diff --git a/.github/actions/install-node-dependencies/action.yml b/.github/actions/install-node-dependencies/action.yml
index 6aecef6e1524..7bf1d8cd43b6 100644
--- a/.github/actions/install-node-dependencies/action.yml
+++ b/.github/actions/install-node-dependencies/action.yml
@@ -2,6 +2,10 @@ name: Install Node dependencies
 description: Installs the Node toolchain and repository dependencies for CI jobs, with optional Electron archive caching.
 
 inputs:
+  cache-pnpm-verification:
+    description: Restore pnpm's policy-checked lockfile verification record on Linux.
+    required: false
+    default: 'true'
   native-runtime:
     description: Native runtime to prepare after the script-free install (none, node, or electron).
     required: false
@@ -24,6 +28,15 @@ inputs:
     default: 'false'
 
 outputs:
+  verification-cache-hit:
+    description: Whether pnpm's verification record was restored.
+    value: ${{ steps.verification-cache-restore.outputs.cache-hit }}
+  verification-cache-path:
+    description: The small pnpm-owned verification record, without registry metadata.
+    value: ${{ steps.verification-cache.outputs.path }}
+  verification-cache-key:
+    description: Exact verification record key, also used by the isolated PR benchmark.
+    value: ${{ steps.verification-cache.outputs.key }}
   node-version:
     description: Resolved Node.js version used for the install.
     value: ${{ steps.requested-node.outputs.node-version || steps.default-node.outputs.node-version }}
@@ -86,6 +99,25 @@ runs:
         path: ${{ steps.pnpm-store.outputs.path }}
         key: node-cache-${{ runner.os }}-${{ steps.pnpm-store.outputs.arch }}-pnpm-${{ hashFiles(inputs.cache-dependency-path) }}
 
+    - name: Resolve pnpm verification cache
+      id: verification-cache
+      if: runner.os == 'Linux' && inputs.cache-pnpm-verification == 'true'
+      shell: bash
+      env:
+        POLICY_HASH: ${{ hashFiles('pnpm-lock.yaml', 'pnpm-workspace.yaml', '.npmrc') }}
+      run: |
+        printf 'path=%s/lockfile-verified.jsonl\n' "$(pnpm cache path)" >> "$GITHUB_OUTPUT"
+        printf 'key=pnpm-verification-v1-%s-%s-%s-%s\n' "$RUNNER_OS" "$RUNNER_ARCH" "$(pnpm --version)" "$POLICY_HASH" >> "$GITHUB_OUTPUT"
+
+    - name: Restore pnpm verification record
+      id: verification-cache-restore
+      if: steps.verification-cache.outputs.key != ''
+      continue-on-error: true
+      uses: actions/cache/restore@v5
+      with:
+        path: ${{ steps.verification-cache.outputs.path }}
+        key: ${{ steps.verification-cache.outputs.key }}
+
     - name: Validate native runtime
       shell: bash
       env:
@@ -120,6 +152,15 @@ runs:
           git -C "$GITHUB_WORKSPACE" diff --exit-code -- package.json pnpm-lock.yaml pnpm-workspace.yaml
         fi
 
+    # pnpm checks the cached record's policy and validity; never bypass verification.
+    - name: Save pnpm verification record on main
+      if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && steps.verification-cache.outputs.key != '' && steps.verification-cache-restore.outputs.cache-hit != 'true'
+      continue-on-error: true
+      uses: actions/cache/save@v5
+      with:
+        path: ${{ steps.verification-cache.outputs.path }}
+        key: ${{ steps.verification-cache.outputs.key }}
+
     - name: Resolve Electron package cache
       id: electron-package-cache
       if: inputs.native-runtime == 'electron' || inputs.cache-electron-package == 'true'
@@ -140,12 +181,19 @@ runs:
         printf 'version=%s\n' "$(node -p "require('./node_modules/electron/package.json').version")" >> "$GITHUB_OUTPUT"
 
     - name: Cache Electron package archive
-      if: inputs.native-runtime == 'electron' || inputs.cache-electron-package == 'true'
+      if: (github.event_name != 'pull_request' || runner.os != 'Linux') && steps.electron-package-cache.outputs.version != ''
       uses: actions/cache@v5
       with:
         path: ${{ steps.electron-package-cache.outputs.cache-root }}
         key: electron-package-${{ runner.os }}-${{ runner.arch }}-${{ steps.electron-package-cache.outputs.version }}
 
+    - name: Restore Electron package archive without saving
+      if: github.event_name == 'pull_request' && runner.os == 'Linux' && steps.electron-package-cache.outputs.version != ''
+      uses: actions/cache/restore@v5
+      with:
+        path: ${{ steps.electron-package-cache.outputs.cache-root }}
+        key: electron-package-${{ runner.os }}-${{ runner.arch }}-${{ steps.electron-package-cache.outputs.version }}
+
     # Why cached: `--ignore-scripts` leaves node-pty without build/Release, so
     # ensure-native-runtime node-gyp-compiles it in every job that asks for a runtime.
     # The artifacts are ABI-bound, so the key carries the target runtime, the resolved
diff --git a/.github/actions/prepare-linux-package-fixture/action.yml b/.github/actions/prepare-linux-package-fixture/action.yml
new file mode 100644
index 000000000000..a84568b3e062
--- /dev/null
+++ b/.github/actions/prepare-linux-package-fixture/action.yml
@@ -0,0 +1,63 @@
+name: Prepare cached Linux package fixture
+description: Restore Docker build layers; only the main warmer builds and saves missing images.
+inputs:
+  fixture:
+    description: Directory name below config/docker.
+    required: true
+  save-cache:
+    description: Build and save a missing fixture on the default branch.
+    default: 'false'
+outputs:
+  image:
+    description: Loaded image to use as a Docker build cache, or empty on a cache miss.
+    value: ${{ steps.image.outputs.image }}
+runs:
+  using: composite
+  steps:
+    - name: Restore fixture image
+      id: cache
+      uses: actions/cache/restore@v5
+      continue-on-error: true
+      with:
+        path: ${{ runner.temp }}/orca-package-fixtures/${{ inputs.fixture }}.tar
+        key: linux-package-fixture-v1-${{ runner.os }}-${{ runner.arch }}-linux-amd64-${{ inputs.fixture }}-${{ hashFiles(format('config/docker/{0}/**', inputs.fixture), '.github/actions/prepare-linux-package-fixture/action.yml') }}
+
+    - name: Load or seed fixture build cache
+      id: image
+      shell: bash
+      env:
+        FIXTURE: ${{ inputs.fixture }}
+        SAVE_CACHE: ${{ inputs.save-cache }}
+        CACHE_HIT: ${{ steps.cache.outputs.cache-hit }}
+      run: |
+        set -euo pipefail
+        case "$FIXTURE" in
+          headless-serve-shutdown|cli-launch-contract) ;;
+          *) echo "Unsupported package fixture: $FIXTURE" >&2; exit 1 ;;
+        esac
+        archive="$RUNNER_TEMP/orca-package-fixtures/$FIXTURE.tar"
+        image="orca-package-fixture-$FIXTURE:cache"
+        if [[ "$CACHE_HIT" == true ]] && docker load --input "$archive"; then
+          if docker image inspect "$image" > /dev/null; then
+            echo "image=$image" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+        fi
+        if [[ "$SAVE_CACHE" != true ]]; then
+          echo 'No usable fixture cache; the package runner will build normally.'
+          exit 0
+        fi
+        docker build --platform linux/amd64 --build-arg BUILDKIT_INLINE_CACHE=1 \
+          --tag "$image" --file "config/docker/$FIXTURE/Dockerfile" "config/docker/$FIXTURE"
+        mkdir -p "$(dirname "$archive")"
+        docker save --output "$archive" "$image"
+        echo "image=$image" >> "$GITHUB_OUTPUT"
+        echo 'built=true' >> "$GITHUB_OUTPUT"
+
+    - name: Save fixture image
+      if: inputs.save-cache == 'true' && steps.cache.outputs.cache-hit != 'true' && steps.image.outputs.built == 'true'
+      uses: actions/cache/save@v5
+      continue-on-error: true
+      with:
+        path: ${{ runner.temp }}/orca-package-fixtures/${{ inputs.fixture }}.tar
+        key: ${{ steps.cache.outputs.cache-primary-key }}
diff --git a/.github/actions/prepare-xterm-dependencies/action.yml b/.github/actions/prepare-xterm-dependencies/action.yml
new file mode 100644
index 000000000000..8fa54bd85ae4
--- /dev/null
+++ b/.github/actions/prepare-xterm-dependencies/action.yml
@@ -0,0 +1,33 @@
+name: Restore xterm build dependencies
+description: Reuse installed dependencies for the pinned upstream checkout.
+outputs:
+  cache-key:
+    description: Exact dependency cache key.
+    value: ${{ steps.restore.outputs.cache-primary-key }}
+  cache-hit:
+    description: Whether the exact installed dependency cache was restored.
+    value: ${{ steps.restore.outputs.cache-hit }}
+runs:
+  using: composite
+  steps:
+    - id: runtime
+      shell: bash
+      run: |
+        . /etc/os-release
+        echo "image=$ID-$VERSION_ID" >> "$GITHUB_OUTPUT"
+        echo "node=$(node --version)" >> "$GITHUB_OUTPUT"
+    - id: restore
+      uses: actions/cache/restore@v5
+      with:
+        path: |
+          ${{ runner.temp }}/xterm-patch-build/upstream/.git
+          ${{ runner.temp }}/xterm-patch-build/upstream/node_modules
+        key: xterm-dependencies-v1-${{ runner.os }}-${{ steps.runtime.outputs.image }}-${{ runner.arch }}-${{ steps.runtime.outputs.node }}-${{ hashFiles('config/patches/xterm-upstream.json', 'config/scripts/regenerate-xterm-patches.mjs', 'config/scripts/xterm-patch-text.mjs', '.github/actions/prepare-xterm-dependencies/action.yml') }}
+    - name: Restore download cache on an installed-dependency miss
+      if: steps.restore.outputs.cache-hit != 'true'
+      uses: actions/cache/restore@v5
+      with:
+        path: |
+          ~/.npm
+          ${{ runner.temp }}/xterm-patch-build/upstream/.git
+        key: xterm-upstream-${{ hashFiles('config/patches/xterm-upstream.json') }}
diff --git a/.github/workflows/bun-profile-tests.yml b/.github/workflows/bun-profile-tests.yml
index 8452bbfb2532..1a292292510c 100644
--- a/.github/workflows/bun-profile-tests.yml
+++ b/.github/workflows/bun-profile-tests.yml
@@ -2,6 +2,25 @@ name: Bun profile persistence
 
 on:
   pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    paths:
+      - 'src/**'
+      - 'config/**'
+      - 'native/**'
+      - 'tests/**'
+      - 'resources/**'
+      - 'package.json'
+      - 'pnpm-lock.yaml'
+      - 'pnpm-workspace.yaml'
+      - 'tsconfig.json'
+      - '.npmrc'
+      - '.pnpmfile.cjs'
+      - '.github/actions/install-node-dependencies/**'
+      - '.github/workflows/bun-profile-tests.yml'
+  # The pull request qualifies one platform for an unflavoured change; this is where all six
+  # are re-qualified, so a platform break surfaces minutes after merge instead of next cron.
+  push:
+    branches: [main]
     paths:
       - 'src/**'
       - 'config/**'
@@ -17,6 +36,8 @@ on:
       - '.github/actions/install-node-dependencies/**'
       - '.github/workflows/bun-profile-tests.yml'
   workflow_dispatch:
+  schedule:
+    - cron: '30 11 * * *'
 
 permissions:
   contents: read
@@ -32,6 +53,8 @@ jobs:
     timeout-minutes: 5
     outputs:
       should_run: ${{ steps.scope.outputs.should_run }}
+      qualification: ${{ steps.scope.outputs.qualification }}
+      runners: ${{ steps.scope.outputs.runners }}
     steps:
       - uses: actions/checkout@v6
         with:
@@ -52,11 +75,15 @@ jobs:
   persistence:
     needs: changes
     # Missing/failed detection runs the full matrix; manual runs remain unconditional.
-    if: ${{ !cancelled() && needs.changes.outputs.should_run != 'false' }}
+    # A draft carries no platform verdict; readiness re-triggers this workflow. Spelled against
+    # the event name so the push and schedule paths do not rest on a null property comparison.
+    if: >-
+      ${{ !cancelled() && needs.changes.outputs.should_run != 'false' &&
+      (github.event_name != 'pull_request' || github.event.pull_request.draft != true) }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-24.04-arm, macos-14, macos-15-intel, windows-2022, windows-11-arm]
+        os: ${{ fromJSON(needs.changes.outputs.runners || '["ubuntu-22.04","ubuntu-24.04-arm","macos-14","macos-15-intel","windows-2022","windows-11-arm"]') }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     env:
@@ -68,9 +95,7 @@ jobs:
       - uses: ./.github/actions/install-node-dependencies
         with:
           native-runtime: ${{ runner.os == 'Windows' && 'node' || 'none' }}
-      - name: Build the native Windows process reader
-        if: runner.os == 'Windows'
-        run: node config/scripts/build-windows-process-tree-relay-addon.mjs
+      # build:orcad reuses the host addon validated by native-runtime preparation.
       - run: pnpm build:orcad
       - run: pnpm test:bun:profile --artifact
       - uses: actions/setup-node@v6
@@ -84,9 +109,12 @@ jobs:
           node out/orcad/orcad.js --orcad-profile-state-preflight 00000000-0000-4000-8000-000000000018
 
   linux_glibc_floor:
-    needs: changes
-    # Missing/failed detection runs the full matrix; manual runs remain unconditional.
-    if: ${{ !cancelled() && needs.changes.outputs.should_run != 'false' }}
+    needs: [changes, persistence]
+    # A failed smoke already blocks qualification; missing scope still selects every platform.
+    if: >-
+      ${{ !cancelled() && needs.persistence.result == 'success' &&
+      needs.changes.outputs.should_run != 'false' &&
+      needs.changes.outputs.qualification != 'false' }}
     strategy:
       fail-fast: false
       matrix:
@@ -109,9 +137,12 @@ jobs:
       - run: pnpm test:bun:profile --artifact
 
   linux_musl:
-    needs: changes
-    # Missing/failed detection runs the full matrix; manual runs remain unconditional.
-    if: ${{ !cancelled() && needs.changes.outputs.should_run != 'false' }}
+    needs: [changes, persistence]
+    # A failed smoke already blocks qualification; missing scope still selects every platform.
+    if: >-
+      ${{ !cancelled() && needs.persistence.result == 'success' &&
+      needs.changes.outputs.should_run != 'false' &&
+      needs.changes.outputs.qualification != 'false' }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/ci-cache-warmup.yml b/.github/workflows/ci-cache-warmup.yml
index 9066dd266a36..7309f7e39123 100644
--- a/.github/workflows/ci-cache-warmup.yml
+++ b/.github/workflows/ci-cache-warmup.yml
@@ -10,6 +10,9 @@ on:
       - '.github/workflows/ci-cache-warmup.yml'
       - '.github/actions/install-node-dependencies/**'
       - '.github/actions/prepare-git-compatibility/**'
+      - '.github/actions/prepare-linux-package-fixture/**'
+      - 'config/docker/headless-serve-shutdown/**'
+      - 'config/docker/cli-launch-contract/**'
       - 'package.json'
       - 'pnpm-lock.yaml'
       - 'pnpm-workspace.yaml'
@@ -23,6 +26,9 @@ on:
     paths:
       - '.github/workflows/ci-cache-warmup.yml'
       - '.github/actions/prepare-git-compatibility/**'
+      - '.github/actions/prepare-linux-package-fixture/**'
+      - 'config/docker/headless-serve-shutdown/**'
+      - 'config/docker/cli-launch-contract/**'
       - 'config/scripts/ci-cache-warmup-workflow.test.mjs'
 
 permissions:
@@ -48,6 +54,10 @@ jobs:
         with:
           native-runtime: node
           node-version: '24'
+          cache-electron-package: 'true'
+
+      - name: Populate shared Electron archive
+        run: node config/scripts/install-electron-package-binary.mjs
 
       - uses: ./.github/actions/prepare-git-compatibility
 
@@ -63,3 +73,59 @@ jobs:
       - name: Refresh TypeScript state for this commit
         if: steps.typecheck-cache.outputs.cache-hit != 'true'
         run: pnpm run typecheck
+
+  warm-linux-arm:
+    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 10
+    env:
+      ORCA_BACKGROUND_LAUNCH: '1'
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: ./.github/actions/install-node-dependencies
+        with:
+          native-runtime: node
+          node-version: '24'
+          cache-electron-package: 'true'
+      - name: Populate shared Electron archive
+        run: node config/scripts/install-electron-package-binary.mjs
+      - name: Verify native cache is usable
+        run: node config/scripts/ensure-native-runtime.mjs --check-only
+
+  warm-windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-2022, windows-11-arm]
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 20
+    env:
+      ORCA_BACKGROUND_LAUNCH: '1'
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: ./.github/actions/install-node-dependencies
+        with:
+          native-runtime: node
+      - name: Verify native cache is usable
+        run: node config/scripts/ensure-native-runtime.mjs --check-only
+
+  warm-linux-package-fixtures:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    env:
+      ORCA_BACKGROUND_LAUNCH: '1'
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: ./.github/actions/prepare-linux-package-fixture
+        with:
+          fixture: headless-serve-shutdown
+          save-cache: ${{ github.event_name != 'pull_request' }}
+      - uses: ./.github/actions/prepare-linux-package-fixture
+        with:
+          fixture: cli-launch-contract
+          save-cache: ${{ github.event_name != 'pull_request' }}
diff --git a/.github/workflows/ci-closed-pr-caches.yml b/.github/workflows/ci-closed-pr-caches.yml
new file mode 100644
index 000000000000..38cf5803a146
--- /dev/null
+++ b/.github/workflows/ci-closed-pr-caches.yml
@@ -0,0 +1,33 @@
+name: Clean closed PR caches
+
+on:
+  pull_request_target:
+    types: [closed]
+
+permissions:
+  actions: write
+
+jobs:
+  clean:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      # No checkout: this runs trusted default-branch code, including for fork PRs.
+      - uses: actions/github-script@v8
+        with:
+          script: |
+            const ref = `refs/pull/${context.payload.pull_request.number}/merge`
+            const caches = await github.paginate(github.rest.actions.getActionsCacheList, {
+              ...context.repo, ref, per_page: 100
+            })
+            for (const cache of caches) {
+              if (cache.ref !== ref) throw new Error(`Unexpected cache ref: ${cache.ref}`)
+              try {
+                await github.rest.actions.deleteActionsCacheById({
+                  ...context.repo, cache_id: cache.id
+                })
+              } catch (error) {
+                if (error.status !== 404) throw error
+              }
+            }
+            core.info(`Removed ${caches.length} caches scoped to ${ref}`)
diff --git a/.github/workflows/ci-pnpm-verification-pilot.yml b/.github/workflows/ci-pnpm-verification-pilot.yml
new file mode 100644
index 000000000000..2a35a52fcd0e
--- /dev/null
+++ b/.github/workflows/ci-pnpm-verification-pilot.yml
@@ -0,0 +1,65 @@
+name: pnpm verification cache pilot
+
+on:
+  pull_request:
+    paths: ['.github/workflows/ci-pnpm-verification-pilot.yml']
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: pnpm-verification-pilot-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  ORCA_BACKGROUND_LAUNCH: '1'
+
+jobs:
+  seed:
+    strategy:
+      matrix:
+        runner: [ubuntu-latest, ubuntu-24.04-arm]
+    runs-on: ${{ matrix.runner }}
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: ./.github/actions/install-node-dependencies
+        id: deps
+      # PR caches are scoped to the PR merge ref; main never restores them.
+      - uses: actions/cache/save@v5
+        if: steps.deps.outputs.verification-cache-hit != 'true'
+        with:
+          path: ${{ steps.deps.outputs.verification-cache-path }}
+          key: ${{ steps.deps.outputs.verification-cache-key }}
+
+  measure:
+    needs: seed
+    name: measure ${{ matrix.runner }} sample ${{ matrix.sample }} cache ${{ matrix.cache }}
+    strategy:
+      fail-fast: false
+      max-parallel: 4
+      matrix:
+        runner: [ubuntu-latest, ubuntu-24.04-arm]
+        sample: [1, 2, 3]
+        cache: ['false', 'true']
+    runs-on: ${{ matrix.runner }}
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: ./.github/actions/install-node-dependencies
+        id: deps
+        with:
+          cache-pnpm-verification: ${{ matrix.cache }}
+      - name: Validate treatment and frozen install
+        env:
+          CACHE_ENABLED: ${{ matrix.cache }}
+          CACHE_HIT: ${{ steps.deps.outputs.verification-cache-hit }}
+        run: |
+          if [ "$CACHE_ENABLED" = true ]; then test "$CACHE_HIT" = true; fi
+          git diff --exit-code -- package.json pnpm-lock.yaml pnpm-workspace.yaml
+          node -e "require.resolve('vitest'); require.resolve('electron')"
diff --git a/.github/workflows/ci-runner-demand.yml b/.github/workflows/ci-runner-demand.yml
new file mode 100644
index 000000000000..966813a65e40
--- /dev/null
+++ b/.github/workflows/ci-runner-demand.yml
@@ -0,0 +1,33 @@
+name: CI runner demand
+
+on:
+  schedule:
+    - cron: '23 4 * * *'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  actions: read
+
+concurrency:
+  group: ci-runner-demand
+  cancel-in-progress: false
+
+jobs:
+  report:
+    runs-on: ubuntu-slim
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          sparse-checkout: config/scripts
+          persist-credentials: false
+      - name: Measure the previous complete 24 hours
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: node config/scripts/ci-runner-demand.mjs
+      - uses: actions/upload-artifact@v7
+        with:
+          name: ci-runner-demand-${{ github.run_id }}
+          path: ci-demand/
+          retention-days: 30
diff --git a/.github/workflows/ci-xterm-cache.yml b/.github/workflows/ci-xterm-cache.yml
new file mode 100644
index 000000000000..fada7ea8cab4
--- /dev/null
+++ b/.github/workflows/ci-xterm-cache.yml
@@ -0,0 +1,55 @@
+name: Shared xterm dependency cache
+on:
+  push:
+    branches: [main]
+    paths:
+      - '.github/workflows/ci-xterm-cache.yml'
+      - '.github/actions/prepare-xterm-dependencies/**'
+      - 'config/patches/xterm-upstream.json'
+      - 'config/scripts/regenerate-xterm-patches.mjs'
+      - 'config/scripts/xterm-patch-text.mjs'
+      - 'package.json'
+  # Refresh after Node patch releases or cache eviction without rebuilding on hits.
+  schedule:
+    - cron: '17 5 * * *'
+  workflow_dispatch:
+permissions:
+  contents: read
+concurrency:
+  group: xterm-cache-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+env:
+  ORCA_BACKGROUND_LAUNCH: '1'
+jobs:
+  seed:
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: actions/setup-node@v6
+        with:
+          node-version-file: package.json
+          package-manager-cache: false
+      - uses: ./.github/actions/prepare-xterm-dependencies
+        id: cache
+      - name: Verify and populate dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: node config/scripts/regenerate-xterm-patches.mjs --check --work-dir="$RUNNER_TEMP/xterm-patch-build"
+      - uses: actions/cache/save@v5
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          path: |
+            ${{ runner.temp }}/xterm-patch-build/upstream/.git
+            ${{ runner.temp }}/xterm-patch-build/upstream/node_modules
+          key: ${{ steps.cache.outputs.cache-key }}
+      - name: Preserve fallback downloads
+        if: steps.cache.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v5
+        with:
+          path: |
+            ~/.npm
+            ${{ runner.temp }}/xterm-patch-build/upstream/.git
+          key: xterm-upstream-${{ hashFiles('config/patches/xterm-upstream.json') }}
diff --git a/.github/workflows/cloud-verify.yml b/.github/workflows/cloud-verify.yml
index 02f2d1822ec3..6c4cb9a53a12 100644
--- a/.github/workflows/cloud-verify.yml
+++ b/.github/workflows/cloud-verify.yml
@@ -34,6 +34,16 @@ jobs:
         with:
           fetch-depth: 1
 
+      - name: Pull Gitleaks image
+        id: gitleaks-image
+        background: true
+        run: docker pull zricethezav/gitleaks@sha256:cdbb7c955abce02001a9f6c9f602fb195b7fadc1e812065883f695d1eeaba854
+
+      - name: Pull TruffleHog image
+        id: trufflehog-image
+        background: true
+        run: docker pull trufflesecurity/trufflehog@sha256:5dc064868ba7933601b5cbaea6954954d524ddd5dc6222a9667acea70068bf7d
+
       # Scan every ancestor of HEAD without downloading unrelated branch/tag histories.
       - name: Fetch complete scan history
         working-directory: .
@@ -41,7 +51,11 @@ jobs:
           git fetch --no-tags --unshallow origin "$GITHUB_SHA"
           test "$(git rev-parse --is-shallow-repository)" = false
 
+      - wait: [gitleaks-image, trufflehog-image]
+
       - name: Scan Cloud history reachable from HEAD with Gitleaks
+        id: history-scan
+        background: true
         run: >-
           docker run --rm
           --volume "${GITHUB_WORKSPACE}:/repo:ro"
@@ -58,6 +72,8 @@ jobs:
           --include-paths=/repo/cloud/.trufflehog-include-paths.txt
           --exclude-paths=/repo/cloud/.trufflehog-exclude-paths.txt
 
+      - wait: history-scan
+
   # Compiles the workspace. No Postgres service: nothing here reaches a
   # database, and the service container costs ~13s of startup.
   build:
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index f42d1184ce93..4177b141d8a4 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -32,9 +32,8 @@ on:
         required: false
         type: string
   schedule:
-    # Why: GitHub cron uses UTC; these slots map to 10am and 3pm
-    # America/Phoenix for the default-branch E2E run.
-    - cron: '0 17,22 * * *'
+    # One complete daily reference run; targeted PR coverage remains unchanged.
+    - cron: '0 17 * * *'
 
 jobs:
   build:
@@ -62,11 +61,26 @@ jobs:
           status=0
           pnpm run build:relay &
           relay_pid=$!
-          npx electron-vite build --mode e2e || status=1
-          pnpm run build:web-from-renderer || status=1
+          pnpm run build:electron-vite:parallel --mode e2e || status=1
           wait "$relay_pid" || status=1
           exit "$status"
 
+      # The CLI emits into out/main too; start only after Electron finishes clearing that tree.
+      - name: Build shared E2E CLI
+        id: e2e-cli
+        background: true
+        run: |
+          if node -e 'process.exit(require("./package.json").scripts["prepare:cli-output"] ? 0 : 1)'; then
+            pnpm run build:cli
+          else
+            echo "Older ref: let each consumer build and install its CLI."
+          fi
+
+      - name: Project shared E2E web client
+        run: pnpm run build:web-from-renderer
+
+      - wait: e2e-cli
+
       - name: Upload E2E build output
         uses: actions/upload-artifact@v7
         with:
@@ -186,7 +200,14 @@ jobs:
           node config/scripts/ci-e2e-shard-plan.mjs --verify ci-shards/assignment.json ci-shards/selected-discovery.json
 
       - name: Run E2E tests (${{ matrix.shard_name }})
-        run: xvfb-run --auto-servernum bash .github/scripts/e2e-with-window-manager.sh env SKIP_BUILD=1 ORCA_E2E_FORWARD_APP_LOGS=1 ORCA_E2E_WEB_CLIENT=1 ORCA_RELAY_PATH="$GITHUB_WORKSPACE/out/relay" pnpm run test:e2e --test-list=ci-shards/selected.txt
+        env:
+          PLAYWRIGHT_JSON_OUTPUT_FILE: ci-shards/results.json
+        run: xvfb-run --auto-servernum bash .github/scripts/e2e-with-window-manager.sh env SKIP_BUILD=1 ORCA_E2E_FORWARD_APP_LOGS=1 ORCA_E2E_WEB_CLIENT=1 ORCA_RELAY_PATH="$GITHUB_WORKSPACE/out/relay" pnpm run test:e2e --test-list=ci-shards/selected.txt --reporter=list,json
+
+      - name: Summarize E2E failures
+        if: always()
+        continue-on-error: true
+        run: node config/scripts/ci-e2e-failure-summary.mjs ci-shards/results.json
 
       - name: Upload E2E shard assignment
         if: always()
@@ -221,8 +242,6 @@ jobs:
     needs: [build, prepare-native-cache]
     if: inputs.test_files != ''
     runs-on: ubuntu-latest
-    # Why 45: pr.yml now maps SSH source edits onto Docker-backed specs, so this lane can
-    # pay a container image build plus ~22 serial SSH tests on top of the changed specs.
     timeout-minutes: 45
 
     steps:
@@ -256,14 +275,38 @@ jobs:
           # ORCA_E2E_NATIVE_IBUS_HANGUL, which this lane cannot set because it has no ibus
           # session. Running it here reported a green skip as coverage.
           mapfile -t TEST_FILES < <(jq -r '.[] | select(
+            . != "tests/e2e/local-ssh-browser-routing.spec.ts" and
+            . != "tests/e2e/ssh-client-hosted-browser-drop-reconnect.spec.ts" and
+            . != "tests/e2e/pty-input-write-queue-ssh.spec.ts" and
+            . != "tests/e2e/ssh-ai-vault-session-history.spec.ts" and
+            . != "tests/e2e/ssh-codex-display-artifacts-repro.spec.ts" and
+            . != "tests/e2e/ssh-cold-activation-restore.spec.ts" and
+            . != "tests/e2e/ssh-cold-hydration-gap-tab-seeding.spec.ts" and
+            . != "tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts" and
+            . != "tests/e2e/ssh-docker-bulk-open-freeze-repro.spec.ts" and
+            . != "tests/e2e/ssh-docker-half-open-link.spec.ts" and
+            . != "tests/e2e/ssh-docker-quick-open-large-listing.spec.ts" and
+            . != "tests/e2e/ssh-docker-reconnect-pane-restore.spec.ts" and
+            . != "tests/e2e/ssh-docker-relay-stall-credential.spec.ts" and
+            . != "tests/e2e/ssh-docker-resource-accumulation.spec.ts" and
+            . != "tests/e2e/ssh-docker-transport-drop-recovery.spec.ts" and
+            . != "tests/e2e/ssh-external-image-preview.spec.ts" and
+            . != "tests/e2e/ssh-lost-kill-tab-resurrection.spec.ts" and
+            . != "tests/e2e/ssh-pi-compatible-agent-title.spec.ts" and
+            . != "tests/e2e/ssh-port-forward-lifecycle.spec.ts" and
+            . != "tests/e2e/ssh-reconnect-tab-destruction.spec.ts" and
+            . != "tests/e2e/ssh-restart-tab-accumulation.spec.ts" and
+            . != "tests/e2e/ssh-skill-installation.spec.ts" and
+            . != "tests/e2e/ssh-stale-resume-execution-host-scope.spec.ts" and
+            . != "tests/e2e/ssh-terminal-window-wake-stale-grid-repro.spec.ts" and
+            . != "tests/e2e/terminal-inline-images-ssh.spec.ts" and
+            . != "tests/e2e/ssh-docker-watcher-isolation.spec.ts" and
+            . != "tests/e2e/ssh-terminal-parking.spec.ts" and
+            . != "tests/e2e/terminal-retention-budget.spec.ts" and
             . != "tests/e2e/ssh-startup-exec-readiness.spec.ts" and
             . != "tests/e2e/paired-startup-exec-readiness.spec.ts" and
-            . != "tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts" and
-            . != "tests/e2e/local-ssh-browser-routing.spec.ts" and
             . != "tests/e2e/ssh-browser-network-execution-route.docker.unit.test.ts" and
             . != "tests/e2e/ssh-localhost.spec.ts" and
-            . != "tests/e2e/ssh-client-hosted-browser-drop-reconnect.spec.ts" and
-            . != "tests/e2e/ssh-docker-bulk-open-freeze-repro.spec.ts" and
             . != "tests/e2e/terminal-ibus-hangul-native.spec.ts"
           )' <<<"$TEST_FILES_JSON")
           if [ "${#TEST_FILES[@]}" -eq 0 ]; then
@@ -295,25 +338,47 @@ jobs:
           if-no-files-found: ignore
 
   ssh-docker-watcher-isolation:
-    name: ssh docker watcher isolation
+    name: ssh docker watcher isolation (${{ matrix.shard }}/4)
     needs: [build, prepare-native-cache]
-    # effect of one route listing a startup-readiness spec — pruning that spec would have
-    # silently retired the whole lane. The signal is now derived from the SSH routes directly.
-    # The explicit spec clauses stay for their honest purpose: changed-e2e hands these specs to this
-    # lane, so editing one must still run it here.
+    # Each excluded changed spec must trigger its dedicated owner.
     if: >-
       inputs.test_files == '' ||
       inputs.ssh_source_changed == 'true' ||
-      contains(inputs.test_files, 'tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts') ||
       contains(inputs.test_files, 'tests/e2e/local-ssh-browser-routing.spec.ts') ||
       contains(inputs.test_files, 'tests/e2e/ssh-client-hosted-browser-drop-reconnect.spec.ts') ||
-      contains(inputs.test_files, 'tests/e2e/ssh-startup-exec-readiness.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/pty-input-write-queue-ssh.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-ai-vault-session-history.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-codex-display-artifacts-repro.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-cold-activation-restore.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-cold-hydration-gap-tab-seeding.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts') ||
       contains(inputs.test_files, 'tests/e2e/ssh-docker-bulk-open-freeze-repro.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-docker-half-open-link.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-docker-quick-open-large-listing.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-docker-reconnect-pane-restore.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-docker-relay-stall-credential.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-docker-resource-accumulation.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-docker-transport-drop-recovery.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-external-image-preview.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-lost-kill-tab-resurrection.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-pi-compatible-agent-title.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-port-forward-lifecycle.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-reconnect-tab-destruction.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-restart-tab-accumulation.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-skill-installation.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-stale-resume-execution-host-scope.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-terminal-window-wake-stale-grid-repro.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/terminal-inline-images-ssh.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-docker-watcher-isolation.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-terminal-parking.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/terminal-retention-budget.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-startup-exec-readiness.spec.ts') ||
       contains(inputs.test_files, 'tests/e2e/paired-startup-exec-readiness.spec.ts')
     runs-on: ubuntu-latest
-    # Why 60: this lane now also runs the remaining Docker-SSH specs serially. They average
-    # ~18s but several budget 4-10 minutes per test, so a slow run lands far above the old 35
-    # — and the sharded lanes already show that a lane which times out is a lane nobody trusts.
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [1, 2, 3, 4]
     timeout-minutes: 60
 
     steps:
@@ -338,13 +403,14 @@ jobs:
       # Why: this is the release-path proof that the deployed Linux relay keeps
       # its PTY and explorer live across a real watcher SIGSEGV.
       - name: Run Docker SSH watcher isolation E2E
+        if: matrix.shard == 1
         run: xvfb-run --auto-servernum bash .github/scripts/e2e-with-window-manager.sh env SKIP_BUILD=1 ORCA_E2E_FORWARD_APP_LOGS=1 pnpm run test:e2e:ssh-docker-watcher-isolation
 
       # Why: Playwright empties test-results/ when it starts, so each step here used to
       # destroy the previous step's traces. Only the last lane's failure was ever
       # diagnosable from the artifact; set each lane aside before the next one runs.
       - name: Keep watcher-isolation traces
-        if: always()
+        if: always() && matrix.shard == 1
         run: |
           if [ -d test-results ]; then
             mkdir -p e2e-traces
@@ -354,24 +420,21 @@ jobs:
       # Why always(): this lane gates SSH parking/retention plus startup-exec
       # readiness across live SSH, headed paired, and headless serve topologies.
       - name: Run Docker SSH terminal parking + startup readiness E2E
-        if: always()
+        if: always() && matrix.shard == 1
         run: xvfb-run --auto-servernum bash .github/scripts/e2e-with-window-manager.sh env SKIP_BUILD=1 ORCA_E2E_FORWARD_APP_LOGS=1 pnpm run test:e2e:ssh-docker-terminal-parking
 
       - name: Keep terminal-parking traces
-        if: always()
+        if: always() && matrix.shard == 1
         run: |
           if [ -d test-results ]; then
             mkdir -p e2e-traces
             mv test-results "e2e-traces/terminal-parking"
           fi
 
-      # Why here rather than the sharded lanes: the shards set no ORCA_E2E_SSH_DOCKER, so every
-      # spec below skipped itself while the shard still reported green. Running them on this one
-      # VM pays the fixture image build once instead of ten times, and keeps an SSH regression
-      # legible as an SSH-named failure.
+      # Separate VMs isolate destructive SSH fixtures while keeping one worker per shard.
       - name: Run remaining Docker SSH E2E
         if: always()
-        run: xvfb-run --auto-servernum bash .github/scripts/e2e-with-window-manager.sh env SKIP_BUILD=1 ORCA_E2E_FORWARD_APP_LOGS=1 pnpm run test:e2e:ssh-docker
+        run: xvfb-run --auto-servernum bash .github/scripts/e2e-with-window-manager.sh env SKIP_BUILD=1 ORCA_E2E_FORWARD_APP_LOGS=1 pnpm run test:e2e:ssh-docker --shard=${{ matrix.shard }}/4
 
       - name: Keep remaining-ssh-docker traces
         if: always()
@@ -385,7 +448,7 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v7
         with:
-          name: playwright-traces-ssh-docker-watcher-isolation
+          name: playwright-traces-ssh-docker-watcher-isolation-${{ matrix.shard }}
           path: e2e-traces/
           retention-days: 7
           if-no-files-found: ignore
diff --git a/.github/workflows/homebrew-bump.yml b/.github/workflows/homebrew-bump.yml
index 9b04d3205fc4..a5f9b352f6e1 100644
--- a/.github/workflows/homebrew-bump.yml
+++ b/.github/workflows/homebrew-bump.yml
@@ -132,11 +132,10 @@ jobs:
           print(src)
           PY
 
-      # Why: reuse the existing buf0-bot GitHub App (also used by
-      # track-community-prs.yaml) instead of minting a new PAT. The app is
-      # installed org-wide, so it has access to stablyai/homebrew-orca
-      # automatically. GITHUB_TOKEN cannot push cross-repo; a short-lived
-      # installation token can.
+      # Why: reuse the existing buf0-bot GitHub App instead of minting a new
+      # PAT. The app is installed org-wide, so it has access to
+      # stablyai/homebrew-orca automatically. GITHUB_TOKEN cannot push
+      # cross-repo; a short-lived installation token can.
       - name: Generate buf0-bot token
         id: app-token
         uses: actions/create-github-app-token@v3
diff --git a/.github/workflows/mobile-android-release.yml b/.github/workflows/mobile-android-release.yml
index cdb5a59b1549..b9e6e1b1b021 100644
--- a/.github/workflows/mobile-android-release.yml
+++ b/.github/workflows/mobile-android-release.yml
@@ -85,11 +85,44 @@ jobs:
           echo "Mobile shell: $EXPO_PUBLIC_MOBILE_SHELL"
           cd android && ./gradlew assembleRelease
 
+      # Why: an install that fails with a missing certificate or a package-parse error is
+      # usually a download that died near the end, and the signature block sits in the last
+      # ~100 KB. Publishing the size and digest is what lets a reporter tell a truncated
+      # download apart from a bad build without anyone re-deriving them from the asset.
+      - name: Checksum the APK
+        id: apk
+        run: |
+          set -euo pipefail
+          shopt -s nullglob
+          apks=(android/app/build/outputs/apk/release/*.apk)
+          if [ "${#apks[@]}" -ne 1 ]; then
+            echo "Expected exactly one release APK, found ${#apks[@]}" >&2
+            exit 1
+          fi
+
+          apk="${apks[0]}"
+          bytes="$(wc -c < "$apk" | tr -d ' ')"
+          sha256="$(sha256sum "$apk" | cut -d ' ' -f 1)"
+          # A sibling file in `sha256sum -c` format, so verifying a download is one command
+          # and no retyped digest. The asset globs below match *.apk and skip it. The ` *`
+          # marker is binary mode: Git Bash's sha256sum reads text mode as a licence to
+          # translate line endings while hashing, which would fail on a valid APK.
+          printf '%s *%s\n' "$sha256" "$(basename "$apk")" > "$apk.sha256"
+
+          {
+            echo "checksum=$apk.sha256"
+            echo "bytes=$bytes"
+            echo "sha256=$sha256"
+          } >> "$GITHUB_OUTPUT"
+          echo "APK is $bytes bytes, sha256 $sha256"
+
       - name: Upload APK artifact
         uses: actions/upload-artifact@v7
         with:
           name: orca-mobile-apk
-          path: mobile/android/app/build/outputs/apk/release/*.apk
+          path: |
+            mobile/android/app/build/outputs/apk/release/*.apk
+            mobile/android/app/build/outputs/apk/release/*.apk.sha256
 
       - name: Ensure GitHub release tag
         if: steps.release.outputs.publish_release == 'true' && !startsWith(github.ref, 'refs/tags/mobile-android-v')
@@ -112,18 +145,62 @@ jobs:
         run: |
           set -euo pipefail
           tag="${{ steps.release.outputs.tag }}"
+          notes_file="$RUNNER_TEMP/android-release-notes.md"
+
+          # printf rather than a heredoc: YAML block indentation would leak into the Markdown.
+          # Both platforms' commands are named because a reader on macOS has no sha256sum.
+          verification_section() {
+            printf '\n### Verify your download\n\n- Size: `%s` bytes\n- SHA-256: `%s`\n\nA "no certificate" or "problem parsing the package" install failure is usually a truncated download — check the size first, then `sha256sum -c app-release.apk.sha256` (`shasum -a 256 -c` on macOS).\n' \
+              '${{ steps.apk.outputs.bytes }}' '${{ steps.apk.outputs.sha256 }}'
+          }
+
+          # The section is always last, so dropping from its heading to EOF leaves the
+          # generated notes intact. \r* because a body round-tripped through the API has CRLFs.
+          drop_verification_section() {
+            sed '/^### Verify your download\r*$/,$d'
+          }
+
+          # Why: reuse the desktop release path's character-safe truncation so a multi-byte
+          # character cannot be split at the cap. The section's own length is reserved out of
+          # that cap, because appending after truncating would push a near-limit body past
+          # GitHub's API limit and fail the call — on the upload path, after --clobber has
+          # already replaced the assets. `wc -c` counts bytes, so the section's multi-byte
+          # characters over-reserve, which errs toward a shorter body.
+          write_notes_with_verification() {
+            NOTES_FILE="$notes_file" \
+            NOTES_RESERVE="$(verification_section | wc -c | tr -d ' ')" \
+            NOTES_MODULE="$GITHUB_WORKSPACE/config/scripts/create-draft-release.mjs" \
+            node --input-type=module -e '
+              const { readFileSync, writeFileSync } = await import("node:fs")
+              const { pathToFileURL } = await import("node:url")
+              const { MAX_RELEASE_BODY_LENGTH, truncateReleaseBody } = await import(
+                pathToFileURL(process.env.NOTES_MODULE).href
+              )
+              const file = process.env.NOTES_FILE
+              const max = MAX_RELEASE_BODY_LENGTH - Number(process.env.NOTES_RESERVE)
+              writeFileSync(file, truncateReleaseBody(readFileSync(file, "utf8"), max))
+            '
+            verification_section >> "$notes_file"
+          }
 
           if gh release view "$tag" --repo "$GITHUB_REPOSITORY" >/dev/null 2>&1; then
             gh release upload "$tag" \
               --repo "$GITHUB_REPOSITORY" \
               --clobber \
-              android/app/build/outputs/apk/release/*.apk
+              android/app/build/outputs/apk/release/*.apk \
+              "${{ steps.apk.outputs.checksum }}"
+            # Why the body is rewritten too: --clobber replaced the APK, so a digest left
+            # over from the previous build now describes a file nobody can download, and a
+            # reader comparing against it would reject a good APK.
+            gh release view "$tag" --repo "$GITHUB_REPOSITORY" --json body --jq .body \
+              | drop_verification_section > "$notes_file"
+            write_notes_with_verification
+            gh release edit "$tag" --repo "$GITHUB_REPOSITORY" --notes-file "$notes_file"
           else
             # Why: release tags live on side branches, so GitHub's automatic
             # previous-tag detection reaches back several releases; that body
             # already exceeds the 125000-character API limit and grows each
             # release. Pin the comparison base and cap the size.
-            notes_file="$RUNNER_TEMP/android-release-notes.md"
             previous_tag="$(
               gh release list --repo "$GITHUB_REPOSITORY" --limit 200 --json tagName --jq '.[].tagName' \
                 | grep '^mobile-android-v' | grep -Fxv "$tag" | sort -V | tail -1 || true
@@ -143,17 +220,7 @@ jobs:
             if [ ! -s "$notes_file" ]; then
               printf 'Orca Mobile Android %s\n' "$tag" > "$notes_file"
             fi
-            # Why: reuse the desktop release path's character-safe truncation so a
-            # multi-byte character cannot be split at the cap.
-            NOTES_FILE="$notes_file" \
-            NOTES_MODULE="$GITHUB_WORKSPACE/config/scripts/create-draft-release.mjs" \
-            node --input-type=module -e '
-              const { readFileSync, writeFileSync } = await import("node:fs")
-              const { pathToFileURL } = await import("node:url")
-              const { truncateReleaseBody } = await import(pathToFileURL(process.env.NOTES_MODULE).href)
-              const file = process.env.NOTES_FILE
-              writeFileSync(file, truncateReleaseBody(readFileSync(file, "utf8")))
-            '
+            write_notes_with_verification
 
             gh release create "$tag" \
               --repo "$GITHUB_REPOSITORY" \
@@ -161,5 +228,6 @@ jobs:
               --prerelease \
               --latest=false \
               --notes-file "$notes_file" \
-              android/app/build/outputs/apk/release/*.apk
+              android/app/build/outputs/apk/release/*.apk \
+              "${{ steps.apk.outputs.checksum }}"
           fi
diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml
index 8382bb73b5d0..8835c6876b3d 100644
--- a/.github/workflows/mobile.yml
+++ b/.github/workflows/mobile.yml
@@ -8,6 +8,11 @@ on:
       - reopened
     paths:
       - 'mobile/**'
+      # Why all of src/shared: mobile imports hundreds of its modules, directly and through the RPC
+      # recordings and the host params check, so any shared edit can move a golden or break mobile's
+      # typecheck. Why the root lockfile: those modules resolve their packages from the root install.
+      - 'src/shared/**'
+      - 'pnpm-lock.yaml'
       # Mobile launch contracts exercise the real host dispatcher and durable receipt store.
       - 'src/main/agent-launch/**'
       - 'src/main/runtime/rpc/**'
@@ -17,50 +22,48 @@ on:
       - 'src/main/runtime/orca-runtime.ts'
       - 'src/main/runtime/agent-session-*.ts'
       - 'src/main/native-chat/agent-session-wire/**'
-      - 'src/shared/agent-launch-*.ts'
-      - 'src/shared/agent-session-*.ts'
-      - 'src/shared/new-workspace/worktree-create-collision.ts'
-      # Why: the mobile terminal link parsers are conformance-tested against
-      # these shared fixtures; desktop-side fixture edits must re-run this suite.
-      - 'src/shared/terminal-file-link-conformance.ts'
-      # Why: mobile imports the negotiated capability names directly and records
-      # the whole capability read verbatim in its goldens, so a capability added
-      # desktop-side rewrites a mobile fixture and must re-run this suite.
-      - 'src/shared/protocol-version.ts'
-      # Why: mobile's rpc-params-contract.ts is a type-only re-export of the
-      # generated params catalog, and mobile/tsconfig.json includes **/*.ts. A
-      # schema edit anywhere under here changes mobile's types, so a desktop-only
-      # change can break mobile's typecheck with no other mobile signal.
-      - 'src/shared/rpc-contract/**'
       # Why: this job holds the only checks that load the Fastfile, so edits to
       # it or to the release workflow it guards must re-run them.
       - '.github/workflows/mobile.yml'
       - '.github/actions/install-node-dependencies/**'
       - '.github/workflows/mobile-ios-release.yml'
       - 'config/scripts/mobile-release-check-scope*'
+      - 'config/scripts/mobile-test-change-scope*'
       - 'config/scripts/pr-code-change-scope.mjs'
-      - 'config/scripts/mobile-recording-pin-checkout.test.mjs'
-  # Why main too: a behaviour-change branch legitimately pins its own last fenced commit, and that
-  # commit only stops being reachable when the branch squash-merges. The pull_request run cannot
-  # see that; this one is where the pin guard finds it.
+  # Why main too: two pull requests can each pass against their own base and disagree once both
+  # land, and `verify` never runs on main. The same source paths as above, less the CI inputs only
+  # `verify` reads.
   push:
     branches:
       - main
     paths:
       - 'mobile/**'
+      - 'src/shared/**'
+      - 'pnpm-lock.yaml'
+      - 'src/main/agent-launch/**'
+      - 'src/main/runtime/rpc/**'
+      - 'src/main/runtime/runtime-rpc/**'
+      - 'src/main/runtime/runtime-rpc.ts'
+      - 'src/main/runtime/device-registry.ts'
+      - 'src/main/runtime/orca-runtime.ts'
+      - 'src/main/runtime/agent-session-*.ts'
+      - 'src/main/native-chat/agent-session-wire/**'
       - '.github/workflows/mobile.yml'
 
 concurrency:
   # Per commit on main, not per branch. GitHub cancels any PENDING run in a group when a new one
   # queues, whatever `cancel-in-progress` says, so one shared main group drops the middle merge of
-  # three -- and a pin that breaks there is exactly what this workflow now checks for.
+  # three -- and a merge that breaks main there is exactly what `main-tests` checks for.
   group: mobile-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
 jobs:
   verify:
     if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
+    # Why ARM: 209s of this job is Vitest and nothing here needs x86: no Android SDK, emulator, gradle,
+    # Hermes or Watchman, no docker, and no artifacts. The Gemfile.lock lists the generic `ruby`
+    # platform, so frozen bundler installs without an aarch64-linux entry.
+    runs-on: ubuntu-24.04-arm
 
     env:
       # Why: an unfrozen bundler silently re-resolves when Gemfile.lock drifts
@@ -110,7 +113,10 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
+      # Both compilers are read-only; finish them before starting the test workers.
       - name: Typecheck
+        id: production-types
+        background: true
         run: pnpm typecheck
 
       # Why a ratchet and not the raw typecheck: mobile/tsconfig.json excludes test files, so until
@@ -120,15 +126,39 @@ jobs:
       - name: Typecheck tests (ratchet)
         run: pnpm run check:tests-typecheck
 
+      - wait: production-types
+
       # This includes the bridged replay of the whole recording corpus, which used to be a second
       # step of its own behind RPC_FOUNDATION_BRIDGE=1. A gate nobody can forget to set is the point:
       # it fails when a divergence class grows, when a divergence lands in no class at all, or when
       # one of the 103 goldens inside the C1 page closure changes the verdict it is pinned to. It is
       # ~3 min of test time on its own, and Vitest runs it on a worker beside the rest of the suite,
       # so folding it in costs a fraction of that in wall time and one step less to skip.
+      - name: Detect mobile test inputs
+        id: test-scope
+        shell: bash
+        working-directory: .
+        run: |
+          if ! git diff --name-only --no-renames -z HEAD^1 HEAD > "$RUNNER_TEMP/mobile-test-changes"; then
+            echo 'should_run=true' >> "$GITHUB_OUTPUT"
+          elif ! node config/scripts/mobile-test-change-scope.mjs "$RUNNER_TEMP/mobile-test-changes"; then
+            echo 'should_run=true' >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Test
+        if: steps.test-scope.outputs.should_run != 'false'
+        env:
+          ORCA_BACKGROUND_LAUNCH: '1'
         run: pnpm test
 
+      # Reports, never gates: the goldens are content-addressed JSON, so their raw diff is hashes.
+      # This decodes which recorded behaviour the pull request moves into the job summary, and runs
+      # after a red Test too, when a reviewer most wants it.
+      - name: Summarize RPC recording changes
+        if: ${{ !cancelled() }}
+        continue-on-error: true
+        run: pnpm run rpc:diff HEAD^1 --summary "$GITHUB_STEP_SUMMARY"
+
       - name: Test iOS release version resolution
         if: steps.ruby-scope.outputs.should_run != 'false'
         run: ruby fastlane/ios_release_version_test.rb
@@ -155,9 +185,11 @@ jobs:
       - name: Check formatting
         run: pnpm format:check
 
-  recording-pin:
-    name: RPC recording pin
-    runs-on: ubuntu-latest
+  main-tests:
+    name: Mobile tests on main
+    if: github.event_name == 'push'
+    # Why ARM: the same pure-Node Vitest run `verify` makes on a pull request.
+    runs-on: ubuntu-24.04-arm
 
     defaults:
       run:
@@ -167,13 +199,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
         with:
-          # The ancestry verdict is read straight off history. On a shallow checkout
-          # `git merge-base --is-ancestor` answers from grafted parents, so the guard refuses to
-          # answer at all rather than reporting a pass it has no evidence for -- and the pinned tree
-          # below has to be checkable out.
-          fetch-depth: 0
-          # Ancestry needs commits; the pinned worktree fetches its historical blobs on demand.
-          filter: blob:none
+          persist-credentials: false
 
       - uses: ./.github/actions/install-node-dependencies
         with:
@@ -184,28 +210,10 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
-      # Seconds. No `--ref`, so the pin is judged against the same tree it was read out of. On a
-      # pull request that is the merge preview, which already carries main's repins; judging the
-      # branch head instead fails every branch cut before the day's repin, and its instruction would
-      # tell the author to pin their own head -- creating the break this guard exists to catch. A
-      # branch that pins its own commit passes here and fails on the push after the squash, which is
-      # where the pin actually leaves the history.
-      - name: Check the recording pin is reachable
-        shell: bash
-        run: pnpm exec tsx scripts/rpc-recording-pin-guard.mts ancestry
-
-      # ~2 min locally for the record itself, so it is gated rather than run twice over. A pull
-      # request that moves none of the corpus, the manifest or the recorder cannot move this
-      # verdict away from the one the base commit already published, and `verify` replays the
-      # corpus against the branch tree in the meantime. A push to main has no `verify` job and is
-      # where a squash lands a spliced corpus, so there it always runs.
-      - name: Reproduce the corpus from the pinned tree
-        shell: bash
+      # The whole suite, not only the recordings: the mutant and page-bridge suites read the goldens
+      # too. A red run here names each golden and the `rpc:record` command; the author of the merge
+      # that turned it red re-records in a follow-up.
+      - name: Test
         env:
-          PIN_GUARD_BASE: ${{ github.event.pull_request.base.sha }}
-        run: |
-          if [ -n "$PIN_GUARD_BASE" ]; then
-            pnpm exec tsx scripts/rpc-recording-pin-guard.mts reproduce --if-changed-since "$PIN_GUARD_BASE"
-          else
-            pnpm exec tsx scripts/rpc-recording-pin-guard.mts reproduce
-          fi
+          ORCA_BACKGROUND_LAUNCH: '1'
+        run: pnpm test
diff --git a/.github/workflows/node-next-compat.yml b/.github/workflows/node-next-compat.yml
index 43556c864dc1..fc9b9cedaf92 100644
--- a/.github/workflows/node-next-compat.yml
+++ b/.github/workflows/node-next-compat.yml
@@ -1,8 +1,8 @@
-name: Node next compatibility
+name: Scheduled x86 unit compatibility
 
 on:
   schedule:
-    # Full future-runtime coverage is useful, but not worth doubling every PR matrix.
+    # Keep current and future Node coverage on x86 while PR unit shards use ARM.
     - cron: '0 10 * * *'
   workflow_dispatch:
 
@@ -14,9 +14,13 @@ permissions:
   contents: read
 
 jobs:
-  # A cold cache would otherwise make all eight Node 26 shards compile the same native addons.
+  # Prime each Node ABI before its shards restore native modules.
   test_native_cache:
-    name: prepare test native cache node 26
+    name: prepare test native cache node ${{ matrix.node }}
+    strategy:
+      fail-fast: false
+      matrix:
+        node: ['24', '26']
     runs-on: ubuntu-latest
 
     steps:
@@ -28,10 +32,14 @@ jobs:
       - uses: ./.github/actions/install-node-dependencies
         with:
           native-runtime: node
-          node-version: '26'
+          node-version: ${{ matrix.node }}
+
+  unit_plan:
+    uses: ./.github/workflows/unit-plan.yml
 
   test:
-    needs: [test_native_cache]
+    needs: [test_native_cache, unit_plan]
     uses: ./.github/workflows/unit-tests.yml
     with:
-      node_versions: '["26"]'
+      node_versions: '["24", "26"]'
+      shards: ${{ needs.unit_plan.outputs.shards }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index d2dd482858ef..d4dd5f82bacb 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -1,5 +1,5 @@
 name: PR Checks
-run-name: 'PR ${{ github.event.pull_request.number }} | source ${{ github.sha }} | workflow ${{ github.workflow_sha }}'
+run-name: "PR ${{ github.event.pull_request.number }} | source ${{ github.sha }} | workflow ${{ github.workflow_sha }} | unit ${{ github.event.pull_request.draft && vars.ORCA_UNIT_SELECTION_MODE == 'selected' && 'selected' || 'full' }}"
 
 on:
   pull_request:
@@ -58,12 +58,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
         with:
-          # Why blob:none: full history is needed for the merge-base diff, but historical
-          # file contents are not. Blobs are ~89% of this repo's pack, and Git fetches the
-          # few this job actually reads on demand.
-          fetch-depth: 0
+          # Why depth 50 and not 0: every diff below resolves to HEAD^1, so only the merge commit
+          # and a little slack are needed. Fetching all 8127 refs' commit graph cost ~20s here and
+          # is charged to the start of all 22 jobs, since they all need this one.
+          # Why blob:none stays: the sparse tree below is ~7 files, so there are no blobs to
+          # materialize and no promisor refetch. Measured 9.5s -> 1.6s against 20.7s today.
+          fetch-depth: 50
           filter: blob:none
           sparse-checkout: |
+            /config/scripts/git-pull-request-diff-base.mjs
             /package.json
             /README.md
             /docs/readme/
@@ -78,8 +81,9 @@ jobs:
       - name: Reject new root-level files and folders
         env:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
-          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-        run: node .github/scripts/check-root-directory-entries.mjs "$BASE_SHA" "$HEAD_SHA"
+        run: |
+          DIFF_BASE="$(node config/scripts/git-pull-request-diff-base.mjs "$BASE_SHA")"
+          node .github/scripts/check-root-directory-entries.mjs "$DIFF_BASE" HEAD
 
       # The full Git index retains link targets outside the sparse working tree.
       - name: Check README local links
@@ -98,12 +102,15 @@ jobs:
         id: filter
         env:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
-          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
         run: |
           set -euo pipefail
+          # Why HEAD^1 and not --merge-base: HEAD is the pull request merge commit, so its first
+          # parent is the base side already. Computing a merge base instead would require the
+          # payload base SHA to be in the graph, which is what forced a full-history checkout.
+          DIFF_BASE="$(node config/scripts/git-pull-request-diff-base.mjs "$BASE_SHA")"
           # Why --no-renames: name-only rename detection can report only the destination.
           # A code file moved under docs/ must still expose its code-side deletion.
-          git diff --name-only --no-renames --diff-filter=ACDMR --merge-base "$BASE_SHA" "$HEAD_SHA" \
+          git diff --name-only --no-renames --diff-filter=ACDMR "$DIFF_BASE" HEAD \
             > "$RUNNER_TEMP/changed-paths.txt"
           echo "Changed paths:"
           cat "$RUNNER_TEMP/changed-paths.txt"
@@ -122,9 +129,9 @@ jobs:
         run: |
           set -euo pipefail
           BASE="${{ github.event.pull_request.base.sha }}"
-          HEAD="${{ github.event.pull_request.head.sha }}"
+          DIFF_BASE="$(node config/scripts/git-pull-request-diff-base.mjs "$BASE")"
           # Use a file here too so sync-sized diffs cannot exhaust Node's stdin pipe buffer.
-          git diff --name-only --diff-filter=AMCR --merge-base "$BASE" "$HEAD" \
+          git diff --name-only --diff-filter=AMCR "$DIFF_BASE" HEAD \
             > "$RUNNER_TEMP/e2e-changed-paths.txt"
           # Source routes are executable contracts so a test can prove exact
           # authorities, exclusions, and sentinels without evaluating workflow shell.
@@ -157,38 +164,63 @@ jobs:
     name: static analysis
     needs: [code_paths]
     if: needs.code_paths.outputs.static_analysis == 'true'
-    runs-on: ubuntu-latest
+    # Why ARM: measured 128s against 172s on ubuntu-latest, with every compute step faster --
+    # type-aware 24s->15s, anti-slop 28->19s, localization extraction 67->46s, the orcad smoke
+    # 39->14s. Both lint engines ship linux-arm64 and the Bun target follows process.arch, so
+    # the whole toolchain resolves. Free for public repositories, same as the typecheck job.
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - name: Checkout
         uses: actions/checkout@v6
         with:
-          # Why blob:none: full history is needed for the merge-base diff, but historical
-          # file contents are not. Blobs are ~89% of this repo's pack, and Git fetches the
-          # few this job actually reads on demand.
-          fetch-depth: 0
-          filter: blob:none
+          # Why depth 50: the gates below diff against HEAD^1, so no merge base is computed and
+          # the payload base SHA need not be in the graph.
+          # Why no blob:none here, unlike code_paths: this job checks out all 30,226 files, and
+          # the filter then forces a second promisor fetch of nearly every blob. Measured 23s
+          # blobless against ~11s without it.
+          fetch-depth: 50
           persist-credentials: false
 
+      # Why two guarded installs: the mixed root+mobile store entry is 537 MB against
+      # 321 MB for root alone, and restoring it costs 8.6s against 4.6s. Most PRs skip the
+      # mobile install below, so they were paying 216 MB for packages they never link. The
+      # root-only key is also the one the hourly warmer reseeds. Only one of these runs.
+      - uses: ./.github/actions/install-node-dependencies
+        if: needs.code_paths.outputs.mobile_dependencies != 'true'
+        with:
+          native-runtime: node
+
       - uses: ./.github/actions/install-node-dependencies
+        if: needs.code_paths.outputs.mobile_dependencies == 'true'
         with:
           native-runtime: node
           cache-dependency-path: |
             pnpm-lock.yaml
             mobile/pnpm-lock.yaml
 
+      # Keep each check in its own log while sharing this runner.
       - name: Lint
+        id: root-lint
+        background: true
         run: pnpm exec oxlint --format github
 
       - name: Reject low-evidence patterns
         run: pnpm run audit:anti-slop
 
+      - wait: root-lint
+
       - name: Enforce focused code-quality plugins
+        id: native-code-quality
+        background: true
         run: pnpm run audit:code-quality:native
 
       - name: Enforce type-aware code-quality baseline
         run: pnpm run audit:code-quality:type-aware
 
+      # Mobile installation changes import resolution for the native cycle check.
+      - wait: native-code-quality
+
       # Why here: the changed-code gate lints mobile files too, and its type-aware pass
       # resolves types from mobile/node_modules. Without the install every mobile type
       # degrades to an `error` type — reported as phantom findings against the changed lines.
@@ -196,6 +228,7 @@ jobs:
         if: needs.code_paths.outputs.mobile_dependencies == 'true'
 
       - name: Enforce changed-code quality
+        id: changed-code-quality
         if: fromJSON(needs.code_paths.outputs.changed_count) <= 500
         run: pnpm run check:code-quality:changed -- "${{ github.event.pull_request.base.sha }}"
 
@@ -220,9 +253,9 @@ jobs:
       - name: Check VM runtime rollback compatibility
         env:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
-          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
         run: |
-          if git diff --quiet --merge-base "$BASE_SHA" "$HEAD_SHA" -- \
+          DIFF_BASE="$(node config/scripts/git-pull-request-diff-base.mjs "$BASE_SHA")"
+          if git diff --quiet "$DIFF_BASE" HEAD -- \
             src/shared/ephemeral-vm-runtime-store.ts \
             src/shared/ephemeral-vm-runtime-feature-store.ts \
             src/shared/ephemeral-vm-runtime-rollback-projection.ts \
@@ -253,11 +286,39 @@ jobs:
       - name: Enforce runtime Electron-import ratchet
         run: pnpm run check:runtime-electron-ratchet
 
+      # Why: extraction writes sorted evidence to an isolated temporary path,
+      # so feature PRs need one normalized AST pass rather than a three-OS matrix.
+      - name: Verify localization extraction
+        id: localization-extraction
+        background: true
+        env:
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+        run: |
+          # Detection failures run the full check; renames retain the removed input path.
+          DIFF_BASE="$(node config/scripts/git-pull-request-diff-base.mjs "$BASE_SHA")"
+          if git diff --name-only --no-renames -z "$DIFF_BASE" HEAD > "$RUNNER_TEMP/localization-changes" &&
+            scope="$(node config/scripts/localization-extraction-change-scope.mjs "$RUNNER_TEMP/localization-changes")" && [ "$scope" = false ]; then
+            echo "Localization extraction inputs are unchanged."
+          else
+            pnpm run verify:localization-extraction
+          fi
+
       # Why both: the ratchet proves nothing reachable from the runtime imports electron,
       # which is a property of the import graph. This proves the Node artifact it enables
       # actually boots, pairs, creates a worktree and round-trips a real PTY.
       - name: Boot orcad and round-trip a terminal
-        run: pnpm run smoke:orcad-terminal
+        env:
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+          ORCA_BACKGROUND_LAUNCH: '1'
+        run: |
+          # Detection failures run the smoke; renames retain the removed input path.
+          DIFF_BASE="$(node config/scripts/git-pull-request-diff-base.mjs "$BASE_SHA")"
+          if git diff --name-only --no-renames -z "$DIFF_BASE" HEAD > "$RUNNER_TEMP/orcad-smoke-changes" &&
+            scope="$(node config/scripts/orcad-terminal-smoke-change-scope.mjs "$RUNNER_TEMP/orcad-smoke-changes")" && [ "$scope" = false ]; then
+            echo "Orcad terminal smoke inputs are unchanged."
+          else
+            pnpm run smoke:orcad-terminal
+          fi
 
       - name: Verify the generated RPC params catalog
         run: pnpm run verify:rpc-params-catalog
@@ -268,23 +329,16 @@ jobs:
       - name: Verify skill freshness manifest
         run: pnpm run verify:skill-bundle-manifest
 
-      - name: Verify localization catalog
-        run: pnpm run verify:localization-catalog
-
-      # Why: the renderer ships only the English entries i18next cannot rebuild
-      # from each call site's inline default, so the generated subset has to
-      # track en.json and those defaults.
-      - name: Verify runtime-required localization catalog
-        run: pnpm run verify:localization-runtime-catalog
-
-      # Why: extraction writes sorted evidence to an isolated temporary path,
-      # so feature PRs need one normalized AST pass rather than a three-OS matrix.
-      - name: Verify localization extraction
-        run: pnpm run verify:localization-extraction
+      - name: Verify localization catalogs
+        id: localization-catalogs
+        background: true
+        run: pnpm run verify:localization-catalogs
 
       - name: Verify localization coverage
         run: pnpm run verify:localization-coverage
 
+      - wait: [localization-catalogs, localization-extraction]
+
       # Why: project-owned type declarations must live in .ts so tsc
       # actually checks them. TypeScript's skipLibCheck: true (inherited
       # from @electron-toolkit/tsconfig) silently widens unresolved names
@@ -420,9 +474,12 @@ jobs:
     name: Codex index-heal contract
     needs: [code_paths]
     if: needs.code_paths.outputs.codex_index_heal_contract == 'true'
-    runs-on: ubuntu-latest
+    # Why ARM: @openai/codex ships @openai/codex-linux-arm64.
+    runs-on: ubuntu-24.04-arm
     env:
       CODEX_CLI_VERSION: '0.150.1'
+      # Why a second pin: --no-daemon only exists from 0.156, and Orca's codex wrapper relies on it.
+      CODEX_NO_DAEMON_CLI_VERSION: '0.158.0'
 
     steps:
       - name: Checkout
@@ -451,11 +508,42 @@ jobs:
             pnpm exec vitest run --config config/vitest.config.ts \
             src/main/codex/codex-index-heal-binary-contract.test.ts
 
+      - name: Install pinned no-daemon Codex CLI
+        run: |
+          set -euo pipefail
+          npm install --no-audit --no-fund --prefix "$RUNNER_TEMP/codex-cli-no-daemon" \
+            "@openai/codex@$CODEX_NO_DAEMON_CLI_VERSION"
+
+      - name: Verify Codex --no-daemon contract
+        env:
+          ORCA_CODEX_NO_DAEMON_CONTRACT_REQUIRED: '1'
+          ORCA_CODEX_NO_DAEMON_CONTRACT_VERSION: ${{ env.CODEX_NO_DAEMON_CLI_VERSION }}
+        run: |
+          set -euo pipefail
+          ORCA_CODEX_NO_DAEMON_CONTRACT_BINARY="$RUNNER_TEMP/codex-cli-no-daemon/node_modules/.bin/codex" \
+            pnpm exec vitest run --config config/vitest.config.ts \
+            src/main/pty/codex-no-daemon-binary-contract.test.ts
+
+      # Why the no-daemon install: it is the newest pinned Codex, and its project
+      # lookup decides whether a worktree launch stops at the trust prompt.
+      - name: Verify Codex project-trust contract
+        env:
+          ORCA_CODEX_TRUST_CONTRACT_REQUIRED: '1'
+          ORCA_CODEX_TRUST_CONTRACT_VERSION: ${{ env.CODEX_NO_DAEMON_CLI_VERSION }}
+        run: |
+          set -euo pipefail
+          ORCA_CODEX_TRUST_CONTRACT_BINARY="$RUNNER_TEMP/codex-cli-no-daemon/node_modules/.bin/codex" \
+            pnpm exec vitest run --config config/vitest.config.ts \
+            src/main/agent-trust-presets.test.ts
+
   xterm_patch_sync:
     name: xterm patch sync
     needs: [code_paths]
     if: needs.code_paths.outputs.xterm_patch_sync == 'true'
-    runs-on: ubuntu-latest
+    # Why ARM: the patch check rebuilds 4 packages x 2 builds and byte-compares against the
+    # checked-in bundles. Those were generated on Linux x64 and reproduce byte-for-byte on
+    # darwin-arm64, so the output is neither host-arch nor host-OS dependent.
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - name: Checkout
@@ -463,21 +551,14 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ./.github/actions/install-node-dependencies
-
-      # Why: the check rebuilds every package in the manifest from a pinned upstream
-      # commit — @xterm/xterm and its three addons, each built twice (once unmodified to
-      # prove the toolchain still reproduces the published bundles, once patched). Caching
-      # the npm metadata and the shallow clone keeps the repeated cost to the builds
-      # themselves; the key is the manifest, so a commit, package or toolchain bump
-      # invalidates it.
-      - name: Restore upstream xterm build inputs
-        uses: actions/cache@v5
+      # The generator uses Node built-ins and installs its own upstream toolchain.
+      - uses: actions/setup-node@v6
         with:
-          path: |
-            ~/.npm
-            ${{ runner.temp }}/xterm-patch-build/upstream/.git
-          key: xterm-upstream-${{ hashFiles('config/patches/xterm-upstream.json') }}
+          node-version-file: package.json
+          package-manager-cache: false
+
+      # Rebuild both pristine and patched bundles; reuse only the pinned toolchain.
+      - uses: ./.github/actions/prepare-xterm-dependencies
 
       - name: Verify xterm patches match the pinned upstream build
         env:
@@ -488,7 +569,8 @@ jobs:
     name: shell contracts
     needs: [code_paths]
     if: needs.code_paths.outputs.shell_contracts == 'true'
-    runs-on: ubuntu-latest
+    # Why ARM: fish 4.x is published for noble/arm64 and zsh is in the arm64 archive.
+    runs-on: ubuntu-24.04-arm
     # Why: this job's cost is almost entirely package download, and a stalled mirror has
     # no wall-clock bound of its own. A successful run finishes in ~4.5 minutes, so this
     # is generous; it exists so a wedge fails the job instead of holding the whole run
@@ -500,6 +582,8 @@ jobs:
       # and its fish lane is the only end-to-end guard for #9993, so a skip would
       # report green with nothing exercised. Turns those skips into failures.
       ORCA_REQUIRE_FISH: '1'
+      # Why: the runner image ships pwsh, and the codex wrapper's PowerShell lane must not skip.
+      ORCA_REQUIRE_PWSH: '1'
 
     steps:
       - name: Checkout
@@ -514,6 +598,8 @@ jobs:
       # fish-color-scheme-child-stdin.node-pty.test.ts (#9993) needs it. Noble ships
       # 3.7, so the PPA is what makes that lane real.
       - name: Install zsh and fish
+        id: shells
+        background: true
         run: |
           # Why the update/PPA/fish steps are tolerant: a repo the runner image already
           # ships can lack a Release file for this suite, and a failed add-apt-repository
@@ -562,6 +648,12 @@ jobs:
           # first install command in this step to prove the lane really installs them.
           timeout 300 sudo apt-get install -y zsh fish
 
+      - uses: ./.github/actions/install-node-dependencies
+        with:
+          native-runtime: node
+
+      - wait: shells
+
       # Separate from the install so the failure names the contract, not an apt error.
       # ORCA_REQUIRE_FISH re-checks this at test time; this step just fails in seconds
       # instead of after a full dependency install.
@@ -577,10 +669,6 @@ jobs:
             exit 1
           fi
 
-      - uses: ./.github/actions/install-node-dependencies
-        with:
-          native-runtime: node
-
       - name: Test real shell contracts
         run: |
           pnpm exec vitest run --config config/vitest.config.ts --maxWorkers=1 \
@@ -590,6 +678,7 @@ jobs:
             src/main/providers/local-pty-shell-ready-zsh-launch-environment.test.ts \
             src/main/providers/__tests__/shell-ready-framework-example.test.ts \
             src/main/pty/codex-shell-launch-preflight.test.ts \
+            src/main/pty/codex-shell-no-daemon.test.ts \
             src/main/pty/omp-shell-wrapper-alias-safety.test.ts \
             src/main/pty/omp-shell-wrapper.node-pty.test.ts \
             src/main/shell-startup-feature-channel.test.ts \
@@ -597,6 +686,7 @@ jobs:
             src/main/zsh-scoped-histfile.live-shell.test.ts \
             src/main/zsh-startup-hook-user-config-equivalence.live-shell.test.ts \
             src/main/zsh-wrapper-version-mismatch.live-shell.test.ts \
+            src/main/runtime/structured-session-cli-login-shell.live-shell.test.ts \
             src/renderer/src/components/terminal-pane/fish-color-scheme-child-stdin.node-pty.test.ts \
             src/shared/fish-query-reply-child-stdin.node-pty.test.ts \
             src/shared/pty-reply-echo-shapes.node-pty.test.ts \
@@ -609,7 +699,7 @@ jobs:
     name: prepare test native cache node 24
     needs: [code_paths]
     if: needs.code_paths.outputs.native_cache_changed == 'true'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - name: Checkout
@@ -622,16 +712,40 @@ jobs:
           native-runtime: node
           node-version: '24'
 
+  # Why hoisted out of unit-tests.yml: a caller's `needs` gate the whole called workflow, so
+  # while planning lived in there it queued behind static analysis and typecheck and the shards
+  # then queued behind it. Planning needs none of their output, so running it against
+  # code_paths alone overlaps it with the gate. Measured a median 93s off the matrix's start.
+  unit_plan:
+    needs: [code_paths]
+    if: needs.code_paths.outputs.test == 'true'
+    uses: ./.github/workflows/unit-plan.yml
+    with:
+      selection_mode: ${{ vars.ORCA_UNIT_SELECTION_MODE || 'shadow' }}
+
   test:
-    needs: [code_paths, test_native_cache]
+    needs: [code_paths, unit_plan, test_native_cache, static_analysis, typecheck]
     # Honor cancellation while allowing the optional native-cache primer to skip.
     if: >-
       !cancelled() &&
       needs.code_paths.outputs.test == 'true' &&
+      needs.unit_plan.result == 'success' &&
+      needs.static_analysis.result == 'success' &&
+      needs.typecheck.result == 'success' &&
       (needs.test_native_cache.result == 'success' || needs.test_native_cache.result == 'skipped')
     uses: ./.github/workflows/unit-tests.yml
     with:
       node_versions: '["24"]'
+      runner: ubuntu-24.04-arm
+      shards: ${{ needs.unit_plan.outputs.shards }}
+
+  # Why a sibling and not part of the test workflow: it is advisory, so it must not delay the
+  # gate. Inside unit-tests.yml a caller's `needs: test` waited for it, holding verify ~36s
+  # after the last shard. Deliberately absent from verify's needs for the same reason.
+  unit_selection_evidence:
+    needs: [test]
+    if: ${{ !cancelled() && needs.test.result == 'success' }}
+    uses: ./.github/workflows/unit-selection-evidence.yml
 
   # Why a separate job: the test needs a real Chrome, and the sharded `test` matrix
   # would pay for it on every shard to run one file in whichever shard it landed in.
@@ -695,9 +809,22 @@ jobs:
             pnpm-lock.yaml
             mobile/pnpm-lock.yaml
 
+      # The drawer check runs on WebKit as well as Chrome, because the shell's iOS WebView is
+      # WebKit and the Chrome above cannot stand in for it. Downloaded rather than resolved from
+      # the runner: Ubuntu ships no WebKit build to point at.
+      - name: Install WebKit for the drawer check
+        id: webkit
+        background: true
+        run: pnpm exec playwright install --with-deps webkit
+
       # The entry lives in mobile/ so one React resolves; without this every RN import is nothing.
       - uses: ./.github/actions/install-mobile-dependencies
 
+      - name: Prepare mobile route snapshot
+        id: mobile-routes
+        background: true
+        run: node config/scripts/run-mobile-web-app-checks.mjs --prepare-route-snapshot "$RUNNER_TEMP/mobile-routes.json"
+
       # Why the runner's Google Chrome and not a downloaded chromium: same reason as the orcad
       # browser job -- Ubuntu 24.04 only ships an AppArmor userns profile for the Chrome .deb.
       # Why fail instead of skip: a silently skipped render check is the failure this job exists
@@ -713,15 +840,12 @@ jobs:
           "$chrome" --version
           echo "ORCA_MOBILE_WEB_RENDER_BROWSER=$chrome" >> "$GITHUB_ENV"
 
-      # The drawer check runs on WebKit as well as Chrome, because the shell's iOS WebView is
-      # WebKit and the Chrome above cannot stand in for it. Downloaded rather than resolved from
-      # the runner: Ubuntu ships no WebKit build to point at.
-      - name: Install WebKit for the drawer check
-        run: pnpm exec playwright install --with-deps webkit
-
       - name: Build and verify the app bundle
         run: pnpm run build:mobile-web
 
+      # Browser checks must observe both a finished install and the built bundle.
+      - wait: [webkit, mobile-routes]
+
       # The bundling tests skip themselves where mobile dependencies are absent, which is how they
       # stay green in the sharded `test` job. This is the job that installs them, so here a missing
       # install has to fail rather than skip everything the job exists to run.
@@ -731,23 +855,20 @@ jobs:
       # one `pr-code-change-scope.mjs` fires this job on, so naming a test into the family is all
       # it takes to have it run. Quoted because these are vitest filename filters, matched as
       # substrings against the discovered files, and the shell must not touch them.
-      #
-      # Cost: 18 files in 25-30s wall, of which the frame-budget sweep is 2.5s. That sweep encodes
-      # 111 noise JPEGs in Chromium, so it is the one step here whose cost grows with its viewport
-      # set; adding rows to that set is a decision about this job's runtime.
+      # Route censuses share fresh dependency lists for this invocation; scratch builds stay independent.
       - name: Builder, override census and render checks
         env:
           ORCA_MOBILE_WEB_APP_DEPS_REQUIRED: '1'
+          ORCA_MOBILE_WEB_PREPARED_ROUTE_SNAPSHOT: ${{ runner.temp }}/mobile-routes.json
         run: |
-          pnpm exec vitest run --config config/vitest.config.ts \
-            'config/scripts/mobile-web-app-' \
-            'config/scripts/build-mobile-web-app-bundle.test.mjs'
+          node config/scripts/run-mobile-web-app-checks.mjs
 
   cross-version-wire:
     name: cross-version wire compatibility
     needs: [code_paths]
     if: needs.code_paths.outputs.cross-version-wire == 'true'
-    runs-on: ubuntu-latest
+    # Why ARM: source-only: tagged checkout plus in-process vitest, no docker or browser.
+    runs-on: ubuntu-24.04-arm
 
     steps:
       # Why fetch-depth 0: the harness extracts the newest release tag to skew
@@ -784,13 +905,17 @@ jobs:
           tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
           tests/e2e/cross-version-wire/cross-version-worktree-identity-downgrade.unit.test.ts
           tests/e2e/cross-version-wire/cross-version-session-tabs-retirement-proof.unit.test.ts
+          tests/e2e/cross-version-wire/agent-session-death-evidence-downgrade.unit.test.ts
+          tests/e2e/cross-version-wire/agent-session-resume-marker-downgrade.unit.test.ts
           tests/e2e/cross-version-wire/agent-session-unproven-release-downgrade.unit.test.ts
+          tests/e2e/cross-version-wire/cross-version-worktree-ps-verdict.unit.test.ts
 
   managed_hook_node18:
     name: managed hooks on Node 18
     needs: [code_paths]
     if: needs.code_paths.outputs.managed_hook_node18 == 'true'
-    runs-on: ubuntu-latest
+    # Why ARM: Node 18 publishes linux-arm64; the per-platform runtime files are read as data.
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - name: Checkout
@@ -813,7 +938,7 @@ jobs:
 
   package:
     name: package
-    needs: [code_paths]
+    needs: [code_paths, static_analysis, typecheck]
     if: needs.code_paths.outputs.package == 'true'
     runs-on: ubuntu-latest
     # Let the serial Docker gates reach their own deadlines and report cleanup failures.
@@ -826,7 +951,7 @@ jobs:
           persist-credentials: false
 
       - name: Cache electron-builder downloads
-        uses: actions/cache@v5
+        uses: actions/cache/restore@v5
         with:
           path: ~/.cache/electron-builder
           key: electron-builder-linux-${{ hashFiles('pnpm-lock.yaml') }}
@@ -863,6 +988,24 @@ jobs:
           src/main/browser/browser-route-h3-egress.electron.test.ts
           src/main/browser/browser-route-dns-prefetch.electron.test.ts
 
+      # Restore independent fixtures during builds; keep native lifecycle probes serial.
+      - uses: ./.github/actions/prepare-linux-package-fixture
+        id: shutdown-fixture-cache
+        background: true
+        with:
+          fixture: headless-serve-shutdown
+
+      - uses: ./.github/actions/prepare-linux-package-fixture
+        id: cli-fixture-cache
+        background: true
+        with:
+          fixture: cli-launch-contract
+
+      - name: Install Linux package tooling
+        id: linux-package-tools
+        background: true
+        run: sudo apt-get update && sudo apt-get install -y cpio rpm
+
       - name: Build package inputs
         run: |
           status=0
@@ -881,6 +1024,8 @@ jobs:
           exit "$status"
 
       - name: Project web client from renderer build
+        id: web-client
+        background: true
         run: pnpm run build:web-from-renderer
 
       # Why here and not inside "Build package inputs": this job assembles packaging inputs step by
@@ -892,17 +1037,16 @@ jobs:
       - name: Build native components
         run: pnpm run build:native
 
-      - name: Install Linux package tooling
-        run: sudo apt-get update && sudo apt-get install -y cpio rpm
+      - wait: [linux-package-tools, web-client]
 
       - name: Package unpacked app
         env:
+          ORCA_BACKGROUND_LAUNCH: '1'
           ORCA_REUSE_PREPARED_NATIVE_RUNTIME: '1'
-        # PR artifacts are only inspected locally; gzip avoids release-size xz compression.
-        run: >-
-          pnpm exec electron-builder --config config/electron-builder.config.cjs
-          --linux AppImage deb rpm --x64 --publish never
-          --config.deb.compression=gz --config.rpm.compression=gzip
+        # Prepare once with every hook, then isolate the format-specific mutations.
+        run: |
+          pnpm exec electron-builder --config config/electron-builder.config.cjs --linux dir --x64 --publish never
+          node config/scripts/package-linux-formats.mjs
 
       - name: Verify root-package marker payloads
         run: |
@@ -918,13 +1062,21 @@ jobs:
           [[ "$deb_marker" == deb ]] || { echo "Expected deb marker, got: $deb_marker"; exit 1; }
           [[ "$rpm_marker" == rpm ]] || { echo "Expected rpm marker, got: $rpm_marker"; exit 1; }
 
+      - wait: shutdown-fixture-cache
+
       - name: Verify headless serve signal shutdown
+        env:
+          ORCA_SHUTDOWN_FIXTURE_CACHE_IMAGE: ${{ steps.shutdown-fixture-cache.outputs.image }}
         run: >-
           node config/scripts/run-headless-serve-shutdown-docker.mjs
           --appimage dist/orca-linux.AppImage --all-entrypoints
 
       # A default container reproduces the hostile AppImage launch environment.
+      - wait: cli-fixture-cache
+
       - name: Verify Linux CLI launch contract
+        env:
+          ORCA_CLI_FIXTURE_CACHE_IMAGE: ${{ steps.cli-fixture-cache.outputs.image }}
         run: node config/scripts/run-linux-cli-launch-contract-docker.mjs --appimage dist/orca-linux.AppImage
 
       - name: Smoke packaged CLI
diff --git a/.github/workflows/pullfrog.yml b/.github/workflows/pullfrog.yml
index d5030252f88d..2fc81c887bba 100644
--- a/.github/workflows/pullfrog.yml
+++ b/.github/workflows/pullfrog.yml
@@ -1,6 +1,6 @@
-# PULLFROG ACTION — DO NOT EDIT EXCEPT WHERE INDICATED
+# Explicit review identities share workflow concurrency; legacy names use ordered cancellation.
 name: Pullfrog
-run-name: ${{ inputs.name || github.workflow }}
+run-name: ${{ inputs.name || github.workflow }}${{ inputs.pull_request_number && format(' | PR {0}', inputs.pull_request_number) || '' }}
 on:
   workflow_dispatch:
     inputs:
@@ -11,21 +11,71 @@ on:
         type: string
         description: Run name
 
+      pull_request_number:
+        type: string
+        description: Optional PR identity for cancelling superseded reviews
+      head_sha:
+        type: string
+        description: Optional expected PR head; stale reviews are skipped
+
 permissions:
   contents: read
+  pull-requests: read
+
+concurrency:
+  group: ${{ inputs.pull_request_number && format('pullfrog-pr-{0}', inputs.pull_request_number) || format('pullfrog-run-{0}', github.run_id) }}
+  cancel-in-progress: true
 
 jobs:
+  review_scope:
+    runs-on: ubuntu-slim
+    permissions:
+      contents: read
+      pull-requests: read
+      actions: write
+    outputs:
+      current: ${{ steps.scope.outputs.current }}
+      number: ${{ steps.scope.outputs.number }}
+      head: ${{ steps.scope.outputs.head }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          sparse-checkout: config/scripts/pullfrog-review-scope.cjs
+          sparse-checkout-cone-mode: false
+          persist-credentials: false
+      - uses: actions/github-script@v8
+        id: scope
+        with:
+          script: |
+            const { reviewScope } = require('./config/scripts/pullfrog-review-scope.cjs')
+            await reviewScope({ github, context, core })
+
   pullfrog:
+    needs: review_scope
+    if: needs.review_scope.outputs.current == 'true'
     runs-on: ubuntu-latest
     permissions:
       id-token: write
       contents: read
+      pull-requests: read
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
         with:
           fetch-depth: 1
+      - name: Recheck review head before starting agent
+        id: freshness
+        if: needs.review_scope.outputs.number != ''
+        uses: actions/github-script@v8
+        env:
+          REVIEW_NUMBER: ${{ needs.review_scope.outputs.number }}
+          REVIEW_HEAD: ${{ needs.review_scope.outputs.head }}
+        with:
+          script: |
+            const { data: pr } = await github.rest.pulls.get({ ...context.repo, pull_number: Number(process.env.REVIEW_NUMBER) })
+            core.setOutput('current', pr.state === 'open' && pr.head.sha === process.env.REVIEW_HEAD)
       - name: Run agent
+        if: needs.review_scope.outputs.number == '' || steps.freshness.outputs.current == 'true'
         uses: pullfrog/pullfrog@v0
         with:
           prompt: ${{ inputs.prompt }}
diff --git a/.github/workflows/release-cut.yml b/.github/workflows/release-cut.yml
index ad710f49921b..00e8948dd2ca 100644
--- a/.github/workflows/release-cut.yml
+++ b/.github/workflows/release-cut.yml
@@ -1306,6 +1306,20 @@ jobs:
           node config/scripts/build-windows-process-tree-relay-addon.mjs --arch=x64
           node config/scripts/build-windows-process-tree-relay-addon.mjs --arch=arm64
 
+      # Why an explicit step rather than trusting the runner image: the packaged
+      # CLI launcher is a native Rust binary, and a Windows host without cargo
+      # fails deep inside electron-builder's native hook instead of here. Real
+      # Windows dev machines do not have it by default either.
+      - name: Ensure the Rust toolchain for the Windows CLI launcher
+        if: matrix.platform == 'win'
+        shell: pwsh
+        run: |
+          if (-not (Get-Command cargo -ErrorAction SilentlyContinue)) {
+            rustup toolchain install stable --profile minimal
+            rustup default stable
+          }
+          cargo --version
+
       # Why ORCA_POSTHOG_WRITE_KEY here: this is the only build that
       # produces a published binary, so this is the only place the secret
       # needs to be in scope. The key is a PostHog *project* API key, not
@@ -1440,6 +1454,7 @@ jobs:
           }
 
       - name: Install SignPath PowerShell module
+        id: install-signpath
         if: matrix.platform == 'win' && github.run_attempt == 1
         uses: ./.github/actions/install-signpath-module
 
@@ -1450,18 +1465,14 @@ jobs:
       # existing installer signing request below. The NSIS uninstaller rides
       # this same request (it is the MDE update cluster: old-uninstaller.exe /
       # Uninstall Orca.exe), captured through electron-builder's sign hook and
-      # swapped back in during the rebuild — no third approval wait. Every step is
-      # fail-open (continue-on-error + outcome gating): any failure ships the
-      # original installer with unsigned inner binaries, exactly like releases
-      # did before this chain existed. Rehearsed end to end in run 28988432001
-      # (.github/workflows/windows-signing-rehearsal.yml).
+      # swapped back in during the rebuild — no third approval wait. Production
+      # releases require the entire signing chain to succeed (#23383).
 
       # Why: only unsigned PE files go to SignPath. Files that already carry a
       # valid signature (Microsoft's OpenConsole.exe) must keep their signer.
       - name: Stage unsigned inner PE files for signing
         id: stage-inner
         if: matrix.platform == 'win' && github.run_attempt == 1
-        continue-on-error: true
         shell: pwsh
         run: |
           $root = Resolve-Path 'dist/win-unpacked'
@@ -1503,34 +1514,18 @@ jobs:
           # out of inner-signing-list.txt: that list drives the copy-back into
           # dist/win-unpacked, and the uninstaller does not live there — it is
           # re-injected through the sign hook during the rebuild instead.
-          # Why this name and not "Uninstall Orca.exe": the restore loop below
-          # matches staged files by suffix (`-like "*$relative"`) and takes the
-          # first hit, so any staged path ending in "Orca.exe" is separated from
-          # the real Orca.exe only by Get-ChildItem's enumeration order. That
-          # order happens to favour the root file today, but it is not a
-          # documented guarantee; a name that cannot suffix-match is.
-          # Why the whole block is caught rather than just Test-Path'd: this
-          # step's outcome gates the upload of every inner binary, so a locked
-          # file or a full disk here would cost all of them their signatures -
-          # worse than shipping no uninstaller signature at all.
-          try {
-            $exportedUninstaller = Join-Path $env:RUNNER_TEMP 'uninstaller-signing\unsigned\orca-uninstaller.exe'
-            if (Test-Path -LiteralPath $exportedUninstaller) {
-              $uninstallerStagePath = Join-Path $stage.FullName 'uninstaller\orca-uninstaller.exe'
-              New-Item -ItemType Directory -Force -Path (Split-Path $uninstallerStagePath) -ErrorAction Stop | Out-Null
-              Copy-Item -LiteralPath $exportedUninstaller -Destination $uninstallerStagePath -Force -ErrorAction Stop
-              Write-Host 'Staged the NSIS uninstaller for signing: uninstaller\orca-uninstaller.exe'
-            } else {
-              Write-Host "::warning::No exported NSIS uninstaller at $exportedUninstaller; this release ships an unsigned uninstaller (fail-open)."
-            }
-          } catch {
-            Write-Host "::warning::Could not stage the NSIS uninstaller ($_); this release ships an unsigned uninstaller (fail-open)."
+          $exportedUninstaller = Join-Path $env:RUNNER_TEMP 'uninstaller-signing\unsigned\orca-uninstaller.exe'
+          if (-not (Test-Path -LiteralPath $exportedUninstaller)) {
+            throw "No exported NSIS uninstaller at $exportedUninstaller."
           }
+          $uninstallerStagePath = Join-Path $stage.FullName 'uninstaller\orca-uninstaller.exe'
+          New-Item -ItemType Directory -Force -Path (Split-Path $uninstallerStagePath) -ErrorAction Stop | Out-Null
+          Copy-Item -LiteralPath $exportedUninstaller -Destination $uninstallerStagePath -Force -ErrorAction Stop
+          Write-Host 'Staged the NSIS uninstaller for signing: uninstaller\orca-uninstaller.exe'
 
       - name: Upload unsigned inner binaries for SignPath
         id: upload-unsigned-inner
         if: matrix.platform == 'win' && github.run_attempt == 1 && steps.stage-inner.outcome == 'success'
-        continue-on-error: true
         uses: actions/upload-artifact@v7
         with:
           name: orca-windows-inner-unsigned-${{ needs.cut.outputs.tag }}
@@ -1540,7 +1535,6 @@ jobs:
       - name: Submit inner binaries signing request
         id: submit-inner-signing
         if: matrix.platform == 'win' && github.run_attempt == 1 && steps.upload-unsigned-inner.outcome == 'success'
-        continue-on-error: true
         uses: signpath/github-action-submit-signing-request@v2
         with:
           api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
@@ -1553,8 +1547,8 @@ jobs:
 
       - name: Notify Slack that inner-binary signing is waiting for approval
         id: notify-inner-signing
-        if: matrix.platform == 'win' && github.run_attempt == 1 && steps.submit-inner-signing.outcome == 'success'
         continue-on-error: true
+        if: matrix.platform == 'win' && github.run_attempt == 1 && steps.submit-inner-signing.outcome == 'success'
         shell: pwsh
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
@@ -1614,15 +1608,10 @@ jobs:
 
           Invoke-RestMethod -Method Post -Uri $env:SLACK_WEBHOOK_URL -ContentType 'application/json' -Body $payload
 
-      # Why gate on the notify outcome too: if nobody was told to approve,
-      # don't hold the release for the approval window — fall through and
-      # ship like today instead. The 1h wait (vs the installer's 4h) keeps
-      # both waits plus the build inside the 360-minute job cap; missing it
-      # falls through to today's unsigned-inner flow rather than blocking.
+      # Approval remains required even when the notification service is unavailable.
       - name: Download signed inner binaries from SignPath
         id: download-signed-inner
-        if: matrix.platform == 'win' && github.run_attempt == 1 && steps.submit-inner-signing.outcome == 'success' && steps.notify-inner-signing.outcome == 'success'
-        continue-on-error: true
+        if: matrix.platform == 'win' && github.run_attempt == 1 && steps.submit-inner-signing.outcome == 'success'
         shell: pwsh
         env:
           SIGNPATH_API_TOKEN: ${{ secrets.SIGNPATH_API_TOKEN }}
@@ -1640,27 +1629,31 @@ jobs:
           Expand-Archive -Path signed-inner.zip -DestinationPath signed-inner -Force
 
       # Why: copy back strictly by the staged list so a layout mismatch in the
-      # returned artifact fails loudly (into fail-open) instead of silently
+      # returned artifact fails before publication instead of silently
       # shipping a mix of signed and unsigned binaries.
       - name: Restore signed inner binaries into unpacked app
         id: restore-signed-inner
         if: matrix.platform == 'win' && github.run_attempt == 1 && steps.download-signed-inner.outcome == 'success'
-        continue-on-error: true
         shell: pwsh
+        env:
+          SIGNING_POLICY: release-signing
         run: |
+          $requireValid = $env:SIGNING_POLICY -ne 'test-signing'
           $root = Resolve-Path 'dist/win-unpacked'
           $failures = New-Object System.Collections.Generic.List[string]
           foreach ($relative in Get-Content 'inner-signing-list.txt') {
-            $signed = Get-ChildItem -Path signed-inner -Recurse -File |
-              Where-Object { [System.IO.Path]::GetRelativePath((Resolve-Path 'signed-inner'), $_.FullName).TrimStart('\', '/') -like "*$relative" } |
-              Select-Object -First 1
-            if ($null -eq $signed) {
-              $failures.Add("missing from signed artifact: $relative")
+            $candidates = @(
+              (Join-Path 'signed-inner' $relative),
+              (Join-Path 'signed-inner/signing-stage' $relative)
+            ) | Where-Object { Test-Path -LiteralPath $_ -PathType Leaf }
+            if (@($candidates).Count -ne 1) {
+              $failures.Add("missing or ambiguous signed artifact path: $relative")
               continue
             }
+            $signed = Get-Item -LiteralPath @($candidates)[0]
             $signature = Get-AuthenticodeSignature -FilePath $signed.FullName
-            if ($null -eq $signature.SignerCertificate) {
-              $failures.Add("returned without a signature: $relative")
+            if ($null -eq $signature.SignerCertificate -or ($requireValid -and ($signature.Status -ne 'Valid' -or $signature.SignerCertificate.Subject -notlike '*CN=SignPath Foundation*'))) {
+              $failures.Add("returned without a valid SignPath signature: $relative")
               continue
             }
             Copy-Item -Path $signed.FullName -Destination (Join-Path $root $relative) -Force
@@ -1671,25 +1664,26 @@ jobs:
             throw "Signed inner artifact did not round-trip cleanly ($($failures.Count) failures)."
           }
 
-      # Why gated separately from the inner restore above: if SignPath's
-      # windows-inner-binaries-zip artifact configuration does not (yet) cover the
-      # uninstaller/ directory, the uninstaller comes back missing. That must cost
-      # only the uninstaller signature — the rebuild below still runs and still
-      # ships the signed inner binaries, exactly as it does today.
+      # The uninstaller must return signed before rebuilding the installer.
       - name: Restore signed uninstaller for the installer rebuild
         id: restore-signed-uninstaller
         if: matrix.platform == 'win' && github.run_attempt == 1 && steps.restore-signed-inner.outcome == 'success'
-        continue-on-error: true
         shell: pwsh
+        env:
+          SIGNING_POLICY: release-signing
         run: |
-          $signed = Get-ChildItem -Path signed-inner -Recurse -File -Filter 'orca-uninstaller.exe' |
-            Select-Object -First 1
-          if ($null -eq $signed) {
-            throw 'SignPath did not return uninstaller/orca-uninstaller.exe; check the windows-inner-binaries-zip artifact configuration covers it.'
+          $requireValid = $env:SIGNING_POLICY -ne 'test-signing'
+          $candidates = @(
+            (Join-Path 'signed-inner' 'uninstaller\orca-uninstaller.exe'),
+            (Join-Path 'signed-inner/signing-stage' 'uninstaller\orca-uninstaller.exe')
+          ) | Where-Object { Test-Path -LiteralPath $_ -PathType Leaf }
+          if (@($candidates).Count -ne 1) {
+            throw 'Missing or ambiguous uninstaller/orca-uninstaller.exe in the signed artifact; check the windows-inner-binaries-zip configuration.'
           }
+          $signed = Get-Item -LiteralPath @($candidates)[0]
           $signature = Get-AuthenticodeSignature -FilePath $signed.FullName
-          if ($null -eq $signature.SignerCertificate) {
-            throw 'The returned NSIS uninstaller carries no signature.'
+          if ($null -eq $signature.SignerCertificate -or ($requireValid -and ($signature.Status -ne 'Valid' -or $signature.SignerCertificate.Subject -notlike '*CN=SignPath Foundation*'))) {
+            throw 'The returned NSIS uninstaller carries no valid SignPath signature.'
           }
           $signedDir = Join-Path $env:RUNNER_TEMP 'uninstaller-signing\signed'
           New-Item -ItemType Directory -Force -Path $signedDir | Out-Null
@@ -1714,13 +1708,11 @@ jobs:
       - name: Replace cached elevate.exe with the signed copy
         id: sign-elevate-cache
         if: matrix.platform == 'win' && github.run_attempt == 1 && steps.restore-signed-inner.outcome == 'success'
-        continue-on-error: true
         shell: pwsh
         run: |
           $signed = 'dist/win-unpacked/resources/elevate.exe'
           if (-not (Test-Path $signed)) {
-            Write-Host '::warning::No elevate.exe in win-unpacked resources; nothing to protect from the rebuild clobber.'
-            exit 0
+            throw 'No elevate.exe in win-unpacked resources.'
           }
           # Why this guard stays: windows-signing-rehearsal.yml shares the
           # electron-builder-win-<lockfile hash> cache key with this workflow, so a
@@ -1728,8 +1720,7 @@ jobs:
           $signature = Get-AuthenticodeSignature -FilePath $signed
           $subject = if ($null -eq $signature.SignerCertificate) { '<none>' } else { $signature.SignerCertificate.Subject }
           if ($signature.Status -ne 'Valid' -or $subject -notlike '*CN=SignPath Foundation*') {
-            Write-Host "::warning::win-unpacked elevate.exe is not SignPath-signed ($($signature.Status), $subject); skipping cache swap."
-            exit 0
+            throw "win-unpacked elevate.exe is not SignPath-signed ($($signature.Status), $subject)."
           }
           node config/scripts/replace-cached-nsis-elevate.mjs $signed
           if ($LASTEXITCODE -ne 0) {
@@ -1747,35 +1738,16 @@ jobs:
       - name: Rebuild NSIS installer from signed unpacked app
         id: rebuild-nsis-signed
         if: matrix.platform == 'win' && github.run_attempt == 1 && steps.restore-signed-inner.outcome == 'success'
-        continue-on-error: true
         shell: pwsh
         env:
-          # Why unconditional: the sign hook keys off the file existing, which it
-          # only does when the restore step above succeeded. A missing file logs a
-          # warning and embeds the freshly built unsigned uninstaller instead.
           ORCA_WIN_UNINSTALLER_SIGNED_PATH: ${{ runner.temp }}\uninstaller-signing\signed\orca-uninstaller.exe
         run: |
-          # Why: keep the pre-rebuild artifacts so a failed rebuild can fall
-          # back to shipping them unchanged (fail-open).
-          New-Item -ItemType Directory -Path prepack-backup -Force | Out-Null
-          Copy-Item 'dist/orca-windows-setup.exe' 'prepack-backup/orca-windows-setup.exe' -Force
-          Copy-Item 'dist/latest.yml' 'prepack-backup/latest.yml' -Force
-
           pnpm exec electron-builder --config config/electron-builder.config.cjs --win --publish never --prepackaged "$env:GITHUB_WORKSPACE\dist\win-unpacked"
           if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
           if (-not (Test-Path 'dist/orca-windows-setup.exe')) {
             throw 'electron-builder --prepackaged did not produce dist/orca-windows-setup.exe'
           }
 
-      - name: Roll back to original installer after failed rebuild
-        if: matrix.platform == 'win' && github.run_attempt == 1 && steps.rebuild-nsis-signed.outcome == 'failure'
-        shell: pwsh
-        run: |
-          if (Test-Path 'prepack-backup/orca-windows-setup.exe') {
-            Copy-Item 'prepack-backup/orca-windows-setup.exe' 'dist/orca-windows-setup.exe' -Force
-            Copy-Item 'prepack-backup/latest.yml' 'dist/latest.yml' -Force
-            Write-Warning 'Restored pre-rebuild installer; this release ships with unsigned inner binaries.'
-          }
       # ── End Windows inner-binary signing ───────────────────────────────
       - name: Upload unsigned Windows installer for SignPath
         if: matrix.platform == 'win' && github.run_attempt == 1
@@ -1829,7 +1801,7 @@ jobs:
             $requestUrl = "https://app.signpath.io/Web/$env:SIGNPATH_ORGANIZATION_ID/SigningRequests/$env:SIGNPATH_REQUEST_ID"
           }
 
-          # Why: releases where inner signing fell through have only this one request.
+          # Keep the two approval requests distinguishable in the notification.
           $stage = if ($env:INNER_SIGNING_SUBMITTED -eq 'true') { 'installer signing request (2 of 2)' } else { 'signing request' }
           # Why: approvers need tag + source ref/commit + who cut, not only the tag.
           $sourceRef = if (-not [string]::IsNullOrWhiteSpace($env:SOURCE_REF)) { $env:SOURCE_REF } else { 'unknown' }
@@ -1936,24 +1908,18 @@ jobs:
 
       # Why: evidence gate for inner-binary signing (issue #7785, supersedes
       # PR #7170's Orca.exe-only gate — this covers every staged .exe/.dll/.node
-      # by extracting the shipped installer). Warn-only until the flow has been
-      # proven on a real release, then flip ORCA_WINDOWS_INNER_SIGNATURE_REQUIRED
-      # to 'true' so unsigned inner binaries block the release.
+      # by extracting the shipped installer). Unsigned binaries block publication.
       - name: Verify Windows inner binary signatures
         if: matrix.platform == 'win' && github.run_attempt == 1
         shell: pwsh
         env:
-          ORCA_WINDOWS_INNER_SIGNATURE_REQUIRED: 'false'
+          ORCA_WINDOWS_INNER_SIGNATURE_REQUIRED: 'true'
           INNER_SIGNING_COMPLETED: ${{ steps.rebuild-nsis-signed.outcome == 'success' }}
           UNINSTALLER_SIGNING_COMPLETED: ${{ steps.restore-signed-uninstaller.outcome == 'success' }}
         run: |
           $required = $env:ORCA_WINDOWS_INNER_SIGNATURE_REQUIRED -eq 'true'
 
-          # Why: a fail-open gate that writes nothing is indistinguishable from a
-          # gate that passed. Always leave a verdict in the evidence artifact and
-          # the job summary so a silent degradation is visible (#6487).
-          # Why best-effort: while warn-only, a disk-full or permission error
-          # writing the verdict must not become the thing that fails the release.
+          # Keep diagnostics best-effort so they cannot mask a signature failure.
           function Add-GateEvidence([string]$line) {
             try {
               Add-Content -Path 'inner-signing-evidence.txt' -Value "`n$line" -ErrorAction Stop
@@ -1981,19 +1947,14 @@ jobs:
           }
 
           if ($env:INNER_SIGNING_COMPLETED -ne 'true') {
-            $message = 'Windows inner-binary signing did not complete; this release ships unsigned inner binaries (fail-open, issue #7785).'
+            $message = 'Windows inner-binary signing did not complete; publication is blocked.'
             Write-GateVerdict "NOT VERIFIED — $message"
             if ($required) { throw $message }
             Write-Host "::warning::$message"
             exit 0
           }
 
-          # Why try/catch: while the gate is warn-only, even an unexpected
-          # script error (extraction hiccup, missing file) must not block
-          # the release — only the flip to required makes failures fatal.
-          # Why tracked separately: a required-mode signature failure must not be
-          # rewritten as ERRORED by the catch below, which would replace the
-          # per-file report with an exception string and lose the diagnostics.
+          # Keep signature failures outside the catch to preserve the per-file report.
           $policyFailure = $null
 
           try {
@@ -2015,14 +1976,19 @@ jobs:
             }
             New-Item -ItemType Directory -Path inner-evidence-extract -Force | Out-Null
             & $7za x 'dist/orca-windows-setup.exe' '-oinner-evidence-extract' -y | Out-Null
+            if ($LASTEXITCODE -ne 0) { throw 'Could not extract the shipped installer payload.' }
 
             $root = Resolve-Path 'inner-evidence-extract'
+            # Verify the CLI even when a cached signed copy bypassed staging (#23383).
             # Why elevate.exe is always appended: staging skips already-signed
             # files, and the persisted electron-builder cache can carry a
             # previously signed elevate.exe — so it may be absent from the list
             # in some runs, yet it is the file most at risk of losing its
             # signature in the NSIS rebuild. Verify it in every release.
             $targets = @(Get-Content 'inner-signing-list.txt')
+            foreach ($requiredTarget in @('Orca.exe', 'resources\bin\orca.exe')) {
+              if ($targets -notcontains $requiredTarget) { $targets += $requiredTarget }
+            }
             if ($targets -notcontains 'resources\elevate.exe') {
               $targets += 'resources\elevate.exe'
             }
@@ -2057,7 +2023,7 @@ jobs:
                 }
               }
             } else {
-              Write-Host '::warning::The NSIS uninstaller was not signed on this run; it is excluded from the evidence gate (fail-open).'
+              $failures.Add('The NSIS uninstaller signing did not complete.')
             }
             foreach ($relative in $targets) {
               $path = Join-Path $root $relative
@@ -2107,6 +2073,38 @@ jobs:
           # Outside the catch so the FAILED evidence report survives intact.
           if ($policyFailure) { throw $policyFailure }
 
+      - name: Notify Slack when Windows signing fails
+        if: failure() && matrix.platform == 'win' && github.run_attempt == 1 && steps.install-signpath.outcome != '' && steps.install-signpath.outcome != 'skipped'
+        continue-on-error: true
+        shell: pwsh
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          TAG: ${{ needs.cut.outputs.tag }}
+          GITHUB_RUN_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          INNER_REQUEST_ID: ${{ steps.submit-inner-signing.outputs.signing-request-id }}
+          INSTALLER_REQUEST_ID: ${{ steps.submit-signing-request.outputs.signing-request-id }}
+          INSTALLER_SUBMISSION_OUTCOME: ${{ steps.submit-signing-request.outcome }}
+        run: |
+          if ([string]::IsNullOrWhiteSpace($env:SLACK_WEBHOOK_URL)) {
+            throw 'SLACK_WEBHOOK_URL is missing; cannot notify release approvers of the signing failure.'
+          }
+          $stage = 'inner-binary signing or installer rebuild'
+          if ($env:INSTALLER_SUBMISSION_OUTCOME -in @('success', 'failure')) {
+            $stage = 'installer signing or final signature verification'
+          }
+          $message = "Orca Windows release ``$($env:TAG)`` failed during $stage (including approval timeouts). Publication is blocked.`n<$($env:GITHUB_RUN_URL)|Open failed GitHub Actions run>"
+          foreach ($request in @(
+            @{ Id = $env:INNER_REQUEST_ID; Label = 'Inner-binary signing request' },
+            @{ Id = $env:INSTALLER_REQUEST_ID; Label = 'Installer signing request' }
+          )) {
+            if (-not [string]::IsNullOrWhiteSpace($request.Id)) {
+              $message += "`n<https://app.signpath.io/Web/c37aa192-a27a-4377-9c90-5d6c95912dc0/SigningRequests/$($request.Id)|$($request.Label)>"
+            }
+          }
+          $message += "`nCheck the failed step before retrying. Late SignPath approval does not resume this run; missing Windows assets require a fresh release dispatch, not Re-run failed jobs."
+          $payload = @{ text = $message } | ConvertTo-Json
+          Invoke-RestMethod -Method Post -Uri $env:SLACK_WEBHOOK_URL -ContentType 'application/json' -Body $payload
+
       - name: Upload Windows inner signing evidence
         if: always() && matrix.platform == 'win' && github.run_attempt == 1
         uses: actions/upload-artifact@v7
diff --git a/.github/workflows/release-policy.yml b/.github/workflows/release-policy.yml
index e6ab98f0d0d2..53decc5e7e39 100644
--- a/.github/workflows/release-policy.yml
+++ b/.github/workflows/release-policy.yml
@@ -19,80 +19,18 @@ jobs:
     runs-on: ubuntu-slim
     timeout-minutes: 5
     steps:
+      # Why: release events run this file from the tagged commit, so load the module from the same commit.
+      - uses: actions/checkout@v6
+        with:
+          sparse-checkout: config/scripts/release-policy.mjs
+          sparse-checkout-cone-mode: false
+          persist-credentials: false
       - name: Enforce release policy
         uses: actions/github-script@v8
         with:
           script: |
-            const release = context.payload.release;
-            const tag = release.tag_name;
-            const author = release.author?.login;
-            const number = "(?:0|[1-9][0-9]*)";
-            const version = `${number}\\.${number}\\.${number}`;
-            const stableTag = new RegExp(`^v${version}$`);
-            const prereleaseTag = new RegExp(
-              `^(?:v${version}-rc\\.${number}(?:\\.[0-9A-Za-z]+)?|mobile(?:-android)?-v${version})$`,
-            );
-            const expectedPrerelease = prereleaseTag.test(tag);
-            const allowed = author === "github-actions[bot]" &&
-              (stableTag.test(tag) || expectedPrerelease);
-            const { owner, repo } = context.repo;
-
-            async function restoreLatestStable() {
-              const releases = await github.paginate(github.rest.repos.listReleases, {
-                owner,
-                repo,
-                per_page: 100,
-              });
-              const stable = releases
-                .filter((candidate) =>
-                  !candidate.draft &&
-                  !candidate.prerelease &&
-                  candidate.author?.login === "github-actions[bot]" &&
-                  stableTag.test(candidate.tag_name),
-                )
-                .sort((left, right) => {
-                  const a = left.tag_name.slice(1).split(".").map(Number);
-                  const b = right.tag_name.slice(1).split(".").map(Number);
-                  return a.reduce((result, part, index) => result || part - b[index], 0);
-                })
-                .at(-1);
-              if (stable) {
-                await github.rest.repos.updateRelease({
-                  owner,
-                  repo,
-                  release_id: stable.id,
-                  make_latest: "true",
-                });
-              }
-            }
-
-            if (allowed) {
-              if (release.prerelease !== expectedPrerelease) {
-                await github.rest.repos.updateRelease({
-                  owner,
-                  repo,
-                  release_id: release.id,
-                  prerelease: expectedPrerelease,
-                  make_latest: expectedPrerelease ? "false" : "legacy",
-                });
-              }
-              await restoreLatestStable();
-              return;
-            }
-
-            await github.rest.repos.updateRelease({
-              owner,
-              repo,
-              release_id: release.id,
-              draft: true,
-              prerelease: true,
-              make_latest: "false",
-            });
-            await restoreLatestStable();
-            await github.rest.repos.deleteRelease({ owner, repo, release_id: release.id });
-            try {
-              await github.rest.git.deleteRef({ owner, repo, ref: `tags/${tag}` });
-            } catch (error) {
-              if (error.status !== 404) throw error;
-            }
-            core.warning(`Deleted unauthorized release ${tag} created by ${author || "unknown"}.`);
+            const { pathToFileURL } = await import("node:url")
+            const { enforceReleasePolicy } = await import(
+              pathToFileURL(`${process.env.GITHUB_WORKSPACE}/config/scripts/release-policy.mjs`).href
+            )
+            await enforceReleasePolicy({ github, context, core })
diff --git a/.github/workflows/unit-plan.yml b/.github/workflows/unit-plan.yml
new file mode 100644
index 000000000000..b427908b26d1
--- /dev/null
+++ b/.github/workflows/unit-plan.yml
@@ -0,0 +1,48 @@
+name: Unit plan
+
+# Why its own workflow: the caller's `needs` gate the whole called workflow, so while this lived
+# inside unit-tests.yml it waited on static analysis and typecheck before it could even start —
+# and the shards then waited on it. Planning needs neither (its inputs are the checkout, a git
+# diff against HEAD^1, the import graph, and the checked-in timing baseline), so hoisting it out
+# lets it overlap the gate instead of queueing behind it. Measured: a median 93s off the shard
+# matrix's start.
+on:
+  workflow_call:
+    inputs:
+      selection_mode:
+        description: Shadow validates selection; selected applies it only to draft PRs.
+        required: false
+        default: shadow
+        type: string
+
+    outputs:
+      shards:
+        description: JSON array of shard assignments for the unit matrix.
+        value: ${{ jobs.plan.outputs.shards }}
+
+permissions:
+  contents: read
+
+jobs:
+  plan:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    outputs:
+      shards: ${{ steps.plan.outputs.shards }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 2
+          persist-credentials: false
+      - uses: ./.github/actions/install-node-dependencies
+      - name: Plan unit selection
+        id: plan
+        env:
+          ORCA_UNIT_SELECTION_MODE: ${{ inputs.selection_mode }}
+        run: node config/scripts/ci-unit-plan.mjs
+      - uses: actions/upload-artifact@v7
+        continue-on-error: true
+        with:
+          name: unit-selection-attempt-${{ github.run_attempt }}
+          path: ci-shards/unit-selection.json
+          retention-days: 14
diff --git a/.github/workflows/unit-selection-evidence.yml b/.github/workflows/unit-selection-evidence.yml
new file mode 100644
index 000000000000..4ff46be84d0f
--- /dev/null
+++ b/.github/workflows/unit-selection-evidence.yml
@@ -0,0 +1,41 @@
+name: Unit selection evidence
+
+# Why its own workflow: this job is advisory -- `continue-on-error` on both the job and its
+# comparison step, so it can never fail a PR. But a caller's `needs: test` waits for every job in
+# the called workflow, so while it lived in unit-tests.yml it held `verify` for ~36s after the
+# last shard finished. Called as a sibling instead, it still runs on every PR and still uploads
+# its review artifact; it just no longer sits on the critical path.
+on:
+  workflow_call:
+
+permissions:
+  contents: read
+
+jobs:
+  selection_evidence:
+    if: ${{ !cancelled() }}
+    continue-on-error: true
+    runs-on: ubuntu-slim
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          sparse-checkout: config/scripts/ci-unit-selection-review.mjs
+          sparse-checkout-cone-mode: false
+          persist-credentials: false
+      - uses: actions/setup-node@v6
+        with:
+          node-version: '24'
+      - uses: actions/download-artifact@v8
+        with:
+          pattern: unit-shard-node-*-attempt-${{ github.run_attempt }}
+          path: unit-evidence/
+      - name: Compare selection with full results
+        continue-on-error: true
+        run: node config/scripts/ci-unit-selection-review.mjs unit-evidence
+      - uses: actions/upload-artifact@v7
+        if: always()
+        continue-on-error: true
+        with:
+          name: unit-selection-review-attempt-${{ github.run_attempt }}
+          path: unit-evidence/selection-review.json
+          retention-days: 30
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 73748238f5f3..abe9cf28a413 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -8,19 +8,29 @@ on:
         required: true
         type: string
 
+      runner:
+        description: Hosted runner for the unit shards; relay integration keeps its x86 host.
+        required: false
+        default: ubuntu-latest
+        type: string
+
+      shards:
+        description: JSON array of shard assignments, produced by unit-plan.yml.
+        required: true
+        type: string
+
 permissions:
   contents: read
 
 jobs:
   test:
-    name: tests node ${{ matrix.node }} ${{ matrix.shard }}/${{ matrix.shard_total }}
-    runs-on: ubuntu-latest
+    name: tests node ${{ matrix.node }} ${{ matrix.shard.index }}/${{ matrix.shard.count }}
+    runs-on: ${{ inputs.runner }}
     strategy:
       fail-fast: false
       matrix:
         node: ${{ fromJSON(inputs.node_versions) }}
-        shard: [1, 2, 3, 4, 5, 6, 7, 8]
-        shard_total: [8]
+        shard: ${{ fromJSON(inputs.shards) }}
 
     steps:
       - name: Checkout
@@ -37,34 +47,22 @@ jobs:
       - name: Install Electron package binary for tests
         run: node config/scripts/install-electron-package-binary.mjs
 
+      - uses: actions/download-artifact@v8
+        continue-on-error: true
+        with:
+          name: unit-selection-attempt-${{ github.run_attempt }}
+          path: ci-shards/
+
       - name: Test shard
         env:
           ORCA_BALANCE_UNIT_SHARDS: '1'
           ORCA_BACKGROUND_LAUNCH: '1'
         run: |
-          export ORCA_SHARD_SOURCE_SHA="$(git rev-parse HEAD)"
+          ORCA_SHARD_SOURCE_SHA="$(git rev-parse HEAD)"
+          export ORCA_SHARD_SOURCE_SHA
           pnpm exec vitest run --config config/vitest.config.ts \
-            --exclude=src/main/daemon/repro-13767-shell-ready-marker-lost-to-exec.test.ts \
-            --exclude=src/main/daemon/shell-ready.test.ts \
-            --exclude=src/main/daemon/node-pty-fd-leak.test.ts \
-            --exclude=src/main/providers/local-pty-shell-ready-zsh-launch-environment.test.ts \
-            --exclude=src/main/providers/__tests__/shell-ready-framework-example.test.ts \
-            --exclude=src/main/pty/omp-shell-wrapper-alias-safety.test.ts \
-            --exclude=src/main/pty/omp-shell-wrapper.node-pty.test.ts \
-            --exclude=src/main/shell-startup-feature-channel.test.ts \
-            --exclude=src/main/terminal-history-fish-session.node-pty.test.ts \
-            --exclude=src/main/zsh-scoped-histfile.live-shell.test.ts \
-            --exclude=src/main/zsh-startup-hook-user-config-equivalence.live-shell.test.ts \
-            --exclude=src/main/zsh-wrapper-version-mismatch.live-shell.test.ts \
-            --exclude=src/renderer/src/components/terminal-pane/fish-color-scheme-child-stdin.node-pty.test.ts \
-            --exclude=src/shared/fish-query-reply-child-stdin.node-pty.test.ts \
-            --exclude=src/shared/pty-reply-echo-shapes.node-pty.test.ts \
-            --exclude=src/shared/startup-shell-portability.live-shell.test.ts \
-            --exclude=src/shared/posix-command-path-lookup.test.ts \
-            --exclude=tests/e2e/relay-region-compatibility.unit.test.ts \
-            --exclude=tests/e2e/relay-region-correction.unit.test.ts \
-            --exclude=tests/e2e/cross-version-wire/** \
-            --shard=${{ matrix.shard }}/${{ matrix.shard_total }}
+            --shard=${{ matrix.shard.index }}/${{ matrix.shard.count }} \
+            ${{ inputs.runner == 'ubuntu-24.04-arm' && '--maxWorkers=4' || '' }}
 
       - name: Upload unit shard assignment
         if: always()
@@ -72,13 +70,17 @@ jobs:
         continue-on-error: true
         uses: actions/upload-artifact@v7
         with:
-          name: unit-shard-node-${{ matrix.node }}-${{ matrix.shard }}-attempt-${{ github.run_attempt }}
+          name: unit-shard-node-${{ matrix.node }}-${{ matrix.shard.index }}-attempt-${{ github.run_attempt }}
           path: ci-shards/
           retention-days: 14
           if-no-files-found: warn
 
   relay_integration:
-    name: relay integration node ${{ fromJSON(inputs.node_versions)[0] }}
+    name: relay integration node ${{ matrix.node }}
+    strategy:
+      fail-fast: false
+      matrix:
+        node: ${{ fromJSON(inputs.node_versions) }}
     runs-on: ubuntu-latest
 
     steps:
@@ -90,7 +92,7 @@ jobs:
       - uses: ./.github/actions/install-node-dependencies
         with:
           native-runtime: node
-          node-version: ${{ fromJSON(inputs.node_versions)[0] }}
+          node-version: ${{ matrix.node }}
           cache-electron-package: 'true'
           cache-dependency-path: |
             pnpm-lock.yaml
diff --git a/.github/workflows/win-crash-survival-e2e.yml b/.github/workflows/win-crash-survival-e2e.yml
index e0d7b80d0473..53c231111dbf 100644
--- a/.github/workflows/win-crash-survival-e2e.yml
+++ b/.github/workflows/win-crash-survival-e2e.yml
@@ -35,6 +35,7 @@ jobs:
     timeout-minutes: 50
     env:
       EXPECT: ${{ inputs.expect || 'survival' }}
+      ORCA_BACKGROUND_LAUNCH: '1'
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/win-update-survival-e2e.yml b/.github/workflows/win-update-survival-e2e.yml
index 50c38f2e3ad5..b709f82b7885 100644
--- a/.github/workflows/win-update-survival-e2e.yml
+++ b/.github/workflows/win-update-survival-e2e.yml
@@ -29,6 +29,21 @@ on:
         options:
           - survival
           - cold-restore
+      trace_installer:
+        description: Trace installer process checks in this disposable build
+        type: boolean
+        default: false
+      policy:
+        description: Execution policy inherited by harness child processes
+        type: choice
+        default: inherited
+        options:
+          - inherited
+          - Restricted
+      from_release:
+        description: Optional base release tag; blank uses this branch build
+        type: string
+        default: ''
 
 permissions:
   contents: read
@@ -39,7 +54,7 @@ concurrency:
 
 jobs:
   survival:
-    name: survival (branch build over itself)
+    name: update ${{ inputs.from_release || 'branch' }} to branch (${{ inputs.expect || 'survival' }}, policy=${{ inputs.policy || 'inherited' }})
     runs-on: windows-2022
     timeout-minutes: 50
     env:
@@ -62,18 +77,23 @@ jobs:
         with:
           install: false
 
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
       # Why: cache the built installer keyed on the inputs that affect it, so a
       # harness-only edit skips the ~20 min electron-builder build. The daemon
       # relocation code lives under src/, so changing it correctly rebuilds.
+      # Hash before installation creates native build artifacts under native/.
       - name: Cache branch installer
         id: cache-installer
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v4
         with:
           path: dist/orca-windows-setup.exe
-          key: branch-installer-${{ hashFiles('src/**', 'config/**', 'native/**', 'resources/win32/**', 'package.json', 'pnpm-lock.yaml') }}
+          key: branch-installer-${{ inputs.trace_installer && format('trace-{0}-', hashFiles('tests/tools/win-update-e2e/trace-installer-branches.mjs')) || '' }}${{ hashFiles('src/**', 'config/**', 'native/**', 'resources/**', 'mobile/**', 'patches/**', 'package.json', 'pnpm-lock.yaml', 'pnpm-workspace.yaml') }}
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Instrument disposable installer and uninstaller
+        if: inputs.trace_installer && steps.cache-installer.outputs.cache-hit != 'true'
+        run: node tests/tools/win-update-e2e/trace-installer-branches.mjs
 
       # Why here: electron-builder's beforePack requires out/mobile-web, and the bundle
       # build resolves React Native and Expo from mobile/node_modules. Gated with the
@@ -88,26 +108,46 @@ jobs:
           pnpm run build:desktop
           pnpm exec electron-builder --config config/electron-builder.config.cjs --win --publish never
 
-      # Why: install the branch build, open a terminal, update the SAME build
-      # over it, and assert the relocated daemon survives. Same build on both
-      # sides isolates the survival mechanism (NSIS kill sweep + userData daemon
-      # + adoption) from cross-version staleness policy. No --install-dir: a CI
-      # runner has no real Orca to protect.
+      - name: Cache successfully built installer before survival verification
+        if: steps.cache-installer.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: dist/orca-windows-setup.exe
+          key: ${{ steps.cache-installer.outputs.cache-primary-key }}
+
+      # A released base also exercises its old uninstaller; default runs isolate this branch.
       - name: Run survival harness
         id: harness
         shell: pwsh
         env:
           ORCA_E2E_DIAG_DIR: artifacts/diag
+          ORCA_BACKGROUND_LAUNCH: '1'
+          DEBUG: 'pw:browser'
+          ORCA_E2E_NSIS_TRACE: ${{ github.workspace }}\artifacts\nsis-process-trace.log
+          ORCA_E2E_PROCESS_POLICY: ${{ inputs.policy || 'inherited' }}
+          FROM_RELEASE: ${{ inputs.from_release }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           New-Item -ItemType Directory -Force artifacts | Out-Null
           $exe = "dist/orca-windows-setup.exe"
           if (-not (Test-Path $exe)) { throw "Installer not found at $exe" }
           $log = "artifacts/survival-output.log"
-          node tests/tools/win-update-e2e/run.mjs `
-            --from "$exe" `
-            --to "$exe" `
-            --expect "$env:EXPECT" `
-            --soak-seconds 60 2>&1 | Tee-Object -FilePath $log
+          $harnessArgs = @('--to', $exe, '--expect', $env:EXPECT, '--soak-seconds', '60')
+          if ($env:FROM_RELEASE) {
+            $harnessArgs += @('--from-release', $env:FROM_RELEASE)
+          } else {
+            $harnessArgs += @('--from', $exe)
+          }
+          # Only the harness and its children inherit the test policy.
+          $launch = @'
+          if (process.env.ORCA_E2E_PROCESS_POLICY === 'Restricted') {
+            process.env.PSExecutionPolicyPreference = 'Restricted'
+          }
+          console.log('Harness child process policy: ' + (process.env.PSExecutionPolicyPreference || 'inherited'))
+          process.argv.splice(1, 0, 'tests/tools/win-update-e2e/run.mjs')
+          await import('./tests/tools/win-update-e2e/run.mjs')
+          '@
+          node --input-type=module -e $launch -- @harnessArgs 2>&1 | Tee-Object -FilePath $log
           exit $LASTEXITCODE
 
       - name: Upload survival output
@@ -117,6 +157,7 @@ jobs:
           name: win-update-survival-output
           path: |
             artifacts/survival-output.log
+            artifacts/nsis-process-trace.log
             artifacts/diag/**
           retention-days: 7
           if-no-files-found: warn
diff --git a/.github/workflows/windows-signing-rehearsal.yml b/.github/workflows/windows-signing-rehearsal.yml
index 0fa2a31cd979..c23643301646 100644
--- a/.github/workflows/windows-signing-rehearsal.yml
+++ b/.github/workflows/windows-signing-rehearsal.yml
@@ -210,20 +210,25 @@ jobs:
       # signed and unsigned binaries.
       - name: Restore signed inner binaries into unpacked app
         shell: pwsh
+        env:
+          SIGNING_POLICY: ${{ inputs.signing-policy-slug || 'test-signing' }}
         run: |
+          $requireValid = $env:SIGNING_POLICY -ne 'test-signing'
           $root = Resolve-Path 'dist/win-unpacked'
           $failures = New-Object System.Collections.Generic.List[string]
           foreach ($relative in Get-Content 'inner-signing-list.txt') {
-            $signed = Get-ChildItem -Path signed-inner -Recurse -File |
-              Where-Object { [System.IO.Path]::GetRelativePath((Resolve-Path 'signed-inner'), $_.FullName).TrimStart('\', '/') -like "*$relative" } |
-              Select-Object -First 1
-            if ($null -eq $signed) {
-              $failures.Add("missing from signed artifact: $relative")
+            $candidates = @(
+              (Join-Path 'signed-inner' $relative),
+              (Join-Path 'signed-inner/signing-stage' $relative)
+            ) | Where-Object { Test-Path -LiteralPath $_ -PathType Leaf }
+            if (@($candidates).Count -ne 1) {
+              $failures.Add("missing or ambiguous signed artifact path: $relative")
               continue
             }
+            $signed = Get-Item -LiteralPath @($candidates)[0]
             $signature = Get-AuthenticodeSignature -FilePath $signed.FullName
-            if ($null -eq $signature.SignerCertificate) {
-              $failures.Add("returned without a signature: $relative")
+            if ($null -eq $signature.SignerCertificate -or ($requireValid -and ($signature.Status -ne 'Valid' -or $signature.SignerCertificate.Subject -notlike '*CN=SignPath Foundation*'))) {
+              $failures.Add("returned without a valid SignPath signature: $relative")
               continue
             }
             Copy-Item -Path $signed.FullName -Destination (Join-Path $root $relative) -Force
@@ -236,15 +241,21 @@ jobs:
 
       - name: Restore signed uninstaller for the installer rebuild
         shell: pwsh
+        env:
+          SIGNING_POLICY: ${{ inputs.signing-policy-slug || 'test-signing' }}
         run: |
-          $signed = Get-ChildItem -Path signed-inner -Recurse -File -Filter 'orca-uninstaller.exe' |
-            Select-Object -First 1
-          if ($null -eq $signed) {
-            throw 'SignPath did not return uninstaller/orca-uninstaller.exe; check the inner-binaries artifact configuration covers it.'
+          $requireValid = $env:SIGNING_POLICY -ne 'test-signing'
+          $candidates = @(
+            (Join-Path 'signed-inner' 'uninstaller\orca-uninstaller.exe'),
+            (Join-Path 'signed-inner/signing-stage' 'uninstaller\orca-uninstaller.exe')
+          ) | Where-Object { Test-Path -LiteralPath $_ -PathType Leaf }
+          if (@($candidates).Count -ne 1) {
+            throw 'Missing or ambiguous uninstaller/orca-uninstaller.exe in the signed artifact; check the windows-inner-binaries-zip configuration.'
           }
+          $signed = Get-Item -LiteralPath @($candidates)[0]
           $signature = Get-AuthenticodeSignature -FilePath $signed.FullName
-          if ($null -eq $signature.SignerCertificate) {
-            throw 'The returned NSIS uninstaller carries no signature.'
+          if ($null -eq $signature.SignerCertificate -or ($requireValid -and ($signature.Status -ne 'Valid' -or $signature.SignerCertificate.Subject -notlike '*CN=SignPath Foundation*'))) {
+            throw 'The returned NSIS uninstaller carries no valid SignPath signature.'
           }
           $signedDir = Join-Path $env:RUNNER_TEMP 'uninstaller-signing\signed'
           New-Item -ItemType Directory -Force -Path $signedDir | Out-Null
@@ -487,7 +498,11 @@ jobs:
             Test-Signature "shipped: Uninstall Orca.exe (via $installedVia)" $installedUninstaller.FullName
           }
 
-          foreach ($relative in Get-Content 'inner-signing-list.txt') {
+          $targets = @(Get-Content 'inner-signing-list.txt')
+          foreach ($requiredTarget in @('Orca.exe', 'resources\bin\orca.exe')) {
+            if ($targets -notcontains $requiredTarget) { $targets += $requiredTarget }
+          }
+          foreach ($relative in $targets) {
             $path = Join-Path $root $relative
             if (-not (Test-Path $path)) {
               $failures.Add("missing from installer payload: $relative")
diff --git a/.github/workflows/windows-terminal-restart-e2e.yml b/.github/workflows/windows-terminal-restart-e2e.yml
index abb8dc89aa81..d576ee650499 100644
--- a/.github/workflows/windows-terminal-restart-e2e.yml
+++ b/.github/workflows/windows-terminal-restart-e2e.yml
@@ -22,6 +22,7 @@ jobs:
     timeout-minutes: 30
     env:
       NODE_OPTIONS: --max-old-space-size=4096
+      ORCA_BACKGROUND_LAUNCH: '1'
 
     steps:
       - name: Checkout
diff --git a/.oxfmtrc.json b/.oxfmtrc.json
index 86931f1f9ec6..19856d6ca841 100644
--- a/.oxfmtrc.json
+++ b/.oxfmtrc.json
@@ -6,7 +6,9 @@
   "trailingComma": "none",
   "ignorePatterns": [
     "cloud/**",
+    "resources/licenses/**",
     ".github/actions/cloud-sql-rollout-lease/**",
-    ".anti-slop-plugin/**"
+    ".anti-slop-plugin/**",
+    "src/main/runtime/__fixtures__/*.timing.json"
   ]
 }
diff --git a/Casks/orca.rb b/Casks/orca.rb
index 6b97b27d52e6..1abc9b3a9124 100644
--- a/Casks/orca.rb
+++ b/Casks/orca.rb
@@ -5,8 +5,7 @@
   sha256 arm:   "fc707f290ff3b631b7b7947bf339885b61a43d2e89475997c125b61268ed4966",
          intel: "5f677c13a08f7a5740442e29d388285a86488c8c1f7aa5f10a8721a2c6ede8e4"
 
-  url "https://github.com/stablyai/orca/releases/download/v#{version}/orca-macos-#{arch}.dmg",
-      verified: "github.com/stablyai/orca/"
+  url "https://github.com/stablyai/orca/releases/download/v#{version}/orca-macos-#{arch}.dmg"
   name "Orca"
   desc "IDE for orchestrating AI coding agents across terminals and worktrees"
   homepage "https://onorca.dev/"
diff --git a/Casks/orca@rc.rb b/Casks/orca@rc.rb
index 63bc843b6407..08eaeeca459f 100644
--- a/Casks/orca@rc.rb
+++ b/Casks/orca@rc.rb
@@ -5,8 +5,7 @@
   sha256 arm:   "563b6b14323fc9d5489299c82442d514bc12cabffc9d06d3964ed572af4b3955",
          intel: "457088c7021f07de1a419197f7b2bd00092741ad4727d4fef3d86af38a6831e7"
 
-  url "https://github.com/stablyai/orca/releases/download/v#{version}/orca-macos-#{arch}.dmg",
-      verified: "github.com/stablyai/orca/"
+  url "https://github.com/stablyai/orca/releases/download/v#{version}/orca-macos-#{arch}.dmg"
   name "Orca RC"
   desc "IDE for orchestrating AI coding agents across terminals and worktrees"
   homepage "https://onorca.dev/"
diff --git a/README.md b/README.md
index 98efc301c2f9..93e096146090 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@
 
 Monitor and steer your agents from your phone — get notified when an agent finishes and send follow-ups from anywhere.
 
-[iOS App Store](https://apps.apple.com/us/app/orca-ide/id6766130217) · [TestFlight](https://testflight.apple.com/join/YjeGMQBA) · [Android APK 0.0.50](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk) · [Docs →](https://www.onorca.dev/docs/mobile)
+[iOS App Store](https://apps.apple.com/us/app/orca-ide/id6766130217) · [Android APK 0.0.50](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk) · [Docs →](https://www.onorca.dev/docs/mobile)
 
 </td>
 <td width="50%">
@@ -179,6 +179,7 @@ Works with **any CLI agent** — if it runs in a terminal, it runs in Orca.
   <a href="https://cursor.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=cursor.com&sz=64" alt="Cursor logo" width="16" valign="middle" /> Cursor</kbd></a> &nbsp;
   <a href="https://docs.github.com/en/copilot/how-tos/set-up/install-copilot-cli"><kbd><img src="https://www.google.com/s2/favicons?domain=github.com&sz=64" alt="GitHub Copilot logo" width="16" valign="middle" /> GitHub Copilot</kbd></a> &nbsp;
   <a href="https://dev.meta.ai/docs/muse-code"><kbd><img src="src/shared/agent-icons/muse.png" alt="Muse logo" width="16" valign="middle" /> Muse</kbd></a> &nbsp;
+  <a href="https://deepseek-harness.github.io/deepseek-harness/"><kbd><img src="src/shared/agent-icons/dsh.png" alt="DeepSeek Harness logo" width="16" valign="middle" /> DeepSeek Harness</kbd></a> &nbsp;
   <a href="https://zcode.z.ai/en/docs"><kbd><img src="src/shared/agent-icons/zcode.png" alt="ZCode logo" width="16" valign="middle" /> ZCode</kbd></a> &nbsp;
   <a href="https://opencode.ai/docs/cli/"><kbd><img src="https://www.google.com/s2/favicons?domain=opencode.ai&sz=64" alt="OpenCode logo" width="16" valign="middle" /> OpenCode</kbd></a> &nbsp;
   <a href="https://mimo.xiaomi.com/coder"><kbd><img src="https://www.google.com/s2/favicons?domain=mimo.xiaomi.com&sz=64" alt="MiMo Code logo" width="16" valign="middle" /> MiMo Code</kbd></a> &nbsp;
@@ -194,7 +195,9 @@ Works with **any CLI agent** — if it runs in a terminal, it runs in Orca.
   <a href="https://github.com/autohandai/code-cli"><kbd><img src="https://www.google.com/s2/favicons?domain=autohand.ai&sz=64" alt="Autohand Code logo" width="16" valign="middle" /> Autohand Code</kbd></a> &nbsp;
   <a href="https://github.com/charmbracelet/crush"><kbd><img src="https://www.google.com/s2/favicons?domain=charm.sh&sz=64" alt="Charm logo" width="16" valign="middle" /> Charm</kbd></a> &nbsp;
   <a href="https://docs.cline.bot/cline-cli/overview"><kbd><img src="https://www.google.com/s2/favicons?domain=cline.bot&sz=64" alt="Cline logo" width="16" valign="middle" /> Cline</kbd></a> &nbsp;
+  <a href="https://www.codebuddy.ai/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=codebuddy.ai&sz=64" alt="CodeBuddy logo" width="16" valign="middle" /> CodeBuddy</kbd></a> &nbsp;
   <a href="https://www.codebuff.com/docs/help/quick-start"><kbd><img src="https://www.google.com/s2/favicons?domain=codebuff.com&sz=64" alt="Codebuff logo" width="16" valign="middle" /> Codebuff</kbd></a> &nbsp;
+  <a href="https://freebuff.com"><kbd><img src="src/shared/agent-icons/freebuff.png" alt="Freebuff logo" width="16" valign="middle" /> Freebuff</kbd></a> &nbsp;
   <a href="https://commandcode.ai/docs/quickstart"><kbd><img src="https://www.google.com/s2/favicons?domain=commandcode.ai&sz=64" alt="Command Code logo" width="16" valign="middle" /> Command Code</kbd></a> &nbsp;
   <a href="https://docs.continue.dev/guides/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=continue.dev&sz=64" alt="Continue logo" width="16" valign="middle" /> Continue</kbd></a> &nbsp;
   <a href="https://docs.factory.ai/cli/getting-started/quickstart"><kbd><img src="docs/assets/droid-logo.svg" alt="Droid logo" width="16" valign="middle" /> Droid</kbd></a> &nbsp;
@@ -231,7 +234,7 @@ yay -S stably-orca-bin
 
 Pair with your desktop app to monitor and steer your agents from your phone.
 
-- **iOS:** [Download on the App Store](https://apps.apple.com/us/app/orca-ide/id6766130217) or [join TestFlight](https://testflight.apple.com/join/YjeGMQBA)
+- **iOS:** [Download on the App Store](https://apps.apple.com/us/app/orca-ide/id6766130217)
 - **Android:** [Download APK 0.0.50](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk) · [Install guide](https://www.onorca.dev/docs/android-apk)
 
 ---
diff --git a/cloud/apps/push/src/durable-push-claim.test.ts b/cloud/apps/push/src/durable-push-claim.test.ts
index f43588bd2c3d..c7a228a05595 100644
--- a/cloud/apps/push/src/durable-push-claim.test.ts
+++ b/cloud/apps/push/src/durable-push-claim.test.ts
@@ -157,7 +157,7 @@ it('keeps claim, exclusion and prune correct without the queue index', async ()
   for (const claim of leased) await store.finish(claim)
   expect((await store.claim())?.notification.notificationSeq).toBe(2)
   advance(10 * 60_000)
-  expect(await store.prune()).toBe(1)
+  expect(await store.prune()).toEqual({ deleted: 1, saturated: false })
   expect(await batchCount(db)).toBe(0)
 })
 
@@ -211,11 +211,11 @@ it('prunes a large backlog in bounded calls without touching live or leased work
     [JSON.stringify(notification(9)), now - 1, now - 1, now + 1000, now - 1]
   )
   await store.accept('host', 'phone-live', notification(1))
-  expect(await store.prune()).toBe(perCall)
-  expect(await store.prune()).toBe(500)
-  expect(await store.prune()).toBe(0)
+  expect(await store.prune()).toEqual({ deleted: perCall, saturated: true })
+  expect(await store.prune()).toEqual({ deleted: 500, saturated: false })
+  expect(await store.prune()).toEqual({ deleted: 0, saturated: false })
   advance(1000)
-  expect(await store.prune()).toBe(1)
+  expect(await store.prune()).toEqual({ deleted: 1, saturated: false })
   expect(await batchCount(db)).toBe(1)
   expect(await store.pendingCount('phone-live')).toBe(1)
 })
diff --git a/cloud/apps/push/src/durable-push-store.ts b/cloud/apps/push/src/durable-push-store.ts
index 61fed2350184..02d26f20b3e1 100644
--- a/cloud/apps/push/src/durable-push-store.ts
+++ b/cloud/apps/push/src/durable-push-store.ts
@@ -12,6 +12,8 @@ const CLAIM_CANDIDATE_ATTEMPTS = 4
 export const PRUNE_BATCH_ROWS = 2_000
 export const PRUNE_MAX_BATCHES = 50
 export const DELIVERY_LEASE_MS = 30_000
+// `saturated` means the batch budget ran out with rows still matching, so a backlog remains.
+export type PushPruneSweep = { deleted: number; saturated: boolean }
 export type QueuedPushDelivery = {
   id: string
   registrationId: string
@@ -200,10 +202,10 @@ export class DurablePushStore {
   }
 
   // Bounded per call and per statement, so it drains any backlog on its own without holding locks.
-  async prune(): Promise<number> {
+  async prune(): Promise<PushPruneSweep> {
     const now = this.now()
     // Also clears terminal rows older revisions kept, since each carries a past expires_at.
-    let deleted = await this.deleteInBatches(
+    let { deleted, saturated } = await this.deleteInBatches(
       'push_delivery_batches',
       'batch_id',
       'expires_at <= ? AND lease_until <= ?',
@@ -215,9 +217,11 @@ export class DurablePushStore {
       ['push_event_recipients', 'event_id, registration_id'],
       ['push_events', 'event_id']
     ] as const) {
-      deleted += await this.deleteInBatches(table, key, 'created_at < ?', [now - RETENTION_MS])
+      const sweep = await this.deleteInBatches(table, key, 'created_at < ?', [now - RETENTION_MS])
+      deleted += sweep.deleted
+      saturated ||= sweep.saturated
     }
-    return deleted
+    return { deleted, saturated }
   }
 
   private async deleteInBatches(
@@ -225,7 +229,7 @@ export class DurablePushStore {
     key: string,
     where: string,
     params: unknown[]
-  ): Promise<number> {
+  ): Promise<PushPruneSweep> {
     const lockRows = this.background.dialect === 'postgres' ? ' FOR UPDATE SKIP LOCKED' : ''
     let total = 0
     for (let batch = 0; batch < PRUNE_MAX_BATCHES; batch++) {
@@ -235,8 +239,9 @@ export class DurablePushStore {
       )
       const changes = Number(result?.changes ?? 0)
       total += changes
-      if (changes < PRUNE_BATCH_ROWS) break
+      // A short batch drained the predicate; only a full last batch leaves rows behind.
+      if (changes < PRUNE_BATCH_ROWS) return { deleted: total, saturated: false }
     }
-    return total
+    return { deleted: total, saturated: true }
   }
 }
diff --git a/cloud/apps/push/src/push-background.test.ts b/cloud/apps/push/src/push-background.test.ts
new file mode 100644
index 000000000000..21598ef67a21
--- /dev/null
+++ b/cloud/apps/push/src/push-background.test.ts
@@ -0,0 +1,174 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import { startPushBackground } from './push-background.js'
+import { createPushServerHarness } from './push-server-harness.test-fixture.js'
+import { reserveRequestConnection } from './push-background-database.js'
+import { DurablePushStore, PRUNE_BATCH_ROWS, type PushPruneSweep } from './durable-push-store.js'
+import type { PushDatabase } from './push-database.js'
+
+const cleanups: (() => Promise<void>)[] = []
+afterEach(async () => {
+  for (const cleanup of cleanups.splice(0)) await cleanup()
+  vi.useRealTimers()
+  vi.restoreAllMocks()
+})
+
+async function fixture(mode: 'active' | 'validation' = 'active') {
+  const harness = await createPushServerHarness()
+  const runtime = harness.server
+  const challenges = vi.spyOn(runtime.challenges, 'pruneExpired').mockResolvedValue(0)
+  const sessions = vi.spyOn(runtime.sessions, 'pruneExpired').mockResolvedValue(0)
+  const deliveries = vi
+    .spyOn(runtime.deliveryStore, 'prune')
+    .mockResolvedValue({ deleted: 0, saturated: false })
+  vi.spyOn(runtime.worker, 'start').mockImplementation(() => {})
+  const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+  vi.useFakeTimers()
+  const stop = startPushBackground({ mode }, runtime)
+  cleanups.push(async () => {
+    await stop()
+    await harness.close()
+  })
+  return { stop, challenges, sessions, deliveries, warn }
+}
+
+it('keeps one slow sweep per store while other stores keep their cadence', async () => {
+  const h = await fixture()
+  let finish!: (sweep: PushPruneSweep) => void
+  h.deliveries.mockImplementationOnce(
+    () => new Promise<PushPruneSweep>((resolve) => (finish = resolve))
+  )
+  try {
+    await vi.advanceTimersByTimeAsync(10 * 60_000)
+    expect(h.deliveries).toHaveBeenCalledTimes(1)
+    expect(h.challenges).toHaveBeenCalledTimes(10)
+    expect(h.sessions).toHaveBeenCalledTimes(1)
+  } finally {
+    finish({ deleted: 100_000, saturated: false })
+  }
+  await vi.advanceTimersByTimeAsync(60_000)
+  expect(h.deliveries).toHaveBeenCalledTimes(2)
+  await h.stop()
+  await vi.advanceTimersByTimeAsync(10 * 60_000)
+  expect(h.deliveries).toHaveBeenCalledTimes(2)
+  expect(h.challenges).toHaveBeenCalledTimes(11)
+  expect(h.sessions).toHaveBeenCalledTimes(1)
+})
+
+it('reports a sweep that is still running a full interval after it started', async () => {
+  const h = await fixture()
+  let finish!: (sweep: PushPruneSweep) => void
+  h.deliveries.mockImplementationOnce(
+    () => new Promise<PushPruneSweep>((resolve) => (finish = resolve))
+  )
+  try {
+    await vi.advanceTimersByTimeAsync(119_999)
+    expect(h.warn).not.toHaveBeenCalled()
+    await vi.advanceTimersByTimeAsync(1)
+    expect(h.warn).toHaveBeenCalledWith(
+      JSON.stringify({ event: 'orca_push_prune_overdue', target: 'deliveries' })
+    )
+  } finally {
+    finish({ deleted: 0, saturated: false })
+  }
+  // One report per sweep: the settled sweep clears its own watchdog.
+  await vi.advanceTimersByTimeAsync(10 * 60_000)
+  expect(h.warn).toHaveBeenCalledTimes(1)
+})
+
+it('releases a failed sweep so the next scheduled sweep can recover', async () => {
+  const h = await fixture()
+  h.deliveries.mockRejectedValueOnce(new Error('database unavailable'))
+  await vi.advanceTimersByTimeAsync(60_000)
+  expect(h.deliveries).toHaveBeenCalledTimes(1)
+  expect(h.warn).toHaveBeenCalledWith(
+    JSON.stringify({ event: 'orca_push_prune_failed', target: 'deliveries', error: 'Error' })
+  )
+  await vi.advanceTimersByTimeAsync(60_000)
+  expect(h.deliveries).toHaveBeenCalledTimes(2)
+  expect(h.warn).toHaveBeenCalledTimes(1)
+})
+
+it('resumes a saturated sweep at once rather than waiting out the interval', async () => {
+  const h = await fixture()
+  let backlogSweeps = 3
+  h.deliveries.mockImplementation(async () => {
+    const saturated = backlogSweeps-- > 0
+    return { deleted: saturated ? PRUNE_BATCH_ROWS : 0, saturated }
+  })
+  await vi.advanceTimersByTimeAsync(60_000)
+  expect(h.deliveries).toHaveBeenCalledTimes(1)
+  // Three saturated sweeps resume within milliseconds instead of costing an interval each.
+  await vi.advanceTimersByTimeAsync(10)
+  expect(h.deliveries).toHaveBeenCalledTimes(4)
+  await vi.advanceTimersByTimeAsync(59_000)
+  expect(h.deliveries).toHaveBeenCalledTimes(4)
+  await vi.advanceTimersByTimeAsync(1_000)
+  expect(h.deliveries).toHaveBeenCalledTimes(5)
+})
+
+it('keeps a delivery claim behind one statement while a backlog drains back to back', async () => {
+  const h = await fixture()
+  let backlog = true
+  let finishedDeletes = 0
+  const database: PushDatabase = {
+    dialect: 'postgres',
+    query: async (sql) => {
+      if (!sql.startsWith('DELETE')) return []
+      await new Promise((resolve) => setTimeout(resolve, 4_000))
+      finishedDeletes++
+      // Only deliveries hold a backlog, so each sweep spends its whole budget there and returns.
+      if (!backlog || !sql.includes('push_delivery_batches')) return [{ changes: 0 }]
+      return [{ changes: PRUNE_BATCH_ROWS }]
+    },
+    transaction: (operation) => operation(database),
+    lockQuotaScope: async () => {},
+    tryLockScope: async () => true,
+    tryLockSharedScope: async () => true,
+    close: async () => {}
+  }
+  const store = new DurablePushStore(database, Date.now, reserveRequestConnection(database, 2))
+  const sweeps: Promise<PushPruneSweep>[] = []
+  let inFlight = 0
+  let concurrentSweeps = 0
+  h.deliveries.mockImplementation(() => {
+    concurrentSweeps = Math.max(concurrentSweeps, ++inFlight)
+    const sweep = store.prune().finally(() => void inFlight--)
+    sweeps.push(sweep)
+    return sweep
+  })
+  try {
+    await vi.advanceTimersByTimeAsync(10 * 60_000)
+    const queuedAt = finishedDeletes
+    const startedAt = Date.now()
+    let statementsAhead: number | undefined
+    let claimDelay: number | undefined
+    const claim = store.claim().then(() => {
+      statementsAhead = finishedDeletes - queuedAt
+      claimDelay = Date.now() - startedAt
+    })
+    await vi.advanceTimersByTimeAsync(44_000)
+    await claim
+    // Sweeping serially parks one statement ahead of the claim no matter how long the drain runs.
+    expect({ statementsAhead, concurrentSweeps }).toEqual({
+      statementsAhead: 1,
+      concurrentSweeps: 1
+    })
+    expect(claimDelay).toBeLessThanOrEqual(4_000)
+    // Each sweep exhausts its 50-batch budget, so the drain continues instead of idling out the tick.
+    expect(sweeps.length).toBeGreaterThan(1)
+  } finally {
+    await h.stop()
+    backlog = false
+    await vi.advanceTimersByTimeAsync(10 * 60_000)
+    await Promise.all(sweeps)
+  }
+})
+
+it('keeps validation mode free of sweeps and timers', async () => {
+  const h = await fixture('validation')
+  await vi.advanceTimersByTimeAsync(20 * 60_000)
+  expect(h.challenges).not.toHaveBeenCalled()
+  expect(h.sessions).not.toHaveBeenCalled()
+  expect(h.deliveries).not.toHaveBeenCalled()
+  expect(vi.getTimerCount()).toBe(0)
+})
diff --git a/cloud/apps/push/src/push-background.ts b/cloud/apps/push/src/push-background.ts
index 8925fd41fedd..9fad4700e7b5 100644
--- a/cloud/apps/push/src/push-background.ts
+++ b/cloud/apps/push/src/push-background.ts
@@ -1,26 +1,55 @@
 import type { PushConfig } from './config.js'
+import type { PushPruneSweep } from './durable-push-store.js'
 import type { createPushServer } from './push-server.js'
 
 const CHALLENGE_PRUNE_INTERVAL_MS = 60_000
 const SESSION_PRUNE_INTERVAL_MS = 10 * 60_000
 const DELIVERY_PRUNE_INTERVAL_MS = 60_000
 
-function prune(label: string, run: () => Promise<number>, intervalMs: number): NodeJS.Timeout {
-  const timer = setInterval(() => {
-    void run().catch((error: unknown) => {
-      console.warn(
-        JSON.stringify({
-          event: 'orca_push_prune_failed',
-          target: label,
-          error: error instanceof Error ? error.name : 'unknown'
-        })
-      )
-    })
-  }, intervalMs)
-  timer.unref()
-  return timer
+// Chained rather than periodic, so a sweep spanning many bounded statements never overlaps itself and
+// one that exhausted its batch budget resumes at once instead of idling out the rest of the interval.
+function prune(label: string, run: () => Promise<PushPruneSweep>, intervalMs: number): () => void {
+  let timer: NodeJS.Timeout | undefined
+  let overdue: NodeJS.Timeout | undefined
+  let stopped = false
+  function schedule(delayMs: number): void {
+    if (stopped) return
+    timer = setTimeout(tick, delayMs)
+    timer.unref()
+  }
+  function tick(): void {
+    // Admission waits are untimed, so a lost slot release would otherwise stall retention silently.
+    overdue = setTimeout(() => {
+      console.warn(JSON.stringify({ event: 'orca_push_prune_overdue', target: label }))
+    }, intervalMs)
+    overdue.unref()
+    void run()
+      .then((sweep) => schedule(sweep.saturated ? 0 : intervalMs))
+      .catch((error: unknown) => {
+        console.warn(
+          JSON.stringify({
+            event: 'orca_push_prune_failed',
+            target: label,
+            error: error instanceof Error ? error.name : 'unknown'
+          })
+        )
+        schedule(intervalMs)
+      })
+      .finally(() => clearTimeout(overdue))
+  }
+  schedule(intervalMs)
+  return () => {
+    stopped = true
+    clearTimeout(timer)
+    clearTimeout(overdue)
+  }
 }
 
+// One DELETE under a statement timeout: there is no batch budget for it to exhaust.
+const unbatchedSweep =
+  (run: () => Promise<number>) =>
+  async (): Promise<PushPruneSweep> => ({ deleted: await run(), saturated: false })
+
 export function startPushBackground(
   config: Pick<PushConfig, 'mode'>,
   runtime: Pick<
@@ -30,14 +59,22 @@ export function startPushBackground(
 ): () => Promise<void> {
   if (config.mode === 'validation') return async () => {}
   const { challenges, sessions, deliveryStore, worker } = runtime
-  const timers = [
-    prune('challenges', () => challenges.pruneExpired(), CHALLENGE_PRUNE_INTERVAL_MS),
-    prune('sessions', () => sessions.pruneExpired(), SESSION_PRUNE_INTERVAL_MS),
+  const stops = [
+    prune(
+      'challenges',
+      unbatchedSweep(() => challenges.pruneExpired()),
+      CHALLENGE_PRUNE_INTERVAL_MS
+    ),
+    prune(
+      'sessions',
+      unbatchedSweep(() => sessions.pruneExpired()),
+      SESSION_PRUNE_INTERVAL_MS
+    ),
     prune('deliveries', () => deliveryStore.prune(), DELIVERY_PRUNE_INTERVAL_MS)
   ]
   worker.start()
   return async () => {
-    for (const timer of timers) clearInterval(timer)
+    for (const stop of stops) stop()
     await worker.stop()
   }
 }
diff --git a/cloud/apps/relay/src/assignment-headroom-scope.test.ts b/cloud/apps/relay/src/assignment-headroom-scope.test.ts
new file mode 100644
index 000000000000..9862849d8e0e
--- /dev/null
+++ b/cloud/apps/relay/src/assignment-headroom-scope.test.ts
@@ -0,0 +1,129 @@
+import { afterEach, describe, expect, it } from 'vitest'
+import { RelayAssignmentStore } from './assignment-store.js'
+import { openInMemoryRelayDatabase, type RelayDatabase } from './database.js'
+
+const NOW = 100_000
+const CELL_COUNT = 32
+const identity = { userId: 'headroom-user', relayHostId: 'headroomhost0001' }
+
+function observeHeadroom(database: RelayDatabase, rowCounts: number[]): RelayDatabase {
+  return {
+    dialect: database.dialect,
+    async query(sql, params) {
+      const rows = await database.query(sql, params)
+      if (sql.includes('FROM relay_cell_connection_limits limits')) rowCounts.push(rows.length)
+      return rows
+    },
+    queryLocked: (sql, params, options) => database.queryLocked(sql, params, options),
+    transaction: (operation, options) =>
+      database.transaction((transaction) => operation(observeHeadroom(transaction, rowCounts)), options),
+    close: () => database.close()
+  }
+}
+
+describe('assignment headroom query scope', () => {
+  let database: RelayDatabase | undefined
+  afterEach(async () => await database?.close())
+
+  async function setup() {
+    database = await openInMemoryRelayDatabase()
+    const rowCounts: number[] = []
+    const store = new RelayAssignmentStore(observeHeadroom(database, rowCounts), () => NOW, {
+      requireLiveCells: true,
+      heartbeatTtlMs: 45_000
+    })
+    const cells = Array.from({ length: CELL_COUNT }, (_, index) => ({
+      id: `cell-${String(index).padStart(2, '0')}`,
+      url: `https://cell-${index}.example.com`,
+      capacityRequests: 1_000,
+      connectionHardCap: 600 as const,
+      connectionUnobservedBound: 50
+    }))
+    await store.reconcileCells(cells)
+    for (const cell of cells) {
+      await store.recordCellHeartbeat({
+        cellId: cell.id,
+        cellUrl: cell.url,
+        cellIncarnation: '11111111-1111-4111-8111-111111111111',
+        startedAt: NOW - 10,
+        ready: true,
+        observedRequests: 0,
+        totalConnections: 0,
+        inFlightConnections: 0,
+        reservedConnectionUnits: 0,
+        enforcedConnectionUnits: 0,
+        connectionHardCap: 600,
+        connectionUnobservedBound: 50
+      })
+    }
+    await database.query(
+      `INSERT INTO relay_assignments
+       (user_id, relay_host_id, cell_id, assignment_epoch, lease_expires_at,
+        last_activity_at, reserved_controls, reserved_splices, reserved_invites,
+        pending_installs, pending_confirmations, migration_leases)
+       VALUES (?, ?, 'cell-00', 1, ?, ?, 0, 0, 0, 0, 0, 0)`,
+      [identity.userId, identity.relayHostId, NOW + 90_000, NOW]
+    )
+    await store.acquireActivity(identity, {
+      activityId: 'existing-splice',
+      kind: 'splice',
+      cellId: 'cell-00'
+    })
+    rowCounts.length = 0
+    return { store, rowCounts, database }
+  }
+
+  it('reads one cell for a sticky assignment even when the capped fleet grows', async () => {
+    const { store, rowCounts } = await setup()
+    await expect(store.assign(identity)).resolves.toMatchObject({
+      ...identity,
+      cellId: 'cell-00',
+      assignmentEpoch: 1
+    })
+    console.info('sticky headroom rows', { fleetCells: CELL_COUNT, rowCounts })
+    expect(rowCounts).toEqual([1])
+  })
+
+  it('still considers the full fleet for a new placement', async () => {
+    const { store, rowCounts } = await setup()
+    await expect(
+      store.assign({ userId: 'new-user', relayHostId: 'newheadroomhost1' })
+    ).resolves.toMatchObject({ cellId: 'cell-01', assignmentEpoch: 1 })
+    expect(rowCounts).toEqual([CELL_COUNT])
+  })
+
+  it.each([
+    ['missing snapshot', `DELETE FROM relay_cell_connection_snapshots WHERE cell_id = 'cell-00'`],
+    ['expired snapshot', `UPDATE relay_cell_connection_snapshots SET snapshot_at = ${NOW - 45_000} WHERE cell_id = 'cell-00'`],
+    ['old incarnation', `UPDATE relay_cell_connection_snapshots SET cell_incarnation = 'old' WHERE cell_id = 'cell-00'`],
+    ['capacity boundary', `UPDATE relay_cell_connection_snapshots SET enforced_connection_units = 450 WHERE cell_id = 'cell-00'`]
+  ])('rejects the pinned active host with %s', async (_name, sql) => {
+    const { store, database } = await setup()
+    await database.query(sql)
+    await expect(store.assign(identity)).rejects.toThrow('relay_connection_headroom_exhausted')
+  })
+
+  it('preserves admission for cells without a connection limit', async () => {
+    const { store, rowCounts, database } = await setup()
+    await database.query(`DELETE FROM relay_cell_connection_limits WHERE cell_id = 'cell-00'`)
+    await expect(store.assign(identity)).resolves.toMatchObject({ cellId: 'cell-00' })
+    expect(rowCounts).toEqual([0])
+  })
+
+  it('counts outstanding reservations at the admission boundary', async () => {
+    const { store, database } = await setup()
+    await database.query(
+      `UPDATE relay_cell_connection_snapshots SET enforced_connection_units = 449
+       WHERE cell_id = 'cell-00'`
+    )
+    await database.query(
+      `INSERT INTO relay_control_connection_reservations
+       (reservation_id, idempotency_key, user_id, relay_host_id, assignment_epoch,
+        cell_id, state, created_at, timeout_at, updated_at)
+       VALUES ('pending', 'pending', 'other-user', 'other-host', 1,
+        'cell-00', 'reserved', ?, ?, ?)`,
+      [NOW, NOW + 90_000, NOW]
+    )
+    await expect(store.assign(identity)).rejects.toThrow('relay_connection_headroom_exhausted')
+  })
+})
diff --git a/cloud/apps/relay/src/assignment-store.ts b/cloud/apps/relay/src/assignment-store.ts
index 3cb5dcfeee9f..9a5cd9d4165c 100644
--- a/cloud/apps/relay/src/assignment-store.ts
+++ b/cloud/apps/relay/src/assignment-store.ts
@@ -7466,10 +7466,16 @@ export class RelayAssignmentStore {
   }
 
   private async connectionHeadroomByCell(
-    database: RelayDatabase
+    database: RelayDatabase,
+    cellId?: string
   ): Promise<Map<string, boolean>> {
     const now = this.now()
-    const rows = await database.query(ASSIGNMENT_CONNECTION_HEADROOM_QUERY)
+    const rows = await database.query(
+      cellId === undefined
+        ? ASSIGNMENT_CONNECTION_HEADROOM_QUERY
+        : `${ASSIGNMENT_CONNECTION_HEADROOM_QUERY} WHERE limits.cell_id = ?`,
+      cellId === undefined ? [] : [cellId]
+    )
     return new Map(
       rows.map((row) => {
         const heartbeat = optionalInteger(row, 'last_heartbeat_at')
@@ -7503,7 +7509,7 @@ export class RelayAssignmentStore {
     database: RelayDatabase,
     cellId: string
   ): Promise<boolean> {
-    return (await this.connectionHeadroomByCell(database)).get(cellId) !== false
+    return (await this.connectionHeadroomByCell(database, cellId)).get(cellId) !== false
   }
 
   private async cellIsLive(
@@ -8476,7 +8482,7 @@ function isDatabaseLockUnavailable(error: unknown): boolean {
   return error instanceof Error && error.message === 'database_lock_unavailable'
 }
 
-export function cellInventoryLockOptions(mode: CellInventoryLockMode): RelayLockOptions {
+function cellInventoryLockOptions(mode: CellInventoryLockMode): RelayLockOptions {
   if (mode === 'nowait') return { failIfUnavailable: true, measureHoldMs: true }
   if (mode === 'pool-default') return { measureHoldMs: true }
   return { lockTimeoutMs: CELL_INVENTORY_LOCK_TIMEOUT_MS, measureHoldMs: true }
diff --git a/cloud/apps/relay/src/cell-inventory-lock-census.test.ts b/cloud/apps/relay/src/cell-inventory-lock-census.test.ts
deleted file mode 100644
index e26d8d0551e6..000000000000
--- a/cloud/apps/relay/src/cell-inventory-lock-census.test.ts
+++ /dev/null
@@ -1,335 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { describe, expect, it } from 'vitest'
-import { cellInventoryLockOptions, type CellInventoryLockMode } from './assignment-store.js'
-
-// Which entry points can reach a call site. A site a sweep can enter must never
-// take the bounded wait: its 55P03 becomes a terminal transaction failure, and
-// the incident monitor freezes on a single one.
-type Reachability = 'request' | 'sweep' | 'both' | 'orphan'
-
-// 'caller' is not a CellInventoryLockMode: those sites take the mode threaded
-// from `assign`, which is 'request' for a client and 'pool-default' for the
-// evacuateDeadCells sweep.
-type CensusMode = CellInventoryLockMode | 'caller'
-
-type CensusEntry = { method: string; mode: CensusMode; reach: Reachability }
-
-// Every lockCellInventory / lockGeneralCellInventory call site in
-// assignment-store.ts, in source order. A new site fails this test until it is
-// classified here, which is the point.
-const CENSUS: CensusEntry[] = [
-  // assignStickyOnce is gone from this list: its retry now locks only the row
-  // the host is pinned to (lockCellRows), which is what a sticky refresh
-  // touches. Placement below is the one genuinely fleet-wide decision left.
-  { method: 'assignOnce', mode: 'caller', reach: 'both' },
-  { method: 'assignOnce', mode: 'caller', reach: 'both' },
-  { method: 'assignOnce', mode: 'nowait', reach: 'both' },
-  { method: 'assignOnce', mode: 'nowait', reach: 'both' },
-  { method: 'assignOnce', mode: 'nowait', reach: 'both' },
-  { method: 'refreshDrainMigrationLeasesOnce', mode: 'request', reach: 'request' },
-  // changeActivity, acquireActivity, activateControl and
-  // removeSupersededSameCellControls no longer take the inventory: they lock
-  // only the one or two cell rows they touch, in cell_id order (lockCellRows),
-  // so they cannot cycle with placement's ordered inventory lock, and the
-  // 23-row lock there had serialised every reconnect in the fleet behind every
-  // other one. The control accept path went one step further and takes no cell
-  // read lock at all: its single conditional write is the last statement before
-  // COMMIT.
-  { method: 'startEvacuation', mode: 'request', reach: 'request' },
-  { method: 'completeEvacuationFromDeadSourceOnce', mode: 'request', reach: 'request' },
-  { method: 'completeEvacuationFromDeadSourceOnce', mode: 'nowait', reach: 'request' },
-  { method: 'supersedeRegisteredEvacuationOnce', mode: 'request', reach: 'request' },
-  { method: 'supersedeRegisteredEvacuationOnce', mode: 'nowait', reach: 'request' },
-  { method: 'prepareRegisteredCellSupersession', mode: 'request', reach: 'request' },
-  { method: 'prepareRegisteredCellSupersession', mode: 'request', reach: 'request' },
-  { method: 'completeEvacuation', mode: 'nowait', reach: 'both' },
-  { method: 'completeEvacuation', mode: 'pool-default', reach: 'both' },
-  { method: 'rebalanceDormant', mode: 'request', reach: 'request' },
-  // startRegionalRehomeCandidate is gone: the rehome commit reads the inventory
-  // unlocked and locks only its target row, NOWAIT, as the statement before
-  // COMMIT (reserveRegionalRehomeTargetRow below).
-  { method: 'completeRegionalRehomeCandidate', mode: 'nowait', reach: 'sweep' },
-  // Both regional-rehome abort sweeps share this rollback; only the 24-hour
-  // one also disables the durable switch.
-  { method: 'rollBackStalledRegionalRehomes', mode: 'nowait', reach: 'sweep' },
-  { method: 'abortExpiredEvacuations', mode: 'nowait', reach: 'sweep' },
-  { method: 'abortExpiredEvacuations', mode: 'nowait', reach: 'sweep' },
-  { method: 'releaseExpiredActivityLeases', mode: 'nowait', reach: 'sweep' },
-  { method: 'releaseExpiredActivity', mode: 'nowait', reach: 'sweep' }
-  // reconcileReservationAccounting and leastLoadedCell are gone too: the first
-  // repairs exactly two cells' counters and now holds only those rows, and the
-  // second selects from the inventory its single caller has already locked.
-]
-
-// Every inline `FROM relay_cells ... FOR UPDATE` outside the named lock helpers,
-// in source order: whole-table locks in reconciliation and sticky placement,
-// and single-row locks for a cell the method is already scoped to (heartbeat,
-// fence, drain generation, configuration, or a reservation adjust that runs
-// under a lock its caller already holds). A new inline lock fails the census
-// below until it is listed here; per-connection paths that touch more than one
-// cell go through lockCellRows so the order is fixed.
-const NAMED_LOCK_HELPERS = ['lockCellInventory', 'lockGeneralCellInventory', 'lockCellRows']
-
-const INLINE_CELL_LOCK_SITES = [
-  'reconcileCellsWithOptions',
-  'assignStickyOnce',
-  'recordCellHeartbeat',
-  'attestCellFence',
-  'adoptLegacyCellFence',
-  'commitLegacyCellFenceAdoption',
-  'prepareCellFenceAttempt',
-  'attestCellFenceAttempt',
-  'attestCellFenceAttempt',
-  'configureCell',
-  'reserveRegionalRehomeTargetRow',
-  'assertDrainCellGeneration',
-  'adjustCellReservation'
-]
-
-// The background sweeps, and nothing else. A method reachable from one of these
-// can be entered by a sweep tick, whatever else can also enter it. Both lists are
-// read from source, so a new sweep step or a new route widens the derivation here
-// instead of silently widening what a bounded wait can be entered from.
-const SWEEP_ENTRY_FILES = ['./assignment-cleanup-steps.ts', './regional-rehome-worker.ts']
-const REQUEST_ENTRY_FILES = [
-  './app.ts',
-  './relay-server.ts',
-  './host-session-registry.ts',
-  './cell-admission-startup.ts'
-]
-
-const DECLARATION = /^ {2}(?:private |public )?(?:static )?(?:async )?([A-Za-z_][\w]*)[(<]/
-
-function storeSource(): string[] {
-  return readFileSync(new URL('./assignment-store.ts', import.meta.url), 'utf8').split('\n')
-}
-
-function entryPoints(files: string[]): string[] {
-  return files.flatMap((file) =>
-    [
-      ...readFileSync(new URL(file, import.meta.url), 'utf8').matchAll(
-        /assignments\.([A-Za-z_][\w]*)\(/g
-      )
-    ].map((call) => call[1]!)
-  )
-}
-
-// Same-class call graph: store methods only ever reach each other through `this.`.
-function storeCallGraph(lines: string[]): Map<string, Set<string>> {
-  const bounds: { name: string; start: number }[] = []
-  lines.forEach((line, index) => {
-    const declaration = DECLARATION.exec(line)
-    if (declaration) bounds.push({ name: declaration[1]!, start: index })
-  })
-  const callees = new Map<string, Set<string>>()
-  bounds.forEach((method, index) => {
-    const end = bounds[index + 1]?.start ?? lines.length
-    const names = callees.get(method.name) ?? new Set<string>()
-    for (const call of lines
-      .slice(method.start, end)
-      .join('\n')
-      .matchAll(/this\.([A-Za-z_][\w]*)\s*\(/g)) {
-      names.add(call[1]!)
-    }
-    callees.set(method.name, names)
-  })
-  return callees
-}
-
-function closure(callees: Map<string, Set<string>>, roots: string[]): Set<string> {
-  const reached = new Set<string>()
-  const pending = [...roots]
-  while (pending.length > 0) {
-    const name = pending.pop()!
-    if (reached.has(name)) continue
-    reached.add(name)
-    for (const callee of callees.get(name) ?? []) if (!reached.has(callee)) pending.push(callee)
-  }
-  return reached
-}
-
-// Why: a hand-written reachability column is a claim, not a check. Derive both
-// directions, so a new sweep edge into a bounded site fails here instead of in
-// production, and so 'sweep' and 'both' stop being asserted by hand.
-function derivedReachability(lines: string[]): (method: string) => Reachability {
-  const callees = storeCallGraph(lines)
-  const sweep = closure(callees, entryPoints(SWEEP_ENTRY_FILES))
-  const request = closure(callees, entryPoints(REQUEST_ENTRY_FILES))
-  return (method) =>
-    sweep.has(method)
-      ? request.has(method)
-        ? 'both'
-        : 'sweep'
-      : request.has(method)
-        ? 'request'
-        : 'orphan'
-}
-
-function readCallSites(): { method: string; mode: CensusMode }[] {
-  const sites: { method: string; mode: CensusMode }[] = []
-  let method = '<module>'
-  for (const line of storeSource()) {
-    const declaration = DECLARATION.exec(line)
-    if (declaration) method = declaration[1]!
-    if (/private async lock(General)?CellInventory\(/.test(line)) continue
-    const call = /lock(?:General)?CellInventory\(\s*\w+\s*,\s*(?:'([a-z-]+)'|(\w+))\s*\)/.exec(line)
-    if (!call) continue
-    sites.push({ method, mode: (call[1] ?? 'caller') as CensusMode })
-  }
-  return sites
-}
-
-
-// Tier 3 and tier 4 of the row lock order documented in assignment-store.ts. A
-// transaction that takes relay_cells before this host's reservation rows can
-// cycle with one that takes them the other way round, and PostgreSQL resolves
-// that as a 40P01 during exactly the drain and rehome waves these paths exist
-// to run. The cell row is the one every host on a cell shares, so it is the
-// lock that must be taken last, which fixes the direction for everyone else.
-const CELL_LOCK_CALL =
-  /this\.(?:lockCellInventory|lockGeneralCellInventory|lockCellRows|adjustCellReservationAtomically|adjustCellReservation)\(|UPDATE relay_cells/
-const RESERVATION_LOCK_CALL =
-  /this\.(?:lockControlConnectionReservations|insertControlConnectionReservation|claimControlConnectionReservation|releaseSupersededControlConnectionReservations)\(|(?:UPDATE|INTO|DELETE FROM)\s+relay_control_connection_reservations/
-
-// The lock helpers themselves, plus the one reporting query that reads both
-// tables without locking either.
-const ROW_LOCK_ORDER_EXEMPT = [
-  'lockCellInventory',
-  'lockGeneralCellInventory',
-  'lockCellRows',
-  'lockControlConnectionReservations',
-  'adjustCellReservation',
-  'adjustCellReservationAtomically',
-  'insertControlConnectionReservation',
-  'claimControlConnectionReservation',
-  'releaseSupersededControlConnectionReservations',
-  'cellDeploymentStatus'
-]
-
-function methodSpans(lines: string[]): { name: string; start: number; end: number }[] {
-  const starts: { name: string; start: number }[] = []
-  lines.forEach((line, index) => {
-    const declaration = DECLARATION.exec(line)
-    if (declaration) starts.push({ name: declaration[1]!, start: index })
-  })
-  return starts.map((entry, index) => ({
-    ...entry,
-    end: starts[index + 1]?.start ?? lines.length
-  }))
-}
-
-function pathsTakingCellsBeforeReservations(lines: string[]): string[] {
-  const offending: string[] = []
-  for (const span of methodSpans(lines)) {
-    if (ROW_LOCK_ORDER_EXEMPT.includes(span.name)) continue
-    let cell = Number.POSITIVE_INFINITY
-    let reservation = Number.POSITIVE_INFINITY
-    for (let index = span.start; index < span.end; index++) {
-      const line = lines[index]!
-      if (CELL_LOCK_CALL.test(line)) cell = Math.min(cell, index)
-      if (RESERVATION_LOCK_CALL.test(line)) reservation = Math.min(reservation, index)
-    }
-    if (cell < reservation && reservation !== Number.POSITIVE_INFINITY) {
-      offending.push(span.name)
-    }
-  }
-  return offending
-}
-
-describe('cell inventory lock call-site census', () => {
-  it('classifies every call site exactly as recorded', () => {
-    expect(readCallSites()).toEqual(CENSUS.map(({ method, mode }) => ({ method, mode })))
-  })
-
-  // Why: the census only sees lockCellInventory calls, so a hand-written
-  // `relay_cells ... FOR UPDATE` would escape classification entirely.
-  it('routes every relay_cells row lock through a named lock helper', () => {
-    const lines = storeSource()
-    const rawSites: string[] = []
-    // Whole statements, not a fixed window: a wide column list or a raw
-    // FOR UPDATE inside query() must not slip past.
-    const source = lines.join('\n')
-    const bounds: { name: string; start: number }[] = []
-    lines.forEach((line, index) => {
-      const declaration = DECLARATION.exec(line)
-      if (declaration) bounds.push({ name: declaration[1]!, start: index })
-    })
-    const methodAt = (offset: number): string => {
-      const lineIndex = source.slice(0, offset).split('\n').length - 1
-      let name = '<module>'
-      for (const bound of bounds) if (bound.start <= lineIndex) name = bound.name
-      return name
-    }
-    const tick = String.fromCharCode(96)
-    const statementCall = new RegExp(
-      '\\.(queryLocked|query)\\(\\s*' + tick + '([^' + tick + ']*)' + tick,
-      'g'
-    )
-    for (const call of source.matchAll(statementCall)) {
-      const statement = call[2]!
-      if (!/\bFROM\s+relay_cells\b/.test(statement)) continue
-      const locks = call[1] === 'queryLocked' || /\bFOR\s+UPDATE\b/.test(statement)
-      if (!locks) continue
-      const method = methodAt(call.index)
-      if (NAMED_LOCK_HELPERS.includes(method)) continue
-      rawSites.push(method)
-    }
-    expect(rawSites).toEqual(INLINE_CELL_LOCK_SITES)
-  })
-
-  it('takes the host reservation rows before the shared cell row everywhere', () => {
-    expect(pathsTakingCellsBeforeReservations(storeSource())).toEqual([])
-  })
-
-  it('leaves no call site taking the inventory without naming a mode', () => {
-    const source = readFileSync(new URL('./assignment-store.ts', import.meta.url), 'utf8')
-    const unclassified = source
-      .split('\n')
-      .filter((line) => /lock(?:General)?CellInventory\(\s*\w+\s*\)/.test(line))
-      .filter((line) => !line.includes('private async'))
-
-    expect(unclassified).toEqual([])
-  })
-
-  it('derives the same reachability the census claims', () => {
-    const reachOf = derivedReachability(storeSource())
-
-    expect(readCallSites().map(({ method }) => reachOf(method))).toEqual(
-      CENSUS.map((entry) => entry.reach)
-    )
-  })
-
-  // Why: this is the whole point of the classification. A shorter wait on a
-  // sweep-reachable site turns contention into a terminal transaction failure
-  // that counts against the incident gate's relayPostgresRetryExhausted bar.
-  // Why: the hold distribution is what the 500ms bound will be tuned against, so
-  // a mode that stops asking for it goes unmeasured in exactly the lane that
-  // matters. Nothing else in the suite reads the pool-default branch.
-  it('measures the hold in every lock mode', () => {
-    const modes: CellInventoryLockMode[] = ['request', 'nowait', 'pool-default']
-
-    expect(modes.map((mode) => cellInventoryLockOptions(mode).measureHoldMs)).toEqual([
-      true,
-      true,
-      true
-    ])
-  })
-
-  it('never puts a sweep-reachable site on the bounded wait', () => {
-    const reachOf = derivedReachability(storeSource())
-    const bounded = readCallSites().filter(
-      (site) => site.mode === 'request' && ['sweep', 'both'].includes(reachOf(site.method))
-    )
-
-    expect(bounded).toEqual([])
-  })
-
-  it('routes every sweep-only site to NOWAIT so it can skip the tick', () => {
-    const reachOf = derivedReachability(storeSource())
-    const queueing = readCallSites().filter(
-      (site) => reachOf(site.method) === 'sweep' && site.mode !== 'nowait'
-    )
-
-    expect(queueing).toEqual([])
-  })
-})
diff --git a/cloud/apps/relay/src/cell-inventory-lock-contention.test.ts b/cloud/apps/relay/src/cell-inventory-lock-contention.test.ts
index 44a4b990ea8d..1bf3153f3e44 100644
--- a/cloud/apps/relay/src/cell-inventory-lock-contention.test.ts
+++ b/cloud/apps/relay/src/cell-inventory-lock-contention.test.ts
@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
 const fakes = vi.hoisted(() => ({
@@ -78,7 +77,6 @@ describe('bounded cell-inventory lock wait', () => {
   // Why: a bound at or above the pool default would fence nothing, and one far
   // below the hold time would convert ordinary contention into terminal failures.
   it('keeps the request bound strictly inside the pool default', () => {
-    expect(CELL_INVENTORY_LOCK_TIMEOUT_MS).toBe(500)
     expect(CELL_INVENTORY_LOCK_TIMEOUT_MS).toBeLessThan(POSTGRES_LOCK_TIMEOUT_MS)
   })
 
@@ -361,15 +359,6 @@ describe('bounded cell-inventory lock wait', () => {
     await database.close()
   })
 
-  // Why: index.ts boots a server on import, so its wiring can only be read. An
-  // unspread hold metric is invisible: the flush simply omits the fields.
-  it('spreads the hold counts into the runtime metrics flush', () => {
-    const source = readFileSync(new URL('./index.ts', import.meta.url), 'utf8')
-    const flush = /observability\.start\(\(\) => \(\{([^}]*)\}\)\)/.exec(source)
-
-    expect(flush?.[1]).toContain('...consumeRelayCellInventoryHold(database)')
-  })
-
   // Why: 500ms is a first value, not a measurement. Tuning it needs the hold
   // distribution, which no runtime metric carried.
   it('reports how long the inventory lock was held to COMMIT', async () => {
@@ -492,25 +481,6 @@ describe('background sweeps skip a contended cell inventory', () => {
     expect(warnings.entries).toEqual([])
     await database.close()
   })
-
-  it('still aborts the expired evacuation once the inventory is free', async () => {
-    const database = await openInMemoryRelayDatabase()
-    const probe = new InventoryLockProbe(database)
-    let now = 1_000
-    const store = new RelayAssignmentStore(probe, () => now)
-    await store.reconcileCells(CELLS)
-    const assignment = await store.assign(identity)
-    await store.activateControl(identity, {
-      cellId: assignment.cellId,
-      assignmentEpoch: assignment.assignmentEpoch,
-      generation: 1
-    })
-    await store.startEvacuation(identity, 'cell-b')
-    now += 24 * 60 * 60_000
-
-    expect(await store.abortExpiredEvacuations()).toBe(1)
-    await database.close()
-  })
 })
 
 // Returns each inventory lock the run took, as its bound or 'nowait'.
diff --git a/cloud/apps/relay/src/relay-first-frame-close.blackbox.test.ts b/cloud/apps/relay/src/relay-first-frame-close.blackbox.test.ts
new file mode 100644
index 000000000000..8a3d797cdfb9
--- /dev/null
+++ b/cloud/apps/relay/src/relay-first-frame-close.blackbox.test.ts
@@ -0,0 +1,272 @@
+import { connect, type Socket } from 'node:net'
+import { afterEach, expect, it, vi } from 'vitest'
+import { RELAY_CLOSE_CODE, RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract'
+import { loadRelayConfig } from './config.js'
+import type { RelayDatabase } from './database.js'
+import { createRelayServer } from './relay-server.js'
+
+const cleanups: (() => Promise<void> | void)[] = []
+afterEach(async () => {
+  for (const cleanup of cleanups.splice(0).reverse()) await cleanup()
+  vi.restoreAllMocks()
+})
+
+const IDLE_LEDGER = {
+  physicalConnections: 0,
+  inFlightConnections: 0,
+  reservedConnectionUnits: 0,
+  enforcedConnectionUnits: 0
+}
+
+async function fixture(
+  options: { role?: 'cell' | 'director'; hardCap?: number } = {}
+) {
+  const role = options.role ?? 'cell'
+  const database: RelayDatabase = {
+    query: vi.fn(async () => []),
+    queryLocked: vi.fn(async () => []),
+    transaction: (operation) => operation(database),
+    close: async () => {}
+  }
+  const config = loadRelayConfig({
+    ORCA_RELAY_PUBLIC_URL: 'http://127.0.0.1',
+    ORCA_RELAY_CELL_URL: 'http://127.0.0.1',
+    ORCA_RELAY_AUTH_ISSUER: 'https://auth.example.test',
+    ORCA_RELAY_JWKS_URL: 'https://auth.example.test/jwks',
+    ORCA_RELAY_ASSIGNMENT_SIGNING_KEY: 'synthetic-assignment-key-for-test-only',
+    ORCA_RELAY_ROLE: role,
+    ORCA_RELAY_ADMIN_AUDIENCE: 'https://auth.example.test/admin',
+    ORCA_RELAY_DEPLOY_SERVICE_ACCOUNT: 'deploy@example.test',
+    ORCA_RELAY_CELL_CONNECTION_HARD_CAP: '600',
+    ORCA_RELAY_CELL_CONNECTION_UNOBSERVED_BOUND: '60',
+    ...(role === 'director'
+      ? {
+          ORCA_RELAY_CELLS_JSON: JSON.stringify([
+            { id: 'cell-1', url: 'https://cell-1.example.test', capacityRequests: 900 }
+          ])
+        }
+      : {})
+  })
+  const relay = createRelayServer(config, database, {
+    connectionLedgerLimits: { hardCap: options.hardCap ?? 3, controlReserve: 1 }
+  })
+  await new Promise<void>((resolve) => relay.server.listen(0, '127.0.0.1', resolve))
+  cleanups.push(() => new Promise<void>((resolve) => relay.server.close(() => resolve())))
+  const address = relay.server.address()
+  if (!address || typeof address === 'string') throw new Error('missing test port')
+  return { relay, port: address.port, database }
+}
+
+type RawPeer = {
+  socket: Socket
+  received: () => Buffer
+  transport: () => { ended: boolean; error: string | null }
+}
+
+async function silentUpgrade(port: number, target: string): Promise<RawPeer> {
+  const socket = connect(port, '127.0.0.1')
+  cleanups.push(() => {
+    socket.destroy()
+  })
+  await new Promise<void>((resolve, reject) => {
+    let header = ''
+    socket.once('error', reject)
+    socket.once('connect', () => {
+      socket.write(
+        `GET ${target} HTTP/1.1\r\nHost: 127.0.0.1\r\nConnection: Upgrade\r\n` +
+          'Upgrade: websocket\r\nSec-WebSocket-Version: 13\r\n' +
+          // RFC 6455 example nonce, matching the existing raw-upgrade fixture.
+          'Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n'
+      )
+    })
+    const readHeader = (chunk: Buffer): void => {
+      header += chunk.toString()
+      if (!header.includes('\r\n\r\n')) return
+      socket.off('data', readHeader)
+      if (header.startsWith('HTTP/1.1 101 ')) resolve()
+      else reject(new Error(header.split('\r\n')[0]))
+    }
+    socket.on('data', readHeader)
+  })
+  socket.removeAllListeners('error')
+  // This raw peer reads frames without answering the server's close handshake.
+  const chunks: Buffer[] = []
+  let ended = false
+  let error: string | null = null
+  socket.on('data', (chunk: Buffer) => chunks.push(chunk))
+  socket.on('end', () => {
+    ended = true
+  })
+  socket.on('error', (caught: Error) => {
+    error = caught.message
+  })
+  return {
+    socket,
+    received: () => Buffer.concat(chunks),
+    transport: () => ({ ended, error })
+  }
+}
+
+// A 43-character base64url credential is the shortest value RelayAuthSchema accepts.
+const WELL_FORMED_CREDENTIAL = 'abcdefghijklmnopqrstuvwxyzABCDEFGH012345678'
+
+function maskedTextFrame(payload: string): Buffer {
+  const body = Buffer.from(payload)
+  const mask = Buffer.from([1, 2, 3, 4])
+  const masked = Buffer.from(body.map((byte, index) => byte ^ mask[index % 4]!))
+  return Buffer.concat([Buffer.from([0x81, 0x80 | body.length]), mask, masked])
+}
+
+function relayAuthFrame(): Buffer {
+  return maskedTextFrame(
+    JSON.stringify({
+      type: 'relay-auth',
+      v: 1,
+      mode: 'connect',
+      credential: WELL_FORMED_CREDENTIAL
+    })
+  )
+}
+
+// The close frame is the last unmasked frame a rejected peer receives: 0x88, length,
+// then a big-endian status code followed by the UTF-8 reason.
+function readCloseFrame(received: Buffer): { code: number; reason: string } | null {
+  const start = received.lastIndexOf(0x88)
+  if (start < 0 || received.length < start + 4) return null
+  const length = received[start + 1]!
+  return {
+    code: received.readUInt16BE(start + 2),
+    reason: received.subarray(start + 4, start + 2 + length).toString('utf8')
+  }
+}
+
+async function expectIdleLedger(
+  relay: Awaited<ReturnType<typeof fixture>>['relay'],
+  timeout: number
+): Promise<void> {
+  await vi.waitFor(() => expect(relay.connectionSnapshot()).toMatchObject(IDLE_LEDGER), { timeout })
+}
+
+const PHONE_TARGET = '/v1/connect/abcdefghijklmnop'
+
+it.each([
+  { label: 'first-frame timeout', target: PHONE_TARGET, opcode: undefined },
+  { label: 'binary first frame', target: PHONE_TARGET, opcode: 0x82 },
+  { label: 'invalid phone auth', target: PHONE_TARGET, opcode: 0x81 },
+  { label: 'invalid host-data auth', target: '/v1/host/data/connection-1', opcode: 0x81 }
+])(
+  'releases admission after $label even when the peer ignores close',
+  async ({ target, opcode }) => {
+    const { relay, port, database } = await fixture()
+    const peer = await silentUpgrade(port, target)
+    const firstFrameDeadline = opcode === undefined ? RELAY_PROTOCOL_LIMITS.firstFrameDeadlineMs : 0
+    if (opcode !== undefined) peer.socket.write(Buffer.from([opcode, 0x80, 0, 0, 0, 0]))
+    await expectIdleLedger(relay, firstFrameDeadline + 2_000)
+    expect(relay.runtimeCounts().preAuthConnections).toBe(0)
+    expect(database.query).not.toHaveBeenCalled()
+    expect(database.queryLocked).not.toHaveBeenCalled()
+    await silentUpgrade(port, PHONE_TARGET)
+    expect(relay.connectionSnapshot()?.enforcedConnectionUnits).toBe(2)
+  }
+)
+
+it('releases admission after a rejected director invite when the peer ignores close', async () => {
+  const { relay, port } = await fixture({ role: 'director' })
+  const peer = await silentUpgrade(port, PHONE_TARGET)
+  peer.socket.write(relayAuthFrame())
+  await expectIdleLedger(relay, 2_000)
+  expect(readCloseFrame(peer.received())).toEqual({
+    code: RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL,
+    reason: 'invalid invite'
+  })
+  expect(relay.runtimeCounts().preAuthConnections).toBe(0)
+  await silentUpgrade(port, PHONE_TARGET)
+  expect(relay.connectionSnapshot()?.enforcedConnectionUnits).toBe(2)
+})
+
+it('releases admission after a director move redirect when the peer ignores close', async () => {
+  const { relay, port } = await fixture({ role: 'director' })
+  const identity = { userId: 'user-1', relayHostId: 'abcdefghijklmnop' }
+  vi.spyOn(relay.store, 'resolveInviteForMove').mockResolvedValue({
+    userId: identity.userId,
+    relayDeviceId: 'device-1'
+  })
+  vi.spyOn(relay.assignments, 'resolve').mockResolvedValue({
+    ...identity,
+    cellId: 'cell-1',
+    cellUrl: 'https://cell-1.example.test',
+    assignmentEpoch: 1,
+    leaseExpiresAt: Date.now() + 60_000
+  })
+  const peer = await silentUpgrade(port, PHONE_TARGET)
+  peer.socket.write(relayAuthFrame())
+  await expectIdleLedger(relay, 2_000)
+  expect(peer.received().toString('utf8')).toContain('"type":"relay-moved"')
+  expect(readCloseFrame(peer.received())).toEqual({
+    code: RELAY_CLOSE_CODE.DRAINING,
+    reason: 'connect to assigned cell'
+  })
+  await silentUpgrade(port, PHONE_TARGET)
+  expect(relay.connectionSnapshot()?.enforcedConnectionUnits).toBe(2)
+})
+
+// A peer that keeps draining its socket does get the rejection: the close frame is written
+// before the force-close timer can fire, and TCP delivers those bytes ahead of the FIN.
+//
+// Scope, deliberately narrow: this peer reads every byte as it arrives, so the assertion below
+// speaks only for a responsive peer. It is not evidence that delivery survives backpressure —
+// `terminate()` destroys the socket a second later, and a frame still queued in the kernel or in
+// `ws`'s own buffer goes unsent. Treat the rejection as best effort; the bound on the close is
+// what the trade-off actually buys.
+it('delivers the rejection code and a graceful FIN to a peer that keeps reading', async () => {
+  const { relay, port } = await fixture()
+  const peer = await silentUpgrade(port, PHONE_TARGET)
+  peer.socket.write(maskedTextFrame(JSON.stringify({ type: 'relay-auth', v: 1, mode: 'wrong' })))
+  await vi.waitFor(() => expect(peer.transport().ended).toBe(true), { timeout: 3_000 })
+  expect(peer.received().toString('utf8')).toContain('"code":4401')
+  expect(readCloseFrame(peer.received())).toEqual({
+    code: RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL,
+    reason: 'invalid relay auth'
+  })
+  expect(peer.transport().error).toBeNull()
+  await expectIdleLedger(relay, 2_000)
+})
+
+const BINARY_FIRST_FRAME = Buffer.from([0x82, 0x80, 0, 0, 0, 0])
+// maxPreAuthPerSource caps how many unauthenticated sockets one source may hold at once.
+const CONCURRENT_PEERS_PER_SOURCE = 4
+
+it('returns capacity to its exact baseline after repeated bursts of rejections', async () => {
+  const { relay, port } = await fixture({ hardCap: 2 * CONCURRENT_PEERS_PER_SOURCE + 1 })
+  for (let wave = 0; wave < 3; wave++) {
+    const peers = await Promise.all(
+      Array.from({ length: CONCURRENT_PEERS_PER_SOURCE }, () =>
+        silentUpgrade(port, PHONE_TARGET)
+      )
+    )
+    expect(relay.connectionSnapshot()).toMatchObject({
+      enforcedConnectionUnits: 2 * CONCURRENT_PEERS_PER_SOURCE
+    })
+    for (const peer of peers) peer.socket.write(BINARY_FIRST_FRAME)
+    await expectIdleLedger(relay, 3_000)
+    expect(relay.runtimeCounts().preAuthConnections).toBe(0)
+  }
+})
+
+// A rejection racing the peer's own disconnect must release once, not twice: the ledger
+// does not clamp at zero, so a double release shows up as a negative count here.
+it('releases exactly once when a rejected peer disconnects at the same moment', async () => {
+  const { relay, port } = await fixture({ hardCap: 2 * CONCURRENT_PEERS_PER_SOURCE + 1 })
+  const peers = await Promise.all(
+    Array.from({ length: CONCURRENT_PEERS_PER_SOURCE }, () => silentUpgrade(port, PHONE_TARGET))
+  )
+  for (const peer of peers) {
+    peer.socket.write(BINARY_FIRST_FRAME)
+    peer.socket.destroy()
+  }
+  await expectIdleLedger(relay, 3_000)
+  expect(relay.connectionSnapshot()).toMatchObject(IDLE_LEDGER)
+  expect(relay.runtimeCounts().preAuthConnections).toBe(0)
+  await silentUpgrade(port, PHONE_TARGET)
+  expect(relay.connectionSnapshot()?.enforcedConnectionUnits).toBe(2)
+})
diff --git a/cloud/apps/relay/src/relay-server.ts b/cloud/apps/relay/src/relay-server.ts
index e9a08398da9f..b90c322d1c24 100644
--- a/cloud/apps/relay/src/relay-server.ts
+++ b/cloud/apps/relay/src/relay-server.ts
@@ -276,7 +276,7 @@ export function createRelayServer(
       finished = true
       authenticated(source)
       observability.recordAuth(false)
-      socket.close(RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL, 'first frame timeout')
+      closeRelayWebSocket(socket, RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL, 'first frame timeout')
     }, RELAY_PROTOCOL_LIMITS.firstFrameDeadlineMs)
     socket.once('message', (raw, binary) => {
       if (finished) return
@@ -285,7 +285,11 @@ export function createRelayServer(
       authenticated(source)
       if (binary) {
         observability.recordAuth(false)
-        socket.close(RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL, 'first frame must be text')
+        closeRelayWebSocket(
+          socket,
+          RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL,
+          'first frame must be text'
+        )
         return
       }
       void callback(raw).catch((error: unknown) => {
@@ -356,7 +360,11 @@ export function createRelayServer(
               webSocket.send(
                 JSON.stringify({ type: 'relay-hello', ok: false, code: RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL })
               )
-              webSocket.close(RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL, 'invalid relay auth')
+              closeRelayWebSocket(
+                webSocket,
+                RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL,
+                'invalid relay auth'
+              )
               return
             }
             if (config.role === 'director') {
@@ -376,7 +384,11 @@ export function createRelayServer(
                     code: RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL
                   })
                 )
-                webSocket.close(RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL, 'invalid invite')
+                closeRelayWebSocket(
+                  webSocket,
+                  RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL,
+                  'invalid invite'
+                )
                 return
               }
               phoneAdmission?.hostData.release()
@@ -389,7 +401,7 @@ export function createRelayServer(
                   assignmentEpoch: assignment.assignmentEpoch
                 })
               )
-              webSocket.close(RELAY_CLOSE_CODE.DRAINING, 'connect to assigned cell')
+              closeRelayWebSocket(webSocket, RELAY_CLOSE_CODE.DRAINING, 'connect to assigned cell')
               return
             }
             await sessions.acceptClient(
@@ -442,7 +454,11 @@ export function createRelayServer(
             const auth = HostDataAuthSchema.safeParse(firstPayload(raw, 'host-data-auth'))
             if (!auth.success) {
               observability.recordAuth(false)
-              webSocket.close(RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL, 'invalid host data auth')
+              closeRelayWebSocket(
+                webSocket,
+                RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL,
+                'invalid host data auth'
+              )
               return
             }
             const accepted = await sessions.acceptHostData(
@@ -566,8 +582,3 @@ export function createRelayServer(
     cellIncarnation
   }
 }
-
-export function closeWithDrain(socket: WebSocket, graceMs: number): void {
-  socket.send(JSON.stringify({ type: 'drain', graceMs, recovery: 'resolve-director' }))
-  socket.close(RELAY_CLOSE_CODE.DRAINING, 'resolve configured director')
-}
diff --git a/cloud/apps/relay/src/relay-websocket-close.ts b/cloud/apps/relay/src/relay-websocket-close.ts
index d4a7f61a3ee2..4b0517c3e531 100644
--- a/cloud/apps/relay/src/relay-websocket-close.ts
+++ b/cloud/apps/relay/src/relay-websocket-close.ts
@@ -3,6 +3,14 @@ import type WebSocket from 'ws'
 const RELAY_WEBSOCKET_FORCE_CLOSE_MS = 1_000
 const forceCloseTimers = new WeakMap<WebSocket, ReturnType<typeof setTimeout>>()
 
+// Delivering the rejection is best effort, and deliberately so. The close frame carrying the
+// code and reason is written before the timer can fire, so a peer reading normally gets its
+// rejection ahead of the FIN — that much is asserted in relay-first-frame-close.blackbox.test.ts.
+// It is not a delivery guarantee: `ws` writes the frame to the socket, and `terminate()` destroys
+// the socket a second later, so under backpressure the frame (and any `relay-moved` message queued
+// before it) can still be dropped unsent even though the peer never stopped reading. Bounding the
+// close is what keeps a stalled peer from holding admission, and no finite grace makes delivery
+// certain. Keep the close write ahead of any new wait added here.
 export function closeRelayWebSocket(socket: WebSocket, code: number, reason: string): void {
   if (socket.readyState === socket.CLOSED) return
   if (!forceCloseTimers.has(socket)) {
diff --git a/cloud/dev/scripts/prepare-relay-production-capacity-canary.test.mjs b/cloud/dev/scripts/prepare-relay-production-capacity-canary.test.mjs
index 5588bcd27fcf..ee30b6340fab 100644
--- a/cloud/dev/scripts/prepare-relay-production-capacity-canary.test.mjs
+++ b/cloud/dev/scripts/prepare-relay-production-capacity-canary.test.mjs
@@ -2,8 +2,7 @@ import assert from 'node:assert/strict'
 import { describe, it } from 'node:test'
 import {
   parseProductionCapacityCellArguments,
-  prepareProductionCapacityCell,
-  PRODUCTION_CAPACITY_CELL_IDS
+  prepareProductionCapacityCell
 } from './prepare-relay-production-capacity-canary.mjs'
 
 const config = {
@@ -63,24 +62,6 @@ function canaryFetch() {
 
 describe('production Relay capacity cell admission', () => {
   it('allows only the serving rollout cells', () => {
-    assert.deepEqual(PRODUCTION_CAPACITY_CELL_IDS, [
-      'production-gce-c7',
-      'production-gce-c8',
-      'production-gce-c9',
-      'production-gce-c10',
-      'production-gce-c13',
-      'production-gce-c14',
-      'production-gce-c15',
-      'production-gce-c16',
-      'production-gce-c19',
-      'production-gce-c20',
-      'production-gce-c21',
-      'production-gce-c22',
-      'production-gce-c23',
-      'production-gce-c24',
-      'production-gce-c25',
-      'production-gce-c26'
-    ])
     assert.deepEqual(parseProductionCapacityCellArguments([
       '--director-origin', 'https://relay.onorca.dev',
       '--cell-origin', 'https://c7.relay.onorca.dev',
diff --git a/cloud/dev/scripts/production-cloud-sql-rollout-lock.test.mjs b/cloud/dev/scripts/production-cloud-sql-rollout-lock.test.mjs
index d79d4f910460..628b09176da6 100644
--- a/cloud/dev/scripts/production-cloud-sql-rollout-lock.test.mjs
+++ b/cloud/dev/scripts/production-cloud-sql-rollout-lock.test.mjs
@@ -1,5 +1,4 @@
 import assert from 'node:assert/strict'
-import { readFileSync } from 'node:fs'
 import { test } from 'node:test'
 import {
   LEASED_WORKFLOWS,
@@ -21,7 +20,6 @@ import {
   revisionMintingScripts,
   workflowFiles
 } from './cloud-sql-rollout-lock-census.mjs'
-import { relayWorkflowFile } from './relay-repository.mjs'
 
 const expectedLease = { production: PRODUCTION_LEASE, staging: STAGING_LEASE, selectable: SELECTABLE_LEASE }
 const leasedFiles = Object.keys(LEASED_WORKFLOWS)
@@ -182,29 +180,3 @@ test('census: no workflow rolls out against the shared instance outside the leas
     assert.ok(!(file in NOT_A_CLOUD_SQL_CANDIDATE), `${file} cannot be both leased and a non-candidate`)
   }
 })
-
-// The API and auth deploy scripts share this contract but stay in the private repository.
-const serviceCapScripts = ['dev/scripts/deploy-relay-blue-green.mjs']
-
-test('budgets tagged Cloud Run candidates outside the service-wide instance cap', () => {
-  for (const file of serviceCapScripts) {
-    const script = readFileSync(new URL(`../../${file}`, import.meta.url), 'utf8')
-    assert.match(script, /'--no-traffic'/, file)
-    assert.match(script, /'--max'/, file)
-  }
-  const budget = readFileSync(
-    new URL('../../dev/scripts/relay-cloud-sql-connection-budget.mjs', import.meta.url),
-    'utf8'
-  )
-  assert.match(budget, /directly addressable tagged revisions outside service-level caps/)
-  assert.match(
-    budget,
-    /apiCandidate: retainedDirectorRollback \+ inputs\.apiInstances \* inputs\.apiPoolMax/
-  )
-  const director = readWorkflow(relayWorkflowFile('deploy-relay-production-director.yml'))
-  const capacity = readWorkflow(relayWorkflowFile('deploy-relay-production-capacity-job.yml'))
-  const asia = readWorkflow(relayWorkflowFile('operate-relay-asia-admission.yml'))
-  assert.match(director, /--max-instances "\$\{DIRECTOR_MAX_INSTANCES\}"/)
-  assert.match(capacity, /--max-instances 5/)
-  assert.match(asia, /--max-instances "\$\{DIRECTOR_MAX_INSTANCES\}"/)
-})
diff --git a/cloud/dev/scripts/push-gateway-workflow.test.mjs b/cloud/dev/scripts/push-gateway-workflow.test.mjs
index 3ee4fabe4109..5a8349c1855d 100644
--- a/cloud/dev/scripts/push-gateway-workflow.test.mjs
+++ b/cloud/dev/scripts/push-gateway-workflow.test.mjs
@@ -309,11 +309,6 @@ test('push credentials cannot assume the shared Relay deploy identity', () => {
   assert.doesNotMatch(terraform('push-gateway.tf'), /member\s*=\s*local\.relay_github_deploy_service_account_member/)
 })
 
-// A latest revision needs a successor even when validation is inert.
-test('dedicated database admits three simultaneous revision pools', () => {
-  assert.match(terraform('push-gateway.tf'), /var\.push_max_instances \* var\.push_database_pool_max \* 3 <= 64/)
-})
-
 test('push has only a dedicated database attachment and a narrowly scoped deployment lease', () => {
   const service = terraform('push-gateway.tf')
   const database = terraform('push-dedicated-database.tf')
diff --git a/cloud/dev/scripts/push-validation-workflow.test.mjs b/cloud/dev/scripts/push-validation-workflow.test.mjs
deleted file mode 100644
index e26769cfeb35..000000000000
--- a/cloud/dev/scripts/push-validation-workflow.test.mjs
+++ /dev/null
@@ -1,48 +0,0 @@
-import assert from 'node:assert/strict'
-import { readFileSync } from 'node:fs'
-import test from 'node:test'
-import { readRelayWorkflow } from './relay-repository.mjs'
-
-const workflow = readRelayWorkflow('push-deploy.yml')
-const position = (name) => {
-  const index = workflow.indexOf(`- name: ${name}`)
-  assert.notEqual(index, -1)
-  return index
-}
-const capability = position('Require image support for inert validation')
-const deploy = position('Deploy the candidate revision with no traffic')
-const activation = position('Retire inert validation and activate the verified image')
-const shift = position('Shift all traffic to the verified candidate')
-
-test('the exact build digest must support validation before production boot', () => {
-  assert.match(workflow, /docker buildx build --push --platform linux\/amd64 --provenance=false --metadata-file/)
-  assert.match(workflow, /containerimage\.digest/)
-  assert.doesNotMatch(workflow, /gcloud artifacts docker images describe/)
-  assert.ok(capability < deploy)
-  const preflight = workflow.slice(capability, deploy)
-  assert.match(preflight, /docker run --rm --network none --entrypoint node "\$\{IMAGE\}"/)
-  assert.match(preflight, /loadPushConfig\(env\)\.mode !== "validation"/)
-  assert.match(preflight, /validation_mode_not_fail_closed/)
-})
-
-test('inert validation and credential checks precede deliberate activation of the same digest', () => {
-  assert.match(workflow.slice(deploy, activation), /--update-env-vars ORCA_PUSH_MODE=validation/)
-  assert.match(workflow.slice(deploy, activation), /\.mode == "validation"/)
-  assert.ok(position('Prove the runtime identity can reach FCM') < activation)
-  const active = workflow.slice(activation, shift)
-  assert.ok(active.indexOf('gcloud run deploy') < active.indexOf('gcloud run revisions delete'))
-  assert.match(active, /--image "\$\{IMAGE\}"/)
-  assert.match(active, /--remove-env-vars ORCA_PUSH_MODE/)
-  assert.match(active, /\.spec\.containers\[0\]\.image == \$image/)
-  assert.match(active, /\.spec\.serviceAccountName == \$account/)
-  assert.match(active, /\.mode == "active"/)
-  assert.ok(active.indexOf('ACTIVATION_ATTEMPTED=true') < active.indexOf('gcloud run deploy'))
-  assert.match(workflow, /deletion below must stop its workers/)
-})
-
-test('production startup connects read-only and gates all background work in validation', () => {
-  const entry = readFileSync(new URL('../../apps/push/src/index.ts', import.meta.url), 'utf8')
-  assert.match(entry, /readOnly: config\.mode === 'validation'/)
-  assert.match(entry, /startPushBackground\(config,/)
-  assert.doesNotMatch(entry, /worker\.start\(/)
-})
diff --git a/cloud/dev/scripts/relay-asia-admission-workflow.test.mjs b/cloud/dev/scripts/relay-asia-admission-workflow.test.mjs
deleted file mode 100644
index 8283d43ca44e..000000000000
--- a/cloud/dev/scripts/relay-asia-admission-workflow.test.mjs
+++ /dev/null
@@ -1,375 +0,0 @@
-import assert from 'node:assert/strict'
-import { readFileSync } from 'node:fs'
-import { test } from 'node:test'
-import { relayWorkflowUrl } from './relay-repository.mjs'
-
-const workflow = readFileSync(
-  relayWorkflowUrl('operate-relay-asia-admission.yml'),
-  'utf8'
-)
-const iam = readFileSync(new URL('../../infra/terraform/relay-github-actions.tf', import.meta.url), 'utf8')
-const stagingProof = readFileSync(
-  relayWorkflowUrl('prove-relay-asia-staging.yml'),
-  'utf8'
-)
-const directorWorkflow = readFileSync(
-  relayWorkflowUrl('deploy-relay-production-director.yml'),
-  'utf8'
-)
-const terraformReadme = readFileSync(
-  new URL('../../infra/terraform/README.md', import.meta.url),
-  'utf8'
-)
-const proofIam = readFileSync(
-  new URL('../../infra/terraform/relay-asia-proof-iam.tf', import.meta.url),
-  'utf8'
-)
-const relayTerraform = readFileSync(
-  new URL('../../infra/terraform/relay.tf', import.meta.url),
-  'utf8'
-)
-const rolloutEvidence = readFileSync(
-  new URL('./relay-asia-rollout-evidence.mjs', import.meta.url),
-  'utf8'
-)
-const admissionBudgets = readFileSync(
-  new URL('../../packages/relay-contract/src/admission-budgets.ts', import.meta.url),
-  'utf8'
-)
-
-test('offers the exact audited admission modes under the shared deployment lock', () => {
-  for (const mode of [
-    'inspect', 'initialize', 'verify', 'register', 'configure', 'promote', 'rollback'
-  ]) {
-    assert.match(workflow, new RegExp(`\\b${mode}\\b`))
-  }
-  assert.match(workflow, /production-cloud-sql-rollout/)
-  assert.match(workflow, /relay-staging-mutation/)
-  assert.match(workflow, /selector-generation/)
-  assert.match(workflow, /selector-attempt-id/)
-})
-
-test('requires exact confirmations and uses the existing admin identity', () => {
-  assert.match(workflow, /INITIALIZE_ADMISSION_SELECTOR/)
-  assert.match(workflow, /REGISTER_ASIA_MIGRATION_ONLY/)
-  assert.match(workflow, /PROMOTE_ASIA_GENERAL/)
-  assert.match(workflow, /ROLLBACK_ASIA_MIGRATION_ONLY/)
-  assert.match(workflow, /CONFIGURE_ASIA_DIRECTOR/)
-  assert.match(workflow, /GCP_RELAY_DEPLOY_SERVICE_ACCOUNT/)
-  assert.match(workflow, /id_token_audience: \$\{\{ env\.DIRECTOR_ORIGIN \}\}\/v1\/admin\/drain/)
-  assert.match(iam, /"operate-relay-asia-admission\.yml"/)
-})
-
-test('discovers generation read-only and explicitly initializes only generation zero', () => {
-  assert.match(workflow, /leave empty only for inspect/)
-  assert.match(workflow, /test -z "\$\{EXPECTED_SELECTOR_GENERATION\}"/)
-  assert.match(workflow, /test "\$\{EXPECTED_SELECTOR_GENERATION\}" = 0/)
-  assert.match(workflow, /\^\(0\|\[1-9\]\[0-9\]\*\)\$/)
-  assert.match(workflow, /selector-membership-sha256/)
-  assert.match(workflow, /\^\[a-f0-9\]\{64\}\$/)
-  assert.match(workflow, /director-image-digest/)
-  assert.match(workflow, /\.spec\.containers\[0\]\.image == \$image/)
-})
-
-test('uploads one sanitized machine-readable admission result', () => {
-  assert.match(workflow, /sanitize-relay-asia-admission-result\.mjs/)
-  const upload = /- name: Upload sanitized admission result\n([\s\S]*?)(?=\n      - name:)/
-    .exec(workflow)?.[1]
-  assert.ok(upload)
-  assert.match(
-    upload,
-    /if: \$\{\{ inputs\.mode != 'configure' && steps\.admission-operation\.outcome == 'success' \}\}/
-  )
-  assert.match(upload, /uses: actions\/upload-artifact@v4/)
-  assert.match(
-    upload,
-    /relay-asia-admission-result-\$\{\{ github\.run_id \}\}-\$\{\{ github\.run_attempt \}\}/
-  )
-  assert.match(upload, /path: \$\{\{ runner\.temp \}\}\/relay-asia-admission-result\/result\.json/)
-  assert.match(upload, /if-no-files-found: error/)
-  assert.match(upload, /retention-days: 7/)
-  assert.ok(
-    workflow.indexOf('Upload sanitized admission result') >
-      workflow.indexOf('Upload immutable canary evidence')
-  )
-})
-
-test('binds selector operations and director configuration to reviewed implementations', () => {
-  assert.match(workflow, /operate-relay-asia-admission\.mjs/)
-  assert.match(workflow, /prepare-relay-asia-director-cells\.mjs/)
-  assert.match(workflow, /deploy-relay-blue-green\.mjs/)
-  assert.match(workflow, /--prune-revisions false/)
-  assert.doesNotMatch(workflow, /gcloud secrets versions add/)
-  assert.match(workflow, /orca-cloud-relay-regional-placement-enabled/)
-  assert.match(workflow, /\.valueSource\.secretKeyRef/)
-  assert.match(workflow, /jq -er --arg secret "\$\{REGIONAL_PLACEMENT_SECRET\}"/)
-  assert.doesNotMatch(workflow, /jq -e --arg secret "\$\{REGIONAL_PLACEMENT_SECRET\}"/)
-  assert.doesNotMatch(workflow, /--regional-placement-enabled/)
-  assert.doesNotMatch(workflow, /"\$\{\{ inputs\./)
-  assert.doesNotMatch(workflow, /dns/i)
-})
-
-test('requires immutable staged evidence and a timed production canary before expansion', () => {
-  assert.match(workflow, /actions: read/)
-  assert.match(workflow, /actions\/download-artifact@v4/)
-  assert.match(workflow, /relay-asia-staging-\$\{EVIDENCE_RUN_ID\}-\$\{EVIDENCE_RUN_ATTEMPT\}/)
-  assert.match(workflow, /evidence_kind=staging/)
-  assert.match(workflow, /load-relay-controls\.mjs/)
-  assert.match(workflow, /--controls 1/)
-  assert.match(workflow, /--splices 1/)
-  assert.match(workflow, /--splice-hold-seconds 60/)
-  assert.match(workflow, /--relay-asia-load-principals 1/)
-  assert.match(workflow, /--duration-seconds 300/)
-  assert.match(workflow, /--required-lease-horizons 2/)
-  assert.match(workflow, /pnpm\/action-setup@v4/)
-  assert.match(workflow, /Install exact canary dependencies/)
-  assert.match(workflow, /pnpm install --frozen-lockfile/)
-  assert.match(workflow, /pnpm --filter @orca-cloud\/relay-contract build/)
-  assert.ok(
-    workflow.indexOf('Build the canary Relay contract') <
-      workflow.indexOf('Run a real five-minute canary control and splice')
-  )
-  assert.match(workflow, /--load-report "\$\{RUNNER_TEMP\}\/relay-asia-canary-load\.json"/)
-  assert.match(workflow, /"production-gce-c28":"migration-only","production-gce-c29":"migration-only"/)
-  // C28/C29 promotion downloads C27's canary under exactly this name.
-  assert.match(workflow, /relay-asia-\$\{\{ steps\.inputs\.outputs\.canary_hostname \}\}-canary-\$\{\{ github\.run_id \}\}-\$\{\{ github\.run_attempt \}\}/)
-  assert.match(workflow, /echo "canary_hostname=\$\{canary_cell##\*-\}"/)
-  assert.match(workflow, /id: canary-evidence-upload/)
-  assert.match(workflow, /Return an unproven canary cell to migration-only/)
-  assert.match(workflow, /steps\.canary-evidence-upload\.outcome != 'success'/)
-  assert.match(workflow, /--mode recover-promotion[\s\S]*?--attempt-id "\$\{SELECTOR_ATTEMPT_ID\}"/)
-  assert.match(workflow, /--attempt-id "\$\{SELECTOR_ATTEMPT_ID\}-rollback"/)
-  assert.match(workflow, /evidence_kind=c27/)
-  assert.match(workflow, /orca_relay_runtime_metrics/)
-  assert.match(workflow, /relay-asia-rollout-evidence\.mjs create-canary \\\n\s+--cell-id "\$\{CANARY_CELL\}"/)
-  assert.match(workflow, /retention-days: 7/)
-  assert.match(workflow, /Require the exact director image before promotion/)
-  assert.match(workflow, /DIRECTOR_ORIGIN.*\/v1\/admin\/runtime-status/)
-  assert.match(workflow, /\.imageDigest.*IMAGE_DIGEST/)
-  const provenance = /- name: Verify evidence provenance and rollout binding before authentication\n([\s\S]*?)(?=\n      - id: auth)/
-    .exec(workflow)?.[1]
-  assert.ok(provenance)
-  assert.match(provenance, /\.head_sha \| select\(type == "string" and test\("\^\[a-f0-9\]\{40\}\$"\)\)/)
-  assert.match(provenance, /--commit-sha "\$\{evidence_commit_sha\}"/)
-  assert.doesNotMatch(provenance, /--commit-sha "\$\{GITHUB_SHA\}"/)
-})
-
-test('binds each production promotion wave to its exact evidence and canary', () => {
-  const cases = /case "\$\{TARGET_CELL_IDS\}" in\n([\s\S]*?)\n\s*esac/.exec(workflow)?.[1]
-  assert.ok(cases)
-  const waves = Object.fromEntries(
-    [...cases.matchAll(/^ {14}([a-z0-9,-]+)\)\n([\s\S]*?);;/gm)].map((match) => [match[1], {
-      evidence: /evidence_kind=([a-z0-9]+)/.exec(match[2])?.[1] ?? 'none',
-      canary: /canary_cell=([a-z0-9-]+)/.exec(match[2])?.[1] ?? 'none'
-    }])
-  )
-  assert.deepEqual(waves, {
-    'production-gce-c27': { evidence: 'staging', canary: 'production-gce-c27' },
-    'production-gce-c28,production-gce-c29': { evidence: 'c27', canary: 'none' },
-    'production-gce-c30': { evidence: 'none', canary: 'production-gce-c30' }
-  })
-  assert.match(cases, /\*\) echo "production promotion wave is not reviewed" >&2; exit 1 ;;/)
-  assert.match(workflow, /if test "\$\{evidence_kind\}" = none; then\n\s+test -z "\$\{EVIDENCE_RUN_ID\}"/)
-  assert.doesNotMatch(workflow, /inputs\.cell-ids == /)
-})
-
-test('runs the timed canary and its automatic rollback for C27 and C30 alike', () => {
-  const steps = workflow.split(/\n(?=      - )/)
-  const named = (name) => steps.find((step) => step.includes(`name: ${name}`))
-  for (const name of [
-    'Install exact canary dependencies',
-    'Build the canary Relay contract',
-    'Verify the canary cell state and start the timed canary',
-    'Run a real five-minute canary control and splice',
-    'Collect regional, Relay SQL, and Cloud SQL canary evidence',
-    'Upload immutable canary evidence'
-  ]) {
-    assert.match(named(name), /if: \$\{\{ steps\.inputs\.outputs\.canary == 'true' \}\}/, name)
-  }
-  assert.match(
-    workflow,
-    /if: \$\{\{ inputs\.mode == 'configure' \|\| steps\.inputs\.outputs\.canary == 'true' \}\}/
-  )
-  const rollback = named('Return an unproven canary cell to migration-only')
-  assert.match(
-    rollback,
-    /if: \$\{\{ always\(\) && steps\.inputs\.outputs\.canary == 'true' && steps\.admission-operation\.outcome != 'skipped' && steps\.canary-evidence-upload\.outcome != 'success' \}\}/
-  )
-  assert.match(rollback, /CANARY_CELL: \$\{\{ steps\.inputs\.outputs\.canary_cell \}\}/)
-  assert.match(rollback, /--mode recover-promotion \\\n\s+--cell-ids "\$\{CANARY_CELL\}"/)
-  assert.match(rollback, /--mode rollback \\\n\s+--cell-ids "\$\{CANARY_CELL\}"/)
-  assert.match(rollback, /'\.states\[\$cell\]' <<< "\$\{result\}"\)" = migration-only/)
-  const start = named('Verify the canary cell state and start the timed canary')
-  assert.match(start, /production-gce-c30\)\n\s+verify_cells=production-gce-c30\n\s+expected_states='\{"production-gce-c30":"general"\}'/)
-  assert.match(start, /test "\$\(jq -cS '\.states' <<< "\$\{result\}"\)" = "\$\(jq -cS '\.' <<< "\$\{expected_states\}"\)"/)
-  assert.match(named('Run a real five-minute canary control and splice'), /--duration-seconds 300/)
-})
-
-test('creates staging evidence only after the bounded launch-path load and rollback', () => {
-  assert.match(stagingProof, /runs-on: \[self-hosted, linux, x64, relay-asia-east2-load\]/)
-  assert.doesNotMatch(stagingProof, /group: relay-asia-east2-load/)
-  assert.match(stagingProof, /pnpm\/action-setup@v4/)
-  assert.match(stagingProof, /pnpm install --frozen-lockfile/)
-  assert.match(stagingProof, /pnpm --filter @orca-cloud\/relay-contract build/)
-  assert.match(stagingProof, /run_phase launch 5 5/)
-  assert.doesNotMatch(stagingProof, /run_phase control|run_phase mixed/)
-  assert.match(stagingProof, /--aggregate-controls "\$\(\(controls \* 4\)\)"/)
-  assert.match(stagingProof, /--aggregate-splices "\$\(\(splices \* 4\)\)"/)
-  assert.match(stagingProof, /--required-lease-horizons 2/)
-  assert.match(stagingProof, /--splice-ramp-seconds 120/)
-  assert.match(stagingProof, /--max-generator-rss-growth-mib 512/)
-  assert.match(stagingProof, /--relay-asia-load-principals 32/)
-  assert.match(stagingProof, /ulimit -n/)
-  assert.match(stagingProof, /--region-behavior-probes 1/)
-  assert.match(stagingProof, /--capacity-cell-origin https:\/\/c4\.relay-staging\.onorca\.dev/)
-  assert.match(stagingProof, /--rebind-probes 2/)
-  assert.match(stagingProof, /--skip-rebind-overflow-check/)
-  assert.doesNotMatch(stagingProof, /--request-unit-invites|--regional-fallback-probes/)
-  assert.match(stagingProof, /--aggregate-reader-splices.*echo 5/)
-  assert.match(stagingProof, /--aggregate-reader-bytes.*echo 12582912/)
-  assert.match(stagingProof, /--phase-barrier-dir "\$\{proof_dir\}\/\$\{phase\}-barrier"/)
-  assert.match(stagingProof, /--duration-seconds 210/)
-  assert.match(stagingProof, /trap stop_shards EXIT/)
-  assert.match(stagingProof, /if ! wait "\$\{pid\}"; then failed=1; break; fi/)
-  assert.match(stagingProof, /connectionFailuresByReason/)
-  assert.match(stagingProof, /--launch-report "\$\{proof_dir\}\/launch\.json"/)
-  assert.match(stagingProof, /id-token: write/)
-  assert.match(stagingProof, /STAGING_GCP_RELAY_ASIA_PROOF_WORKLOAD_IDENTITY_PROVIDER/)
-  assert.match(stagingProof, /STAGING_GCP_RELAY_ASIA_PROOF_SERVICE_ACCOUNT/)
-  assert.doesNotMatch(stagingProof, /STAGING_GCP_DEPLOY_SERVICE_ACCOUNT/)
-  assert.doesNotMatch(stagingProof, /STAGING_RELAY_LOAD_ACCESS_TOKEN/)
-  assert.doesNotMatch(stagingProof, /secrets versions access|signing-key-file/)
-  assert.match(stagingProof, /relay-asia-rollout-evidence\.mjs create-staging/)
-  assert.match(stagingProof, /Require the exact staging director image before promotion/)
-  assert.match(stagingProof, /DIRECTOR_ORIGIN.*\/v1\/admin\/runtime-status/)
-  assert.match(stagingProof, /\.imageDigest.*IMAGE_DIGEST/)
-  assert.match(stagingProof, /Return staging C4 to migration-only/)
-  assert.match(stagingProof, /steps\.promote\.outcome != 'skipped'/)
-  assert.match(stagingProof, /--mode recover-promotion[\s\S]*?--attempt-id "\$\{PROMOTE_ATTEMPT_ID\}"/)
-  assert.match(stagingProof, /--mode rollback[\s\S]*?--expected-generation "\$\{promoted_generation\}"/)
-  assert.match(stagingProof, /if: \$\{\{ success\(\) \}\}/)
-  assert.match(
-    stagingProof,
-    /recover:\n    if: \$\{\{ always\(\) && github\.ref == 'refs\/heads\/main' \}\}/
-  )
-  assert.match(stagingProof, /needs: prove/)
-  assert.match(stagingProof, /Recover staging C4 with a fresh identity/)
-  assert.equal((stagingProof.match(/google-github-actions\/auth@v2/g) ?? []).length, 2)
-  assert.equal((stagingProof.match(/--mode recover-promotion/g) ?? []).length, 2)
-  assert.equal((stagingProof.match(/--mode rollback/g) ?? []).length, 2)
-})
-
-test('keeps the private runner below its 64-port Cloud NAT allocation', () => {
-  const profile = /run_phase launch (\d+) (\d+)/.exec(stagingProof)
-  const controlsPerShard = Number(profile?.[1])
-  const splicesPerShard = Number(profile?.[2])
-  const rebindProbes = Number(/--rebind-probes (\d+)/.exec(stagingProof)?.[1])
-  const runtimeStatusSockets = 1
-  assert.ok(
-    controlsPerShard * 4 + splicesPerShard * 4 * 2 + rebindProbes + runtimeStatusSockets < 64
-  )
-})
-
-test('paces one-source staging upgrades below the Relay anti-abuse ceiling', () => {
-  const splicesPerShard = Number(/run_phase launch \d+ (\d+)/.exec(stagingProof)?.[1])
-  const rebindProbes = Number(/--rebind-probes (\d+)/.exec(stagingProof)?.[1])
-  const spliceRampMs = Number(/--splice-ramp-seconds (\d+)/.exec(stagingProof)?.[1]) * 1000
-  const ceiling = Number(
-    /maxPreAuthAttemptsPerSourcePerMinute: (\d+)/.exec(admissionBudgets)?.[1]
-  )
-  const totalSplices = splicesPerShard * 4
-  const attempts = Array.from({ length: totalSplices }, (_, ordinal) =>
-    Math.floor(ordinal * spliceRampMs / (totalSplices - 1))
-  ).flatMap((startedAt) => [startedAt, startedAt])
-  attempts.push(...Array.from({ length: 4 + rebindProbes }, () => 0))
-  const busiestMinute = Math.max(...attempts.map((startedAt) =>
-    attempts.filter((attempt) => attempt >= startedAt && attempt < startedAt + 60_000).length
-  ))
-  assert.ok(busiestMinute < ceiling)
-})
-
-test('reserves rollback time beyond the complete bounded staging proof envelope', () => {
-  const timeoutMinutes = Number(/timeout-minutes: (\d+)/.exec(stagingProof)?.[1])
-  assert.equal(timeoutMinutes, 75)
-  const spliceRampSeconds = Number(/--splice-ramp-seconds (\d+)/.exec(stagingProof)?.[1])
-  const launchSeconds = 180 + spliceRampSeconds + 210 + 60
-  const setupEvidenceAndRollbackSeconds = 10 * 60
-  const envelopeMinutes = Math.ceil((launchSeconds + setupEvidenceAndRollbackSeconds) / 60)
-  assert.ok(timeoutMinutes - envelopeMinutes >= 30)
-  assert.match(stagingProof, /--ramp-seconds 180/)
-  assert.match(stagingProof, /--duration-seconds 210/)
-})
-
-test('binds the staging proof to one least-privilege Google identity', () => {
-  assert.match(
-    proofIam,
-    /github_relay_asia_proof_workflow_file = "prove-relay-asia-staging\.yml"/
-  )
-  assert.match(
-    proofIam,
-    /assertion\.workflow_ref == '\$\{prefix\}\$\{local\.github_relay_asia_proof_workflow_file\}@refs\/heads\/main'/
-  )
-  assert.match(proofIam, /assertion\.environment == 'staging'/)
-  assert.match(proofIam, /assertion\.event_name == 'workflow_dispatch'/)
-  assert.match(proofIam, /roles\/logging\.viewer/)
-  assert.match(proofIam, /roles\/monitoring\.viewer/)
-  assert.match(rolloutEvidence, /readCloudSqlBackends/)
-  assert.match(rolloutEvidence, /cloudSql: await readCloudSqlBackends/)
-  assert.doesNotMatch(proofIam, /compute\.|cloudsql\.|secretmanager\.|roles\/editor|roles\/run\./)
-})
-
-test('keeps the production US-first switch in durable Secret Manager state', () => {
-  assert.match(directorWorkflow, /options: \[preserve, enable, disable\]/)
-  assert.match(directorWorkflow, /default: preserve/)
-  assert.match(directorWorkflow, /gcloud secrets versions add/)
-  assert.match(directorWorkflow, /preserve\) desired="\$\{current\}"/)
-  assert.match(directorWorkflow, /--regional-placement-secret-version "\$\{target_version\}"/)
-  assert.match(directorWorkflow, /test "\$\{CEILING\}" = "\$\{DIRECTOR_MAX_INSTANCES\}"/)
-  assert.match(directorWorkflow, /orca-cloud-relay-regional-placement-enabled/)
-  assert.match(directorWorkflow, /\.valueSource\.secretKeyRef \/\/ \.valueFrom\.secretKeyRef/)
-  assert.match(directorWorkflow, /\.version \/\/ \.key/)
-  assert.match(directorWorkflow, /\.secret \/\/ \.name/)
-  assert.match(workflow, /\.valueSource\.secretKeyRef \/\/ \.valueFrom\.secretKeyRef/)
-  assert.doesNotMatch(directorWorkflow, /--regional-placement-enabled/)
-  assert.doesNotMatch(workflow, /inputs\.regional-placement-enabled/)
-})
-
-test('prunes incompatible production revisions only when explicitly confirmed', () => {
-  assert.match(
-    directorWorkflow,
-    /prune-incompatible-revisions:[\s\S]*?default: false[\s\S]*?type: boolean/
-  )
-  assert.match(directorWorkflow, /PRUNE_INCOMPATIBLE_RELAY_DIRECTOR_REVISIONS/)
-  assert.match(
-    directorWorkflow,
-    /test "\$\{REGIONAL_PLACEMENT_MODE\}" = preserve[\s\S]*?test "\$\{CONFIRMATION\}" = PRUNE_INCOMPATIBLE_RELAY_DIRECTOR_REVISIONS/
-  )
-  assert.match(
-    directorWorkflow,
-    /--prune-revisions "\$\{PRUNE_INCOMPATIBLE_REVISIONS\}"/
-  )
-})
-
-test('documents the exact regional-placement secret bootstrap before director rollout', () => {
-  for (const address of [
-    'google_secret_manager_secret.relay_regional_placement_enabled',
-    'google_secret_manager_secret_version.relay_regional_placement_enabled',
-    'google_secret_manager_secret_iam_member.relay_regional_placement_runtime_accessor',
-    'google_secret_manager_secret_iam_member.relay_regional_placement_deploy_accessor[0]',
-    'google_secret_manager_secret_iam_member.relay_regional_placement_deploy_adder[0]',
-    'google_secret_manager_secret_iam_member.relay_regional_placement_deploy_viewer[0]'
-  ]) {
-    assert.match(terraformReadme, new RegExp(address.replaceAll(/[.[\]]/g, '\\$&')))
-  }
-  assert.match(terraformReadme, /Before the first director deployment/)
-  assert.match(terraformReadme, /Pass the exact environment tfvars/)
-  // The Cloudflare records left with the apps root; a -var for a variable this root no longer
-  // declares is a hard error, so no relay procedure may still tell an operator to pass it.
-  assert.doesNotMatch(terraformReadme, /manage_artifact_dns/)
-  assert.match(terraformReadme, /exactly these six additions/)
-  assert.match(terraformReadme, /version metadata/)
-  assert.match(
-    relayTerraform,
-    /resource "google_secret_manager_secret_iam_member" "relay_regional_placement_deploy_viewer"[\s\S]*?role\s+= "roles\/secretmanager\.viewer"/
-  )
-})
diff --git a/cloud/dev/scripts/relay-regional-rehome-workflow.test.mjs b/cloud/dev/scripts/relay-regional-rehome-workflow.test.mjs
deleted file mode 100644
index aabf80a65f0f..000000000000
--- a/cloud/dev/scripts/relay-regional-rehome-workflow.test.mjs
+++ /dev/null
@@ -1,269 +0,0 @@
-import assert from 'node:assert/strict'
-import { readFileSync } from 'node:fs'
-import { test } from 'node:test'
-import { fileURLToPath } from 'node:url'
-import { relayWorkflowUrl } from './relay-repository.mjs'
-
-function workflow(name) {
-  return readFileSync(
-    fileURLToPath(relayWorkflowUrl(name)),
-    'utf8'
-  )
-}
-
-test('same-cap wrapper is reusable, canary-bound, and sequential', () => {
-  const wrapper = workflow('deploy-relay-production-same-cap.yml')
-  const job = workflow('deploy-relay-production-same-cap-job.yml')
-  assert.match(wrapper, /options: \[verify, canary-apply, batch-apply, rollback\]/)
-  assert.match(wrapper, /relay-same-cap-canary-\$\{\{ inputs\.canary-run-id \}\}/)
-  assert.match(wrapper, /needs: \[gate, cell_1\]/)
-  assert.match(wrapper, /needs: \[gate, cell_2\]/)
-  assert.match(wrapper, /needs: \[gate, cell_3\]/)
-  assert.match(job, /on:\n  workflow_call:/)
-  assert.match(job, /c27\|c28\|c29\|c30\)/)
-  assert.match(job, /EXPECTED_HARD_CAP=3000/)
-  assert.match(job, /EXPECTED_REGION=asia-east2/)
-  assert.match(job, /--hard-cap "\$\{EXPECTED_HARD_CAP\}"/)
-  assert.match(job, /--regional-rehome-protocol "\$\{DESIRED_REHOME_PROTOCOL\}"/)
-  assert.match(job, /--argjson protocol "\$\{PREDECESSOR_REHOME_PROTOCOL\}"/)
-  assert.match(job, /runtime predecessor mismatch fields=/)
-  // A rollback interrupted between apply and restore must be resumable.
-  assert.match(job, /ROLLBACK_RESUME=true/)
-  assert.match(job, /test "\$\{LIVE_IMAGE_DIGEST\}" = "\$\{DESIRED_IMAGE_DIGEST\}"/)
-  // Resume must skip BOTH the drain (no restart will clear the flag) and the
-  // apply (state already converged), and prove convergence instead.
-  assert.match(
-    job,
-    /Reversibly isolate and drain only the selected cell\n        if: \$\{\{ inputs\.mode != 'verify' && env\.ROLLBACK_RESUME != 'true' \}\}/
-  )
-  assert.match(
-    job,
-    /Apply only the selected same-cap template and MIG\n        if: \$\{\{ inputs\.mode != 'verify' && env\.ROLLBACK_RESUME != 'true' \}\}/
-  )
-  assert.match(
-    job,
-    /Require converged Terraform state and a stable MIG on resume\n        if: \$\{\{ inputs\.mode != 'verify' && env\.ROLLBACK_RESUME == 'true' \}\}/
-  )
-  assert.match(job, /resume found unconverged resources/)
-  // A canary or batch cell that failed before its template apply also
-  // resumes here with template drift from repo changes since its last roll;
-  // only a plan the reviewed validator approves for the image the cell
-  // already serves may pass, and resume still applies nothing.
-  assert.match(job, /requiring reviewed rollback-image drift/)
-  assert.match(
-    job,
-    /--image "\$\{DESIRED_IMAGE\}" \\\n {16}--rollback-image "\$\{DESIRED_IMAGE\}"/
-  )
-  // The relaxation is only safe if the reviewed validator actually runs on
-  // the NON-converged branch, in same-cap-cell mode, with the trust config
-  // the validator requires, restricted to the template-and-MIG change pair.
-  assert.match(
-    job,
-    /if ! terraform -chdir=infra\/terraform show -json[\s\S]{0,220}\| length == 0' >\/dev\/null\n          then\n/
-  )
-  assert.match(
-    job,
-    /requiring reviewed rollback-image drift'\n[\s\S]{0,400}?\n {16}--mode same-cap-cell --cell-id "\$\{TARGET_CELL_ID\}" \\\n/
-  )
-  assert.match(
-    job,
-    /Require converged Terraform state and a stable MIG on resume[\s\S]{0,300}CAPACITY_SERVICE_ACCOUNT: \$\{\{ vars\.PRODUCTION_GCP_RELAY_CAPACITY_SERVICE_ACCOUNT \}\}\n {10}DIRECTOR_RUNTIME_SERVICE_ACCOUNT: \$\{\{ vars\.PRODUCTION_GCP_RELAY_DIRECTOR_RUNTIME_SERVICE_ACCOUNT \}\}/
-  )
-  assert.match(
-    job,
-    /--rollback-image "\$\{DESIRED_IMAGE\}" \\\n {16}--capacity-service-account "\$\{CAPACITY_SERVICE_ACCOUNT\}" \\\n {16}--rehome-director-service-account "\$\{DIRECTOR_RUNTIME_SERVICE_ACCOUNT\}"/
-  )
-  assert.match(
-    job,
-    /host-drain \\\n {16}--regional-rehome-protocol "\$\{DESIRED_REHOME_PROTOCOL\}" \\\n {16}"\$\{POOL_ARGUMENTS\[@\]\}"\)"\n {12}echo "\$\{RESUME_REVIEW\}"\n {12}jq -e '\.changes == 2' <<< "\$\{RESUME_REVIEW\}" >\/dev\/null/
-  )
-  // A resume applies nothing at all, which is what a resume means: the only accepted
-  // unconverged plan is the template-and-MIG rollback-image drift, and it is left pending.
-  const resumeStep = job.slice(
-    job.indexOf('- name: Require converged Terraform state and a stable MIG on resume'),
-    job.indexOf('- name: Apply only the selected same-cap template and MIG')
-  )
-  assert.equal(resumeStep.split('terraform -chdir=infra/terraform apply').length, 1)
-  assert.match(job, /resume requires the isolated migration-only cell/)
-  assert.match(job, /test "\$\{TARGET_INCARNATION\}" = "\$\{SOURCE_INCARNATION\}"/)
-  assert.match(job, /\(.regionalRehomeProtocol \/\/ 0\) == \$protocol/)
-  assert.match(job, /\(\.draining == false or \$drainingOk\)/)
-  // Selector expectations must follow the mutations' returned generations,
-  // not fixed offsets: isolate is a no-op on a cell a failed canary already
-  // isolated, and the restore inspect must expect post-restore membership.
-  assert.match(job, /SELECTOR_GENERATION_AFTER_ISOLATE=\$\{EFFECTIVE_SELECTOR_GENERATION\}/)
-  assert.match(job, /SELECTOR_GENERATION_AFTER_ISOLATE=\$\{ISOLATE_GENERATION\}/)
-  assert.match(job, /--expected-selector-generation "\$\{SELECTOR_GENERATION_AFTER_ISOLATE\}"/)
-  assert.match(job, /--expected-selector-generation "\$\{SELECTOR_GENERATION_AFTER_RESTORE\}"/)
-  assert.match(job, /--expected-migration-only-cells "\$\{RESTORED_MIGRATION_CELLS\}"/)
-  assert.match(job, /--expected-general-cells "\$\{RESTORED_GENERAL_CELLS\}"/)
-  assert.match(job, /FAILSAFE_GENERATION/)
-  // Later batch waves start after ~16-min predecessor rolls, so BOTH evidence
-  // age checks must scale by wave or cell_2+ can never pass; the bound's
-  // per-wave step is the cell job timeout, so the two must move together.
-  assert.match(job, /--required-migration-policy strict \\\n            --wave-index "\$\{WAVE_INDEX\}"/)
-  // Wave 0 must retry freshness-only failures too: one Cloud Monitoring publish
-  // lag at the sample instant is not health evidence, and single-shot wave 0
-  // failed a whole batch on a series that was fresh again a minute later.
-  assert.match(
-    job,
-    /dry-run\.state\.json" \\\n {14}--wave-index "\$\{WAVE_INDEX\}" \\\n {14}--selector-wave-delta "\$\{SELECTOR_WAVE_DELTA\}" --retry-freshness/
-  )
-  assert.doesNotMatch(job, /RETRY_ARGS/)
-  // Break-glass: the override skips the aggregate 15-minute monitor evidence and
-  // nothing else. The live per-wave recheck still runs on the override path, off
-  // the dispatch inputs the rehome inspect below verifies against the director.
-  assert.match(
-    job,
-    /if test -n "\$\{GATE_OVERRIDE_CONFIRMATION\}"; then[\s\S]{0,700}?--no-monitor-state \\\n {14}--expected-selector-generation "\$\{EXPECTED_SELECTOR_GENERATION\}" \\\n {14}--selector-membership-file[\s\S]{0,160}?--wave-index "\$\{WAVE_INDEX\}" \\\n {14}--selector-wave-delta "\$\{SELECTOR_WAVE_DELTA\}" --retry-freshness/
-  )
-  // The override is re-validated here, not trusted from the caller, and it is
-  // bound to the digest this wave installs.
-  assert.match(
-    job,
-    /test "\$\{GATE_OVERRIDE_CONFIRMATION\}" = \\\n {14}"SKIP_RELAY_MONITOR_GATE \$\{TARGET_IMAGE_DIGEST\}"/
-  )
-  assert.match(job, /\[\[ "\$\{GATE_OVERRIDE_REASON\}" =~ \^\[\[:print:\]\]\{12,500\}\$ \]\]/)
-  // Exactly the aggregate-evidence steps are skipped, and only them: every step
-  // that reads or spends the sealed monitor artifact carries the override guard.
-  const overrideSkipped = [
-    'Require fresh aggregate monitor evidence reference',
-    'Download private aggregate monitor evidence',
-    'Verify monitor evidence provenance',
-    "Download this wave's single-use safety authority",
-    'Require safety evidence consumed by this workflow'
-  ]
-  for (const name of overrideSkipped) {
-    assert.match(
-      job,
-      new RegExp(`- name: ${name}\\n {8}if: \\$\\{\\{ inputs\\.mode != 'verify' && inputs\\.gate-override-confirmation == '' \\}\\}`)
-    )
-  }
-  assert.equal(
-    job.match(/inputs\.gate-override-confirmation == ''/g).length,
-    overrideSkipped.length
-  )
-  // The wrapper validates the override before anything runs, passes it to every
-  // cell, seals it into the canary artifact, and prints it in the run summary.
-  assert.match(wrapper, /--gate-override-reason "\$\{GATE_OVERRIDE_REASON\}" \\\n {12}--gate-override-confirmation "\$\{GATE_OVERRIDE_CONFIRMATION\}"\)/)
-  // One per cell job in the serial cell_1..cell_10 chain.
-  assert.equal(
-    wrapper.match(/gate-override-confirmation: \$\{\{ inputs\.gate-override-confirmation \}\}/g).length,
-    10
-  )
-  assert.match(wrapper, /Aggregate monitor gate overridden \(break-glass\)/)
-  assert.match(wrapper, /ACTOR: \$\{\{ github\.actor \}\}/)
-  for (const name of [
-    'Reject previously consumed aggregate safety evidence',
-    'Consume aggregate safety evidence for this exact wave'
-  ]) {
-    assert.match(
-      wrapper,
-      new RegExp(`- name: ${name}\\n {8}if: \\$\\{\\{ inputs\\.mode != 'verify' && inputs\\.gate-override-confirmation == '' \\}\\}`)
-    )
-  }
-  assert.match(job, /timeout-minutes: 75/)
-  // Both age gates step by the cell job timeout above; the constant is
-  // duplicated across the two languages, so pin each copy to it.
-  for (const source of [
-    '../../dev/scripts/relay-monitor-evidence.mjs',
-    '../../apps/relay-ops/src/incident-live-preflight-cli.ts'
-  ]) {
-    const body = readFileSync(fileURLToPath(new URL(source, import.meta.url)), 'utf8')
-    assert.match(body, /WAVE_PREDECESSOR_TIMEOUT_MS = 75 \* 60_000/)
-    assert.match(body, /\^\[0-9\]\$/)
-  }
-  // Aged-evidence replay via job re-runs is fenced: mutations are
-  // single-dispatch, so a failed cell needs a fresh gate and monitor run.
-  assert.match(job, /test "\$\{GITHUB_RUN_ATTEMPT\}" = 1/)
-  for (const index of [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]) {
-    assert.match(wrapper, new RegExp(`wave-index: '${index}'`))
-  }
-  assert.doesNotMatch(job, /EFFECTIVE_SELECTOR_GENERATION \+ 1\)/)
-  assert.doesNotMatch(job, /EFFECTIVE_SELECTOR_GENERATION \+ 2\)/)
-  assert.match(job, /\$region == "us-central1" and \$protocol == 0 and [.]region == null/)
-  assert.match(job, /[.]regionalRehomeProtocol \/\/ 0/)
-  assert.match(job, /runtime predecessor normalized legacy fields=/)
-  assert.match(job, /probe-relay-rehome-trust[.]mjs/)
-  assert.doesNotMatch(job, /service_account: \$\{\{ vars\.PRODUCTION_GCP_RELAY_(?:DIRECTOR_)?RUNTIME_SERVICE_ACCOUNT/)
-  assert.doesNotMatch(job, /roles\/iam\.serviceAccountTokenCreator/)
-})
-
-// Why: the same-cap caller defines release_lease itself, and a caller-defined job presents the
-// caller as job_workflow_ref, so the pair must admit the caller alongside its reusable job.
-test('shared deploy WIF admits the exact same-cap reusable workflow pair and the caller itself', () => {
-  const terraform = readFileSync(
-    fileURLToPath(new URL('../../infra/terraform/relay-github-actions.tf', import.meta.url)),
-    'utf8'
-  )
-  const providerStart = terraform.indexOf(
-    'resource "google_iam_workload_identity_pool_provider" "github"'
-  )
-  const providerEnd = terraform.indexOf('\nresource "', providerStart + 1)
-  const sharedProvider = terraform.slice(providerStart, providerEnd)
-  assert.ok(providerStart >= 0 && providerEnd > providerStart)
-  assert.match(sharedProvider, /local\.relay_github_workflow_conditions\["github"\]/)
-  // The pairing itself now lives in the clause the provider renders, once per accepted repository.
-  assert.match(
-    terraform,
-    /assertion\.workflow_ref == '\$\{prefix\}\$\{local\.github_production_relay_same_cap_workflow_file\}@refs\/heads\/main' && \(assertion\.job_workflow_ref == '\$\{prefix\}\$\{local\.github_production_relay_same_cap_job_workflow_file\}@refs\/heads\/main' \|\| assertion\.job_workflow_ref == '\$\{prefix\}\$\{local\.github_production_relay_same_cap_workflow_file\}@refs\/heads\/main'\)/
-  )
-})
-
-test('pause and disable precede optional installation and cloud diagnostics', () => {
-  const job = workflow('operate-relay-production-rehome-job.yml')
-  const emergency = job.indexOf('Apply emergency durable pause or disable before diagnostics')
-  const install = job.indexOf('pnpm install --frozen-lockfile')
-  const revision = job.indexOf('Verify exact serving and rollback director identities')
-  assert.ok(emergency > 0)
-  assert.ok(emergency < install)
-  assert.ok(emergency < revision)
-  assert.match(job, /inputs\.mode == 'pause' \|\| inputs\.mode == 'disable'/)
-  assert.match(job, /Seal 24-hour aggregate region observation evidence/)
-  assert.match(job, /--freshness=25h --limit=30000/)
-  assert.match(job, /relay-region-observation-\$\{\{ github\.run_id \}\}-\$\{\{ github\.run_attempt \}\}/)
-  assert.match(job, /test "\$\{RATE_PER_MINUTE\}" = 10/)
-})
-
-test('a failed enable independently restores and verifies durable disabled state', () => {
-  const job = workflow('operate-relay-production-rehome-job.yml')
-  const enable = job.indexOf('Apply exact durable regional rehome enable')
-  const evidence = job.indexOf('Read fresh aggregate completion and abort evidence')
-  const summary = job.indexOf('Publish aggregate control evidence')
-  const recovery = job.indexOf('Fail closed after an unsuccessful enable run')
-  assert.ok(enable > 0 && enable < evidence && evidence < summary && summary < recovery)
-  const recoveryStep = job.slice(recovery)
-  assert.match(
-    recoveryStep,
-    /failure\(\) && inputs\.mode == 'enable' && steps\.google-auth\.outcome == 'success'/
-  )
-  assert.match(recoveryStep, /--mode recover-enable/)
-  assert.match(recoveryStep, /--expected-control-generation "\$\{EXPECTED_CONTROL_GENERATION\}"/)
-  assert.match(recoveryStep, /RECOVER_FAILED_REGIONAL_REHOME_ENABLE/)
-  assert.match(recoveryStep, /\.control\.enabled == false/)
-  assert.doesNotMatch(recoveryStep, /gcloud|pnpm/)
-})
-
-test('director rollout has a strict one-time identity bootstrap', () => {
-  const workflowBody = workflow('deploy-relay-production-director.yml')
-  const script = readFileSync(
-    fileURLToPath(new URL('./deploy-relay-blue-green.mjs', import.meta.url)),
-    'utf8'
-  )
-  assert.match(workflowBody, /BOOTSTRAP_RELAY_DIRECTOR_REHOME_IDENTITY/)
-  assert.match(workflowBody, /--predecessor-runtime-service-account/)
-  assert.match(workflowBody, /--expected-rehome-generation/)
-  assert.match(script, /args\.push\('--service-account', config\['runtime-service-account'\]\)/)
-  assert.match(script, /director predecessor runtime service account does not match/)
-  const candidateProof = script.indexOf('await verifyRehomeDisabled(candidate.origin)')
-  const trafficMove = script.indexOf('operations.updateTraffic(config, [`--to-tags=')
-  assert.ok(candidateProof > 0 && candidateProof < trafficMove)
-  assert.equal(script.indexOf('verifyRehomeDisabled', trafficMove), -1)
-})
-
-test('rehome job pipes every control result through tee under pipefail', () => {
-  const job = workflow('operate-relay-production-rehome-job.yml')
-  // Without `shell: bash` the step exit code is tee's, so a thrown inspect/apply passes green.
-  assert.match(job, /defaults:\n  run:\n(?:    #.*\n)*    shell: bash\n/)
-  assert.ok((job.match(/\| tee "\$\{RUNNER_TEMP\}/g) ?? []).length >= 5)
-})
diff --git a/cloud/dev/scripts/relay-same-cap-script-census.test.mjs b/cloud/dev/scripts/relay-same-cap-script-census.test.mjs
index 1e023ce0c9d9..ff2c265ee726 100644
--- a/cloud/dev/scripts/relay-same-cap-script-census.test.mjs
+++ b/cloud/dev/scripts/relay-same-cap-script-census.test.mjs
@@ -13,7 +13,6 @@ import { readRelayWorkflow } from './relay-repository.mjs'
 import { validateCapacityPlan } from './validate-relay-capacity-plan.mjs'
 
 const workflow = readRelayWorkflow('deploy-relay-production-same-cap-job.yml')
-const capacityWorkflow = readRelayWorkflow('deploy-relay-production-capacity-job.yml')
 const production = readFileSync(
   new URL('../../infra/terraform/environments/production.tfvars', import.meta.url),
   'utf8'
@@ -295,74 +294,10 @@ describe('same-cap roll scripts accept every same-cap cell', () => {
     assert.equal(resolveCellShape('production-gce-c31').status, 1)
   })
 
-  it('passes the same-cap allowlist on every canary invocation the job runs', () => {
-    const invocations = workflow.split('prepare-relay-production-capacity-canary.mjs').slice(1)
-    assert.equal(invocations.length, 4)
-    for (const invocation of invocations) {
-      const lines = invocation.split('\n')
-      const end = lines.findIndex((line) => !line.endsWith('\\'))
-      const call = lines.slice(0, end + 1).join(' ')
-      assert.match(call, /--approved-cells same-cap/)
-      // The restore call picks its mode from the cell's entry admission class.
-      assert.match(call, /--mode (isolate|drain|activate|"\$\{RESTORE_MODE\}")/)
-    }
-  })
 
-  it('paces the drain it sends to the selected cell', () => {
-    const drain = workflow.split('--mode drain')[1] ?? ''
-    assert.match(drain.split('\n').slice(0, 2).join(' '), /--pace-window-ms "\$\{DRAIN_PACE_WINDOW_MS\}"/)
-    // 5 min is the cell's DRAIN_PACE_WINDOW_MAX_MS; a 2,700-host cell at 2 min overruns the director's sticky lane.
-    assert.match(workflow, /DRAIN_PACE_WINDOW_MS: '300000'/)
-    // The transition wait has to outlast the pacing window on top of the leases it waits on.
-    assert.match(workflow, /--activity restart-safe[\s\S]*?--timeout-ms 1200000/)
-  })
 
-  it('passes this cell\'s rehome protocol and pool on every plan validation the job runs', () => {
-    const invocations = workflow.split('validate-relay-capacity-plan.mjs').slice(1)
-    assert.equal(invocations.length, 2)
-    for (const invocation of invocations) {
-      const lines = invocation.split('\n')
-      const end = lines.findIndex((line) => !line.trimEnd().endsWith('\\'))
-      const call = lines.slice(0, end + 1).join(' ')
-      assert.match(call, /--mode same-cap-cell/)
-      assert.match(call, /--regional-rehome-protocol "\$\{DESIRED_REHOME_PROTOCOL\}"/)
-      assert.match(call, /"\$\{POOL_ARGUMENTS\[@\]\}"/)
-    }
-    // Each of those steps must build the flag from the resolved pool, and only when there is one.
-    const builders = workflow.split(
-      'if test -n "${EXPECTED_DATABASE_POOL_MAX}"; then\n' +
-        '            POOL_ARGUMENTS=(--database-pool-max "${EXPECTED_DATABASE_POOL_MAX}")'
-    )
-    assert.equal(builders.length, 3)
-    assert.equal(workflow.split('POOL_ARGUMENTS=()').length, 3)
-  })
 
-  // One cell's compute path and nothing else: the template and the MIG bound to it. The cell
-  // backend service stays out because the capacity role has no compute.backendServices.update,
-  // so naming it fails the apply after the MIG has already rolled.
-  it('targets exactly this cell template and MIG on every plan the job runs', () => {
-    const plans = workflow.split('terraform -chdir=infra/terraform plan').slice(1)
-    assert.equal(plans.length, 2)
-    for (const plan of plans) {
-      const lines = plan.split('\n')
-      const end = lines.findIndex((line) => !line.trimEnd().endsWith('\\'))
-      const call = lines.slice(0, end + 1).join('\n')
-      assert.deepEqual(
-        [...call.matchAll(/-target=([\w.]+)\[\\"\$\{TARGET_CELL_ID\}\\"\]/g)]
-          .map(([, resource]) => resource),
-        [
-          'google_compute_instance_template.relay_gce_cell',
-          'google_compute_instance_group_manager.relay_gce_cell'
-        ]
-      )
-      // Any target that is not one of those two, or not scoped to this cell, fails here.
-      assert.equal(call.split('-target=').length, 3)
-    }
-  })
 
-  it('never names a backend service on any plan or apply in the job', () => {
-    assert.equal(workflow.includes('google_compute_backend_service'), false)
-  })
 
   it('validates a correct plan for every wave cell at that cell\'s rehome protocol', () => {
     const trusted = SAME_CAP_CELLS.filter((cell) => REHOME_SOURCE_CELLS.has(cell))
@@ -569,25 +504,6 @@ describe('same-cap roll scripts accept every same-cap cell', () => {
     )
   })
 
-  it('pins the capacity identity on every plan validation the job runs', () => {
-    const invocations = workflow.split('validate-relay-capacity-plan.mjs').slice(1)
-    assert.equal(invocations.length, 2)
-    for (const invocation of invocations) {
-      const lines = invocation.split('\n')
-      const end = lines.findIndex((line) => !line.trimEnd().endsWith('\\'))
-      assert.match(
-        lines.slice(0, end + 1).join(' '),
-        /--capacity-service-account "\$\{CAPACITY_SERVICE_ACCOUNT\}"/
-      )
-    }
-    // Both steps must read it from the same repository variable the job already requires.
-    assert.equal(
-      workflow.split(
-        'CAPACITY_SERVICE_ACCOUNT: ${{ vars.PRODUCTION_GCP_RELAY_CAPACITY_SERVICE_ACCOUNT }}'
-      ).length,
-      4
-    )
-  })
 
   it('decides the predecessor draining rule from the real block, for both classes', () => {
     // A zero-host cell sheds nothing, and a failed canary's own drain leaves the flag set
@@ -777,29 +693,5 @@ describe('same-cap roll scripts accept every same-cap cell', () => {
     assert.equal(rolls('resume', { changes: 0 }), 'no-replace')
     assert.equal(rolls('none', { changes: 0 }), 'no-replace')
   })
-
-  it('waits on the image a stranded cell actually serves', () => {
-    const isolate = workflow
-      .split('name: Reversibly isolate and drain only the selected cell')[1]
-      .split('\n      - id:')[0]
-    assert.match(isolate, /--expected-image-digests "\$\{PREDECESSOR_IMAGE_DIGEST\}"/)
-    // A stranded cell has to come back on a new process, which is what clears the drain.
-    const after = workflow
-      .split('name: Verify new incarnation, exact image, protocol, and durable safety')[1]
-      .split('\n      - name:')[0]
-    assert.match(after, /test "\$\{TARGET_INCARNATION\}" != "\$\{SOURCE_INCARNATION\}"/)
-    assert.match(after, /if test "\$\{ROLLBACK_RESUME\}" = true; then/)
-  })
-
-  it('leaves the US-only capacity job on the default allowlist', () => {
-    assert.doesNotMatch(capacityWorkflow, /--approved-cells/)
-  })
 })
 
-// Both trusted versions must prove the same authenticated drain boundary.
-it('proves rehome trust for protocol 3 on forward and rollback rolls', () => {
-  const step = workflow.split('name: Prove exact per-host trust and idempotent no-neighbor behavior')[1].split('\n      - name:')[0]
-  assert.match(step, /inputs\.rollback-rehome-protocol != '0'/)
-  assert.match(step, /inputs\.target-rehome-protocol != '0'/)
-  assert.match(step, /probe-relay-rehome-trust\.mjs/)
-})
diff --git a/cloud/package.json b/cloud/package.json
index 0dd2a5466999..c029b06d6faf 100644
--- a/cloud/package.json
+++ b/cloud/package.json
@@ -20,8 +20,8 @@
     "load:relay:model": "node dev/scripts/run-relay-load-model.mjs",
     "load:relay:recovery-gate": "node dev/scripts/run-relay-recovery-wave-gate.mjs",
     "ops:relay": "pnpm --filter @orca-cloud/relay-ops dev",
-    "pretest": "node --test dev/scripts/capture-terraform-plan-baseline.test.mjs dev/scripts/operate-relay-asia-admission.test.mjs dev/scripts/prepare-relay-asia-director-cells.test.mjs dev/scripts/prepare-relay-asia-topology-input.test.mjs dev/scripts/production-cloud-sql-rollout-lock.test.mjs dev/scripts/read-relay-serving-regional-placement-version.test.mjs dev/scripts/relay-asia-admission-workflow.test.mjs dev/scripts/relay-asia-rollout-evidence.test.mjs dev/scripts/relay-asia-topology-workflow.test.mjs dev/scripts/relay-cloud-sql-connection-budget.test.mjs dev/scripts/relay-load-reader-evidence.test.mjs dev/scripts/relay-lock-contention-alerts.test.mjs dev/scripts/relay-region-hint-metrics.test.mjs dev/scripts/relay-staging-deploy-identity.test.mjs dev/scripts/sanitize-relay-asia-admission-result.test.mjs dev/scripts/terraform-root-partition.test.mjs dev/scripts/validate-relay-asia-topology-plan.test.mjs ../.github/actions/cloud-sql-rollout-lease/action-contract.test.mjs ../.github/actions/cloud-sql-rollout-lease/storage-lease.test.mjs",
-    "test": "pnpm -r test && node --test dev/scripts/classify-relay-production-capacity-director.test.mjs dev/scripts/classify-relay-staging-bootstrap.test.mjs dev/scripts/deploy-relay-blue-green.test.mjs dev/scripts/deploy-relay-gce-candidate.test.mjs dev/scripts/deploy-relay-gce-multi-target.test.mjs dev/scripts/github-smoke-token.test.mjs dev/scripts/infra.test.mjs dev/scripts/operate-relay-regional-rehome.test.mjs dev/scripts/power-staging-relay.test.mjs dev/scripts/prepare-relay-capacity-canary.test.mjs dev/scripts/prepare-relay-production-capacity-canary.test.mjs dev/scripts/probe-relay-legacy-admission.test.mjs dev/scripts/probe-relay-rehome-trust.test.mjs dev/scripts/production-cell-image-digest-consistency.test.mjs dev/scripts/push-gateway-workflow.test.mjs dev/scripts/push-gateway-recovery.test.mjs dev/scripts/push-validation-workflow.test.mjs dev/scripts/read-relay-production-capacity-identity.test.mjs dev/scripts/relay-admin-endpoint-retry-workflow.test.mjs dev/scripts/relay-admin-transient-retry.test.mjs dev/scripts/relay-admission-selector.test.mjs dev/scripts/relay-gce-terraform-fence.test.mjs dev/scripts/relay-load-connection-failure.test.mjs dev/scripts/relay-load-control-peer.test.mjs dev/scripts/relay-load-director-capacity-gate.test.mjs dev/scripts/relay-load-model.test.mjs dev/scripts/relay-load-phase-barrier.test.mjs dev/scripts/relay-load-placement-boundary.test.mjs dev/scripts/relay-load-profile.test.mjs dev/scripts/relay-load-rebind-boundary.test.mjs dev/scripts/relay-load-region-behavior.test.mjs dev/scripts/relay-load-request-unit-boundary.test.mjs dev/scripts/relay-load-run-lifecycle.test.mjs dev/scripts/relay-monitor-evidence.test.mjs dev/scripts/relay-production-capacity-wave.test.mjs dev/scripts/relay-production-capacity-workflow.test.mjs dev/scripts/relay-production-identity-boundaries.test.mjs dev/scripts/relay-production-same-cap-wave.test.mjs dev/scripts/relay-public-workflow-contract.test.mjs dev/scripts/relay-recovery-wave-gate.test.mjs dev/scripts/relay-region-observation-evidence.test.mjs dev/scripts/relay-regional-rehome-workflow.test.mjs dev/scripts/relay-rehome-aggregate-evidence.test.mjs dev/scripts/relay-repository.test.mjs dev/scripts/relay-same-cap-script-census.test.mjs dev/scripts/relay-same-cap-shadow-gate.test.mjs dev/scripts/relay-staging-c4-refresh-workflow.test.mjs dev/scripts/relay-staging-capacity-identity.test.mjs dev/scripts/staging-relay-apply-guard.test.mjs dev/scripts/validate-relay-capacity-plan.test.mjs dev/scripts/verify-relay-capacity-transition.test.mjs dev/scripts/verify-relay-legacy-bootstrap.test.mjs dev/scripts/workload-identity-attribute-conditions.test.mjs",
+    "pretest": "node --test dev/scripts/capture-terraform-plan-baseline.test.mjs dev/scripts/operate-relay-asia-admission.test.mjs dev/scripts/prepare-relay-asia-director-cells.test.mjs dev/scripts/prepare-relay-asia-topology-input.test.mjs dev/scripts/production-cloud-sql-rollout-lock.test.mjs dev/scripts/read-relay-serving-regional-placement-version.test.mjs dev/scripts/relay-asia-rollout-evidence.test.mjs dev/scripts/relay-asia-topology-workflow.test.mjs dev/scripts/relay-cloud-sql-connection-budget.test.mjs dev/scripts/relay-load-reader-evidence.test.mjs dev/scripts/relay-lock-contention-alerts.test.mjs dev/scripts/relay-region-hint-metrics.test.mjs dev/scripts/relay-staging-deploy-identity.test.mjs dev/scripts/sanitize-relay-asia-admission-result.test.mjs dev/scripts/terraform-root-partition.test.mjs dev/scripts/validate-relay-asia-topology-plan.test.mjs ../.github/actions/cloud-sql-rollout-lease/action-contract.test.mjs ../.github/actions/cloud-sql-rollout-lease/storage-lease.test.mjs",
+    "test": "pnpm -r test && node --test dev/scripts/classify-relay-production-capacity-director.test.mjs dev/scripts/classify-relay-staging-bootstrap.test.mjs dev/scripts/deploy-relay-blue-green.test.mjs dev/scripts/deploy-relay-gce-candidate.test.mjs dev/scripts/deploy-relay-gce-multi-target.test.mjs dev/scripts/github-smoke-token.test.mjs dev/scripts/infra.test.mjs dev/scripts/operate-relay-regional-rehome.test.mjs dev/scripts/power-staging-relay.test.mjs dev/scripts/prepare-relay-capacity-canary.test.mjs dev/scripts/prepare-relay-production-capacity-canary.test.mjs dev/scripts/probe-relay-legacy-admission.test.mjs dev/scripts/probe-relay-rehome-trust.test.mjs dev/scripts/production-cell-image-digest-consistency.test.mjs dev/scripts/push-gateway-workflow.test.mjs dev/scripts/push-gateway-recovery.test.mjs dev/scripts/read-relay-production-capacity-identity.test.mjs dev/scripts/relay-admin-endpoint-retry-workflow.test.mjs dev/scripts/relay-admin-transient-retry.test.mjs dev/scripts/relay-admission-selector.test.mjs dev/scripts/relay-gce-terraform-fence.test.mjs dev/scripts/relay-load-connection-failure.test.mjs dev/scripts/relay-load-control-peer.test.mjs dev/scripts/relay-load-director-capacity-gate.test.mjs dev/scripts/relay-load-model.test.mjs dev/scripts/relay-load-phase-barrier.test.mjs dev/scripts/relay-load-placement-boundary.test.mjs dev/scripts/relay-load-profile.test.mjs dev/scripts/relay-load-rebind-boundary.test.mjs dev/scripts/relay-load-region-behavior.test.mjs dev/scripts/relay-load-request-unit-boundary.test.mjs dev/scripts/relay-load-run-lifecycle.test.mjs dev/scripts/relay-monitor-evidence.test.mjs dev/scripts/relay-production-capacity-wave.test.mjs dev/scripts/relay-production-capacity-workflow.test.mjs dev/scripts/relay-production-identity-boundaries.test.mjs dev/scripts/relay-production-same-cap-wave.test.mjs dev/scripts/relay-public-workflow-contract.test.mjs dev/scripts/relay-recovery-wave-gate.test.mjs dev/scripts/relay-region-observation-evidence.test.mjs dev/scripts/relay-rehome-aggregate-evidence.test.mjs dev/scripts/relay-repository.test.mjs dev/scripts/relay-same-cap-script-census.test.mjs dev/scripts/relay-same-cap-shadow-gate.test.mjs dev/scripts/relay-staging-c4-refresh-workflow.test.mjs dev/scripts/relay-staging-capacity-identity.test.mjs dev/scripts/staging-relay-apply-guard.test.mjs dev/scripts/validate-relay-capacity-plan.test.mjs dev/scripts/verify-relay-capacity-transition.test.mjs dev/scripts/verify-relay-legacy-bootstrap.test.mjs dev/scripts/workload-identity-attribute-conditions.test.mjs",
     "typecheck": "pnpm -r typecheck"
   },
   "devDependencies": {
diff --git a/config/build-plugins/pdfjs-viewer-assets.ts b/config/build-plugins/pdfjs-viewer-assets.ts
index c212194ec71e..a632a7aa2d61 100644
--- a/config/build-plugins/pdfjs-viewer-assets.ts
+++ b/config/build-plugins/pdfjs-viewer-assets.ts
@@ -76,6 +76,9 @@ export function createPdfjsViewerAssetsPlugin(root = pdfjsRoot()): Plugin {
           next()
           return
         }
+        if (response.destroyed) {
+          return
+        }
         response.statusCode = 200
         response.setHeader('Content-Length', size)
         response.setHeader(
@@ -86,7 +89,18 @@ export function createPdfjsViewerAssetsPlugin(root = pdfjsRoot()): Plugin {
           response.end()
           return
         }
-        createReadStream(filePath).pipe(response)
+        const stream = createReadStream(filePath)
+        const stopReading = (): void => {
+          stream.destroy()
+        }
+        response.once('close', stopReading)
+        response.once('error', stopReading)
+        stream.once('close', () => {
+          response.off('close', stopReading)
+          response.off('error', stopReading)
+        })
+        stream.once('error', () => response.destroy())
+        stream.pipe(response)
       })
     },
     writeBundle(options) {
diff --git a/config/docker/cli-launch-contract/Dockerfile b/config/docker/cli-launch-contract/Dockerfile
index c90cbcd979c7..bc9ba2947f4d 100644
--- a/config/docker/cli-launch-contract/Dockerfile
+++ b/config/docker/cli-launch-contract/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=ubuntu:24.04
+ARG BASE_IMAGE=ubuntu@sha256:4fbb8e6a8395de5a7550b33509421a2bafbc0aab6c06ba2cef9ebffbc7092d90
 FROM ${BASE_IMAGE}
 
 ARG LIBASOUND_PACKAGE=libasound2t64
diff --git a/config/e2e-failure-tracking.json b/config/e2e-failure-tracking.json
new file mode 100644
index 000000000000..fe51488c7066
--- /dev/null
+++ b/config/e2e-failure-tracking.json
@@ -0,0 +1 @@
+[]
diff --git a/config/electron-builder-pr-linux.config.cjs b/config/electron-builder-pr-linux.config.cjs
new file mode 100644
index 000000000000..54056e809965
--- /dev/null
+++ b/config/electron-builder-pr-linux.config.cjs
@@ -0,0 +1,8 @@
+const release = require('./electron-builder.config.cjs')
+
+// CI discards these packages after smoke tests; keep release compression unchanged.
+module.exports = {
+  ...release,
+  deb: { ...release.deb, fpm: [...(release.deb.fpm ?? []), '--deb-compression-level=1'] },
+  rpm: { ...release.rpm, fpm: [...(release.rpm.fpm ?? []), '--rpm-compression-level=1'] }
+}
diff --git a/config/electron-builder.config.cjs b/config/electron-builder.config.cjs
index 985c91f8ca48..8023182278f8 100644
--- a/config/electron-builder.config.cjs
+++ b/config/electron-builder.config.cjs
@@ -167,6 +167,8 @@ module.exports = {
     // it is gitignored, but exclude it defensively so a stray local capture at
     // package time never bloats app.asar.
     '!pr-evidence{,/**/*}',
+    // Local build logs and rollback copies are never application resources.
+    '!notes{,/**/*}',
     // Why: local agent/tooling directories may contain worktree symlink loops;
     // they are never runtime inputs and must not be traversed by electron-builder.
     '!{.claude,.grok,.agents,.codex}{,/**/*}',
diff --git a/config/fork-ownership.json b/config/fork-ownership.json
index b466d0ef3b52..a0e733c06705 100644
--- a/config/fork-ownership.json
+++ b/config/fork-ownership.json
@@ -531,12 +531,6 @@
       "kind": "passthrough",
       "lines": ["  | 'heimdall'"]
     },
-    {
-      "path": "src/renderer/src/lib/agent-launch-routing-caller-census.test.ts",
-      "feature": "hosted-review-sitter",
-      "kind": "registration",
-      "lines": ["  'src/renderer/src/fork-hosted-review-sitter/fix-checks-agent-launch.ts',"]
-    },
     {
       "path": "src/renderer/src/lib/worktree-activation-surface-caller-wiring.test.ts",
       "feature": "hosted-review-sitter",
@@ -918,14 +912,6 @@
       "kind": "registration",
       "lines": ["      if (job === 'code_paths' || job === 'fork_ownership_guard') {"]
     },
-    {
-      "path": "src/shared/pane-agent-identity-inventory.test.ts",
-      "feature": "session-handoff",
-      "kind": "registration",
-      "lines": [
-        "        'src/renderer/src/components/agent-session-continuation/fork-session-handoff/AgentSessionContinuationDialog.tsx',"
-      ]
-    },
     {
       "path": "tests/e2e/cross-version-wire/cross-version-browser-placement.unit.test.ts",
       "feature": "fork-infra",
@@ -1191,7 +1177,9 @@
       "path": "src/preload/api/pty-api.ts",
       "feature": "terminal-dock",
       "kind": "passthrough",
-      "lines": ["  writeInputAccepted: (id: string, data: string) => Promise<boolean>"]
+      "lines": [
+        "  writeInputAccepted: (id: string, data: string, inputKind: TerminalInputKind) => Promise<boolean>"
+      ]
     },
     {
       "path": "src/preload/api/ui-command-event-api.ts",
@@ -1216,7 +1204,9 @@
       "path": "src/preload/api/pty-bridge-session-control.ts",
       "feature": "terminal-dock",
       "kind": "passthrough",
-      "lines": ["  writeInputAccepted: (id: string, data: string): Promise<boolean> =>"]
+      "lines": [
+        "  writeInputAccepted: (id: string, data: string, inputKind: TerminalInputKind): Promise<boolean> =>"
+      ]
     },
     {
       "path": "src/relay/relay-runtime-services.ts",
@@ -3057,25 +3047,6 @@
         "    return askServicesFor(this, () => Boolean(this.getAvailableAuthoritativeWindow()))"
       ]
     },
-    {
-      "path": "src/main/runtime/rpc/methods/terminal/terminal-legacy-simple-subscriptions.ts",
-      "feature": "ask-question-tool",
-      "kind": "registration",
-      "lines": [
-        "import { untrackAskSurfacePaneSubscription } from '../../../../fork-ask-question-tool/ask-attached-surface-roster'",
-        "      untrackAskSurfacePaneSubscription(runtime, connectionId, params.terminal)",
-        "      untrackAskSurfacePaneSubscription(runtime, connectionId, params.terminal)"
-      ]
-    },
-    {
-      "path": "src/main/runtime/rpc/methods/terminal/terminal-legacy-subscribe-binary.ts",
-      "feature": "ask-question-tool",
-      "kind": "registration",
-      "lines": [
-        "import { untrackAskSurfacePaneSubscription } from '../../../../fork-ask-question-tool/ask-attached-surface-roster'",
-        "      untrackAskSurfacePaneSubscription(runtime, connectionId, params.terminal)"
-      ]
-    },
     {
       "path": "src/main/runtime/rpc/methods/terminal/terminal-multiplex-cleanup.ts",
       "feature": "ask-question-tool",
@@ -3100,8 +3071,10 @@
       "feature": "ask-question-tool",
       "kind": "registration",
       "lines": [
-        "import { trackAskSurfacePaneSubscription } from '../../../../fork-ask-question-tool/ask-attached-surface-roster'",
-        "      trackAskSurfacePaneSubscription(runtime, connectionId, params.terminal)"
+        "  trackAskSurfacePaneSubscription,",
+        "  untrackAskSurfacePaneSubscription",
+        "        trackAskSurfacePaneSubscription(runtime, connectionId, params.terminal)",
+        "          () => untrackAskSurfacePaneSubscription(runtime, connectionId, params.terminal),"
       ]
     },
     {
@@ -4349,12 +4322,6 @@
         "  HOSTED_REVIEW_FIX_CHECKS_CALLER_PROFILE"
       ]
     },
-    {
-      "path": "src/renderer/src/lib/agent-launch-caller-profile-census.test.ts",
-      "feature": "hosted-review-sitter",
-      "kind": "registration",
-      "lines": ["    expect(ids.length).toBe(13)", "      'hosted-review-fix-checks',"]
-    },
     {
       "path": "src/main/ipc/filesystem-download-lifetime.test.ts",
       "feature": "fork-infra",
@@ -5283,6 +5250,38 @@
       "feature": "automation-launch-settings",
       "kind": "passthrough",
       "lines": ["        launchOptions: SourceControlLaunchOptions.nullable().optional()"]
+    },
+    {
+      "path": "tests/e2e/cross-version-wire/agent-session-death-evidence-downgrade.unit.test.ts",
+      "feature": "fork-infra",
+      "kind": "passthrough",
+      "lines": ["const BASELINE_REF = 'v1.4.208-rc.0.zy01'"]
+    },
+    {
+      "path": "tests/e2e/cross-version-wire/agent-session-resume-marker-downgrade.unit.test.ts",
+      "feature": "fork-infra",
+      "kind": "passthrough",
+      "lines": ["const BASELINE_REF = 'v1.4.216-rc.0.zy03'"]
+    },
+    {
+      "path": "tests/e2e/cross-version-wire/cross-version-worktree-ps-verdict.unit.test.ts",
+      "feature": "fork-infra",
+      "kind": "passthrough",
+      "lines": ["const PRE_CHANGE_REF = 'v1.4.216-rc.0.zy01'"]
+    },
+    {
+      "path": "pnpm-lock.yaml",
+      "feature": "fork-infra",
+      "kind": "passthrough",
+      "lines": ["        specifier: 12.5.1", "        version: 12.5.1"]
+    },
+    {
+      "path": "config/scripts/localization-package-contract.test.mjs",
+      "feature": "fork-infra",
+      "kind": "passthrough",
+      "lines": [
+        "      'pnpm run verify:localization-catalog && pnpm run verify:localization-runtime-catalog'"
+      ]
     }
   ],
   "exceptions": [
@@ -5304,18 +5303,6 @@
       "status": "pending-upstream",
       "ledger": "docs/fork-upstreaming.md#git-exec-mutation-cache-invalidation"
     },
-    {
-      "path": "src/main/runtime/rpc/methods/orchestration-structured-worker-session.ts",
-      "reason": "Wait for an admitted structured preamble to settle before judging it, so Claude worker and owner starts are not misreported as unknown.",
-      "status": "pending-upstream",
-      "ledger": "docs/fork-upstreaming.md#structured-preamble-waits-for-admitted-settlement"
-    },
-    {
-      "path": "src/main/runtime/rpc/methods/orchestration-structured-worker-session.test.ts",
-      "reason": "Defend preamble settlement for admitted, rejected, and unsettled Claude sends.",
-      "status": "pending-upstream",
-      "ledger": "docs/fork-upstreaming.md#structured-preamble-waits-for-admitted-settlement"
-    },
     {
       "path": "src/main/runtime/terminal-wait-detection.ts",
       "reason": "Recognize Claude Code's cold-start input box and finished-turn summary as a ready prompt, since Claude paints no idle title.",
@@ -5612,11 +5599,6 @@
       "reason": "Tests for the fork's release-tooling delta above.",
       "status": "permanent"
     },
-    {
-      "path": "config/scripts/package-electron-runtime-contract.test.mjs",
-      "reason": "Tests the fork's own packaged Electron runtime contract.",
-      "status": "permanent"
-    },
     {
       "path": "config/scripts/release-cut-token-permissions.test.mjs",
       "status": "permanent",
@@ -5627,6 +5609,11 @@
       "reason": "Fork release-tooling delta for the fork's own RC history.",
       "status": "permanent"
     },
+    {
+      "path": "config/scripts/package-electron-runtime-contract.test.mjs",
+      "reason": "Tests the fork's own packaged Electron runtime contract.",
+      "status": "permanent"
+    },
     {
       "path": "config/scripts/release-rc-history.test.mjs",
       "reason": "Tests for the fork's release-tooling delta above.",
@@ -5810,12 +5797,6 @@
       "deleted": true,
       "reason": "Upstream's chat-only PTY send hook; fork-agent-composer's useAgentComposerSend already serves both the chat pane and the terminal dock."
     },
-    {
-      "path": "src/renderer/src/components/native-chat/use-native-chat-draft.ts",
-      "reason": "Superseded by useAgentComposerDraft, which serves both the chat pane and the dock.",
-      "status": "permanent",
-      "deleted": true
-    },
     {
       "path": "src/renderer/src/components/native-chat/use-native-chat-live-session-visibility.test.ts",
       "reason": "The tag visibility test assumes hidden panes disable reads, but the retained-session relay path must stay subscribed across SSH relay reconnects; it cannot assert both contracts.",
@@ -6023,12 +6004,6 @@
       "status": "pending-upstream",
       "ledger": "docs/fork-upstreaming.md#bug-2-relay-and-ssh-environment-dependent-failures"
     },
-    {
-      "path": "config/scripts/hourly-build-version.test.mjs",
-      "reason": "Resolves the unpublished-release base explicitly instead of through getHourlyBuildIdentity, which reads this repo's package.json and pins the case to a tree at or below 1.4.203 — upstream's own v1.4.206 tag fails it too.",
-      "status": "pending-upstream",
-      "ledger": "docs/fork-upstreaming.md#hourly-base-case-is-pinned-to-the-repos-own-package-version"
-    },
     {
       "path": "config/scripts/ci-dependency-download-cache.test.mjs",
       "reason": "Contracts for the fork-owned PR job graph. Upstream asserts its Windows lane still carries the addon checks; this fork removed the Windows PR lanes, so the case asserts the removal instead.",
@@ -6428,40 +6403,23 @@
       "ledger": "bug-1"
     },
     {
-      "path": ".github/workflows/terminal-ime-e2e.yml",
-      "reason": "Upstream's #23270 (dffb3498e2), not yet in a stable tag: Playwright 1.63 reads a forwarded `--` as ending file selection, so focused e2e steps run the whole suite.",
-      "status": "pending-upstream",
-      "ledger": "docs/fork-upstreaming.md#focused-playwright-file-selection"
-    },
-    {
-      "path": ".github/workflows/golden-e2e-experiment.yml",
-      "reason": "Upstream's #23270 (dffb3498e2), not yet in a stable tag: Playwright 1.63 reads a forwarded `--` as ending file selection, so focused e2e steps run the whole suite.",
-      "status": "pending-upstream",
-      "ledger": "docs/fork-upstreaming.md#focused-playwright-file-selection"
-    },
-    {
-      "path": "config/scripts/run-terminal-ibus-hangul-e2e.mjs",
-      "reason": "Upstream's #23270 (dffb3498e2), not yet in a stable tag: Playwright 1.63 reads a forwarded `--` as ending file selection, so focused e2e steps run the whole suite.",
-      "status": "pending-upstream",
-      "ledger": "docs/fork-upstreaming.md#focused-playwright-file-selection"
-    },
-    {
-      "path": "config/scripts/terminal-ime-e2e-workflow.test.mjs",
-      "reason": "Upstream's #23270 (dffb3498e2), not yet in a stable tag: Playwright 1.63 reads a forwarded `--` as ending file selection, so focused e2e steps run the whole suite.",
+      "path": "src/cli/specs/search.test.ts",
+      "reason": "Removes an invalid global assertion that CLI flags are exclusive; Heimdall create commands legitimately use repeatable flags.",
       "status": "pending-upstream",
-      "ledger": "docs/fork-upstreaming.md#focused-playwright-file-selection"
+      "ledger": "bug-253"
     },
     {
-      "path": "config/scripts/playwright-focused-workflow-selection.test.mjs",
-      "reason": "Upstream's #23270 (dffb3498e2), not yet in a stable tag: Playwright 1.63 reads a forwarded `--` as ending file selection, so focused e2e steps run the whole suite.",
+      "path": "config/scripts/mobile-recording-pin-checkout.test.mjs",
+      "reason": "v1.4.218's mobile.yml (synced from main for the cut) has no recording-pin job, so its own contract test fails; upstream deleted the test in e594cb06af.",
       "status": "pending-upstream",
-      "ledger": "docs/fork-upstreaming.md#focused-playwright-file-selection"
+      "ledger": "docs/fork-upstreaming.md#mobile-workflow-tests-ahead-of-their-release",
+      "deleted": true
     },
     {
-      "path": "src/cli/specs/search.test.ts",
-      "reason": "Removes an invalid global assertion that CLI flags are exclusive; Heimdall create commands legitimately use repeatable flags.",
+      "path": "config/scripts/mobile-release-check-scope.test.mjs",
+      "reason": "v1.4.218's mobile.yml gates 'Summarize RPC recording changes', which the tag's test does not expect; aligned with upstream's e594cb06af.",
       "status": "pending-upstream",
-      "ledger": "bug-253"
+      "ledger": "docs/fork-upstreaming.md#mobile-workflow-tests-ahead-of-their-release"
     }
   ],
   "residuals": {
@@ -6545,10 +6503,6 @@
       "added": 4,
       "removed": 7
     },
-    "src/renderer/src/lib/agent-launch-routing-caller-census.test.ts": {
-      "added": 1,
-      "removed": 0
-    },
     "src/renderer/src/lib/worktree-activation-surface-caller-wiring.test.ts": {
       "added": 2,
       "removed": 0
@@ -6686,7 +6640,7 @@
       "removed": 1
     },
     "src/main/ipc/pty/ipc/write-input.ts": {
-      "added": 82,
+      "added": 80,
       "removed": 1
     },
     "src/main/ipc/pty/ipc/write.ts": {
@@ -6861,14 +6815,6 @@
       "added": 2,
       "removed": 1
     },
-    "src/main/runtime/rpc/methods/terminal/terminal-legacy-simple-subscriptions.ts": {
-      "added": 3,
-      "removed": 0
-    },
-    "src/main/runtime/rpc/methods/terminal/terminal-legacy-subscribe-binary.ts": {
-      "added": 2,
-      "removed": 0
-    },
     "src/main/runtime/rpc/methods/terminal/terminal-multiplex-cleanup.ts": {
       "added": 3,
       "removed": 1
@@ -6878,7 +6824,7 @@
       "removed": 0
     },
     "src/main/runtime/rpc/methods/terminal/terminal-subscribe-method.ts": {
-      "added": 2,
+      "added": 10,
       "removed": 0
     },
     "src/main/runtime/rpc/methods/worktree.ts": {
@@ -7115,7 +7061,7 @@
     },
     "src/renderer/src/components/native-chat/NativeChatView.test.tsx": {
       "added": 4,
-      "removed": 4
+      "removed": 6
     },
     "src/renderer/src/components/native-chat/native-chat-attachment-upload.ts": {
       "added": 2,
@@ -7162,8 +7108,8 @@
       "removed": 3
     },
     "src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts": {
-      "added": 98,
-      "removed": 47
+      "added": 93,
+      "removed": 72
     },
     "src/renderer/src/components/native-chat/use-native-chat-live-session-pending.test.ts": {
       "added": 4,
@@ -7314,8 +7260,8 @@
       "removed": 0
     },
     "src/renderer/src/components/sidebar/worktree-card-compact-agent-row.tsx": {
-      "added": 18,
-      "removed": 1
+      "added": 2,
+      "removed": 0
     },
     "src/renderer/src/components/sidebar/worktree-drag-units.ts": {
       "added": 8,
@@ -7829,10 +7775,6 @@
       "added": 5,
       "removed": 2
     },
-    "src/shared/pane-agent-identity-inventory.test.ts": {
-      "added": 4,
-      "removed": 0
-    },
     "src/shared/persisted-ui-state-types.ts": {
       "added": 4,
       "removed": 1
@@ -8225,10 +8167,6 @@
       "added": 3,
       "removed": 1
     },
-    "src/renderer/src/lib/agent-launch-caller-profile-census.test.ts": {
-      "added": 2,
-      "removed": 1
-    },
     "src/main/ipc/filesystem-download-lifetime.test.ts": {
       "added": 7,
       "removed": 1
@@ -8732,6 +8670,26 @@
     "src/shared/rpc-contract/git-params.ts": {
       "added": 15,
       "removed": 2
+    },
+    "tests/e2e/cross-version-wire/agent-session-death-evidence-downgrade.unit.test.ts": {
+      "added": 1,
+      "removed": 1
+    },
+    "tests/e2e/cross-version-wire/agent-session-resume-marker-downgrade.unit.test.ts": {
+      "added": 1,
+      "removed": 1
+    },
+    "tests/e2e/cross-version-wire/cross-version-worktree-ps-verdict.unit.test.ts": {
+      "added": 1,
+      "removed": 1
+    },
+    "pnpm-lock.yaml": {
+      "added": 94,
+      "removed": 37
+    },
+    "config/scripts/localization-package-contract.test.mjs": {
+      "added": 1,
+      "removed": 1
     }
   }
 }
diff --git a/config/nsis/orca-installer-hooks.nsh b/config/nsis/orca-installer-hooks.nsh
index d89439073abd..a6fb31f9aec9 100644
--- a/config/nsis/orca-installer-hooks.nsh
+++ b/config/nsis/orca-installer-hooks.nsh
@@ -3,6 +3,8 @@
 ; electron-builder accepts exactly ONE `nsis.include` file, so every customInstall /
 ; customUnInstall hook Orca needs lives here.
 
+!include "${__FILEDIR__}\orca-process-check.nsh"
+
 ; ---------------------------------------------------------------------------
 ; Markdown "Open with Orca" (issue #10138)
 ;
diff --git a/config/nsis/orca-process-check.nsh b/config/nsis/orca-process-check.nsh
new file mode 100644
index 000000000000..4acedf5afc8e
--- /dev/null
+++ b/config/nsis/orca-process-check.nsh
@@ -0,0 +1,17 @@
+; Defining the hook suppresses electron-builder's process-info declarations.
+!include "getProcessInfo.nsh"
+Var pid
+Var /GLOBAL IsPowerShellAvailable
+
+!macro customCheckAppRunning
+  ; Restricted permits inline commands; test the process query rather than script-file policy.
+  ; Match upstream FIND/KILL's profile behavior so the probe cannot skip a failing profile.
+  nsExec::Exec `"$PowerShellPath" -Command "try { Get-CimInstance -ClassName Win32_Process -ErrorAction Stop | Out-Null; exit 0 } catch { exit 1 }"`
+  Pop $0
+  ; Launch errors, timeouts, and failed queries retain upstream's image-name fallback.
+  StrCpy $IsPowerShellAvailable 1
+  ${if} $0 == 0
+    StrCpy $IsPowerShellAvailable 0
+  ${endIf}
+  !insertmacro _CHECK_APP_RUNNING
+!macroend
diff --git a/config/patches/@xterm__addon-image@0.10.0-beta.300.patch b/config/patches/@xterm__addon-image@0.10.0-beta.300.patch
index c44cb33d2d50..44d6ac32c148 100644
--- a/config/patches/@xterm__addon-image@0.10.0-beta.300.patch
+++ b/config/patches/@xterm__addon-image@0.10.0-beta.300.patch
@@ -1,24 +1,24 @@
 diff --git a/lib/addon-image.js b/lib/addon-image.js
-index 38cf9e8708a5f314b8d587e5428ce7facb0d4076..4807d674d75a5aeaba40cf86972ce0a6158a33f4 100644
+index 38cf9e8708a5f314b8d587e5428ce7facb0d4076..4c5f44e00b0972978d762df5990de86002537649 100644
 --- a/lib/addon-image.js
 +++ b/lib/addon-image.js
 @@ -1,3 +1,3 @@
  /*! For license information please see addon-image.js.LICENSE.txt */
 -!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.ImageAddon=t():e.ImageAddon=t()}(globalThis,()=>(()=>{"use strict";var e={939(e,t){function A(e){return 255&e}function i(e){return e>>>8&255}function s(e){return e>>>16&255}function r(e,t,A,i=255){return((255&i)<<24|(255&A)<<16|(255&t)<<8|255&e)>>>0}function o(e,t,A){return Math.max(e,Math.min(A,t))}function a(e,t,A){return A<0&&(A+=1),A>1&&(A-=1),6*A<1?t+6*(e-t)*A:2*A<1?e:3*A<2?t+(e-t)*(4-6*A):t}function n(e,t,A){return(4278190080|Math.round(A/100*255)<<16|Math.round(t/100*255)<<8|Math.round(e/100*255))>>>0}Object.defineProperty(t,"__esModule",{value:!0}),t.DEFAULT_FOREGROUND=t.DEFAULT_BACKGROUND=t.PALETTE_ANSI_256=t.PALETTE_VT340_GREY=t.PALETTE_VT340_COLOR=t.normalizeHLS=t.normalizeRGB=t.nearestColorIndex=t.fromRGBA8888=t.toRGBA8888=t.alpha=t.blue=t.green=t.red=t.BIG_ENDIAN=void 0,t.BIG_ENDIAN=255===new Uint8Array(new Uint32Array([4278190080]).buffer)[0],t.BIG_ENDIAN&&console.warn("BE platform detected. This version of node-sixel works only on LE properly."),t.red=A,t.green=i,t.blue=s,t.alpha=function(e){return e>>>24&255},t.toRGBA8888=r,t.fromRGBA8888=function(e){return[255&e,e>>8&255,e>>16&255,e>>>24]},t.nearestColorIndex=function(e,t){const r=A(e),o=i(e),a=s(e);let n=Number.MAX_SAFE_INTEGER,h=-1;for(let e=0;e<t.length;++e){const A=r-t[e][0],i=o-t[e][1],s=a-t[e][2],g=A*A+i*i+s*s;if(!g)return e;g<n&&(n=g,h=e)}return h},t.normalizeRGB=n,t.normalizeHLS=function(e,t,A){return function(e,t,A){if(!A){const e=Math.round(255*t);return r(e,e,e)}const i=t<.5?t*(1+A):t+A-t*A,s=2*t-i;return r(o(0,255,Math.round(255*a(i,s,e+1/3))),o(0,255,Math.round(255*a(i,s,e))),o(0,255,Math.round(255*a(i,s,e-1/3))))}((e+240)/360,t/100,A/100)},t.PALETTE_VT340_COLOR=new Uint32Array([n(0,0,0),n(20,20,80),n(80,13,13),n(20,80,20),n(80,20,80),n(20,80,80),n(80,80,20),n(53,53,53),n(26,26,26),n(33,33,60),n(60,26,26),n(33,60,33),n(60,33,60),n(33,60,60),n(60,60,33),n(80,80,80)]),t.PALETTE_VT340_GREY=new Uint32Array([n(0,0,0),n(13,13,13),n(26,26,26),n(40,40,40),n(6,6,6),n(20,20,20),n(33,33,33),n(46,46,46),n(0,0,0),n(13,13,13),n(26,26,26),n(40,40,40),n(6,6,6),n(20,20,20),n(33,33,33),n(46,46,46)]),t.PALETTE_ANSI_256=(()=>{const e=[r(0,0,0),r(205,0,0),r(0,205,0),r(205,205,0),r(0,0,238),r(205,0,205),r(0,250,205),r(229,229,229),r(127,127,127),r(255,0,0),r(0,255,0),r(255,255,0),r(92,92,255),r(255,0,255),r(0,255,255),r(255,255,255)],t=[0,95,135,175,215,255];for(let A=0;A<6;++A)for(let i=0;i<6;++i)for(let s=0;s<6;++s)e.push(r(t[A],t[i],t[s]));for(let t=8;t<=238;t+=10)e.push(r(t,t,t));return new Uint32Array(e)})(),t.DEFAULT_BACKGROUND=r(0,0,0,255),t.DEFAULT_FOREGROUND=r(255,255,255,255)},591(e,t,A){Object.defineProperty(t,"__esModule",{value:!0}),t.decodeAsync=t.decode=t.Decoder=t.DecoderAsync=void 0;const i=A(939),s=A(199),r=function(e){if("undefined"!=typeof Buffer)return Buffer.from(e,"base64");const t=atob(e),A=new Uint8Array(t.length);for(let e=0;e<A.length;++e)A[e]=t.charCodeAt(e);return A}(s.LIMITS.BYTES);let o;const a=new Uint32Array;class n{constructor(){this.bandHandler=e=>1,this.modeHandler=e=>1}handle_band(e){return this.bandHandler(e)}mode_parsed(e){return this.modeHandler(e)}}const h={memoryLimit:134217728,sixelColor:i.DEFAULT_FOREGROUND,fillColor:i.DEFAULT_BACKGROUND,palette:i.PALETTE_VT340_COLOR,paletteLimit:s.LIMITS.PALETTE_SIZE,truncate:!0};function g(e){const t=new n,A={env:{handle_band:t.handle_band.bind(t),mode_parsed:t.mode_parsed.bind(t)}};return WebAssembly.instantiate(o||r,A).then(A=>(o=o||A.module,new d(e,A.instance||A,t)))}t.DecoderAsync=g;class d{constructor(e,t,A){if(this._PIXEL_OFFSET=s.LIMITS.MAX_WIDTH+4,this._canvas=a,this._bandWidths=[],this._maxWidth=0,this._minWidth=s.LIMITS.MAX_WIDTH,this._lastOffset=0,this._currentHeight=0,this._opts=Object.assign({},h,e),this._opts.paletteLimit>s.LIMITS.PALETTE_SIZE)throw new Error(`DecoderOptions.paletteLimit must not exceed ${s.LIMITS.PALETTE_SIZE}`);if(t)A.bandHandler=this._handle_band.bind(this),A.modeHandler=this._initCanvas.bind(this);else{const e=o||(o=new WebAssembly.Module(r));t=new WebAssembly.Instance(e,{env:{handle_band:this._handle_band.bind(this),mode_parsed:this._initCanvas.bind(this)}})}this._instance=t,this._wasm=this._instance.exports,this._chunk=new Uint8Array(this._wasm.memory.buffer,this._wasm.get_chunk_address(),s.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(),s.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(i.DEFAULT_FOREGROUND,0,this._opts.paletteLimit,0)}get _fillColor(){return this._states[0]}get _truncate(){return this._states[8]}get _rasterWidth(){return this._states[6]}get _rasterHeight(){return this._states[7]}get _width(){return this._states[2]?this._states[2]-4:0}get _height(){return this._states[3]}get _level(){return this._states[9]}get _mode(){return this._states[10]}get _paletteLimit(){return this._states[11]}_initCanvas(e){if(2===e){const e=this.width*this.height;if(e>this._canvas.length){if(this._opts.memoryLimit&&4*e>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");this._canvas=new Uint32Array(e)}this._maxWidth=this._width}else if(1===e)if(2===this._level){const e=Math.min(this._rasterWidth,s.LIMITS.MAX_WIDTH)*this._rasterHeight;if(e>this._canvas.length){if(this._opts.memoryLimit&&4*e>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");this._canvas=new Uint32Array(e)}}else this._canvas.length<65536&&(this._canvas=new Uint32Array(65536));return 0}_realloc(e,t){const A=e+t;if(A>this._canvas.length){if(this._opts.memoryLimit&&4*A>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");const e=new Uint32Array(65536*Math.ceil(A/65536));e.set(this._canvas),this._canvas=e}}_handle_band(e){const t=this._PIXEL_OFFSET;let A=this._lastOffset;if(2===this._mode){let i=this.height-this._currentHeight,s=0;for(;s<6&&i>0;)this._canvas.set(this._pSrc.subarray(t*s,t*s+e),A+e*s),s++,i--;this._lastOffset+=e*s,this._currentHeight+=s}else if(1===this._mode){this._realloc(A,6*e),this._maxWidth=Math.max(this._maxWidth,e),this._minWidth=Math.min(this._minWidth,e);for(let i=0;i<6;++i)this._canvas.set(this._pSrc.subarray(t*i,t*i+e),A+e*i);this._bandWidths.push(e),this._lastOffset+=6*e,this._currentHeight+=6}return 0}get width(){return 1!==this._mode?this._width:Math.max(this._maxWidth,this._wasm.current_width())}get height(){return 1!==this._mode?this._height:this._wasm.current_width()?6*this._bandWidths.length+this._wasm.current_height():6*this._bandWidths.length}get palette(){return this._palette.subarray(0,this._paletteLimit)}get memoryUsage(){return this._canvas.byteLength+this._wasm.memory.buffer.byteLength+8*this._bandWidths.length}get properties(){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}}}init(e=this._opts.fillColor,t=this._opts.palette,A=this._opts.paletteLimit,i=this._opts.truncate){this._wasm.init(this._opts.sixelColor,e,A,i?1:0),t&&this._palette.set(t.subarray(0,s.LIMITS.PALETTE_SIZE)),this._bandWidths.length=0,this._maxWidth=0,this._minWidth=s.LIMITS.MAX_WIDTH,this._lastOffset=0,this._currentHeight=0}decode(e,t=0,A=e.length){let i=t;for(;i<A;){const t=Math.min(A-i,s.LIMITS.CHUNK_SIZE);this._chunk.set(e.subarray(i,i+=t)),this._wasm.decode(0,t)}}decodeString(e,t=0,A=e.length){let i=t;for(;i<A;){const t=Math.min(A-i,s.LIMITS.CHUNK_SIZE);for(let A=0,s=i;A<t;++A,++s)this._chunk[A]=e.charCodeAt(s);i+=t,this._wasm.decode(0,t)}}get data32(){if(0===this._mode||!this.width||!this.height)return a;const e=this._wasm.current_width();if(2===this._mode){let t=this.height-this._currentHeight;if(t>0){const A=this._PIXEL_OFFSET;let i=this._lastOffset,s=0;for(;s<6&&t>0;)this._canvas.set(this._pSrc.subarray(A*s,A*s+e),i+e*s),s++,t--;t&&this._canvas.fill(this._fillColor,i+e*s)}return this._canvas.subarray(0,this.width*this.height)}if(1===this._mode){if(this._minWidth===this._maxWidth){let t=!1;if(e)if(e!==this._minWidth)t=!0;else{const t=this._PIXEL_OFFSET;let A=this._lastOffset;this._realloc(A,6*e);for(let i=0;i<6;++i)this._canvas.set(this._pSrc.subarray(t*i,t*i+e),A+e*i)}if(!t)return this._canvas.subarray(0,this.width*this.height)}const t=new Uint32Array(this.width*this.height);t.fill(this._fillColor);let A=0,i=0;for(let e=0;e<this._bandWidths.length;++e){const s=this._bandWidths[e];for(let e=0;e<6;++e)t.set(this._canvas.subarray(i,i+=s),A),A+=this.width}if(e){const i=this._PIXEL_OFFSET,s=this._wasm.current_height();for(let r=0;r<s;++r)t.set(this._pSrc.subarray(i*r,i*r+e),A+this.width*r)}return t}return a}get data8(){return new Uint8ClampedArray(this.data32.buffer,0,this.width*this.height*4)}release(){this._canvas=a,this._bandWidths.length=0,this._maxWidth=0,this._minWidth=s.LIMITS.MAX_WIDTH,this._wasm.init(i.DEFAULT_FOREGROUND,0,this._opts.paletteLimit,0)}}t.Decoder=d,t.decode=function(e,t){const A=new d(t);return A.init(),"string"==typeof e?A.decodeString(e):A.decode(e),{width:A.width,height:A.height,data32:A.data32,data8:A.data8}},t.decodeAsync=async function(e,t){const A=await g(t);return A.init(),"string"==typeof e?A.decodeString(e):A.decode(e),{width:A.width,height:A.height,data32:A.data32,data8:A.data8}}},199(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.LIMITS=void 0,t.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"}},414(e,t,A){Object.defineProperty(t,"__esModule",{value:!0}),t.EventUtils=t.Emitter=void 0;const i=A(426);var s;t.Emitter=class{constructor(){this._listeners=[],this._disposed=!1}get event(){return this._event||(this._event=(e,t,A)=>{if(this._disposed)return(0,i.toDisposable)(()=>{});const s={fn:e,thisArgs:t};this._listeners=this._listeners.slice(),this._listeners.push(s);const r=(0,i.toDisposable)(()=>{const e=this._listeners.indexOf(s);-1!==e&&(this._listeners=this._listeners.slice(),this._listeners.splice(e,1))});return A&&(Array.isArray(A)?A.push(r):A.add(r)),r}),this._event}fire(e){if(this._disposed||!this._listeners.length)return;if(1===this._listeners.length)return void this._listeners[0].fn.call(this._listeners[0].thisArgs,e);const t=this._listeners;for(let A=0,i=t.length;A<i;++A)t[A].fn.call(t[A].thisArgs,e)}dispose(){this._disposed||(this._disposed=!0,this._listeners.length=0)}},function(e){e.forward=function(e,t){return e(e=>t.fire(e))},e.map=function(e,t){return(A,i,s)=>e(e=>A.call(i,t(e)),void 0,s)},e.any=function(...e){return(t,A,s)=>{const r=new i.DisposableStore;for(const i of e)r.add(i(e=>t.call(A,e)));return s&&(Array.isArray(s)?s.push(r):s.add(r)),r}},e.runAndSubscribe=function(e,t,A){return t(A),e(e=>t(e))}}(s||(t.EventUtils=s={}))},426(e,t){function A(e){return{dispose:e}}function i(e){if(!e)return e;if(Array.isArray(e)){for(const t of e)t.dispose();return[]}return e.dispose(),e}Object.defineProperty(t,"__esModule",{value:!0}),t.MutableDisposable=t.Disposable=t.DisposableStore=void 0,t.toDisposable=A,t.dispose=i,t.combinedDisposable=function(...e){return A(()=>i(e))};class s{constructor(){this._disposables=new Set,this._isDisposed=!1}get isDisposed(){return this._isDisposed}add(e){return this._isDisposed?e.dispose():this._disposables.add(e),e}dispose(){if(!this._isDisposed){this._isDisposed=!0;for(const e of this._disposables)e.dispose();this._disposables.clear()}}clear(){for(const e of this._disposables)e.dispose();this._disposables.clear()}}t.DisposableStore=s;class r{constructor(){this._store=new s}dispose(){this._store.dispose()}_register(e){return this._store.add(e)}}t.Disposable=r,r.None=Object.freeze({dispose(){}}),t.MutableDisposable=class{constructor(){this._isDisposed=!1}get value(){return this._isDisposed?void 0:this._value}set value(e){this._isDisposed||e===this._value||(this._value?.dispose(),this._value=e)}clear(){this.value=void 0}dispose(){this._isDisposed=!0,this._value?.dispose(),this._value=void 0}}},795(e,t,A){var i=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:!0}),t.IIPHandler=void 0;const s=A(463),r=A(699),o=i(A(669)),a=i(A(61)),n=A(389),h=A(462),g={type:0,name:"Unnamed file",size:0,width:"auto",height:"auto",preserveAspectRatio:1,inline:0};t.IIPHandler=class{constructor(e,t,A,i){this._opts=e,this._renderer=t,this._storage=A,this._coreTerminal=i,this._aborted=!1,this._hp=new n.HeaderParser,this._header=g,this._isMultipart=!1,this._abortMulti=!1;const s=Math.ceil(4*this._opts.iipSizeLimit/3),r=Math.min(1048576,s);this._dec=new o.default(4194304,s,r),this._qoiDec=new a.default(4194304)}reset(){this._hp.reset(),this._dec.release(),this._qoiDec.release()}start(){this._aborted=!1,this._hp.reset()}put(e,t,A){if(!this._aborted)if(4===this._hp.state)0!==this._dec.put(e.subarray(t,A))&&(this._dec.release(),this._aborted=!0);else{const i=this._hp.parse(e,t,A);if(-1===i)return void(this._aborted=!0);if(i>0){if(1===this._hp.fields.type){if(this._isMultipart&&(this._isMultipart=!1,this._abortMulti=!1,this._dec.release()),this._header=Object.assign({},g,this._hp.fields),!this._header.inline)return void(this._aborted=!0);this._dec.init()}else if(this._abortMulti)return void(this._aborted=!0);0!==this._dec.put(e.subarray(i,A))&&(this._dec.release(),this._aborted=!0,this._isMultipart&&(this._abortMulti=!0))}}}end(e){var t,A,i;if(this._aborted)return!0;if(4!==this._hp.state&&this._hp.end())return!0;const o=this._hp.fields.type;if(3===o)return!0;if(5===o){let e=r.CELL_SIZE_DEFAULT.width,A=r.CELL_SIZE_DEFAULT.height;this._renderer.dimensions&&(e=this._renderer.dimensions.css.canvas.width/this._coreTerminal.cols,A=this._renderer.dimensions.css.canvas.height/this._coreTerminal.rows);const s=null!==(i=null===(t=this._coreTerminal._core._coreBrowserService)||void 0===t?void 0:t.dpr)&&void 0!==i?i:1,o=`]1337;ReportCellSize=${A.toFixed(3)};${e.toFixed(3)};${s.toFixed(3)}\\`;return this._coreTerminal.input(o,!1),!0}if(2===o)return this._header=Object.assign({},g,this._hp.fields),this._isMultipart=!0,this._abortMulti=!1,this._dec.release(),this._dec.init(),!0;if(4===o){if(!this._isMultipart)return!0;if(this._isMultipart=!1,this._abortMulti||2!==this._header.type)return!0}let a,n,d=0,l=0,I=h.UNSUPPORTED_TYPE;if((a=e)&&((a=!this._dec.end())?(I=(0,h.imageType)(this._dec.data8),(a="unsupported"!==I.mime)?(d=I.width,l=I.height,(a=d&&l&&d*l<this._opts.pixelLimit)?([d,l]=this._resize(d,l).map(Math.floor),a=d&&l&&d*l<this._opts.pixelLimit):console.warn(`IIP: image dimension issue ${I.width}x${I.height}`)):console.warn("IIP: unsupported image type")):console.warn("IIP: error during BASE64 decoding")),!a)return this._dec.release(),!0;if("image/qoi"===I.mime){const e=this._qoiDec.decode(this._dec.data8);if(n=new ImageData(new Uint8ClampedArray(e.buffer,e.byteOffset,e.byteLength),this._qoiDec.width,this._qoiDec.height),this._qoiDec.release(),d===this._qoiDec.width&&l===this._qoiDec.height){this._dec.release();const e=s.ImageRenderer.createCanvas(void 0,this._qoiDec.width,this._qoiDec.height);return null===(A=e.getContext("2d"))||void 0===A||A.putImageData(n,0,0),this._storage.addImage(e),!0}}else n=new Blob([this._dec.data8],{type:I.mime});return this._dec.release(),createImageBitmap(n,{resizeWidth:d,resizeHeight:l}).then(e=>(this._storage.addImage(e),!0)).catch(e=>(console.warn(`IIP: decoding error ${I.mime} ${I.width}x${I.height}`,e),!0))}_resize(e,t){var A,i,s,o;const a=(null===(A=this._renderer.dimensions)||void 0===A?void 0:A.css.cell.width)||r.CELL_SIZE_DEFAULT.width,n=(null===(i=this._renderer.dimensions)||void 0===i?void 0:i.css.cell.height)||r.CELL_SIZE_DEFAULT.height,h=(null===(s=this._renderer.dimensions)||void 0===s?void 0:s.css.canvas.width)||a*this._coreTerminal.cols,g=(null===(o=this._renderer.dimensions)||void 0===o?void 0:o.css.canvas.height)||n*this._coreTerminal.rows,d=this._dim(this._header.width,h,a),l=this._dim(this._header.height,g,n);if(!d&&!l){const A=h/e,i=(g-n)/t,s=Math.min(A,i);return s<1?[e*s,t*s]:[e,t]}return d?!this._header.preserveAspectRatio&&d&&l?[d,l]:[d,t*d/e]:[e*l/t,l]}_dim(e,t,A){return"auto"===e?0:e.endsWith("%")?parseInt(e.slice(0,-1),10)*t/100:e.endsWith("px")?parseInt(e.slice(0,-2),10):parseInt(e,10)*A}}},389(e,t){function A(e){let t="";for(let A=0;A<e.length;++A)t+=String.fromCharCode(e[A]);return t}function i(e){let t=0;for(let A=0;A<e.length;++A){if(e[A]<48||e[A]>57)throw new Error("illegal char");t=10*t+e[A]-48}return t}function s(e){const t=A(e);if(!t.match(/^((auto)|(\d+?((px)|(%)){0,1}))$/))throw new Error("illegal size");return t}Object.defineProperty(t,"__esModule",{value:!0}),t.HeaderParser=void 0;const r={inline:i,size:i,name:function(e){if("undefined"!=typeof Buffer)return Buffer.from(A(e),"base64").toString();const t=atob(A(e)),i=new Uint8Array(t.length);for(let e=0;e<i.length;++e)i[e]=t.charCodeAt(e);return(new TextDecoder).decode(i)},width:s,height:s,preserveAspectRatio:i},o=[70,105,108,101],a=[77,117,108,116,105,112,97,114,116,70,105,108,101],n=[70,105,108,101,80,97,114,116],h=[70,105,108,101,69,110,100],g=[82,101,112,111,114,116,67,101,108,108,83,105,122,101],d=1024;t.HeaderParser=class{constructor(){this.state=0,this._buffer=new Uint32Array(d),this._position=0,this._key="",this.fields={}}reset(){this._buffer.fill(0),this.state=0,this._position=0,this.fields={},this._key=""}end(){if(0===this.state){if(this._position===h.length){for(let e=0;e<h.length;++e)if(this._buffer[e]!==h[e])return this._a();return this.fields.type=4,this.state=4,0}if(this._position===g.length){for(let e=0;e<g.length;++e)if(this._buffer[e]!==g[e])return this._a();return this.fields.type=5,this.state=4,0}return this._a()}return 4===this.state?0:3===this.state&&2===this.fields.type&&this._storeValue(this._position)?(this.state=4,0):this._a()}parse(e,t,A){let i=this.state,s=this._position;const r=this._buffer;if(1===i||4===i)return-1;if(0===i&&s>14)return-1;for(let h=t;h<A;++h){const t=e[h];switch(t){case 59:if(!this._storeValue(s))return this._a();i=2,s=0;break;case 61:if(0===i){if(70===r[0]){let e=0;for(;e<o.length;++e)if(r[e]!==o[e])return this._a();if(this.fields.type=1,s===n.length){for(;e<n.length;++e)if(r[e]!==n[e])return this._a();return this.fields.type=3,this.state=4,h+1}}else{if(77!==r[0])return this._a();for(let e=0;e<a.length;++e)if(r[e]!==a[e])return this._a();this.fields.type=2}i=2,s=0}else if(2===i){if(!this._storeKey(s))return this._a();i=3,s=0}else if(3===i){if(s>=d)return this._a();r[s++]=t}break;case 58:return 3!==i||this._storeValue(s)?(this.state=4,h+1):this._a();default:if(s>=d)return this._a();r[s++]=t}}return this.state=i,this._position=s,-2}_a(){return this.fields.type=0,this.state=1,-1}_storeKey(e){const t=A(this._buffer.subarray(0,e));return!!t&&(this._key=t,this.fields[t]=null,!0)}_storeValue(e){if(this._key){try{const t=this._buffer.slice(0,e);this.fields[this._key]=r[this._key]?r[this._key](t):t}catch(e){return!1}return!0}return!1}}},649(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.IIPImageStorage=void 0,t.IIPImageStorage=class{constructor(e){this._storage=e,this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"iip"}}addImage(e){this._storage.addImage(e,this._addImageOpts)}}},462(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.UNSUPPORTED_TYPE=void 0,t.imageType=function(e){if(e.length<32)return t.UNSUPPORTED_TYPE;const A=new Uint32Array(e.buffer,e.byteOffset,8);if(1196314761===A[0]&&169478669===A[1]&&1380206665===A[3])return{mime:"image/png",width:e[16]<<24|e[17]<<16|e[18]<<8|e[19],height:e[20]<<24|e[21]<<16|e[22]<<8|e[23]};if(255===e[0]&&216===e[1]&&255===e[2]){const[t,A]=function(e){const t=e.length;let A=4,i=e[A]<<8|e[A+1];for(;;){if(A+=i,A>=t)return[0,0];if(255!==e[A])return[0,0];if(192===e[A+1]||194===e[A+1])return A+8<t?[e[A+7]<<8|e[A+8],e[A+5]<<8|e[A+6]]:[0,0];A+=2,i=e[A]<<8|e[A+1]}}(e);return{mime:"image/jpeg",width:t,height:A}}if(944130375===A[0]&&(55===e[4]||57===e[4])&&97===e[5])return{mime:"image/gif",width:e[7]<<8|e[6],height:e[9]<<8|e[8]};if(1718185841===A[0])return{mime:"image/qoi",width:e[4]<<24|e[5]<<16|e[6]<<8|e[7],height:e[8]<<24|e[9]<<16|e[10]<<8|e[11]};if(1179011410===A[0]&&1346520407===A[2]&&3690582==(16777215&A[3])){switch(e[15]){case 88:return{mime:"image/webp",width:1+(e[24]|e[25]<<8|e[26]<<16),height:1+(e[27]|e[28]<<8|e[29]<<16)};case 76:if(47!==e[20])return t.UNSUPPORTED_TYPE;const A=e[21]|e[22]<<8|e[23]<<16|e[24]<<24;return{mime:"image/webp",width:1+(16383&A),height:1+(A>>>14&16383)};case 32:return 157!==e[23]||1!==e[24]||42!==e[25]?t.UNSUPPORTED_TYPE:{mime:"image/webp",width:16383&(e[26]|e[27]<<8),height:16383&(e[28]|e[29]<<8)}}return t.UNSUPPORTED_TYPE}if(1887007846===A[1]&&(1718187617===A[2]||1936291425===A[2])){let A=-1;const i=Math.min(e.length-16,1024);for(let t=8;t<i;t++)if(105===e[t]&&115===e[t+1]&&112===e[t+2]&&101===e[t+3]){A=t;break}if(-1!==A){const t=e[A+8]<<24|e[A+9]<<16|e[A+10]<<8|e[A+11],i=e[A+12]<<24|e[A+13]<<16|e[A+14]<<8|e[A+15];if(t>0&&i>0)return{mime:"image/avif",width:t,height:i}}return t.UNSUPPORTED_TYPE}return t.UNSUPPORTED_TYPE},t.UNSUPPORTED_TYPE={mime:"unsupported",width:0,height:0}},463(e,t,A){Object.defineProperty(t,"__esModule",{value:!0}),t.ImageRenderer=void 0;const i=A(939),s=A(426);class r extends s.Disposable{get canvas(){var e;return null===(e=this._layers.get("top"))||void 0===e?void 0:e.canvas}static createCanvas(e,t,A){const i=(null!=e?e:document).createElement("canvas");return i.width=0|t,i.height=0|A,i}static createImageData(e,t,A,i){if("function"!=typeof ImageData){const s=e.createImageData(t,A);return i&&s.data.set(new Uint8ClampedArray(i,0,t*A*4)),s}return i?new ImageData(new Uint8ClampedArray(i,0,t*A*4),t,A):new ImageData(t,A)}static createImageBitmap(e){return"function"!=typeof createImageBitmap?Promise.resolve(void 0):createImageBitmap(e)}constructor(e){super(),this._terminal=e,this._layers=new Map,this._optionsRefresh=this._register(new s.MutableDisposable),this._oldOpen=this._terminal._core.open,this._terminal._core.open=e=>{var t;null===(t=this._oldOpen)||void 0===t||t.call(this._terminal._core,e),this._open()},this._terminal._core.screenElement&&this._open(),this._optionsRefresh.value=this._terminal._core.optionsService.onOptionChange(e=>{var t;"fontSize"===e&&(this.rescaleCanvas(),null===(t=this._renderService)||void 0===t||t.refreshRows(0,this._terminal.rows))}),this._register((0,s.toDisposable)(()=>{var e;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(),null===(e=this._placeholderBitmap)||void 0===e||e.close(),this._placeholderBitmap=void 0,this._placeholder=void 0}))}showPlaceholder(e){var t,A;e?this._placeholder||-1===this.cellSize.height||this._createPlaceHolder(Math.max(this.cellSize.height+1,24)):(null===(t=this._placeholderBitmap)||void 0===t||t.close(),this._placeholderBitmap=void 0,this._placeholder=void 0),null===(A=this._renderService)||void 0===A||A.refreshRows(0,this._terminal.rows)}get dimensions(){return this._terminal.dimensions}get cellSize(){var e,t;return{width:(null===(e=this.dimensions)||void 0===e?void 0:e.css.cell.width)||-1,height:(null===(t=this.dimensions)||void 0===t?void 0:t.css.cell.height)||-1}}clearLines(e,t,A){var i,s,r,o,a;const n=e*((null===(i=this.dimensions)||void 0===i?void 0:i.css.cell.height)||0),h=(null===(s=this.dimensions)||void 0===s?void 0:s.css.canvas.width)||0,g=(t+1-e)*((null===(r=this.dimensions)||void 0===r?void 0:r.css.cell.height)||0);A&&"top"!==A||null===(o=this._layers.get("top"))||void 0===o||o.clearRect(0,n,h,g),A&&"bottom"!==A||null===(a=this._layers.get("bottom"))||void 0===a||a.clearRect(0,n,h,g)}clearAll(e){if(!e||"top"===e){const e=this._layers.get("top");null==e||e.clearRect(0,0,e.canvas.width,e.canvas.height)}if(!e||"bottom"===e){const e=this._layers.get("bottom");null==e||e.clearRect(0,0,e.canvas.width,e.canvas.height)}}draw(e,t,A,i,s=1){const r=this._layers.get(e.layer);if(!r)return;const{width:o,height:a}=this.cellSize;if(-1===o||-1===a)return;this._rescaleImage(e,o,a);const n=e.actual,h=Math.ceil(n.width/o),g=t%h*o,d=Math.floor(t/h)*a,l=A*o,I=i*a,c=s*o+g>n.width?n.width-g:s*o,_=d+a>n.height?n.height-d:a;r.drawImage(n,Math.floor(g),Math.floor(d),Math.ceil(c),Math.ceil(_),Math.floor(l),Math.floor(I),Math.ceil(c),Math.ceil(_))}extractTile(e,t){const{width:A,height:i}=this.cellSize;if(-1===A||-1===i)return;this._rescaleImage(e,A,i);const s=e.actual,o=Math.ceil(s.width/A),a=t%o*A,n=Math.floor(t/o)*i,h=A+a>s.width?s.width-a:A,g=n+i>s.height?s.height-n:i,d=r.createCanvas(this.document,h,g),l=d.getContext("2d");return l?(l.drawImage(s,Math.floor(a),Math.floor(n),Math.floor(h),Math.floor(g),0,0,Math.floor(h),Math.floor(g)),d):void 0}drawPlaceholder(e,t,A=1){var i;const s=this._layers.get("top");if(s){const{width:r,height:o}=this.cellSize;if(-1===r||-1===o)return;if(this._placeholder?o>=this._placeholder.height&&this._createPlaceHolder(o+1):this._createPlaceHolder(Math.max(o+1,24)),!this._placeholder)return;s.drawImage(null!==(i=this._placeholderBitmap)&&void 0!==i?i:this._placeholder,e*r,t*o%2?0:1,r*A,o,e*r,t*o,r*A,o)}}rescaleCanvas(){var e,t;const A=(null===(e=this.dimensions)||void 0===e?void 0:e.css.canvas.width)||0,i=(null===(t=this.dimensions)||void 0===t?void 0:t.css.canvas.height)||0;for(const e of this._layers.values())e.canvas.width===A&&e.canvas.height===i||(e.canvas.width=A,e.canvas.height=i)}_rescaleImage(e,t,A){if(t===e.actualCellSize.width&&A===e.actualCellSize.height)return;const{width:i,height:s}=e.origCellSize;if(t===i&&A===s)return e.actual=e.orig,e.actualCellSize.width=i,void(e.actualCellSize.height=s);const o=r.createCanvas(this.document,Math.ceil(e.orig.width*t/i),Math.ceil(e.orig.height*A/s)),a=o.getContext("2d");a&&(a.drawImage(e.orig,0,0,o.width,o.height),e.actual=o,e.actualCellSize.width=t,e.actualCellSize.height=A)}_open(){this._renderService=this._terminal._core._renderService,this._oldSetRenderer=this._renderService.setRenderer.bind(this._renderService),this._renderService.setRenderer=e=>{var t;for(const e of[...this._layers.keys()])this.removeLayerFromDom(e);null===(t=this._oldSetRenderer)||void 0===t||t.call(this._renderService,e)}}insertLayerToDom(e="top"){var t,A;if(!this.document||!this._terminal._core.screenElement)return void console.warn("image addon: cannot insert output canvas to DOM, missing document or screenElement");if(this._layers.has(e))return;const i=r.createCanvas(this.document,(null===(t=this.dimensions)||void 0===t?void 0:t.css.canvas.width)||0,(null===(A=this.dimensions)||void 0===A?void 0:A.css.canvas.height)||0);i.classList.add(`xterm-image-layer-${e}`);const s=this._terminal._core.screenElement;s.style.isolation="isolate","bottom"===e?(i.style.zIndex="-1",s.insertBefore(i,s.firstChild)):(i.style.zIndex="0",s.appendChild(i));const o=i.getContext("2d",{alpha:!0});o?(this._layers.set(e,o),this.clearAll(e)):i.remove()}removeLayerFromDom(e="top"){const t=this._layers.get(e);t&&(t.canvas.remove(),this._layers.delete(e))}hasLayer(e){return this._layers.has(e)}_createPlaceHolder(e=24){var t;null===(t=this._placeholderBitmap)||void 0===t||t.close(),this._placeholderBitmap=void 0;const A=32,s=r.createCanvas(this.document,A,e),o=s.getContext("2d",{alpha:!1});if(!o)return;const a=r.createImageData(o,A,e),n=new Uint32Array(a.data.buffer),h=(0,i.toRGBA8888)(0,0,0),g=(0,i.toRGBA8888)(255,255,255);n.fill(h);for(let t=0;t<e;++t){const e=t%2,i=t*A;for(let t=0;t<A;t+=2)n[i+t+e]=g}o.putImageData(a,0,0);const d=screen.width+A-1&-32||4096;this._placeholder=r.createCanvas(this.document,d,e);const l=this._placeholder.getContext("2d",{alpha:!1});if(l){for(let e=0;e<d;e+=A)l.drawImage(s,e,0);r.createImageBitmap(this._placeholder).then(e=>this._placeholderBitmap=e)}else this._placeholder=void 0}get document(){var e;return null===(e=this._terminal._core._coreBrowserService)||void 0===e?void 0:e.window.document}}t.ImageRenderer=r},699(e,t,A){Object.defineProperty(t,"__esModule",{value:!0}),t.ImageStorage=t.CELL_SIZE_DEFAULT=void 0;const i=A(463);t.CELL_SIZE_DEFAULT={width:7,height:14};class s{get ext(){return this._urlId?-469762049&this._ext|this.underlineStyle<<26:this._ext}set ext(e){this._ext=e}get underlineStyle(){return this._urlId?5:(469762048&this._ext)>>26}set underlineStyle(e){this._ext&=-469762049,this._ext|=e<<26&469762048}get underlineColor(){return 67108863&this._ext}set underlineColor(e){this._ext&=-67108864,this._ext|=67108863&e}get underlineVariantOffset(){const e=(3758096384&this._ext)>>29;return e<0?4294967288^e:e}set underlineVariantOffset(e){this._ext&=536870911,this._ext|=e<<29&3758096384}get urlId(){return this._urlId}set urlId(e){this._urlId=e}constructor(e=0,t=0,A=-1,i=-1){this.imageId=A,this.tileId=i,this._ext=0,this._urlId=0,this._ext=e,this._urlId=t}clone(){return new s(this._ext,this._urlId,this.imageId,this.tileId)}isEmpty(){return 0===this.underlineStyle&&0===this._urlId&&-1===this.imageId}}const r=new s;t.ImageStorage=class{constructor(e,t,A){this._terminal=e,this._renderer=t,this._opts=A,this._images=new Map,this._lastId=0,this._lowestId=0,this._fullyCleared=!1,this._needsFullClear=!1,this._pixelLimit=25e5;try{this.setLimit(this._opts.storageLimit)}catch(e){e instanceof Error&&console.error(e.message),console.warn(`storageLimit is set to ${this.getLimit()} MB`)}this._viewportMetrics={cols:this._terminal.cols,rows:this._terminal.rows}}dispose(){this.reset()}reset(){var e;for(const t of this._images.values())null===(e=t.marker)||void 0===e||e.dispose();this._images.clear(),this._renderer.clearAll()}getLimit(){return 4*this._pixelLimit/1e6}setLimit(e){if(e<.5||e>1e3)throw RangeError("invalid storageLimit, should be at least 0.5 MB and not exceed 1G");this._pixelLimit=e/4*1e6>>>0,this._evictOldest(0)}getUsage(){return 4*this._getStoredPixels()/1e6}_getStoredPixels(){let e=0;for(const 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));return e}_delImg(e){var t;const A=this._images.get(e);A&&(this._images.delete(e),window.ImageBitmap&&A.orig instanceof ImageBitmap&&A.orig.close(),null===(t=this.onImageDeleted)||void 0===t||t.call(this,e))}wipeAlternate(){var e;const t=[];for(const[A,i]of this._images.entries())"alternate"===i.bufferType&&(null===(e=i.marker)||void 0===e||e.dispose(),t.push(A));for(const e of t)this._delImg(e);this._needsFullClear=!0,this._fullyCleared=!1}deleteImage(e){var t;const A=this._images.get(e);A&&(null===(t=A.marker)||void 0===t||t.dispose(),this._delImg(e))}addImage(e,A){var i,s;this._evictOldest(e.width*e.height);let r=this._renderer.cellSize;-1!==r.width&&-1!==r.height||(r=t.CELL_SIZE_DEFAULT);const o=Math.ceil(e.width/r.width),a=Math.ceil(e.height/r.height),n=++this._lastId,h=this._terminal._core.buffer,g=this._terminal.cols,d=this._terminal.rows,l=h.x,I=h.y;let c=l,_=0;A.scrolling||(h.x=0,h.y=0,c=0),this._terminal._core._inputHandler._dirtyRowTracker.markDirty(h.y);for(let e=0;e<a;++e){const t=h.lines.get(h.y+h.ybase);for(let A=0;A<o&&!(c+A>=g);++A)this._writeToCell(t,c+A,n,e*o+A),_++;if(A.scrolling)e<a-1&&this._terminal._core._inputHandler.lineFeed();else if(++h.y>=d)break;h.x=c}this._terminal._core._inputHandler._dirtyRowTracker.markDirty(h.y),A.scrolling?"iip"===A.cursorPos?h.x=Math.min(c+o,g):h.x=c:(h.x=l,h.y=I);const C=[];for(const[e,t]of this._images.entries())t.tileCount<1&&(null===(i=t.marker)||void 0===i||i.dispose(),C.push(e));for(const e of C)this._delImg(e);const B=this._terminal.registerMarker(0);null==B||B.onDispose(()=>{this._images.get(n)&&this._delImg(n)}),"alternate"===this._terminal.buffer.active.type&&this._evictOnAlternate();const Q={orig:e,origCellSize:r,actual:e,actualCellSize:Object.assign({},r),marker:B||void 0,tileCount:_,bufferType:this._terminal.buffer.active.type,layer:A.layer,zIndex:A.zIndex};return this._images.set(n,Q),null===(s=this.onImageAdded)||void 0===s||s.call(this),n}render(e){var t,A;let i=!1,s=!1;for(const e of this._images.values())if("bottom"===e.layer?s=!0:i=!0,i&&s)break;if(i&&!this._renderer.hasLayer("top")&&(this._renderer.insertLayerToDom("top"),!this._renderer.hasLayer("top")))return;if(s&&!this._renderer.hasLayer("bottom")&&this._renderer.insertLayerToDom("bottom"),this._renderer.rescaleCanvas(),!this._images.size)return this._fullyCleared||(this._renderer.clearAll(),this._fullyCleared=!0,this._needsFullClear=!1),this._renderer.hasLayer("top")&&this._renderer.removeLayerFromDom("top"),void(this._renderer.hasLayer("bottom")&&this._renderer.removeLayerFromDom("bottom"));!i&&this._renderer.hasLayer("top")&&(this._renderer.clearAll("top"),this._renderer.removeLayerFromDom("top")),!s&&this._renderer.hasLayer("bottom")&&(this._renderer.clearAll("bottom"),this._renderer.removeLayerFromDom("bottom")),this._needsFullClear&&(this._renderer.clearAll(),this._fullyCleared=!0,this._needsFullClear=!1);const{start:o,end:a}=e,n=this._terminal._core.buffer,h=this._terminal._core.cols;this._renderer.clearLines(o,a);const g=[],d=[];for(let e=o;e<=a;++e){const i=n.lines.get(e+n.ydisp);if(!i)return;for(let s=0;s<h;++s)if(268435456&i.getBg(s)){let o=null!==(t=i._extendedAttrs[s])&&void 0!==t?t:r;const a=o.imageId;if(void 0===a||-1===a)continue;const n=this._images.get(a);if(-1!==o.tileId){const t=o.tileId,l=s;let I=1;for(;++s<h&&268435456&i.getBg(s)&&(o=null!==(A=i._extendedAttrs[s])&&void 0!==A?A:r)&&o.imageId===a&&o.tileId===t+I;)I++;s--,n?n.actual&&g.push({imgSpec:n,tileId:t,col:l,row:e,count:I}):this._opts.showPlaceholder&&d.push({col:l,row:e,count:I}),this._fullyCleared=!1}}}g.sort((e,t)=>e.imgSpec.zIndex-t.imgSpec.zIndex);for(const e of d)this._renderer.drawPlaceholder(e.col,e.row,e.count);for(const e of g)this._renderer.draw(e.imgSpec,e.tileId,e.col,e.row,e.count)}viewportResize(e){var t,A;if(!this._images.size)return void(this._viewportMetrics=e);if(this._viewportMetrics.cols>=e.cols)return void(this._viewportMetrics=e);const i=this._terminal._core.buffer,s=i.lines.length,o=this._viewportMetrics.cols-1;for(let a=0;a<s;++a){const s=i.lines.get(a);if(268435456&s.getBg(o)){const i=null!==(A=s._extendedAttrs[o])&&void 0!==A?A:r,a=i.imageId;if(void 0===a||-1===a)continue;const n=this._images.get(a);if(!n)continue;const h=Math.ceil(((null===(t=n.actual)||void 0===t?void 0:t.width)||0)/n.actualCellSize.width);if(i.tileId%h+1>=h)continue;let g=!1;for(let t=o+1;t>e.cols;++t)if(4194303&s._data[3*t+0]){g=!0;break}if(g)continue;const d=Math.min(e.cols,h-i.tileId%h+o);let l=i.tileId;for(let e=o+1;e<d;++e)this._writeToCell(s,e,a,++l),n.tileCount++}}this._viewportMetrics=e}getImageAtBufferCell(e,t){var A,s,o;const a=this._terminal._core.buffer.lines.get(t);if(a&&268435456&a.getBg(e)){const t=null!==(o=a._extendedAttrs[e])&&void 0!==o?o:r;if(t.imageId&&-1!==t.imageId){const e=null===(A=this._images.get(t.imageId))||void 0===A?void 0:A.orig;if(window.ImageBitmap&&e instanceof ImageBitmap){const t=i.ImageRenderer.createCanvas(window.document,e.width,e.height);return null===(s=t.getContext("2d"))||void 0===s||s.drawImage(e,0,0,e.width,e.height),t}return e}}}extractTileAtBufferCell(e,t){var A;const i=this._terminal._core.buffer.lines.get(t);if(i&&268435456&i.getBg(e)){const t=null!==(A=i._extendedAttrs[e])&&void 0!==A?A:r;if(t.imageId&&-1!==t.imageId&&-1!==t.tileId){const e=this._images.get(t.imageId);if(e)return this._renderer.extractTile(e,t.tileId)}}}_evictOldest(e){var t;const A=this._getStoredPixels();let i=A;for(;this._pixelLimit<i+e&&this._images.size;){const e=this._images.get(++this._lowestId);e&&e.orig&&(i-=e.orig.width*e.orig.height,e.actual&&e.orig!==e.actual&&(i-=e.actual.width*e.actual.height),null===(t=e.marker)||void 0===t||t.dispose(),this._delImg(this._lowestId))}return A-i}_writeToCell(e,t,A,i){if(268435456&e._data[3*t+2]){const r=e._extendedAttrs[t];if(r){if(void 0!==r.imageId){const e=this._images.get(r.imageId);return e&&e.tileCount--,r.imageId=A,void(r.tileId=i)}return void(e._extendedAttrs[t]=new s(r.ext,r.urlId,A,i))}}e._data[3*t+2]|=268435456,e._extendedAttrs[t]=new s(0,0,A,i)}_evictOnAlternate(){var e,t;for(const e of this._images.values())"alternate"===e.bufferType&&(e.tileCount=0);const A=this._terminal._core.buffer;for(let t=0;t<this._terminal.rows;++t){const i=A.lines.get(t);if(i)for(let t=0;t<this._terminal.cols;++t)if(268435456&i._data[3*t+2]){const A=null===(e=i._extendedAttrs[t])||void 0===e?void 0:e.imageId;if(A){const e=this._images.get(A);e&&e.tileCount++}}}const i=[];for(const[e,A]of this._images.entries())"alternate"!==A.bufferType||A.tileCount||(null===(t=A.marker)||void 0===t||t.dispose(),i.push(e));for(const e of i)this._delImg(e)}}},566(e,t,A){Object.defineProperty(t,"__esModule",{value:!0}),t.SixelHandler=void 0;const i=A(939),s=A(463),r=A(591),o=i.PALETTE_ANSI_256;function a(e){return i.BIG_ENDIAN?e:(255&e)<<24|(e>>>8&255)<<16|(e>>>16&255)<<8|e>>>24&255}o.set(i.PALETTE_VT340_COLOR),t.SixelHandler=class{constructor(e,t,A){this._opts=e,this._storage=t,this._coreTerminal=A,this._size=0,this._aborted=!1,(0,r.DecoderAsync)({memoryLimit:4*this._opts.pixelLimit,palette:o,paletteLimit:this._opts.sixelPaletteLimit}).then(e=>this._dec=e)}reset(){this._dec&&(this._dec.release(),this._dec._palette.fill(0),this._dec.init(0,o,this._opts.sixelPaletteLimit))}hook(e){var t;if(this._size=0,this._aborted=!1,this._dec){const A=1===e.params[1]?0:function(e,t){let A=0;if(!t)return A;if(e.isInverse())if(e.isFgDefault())A=a(t.foreground.rgba);else if(e.isFgRGB()){const t=e.constructor.toColorRGB(e.getFgColor());A=(0,i.toRGBA8888)(...t)}else A=a(t.ansi[e.getFgColor()].rgba);else if(e.isBgDefault())A=a(t.background.rgba);else if(e.isBgRGB()){const t=e.constructor.toColorRGB(e.getBgColor());A=(0,i.toRGBA8888)(...t)}else A=a(t.ansi[e.getBgColor()].rgba);return A}(this._coreTerminal._core._inputHandler._curAttrData,null===(t=this._coreTerminal._core._themeService)||void 0===t?void 0:t.colors);this._dec.init(A,null,this._opts.sixelPaletteLimit)}}put(e,t,A){if(!this._aborted&&this._dec){if(this._size+=A-t,this._size>this._opts.sixelSizeLimit)return console.warn("SIXEL: too much data, aborting"),this._aborted=!0,void this._dec.release();try{this._dec.decode(e,t,A)}catch(e){console.warn(`SIXEL: error while decoding image - ${e}`),this._aborted=!0,this._dec.release()}}}unhook(e){var t;if(this._aborted||!e||!this._dec)return!0;const A=this._dec.width,i=this._dec.height;if(!A||!i)return i&&this._storage.advanceCursor(i),!0;const r=s.ImageRenderer.createCanvas(void 0,A,i);return null===(t=r.getContext("2d"))||void 0===t||t.putImageData(new ImageData(this._dec.data8,A,i),0,0),this._dec.memoryUsage>4194304&&this._dec.release(),this._storage.addImage(r),!0}}},994(e,t,A){Object.defineProperty(t,"__esModule",{value:!0}),t.SixelImageStorage=void 0;const i=A(699);t.SixelImageStorage=class{constructor(e,t,A,i){this._storage=e,this._opts=t,this._renderer=A,this._terminal=i,this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"vt340"}}addImage(e){this._addImageOpts.scrolling=this._opts.sixelScrolling,this._storage.addImage(e,this._addImageOpts)}advanceCursor(e){if(this._opts.sixelScrolling){let t=this._renderer.cellSize;-1!==t.width&&-1!==t.height||(t=i.CELL_SIZE_DEFAULT);const A=Math.ceil(e/t.height);for(let e=1;e<A;++e)this._terminal._core._inputHandler.lineFeed()}}}},23(e,t,A){var i=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:!0}),t.KittyGraphicsHandler=void 0;const s=A(463),r=A(699),o=i(A(669)),a=A(470);t.KittyGraphicsHandler=class{constructor(e,t,A,i){this._opts=e,this._renderer=t,this._kittyStorage=A,this._coreTerminal=i,this._aborted=!1,this._decodeError=!1,this._activeDecoder=null,this._inControlData=!0,this._controlData=new Uint32Array(512),this._controlLength=0,this._encodedSizeLimit=0,this._totalEncodedSize=0,this._parsedCommand=null,this._pendingTransmissions=new Map,this._maxEncodedBytes=Math.ceil(4*this._opts.kittySizeLimit/3),this._initialEncodedBytes=Math.min(4194304,this._maxEncodedBytes)}reset(){this._cleanupAllPending(),this._activeDecoder&&(this._activeDecoder.release(),this._activeDecoder=null),this._kittyStorage.reset()}dispose(){this.reset()}_removePendingEntry(e){this._pendingTransmissions.delete(e),this._lastPendingKey===e&&(this._lastPendingKey=void 0)}_cleanupAllPending(){for(const e of this._pendingTransmissions.values())e.decoder.release();this._pendingTransmissions.clear(),this._lastPendingKey=void 0}start(){this._aborted=!1,this._decodeError=!1,this._inControlData=!0,this._controlLength=0,this._parsedCommand=null,this._encodedSizeLimit=this._maxEncodedBytes,this._totalEncodedSize=0,this._activeDecoder=null}put(e,t,A){var i;if(!this._aborted)if(this._inControlData){let s=A;for(let i=t;i<A;i++)if(59===e[i]){this._inControlData=!1,s=i;break}const r=s-t;if(this._controlLength+r>512)return void(this._aborted=!0);if(this._controlData.set(e.subarray(t,s),this._controlLength),this._controlLength+=r,!this._inControlData){if(this._parsedCommand=(0,a.parseKittyCommand)(this._parseControlDataString()),void 0!==this._parsedCommand.id&&void 0!==this._parsedCommand.imageNumber)return this._sendResponse(this._parsedCommand.id,"EINVAL:cannot specify both i and I keys",null!==(i=this._parsedCommand.quiet)&&void 0!==i?i:0),void(this._aborted=!0);if("d"===this._parsedCommand.action)return;const t=s+1;t<A&&this._streamPayload(e,t,A)}}else this._streamPayload(e,t,A)}_streamPayload(e,t,A){var i,s,r,a,n;if(this._aborted)return;const h=null!==(r=null!==(s=null===(i=this._parsedCommand)||void 0===i?void 0:i.id)&&void 0!==s?s:this._lastPendingKey)&&void 0!==r?r:0,g=this._pendingTransmissions.get(h),d=null!==(a=null==g?void 0:g.totalEncodedSize)&&void 0!==a?a:0;if(this._totalEncodedSize+=A-t,d+this._totalEncodedSize>this._encodedSizeLimit){const e=null!==(n=this._activeDecoder)&&void 0!==n?n:null==g?void 0:g.decoder;return e&&e.release(),this._activeDecoder=null,g&&this._removePendingEntry(h),void(this._aborted=!0)}this._decodeError||((null==g?void 0:g.decoder)&&!this._activeDecoder&&(this._activeDecoder=g.decoder),this._activeDecoder||(this._activeDecoder=new o.default(4194304,this._maxEncodedBytes,this._initialEncodedBytes),this._activeDecoder.init()),0!==this._activeDecoder.put(e.subarray(t,A))&&(this._activeDecoder.release(),this._activeDecoder=null,this._decodeError=!0,g&&this._removePendingEntry(h)))}end(e){var t,A;if(this._aborted||!e)return this._activeDecoder&&(this._activeDecoder.release(),this._activeDecoder=null),!0;if(this._inControlData)return this._handleNoPayloadCommand();const i=this._parsedCommand;if("d"===i.action)return this._handleDelete(i);const s=null!==(A=null!==(t=i.id)&&void 0!==t?t:this._lastPendingKey)&&void 0!==A?A:0,r=1===i.more,o=this._pendingTransmissions.get(s);if(r)return this._activeDecoder&&(o?(o.totalEncodedSize+=this._totalEncodedSize,o.decodeError=o.decodeError||this._decodeError):this._pendingTransmissions.set(s,{cmd:Object.assign({},i),decoder:this._activeDecoder,totalEncodedSize:this._totalEncodedSize,decodeError:this._decodeError}),this._lastPendingKey=s,this._activeDecoder=null),!0;o&&(this._lastPendingKey=void 0);let a=this._decodeError,n=i,h=this._activeDecoder;o&&(n=o.cmd,h=o.decoder,a=a||o.decodeError,this._pendingTransmissions.delete(s));let g=new Uint8Array(0);h&&(0!==h.end()&&(a=!0),g=h.data8),this._activeDecoder=null;const d=this._handleCommandWithBytesAndCmd(n,g,a);return h&&h.release(),d}_parseControlDataString(){let e="";for(let t=0;t<this._controlLength;t++)e+=String.fromCodePoint(this._controlData[t]);return e}_handleNoPayloadCommand(){var e,t,A,i,s;const r=(0,a.parseKittyCommand)(this._parseControlDataString());if(void 0!==r.id&&void 0!==r.imageNumber)return this._sendResponse(r.id,"EINVAL:cannot specify both i and I keys",null!==(e=r.quiet)&&void 0!==e?e:0),!0;switch(null!==(t=r.action)&&void 0!==t?t:"t"){case"d":return this._handleDelete(r);case"q":return this._sendResponse(null!==(A=r.id)&&void 0!==A?A:0,"OK",null!==(i=r.quiet)&&void 0!==i?i:0),!0;case"p":return this._handlePlacement(r);default:return void 0!==r.id&&this._sendResponse(r.id,"EINVAL:unsupported action",null!==(s=r.quiet)&&void 0!==s?s:0),!0}}_handleCommandWithBytesAndCmd(e,t,A){var i,s,r,o,a;switch(null!==(i=e.action)&&void 0!==i?i:"t"){case"t":{const i=this._handleTransmit(e,t,A);return"d"===(null!==(s=e.transmission)&&void 0!==s?s:"d")&&void 0!==e.id&&(A?this._sendResponse(e.id,"EINVAL:invalid base64 data",null!==(r=e.quiet)&&void 0!==r?r:0):t.length>0&&this._sendResponse(e.id,"OK",null!==(o=e.quiet)&&void 0!==o?o:0)),i}case"T":return this._handleTransmitDisplay(e,t,A);case"q":return this._handleQuery(e,t,A);case"p":return this._handlePlacement(e);default:return void 0!==e.id&&this._sendResponse(e.id,"EINVAL:unsupported action",null!==(a=e.quiet)&&void 0!==a?a:0),!0}}_handlePlacement(e){var t;if(void 0===e.id)return!0;const A=e.id,i=this._kittyStorage.getImage(A);return i?this._displayImage(i,e).then(t=>{var i;return this._sendResponse(A,t?"OK":"EINVAL:image rendering failed",null!==(i=e.quiet)&&void 0!==i?i:0,e.placementId),!0}):(this._sendResponse(A,"ENOENT:image not found",null!==(t=e.quiet)&&void 0!==t?t:0,e.placementId),!0)}_handleTransmit(e,t,A){var i,s,r,o,a,n;return"d"!==(null!==(i=e.transmission)&&void 0!==i?i:"d")?(void 0!==e.id&&this._sendResponse(e.id,"EINVAL:unsupported transmission medium",null!==(s=e.quiet)&&void 0!==s?s:0),!0):(A||0===t.length||this._kittyStorage.storeImage(e.id,{data:new Blob([t]),width:null!==(r=e.width)&&void 0!==r?r:0,height:null!==(o=e.height)&&void 0!==o?o:0,format:null!==(a=e.format)&&void 0!==a?a:32,compression:null!==(n=e.compression)&&void 0!==n?n:""}),!0)}_handleTransmitDisplay(e,t,A){var i,s;if(A)return void 0!==e.id&&this._sendResponse(e.id,"EINVAL:invalid base64 data",null!==(i=e.quiet)&&void 0!==i?i:0),!0;this._handleTransmit(e,t,A);const r=null!==(s=e.id)&&void 0!==s?s:this._kittyStorage.lastImageId,o=this._kittyStorage.getImage(r);if(o){const t=this._displayImage(o,e);return void 0!==e.id?t.then(t=>{var A;return this._sendResponse(r,t?"OK":"EINVAL:image rendering failed",null!==(A=e.quiet)&&void 0!==A?A:0),!0}):t.then(()=>!0)}return!0}_handleQuery(e,t,A){var i,s,r,o,a,n;const h=null!==(i=e.id)&&void 0!==i?i:0,g=null!==(s=e.quiet)&&void 0!==s?s:0;if("d"!==(null!==(r=e.transmission)&&void 0!==r?r:"d"))return this._sendResponse(h,"EINVAL:unsupported transmission medium",g),!0;if(A)return this._sendResponse(h,"EINVAL:invalid base64 data",g),!0;if(0===t.length)return this._sendResponse(h,"OK",g),!0;const d=null!==(o=e.format)&&void 0!==o?o:32;if(100===d)this._sendResponse(h,"OK",g);else{const A=null!==(a=e.width)&&void 0!==a?a:0,i=null!==(n=e.height)&&void 0!==n?n:0;if(!A||!i)return this._sendResponse(h,"EINVAL:width and height required for raw pixel data",g),!0;const s=A*i*(32===d?4:3);if(t.length<s)return this._sendResponse(h,"EINVAL:insufficient pixel data",g),!0;this._sendResponse(h,"OK",g)}return!0}_handleDelete(e){var t;switch(null!==(t=e.deleteSelector)&&void 0!==t?t:"a"){case"a":case"A":this._cleanupAllPending(),this._kittyStorage.deleteAll();break;case"i":case"I":if(void 0!==e.id){const t=this._pendingTransmissions.get(e.id);t&&t.decoder.release(),this._removePendingEntry(e.id),this._kittyStorage.deleteById(e.id)}}return!0}_sendResponse(e,t,A,i){const s="OK"===t;if(s&&A>=1)return;if(!s&&A>=2)return;const r=`_Gi=${e}${i?`,p=${i}`:""};${t}\\`;this._coreTerminal._core.coreService.triggerDataEvent(r)}_displayImage(e,t){return this._decodeAndDisplay(e,t).then(()=>!0).catch(()=>!1)}async _decodeAndDisplay(e,t){var A,i,o,a,n,h,g;let d=await this._createBitmap(e);try{const l=Math.max(0,null!==(o=t.x)&&void 0!==o?o:0),I=Math.max(0,null!==(a=t.y)&&void 0!==a?a:0),c=t.sourceWidth||d.width-l,_=t.sourceHeight||d.height-I,C=Math.max(0,d.width-l),B=Math.max(0,d.height-I),Q=Math.max(0,Math.min(c,C)),m=Math.max(0,Math.min(_,B));if(0===Q||0===m)throw new Error("invalid source rectangle");if(0!==l||0!==I||Q!==d.width||m!==d.height){const e=await createImageBitmap(d,l,I,Q,m);d.close(),d=e}const E=(null===(A=this._renderer.dimensions)||void 0===A?void 0:A.css.cell.width)||r.CELL_SIZE_DEFAULT.width,u=(null===(i=this._renderer.dimensions)||void 0===i?void 0:i.css.cell.height)||r.CELL_SIZE_DEFAULT.height;let w,p;void 0!==t.columns&&void 0!==t.rows?(w=t.columns,p=t.rows):void 0!==t.columns?(w=t.columns,p=Math.max(1,Math.ceil(d.height/d.width*(w*E)/u))):void 0!==t.rows?(p=t.rows,w=Math.max(1,Math.ceil(d.width/d.height*(p*u)/E))):(w=Math.ceil(d.width/E),p=Math.ceil(d.height/u));let f=d.width,D=d.height;if(void 0===t.columns&&void 0===t.rows||(f=Math.round(w*E),D=Math.round(p*u)),f*D>this._opts.pixelLimit)throw new Error("image exceeds pixel limit");const y=this._coreTerminal._core.buffer,v=y.x,k=y.y,M=y.ybase,b=void 0!==t.zIndex&&t.zIndex<0?"bottom":"top";if(f!==d.width||D!==d.height){const e=await createImageBitmap(d,{resizeWidth:f,resizeHeight:D});d.close(),d=e}const S=Math.min(Math.max(0,null!==(n=t.xOffset)&&void 0!==n?n:0),E-1),L=Math.min(Math.max(0,null!==(h=t.yOffset)&&void 0!==h?h:0),u-1);if(0!==S||0!==L){const e=void 0!==t.columns?Math.round(w*E):d.width+S,A=void 0!==t.rows?Math.round(p*u):d.height+L,i=s.ImageRenderer.createCanvas(window.document,e,A),r=i.getContext("2d");if(!r)throw new Error("Failed to create offset canvas context");r.drawImage(d,S,L);const o=await createImageBitmap(i);if(i.width=i.height=0,d.close(),d=o,f=d.width,D=d.height,f*D>this._opts.pixelLimit)throw new Error("image exceeds pixel limit");void 0===t.columns&&(w=Math.ceil(d.width/E)),void 0===t.rows&&(p=Math.ceil(d.height/u))}const N=null!==(g=t.zIndex)&&void 0!==g?g:0;if(this._kittyStorage.addImage(e.id,d,!0,b,N),d=void 0,1===t.cursorMovement){const e=y.ybase-M;y.x=v,y.y=Math.max(k-e,0)}else y.x=Math.min(v+w,this._coreTerminal.cols)}catch(e){throw null==d||d.close(),e}}async _createBitmap(e){let t=new Uint8Array(await e.data.arrayBuffer());if("z"===e.compression&&(t=await this._decompressZlib(t)),100===e.format){const e=new Blob([t],{type:"image/png"});if(!window.createImageBitmap){const t=URL.createObjectURL(e),A=new Image;return new Promise((e,i)=>{A.addEventListener("load",()=>{var r;URL.revokeObjectURL(t);const o=s.ImageRenderer.createCanvas(window.document,A.width,A.height);null===(r=o.getContext("2d"))||void 0===r||r.drawImage(A,0,0),createImageBitmap(o).then(e).catch(i)}),A.addEventListener("error",()=>{URL.revokeObjectURL(t),i(new Error("Failed to load image"))}),A.src=t})}return createImageBitmap(e)}const A=e.width,i=e.height;if(!A||!i)throw new Error("Width and height required for raw pixel data");const r=A*i*(32===e.format?4:3);if(t.length<r)throw new Error("Insufficient pixel data");const o=A*i;if(32===e.format)return createImageBitmap(new ImageData(new Uint8ClampedArray(t.buffer,t.byteOffset,4*o),A,i));const a=new Uint8ClampedArray(4*o),n=new Uint32Array(t.buffer,t.byteOffset,Math.floor(t.byteLength/4)),h=new Uint32Array(a.buffer),g=-4&o;let d=0,l=0;for(let e=0;e<g;e+=4){const e=n[d++],t=n[d++],A=n[d++];h[l++]=4278190080|e,h[l++]=4278190080|e>>>24|t<<8,h[l++]=4278190080|t>>>16|A<<16,h[l++]=4278190080|A>>>8}let I=3*g,c=4*g;for(let e=g;e<o;e++)a[c]=t[I],a[c+1]=t[I+1],a[c+2]=t[I+2],a[c+3]=255,I+=3,c+=4;return createImageBitmap(new ImageData(a,A,i))}async _decompressZlib(e){try{return await this._decompress(e,"deflate")}catch(t){return await this._decompress(e,"deflate-raw")}}async _decompress(e,t){const A=new DecompressionStream(t),i=A.writable.getWriter();i.write(e),i.close();const s=[],r=A.readable.getReader();for(;;){const{done:e,value:t}=await r.read();if(e)break;s.push(t)}const o=s.reduce((e,t)=>e+t.length,0),a=new Uint8Array(o);let n=0;for(const e of s)a.set(e,n),n+=e.length;return a}get images(){return this._kittyStorage.images}get _kittyIdToStorageId(){return this._kittyStorage.kittyIdToStorageId}get pendingTransmissions(){return this._pendingTransmissions}}},470(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.parseKittyCommand=function(e){const t={},A=e.split(",");for(const e of A){const A=e.indexOf("=");if(-1===A)continue;const i=e.substring(0,A),s=e.substring(A+1);if("a"===i){t.action=s;continue}if("o"===i){t.compression=s;continue}if("t"===i){t.transmission=s;continue}if("d"===i){t.deleteSelector=s;continue}const r=parseInt(s,10);switch(i){case"f":t.format=r;break;case"i":t.id=r;break;case"I":t.imageNumber=r;break;case"s":t.width=r;break;case"v":t.height=r;break;case"x":t.x=r;break;case"y":t.y=r;break;case"w":t.sourceWidth=r;break;case"h":t.sourceHeight=r;break;case"X":t.xOffset=r;break;case"Y":t.yOffset=r;break;case"c":t.columns=r;break;case"r":t.rows=r;break;case"m":t.more=r;break;case"q":t.quiet=r;break;case"C":t.cursorMovement=r;break;case"z":t.zIndex=r;break;case"p":t.placementId=r}}return t}},235(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.KittyImageStorage=void 0;class A{constructor(e){this._storage=e,this._nextImageId=1,this._images=new Map,this._kittyIdToStorageId=new Map,this._storageIdToKittyId=new Map,this._handleStorageImageDeleted=e=>{const t=this._storageIdToKittyId.get(e);void 0!==t&&(this._kittyIdToStorageId.delete(t),this._storageIdToKittyId.delete(e),this._images.delete(t))},this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"iip"},this._previousOnImageDeleted=this._storage.onImageDeleted,this._wrappedOnImageDeleted=e=>{var t;null===(t=this._previousOnImageDeleted)||void 0===t||t.call(this,e),this._handleStorageImageDeleted(e)},this._storage.onImageDeleted=this._wrappedOnImageDeleted}reset(){this._nextImageId=1,this._images.clear(),this._kittyIdToStorageId.clear(),this._storageIdToKittyId.clear()}dispose(){this.reset(),this._storage.onImageDeleted===this._wrappedOnImageDeleted&&(this._storage.onImageDeleted=this._previousOnImageDeleted)}storeImage(e,t){const i=null!=e?e:this._nextImageId++,s=this._kittyIdToStorageId.get(i);return void 0!==s&&(this._storage.deleteImage(s),this._kittyIdToStorageId.delete(i),this._storageIdToKittyId.delete(s)),!this._images.has(i)&&this._images.size>=A._maxStoredImages&&this._evictUndisplayedImages(),this._images.set(i,Object.assign(Object.assign({},t),{id:i})),i}addImage(e,t,A,i,s){const r=this._kittyIdToStorageId.get(e);void 0!==r&&this._storageIdToKittyId.delete(r),this._addImageOpts.scrolling=A,this._addImageOpts.layer=i,this._addImageOpts.zIndex=s;const o=this._storage.addImage(t,this._addImageOpts);this._kittyIdToStorageId.set(e,o),this._storageIdToKittyId.set(o,e)}getImage(e){return this._images.get(e)}deleteById(e){this._images.delete(e);const t=this._kittyIdToStorageId.get(e);void 0!==t&&(this._storage.deleteImage(t),this._kittyIdToStorageId.delete(e),this._storageIdToKittyId.delete(t))}deleteAll(){this._images.clear();for(const e of this._kittyIdToStorageId.values())this._storage.deleteImage(e);this._kittyIdToStorageId.clear(),this._storageIdToKittyId.clear()}get images(){return this._images}get kittyIdToStorageId(){return this._kittyIdToStorageId}get lastImageId(){return this._nextImageId-1}_evictUndisplayedImages(){for(const[e]of this._images){if(this._images.size<=A._maxStoredImages/2)break;this._kittyIdToStorageId.has(e)||this._images.delete(e)}}}t.KittyImageStorage=A,A._maxStoredImages=256},669(e,t,A){Object.defineProperty(t,"__esModule",{value:!0});const i=(0,A(552).InWasm)({s:1,t:0,d:"AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML"}),s=new Uint8Array("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("").map(e=>e.charCodeAt(0))),r=new Uint32Array(1024);r.fill(4278190080);for(let e=0;e<s.length;++e)r[s[e]]=e<<2;for(let e=0;e<s.length;++e)r[256+s[e]]=e>>4|(e<<4&255)<<8;for(let e=0;e<s.length;++e)r[512+s[e]]=e>>2<<8|(e<<6&255)<<16;for(let e=0;e<s.length;++e)r[768+s[e]]=e<<16;const o=new Uint8Array(0);t.default=class{constructor(e,t,A){if(this._inst=null,this._ended=!0,this._bytes=0,this.keepSize=null!=e?e:1048576,this.maxBytes=null!=t?t:4294901760,this._bytes=null!=A?A:32768,this._bytes>this.maxBytes||this.maxBytes>4294901760)throw new Error("invalid byte settings")}get data8(){return this._inst?this._d.subarray(0,this._m32[1282]):o}release(){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))}init(e,t){if(this.maxBytes=null!=e?e:this.maxBytes,this._bytes=null!=t?t:Math.min(this._bytes,this.maxBytes),this._bytes>this.maxBytes||this.maxBytes>4294901760)throw Error("invalid byte settings");let A=this._m32;const s=this._bytes+5152;this._inst?this._mem.buffer.byteLength<s&&(this._mem.grow(Math.ceil((s-this._mem.buffer.byteLength)/65536)),A=new Uint32Array(this._mem.buffer,0),this._d=new Uint8Array(this._mem.buffer,5152)):(this._mem=new WebAssembly.Memory({initial:Math.ceil(s/65536)}),this._inst=i({env:{memory:this._mem}}),A=new Uint32Array(this._mem.buffer,0),A.set(r,256),this._d=new Uint8Array(this._mem.buffer,5152)),A[1280]=0,A[1281]=0,A[1282]=0,this._m32=A,this._ended=!1}_realloc(e){const t=this._m32[1280]+e;if(this._bytes<t){if(t>this.maxBytes)return-3;let e=this._bytes;for(;(e*=2)<t;);if(e=Math.min(e,this.maxBytes),e<t)return-3;if(e+5152>this._mem.buffer.byteLength){const t=Math.ceil((e+5152-this._mem.buffer.byteLength)/65536);this._mem.grow(t),this._m32=new Uint32Array(this._mem.buffer,0),this._d=new Uint8Array(this._mem.buffer,5152)}this._bytes=e}return 0}put(e){if(!this._inst||this._ended)return-2;if(this._realloc(e.length))return-3;const t=this._m32;return this._d.set(e,t[1280]),t[1280]+=e.length,t[1280]-t[1281]>=131072?this._inst.exports.dec():0}end(){return this._ended=!0,this._inst?this._inst.exports.end():-2}get loadedBytes(){return this._inst?this._m32[1280]:0}get freeBytes(){return this._inst?this.maxBytes-this._m32[1280]:0}}},61(e,t,A){Object.defineProperty(t,"__esModule",{value:!0});const i=(0,A(552).InWasm)({s:1,t:0,d:"AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw=="});t.default=class{constructor(e){this.keepSize=e,this.width=0,this.height=0}decode(e){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];const t=this.width*this.height,A=4*t,s=e.length,r=Math.max(A,s)+(Math.min(A,s)>>1)+4096;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=i({env:{memory:this._mem}})),this._d||(this._d=new Uint8Array(this._mem.buffer));const o=this._mem.buffer.byteLength-s&-256;return this._d.set(e,o),this._inst.exports.dec(o,s,t),this._d.subarray(1024,1024+A)}release(){this._inst&&this._mem.buffer.byteLength>this.keepSize&&(this._inst=this._d=this._mem=null)}}},552(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.InWasm=function(e){if(e.d){const{t,s:i,d:s}=e;let r,o;const a=WebAssembly;return 0===t?i?e=>new a.Instance(o||(o=new a.Module(r||(r=A(s)))),e):e=>o?a.instantiate(o,e):a.instantiate(r||(r=A(s)),e).then(e=>(o=e.module)&&e.instance):1===t?i?()=>o||(o=new a.Module(r||(r=A(s)))):()=>o?Promise.resolve(o):a.compile(r||(r=A(s))).then(e=>o=e):i?()=>r||(r=A(s)):()=>Promise.resolve(r||(r=A(s)))}if("undefined"==typeof _wasmCtx)throw new Error('must run "inwasm"');_wasmCtx.add(e)};let A=e=>{if(Uint8Array.fromBase64)return Uint8Array.fromBase64(e);if("undefined"!=typeof Buffer)return Buffer.from(e,"base64");const t=atob(e),A=new Uint8Array(t.length);for(let e=0;e<A.length;++e)A[e]=t.charCodeAt(e);return A}}},t={};function A(i){var s=t[i];if(void 0!==s)return s.exports;var r=t[i]={exports:{}};return e[i].call(r.exports,r,r.exports,A),r.exports}var i={};return(()=>{var e=i;Object.defineProperty(e,"__esModule",{value:!0}),e.ImageAddon=void 0;const t=A(414),s=A(795),r=A(463),o=A(699),a=A(23),n=A(235),h=A(566),g=A(994),d=A(649),l={enableSizeReports:!0,pixelLimit:16777216,sixelSupport:!0,sixelScrolling:!0,sixelPaletteLimit:4096,sixelSizeLimit:33554432,storageLimit:128,showPlaceholder:!0,iipSupport:!0,iipSizeLimit:33554432,kittySupport:!0,kittySizeLimit:33554432};e.ImageAddon=class{constructor(e){this._disposables=[],this._handlers=new Map,this._onImageAdded=new t.Emitter,this.onImageAdded=this._onImageAdded.event,this._opts=Object.assign({},l,e),this._defaultOpts=Object.assign({},l,e)}dispose(){for(const e of this._disposables)e.dispose();this._disposables.length=0,this._handlers.clear(),this._onImageAdded.dispose()}_disposeLater(...e){for(const t of e)this._disposables.push(t)}activate(e){var t;if(this._terminal=e,this._renderer=new r.ImageRenderer(e),this._storage=new o.ImageStorage(e,this._renderer,this._opts),this._storage.onImageAdded=()=>this._onImageAdded.fire(),this._opts.enableSizeReports){const A=null!==(t=e.options.windowOptions)&&void 0!==t?t:{};A.getWinSizePixels=!0,A.getCellSizePixels=!0,A.getWinSizeChars=!0,e.options.windowOptions=A}if(this._disposeLater(this._renderer,this._storage,e.parser.registerCsiHandler({prefix:"?",final:"h"},e=>this._decset(e)),e.parser.registerCsiHandler({prefix:"?",final:"l"},e=>this._decrst(e)),e.parser.registerCsiHandler({final:"c"},e=>this._da1(e)),e.parser.registerCsiHandler({prefix:"?",final:"S"},e=>this._xtermGraphicsAttributes(e)),e.onRender(e=>{var t;return null===(t=this._storage)||void 0===t?void 0:t.render(e)}),e.parser.registerCsiHandler({intermediates:"!",final:"p"},()=>this.reset()),e.parser.registerEscHandler({final:"c"},()=>this.reset()),e._core._inputHandler.onRequestReset(()=>this.reset()),e.buffer.onBufferChange(()=>{var e;return null===(e=this._storage)||void 0===e?void 0:e.wipeAlternate()}),e.onResize(e=>{var t;return null===(t=this._storage)||void 0===t?void 0:t.viewportResize(e)})),this._opts.sixelSupport){const t=new g.SixelImageStorage(this._storage,this._opts,this._renderer,e),A=new h.SixelHandler(this._opts,t,e);this._handlers.set("sixel",A),this._disposeLater(e._core._inputHandler._parser.registerDcsHandler({final:"q"},A))}if(this._opts.iipSupport){const t=new d.IIPImageStorage(this._storage),A=new s.IIPHandler(this._opts,this._renderer,t,e);this._handlers.set("iip",A),this._disposeLater(e._core._inputHandler._parser.registerOscHandler(1337,A))}if(this._opts.kittySupport){const t=new n.KittyImageStorage(this._storage),A=new a.KittyGraphicsHandler(this._opts,this._renderer,t,e);this._handlers.set("kitty",A),this._disposeLater(t,A,e._core._inputHandler._parser.registerApcHandler({final:"G"},A))}}reset(){var e;this._opts.sixelScrolling=this._defaultOpts.sixelScrolling,this._opts.sixelPaletteLimit=this._defaultOpts.sixelPaletteLimit,null===(e=this._storage)||void 0===e||e.reset();for(const e of this._handlers.values())e.reset();return!1}get storageLimit(){var e;return(null===(e=this._storage)||void 0===e?void 0:e.getLimit())||-1}set storageLimit(e){var t;null===(t=this._storage)||void 0===t||t.setLimit(e),this._opts.storageLimit=e}get storageUsage(){return this._storage?this._storage.getUsage():-1}get showPlaceholder(){return this._opts.showPlaceholder}set showPlaceholder(e){var t;this._opts.showPlaceholder=e,null===(t=this._renderer)||void 0===t||t.showPlaceholder(e)}getImageAtBufferCell(e,t){var A;return null===(A=this._storage)||void 0===A?void 0:A.getImageAtBufferCell(e,t)}extractTileAtBufferCell(e,t){var A;return null===(A=this._storage)||void 0===A?void 0:A.extractTileAtBufferCell(e,t)}_report(e){var t;null===(t=this._terminal)||void 0===t||t._core.input(e,!1)}_decset(e){for(let t=0;t<e.length;++t)80===e[t]&&(this._opts.sixelScrolling=!1);return!1}_decrst(e){for(let t=0;t<e.length;++t)80===e[t]&&(this._opts.sixelScrolling=!0);return!1}_da1(e){return!!e[0]||!!this._opts.sixelSupport&&(this._report("[?62;4;9;22c"),!0)}_xtermGraphicsAttributes(e){var t,A,i,s,r,a;if(e.length<2)return!0;if(1===e[0])switch(e[1]){case 1:return this._report(`[?${e[0]};0;${this._opts.sixelPaletteLimit}S`),!0;case 2:this._opts.sixelPaletteLimit=this._defaultOpts.sixelPaletteLimit,this._report(`[?${e[0]};0;${this._opts.sixelPaletteLimit}S`);for(const e of this._handlers.values())e.reset();return!0;case 3:return e.length>2&&!(e[2]instanceof Array)&&e[2]<=4096?(this._opts.sixelPaletteLimit=e[2],this._report(`[?${e[0]};0;${this._opts.sixelPaletteLimit}S`)):this._report(`[?${e[0]};2S`),!0;case 4:return this._report(`[?${e[0]};0;4096S`),!0;default:return this._report(`[?${e[0]};2S`),!0}if(2===e[0])switch(e[1]){case 1:let n=null===(A=null===(t=this._renderer)||void 0===t?void 0:t.dimensions)||void 0===A?void 0:A.css.canvas.width,h=null===(s=null===(i=this._renderer)||void 0===i?void 0:i.dimensions)||void 0===s?void 0:s.css.canvas.height;if(!n||!h){const e=o.CELL_SIZE_DEFAULT;n=((null===(r=this._terminal)||void 0===r?void 0:r.cols)||80)*e.width,h=((null===(a=this._terminal)||void 0===a?void 0:a.rows)||24)*e.height}if(n*h<this._opts.pixelLimit)this._report(`[?${e[0]};0;${n.toFixed(0)};${h.toFixed(0)}S`);else{const t=Math.floor(Math.sqrt(this._opts.pixelLimit));this._report(`[?${e[0]};0;${t};${t}S`)}return!0;case 4:const g=Math.floor(Math.sqrt(this._opts.pixelLimit));return this._report(`[?${e[0]};0;${g};${g}S`),!0;default:return this._report(`[?${e[0]};2S`),!0}return this._report(`[?${e[0]};1S`),!0}}})(),i})());
-+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.ImageAddon=t():e.ImageAddon=t()}(globalThis,()=>(()=>{"use strict";var e={939(e,t){function i(e){return 255&e}function A(e){return e>>>8&255}function s(e){return e>>>16&255}function r(e,t,i,A=255){return((255&A)<<24|(255&i)<<16|(255&t)<<8|255&e)>>>0}function o(e,t,i){return Math.max(e,Math.min(i,t))}function a(e,t,i){return i<0&&(i+=1),i>1&&(i-=1),6*i<1?t+6*(e-t)*i:2*i<1?e:3*i<2?t+(e-t)*(4-6*i):t}function n(e,t,i){return(4278190080|Math.round(i/100*255)<<16|Math.round(t/100*255)<<8|Math.round(e/100*255))>>>0}Object.defineProperty(t,"__esModule",{value:!0}),t.DEFAULT_FOREGROUND=t.DEFAULT_BACKGROUND=t.PALETTE_ANSI_256=t.PALETTE_VT340_GREY=t.PALETTE_VT340_COLOR=t.normalizeHLS=t.normalizeRGB=t.nearestColorIndex=t.fromRGBA8888=t.toRGBA8888=t.alpha=t.blue=t.green=t.red=t.BIG_ENDIAN=void 0,t.BIG_ENDIAN=255===new Uint8Array(new Uint32Array([4278190080]).buffer)[0],t.BIG_ENDIAN&&console.warn("BE platform detected. This version of node-sixel works only on LE properly."),t.red=i,t.green=A,t.blue=s,t.alpha=function(e){return e>>>24&255},t.toRGBA8888=r,t.fromRGBA8888=function(e){return[255&e,e>>8&255,e>>16&255,e>>>24]},t.nearestColorIndex=function(e,t){const r=i(e),o=A(e),a=s(e);let n=Number.MAX_SAFE_INTEGER,h=-1;for(let e=0;e<t.length;++e){const i=r-t[e][0],A=o-t[e][1],s=a-t[e][2],g=i*i+A*A+s*s;if(!g)return e;g<n&&(n=g,h=e)}return h},t.normalizeRGB=n,t.normalizeHLS=function(e,t,i){return function(e,t,i){if(!i){const e=Math.round(255*t);return r(e,e,e)}const A=t<.5?t*(1+i):t+i-t*i,s=2*t-A;return r(o(0,255,Math.round(255*a(A,s,e+1/3))),o(0,255,Math.round(255*a(A,s,e))),o(0,255,Math.round(255*a(A,s,e-1/3))))}((e+240)/360,t/100,i/100)},t.PALETTE_VT340_COLOR=new Uint32Array([n(0,0,0),n(20,20,80),n(80,13,13),n(20,80,20),n(80,20,80),n(20,80,80),n(80,80,20),n(53,53,53),n(26,26,26),n(33,33,60),n(60,26,26),n(33,60,33),n(60,33,60),n(33,60,60),n(60,60,33),n(80,80,80)]),t.PALETTE_VT340_GREY=new Uint32Array([n(0,0,0),n(13,13,13),n(26,26,26),n(40,40,40),n(6,6,6),n(20,20,20),n(33,33,33),n(46,46,46),n(0,0,0),n(13,13,13),n(26,26,26),n(40,40,40),n(6,6,6),n(20,20,20),n(33,33,33),n(46,46,46)]),t.PALETTE_ANSI_256=(()=>{const e=[r(0,0,0),r(205,0,0),r(0,205,0),r(205,205,0),r(0,0,238),r(205,0,205),r(0,250,205),r(229,229,229),r(127,127,127),r(255,0,0),r(0,255,0),r(255,255,0),r(92,92,255),r(255,0,255),r(0,255,255),r(255,255,255)],t=[0,95,135,175,215,255];for(let i=0;i<6;++i)for(let A=0;A<6;++A)for(let s=0;s<6;++s)e.push(r(t[i],t[A],t[s]));for(let t=8;t<=238;t+=10)e.push(r(t,t,t));return new Uint32Array(e)})(),t.DEFAULT_BACKGROUND=r(0,0,0,255),t.DEFAULT_FOREGROUND=r(255,255,255,255)},591(e,t,i){Object.defineProperty(t,"__esModule",{value:!0}),t.decodeAsync=t.decode=t.Decoder=t.DecoderAsync=void 0;const A=i(939),s=i(199),r=function(e){if("undefined"!=typeof Buffer)return Buffer.from(e,"base64");const t=atob(e),i=new Uint8Array(t.length);for(let e=0;e<i.length;++e)i[e]=t.charCodeAt(e);return i}(s.LIMITS.BYTES);let o;const a=new Uint32Array;class n{constructor(){this.bandHandler=e=>1,this.modeHandler=e=>1}handle_band(e){return this.bandHandler(e)}mode_parsed(e){return this.modeHandler(e)}}const h={memoryLimit:134217728,sixelColor:A.DEFAULT_FOREGROUND,fillColor:A.DEFAULT_BACKGROUND,palette:A.PALETTE_VT340_COLOR,paletteLimit:s.LIMITS.PALETTE_SIZE,truncate:!0};function g(e){const t=new n,i={env:{handle_band:t.handle_band.bind(t),mode_parsed:t.mode_parsed.bind(t)}};return WebAssembly.instantiate(o||r,i).then(i=>(o=o||i.module,new d(e,i.instance||i,t)))}t.DecoderAsync=g;class d{constructor(e,t,i){if(this._PIXEL_OFFSET=s.LIMITS.MAX_WIDTH+4,this._canvas=a,this._bandWidths=[],this._maxWidth=0,this._minWidth=s.LIMITS.MAX_WIDTH,this._lastOffset=0,this._currentHeight=0,this._opts=Object.assign({},h,e),this._opts.paletteLimit>s.LIMITS.PALETTE_SIZE)throw new Error(`DecoderOptions.paletteLimit must not exceed ${s.LIMITS.PALETTE_SIZE}`);if(t)i.bandHandler=this._handle_band.bind(this),i.modeHandler=this._initCanvas.bind(this);else{const e=o||(o=new WebAssembly.Module(r));t=new WebAssembly.Instance(e,{env:{handle_band:this._handle_band.bind(this),mode_parsed:this._initCanvas.bind(this)}})}this._instance=t,this._wasm=this._instance.exports,this._chunk=new Uint8Array(this._wasm.memory.buffer,this._wasm.get_chunk_address(),s.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(),s.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(A.DEFAULT_FOREGROUND,0,this._opts.paletteLimit,0)}get _fillColor(){return this._states[0]}get _truncate(){return this._states[8]}get _rasterWidth(){return this._states[6]}get _rasterHeight(){return this._states[7]}get _width(){return this._states[2]?this._states[2]-4:0}get _height(){return this._states[3]}get _level(){return this._states[9]}get _mode(){return this._states[10]}get _paletteLimit(){return this._states[11]}_initCanvas(e){if(2===e){const e=this.width*this.height;if(e>this._canvas.length){if(this._opts.memoryLimit&&4*e>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");this._canvas=new Uint32Array(e)}this._maxWidth=this._width}else if(1===e)if(2===this._level){const e=Math.min(this._rasterWidth,s.LIMITS.MAX_WIDTH)*this._rasterHeight;if(e>this._canvas.length){if(this._opts.memoryLimit&&4*e>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");this._canvas=new Uint32Array(e)}}else this._canvas.length<65536&&(this._canvas=new Uint32Array(65536));return 0}_realloc(e,t){const i=e+t;if(i>this._canvas.length){if(this._opts.memoryLimit&&4*i>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");const e=new Uint32Array(65536*Math.ceil(i/65536));e.set(this._canvas),this._canvas=e}}_handle_band(e){const t=this._PIXEL_OFFSET;let i=this._lastOffset;if(2===this._mode){let A=this.height-this._currentHeight,s=0;for(;s<6&&A>0;)this._canvas.set(this._pSrc.subarray(t*s,t*s+e),i+e*s),s++,A--;this._lastOffset+=e*s,this._currentHeight+=s}else if(1===this._mode){this._realloc(i,6*e),this._maxWidth=Math.max(this._maxWidth,e),this._minWidth=Math.min(this._minWidth,e);for(let A=0;A<6;++A)this._canvas.set(this._pSrc.subarray(t*A,t*A+e),i+e*A);this._bandWidths.push(e),this._lastOffset+=6*e,this._currentHeight+=6}return 0}get width(){return 1!==this._mode?this._width:Math.max(this._maxWidth,this._wasm.current_width())}get height(){return 1!==this._mode?this._height:this._wasm.current_width()?6*this._bandWidths.length+this._wasm.current_height():6*this._bandWidths.length}get palette(){return this._palette.subarray(0,this._paletteLimit)}get memoryUsage(){return this._canvas.byteLength+this._wasm.memory.buffer.byteLength+8*this._bandWidths.length}get properties(){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}}}init(e=this._opts.fillColor,t=this._opts.palette,i=this._opts.paletteLimit,A=this._opts.truncate){this._wasm.init(this._opts.sixelColor,e,i,A?1:0),t&&this._palette.set(t.subarray(0,s.LIMITS.PALETTE_SIZE)),this._bandWidths.length=0,this._maxWidth=0,this._minWidth=s.LIMITS.MAX_WIDTH,this._lastOffset=0,this._currentHeight=0}decode(e,t=0,i=e.length){let A=t;for(;A<i;){const t=Math.min(i-A,s.LIMITS.CHUNK_SIZE);this._chunk.set(e.subarray(A,A+=t)),this._wasm.decode(0,t)}}decodeString(e,t=0,i=e.length){let A=t;for(;A<i;){const t=Math.min(i-A,s.LIMITS.CHUNK_SIZE);for(let i=0,s=A;i<t;++i,++s)this._chunk[i]=e.charCodeAt(s);A+=t,this._wasm.decode(0,t)}}get data32(){if(0===this._mode||!this.width||!this.height)return a;const e=this._wasm.current_width();if(2===this._mode){let t=this.height-this._currentHeight;if(t>0){const i=this._PIXEL_OFFSET;let A=this._lastOffset,s=0;for(;s<6&&t>0;)this._canvas.set(this._pSrc.subarray(i*s,i*s+e),A+e*s),s++,t--;t&&this._canvas.fill(this._fillColor,A+e*s)}return this._canvas.subarray(0,this.width*this.height)}if(1===this._mode){if(this._minWidth===this._maxWidth){let t=!1;if(e)if(e!==this._minWidth)t=!0;else{const t=this._PIXEL_OFFSET;let i=this._lastOffset;this._realloc(i,6*e);for(let A=0;A<6;++A)this._canvas.set(this._pSrc.subarray(t*A,t*A+e),i+e*A)}if(!t)return this._canvas.subarray(0,this.width*this.height)}const t=new Uint32Array(this.width*this.height);t.fill(this._fillColor);let i=0,A=0;for(let e=0;e<this._bandWidths.length;++e){const s=this._bandWidths[e];for(let e=0;e<6;++e)t.set(this._canvas.subarray(A,A+=s),i),i+=this.width}if(e){const A=this._PIXEL_OFFSET,s=this._wasm.current_height();for(let r=0;r<s;++r)t.set(this._pSrc.subarray(A*r,A*r+e),i+this.width*r)}return t}return a}get data8(){return new Uint8ClampedArray(this.data32.buffer,0,this.width*this.height*4)}release(){this._canvas=a,this._bandWidths.length=0,this._maxWidth=0,this._minWidth=s.LIMITS.MAX_WIDTH,this._wasm.init(A.DEFAULT_FOREGROUND,0,this._opts.paletteLimit,0)}}t.Decoder=d,t.decode=function(e,t){const i=new d(t);return i.init(),"string"==typeof e?i.decodeString(e):i.decode(e),{width:i.width,height:i.height,data32:i.data32,data8:i.data8}},t.decodeAsync=async function(e,t){const i=await g(t);return i.init(),"string"==typeof e?i.decodeString(e):i.decode(e),{width:i.width,height:i.height,data32:i.data32,data8:i.data8}}},199(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.LIMITS=void 0,t.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"}},414(e,t,i){Object.defineProperty(t,"__esModule",{value:!0}),t.EventUtils=t.Emitter=void 0;const A=i(426);var s;t.Emitter=class{constructor(){this._listeners=[],this._disposed=!1}get event(){return this._event||(this._event=(e,t,i)=>{if(this._disposed)return(0,A.toDisposable)(()=>{});const s={fn:e,thisArgs:t};this._listeners=this._listeners.slice(),this._listeners.push(s);const r=(0,A.toDisposable)(()=>{const e=this._listeners.indexOf(s);-1!==e&&(this._listeners=this._listeners.slice(),this._listeners.splice(e,1))});return i&&(Array.isArray(i)?i.push(r):i.add(r)),r}),this._event}fire(e){if(this._disposed||!this._listeners.length)return;if(1===this._listeners.length)return void this._listeners[0].fn.call(this._listeners[0].thisArgs,e);const t=this._listeners;for(let i=0,A=t.length;i<A;++i)t[i].fn.call(t[i].thisArgs,e)}dispose(){this._disposed||(this._disposed=!0,this._listeners.length=0)}},function(e){e.forward=function(e,t){return e(e=>t.fire(e))},e.map=function(e,t){return(i,A,s)=>e(e=>i.call(A,t(e)),void 0,s)},e.any=function(...e){return(t,i,s)=>{const r=new A.DisposableStore;for(const A of e)r.add(A(e=>t.call(i,e)));return s&&(Array.isArray(s)?s.push(r):s.add(r)),r}},e.runAndSubscribe=function(e,t,i){return t(i),e(e=>t(e))}}(s||(t.EventUtils=s={}))},426(e,t){function i(e){return{dispose:e}}function A(e){if(!e)return e;if(Array.isArray(e)){for(const t of e)t.dispose();return[]}return e.dispose(),e}Object.defineProperty(t,"__esModule",{value:!0}),t.MutableDisposable=t.Disposable=t.DisposableStore=void 0,t.toDisposable=i,t.dispose=A,t.combinedDisposable=function(...e){return i(()=>A(e))};class s{constructor(){this._disposables=new Set,this._isDisposed=!1}get isDisposed(){return this._isDisposed}add(e){return this._isDisposed?e.dispose():this._disposables.add(e),e}dispose(){if(!this._isDisposed){this._isDisposed=!0;for(const e of this._disposables)e.dispose();this._disposables.clear()}}clear(){for(const e of this._disposables)e.dispose();this._disposables.clear()}}t.DisposableStore=s;class r{constructor(){this._store=new s}dispose(){this._store.dispose()}_register(e){return this._store.add(e)}}t.Disposable=r,r.None=Object.freeze({dispose(){}}),t.MutableDisposable=class{constructor(){this._isDisposed=!1}get value(){return this._isDisposed?void 0:this._value}set value(e){this._isDisposed||e===this._value||(this._value?.dispose(),this._value=e)}clear(){this.value=void 0}dispose(){this._isDisposed=!0,this._value?.dispose(),this._value=void 0}}},795(e,t,i){var A=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:!0}),t.IIPHandler=void 0;const s=i(463),r=i(699),o=A(i(669)),a=A(i(61)),n=i(389),h=i(462),g={type:0,name:"Unnamed file",size:0,width:"auto",height:"auto",preserveAspectRatio:1,inline:0};t.IIPHandler=class{constructor(e,t,i,A){this._opts=e,this._renderer=t,this._storage=i,this._coreTerminal=A,this._generation=0,this._aborted=!1,this._hp=new n.HeaderParser,this._header=g,this._isMultipart=!1,this._abortMulti=!1;const s=Math.ceil(4*this._opts.iipSizeLimit/3),r=Math.min(1048576,s);this._dec=new o.default(4194304,s,r),this._qoiDec=new a.default(4194304)}reset(){this._generation++,this._hp.reset(),this._dec.release(),this._qoiDec.release()}start(){this._aborted=!1,this._hp.reset()}put(e,t,i){if(!this._aborted)if(4===this._hp.state)0!==this._dec.put(e.subarray(t,i))&&(this._dec.release(),this._aborted=!0);else{const A=this._hp.parse(e,t,i);if(-1===A)return void(this._aborted=!0);if(A>0){if(1===this._hp.fields.type){if(this._isMultipart&&(this._isMultipart=!1,this._abortMulti=!1,this._dec.release()),this._header=Object.assign({},g,this._hp.fields),!this._header.inline)return void(this._aborted=!0);this._dec.init()}else if(this._abortMulti)return void(this._aborted=!0);0!==this._dec.put(e.subarray(A,i))&&(this._dec.release(),this._aborted=!0,this._isMultipart&&(this._abortMulti=!0))}}}end(e){var t,i,A;if(this._aborted)return!0;if(4!==this._hp.state&&this._hp.end())return!0;const o=this._hp.fields.type;if(3===o)return!0;if(5===o){let e=r.CELL_SIZE_DEFAULT.width,i=r.CELL_SIZE_DEFAULT.height;this._renderer.dimensions&&(e=this._renderer.dimensions.css.canvas.width/this._coreTerminal.cols,i=this._renderer.dimensions.css.canvas.height/this._coreTerminal.rows);const s=null!==(A=null===(t=this._coreTerminal._core._coreBrowserService)||void 0===t?void 0:t.dpr)&&void 0!==A?A:1,o=`]1337;ReportCellSize=${i.toFixed(3)};${e.toFixed(3)};${s.toFixed(3)}\\`;return this._coreTerminal.input(o,!1),!0}if(2===o)return this._header=Object.assign({},g,this._hp.fields),this._isMultipart=!0,this._abortMulti=!1,this._dec.release(),this._dec.init(),!0;if(4===o){if(!this._isMultipart)return!0;if(this._isMultipart=!1,this._abortMulti||2!==this._header.type)return!0}let a,n,d=0,l=0,I=h.UNSUPPORTED_TYPE;if((a=e)&&((a=!this._dec.end())?(I=(0,h.imageType)(this._dec.data8),(a="unsupported"!==I.mime)?(d=I.width,l=I.height,(a=d&&l&&d*l<this._opts.pixelLimit)?([d,l]=this._resize(d,l).map(Math.floor),a=d&&l&&d*l<this._opts.pixelLimit):console.warn(`IIP: image dimension issue ${I.width}x${I.height}`)):console.warn("IIP: unsupported image type")):console.warn("IIP: error during BASE64 decoding")),!a)return this._dec.release(),!0;if("image/qoi"===I.mime){const e=this._qoiDec.decode(this._dec.data8);if(n=new ImageData(new Uint8ClampedArray(e.buffer,e.byteOffset,e.byteLength),this._qoiDec.width,this._qoiDec.height),this._qoiDec.release(),d===this._qoiDec.width&&l===this._qoiDec.height){this._dec.release();const e=s.ImageRenderer.createCanvas(void 0,this._qoiDec.width,this._qoiDec.height);return null===(i=e.getContext("2d"))||void 0===i||i.putImageData(n,0,0),this._storage.addImage(e),!0}}else n=new Blob([this._dec.data8],{type:I.mime});this._dec.release();const c=this._generation;return createImageBitmap(n,{resizeWidth:d,resizeHeight:l}).then(e=>c!==this._generation?(e.close(),!0):(this._storage.addImage(e),!0)).catch(e=>(console.warn(`IIP: decoding error ${I.mime} ${I.width}x${I.height}`,e),!0))}_resize(e,t){var i,A,s,o;const a=(null===(i=this._renderer.dimensions)||void 0===i?void 0:i.css.cell.width)||r.CELL_SIZE_DEFAULT.width,n=(null===(A=this._renderer.dimensions)||void 0===A?void 0:A.css.cell.height)||r.CELL_SIZE_DEFAULT.height,h=(null===(s=this._renderer.dimensions)||void 0===s?void 0:s.css.canvas.width)||a*this._coreTerminal.cols,g=(null===(o=this._renderer.dimensions)||void 0===o?void 0:o.css.canvas.height)||n*this._coreTerminal.rows,d=this._dim(this._header.width,h,a),l=this._dim(this._header.height,g,n);if(!d&&!l){const i=h/e,A=(g-n)/t,s=Math.min(i,A);return s<1?[e*s,t*s]:[e,t]}return d?!this._header.preserveAspectRatio&&d&&l?[d,l]:[d,t*d/e]:[e*l/t,l]}_dim(e,t,i){return"auto"===e?0:e.endsWith("%")?parseInt(e.slice(0,-1),10)*t/100:e.endsWith("px")?parseInt(e.slice(0,-2),10):parseInt(e,10)*i}}},389(e,t){function i(e){let t="";for(let i=0;i<e.length;++i)t+=String.fromCharCode(e[i]);return t}function A(e){let t=0;for(let i=0;i<e.length;++i){if(e[i]<48||e[i]>57)throw new Error("illegal char");t=10*t+e[i]-48}return t}function s(e){const t=i(e);if(!t.match(/^((auto)|(\d+?((px)|(%)){0,1}))$/))throw new Error("illegal size");return t}Object.defineProperty(t,"__esModule",{value:!0}),t.HeaderParser=void 0;const r={inline:A,size:A,name:function(e){if("undefined"!=typeof Buffer)return Buffer.from(i(e),"base64").toString();const t=atob(i(e)),A=new Uint8Array(t.length);for(let e=0;e<A.length;++e)A[e]=t.charCodeAt(e);return(new TextDecoder).decode(A)},width:s,height:s,preserveAspectRatio:A},o=[70,105,108,101],a=[77,117,108,116,105,112,97,114,116,70,105,108,101],n=[70,105,108,101,80,97,114,116],h=[70,105,108,101,69,110,100],g=[82,101,112,111,114,116,67,101,108,108,83,105,122,101],d=1024;t.HeaderParser=class{constructor(){this.state=0,this._buffer=new Uint32Array(d),this._position=0,this._key="",this.fields={}}reset(){this._buffer.fill(0),this.state=0,this._position=0,this.fields={},this._key=""}end(){if(0===this.state){if(this._position===h.length){for(let e=0;e<h.length;++e)if(this._buffer[e]!==h[e])return this._a();return this.fields.type=4,this.state=4,0}if(this._position===g.length){for(let e=0;e<g.length;++e)if(this._buffer[e]!==g[e])return this._a();return this.fields.type=5,this.state=4,0}return this._a()}return 4===this.state?0:3===this.state&&2===this.fields.type&&this._storeValue(this._position)?(this.state=4,0):this._a()}parse(e,t,i){let A=this.state,s=this._position;const r=this._buffer;if(1===A||4===A)return-1;if(0===A&&s>14)return-1;for(let h=t;h<i;++h){const t=e[h];switch(t){case 59:if(!this._storeValue(s))return this._a();A=2,s=0;break;case 61:if(0===A){if(70===r[0]){let e=0;for(;e<o.length;++e)if(r[e]!==o[e])return this._a();if(this.fields.type=1,s===n.length){for(;e<n.length;++e)if(r[e]!==n[e])return this._a();return this.fields.type=3,this.state=4,h+1}}else{if(77!==r[0])return this._a();for(let e=0;e<a.length;++e)if(r[e]!==a[e])return this._a();this.fields.type=2}A=2,s=0}else if(2===A){if(!this._storeKey(s))return this._a();A=3,s=0}else if(3===A){if(s>=d)return this._a();r[s++]=t}break;case 58:return 3!==A||this._storeValue(s)?(this.state=4,h+1):this._a();default:if(s>=d)return this._a();r[s++]=t}}return this.state=A,this._position=s,-2}_a(){return this.fields.type=0,this.state=1,-1}_storeKey(e){const t=i(this._buffer.subarray(0,e));return!!t&&(this._key=t,this.fields[t]=null,!0)}_storeValue(e){if(this._key){try{const t=this._buffer.slice(0,e);this.fields[this._key]=r[this._key]?r[this._key](t):t}catch(e){return!1}return!0}return!1}}},649(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.IIPImageStorage=void 0,t.IIPImageStorage=class{constructor(e){this._storage=e,this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"iip"}}addImage(e){this._storage.addImage(e,this._addImageOpts)}}},462(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.UNSUPPORTED_TYPE=void 0,t.imageType=function(e){if(e.length<32)return t.UNSUPPORTED_TYPE;const i=new Uint32Array(e.buffer,e.byteOffset,8);if(1196314761===i[0]&&169478669===i[1]&&1380206665===i[3])return{mime:"image/png",width:e[16]<<24|e[17]<<16|e[18]<<8|e[19],height:e[20]<<24|e[21]<<16|e[22]<<8|e[23]};if(255===e[0]&&216===e[1]&&255===e[2]){const[t,i]=function(e){const t=e.length;let i=4,A=e[i]<<8|e[i+1];for(;;){if(i+=A,i>=t)return[0,0];if(255!==e[i])return[0,0];if(192===e[i+1]||194===e[i+1])return i+8<t?[e[i+7]<<8|e[i+8],e[i+5]<<8|e[i+6]]:[0,0];i+=2,A=e[i]<<8|e[i+1]}}(e);return{mime:"image/jpeg",width:t,height:i}}if(944130375===i[0]&&(55===e[4]||57===e[4])&&97===e[5])return{mime:"image/gif",width:e[7]<<8|e[6],height:e[9]<<8|e[8]};if(1718185841===i[0])return{mime:"image/qoi",width:e[4]<<24|e[5]<<16|e[6]<<8|e[7],height:e[8]<<24|e[9]<<16|e[10]<<8|e[11]};if(1179011410===i[0]&&1346520407===i[2]&&3690582==(16777215&i[3])){switch(e[15]){case 88:return{mime:"image/webp",width:1+(e[24]|e[25]<<8|e[26]<<16),height:1+(e[27]|e[28]<<8|e[29]<<16)};case 76:if(47!==e[20])return t.UNSUPPORTED_TYPE;const i=e[21]|e[22]<<8|e[23]<<16|e[24]<<24;return{mime:"image/webp",width:1+(16383&i),height:1+(i>>>14&16383)};case 32:return 157!==e[23]||1!==e[24]||42!==e[25]?t.UNSUPPORTED_TYPE:{mime:"image/webp",width:16383&(e[26]|e[27]<<8),height:16383&(e[28]|e[29]<<8)}}return t.UNSUPPORTED_TYPE}if(1887007846===i[1]&&(1718187617===i[2]||1936291425===i[2])){let i=-1;const A=Math.min(e.length-16,1024);for(let t=8;t<A;t++)if(105===e[t]&&115===e[t+1]&&112===e[t+2]&&101===e[t+3]){i=t;break}if(-1!==i){const t=e[i+8]<<24|e[i+9]<<16|e[i+10]<<8|e[i+11],A=e[i+12]<<24|e[i+13]<<16|e[i+14]<<8|e[i+15];if(t>0&&A>0)return{mime:"image/avif",width:t,height:A}}return t.UNSUPPORTED_TYPE}return t.UNSUPPORTED_TYPE},t.UNSUPPORTED_TYPE={mime:"unsupported",width:0,height:0}},463(e,t,i){Object.defineProperty(t,"__esModule",{value:!0}),t.ImageRenderer=void 0;const A=i(939),s=i(426);class r extends s.Disposable{get canvas(){var e;return null===(e=this._layers.get("top"))||void 0===e?void 0:e.canvas}static createCanvas(e,t,i){const A=(null!=e?e:document).createElement("canvas");return A.width=0|t,A.height=0|i,A}static createImageData(e,t,i,A){if("function"!=typeof ImageData){const s=e.createImageData(t,i);return A&&s.data.set(new Uint8ClampedArray(A,0,t*i*4)),s}return A?new ImageData(new Uint8ClampedArray(A,0,t*i*4),t,i):new ImageData(t,i)}static createImageBitmap(e){return"function"!=typeof createImageBitmap?Promise.resolve(void 0):createImageBitmap(e)}constructor(e){super(),this._terminal=e,this._layers=new Map,this._optionsRefresh=this._register(new s.MutableDisposable),this._oldOpen=this._terminal._core.open,this._terminal._core.open=e=>{var t;null===(t=this._oldOpen)||void 0===t||t.call(this._terminal._core,e),this._open()},this._terminal._core.screenElement&&this._open(),this._optionsRefresh.value=this._terminal._core.optionsService.onOptionChange(e=>{var t;"fontSize"===e&&(this.rescaleCanvas(),null===(t=this._renderService)||void 0===t||t.refreshRows(0,this._terminal.rows))}),this._register((0,s.toDisposable)(()=>{var e;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(),null===(e=this._placeholderBitmap)||void 0===e||e.close(),this._placeholderBitmap=void 0,this._placeholder=void 0}))}showPlaceholder(e){var t,i;e?this._placeholder||-1===this.cellSize.height||this._createPlaceHolder(Math.max(this.cellSize.height+1,24)):(null===(t=this._placeholderBitmap)||void 0===t||t.close(),this._placeholderBitmap=void 0,this._placeholder=void 0),null===(i=this._renderService)||void 0===i||i.refreshRows(0,this._terminal.rows)}get dimensions(){return this._terminal.dimensions}get cellSize(){var e,t;return{width:(null===(e=this.dimensions)||void 0===e?void 0:e.css.cell.width)||-1,height:(null===(t=this.dimensions)||void 0===t?void 0:t.css.cell.height)||-1}}clearLines(e,t,i){var A,s,r,o,a;const n=e*((null===(A=this.dimensions)||void 0===A?void 0:A.css.cell.height)||0),h=(null===(s=this.dimensions)||void 0===s?void 0:s.css.canvas.width)||0,g=(t+1-e)*((null===(r=this.dimensions)||void 0===r?void 0:r.css.cell.height)||0);i&&"top"!==i||null===(o=this._layers.get("top"))||void 0===o||o.clearRect(0,n,h,g),i&&"bottom"!==i||null===(a=this._layers.get("bottom"))||void 0===a||a.clearRect(0,n,h,g)}clearAll(e){if(!e||"top"===e){const e=this._layers.get("top");null==e||e.clearRect(0,0,e.canvas.width,e.canvas.height)}if(!e||"bottom"===e){const e=this._layers.get("bottom");null==e||e.clearRect(0,0,e.canvas.width,e.canvas.height)}}draw(e,t,i,A,s=1){const r=this._layers.get(e.layer);if(!r)return;const{width:o,height:a}=this.cellSize;if(-1===o||-1===a)return;this._rescaleImage(e,o,a);const n=e.actual,{width:h,height:g}=e.actualCellSize,d=Math.ceil(n.width/h),l=t%d*h,I=Math.floor(t/d)*g,c=i*o,_=A*a,C=s*h+l>n.width?n.width-l:s*h,B=I+g>n.height?n.height-I:g;r.drawImage(n,Math.floor(l),Math.floor(I),Math.ceil(C),Math.ceil(B),Math.floor(c),Math.floor(_),Math.ceil(C*o/h),Math.ceil(B*a/g))}extractTile(e,t){const{width:i,height:A}=this.cellSize;if(-1===i||-1===A)return;this._rescaleImage(e,i,A);const s=e.actual,{width:o,height:a}=e.actualCellSize,n=Math.ceil(s.width/o),h=t%n*o,g=Math.floor(t/n)*a,d=o+h>s.width?s.width-h:o,l=g+a>s.height?s.height-g:a,I=r.createCanvas(this.document,Math.ceil(d*i/o),Math.ceil(l*A/a)),c=I.getContext("2d");return c?(c.drawImage(s,Math.floor(h),Math.floor(g),Math.floor(d),Math.floor(l),0,0,I.width,I.height),I):void 0}drawPlaceholder(e,t,i=1){var A;const s=this._layers.get("top");if(s){const{width:r,height:o}=this.cellSize;if(-1===r||-1===o)return;if(this._placeholder?o>=this._placeholder.height&&this._createPlaceHolder(o+1):this._createPlaceHolder(Math.max(o+1,24)),!this._placeholder)return;s.drawImage(null!==(A=this._placeholderBitmap)&&void 0!==A?A:this._placeholder,e*r,t*o%2?0:1,r*i,o,e*r,t*o,r*i,o)}}rescaleCanvas(){var e,t;const i=(null===(e=this.dimensions)||void 0===e?void 0:e.css.canvas.width)||0,A=(null===(t=this.dimensions)||void 0===t?void 0:t.css.canvas.height)||0;for(const e of this._layers.values())e.canvas.width===i&&e.canvas.height===A||(e.canvas.width=i,e.canvas.height=A)}_rescaleImage(e,t,i){if(t===e.actualCellSize.width&&i===e.actualCellSize.height)return;const{width:A,height:s}=e.origCellSize;if(t===A&&i===s)return e.actual=e.orig,e.actualCellSize.width=A,void(e.actualCellSize.height=s);const o=Math.ceil(e.orig.width*t/A),a=Math.ceil(e.orig.height*i/s);if(o*a>e.orig.width*e.orig.height)return e.actual=e.orig,e.actualCellSize.width=A,void(e.actualCellSize.height=s);const n=r.createCanvas(this.document,o,a),h=n.getContext("2d");h&&(h.drawImage(e.orig,0,0,n.width,n.height),e.actual=n,e.actualCellSize.width=t,e.actualCellSize.height=i)}_open(){this._renderService=this._terminal._core._renderService,this._oldSetRenderer=this._renderService.setRenderer.bind(this._renderService),this._renderService.setRenderer=e=>{var t;for(const e of[...this._layers.keys()])this.removeLayerFromDom(e);null===(t=this._oldSetRenderer)||void 0===t||t.call(this._renderService,e)}}insertLayerToDom(e="top"){var t,i;if(!this.document||!this._terminal._core.screenElement)return void console.warn("image addon: cannot insert output canvas to DOM, missing document or screenElement");if(this._layers.has(e))return;const A=r.createCanvas(this.document,(null===(t=this.dimensions)||void 0===t?void 0:t.css.canvas.width)||0,(null===(i=this.dimensions)||void 0===i?void 0:i.css.canvas.height)||0);A.classList.add(`xterm-image-layer-${e}`);const s=this._terminal._core.screenElement;s.style.isolation="isolate","bottom"===e?(A.style.zIndex="-1",s.insertBefore(A,s.firstChild)):(A.style.zIndex="0",s.appendChild(A));const o=A.getContext("2d",{alpha:!0});o?(this._layers.set(e,o),this.clearAll(e)):A.remove()}removeLayerFromDom(e="top"){const t=this._layers.get(e);t&&(t.canvas.remove(),this._layers.delete(e))}hasLayer(e){return this._layers.has(e)}_createPlaceHolder(e=24){var t;null===(t=this._placeholderBitmap)||void 0===t||t.close(),this._placeholderBitmap=void 0;const i=32,s=r.createCanvas(this.document,i,e),o=s.getContext("2d",{alpha:!1});if(!o)return;const a=r.createImageData(o,i,e),n=new Uint32Array(a.data.buffer),h=(0,A.toRGBA8888)(0,0,0),g=(0,A.toRGBA8888)(255,255,255);n.fill(h);for(let t=0;t<e;++t){const e=t%2,A=t*i;for(let t=0;t<i;t+=2)n[A+t+e]=g}o.putImageData(a,0,0);const d=screen.width+i-1&-32||4096;this._placeholder=r.createCanvas(this.document,d,e);const l=this._placeholder.getContext("2d",{alpha:!1});if(!l)return void(this._placeholder=void 0);for(let e=0;e<d;e+=i)l.drawImage(s,e,0);const I=this._placeholder;r.createImageBitmap(I).then(e=>{this._placeholder!==I?null==e||e.close():this._placeholderBitmap=e}).catch(()=>{})}get document(){var e;return null===(e=this._terminal._core._coreBrowserService)||void 0===e?void 0:e.window.document}}t.ImageRenderer=r},699(e,t,i){Object.defineProperty(t,"__esModule",{value:!0}),t.ImageStorage=t.CELL_SIZE_DEFAULT=void 0;const A=i(463);t.CELL_SIZE_DEFAULT={width:7,height:14};class s{get ext(){return this._urlId?-469762049&this._ext|this.underlineStyle<<26:this._ext}set ext(e){this._ext=e}get underlineStyle(){return this._urlId?5:(469762048&this._ext)>>26}set underlineStyle(e){this._ext&=-469762049,this._ext|=e<<26&469762048}get underlineColor(){return 67108863&this._ext}set underlineColor(e){this._ext&=-67108864,this._ext|=67108863&e}get underlineVariantOffset(){const e=(3758096384&this._ext)>>29;return e<0?4294967288^e:e}set underlineVariantOffset(e){this._ext&=536870911,this._ext|=e<<29&3758096384}get urlId(){return this._urlId}set urlId(e){this._urlId=e}constructor(e=0,t=0,i=-1,A=-1){this.imageId=i,this.tileId=A,this._ext=0,this._urlId=0,this._ext=e,this._urlId=t}clone(){return new s(this._ext,this._urlId,this.imageId,this.tileId)}isEmpty(){return 0===this.underlineStyle&&0===this._urlId&&-1===this.imageId}}const r=new s;t.ImageStorage=class{constructor(e,t,i){this._terminal=e,this._renderer=t,this._opts=i,this._images=new Map,this._lastId=0,this._lowestId=0,this._fullyCleared=!1,this._needsFullClear=!1,this._pixelLimit=25e5;try{this.setLimit(this._opts.storageLimit)}catch(e){e instanceof Error&&console.error(e.message),console.warn(`storageLimit is set to ${this.getLimit()} MB`)}this._viewportMetrics={cols:this._terminal.cols,rows:this._terminal.rows}}dispose(){this.reset()}reset(){var e;for(const t of this._images.values())null===(e=t.marker)||void 0===e||e.dispose();this._images.clear(),this._renderer.clearAll()}getLimit(){return 4*this._pixelLimit/1e6}setLimit(e){if(e<.5||e>1e3)throw RangeError("invalid storageLimit, should be at least 0.5 MB and not exceed 1G");this._pixelLimit=e/4*1e6>>>0,this._evictOldest(0)}getUsage(){return 4*this._getStoredPixels()/1e6}_getStoredPixels(){let e=0;for(const 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));return e}_delImg(e){var t;const i=this._images.get(e);i&&(this._images.delete(e),window.ImageBitmap&&i.orig instanceof ImageBitmap&&i.orig.close(),null===(t=this.onImageDeleted)||void 0===t||t.call(this,e))}wipeAlternate(){var e;const t=[];for(const[i,A]of this._images.entries())"alternate"===A.bufferType&&(null===(e=A.marker)||void 0===e||e.dispose(),t.push(i));for(const e of t)this._delImg(e);this._needsFullClear=!0,this._fullyCleared=!1}deleteImage(e){var t;const i=this._images.get(e);i&&(null===(t=i.marker)||void 0===t||t.dispose(),this._delImg(e))}addImage(e,i){var A,s;this._evictOldest(e.width*e.height);let r=this._renderer.cellSize;-1!==r.width&&-1!==r.height||(r=t.CELL_SIZE_DEFAULT);const o=Math.ceil(e.width/r.width),a=Math.ceil(e.height/r.height),n=++this._lastId,h=this._terminal._core.buffer,g=this._terminal.cols,d=this._terminal.rows,l=h.x,I=h.y;let c=l,_=0;i.scrolling||(h.x=0,h.y=0,c=0),this._terminal._core._inputHandler._dirtyRowTracker.markDirty(h.y);for(let e=0;e<a;++e){const t=h.lines.get(h.y+h.ybase);for(let i=0;i<o&&!(c+i>=g);++i)this._writeToCell(t,c+i,n,e*o+i),_++;if(i.scrolling)e<a-1&&this._terminal._core._inputHandler.lineFeed();else if(++h.y>=d)break;h.x=c}this._terminal._core._inputHandler._dirtyRowTracker.markDirty(h.y),i.scrolling?"iip"===i.cursorPos?h.x=Math.min(c+o,g):h.x=c:(h.x=l,h.y=I);const C=[];for(const[e,t]of this._images.entries())t.tileCount<1&&(null===(A=t.marker)||void 0===A||A.dispose(),C.push(e));for(const e of C)this._delImg(e);const B=this._terminal.registerMarker(0);null==B||B.onDispose(()=>{this._images.get(n)&&this._delImg(n)}),"alternate"===this._terminal.buffer.active.type&&this._evictOnAlternate();const Q={orig:e,origCellSize:r,actual:e,actualCellSize:Object.assign({},r),marker:B||void 0,tileCount:_,bufferType:this._terminal.buffer.active.type,layer:i.layer,zIndex:i.zIndex};return this._images.set(n,Q),null===(s=this.onImageAdded)||void 0===s||s.call(this),n}render(e){var t,i;let A=!1,s=!1;for(const e of this._images.values())if("bottom"===e.layer?s=!0:A=!0,A&&s)break;if(A&&!this._renderer.hasLayer("top")&&(this._renderer.insertLayerToDom("top"),!this._renderer.hasLayer("top")))return;if(s&&!this._renderer.hasLayer("bottom")&&this._renderer.insertLayerToDom("bottom"),this._renderer.rescaleCanvas(),!this._images.size)return this._fullyCleared||(this._renderer.clearAll(),this._fullyCleared=!0,this._needsFullClear=!1),this._renderer.hasLayer("top")&&this._renderer.removeLayerFromDom("top"),void(this._renderer.hasLayer("bottom")&&this._renderer.removeLayerFromDom("bottom"));!A&&this._renderer.hasLayer("top")&&(this._renderer.clearAll("top"),this._renderer.removeLayerFromDom("top")),!s&&this._renderer.hasLayer("bottom")&&(this._renderer.clearAll("bottom"),this._renderer.removeLayerFromDom("bottom")),this._needsFullClear&&(this._renderer.clearAll(),this._fullyCleared=!0,this._needsFullClear=!1);const{start:o,end:a}=e,n=this._terminal._core.buffer,h=this._terminal._core.cols;this._renderer.clearLines(o,a);const g=[],d=[];for(let e=o;e<=a;++e){const A=n.lines.get(e+n.ydisp);if(!A)return;for(let s=0;s<h;++s)if(268435456&A.getBg(s)){let o=null!==(t=A._extendedAttrs[s])&&void 0!==t?t:r;const a=o.imageId;if(void 0===a||-1===a)continue;const n=this._images.get(a);if(-1!==o.tileId){const t=o.tileId,l=s;let I=1;for(;++s<h&&268435456&A.getBg(s)&&(o=null!==(i=A._extendedAttrs[s])&&void 0!==i?i:r)&&o.imageId===a&&o.tileId===t+I;)I++;s--,n?n.actual&&g.push({imgSpec:n,tileId:t,col:l,row:e,count:I}):this._opts.showPlaceholder&&d.push({col:l,row:e,count:I}),this._fullyCleared=!1}}}g.sort((e,t)=>e.imgSpec.zIndex-t.imgSpec.zIndex);for(const e of d)this._renderer.drawPlaceholder(e.col,e.row,e.count);for(const e of g)this._renderer.draw(e.imgSpec,e.tileId,e.col,e.row,e.count)}viewportResize(e){var t,i;if(!this._images.size)return void(this._viewportMetrics=e);if(this._viewportMetrics.cols>=e.cols)return void(this._viewportMetrics=e);const A=this._terminal._core.buffer,s=A.lines.length,o=this._viewportMetrics.cols-1;for(let a=0;a<s;++a){const s=A.lines.get(a);if(268435456&s.getBg(o)){const A=null!==(i=s._extendedAttrs[o])&&void 0!==i?i:r,a=A.imageId;if(void 0===a||-1===a)continue;const n=this._images.get(a);if(!n)continue;const h=Math.ceil(((null===(t=n.actual)||void 0===t?void 0:t.width)||0)/n.actualCellSize.width);if(A.tileId%h+1>=h)continue;let g=!1;for(let t=o+1;t>e.cols;++t)if(4194303&s._data[3*t+0]){g=!0;break}if(g)continue;const d=Math.min(e.cols,h-A.tileId%h+o);let l=A.tileId;for(let e=o+1;e<d;++e)this._writeToCell(s,e,a,++l),n.tileCount++}}this._viewportMetrics=e}getImageAtBufferCell(e,t){var i,s,o;const a=this._terminal._core.buffer.lines.get(t);if(a&&268435456&a.getBg(e)){const t=null!==(o=a._extendedAttrs[e])&&void 0!==o?o:r;if(t.imageId&&-1!==t.imageId){const e=null===(i=this._images.get(t.imageId))||void 0===i?void 0:i.orig;if(window.ImageBitmap&&e instanceof ImageBitmap){const t=A.ImageRenderer.createCanvas(window.document,e.width,e.height);return null===(s=t.getContext("2d"))||void 0===s||s.drawImage(e,0,0,e.width,e.height),t}return e}}}extractTileAtBufferCell(e,t){var i;const A=this._terminal._core.buffer.lines.get(t);if(A&&268435456&A.getBg(e)){const t=null!==(i=A._extendedAttrs[e])&&void 0!==i?i:r;if(t.imageId&&-1!==t.imageId&&-1!==t.tileId){const e=this._images.get(t.imageId);if(e)return this._renderer.extractTile(e,t.tileId)}}}_evictOldest(e){var t;const i=this._getStoredPixels();let A=i;for(;this._pixelLimit<A+e&&this._images.size;){const e=this._images.get(++this._lowestId);e&&e.orig&&(A-=e.orig.width*e.orig.height,e.actual&&e.orig!==e.actual&&(A-=e.actual.width*e.actual.height),null===(t=e.marker)||void 0===t||t.dispose(),this._delImg(this._lowestId))}return i-A}_writeToCell(e,t,i,A){if(268435456&e._data[3*t+2]){const r=e._extendedAttrs[t];if(r){if(void 0!==r.imageId){const e=this._images.get(r.imageId);return e&&e.tileCount--,r.imageId=i,void(r.tileId=A)}return void(e._extendedAttrs[t]=new s(r.ext,r.urlId,i,A))}}e._data[3*t+2]|=268435456,e._extendedAttrs[t]=new s(0,0,i,A)}_evictOnAlternate(){var e,t;for(const e of this._images.values())"alternate"===e.bufferType&&(e.tileCount=0);const i=this._terminal._core.buffer;for(let t=0;t<this._terminal.rows;++t){const A=i.lines.get(t);if(A)for(let t=0;t<this._terminal.cols;++t)if(268435456&A._data[3*t+2]){const i=null===(e=A._extendedAttrs[t])||void 0===e?void 0:e.imageId;if(i){const e=this._images.get(i);e&&e.tileCount++}}}const A=[];for(const[e,i]of this._images.entries())"alternate"!==i.bufferType||i.tileCount||(null===(t=i.marker)||void 0===t||t.dispose(),A.push(e));for(const e of A)this._delImg(e)}}},566(e,t,i){Object.defineProperty(t,"__esModule",{value:!0}),t.SixelHandler=void 0;const A=i(939),s=i(463),r=i(591),o=A.PALETTE_ANSI_256;function a(e){return A.BIG_ENDIAN?e:(255&e)<<24|(e>>>8&255)<<16|(e>>>16&255)<<8|e>>>24&255}o.set(A.PALETTE_VT340_COLOR),t.SixelHandler=class{constructor(e,t,i){this._opts=e,this._storage=t,this._coreTerminal=i,this._size=0,this._aborted=!1,(0,r.DecoderAsync)({memoryLimit:4*this._opts.pixelLimit,palette:o,paletteLimit:this._opts.sixelPaletteLimit}).then(e=>this._dec=e)}reset(){this._dec&&(this._dec.release(),this._dec._palette.fill(0),this._dec.init(0,o,this._opts.sixelPaletteLimit))}hook(e){var t;if(this._size=0,this._aborted=!1,this._dec){const i=1===e.params[1]?0:function(e,t){let i=0;if(!t)return i;if(e.isInverse())if(e.isFgDefault())i=a(t.foreground.rgba);else if(e.isFgRGB()){const t=e.constructor.toColorRGB(e.getFgColor());i=(0,A.toRGBA8888)(...t)}else i=a(t.ansi[e.getFgColor()].rgba);else if(e.isBgDefault())i=a(t.background.rgba);else if(e.isBgRGB()){const t=e.constructor.toColorRGB(e.getBgColor());i=(0,A.toRGBA8888)(...t)}else i=a(t.ansi[e.getBgColor()].rgba);return i}(this._coreTerminal._core._inputHandler._curAttrData,null===(t=this._coreTerminal._core._themeService)||void 0===t?void 0:t.colors);this._dec.init(i,null,this._opts.sixelPaletteLimit)}}put(e,t,i){if(!this._aborted&&this._dec){if(this._size+=i-t,this._size>this._opts.sixelSizeLimit)return console.warn("SIXEL: too much data, aborting"),this._aborted=!0,void this._dec.release();try{this._dec.decode(e,t,i)}catch(e){console.warn(`SIXEL: error while decoding image - ${e}`),this._aborted=!0,this._dec.release()}}}unhook(e){var t;if(this._aborted||!e||!this._dec)return!0;const i=this._dec.width,A=this._dec.height;if(!i||!A)return A&&this._storage.advanceCursor(A),!0;const r=s.ImageRenderer.createCanvas(void 0,i,A);return null===(t=r.getContext("2d"))||void 0===t||t.putImageData(new ImageData(this._dec.data8,i,A),0,0),this._dec.memoryUsage>4194304&&this._dec.release(),this._storage.addImage(r),!0}}},994(e,t,i){Object.defineProperty(t,"__esModule",{value:!0}),t.SixelImageStorage=void 0;const A=i(699);t.SixelImageStorage=class{constructor(e,t,i,A){this._storage=e,this._opts=t,this._renderer=i,this._terminal=A,this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"vt340"}}addImage(e){this._addImageOpts.scrolling=this._opts.sixelScrolling,this._storage.addImage(e,this._addImageOpts)}advanceCursor(e){if(this._opts.sixelScrolling){let t=this._renderer.cellSize;-1!==t.width&&-1!==t.height||(t=A.CELL_SIZE_DEFAULT);const i=Math.ceil(e/t.height);for(let e=1;e<i;++e)this._terminal._core._inputHandler.lineFeed()}}}},23(e,t,i){var A=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:!0}),t.KittyGraphicsHandler=void 0;const s=i(463),r=i(699),o=i(462),a=A(i(669)),n=i(470);t.KittyGraphicsHandler=class{constructor(e,t,i,A){this._opts=e,this._renderer=t,this._kittyStorage=i,this._coreTerminal=A,this._aborted=!1,this._generation=0,this._decodeError=!1,this._activeDecoder=null,this._inControlData=!0,this._controlData=new Uint32Array(512),this._controlLength=0,this._encodedSizeLimit=0,this._totalEncodedSize=0,this._parsedCommand=null,this._pendingTransmissions=new Map,this._maxEncodedBytes=Math.ceil(4*this._opts.kittySizeLimit/3),this._initialEncodedBytes=Math.min(4194304,this._maxEncodedBytes)}reset(){this._generation++,this._cleanupAllPending(),this._activeDecoder&&(this._activeDecoder.release(),this._activeDecoder=null),this._kittyStorage.reset()}dispose(){this.reset()}_removePendingEntry(e){this._pendingTransmissions.delete(e),this._lastPendingKey===e&&(this._lastPendingKey=void 0)}_cleanupAllPending(){for(const e of this._pendingTransmissions.values())e.decoder.release();this._pendingTransmissions.clear(),this._lastPendingKey=void 0}start(){this._aborted=!1,this._decodeError=!1,this._inControlData=!0,this._controlLength=0,this._parsedCommand=null,this._encodedSizeLimit=this._maxEncodedBytes,this._totalEncodedSize=0,this._activeDecoder=null}put(e,t,i){var A;if(!this._aborted)if(this._inControlData){let s=i;for(let A=t;A<i;A++)if(59===e[A]){this._inControlData=!1,s=A;break}const r=s-t;if(this._controlLength+r>512)return void(this._aborted=!0);if(this._controlData.set(e.subarray(t,s),this._controlLength),this._controlLength+=r,!this._inControlData){if(this._parsedCommand=(0,n.parseKittyCommand)(this._parseControlDataString()),void 0!==this._parsedCommand.id&&void 0!==this._parsedCommand.imageNumber)return this._sendResponse(this._parsedCommand.id,"EINVAL:cannot specify both i and I keys",null!==(A=this._parsedCommand.quiet)&&void 0!==A?A:0),void(this._aborted=!0);if("d"===this._parsedCommand.action)return;const t=s+1;t<i&&this._streamPayload(e,t,i)}}else this._streamPayload(e,t,i)}_streamPayload(e,t,i){var A,s,r,o,n,h,g,d;if(this._aborted)return;const l=null!==(o=null!==(r=null===(A=this._parsedCommand)||void 0===A?void 0:A.id)&&void 0!==r?r:this._lastPendingKey)&&void 0!==o?o:0,I=this._pendingTransmissions.get(l),c=null!==(n=null==I?void 0:I.totalEncodedSize)&&void 0!==n?n:0;if(this._totalEncodedSize+=i-t,c+this._totalEncodedSize>this._encodedSizeLimit){const e=null!==(h=this._activeDecoder)&&void 0!==h?h:null==I?void 0:I.decoder;return e&&e.release(),this._activeDecoder=null,I&&this._removePendingEntry(l),void(this._aborted=!0)}if(!this._decodeError){if((null==I?void 0:I.decoder)&&!this._activeDecoder&&(this._activeDecoder=I.decoder),!this._activeDecoder){const e=this._maxEncodedBytes+131072;if(e>1e6*this._opts.storageLimit)return this._aborted=!0,void(void 0!==(null===(s=this._parsedCommand)||void 0===s?void 0:s.id)&&this._sendResponse(this._parsedCommand.id,"ENOMEM:pending image budget exceeded",null!==(g=this._parsedCommand.quiet)&&void 0!==g?g:0));const t=Math.max(1,Math.floor(1e6*this._opts.storageLimit/e));for(;this._pendingTransmissions.size>=t;){const e=this._pendingTransmissions.entries().next().value;if(!e)break;e[1].decoder.release(),this._removePendingEntry(e[0]),void 0!==e[1].cmd.id&&this._sendResponse(e[1].cmd.id,"ENOMEM:pending image budget exceeded",null!==(d=e[1].cmd.quiet)&&void 0!==d?d:0)}this._activeDecoder=new a.default(4194304,this._maxEncodedBytes,this._initialEncodedBytes),this._activeDecoder.init()}0!==this._activeDecoder.put(e.subarray(t,i))&&(this._activeDecoder.release(),this._activeDecoder=null,this._decodeError=!0,I&&this._removePendingEntry(l))}}end(e){var t,i;if(this._aborted||!e)return this._activeDecoder&&(this._activeDecoder.release(),this._activeDecoder=null),!0;if(this._inControlData)return this._handleNoPayloadCommand();const A=this._parsedCommand;if("d"===A.action)return this._handleDelete(A);const s=null!==(i=null!==(t=A.id)&&void 0!==t?t:this._lastPendingKey)&&void 0!==i?i:0,r=1===A.more,o=this._pendingTransmissions.get(s);if(r)return this._activeDecoder&&(o?(o.totalEncodedSize+=this._totalEncodedSize,o.decodeError=o.decodeError||this._decodeError):this._pendingTransmissions.set(s,{cmd:Object.assign({},A),decoder:this._activeDecoder,totalEncodedSize:this._totalEncodedSize,decodeError:this._decodeError}),this._lastPendingKey=s,this._activeDecoder=null),!0;o&&(this._lastPendingKey=void 0);let a=this._decodeError,n=A,h=this._activeDecoder;o&&(n=o.cmd,h=o.decoder,a=a||o.decodeError,this._pendingTransmissions.delete(s));let g=new Uint8Array(0);h&&(0!==h.end()&&(a=!0),g=h.data8),this._activeDecoder=null;const d=this._handleCommandWithBytesAndCmd(n,g,a);return h&&h.release(),d}_parseControlDataString(){let e="";for(let t=0;t<this._controlLength;t++)e+=String.fromCodePoint(this._controlData[t]);return e}_handleNoPayloadCommand(){var e,t,i,A,s;const r=(0,n.parseKittyCommand)(this._parseControlDataString());if(void 0!==r.id&&void 0!==r.imageNumber)return this._sendResponse(r.id,"EINVAL:cannot specify both i and I keys",null!==(e=r.quiet)&&void 0!==e?e:0),!0;switch(null!==(t=r.action)&&void 0!==t?t:"t"){case"d":return this._handleDelete(r);case"q":return this._sendResponse(null!==(i=r.id)&&void 0!==i?i:0,"OK",null!==(A=r.quiet)&&void 0!==A?A:0),!0;case"p":return this._handlePlacement(r);default:return void 0!==r.id&&this._sendResponse(r.id,"EINVAL:unsupported action",null!==(s=r.quiet)&&void 0!==s?s:0),!0}}_handleCommandWithBytesAndCmd(e,t,i){var A,s,r,o,a;switch(null!==(A=e.action)&&void 0!==A?A:"t"){case"t":{const A=this._handleTransmit(e,t,i);return"d"===(null!==(s=e.transmission)&&void 0!==s?s:"d")&&void 0!==e.id&&(i?this._sendResponse(e.id,"EINVAL:invalid base64 data",null!==(r=e.quiet)&&void 0!==r?r:0):t.length>0&&this._sendResponse(e.id,"OK",null!==(o=e.quiet)&&void 0!==o?o:0)),A}case"T":return this._handleTransmitDisplay(e,t,i);case"q":return this._handleQuery(e,t,i);case"p":return this._handlePlacement(e);default:return void 0!==e.id&&this._sendResponse(e.id,"EINVAL:unsupported action",null!==(a=e.quiet)&&void 0!==a?a:0),!0}}_handlePlacement(e){var t;if(void 0===e.id)return!0;const i=e.id,A=this._kittyStorage.getImage(i);return A?this._displayImage(A,e).then(t=>{var A;return this._sendResponse(i,t?"OK":"EINVAL:image rendering failed",null!==(A=e.quiet)&&void 0!==A?A:0,e.placementId),!0}):(this._sendResponse(i,"ENOENT:image not found",null!==(t=e.quiet)&&void 0!==t?t:0,e.placementId),!0)}_handleTransmit(e,t,i){var A,s,r,o,a,n;return"d"!==(null!==(A=e.transmission)&&void 0!==A?A:"d")?(void 0!==e.id&&this._sendResponse(e.id,"EINVAL:unsupported transmission medium",null!==(s=e.quiet)&&void 0!==s?s:0),!0):(i||0===t.length||this._kittyStorage.storeImage(e.id,{data:new Blob([t]),width:null!==(r=e.width)&&void 0!==r?r:0,height:null!==(o=e.height)&&void 0!==o?o:0,format:null!==(a=e.format)&&void 0!==a?a:32,compression:null!==(n=e.compression)&&void 0!==n?n:""}),!0)}_handleTransmitDisplay(e,t,i){var A,s;if(i)return void 0!==e.id&&this._sendResponse(e.id,"EINVAL:invalid base64 data",null!==(A=e.quiet)&&void 0!==A?A:0),!0;this._handleTransmit(e,t,i);const r=null!==(s=e.id)&&void 0!==s?s:this._kittyStorage.lastImageId,o=this._kittyStorage.getImage(r);if(o){const t=this._displayImage(o,e);return void 0!==e.id?t.then(t=>{var i;return this._sendResponse(r,t?"OK":"EINVAL:image rendering failed",null!==(i=e.quiet)&&void 0!==i?i:0),!0}):t.then(()=>!0)}return!0}_handleQuery(e,t,i){var A,s,r,o,a,n;const h=null!==(A=e.id)&&void 0!==A?A:0,g=null!==(s=e.quiet)&&void 0!==s?s:0;if("d"!==(null!==(r=e.transmission)&&void 0!==r?r:"d"))return this._sendResponse(h,"EINVAL:unsupported transmission medium",g),!0;if(i)return this._sendResponse(h,"EINVAL:invalid base64 data",g),!0;if(0===t.length)return this._sendResponse(h,"OK",g),!0;const d=null!==(o=e.format)&&void 0!==o?o:32;if(100===d)this._sendResponse(h,"OK",g);else{const i=null!==(a=e.width)&&void 0!==a?a:0,A=null!==(n=e.height)&&void 0!==n?n:0;if(!i||!A)return this._sendResponse(h,"EINVAL:width and height required for raw pixel data",g),!0;const s=i*A*(32===d?4:3);if(t.length<s)return this._sendResponse(h,"EINVAL:insufficient pixel data",g),!0;this._sendResponse(h,"OK",g)}return!0}_handleDelete(e){var t;switch(null!==(t=e.deleteSelector)&&void 0!==t?t:"a"){case"a":case"A":this._cleanupAllPending(),this._kittyStorage.deleteAll();break;case"i":case"I":if(void 0!==e.id){const t=this._pendingTransmissions.get(e.id);t&&t.decoder.release(),this._removePendingEntry(e.id),this._kittyStorage.deleteById(e.id)}}return!0}_sendResponse(e,t,i,A){const s="OK"===t;if(s&&i>=1)return;if(!s&&i>=2)return;const r=`_Gi=${e}${A?`,p=${A}`:""};${t}\\`;this._coreTerminal._core.coreService.triggerDataEvent(r)}_displayImage(e,t){return this._decodeAndDisplay(e,t).then(()=>!0).catch(()=>!1)}async _decodeAndDisplay(e,t){var i,A,o,a,n,h,g;const d=this._generation;let l=await this._createBitmap(e);try{if(d!==this._generation)throw new Error("image decode canceled");const I=Math.max(0,null!==(o=t.x)&&void 0!==o?o:0),c=Math.max(0,null!==(a=t.y)&&void 0!==a?a:0),_=t.sourceWidth||l.width-I,C=t.sourceHeight||l.height-c,B=Math.max(0,l.width-I),Q=Math.max(0,l.height-c),m=Math.max(0,Math.min(_,B)),E=Math.max(0,Math.min(C,Q));if(0===m||0===E)throw new Error("invalid source rectangle");if(0!==I||0!==c||m!==l.width||E!==l.height){const e=await createImageBitmap(l,I,c,m,E);l.close(),l=e}const u=(null===(i=this._renderer.dimensions)||void 0===i?void 0:i.css.cell.width)||r.CELL_SIZE_DEFAULT.width,p=(null===(A=this._renderer.dimensions)||void 0===A?void 0:A.css.cell.height)||r.CELL_SIZE_DEFAULT.height;let w,f;void 0!==t.columns&&void 0!==t.rows?(w=t.columns,f=t.rows):void 0!==t.columns?(w=t.columns,f=Math.max(1,Math.ceil(l.height/l.width*(w*u)/p))):void 0!==t.rows?(f=t.rows,w=Math.max(1,Math.ceil(l.width/l.height*(f*p)/u))):(w=Math.ceil(l.width/u),f=Math.ceil(l.height/p));let D=l.width,y=l.height;if(void 0===t.columns&&void 0===t.rows||(D=Math.round(w*u),y=Math.round(f*p)),D*y>this._opts.pixelLimit)throw new Error("image exceeds pixel limit");const v=this._coreTerminal._core.buffer,k=v.x,M=v.y,b=v.ybase,S=void 0!==t.zIndex&&t.zIndex<0?"bottom":"top";if(D!==l.width||y!==l.height){const e=await createImageBitmap(l,{resizeWidth:D,resizeHeight:y});l.close(),l=e}const L=Math.min(Math.max(0,null!==(n=t.xOffset)&&void 0!==n?n:0),u-1),N=Math.min(Math.max(0,null!==(h=t.yOffset)&&void 0!==h?h:0),p-1);if(0!==L||0!==N){const e=void 0!==t.columns?Math.round(w*u):l.width+L,i=void 0!==t.rows?Math.round(f*p):l.height+N,A=s.ImageRenderer.createCanvas(window.document,e,i),r=A.getContext("2d");if(!r)throw new Error("Failed to create offset canvas context");r.drawImage(l,L,N);const o=await createImageBitmap(A);if(A.width=A.height=0,l.close(),l=o,D=l.width,y=l.height,D*y>this._opts.pixelLimit)throw new Error("image exceeds pixel limit");void 0===t.columns&&(w=Math.ceil(l.width/u)),void 0===t.rows&&(f=Math.ceil(l.height/p))}if(d!==this._generation)throw new Error("image decode canceled");const G=null!==(g=t.zIndex)&&void 0!==g?g:0;if(this._kittyStorage.addImage(e.id,l,!0,S,G),l=void 0,1===t.cursorMovement){const e=v.ybase-b;v.x=k,v.y=Math.max(M-e,0)}else v.x=Math.min(k+w,this._coreTerminal.cols)}catch(e){throw null==l||l.close(),e}}async _createBitmap(e){let t=new Uint8Array(await e.data.arrayBuffer());if("z"===e.compression&&(t=await this._decompressZlib(t)),100===e.format){const e=(0,o.imageType)(t);if("image/png"!==e.mime||!(e.width>0)||!(e.height>0)||e.width*e.height>this._opts.pixelLimit)throw new RangeError("PNG exceeds pixel limit or has invalid dimensions");const i=new Blob([t],{type:"image/png"});if(!window.createImageBitmap){const e=URL.createObjectURL(i),t=new Image;return new Promise((i,A)=>{t.addEventListener("load",()=>{var r;URL.revokeObjectURL(e);const o=s.ImageRenderer.createCanvas(window.document,t.width,t.height);null===(r=o.getContext("2d"))||void 0===r||r.drawImage(t,0,0),createImageBitmap(o).then(i).catch(A)}),t.addEventListener("error",()=>{URL.revokeObjectURL(e),A(new Error("Failed to load image"))}),t.src=e})}return createImageBitmap(i)}const i=e.width,A=e.height;if(!i||!A)throw new Error("Width and height required for raw pixel data");const r=i*A*(32===e.format?4:3);if(t.length<r)throw new Error("Insufficient pixel data");const a=i*A;if(32===e.format)return createImageBitmap(new ImageData(new Uint8ClampedArray(t.buffer,t.byteOffset,4*a),i,A));const n=new Uint8ClampedArray(4*a),h=new Uint32Array(t.buffer,t.byteOffset,Math.floor(t.byteLength/4)),g=new Uint32Array(n.buffer),d=-4&a;let l=0,I=0;for(let e=0;e<d;e+=4){const e=h[l++],t=h[l++],i=h[l++];g[I++]=4278190080|e,g[I++]=4278190080|e>>>24|t<<8,g[I++]=4278190080|t>>>16|i<<16,g[I++]=4278190080|i>>>8}let c=3*d,_=4*d;for(let e=d;e<a;e++)n[_]=t[c],n[_+1]=t[c+1],n[_+2]=t[c+2],n[_+3]=255,c+=3,_+=4;return createImageBitmap(new ImageData(n,i,A))}async _decompressZlib(e){try{return await this._decompress(e,"deflate")}catch(t){if(t instanceof RangeError)throw t;return await this._decompress(e,"deflate-raw")}}async _decompress(e,t){const i=Math.min(this._opts.kittySizeLimit,4*this._opts.pixelLimit,1e6*this._opts.storageLimit);let A=0;const s=new ReadableStream({pull(t){if(A>=e.length)return void t.close();const i=Math.min(A+4096,e.length);t.enqueue(new Uint8Array(e.subarray(A,i))),A=i}}).pipeThrough(new DecompressionStream(t)).getReader(),r=[];let o=0;try{for(;;){const{done:e,value:t}=await s.read();if(e)break;if(o+=t.byteLength,o>i)throw await s.cancel().catch(()=>{}),new RangeError("decompressed image exceeds byte limit");r.push(t)}}finally{s.releaseLock()}const a=new Uint8Array(o);let n=0;for(const e of r)a.set(e,n),n+=e.length;return a}get images(){return this._kittyStorage.images}get _kittyIdToStorageId(){return this._kittyStorage.kittyIdToStorageId}get pendingTransmissions(){return this._pendingTransmissions}}},470(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.parseKittyCommand=function(e){const t={},i=e.split(",");for(const e of i){const i=e.indexOf("=");if(-1===i)continue;const A=e.substring(0,i),s=e.substring(i+1);if("a"===A){t.action=s;continue}if("o"===A){t.compression=s;continue}if("t"===A){t.transmission=s;continue}if("d"===A){t.deleteSelector=s;continue}const r=parseInt(s,10);switch(A){case"f":t.format=r;break;case"i":t.id=r;break;case"I":t.imageNumber=r;break;case"s":t.width=r;break;case"v":t.height=r;break;case"x":t.x=r;break;case"y":t.y=r;break;case"w":t.sourceWidth=r;break;case"h":t.sourceHeight=r;break;case"X":t.xOffset=r;break;case"Y":t.yOffset=r;break;case"c":t.columns=r;break;case"r":t.rows=r;break;case"m":t.more=r;break;case"q":t.quiet=r;break;case"C":t.cursorMovement=r;break;case"z":t.zIndex=r;break;case"p":t.placementId=r}}return t}},235(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.KittyImageStorage=void 0;class i{constructor(e){this._storage=e,this._nextImageId=1,this._images=new Map,this._kittyIdToStorageId=new Map,this._storageIdToKittyId=new Map,this._handleStorageImageDeleted=e=>{const t=this._storageIdToKittyId.get(e);void 0!==t&&(this._kittyIdToStorageId.delete(t),this._storageIdToKittyId.delete(e),this._images.delete(t))},this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"iip"},this._previousOnImageDeleted=this._storage.onImageDeleted,this._wrappedOnImageDeleted=e=>{var t;null===(t=this._previousOnImageDeleted)||void 0===t||t.call(this,e),this._handleStorageImageDeleted(e)},this._storage.onImageDeleted=this._wrappedOnImageDeleted}reset(){this._nextImageId=1,this._images.clear(),this._kittyIdToStorageId.clear(),this._storageIdToKittyId.clear()}dispose(){this.reset(),this._storage.onImageDeleted===this._wrappedOnImageDeleted&&(this._storage.onImageDeleted=this._previousOnImageDeleted)}storeImage(e,t){const A=null!=e?e:this._nextImageId++,s=this._kittyIdToStorageId.get(A);void 0!==s&&(this._storage.deleteImage(s),this._kittyIdToStorageId.delete(A),this._storageIdToKittyId.delete(s)),!this._images.has(A)&&this._images.size>=i._maxStoredImages&&this._evictUndisplayedImages();const r=1e6*this._storage.getLimit();this._images.delete(A);let o=0;for(const e of this._images.values())o+=e.data.size;for(const e of[!1,!0])for(const[i,A]of this._images){if(o+t.data.size<=r)break;this._kittyIdToStorageId.has(i)===e&&(o-=A.data.size,this.deleteById(i))}return this._images.set(A,Object.assign(Object.assign({},t),{id:A})),A}addImage(e,t,i,A,s){const r=this._kittyIdToStorageId.get(e);void 0!==r&&this._storageIdToKittyId.delete(r),this._addImageOpts.scrolling=i,this._addImageOpts.layer=A,this._addImageOpts.zIndex=s;const o=this._storage.addImage(t,this._addImageOpts);this._kittyIdToStorageId.set(e,o),this._storageIdToKittyId.set(o,e)}getImage(e){return this._images.get(e)}deleteById(e){this._images.delete(e);const t=this._kittyIdToStorageId.get(e);void 0!==t&&(this._storage.deleteImage(t),this._kittyIdToStorageId.delete(e),this._storageIdToKittyId.delete(t))}deleteAll(){this._images.clear();for(const e of this._kittyIdToStorageId.values())this._storage.deleteImage(e);this._kittyIdToStorageId.clear(),this._storageIdToKittyId.clear()}get images(){return this._images}get kittyIdToStorageId(){return this._kittyIdToStorageId}get lastImageId(){return this._nextImageId-1}_evictUndisplayedImages(){for(const[e]of this._images){if(this._images.size<=i._maxStoredImages/2)break;this._kittyIdToStorageId.has(e)||this._images.delete(e)}}}t.KittyImageStorage=i,i._maxStoredImages=256},669(e,t,i){Object.defineProperty(t,"__esModule",{value:!0});const A=(0,i(552).InWasm)({s:1,t:0,d:"AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML"}),s=new Uint8Array("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("").map(e=>e.charCodeAt(0))),r=new Uint32Array(1024);r.fill(4278190080);for(let e=0;e<s.length;++e)r[s[e]]=e<<2;for(let e=0;e<s.length;++e)r[256+s[e]]=e>>4|(e<<4&255)<<8;for(let e=0;e<s.length;++e)r[512+s[e]]=e>>2<<8|(e<<6&255)<<16;for(let e=0;e<s.length;++e)r[768+s[e]]=e<<16;const o=new Uint8Array(0);t.default=class{constructor(e,t,i){if(this._inst=null,this._ended=!0,this._bytes=0,this.keepSize=null!=e?e:1048576,this.maxBytes=null!=t?t:4294901760,this._bytes=null!=i?i:32768,this._bytes>this.maxBytes||this.maxBytes>4294901760)throw new Error("invalid byte settings")}get data8(){return this._inst?this._d.subarray(0,this._m32[1282]):o}release(){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))}init(e,t){if(this.maxBytes=null!=e?e:this.maxBytes,this._bytes=null!=t?t:Math.min(this._bytes,this.maxBytes),this._bytes>this.maxBytes||this.maxBytes>4294901760)throw Error("invalid byte settings");let i=this._m32;const s=this._bytes+5152;this._inst?this._mem.buffer.byteLength<s&&(this._mem.grow(Math.ceil((s-this._mem.buffer.byteLength)/65536)),i=new Uint32Array(this._mem.buffer,0),this._d=new Uint8Array(this._mem.buffer,5152)):(this._mem=new WebAssembly.Memory({initial:Math.ceil(s/65536)}),this._inst=A({env:{memory:this._mem}}),i=new Uint32Array(this._mem.buffer,0),i.set(r,256),this._d=new Uint8Array(this._mem.buffer,5152)),i[1280]=0,i[1281]=0,i[1282]=0,this._m32=i,this._ended=!1}_realloc(e){const t=this._m32[1280]+e;if(this._bytes<t){if(t>this.maxBytes)return-3;let e=this._bytes;for(;(e*=2)<t;);if(e=Math.min(e,this.maxBytes),e<t)return-3;if(e+5152>this._mem.buffer.byteLength){const t=Math.ceil((e+5152-this._mem.buffer.byteLength)/65536);this._mem.grow(t),this._m32=new Uint32Array(this._mem.buffer,0),this._d=new Uint8Array(this._mem.buffer,5152)}this._bytes=e}return 0}put(e){if(!this._inst||this._ended)return-2;if(this._realloc(e.length))return-3;const t=this._m32;return this._d.set(e,t[1280]),t[1280]+=e.length,t[1280]-t[1281]>=131072?this._inst.exports.dec():0}end(){return this._ended=!0,this._inst?this._inst.exports.end():-2}get loadedBytes(){return this._inst?this._m32[1280]:0}get freeBytes(){return this._inst?this.maxBytes-this._m32[1280]:0}}},61(e,t,i){Object.defineProperty(t,"__esModule",{value:!0});const A=(0,i(552).InWasm)({s:1,t:0,d:"AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw=="});t.default=class{constructor(e){this.keepSize=e,this.width=0,this.height=0}decode(e){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];const t=this.width*this.height,i=4*t,s=e.length,r=Math.max(i,s)+(Math.min(i,s)>>1)+4096;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=A({env:{memory:this._mem}})),this._d||(this._d=new Uint8Array(this._mem.buffer));const o=this._mem.buffer.byteLength-s&-256;return this._d.set(e,o),this._inst.exports.dec(o,s,t),this._d.subarray(1024,1024+i)}release(){this._inst&&this._mem.buffer.byteLength>this.keepSize&&(this._inst=this._d=this._mem=null)}}},552(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.InWasm=function(e){if(e.d){const{t,s:A,d:s}=e;let r,o;const a=WebAssembly;return 0===t?A?e=>new a.Instance(o||(o=new a.Module(r||(r=i(s)))),e):e=>o?a.instantiate(o,e):a.instantiate(r||(r=i(s)),e).then(e=>(o=e.module)&&e.instance):1===t?A?()=>o||(o=new a.Module(r||(r=i(s)))):()=>o?Promise.resolve(o):a.compile(r||(r=i(s))).then(e=>o=e):A?()=>r||(r=i(s)):()=>Promise.resolve(r||(r=i(s)))}if("undefined"==typeof _wasmCtx)throw new Error('must run "inwasm"');_wasmCtx.add(e)};let i=e=>{if(Uint8Array.fromBase64)return Uint8Array.fromBase64(e);if("undefined"!=typeof Buffer)return Buffer.from(e,"base64");const t=atob(e),i=new Uint8Array(t.length);for(let e=0;e<i.length;++e)i[e]=t.charCodeAt(e);return i}}},t={};function i(A){var s=t[A];if(void 0!==s)return s.exports;var r=t[A]={exports:{}};return e[A].call(r.exports,r,r.exports,i),r.exports}var A={};return(()=>{var e=A;Object.defineProperty(e,"__esModule",{value:!0}),e.ImageAddon=void 0;const t=i(414),s=i(795),r=i(463),o=i(699),a=i(23),n=i(235),h=i(566),g=i(994),d=i(649),l={enableSizeReports:!0,pixelLimit:16777216,sixelSupport:!0,sixelScrolling:!0,sixelPaletteLimit:4096,sixelSizeLimit:33554432,storageLimit:128,showPlaceholder:!0,iipSupport:!0,iipSizeLimit:33554432,kittySupport:!0,kittySizeLimit:33554432};e.ImageAddon=class{constructor(e){this._disposables=[],this._handlers=new Map,this._onImageAdded=new t.Emitter,this.onImageAdded=this._onImageAdded.event,this._opts=Object.assign({},l,e),this._defaultOpts=Object.assign({},l,e)}dispose(){for(const e of this._handlers.values())e.reset();for(const e of this._disposables)e.dispose();this._disposables.length=0,this._handlers.clear(),this._onImageAdded.dispose()}_disposeLater(...e){for(const t of e)this._disposables.push(t)}activate(e){var t;if(this._terminal=e,this._renderer=new r.ImageRenderer(e),this._storage=new o.ImageStorage(e,this._renderer,this._opts),this._storage.onImageAdded=()=>this._onImageAdded.fire(),this._opts.enableSizeReports){const i=null!==(t=e.options.windowOptions)&&void 0!==t?t:{};i.getWinSizePixels=!0,i.getCellSizePixels=!0,i.getWinSizeChars=!0,e.options.windowOptions=i}if(this._disposeLater(this._renderer,this._storage,e.parser.registerCsiHandler({prefix:"?",final:"h"},e=>this._decset(e)),e.parser.registerCsiHandler({prefix:"?",final:"l"},e=>this._decrst(e)),e.parser.registerCsiHandler({final:"c"},e=>this._da1(e)),e.parser.registerCsiHandler({prefix:"?",final:"S"},e=>this._xtermGraphicsAttributes(e)),e.onRender(e=>{var t;return null===(t=this._storage)||void 0===t?void 0:t.render(e)}),e.parser.registerCsiHandler({intermediates:"!",final:"p"},()=>this.reset()),e.parser.registerEscHandler({final:"c"},()=>this.reset()),e._core._inputHandler.onRequestReset(()=>this.reset()),e.buffer.onBufferChange(()=>{var e;return null===(e=this._storage)||void 0===e?void 0:e.wipeAlternate()}),e.onResize(e=>{var t;return null===(t=this._storage)||void 0===t?void 0:t.viewportResize(e)})),this._opts.sixelSupport){const t=new g.SixelImageStorage(this._storage,this._opts,this._renderer,e),i=new h.SixelHandler(this._opts,t,e);this._handlers.set("sixel",i),this._disposeLater(e._core._inputHandler._parser.registerDcsHandler({final:"q"},i))}if(this._opts.iipSupport){const t=new d.IIPImageStorage(this._storage),i=new s.IIPHandler(this._opts,this._renderer,t,e);this._handlers.set("iip",i),this._disposeLater(e._core._inputHandler._parser.registerOscHandler(1337,i))}if(this._opts.kittySupport){const t=new n.KittyImageStorage(this._storage),i=new a.KittyGraphicsHandler(this._opts,this._renderer,t,e);this._handlers.set("kitty",i),this._disposeLater(t,i,e._core._inputHandler._parser.registerApcHandler({final:"G"},i))}}reset(){var e;this._opts.sixelScrolling=this._defaultOpts.sixelScrolling,this._opts.sixelPaletteLimit=this._defaultOpts.sixelPaletteLimit,null===(e=this._storage)||void 0===e||e.reset();for(const e of this._handlers.values())e.reset();return!1}get storageLimit(){var e;return(null===(e=this._storage)||void 0===e?void 0:e.getLimit())||-1}set storageLimit(e){var t;null===(t=this._storage)||void 0===t||t.setLimit(e),this._opts.storageLimit=e}get storageUsage(){return this._storage?this._storage.getUsage():-1}get showPlaceholder(){return this._opts.showPlaceholder}set showPlaceholder(e){var t;this._opts.showPlaceholder=e,null===(t=this._renderer)||void 0===t||t.showPlaceholder(e)}getImageAtBufferCell(e,t){var i;return null===(i=this._storage)||void 0===i?void 0:i.getImageAtBufferCell(e,t)}extractTileAtBufferCell(e,t){var i;return null===(i=this._storage)||void 0===i?void 0:i.extractTileAtBufferCell(e,t)}_report(e){var t;null===(t=this._terminal)||void 0===t||t._core.input(e,!1)}_decset(e){for(let t=0;t<e.length;++t)80===e[t]&&(this._opts.sixelScrolling=!1);return!1}_decrst(e){for(let t=0;t<e.length;++t)80===e[t]&&(this._opts.sixelScrolling=!0);return!1}_da1(e){return!!e[0]||!!this._opts.sixelSupport&&(this._report("[?62;4;9;22c"),!0)}_xtermGraphicsAttributes(e){var t,i,A,s,r,a;if(e.length<2)return!0;if(1===e[0])switch(e[1]){case 1:return this._report(`[?${e[0]};0;${this._opts.sixelPaletteLimit}S`),!0;case 2:this._opts.sixelPaletteLimit=this._defaultOpts.sixelPaletteLimit,this._report(`[?${e[0]};0;${this._opts.sixelPaletteLimit}S`);for(const e of this._handlers.values())e.reset();return!0;case 3:return e.length>2&&!(e[2]instanceof Array)&&e[2]<=4096?(this._opts.sixelPaletteLimit=e[2],this._report(`[?${e[0]};0;${this._opts.sixelPaletteLimit}S`)):this._report(`[?${e[0]};2S`),!0;case 4:return this._report(`[?${e[0]};0;4096S`),!0;default:return this._report(`[?${e[0]};2S`),!0}if(2===e[0])switch(e[1]){case 1:let n=null===(i=null===(t=this._renderer)||void 0===t?void 0:t.dimensions)||void 0===i?void 0:i.css.canvas.width,h=null===(s=null===(A=this._renderer)||void 0===A?void 0:A.dimensions)||void 0===s?void 0:s.css.canvas.height;if(!n||!h){const e=o.CELL_SIZE_DEFAULT;n=((null===(r=this._terminal)||void 0===r?void 0:r.cols)||80)*e.width,h=((null===(a=this._terminal)||void 0===a?void 0:a.rows)||24)*e.height}if(n*h<this._opts.pixelLimit)this._report(`[?${e[0]};0;${n.toFixed(0)};${h.toFixed(0)}S`);else{const t=Math.floor(Math.sqrt(this._opts.pixelLimit));this._report(`[?${e[0]};0;${t};${t}S`)}return!0;case 4:const g=Math.floor(Math.sqrt(this._opts.pixelLimit));return this._report(`[?${e[0]};0;${g};${g}S`),!0;default:return this._report(`[?${e[0]};2S`),!0}return this._report(`[?${e[0]};1S`),!0}}})(),A})());
++!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.ImageAddon=t():e.ImageAddon=t()}(globalThis,()=>(()=>{"use strict";var e={939(e,t){function i(e){return 255&e}function A(e){return e>>>8&255}function s(e){return e>>>16&255}function r(e,t,i,A=255){return((255&A)<<24|(255&i)<<16|(255&t)<<8|255&e)>>>0}function o(e,t,i){return Math.max(e,Math.min(i,t))}function a(e,t,i){return i<0&&(i+=1),i>1&&(i-=1),6*i<1?t+6*(e-t)*i:2*i<1?e:3*i<2?t+(e-t)*(4-6*i):t}function n(e,t,i){return(4278190080|Math.round(i/100*255)<<16|Math.round(t/100*255)<<8|Math.round(e/100*255))>>>0}Object.defineProperty(t,"__esModule",{value:!0}),t.DEFAULT_FOREGROUND=t.DEFAULT_BACKGROUND=t.PALETTE_ANSI_256=t.PALETTE_VT340_GREY=t.PALETTE_VT340_COLOR=t.normalizeHLS=t.normalizeRGB=t.nearestColorIndex=t.fromRGBA8888=t.toRGBA8888=t.alpha=t.blue=t.green=t.red=t.BIG_ENDIAN=void 0,t.BIG_ENDIAN=255===new Uint8Array(new Uint32Array([4278190080]).buffer)[0],t.BIG_ENDIAN&&console.warn("BE platform detected. This version of node-sixel works only on LE properly."),t.red=i,t.green=A,t.blue=s,t.alpha=function(e){return e>>>24&255},t.toRGBA8888=r,t.fromRGBA8888=function(e){return[255&e,e>>8&255,e>>16&255,e>>>24]},t.nearestColorIndex=function(e,t){const r=i(e),o=A(e),a=s(e);let n=Number.MAX_SAFE_INTEGER,h=-1;for(let e=0;e<t.length;++e){const i=r-t[e][0],A=o-t[e][1],s=a-t[e][2],g=i*i+A*A+s*s;if(!g)return e;g<n&&(n=g,h=e)}return h},t.normalizeRGB=n,t.normalizeHLS=function(e,t,i){return function(e,t,i){if(!i){const e=Math.round(255*t);return r(e,e,e)}const A=t<.5?t*(1+i):t+i-t*i,s=2*t-A;return r(o(0,255,Math.round(255*a(A,s,e+1/3))),o(0,255,Math.round(255*a(A,s,e))),o(0,255,Math.round(255*a(A,s,e-1/3))))}((e+240)/360,t/100,i/100)},t.PALETTE_VT340_COLOR=new Uint32Array([n(0,0,0),n(20,20,80),n(80,13,13),n(20,80,20),n(80,20,80),n(20,80,80),n(80,80,20),n(53,53,53),n(26,26,26),n(33,33,60),n(60,26,26),n(33,60,33),n(60,33,60),n(33,60,60),n(60,60,33),n(80,80,80)]),t.PALETTE_VT340_GREY=new Uint32Array([n(0,0,0),n(13,13,13),n(26,26,26),n(40,40,40),n(6,6,6),n(20,20,20),n(33,33,33),n(46,46,46),n(0,0,0),n(13,13,13),n(26,26,26),n(40,40,40),n(6,6,6),n(20,20,20),n(33,33,33),n(46,46,46)]),t.PALETTE_ANSI_256=(()=>{const e=[r(0,0,0),r(205,0,0),r(0,205,0),r(205,205,0),r(0,0,238),r(205,0,205),r(0,250,205),r(229,229,229),r(127,127,127),r(255,0,0),r(0,255,0),r(255,255,0),r(92,92,255),r(255,0,255),r(0,255,255),r(255,255,255)],t=[0,95,135,175,215,255];for(let i=0;i<6;++i)for(let A=0;A<6;++A)for(let s=0;s<6;++s)e.push(r(t[i],t[A],t[s]));for(let t=8;t<=238;t+=10)e.push(r(t,t,t));return new Uint32Array(e)})(),t.DEFAULT_BACKGROUND=r(0,0,0,255),t.DEFAULT_FOREGROUND=r(255,255,255,255)},591(e,t,i){Object.defineProperty(t,"__esModule",{value:!0}),t.decodeAsync=t.decode=t.Decoder=t.DecoderAsync=void 0;const A=i(939),s=i(199),r=function(e){if("undefined"!=typeof Buffer)return Buffer.from(e,"base64");const t=atob(e),i=new Uint8Array(t.length);for(let e=0;e<i.length;++e)i[e]=t.charCodeAt(e);return i}(s.LIMITS.BYTES);let o;const a=new Uint32Array;class n{constructor(){this.bandHandler=e=>1,this.modeHandler=e=>1}handle_band(e){return this.bandHandler(e)}mode_parsed(e){return this.modeHandler(e)}}const h={memoryLimit:134217728,sixelColor:A.DEFAULT_FOREGROUND,fillColor:A.DEFAULT_BACKGROUND,palette:A.PALETTE_VT340_COLOR,paletteLimit:s.LIMITS.PALETTE_SIZE,truncate:!0};function g(e){const t=new n,i={env:{handle_band:t.handle_band.bind(t),mode_parsed:t.mode_parsed.bind(t)}};return WebAssembly.instantiate(o||r,i).then(i=>(o=o||i.module,new d(e,i.instance||i,t)))}t.DecoderAsync=g;class d{constructor(e,t,i){if(this._PIXEL_OFFSET=s.LIMITS.MAX_WIDTH+4,this._canvas=a,this._bandWidths=[],this._maxWidth=0,this._minWidth=s.LIMITS.MAX_WIDTH,this._lastOffset=0,this._currentHeight=0,this._opts=Object.assign({},h,e),this._opts.paletteLimit>s.LIMITS.PALETTE_SIZE)throw new Error(`DecoderOptions.paletteLimit must not exceed ${s.LIMITS.PALETTE_SIZE}`);if(t)i.bandHandler=this._handle_band.bind(this),i.modeHandler=this._initCanvas.bind(this);else{const e=o||(o=new WebAssembly.Module(r));t=new WebAssembly.Instance(e,{env:{handle_band:this._handle_band.bind(this),mode_parsed:this._initCanvas.bind(this)}})}this._instance=t,this._wasm=this._instance.exports,this._chunk=new Uint8Array(this._wasm.memory.buffer,this._wasm.get_chunk_address(),s.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(),s.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(A.DEFAULT_FOREGROUND,0,this._opts.paletteLimit,0)}get _fillColor(){return this._states[0]}get _truncate(){return this._states[8]}get _rasterWidth(){return this._states[6]}get _rasterHeight(){return this._states[7]}get _width(){return this._states[2]?this._states[2]-4:0}get _height(){return this._states[3]}get _level(){return this._states[9]}get _mode(){return this._states[10]}get _paletteLimit(){return this._states[11]}_initCanvas(e){if(2===e){const e=this.width*this.height;if(e>this._canvas.length){if(this._opts.memoryLimit&&4*e>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");this._canvas=new Uint32Array(e)}this._maxWidth=this._width}else if(1===e)if(2===this._level){const e=Math.min(this._rasterWidth,s.LIMITS.MAX_WIDTH)*this._rasterHeight;if(e>this._canvas.length){if(this._opts.memoryLimit&&4*e>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");this._canvas=new Uint32Array(e)}}else this._canvas.length<65536&&(this._canvas=new Uint32Array(65536));return 0}_realloc(e,t){const i=e+t;if(i>this._canvas.length){if(this._opts.memoryLimit&&4*i>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");const e=new Uint32Array(65536*Math.ceil(i/65536));e.set(this._canvas),this._canvas=e}}_handle_band(e){const t=this._PIXEL_OFFSET;let i=this._lastOffset;if(2===this._mode){let A=this.height-this._currentHeight,s=0;for(;s<6&&A>0;)this._canvas.set(this._pSrc.subarray(t*s,t*s+e),i+e*s),s++,A--;this._lastOffset+=e*s,this._currentHeight+=s}else if(1===this._mode){this._realloc(i,6*e),this._maxWidth=Math.max(this._maxWidth,e),this._minWidth=Math.min(this._minWidth,e);for(let A=0;A<6;++A)this._canvas.set(this._pSrc.subarray(t*A,t*A+e),i+e*A);this._bandWidths.push(e),this._lastOffset+=6*e,this._currentHeight+=6}return 0}get width(){return 1!==this._mode?this._width:Math.max(this._maxWidth,this._wasm.current_width())}get height(){return 1!==this._mode?this._height:this._wasm.current_width()?6*this._bandWidths.length+this._wasm.current_height():6*this._bandWidths.length}get palette(){return this._palette.subarray(0,this._paletteLimit)}get memoryUsage(){return this._canvas.byteLength+this._wasm.memory.buffer.byteLength+8*this._bandWidths.length}get properties(){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}}}init(e=this._opts.fillColor,t=this._opts.palette,i=this._opts.paletteLimit,A=this._opts.truncate){this._wasm.init(this._opts.sixelColor,e,i,A?1:0),t&&this._palette.set(t.subarray(0,s.LIMITS.PALETTE_SIZE)),this._bandWidths.length=0,this._maxWidth=0,this._minWidth=s.LIMITS.MAX_WIDTH,this._lastOffset=0,this._currentHeight=0}decode(e,t=0,i=e.length){let A=t;for(;A<i;){const t=Math.min(i-A,s.LIMITS.CHUNK_SIZE);this._chunk.set(e.subarray(A,A+=t)),this._wasm.decode(0,t)}}decodeString(e,t=0,i=e.length){let A=t;for(;A<i;){const t=Math.min(i-A,s.LIMITS.CHUNK_SIZE);for(let i=0,s=A;i<t;++i,++s)this._chunk[i]=e.charCodeAt(s);A+=t,this._wasm.decode(0,t)}}get data32(){if(0===this._mode||!this.width||!this.height)return a;const e=this._wasm.current_width();if(2===this._mode){let t=this.height-this._currentHeight;if(t>0){const i=this._PIXEL_OFFSET;let A=this._lastOffset,s=0;for(;s<6&&t>0;)this._canvas.set(this._pSrc.subarray(i*s,i*s+e),A+e*s),s++,t--;t&&this._canvas.fill(this._fillColor,A+e*s)}return this._canvas.subarray(0,this.width*this.height)}if(1===this._mode){if(this._minWidth===this._maxWidth){let t=!1;if(e)if(e!==this._minWidth)t=!0;else{const t=this._PIXEL_OFFSET;let i=this._lastOffset;this._realloc(i,6*e);for(let A=0;A<6;++A)this._canvas.set(this._pSrc.subarray(t*A,t*A+e),i+e*A)}if(!t)return this._canvas.subarray(0,this.width*this.height)}const t=new Uint32Array(this.width*this.height);t.fill(this._fillColor);let i=0,A=0;for(let e=0;e<this._bandWidths.length;++e){const s=this._bandWidths[e];for(let e=0;e<6;++e)t.set(this._canvas.subarray(A,A+=s),i),i+=this.width}if(e){const A=this._PIXEL_OFFSET,s=this._wasm.current_height();for(let r=0;r<s;++r)t.set(this._pSrc.subarray(A*r,A*r+e),i+this.width*r)}return t}return a}get data8(){return new Uint8ClampedArray(this.data32.buffer,0,this.width*this.height*4)}release(){this._canvas=a,this._bandWidths.length=0,this._maxWidth=0,this._minWidth=s.LIMITS.MAX_WIDTH,this._wasm.init(A.DEFAULT_FOREGROUND,0,this._opts.paletteLimit,0)}}t.Decoder=d,t.decode=function(e,t){const i=new d(t);return i.init(),"string"==typeof e?i.decodeString(e):i.decode(e),{width:i.width,height:i.height,data32:i.data32,data8:i.data8}},t.decodeAsync=async function(e,t){const i=await g(t);return i.init(),"string"==typeof e?i.decodeString(e):i.decode(e),{width:i.width,height:i.height,data32:i.data32,data8:i.data8}}},199(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.LIMITS=void 0,t.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"}},414(e,t,i){Object.defineProperty(t,"__esModule",{value:!0}),t.EventUtils=t.Emitter=void 0;const A=i(426);var s;t.Emitter=class{constructor(){this._listeners=[],this._disposed=!1}get event(){return this._event||(this._event=(e,t,i)=>{if(this._disposed)return(0,A.toDisposable)(()=>{});const s={fn:e,thisArgs:t};this._listeners=this._listeners.slice(),this._listeners.push(s);const r=(0,A.toDisposable)(()=>{const e=this._listeners.indexOf(s);-1!==e&&(this._listeners=this._listeners.slice(),this._listeners.splice(e,1))});return i&&(Array.isArray(i)?i.push(r):i.add(r)),r}),this._event}fire(e){if(this._disposed||!this._listeners.length)return;if(1===this._listeners.length)return void this._listeners[0].fn.call(this._listeners[0].thisArgs,e);const t=this._listeners;for(let i=0,A=t.length;i<A;++i)t[i].fn.call(t[i].thisArgs,e)}dispose(){this._disposed||(this._disposed=!0,this._listeners.length=0)}},function(e){e.forward=function(e,t){return e(e=>t.fire(e))},e.map=function(e,t){return(i,A,s)=>e(e=>i.call(A,t(e)),void 0,s)},e.any=function(...e){return(t,i,s)=>{const r=new A.DisposableStore;for(const A of e)r.add(A(e=>t.call(i,e)));return s&&(Array.isArray(s)?s.push(r):s.add(r)),r}},e.runAndSubscribe=function(e,t,i){return t(i),e(e=>t(e))}}(s||(t.EventUtils=s={}))},426(e,t){function i(e){return{dispose:e}}function A(e){if(!e)return e;if(Array.isArray(e)){for(const t of e)t.dispose();return[]}return e.dispose(),e}Object.defineProperty(t,"__esModule",{value:!0}),t.MutableDisposable=t.Disposable=t.DisposableStore=void 0,t.toDisposable=i,t.dispose=A,t.combinedDisposable=function(...e){return i(()=>A(e))};class s{constructor(){this._disposables=new Set,this._isDisposed=!1}get isDisposed(){return this._isDisposed}add(e){return this._isDisposed?e.dispose():this._disposables.add(e),e}dispose(){if(!this._isDisposed){this._isDisposed=!0;for(const e of this._disposables)e.dispose();this._disposables.clear()}}clear(){for(const e of this._disposables)e.dispose();this._disposables.clear()}}t.DisposableStore=s;class r{constructor(){this._store=new s}dispose(){this._store.dispose()}_register(e){return this._store.add(e)}}t.Disposable=r,r.None=Object.freeze({dispose(){}}),t.MutableDisposable=class{constructor(){this._isDisposed=!1}get value(){return this._isDisposed?void 0:this._value}set value(e){this._isDisposed||e===this._value||(this._value?.dispose(),this._value=e)}clear(){this.value=void 0}dispose(){this._isDisposed=!0,this._value?.dispose(),this._value=void 0}}},795(e,t,i){var A=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:!0}),t.IIPHandler=void 0;const s=i(463),r=i(699),o=A(i(669)),a=A(i(61)),n=i(389),h=i(462),g={type:0,name:"Unnamed file",size:0,width:"auto",height:"auto",preserveAspectRatio:1,inline:0};t.IIPHandler=class{constructor(e,t,i,A){this._opts=e,this._renderer=t,this._storage=i,this._coreTerminal=A,this._generation=0,this._aborted=!1,this._hp=new n.HeaderParser,this._header=g,this._isMultipart=!1,this._abortMulti=!1;const s=Math.ceil(4*this._opts.iipSizeLimit/3),r=Math.min(1048576,s);this._dec=new o.default(0,s,r),this._qoiDec=new a.default(0)}reset(){this._generation++,this._hp.reset(),this._dec.release(),this._qoiDec.release()}start(){this._aborted=!1,this._hp.reset()}put(e,t,i){if(!this._aborted)if(4===this._hp.state)0!==this._dec.put(e.subarray(t,i))&&(this._dec.release(),this._aborted=!0);else{const A=this._hp.parse(e,t,i);if(-1===A)return void(this._aborted=!0);if(A>0){if(1===this._hp.fields.type){if(this._isMultipart&&(this._isMultipart=!1,this._abortMulti=!1,this._dec.release()),this._header=Object.assign({},g,this._hp.fields),!this._header.inline)return void(this._aborted=!0);if(!this._initDecoder())return void(this._aborted=!0)}else if(this._abortMulti)return void(this._aborted=!0);0!==this._dec.put(e.subarray(A,i))&&(this._dec.release(),this._aborted=!0,this._isMultipart&&(this._abortMulti=!0))}}}end(e){var t,i,A;if(this._aborted)return!0;if(4!==this._hp.state&&this._hp.end())return!0;const o=this._hp.fields.type;if(3===o)return!0;if(5===o){let e=r.CELL_SIZE_DEFAULT.width,i=r.CELL_SIZE_DEFAULT.height;this._renderer.dimensions&&(e=this._renderer.dimensions.css.canvas.width/this._coreTerminal.cols,i=this._renderer.dimensions.css.canvas.height/this._coreTerminal.rows);const s=null!==(A=null===(t=this._coreTerminal._core._coreBrowserService)||void 0===t?void 0:t.dpr)&&void 0!==A?A:1,o=`]1337;ReportCellSize=${i.toFixed(3)};${e.toFixed(3)};${s.toFixed(3)}\\`;return this._coreTerminal.input(o,!1),!0}if(2===o)return this._header=Object.assign({},g,this._hp.fields),this._isMultipart=!0,this._abortMulti=!1,this._dec.release(),this._initDecoder()||(this._abortMulti=!0),!0;if(4===o){if(!this._isMultipart)return!0;if(this._isMultipart=!1,this._abortMulti||2!==this._header.type)return!0}let a,n,d=0,l=0,I=h.UNSUPPORTED_TYPE;if((a=e)&&((a=!this._dec.end())?(I=(0,h.imageType)(this._dec.data8),(a="unsupported"!==I.mime)?(d=I.width,l=I.height,(a=d&&l&&d*l<this._opts.pixelLimit)?([d,l]=this._resize(d,l).map(Math.floor),a=d&&l&&d*l<this._opts.pixelLimit):console.warn(`IIP: image dimension issue ${I.width}x${I.height}`)):console.warn("IIP: unsupported image type")):console.warn("IIP: error during BASE64 decoding")),!a)return this._dec.release(),!0;if("image/qoi"===I.mime){let e;try{e=this._qoiDec.decode(this._dec.data8)}catch(e){return console.warn("IIP: could not decode QOI image",e),this._dec.release(),this._qoiDec.release(),!0}if(n=new ImageData(new Uint8ClampedArray(e.buffer,e.byteOffset,e.byteLength),this._qoiDec.width,this._qoiDec.height),this._qoiDec.release(),d===this._qoiDec.width&&l===this._qoiDec.height){this._dec.release();const e=s.ImageRenderer.createCanvas(void 0,this._qoiDec.width,this._qoiDec.height);return null===(i=e.getContext("2d"))||void 0===i||i.putImageData(n,0,0),this._storage.addImage(e),!0}}else n=new Blob([this._dec.data8],{type:I.mime});this._dec.release();const c=this._generation;return createImageBitmap(n,{resizeWidth:d,resizeHeight:l}).then(e=>c!==this._generation?(e.close(),!0):(this._storage.addImage(e),!0)).catch(e=>(console.warn(`IIP: decoding error ${I.mime} ${I.width}x${I.height}`,e),!0))}_initDecoder(){try{return this._dec.init(),!0}catch(e){return console.warn("IIP: could not allocate decoder",e),this._dec.release(),!1}}_resize(e,t){var i,A,s,o;const a=(null===(i=this._renderer.dimensions)||void 0===i?void 0:i.css.cell.width)||r.CELL_SIZE_DEFAULT.width,n=(null===(A=this._renderer.dimensions)||void 0===A?void 0:A.css.cell.height)||r.CELL_SIZE_DEFAULT.height,h=(null===(s=this._renderer.dimensions)||void 0===s?void 0:s.css.canvas.width)||a*this._coreTerminal.cols,g=(null===(o=this._renderer.dimensions)||void 0===o?void 0:o.css.canvas.height)||n*this._coreTerminal.rows,d=this._dim(this._header.width,h,a),l=this._dim(this._header.height,g,n);if(!d&&!l){const i=h/e,A=(g-n)/t,s=Math.min(i,A);return s<1?[e*s,t*s]:[e,t]}return d?!this._header.preserveAspectRatio&&d&&l?[d,l]:[d,t*d/e]:[e*l/t,l]}_dim(e,t,i){return"auto"===e?0:e.endsWith("%")?parseInt(e.slice(0,-1),10)*t/100:e.endsWith("px")?parseInt(e.slice(0,-2),10):parseInt(e,10)*i}}},389(e,t){function i(e){let t="";for(let i=0;i<e.length;++i)t+=String.fromCharCode(e[i]);return t}function A(e){let t=0;for(let i=0;i<e.length;++i){if(e[i]<48||e[i]>57)throw new Error("illegal char");t=10*t+e[i]-48}return t}function s(e){const t=i(e);if(!t.match(/^((auto)|(\d+?((px)|(%)){0,1}))$/))throw new Error("illegal size");return t}Object.defineProperty(t,"__esModule",{value:!0}),t.HeaderParser=void 0;const r={inline:A,size:A,name:function(e){if("undefined"!=typeof Buffer)return Buffer.from(i(e),"base64").toString();const t=atob(i(e)),A=new Uint8Array(t.length);for(let e=0;e<A.length;++e)A[e]=t.charCodeAt(e);return(new TextDecoder).decode(A)},width:s,height:s,preserveAspectRatio:A},o=[70,105,108,101],a=[77,117,108,116,105,112,97,114,116,70,105,108,101],n=[70,105,108,101,80,97,114,116],h=[70,105,108,101,69,110,100],g=[82,101,112,111,114,116,67,101,108,108,83,105,122,101],d=1024;t.HeaderParser=class{constructor(){this.state=0,this._buffer=new Uint32Array(d),this._position=0,this._key="",this.fields={}}reset(){this._buffer.fill(0),this.state=0,this._position=0,this.fields={},this._key=""}end(){if(0===this.state){if(this._position===h.length){for(let e=0;e<h.length;++e)if(this._buffer[e]!==h[e])return this._a();return this.fields.type=4,this.state=4,0}if(this._position===g.length){for(let e=0;e<g.length;++e)if(this._buffer[e]!==g[e])return this._a();return this.fields.type=5,this.state=4,0}return this._a()}return 4===this.state?0:3===this.state&&2===this.fields.type&&this._storeValue(this._position)?(this.state=4,0):this._a()}parse(e,t,i){let A=this.state,s=this._position;const r=this._buffer;if(1===A||4===A)return-1;if(0===A&&s>14)return-1;for(let h=t;h<i;++h){const t=e[h];switch(t){case 59:if(!this._storeValue(s))return this._a();A=2,s=0;break;case 61:if(0===A){if(70===r[0]){let e=0;for(;e<o.length;++e)if(r[e]!==o[e])return this._a();if(this.fields.type=1,s===n.length){for(;e<n.length;++e)if(r[e]!==n[e])return this._a();return this.fields.type=3,this.state=4,h+1}}else{if(77!==r[0])return this._a();for(let e=0;e<a.length;++e)if(r[e]!==a[e])return this._a();this.fields.type=2}A=2,s=0}else if(2===A){if(!this._storeKey(s))return this._a();A=3,s=0}else if(3===A){if(s>=d)return this._a();r[s++]=t}break;case 58:return 3!==A||this._storeValue(s)?(this.state=4,h+1):this._a();default:if(s>=d)return this._a();r[s++]=t}}return this.state=A,this._position=s,-2}_a(){return this.fields.type=0,this.state=1,-1}_storeKey(e){const t=i(this._buffer.subarray(0,e));return!!t&&(this._key=t,this.fields[t]=null,!0)}_storeValue(e){if(this._key){try{const t=this._buffer.slice(0,e);this.fields[this._key]=r[this._key]?r[this._key](t):t}catch(e){return!1}return!0}return!1}}},649(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.IIPImageStorage=void 0,t.IIPImageStorage=class{constructor(e){this._storage=e,this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"iip"}}addImage(e){this._storage.addImage(e,this._addImageOpts)}}},462(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.UNSUPPORTED_TYPE=void 0,t.imageType=function(e){if(e.length<32)return t.UNSUPPORTED_TYPE;const i=new Uint32Array(e.buffer,e.byteOffset,8);if(1196314761===i[0]&&169478669===i[1]&&1380206665===i[3])return{mime:"image/png",width:e[16]<<24|e[17]<<16|e[18]<<8|e[19],height:e[20]<<24|e[21]<<16|e[22]<<8|e[23]};if(255===e[0]&&216===e[1]&&255===e[2]){const[t,i]=function(e){const t=e.length;let i=4,A=e[i]<<8|e[i+1];for(;;){if(i+=A,i>=t)return[0,0];if(255!==e[i])return[0,0];if(192===e[i+1]||194===e[i+1])return i+8<t?[e[i+7]<<8|e[i+8],e[i+5]<<8|e[i+6]]:[0,0];i+=2,A=e[i]<<8|e[i+1]}}(e);return{mime:"image/jpeg",width:t,height:i}}if(944130375===i[0]&&(55===e[4]||57===e[4])&&97===e[5])return{mime:"image/gif",width:e[7]<<8|e[6],height:e[9]<<8|e[8]};if(1718185841===i[0])return{mime:"image/qoi",width:e[4]<<24|e[5]<<16|e[6]<<8|e[7],height:e[8]<<24|e[9]<<16|e[10]<<8|e[11]};if(1179011410===i[0]&&1346520407===i[2]&&3690582==(16777215&i[3])){switch(e[15]){case 88:return{mime:"image/webp",width:1+(e[24]|e[25]<<8|e[26]<<16),height:1+(e[27]|e[28]<<8|e[29]<<16)};case 76:if(47!==e[20])return t.UNSUPPORTED_TYPE;const i=e[21]|e[22]<<8|e[23]<<16|e[24]<<24;return{mime:"image/webp",width:1+(16383&i),height:1+(i>>>14&16383)};case 32:return 157!==e[23]||1!==e[24]||42!==e[25]?t.UNSUPPORTED_TYPE:{mime:"image/webp",width:16383&(e[26]|e[27]<<8),height:16383&(e[28]|e[29]<<8)}}return t.UNSUPPORTED_TYPE}if(1887007846===i[1]&&(1718187617===i[2]||1936291425===i[2])){let i=-1;const A=Math.min(e.length-16,1024);for(let t=8;t<A;t++)if(105===e[t]&&115===e[t+1]&&112===e[t+2]&&101===e[t+3]){i=t;break}if(-1!==i){const t=e[i+8]<<24|e[i+9]<<16|e[i+10]<<8|e[i+11],A=e[i+12]<<24|e[i+13]<<16|e[i+14]<<8|e[i+15];if(t>0&&A>0)return{mime:"image/avif",width:t,height:A}}return t.UNSUPPORTED_TYPE}return t.UNSUPPORTED_TYPE},t.UNSUPPORTED_TYPE={mime:"unsupported",width:0,height:0}},463(e,t,i){Object.defineProperty(t,"__esModule",{value:!0}),t.ImageRenderer=void 0;const A=i(939),s=i(426);class r extends s.Disposable{get canvas(){var e;return null===(e=this._layers.get("top"))||void 0===e?void 0:e.canvas}static createCanvas(e,t,i){const A=(null!=e?e:document).createElement("canvas");return A.width=0|t,A.height=0|i,A}static createImageData(e,t,i,A){if("function"!=typeof ImageData){const s=e.createImageData(t,i);return A&&s.data.set(new Uint8ClampedArray(A,0,t*i*4)),s}return A?new ImageData(new Uint8ClampedArray(A,0,t*i*4),t,i):new ImageData(t,i)}static createImageBitmap(e){return"function"!=typeof createImageBitmap?Promise.resolve(void 0):createImageBitmap(e)}constructor(e){super(),this._terminal=e,this._layers=new Map,this._optionsRefresh=this._register(new s.MutableDisposable),this._oldOpen=this._terminal._core.open,this._terminal._core.open=e=>{var t;null===(t=this._oldOpen)||void 0===t||t.call(this._terminal._core,e),this._open()},this._terminal._core.screenElement&&this._open(),this._optionsRefresh.value=this._terminal._core.optionsService.onOptionChange(e=>{var t;"fontSize"===e&&(this.rescaleCanvas(),null===(t=this._renderService)||void 0===t||t.refreshRows(0,this._terminal.rows))}),this._register((0,s.toDisposable)(()=>{var e;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(),null===(e=this._placeholderBitmap)||void 0===e||e.close(),this._placeholderBitmap=void 0,this._placeholder=void 0}))}showPlaceholder(e){var t,i;e?this._placeholder||-1===this.cellSize.height||this._createPlaceHolder(Math.max(this.cellSize.height+1,24)):(null===(t=this._placeholderBitmap)||void 0===t||t.close(),this._placeholderBitmap=void 0,this._placeholder=void 0),null===(i=this._renderService)||void 0===i||i.refreshRows(0,this._terminal.rows)}get dimensions(){return this._terminal.dimensions}get cellSize(){var e,t;return{width:(null===(e=this.dimensions)||void 0===e?void 0:e.css.cell.width)||-1,height:(null===(t=this.dimensions)||void 0===t?void 0:t.css.cell.height)||-1}}clearLines(e,t,i){var A,s,r,o,a;const n=e*((null===(A=this.dimensions)||void 0===A?void 0:A.css.cell.height)||0),h=(null===(s=this.dimensions)||void 0===s?void 0:s.css.canvas.width)||0,g=(t+1-e)*((null===(r=this.dimensions)||void 0===r?void 0:r.css.cell.height)||0);i&&"top"!==i||null===(o=this._layers.get("top"))||void 0===o||o.clearRect(0,n,h,g),i&&"bottom"!==i||null===(a=this._layers.get("bottom"))||void 0===a||a.clearRect(0,n,h,g)}clearAll(e){if(!e||"top"===e){const e=this._layers.get("top");null==e||e.clearRect(0,0,e.canvas.width,e.canvas.height)}if(!e||"bottom"===e){const e=this._layers.get("bottom");null==e||e.clearRect(0,0,e.canvas.width,e.canvas.height)}}draw(e,t,i,A,s=1){const r=this._layers.get(e.layer);if(!r)return;const{width:o,height:a}=this.cellSize;if(-1===o||-1===a)return;this._rescaleImage(e,o,a);const n=e.actual,{width:h,height:g}=e.actualCellSize,d=Math.ceil(n.width/h),l=t%d*h,I=Math.floor(t/d)*g,c=i*o,_=A*a,C=s*h+l>n.width?n.width-l:s*h,B=I+g>n.height?n.height-I:g;r.drawImage(n,Math.floor(l),Math.floor(I),Math.ceil(C),Math.ceil(B),Math.floor(c),Math.floor(_),Math.ceil(C*o/h),Math.ceil(B*a/g))}extractTile(e,t){const{width:i,height:A}=this.cellSize;if(-1===i||-1===A)return;this._rescaleImage(e,i,A);const s=e.actual,{width:o,height:a}=e.actualCellSize,n=Math.ceil(s.width/o),h=t%n*o,g=Math.floor(t/n)*a,d=o+h>s.width?s.width-h:o,l=g+a>s.height?s.height-g:a,I=r.createCanvas(this.document,Math.ceil(d*i/o),Math.ceil(l*A/a)),c=I.getContext("2d");return c?(c.drawImage(s,Math.floor(h),Math.floor(g),Math.floor(d),Math.floor(l),0,0,I.width,I.height),I):void 0}drawPlaceholder(e,t,i=1){var A;const s=this._layers.get("top");if(s){const{width:r,height:o}=this.cellSize;if(-1===r||-1===o)return;if(this._placeholder?o>=this._placeholder.height&&this._createPlaceHolder(o+1):this._createPlaceHolder(Math.max(o+1,24)),!this._placeholder)return;s.drawImage(null!==(A=this._placeholderBitmap)&&void 0!==A?A:this._placeholder,e*r,t*o%2?0:1,r*i,o,e*r,t*o,r*i,o)}}rescaleCanvas(){var e,t;const i=(null===(e=this.dimensions)||void 0===e?void 0:e.css.canvas.width)||0,A=(null===(t=this.dimensions)||void 0===t?void 0:t.css.canvas.height)||0;for(const e of this._layers.values())e.canvas.width===i&&e.canvas.height===A||(e.canvas.width=i,e.canvas.height=A)}_rescaleImage(e,t,i){if(t===e.actualCellSize.width&&i===e.actualCellSize.height)return;const{width:A,height:s}=e.origCellSize;if(t===A&&i===s)return e.actual=e.orig,e.actualCellSize.width=A,void(e.actualCellSize.height=s);const o=Math.ceil(e.orig.width*t/A),a=Math.ceil(e.orig.height*i/s);if(o*a>e.orig.width*e.orig.height)return e.actual=e.orig,e.actualCellSize.width=A,void(e.actualCellSize.height=s);const n=r.createCanvas(this.document,o,a),h=n.getContext("2d");h&&(h.drawImage(e.orig,0,0,n.width,n.height),e.actual=n,e.actualCellSize.width=t,e.actualCellSize.height=i)}_open(){this._renderService=this._terminal._core._renderService,this._oldSetRenderer=this._renderService.setRenderer.bind(this._renderService),this._renderService.setRenderer=e=>{var t;for(const e of[...this._layers.keys()])this.removeLayerFromDom(e);null===(t=this._oldSetRenderer)||void 0===t||t.call(this._renderService,e)}}insertLayerToDom(e="top"){var t,i;if(!this.document||!this._terminal._core.screenElement)return void console.warn("image addon: cannot insert output canvas to DOM, missing document or screenElement");if(this._layers.has(e))return;const A=r.createCanvas(this.document,(null===(t=this.dimensions)||void 0===t?void 0:t.css.canvas.width)||0,(null===(i=this.dimensions)||void 0===i?void 0:i.css.canvas.height)||0);A.classList.add(`xterm-image-layer-${e}`);const s=this._terminal._core.screenElement;s.style.isolation="isolate","bottom"===e?(A.style.zIndex="-1",s.insertBefore(A,s.firstChild)):(A.style.zIndex="0",s.appendChild(A));const o=A.getContext("2d",{alpha:!0});o?(this._layers.set(e,o),this.clearAll(e)):A.remove()}removeLayerFromDom(e="top"){const t=this._layers.get(e);t&&(t.canvas.remove(),this._layers.delete(e))}hasLayer(e){return this._layers.has(e)}_createPlaceHolder(e=24){var t;null===(t=this._placeholderBitmap)||void 0===t||t.close(),this._placeholderBitmap=void 0;const i=32,s=r.createCanvas(this.document,i,e),o=s.getContext("2d",{alpha:!1});if(!o)return;const a=r.createImageData(o,i,e),n=new Uint32Array(a.data.buffer),h=(0,A.toRGBA8888)(0,0,0),g=(0,A.toRGBA8888)(255,255,255);n.fill(h);for(let t=0;t<e;++t){const e=t%2,A=t*i;for(let t=0;t<i;t+=2)n[A+t+e]=g}o.putImageData(a,0,0);const d=screen.width+i-1&-32||4096;this._placeholder=r.createCanvas(this.document,d,e);const l=this._placeholder.getContext("2d",{alpha:!1});if(!l)return void(this._placeholder=void 0);for(let e=0;e<d;e+=i)l.drawImage(s,e,0);const I=this._placeholder;r.createImageBitmap(I).then(e=>{this._placeholder!==I?null==e||e.close():this._placeholderBitmap=e}).catch(()=>{})}get document(){var e;return null===(e=this._terminal._core._coreBrowserService)||void 0===e?void 0:e.window.document}}t.ImageRenderer=r},699(e,t,i){Object.defineProperty(t,"__esModule",{value:!0}),t.ImageStorage=t.CELL_SIZE_DEFAULT=void 0;const A=i(463);t.CELL_SIZE_DEFAULT={width:7,height:14};class s{get ext(){return this._urlId?-469762049&this._ext|this.underlineStyle<<26:this._ext}set ext(e){this._ext=e}get underlineStyle(){return this._urlId?5:(469762048&this._ext)>>26}set underlineStyle(e){this._ext&=-469762049,this._ext|=e<<26&469762048}get underlineColor(){return 67108863&this._ext}set underlineColor(e){this._ext&=-67108864,this._ext|=67108863&e}get underlineVariantOffset(){const e=(3758096384&this._ext)>>29;return e<0?4294967288^e:e}set underlineVariantOffset(e){this._ext&=536870911,this._ext|=e<<29&3758096384}get urlId(){return this._urlId}set urlId(e){this._urlId=e}constructor(e=0,t=0,i=-1,A=-1){this.imageId=i,this.tileId=A,this._ext=0,this._urlId=0,this._ext=e,this._urlId=t}clone(){return new s(this._ext,this._urlId,this.imageId,this.tileId)}isEmpty(){return 0===this.underlineStyle&&0===this._urlId&&-1===this.imageId}}const r=new s;t.ImageStorage=class{constructor(e,t,i){this._terminal=e,this._renderer=t,this._opts=i,this._images=new Map,this._lastId=0,this._lowestId=0,this._fullyCleared=!1,this._needsFullClear=!1,this._pixelLimit=25e5;try{this.setLimit(this._opts.storageLimit)}catch(e){e instanceof Error&&console.error(e.message),console.warn(`storageLimit is set to ${this.getLimit()} MB`)}this._viewportMetrics={cols:this._terminal.cols,rows:this._terminal.rows}}dispose(){this.reset()}reset(){var e;for(const t of this._images.values())null===(e=t.marker)||void 0===e||e.dispose();this._images.clear(),this._renderer.clearAll()}getLimit(){return 4*this._pixelLimit/1e6}setLimit(e){if(e<.5||e>1e3)throw RangeError("invalid storageLimit, should be at least 0.5 MB and not exceed 1G");this._pixelLimit=e/4*1e6>>>0,this._evictOldest(0)}getUsage(){return 4*this._getStoredPixels()/1e6}_getStoredPixels(){let e=0;for(const 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));return e}_delImg(e){var t;const i=this._images.get(e);i&&(this._images.delete(e),window.ImageBitmap&&i.orig instanceof ImageBitmap&&i.orig.close(),null===(t=this.onImageDeleted)||void 0===t||t.call(this,e))}wipeAlternate(){var e;const t=[];for(const[i,A]of this._images.entries())"alternate"===A.bufferType&&(null===(e=A.marker)||void 0===e||e.dispose(),t.push(i));for(const e of t)this._delImg(e);this._needsFullClear=!0,this._fullyCleared=!1}deleteImage(e){var t;const i=this._images.get(e);i&&(null===(t=i.marker)||void 0===t||t.dispose(),this._delImg(e))}addImage(e,i){var A,s;this._evictOldest(e.width*e.height);let r=this._renderer.cellSize;-1!==r.width&&-1!==r.height||(r=t.CELL_SIZE_DEFAULT);const o=Math.ceil(e.width/r.width),a=Math.ceil(e.height/r.height),n=++this._lastId,h=this._terminal._core.buffer,g=this._terminal.cols,d=this._terminal.rows,l=h.x,I=h.y;let c=l,_=0;i.scrolling||(h.x=0,h.y=0,c=0),this._terminal._core._inputHandler._dirtyRowTracker.markDirty(h.y);for(let e=0;e<a;++e){const t=h.lines.get(h.y+h.ybase);for(let i=0;i<o&&!(c+i>=g);++i)this._writeToCell(t,c+i,n,e*o+i),_++;if(i.scrolling)e<a-1&&this._terminal._core._inputHandler.lineFeed();else if(++h.y>=d)break;h.x=c}this._terminal._core._inputHandler._dirtyRowTracker.markDirty(h.y),i.scrolling?"iip"===i.cursorPos?h.x=Math.min(c+o,g):h.x=c:(h.x=l,h.y=I);const C=[];for(const[e,t]of this._images.entries())t.tileCount<1&&(null===(A=t.marker)||void 0===A||A.dispose(),C.push(e));for(const e of C)this._delImg(e);const B=this._terminal.registerMarker(0);null==B||B.onDispose(()=>{this._images.get(n)&&this._delImg(n)}),"alternate"===this._terminal.buffer.active.type&&this._evictOnAlternate();const Q={orig:e,origCellSize:r,actual:e,actualCellSize:Object.assign({},r),marker:B||void 0,tileCount:_,bufferType:this._terminal.buffer.active.type,layer:i.layer,zIndex:i.zIndex};return this._images.set(n,Q),null===(s=this.onImageAdded)||void 0===s||s.call(this),n}render(e){var t,i;let A=!1,s=!1;for(const e of this._images.values())if("bottom"===e.layer?s=!0:A=!0,A&&s)break;if(A&&!this._renderer.hasLayer("top")&&(this._renderer.insertLayerToDom("top"),!this._renderer.hasLayer("top")))return;if(s&&!this._renderer.hasLayer("bottom")&&this._renderer.insertLayerToDom("bottom"),this._renderer.rescaleCanvas(),!this._images.size)return this._fullyCleared||(this._renderer.clearAll(),this._fullyCleared=!0,this._needsFullClear=!1),this._renderer.hasLayer("top")&&this._renderer.removeLayerFromDom("top"),void(this._renderer.hasLayer("bottom")&&this._renderer.removeLayerFromDom("bottom"));!A&&this._renderer.hasLayer("top")&&(this._renderer.clearAll("top"),this._renderer.removeLayerFromDom("top")),!s&&this._renderer.hasLayer("bottom")&&(this._renderer.clearAll("bottom"),this._renderer.removeLayerFromDom("bottom")),this._needsFullClear&&(this._renderer.clearAll(),this._fullyCleared=!0,this._needsFullClear=!1);const{start:o,end:a}=e,n=this._terminal._core.buffer,h=this._terminal._core.cols;this._renderer.clearLines(o,a);const g=[],d=[];for(let e=o;e<=a;++e){const A=n.lines.get(e+n.ydisp);if(!A)return;for(let s=0;s<h;++s)if(268435456&A.getBg(s)){let o=null!==(t=A._extendedAttrs[s])&&void 0!==t?t:r;const a=o.imageId;if(void 0===a||-1===a)continue;const n=this._images.get(a);if(-1!==o.tileId){const t=o.tileId,l=s;let I=1;for(;++s<h&&268435456&A.getBg(s)&&(o=null!==(i=A._extendedAttrs[s])&&void 0!==i?i:r)&&o.imageId===a&&o.tileId===t+I;)I++;s--,n?n.actual&&g.push({imgSpec:n,tileId:t,col:l,row:e,count:I}):this._opts.showPlaceholder&&d.push({col:l,row:e,count:I}),this._fullyCleared=!1}}}g.sort((e,t)=>e.imgSpec.zIndex-t.imgSpec.zIndex);for(const e of d)this._renderer.drawPlaceholder(e.col,e.row,e.count);for(const e of g)this._renderer.draw(e.imgSpec,e.tileId,e.col,e.row,e.count)}viewportResize(e){var t,i;if(!this._images.size)return void(this._viewportMetrics=e);if(this._viewportMetrics.cols>=e.cols)return void(this._viewportMetrics=e);const A=this._terminal._core.buffer,s=A.lines.length,o=this._viewportMetrics.cols-1;for(let a=0;a<s;++a){const s=A.lines.get(a);if(268435456&s.getBg(o)){const A=null!==(i=s._extendedAttrs[o])&&void 0!==i?i:r,a=A.imageId;if(void 0===a||-1===a)continue;const n=this._images.get(a);if(!n)continue;const h=Math.ceil(((null===(t=n.actual)||void 0===t?void 0:t.width)||0)/n.actualCellSize.width);if(A.tileId%h+1>=h)continue;let g=!1;for(let t=o+1;t>e.cols;++t)if(4194303&s._data[3*t+0]){g=!0;break}if(g)continue;const d=Math.min(e.cols,h-A.tileId%h+o);let l=A.tileId;for(let e=o+1;e<d;++e)this._writeToCell(s,e,a,++l),n.tileCount++}}this._viewportMetrics=e}getImageAtBufferCell(e,t){var i,s,o;const a=this._terminal._core.buffer.lines.get(t);if(a&&268435456&a.getBg(e)){const t=null!==(o=a._extendedAttrs[e])&&void 0!==o?o:r;if(t.imageId&&-1!==t.imageId){const e=null===(i=this._images.get(t.imageId))||void 0===i?void 0:i.orig;if(window.ImageBitmap&&e instanceof ImageBitmap){const t=A.ImageRenderer.createCanvas(window.document,e.width,e.height);return null===(s=t.getContext("2d"))||void 0===s||s.drawImage(e,0,0,e.width,e.height),t}return e}}}extractTileAtBufferCell(e,t){var i;const A=this._terminal._core.buffer.lines.get(t);if(A&&268435456&A.getBg(e)){const t=null!==(i=A._extendedAttrs[e])&&void 0!==i?i:r;if(t.imageId&&-1!==t.imageId&&-1!==t.tileId){const e=this._images.get(t.imageId);if(e)return this._renderer.extractTile(e,t.tileId)}}}_evictOldest(e){var t;const i=this._getStoredPixels();let A=i;for(;this._pixelLimit<A+e&&this._images.size;){const e=this._images.get(++this._lowestId);e&&e.orig&&(A-=e.orig.width*e.orig.height,e.actual&&e.orig!==e.actual&&(A-=e.actual.width*e.actual.height),null===(t=e.marker)||void 0===t||t.dispose(),this._delImg(this._lowestId))}return i-A}_writeToCell(e,t,i,A){if(268435456&e._data[3*t+2]){const r=e._extendedAttrs[t];if(r){if(void 0!==r.imageId){const e=this._images.get(r.imageId);return e&&e.tileCount--,r.imageId=i,void(r.tileId=A)}return void(e._extendedAttrs[t]=new s(r.ext,r.urlId,i,A))}}e._data[3*t+2]|=268435456,e._extendedAttrs[t]=new s(0,0,i,A)}_evictOnAlternate(){var e,t;for(const e of this._images.values())"alternate"===e.bufferType&&(e.tileCount=0);const i=this._terminal._core.buffer;for(let t=0;t<this._terminal.rows;++t){const A=i.lines.get(t);if(A)for(let t=0;t<this._terminal.cols;++t)if(268435456&A._data[3*t+2]){const i=null===(e=A._extendedAttrs[t])||void 0===e?void 0:e.imageId;if(i){const e=this._images.get(i);e&&e.tileCount++}}}const A=[];for(const[e,i]of this._images.entries())"alternate"!==i.bufferType||i.tileCount||(null===(t=i.marker)||void 0===t||t.dispose(),A.push(e));for(const e of A)this._delImg(e)}}},566(e,t,i){Object.defineProperty(t,"__esModule",{value:!0}),t.SixelHandler=void 0;const A=i(939),s=i(463),r=i(591),o=i(199),a=A.PALETTE_ANSI_256;a.set(A.PALETTE_VT340_COLOR);const n=new Map;let h=!1;function g(e,t){var i;e.memoryUsage>4194304&&e.release();const A=null!==(i=n.get(t))&&void 0!==i?i:[];A.length<2&&(A.push(e),n.set(t,A))}function d(e){return A.BIG_ENDIAN?e:(255&e)<<24|(e>>>8&255)<<16|(e>>>16&255)<<8|e>>>24&255}t.SixelHandler=class{constructor(e,t,i){var A;this._opts=e,this._storage=t,this._coreTerminal=i,this._size=0,this._aborted=!1,this._decMemoryLimit=0,this._palette=new Uint32Array(o.LIMITS.PALETTE_SIZE),this._palette.set(a),A=4*this._opts.pixelLimit,h||(h=!0,(0,r.DecoderAsync)({memoryLimit:A,palette:a}).then(e=>g(e,A),()=>{h=!1}))}reset(){this._returnDecoder(),this._palette.fill(0),this._palette.set(a)}hook(e){var t;this._size=0,this._aborted=!1,this._returnDecoder();const i=4*this._opts.pixelLimit;try{this._dec=function(e){var t,i;return null!==(i=null===(t=n.get(e))||void 0===t?void 0:t.pop())&&void 0!==i?i:new r.Decoder({memoryLimit:e,palette:a})}(i)}catch(e){return console.warn(`SIXEL: could not allocate decoder - ${e}`),void(this._aborted=!0)}this._decMemoryLimit=i;const s=1===e.params[1]?0:function(e,t){let i=0;if(!t)return i;if(e.isInverse())if(e.isFgDefault())i=d(t.foreground.rgba);else if(e.isFgRGB()){const t=e.constructor.toColorRGB(e.getFgColor());i=(0,A.toRGBA8888)(...t)}else i=d(t.ansi[e.getFgColor()].rgba);else if(e.isBgDefault())i=d(t.background.rgba);else if(e.isBgRGB()){const t=e.constructor.toColorRGB(e.getBgColor());i=(0,A.toRGBA8888)(...t)}else i=d(t.ansi[e.getBgColor()].rgba);return i}(this._coreTerminal._core._inputHandler._curAttrData,null===(t=this._coreTerminal._core._themeService)||void 0===t?void 0:t.colors);this._dec.init(s,this._palette,this._opts.sixelPaletteLimit)}_returnDecoder(){const e=this._dec;e&&(this._dec=void 0,this._palette.set(e.palette),g(e,this._decMemoryLimit))}put(e,t,i){if(!this._aborted&&this._dec){if(this._size+=i-t,this._size>this._opts.sixelSizeLimit)return console.warn("SIXEL: too much data, aborting"),this._aborted=!0,void this._dec.release();try{this._dec.decode(e,t,i)}catch(e){console.warn(`SIXEL: error while decoding image - ${e}`),this._aborted=!0,this._dec.release()}}}unhook(e){try{return this._unhook(e)}finally{this._returnDecoder()}}_unhook(e){var t;if(this._aborted||!e||!this._dec)return!0;const i=this._dec.width,A=this._dec.height;if(!i||!A)return A&&this._storage.advanceCursor(A),!0;const r=s.ImageRenderer.createCanvas(void 0,i,A);return null===(t=r.getContext("2d"))||void 0===t||t.putImageData(new ImageData(this._dec.data8,i,A),0,0),this._storage.addImage(r),!0}}},994(e,t,i){Object.defineProperty(t,"__esModule",{value:!0}),t.SixelImageStorage=void 0;const A=i(699);t.SixelImageStorage=class{constructor(e,t,i,A){this._storage=e,this._opts=t,this._renderer=i,this._terminal=A,this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"vt340"}}addImage(e){this._addImageOpts.scrolling=this._opts.sixelScrolling,this._storage.addImage(e,this._addImageOpts)}advanceCursor(e){if(this._opts.sixelScrolling){let t=this._renderer.cellSize;-1!==t.width&&-1!==t.height||(t=A.CELL_SIZE_DEFAULT);const i=Math.ceil(e/t.height);for(let e=1;e<i;++e)this._terminal._core._inputHandler.lineFeed()}}}},23(e,t,i){var A=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:!0}),t.KittyGraphicsHandler=void 0;const s=i(463),r=i(699),o=i(462),a=A(i(669)),n=i(470);t.KittyGraphicsHandler=class{constructor(e,t,i,A){this._opts=e,this._renderer=t,this._kittyStorage=i,this._coreTerminal=A,this._aborted=!1,this._generation=0,this._decodeError=!1,this._activeDecoder=null,this._inControlData=!0,this._controlData=new Uint32Array(512),this._controlLength=0,this._encodedSizeLimit=0,this._totalEncodedSize=0,this._parsedCommand=null,this._pendingTransmissions=new Map,this._maxEncodedBytes=Math.ceil(4*this._opts.kittySizeLimit/3),this._initialEncodedBytes=Math.min(4194304,this._maxEncodedBytes)}reset(){this._generation++,this._cleanupAllPending(),this._activeDecoder&&(this._activeDecoder.release(),this._activeDecoder=null),this._kittyStorage.reset()}dispose(){this.reset()}_removePendingEntry(e){this._pendingTransmissions.delete(e),this._lastPendingKey===e&&(this._lastPendingKey=void 0)}_cleanupAllPending(){for(const e of this._pendingTransmissions.values())e.decoder.release();this._pendingTransmissions.clear(),this._lastPendingKey=void 0}start(){this._aborted=!1,this._decodeError=!1,this._inControlData=!0,this._controlLength=0,this._parsedCommand=null,this._encodedSizeLimit=this._maxEncodedBytes,this._totalEncodedSize=0,this._activeDecoder=null}put(e,t,i){var A;if(!this._aborted)if(this._inControlData){let s=i;for(let A=t;A<i;A++)if(59===e[A]){this._inControlData=!1,s=A;break}const r=s-t;if(this._controlLength+r>512)return void(this._aborted=!0);if(this._controlData.set(e.subarray(t,s),this._controlLength),this._controlLength+=r,!this._inControlData){if(this._parsedCommand=(0,n.parseKittyCommand)(this._parseControlDataString()),void 0!==this._parsedCommand.id&&void 0!==this._parsedCommand.imageNumber)return this._sendResponse(this._parsedCommand.id,"EINVAL:cannot specify both i and I keys",null!==(A=this._parsedCommand.quiet)&&void 0!==A?A:0),void(this._aborted=!0);if("d"===this._parsedCommand.action)return;const t=s+1;t<i&&this._streamPayload(e,t,i)}}else this._streamPayload(e,t,i)}_streamPayload(e,t,i){var A,s,r,o,n,h,g,d,l,I;if(this._aborted)return;const c=null!==(n=null!==(o=null===(A=this._parsedCommand)||void 0===A?void 0:A.id)&&void 0!==o?o:this._lastPendingKey)&&void 0!==n?n:0,_=this._pendingTransmissions.get(c),C=null!==(h=null==_?void 0:_.totalEncodedSize)&&void 0!==h?h:0;if(this._totalEncodedSize+=i-t,C+this._totalEncodedSize>this._encodedSizeLimit){const e=null!==(g=this._activeDecoder)&&void 0!==g?g:null==_?void 0:_.decoder;return e&&e.release(),this._activeDecoder=null,_&&this._removePendingEntry(c),void(this._aborted=!0)}if(!this._decodeError){if((null==_?void 0:_.decoder)&&!this._activeDecoder&&(this._activeDecoder=_.decoder),!this._activeDecoder){const e=this._maxEncodedBytes+131072;if(e>1e6*this._opts.storageLimit)return this._aborted=!0,void(void 0!==(null===(s=this._parsedCommand)||void 0===s?void 0:s.id)&&this._sendResponse(this._parsedCommand.id,"ENOMEM:pending image budget exceeded",null!==(d=this._parsedCommand.quiet)&&void 0!==d?d:0));const t=Math.max(1,Math.floor(1e6*this._opts.storageLimit/e));for(;this._pendingTransmissions.size>=t;){const e=this._pendingTransmissions.entries().next().value;if(!e)break;e[1].decoder.release(),this._removePendingEntry(e[0]),void 0!==e[1].cmd.id&&this._sendResponse(e[1].cmd.id,"ENOMEM:pending image budget exceeded",null!==(l=e[1].cmd.quiet)&&void 0!==l?l:0)}const i=new a.default(4194304,this._maxEncodedBytes,this._initialEncodedBytes);try{i.init()}catch(e){return console.warn("KITTY: could not allocate decoder",e),this._aborted=!0,void(void 0!==(null===(r=this._parsedCommand)||void 0===r?void 0:r.id)&&this._sendResponse(this._parsedCommand.id,"ENOMEM:could not allocate decoder",null!==(I=this._parsedCommand.quiet)&&void 0!==I?I:0))}this._activeDecoder=i}0!==this._activeDecoder.put(e.subarray(t,i))&&(this._activeDecoder.release(),this._activeDecoder=null,this._decodeError=!0,_&&this._removePendingEntry(c))}}end(e){var t,i;if(this._aborted||!e)return this._activeDecoder&&(this._activeDecoder.release(),this._activeDecoder=null),!0;if(this._inControlData)return this._handleNoPayloadCommand();const A=this._parsedCommand;if("d"===A.action)return this._handleDelete(A);const s=null!==(i=null!==(t=A.id)&&void 0!==t?t:this._lastPendingKey)&&void 0!==i?i:0,r=1===A.more,o=this._pendingTransmissions.get(s);if(r)return this._activeDecoder&&(o?(o.totalEncodedSize+=this._totalEncodedSize,o.decodeError=o.decodeError||this._decodeError):this._pendingTransmissions.set(s,{cmd:Object.assign({},A),decoder:this._activeDecoder,totalEncodedSize:this._totalEncodedSize,decodeError:this._decodeError}),this._lastPendingKey=s,this._activeDecoder=null),!0;o&&(this._lastPendingKey=void 0);let a=this._decodeError,n=A,h=this._activeDecoder;o&&(n=o.cmd,h=o.decoder,a=a||o.decodeError,this._pendingTransmissions.delete(s));let g=new Uint8Array(0);h&&(0!==h.end()&&(a=!0),g=h.data8),this._activeDecoder=null;const d=this._handleCommandWithBytesAndCmd(n,g,a);return h&&h.release(),d}_parseControlDataString(){let e="";for(let t=0;t<this._controlLength;t++)e+=String.fromCodePoint(this._controlData[t]);return e}_handleNoPayloadCommand(){var e,t,i,A,s;const r=(0,n.parseKittyCommand)(this._parseControlDataString());if(void 0!==r.id&&void 0!==r.imageNumber)return this._sendResponse(r.id,"EINVAL:cannot specify both i and I keys",null!==(e=r.quiet)&&void 0!==e?e:0),!0;switch(null!==(t=r.action)&&void 0!==t?t:"t"){case"d":return this._handleDelete(r);case"q":return this._sendResponse(null!==(i=r.id)&&void 0!==i?i:0,"OK",null!==(A=r.quiet)&&void 0!==A?A:0),!0;case"p":return this._handlePlacement(r);default:return void 0!==r.id&&this._sendResponse(r.id,"EINVAL:unsupported action",null!==(s=r.quiet)&&void 0!==s?s:0),!0}}_handleCommandWithBytesAndCmd(e,t,i){var A,s,r,o,a;switch(null!==(A=e.action)&&void 0!==A?A:"t"){case"t":{const A=this._handleTransmit(e,t,i);return"d"===(null!==(s=e.transmission)&&void 0!==s?s:"d")&&void 0!==e.id&&(i?this._sendResponse(e.id,"EINVAL:invalid base64 data",null!==(r=e.quiet)&&void 0!==r?r:0):t.length>0&&this._sendResponse(e.id,"OK",null!==(o=e.quiet)&&void 0!==o?o:0)),A}case"T":return this._handleTransmitDisplay(e,t,i);case"q":return this._handleQuery(e,t,i);case"p":return this._handlePlacement(e);default:return void 0!==e.id&&this._sendResponse(e.id,"EINVAL:unsupported action",null!==(a=e.quiet)&&void 0!==a?a:0),!0}}_handlePlacement(e){var t;if(void 0===e.id)return!0;const i=e.id,A=this._kittyStorage.getImage(i);return A?this._displayImage(A,e).then(t=>{var A;return this._sendResponse(i,t?"OK":"EINVAL:image rendering failed",null!==(A=e.quiet)&&void 0!==A?A:0,e.placementId),!0}):(this._sendResponse(i,"ENOENT:image not found",null!==(t=e.quiet)&&void 0!==t?t:0,e.placementId),!0)}_handleTransmit(e,t,i){var A,s,r,o,a,n;return"d"!==(null!==(A=e.transmission)&&void 0!==A?A:"d")?(void 0!==e.id&&this._sendResponse(e.id,"EINVAL:unsupported transmission medium",null!==(s=e.quiet)&&void 0!==s?s:0),!0):(i||0===t.length||this._kittyStorage.storeImage(e.id,{data:new Blob([t]),width:null!==(r=e.width)&&void 0!==r?r:0,height:null!==(o=e.height)&&void 0!==o?o:0,format:null!==(a=e.format)&&void 0!==a?a:32,compression:null!==(n=e.compression)&&void 0!==n?n:""}),!0)}_handleTransmitDisplay(e,t,i){var A,s;if(i)return void 0!==e.id&&this._sendResponse(e.id,"EINVAL:invalid base64 data",null!==(A=e.quiet)&&void 0!==A?A:0),!0;this._handleTransmit(e,t,i);const r=null!==(s=e.id)&&void 0!==s?s:this._kittyStorage.lastImageId,o=this._kittyStorage.getImage(r);if(o){const t=this._displayImage(o,e);return void 0!==e.id?t.then(t=>{var i;return this._sendResponse(r,t?"OK":"EINVAL:image rendering failed",null!==(i=e.quiet)&&void 0!==i?i:0),!0}):t.then(()=>!0)}return!0}_handleQuery(e,t,i){var A,s,r,o,a,n;const h=null!==(A=e.id)&&void 0!==A?A:0,g=null!==(s=e.quiet)&&void 0!==s?s:0;if("d"!==(null!==(r=e.transmission)&&void 0!==r?r:"d"))return this._sendResponse(h,"EINVAL:unsupported transmission medium",g),!0;if(i)return this._sendResponse(h,"EINVAL:invalid base64 data",g),!0;if(0===t.length)return this._sendResponse(h,"OK",g),!0;const d=null!==(o=e.format)&&void 0!==o?o:32;if(100===d)this._sendResponse(h,"OK",g);else{const i=null!==(a=e.width)&&void 0!==a?a:0,A=null!==(n=e.height)&&void 0!==n?n:0;if(!i||!A)return this._sendResponse(h,"EINVAL:width and height required for raw pixel data",g),!0;const s=i*A*(32===d?4:3);if(t.length<s)return this._sendResponse(h,"EINVAL:insufficient pixel data",g),!0;this._sendResponse(h,"OK",g)}return!0}_handleDelete(e){var t;switch(null!==(t=e.deleteSelector)&&void 0!==t?t:"a"){case"a":case"A":this._cleanupAllPending(),this._kittyStorage.deleteAll();break;case"i":case"I":if(void 0!==e.id){const t=this._pendingTransmissions.get(e.id);t&&t.decoder.release(),this._removePendingEntry(e.id),this._kittyStorage.deleteById(e.id)}}return!0}_sendResponse(e,t,i,A){const s="OK"===t;if(s&&i>=1)return;if(!s&&i>=2)return;const r=`_Gi=${e}${A?`,p=${A}`:""};${t}\\`;this._coreTerminal._core.coreService.triggerDataEvent(r)}_displayImage(e,t){return this._decodeAndDisplay(e,t).then(()=>!0).catch(()=>!1)}async _decodeAndDisplay(e,t){var i,A,o,a,n,h,g;const d=this._generation;let l=await this._createBitmap(e);try{if(d!==this._generation)throw new Error("image decode canceled");const I=Math.max(0,null!==(o=t.x)&&void 0!==o?o:0),c=Math.max(0,null!==(a=t.y)&&void 0!==a?a:0),_=t.sourceWidth||l.width-I,C=t.sourceHeight||l.height-c,B=Math.max(0,l.width-I),Q=Math.max(0,l.height-c),m=Math.max(0,Math.min(_,B)),u=Math.max(0,Math.min(C,Q));if(0===m||0===u)throw new Error("invalid source rectangle");if(0!==I||0!==c||m!==l.width||u!==l.height){const e=await createImageBitmap(l,I,c,m,u);l.close(),l=e}const E=(null===(i=this._renderer.dimensions)||void 0===i?void 0:i.css.cell.width)||r.CELL_SIZE_DEFAULT.width,p=(null===(A=this._renderer.dimensions)||void 0===A?void 0:A.css.cell.height)||r.CELL_SIZE_DEFAULT.height;let w,f;void 0!==t.columns&&void 0!==t.rows?(w=t.columns,f=t.rows):void 0!==t.columns?(w=t.columns,f=Math.max(1,Math.ceil(l.height/l.width*(w*E)/p))):void 0!==t.rows?(f=t.rows,w=Math.max(1,Math.ceil(l.width/l.height*(f*p)/E))):(w=Math.ceil(l.width/E),f=Math.ceil(l.height/p));let D=l.width,y=l.height;if(void 0===t.columns&&void 0===t.rows||(D=Math.round(w*E),y=Math.round(f*p)),D*y>this._opts.pixelLimit)throw new Error("image exceeds pixel limit");const v=this._coreTerminal._core.buffer,M=v.x,k=v.y,b=v.ybase,S=void 0!==t.zIndex&&t.zIndex<0?"bottom":"top";if(D!==l.width||y!==l.height){const e=await createImageBitmap(l,{resizeWidth:D,resizeHeight:y});l.close(),l=e}const L=Math.min(Math.max(0,null!==(n=t.xOffset)&&void 0!==n?n:0),E-1),N=Math.min(Math.max(0,null!==(h=t.yOffset)&&void 0!==h?h:0),p-1);if(0!==L||0!==N){const e=void 0!==t.columns?Math.round(w*E):l.width+L,i=void 0!==t.rows?Math.round(f*p):l.height+N,A=s.ImageRenderer.createCanvas(window.document,e,i),r=A.getContext("2d");if(!r)throw new Error("Failed to create offset canvas context");r.drawImage(l,L,N);const o=await createImageBitmap(A);if(A.width=A.height=0,l.close(),l=o,D=l.width,y=l.height,D*y>this._opts.pixelLimit)throw new Error("image exceeds pixel limit");void 0===t.columns&&(w=Math.ceil(l.width/E)),void 0===t.rows&&(f=Math.ceil(l.height/p))}if(d!==this._generation)throw new Error("image decode canceled");const G=null!==(g=t.zIndex)&&void 0!==g?g:0;if(this._kittyStorage.addImage(e.id,l,!0,S,G),l=void 0,1===t.cursorMovement){const e=v.ybase-b;v.x=M,v.y=Math.max(k-e,0)}else v.x=Math.min(M+w,this._coreTerminal.cols)}catch(e){throw null==l||l.close(),e}}async _createBitmap(e){let t=new Uint8Array(await e.data.arrayBuffer());if("z"===e.compression&&(t=await this._decompressZlib(t)),100===e.format){const e=(0,o.imageType)(t);if("image/png"!==e.mime||!(e.width>0)||!(e.height>0)||e.width*e.height>this._opts.pixelLimit)throw new RangeError("PNG exceeds pixel limit or has invalid dimensions");const i=new Blob([t],{type:"image/png"});if(!window.createImageBitmap){const e=URL.createObjectURL(i),t=new Image;return new Promise((i,A)=>{t.addEventListener("load",()=>{var r;URL.revokeObjectURL(e);const o=s.ImageRenderer.createCanvas(window.document,t.width,t.height);null===(r=o.getContext("2d"))||void 0===r||r.drawImage(t,0,0),createImageBitmap(o).then(i).catch(A)}),t.addEventListener("error",()=>{URL.revokeObjectURL(e),A(new Error("Failed to load image"))}),t.src=e})}return createImageBitmap(i)}const i=e.width,A=e.height;if(!i||!A)throw new Error("Width and height required for raw pixel data");const r=i*A*(32===e.format?4:3);if(t.length<r)throw new Error("Insufficient pixel data");const a=i*A;if(32===e.format)return createImageBitmap(new ImageData(new Uint8ClampedArray(t.buffer,t.byteOffset,4*a),i,A));const n=new Uint8ClampedArray(4*a),h=new Uint32Array(t.buffer,t.byteOffset,Math.floor(t.byteLength/4)),g=new Uint32Array(n.buffer),d=-4&a;let l=0,I=0;for(let e=0;e<d;e+=4){const e=h[l++],t=h[l++],i=h[l++];g[I++]=4278190080|e,g[I++]=4278190080|e>>>24|t<<8,g[I++]=4278190080|t>>>16|i<<16,g[I++]=4278190080|i>>>8}let c=3*d,_=4*d;for(let e=d;e<a;e++)n[_]=t[c],n[_+1]=t[c+1],n[_+2]=t[c+2],n[_+3]=255,c+=3,_+=4;return createImageBitmap(new ImageData(n,i,A))}async _decompressZlib(e){try{return await this._decompress(e,"deflate")}catch(t){if(t instanceof RangeError)throw t;return await this._decompress(e,"deflate-raw")}}async _decompress(e,t){const i=Math.min(this._opts.kittySizeLimit,4*this._opts.pixelLimit,1e6*this._opts.storageLimit);let A=0;const s=new ReadableStream({pull(t){if(A>=e.length)return void t.close();const i=Math.min(A+4096,e.length);t.enqueue(new Uint8Array(e.subarray(A,i))),A=i}}).pipeThrough(new DecompressionStream(t)).getReader(),r=[];let o=0;try{for(;;){const{done:e,value:t}=await s.read();if(e)break;if(o+=t.byteLength,o>i)throw await s.cancel().catch(()=>{}),new RangeError("decompressed image exceeds byte limit");r.push(t)}}finally{s.releaseLock()}const a=new Uint8Array(o);let n=0;for(const e of r)a.set(e,n),n+=e.length;return a}get images(){return this._kittyStorage.images}get _kittyIdToStorageId(){return this._kittyStorage.kittyIdToStorageId}get pendingTransmissions(){return this._pendingTransmissions}}},470(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.parseKittyCommand=function(e){const t={},i=e.split(",");for(const e of i){const i=e.indexOf("=");if(-1===i)continue;const A=e.substring(0,i),s=e.substring(i+1);if("a"===A){t.action=s;continue}if("o"===A){t.compression=s;continue}if("t"===A){t.transmission=s;continue}if("d"===A){t.deleteSelector=s;continue}const r=parseInt(s,10);switch(A){case"f":t.format=r;break;case"i":t.id=r;break;case"I":t.imageNumber=r;break;case"s":t.width=r;break;case"v":t.height=r;break;case"x":t.x=r;break;case"y":t.y=r;break;case"w":t.sourceWidth=r;break;case"h":t.sourceHeight=r;break;case"X":t.xOffset=r;break;case"Y":t.yOffset=r;break;case"c":t.columns=r;break;case"r":t.rows=r;break;case"m":t.more=r;break;case"q":t.quiet=r;break;case"C":t.cursorMovement=r;break;case"z":t.zIndex=r;break;case"p":t.placementId=r}}return t}},235(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.KittyImageStorage=void 0;class i{constructor(e){this._storage=e,this._nextImageId=1,this._images=new Map,this._kittyIdToStorageId=new Map,this._storageIdToKittyId=new Map,this._handleStorageImageDeleted=e=>{const t=this._storageIdToKittyId.get(e);void 0!==t&&(this._kittyIdToStorageId.delete(t),this._storageIdToKittyId.delete(e),this._images.delete(t))},this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"iip"},this._previousOnImageDeleted=this._storage.onImageDeleted,this._wrappedOnImageDeleted=e=>{var t;null===(t=this._previousOnImageDeleted)||void 0===t||t.call(this,e),this._handleStorageImageDeleted(e)},this._storage.onImageDeleted=this._wrappedOnImageDeleted}reset(){this._nextImageId=1,this._images.clear(),this._kittyIdToStorageId.clear(),this._storageIdToKittyId.clear()}dispose(){this.reset(),this._storage.onImageDeleted===this._wrappedOnImageDeleted&&(this._storage.onImageDeleted=this._previousOnImageDeleted)}storeImage(e,t){const A=null!=e?e:this._nextImageId++,s=this._kittyIdToStorageId.get(A);void 0!==s&&(this._storage.deleteImage(s),this._kittyIdToStorageId.delete(A),this._storageIdToKittyId.delete(s)),!this._images.has(A)&&this._images.size>=i._maxStoredImages&&this._evictUndisplayedImages();const r=1e6*this._storage.getLimit();this._images.delete(A);let o=0;for(const e of this._images.values())o+=e.data.size;for(const e of[!1,!0])for(const[i,A]of this._images){if(o+t.data.size<=r)break;this._kittyIdToStorageId.has(i)===e&&(o-=A.data.size,this.deleteById(i))}return this._images.set(A,Object.assign(Object.assign({},t),{id:A})),A}addImage(e,t,i,A,s){const r=this._kittyIdToStorageId.get(e);void 0!==r&&this._storageIdToKittyId.delete(r),this._addImageOpts.scrolling=i,this._addImageOpts.layer=A,this._addImageOpts.zIndex=s;const o=this._storage.addImage(t,this._addImageOpts);this._kittyIdToStorageId.set(e,o),this._storageIdToKittyId.set(o,e)}getImage(e){return this._images.get(e)}deleteById(e){this._images.delete(e);const t=this._kittyIdToStorageId.get(e);void 0!==t&&(this._storage.deleteImage(t),this._kittyIdToStorageId.delete(e),this._storageIdToKittyId.delete(t))}deleteAll(){this._images.clear();for(const e of this._kittyIdToStorageId.values())this._storage.deleteImage(e);this._kittyIdToStorageId.clear(),this._storageIdToKittyId.clear()}get images(){return this._images}get kittyIdToStorageId(){return this._kittyIdToStorageId}get lastImageId(){return this._nextImageId-1}_evictUndisplayedImages(){for(const[e]of this._images){if(this._images.size<=i._maxStoredImages/2)break;this._kittyIdToStorageId.has(e)||this._images.delete(e)}}}t.KittyImageStorage=i,i._maxStoredImages=256},669(e,t,i){Object.defineProperty(t,"__esModule",{value:!0});const A=(0,i(552).InWasm)({s:1,t:0,d:"AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML"}),s=new Uint8Array("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("").map(e=>e.charCodeAt(0))),r=new Uint32Array(1024);r.fill(4278190080);for(let e=0;e<s.length;++e)r[s[e]]=e<<2;for(let e=0;e<s.length;++e)r[256+s[e]]=e>>4|(e<<4&255)<<8;for(let e=0;e<s.length;++e)r[512+s[e]]=e>>2<<8|(e<<6&255)<<16;for(let e=0;e<s.length;++e)r[768+s[e]]=e<<16;const o=new Uint8Array(0);t.default=class{constructor(e,t,i){if(this._inst=null,this._ended=!0,this._bytes=0,this.keepSize=null!=e?e:1048576,this.maxBytes=null!=t?t:4294901760,this._bytes=null!=i?i:32768,this._bytes>this.maxBytes||this.maxBytes>4294901760)throw new Error("invalid byte settings")}get data8(){return this._inst?this._d.subarray(0,this._m32[1282]):o}release(){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))}init(e,t){if(this.maxBytes=null!=e?e:this.maxBytes,this._bytes=null!=t?t:Math.min(this._bytes,this.maxBytes),this._bytes>this.maxBytes||this.maxBytes>4294901760)throw Error("invalid byte settings");let i=this._m32;const s=this._bytes+5152;this._inst?this._mem.buffer.byteLength<s&&(this._mem.grow(Math.ceil((s-this._mem.buffer.byteLength)/65536)),i=new Uint32Array(this._mem.buffer,0),this._d=new Uint8Array(this._mem.buffer,5152)):(this._mem=new WebAssembly.Memory({initial:Math.ceil(s/65536)}),this._inst=A({env:{memory:this._mem}}),i=new Uint32Array(this._mem.buffer,0),i.set(r,256),this._d=new Uint8Array(this._mem.buffer,5152)),i[1280]=0,i[1281]=0,i[1282]=0,this._m32=i,this._ended=!1}_realloc(e){const t=this._m32[1280]+e;if(this._bytes<t){if(t>this.maxBytes)return-3;let e=this._bytes;for(;(e*=2)<t;);if(e=Math.min(e,this.maxBytes),e<t)return-3;if(e+5152>this._mem.buffer.byteLength){const t=Math.ceil((e+5152-this._mem.buffer.byteLength)/65536);this._mem.grow(t),this._m32=new Uint32Array(this._mem.buffer,0),this._d=new Uint8Array(this._mem.buffer,5152)}this._bytes=e}return 0}put(e){if(!this._inst||this._ended)return-2;if(this._realloc(e.length))return-3;const t=this._m32;return this._d.set(e,t[1280]),t[1280]+=e.length,t[1280]-t[1281]>=131072?this._inst.exports.dec():0}end(){return this._ended=!0,this._inst?this._inst.exports.end():-2}get loadedBytes(){return this._inst?this._m32[1280]:0}get freeBytes(){return this._inst?this.maxBytes-this._m32[1280]:0}}},61(e,t,i){Object.defineProperty(t,"__esModule",{value:!0});const A=(0,i(552).InWasm)({s:1,t:0,d:"AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw=="});t.default=class{constructor(e){this.keepSize=e,this.width=0,this.height=0}decode(e){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];const t=this.width*this.height,i=4*t,s=e.length,r=Math.max(i,s)+(Math.min(i,s)>>1)+4096;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=A({env:{memory:this._mem}})),this._d||(this._d=new Uint8Array(this._mem.buffer));const o=this._mem.buffer.byteLength-s&-256;return this._d.set(e,o),this._inst.exports.dec(o,s,t),this._d.subarray(1024,1024+i)}release(){this._inst&&this._mem.buffer.byteLength>this.keepSize&&(this._inst=this._d=this._mem=null)}}},552(e,t){Object.defineProperty(t,"__esModule",{value:!0}),t.InWasm=function(e){if(e.d){const{t,s:A,d:s}=e;let r,o;const a=WebAssembly;return 0===t?A?e=>new a.Instance(o||(o=new a.Module(r||(r=i(s)))),e):e=>o?a.instantiate(o,e):a.instantiate(r||(r=i(s)),e).then(e=>(o=e.module)&&e.instance):1===t?A?()=>o||(o=new a.Module(r||(r=i(s)))):()=>o?Promise.resolve(o):a.compile(r||(r=i(s))).then(e=>o=e):A?()=>r||(r=i(s)):()=>Promise.resolve(r||(r=i(s)))}if("undefined"==typeof _wasmCtx)throw new Error('must run "inwasm"');_wasmCtx.add(e)};let i=e=>{if(Uint8Array.fromBase64)return Uint8Array.fromBase64(e);if("undefined"!=typeof Buffer)return Buffer.from(e,"base64");const t=atob(e),i=new Uint8Array(t.length);for(let e=0;e<i.length;++e)i[e]=t.charCodeAt(e);return i}}},t={};function i(A){var s=t[A];if(void 0!==s)return s.exports;var r=t[A]={exports:{}};return e[A].call(r.exports,r,r.exports,i),r.exports}var A={};return(()=>{var e=A;Object.defineProperty(e,"__esModule",{value:!0}),e.ImageAddon=void 0;const t=i(414),s=i(795),r=i(463),o=i(699),a=i(23),n=i(235),h=i(566),g=i(994),d=i(649),l={enableSizeReports:!0,pixelLimit:16777216,sixelSupport:!0,sixelScrolling:!0,sixelPaletteLimit:4096,sixelSizeLimit:33554432,storageLimit:128,showPlaceholder:!0,iipSupport:!0,iipSizeLimit:33554432,kittySupport:!0,kittySizeLimit:33554432};e.ImageAddon=class{constructor(e){this._disposables=[],this._handlers=new Map,this._onImageAdded=new t.Emitter,this.onImageAdded=this._onImageAdded.event,this._opts=Object.assign({},l,e),this._defaultOpts=Object.assign({},l,e)}dispose(){for(const e of this._handlers.values())e.reset();for(const e of this._disposables)e.dispose();this._disposables.length=0,this._handlers.clear(),this._onImageAdded.dispose()}_disposeLater(...e){for(const t of e)this._disposables.push(t)}activate(e){var t;if(this._terminal=e,this._renderer=new r.ImageRenderer(e),this._storage=new o.ImageStorage(e,this._renderer,this._opts),this._storage.onImageAdded=()=>this._onImageAdded.fire(),this._opts.enableSizeReports){const i=null!==(t=e.options.windowOptions)&&void 0!==t?t:{};i.getWinSizePixels=!0,i.getCellSizePixels=!0,i.getWinSizeChars=!0,e.options.windowOptions=i}if(this._disposeLater(this._renderer,this._storage,e.parser.registerCsiHandler({prefix:"?",final:"h"},e=>this._decset(e)),e.parser.registerCsiHandler({prefix:"?",final:"l"},e=>this._decrst(e)),e.parser.registerCsiHandler({final:"c"},e=>this._da1(e)),e.parser.registerCsiHandler({prefix:"?",final:"S"},e=>this._xtermGraphicsAttributes(e)),e.onRender(e=>{var t;return null===(t=this._storage)||void 0===t?void 0:t.render(e)}),e.parser.registerCsiHandler({intermediates:"!",final:"p"},()=>this.reset()),e.parser.registerEscHandler({final:"c"},()=>this.reset()),e._core._inputHandler.onRequestReset(()=>this.reset()),e.buffer.onBufferChange(()=>{var e;return null===(e=this._storage)||void 0===e?void 0:e.wipeAlternate()}),e.onResize(e=>{var t;return null===(t=this._storage)||void 0===t?void 0:t.viewportResize(e)})),this._opts.sixelSupport){const t=new g.SixelImageStorage(this._storage,this._opts,this._renderer,e),i=new h.SixelHandler(this._opts,t,e);this._handlers.set("sixel",i),this._disposeLater(e._core._inputHandler._parser.registerDcsHandler({final:"q"},i))}if(this._opts.iipSupport){const t=new d.IIPImageStorage(this._storage),i=new s.IIPHandler(this._opts,this._renderer,t,e);this._handlers.set("iip",i),this._disposeLater(e._core._inputHandler._parser.registerOscHandler(1337,i))}if(this._opts.kittySupport){const t=new n.KittyImageStorage(this._storage),i=new a.KittyGraphicsHandler(this._opts,this._renderer,t,e);this._handlers.set("kitty",i),this._disposeLater(t,i,e._core._inputHandler._parser.registerApcHandler({final:"G"},i))}}reset(){var e;this._opts.sixelScrolling=this._defaultOpts.sixelScrolling,this._opts.sixelPaletteLimit=this._defaultOpts.sixelPaletteLimit,null===(e=this._storage)||void 0===e||e.reset();for(const e of this._handlers.values())e.reset();return!1}get storageLimit(){var e;return(null===(e=this._storage)||void 0===e?void 0:e.getLimit())||-1}set storageLimit(e){var t;null===(t=this._storage)||void 0===t||t.setLimit(e),this._opts.storageLimit=e}get storageUsage(){return this._storage?this._storage.getUsage():-1}get showPlaceholder(){return this._opts.showPlaceholder}set showPlaceholder(e){var t;this._opts.showPlaceholder=e,null===(t=this._renderer)||void 0===t||t.showPlaceholder(e)}getImageAtBufferCell(e,t){var i;return null===(i=this._storage)||void 0===i?void 0:i.getImageAtBufferCell(e,t)}extractTileAtBufferCell(e,t){var i;return null===(i=this._storage)||void 0===i?void 0:i.extractTileAtBufferCell(e,t)}_report(e){var t;null===(t=this._terminal)||void 0===t||t._core.input(e,!1)}_decset(e){for(let t=0;t<e.length;++t)80===e[t]&&(this._opts.sixelScrolling=!1);return!1}_decrst(e){for(let t=0;t<e.length;++t)80===e[t]&&(this._opts.sixelScrolling=!0);return!1}_da1(e){return!!e[0]||!!this._opts.sixelSupport&&(this._report("[?62;4;9;22c"),!0)}_xtermGraphicsAttributes(e){var t,i,A,s,r,a;if(e.length<2)return!0;if(1===e[0])switch(e[1]){case 1:return this._report(`[?${e[0]};0;${this._opts.sixelPaletteLimit}S`),!0;case 2:this._opts.sixelPaletteLimit=this._defaultOpts.sixelPaletteLimit,this._report(`[?${e[0]};0;${this._opts.sixelPaletteLimit}S`);for(const e of this._handlers.values())e.reset();return!0;case 3:return e.length>2&&!(e[2]instanceof Array)&&e[2]<=4096?(this._opts.sixelPaletteLimit=e[2],this._report(`[?${e[0]};0;${this._opts.sixelPaletteLimit}S`)):this._report(`[?${e[0]};2S`),!0;case 4:return this._report(`[?${e[0]};0;4096S`),!0;default:return this._report(`[?${e[0]};2S`),!0}if(2===e[0])switch(e[1]){case 1:let n=null===(i=null===(t=this._renderer)||void 0===t?void 0:t.dimensions)||void 0===i?void 0:i.css.canvas.width,h=null===(s=null===(A=this._renderer)||void 0===A?void 0:A.dimensions)||void 0===s?void 0:s.css.canvas.height;if(!n||!h){const e=o.CELL_SIZE_DEFAULT;n=((null===(r=this._terminal)||void 0===r?void 0:r.cols)||80)*e.width,h=((null===(a=this._terminal)||void 0===a?void 0:a.rows)||24)*e.height}if(n*h<this._opts.pixelLimit)this._report(`[?${e[0]};0;${n.toFixed(0)};${h.toFixed(0)}S`);else{const t=Math.floor(Math.sqrt(this._opts.pixelLimit));this._report(`[?${e[0]};0;${t};${t}S`)}return!0;case 4:const g=Math.floor(Math.sqrt(this._opts.pixelLimit));return this._report(`[?${e[0]};0;${g};${g}S`),!0;default:return this._report(`[?${e[0]};2S`),!0}return this._report(`[?${e[0]};1S`),!0}}})(),A})());
  //# sourceMappingURL=addon-image.js.map
 \ No newline at end of file
 diff --git a/lib/addon-image.js.map b/lib/addon-image.js.map
-index 7a6ca6fc4405bd466272eac7d835a08b330f7be6..7a5eff4c47b4042eb1b4f72ec2283754988ca223 100644
+index 7a6ca6fc4405bd466272eac7d835a08b330f7be6..490d4c101a2f9d36f4e1d3727ec9714ae6255e0e 100644
 --- a/lib/addon-image.js.map
 +++ b/lib/addon-image.js.map
 @@ -1 +1 @@
 -{"version":3,"file":"addon-image.js","mappings":";CAAA,SAAAA,EAAAC,GACA,iBAAAC,SAAA,iBAAAC,OACAA,OAAAD,QAAAD,IACA,mBAAAG,QAAAA,OAAAC,IACAD,OAAA,GAAAH,GACA,iBAAAC,QACAA,QAAA,WAAAD,IAEAD,EAAA,WAAAC,GACC,CATD,CASCK,WAAA,uCCKD,SAAAC,EAAAC,GACA,WAAAA,CACA,CAEA,SAAAC,EAAAD,GACA,OAAAA,IAAA,KACA,CAEA,SAAAE,EAAAF,GACA,OAAAA,IAAA,MACA,CASA,SAAAG,EAAAC,EAAAC,EAAAC,EAAAC,EAAA,KACA,YAAAA,IAAA,QAAAD,IAAA,QAAAD,IAAA,MAAAD,KAAA,CACA,CAqCA,SAAAI,EAAAC,EAAAC,EAAAC,GACA,OAAAC,KAAAC,IAAAJ,EAAAG,KAAAE,IAAAH,EAAAD,GACA,CACA,SAAAK,EAAAC,EAAAC,EAAAC,GAKA,OAJAA,EAAA,IACAA,GAAA,GACAA,EAAA,IACAA,GAAA,GACA,EAAAA,EAAA,EACAD,EAAA,GAAAD,EAAAC,GAAAC,EACA,EAAAA,EAAA,EACAF,EACA,EAAAE,EAAA,EACAD,GAAAD,EAAAC,IAAA,IAAAC,GACAD,CACA,CAaA,SAAAE,EAAAf,EAAAC,EAAAC,GACA,kBAAAM,KAAAQ,MAAAd,EAAA,aAAAM,KAAAQ,MAAAf,EAAA,YAAAO,KAAAQ,MAAAhB,EAAA,aACA,CAjGAiB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAC/CjB,EAAA6B,mBAA6B7B,EAAA8B,mBAA6B9B,EAAA+B,iBAA2B/B,EAAAgC,mBAA6BhC,EAAAiC,oBAA8BjC,EAAAkC,aAAuBlC,EAAAyB,aAAuBzB,EAAAmC,kBAA4BnC,EAAAoC,aAAuBpC,EAAAS,WAAqBT,EAAAqC,MAAgBrC,EAAAQ,KAAeR,EAAAO,MAAgBP,EAAAK,IAAcL,EAAAsC,gBAAkB,EAGrVtC,EAAAsC,WAAkB,UAAAC,WAAA,IAAAC,YAAA,cAAAC,QAAA,GAClBzC,EAAAsC,YACAI,QAAAC,KAAA,+EAMA3C,EAAAK,IAAWA,EAIXL,EAAAO,MAAaA,EAIbP,EAAAQ,KAAYA,EAIZR,EAAAqC,MAHA,SAAA/B,GACA,OAAAA,IAAA,MACA,EAQAN,EAAAS,WAAkBA,EAOlBT,EAAAoC,aAHA,SAAAQ,GACA,WAAAA,EAAAA,GAAA,MAAAA,GAAA,OAAAA,IAAA,GACA,EA2BA5C,EAAAmC,kBArBA,SAAAS,EAAAC,GACA,MAAAnC,EAAAL,EAAAuC,GACAjC,EAAAJ,EAAAqC,GACAhC,EAAAJ,EAAAoC,GACA,IAAAxB,EAAA0B,OAAAC,iBACAC,GAAA,EAEA,QAAAC,EAAA,EAAoBA,EAAAJ,EAAAK,SAAoBD,EAAA,CACxC,MAAAE,EAAAzC,EAAAmC,EAAAI,GAAA,GACAG,EAAAzC,EAAAkC,EAAAI,GAAA,GACAI,EAAAzC,EAAAiC,EAAAI,GAAA,GACAK,EAAAH,EAAAA,EAAAC,EAAAA,EAAAC,EAAAA,EACA,IAAAC,EACA,OAAAL,EACAK,EAAAlC,IACAA,EAAAkC,EACAN,EAAAC,EAEA,CACA,OAAAD,CACA,EAmCAhD,EAAAyB,aAAoBA,EAQpBzB,EAAAkC,aAJA,SAAAqB,EAAAC,EAAAC,GAEA,OArBA,SAAAF,EAAAC,EAAAC,GACA,IAAAA,EAAA,CACA,MAAAC,EAAAxC,KAAAQ,MAAA,IAAA8B,GACA,OAAA/C,EAAAiD,EAAAA,EAAAA,EACA,CACA,MAAApC,EAAAkC,EAAA,GAAAA,GAAA,EAAAC,GAAAD,EAAAC,EAAAD,EAAAC,EACAlC,EAAA,EAAAiC,EAAAlC,EACA,OAAAb,EAAAK,EAAA,MAAAI,KAAAQ,MAAA,IAAAL,EAAAC,EAAAC,EAAAgC,EAAA,OAAAzC,EAAA,MAAAI,KAAAQ,MAAA,IAAAL,EAAAC,EAAAC,EAAAgC,KAAAzC,EAAA,MAAAI,KAAAQ,MAAA,IAAAL,EAAAC,EAAAC,EAAAgC,EAAA,OACA,CAaAI,EAAAJ,EAAA,SAAAC,EAAA,IAAAC,EAAA,IACA,EA+BAzD,EAAAiC,oBAA2B,IAAAO,YAAA,CAC3Bf,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,YA0BAzB,EAAAgC,mBAA0B,IAAAQ,YAAA,CAC1Bf,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,YAOAzB,EAAA+B,iBAAwB,MAExB,MAAA6B,EAAA,CACAnD,EAAA,OACAA,EAAA,SACAA,EAAA,SACAA,EAAA,WACAA,EAAA,SACAA,EAAA,WACAA,EAAA,WACAA,EAAA,aACAA,EAAA,aACAA,EAAA,SACAA,EAAA,SACAA,EAAA,WACAA,EAAA,WACAA,EAAA,WACAA,EAAA,WACAA,EAAA,cAGA6C,EAAA,uBACA,QAAA5C,EAAA,EAAoBA,EAAA,IAAOA,EAC3B,QAAAC,EAAA,EAAwBA,EAAA,IAAOA,EAC/B,QAAAC,EAAA,EAA4BA,EAAA,IAAOA,EACnCgD,EAAAC,KAAApD,EAAA6C,EAAA5C,GAAA4C,EAAA3C,GAAA2C,EAAA1C,KAKA,QAAA8C,EAAA,EAAoBA,GAAA,IAAUA,GAAA,GAC9BE,EAAAC,KAAApD,EAAAiD,EAAAA,EAAAA,IAEA,WAAAlB,YAAAoB,EACC,EAlCuB,GA0CxB5D,EAAA8B,mBAA0BrB,EAAA,WAC1BT,EAAA6B,mBAA0BpB,EAAA,6BCpP1BkB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAC/CjB,EAAA8D,YAAsB9D,EAAA+D,OAAiB/D,EAAAgE,QAAkBhE,EAAAiE,kBAAoB,EAC7E,MAAAC,EAAiBC,EAAQ,KACzBC,EAAeD,EAAQ,KAavBE,EAXA,SAAAZ,GACA,uBAAAa,OACA,OAAAA,OAAAC,KAAAd,EAAA,UAEA,MAAAe,EAAAC,KAAAhB,GACAiB,EAAA,IAAAnC,WAAAiC,EAAAtB,QACA,QAAAD,EAAA,EAAoBA,EAAAyB,EAAAxB,SAAmBD,EACvCyB,EAAAzB,GAAAuB,EAAAG,WAAA1B,GAEA,OAAAyB,CACA,CACAE,CAAAR,EAAAS,OAAAC,OACA,IAAAC,EAEA,MAAAC,EAAA,IAAAxC,YAEA,MAAAyC,EACA,WAAAC,GACAC,KAAAC,YAAAC,GAAA,EACAF,KAAAG,YAAAC,GAAA,CACA,CACA,WAAAC,CAAAH,GACA,OAAAF,KAAAC,YAAAC,EACA,CACA,WAAAI,CAAAF,GACA,OAAAJ,KAAAG,YAAAC,EACA,EAGA,MAAAG,EAAA,CACAC,YAAA,UACAC,WAAA1B,EAAArC,mBACAgE,UAAA3B,EAAApC,mBACAe,QAAAqB,EAAAjC,oBACA6D,aAAA1B,EAAAS,OAAAkB,aACAC,UAAA,GAMA,SAAA/B,EAAAgC,GACA,MAAAC,EAAA,IAAAjB,EACAkB,EAAA,CACAC,IAAA,CACAZ,YAAAU,EAAAV,YAAAa,KAAAH,GACAT,YAAAS,EAAAT,YAAAY,KAAAH,KAGA,OAAAI,YAAAC,YAAAxB,GAAAV,EAAA8B,GACAK,KAAAC,IACA1B,EAAAA,GAAA0B,EAAAxG,OACA,IAAA+D,EAAAiC,EAAAQ,EAAAC,UAAAD,EAAAP,IAEA,CACAlG,EAAAiE,aAAoBA,EAiCpB,MAAAD,EAKA,WAAAkB,CAAAe,EAAAU,EAAAC,GASA,GARAzB,KAAA0B,cAAAzC,EAAAS,OAAAiC,UAAA,EACA3B,KAAA4B,QAAA/B,EACAG,KAAA6B,YAAA,GACA7B,KAAA8B,UAAA,EACA9B,KAAA+B,UAAA9C,EAAAS,OAAAiC,UACA3B,KAAAgC,YAAA,EACAhC,KAAAiC,eAAA,EACAjC,KAAAkC,MAAA1F,OAAA2F,OAAA,GAAqC5B,EAAAO,GACrCd,KAAAkC,MAAAvB,aAAA1B,EAAAS,OAAAkB,aACA,UAAAwB,MAAA,+CAA2EnD,EAAAS,OAAAkB,gBAE3E,GAAAY,EAUAC,EAAAxB,YAAAD,KAAAqC,aAAAnB,KAAAlB,MACAyB,EAAAtB,YAAAH,KAAAsC,YAAApB,KAAAlB,UAXA,CACA,MAAAlF,EAAA8E,IAAAA,EAAA,IAAAuB,YAAAoB,OAAArD,IACAsC,EAAA,IAAAL,YAAAqB,SAAA1H,EAAA,CACAmG,IAAA,CACAZ,YAAAL,KAAAqC,aAAAnB,KAAAlB,MACAM,YAAAN,KAAAsC,YAAApB,KAAAlB,QAGA,CAKAA,KAAAwB,UAAAA,EACAxB,KAAAyC,MAAAzC,KAAAwB,UAAA3G,QACAmF,KAAA0C,OAAA,IAAAtF,WAAA4C,KAAAyC,MAAAE,OAAArF,OAAA0C,KAAAyC,MAAAG,oBAAA3D,EAAAS,OAAAmD,YACA7C,KAAA8C,QAAA,IAAAzF,YAAA2C,KAAAyC,MAAAE,OAAArF,OAAA0C,KAAAyC,MAAAM,oBAAA,IACA/C,KAAAgD,SAAA,IAAA3F,YAAA2C,KAAAyC,MAAAE,OAAArF,OAAA0C,KAAAyC,MAAAQ,sBAAAhE,EAAAS,OAAAkB,cACAZ,KAAAgD,SAAAE,IAAAlD,KAAAkC,MAAAxE,SACAsC,KAAAmD,MAAA,IAAA9F,YAAA2C,KAAAyC,MAAAE,OAAArF,OAAA0C,KAAAyC,MAAAW,kBACApD,KAAAyC,MAAAY,KAAAtE,EAAArC,mBAAA,EAAAsD,KAAAkC,MAAAvB,aAAA,EACA,CAEA,cAAA2C,GAAuB,OAAAtD,KAAA8C,QAAA,GACvB,aAAAS,GAAsB,OAAAvD,KAAA8C,QAAA,GACtB,gBAAAU,GAAyB,OAAAxD,KAAA8C,QAAA,GACzB,iBAAAW,GAA0B,OAAAzD,KAAA8C,QAAA,GAC1B,UAAAY,GAAmB,OAAA1D,KAAA8C,QAAA,GAAA9C,KAAA8C,QAAA,OACnB,WAAAa,GAAoB,OAAA3D,KAAA8C,QAAA,GACpB,UAAAc,GAAmB,OAAA5D,KAAA8C,QAAA,GACnB,SAAAe,GAAkB,OAAA7D,KAAA8C,QAAA,IAClB,iBAAAgB,GAA0B,OAAA9D,KAAA8C,QAAA,IAC1B,WAAAR,CAAAlC,GACA,OAAAA,EAAA,CACA,MAAA2D,EAAA/D,KAAAE,MAAAF,KAAAgE,OACA,GAAAD,EAAA/D,KAAA4B,QAAA7D,OAAA,CACA,GAAAiC,KAAAkC,MAAA1B,aAAA,EAAAuD,EAAA/D,KAAAkC,MAAA1B,YAEA,MADAR,KAAAiE,UACA,IAAA7B,MAAA,8BAEApC,KAAA4B,QAAA,IAAAvE,YAAA0G,EACA,CACA/D,KAAA8B,UAAA9B,KAAA0D,MACA,MACA,OAAAtD,EACA,OAAAJ,KAAA4D,OAAA,CAEA,MAAAG,EAAAhI,KAAAE,IAAA+D,KAAAwD,aAAAvE,EAAAS,OAAAiC,WAAA3B,KAAAyD,cACA,GAAAM,EAAA/D,KAAA4B,QAAA7D,OAAA,CACA,GAAAiC,KAAAkC,MAAA1B,aAAA,EAAAuD,EAAA/D,KAAAkC,MAAA1B,YAEA,MADAR,KAAAiE,UACA,IAAA7B,MAAA,8BAEApC,KAAA4B,QAAA,IAAAvE,YAAA0G,EACA,CACA,MAGA/D,KAAA4B,QAAA7D,OAAA,QACAiC,KAAA4B,QAAA,IAAAvE,YAAA,QAIA,QACA,CACA,QAAA6G,CAAAC,EAAAC,GACA,MAAAL,EAAAI,EAAAC,EACA,GAAAL,EAAA/D,KAAA4B,QAAA7D,OAAA,CACA,GAAAiC,KAAAkC,MAAA1B,aAAA,EAAAuD,EAAA/D,KAAAkC,MAAA1B,YAEA,MADAR,KAAAiE,UACA,IAAA7B,MAAA,8BAGA,MAAAiC,EAAA,IAAAhH,YAAA,MAAAtB,KAAAuI,KAAAP,EAAA,QACAM,EAAAnB,IAAAlD,KAAA4B,SACA5B,KAAA4B,QAAAyC,CACA,CACA,CACA,YAAAhC,CAAAnC,GACA,MAAAqE,EAAAvE,KAAA0B,cACA,IAAAyC,EAAAnE,KAAAgC,YACA,OAAAhC,KAAA6D,MAAA,CACA,IAAAW,EAAAxE,KAAAgE,OAAAhE,KAAAiC,eACA5F,EAAA,EACA,KAAAA,EAAA,GAAAmI,EAAA,GACAxE,KAAA4B,QAAAsB,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAlI,EAAAkI,EAAAlI,EAAA6D,GAAAiE,EAAAjE,EAAA7D,GACAA,IACAmI,IAEAxE,KAAAgC,aAAA9B,EAAA7D,EACA2D,KAAAiC,gBAAA5F,CACA,MACA,OAAA2D,KAAA6D,MAAA,CACA7D,KAAAkE,SAAAC,EAAA,EAAAjE,GACAF,KAAA8B,UAAA/F,KAAAC,IAAAgE,KAAA8B,UAAA5B,GACAF,KAAA+B,UAAAhG,KAAAE,IAAA+D,KAAA+B,UAAA7B,GACA,QAAApC,EAAA,EAA4BA,EAAA,IAAOA,EACnCkC,KAAA4B,QAAAsB,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAzG,EAAAyG,EAAAzG,EAAAoC,GAAAiE,EAAAjE,EAAApC,GAEAkC,KAAA6B,YAAAnD,KAAAwB,GACAF,KAAAgC,aAAA,EAAA9B,EACAF,KAAAiC,gBAAA,CACA,CACA,QACA,CAMA,SAAA/B,GACA,WAAAF,KAAA6D,MACA7D,KAAA0D,OACA3H,KAAAC,IAAAgE,KAAA8B,UAAA9B,KAAAyC,MAAAiC,gBACA,CAMA,UAAAV,GACA,WAAAhE,KAAA6D,MACA7D,KAAA2D,QACA3D,KAAAyC,MAAAiC,gBACA,EAAA1E,KAAA6B,YAAA9D,OAAAiC,KAAAyC,MAAAkC,iBACA,EAAA3E,KAAA6B,YAAA9D,MACA,CAIA,WAAAL,GACA,OAAAsC,KAAAgD,SAAAyB,SAAA,EAAAzE,KAAA8D,cACA,CAUA,eAAAc,GACA,OAAA5E,KAAA4B,QAAAiD,WAAA7E,KAAAyC,MAAAE,OAAArF,OAAAuH,WAAA,EAAA7E,KAAA6B,YAAA9D,MACA,CAIA,cAAA+G,GACA,OACA5E,MAAAF,KAAAE,MACA8D,OAAAhE,KAAAgE,OACA5D,KAAAJ,KAAA6D,MACAkB,MAAA/E,KAAA4D,OACA/C,WAAAb,KAAAuD,UACA5C,aAAAX,KAAA8D,cACApD,UAAAV,KAAAsD,WACA0B,SAAAhF,KAAA4E,YACAK,iBAAA,CACAC,UAAAlF,KAAA8C,QAAA,GACAqC,YAAAnF,KAAA8C,QAAA,GACA5C,MAAAF,KAAAwD,aACAQ,OAAAhE,KAAAyD,eAGA,CAMA,IAAAJ,CAAA3C,EAAAV,KAAAkC,MAAAxB,UAAAhD,EAAAsC,KAAAkC,MAAAxE,QAAAiD,EAAAX,KAAAkC,MAAAvB,aAAAE,EAAAb,KAAAkC,MAAArB,UACAb,KAAAyC,MAAAY,KAAArD,KAAAkC,MAAAzB,WAAAC,EAAAC,EAAAE,EAAA,KACAnD,GACAsC,KAAAgD,SAAAE,IAAAxF,EAAA+G,SAAA,EAAAxF,EAAAS,OAAAkB,eAEAZ,KAAA6B,YAAA9D,OAAA,EACAiC,KAAA8B,UAAA,EACA9B,KAAA+B,UAAA9C,EAAAS,OAAAiC,UACA3B,KAAAgC,YAAA,EACAhC,KAAAiC,eAAA,CACA,CAKA,MAAArD,CAAAwG,EAAAC,EAAA,EAAAC,EAAAF,EAAArH,QACA,IAAAU,EAAA4G,EACA,KAAA5G,EAAA6G,GAAA,CACA,MAAAvH,EAAAhC,KAAAE,IAAAqJ,EAAA7G,EAAAQ,EAAAS,OAAAmD,YACA7C,KAAA0C,OAAAQ,IAAAkC,EAAAX,SAAAhG,EAAAA,GAAAV,IACAiC,KAAAyC,MAAA7D,OAAA,EAAAb,EACA,CACA,CAMA,YAAAwH,CAAAH,EAAAC,EAAA,EAAAC,EAAAF,EAAArH,QACA,IAAAU,EAAA4G,EACA,KAAA5G,EAAA6G,GAAA,CACA,MAAAvH,EAAAhC,KAAAE,IAAAqJ,EAAA7G,EAAAQ,EAAAS,OAAAmD,YACA,QAAA/E,EAAA,EAAA0H,EAAA/G,EAAmCX,EAAAC,IAAYD,IAAA0H,EAC/CxF,KAAA0C,OAAA5E,GAAAsH,EAAA5F,WAAAgG,GAEA/G,GAAAV,EACAiC,KAAAyC,MAAA7D,OAAA,EAAAb,EACA,CACA,CAKA,UAAA0H,GACA,OAAAzF,KAAA6D,QAAA7D,KAAAE,QAAAF,KAAAgE,OACA,OAAAnE,EAGA,MAAA6F,EAAA1F,KAAAyC,MAAAiC,gBACA,OAAA1E,KAAA6D,MAAA,CACA,IAAAW,EAAAxE,KAAAgE,OAAAhE,KAAAiC,eACA,GAAAuC,EAAA,GACA,MAAAD,EAAAvE,KAAA0B,cACA,IAAAyC,EAAAnE,KAAAgC,YACA3F,EAAA,EACA,KAAAA,EAAA,GAAAmI,EAAA,GACAxE,KAAA4B,QAAAsB,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAlI,EAAAkI,EAAAlI,EAAAqJ,GAAAvB,EAAAuB,EAAArJ,GACAA,IACAmI,IAEAA,GACAxE,KAAA4B,QAAA+D,KAAA3F,KAAAsD,WAAAa,EAAAuB,EAAArJ,EAEA,CACA,OAAA2D,KAAA4B,QAAA6C,SAAA,EAAAzE,KAAAE,MAAAF,KAAAgE,OACA,CACA,OAAAhE,KAAA6D,MAAA,CACA,GAAA7D,KAAA+B,YAAA/B,KAAA8B,UAAA,CACA,IAAA8D,GAAA,EACA,GAAAF,EACA,GAAAA,IAAA1F,KAAA+B,UACA6D,GAAA,MAEA,CACA,MAAArB,EAAAvE,KAAA0B,cACA,IAAAyC,EAAAnE,KAAAgC,YACAhC,KAAAkE,SAAAC,EAAA,EAAAuB,GACA,QAAA5H,EAAA,EAAwCA,EAAA,IAAOA,EAC/CkC,KAAA4B,QAAAsB,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAzG,EAAAyG,EAAAzG,EAAA4H,GAAAvB,EAAAuB,EAAA5H,EAEA,CAEA,IAAA8H,EACA,OAAA5F,KAAA4B,QAAA6C,SAAA,EAAAzE,KAAAE,MAAAF,KAAAgE,OAEA,CAGA,MAAA6B,EAAA,IAAAxI,YAAA2C,KAAAE,MAAAF,KAAAgE,QACA6B,EAAAF,KAAA3F,KAAAsD,YACA,IAAAwC,EAAA,EACAT,EAAA,EACA,QAAAvH,EAAA,EAA4BA,EAAAkC,KAAA6B,YAAA9D,SAA6BD,EAAA,CACzD,MAAAiI,EAAA/F,KAAA6B,YAAA/D,GACA,QAAAW,EAAA,EAAgCA,EAAA,IAAOA,EACvCoH,EAAA3C,IAAAlD,KAAA4B,QAAA6C,SAAAY,EAAAA,GAAAU,GAAAD,GACAA,GAAA9F,KAAAE,KAEA,CAEA,GAAAwF,EAAA,CACA,MAAAnB,EAAAvE,KAAA0B,cAEAsE,EAAAhG,KAAAyC,MAAAkC,iBACA,QAAA7G,EAAA,EAAgCA,EAAAkI,IAAmBlI,EACnD+H,EAAA3C,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAzG,EAAAyG,EAAAzG,EAAA4H,GAAAI,EAAA9F,KAAAE,MAAApC,EAEA,CACA,OAAA+H,CACA,CAEA,OAAAhG,CACA,CAKA,SAAAoG,GACA,WAAAC,kBAAAlG,KAAAyF,OAAAnI,OAAA,EAAA0C,KAAAE,MAAAF,KAAAgE,OAAA,EACA,CAaA,OAAAC,GACAjE,KAAA4B,QAAA/B,EACAG,KAAA6B,YAAA9D,OAAA,EACAiC,KAAA8B,UAAA,EACA9B,KAAA+B,UAAA9C,EAAAS,OAAAiC,UAGA3B,KAAAyC,MAAAY,KAAAtE,EAAArC,mBAAA,EAAAsD,KAAAkC,MAAAvB,aAAA,EACA,EAEA9F,EAAAgE,QAAeA,EAyBfhE,EAAA+D,OAXA,SAAAwG,EAAAtE,GACA,MAAAqF,EAAA,IAAAtH,EAAAiC,GAGA,OAFAqF,EAAA9C,OACA,iBAAA+B,EAAAe,EAAAZ,aAAAH,GAAAe,EAAAvH,OAAAwG,GACA,CACAlF,MAAAiG,EAAAjG,MACA8D,OAAAmC,EAAAnC,OACAyB,OAAAU,EAAAV,OACAQ,MAAAE,EAAAF,MAEA,EAkBApL,EAAA8D,YAXAyH,eAAAhB,EAAAtE,GACA,MAAAqF,QAAArH,EAAAgC,GAGA,OAFAqF,EAAA9C,OACA,iBAAA+B,EAAAe,EAAAZ,aAAAH,GAAAe,EAAAvH,OAAAwG,GACA,CACAlF,MAAAiG,EAAAjG,MACA8D,OAAAmC,EAAAnC,OACAyB,OAAAU,EAAAV,OACAQ,MAAAE,EAAAF,MAEA,YCpdAzJ,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAC/CjB,EAAA6E,YAAc,EACd7E,EAAA6E,OAAc,CACdmD,WAAA,MACAjC,aAAA,KACAe,UAAA,MACAhC,MAAA,+qdCCA,MAAA0G,EAAArH,EAAA,KAoEA,IAAiBsH,YA9DjB,iBAAAvG,GACUC,KAAAuG,WAAqD,GACrDvG,KAAAwG,WAAY,CA0DtB,CAvDE,SAAWC,GACT,OAAIzG,KAAK0G,SAGT1G,KAAK0G,OAAS,CAACC,EAAyBC,EAAgBC,KACtD,GAAI7G,KAAKwG,UACP,OAAO,EAAAH,EAAAS,cAAa,QAGtB,MAAMC,EAAQ,CAAEC,GAAIL,EAAUC,YAC9B5G,KAAKuG,WAAavG,KAAKuG,WAAWU,QAClCjH,KAAKuG,WAAW7H,KAAKqI,GAErB,MAAMxH,GAAS,EAAA8G,EAAAS,cAAa,KAC1B,MAAMjJ,EAAMmC,KAAKuG,WAAWW,QAAQH,IACvB,IAATlJ,IACFmC,KAAKuG,WAAavG,KAAKuG,WAAWU,QAClCjH,KAAKuG,WAAWY,OAAOtJ,EAAK,MAYhC,OARIgJ,IACEO,MAAMC,QAAQR,GAChBA,EAAYnI,KAAKa,GAEjBsH,EAAYS,IAAI/H,IAIbA,IA3BAS,KAAK0G,MA8BhB,CAEO,IAAAa,CAAKd,GACV,GAAIzG,KAAKwG,YAAcxG,KAAKuG,WAAWxI,OACrC,OAEF,GAA+B,IAA3BiC,KAAKuG,WAAWxI,OAElB,YADAiC,KAAKuG,WAAW,GAAGS,GAAGQ,KAAKxH,KAAKuG,WAAW,GAAGK,SAAUH,GAG1D,MAAMgB,EAAYzH,KAAKuG,WACvB,IAAK,IAAIzI,EAAI,EAAG4J,EAAMD,EAAU1J,OAAQD,EAAI4J,IAAO5J,EACjD2J,EAAU3J,GAAGkJ,GAAGQ,KAAKC,EAAU3J,GAAG8I,SAAUH,EAEhD,CAEO,OAAAkB,GACD3H,KAAKwG,YAGTxG,KAAKwG,WAAY,EACjBxG,KAAKuG,WAAWxI,OAAS,EAC3B,GAGF,SAAiBuI,GACCA,EAAAsB,QAAhB,SAA2BxI,EAAiByI,GAC1C,OAAOzI,EAAK0I,GAAKD,EAAGN,KAAKO,GAC3B,EAEgBxB,EAAAyB,IAAhB,SAA0BtB,EAAkBsB,GAC1C,MAAO,CAACpB,EAAyBC,EAAgBC,IACxCJ,EAAM3I,GAAK6I,EAASa,KAAKZ,EAAUmB,EAAIjK,SAAKkK,EAAWnB,EAElE,EAIgBP,EAAA2B,IAAhB,YAA0BC,GACxB,MAAO,CAACvB,EAAyBC,EAAgBC,KAC/C,MAAMsB,EAAQ,IAAI9B,EAAA+B,gBAClB,IAAK,MAAM3B,KAASyB,EAClBC,EAAMb,IAAIb,EAAMqB,GAAKnB,EAASa,KAAKZ,EAAUkB,KAS/C,OAPIjB,IACEO,MAAMC,QAAQR,GAChBA,EAAYnI,KAAKyJ,GAEjBtB,EAAYS,IAAIa,IAGbA,EAEX,EAIgB7B,EAAA+B,gBAAhB,SAAmC5B,EAAkB6B,EAAqCC,GAExF,OADAD,EAAQC,GACD9B,EAAMqB,GAAKQ,EAAQR,GAC5B,CACD,CApCD,CAAiBxB,IAAUzL,EAAAyL,WAAVA,EAAU,eChE3B,SAAAQ,EAA6BE,GAC3B,MAAO,CAAEW,QAASX,EACpB,CAKA,SAAAW,EAA+Ca,GAC7C,IAAKA,EACH,OAAOA,EAET,GAAIpB,MAAMC,QAAQmB,GAAM,CACtB,IAAK,MAAMrK,KAAKqK,EACdrK,EAAEwJ,UAEJ,MAAO,EACT,CAEA,OADAa,EAAIb,UACGa,CACT,8JAEA,YAAsC3B,GACpC,OAAOC,EAAa,IAAMa,EAAQd,GACpC,EAEA,MAAAuB,EAAA,WAAArI,GACmBC,KAAAyI,aAAe,IAAIC,IAC5B1I,KAAA2I,aAAc,CAgCxB,CA9BE,cAAWC,GACT,OAAO5I,KAAK2I,WACd,CAEO,GAAArB,CAA2BuB,GAMhC,OALI7I,KAAK2I,YACPE,EAAElB,UAEF3H,KAAKyI,aAAanB,IAAIuB,GAEjBA,CACT,CAEO,OAAAlB,GACL,IAAI3H,KAAK2I,YAAT,CAGA3I,KAAK2I,aAAc,EACnB,IAAK,MAAMxK,KAAK6B,KAAKyI,aACnBtK,EAAEwJ,UAEJ3H,KAAKyI,aAAaK,OALlB,CAMF,CAEO,KAAAA,GACL,IAAK,MAAM3K,KAAK6B,KAAKyI,aACnBtK,EAAEwJ,UAEJ3H,KAAKyI,aAAaK,OACpB,sBAGF,MAAAC,EAAA,WAAAhJ,GAGqBC,KAAAgJ,OAAS,IAAIZ,CASlC,CAPS,OAAAT,GACL3H,KAAKgJ,OAAOrB,SACd,CAEU,SAAAsB,CAAiCJ,GACzC,OAAO7I,KAAKgJ,OAAO1B,IAAIuB,EACzB,iBAVuBE,EAAAG,KAAoB1M,OAAO2M,OAAO,CAAE,OAAAxB,GAAY,wBAazE,iBAAA5H,GAEUC,KAAA2I,aAAc,CAuBxB,CArBE,SAAW7M,GACT,OAAOkE,KAAK2I,iBAAcX,EAAYhI,KAAKoJ,MAC7C,CAEA,SAAWtN,CAAMA,GACXkE,KAAK2I,aAAe7M,IAAUkE,KAAKoJ,SAGvCpJ,KAAKoJ,QAAQzB,UACb3H,KAAKoJ,OAAStN,EAChB,CAEO,KAAAgN,GACL9I,KAAKlE,WAAQkM,CACf,CAEO,OAAAL,GACL3H,KAAK2I,aAAc,EACnB3I,KAAKoJ,QAAQzB,UACb3H,KAAKoJ,YAASpB,CAChB,wKC1GF,MAAAqB,EAAArK,EAAA,KAEAsK,EAAAtK,EAAA,KACAuK,EAAAC,EAAAxK,EAAA,MACAyK,EAAAD,EAAAxK,EAAA,KACA0K,EAAA1K,EAAA,KACA2K,EAAA3K,EAAA,KAaM4K,EAAgC,CACpCC,KAAI,EACJC,KAAM,eACNC,KAAM,EACN7J,MAAO,OACP8D,OAAQ,OACRgG,oBAAqB,EACrBC,OAAQ,gBAIV,MASE,WAAAlK,CACmBmC,EACAgI,EACAC,EACAC,GAHApK,KAAAkC,MAAAA,EACAlC,KAAAkK,UAAAA,EACAlK,KAAAmK,SAAAA,EACAnK,KAAAoK,cAAAA,EAZXpK,KAAAqK,UAAW,EACXrK,KAAAsK,IAAM,IAAIZ,EAAAa,aACVvK,KAAAwK,QAAyBZ,EAGzB5J,KAAAyK,cAAe,EACfzK,KAAA0K,aAAc,EAQpB,MAAMC,EAAkB5O,KAAKuI,KAA+B,EAA1BtE,KAAKkC,MAAM0I,aAAmB,GAC1DC,EAAe9O,KAAKE,IAAG,QAA4B0O,GACzD3K,KAAK8K,KAAO,IAAIvB,EAAAwB,QAAa,QAAyBJ,EAAiBE,GACvE7K,KAAKgL,QAAU,IAAIvB,EAAAsB,QAAU,QAC/B,CAEO,KAAAE,GACLjL,KAAKsK,IAAIW,QACTjL,KAAK8K,KAAK7G,UACVjE,KAAKgL,QAAQ/G,SACf,CAEO,KAAAoB,GACLrF,KAAKqK,UAAW,EAChBrK,KAAKsK,IAAIW,OACX,CAEO,GAAAC,CAAI9F,EAAmBC,EAAeC,GAC3C,IAAItF,KAAKqK,SAET,GAAkB,IAAdrK,KAAKsK,IAAIa,MAC6C,IAAnDnL,KAAK8K,KAAKI,IAAI9F,EAAKX,SAASY,EAAOC,MACtCtF,KAAK8K,KAAK7G,UACVjE,KAAKqK,UAAW,OAEb,CACL,MAAMe,EAAUpL,KAAKsK,IAAIe,MAAMjG,EAAMC,EAAOC,GAC5C,IAAiB,IAAb8F,EAEF,YADApL,KAAKqK,UAAW,GAGlB,GAAIe,EAAU,EAAG,CAEf,GAAW,IADKpL,KAAKsK,IAAIgB,OAAOzB,KACG,CAOjC,GANI7J,KAAKyK,eACPzK,KAAKyK,cAAe,EACpBzK,KAAK0K,aAAc,EACnB1K,KAAK8K,KAAK7G,WAEZjE,KAAKwK,QAAUhO,OAAO2F,OAAO,GAAIyH,EAAgB5J,KAAKsK,IAAIgB,SACrDtL,KAAKwK,QAAQP,OAEhB,YADAjK,KAAKqK,UAAW,GAGlBrK,KAAK8K,KAAKzH,MACZ,MAAO,GAAIrD,KAAK0K,YAEd,YADA1K,KAAKqK,UAAW,GAGwC,IAArDrK,KAAK8K,KAAKI,IAAI9F,EAAKX,SAAS2G,EAAS9F,MACxCtF,KAAK8K,KAAK7G,UACVjE,KAAKqK,UAAW,EACZrK,KAAKyK,eAAczK,KAAK0K,aAAc,GAE9C,CACF,CACF,CAEO,GAAApF,CAAIiG,aACT,GAAIvL,KAAKqK,SAAU,OAAO,EAE1B,GAAkB,IAAdrK,KAAKsK,IAAIa,OACPnL,KAAKsK,IAAIhF,MAAO,OAAO,EAE7B,MAAMkG,EAAUxL,KAAKsK,IAAIgB,OAAOzB,KAEhC,GAAW,IAAP2B,EAAmC,OAAO,EAE9C,GAAW,IAAPA,EAAyC,CAE3C,IAAIC,EAAInC,EAAAoC,kBAAkBxL,MACtB9B,EAAIkL,EAAAoC,kBAAkB1H,OACtBhE,KAAKkK,UAAUyB,aACjBF,EAAIzL,KAAKkK,UAAUyB,WAAWC,IAAIC,OAAO3L,MAAQF,KAAKoK,cAAc0B,KACpE1N,EAAI4B,KAAKkK,UAAUyB,WAAWC,IAAIC,OAAO7H,OAAShE,KAAKoK,cAAc2B,MAEvE,MAAMC,EAAyD,QAApDC,EAA+C,QAA5CC,EAAAlM,KAAKoK,cAAc+B,MAAMC,2BAAmB,IAAAF,OAAA,EAAAA,EAAEG,WAAG,IAAAJ,EAAAA,EAAI,EAC7DK,EAAS,yBAA4BlO,EAAEmO,QAAQ,MAAMd,EAAEc,QAAQ,MAAMP,EAAMO,QAAQ,QAEzF,OADAvM,KAAKoK,cAAcoC,MAAMF,GAAQ,IAC1B,CACT,CAEA,GAAW,IAAPd,EAMF,OALAxL,KAAKwK,QAAUhO,OAAO2F,OAAO,GAAIyH,EAAgB5J,KAAKsK,IAAIgB,QAC1DtL,KAAKyK,cAAe,EACpBzK,KAAK0K,aAAc,EACnB1K,KAAK8K,KAAK7G,UACVjE,KAAK8K,KAAKzH,QACH,EAGT,GAAW,IAAPmI,EAAkC,CACpC,IAAKxL,KAAKyK,aAAc,OAAO,EAE/B,GADAzK,KAAKyK,cAAe,EAChBzK,KAAK0K,aAAgC,IAAjB1K,KAAKwK,QAAQX,KAAqC,OAAO,CACnF,CAIA,IAII4C,EA0BAC,EA9BAjB,EAAI,EACJrN,EAAI,EAIJuO,EAAUhD,EAAAiD,iBAoBd,IAnBIH,EAAOlB,MACLkB,GAAQzM,KAAK8K,KAAKxF,QACpBqH,GAAU,EAAAhD,EAAAkD,WAAU7M,KAAK8K,KAAK7E,QAC1BwG,EAAwB,gBAAjBE,EAAQG,OACjBrB,EAAIkB,EAAQzM,MACZ9B,EAAIuO,EAAQ3I,QACRyI,EAAOhB,GAAKrN,GAAKqN,EAAIrN,EAAI4B,KAAKkC,MAAM6K,cACrCtB,EAAGrN,GAAK4B,KAAKgN,QAAQvB,EAAGrN,GAAG2J,IAAIhM,KAAKkR,OACrCR,EAAOhB,GAAKrN,GAAKqN,EAAIrN,EAAI4B,KAAKkC,MAAM6K,YAEpCxP,QAAQC,KAAK,8BAA8BmP,EAAQzM,SAASyM,EAAQ3I,WAGtEzG,QAAQC,KAAK,gCAGfD,QAAQC,KAAK,uCAGZiP,EAEH,OADAzM,KAAK8K,KAAK7G,WACH,EAIT,GAAqB,cAAjB0I,EAAQG,KAAsB,CAChC,MAAM1H,EAAOpF,KAAKgL,QAAQpM,OAAOoB,KAAK8K,KAAK7E,OAO3C,GANAyG,EAAO,IAAIQ,UACT,IAAIhH,kBAAkBd,EAAK9H,OAAQ8H,EAAK+H,WAAY/H,EAAKP,YACzD7E,KAAKgL,QAAQ9K,MACbF,KAAKgL,QAAQhH,QAEfhE,KAAKgL,QAAQ/G,UACTwH,IAAMzL,KAAKgL,QAAQ9K,OAAS9B,IAAM4B,KAAKgL,QAAQhH,OAAQ,CAEzDhE,KAAK8K,KAAK7G,UACV,MAAM4H,EAASxC,EAAA+D,cAAcC,kBAAarF,EAAWhI,KAAKgL,QAAQ9K,MAAOF,KAAKgL,QAAQhH,QAGtF,OAFuB,QAAvBsJ,EAAAzB,EAAO0B,WAAW,aAAK,IAAAD,GAAAA,EAAEE,aAAad,EAAM,EAAG,GAC/C1M,KAAKmK,SAASsD,SAAS5B,IAChB,CACT,CACF,MACEa,EAAO,IAAIgB,KAAK,CAAC1N,KAAK8K,KAAK7E,OAAQ,CAAE4D,KAAM8C,EAAQG,OAGrD,OADA9M,KAAK8K,KAAK7G,UACH0J,kBAAkBjB,EAAM,CAAEkB,YAAanC,EAAGoC,aAAczP,IAC5DiD,KAAKyM,IACJ9N,KAAKmK,SAASsD,SAASK,IAChB,IAERC,MAAMjG,IACLvK,QAAQC,KAAK,uBAAuBmP,EAAQG,QAAQH,EAAQzM,SAASyM,EAAQ3I,SAAU8D,IAChF,GAEb,CAEQ,OAAAkF,CAAQvB,EAAWrN,eACzB,MAAM4P,GAA8B,QAAzB9B,EAAAlM,KAAKkK,UAAUyB,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIqC,KAAK/N,QAASoJ,EAAAoC,kBAAkBxL,MACpEgO,GAA8B,QAAzBZ,EAAAtN,KAAKkK,UAAUyB,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIqC,KAAKjK,SAAUsF,EAAAoC,kBAAkB1H,OACrE9D,GAAiC,QAAzB+L,EAAAjM,KAAKkK,UAAUyB,kBAAU,IAAAM,OAAA,EAAAA,EAAEL,IAAIC,OAAO3L,QAAS8N,EAAKhO,KAAKoK,cAAc0B,KAC/E9H,GAAkC,QAAzBmK,EAAAnO,KAAKkK,UAAUyB,kBAAU,IAAAwC,OAAA,EAAAA,EAAEvC,IAAIC,OAAO7H,SAAUkK,EAAKlO,KAAKoK,cAAc2B,KAEjFqC,EAAKpO,KAAKqO,KAAKrO,KAAKwK,QAAQtK,MAAQA,EAAO8N,GAC3CM,EAAKtO,KAAKqO,KAAKrO,KAAKwK,QAAQxG,OAASA,EAAQkK,GACnD,IAAKE,IAAOE,EAAI,CACd,MAAMC,EAAKrO,EAAQuL,EACb+C,GAAMxK,EAASkK,GAAM9P,EACrBqQ,EAAI1S,KAAKE,IAAIsS,EAAIC,GACvB,OAAOC,EAAI,EAAI,CAAChD,EAAIgD,EAAGrQ,EAAIqQ,GAAK,CAAChD,EAAGrN,EACtC,CACA,OAAQgQ,GAEJpO,KAAKwK,QAAQR,qBAAwBoE,GAAOE,EACvB,CAACF,EAAIE,GAAxB,CAACF,EAAIhQ,EAAIgQ,EAAK3C,GAFhB,CAACA,EAAI6C,EAAKlQ,EAAGkQ,EAGnB,CAEQ,IAAAD,CAAK/P,EAAWoQ,EAAeC,GACrC,MAAU,SAANrQ,EAAqB,EACrBA,EAAEsQ,SAAS,KAAaC,SAASvQ,EAAE2I,MAAM,GAAI,GAAI,IAAMyH,EAAQ,IAC/DpQ,EAAEsQ,SAAS,MAAcC,SAASvQ,EAAE2I,MAAM,GAAI,GAAI,IAC/C4H,SAASvQ,EAAG,IAAMqQ,CAC3B,aCxLF,SAASG,EAAM1J,GACb,IAAI9G,EAAI,GACR,IAAK,IAAIR,EAAI,EAAGA,EAAIsH,EAAKrH,SAAUD,EACjCQ,GAAKyQ,OAAOC,aAAa5J,EAAKtH,IAEhC,OAAOQ,CACT,CAGA,SAAS2Q,EAAM7J,GACb,IAAI7G,EAAI,EACR,IAAK,IAAIT,EAAI,EAAGA,EAAIsH,EAAKrH,SAAUD,EAAG,CACpC,GAAIsH,EAAKtH,GAAK,IAAMsH,EAAKtH,GAAK,GAC5B,MAAM,IAAIsE,MAAM,gBAElB7D,EAAQ,GAAJA,EAAS6G,EAAKtH,GAAK,EACzB,CACA,OAAOS,CACT,CAGA,SAAS2Q,EAAO9J,GACd,MAAM7G,EAAIuQ,EAAM1J,GAChB,IAAK7G,EAAE4Q,MAAM,oCACX,MAAM,IAAI/M,MAAM,gBAElB,OAAO7D,CACT,wEAeA,MAAM6Q,EAAiE,CACrEnF,OAAQgF,EACRlF,KAAMkF,EACNnF,KAfF,SAAgB1E,GACd,GAAsB,oBAAXjG,OACT,OAAOA,OAAOC,KAAK0P,EAAM1J,GAAO,UAAUiK,WAE5C,MAAMC,EAAKhQ,KAAKwP,EAAM1J,IAChB3J,EAAI,IAAI2B,WAAWkS,EAAGvR,QAC5B,IAAK,IAAID,EAAI,EAAGA,EAAIrC,EAAEsC,SAAUD,EAC9BrC,EAAEqC,GAAKwR,EAAG9P,WAAW1B,GAEvB,OAAO,IAAIyR,aAAc3Q,OAAOnD,EAClC,EAMEyE,MAAOgP,EACPlL,OAAQkL,EACRlF,oBAAqBiF,GAMjBO,EAAc,CAAC,GAAI,IAAK,IAAK,KAE7BC,EAAuB,CAAC,GAAI,IAAK,IAAK,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,GAAI,IAAK,IAAK,KAEjFC,EAAkB,CAAC,GAAI,IAAK,IAAK,IAAK,GAAI,GAAI,IAAK,KAEnDC,EAAiB,CAAC,GAAI,IAAK,IAAK,IAAK,GAAI,IAAK,KAE9CC,EAAwB,CAAC,GAAI,IAAK,IAAK,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,KAGvFC,EAAiB,oBAGvB,iBAAA9P,GACSC,KAAAmL,MAAK,EACJnL,KAAA8P,QAAU,IAAIzS,YAAYwS,GAC1B7P,KAAA+P,UAAY,EACZ/P,KAAAgQ,KAAO,GACRhQ,KAAAsL,OAA4E,EAwIrF,CAtIS,KAAAL,GACLjL,KAAK8P,QAAQnK,KAAK,GAClB3F,KAAKmL,MAAK,EACVnL,KAAK+P,UAAY,EACjB/P,KAAKsL,OAAS,GACdtL,KAAKgQ,KAAO,EACd,CAEO,GAAA1K,GACL,GAAc,IAAVtF,KAAKmL,MAA6B,CACpC,GAAInL,KAAK+P,YAAcJ,EAAe5R,OAAQ,CAC5C,IAAK,IAAIkS,EAAI,EAAGA,EAAIN,EAAe5R,SAAUkS,EAC3C,GAAIjQ,KAAK8P,QAAQG,KAAON,EAAeM,GAAI,OAAOjQ,KAAKkM,KAIzD,OAFAlM,KAAKsL,OAAa,KAAC,EACnBtL,KAAKmL,MAAK,EACH,CACT,CACA,GAAInL,KAAK+P,YAAcH,EAAsB7R,OAAQ,CACnD,IAAK,IAAIkS,EAAI,EAAGA,EAAIL,EAAsB7R,SAAUkS,EAClD,GAAIjQ,KAAK8P,QAAQG,KAAOL,EAAsBK,GAAI,OAAOjQ,KAAKkM,KAIhE,OAFAlM,KAAKsL,OAAa,KAAC,EACnBtL,KAAKmL,MAAK,EACH,CACT,CACA,OAAOnL,KAAKkM,IACd,CACA,OAAc,IAAVlM,KAAKmL,MAAkC,EAC7B,IAAVnL,KAAKmL,OACY,IAAhBnL,KAAKsL,OAAOzB,MAEV7J,KAAKkQ,YAAYlQ,KAAK+P,YAC3B/P,KAAKmL,MAAK,EACH,GAEFnL,KAAKkM,IACd,CAEO,KAAAb,CAAMjG,EAAmBC,EAAeC,GAC7C,IAAI6F,EAAQnL,KAAKmL,MACbgF,EAAMnQ,KAAK+P,UACf,MAAMzS,EAAS0C,KAAK8P,QACpB,GAAS,IAAL3E,GAAoC,IAALA,EAA2B,OAAQ,EACtE,GAAS,IAALA,GAA+BgF,EAAM,GAAI,OAAQ,EACrD,IAAK,IAAIrS,EAAIuH,EAAOvH,EAAIwH,IAAOxH,EAAG,CAChC,MAAMzB,EAAI+I,EAAKtH,GACf,OAAQzB,GACN,KAAK,GACH,IAAK2D,KAAKkQ,YAAYC,GAAM,OAAOnQ,KAAKkM,KACxCf,EAAK,EACLgF,EAAM,EACN,MACF,KAAK,GACH,GAAS,IAALhF,EAA6B,CAC/B,GAAkB,KAAd7N,EAAO,GAAW,CAEpB,IAAI2S,EAAI,EACR,KAAOA,EAAIT,EAAYzR,SAAUkS,EAC/B,GAAI3S,EAAO2S,KAAOT,EAAYS,GAAI,OAAOjQ,KAAKkM,KAGhD,GADAlM,KAAKsL,OAAa,KAAC,EACf6E,IAAQT,EAAgB3R,OAAQ,CAClC,KAAOkS,EAAIP,EAAgB3R,SAAUkS,EACnC,GAAI3S,EAAO2S,KAAOP,EAAgBO,GAAI,OAAOjQ,KAAKkM,KAIpD,OAFAlM,KAAKsL,OAAa,KAAC,EACnBtL,KAAKmL,MAAK,EACHrN,EAAI,CACb,CACF,KAAO,IAAkB,KAAdR,EAAO,GAOhB,OAAO0C,KAAKkM,KALZ,IAAK,IAAI+D,EAAI,EAAGA,EAAIR,EAAqB1R,SAAUkS,EACjD,GAAI3S,EAAO2S,KAAOR,EAAqBQ,GAAI,OAAOjQ,KAAKkM,KAEzDlM,KAAKsL,OAAa,KAAC,CAGrB,CACAH,EAAK,EACLgF,EAAM,CACR,MAAO,GAAS,IAALhF,EAA2B,CACpC,IAAKnL,KAAKoQ,UAAUD,GAAM,OAAOnQ,KAAKkM,KACtCf,EAAK,EACLgF,EAAM,CACR,MAAO,GAAS,IAALhF,EAA6B,CACtC,GAAIgF,GAAON,EAAgB,OAAO7P,KAAKkM,KACvC5O,EAAO6S,KAAS9T,CAClB,CACA,MACF,KAAK,GACH,OAAS,IAAL8O,GACGnL,KAAKkQ,YAAYC,IAExBnQ,KAAKmL,MAAK,EACHrN,EAAI,GAH0BkC,KAAKkM,KAI5C,QACE,GAAIiE,GAAON,EAAgB,OAAO7P,KAAKkM,KACvC5O,EAAO6S,KAAS9T,EAEtB,CAGA,OAFA2D,KAAKmL,MAAQA,EACbnL,KAAK+P,UAAYI,GACT,CACV,CAEQ,EAAAjE,GAGN,OAFAlM,KAAKsL,OAAOzB,KAAI,EAChB7J,KAAKmL,MAAK,GACF,CACV,CAEQ,SAAAiF,CAAUD,GAChB,MAAMF,EAAInB,EAAM9O,KAAK8P,QAAQrL,SAAS,EAAG0L,IACzC,QAAIF,IACFjQ,KAAKgQ,KAAOC,EACZjQ,KAAKsL,OAAO2E,GAAK,MACV,EAGX,CAEQ,WAAAC,CAAYC,GAClB,GAAInQ,KAAKgQ,KAAM,CACb,IACE,MAAMzR,EAAIyB,KAAK8P,QAAQ7I,MAAM,EAAGkJ,GAChCnQ,KAAKsL,OAAOtL,KAAKgQ,MAAQZ,EAASpP,KAAKgQ,MAAQZ,EAASpP,KAAKgQ,MAAMzR,GAAKA,CAC1E,UACE,OAAO,CACT,CACA,OAAO,CACT,CACA,OAAO,CACT,yGCtPF,MAEE,WAAAwB,CACmBoK,GAAAnK,KAAAmK,SAAAA,EAFXnK,KAAAqQ,cAA+B,CAAEC,WAAW,EAAMC,MAAO,MAAOC,OAAQ,EAAGC,UAAW,MAG3F,CAMI,QAAAhD,CAASiD,GACd1Q,KAAKmK,SAASsD,SAASiD,EAAK1Q,KAAKqQ,cACnC,oGCNF,SAA0BlS,GACxB,GAAIA,EAAEJ,OAAS,GACb,OAAOlD,EAAA+R,iBAET,MAAM+D,EAAM,IAAItT,YAAYc,EAAEb,OAAQa,EAAEgP,WAAY,GAGpD,GAAe,aAAXwD,EAAI,IAAgC,YAAXA,EAAI,IAAgC,aAAXA,EAAI,GACxD,MAAO,CACL7D,KAAM,YACN5M,MAAQ/B,EAAE,KAAO,GAAKA,EAAE,KAAO,GAAKA,EAAE,KAAO,EAAIA,EAAE,IACnD6F,OAAQ7F,EAAE,KAAO,GAAKA,EAAE,KAAO,GAAKA,EAAE,KAAO,EAAIA,EAAE,KAIvD,GAAa,MAATA,EAAE,IAAwB,MAATA,EAAE,IAAwB,MAATA,EAAE,GAAa,CACnD,MAAO+B,EAAO8D,GAgFlB,SAAiB7F,GACf,MAAMuJ,EAAMvJ,EAAEJ,OACd,IAAID,EAAI,EACJ8S,EAAczS,EAAEL,IAAM,EAAIK,EAAEL,EAAI,GACpC,OAAa,CAEX,GADAA,GAAK8S,EACD9S,GAAK4J,EAEP,MAAO,CAAC,EAAG,GAEb,GAAa,MAATvJ,EAAEL,GACJ,MAAO,CAAC,EAAG,GAEb,GAAiB,MAAbK,EAAEL,EAAI,IAA4B,MAAbK,EAAEL,EAAI,GAC7B,OAAIA,EAAI,EAAI4J,EACH,CACLvJ,EAAEL,EAAI,IAAM,EAAIK,EAAEL,EAAI,GACtBK,EAAEL,EAAI,IAAM,EAAIK,EAAEL,EAAI,IAGnB,CAAC,EAAG,GAEbA,GAAK,EACL8S,EAAczS,EAAEL,IAAM,EAAIK,EAAEL,EAAI,EAClC,CACF,CAzG4B+S,CAAQ1S,GAChC,MAAO,CAAE2O,KAAM,aAAc5M,QAAO8D,SACtC,CAEA,GAAe,YAAX2M,EAAI,KAA+B,KAATxS,EAAE,IAAwB,KAATA,EAAE,KAAyB,KAATA,EAAE,GACjE,MAAO,CACL2O,KAAM,YACN5M,MAAQ/B,EAAE,IAAM,EAAIA,EAAE,GACtB6F,OAAQ7F,EAAE,IAAM,EAAIA,EAAE,IAI1B,GAAe,aAAXwS,EAAI,GACN,MAAO,CACL7D,KAAM,YACN5M,MAAQ/B,EAAE,IAAM,GAAKA,EAAE,IAAM,GAAKA,EAAE,IAAM,EAAIA,EAAE,GAChD6F,OAAQ7F,EAAE,IAAM,GAAKA,EAAE,IAAM,GAAKA,EAAE,KAAO,EAAIA,EAAE,KAIrD,GAAe,aAAXwS,EAAI,IAAgC,aAAXA,EAAI,IAA6C,UAAd,SAATA,EAAI,IAA6B,CACtF,OAAQxS,EAAE,KACR,KAAK,GACH,MAAO,CACL2O,KAAM,aACN5M,MAA6C,GAApC/B,EAAE,IAAMA,EAAE,KAAO,EAAIA,EAAE,KAAO,IACvC6F,OAA6C,GAApC7F,EAAE,IAAMA,EAAE,KAAO,EAAIA,EAAE,KAAO,KAE3C,KAAK,GACH,GAAc,KAAVA,EAAE,IAAc,OAAOtD,EAAA+R,iBAC3B,MAAMkE,EAAM3S,EAAE,IAAMA,EAAE,KAAO,EAAIA,EAAE,KAAO,GAAKA,EAAE,KAAO,GACxD,MAAO,CACL2O,KAAM,aACN5M,MAAgC,GAAV,MAAb4Q,GACT9M,OAAgC,GAAvB8M,IAAQ,GAAK,QAE1B,KAAK,GACH,OAAc,MAAV3S,EAAE,KAA0B,IAAVA,EAAE,KAA0B,KAAVA,EAAE,IAAqBtD,EAAA+R,iBACxD,CACLE,KAAM,aACN5M,MAA+B,OAAtB/B,EAAE,IAAMA,EAAE,KAAO,GAC1B6F,OAA+B,OAAtB7F,EAAE,IAAMA,EAAE,KAAO,IAGhC,OAAOtD,EAAA+R,gBACT,CAEA,GAAe,aAAX+D,EAAI,KAAiC,aAAXA,EAAI,IAAgC,aAAXA,EAAI,IAAoB,CAC7E,IAAIR,GAAO,EAEX,MAAMY,EAAQhV,KAAKE,IAAIkC,EAAEJ,OAAS,GAAI,MACtC,IAAK,IAAID,EAAI,EAAGA,EAAIiT,EAAOjT,IAEzB,GAAa,MAATK,EAAEL,IAA4B,MAAbK,EAAEL,EAAI,IAA4B,MAAbK,EAAEL,EAAI,IAA4B,MAAbK,EAAEL,EAAI,GAAa,CAChFqS,EAAMrS,EACN,KACF,CAEF,IAAa,IAATqS,EAAY,CAEd,MAAMjQ,EACJ/B,EAAEgS,EAAO,IAAM,GACfhS,EAAEgS,EAAO,IAAM,GACfhS,EAAEgS,EAAM,KAAQ,EAChBhS,EAAEgS,EAAM,IACJnM,EACJ7F,EAAEgS,EAAM,KAAO,GACfhS,EAAEgS,EAAM,KAAO,GACfhS,EAAEgS,EAAM,KAAQ,EAChBhS,EAAEgS,EAAM,IACV,GAAIjQ,EAAQ,GAAK8D,EAAS,EACxB,MAAO,CAAE8I,KAAM,aAAc5M,QAAO8D,SAExC,CACA,OAAOnJ,EAAA+R,gBACT,CACA,OAAO/R,EAAA+R,gBACT,EAnGa/R,EAAA+R,iBAA6B,CACxCE,KAAM,cACN5M,MAAO,EACP8D,OAAQ,uFCZV,MAAAjF,EAAAC,EAAA,KAGAqH,EAAArH,EAAA,KAaA,MAAAoO,UAAmC/G,EAAA0C,WAEjC,UAAW8C,GAAM,IAAAK,EAAoC,OAA8B,QAAvBA,EAAAlM,KAAKgR,QAAQC,IAAI,cAAM,IAAA/E,OAAA,EAAAA,EAAEL,MAAQ,CAUtF,mBAAOwB,CAAa6D,EAAqChR,EAAe8D,GAU7E,MAAM6H,GAAUqF,QAAAA,EAAiBC,UAAUC,cAAc,UAGzD,OAFAvF,EAAO3L,MAAgB,EAARA,EACf2L,EAAO7H,OAAkB,EAATA,EACT6H,CACT,CAGO,sBAAOwF,CAAgBC,EAA+BpR,EAAe8D,EAAgB1G,GAC1F,GAAyB,mBAAd4P,UAA0B,CACnC,MAAMqE,EAAUD,EAAID,gBAAgBnR,EAAO8D,GAI3C,OAHI1G,GACFiU,EAAQnM,KAAKlC,IAAI,IAAIgD,kBAAkB5I,EAAQ,EAAG4C,EAAQ8D,EAAS,IAE9DuN,CACT,CACA,OAAOjU,EACH,IAAI4P,UAAU,IAAIhH,kBAAkB5I,EAAQ,EAAG4C,EAAQ8D,EAAS,GAAI9D,EAAO8D,GAC3E,IAAIkJ,UAAUhN,EAAO8D,EAC3B,CAGO,wBAAO2J,CAAkB+C,GAC9B,MAAiC,mBAAtB/C,kBACF6D,QAAQC,aAAQzJ,GAElB2F,kBAAkB+C,EAC3B,CAGA,WAAA3Q,CAAoB2R,GAClBC,QADkB3R,KAAA0R,UAAAA,EAhDZ1R,KAAAgR,QAAU,IAAIY,IAGd5R,KAAA6R,gBAAkB7R,KAAKiJ,UAAU,IAAI5C,EAAAyL,mBA+C3C9R,KAAK+R,SAAW/R,KAAK0R,UAAUvF,MAAM6F,KACrChS,KAAK0R,UAAUvF,MAAM6F,KAAQC,UACd,QAAb/F,EAAAlM,KAAK+R,gBAAQ,IAAA7F,GAAAA,EAAE1E,KAAKxH,KAAK0R,UAAUvF,MAAO8F,GAC1CjS,KAAKkS,SAEHlS,KAAK0R,UAAUvF,MAAMgG,eACvBnS,KAAKkS,QAGPlS,KAAK6R,gBAAgB/V,MAAQkE,KAAK0R,UAAUvF,MAAMiG,eAAeC,eAAeC,UAC/D,aAAXA,IACFtS,KAAKuS,gBACc,QAAnBrG,EAAAlM,KAAKwS,sBAAc,IAAAtG,GAAAA,EAAEuG,YAAY,EAAGzS,KAAK0R,UAAU3F,SAGvD/L,KAAKiJ,WAAU,EAAA5C,EAAAS,cAAa,WAC1B9G,KAAK0S,qBACL1S,KAAK0S,mBAAmB,UACpB1S,KAAK0R,UAAUvF,OAASnM,KAAK+R,WAC/B/R,KAAK0R,UAAUvF,MAAM6F,KAAOhS,KAAK+R,SACjC/R,KAAK+R,cAAW/J,GAEdhI,KAAKwS,gBAAkBxS,KAAK2S,kBAC9B3S,KAAKwS,eAAeI,YAAc5S,KAAK2S,gBACvC3S,KAAK2S,qBAAkB3K,GAEzBhI,KAAKwS,oBAAiBxK,EACtBhI,KAAKgR,QAAQlI,QACU,QAAvBoD,EAAAlM,KAAK6S,0BAAkB,IAAA3G,GAAAA,EAAE4G,QACzB9S,KAAK6S,wBAAqB7K,EAC1BhI,KAAK+S,kBAAe/K,IAExB,CAKO,eAAAgL,CAAgBlX,WACjBA,EACGkE,KAAK+S,eAA0C,IAA1B/S,KAAKiT,SAASjP,QACtChE,KAAKkT,mBAAmBnX,KAAKC,IAAIgE,KAAKiT,SAASjP,OAAS,EAAC,MAGpC,QAAvBkI,EAAAlM,KAAK6S,0BAAkB,IAAA3G,GAAAA,EAAE4G,QACzB9S,KAAK6S,wBAAqB7K,EAC1BhI,KAAK+S,kBAAe/K,GAEH,QAAnBsF,EAAAtN,KAAKwS,sBAAc,IAAAlF,GAAAA,EAAEmF,YAAY,EAAGzS,KAAK0R,UAAU3F,KACrD,CAMA,cAAWJ,GACT,OAAO3L,KAAK0R,UAAU/F,UACxB,CAKA,YAAWsH,WACT,MAAO,CACL/S,OAAsB,QAAfgM,EAAAlM,KAAK2L,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIqC,KAAK/N,SAAU,EAC3C8D,QAAuB,QAAfsJ,EAAAtN,KAAK2L,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIqC,KAAKjK,UAAW,EAEjD,CAKO,UAAAmP,CAAW9N,EAAeC,EAAaiL,iBAC5C,MAAM6C,EAAI/N,IAAwB,QAAf6G,EAAAlM,KAAK2L,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIqC,KAAKjK,SAAU,GACjDyH,GAAmB,QAAf6B,EAAAtN,KAAK2L,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIC,OAAO3L,QAAS,EACzC9B,GAAKkH,EAAM,EAAID,KAAyB,QAAf4G,EAAAjM,KAAK2L,kBAAU,IAAAM,OAAA,EAAAA,EAAEL,IAAIqC,KAAKjK,SAAU,GAC9DuM,GAAmB,QAAVA,GACW,QAAvBpC,EAAAnO,KAAKgR,QAAQC,IAAI,cAAM,IAAA9C,GAAAA,EAAEkF,UAAU,EAAGD,EAAG3H,EAAGrN,GAEzCmS,GAAmB,WAAVA,GACc,QAA1B+C,EAAAtT,KAAKgR,QAAQC,IAAI,iBAAS,IAAAqC,GAAAA,EAAED,UAAU,EAAGD,EAAG3H,EAAGrN,EAEnD,CAKO,QAAAmV,CAAShD,GACd,IAAKA,GAAmB,QAAVA,EAAiB,CAC7B,MAAMe,EAAMtR,KAAKgR,QAAQC,IAAI,OAC7BK,SAAAA,EAAK+B,UAAU,EAAG,EAAG/B,EAAIzF,OAAO3L,MAAOoR,EAAIzF,OAAO7H,OACpD,CACA,IAAKuM,GAAmB,WAAVA,EAAoB,CAChC,MAAMe,EAAMtR,KAAKgR,QAAQC,IAAI,UAC7BK,SAAAA,EAAK+B,UAAU,EAAG,EAAG/B,EAAIzF,OAAO3L,MAAOoR,EAAIzF,OAAO7H,OACpD,CACF,CAKO,IAAAwP,CAAKC,EAAqBC,EAAgBC,EAAaC,EAAaC,EAAgB,GACzF,MAAMvC,EAAMtR,KAAKgR,QAAQC,IAAIwC,EAAQlD,OACrC,IAAKe,EACH,OAEF,MAAMpR,MAAEA,EAAK8D,OAAEA,GAAWhE,KAAKiT,SAG/B,IAAe,IAAX/S,IAA4B,IAAZ8D,EAClB,OAGFhE,KAAK8T,cAAcL,EAASvT,EAAO8D,GACnC,MAAM0M,EAAM+C,EAAQM,OACdjI,EAAO/P,KAAKuI,KAAKoM,EAAIxQ,MAAQA,GAE7B8T,EAAMN,EAAS5H,EAAQ5L,EACvB+T,EAAKlY,KAAKkR,MAAMyG,EAAS5H,GAAQ9H,EACjCkQ,EAAKP,EAAMzT,EACXiU,EAAKP,EAAM5P,EAGXoQ,EAAaP,EAAQ3T,EAAQ8T,EAAKtD,EAAIxQ,MAAQwQ,EAAIxQ,MAAQ8T,EAAKH,EAAQ3T,EACvEmU,EAAcJ,EAAKjQ,EAAS0M,EAAI1M,OAAS0M,EAAI1M,OAASiQ,EAAKjQ,EAMjEsN,EAAIgD,UACF5D,EACA3U,KAAKkR,MAAM+G,GAAKjY,KAAKkR,MAAMgH,GAAKlY,KAAKuI,KAAK8P,GAAarY,KAAKuI,KAAK+P,GACjEtY,KAAKkR,MAAMiH,GAAKnY,KAAKkR,MAAMkH,GAAKpY,KAAKuI,KAAK8P,GAAarY,KAAKuI,KAAK+P,GAErE,CAKO,WAAAE,CAAYd,EAAqBC,GACtC,MAAMxT,MAAEA,EAAK8D,OAAEA,GAAWhE,KAAKiT,SAE/B,IAAe,IAAX/S,IAA4B,IAAZ8D,EAClB,OAEFhE,KAAK8T,cAAcL,EAASvT,EAAO8D,GACnC,MAAM0M,EAAM+C,EAAQM,OACdjI,EAAO/P,KAAKuI,KAAKoM,EAAIxQ,MAAQA,GAC7B8T,EAAMN,EAAS5H,EAAQ5L,EACvB+T,EAAKlY,KAAKkR,MAAMyG,EAAS5H,GAAQ9H,EACjCoQ,EAAalU,EAAQ8T,EAAKtD,EAAIxQ,MAAQwQ,EAAIxQ,MAAQ8T,EAAK9T,EACvDmU,EAAcJ,EAAKjQ,EAAS0M,EAAI1M,OAAS0M,EAAI1M,OAASiQ,EAAKjQ,EAE3D6H,EAASuB,EAAcC,aAAarN,KAAKmR,SAAUiD,EAAYC,GAC/D/C,EAAMzF,EAAO0B,WAAW,MAC9B,OAAI+D,GACFA,EAAIgD,UACF5D,EACA3U,KAAKkR,MAAM+G,GAAKjY,KAAKkR,MAAMgH,GAAKlY,KAAKkR,MAAMmH,GAAarY,KAAKkR,MAAMoH,GACnE,EAAG,EAAGtY,KAAKkR,MAAMmH,GAAarY,KAAKkR,MAAMoH,IAEpCxI,QANT,CAQF,CAKO,eAAA2I,CAAgBb,EAAaC,EAAaC,EAAgB,SAC/D,MAAMvC,EAAMtR,KAAKgR,QAAQC,IAAI,OAC7B,GAAIK,EAAK,CACP,MAAMpR,MAAEA,EAAK8D,OAAEA,GAAWhE,KAAKiT,SAG/B,IAAe,IAAX/S,IAA4B,IAAZ8D,EAClB,OAQF,GALKhE,KAAK+S,aAEC/O,GAAUhE,KAAK+S,aAAc/O,QACtChE,KAAKkT,mBAAmBlP,EAAS,GAFjChE,KAAKkT,mBAAmBnX,KAAKC,IAAIgI,EAAS,EAAC,MAIxChE,KAAK+S,aAAc,OACxBzB,EAAIgD,UACqB,QADZpI,EACXlM,KAAK6S,0BAAkB,IAAA3G,EAAAA,EAAIlM,KAAK+S,aAChCY,EAAMzT,EACL0T,EAAM5P,EAAU,EAAI,EAAI,EACzB9D,EAAQ2T,EACR7P,EACA2P,EAAMzT,EACN0T,EAAM5P,EACN9D,EAAQ2T,EACR7P,EAEJ,CACF,CAMO,aAAAuO,WACL,MAAM9G,GAAmB,QAAfS,EAAAlM,KAAK2L,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIC,OAAO3L,QAAS,EACzC9B,GAAmB,QAAfkP,EAAAtN,KAAK2L,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIC,OAAO7H,SAAU,EAChD,IAAK,MAAMsN,KAAOtR,KAAKgR,QAAQyD,SACzBnD,EAAIzF,OAAO3L,QAAUuL,GAAK6F,EAAIzF,OAAO7H,SAAW5F,IAClDkT,EAAIzF,OAAO3L,MAAQuL,EACnB6F,EAAIzF,OAAO7H,OAAS5F,EAG1B,CAKQ,aAAA0V,CAAcY,EAAkBhP,EAAsBM,GAC5D,GAAIN,IAAiBgP,EAAKC,eAAezU,OAAS8F,IAAkB0O,EAAKC,eAAe3Q,OACtF,OAEF,MAAQ9D,MAAO0U,EAAe5Q,OAAQ6Q,GAAmBH,EAAKI,aAC9D,GAAIpP,IAAiBkP,GAAiB5O,IAAkB6O,EAItD,OAHAH,EAAKX,OAASW,EAAKK,KACnBL,EAAKC,eAAezU,MAAQ0U,OAC5BF,EAAKC,eAAe3Q,OAAS6Q,GAG/B,MAAMhJ,EAASuB,EAAcC,aAC3BrN,KAAKmR,SACLpV,KAAKuI,KAAKoQ,EAAKK,KAAM7U,MAAQwF,EAAekP,GAC5C7Y,KAAKuI,KAAKoQ,EAAKK,KAAM/Q,OAASgC,EAAgB6O,IAE1CvD,EAAMzF,EAAO0B,WAAW,MAC1B+D,IACFA,EAAIgD,UAAUI,EAAKK,KAAO,EAAG,EAAGlJ,EAAO3L,MAAO2L,EAAO7H,QACrD0Q,EAAKX,OAASlI,EACd6I,EAAKC,eAAezU,MAAQwF,EAC5BgP,EAAKC,eAAe3Q,OAASgC,EAEjC,CAKQ,KAAAkM,GACNlS,KAAKwS,eAAiBxS,KAAK0R,UAAUvF,MAAMqG,eAC3CxS,KAAK2S,gBAAkB3S,KAAKwS,eAAeI,YAAY1R,KAAKlB,KAAKwS,gBACjExS,KAAKwS,eAAeI,YAAeoC,UACjC,IAAK,MAAMC,IAAO,IAAIjV,KAAKgR,QAAQkE,QACjClV,KAAK0S,mBAAmBuC,GAEN,QAApB/I,EAAAlM,KAAK2S,uBAAe,IAAAzG,GAAAA,EAAE1E,KAAKxH,KAAKwS,eAAgBwC,GAEpD,CAEO,gBAAAG,CAAiB5E,EAAoB,eAE1C,IAAKvQ,KAAKmR,WAAanR,KAAK0R,UAAUvF,MAAMgG,cAE1C,YADA5U,QAAQC,KAAK,sFAGf,GAAIwC,KAAKgR,QAAQoE,IAAI7E,GACnB,OAEF,MAAM1E,EAASuB,EAAcC,aAC3BrN,KAAKmR,UAAyB,QAAfjF,EAAAlM,KAAK2L,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIC,OAAO3L,QAAS,GACrC,QAAfoN,EAAAtN,KAAK2L,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIC,OAAO7H,SAAU,GAExC6H,EAAOwJ,UAAU/N,IAAI,qBAAqBiJ,KAC1C,MAAM4B,EAAgBnS,KAAK0R,UAAUvF,MAAMgG,cAI3CA,EAAcmD,MAAMC,UAAY,UAClB,WAAVhF,GAKF1E,EAAOyJ,MAAM9E,OAAS,KACtB2B,EAAcqD,aAAa3J,EAAQsG,EAAcsD,cAKjD5J,EAAOyJ,MAAM9E,OAAS,IACtB2B,EAAcuD,YAAY7J,IAE5B,MAAMyF,EAAMzF,EAAO0B,WAAW,KAAM,CAAErQ,OAAO,IACxCoU,GAILtR,KAAKgR,QAAQ9N,IAAIqN,EAAOe,GACxBtR,KAAKuT,SAAShD,IAJZ1E,EAAO8J,QAKX,CAEO,kBAAAjD,CAAmBnC,EAAoB,OAC5C,MAAMe,EAAMtR,KAAKgR,QAAQC,IAAIV,GACzBe,IACFA,EAAIzF,OAAO8J,SACX3V,KAAKgR,QAAQ4E,OAAOrF,GAExB,CAEO,QAAAsF,CAAStF,GACd,OAAOvQ,KAAKgR,QAAQoE,IAAI7E,EAC1B,CAEQ,kBAAA2C,CAAmBlP,EAAM,UACR,QAAvBkI,EAAAlM,KAAK6S,0BAAkB,IAAA3G,GAAAA,EAAE4G,QACzB9S,KAAK6S,wBAAqB7K,EAG1B,MAAM8N,EAAS,GACTC,EAAY3I,EAAcC,aAAarN,KAAKmR,SAAU2E,EAAQ9R,GAC9DsN,EAAMyE,EAAUxI,WAAW,KAAM,CAAErQ,OAAO,IAChD,IAAKoU,EAAK,OACV,MAAMC,EAAUnE,EAAciE,gBAAgBC,EAAKwE,EAAQ9R,GACrD2M,EAAM,IAAItT,YAAYkU,EAAQnM,KAAK9H,QACnC0Y,GAAQ,EAAAjX,EAAAzD,YAAW,EAAG,EAAG,GACzB2a,GAAQ,EAAAlX,EAAAzD,YAAW,IAAK,IAAK,KACnCqV,EAAIhL,KAAKqQ,GACT,IAAK,IAAI5C,EAAI,EAAGA,EAAIpP,IAAUoP,EAAG,CAC/B,MAAM8C,EAAQ9C,EAAI,EACZjP,EAASiP,EAAI0C,EACnB,IAAK,IAAIK,EAAI,EAAGA,EAAIL,EAAQK,GAAK,EAC/BxF,EAAIxM,EAASgS,EAAID,GAASD,CAE9B,CACA3E,EAAI9D,aAAa+D,EAAS,EAAG,GAG7B,MAAMrR,EAASkW,OAAOlW,MAAQ4V,EAAS,GAAK,IAAa,KACzD9V,KAAK+S,aAAe3F,EAAcC,aAAarN,KAAKmR,SAAUjR,EAAO8D,GACrE,MAAMqS,EAAOrW,KAAK+S,aAAaxF,WAAW,KAAM,CAAErQ,OAAO,IACzD,GAAKmZ,EAAL,CAIA,IAAK,IAAIvY,EAAI,EAAGA,EAAIoC,EAAOpC,GAAKgY,EAC9BO,EAAK/B,UAAUyB,EAAWjY,EAAG,GAE/BsP,EAAcO,kBAAkB3N,KAAK+S,cAAc1R,KAAKiV,GAAUtW,KAAK6S,mBAAqByD,EAJ5F,MAFEtW,KAAK+S,kBAAe/K,CAOxB,CAEA,YAAWmJ,SACT,OAA+C,QAAxCjF,EAAAlM,KAAK0R,UAAUvF,MAAMC,2BAAmB,IAAAF,OAAA,EAAAA,EAAEqK,OAAOpF,QAC1D,2HChaF,MAAA9H,EAAArK,EAAA,KASanE,EAAA6Q,kBAA+B,CAC1CxL,MAAO,EACP8D,OAAQ,IASV,MAAMwS,EAEJ,OAAWC,GACT,OAAIzW,KAAK0W,QAEQ,UAAZ1W,KAAK2W,KACL3W,KAAK4W,gBAAkB,GAGrB5W,KAAK2W,IACd,CACA,OAAWF,CAAI3a,GAAiBkE,KAAK2W,KAAO7a,CAAO,CAEnD,kBAAW8a,GAET,OAAI5W,KAAK0W,OACP,GAEe,UAAT1W,KAAK2W,OAAoC,EACnD,CACA,kBAAWC,CAAe9a,GACxBkE,KAAK2W,OAAQ,UACb3W,KAAK2W,MAAS7a,GAAS,GAAG,SAC5B,CAEA,kBAAW+a,GACT,OAAmB,SAAZ7W,KAAK2W,IACd,CACA,kBAAWE,CAAe/a,GACxBkE,KAAK2W,OAAQ,SACb3W,KAAK2W,MAAgB,SAAR7a,CACf,CAEA,0BAAWgb,GACT,MAAMC,GAAgB,WAAT/W,KAAK2W,OAAmC,GACrD,OAAII,EAAM,EACK,WAANA,EAEFA,CACT,CACA,0BAAWD,CAAuBhb,GAChCkE,KAAK2W,MAAQ,UACb3W,KAAK2W,MAAS7a,GAAS,GAAG,UAC5B,CAGA,SAAWkb,GACT,OAAOhX,KAAK0W,MACd,CACA,SAAWM,CAAMlb,GACfkE,KAAK0W,OAAS5a,CAChB,CAEA,WAAAiE,CACE0W,EAAc,EACdO,EAAgB,EACTC,GAAU,EACVvD,GAAS,GADT1T,KAAAiX,QAAAA,EACAjX,KAAA0T,OAAAA,EAxDD1T,KAAA2W,KAAe,EA4Cf3W,KAAA0W,OAAiB,EAcvB1W,KAAK2W,KAAOF,EACZzW,KAAK0W,OAASM,CAChB,CAEO,KAAAE,GASL,OAAO,IAAIV,EAAmBxW,KAAK2W,KAAM3W,KAAK0W,OAAQ1W,KAAKiX,QAASjX,KAAK0T,OAC3E,CAEO,OAAAyD,GACL,OAA0B,IAAnBnX,KAAK4W,gBAA0D,IAAhB5W,KAAK0W,SAAkC,IAAlB1W,KAAKiX,OAClF,EAEF,MAAMG,EAAc,IAAIZ,iBAUxB,MAkBE,WAAAzW,CACU2R,EACAxH,EACAhI,GAFAlC,KAAA0R,UAAAA,EACA1R,KAAAkK,UAAAA,EACAlK,KAAAkC,MAAAA,EAnBFlC,KAAAqX,QAAmC,IAAIzF,IAEvC5R,KAAAsX,QAAU,EAEVtX,KAAAuX,UAAY,EAEZvX,KAAAwX,eAAgB,EAEhBxX,KAAAyX,iBAAkB,EAElBzX,KAAA0X,YAAsB,KAW5B,IACE1X,KAAK2X,SAAS3X,KAAKkC,MAAM0V,aAC3B,CAAE,MAAO9P,GACHA,aAAa1F,OACf7E,QAAQsa,MAAM/P,EAAEgQ,SAElBva,QAAQC,KAAK,0BAA0BwC,KAAK+X,gBAC9C,CACA/X,KAAKgY,iBAAmB,CACtBlM,KAAM9L,KAAK0R,UAAU5F,KACrBC,KAAM/L,KAAK0R,UAAU3F,KAEzB,CAEO,OAAApE,GACL3H,KAAKiL,OACP,CAEO,KAAAA,SACL,IAAK,MAAMyJ,KAAQ1U,KAAKqX,QAAQ5C,SACnB,QAAXvI,EAAAwI,EAAKuD,cAAM,IAAA/L,GAAAA,EAAEvE,UAIf3H,KAAKqX,QAAQvO,QACb9I,KAAKkK,UAAUqJ,UACjB,CAEO,QAAAwE,GACL,OAA0B,EAAnB/X,KAAK0X,YAAkB,GAChC,CAEO,QAAAC,CAAS7b,GACd,GAAIA,EAAQ,IAAOA,EAAQ,IACzB,MAAMoc,WAAW,qEAEnBlY,KAAK0X,YAAe5b,EAAQ,EAAI,MAAa,EAC7CkE,KAAKmY,aAAa,EACpB,CAEO,QAAAC,GACL,OAAiC,EAA1BpY,KAAKqY,mBAAyB,GACvC,CAEQ,gBAAAA,GACN,IAAIC,EAAe,EACnB,IAAK,MAAM5D,KAAQ1U,KAAKqX,QAAQ5C,SAC1BC,EAAKK,OACPuD,GAAgB5D,EAAKK,KAAK7U,MAAQwU,EAAKK,KAAK/Q,OACxC0Q,EAAKX,QAAUW,EAAKX,SAAWW,EAAKK,OACtCuD,GAAgB5D,EAAKX,OAAO7T,MAAQwU,EAAKX,OAAO/P,SAItD,OAAOsU,CACT,CAEQ,OAAAC,CAAQC,SACd,MAAM9D,EAAO1U,KAAKqX,QAAQpG,IAAIuH,GACzB9D,IACL1U,KAAKqX,QAAQzB,OAAO4C,GAEhBjC,OAAOkC,aAAe/D,EAAKK,gBAAgB0D,aAC7C/D,EAAKK,KAAKjC,QAEO,QAAnB5G,EAAAlM,KAAK0Y,sBAAc,IAAAxM,GAAAA,EAAA1E,KAAnBxH,KAAsBwY,GACxB,CAKO,aAAAG,SAEL,MAAMC,EAAO,GACb,IAAK,MAAOJ,EAAI9D,KAAS1U,KAAKqX,QAAQwB,UACZ,cAApBnE,EAAKoE,aACI,QAAX5M,EAAAwI,EAAKuD,cAAM,IAAA/L,GAAAA,EAAEvE,UACbiR,EAAKla,KAAK8Z,IAGd,IAAK,MAAMA,KAAMI,EACf5Y,KAAKuY,QAAQC,GAGfxY,KAAKyX,iBAAkB,EACvBzX,KAAKwX,eAAgB,CACvB,CAMO,WAAAuB,CAAYP,SACjB,MAAM9D,EAAO1U,KAAKqX,QAAQpG,IAAIuH,GAC1B9D,IACS,QAAXxI,EAAAwI,EAAKuD,cAAM,IAAA/L,GAAAA,EAAEvE,UACb3H,KAAKuY,QAAQC,GAEjB,CAaO,QAAA/K,CAASiD,EAAsC5P,WAEpDd,KAAKmY,aAAazH,EAAIxQ,MAAQwQ,EAAI1M,QAGlC,IAAIiP,EAAWjT,KAAKkK,UAAU+I,UACN,IAApBA,EAAS/S,QAAqC,IAArB+S,EAASjP,SACpCiP,EAAWpY,EAAA6Q,mBAEb,MAAMI,EAAO/P,KAAKuI,KAAKoM,EAAIxQ,MAAQ+S,EAAS/S,OACtC6L,EAAOhQ,KAAKuI,KAAKoM,EAAI1M,OAASiP,EAASjP,QAEvCiT,IAAYjX,KAAKsX,QAEjBha,EAAS0C,KAAK0R,UAAUvF,MAAM7O,OAC9B0b,EAAWhZ,KAAK0R,UAAU5F,KAC1BmN,EAAWjZ,KAAK0R,UAAU3F,KAC1BmN,EAAU5b,EAAO6Y,EACjBgD,EAAU7b,EAAO8V,EACvB,IAAIjP,EAAS+U,EACTE,EAAY,EAEXtY,EAAKwP,YACRhT,EAAO6Y,EAAI,EACX7Y,EAAO8V,EAAI,EACXjP,EAAS,GAGXnE,KAAK0R,UAAUvF,MAAMkN,cAAcC,iBAAiBC,UAAUjc,EAAO8V,GACrE,IAAK,IAAIQ,EAAM,EAAGA,EAAM7H,IAAQ6H,EAAK,CACnC,MAAM4F,EAAOlc,EAAOmc,MAAMxI,IAAI3T,EAAO8V,EAAI9V,EAAOoc,OAChD,IAAK,IAAI/F,EAAM,EAAGA,EAAM7H,KAClB3H,EAASwP,GAAOqF,KADUrF,EAE9B3T,KAAK2Z,aAAaH,EAAwBrV,EAASwP,EAAKsD,EAASrD,EAAM9H,EAAO6H,GAC9EyF,IAEF,GAAItY,EAAKwP,UACHsD,EAAM7H,EAAO,GAAG/L,KAAK0R,UAAUvF,MAAMkN,cAAcO,gBAEvD,KAAMtc,EAAO8V,GAAK6F,EAAU,MAE9B3b,EAAO6Y,EAAIhS,CACb,CACAnE,KAAK0R,UAAUvF,MAAMkN,cAAcC,iBAAiBC,UAAUjc,EAAO8V,GAGjEtS,EAAKwP,UACgB,QAAnBxP,EAAK2P,UACPnT,EAAO6Y,EAAIpa,KAAKE,IAAIkI,EAAS2H,EAAMkN,GAEnC1b,EAAO6Y,EAAIhS,GAGb7G,EAAO6Y,EAAI+C,EACX5b,EAAO8V,EAAI+F,GAIb,MAAMP,EAAO,GACb,IAAK,MAAOJ,EAAI9D,KAAS1U,KAAKqX,QAAQwB,UAChCnE,EAAK0E,UAAY,IACR,QAAXlN,EAAAwI,EAAKuD,cAAM,IAAA/L,GAAAA,EAAEvE,UACbiR,EAAKla,KAAK8Z,IAGd,IAAK,MAAMA,KAAMI,EACf5Y,KAAKuY,QAAQC,GAKf,MAAMqB,EAAY7Z,KAAK0R,UAAUoI,eAAe,GAChDD,SAAAA,EAAWE,UAAU,KACN/Z,KAAKqX,QAAQpG,IAAIgG,IAE5BjX,KAAKuY,QAAQtB,KAMyB,cAAtCjX,KAAK0R,UAAUpU,OAAO0c,OAAOnQ,MAC/B7J,KAAKia,oBAIP,MAAMxG,EAAsB,CAC1BsB,KAAMrE,EACNoE,aAAc7B,EACdc,OAAQrD,EACRiE,eAAcnY,OAAA2F,OAAA,GAAO8Q,GACrBgF,OAAQ4B,QAAa7R,EACrBoR,YACAN,WAAY9Y,KAAK0R,UAAUpU,OAAO0c,OAAOnQ,KACzC0G,MAAOzP,EAAKyP,MACZC,OAAQ1P,EAAK0P,QAMf,OAFAxQ,KAAKqX,QAAQnU,IAAI+T,EAASxD,GACT,QAAjBnG,EAAAtN,KAAKka,oBAAY,IAAA5M,GAAAA,EAAA9F,KAAjBxH,MACOiX,CACT,CAQO,MAAAkD,CAAOC,WAEZ,IAAIC,GAAe,EACfC,GAAkB,EACtB,IAAK,MAAM5F,KAAQ1U,KAAKqX,QAAQ5C,SAM9B,GALmB,WAAfC,EAAKnE,MACP+J,GAAkB,EAElBD,GAAe,EAEbA,GAAgBC,EAAiB,MAIvC,GAAID,IAAiBra,KAAKkK,UAAU2L,SAAS,SAC3C7V,KAAKkK,UAAUiL,iBAAiB,QAC3BnV,KAAKkK,UAAU2L,SAAS,QAAQ,OAUvC,GARIyE,IAAoBta,KAAKkK,UAAU2L,SAAS,WAC9C7V,KAAKkK,UAAUiL,iBAAiB,UAIlCnV,KAAKkK,UAAUqI,iBAGVvS,KAAKqX,QAAQtN,KAYhB,OAXK/J,KAAKwX,gBACRxX,KAAKkK,UAAUqJ,WACfvT,KAAKwX,eAAgB,EACrBxX,KAAKyX,iBAAkB,GAErBzX,KAAKkK,UAAU2L,SAAS,QAC1B7V,KAAKkK,UAAUwI,mBAAmB,YAEhC1S,KAAKkK,UAAU2L,SAAS,WAC1B7V,KAAKkK,UAAUwI,mBAAmB,YAMjC2H,GAAgBra,KAAKkK,UAAU2L,SAAS,SAC3C7V,KAAKkK,UAAUqJ,SAAS,OACxBvT,KAAKkK,UAAUwI,mBAAmB,SAE/B4H,GAAmBta,KAAKkK,UAAU2L,SAAS,YAC9C7V,KAAKkK,UAAUqJ,SAAS,UACxBvT,KAAKkK,UAAUwI,mBAAmB,WAIhC1S,KAAKyX,kBACPzX,KAAKkK,UAAUqJ,WACfvT,KAAKwX,eAAgB,EACrBxX,KAAKyX,iBAAkB,GAGzB,MAAMpS,MAAEA,EAAKC,IAAEA,GAAQ8U,EACjB9c,EAAS0C,KAAK0R,UAAUvF,MAAM7O,OAC9BwO,EAAO9L,KAAK0R,UAAUvF,MAAML,KAGlC9L,KAAKkK,UAAUiJ,WAAW9N,EAAOC,GAGjC,MAAMiV,EAAgG,GAChGC,EAAkE,GAGxE,IAAK,IAAI5G,EAAMvO,EAAOuO,GAAOtO,IAAOsO,EAAK,CACvC,MAAM4F,EAAOlc,EAAOmc,MAAMxI,IAAI2C,EAAMtW,EAAOmd,OAC3C,IAAKjB,EAAM,OACX,IAAK,IAAI7F,EAAM,EAAGA,EAAM7H,IAAQ6H,EAC9B,GAAmB,UAAf6F,EAAKkB,MAAM/G,GAA6B,CAC1C,IAAI7L,EAAiD,QAAhDoE,EAAwBsN,EAAKmB,eAAehH,UAAI,IAAAzH,EAAAA,EAAIkL,EACzD,MAAMH,EAAUnP,EAAEmP,QAClB,QAAgBjP,IAAZiP,IAAsC,IAAbA,EAC3B,SAEF,MAAMxD,EAAUzT,KAAKqX,QAAQpG,IAAIgG,GACjC,IAAkB,IAAdnP,EAAE4L,OAAe,CACnB,MAAMkH,EAAY9S,EAAE4L,OACdmH,EAAWlH,EACjB,IAAIE,EAAQ,EAOZ,OACIF,EAAM7H,GACW,UAAf0N,EAAKkB,MAAM/G,KACX7L,EAA4B,QAA3BwF,EAAGkM,EAAKmB,eAAehH,UAAI,IAAArG,EAAAA,EAAI8J,IAChCtP,EAAEmP,UAAYA,GACdnP,EAAE4L,SAAWkH,EAAY/G,GAE7BA,IAEFF,IACIF,EACEA,EAAQM,QACVwG,EAAU7b,KAAK,CAAE+U,UAASC,OAAQkH,EAAWjH,IAAKkH,EAAUjH,MAAKC,UAE1D7T,KAAKkC,MAAM8Q,iBACpBwH,EAAiB9b,KAAK,CAAEiV,IAAKkH,EAAUjH,MAAKC,UAE9C7T,KAAKwX,eAAgB,CACvB,CACF,CAEJ,CAGA+C,EAAUO,KAAK,CAACpf,EAAGD,IAAMC,EAAE+X,QAAQjD,OAAS/U,EAAEgY,QAAQjD,QAGtD,IAAK,MAAMhJ,KAAQgT,EACjBxa,KAAKkK,UAAUsK,gBAAgBhN,EAAKmM,IAAKnM,EAAKoM,IAAKpM,EAAKqM,OAI1D,IAAK,MAAMrM,KAAQ+S,EACjBva,KAAKkK,UAAUsJ,KAAKhM,EAAKiM,QAASjM,EAAKkM,OAAQlM,EAAKmM,IAAKnM,EAAKoM,IAAKpM,EAAKqM,MAE5E,CAEO,cAAAkH,CAAepO,WAEpB,IAAK3M,KAAKqX,QAAQtN,KAEhB,YADA/J,KAAKgY,iBAAmBrL,GAM1B,GAAI3M,KAAKgY,iBAAiBlM,MAAQa,EAAQb,KAExC,YADA9L,KAAKgY,iBAAmBrL,GAK1B,MAAMrP,EAAS0C,KAAK0R,UAAUvF,MAAM7O,OAC9ByO,EAAOzO,EAAOmc,MAAM1b,OACpBid,EAAShb,KAAKgY,iBAAiBlM,KAAO,EAC5C,IAAK,IAAI8H,EAAM,EAAGA,EAAM7H,IAAQ6H,EAAK,CACnC,MAAM4F,EAAOlc,EAAOmc,MAAMxI,IAAI2C,GAC9B,GAAsB,UAAlB4F,EAAKkB,MAAMM,GAAgC,CAC7C,MAAMlT,EAAoD,QAAnDwF,EAAwBkM,EAAKmB,eAAeK,UAAO,IAAA1N,EAAAA,EAAI8J,EACxDH,EAAUnP,EAAEmP,QAClB,QAAgBjP,IAAZiP,IAAsC,IAAbA,EAC3B,SAEF,MAAMxD,EAAUzT,KAAKqX,QAAQpG,IAAIgG,GACjC,IAAKxD,EACH,SAGF,MAAMwH,EAAclf,KAAKuI,OAAoB,QAAd4H,EAAAuH,EAAQM,cAAM,IAAA7H,OAAA,EAAAA,EAAEhM,QAAS,GAAKuT,EAAQkB,eAAezU,OACpF,GAAK4H,EAAE4L,OAASuH,EAAe,GAAKA,EAClC,SAGF,IAAIC,GAAU,EACd,IAAK,IAAIC,EAAWH,EAAS,EAAGG,EAAWxO,EAAQb,OAAQqP,EACzD,GAAmD,QAA/C3B,EAAK4B,MAAc,EAARD,EAAoB,GAA6C,CAC9ED,GAAU,EACV,KACF,CAEF,GAAIA,EACF,SAGF,MAAM5V,EAAMvJ,KAAKE,IAAI0Q,EAAQb,KAAMmP,EAAenT,EAAE4L,OAASuH,EAAeD,GAC5E,IAAIK,EAAWvT,EAAE4L,OACjB,IAAK,IAAI4H,EAAYN,EAAS,EAAGM,EAAYhW,IAAOgW,EAClDtb,KAAK2Z,aAAaH,EAAwB8B,EAAWrE,IAAWoE,GAChE5H,EAAQ2F,WAEZ,CACF,CAEApZ,KAAKgY,iBAAmBrL,CAC1B,CAKO,oBAAA4O,CAAqBpF,EAAW/C,aACrC,MACMoG,EADSxZ,KAAK0R,UAAUvF,MAAM7O,OAChBmc,MAAMxI,IAAImC,GAC9B,GAAIoG,GAAqB,UAAbA,EAAKkB,MAAMvE,GAA2B,CAChD,MAAMrO,EAA+C,QAA9CmE,EAAwBuN,EAAKmB,eAAexE,UAAE,IAAAlK,EAAAA,EAAImL,EACzD,GAAItP,EAAEmP,UAA0B,IAAfnP,EAAEmP,QAAgB,CACjC,MAAMlC,EAAkC,QAA3B7I,EAAAlM,KAAKqX,QAAQpG,IAAInJ,EAAEmP,gBAAQ,IAAA/K,OAAA,EAAAA,EAAE6I,KAC1C,GAAIwB,OAAOkC,aAAe1D,aAAgB0D,YAAa,CACrD,MAAM5M,EAASxC,EAAA+D,cAAcC,aAAakJ,OAAOpF,SAAU4D,EAAK7U,MAAO6U,EAAK/Q,QAE5E,OADuB,QAAvBsJ,EAAAzB,EAAO0B,WAAW,aAAK,IAAAD,GAAAA,EAAEgH,UAAUS,EAAM,EAAG,EAAGA,EAAK7U,MAAO6U,EAAK/Q,QACzD6H,CACT,CACA,OAAOkJ,CACT,CACF,CACF,CAKO,uBAAAyG,CAAwBrF,EAAW/C,SACxC,MACMoG,EADSxZ,KAAK0R,UAAUvF,MAAM7O,OAChBmc,MAAMxI,IAAImC,GAC9B,GAAIoG,GAAqB,UAAbA,EAAKkB,MAAMvE,GAA2B,CAChD,MAAMrO,EAA+C,QAA9CoE,EAAwBsN,EAAKmB,eAAexE,UAAE,IAAAjK,EAAAA,EAAIkL,EACzD,GAAItP,EAAEmP,UAA0B,IAAfnP,EAAEmP,UAAgC,IAAdnP,EAAE4L,OAAe,CACpD,MAAMgB,EAAO1U,KAAKqX,QAAQpG,IAAInJ,EAAEmP,SAChC,GAAIvC,EACF,OAAO1U,KAAKkK,UAAUqK,YAAYG,EAAM5M,EAAE4L,OAE9C,CACF,CACF,CAIQ,YAAAyE,CAAasD,SACnB,MAAMC,EAAO1b,KAAKqY,mBAClB,IAAIsD,EAAUD,EACd,KAAO1b,KAAK0X,YAAciE,EAAUF,GAAQzb,KAAKqX,QAAQtN,MAAM,CAC7D,MAAM2K,EAAO1U,KAAKqX,QAAQpG,MAAMjR,KAAKuX,WACjC7C,GAAQA,EAAKK,OACf4G,GAAWjH,EAAKK,KAAK7U,MAAQwU,EAAKK,KAAK/Q,OACnC0Q,EAAKX,QAAUW,EAAKK,OAASL,EAAKX,SACpC4H,GAAWjH,EAAKX,OAAO7T,MAAQwU,EAAKX,OAAO/P,QAElC,QAAXkI,EAAAwI,EAAKuD,cAAM,IAAA/L,GAAAA,EAAEvE,UACb3H,KAAKuY,QAAQvY,KAAKuX,WAEtB,CACA,OAAOmE,EAAOC,CAChB,CAEQ,YAAAhC,CAAaH,EAAsBrD,EAAWc,EAAiBvD,GACrE,GAAuC,UAAnC8F,EAAK4B,MAAO,EAADjF,EAAa,GAAoC,CAC9D,MAAMyF,EAAMpC,EAAKmB,eAAexE,GAChC,GAAIyF,EAAK,CACP,QAAoB5T,IAAhB4T,EAAI3E,QAAuB,CAI7B,MAAM4E,EAAU7b,KAAKqX,QAAQpG,IAAI2K,EAAI3E,SAOrC,OANI4E,GAEFA,EAAQzC,YAEVwC,EAAI3E,QAAUA,OACd2E,EAAIlI,OAASA,EAEf,CAGA,YADA8F,EAAKmB,eAAexE,GAAK,IAAIK,EAAmBoF,EAAInF,IAAKmF,EAAI5E,MAAOC,EAASvD,GAE/E,CACF,CAEA8F,EAAK4B,MAAO,EAADjF,EAAa,IAAW,UACnCqD,EAAKmB,eAAexE,GAAK,IAAIK,EAAmB,EAAG,EAAGS,EAASvD,EACjE,CAEQ,iBAAAuG,WAEN,IAAK,MAAMvF,KAAQ1U,KAAKqX,QAAQ5C,SACN,cAApBC,EAAKoE,aACPpE,EAAK0E,UAAY,GAIrB,MAAM9b,EAAS0C,KAAK0R,UAAUvF,MAAM7O,OACpC,IAAK,IAAI8V,EAAI,EAAGA,EAAIpT,KAAK0R,UAAU3F,OAAQqH,EAAG,CAC5C,MAAMoG,EAAOlc,EAAOmc,MAAMxI,IAAImC,GAC9B,GAAKoG,EAGL,IAAK,IAAIrD,EAAI,EAAGA,EAAInW,KAAK0R,UAAU5F,OAAQqK,EACzC,GAAuC,UAAnCqD,EAAK4B,MAAO,EAADjF,EAAa,GAAoC,CAC9D,MAAM2F,EAA8B,QAAtB5P,EAAAsN,EAAKmB,eAAexE,UAAE,IAAAjK,OAAA,EAAAA,EAAE+K,QACtC,GAAI6E,EAAO,CACT,MAAMpH,EAAO1U,KAAKqX,QAAQpG,IAAI6K,GAC1BpH,GACFA,EAAK0E,WAET,CACF,CAEJ,CAEA,MAAMR,EAAO,GACb,IAAK,MAAOJ,EAAI9D,KAAS1U,KAAKqX,QAAQwB,UACZ,cAApBnE,EAAKoE,YAA+BpE,EAAK0E,YAChC,QAAX9L,EAAAoH,EAAKuD,cAAM,IAAA3K,GAAAA,EAAE3F,UACbiR,EAAKla,KAAK8Z,IAGd,IAAK,MAAMA,KAAMI,EACf5Y,KAAKuY,QAAQC,EAEjB,sFCnpBF,MAAAzZ,EAAAC,EAAA,KAEAqK,EAAArK,EAAA,KAEA+c,EAAA/c,EAAA,KAMMgd,EAAkBjd,EAAAnC,iBAkIxB,SAASqf,EAAUxe,GACjB,OAAIsB,EAAA5B,WAAmBM,GACP,IAARA,IAAiB,IAAMA,IAAU,EAAI,MAAS,IAAMA,IAAU,GAAK,MAAS,EAAIA,IAAU,GAAK,GACzG,CApIAue,EAAgB9Y,IAAInE,EAAAjC,oCAGpB,MAKE,WAAAiD,CACmBmC,EACAiI,EACAC,GAFApK,KAAAkC,MAAAA,EACAlC,KAAAmK,SAAAA,EACAnK,KAAAoK,cAAAA,EAPXpK,KAAAkc,MAAQ,EACRlc,KAAAqK,UAAW,GAQjB,EAAA0R,EAAAjd,cAAa,CACX0B,YAAqC,EAAxBR,KAAKkC,MAAM6K,WACxBrP,QAASse,EACTrb,aAAcX,KAAKkC,MAAMia,oBACxB9a,KAAKlD,GAAK6B,KAAK8K,KAAO3M,EAC3B,CAEO,KAAA8M,GAODjL,KAAK8K,OACP9K,KAAK8K,KAAK7G,UAETjE,KAAK8K,KAAa9H,SAAS2C,KAAK,GACjC3F,KAAK8K,KAAKzH,KAAK,EAAG2Y,EAAiBhc,KAAKkC,MAAMia,mBAElD,CAEO,IAAAC,CAAKC,SAGV,GAFArc,KAAKkc,MAAQ,EACblc,KAAKqK,UAAW,EACZrK,KAAK8K,KAAM,CACb,MAAMpK,EAAiC,IAArB2b,EAAOA,OAAO,GAAW,EA4DjD,SAAyBC,EAAqBC,GAC5C,IAAIC,EAAK,EACT,IAAKD,EAGH,OAAOC,EAET,GAAIF,EAAKG,YACP,GAAIH,EAAKI,cACPF,EAAKP,EAAUM,EAAOI,WAAWC,WAC5B,GAAIN,EAAKO,UAAW,CACzB,MAAMC,EAAKR,EAAKvc,YAAqCgd,WAAWT,EAAKU,cACrER,GAAK,EAAAzd,EAAAzD,eAAcwhB,EACrB,MACEN,EAAKP,EAAUM,EAAOU,KAAKX,EAAKU,cAAcJ,WAGhD,GAAIN,EAAKY,cACPV,EAAKP,EAAUM,EAAOY,WAAWP,WAC5B,GAAIN,EAAKc,UAAW,CACzB,MAAMN,EAAKR,EAAKvc,YAAqCgd,WAAWT,EAAKe,cACrEb,GAAK,EAAAzd,EAAAzD,eAAcwhB,EACrB,MACEN,EAAKP,EAAUM,EAAOU,KAAKX,EAAKe,cAAcT,MAGlD,OAAOJ,CACT,CAvFqDc,CAC7Ctd,KAAKoK,cAAc+B,MAAMkN,cAAckE,aACD,QAAtCrR,EAAAlM,KAAKoK,cAAc+B,MAAMqR,qBAAa,IAAAtR,OAAA,EAAAA,EAAEqQ,QAC1Cvc,KAAK8K,KAAKzH,KAAK3C,EAAW,KAAMV,KAAKkC,MAAMia,kBAC7C,CACF,CAEO,GAAAjR,CAAI9F,EAAmBC,EAAeC,GAC3C,IAAItF,KAAKqK,UAAarK,KAAK8K,KAA3B,CAIA,GADA9K,KAAKkc,OAAS5W,EAAMD,EAChBrF,KAAKkc,MAAQlc,KAAKkC,MAAMub,eAI1B,OAHAlgB,QAAQC,KAAK,kCACbwC,KAAKqK,UAAW,OAChBrK,KAAK8K,KAAK7G,UAGZ,IACEjE,KAAK8K,KAAKlM,OAAOwG,EAAMC,EAAOC,EAChC,CAAE,MAAOwC,GACPvK,QAAQC,KAAK,uCAAuCsK,KACpD9H,KAAKqK,UAAW,EAChBrK,KAAK8K,KAAK7G,SACZ,CAdA,CAeF,CAEO,MAAAyZ,CAAOnS,SACZ,GAAIvL,KAAKqK,WAAakB,IAAYvL,KAAK8K,KACrC,OAAO,EAGT,MAAM5K,EAAQF,KAAK8K,KAAK5K,MAClB8D,EAAShE,KAAK8K,KAAK9G,OAGzB,IAAK9D,IAAU8D,EAIb,OAHIA,GACFhE,KAAKmK,SAASwT,cAAc3Z,IAEvB,EAGT,MAAM6H,EAASxC,EAAA+D,cAAcC,kBAAarF,EAAW9H,EAAO8D,GAM5D,OALuB,QAAvBkI,EAAAL,EAAO0B,WAAW,aAAK,IAAArB,GAAAA,EAAEsB,aAAa,IAAIN,UAAUlN,KAAK8K,KAAK7E,MAAyC/F,EAAO8D,GAAS,EAAG,GACtHhE,KAAK8K,KAAKlG,YAxFM,SAyFlB5E,KAAK8K,KAAK7G,UAEZjE,KAAKmK,SAASsD,SAAS5B,IAChB,CACT,2FCtGF,MAAAvC,EAAAtK,EAAA,yBAWA,MAEE,WAAAe,CACmBoK,EACAjI,EACAgI,EACAwH,GAHA1R,KAAAmK,SAAAA,EACAnK,KAAAkC,MAAAA,EACAlC,KAAAkK,UAAAA,EACAlK,KAAA0R,UAAAA,EALX1R,KAAAqQ,cAA+B,CAAEC,WAAW,EAAMC,MAAO,MAAOC,OAAQ,EAAGC,UAAW,QAM3F,CAMI,QAAAhD,CAASiD,GACd1Q,KAAKqQ,cAAcC,UAAYtQ,KAAKkC,MAAM0b,eAC1C5d,KAAKmK,SAASsD,SAASiD,EAAK1Q,KAAKqQ,cACnC,CAOO,aAAAsN,CAAc3Z,GACnB,GAAIhE,KAAKkC,MAAM0b,eAAgB,CAC7B,IAAI3K,EAAWjT,KAAKkK,UAAU+I,UACN,IAApBA,EAAS/S,QAAqC,IAArB+S,EAASjP,SACpCiP,EAAW3J,EAAAoC,mBAEb,MAAMK,EAAOhQ,KAAKuI,KAAKN,EAASiP,EAASjP,QACzC,IAAK,IAAIlG,EAAI,EAAGA,EAAIiO,IAAQjO,EAC1BkC,KAAK0R,UAAUvF,MAAMkN,cAAcO,UAEvC,CACF,iLC3CF,MAAAvQ,EAAArK,EAAA,KACAsK,EAAAtK,EAAA,KAEAuK,EAAAC,EAAAxK,EAAA,MACA6e,EAAA7e,EAAA,4BA0BA,MAgCE,WAAAe,CACmBmC,EACAgI,EACA4T,EACA1T,GAHApK,KAAAkC,MAAAA,EACAlC,KAAAkK,UAAAA,EACAlK,KAAA8d,cAAAA,EACA9d,KAAAoK,cAAAA,EAnCXpK,KAAAqK,UAAW,EACXrK,KAAA+d,cAAe,EAEf/d,KAAAge,eAAuC,KAOvChe,KAAAie,gBAAiB,EAGjBje,KAAAke,aAAe,IAAI7gB,YAAW,KAC9B2C,KAAAme,eAAiB,EAGjBne,KAAAoe,kBAAoB,EACpBpe,KAAAqe,kBAAoB,EAGpBre,KAAAse,eAAuC,KAIvCte,KAAAue,sBAA2D,IAAI3M,IAarE5R,KAAKwe,iBAAmBziB,KAAKuI,KAAiC,EAA5BtE,KAAKkC,MAAMuc,eAAqB,GAElEze,KAAK0e,qBAAuB3iB,KAAKE,IAAG,QAAiC+D,KAAKwe,iBAC5E,CAEO,KAAAvT,GACLjL,KAAK2e,qBACD3e,KAAKge,iBACPhe,KAAKge,eAAe/Z,UACpBjE,KAAKge,eAAiB,MAExBhe,KAAK8d,cAAc7S,OACrB,CAEO,OAAAtD,GACL3H,KAAKiL,OACP,CAEQ,mBAAA2T,CAAoB3J,GAC1BjV,KAAKue,sBAAsB3I,OAAOX,GAC9BjV,KAAK6e,kBAAoB5J,IAC3BjV,KAAK6e,qBAAkB7W,EAE3B,CAEQ,kBAAA2W,GACN,IAAK,MAAMG,KAAW9e,KAAKue,sBAAsB9J,SAC/CqK,EAAQC,QAAQ9a,UAElBjE,KAAKue,sBAAsBzV,QAC3B9I,KAAK6e,qBAAkB7W,CACzB,CAEO,KAAA3C,GACLrF,KAAKqK,UAAW,EAChBrK,KAAK+d,cAAe,EACpB/d,KAAKie,gBAAiB,EACtBje,KAAKme,eAAiB,EACtBne,KAAKse,eAAiB,KAEtBte,KAAKoe,kBAAoBpe,KAAKwe,iBAC9Bxe,KAAKqe,kBAAoB,EACzBre,KAAKge,eAAiB,IACxB,CAEO,GAAA9S,CAAI9F,EAAmBC,EAAeC,SAC3C,IAAItF,KAAKqK,SAET,GAAKrK,KAAKie,eAEH,CAEL,IAAIe,EAAa1Z,EACjB,IAAK,IAAIxH,EAAIuH,EAAOvH,EAAIwH,EAAKxH,IAC3B,GAAW,KAAPsH,EAAKtH,GAA4B,CACnCkC,KAAKie,gBAAiB,EACtBe,EAAalhB,EACb,KACF,CAIF,MAAMmhB,EAAaD,EAAa3Z,EAChC,GAAIrF,KAAKme,eAAiBc,EAAU,IAElC,YADAjf,KAAKqK,UAAW,GAMlB,GAHArK,KAAKke,aAAahb,IAAIkC,EAAKX,SAASY,EAAO2Z,GAAahf,KAAKme,gBAC7Dne,KAAKme,gBAAkBc,GAElBjf,KAAKie,eAAgB,CAKxB,GAHAje,KAAKse,gBAAiB,EAAAT,EAAAqB,mBAAkBlf,KAAKmf,gCAGdnX,IAA3BhI,KAAKse,eAAe9F,SAAwDxQ,IAApChI,KAAKse,eAAec,YAG9D,OAFApf,KAAKqf,cAAcrf,KAAKse,eAAe9F,GAAI,0CAAoE,QAA3BtM,EAAElM,KAAKse,eAAegB,aAAK,IAAApT,EAAAA,EAAI,QACnHlM,KAAKqK,UAAW,GAKlB,GAA8B,MAA1BrK,KAAKse,eAAeiB,OACtB,OAIF,MAAMC,EAAeR,EAAa,EAC9BQ,EAAela,GACjBtF,KAAKyf,eAAera,EAAMoa,EAAcla,EAE5C,CACF,MA3CEtF,KAAKyf,eAAera,EAAMC,EAAOC,EA4CrC,CAGQ,cAAAma,CAAera,EAAmBC,EAAeC,iBACvD,GAAItF,KAAKqK,SAAU,OAKnB,MAAMqV,EAA4D,QAAlDzT,EAA0B,QAA1BqB,EAAsB,QAAnBpB,EAAAlM,KAAKse,sBAAc,IAAApS,OAAA,EAAAA,EAAEsM,UAAE,IAAAlL,EAAAA,EAAItN,KAAK6e,uBAAe,IAAA5S,EAAAA,EAAI,EAChE6S,EAAU9e,KAAKue,sBAAsBtN,IAAIyO,GACzCC,EAA+C,QAA5BxR,EAAG2Q,aAAO,EAAPA,EAASc,wBAAgB,IAAAzR,EAAAA,EAAI,EAGzD,GAFAnO,KAAKqe,mBAAqB/Y,EAAMD,EACFsa,EAAsB3f,KAAKqe,kBAC7Bre,KAAKoe,kBAAmB,CAClD,MAAMyB,EAAsC,QAAtBvM,EAAGtT,KAAKge,sBAAc,IAAA1K,EAAAA,EAAIwL,aAAO,EAAPA,EAASC,QASzD,OARIc,GACFA,EAAiB5b,UAEnBjE,KAAKge,eAAiB,KAClBc,GACF9e,KAAK4e,oBAAoBc,QAE3B1f,KAAKqK,UAAW,EAElB,CAEIrK,KAAK+d,gBAELe,aAAO,EAAPA,EAASC,WAAY/e,KAAKge,iBAC5Bhe,KAAKge,eAAiBc,EAAQC,SAE3B/e,KAAKge,iBACRhe,KAAKge,eAAiB,IAAIzU,EAAAwB,QAAa,QAA8B/K,KAAKwe,iBAAkBxe,KAAK0e,sBACjG1e,KAAKge,eAAe3a,QAzKP,IA4KXrD,KAAKge,eAAe9S,IAAI9F,EAAKX,SAASY,EAAOC,MAC/CtF,KAAKge,eAAe/Z,UACpBjE,KAAKge,eAAiB,KACtBhe,KAAK+d,cAAe,EAChBe,GACF9e,KAAK4e,oBAAoBc,IAG/B,CAEO,GAAApa,CAAIiG,WACT,GAAIvL,KAAKqK,WAAakB,EAKpB,OAJIvL,KAAKge,iBACPhe,KAAKge,eAAe/Z,UACpBjE,KAAKge,eAAiB,OAEjB,EAIT,GAAIhe,KAAKie,eACP,OAAOje,KAAK8f,0BAId,MAAMC,EAAM/f,KAAKse,eAGjB,GAAc,MAAVyB,EAAIR,OACN,OAAOvf,KAAKggB,cAAcD,GAI5B,MAAML,EAA2C,QAAjCpS,EAAS,QAATpB,EAAG6T,EAAIvH,UAAE,IAAAtM,EAAAA,EAAIlM,KAAK6e,uBAAe,IAAAvR,EAAAA,EAAI,EAC/C2S,EAA4B,IAAbF,EAAIG,KACnBpB,EAAU9e,KAAKue,sBAAsBtN,IAAIyO,GAE/C,GAAIO,EAgBF,OAfIjgB,KAAKge,iBACHc,GACFA,EAAQc,kBAAoB5f,KAAKqe,kBACjCS,EAAQqB,YAAcrB,EAAQqB,aAAengB,KAAK+d,cAElD/d,KAAKue,sBAAsBrb,IAAIwc,EAAY,CACzCK,IAAGvjB,OAAA2F,OAAA,GAAO4d,GACVhB,QAAS/e,KAAKge,eACd4B,iBAAkB5f,KAAKqe,kBACvB8B,YAAangB,KAAK+d,eAGtB/d,KAAK6e,gBAAkBa,EACvB1f,KAAKge,eAAiB,OAEjB,EAILc,IACF9e,KAAK6e,qBAAkB7W,GAGzB,IAAImY,EAAcngB,KAAK+d,aACnBqC,EAAWL,EACXhB,EAAU/e,KAAKge,eAEfc,IACFsB,EAAWtB,EAAQiB,IACnBhB,EAAUD,EAAQC,QAClBoB,EAAcA,GAAerB,EAAQqB,YACrCngB,KAAKue,sBAAsB3I,OAAO8J,IAGpC,IAAIW,EAAa,IAAIjjB,WAAW,GAC5B2hB,IArPW,IAsPTA,EAAQzZ,QACV6a,GAAc,GAEhBE,EAAatB,EAAQ9Y,OAEvBjG,KAAKge,eAAiB,KAKtB,MAAMze,EAASS,KAAKsgB,8BAA8BF,EAAUC,EAAYF,GAIxE,OAHIpB,GACFA,EAAQ9a,UAEH1E,CACT,CAIQ,uBAAA4f,GACN,IAAIoB,EAAM,GACV,IAAK,IAAIziB,EAAI,EAAGA,EAAIkC,KAAKme,eAAgBrgB,IACvCyiB,GAAOxR,OAAOyR,cAAcxgB,KAAKke,aAAapgB,IAEhD,OAAOyiB,CACT,CAEQ,uBAAAT,iBACN,MAAMC,GAAM,EAAAlC,EAAAqB,mBAAkBlf,KAAKmf,2BAGnC,QAAenX,IAAX+X,EAAIvH,SAAwCxQ,IAApB+X,EAAIX,YAE9B,OADApf,KAAKqf,cAAcU,EAAIvH,GAAI,0CAAoD,QAAXtM,EAAE6T,EAAIT,aAAK,IAAApT,EAAAA,EAAI,IAC5E,EAKT,OAFyB,QAAboB,EAAGyS,EAAIR,cAAM,IAAAjS,EAAAA,EAAI,KAG3B,QACE,OAAOtN,KAAKggB,cAAcD,GAC5B,QAEE,OADA/f,KAAKqf,cAAoB,QAAPpT,EAAC8T,EAAIvH,UAAE,IAAAvM,EAAAA,EAAI,EAAG,KAAe,QAAXkC,EAAE4R,EAAIT,aAAK,IAAAnR,EAAAA,EAAI,IAC5C,EACT,QACE,OAAOnO,KAAKygB,iBAAiBV,GAC/B,QAQE,YAHe/X,IAAX+X,EAAIvH,IACNxY,KAAKqf,cAAcU,EAAIvH,GAAI,4BAAsC,QAAXlF,EAAEyM,EAAIT,aAAK,IAAAhM,EAAAA,EAAI,IAEhE,EAEb,CAEQ,6BAAAgN,CAA8BP,EAAoBW,EAAmBP,iBAG3E,OAFyB,QAAbjU,EAAG6T,EAAIR,cAAM,IAAArT,EAAAA,EAAI,KAG3B,QAA2B,CACzB,MAAM3M,EAASS,KAAK2gB,gBAAgBZ,EAAKW,EAAOP,GAUhD,MAPkC,OAAb,QAAjB7S,EAACyS,EAAIa,oBAAY,IAAAtT,EAAAA,EAAI,WAA2BtF,IAAX+X,EAAIvH,KACvC2H,EACFngB,KAAKqf,cAAcU,EAAIvH,GAAI,6BAAuC,QAAXvM,EAAE8T,EAAIT,aAAK,IAAArT,EAAAA,EAAI,GAC7DyU,EAAM3iB,OAAS,GACxBiC,KAAKqf,cAAcU,EAAIvH,GAAI,KAAe,QAAXrK,EAAE4R,EAAIT,aAAK,IAAAnR,EAAAA,EAAI,IAG3C5O,CACT,CACA,QACE,OAAOS,KAAK6gB,uBAAuBd,EAAKW,EAAOP,GACjD,QACE,OAAOngB,KAAK8gB,aAAaf,EAAKW,EAAOP,GACvC,QAEE,OAAOngB,KAAKygB,iBAAiBV,GAC/B,QAQE,YAHe/X,IAAX+X,EAAIvH,IACNxY,KAAKqf,cAAcU,EAAIvH,GAAI,4BAAsC,QAAXlF,EAAEyM,EAAIT,aAAK,IAAAhM,EAAAA,EAAI,IAEhE,EAEb,CAEQ,gBAAAmN,CAAiBV,SACvB,QAAe/X,IAAX+X,EAAIvH,GACN,OAAO,EAET,MAAMA,EAAKuH,EAAIvH,GACTuI,EAAQ/gB,KAAK8d,cAAckD,SAASxI,GAC1C,OAAKuI,EAIU/gB,KAAKihB,cAAcF,EAAOhB,GAC3B1e,KAAKkK,UAEjB,OADAvL,KAAKqf,cAAc7G,EAAIjN,EAAU,KAAO,gCAA0C,QAAXW,EAAE6T,EAAIT,aAAK,IAAApT,EAAAA,EAAI,EAAG6T,EAAImB,cACtF,KANPlhB,KAAKqf,cAAc7G,EAAI,yBAAmC,QAAXtM,EAAE6T,EAAIT,aAAK,IAAApT,EAAAA,EAAI,EAAG6T,EAAImB,cAC9D,EAOX,CAEQ,eAAAP,CAAgBZ,EAAoBW,EAAmBP,mBAY7D,MAAqB,OADgB,QAAnBjU,EAAG6T,EAAIa,oBAAY,IAAA1U,EAAAA,EAAI,WAExBlE,IAAX+X,EAAIvH,IACNxY,KAAKqf,cAAcU,EAAIvH,GAAI,yCAAmD,QAAXlL,EAAEyS,EAAIT,aAAK,IAAAhS,EAAAA,EAAI,IAE7E,IAGL6S,GAAgC,IAAjBO,EAAM3iB,QAEzBiC,KAAK8d,cAAcqD,WAAWpB,EAAIvH,GAAI,CACpCpT,KAAM,IAAIsI,KAAK,CAACgT,IAChBxgB,MAAgB,QAAX+L,EAAE8T,EAAI7f,aAAK,IAAA+L,EAAAA,EAAI,EACpBjI,OAAkB,QAAZmK,EAAE4R,EAAI/b,cAAM,IAAAmK,EAAAA,EAAI,EACtBiT,OAAmB,QAAX9N,EAACyM,EAAIqB,cAAM,IAAA9N,EAAAA,EAAA,GACnB+N,YAA4B,QAAjBC,EAAEvB,EAAIsB,mBAAW,IAAAC,EAAAA,EAAI,MAPY,EAUhD,CAEQ,sBAAAT,CAAuBd,EAAoBW,EAAmBP,WACpE,GAAIA,EAIF,YAHenY,IAAX+X,EAAIvH,IACNxY,KAAKqf,cAAcU,EAAIvH,GAAI,6BAAuC,QAAXtM,EAAE6T,EAAIT,aAAK,IAAApT,EAAAA,EAAI,IAEjE,EAGTlM,KAAK2gB,gBAAgBZ,EAAKW,EAAOP,GAEjC,MAAM3H,EAAW,QAATlL,EAAGyS,EAAIvH,UAAE,IAAAlL,EAAAA,EAAItN,KAAK8d,cAAcyD,YAClCR,EAAQ/gB,KAAK8d,cAAckD,SAASxI,GAC1C,GAAIuI,EAAO,CACT,MAAMxhB,EAASS,KAAKihB,cAAcF,EAAOhB,GACzC,YAAe/X,IAAX+X,EAAIvH,GACCjZ,EAAO8B,KAAKkK,UAEjB,OADAvL,KAAKqf,cAAc7G,EAAIjN,EAAU,KAAO,gCAA0C,QAAXW,EAAE6T,EAAIT,aAAK,IAAApT,EAAAA,EAAI,IAC/E,IAGJ3M,EAAO8B,KAAK,KAAM,EAC3B,CACA,OAAO,CACT,CAEQ,YAAAyf,CAAaf,EAAoBW,EAAmBP,mBAC1D,MAAM3H,EAAW,QAATtM,EAAG6T,EAAIvH,UAAE,IAAAtM,EAAAA,EAAI,EACfoT,EAAiB,QAAZhS,EAAGyS,EAAIT,aAAK,IAAAhS,EAAAA,EAAI,EAM3B,GAAqB,OADgB,QAAnBrB,EAAG8T,EAAIa,oBAAY,IAAA3U,EAAAA,EAAI,KAGvC,OADAjM,KAAKqf,cAAc7G,EAAI,yCAA0C8G,IAC1D,EAIT,GAAIa,EAEF,OADAngB,KAAKqf,cAAc7G,EAAI,6BAA8B8G,IAC9C,EAIT,GAAqB,IAAjBoB,EAAM3iB,OAER,OADAiC,KAAKqf,cAAc7G,EAAI,KAAM8G,IACtB,EAGT,MAAM8B,EAAmB,QAAbjT,EAAG4R,EAAIqB,cAAM,IAAAjT,EAAAA,EAAA,GAEzB,GAAU,MAANiT,EACFphB,KAAKqf,cAAc7G,EAAI,KAAM8G,OACxB,CACL,MAAMpf,EAAiB,QAAZoT,EAAGyM,EAAI7f,aAAK,IAAAoT,EAAAA,EAAI,EACrBtP,EAAmB,QAAbsd,EAAGvB,EAAI/b,cAAM,IAAAsd,EAAAA,EAAI,EAE7B,IAAKphB,IAAU8D,EAEb,OADAhE,KAAKqf,cAAc7G,EAAI,sDAAuD8G,IACvE,EAGT,MACMkC,EAAgBthB,EAAQ8D,GADF,KAANod,EAA6B,EAA2C,GAG9F,GAAIV,EAAM3iB,OAASyjB,EAEjB,OADAxhB,KAAKqf,cAAc7G,EAAI,iCAAkC8G,IAClD,EAGTtf,KAAKqf,cAAc7G,EAAI,KAAM8G,EAC/B,CACA,OAAO,CACT,CAEQ,aAAAU,CAAcD,SAOpB,OALmC,QAArB7T,EAAG6T,EAAI0B,sBAAc,IAAAvV,EAAAA,EAAI,KAMrC,IAAK,IACL,IAAK,IACHlM,KAAK2e,qBACL3e,KAAK8d,cAAc4D,YACnB,MACF,IAAK,IACL,IAAK,IAKH,QAAe1Z,IAAX+X,EAAIvH,GAAkB,CACxB,MAAMsG,EAAU9e,KAAKue,sBAAsBtN,IAAI8O,EAAIvH,IAC/CsG,GACFA,EAAQC,QAAQ9a,UAElBjE,KAAK4e,oBAAoBmB,EAAIvH,IAC7BxY,KAAK8d,cAAc6D,WAAW5B,EAAIvH,GACpC,EAMJ,OAAO,CACT,CAEQ,aAAA6G,CAAc7G,EAAYV,EAAiBwH,EAAe4B,GAChE,MAAMU,EAAmB,OAAZ9J,EACb,GAAI8J,GAAQtC,GAAS,EAAG,OACxB,IAAKsC,GAAQtC,GAAS,EAAG,OAEzB,MACMuC,EAAW,QAAWrJ,IADd0I,EAAc,MAAMA,IAAgB,MACRpJ,OAC1C9X,KAAKoK,cAAc+B,MAAM2V,YAAYC,iBAAiBF,EACxD,CAIQ,aAAAZ,CAAcF,EAAwBhB,GAC5C,OAAO/f,KAAKgiB,kBAAkBjB,EAAOhB,GAClC1e,KAAK,KAAM,GACX0M,MAAM,KAAM,EACjB,CAEQ,uBAAMiU,CAAkBjB,EAAwBhB,qBACtD,IAAIzJ,QAAwCtW,KAAKiiB,cAAclB,GAE/D,IACE,MAAMmB,EAAQnmB,KAAKC,IAAI,EAAQ,QAAPiQ,EAAE8T,EAAI5J,SAAC,IAAAlK,EAAAA,EAAI,GAC7BkW,EAAQpmB,KAAKC,IAAI,EAAQ,QAAPmS,EAAE4R,EAAI3M,SAAC,IAAAjF,EAAAA,EAAI,GAC7BiU,EAAQrC,EAAIsC,aAAgB/L,EAAOpW,MAAQgiB,EAC3CI,EAAQvC,EAAIwC,cAAiBjM,EAAOtS,OAASme,EAE7CK,EAAWzmB,KAAKC,IAAI,EAAGsa,EAAOpW,MAAQgiB,GACtCO,EAAW1mB,KAAKC,IAAI,EAAGsa,EAAOtS,OAASme,GACvCO,EAAa3mB,KAAKC,IAAI,EAAGD,KAAKE,IAAImmB,EAAOI,IACzCG,EAAa5mB,KAAKC,IAAI,EAAGD,KAAKE,IAAIqmB,EAAOG,IAE/C,GAAmB,IAAfC,GAAmC,IAAfC,EACtB,MAAM,IAAIvgB,MAAM,4BAGlB,GAAc,IAAV8f,GAAyB,IAAVC,GAAeO,IAAepM,EAAOpW,OAASyiB,IAAerM,EAAOtS,OAAQ,CAC7F,MAAM4e,QAAgBjV,kBAAkB2I,EAAQ4L,EAAOC,EAAOO,EAAYC,GAC1ErM,EAAOxD,QACPwD,EAASsM,CACX,CAEA,MAAM5U,GAA8B,QAAzB9B,EAAAlM,KAAKkK,UAAUyB,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIqC,KAAK/N,QAASoJ,EAAAoC,kBAAkBxL,MACpEgO,GAA8B,QAAzBZ,EAAAtN,KAAKkK,UAAUyB,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIqC,KAAKjK,SAAUsF,EAAAoC,kBAAkB1H,OAI3E,IAAI6e,EACAC,OACgB9a,IAAhB+X,EAAIgD,cAAsC/a,IAAb+X,EAAIhU,MACnC8W,EAAU9C,EAAIgD,QACdD,EAAU/C,EAAIhU,WACW/D,IAAhB+X,EAAIgD,SACbF,EAAU9C,EAAIgD,QACdD,EAAU/mB,KAAKC,IAAI,EAAGD,KAAKuI,KAAMgS,EAAOtS,OAASsS,EAAOpW,OAAU2iB,EAAU7U,GAAME,UAC5DlG,IAAb+X,EAAIhU,MACb+W,EAAU/C,EAAIhU,KACd8W,EAAU9mB,KAAKC,IAAI,EAAGD,KAAKuI,KAAMgS,EAAOpW,MAAQoW,EAAOtS,QAAW8e,EAAU5U,GAAMF,MAElF6U,EAAU9mB,KAAKuI,KAAKgS,EAAOpW,MAAQ8N,GACnC8U,EAAU/mB,KAAKuI,KAAKgS,EAAOtS,OAASkK,IAGtC,IAAIzC,EAAI6K,EAAOpW,MACX9B,EAAIkY,EAAOtS,OAQf,QALoBgE,IAAhB+X,EAAIgD,cAAsC/a,IAAb+X,EAAIhU,OACnCN,EAAI1P,KAAKQ,MAAMsmB,EAAU7U,GACzB5P,EAAIrC,KAAKQ,MAAMumB,EAAU5U,IAGvBzC,EAAIrN,EAAI4B,KAAKkC,MAAM6K,WACrB,MAAM,IAAI3K,MAAM,6BAIlB,MAAM9E,EAAS0C,KAAKoK,cAAc+B,MAAM7O,OAClC0lB,EAAS1lB,EAAO6Y,EAChB8M,EAAS3lB,EAAO8V,EAChB8P,EAAa5lB,EAAOoc,MAOpBnJ,OAD6BvI,IAAf+X,EAAIvP,QAAwBuP,EAAIvP,OAAS,EACrB,SAAW,MAEnD,GAAI/E,IAAM6K,EAAOpW,OAAS9B,IAAMkY,EAAOtS,OAAQ,CAC7C,MAAMmf,QAAexV,kBAAkB2I,EAAQ,CAAE1I,YAAanC,EAAGoC,aAAczP,IAC/EkY,EAAOxD,QACPwD,EAAS6M,CACX,CAGA,MAAMC,EAAUrnB,KAAKE,IAAIF,KAAKC,IAAI,EAAc,QAAbsX,EAAEyM,EAAIqD,eAAO,IAAA9P,EAAAA,EAAI,GAAItF,EAAK,GACvDqV,EAAUtnB,KAAKE,IAAIF,KAAKC,IAAI,EAAc,QAAbslB,EAAEvB,EAAIsD,eAAO,IAAA/B,EAAAA,EAAI,GAAIpT,EAAK,GAC7D,GAAgB,IAAZkV,GAA6B,IAAZC,EAAe,CAKlC,MAAMC,OAA2Btb,IAAhB+X,EAAIgD,QAAyBhnB,KAAKQ,MAAMsmB,EAAU7U,GAAMsI,EAAOpW,MAAQkjB,EAClFG,OAAwBvb,IAAb+X,EAAIhU,KAAsBhQ,KAAKQ,MAAMumB,EAAU5U,GAAMoI,EAAOtS,OAASqf,EAChFG,EAAena,EAAA+D,cAAcC,aAAakJ,OAAOpF,SAAUmS,EAASC,GACpEE,EAAYD,EAAajW,WAAW,MAC1C,IAAKkW,EACH,MAAM,IAAIrhB,MAAM,0CAElBqhB,EAAUnP,UAAUgC,EAAQ8M,EAASC,GAErC,MAAMK,QAAqB/V,kBAAkB6V,GAM7C,GALAA,EAAatjB,MAAQsjB,EAAaxf,OAAS,EAC3CsS,EAAOxD,QACPwD,EAASoN,EACTjY,EAAI6K,EAAOpW,MACX9B,EAAIkY,EAAOtS,OACPyH,EAAIrN,EAAI4B,KAAKkC,MAAM6K,WACrB,MAAM,IAAI3K,MAAM,kCAEE4F,IAAhB+X,EAAIgD,UACNF,EAAU9mB,KAAKuI,KAAKgS,EAAOpW,MAAQ8N,SAEpBhG,IAAb+X,EAAIhU,OACN+W,EAAU/mB,KAAKuI,KAAKgS,EAAOtS,OAASkK,GAExC,CAEA,MAAMsC,EAAmB,QAAbmT,EAAG5D,EAAIvP,cAAM,IAAAmT,EAAAA,EAAI,EAO7B,GANA3jB,KAAK8d,cAAcrQ,SAASsT,EAAMvI,GAAIlC,GAAQ,EAAM/F,EAAOC,GAC3D8F,OAAStO,EAKkB,IAAvB+X,EAAI6D,eAAsB,CAE5B,MAAMC,EAAWvmB,EAAOoc,MAAQwJ,EAChC5lB,EAAO6Y,EAAI6M,EAEX1lB,EAAO8V,EAAIrX,KAAKC,IAAIinB,EAASY,EAAU,EACzC,MAGEvmB,EAAO6Y,EAAIpa,KAAKE,IAAI+mB,EAASH,EAAS7iB,KAAKoK,cAAc0B,KAE7D,CAAE,MAAOhE,GAEP,MADAwO,SAAAA,EAAQxD,QACFhL,CACR,CACF,CAGQ,mBAAMma,CAAclB,GAC1B,IAAIL,EAAoB,IAAItjB,iBAAiB2jB,EAAM3b,KAAK0e,eAMxD,GAJqB,MAAjB/C,EAAMM,cACRX,QAAc1gB,KAAK+jB,gBAAgBrD,IAGrB,MAAZK,EAAMK,OAA4B,CACpC,MAAM1U,EAAO,IAAIgB,KAAK,CAACgT,GAAoB,CAAE7W,KAAM,cACnD,IAAK0M,OAAO5I,kBAAmB,CAC7B,MAAMqW,EAAMC,IAAIC,gBAAgBxX,GAC1BgE,EAAM,IAAIyT,MAChB,OAAO,IAAI3S,QAAqB,CAACC,EAAS2S,KACxC1T,EAAI2T,iBAAiB,OAAQ,WAC3BJ,IAAIK,gBAAgBN,GACpB,MAAMnY,EAASxC,EAAA+D,cAAcC,aAAakJ,OAAOpF,SAAUT,EAAIxQ,MAAOwQ,EAAI1M,QACnD,QAAvBkI,EAAAL,EAAO0B,WAAW,aAAK,IAAArB,GAAAA,EAAEoI,UAAU5D,EAAK,EAAG,GAC3C/C,kBAAkB9B,GAAQxK,KAAKoQ,GAAS1D,MAAMqW,KAEhD1T,EAAI2T,iBAAiB,QAAS,KAC5BJ,IAAIK,gBAAgBN,GACpBI,EAAO,IAAIhiB,MAAM,2BAEnBsO,EAAI6T,IAAMP,GAEd,CACA,OAAOrW,kBAAkBjB,EAC3B,CAGA,MAAMxM,EAAQ6gB,EAAM7gB,MACd8D,EAAS+c,EAAM/c,OAErB,IAAK9D,IAAU8D,EACb,MAAM,IAAI5B,MAAM,gDAGlB,MACMof,EAAgBthB,EAAQ8D,GADI,KAAZ+c,EAAMK,OAA6B,EAA2C,GAGpG,GAAIV,EAAM3iB,OAASyjB,EACjB,MAAM,IAAIpf,MAAM,2BAGlB,MAAMoiB,EAAatkB,EAAQ8D,EAE3B,GAAgB,KAAZ+c,EAAMK,OAER,OAAOzT,kBAAkB,IAAIT,UAAU,IAAIhH,kBAAkBwa,EAAMpjB,OAAuBojB,EAAMvT,WAAsB,EAAVqX,GAAwDtkB,EAAO8D,IAM7K,MAAMoB,EAAO,IAAIc,kBAA4B,EAAVse,GAC7BC,EAAQ,IAAIpnB,YAAYqjB,EAAMpjB,OAAQojB,EAAMvT,WAAYpR,KAAKkR,MAAMyT,EAAM7b,WAAa,IACtF6f,EAAQ,IAAIrnB,YAAY+H,EAAK9H,QAC7BqnB,GAA6B,EAAbH,EAEtB,IAAII,EAAY,EACZC,EAAY,EAChB,IAAK,IAAI/mB,EAAI,EAAGA,EAAI6mB,EAAe7mB,GAAK,EAAG,CACzC,MAAMgnB,EAAKL,EAAMG,KACXG,EAAKN,EAAMG,KACXI,EAAKP,EAAMG,KAEjBF,EAAMG,KAAe,WAAaC,EAClCJ,EAAMG,KAAe,WAAcC,IAAO,GAAOC,GAAM,EACvDL,EAAMG,KAAe,WAAcE,IAAO,GAAOC,GAAM,GACvDN,EAAMG,KAAe,WAAcG,IAAO,CAC5C,CAGA,IAAIC,EAAuB,EAAbN,EACVO,EAAuB,EAAbP,EACd,IAAK,IAAI7mB,EAAI6mB,EAAe7mB,EAAI0mB,EAAY1mB,IAC1CsH,EAAK8f,GAAexE,EAAMuE,GAC1B7f,EAAK8f,EAAU,GAAKxE,EAAMuE,EAAU,GACpC7f,EAAK8f,EAAU,GAAKxE,EAAMuE,EAAU,GACpC7f,EAAK8f,EAAU,GAAE,IACjBD,GAAO,EACPC,GAAO,EAGT,OAAOvX,kBAAkB,IAAIT,UAAU9H,EAAMlF,EAAO8D,GACtD,CAEQ,qBAAM+f,CAAgBoB,GAC5B,IACE,aAAanlB,KAAKolB,YAAYD,EAAY,UAC5C,UACE,aAAanlB,KAAKolB,YAAYD,EAAY,cAC5C,CACF,CAEQ,iBAAMC,CAAYD,EAAwB/D,GAChD,MAAMiE,EAAK,IAAIC,oBAAoBlE,GAC7BmE,EAASF,EAAGG,SAASC,YAC3BF,EAAOG,MAAMP,GACbI,EAAOzS,QAEP,MAAM6S,EAAuB,GACvBC,EAASP,EAAGQ,SAASC,YAE3B,OAAa,CACX,MAAMC,KAAEA,EAAIjqB,MAAEA,SAAgB8pB,EAAOI,OACrC,GAAID,EAAM,MACVJ,EAAOjnB,KAAK5C,EACd,CAEA,MAAMmqB,EAAcN,EAAOO,OAAO,CAACC,EAAKC,IAAUD,EAAMC,EAAMroB,OAAQ,GAChEwB,EAAS,IAAInC,WAAW6oB,GAC9B,IAAI9hB,EAAS,EACb,IAAK,MAAMiiB,KAAST,EAClBpmB,EAAO2D,IAAIkjB,EAAOjiB,GAClBA,GAAUiiB,EAAMroB,OAElB,OAAOwB,CACT,CAEA,UAAW8mB,GACT,OAAOrmB,KAAK8d,cAAcuI,MAC5B,CAEA,uBAAWC,GACT,OAAOtmB,KAAK8d,cAAcyI,kBAC5B,CAEA,wBAAWC,GACT,OAAOxmB,KAAKue,qBACd,kFCnqBF,SAAkCnZ,GAChC,MAAM2a,EAAqB,GACrB0G,EAAQrhB,EAAKshB,MAAM,KAEzB,IAAK,MAAMC,KAAQF,EAAO,CACxB,MAAMG,EAAQD,EAAKzf,QAAQ,KAC3B,IAAe,IAAX0f,EAAc,SAElB,MAAM3R,EAAM0R,EAAKE,UAAU,EAAGD,GACxB9qB,EAAQ6qB,EAAKE,UAAUD,EAAQ,GAGrC,GAAO,MAAH3R,EAAyB,CAC3B8K,EAAIR,OAASzjB,EACb,QACF,CACA,GAAO,MAAHmZ,EAA8B,CAChC8K,EAAIsB,YAAcvlB,EAClB,QACF,CACA,GAAO,MAAHmZ,EAA+B,CACjC8K,EAAIa,aAAe9kB,EACnB,QACF,CACA,GAAO,MAAHmZ,EAAkC,CACpC8K,EAAI0B,eAAiB3lB,EACrB,QACF,CACA,MAAMgrB,EAAWjY,SAAS/S,EAAO,IACjC,OAAQmZ,GACN,QAAsB8K,EAAIqB,OAAS0F,EAAU,MAC7C,QAAkB/G,EAAIvH,GAAKsO,EAAU,MACrC,QAA4B/G,EAAIX,YAAc0H,EAAU,MACxD,QAAqB/G,EAAI7f,MAAQ4mB,EAAU,MAC3C,QAAsB/G,EAAI/b,OAAS8iB,EAAU,MAC7C,QAAwB/G,EAAI5J,EAAI2Q,EAAU,MAC1C,QAAwB/G,EAAI3M,EAAI0T,EAAU,MAC1C,QAA4B/G,EAAIsC,YAAcyE,EAAU,MACxD,QAA6B/G,EAAIwC,aAAeuE,EAAU,MAC1D,QAAkC/G,EAAIqD,QAAU0D,EAAU,MAC1D,QAAkC/G,EAAIsD,QAAUyD,EAAU,MAC1D,QAAuB/G,EAAIgD,QAAU+D,EAAU,MAC/C,QAAoB/G,EAAIhU,KAAO+a,EAAU,MACzC,QAAoB/G,EAAIG,KAAO4G,EAAU,MACzC,QAAqB/G,EAAIT,MAAQwH,EAAU,MAC3C,QAA+B/G,EAAI6D,eAAiBkD,EAAU,MAC9D,QAAuB/G,EAAIvP,OAASsW,EAAU,MAC9C,QAA4B/G,EAAImB,YAAc4F,EAElD,CAEA,OAAO/G,CACT,wFCjLA,MAAAgH,EA6BE,WAAAhnB,CACmBoK,GAAAnK,KAAAmK,SAAAA,EA3BXnK,KAAAgnB,aAAe,EACNhnB,KAAAqX,QAAwC,IAAIzF,IAU5C5R,KAAAsmB,oBAA2C,IAAI1U,IAC/C5R,KAAAinB,oBAA2C,IAAIrV,IAI/C5R,KAAAknB,2BAA8BC,IAC7C,MAAMC,EAAUpnB,KAAKinB,oBAAoBhW,IAAIkW,QAC7Bnf,IAAZof,IACFpnB,KAAKsmB,oBAAoB1Q,OAAOwR,GAChCpnB,KAAKinB,oBAAoBrR,OAAOuR,GAChCnnB,KAAKqX,QAAQzB,OAAOwR,KAGhBpnB,KAAAqQ,cAA+B,CAAEC,WAAW,EAAMC,MAAO,MAAOC,OAAQ,EAAGC,UAAW,OAK5FzQ,KAAKqnB,wBAA0BrnB,KAAKmK,SAASuO,eAC7C1Y,KAAKsnB,uBAA0BH,UACD,QAA5Bjb,EAAAlM,KAAKqnB,+BAAuB,IAAAnb,GAAAA,EAAA1E,KAA5BxH,KAA+BmnB,GAC/BnnB,KAAKknB,2BAA2BC,IAElCnnB,KAAKmK,SAASuO,eAAiB1Y,KAAKsnB,sBACtC,CAEO,KAAArc,GACLjL,KAAKgnB,aAAe,EACpBhnB,KAAKqX,QAAQvO,QACb9I,KAAKsmB,oBAAoBxd,QACzB9I,KAAKinB,oBAAoBne,OAC3B,CAEO,OAAAnB,GACL3H,KAAKiL,QACDjL,KAAKmK,SAASuO,iBAAmB1Y,KAAKsnB,yBACxCtnB,KAAKmK,SAASuO,eAAiB1Y,KAAKqnB,wBAExC,CAEO,UAAAlG,CAAW3I,EAAwB+O,GACxC,MAAMtQ,EAAUuB,QAAAA,EAAMxY,KAAKgnB,eAErBQ,EAAexnB,KAAKsmB,oBAAoBrV,IAAIgG,GAelD,YAdqBjP,IAAjBwf,IACFxnB,KAAKmK,SAAS4O,YAAYyO,GAC1BxnB,KAAKsmB,oBAAoB1Q,OAAOqB,GAChCjX,KAAKinB,oBAAoBrR,OAAO4R,KAG7BxnB,KAAKqX,QAAQjC,IAAI6B,IAAYjX,KAAKqX,QAAQtN,MAAQgd,EAAkBU,kBACvEznB,KAAK0nB,0BAGP1nB,KAAKqX,QAAQnU,IAAI+T,EAAOza,OAAA2F,OAAA3F,OAAA2F,OAAA,GACnBolB,GAAS,CACZ/O,GAAIvB,KAECA,CACT,CAEO,QAAAxJ,CAAS2Z,EAAiBrG,EAAwCzQ,EAAoBC,EAAmBC,GAK9G,MAAMgX,EAAexnB,KAAKsmB,oBAAoBrV,IAAImW,QAC7Bpf,IAAjBwf,GACFxnB,KAAKinB,oBAAoBrR,OAAO4R,GAElCxnB,KAAKqQ,cAAcC,UAAYA,EAC/BtQ,KAAKqQ,cAAcE,MAAQA,EAC3BvQ,KAAKqQ,cAAcG,OAASA,EAC5B,MAAM2W,EAAYnnB,KAAKmK,SAASsD,SAASsT,EAAO/gB,KAAKqQ,eACrDrQ,KAAKsmB,oBAAoBpjB,IAAIkkB,EAASD,GACtCnnB,KAAKinB,oBAAoB/jB,IAAIikB,EAAWC,EAC1C,CAEO,QAAApG,CAASoG,GACd,OAAOpnB,KAAKqX,QAAQpG,IAAImW,EAC1B,CAEO,UAAAzF,CAAWyF,GAChBpnB,KAAKqX,QAAQzB,OAAOwR,GACpB,MAAMD,EAAYnnB,KAAKsmB,oBAAoBrV,IAAImW,QAC7Bpf,IAAdmf,IACFnnB,KAAKmK,SAAS4O,YAAYoO,GAC1BnnB,KAAKsmB,oBAAoB1Q,OAAOwR,GAChCpnB,KAAKinB,oBAAoBrR,OAAOuR,GAEpC,CAEO,SAAAzF,GACL1hB,KAAKqX,QAAQvO,QACb,IAAK,MAAMqe,KAAannB,KAAKsmB,oBAAoB7R,SAC/CzU,KAAKmK,SAAS4O,YAAYoO,GAE5BnnB,KAAKsmB,oBAAoBxd,QACzB9I,KAAKinB,oBAAoBne,OAC3B,CAEA,UAAWud,GACT,OAAOrmB,KAAKqX,OACd,CAEA,sBAAWkP,GACT,OAAOvmB,KAAKsmB,mBACd,CAEA,eAAW/E,GACT,OAAOvhB,KAAKgnB,aAAe,CAC7B,CAEQ,uBAAAU,GACN,IAAK,MAAON,KAAYpnB,KAAKqX,QAAS,CACpC,GAAIrX,KAAKqX,QAAQtN,MAAQgd,EAAkBU,iBAAmB,EAC5D,MAEGznB,KAAKsmB,oBAAoBlR,IAAIgS,IAChCpnB,KAAKqX,QAAQzB,OAAOwR,EAExB,CACF,wBAvIwBL,EAAAU,iBAAmB,gBCjB7CjrB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAK/C,MAIA6rB,GAAA,EAJyB3oB,EAAQ,KAIjC4oB,QAAA,CAAgGtpB,EAAA,EAAAwe,EAAA,EAAA3e,EAAA,6lCAuJhG0pB,EAAA,IAAAzqB,WAAA,mEACAspB,MAAA,IACA3e,IAAA+f,GAAAA,EAAAtoB,WAAA,KAEAuoB,EAAA,IAAA1qB,YAAA,MACA0qB,EAAApiB,KAAA,YACA,QAAA7H,EAAA,EAAgBA,EAAA+pB,EAAA9pB,SAAgBD,EAChCiqB,EAAAF,EAAA/pB,IAAAA,GAAA,EACA,QAAAA,EAAA,EAAgBA,EAAA+pB,EAAA9pB,SAAgBD,EAChCiqB,EAAA,IAAAF,EAAA/pB,IAAAA,GAAA,GAAAA,GAAA,UACA,QAAAA,EAAA,EAAgBA,EAAA+pB,EAAA9pB,SAAgBD,EAChCiqB,EAAA,IAAAF,EAAA/pB,IAAAA,GAAA,MAAAA,GAAA,WACA,QAAAA,EAAA,EAAgBA,EAAA+pB,EAAA9pB,SAAgBD,EAChCiqB,EAAA,IAAAF,EAAA/pB,IAAAA,GAAA,GACA,MAAAkqB,EAAA,IAAA5qB,WAAA,GAkKAvC,EAAA,QAvJA,MAMA,WAAAkF,CAAAkoB,EAAAC,EAAArd,GAOA,GANA7K,KAAAmoB,MAAA,KACAnoB,KAAAooB,QAAA,EACApoB,KAAAqoB,OAAA,EACAroB,KAAAioB,SAAAA,QAAAA,EAAA,QACAjoB,KAAAkoB,SAAAA,QAAAA,EAAA,WACAloB,KAAAqoB,OAAAxd,QAAAA,EAAA,MACA7K,KAAAqoB,OAAAroB,KAAAkoB,UAAAloB,KAAAkoB,SAAA,WACA,UAAA9lB,MAAA,wBAEA,CAKA,SAAA6D,GACA,OAAAjG,KAAAmoB,MAAAnoB,KAAAmO,GAAA1J,SAAA,EAAAzE,KAAAsoB,KAAA,OAAAN,CACA,CAMA,OAAA/jB,GACAjE,KAAAmoB,QAEAnoB,KAAAqoB,OAAAroB,KAAAioB,SACAjoB,KAAAmoB,MAAAnoB,KAAAsoB,KAAAtoB,KAAAmO,GAAAnO,KAAAuoB,KAAA,MAGAvoB,KAAAsoB,KAAA,QACAtoB,KAAAsoB,KAAA,QACAtoB,KAAAsoB,KAAA,SAEA,CASA,IAAAjlB,CAAA6kB,EAAArd,GAGA,GAFA7K,KAAAkoB,SAAAA,QAAAA,EAAAloB,KAAAkoB,SACAloB,KAAAqoB,OAAAxd,QAAAA,EAAA9O,KAAAE,IAAA+D,KAAAqoB,OAAAroB,KAAAkoB,UACAloB,KAAAqoB,OAAAroB,KAAAkoB,UAAAloB,KAAAkoB,SAAA,WACA,MAAA9lB,MAAA,yBAEA,IAAAomB,EAAAxoB,KAAAsoB,KACA,MAAA5H,EAAA1gB,KAAAqoB,OAAA,KACAroB,KAAAmoB,MAOAnoB,KAAAuoB,KAAAjrB,OAAAuH,WAAA6b,IACA1gB,KAAAuoB,KAAAE,KAAA1sB,KAAAuI,MAAAoc,EAAA1gB,KAAAuoB,KAAAjrB,OAAAuH,YAAA,QACA2jB,EAAA,IAAAnrB,YAAA2C,KAAAuoB,KAAAjrB,OAAA,GACA0C,KAAAmO,GAAA,IAAA/Q,WAAA4C,KAAAuoB,KAAAjrB,OAAA,QATA0C,KAAAuoB,KAAA,IAAApnB,YAAAunB,OAAA,CAAiDngB,QAAAxM,KAAAuI,KAAAoc,EAAA,SACjD1gB,KAAAmoB,MAAAR,EAAA,CAAsC1mB,IAAA,CAAO0B,OAAA3C,KAAAuoB,QAC7CC,EAAA,IAAAnrB,YAAA2C,KAAAuoB,KAAAjrB,OAAA,GACAkrB,EAAAtlB,IAAA6kB,EAAA,KACA/nB,KAAAmO,GAAA,IAAA/Q,WAAA4C,KAAAuoB,KAAAjrB,OAAA,OAOAkrB,EAAA,QACAA,EAAA,QACAA,EAAA,QACAxoB,KAAAsoB,KAAAE,EACAxoB,KAAAooB,QAAA,CACA,CAOA,QAAAlkB,CAAAykB,GACA,MAAAC,EAAA5oB,KAAAsoB,KAAA,MAAAK,EACA,GAAA3oB,KAAAqoB,OAAAO,EAAA,CACA,GAAAA,EAAA5oB,KAAAkoB,SACA,SAEA,IAAAW,EAAA7oB,KAAAqoB,OACA,MAAAQ,GAAA,GAAAD,IAEA,GADAC,EAAA9sB,KAAAE,IAAA4sB,EAAA7oB,KAAAkoB,UACAW,EAAAD,EACA,SAEA,GAAAC,EAAA,KAAA7oB,KAAAuoB,KAAAjrB,OAAAuH,WAAA,CACA,MAAAikB,EAAA/sB,KAAAuI,MAAAukB,EAAA,KAAA7oB,KAAAuoB,KAAAjrB,OAAAuH,YAAA,OACA7E,KAAAuoB,KAAAE,KAAAK,GACA9oB,KAAAsoB,KAAA,IAAAjrB,YAAA2C,KAAAuoB,KAAAjrB,OAAA,GACA0C,KAAAmO,GAAA,IAAA/Q,WAAA4C,KAAAuoB,KAAAjrB,OAAA,KACA,CACA0C,KAAAqoB,OAAAQ,CACA,CACA,QACA,CAOA,GAAA3d,CAAA9F,GACA,IAAApF,KAAAmoB,OAAAnoB,KAAAooB,OACA,SAEA,GAAApoB,KAAAkE,SAAAkB,EAAArH,QACA,SAEA,MAAAyqB,EAAAxoB,KAAAsoB,KAIA,OAHAtoB,KAAAmO,GAAAjL,IAAAkC,EAAAojB,EAAA,OACAA,EAAA,OAAApjB,EAAArH,OAEAyqB,EAAA,MAAAA,EAAA,cACAxoB,KAAAmoB,MAAAttB,QAAAsL,MACA,CACA,CAKA,GAAAb,GAEA,OADAtF,KAAAooB,QAAA,EACApoB,KAAAmoB,MACAnoB,KAAAmoB,MAAAttB,QAAAyK,OACA,CACA,CAIA,eAAAyjB,GACA,OAAA/oB,KAAAmoB,MACAnoB,KAAAsoB,KAAA,MACA,CACA,CAIA,aAAAU,GACA,OAAAhpB,KAAAmoB,MACAnoB,KAAAkoB,SAAAloB,KAAAsoB,KAAA,MACA,CACA,cC9UA9rB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAK/C,MACAmtB,GAAA,EADyBjqB,EAAQ,KACjC4oB,QAAA,CAAuGtpB,EAAA,EAAAwe,EAAA,EAAA3e,EAAA,i5BA8DvGtD,EAAA,QA7DA,MACA,WAAAkF,CAAAkoB,GACAjoB,KAAAioB,SAAAA,EACAjoB,KAAAE,MAAA,EACAF,KAAAgE,OAAA,CACA,CACA,MAAApF,CAAAT,GACA6B,KAAAE,MAAA/B,EAAA,OAAAA,EAAA,OAAAA,EAAA,MAAAA,EAAA,GACA6B,KAAAgE,OAAA7F,EAAA,OAAAA,EAAA,OAAAA,EAAA,OAAAA,EAAA,IACA,MAAA4F,EAAA/D,KAAAE,MAAAF,KAAAgE,OACAklB,EAAA,EAAAnlB,EACAolB,EAAAhrB,EAAAJ,OAwBA2iB,EAAA3kB,KAAAC,IAAAktB,EAAAC,IAAAptB,KAAAE,IAAAitB,EAAAC,IAAA,QACAnpB,KAAAmoB,MAIAnoB,KAAAuoB,KAAAjrB,OAAAuH,WAAA6b,IACA1gB,KAAAuoB,KAAAE,KAAA1sB,KAAAuI,MAAAoc,EAAA1gB,KAAAuoB,KAAAjrB,OAAAuH,YAAA,QACA7E,KAAAmO,GAAA,OALAnO,KAAAuoB,KAAA,IAAApnB,YAAAunB,OAAA,CAAiDngB,QAAAxM,KAAAuI,KAAAoc,EAAA,SACjD1gB,KAAAmoB,MAAAc,EAAA,CAAyChoB,IAAA,CAAO0B,OAAA3C,KAAAuoB,SAMhDvoB,KAAAmO,KACAnO,KAAAmO,GAAA,IAAA/Q,WAAA4C,KAAAuoB,KAAAjrB,SAGA,MAAA8rB,EAAAppB,KAAAuoB,KAAAjrB,OAAAuH,WAAAskB,GAAA,IAGA,OAFAnpB,KAAAmO,GAAAjL,IAAA/E,EAAAirB,GACAppB,KAAAmoB,MAAAttB,QAAAsL,IAAAijB,EAAAD,EAAAplB,GACA/D,KAAAmO,GAAA1J,SAAA,UAAAykB,EACA,CACA,OAAAjlB,GACAjE,KAAAmoB,OAEAnoB,KAAAuoB,KAAAjrB,OAAAuH,WAAA7E,KAAAioB,WACAjoB,KAAAmoB,MAAAnoB,KAAAmO,GAAAnO,KAAAuoB,KAAA,KAEA,aC9DA/rB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAC/CjB,EAAA+sB,OAYA,SAAAyB,GACA,GAAAA,EAAAlrB,EAAA,CACA,MAAA2e,EAAgBxe,EAAAA,EAAAH,EAAAA,GAAUkrB,EAC1B,IAAA5tB,EACA+sB,EACA,MAAAc,EAAAnoB,YACA,WAAA2b,EACAxe,EACAwJ,GAAA,IAAAwhB,EAAA9mB,SAAAgmB,IAAAA,EAAA,IAAAc,EAAA/mB,OAAA9G,IAAAA,EAAA8tB,EAAAprB,MAAA2J,GACAA,GAAA0gB,EACAc,EAAAloB,YAAAonB,EAAA1gB,GACAwhB,EAAAloB,YAAA3F,IAAAA,EAAA8tB,EAAAprB,IAAA2J,GAAAzG,KAAA9F,IAAAitB,EAAAjtB,EAAAT,SAAAS,EAAAgG,UAEA,IAAAub,EACAxe,EACA,IAAAkqB,IAAAA,EAAA,IAAAc,EAAA/mB,OAAA9G,IAAAA,EAAA8tB,EAAAprB,MACA,IAAAqqB,EACAhX,QAAAC,QAAA+W,GACAc,EAAAE,QAAA/tB,IAAAA,EAAA8tB,EAAAprB,KAAAkD,KAAA9F,GAAAitB,EAAAjtB,GAEA+C,EACA,IAAA7C,IAAAA,EAAA8tB,EAAAprB,IACA,IAAAqT,QAAAC,QAAAhW,IAAAA,EAAA8tB,EAAAprB,IACA,CACA,uBAAAsrB,SACA,UAAArnB,MAAA,qBACAqnB,SAAAniB,IAAA+hB,EACA,EAtCA,IAAAE,EAAAjrB,IACA,GAAAlB,WAAAssB,WACA,OAAAtsB,WAAAssB,WAAAprB,GACA,uBAAAa,OACA,OAAAA,OAAAC,KAAAd,EAAA,UACA,MAAA7C,EAAA6D,KAAAhB,GACA/C,EAAA,IAAA6B,WAAA3B,EAAAsC,QACA,QAAAD,EAAA,EAAoBA,EAAAvC,EAAAwC,SAAcD,EAClCvC,EAAAuC,GAAArC,EAAA+D,WAAA1B,GACA,OAAAvC,KCfAouB,EAAA,GAGA,SAAA3qB,EAAA4qB,GAEA,IAAAC,EAAAF,EAAAC,GACA,QAAA5hB,IAAA6hB,EACA,OAAAA,EAAAhvB,QAGA,IAAAC,EAAA6uB,EAAAC,GAAA,CAGA/uB,QAAA,IAOA,OAHAivB,EAAAF,GAAApiB,KAAA1M,EAAAD,QAAAC,EAAAA,EAAAD,QAAAmE,GAGAlE,EAAAD,OACA,mGCfA,MAAAkvB,EAAA/qB,EAAA,KACAgrB,EAAAhrB,EAAA,KACAqK,EAAArK,EAAA,KACAsK,EAAAtK,EAAA,KACAirB,EAAAjrB,EAAA,IACAkrB,EAAAlrB,EAAA,KACAmrB,EAAAnrB,EAAA,KACAorB,EAAAprB,EAAA,KACAqrB,EAAArrB,EAAA,KA6CMuB,EAAsC,CAC1C+pB,mBAAmB,EACnBvd,WAAY,SACZwd,cAAc,EACd3M,gBAAgB,EAChBzB,kBAAmB,KACnBsB,eAAgB,SAChB7F,aAAc,IACd5E,iBAAiB,EACjBwX,YAAY,EACZ5f,aAAc,SACd6f,cAAc,EACdhM,eAAgB,uBA0BlB,MAWE,WAAA1e,CAAYe,GANJd,KAAAyI,aAA8B,GAE9BzI,KAAA0qB,UAAwC,IAAI9Y,IACnC5R,KAAA2qB,cAAgB,IAAIZ,EAAAa,QACrB5qB,KAAAka,aAA6Bla,KAAK2qB,cAAclkB,MAG9DzG,KAAKkC,MAAQ1F,OAAO2F,OAAO,GAAI5B,EAAiBO,GAChDd,KAAK6qB,aAAeruB,OAAO2F,OAAO,GAAI5B,EAAiBO,EACzD,CAEO,OAAA6G,GACL,IAAK,MAAMmjB,KAAO9qB,KAAKyI,aACrBqiB,EAAInjB,UAEN3H,KAAKyI,aAAa1K,OAAS,EAC3BiC,KAAK0qB,UAAU5hB,QACf9I,KAAK2qB,cAAchjB,SACrB,CAEQ,aAAAojB,IAAiBC,GACvB,IAAK,MAAMF,KAAOE,EAChBhrB,KAAKyI,aAAa/J,KAAKosB,EAE3B,CAEO,QAAAG,CAASC,SASd,GARAlrB,KAAK0R,UAAYwZ,EAGjBlrB,KAAKkK,UAAY,IAAIb,EAAA+D,cAAc8d,GACnClrB,KAAKmK,SAAW,IAAIb,EAAA6hB,aAAaD,EAAUlrB,KAAKkK,UAAWlK,KAAKkC,OAChElC,KAAKmK,SAAS+P,aAAe,IAAMla,KAAK2qB,cAAcpjB,OAGlDvH,KAAKkC,MAAMooB,kBAAmB,CAChC,MAAMc,EAA0C,QAAjClf,EAAGgf,EAASG,QAAQC,qBAAa,IAAApf,EAAAA,EAAI,GACpDkf,EAAUG,kBAAmB,EAC7BH,EAAUI,mBAAoB,EAC9BJ,EAAUK,iBAAkB,EAC5BP,EAASG,QAAQC,cAAgBF,CACnC,CAiCA,GA/BAprB,KAAK+qB,cACH/qB,KAAKkK,UACLlK,KAAKmK,SAGL+gB,EAASQ,OAAOC,mBAAmB,CAAEC,OAAQ,IAAK/lB,MAAO,KAAOwW,GAAUrc,KAAK6rB,QAAQxP,IACvF6O,EAASQ,OAAOC,mBAAmB,CAAEC,OAAQ,IAAK/lB,MAAO,KAAOwW,GAAUrc,KAAK8rB,QAAQzP,IACvF6O,EAASQ,OAAOC,mBAAmB,CAAE9lB,MAAO,KAAOwW,GAAUrc,KAAK+rB,KAAK1P,IACvE6O,EAASQ,OAAOC,mBAAmB,CAAEC,OAAQ,IAAK/lB,MAAO,KAAOwW,GAAUrc,KAAKgsB,yBAAyB3P,IAGxG6O,EAASe,SAAS7R,IAAQ,IAAAlO,EAAA,OAAc,QAAbA,EAAAlM,KAAKmK,gBAAQ,IAAA+B,OAAA,EAAAA,EAAEiO,OAAOC,KAQjD8Q,EAASQ,OAAOC,mBAAmB,CAAEO,cAAe,IAAKrmB,MAAO,KAAO,IAAM7F,KAAKiL,SAClFigB,EAASQ,OAAOS,mBAAmB,CAAEtmB,MAAO,KAAO,IAAM7F,KAAKiL,SAC9DigB,EAAS/e,MAAMkN,cAAc+S,eAAe,IAAMpsB,KAAKiL,SAGvDigB,EAAS5tB,OAAO+uB,eAAe,KAAK,IAAAngB,EAAA,OAAc,QAAbA,EAAAlM,KAAKmK,gBAAQ,IAAA+B,OAAA,EAAAA,EAAEyM,kBAGpDuS,EAASoB,SAAS3f,IAAU,IAAAT,EAAA,OAAc,QAAbA,EAAAlM,KAAKmK,gBAAQ,IAAA+B,OAAA,EAAAA,EAAE6O,eAAepO,MAIzD3M,KAAKkC,MAAMqoB,aAAc,CAC3B,MAAMgC,EAAe,IAAInC,EAAAoC,kBAAkBxsB,KAAKmK,SAAWnK,KAAKkC,MAAOlC,KAAKkK,UAAYghB,GAClFuB,EAAe,IAAItC,EAAAuC,aAAa1sB,KAAKkC,MAAOqqB,EAAcrB,GAChElrB,KAAK0qB,UAAUxnB,IAAI,QAASupB,GAC5BzsB,KAAK+qB,cACHG,EAAS/e,MAAMkN,cAAcsT,QAAQC,mBAAmB,CAAE/mB,MAAO,KAAO4mB,GAE5E,CAGA,GAAIzsB,KAAKkC,MAAMsoB,WAAY,CACzB,MAAMqC,EAAa,IAAIxC,EAAAyC,gBAAgB9sB,KAAKmK,UACtC4iB,EAAa,IAAI/C,EAAAgD,WAAWhtB,KAAKkC,MAAOlC,KAAKkK,UAAY2iB,EAAY3B,GAC3ElrB,KAAK0qB,UAAUxnB,IAAI,MAAO6pB,GAC1B/sB,KAAK+qB,cACHG,EAAS/e,MAAMkN,cAAcsT,QAAQM,mBAAmB,KAAMF,GAElE,CAGA,GAAI/sB,KAAKkC,MAAMuoB,aAAc,CAC3B,MAAMyC,EAAe,IAAIhD,EAAAnD,kBAAkB/mB,KAAKmK,UAC1CgjB,EAAe,IAAIlD,EAAAmD,qBAAqBptB,KAAKkC,MAAOlC,KAAKkK,UAAYgjB,EAAchC,GACzFlrB,KAAK0qB,UAAUxnB,IAAI,QAASiqB,GAC5BntB,KAAK+qB,cACHmC,EACAC,EACAjC,EAAS/e,MAAMkN,cAAcsT,QAAQU,mBAAmB,CAAExnB,MAAO,KAAOsnB,GAE5E,CACF,CAGO,KAAAliB,SAELjL,KAAKkC,MAAM0b,eAAiB5d,KAAK6qB,aAAajN,eAC9C5d,KAAKkC,MAAMia,kBAAoBnc,KAAK6qB,aAAa1O,kBAEpC,QAAbjQ,EAAAlM,KAAKmK,gBAAQ,IAAA+B,GAAAA,EAAEjB,QAEf,IAAK,MAAM3C,KAAWtI,KAAK0qB,UAAUjW,SACnCnM,EAAQ2C,QAEV,OAAO,CACT,CAEA,gBAAW2M,SACT,OAAoB,QAAb1L,EAAAlM,KAAKmK,gBAAQ,IAAA+B,OAAA,EAAAA,EAAE6L,cAAe,CACvC,CAEA,gBAAWH,CAAa7G,SACT,QAAb7E,EAAAlM,KAAKmK,gBAAQ,IAAA+B,GAAAA,EAAEyL,SAAS5G,GACxB/Q,KAAKkC,MAAM0V,aAAe7G,CAC5B,CAEA,gBAAWuc,GACT,OAAIttB,KAAKmK,SACAnK,KAAKmK,SAASiO,YAEf,CACV,CAEA,mBAAWpF,GACT,OAAOhT,KAAKkC,MAAM8Q,eACpB,CAEA,mBAAWA,CAAgBlX,SACzBkE,KAAKkC,MAAM8Q,gBAAkBlX,EACf,QAAdoQ,EAAAlM,KAAKkK,iBAAS,IAAAgC,GAAAA,EAAE8G,gBAAgBlX,EAClC,CAEO,oBAAAyf,CAAqBpF,EAAW/C,SACrC,OAAoB,QAAblH,EAAAlM,KAAKmK,gBAAQ,IAAA+B,OAAA,EAAAA,EAAEqP,qBAAqBpF,EAAG/C,EAChD,CAEO,uBAAAoI,CAAwBrF,EAAW/C,SACxC,OAAoB,QAAblH,EAAAlM,KAAKmK,gBAAQ,IAAA+B,OAAA,EAAAA,EAAEsP,wBAAwBrF,EAAG/C,EACnD,CAEQ,OAAAma,CAAQjvB,SACA,QAAd4N,EAAAlM,KAAK0R,iBAAS,IAAAxF,GAAAA,EAAEC,MAAMK,MAAMlO,GAAG,EACjC,CAEQ,OAAAutB,CAAQxP,GACd,IAAK,IAAIve,EAAI,EAAGA,EAAIue,EAAOte,SAAUD,EAE5B,KADCue,EAAOve,KAEXkC,KAAKkC,MAAM0b,gBAAiB,GAIlC,OAAO,CACT,CAEQ,OAAAkO,CAAQzP,GACd,IAAK,IAAIve,EAAI,EAAGA,EAAIue,EAAOte,SAAUD,EAE5B,KADCue,EAAOve,KAEXkC,KAAKkC,MAAM0b,gBAAiB,GAIlC,OAAO,CACT,CAGQ,IAAAmO,CAAK1P,GACX,QAAIA,EAAO,MAQPrc,KAAKkC,MAAMqoB,eACbvqB,KAAKutB,QAAQ,kBACN,EAGX,CAYQ,wBAAAvB,CAAyB3P,mBAC/B,GAAIA,EAAOte,OAAS,EAClB,OAAO,EAET,GAAa,IAATse,EAAO,GACT,OAAQA,EAAO,IACb,OAEE,OADArc,KAAKutB,QAAQ,MAASlR,EAAO,QAA0Brc,KAAKkC,MAAMia,uBAC3D,EACT,OACEnc,KAAKkC,MAAMia,kBAAoBnc,KAAK6qB,aAAa1O,kBACjDnc,KAAKutB,QAAQ,MAASlR,EAAO,QAA0Brc,KAAKkC,MAAMia,sBAElE,IAAK,MAAM7T,KAAWtI,KAAK0qB,UAAUjW,SACnCnM,EAAQ2C,QAEV,OAAO,EACT,OAOE,OANIoR,EAAOte,OAAS,KAAOse,EAAO,aAAcjV,QAAUiV,EAAO,IA3P5C,MA4PnBrc,KAAKkC,MAAMia,kBAAoBE,EAAO,GACtCrc,KAAKutB,QAAQ,MAASlR,EAAO,QAA0Brc,KAAKkC,MAAMia,uBAElEnc,KAAKutB,QAAQ,MAASlR,EAAO,UAExB,EACT,OAEE,OADArc,KAAKutB,QAAQ,MAASlR,EAAO,eACtB,EACT,QAEE,OADArc,KAAKutB,QAAQ,MAASlR,EAAO,UACtB,EAGb,GAAa,IAATA,EAAO,GACT,OAAQA,EAAO,IAEb,OACE,IAAInc,EAAkC,QAA1BoN,EAAc,QAAdpB,EAAAlM,KAAKkK,iBAAS,IAAAgC,OAAA,EAAAA,EAAEP,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIC,OAAO3L,MAC/C8D,EAAmC,QAA1BmK,EAAc,QAAdlC,EAAAjM,KAAKkK,iBAAS,IAAA+B,OAAA,EAAAA,EAAEN,kBAAU,IAAAwC,OAAA,EAAAA,EAAEvC,IAAIC,OAAO7H,OACpD,IAAK9D,IAAU8D,EAAQ,CAGrB,MAAMiP,EAAW3J,EAAAoC,kBACjBxL,IAAuB,QAAdoT,EAAAtT,KAAK0R,iBAAS,IAAA4B,OAAA,EAAAA,EAAExH,OAAQ,IAAMmH,EAAS/S,MAChD8D,IAAwB,QAAdsd,EAAAthB,KAAK0R,iBAAS,IAAA4P,OAAA,EAAAA,EAAEvV,OAAQ,IAAMkH,EAASjP,MACnD,CACA,GAAI9D,EAAQ8D,EAAShE,KAAKkC,MAAM6K,WAC9B/M,KAAKutB,QAAQ,MAASlR,EAAO,QAA0Bnc,EAAMqM,QAAQ,MAAMvI,EAAOuI,QAAQ,WACrF,CAEL,MAAM4J,EAAIpa,KAAKkR,MAAMlR,KAAKyxB,KAAKxtB,KAAKkC,MAAM6K,aAC1C/M,KAAKutB,QAAQ,MAASlR,EAAO,QAA0BlG,KAAKA,KAC9D,CACA,OAAO,EACT,OAEE,MAAMA,EAAIpa,KAAKkR,MAAMlR,KAAKyxB,KAAKxtB,KAAKkC,MAAM6K,aAE1C,OADA/M,KAAKutB,QAAQ,MAASlR,EAAO,QAA0BlG,KAAKA,OACrD,EACT,QAEE,OADAnW,KAAKutB,QAAQ,MAASlR,EAAO,UACtB,EAKb,OADArc,KAAKutB,QAAQ,MAASlR,EAAO,UACtB,CACT","sources":["webpack://ImageAddon/webpack/universalModuleDefinition","webpack://ImageAddon/../node_modules/sixel/lib/Colors.js","webpack://ImageAddon/../node_modules/sixel/lib/Decoder.js","webpack://ImageAddon/../node_modules/sixel/lib/wasm.js","webpack://ImageAddon/../src/common/Event.ts","webpack://ImageAddon/../src/common/Lifecycle.ts","webpack://ImageAddon/./src/IIPHandler.ts","webpack://ImageAddon/./src/IIPHeaderParser.ts","webpack://ImageAddon/./src/IIPImageStorage.ts","webpack://ImageAddon/./src/IIPMetrics.ts","webpack://ImageAddon/./src/ImageRenderer.ts","webpack://ImageAddon/./src/ImageStorage.ts","webpack://ImageAddon/./src/SixelHandler.ts","webpack://ImageAddon/./src/SixelImageStorage.ts","webpack://ImageAddon/./src/kitty/KittyGraphicsHandler.ts","webpack://ImageAddon/./src/kitty/KittyGraphicsTypes.ts","webpack://ImageAddon/./src/kitty/KittyImageStorage.ts","webpack://ImageAddon/../node_modules/xterm-wasm-parts/lib/base64/Base64Decoder.wasm.js","webpack://ImageAddon/../node_modules/xterm-wasm-parts/lib/qoi/QoiDecoder.wasm.js","webpack://ImageAddon/javascript/node_modules/inwasm-runtime/lib/index.cjs","webpack://ImageAddon/webpack/bootstrap","webpack://ImageAddon/./src/ImageAddon.ts"],"sourcesContent":["(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine([], factory);\n\telse if(typeof exports === 'object')\n\t\texports[\"ImageAddon\"] = factory();\n\telse\n\t\troot[\"ImageAddon\"] = factory();\n})(globalThis, () => {\nreturn ","\"use strict\";\n/**\n * Copyright (c) 2019 Joerg Breitbart.\n * @license MIT\n */\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.DEFAULT_FOREGROUND = exports.DEFAULT_BACKGROUND = exports.PALETTE_ANSI_256 = exports.PALETTE_VT340_GREY = exports.PALETTE_VT340_COLOR = exports.normalizeHLS = exports.normalizeRGB = exports.nearestColorIndex = exports.fromRGBA8888 = exports.toRGBA8888 = exports.alpha = exports.blue = exports.green = exports.red = exports.BIG_ENDIAN = void 0;\n// FIXME: cleanup this mess, move things either to decoder/encoder, keep only shared things\n// system endianess\nexports.BIG_ENDIAN = new Uint8Array(new Uint32Array([0xFF000000]).buffer)[0] === 0xFF;\nif (exports.BIG_ENDIAN) {\n    console.warn('BE platform detected. This version of node-sixel works only on LE properly.');\n}\n// channel values\nfunction red(n) {\n    return n & 0xFF;\n}\nexports.red = red;\nfunction green(n) {\n    return (n >>> 8) & 0xFF;\n}\nexports.green = green;\nfunction blue(n) {\n    return (n >>> 16) & 0xFF;\n}\nexports.blue = blue;\nfunction alpha(n) {\n    return (n >>> 24) & 0xFF;\n}\nexports.alpha = alpha;\n/**\n * Convert RGB channels to native color RGBA8888.\n */\nfunction toRGBA8888(r, g, b, a = 255) {\n    return ((a & 0xFF) << 24 | (b & 0xFF) << 16 | (g & 0xFF) << 8 | (r & 0xFF)) >>> 0; // ABGR32\n}\nexports.toRGBA8888 = toRGBA8888;\n/**\n * Convert native color to [r, g, b, a].\n */\nfunction fromRGBA8888(color) {\n    return [color & 0xFF, (color >> 8) & 0xFF, (color >> 16) & 0xFF, color >>> 24];\n}\nexports.fromRGBA8888 = fromRGBA8888;\n/**\n * Get index of nearest color in `palette` for `color`.\n * Uses euclidean distance without any luminescence correction.\n */\nfunction nearestColorIndex(color, palette) {\n    const r = red(color);\n    const g = green(color);\n    const b = blue(color);\n    let min = Number.MAX_SAFE_INTEGER;\n    let idx = -1;\n    // use euclidean distance (manhattan gives very poor results)\n    for (let i = 0; i < palette.length; ++i) {\n        const dr = r - palette[i][0];\n        const dg = g - palette[i][1];\n        const db = b - palette[i][2];\n        const d = dr * dr + dg * dg + db * db;\n        if (!d)\n            return i;\n        if (d < min) {\n            min = d;\n            idx = i;\n        }\n    }\n    return idx;\n}\nexports.nearestColorIndex = nearestColorIndex;\n// color conversions\n// HLS taken from: http://www.niwa.nu/2013/05/math-behind-colorspace-conversions-rgb-hsl\nfunction clamp(low, high, value) {\n    return Math.max(low, Math.min(value, high));\n}\nfunction h2c(t1, t2, c) {\n    if (c < 0)\n        c += 1;\n    if (c > 1)\n        c -= 1;\n    return c * 6 < 1\n        ? t2 + (t1 - t2) * 6 * c\n        : c * 2 < 1\n            ? t1\n            : c * 3 < 2\n                ? t2 + (t1 - t2) * (4 - c * 6)\n                : t2;\n}\nfunction HLStoRGB(h, l, s) {\n    if (!s) {\n        const v = Math.round(l * 255);\n        return toRGBA8888(v, v, v);\n    }\n    const t1 = l < 0.5 ? l * (1 + s) : l + s - l * s;\n    const t2 = 2 * l - t1;\n    return toRGBA8888(clamp(0, 255, Math.round(h2c(t1, t2, h + 1 / 3) * 255)), clamp(0, 255, Math.round(h2c(t1, t2, h) * 255)), clamp(0, 255, Math.round(h2c(t1, t2, h - 1 / 3) * 255)));\n}\n/**\n * Normalize SIXEL RGB values (percent based, 0-100) to RGBA8888.\n */\nfunction normalizeRGB(r, g, b) {\n    return (0xFF000000 | Math.round(b / 100 * 255) << 16 | Math.round(g / 100 * 255) << 8 | Math.round(r / 100 * 255)) >>> 0; // ABGR32\n}\nexports.normalizeRGB = normalizeRGB;\n/**\n * Normalize SIXEL HLS values to RGBA8888. Applies hue correction of +240°.\n */\nfunction normalizeHLS(h, l, s) {\n    // Note: hue value is turned by 240° in VT340, all values given as fractions\n    return HLStoRGB((h + 240 % 360) / 360, l / 100, s / 100);\n}\nexports.normalizeHLS = normalizeHLS;\n/**\n * default palettes\n */\n// FIXME: move palettes to Decoder.ts\n/**\n * 16 predefined color registers of VT340 (values in %):\n * ```\n *                R   G   B\n * 0  Black       0   0   0\n * 1  Blue        20  20  80\n * 2  Red         80  13  13\n * 3  Green       20  80  20\n * 4  Magenta     80  20  80\n * 5  Cyan        20  80  80\n * 6  Yellow      80  80  20\n * 7  Gray 50%    53  53  53\n * 8  Gray 25%    26  26  26\n * 9  Blue*       33  33  60\n * 10 Red*        60  26  26\n * 11 Green*      33  60  33\n * 12 Magenta*    60  33  60\n * 13 Cyan*       33  60  60\n * 14 Yellow*     60  60  33\n * 15 Gray 75%    80  80  80\n * ```\n * (*) less saturated\n *\n * @see https://vt100.net/docs/vt3xx-gp/chapter2.html#S2.4\n*/\nexports.PALETTE_VT340_COLOR = new Uint32Array([\n    normalizeRGB(0, 0, 0),\n    normalizeRGB(20, 20, 80),\n    normalizeRGB(80, 13, 13),\n    normalizeRGB(20, 80, 20),\n    normalizeRGB(80, 20, 80),\n    normalizeRGB(20, 80, 80),\n    normalizeRGB(80, 80, 20),\n    normalizeRGB(53, 53, 53),\n    normalizeRGB(26, 26, 26),\n    normalizeRGB(33, 33, 60),\n    normalizeRGB(60, 26, 26),\n    normalizeRGB(33, 60, 33),\n    normalizeRGB(60, 33, 60),\n    normalizeRGB(33, 60, 60),\n    normalizeRGB(60, 60, 33),\n    normalizeRGB(80, 80, 80)\n]);\n/**\n * 16 predefined monochrome registers of VT340 (values in %):\n * ```\n *              R   G   B\n * 0  Black     0   0   0\n * 1  Gray-2    13  13  13\n * 2  Gray-4    26  26  26\n * 3  Gray-6    40  40  40\n * 4  Gray-1    6   6   6\n * 5  Gray-3    20  20  20\n * 6  Gray-5    33  33  33\n * 7  White 7   46  46  46\n * 8  Black 0   0   0   0\n * 9  Gray-2    13  13  13\n * 10 Gray-4    26  26  26\n * 11 Gray-6    40  40  40\n * 12 Gray-1    6   6   6\n * 13 Gray-3    20  20  20\n * 14 Gray-5    33  33  33\n * 15 White 7   46  46  46\n * ```\n *\n * @see https://vt100.net/docs/vt3xx-gp/chapter2.html#S2.4\n */\nexports.PALETTE_VT340_GREY = new Uint32Array([\n    normalizeRGB(0, 0, 0),\n    normalizeRGB(13, 13, 13),\n    normalizeRGB(26, 26, 26),\n    normalizeRGB(40, 40, 40),\n    normalizeRGB(6, 6, 6),\n    normalizeRGB(20, 20, 20),\n    normalizeRGB(33, 33, 33),\n    normalizeRGB(46, 46, 46),\n    normalizeRGB(0, 0, 0),\n    normalizeRGB(13, 13, 13),\n    normalizeRGB(26, 26, 26),\n    normalizeRGB(40, 40, 40),\n    normalizeRGB(6, 6, 6),\n    normalizeRGB(20, 20, 20),\n    normalizeRGB(33, 33, 33),\n    normalizeRGB(46, 46, 46)\n]);\n/**\n * 256 predefined ANSI colors.\n *\n * @see https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit\n */\nexports.PALETTE_ANSI_256 = (() => {\n    // 16 lower colors (taken from xterm)\n    const p = [\n        toRGBA8888(0, 0, 0),\n        toRGBA8888(205, 0, 0),\n        toRGBA8888(0, 205, 0),\n        toRGBA8888(205, 205, 0),\n        toRGBA8888(0, 0, 238),\n        toRGBA8888(205, 0, 205),\n        toRGBA8888(0, 250, 205),\n        toRGBA8888(229, 229, 229),\n        toRGBA8888(127, 127, 127),\n        toRGBA8888(255, 0, 0),\n        toRGBA8888(0, 255, 0),\n        toRGBA8888(255, 255, 0),\n        toRGBA8888(92, 92, 255),\n        toRGBA8888(255, 0, 255),\n        toRGBA8888(0, 255, 255),\n        toRGBA8888(255, 255, 255),\n    ];\n    // colors up to 232\n    const d = [0, 95, 135, 175, 215, 255];\n    for (let r = 0; r < 6; ++r) {\n        for (let g = 0; g < 6; ++g) {\n            for (let b = 0; b < 6; ++b) {\n                p.push(toRGBA8888(d[r], d[g], d[b]));\n            }\n        }\n    }\n    // grey scale to up 255\n    for (let v = 8; v <= 238; v += 10) {\n        p.push(toRGBA8888(v, v, v));\n    }\n    return new Uint32Array(p);\n})();\n/**\n * Background: Black by default.\n * Foreground: White by default.\n *\n * Background color is used whenever a fill color is needed and not explicitly set.\n * Foreground color is used as default initial sixel color.\n */\nexports.DEFAULT_BACKGROUND = toRGBA8888(0, 0, 0, 255);\nexports.DEFAULT_FOREGROUND = toRGBA8888(255, 255, 255, 255);\n//# sourceMappingURL=Colors.js.map","\"use strict\";\n/**\n * Copyright (c) 2021 Joerg Breitbart.\n * @license MIT\n */\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.decodeAsync = exports.decode = exports.Decoder = exports.DecoderAsync = void 0;\nconst Colors_1 = require(\"./Colors\");\nconst wasm_1 = require(\"./wasm\");\n/* istanbul ignore next */\nfunction decodeBase64(s) {\n    if (typeof Buffer !== 'undefined') {\n        return Buffer.from(s, 'base64');\n    }\n    const bytestring = atob(s);\n    const result = new Uint8Array(bytestring.length);\n    for (let i = 0; i < result.length; ++i) {\n        result[i] = bytestring.charCodeAt(i);\n    }\n    return result;\n}\nconst WASM_BYTES = decodeBase64(wasm_1.LIMITS.BYTES);\nlet WASM_MODULE;\n// empty canvas\nconst NULL_CANVAS = new Uint32Array();\n// proxy for lazy binding of decoder methods to wasm env callbacks\nclass CallbackProxy {\n    constructor() {\n        this.bandHandler = (width) => 1;\n        this.modeHandler = (mode) => 1;\n    }\n    handle_band(width) {\n        return this.bandHandler(width);\n    }\n    mode_parsed(mode) {\n        return this.modeHandler(mode);\n    }\n}\n// default decoder options\nconst DEFAULT_OPTIONS = {\n    memoryLimit: 2048 * 65536,\n    sixelColor: Colors_1.DEFAULT_FOREGROUND,\n    fillColor: Colors_1.DEFAULT_BACKGROUND,\n    palette: Colors_1.PALETTE_VT340_COLOR,\n    paletteLimit: wasm_1.LIMITS.PALETTE_SIZE,\n    truncate: true\n};\n/**\n * Create a decoder instance asynchronously.\n * To be used in the browser main thread.\n */\nfunction DecoderAsync(opts) {\n    const cbProxy = new CallbackProxy();\n    const importObj = {\n        env: {\n            handle_band: cbProxy.handle_band.bind(cbProxy),\n            mode_parsed: cbProxy.mode_parsed.bind(cbProxy)\n        }\n    };\n    return WebAssembly.instantiate(WASM_MODULE || WASM_BYTES, importObj)\n        .then((inst) => {\n        WASM_MODULE = WASM_MODULE || inst.module;\n        return new Decoder(opts, inst.instance || inst, cbProxy);\n    });\n}\nexports.DecoderAsync = DecoderAsync;\n/**\n * Decoder - web assembly based sixel stream decoder.\n *\n * Usage pattern:\n *  - call `init` to initialize decoder for new image\n *  - feed data chunks to `decode` or `decodeString`\n *  - grab pixels from `data32`\n *  - optional: call `release` to free memory (e.g. after big images)\n *  - start over with next image by calling `init`\n *\n * Properties:\n *  - max width of 2^14 - 4 pixels (compile time setting in wasm)\n *  - no explicit height limit (only limited by memory)\n *  - max 4096 colors palette (compile time setting in wasm)\n *\n * Explanation operation modes:\n * - M1   Mode chosen for level 1 images (no raster attributes),\n *        or for level 2 images with `truncate=false`.\n * - M2   Mode chosen for level 2 images with `truncate=true` (default).\n *        While this mode is not fully spec conform (decoder not expected to truncate),\n *        it is what spec conform encoders should create (should not excess raster).\n *        This mode has several advantages:\n *        - ~15% faster decoding speed\n *        - image dimensions can be evaluated early without processing the whole data\n *        - faster pixel access in `data32` (precalulated)\n *        - image height is not reported as multiple of 6 pixels\n * - M0   Undecided mode state after `init`.\n * The level of an image is determined during early decoding based on the fact,\n * whether the data contains valid raster attributes before any sixel data.\n * Until then the mode of an image is marked as M0, meaning the real operation mode\n * could not be decided yet.\n */\nclass Decoder {\n    /**\n     * Synchonous ctor. Can be called from nodejs or a webworker context.\n     * For instantiation in the browser main thread use `WasmDecoderAsync` instead.\n     */\n    constructor(opts, _instance, _cbProxy) {\n        this._PIXEL_OFFSET = wasm_1.LIMITS.MAX_WIDTH + 4;\n        this._canvas = NULL_CANVAS;\n        this._bandWidths = [];\n        this._maxWidth = 0;\n        this._minWidth = wasm_1.LIMITS.MAX_WIDTH;\n        this._lastOffset = 0;\n        this._currentHeight = 0;\n        this._opts = Object.assign({}, DEFAULT_OPTIONS, opts);\n        if (this._opts.paletteLimit > wasm_1.LIMITS.PALETTE_SIZE) {\n            throw new Error(`DecoderOptions.paletteLimit must not exceed ${wasm_1.LIMITS.PALETTE_SIZE}`);\n        }\n        if (!_instance) {\n            const module = WASM_MODULE || (WASM_MODULE = new WebAssembly.Module(WASM_BYTES));\n            _instance = new WebAssembly.Instance(module, {\n                env: {\n                    handle_band: this._handle_band.bind(this),\n                    mode_parsed: this._initCanvas.bind(this)\n                }\n            });\n        }\n        else {\n            _cbProxy.bandHandler = this._handle_band.bind(this);\n            _cbProxy.modeHandler = this._initCanvas.bind(this);\n        }\n        this._instance = _instance;\n        this._wasm = this._instance.exports;\n        this._chunk = new Uint8Array(this._wasm.memory.buffer, this._wasm.get_chunk_address(), wasm_1.LIMITS.CHUNK_SIZE);\n        this._states = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_state_address(), 12);\n        this._palette = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_palette_address(), wasm_1.LIMITS.PALETTE_SIZE);\n        this._palette.set(this._opts.palette);\n        this._pSrc = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_p0_address());\n        this._wasm.init(Colors_1.DEFAULT_FOREGROUND, 0, this._opts.paletteLimit, 0);\n    }\n    // some readonly parser states for internal usage\n    get _fillColor() { return this._states[0]; }\n    get _truncate() { return this._states[8]; }\n    get _rasterWidth() { return this._states[6]; }\n    get _rasterHeight() { return this._states[7]; }\n    get _width() { return this._states[2] ? this._states[2] - 4 : 0; }\n    get _height() { return this._states[3]; }\n    get _level() { return this._states[9]; }\n    get _mode() { return this._states[10]; }\n    get _paletteLimit() { return this._states[11]; }\n    _initCanvas(mode) {\n        if (mode === 2 /* M2 */) {\n            const pixels = this.width * this.height;\n            if (pixels > this._canvas.length) {\n                if (this._opts.memoryLimit && pixels * 4 > this._opts.memoryLimit) {\n                    this.release();\n                    throw new Error('image exceeds memory limit');\n                }\n                this._canvas = new Uint32Array(pixels);\n            }\n            this._maxWidth = this._width;\n        }\n        else if (mode === 1 /* M1 */) {\n            if (this._level === 2) {\n                // got raster attributes, use them as initial size hint\n                const pixels = Math.min(this._rasterWidth, wasm_1.LIMITS.MAX_WIDTH) * this._rasterHeight;\n                if (pixels > this._canvas.length) {\n                    if (this._opts.memoryLimit && pixels * 4 > this._opts.memoryLimit) {\n                        this.release();\n                        throw new Error('image exceeds memory limit');\n                    }\n                    this._canvas = new Uint32Array(pixels);\n                }\n            }\n            else {\n                // else fallback to generic resizing, starting with 256*256 pixels\n                if (this._canvas.length < 65536) {\n                    this._canvas = new Uint32Array(65536);\n                }\n            }\n        }\n        return 0; // 0 - continue, 1 - abort right away\n    }\n    _realloc(offset, additionalPixels) {\n        const pixels = offset + additionalPixels;\n        if (pixels > this._canvas.length) {\n            if (this._opts.memoryLimit && pixels * 4 > this._opts.memoryLimit) {\n                this.release();\n                throw new Error('image exceeds memory limit');\n            }\n            // extend in 65536 pixel blocks\n            const newCanvas = new Uint32Array(Math.ceil(pixels / 65536) * 65536);\n            newCanvas.set(this._canvas);\n            this._canvas = newCanvas;\n        }\n    }\n    _handle_band(width) {\n        const adv = this._PIXEL_OFFSET;\n        let offset = this._lastOffset;\n        if (this._mode === 2 /* M2 */) {\n            let remaining = this.height - this._currentHeight;\n            let c = 0;\n            while (c < 6 && remaining > 0) {\n                this._canvas.set(this._pSrc.subarray(adv * c, adv * c + width), offset + width * c);\n                c++;\n                remaining--;\n            }\n            this._lastOffset += width * c;\n            this._currentHeight += c;\n        }\n        else if (this._mode === 1 /* M1 */) {\n            this._realloc(offset, width * 6);\n            this._maxWidth = Math.max(this._maxWidth, width);\n            this._minWidth = Math.min(this._minWidth, width);\n            for (let i = 0; i < 6; ++i) {\n                this._canvas.set(this._pSrc.subarray(adv * i, adv * i + width), offset + width * i);\n            }\n            this._bandWidths.push(width);\n            this._lastOffset += width * 6;\n            this._currentHeight += 6;\n        }\n        return 0; // 0 - continue, 1 - abort right away\n    }\n    /**\n     * Width of the image data.\n     * Returns the rasterWidth in level2/truncating mode,\n     * otherwise the max width, that has been seen so far.\n     */\n    get width() {\n        return this._mode !== 1 /* M1 */\n            ? this._width\n            : Math.max(this._maxWidth, this._wasm.current_width());\n    }\n    /**\n     * Height of the image data.\n     * Returns the rasterHeight in level2/truncating mode,\n     * otherwise height touched by sixels.\n     */\n    get height() {\n        return this._mode !== 1 /* M1 */\n            ? this._height\n            : this._wasm.current_width()\n                ? this._bandWidths.length * 6 + this._wasm.current_height()\n                : this._bandWidths.length * 6;\n    }\n    /**\n     * Get active palette colors as RGBA8888[] (borrowed).\n     */\n    get palette() {\n        return this._palette.subarray(0, this._paletteLimit);\n    }\n    /**\n     * Get the memory used by the decoder.\n     *\n     * This is a rough estimate accounting the wasm instance memory\n     * and pixel buffers held on JS side (real value will be slightly\n     * higher due to JS book-keeping).\n     * Note that the decoder does not free ressources on its own,\n     * call `release` to free excess memory.\n     */\n    get memoryUsage() {\n        return this._canvas.byteLength + this._wasm.memory.buffer.byteLength + 8 * this._bandWidths.length;\n    }\n    /**\n     * Get various properties of the decoder and the current image.\n     */\n    get properties() {\n        return {\n            width: this.width,\n            height: this.height,\n            mode: this._mode,\n            level: this._level,\n            truncate: !!this._truncate,\n            paletteLimit: this._paletteLimit,\n            fillColor: this._fillColor,\n            memUsage: this.memoryUsage,\n            rasterAttributes: {\n                numerator: this._states[4],\n                denominator: this._states[5],\n                width: this._rasterWidth,\n                height: this._rasterHeight,\n            }\n        };\n    }\n    /**\n     * Initialize decoder for next image. Must be called before\n     * any calls to `decode` or `decodeString`.\n     */\n    // FIXME: reorder arguments, better palette handling\n    init(fillColor = this._opts.fillColor, palette = this._opts.palette, paletteLimit = this._opts.paletteLimit, truncate = this._opts.truncate) {\n        this._wasm.init(this._opts.sixelColor, fillColor, paletteLimit, truncate ? 1 : 0);\n        if (palette) {\n            this._palette.set(palette.subarray(0, wasm_1.LIMITS.PALETTE_SIZE));\n        }\n        this._bandWidths.length = 0;\n        this._maxWidth = 0;\n        this._minWidth = wasm_1.LIMITS.MAX_WIDTH;\n        this._lastOffset = 0;\n        this._currentHeight = 0;\n    }\n    /**\n     * Decode next chunk of data from start to end index (exclusive).\n     * @throws Will throw if the image exceeds the memory limit.\n     */\n    decode(data, start = 0, end = data.length) {\n        let p = start;\n        while (p < end) {\n            const length = Math.min(end - p, wasm_1.LIMITS.CHUNK_SIZE);\n            this._chunk.set(data.subarray(p, p += length));\n            this._wasm.decode(0, length);\n        }\n    }\n    /**\n     * Decode next chunk of string data from start to end index (exclusive).\n     * Note: Decoding from string data is rather slow, use `decode` with byte data instead.\n     * @throws Will throw if the image exceeds the memory limit.\n     */\n    decodeString(data, start = 0, end = data.length) {\n        let p = start;\n        while (p < end) {\n            const length = Math.min(end - p, wasm_1.LIMITS.CHUNK_SIZE);\n            for (let i = 0, j = p; i < length; ++i, ++j) {\n                this._chunk[i] = data.charCodeAt(j);\n            }\n            p += length;\n            this._wasm.decode(0, length);\n        }\n    }\n    /**\n     * Get current pixel data as 32-bit typed array (RGBA8888).\n     * Also peeks into pixel data of the current band, that got not pushed yet.\n     */\n    get data32() {\n        if (this._mode === 0 /* M0 */ || !this.width || !this.height) {\n            return NULL_CANVAS;\n        }\n        // get width of pending band to peek into left-over data\n        const currentWidth = this._wasm.current_width();\n        if (this._mode === 2 /* M2 */) {\n            let remaining = this.height - this._currentHeight;\n            if (remaining > 0) {\n                const adv = this._PIXEL_OFFSET;\n                let offset = this._lastOffset;\n                let c = 0;\n                while (c < 6 && remaining > 0) {\n                    this._canvas.set(this._pSrc.subarray(adv * c, adv * c + currentWidth), offset + currentWidth * c);\n                    c++;\n                    remaining--;\n                }\n                if (remaining) {\n                    this._canvas.fill(this._fillColor, offset + currentWidth * c);\n                }\n            }\n            return this._canvas.subarray(0, this.width * this.height);\n        }\n        if (this._mode === 1 /* M1 */) {\n            if (this._minWidth === this._maxWidth) {\n                let escape = false;\n                if (currentWidth) {\n                    if (currentWidth !== this._minWidth) {\n                        escape = true;\n                    }\n                    else {\n                        const adv = this._PIXEL_OFFSET;\n                        let offset = this._lastOffset;\n                        this._realloc(offset, currentWidth * 6);\n                        for (let i = 0; i < 6; ++i) {\n                            this._canvas.set(this._pSrc.subarray(adv * i, adv * i + currentWidth), offset + currentWidth * i);\n                        }\n                    }\n                }\n                if (!escape) {\n                    return this._canvas.subarray(0, this.width * this.height);\n                }\n            }\n            // worst case: re-align pixels if we have bands with different width\n            // This is somewhat allocation intensive, any way to do that in-place, and just once?\n            const final = new Uint32Array(this.width * this.height);\n            final.fill(this._fillColor);\n            let finalOffset = 0;\n            let start = 0;\n            for (let i = 0; i < this._bandWidths.length; ++i) {\n                const bw = this._bandWidths[i];\n                for (let p = 0; p < 6; ++p) {\n                    final.set(this._canvas.subarray(start, start += bw), finalOffset);\n                    finalOffset += this.width;\n                }\n            }\n            // also handle left-over pixels of the current band\n            if (currentWidth) {\n                const adv = this._PIXEL_OFFSET;\n                // other than finished bands, this runs only up to currentHeight\n                const currentHeight = this._wasm.current_height();\n                for (let i = 0; i < currentHeight; ++i) {\n                    final.set(this._pSrc.subarray(adv * i, adv * i + currentWidth), finalOffset + this.width * i);\n                }\n            }\n            return final;\n        }\n        // fallthrough for all not handled cases\n        return NULL_CANVAS;\n    }\n    /**\n     * Same as `data32`, but returning pixel data as Uint8ClampedArray suitable\n     * for direct usage with `ImageData`.\n     */\n    get data8() {\n        return new Uint8ClampedArray(this.data32.buffer, 0, this.width * this.height * 4);\n    }\n    /**\n     * Release image ressources on JS side held by the decoder.\n     *\n     * The decoder tries to re-use memory ressources of a previous image\n     * to lower allocation and GC pressure. Decoding a single big image\n     * will grow the memory usage of the decoder permanently.\n     * Call `release` to reset the internal buffers and free the memory.\n     * Note that this destroys the image data, call it when done processing\n     * a rather big image, otherwise it is not needed. Use `memoryUsage`\n     * to decide, whether the held memory is still within your limits.\n     * This does not affect the wasm module (operates on static memory).\n     */\n    release() {\n        this._canvas = NULL_CANVAS;\n        this._bandWidths.length = 0;\n        this._maxWidth = 0;\n        this._minWidth = wasm_1.LIMITS.MAX_WIDTH;\n        // also nullify parser states in wasm to avoid\n        // width/height reporting potential out-of-bound values\n        this._wasm.init(Colors_1.DEFAULT_FOREGROUND, 0, this._opts.paletteLimit, 0);\n    }\n}\nexports.Decoder = Decoder;\n/**\n * Convenient decoding functions for easier usage.\n *\n * These can be used for casual decoding of sixel images,\n * that dont come in as stream chunks.\n * Note that the functions instantiate a stream decoder for every call,\n * which comes with a performance penalty of ~25%.\n */\n/**\n * Decode function with synchronous wasm loading.\n * Can be used in a web worker or in nodejs. Does not work reliable in normal browser context.\n * @throws Will throw if the image exceeds the memory limit.\n */\nfunction decode(data, opts) {\n    const dec = new Decoder(opts);\n    dec.init();\n    typeof data === 'string' ? dec.decodeString(data) : dec.decode(data);\n    return {\n        width: dec.width,\n        height: dec.height,\n        data32: dec.data32,\n        data8: dec.data8\n    };\n}\nexports.decode = decode;\n/**\n * Decode function with asynchronous wasm loading.\n * Use this version in normal browser context.\n * @throws Will throw if the image exceeds the memory limit.\n */\nasync function decodeAsync(data, opts) {\n    const dec = await DecoderAsync(opts);\n    dec.init();\n    typeof data === 'string' ? dec.decodeString(data) : dec.decode(data);\n    return {\n        width: dec.width,\n        height: dec.height,\n        data32: dec.data32,\n        data8: dec.data8\n    };\n}\nexports.decodeAsync = decodeAsync;\n//# sourceMappingURL=Decoder.js.map","\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.LIMITS = void 0;\nexports.LIMITS = {\n    CHUNK_SIZE: 16384,\n    PALETTE_SIZE: 4096,\n    MAX_WIDTH: 16384,\n    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//# sourceMappingURL=wasm.js.map","/**\n * Copyright (c) 2024-2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Minimal event utilities for xterm.js core.\n * Simplified from VS Code's event.ts - no leak detection/profiling.\n */\n\nimport { IDisposable, DisposableStore, toDisposable } from './Lifecycle';\n\nexport interface IEvent<T> {\n  (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore): IDisposable;\n}\n\nexport class Emitter<T> {\n  private _listeners: { fn: (e: T) => any, thisArgs: any }[] = [];\n  private _disposed = false;\n  private _event: IEvent<T> | undefined;\n\n  public get event(): IEvent<T> {\n    if (this._event) {\n      return this._event;\n    }\n    this._event = (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      if (this._disposed) {\n        return toDisposable(() => {});\n      }\n\n      const entry = { fn: listener, thisArgs };\n      this._listeners = this._listeners.slice();\n      this._listeners.push(entry);\n\n      const result = toDisposable(() => {\n        const idx = this._listeners.indexOf(entry);\n        if (idx !== -1) {\n          this._listeners = this._listeners.slice();\n          this._listeners.splice(idx, 1);\n        }\n      });\n\n      if (disposables) {\n        if (Array.isArray(disposables)) {\n          disposables.push(result);\n        } else {\n          disposables.add(result);\n        }\n      }\n\n      return result;\n    };\n    return this._event;\n  }\n\n  public fire(event: T): void {\n    if (this._disposed || !this._listeners.length) {\n      return;\n    }\n    if (this._listeners.length === 1) {\n      this._listeners[0].fn.call(this._listeners[0].thisArgs, event);\n      return;\n    }\n    const listeners = this._listeners;\n    for (let i = 0, len = listeners.length; i < len; ++i) {\n      listeners[i].fn.call(listeners[i].thisArgs, event);\n    }\n  }\n\n  public dispose(): void {\n    if (this._disposed) {\n      return;\n    }\n    this._disposed = true;\n    this._listeners.length = 0;\n  }\n}\n\nexport namespace EventUtils {\n  export function forward<T>(from: IEvent<T>, to: Emitter<T>): IDisposable {\n    return from(e => to.fire(e));\n  }\n\n  export function map<I, O>(event: IEvent<I>, map: (i: I) => O): IEvent<O> {\n    return (listener: (e: O) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      return event(i => listener.call(thisArgs, map(i)), undefined, disposables);\n    };\n  }\n\n  export function any<T>(...events: IEvent<T>[]): IEvent<T>;\n  export function any(...events: IEvent<any>[]): IEvent<void>;\n  export function any<T>(...events: IEvent<T>[]): IEvent<T> {\n    return (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      const store = new DisposableStore();\n      for (const event of events) {\n        store.add(event(e => listener.call(thisArgs, e)));\n      }\n      if (disposables) {\n        if (Array.isArray(disposables)) {\n          disposables.push(store);\n        } else {\n          disposables.add(store);\n        }\n      }\n      return store;\n    };\n  }\n\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T) => void, initial: T): IDisposable;\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T | undefined) => void): IDisposable;\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T | undefined) => void, initial?: T): IDisposable {\n    handler(initial);\n    return event(e => handler(e));\n  }\n}\n","/**\n * Copyright (c) 2024-2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Minimal lifecycle utilities for xterm.js core.\n * Simplified from VS Code's lifecycle.ts - no tracking/leak detection.\n */\n\nexport interface IDisposable {\n  dispose(): void;\n}\n\nexport function toDisposable(fn: () => void): IDisposable {\n  return { dispose: fn };\n}\n\nexport function dispose<T extends IDisposable>(disposable: T): T;\nexport function dispose<T extends IDisposable>(disposable: T | undefined): T | undefined;\nexport function dispose<T extends IDisposable>(disposables: T[]): T[];\nexport function dispose<T extends IDisposable>(arg: T | T[] | undefined): T | T[] | undefined {\n  if (!arg) {\n    return arg;\n  }\n  if (Array.isArray(arg)) {\n    for (const d of arg) {\n      d.dispose();\n    }\n    return [];\n  }\n  arg.dispose();\n  return arg;\n}\n\nexport function combinedDisposable(...disposables: IDisposable[]): IDisposable {\n  return toDisposable(() => dispose(disposables));\n}\n\nexport class DisposableStore implements IDisposable {\n  private readonly _disposables = new Set<IDisposable>();\n  private _isDisposed = false;\n\n  public get isDisposed(): boolean {\n    return this._isDisposed;\n  }\n\n  public add<T extends IDisposable>(o: T): T {\n    if (this._isDisposed) {\n      o.dispose();\n    } else {\n      this._disposables.add(o);\n    }\n    return o;\n  }\n\n  public dispose(): void {\n    if (this._isDisposed) {\n      return;\n    }\n    this._isDisposed = true;\n    for (const d of this._disposables) {\n      d.dispose();\n    }\n    this._disposables.clear();\n  }\n\n  public clear(): void {\n    for (const d of this._disposables) {\n      d.dispose();\n    }\n    this._disposables.clear();\n  }\n}\n\nexport abstract class Disposable implements IDisposable {\n  public static readonly None: IDisposable = Object.freeze({ dispose() { } });\n\n  protected readonly _store = new DisposableStore();\n\n  public dispose(): void {\n    this._store.dispose();\n  }\n\n  protected _register<T extends IDisposable>(o: T): T {\n    return this._store.add(o);\n  }\n}\n\nexport class MutableDisposable<T extends IDisposable> implements IDisposable {\n  private _value: T | undefined;\n  private _isDisposed = false;\n\n  public get value(): T | undefined {\n    return this._isDisposed ? undefined : this._value;\n  }\n\n  public set value(value: T | undefined) {\n    if (this._isDisposed || value === this._value) {\n      return;\n    }\n    this._value?.dispose();\n    this._value = value;\n  }\n\n  public clear(): void {\n    this.value = undefined;\n  }\n\n  public dispose(): void {\n    this._isDisposed = true;\n    this._value?.dispose();\n    this._value = undefined;\n  }\n}\n","/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nimport { IImageAddonOptions, IOscHandler, IResetHandler, ITerminalExt } from './Types';\nimport { ImageRenderer } from './ImageRenderer';\nimport { IIPImageStorage } from './IIPImageStorage';\nimport { CELL_SIZE_DEFAULT } from './ImageStorage';\nimport Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\nimport QoiDecoder from 'xterm-wasm-parts/lib/qoi/QoiDecoder.wasm';\nimport { HeaderParser, IHeaderFields, HeaderState, SequenceType } from './IIPHeaderParser';\nimport { imageType, UNSUPPORTED_TYPE } from './IIPMetrics';\n\n// Local const enum mirror - esbuild can't inline const enums from external packages\nconst enum DecoderConst {\n  // Limit held memory in base64 decoder (encoded bytes).\n  KEEP_DATA = 4194304,\n  // Initial buffer allocation for the decoder.\n  INITIAL_DATA = 1048576,\n  // Local mirror of const enum (esbuild can't inline const enums from external packages)\n  OK = 0\n}\n\n// default IIP header values\nconst DEFAULT_HEADER: IHeaderFields = {\n  type: SequenceType.INVALID,\n  name: 'Unnamed file',\n  size: 0,\n  width: 'auto',\n  height: 'auto',\n  preserveAspectRatio: 1,\n  inline: 0\n};\n\n\nexport class IIPHandler implements IOscHandler, IResetHandler {\n  private _aborted = false;\n  private _hp = new HeaderParser();\n  private _header: IHeaderFields = DEFAULT_HEADER;\n  private _dec: Base64Decoder;\n  private _qoiDec: QoiDecoder;\n  private _isMultipart = false;\n  private _abortMulti = false;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _storage: IIPImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    const maxEncodedBytes = Math.ceil(this._opts.iipSizeLimit * 4 / 3);\n    const initialBytes = Math.min(DecoderConst.INITIAL_DATA, maxEncodedBytes);\n    this._dec = new Base64Decoder(DecoderConst.KEEP_DATA, maxEncodedBytes, initialBytes);\n    this._qoiDec = new QoiDecoder(DecoderConst.KEEP_DATA);\n  }\n\n  public reset(): void {\n    this._hp.reset();\n    this._dec.release();\n    this._qoiDec.release();\n  }\n\n  public start(): void {\n    this._aborted = false;\n    this._hp.reset();\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    if (this._hp.state === HeaderState.END) {\n      if ((this._dec.put(data.subarray(start, end)) as number) !== DecoderConst.OK) {\n        this._dec.release();\n        this._aborted = true;\n      }\n    } else {\n      const dataPos = this._hp.parse(data, start, end);\n      if (dataPos === -1) {\n        this._aborted = true;\n        return;\n      }\n      if (dataPos > 0) {\n        const seqType = this._hp.fields.type;\n        if (seqType === SequenceType.FILE) {\n          if (this._isMultipart) {\n            this._isMultipart = false;\n            this._abortMulti = false;\n            this._dec.release();\n          }\n          this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);\n          if (!this._header.inline) {\n            this._aborted = true;\n            return;\n          }\n          this._dec.init();\n        } else if (this._abortMulti) {\n          this._aborted = true;\n          return;\n        }\n        if ((this._dec.put(data.subarray(dataPos, end)) as number) !== DecoderConst.OK) {\n          this._dec.release();\n          this._aborted = true;\n          if (this._isMultipart) this._abortMulti = true;\n        }\n      }\n    }\n  }\n\n  public end(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted) return true;\n\n    if (this._hp.state !== HeaderState.END) {\n      if (this._hp.end()) return true;\n    }\n    const seqType = this._hp.fields.type;\n\n    if (seqType === SequenceType.FILEPART) return true;\n\n    if (seqType === SequenceType.REPORTCELLSIZE) {\n      // OSC 1337 ; ReportCellSize=[height];[width];[scale] ST\n      let w = CELL_SIZE_DEFAULT.width;\n      let h = CELL_SIZE_DEFAULT.height;\n      if (this._renderer.dimensions) {\n        w = this._renderer.dimensions.css.canvas.width / this._coreTerminal.cols;\n        h = this._renderer.dimensions.css.canvas.height / this._coreTerminal.rows;\n      }\n      const scale = this._coreTerminal._core._coreBrowserService?.dpr ?? 1;\n      const report = `\\x1b]1337;ReportCellSize=${h.toFixed(3)};${w.toFixed(3)};${scale.toFixed(3)}\\x1b\\\\`;\n      this._coreTerminal.input(report, false);\n      return true;\n    }\n\n    if (seqType === SequenceType.MULTIPARTFILE) {\n      this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);\n      this._isMultipart = true;\n      this._abortMulti = false;\n      this._dec.release();\n      this._dec.init();\n      return true;\n    }\n\n    if (seqType === SequenceType.FILEEND) {\n      if (!this._isMultipart) return true;\n      this._isMultipart = false;\n      if (this._abortMulti || this._header.type !== SequenceType.MULTIPARTFILE) return true;\n    }\n\n    // fallthrough for SequenceType.FILE & SequenceType.FILEEND\n\n    let w = 0;\n    let h = 0;\n\n    // early exit condition chain\n    let cond: number | boolean;\n    let metrics = UNSUPPORTED_TYPE;\n    if (cond = success) {\n      if (cond = !this._dec.end()) {\n        metrics = imageType(this._dec.data8);\n        if (cond = metrics.mime !== 'unsupported') {\n          w = metrics.width;\n          h = metrics.height;\n          if (cond = w && h && w * h < this._opts.pixelLimit) {\n            [w, h] = this._resize(w, h).map(Math.floor);\n            cond = w && h && w * h < this._opts.pixelLimit;\n          } else {\n            console.warn(`IIP: image dimension issue ${metrics.width}x${metrics.height}`);\n          }\n        } else {\n          console.warn('IIP: unsupported image type');\n        }\n      } else {\n        console.warn('IIP: error during BASE64 decoding');\n      }\n    }\n    if (!cond) {\n      this._dec.release();\n      return true;\n    }\n\n    let blob: Blob | ImageData;\n    if (metrics.mime === 'image/qoi') {\n      const data = this._qoiDec.decode(this._dec.data8);\n      blob = new ImageData(\n        new Uint8ClampedArray(data.buffer, data.byteOffset, data.byteLength),\n        this._qoiDec.width,\n        this._qoiDec.height\n      );\n      this._qoiDec.release();\n      if (w === this._qoiDec.width && h === this._qoiDec.height) {\n        // use fast-path if we don't need to rescale\n        this._dec.release();\n        const canvas = ImageRenderer.createCanvas(undefined, this._qoiDec.width, this._qoiDec.height);\n        canvas.getContext('2d')?.putImageData(blob, 0, 0);\n        this._storage.addImage(canvas);\n        return true;\n      }\n    } else {\n      blob = new Blob([this._dec.data8], { type: metrics.mime });\n    }\n    this._dec.release();\n    return createImageBitmap(blob, { resizeWidth: w, resizeHeight: h })\n      .then(bm => {\n        this._storage.addImage(bm);\n        return true;\n      })\n      .catch(e => {\n        console.warn(`IIP: decoding error ${metrics.mime} ${metrics.width}x${metrics.height}`, e);\n        return true;\n      });\n  }\n\n  private _resize(w: number, h: number): [number, number] {\n    const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;\n    const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;\n    const width = this._renderer.dimensions?.css.canvas.width || cw * this._coreTerminal.cols;\n    const height = this._renderer.dimensions?.css.canvas.height || ch * this._coreTerminal.rows;\n\n    const rw = this._dim(this._header.width!, width, cw);\n    const rh = this._dim(this._header.height!, height, ch);\n    if (!rw && !rh) {\n      const wf = width / w;         // TODO: should this respect initial cursor offset?\n      const hf = (height - ch) / h; // TODO: fix offset issues from float cell height\n      const f = Math.min(wf, hf);\n      return f < 1 ? [w * f, h * f] : [w, h];\n    }\n    return !rw\n      ? [w * rh / h, rh]\n      : this._header.preserveAspectRatio || !rw || !rh\n        ? [rw, h * rw / w] : [rw, rh];\n  }\n\n  private _dim(s: string, total: number, cdim: number): number {\n    if (s === 'auto') return 0;\n    if (s.endsWith('%')) return parseInt(s.slice(0, -1), 10) * total / 100;\n    if (s.endsWith('px')) return parseInt(s.slice(0, -2), 10);\n    return parseInt(s, 10) * cdim;\n  }\n}\n","/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n// eslint-disable-next-line\ndeclare const Buffer: any;\n\nexport const enum HeaderState {\n  START = 0,\n  ABORT = 1,\n  KEY = 2,\n  VALUE = 3,\n  END = 4\n}\n\nexport const enum SequenceType {\n  INVALID = 0,\n  FILE = 1,\n  MULTIPARTFILE = 2,\n  FILEPART = 3,\n  FILEEND = 4,\n  REPORTCELLSIZE = 5\n}\n\nexport interface IHeaderFields {\n  [key: string]: number | string | Uint32Array | null | undefined;\n  // sequence type\n  type: SequenceType;\n  // base-64 encoded filename. Defaults to \"Unnamed file\".\n  name: string;\n  // File size in bytes. The file transfer will be canceled if this size is exceeded.\n  size: number;\n  /**\n   * Optional width and height to render:\n   * - N: N character cells.\n   * - Npx: N pixels.\n   * - N%: N percent of the session's width or height.\n   * - auto: The image's inherent size will be used to determine an appropriate dimension.\n   */\n  width?: string;\n  height?: string;\n  // Optional, defaults to 1 respecting aspect ratio (width takes precedence).\n  preserveAspectRatio?: number;\n  // Optional, defaults to 0. If set to 1, the file will be displayed inline, else downloaded\n  // (download not supported).\n  inline?: number;\n}\n\n// field value decoders\n\n// ASCII bytes to string\nfunction toStr(data: Uint32Array): string {\n  let s = '';\n  for (let i = 0; i < data.length; ++i) {\n    s += String.fromCharCode(data[i]);\n  }\n  return s;\n}\n\n// digits to integer\nfunction toInt(data: Uint32Array): number {\n  let v = 0;\n  for (let i = 0; i < data.length; ++i) {\n    if (data[i] < 48 || data[i] > 57) {\n      throw new Error('illegal char');\n    }\n    v = v * 10 + data[i] - 48;\n  }\n  return v;\n}\n\n// check for correct size entry\nfunction toSize(data: Uint32Array): string {\n  const v = toStr(data);\n  if (!v.match(/^((auto)|(\\d+?((px)|(%)){0,1}))$/)) {\n    throw new Error('illegal size');\n  }\n  return v;\n}\n\n// name is base64 encoded utf-8\nfunction toName(data: Uint32Array): string {\n  if (typeof Buffer !== 'undefined') {\n    return Buffer.from(toStr(data), 'base64').toString();\n  }\n  const bs = atob(toStr(data));\n  const b = new Uint8Array(bs.length);\n  for (let i = 0; i < b.length; ++i) {\n    b[i] = bs.charCodeAt(i);\n  }\n  return new TextDecoder().decode(b);\n}\n\nconst DECODERS: {[key: string]: (v: Uint32Array) => number | string} = {\n  inline: toInt,\n  size: toInt,\n  name: toName,\n  width: toSize,\n  height: toSize,\n  preserveAspectRatio: toInt\n};\n\n\n// sequence type markers\n// File\nconst FILE_MARKER = [70, 105, 108, 101];\n// MultipartFile\nconst MULTIPARTFILE_MARKER = [77, 117, 108, 116, 105, 112, 97, 114, 116, 70, 105, 108, 101];\n// FilePart\nconst FILEPART_MARKER = [70, 105, 108, 101, 80, 97, 114, 116];\n// FileEnd\nconst FILEEND_MARKER = [70, 105, 108, 101, 69, 110, 100];\n// ReportCellSize\nconst REPORTCELLSIZE_MARKER = [82, 101, 112, 111, 114, 116, 67, 101, 108, 108, 83, 105, 122, 101];\n\n// max allowed chars for sequence header\nconst MAX_FIELDCHARS = 1024;\n\n\nexport class HeaderParser {\n  public state: HeaderState = HeaderState.START;\n  private _buffer = new Uint32Array(MAX_FIELDCHARS);\n  private _position = 0;\n  private _key = '';\n  public fields: {[key: string]: number | string | Uint32Array | null | undefined} = {};\n\n  public reset(): void {\n    this._buffer.fill(0);\n    this.state = HeaderState.START;\n    this._position = 0;\n    this.fields = {};\n    this._key = '';\n  }\n\n  public end(): number {\n    if (this.state === HeaderState.START) {\n      if (this._position === FILEEND_MARKER.length) {\n        for (let k = 0; k < FILEEND_MARKER.length; ++k) {\n          if (this._buffer[k] !== FILEEND_MARKER[k]) return this._a();\n        }\n        this.fields['type'] = SequenceType.FILEEND;\n        this.state = HeaderState.END;\n        return 0;\n      }\n      if (this._position === REPORTCELLSIZE_MARKER.length) {\n        for (let k = 0; k < REPORTCELLSIZE_MARKER.length; ++k) {\n          if (this._buffer[k] !== REPORTCELLSIZE_MARKER[k]) return this._a();\n        }\n        this.fields['type'] = SequenceType.REPORTCELLSIZE;\n        this.state = HeaderState.END;\n        return 0;\n      }\n      return this._a();\n    }\n    if (this.state === HeaderState.END) return 0;\n    if (this.state === HeaderState.VALUE\n      && this.fields.type === SequenceType.MULTIPARTFILE\n    ) {\n      if (!this._storeValue(this._position)) return this._a();\n      this.state = HeaderState.END;\n      return 0;\n    }\n    return this._a();\n  }\n\n  public parse(data: Uint32Array, start: number, end: number): number {\n    let state = this.state;\n    let pos = this._position;\n    const buffer = this._buffer;\n    if (state === HeaderState.ABORT || state === HeaderState.END) return -1;\n    if (state === HeaderState.START && pos > 14) return -1;\n    for (let i = start; i < end; ++i) {\n      const c = data[i];\n      switch (c) {\n        case 59: // ;\n          if (!this._storeValue(pos)) return this._a();\n          state = HeaderState.KEY;\n          pos = 0;\n          break;\n        case 61: // =\n          if (state === HeaderState.START) {\n            if (buffer[0] === 70) {\n              // 'File' or 'FilePart'\n              let k = 0;\n              for (; k < FILE_MARKER.length; ++k) {\n                if (buffer[k] !== FILE_MARKER[k]) return this._a();\n              }\n              this.fields['type'] = SequenceType.FILE;\n              if (pos === FILEPART_MARKER.length) {\n                for (; k < FILEPART_MARKER.length; ++k) {\n                  if (buffer[k] !== FILEPART_MARKER[k]) return this._a();\n                }\n                this.fields['type'] = SequenceType.FILEPART;\n                this.state = HeaderState.END;\n                return i + 1;\n              }\n            } else if (buffer[0] === 77) {\n              // 'MultipartFile'\n              for (let k = 0; k < MULTIPARTFILE_MARKER.length; ++k) {\n                if (buffer[k] !== MULTIPARTFILE_MARKER[k]) return this._a();\n              }\n              this.fields['type'] = SequenceType.MULTIPARTFILE;\n            } else {\n              return this._a();\n            }\n            state = HeaderState.KEY;\n            pos = 0;\n          } else if (state === HeaderState.KEY) {\n            if (!this._storeKey(pos)) return this._a();\n            state = HeaderState.VALUE;\n            pos = 0;\n          } else if (state === HeaderState.VALUE) {\n            if (pos >= MAX_FIELDCHARS) return this._a();\n            buffer[pos++] = c;\n          }\n          break;\n        case 58: // :\n          if (state === HeaderState.VALUE) {\n            if (!this._storeValue(pos)) return this._a();\n          }\n          this.state = HeaderState.END;\n          return i + 1;\n        default:\n          if (pos >= MAX_FIELDCHARS) return this._a();\n          buffer[pos++] = c;\n      }\n    }\n    this.state = state;\n    this._position = pos;\n    return -2;\n  }\n\n  private _a(): number {\n    this.fields.type = SequenceType.INVALID;\n    this.state = HeaderState.ABORT;\n    return -1;\n  }\n\n  private _storeKey(pos: number): boolean {\n    const k = toStr(this._buffer.subarray(0, pos));\n    if (k) {\n      this._key = k;\n      this.fields[k] = null;\n      return true;\n    }\n    return false;\n  }\n\n  private _storeValue(pos: number): boolean {\n    if (this._key) {\n      try {\n        const v = this._buffer.slice(0, pos);\n        this.fields[this._key] = DECODERS[this._key] ? DECODERS[this._key](v) : v;\n      } catch {\n        return false;\n      }\n      return true;\n    }\n    return false;\n  }\n}\n","/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IAddImageOpts } from './Types';\nimport { ImageStorage } from './ImageStorage';\n\n/**\n * IIP (iTerm Image Protocol) specific image storage controller.\n *\n * Wraps the shared ImageStorage with IIP protocol semantics:\n * - Always uses scrolling mode (cursor advances with image)\n */\nexport class IIPImageStorage {\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };\n  constructor(\n    private readonly _storage: ImageStorage\n  ) {}\n\n  /**\n   * Add an IIP image to storage.\n   * Always uses scrolling mode — cursor advances past the image.\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap): void {\n    this._storage.addImage(img, this._addImageOpts);\n  }\n}\n","/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n\nexport type ImageType = 'image/png' | 'image/jpeg' | 'image/gif' | 'image/qoi' | 'image/webp' | 'image/avif' | 'unsupported' | '';\n\nexport interface IMetrics {\n  mime: ImageType;\n  width: number;\n  height: number;\n}\n\nexport const UNSUPPORTED_TYPE: IMetrics = {\n  mime: 'unsupported',\n  width: 0,\n  height: 0\n};\n\nexport function imageType(d: Uint8Array): IMetrics {\n  if (d.length < 32) {\n    return UNSUPPORTED_TYPE;\n  }\n  const d32 = new Uint32Array(d.buffer, d.byteOffset, 8);\n  // PNG: 89 50 4E 47 0D 0A 1A 0A (8 first bytes == magic number for PNG)\n  // + first chunk must be IHDR\n  if (d32[0] === 0x474E5089 && d32[1] === 0x0A1A0A0D && d32[3] === 0x52444849) {\n    return {\n      mime: 'image/png',\n      width:  d[16] << 24 | d[17] << 16 | d[18] << 8 | d[19],\n      height: d[20] << 24 | d[21] << 16 | d[22] << 8 | d[23]\n    };\n  }\n  // JPEG: FF D8 FF\n  if (d[0] === 0xFF && d[1] === 0xD8 && d[2] === 0xFF) {\n    const [width, height] = jpgSize(d);\n    return { mime: 'image/jpeg', width, height };\n  }\n  // GIF: GIF87a or GIF89a\n  if (d32[0] === 0x38464947 && (d[4] === 0x37 || d[4] === 0x39) && d[5] === 0x61) {\n    return {\n      mime: 'image/gif',\n      width:  d[7] << 8 | d[6],\n      height: d[9] << 8 | d[8]\n    };\n  }\n  // QOI: qoif\n  if (d32[0] === 0x66696F71) {\n    return {\n      mime: 'image/qoi',\n      width:  d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7],\n      height: d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11]\n    };\n  }\n  // WEBP: RIFF | xxxx | WEBP | VP8x\n  if (d32[0] === 0x46464952 && d32[2] === 0x50424557 && (d32[3] & 0xFFFFFF) === 0x385056) {\n    switch (d[15]) {\n      case 0x58:  // Extended WebP VP8X --> \"X\"\n        return {\n          mime: 'image/webp',\n          width:  (d[24] | d[25] << 8 | d[26] << 16) + 1,\n          height: (d[27] | d[28] << 8 | d[29] << 16) + 1\n        };\n      case 0x4C:  // Lossless WebP VP8L --> \"L\"\n        if (d[20] !== 0x2f) return UNSUPPORTED_TYPE;\n        const dim = d[21] | d[22] << 8 | d[23] << 16 | d[24] << 24;\n        return {\n          mime: 'image/webp',\n          width:  (dim        & 0x3FFF) + 1,\n          height: (dim >>> 14 & 0x3FFF) + 1\n        };\n      case 0x20:  // Lossy WebP VP8  --> \" \"\n        if (d[23] !== 0x9d || d[24] !== 0x01 || d[25] !== 0x2a) return UNSUPPORTED_TYPE;\n        return {\n          mime: 'image/webp',\n          width:  (d[26] | d[27] << 8) & 0x3FFF,\n          height: (d[28] | d[29] << 8) & 0x3FFF\n        };\n    }\n    return UNSUPPORTED_TYPE;\n  }\n  // AVIF: Box size | ftyp | avif/avis\n  if (d32[1] === 0x70797466 && (d32[2] === 0x66697661 || d32[2] === 0x73697661)) {\n    let pos = -1;\n    // search for ispe box within first 1024 bytes\n    const limit = Math.min(d.length - 16, 1024);\n    for (let i = 8; i < limit; i++) {\n      // scan for ispe\n      if (d[i] === 0x69 && d[i + 1] === 0x73 && d[i + 2] === 0x70 && d[i + 3] === 0x65) {\n        pos = i;\n        break;\n      }\n    }\n    if (pos !== -1) {\n      // dimensions are in BE at +8 (width) at +12 (height)\n      const width =\n        d[pos +  8] << 24 |\n        d[pos +  9] << 16 |\n        d[pos + 10] <<  8 |\n        d[pos + 11];\n      const height =\n        d[pos + 12] << 24 |\n        d[pos + 13] << 16 |\n        d[pos + 14] <<  8 |\n        d[pos + 15];\n      if (width > 0 && height > 0) {\n        return { mime: 'image/avif', width, height };\n      }\n    }\n    return UNSUPPORTED_TYPE;\n  }\n  return UNSUPPORTED_TYPE;\n}\n\n\nfunction jpgSize(d: Uint8Array): [number, number] {\n  const len = d.length;\n  let i = 4;\n  let blockLength = d[i] << 8 | d[i + 1];\n  while (true) {\n    i += blockLength;\n    if (i >= len) {\n      // exhausted without size info\n      return [0, 0];\n    }\n    if (d[i] !== 0xFF) {\n      return [0, 0];\n    }\n    if (d[i + 1] === 0xC0 || d[i + 1] === 0xC2) {\n      if (i + 8 < len) {\n        return [\n          d[i + 7] << 8 | d[i + 8],\n          d[i + 5] << 8 | d[i + 6]\n        ];\n      }\n      return [0, 0];\n    }\n    i += 2;\n    blockLength = d[i] << 8 | d[i + 1];\n  }\n}\n","/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { toRGBA8888 } from 'sixel/lib/Colors';\nimport { IDisposable } from '@xterm/xterm';\nimport { ICellSize, ImageLayer, ITerminalExt, IImageSpec, IRenderDimensions, IRenderService } from './Types';\nimport { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';\n\nconst enum Constants {\n  PLACEHOLDER_LENGTH = 4096,\n  PLACEHOLDER_HEIGHT = 24\n}\n\n/**\n * ImageRenderer - terminal frontend extension:\n * - provide primitives for canvas, ImageData, Bitmap (static)\n * - add canvas layer to DOM (browser only for now)\n * - draw image tiles onRender\n */\nexport class ImageRenderer extends Disposable implements IDisposable {\n  /** @deprecated Kept for backward compat — points to top layer canvas. */\n  public get canvas(): HTMLCanvasElement | undefined { return this._layers.get('top')?.canvas; }\n  private _layers = new Map<ImageLayer, CanvasRenderingContext2D>();\n  private _placeholder: HTMLCanvasElement | undefined;\n  private _placeholderBitmap: ImageBitmap | undefined;\n  private _optionsRefresh = this._register(new MutableDisposable());\n  private _oldOpen: ((parent: HTMLElement) => void) | undefined;\n  private _renderService: IRenderService | undefined;\n  private _oldSetRenderer: ((renderer: any) => void) | undefined;\n\n  // drawing primitive - canvas\n  public static createCanvas(localDocument: Document | undefined, width: number, height: number): HTMLCanvasElement {\n    /**\n     * NOTE: We normally dont care, from which document the canvas\n     * gets created, so we can fall back to global document,\n     * if the terminal has no document associated yet.\n     * This way early image loads before calling .open keep working\n     * (still discouraged though, as the metrics will be screwed up).\n     * Only the DOM output canvas should be on the terminal's document,\n     * which gets explicitly checked in `insertLayerToDom`.\n     */\n    const canvas = (localDocument ?? document).createElement('canvas');\n    canvas.width = width | 0;\n    canvas.height = height | 0;\n    return canvas;\n  }\n\n  // drawing primitive - ImageData with optional buffer\n  public static createImageData(ctx: CanvasRenderingContext2D, width: number, height: number, buffer?: ArrayBuffer): ImageData {\n    if (typeof ImageData !== 'function') {\n      const imgData = ctx.createImageData(width, height);\n      if (buffer) {\n        imgData.data.set(new Uint8ClampedArray(buffer, 0, width * height * 4));\n      }\n      return imgData;\n    }\n    return buffer\n      ? new ImageData(new Uint8ClampedArray(buffer, 0, width * height * 4), width, height)\n      : new ImageData(width, height);\n  }\n\n  // drawing primitive - ImageBitmap\n  public static createImageBitmap(img: ImageBitmapSource): Promise<ImageBitmap | undefined> {\n    if (typeof createImageBitmap !== 'function') {\n      return Promise.resolve(undefined);\n    }\n    return createImageBitmap(img);\n  }\n\n\n  constructor(private _terminal: ITerminalExt) {\n    super();\n    this._oldOpen = this._terminal._core.open;\n    this._terminal._core.open = (parent: HTMLElement): void => {\n      this._oldOpen?.call(this._terminal._core, parent);\n      this._open();\n    };\n    if (this._terminal._core.screenElement) {\n      this._open();\n    }\n    // hack to spot fontSize changes\n    this._optionsRefresh.value = this._terminal._core.optionsService.onOptionChange(option => {\n      if (option === 'fontSize') {\n        this.rescaleCanvas();\n        this._renderService?.refreshRows(0, this._terminal.rows);\n      }\n    });\n    this._register(toDisposable(() => {\n      this.removeLayerFromDom();\n      this.removeLayerFromDom('bottom');\n      if (this._terminal._core && this._oldOpen) {\n        this._terminal._core.open = this._oldOpen;\n        this._oldOpen = undefined;\n      }\n      if (this._renderService && this._oldSetRenderer) {\n        this._renderService.setRenderer = this._oldSetRenderer;\n        this._oldSetRenderer = undefined;\n      }\n      this._renderService = undefined;\n      this._layers.clear();\n      this._placeholderBitmap?.close();\n      this._placeholderBitmap = undefined;\n      this._placeholder = undefined;\n    }));\n  }\n\n  /**\n   * Enable the placeholder.\n   */\n  public showPlaceholder(value: boolean): void {\n    if (value) {\n      if (!this._placeholder && this.cellSize.height !== -1) {\n        this._createPlaceHolder(Math.max(this.cellSize.height + 1, Constants.PLACEHOLDER_HEIGHT));\n      }\n    } else {\n      this._placeholderBitmap?.close();\n      this._placeholderBitmap = undefined;\n      this._placeholder = undefined;\n    }\n    this._renderService?.refreshRows(0, this._terminal.rows);\n  }\n\n  /**\n   * Dimensions of the terminal.\n   * Forwarded from internal render service.\n   */\n  public get dimensions(): IRenderDimensions | undefined {\n    return this._terminal.dimensions;\n  }\n\n  /**\n   * Current cell size (float).\n   */\n  public get cellSize(): ICellSize {\n    return {\n      width: this.dimensions?.css.cell.width || -1,\n      height: this.dimensions?.css.cell.height || -1\n    };\n  }\n\n  /**\n   * Clear a region of the image layer canvas.\n   */\n  public clearLines(start: number, end: number, layer?: ImageLayer): void {\n    const y = start * (this.dimensions?.css.cell.height || 0);\n    const w = this.dimensions?.css.canvas.width || 0;\n    const h = (end + 1 - start) * (this.dimensions?.css.cell.height || 0);\n    if (!layer || layer === 'top') {\n      this._layers.get('top')?.clearRect(0, y, w, h);\n    }\n    if (!layer || layer === 'bottom') {\n      this._layers.get('bottom')?.clearRect(0, y, w, h);\n    }\n  }\n\n  /**\n   * Clear whole image canvas.\n   */\n  public clearAll(layer?: ImageLayer): void {\n    if (!layer || layer === 'top') {\n      const ctx = this._layers.get('top');\n      ctx?.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);\n    }\n    if (!layer || layer === 'bottom') {\n      const ctx = this._layers.get('bottom');\n      ctx?.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);\n    }\n  }\n\n  /**\n   * Draw neighboring tiles on the image layer canvas.\n   */\n  public draw(imgSpec: IImageSpec, tileId: number, col: number, row: number, count: number = 1): void {\n    const ctx = this._layers.get(imgSpec.layer);\n    if (!ctx) {\n      return;\n    }\n    const { width, height } = this.cellSize;\n\n    // Don't try to draw anything, if we cannot get valid renderer metrics.\n    if (width === -1 || height === -1) {\n      return;\n    }\n\n    this._rescaleImage(imgSpec, width, height);\n    const img = imgSpec.actual!;\n    const cols = Math.ceil(img.width / width);\n\n    const sx = (tileId % cols) * width;\n    const sy = Math.floor(tileId / cols) * height;\n    const dx = col * width;\n    const dy = row * height;\n\n    // safari bug: never access image source out of bounds\n    const finalWidth = count * width + sx > img.width ? img.width - sx : count * width;\n    const finalHeight = sy + height > img.height ? img.height - sy : height;\n\n    // Floor all pixel offsets to get stable tile mapping without any overflows.\n    // Note: For not pixel perfect aligned cells like in the DOM renderer\n    // this will move a tile slightly to the top/left (subpixel range, thus ignore it).\n    // FIX #34: avoid striping on displays with pixelDeviceRatio != 1 by ceiling height and width\n    ctx.drawImage(\n      img,\n      Math.floor(sx), Math.floor(sy), Math.ceil(finalWidth), Math.ceil(finalHeight),\n      Math.floor(dx), Math.floor(dy), Math.ceil(finalWidth), Math.ceil(finalHeight)\n    );\n  }\n\n  /**\n   * Extract a single tile from an image.\n   */\n  public extractTile(imgSpec: IImageSpec, tileId: number): HTMLCanvasElement | undefined {\n    const { width, height } = this.cellSize;\n    // Don't try to draw anything, if we cannot get valid renderer metrics.\n    if (width === -1 || height === -1) {\n      return;\n    }\n    this._rescaleImage(imgSpec, width, height);\n    const img = imgSpec.actual!;\n    const cols = Math.ceil(img.width / width);\n    const sx = (tileId % cols) * width;\n    const sy = Math.floor(tileId / cols) * height;\n    const finalWidth = width + sx > img.width ? img.width - sx : width;\n    const finalHeight = sy + height > img.height ? img.height - sy : height;\n\n    const canvas = ImageRenderer.createCanvas(this.document, finalWidth, finalHeight);\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      ctx.drawImage(\n        img,\n        Math.floor(sx), Math.floor(sy), Math.floor(finalWidth), Math.floor(finalHeight),\n        0, 0, Math.floor(finalWidth), Math.floor(finalHeight)\n      );\n      return canvas;\n    }\n  }\n\n  /**\n   * Draw a line with placeholder on the image layer canvas.\n   */\n  public drawPlaceholder(col: number, row: number, count: number = 1): void {\n    const ctx = this._layers.get('top');\n    if (ctx) {\n      const { width, height } = this.cellSize;\n\n      // Don't try to draw anything, if we cannot get valid renderer metrics.\n      if (width === -1 || height === -1) {\n        return;\n      }\n\n      if (!this._placeholder) {\n        this._createPlaceHolder(Math.max(height + 1, Constants.PLACEHOLDER_HEIGHT));\n      } else if (height >= this._placeholder!.height) {\n        this._createPlaceHolder(height + 1);\n      }\n      if (!this._placeholder) return;\n      ctx.drawImage(\n        this._placeholderBitmap ?? this._placeholder!,\n        col * width,\n        (row * height) % 2 ? 0 : 1,  // needs %2 offset correction\n        width * count,\n        height,\n        col * width,\n        row * height,\n        width * count,\n        height\n      );\n    }\n  }\n\n  /**\n   * Rescale image layer canvas if needed.\n   * Checked once from `ImageStorage.render`.\n   */\n  public rescaleCanvas(): void {\n    const w = this.dimensions?.css.canvas.width || 0;\n    const h = this.dimensions?.css.canvas.height || 0;\n    for (const ctx of this._layers.values()) {\n      if (ctx.canvas.width !== w || ctx.canvas.height !== h) {\n        ctx.canvas.width = w;\n        ctx.canvas.height = h;\n      }\n    }\n  }\n\n  /**\n   * Rescale image in storage if needed.\n   */\n  private _rescaleImage(spec: IImageSpec, currentWidth: number, currentHeight: number): void {\n    if (currentWidth === spec.actualCellSize.width && currentHeight === spec.actualCellSize.height) {\n      return;\n    }\n    const { width: originalWidth, height: originalHeight } = spec.origCellSize;\n    if (currentWidth === originalWidth && currentHeight === originalHeight) {\n      spec.actual = spec.orig;\n      spec.actualCellSize.width = originalWidth;\n      spec.actualCellSize.height = originalHeight;\n      return;\n    }\n    const canvas = ImageRenderer.createCanvas(\n      this.document,\n      Math.ceil(spec.orig!.width * currentWidth / originalWidth),\n      Math.ceil(spec.orig!.height * currentHeight / originalHeight)\n    );\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      ctx.drawImage(spec.orig!, 0, 0, canvas.width, canvas.height);\n      spec.actual = canvas;\n      spec.actualCellSize.width = currentWidth;\n      spec.actualCellSize.height = currentHeight;\n    }\n  }\n\n  /**\n   * Lazy init for the renderer.\n   */\n  private _open(): void {\n    this._renderService = this._terminal._core._renderService;\n    this._oldSetRenderer = this._renderService.setRenderer.bind(this._renderService);\n    this._renderService.setRenderer = (renderer: any) => {\n      for (const key of [...this._layers.keys()]) {\n        this.removeLayerFromDom(key);\n      }\n      this._oldSetRenderer?.call(this._renderService, renderer);\n    };\n  }\n\n  public insertLayerToDom(layer: ImageLayer = 'top'): void {\n    // make sure that the terminal is attached to a document and to DOM\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(layer)) {\n      return;\n    }\n    const canvas = ImageRenderer.createCanvas(\n      this.document, this.dimensions?.css.canvas.width || 0,\n      this.dimensions?.css.canvas.height || 0\n    );\n    canvas.classList.add(`xterm-image-layer-${layer}`);\n    const screenElement = this._terminal._core.screenElement;\n    // Use isolation to create a stacking context without overriding z-index,\n    // which would conflict with integrators (e.g. VS Code) that set their\n    // own z-index on the screen element.\n    screenElement.style.isolation = 'isolate';\n    if (layer === 'bottom') {\n      // Use z-index:-1 so it paints behind non-positioned text elements.\n      // The screen element needs to be a stacking context (via isolation)\n      // to contain the negative z-index, otherwise it would go behind the\n      // entire terminal.\n      canvas.style.zIndex = '-1';\n      screenElement.insertBefore(canvas, screenElement.firstChild);\n    } else {\n      // Explicit z-index ensures the image canvas reliably stacks above\n      // the text layer (DOM renderer rows). z-index: 0 is below the\n      // selection overlay (z-index: 1).\n      canvas.style.zIndex = '0';\n      screenElement.appendChild(canvas);\n    }\n    const ctx = canvas.getContext('2d', { alpha: true });\n    if (!ctx) {\n      canvas.remove();\n      return;\n    }\n    this._layers.set(layer, ctx);\n    this.clearAll(layer);\n  }\n\n  public removeLayerFromDom(layer: ImageLayer = 'top'): void {\n    const ctx = this._layers.get(layer);\n    if (ctx) {\n      ctx.canvas.remove();\n      this._layers.delete(layer);\n    }\n  }\n\n  public hasLayer(layer: ImageLayer): boolean {\n    return this._layers.has(layer);\n  }\n\n  private _createPlaceHolder(height: number = Constants.PLACEHOLDER_HEIGHT): void {\n    this._placeholderBitmap?.close();\n    this._placeholderBitmap = undefined;\n\n    // create blueprint to fill placeholder with\n    const bWidth = 32;  // must be 2^n\n    const blueprint = ImageRenderer.createCanvas(this.document, bWidth, height);\n    const ctx = blueprint.getContext('2d', { alpha: false });\n    if (!ctx) return;\n    const imgData = ImageRenderer.createImageData(ctx, bWidth, height);\n    const d32 = new Uint32Array(imgData.data.buffer);\n    const black = toRGBA8888(0, 0, 0);\n    const white = toRGBA8888(255, 255, 255);\n    d32.fill(black);\n    for (let y = 0; y < height; ++y) {\n      const shift = y % 2;\n      const offset = y * bWidth;\n      for (let x = 0; x < bWidth; x += 2) {\n        d32[offset + x + shift] = white;\n      }\n    }\n    ctx.putImageData(imgData, 0, 0);\n\n    // create placeholder line, width aligned to blueprint width\n    const width = (screen.width + bWidth - 1) & ~(bWidth - 1) || Constants.PLACEHOLDER_LENGTH;\n    this._placeholder = ImageRenderer.createCanvas(this.document, width, height);\n    const ctx2 = this._placeholder.getContext('2d', { alpha: false });\n    if (!ctx2) {\n      this._placeholder = undefined;\n      return;\n    }\n    for (let i = 0; i < width; i += bWidth) {\n      ctx2.drawImage(blueprint, i, 0);\n    }\n    ImageRenderer.createImageBitmap(this._placeholder).then(bitmap => this._placeholderBitmap = bitmap);\n  }\n\n  public get document(): Document | undefined {\n    return this._terminal._core._coreBrowserService?.window.document;\n  }\n}\n","/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { ImageRenderer } from './ImageRenderer';\nimport {\n  ITerminalExt, IExtendedAttrsImage, IImageAddonOptions, IImageSpec,\n  IBufferLineExt, BgFlags, Cell, Content, ICellSize, ExtFlags, Attributes,\n  UnderlineStyle, IAddImageOpts\n} from './Types';\n\n\n// fallback default cell size\nexport const CELL_SIZE_DEFAULT: ICellSize = {\n  width: 7,\n  height: 14\n};\n\n/**\n * Extend extended attribute to also hold image tile information.\n *\n * Object definition is copied from base repo to fully mimick its behavior.\n * Image data is added as additional public properties `imageId` and `tileId`.\n */\nclass ExtendedAttrsImage implements IExtendedAttrsImage {\n  private _ext: number = 0;\n  public get ext(): number {\n    if (this._urlId) {\n      return (\n        (this._ext & ~ExtFlags.UNDERLINE_STYLE) |\n        (this.underlineStyle << 26)\n      );\n    }\n    return this._ext;\n  }\n  public set ext(value: number) { this._ext = value; }\n\n  public get underlineStyle(): UnderlineStyle {\n    // Always return the URL style if it has one\n    if (this._urlId) {\n      return UnderlineStyle.DASHED;\n    }\n    return (this._ext & ExtFlags.UNDERLINE_STYLE) >> 26;\n  }\n  public set underlineStyle(value: UnderlineStyle) {\n    this._ext &= ~ExtFlags.UNDERLINE_STYLE;\n    this._ext |= (value << 26) & ExtFlags.UNDERLINE_STYLE;\n  }\n\n  public get underlineColor(): number {\n    return this._ext & (Attributes.CM_MASK | Attributes.RGB_MASK);\n  }\n  public set underlineColor(value: number) {\n    this._ext &= ~(Attributes.CM_MASK | Attributes.RGB_MASK);\n    this._ext |= value & (Attributes.CM_MASK | Attributes.RGB_MASK);\n  }\n\n  public get underlineVariantOffset(): number {\n    const val = (this._ext & ExtFlags.VARIANT_OFFSET) >> 29;\n    if (val < 0) {\n      return val ^ 0xFFFFFFF8;\n    }\n    return val;\n  }\n  public set underlineVariantOffset(value: number) {\n    this._ext &= ~ExtFlags.VARIANT_OFFSET;\n    this._ext |= (value << 29) & ExtFlags.VARIANT_OFFSET;\n  }\n\n  private _urlId: number = 0;\n  public get urlId(): number {\n    return this._urlId;\n  }\n  public set urlId(value: number) {\n    this._urlId = value;\n  }\n\n  constructor(\n    ext: number = 0,\n    urlId: number = 0,\n    public imageId = -1,\n    public tileId = -1\n  ) {\n    this._ext = ext;\n    this._urlId = urlId;\n  }\n\n  public clone(): IExtendedAttrsImage {\n    /**\n     * Technically we dont need a clone variant of ExtendedAttrsImage,\n     * as we never clone a cell holding image data.\n     * Note: Clone is only meant to be used by the InputHandler for\n     * sticky attributes, which is never the case for image data.\n     * We still provide a proper clone method to reflect the full ext attr\n     * state in case there are future use cases for clone.\n     */\n    return new ExtendedAttrsImage(this._ext, this._urlId, this.imageId, this.tileId);\n  }\n\n  public isEmpty(): boolean {\n    return this.underlineStyle === UnderlineStyle.NONE && this._urlId === 0 && this.imageId === -1;\n  }\n}\nconst EMPTY_ATTRS = new ExtendedAttrsImage();\n\n\n/**\n * ImageStorage - extension of CoreTerminal:\n * - hold image data\n * - write/read image data to/from buffer\n *\n * TODO: image composition for overwrites\n */\nexport class ImageStorage implements IDisposable {\n  // storage\n  private _images: Map<number, IImageSpec> = new Map();\n  // last used id\n  private _lastId = 0;\n  // last evicted id\n  private _lowestId = 0;\n  // whether a full clear happened before\n  private _fullyCleared = false;\n  // whether render should do a full clear\n  private _needsFullClear = false;\n  // hard limit of stored pixels (fallback limit of 10 MB)\n  private _pixelLimit: number = 2500000;\n\n  private _viewportMetrics: { cols: number, rows: number };\n  public onImageAdded: (() => void) | undefined;\n  public onImageDeleted: ((storageId: number) => void) | undefined;\n\n  constructor(\n    private _terminal: ITerminalExt,\n    private _renderer: ImageRenderer,\n    private _opts: IImageAddonOptions\n  ) {\n    try {\n      this.setLimit(this._opts.storageLimit);\n    } catch (e: unknown) {\n      if (e instanceof Error) {\n        console.error(e.message);\n      }\n      console.warn(`storageLimit is set to ${this.getLimit()} MB`);\n    }\n    this._viewportMetrics = {\n      cols: this._terminal.cols,\n      rows: this._terminal.rows\n    };\n  }\n\n  public dispose(): void {\n    this.reset();\n  }\n\n  public reset(): void {\n    for (const spec of this._images.values()) {\n      spec.marker?.dispose();\n    }\n    // NOTE: marker.dispose above already calls ImageBitmap.close\n    // therefore we can just wipe the map here\n    this._images.clear();\n    this._renderer.clearAll();\n  }\n\n  public getLimit(): number {\n    return this._pixelLimit * 4 / 1000000;\n  }\n\n  public setLimit(value: number): void {\n    if (value < 0.5 || value > 1000) {\n      throw RangeError('invalid storageLimit, should be at least 0.5 MB and not exceed 1G');\n    }\n    this._pixelLimit = (value / 4 * 1000000) >>> 0;\n    this._evictOldest(0);\n  }\n\n  public getUsage(): number {\n    return this._getStoredPixels() * 4 / 1000000;\n  }\n\n  private _getStoredPixels(): number {\n    let storedPixels = 0;\n    for (const spec of this._images.values()) {\n      if (spec.orig) {\n        storedPixels += spec.orig.width * spec.orig.height;\n        if (spec.actual && spec.actual !== spec.orig) {\n          storedPixels += spec.actual.width * spec.actual.height;\n        }\n      }\n    }\n    return storedPixels;\n  }\n\n  private _delImg(id: number): void {\n    const spec = this._images.get(id);\n    if (!spec) return;\n    this._images.delete(id);\n    // FIXME: really ugly workaround to get bitmaps deallocated :(\n    if (window.ImageBitmap && spec.orig instanceof ImageBitmap) {\n      spec.orig.close();\n    }\n    this.onImageDeleted?.(id);\n  }\n\n  /**\n   * Wipe canvas and images on alternate buffer.\n   */\n  public wipeAlternate(): void {\n    // remove all alternate tagged images\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.bufferType === 'alternate') {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n    // mark canvas to be wiped on next render\n    this._needsFullClear = true;\n    this._fullyCleared = false;\n  }\n\n  /**\n   * Delete an image by its internal storage ID.\n   * Used by protocols that support explicit deletion (e.g. Kitty a=d).\n   */\n  public deleteImage(id: number): void {\n    const spec = this._images.get(id);\n    if (spec) {\n      spec.marker?.dispose();\n      this._delImg(id);\n    }\n  }\n\n  /**\n   * Method to add an image to the storage.\n   * @param img - The image to add (canvas or bitmap).\n   * @param opts - Options for addImage:\n   *   - scrolling:  When true, cursor advances with the image.\n   *                 When false, image is placed at ORIGIN and cursor does not move.\n   *   - layer:      Which canvas layer to render on ('top' or 'bottom').\n   *   - zIndex:     Z-index for image layering within the same layer.\n   *   - cursorPos:  'vt340' for bottom-left, 'iip' for bottom.right.\n   * @returns The internal image ID assigned to the stored image.\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap, opts: IAddImageOpts): number {\n    // never allow storage to exceed memory limit\n    this._evictOldest(img.width * img.height);\n\n    // calc rows x cols needed to display the image\n    let cellSize = this._renderer.cellSize;\n    if (cellSize.width === -1 || cellSize.height === -1) {\n      cellSize = CELL_SIZE_DEFAULT;\n    }\n    const cols = Math.ceil(img.width / cellSize.width);\n    const rows = Math.ceil(img.height / cellSize.height);\n\n    const imageId = ++this._lastId;\n\n    const buffer = this._terminal._core.buffer;\n    const termCols = this._terminal.cols;\n    const termRows = this._terminal.rows;\n    const originX = buffer.x;\n    const originY = buffer.y;\n    let offset = originX;\n    let tileCount = 0;\n\n    if (!opts.scrolling) {\n      buffer.x = 0;\n      buffer.y = 0;\n      offset = 0;\n    }\n\n    this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);\n    for (let row = 0; row < rows; ++row) {\n      const line = buffer.lines.get(buffer.y + buffer.ybase);\n      for (let col = 0; col < cols; ++col) {\n        if (offset + col >= termCols) break;\n        this._writeToCell(line as IBufferLineExt, offset + col, imageId, row * cols + col);\n        tileCount++;\n      }\n      if (opts.scrolling) {\n        if (row < rows - 1) this._terminal._core._inputHandler.lineFeed();\n      } else {\n        if (++buffer.y >= termRows) break;\n      }\n      buffer.x = offset;\n    }\n    this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);\n\n    // cursor positioning modes\n    if (opts.scrolling) {\n      if (opts.cursorPos === 'iip') {\n        buffer.x = Math.min(offset + cols, termCols);\n      } else {\n        buffer.x = offset;\n      }\n    } else {\n      buffer.x = originX;\n      buffer.y = originY;\n    }\n\n    // deleted images with zero tile count\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.tileCount < 1) {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n\n    // eviction marker:\n    // delete the image when the marker gets disposed\n    const endMarker = this._terminal.registerMarker(0);\n    endMarker?.onDispose(() => {\n      const spec = this._images.get(imageId);\n      if (spec) {\n        this._delImg(imageId);\n      }\n    });\n\n    // since markers do not work on alternate for some reason,\n    // we evict images here manually\n    if (this._terminal.buffer.active.type === 'alternate') {\n      this._evictOnAlternate();\n    }\n\n    // create storage entry\n    const imgSpec: IImageSpec = {\n      orig: img,\n      origCellSize: cellSize,\n      actual: img,\n      actualCellSize: { ...cellSize },  // clone needed, since later modified\n      marker: endMarker || undefined,\n      tileCount,\n      bufferType: this._terminal.buffer.active.type,\n      layer: opts.layer,\n      zIndex: opts.zIndex\n    };\n\n    // finally add the image\n    this._images.set(imageId, imgSpec);\n    this.onImageAdded?.();\n    return imageId;\n  }\n\n\n  /**\n   * Render method. Collects buffer information and triggers\n   * canvas updates.\n   */\n  // TODO: Should we move this to the ImageRenderer?\n  public render(range: { start: number, end: number }): void {\n    // Determine which layers have images\n    let hasTopImages = false;\n    let hasBottomImages = false;\n    for (const spec of this._images.values()) {\n      if (spec.layer === 'bottom') {\n        hasBottomImages = true;\n      } else {\n        hasTopImages = true;\n      }\n      if (hasTopImages && hasBottomImages) break;\n    }\n\n    // Lazily insert layers that are needed\n    if (hasTopImages && !this._renderer.hasLayer('top')) {\n      this._renderer.insertLayerToDom('top');\n      if (!this._renderer.hasLayer('top')) return;\n    }\n    if (hasBottomImages && !this._renderer.hasLayer('bottom')) {\n      this._renderer.insertLayerToDom('bottom');\n    }\n\n    // rescale if needed\n    this._renderer.rescaleCanvas();\n\n    // exit early if we dont have any images to test for\n    if (!this._images.size) {\n      if (!this._fullyCleared) {\n        this._renderer.clearAll();\n        this._fullyCleared = true;\n        this._needsFullClear = false;\n      }\n      if (this._renderer.hasLayer('top')) {\n        this._renderer.removeLayerFromDom('top');\n      }\n      if (this._renderer.hasLayer('bottom')) {\n        this._renderer.removeLayerFromDom('bottom');\n      }\n      return;\n    }\n\n    // Remove layers no longer needed\n    if (!hasTopImages && this._renderer.hasLayer('top')) {\n      this._renderer.clearAll('top');\n      this._renderer.removeLayerFromDom('top');\n    }\n    if (!hasBottomImages && this._renderer.hasLayer('bottom')) {\n      this._renderer.clearAll('bottom');\n      this._renderer.removeLayerFromDom('bottom');\n    }\n\n    // buffer switches force a full clear\n    if (this._needsFullClear) {\n      this._renderer.clearAll();\n      this._fullyCleared = true;\n      this._needsFullClear = false;\n    }\n\n    const { start, end } = range;\n    const buffer = this._terminal._core.buffer;\n    const cols = this._terminal._core.cols;\n\n    // clear drawing area\n    this._renderer.clearLines(start, end);\n\n    // Collect draw calls so we can sort by z-index (lower z drawn first).\n    const drawCalls: { imgSpec: IImageSpec, tileId: number, col: number, row: number, count: number }[] = [];\n    const placeholderCalls: { col: number, row: number, count: number }[] = [];\n\n    // walk all cells in viewport and collect tiles found\n    for (let row = start; row <= end; ++row) {\n      const line = buffer.lines.get(row + buffer.ydisp) as IBufferLineExt;\n      if (!line) return;\n      for (let col = 0; col < cols; ++col) {\n        if (line.getBg(col) & BgFlags.HAS_EXTENDED) {\n          let e: IExtendedAttrsImage = line._extendedAttrs[col] ?? EMPTY_ATTRS;\n          const imageId = e.imageId;\n          if (imageId === undefined || imageId === -1) {\n            continue;\n          }\n          const imgSpec = this._images.get(imageId);\n          if (e.tileId !== -1) {\n            const startTile = e.tileId;\n            const startCol = col;\n            let count = 1;\n            /**\n             * merge tiles to the right into a single draw call, if:\n             * - not at end of line\n             * - cell has same image id\n             * - cell has consecutive tile id\n             */\n            while (\n              ++col < cols\n              && (line.getBg(col) & BgFlags.HAS_EXTENDED)\n              && (e = line._extendedAttrs[col] ?? EMPTY_ATTRS)\n              && (e.imageId === imageId)\n              && (e.tileId === startTile + count)\n            ) {\n              count++;\n            }\n            col--;\n            if (imgSpec) {\n              if (imgSpec.actual) {\n                drawCalls.push({ imgSpec, tileId: startTile, col: startCol, row, count });\n              }\n            } else if (this._opts.showPlaceholder) {\n              placeholderCalls.push({ col: startCol, row, count });\n            }\n            this._fullyCleared = false;\n          }\n        }\n      }\n    }\n\n    // Sort by z-index so lower z draws first (higher z renders on top)\n    drawCalls.sort((a, b) => a.imgSpec.zIndex - b.imgSpec.zIndex);\n\n    // Draw placeholders first (lowest priority)\n    for (const call of placeholderCalls) {\n      this._renderer.drawPlaceholder(call.col, call.row, call.count);\n    }\n\n    // Draw images in z-index order\n    for (const call of drawCalls) {\n      this._renderer.draw(call.imgSpec, call.tileId, call.col, call.row, call.count);\n    }\n  }\n\n  public viewportResize(metrics: { cols: number, rows: number }): void {\n    // exit early if we have nothing in storage\n    if (!this._images.size) {\n      this._viewportMetrics = metrics;\n      return;\n    }\n\n    // handle only viewport width enlargements, exit all other cases\n    // TODO: needs patch for tile counter\n    if (this._viewportMetrics.cols >= metrics.cols) {\n      this._viewportMetrics = metrics;\n      return;\n    }\n\n    // walk scrollbuffer at old col width to find all possible expansion matches\n    const buffer = this._terminal._core.buffer;\n    const rows = buffer.lines.length;\n    const oldCol = this._viewportMetrics.cols - 1;\n    for (let row = 0; row < rows; ++row) {\n      const line = buffer.lines.get(row) as IBufferLineExt;\n      if (line.getBg(oldCol) & BgFlags.HAS_EXTENDED) {\n        const e: IExtendedAttrsImage = line._extendedAttrs[oldCol] ?? EMPTY_ATTRS;\n        const imageId = e.imageId;\n        if (imageId === undefined || imageId === -1) {\n          continue;\n        }\n        const imgSpec = this._images.get(imageId);\n        if (!imgSpec) {\n          continue;\n        }\n        // found an image tile at oldCol, check if it qualifies for right exapansion\n        const tilesPerRow = Math.ceil((imgSpec.actual?.width || 0) / imgSpec.actualCellSize.width);\n        if ((e.tileId % tilesPerRow) + 1 >= tilesPerRow) {\n          continue;\n        }\n        // expand only if right side is empty (nothing got wrapped from below)\n        let hasData = false;\n        for (let rightCol = oldCol + 1; rightCol > metrics.cols; ++rightCol) {\n          if (line._data[rightCol * Cell.SIZE + Cell.CONTENT] & Content.HAS_CONTENT_MASK) {\n            hasData = true;\n            break;\n          }\n        }\n        if (hasData) {\n          continue;\n        }\n        // do right expansion on terminal buffer\n        const end = Math.min(metrics.cols, tilesPerRow - (e.tileId % tilesPerRow) + oldCol);\n        let lastTile = e.tileId;\n        for (let expandCol = oldCol + 1; expandCol < end; ++expandCol) {\n          this._writeToCell(line as IBufferLineExt, expandCol, imageId, ++lastTile);\n          imgSpec.tileCount++;\n        }\n      }\n    }\n    // store new viewport metrics\n    this._viewportMetrics = metrics;\n  }\n\n  /**\n   * Retrieve original canvas at buffer position.\n   */\n  public getImageAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    const buffer = this._terminal._core.buffer;\n    const line = buffer.lines.get(y) as IBufferLineExt;\n    if (line && line.getBg(x) & BgFlags.HAS_EXTENDED) {\n      const e: IExtendedAttrsImage = line._extendedAttrs[x] ?? EMPTY_ATTRS;\n      if (e.imageId && e.imageId !== -1) {\n        const orig = this._images.get(e.imageId)?.orig;\n        if (window.ImageBitmap && orig instanceof ImageBitmap) {\n          const canvas = ImageRenderer.createCanvas(window.document, orig.width, orig.height);\n          canvas.getContext('2d')?.drawImage(orig, 0, 0, orig.width, orig.height);\n          return canvas;\n        }\n        return orig as HTMLCanvasElement;\n      }\n    }\n  }\n\n  /**\n   * Extract active single tile at buffer position.\n   */\n  public extractTileAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    const buffer = this._terminal._core.buffer;\n    const line = buffer.lines.get(y) as IBufferLineExt;\n    if (line && line.getBg(x) & BgFlags.HAS_EXTENDED) {\n      const e: IExtendedAttrsImage = line._extendedAttrs[x] ?? EMPTY_ATTRS;\n      if (e.imageId && e.imageId !== -1 && e.tileId !== -1) {\n        const spec = this._images.get(e.imageId);\n        if (spec) {\n          return this._renderer.extractTile(spec, e.tileId);\n        }\n      }\n    }\n  }\n\n  // TODO: Do we need some blob offloading tricks here to avoid early eviction?\n  // also see https://stackoverflow.com/questions/28307789/is-there-any-limitation-on-javascript-max-blob-size\n  private _evictOldest(room: number): number {\n    const used = this._getStoredPixels();\n    let current = used;\n    while (this._pixelLimit < current + room && this._images.size) {\n      const spec = this._images.get(++this._lowestId);\n      if (spec && spec.orig) {\n        current -= spec.orig.width * spec.orig.height;\n        if (spec.actual && spec.orig !== spec.actual) {\n          current -= spec.actual.width * spec.actual.height;\n        }\n        spec.marker?.dispose();\n        this._delImg(this._lowestId);\n      }\n    }\n    return used - current;\n  }\n\n  private _writeToCell(line: IBufferLineExt, x: number, imageId: number, tileId: number): void {\n    if (line._data[x * Cell.SIZE + Cell.BG] & BgFlags.HAS_EXTENDED) {\n      const old = line._extendedAttrs[x];\n      if (old) {\n        if (old.imageId !== undefined) {\n          // found an old ExtendedAttrsImage, since we know that\n          // they are always isolated instances (single cell usage),\n          // we can re-use it and just update their id entries\n          const oldSpec = this._images.get(old.imageId);\n          if (oldSpec) {\n            // early eviction for in-viewport overwrites\n            oldSpec.tileCount--;\n          }\n          old.imageId = imageId;\n          old.tileId = tileId;\n          return;\n        }\n        // found a plain ExtendedAttrs instance, clone it to new entry\n        line._extendedAttrs[x] = new ExtendedAttrsImage(old.ext, old.urlId, imageId, tileId);\n        return;\n      }\n    }\n    // fall-through: always create new ExtendedAttrsImage entry\n    line._data[x * Cell.SIZE + Cell.BG] |= BgFlags.HAS_EXTENDED;\n    line._extendedAttrs[x] = new ExtendedAttrsImage(0, 0, imageId, tileId);\n  }\n\n  private _evictOnAlternate(): void {\n    // nullify tile count of all images on alternate buffer\n    for (const spec of this._images.values()) {\n      if (spec.bufferType === 'alternate') {\n        spec.tileCount = 0;\n      }\n    }\n    // re-count tiles on whole buffer\n    const buffer = this._terminal._core.buffer;\n    for (let y = 0; y < this._terminal.rows; ++y) {\n      const line = buffer.lines.get(y) as IBufferLineExt;\n      if (!line) {\n        continue;\n      }\n      for (let x = 0; x < this._terminal.cols; ++x) {\n        if (line._data[x * Cell.SIZE + Cell.BG] & BgFlags.HAS_EXTENDED) {\n          const imgId = line._extendedAttrs[x]?.imageId;\n          if (imgId) {\n            const spec = this._images.get(imgId);\n            if (spec) {\n              spec.tileCount++;\n            }\n          }\n        }\n      }\n    }\n    // deleted images with zero tile count\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.bufferType === 'alternate' && !spec.tileCount) {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n  }\n}\n","/**\n * Copyright (c) 2020, 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { SixelImageStorage } from './SixelImageStorage';\nimport { IDcsHandler, IParams, IImageAddonOptions, ITerminalExt, AttributeData, IResetHandler, ReadonlyColorSet } from './Types';\nimport { toRGBA8888, BIG_ENDIAN, PALETTE_ANSI_256, PALETTE_VT340_COLOR } from 'sixel/lib/Colors';\nimport { RGBA8888 } from 'sixel/lib/Types';\nimport { ImageRenderer } from './ImageRenderer';\n\nimport { DecoderAsync, Decoder } from 'sixel/lib/Decoder';\n\n// always free decoder ressources after decoding if it exceeds this limit\nconst MEM_PERMA_LIMIT = 4194304; // 1024 pixels * 1024 pixels * 4 channels = 4MB\n\n// custom default palette: VT340 (lower 16 colors) + ANSI256 (up to 256) + zeroed (up to 4096)\nconst DEFAULT_PALETTE = PALETTE_ANSI_256;\nDEFAULT_PALETTE.set(PALETTE_VT340_COLOR);\n\n\nexport class SixelHandler implements IDcsHandler, IResetHandler {\n  private _size = 0;\n  private _aborted = false;\n  private _dec: Decoder | undefined;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _storage: SixelImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    DecoderAsync({\n      memoryLimit: this._opts.pixelLimit * 4,\n      palette: DEFAULT_PALETTE,\n      paletteLimit: this._opts.sixelPaletteLimit\n    }).then(d => this._dec = d);\n  }\n\n  public reset(): void {\n    /**\n     * reset sixel decoder to defaults:\n     * - release all memory\n     * - nullify palette (4096)\n     * - apply default palette (256)\n     */\n    if (this._dec) {\n      this._dec.release();\n      // FIXME: missing interface on decoder to nullify full palette\n      (this._dec as any)._palette.fill(0);\n      this._dec.init(0, DEFAULT_PALETTE, this._opts.sixelPaletteLimit);\n    }\n  }\n\n  public hook(params: IParams): void {\n    this._size = 0;\n    this._aborted = false;\n    if (this._dec) {\n      const fillColor = params.params[1] === 1 ? 0 : extractActiveBg(\n        this._coreTerminal._core._inputHandler._curAttrData,\n        this._coreTerminal._core._themeService?.colors);\n      this._dec.init(fillColor, null, this._opts.sixelPaletteLimit);\n    }\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted || !this._dec) {\n      return;\n    }\n    this._size += end - start;\n    if (this._size > this._opts.sixelSizeLimit) {\n      console.warn(`SIXEL: too much data, aborting`);\n      this._aborted = true;\n      this._dec.release();\n      return;\n    }\n    try {\n      this._dec.decode(data, start, end);\n    } catch (e) {\n      console.warn(`SIXEL: error while decoding image - ${e}`);\n      this._aborted = true;\n      this._dec.release();\n    }\n  }\n\n  public unhook(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted || !success || !this._dec) {\n      return true;\n    }\n\n    const width = this._dec.width;\n    const height = this._dec.height;\n\n    // partial fix for https://github.com/jerch/xterm-addon-image/issues/37\n    if (!width || !height) {\n      if (height) {\n        this._storage.advanceCursor(height);\n      }\n      return true;\n    }\n\n    const canvas = ImageRenderer.createCanvas(undefined, width, height);\n    canvas.getContext('2d')?.putImageData(new ImageData(this._dec.data8 as Uint8ClampedArray<ArrayBuffer>, width, height), 0, 0);\n    if (this._dec.memoryUsage > MEM_PERMA_LIMIT) {\n      this._dec.release();\n    }\n    this._storage.addImage(canvas);\n    return true;\n  }\n}\n\n\n/**\n * Some helpers to extract current terminal colors.\n */\n\n// get currently active background color from terminal\n// also respect INVERSE setting\nfunction extractActiveBg(attr: AttributeData, colors: ReadonlyColorSet | undefined): RGBA8888 {\n  let bg = 0;\n  if (!colors) {\n    // FIXME: theme service is prolly not available yet,\n    // happens if .open() was not called yet (bug in core?)\n    return bg;\n  }\n  if (attr.isInverse()) {\n    if (attr.isFgDefault()) {\n      bg = convertLe(colors.foreground.rgba);\n    } else if (attr.isFgRGB()) {\n      const t = (attr.constructor as typeof AttributeData).toColorRGB(attr.getFgColor());\n      bg = toRGBA8888(...t);\n    } else {\n      bg = convertLe(colors.ansi[attr.getFgColor()].rgba);\n    }\n  } else {\n    if (attr.isBgDefault()) {\n      bg = convertLe(colors.background.rgba);\n    } else if (attr.isBgRGB()) {\n      const t = (attr.constructor as typeof AttributeData).toColorRGB(attr.getBgColor());\n      bg = toRGBA8888(...t);\n    } else {\n      bg = convertLe(colors.ansi[attr.getBgColor()].rgba);\n    }\n  }\n  return bg;\n}\n\n// rgba values on the color managers are always in BE, thus convert to LE\nfunction convertLe(color: number): RGBA8888 {\n  if (BIG_ENDIAN) return color;\n  return (color & 0xFF) << 24 | (color >>> 8 & 0xFF) << 16 | (color >>> 16 & 0xFF) << 8 | color >>> 24 & 0xFF;\n}\n","/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';\nimport { IImageAddonOptions, ITerminalExt, IAddImageOpts } from './Types';\nimport { ImageRenderer } from './ImageRenderer';\n\n/**\n * Sixel-specific image storage controller.\n *\n * Wraps the shared ImageStorage with sixel protocol semantics:\n * - Cursor behavior governed by DECSET 80 (sixelScrolling option)\n * - advanceCursor for empty sixels carrying only height\n */\nexport class SixelImageStorage {\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'vt340' };\n  constructor(\n    private readonly _storage: ImageStorage,\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _terminal: ITerminalExt\n  ) {}\n\n  /**\n   * Add a sixel image to storage.\n   * Cursor behavior depends on the sixelScrolling option (DECSET 80).\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap): void {\n    this._addImageOpts.scrolling = this._opts.sixelScrolling;\n    this._storage.addImage(img, this._addImageOpts);\n  }\n\n  /**\n   * Only advance text cursor.\n   * This is an edge case from empty sixels carrying only a height but no pixels.\n   * Partially fixes https://github.com/jerch/xterm-addon-image/issues/37.\n   */\n  public advanceCursor(height: number): void {\n    if (this._opts.sixelScrolling) {\n      let cellSize = this._renderer.cellSize;\n      if (cellSize.width === -1 || cellSize.height === -1) {\n        cellSize = CELL_SIZE_DEFAULT;\n      }\n      const rows = Math.ceil(height / cellSize.height);\n      for (let i = 1; i < rows; ++i) {\n        this._terminal._core._inputHandler.lineFeed();\n      }\n    }\n  }\n}\n","/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { IApcHandler, IImageAddonOptions, IResetHandler, ITerminalExt, ImageLayer } from '../Types';\nimport { ImageRenderer } from '../ImageRenderer';\nimport { CELL_SIZE_DEFAULT } from '../ImageStorage';\nimport { KittyImageStorage } from './KittyImageStorage';\nimport Base64Decoder, { type DecodeStatus } from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\nimport {\n  KittyAction,\n  KittyFormat,\n  KittyCompression,\n  IKittyCommand,\n  IPendingTransmission,\n  IKittyImageData,\n  KittyPixelConstants,\n  parseKittyCommand\n} from './KittyGraphicsTypes';\n\nconst enum Constants {\n  // Memory limit for base64 decoder (4MB, same as IIPHandler)\n  DECODER_KEEP_DATA = 4194304,\n  DECODER_INITIAL_DATA = 4194304, // 4MB\n  // Local mirror of const enum (esbuild can't inline const enums from external packages)\n  DECODER_OK = 0,\n  // Maximum control data size\n  MAX_CONTROL_DATA_SIZE = 512,\n  // Semicolon codepoint\n  SEMICOLON = 0x3B\n}\n\nconst DECODER_OK = Constants.DECODER_OK as unknown as DecodeStatus.OK;\n\n// Kitty graphics protocol handler with streaming base64 decoding.\nexport class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDisposable {\n  private _aborted = false;\n  private _decodeError = false;\n\n  private _activeDecoder: Base64Decoder | null = null;\n  private readonly _maxEncodedBytes: number;\n  private readonly _initialEncodedBytes: number;\n\n  // Streaming related states\n\n  // True while receiving control data (before semicolon).\n  private _inControlData = true;\n\n  // Buffer for control data.\n  private _controlData = new Uint32Array(Constants.MAX_CONTROL_DATA_SIZE);\n  private _controlLength = 0;\n\n  // Pre-calculated encoded size limit\n  private _encodedSizeLimit = 0;\n  private _totalEncodedSize = 0;\n\n  // Parsed command. These are the control data before semicolon.\n  private _parsedCommand: IKittyCommand | null = null;\n\n  // Storage related states\n\n  private _pendingTransmissions: Map<number, IPendingTransmission> = new Map();\n  // Tracks the pending key of the most recently started chunked upload.\n  // Per spec, subsequent chunks only need m= (and optionally q=), without i=.\n  // When a chunk arrives with no i=, this key is used to find the pending upload.\n  private _lastPendingKey: number | undefined;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _kittyStorage: KittyImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    // Convert decoded size limit -> max encoded bytes.\n    this._maxEncodedBytes = Math.ceil(this._opts.kittySizeLimit * 4 / 3);\n    // ensure we preallocate more than configured limit while using 4mb initial size.\n    this._initialEncodedBytes = Math.min(Constants.DECODER_INITIAL_DATA, this._maxEncodedBytes);\n  }\n\n  public reset(): void {\n    this._cleanupAllPending();\n    if (this._activeDecoder) {\n      this._activeDecoder.release();\n      this._activeDecoder = null;\n    }\n    this._kittyStorage.reset();\n  }\n\n  public dispose(): void {\n    this.reset();\n  }\n\n  private _removePendingEntry(key: number): void {\n    this._pendingTransmissions.delete(key);\n    if (this._lastPendingKey === key) {\n      this._lastPendingKey = undefined;\n    }\n  }\n\n  private _cleanupAllPending(): void {\n    for (const pending of this._pendingTransmissions.values()) {\n      pending.decoder.release();\n    }\n    this._pendingTransmissions.clear();\n    this._lastPendingKey = undefined;\n  }\n\n  public start(): void {\n    this._aborted = false;\n    this._decodeError = false;\n    this._inControlData = true;\n    this._controlLength = 0;\n    this._parsedCommand = null;\n    // Pre-calculate encoded limit once: base64 is 4 bytes encoded → 3 bytes decoded\n    this._encodedSizeLimit = this._maxEncodedBytes;\n    this._totalEncodedSize = 0;\n    this._activeDecoder = null;\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    if (!this._inControlData) {\n      this._streamPayload(data, start, end);\n    } else {\n      // Scan for semicolon\n      let controlEnd = end;\n      for (let i = start; i < end; i++) {\n        if (data[i] === Constants.SEMICOLON) {\n          this._inControlData = false;\n          controlEnd = i;\n          break;\n        }\n      }\n\n      // Copy control data\n      const copyLength = controlEnd - start;\n      if (this._controlLength + copyLength > Constants.MAX_CONTROL_DATA_SIZE) {\n        this._aborted = true;\n        return;\n      }\n      this._controlData.set(data.subarray(start, controlEnd), this._controlLength);\n      this._controlLength += copyLength;\n\n      if (!this._inControlData) {\n        // Found semicolon - parse control data early for validation\n        this._parsedCommand = parseKittyCommand(this._parseControlDataString());\n\n        // Early validation: i+I conflict\n        if (this._parsedCommand.id !== undefined && this._parsedCommand.imageNumber !== undefined) {\n          this._sendResponse(this._parsedCommand.id, 'EINVAL:cannot specify both i and I keys', this._parsedCommand.quiet ?? 0);\n          this._aborted = true;\n          return;\n        }\n\n        // Delete action doesn't need payload - skip streaming\n        if (this._parsedCommand.action === KittyAction.DELETE) {\n          return;\n        }\n\n        // Stream remaining as payload\n        const payloadStart = controlEnd + 1;\n        if (payloadStart < end) {\n          this._streamPayload(data, payloadStart, end);\n        }\n      }\n    }\n  }\n\n  // Stream payload bytes into the base64 decoder.\n  private _streamPayload(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    // Check size limit (compare encoded bytes against pre-calculated limit)\n    // Include cumulative size from pending transmission for multi-chunk images.\n    // Per spec, subsequent chunks may omit i=, so fall back to _lastPendingKey.\n    const pendingKey = this._parsedCommand?.id ?? this._lastPendingKey ?? 0;\n    const pending = this._pendingTransmissions.get(pendingKey);\n    const previousEncodedSize = pending?.totalEncodedSize ?? 0;\n    this._totalEncodedSize += end - start;\n    const cumulativeEncodedSize = previousEncodedSize + this._totalEncodedSize;\n    if (cumulativeEncodedSize > this._encodedSizeLimit) {\n      const decoderToRelease = this._activeDecoder ?? pending?.decoder;\n      if (decoderToRelease) {\n        decoderToRelease.release();\n      }\n      this._activeDecoder = null;\n      if (pending) {\n        this._removePendingEntry(pendingKey);\n      }\n      this._aborted = true;\n      return;\n    }\n\n    if (this._decodeError) return;\n\n    if (pending?.decoder && !this._activeDecoder) {\n      this._activeDecoder = pending.decoder;\n    }\n    if (!this._activeDecoder) {\n      this._activeDecoder = new Base64Decoder(Constants.DECODER_KEEP_DATA, this._maxEncodedBytes, this._initialEncodedBytes);\n      this._activeDecoder.init();\n    }\n\n    if (this._activeDecoder.put(data.subarray(start, end)) !== DECODER_OK) {\n      this._activeDecoder.release();\n      this._activeDecoder = null;\n      this._decodeError = true;\n      if (pending) {\n        this._removePendingEntry(pendingKey);\n      }\n    }\n  }\n\n  public end(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted || !success) {\n      if (this._activeDecoder) {\n        this._activeDecoder.release();\n        this._activeDecoder = null;\n      }\n      return true;\n    }\n\n    // No semicolon = no payload (delete, capability query)\n    if (this._inControlData) {\n      return this._handleNoPayloadCommand();\n    }\n\n    // Use command parsed early in put() - i+I already validated there\n    const cmd = this._parsedCommand!;\n\n    // Delete action was handled by skipping payload - just execute\n    if (cmd.action === KittyAction.DELETE) {\n      return this._handleDelete(cmd);\n    }\n\n    // Per spec, subsequent chunks may omit i=, so fall back to _lastPendingKey.\n    const pendingKey = cmd.id ?? this._lastPendingKey ?? 0;\n    const isMoreComing = cmd.more === 1;\n    const pending = this._pendingTransmissions.get(pendingKey);\n\n    if (isMoreComing) {\n      if (this._activeDecoder) {\n        if (pending) {\n          pending.totalEncodedSize += this._totalEncodedSize;\n          pending.decodeError = pending.decodeError || this._decodeError;\n        } else {\n          this._pendingTransmissions.set(pendingKey, {\n            cmd: { ...cmd },\n            decoder: this._activeDecoder,\n            totalEncodedSize: this._totalEncodedSize,\n            decodeError: this._decodeError\n          });\n        }\n        this._lastPendingKey = pendingKey;\n        this._activeDecoder = null;\n      }\n      return true;\n    }\n\n    // Final chunk received — clear the last pending key\n    if (pending) {\n      this._lastPendingKey = undefined;\n    }\n\n    let decodeError = this._decodeError;\n    let finalCmd = cmd;\n    let decoder = this._activeDecoder;\n\n    if (pending) {\n      finalCmd = pending.cmd;\n      decoder = pending.decoder;\n      decodeError = decodeError || pending.decodeError;\n      this._pendingTransmissions.delete(pendingKey);\n    }\n\n    let imageBytes = new Uint8Array(0);\n    if (decoder) {\n      if (decoder.end() !== DECODER_OK) {\n        decodeError = true;\n      }\n      imageBytes = decoder.data8;\n    }\n    this._activeDecoder = null;\n\n    // Handle command first — handlers create Blob/ImageData from imageBytes,\n    // which copies the data. Only then is it safe to release the decoder's\n    // wasm memory that imageBytes points into.\n    const result = this._handleCommandWithBytesAndCmd(finalCmd, imageBytes, decodeError);\n    if (decoder) {\n      decoder.release();\n    }\n    return result;\n  }\n\n  // Command handling\n\n  private _parseControlDataString(): string {\n    let str = '';\n    for (let i = 0; i < this._controlLength; i++) {\n      str += String.fromCodePoint(this._controlData[i]);\n    }\n    return str;\n  }\n\n  private _handleNoPayloadCommand(): boolean | Promise<boolean> {\n    const cmd = parseKittyCommand(this._parseControlDataString());\n\n    // Per spec: specifying both i and I is an error\n    if (cmd.id !== undefined && cmd.imageNumber !== undefined) {\n      this._sendResponse(cmd.id, 'EINVAL:cannot specify both i and I keys', cmd.quiet ?? 0);\n      return true;\n    }\n\n    const action = cmd.action ?? 't';\n\n    switch (action) {\n      case KittyAction.DELETE:\n        return this._handleDelete(cmd);\n      case KittyAction.QUERY:\n        this._sendResponse(cmd.id ?? 0, 'OK', cmd.quiet ?? 0);\n        return true;\n      case KittyAction.PLACEMENT:\n        return this._handlePlacement(cmd);\n      default:\n        // TODO: Implement remaining actions when needed:\n        // - a=f (frame): animation frame operations\n        // - a=a (animation): animation control\n        // - a=c (compose): compose images\n        if (cmd.id !== undefined) {\n          this._sendResponse(cmd.id, 'EINVAL:unsupported action', cmd.quiet ?? 0);\n        }\n        return true;\n    }\n  }\n\n  private _handleCommandWithBytesAndCmd(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean | Promise<boolean> {\n    const action = cmd.action ?? 't';\n\n    switch (action) {\n      case KittyAction.TRANSMIT: {\n        const result = this._handleTransmit(cmd, bytes, decodeError);\n        // Only send response when _handleTransmit didn't already respond\n        // (it handles unsupported transmission medium responses internally)\n        if ((cmd.transmission ?? 'd') === 'd' && cmd.id !== undefined) {\n          if (decodeError) {\n            this._sendResponse(cmd.id, 'EINVAL:invalid base64 data', cmd.quiet ?? 0);\n          } else if (bytes.length > 0) {\n            this._sendResponse(cmd.id, 'OK', cmd.quiet ?? 0);\n          }\n        }\n        return result;\n      }\n      case KittyAction.TRANSMIT_DISPLAY:\n        return this._handleTransmitDisplay(cmd, bytes, decodeError);\n      case KittyAction.QUERY:\n        return this._handleQuery(cmd, bytes, decodeError);\n      case KittyAction.PLACEMENT:\n        // a=p ignores any payload — image data was already transmitted\n        return this._handlePlacement(cmd);\n      default:\n        // TODO: Implement remaining actions when needed:\n        // - a=f (frame): animation frame operations\n        // - a=a (animation): animation control\n        // - a=c (compose): compose images\n        if (cmd.id !== undefined) {\n          this._sendResponse(cmd.id, 'EINVAL:unsupported action', cmd.quiet ?? 0);\n        }\n        return true;\n    }\n  }\n\n  private _handlePlacement(cmd: IKittyCommand): boolean | Promise<boolean> {\n    if (cmd.id === undefined) {\n      return true;\n    }\n    const id = cmd.id;\n    const image = this._kittyStorage.getImage(id);\n    if (!image) {\n      this._sendResponse(id, 'ENOENT:image not found', cmd.quiet ?? 0, cmd.placementId);\n      return true;\n    }\n    const result = this._displayImage(image, cmd);\n    return result.then(success => {\n      this._sendResponse(id, success ? 'OK' : 'EINVAL:image rendering failed', cmd.quiet ?? 0, cmd.placementId);\n      return true;\n    });\n  }\n\n  private _handleTransmit(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean {\n    // TODO: Support file-based transmission modes (t=f, t=t, t=s)\n    // Currently only supports direct transmission (t=d, the default).\n    // - t=f (file): Payload is base64-encoded file path. Terminal reads image from that path.\n    // - t=t (temp file): Payload is base64-encoded path in temp directory. Terminal reads, deletes.\n    // - t=s: Payload is base64-encoded POSIX shm name. Terminal reads from shared memory.\n    // These modes require filesystem/IPC access not available in browsers. For Node.js/Electron:\n    // 1. Check cmd.transmission (t key) before treating bytes as image data\n    // 2. For t=f/t/s: decode bytes as UTF-8 string (the path/name), then read file contents\n    // 3. For t=d: treat bytes as image data (current behavior)\n    // When implementing, also update _handleQuery to accept these transmission mediums.\n    const transmission = cmd.transmission ?? 'd';\n    if (transmission !== 'd') {\n      if (cmd.id !== undefined) {\n        this._sendResponse(cmd.id, 'EINVAL:unsupported transmission medium', cmd.quiet ?? 0);\n      }\n      return true;\n    }\n\n    if (decodeError || bytes.length === 0) return true;\n\n    this._kittyStorage.storeImage(cmd.id, {\n      data: new Blob([bytes as BlobPart]),\n      width: cmd.width ?? 0,\n      height: cmd.height ?? 0,\n      format: (cmd.format ?? KittyFormat.RGBA) as 24 | 32 | 100,\n      compression: cmd.compression ?? ''\n    });\n    return true;\n  }\n\n  private _handleTransmitDisplay(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean | Promise<boolean> {\n    if (decodeError) {\n      if (cmd.id !== undefined) {\n        this._sendResponse(cmd.id, 'EINVAL:invalid base64 data', cmd.quiet ?? 0);\n      }\n      return true;\n    }\n\n    this._handleTransmit(cmd, bytes, decodeError);\n\n    const id = cmd.id ?? this._kittyStorage.lastImageId;\n    const image = this._kittyStorage.getImage(id);\n    if (image) {\n      const result = this._displayImage(image, cmd);\n      if (cmd.id !== undefined) {\n        return result.then(success => {\n          this._sendResponse(id, success ? 'OK' : 'EINVAL:image rendering failed', cmd.quiet ?? 0);\n          return true;\n        });\n      }\n      return result.then(() => true);\n    }\n    return true;\n  }\n\n  private _handleQuery(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean {\n    const id = cmd.id ?? 0;\n    const quiet = cmd.quiet ?? 0;\n\n    // Per spec: reject unsupported transmission mediums (only t=d is supported atm)\n    // TODO: When filesystem support is added (Node.js/Electron), update this to accept\n    // t=f (file), t=t (temp file), and t=s (shared memory) and respond OK for queries.\n    const transmission = cmd.transmission ?? 'd';\n    if (transmission !== 'd') {\n      this._sendResponse(id, 'EINVAL:unsupported transmission medium', quiet);\n      return true;\n    }\n\n    // Check decode error first (invalid base64)\n    if (decodeError) {\n      this._sendResponse(id, 'EINVAL:invalid base64 data', quiet);\n      return true;\n    }\n\n    // Capability query (no payload) - just respond OK\n    if (bytes.length === 0) {\n      this._sendResponse(id, 'OK', quiet);\n      return true;\n    }\n\n    const format = cmd.format ?? KittyFormat.RGBA;\n\n    if (format === KittyFormat.PNG) {\n      this._sendResponse(id, 'OK', quiet);\n    } else {\n      const width = cmd.width ?? 0;\n      const height = cmd.height ?? 0;\n\n      if (!width || !height) {\n        this._sendResponse(id, 'EINVAL:width and height required for raw pixel data', quiet);\n        return true;\n      }\n\n      const bytesPerPixel = format === KittyFormat.RGBA ? KittyPixelConstants.BYTES_PER_PIXEL_RGBA : KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n      const expectedBytes = width * height * bytesPerPixel;\n\n      if (bytes.length < expectedBytes) {\n        this._sendResponse(id, `EINVAL:insufficient pixel data`, quiet);\n        return true;\n      }\n\n      this._sendResponse(id, 'OK', quiet);\n    }\n    return true;\n  }\n\n  private _handleDelete(cmd: IKittyCommand): boolean {\n    // Per spec: default delete selector is 'a' (delete all visible placements)\n    const selector = cmd.deleteSelector ?? 'a';\n\n    // TODO: Distinguish lowercase (delete placements only) from uppercase\n    // (delete placements + free stored image data). Currently both variants\n    // free everything since we don't separate stored data from placements.\n    switch (selector) {\n      case 'a':\n      case 'A':\n        this._cleanupAllPending();\n        this._kittyStorage.deleteAll();\n        break;\n      case 'i':\n      case 'I':\n        // TODO: When placement id tracking is implemented (see TODO in\n        // KittyImageStorage), d=i with p=<pid> should delete only that\n        // specific placement, while d=i without p should delete all\n        // placements for the image.\n        if (cmd.id !== undefined) {\n          const pending = this._pendingTransmissions.get(cmd.id);\n          if (pending) {\n            pending.decoder.release();\n          }\n          this._removePendingEntry(cmd.id);\n          this._kittyStorage.deleteById(cmd.id);\n        }\n        break;\n      default:\n        // Unsupported selectors (c, n, p, q, r, x, y, z, f) — ignore for now\n        break;\n    }\n    return true;\n  }\n\n  private _sendResponse(id: number, message: string, quiet: number, placementId?: number): void {\n    const isOk = message === 'OK';\n    if (isOk && quiet >= 1) return;\n    if (!isOk && quiet >= 2) return;\n\n    const pPart = placementId ? `,p=${placementId}` : '';\n    const response = `\\x1b_Gi=${id}${pPart};${message}\\x1b\\\\`;\n    this._coreTerminal._core.coreService.triggerDataEvent(response);\n  }\n\n  // Image display\n\n  private _displayImage(image: IKittyImageData, cmd: IKittyCommand): Promise<boolean> {\n    return this._decodeAndDisplay(image, cmd)\n      .then(() => true)\n      .catch(() => false);\n  }\n\n  private async _decodeAndDisplay(image: IKittyImageData, cmd: IKittyCommand): Promise<void> {\n    let bitmap: ImageBitmap | undefined = await this._createBitmap(image);\n\n    try {\n      const cropX = Math.max(0, cmd.x ?? 0);\n      const cropY = Math.max(0, cmd.y ?? 0);\n      const cropW = cmd.sourceWidth || (bitmap.width - cropX);\n      const cropH = cmd.sourceHeight || (bitmap.height - cropY);\n\n      const maxCropW = Math.max(0, bitmap.width - cropX);\n      const maxCropH = Math.max(0, bitmap.height - cropY);\n      const finalCropW = Math.max(0, Math.min(cropW, maxCropW));\n      const finalCropH = Math.max(0, Math.min(cropH, maxCropH));\n\n      if (finalCropW === 0 || finalCropH === 0) {\n        throw new Error('invalid source rectangle');\n      }\n\n      if (cropX !== 0 || cropY !== 0 || finalCropW !== bitmap.width || finalCropH !== bitmap.height) {\n        const cropped = await createImageBitmap(bitmap, cropX, cropY, finalCropW, finalCropH);\n        bitmap.close();\n        bitmap = cropped;\n      }\n\n      const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;\n      const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;\n\n      // Per spec: c/r default to image's natural cell dimensions.\n      // If only one of c/r is specified, compute the other from image aspect ratio.\n      let imgCols: number;\n      let imgRows: number;\n      if (cmd.columns !== undefined && cmd.rows !== undefined) {\n        imgCols = cmd.columns;\n        imgRows = cmd.rows;\n      } else if (cmd.columns !== undefined) {\n        imgCols = cmd.columns;\n        imgRows = Math.max(1, Math.ceil((bitmap.height / bitmap.width) * (imgCols * cw) / ch));\n      } else if (cmd.rows !== undefined) {\n        imgRows = cmd.rows;\n        imgCols = Math.max(1, Math.ceil((bitmap.width / bitmap.height) * (imgRows * ch) / cw));\n      } else {\n        imgCols = Math.ceil(bitmap.width / cw);\n        imgRows = Math.ceil(bitmap.height / ch);\n      }\n\n      let w = bitmap.width;\n      let h = bitmap.height;\n\n      // Scale bitmap to fit placement rectangle when c/r are specified\n      if (cmd.columns !== undefined || cmd.rows !== undefined) {\n        w = Math.round(imgCols * cw);\n        h = Math.round(imgRows * ch);\n      }\n\n      if (w * h > this._opts.pixelLimit) {\n        throw new Error('image exceeds pixel limit');\n      }\n\n      // Save cursor position before addImage modifies it\n      const buffer = this._coreTerminal._core.buffer;\n      const savedX = buffer.x;\n      const savedY = buffer.y;\n      const savedYbase = buffer.ybase;\n\n      // Determine layer based on z-index: negative = behind text, 0+ = on top.\n      // When z<0 we always use the bottom layer even without allowTransparency —\n      // the image will simply be hidden behind the opaque text background, which\n      // is the correct behavior (client asked for \"behind text\").\n      const wantsBottom = cmd.zIndex !== undefined && cmd.zIndex < 0;\n      const layer: ImageLayer = wantsBottom ? 'bottom' : 'top';\n\n      if (w !== bitmap.width || h !== bitmap.height) {\n        const scaled = await createImageBitmap(bitmap, { resizeWidth: w, resizeHeight: h });\n        bitmap.close();\n        bitmap = scaled;\n      }\n\n      // Per spec: X/Y are pixel offsets within the first cell, so clamp to cell dimensions\n      const xOffset = Math.min(Math.max(0, cmd.xOffset ?? 0), cw - 1);\n      const yOffset = Math.min(Math.max(0, cmd.yOffset ?? 0), ch - 1);\n      if (xOffset !== 0 || yOffset !== 0) {\n        // Per spec: X/Y is not added to c/r area. When c/r are explicit, the\n        // total placement area remains c*cw × r*ch pixels and the offset image\n        // is clipped to fit. When c/r are unset, the padded canvas determines\n        // the natural cell dimensions.\n        const canvasW = (cmd.columns !== undefined) ? Math.round(imgCols * cw) : bitmap.width + xOffset;\n        const canvasH = (cmd.rows !== undefined) ? Math.round(imgRows * ch) : bitmap.height + yOffset;\n        const offsetCanvas = ImageRenderer.createCanvas(window.document, canvasW, canvasH);\n        const offsetCtx = offsetCanvas.getContext('2d');\n        if (!offsetCtx) {\n          throw new Error('Failed to create offset canvas context');\n        }\n        offsetCtx.drawImage(bitmap, xOffset, yOffset);\n\n        const offsetBitmap = await createImageBitmap(offsetCanvas);\n        offsetCanvas.width = offsetCanvas.height = 0;\n        bitmap.close();\n        bitmap = offsetBitmap;\n        w = bitmap.width;\n        h = bitmap.height;\n        if (w * h > this._opts.pixelLimit) {\n          throw new Error('image exceeds pixel limit');\n        }\n        if (cmd.columns === undefined) {\n          imgCols = Math.ceil(bitmap.width / cw);\n        }\n        if (cmd.rows === undefined) {\n          imgRows = Math.ceil(bitmap.height / ch);\n        }\n      }\n\n      const zIndex = cmd.zIndex ?? 0;\n      this._kittyStorage.addImage(image.id, bitmap, true, layer, zIndex);\n      bitmap = undefined;  // ownership transferred to storage\n\n      // Kitty cursor movement\n      // Per spec: cursor placed at first column after last image column,\n      // on the last row of the image. C=1 means don't move cursor.\n      if (cmd.cursorMovement === 1) {\n        // C=1: restore cursor to position before image was placed\n        const scrolled = buffer.ybase - savedYbase;\n        buffer.x = savedX;\n        // Can't restore cursor to scrollback?\n        buffer.y = Math.max(savedY - scrolled, 0);\n      } else {\n        // Default (C=0): advance cursor horizontally past the image\n        // addImage already positioned cursor on the last row via lineFeeds\n        buffer.x = Math.min(savedX + imgCols, this._coreTerminal.cols);\n      }\n    } catch (e) {\n      bitmap?.close();\n      throw e;\n    }\n  }\n\n  // Create ImageBitmap from already-decoded image data.\n  private async _createBitmap(image: IKittyImageData): Promise<ImageBitmap> {\n    let bytes: Uint8Array = new Uint8Array(await image.data.arrayBuffer());\n\n    if (image.compression === KittyCompression.ZLIB) {\n      bytes = await this._decompressZlib(bytes);\n    }\n\n    if (image.format === KittyFormat.PNG) {\n      const blob = new Blob([bytes as BlobPart], { type: 'image/png' });\n      if (!window.createImageBitmap) {\n        const url = URL.createObjectURL(blob);\n        const img = new Image();\n        return new Promise<ImageBitmap>((resolve, reject) => {\n          img.addEventListener('load', () => {\n            URL.revokeObjectURL(url);\n            const canvas = ImageRenderer.createCanvas(window.document, img.width, img.height);\n            canvas.getContext('2d')?.drawImage(img, 0, 0);\n            createImageBitmap(canvas).then(resolve).catch(reject);\n          });\n          img.addEventListener('error', () => {\n            URL.revokeObjectURL(url);\n            reject(new Error('Failed to load image'));\n          });\n          img.src = url;\n        });\n      }\n      return createImageBitmap(blob);\n    }\n\n    // Raw pixel data\n    const width = image.width;\n    const height = image.height;\n\n    if (!width || !height) {\n      throw new Error('Width and height required for raw pixel data');\n    }\n\n    const bytesPerPixel = image.format === KittyFormat.RGBA ? KittyPixelConstants.BYTES_PER_PIXEL_RGBA : KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n    const expectedBytes = width * height * bytesPerPixel;\n\n    if (bytes.length < expectedBytes) {\n      throw new Error('Insufficient pixel data');\n    }\n\n    const pixelCount = width * height;\n\n    if (image.format === KittyFormat.RGBA) {\n      // RGBA: use bytes directly — no copy needed\n      return createImageBitmap(new ImageData(new Uint8ClampedArray(bytes.buffer as ArrayBuffer, bytes.byteOffset, pixelCount * KittyPixelConstants.BYTES_PER_PIXEL_RGBA), width, height));\n    }\n\n    // RGB→RGBA: interleave alpha using uint32 block processing (4 pixels per iteration).\n    // 3 uint32 reads + 4 uint32 writes per 4 pixels vs 28 byte reads/writes — ~6x faster.\n    // Assumes little-endian (all modern browsers/Node.js).\n    const data = new Uint8ClampedArray(pixelCount * KittyPixelConstants.BYTES_PER_PIXEL_RGBA);\n    const src32 = new Uint32Array(bytes.buffer, bytes.byteOffset, Math.floor(bytes.byteLength / 4));\n    const dst32 = new Uint32Array(data.buffer);\n    const alignedPixels = pixelCount & ~3;  // round down to multiple of 4\n\n    let srcOffset = 0;\n    let dstOffset = 0;\n    for (let i = 0; i < alignedPixels; i += 4) {\n      const b0 = src32[srcOffset++];\n      const b1 = src32[srcOffset++];\n      const b2 = src32[srcOffset++];\n      // Little-endian: pixel bytes are [R,G,B] → uint32 ABGR layout\n      dst32[dstOffset++] = 0xFF000000 | b0;\n      dst32[dstOffset++] = 0xFF000000 | (b0 >>> 24) | (b1 << 8);\n      dst32[dstOffset++] = 0xFF000000 | (b1 >>> 16) | (b2 << 16);\n      dst32[dstOffset++] = 0xFF000000 | (b2 >>> 8);\n    }\n\n    // Handle remaining 1–3 pixels\n    let srcByte = alignedPixels * KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n    let dstByte = alignedPixels * KittyPixelConstants.BYTES_PER_PIXEL_RGBA;\n    for (let i = alignedPixels; i < pixelCount; i++) {\n      data[dstByte]     = bytes[srcByte];\n      data[dstByte + 1] = bytes[srcByte + 1];\n      data[dstByte + 2] = bytes[srcByte + 2];\n      data[dstByte + 3] = KittyPixelConstants.ALPHA_OPAQUE;\n      srcByte += KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n      dstByte += KittyPixelConstants.BYTES_PER_PIXEL_RGBA;\n    }\n\n    return createImageBitmap(new ImageData(data, width, height));\n  }\n\n  private async _decompressZlib(compressed: Uint8Array): Promise<Uint8Array> {\n    try {\n      return await this._decompress(compressed, 'deflate');\n    } catch {\n      return await this._decompress(compressed, 'deflate-raw');\n    }\n  }\n\n  private async _decompress(compressed: Uint8Array, format: 'deflate' | 'deflate-raw'): Promise<Uint8Array> {\n    const ds = new DecompressionStream(format);\n    const writer = ds.writable.getWriter();\n    writer.write(compressed as BufferSource);\n    writer.close();\n\n    const chunks: Uint8Array[] = [];\n    const reader = ds.readable.getReader();\n\n    while (true) {\n      const { done, value } = await reader.read();\n      if (done) break;\n      chunks.push(value);\n    }\n\n    const totalLength = chunks.reduce((sum, chunk) => sum + chunk.length, 0);\n    const result = new Uint8Array(totalLength);\n    let offset = 0;\n    for (const chunk of chunks) {\n      result.set(chunk, offset);\n      offset += chunk.length;\n    }\n    return result;\n  }\n\n  public get images(): ReadonlyMap<number, IKittyImageData> {\n    return this._kittyStorage.images;\n  }\n\n  public get _kittyIdToStorageId(): ReadonlyMap<number, number> {\n    return this._kittyStorage.kittyIdToStorageId;\n  }\n\n  public get pendingTransmissions(): ReadonlyMap<number, IPendingTransmission> {\n    return this._pendingTransmissions;\n  }\n}\n","/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Kitty graphics protocol types, constants, and parsing utilities.\n */\n\nimport type Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\n\n// Kitty graphics protocol action types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference under key 'a'.\nexport const enum KittyAction {\n  TRANSMIT = 't',\n  TRANSMIT_DISPLAY = 'T',\n  QUERY = 'q',\n  PLACEMENT = 'p',\n  DELETE = 'd'\n}\n\n// Kitty graphics protocol format types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference\nexport const enum KittyFormat {\n  RGB = 24,\n  RGBA = 32,\n  PNG = 100\n}\n\n// Kitty graphics protocol compression types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference under key 'o'.\nexport const enum KittyCompression {\n  NONE = '',\n  ZLIB = 'z'\n}\n\n// Kitty graphics protocol control data keys.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference\nexport const enum KittyKey {\n  // Action to perform (t=transmit, T=transmit+display, q=query, p=placement, d=delete)\n  ACTION = 'a',\n  // Image format (24=RGB, 32=RGBA, 100=PNG)\n  FORMAT = 'f',\n  // Image ID for referencing stored images\n  ID = 'i',\n  // Image number (alternative to ID, terminal assigns ID)\n  IMAGE_NUMBER = 'I',\n  // Source image width in pixels\n  WIDTH = 's',\n  // Source image height in pixels\n  HEIGHT = 'v',\n  // The left edge (in pixels) of the image area to display\n  X_OFFSET = 'x',\n  // The top edge (in pixels) of the image area to display\n  Y_OFFSET = 'y',\n  // Width (in pixels) of the source rectangle to display\n  SOURCE_WIDTH = 'w',\n  // Height (in pixels) of the source rectangle to display\n  SOURCE_HEIGHT = 'h',\n  // Horizontal offset (in pixels) within the first cell\n  X_PLACEMENT_OFFSET = 'X',\n  // Vertical offset (in pixels) within the first cell\n  Y_PLACEMENT_OFFSET = 'Y',\n  // Number of terminal columns to display the image over\n  COLUMNS = 'c',\n  // Number of terminal rows to display the image over\n  ROWS = 'r',\n  // More data flag (1=more chunks coming, 0=final chunk)\n  MORE = 'm',\n  // Compression type (z=zlib). This is essential for chunking larger images.\n  COMPRESSION = 'o',\n  // Quiet mode (1=suppress OK responses, 2=suppress error responses)\n  QUIET = 'q',\n  // Cursor movement policy (0=move cursor after image, 1=don't move cursor)\n  CURSOR_MOVEMENT = 'C',\n  // Z-index for image layering (negative = behind text, 0+ = on top)\n  Z_INDEX = 'z',\n  // Transmission medium (d=direct, f=file, t=temp file, s=shared memory)\n  TRANSMISSION = 't',\n  // Delete selector (a/A=all, i/I=by id, c/C=at cursor, etc.) — only used when a=d\n  DELETE_SELECTOR = 'd',\n  // Placement ID for targeting specific placements\n  PLACEMENT_ID = 'p'\n}\n\n// Pixel format constants\nexport const enum KittyPixelConstants {\n  BYTES_PER_PIXEL_RGB = 3,\n  BYTES_PER_PIXEL_RGBA = 4,\n  ALPHA_OPAQUE = 255\n}\n\n// Parsed Kitty graphics command.\nexport interface IKittyCommand {\n  action?: string;\n  format?: number;\n  id?: number;\n  imageNumber?: number;\n  width?: number;\n  height?: number;\n  x?: number;\n  y?: number;\n  sourceWidth?: number;\n  sourceHeight?: number;\n  xOffset?: number;\n  yOffset?: number;\n  columns?: number;\n  rows?: number;\n  more?: number;\n  quiet?: number;\n  cursorMovement?: number;\n  zIndex?: number;\n  transmission?: string;\n  deleteSelector?: string;\n  placementId?: number;\n  compression?: string;\n  payload?: string;\n}\n\n// Pending chunked transmission state.\n// Stores metadata from the first chunk while accumulating decoded payload data.\nexport interface IPendingTransmission {\n  // The parsed command from the first chunk (contains action, format, dimensions, etc.)\n  cmd: IKittyCommand;\n  // Decoder used across chunked payloads\n  decoder: Base64Decoder;\n  // Total encoded (base64) bytes received across all chunks - for size limit enforcement\n  totalEncodedSize: number;\n  // Whether any chunk has failed to decode\n  decodeError: boolean;\n}\n\n// Stored Kitty image data.\nexport interface IKittyImageData {\n  id: number;\n  // Decoded image data stored as Blob (off JS heap) to avoid 2GB heap limit\n  data: Blob;\n  width: number;\n  height: number;\n  format: 24 | 32 | 100;\n  compression?: string;\n}\n\n// Parses Kitty graphics control data into a command object.\nexport function parseKittyCommand(data: string): IKittyCommand {\n  const cmd: IKittyCommand = {};\n  const parts = data.split(',');\n\n  for (const part of parts) {\n    const eqIdx = part.indexOf('=');\n    if (eqIdx === -1) continue;\n\n    const key = part.substring(0, eqIdx);\n    const value = part.substring(eqIdx + 1);\n\n    // Handle string keys first\n    if (key === KittyKey.ACTION) {\n      cmd.action = value;\n      continue;\n    }\n    if (key === KittyKey.COMPRESSION) {\n      cmd.compression = value;\n      continue;\n    }\n    if (key === KittyKey.TRANSMISSION) {\n      cmd.transmission = value;\n      continue;\n    }\n    if (key === KittyKey.DELETE_SELECTOR) {\n      cmd.deleteSelector = value;\n      continue;\n    }\n    const numValue = parseInt(value, 10);\n    switch (key) {\n      case KittyKey.FORMAT: cmd.format = numValue; break;\n      case KittyKey.ID: cmd.id = numValue; break;\n      case KittyKey.IMAGE_NUMBER: cmd.imageNumber = numValue; break;\n      case KittyKey.WIDTH: cmd.width = numValue; break;\n      case KittyKey.HEIGHT: cmd.height = numValue; break;\n      case KittyKey.X_OFFSET: cmd.x = numValue; break;\n      case KittyKey.Y_OFFSET: cmd.y = numValue; break;\n      case KittyKey.SOURCE_WIDTH: cmd.sourceWidth = numValue; break;\n      case KittyKey.SOURCE_HEIGHT: cmd.sourceHeight = numValue; break;\n      case KittyKey.X_PLACEMENT_OFFSET: cmd.xOffset = numValue; break;\n      case KittyKey.Y_PLACEMENT_OFFSET: cmd.yOffset = numValue; break;\n      case KittyKey.COLUMNS: cmd.columns = numValue; break;\n      case KittyKey.ROWS: cmd.rows = numValue; break;\n      case KittyKey.MORE: cmd.more = numValue; break;\n      case KittyKey.QUIET: cmd.quiet = numValue; break;\n      case KittyKey.CURSOR_MOVEMENT: cmd.cursorMovement = numValue; break;\n      case KittyKey.Z_INDEX: cmd.zIndex = numValue; break;\n      case KittyKey.PLACEMENT_ID: cmd.placementId = numValue; break;\n    }\n  }\n\n  return cmd;\n}\n","/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { ImageStorage } from '../ImageStorage';\nimport { ImageLayer, IAddImageOpts } from '../Types';\nimport { IKittyImageData } from './KittyGraphicsTypes';\n\n// Kitty-specific image storage controller.\n//\n// Wraps shared ImageStorage with kitty protocol semantics:\n// - tracks transmitted image payloads by kitty image id\n// - tracks kitty image id -> shared ImageStorage id mapping for displayed images\n// - mirrors shared-storage evictions into kitty maps\n// - applies protocol-level undisplayed-image eviction policy\nexport class KittyImageStorage implements IDisposable {\n  private static readonly _maxStoredImages = 256;\n\n  private _nextImageId = 1;\n  private readonly _images: Map<number, IKittyImageData> = new Map();\n  // TODO: Support multiple placements per image. The kitty spec identifies\n  // placements by an (image id, placement id) pair — same i + different p\n  // values should coexist, and same i + same p should replace the prior\n  // placement. Currently we track only one storage entry per kitty image id,\n  // so multiple placements of the same image overwrite each other. Fixing\n  // this requires changing these maps to Map<number, Map<number, number>>\n  // (kittyId → placementId → storageId) and updating addImage/deleteById\n  // accordingly. The underlying shared ImageStorage would also need to\n  // support multiple entries per logical image.\n  private readonly _kittyIdToStorageId: Map<number, number> = new Map();\n  private readonly _storageIdToKittyId: Map<number, number> = new Map();\n\n  private readonly _previousOnImageDeleted: ((storageId: number) => void) | undefined;\n  private readonly _wrappedOnImageDeleted: (storageId: number) => void;\n  private readonly _handleStorageImageDeleted = (storageId: number): void => {\n    const kittyId = this._storageIdToKittyId.get(storageId);\n    if (kittyId !== undefined) {\n      this._kittyIdToStorageId.delete(kittyId);\n      this._storageIdToKittyId.delete(storageId);\n      this._images.delete(kittyId);\n    }\n  };\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };\n\n  constructor(\n    private readonly _storage: ImageStorage\n  ) {\n    this._previousOnImageDeleted = this._storage.onImageDeleted;\n    this._wrappedOnImageDeleted = (storageId: number) => {\n      this._previousOnImageDeleted?.(storageId);\n      this._handleStorageImageDeleted(storageId);\n    };\n    this._storage.onImageDeleted = this._wrappedOnImageDeleted;\n  }\n\n  public reset(): void {\n    this._nextImageId = 1;\n    this._images.clear();\n    this._kittyIdToStorageId.clear();\n    this._storageIdToKittyId.clear();\n  }\n\n  public dispose(): void {\n    this.reset();\n    if (this._storage.onImageDeleted === this._wrappedOnImageDeleted) {\n      this._storage.onImageDeleted = this._previousOnImageDeleted;\n    }\n  }\n\n  public storeImage(id: number | undefined, imageData: Omit<IKittyImageData, 'id'>): number {\n    const imageId = id ?? this._nextImageId++;\n\n    const oldStorageId = this._kittyIdToStorageId.get(imageId);\n    if (oldStorageId !== undefined) {\n      this._storage.deleteImage(oldStorageId);\n      this._kittyIdToStorageId.delete(imageId);\n      this._storageIdToKittyId.delete(oldStorageId);\n    }\n\n    if (!this._images.has(imageId) && this._images.size >= KittyImageStorage._maxStoredImages) {\n      this._evictUndisplayedImages();\n    }\n\n    this._images.set(imageId, {\n      ...imageData,\n      id: imageId\n    });\n    return imageId;\n  }\n\n  public addImage(kittyId: number, image: HTMLCanvasElement | ImageBitmap, scrolling: boolean, layer: ImageLayer, zIndex: number): void {\n    // Clean up stale reverse-mapping from a previous placement of the same\n    // kitty image.  The old shared-storage entry is kept (it may still be\n    // visible on screen) but its reverse mapping is removed so that eviction\n    // of the old entry won't incorrectly delete the kitty image data.\n    const oldStorageId = this._kittyIdToStorageId.get(kittyId);\n    if (oldStorageId !== undefined) {\n      this._storageIdToKittyId.delete(oldStorageId);\n    }\n    this._addImageOpts.scrolling = scrolling;\n    this._addImageOpts.layer = layer;\n    this._addImageOpts.zIndex = zIndex;\n    const storageId = this._storage.addImage(image, this._addImageOpts);\n    this._kittyIdToStorageId.set(kittyId, storageId);\n    this._storageIdToKittyId.set(storageId, kittyId);\n  }\n\n  public getImage(kittyId: number): IKittyImageData | undefined {\n    return this._images.get(kittyId);\n  }\n\n  public deleteById(kittyId: number): void {\n    this._images.delete(kittyId);\n    const storageId = this._kittyIdToStorageId.get(kittyId);\n    if (storageId !== undefined) {\n      this._storage.deleteImage(storageId);\n      this._kittyIdToStorageId.delete(kittyId);\n      this._storageIdToKittyId.delete(storageId);\n    }\n  }\n\n  public deleteAll(): void {\n    this._images.clear();\n    for (const storageId of this._kittyIdToStorageId.values()) {\n      this._storage.deleteImage(storageId);\n    }\n    this._kittyIdToStorageId.clear();\n    this._storageIdToKittyId.clear();\n  }\n\n  public get images(): ReadonlyMap<number, IKittyImageData> {\n    return this._images;\n  }\n\n  public get kittyIdToStorageId(): ReadonlyMap<number, number> {\n    return this._kittyIdToStorageId;\n  }\n\n  public get lastImageId(): number {\n    return this._nextImageId - 1;\n  }\n\n  private _evictUndisplayedImages(): void {\n    for (const [kittyId] of this._images) {\n      if (this._images.size <= KittyImageStorage._maxStoredImages / 2) {\n        break;\n      }\n      if (!this._kittyIdToStorageId.has(kittyId)) {\n        this._images.delete(kittyId);\n      }\n    }\n  }\n}\n","\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\n/**\n * Copyright (c) 2023, 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nconst inwasm_runtime_1 = require(\"inwasm-runtime\");\n/**\n * wasm base64 decoder.\n */\nconst wasmDecode = (0, inwasm_runtime_1.InWasm)(/*inwasm#828e69684093b2c6:rdef-start:\"decode\"*/{s:1,t:0,d:'AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML'}/*inwasm#828e69684093b2c6:rdef-end:\"decode\"*/);\n// SIMD version (speedup ~1.4x, not covered by tests yet)\n/*\nconst wasmDecode = InWasm({\n  name: 'decode',\n  type: OutputType.INSTANCE,\n  mode: OutputMode.SYNC,\n  srctype: 'Clang-C',\n  imports: {\n    env: { memory: new WebAssembly.Memory({ initial: 1 }) }\n  },\n  exports: {\n    dec: () => 0,\n    end: () => 0\n  },\n  compile: {\n    switches: ['-msimd128', '-Wl,-z,stack-size=0', '-Wl,--stack-first']\n  },\n  code: `\n    #include <wasm_simd128.h>\n    typedef struct {\n      unsigned int wp;\n      unsigned int sp;\n      unsigned int dp;\n      unsigned int e_size;\n      unsigned int dummy[4];\n      unsigned char data[0];\n    } State;\n\n    unsigned int *D0 = (unsigned int *) ${P32.D0 * 4};\n    unsigned int *D1 = (unsigned int *) ${P32.D1 * 4};\n    unsigned int *D2 = (unsigned int *) ${P32.D2 * 4};\n    unsigned int *D3 = (unsigned int *) ${P32.D3 * 4};\n    State *state = (State *) ${P32.STATE * 4};\n\n    #define packed_byte(x) wasm_i8x16_splat((char) x)\n    #define packed_dword(x) wasm_i32x4_splat(x)\n    #define masked(x, mask) wasm_v128_and(x, wasm_i32x4_splat(mask))\n\n    __attribute__((noinline)) int dec() {\n      unsigned int nsp = (state->wp - 1) & ~3;\n      unsigned char *src = state->data + state->sp;\n      unsigned char *end = state->data + nsp;\n      unsigned char *dst = state->data + state->dp;\n      unsigned int error = 0;\n\n      v128_t err = wasm_i8x16_splat(0);\n      unsigned char *end16 = state->data + (nsp & ~15);\n      while (src < end16) {\n        v128_t data = wasm_v128_load((v128_t *) src);\n\n        // wasm-simd rewrite of http://0x80.pl/notesen/2016-01-17-sse-base64-decoding.html#vector-lookup-pshufb\n        const v128_t higher_nibble = wasm_u32x4_shr(data, 4) & packed_byte(0x0f);\n        const char linv = 1;\n        const char hinv = 0;\n\n        const v128_t lower_bound_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          linv, linv, 0x2b, 0x30,\n          0x41, 0x50, 0x61, 0x70,\n          linv, linv, linv, linv,\n          linv, linv, linv, linv\n        );\n        const v128_t upper_bound_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          hinv, hinv, 0x2b, 0x39,\n          0x4f, 0x5a, 0x6f, 0x7a,\n          hinv, hinv, hinv, hinv,\n          hinv, hinv, hinv, hinv\n        );\n        // the difference between the shift and lower bound\n        const v128_t shift_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          0x00,        0x00,        0x3e - 0x2b, 0x34 - 0x30,\n          0x00 - 0x41, 0x0f - 0x50, 0x1a - 0x61, 0x29 - 0x70,\n          0x00,        0x00,        0x00,        0x00,\n          0x00,        0x00,        0x00,        0x00\n        );\n\n        const v128_t upper_bound = wasm_i8x16_swizzle(upper_bound_LUT, higher_nibble);\n        const v128_t lower_bound = wasm_i8x16_swizzle(lower_bound_LUT, higher_nibble);\n\n        const v128_t below = wasm_i8x16_lt(data, lower_bound);\n        const v128_t above = wasm_i8x16_gt(data, upper_bound);\n        const v128_t eq_2f = wasm_i8x16_eq(data, packed_byte(0x2f));\n\n        // in_range = not (below or above) or eq_2f\n        // outside  = not in_range = below or above and not eq_2f (from deMorgan law)\n        const v128_t outside = wasm_v128_andnot(eq_2f, above | below);\n        err = wasm_v128_or(err, outside);\n\n        const v128_t shift  = wasm_i8x16_swizzle(shift_LUT, higher_nibble);\n        const v128_t t0     = wasm_i8x16_add(data, shift);\n        v128_t v = wasm_i8x16_add(t0, wasm_v128_and(eq_2f, packed_byte(-3)));\n\n        // pack bytes\n        const v128_t ca = masked(v, 0x003f003f);\n        const v128_t db = masked(v, 0x3f003f00);\n        const v128_t t00 = wasm_v128_or(wasm_u32x4_shr(db, 8), wasm_i32x4_shl(ca, 6));\n        v128_t res = wasm_v128_or(wasm_u32x4_shr(t00, 16), wasm_i32x4_shl(t00, 12));\n        res = wasm_i8x16_swizzle(res, wasm_i8x16_const(2, 1, 0, 6, 5, 4, 10, 9, 8, 14, 13, 12, 16, 16, 16, 16));\n\n        wasm_v128_store((v128_t *) dst, res);\n        dst += 12;\n        src += 16;\n      }\n      //if (wasm_i8x16_bitmask(err) != 0) return -1;\n      if (wasm_v128_any_true(err)) return -1;\n\n      // operate on 4-byte blocks\n      while (src < end) {\n        error |= *((unsigned int *) dst) = D0[src[0]] | D1[src[1]] | D2[src[2]] | D3[src[3]];\n        dst += 3;\n        src += 4;\n      }\n      if (error >> 24) return -1;\n      state->sp = nsp;\n      state->dp = dst - state->data;\n      return 0;\n    }\n\n    int end() {\n      int rem = state->wp - state->sp;\n      if (rem > 4 && dec()) return -1;\n      rem = state->wp - state->sp;\n      if (rem < 2) return -1;\n\n      unsigned char *src = state->data + state->sp;\n      if (rem == 4) {\n        if (src[3] == 61) rem--;\n        if (src[2] == 61) rem--;\n      }\n      unsigned int accu = D0[src[0]] | D1[src[1]];\n      int dp = 1;\n      if (rem > 2) {\n        accu |= D2[src[2]];\n        dp++;\n        if (rem == 4) {\n          accu |= D3[src[3]];\n          dp++;\n        }\n      }\n      if (accu >> 24) return -1;\n      *((unsigned int *) (state->data + state->dp)) = accu;\n      state->dp += dp;\n      return 0;\n    }\n    `\n});\n*/\n// base64 map\nconst MAP = new Uint8Array('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'\n    .split('')\n    .map(el => el.charCodeAt(0)));\n// init decoder maps in LE order\nconst D = new Uint32Array(1024);\nD.fill(0xFF000000);\nfor (let i = 0; i < MAP.length; ++i)\n    D[MAP[i]] = i << 2;\nfor (let i = 0; i < MAP.length; ++i)\n    D[256 + MAP[i]] = i >> 4 | ((i << 4) & 0xFF) << 8;\nfor (let i = 0; i < MAP.length; ++i)\n    D[512 + MAP[i]] = (i >> 2) << 8 | ((i << 6) & 0xFF) << 16;\nfor (let i = 0; i < MAP.length; ++i)\n    D[768 + MAP[i]] = i << 16;\nconst EMPTY = new Uint8Array(0);\n/**\n * base64 stream decoder.\n *\n * Features / assumptions:\n * - lazy chunkwise decoding\n * - errors out on any non base64 chars (no support for NL formatted base64)\n * - decodes in wasm\n * - inplace decoding to save memory\n * - supports a keepSize for lazy memory release\n */\nclass Base64Decoder {\n    /**\n     * @param keepSize Keep the wasm instance below this limit when calling `release()`.\n     * @param maxBytes Max allowed bytes to allocate.\n     * @param initialBytes Initial bytes to allocate.\n     */\n    constructor(keepSize, maxBytes, initialBytes) {\n        this._inst = null;\n        this._ended = true;\n        this._bytes = 0;\n        this.keepSize = keepSize !== null && keepSize !== void 0 ? keepSize : 1048576 /* Bytes.KEEP */;\n        this.maxBytes = maxBytes !== null && maxBytes !== void 0 ? maxBytes : 4294901760 /* Bytes.MAX */;\n        this._bytes = initialBytes !== null && initialBytes !== void 0 ? initialBytes : 32768 /* Bytes.INITIAL */;\n        if (this._bytes > this.maxBytes || this.maxBytes > 4294901760 /* Bytes.MAX */) {\n            throw new Error('invalid byte settings');\n        }\n    }\n    /**\n     * Currently decoded bytes (borrowed).\n     * Must be accessed before calling `release` or `init`.\n     */\n    get data8() {\n        return this._inst ? this._d.subarray(0, this._m32[1282 /* P32.STATE_DP */]) : EMPTY;\n    }\n    /**\n     * Release memory conditionally based on `keepSize`.\n     * If memory gets released, also the wasm instance will be freed and recreated on next `init`,\n     * otherwise the instance will be reused.\n     */\n    release() {\n        if (!this._inst)\n            return;\n        if (this._bytes > this.keepSize) {\n            this._inst = this._m32 = this._d = this._mem = null;\n        }\n        else {\n            this._m32[1280 /* P32.STATE_WP */] = 0;\n            this._m32[1281 /* P32.STATE_SP */] = 0;\n            this._m32[1282 /* P32.STATE_DP */] = 0;\n        }\n    }\n    /**\n     * Initializes the decoder for new base64 data.\n     * Must be called before doing any decoding attempts.\n     * The method will either spawn a new wasm instance or grow\n     * the needed memory of an existing instance.\n     * @param maxBytes Max allowed bytes to allocate (overwrites ctor value).\n     * @param initialBytes Initial bytes to allocate (overwrites ctor value).\n     */\n    init(maxBytes, initialBytes) {\n        this.maxBytes = maxBytes !== null && maxBytes !== void 0 ? maxBytes : this.maxBytes;\n        this._bytes = initialBytes !== null && initialBytes !== void 0 ? initialBytes : Math.min(this._bytes, this.maxBytes);\n        if (this._bytes > this.maxBytes || this.maxBytes > 4294901760 /* Bytes.MAX */) {\n            throw Error('invalid byte settings');\n        }\n        let m = this._m32;\n        const bytes = this._bytes + 5152 /* Bytes._DATA_OFFSET */;\n        if (!this._inst) {\n            this._mem = new WebAssembly.Memory({ initial: Math.ceil(bytes / 65536) });\n            this._inst = wasmDecode({ env: { memory: this._mem } });\n            m = new Uint32Array(this._mem.buffer, 0);\n            m.set(D, 256 /* P32.D0 */);\n            this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n        }\n        else if (this._mem.buffer.byteLength < bytes) {\n            this._mem.grow(Math.ceil((bytes - this._mem.buffer.byteLength) / 65536));\n            m = new Uint32Array(this._mem.buffer, 0);\n            this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n        }\n        m[1280 /* P32.STATE_WP */] = 0;\n        m[1281 /* P32.STATE_SP */] = 0;\n        m[1282 /* P32.STATE_DP */] = 0;\n        this._m32 = m;\n        this._ended = false;\n    }\n    /**\n     * Realloc memory. Realloc only happens, if the requested\n     * size doesn't fit in the current memory.\n     * The new size will be capped by `maxBytes`.\n     * @param requested Bytes to be stored.\n     */\n    _realloc(requested) {\n        const needed = this._m32[1280 /* P32.STATE_WP */] + requested;\n        if (this._bytes < needed) {\n            if (needed > this.maxBytes) {\n                return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n            }\n            let newSize = this._bytes;\n            while ((newSize *= 2) < needed) { }\n            newSize = Math.min(newSize, this.maxBytes);\n            if (newSize < needed) {\n                return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n            }\n            if (newSize + 5152 /* Bytes._DATA_OFFSET */ > this._mem.buffer.byteLength) {\n                const addPages = Math.ceil((newSize + 5152 /* Bytes._DATA_OFFSET */ - this._mem.buffer.byteLength) / 65536);\n                this._mem.grow(addPages);\n                this._m32 = new Uint32Array(this._mem.buffer, 0);\n                this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n            }\n            this._bytes = newSize;\n        }\n        return 0 /* DecodeStatus.OK */;\n    }\n    /**\n     * Put bytes in `data` into the decoder.\n     * Additionally decodes the payload, if it reached 2^17 bytes.\n     * The return value indicates the type of issue.\n     * @param data Bytes to be loaded.\n     */\n    put(data) {\n        if (!this._inst || this._ended) {\n            return -2 /* DecodeStatus.NOT_INITIALIZED */;\n        }\n        if (this._realloc(data.length)) {\n            return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n        }\n        const m = this._m32;\n        this._d.set(data, m[1280 /* P32.STATE_WP */]);\n        m[1280 /* P32.STATE_WP */] += data.length;\n        // max chunk in input handler is 2^17, try to run in \"tandem mode\"\n        return m[1280 /* P32.STATE_WP */] - m[1281 /* P32.STATE_SP */] >= 131072\n            ? this._inst.exports.dec()\n            : 0 /* DecodeStatus.OK */;\n    }\n    /**\n     * End the current decoding.\n     * Also decodes leftover payload from previous put calls.\n     */\n    end() {\n        this._ended = true;\n        return this._inst\n            ? this._inst.exports.end()\n            : -2 /* DecodeStatus.NOT_INITIALIZED */;\n    }\n    /**\n     * Bytes loaded into the decoder.\n     */\n    get loadedBytes() {\n        return this._inst\n            ? this._m32[1280 /* P32.STATE_WP */]\n            : 0;\n    }\n    /**\n     * Free bytes to feed to the decoder.\n     */\n    get freeBytes() {\n        return this._inst\n            ? this.maxBytes - this._m32[1280 /* P32.STATE_WP */]\n            : 0;\n    }\n}\nexports.default = Base64Decoder;\n//# sourceMappingURL=Base64Decoder.wasm.js.map","\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\n/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nconst inwasm_runtime_1 = require(\"inwasm-runtime\");\nconst wasmQoiDecode = (0, inwasm_runtime_1.InWasm)(/*inwasm#459f9e1bfb80b1a8:rdef-start:\"qoi_decode\"*/{s:1,t:0,d:'AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw=='}/*inwasm#459f9e1bfb80b1a8:rdef-end:\"qoi_decode\"*/);\nclass QoiDecoder {\n    constructor(keepSize) {\n        this.keepSize = keepSize;\n        this.width = 0;\n        this.height = 0;\n    }\n    decode(d) {\n        this.width = d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7];\n        this.height = d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11];\n        const pixels = this.width * this.height;\n        const ib = pixels * 4;\n        const dl = d.length;\n        /**\n         * byte/offset calculation:\n         * To save some memory we dont reserve full memory for decoded + encoded,\n         * but place encoded at the end of decoded plus 50% security distance\n         * to avoid reads before writes positions:\n         *\n         * encoded < decoded (good compression)\n         *    enc                                              ####################\n         *    dec                 #######################################\n         *                        ^                            ^\n         *                        DST_P                        CHUNK_P\n         *\n         * encoded > decoded (degenerated compression, should not happen)\n         *    enc                           ##############################\n         *    dec                 ####################\n         *                        ^         ^\n         *                        DST_P     CHUNK_P\n         *\n         * There is still a chance for overlapping r/w positions in case the compressed\n         * data has very different pixel progression, yet the 50% security distance\n         * should deal with that, as QOI will bloat data by 25% at max (RGB -> OP byte + RGB).\n         * Since we always assume RGBA at decoding stage, the possible bloat reduces to 20% at max.\n         */\n        const bytes = Math.max(ib, dl) + (Math.min(ib, dl) >> 1) + 4096;\n        if (!this._inst) {\n            this._mem = new WebAssembly.Memory({ initial: Math.ceil(bytes / 65536) });\n            this._inst = wasmQoiDecode({ env: { memory: this._mem } });\n        }\n        else if (this._mem.buffer.byteLength < bytes) {\n            this._mem.grow(Math.ceil((bytes - this._mem.buffer.byteLength) / 65536));\n            this._d = null;\n        }\n        if (!this._d) {\n            this._d = new Uint8Array(this._mem.buffer);\n        }\n        // put src data at the end of memory, also align to 256\n        const chunkP = (this._mem.buffer.byteLength - dl) & ~0xFF;\n        this._d.set(d, chunkP);\n        this._inst.exports.dec(chunkP, dl, pixels);\n        return this._d.subarray(1024 /* P8.DST_P */, 1024 /* P8.DST_P */ + ib);\n    }\n    release() {\n        if (!this._inst)\n            return;\n        if (this._mem.buffer.byteLength > this.keepSize) {\n            this._inst = this._d = this._mem = null;\n        }\n    }\n}\nexports.default = QoiDecoder;\n//# sourceMappingURL=QoiDecoder.wasm.js.map","\"use strict\";\n/**\n * Copyright (c) 2022, 2026 Joerg Breitbart\n * @license MIT\n */\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.InWasm = InWasm;\nlet z = (s) => {\n    if (Uint8Array.fromBase64)\n        return Uint8Array.fromBase64(s);\n    if (typeof Buffer !== 'undefined')\n        return Buffer.from(s, 'base64');\n    const b = atob(s);\n    const r = new Uint8Array(b.length);\n    for (let i = 0; i < r.length; ++i)\n        r[i] = b.charCodeAt(i);\n    return r;\n};\nfunction InWasm(def) {\n    if (def.d) {\n        const { t, s, d } = def;\n        let b;\n        let m;\n        const W = WebAssembly;\n        if (t === 0 /* OutputType.INSTANCE */) {\n            if (s)\n                return (e) => new W.Instance(m || (m = new W.Module(b || (b = z(d)))), e);\n            return (e) => m\n                ? W.instantiate(m, e)\n                : W.instantiate(b || (b = z(d)), e).then(r => (m = r.module) && r.instance);\n        }\n        if (t === 1 /* OutputType.MODULE */) {\n            if (s)\n                return () => m || (m = new W.Module(b || (b = z(d))));\n            return () => m\n                ? Promise.resolve(m)\n                : W.compile(b || (b = z(d))).then(r => m = r);\n        }\n        if (s)\n            return () => b || (b = z(d));\n        return () => Promise.resolve(b || (b = z(d)));\n    }\n    if (typeof _wasmCtx === 'undefined')\n        throw new Error('must run \"inwasm\"');\n    _wasmCtx.add(def);\n}\n//# sourceMappingURL=index.js.map","// The module cache\nvar __webpack_module_cache__ = {};\n\n// The require function\nfunction __webpack_require__(moduleId) {\n\t// Check if module is in cache\n\tvar cachedModule = __webpack_module_cache__[moduleId];\n\tif (cachedModule !== undefined) {\n\t\treturn cachedModule.exports;\n\t}\n\t// Create a new module (and put it into the cache)\n\tvar module = __webpack_module_cache__[moduleId] = {\n\t\t// no module.id needed\n\t\t// no module.loaded needed\n\t\texports: {}\n\t};\n\n\t// Execute the module function\n\t__webpack_modules__[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n\t// Return the exports of the module\n\treturn module.exports;\n}\n\n","/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport type { ITerminalAddon, IDisposable } from '@xterm/xterm';\nimport type { ImageAddon as IImageApi } from '@xterm/addon-image';\nimport { Emitter, type IEvent } from 'common/Event';\nimport { IIPHandler } from './IIPHandler';\nimport { ImageRenderer } from './ImageRenderer';\nimport { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';\nimport { KittyGraphicsHandler } from './kitty/KittyGraphicsHandler';\nimport { KittyImageStorage } from './kitty/KittyImageStorage';\nimport { SixelHandler } from './SixelHandler';\nimport { SixelImageStorage } from './SixelImageStorage';\nimport { IIPImageStorage } from './IIPImageStorage';\nimport { ITerminalExt, IImageAddonOptions, IResetHandler } from './Types';\n\n\n/**\n * Document VT features provided by this addon.\n *\n * @vt: #E[Supported via @xterm/addon-image.] DCS SIXEL \"SIXEL Graphics\"  \"DCS Ps ; Ps ; Ps ; q Pt ST\"  \"Draw SIXEL image.\"\n *\n * Sixel support is provided by the addon @xterm/addon-image with these limitations:\n * - immediate coloring (no shared palette, allows high color settings of `img2sixel`)\n * - max. palette size of 4096 colors\n * - max. pixel width of 16K\n * - max. 25 MB per sixel sequence\n * - VT340 cursor positioning (begin of last sixel data row)\n *\n * See [addon readme](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image) for more details.\n *\n *\n * @vt: #E[Supported via @xterm/addon-image.] OSC 1337  \"iTerm2 Commands\"   \"OSC 1337 ; Pt BEL\"  \"Custom iTerm2 commands.\"\n *\n * Only the inline image protocol (IIP) is supported by the addon @xterm/addon-image with\n * the following limitations:\n * - sequence:\n *   - format: `OSC 1337 ; File=inline=1 ; size=<unencoded size> ; ... : <base64 payload> BEL`\n *   - size param must be set and payload may not exceed CEIL(size * 4 / 3)\n *   - strict base64 handling as of RFC4648 §4 (standard alphabet, optional padding,\n *     no separator bytes allowed)\n *   - supported params: size, name, width, height, preserveAspectRatio\n * - image formats: PNG, JPEG and GIF\n * - no animation support (renders first image of a GIF)\n * - no multipart support\n * - VT340 cursor positioning (begin of last sixel data row)\n *\n * See [addon readme](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image)\n * and [iTerm2 IIP docs](https://iterm2.com/documentation-images.html) for more details.\n *\n *\n * @vt: #E[Supported via @xterm/addon-image.] APC KITTY_GRAPHICS \"Kitty Graphics\"  \"APC G Pt ST\"  \"Kitty Graphics Protocol.\"\n *\n * Kitty graphics support is provided by the addon @xterm/addon-image.\n * Note that while basic image output already works, this is still work in progress.\n */\n\n// default values of addon ctor options\nconst DEFAULT_OPTIONS: IImageAddonOptions = {\n  enableSizeReports: true,\n  pixelLimit: 16777216, // limit to 4096 * 4096 pixels\n  sixelSupport: true,\n  sixelScrolling: true,\n  sixelPaletteLimit: 4096,\n  sixelSizeLimit: 33554432,\n  storageLimit: 128,\n  showPlaceholder: true,\n  iipSupport: true,\n  iipSizeLimit: 33554432,\n  kittySupport: true,\n  kittySizeLimit: 33554432\n};\n\n// max palette size supported by the sixel lib (compile time setting)\nconst MAX_SIXEL_PALETTE_SIZE = 4096;\n\n// definitions for _xtermGraphicsAttributes sequence\nconst enum GaItem {\n  COLORS = 1,\n  SIXEL_GEO = 2,\n  REGIS_GEO = 3\n}\nconst enum GaAction {\n  READ = 1,\n  SET_DEFAULT = 2,\n  SET = 3,\n  READ_MAX = 4\n}\nconst enum GaStatus {\n  SUCCESS = 0,\n  ITEM_ERROR = 1,\n  ACTION_ERROR = 2,\n  FAILURE = 3\n}\n\n\nexport class ImageAddon implements ITerminalAddon, IImageApi {\n  private _opts: IImageAddonOptions;\n  private _defaultOpts: IImageAddonOptions;\n  private _storage: ImageStorage | undefined;\n  private _renderer: ImageRenderer | undefined;\n  private _disposables: IDisposable[] = [];\n  private _terminal: ITerminalExt | undefined;\n  private _handlers: Map<String, IResetHandler> = new Map();\n  private readonly _onImageAdded = new Emitter<void>();\n  public readonly onImageAdded: IEvent<void> = this._onImageAdded.event;\n\n  constructor(opts?: Partial<IImageAddonOptions>) {\n    this._opts = Object.assign({}, DEFAULT_OPTIONS, opts);\n    this._defaultOpts = Object.assign({}, DEFAULT_OPTIONS, opts);\n  }\n\n  public dispose(): void {\n    for (const obj of this._disposables) {\n      obj.dispose();\n    }\n    this._disposables.length = 0;\n    this._handlers.clear();\n    this._onImageAdded.dispose();\n  }\n\n  private _disposeLater(...args: IDisposable[]): void {\n    for (const obj of args) {\n      this._disposables.push(obj);\n    }\n  }\n\n  public activate(terminal: ITerminalExt): void {\n    this._terminal = terminal;\n\n    // internal data structures\n    this._renderer = new ImageRenderer(terminal);\n    this._storage = new ImageStorage(terminal, this._renderer, this._opts);\n    this._storage.onImageAdded = () => this._onImageAdded.fire();\n\n    // enable size reports\n    if (this._opts.enableSizeReports) {\n      const windowOps = terminal.options.windowOptions ?? {};\n      windowOps.getWinSizePixels = true;\n      windowOps.getCellSizePixels = true;\n      windowOps.getWinSizeChars = true;\n      terminal.options.windowOptions = windowOps;\n    }\n\n    this._disposeLater(\n      this._renderer,\n      this._storage,\n\n      // DECSET/DECRST/DA1/XTSMGRAPHICS handlers\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'h' }, params => this._decset(params)),\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'l' }, params => this._decrst(params)),\n      terminal.parser.registerCsiHandler({ final: 'c' }, params => this._da1(params)),\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'S' }, params => this._xtermGraphicsAttributes(params)),\n\n      // render hook\n      terminal.onRender(range => this._storage?.render(range)),\n\n      /**\n       * reset handlers covered:\n       * - DECSTR\n       * - RIS\n       * - Terminal.reset()\n       */\n      terminal.parser.registerCsiHandler({ intermediates: '!', final: 'p' }, () => this.reset()),\n      terminal.parser.registerEscHandler({ final: 'c' }, () => this.reset()),\n      terminal._core._inputHandler.onRequestReset(() => this.reset()),\n\n      // wipe canvas and delete alternate images on buffer switch\n      terminal.buffer.onBufferChange(() => this._storage?.wipeAlternate()),\n\n      // extend images to the right on resize\n      terminal.onResize(metrics => this._storage?.viewportResize(metrics))\n    );\n\n    // SIXEL handler\n    if (this._opts.sixelSupport) {\n      const sixelStorage = new SixelImageStorage(this._storage!, this._opts, this._renderer!, terminal);\n      const sixelHandler = new SixelHandler(this._opts, sixelStorage, terminal);\n      this._handlers.set('sixel', sixelHandler);\n      this._disposeLater(\n        terminal._core._inputHandler._parser.registerDcsHandler({ final: 'q' }, sixelHandler)\n      );\n    }\n\n    // iTerm IIP handler\n    if (this._opts.iipSupport) {\n      const iipStorage = new IIPImageStorage(this._storage!);\n      const iipHandler = new IIPHandler(this._opts, this._renderer!, iipStorage, terminal);\n      this._handlers.set('iip', iipHandler);\n      this._disposeLater(\n        terminal._core._inputHandler._parser.registerOscHandler(1337, iipHandler)\n      );\n    }\n\n    // Kitty graphics handler\n    if (this._opts.kittySupport) {\n      const kittyStorage = new KittyImageStorage(this._storage!);\n      const kittyHandler = new KittyGraphicsHandler(this._opts, this._renderer!, kittyStorage, terminal);\n      this._handlers.set('kitty', kittyHandler);\n      this._disposeLater(\n        kittyStorage,\n        kittyHandler,\n        terminal._core._inputHandler._parser.registerApcHandler({ final: 'G' }, kittyHandler)\n      );\n    }\n  }\n\n  // Note: storageLimit is skipped here to not intoduce a surprising side effect.\n  public reset(): boolean {\n    // reset options customizable by sequences to defaults\n    this._opts.sixelScrolling = this._defaultOpts.sixelScrolling;\n    this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit;\n    // also clear image storage\n    this._storage?.reset();\n    // reset protocol handlers\n    for (const handler of this._handlers.values()) {\n      handler.reset();\n    }\n    return false;\n  }\n\n  public get storageLimit(): number {\n    return this._storage?.getLimit() || -1;\n  }\n\n  public set storageLimit(limit: number) {\n    this._storage?.setLimit(limit);\n    this._opts.storageLimit = limit;\n  }\n\n  public get storageUsage(): number {\n    if (this._storage) {\n      return this._storage.getUsage();\n    }\n    return -1;\n  }\n\n  public get showPlaceholder(): boolean {\n    return this._opts.showPlaceholder;\n  }\n\n  public set showPlaceholder(value: boolean) {\n    this._opts.showPlaceholder = value;\n    this._renderer?.showPlaceholder(value);\n  }\n\n  public getImageAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    return this._storage?.getImageAtBufferCell(x, y);\n  }\n\n  public extractTileAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    return this._storage?.extractTileAtBufferCell(x, y);\n  }\n\n  private _report(s: string): void {\n    this._terminal?._core.input(s, false);\n  }\n\n  private _decset(params: (number | number[])[]): boolean {\n    for (let i = 0; i < params.length; ++i) {\n      switch (params[i]) {\n        case 80:\n          this._opts.sixelScrolling = false;\n          break;\n      }\n    }\n    return false;\n  }\n\n  private _decrst(params: (number | number[])[]): boolean {\n    for (let i = 0; i < params.length; ++i) {\n      switch (params[i]) {\n        case 80:\n          this._opts.sixelScrolling = true;\n          break;\n      }\n    }\n    return false;\n  }\n\n  // overload DA to return something more appropriate\n  private _da1(params: (number | number[])[]): boolean {\n    if (params[0]) {\n      return true;\n    }\n    // reported features:\n    // 62 - VT220\n    // 4 - SIXEL support\n    // 9 - charsets\n    // 22 - ANSI colors\n    if (this._opts.sixelSupport) {\n      this._report(`\\x1b[?62;4;9;22c`);\n      return true;\n    }\n    return false;\n  }\n\n  /**\n   * Implementation of xterm's graphics attribute sequence.\n   *\n   * Supported features:\n   * - read/change palette limits (max 4096 by sixel lib)\n   * - read SIXEL canvas geometry (reports current window canvas or\n   *   squared pixelLimit if canvas > pixel limit)\n   *\n   * Everything else is deactivated.\n   */\n  private _xtermGraphicsAttributes(params: (number | number[])[]): boolean {\n    if (params.length < 2) {\n      return true;\n    }\n    if (params[0] === GaItem.COLORS) {\n      switch (params[1]) {\n        case GaAction.READ:\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          return true;\n        case GaAction.SET_DEFAULT:\n          this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit;\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          // also reset protocol handlers for now\n          for (const handler of this._handlers.values()) {\n            handler.reset();\n          }\n          return true;\n        case GaAction.SET:\n          if (params.length > 2 && !(params[2] instanceof Array) && params[2] <= MAX_SIXEL_PALETTE_SIZE) {\n            this._opts.sixelPaletteLimit = params[2];\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          } else {\n            this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          }\n          return true;\n        case GaAction.READ_MAX:\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${MAX_SIXEL_PALETTE_SIZE}S`);\n          return true;\n        default:\n          this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          return true;\n      }\n    }\n    if (params[0] === GaItem.SIXEL_GEO) {\n      switch (params[1]) {\n        // we only implement read and read_max here\n        case GaAction.READ:\n          let width = this._renderer?.dimensions?.css.canvas.width;\n          let height = this._renderer?.dimensions?.css.canvas.height;\n          if (!width || !height) {\n            // for some reason we have no working image renderer\n            // --> fallback to default cell size\n            const cellSize = CELL_SIZE_DEFAULT;\n            width = (this._terminal?.cols || 80) * cellSize.width;\n            height = (this._terminal?.rows || 24) * cellSize.height;\n          }\n          if (width * height < this._opts.pixelLimit) {\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${width.toFixed(0)};${height.toFixed(0)}S`);\n          } else {\n            // if we overflow pixelLimit report that squared instead\n            const x = Math.floor(Math.sqrt(this._opts.pixelLimit));\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${x};${x}S`);\n          }\n          return true;\n        case GaAction.READ_MAX:\n          // read_max returns pixelLimit as square area\n          const x = Math.floor(Math.sqrt(this._opts.pixelLimit));\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${x};${x}S`);\n          return true;\n        default:\n          this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          return true;\n      }\n    }\n    // exit with error on ReGIS or any other requests\n    this._report(`\\x1b[?${params[0]};${GaStatus.ITEM_ERROR}S`);\n    return true;\n  }\n}\n"],"names":["root","factory","exports","module","define","amd","globalThis","red","n","green","blue","toRGBA8888","r","g","b","a","clamp","low","high","value","Math","max","min","h2c","t1","t2","c","normalizeRGB","round","Object","defineProperty","DEFAULT_FOREGROUND","DEFAULT_BACKGROUND","PALETTE_ANSI_256","PALETTE_VT340_GREY","PALETTE_VT340_COLOR","normalizeHLS","nearestColorIndex","fromRGBA8888","alpha","BIG_ENDIAN","Uint8Array","Uint32Array","buffer","console","warn","color","palette","Number","MAX_SAFE_INTEGER","idx","i","length","dr","dg","db","d","h","l","s","v","HLStoRGB","p","push","decodeAsync","decode","Decoder","DecoderAsync","Colors_1","__webpack_require__","wasm_1","WASM_BYTES","Buffer","from","bytestring","atob","result","charCodeAt","decodeBase64","LIMITS","BYTES","WASM_MODULE","NULL_CANVAS","CallbackProxy","constructor","this","bandHandler","width","modeHandler","mode","handle_band","mode_parsed","DEFAULT_OPTIONS","memoryLimit","sixelColor","fillColor","paletteLimit","PALETTE_SIZE","truncate","opts","cbProxy","importObj","env","bind","WebAssembly","instantiate","then","inst","instance","_instance","_cbProxy","_PIXEL_OFFSET","MAX_WIDTH","_canvas","_bandWidths","_maxWidth","_minWidth","_lastOffset","_currentHeight","_opts","assign","Error","_handle_band","_initCanvas","Module","Instance","_wasm","_chunk","memory","get_chunk_address","CHUNK_SIZE","_states","get_state_address","_palette","get_palette_address","set","_pSrc","get_p0_address","init","_fillColor","_truncate","_rasterWidth","_rasterHeight","_width","_height","_level","_mode","_paletteLimit","pixels","height","release","_realloc","offset","additionalPixels","newCanvas","ceil","adv","remaining","subarray","current_width","current_height","memoryUsage","byteLength","properties","level","memUsage","rasterAttributes","numerator","denominator","data","start","end","decodeString","j","data32","currentWidth","fill","escape","final","finalOffset","bw","currentHeight","data8","Uint8ClampedArray","dec","async","Lifecycle_1","EventUtils","_listeners","_disposed","event","_event","listener","thisArgs","disposables","toDisposable","entry","fn","slice","indexOf","splice","Array","isArray","add","fire","call","listeners","len","dispose","forward","to","e","map","undefined","any","events","store","DisposableStore","runAndSubscribe","handler","initial","arg","_disposables","Set","_isDisposed","isDisposed","o","clear","Disposable","_store","_register","None","freeze","_value","ImageRenderer_1","ImageStorage_1","Base64Decoder_wasm_1","__importDefault","QoiDecoder_wasm_1","IIPHeaderParser_1","IIPMetrics_1","DEFAULT_HEADER","type","name","size","preserveAspectRatio","inline","_renderer","_storage","_coreTerminal","_aborted","_hp","HeaderParser","_header","_isMultipart","_abortMulti","maxEncodedBytes","iipSizeLimit","initialBytes","_dec","default","_qoiDec","reset","put","state","dataPos","parse","fields","success","seqType","w","CELL_SIZE_DEFAULT","dimensions","css","canvas","cols","rows","scale","_c","_a","_core","_coreBrowserService","dpr","report","toFixed","input","cond","blob","metrics","UNSUPPORTED_TYPE","imageType","mime","pixelLimit","_resize","floor","ImageData","byteOffset","ImageRenderer","createCanvas","_b","getContext","putImageData","addImage","Blob","createImageBitmap","resizeWidth","resizeHeight","bm","catch","cw","cell","ch","_d","rw","_dim","rh","wf","hf","f","total","cdim","endsWith","parseInt","toStr","String","fromCharCode","toInt","toSize","match","DECODERS","toString","bs","TextDecoder","FILE_MARKER","MULTIPARTFILE_MARKER","FILEPART_MARKER","FILEEND_MARKER","REPORTCELLSIZE_MARKER","MAX_FIELDCHARS","_buffer","_position","_key","k","_storeValue","pos","_storeKey","_addImageOpts","scrolling","layer","zIndex","cursorPos","img","d32","blockLength","jpgSize","dim","limit","_layers","get","localDocument","document","createElement","createImageData","ctx","imgData","Promise","resolve","_terminal","super","Map","_optionsRefresh","MutableDisposable","_oldOpen","open","parent","_open","screenElement","optionsService","onOptionChange","option","rescaleCanvas","_renderService","refreshRows","removeLayerFromDom","_oldSetRenderer","setRenderer","_placeholderBitmap","close","_placeholder","showPlaceholder","cellSize","_createPlaceHolder","clearLines","y","clearRect","_e","clearAll","draw","imgSpec","tileId","col","row","count","_rescaleImage","actual","sx","sy","dx","dy","finalWidth","finalHeight","drawImage","extractTile","drawPlaceholder","values","spec","actualCellSize","originalWidth","originalHeight","origCellSize","orig","renderer","key","keys","insertLayerToDom","has","classList","style","isolation","insertBefore","firstChild","appendChild","remove","delete","hasLayer","bWidth","blueprint","black","white","shift","x","screen","ctx2","bitmap","window","ExtendedAttrsImage","ext","_urlId","_ext","underlineStyle","underlineColor","underlineVariantOffset","val","urlId","imageId","clone","isEmpty","EMPTY_ATTRS","_images","_lastId","_lowestId","_fullyCleared","_needsFullClear","_pixelLimit","setLimit","storageLimit","error","message","getLimit","_viewportMetrics","marker","RangeError","_evictOldest","getUsage","_getStoredPixels","storedPixels","_delImg","id","ImageBitmap","onImageDeleted","wipeAlternate","zero","entries","bufferType","deleteImage","termCols","termRows","originX","originY","tileCount","_inputHandler","_dirtyRowTracker","markDirty","line","lines","ybase","_writeToCell","lineFeed","endMarker","registerMarker","onDispose","active","_evictOnAlternate","onImageAdded","render","range","hasTopImages","hasBottomImages","drawCalls","placeholderCalls","ydisp","getBg","_extendedAttrs","startTile","startCol","sort","viewportResize","oldCol","tilesPerRow","hasData","rightCol","_data","lastTile","expandCol","getImageAtBufferCell","extractTileAtBufferCell","room","used","current","old","oldSpec","imgId","Decoder_1","DEFAULT_PALETTE","convertLe","_size","sixelPaletteLimit","hook","params","attr","colors","bg","isInverse","isFgDefault","foreground","rgba","isFgRGB","t","toColorRGB","getFgColor","ansi","isBgDefault","background","isBgRGB","getBgColor","extractActiveBg","_curAttrData","_themeService","sixelSizeLimit","unhook","advanceCursor","sixelScrolling","KittyGraphicsTypes_1","_kittyStorage","_decodeError","_activeDecoder","_inControlData","_controlData","_controlLength","_encodedSizeLimit","_totalEncodedSize","_parsedCommand","_pendingTransmissions","_maxEncodedBytes","kittySizeLimit","_initialEncodedBytes","_cleanupAllPending","_removePendingEntry","_lastPendingKey","pending","decoder","controlEnd","copyLength","parseKittyCommand","_parseControlDataString","imageNumber","_sendResponse","quiet","action","payloadStart","_streamPayload","pendingKey","previousEncodedSize","totalEncodedSize","decoderToRelease","_handleNoPayloadCommand","cmd","_handleDelete","isMoreComing","more","decodeError","finalCmd","imageBytes","_handleCommandWithBytesAndCmd","str","fromCodePoint","_handlePlacement","bytes","_handleTransmit","transmission","_handleTransmitDisplay","_handleQuery","image","getImage","_displayImage","placementId","storeImage","format","compression","_f","lastImageId","expectedBytes","deleteSelector","deleteAll","deleteById","isOk","response","coreService","triggerDataEvent","_decodeAndDisplay","_createBitmap","cropX","cropY","cropW","sourceWidth","cropH","sourceHeight","maxCropW","maxCropH","finalCropW","finalCropH","cropped","imgCols","imgRows","columns","savedX","savedY","savedYbase","scaled","xOffset","yOffset","canvasW","canvasH","offsetCanvas","offsetCtx","offsetBitmap","_g","cursorMovement","scrolled","arrayBuffer","_decompressZlib","url","URL","createObjectURL","Image","reject","addEventListener","revokeObjectURL","src","pixelCount","src32","dst32","alignedPixels","srcOffset","dstOffset","b0","b1","b2","srcByte","dstByte","compressed","_decompress","ds","DecompressionStream","writer","writable","getWriter","write","chunks","reader","readable","getReader","done","read","totalLength","reduce","sum","chunk","images","_kittyIdToStorageId","kittyIdToStorageId","pendingTransmissions","parts","split","part","eqIdx","substring","numValue","KittyImageStorage","_nextImageId","_storageIdToKittyId","_handleStorageImageDeleted","storageId","kittyId","_previousOnImageDeleted","_wrappedOnImageDeleted","imageData","oldStorageId","_maxStoredImages","_evictUndisplayedImages","wasmDecode","InWasm","MAP","el","D","EMPTY","keepSize","maxBytes","_inst","_ended","_bytes","_m32","_mem","m","grow","Memory","requested","needed","newSize","addPages","loadedBytes","freeBytes","wasmQoiDecode","ib","dl","chunkP","def","W","z","compile","_wasmCtx","fromBase64","__webpack_module_cache__","moduleId","cachedModule","__webpack_modules__","Event_1","IIPHandler_1","KittyGraphicsHandler_1","KittyImageStorage_1","SixelHandler_1","SixelImageStorage_1","IIPImageStorage_1","enableSizeReports","sixelSupport","iipSupport","kittySupport","_handlers","_onImageAdded","Emitter","_defaultOpts","obj","_disposeLater","args","activate","terminal","ImageStorage","windowOps","options","windowOptions","getWinSizePixels","getCellSizePixels","getWinSizeChars","parser","registerCsiHandler","prefix","_decset","_decrst","_da1","_xtermGraphicsAttributes","onRender","intermediates","registerEscHandler","onRequestReset","onBufferChange","onResize","sixelStorage","SixelImageStorage","sixelHandler","SixelHandler","_parser","registerDcsHandler","iipStorage","IIPImageStorage","iipHandler","IIPHandler","registerOscHandler","kittyStorage","kittyHandler","KittyGraphicsHandler","registerApcHandler","storageUsage","_report","sqrt"],"sourceRoot":""}
 \ No newline at end of file
-+{"version":3,"file":"addon-image.js","mappings":";CAAA,SAAAA,EAAAC,GACA,iBAAAC,SAAA,iBAAAC,OACAA,OAAAD,QAAAD,IACA,mBAAAG,QAAAA,OAAAC,IACAD,OAAA,GAAAH,GACA,iBAAAC,QACAA,QAAA,WAAAD,IAEAD,EAAA,WAAAC,GACC,CATD,CASCK,WAAA,uCCKD,SAAAC,EAAAC,GACA,WAAAA,CACA,CAEA,SAAAC,EAAAD,GACA,OAAAA,IAAA,KACA,CAEA,SAAAE,EAAAF,GACA,OAAAA,IAAA,MACA,CASA,SAAAG,EAAAC,EAAAC,EAAAC,EAAAC,EAAA,KACA,YAAAA,IAAA,QAAAD,IAAA,QAAAD,IAAA,MAAAD,KAAA,CACA,CAqCA,SAAAI,EAAAC,EAAAC,EAAAC,GACA,OAAAC,KAAAC,IAAAJ,EAAAG,KAAAE,IAAAH,EAAAD,GACA,CACA,SAAAK,EAAAC,EAAAC,EAAAC,GAKA,OAJAA,EAAA,IACAA,GAAA,GACAA,EAAA,IACAA,GAAA,GACA,EAAAA,EAAA,EACAD,EAAA,GAAAD,EAAAC,GAAAC,EACA,EAAAA,EAAA,EACAF,EACA,EAAAE,EAAA,EACAD,GAAAD,EAAAC,IAAA,IAAAC,GACAD,CACA,CAaA,SAAAE,EAAAf,EAAAC,EAAAC,GACA,kBAAAM,KAAAQ,MAAAd,EAAA,aAAAM,KAAAQ,MAAAf,EAAA,YAAAO,KAAAQ,MAAAhB,EAAA,aACA,CAjGAiB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAC/CjB,EAAA6B,mBAA6B7B,EAAA8B,mBAA6B9B,EAAA+B,iBAA2B/B,EAAAgC,mBAA6BhC,EAAAiC,oBAA8BjC,EAAAkC,aAAuBlC,EAAAyB,aAAuBzB,EAAAmC,kBAA4BnC,EAAAoC,aAAuBpC,EAAAS,WAAqBT,EAAAqC,MAAgBrC,EAAAQ,KAAeR,EAAAO,MAAgBP,EAAAK,IAAcL,EAAAsC,gBAAkB,EAGrVtC,EAAAsC,WAAkB,UAAAC,WAAA,IAAAC,YAAA,cAAAC,QAAA,GAClBzC,EAAAsC,YACAI,QAAAC,KAAA,+EAMA3C,EAAAK,IAAWA,EAIXL,EAAAO,MAAaA,EAIbP,EAAAQ,KAAYA,EAIZR,EAAAqC,MAHA,SAAA/B,GACA,OAAAA,IAAA,MACA,EAQAN,EAAAS,WAAkBA,EAOlBT,EAAAoC,aAHA,SAAAQ,GACA,WAAAA,EAAAA,GAAA,MAAAA,GAAA,OAAAA,IAAA,GACA,EA2BA5C,EAAAmC,kBArBA,SAAAS,EAAAC,GACA,MAAAnC,EAAAL,EAAAuC,GACAjC,EAAAJ,EAAAqC,GACAhC,EAAAJ,EAAAoC,GACA,IAAAxB,EAAA0B,OAAAC,iBACAC,GAAA,EAEA,QAAAC,EAAA,EAAoBA,EAAAJ,EAAAK,SAAoBD,EAAA,CACxC,MAAAE,EAAAzC,EAAAmC,EAAAI,GAAA,GACAG,EAAAzC,EAAAkC,EAAAI,GAAA,GACAI,EAAAzC,EAAAiC,EAAAI,GAAA,GACAK,EAAAH,EAAAA,EAAAC,EAAAA,EAAAC,EAAAA,EACA,IAAAC,EACA,OAAAL,EACAK,EAAAlC,IACAA,EAAAkC,EACAN,EAAAC,EAEA,CACA,OAAAD,CACA,EAmCAhD,EAAAyB,aAAoBA,EAQpBzB,EAAAkC,aAJA,SAAAqB,EAAAC,EAAAC,GAEA,OArBA,SAAAF,EAAAC,EAAAC,GACA,IAAAA,EAAA,CACA,MAAAC,EAAAxC,KAAAQ,MAAA,IAAA8B,GACA,OAAA/C,EAAAiD,EAAAA,EAAAA,EACA,CACA,MAAApC,EAAAkC,EAAA,GAAAA,GAAA,EAAAC,GAAAD,EAAAC,EAAAD,EAAAC,EACAlC,EAAA,EAAAiC,EAAAlC,EACA,OAAAb,EAAAK,EAAA,MAAAI,KAAAQ,MAAA,IAAAL,EAAAC,EAAAC,EAAAgC,EAAA,OAAAzC,EAAA,MAAAI,KAAAQ,MAAA,IAAAL,EAAAC,EAAAC,EAAAgC,KAAAzC,EAAA,MAAAI,KAAAQ,MAAA,IAAAL,EAAAC,EAAAC,EAAAgC,EAAA,OACA,CAaAI,EAAAJ,EAAA,SAAAC,EAAA,IAAAC,EAAA,IACA,EA+BAzD,EAAAiC,oBAA2B,IAAAO,YAAA,CAC3Bf,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,YA0BAzB,EAAAgC,mBAA0B,IAAAQ,YAAA,CAC1Bf,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,YAOAzB,EAAA+B,iBAAwB,MAExB,MAAA6B,EAAA,CACAnD,EAAA,OACAA,EAAA,SACAA,EAAA,SACAA,EAAA,WACAA,EAAA,SACAA,EAAA,WACAA,EAAA,WACAA,EAAA,aACAA,EAAA,aACAA,EAAA,SACAA,EAAA,SACAA,EAAA,WACAA,EAAA,WACAA,EAAA,WACAA,EAAA,WACAA,EAAA,cAGA6C,EAAA,uBACA,QAAA5C,EAAA,EAAoBA,EAAA,IAAOA,EAC3B,QAAAC,EAAA,EAAwBA,EAAA,IAAOA,EAC/B,QAAAC,EAAA,EAA4BA,EAAA,IAAOA,EACnCgD,EAAAC,KAAApD,EAAA6C,EAAA5C,GAAA4C,EAAA3C,GAAA2C,EAAA1C,KAKA,QAAA8C,EAAA,EAAoBA,GAAA,IAAUA,GAAA,GAC9BE,EAAAC,KAAApD,EAAAiD,EAAAA,EAAAA,IAEA,WAAAlB,YAAAoB,EACC,EAlCuB,GA0CxB5D,EAAA8B,mBAA0BrB,EAAA,WAC1BT,EAAA6B,mBAA0BpB,EAAA,6BCpP1BkB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAC/CjB,EAAA8D,YAAsB9D,EAAA+D,OAAiB/D,EAAAgE,QAAkBhE,EAAAiE,kBAAoB,EAC7E,MAAAC,EAAiBC,EAAQ,KACzBC,EAAeD,EAAQ,KAavBE,EAXA,SAAAZ,GACA,uBAAAa,OACA,OAAAA,OAAAC,KAAAd,EAAA,UAEA,MAAAe,EAAAC,KAAAhB,GACAiB,EAAA,IAAAnC,WAAAiC,EAAAtB,QACA,QAAAD,EAAA,EAAoBA,EAAAyB,EAAAxB,SAAmBD,EACvCyB,EAAAzB,GAAAuB,EAAAG,WAAA1B,GAEA,OAAAyB,CACA,CACAE,CAAAR,EAAAS,OAAAC,OACA,IAAAC,EAEA,MAAAC,EAAA,IAAAxC,YAEA,MAAAyC,EACA,WAAAC,GACAC,KAAAC,YAAAC,GAAA,EACAF,KAAAG,YAAAC,GAAA,CACA,CACA,WAAAC,CAAAH,GACA,OAAAF,KAAAC,YAAAC,EACA,CACA,WAAAI,CAAAF,GACA,OAAAJ,KAAAG,YAAAC,EACA,EAGA,MAAAG,EAAA,CACAC,YAAA,UACAC,WAAA1B,EAAArC,mBACAgE,UAAA3B,EAAApC,mBACAe,QAAAqB,EAAAjC,oBACA6D,aAAA1B,EAAAS,OAAAkB,aACAC,UAAA,GAMA,SAAA/B,EAAAgC,GACA,MAAAC,EAAA,IAAAjB,EACAkB,EAAA,CACAC,IAAA,CACAZ,YAAAU,EAAAV,YAAAa,KAAAH,GACAT,YAAAS,EAAAT,YAAAY,KAAAH,KAGA,OAAAI,YAAAC,YAAAxB,GAAAV,EAAA8B,GACAK,KAAAC,IACA1B,EAAAA,GAAA0B,EAAAxG,OACA,IAAA+D,EAAAiC,EAAAQ,EAAAC,UAAAD,EAAAP,IAEA,CACAlG,EAAAiE,aAAoBA,EAiCpB,MAAAD,EAKA,WAAAkB,CAAAe,EAAAU,EAAAC,GASA,GARAzB,KAAA0B,cAAAzC,EAAAS,OAAAiC,UAAA,EACA3B,KAAA4B,QAAA/B,EACAG,KAAA6B,YAAA,GACA7B,KAAA8B,UAAA,EACA9B,KAAA+B,UAAA9C,EAAAS,OAAAiC,UACA3B,KAAAgC,YAAA,EACAhC,KAAAiC,eAAA,EACAjC,KAAAkC,MAAA1F,OAAA2F,OAAA,GAAqC5B,EAAAO,GACrCd,KAAAkC,MAAAvB,aAAA1B,EAAAS,OAAAkB,aACA,UAAAwB,MAAA,+CAA2EnD,EAAAS,OAAAkB,gBAE3E,GAAAY,EAUAC,EAAAxB,YAAAD,KAAAqC,aAAAnB,KAAAlB,MACAyB,EAAAtB,YAAAH,KAAAsC,YAAApB,KAAAlB,UAXA,CACA,MAAAlF,EAAA8E,IAAAA,EAAA,IAAAuB,YAAAoB,OAAArD,IACAsC,EAAA,IAAAL,YAAAqB,SAAA1H,EAAA,CACAmG,IAAA,CACAZ,YAAAL,KAAAqC,aAAAnB,KAAAlB,MACAM,YAAAN,KAAAsC,YAAApB,KAAAlB,QAGA,CAKAA,KAAAwB,UAAAA,EACAxB,KAAAyC,MAAAzC,KAAAwB,UAAA3G,QACAmF,KAAA0C,OAAA,IAAAtF,WAAA4C,KAAAyC,MAAAE,OAAArF,OAAA0C,KAAAyC,MAAAG,oBAAA3D,EAAAS,OAAAmD,YACA7C,KAAA8C,QAAA,IAAAzF,YAAA2C,KAAAyC,MAAAE,OAAArF,OAAA0C,KAAAyC,MAAAM,oBAAA,IACA/C,KAAAgD,SAAA,IAAA3F,YAAA2C,KAAAyC,MAAAE,OAAArF,OAAA0C,KAAAyC,MAAAQ,sBAAAhE,EAAAS,OAAAkB,cACAZ,KAAAgD,SAAAE,IAAAlD,KAAAkC,MAAAxE,SACAsC,KAAAmD,MAAA,IAAA9F,YAAA2C,KAAAyC,MAAAE,OAAArF,OAAA0C,KAAAyC,MAAAW,kBACApD,KAAAyC,MAAAY,KAAAtE,EAAArC,mBAAA,EAAAsD,KAAAkC,MAAAvB,aAAA,EACA,CAEA,cAAA2C,GAAuB,OAAAtD,KAAA8C,QAAA,GACvB,aAAAS,GAAsB,OAAAvD,KAAA8C,QAAA,GACtB,gBAAAU,GAAyB,OAAAxD,KAAA8C,QAAA,GACzB,iBAAAW,GAA0B,OAAAzD,KAAA8C,QAAA,GAC1B,UAAAY,GAAmB,OAAA1D,KAAA8C,QAAA,GAAA9C,KAAA8C,QAAA,OACnB,WAAAa,GAAoB,OAAA3D,KAAA8C,QAAA,GACpB,UAAAc,GAAmB,OAAA5D,KAAA8C,QAAA,GACnB,SAAAe,GAAkB,OAAA7D,KAAA8C,QAAA,IAClB,iBAAAgB,GAA0B,OAAA9D,KAAA8C,QAAA,IAC1B,WAAAR,CAAAlC,GACA,OAAAA,EAAA,CACA,MAAA2D,EAAA/D,KAAAE,MAAAF,KAAAgE,OACA,GAAAD,EAAA/D,KAAA4B,QAAA7D,OAAA,CACA,GAAAiC,KAAAkC,MAAA1B,aAAA,EAAAuD,EAAA/D,KAAAkC,MAAA1B,YAEA,MADAR,KAAAiE,UACA,IAAA7B,MAAA,8BAEApC,KAAA4B,QAAA,IAAAvE,YAAA0G,EACA,CACA/D,KAAA8B,UAAA9B,KAAA0D,MACA,MACA,OAAAtD,EACA,OAAAJ,KAAA4D,OAAA,CAEA,MAAAG,EAAAhI,KAAAE,IAAA+D,KAAAwD,aAAAvE,EAAAS,OAAAiC,WAAA3B,KAAAyD,cACA,GAAAM,EAAA/D,KAAA4B,QAAA7D,OAAA,CACA,GAAAiC,KAAAkC,MAAA1B,aAAA,EAAAuD,EAAA/D,KAAAkC,MAAA1B,YAEA,MADAR,KAAAiE,UACA,IAAA7B,MAAA,8BAEApC,KAAA4B,QAAA,IAAAvE,YAAA0G,EACA,CACA,MAGA/D,KAAA4B,QAAA7D,OAAA,QACAiC,KAAA4B,QAAA,IAAAvE,YAAA,QAIA,QACA,CACA,QAAA6G,CAAAC,EAAAC,GACA,MAAAL,EAAAI,EAAAC,EACA,GAAAL,EAAA/D,KAAA4B,QAAA7D,OAAA,CACA,GAAAiC,KAAAkC,MAAA1B,aAAA,EAAAuD,EAAA/D,KAAAkC,MAAA1B,YAEA,MADAR,KAAAiE,UACA,IAAA7B,MAAA,8BAGA,MAAAiC,EAAA,IAAAhH,YAAA,MAAAtB,KAAAuI,KAAAP,EAAA,QACAM,EAAAnB,IAAAlD,KAAA4B,SACA5B,KAAA4B,QAAAyC,CACA,CACA,CACA,YAAAhC,CAAAnC,GACA,MAAAqE,EAAAvE,KAAA0B,cACA,IAAAyC,EAAAnE,KAAAgC,YACA,OAAAhC,KAAA6D,MAAA,CACA,IAAAW,EAAAxE,KAAAgE,OAAAhE,KAAAiC,eACA5F,EAAA,EACA,KAAAA,EAAA,GAAAmI,EAAA,GACAxE,KAAA4B,QAAAsB,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAlI,EAAAkI,EAAAlI,EAAA6D,GAAAiE,EAAAjE,EAAA7D,GACAA,IACAmI,IAEAxE,KAAAgC,aAAA9B,EAAA7D,EACA2D,KAAAiC,gBAAA5F,CACA,MACA,OAAA2D,KAAA6D,MAAA,CACA7D,KAAAkE,SAAAC,EAAA,EAAAjE,GACAF,KAAA8B,UAAA/F,KAAAC,IAAAgE,KAAA8B,UAAA5B,GACAF,KAAA+B,UAAAhG,KAAAE,IAAA+D,KAAA+B,UAAA7B,GACA,QAAApC,EAAA,EAA4BA,EAAA,IAAOA,EACnCkC,KAAA4B,QAAAsB,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAzG,EAAAyG,EAAAzG,EAAAoC,GAAAiE,EAAAjE,EAAApC,GAEAkC,KAAA6B,YAAAnD,KAAAwB,GACAF,KAAAgC,aAAA,EAAA9B,EACAF,KAAAiC,gBAAA,CACA,CACA,QACA,CAMA,SAAA/B,GACA,WAAAF,KAAA6D,MACA7D,KAAA0D,OACA3H,KAAAC,IAAAgE,KAAA8B,UAAA9B,KAAAyC,MAAAiC,gBACA,CAMA,UAAAV,GACA,WAAAhE,KAAA6D,MACA7D,KAAA2D,QACA3D,KAAAyC,MAAAiC,gBACA,EAAA1E,KAAA6B,YAAA9D,OAAAiC,KAAAyC,MAAAkC,iBACA,EAAA3E,KAAA6B,YAAA9D,MACA,CAIA,WAAAL,GACA,OAAAsC,KAAAgD,SAAAyB,SAAA,EAAAzE,KAAA8D,cACA,CAUA,eAAAc,GACA,OAAA5E,KAAA4B,QAAAiD,WAAA7E,KAAAyC,MAAAE,OAAArF,OAAAuH,WAAA,EAAA7E,KAAA6B,YAAA9D,MACA,CAIA,cAAA+G,GACA,OACA5E,MAAAF,KAAAE,MACA8D,OAAAhE,KAAAgE,OACA5D,KAAAJ,KAAA6D,MACAkB,MAAA/E,KAAA4D,OACA/C,WAAAb,KAAAuD,UACA5C,aAAAX,KAAA8D,cACApD,UAAAV,KAAAsD,WACA0B,SAAAhF,KAAA4E,YACAK,iBAAA,CACAC,UAAAlF,KAAA8C,QAAA,GACAqC,YAAAnF,KAAA8C,QAAA,GACA5C,MAAAF,KAAAwD,aACAQ,OAAAhE,KAAAyD,eAGA,CAMA,IAAAJ,CAAA3C,EAAAV,KAAAkC,MAAAxB,UAAAhD,EAAAsC,KAAAkC,MAAAxE,QAAAiD,EAAAX,KAAAkC,MAAAvB,aAAAE,EAAAb,KAAAkC,MAAArB,UACAb,KAAAyC,MAAAY,KAAArD,KAAAkC,MAAAzB,WAAAC,EAAAC,EAAAE,EAAA,KACAnD,GACAsC,KAAAgD,SAAAE,IAAAxF,EAAA+G,SAAA,EAAAxF,EAAAS,OAAAkB,eAEAZ,KAAA6B,YAAA9D,OAAA,EACAiC,KAAA8B,UAAA,EACA9B,KAAA+B,UAAA9C,EAAAS,OAAAiC,UACA3B,KAAAgC,YAAA,EACAhC,KAAAiC,eAAA,CACA,CAKA,MAAArD,CAAAwG,EAAAC,EAAA,EAAAC,EAAAF,EAAArH,QACA,IAAAU,EAAA4G,EACA,KAAA5G,EAAA6G,GAAA,CACA,MAAAvH,EAAAhC,KAAAE,IAAAqJ,EAAA7G,EAAAQ,EAAAS,OAAAmD,YACA7C,KAAA0C,OAAAQ,IAAAkC,EAAAX,SAAAhG,EAAAA,GAAAV,IACAiC,KAAAyC,MAAA7D,OAAA,EAAAb,EACA,CACA,CAMA,YAAAwH,CAAAH,EAAAC,EAAA,EAAAC,EAAAF,EAAArH,QACA,IAAAU,EAAA4G,EACA,KAAA5G,EAAA6G,GAAA,CACA,MAAAvH,EAAAhC,KAAAE,IAAAqJ,EAAA7G,EAAAQ,EAAAS,OAAAmD,YACA,QAAA/E,EAAA,EAAA0H,EAAA/G,EAAmCX,EAAAC,IAAYD,IAAA0H,EAC/CxF,KAAA0C,OAAA5E,GAAAsH,EAAA5F,WAAAgG,GAEA/G,GAAAV,EACAiC,KAAAyC,MAAA7D,OAAA,EAAAb,EACA,CACA,CAKA,UAAA0H,GACA,OAAAzF,KAAA6D,QAAA7D,KAAAE,QAAAF,KAAAgE,OACA,OAAAnE,EAGA,MAAA6F,EAAA1F,KAAAyC,MAAAiC,gBACA,OAAA1E,KAAA6D,MAAA,CACA,IAAAW,EAAAxE,KAAAgE,OAAAhE,KAAAiC,eACA,GAAAuC,EAAA,GACA,MAAAD,EAAAvE,KAAA0B,cACA,IAAAyC,EAAAnE,KAAAgC,YACA3F,EAAA,EACA,KAAAA,EAAA,GAAAmI,EAAA,GACAxE,KAAA4B,QAAAsB,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAlI,EAAAkI,EAAAlI,EAAAqJ,GAAAvB,EAAAuB,EAAArJ,GACAA,IACAmI,IAEAA,GACAxE,KAAA4B,QAAA+D,KAAA3F,KAAAsD,WAAAa,EAAAuB,EAAArJ,EAEA,CACA,OAAA2D,KAAA4B,QAAA6C,SAAA,EAAAzE,KAAAE,MAAAF,KAAAgE,OACA,CACA,OAAAhE,KAAA6D,MAAA,CACA,GAAA7D,KAAA+B,YAAA/B,KAAA8B,UAAA,CACA,IAAA8D,GAAA,EACA,GAAAF,EACA,GAAAA,IAAA1F,KAAA+B,UACA6D,GAAA,MAEA,CACA,MAAArB,EAAAvE,KAAA0B,cACA,IAAAyC,EAAAnE,KAAAgC,YACAhC,KAAAkE,SAAAC,EAAA,EAAAuB,GACA,QAAA5H,EAAA,EAAwCA,EAAA,IAAOA,EAC/CkC,KAAA4B,QAAAsB,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAzG,EAAAyG,EAAAzG,EAAA4H,GAAAvB,EAAAuB,EAAA5H,EAEA,CAEA,IAAA8H,EACA,OAAA5F,KAAA4B,QAAA6C,SAAA,EAAAzE,KAAAE,MAAAF,KAAAgE,OAEA,CAGA,MAAA6B,EAAA,IAAAxI,YAAA2C,KAAAE,MAAAF,KAAAgE,QACA6B,EAAAF,KAAA3F,KAAAsD,YACA,IAAAwC,EAAA,EACAT,EAAA,EACA,QAAAvH,EAAA,EAA4BA,EAAAkC,KAAA6B,YAAA9D,SAA6BD,EAAA,CACzD,MAAAiI,EAAA/F,KAAA6B,YAAA/D,GACA,QAAAW,EAAA,EAAgCA,EAAA,IAAOA,EACvCoH,EAAA3C,IAAAlD,KAAA4B,QAAA6C,SAAAY,EAAAA,GAAAU,GAAAD,GACAA,GAAA9F,KAAAE,KAEA,CAEA,GAAAwF,EAAA,CACA,MAAAnB,EAAAvE,KAAA0B,cAEAsE,EAAAhG,KAAAyC,MAAAkC,iBACA,QAAA7G,EAAA,EAAgCA,EAAAkI,IAAmBlI,EACnD+H,EAAA3C,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAzG,EAAAyG,EAAAzG,EAAA4H,GAAAI,EAAA9F,KAAAE,MAAApC,EAEA,CACA,OAAA+H,CACA,CAEA,OAAAhG,CACA,CAKA,SAAAoG,GACA,WAAAC,kBAAAlG,KAAAyF,OAAAnI,OAAA,EAAA0C,KAAAE,MAAAF,KAAAgE,OAAA,EACA,CAaA,OAAAC,GACAjE,KAAA4B,QAAA/B,EACAG,KAAA6B,YAAA9D,OAAA,EACAiC,KAAA8B,UAAA,EACA9B,KAAA+B,UAAA9C,EAAAS,OAAAiC,UAGA3B,KAAAyC,MAAAY,KAAAtE,EAAArC,mBAAA,EAAAsD,KAAAkC,MAAAvB,aAAA,EACA,EAEA9F,EAAAgE,QAAeA,EAyBfhE,EAAA+D,OAXA,SAAAwG,EAAAtE,GACA,MAAAqF,EAAA,IAAAtH,EAAAiC,GAGA,OAFAqF,EAAA9C,OACA,iBAAA+B,EAAAe,EAAAZ,aAAAH,GAAAe,EAAAvH,OAAAwG,GACA,CACAlF,MAAAiG,EAAAjG,MACA8D,OAAAmC,EAAAnC,OACAyB,OAAAU,EAAAV,OACAQ,MAAAE,EAAAF,MAEA,EAkBApL,EAAA8D,YAXAyH,eAAAhB,EAAAtE,GACA,MAAAqF,QAAArH,EAAAgC,GAGA,OAFAqF,EAAA9C,OACA,iBAAA+B,EAAAe,EAAAZ,aAAAH,GAAAe,EAAAvH,OAAAwG,GACA,CACAlF,MAAAiG,EAAAjG,MACA8D,OAAAmC,EAAAnC,OACAyB,OAAAU,EAAAV,OACAQ,MAAAE,EAAAF,MAEA,YCpdAzJ,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAC/CjB,EAAA6E,YAAc,EACd7E,EAAA6E,OAAc,CACdmD,WAAA,MACAjC,aAAA,KACAe,UAAA,MACAhC,MAAA,+qdCCA,MAAA0G,EAAArH,EAAA,KAoEA,IAAiBsH,YA9DjB,iBAAAvG,GACUC,KAAAuG,WAAqD,GACrDvG,KAAAwG,WAAY,CA0DtB,CAvDE,SAAWC,GACT,OAAIzG,KAAK0G,SAGT1G,KAAK0G,OAAS,CAACC,EAAyBC,EAAgBC,KACtD,GAAI7G,KAAKwG,UACP,OAAO,EAAAH,EAAAS,cAAa,QAGtB,MAAMC,EAAQ,CAAEC,GAAIL,EAAUC,YAC9B5G,KAAKuG,WAAavG,KAAKuG,WAAWU,QAClCjH,KAAKuG,WAAW7H,KAAKqI,GAErB,MAAMxH,GAAS,EAAA8G,EAAAS,cAAa,KAC1B,MAAMjJ,EAAMmC,KAAKuG,WAAWW,QAAQH,IACvB,IAATlJ,IACFmC,KAAKuG,WAAavG,KAAKuG,WAAWU,QAClCjH,KAAKuG,WAAWY,OAAOtJ,EAAK,MAYhC,OARIgJ,IACEO,MAAMC,QAAQR,GAChBA,EAAYnI,KAAKa,GAEjBsH,EAAYS,IAAI/H,IAIbA,IA3BAS,KAAK0G,MA8BhB,CAEO,IAAAa,CAAKd,GACV,GAAIzG,KAAKwG,YAAcxG,KAAKuG,WAAWxI,OACrC,OAEF,GAA+B,IAA3BiC,KAAKuG,WAAWxI,OAElB,YADAiC,KAAKuG,WAAW,GAAGS,GAAGQ,KAAKxH,KAAKuG,WAAW,GAAGK,SAAUH,GAG1D,MAAMgB,EAAYzH,KAAKuG,WACvB,IAAK,IAAIzI,EAAI,EAAG4J,EAAMD,EAAU1J,OAAQD,EAAI4J,IAAO5J,EACjD2J,EAAU3J,GAAGkJ,GAAGQ,KAAKC,EAAU3J,GAAG8I,SAAUH,EAEhD,CAEO,OAAAkB,GACD3H,KAAKwG,YAGTxG,KAAKwG,WAAY,EACjBxG,KAAKuG,WAAWxI,OAAS,EAC3B,GAGF,SAAiBuI,GACCA,EAAAsB,QAAhB,SAA2BxI,EAAiByI,GAC1C,OAAOzI,EAAK0I,GAAKD,EAAGN,KAAKO,GAC3B,EAEgBxB,EAAAyB,IAAhB,SAA0BtB,EAAkBsB,GAC1C,MAAO,CAACpB,EAAyBC,EAAgBC,IACxCJ,EAAM3I,GAAK6I,EAASa,KAAKZ,EAAUmB,EAAIjK,SAAKkK,EAAWnB,EAElE,EAIgBP,EAAA2B,IAAhB,YAA0BC,GACxB,MAAO,CAACvB,EAAyBC,EAAgBC,KAC/C,MAAMsB,EAAQ,IAAI9B,EAAA+B,gBAClB,IAAK,MAAM3B,KAASyB,EAClBC,EAAMb,IAAIb,EAAMqB,GAAKnB,EAASa,KAAKZ,EAAUkB,KAS/C,OAPIjB,IACEO,MAAMC,QAAQR,GAChBA,EAAYnI,KAAKyJ,GAEjBtB,EAAYS,IAAIa,IAGbA,EAEX,EAIgB7B,EAAA+B,gBAAhB,SAAmC5B,EAAkB6B,EAAqCC,GAExF,OADAD,EAAQC,GACD9B,EAAMqB,GAAKQ,EAAQR,GAC5B,CACD,CApCD,CAAiBxB,IAAUzL,EAAAyL,WAAVA,EAAU,eChE3B,SAAAQ,EAA6BE,GAC3B,MAAO,CAAEW,QAASX,EACpB,CAKA,SAAAW,EAA+Ca,GAC7C,IAAKA,EACH,OAAOA,EAET,GAAIpB,MAAMC,QAAQmB,GAAM,CACtB,IAAK,MAAMrK,KAAKqK,EACdrK,EAAEwJ,UAEJ,MAAO,EACT,CAEA,OADAa,EAAIb,UACGa,CACT,8JAEA,YAAsC3B,GACpC,OAAOC,EAAa,IAAMa,EAAQd,GACpC,EAEA,MAAAuB,EAAA,WAAArI,GACmBC,KAAAyI,aAAe,IAAIC,IAC5B1I,KAAA2I,aAAc,CAgCxB,CA9BE,cAAWC,GACT,OAAO5I,KAAK2I,WACd,CAEO,GAAArB,CAA2BuB,GAMhC,OALI7I,KAAK2I,YACPE,EAAElB,UAEF3H,KAAKyI,aAAanB,IAAIuB,GAEjBA,CACT,CAEO,OAAAlB,GACL,IAAI3H,KAAK2I,YAAT,CAGA3I,KAAK2I,aAAc,EACnB,IAAK,MAAMxK,KAAK6B,KAAKyI,aACnBtK,EAAEwJ,UAEJ3H,KAAKyI,aAAaK,OALlB,CAMF,CAEO,KAAAA,GACL,IAAK,MAAM3K,KAAK6B,KAAKyI,aACnBtK,EAAEwJ,UAEJ3H,KAAKyI,aAAaK,OACpB,sBAGF,MAAAC,EAAA,WAAAhJ,GAGqBC,KAAAgJ,OAAS,IAAIZ,CASlC,CAPS,OAAAT,GACL3H,KAAKgJ,OAAOrB,SACd,CAEU,SAAAsB,CAAiCJ,GACzC,OAAO7I,KAAKgJ,OAAO1B,IAAIuB,EACzB,iBAVuBE,EAAAG,KAAoB1M,OAAO2M,OAAO,CAAE,OAAAxB,GAAY,wBAazE,iBAAA5H,GAEUC,KAAA2I,aAAc,CAuBxB,CArBE,SAAW7M,GACT,OAAOkE,KAAK2I,iBAAcX,EAAYhI,KAAKoJ,MAC7C,CAEA,SAAWtN,CAAMA,GACXkE,KAAK2I,aAAe7M,IAAUkE,KAAKoJ,SAGvCpJ,KAAKoJ,QAAQzB,UACb3H,KAAKoJ,OAAStN,EAChB,CAEO,KAAAgN,GACL9I,KAAKlE,WAAQkM,CACf,CAEO,OAAAL,GACL3H,KAAK2I,aAAc,EACnB3I,KAAKoJ,QAAQzB,UACb3H,KAAKoJ,YAASpB,CAChB,wKC1GF,MAAAqB,EAAArK,EAAA,KAEAsK,EAAAtK,EAAA,KACAuK,EAAAC,EAAAxK,EAAA,MACAyK,EAAAD,EAAAxK,EAAA,KACA0K,EAAA1K,EAAA,KACA2K,EAAA3K,EAAA,KAaM4K,EAAgC,CACpCC,KAAI,EACJC,KAAM,eACNC,KAAM,EACN7J,MAAO,OACP8D,OAAQ,OACRgG,oBAAqB,EACrBC,OAAQ,gBAIV,MAUE,WAAAlK,CACmBmC,EACAgI,EACAC,EACAC,GAHApK,KAAAkC,MAAAA,EACAlC,KAAAkK,UAAAA,EACAlK,KAAAmK,SAAAA,EACAnK,KAAAoK,cAAAA,EAbXpK,KAAAqK,YAAc,EACdrK,KAAAsK,UAAW,EACXtK,KAAAuK,IAAM,IAAIb,EAAAc,aACVxK,KAAAyK,QAAyBb,EAGzB5J,KAAA0K,cAAe,EACf1K,KAAA2K,aAAc,EAQpB,MAAMC,EAAkB7O,KAAKuI,KAA+B,EAA1BtE,KAAKkC,MAAM2I,aAAmB,GAC1DC,EAAe/O,KAAKE,IAAG,QAA4B2O,GACzD5K,KAAK+K,KAAO,IAAIxB,EAAAyB,QAAa,QAAyBJ,EAAiBE,GACvE9K,KAAKiL,QAAU,IAAIxB,EAAAuB,QAAU,QAC/B,CAEO,KAAAE,GACLlL,KAAKqK,cACLrK,KAAKuK,IAAIW,QACTlL,KAAK+K,KAAK9G,UACVjE,KAAKiL,QAAQhH,SACf,CAEO,KAAAoB,GACLrF,KAAKsK,UAAW,EAChBtK,KAAKuK,IAAIW,OACX,CAEO,GAAAC,CAAI/F,EAAmBC,EAAeC,GAC3C,IAAItF,KAAKsK,SAET,GAAkB,IAAdtK,KAAKuK,IAAIa,MAC6C,IAAnDpL,KAAK+K,KAAKI,IAAI/F,EAAKX,SAASY,EAAOC,MACtCtF,KAAK+K,KAAK9G,UACVjE,KAAKsK,UAAW,OAEb,CACL,MAAMe,EAAUrL,KAAKuK,IAAIe,MAAMlG,EAAMC,EAAOC,GAC5C,IAAiB,IAAb+F,EAEF,YADArL,KAAKsK,UAAW,GAGlB,GAAIe,EAAU,EAAG,CAEf,GAAW,IADKrL,KAAKuK,IAAIgB,OAAO1B,KACG,CAOjC,GANI7J,KAAK0K,eACP1K,KAAK0K,cAAe,EACpB1K,KAAK2K,aAAc,EACnB3K,KAAK+K,KAAK9G,WAEZjE,KAAKyK,QAAUjO,OAAO2F,OAAO,GAAIyH,EAAgB5J,KAAKuK,IAAIgB,SACrDvL,KAAKyK,QAAQR,OAEhB,YADAjK,KAAKsK,UAAW,GAGlBtK,KAAK+K,KAAK1H,MACZ,MAAO,GAAIrD,KAAK2K,YAEd,YADA3K,KAAKsK,UAAW,GAGwC,IAArDtK,KAAK+K,KAAKI,IAAI/F,EAAKX,SAAS4G,EAAS/F,MACxCtF,KAAK+K,KAAK9G,UACVjE,KAAKsK,UAAW,EACZtK,KAAK0K,eAAc1K,KAAK2K,aAAc,GAE9C,CACF,CACF,CAEO,GAAArF,CAAIkG,aACT,GAAIxL,KAAKsK,SAAU,OAAO,EAE1B,GAAkB,IAAdtK,KAAKuK,IAAIa,OACPpL,KAAKuK,IAAIjF,MAAO,OAAO,EAE7B,MAAMmG,EAAUzL,KAAKuK,IAAIgB,OAAO1B,KAEhC,GAAW,IAAP4B,EAAmC,OAAO,EAE9C,GAAW,IAAPA,EAAyC,CAE3C,IAAIC,EAAIpC,EAAAqC,kBAAkBzL,MACtB9B,EAAIkL,EAAAqC,kBAAkB3H,OACtBhE,KAAKkK,UAAU0B,aACjBF,EAAI1L,KAAKkK,UAAU0B,WAAWC,IAAIC,OAAO5L,MAAQF,KAAKoK,cAAc2B,KACpE3N,EAAI4B,KAAKkK,UAAU0B,WAAWC,IAAIC,OAAO9H,OAAShE,KAAKoK,cAAc4B,MAEvE,MAAMC,EAAyD,QAApDC,EAA+C,QAA5CC,EAAAnM,KAAKoK,cAAcgC,MAAMC,2BAAmB,IAAAF,OAAA,EAAAA,EAAEG,WAAG,IAAAJ,EAAAA,EAAI,EAC7DK,EAAS,yBAA4BnO,EAAEoO,QAAQ,MAAMd,EAAEc,QAAQ,MAAMP,EAAMO,QAAQ,QAEzF,OADAxM,KAAKoK,cAAcqC,MAAMF,GAAQ,IAC1B,CACT,CAEA,GAAW,IAAPd,EAMF,OALAzL,KAAKyK,QAAUjO,OAAO2F,OAAO,GAAIyH,EAAgB5J,KAAKuK,IAAIgB,QAC1DvL,KAAK0K,cAAe,EACpB1K,KAAK2K,aAAc,EACnB3K,KAAK+K,KAAK9G,UACVjE,KAAK+K,KAAK1H,QACH,EAGT,GAAW,IAAPoI,EAAkC,CACpC,IAAKzL,KAAK0K,aAAc,OAAO,EAE/B,GADA1K,KAAK0K,cAAe,EAChB1K,KAAK2K,aAAgC,IAAjB3K,KAAKyK,QAAQZ,KAAqC,OAAO,CACnF,CAIA,IAII6C,EA0BAC,EA9BAjB,EAAI,EACJtN,EAAI,EAIJwO,EAAUjD,EAAAkD,iBAoBd,IAnBIH,EAAOlB,MACLkB,GAAQ1M,KAAK+K,KAAKzF,QACpBsH,GAAU,EAAAjD,EAAAmD,WAAU9M,KAAK+K,KAAK9E,QAC1ByG,EAAwB,gBAAjBE,EAAQG,OACjBrB,EAAIkB,EAAQ1M,MACZ9B,EAAIwO,EAAQ5I,QACR0I,EAAOhB,GAAKtN,GAAKsN,EAAItN,EAAI4B,KAAKkC,MAAM8K,cACrCtB,EAAGtN,GAAK4B,KAAKiN,QAAQvB,EAAGtN,GAAG2J,IAAIhM,KAAKmR,OACrCR,EAAOhB,GAAKtN,GAAKsN,EAAItN,EAAI4B,KAAKkC,MAAM8K,YAEpCzP,QAAQC,KAAK,8BAA8BoP,EAAQ1M,SAAS0M,EAAQ5I,WAGtEzG,QAAQC,KAAK,gCAGfD,QAAQC,KAAK,uCAGZkP,EAEH,OADA1M,KAAK+K,KAAK9G,WACH,EAIT,GAAqB,cAAjB2I,EAAQG,KAAsB,CAChC,MAAM3H,EAAOpF,KAAKiL,QAAQrM,OAAOoB,KAAK+K,KAAK9E,OAO3C,GANA0G,EAAO,IAAIQ,UACT,IAAIjH,kBAAkBd,EAAK9H,OAAQ8H,EAAKgI,WAAYhI,EAAKP,YACzD7E,KAAKiL,QAAQ/K,MACbF,KAAKiL,QAAQjH,QAEfhE,KAAKiL,QAAQhH,UACTyH,IAAM1L,KAAKiL,QAAQ/K,OAAS9B,IAAM4B,KAAKiL,QAAQjH,OAAQ,CAEzDhE,KAAK+K,KAAK9G,UACV,MAAM6H,EAASzC,EAAAgE,cAAcC,kBAAatF,EAAWhI,KAAKiL,QAAQ/K,MAAOF,KAAKiL,QAAQjH,QAGtF,OAFuB,QAAvBuJ,EAAAzB,EAAO0B,WAAW,aAAK,IAAAD,GAAAA,EAAEE,aAAad,EAAM,EAAG,GAC/C3M,KAAKmK,SAASuD,SAAS5B,IAChB,CACT,CACF,MACEa,EAAO,IAAIgB,KAAK,CAAC3N,KAAK+K,KAAK9E,OAAQ,CAAE4D,KAAM+C,EAAQG,OAErD/M,KAAK+K,KAAK9G,UACV,MAAM2J,EAAa5N,KAAKqK,YACxB,OAAOwD,kBAAkBlB,EAAM,CAAEmB,YAAapC,EAAGqC,aAAc3P,IAC5DiD,KAAK2M,GACAJ,IAAe5N,KAAKqK,aACtB2D,EAAGC,SACI,IAETjO,KAAKmK,SAASuD,SAASM,IAChB,IAERE,MAAMpG,IACLvK,QAAQC,KAAK,uBAAuBoP,EAAQG,QAAQH,EAAQ1M,SAAS0M,EAAQ5I,SAAU8D,IAChF,GAEb,CAEQ,OAAAmF,CAAQvB,EAAWtN,eACzB,MAAM+P,GAA8B,QAAzBhC,EAAAnM,KAAKkK,UAAU0B,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIuC,KAAKlO,QAASoJ,EAAAqC,kBAAkBzL,MACpEmO,GAA8B,QAAzBd,EAAAvN,KAAKkK,UAAU0B,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIuC,KAAKpK,SAAUsF,EAAAqC,kBAAkB3H,OACrE9D,GAAiC,QAAzBgM,EAAAlM,KAAKkK,UAAU0B,kBAAU,IAAAM,OAAA,EAAAA,EAAEL,IAAIC,OAAO5L,QAASiO,EAAKnO,KAAKoK,cAAc2B,KAC/E/H,GAAkC,QAAzBsK,EAAAtO,KAAKkK,UAAU0B,kBAAU,IAAA0C,OAAA,EAAAA,EAAEzC,IAAIC,OAAO9H,SAAUqK,EAAKrO,KAAKoK,cAAc4B,KAEjFuC,EAAKvO,KAAKwO,KAAKxO,KAAKyK,QAAQvK,MAAQA,EAAOiO,GAC3CM,EAAKzO,KAAKwO,KAAKxO,KAAKyK,QAAQzG,OAASA,EAAQqK,GACnD,IAAKE,IAAOE,EAAI,CACd,MAAMC,EAAKxO,EAAQwL,EACbiD,GAAM3K,EAASqK,GAAMjQ,EACrBwQ,EAAI7S,KAAKE,IAAIyS,EAAIC,GACvB,OAAOC,EAAI,EAAI,CAAClD,EAAIkD,EAAGxQ,EAAIwQ,GAAK,CAAClD,EAAGtN,EACtC,CACA,OAAQmQ,GAEJvO,KAAKyK,QAAQT,qBAAwBuE,GAAOE,EACvB,CAACF,EAAIE,GAAxB,CAACF,EAAInQ,EAAImQ,EAAK7C,GAFhB,CAACA,EAAI+C,EAAKrQ,EAAGqQ,EAGnB,CAEQ,IAAAD,CAAKlQ,EAAWuQ,EAAeC,GACrC,MAAU,SAANxQ,EAAqB,EACrBA,EAAEyQ,SAAS,KAAaC,SAAS1Q,EAAE2I,MAAM,GAAI,GAAI,IAAM4H,EAAQ,IAC/DvQ,EAAEyQ,SAAS,MAAcC,SAAS1Q,EAAE2I,MAAM,GAAI,GAAI,IAC/C+H,SAAS1Q,EAAG,IAAMwQ,CAC3B,aC/LF,SAASG,EAAM7J,GACb,IAAI9G,EAAI,GACR,IAAK,IAAIR,EAAI,EAAGA,EAAIsH,EAAKrH,SAAUD,EACjCQ,GAAK4Q,OAAOC,aAAa/J,EAAKtH,IAEhC,OAAOQ,CACT,CAGA,SAAS8Q,EAAMhK,GACb,IAAI7G,EAAI,EACR,IAAK,IAAIT,EAAI,EAAGA,EAAIsH,EAAKrH,SAAUD,EAAG,CACpC,GAAIsH,EAAKtH,GAAK,IAAMsH,EAAKtH,GAAK,GAC5B,MAAM,IAAIsE,MAAM,gBAElB7D,EAAQ,GAAJA,EAAS6G,EAAKtH,GAAK,EACzB,CACA,OAAOS,CACT,CAGA,SAAS8Q,EAAOjK,GACd,MAAM7G,EAAI0Q,EAAM7J,GAChB,IAAK7G,EAAE+Q,MAAM,oCACX,MAAM,IAAIlN,MAAM,gBAElB,OAAO7D,CACT,wEAeA,MAAMgR,EAAiE,CACrEtF,OAAQmF,EACRrF,KAAMqF,EACNtF,KAfF,SAAgB1E,GACd,GAAsB,oBAAXjG,OACT,OAAOA,OAAOC,KAAK6P,EAAM7J,GAAO,UAAUoK,WAE5C,MAAMC,EAAKnQ,KAAK2P,EAAM7J,IAChB3J,EAAI,IAAI2B,WAAWqS,EAAG1R,QAC5B,IAAK,IAAID,EAAI,EAAGA,EAAIrC,EAAEsC,SAAUD,EAC9BrC,EAAEqC,GAAK2R,EAAGjQ,WAAW1B,GAEvB,OAAO,IAAI4R,aAAc9Q,OAAOnD,EAClC,EAMEyE,MAAOmP,EACPrL,OAAQqL,EACRrF,oBAAqBoF,GAMjBO,EAAc,CAAC,GAAI,IAAK,IAAK,KAE7BC,EAAuB,CAAC,GAAI,IAAK,IAAK,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,GAAI,IAAK,IAAK,KAEjFC,EAAkB,CAAC,GAAI,IAAK,IAAK,IAAK,GAAI,GAAI,IAAK,KAEnDC,EAAiB,CAAC,GAAI,IAAK,IAAK,IAAK,GAAI,IAAK,KAE9CC,EAAwB,CAAC,GAAI,IAAK,IAAK,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,KAGvFC,EAAiB,oBAGvB,iBAAAjQ,GACSC,KAAAoL,MAAK,EACJpL,KAAAiQ,QAAU,IAAI5S,YAAY2S,GAC1BhQ,KAAAkQ,UAAY,EACZlQ,KAAAmQ,KAAO,GACRnQ,KAAAuL,OAA4E,EAwIrF,CAtIS,KAAAL,GACLlL,KAAKiQ,QAAQtK,KAAK,GAClB3F,KAAKoL,MAAK,EACVpL,KAAKkQ,UAAY,EACjBlQ,KAAKuL,OAAS,GACdvL,KAAKmQ,KAAO,EACd,CAEO,GAAA7K,GACL,GAAc,IAAVtF,KAAKoL,MAA6B,CACpC,GAAIpL,KAAKkQ,YAAcJ,EAAe/R,OAAQ,CAC5C,IAAK,IAAIqS,EAAI,EAAGA,EAAIN,EAAe/R,SAAUqS,EAC3C,GAAIpQ,KAAKiQ,QAAQG,KAAON,EAAeM,GAAI,OAAOpQ,KAAKmM,KAIzD,OAFAnM,KAAKuL,OAAa,KAAC,EACnBvL,KAAKoL,MAAK,EACH,CACT,CACA,GAAIpL,KAAKkQ,YAAcH,EAAsBhS,OAAQ,CACnD,IAAK,IAAIqS,EAAI,EAAGA,EAAIL,EAAsBhS,SAAUqS,EAClD,GAAIpQ,KAAKiQ,QAAQG,KAAOL,EAAsBK,GAAI,OAAOpQ,KAAKmM,KAIhE,OAFAnM,KAAKuL,OAAa,KAAC,EACnBvL,KAAKoL,MAAK,EACH,CACT,CACA,OAAOpL,KAAKmM,IACd,CACA,OAAc,IAAVnM,KAAKoL,MAAkC,EAC7B,IAAVpL,KAAKoL,OACY,IAAhBpL,KAAKuL,OAAO1B,MAEV7J,KAAKqQ,YAAYrQ,KAAKkQ,YAC3BlQ,KAAKoL,MAAK,EACH,GAEFpL,KAAKmM,IACd,CAEO,KAAAb,CAAMlG,EAAmBC,EAAeC,GAC7C,IAAI8F,EAAQpL,KAAKoL,MACbkF,EAAMtQ,KAAKkQ,UACf,MAAM5S,EAAS0C,KAAKiQ,QACpB,GAAS,IAAL7E,GAAoC,IAALA,EAA2B,OAAQ,EACtE,GAAS,IAALA,GAA+BkF,EAAM,GAAI,OAAQ,EACrD,IAAK,IAAIxS,EAAIuH,EAAOvH,EAAIwH,IAAOxH,EAAG,CAChC,MAAMzB,EAAI+I,EAAKtH,GACf,OAAQzB,GACN,KAAK,GACH,IAAK2D,KAAKqQ,YAAYC,GAAM,OAAOtQ,KAAKmM,KACxCf,EAAK,EACLkF,EAAM,EACN,MACF,KAAK,GACH,GAAS,IAALlF,EAA6B,CAC/B,GAAkB,KAAd9N,EAAO,GAAW,CAEpB,IAAI8S,EAAI,EACR,KAAOA,EAAIT,EAAY5R,SAAUqS,EAC/B,GAAI9S,EAAO8S,KAAOT,EAAYS,GAAI,OAAOpQ,KAAKmM,KAGhD,GADAnM,KAAKuL,OAAa,KAAC,EACf+E,IAAQT,EAAgB9R,OAAQ,CAClC,KAAOqS,EAAIP,EAAgB9R,SAAUqS,EACnC,GAAI9S,EAAO8S,KAAOP,EAAgBO,GAAI,OAAOpQ,KAAKmM,KAIpD,OAFAnM,KAAKuL,OAAa,KAAC,EACnBvL,KAAKoL,MAAK,EACHtN,EAAI,CACb,CACF,KAAO,IAAkB,KAAdR,EAAO,GAOhB,OAAO0C,KAAKmM,KALZ,IAAK,IAAIiE,EAAI,EAAGA,EAAIR,EAAqB7R,SAAUqS,EACjD,GAAI9S,EAAO8S,KAAOR,EAAqBQ,GAAI,OAAOpQ,KAAKmM,KAEzDnM,KAAKuL,OAAa,KAAC,CAGrB,CACAH,EAAK,EACLkF,EAAM,CACR,MAAO,GAAS,IAALlF,EAA2B,CACpC,IAAKpL,KAAKuQ,UAAUD,GAAM,OAAOtQ,KAAKmM,KACtCf,EAAK,EACLkF,EAAM,CACR,MAAO,GAAS,IAALlF,EAA6B,CACtC,GAAIkF,GAAON,EAAgB,OAAOhQ,KAAKmM,KACvC7O,EAAOgT,KAASjU,CAClB,CACA,MACF,KAAK,GACH,OAAS,IAAL+O,GACGpL,KAAKqQ,YAAYC,IAExBtQ,KAAKoL,MAAK,EACHtN,EAAI,GAH0BkC,KAAKmM,KAI5C,QACE,GAAImE,GAAON,EAAgB,OAAOhQ,KAAKmM,KACvC7O,EAAOgT,KAASjU,EAEtB,CAGA,OAFA2D,KAAKoL,MAAQA,EACbpL,KAAKkQ,UAAYI,GACT,CACV,CAEQ,EAAAnE,GAGN,OAFAnM,KAAKuL,OAAO1B,KAAI,EAChB7J,KAAKoL,MAAK,GACF,CACV,CAEQ,SAAAmF,CAAUD,GAChB,MAAMF,EAAInB,EAAMjP,KAAKiQ,QAAQxL,SAAS,EAAG6L,IACzC,QAAIF,IACFpQ,KAAKmQ,KAAOC,EACZpQ,KAAKuL,OAAO6E,GAAK,MACV,EAGX,CAEQ,WAAAC,CAAYC,GAClB,GAAItQ,KAAKmQ,KAAM,CACb,IACE,MAAM5R,EAAIyB,KAAKiQ,QAAQhJ,MAAM,EAAGqJ,GAChCtQ,KAAKuL,OAAOvL,KAAKmQ,MAAQZ,EAASvP,KAAKmQ,MAAQZ,EAASvP,KAAKmQ,MAAM5R,GAAKA,CAC1E,UACE,OAAO,CACT,CACA,OAAO,CACT,CACA,OAAO,CACT,yGCtPF,MAEE,WAAAwB,CACmBoK,GAAAnK,KAAAmK,SAAAA,EAFXnK,KAAAwQ,cAA+B,CAAEC,WAAW,EAAMC,MAAO,MAAOC,OAAQ,EAAGC,UAAW,MAG3F,CAMI,QAAAlD,CAASmD,GACd7Q,KAAKmK,SAASuD,SAASmD,EAAK7Q,KAAKwQ,cACnC,oGCNF,SAA0BrS,GACxB,GAAIA,EAAEJ,OAAS,GACb,OAAOlD,EAAAgS,iBAET,MAAMiE,EAAM,IAAIzT,YAAYc,EAAEb,OAAQa,EAAEiP,WAAY,GAGpD,GAAe,aAAX0D,EAAI,IAAgC,YAAXA,EAAI,IAAgC,aAAXA,EAAI,GACxD,MAAO,CACL/D,KAAM,YACN7M,MAAQ/B,EAAE,KAAO,GAAKA,EAAE,KAAO,GAAKA,EAAE,KAAO,EAAIA,EAAE,IACnD6F,OAAQ7F,EAAE,KAAO,GAAKA,EAAE,KAAO,GAAKA,EAAE,KAAO,EAAIA,EAAE,KAIvD,GAAa,MAATA,EAAE,IAAwB,MAATA,EAAE,IAAwB,MAATA,EAAE,GAAa,CACnD,MAAO+B,EAAO8D,GAgFlB,SAAiB7F,GACf,MAAMuJ,EAAMvJ,EAAEJ,OACd,IAAID,EAAI,EACJiT,EAAc5S,EAAEL,IAAM,EAAIK,EAAEL,EAAI,GACpC,OAAa,CAEX,GADAA,GAAKiT,EACDjT,GAAK4J,EAEP,MAAO,CAAC,EAAG,GAEb,GAAa,MAATvJ,EAAEL,GACJ,MAAO,CAAC,EAAG,GAEb,GAAiB,MAAbK,EAAEL,EAAI,IAA4B,MAAbK,EAAEL,EAAI,GAC7B,OAAIA,EAAI,EAAI4J,EACH,CACLvJ,EAAEL,EAAI,IAAM,EAAIK,EAAEL,EAAI,GACtBK,EAAEL,EAAI,IAAM,EAAIK,EAAEL,EAAI,IAGnB,CAAC,EAAG,GAEbA,GAAK,EACLiT,EAAc5S,EAAEL,IAAM,EAAIK,EAAEL,EAAI,EAClC,CACF,CAzG4BkT,CAAQ7S,GAChC,MAAO,CAAE4O,KAAM,aAAc7M,QAAO8D,SACtC,CAEA,GAAe,YAAX8M,EAAI,KAA+B,KAAT3S,EAAE,IAAwB,KAATA,EAAE,KAAyB,KAATA,EAAE,GACjE,MAAO,CACL4O,KAAM,YACN7M,MAAQ/B,EAAE,IAAM,EAAIA,EAAE,GACtB6F,OAAQ7F,EAAE,IAAM,EAAIA,EAAE,IAI1B,GAAe,aAAX2S,EAAI,GACN,MAAO,CACL/D,KAAM,YACN7M,MAAQ/B,EAAE,IAAM,GAAKA,EAAE,IAAM,GAAKA,EAAE,IAAM,EAAIA,EAAE,GAChD6F,OAAQ7F,EAAE,IAAM,GAAKA,EAAE,IAAM,GAAKA,EAAE,KAAO,EAAIA,EAAE,KAIrD,GAAe,aAAX2S,EAAI,IAAgC,aAAXA,EAAI,IAA6C,UAAd,SAATA,EAAI,IAA6B,CACtF,OAAQ3S,EAAE,KACR,KAAK,GACH,MAAO,CACL4O,KAAM,aACN7M,MAA6C,GAApC/B,EAAE,IAAMA,EAAE,KAAO,EAAIA,EAAE,KAAO,IACvC6F,OAA6C,GAApC7F,EAAE,IAAMA,EAAE,KAAO,EAAIA,EAAE,KAAO,KAE3C,KAAK,GACH,GAAc,KAAVA,EAAE,IAAc,OAAOtD,EAAAgS,iBAC3B,MAAMoE,EAAM9S,EAAE,IAAMA,EAAE,KAAO,EAAIA,EAAE,KAAO,GAAKA,EAAE,KAAO,GACxD,MAAO,CACL4O,KAAM,aACN7M,MAAgC,GAAV,MAAb+Q,GACTjN,OAAgC,GAAvBiN,IAAQ,GAAK,QAE1B,KAAK,GACH,OAAc,MAAV9S,EAAE,KAA0B,IAAVA,EAAE,KAA0B,KAAVA,EAAE,IAAqBtD,EAAAgS,iBACxD,CACLE,KAAM,aACN7M,MAA+B,OAAtB/B,EAAE,IAAMA,EAAE,KAAO,GAC1B6F,OAA+B,OAAtB7F,EAAE,IAAMA,EAAE,KAAO,IAGhC,OAAOtD,EAAAgS,gBACT,CAEA,GAAe,aAAXiE,EAAI,KAAiC,aAAXA,EAAI,IAAgC,aAAXA,EAAI,IAAoB,CAC7E,IAAIR,GAAO,EAEX,MAAMY,EAAQnV,KAAKE,IAAIkC,EAAEJ,OAAS,GAAI,MACtC,IAAK,IAAID,EAAI,EAAGA,EAAIoT,EAAOpT,IAEzB,GAAa,MAATK,EAAEL,IAA4B,MAAbK,EAAEL,EAAI,IAA4B,MAAbK,EAAEL,EAAI,IAA4B,MAAbK,EAAEL,EAAI,GAAa,CAChFwS,EAAMxS,EACN,KACF,CAEF,IAAa,IAATwS,EAAY,CAEd,MAAMpQ,EACJ/B,EAAEmS,EAAO,IAAM,GACfnS,EAAEmS,EAAO,IAAM,GACfnS,EAAEmS,EAAM,KAAQ,EAChBnS,EAAEmS,EAAM,IACJtM,EACJ7F,EAAEmS,EAAM,KAAO,GACfnS,EAAEmS,EAAM,KAAO,GACfnS,EAAEmS,EAAM,KAAQ,EAChBnS,EAAEmS,EAAM,IACV,GAAIpQ,EAAQ,GAAK8D,EAAS,EACxB,MAAO,CAAE+I,KAAM,aAAc7M,QAAO8D,SAExC,CACA,OAAOnJ,EAAAgS,gBACT,CACA,OAAOhS,EAAAgS,gBACT,EAnGahS,EAAAgS,iBAA6B,CACxCE,KAAM,cACN7M,MAAO,EACP8D,OAAQ,uFCZV,MAAAjF,EAAAC,EAAA,KAGAqH,EAAArH,EAAA,KAaA,MAAAqO,UAAmChH,EAAA0C,WAEjC,UAAW+C,GAAM,IAAAK,EAAoC,OAA8B,QAAvBA,EAAAnM,KAAKmR,QAAQC,IAAI,cAAM,IAAAjF,OAAA,EAAAA,EAAEL,MAAQ,CAUtF,mBAAOwB,CAAa+D,EAAqCnR,EAAe8D,GAU7E,MAAM8H,GAAUuF,QAAAA,EAAiBC,UAAUC,cAAc,UAGzD,OAFAzF,EAAO5L,MAAgB,EAARA,EACf4L,EAAO9H,OAAkB,EAATA,EACT8H,CACT,CAGO,sBAAO0F,CAAgBC,EAA+BvR,EAAe8D,EAAgB1G,GAC1F,GAAyB,mBAAd6P,UAA0B,CACnC,MAAMuE,EAAUD,EAAID,gBAAgBtR,EAAO8D,GAI3C,OAHI1G,GACFoU,EAAQtM,KAAKlC,IAAI,IAAIgD,kBAAkB5I,EAAQ,EAAG4C,EAAQ8D,EAAS,IAE9D0N,CACT,CACA,OAAOpU,EACH,IAAI6P,UAAU,IAAIjH,kBAAkB5I,EAAQ,EAAG4C,EAAQ8D,EAAS,GAAI9D,EAAO8D,GAC3E,IAAImJ,UAAUjN,EAAO8D,EAC3B,CAGO,wBAAO6J,CAAkBgD,GAC9B,MAAiC,mBAAtBhD,kBACF8D,QAAQC,aAAQ5J,GAElB6F,kBAAkBgD,EAC3B,CAGA,WAAA9Q,CAAoB8R,GAClBC,QADkB9R,KAAA6R,UAAAA,EAhDZ7R,KAAAmR,QAAU,IAAIY,IAGd/R,KAAAgS,gBAAkBhS,KAAKiJ,UAAU,IAAI5C,EAAA4L,mBA+C3CjS,KAAKkS,SAAWlS,KAAK6R,UAAUzF,MAAM+F,KACrCnS,KAAK6R,UAAUzF,MAAM+F,KAAQC,UACd,QAAbjG,EAAAnM,KAAKkS,gBAAQ,IAAA/F,GAAAA,EAAE3E,KAAKxH,KAAK6R,UAAUzF,MAAOgG,GAC1CpS,KAAKqS,SAEHrS,KAAK6R,UAAUzF,MAAMkG,eACvBtS,KAAKqS,QAGPrS,KAAKgS,gBAAgBlW,MAAQkE,KAAK6R,UAAUzF,MAAMmG,eAAeC,eAAeC,UAC/D,aAAXA,IACFzS,KAAK0S,gBACc,QAAnBvG,EAAAnM,KAAK2S,sBAAc,IAAAxG,GAAAA,EAAEyG,YAAY,EAAG5S,KAAK6R,UAAU7F,SAGvDhM,KAAKiJ,WAAU,EAAA5C,EAAAS,cAAa,WAC1B9G,KAAK6S,qBACL7S,KAAK6S,mBAAmB,UACpB7S,KAAK6R,UAAUzF,OAASpM,KAAKkS,WAC/BlS,KAAK6R,UAAUzF,MAAM+F,KAAOnS,KAAKkS,SACjClS,KAAKkS,cAAWlK,GAEdhI,KAAK2S,gBAAkB3S,KAAK8S,kBAC9B9S,KAAK2S,eAAeI,YAAc/S,KAAK8S,gBACvC9S,KAAK8S,qBAAkB9K,GAEzBhI,KAAK2S,oBAAiB3K,EACtBhI,KAAKmR,QAAQrI,QACU,QAAvBqD,EAAAnM,KAAKgT,0BAAkB,IAAA7G,GAAAA,EAAE8B,QACzBjO,KAAKgT,wBAAqBhL,EAC1BhI,KAAKiT,kBAAejL,IAExB,CAKO,eAAAkL,CAAgBpX,WACjBA,EACGkE,KAAKiT,eAA0C,IAA1BjT,KAAKmT,SAASnP,QACtChE,KAAKoT,mBAAmBrX,KAAKC,IAAIgE,KAAKmT,SAASnP,OAAS,EAAC,MAGpC,QAAvBmI,EAAAnM,KAAKgT,0BAAkB,IAAA7G,GAAAA,EAAE8B,QACzBjO,KAAKgT,wBAAqBhL,EAC1BhI,KAAKiT,kBAAejL,GAEH,QAAnBuF,EAAAvN,KAAK2S,sBAAc,IAAApF,GAAAA,EAAEqF,YAAY,EAAG5S,KAAK6R,UAAU7F,KACrD,CAMA,cAAWJ,GACT,OAAO5L,KAAK6R,UAAUjG,UACxB,CAKA,YAAWuH,WACT,MAAO,CACLjT,OAAsB,QAAfiM,EAAAnM,KAAK4L,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIuC,KAAKlO,SAAU,EAC3C8D,QAAuB,QAAfuJ,EAAAvN,KAAK4L,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIuC,KAAKpK,UAAW,EAEjD,CAKO,UAAAqP,CAAWhO,EAAeC,EAAaoL,iBAC5C,MAAM4C,EAAIjO,IAAwB,QAAf8G,EAAAnM,KAAK4L,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIuC,KAAKpK,SAAU,GACjD0H,GAAmB,QAAf6B,EAAAvN,KAAK4L,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIC,OAAO5L,QAAS,EACzC9B,GAAKkH,EAAM,EAAID,KAAyB,QAAf6G,EAAAlM,KAAK4L,kBAAU,IAAAM,OAAA,EAAAA,EAAEL,IAAIuC,KAAKpK,SAAU,GAC9D0M,GAAmB,QAAVA,GACW,QAAvBpC,EAAAtO,KAAKmR,QAAQC,IAAI,cAAM,IAAA9C,GAAAA,EAAEiF,UAAU,EAAGD,EAAG5H,EAAGtN,GAEzCsS,GAAmB,WAAVA,GACc,QAA1B8C,EAAAxT,KAAKmR,QAAQC,IAAI,iBAAS,IAAAoC,GAAAA,EAAED,UAAU,EAAGD,EAAG5H,EAAGtN,EAEnD,CAKO,QAAAqV,CAAS/C,GACd,IAAKA,GAAmB,QAAVA,EAAiB,CAC7B,MAAMe,EAAMzR,KAAKmR,QAAQC,IAAI,OAC7BK,SAAAA,EAAK8B,UAAU,EAAG,EAAG9B,EAAI3F,OAAO5L,MAAOuR,EAAI3F,OAAO9H,OACpD,CACA,IAAK0M,GAAmB,WAAVA,EAAoB,CAChC,MAAMe,EAAMzR,KAAKmR,QAAQC,IAAI,UAC7BK,SAAAA,EAAK8B,UAAU,EAAG,EAAG9B,EAAI3F,OAAO5L,MAAOuR,EAAI3F,OAAO9H,OACpD,CACF,CAKO,IAAA0P,CAAKC,EAAqBC,EAAgBC,EAAaC,EAAaC,EAAgB,GACzF,MAAMtC,EAAMzR,KAAKmR,QAAQC,IAAIuC,EAAQjD,OACrC,IAAKe,EACH,OAEF,MAAMvR,MAAEA,EAAK8D,OAAEA,GAAWhE,KAAKmT,SAG/B,IAAe,IAAXjT,IAA4B,IAAZ8D,EAClB,OAGFhE,KAAKgU,cAAcL,EAASzT,EAAO8D,GACnC,MAAM6M,EAAM8C,EAAQM,QACZ/T,MAAOgU,EAAalQ,OAAQmQ,GAAiBR,EAAQS,eACvDrI,EAAOhQ,KAAKuI,KAAKuM,EAAI3Q,MAAQgU,GAE7BG,EAAMT,EAAS7H,EAAQmI,EACvBI,EAAKvY,KAAKmR,MAAM0G,EAAS7H,GAAQoI,EACjCI,EAAKV,EAAM3T,EACXsU,EAAKV,EAAM9P,EAGXyQ,EAAaV,EAAQG,EAAcG,EAAKxD,EAAI3Q,MAAQ2Q,EAAI3Q,MAAQmU,EAAKN,EAAQG,EAC7EQ,EAAcJ,EAAKH,EAAetD,EAAI7M,OAAS6M,EAAI7M,OAASsQ,EAAKH,EAMvE1C,EAAIkD,UACF9D,EACA9U,KAAKmR,MAAMmH,GAAKtY,KAAKmR,MAAMoH,GAAKvY,KAAKuI,KAAKmQ,GAAa1Y,KAAKuI,KAAKoQ,GACjE3Y,KAAKmR,MAAMqH,GAAKxY,KAAKmR,MAAMsH,GAAKzY,KAAKuI,KAAKmQ,EAAavU,EAAQgU,GAAcnY,KAAKuI,KAAKoQ,EAAc1Q,EAASmQ,GAElH,CAKO,WAAAS,CAAYjB,EAAqBC,GACtC,MAAM1T,MAAEA,EAAK8D,OAAEA,GAAWhE,KAAKmT,SAE/B,IAAe,IAAXjT,IAA4B,IAAZ8D,EAClB,OAEFhE,KAAKgU,cAAcL,EAASzT,EAAO8D,GACnC,MAAM6M,EAAM8C,EAAQM,QACZ/T,MAAOgU,EAAalQ,OAAQmQ,GAAiBR,EAAQS,eACvDrI,EAAOhQ,KAAKuI,KAAKuM,EAAI3Q,MAAQgU,GAC7BG,EAAMT,EAAS7H,EAAQmI,EACvBI,EAAKvY,KAAKmR,MAAM0G,EAAS7H,GAAQoI,EACjCM,EAAaP,EAAcG,EAAKxD,EAAI3Q,MAAQ2Q,EAAI3Q,MAAQmU,EAAKH,EAC7DQ,EAAcJ,EAAKH,EAAetD,EAAI7M,OAAS6M,EAAI7M,OAASsQ,EAAKH,EAEjErI,EAASuB,EAAcC,aAAatN,KAAKsR,SAAUvV,KAAKuI,KAAKmQ,EAAavU,EAAQgU,GAAcnY,KAAKuI,KAAKoQ,EAAc1Q,EAASmQ,IACjI1C,EAAM3F,EAAO0B,WAAW,MAC9B,OAAIiE,GACFA,EAAIkD,UACF9D,EACA9U,KAAKmR,MAAMmH,GAAKtY,KAAKmR,MAAMoH,GAAKvY,KAAKmR,MAAMuH,GAAa1Y,KAAKmR,MAAMwH,GACnE,EAAG,EAAG5I,EAAO5L,MAAO4L,EAAO9H,QAEtB8H,QANT,CAQF,CAKO,eAAA+I,CAAgBhB,EAAaC,EAAaC,EAAgB,SAC/D,MAAMtC,EAAMzR,KAAKmR,QAAQC,IAAI,OAC7B,GAAIK,EAAK,CACP,MAAMvR,MAAEA,EAAK8D,OAAEA,GAAWhE,KAAKmT,SAG/B,IAAe,IAAXjT,IAA4B,IAAZ8D,EAClB,OAQF,GALKhE,KAAKiT,aAECjP,GAAUhE,KAAKiT,aAAcjP,QACtChE,KAAKoT,mBAAmBpP,EAAS,GAFjChE,KAAKoT,mBAAmBrX,KAAKC,IAAIgI,EAAS,EAAC,MAIxChE,KAAKiT,aAAc,OACxBxB,EAAIkD,UACqB,QADZxI,EACXnM,KAAKgT,0BAAkB,IAAA7G,EAAAA,EAAInM,KAAKiT,aAChCY,EAAM3T,EACL4T,EAAM9P,EAAU,EAAI,EAAI,EACzB9D,EAAQ6T,EACR/P,EACA6P,EAAM3T,EACN4T,EAAM9P,EACN9D,EAAQ6T,EACR/P,EAEJ,CACF,CAMO,aAAA0O,WACL,MAAMhH,GAAmB,QAAfS,EAAAnM,KAAK4L,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIC,OAAO5L,QAAS,EACzC9B,GAAmB,QAAfmP,EAAAvN,KAAK4L,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIC,OAAO9H,SAAU,EAChD,IAAK,MAAMyN,KAAOzR,KAAKmR,QAAQ2D,SACzBrD,EAAI3F,OAAO5L,QAAUwL,GAAK+F,EAAI3F,OAAO9H,SAAW5F,IAClDqT,EAAI3F,OAAO5L,MAAQwL,EACnB+F,EAAI3F,OAAO9H,OAAS5F,EAG1B,CAKQ,aAAA4V,CAAce,EAAkBrP,EAAsBM,GAC5D,GAAIN,IAAiBqP,EAAKX,eAAelU,OAAS8F,IAAkB+O,EAAKX,eAAepQ,OACtF,OAEF,MAAQ9D,MAAO8U,EAAehR,OAAQiR,GAAmBF,EAAKG,aAC9D,GAAIxP,IAAiBsP,GAAiBhP,IAAkBiP,EAItD,OAHAF,EAAKd,OAASc,EAAKI,KACnBJ,EAAKX,eAAelU,MAAQ8U,OAC5BD,EAAKX,eAAepQ,OAASiR,GAG/B,MAAMG,EAAcrZ,KAAKuI,KAAKyQ,EAAKI,KAAMjV,MAAQwF,EAAesP,GAC1DK,EAAetZ,KAAKuI,KAAKyQ,EAAKI,KAAMnR,OAASgC,EAAgBiP,GAEnE,GAAIG,EAAcC,EAAeN,EAAKI,KAAMjV,MAAQ6U,EAAKI,KAAMnR,OAI7D,OAHA+Q,EAAKd,OAASc,EAAKI,KACnBJ,EAAKX,eAAelU,MAAQ8U,OAC5BD,EAAKX,eAAepQ,OAASiR,GAG/B,MAAMnJ,EAASuB,EAAcC,aAAatN,KAAKsR,SAAU8D,EAAaC,GAChE5D,EAAM3F,EAAO0B,WAAW,MAC1BiE,IACFA,EAAIkD,UAAUI,EAAKI,KAAO,EAAG,EAAGrJ,EAAO5L,MAAO4L,EAAO9H,QACrD+Q,EAAKd,OAASnI,EACdiJ,EAAKX,eAAelU,MAAQwF,EAC5BqP,EAAKX,eAAepQ,OAASgC,EAEjC,CAKQ,KAAAqM,GACNrS,KAAK2S,eAAiB3S,KAAK6R,UAAUzF,MAAMuG,eAC3C3S,KAAK8S,gBAAkB9S,KAAK2S,eAAeI,YAAY7R,KAAKlB,KAAK2S,gBACjE3S,KAAK2S,eAAeI,YAAeuC,UACjC,IAAK,MAAMC,IAAO,IAAIvV,KAAKmR,QAAQqE,QACjCxV,KAAK6S,mBAAmB0C,GAEN,QAApBpJ,EAAAnM,KAAK8S,uBAAe,IAAA3G,GAAAA,EAAE3E,KAAKxH,KAAK2S,eAAgB2C,GAEpD,CAEO,gBAAAG,CAAiB/E,EAAoB,eAE1C,IAAK1Q,KAAKsR,WAAatR,KAAK6R,UAAUzF,MAAMkG,cAE1C,YADA/U,QAAQC,KAAK,sFAGf,GAAIwC,KAAKmR,QAAQuE,IAAIhF,GACnB,OAEF,MAAM5E,EAASuB,EAAcC,aAC3BtN,KAAKsR,UAAyB,QAAfnF,EAAAnM,KAAK4L,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIC,OAAO5L,QAAS,GACrC,QAAfqN,EAAAvN,KAAK4L,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIC,OAAO9H,SAAU,GAExC8H,EAAO6J,UAAUrO,IAAI,qBAAqBoJ,KAC1C,MAAM4B,EAAgBtS,KAAK6R,UAAUzF,MAAMkG,cAI3CA,EAAcsD,MAAMC,UAAY,UAClB,WAAVnF,GAKF5E,EAAO8J,MAAMjF,OAAS,KACtB2B,EAAcwD,aAAahK,EAAQwG,EAAcyD,cAKjDjK,EAAO8J,MAAMjF,OAAS,IACtB2B,EAAc0D,YAAYlK,IAE5B,MAAM2F,EAAM3F,EAAO0B,WAAW,KAAM,CAAEtQ,OAAO,IACxCuU,GAILzR,KAAKmR,QAAQjO,IAAIwN,EAAOe,GACxBzR,KAAKyT,SAAS/C,IAJZ5E,EAAOmK,QAKX,CAEO,kBAAApD,CAAmBnC,EAAoB,OAC5C,MAAMe,EAAMzR,KAAKmR,QAAQC,IAAIV,GACzBe,IACFA,EAAI3F,OAAOmK,SACXjW,KAAKmR,QAAQ+E,OAAOxF,GAExB,CAEO,QAAAyF,CAASzF,GACd,OAAO1Q,KAAKmR,QAAQuE,IAAIhF,EAC1B,CAEQ,kBAAA0C,CAAmBpP,EAAM,UACR,QAAvBmI,EAAAnM,KAAKgT,0BAAkB,IAAA7G,GAAAA,EAAE8B,QACzBjO,KAAKgT,wBAAqBhL,EAG1B,MAAMoO,EAAS,GACTC,EAAYhJ,EAAcC,aAAatN,KAAKsR,SAAU8E,EAAQpS,GAC9DyN,EAAM4E,EAAU7I,WAAW,KAAM,CAAEtQ,OAAO,IAChD,IAAKuU,EAAK,OACV,MAAMC,EAAUrE,EAAcmE,gBAAgBC,EAAK2E,EAAQpS,GACrD8M,EAAM,IAAIzT,YAAYqU,EAAQtM,KAAK9H,QACnCgZ,GAAQ,EAAAvX,EAAAzD,YAAW,EAAG,EAAG,GACzBib,GAAQ,EAAAxX,EAAAzD,YAAW,IAAK,IAAK,KACnCwV,EAAInL,KAAK2Q,GACT,IAAK,IAAIhD,EAAI,EAAGA,EAAItP,IAAUsP,EAAG,CAC/B,MAAMkD,EAAQlD,EAAI,EACZnP,EAASmP,EAAI8C,EACnB,IAAK,IAAIK,EAAI,EAAGA,EAAIL,EAAQK,GAAK,EAC/B3F,EAAI3M,EAASsS,EAAID,GAASD,CAE9B,CACA9E,EAAIhE,aAAaiE,EAAS,EAAG,GAG7B,MAAMxR,EAASwW,OAAOxW,MAAQkW,EAAS,GAAK,IAAa,KACzDpW,KAAKiT,aAAe5F,EAAcC,aAAatN,KAAKsR,SAAUpR,EAAO8D,GACrE,MAAM2S,EAAO3W,KAAKiT,aAAazF,WAAW,KAAM,CAAEtQ,OAAO,IACzD,IAAKyZ,EAEH,YADA3W,KAAKiT,kBAAejL,GAGtB,IAAK,IAAIlK,EAAI,EAAGA,EAAIoC,EAAOpC,GAAKsY,EAC9BO,EAAKhC,UAAU0B,EAAWvY,EAAG,GAE/B,MAAM8Y,EAAc5W,KAAKiT,aACzB5F,EAAcQ,kBAAkB+I,GAAavV,KAAKwV,IAC5C7W,KAAKiT,eAAiB2D,EAAaC,SAAAA,EAAQ5I,QAC1CjO,KAAKgT,mBAAqB6D,IAC9B3I,MAAM,OACX,CAEA,YAAWoD,SACT,OAA+C,QAAxCnF,EAAAnM,KAAK6R,UAAUzF,MAAMC,2BAAmB,IAAAF,OAAA,EAAAA,EAAE2K,OAAOxF,QAC1D,2HC3aF,MAAAjI,EAAArK,EAAA,KASanE,EAAA8Q,kBAA+B,CAC1CzL,MAAO,EACP8D,OAAQ,IASV,MAAM+S,EAEJ,OAAWC,GACT,OAAIhX,KAAKiX,QAEQ,UAAZjX,KAAKkX,KACLlX,KAAKmX,gBAAkB,GAGrBnX,KAAKkX,IACd,CACA,OAAWF,CAAIlb,GAAiBkE,KAAKkX,KAAOpb,CAAO,CAEnD,kBAAWqb,GAET,OAAInX,KAAKiX,OACP,GAEe,UAATjX,KAAKkX,OAAoC,EACnD,CACA,kBAAWC,CAAerb,GACxBkE,KAAKkX,OAAQ,UACblX,KAAKkX,MAASpb,GAAS,GAAG,SAC5B,CAEA,kBAAWsb,GACT,OAAmB,SAAZpX,KAAKkX,IACd,CACA,kBAAWE,CAAetb,GACxBkE,KAAKkX,OAAQ,SACblX,KAAKkX,MAAgB,SAARpb,CACf,CAEA,0BAAWub,GACT,MAAMC,GAAgB,WAATtX,KAAKkX,OAAmC,GACrD,OAAII,EAAM,EACK,WAANA,EAEFA,CACT,CACA,0BAAWD,CAAuBvb,GAChCkE,KAAKkX,MAAQ,UACblX,KAAKkX,MAASpb,GAAS,GAAG,UAC5B,CAGA,SAAWyb,GACT,OAAOvX,KAAKiX,MACd,CACA,SAAWM,CAAMzb,GACfkE,KAAKiX,OAASnb,CAChB,CAEA,WAAAiE,CACEiX,EAAc,EACdO,EAAgB,EACTC,GAAU,EACV5D,GAAS,GADT5T,KAAAwX,QAAAA,EACAxX,KAAA4T,OAAAA,EAxDD5T,KAAAkX,KAAe,EA4CflX,KAAAiX,OAAiB,EAcvBjX,KAAKkX,KAAOF,EACZhX,KAAKiX,OAASM,CAChB,CAEO,KAAAE,GASL,OAAO,IAAIV,EAAmB/W,KAAKkX,KAAMlX,KAAKiX,OAAQjX,KAAKwX,QAASxX,KAAK4T,OAC3E,CAEO,OAAA8D,GACL,OAA0B,IAAnB1X,KAAKmX,gBAA0D,IAAhBnX,KAAKiX,SAAkC,IAAlBjX,KAAKwX,OAClF,EAEF,MAAMG,EAAc,IAAIZ,iBAUxB,MAkBE,WAAAhX,CACU8R,EACA3H,EACAhI,GAFAlC,KAAA6R,UAAAA,EACA7R,KAAAkK,UAAAA,EACAlK,KAAAkC,MAAAA,EAnBFlC,KAAA4X,QAAmC,IAAI7F,IAEvC/R,KAAA6X,QAAU,EAEV7X,KAAA8X,UAAY,EAEZ9X,KAAA+X,eAAgB,EAEhB/X,KAAAgY,iBAAkB,EAElBhY,KAAAiY,YAAsB,KAW5B,IACEjY,KAAKkY,SAASlY,KAAKkC,MAAMiW,aAC3B,CAAE,MAAOrQ,GACHA,aAAa1F,OACf7E,QAAQ6a,MAAMtQ,EAAEuQ,SAElB9a,QAAQC,KAAK,0BAA0BwC,KAAKsY,gBAC9C,CACAtY,KAAKuY,iBAAmB,CACtBxM,KAAM/L,KAAK6R,UAAU9F,KACrBC,KAAMhM,KAAK6R,UAAU7F,KAEzB,CAEO,OAAArE,GACL3H,KAAKkL,OACP,CAEO,KAAAA,SACL,IAAK,MAAM6J,KAAQ/U,KAAK4X,QAAQ9C,SACnB,QAAX3I,EAAA4I,EAAKyD,cAAM,IAAArM,GAAAA,EAAExE,UAIf3H,KAAK4X,QAAQ9O,QACb9I,KAAKkK,UAAUuJ,UACjB,CAEO,QAAA6E,GACL,OAA0B,EAAnBtY,KAAKiY,YAAkB,GAChC,CAEO,QAAAC,CAASpc,GACd,GAAIA,EAAQ,IAAOA,EAAQ,IACzB,MAAM2c,WAAW,qEAEnBzY,KAAKiY,YAAenc,EAAQ,EAAI,MAAa,EAC7CkE,KAAK0Y,aAAa,EACpB,CAEO,QAAAC,GACL,OAAiC,EAA1B3Y,KAAK4Y,mBAAyB,GACvC,CAEQ,gBAAAA,GACN,IAAIC,EAAe,EACnB,IAAK,MAAM9D,KAAQ/U,KAAK4X,QAAQ9C,SAC1BC,EAAKI,OACP0D,GAAgB9D,EAAKI,KAAKjV,MAAQ6U,EAAKI,KAAKnR,OACxC+Q,EAAKd,QAAUc,EAAKd,SAAWc,EAAKI,OACtC0D,GAAgB9D,EAAKd,OAAO/T,MAAQ6U,EAAKd,OAAOjQ,SAItD,OAAO6U,CACT,CAEQ,OAAAC,CAAQC,SACd,MAAMhE,EAAO/U,KAAK4X,QAAQxG,IAAI2H,GACzBhE,IACL/U,KAAK4X,QAAQ1B,OAAO6C,GAEhBjC,OAAOkC,aAAejE,EAAKI,gBAAgB6D,aAC7CjE,EAAKI,KAAKlH,QAEO,QAAnB9B,EAAAnM,KAAKiZ,sBAAc,IAAA9M,GAAAA,EAAA3E,KAAnBxH,KAAsB+Y,GACxB,CAKO,aAAAG,SAEL,MAAMC,EAAO,GACb,IAAK,MAAOJ,EAAIhE,KAAS/U,KAAK4X,QAAQwB,UACZ,cAApBrE,EAAKsE,aACI,QAAXlN,EAAA4I,EAAKyD,cAAM,IAAArM,GAAAA,EAAExE,UACbwR,EAAKza,KAAKqa,IAGd,IAAK,MAAMA,KAAMI,EACfnZ,KAAK8Y,QAAQC,GAGf/Y,KAAKgY,iBAAkB,EACvBhY,KAAK+X,eAAgB,CACvB,CAMO,WAAAuB,CAAYP,SACjB,MAAMhE,EAAO/U,KAAK4X,QAAQxG,IAAI2H,GAC1BhE,IACS,QAAX5I,EAAA4I,EAAKyD,cAAM,IAAArM,GAAAA,EAAExE,UACb3H,KAAK8Y,QAAQC,GAEjB,CAaO,QAAArL,CAASmD,EAAsC/P,WAEpDd,KAAK0Y,aAAa7H,EAAI3Q,MAAQ2Q,EAAI7M,QAGlC,IAAImP,EAAWnT,KAAKkK,UAAUiJ,UACN,IAApBA,EAASjT,QAAqC,IAArBiT,EAASnP,SACpCmP,EAAWtY,EAAA8Q,mBAEb,MAAMI,EAAOhQ,KAAKuI,KAAKuM,EAAI3Q,MAAQiT,EAASjT,OACtC8L,EAAOjQ,KAAKuI,KAAKuM,EAAI7M,OAASmP,EAASnP,QAEvCwT,IAAYxX,KAAK6X,QAEjBva,EAAS0C,KAAK6R,UAAUzF,MAAM9O,OAC9Bic,EAAWvZ,KAAK6R,UAAU9F,KAC1ByN,EAAWxZ,KAAK6R,UAAU7F,KAC1ByN,EAAUnc,EAAOmZ,EACjBiD,EAAUpc,EAAOgW,EACvB,IAAInP,EAASsV,EACTE,EAAY,EAEX7Y,EAAK2P,YACRnT,EAAOmZ,EAAI,EACXnZ,EAAOgW,EAAI,EACXnP,EAAS,GAGXnE,KAAK6R,UAAUzF,MAAMwN,cAAcC,iBAAiBC,UAAUxc,EAAOgW,GACrE,IAAK,IAAIQ,EAAM,EAAGA,EAAM9H,IAAQ8H,EAAK,CACnC,MAAMiG,EAAOzc,EAAO0c,MAAM5I,IAAI9T,EAAOgW,EAAIhW,EAAO2c,OAChD,IAAK,IAAIpG,EAAM,EAAGA,EAAM9H,KAClB5H,EAAS0P,GAAO0F,KADU1F,EAE9B7T,KAAKka,aAAaH,EAAwB5V,EAAS0P,EAAK2D,EAAS1D,EAAM/H,EAAO8H,GAC9E8F,IAEF,GAAI7Y,EAAK2P,UACHqD,EAAM9H,EAAO,GAAGhM,KAAK6R,UAAUzF,MAAMwN,cAAcO,gBAEvD,KAAM7c,EAAOgW,GAAKkG,EAAU,MAE9Blc,EAAOmZ,EAAItS,CACb,CACAnE,KAAK6R,UAAUzF,MAAMwN,cAAcC,iBAAiBC,UAAUxc,EAAOgW,GAGjExS,EAAK2P,UACgB,QAAnB3P,EAAK8P,UACPtT,EAAOmZ,EAAI1a,KAAKE,IAAIkI,EAAS4H,EAAMwN,GAEnCjc,EAAOmZ,EAAItS,GAGb7G,EAAOmZ,EAAIgD,EACXnc,EAAOgW,EAAIoG,GAIb,MAAMP,EAAO,GACb,IAAK,MAAOJ,EAAIhE,KAAS/U,KAAK4X,QAAQwB,UAChCrE,EAAK4E,UAAY,IACR,QAAXxN,EAAA4I,EAAKyD,cAAM,IAAArM,GAAAA,EAAExE,UACbwR,EAAKza,KAAKqa,IAGd,IAAK,MAAMA,KAAMI,EACfnZ,KAAK8Y,QAAQC,GAKf,MAAMqB,EAAYpa,KAAK6R,UAAUwI,eAAe,GAChDD,SAAAA,EAAWE,UAAU,KACNta,KAAK4X,QAAQxG,IAAIoG,IAE5BxX,KAAK8Y,QAAQtB,KAMyB,cAAtCxX,KAAK6R,UAAUvU,OAAOid,OAAO1Q,MAC/B7J,KAAKwa,oBAIP,MAAM7G,EAAsB,CAC1BwB,KAAMtE,EACNqE,aAAc/B,EACdc,OAAQpD,EACRuD,eAAc5X,OAAA2F,OAAA,GAAOgR,GACrBqF,OAAQ4B,QAAapS,EACrB2R,YACAN,WAAYrZ,KAAK6R,UAAUvU,OAAOid,OAAO1Q,KACzC6G,MAAO5P,EAAK4P,MACZC,OAAQ7P,EAAK6P,QAMf,OAFA3Q,KAAK4X,QAAQ1U,IAAIsU,EAAS7D,GACT,QAAjBpG,EAAAvN,KAAKya,oBAAY,IAAAlN,GAAAA,EAAA/F,KAAjBxH,MACOwX,CACT,CAQO,MAAAkD,CAAOC,WAEZ,IAAIC,GAAe,EACfC,GAAkB,EACtB,IAAK,MAAM9F,KAAQ/U,KAAK4X,QAAQ9C,SAM9B,GALmB,WAAfC,EAAKrE,MACPmK,GAAkB,EAElBD,GAAe,EAEbA,GAAgBC,EAAiB,MAIvC,GAAID,IAAiB5a,KAAKkK,UAAUiM,SAAS,SAC3CnW,KAAKkK,UAAUuL,iBAAiB,QAC3BzV,KAAKkK,UAAUiM,SAAS,QAAQ,OAUvC,GARI0E,IAAoB7a,KAAKkK,UAAUiM,SAAS,WAC9CnW,KAAKkK,UAAUuL,iBAAiB,UAIlCzV,KAAKkK,UAAUwI,iBAGV1S,KAAK4X,QAAQ7N,KAYhB,OAXK/J,KAAK+X,gBACR/X,KAAKkK,UAAUuJ,WACfzT,KAAK+X,eAAgB,EACrB/X,KAAKgY,iBAAkB,GAErBhY,KAAKkK,UAAUiM,SAAS,QAC1BnW,KAAKkK,UAAU2I,mBAAmB,YAEhC7S,KAAKkK,UAAUiM,SAAS,WAC1BnW,KAAKkK,UAAU2I,mBAAmB,YAMjC+H,GAAgB5a,KAAKkK,UAAUiM,SAAS,SAC3CnW,KAAKkK,UAAUuJ,SAAS,OACxBzT,KAAKkK,UAAU2I,mBAAmB,SAE/BgI,GAAmB7a,KAAKkK,UAAUiM,SAAS,YAC9CnW,KAAKkK,UAAUuJ,SAAS,UACxBzT,KAAKkK,UAAU2I,mBAAmB,WAIhC7S,KAAKgY,kBACPhY,KAAKkK,UAAUuJ,WACfzT,KAAK+X,eAAgB,EACrB/X,KAAKgY,iBAAkB,GAGzB,MAAM3S,MAAEA,EAAKC,IAAEA,GAAQqV,EACjBrd,EAAS0C,KAAK6R,UAAUzF,MAAM9O,OAC9ByO,EAAO/L,KAAK6R,UAAUzF,MAAML,KAGlC/L,KAAKkK,UAAUmJ,WAAWhO,EAAOC,GAGjC,MAAMwV,EAAgG,GAChGC,EAAkE,GAGxE,IAAK,IAAIjH,EAAMzO,EAAOyO,GAAOxO,IAAOwO,EAAK,CACvC,MAAMiG,EAAOzc,EAAO0c,MAAM5I,IAAI0C,EAAMxW,EAAO0d,OAC3C,IAAKjB,EAAM,OACX,IAAK,IAAIlG,EAAM,EAAGA,EAAM9H,IAAQ8H,EAC9B,GAAmB,UAAfkG,EAAKkB,MAAMpH,GAA6B,CAC1C,IAAI/L,EAAiD,QAAhDqE,EAAwB4N,EAAKmB,eAAerH,UAAI,IAAA1H,EAAAA,EAAIwL,EACzD,MAAMH,EAAU1P,EAAE0P,QAClB,QAAgBxP,IAAZwP,IAAsC,IAAbA,EAC3B,SAEF,MAAM7D,EAAU3T,KAAK4X,QAAQxG,IAAIoG,GACjC,IAAkB,IAAd1P,EAAE8L,OAAe,CACnB,MAAMuH,EAAYrT,EAAE8L,OACdwH,EAAWvH,EACjB,IAAIE,EAAQ,EAOZ,OACIF,EAAM9H,GACW,UAAfgO,EAAKkB,MAAMpH,KACX/L,EAA4B,QAA3ByF,EAAGwM,EAAKmB,eAAerH,UAAI,IAAAtG,EAAAA,EAAIoK,IAChC7P,EAAE0P,UAAYA,GACd1P,EAAE8L,SAAWuH,EAAYpH,GAE7BA,IAEFF,IACIF,EACEA,EAAQM,QACV6G,EAAUpc,KAAK,CAAEiV,UAASC,OAAQuH,EAAWtH,IAAKuH,EAAUtH,MAAKC,UAE1D/T,KAAKkC,MAAMgR,iBACpB6H,EAAiBrc,KAAK,CAAEmV,IAAKuH,EAAUtH,MAAKC,UAE9C/T,KAAK+X,eAAgB,CACvB,CACF,CAEJ,CAGA+C,EAAUO,KAAK,CAAC3f,EAAGD,IAAMC,EAAEiY,QAAQhD,OAASlV,EAAEkY,QAAQhD,QAGtD,IAAK,MAAMnJ,KAAQuT,EACjB/a,KAAKkK,UAAU2K,gBAAgBrN,EAAKqM,IAAKrM,EAAKsM,IAAKtM,EAAKuM,OAI1D,IAAK,MAAMvM,KAAQsT,EACjB9a,KAAKkK,UAAUwJ,KAAKlM,EAAKmM,QAASnM,EAAKoM,OAAQpM,EAAKqM,IAAKrM,EAAKsM,IAAKtM,EAAKuM,MAE5E,CAEO,cAAAuH,CAAe1O,WAEpB,IAAK5M,KAAK4X,QAAQ7N,KAEhB,YADA/J,KAAKuY,iBAAmB3L,GAM1B,GAAI5M,KAAKuY,iBAAiBxM,MAAQa,EAAQb,KAExC,YADA/L,KAAKuY,iBAAmB3L,GAK1B,MAAMtP,EAAS0C,KAAK6R,UAAUzF,MAAM9O,OAC9B0O,EAAO1O,EAAO0c,MAAMjc,OACpBwd,EAASvb,KAAKuY,iBAAiBxM,KAAO,EAC5C,IAAK,IAAI+H,EAAM,EAAGA,EAAM9H,IAAQ8H,EAAK,CACnC,MAAMiG,EAAOzc,EAAO0c,MAAM5I,IAAI0C,GAC9B,GAAsB,UAAlBiG,EAAKkB,MAAMM,GAAgC,CAC7C,MAAMzT,EAAoD,QAAnDyF,EAAwBwM,EAAKmB,eAAeK,UAAO,IAAAhO,EAAAA,EAAIoK,EACxDH,EAAU1P,EAAE0P,QAClB,QAAgBxP,IAAZwP,IAAsC,IAAbA,EAC3B,SAEF,MAAM7D,EAAU3T,KAAK4X,QAAQxG,IAAIoG,GACjC,IAAK7D,EACH,SAGF,MAAM6H,EAAczf,KAAKuI,OAAoB,QAAd6H,EAAAwH,EAAQM,cAAM,IAAA9H,OAAA,EAAAA,EAAEjM,QAAS,GAAKyT,EAAQS,eAAelU,OACpF,GAAK4H,EAAE8L,OAAS4H,EAAe,GAAKA,EAClC,SAGF,IAAIC,GAAU,EACd,IAAK,IAAIC,EAAWH,EAAS,EAAGG,EAAW9O,EAAQb,OAAQ2P,EACzD,GAAmD,QAA/C3B,EAAK4B,MAAc,EAARD,EAAoB,GAA6C,CAC9ED,GAAU,EACV,KACF,CAEF,GAAIA,EACF,SAGF,MAAMnW,EAAMvJ,KAAKE,IAAI2Q,EAAQb,KAAMyP,EAAe1T,EAAE8L,OAAS4H,EAAeD,GAC5E,IAAIK,EAAW9T,EAAE8L,OACjB,IAAK,IAAIiI,EAAYN,EAAS,EAAGM,EAAYvW,IAAOuW,EAClD7b,KAAKka,aAAaH,EAAwB8B,EAAWrE,IAAWoE,GAChEjI,EAAQgG,WAEZ,CACF,CAEA3Z,KAAKuY,iBAAmB3L,CAC1B,CAKO,oBAAAkP,CAAqBrF,EAAWnD,aACrC,MACMyG,EADS/Z,KAAK6R,UAAUzF,MAAM9O,OAChB0c,MAAM5I,IAAIkC,GAC9B,GAAIyG,GAAqB,UAAbA,EAAKkB,MAAMxE,GAA2B,CAChD,MAAM3O,EAA+C,QAA9CoE,EAAwB6N,EAAKmB,eAAezE,UAAE,IAAAvK,EAAAA,EAAIyL,EACzD,GAAI7P,EAAE0P,UAA0B,IAAf1P,EAAE0P,QAAgB,CACjC,MAAMrC,EAAkC,QAA3BhJ,EAAAnM,KAAK4X,QAAQxG,IAAItJ,EAAE0P,gBAAQ,IAAArL,OAAA,EAAAA,EAAEgJ,KAC1C,GAAI2B,OAAOkC,aAAe7D,aAAgB6D,YAAa,CACrD,MAAMlN,EAASzC,EAAAgE,cAAcC,aAAawJ,OAAOxF,SAAU6D,EAAKjV,MAAOiV,EAAKnR,QAE5E,OADuB,QAAvBuJ,EAAAzB,EAAO0B,WAAW,aAAK,IAAAD,GAAAA,EAAEoH,UAAUQ,EAAM,EAAG,EAAGA,EAAKjV,MAAOiV,EAAKnR,QACzD8H,CACT,CACA,OAAOqJ,CACT,CACF,CACF,CAKO,uBAAA4G,CAAwBtF,EAAWnD,SACxC,MACMyG,EADS/Z,KAAK6R,UAAUzF,MAAM9O,OAChB0c,MAAM5I,IAAIkC,GAC9B,GAAIyG,GAAqB,UAAbA,EAAKkB,MAAMxE,GAA2B,CAChD,MAAM3O,EAA+C,QAA9CqE,EAAwB4N,EAAKmB,eAAezE,UAAE,IAAAtK,EAAAA,EAAIwL,EACzD,GAAI7P,EAAE0P,UAA0B,IAAf1P,EAAE0P,UAAgC,IAAd1P,EAAE8L,OAAe,CACpD,MAAMmB,EAAO/U,KAAK4X,QAAQxG,IAAItJ,EAAE0P,SAChC,GAAIzC,EACF,OAAO/U,KAAKkK,UAAU0K,YAAYG,EAAMjN,EAAE8L,OAE9C,CACF,CACF,CAIQ,YAAA8E,CAAasD,SACnB,MAAMC,EAAOjc,KAAK4Y,mBAClB,IAAIsD,EAAUD,EACd,KAAOjc,KAAKiY,YAAciE,EAAUF,GAAQhc,KAAK4X,QAAQ7N,MAAM,CAC7D,MAAMgL,EAAO/U,KAAK4X,QAAQxG,MAAMpR,KAAK8X,WACjC/C,GAAQA,EAAKI,OACf+G,GAAWnH,EAAKI,KAAKjV,MAAQ6U,EAAKI,KAAKnR,OACnC+Q,EAAKd,QAAUc,EAAKI,OAASJ,EAAKd,SACpCiI,GAAWnH,EAAKd,OAAO/T,MAAQ6U,EAAKd,OAAOjQ,QAElC,QAAXmI,EAAA4I,EAAKyD,cAAM,IAAArM,GAAAA,EAAExE,UACb3H,KAAK8Y,QAAQ9Y,KAAK8X,WAEtB,CACA,OAAOmE,EAAOC,CAChB,CAEQ,YAAAhC,CAAaH,EAAsBtD,EAAWe,EAAiB5D,GACrE,GAAuC,UAAnCmG,EAAK4B,MAAO,EAADlF,EAAa,GAAoC,CAC9D,MAAM0F,EAAMpC,EAAKmB,eAAezE,GAChC,GAAI0F,EAAK,CACP,QAAoBnU,IAAhBmU,EAAI3E,QAAuB,CAI7B,MAAM4E,EAAUpc,KAAK4X,QAAQxG,IAAI+K,EAAI3E,SAOrC,OANI4E,GAEFA,EAAQzC,YAEVwC,EAAI3E,QAAUA,OACd2E,EAAIvI,OAASA,EAEf,CAGA,YADAmG,EAAKmB,eAAezE,GAAK,IAAIM,EAAmBoF,EAAInF,IAAKmF,EAAI5E,MAAOC,EAAS5D,GAE/E,CACF,CAEAmG,EAAK4B,MAAO,EAADlF,EAAa,IAAW,UACnCsD,EAAKmB,eAAezE,GAAK,IAAIM,EAAmB,EAAG,EAAGS,EAAS5D,EACjE,CAEQ,iBAAA4G,WAEN,IAAK,MAAMzF,KAAQ/U,KAAK4X,QAAQ9C,SACN,cAApBC,EAAKsE,aACPtE,EAAK4E,UAAY,GAIrB,MAAMrc,EAAS0C,KAAK6R,UAAUzF,MAAM9O,OACpC,IAAK,IAAIgW,EAAI,EAAGA,EAAItT,KAAK6R,UAAU7F,OAAQsH,EAAG,CAC5C,MAAMyG,EAAOzc,EAAO0c,MAAM5I,IAAIkC,GAC9B,GAAKyG,EAGL,IAAK,IAAItD,EAAI,EAAGA,EAAIzW,KAAK6R,UAAU9F,OAAQ0K,EACzC,GAAuC,UAAnCsD,EAAK4B,MAAO,EAADlF,EAAa,GAAoC,CAC9D,MAAM4F,EAA8B,QAAtBlQ,EAAA4N,EAAKmB,eAAezE,UAAE,IAAAtK,OAAA,EAAAA,EAAEqL,QACtC,GAAI6E,EAAO,CACT,MAAMtH,EAAO/U,KAAK4X,QAAQxG,IAAIiL,GAC1BtH,GACFA,EAAK4E,WAET,CACF,CAEJ,CAEA,MAAMR,EAAO,GACb,IAAK,MAAOJ,EAAIhE,KAAS/U,KAAK4X,QAAQwB,UACZ,cAApBrE,EAAKsE,YAA+BtE,EAAK4E,YAChC,QAAXpM,EAAAwH,EAAKyD,cAAM,IAAAjL,GAAAA,EAAE5F,UACbwR,EAAKza,KAAKqa,IAGd,IAAK,MAAMA,KAAMI,EACfnZ,KAAK8Y,QAAQC,EAEjB,sFCnpBF,MAAAha,EAAAC,EAAA,KAEAqK,EAAArK,EAAA,KAEAsd,EAAAtd,EAAA,KAMMud,EAAkBxd,EAAAnC,iBAkIxB,SAAS4f,EAAU/e,GACjB,OAAIsB,EAAA5B,WAAmBM,GACP,IAARA,IAAiB,IAAMA,IAAU,EAAI,MAAS,IAAMA,IAAU,GAAK,MAAS,EAAIA,IAAU,GAAK,GACzG,CApIA8e,EAAgBrZ,IAAInE,EAAAjC,oCAGpB,MAKE,WAAAiD,CACmBmC,EACAiI,EACAC,GAFApK,KAAAkC,MAAAA,EACAlC,KAAAmK,SAAAA,EACAnK,KAAAoK,cAAAA,EAPXpK,KAAAyc,MAAQ,EACRzc,KAAAsK,UAAW,GAQjB,EAAAgS,EAAAxd,cAAa,CACX0B,YAAqC,EAAxBR,KAAKkC,MAAM8K,WACxBtP,QAAS6e,EACT5b,aAAcX,KAAKkC,MAAMwa,oBACxBrb,KAAKlD,GAAK6B,KAAK+K,KAAO5M,EAC3B,CAEO,KAAA+M,GAODlL,KAAK+K,OACP/K,KAAK+K,KAAK9G,UAETjE,KAAK+K,KAAa/H,SAAS2C,KAAK,GACjC3F,KAAK+K,KAAK1H,KAAK,EAAGkZ,EAAiBvc,KAAKkC,MAAMwa,mBAElD,CAEO,IAAAC,CAAKC,SAGV,GAFA5c,KAAKyc,MAAQ,EACbzc,KAAKsK,UAAW,EACZtK,KAAK+K,KAAM,CACb,MAAMrK,EAAiC,IAArBkc,EAAOA,OAAO,GAAW,EA4DjD,SAAyBC,EAAqBC,GAC5C,IAAIC,EAAK,EACT,IAAKD,EAGH,OAAOC,EAET,GAAIF,EAAKG,YACP,GAAIH,EAAKI,cACPF,EAAKP,EAAUM,EAAOI,WAAWC,WAC5B,GAAIN,EAAKO,UAAW,CACzB,MAAMC,EAAKR,EAAK9c,YAAqCud,WAAWT,EAAKU,cACrER,GAAK,EAAAhe,EAAAzD,eAAc+hB,EACrB,MACEN,EAAKP,EAAUM,EAAOU,KAAKX,EAAKU,cAAcJ,WAGhD,GAAIN,EAAKY,cACPV,EAAKP,EAAUM,EAAOY,WAAWP,WAC5B,GAAIN,EAAKc,UAAW,CACzB,MAAMN,EAAKR,EAAK9c,YAAqCud,WAAWT,EAAKe,cACrEb,GAAK,EAAAhe,EAAAzD,eAAc+hB,EACrB,MACEN,EAAKP,EAAUM,EAAOU,KAAKX,EAAKe,cAAcT,MAGlD,OAAOJ,CACT,CAvFqDc,CAC7C7d,KAAKoK,cAAcgC,MAAMwN,cAAckE,aACD,QAAtC3R,EAAAnM,KAAKoK,cAAcgC,MAAM2R,qBAAa,IAAA5R,OAAA,EAAAA,EAAE2Q,QAC1C9c,KAAK+K,KAAK1H,KAAK3C,EAAW,KAAMV,KAAKkC,MAAMwa,kBAC7C,CACF,CAEO,GAAAvR,CAAI/F,EAAmBC,EAAeC,GAC3C,IAAItF,KAAKsK,UAAatK,KAAK+K,KAA3B,CAIA,GADA/K,KAAKyc,OAASnX,EAAMD,EAChBrF,KAAKyc,MAAQzc,KAAKkC,MAAM8b,eAI1B,OAHAzgB,QAAQC,KAAK,kCACbwC,KAAKsK,UAAW,OAChBtK,KAAK+K,KAAK9G,UAGZ,IACEjE,KAAK+K,KAAKnM,OAAOwG,EAAMC,EAAOC,EAChC,CAAE,MAAOwC,GACPvK,QAAQC,KAAK,uCAAuCsK,KACpD9H,KAAKsK,UAAW,EAChBtK,KAAK+K,KAAK9G,SACZ,CAdA,CAeF,CAEO,MAAAga,CAAOzS,SACZ,GAAIxL,KAAKsK,WAAakB,IAAYxL,KAAK+K,KACrC,OAAO,EAGT,MAAM7K,EAAQF,KAAK+K,KAAK7K,MAClB8D,EAAShE,KAAK+K,KAAK/G,OAGzB,IAAK9D,IAAU8D,EAIb,OAHIA,GACFhE,KAAKmK,SAAS+T,cAAcla,IAEvB,EAGT,MAAM8H,EAASzC,EAAAgE,cAAcC,kBAAatF,EAAW9H,EAAO8D,GAM5D,OALuB,QAAvBmI,EAAAL,EAAO0B,WAAW,aAAK,IAAArB,GAAAA,EAAEsB,aAAa,IAAIN,UAAUnN,KAAK+K,KAAK9E,MAAyC/F,EAAO8D,GAAS,EAAG,GACtHhE,KAAK+K,KAAKnG,YAxFM,SAyFlB5E,KAAK+K,KAAK9G,UAEZjE,KAAKmK,SAASuD,SAAS5B,IAChB,CACT,2FCtGF,MAAAxC,EAAAtK,EAAA,yBAWA,MAEE,WAAAe,CACmBoK,EACAjI,EACAgI,EACA2H,GAHA7R,KAAAmK,SAAAA,EACAnK,KAAAkC,MAAAA,EACAlC,KAAAkK,UAAAA,EACAlK,KAAA6R,UAAAA,EALX7R,KAAAwQ,cAA+B,CAAEC,WAAW,EAAMC,MAAO,MAAOC,OAAQ,EAAGC,UAAW,QAM3F,CAMI,QAAAlD,CAASmD,GACd7Q,KAAKwQ,cAAcC,UAAYzQ,KAAKkC,MAAMic,eAC1Cne,KAAKmK,SAASuD,SAASmD,EAAK7Q,KAAKwQ,cACnC,CAOO,aAAA0N,CAAcla,GACnB,GAAIhE,KAAKkC,MAAMic,eAAgB,CAC7B,IAAIhL,EAAWnT,KAAKkK,UAAUiJ,UACN,IAApBA,EAASjT,QAAqC,IAArBiT,EAASnP,SACpCmP,EAAW7J,EAAAqC,mBAEb,MAAMK,EAAOjQ,KAAKuI,KAAKN,EAASmP,EAASnP,QACzC,IAAK,IAAIlG,EAAI,EAAGA,EAAIkO,IAAQlO,EAC1BkC,KAAK6R,UAAUzF,MAAMwN,cAAcO,UAEvC,CACF,iLC3CF,MAAA9Q,EAAArK,EAAA,KACAsK,EAAAtK,EAAA,KACA2K,EAAA3K,EAAA,KAEAuK,EAAAC,EAAAxK,EAAA,MACAof,EAAApf,EAAA,4BA0BA,MAiCE,WAAAe,CACmBmC,EACAgI,EACAmU,EACAjU,GAHApK,KAAAkC,MAAAA,EACAlC,KAAAkK,UAAAA,EACAlK,KAAAqe,cAAAA,EACAre,KAAAoK,cAAAA,EApCXpK,KAAAsK,UAAW,EACXtK,KAAAqK,YAAc,EACdrK,KAAAse,cAAe,EAEfte,KAAAue,eAAuC,KAOvCve,KAAAwe,gBAAiB,EAGjBxe,KAAAye,aAAe,IAAIphB,YAAW,KAC9B2C,KAAA0e,eAAiB,EAGjB1e,KAAA2e,kBAAoB,EACpB3e,KAAA4e,kBAAoB,EAGpB5e,KAAA6e,eAAuC,KAIvC7e,KAAA8e,sBAA2D,IAAI/M,IAarE/R,KAAK+e,iBAAmBhjB,KAAKuI,KAAiC,EAA5BtE,KAAKkC,MAAM8c,eAAqB,GAElEhf,KAAKif,qBAAuBljB,KAAKE,IAAG,QAAiC+D,KAAK+e,iBAC5E,CAEO,KAAA7T,GACLlL,KAAKqK,cACLrK,KAAKkf,qBACDlf,KAAKue,iBACPve,KAAKue,eAAeta,UACpBjE,KAAKue,eAAiB,MAExBve,KAAKqe,cAAcnT,OACrB,CAEO,OAAAvD,GACL3H,KAAKkL,OACP,CAEQ,mBAAAiU,CAAoB5J,GAC1BvV,KAAK8e,sBAAsB5I,OAAOX,GAC9BvV,KAAKof,kBAAoB7J,IAC3BvV,KAAKof,qBAAkBpX,EAE3B,CAEQ,kBAAAkX,GACN,IAAK,MAAMG,KAAWrf,KAAK8e,sBAAsBhK,SAC/CuK,EAAQC,QAAQrb,UAElBjE,KAAK8e,sBAAsBhW,QAC3B9I,KAAKof,qBAAkBpX,CACzB,CAEO,KAAA3C,GACLrF,KAAKsK,UAAW,EAChBtK,KAAKse,cAAe,EACpBte,KAAKwe,gBAAiB,EACtBxe,KAAK0e,eAAiB,EACtB1e,KAAK6e,eAAiB,KAEtB7e,KAAK2e,kBAAoB3e,KAAK+e,iBAC9B/e,KAAK4e,kBAAoB,EACzB5e,KAAKue,eAAiB,IACxB,CAEO,GAAApT,CAAI/F,EAAmBC,EAAeC,SAC3C,IAAItF,KAAKsK,SAET,GAAKtK,KAAKwe,eAEH,CAEL,IAAIe,EAAaja,EACjB,IAAK,IAAIxH,EAAIuH,EAAOvH,EAAIwH,EAAKxH,IAC3B,GAAW,KAAPsH,EAAKtH,GAA4B,CACnCkC,KAAKwe,gBAAiB,EACtBe,EAAazhB,EACb,KACF,CAIF,MAAM0hB,EAAaD,EAAala,EAChC,GAAIrF,KAAK0e,eAAiBc,EAAU,IAElC,YADAxf,KAAKsK,UAAW,GAMlB,GAHAtK,KAAKye,aAAavb,IAAIkC,EAAKX,SAASY,EAAOka,GAAavf,KAAK0e,gBAC7D1e,KAAK0e,gBAAkBc,GAElBxf,KAAKwe,eAAgB,CAKxB,GAHAxe,KAAK6e,gBAAiB,EAAAT,EAAAqB,mBAAkBzf,KAAK0f,gCAGd1X,IAA3BhI,KAAK6e,eAAe9F,SAAwD/Q,IAApChI,KAAK6e,eAAec,YAG9D,OAFA3f,KAAK4f,cAAc5f,KAAK6e,eAAe9F,GAAI,0CAAoE,QAA3B5M,EAAEnM,KAAK6e,eAAegB,aAAK,IAAA1T,EAAAA,EAAI,QACnHnM,KAAKsK,UAAW,GAKlB,GAA8B,MAA1BtK,KAAK6e,eAAeiB,OACtB,OAIF,MAAMC,EAAeR,EAAa,EAC9BQ,EAAeza,GACjBtF,KAAKggB,eAAe5a,EAAM2a,EAAcza,EAE5C,CACF,MA3CEtF,KAAKggB,eAAe5a,EAAMC,EAAOC,EA4CrC,CAGQ,cAAA0a,CAAe5a,EAAmBC,EAAeC,uBACvD,GAAItF,KAAKsK,SAAU,OAKnB,MAAM2V,EAA4D,QAAlD3R,EAA0B,QAA1BpC,EAAsB,QAAnBC,EAAAnM,KAAK6e,sBAAc,IAAA1S,OAAA,EAAAA,EAAE4M,UAAE,IAAA7M,EAAAA,EAAIlM,KAAKof,uBAAe,IAAA9Q,EAAAA,EAAI,EAChE+Q,EAAUrf,KAAK8e,sBAAsB1N,IAAI6O,GACzCC,EAA+C,QAA5B1M,EAAG6L,aAAO,EAAPA,EAASc,wBAAgB,IAAA3M,EAAAA,EAAI,EAGzD,GAFAxT,KAAK4e,mBAAqBtZ,EAAMD,EACF6a,EAAsBlgB,KAAK4e,kBAC7B5e,KAAK2e,kBAAmB,CAClD,MAAMyB,EAAsC,QAAtBC,EAAGrgB,KAAKue,sBAAc,IAAA8B,EAAAA,EAAIhB,aAAO,EAAPA,EAASC,QASzD,OARIc,GACFA,EAAiBnc,UAEnBjE,KAAKue,eAAiB,KAClBc,GACFrf,KAAKmf,oBAAoBc,QAE3BjgB,KAAKsK,UAAW,EAElB,CAEA,IAAItK,KAAKse,aAAT,CAKA,IAHIe,aAAO,EAAPA,EAASC,WAAYtf,KAAKue,iBAC5Bve,KAAKue,eAAiBc,EAAQC,UAE3Btf,KAAKue,eAAgB,CAExB,MAAM+B,EAAkBtgB,KAAK+e,iBAAmB,OAChD,GAAIuB,EAA4C,IAA1BtgB,KAAKkC,MAAMiW,aAK/B,OAJAnY,KAAKsK,UAAW,YACgBtC,KAAT,QAAnBuF,EAAAvN,KAAK6e,sBAAc,IAAAtR,OAAA,EAAAA,EAAEwL,KACvB/Y,KAAK4f,cAAc5f,KAAK6e,eAAe9F,GAAI,uCAAiE,QAA3BwH,EAAEvgB,KAAK6e,eAAegB,aAAK,IAAAU,EAAAA,EAAI,IAIpH,MAAMC,EAAazkB,KAAKC,IAAI,EAAGD,KAAKmR,MAAgC,IAA1BlN,KAAKkC,MAAMiW,aAAyBmI,IAC9E,KAAOtgB,KAAK8e,sBAAsB/U,MAAQyW,GAAY,CACpD,MAAMC,EAASzgB,KAAK8e,sBAAsB1F,UAAUsH,OAAO5kB,MAC3D,IAAK2kB,EAAQ,MACbA,EAAO,GAAGnB,QAAQrb,UAClBjE,KAAKmf,oBAAoBsB,EAAO,SACPzY,IAArByY,EAAO,GAAGE,IAAI5H,IAChB/Y,KAAK4f,cAAca,EAAO,GAAGE,IAAI5H,GAAI,uCAA2D,QAArB6H,EAAEH,EAAO,GAAGE,IAAId,aAAK,IAAAe,EAAAA,EAAI,EAExG,CACA5gB,KAAKue,eAAiB,IAAIhV,EAAAyB,QAAa,QAA8BhL,KAAK+e,iBAAkB/e,KAAKif,sBACjGjf,KAAKue,eAAelb,MACtB,CA/Le,IAiMXrD,KAAKue,eAAepT,IAAI/F,EAAKX,SAASY,EAAOC,MAC/CtF,KAAKue,eAAeta,UACpBjE,KAAKue,eAAiB,KACtBve,KAAKse,cAAe,EAChBe,GACFrf,KAAKmf,oBAAoBc,GAlCN,CAqCzB,CAEO,GAAA3a,CAAIkG,WACT,GAAIxL,KAAKsK,WAAakB,EAKpB,OAJIxL,KAAKue,iBACPve,KAAKue,eAAeta,UACpBjE,KAAKue,eAAiB,OAEjB,EAIT,GAAIve,KAAKwe,eACP,OAAOxe,KAAK6gB,0BAId,MAAMF,EAAM3gB,KAAK6e,eAGjB,GAAc,MAAV8B,EAAIb,OACN,OAAO9f,KAAK8gB,cAAcH,GAI5B,MAAMV,EAA2C,QAAjC1S,EAAS,QAATpB,EAAGwU,EAAI5H,UAAE,IAAA5M,EAAAA,EAAInM,KAAKof,uBAAe,IAAA7R,EAAAA,EAAI,EAC/CwT,EAA4B,IAAbJ,EAAIK,KACnB3B,EAAUrf,KAAK8e,sBAAsB1N,IAAI6O,GAE/C,GAAIc,EAgBF,OAfI/gB,KAAKue,iBACHc,GACFA,EAAQc,kBAAoBngB,KAAK4e,kBACjCS,EAAQ4B,YAAc5B,EAAQ4B,aAAejhB,KAAKse,cAElDte,KAAK8e,sBAAsB5b,IAAI+c,EAAY,CACzCU,IAAGnkB,OAAA2F,OAAA,GAAOwe,GACVrB,QAAStf,KAAKue,eACd4B,iBAAkBngB,KAAK4e,kBACvBqC,YAAajhB,KAAKse,eAGtBte,KAAKof,gBAAkBa,EACvBjgB,KAAKue,eAAiB,OAEjB,EAILc,IACFrf,KAAKof,qBAAkBpX,GAGzB,IAAIiZ,EAAcjhB,KAAKse,aACnB4C,EAAWP,EACXrB,EAAUtf,KAAKue,eAEfc,IACF6B,EAAW7B,EAAQsB,IACnBrB,EAAUD,EAAQC,QAClB2B,EAAcA,GAAe5B,EAAQ4B,YACrCjhB,KAAK8e,sBAAsB5I,OAAO+J,IAGpC,IAAIkB,EAAa,IAAI/jB,WAAW,GAC5BkiB,IA1QW,IA2QTA,EAAQha,QACV2b,GAAc,GAEhBE,EAAa7B,EAAQrZ,OAEvBjG,KAAKue,eAAiB,KAKtB,MAAMhf,EAASS,KAAKohB,8BAA8BF,EAAUC,EAAYF,GAIxE,OAHI3B,GACFA,EAAQrb,UAEH1E,CACT,CAIQ,uBAAAmgB,GACN,IAAI2B,EAAM,GACV,IAAK,IAAIvjB,EAAI,EAAGA,EAAIkC,KAAK0e,eAAgB5gB,IACvCujB,GAAOnS,OAAOoS,cAActhB,KAAKye,aAAa3gB,IAEhD,OAAOujB,CACT,CAEQ,uBAAAR,iBACN,MAAMF,GAAM,EAAAvC,EAAAqB,mBAAkBzf,KAAK0f,2BAGnC,QAAe1X,IAAX2Y,EAAI5H,SAAwC/Q,IAApB2Y,EAAIhB,YAE9B,OADA3f,KAAK4f,cAAce,EAAI5H,GAAI,0CAAoD,QAAX5M,EAAEwU,EAAId,aAAK,IAAA1T,EAAAA,EAAI,IAC5E,EAKT,OAFyB,QAAboB,EAAGoT,EAAIb,cAAM,IAAAvS,EAAAA,EAAI,KAG3B,QACE,OAAOvN,KAAK8gB,cAAcH,GAC5B,QAEE,OADA3gB,KAAK4f,cAAoB,QAAP1T,EAACyU,EAAI5H,UAAE,IAAA7M,EAAAA,EAAI,EAAG,KAAe,QAAXoC,EAAEqS,EAAId,aAAK,IAAAvR,EAAAA,EAAI,IAC5C,EACT,QACE,OAAOtO,KAAKuhB,iBAAiBZ,GAC/B,QAQE,YAHe3Y,IAAX2Y,EAAI5H,IACN/Y,KAAK4f,cAAce,EAAI5H,GAAI,4BAAsC,QAAXvF,EAAEmN,EAAId,aAAK,IAAArM,EAAAA,EAAI,IAEhE,EAEb,CAEQ,6BAAA4N,CAA8BT,EAAoBa,EAAmBP,iBAG3E,OAFyB,QAAb9U,EAAGwU,EAAIb,cAAM,IAAA3T,EAAAA,EAAI,KAG3B,QAA2B,CACzB,MAAM5M,EAASS,KAAKyhB,gBAAgBd,EAAKa,EAAOP,GAUhD,MAPkC,OAAb,QAAjB1T,EAACoT,EAAIe,oBAAY,IAAAnU,EAAAA,EAAI,WAA2BvF,IAAX2Y,EAAI5H,KACvCkI,EACFjhB,KAAK4f,cAAce,EAAI5H,GAAI,6BAAuC,QAAX7M,EAAEyU,EAAId,aAAK,IAAA3T,EAAAA,EAAI,GAC7DsV,EAAMzjB,OAAS,GACxBiC,KAAK4f,cAAce,EAAI5H,GAAI,KAAe,QAAXzK,EAAEqS,EAAId,aAAK,IAAAvR,EAAAA,EAAI,IAG3C/O,CACT,CACA,QACE,OAAOS,KAAK2hB,uBAAuBhB,EAAKa,EAAOP,GACjD,QACE,OAAOjhB,KAAK4hB,aAAajB,EAAKa,EAAOP,GACvC,QAEE,OAAOjhB,KAAKuhB,iBAAiBZ,GAC/B,QAQE,YAHe3Y,IAAX2Y,EAAI5H,IACN/Y,KAAK4f,cAAce,EAAI5H,GAAI,4BAAsC,QAAXvF,EAAEmN,EAAId,aAAK,IAAArM,EAAAA,EAAI,IAEhE,EAEb,CAEQ,gBAAA+N,CAAiBZ,SACvB,QAAe3Y,IAAX2Y,EAAI5H,GACN,OAAO,EAET,MAAMA,EAAK4H,EAAI5H,GACT8I,EAAQ7hB,KAAKqe,cAAcyD,SAAS/I,GAC1C,OAAK8I,EAIU7hB,KAAK+hB,cAAcF,EAAOlB,GAC3Btf,KAAKmK,UAEjB,OADAxL,KAAK4f,cAAc7G,EAAIvN,EAAU,KAAO,gCAA0C,QAAXW,EAAEwU,EAAId,aAAK,IAAA1T,EAAAA,EAAI,EAAGwU,EAAIqB,cACtF,KANPhiB,KAAK4f,cAAc7G,EAAI,yBAAmC,QAAX5M,EAAEwU,EAAId,aAAK,IAAA1T,EAAAA,EAAI,EAAGwU,EAAIqB,cAC9D,EAOX,CAEQ,eAAAP,CAAgBd,EAAoBa,EAAmBP,mBAY7D,MAAqB,OADgB,QAAnB9U,EAAGwU,EAAIe,oBAAY,IAAAvV,EAAAA,EAAI,WAExBnE,IAAX2Y,EAAI5H,IACN/Y,KAAK4f,cAAce,EAAI5H,GAAI,yCAAmD,QAAXxL,EAAEoT,EAAId,aAAK,IAAAtS,EAAAA,EAAI,IAE7E,IAGL0T,GAAgC,IAAjBO,EAAMzjB,QAEzBiC,KAAKqe,cAAc4D,WAAWtB,EAAI5H,GAAI,CACpC3T,KAAM,IAAIuI,KAAK,CAAC6T,IAChBthB,MAAgB,QAAXgM,EAAEyU,EAAIzgB,aAAK,IAAAgM,EAAAA,EAAI,EACpBlI,OAAkB,QAAZsK,EAAEqS,EAAI3c,cAAM,IAAAsK,EAAAA,EAAI,EACtB4T,OAAmB,QAAX1O,EAACmN,EAAIuB,cAAM,IAAA1O,EAAAA,EAAA,GACnB2O,YAA4B,QAAjB9B,EAAEM,EAAIwB,mBAAW,IAAA9B,EAAAA,EAAI,MAPY,EAUhD,CAEQ,sBAAAsB,CAAuBhB,EAAoBa,EAAmBP,WACpE,GAAIA,EAIF,YAHejZ,IAAX2Y,EAAI5H,IACN/Y,KAAK4f,cAAce,EAAI5H,GAAI,6BAAuC,QAAX5M,EAAEwU,EAAId,aAAK,IAAA1T,EAAAA,EAAI,IAEjE,EAGTnM,KAAKyhB,gBAAgBd,EAAKa,EAAOP,GAEjC,MAAMlI,EAAW,QAATxL,EAAGoT,EAAI5H,UAAE,IAAAxL,EAAAA,EAAIvN,KAAKqe,cAAc+D,YAClCP,EAAQ7hB,KAAKqe,cAAcyD,SAAS/I,GAC1C,GAAI8I,EAAO,CACT,MAAMtiB,EAASS,KAAK+hB,cAAcF,EAAOlB,GACzC,YAAe3Y,IAAX2Y,EAAI5H,GACCxZ,EAAO8B,KAAKmK,UAEjB,OADAxL,KAAK4f,cAAc7G,EAAIvN,EAAU,KAAO,gCAA0C,QAAXW,EAAEwU,EAAId,aAAK,IAAA1T,EAAAA,EAAI,IAC/E,IAGJ5M,EAAO8B,KAAK,KAAM,EAC3B,CACA,OAAO,CACT,CAEQ,YAAAugB,CAAajB,EAAoBa,EAAmBP,mBAC1D,MAAMlI,EAAW,QAAT5M,EAAGwU,EAAI5H,UAAE,IAAA5M,EAAAA,EAAI,EACf0T,EAAiB,QAAZtS,EAAGoT,EAAId,aAAK,IAAAtS,EAAAA,EAAI,EAM3B,GAAqB,OADgB,QAAnBrB,EAAGyU,EAAIe,oBAAY,IAAAxV,EAAAA,EAAI,KAGvC,OADAlM,KAAK4f,cAAc7G,EAAI,yCAA0C8G,IAC1D,EAIT,GAAIoB,EAEF,OADAjhB,KAAK4f,cAAc7G,EAAI,6BAA8B8G,IAC9C,EAIT,GAAqB,IAAjB2B,EAAMzjB,OAER,OADAiC,KAAK4f,cAAc7G,EAAI,KAAM8G,IACtB,EAGT,MAAMqC,EAAmB,QAAb5T,EAAGqS,EAAIuB,cAAM,IAAA5T,EAAAA,EAAA,GAEzB,GAAU,MAAN4T,EACFliB,KAAK4f,cAAc7G,EAAI,KAAM8G,OACxB,CACL,MAAM3f,EAAiB,QAAZsT,EAAGmN,EAAIzgB,aAAK,IAAAsT,EAAAA,EAAI,EACrBxP,EAAmB,QAAbqc,EAAGM,EAAI3c,cAAM,IAAAqc,EAAAA,EAAI,EAE7B,IAAKngB,IAAU8D,EAEb,OADAhE,KAAK4f,cAAc7G,EAAI,sDAAuD8G,IACvE,EAGT,MACMwC,EAAgBniB,EAAQ8D,GADF,KAANke,EAA6B,EAA2C,GAG9F,GAAIV,EAAMzjB,OAASskB,EAEjB,OADAriB,KAAK4f,cAAc7G,EAAI,iCAAkC8G,IAClD,EAGT7f,KAAK4f,cAAc7G,EAAI,KAAM8G,EAC/B,CACA,OAAO,CACT,CAEQ,aAAAiB,CAAcH,SAOpB,OALmC,QAArBxU,EAAGwU,EAAI2B,sBAAc,IAAAnW,EAAAA,EAAI,KAMrC,IAAK,IACL,IAAK,IACHnM,KAAKkf,qBACLlf,KAAKqe,cAAckE,YACnB,MACF,IAAK,IACL,IAAK,IAKH,QAAeva,IAAX2Y,EAAI5H,GAAkB,CACxB,MAAMsG,EAAUrf,KAAK8e,sBAAsB1N,IAAIuP,EAAI5H,IAC/CsG,GACFA,EAAQC,QAAQrb,UAElBjE,KAAKmf,oBAAoBwB,EAAI5H,IAC7B/Y,KAAKqe,cAAcmE,WAAW7B,EAAI5H,GACpC,EAMJ,OAAO,CACT,CAEQ,aAAA6G,CAAc7G,EAAYV,EAAiBwH,EAAemC,GAChE,MAAMS,EAAmB,OAAZpK,EACb,GAAIoK,GAAQ5C,GAAS,EAAG,OACxB,IAAK4C,GAAQ5C,GAAS,EAAG,OAEzB,MACM6C,EAAW,QAAW3J,IADdiJ,EAAc,MAAMA,IAAgB,MACR3J,OAC1CrY,KAAKoK,cAAcgC,MAAMuW,YAAYC,iBAAiBF,EACxD,CAIQ,aAAAX,CAAcF,EAAwBlB,GAC5C,OAAO3gB,KAAK6iB,kBAAkBhB,EAAOlB,GAClCtf,KAAK,KAAM,GACX6M,MAAM,KAAM,EACjB,CAEQ,uBAAM2U,CAAkBhB,EAAwBlB,qBACtD,MAAM/S,EAAa5N,KAAKqK,YACxB,IAAIwM,QAAwC7W,KAAK8iB,cAAcjB,GAE/D,IACE,GAAIjU,IAAe5N,KAAKqK,YAAa,MAAM,IAAIjI,MAAM,yBACrD,MAAM2gB,EAAQhnB,KAAKC,IAAI,EAAQ,QAAPkQ,EAAEyU,EAAIlK,SAAC,IAAAvK,EAAAA,EAAI,GAC7B8W,EAAQjnB,KAAKC,IAAI,EAAQ,QAAPsS,EAAEqS,EAAIrN,SAAC,IAAAhF,EAAAA,EAAI,GAC7B2U,EAAQtC,EAAIzM,aAAgB2C,EAAO3W,MAAQ6iB,EAC3CG,EAAQvC,EAAIxM,cAAiB0C,EAAO7S,OAASgf,EAE7CG,EAAWpnB,KAAKC,IAAI,EAAG6a,EAAO3W,MAAQ6iB,GACtCK,EAAWrnB,KAAKC,IAAI,EAAG6a,EAAO7S,OAASgf,GACvCK,EAAatnB,KAAKC,IAAI,EAAGD,KAAKE,IAAIgnB,EAAOE,IACzCG,EAAavnB,KAAKC,IAAI,EAAGD,KAAKE,IAAIinB,EAAOE,IAE/C,GAAmB,IAAfC,GAAmC,IAAfC,EACtB,MAAM,IAAIlhB,MAAM,4BAGlB,GAAc,IAAV2gB,GAAyB,IAAVC,GAAeK,IAAexM,EAAO3W,OAASojB,IAAezM,EAAO7S,OAAQ,CAC7F,MAAMuf,QAAgB1V,kBAAkBgJ,EAAQkM,EAAOC,EAAOK,EAAYC,GAC1EzM,EAAO5I,QACP4I,EAAS0M,CACX,CAEA,MAAMpV,GAA8B,QAAzBhC,EAAAnM,KAAKkK,UAAU0B,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIuC,KAAKlO,QAASoJ,EAAAqC,kBAAkBzL,MACpEmO,GAA8B,QAAzBd,EAAAvN,KAAKkK,UAAU0B,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIuC,KAAKpK,SAAUsF,EAAAqC,kBAAkB3H,OAI3E,IAAIwf,EACAC,OACgBzb,IAAhB2Y,EAAI+C,cAAsC1b,IAAb2Y,EAAI3U,MACnCwX,EAAU7C,EAAI+C,QACdD,EAAU9C,EAAI3U,WACWhE,IAAhB2Y,EAAI+C,SACbF,EAAU7C,EAAI+C,QACdD,EAAU1nB,KAAKC,IAAI,EAAGD,KAAKuI,KAAMuS,EAAO7S,OAAS6S,EAAO3W,OAAUsjB,EAAUrV,GAAME,UAC5DrG,IAAb2Y,EAAI3U,MACbyX,EAAU9C,EAAI3U,KACdwX,EAAUznB,KAAKC,IAAI,EAAGD,KAAKuI,KAAMuS,EAAO3W,MAAQ2W,EAAO7S,QAAWyf,EAAUpV,GAAMF,MAElFqV,EAAUznB,KAAKuI,KAAKuS,EAAO3W,MAAQiO,GACnCsV,EAAU1nB,KAAKuI,KAAKuS,EAAO7S,OAASqK,IAGtC,IAAI3C,EAAImL,EAAO3W,MACX9B,EAAIyY,EAAO7S,OAQf,QALoBgE,IAAhB2Y,EAAI+C,cAAsC1b,IAAb2Y,EAAI3U,OACnCN,EAAI3P,KAAKQ,MAAMinB,EAAUrV,GACzB/P,EAAIrC,KAAKQ,MAAMknB,EAAUpV,IAGvB3C,EAAItN,EAAI4B,KAAKkC,MAAM8K,WACrB,MAAM,IAAI5K,MAAM,6BAIlB,MAAM9E,EAAS0C,KAAKoK,cAAcgC,MAAM9O,OAClCqmB,EAASrmB,EAAOmZ,EAChBmN,EAAStmB,EAAOgW,EAChBuQ,EAAavmB,EAAO2c,MAOpBvJ,OAD6B1I,IAAf2Y,EAAIhQ,QAAwBgQ,EAAIhQ,OAAS,EACrB,SAAW,MAEnD,GAAIjF,IAAMmL,EAAO3W,OAAS9B,IAAMyY,EAAO7S,OAAQ,CAC7C,MAAM8f,QAAejW,kBAAkBgJ,EAAQ,CAAE/I,YAAapC,EAAGqC,aAAc3P,IAC/EyY,EAAO5I,QACP4I,EAASiN,CACX,CAGA,MAAMC,EAAUhoB,KAAKE,IAAIF,KAAKC,IAAI,EAAc,QAAbwX,EAAEmN,EAAIoD,eAAO,IAAAvQ,EAAAA,EAAI,GAAIrF,EAAK,GACvD6V,EAAUjoB,KAAKE,IAAIF,KAAKC,IAAI,EAAc,QAAbqkB,EAAEM,EAAIqD,eAAO,IAAA3D,EAAAA,EAAI,GAAIhS,EAAK,GAC7D,GAAgB,IAAZ0V,GAA6B,IAAZC,EAAe,CAKlC,MAAMC,OAA2Bjc,IAAhB2Y,EAAI+C,QAAyB3nB,KAAKQ,MAAMinB,EAAUrV,GAAM0I,EAAO3W,MAAQ6jB,EAClFG,OAAwBlc,IAAb2Y,EAAI3U,KAAsBjQ,KAAKQ,MAAMknB,EAAUpV,GAAMwI,EAAO7S,OAASggB,EAChFG,EAAe9a,EAAAgE,cAAcC,aAAawJ,OAAOxF,SAAU2S,EAASC,GACpEE,EAAYD,EAAa3W,WAAW,MAC1C,IAAK4W,EACH,MAAM,IAAIhiB,MAAM,0CAElBgiB,EAAUzP,UAAUkC,EAAQkN,EAASC,GAErC,MAAMK,QAAqBxW,kBAAkBsW,GAM7C,GALAA,EAAajkB,MAAQikB,EAAangB,OAAS,EAC3C6S,EAAO5I,QACP4I,EAASwN,EACT3Y,EAAImL,EAAO3W,MACX9B,EAAIyY,EAAO7S,OACP0H,EAAItN,EAAI4B,KAAKkC,MAAM8K,WACrB,MAAM,IAAI5K,MAAM,kCAEE4F,IAAhB2Y,EAAI+C,UACNF,EAAUznB,KAAKuI,KAAKuS,EAAO3W,MAAQiO,SAEpBnG,IAAb2Y,EAAI3U,OACNyX,EAAU1nB,KAAKuI,KAAKuS,EAAO7S,OAASqK,GAExC,CAEA,GAAIT,IAAe5N,KAAKqK,YAAa,MAAM,IAAIjI,MAAM,yBACrD,MAAMuO,EAAmB,QAAb4P,EAAGI,EAAIhQ,cAAM,IAAA4P,EAAAA,EAAI,EAO7B,GANAvgB,KAAKqe,cAAc3Q,SAASmU,EAAM9I,GAAIlC,GAAQ,EAAMnG,EAAOC,GAC3DkG,OAAS7O,EAKkB,IAAvB2Y,EAAI2D,eAAsB,CAE5B,MAAMC,EAAWjnB,EAAO2c,MAAQ4J,EAChCvmB,EAAOmZ,EAAIkN,EAEXrmB,EAAOgW,EAAIvX,KAAKC,IAAI4nB,EAASW,EAAU,EACzC,MAGEjnB,EAAOmZ,EAAI1a,KAAKE,IAAI0nB,EAASH,EAASxjB,KAAKoK,cAAc2B,KAE7D,CAAE,MAAOjE,GAEP,MADA+O,SAAAA,EAAQ5I,QACFnG,CACR,CACF,CAGQ,mBAAMgb,CAAcjB,GAC1B,IAAIL,EAAoB,IAAIpkB,iBAAiBykB,EAAMzc,KAAKof,eAMxD,GAJqB,MAAjB3C,EAAMM,cACRX,QAAcxhB,KAAKykB,gBAAgBjD,IAGrB,MAAZK,EAAMK,OAA4B,CACpC,MAAMtV,GAAU,EAAAjD,EAAAmD,WAAU0U,GAG1B,GAAqB,cAAjB5U,EAAQG,QAA0BH,EAAQ1M,MAAQ,MAAQ0M,EAAQ5I,OAAS,IAAM4I,EAAQ1M,MAAQ0M,EAAQ5I,OAAShE,KAAKkC,MAAM8K,WAC/H,MAAM,IAAIyL,WAAW,qDAEvB,MAAM9L,EAAO,IAAIgB,KAAK,CAAC6T,GAAoB,CAAE3X,KAAM,cACnD,IAAKiN,OAAOjJ,kBAAmB,CAC7B,MAAM6W,EAAMC,IAAIC,gBAAgBjY,GAC1BkE,EAAM,IAAIgU,MAChB,OAAO,IAAIlT,QAAqB,CAACC,EAASkT,KACxCjU,EAAIkU,iBAAiB,OAAQ,WAC3BJ,IAAIK,gBAAgBN,GACpB,MAAM5Y,EAASzC,EAAAgE,cAAcC,aAAawJ,OAAOxF,SAAUT,EAAI3Q,MAAO2Q,EAAI7M,QACnD,QAAvBmI,EAAAL,EAAO0B,WAAW,aAAK,IAAArB,GAAAA,EAAEwI,UAAU9D,EAAK,EAAG,GAC3ChD,kBAAkB/B,GAAQzK,KAAKuQ,GAAS1D,MAAM4W,KAEhDjU,EAAIkU,iBAAiB,QAAS,KAC5BJ,IAAIK,gBAAgBN,GACpBI,EAAO,IAAI1iB,MAAM,2BAEnByO,EAAIoU,IAAMP,GAEd,CACA,OAAO7W,kBAAkBlB,EAC3B,CAGA,MAAMzM,EAAQ2hB,EAAM3hB,MACd8D,EAAS6d,EAAM7d,OAErB,IAAK9D,IAAU8D,EACb,MAAM,IAAI5B,MAAM,gDAGlB,MACMigB,EAAgBniB,EAAQ8D,GADI,KAAZ6d,EAAMK,OAA6B,EAA2C,GAGpG,GAAIV,EAAMzjB,OAASskB,EACjB,MAAM,IAAIjgB,MAAM,2BAGlB,MAAM8iB,EAAahlB,EAAQ8D,EAE3B,GAAgB,KAAZ6d,EAAMK,OAER,OAAOrU,kBAAkB,IAAIV,UAAU,IAAIjH,kBAAkBsb,EAAMlkB,OAAuBkkB,EAAMpU,WAAsB,EAAV8X,GAAwDhlB,EAAO8D,IAM7K,MAAMoB,EAAO,IAAIc,kBAA4B,EAAVgf,GAC7BC,EAAQ,IAAI9nB,YAAYmkB,EAAMlkB,OAAQkkB,EAAMpU,WAAYrR,KAAKmR,MAAMsU,EAAM3c,WAAa,IACtFugB,EAAQ,IAAI/nB,YAAY+H,EAAK9H,QAC7B+nB,GAA6B,EAAbH,EAEtB,IAAII,EAAY,EACZC,EAAY,EAChB,IAAK,IAAIznB,EAAI,EAAGA,EAAIunB,EAAevnB,GAAK,EAAG,CACzC,MAAM0nB,EAAKL,EAAMG,KACXG,EAAKN,EAAMG,KACXI,EAAKP,EAAMG,KAEjBF,EAAMG,KAAe,WAAaC,EAClCJ,EAAMG,KAAe,WAAcC,IAAO,GAAOC,GAAM,EACvDL,EAAMG,KAAe,WAAcE,IAAO,GAAOC,GAAM,GACvDN,EAAMG,KAAe,WAAcG,IAAO,CAC5C,CAGA,IAAIC,EAAuB,EAAbN,EACVO,EAAuB,EAAbP,EACd,IAAK,IAAIvnB,EAAIunB,EAAevnB,EAAIonB,EAAYpnB,IAC1CsH,EAAKwgB,GAAepE,EAAMmE,GAC1BvgB,EAAKwgB,EAAU,GAAKpE,EAAMmE,EAAU,GACpCvgB,EAAKwgB,EAAU,GAAKpE,EAAMmE,EAAU,GACpCvgB,EAAKwgB,EAAU,GAAE,IACjBD,GAAO,EACPC,GAAO,EAGT,OAAO/X,kBAAkB,IAAIV,UAAU/H,EAAMlF,EAAO8D,GACtD,CAEQ,qBAAMygB,CAAgBoB,GAC5B,IACE,aAAa7lB,KAAK8lB,YAAYD,EAAY,UAC5C,CAAE,MAAOzN,GACP,GAAIA,aAAiBK,WAAY,MAAML,EACvC,aAAapY,KAAK8lB,YAAYD,EAAY,cAC5C,CACF,CAEQ,iBAAMC,CAAYD,EAAwB3D,GAChD,MAAMhR,EAAQnV,KAAKE,IAAI+D,KAAKkC,MAAM8c,eAAwC,EAAxBhf,KAAKkC,MAAM8K,WAA0C,IAA1BhN,KAAKkC,MAAMiW,cACxF,IAAI4N,EAAW,EAEf,MAWMC,EAXS,IAAIC,eAA6B,CAC9C,IAAAC,CAAKC,GACH,GAAIJ,GAAYF,EAAW9nB,OAEzB,YADAooB,EAAWlY,QAGb,MAAM3I,EAAMvJ,KAAKE,IAAI8pB,EAAW,KAAMF,EAAW9nB,QACjDooB,EAAWC,QAAQ,IAAIhpB,WAAWyoB,EAAWphB,SAASshB,EAAUzgB,KAChEygB,EAAWzgB,CACb,IAEoB+gB,YAAY,IAAIC,oBAAoBpE,IAASqE,YAC7DC,EAAuB,GAC7B,IAAIC,EAAc,EAClB,IACE,OAAa,CACX,MAAMC,KAAEA,EAAI5qB,MAAEA,SAAgBkqB,EAAOW,OACrC,GAAID,EAAM,MAEV,GADAD,GAAe3qB,EAAM+I,WACjB4hB,EAAcvV,EAEhB,YADM8U,EAAOY,SAAS1Y,MAAM,QACtB,IAAIuK,WAAW,yCAEvB+N,EAAO9nB,KAAK5C,EACd,CACF,SACEkqB,EAAOa,aACT,CAEA,MAAMtnB,EAAS,IAAInC,WAAWqpB,GAC9B,IAAItiB,EAAS,EACb,IAAK,MAAM2iB,KAASN,EAClBjnB,EAAO2D,IAAI4jB,EAAO3iB,GAClBA,GAAU2iB,EAAM/oB,OAElB,OAAOwB,CACT,CAEA,UAAWwnB,GACT,OAAO/mB,KAAKqe,cAAc0I,MAC5B,CAEA,uBAAWC,GACT,OAAOhnB,KAAKqe,cAAc4I,kBAC5B,CAEA,wBAAWC,GACT,OAAOlnB,KAAK8e,qBACd,kFCptBF,SAAkC1Z,GAChC,MAAMub,EAAqB,GACrBwG,EAAQ/hB,EAAKgiB,MAAM,KAEzB,IAAK,MAAMC,KAAQF,EAAO,CACxB,MAAMG,EAAQD,EAAKngB,QAAQ,KAC3B,IAAe,IAAXogB,EAAc,SAElB,MAAM/R,EAAM8R,EAAKE,UAAU,EAAGD,GACxBxrB,EAAQurB,EAAKE,UAAUD,EAAQ,GAGrC,GAAO,MAAH/R,EAAyB,CAC3BoL,EAAIb,OAAShkB,EACb,QACF,CACA,GAAO,MAAHyZ,EAA8B,CAChCoL,EAAIwB,YAAcrmB,EAClB,QACF,CACA,GAAO,MAAHyZ,EAA+B,CACjCoL,EAAIe,aAAe5lB,EACnB,QACF,CACA,GAAO,MAAHyZ,EAAkC,CACpCoL,EAAI2B,eAAiBxmB,EACrB,QACF,CACA,MAAM0rB,EAAWxY,SAASlT,EAAO,IACjC,OAAQyZ,GACN,QAAsBoL,EAAIuB,OAASsF,EAAU,MAC7C,QAAkB7G,EAAI5H,GAAKyO,EAAU,MACrC,QAA4B7G,EAAIhB,YAAc6H,EAAU,MACxD,QAAqB7G,EAAIzgB,MAAQsnB,EAAU,MAC3C,QAAsB7G,EAAI3c,OAASwjB,EAAU,MAC7C,QAAwB7G,EAAIlK,EAAI+Q,EAAU,MAC1C,QAAwB7G,EAAIrN,EAAIkU,EAAU,MAC1C,QAA4B7G,EAAIzM,YAAcsT,EAAU,MACxD,QAA6B7G,EAAIxM,aAAeqT,EAAU,MAC1D,QAAkC7G,EAAIoD,QAAUyD,EAAU,MAC1D,QAAkC7G,EAAIqD,QAAUwD,EAAU,MAC1D,QAAuB7G,EAAI+C,QAAU8D,EAAU,MAC/C,QAAoB7G,EAAI3U,KAAOwb,EAAU,MACzC,QAAoB7G,EAAIK,KAAOwG,EAAU,MACzC,QAAqB7G,EAAId,MAAQ2H,EAAU,MAC3C,QAA+B7G,EAAI2D,eAAiBkD,EAAU,MAC9D,QAAuB7G,EAAIhQ,OAAS6W,EAAU,MAC9C,QAA4B7G,EAAIqB,YAAcwF,EAElD,CAEA,OAAO7G,CACT,wFCjLA,MAAA8G,EA6BE,WAAA1nB,CACmBoK,GAAAnK,KAAAmK,SAAAA,EA3BXnK,KAAA0nB,aAAe,EACN1nB,KAAA4X,QAAwC,IAAI7F,IAU5C/R,KAAAgnB,oBAA2C,IAAIjV,IAC/C/R,KAAA2nB,oBAA2C,IAAI5V,IAI/C/R,KAAA4nB,2BAA8BC,IAC7C,MAAMC,EAAU9nB,KAAK2nB,oBAAoBvW,IAAIyW,QAC7B7f,IAAZ8f,IACF9nB,KAAKgnB,oBAAoB9Q,OAAO4R,GAChC9nB,KAAK2nB,oBAAoBzR,OAAO2R,GAChC7nB,KAAK4X,QAAQ1B,OAAO4R,KAGhB9nB,KAAAwQ,cAA+B,CAAEC,WAAW,EAAMC,MAAO,MAAOC,OAAQ,EAAGC,UAAW,OAK5F5Q,KAAK+nB,wBAA0B/nB,KAAKmK,SAAS8O,eAC7CjZ,KAAKgoB,uBAA0BH,UACD,QAA5B1b,EAAAnM,KAAK+nB,+BAAuB,IAAA5b,GAAAA,EAAA3E,KAA5BxH,KAA+B6nB,GAC/B7nB,KAAK4nB,2BAA2BC,IAElC7nB,KAAKmK,SAAS8O,eAAiBjZ,KAAKgoB,sBACtC,CAEO,KAAA9c,GACLlL,KAAK0nB,aAAe,EACpB1nB,KAAK4X,QAAQ9O,QACb9I,KAAKgnB,oBAAoBle,QACzB9I,KAAK2nB,oBAAoB7e,OAC3B,CAEO,OAAAnB,GACL3H,KAAKkL,QACDlL,KAAKmK,SAAS8O,iBAAmBjZ,KAAKgoB,yBACxChoB,KAAKmK,SAAS8O,eAAiBjZ,KAAK+nB,wBAExC,CAEO,UAAA9F,CAAWlJ,EAAwBkP,GACxC,MAAMzQ,EAAUuB,QAAAA,EAAM/Y,KAAK0nB,eAErBQ,EAAeloB,KAAKgnB,oBAAoB5V,IAAIoG,QAC7BxP,IAAjBkgB,IACFloB,KAAKmK,SAASmP,YAAY4O,GAC1BloB,KAAKgnB,oBAAoB9Q,OAAOsB,GAChCxX,KAAK2nB,oBAAoBzR,OAAOgS,KAG7BloB,KAAK4X,QAAQlC,IAAI8B,IAAYxX,KAAK4X,QAAQ7N,MAAQ0d,EAAkBU,kBACvEnoB,KAAKooB,0BASP,MAAMC,EAAuC,IAA3BroB,KAAKmK,SAASmO,WAChCtY,KAAK4X,QAAQ1B,OAAOsB,GACpB,IAAI8Q,EAAgB,EACpB,IAAK,MAAMzG,KAAS7hB,KAAK4X,QAAQ9C,SAAUwT,GAAiBzG,EAAMzc,KAAK2E,KACvE,IAAK,MAAMwe,IAAe,EAAC,GAAO,GAChC,IAAK,MAAOC,EAAU3G,KAAU7hB,KAAK4X,QAAS,CAC5C,GAAI0Q,EAAgBL,EAAU7iB,KAAK2E,MAAQse,EAAW,MAClDroB,KAAKgnB,oBAAoBtR,IAAI8S,KAAcD,IAC/CD,GAAiBzG,EAAMzc,KAAK2E,KAC5B/J,KAAKwiB,WAAWgG,GAClB,CAOF,OAJAxoB,KAAK4X,QAAQ1U,IAAIsU,EAAOhb,OAAA2F,OAAA3F,OAAA2F,OAAA,GACnB8lB,GAAS,CACZlP,GAAIvB,KAECA,CACT,CAEO,QAAA9J,CAASoa,EAAiBjG,EAAwCpR,EAAoBC,EAAmBC,GAK9G,MAAMuX,EAAeloB,KAAKgnB,oBAAoB5V,IAAI0W,QAC7B9f,IAAjBkgB,GACFloB,KAAK2nB,oBAAoBzR,OAAOgS,GAElCloB,KAAKwQ,cAAcC,UAAYA,EAC/BzQ,KAAKwQ,cAAcE,MAAQA,EAC3B1Q,KAAKwQ,cAAcG,OAASA,EAC5B,MAAMkX,EAAY7nB,KAAKmK,SAASuD,SAASmU,EAAO7hB,KAAKwQ,eACrDxQ,KAAKgnB,oBAAoB9jB,IAAI4kB,EAASD,GACtC7nB,KAAK2nB,oBAAoBzkB,IAAI2kB,EAAWC,EAC1C,CAEO,QAAAhG,CAASgG,GACd,OAAO9nB,KAAK4X,QAAQxG,IAAI0W,EAC1B,CAEO,UAAAtF,CAAWsF,GAChB9nB,KAAK4X,QAAQ1B,OAAO4R,GACpB,MAAMD,EAAY7nB,KAAKgnB,oBAAoB5V,IAAI0W,QAC7B9f,IAAd6f,IACF7nB,KAAKmK,SAASmP,YAAYuO,GAC1B7nB,KAAKgnB,oBAAoB9Q,OAAO4R,GAChC9nB,KAAK2nB,oBAAoBzR,OAAO2R,GAEpC,CAEO,SAAAtF,GACLviB,KAAK4X,QAAQ9O,QACb,IAAK,MAAM+e,KAAa7nB,KAAKgnB,oBAAoBlS,SAC/C9U,KAAKmK,SAASmP,YAAYuO,GAE5B7nB,KAAKgnB,oBAAoBle,QACzB9I,KAAK2nB,oBAAoB7e,OAC3B,CAEA,UAAWie,GACT,OAAO/mB,KAAK4X,OACd,CAEA,sBAAWqP,GACT,OAAOjnB,KAAKgnB,mBACd,CAEA,eAAW5E,GACT,OAAOpiB,KAAK0nB,aAAe,CAC7B,CAEQ,uBAAAU,GACN,IAAK,MAAON,KAAY9nB,KAAK4X,QAAS,CACpC,GAAI5X,KAAK4X,QAAQ7N,MAAQ0d,EAAkBU,iBAAmB,EAC5D,MAEGnoB,KAAKgnB,oBAAoBtR,IAAIoS,IAChC9nB,KAAK4X,QAAQ1B,OAAO4R,EAExB,CACF,wBA1JwBL,EAAAU,iBAAmB,gBCjB7C3rB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAK/C,MAIA2sB,GAAA,EAJyBzpB,EAAQ,KAIjC0pB,QAAA,CAAgGpqB,EAAA,EAAA+e,EAAA,EAAAlf,EAAA,6lCAuJhGwqB,EAAA,IAAAvrB,WAAA,mEACAgqB,MAAA,IACArf,IAAA6gB,GAAAA,EAAAppB,WAAA,KAEAqpB,EAAA,IAAAxrB,YAAA,MACAwrB,EAAAljB,KAAA,YACA,QAAA7H,EAAA,EAAgBA,EAAA6qB,EAAA5qB,SAAgBD,EAChC+qB,EAAAF,EAAA7qB,IAAAA,GAAA,EACA,QAAAA,EAAA,EAAgBA,EAAA6qB,EAAA5qB,SAAgBD,EAChC+qB,EAAA,IAAAF,EAAA7qB,IAAAA,GAAA,GAAAA,GAAA,UACA,QAAAA,EAAA,EAAgBA,EAAA6qB,EAAA5qB,SAAgBD,EAChC+qB,EAAA,IAAAF,EAAA7qB,IAAAA,GAAA,MAAAA,GAAA,WACA,QAAAA,EAAA,EAAgBA,EAAA6qB,EAAA5qB,SAAgBD,EAChC+qB,EAAA,IAAAF,EAAA7qB,IAAAA,GAAA,GACA,MAAAgrB,EAAA,IAAA1rB,WAAA,GAkKAvC,EAAA,QAvJA,MAMA,WAAAkF,CAAAgpB,EAAAC,EAAAle,GAOA,GANA9K,KAAAipB,MAAA,KACAjpB,KAAAkpB,QAAA,EACAlpB,KAAAmpB,OAAA,EACAnpB,KAAA+oB,SAAAA,QAAAA,EAAA,QACA/oB,KAAAgpB,SAAAA,QAAAA,EAAA,WACAhpB,KAAAmpB,OAAAre,QAAAA,EAAA,MACA9K,KAAAmpB,OAAAnpB,KAAAgpB,UAAAhpB,KAAAgpB,SAAA,WACA,UAAA5mB,MAAA,wBAEA,CAKA,SAAA6D,GACA,OAAAjG,KAAAipB,MAAAjpB,KAAAsO,GAAA7J,SAAA,EAAAzE,KAAAopB,KAAA,OAAAN,CACA,CAMA,OAAA7kB,GACAjE,KAAAipB,QAEAjpB,KAAAmpB,OAAAnpB,KAAA+oB,SACA/oB,KAAAipB,MAAAjpB,KAAAopB,KAAAppB,KAAAsO,GAAAtO,KAAAqpB,KAAA,MAGArpB,KAAAopB,KAAA,QACAppB,KAAAopB,KAAA,QACAppB,KAAAopB,KAAA,SAEA,CASA,IAAA/lB,CAAA2lB,EAAAle,GAGA,GAFA9K,KAAAgpB,SAAAA,QAAAA,EAAAhpB,KAAAgpB,SACAhpB,KAAAmpB,OAAAre,QAAAA,EAAA/O,KAAAE,IAAA+D,KAAAmpB,OAAAnpB,KAAAgpB,UACAhpB,KAAAmpB,OAAAnpB,KAAAgpB,UAAAhpB,KAAAgpB,SAAA,WACA,MAAA5mB,MAAA,yBAEA,IAAAknB,EAAAtpB,KAAAopB,KACA,MAAA5H,EAAAxhB,KAAAmpB,OAAA,KACAnpB,KAAAipB,MAOAjpB,KAAAqpB,KAAA/rB,OAAAuH,WAAA2c,IACAxhB,KAAAqpB,KAAAE,KAAAxtB,KAAAuI,MAAAkd,EAAAxhB,KAAAqpB,KAAA/rB,OAAAuH,YAAA,QACAykB,EAAA,IAAAjsB,YAAA2C,KAAAqpB,KAAA/rB,OAAA,GACA0C,KAAAsO,GAAA,IAAAlR,WAAA4C,KAAAqpB,KAAA/rB,OAAA,QATA0C,KAAAqpB,KAAA,IAAAloB,YAAAqoB,OAAA,CAAiDjhB,QAAAxM,KAAAuI,KAAAkd,EAAA,SACjDxhB,KAAAipB,MAAAR,EAAA,CAAsCxnB,IAAA,CAAO0B,OAAA3C,KAAAqpB,QAC7CC,EAAA,IAAAjsB,YAAA2C,KAAAqpB,KAAA/rB,OAAA,GACAgsB,EAAApmB,IAAA2lB,EAAA,KACA7oB,KAAAsO,GAAA,IAAAlR,WAAA4C,KAAAqpB,KAAA/rB,OAAA,OAOAgsB,EAAA,QACAA,EAAA,QACAA,EAAA,QACAtpB,KAAAopB,KAAAE,EACAtpB,KAAAkpB,QAAA,CACA,CAOA,QAAAhlB,CAAAulB,GACA,MAAAC,EAAA1pB,KAAAopB,KAAA,MAAAK,EACA,GAAAzpB,KAAAmpB,OAAAO,EAAA,CACA,GAAAA,EAAA1pB,KAAAgpB,SACA,SAEA,IAAAW,EAAA3pB,KAAAmpB,OACA,MAAAQ,GAAA,GAAAD,IAEA,GADAC,EAAA5tB,KAAAE,IAAA0tB,EAAA3pB,KAAAgpB,UACAW,EAAAD,EACA,SAEA,GAAAC,EAAA,KAAA3pB,KAAAqpB,KAAA/rB,OAAAuH,WAAA,CACA,MAAA+kB,EAAA7tB,KAAAuI,MAAAqlB,EAAA,KAAA3pB,KAAAqpB,KAAA/rB,OAAAuH,YAAA,OACA7E,KAAAqpB,KAAAE,KAAAK,GACA5pB,KAAAopB,KAAA,IAAA/rB,YAAA2C,KAAAqpB,KAAA/rB,OAAA,GACA0C,KAAAsO,GAAA,IAAAlR,WAAA4C,KAAAqpB,KAAA/rB,OAAA,KACA,CACA0C,KAAAmpB,OAAAQ,CACA,CACA,QACA,CAOA,GAAAxe,CAAA/F,GACA,IAAApF,KAAAipB,OAAAjpB,KAAAkpB,OACA,SAEA,GAAAlpB,KAAAkE,SAAAkB,EAAArH,QACA,SAEA,MAAAurB,EAAAtpB,KAAAopB,KAIA,OAHAppB,KAAAsO,GAAApL,IAAAkC,EAAAkkB,EAAA,OACAA,EAAA,OAAAlkB,EAAArH,OAEAurB,EAAA,MAAAA,EAAA,cACAtpB,KAAAipB,MAAApuB,QAAAsL,MACA,CACA,CAKA,GAAAb,GAEA,OADAtF,KAAAkpB,QAAA,EACAlpB,KAAAipB,MACAjpB,KAAAipB,MAAApuB,QAAAyK,OACA,CACA,CAIA,eAAAukB,GACA,OAAA7pB,KAAAipB,MACAjpB,KAAAopB,KAAA,MACA,CACA,CAIA,aAAAU,GACA,OAAA9pB,KAAAipB,MACAjpB,KAAAgpB,SAAAhpB,KAAAopB,KAAA,MACA,CACA,cC9UA5sB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAK/C,MACAiuB,GAAA,EADyB/qB,EAAQ,KACjC0pB,QAAA,CAAuGpqB,EAAA,EAAA+e,EAAA,EAAAlf,EAAA,i5BA8DvGtD,EAAA,QA7DA,MACA,WAAAkF,CAAAgpB,GACA/oB,KAAA+oB,SAAAA,EACA/oB,KAAAE,MAAA,EACAF,KAAAgE,OAAA,CACA,CACA,MAAApF,CAAAT,GACA6B,KAAAE,MAAA/B,EAAA,OAAAA,EAAA,OAAAA,EAAA,MAAAA,EAAA,GACA6B,KAAAgE,OAAA7F,EAAA,OAAAA,EAAA,OAAAA,EAAA,OAAAA,EAAA,IACA,MAAA4F,EAAA/D,KAAAE,MAAAF,KAAAgE,OACAgmB,EAAA,EAAAjmB,EACAkmB,EAAA9rB,EAAAJ,OAwBAyjB,EAAAzlB,KAAAC,IAAAguB,EAAAC,IAAAluB,KAAAE,IAAA+tB,EAAAC,IAAA,QACAjqB,KAAAipB,MAIAjpB,KAAAqpB,KAAA/rB,OAAAuH,WAAA2c,IACAxhB,KAAAqpB,KAAAE,KAAAxtB,KAAAuI,MAAAkd,EAAAxhB,KAAAqpB,KAAA/rB,OAAAuH,YAAA,QACA7E,KAAAsO,GAAA,OALAtO,KAAAqpB,KAAA,IAAAloB,YAAAqoB,OAAA,CAAiDjhB,QAAAxM,KAAAuI,KAAAkd,EAAA,SACjDxhB,KAAAipB,MAAAc,EAAA,CAAyC9oB,IAAA,CAAO0B,OAAA3C,KAAAqpB,SAMhDrpB,KAAAsO,KACAtO,KAAAsO,GAAA,IAAAlR,WAAA4C,KAAAqpB,KAAA/rB,SAGA,MAAA4sB,EAAAlqB,KAAAqpB,KAAA/rB,OAAAuH,WAAAolB,GAAA,IAGA,OAFAjqB,KAAAsO,GAAApL,IAAA/E,EAAA+rB,GACAlqB,KAAAipB,MAAApuB,QAAAsL,IAAA+jB,EAAAD,EAAAlmB,GACA/D,KAAAsO,GAAA7J,SAAA,UAAAulB,EACA,CACA,OAAA/lB,GACAjE,KAAAipB,OAEAjpB,KAAAqpB,KAAA/rB,OAAAuH,WAAA7E,KAAA+oB,WACA/oB,KAAAipB,MAAAjpB,KAAAsO,GAAAtO,KAAAqpB,KAAA,KAEA,aC9DA7sB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAC/CjB,EAAA6tB,OAYA,SAAAyB,GACA,GAAAA,EAAAhsB,EAAA,CACA,MAAAkf,EAAgB/e,EAAAA,EAAAH,EAAAA,GAAUgsB,EAC1B,IAAA1uB,EACA6tB,EACA,MAAAc,EAAAjpB,YACA,WAAAkc,EACA/e,EACAwJ,GAAA,IAAAsiB,EAAA5nB,SAAA8mB,IAAAA,EAAA,IAAAc,EAAA7nB,OAAA9G,IAAAA,EAAA4uB,EAAAlsB,MAAA2J,GACAA,GAAAwhB,EACAc,EAAAhpB,YAAAkoB,EAAAxhB,GACAsiB,EAAAhpB,YAAA3F,IAAAA,EAAA4uB,EAAAlsB,IAAA2J,GAAAzG,KAAA9F,IAAA+tB,EAAA/tB,EAAAT,SAAAS,EAAAgG,UAEA,IAAA8b,EACA/e,EACA,IAAAgrB,IAAAA,EAAA,IAAAc,EAAA7nB,OAAA9G,IAAAA,EAAA4uB,EAAAlsB,MACA,IAAAmrB,EACA3X,QAAAC,QAAA0X,GACAc,EAAAE,QAAA7uB,IAAAA,EAAA4uB,EAAAlsB,KAAAkD,KAAA9F,GAAA+tB,EAAA/tB,GAEA+C,EACA,IAAA7C,IAAAA,EAAA4uB,EAAAlsB,IACA,IAAAwT,QAAAC,QAAAnW,IAAAA,EAAA4uB,EAAAlsB,IACA,CACA,uBAAAosB,SACA,UAAAnoB,MAAA,qBACAmoB,SAAAjjB,IAAA6iB,EACA,EAtCA,IAAAE,EAAA/rB,IACA,GAAAlB,WAAAotB,WACA,OAAAptB,WAAAotB,WAAAlsB,GACA,uBAAAa,OACA,OAAAA,OAAAC,KAAAd,EAAA,UACA,MAAA7C,EAAA6D,KAAAhB,GACA/C,EAAA,IAAA6B,WAAA3B,EAAAsC,QACA,QAAAD,EAAA,EAAoBA,EAAAvC,EAAAwC,SAAcD,EAClCvC,EAAAuC,GAAArC,EAAA+D,WAAA1B,GACA,OAAAvC,KCfAkvB,EAAA,GAGA,SAAAzrB,EAAA0rB,GAEA,IAAAC,EAAAF,EAAAC,GACA,QAAA1iB,IAAA2iB,EACA,OAAAA,EAAA9vB,QAGA,IAAAC,EAAA2vB,EAAAC,GAAA,CAGA7vB,QAAA,IAOA,OAHA+vB,EAAAF,GAAAljB,KAAA1M,EAAAD,QAAAC,EAAAA,EAAAD,QAAAmE,GAGAlE,EAAAD,OACA,mGCfA,MAAAgwB,EAAA7rB,EAAA,KACA8rB,EAAA9rB,EAAA,KACAqK,EAAArK,EAAA,KACAsK,EAAAtK,EAAA,KACA+rB,EAAA/rB,EAAA,IACAgsB,EAAAhsB,EAAA,KACAisB,EAAAjsB,EAAA,KACAksB,EAAAlsB,EAAA,KACAmsB,EAAAnsB,EAAA,KA6CMuB,EAAsC,CAC1C6qB,mBAAmB,EACnBpe,WAAY,SACZqe,cAAc,EACdlN,gBAAgB,EAChBzB,kBAAmB,KACnBsB,eAAgB,SAChB7F,aAAc,IACdjF,iBAAiB,EACjBoY,YAAY,EACZzgB,aAAc,SACd0gB,cAAc,EACdvM,eAAgB,uBA0BlB,MAWE,WAAAjf,CAAYe,GANJd,KAAAyI,aAA8B,GAE9BzI,KAAAwrB,UAAwC,IAAIzZ,IACnC/R,KAAAyrB,cAAgB,IAAIZ,EAAAa,QACrB1rB,KAAAya,aAA6Bza,KAAKyrB,cAAchlB,MAG9DzG,KAAKkC,MAAQ1F,OAAO2F,OAAO,GAAI5B,EAAiBO,GAChDd,KAAK2rB,aAAenvB,OAAO2F,OAAO,GAAI5B,EAAiBO,EACzD,CAEO,OAAA6G,GACL,IAAK,MAAMW,KAAWtI,KAAKwrB,UAAU1W,SAAUxM,EAAQ4C,QACvD,IAAK,MAAM0gB,KAAO5rB,KAAKyI,aACrBmjB,EAAIjkB,UAEN3H,KAAKyI,aAAa1K,OAAS,EAC3BiC,KAAKwrB,UAAU1iB,QACf9I,KAAKyrB,cAAc9jB,SACrB,CAEQ,aAAAkkB,IAAiBC,GACvB,IAAK,MAAMF,KAAOE,EAChB9rB,KAAKyI,aAAa/J,KAAKktB,EAE3B,CAEO,QAAAG,CAASC,SASd,GARAhsB,KAAK6R,UAAYma,EAGjBhsB,KAAKkK,UAAY,IAAIb,EAAAgE,cAAc2e,GACnChsB,KAAKmK,SAAW,IAAIb,EAAA2iB,aAAaD,EAAUhsB,KAAKkK,UAAWlK,KAAKkC,OAChElC,KAAKmK,SAASsQ,aAAe,IAAMza,KAAKyrB,cAAclkB,OAGlDvH,KAAKkC,MAAMkpB,kBAAmB,CAChC,MAAMc,EAA0C,QAAjC/f,EAAG6f,EAASG,QAAQC,qBAAa,IAAAjgB,EAAAA,EAAI,GACpD+f,EAAUG,kBAAmB,EAC7BH,EAAUI,mBAAoB,EAC9BJ,EAAUK,iBAAkB,EAC5BP,EAASG,QAAQC,cAAgBF,CACnC,CAiCA,GA/BAlsB,KAAK6rB,cACH7rB,KAAKkK,UACLlK,KAAKmK,SAGL6hB,EAASQ,OAAOC,mBAAmB,CAAEC,OAAQ,IAAK7mB,MAAO,KAAO+W,GAAU5c,KAAK2sB,QAAQ/P,IACvFoP,EAASQ,OAAOC,mBAAmB,CAAEC,OAAQ,IAAK7mB,MAAO,KAAO+W,GAAU5c,KAAK4sB,QAAQhQ,IACvFoP,EAASQ,OAAOC,mBAAmB,CAAE5mB,MAAO,KAAO+W,GAAU5c,KAAK6sB,KAAKjQ,IACvEoP,EAASQ,OAAOC,mBAAmB,CAAEC,OAAQ,IAAK7mB,MAAO,KAAO+W,GAAU5c,KAAK8sB,yBAAyBlQ,IAGxGoP,EAASe,SAASpS,IAAQ,IAAAxO,EAAA,OAAc,QAAbA,EAAAnM,KAAKmK,gBAAQ,IAAAgC,OAAA,EAAAA,EAAEuO,OAAOC,KAQjDqR,EAASQ,OAAOC,mBAAmB,CAAEO,cAAe,IAAKnnB,MAAO,KAAO,IAAM7F,KAAKkL,SAClF8gB,EAASQ,OAAOS,mBAAmB,CAAEpnB,MAAO,KAAO,IAAM7F,KAAKkL,SAC9D8gB,EAAS5f,MAAMwN,cAAcsT,eAAe,IAAMltB,KAAKkL,SAGvD8gB,EAAS1uB,OAAO6vB,eAAe,KAAK,IAAAhhB,EAAA,OAAc,QAAbA,EAAAnM,KAAKmK,gBAAQ,IAAAgC,OAAA,EAAAA,EAAE+M,kBAGpD8S,EAASoB,SAASxgB,IAAU,IAAAT,EAAA,OAAc,QAAbA,EAAAnM,KAAKmK,gBAAQ,IAAAgC,OAAA,EAAAA,EAAEmP,eAAe1O,MAIzD5M,KAAKkC,MAAMmpB,aAAc,CAC3B,MAAMgC,EAAe,IAAInC,EAAAoC,kBAAkBttB,KAAKmK,SAAWnK,KAAKkC,MAAOlC,KAAKkK,UAAY8hB,GAClFuB,EAAe,IAAItC,EAAAuC,aAAaxtB,KAAKkC,MAAOmrB,EAAcrB,GAChEhsB,KAAKwrB,UAAUtoB,IAAI,QAASqqB,GAC5BvtB,KAAK6rB,cACHG,EAAS5f,MAAMwN,cAAc6T,QAAQC,mBAAmB,CAAE7nB,MAAO,KAAO0nB,GAE5E,CAGA,GAAIvtB,KAAKkC,MAAMopB,WAAY,CACzB,MAAMqC,EAAa,IAAIxC,EAAAyC,gBAAgB5tB,KAAKmK,UACtC0jB,EAAa,IAAI/C,EAAAgD,WAAW9tB,KAAKkC,MAAOlC,KAAKkK,UAAYyjB,EAAY3B,GAC3EhsB,KAAKwrB,UAAUtoB,IAAI,MAAO2qB,GAC1B7tB,KAAK6rB,cACHG,EAAS5f,MAAMwN,cAAc6T,QAAQM,mBAAmB,KAAMF,GAElE,CAGA,GAAI7tB,KAAKkC,MAAMqpB,aAAc,CAC3B,MAAMyC,EAAe,IAAIhD,EAAAvD,kBAAkBznB,KAAKmK,UAC1C8jB,EAAe,IAAIlD,EAAAmD,qBAAqBluB,KAAKkC,MAAOlC,KAAKkK,UAAY8jB,EAAchC,GACzFhsB,KAAKwrB,UAAUtoB,IAAI,QAAS+qB,GAC5BjuB,KAAK6rB,cACHmC,EACAC,EACAjC,EAAS5f,MAAMwN,cAAc6T,QAAQU,mBAAmB,CAAEtoB,MAAO,KAAOooB,GAE5E,CACF,CAGO,KAAA/iB,SAELlL,KAAKkC,MAAMic,eAAiBne,KAAK2rB,aAAaxN,eAC9Cne,KAAKkC,MAAMwa,kBAAoB1c,KAAK2rB,aAAajP,kBAEpC,QAAbvQ,EAAAnM,KAAKmK,gBAAQ,IAAAgC,GAAAA,EAAEjB,QAEf,IAAK,MAAM5C,KAAWtI,KAAKwrB,UAAU1W,SACnCxM,EAAQ4C,QAEV,OAAO,CACT,CAEA,gBAAWiN,SACT,OAAoB,QAAbhM,EAAAnM,KAAKmK,gBAAQ,IAAAgC,OAAA,EAAAA,EAAEmM,cAAe,CACvC,CAEA,gBAAWH,CAAajH,SACT,QAAb/E,EAAAnM,KAAKmK,gBAAQ,IAAAgC,GAAAA,EAAE+L,SAAShH,GACxBlR,KAAKkC,MAAMiW,aAAejH,CAC5B,CAEA,gBAAWkd,GACT,OAAIpuB,KAAKmK,SACAnK,KAAKmK,SAASwO,YAEf,CACV,CAEA,mBAAWzF,GACT,OAAOlT,KAAKkC,MAAMgR,eACpB,CAEA,mBAAWA,CAAgBpX,SACzBkE,KAAKkC,MAAMgR,gBAAkBpX,EACf,QAAdqQ,EAAAnM,KAAKkK,iBAAS,IAAAiC,GAAAA,EAAE+G,gBAAgBpX,EAClC,CAEO,oBAAAggB,CAAqBrF,EAAWnD,SACrC,OAAoB,QAAbnH,EAAAnM,KAAKmK,gBAAQ,IAAAgC,OAAA,EAAAA,EAAE2P,qBAAqBrF,EAAGnD,EAChD,CAEO,uBAAAyI,CAAwBtF,EAAWnD,SACxC,OAAoB,QAAbnH,EAAAnM,KAAKmK,gBAAQ,IAAAgC,OAAA,EAAAA,EAAE4P,wBAAwBtF,EAAGnD,EACnD,CAEQ,OAAA+a,CAAQ/vB,SACA,QAAd6N,EAAAnM,KAAK6R,iBAAS,IAAA1F,GAAAA,EAAEC,MAAMK,MAAMnO,GAAG,EACjC,CAEQ,OAAAquB,CAAQ/P,GACd,IAAK,IAAI9e,EAAI,EAAGA,EAAI8e,EAAO7e,SAAUD,EAE5B,KADC8e,EAAO9e,KAEXkC,KAAKkC,MAAMic,gBAAiB,GAIlC,OAAO,CACT,CAEQ,OAAAyO,CAAQhQ,GACd,IAAK,IAAI9e,EAAI,EAAGA,EAAI8e,EAAO7e,SAAUD,EAE5B,KADC8e,EAAO9e,KAEXkC,KAAKkC,MAAMic,gBAAiB,GAIlC,OAAO,CACT,CAGQ,IAAA0O,CAAKjQ,GACX,QAAIA,EAAO,MAQP5c,KAAKkC,MAAMmpB,eACbrrB,KAAKquB,QAAQ,kBACN,EAGX,CAYQ,wBAAAvB,CAAyBlQ,mBAC/B,GAAIA,EAAO7e,OAAS,EAClB,OAAO,EAET,GAAa,IAAT6e,EAAO,GACT,OAAQA,EAAO,IACb,OAEE,OADA5c,KAAKquB,QAAQ,MAASzR,EAAO,QAA0B5c,KAAKkC,MAAMwa,uBAC3D,EACT,OACE1c,KAAKkC,MAAMwa,kBAAoB1c,KAAK2rB,aAAajP,kBACjD1c,KAAKquB,QAAQ,MAASzR,EAAO,QAA0B5c,KAAKkC,MAAMwa,sBAElE,IAAK,MAAMpU,KAAWtI,KAAKwrB,UAAU1W,SACnCxM,EAAQ4C,QAEV,OAAO,EACT,OAOE,OANI0R,EAAO7e,OAAS,KAAO6e,EAAO,aAAcxV,QAAUwV,EAAO,IA5P5C,MA6PnB5c,KAAKkC,MAAMwa,kBAAoBE,EAAO,GACtC5c,KAAKquB,QAAQ,MAASzR,EAAO,QAA0B5c,KAAKkC,MAAMwa,uBAElE1c,KAAKquB,QAAQ,MAASzR,EAAO,UAExB,EACT,OAEE,OADA5c,KAAKquB,QAAQ,MAASzR,EAAO,eACtB,EACT,QAEE,OADA5c,KAAKquB,QAAQ,MAASzR,EAAO,UACtB,EAGb,GAAa,IAATA,EAAO,GACT,OAAQA,EAAO,IAEb,OACE,IAAI1c,EAAkC,QAA1BqN,EAAc,QAAdpB,EAAAnM,KAAKkK,iBAAS,IAAAiC,OAAA,EAAAA,EAAEP,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIC,OAAO5L,MAC/C8D,EAAmC,QAA1BsK,EAAc,QAAdpC,EAAAlM,KAAKkK,iBAAS,IAAAgC,OAAA,EAAAA,EAAEN,kBAAU,IAAA0C,OAAA,EAAAA,EAAEzC,IAAIC,OAAO9H,OACpD,IAAK9D,IAAU8D,EAAQ,CAGrB,MAAMmP,EAAW7J,EAAAqC,kBACjBzL,IAAuB,QAAdsT,EAAAxT,KAAK6R,iBAAS,IAAA2B,OAAA,EAAAA,EAAEzH,OAAQ,IAAMoH,EAASjT,MAChD8D,IAAwB,QAAdqc,EAAArgB,KAAK6R,iBAAS,IAAAwO,OAAA,EAAAA,EAAErU,OAAQ,IAAMmH,EAASnP,MACnD,CACA,GAAI9D,EAAQ8D,EAAShE,KAAKkC,MAAM8K,WAC9BhN,KAAKquB,QAAQ,MAASzR,EAAO,QAA0B1c,EAAMsM,QAAQ,MAAMxI,EAAOwI,QAAQ,WACrF,CAEL,MAAMiK,EAAI1a,KAAKmR,MAAMnR,KAAKuyB,KAAKtuB,KAAKkC,MAAM8K,aAC1ChN,KAAKquB,QAAQ,MAASzR,EAAO,QAA0BnG,KAAKA,KAC9D,CACA,OAAO,EACT,OAEE,MAAMA,EAAI1a,KAAKmR,MAAMnR,KAAKuyB,KAAKtuB,KAAKkC,MAAM8K,aAE1C,OADAhN,KAAKquB,QAAQ,MAASzR,EAAO,QAA0BnG,KAAKA,OACrD,EACT,QAEE,OADAzW,KAAKquB,QAAQ,MAASzR,EAAO,UACtB,EAKb,OADA5c,KAAKquB,QAAQ,MAASzR,EAAO,UACtB,CACT","sources":["webpack://ImageAddon/webpack/universalModuleDefinition","webpack://ImageAddon/../node_modules/sixel/lib/Colors.js","webpack://ImageAddon/../node_modules/sixel/lib/Decoder.js","webpack://ImageAddon/../node_modules/sixel/lib/wasm.js","webpack://ImageAddon/../src/common/Event.ts","webpack://ImageAddon/../src/common/Lifecycle.ts","webpack://ImageAddon/./src/IIPHandler.ts","webpack://ImageAddon/./src/IIPHeaderParser.ts","webpack://ImageAddon/./src/IIPImageStorage.ts","webpack://ImageAddon/./src/IIPMetrics.ts","webpack://ImageAddon/./src/ImageRenderer.ts","webpack://ImageAddon/./src/ImageStorage.ts","webpack://ImageAddon/./src/SixelHandler.ts","webpack://ImageAddon/./src/SixelImageStorage.ts","webpack://ImageAddon/./src/kitty/KittyGraphicsHandler.ts","webpack://ImageAddon/./src/kitty/KittyGraphicsTypes.ts","webpack://ImageAddon/./src/kitty/KittyImageStorage.ts","webpack://ImageAddon/../node_modules/xterm-wasm-parts/lib/base64/Base64Decoder.wasm.js","webpack://ImageAddon/../node_modules/xterm-wasm-parts/lib/qoi/QoiDecoder.wasm.js","webpack://ImageAddon/javascript/node_modules/inwasm-runtime/lib/index.cjs","webpack://ImageAddon/webpack/bootstrap","webpack://ImageAddon/./src/ImageAddon.ts"],"sourcesContent":["(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine([], factory);\n\telse if(typeof exports === 'object')\n\t\texports[\"ImageAddon\"] = factory();\n\telse\n\t\troot[\"ImageAddon\"] = factory();\n})(globalThis, () => {\nreturn ","\"use strict\";\n/**\n * Copyright (c) 2019 Joerg Breitbart.\n * @license MIT\n */\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.DEFAULT_FOREGROUND = exports.DEFAULT_BACKGROUND = exports.PALETTE_ANSI_256 = exports.PALETTE_VT340_GREY = exports.PALETTE_VT340_COLOR = exports.normalizeHLS = exports.normalizeRGB = exports.nearestColorIndex = exports.fromRGBA8888 = exports.toRGBA8888 = exports.alpha = exports.blue = exports.green = exports.red = exports.BIG_ENDIAN = void 0;\n// FIXME: cleanup this mess, move things either to decoder/encoder, keep only shared things\n// system endianess\nexports.BIG_ENDIAN = new Uint8Array(new Uint32Array([0xFF000000]).buffer)[0] === 0xFF;\nif (exports.BIG_ENDIAN) {\n    console.warn('BE platform detected. This version of node-sixel works only on LE properly.');\n}\n// channel values\nfunction red(n) {\n    return n & 0xFF;\n}\nexports.red = red;\nfunction green(n) {\n    return (n >>> 8) & 0xFF;\n}\nexports.green = green;\nfunction blue(n) {\n    return (n >>> 16) & 0xFF;\n}\nexports.blue = blue;\nfunction alpha(n) {\n    return (n >>> 24) & 0xFF;\n}\nexports.alpha = alpha;\n/**\n * Convert RGB channels to native color RGBA8888.\n */\nfunction toRGBA8888(r, g, b, a = 255) {\n    return ((a & 0xFF) << 24 | (b & 0xFF) << 16 | (g & 0xFF) << 8 | (r & 0xFF)) >>> 0; // ABGR32\n}\nexports.toRGBA8888 = toRGBA8888;\n/**\n * Convert native color to [r, g, b, a].\n */\nfunction fromRGBA8888(color) {\n    return [color & 0xFF, (color >> 8) & 0xFF, (color >> 16) & 0xFF, color >>> 24];\n}\nexports.fromRGBA8888 = fromRGBA8888;\n/**\n * Get index of nearest color in `palette` for `color`.\n * Uses euclidean distance without any luminescence correction.\n */\nfunction nearestColorIndex(color, palette) {\n    const r = red(color);\n    const g = green(color);\n    const b = blue(color);\n    let min = Number.MAX_SAFE_INTEGER;\n    let idx = -1;\n    // use euclidean distance (manhattan gives very poor results)\n    for (let i = 0; i < palette.length; ++i) {\n        const dr = r - palette[i][0];\n        const dg = g - palette[i][1];\n        const db = b - palette[i][2];\n        const d = dr * dr + dg * dg + db * db;\n        if (!d)\n            return i;\n        if (d < min) {\n            min = d;\n            idx = i;\n        }\n    }\n    return idx;\n}\nexports.nearestColorIndex = nearestColorIndex;\n// color conversions\n// HLS taken from: http://www.niwa.nu/2013/05/math-behind-colorspace-conversions-rgb-hsl\nfunction clamp(low, high, value) {\n    return Math.max(low, Math.min(value, high));\n}\nfunction h2c(t1, t2, c) {\n    if (c < 0)\n        c += 1;\n    if (c > 1)\n        c -= 1;\n    return c * 6 < 1\n        ? t2 + (t1 - t2) * 6 * c\n        : c * 2 < 1\n            ? t1\n            : c * 3 < 2\n                ? t2 + (t1 - t2) * (4 - c * 6)\n                : t2;\n}\nfunction HLStoRGB(h, l, s) {\n    if (!s) {\n        const v = Math.round(l * 255);\n        return toRGBA8888(v, v, v);\n    }\n    const t1 = l < 0.5 ? l * (1 + s) : l + s - l * s;\n    const t2 = 2 * l - t1;\n    return toRGBA8888(clamp(0, 255, Math.round(h2c(t1, t2, h + 1 / 3) * 255)), clamp(0, 255, Math.round(h2c(t1, t2, h) * 255)), clamp(0, 255, Math.round(h2c(t1, t2, h - 1 / 3) * 255)));\n}\n/**\n * Normalize SIXEL RGB values (percent based, 0-100) to RGBA8888.\n */\nfunction normalizeRGB(r, g, b) {\n    return (0xFF000000 | Math.round(b / 100 * 255) << 16 | Math.round(g / 100 * 255) << 8 | Math.round(r / 100 * 255)) >>> 0; // ABGR32\n}\nexports.normalizeRGB = normalizeRGB;\n/**\n * Normalize SIXEL HLS values to RGBA8888. Applies hue correction of +240°.\n */\nfunction normalizeHLS(h, l, s) {\n    // Note: hue value is turned by 240° in VT340, all values given as fractions\n    return HLStoRGB((h + 240 % 360) / 360, l / 100, s / 100);\n}\nexports.normalizeHLS = normalizeHLS;\n/**\n * default palettes\n */\n// FIXME: move palettes to Decoder.ts\n/**\n * 16 predefined color registers of VT340 (values in %):\n * ```\n *                R   G   B\n * 0  Black       0   0   0\n * 1  Blue        20  20  80\n * 2  Red         80  13  13\n * 3  Green       20  80  20\n * 4  Magenta     80  20  80\n * 5  Cyan        20  80  80\n * 6  Yellow      80  80  20\n * 7  Gray 50%    53  53  53\n * 8  Gray 25%    26  26  26\n * 9  Blue*       33  33  60\n * 10 Red*        60  26  26\n * 11 Green*      33  60  33\n * 12 Magenta*    60  33  60\n * 13 Cyan*       33  60  60\n * 14 Yellow*     60  60  33\n * 15 Gray 75%    80  80  80\n * ```\n * (*) less saturated\n *\n * @see https://vt100.net/docs/vt3xx-gp/chapter2.html#S2.4\n*/\nexports.PALETTE_VT340_COLOR = new Uint32Array([\n    normalizeRGB(0, 0, 0),\n    normalizeRGB(20, 20, 80),\n    normalizeRGB(80, 13, 13),\n    normalizeRGB(20, 80, 20),\n    normalizeRGB(80, 20, 80),\n    normalizeRGB(20, 80, 80),\n    normalizeRGB(80, 80, 20),\n    normalizeRGB(53, 53, 53),\n    normalizeRGB(26, 26, 26),\n    normalizeRGB(33, 33, 60),\n    normalizeRGB(60, 26, 26),\n    normalizeRGB(33, 60, 33),\n    normalizeRGB(60, 33, 60),\n    normalizeRGB(33, 60, 60),\n    normalizeRGB(60, 60, 33),\n    normalizeRGB(80, 80, 80)\n]);\n/**\n * 16 predefined monochrome registers of VT340 (values in %):\n * ```\n *              R   G   B\n * 0  Black     0   0   0\n * 1  Gray-2    13  13  13\n * 2  Gray-4    26  26  26\n * 3  Gray-6    40  40  40\n * 4  Gray-1    6   6   6\n * 5  Gray-3    20  20  20\n * 6  Gray-5    33  33  33\n * 7  White 7   46  46  46\n * 8  Black 0   0   0   0\n * 9  Gray-2    13  13  13\n * 10 Gray-4    26  26  26\n * 11 Gray-6    40  40  40\n * 12 Gray-1    6   6   6\n * 13 Gray-3    20  20  20\n * 14 Gray-5    33  33  33\n * 15 White 7   46  46  46\n * ```\n *\n * @see https://vt100.net/docs/vt3xx-gp/chapter2.html#S2.4\n */\nexports.PALETTE_VT340_GREY = new Uint32Array([\n    normalizeRGB(0, 0, 0),\n    normalizeRGB(13, 13, 13),\n    normalizeRGB(26, 26, 26),\n    normalizeRGB(40, 40, 40),\n    normalizeRGB(6, 6, 6),\n    normalizeRGB(20, 20, 20),\n    normalizeRGB(33, 33, 33),\n    normalizeRGB(46, 46, 46),\n    normalizeRGB(0, 0, 0),\n    normalizeRGB(13, 13, 13),\n    normalizeRGB(26, 26, 26),\n    normalizeRGB(40, 40, 40),\n    normalizeRGB(6, 6, 6),\n    normalizeRGB(20, 20, 20),\n    normalizeRGB(33, 33, 33),\n    normalizeRGB(46, 46, 46)\n]);\n/**\n * 256 predefined ANSI colors.\n *\n * @see https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit\n */\nexports.PALETTE_ANSI_256 = (() => {\n    // 16 lower colors (taken from xterm)\n    const p = [\n        toRGBA8888(0, 0, 0),\n        toRGBA8888(205, 0, 0),\n        toRGBA8888(0, 205, 0),\n        toRGBA8888(205, 205, 0),\n        toRGBA8888(0, 0, 238),\n        toRGBA8888(205, 0, 205),\n        toRGBA8888(0, 250, 205),\n        toRGBA8888(229, 229, 229),\n        toRGBA8888(127, 127, 127),\n        toRGBA8888(255, 0, 0),\n        toRGBA8888(0, 255, 0),\n        toRGBA8888(255, 255, 0),\n        toRGBA8888(92, 92, 255),\n        toRGBA8888(255, 0, 255),\n        toRGBA8888(0, 255, 255),\n        toRGBA8888(255, 255, 255),\n    ];\n    // colors up to 232\n    const d = [0, 95, 135, 175, 215, 255];\n    for (let r = 0; r < 6; ++r) {\n        for (let g = 0; g < 6; ++g) {\n            for (let b = 0; b < 6; ++b) {\n                p.push(toRGBA8888(d[r], d[g], d[b]));\n            }\n        }\n    }\n    // grey scale to up 255\n    for (let v = 8; v <= 238; v += 10) {\n        p.push(toRGBA8888(v, v, v));\n    }\n    return new Uint32Array(p);\n})();\n/**\n * Background: Black by default.\n * Foreground: White by default.\n *\n * Background color is used whenever a fill color is needed and not explicitly set.\n * Foreground color is used as default initial sixel color.\n */\nexports.DEFAULT_BACKGROUND = toRGBA8888(0, 0, 0, 255);\nexports.DEFAULT_FOREGROUND = toRGBA8888(255, 255, 255, 255);\n//# sourceMappingURL=Colors.js.map","\"use strict\";\n/**\n * Copyright (c) 2021 Joerg Breitbart.\n * @license MIT\n */\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.decodeAsync = exports.decode = exports.Decoder = exports.DecoderAsync = void 0;\nconst Colors_1 = require(\"./Colors\");\nconst wasm_1 = require(\"./wasm\");\n/* istanbul ignore next */\nfunction decodeBase64(s) {\n    if (typeof Buffer !== 'undefined') {\n        return Buffer.from(s, 'base64');\n    }\n    const bytestring = atob(s);\n    const result = new Uint8Array(bytestring.length);\n    for (let i = 0; i < result.length; ++i) {\n        result[i] = bytestring.charCodeAt(i);\n    }\n    return result;\n}\nconst WASM_BYTES = decodeBase64(wasm_1.LIMITS.BYTES);\nlet WASM_MODULE;\n// empty canvas\nconst NULL_CANVAS = new Uint32Array();\n// proxy for lazy binding of decoder methods to wasm env callbacks\nclass CallbackProxy {\n    constructor() {\n        this.bandHandler = (width) => 1;\n        this.modeHandler = (mode) => 1;\n    }\n    handle_band(width) {\n        return this.bandHandler(width);\n    }\n    mode_parsed(mode) {\n        return this.modeHandler(mode);\n    }\n}\n// default decoder options\nconst DEFAULT_OPTIONS = {\n    memoryLimit: 2048 * 65536,\n    sixelColor: Colors_1.DEFAULT_FOREGROUND,\n    fillColor: Colors_1.DEFAULT_BACKGROUND,\n    palette: Colors_1.PALETTE_VT340_COLOR,\n    paletteLimit: wasm_1.LIMITS.PALETTE_SIZE,\n    truncate: true\n};\n/**\n * Create a decoder instance asynchronously.\n * To be used in the browser main thread.\n */\nfunction DecoderAsync(opts) {\n    const cbProxy = new CallbackProxy();\n    const importObj = {\n        env: {\n            handle_band: cbProxy.handle_band.bind(cbProxy),\n            mode_parsed: cbProxy.mode_parsed.bind(cbProxy)\n        }\n    };\n    return WebAssembly.instantiate(WASM_MODULE || WASM_BYTES, importObj)\n        .then((inst) => {\n        WASM_MODULE = WASM_MODULE || inst.module;\n        return new Decoder(opts, inst.instance || inst, cbProxy);\n    });\n}\nexports.DecoderAsync = DecoderAsync;\n/**\n * Decoder - web assembly based sixel stream decoder.\n *\n * Usage pattern:\n *  - call `init` to initialize decoder for new image\n *  - feed data chunks to `decode` or `decodeString`\n *  - grab pixels from `data32`\n *  - optional: call `release` to free memory (e.g. after big images)\n *  - start over with next image by calling `init`\n *\n * Properties:\n *  - max width of 2^14 - 4 pixels (compile time setting in wasm)\n *  - no explicit height limit (only limited by memory)\n *  - max 4096 colors palette (compile time setting in wasm)\n *\n * Explanation operation modes:\n * - M1   Mode chosen for level 1 images (no raster attributes),\n *        or for level 2 images with `truncate=false`.\n * - M2   Mode chosen for level 2 images with `truncate=true` (default).\n *        While this mode is not fully spec conform (decoder not expected to truncate),\n *        it is what spec conform encoders should create (should not excess raster).\n *        This mode has several advantages:\n *        - ~15% faster decoding speed\n *        - image dimensions can be evaluated early without processing the whole data\n *        - faster pixel access in `data32` (precalulated)\n *        - image height is not reported as multiple of 6 pixels\n * - M0   Undecided mode state after `init`.\n * The level of an image is determined during early decoding based on the fact,\n * whether the data contains valid raster attributes before any sixel data.\n * Until then the mode of an image is marked as M0, meaning the real operation mode\n * could not be decided yet.\n */\nclass Decoder {\n    /**\n     * Synchonous ctor. Can be called from nodejs or a webworker context.\n     * For instantiation in the browser main thread use `WasmDecoderAsync` instead.\n     */\n    constructor(opts, _instance, _cbProxy) {\n        this._PIXEL_OFFSET = wasm_1.LIMITS.MAX_WIDTH + 4;\n        this._canvas = NULL_CANVAS;\n        this._bandWidths = [];\n        this._maxWidth = 0;\n        this._minWidth = wasm_1.LIMITS.MAX_WIDTH;\n        this._lastOffset = 0;\n        this._currentHeight = 0;\n        this._opts = Object.assign({}, DEFAULT_OPTIONS, opts);\n        if (this._opts.paletteLimit > wasm_1.LIMITS.PALETTE_SIZE) {\n            throw new Error(`DecoderOptions.paletteLimit must not exceed ${wasm_1.LIMITS.PALETTE_SIZE}`);\n        }\n        if (!_instance) {\n            const module = WASM_MODULE || (WASM_MODULE = new WebAssembly.Module(WASM_BYTES));\n            _instance = new WebAssembly.Instance(module, {\n                env: {\n                    handle_band: this._handle_band.bind(this),\n                    mode_parsed: this._initCanvas.bind(this)\n                }\n            });\n        }\n        else {\n            _cbProxy.bandHandler = this._handle_band.bind(this);\n            _cbProxy.modeHandler = this._initCanvas.bind(this);\n        }\n        this._instance = _instance;\n        this._wasm = this._instance.exports;\n        this._chunk = new Uint8Array(this._wasm.memory.buffer, this._wasm.get_chunk_address(), wasm_1.LIMITS.CHUNK_SIZE);\n        this._states = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_state_address(), 12);\n        this._palette = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_palette_address(), wasm_1.LIMITS.PALETTE_SIZE);\n        this._palette.set(this._opts.palette);\n        this._pSrc = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_p0_address());\n        this._wasm.init(Colors_1.DEFAULT_FOREGROUND, 0, this._opts.paletteLimit, 0);\n    }\n    // some readonly parser states for internal usage\n    get _fillColor() { return this._states[0]; }\n    get _truncate() { return this._states[8]; }\n    get _rasterWidth() { return this._states[6]; }\n    get _rasterHeight() { return this._states[7]; }\n    get _width() { return this._states[2] ? this._states[2] - 4 : 0; }\n    get _height() { return this._states[3]; }\n    get _level() { return this._states[9]; }\n    get _mode() { return this._states[10]; }\n    get _paletteLimit() { return this._states[11]; }\n    _initCanvas(mode) {\n        if (mode === 2 /* M2 */) {\n            const pixels = this.width * this.height;\n            if (pixels > this._canvas.length) {\n                if (this._opts.memoryLimit && pixels * 4 > this._opts.memoryLimit) {\n                    this.release();\n                    throw new Error('image exceeds memory limit');\n                }\n                this._canvas = new Uint32Array(pixels);\n            }\n            this._maxWidth = this._width;\n        }\n        else if (mode === 1 /* M1 */) {\n            if (this._level === 2) {\n                // got raster attributes, use them as initial size hint\n                const pixels = Math.min(this._rasterWidth, wasm_1.LIMITS.MAX_WIDTH) * this._rasterHeight;\n                if (pixels > this._canvas.length) {\n                    if (this._opts.memoryLimit && pixels * 4 > this._opts.memoryLimit) {\n                        this.release();\n                        throw new Error('image exceeds memory limit');\n                    }\n                    this._canvas = new Uint32Array(pixels);\n                }\n            }\n            else {\n                // else fallback to generic resizing, starting with 256*256 pixels\n                if (this._canvas.length < 65536) {\n                    this._canvas = new Uint32Array(65536);\n                }\n            }\n        }\n        return 0; // 0 - continue, 1 - abort right away\n    }\n    _realloc(offset, additionalPixels) {\n        const pixels = offset + additionalPixels;\n        if (pixels > this._canvas.length) {\n            if (this._opts.memoryLimit && pixels * 4 > this._opts.memoryLimit) {\n                this.release();\n                throw new Error('image exceeds memory limit');\n            }\n            // extend in 65536 pixel blocks\n            const newCanvas = new Uint32Array(Math.ceil(pixels / 65536) * 65536);\n            newCanvas.set(this._canvas);\n            this._canvas = newCanvas;\n        }\n    }\n    _handle_band(width) {\n        const adv = this._PIXEL_OFFSET;\n        let offset = this._lastOffset;\n        if (this._mode === 2 /* M2 */) {\n            let remaining = this.height - this._currentHeight;\n            let c = 0;\n            while (c < 6 && remaining > 0) {\n                this._canvas.set(this._pSrc.subarray(adv * c, adv * c + width), offset + width * c);\n                c++;\n                remaining--;\n            }\n            this._lastOffset += width * c;\n            this._currentHeight += c;\n        }\n        else if (this._mode === 1 /* M1 */) {\n            this._realloc(offset, width * 6);\n            this._maxWidth = Math.max(this._maxWidth, width);\n            this._minWidth = Math.min(this._minWidth, width);\n            for (let i = 0; i < 6; ++i) {\n                this._canvas.set(this._pSrc.subarray(adv * i, adv * i + width), offset + width * i);\n            }\n            this._bandWidths.push(width);\n            this._lastOffset += width * 6;\n            this._currentHeight += 6;\n        }\n        return 0; // 0 - continue, 1 - abort right away\n    }\n    /**\n     * Width of the image data.\n     * Returns the rasterWidth in level2/truncating mode,\n     * otherwise the max width, that has been seen so far.\n     */\n    get width() {\n        return this._mode !== 1 /* M1 */\n            ? this._width\n            : Math.max(this._maxWidth, this._wasm.current_width());\n    }\n    /**\n     * Height of the image data.\n     * Returns the rasterHeight in level2/truncating mode,\n     * otherwise height touched by sixels.\n     */\n    get height() {\n        return this._mode !== 1 /* M1 */\n            ? this._height\n            : this._wasm.current_width()\n                ? this._bandWidths.length * 6 + this._wasm.current_height()\n                : this._bandWidths.length * 6;\n    }\n    /**\n     * Get active palette colors as RGBA8888[] (borrowed).\n     */\n    get palette() {\n        return this._palette.subarray(0, this._paletteLimit);\n    }\n    /**\n     * Get the memory used by the decoder.\n     *\n     * This is a rough estimate accounting the wasm instance memory\n     * and pixel buffers held on JS side (real value will be slightly\n     * higher due to JS book-keeping).\n     * Note that the decoder does not free ressources on its own,\n     * call `release` to free excess memory.\n     */\n    get memoryUsage() {\n        return this._canvas.byteLength + this._wasm.memory.buffer.byteLength + 8 * this._bandWidths.length;\n    }\n    /**\n     * Get various properties of the decoder and the current image.\n     */\n    get properties() {\n        return {\n            width: this.width,\n            height: this.height,\n            mode: this._mode,\n            level: this._level,\n            truncate: !!this._truncate,\n            paletteLimit: this._paletteLimit,\n            fillColor: this._fillColor,\n            memUsage: this.memoryUsage,\n            rasterAttributes: {\n                numerator: this._states[4],\n                denominator: this._states[5],\n                width: this._rasterWidth,\n                height: this._rasterHeight,\n            }\n        };\n    }\n    /**\n     * Initialize decoder for next image. Must be called before\n     * any calls to `decode` or `decodeString`.\n     */\n    // FIXME: reorder arguments, better palette handling\n    init(fillColor = this._opts.fillColor, palette = this._opts.palette, paletteLimit = this._opts.paletteLimit, truncate = this._opts.truncate) {\n        this._wasm.init(this._opts.sixelColor, fillColor, paletteLimit, truncate ? 1 : 0);\n        if (palette) {\n            this._palette.set(palette.subarray(0, wasm_1.LIMITS.PALETTE_SIZE));\n        }\n        this._bandWidths.length = 0;\n        this._maxWidth = 0;\n        this._minWidth = wasm_1.LIMITS.MAX_WIDTH;\n        this._lastOffset = 0;\n        this._currentHeight = 0;\n    }\n    /**\n     * Decode next chunk of data from start to end index (exclusive).\n     * @throws Will throw if the image exceeds the memory limit.\n     */\n    decode(data, start = 0, end = data.length) {\n        let p = start;\n        while (p < end) {\n            const length = Math.min(end - p, wasm_1.LIMITS.CHUNK_SIZE);\n            this._chunk.set(data.subarray(p, p += length));\n            this._wasm.decode(0, length);\n        }\n    }\n    /**\n     * Decode next chunk of string data from start to end index (exclusive).\n     * Note: Decoding from string data is rather slow, use `decode` with byte data instead.\n     * @throws Will throw if the image exceeds the memory limit.\n     */\n    decodeString(data, start = 0, end = data.length) {\n        let p = start;\n        while (p < end) {\n            const length = Math.min(end - p, wasm_1.LIMITS.CHUNK_SIZE);\n            for (let i = 0, j = p; i < length; ++i, ++j) {\n                this._chunk[i] = data.charCodeAt(j);\n            }\n            p += length;\n            this._wasm.decode(0, length);\n        }\n    }\n    /**\n     * Get current pixel data as 32-bit typed array (RGBA8888).\n     * Also peeks into pixel data of the current band, that got not pushed yet.\n     */\n    get data32() {\n        if (this._mode === 0 /* M0 */ || !this.width || !this.height) {\n            return NULL_CANVAS;\n        }\n        // get width of pending band to peek into left-over data\n        const currentWidth = this._wasm.current_width();\n        if (this._mode === 2 /* M2 */) {\n            let remaining = this.height - this._currentHeight;\n            if (remaining > 0) {\n                const adv = this._PIXEL_OFFSET;\n                let offset = this._lastOffset;\n                let c = 0;\n                while (c < 6 && remaining > 0) {\n                    this._canvas.set(this._pSrc.subarray(adv * c, adv * c + currentWidth), offset + currentWidth * c);\n                    c++;\n                    remaining--;\n                }\n                if (remaining) {\n                    this._canvas.fill(this._fillColor, offset + currentWidth * c);\n                }\n            }\n            return this._canvas.subarray(0, this.width * this.height);\n        }\n        if (this._mode === 1 /* M1 */) {\n            if (this._minWidth === this._maxWidth) {\n                let escape = false;\n                if (currentWidth) {\n                    if (currentWidth !== this._minWidth) {\n                        escape = true;\n                    }\n                    else {\n                        const adv = this._PIXEL_OFFSET;\n                        let offset = this._lastOffset;\n                        this._realloc(offset, currentWidth * 6);\n                        for (let i = 0; i < 6; ++i) {\n                            this._canvas.set(this._pSrc.subarray(adv * i, adv * i + currentWidth), offset + currentWidth * i);\n                        }\n                    }\n                }\n                if (!escape) {\n                    return this._canvas.subarray(0, this.width * this.height);\n                }\n            }\n            // worst case: re-align pixels if we have bands with different width\n            // This is somewhat allocation intensive, any way to do that in-place, and just once?\n            const final = new Uint32Array(this.width * this.height);\n            final.fill(this._fillColor);\n            let finalOffset = 0;\n            let start = 0;\n            for (let i = 0; i < this._bandWidths.length; ++i) {\n                const bw = this._bandWidths[i];\n                for (let p = 0; p < 6; ++p) {\n                    final.set(this._canvas.subarray(start, start += bw), finalOffset);\n                    finalOffset += this.width;\n                }\n            }\n            // also handle left-over pixels of the current band\n            if (currentWidth) {\n                const adv = this._PIXEL_OFFSET;\n                // other than finished bands, this runs only up to currentHeight\n                const currentHeight = this._wasm.current_height();\n                for (let i = 0; i < currentHeight; ++i) {\n                    final.set(this._pSrc.subarray(adv * i, adv * i + currentWidth), finalOffset + this.width * i);\n                }\n            }\n            return final;\n        }\n        // fallthrough for all not handled cases\n        return NULL_CANVAS;\n    }\n    /**\n     * Same as `data32`, but returning pixel data as Uint8ClampedArray suitable\n     * for direct usage with `ImageData`.\n     */\n    get data8() {\n        return new Uint8ClampedArray(this.data32.buffer, 0, this.width * this.height * 4);\n    }\n    /**\n     * Release image ressources on JS side held by the decoder.\n     *\n     * The decoder tries to re-use memory ressources of a previous image\n     * to lower allocation and GC pressure. Decoding a single big image\n     * will grow the memory usage of the decoder permanently.\n     * Call `release` to reset the internal buffers and free the memory.\n     * Note that this destroys the image data, call it when done processing\n     * a rather big image, otherwise it is not needed. Use `memoryUsage`\n     * to decide, whether the held memory is still within your limits.\n     * This does not affect the wasm module (operates on static memory).\n     */\n    release() {\n        this._canvas = NULL_CANVAS;\n        this._bandWidths.length = 0;\n        this._maxWidth = 0;\n        this._minWidth = wasm_1.LIMITS.MAX_WIDTH;\n        // also nullify parser states in wasm to avoid\n        // width/height reporting potential out-of-bound values\n        this._wasm.init(Colors_1.DEFAULT_FOREGROUND, 0, this._opts.paletteLimit, 0);\n    }\n}\nexports.Decoder = Decoder;\n/**\n * Convenient decoding functions for easier usage.\n *\n * These can be used for casual decoding of sixel images,\n * that dont come in as stream chunks.\n * Note that the functions instantiate a stream decoder for every call,\n * which comes with a performance penalty of ~25%.\n */\n/**\n * Decode function with synchronous wasm loading.\n * Can be used in a web worker or in nodejs. Does not work reliable in normal browser context.\n * @throws Will throw if the image exceeds the memory limit.\n */\nfunction decode(data, opts) {\n    const dec = new Decoder(opts);\n    dec.init();\n    typeof data === 'string' ? dec.decodeString(data) : dec.decode(data);\n    return {\n        width: dec.width,\n        height: dec.height,\n        data32: dec.data32,\n        data8: dec.data8\n    };\n}\nexports.decode = decode;\n/**\n * Decode function with asynchronous wasm loading.\n * Use this version in normal browser context.\n * @throws Will throw if the image exceeds the memory limit.\n */\nasync function decodeAsync(data, opts) {\n    const dec = await DecoderAsync(opts);\n    dec.init();\n    typeof data === 'string' ? dec.decodeString(data) : dec.decode(data);\n    return {\n        width: dec.width,\n        height: dec.height,\n        data32: dec.data32,\n        data8: dec.data8\n    };\n}\nexports.decodeAsync = decodeAsync;\n//# sourceMappingURL=Decoder.js.map","\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.LIMITS = void 0;\nexports.LIMITS = {\n    CHUNK_SIZE: 16384,\n    PALETTE_SIZE: 4096,\n    MAX_WIDTH: 16384,\n    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//# sourceMappingURL=wasm.js.map","/**\n * Copyright (c) 2024-2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Minimal event utilities for xterm.js core.\n * Simplified from VS Code's event.ts - no leak detection/profiling.\n */\n\nimport { IDisposable, DisposableStore, toDisposable } from './Lifecycle';\n\nexport interface IEvent<T> {\n  (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore): IDisposable;\n}\n\nexport class Emitter<T> {\n  private _listeners: { fn: (e: T) => any, thisArgs: any }[] = [];\n  private _disposed = false;\n  private _event: IEvent<T> | undefined;\n\n  public get event(): IEvent<T> {\n    if (this._event) {\n      return this._event;\n    }\n    this._event = (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      if (this._disposed) {\n        return toDisposable(() => {});\n      }\n\n      const entry = { fn: listener, thisArgs };\n      this._listeners = this._listeners.slice();\n      this._listeners.push(entry);\n\n      const result = toDisposable(() => {\n        const idx = this._listeners.indexOf(entry);\n        if (idx !== -1) {\n          this._listeners = this._listeners.slice();\n          this._listeners.splice(idx, 1);\n        }\n      });\n\n      if (disposables) {\n        if (Array.isArray(disposables)) {\n          disposables.push(result);\n        } else {\n          disposables.add(result);\n        }\n      }\n\n      return result;\n    };\n    return this._event;\n  }\n\n  public fire(event: T): void {\n    if (this._disposed || !this._listeners.length) {\n      return;\n    }\n    if (this._listeners.length === 1) {\n      this._listeners[0].fn.call(this._listeners[0].thisArgs, event);\n      return;\n    }\n    const listeners = this._listeners;\n    for (let i = 0, len = listeners.length; i < len; ++i) {\n      listeners[i].fn.call(listeners[i].thisArgs, event);\n    }\n  }\n\n  public dispose(): void {\n    if (this._disposed) {\n      return;\n    }\n    this._disposed = true;\n    this._listeners.length = 0;\n  }\n}\n\nexport namespace EventUtils {\n  export function forward<T>(from: IEvent<T>, to: Emitter<T>): IDisposable {\n    return from(e => to.fire(e));\n  }\n\n  export function map<I, O>(event: IEvent<I>, map: (i: I) => O): IEvent<O> {\n    return (listener: (e: O) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      return event(i => listener.call(thisArgs, map(i)), undefined, disposables);\n    };\n  }\n\n  export function any<T>(...events: IEvent<T>[]): IEvent<T>;\n  export function any(...events: IEvent<any>[]): IEvent<void>;\n  export function any<T>(...events: IEvent<T>[]): IEvent<T> {\n    return (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      const store = new DisposableStore();\n      for (const event of events) {\n        store.add(event(e => listener.call(thisArgs, e)));\n      }\n      if (disposables) {\n        if (Array.isArray(disposables)) {\n          disposables.push(store);\n        } else {\n          disposables.add(store);\n        }\n      }\n      return store;\n    };\n  }\n\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T) => void, initial: T): IDisposable;\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T | undefined) => void): IDisposable;\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T | undefined) => void, initial?: T): IDisposable {\n    handler(initial);\n    return event(e => handler(e));\n  }\n}\n","/**\n * Copyright (c) 2024-2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Minimal lifecycle utilities for xterm.js core.\n * Simplified from VS Code's lifecycle.ts - no tracking/leak detection.\n */\n\nexport interface IDisposable {\n  dispose(): void;\n}\n\nexport function toDisposable(fn: () => void): IDisposable {\n  return { dispose: fn };\n}\n\nexport function dispose<T extends IDisposable>(disposable: T): T;\nexport function dispose<T extends IDisposable>(disposable: T | undefined): T | undefined;\nexport function dispose<T extends IDisposable>(disposables: T[]): T[];\nexport function dispose<T extends IDisposable>(arg: T | T[] | undefined): T | T[] | undefined {\n  if (!arg) {\n    return arg;\n  }\n  if (Array.isArray(arg)) {\n    for (const d of arg) {\n      d.dispose();\n    }\n    return [];\n  }\n  arg.dispose();\n  return arg;\n}\n\nexport function combinedDisposable(...disposables: IDisposable[]): IDisposable {\n  return toDisposable(() => dispose(disposables));\n}\n\nexport class DisposableStore implements IDisposable {\n  private readonly _disposables = new Set<IDisposable>();\n  private _isDisposed = false;\n\n  public get isDisposed(): boolean {\n    return this._isDisposed;\n  }\n\n  public add<T extends IDisposable>(o: T): T {\n    if (this._isDisposed) {\n      o.dispose();\n    } else {\n      this._disposables.add(o);\n    }\n    return o;\n  }\n\n  public dispose(): void {\n    if (this._isDisposed) {\n      return;\n    }\n    this._isDisposed = true;\n    for (const d of this._disposables) {\n      d.dispose();\n    }\n    this._disposables.clear();\n  }\n\n  public clear(): void {\n    for (const d of this._disposables) {\n      d.dispose();\n    }\n    this._disposables.clear();\n  }\n}\n\nexport abstract class Disposable implements IDisposable {\n  public static readonly None: IDisposable = Object.freeze({ dispose() { } });\n\n  protected readonly _store = new DisposableStore();\n\n  public dispose(): void {\n    this._store.dispose();\n  }\n\n  protected _register<T extends IDisposable>(o: T): T {\n    return this._store.add(o);\n  }\n}\n\nexport class MutableDisposable<T extends IDisposable> implements IDisposable {\n  private _value: T | undefined;\n  private _isDisposed = false;\n\n  public get value(): T | undefined {\n    return this._isDisposed ? undefined : this._value;\n  }\n\n  public set value(value: T | undefined) {\n    if (this._isDisposed || value === this._value) {\n      return;\n    }\n    this._value?.dispose();\n    this._value = value;\n  }\n\n  public clear(): void {\n    this.value = undefined;\n  }\n\n  public dispose(): void {\n    this._isDisposed = true;\n    this._value?.dispose();\n    this._value = undefined;\n  }\n}\n","/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nimport { IImageAddonOptions, IOscHandler, IResetHandler, ITerminalExt } from './Types';\nimport { ImageRenderer } from './ImageRenderer';\nimport { IIPImageStorage } from './IIPImageStorage';\nimport { CELL_SIZE_DEFAULT } from './ImageStorage';\nimport Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\nimport QoiDecoder from 'xterm-wasm-parts/lib/qoi/QoiDecoder.wasm';\nimport { HeaderParser, IHeaderFields, HeaderState, SequenceType } from './IIPHeaderParser';\nimport { imageType, UNSUPPORTED_TYPE } from './IIPMetrics';\n\n// Local const enum mirror - esbuild can't inline const enums from external packages\nconst enum DecoderConst {\n  // Limit held memory in base64 decoder (encoded bytes).\n  KEEP_DATA = 4194304,\n  // Initial buffer allocation for the decoder.\n  INITIAL_DATA = 1048576,\n  // Local mirror of const enum (esbuild can't inline const enums from external packages)\n  OK = 0\n}\n\n// default IIP header values\nconst DEFAULT_HEADER: IHeaderFields = {\n  type: SequenceType.INVALID,\n  name: 'Unnamed file',\n  size: 0,\n  width: 'auto',\n  height: 'auto',\n  preserveAspectRatio: 1,\n  inline: 0\n};\n\n\nexport class IIPHandler implements IOscHandler, IResetHandler {\n  private _generation = 0;\n  private _aborted = false;\n  private _hp = new HeaderParser();\n  private _header: IHeaderFields = DEFAULT_HEADER;\n  private _dec: Base64Decoder;\n  private _qoiDec: QoiDecoder;\n  private _isMultipart = false;\n  private _abortMulti = false;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _storage: IIPImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    const maxEncodedBytes = Math.ceil(this._opts.iipSizeLimit * 4 / 3);\n    const initialBytes = Math.min(DecoderConst.INITIAL_DATA, maxEncodedBytes);\n    this._dec = new Base64Decoder(DecoderConst.KEEP_DATA, maxEncodedBytes, initialBytes);\n    this._qoiDec = new QoiDecoder(DecoderConst.KEEP_DATA);\n  }\n\n  public reset(): void {\n    this._generation++;\n    this._hp.reset();\n    this._dec.release();\n    this._qoiDec.release();\n  }\n\n  public start(): void {\n    this._aborted = false;\n    this._hp.reset();\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    if (this._hp.state === HeaderState.END) {\n      if ((this._dec.put(data.subarray(start, end)) as number) !== DecoderConst.OK) {\n        this._dec.release();\n        this._aborted = true;\n      }\n    } else {\n      const dataPos = this._hp.parse(data, start, end);\n      if (dataPos === -1) {\n        this._aborted = true;\n        return;\n      }\n      if (dataPos > 0) {\n        const seqType = this._hp.fields.type;\n        if (seqType === SequenceType.FILE) {\n          if (this._isMultipart) {\n            this._isMultipart = false;\n            this._abortMulti = false;\n            this._dec.release();\n          }\n          this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);\n          if (!this._header.inline) {\n            this._aborted = true;\n            return;\n          }\n          this._dec.init();\n        } else if (this._abortMulti) {\n          this._aborted = true;\n          return;\n        }\n        if ((this._dec.put(data.subarray(dataPos, end)) as number) !== DecoderConst.OK) {\n          this._dec.release();\n          this._aborted = true;\n          if (this._isMultipart) this._abortMulti = true;\n        }\n      }\n    }\n  }\n\n  public end(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted) return true;\n\n    if (this._hp.state !== HeaderState.END) {\n      if (this._hp.end()) return true;\n    }\n    const seqType = this._hp.fields.type;\n\n    if (seqType === SequenceType.FILEPART) return true;\n\n    if (seqType === SequenceType.REPORTCELLSIZE) {\n      // OSC 1337 ; ReportCellSize=[height];[width];[scale] ST\n      let w = CELL_SIZE_DEFAULT.width;\n      let h = CELL_SIZE_DEFAULT.height;\n      if (this._renderer.dimensions) {\n        w = this._renderer.dimensions.css.canvas.width / this._coreTerminal.cols;\n        h = this._renderer.dimensions.css.canvas.height / this._coreTerminal.rows;\n      }\n      const scale = this._coreTerminal._core._coreBrowserService?.dpr ?? 1;\n      const report = `\\x1b]1337;ReportCellSize=${h.toFixed(3)};${w.toFixed(3)};${scale.toFixed(3)}\\x1b\\\\`;\n      this._coreTerminal.input(report, false);\n      return true;\n    }\n\n    if (seqType === SequenceType.MULTIPARTFILE) {\n      this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);\n      this._isMultipart = true;\n      this._abortMulti = false;\n      this._dec.release();\n      this._dec.init();\n      return true;\n    }\n\n    if (seqType === SequenceType.FILEEND) {\n      if (!this._isMultipart) return true;\n      this._isMultipart = false;\n      if (this._abortMulti || this._header.type !== SequenceType.MULTIPARTFILE) return true;\n    }\n\n    // fallthrough for SequenceType.FILE & SequenceType.FILEEND\n\n    let w = 0;\n    let h = 0;\n\n    // early exit condition chain\n    let cond: number | boolean;\n    let metrics = UNSUPPORTED_TYPE;\n    if (cond = success) {\n      if (cond = !this._dec.end()) {\n        metrics = imageType(this._dec.data8);\n        if (cond = metrics.mime !== 'unsupported') {\n          w = metrics.width;\n          h = metrics.height;\n          if (cond = w && h && w * h < this._opts.pixelLimit) {\n            [w, h] = this._resize(w, h).map(Math.floor);\n            cond = w && h && w * h < this._opts.pixelLimit;\n          } else {\n            console.warn(`IIP: image dimension issue ${metrics.width}x${metrics.height}`);\n          }\n        } else {\n          console.warn('IIP: unsupported image type');\n        }\n      } else {\n        console.warn('IIP: error during BASE64 decoding');\n      }\n    }\n    if (!cond) {\n      this._dec.release();\n      return true;\n    }\n\n    let blob: Blob | ImageData;\n    if (metrics.mime === 'image/qoi') {\n      const data = this._qoiDec.decode(this._dec.data8);\n      blob = new ImageData(\n        new Uint8ClampedArray(data.buffer, data.byteOffset, data.byteLength),\n        this._qoiDec.width,\n        this._qoiDec.height\n      );\n      this._qoiDec.release();\n      if (w === this._qoiDec.width && h === this._qoiDec.height) {\n        // use fast-path if we don't need to rescale\n        this._dec.release();\n        const canvas = ImageRenderer.createCanvas(undefined, this._qoiDec.width, this._qoiDec.height);\n        canvas.getContext('2d')?.putImageData(blob, 0, 0);\n        this._storage.addImage(canvas);\n        return true;\n      }\n    } else {\n      blob = new Blob([this._dec.data8], { type: metrics.mime });\n    }\n    this._dec.release();\n    const generation = this._generation;\n    return createImageBitmap(blob, { resizeWidth: w, resizeHeight: h })\n      .then(bm => {\n        if (generation !== this._generation) {\n          bm.close();\n          return true;\n        }\n        this._storage.addImage(bm);\n        return true;\n      })\n      .catch(e => {\n        console.warn(`IIP: decoding error ${metrics.mime} ${metrics.width}x${metrics.height}`, e);\n        return true;\n      });\n  }\n\n  private _resize(w: number, h: number): [number, number] {\n    const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;\n    const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;\n    const width = this._renderer.dimensions?.css.canvas.width || cw * this._coreTerminal.cols;\n    const height = this._renderer.dimensions?.css.canvas.height || ch * this._coreTerminal.rows;\n\n    const rw = this._dim(this._header.width!, width, cw);\n    const rh = this._dim(this._header.height!, height, ch);\n    if (!rw && !rh) {\n      const wf = width / w;         // TODO: should this respect initial cursor offset?\n      const hf = (height - ch) / h; // TODO: fix offset issues from float cell height\n      const f = Math.min(wf, hf);\n      return f < 1 ? [w * f, h * f] : [w, h];\n    }\n    return !rw\n      ? [w * rh / h, rh]\n      : this._header.preserveAspectRatio || !rw || !rh\n        ? [rw, h * rw / w] : [rw, rh];\n  }\n\n  private _dim(s: string, total: number, cdim: number): number {\n    if (s === 'auto') return 0;\n    if (s.endsWith('%')) return parseInt(s.slice(0, -1), 10) * total / 100;\n    if (s.endsWith('px')) return parseInt(s.slice(0, -2), 10);\n    return parseInt(s, 10) * cdim;\n  }\n}\n","/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n// eslint-disable-next-line\ndeclare const Buffer: any;\n\nexport const enum HeaderState {\n  START = 0,\n  ABORT = 1,\n  KEY = 2,\n  VALUE = 3,\n  END = 4\n}\n\nexport const enum SequenceType {\n  INVALID = 0,\n  FILE = 1,\n  MULTIPARTFILE = 2,\n  FILEPART = 3,\n  FILEEND = 4,\n  REPORTCELLSIZE = 5\n}\n\nexport interface IHeaderFields {\n  [key: string]: number | string | Uint32Array | null | undefined;\n  // sequence type\n  type: SequenceType;\n  // base-64 encoded filename. Defaults to \"Unnamed file\".\n  name: string;\n  // File size in bytes. The file transfer will be canceled if this size is exceeded.\n  size: number;\n  /**\n   * Optional width and height to render:\n   * - N: N character cells.\n   * - Npx: N pixels.\n   * - N%: N percent of the session's width or height.\n   * - auto: The image's inherent size will be used to determine an appropriate dimension.\n   */\n  width?: string;\n  height?: string;\n  // Optional, defaults to 1 respecting aspect ratio (width takes precedence).\n  preserveAspectRatio?: number;\n  // Optional, defaults to 0. If set to 1, the file will be displayed inline, else downloaded\n  // (download not supported).\n  inline?: number;\n}\n\n// field value decoders\n\n// ASCII bytes to string\nfunction toStr(data: Uint32Array): string {\n  let s = '';\n  for (let i = 0; i < data.length; ++i) {\n    s += String.fromCharCode(data[i]);\n  }\n  return s;\n}\n\n// digits to integer\nfunction toInt(data: Uint32Array): number {\n  let v = 0;\n  for (let i = 0; i < data.length; ++i) {\n    if (data[i] < 48 || data[i] > 57) {\n      throw new Error('illegal char');\n    }\n    v = v * 10 + data[i] - 48;\n  }\n  return v;\n}\n\n// check for correct size entry\nfunction toSize(data: Uint32Array): string {\n  const v = toStr(data);\n  if (!v.match(/^((auto)|(\\d+?((px)|(%)){0,1}))$/)) {\n    throw new Error('illegal size');\n  }\n  return v;\n}\n\n// name is base64 encoded utf-8\nfunction toName(data: Uint32Array): string {\n  if (typeof Buffer !== 'undefined') {\n    return Buffer.from(toStr(data), 'base64').toString();\n  }\n  const bs = atob(toStr(data));\n  const b = new Uint8Array(bs.length);\n  for (let i = 0; i < b.length; ++i) {\n    b[i] = bs.charCodeAt(i);\n  }\n  return new TextDecoder().decode(b);\n}\n\nconst DECODERS: {[key: string]: (v: Uint32Array) => number | string} = {\n  inline: toInt,\n  size: toInt,\n  name: toName,\n  width: toSize,\n  height: toSize,\n  preserveAspectRatio: toInt\n};\n\n\n// sequence type markers\n// File\nconst FILE_MARKER = [70, 105, 108, 101];\n// MultipartFile\nconst MULTIPARTFILE_MARKER = [77, 117, 108, 116, 105, 112, 97, 114, 116, 70, 105, 108, 101];\n// FilePart\nconst FILEPART_MARKER = [70, 105, 108, 101, 80, 97, 114, 116];\n// FileEnd\nconst FILEEND_MARKER = [70, 105, 108, 101, 69, 110, 100];\n// ReportCellSize\nconst REPORTCELLSIZE_MARKER = [82, 101, 112, 111, 114, 116, 67, 101, 108, 108, 83, 105, 122, 101];\n\n// max allowed chars for sequence header\nconst MAX_FIELDCHARS = 1024;\n\n\nexport class HeaderParser {\n  public state: HeaderState = HeaderState.START;\n  private _buffer = new Uint32Array(MAX_FIELDCHARS);\n  private _position = 0;\n  private _key = '';\n  public fields: {[key: string]: number | string | Uint32Array | null | undefined} = {};\n\n  public reset(): void {\n    this._buffer.fill(0);\n    this.state = HeaderState.START;\n    this._position = 0;\n    this.fields = {};\n    this._key = '';\n  }\n\n  public end(): number {\n    if (this.state === HeaderState.START) {\n      if (this._position === FILEEND_MARKER.length) {\n        for (let k = 0; k < FILEEND_MARKER.length; ++k) {\n          if (this._buffer[k] !== FILEEND_MARKER[k]) return this._a();\n        }\n        this.fields['type'] = SequenceType.FILEEND;\n        this.state = HeaderState.END;\n        return 0;\n      }\n      if (this._position === REPORTCELLSIZE_MARKER.length) {\n        for (let k = 0; k < REPORTCELLSIZE_MARKER.length; ++k) {\n          if (this._buffer[k] !== REPORTCELLSIZE_MARKER[k]) return this._a();\n        }\n        this.fields['type'] = SequenceType.REPORTCELLSIZE;\n        this.state = HeaderState.END;\n        return 0;\n      }\n      return this._a();\n    }\n    if (this.state === HeaderState.END) return 0;\n    if (this.state === HeaderState.VALUE\n      && this.fields.type === SequenceType.MULTIPARTFILE\n    ) {\n      if (!this._storeValue(this._position)) return this._a();\n      this.state = HeaderState.END;\n      return 0;\n    }\n    return this._a();\n  }\n\n  public parse(data: Uint32Array, start: number, end: number): number {\n    let state = this.state;\n    let pos = this._position;\n    const buffer = this._buffer;\n    if (state === HeaderState.ABORT || state === HeaderState.END) return -1;\n    if (state === HeaderState.START && pos > 14) return -1;\n    for (let i = start; i < end; ++i) {\n      const c = data[i];\n      switch (c) {\n        case 59: // ;\n          if (!this._storeValue(pos)) return this._a();\n          state = HeaderState.KEY;\n          pos = 0;\n          break;\n        case 61: // =\n          if (state === HeaderState.START) {\n            if (buffer[0] === 70) {\n              // 'File' or 'FilePart'\n              let k = 0;\n              for (; k < FILE_MARKER.length; ++k) {\n                if (buffer[k] !== FILE_MARKER[k]) return this._a();\n              }\n              this.fields['type'] = SequenceType.FILE;\n              if (pos === FILEPART_MARKER.length) {\n                for (; k < FILEPART_MARKER.length; ++k) {\n                  if (buffer[k] !== FILEPART_MARKER[k]) return this._a();\n                }\n                this.fields['type'] = SequenceType.FILEPART;\n                this.state = HeaderState.END;\n                return i + 1;\n              }\n            } else if (buffer[0] === 77) {\n              // 'MultipartFile'\n              for (let k = 0; k < MULTIPARTFILE_MARKER.length; ++k) {\n                if (buffer[k] !== MULTIPARTFILE_MARKER[k]) return this._a();\n              }\n              this.fields['type'] = SequenceType.MULTIPARTFILE;\n            } else {\n              return this._a();\n            }\n            state = HeaderState.KEY;\n            pos = 0;\n          } else if (state === HeaderState.KEY) {\n            if (!this._storeKey(pos)) return this._a();\n            state = HeaderState.VALUE;\n            pos = 0;\n          } else if (state === HeaderState.VALUE) {\n            if (pos >= MAX_FIELDCHARS) return this._a();\n            buffer[pos++] = c;\n          }\n          break;\n        case 58: // :\n          if (state === HeaderState.VALUE) {\n            if (!this._storeValue(pos)) return this._a();\n          }\n          this.state = HeaderState.END;\n          return i + 1;\n        default:\n          if (pos >= MAX_FIELDCHARS) return this._a();\n          buffer[pos++] = c;\n      }\n    }\n    this.state = state;\n    this._position = pos;\n    return -2;\n  }\n\n  private _a(): number {\n    this.fields.type = SequenceType.INVALID;\n    this.state = HeaderState.ABORT;\n    return -1;\n  }\n\n  private _storeKey(pos: number): boolean {\n    const k = toStr(this._buffer.subarray(0, pos));\n    if (k) {\n      this._key = k;\n      this.fields[k] = null;\n      return true;\n    }\n    return false;\n  }\n\n  private _storeValue(pos: number): boolean {\n    if (this._key) {\n      try {\n        const v = this._buffer.slice(0, pos);\n        this.fields[this._key] = DECODERS[this._key] ? DECODERS[this._key](v) : v;\n      } catch {\n        return false;\n      }\n      return true;\n    }\n    return false;\n  }\n}\n","/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IAddImageOpts } from './Types';\nimport { ImageStorage } from './ImageStorage';\n\n/**\n * IIP (iTerm Image Protocol) specific image storage controller.\n *\n * Wraps the shared ImageStorage with IIP protocol semantics:\n * - Always uses scrolling mode (cursor advances with image)\n */\nexport class IIPImageStorage {\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };\n  constructor(\n    private readonly _storage: ImageStorage\n  ) {}\n\n  /**\n   * Add an IIP image to storage.\n   * Always uses scrolling mode — cursor advances past the image.\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap): void {\n    this._storage.addImage(img, this._addImageOpts);\n  }\n}\n","/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n\nexport type ImageType = 'image/png' | 'image/jpeg' | 'image/gif' | 'image/qoi' | 'image/webp' | 'image/avif' | 'unsupported' | '';\n\nexport interface IMetrics {\n  mime: ImageType;\n  width: number;\n  height: number;\n}\n\nexport const UNSUPPORTED_TYPE: IMetrics = {\n  mime: 'unsupported',\n  width: 0,\n  height: 0\n};\n\nexport function imageType(d: Uint8Array): IMetrics {\n  if (d.length < 32) {\n    return UNSUPPORTED_TYPE;\n  }\n  const d32 = new Uint32Array(d.buffer, d.byteOffset, 8);\n  // PNG: 89 50 4E 47 0D 0A 1A 0A (8 first bytes == magic number for PNG)\n  // + first chunk must be IHDR\n  if (d32[0] === 0x474E5089 && d32[1] === 0x0A1A0A0D && d32[3] === 0x52444849) {\n    return {\n      mime: 'image/png',\n      width:  d[16] << 24 | d[17] << 16 | d[18] << 8 | d[19],\n      height: d[20] << 24 | d[21] << 16 | d[22] << 8 | d[23]\n    };\n  }\n  // JPEG: FF D8 FF\n  if (d[0] === 0xFF && d[1] === 0xD8 && d[2] === 0xFF) {\n    const [width, height] = jpgSize(d);\n    return { mime: 'image/jpeg', width, height };\n  }\n  // GIF: GIF87a or GIF89a\n  if (d32[0] === 0x38464947 && (d[4] === 0x37 || d[4] === 0x39) && d[5] === 0x61) {\n    return {\n      mime: 'image/gif',\n      width:  d[7] << 8 | d[6],\n      height: d[9] << 8 | d[8]\n    };\n  }\n  // QOI: qoif\n  if (d32[0] === 0x66696F71) {\n    return {\n      mime: 'image/qoi',\n      width:  d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7],\n      height: d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11]\n    };\n  }\n  // WEBP: RIFF | xxxx | WEBP | VP8x\n  if (d32[0] === 0x46464952 && d32[2] === 0x50424557 && (d32[3] & 0xFFFFFF) === 0x385056) {\n    switch (d[15]) {\n      case 0x58:  // Extended WebP VP8X --> \"X\"\n        return {\n          mime: 'image/webp',\n          width:  (d[24] | d[25] << 8 | d[26] << 16) + 1,\n          height: (d[27] | d[28] << 8 | d[29] << 16) + 1\n        };\n      case 0x4C:  // Lossless WebP VP8L --> \"L\"\n        if (d[20] !== 0x2f) return UNSUPPORTED_TYPE;\n        const dim = d[21] | d[22] << 8 | d[23] << 16 | d[24] << 24;\n        return {\n          mime: 'image/webp',\n          width:  (dim        & 0x3FFF) + 1,\n          height: (dim >>> 14 & 0x3FFF) + 1\n        };\n      case 0x20:  // Lossy WebP VP8  --> \" \"\n        if (d[23] !== 0x9d || d[24] !== 0x01 || d[25] !== 0x2a) return UNSUPPORTED_TYPE;\n        return {\n          mime: 'image/webp',\n          width:  (d[26] | d[27] << 8) & 0x3FFF,\n          height: (d[28] | d[29] << 8) & 0x3FFF\n        };\n    }\n    return UNSUPPORTED_TYPE;\n  }\n  // AVIF: Box size | ftyp | avif/avis\n  if (d32[1] === 0x70797466 && (d32[2] === 0x66697661 || d32[2] === 0x73697661)) {\n    let pos = -1;\n    // search for ispe box within first 1024 bytes\n    const limit = Math.min(d.length - 16, 1024);\n    for (let i = 8; i < limit; i++) {\n      // scan for ispe\n      if (d[i] === 0x69 && d[i + 1] === 0x73 && d[i + 2] === 0x70 && d[i + 3] === 0x65) {\n        pos = i;\n        break;\n      }\n    }\n    if (pos !== -1) {\n      // dimensions are in BE at +8 (width) at +12 (height)\n      const width =\n        d[pos +  8] << 24 |\n        d[pos +  9] << 16 |\n        d[pos + 10] <<  8 |\n        d[pos + 11];\n      const height =\n        d[pos + 12] << 24 |\n        d[pos + 13] << 16 |\n        d[pos + 14] <<  8 |\n        d[pos + 15];\n      if (width > 0 && height > 0) {\n        return { mime: 'image/avif', width, height };\n      }\n    }\n    return UNSUPPORTED_TYPE;\n  }\n  return UNSUPPORTED_TYPE;\n}\n\n\nfunction jpgSize(d: Uint8Array): [number, number] {\n  const len = d.length;\n  let i = 4;\n  let blockLength = d[i] << 8 | d[i + 1];\n  while (true) {\n    i += blockLength;\n    if (i >= len) {\n      // exhausted without size info\n      return [0, 0];\n    }\n    if (d[i] !== 0xFF) {\n      return [0, 0];\n    }\n    if (d[i + 1] === 0xC0 || d[i + 1] === 0xC2) {\n      if (i + 8 < len) {\n        return [\n          d[i + 7] << 8 | d[i + 8],\n          d[i + 5] << 8 | d[i + 6]\n        ];\n      }\n      return [0, 0];\n    }\n    i += 2;\n    blockLength = d[i] << 8 | d[i + 1];\n  }\n}\n","/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { toRGBA8888 } from 'sixel/lib/Colors';\nimport { IDisposable } from '@xterm/xterm';\nimport { ICellSize, ImageLayer, ITerminalExt, IImageSpec, IRenderDimensions, IRenderService } from './Types';\nimport { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';\n\nconst enum Constants {\n  PLACEHOLDER_LENGTH = 4096,\n  PLACEHOLDER_HEIGHT = 24\n}\n\n/**\n * ImageRenderer - terminal frontend extension:\n * - provide primitives for canvas, ImageData, Bitmap (static)\n * - add canvas layer to DOM (browser only for now)\n * - draw image tiles onRender\n */\nexport class ImageRenderer extends Disposable implements IDisposable {\n  /** @deprecated Kept for backward compat — points to top layer canvas. */\n  public get canvas(): HTMLCanvasElement | undefined { return this._layers.get('top')?.canvas; }\n  private _layers = new Map<ImageLayer, CanvasRenderingContext2D>();\n  private _placeholder: HTMLCanvasElement | undefined;\n  private _placeholderBitmap: ImageBitmap | undefined;\n  private _optionsRefresh = this._register(new MutableDisposable());\n  private _oldOpen: ((parent: HTMLElement) => void) | undefined;\n  private _renderService: IRenderService | undefined;\n  private _oldSetRenderer: ((renderer: any) => void) | undefined;\n\n  // drawing primitive - canvas\n  public static createCanvas(localDocument: Document | undefined, width: number, height: number): HTMLCanvasElement {\n    /**\n     * NOTE: We normally dont care, from which document the canvas\n     * gets created, so we can fall back to global document,\n     * if the terminal has no document associated yet.\n     * This way early image loads before calling .open keep working\n     * (still discouraged though, as the metrics will be screwed up).\n     * Only the DOM output canvas should be on the terminal's document,\n     * which gets explicitly checked in `insertLayerToDom`.\n     */\n    const canvas = (localDocument ?? document).createElement('canvas');\n    canvas.width = width | 0;\n    canvas.height = height | 0;\n    return canvas;\n  }\n\n  // drawing primitive - ImageData with optional buffer\n  public static createImageData(ctx: CanvasRenderingContext2D, width: number, height: number, buffer?: ArrayBuffer): ImageData {\n    if (typeof ImageData !== 'function') {\n      const imgData = ctx.createImageData(width, height);\n      if (buffer) {\n        imgData.data.set(new Uint8ClampedArray(buffer, 0, width * height * 4));\n      }\n      return imgData;\n    }\n    return buffer\n      ? new ImageData(new Uint8ClampedArray(buffer, 0, width * height * 4), width, height)\n      : new ImageData(width, height);\n  }\n\n  // drawing primitive - ImageBitmap\n  public static createImageBitmap(img: ImageBitmapSource): Promise<ImageBitmap | undefined> {\n    if (typeof createImageBitmap !== 'function') {\n      return Promise.resolve(undefined);\n    }\n    return createImageBitmap(img);\n  }\n\n\n  constructor(private _terminal: ITerminalExt) {\n    super();\n    this._oldOpen = this._terminal._core.open;\n    this._terminal._core.open = (parent: HTMLElement): void => {\n      this._oldOpen?.call(this._terminal._core, parent);\n      this._open();\n    };\n    if (this._terminal._core.screenElement) {\n      this._open();\n    }\n    // hack to spot fontSize changes\n    this._optionsRefresh.value = this._terminal._core.optionsService.onOptionChange(option => {\n      if (option === 'fontSize') {\n        this.rescaleCanvas();\n        this._renderService?.refreshRows(0, this._terminal.rows);\n      }\n    });\n    this._register(toDisposable(() => {\n      this.removeLayerFromDom();\n      this.removeLayerFromDom('bottom');\n      if (this._terminal._core && this._oldOpen) {\n        this._terminal._core.open = this._oldOpen;\n        this._oldOpen = undefined;\n      }\n      if (this._renderService && this._oldSetRenderer) {\n        this._renderService.setRenderer = this._oldSetRenderer;\n        this._oldSetRenderer = undefined;\n      }\n      this._renderService = undefined;\n      this._layers.clear();\n      this._placeholderBitmap?.close();\n      this._placeholderBitmap = undefined;\n      this._placeholder = undefined;\n    }));\n  }\n\n  /**\n   * Enable the placeholder.\n   */\n  public showPlaceholder(value: boolean): void {\n    if (value) {\n      if (!this._placeholder && this.cellSize.height !== -1) {\n        this._createPlaceHolder(Math.max(this.cellSize.height + 1, Constants.PLACEHOLDER_HEIGHT));\n      }\n    } else {\n      this._placeholderBitmap?.close();\n      this._placeholderBitmap = undefined;\n      this._placeholder = undefined;\n    }\n    this._renderService?.refreshRows(0, this._terminal.rows);\n  }\n\n  /**\n   * Dimensions of the terminal.\n   * Forwarded from internal render service.\n   */\n  public get dimensions(): IRenderDimensions | undefined {\n    return this._terminal.dimensions;\n  }\n\n  /**\n   * Current cell size (float).\n   */\n  public get cellSize(): ICellSize {\n    return {\n      width: this.dimensions?.css.cell.width || -1,\n      height: this.dimensions?.css.cell.height || -1\n    };\n  }\n\n  /**\n   * Clear a region of the image layer canvas.\n   */\n  public clearLines(start: number, end: number, layer?: ImageLayer): void {\n    const y = start * (this.dimensions?.css.cell.height || 0);\n    const w = this.dimensions?.css.canvas.width || 0;\n    const h = (end + 1 - start) * (this.dimensions?.css.cell.height || 0);\n    if (!layer || layer === 'top') {\n      this._layers.get('top')?.clearRect(0, y, w, h);\n    }\n    if (!layer || layer === 'bottom') {\n      this._layers.get('bottom')?.clearRect(0, y, w, h);\n    }\n  }\n\n  /**\n   * Clear whole image canvas.\n   */\n  public clearAll(layer?: ImageLayer): void {\n    if (!layer || layer === 'top') {\n      const ctx = this._layers.get('top');\n      ctx?.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);\n    }\n    if (!layer || layer === 'bottom') {\n      const ctx = this._layers.get('bottom');\n      ctx?.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);\n    }\n  }\n\n  /**\n   * Draw neighboring tiles on the image layer canvas.\n   */\n  public draw(imgSpec: IImageSpec, tileId: number, col: number, row: number, count: number = 1): void {\n    const ctx = this._layers.get(imgSpec.layer);\n    if (!ctx) {\n      return;\n    }\n    const { width, height } = this.cellSize;\n\n    // Don't try to draw anything, if we cannot get valid renderer metrics.\n    if (width === -1 || height === -1) {\n      return;\n    }\n\n    this._rescaleImage(imgSpec, width, height);\n    const img = imgSpec.actual!;\n    const { width: sourceWidth, height: sourceHeight } = imgSpec.actualCellSize;\n    const cols = Math.ceil(img.width / sourceWidth);\n\n    const sx = (tileId % cols) * sourceWidth;\n    const sy = Math.floor(tileId / cols) * sourceHeight;\n    const dx = col * width;\n    const dy = row * height;\n\n    // safari bug: never access image source out of bounds\n    const finalWidth = count * sourceWidth + sx > img.width ? img.width - sx : count * sourceWidth;\n    const finalHeight = sy + sourceHeight > img.height ? img.height - sy : sourceHeight;\n\n    // Floor all pixel offsets to get stable tile mapping without any overflows.\n    // Note: For not pixel perfect aligned cells like in the DOM renderer\n    // this will move a tile slightly to the top/left (subpixel range, thus ignore it).\n    // FIX #34: avoid striping on displays with pixelDeviceRatio != 1 by ceiling height and width\n    ctx.drawImage(\n      img,\n      Math.floor(sx), Math.floor(sy), Math.ceil(finalWidth), Math.ceil(finalHeight),\n      Math.floor(dx), Math.floor(dy), Math.ceil(finalWidth * width / sourceWidth), Math.ceil(finalHeight * height / sourceHeight)\n    );\n  }\n\n  /**\n   * Extract a single tile from an image.\n   */\n  public extractTile(imgSpec: IImageSpec, tileId: number): HTMLCanvasElement | undefined {\n    const { width, height } = this.cellSize;\n    // Don't try to draw anything, if we cannot get valid renderer metrics.\n    if (width === -1 || height === -1) {\n      return;\n    }\n    this._rescaleImage(imgSpec, width, height);\n    const img = imgSpec.actual!;\n    const { width: sourceWidth, height: sourceHeight } = imgSpec.actualCellSize;\n    const cols = Math.ceil(img.width / sourceWidth);\n    const sx = (tileId % cols) * sourceWidth;\n    const sy = Math.floor(tileId / cols) * sourceHeight;\n    const finalWidth = sourceWidth + sx > img.width ? img.width - sx : sourceWidth;\n    const finalHeight = sy + sourceHeight > img.height ? img.height - sy : sourceHeight;\n\n    const canvas = ImageRenderer.createCanvas(this.document, Math.ceil(finalWidth * width / sourceWidth), Math.ceil(finalHeight * height / sourceHeight));\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      ctx.drawImage(\n        img,\n        Math.floor(sx), Math.floor(sy), Math.floor(finalWidth), Math.floor(finalHeight),\n        0, 0, canvas.width, canvas.height\n      );\n      return canvas;\n    }\n  }\n\n  /**\n   * Draw a line with placeholder on the image layer canvas.\n   */\n  public drawPlaceholder(col: number, row: number, count: number = 1): void {\n    const ctx = this._layers.get('top');\n    if (ctx) {\n      const { width, height } = this.cellSize;\n\n      // Don't try to draw anything, if we cannot get valid renderer metrics.\n      if (width === -1 || height === -1) {\n        return;\n      }\n\n      if (!this._placeholder) {\n        this._createPlaceHolder(Math.max(height + 1, Constants.PLACEHOLDER_HEIGHT));\n      } else if (height >= this._placeholder!.height) {\n        this._createPlaceHolder(height + 1);\n      }\n      if (!this._placeholder) return;\n      ctx.drawImage(\n        this._placeholderBitmap ?? this._placeholder!,\n        col * width,\n        (row * height) % 2 ? 0 : 1,  // needs %2 offset correction\n        width * count,\n        height,\n        col * width,\n        row * height,\n        width * count,\n        height\n      );\n    }\n  }\n\n  /**\n   * Rescale image layer canvas if needed.\n   * Checked once from `ImageStorage.render`.\n   */\n  public rescaleCanvas(): void {\n    const w = this.dimensions?.css.canvas.width || 0;\n    const h = this.dimensions?.css.canvas.height || 0;\n    for (const ctx of this._layers.values()) {\n      if (ctx.canvas.width !== w || ctx.canvas.height !== h) {\n        ctx.canvas.width = w;\n        ctx.canvas.height = h;\n      }\n    }\n  }\n\n  /**\n   * Rescale image in storage if needed.\n   */\n  private _rescaleImage(spec: IImageSpec, currentWidth: number, currentHeight: number): void {\n    if (currentWidth === spec.actualCellSize.width && currentHeight === spec.actualCellSize.height) {\n      return;\n    }\n    const { width: originalWidth, height: originalHeight } = spec.origCellSize;\n    if (currentWidth === originalWidth && currentHeight === originalHeight) {\n      spec.actual = spec.orig;\n      spec.actualCellSize.width = originalWidth;\n      spec.actualCellSize.height = originalHeight;\n      return;\n    }\n    const scaledWidth = Math.ceil(spec.orig!.width * currentWidth / originalWidth);\n    const scaledHeight = Math.ceil(spec.orig!.height * currentHeight / originalHeight);\n    // Upscale visible tiles directly; a full zoomed copy can dwarf the image budget.\n    if (scaledWidth * scaledHeight > spec.orig!.width * spec.orig!.height) {\n      spec.actual = spec.orig;\n      spec.actualCellSize.width = originalWidth;\n      spec.actualCellSize.height = originalHeight;\n      return;\n    }\n    const canvas = ImageRenderer.createCanvas(this.document, scaledWidth, scaledHeight);\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      ctx.drawImage(spec.orig!, 0, 0, canvas.width, canvas.height);\n      spec.actual = canvas;\n      spec.actualCellSize.width = currentWidth;\n      spec.actualCellSize.height = currentHeight;\n    }\n  }\n\n  /**\n   * Lazy init for the renderer.\n   */\n  private _open(): void {\n    this._renderService = this._terminal._core._renderService;\n    this._oldSetRenderer = this._renderService.setRenderer.bind(this._renderService);\n    this._renderService.setRenderer = (renderer: any) => {\n      for (const key of [...this._layers.keys()]) {\n        this.removeLayerFromDom(key);\n      }\n      this._oldSetRenderer?.call(this._renderService, renderer);\n    };\n  }\n\n  public insertLayerToDom(layer: ImageLayer = 'top'): void {\n    // make sure that the terminal is attached to a document and to DOM\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(layer)) {\n      return;\n    }\n    const canvas = ImageRenderer.createCanvas(\n      this.document, this.dimensions?.css.canvas.width || 0,\n      this.dimensions?.css.canvas.height || 0\n    );\n    canvas.classList.add(`xterm-image-layer-${layer}`);\n    const screenElement = this._terminal._core.screenElement;\n    // Use isolation to create a stacking context without overriding z-index,\n    // which would conflict with integrators (e.g. VS Code) that set their\n    // own z-index on the screen element.\n    screenElement.style.isolation = 'isolate';\n    if (layer === 'bottom') {\n      // Use z-index:-1 so it paints behind non-positioned text elements.\n      // The screen element needs to be a stacking context (via isolation)\n      // to contain the negative z-index, otherwise it would go behind the\n      // entire terminal.\n      canvas.style.zIndex = '-1';\n      screenElement.insertBefore(canvas, screenElement.firstChild);\n    } else {\n      // Explicit z-index ensures the image canvas reliably stacks above\n      // the text layer (DOM renderer rows). z-index: 0 is below the\n      // selection overlay (z-index: 1).\n      canvas.style.zIndex = '0';\n      screenElement.appendChild(canvas);\n    }\n    const ctx = canvas.getContext('2d', { alpha: true });\n    if (!ctx) {\n      canvas.remove();\n      return;\n    }\n    this._layers.set(layer, ctx);\n    this.clearAll(layer);\n  }\n\n  public removeLayerFromDom(layer: ImageLayer = 'top'): void {\n    const ctx = this._layers.get(layer);\n    if (ctx) {\n      ctx.canvas.remove();\n      this._layers.delete(layer);\n    }\n  }\n\n  public hasLayer(layer: ImageLayer): boolean {\n    return this._layers.has(layer);\n  }\n\n  private _createPlaceHolder(height: number = Constants.PLACEHOLDER_HEIGHT): void {\n    this._placeholderBitmap?.close();\n    this._placeholderBitmap = undefined;\n\n    // create blueprint to fill placeholder with\n    const bWidth = 32;  // must be 2^n\n    const blueprint = ImageRenderer.createCanvas(this.document, bWidth, height);\n    const ctx = blueprint.getContext('2d', { alpha: false });\n    if (!ctx) return;\n    const imgData = ImageRenderer.createImageData(ctx, bWidth, height);\n    const d32 = new Uint32Array(imgData.data.buffer);\n    const black = toRGBA8888(0, 0, 0);\n    const white = toRGBA8888(255, 255, 255);\n    d32.fill(black);\n    for (let y = 0; y < height; ++y) {\n      const shift = y % 2;\n      const offset = y * bWidth;\n      for (let x = 0; x < bWidth; x += 2) {\n        d32[offset + x + shift] = white;\n      }\n    }\n    ctx.putImageData(imgData, 0, 0);\n\n    // create placeholder line, width aligned to blueprint width\n    const width = (screen.width + bWidth - 1) & ~(bWidth - 1) || Constants.PLACEHOLDER_LENGTH;\n    this._placeholder = ImageRenderer.createCanvas(this.document, width, height);\n    const ctx2 = this._placeholder.getContext('2d', { alpha: false });\n    if (!ctx2) {\n      this._placeholder = undefined;\n      return;\n    }\n    for (let i = 0; i < width; i += bWidth) {\n      ctx2.drawImage(blueprint, i, 0);\n    }\n    const placeholder = this._placeholder;\n    ImageRenderer.createImageBitmap(placeholder).then(bitmap => {\n      if (this._placeholder !== placeholder) bitmap?.close();\n      else this._placeholderBitmap = bitmap;\n    }).catch(() => {});\n  }\n\n  public get document(): Document | undefined {\n    return this._terminal._core._coreBrowserService?.window.document;\n  }\n}\n","/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { ImageRenderer } from './ImageRenderer';\nimport {\n  ITerminalExt, IExtendedAttrsImage, IImageAddonOptions, IImageSpec,\n  IBufferLineExt, BgFlags, Cell, Content, ICellSize, ExtFlags, Attributes,\n  UnderlineStyle, IAddImageOpts\n} from './Types';\n\n\n// fallback default cell size\nexport const CELL_SIZE_DEFAULT: ICellSize = {\n  width: 7,\n  height: 14\n};\n\n/**\n * Extend extended attribute to also hold image tile information.\n *\n * Object definition is copied from base repo to fully mimick its behavior.\n * Image data is added as additional public properties `imageId` and `tileId`.\n */\nclass ExtendedAttrsImage implements IExtendedAttrsImage {\n  private _ext: number = 0;\n  public get ext(): number {\n    if (this._urlId) {\n      return (\n        (this._ext & ~ExtFlags.UNDERLINE_STYLE) |\n        (this.underlineStyle << 26)\n      );\n    }\n    return this._ext;\n  }\n  public set ext(value: number) { this._ext = value; }\n\n  public get underlineStyle(): UnderlineStyle {\n    // Always return the URL style if it has one\n    if (this._urlId) {\n      return UnderlineStyle.DASHED;\n    }\n    return (this._ext & ExtFlags.UNDERLINE_STYLE) >> 26;\n  }\n  public set underlineStyle(value: UnderlineStyle) {\n    this._ext &= ~ExtFlags.UNDERLINE_STYLE;\n    this._ext |= (value << 26) & ExtFlags.UNDERLINE_STYLE;\n  }\n\n  public get underlineColor(): number {\n    return this._ext & (Attributes.CM_MASK | Attributes.RGB_MASK);\n  }\n  public set underlineColor(value: number) {\n    this._ext &= ~(Attributes.CM_MASK | Attributes.RGB_MASK);\n    this._ext |= value & (Attributes.CM_MASK | Attributes.RGB_MASK);\n  }\n\n  public get underlineVariantOffset(): number {\n    const val = (this._ext & ExtFlags.VARIANT_OFFSET) >> 29;\n    if (val < 0) {\n      return val ^ 0xFFFFFFF8;\n    }\n    return val;\n  }\n  public set underlineVariantOffset(value: number) {\n    this._ext &= ~ExtFlags.VARIANT_OFFSET;\n    this._ext |= (value << 29) & ExtFlags.VARIANT_OFFSET;\n  }\n\n  private _urlId: number = 0;\n  public get urlId(): number {\n    return this._urlId;\n  }\n  public set urlId(value: number) {\n    this._urlId = value;\n  }\n\n  constructor(\n    ext: number = 0,\n    urlId: number = 0,\n    public imageId = -1,\n    public tileId = -1\n  ) {\n    this._ext = ext;\n    this._urlId = urlId;\n  }\n\n  public clone(): IExtendedAttrsImage {\n    /**\n     * Technically we dont need a clone variant of ExtendedAttrsImage,\n     * as we never clone a cell holding image data.\n     * Note: Clone is only meant to be used by the InputHandler for\n     * sticky attributes, which is never the case for image data.\n     * We still provide a proper clone method to reflect the full ext attr\n     * state in case there are future use cases for clone.\n     */\n    return new ExtendedAttrsImage(this._ext, this._urlId, this.imageId, this.tileId);\n  }\n\n  public isEmpty(): boolean {\n    return this.underlineStyle === UnderlineStyle.NONE && this._urlId === 0 && this.imageId === -1;\n  }\n}\nconst EMPTY_ATTRS = new ExtendedAttrsImage();\n\n\n/**\n * ImageStorage - extension of CoreTerminal:\n * - hold image data\n * - write/read image data to/from buffer\n *\n * TODO: image composition for overwrites\n */\nexport class ImageStorage implements IDisposable {\n  // storage\n  private _images: Map<number, IImageSpec> = new Map();\n  // last used id\n  private _lastId = 0;\n  // last evicted id\n  private _lowestId = 0;\n  // whether a full clear happened before\n  private _fullyCleared = false;\n  // whether render should do a full clear\n  private _needsFullClear = false;\n  // hard limit of stored pixels (fallback limit of 10 MB)\n  private _pixelLimit: number = 2500000;\n\n  private _viewportMetrics: { cols: number, rows: number };\n  public onImageAdded: (() => void) | undefined;\n  public onImageDeleted: ((storageId: number) => void) | undefined;\n\n  constructor(\n    private _terminal: ITerminalExt,\n    private _renderer: ImageRenderer,\n    private _opts: IImageAddonOptions\n  ) {\n    try {\n      this.setLimit(this._opts.storageLimit);\n    } catch (e: unknown) {\n      if (e instanceof Error) {\n        console.error(e.message);\n      }\n      console.warn(`storageLimit is set to ${this.getLimit()} MB`);\n    }\n    this._viewportMetrics = {\n      cols: this._terminal.cols,\n      rows: this._terminal.rows\n    };\n  }\n\n  public dispose(): void {\n    this.reset();\n  }\n\n  public reset(): void {\n    for (const spec of this._images.values()) {\n      spec.marker?.dispose();\n    }\n    // NOTE: marker.dispose above already calls ImageBitmap.close\n    // therefore we can just wipe the map here\n    this._images.clear();\n    this._renderer.clearAll();\n  }\n\n  public getLimit(): number {\n    return this._pixelLimit * 4 / 1000000;\n  }\n\n  public setLimit(value: number): void {\n    if (value < 0.5 || value > 1000) {\n      throw RangeError('invalid storageLimit, should be at least 0.5 MB and not exceed 1G');\n    }\n    this._pixelLimit = (value / 4 * 1000000) >>> 0;\n    this._evictOldest(0);\n  }\n\n  public getUsage(): number {\n    return this._getStoredPixels() * 4 / 1000000;\n  }\n\n  private _getStoredPixels(): number {\n    let storedPixels = 0;\n    for (const spec of this._images.values()) {\n      if (spec.orig) {\n        storedPixels += spec.orig.width * spec.orig.height;\n        if (spec.actual && spec.actual !== spec.orig) {\n          storedPixels += spec.actual.width * spec.actual.height;\n        }\n      }\n    }\n    return storedPixels;\n  }\n\n  private _delImg(id: number): void {\n    const spec = this._images.get(id);\n    if (!spec) return;\n    this._images.delete(id);\n    // FIXME: really ugly workaround to get bitmaps deallocated :(\n    if (window.ImageBitmap && spec.orig instanceof ImageBitmap) {\n      spec.orig.close();\n    }\n    this.onImageDeleted?.(id);\n  }\n\n  /**\n   * Wipe canvas and images on alternate buffer.\n   */\n  public wipeAlternate(): void {\n    // remove all alternate tagged images\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.bufferType === 'alternate') {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n    // mark canvas to be wiped on next render\n    this._needsFullClear = true;\n    this._fullyCleared = false;\n  }\n\n  /**\n   * Delete an image by its internal storage ID.\n   * Used by protocols that support explicit deletion (e.g. Kitty a=d).\n   */\n  public deleteImage(id: number): void {\n    const spec = this._images.get(id);\n    if (spec) {\n      spec.marker?.dispose();\n      this._delImg(id);\n    }\n  }\n\n  /**\n   * Method to add an image to the storage.\n   * @param img - The image to add (canvas or bitmap).\n   * @param opts - Options for addImage:\n   *   - scrolling:  When true, cursor advances with the image.\n   *                 When false, image is placed at ORIGIN and cursor does not move.\n   *   - layer:      Which canvas layer to render on ('top' or 'bottom').\n   *   - zIndex:     Z-index for image layering within the same layer.\n   *   - cursorPos:  'vt340' for bottom-left, 'iip' for bottom.right.\n   * @returns The internal image ID assigned to the stored image.\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap, opts: IAddImageOpts): number {\n    // never allow storage to exceed memory limit\n    this._evictOldest(img.width * img.height);\n\n    // calc rows x cols needed to display the image\n    let cellSize = this._renderer.cellSize;\n    if (cellSize.width === -1 || cellSize.height === -1) {\n      cellSize = CELL_SIZE_DEFAULT;\n    }\n    const cols = Math.ceil(img.width / cellSize.width);\n    const rows = Math.ceil(img.height / cellSize.height);\n\n    const imageId = ++this._lastId;\n\n    const buffer = this._terminal._core.buffer;\n    const termCols = this._terminal.cols;\n    const termRows = this._terminal.rows;\n    const originX = buffer.x;\n    const originY = buffer.y;\n    let offset = originX;\n    let tileCount = 0;\n\n    if (!opts.scrolling) {\n      buffer.x = 0;\n      buffer.y = 0;\n      offset = 0;\n    }\n\n    this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);\n    for (let row = 0; row < rows; ++row) {\n      const line = buffer.lines.get(buffer.y + buffer.ybase);\n      for (let col = 0; col < cols; ++col) {\n        if (offset + col >= termCols) break;\n        this._writeToCell(line as IBufferLineExt, offset + col, imageId, row * cols + col);\n        tileCount++;\n      }\n      if (opts.scrolling) {\n        if (row < rows - 1) this._terminal._core._inputHandler.lineFeed();\n      } else {\n        if (++buffer.y >= termRows) break;\n      }\n      buffer.x = offset;\n    }\n    this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);\n\n    // cursor positioning modes\n    if (opts.scrolling) {\n      if (opts.cursorPos === 'iip') {\n        buffer.x = Math.min(offset + cols, termCols);\n      } else {\n        buffer.x = offset;\n      }\n    } else {\n      buffer.x = originX;\n      buffer.y = originY;\n    }\n\n    // deleted images with zero tile count\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.tileCount < 1) {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n\n    // eviction marker:\n    // delete the image when the marker gets disposed\n    const endMarker = this._terminal.registerMarker(0);\n    endMarker?.onDispose(() => {\n      const spec = this._images.get(imageId);\n      if (spec) {\n        this._delImg(imageId);\n      }\n    });\n\n    // since markers do not work on alternate for some reason,\n    // we evict images here manually\n    if (this._terminal.buffer.active.type === 'alternate') {\n      this._evictOnAlternate();\n    }\n\n    // create storage entry\n    const imgSpec: IImageSpec = {\n      orig: img,\n      origCellSize: cellSize,\n      actual: img,\n      actualCellSize: { ...cellSize },  // clone needed, since later modified\n      marker: endMarker || undefined,\n      tileCount,\n      bufferType: this._terminal.buffer.active.type,\n      layer: opts.layer,\n      zIndex: opts.zIndex\n    };\n\n    // finally add the image\n    this._images.set(imageId, imgSpec);\n    this.onImageAdded?.();\n    return imageId;\n  }\n\n\n  /**\n   * Render method. Collects buffer information and triggers\n   * canvas updates.\n   */\n  // TODO: Should we move this to the ImageRenderer?\n  public render(range: { start: number, end: number }): void {\n    // Determine which layers have images\n    let hasTopImages = false;\n    let hasBottomImages = false;\n    for (const spec of this._images.values()) {\n      if (spec.layer === 'bottom') {\n        hasBottomImages = true;\n      } else {\n        hasTopImages = true;\n      }\n      if (hasTopImages && hasBottomImages) break;\n    }\n\n    // Lazily insert layers that are needed\n    if (hasTopImages && !this._renderer.hasLayer('top')) {\n      this._renderer.insertLayerToDom('top');\n      if (!this._renderer.hasLayer('top')) return;\n    }\n    if (hasBottomImages && !this._renderer.hasLayer('bottom')) {\n      this._renderer.insertLayerToDom('bottom');\n    }\n\n    // rescale if needed\n    this._renderer.rescaleCanvas();\n\n    // exit early if we dont have any images to test for\n    if (!this._images.size) {\n      if (!this._fullyCleared) {\n        this._renderer.clearAll();\n        this._fullyCleared = true;\n        this._needsFullClear = false;\n      }\n      if (this._renderer.hasLayer('top')) {\n        this._renderer.removeLayerFromDom('top');\n      }\n      if (this._renderer.hasLayer('bottom')) {\n        this._renderer.removeLayerFromDom('bottom');\n      }\n      return;\n    }\n\n    // Remove layers no longer needed\n    if (!hasTopImages && this._renderer.hasLayer('top')) {\n      this._renderer.clearAll('top');\n      this._renderer.removeLayerFromDom('top');\n    }\n    if (!hasBottomImages && this._renderer.hasLayer('bottom')) {\n      this._renderer.clearAll('bottom');\n      this._renderer.removeLayerFromDom('bottom');\n    }\n\n    // buffer switches force a full clear\n    if (this._needsFullClear) {\n      this._renderer.clearAll();\n      this._fullyCleared = true;\n      this._needsFullClear = false;\n    }\n\n    const { start, end } = range;\n    const buffer = this._terminal._core.buffer;\n    const cols = this._terminal._core.cols;\n\n    // clear drawing area\n    this._renderer.clearLines(start, end);\n\n    // Collect draw calls so we can sort by z-index (lower z drawn first).\n    const drawCalls: { imgSpec: IImageSpec, tileId: number, col: number, row: number, count: number }[] = [];\n    const placeholderCalls: { col: number, row: number, count: number }[] = [];\n\n    // walk all cells in viewport and collect tiles found\n    for (let row = start; row <= end; ++row) {\n      const line = buffer.lines.get(row + buffer.ydisp) as IBufferLineExt;\n      if (!line) return;\n      for (let col = 0; col < cols; ++col) {\n        if (line.getBg(col) & BgFlags.HAS_EXTENDED) {\n          let e: IExtendedAttrsImage = line._extendedAttrs[col] ?? EMPTY_ATTRS;\n          const imageId = e.imageId;\n          if (imageId === undefined || imageId === -1) {\n            continue;\n          }\n          const imgSpec = this._images.get(imageId);\n          if (e.tileId !== -1) {\n            const startTile = e.tileId;\n            const startCol = col;\n            let count = 1;\n            /**\n             * merge tiles to the right into a single draw call, if:\n             * - not at end of line\n             * - cell has same image id\n             * - cell has consecutive tile id\n             */\n            while (\n              ++col < cols\n              && (line.getBg(col) & BgFlags.HAS_EXTENDED)\n              && (e = line._extendedAttrs[col] ?? EMPTY_ATTRS)\n              && (e.imageId === imageId)\n              && (e.tileId === startTile + count)\n            ) {\n              count++;\n            }\n            col--;\n            if (imgSpec) {\n              if (imgSpec.actual) {\n                drawCalls.push({ imgSpec, tileId: startTile, col: startCol, row, count });\n              }\n            } else if (this._opts.showPlaceholder) {\n              placeholderCalls.push({ col: startCol, row, count });\n            }\n            this._fullyCleared = false;\n          }\n        }\n      }\n    }\n\n    // Sort by z-index so lower z draws first (higher z renders on top)\n    drawCalls.sort((a, b) => a.imgSpec.zIndex - b.imgSpec.zIndex);\n\n    // Draw placeholders first (lowest priority)\n    for (const call of placeholderCalls) {\n      this._renderer.drawPlaceholder(call.col, call.row, call.count);\n    }\n\n    // Draw images in z-index order\n    for (const call of drawCalls) {\n      this._renderer.draw(call.imgSpec, call.tileId, call.col, call.row, call.count);\n    }\n  }\n\n  public viewportResize(metrics: { cols: number, rows: number }): void {\n    // exit early if we have nothing in storage\n    if (!this._images.size) {\n      this._viewportMetrics = metrics;\n      return;\n    }\n\n    // handle only viewport width enlargements, exit all other cases\n    // TODO: needs patch for tile counter\n    if (this._viewportMetrics.cols >= metrics.cols) {\n      this._viewportMetrics = metrics;\n      return;\n    }\n\n    // walk scrollbuffer at old col width to find all possible expansion matches\n    const buffer = this._terminal._core.buffer;\n    const rows = buffer.lines.length;\n    const oldCol = this._viewportMetrics.cols - 1;\n    for (let row = 0; row < rows; ++row) {\n      const line = buffer.lines.get(row) as IBufferLineExt;\n      if (line.getBg(oldCol) & BgFlags.HAS_EXTENDED) {\n        const e: IExtendedAttrsImage = line._extendedAttrs[oldCol] ?? EMPTY_ATTRS;\n        const imageId = e.imageId;\n        if (imageId === undefined || imageId === -1) {\n          continue;\n        }\n        const imgSpec = this._images.get(imageId);\n        if (!imgSpec) {\n          continue;\n        }\n        // found an image tile at oldCol, check if it qualifies for right exapansion\n        const tilesPerRow = Math.ceil((imgSpec.actual?.width || 0) / imgSpec.actualCellSize.width);\n        if ((e.tileId % tilesPerRow) + 1 >= tilesPerRow) {\n          continue;\n        }\n        // expand only if right side is empty (nothing got wrapped from below)\n        let hasData = false;\n        for (let rightCol = oldCol + 1; rightCol > metrics.cols; ++rightCol) {\n          if (line._data[rightCol * Cell.SIZE + Cell.CONTENT] & Content.HAS_CONTENT_MASK) {\n            hasData = true;\n            break;\n          }\n        }\n        if (hasData) {\n          continue;\n        }\n        // do right expansion on terminal buffer\n        const end = Math.min(metrics.cols, tilesPerRow - (e.tileId % tilesPerRow) + oldCol);\n        let lastTile = e.tileId;\n        for (let expandCol = oldCol + 1; expandCol < end; ++expandCol) {\n          this._writeToCell(line as IBufferLineExt, expandCol, imageId, ++lastTile);\n          imgSpec.tileCount++;\n        }\n      }\n    }\n    // store new viewport metrics\n    this._viewportMetrics = metrics;\n  }\n\n  /**\n   * Retrieve original canvas at buffer position.\n   */\n  public getImageAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    const buffer = this._terminal._core.buffer;\n    const line = buffer.lines.get(y) as IBufferLineExt;\n    if (line && line.getBg(x) & BgFlags.HAS_EXTENDED) {\n      const e: IExtendedAttrsImage = line._extendedAttrs[x] ?? EMPTY_ATTRS;\n      if (e.imageId && e.imageId !== -1) {\n        const orig = this._images.get(e.imageId)?.orig;\n        if (window.ImageBitmap && orig instanceof ImageBitmap) {\n          const canvas = ImageRenderer.createCanvas(window.document, orig.width, orig.height);\n          canvas.getContext('2d')?.drawImage(orig, 0, 0, orig.width, orig.height);\n          return canvas;\n        }\n        return orig as HTMLCanvasElement;\n      }\n    }\n  }\n\n  /**\n   * Extract active single tile at buffer position.\n   */\n  public extractTileAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    const buffer = this._terminal._core.buffer;\n    const line = buffer.lines.get(y) as IBufferLineExt;\n    if (line && line.getBg(x) & BgFlags.HAS_EXTENDED) {\n      const e: IExtendedAttrsImage = line._extendedAttrs[x] ?? EMPTY_ATTRS;\n      if (e.imageId && e.imageId !== -1 && e.tileId !== -1) {\n        const spec = this._images.get(e.imageId);\n        if (spec) {\n          return this._renderer.extractTile(spec, e.tileId);\n        }\n      }\n    }\n  }\n\n  // TODO: Do we need some blob offloading tricks here to avoid early eviction?\n  // also see https://stackoverflow.com/questions/28307789/is-there-any-limitation-on-javascript-max-blob-size\n  private _evictOldest(room: number): number {\n    const used = this._getStoredPixels();\n    let current = used;\n    while (this._pixelLimit < current + room && this._images.size) {\n      const spec = this._images.get(++this._lowestId);\n      if (spec && spec.orig) {\n        current -= spec.orig.width * spec.orig.height;\n        if (spec.actual && spec.orig !== spec.actual) {\n          current -= spec.actual.width * spec.actual.height;\n        }\n        spec.marker?.dispose();\n        this._delImg(this._lowestId);\n      }\n    }\n    return used - current;\n  }\n\n  private _writeToCell(line: IBufferLineExt, x: number, imageId: number, tileId: number): void {\n    if (line._data[x * Cell.SIZE + Cell.BG] & BgFlags.HAS_EXTENDED) {\n      const old = line._extendedAttrs[x];\n      if (old) {\n        if (old.imageId !== undefined) {\n          // found an old ExtendedAttrsImage, since we know that\n          // they are always isolated instances (single cell usage),\n          // we can re-use it and just update their id entries\n          const oldSpec = this._images.get(old.imageId);\n          if (oldSpec) {\n            // early eviction for in-viewport overwrites\n            oldSpec.tileCount--;\n          }\n          old.imageId = imageId;\n          old.tileId = tileId;\n          return;\n        }\n        // found a plain ExtendedAttrs instance, clone it to new entry\n        line._extendedAttrs[x] = new ExtendedAttrsImage(old.ext, old.urlId, imageId, tileId);\n        return;\n      }\n    }\n    // fall-through: always create new ExtendedAttrsImage entry\n    line._data[x * Cell.SIZE + Cell.BG] |= BgFlags.HAS_EXTENDED;\n    line._extendedAttrs[x] = new ExtendedAttrsImage(0, 0, imageId, tileId);\n  }\n\n  private _evictOnAlternate(): void {\n    // nullify tile count of all images on alternate buffer\n    for (const spec of this._images.values()) {\n      if (spec.bufferType === 'alternate') {\n        spec.tileCount = 0;\n      }\n    }\n    // re-count tiles on whole buffer\n    const buffer = this._terminal._core.buffer;\n    for (let y = 0; y < this._terminal.rows; ++y) {\n      const line = buffer.lines.get(y) as IBufferLineExt;\n      if (!line) {\n        continue;\n      }\n      for (let x = 0; x < this._terminal.cols; ++x) {\n        if (line._data[x * Cell.SIZE + Cell.BG] & BgFlags.HAS_EXTENDED) {\n          const imgId = line._extendedAttrs[x]?.imageId;\n          if (imgId) {\n            const spec = this._images.get(imgId);\n            if (spec) {\n              spec.tileCount++;\n            }\n          }\n        }\n      }\n    }\n    // deleted images with zero tile count\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.bufferType === 'alternate' && !spec.tileCount) {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n  }\n}\n","/**\n * Copyright (c) 2020, 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { SixelImageStorage } from './SixelImageStorage';\nimport { IDcsHandler, IParams, IImageAddonOptions, ITerminalExt, AttributeData, IResetHandler, ReadonlyColorSet } from './Types';\nimport { toRGBA8888, BIG_ENDIAN, PALETTE_ANSI_256, PALETTE_VT340_COLOR } from 'sixel/lib/Colors';\nimport { RGBA8888 } from 'sixel/lib/Types';\nimport { ImageRenderer } from './ImageRenderer';\n\nimport { DecoderAsync, Decoder } from 'sixel/lib/Decoder';\n\n// always free decoder ressources after decoding if it exceeds this limit\nconst MEM_PERMA_LIMIT = 4194304; // 1024 pixels * 1024 pixels * 4 channels = 4MB\n\n// custom default palette: VT340 (lower 16 colors) + ANSI256 (up to 256) + zeroed (up to 4096)\nconst DEFAULT_PALETTE = PALETTE_ANSI_256;\nDEFAULT_PALETTE.set(PALETTE_VT340_COLOR);\n\n\nexport class SixelHandler implements IDcsHandler, IResetHandler {\n  private _size = 0;\n  private _aborted = false;\n  private _dec: Decoder | undefined;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _storage: SixelImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    DecoderAsync({\n      memoryLimit: this._opts.pixelLimit * 4,\n      palette: DEFAULT_PALETTE,\n      paletteLimit: this._opts.sixelPaletteLimit\n    }).then(d => this._dec = d);\n  }\n\n  public reset(): void {\n    /**\n     * reset sixel decoder to defaults:\n     * - release all memory\n     * - nullify palette (4096)\n     * - apply default palette (256)\n     */\n    if (this._dec) {\n      this._dec.release();\n      // FIXME: missing interface on decoder to nullify full palette\n      (this._dec as any)._palette.fill(0);\n      this._dec.init(0, DEFAULT_PALETTE, this._opts.sixelPaletteLimit);\n    }\n  }\n\n  public hook(params: IParams): void {\n    this._size = 0;\n    this._aborted = false;\n    if (this._dec) {\n      const fillColor = params.params[1] === 1 ? 0 : extractActiveBg(\n        this._coreTerminal._core._inputHandler._curAttrData,\n        this._coreTerminal._core._themeService?.colors);\n      this._dec.init(fillColor, null, this._opts.sixelPaletteLimit);\n    }\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted || !this._dec) {\n      return;\n    }\n    this._size += end - start;\n    if (this._size > this._opts.sixelSizeLimit) {\n      console.warn(`SIXEL: too much data, aborting`);\n      this._aborted = true;\n      this._dec.release();\n      return;\n    }\n    try {\n      this._dec.decode(data, start, end);\n    } catch (e) {\n      console.warn(`SIXEL: error while decoding image - ${e}`);\n      this._aborted = true;\n      this._dec.release();\n    }\n  }\n\n  public unhook(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted || !success || !this._dec) {\n      return true;\n    }\n\n    const width = this._dec.width;\n    const height = this._dec.height;\n\n    // partial fix for https://github.com/jerch/xterm-addon-image/issues/37\n    if (!width || !height) {\n      if (height) {\n        this._storage.advanceCursor(height);\n      }\n      return true;\n    }\n\n    const canvas = ImageRenderer.createCanvas(undefined, width, height);\n    canvas.getContext('2d')?.putImageData(new ImageData(this._dec.data8 as Uint8ClampedArray<ArrayBuffer>, width, height), 0, 0);\n    if (this._dec.memoryUsage > MEM_PERMA_LIMIT) {\n      this._dec.release();\n    }\n    this._storage.addImage(canvas);\n    return true;\n  }\n}\n\n\n/**\n * Some helpers to extract current terminal colors.\n */\n\n// get currently active background color from terminal\n// also respect INVERSE setting\nfunction extractActiveBg(attr: AttributeData, colors: ReadonlyColorSet | undefined): RGBA8888 {\n  let bg = 0;\n  if (!colors) {\n    // FIXME: theme service is prolly not available yet,\n    // happens if .open() was not called yet (bug in core?)\n    return bg;\n  }\n  if (attr.isInverse()) {\n    if (attr.isFgDefault()) {\n      bg = convertLe(colors.foreground.rgba);\n    } else if (attr.isFgRGB()) {\n      const t = (attr.constructor as typeof AttributeData).toColorRGB(attr.getFgColor());\n      bg = toRGBA8888(...t);\n    } else {\n      bg = convertLe(colors.ansi[attr.getFgColor()].rgba);\n    }\n  } else {\n    if (attr.isBgDefault()) {\n      bg = convertLe(colors.background.rgba);\n    } else if (attr.isBgRGB()) {\n      const t = (attr.constructor as typeof AttributeData).toColorRGB(attr.getBgColor());\n      bg = toRGBA8888(...t);\n    } else {\n      bg = convertLe(colors.ansi[attr.getBgColor()].rgba);\n    }\n  }\n  return bg;\n}\n\n// rgba values on the color managers are always in BE, thus convert to LE\nfunction convertLe(color: number): RGBA8888 {\n  if (BIG_ENDIAN) return color;\n  return (color & 0xFF) << 24 | (color >>> 8 & 0xFF) << 16 | (color >>> 16 & 0xFF) << 8 | color >>> 24 & 0xFF;\n}\n","/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';\nimport { IImageAddonOptions, ITerminalExt, IAddImageOpts } from './Types';\nimport { ImageRenderer } from './ImageRenderer';\n\n/**\n * Sixel-specific image storage controller.\n *\n * Wraps the shared ImageStorage with sixel protocol semantics:\n * - Cursor behavior governed by DECSET 80 (sixelScrolling option)\n * - advanceCursor for empty sixels carrying only height\n */\nexport class SixelImageStorage {\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'vt340' };\n  constructor(\n    private readonly _storage: ImageStorage,\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _terminal: ITerminalExt\n  ) {}\n\n  /**\n   * Add a sixel image to storage.\n   * Cursor behavior depends on the sixelScrolling option (DECSET 80).\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap): void {\n    this._addImageOpts.scrolling = this._opts.sixelScrolling;\n    this._storage.addImage(img, this._addImageOpts);\n  }\n\n  /**\n   * Only advance text cursor.\n   * This is an edge case from empty sixels carrying only a height but no pixels.\n   * Partially fixes https://github.com/jerch/xterm-addon-image/issues/37.\n   */\n  public advanceCursor(height: number): void {\n    if (this._opts.sixelScrolling) {\n      let cellSize = this._renderer.cellSize;\n      if (cellSize.width === -1 || cellSize.height === -1) {\n        cellSize = CELL_SIZE_DEFAULT;\n      }\n      const rows = Math.ceil(height / cellSize.height);\n      for (let i = 1; i < rows; ++i) {\n        this._terminal._core._inputHandler.lineFeed();\n      }\n    }\n  }\n}\n","/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { IApcHandler, IImageAddonOptions, IResetHandler, ITerminalExt, ImageLayer } from '../Types';\nimport { ImageRenderer } from '../ImageRenderer';\nimport { CELL_SIZE_DEFAULT } from '../ImageStorage';\nimport { imageType } from '../IIPMetrics';\nimport { KittyImageStorage } from './KittyImageStorage';\nimport Base64Decoder, { type DecodeStatus } from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\nimport {\n  KittyAction,\n  KittyFormat,\n  KittyCompression,\n  IKittyCommand,\n  IPendingTransmission,\n  IKittyImageData,\n  KittyPixelConstants,\n  parseKittyCommand\n} from './KittyGraphicsTypes';\n\nconst enum Constants {\n  // Memory limit for base64 decoder (4MB, same as IIPHandler)\n  DECODER_KEEP_DATA = 4194304,\n  DECODER_INITIAL_DATA = 4194304, // 4MB\n  // Local mirror of const enum (esbuild can't inline const enums from external packages)\n  DECODER_OK = 0,\n  // Maximum control data size\n  MAX_CONTROL_DATA_SIZE = 512,\n  // Semicolon codepoint\n  SEMICOLON = 0x3B\n}\n\nconst DECODER_OK = Constants.DECODER_OK as unknown as DecodeStatus.OK;\n\n// Kitty graphics protocol handler with streaming base64 decoding.\nexport class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDisposable {\n  private _aborted = false;\n  private _generation = 0;\n  private _decodeError = false;\n\n  private _activeDecoder: Base64Decoder | null = null;\n  private readonly _maxEncodedBytes: number;\n  private readonly _initialEncodedBytes: number;\n\n  // Streaming related states\n\n  // True while receiving control data (before semicolon).\n  private _inControlData = true;\n\n  // Buffer for control data.\n  private _controlData = new Uint32Array(Constants.MAX_CONTROL_DATA_SIZE);\n  private _controlLength = 0;\n\n  // Pre-calculated encoded size limit\n  private _encodedSizeLimit = 0;\n  private _totalEncodedSize = 0;\n\n  // Parsed command. These are the control data before semicolon.\n  private _parsedCommand: IKittyCommand | null = null;\n\n  // Storage related states\n\n  private _pendingTransmissions: Map<number, IPendingTransmission> = new Map();\n  // Tracks the pending key of the most recently started chunked upload.\n  // Per spec, subsequent chunks only need m= (and optionally q=), without i=.\n  // When a chunk arrives with no i=, this key is used to find the pending upload.\n  private _lastPendingKey: number | undefined;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _kittyStorage: KittyImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    // Convert decoded size limit -> max encoded bytes.\n    this._maxEncodedBytes = Math.ceil(this._opts.kittySizeLimit * 4 / 3);\n    // ensure we preallocate more than configured limit while using 4mb initial size.\n    this._initialEncodedBytes = Math.min(Constants.DECODER_INITIAL_DATA, this._maxEncodedBytes);\n  }\n\n  public reset(): void {\n    this._generation++;\n    this._cleanupAllPending();\n    if (this._activeDecoder) {\n      this._activeDecoder.release();\n      this._activeDecoder = null;\n    }\n    this._kittyStorage.reset();\n  }\n\n  public dispose(): void {\n    this.reset();\n  }\n\n  private _removePendingEntry(key: number): void {\n    this._pendingTransmissions.delete(key);\n    if (this._lastPendingKey === key) {\n      this._lastPendingKey = undefined;\n    }\n  }\n\n  private _cleanupAllPending(): void {\n    for (const pending of this._pendingTransmissions.values()) {\n      pending.decoder.release();\n    }\n    this._pendingTransmissions.clear();\n    this._lastPendingKey = undefined;\n  }\n\n  public start(): void {\n    this._aborted = false;\n    this._decodeError = false;\n    this._inControlData = true;\n    this._controlLength = 0;\n    this._parsedCommand = null;\n    // Pre-calculate encoded limit once: base64 is 4 bytes encoded → 3 bytes decoded\n    this._encodedSizeLimit = this._maxEncodedBytes;\n    this._totalEncodedSize = 0;\n    this._activeDecoder = null;\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    if (!this._inControlData) {\n      this._streamPayload(data, start, end);\n    } else {\n      // Scan for semicolon\n      let controlEnd = end;\n      for (let i = start; i < end; i++) {\n        if (data[i] === Constants.SEMICOLON) {\n          this._inControlData = false;\n          controlEnd = i;\n          break;\n        }\n      }\n\n      // Copy control data\n      const copyLength = controlEnd - start;\n      if (this._controlLength + copyLength > Constants.MAX_CONTROL_DATA_SIZE) {\n        this._aborted = true;\n        return;\n      }\n      this._controlData.set(data.subarray(start, controlEnd), this._controlLength);\n      this._controlLength += copyLength;\n\n      if (!this._inControlData) {\n        // Found semicolon - parse control data early for validation\n        this._parsedCommand = parseKittyCommand(this._parseControlDataString());\n\n        // Early validation: i+I conflict\n        if (this._parsedCommand.id !== undefined && this._parsedCommand.imageNumber !== undefined) {\n          this._sendResponse(this._parsedCommand.id, 'EINVAL:cannot specify both i and I keys', this._parsedCommand.quiet ?? 0);\n          this._aborted = true;\n          return;\n        }\n\n        // Delete action doesn't need payload - skip streaming\n        if (this._parsedCommand.action === KittyAction.DELETE) {\n          return;\n        }\n\n        // Stream remaining as payload\n        const payloadStart = controlEnd + 1;\n        if (payloadStart < end) {\n          this._streamPayload(data, payloadStart, end);\n        }\n      }\n    }\n  }\n\n  // Stream payload bytes into the base64 decoder.\n  private _streamPayload(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    // Check size limit (compare encoded bytes against pre-calculated limit)\n    // Include cumulative size from pending transmission for multi-chunk images.\n    // Per spec, subsequent chunks may omit i=, so fall back to _lastPendingKey.\n    const pendingKey = this._parsedCommand?.id ?? this._lastPendingKey ?? 0;\n    const pending = this._pendingTransmissions.get(pendingKey);\n    const previousEncodedSize = pending?.totalEncodedSize ?? 0;\n    this._totalEncodedSize += end - start;\n    const cumulativeEncodedSize = previousEncodedSize + this._totalEncodedSize;\n    if (cumulativeEncodedSize > this._encodedSizeLimit) {\n      const decoderToRelease = this._activeDecoder ?? pending?.decoder;\n      if (decoderToRelease) {\n        decoderToRelease.release();\n      }\n      this._activeDecoder = null;\n      if (pending) {\n        this._removePendingEntry(pendingKey);\n      }\n      this._aborted = true;\n      return;\n    }\n\n    if (this._decodeError) return;\n\n    if (pending?.decoder && !this._activeDecoder) {\n      this._activeDecoder = pending.decoder;\n    }\n    if (!this._activeDecoder) {\n      // Budget WASM capacity, including one page of decoder state and rounding.\n      const decoderCapacity = this._maxEncodedBytes + 131072;\n      if (decoderCapacity > this._opts.storageLimit * 1000000) {\n        this._aborted = true;\n        if (this._parsedCommand?.id !== undefined) {\n          this._sendResponse(this._parsedCommand.id, 'ENOMEM:pending image budget exceeded', this._parsedCommand.quiet ?? 0);\n        }\n        return;\n      }\n      const maxPending = Math.max(1, Math.floor(this._opts.storageLimit * 1000000 / decoderCapacity));\n      while (this._pendingTransmissions.size >= maxPending) {\n        const oldest = this._pendingTransmissions.entries().next().value;\n        if (!oldest) break;\n        oldest[1].decoder.release();\n        this._removePendingEntry(oldest[0]);\n        if (oldest[1].cmd.id !== undefined) {\n          this._sendResponse(oldest[1].cmd.id, 'ENOMEM:pending image budget exceeded', oldest[1].cmd.quiet ?? 0);\n        }\n      }\n      this._activeDecoder = new Base64Decoder(Constants.DECODER_KEEP_DATA, this._maxEncodedBytes, this._initialEncodedBytes);\n      this._activeDecoder.init();\n    }\n\n    if (this._activeDecoder.put(data.subarray(start, end)) !== DECODER_OK) {\n      this._activeDecoder.release();\n      this._activeDecoder = null;\n      this._decodeError = true;\n      if (pending) {\n        this._removePendingEntry(pendingKey);\n      }\n    }\n  }\n\n  public end(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted || !success) {\n      if (this._activeDecoder) {\n        this._activeDecoder.release();\n        this._activeDecoder = null;\n      }\n      return true;\n    }\n\n    // No semicolon = no payload (delete, capability query)\n    if (this._inControlData) {\n      return this._handleNoPayloadCommand();\n    }\n\n    // Use command parsed early in put() - i+I already validated there\n    const cmd = this._parsedCommand!;\n\n    // Delete action was handled by skipping payload - just execute\n    if (cmd.action === KittyAction.DELETE) {\n      return this._handleDelete(cmd);\n    }\n\n    // Per spec, subsequent chunks may omit i=, so fall back to _lastPendingKey.\n    const pendingKey = cmd.id ?? this._lastPendingKey ?? 0;\n    const isMoreComing = cmd.more === 1;\n    const pending = this._pendingTransmissions.get(pendingKey);\n\n    if (isMoreComing) {\n      if (this._activeDecoder) {\n        if (pending) {\n          pending.totalEncodedSize += this._totalEncodedSize;\n          pending.decodeError = pending.decodeError || this._decodeError;\n        } else {\n          this._pendingTransmissions.set(pendingKey, {\n            cmd: { ...cmd },\n            decoder: this._activeDecoder,\n            totalEncodedSize: this._totalEncodedSize,\n            decodeError: this._decodeError\n          });\n        }\n        this._lastPendingKey = pendingKey;\n        this._activeDecoder = null;\n      }\n      return true;\n    }\n\n    // Final chunk received — clear the last pending key\n    if (pending) {\n      this._lastPendingKey = undefined;\n    }\n\n    let decodeError = this._decodeError;\n    let finalCmd = cmd;\n    let decoder = this._activeDecoder;\n\n    if (pending) {\n      finalCmd = pending.cmd;\n      decoder = pending.decoder;\n      decodeError = decodeError || pending.decodeError;\n      this._pendingTransmissions.delete(pendingKey);\n    }\n\n    let imageBytes = new Uint8Array(0);\n    if (decoder) {\n      if (decoder.end() !== DECODER_OK) {\n        decodeError = true;\n      }\n      imageBytes = decoder.data8;\n    }\n    this._activeDecoder = null;\n\n    // Handle command first — handlers create Blob/ImageData from imageBytes,\n    // which copies the data. Only then is it safe to release the decoder's\n    // wasm memory that imageBytes points into.\n    const result = this._handleCommandWithBytesAndCmd(finalCmd, imageBytes, decodeError);\n    if (decoder) {\n      decoder.release();\n    }\n    return result;\n  }\n\n  // Command handling\n\n  private _parseControlDataString(): string {\n    let str = '';\n    for (let i = 0; i < this._controlLength; i++) {\n      str += String.fromCodePoint(this._controlData[i]);\n    }\n    return str;\n  }\n\n  private _handleNoPayloadCommand(): boolean | Promise<boolean> {\n    const cmd = parseKittyCommand(this._parseControlDataString());\n\n    // Per spec: specifying both i and I is an error\n    if (cmd.id !== undefined && cmd.imageNumber !== undefined) {\n      this._sendResponse(cmd.id, 'EINVAL:cannot specify both i and I keys', cmd.quiet ?? 0);\n      return true;\n    }\n\n    const action = cmd.action ?? 't';\n\n    switch (action) {\n      case KittyAction.DELETE:\n        return this._handleDelete(cmd);\n      case KittyAction.QUERY:\n        this._sendResponse(cmd.id ?? 0, 'OK', cmd.quiet ?? 0);\n        return true;\n      case KittyAction.PLACEMENT:\n        return this._handlePlacement(cmd);\n      default:\n        // TODO: Implement remaining actions when needed:\n        // - a=f (frame): animation frame operations\n        // - a=a (animation): animation control\n        // - a=c (compose): compose images\n        if (cmd.id !== undefined) {\n          this._sendResponse(cmd.id, 'EINVAL:unsupported action', cmd.quiet ?? 0);\n        }\n        return true;\n    }\n  }\n\n  private _handleCommandWithBytesAndCmd(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean | Promise<boolean> {\n    const action = cmd.action ?? 't';\n\n    switch (action) {\n      case KittyAction.TRANSMIT: {\n        const result = this._handleTransmit(cmd, bytes, decodeError);\n        // Only send response when _handleTransmit didn't already respond\n        // (it handles unsupported transmission medium responses internally)\n        if ((cmd.transmission ?? 'd') === 'd' && cmd.id !== undefined) {\n          if (decodeError) {\n            this._sendResponse(cmd.id, 'EINVAL:invalid base64 data', cmd.quiet ?? 0);\n          } else if (bytes.length > 0) {\n            this._sendResponse(cmd.id, 'OK', cmd.quiet ?? 0);\n          }\n        }\n        return result;\n      }\n      case KittyAction.TRANSMIT_DISPLAY:\n        return this._handleTransmitDisplay(cmd, bytes, decodeError);\n      case KittyAction.QUERY:\n        return this._handleQuery(cmd, bytes, decodeError);\n      case KittyAction.PLACEMENT:\n        // a=p ignores any payload — image data was already transmitted\n        return this._handlePlacement(cmd);\n      default:\n        // TODO: Implement remaining actions when needed:\n        // - a=f (frame): animation frame operations\n        // - a=a (animation): animation control\n        // - a=c (compose): compose images\n        if (cmd.id !== undefined) {\n          this._sendResponse(cmd.id, 'EINVAL:unsupported action', cmd.quiet ?? 0);\n        }\n        return true;\n    }\n  }\n\n  private _handlePlacement(cmd: IKittyCommand): boolean | Promise<boolean> {\n    if (cmd.id === undefined) {\n      return true;\n    }\n    const id = cmd.id;\n    const image = this._kittyStorage.getImage(id);\n    if (!image) {\n      this._sendResponse(id, 'ENOENT:image not found', cmd.quiet ?? 0, cmd.placementId);\n      return true;\n    }\n    const result = this._displayImage(image, cmd);\n    return result.then(success => {\n      this._sendResponse(id, success ? 'OK' : 'EINVAL:image rendering failed', cmd.quiet ?? 0, cmd.placementId);\n      return true;\n    });\n  }\n\n  private _handleTransmit(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean {\n    // TODO: Support file-based transmission modes (t=f, t=t, t=s)\n    // Currently only supports direct transmission (t=d, the default).\n    // - t=f (file): Payload is base64-encoded file path. Terminal reads image from that path.\n    // - t=t (temp file): Payload is base64-encoded path in temp directory. Terminal reads, deletes.\n    // - t=s: Payload is base64-encoded POSIX shm name. Terminal reads from shared memory.\n    // These modes require filesystem/IPC access not available in browsers. For Node.js/Electron:\n    // 1. Check cmd.transmission (t key) before treating bytes as image data\n    // 2. For t=f/t/s: decode bytes as UTF-8 string (the path/name), then read file contents\n    // 3. For t=d: treat bytes as image data (current behavior)\n    // When implementing, also update _handleQuery to accept these transmission mediums.\n    const transmission = cmd.transmission ?? 'd';\n    if (transmission !== 'd') {\n      if (cmd.id !== undefined) {\n        this._sendResponse(cmd.id, 'EINVAL:unsupported transmission medium', cmd.quiet ?? 0);\n      }\n      return true;\n    }\n\n    if (decodeError || bytes.length === 0) return true;\n\n    this._kittyStorage.storeImage(cmd.id, {\n      data: new Blob([bytes as BlobPart]),\n      width: cmd.width ?? 0,\n      height: cmd.height ?? 0,\n      format: (cmd.format ?? KittyFormat.RGBA) as 24 | 32 | 100,\n      compression: cmd.compression ?? ''\n    });\n    return true;\n  }\n\n  private _handleTransmitDisplay(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean | Promise<boolean> {\n    if (decodeError) {\n      if (cmd.id !== undefined) {\n        this._sendResponse(cmd.id, 'EINVAL:invalid base64 data', cmd.quiet ?? 0);\n      }\n      return true;\n    }\n\n    this._handleTransmit(cmd, bytes, decodeError);\n\n    const id = cmd.id ?? this._kittyStorage.lastImageId;\n    const image = this._kittyStorage.getImage(id);\n    if (image) {\n      const result = this._displayImage(image, cmd);\n      if (cmd.id !== undefined) {\n        return result.then(success => {\n          this._sendResponse(id, success ? 'OK' : 'EINVAL:image rendering failed', cmd.quiet ?? 0);\n          return true;\n        });\n      }\n      return result.then(() => true);\n    }\n    return true;\n  }\n\n  private _handleQuery(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean {\n    const id = cmd.id ?? 0;\n    const quiet = cmd.quiet ?? 0;\n\n    // Per spec: reject unsupported transmission mediums (only t=d is supported atm)\n    // TODO: When filesystem support is added (Node.js/Electron), update this to accept\n    // t=f (file), t=t (temp file), and t=s (shared memory) and respond OK for queries.\n    const transmission = cmd.transmission ?? 'd';\n    if (transmission !== 'd') {\n      this._sendResponse(id, 'EINVAL:unsupported transmission medium', quiet);\n      return true;\n    }\n\n    // Check decode error first (invalid base64)\n    if (decodeError) {\n      this._sendResponse(id, 'EINVAL:invalid base64 data', quiet);\n      return true;\n    }\n\n    // Capability query (no payload) - just respond OK\n    if (bytes.length === 0) {\n      this._sendResponse(id, 'OK', quiet);\n      return true;\n    }\n\n    const format = cmd.format ?? KittyFormat.RGBA;\n\n    if (format === KittyFormat.PNG) {\n      this._sendResponse(id, 'OK', quiet);\n    } else {\n      const width = cmd.width ?? 0;\n      const height = cmd.height ?? 0;\n\n      if (!width || !height) {\n        this._sendResponse(id, 'EINVAL:width and height required for raw pixel data', quiet);\n        return true;\n      }\n\n      const bytesPerPixel = format === KittyFormat.RGBA ? KittyPixelConstants.BYTES_PER_PIXEL_RGBA : KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n      const expectedBytes = width * height * bytesPerPixel;\n\n      if (bytes.length < expectedBytes) {\n        this._sendResponse(id, `EINVAL:insufficient pixel data`, quiet);\n        return true;\n      }\n\n      this._sendResponse(id, 'OK', quiet);\n    }\n    return true;\n  }\n\n  private _handleDelete(cmd: IKittyCommand): boolean {\n    // Per spec: default delete selector is 'a' (delete all visible placements)\n    const selector = cmd.deleteSelector ?? 'a';\n\n    // TODO: Distinguish lowercase (delete placements only) from uppercase\n    // (delete placements + free stored image data). Currently both variants\n    // free everything since we don't separate stored data from placements.\n    switch (selector) {\n      case 'a':\n      case 'A':\n        this._cleanupAllPending();\n        this._kittyStorage.deleteAll();\n        break;\n      case 'i':\n      case 'I':\n        // TODO: When placement id tracking is implemented (see TODO in\n        // KittyImageStorage), d=i with p=<pid> should delete only that\n        // specific placement, while d=i without p should delete all\n        // placements for the image.\n        if (cmd.id !== undefined) {\n          const pending = this._pendingTransmissions.get(cmd.id);\n          if (pending) {\n            pending.decoder.release();\n          }\n          this._removePendingEntry(cmd.id);\n          this._kittyStorage.deleteById(cmd.id);\n        }\n        break;\n      default:\n        // Unsupported selectors (c, n, p, q, r, x, y, z, f) — ignore for now\n        break;\n    }\n    return true;\n  }\n\n  private _sendResponse(id: number, message: string, quiet: number, placementId?: number): void {\n    const isOk = message === 'OK';\n    if (isOk && quiet >= 1) return;\n    if (!isOk && quiet >= 2) return;\n\n    const pPart = placementId ? `,p=${placementId}` : '';\n    const response = `\\x1b_Gi=${id}${pPart};${message}\\x1b\\\\`;\n    this._coreTerminal._core.coreService.triggerDataEvent(response);\n  }\n\n  // Image display\n\n  private _displayImage(image: IKittyImageData, cmd: IKittyCommand): Promise<boolean> {\n    return this._decodeAndDisplay(image, cmd)\n      .then(() => true)\n      .catch(() => false);\n  }\n\n  private async _decodeAndDisplay(image: IKittyImageData, cmd: IKittyCommand): Promise<void> {\n    const generation = this._generation;\n    let bitmap: ImageBitmap | undefined = await this._createBitmap(image);\n\n    try {\n      if (generation !== this._generation) throw new Error('image decode canceled');\n      const cropX = Math.max(0, cmd.x ?? 0);\n      const cropY = Math.max(0, cmd.y ?? 0);\n      const cropW = cmd.sourceWidth || (bitmap.width - cropX);\n      const cropH = cmd.sourceHeight || (bitmap.height - cropY);\n\n      const maxCropW = Math.max(0, bitmap.width - cropX);\n      const maxCropH = Math.max(0, bitmap.height - cropY);\n      const finalCropW = Math.max(0, Math.min(cropW, maxCropW));\n      const finalCropH = Math.max(0, Math.min(cropH, maxCropH));\n\n      if (finalCropW === 0 || finalCropH === 0) {\n        throw new Error('invalid source rectangle');\n      }\n\n      if (cropX !== 0 || cropY !== 0 || finalCropW !== bitmap.width || finalCropH !== bitmap.height) {\n        const cropped = await createImageBitmap(bitmap, cropX, cropY, finalCropW, finalCropH);\n        bitmap.close();\n        bitmap = cropped;\n      }\n\n      const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;\n      const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;\n\n      // Per spec: c/r default to image's natural cell dimensions.\n      // If only one of c/r is specified, compute the other from image aspect ratio.\n      let imgCols: number;\n      let imgRows: number;\n      if (cmd.columns !== undefined && cmd.rows !== undefined) {\n        imgCols = cmd.columns;\n        imgRows = cmd.rows;\n      } else if (cmd.columns !== undefined) {\n        imgCols = cmd.columns;\n        imgRows = Math.max(1, Math.ceil((bitmap.height / bitmap.width) * (imgCols * cw) / ch));\n      } else if (cmd.rows !== undefined) {\n        imgRows = cmd.rows;\n        imgCols = Math.max(1, Math.ceil((bitmap.width / bitmap.height) * (imgRows * ch) / cw));\n      } else {\n        imgCols = Math.ceil(bitmap.width / cw);\n        imgRows = Math.ceil(bitmap.height / ch);\n      }\n\n      let w = bitmap.width;\n      let h = bitmap.height;\n\n      // Scale bitmap to fit placement rectangle when c/r are specified\n      if (cmd.columns !== undefined || cmd.rows !== undefined) {\n        w = Math.round(imgCols * cw);\n        h = Math.round(imgRows * ch);\n      }\n\n      if (w * h > this._opts.pixelLimit) {\n        throw new Error('image exceeds pixel limit');\n      }\n\n      // Save cursor position before addImage modifies it\n      const buffer = this._coreTerminal._core.buffer;\n      const savedX = buffer.x;\n      const savedY = buffer.y;\n      const savedYbase = buffer.ybase;\n\n      // Determine layer based on z-index: negative = behind text, 0+ = on top.\n      // When z<0 we always use the bottom layer even without allowTransparency —\n      // the image will simply be hidden behind the opaque text background, which\n      // is the correct behavior (client asked for \"behind text\").\n      const wantsBottom = cmd.zIndex !== undefined && cmd.zIndex < 0;\n      const layer: ImageLayer = wantsBottom ? 'bottom' : 'top';\n\n      if (w !== bitmap.width || h !== bitmap.height) {\n        const scaled = await createImageBitmap(bitmap, { resizeWidth: w, resizeHeight: h });\n        bitmap.close();\n        bitmap = scaled;\n      }\n\n      // Per spec: X/Y are pixel offsets within the first cell, so clamp to cell dimensions\n      const xOffset = Math.min(Math.max(0, cmd.xOffset ?? 0), cw - 1);\n      const yOffset = Math.min(Math.max(0, cmd.yOffset ?? 0), ch - 1);\n      if (xOffset !== 0 || yOffset !== 0) {\n        // Per spec: X/Y is not added to c/r area. When c/r are explicit, the\n        // total placement area remains c*cw × r*ch pixels and the offset image\n        // is clipped to fit. When c/r are unset, the padded canvas determines\n        // the natural cell dimensions.\n        const canvasW = (cmd.columns !== undefined) ? Math.round(imgCols * cw) : bitmap.width + xOffset;\n        const canvasH = (cmd.rows !== undefined) ? Math.round(imgRows * ch) : bitmap.height + yOffset;\n        const offsetCanvas = ImageRenderer.createCanvas(window.document, canvasW, canvasH);\n        const offsetCtx = offsetCanvas.getContext('2d');\n        if (!offsetCtx) {\n          throw new Error('Failed to create offset canvas context');\n        }\n        offsetCtx.drawImage(bitmap, xOffset, yOffset);\n\n        const offsetBitmap = await createImageBitmap(offsetCanvas);\n        offsetCanvas.width = offsetCanvas.height = 0;\n        bitmap.close();\n        bitmap = offsetBitmap;\n        w = bitmap.width;\n        h = bitmap.height;\n        if (w * h > this._opts.pixelLimit) {\n          throw new Error('image exceeds pixel limit');\n        }\n        if (cmd.columns === undefined) {\n          imgCols = Math.ceil(bitmap.width / cw);\n        }\n        if (cmd.rows === undefined) {\n          imgRows = Math.ceil(bitmap.height / ch);\n        }\n      }\n\n      if (generation !== this._generation) throw new Error('image decode canceled');\n      const zIndex = cmd.zIndex ?? 0;\n      this._kittyStorage.addImage(image.id, bitmap, true, layer, zIndex);\n      bitmap = undefined;  // ownership transferred to storage\n\n      // Kitty cursor movement\n      // Per spec: cursor placed at first column after last image column,\n      // on the last row of the image. C=1 means don't move cursor.\n      if (cmd.cursorMovement === 1) {\n        // C=1: restore cursor to position before image was placed\n        const scrolled = buffer.ybase - savedYbase;\n        buffer.x = savedX;\n        // Can't restore cursor to scrollback?\n        buffer.y = Math.max(savedY - scrolled, 0);\n      } else {\n        // Default (C=0): advance cursor horizontally past the image\n        // addImage already positioned cursor on the last row via lineFeeds\n        buffer.x = Math.min(savedX + imgCols, this._coreTerminal.cols);\n      }\n    } catch (e) {\n      bitmap?.close();\n      throw e;\n    }\n  }\n\n  // Create ImageBitmap from already-decoded image data.\n  private async _createBitmap(image: IKittyImageData): Promise<ImageBitmap> {\n    let bytes: Uint8Array = new Uint8Array(await image.data.arrayBuffer());\n\n    if (image.compression === KittyCompression.ZLIB) {\n      bytes = await this._decompressZlib(bytes);\n    }\n\n    if (image.format === KittyFormat.PNG) {\n      const metrics = imageType(bytes);\n      // IHDR dimensions are parsed with signed shifts, so a value >= 0x80000000 comes\n      // back negative and a bare `>` pixel-limit test passes it; require positive.\n      if (metrics.mime !== 'image/png' || !(metrics.width > 0) || !(metrics.height > 0) || metrics.width * metrics.height > this._opts.pixelLimit) {\n        throw new RangeError('PNG exceeds pixel limit or has invalid dimensions');\n      }\n      const blob = new Blob([bytes as BlobPart], { type: 'image/png' });\n      if (!window.createImageBitmap) {\n        const url = URL.createObjectURL(blob);\n        const img = new Image();\n        return new Promise<ImageBitmap>((resolve, reject) => {\n          img.addEventListener('load', () => {\n            URL.revokeObjectURL(url);\n            const canvas = ImageRenderer.createCanvas(window.document, img.width, img.height);\n            canvas.getContext('2d')?.drawImage(img, 0, 0);\n            createImageBitmap(canvas).then(resolve).catch(reject);\n          });\n          img.addEventListener('error', () => {\n            URL.revokeObjectURL(url);\n            reject(new Error('Failed to load image'));\n          });\n          img.src = url;\n        });\n      }\n      return createImageBitmap(blob);\n    }\n\n    // Raw pixel data\n    const width = image.width;\n    const height = image.height;\n\n    if (!width || !height) {\n      throw new Error('Width and height required for raw pixel data');\n    }\n\n    const bytesPerPixel = image.format === KittyFormat.RGBA ? KittyPixelConstants.BYTES_PER_PIXEL_RGBA : KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n    const expectedBytes = width * height * bytesPerPixel;\n\n    if (bytes.length < expectedBytes) {\n      throw new Error('Insufficient pixel data');\n    }\n\n    const pixelCount = width * height;\n\n    if (image.format === KittyFormat.RGBA) {\n      // RGBA: use bytes directly — no copy needed\n      return createImageBitmap(new ImageData(new Uint8ClampedArray(bytes.buffer as ArrayBuffer, bytes.byteOffset, pixelCount * KittyPixelConstants.BYTES_PER_PIXEL_RGBA), width, height));\n    }\n\n    // RGB→RGBA: interleave alpha using uint32 block processing (4 pixels per iteration).\n    // 3 uint32 reads + 4 uint32 writes per 4 pixels vs 28 byte reads/writes — ~6x faster.\n    // Assumes little-endian (all modern browsers/Node.js).\n    const data = new Uint8ClampedArray(pixelCount * KittyPixelConstants.BYTES_PER_PIXEL_RGBA);\n    const src32 = new Uint32Array(bytes.buffer, bytes.byteOffset, Math.floor(bytes.byteLength / 4));\n    const dst32 = new Uint32Array(data.buffer);\n    const alignedPixels = pixelCount & ~3;  // round down to multiple of 4\n\n    let srcOffset = 0;\n    let dstOffset = 0;\n    for (let i = 0; i < alignedPixels; i += 4) {\n      const b0 = src32[srcOffset++];\n      const b1 = src32[srcOffset++];\n      const b2 = src32[srcOffset++];\n      // Little-endian: pixel bytes are [R,G,B] → uint32 ABGR layout\n      dst32[dstOffset++] = 0xFF000000 | b0;\n      dst32[dstOffset++] = 0xFF000000 | (b0 >>> 24) | (b1 << 8);\n      dst32[dstOffset++] = 0xFF000000 | (b1 >>> 16) | (b2 << 16);\n      dst32[dstOffset++] = 0xFF000000 | (b2 >>> 8);\n    }\n\n    // Handle remaining 1–3 pixels\n    let srcByte = alignedPixels * KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n    let dstByte = alignedPixels * KittyPixelConstants.BYTES_PER_PIXEL_RGBA;\n    for (let i = alignedPixels; i < pixelCount; i++) {\n      data[dstByte]     = bytes[srcByte];\n      data[dstByte + 1] = bytes[srcByte + 1];\n      data[dstByte + 2] = bytes[srcByte + 2];\n      data[dstByte + 3] = KittyPixelConstants.ALPHA_OPAQUE;\n      srcByte += KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n      dstByte += KittyPixelConstants.BYTES_PER_PIXEL_RGBA;\n    }\n\n    return createImageBitmap(new ImageData(data, width, height));\n  }\n\n  private async _decompressZlib(compressed: Uint8Array): Promise<Uint8Array> {\n    try {\n      return await this._decompress(compressed, 'deflate');\n    } catch (error) {\n      if (error instanceof RangeError) throw error;\n      return await this._decompress(compressed, 'deflate-raw');\n    }\n  }\n\n  private async _decompress(compressed: Uint8Array, format: 'deflate' | 'deflate-raw'): Promise<Uint8Array> {\n    const limit = Math.min(this._opts.kittySizeLimit, this._opts.pixelLimit * 4, this._opts.storageLimit * 1000000);\n    let offsetIn = 0;\n    // Bound inflation within one native transform before its output is budgeted.\n    const source = new ReadableStream<BufferSource>({\n      pull(controller) {\n        if (offsetIn >= compressed.length) {\n          controller.close();\n          return;\n        }\n        const end = Math.min(offsetIn + 4096, compressed.length);\n        controller.enqueue(new Uint8Array(compressed.subarray(offsetIn, end)));\n        offsetIn = end;\n      }\n    });\n    const reader = source.pipeThrough(new DecompressionStream(format)).getReader();\n    const chunks: Uint8Array[] = [];\n    let totalLength = 0;\n    try {\n      while (true) {\n        const { done, value } = await reader.read();\n        if (done) break;\n        totalLength += value.byteLength;\n        if (totalLength > limit) {\n          await reader.cancel().catch(() => {});\n          throw new RangeError('decompressed image exceeds byte limit');\n        }\n        chunks.push(value);\n      }\n    } finally {\n      reader.releaseLock();\n    }\n\n    const result = new Uint8Array(totalLength);\n    let offset = 0;\n    for (const chunk of chunks) {\n      result.set(chunk, offset);\n      offset += chunk.length;\n    }\n    return result;\n  }\n\n  public get images(): ReadonlyMap<number, IKittyImageData> {\n    return this._kittyStorage.images;\n  }\n\n  public get _kittyIdToStorageId(): ReadonlyMap<number, number> {\n    return this._kittyStorage.kittyIdToStorageId;\n  }\n\n  public get pendingTransmissions(): ReadonlyMap<number, IPendingTransmission> {\n    return this._pendingTransmissions;\n  }\n}\n","/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Kitty graphics protocol types, constants, and parsing utilities.\n */\n\nimport type Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\n\n// Kitty graphics protocol action types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference under key 'a'.\nexport const enum KittyAction {\n  TRANSMIT = 't',\n  TRANSMIT_DISPLAY = 'T',\n  QUERY = 'q',\n  PLACEMENT = 'p',\n  DELETE = 'd'\n}\n\n// Kitty graphics protocol format types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference\nexport const enum KittyFormat {\n  RGB = 24,\n  RGBA = 32,\n  PNG = 100\n}\n\n// Kitty graphics protocol compression types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference under key 'o'.\nexport const enum KittyCompression {\n  NONE = '',\n  ZLIB = 'z'\n}\n\n// Kitty graphics protocol control data keys.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference\nexport const enum KittyKey {\n  // Action to perform (t=transmit, T=transmit+display, q=query, p=placement, d=delete)\n  ACTION = 'a',\n  // Image format (24=RGB, 32=RGBA, 100=PNG)\n  FORMAT = 'f',\n  // Image ID for referencing stored images\n  ID = 'i',\n  // Image number (alternative to ID, terminal assigns ID)\n  IMAGE_NUMBER = 'I',\n  // Source image width in pixels\n  WIDTH = 's',\n  // Source image height in pixels\n  HEIGHT = 'v',\n  // The left edge (in pixels) of the image area to display\n  X_OFFSET = 'x',\n  // The top edge (in pixels) of the image area to display\n  Y_OFFSET = 'y',\n  // Width (in pixels) of the source rectangle to display\n  SOURCE_WIDTH = 'w',\n  // Height (in pixels) of the source rectangle to display\n  SOURCE_HEIGHT = 'h',\n  // Horizontal offset (in pixels) within the first cell\n  X_PLACEMENT_OFFSET = 'X',\n  // Vertical offset (in pixels) within the first cell\n  Y_PLACEMENT_OFFSET = 'Y',\n  // Number of terminal columns to display the image over\n  COLUMNS = 'c',\n  // Number of terminal rows to display the image over\n  ROWS = 'r',\n  // More data flag (1=more chunks coming, 0=final chunk)\n  MORE = 'm',\n  // Compression type (z=zlib). This is essential for chunking larger images.\n  COMPRESSION = 'o',\n  // Quiet mode (1=suppress OK responses, 2=suppress error responses)\n  QUIET = 'q',\n  // Cursor movement policy (0=move cursor after image, 1=don't move cursor)\n  CURSOR_MOVEMENT = 'C',\n  // Z-index for image layering (negative = behind text, 0+ = on top)\n  Z_INDEX = 'z',\n  // Transmission medium (d=direct, f=file, t=temp file, s=shared memory)\n  TRANSMISSION = 't',\n  // Delete selector (a/A=all, i/I=by id, c/C=at cursor, etc.) — only used when a=d\n  DELETE_SELECTOR = 'd',\n  // Placement ID for targeting specific placements\n  PLACEMENT_ID = 'p'\n}\n\n// Pixel format constants\nexport const enum KittyPixelConstants {\n  BYTES_PER_PIXEL_RGB = 3,\n  BYTES_PER_PIXEL_RGBA = 4,\n  ALPHA_OPAQUE = 255\n}\n\n// Parsed Kitty graphics command.\nexport interface IKittyCommand {\n  action?: string;\n  format?: number;\n  id?: number;\n  imageNumber?: number;\n  width?: number;\n  height?: number;\n  x?: number;\n  y?: number;\n  sourceWidth?: number;\n  sourceHeight?: number;\n  xOffset?: number;\n  yOffset?: number;\n  columns?: number;\n  rows?: number;\n  more?: number;\n  quiet?: number;\n  cursorMovement?: number;\n  zIndex?: number;\n  transmission?: string;\n  deleteSelector?: string;\n  placementId?: number;\n  compression?: string;\n  payload?: string;\n}\n\n// Pending chunked transmission state.\n// Stores metadata from the first chunk while accumulating decoded payload data.\nexport interface IPendingTransmission {\n  // The parsed command from the first chunk (contains action, format, dimensions, etc.)\n  cmd: IKittyCommand;\n  // Decoder used across chunked payloads\n  decoder: Base64Decoder;\n  // Total encoded (base64) bytes received across all chunks - for size limit enforcement\n  totalEncodedSize: number;\n  // Whether any chunk has failed to decode\n  decodeError: boolean;\n}\n\n// Stored Kitty image data.\nexport interface IKittyImageData {\n  id: number;\n  // Decoded image data stored as Blob (off JS heap) to avoid 2GB heap limit\n  data: Blob;\n  width: number;\n  height: number;\n  format: 24 | 32 | 100;\n  compression?: string;\n}\n\n// Parses Kitty graphics control data into a command object.\nexport function parseKittyCommand(data: string): IKittyCommand {\n  const cmd: IKittyCommand = {};\n  const parts = data.split(',');\n\n  for (const part of parts) {\n    const eqIdx = part.indexOf('=');\n    if (eqIdx === -1) continue;\n\n    const key = part.substring(0, eqIdx);\n    const value = part.substring(eqIdx + 1);\n\n    // Handle string keys first\n    if (key === KittyKey.ACTION) {\n      cmd.action = value;\n      continue;\n    }\n    if (key === KittyKey.COMPRESSION) {\n      cmd.compression = value;\n      continue;\n    }\n    if (key === KittyKey.TRANSMISSION) {\n      cmd.transmission = value;\n      continue;\n    }\n    if (key === KittyKey.DELETE_SELECTOR) {\n      cmd.deleteSelector = value;\n      continue;\n    }\n    const numValue = parseInt(value, 10);\n    switch (key) {\n      case KittyKey.FORMAT: cmd.format = numValue; break;\n      case KittyKey.ID: cmd.id = numValue; break;\n      case KittyKey.IMAGE_NUMBER: cmd.imageNumber = numValue; break;\n      case KittyKey.WIDTH: cmd.width = numValue; break;\n      case KittyKey.HEIGHT: cmd.height = numValue; break;\n      case KittyKey.X_OFFSET: cmd.x = numValue; break;\n      case KittyKey.Y_OFFSET: cmd.y = numValue; break;\n      case KittyKey.SOURCE_WIDTH: cmd.sourceWidth = numValue; break;\n      case KittyKey.SOURCE_HEIGHT: cmd.sourceHeight = numValue; break;\n      case KittyKey.X_PLACEMENT_OFFSET: cmd.xOffset = numValue; break;\n      case KittyKey.Y_PLACEMENT_OFFSET: cmd.yOffset = numValue; break;\n      case KittyKey.COLUMNS: cmd.columns = numValue; break;\n      case KittyKey.ROWS: cmd.rows = numValue; break;\n      case KittyKey.MORE: cmd.more = numValue; break;\n      case KittyKey.QUIET: cmd.quiet = numValue; break;\n      case KittyKey.CURSOR_MOVEMENT: cmd.cursorMovement = numValue; break;\n      case KittyKey.Z_INDEX: cmd.zIndex = numValue; break;\n      case KittyKey.PLACEMENT_ID: cmd.placementId = numValue; break;\n    }\n  }\n\n  return cmd;\n}\n","/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { ImageStorage } from '../ImageStorage';\nimport { ImageLayer, IAddImageOpts } from '../Types';\nimport { IKittyImageData } from './KittyGraphicsTypes';\n\n// Kitty-specific image storage controller.\n//\n// Wraps shared ImageStorage with kitty protocol semantics:\n// - tracks transmitted image payloads by kitty image id\n// - tracks kitty image id -> shared ImageStorage id mapping for displayed images\n// - mirrors shared-storage evictions into kitty maps\n// - applies protocol-level undisplayed-image eviction policy\nexport class KittyImageStorage implements IDisposable {\n  private static readonly _maxStoredImages = 256;\n\n  private _nextImageId = 1;\n  private readonly _images: Map<number, IKittyImageData> = new Map();\n  // TODO: Support multiple placements per image. The kitty spec identifies\n  // placements by an (image id, placement id) pair — same i + different p\n  // values should coexist, and same i + same p should replace the prior\n  // placement. Currently we track only one storage entry per kitty image id,\n  // so multiple placements of the same image overwrite each other. Fixing\n  // this requires changing these maps to Map<number, Map<number, number>>\n  // (kittyId → placementId → storageId) and updating addImage/deleteById\n  // accordingly. The underlying shared ImageStorage would also need to\n  // support multiple entries per logical image.\n  private readonly _kittyIdToStorageId: Map<number, number> = new Map();\n  private readonly _storageIdToKittyId: Map<number, number> = new Map();\n\n  private readonly _previousOnImageDeleted: ((storageId: number) => void) | undefined;\n  private readonly _wrappedOnImageDeleted: (storageId: number) => void;\n  private readonly _handleStorageImageDeleted = (storageId: number): void => {\n    const kittyId = this._storageIdToKittyId.get(storageId);\n    if (kittyId !== undefined) {\n      this._kittyIdToStorageId.delete(kittyId);\n      this._storageIdToKittyId.delete(storageId);\n      this._images.delete(kittyId);\n    }\n  };\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };\n\n  constructor(\n    private readonly _storage: ImageStorage\n  ) {\n    this._previousOnImageDeleted = this._storage.onImageDeleted;\n    this._wrappedOnImageDeleted = (storageId: number) => {\n      this._previousOnImageDeleted?.(storageId);\n      this._handleStorageImageDeleted(storageId);\n    };\n    this._storage.onImageDeleted = this._wrappedOnImageDeleted;\n  }\n\n  public reset(): void {\n    this._nextImageId = 1;\n    this._images.clear();\n    this._kittyIdToStorageId.clear();\n    this._storageIdToKittyId.clear();\n  }\n\n  public dispose(): void {\n    this.reset();\n    if (this._storage.onImageDeleted === this._wrappedOnImageDeleted) {\n      this._storage.onImageDeleted = this._previousOnImageDeleted;\n    }\n  }\n\n  public storeImage(id: number | undefined, imageData: Omit<IKittyImageData, 'id'>): number {\n    const imageId = id ?? this._nextImageId++;\n\n    const oldStorageId = this._kittyIdToStorageId.get(imageId);\n    if (oldStorageId !== undefined) {\n      this._storage.deleteImage(oldStorageId);\n      this._kittyIdToStorageId.delete(imageId);\n      this._storageIdToKittyId.delete(oldStorageId);\n    }\n\n    if (!this._images.has(imageId) && this._images.size >= KittyImageStorage._maxStoredImages) {\n      this._evictUndisplayedImages();\n    }\n\n    // Encoded images awaiting placement are outside ImageStorage's pixel budget.\n    // Unplaced payloads are evicted first so a new upload cannot erase a visible\n    // image while abandoned blobs still hold budget; placed ones go only when\n    // that is not enough, because the byte cap is a hard bound. The new image is\n    // always stored, so an oversized one overshoots by at most one payload\n    // (itself bounded by kittySizeLimit) rather than being dropped after an OK ack.\n    const byteLimit = this._storage.getLimit() * 1000000;\n    this._images.delete(imageId);\n    let retainedBytes = 0;\n    for (const image of this._images.values()) retainedBytes += image.data.size;\n    for (const evictPlaced of [false, true]) {\n      for (const [oldestId, image] of this._images) {\n        if (retainedBytes + imageData.data.size <= byteLimit) break;\n        if (this._kittyIdToStorageId.has(oldestId) !== evictPlaced) continue;\n        retainedBytes -= image.data.size;\n        this.deleteById(oldestId);\n      }\n    }\n\n    this._images.set(imageId, {\n      ...imageData,\n      id: imageId\n    });\n    return imageId;\n  }\n\n  public addImage(kittyId: number, image: HTMLCanvasElement | ImageBitmap, scrolling: boolean, layer: ImageLayer, zIndex: number): void {\n    // Clean up stale reverse-mapping from a previous placement of the same\n    // kitty image.  The old shared-storage entry is kept (it may still be\n    // visible on screen) but its reverse mapping is removed so that eviction\n    // of the old entry won't incorrectly delete the kitty image data.\n    const oldStorageId = this._kittyIdToStorageId.get(kittyId);\n    if (oldStorageId !== undefined) {\n      this._storageIdToKittyId.delete(oldStorageId);\n    }\n    this._addImageOpts.scrolling = scrolling;\n    this._addImageOpts.layer = layer;\n    this._addImageOpts.zIndex = zIndex;\n    const storageId = this._storage.addImage(image, this._addImageOpts);\n    this._kittyIdToStorageId.set(kittyId, storageId);\n    this._storageIdToKittyId.set(storageId, kittyId);\n  }\n\n  public getImage(kittyId: number): IKittyImageData | undefined {\n    return this._images.get(kittyId);\n  }\n\n  public deleteById(kittyId: number): void {\n    this._images.delete(kittyId);\n    const storageId = this._kittyIdToStorageId.get(kittyId);\n    if (storageId !== undefined) {\n      this._storage.deleteImage(storageId);\n      this._kittyIdToStorageId.delete(kittyId);\n      this._storageIdToKittyId.delete(storageId);\n    }\n  }\n\n  public deleteAll(): void {\n    this._images.clear();\n    for (const storageId of this._kittyIdToStorageId.values()) {\n      this._storage.deleteImage(storageId);\n    }\n    this._kittyIdToStorageId.clear();\n    this._storageIdToKittyId.clear();\n  }\n\n  public get images(): ReadonlyMap<number, IKittyImageData> {\n    return this._images;\n  }\n\n  public get kittyIdToStorageId(): ReadonlyMap<number, number> {\n    return this._kittyIdToStorageId;\n  }\n\n  public get lastImageId(): number {\n    return this._nextImageId - 1;\n  }\n\n  private _evictUndisplayedImages(): void {\n    for (const [kittyId] of this._images) {\n      if (this._images.size <= KittyImageStorage._maxStoredImages / 2) {\n        break;\n      }\n      if (!this._kittyIdToStorageId.has(kittyId)) {\n        this._images.delete(kittyId);\n      }\n    }\n  }\n}\n","\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\n/**\n * Copyright (c) 2023, 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nconst inwasm_runtime_1 = require(\"inwasm-runtime\");\n/**\n * wasm base64 decoder.\n */\nconst wasmDecode = (0, inwasm_runtime_1.InWasm)(/*inwasm#828e69684093b2c6:rdef-start:\"decode\"*/{s:1,t:0,d:'AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML'}/*inwasm#828e69684093b2c6:rdef-end:\"decode\"*/);\n// SIMD version (speedup ~1.4x, not covered by tests yet)\n/*\nconst wasmDecode = InWasm({\n  name: 'decode',\n  type: OutputType.INSTANCE,\n  mode: OutputMode.SYNC,\n  srctype: 'Clang-C',\n  imports: {\n    env: { memory: new WebAssembly.Memory({ initial: 1 }) }\n  },\n  exports: {\n    dec: () => 0,\n    end: () => 0\n  },\n  compile: {\n    switches: ['-msimd128', '-Wl,-z,stack-size=0', '-Wl,--stack-first']\n  },\n  code: `\n    #include <wasm_simd128.h>\n    typedef struct {\n      unsigned int wp;\n      unsigned int sp;\n      unsigned int dp;\n      unsigned int e_size;\n      unsigned int dummy[4];\n      unsigned char data[0];\n    } State;\n\n    unsigned int *D0 = (unsigned int *) ${P32.D0 * 4};\n    unsigned int *D1 = (unsigned int *) ${P32.D1 * 4};\n    unsigned int *D2 = (unsigned int *) ${P32.D2 * 4};\n    unsigned int *D3 = (unsigned int *) ${P32.D3 * 4};\n    State *state = (State *) ${P32.STATE * 4};\n\n    #define packed_byte(x) wasm_i8x16_splat((char) x)\n    #define packed_dword(x) wasm_i32x4_splat(x)\n    #define masked(x, mask) wasm_v128_and(x, wasm_i32x4_splat(mask))\n\n    __attribute__((noinline)) int dec() {\n      unsigned int nsp = (state->wp - 1) & ~3;\n      unsigned char *src = state->data + state->sp;\n      unsigned char *end = state->data + nsp;\n      unsigned char *dst = state->data + state->dp;\n      unsigned int error = 0;\n\n      v128_t err = wasm_i8x16_splat(0);\n      unsigned char *end16 = state->data + (nsp & ~15);\n      while (src < end16) {\n        v128_t data = wasm_v128_load((v128_t *) src);\n\n        // wasm-simd rewrite of http://0x80.pl/notesen/2016-01-17-sse-base64-decoding.html#vector-lookup-pshufb\n        const v128_t higher_nibble = wasm_u32x4_shr(data, 4) & packed_byte(0x0f);\n        const char linv = 1;\n        const char hinv = 0;\n\n        const v128_t lower_bound_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          linv, linv, 0x2b, 0x30,\n          0x41, 0x50, 0x61, 0x70,\n          linv, linv, linv, linv,\n          linv, linv, linv, linv\n        );\n        const v128_t upper_bound_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          hinv, hinv, 0x2b, 0x39,\n          0x4f, 0x5a, 0x6f, 0x7a,\n          hinv, hinv, hinv, hinv,\n          hinv, hinv, hinv, hinv\n        );\n        // the difference between the shift and lower bound\n        const v128_t shift_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          0x00,        0x00,        0x3e - 0x2b, 0x34 - 0x30,\n          0x00 - 0x41, 0x0f - 0x50, 0x1a - 0x61, 0x29 - 0x70,\n          0x00,        0x00,        0x00,        0x00,\n          0x00,        0x00,        0x00,        0x00\n        );\n\n        const v128_t upper_bound = wasm_i8x16_swizzle(upper_bound_LUT, higher_nibble);\n        const v128_t lower_bound = wasm_i8x16_swizzle(lower_bound_LUT, higher_nibble);\n\n        const v128_t below = wasm_i8x16_lt(data, lower_bound);\n        const v128_t above = wasm_i8x16_gt(data, upper_bound);\n        const v128_t eq_2f = wasm_i8x16_eq(data, packed_byte(0x2f));\n\n        // in_range = not (below or above) or eq_2f\n        // outside  = not in_range = below or above and not eq_2f (from deMorgan law)\n        const v128_t outside = wasm_v128_andnot(eq_2f, above | below);\n        err = wasm_v128_or(err, outside);\n\n        const v128_t shift  = wasm_i8x16_swizzle(shift_LUT, higher_nibble);\n        const v128_t t0     = wasm_i8x16_add(data, shift);\n        v128_t v = wasm_i8x16_add(t0, wasm_v128_and(eq_2f, packed_byte(-3)));\n\n        // pack bytes\n        const v128_t ca = masked(v, 0x003f003f);\n        const v128_t db = masked(v, 0x3f003f00);\n        const v128_t t00 = wasm_v128_or(wasm_u32x4_shr(db, 8), wasm_i32x4_shl(ca, 6));\n        v128_t res = wasm_v128_or(wasm_u32x4_shr(t00, 16), wasm_i32x4_shl(t00, 12));\n        res = wasm_i8x16_swizzle(res, wasm_i8x16_const(2, 1, 0, 6, 5, 4, 10, 9, 8, 14, 13, 12, 16, 16, 16, 16));\n\n        wasm_v128_store((v128_t *) dst, res);\n        dst += 12;\n        src += 16;\n      }\n      //if (wasm_i8x16_bitmask(err) != 0) return -1;\n      if (wasm_v128_any_true(err)) return -1;\n\n      // operate on 4-byte blocks\n      while (src < end) {\n        error |= *((unsigned int *) dst) = D0[src[0]] | D1[src[1]] | D2[src[2]] | D3[src[3]];\n        dst += 3;\n        src += 4;\n      }\n      if (error >> 24) return -1;\n      state->sp = nsp;\n      state->dp = dst - state->data;\n      return 0;\n    }\n\n    int end() {\n      int rem = state->wp - state->sp;\n      if (rem > 4 && dec()) return -1;\n      rem = state->wp - state->sp;\n      if (rem < 2) return -1;\n\n      unsigned char *src = state->data + state->sp;\n      if (rem == 4) {\n        if (src[3] == 61) rem--;\n        if (src[2] == 61) rem--;\n      }\n      unsigned int accu = D0[src[0]] | D1[src[1]];\n      int dp = 1;\n      if (rem > 2) {\n        accu |= D2[src[2]];\n        dp++;\n        if (rem == 4) {\n          accu |= D3[src[3]];\n          dp++;\n        }\n      }\n      if (accu >> 24) return -1;\n      *((unsigned int *) (state->data + state->dp)) = accu;\n      state->dp += dp;\n      return 0;\n    }\n    `\n});\n*/\n// base64 map\nconst MAP = new Uint8Array('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'\n    .split('')\n    .map(el => el.charCodeAt(0)));\n// init decoder maps in LE order\nconst D = new Uint32Array(1024);\nD.fill(0xFF000000);\nfor (let i = 0; i < MAP.length; ++i)\n    D[MAP[i]] = i << 2;\nfor (let i = 0; i < MAP.length; ++i)\n    D[256 + MAP[i]] = i >> 4 | ((i << 4) & 0xFF) << 8;\nfor (let i = 0; i < MAP.length; ++i)\n    D[512 + MAP[i]] = (i >> 2) << 8 | ((i << 6) & 0xFF) << 16;\nfor (let i = 0; i < MAP.length; ++i)\n    D[768 + MAP[i]] = i << 16;\nconst EMPTY = new Uint8Array(0);\n/**\n * base64 stream decoder.\n *\n * Features / assumptions:\n * - lazy chunkwise decoding\n * - errors out on any non base64 chars (no support for NL formatted base64)\n * - decodes in wasm\n * - inplace decoding to save memory\n * - supports a keepSize for lazy memory release\n */\nclass Base64Decoder {\n    /**\n     * @param keepSize Keep the wasm instance below this limit when calling `release()`.\n     * @param maxBytes Max allowed bytes to allocate.\n     * @param initialBytes Initial bytes to allocate.\n     */\n    constructor(keepSize, maxBytes, initialBytes) {\n        this._inst = null;\n        this._ended = true;\n        this._bytes = 0;\n        this.keepSize = keepSize !== null && keepSize !== void 0 ? keepSize : 1048576 /* Bytes.KEEP */;\n        this.maxBytes = maxBytes !== null && maxBytes !== void 0 ? maxBytes : 4294901760 /* Bytes.MAX */;\n        this._bytes = initialBytes !== null && initialBytes !== void 0 ? initialBytes : 32768 /* Bytes.INITIAL */;\n        if (this._bytes > this.maxBytes || this.maxBytes > 4294901760 /* Bytes.MAX */) {\n            throw new Error('invalid byte settings');\n        }\n    }\n    /**\n     * Currently decoded bytes (borrowed).\n     * Must be accessed before calling `release` or `init`.\n     */\n    get data8() {\n        return this._inst ? this._d.subarray(0, this._m32[1282 /* P32.STATE_DP */]) : EMPTY;\n    }\n    /**\n     * Release memory conditionally based on `keepSize`.\n     * If memory gets released, also the wasm instance will be freed and recreated on next `init`,\n     * otherwise the instance will be reused.\n     */\n    release() {\n        if (!this._inst)\n            return;\n        if (this._bytes > this.keepSize) {\n            this._inst = this._m32 = this._d = this._mem = null;\n        }\n        else {\n            this._m32[1280 /* P32.STATE_WP */] = 0;\n            this._m32[1281 /* P32.STATE_SP */] = 0;\n            this._m32[1282 /* P32.STATE_DP */] = 0;\n        }\n    }\n    /**\n     * Initializes the decoder for new base64 data.\n     * Must be called before doing any decoding attempts.\n     * The method will either spawn a new wasm instance or grow\n     * the needed memory of an existing instance.\n     * @param maxBytes Max allowed bytes to allocate (overwrites ctor value).\n     * @param initialBytes Initial bytes to allocate (overwrites ctor value).\n     */\n    init(maxBytes, initialBytes) {\n        this.maxBytes = maxBytes !== null && maxBytes !== void 0 ? maxBytes : this.maxBytes;\n        this._bytes = initialBytes !== null && initialBytes !== void 0 ? initialBytes : Math.min(this._bytes, this.maxBytes);\n        if (this._bytes > this.maxBytes || this.maxBytes > 4294901760 /* Bytes.MAX */) {\n            throw Error('invalid byte settings');\n        }\n        let m = this._m32;\n        const bytes = this._bytes + 5152 /* Bytes._DATA_OFFSET */;\n        if (!this._inst) {\n            this._mem = new WebAssembly.Memory({ initial: Math.ceil(bytes / 65536) });\n            this._inst = wasmDecode({ env: { memory: this._mem } });\n            m = new Uint32Array(this._mem.buffer, 0);\n            m.set(D, 256 /* P32.D0 */);\n            this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n        }\n        else if (this._mem.buffer.byteLength < bytes) {\n            this._mem.grow(Math.ceil((bytes - this._mem.buffer.byteLength) / 65536));\n            m = new Uint32Array(this._mem.buffer, 0);\n            this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n        }\n        m[1280 /* P32.STATE_WP */] = 0;\n        m[1281 /* P32.STATE_SP */] = 0;\n        m[1282 /* P32.STATE_DP */] = 0;\n        this._m32 = m;\n        this._ended = false;\n    }\n    /**\n     * Realloc memory. Realloc only happens, if the requested\n     * size doesn't fit in the current memory.\n     * The new size will be capped by `maxBytes`.\n     * @param requested Bytes to be stored.\n     */\n    _realloc(requested) {\n        const needed = this._m32[1280 /* P32.STATE_WP */] + requested;\n        if (this._bytes < needed) {\n            if (needed > this.maxBytes) {\n                return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n            }\n            let newSize = this._bytes;\n            while ((newSize *= 2) < needed) { }\n            newSize = Math.min(newSize, this.maxBytes);\n            if (newSize < needed) {\n                return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n            }\n            if (newSize + 5152 /* Bytes._DATA_OFFSET */ > this._mem.buffer.byteLength) {\n                const addPages = Math.ceil((newSize + 5152 /* Bytes._DATA_OFFSET */ - this._mem.buffer.byteLength) / 65536);\n                this._mem.grow(addPages);\n                this._m32 = new Uint32Array(this._mem.buffer, 0);\n                this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n            }\n            this._bytes = newSize;\n        }\n        return 0 /* DecodeStatus.OK */;\n    }\n    /**\n     * Put bytes in `data` into the decoder.\n     * Additionally decodes the payload, if it reached 2^17 bytes.\n     * The return value indicates the type of issue.\n     * @param data Bytes to be loaded.\n     */\n    put(data) {\n        if (!this._inst || this._ended) {\n            return -2 /* DecodeStatus.NOT_INITIALIZED */;\n        }\n        if (this._realloc(data.length)) {\n            return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n        }\n        const m = this._m32;\n        this._d.set(data, m[1280 /* P32.STATE_WP */]);\n        m[1280 /* P32.STATE_WP */] += data.length;\n        // max chunk in input handler is 2^17, try to run in \"tandem mode\"\n        return m[1280 /* P32.STATE_WP */] - m[1281 /* P32.STATE_SP */] >= 131072\n            ? this._inst.exports.dec()\n            : 0 /* DecodeStatus.OK */;\n    }\n    /**\n     * End the current decoding.\n     * Also decodes leftover payload from previous put calls.\n     */\n    end() {\n        this._ended = true;\n        return this._inst\n            ? this._inst.exports.end()\n            : -2 /* DecodeStatus.NOT_INITIALIZED */;\n    }\n    /**\n     * Bytes loaded into the decoder.\n     */\n    get loadedBytes() {\n        return this._inst\n            ? this._m32[1280 /* P32.STATE_WP */]\n            : 0;\n    }\n    /**\n     * Free bytes to feed to the decoder.\n     */\n    get freeBytes() {\n        return this._inst\n            ? this.maxBytes - this._m32[1280 /* P32.STATE_WP */]\n            : 0;\n    }\n}\nexports.default = Base64Decoder;\n//# sourceMappingURL=Base64Decoder.wasm.js.map","\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\n/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nconst inwasm_runtime_1 = require(\"inwasm-runtime\");\nconst wasmQoiDecode = (0, inwasm_runtime_1.InWasm)(/*inwasm#459f9e1bfb80b1a8:rdef-start:\"qoi_decode\"*/{s:1,t:0,d:'AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw=='}/*inwasm#459f9e1bfb80b1a8:rdef-end:\"qoi_decode\"*/);\nclass QoiDecoder {\n    constructor(keepSize) {\n        this.keepSize = keepSize;\n        this.width = 0;\n        this.height = 0;\n    }\n    decode(d) {\n        this.width = d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7];\n        this.height = d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11];\n        const pixels = this.width * this.height;\n        const ib = pixels * 4;\n        const dl = d.length;\n        /**\n         * byte/offset calculation:\n         * To save some memory we dont reserve full memory for decoded + encoded,\n         * but place encoded at the end of decoded plus 50% security distance\n         * to avoid reads before writes positions:\n         *\n         * encoded < decoded (good compression)\n         *    enc                                              ####################\n         *    dec                 #######################################\n         *                        ^                            ^\n         *                        DST_P                        CHUNK_P\n         *\n         * encoded > decoded (degenerated compression, should not happen)\n         *    enc                           ##############################\n         *    dec                 ####################\n         *                        ^         ^\n         *                        DST_P     CHUNK_P\n         *\n         * There is still a chance for overlapping r/w positions in case the compressed\n         * data has very different pixel progression, yet the 50% security distance\n         * should deal with that, as QOI will bloat data by 25% at max (RGB -> OP byte + RGB).\n         * Since we always assume RGBA at decoding stage, the possible bloat reduces to 20% at max.\n         */\n        const bytes = Math.max(ib, dl) + (Math.min(ib, dl) >> 1) + 4096;\n        if (!this._inst) {\n            this._mem = new WebAssembly.Memory({ initial: Math.ceil(bytes / 65536) });\n            this._inst = wasmQoiDecode({ env: { memory: this._mem } });\n        }\n        else if (this._mem.buffer.byteLength < bytes) {\n            this._mem.grow(Math.ceil((bytes - this._mem.buffer.byteLength) / 65536));\n            this._d = null;\n        }\n        if (!this._d) {\n            this._d = new Uint8Array(this._mem.buffer);\n        }\n        // put src data at the end of memory, also align to 256\n        const chunkP = (this._mem.buffer.byteLength - dl) & ~0xFF;\n        this._d.set(d, chunkP);\n        this._inst.exports.dec(chunkP, dl, pixels);\n        return this._d.subarray(1024 /* P8.DST_P */, 1024 /* P8.DST_P */ + ib);\n    }\n    release() {\n        if (!this._inst)\n            return;\n        if (this._mem.buffer.byteLength > this.keepSize) {\n            this._inst = this._d = this._mem = null;\n        }\n    }\n}\nexports.default = QoiDecoder;\n//# sourceMappingURL=QoiDecoder.wasm.js.map","\"use strict\";\n/**\n * Copyright (c) 2022, 2026 Joerg Breitbart\n * @license MIT\n */\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.InWasm = InWasm;\nlet z = (s) => {\n    if (Uint8Array.fromBase64)\n        return Uint8Array.fromBase64(s);\n    if (typeof Buffer !== 'undefined')\n        return Buffer.from(s, 'base64');\n    const b = atob(s);\n    const r = new Uint8Array(b.length);\n    for (let i = 0; i < r.length; ++i)\n        r[i] = b.charCodeAt(i);\n    return r;\n};\nfunction InWasm(def) {\n    if (def.d) {\n        const { t, s, d } = def;\n        let b;\n        let m;\n        const W = WebAssembly;\n        if (t === 0 /* OutputType.INSTANCE */) {\n            if (s)\n                return (e) => new W.Instance(m || (m = new W.Module(b || (b = z(d)))), e);\n            return (e) => m\n                ? W.instantiate(m, e)\n                : W.instantiate(b || (b = z(d)), e).then(r => (m = r.module) && r.instance);\n        }\n        if (t === 1 /* OutputType.MODULE */) {\n            if (s)\n                return () => m || (m = new W.Module(b || (b = z(d))));\n            return () => m\n                ? Promise.resolve(m)\n                : W.compile(b || (b = z(d))).then(r => m = r);\n        }\n        if (s)\n            return () => b || (b = z(d));\n        return () => Promise.resolve(b || (b = z(d)));\n    }\n    if (typeof _wasmCtx === 'undefined')\n        throw new Error('must run \"inwasm\"');\n    _wasmCtx.add(def);\n}\n//# sourceMappingURL=index.js.map","// The module cache\nvar __webpack_module_cache__ = {};\n\n// The require function\nfunction __webpack_require__(moduleId) {\n\t// Check if module is in cache\n\tvar cachedModule = __webpack_module_cache__[moduleId];\n\tif (cachedModule !== undefined) {\n\t\treturn cachedModule.exports;\n\t}\n\t// Create a new module (and put it into the cache)\n\tvar module = __webpack_module_cache__[moduleId] = {\n\t\t// no module.id needed\n\t\t// no module.loaded needed\n\t\texports: {}\n\t};\n\n\t// Execute the module function\n\t__webpack_modules__[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n\t// Return the exports of the module\n\treturn module.exports;\n}\n\n","/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport type { ITerminalAddon, IDisposable } from '@xterm/xterm';\nimport type { ImageAddon as IImageApi } from '@xterm/addon-image';\nimport { Emitter, type IEvent } from 'common/Event';\nimport { IIPHandler } from './IIPHandler';\nimport { ImageRenderer } from './ImageRenderer';\nimport { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';\nimport { KittyGraphicsHandler } from './kitty/KittyGraphicsHandler';\nimport { KittyImageStorage } from './kitty/KittyImageStorage';\nimport { SixelHandler } from './SixelHandler';\nimport { SixelImageStorage } from './SixelImageStorage';\nimport { IIPImageStorage } from './IIPImageStorage';\nimport { ITerminalExt, IImageAddonOptions, IResetHandler } from './Types';\n\n\n/**\n * Document VT features provided by this addon.\n *\n * @vt: #E[Supported via @xterm/addon-image.] DCS SIXEL \"SIXEL Graphics\"  \"DCS Ps ; Ps ; Ps ; q Pt ST\"  \"Draw SIXEL image.\"\n *\n * Sixel support is provided by the addon @xterm/addon-image with these limitations:\n * - immediate coloring (no shared palette, allows high color settings of `img2sixel`)\n * - max. palette size of 4096 colors\n * - max. pixel width of 16K\n * - max. 25 MB per sixel sequence\n * - VT340 cursor positioning (begin of last sixel data row)\n *\n * See [addon readme](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image) for more details.\n *\n *\n * @vt: #E[Supported via @xterm/addon-image.] OSC 1337  \"iTerm2 Commands\"   \"OSC 1337 ; Pt BEL\"  \"Custom iTerm2 commands.\"\n *\n * Only the inline image protocol (IIP) is supported by the addon @xterm/addon-image with\n * the following limitations:\n * - sequence:\n *   - format: `OSC 1337 ; File=inline=1 ; size=<unencoded size> ; ... : <base64 payload> BEL`\n *   - size param must be set and payload may not exceed CEIL(size * 4 / 3)\n *   - strict base64 handling as of RFC4648 §4 (standard alphabet, optional padding,\n *     no separator bytes allowed)\n *   - supported params: size, name, width, height, preserveAspectRatio\n * - image formats: PNG, JPEG and GIF\n * - no animation support (renders first image of a GIF)\n * - no multipart support\n * - VT340 cursor positioning (begin of last sixel data row)\n *\n * See [addon readme](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image)\n * and [iTerm2 IIP docs](https://iterm2.com/documentation-images.html) for more details.\n *\n *\n * @vt: #E[Supported via @xterm/addon-image.] APC KITTY_GRAPHICS \"Kitty Graphics\"  \"APC G Pt ST\"  \"Kitty Graphics Protocol.\"\n *\n * Kitty graphics support is provided by the addon @xterm/addon-image.\n * Note that while basic image output already works, this is still work in progress.\n */\n\n// default values of addon ctor options\nconst DEFAULT_OPTIONS: IImageAddonOptions = {\n  enableSizeReports: true,\n  pixelLimit: 16777216, // limit to 4096 * 4096 pixels\n  sixelSupport: true,\n  sixelScrolling: true,\n  sixelPaletteLimit: 4096,\n  sixelSizeLimit: 33554432,\n  storageLimit: 128,\n  showPlaceholder: true,\n  iipSupport: true,\n  iipSizeLimit: 33554432,\n  kittySupport: true,\n  kittySizeLimit: 33554432\n};\n\n// max palette size supported by the sixel lib (compile time setting)\nconst MAX_SIXEL_PALETTE_SIZE = 4096;\n\n// definitions for _xtermGraphicsAttributes sequence\nconst enum GaItem {\n  COLORS = 1,\n  SIXEL_GEO = 2,\n  REGIS_GEO = 3\n}\nconst enum GaAction {\n  READ = 1,\n  SET_DEFAULT = 2,\n  SET = 3,\n  READ_MAX = 4\n}\nconst enum GaStatus {\n  SUCCESS = 0,\n  ITEM_ERROR = 1,\n  ACTION_ERROR = 2,\n  FAILURE = 3\n}\n\n\nexport class ImageAddon implements ITerminalAddon, IImageApi {\n  private _opts: IImageAddonOptions;\n  private _defaultOpts: IImageAddonOptions;\n  private _storage: ImageStorage | undefined;\n  private _renderer: ImageRenderer | undefined;\n  private _disposables: IDisposable[] = [];\n  private _terminal: ITerminalExt | undefined;\n  private _handlers: Map<String, IResetHandler> = new Map();\n  private readonly _onImageAdded = new Emitter<void>();\n  public readonly onImageAdded: IEvent<void> = this._onImageAdded.event;\n\n  constructor(opts?: Partial<IImageAddonOptions>) {\n    this._opts = Object.assign({}, DEFAULT_OPTIONS, opts);\n    this._defaultOpts = Object.assign({}, DEFAULT_OPTIONS, opts);\n  }\n\n  public dispose(): void {\n    for (const handler of this._handlers.values()) handler.reset();\n    for (const obj of this._disposables) {\n      obj.dispose();\n    }\n    this._disposables.length = 0;\n    this._handlers.clear();\n    this._onImageAdded.dispose();\n  }\n\n  private _disposeLater(...args: IDisposable[]): void {\n    for (const obj of args) {\n      this._disposables.push(obj);\n    }\n  }\n\n  public activate(terminal: ITerminalExt): void {\n    this._terminal = terminal;\n\n    // internal data structures\n    this._renderer = new ImageRenderer(terminal);\n    this._storage = new ImageStorage(terminal, this._renderer, this._opts);\n    this._storage.onImageAdded = () => this._onImageAdded.fire();\n\n    // enable size reports\n    if (this._opts.enableSizeReports) {\n      const windowOps = terminal.options.windowOptions ?? {};\n      windowOps.getWinSizePixels = true;\n      windowOps.getCellSizePixels = true;\n      windowOps.getWinSizeChars = true;\n      terminal.options.windowOptions = windowOps;\n    }\n\n    this._disposeLater(\n      this._renderer,\n      this._storage,\n\n      // DECSET/DECRST/DA1/XTSMGRAPHICS handlers\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'h' }, params => this._decset(params)),\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'l' }, params => this._decrst(params)),\n      terminal.parser.registerCsiHandler({ final: 'c' }, params => this._da1(params)),\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'S' }, params => this._xtermGraphicsAttributes(params)),\n\n      // render hook\n      terminal.onRender(range => this._storage?.render(range)),\n\n      /**\n       * reset handlers covered:\n       * - DECSTR\n       * - RIS\n       * - Terminal.reset()\n       */\n      terminal.parser.registerCsiHandler({ intermediates: '!', final: 'p' }, () => this.reset()),\n      terminal.parser.registerEscHandler({ final: 'c' }, () => this.reset()),\n      terminal._core._inputHandler.onRequestReset(() => this.reset()),\n\n      // wipe canvas and delete alternate images on buffer switch\n      terminal.buffer.onBufferChange(() => this._storage?.wipeAlternate()),\n\n      // extend images to the right on resize\n      terminal.onResize(metrics => this._storage?.viewportResize(metrics))\n    );\n\n    // SIXEL handler\n    if (this._opts.sixelSupport) {\n      const sixelStorage = new SixelImageStorage(this._storage!, this._opts, this._renderer!, terminal);\n      const sixelHandler = new SixelHandler(this._opts, sixelStorage, terminal);\n      this._handlers.set('sixel', sixelHandler);\n      this._disposeLater(\n        terminal._core._inputHandler._parser.registerDcsHandler({ final: 'q' }, sixelHandler)\n      );\n    }\n\n    // iTerm IIP handler\n    if (this._opts.iipSupport) {\n      const iipStorage = new IIPImageStorage(this._storage!);\n      const iipHandler = new IIPHandler(this._opts, this._renderer!, iipStorage, terminal);\n      this._handlers.set('iip', iipHandler);\n      this._disposeLater(\n        terminal._core._inputHandler._parser.registerOscHandler(1337, iipHandler)\n      );\n    }\n\n    // Kitty graphics handler\n    if (this._opts.kittySupport) {\n      const kittyStorage = new KittyImageStorage(this._storage!);\n      const kittyHandler = new KittyGraphicsHandler(this._opts, this._renderer!, kittyStorage, terminal);\n      this._handlers.set('kitty', kittyHandler);\n      this._disposeLater(\n        kittyStorage,\n        kittyHandler,\n        terminal._core._inputHandler._parser.registerApcHandler({ final: 'G' }, kittyHandler)\n      );\n    }\n  }\n\n  // Note: storageLimit is skipped here to not intoduce a surprising side effect.\n  public reset(): boolean {\n    // reset options customizable by sequences to defaults\n    this._opts.sixelScrolling = this._defaultOpts.sixelScrolling;\n    this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit;\n    // also clear image storage\n    this._storage?.reset();\n    // reset protocol handlers\n    for (const handler of this._handlers.values()) {\n      handler.reset();\n    }\n    return false;\n  }\n\n  public get storageLimit(): number {\n    return this._storage?.getLimit() || -1;\n  }\n\n  public set storageLimit(limit: number) {\n    this._storage?.setLimit(limit);\n    this._opts.storageLimit = limit;\n  }\n\n  public get storageUsage(): number {\n    if (this._storage) {\n      return this._storage.getUsage();\n    }\n    return -1;\n  }\n\n  public get showPlaceholder(): boolean {\n    return this._opts.showPlaceholder;\n  }\n\n  public set showPlaceholder(value: boolean) {\n    this._opts.showPlaceholder = value;\n    this._renderer?.showPlaceholder(value);\n  }\n\n  public getImageAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    return this._storage?.getImageAtBufferCell(x, y);\n  }\n\n  public extractTileAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    return this._storage?.extractTileAtBufferCell(x, y);\n  }\n\n  private _report(s: string): void {\n    this._terminal?._core.input(s, false);\n  }\n\n  private _decset(params: (number | number[])[]): boolean {\n    for (let i = 0; i < params.length; ++i) {\n      switch (params[i]) {\n        case 80:\n          this._opts.sixelScrolling = false;\n          break;\n      }\n    }\n    return false;\n  }\n\n  private _decrst(params: (number | number[])[]): boolean {\n    for (let i = 0; i < params.length; ++i) {\n      switch (params[i]) {\n        case 80:\n          this._opts.sixelScrolling = true;\n          break;\n      }\n    }\n    return false;\n  }\n\n  // overload DA to return something more appropriate\n  private _da1(params: (number | number[])[]): boolean {\n    if (params[0]) {\n      return true;\n    }\n    // reported features:\n    // 62 - VT220\n    // 4 - SIXEL support\n    // 9 - charsets\n    // 22 - ANSI colors\n    if (this._opts.sixelSupport) {\n      this._report(`\\x1b[?62;4;9;22c`);\n      return true;\n    }\n    return false;\n  }\n\n  /**\n   * Implementation of xterm's graphics attribute sequence.\n   *\n   * Supported features:\n   * - read/change palette limits (max 4096 by sixel lib)\n   * - read SIXEL canvas geometry (reports current window canvas or\n   *   squared pixelLimit if canvas > pixel limit)\n   *\n   * Everything else is deactivated.\n   */\n  private _xtermGraphicsAttributes(params: (number | number[])[]): boolean {\n    if (params.length < 2) {\n      return true;\n    }\n    if (params[0] === GaItem.COLORS) {\n      switch (params[1]) {\n        case GaAction.READ:\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          return true;\n        case GaAction.SET_DEFAULT:\n          this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit;\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          // also reset protocol handlers for now\n          for (const handler of this._handlers.values()) {\n            handler.reset();\n          }\n          return true;\n        case GaAction.SET:\n          if (params.length > 2 && !(params[2] instanceof Array) && params[2] <= MAX_SIXEL_PALETTE_SIZE) {\n            this._opts.sixelPaletteLimit = params[2];\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          } else {\n            this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          }\n          return true;\n        case GaAction.READ_MAX:\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${MAX_SIXEL_PALETTE_SIZE}S`);\n          return true;\n        default:\n          this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          return true;\n      }\n    }\n    if (params[0] === GaItem.SIXEL_GEO) {\n      switch (params[1]) {\n        // we only implement read and read_max here\n        case GaAction.READ:\n          let width = this._renderer?.dimensions?.css.canvas.width;\n          let height = this._renderer?.dimensions?.css.canvas.height;\n          if (!width || !height) {\n            // for some reason we have no working image renderer\n            // --> fallback to default cell size\n            const cellSize = CELL_SIZE_DEFAULT;\n            width = (this._terminal?.cols || 80) * cellSize.width;\n            height = (this._terminal?.rows || 24) * cellSize.height;\n          }\n          if (width * height < this._opts.pixelLimit) {\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${width.toFixed(0)};${height.toFixed(0)}S`);\n          } else {\n            // if we overflow pixelLimit report that squared instead\n            const x = Math.floor(Math.sqrt(this._opts.pixelLimit));\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${x};${x}S`);\n          }\n          return true;\n        case GaAction.READ_MAX:\n          // read_max returns pixelLimit as square area\n          const x = Math.floor(Math.sqrt(this._opts.pixelLimit));\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${x};${x}S`);\n          return true;\n        default:\n          this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          return true;\n      }\n    }\n    // exit with error on ReGIS or any other requests\n    this._report(`\\x1b[?${params[0]};${GaStatus.ITEM_ERROR}S`);\n    return true;\n  }\n}\n"],"names":["root","factory","exports","module","define","amd","globalThis","red","n","green","blue","toRGBA8888","r","g","b","a","clamp","low","high","value","Math","max","min","h2c","t1","t2","c","normalizeRGB","round","Object","defineProperty","DEFAULT_FOREGROUND","DEFAULT_BACKGROUND","PALETTE_ANSI_256","PALETTE_VT340_GREY","PALETTE_VT340_COLOR","normalizeHLS","nearestColorIndex","fromRGBA8888","alpha","BIG_ENDIAN","Uint8Array","Uint32Array","buffer","console","warn","color","palette","Number","MAX_SAFE_INTEGER","idx","i","length","dr","dg","db","d","h","l","s","v","HLStoRGB","p","push","decodeAsync","decode","Decoder","DecoderAsync","Colors_1","__webpack_require__","wasm_1","WASM_BYTES","Buffer","from","bytestring","atob","result","charCodeAt","decodeBase64","LIMITS","BYTES","WASM_MODULE","NULL_CANVAS","CallbackProxy","constructor","this","bandHandler","width","modeHandler","mode","handle_band","mode_parsed","DEFAULT_OPTIONS","memoryLimit","sixelColor","fillColor","paletteLimit","PALETTE_SIZE","truncate","opts","cbProxy","importObj","env","bind","WebAssembly","instantiate","then","inst","instance","_instance","_cbProxy","_PIXEL_OFFSET","MAX_WIDTH","_canvas","_bandWidths","_maxWidth","_minWidth","_lastOffset","_currentHeight","_opts","assign","Error","_handle_band","_initCanvas","Module","Instance","_wasm","_chunk","memory","get_chunk_address","CHUNK_SIZE","_states","get_state_address","_palette","get_palette_address","set","_pSrc","get_p0_address","init","_fillColor","_truncate","_rasterWidth","_rasterHeight","_width","_height","_level","_mode","_paletteLimit","pixels","height","release","_realloc","offset","additionalPixels","newCanvas","ceil","adv","remaining","subarray","current_width","current_height","memoryUsage","byteLength","properties","level","memUsage","rasterAttributes","numerator","denominator","data","start","end","decodeString","j","data32","currentWidth","fill","escape","final","finalOffset","bw","currentHeight","data8","Uint8ClampedArray","dec","async","Lifecycle_1","EventUtils","_listeners","_disposed","event","_event","listener","thisArgs","disposables","toDisposable","entry","fn","slice","indexOf","splice","Array","isArray","add","fire","call","listeners","len","dispose","forward","to","e","map","undefined","any","events","store","DisposableStore","runAndSubscribe","handler","initial","arg","_disposables","Set","_isDisposed","isDisposed","o","clear","Disposable","_store","_register","None","freeze","_value","ImageRenderer_1","ImageStorage_1","Base64Decoder_wasm_1","__importDefault","QoiDecoder_wasm_1","IIPHeaderParser_1","IIPMetrics_1","DEFAULT_HEADER","type","name","size","preserveAspectRatio","inline","_renderer","_storage","_coreTerminal","_generation","_aborted","_hp","HeaderParser","_header","_isMultipart","_abortMulti","maxEncodedBytes","iipSizeLimit","initialBytes","_dec","default","_qoiDec","reset","put","state","dataPos","parse","fields","success","seqType","w","CELL_SIZE_DEFAULT","dimensions","css","canvas","cols","rows","scale","_c","_a","_core","_coreBrowserService","dpr","report","toFixed","input","cond","blob","metrics","UNSUPPORTED_TYPE","imageType","mime","pixelLimit","_resize","floor","ImageData","byteOffset","ImageRenderer","createCanvas","_b","getContext","putImageData","addImage","Blob","generation","createImageBitmap","resizeWidth","resizeHeight","bm","close","catch","cw","cell","ch","_d","rw","_dim","rh","wf","hf","f","total","cdim","endsWith","parseInt","toStr","String","fromCharCode","toInt","toSize","match","DECODERS","toString","bs","TextDecoder","FILE_MARKER","MULTIPARTFILE_MARKER","FILEPART_MARKER","FILEEND_MARKER","REPORTCELLSIZE_MARKER","MAX_FIELDCHARS","_buffer","_position","_key","k","_storeValue","pos","_storeKey","_addImageOpts","scrolling","layer","zIndex","cursorPos","img","d32","blockLength","jpgSize","dim","limit","_layers","get","localDocument","document","createElement","createImageData","ctx","imgData","Promise","resolve","_terminal","super","Map","_optionsRefresh","MutableDisposable","_oldOpen","open","parent","_open","screenElement","optionsService","onOptionChange","option","rescaleCanvas","_renderService","refreshRows","removeLayerFromDom","_oldSetRenderer","setRenderer","_placeholderBitmap","_placeholder","showPlaceholder","cellSize","_createPlaceHolder","clearLines","y","clearRect","_e","clearAll","draw","imgSpec","tileId","col","row","count","_rescaleImage","actual","sourceWidth","sourceHeight","actualCellSize","sx","sy","dx","dy","finalWidth","finalHeight","drawImage","extractTile","drawPlaceholder","values","spec","originalWidth","originalHeight","origCellSize","orig","scaledWidth","scaledHeight","renderer","key","keys","insertLayerToDom","has","classList","style","isolation","insertBefore","firstChild","appendChild","remove","delete","hasLayer","bWidth","blueprint","black","white","shift","x","screen","ctx2","placeholder","bitmap","window","ExtendedAttrsImage","ext","_urlId","_ext","underlineStyle","underlineColor","underlineVariantOffset","val","urlId","imageId","clone","isEmpty","EMPTY_ATTRS","_images","_lastId","_lowestId","_fullyCleared","_needsFullClear","_pixelLimit","setLimit","storageLimit","error","message","getLimit","_viewportMetrics","marker","RangeError","_evictOldest","getUsage","_getStoredPixels","storedPixels","_delImg","id","ImageBitmap","onImageDeleted","wipeAlternate","zero","entries","bufferType","deleteImage","termCols","termRows","originX","originY","tileCount","_inputHandler","_dirtyRowTracker","markDirty","line","lines","ybase","_writeToCell","lineFeed","endMarker","registerMarker","onDispose","active","_evictOnAlternate","onImageAdded","render","range","hasTopImages","hasBottomImages","drawCalls","placeholderCalls","ydisp","getBg","_extendedAttrs","startTile","startCol","sort","viewportResize","oldCol","tilesPerRow","hasData","rightCol","_data","lastTile","expandCol","getImageAtBufferCell","extractTileAtBufferCell","room","used","current","old","oldSpec","imgId","Decoder_1","DEFAULT_PALETTE","convertLe","_size","sixelPaletteLimit","hook","params","attr","colors","bg","isInverse","isFgDefault","foreground","rgba","isFgRGB","t","toColorRGB","getFgColor","ansi","isBgDefault","background","isBgRGB","getBgColor","extractActiveBg","_curAttrData","_themeService","sixelSizeLimit","unhook","advanceCursor","sixelScrolling","KittyGraphicsTypes_1","_kittyStorage","_decodeError","_activeDecoder","_inControlData","_controlData","_controlLength","_encodedSizeLimit","_totalEncodedSize","_parsedCommand","_pendingTransmissions","_maxEncodedBytes","kittySizeLimit","_initialEncodedBytes","_cleanupAllPending","_removePendingEntry","_lastPendingKey","pending","decoder","controlEnd","copyLength","parseKittyCommand","_parseControlDataString","imageNumber","_sendResponse","quiet","action","payloadStart","_streamPayload","pendingKey","previousEncodedSize","totalEncodedSize","decoderToRelease","_f","decoderCapacity","_g","maxPending","oldest","next","cmd","_h","_handleNoPayloadCommand","_handleDelete","isMoreComing","more","decodeError","finalCmd","imageBytes","_handleCommandWithBytesAndCmd","str","fromCodePoint","_handlePlacement","bytes","_handleTransmit","transmission","_handleTransmitDisplay","_handleQuery","image","getImage","_displayImage","placementId","storeImage","format","compression","lastImageId","expectedBytes","deleteSelector","deleteAll","deleteById","isOk","response","coreService","triggerDataEvent","_decodeAndDisplay","_createBitmap","cropX","cropY","cropW","cropH","maxCropW","maxCropH","finalCropW","finalCropH","cropped","imgCols","imgRows","columns","savedX","savedY","savedYbase","scaled","xOffset","yOffset","canvasW","canvasH","offsetCanvas","offsetCtx","offsetBitmap","cursorMovement","scrolled","arrayBuffer","_decompressZlib","url","URL","createObjectURL","Image","reject","addEventListener","revokeObjectURL","src","pixelCount","src32","dst32","alignedPixels","srcOffset","dstOffset","b0","b1","b2","srcByte","dstByte","compressed","_decompress","offsetIn","reader","ReadableStream","pull","controller","enqueue","pipeThrough","DecompressionStream","getReader","chunks","totalLength","done","read","cancel","releaseLock","chunk","images","_kittyIdToStorageId","kittyIdToStorageId","pendingTransmissions","parts","split","part","eqIdx","substring","numValue","KittyImageStorage","_nextImageId","_storageIdToKittyId","_handleStorageImageDeleted","storageId","kittyId","_previousOnImageDeleted","_wrappedOnImageDeleted","imageData","oldStorageId","_maxStoredImages","_evictUndisplayedImages","byteLimit","retainedBytes","evictPlaced","oldestId","wasmDecode","InWasm","MAP","el","D","EMPTY","keepSize","maxBytes","_inst","_ended","_bytes","_m32","_mem","m","grow","Memory","requested","needed","newSize","addPages","loadedBytes","freeBytes","wasmQoiDecode","ib","dl","chunkP","def","W","z","compile","_wasmCtx","fromBase64","__webpack_module_cache__","moduleId","cachedModule","__webpack_modules__","Event_1","IIPHandler_1","KittyGraphicsHandler_1","KittyImageStorage_1","SixelHandler_1","SixelImageStorage_1","IIPImageStorage_1","enableSizeReports","sixelSupport","iipSupport","kittySupport","_handlers","_onImageAdded","Emitter","_defaultOpts","obj","_disposeLater","args","activate","terminal","ImageStorage","windowOps","options","windowOptions","getWinSizePixels","getCellSizePixels","getWinSizeChars","parser","registerCsiHandler","prefix","_decset","_decrst","_da1","_xtermGraphicsAttributes","onRender","intermediates","registerEscHandler","onRequestReset","onBufferChange","onResize","sixelStorage","SixelImageStorage","sixelHandler","SixelHandler","_parser","registerDcsHandler","iipStorage","IIPImageStorage","iipHandler","IIPHandler","registerOscHandler","kittyStorage","kittyHandler","KittyGraphicsHandler","registerApcHandler","storageUsage","_report","sqrt"],"sourceRoot":""}
++{"version":3,"file":"addon-image.js","mappings":";CAAA,SAAAA,EAAAC,GACA,iBAAAC,SAAA,iBAAAC,OACAA,OAAAD,QAAAD,IACA,mBAAAG,QAAAA,OAAAC,IACAD,OAAA,GAAAH,GACA,iBAAAC,QACAA,QAAA,WAAAD,IAEAD,EAAA,WAAAC,GACC,CATD,CASCK,WAAA,uCCKD,SAAAC,EAAAC,GACA,WAAAA,CACA,CAEA,SAAAC,EAAAD,GACA,OAAAA,IAAA,KACA,CAEA,SAAAE,EAAAF,GACA,OAAAA,IAAA,MACA,CASA,SAAAG,EAAAC,EAAAC,EAAAC,EAAAC,EAAA,KACA,YAAAA,IAAA,QAAAD,IAAA,QAAAD,IAAA,MAAAD,KAAA,CACA,CAqCA,SAAAI,EAAAC,EAAAC,EAAAC,GACA,OAAAC,KAAAC,IAAAJ,EAAAG,KAAAE,IAAAH,EAAAD,GACA,CACA,SAAAK,EAAAC,EAAAC,EAAAC,GAKA,OAJAA,EAAA,IACAA,GAAA,GACAA,EAAA,IACAA,GAAA,GACA,EAAAA,EAAA,EACAD,EAAA,GAAAD,EAAAC,GAAAC,EACA,EAAAA,EAAA,EACAF,EACA,EAAAE,EAAA,EACAD,GAAAD,EAAAC,IAAA,IAAAC,GACAD,CACA,CAaA,SAAAE,EAAAf,EAAAC,EAAAC,GACA,kBAAAM,KAAAQ,MAAAd,EAAA,aAAAM,KAAAQ,MAAAf,EAAA,YAAAO,KAAAQ,MAAAhB,EAAA,aACA,CAjGAiB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAC/CjB,EAAA6B,mBAA6B7B,EAAA8B,mBAA6B9B,EAAA+B,iBAA2B/B,EAAAgC,mBAA6BhC,EAAAiC,oBAA8BjC,EAAAkC,aAAuBlC,EAAAyB,aAAuBzB,EAAAmC,kBAA4BnC,EAAAoC,aAAuBpC,EAAAS,WAAqBT,EAAAqC,MAAgBrC,EAAAQ,KAAeR,EAAAO,MAAgBP,EAAAK,IAAcL,EAAAsC,gBAAkB,EAGrVtC,EAAAsC,WAAkB,UAAAC,WAAA,IAAAC,YAAA,cAAAC,QAAA,GAClBzC,EAAAsC,YACAI,QAAAC,KAAA,+EAMA3C,EAAAK,IAAWA,EAIXL,EAAAO,MAAaA,EAIbP,EAAAQ,KAAYA,EAIZR,EAAAqC,MAHA,SAAA/B,GACA,OAAAA,IAAA,MACA,EAQAN,EAAAS,WAAkBA,EAOlBT,EAAAoC,aAHA,SAAAQ,GACA,WAAAA,EAAAA,GAAA,MAAAA,GAAA,OAAAA,IAAA,GACA,EA2BA5C,EAAAmC,kBArBA,SAAAS,EAAAC,GACA,MAAAnC,EAAAL,EAAAuC,GACAjC,EAAAJ,EAAAqC,GACAhC,EAAAJ,EAAAoC,GACA,IAAAxB,EAAA0B,OAAAC,iBACAC,GAAA,EAEA,QAAAC,EAAA,EAAoBA,EAAAJ,EAAAK,SAAoBD,EAAA,CACxC,MAAAE,EAAAzC,EAAAmC,EAAAI,GAAA,GACAG,EAAAzC,EAAAkC,EAAAI,GAAA,GACAI,EAAAzC,EAAAiC,EAAAI,GAAA,GACAK,EAAAH,EAAAA,EAAAC,EAAAA,EAAAC,EAAAA,EACA,IAAAC,EACA,OAAAL,EACAK,EAAAlC,IACAA,EAAAkC,EACAN,EAAAC,EAEA,CACA,OAAAD,CACA,EAmCAhD,EAAAyB,aAAoBA,EAQpBzB,EAAAkC,aAJA,SAAAqB,EAAAC,EAAAC,GAEA,OArBA,SAAAF,EAAAC,EAAAC,GACA,IAAAA,EAAA,CACA,MAAAC,EAAAxC,KAAAQ,MAAA,IAAA8B,GACA,OAAA/C,EAAAiD,EAAAA,EAAAA,EACA,CACA,MAAApC,EAAAkC,EAAA,GAAAA,GAAA,EAAAC,GAAAD,EAAAC,EAAAD,EAAAC,EACAlC,EAAA,EAAAiC,EAAAlC,EACA,OAAAb,EAAAK,EAAA,MAAAI,KAAAQ,MAAA,IAAAL,EAAAC,EAAAC,EAAAgC,EAAA,OAAAzC,EAAA,MAAAI,KAAAQ,MAAA,IAAAL,EAAAC,EAAAC,EAAAgC,KAAAzC,EAAA,MAAAI,KAAAQ,MAAA,IAAAL,EAAAC,EAAAC,EAAAgC,EAAA,OACA,CAaAI,EAAAJ,EAAA,SAAAC,EAAA,IAAAC,EAAA,IACA,EA+BAzD,EAAAiC,oBAA2B,IAAAO,YAAA,CAC3Bf,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,YA0BAzB,EAAAgC,mBAA0B,IAAAQ,YAAA,CAC1Bf,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,UACAA,EAAA,OACAA,EAAA,UACAA,EAAA,UACAA,EAAA,YAOAzB,EAAA+B,iBAAwB,MAExB,MAAA6B,EAAA,CACAnD,EAAA,OACAA,EAAA,SACAA,EAAA,SACAA,EAAA,WACAA,EAAA,SACAA,EAAA,WACAA,EAAA,WACAA,EAAA,aACAA,EAAA,aACAA,EAAA,SACAA,EAAA,SACAA,EAAA,WACAA,EAAA,WACAA,EAAA,WACAA,EAAA,WACAA,EAAA,cAGA6C,EAAA,uBACA,QAAA5C,EAAA,EAAoBA,EAAA,IAAOA,EAC3B,QAAAC,EAAA,EAAwBA,EAAA,IAAOA,EAC/B,QAAAC,EAAA,EAA4BA,EAAA,IAAOA,EACnCgD,EAAAC,KAAApD,EAAA6C,EAAA5C,GAAA4C,EAAA3C,GAAA2C,EAAA1C,KAKA,QAAA8C,EAAA,EAAoBA,GAAA,IAAUA,GAAA,GAC9BE,EAAAC,KAAApD,EAAAiD,EAAAA,EAAAA,IAEA,WAAAlB,YAAAoB,EACC,EAlCuB,GA0CxB5D,EAAA8B,mBAA0BrB,EAAA,WAC1BT,EAAA6B,mBAA0BpB,EAAA,6BCpP1BkB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAC/CjB,EAAA8D,YAAsB9D,EAAA+D,OAAiB/D,EAAAgE,QAAkBhE,EAAAiE,kBAAoB,EAC7E,MAAAC,EAAiBC,EAAQ,KACzBC,EAAeD,EAAQ,KAavBE,EAXA,SAAAZ,GACA,uBAAAa,OACA,OAAAA,OAAAC,KAAAd,EAAA,UAEA,MAAAe,EAAAC,KAAAhB,GACAiB,EAAA,IAAAnC,WAAAiC,EAAAtB,QACA,QAAAD,EAAA,EAAoBA,EAAAyB,EAAAxB,SAAmBD,EACvCyB,EAAAzB,GAAAuB,EAAAG,WAAA1B,GAEA,OAAAyB,CACA,CACAE,CAAAR,EAAAS,OAAAC,OACA,IAAAC,EAEA,MAAAC,EAAA,IAAAxC,YAEA,MAAAyC,EACA,WAAAC,GACAC,KAAAC,YAAAC,GAAA,EACAF,KAAAG,YAAAC,GAAA,CACA,CACA,WAAAC,CAAAH,GACA,OAAAF,KAAAC,YAAAC,EACA,CACA,WAAAI,CAAAF,GACA,OAAAJ,KAAAG,YAAAC,EACA,EAGA,MAAAG,EAAA,CACAC,YAAA,UACAC,WAAA1B,EAAArC,mBACAgE,UAAA3B,EAAApC,mBACAe,QAAAqB,EAAAjC,oBACA6D,aAAA1B,EAAAS,OAAAkB,aACAC,UAAA,GAMA,SAAA/B,EAAAgC,GACA,MAAAC,EAAA,IAAAjB,EACAkB,EAAA,CACAC,IAAA,CACAZ,YAAAU,EAAAV,YAAAa,KAAAH,GACAT,YAAAS,EAAAT,YAAAY,KAAAH,KAGA,OAAAI,YAAAC,YAAAxB,GAAAV,EAAA8B,GACAK,KAAAC,IACA1B,EAAAA,GAAA0B,EAAAxG,OACA,IAAA+D,EAAAiC,EAAAQ,EAAAC,UAAAD,EAAAP,IAEA,CACAlG,EAAAiE,aAAoBA,EAiCpB,MAAAD,EAKA,WAAAkB,CAAAe,EAAAU,EAAAC,GASA,GARAzB,KAAA0B,cAAAzC,EAAAS,OAAAiC,UAAA,EACA3B,KAAA4B,QAAA/B,EACAG,KAAA6B,YAAA,GACA7B,KAAA8B,UAAA,EACA9B,KAAA+B,UAAA9C,EAAAS,OAAAiC,UACA3B,KAAAgC,YAAA,EACAhC,KAAAiC,eAAA,EACAjC,KAAAkC,MAAA1F,OAAA2F,OAAA,GAAqC5B,EAAAO,GACrCd,KAAAkC,MAAAvB,aAAA1B,EAAAS,OAAAkB,aACA,UAAAwB,MAAA,+CAA2EnD,EAAAS,OAAAkB,gBAE3E,GAAAY,EAUAC,EAAAxB,YAAAD,KAAAqC,aAAAnB,KAAAlB,MACAyB,EAAAtB,YAAAH,KAAAsC,YAAApB,KAAAlB,UAXA,CACA,MAAAlF,EAAA8E,IAAAA,EAAA,IAAAuB,YAAAoB,OAAArD,IACAsC,EAAA,IAAAL,YAAAqB,SAAA1H,EAAA,CACAmG,IAAA,CACAZ,YAAAL,KAAAqC,aAAAnB,KAAAlB,MACAM,YAAAN,KAAAsC,YAAApB,KAAAlB,QAGA,CAKAA,KAAAwB,UAAAA,EACAxB,KAAAyC,MAAAzC,KAAAwB,UAAA3G,QACAmF,KAAA0C,OAAA,IAAAtF,WAAA4C,KAAAyC,MAAAE,OAAArF,OAAA0C,KAAAyC,MAAAG,oBAAA3D,EAAAS,OAAAmD,YACA7C,KAAA8C,QAAA,IAAAzF,YAAA2C,KAAAyC,MAAAE,OAAArF,OAAA0C,KAAAyC,MAAAM,oBAAA,IACA/C,KAAAgD,SAAA,IAAA3F,YAAA2C,KAAAyC,MAAAE,OAAArF,OAAA0C,KAAAyC,MAAAQ,sBAAAhE,EAAAS,OAAAkB,cACAZ,KAAAgD,SAAAE,IAAAlD,KAAAkC,MAAAxE,SACAsC,KAAAmD,MAAA,IAAA9F,YAAA2C,KAAAyC,MAAAE,OAAArF,OAAA0C,KAAAyC,MAAAW,kBACApD,KAAAyC,MAAAY,KAAAtE,EAAArC,mBAAA,EAAAsD,KAAAkC,MAAAvB,aAAA,EACA,CAEA,cAAA2C,GAAuB,OAAAtD,KAAA8C,QAAA,GACvB,aAAAS,GAAsB,OAAAvD,KAAA8C,QAAA,GACtB,gBAAAU,GAAyB,OAAAxD,KAAA8C,QAAA,GACzB,iBAAAW,GAA0B,OAAAzD,KAAA8C,QAAA,GAC1B,UAAAY,GAAmB,OAAA1D,KAAA8C,QAAA,GAAA9C,KAAA8C,QAAA,OACnB,WAAAa,GAAoB,OAAA3D,KAAA8C,QAAA,GACpB,UAAAc,GAAmB,OAAA5D,KAAA8C,QAAA,GACnB,SAAAe,GAAkB,OAAA7D,KAAA8C,QAAA,IAClB,iBAAAgB,GAA0B,OAAA9D,KAAA8C,QAAA,IAC1B,WAAAR,CAAAlC,GACA,OAAAA,EAAA,CACA,MAAA2D,EAAA/D,KAAAE,MAAAF,KAAAgE,OACA,GAAAD,EAAA/D,KAAA4B,QAAA7D,OAAA,CACA,GAAAiC,KAAAkC,MAAA1B,aAAA,EAAAuD,EAAA/D,KAAAkC,MAAA1B,YAEA,MADAR,KAAAiE,UACA,IAAA7B,MAAA,8BAEApC,KAAA4B,QAAA,IAAAvE,YAAA0G,EACA,CACA/D,KAAA8B,UAAA9B,KAAA0D,MACA,MACA,OAAAtD,EACA,OAAAJ,KAAA4D,OAAA,CAEA,MAAAG,EAAAhI,KAAAE,IAAA+D,KAAAwD,aAAAvE,EAAAS,OAAAiC,WAAA3B,KAAAyD,cACA,GAAAM,EAAA/D,KAAA4B,QAAA7D,OAAA,CACA,GAAAiC,KAAAkC,MAAA1B,aAAA,EAAAuD,EAAA/D,KAAAkC,MAAA1B,YAEA,MADAR,KAAAiE,UACA,IAAA7B,MAAA,8BAEApC,KAAA4B,QAAA,IAAAvE,YAAA0G,EACA,CACA,MAGA/D,KAAA4B,QAAA7D,OAAA,QACAiC,KAAA4B,QAAA,IAAAvE,YAAA,QAIA,QACA,CACA,QAAA6G,CAAAC,EAAAC,GACA,MAAAL,EAAAI,EAAAC,EACA,GAAAL,EAAA/D,KAAA4B,QAAA7D,OAAA,CACA,GAAAiC,KAAAkC,MAAA1B,aAAA,EAAAuD,EAAA/D,KAAAkC,MAAA1B,YAEA,MADAR,KAAAiE,UACA,IAAA7B,MAAA,8BAGA,MAAAiC,EAAA,IAAAhH,YAAA,MAAAtB,KAAAuI,KAAAP,EAAA,QACAM,EAAAnB,IAAAlD,KAAA4B,SACA5B,KAAA4B,QAAAyC,CACA,CACA,CACA,YAAAhC,CAAAnC,GACA,MAAAqE,EAAAvE,KAAA0B,cACA,IAAAyC,EAAAnE,KAAAgC,YACA,OAAAhC,KAAA6D,MAAA,CACA,IAAAW,EAAAxE,KAAAgE,OAAAhE,KAAAiC,eACA5F,EAAA,EACA,KAAAA,EAAA,GAAAmI,EAAA,GACAxE,KAAA4B,QAAAsB,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAlI,EAAAkI,EAAAlI,EAAA6D,GAAAiE,EAAAjE,EAAA7D,GACAA,IACAmI,IAEAxE,KAAAgC,aAAA9B,EAAA7D,EACA2D,KAAAiC,gBAAA5F,CACA,MACA,OAAA2D,KAAA6D,MAAA,CACA7D,KAAAkE,SAAAC,EAAA,EAAAjE,GACAF,KAAA8B,UAAA/F,KAAAC,IAAAgE,KAAA8B,UAAA5B,GACAF,KAAA+B,UAAAhG,KAAAE,IAAA+D,KAAA+B,UAAA7B,GACA,QAAApC,EAAA,EAA4BA,EAAA,IAAOA,EACnCkC,KAAA4B,QAAAsB,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAzG,EAAAyG,EAAAzG,EAAAoC,GAAAiE,EAAAjE,EAAApC,GAEAkC,KAAA6B,YAAAnD,KAAAwB,GACAF,KAAAgC,aAAA,EAAA9B,EACAF,KAAAiC,gBAAA,CACA,CACA,QACA,CAMA,SAAA/B,GACA,WAAAF,KAAA6D,MACA7D,KAAA0D,OACA3H,KAAAC,IAAAgE,KAAA8B,UAAA9B,KAAAyC,MAAAiC,gBACA,CAMA,UAAAV,GACA,WAAAhE,KAAA6D,MACA7D,KAAA2D,QACA3D,KAAAyC,MAAAiC,gBACA,EAAA1E,KAAA6B,YAAA9D,OAAAiC,KAAAyC,MAAAkC,iBACA,EAAA3E,KAAA6B,YAAA9D,MACA,CAIA,WAAAL,GACA,OAAAsC,KAAAgD,SAAAyB,SAAA,EAAAzE,KAAA8D,cACA,CAUA,eAAAc,GACA,OAAA5E,KAAA4B,QAAAiD,WAAA7E,KAAAyC,MAAAE,OAAArF,OAAAuH,WAAA,EAAA7E,KAAA6B,YAAA9D,MACA,CAIA,cAAA+G,GACA,OACA5E,MAAAF,KAAAE,MACA8D,OAAAhE,KAAAgE,OACA5D,KAAAJ,KAAA6D,MACAkB,MAAA/E,KAAA4D,OACA/C,WAAAb,KAAAuD,UACA5C,aAAAX,KAAA8D,cACApD,UAAAV,KAAAsD,WACA0B,SAAAhF,KAAA4E,YACAK,iBAAA,CACAC,UAAAlF,KAAA8C,QAAA,GACAqC,YAAAnF,KAAA8C,QAAA,GACA5C,MAAAF,KAAAwD,aACAQ,OAAAhE,KAAAyD,eAGA,CAMA,IAAAJ,CAAA3C,EAAAV,KAAAkC,MAAAxB,UAAAhD,EAAAsC,KAAAkC,MAAAxE,QAAAiD,EAAAX,KAAAkC,MAAAvB,aAAAE,EAAAb,KAAAkC,MAAArB,UACAb,KAAAyC,MAAAY,KAAArD,KAAAkC,MAAAzB,WAAAC,EAAAC,EAAAE,EAAA,KACAnD,GACAsC,KAAAgD,SAAAE,IAAAxF,EAAA+G,SAAA,EAAAxF,EAAAS,OAAAkB,eAEAZ,KAAA6B,YAAA9D,OAAA,EACAiC,KAAA8B,UAAA,EACA9B,KAAA+B,UAAA9C,EAAAS,OAAAiC,UACA3B,KAAAgC,YAAA,EACAhC,KAAAiC,eAAA,CACA,CAKA,MAAArD,CAAAwG,EAAAC,EAAA,EAAAC,EAAAF,EAAArH,QACA,IAAAU,EAAA4G,EACA,KAAA5G,EAAA6G,GAAA,CACA,MAAAvH,EAAAhC,KAAAE,IAAAqJ,EAAA7G,EAAAQ,EAAAS,OAAAmD,YACA7C,KAAA0C,OAAAQ,IAAAkC,EAAAX,SAAAhG,EAAAA,GAAAV,IACAiC,KAAAyC,MAAA7D,OAAA,EAAAb,EACA,CACA,CAMA,YAAAwH,CAAAH,EAAAC,EAAA,EAAAC,EAAAF,EAAArH,QACA,IAAAU,EAAA4G,EACA,KAAA5G,EAAA6G,GAAA,CACA,MAAAvH,EAAAhC,KAAAE,IAAAqJ,EAAA7G,EAAAQ,EAAAS,OAAAmD,YACA,QAAA/E,EAAA,EAAA0H,EAAA/G,EAAmCX,EAAAC,IAAYD,IAAA0H,EAC/CxF,KAAA0C,OAAA5E,GAAAsH,EAAA5F,WAAAgG,GAEA/G,GAAAV,EACAiC,KAAAyC,MAAA7D,OAAA,EAAAb,EACA,CACA,CAKA,UAAA0H,GACA,OAAAzF,KAAA6D,QAAA7D,KAAAE,QAAAF,KAAAgE,OACA,OAAAnE,EAGA,MAAA6F,EAAA1F,KAAAyC,MAAAiC,gBACA,OAAA1E,KAAA6D,MAAA,CACA,IAAAW,EAAAxE,KAAAgE,OAAAhE,KAAAiC,eACA,GAAAuC,EAAA,GACA,MAAAD,EAAAvE,KAAA0B,cACA,IAAAyC,EAAAnE,KAAAgC,YACA3F,EAAA,EACA,KAAAA,EAAA,GAAAmI,EAAA,GACAxE,KAAA4B,QAAAsB,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAlI,EAAAkI,EAAAlI,EAAAqJ,GAAAvB,EAAAuB,EAAArJ,GACAA,IACAmI,IAEAA,GACAxE,KAAA4B,QAAA+D,KAAA3F,KAAAsD,WAAAa,EAAAuB,EAAArJ,EAEA,CACA,OAAA2D,KAAA4B,QAAA6C,SAAA,EAAAzE,KAAAE,MAAAF,KAAAgE,OACA,CACA,OAAAhE,KAAA6D,MAAA,CACA,GAAA7D,KAAA+B,YAAA/B,KAAA8B,UAAA,CACA,IAAA8D,GAAA,EACA,GAAAF,EACA,GAAAA,IAAA1F,KAAA+B,UACA6D,GAAA,MAEA,CACA,MAAArB,EAAAvE,KAAA0B,cACA,IAAAyC,EAAAnE,KAAAgC,YACAhC,KAAAkE,SAAAC,EAAA,EAAAuB,GACA,QAAA5H,EAAA,EAAwCA,EAAA,IAAOA,EAC/CkC,KAAA4B,QAAAsB,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAzG,EAAAyG,EAAAzG,EAAA4H,GAAAvB,EAAAuB,EAAA5H,EAEA,CAEA,IAAA8H,EACA,OAAA5F,KAAA4B,QAAA6C,SAAA,EAAAzE,KAAAE,MAAAF,KAAAgE,OAEA,CAGA,MAAA6B,EAAA,IAAAxI,YAAA2C,KAAAE,MAAAF,KAAAgE,QACA6B,EAAAF,KAAA3F,KAAAsD,YACA,IAAAwC,EAAA,EACAT,EAAA,EACA,QAAAvH,EAAA,EAA4BA,EAAAkC,KAAA6B,YAAA9D,SAA6BD,EAAA,CACzD,MAAAiI,EAAA/F,KAAA6B,YAAA/D,GACA,QAAAW,EAAA,EAAgCA,EAAA,IAAOA,EACvCoH,EAAA3C,IAAAlD,KAAA4B,QAAA6C,SAAAY,EAAAA,GAAAU,GAAAD,GACAA,GAAA9F,KAAAE,KAEA,CAEA,GAAAwF,EAAA,CACA,MAAAnB,EAAAvE,KAAA0B,cAEAsE,EAAAhG,KAAAyC,MAAAkC,iBACA,QAAA7G,EAAA,EAAgCA,EAAAkI,IAAmBlI,EACnD+H,EAAA3C,IAAAlD,KAAAmD,MAAAsB,SAAAF,EAAAzG,EAAAyG,EAAAzG,EAAA4H,GAAAI,EAAA9F,KAAAE,MAAApC,EAEA,CACA,OAAA+H,CACA,CAEA,OAAAhG,CACA,CAKA,SAAAoG,GACA,WAAAC,kBAAAlG,KAAAyF,OAAAnI,OAAA,EAAA0C,KAAAE,MAAAF,KAAAgE,OAAA,EACA,CAaA,OAAAC,GACAjE,KAAA4B,QAAA/B,EACAG,KAAA6B,YAAA9D,OAAA,EACAiC,KAAA8B,UAAA,EACA9B,KAAA+B,UAAA9C,EAAAS,OAAAiC,UAGA3B,KAAAyC,MAAAY,KAAAtE,EAAArC,mBAAA,EAAAsD,KAAAkC,MAAAvB,aAAA,EACA,EAEA9F,EAAAgE,QAAeA,EAyBfhE,EAAA+D,OAXA,SAAAwG,EAAAtE,GACA,MAAAqF,EAAA,IAAAtH,EAAAiC,GAGA,OAFAqF,EAAA9C,OACA,iBAAA+B,EAAAe,EAAAZ,aAAAH,GAAAe,EAAAvH,OAAAwG,GACA,CACAlF,MAAAiG,EAAAjG,MACA8D,OAAAmC,EAAAnC,OACAyB,OAAAU,EAAAV,OACAQ,MAAAE,EAAAF,MAEA,EAkBApL,EAAA8D,YAXAyH,eAAAhB,EAAAtE,GACA,MAAAqF,QAAArH,EAAAgC,GAGA,OAFAqF,EAAA9C,OACA,iBAAA+B,EAAAe,EAAAZ,aAAAH,GAAAe,EAAAvH,OAAAwG,GACA,CACAlF,MAAAiG,EAAAjG,MACA8D,OAAAmC,EAAAnC,OACAyB,OAAAU,EAAAV,OACAQ,MAAAE,EAAAF,MAEA,YCpdAzJ,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAC/CjB,EAAA6E,YAAc,EACd7E,EAAA6E,OAAc,CACdmD,WAAA,MACAjC,aAAA,KACAe,UAAA,MACAhC,MAAA,+qdCCA,MAAA0G,EAAArH,EAAA,KAoEA,IAAiBsH,YA9DjB,iBAAAvG,GACUC,KAAAuG,WAAqD,GACrDvG,KAAAwG,WAAY,CA0DtB,CAvDE,SAAWC,GACT,OAAIzG,KAAK0G,SAGT1G,KAAK0G,OAAS,CAACC,EAAyBC,EAAgBC,KACtD,GAAI7G,KAAKwG,UACP,OAAO,EAAAH,EAAAS,cAAa,QAGtB,MAAMC,EAAQ,CAAEC,GAAIL,EAAUC,YAC9B5G,KAAKuG,WAAavG,KAAKuG,WAAWU,QAClCjH,KAAKuG,WAAW7H,KAAKqI,GAErB,MAAMxH,GAAS,EAAA8G,EAAAS,cAAa,KAC1B,MAAMjJ,EAAMmC,KAAKuG,WAAWW,QAAQH,IACvB,IAATlJ,IACFmC,KAAKuG,WAAavG,KAAKuG,WAAWU,QAClCjH,KAAKuG,WAAWY,OAAOtJ,EAAK,MAYhC,OARIgJ,IACEO,MAAMC,QAAQR,GAChBA,EAAYnI,KAAKa,GAEjBsH,EAAYS,IAAI/H,IAIbA,IA3BAS,KAAK0G,MA8BhB,CAEO,IAAAa,CAAKd,GACV,GAAIzG,KAAKwG,YAAcxG,KAAKuG,WAAWxI,OACrC,OAEF,GAA+B,IAA3BiC,KAAKuG,WAAWxI,OAElB,YADAiC,KAAKuG,WAAW,GAAGS,GAAGQ,KAAKxH,KAAKuG,WAAW,GAAGK,SAAUH,GAG1D,MAAMgB,EAAYzH,KAAKuG,WACvB,IAAK,IAAIzI,EAAI,EAAG4J,EAAMD,EAAU1J,OAAQD,EAAI4J,IAAO5J,EACjD2J,EAAU3J,GAAGkJ,GAAGQ,KAAKC,EAAU3J,GAAG8I,SAAUH,EAEhD,CAEO,OAAAkB,GACD3H,KAAKwG,YAGTxG,KAAKwG,WAAY,EACjBxG,KAAKuG,WAAWxI,OAAS,EAC3B,GAGF,SAAiBuI,GACCA,EAAAsB,QAAhB,SAA2BxI,EAAiByI,GAC1C,OAAOzI,EAAK0I,GAAKD,EAAGN,KAAKO,GAC3B,EAEgBxB,EAAAyB,IAAhB,SAA0BtB,EAAkBsB,GAC1C,MAAO,CAACpB,EAAyBC,EAAgBC,IACxCJ,EAAM3I,GAAK6I,EAASa,KAAKZ,EAAUmB,EAAIjK,SAAKkK,EAAWnB,EAElE,EAIgBP,EAAA2B,IAAhB,YAA0BC,GACxB,MAAO,CAACvB,EAAyBC,EAAgBC,KAC/C,MAAMsB,EAAQ,IAAI9B,EAAA+B,gBAClB,IAAK,MAAM3B,KAASyB,EAClBC,EAAMb,IAAIb,EAAMqB,GAAKnB,EAASa,KAAKZ,EAAUkB,KAS/C,OAPIjB,IACEO,MAAMC,QAAQR,GAChBA,EAAYnI,KAAKyJ,GAEjBtB,EAAYS,IAAIa,IAGbA,EAEX,EAIgB7B,EAAA+B,gBAAhB,SAAmC5B,EAAkB6B,EAAqCC,GAExF,OADAD,EAAQC,GACD9B,EAAMqB,GAAKQ,EAAQR,GAC5B,CACD,CApCD,CAAiBxB,IAAUzL,EAAAyL,WAAVA,EAAU,eChE3B,SAAAQ,EAA6BE,GAC3B,MAAO,CAAEW,QAASX,EACpB,CAKA,SAAAW,EAA+Ca,GAC7C,IAAKA,EACH,OAAOA,EAET,GAAIpB,MAAMC,QAAQmB,GAAM,CACtB,IAAK,MAAMrK,KAAKqK,EACdrK,EAAEwJ,UAEJ,MAAO,EACT,CAEA,OADAa,EAAIb,UACGa,CACT,8JAEA,YAAsC3B,GACpC,OAAOC,EAAa,IAAMa,EAAQd,GACpC,EAEA,MAAAuB,EAAA,WAAArI,GACmBC,KAAAyI,aAAe,IAAIC,IAC5B1I,KAAA2I,aAAc,CAgCxB,CA9BE,cAAWC,GACT,OAAO5I,KAAK2I,WACd,CAEO,GAAArB,CAA2BuB,GAMhC,OALI7I,KAAK2I,YACPE,EAAElB,UAEF3H,KAAKyI,aAAanB,IAAIuB,GAEjBA,CACT,CAEO,OAAAlB,GACL,IAAI3H,KAAK2I,YAAT,CAGA3I,KAAK2I,aAAc,EACnB,IAAK,MAAMxK,KAAK6B,KAAKyI,aACnBtK,EAAEwJ,UAEJ3H,KAAKyI,aAAaK,OALlB,CAMF,CAEO,KAAAA,GACL,IAAK,MAAM3K,KAAK6B,KAAKyI,aACnBtK,EAAEwJ,UAEJ3H,KAAKyI,aAAaK,OACpB,sBAGF,MAAAC,EAAA,WAAAhJ,GAGqBC,KAAAgJ,OAAS,IAAIZ,CASlC,CAPS,OAAAT,GACL3H,KAAKgJ,OAAOrB,SACd,CAEU,SAAAsB,CAAiCJ,GACzC,OAAO7I,KAAKgJ,OAAO1B,IAAIuB,EACzB,iBAVuBE,EAAAG,KAAoB1M,OAAO2M,OAAO,CAAE,OAAAxB,GAAY,wBAazE,iBAAA5H,GAEUC,KAAA2I,aAAc,CAuBxB,CArBE,SAAW7M,GACT,OAAOkE,KAAK2I,iBAAcX,EAAYhI,KAAKoJ,MAC7C,CAEA,SAAWtN,CAAMA,GACXkE,KAAK2I,aAAe7M,IAAUkE,KAAKoJ,SAGvCpJ,KAAKoJ,QAAQzB,UACb3H,KAAKoJ,OAAStN,EAChB,CAEO,KAAAgN,GACL9I,KAAKlE,WAAQkM,CACf,CAEO,OAAAL,GACL3H,KAAK2I,aAAc,EACnB3I,KAAKoJ,QAAQzB,UACb3H,KAAKoJ,YAASpB,CAChB,wKC1GF,MAAAqB,EAAArK,EAAA,KAEAsK,EAAAtK,EAAA,KACAuK,EAAAC,EAAAxK,EAAA,MACAyK,EAAAD,EAAAxK,EAAA,KACA0K,EAAA1K,EAAA,KACA2K,EAAA3K,EAAA,KAeM4K,EAAgC,CACpCC,KAAI,EACJC,KAAM,eACNC,KAAM,EACN7J,MAAO,OACP8D,OAAQ,OACRgG,oBAAqB,EACrBC,OAAQ,gBAIV,MAUE,WAAAlK,CACmBmC,EACAgI,EACAC,EACAC,GAHApK,KAAAkC,MAAAA,EACAlC,KAAAkK,UAAAA,EACAlK,KAAAmK,SAAAA,EACAnK,KAAAoK,cAAAA,EAbXpK,KAAAqK,YAAc,EACdrK,KAAAsK,UAAW,EACXtK,KAAAuK,IAAM,IAAIb,EAAAc,aACVxK,KAAAyK,QAAyBb,EAGzB5J,KAAA0K,cAAe,EACf1K,KAAA2K,aAAc,EAQpB,MAAMC,EAAkB7O,KAAKuI,KAA+B,EAA1BtE,KAAKkC,MAAM2I,aAAmB,GAC1DC,EAAe/O,KAAKE,IAAG,QAA4B2O,GACzD5K,KAAK+K,KAAO,IAAIxB,EAAAyB,QAAa,EAAyBJ,EAAiBE,GACvE9K,KAAKiL,QAAU,IAAIxB,EAAAuB,QAAU,EAC/B,CAEO,KAAAE,GACLlL,KAAKqK,cACLrK,KAAKuK,IAAIW,QACTlL,KAAK+K,KAAK9G,UACVjE,KAAKiL,QAAQhH,SACf,CAEO,KAAAoB,GACLrF,KAAKsK,UAAW,EAChBtK,KAAKuK,IAAIW,OACX,CAEO,GAAAC,CAAI/F,EAAmBC,EAAeC,GAC3C,IAAItF,KAAKsK,SAET,GAAkB,IAAdtK,KAAKuK,IAAIa,MAC6C,IAAnDpL,KAAK+K,KAAKI,IAAI/F,EAAKX,SAASY,EAAOC,MACtCtF,KAAK+K,KAAK9G,UACVjE,KAAKsK,UAAW,OAEb,CACL,MAAMe,EAAUrL,KAAKuK,IAAIe,MAAMlG,EAAMC,EAAOC,GAC5C,IAAiB,IAAb+F,EAEF,YADArL,KAAKsK,UAAW,GAGlB,GAAIe,EAAU,EAAG,CAEf,GAAW,IADKrL,KAAKuK,IAAIgB,OAAO1B,KACG,CAOjC,GANI7J,KAAK0K,eACP1K,KAAK0K,cAAe,EACpB1K,KAAK2K,aAAc,EACnB3K,KAAK+K,KAAK9G,WAEZjE,KAAKyK,QAAUjO,OAAO2F,OAAO,GAAIyH,EAAgB5J,KAAKuK,IAAIgB,SACrDvL,KAAKyK,QAAQR,OAEhB,YADAjK,KAAKsK,UAAW,GAGlB,IAAKtK,KAAKwL,eAER,YADAxL,KAAKsK,UAAW,EAGpB,MAAO,GAAItK,KAAK2K,YAEd,YADA3K,KAAKsK,UAAW,GAGwC,IAArDtK,KAAK+K,KAAKI,IAAI/F,EAAKX,SAAS4G,EAAS/F,MACxCtF,KAAK+K,KAAK9G,UACVjE,KAAKsK,UAAW,EACZtK,KAAK0K,eAAc1K,KAAK2K,aAAc,GAE9C,CACF,CACF,CAEO,GAAArF,CAAImG,aACT,GAAIzL,KAAKsK,SAAU,OAAO,EAE1B,GAAkB,IAAdtK,KAAKuK,IAAIa,OACPpL,KAAKuK,IAAIjF,MAAO,OAAO,EAE7B,MAAMoG,EAAU1L,KAAKuK,IAAIgB,OAAO1B,KAEhC,GAAW,IAAP6B,EAAmC,OAAO,EAE9C,GAAW,IAAPA,EAAyC,CAE3C,IAAIC,EAAIrC,EAAAsC,kBAAkB1L,MACtB9B,EAAIkL,EAAAsC,kBAAkB5H,OACtBhE,KAAKkK,UAAU2B,aACjBF,EAAI3L,KAAKkK,UAAU2B,WAAWC,IAAIC,OAAO7L,MAAQF,KAAKoK,cAAc4B,KACpE5N,EAAI4B,KAAKkK,UAAU2B,WAAWC,IAAIC,OAAO/H,OAAShE,KAAKoK,cAAc6B,MAEvE,MAAMC,EAAyD,QAApDC,EAA+C,QAA5CC,EAAApM,KAAKoK,cAAciC,MAAMC,2BAAmB,IAAAF,OAAA,EAAAA,EAAEG,WAAG,IAAAJ,EAAAA,EAAI,EAC7DK,EAAS,yBAA4BpO,EAAEqO,QAAQ,MAAMd,EAAEc,QAAQ,MAAMP,EAAMO,QAAQ,QAEzF,OADAzM,KAAKoK,cAAcsC,MAAMF,GAAQ,IAC1B,CACT,CAEA,GAAW,IAAPd,EAQF,OAPA1L,KAAKyK,QAAUjO,OAAO2F,OAAO,GAAIyH,EAAgB5J,KAAKuK,IAAIgB,QAC1DvL,KAAK0K,cAAe,EACpB1K,KAAK2K,aAAc,EACnB3K,KAAK+K,KAAK9G,UACLjE,KAAKwL,iBACRxL,KAAK2K,aAAc,IAEd,EAGT,GAAW,IAAPe,EAAkC,CACpC,IAAK1L,KAAK0K,aAAc,OAAO,EAE/B,GADA1K,KAAK0K,cAAe,EAChB1K,KAAK2K,aAAgC,IAAjB3K,KAAKyK,QAAQZ,KAAqC,OAAO,CACnF,CAIA,IAII8C,EA0BAC,EA9BAjB,EAAI,EACJvN,EAAI,EAIJyO,EAAUlD,EAAAmD,iBAoBd,IAnBIH,EAAOlB,MACLkB,GAAQ3M,KAAK+K,KAAKzF,QACpBuH,GAAU,EAAAlD,EAAAoD,WAAU/M,KAAK+K,KAAK9E,QAC1B0G,EAAwB,gBAAjBE,EAAQG,OACjBrB,EAAIkB,EAAQ3M,MACZ9B,EAAIyO,EAAQ7I,QACR2I,EAAOhB,GAAKvN,GAAKuN,EAAIvN,EAAI4B,KAAKkC,MAAM+K,cACrCtB,EAAGvN,GAAK4B,KAAKkN,QAAQvB,EAAGvN,GAAG2J,IAAIhM,KAAKoR,OACrCR,EAAOhB,GAAKvN,GAAKuN,EAAIvN,EAAI4B,KAAKkC,MAAM+K,YAEpC1P,QAAQC,KAAK,8BAA8BqP,EAAQ3M,SAAS2M,EAAQ7I,WAGtEzG,QAAQC,KAAK,gCAGfD,QAAQC,KAAK,uCAGZmP,EAEH,OADA3M,KAAK+K,KAAK9G,WACH,EAIT,GAAqB,cAAjB4I,EAAQG,KAAsB,CAChC,IAAI5H,EACJ,IACEA,EAAOpF,KAAKiL,QAAQrM,OAAOoB,KAAK+K,KAAK9E,MACvC,CAAE,MAAO6B,GAIP,OAHAvK,QAAQC,KAAK,kCAAmCsK,GAChD9H,KAAK+K,KAAK9G,UACVjE,KAAKiL,QAAQhH,WACN,CACT,CAOA,GANA2I,EAAO,IAAIQ,UACT,IAAIlH,kBAAkBd,EAAK9H,OAAQ8H,EAAKiI,WAAYjI,EAAKP,YACzD7E,KAAKiL,QAAQ/K,MACbF,KAAKiL,QAAQjH,QAEfhE,KAAKiL,QAAQhH,UACT0H,IAAM3L,KAAKiL,QAAQ/K,OAAS9B,IAAM4B,KAAKiL,QAAQjH,OAAQ,CAEzDhE,KAAK+K,KAAK9G,UACV,MAAM8H,EAAS1C,EAAAiE,cAAcC,kBAAavF,EAAWhI,KAAKiL,QAAQ/K,MAAOF,KAAKiL,QAAQjH,QAGtF,OAFuB,QAAvBwJ,EAAAzB,EAAO0B,WAAW,aAAK,IAAAD,GAAAA,EAAEE,aAAad,EAAM,EAAG,GAC/C5M,KAAKmK,SAASwD,SAAS5B,IAChB,CACT,CACF,MACEa,EAAO,IAAIgB,KAAK,CAAC5N,KAAK+K,KAAK9E,OAAQ,CAAE4D,KAAMgD,EAAQG,OAErDhN,KAAK+K,KAAK9G,UACV,MAAM4J,EAAa7N,KAAKqK,YACxB,OAAOyD,kBAAkBlB,EAAM,CAAEmB,YAAapC,EAAGqC,aAAc5P,IAC5DiD,KAAK4M,GACAJ,IAAe7N,KAAKqK,aACtB4D,EAAGC,SACI,IAETlO,KAAKmK,SAASwD,SAASM,IAChB,IAERE,MAAMrG,IACLvK,QAAQC,KAAK,uBAAuBqP,EAAQG,QAAQH,EAAQ3M,SAAS2M,EAAQ7I,SAAU8D,IAChF,GAEb,CAGQ,YAAA0D,GACN,IAEE,OADAxL,KAAK+K,KAAK1H,QACH,CACT,CAAE,MAAOyE,GAGP,OAFAvK,QAAQC,KAAK,kCAAmCsK,GAChD9H,KAAK+K,KAAK9G,WACH,CACT,CACF,CAEQ,OAAAiJ,CAAQvB,EAAWvN,eACzB,MAAMgQ,GAA8B,QAAzBhC,EAAApM,KAAKkK,UAAU2B,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIuC,KAAKnO,QAASoJ,EAAAsC,kBAAkB1L,MACpEoO,GAA8B,QAAzBd,EAAAxN,KAAKkK,UAAU2B,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIuC,KAAKrK,SAAUsF,EAAAsC,kBAAkB5H,OACrE9D,GAAiC,QAAzBiM,EAAAnM,KAAKkK,UAAU2B,kBAAU,IAAAM,OAAA,EAAAA,EAAEL,IAAIC,OAAO7L,QAASkO,EAAKpO,KAAKoK,cAAc4B,KAC/EhI,GAAkC,QAAzBuK,EAAAvO,KAAKkK,UAAU2B,kBAAU,IAAA0C,OAAA,EAAAA,EAAEzC,IAAIC,OAAO/H,SAAUsK,EAAKtO,KAAKoK,cAAc6B,KAEjFuC,EAAKxO,KAAKyO,KAAKzO,KAAKyK,QAAQvK,MAAQA,EAAOkO,GAC3CM,EAAK1O,KAAKyO,KAAKzO,KAAKyK,QAAQzG,OAASA,EAAQsK,GACnD,IAAKE,IAAOE,EAAI,CACd,MAAMC,EAAKzO,EAAQyL,EACbiD,GAAM5K,EAASsK,GAAMlQ,EACrByQ,EAAI9S,KAAKE,IAAI0S,EAAIC,GACvB,OAAOC,EAAI,EAAI,CAAClD,EAAIkD,EAAGzQ,EAAIyQ,GAAK,CAAClD,EAAGvN,EACtC,CACA,OAAQoQ,GAEJxO,KAAKyK,QAAQT,qBAAwBwE,GAAOE,EACvB,CAACF,EAAIE,GAAxB,CAACF,EAAIpQ,EAAIoQ,EAAK7C,GAFhB,CAACA,EAAI+C,EAAKtQ,EAAGsQ,EAGnB,CAEQ,IAAAD,CAAKnQ,EAAWwQ,EAAeC,GACrC,MAAU,SAANzQ,EAAqB,EACrBA,EAAE0Q,SAAS,KAAaC,SAAS3Q,EAAE2I,MAAM,GAAI,GAAI,IAAM6H,EAAQ,IAC/DxQ,EAAE0Q,SAAS,MAAcC,SAAS3Q,EAAE2I,MAAM,GAAI,GAAI,IAC/CgI,SAAS3Q,EAAG,IAAMyQ,CAC3B,aC1NF,SAASG,EAAM9J,GACb,IAAI9G,EAAI,GACR,IAAK,IAAIR,EAAI,EAAGA,EAAIsH,EAAKrH,SAAUD,EACjCQ,GAAK6Q,OAAOC,aAAahK,EAAKtH,IAEhC,OAAOQ,CACT,CAGA,SAAS+Q,EAAMjK,GACb,IAAI7G,EAAI,EACR,IAAK,IAAIT,EAAI,EAAGA,EAAIsH,EAAKrH,SAAUD,EAAG,CACpC,GAAIsH,EAAKtH,GAAK,IAAMsH,EAAKtH,GAAK,GAC5B,MAAM,IAAIsE,MAAM,gBAElB7D,EAAQ,GAAJA,EAAS6G,EAAKtH,GAAK,EACzB,CACA,OAAOS,CACT,CAGA,SAAS+Q,EAAOlK,GACd,MAAM7G,EAAI2Q,EAAM9J,GAChB,IAAK7G,EAAEgR,MAAM,oCACX,MAAM,IAAInN,MAAM,gBAElB,OAAO7D,CACT,wEAeA,MAAMiR,EAAiE,CACrEvF,OAAQoF,EACRtF,KAAMsF,EACNvF,KAfF,SAAgB1E,GACd,GAAsB,oBAAXjG,OACT,OAAOA,OAAOC,KAAK8P,EAAM9J,GAAO,UAAUqK,WAE5C,MAAMC,EAAKpQ,KAAK4P,EAAM9J,IAChB3J,EAAI,IAAI2B,WAAWsS,EAAG3R,QAC5B,IAAK,IAAID,EAAI,EAAGA,EAAIrC,EAAEsC,SAAUD,EAC9BrC,EAAEqC,GAAK4R,EAAGlQ,WAAW1B,GAEvB,OAAO,IAAI6R,aAAc/Q,OAAOnD,EAClC,EAMEyE,MAAOoP,EACPtL,OAAQsL,EACRtF,oBAAqBqF,GAMjBO,EAAc,CAAC,GAAI,IAAK,IAAK,KAE7BC,EAAuB,CAAC,GAAI,IAAK,IAAK,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,GAAI,IAAK,IAAK,KAEjFC,EAAkB,CAAC,GAAI,IAAK,IAAK,IAAK,GAAI,GAAI,IAAK,KAEnDC,EAAiB,CAAC,GAAI,IAAK,IAAK,IAAK,GAAI,IAAK,KAE9CC,EAAwB,CAAC,GAAI,IAAK,IAAK,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,KAGvFC,EAAiB,oBAGvB,iBAAAlQ,GACSC,KAAAoL,MAAK,EACJpL,KAAAkQ,QAAU,IAAI7S,YAAY4S,GAC1BjQ,KAAAmQ,UAAY,EACZnQ,KAAAoQ,KAAO,GACRpQ,KAAAuL,OAA4E,EAwIrF,CAtIS,KAAAL,GACLlL,KAAKkQ,QAAQvK,KAAK,GAClB3F,KAAKoL,MAAK,EACVpL,KAAKmQ,UAAY,EACjBnQ,KAAKuL,OAAS,GACdvL,KAAKoQ,KAAO,EACd,CAEO,GAAA9K,GACL,GAAc,IAAVtF,KAAKoL,MAA6B,CACpC,GAAIpL,KAAKmQ,YAAcJ,EAAehS,OAAQ,CAC5C,IAAK,IAAIsS,EAAI,EAAGA,EAAIN,EAAehS,SAAUsS,EAC3C,GAAIrQ,KAAKkQ,QAAQG,KAAON,EAAeM,GAAI,OAAOrQ,KAAKoM,KAIzD,OAFApM,KAAKuL,OAAa,KAAC,EACnBvL,KAAKoL,MAAK,EACH,CACT,CACA,GAAIpL,KAAKmQ,YAAcH,EAAsBjS,OAAQ,CACnD,IAAK,IAAIsS,EAAI,EAAGA,EAAIL,EAAsBjS,SAAUsS,EAClD,GAAIrQ,KAAKkQ,QAAQG,KAAOL,EAAsBK,GAAI,OAAOrQ,KAAKoM,KAIhE,OAFApM,KAAKuL,OAAa,KAAC,EACnBvL,KAAKoL,MAAK,EACH,CACT,CACA,OAAOpL,KAAKoM,IACd,CACA,OAAc,IAAVpM,KAAKoL,MAAkC,EAC7B,IAAVpL,KAAKoL,OACY,IAAhBpL,KAAKuL,OAAO1B,MAEV7J,KAAKsQ,YAAYtQ,KAAKmQ,YAC3BnQ,KAAKoL,MAAK,EACH,GAEFpL,KAAKoM,IACd,CAEO,KAAAd,CAAMlG,EAAmBC,EAAeC,GAC7C,IAAI8F,EAAQpL,KAAKoL,MACbmF,EAAMvQ,KAAKmQ,UACf,MAAM7S,EAAS0C,KAAKkQ,QACpB,GAAS,IAAL9E,GAAoC,IAALA,EAA2B,OAAQ,EACtE,GAAS,IAALA,GAA+BmF,EAAM,GAAI,OAAQ,EACrD,IAAK,IAAIzS,EAAIuH,EAAOvH,EAAIwH,IAAOxH,EAAG,CAChC,MAAMzB,EAAI+I,EAAKtH,GACf,OAAQzB,GACN,KAAK,GACH,IAAK2D,KAAKsQ,YAAYC,GAAM,OAAOvQ,KAAKoM,KACxChB,EAAK,EACLmF,EAAM,EACN,MACF,KAAK,GACH,GAAS,IAALnF,EAA6B,CAC/B,GAAkB,KAAd9N,EAAO,GAAW,CAEpB,IAAI+S,EAAI,EACR,KAAOA,EAAIT,EAAY7R,SAAUsS,EAC/B,GAAI/S,EAAO+S,KAAOT,EAAYS,GAAI,OAAOrQ,KAAKoM,KAGhD,GADApM,KAAKuL,OAAa,KAAC,EACfgF,IAAQT,EAAgB/R,OAAQ,CAClC,KAAOsS,EAAIP,EAAgB/R,SAAUsS,EACnC,GAAI/S,EAAO+S,KAAOP,EAAgBO,GAAI,OAAOrQ,KAAKoM,KAIpD,OAFApM,KAAKuL,OAAa,KAAC,EACnBvL,KAAKoL,MAAK,EACHtN,EAAI,CACb,CACF,KAAO,IAAkB,KAAdR,EAAO,GAOhB,OAAO0C,KAAKoM,KALZ,IAAK,IAAIiE,EAAI,EAAGA,EAAIR,EAAqB9R,SAAUsS,EACjD,GAAI/S,EAAO+S,KAAOR,EAAqBQ,GAAI,OAAOrQ,KAAKoM,KAEzDpM,KAAKuL,OAAa,KAAC,CAGrB,CACAH,EAAK,EACLmF,EAAM,CACR,MAAO,GAAS,IAALnF,EAA2B,CACpC,IAAKpL,KAAKwQ,UAAUD,GAAM,OAAOvQ,KAAKoM,KACtChB,EAAK,EACLmF,EAAM,CACR,MAAO,GAAS,IAALnF,EAA6B,CACtC,GAAImF,GAAON,EAAgB,OAAOjQ,KAAKoM,KACvC9O,EAAOiT,KAASlU,CAClB,CACA,MACF,KAAK,GACH,OAAS,IAAL+O,GACGpL,KAAKsQ,YAAYC,IAExBvQ,KAAKoL,MAAK,EACHtN,EAAI,GAH0BkC,KAAKoM,KAI5C,QACE,GAAImE,GAAON,EAAgB,OAAOjQ,KAAKoM,KACvC9O,EAAOiT,KAASlU,EAEtB,CAGA,OAFA2D,KAAKoL,MAAQA,EACbpL,KAAKmQ,UAAYI,GACT,CACV,CAEQ,EAAAnE,GAGN,OAFApM,KAAKuL,OAAO1B,KAAI,EAChB7J,KAAKoL,MAAK,GACF,CACV,CAEQ,SAAAoF,CAAUD,GAChB,MAAMF,EAAInB,EAAMlP,KAAKkQ,QAAQzL,SAAS,EAAG8L,IACzC,QAAIF,IACFrQ,KAAKoQ,KAAOC,EACZrQ,KAAKuL,OAAO8E,GAAK,MACV,EAGX,CAEQ,WAAAC,CAAYC,GAClB,GAAIvQ,KAAKoQ,KAAM,CACb,IACE,MAAM7R,EAAIyB,KAAKkQ,QAAQjJ,MAAM,EAAGsJ,GAChCvQ,KAAKuL,OAAOvL,KAAKoQ,MAAQZ,EAASxP,KAAKoQ,MAAQZ,EAASxP,KAAKoQ,MAAM7R,GAAKA,CAC1E,UACE,OAAO,CACT,CACA,OAAO,CACT,CACA,OAAO,CACT,yGCtPF,MAEE,WAAAwB,CACmBoK,GAAAnK,KAAAmK,SAAAA,EAFXnK,KAAAyQ,cAA+B,CAAEC,WAAW,EAAMC,MAAO,MAAOC,OAAQ,EAAGC,UAAW,MAG3F,CAMI,QAAAlD,CAASmD,GACd9Q,KAAKmK,SAASwD,SAASmD,EAAK9Q,KAAKyQ,cACnC,oGCNF,SAA0BtS,GACxB,GAAIA,EAAEJ,OAAS,GACb,OAAOlD,EAAAiS,iBAET,MAAMiE,EAAM,IAAI1T,YAAYc,EAAEb,OAAQa,EAAEkP,WAAY,GAGpD,GAAe,aAAX0D,EAAI,IAAgC,YAAXA,EAAI,IAAgC,aAAXA,EAAI,GACxD,MAAO,CACL/D,KAAM,YACN9M,MAAQ/B,EAAE,KAAO,GAAKA,EAAE,KAAO,GAAKA,EAAE,KAAO,EAAIA,EAAE,IACnD6F,OAAQ7F,EAAE,KAAO,GAAKA,EAAE,KAAO,GAAKA,EAAE,KAAO,EAAIA,EAAE,KAIvD,GAAa,MAATA,EAAE,IAAwB,MAATA,EAAE,IAAwB,MAATA,EAAE,GAAa,CACnD,MAAO+B,EAAO8D,GAgFlB,SAAiB7F,GACf,MAAMuJ,EAAMvJ,EAAEJ,OACd,IAAID,EAAI,EACJkT,EAAc7S,EAAEL,IAAM,EAAIK,EAAEL,EAAI,GACpC,OAAa,CAEX,GADAA,GAAKkT,EACDlT,GAAK4J,EAEP,MAAO,CAAC,EAAG,GAEb,GAAa,MAATvJ,EAAEL,GACJ,MAAO,CAAC,EAAG,GAEb,GAAiB,MAAbK,EAAEL,EAAI,IAA4B,MAAbK,EAAEL,EAAI,GAC7B,OAAIA,EAAI,EAAI4J,EACH,CACLvJ,EAAEL,EAAI,IAAM,EAAIK,EAAEL,EAAI,GACtBK,EAAEL,EAAI,IAAM,EAAIK,EAAEL,EAAI,IAGnB,CAAC,EAAG,GAEbA,GAAK,EACLkT,EAAc7S,EAAEL,IAAM,EAAIK,EAAEL,EAAI,EAClC,CACF,CAzG4BmT,CAAQ9S,GAChC,MAAO,CAAE6O,KAAM,aAAc9M,QAAO8D,SACtC,CAEA,GAAe,YAAX+M,EAAI,KAA+B,KAAT5S,EAAE,IAAwB,KAATA,EAAE,KAAyB,KAATA,EAAE,GACjE,MAAO,CACL6O,KAAM,YACN9M,MAAQ/B,EAAE,IAAM,EAAIA,EAAE,GACtB6F,OAAQ7F,EAAE,IAAM,EAAIA,EAAE,IAI1B,GAAe,aAAX4S,EAAI,GACN,MAAO,CACL/D,KAAM,YACN9M,MAAQ/B,EAAE,IAAM,GAAKA,EAAE,IAAM,GAAKA,EAAE,IAAM,EAAIA,EAAE,GAChD6F,OAAQ7F,EAAE,IAAM,GAAKA,EAAE,IAAM,GAAKA,EAAE,KAAO,EAAIA,EAAE,KAIrD,GAAe,aAAX4S,EAAI,IAAgC,aAAXA,EAAI,IAA6C,UAAd,SAATA,EAAI,IAA6B,CACtF,OAAQ5S,EAAE,KACR,KAAK,GACH,MAAO,CACL6O,KAAM,aACN9M,MAA6C,GAApC/B,EAAE,IAAMA,EAAE,KAAO,EAAIA,EAAE,KAAO,IACvC6F,OAA6C,GAApC7F,EAAE,IAAMA,EAAE,KAAO,EAAIA,EAAE,KAAO,KAE3C,KAAK,GACH,GAAc,KAAVA,EAAE,IAAc,OAAOtD,EAAAiS,iBAC3B,MAAMoE,EAAM/S,EAAE,IAAMA,EAAE,KAAO,EAAIA,EAAE,KAAO,GAAKA,EAAE,KAAO,GACxD,MAAO,CACL6O,KAAM,aACN9M,MAAgC,GAAV,MAAbgR,GACTlN,OAAgC,GAAvBkN,IAAQ,GAAK,QAE1B,KAAK,GACH,OAAc,MAAV/S,EAAE,KAA0B,IAAVA,EAAE,KAA0B,KAAVA,EAAE,IAAqBtD,EAAAiS,iBACxD,CACLE,KAAM,aACN9M,MAA+B,OAAtB/B,EAAE,IAAMA,EAAE,KAAO,GAC1B6F,OAA+B,OAAtB7F,EAAE,IAAMA,EAAE,KAAO,IAGhC,OAAOtD,EAAAiS,gBACT,CAEA,GAAe,aAAXiE,EAAI,KAAiC,aAAXA,EAAI,IAAgC,aAAXA,EAAI,IAAoB,CAC7E,IAAIR,GAAO,EAEX,MAAMY,EAAQpV,KAAKE,IAAIkC,EAAEJ,OAAS,GAAI,MACtC,IAAK,IAAID,EAAI,EAAGA,EAAIqT,EAAOrT,IAEzB,GAAa,MAATK,EAAEL,IAA4B,MAAbK,EAAEL,EAAI,IAA4B,MAAbK,EAAEL,EAAI,IAA4B,MAAbK,EAAEL,EAAI,GAAa,CAChFyS,EAAMzS,EACN,KACF,CAEF,IAAa,IAATyS,EAAY,CAEd,MAAMrQ,EACJ/B,EAAEoS,EAAO,IAAM,GACfpS,EAAEoS,EAAO,IAAM,GACfpS,EAAEoS,EAAM,KAAQ,EAChBpS,EAAEoS,EAAM,IACJvM,EACJ7F,EAAEoS,EAAM,KAAO,GACfpS,EAAEoS,EAAM,KAAO,GACfpS,EAAEoS,EAAM,KAAQ,EAChBpS,EAAEoS,EAAM,IACV,GAAIrQ,EAAQ,GAAK8D,EAAS,EACxB,MAAO,CAAEgJ,KAAM,aAAc9M,QAAO8D,SAExC,CACA,OAAOnJ,EAAAiS,gBACT,CACA,OAAOjS,EAAAiS,gBACT,EAnGajS,EAAAiS,iBAA6B,CACxCE,KAAM,cACN9M,MAAO,EACP8D,OAAQ,uFCZV,MAAAjF,EAAAC,EAAA,KAGAqH,EAAArH,EAAA,KAaA,MAAAsO,UAAmCjH,EAAA0C,WAEjC,UAAWgD,GAAM,IAAAK,EAAoC,OAA8B,QAAvBA,EAAApM,KAAKoR,QAAQC,IAAI,cAAM,IAAAjF,OAAA,EAAAA,EAAEL,MAAQ,CAUtF,mBAAOwB,CAAa+D,EAAqCpR,EAAe8D,GAU7E,MAAM+H,GAAUuF,QAAAA,EAAiBC,UAAUC,cAAc,UAGzD,OAFAzF,EAAO7L,MAAgB,EAARA,EACf6L,EAAO/H,OAAkB,EAATA,EACT+H,CACT,CAGO,sBAAO0F,CAAgBC,EAA+BxR,EAAe8D,EAAgB1G,GAC1F,GAAyB,mBAAd8P,UAA0B,CACnC,MAAMuE,EAAUD,EAAID,gBAAgBvR,EAAO8D,GAI3C,OAHI1G,GACFqU,EAAQvM,KAAKlC,IAAI,IAAIgD,kBAAkB5I,EAAQ,EAAG4C,EAAQ8D,EAAS,IAE9D2N,CACT,CACA,OAAOrU,EACH,IAAI8P,UAAU,IAAIlH,kBAAkB5I,EAAQ,EAAG4C,EAAQ8D,EAAS,GAAI9D,EAAO8D,GAC3E,IAAIoJ,UAAUlN,EAAO8D,EAC3B,CAGO,wBAAO8J,CAAkBgD,GAC9B,MAAiC,mBAAtBhD,kBACF8D,QAAQC,aAAQ7J,GAElB8F,kBAAkBgD,EAC3B,CAGA,WAAA/Q,CAAoB+R,GAClBC,QADkB/R,KAAA8R,UAAAA,EAhDZ9R,KAAAoR,QAAU,IAAIY,IAGdhS,KAAAiS,gBAAkBjS,KAAKiJ,UAAU,IAAI5C,EAAA6L,mBA+C3ClS,KAAKmS,SAAWnS,KAAK8R,UAAUzF,MAAM+F,KACrCpS,KAAK8R,UAAUzF,MAAM+F,KAAQC,UACd,QAAbjG,EAAApM,KAAKmS,gBAAQ,IAAA/F,GAAAA,EAAE5E,KAAKxH,KAAK8R,UAAUzF,MAAOgG,GAC1CrS,KAAKsS,SAEHtS,KAAK8R,UAAUzF,MAAMkG,eACvBvS,KAAKsS,QAGPtS,KAAKiS,gBAAgBnW,MAAQkE,KAAK8R,UAAUzF,MAAMmG,eAAeC,eAAeC,UAC/D,aAAXA,IACF1S,KAAK2S,gBACc,QAAnBvG,EAAApM,KAAK4S,sBAAc,IAAAxG,GAAAA,EAAEyG,YAAY,EAAG7S,KAAK8R,UAAU7F,SAGvDjM,KAAKiJ,WAAU,EAAA5C,EAAAS,cAAa,WAC1B9G,KAAK8S,qBACL9S,KAAK8S,mBAAmB,UACpB9S,KAAK8R,UAAUzF,OAASrM,KAAKmS,WAC/BnS,KAAK8R,UAAUzF,MAAM+F,KAAOpS,KAAKmS,SACjCnS,KAAKmS,cAAWnK,GAEdhI,KAAK4S,gBAAkB5S,KAAK+S,kBAC9B/S,KAAK4S,eAAeI,YAAchT,KAAK+S,gBACvC/S,KAAK+S,qBAAkB/K,GAEzBhI,KAAK4S,oBAAiB5K,EACtBhI,KAAKoR,QAAQtI,QACU,QAAvBsD,EAAApM,KAAKiT,0BAAkB,IAAA7G,GAAAA,EAAE8B,QACzBlO,KAAKiT,wBAAqBjL,EAC1BhI,KAAKkT,kBAAelL,IAExB,CAKO,eAAAmL,CAAgBrX,WACjBA,EACGkE,KAAKkT,eAA0C,IAA1BlT,KAAKoT,SAASpP,QACtChE,KAAKqT,mBAAmBtX,KAAKC,IAAIgE,KAAKoT,SAASpP,OAAS,EAAC,MAGpC,QAAvBoI,EAAApM,KAAKiT,0BAAkB,IAAA7G,GAAAA,EAAE8B,QACzBlO,KAAKiT,wBAAqBjL,EAC1BhI,KAAKkT,kBAAelL,GAEH,QAAnBwF,EAAAxN,KAAK4S,sBAAc,IAAApF,GAAAA,EAAEqF,YAAY,EAAG7S,KAAK8R,UAAU7F,KACrD,CAMA,cAAWJ,GACT,OAAO7L,KAAK8R,UAAUjG,UACxB,CAKA,YAAWuH,WACT,MAAO,CACLlT,OAAsB,QAAfkM,EAAApM,KAAK6L,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIuC,KAAKnO,SAAU,EAC3C8D,QAAuB,QAAfwJ,EAAAxN,KAAK6L,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIuC,KAAKrK,UAAW,EAEjD,CAKO,UAAAsP,CAAWjO,EAAeC,EAAaqL,iBAC5C,MAAM4C,EAAIlO,IAAwB,QAAf+G,EAAApM,KAAK6L,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIuC,KAAKrK,SAAU,GACjD2H,GAAmB,QAAf6B,EAAAxN,KAAK6L,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIC,OAAO7L,QAAS,EACzC9B,GAAKkH,EAAM,EAAID,KAAyB,QAAf8G,EAAAnM,KAAK6L,kBAAU,IAAAM,OAAA,EAAAA,EAAEL,IAAIuC,KAAKrK,SAAU,GAC9D2M,GAAmB,QAAVA,GACW,QAAvBpC,EAAAvO,KAAKoR,QAAQC,IAAI,cAAM,IAAA9C,GAAAA,EAAEiF,UAAU,EAAGD,EAAG5H,EAAGvN,GAEzCuS,GAAmB,WAAVA,GACc,QAA1B8C,EAAAzT,KAAKoR,QAAQC,IAAI,iBAAS,IAAAoC,GAAAA,EAAED,UAAU,EAAGD,EAAG5H,EAAGvN,EAEnD,CAKO,QAAAsV,CAAS/C,GACd,IAAKA,GAAmB,QAAVA,EAAiB,CAC7B,MAAMe,EAAM1R,KAAKoR,QAAQC,IAAI,OAC7BK,SAAAA,EAAK8B,UAAU,EAAG,EAAG9B,EAAI3F,OAAO7L,MAAOwR,EAAI3F,OAAO/H,OACpD,CACA,IAAK2M,GAAmB,WAAVA,EAAoB,CAChC,MAAMe,EAAM1R,KAAKoR,QAAQC,IAAI,UAC7BK,SAAAA,EAAK8B,UAAU,EAAG,EAAG9B,EAAI3F,OAAO7L,MAAOwR,EAAI3F,OAAO/H,OACpD,CACF,CAKO,IAAA2P,CAAKC,EAAqBC,EAAgBC,EAAaC,EAAaC,EAAgB,GACzF,MAAMtC,EAAM1R,KAAKoR,QAAQC,IAAIuC,EAAQjD,OACrC,IAAKe,EACH,OAEF,MAAMxR,MAAEA,EAAK8D,OAAEA,GAAWhE,KAAKoT,SAG/B,IAAe,IAAXlT,IAA4B,IAAZ8D,EAClB,OAGFhE,KAAKiU,cAAcL,EAAS1T,EAAO8D,GACnC,MAAM8M,EAAM8C,EAAQM,QACZhU,MAAOiU,EAAanQ,OAAQoQ,GAAiBR,EAAQS,eACvDrI,EAAOjQ,KAAKuI,KAAKwM,EAAI5Q,MAAQiU,GAE7BG,EAAMT,EAAS7H,EAAQmI,EACvBI,EAAKxY,KAAKoR,MAAM0G,EAAS7H,GAAQoI,EACjCI,EAAKV,EAAM5T,EACXuU,EAAKV,EAAM/P,EAGX0Q,EAAaV,EAAQG,EAAcG,EAAKxD,EAAI5Q,MAAQ4Q,EAAI5Q,MAAQoU,EAAKN,EAAQG,EAC7EQ,EAAcJ,EAAKH,EAAetD,EAAI9M,OAAS8M,EAAI9M,OAASuQ,EAAKH,EAMvE1C,EAAIkD,UACF9D,EACA/U,KAAKoR,MAAMmH,GAAKvY,KAAKoR,MAAMoH,GAAKxY,KAAKuI,KAAKoQ,GAAa3Y,KAAKuI,KAAKqQ,GACjE5Y,KAAKoR,MAAMqH,GAAKzY,KAAKoR,MAAMsH,GAAK1Y,KAAKuI,KAAKoQ,EAAaxU,EAAQiU,GAAcpY,KAAKuI,KAAKqQ,EAAc3Q,EAASoQ,GAElH,CAKO,WAAAS,CAAYjB,EAAqBC,GACtC,MAAM3T,MAAEA,EAAK8D,OAAEA,GAAWhE,KAAKoT,SAE/B,IAAe,IAAXlT,IAA4B,IAAZ8D,EAClB,OAEFhE,KAAKiU,cAAcL,EAAS1T,EAAO8D,GACnC,MAAM8M,EAAM8C,EAAQM,QACZhU,MAAOiU,EAAanQ,OAAQoQ,GAAiBR,EAAQS,eACvDrI,EAAOjQ,KAAKuI,KAAKwM,EAAI5Q,MAAQiU,GAC7BG,EAAMT,EAAS7H,EAAQmI,EACvBI,EAAKxY,KAAKoR,MAAM0G,EAAS7H,GAAQoI,EACjCM,EAAaP,EAAcG,EAAKxD,EAAI5Q,MAAQ4Q,EAAI5Q,MAAQoU,EAAKH,EAC7DQ,EAAcJ,EAAKH,EAAetD,EAAI9M,OAAS8M,EAAI9M,OAASuQ,EAAKH,EAEjErI,EAASuB,EAAcC,aAAavN,KAAKuR,SAAUxV,KAAKuI,KAAKoQ,EAAaxU,EAAQiU,GAAcpY,KAAKuI,KAAKqQ,EAAc3Q,EAASoQ,IACjI1C,EAAM3F,EAAO0B,WAAW,MAC9B,OAAIiE,GACFA,EAAIkD,UACF9D,EACA/U,KAAKoR,MAAMmH,GAAKvY,KAAKoR,MAAMoH,GAAKxY,KAAKoR,MAAMuH,GAAa3Y,KAAKoR,MAAMwH,GACnE,EAAG,EAAG5I,EAAO7L,MAAO6L,EAAO/H,QAEtB+H,QANT,CAQF,CAKO,eAAA+I,CAAgBhB,EAAaC,EAAaC,EAAgB,SAC/D,MAAMtC,EAAM1R,KAAKoR,QAAQC,IAAI,OAC7B,GAAIK,EAAK,CACP,MAAMxR,MAAEA,EAAK8D,OAAEA,GAAWhE,KAAKoT,SAG/B,IAAe,IAAXlT,IAA4B,IAAZ8D,EAClB,OAQF,GALKhE,KAAKkT,aAEClP,GAAUhE,KAAKkT,aAAclP,QACtChE,KAAKqT,mBAAmBrP,EAAS,GAFjChE,KAAKqT,mBAAmBtX,KAAKC,IAAIgI,EAAS,EAAC,MAIxChE,KAAKkT,aAAc,OACxBxB,EAAIkD,UACqB,QADZxI,EACXpM,KAAKiT,0BAAkB,IAAA7G,EAAAA,EAAIpM,KAAKkT,aAChCY,EAAM5T,EACL6T,EAAM/P,EAAU,EAAI,EAAI,EACzB9D,EAAQ8T,EACRhQ,EACA8P,EAAM5T,EACN6T,EAAM/P,EACN9D,EAAQ8T,EACRhQ,EAEJ,CACF,CAMO,aAAA2O,WACL,MAAMhH,GAAmB,QAAfS,EAAApM,KAAK6L,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIC,OAAO7L,QAAS,EACzC9B,GAAmB,QAAfoP,EAAAxN,KAAK6L,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIC,OAAO/H,SAAU,EAChD,IAAK,MAAM0N,KAAO1R,KAAKoR,QAAQ2D,SACzBrD,EAAI3F,OAAO7L,QAAUyL,GAAK+F,EAAI3F,OAAO/H,SAAW5F,IAClDsT,EAAI3F,OAAO7L,MAAQyL,EACnB+F,EAAI3F,OAAO/H,OAAS5F,EAG1B,CAKQ,aAAA6V,CAAce,EAAkBtP,EAAsBM,GAC5D,GAAIN,IAAiBsP,EAAKX,eAAenU,OAAS8F,IAAkBgP,EAAKX,eAAerQ,OACtF,OAEF,MAAQ9D,MAAO+U,EAAejR,OAAQkR,GAAmBF,EAAKG,aAC9D,GAAIzP,IAAiBuP,GAAiBjP,IAAkBkP,EAItD,OAHAF,EAAKd,OAASc,EAAKI,KACnBJ,EAAKX,eAAenU,MAAQ+U,OAC5BD,EAAKX,eAAerQ,OAASkR,GAG/B,MAAMG,EAActZ,KAAKuI,KAAK0Q,EAAKI,KAAMlV,MAAQwF,EAAeuP,GAC1DK,EAAevZ,KAAKuI,KAAK0Q,EAAKI,KAAMpR,OAASgC,EAAgBkP,GAEnE,GAAIG,EAAcC,EAAeN,EAAKI,KAAMlV,MAAQ8U,EAAKI,KAAMpR,OAI7D,OAHAgR,EAAKd,OAASc,EAAKI,KACnBJ,EAAKX,eAAenU,MAAQ+U,OAC5BD,EAAKX,eAAerQ,OAASkR,GAG/B,MAAMnJ,EAASuB,EAAcC,aAAavN,KAAKuR,SAAU8D,EAAaC,GAChE5D,EAAM3F,EAAO0B,WAAW,MAC1BiE,IACFA,EAAIkD,UAAUI,EAAKI,KAAO,EAAG,EAAGrJ,EAAO7L,MAAO6L,EAAO/H,QACrDgR,EAAKd,OAASnI,EACdiJ,EAAKX,eAAenU,MAAQwF,EAC5BsP,EAAKX,eAAerQ,OAASgC,EAEjC,CAKQ,KAAAsM,GACNtS,KAAK4S,eAAiB5S,KAAK8R,UAAUzF,MAAMuG,eAC3C5S,KAAK+S,gBAAkB/S,KAAK4S,eAAeI,YAAY9R,KAAKlB,KAAK4S,gBACjE5S,KAAK4S,eAAeI,YAAeuC,UACjC,IAAK,MAAMC,IAAO,IAAIxV,KAAKoR,QAAQqE,QACjCzV,KAAK8S,mBAAmB0C,GAEN,QAApBpJ,EAAApM,KAAK+S,uBAAe,IAAA3G,GAAAA,EAAE5E,KAAKxH,KAAK4S,eAAgB2C,GAEpD,CAEO,gBAAAG,CAAiB/E,EAAoB,eAE1C,IAAK3Q,KAAKuR,WAAavR,KAAK8R,UAAUzF,MAAMkG,cAE1C,YADAhV,QAAQC,KAAK,sFAGf,GAAIwC,KAAKoR,QAAQuE,IAAIhF,GACnB,OAEF,MAAM5E,EAASuB,EAAcC,aAC3BvN,KAAKuR,UAAyB,QAAfnF,EAAApM,KAAK6L,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIC,OAAO7L,QAAS,GACrC,QAAfsN,EAAAxN,KAAK6L,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIC,OAAO/H,SAAU,GAExC+H,EAAO6J,UAAUtO,IAAI,qBAAqBqJ,KAC1C,MAAM4B,EAAgBvS,KAAK8R,UAAUzF,MAAMkG,cAI3CA,EAAcsD,MAAMC,UAAY,UAClB,WAAVnF,GAKF5E,EAAO8J,MAAMjF,OAAS,KACtB2B,EAAcwD,aAAahK,EAAQwG,EAAcyD,cAKjDjK,EAAO8J,MAAMjF,OAAS,IACtB2B,EAAc0D,YAAYlK,IAE5B,MAAM2F,EAAM3F,EAAO0B,WAAW,KAAM,CAAEvQ,OAAO,IACxCwU,GAIL1R,KAAKoR,QAAQlO,IAAIyN,EAAOe,GACxB1R,KAAK0T,SAAS/C,IAJZ5E,EAAOmK,QAKX,CAEO,kBAAApD,CAAmBnC,EAAoB,OAC5C,MAAMe,EAAM1R,KAAKoR,QAAQC,IAAIV,GACzBe,IACFA,EAAI3F,OAAOmK,SACXlW,KAAKoR,QAAQ+E,OAAOxF,GAExB,CAEO,QAAAyF,CAASzF,GACd,OAAO3Q,KAAKoR,QAAQuE,IAAIhF,EAC1B,CAEQ,kBAAA0C,CAAmBrP,EAAM,UACR,QAAvBoI,EAAApM,KAAKiT,0BAAkB,IAAA7G,GAAAA,EAAE8B,QACzBlO,KAAKiT,wBAAqBjL,EAG1B,MAAMqO,EAAS,GACTC,EAAYhJ,EAAcC,aAAavN,KAAKuR,SAAU8E,EAAQrS,GAC9D0N,EAAM4E,EAAU7I,WAAW,KAAM,CAAEvQ,OAAO,IAChD,IAAKwU,EAAK,OACV,MAAMC,EAAUrE,EAAcmE,gBAAgBC,EAAK2E,EAAQrS,GACrD+M,EAAM,IAAI1T,YAAYsU,EAAQvM,KAAK9H,QACnCiZ,GAAQ,EAAAxX,EAAAzD,YAAW,EAAG,EAAG,GACzBkb,GAAQ,EAAAzX,EAAAzD,YAAW,IAAK,IAAK,KACnCyV,EAAIpL,KAAK4Q,GACT,IAAK,IAAIhD,EAAI,EAAGA,EAAIvP,IAAUuP,EAAG,CAC/B,MAAMkD,EAAQlD,EAAI,EACZpP,EAASoP,EAAI8C,EACnB,IAAK,IAAIK,EAAI,EAAGA,EAAIL,EAAQK,GAAK,EAC/B3F,EAAI5M,EAASuS,EAAID,GAASD,CAE9B,CACA9E,EAAIhE,aAAaiE,EAAS,EAAG,GAG7B,MAAMzR,EAASyW,OAAOzW,MAAQmW,EAAS,GAAK,IAAa,KACzDrW,KAAKkT,aAAe5F,EAAcC,aAAavN,KAAKuR,SAAUrR,EAAO8D,GACrE,MAAM4S,EAAO5W,KAAKkT,aAAazF,WAAW,KAAM,CAAEvQ,OAAO,IACzD,IAAK0Z,EAEH,YADA5W,KAAKkT,kBAAelL,GAGtB,IAAK,IAAIlK,EAAI,EAAGA,EAAIoC,EAAOpC,GAAKuY,EAC9BO,EAAKhC,UAAU0B,EAAWxY,EAAG,GAE/B,MAAM+Y,EAAc7W,KAAKkT,aACzB5F,EAAcQ,kBAAkB+I,GAAaxV,KAAKyV,IAC5C9W,KAAKkT,eAAiB2D,EAAaC,SAAAA,EAAQ5I,QAC1ClO,KAAKiT,mBAAqB6D,IAC9B3I,MAAM,OACX,CAEA,YAAWoD,SACT,OAA+C,QAAxCnF,EAAApM,KAAK8R,UAAUzF,MAAMC,2BAAmB,IAAAF,OAAA,EAAAA,EAAE2K,OAAOxF,QAC1D,2HC3aF,MAAAlI,EAAArK,EAAA,KASanE,EAAA+Q,kBAA+B,CAC1C1L,MAAO,EACP8D,OAAQ,IASV,MAAMgT,EAEJ,OAAWC,GACT,OAAIjX,KAAKkX,QAEQ,UAAZlX,KAAKmX,KACLnX,KAAKoX,gBAAkB,GAGrBpX,KAAKmX,IACd,CACA,OAAWF,CAAInb,GAAiBkE,KAAKmX,KAAOrb,CAAO,CAEnD,kBAAWsb,GAET,OAAIpX,KAAKkX,OACP,GAEe,UAATlX,KAAKmX,OAAoC,EACnD,CACA,kBAAWC,CAAetb,GACxBkE,KAAKmX,OAAQ,UACbnX,KAAKmX,MAASrb,GAAS,GAAG,SAC5B,CAEA,kBAAWub,GACT,OAAmB,SAAZrX,KAAKmX,IACd,CACA,kBAAWE,CAAevb,GACxBkE,KAAKmX,OAAQ,SACbnX,KAAKmX,MAAgB,SAARrb,CACf,CAEA,0BAAWwb,GACT,MAAMC,GAAgB,WAATvX,KAAKmX,OAAmC,GACrD,OAAII,EAAM,EACK,WAANA,EAEFA,CACT,CACA,0BAAWD,CAAuBxb,GAChCkE,KAAKmX,MAAQ,UACbnX,KAAKmX,MAASrb,GAAS,GAAG,UAC5B,CAGA,SAAW0b,GACT,OAAOxX,KAAKkX,MACd,CACA,SAAWM,CAAM1b,GACfkE,KAAKkX,OAASpb,CAChB,CAEA,WAAAiE,CACEkX,EAAc,EACdO,EAAgB,EACTC,GAAU,EACV5D,GAAS,GADT7T,KAAAyX,QAAAA,EACAzX,KAAA6T,OAAAA,EAxDD7T,KAAAmX,KAAe,EA4CfnX,KAAAkX,OAAiB,EAcvBlX,KAAKmX,KAAOF,EACZjX,KAAKkX,OAASM,CAChB,CAEO,KAAAE,GASL,OAAO,IAAIV,EAAmBhX,KAAKmX,KAAMnX,KAAKkX,OAAQlX,KAAKyX,QAASzX,KAAK6T,OAC3E,CAEO,OAAA8D,GACL,OAA0B,IAAnB3X,KAAKoX,gBAA0D,IAAhBpX,KAAKkX,SAAkC,IAAlBlX,KAAKyX,OAClF,EAEF,MAAMG,EAAc,IAAIZ,iBAUxB,MAkBE,WAAAjX,CACU+R,EACA5H,EACAhI,GAFAlC,KAAA8R,UAAAA,EACA9R,KAAAkK,UAAAA,EACAlK,KAAAkC,MAAAA,EAnBFlC,KAAA6X,QAAmC,IAAI7F,IAEvChS,KAAA8X,QAAU,EAEV9X,KAAA+X,UAAY,EAEZ/X,KAAAgY,eAAgB,EAEhBhY,KAAAiY,iBAAkB,EAElBjY,KAAAkY,YAAsB,KAW5B,IACElY,KAAKmY,SAASnY,KAAKkC,MAAMkW,aAC3B,CAAE,MAAOtQ,GACHA,aAAa1F,OACf7E,QAAQ8a,MAAMvQ,EAAEwQ,SAElB/a,QAAQC,KAAK,0BAA0BwC,KAAKuY,gBAC9C,CACAvY,KAAKwY,iBAAmB,CACtBxM,KAAMhM,KAAK8R,UAAU9F,KACrBC,KAAMjM,KAAK8R,UAAU7F,KAEzB,CAEO,OAAAtE,GACL3H,KAAKkL,OACP,CAEO,KAAAA,SACL,IAAK,MAAM8J,KAAQhV,KAAK6X,QAAQ9C,SACnB,QAAX3I,EAAA4I,EAAKyD,cAAM,IAAArM,GAAAA,EAAEzE,UAIf3H,KAAK6X,QAAQ/O,QACb9I,KAAKkK,UAAUwJ,UACjB,CAEO,QAAA6E,GACL,OAA0B,EAAnBvY,KAAKkY,YAAkB,GAChC,CAEO,QAAAC,CAASrc,GACd,GAAIA,EAAQ,IAAOA,EAAQ,IACzB,MAAM4c,WAAW,qEAEnB1Y,KAAKkY,YAAepc,EAAQ,EAAI,MAAa,EAC7CkE,KAAK2Y,aAAa,EACpB,CAEO,QAAAC,GACL,OAAiC,EAA1B5Y,KAAK6Y,mBAAyB,GACvC,CAEQ,gBAAAA,GACN,IAAIC,EAAe,EACnB,IAAK,MAAM9D,KAAQhV,KAAK6X,QAAQ9C,SAC1BC,EAAKI,OACP0D,GAAgB9D,EAAKI,KAAKlV,MAAQ8U,EAAKI,KAAKpR,OACxCgR,EAAKd,QAAUc,EAAKd,SAAWc,EAAKI,OACtC0D,GAAgB9D,EAAKd,OAAOhU,MAAQ8U,EAAKd,OAAOlQ,SAItD,OAAO8U,CACT,CAEQ,OAAAC,CAAQC,SACd,MAAMhE,EAAOhV,KAAK6X,QAAQxG,IAAI2H,GACzBhE,IACLhV,KAAK6X,QAAQ1B,OAAO6C,GAEhBjC,OAAOkC,aAAejE,EAAKI,gBAAgB6D,aAC7CjE,EAAKI,KAAKlH,QAEO,QAAnB9B,EAAApM,KAAKkZ,sBAAc,IAAA9M,GAAAA,EAAA5E,KAAnBxH,KAAsBgZ,GACxB,CAKO,aAAAG,SAEL,MAAMC,EAAO,GACb,IAAK,MAAOJ,EAAIhE,KAAShV,KAAK6X,QAAQwB,UACZ,cAApBrE,EAAKsE,aACI,QAAXlN,EAAA4I,EAAKyD,cAAM,IAAArM,GAAAA,EAAEzE,UACbyR,EAAK1a,KAAKsa,IAGd,IAAK,MAAMA,KAAMI,EACfpZ,KAAK+Y,QAAQC,GAGfhZ,KAAKiY,iBAAkB,EACvBjY,KAAKgY,eAAgB,CACvB,CAMO,WAAAuB,CAAYP,SACjB,MAAMhE,EAAOhV,KAAK6X,QAAQxG,IAAI2H,GAC1BhE,IACS,QAAX5I,EAAA4I,EAAKyD,cAAM,IAAArM,GAAAA,EAAEzE,UACb3H,KAAK+Y,QAAQC,GAEjB,CAaO,QAAArL,CAASmD,EAAsChQ,WAEpDd,KAAK2Y,aAAa7H,EAAI5Q,MAAQ4Q,EAAI9M,QAGlC,IAAIoP,EAAWpT,KAAKkK,UAAUkJ,UACN,IAApBA,EAASlT,QAAqC,IAArBkT,EAASpP,SACpCoP,EAAWvY,EAAA+Q,mBAEb,MAAMI,EAAOjQ,KAAKuI,KAAKwM,EAAI5Q,MAAQkT,EAASlT,OACtC+L,EAAOlQ,KAAKuI,KAAKwM,EAAI9M,OAASoP,EAASpP,QAEvCyT,IAAYzX,KAAK8X,QAEjBxa,EAAS0C,KAAK8R,UAAUzF,MAAM/O,OAC9Bkc,EAAWxZ,KAAK8R,UAAU9F,KAC1ByN,EAAWzZ,KAAK8R,UAAU7F,KAC1ByN,EAAUpc,EAAOoZ,EACjBiD,EAAUrc,EAAOiW,EACvB,IAAIpP,EAASuV,EACTE,EAAY,EAEX9Y,EAAK4P,YACRpT,EAAOoZ,EAAI,EACXpZ,EAAOiW,EAAI,EACXpP,EAAS,GAGXnE,KAAK8R,UAAUzF,MAAMwN,cAAcC,iBAAiBC,UAAUzc,EAAOiW,GACrE,IAAK,IAAIQ,EAAM,EAAGA,EAAM9H,IAAQ8H,EAAK,CACnC,MAAMiG,EAAO1c,EAAO2c,MAAM5I,IAAI/T,EAAOiW,EAAIjW,EAAO4c,OAChD,IAAK,IAAIpG,EAAM,EAAGA,EAAM9H,KAClB7H,EAAS2P,GAAO0F,KADU1F,EAE9B9T,KAAKma,aAAaH,EAAwB7V,EAAS2P,EAAK2D,EAAS1D,EAAM/H,EAAO8H,GAC9E8F,IAEF,GAAI9Y,EAAK4P,UACHqD,EAAM9H,EAAO,GAAGjM,KAAK8R,UAAUzF,MAAMwN,cAAcO,gBAEvD,KAAM9c,EAAOiW,GAAKkG,EAAU,MAE9Bnc,EAAOoZ,EAAIvS,CACb,CACAnE,KAAK8R,UAAUzF,MAAMwN,cAAcC,iBAAiBC,UAAUzc,EAAOiW,GAGjEzS,EAAK4P,UACgB,QAAnB5P,EAAK+P,UACPvT,EAAOoZ,EAAI3a,KAAKE,IAAIkI,EAAS6H,EAAMwN,GAEnClc,EAAOoZ,EAAIvS,GAGb7G,EAAOoZ,EAAIgD,EACXpc,EAAOiW,EAAIoG,GAIb,MAAMP,EAAO,GACb,IAAK,MAAOJ,EAAIhE,KAAShV,KAAK6X,QAAQwB,UAChCrE,EAAK4E,UAAY,IACR,QAAXxN,EAAA4I,EAAKyD,cAAM,IAAArM,GAAAA,EAAEzE,UACbyR,EAAK1a,KAAKsa,IAGd,IAAK,MAAMA,KAAMI,EACfpZ,KAAK+Y,QAAQC,GAKf,MAAMqB,EAAYra,KAAK8R,UAAUwI,eAAe,GAChDD,SAAAA,EAAWE,UAAU,KACNva,KAAK6X,QAAQxG,IAAIoG,IAE5BzX,KAAK+Y,QAAQtB,KAMyB,cAAtCzX,KAAK8R,UAAUxU,OAAOkd,OAAO3Q,MAC/B7J,KAAKya,oBAIP,MAAM7G,EAAsB,CAC1BwB,KAAMtE,EACNqE,aAAc/B,EACdc,OAAQpD,EACRuD,eAAc7X,OAAA2F,OAAA,GAAOiR,GACrBqF,OAAQ4B,QAAarS,EACrB4R,YACAN,WAAYtZ,KAAK8R,UAAUxU,OAAOkd,OAAO3Q,KACzC8G,MAAO7P,EAAK6P,MACZC,OAAQ9P,EAAK8P,QAMf,OAFA5Q,KAAK6X,QAAQ3U,IAAIuU,EAAS7D,GACT,QAAjBpG,EAAAxN,KAAK0a,oBAAY,IAAAlN,GAAAA,EAAAhG,KAAjBxH,MACOyX,CACT,CAQO,MAAAkD,CAAOC,WAEZ,IAAIC,GAAe,EACfC,GAAkB,EACtB,IAAK,MAAM9F,KAAQhV,KAAK6X,QAAQ9C,SAM9B,GALmB,WAAfC,EAAKrE,MACPmK,GAAkB,EAElBD,GAAe,EAEbA,GAAgBC,EAAiB,MAIvC,GAAID,IAAiB7a,KAAKkK,UAAUkM,SAAS,SAC3CpW,KAAKkK,UAAUwL,iBAAiB,QAC3B1V,KAAKkK,UAAUkM,SAAS,QAAQ,OAUvC,GARI0E,IAAoB9a,KAAKkK,UAAUkM,SAAS,WAC9CpW,KAAKkK,UAAUwL,iBAAiB,UAIlC1V,KAAKkK,UAAUyI,iBAGV3S,KAAK6X,QAAQ9N,KAYhB,OAXK/J,KAAKgY,gBACRhY,KAAKkK,UAAUwJ,WACf1T,KAAKgY,eAAgB,EACrBhY,KAAKiY,iBAAkB,GAErBjY,KAAKkK,UAAUkM,SAAS,QAC1BpW,KAAKkK,UAAU4I,mBAAmB,YAEhC9S,KAAKkK,UAAUkM,SAAS,WAC1BpW,KAAKkK,UAAU4I,mBAAmB,YAMjC+H,GAAgB7a,KAAKkK,UAAUkM,SAAS,SAC3CpW,KAAKkK,UAAUwJ,SAAS,OACxB1T,KAAKkK,UAAU4I,mBAAmB,SAE/BgI,GAAmB9a,KAAKkK,UAAUkM,SAAS,YAC9CpW,KAAKkK,UAAUwJ,SAAS,UACxB1T,KAAKkK,UAAU4I,mBAAmB,WAIhC9S,KAAKiY,kBACPjY,KAAKkK,UAAUwJ,WACf1T,KAAKgY,eAAgB,EACrBhY,KAAKiY,iBAAkB,GAGzB,MAAM5S,MAAEA,EAAKC,IAAEA,GAAQsV,EACjBtd,EAAS0C,KAAK8R,UAAUzF,MAAM/O,OAC9B0O,EAAOhM,KAAK8R,UAAUzF,MAAML,KAGlChM,KAAKkK,UAAUoJ,WAAWjO,EAAOC,GAGjC,MAAMyV,EAAgG,GAChGC,EAAkE,GAGxE,IAAK,IAAIjH,EAAM1O,EAAO0O,GAAOzO,IAAOyO,EAAK,CACvC,MAAMiG,EAAO1c,EAAO2c,MAAM5I,IAAI0C,EAAMzW,EAAO2d,OAC3C,IAAKjB,EAAM,OACX,IAAK,IAAIlG,EAAM,EAAGA,EAAM9H,IAAQ8H,EAC9B,GAAmB,UAAfkG,EAAKkB,MAAMpH,GAA6B,CAC1C,IAAIhM,EAAiD,QAAhDsE,EAAwB4N,EAAKmB,eAAerH,UAAI,IAAA1H,EAAAA,EAAIwL,EACzD,MAAMH,EAAU3P,EAAE2P,QAClB,QAAgBzP,IAAZyP,IAAsC,IAAbA,EAC3B,SAEF,MAAM7D,EAAU5T,KAAK6X,QAAQxG,IAAIoG,GACjC,IAAkB,IAAd3P,EAAE+L,OAAe,CACnB,MAAMuH,EAAYtT,EAAE+L,OACdwH,EAAWvH,EACjB,IAAIE,EAAQ,EAOZ,OACIF,EAAM9H,GACW,UAAfgO,EAAKkB,MAAMpH,KACXhM,EAA4B,QAA3B0F,EAAGwM,EAAKmB,eAAerH,UAAI,IAAAtG,EAAAA,EAAIoK,IAChC9P,EAAE2P,UAAYA,GACd3P,EAAE+L,SAAWuH,EAAYpH,GAE7BA,IAEFF,IACIF,EACEA,EAAQM,QACV6G,EAAUrc,KAAK,CAAEkV,UAASC,OAAQuH,EAAWtH,IAAKuH,EAAUtH,MAAKC,UAE1DhU,KAAKkC,MAAMiR,iBACpB6H,EAAiBtc,KAAK,CAAEoV,IAAKuH,EAAUtH,MAAKC,UAE9ChU,KAAKgY,eAAgB,CACvB,CACF,CAEJ,CAGA+C,EAAUO,KAAK,CAAC5f,EAAGD,IAAMC,EAAEkY,QAAQhD,OAASnV,EAAEmY,QAAQhD,QAGtD,IAAK,MAAMpJ,KAAQwT,EACjBhb,KAAKkK,UAAU4K,gBAAgBtN,EAAKsM,IAAKtM,EAAKuM,IAAKvM,EAAKwM,OAI1D,IAAK,MAAMxM,KAAQuT,EACjB/a,KAAKkK,UAAUyJ,KAAKnM,EAAKoM,QAASpM,EAAKqM,OAAQrM,EAAKsM,IAAKtM,EAAKuM,IAAKvM,EAAKwM,MAE5E,CAEO,cAAAuH,CAAe1O,WAEpB,IAAK7M,KAAK6X,QAAQ9N,KAEhB,YADA/J,KAAKwY,iBAAmB3L,GAM1B,GAAI7M,KAAKwY,iBAAiBxM,MAAQa,EAAQb,KAExC,YADAhM,KAAKwY,iBAAmB3L,GAK1B,MAAMvP,EAAS0C,KAAK8R,UAAUzF,MAAM/O,OAC9B2O,EAAO3O,EAAO2c,MAAMlc,OACpByd,EAASxb,KAAKwY,iBAAiBxM,KAAO,EAC5C,IAAK,IAAI+H,EAAM,EAAGA,EAAM9H,IAAQ8H,EAAK,CACnC,MAAMiG,EAAO1c,EAAO2c,MAAM5I,IAAI0C,GAC9B,GAAsB,UAAlBiG,EAAKkB,MAAMM,GAAgC,CAC7C,MAAM1T,EAAoD,QAAnD0F,EAAwBwM,EAAKmB,eAAeK,UAAO,IAAAhO,EAAAA,EAAIoK,EACxDH,EAAU3P,EAAE2P,QAClB,QAAgBzP,IAAZyP,IAAsC,IAAbA,EAC3B,SAEF,MAAM7D,EAAU5T,KAAK6X,QAAQxG,IAAIoG,GACjC,IAAK7D,EACH,SAGF,MAAM6H,EAAc1f,KAAKuI,OAAoB,QAAd8H,EAAAwH,EAAQM,cAAM,IAAA9H,OAAA,EAAAA,EAAElM,QAAS,GAAK0T,EAAQS,eAAenU,OACpF,GAAK4H,EAAE+L,OAAS4H,EAAe,GAAKA,EAClC,SAGF,IAAIC,GAAU,EACd,IAAK,IAAIC,EAAWH,EAAS,EAAGG,EAAW9O,EAAQb,OAAQ2P,EACzD,GAAmD,QAA/C3B,EAAK4B,MAAc,EAARD,EAAoB,GAA6C,CAC9ED,GAAU,EACV,KACF,CAEF,GAAIA,EACF,SAGF,MAAMpW,EAAMvJ,KAAKE,IAAI4Q,EAAQb,KAAMyP,EAAe3T,EAAE+L,OAAS4H,EAAeD,GAC5E,IAAIK,EAAW/T,EAAE+L,OACjB,IAAK,IAAIiI,EAAYN,EAAS,EAAGM,EAAYxW,IAAOwW,EAClD9b,KAAKma,aAAaH,EAAwB8B,EAAWrE,IAAWoE,GAChEjI,EAAQgG,WAEZ,CACF,CAEA5Z,KAAKwY,iBAAmB3L,CAC1B,CAKO,oBAAAkP,CAAqBrF,EAAWnD,aACrC,MACMyG,EADSha,KAAK8R,UAAUzF,MAAM/O,OAChB2c,MAAM5I,IAAIkC,GAC9B,GAAIyG,GAAqB,UAAbA,EAAKkB,MAAMxE,GAA2B,CAChD,MAAM5O,EAA+C,QAA9CqE,EAAwB6N,EAAKmB,eAAezE,UAAE,IAAAvK,EAAAA,EAAIyL,EACzD,GAAI9P,EAAE2P,UAA0B,IAAf3P,EAAE2P,QAAgB,CACjC,MAAMrC,EAAkC,QAA3BhJ,EAAApM,KAAK6X,QAAQxG,IAAIvJ,EAAE2P,gBAAQ,IAAArL,OAAA,EAAAA,EAAEgJ,KAC1C,GAAI2B,OAAOkC,aAAe7D,aAAgB6D,YAAa,CACrD,MAAMlN,EAAS1C,EAAAiE,cAAcC,aAAawJ,OAAOxF,SAAU6D,EAAKlV,MAAOkV,EAAKpR,QAE5E,OADuB,QAAvBwJ,EAAAzB,EAAO0B,WAAW,aAAK,IAAAD,GAAAA,EAAEoH,UAAUQ,EAAM,EAAG,EAAGA,EAAKlV,MAAOkV,EAAKpR,QACzD+H,CACT,CACA,OAAOqJ,CACT,CACF,CACF,CAKO,uBAAA4G,CAAwBtF,EAAWnD,SACxC,MACMyG,EADSha,KAAK8R,UAAUzF,MAAM/O,OAChB2c,MAAM5I,IAAIkC,GAC9B,GAAIyG,GAAqB,UAAbA,EAAKkB,MAAMxE,GAA2B,CAChD,MAAM5O,EAA+C,QAA9CsE,EAAwB4N,EAAKmB,eAAezE,UAAE,IAAAtK,EAAAA,EAAIwL,EACzD,GAAI9P,EAAE2P,UAA0B,IAAf3P,EAAE2P,UAAgC,IAAd3P,EAAE+L,OAAe,CACpD,MAAMmB,EAAOhV,KAAK6X,QAAQxG,IAAIvJ,EAAE2P,SAChC,GAAIzC,EACF,OAAOhV,KAAKkK,UAAU2K,YAAYG,EAAMlN,EAAE+L,OAE9C,CACF,CACF,CAIQ,YAAA8E,CAAasD,SACnB,MAAMC,EAAOlc,KAAK6Y,mBAClB,IAAIsD,EAAUD,EACd,KAAOlc,KAAKkY,YAAciE,EAAUF,GAAQjc,KAAK6X,QAAQ9N,MAAM,CAC7D,MAAMiL,EAAOhV,KAAK6X,QAAQxG,MAAMrR,KAAK+X,WACjC/C,GAAQA,EAAKI,OACf+G,GAAWnH,EAAKI,KAAKlV,MAAQ8U,EAAKI,KAAKpR,OACnCgR,EAAKd,QAAUc,EAAKI,OAASJ,EAAKd,SACpCiI,GAAWnH,EAAKd,OAAOhU,MAAQ8U,EAAKd,OAAOlQ,QAElC,QAAXoI,EAAA4I,EAAKyD,cAAM,IAAArM,GAAAA,EAAEzE,UACb3H,KAAK+Y,QAAQ/Y,KAAK+X,WAEtB,CACA,OAAOmE,EAAOC,CAChB,CAEQ,YAAAhC,CAAaH,EAAsBtD,EAAWe,EAAiB5D,GACrE,GAAuC,UAAnCmG,EAAK4B,MAAO,EAADlF,EAAa,GAAoC,CAC9D,MAAM0F,EAAMpC,EAAKmB,eAAezE,GAChC,GAAI0F,EAAK,CACP,QAAoBpU,IAAhBoU,EAAI3E,QAAuB,CAI7B,MAAM4E,EAAUrc,KAAK6X,QAAQxG,IAAI+K,EAAI3E,SAOrC,OANI4E,GAEFA,EAAQzC,YAEVwC,EAAI3E,QAAUA,OACd2E,EAAIvI,OAASA,EAEf,CAGA,YADAmG,EAAKmB,eAAezE,GAAK,IAAIM,EAAmBoF,EAAInF,IAAKmF,EAAI5E,MAAOC,EAAS5D,GAE/E,CACF,CAEAmG,EAAK4B,MAAO,EAADlF,EAAa,IAAW,UACnCsD,EAAKmB,eAAezE,GAAK,IAAIM,EAAmB,EAAG,EAAGS,EAAS5D,EACjE,CAEQ,iBAAA4G,WAEN,IAAK,MAAMzF,KAAQhV,KAAK6X,QAAQ9C,SACN,cAApBC,EAAKsE,aACPtE,EAAK4E,UAAY,GAIrB,MAAMtc,EAAS0C,KAAK8R,UAAUzF,MAAM/O,OACpC,IAAK,IAAIiW,EAAI,EAAGA,EAAIvT,KAAK8R,UAAU7F,OAAQsH,EAAG,CAC5C,MAAMyG,EAAO1c,EAAO2c,MAAM5I,IAAIkC,GAC9B,GAAKyG,EAGL,IAAK,IAAItD,EAAI,EAAGA,EAAI1W,KAAK8R,UAAU9F,OAAQ0K,EACzC,GAAuC,UAAnCsD,EAAK4B,MAAO,EAADlF,EAAa,GAAoC,CAC9D,MAAM4F,EAA8B,QAAtBlQ,EAAA4N,EAAKmB,eAAezE,UAAE,IAAAtK,OAAA,EAAAA,EAAEqL,QACtC,GAAI6E,EAAO,CACT,MAAMtH,EAAOhV,KAAK6X,QAAQxG,IAAIiL,GAC1BtH,GACFA,EAAK4E,WAET,CACF,CAEJ,CAEA,MAAMR,EAAO,GACb,IAAK,MAAOJ,EAAIhE,KAAShV,KAAK6X,QAAQwB,UACZ,cAApBrE,EAAKsE,YAA+BtE,EAAK4E,YAChC,QAAXpM,EAAAwH,EAAKyD,cAAM,IAAAjL,GAAAA,EAAE7F,UACbyR,EAAK1a,KAAKsa,IAGd,IAAK,MAAMA,KAAMI,EACfpZ,KAAK+Y,QAAQC,EAEjB,sFCnpBF,MAAAja,EAAAC,EAAA,KAEAqK,EAAArK,EAAA,KAEAud,EAAAvd,EAAA,KACAC,EAAAD,EAAA,KAMMwd,EAAkBzd,EAAAnC,iBACxB4f,EAAgBtZ,IAAInE,EAAAjC,qBAKpB,MACM2f,EAAe,IAAIzK,IACzB,IAAI0K,GAAa,EAgBjB,SAASC,EAAexW,EAAc3F,SAChC2F,EAAIvB,YA5Bc,SA6BpBuB,EAAIlC,UAEN,MAAM2Y,EAAoC,QAAhCxQ,EAAGqQ,EAAapL,IAAI7Q,UAAY,IAAA4L,EAAAA,EAAI,GAC1CwQ,EAAK7e,OAvBe,IAwBtB6e,EAAKle,KAAKyH,GACVsW,EAAavZ,IAAI1C,EAAaoc,GAElC,CA8IA,SAASC,EAAUpf,GACjB,OAAIsB,EAAA5B,WAAmBM,GACP,IAARA,IAAiB,IAAMA,IAAU,EAAI,MAAS,IAAMA,IAAU,GAAK,MAAS,EAAIA,IAAU,GAAK,GACzG,gBA9IA,MAQE,WAAAsC,CACmBmC,EACAiI,EACAC,GArCrB,IAA0B5J,EAmCLR,KAAAkC,MAAAA,EACAlC,KAAAmK,SAAAA,EACAnK,KAAAoK,cAAAA,EAVXpK,KAAA8c,MAAQ,EACR9c,KAAAsK,UAAW,EAEXtK,KAAA+c,gBAAkB,EAET/c,KAAAgD,SAAW,IAAI3F,YAAY4B,EAAAS,OAAOkB,cAOjDZ,KAAKgD,SAASE,IAAIsZ,GAvCIhc,EAwCmB,EAAxBR,KAAKkC,MAAM+K,WAvC1ByP,IACJA,GAAa,GAEb,EAAAH,EAAAzd,cAAa,CAAE0B,cAAa9C,QAAS8e,IAAmBnb,KACtDlD,GAAKwe,EAAexe,EAAGqC,GACvB,KAAQkc,GAAa,IAmCvB,CAEO,KAAAxR,GACLlL,KAAKgd,iBACLhd,KAAKgD,SAAS2C,KAAK,GACnB3F,KAAKgD,SAASE,IAAIsZ,EACpB,CAEO,IAAAS,CAAKC,SACVld,KAAK8c,MAAQ,EACb9c,KAAKsK,UAAW,EAChBtK,KAAKgd,iBACL,MAAMxc,EAAsC,EAAxBR,KAAKkC,MAAM+K,WAC/B,IACEjN,KAAK+K,KA7CX,SAAwBvK,WACtB,OAA2C,QAA3CgN,EAAoC,QAA7BpB,EAAAqQ,EAAapL,IAAI7Q,UAAY,IAAA4L,OAAA,EAAAA,EAAE+Q,aAAK,IAAA3P,EAAAA,EAAI,IAAI+O,EAAA1d,QAAQ,CAAE2B,cAAa9C,QAAS8e,GACrF,CA2CkBY,CAAe5c,EAC7B,CAAE,MAAOsH,GAIP,OAFAvK,QAAQC,KAAK,uCAAuCsK,UACpD9H,KAAKsK,UAAW,EAElB,CACAtK,KAAK+c,gBAAkBvc,EACvB,MAAME,EAAiC,IAArBwc,EAAOA,OAAO,GAAW,EAwE/C,SAAyBG,EAAqBC,GAC5C,IAAIC,EAAK,EACT,IAAKD,EAGH,OAAOC,EAET,GAAIF,EAAKG,YACP,GAAIH,EAAKI,cACPF,EAAKV,EAAUS,EAAOI,WAAWC,WAC5B,GAAIN,EAAKO,UAAW,CACzB,MAAMC,EAAKR,EAAKtd,YAAqC+d,WAAWT,EAAKU,cACrER,GAAK,EAAAxe,EAAAzD,eAAcuiB,EACrB,MACEN,EAAKV,EAAUS,EAAOU,KAAKX,EAAKU,cAAcJ,WAGhD,GAAIN,EAAKY,cACPV,EAAKV,EAAUS,EAAOY,WAAWP,WAC5B,GAAIN,EAAKc,UAAW,CACzB,MAAMN,EAAKR,EAAKtd,YAAqC+d,WAAWT,EAAKe,cACrEb,GAAK,EAAAxe,EAAAzD,eAAcuiB,EACrB,MACEN,EAAKV,EAAUS,EAAOU,KAAKX,EAAKe,cAAcT,MAGlD,OAAOJ,CACT,CAnGmDc,CAC7Cre,KAAKoK,cAAciC,MAAMwN,cAAcyE,aACD,QAAtClS,EAAApM,KAAKoK,cAAciC,MAAMkS,qBAAa,IAAAnS,OAAA,EAAAA,EAAEkR,QAC1Ctd,KAAK+K,KAAK1H,KAAK3C,EAAWV,KAAKgD,SAAUhD,KAAKkC,MAAMsc,kBACtD,CAEQ,cAAAxB,GACN,MAAM7W,EAAMnG,KAAK+K,KACZ5E,IACLnG,KAAK+K,UAAO/C,EACZhI,KAAKgD,SAASE,IAAIiD,EAAIzI,SACtBif,EAAexW,EAAKnG,KAAK+c,iBAC3B,CAEO,GAAA5R,CAAI/F,EAAmBC,EAAeC,GAC3C,IAAItF,KAAKsK,UAAatK,KAAK+K,KAA3B,CAIA,GADA/K,KAAK8c,OAASxX,EAAMD,EAChBrF,KAAK8c,MAAQ9c,KAAKkC,MAAMuc,eAI1B,OAHAlhB,QAAQC,KAAK,kCACbwC,KAAKsK,UAAW,OAChBtK,KAAK+K,KAAK9G,UAGZ,IACEjE,KAAK+K,KAAKnM,OAAOwG,EAAMC,EAAOC,EAChC,CAAE,MAAOwC,GACPvK,QAAQC,KAAK,uCAAuCsK,KACpD9H,KAAKsK,UAAW,EAChBtK,KAAK+K,KAAK9G,SACZ,CAdA,CAeF,CAEO,MAAAya,CAAOjT,GACZ,IACE,OAAOzL,KAAK2e,QAAQlT,EACtB,SACEzL,KAAKgd,gBACP,CACF,CAEQ,OAAA2B,CAAQlT,SACd,GAAIzL,KAAKsK,WAAamB,IAAYzL,KAAK+K,KACrC,OAAO,EAGT,MAAM7K,EAAQF,KAAK+K,KAAK7K,MAClB8D,EAAShE,KAAK+K,KAAK/G,OAGzB,IAAK9D,IAAU8D,EAIb,OAHIA,GACFhE,KAAKmK,SAASyU,cAAc5a,IAEvB,EAGT,MAAM+H,EAAS1C,EAAAiE,cAAcC,kBAAavF,EAAW9H,EAAO8D,GAG5D,OAFuB,QAAvBoI,EAAAL,EAAO0B,WAAW,aAAK,IAAArB,GAAAA,EAAEsB,aAAa,IAAIN,UAAUpN,KAAK+K,KAAK9E,MAAyC/F,EAAO8D,GAAS,EAAG,GAC1HhE,KAAKmK,SAASwD,SAAS5B,IAChB,CACT,2FCpJF,MAAAzC,EAAAtK,EAAA,yBAWA,MAEE,WAAAe,CACmBoK,EACAjI,EACAgI,EACA4H,GAHA9R,KAAAmK,SAAAA,EACAnK,KAAAkC,MAAAA,EACAlC,KAAAkK,UAAAA,EACAlK,KAAA8R,UAAAA,EALX9R,KAAAyQ,cAA+B,CAAEC,WAAW,EAAMC,MAAO,MAAOC,OAAQ,EAAGC,UAAW,QAM3F,CAMI,QAAAlD,CAASmD,GACd9Q,KAAKyQ,cAAcC,UAAY1Q,KAAKkC,MAAM2c,eAC1C7e,KAAKmK,SAASwD,SAASmD,EAAK9Q,KAAKyQ,cACnC,CAOO,aAAAmO,CAAc5a,GACnB,GAAIhE,KAAKkC,MAAM2c,eAAgB,CAC7B,IAAIzL,EAAWpT,KAAKkK,UAAUkJ,UACN,IAApBA,EAASlT,QAAqC,IAArBkT,EAASpP,SACpCoP,EAAW9J,EAAAsC,mBAEb,MAAMK,EAAOlQ,KAAKuI,KAAKN,EAASoP,EAASpP,QACzC,IAAK,IAAIlG,EAAI,EAAGA,EAAImO,IAAQnO,EAC1BkC,KAAK8R,UAAUzF,MAAMwN,cAAcO,UAEvC,CACF,iLC3CF,MAAA/Q,EAAArK,EAAA,KACAsK,EAAAtK,EAAA,KACA2K,EAAA3K,EAAA,KAEAuK,EAAAC,EAAAxK,EAAA,MACA8f,EAAA9f,EAAA,4BA0BA,MAiCE,WAAAe,CACmBmC,EACAgI,EACA6U,EACA3U,GAHApK,KAAAkC,MAAAA,EACAlC,KAAAkK,UAAAA,EACAlK,KAAA+e,cAAAA,EACA/e,KAAAoK,cAAAA,EApCXpK,KAAAsK,UAAW,EACXtK,KAAAqK,YAAc,EACdrK,KAAAgf,cAAe,EAEfhf,KAAAif,eAAuC,KAOvCjf,KAAAkf,gBAAiB,EAGjBlf,KAAAmf,aAAe,IAAI9hB,YAAW,KAC9B2C,KAAAof,eAAiB,EAGjBpf,KAAAqf,kBAAoB,EACpBrf,KAAAsf,kBAAoB,EAGpBtf,KAAAuf,eAAuC,KAIvCvf,KAAAwf,sBAA2D,IAAIxN,IAarEhS,KAAKyf,iBAAmB1jB,KAAKuI,KAAiC,EAA5BtE,KAAKkC,MAAMwd,eAAqB,GAElE1f,KAAK2f,qBAAuB5jB,KAAKE,IAAG,QAAiC+D,KAAKyf,iBAC5E,CAEO,KAAAvU,GACLlL,KAAKqK,cACLrK,KAAK4f,qBACD5f,KAAKif,iBACPjf,KAAKif,eAAehb,UACpBjE,KAAKif,eAAiB,MAExBjf,KAAK+e,cAAc7T,OACrB,CAEO,OAAAvD,GACL3H,KAAKkL,OACP,CAEQ,mBAAA2U,CAAoBrK,GAC1BxV,KAAKwf,sBAAsBrJ,OAAOX,GAC9BxV,KAAK8f,kBAAoBtK,IAC3BxV,KAAK8f,qBAAkB9X,EAE3B,CAEQ,kBAAA4X,GACN,IAAK,MAAMG,KAAW/f,KAAKwf,sBAAsBzK,SAC/CgL,EAAQC,QAAQ/b,UAElBjE,KAAKwf,sBAAsB1W,QAC3B9I,KAAK8f,qBAAkB9X,CACzB,CAEO,KAAA3C,GACLrF,KAAKsK,UAAW,EAChBtK,KAAKgf,cAAe,EACpBhf,KAAKkf,gBAAiB,EACtBlf,KAAKof,eAAiB,EACtBpf,KAAKuf,eAAiB,KAEtBvf,KAAKqf,kBAAoBrf,KAAKyf,iBAC9Bzf,KAAKsf,kBAAoB,EACzBtf,KAAKif,eAAiB,IACxB,CAEO,GAAA9T,CAAI/F,EAAmBC,EAAeC,SAC3C,IAAItF,KAAKsK,SAET,GAAKtK,KAAKkf,eAEH,CAEL,IAAIe,EAAa3a,EACjB,IAAK,IAAIxH,EAAIuH,EAAOvH,EAAIwH,EAAKxH,IAC3B,GAAW,KAAPsH,EAAKtH,GAA4B,CACnCkC,KAAKkf,gBAAiB,EACtBe,EAAaniB,EACb,KACF,CAIF,MAAMoiB,EAAaD,EAAa5a,EAChC,GAAIrF,KAAKof,eAAiBc,EAAU,IAElC,YADAlgB,KAAKsK,UAAW,GAMlB,GAHAtK,KAAKmf,aAAajc,IAAIkC,EAAKX,SAASY,EAAO4a,GAAajgB,KAAKof,gBAC7Dpf,KAAKof,gBAAkBc,GAElBlgB,KAAKkf,eAAgB,CAKxB,GAHAlf,KAAKuf,gBAAiB,EAAAT,EAAAqB,mBAAkBngB,KAAKogB,gCAGdpY,IAA3BhI,KAAKuf,eAAevG,SAAwDhR,IAApChI,KAAKuf,eAAec,YAG9D,OAFArgB,KAAKsgB,cAActgB,KAAKuf,eAAevG,GAAI,0CAAoE,QAA3B5M,EAAEpM,KAAKuf,eAAegB,aAAK,IAAAnU,EAAAA,EAAI,QACnHpM,KAAKsK,UAAW,GAKlB,GAA8B,MAA1BtK,KAAKuf,eAAeiB,OACtB,OAIF,MAAMC,EAAeR,EAAa,EAC9BQ,EAAenb,GACjBtF,KAAK0gB,eAAetb,EAAMqb,EAAcnb,EAE5C,CACF,MA3CEtF,KAAK0gB,eAAetb,EAAMC,EAAOC,EA4CrC,CAGQ,cAAAob,CAAetb,EAAmBC,EAAeC,2BACvD,GAAItF,KAAKsK,SAAU,OAKnB,MAAMqW,EAA4D,QAAlDlN,EAA0B,QAA1BlF,EAAsB,QAAnBnC,EAAApM,KAAKuf,sBAAc,IAAAnT,OAAA,EAAAA,EAAE4M,UAAE,IAAAzK,EAAAA,EAAIvO,KAAK8f,uBAAe,IAAArM,EAAAA,EAAI,EAChEsM,EAAU/f,KAAKwf,sBAAsBnO,IAAIsP,GACzCC,EAA+C,QAA5BC,EAAGd,aAAO,EAAPA,EAASe,wBAAgB,IAAAD,EAAAA,EAAI,EAGzD,GAFA7gB,KAAKsf,mBAAqBha,EAAMD,EACFub,EAAsB5gB,KAAKsf,kBAC7Btf,KAAKqf,kBAAmB,CAClD,MAAM0B,EAAsC,QAAtBC,EAAGhhB,KAAKif,sBAAc,IAAA+B,EAAAA,EAAIjB,aAAO,EAAPA,EAASC,QASzD,OARIe,GACFA,EAAiB9c,UAEnBjE,KAAKif,eAAiB,KAClBc,GACF/f,KAAK6f,oBAAoBc,QAE3B3gB,KAAKsK,UAAW,EAElB,CAEA,IAAItK,KAAKgf,aAAT,CAKA,IAHIe,aAAO,EAAPA,EAASC,WAAYhgB,KAAKif,iBAC5Bjf,KAAKif,eAAiBc,EAAQC,UAE3BhgB,KAAKif,eAAgB,CAExB,MAAMgC,EAAkBjhB,KAAKyf,iBAAmB,OAChD,GAAIwB,EAA4C,IAA1BjhB,KAAKkC,MAAMkW,aAK/B,OAJApY,KAAKsK,UAAW,YACgBtC,KAAT,QAAnBwF,EAAAxN,KAAKuf,sBAAc,IAAA/R,OAAA,EAAAA,EAAEwL,KACvBhZ,KAAKsgB,cAActgB,KAAKuf,eAAevG,GAAI,uCAAiE,QAA3BkI,EAAElhB,KAAKuf,eAAegB,aAAK,IAAAW,EAAAA,EAAI,IAIpH,MAAMC,EAAaplB,KAAKC,IAAI,EAAGD,KAAKoR,MAAgC,IAA1BnN,KAAKkC,MAAMkW,aAAyB6I,IAC9E,KAAOjhB,KAAKwf,sBAAsBzV,MAAQoX,GAAY,CACpD,MAAMC,EAASphB,KAAKwf,sBAAsBnG,UAAUgI,OAAOvlB,MAC3D,IAAKslB,EAAQ,MACbA,EAAO,GAAGpB,QAAQ/b,UAClBjE,KAAK6f,oBAAoBuB,EAAO,SACPpZ,IAArBoZ,EAAO,GAAGE,IAAItI,IAChBhZ,KAAKsgB,cAAcc,EAAO,GAAGE,IAAItI,GAAI,uCAA2D,QAArBuI,EAAEH,EAAO,GAAGE,IAAIf,aAAK,IAAAgB,EAAAA,EAAI,EAExG,CACA,MAAMvB,EAAU,IAAIzW,EAAAyB,QAAa,QAA8BhL,KAAKyf,iBAAkBzf,KAAK2f,sBAC3F,IACEK,EAAQ3c,MACV,CAAE,MAAOyE,GAOP,OALAvK,QAAQC,KAAK,oCAAqCsK,GAClD9H,KAAKsK,UAAW,YACgBtC,KAAT,QAAnBmE,EAAAnM,KAAKuf,sBAAc,IAAApT,OAAA,EAAAA,EAAE6M,KACvBhZ,KAAKsgB,cAActgB,KAAKuf,eAAevG,GAAI,oCAA8D,QAA3BwI,EAAExhB,KAAKuf,eAAegB,aAAK,IAAAiB,EAAAA,EAAI,GAGjH,CACAxhB,KAAKif,eAAiBe,CACxB,CA1Me,IA4MXhgB,KAAKif,eAAe9T,IAAI/F,EAAKX,SAASY,EAAOC,MAC/CtF,KAAKif,eAAehb,UACpBjE,KAAKif,eAAiB,KACtBjf,KAAKgf,cAAe,EAChBe,GACF/f,KAAK6f,oBAAoBc,GA7CN,CAgDzB,CAEO,GAAArb,CAAImG,WACT,GAAIzL,KAAKsK,WAAamB,EAKpB,OAJIzL,KAAKif,iBACPjf,KAAKif,eAAehb,UACpBjE,KAAKif,eAAiB,OAEjB,EAIT,GAAIjf,KAAKkf,eACP,OAAOlf,KAAKyhB,0BAId,MAAMH,EAAMthB,KAAKuf,eAGjB,GAAc,MAAV+B,EAAId,OACN,OAAOxgB,KAAK0hB,cAAcJ,GAI5B,MAAMX,EAA2C,QAAjCnT,EAAS,QAATpB,EAAGkV,EAAItI,UAAE,IAAA5M,EAAAA,EAAIpM,KAAK8f,uBAAe,IAAAtS,EAAAA,EAAI,EAC/CmU,EAA4B,IAAbL,EAAIM,KACnB7B,EAAU/f,KAAKwf,sBAAsBnO,IAAIsP,GAE/C,GAAIgB,EAgBF,OAfI3hB,KAAKif,iBACHc,GACFA,EAAQe,kBAAoB9gB,KAAKsf,kBACjCS,EAAQ8B,YAAc9B,EAAQ8B,aAAe7hB,KAAKgf,cAElDhf,KAAKwf,sBAAsBtc,IAAIyd,EAAY,CACzCW,IAAG9kB,OAAA2F,OAAA,GAAOmf,GACVtB,QAAShgB,KAAKif,eACd6B,iBAAkB9gB,KAAKsf,kBACvBuC,YAAa7hB,KAAKgf,eAGtBhf,KAAK8f,gBAAkBa,EACvB3gB,KAAKif,eAAiB,OAEjB,EAILc,IACF/f,KAAK8f,qBAAkB9X,GAGzB,IAAI6Z,EAAc7hB,KAAKgf,aACnB8C,EAAWR,EACXtB,EAAUhgB,KAAKif,eAEfc,IACF+B,EAAW/B,EAAQuB,IACnBtB,EAAUD,EAAQC,QAClB6B,EAAcA,GAAe9B,EAAQ8B,YACrC7hB,KAAKwf,sBAAsBrJ,OAAOwK,IAGpC,IAAIoB,EAAa,IAAI3kB,WAAW,GAC5B4iB,IArRW,IAsRTA,EAAQ1a,QACVuc,GAAc,GAEhBE,EAAa/B,EAAQ/Z,OAEvBjG,KAAKif,eAAiB,KAKtB,MAAM1f,EAASS,KAAKgiB,8BAA8BF,EAAUC,EAAYF,GAIxE,OAHI7B,GACFA,EAAQ/b,UAEH1E,CACT,CAIQ,uBAAA6gB,GACN,IAAI6B,EAAM,GACV,IAAK,IAAInkB,EAAI,EAAGA,EAAIkC,KAAKof,eAAgBthB,IACvCmkB,GAAO9S,OAAO+S,cAAcliB,KAAKmf,aAAarhB,IAEhD,OAAOmkB,CACT,CAEQ,uBAAAR,iBACN,MAAMH,GAAM,EAAAxC,EAAAqB,mBAAkBngB,KAAKogB,2BAGnC,QAAepY,IAAXsZ,EAAItI,SAAwChR,IAApBsZ,EAAIjB,YAE9B,OADArgB,KAAKsgB,cAAcgB,EAAItI,GAAI,0CAAoD,QAAX5M,EAAEkV,EAAIf,aAAK,IAAAnU,EAAAA,EAAI,IAC5E,EAKT,OAFyB,QAAboB,EAAG8T,EAAId,cAAM,IAAAhT,EAAAA,EAAI,KAG3B,QACE,OAAOxN,KAAK0hB,cAAcJ,GAC5B,QAEE,OADAthB,KAAKsgB,cAAoB,QAAPnU,EAACmV,EAAItI,UAAE,IAAA7M,EAAAA,EAAI,EAAG,KAAe,QAAXoC,EAAE+S,EAAIf,aAAK,IAAAhS,EAAAA,EAAI,IAC5C,EACT,QACE,OAAOvO,KAAKmiB,iBAAiBb,GAC/B,QAQE,YAHetZ,IAAXsZ,EAAItI,IACNhZ,KAAKsgB,cAAcgB,EAAItI,GAAI,4BAAsC,QAAXvF,EAAE6N,EAAIf,aAAK,IAAA9M,EAAAA,EAAI,IAEhE,EAEb,CAEQ,6BAAAuO,CAA8BV,EAAoBc,EAAmBP,iBAG3E,OAFyB,QAAbzV,EAAGkV,EAAId,cAAM,IAAApU,EAAAA,EAAI,KAG3B,QAA2B,CACzB,MAAM7M,EAASS,KAAKqiB,gBAAgBf,EAAKc,EAAOP,GAUhD,MAPkC,OAAb,QAAjBrU,EAAC8T,EAAIgB,oBAAY,IAAA9U,EAAAA,EAAI,WAA2BxF,IAAXsZ,EAAItI,KACvC6I,EACF7hB,KAAKsgB,cAAcgB,EAAItI,GAAI,6BAAuC,QAAX7M,EAAEmV,EAAIf,aAAK,IAAApU,EAAAA,EAAI,GAC7DiW,EAAMrkB,OAAS,GACxBiC,KAAKsgB,cAAcgB,EAAItI,GAAI,KAAe,QAAXzK,EAAE+S,EAAIf,aAAK,IAAAhS,EAAAA,EAAI,IAG3ChP,CACT,CACA,QACE,OAAOS,KAAKuiB,uBAAuBjB,EAAKc,EAAOP,GACjD,QACE,OAAO7hB,KAAKwiB,aAAalB,EAAKc,EAAOP,GACvC,QAEE,OAAO7hB,KAAKmiB,iBAAiBb,GAC/B,QAQE,YAHetZ,IAAXsZ,EAAItI,IACNhZ,KAAKsgB,cAAcgB,EAAItI,GAAI,4BAAsC,QAAXvF,EAAE6N,EAAIf,aAAK,IAAA9M,EAAAA,EAAI,IAEhE,EAEb,CAEQ,gBAAA0O,CAAiBb,SACvB,QAAetZ,IAAXsZ,EAAItI,GACN,OAAO,EAET,MAAMA,EAAKsI,EAAItI,GACTyJ,EAAQziB,KAAK+e,cAAc2D,SAAS1J,GAC1C,OAAKyJ,EAIUziB,KAAK2iB,cAAcF,EAAOnB,GAC3BjgB,KAAKoK,UAEjB,OADAzL,KAAKsgB,cAActH,EAAIvN,EAAU,KAAO,gCAA0C,QAAXW,EAAEkV,EAAIf,aAAK,IAAAnU,EAAAA,EAAI,EAAGkV,EAAIsB,cACtF,KANP5iB,KAAKsgB,cAActH,EAAI,yBAAmC,QAAX5M,EAAEkV,EAAIf,aAAK,IAAAnU,EAAAA,EAAI,EAAGkV,EAAIsB,cAC9D,EAOX,CAEQ,eAAAP,CAAgBf,EAAoBc,EAAmBP,mBAY7D,MAAqB,OADgB,QAAnBzV,EAAGkV,EAAIgB,oBAAY,IAAAlW,EAAAA,EAAI,WAExBpE,IAAXsZ,EAAItI,IACNhZ,KAAKsgB,cAAcgB,EAAItI,GAAI,yCAAmD,QAAXxL,EAAE8T,EAAIf,aAAK,IAAA/S,EAAAA,EAAI,IAE7E,IAGLqU,GAAgC,IAAjBO,EAAMrkB,QAEzBiC,KAAK+e,cAAc8D,WAAWvB,EAAItI,GAAI,CACpC5T,KAAM,IAAIwI,KAAK,CAACwU,IAChBliB,MAAgB,QAAXiM,EAAEmV,EAAIphB,aAAK,IAAAiM,EAAAA,EAAI,EACpBnI,OAAkB,QAAZuK,EAAE+S,EAAItd,cAAM,IAAAuK,EAAAA,EAAI,EACtBuU,OAAmB,QAAXrP,EAAC6N,EAAIwB,cAAM,IAAArP,EAAAA,EAAA,GACnBsP,YAA4B,QAAjBlC,EAAES,EAAIyB,mBAAW,IAAAlC,EAAAA,EAAI,MAPY,EAUhD,CAEQ,sBAAA0B,CAAuBjB,EAAoBc,EAAmBP,WACpE,GAAIA,EAIF,YAHe7Z,IAAXsZ,EAAItI,IACNhZ,KAAKsgB,cAAcgB,EAAItI,GAAI,6BAAuC,QAAX5M,EAAEkV,EAAIf,aAAK,IAAAnU,EAAAA,EAAI,IAEjE,EAGTpM,KAAKqiB,gBAAgBf,EAAKc,EAAOP,GAEjC,MAAM7I,EAAW,QAATxL,EAAG8T,EAAItI,UAAE,IAAAxL,EAAAA,EAAIxN,KAAK+e,cAAciE,YAClCP,EAAQziB,KAAK+e,cAAc2D,SAAS1J,GAC1C,GAAIyJ,EAAO,CACT,MAAMljB,EAASS,KAAK2iB,cAAcF,EAAOnB,GACzC,YAAetZ,IAAXsZ,EAAItI,GACCzZ,EAAO8B,KAAKoK,UAEjB,OADAzL,KAAKsgB,cAActH,EAAIvN,EAAU,KAAO,gCAA0C,QAAXW,EAAEkV,EAAIf,aAAK,IAAAnU,EAAAA,EAAI,IAC/E,IAGJ7M,EAAO8B,KAAK,KAAM,EAC3B,CACA,OAAO,CACT,CAEQ,YAAAmhB,CAAalB,EAAoBc,EAAmBP,mBAC1D,MAAM7I,EAAW,QAAT5M,EAAGkV,EAAItI,UAAE,IAAA5M,EAAAA,EAAI,EACfmU,EAAiB,QAAZ/S,EAAG8T,EAAIf,aAAK,IAAA/S,EAAAA,EAAI,EAM3B,GAAqB,OADgB,QAAnBrB,EAAGmV,EAAIgB,oBAAY,IAAAnW,EAAAA,EAAI,KAGvC,OADAnM,KAAKsgB,cAActH,EAAI,yCAA0CuH,IAC1D,EAIT,GAAIsB,EAEF,OADA7hB,KAAKsgB,cAActH,EAAI,6BAA8BuH,IAC9C,EAIT,GAAqB,IAAjB6B,EAAMrkB,OAER,OADAiC,KAAKsgB,cAActH,EAAI,KAAMuH,IACtB,EAGT,MAAMuC,EAAmB,QAAbvU,EAAG+S,EAAIwB,cAAM,IAAAvU,EAAAA,EAAA,GAEzB,GAAU,MAANuU,EACF9iB,KAAKsgB,cAActH,EAAI,KAAMuH,OACxB,CACL,MAAMrgB,EAAiB,QAAZuT,EAAG6N,EAAIphB,aAAK,IAAAuT,EAAAA,EAAI,EACrBzP,EAAmB,QAAb6c,EAAGS,EAAItd,cAAM,IAAA6c,EAAAA,EAAI,EAE7B,IAAK3gB,IAAU8D,EAEb,OADAhE,KAAKsgB,cAActH,EAAI,sDAAuDuH,IACvE,EAGT,MACM0C,EAAgB/iB,EAAQ8D,GADF,KAAN8e,EAA6B,EAA2C,GAG9F,GAAIV,EAAMrkB,OAASklB,EAEjB,OADAjjB,KAAKsgB,cAActH,EAAI,iCAAkCuH,IAClD,EAGTvgB,KAAKsgB,cAActH,EAAI,KAAMuH,EAC/B,CACA,OAAO,CACT,CAEQ,aAAAmB,CAAcJ,SAOpB,OALmC,QAArBlV,EAAGkV,EAAI4B,sBAAc,IAAA9W,EAAAA,EAAI,KAMrC,IAAK,IACL,IAAK,IACHpM,KAAK4f,qBACL5f,KAAK+e,cAAcoE,YACnB,MACF,IAAK,IACL,IAAK,IAKH,QAAenb,IAAXsZ,EAAItI,GAAkB,CACxB,MAAM+G,EAAU/f,KAAKwf,sBAAsBnO,IAAIiQ,EAAItI,IAC/C+G,GACFA,EAAQC,QAAQ/b,UAElBjE,KAAK6f,oBAAoByB,EAAItI,IAC7BhZ,KAAK+e,cAAcqE,WAAW9B,EAAItI,GACpC,EAMJ,OAAO,CACT,CAEQ,aAAAsH,CAActH,EAAYV,EAAiBiI,EAAeqC,GAChE,MAAMS,EAAmB,OAAZ/K,EACb,GAAI+K,GAAQ9C,GAAS,EAAG,OACxB,IAAK8C,GAAQ9C,GAAS,EAAG,OAEzB,MACM+C,EAAW,QAAWtK,IADd4J,EAAc,MAAMA,IAAgB,MACRtK,OAC1CtY,KAAKoK,cAAciC,MAAMkX,YAAYC,iBAAiBF,EACxD,CAIQ,aAAAX,CAAcF,EAAwBnB,GAC5C,OAAOthB,KAAKyjB,kBAAkBhB,EAAOnB,GAClCjgB,KAAK,KAAM,GACX8M,MAAM,KAAM,EACjB,CAEQ,uBAAMsV,CAAkBhB,EAAwBnB,qBACtD,MAAMzT,EAAa7N,KAAKqK,YACxB,IAAIyM,QAAwC9W,KAAK0jB,cAAcjB,GAE/D,IACE,GAAI5U,IAAe7N,KAAKqK,YAAa,MAAM,IAAIjI,MAAM,yBACrD,MAAMuhB,EAAQ5nB,KAAKC,IAAI,EAAQ,QAAPmQ,EAAEmV,EAAI5K,SAAC,IAAAvK,EAAAA,EAAI,GAC7ByX,EAAQ7nB,KAAKC,IAAI,EAAQ,QAAPuS,EAAE+S,EAAI/N,SAAC,IAAAhF,EAAAA,EAAI,GAC7BsV,EAAQvC,EAAInN,aAAgB2C,EAAO5W,MAAQyjB,EAC3CG,EAAQxC,EAAIlN,cAAiB0C,EAAO9S,OAAS4f,EAE7CG,EAAWhoB,KAAKC,IAAI,EAAG8a,EAAO5W,MAAQyjB,GACtCK,EAAWjoB,KAAKC,IAAI,EAAG8a,EAAO9S,OAAS4f,GACvCK,EAAaloB,KAAKC,IAAI,EAAGD,KAAKE,IAAI4nB,EAAOE,IACzCG,EAAanoB,KAAKC,IAAI,EAAGD,KAAKE,IAAI6nB,EAAOE,IAE/C,GAAmB,IAAfC,GAAmC,IAAfC,EACtB,MAAM,IAAI9hB,MAAM,4BAGlB,GAAc,IAAVuhB,GAAyB,IAAVC,GAAeK,IAAenN,EAAO5W,OAASgkB,IAAepN,EAAO9S,OAAQ,CAC7F,MAAMmgB,QAAgBrW,kBAAkBgJ,EAAQ6M,EAAOC,EAAOK,EAAYC,GAC1EpN,EAAO5I,QACP4I,EAASqN,CACX,CAEA,MAAM/V,GAA8B,QAAzBhC,EAAApM,KAAKkK,UAAU2B,kBAAU,IAAAO,OAAA,EAAAA,EAAEN,IAAIuC,KAAKnO,QAASoJ,EAAAsC,kBAAkB1L,MACpEoO,GAA8B,QAAzBd,EAAAxN,KAAKkK,UAAU2B,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIuC,KAAKrK,SAAUsF,EAAAsC,kBAAkB5H,OAI3E,IAAIogB,EACAC,OACgBrc,IAAhBsZ,EAAIgD,cAAsCtc,IAAbsZ,EAAIrV,MACnCmY,EAAU9C,EAAIgD,QACdD,EAAU/C,EAAIrV,WACWjE,IAAhBsZ,EAAIgD,SACbF,EAAU9C,EAAIgD,QACdD,EAAUtoB,KAAKC,IAAI,EAAGD,KAAKuI,KAAMwS,EAAO9S,OAAS8S,EAAO5W,OAAUkkB,EAAUhW,GAAME,UAC5DtG,IAAbsZ,EAAIrV,MACboY,EAAU/C,EAAIrV,KACdmY,EAAUroB,KAAKC,IAAI,EAAGD,KAAKuI,KAAMwS,EAAO5W,MAAQ4W,EAAO9S,QAAWqgB,EAAU/V,GAAMF,MAElFgW,EAAUroB,KAAKuI,KAAKwS,EAAO5W,MAAQkO,GACnCiW,EAAUtoB,KAAKuI,KAAKwS,EAAO9S,OAASsK,IAGtC,IAAI3C,EAAImL,EAAO5W,MACX9B,EAAI0Y,EAAO9S,OAQf,QALoBgE,IAAhBsZ,EAAIgD,cAAsCtc,IAAbsZ,EAAIrV,OACnCN,EAAI5P,KAAKQ,MAAM6nB,EAAUhW,GACzBhQ,EAAIrC,KAAKQ,MAAM8nB,EAAU/V,IAGvB3C,EAAIvN,EAAI4B,KAAKkC,MAAM+K,WACrB,MAAM,IAAI7K,MAAM,6BAIlB,MAAM9E,EAAS0C,KAAKoK,cAAciC,MAAM/O,OAClCinB,EAASjnB,EAAOoZ,EAChB8N,EAASlnB,EAAOiW,EAChBkR,EAAannB,EAAO4c,MAOpBvJ,OAD6B3I,IAAfsZ,EAAI1Q,QAAwB0Q,EAAI1Q,OAAS,EACrB,SAAW,MAEnD,GAAIjF,IAAMmL,EAAO5W,OAAS9B,IAAM0Y,EAAO9S,OAAQ,CAC7C,MAAM0gB,QAAe5W,kBAAkBgJ,EAAQ,CAAE/I,YAAapC,EAAGqC,aAAc5P,IAC/E0Y,EAAO5I,QACP4I,EAAS4N,CACX,CAGA,MAAMC,EAAU5oB,KAAKE,IAAIF,KAAKC,IAAI,EAAc,QAAbyX,EAAE6N,EAAIqD,eAAO,IAAAlR,EAAAA,EAAI,GAAIrF,EAAK,GACvDwW,EAAU7oB,KAAKE,IAAIF,KAAKC,IAAI,EAAc,QAAb6kB,EAAES,EAAIsD,eAAO,IAAA/D,EAAAA,EAAI,GAAIvS,EAAK,GAC7D,GAAgB,IAAZqW,GAA6B,IAAZC,EAAe,CAKlC,MAAMC,OAA2B7c,IAAhBsZ,EAAIgD,QAAyBvoB,KAAKQ,MAAM6nB,EAAUhW,GAAM0I,EAAO5W,MAAQykB,EAClFG,OAAwB9c,IAAbsZ,EAAIrV,KAAsBlQ,KAAKQ,MAAM8nB,EAAU/V,GAAMwI,EAAO9S,OAAS4gB,EAChFG,EAAe1b,EAAAiE,cAAcC,aAAawJ,OAAOxF,SAAUsT,EAASC,GACpEE,EAAYD,EAAatX,WAAW,MAC1C,IAAKuX,EACH,MAAM,IAAI5iB,MAAM,0CAElB4iB,EAAUpQ,UAAUkC,EAAQ6N,EAASC,GAErC,MAAMK,QAAqBnX,kBAAkBiX,GAM7C,GALAA,EAAa7kB,MAAQ6kB,EAAa/gB,OAAS,EAC3C8S,EAAO5I,QACP4I,EAASmO,EACTtZ,EAAImL,EAAO5W,MACX9B,EAAI0Y,EAAO9S,OACP2H,EAAIvN,EAAI4B,KAAKkC,MAAM+K,WACrB,MAAM,IAAI7K,MAAM,kCAEE4F,IAAhBsZ,EAAIgD,UACNF,EAAUroB,KAAKuI,KAAKwS,EAAO5W,MAAQkO,SAEpBpG,IAAbsZ,EAAIrV,OACNoY,EAAUtoB,KAAKuI,KAAKwS,EAAO9S,OAASsK,GAExC,CAEA,GAAIT,IAAe7N,KAAKqK,YAAa,MAAM,IAAIjI,MAAM,yBACrD,MAAMwO,EAAmB,QAAboQ,EAAGM,EAAI1Q,cAAM,IAAAoQ,EAAAA,EAAI,EAO7B,GANAhhB,KAAK+e,cAAcpR,SAAS8U,EAAMzJ,GAAIlC,GAAQ,EAAMnG,EAAOC,GAC3DkG,OAAS9O,EAKkB,IAAvBsZ,EAAI4D,eAAsB,CAE5B,MAAMC,EAAW7nB,EAAO4c,MAAQuK,EAChCnnB,EAAOoZ,EAAI6N,EAEXjnB,EAAOiW,EAAIxX,KAAKC,IAAIwoB,EAASW,EAAU,EACzC,MAGE7nB,EAAOoZ,EAAI3a,KAAKE,IAAIsoB,EAASH,EAASpkB,KAAKoK,cAAc4B,KAE7D,CAAE,MAAOlE,GAEP,MADAgP,SAAAA,EAAQ5I,QACFpG,CACR,CACF,CAGQ,mBAAM4b,CAAcjB,GAC1B,IAAIL,EAAoB,IAAIhlB,iBAAiBqlB,EAAMrd,KAAKggB,eAMxD,GAJqB,MAAjB3C,EAAMM,cACRX,QAAcpiB,KAAKqlB,gBAAgBjD,IAGrB,MAAZK,EAAMK,OAA4B,CACpC,MAAMjW,GAAU,EAAAlD,EAAAoD,WAAUqV,GAG1B,GAAqB,cAAjBvV,EAAQG,QAA0BH,EAAQ3M,MAAQ,MAAQ2M,EAAQ7I,OAAS,IAAM6I,EAAQ3M,MAAQ2M,EAAQ7I,OAAShE,KAAKkC,MAAM+K,WAC/H,MAAM,IAAIyL,WAAW,qDAEvB,MAAM9L,EAAO,IAAIgB,KAAK,CAACwU,GAAoB,CAAEvY,KAAM,cACnD,IAAKkN,OAAOjJ,kBAAmB,CAC7B,MAAMwX,EAAMC,IAAIC,gBAAgB5Y,GAC1BkE,EAAM,IAAI2U,MAChB,OAAO,IAAI7T,QAAqB,CAACC,EAAS6T,KACxC5U,EAAI6U,iBAAiB,OAAQ,WAC3BJ,IAAIK,gBAAgBN,GACpB,MAAMvZ,EAAS1C,EAAAiE,cAAcC,aAAawJ,OAAOxF,SAAUT,EAAI5Q,MAAO4Q,EAAI9M,QACnD,QAAvBoI,EAAAL,EAAO0B,WAAW,aAAK,IAAArB,GAAAA,EAAEwI,UAAU9D,EAAK,EAAG,GAC3ChD,kBAAkB/B,GAAQ1K,KAAKwQ,GAAS1D,MAAMuX,KAEhD5U,EAAI6U,iBAAiB,QAAS,KAC5BJ,IAAIK,gBAAgBN,GACpBI,EAAO,IAAItjB,MAAM,2BAEnB0O,EAAI+U,IAAMP,GAEd,CACA,OAAOxX,kBAAkBlB,EAC3B,CAGA,MAAM1M,EAAQuiB,EAAMviB,MACd8D,EAASye,EAAMze,OAErB,IAAK9D,IAAU8D,EACb,MAAM,IAAI5B,MAAM,gDAGlB,MACM6gB,EAAgB/iB,EAAQ8D,GADI,KAAZye,EAAMK,OAA6B,EAA2C,GAGpG,GAAIV,EAAMrkB,OAASklB,EACjB,MAAM,IAAI7gB,MAAM,2BAGlB,MAAM0jB,EAAa5lB,EAAQ8D,EAE3B,GAAgB,KAAZye,EAAMK,OAER,OAAOhV,kBAAkB,IAAIV,UAAU,IAAIlH,kBAAkBkc,EAAM9kB,OAAuB8kB,EAAM/U,WAAsB,EAAVyY,GAAwD5lB,EAAO8D,IAM7K,MAAMoB,EAAO,IAAIc,kBAA4B,EAAV4f,GAC7BC,EAAQ,IAAI1oB,YAAY+kB,EAAM9kB,OAAQ8kB,EAAM/U,WAAYtR,KAAKoR,MAAMiV,EAAMvd,WAAa,IACtFmhB,EAAQ,IAAI3oB,YAAY+H,EAAK9H,QAC7B2oB,GAA6B,EAAbH,EAEtB,IAAII,EAAY,EACZC,EAAY,EAChB,IAAK,IAAIroB,EAAI,EAAGA,EAAImoB,EAAenoB,GAAK,EAAG,CACzC,MAAMsoB,EAAKL,EAAMG,KACXG,EAAKN,EAAMG,KACXI,EAAKP,EAAMG,KAEjBF,EAAMG,KAAe,WAAaC,EAClCJ,EAAMG,KAAe,WAAcC,IAAO,GAAOC,GAAM,EACvDL,EAAMG,KAAe,WAAcE,IAAO,GAAOC,GAAM,GACvDN,EAAMG,KAAe,WAAcG,IAAO,CAC5C,CAGA,IAAIC,EAAuB,EAAbN,EACVO,EAAuB,EAAbP,EACd,IAAK,IAAInoB,EAAImoB,EAAenoB,EAAIgoB,EAAYhoB,IAC1CsH,EAAKohB,GAAepE,EAAMmE,GAC1BnhB,EAAKohB,EAAU,GAAKpE,EAAMmE,EAAU,GACpCnhB,EAAKohB,EAAU,GAAKpE,EAAMmE,EAAU,GACpCnhB,EAAKohB,EAAU,GAAE,IACjBD,GAAO,EACPC,GAAO,EAGT,OAAO1Y,kBAAkB,IAAIV,UAAUhI,EAAMlF,EAAO8D,GACtD,CAEQ,qBAAMqhB,CAAgBoB,GAC5B,IACE,aAAazmB,KAAK0mB,YAAYD,EAAY,UAC5C,CAAE,MAAOpO,GACP,GAAIA,aAAiBK,WAAY,MAAML,EACvC,aAAarY,KAAK0mB,YAAYD,EAAY,cAC5C,CACF,CAEQ,iBAAMC,CAAYD,EAAwB3D,GAChD,MAAM3R,EAAQpV,KAAKE,IAAI+D,KAAKkC,MAAMwd,eAAwC,EAAxB1f,KAAKkC,MAAM+K,WAA0C,IAA1BjN,KAAKkC,MAAMkW,cACxF,IAAIuO,EAAW,EAEf,MAWMC,EAXS,IAAIC,eAA6B,CAC9C,IAAAC,CAAKC,GACH,GAAIJ,GAAYF,EAAW1oB,OAEzB,YADAgpB,EAAW7Y,QAGb,MAAM5I,EAAMvJ,KAAKE,IAAI0qB,EAAW,KAAMF,EAAW1oB,QACjDgpB,EAAWC,QAAQ,IAAI5pB,WAAWqpB,EAAWhiB,SAASkiB,EAAUrhB,KAChEqhB,EAAWrhB,CACb,IAEoB2hB,YAAY,IAAIC,oBAAoBpE,IAASqE,YAC7DC,EAAuB,GAC7B,IAAIC,EAAc,EAClB,IACE,OAAa,CACX,MAAMC,KAAEA,EAAIxrB,MAAEA,SAAgB8qB,EAAOW,OACrC,GAAID,EAAM,MAEV,GADAD,GAAevrB,EAAM+I,WACjBwiB,EAAclW,EAEhB,YADMyV,EAAOY,SAASrZ,MAAM,QACtB,IAAIuK,WAAW,yCAEvB0O,EAAO1oB,KAAK5C,EACd,CACF,SACE8qB,EAAOa,aACT,CAEA,MAAMloB,EAAS,IAAInC,WAAWiqB,GAC9B,IAAIljB,EAAS,EACb,IAAK,MAAMujB,KAASN,EAClB7nB,EAAO2D,IAAIwkB,EAAOvjB,GAClBA,GAAUujB,EAAM3pB,OAElB,OAAOwB,CACT,CAEA,UAAWooB,GACT,OAAO3nB,KAAK+e,cAAc4I,MAC5B,CAEA,uBAAWC,GACT,OAAO5nB,KAAK+e,cAAc8I,kBAC5B,CAEA,wBAAWC,GACT,OAAO9nB,KAAKwf,qBACd,kFC/tBF,SAAkCpa,GAChC,MAAMkc,EAAqB,GACrByG,EAAQ3iB,EAAK4iB,MAAM,KAEzB,IAAK,MAAMC,KAAQF,EAAO,CACxB,MAAMG,EAAQD,EAAK/gB,QAAQ,KAC3B,IAAe,IAAXghB,EAAc,SAElB,MAAM1S,EAAMyS,EAAKE,UAAU,EAAGD,GACxBpsB,EAAQmsB,EAAKE,UAAUD,EAAQ,GAGrC,GAAO,MAAH1S,EAAyB,CAC3B8L,EAAId,OAAS1kB,EACb,QACF,CACA,GAAO,MAAH0Z,EAA8B,CAChC8L,EAAIyB,YAAcjnB,EAClB,QACF,CACA,GAAO,MAAH0Z,EAA+B,CACjC8L,EAAIgB,aAAexmB,EACnB,QACF,CACA,GAAO,MAAH0Z,EAAkC,CACpC8L,EAAI4B,eAAiBpnB,EACrB,QACF,CACA,MAAMssB,EAAWnZ,SAASnT,EAAO,IACjC,OAAQ0Z,GACN,QAAsB8L,EAAIwB,OAASsF,EAAU,MAC7C,QAAkB9G,EAAItI,GAAKoP,EAAU,MACrC,QAA4B9G,EAAIjB,YAAc+H,EAAU,MACxD,QAAqB9G,EAAIphB,MAAQkoB,EAAU,MAC3C,QAAsB9G,EAAItd,OAASokB,EAAU,MAC7C,QAAwB9G,EAAI5K,EAAI0R,EAAU,MAC1C,QAAwB9G,EAAI/N,EAAI6U,EAAU,MAC1C,QAA4B9G,EAAInN,YAAciU,EAAU,MACxD,QAA6B9G,EAAIlN,aAAegU,EAAU,MAC1D,QAAkC9G,EAAIqD,QAAUyD,EAAU,MAC1D,QAAkC9G,EAAIsD,QAAUwD,EAAU,MAC1D,QAAuB9G,EAAIgD,QAAU8D,EAAU,MAC/C,QAAoB9G,EAAIrV,KAAOmc,EAAU,MACzC,QAAoB9G,EAAIM,KAAOwG,EAAU,MACzC,QAAqB9G,EAAIf,MAAQ6H,EAAU,MAC3C,QAA+B9G,EAAI4D,eAAiBkD,EAAU,MAC9D,QAAuB9G,EAAI1Q,OAASwX,EAAU,MAC9C,QAA4B9G,EAAIsB,YAAcwF,EAElD,CAEA,OAAO9G,CACT,wFCjLA,MAAA+G,EA6BE,WAAAtoB,CACmBoK,GAAAnK,KAAAmK,SAAAA,EA3BXnK,KAAAsoB,aAAe,EACNtoB,KAAA6X,QAAwC,IAAI7F,IAU5ChS,KAAA4nB,oBAA2C,IAAI5V,IAC/ChS,KAAAuoB,oBAA2C,IAAIvW,IAI/ChS,KAAAwoB,2BAA8BC,IAC7C,MAAMC,EAAU1oB,KAAKuoB,oBAAoBlX,IAAIoX,QAC7BzgB,IAAZ0gB,IACF1oB,KAAK4nB,oBAAoBzR,OAAOuS,GAChC1oB,KAAKuoB,oBAAoBpS,OAAOsS,GAChCzoB,KAAK6X,QAAQ1B,OAAOuS,KAGhB1oB,KAAAyQ,cAA+B,CAAEC,WAAW,EAAMC,MAAO,MAAOC,OAAQ,EAAGC,UAAW,OAK5F7Q,KAAK2oB,wBAA0B3oB,KAAKmK,SAAS+O,eAC7ClZ,KAAK4oB,uBAA0BH,UACD,QAA5Brc,EAAApM,KAAK2oB,+BAAuB,IAAAvc,GAAAA,EAAA5E,KAA5BxH,KAA+ByoB,GAC/BzoB,KAAKwoB,2BAA2BC,IAElCzoB,KAAKmK,SAAS+O,eAAiBlZ,KAAK4oB,sBACtC,CAEO,KAAA1d,GACLlL,KAAKsoB,aAAe,EACpBtoB,KAAK6X,QAAQ/O,QACb9I,KAAK4nB,oBAAoB9e,QACzB9I,KAAKuoB,oBAAoBzf,OAC3B,CAEO,OAAAnB,GACL3H,KAAKkL,QACDlL,KAAKmK,SAAS+O,iBAAmBlZ,KAAK4oB,yBACxC5oB,KAAKmK,SAAS+O,eAAiBlZ,KAAK2oB,wBAExC,CAEO,UAAA9F,CAAW7J,EAAwB6P,GACxC,MAAMpR,EAAUuB,QAAAA,EAAMhZ,KAAKsoB,eAErBQ,EAAe9oB,KAAK4nB,oBAAoBvW,IAAIoG,QAC7BzP,IAAjB8gB,IACF9oB,KAAKmK,SAASoP,YAAYuP,GAC1B9oB,KAAK4nB,oBAAoBzR,OAAOsB,GAChCzX,KAAKuoB,oBAAoBpS,OAAO2S,KAG7B9oB,KAAK6X,QAAQlC,IAAI8B,IAAYzX,KAAK6X,QAAQ9N,MAAQse,EAAkBU,kBACvE/oB,KAAKgpB,0BASP,MAAMC,EAAuC,IAA3BjpB,KAAKmK,SAASoO,WAChCvY,KAAK6X,QAAQ1B,OAAOsB,GACpB,IAAIyR,EAAgB,EACpB,IAAK,MAAMzG,KAASziB,KAAK6X,QAAQ9C,SAAUmU,GAAiBzG,EAAMrd,KAAK2E,KACvE,IAAK,MAAMof,IAAe,EAAC,GAAO,GAChC,IAAK,MAAOC,EAAU3G,KAAUziB,KAAK6X,QAAS,CAC5C,GAAIqR,EAAgBL,EAAUzjB,KAAK2E,MAAQkf,EAAW,MAClDjpB,KAAK4nB,oBAAoBjS,IAAIyT,KAAcD,IAC/CD,GAAiBzG,EAAMrd,KAAK2E,KAC5B/J,KAAKojB,WAAWgG,GAClB,CAOF,OAJAppB,KAAK6X,QAAQ3U,IAAIuU,EAAOjb,OAAA2F,OAAA3F,OAAA2F,OAAA,GACnB0mB,GAAS,CACZ7P,GAAIvB,KAECA,CACT,CAEO,QAAA9J,CAAS+a,EAAiBjG,EAAwC/R,EAAoBC,EAAmBC,GAK9G,MAAMkY,EAAe9oB,KAAK4nB,oBAAoBvW,IAAIqX,QAC7B1gB,IAAjB8gB,GACF9oB,KAAKuoB,oBAAoBpS,OAAO2S,GAElC9oB,KAAKyQ,cAAcC,UAAYA,EAC/B1Q,KAAKyQ,cAAcE,MAAQA,EAC3B3Q,KAAKyQ,cAAcG,OAASA,EAC5B,MAAM6X,EAAYzoB,KAAKmK,SAASwD,SAAS8U,EAAOziB,KAAKyQ,eACrDzQ,KAAK4nB,oBAAoB1kB,IAAIwlB,EAASD,GACtCzoB,KAAKuoB,oBAAoBrlB,IAAIulB,EAAWC,EAC1C,CAEO,QAAAhG,CAASgG,GACd,OAAO1oB,KAAK6X,QAAQxG,IAAIqX,EAC1B,CAEO,UAAAtF,CAAWsF,GAChB1oB,KAAK6X,QAAQ1B,OAAOuS,GACpB,MAAMD,EAAYzoB,KAAK4nB,oBAAoBvW,IAAIqX,QAC7B1gB,IAAdygB,IACFzoB,KAAKmK,SAASoP,YAAYkP,GAC1BzoB,KAAK4nB,oBAAoBzR,OAAOuS,GAChC1oB,KAAKuoB,oBAAoBpS,OAAOsS,GAEpC,CAEO,SAAAtF,GACLnjB,KAAK6X,QAAQ/O,QACb,IAAK,MAAM2f,KAAazoB,KAAK4nB,oBAAoB7S,SAC/C/U,KAAKmK,SAASoP,YAAYkP,GAE5BzoB,KAAK4nB,oBAAoB9e,QACzB9I,KAAKuoB,oBAAoBzf,OAC3B,CAEA,UAAW6e,GACT,OAAO3nB,KAAK6X,OACd,CAEA,sBAAWgQ,GACT,OAAO7nB,KAAK4nB,mBACd,CAEA,eAAW5E,GACT,OAAOhjB,KAAKsoB,aAAe,CAC7B,CAEQ,uBAAAU,GACN,IAAK,MAAON,KAAY1oB,KAAK6X,QAAS,CACpC,GAAI7X,KAAK6X,QAAQ9N,MAAQse,EAAkBU,iBAAmB,EAC5D,MAEG/oB,KAAK4nB,oBAAoBjS,IAAI+S,IAChC1oB,KAAK6X,QAAQ1B,OAAOuS,EAExB,CACF,wBA1JwBL,EAAAU,iBAAmB,gBCjB7CvsB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAK/C,MAIAutB,GAAA,EAJyBrqB,EAAQ,KAIjCsqB,QAAA,CAAgGhrB,EAAA,EAAAuf,EAAA,EAAA1f,EAAA,6lCAuJhGorB,EAAA,IAAAnsB,WAAA,mEACA4qB,MAAA,IACAjgB,IAAAyhB,GAAAA,EAAAhqB,WAAA,KAEAiqB,EAAA,IAAApsB,YAAA,MACAosB,EAAA9jB,KAAA,YACA,QAAA7H,EAAA,EAAgBA,EAAAyrB,EAAAxrB,SAAgBD,EAChC2rB,EAAAF,EAAAzrB,IAAAA,GAAA,EACA,QAAAA,EAAA,EAAgBA,EAAAyrB,EAAAxrB,SAAgBD,EAChC2rB,EAAA,IAAAF,EAAAzrB,IAAAA,GAAA,GAAAA,GAAA,UACA,QAAAA,EAAA,EAAgBA,EAAAyrB,EAAAxrB,SAAgBD,EAChC2rB,EAAA,IAAAF,EAAAzrB,IAAAA,GAAA,MAAAA,GAAA,WACA,QAAAA,EAAA,EAAgBA,EAAAyrB,EAAAxrB,SAAgBD,EAChC2rB,EAAA,IAAAF,EAAAzrB,IAAAA,GAAA,GACA,MAAA4rB,EAAA,IAAAtsB,WAAA,GAkKAvC,EAAA,QAvJA,MAMA,WAAAkF,CAAA4pB,EAAAC,EAAA9e,GAOA,GANA9K,KAAA6pB,MAAA,KACA7pB,KAAA8pB,QAAA,EACA9pB,KAAA+pB,OAAA,EACA/pB,KAAA2pB,SAAAA,QAAAA,EAAA,QACA3pB,KAAA4pB,SAAAA,QAAAA,EAAA,WACA5pB,KAAA+pB,OAAAjf,QAAAA,EAAA,MACA9K,KAAA+pB,OAAA/pB,KAAA4pB,UAAA5pB,KAAA4pB,SAAA,WACA,UAAAxnB,MAAA,wBAEA,CAKA,SAAA6D,GACA,OAAAjG,KAAA6pB,MAAA7pB,KAAAuO,GAAA9J,SAAA,EAAAzE,KAAAgqB,KAAA,OAAAN,CACA,CAMA,OAAAzlB,GACAjE,KAAA6pB,QAEA7pB,KAAA+pB,OAAA/pB,KAAA2pB,SACA3pB,KAAA6pB,MAAA7pB,KAAAgqB,KAAAhqB,KAAAuO,GAAAvO,KAAAiqB,KAAA,MAGAjqB,KAAAgqB,KAAA,QACAhqB,KAAAgqB,KAAA,QACAhqB,KAAAgqB,KAAA,SAEA,CASA,IAAA3mB,CAAAumB,EAAA9e,GAGA,GAFA9K,KAAA4pB,SAAAA,QAAAA,EAAA5pB,KAAA4pB,SACA5pB,KAAA+pB,OAAAjf,QAAAA,EAAA/O,KAAAE,IAAA+D,KAAA+pB,OAAA/pB,KAAA4pB,UACA5pB,KAAA+pB,OAAA/pB,KAAA4pB,UAAA5pB,KAAA4pB,SAAA,WACA,MAAAxnB,MAAA,yBAEA,IAAA8nB,EAAAlqB,KAAAgqB,KACA,MAAA5H,EAAApiB,KAAA+pB,OAAA,KACA/pB,KAAA6pB,MAOA7pB,KAAAiqB,KAAA3sB,OAAAuH,WAAAud,IACApiB,KAAAiqB,KAAAE,KAAApuB,KAAAuI,MAAA8d,EAAApiB,KAAAiqB,KAAA3sB,OAAAuH,YAAA,QACAqlB,EAAA,IAAA7sB,YAAA2C,KAAAiqB,KAAA3sB,OAAA,GACA0C,KAAAuO,GAAA,IAAAnR,WAAA4C,KAAAiqB,KAAA3sB,OAAA,QATA0C,KAAAiqB,KAAA,IAAA9oB,YAAAipB,OAAA,CAAiD7hB,QAAAxM,KAAAuI,KAAA8d,EAAA,SACjDpiB,KAAA6pB,MAAAR,EAAA,CAAsCpoB,IAAA,CAAO0B,OAAA3C,KAAAiqB,QAC7CC,EAAA,IAAA7sB,YAAA2C,KAAAiqB,KAAA3sB,OAAA,GACA4sB,EAAAhnB,IAAAumB,EAAA,KACAzpB,KAAAuO,GAAA,IAAAnR,WAAA4C,KAAAiqB,KAAA3sB,OAAA,OAOA4sB,EAAA,QACAA,EAAA,QACAA,EAAA,QACAlqB,KAAAgqB,KAAAE,EACAlqB,KAAA8pB,QAAA,CACA,CAOA,QAAA5lB,CAAAmmB,GACA,MAAAC,EAAAtqB,KAAAgqB,KAAA,MAAAK,EACA,GAAArqB,KAAA+pB,OAAAO,EAAA,CACA,GAAAA,EAAAtqB,KAAA4pB,SACA,SAEA,IAAAW,EAAAvqB,KAAA+pB,OACA,MAAAQ,GAAA,GAAAD,IAEA,GADAC,EAAAxuB,KAAAE,IAAAsuB,EAAAvqB,KAAA4pB,UACAW,EAAAD,EACA,SAEA,GAAAC,EAAA,KAAAvqB,KAAAiqB,KAAA3sB,OAAAuH,WAAA,CACA,MAAA2lB,EAAAzuB,KAAAuI,MAAAimB,EAAA,KAAAvqB,KAAAiqB,KAAA3sB,OAAAuH,YAAA,OACA7E,KAAAiqB,KAAAE,KAAAK,GACAxqB,KAAAgqB,KAAA,IAAA3sB,YAAA2C,KAAAiqB,KAAA3sB,OAAA,GACA0C,KAAAuO,GAAA,IAAAnR,WAAA4C,KAAAiqB,KAAA3sB,OAAA,KACA,CACA0C,KAAA+pB,OAAAQ,CACA,CACA,QACA,CAOA,GAAApf,CAAA/F,GACA,IAAApF,KAAA6pB,OAAA7pB,KAAA8pB,OACA,SAEA,GAAA9pB,KAAAkE,SAAAkB,EAAArH,QACA,SAEA,MAAAmsB,EAAAlqB,KAAAgqB,KAIA,OAHAhqB,KAAAuO,GAAArL,IAAAkC,EAAA8kB,EAAA,OACAA,EAAA,OAAA9kB,EAAArH,OAEAmsB,EAAA,MAAAA,EAAA,cACAlqB,KAAA6pB,MAAAhvB,QAAAsL,MACA,CACA,CAKA,GAAAb,GAEA,OADAtF,KAAA8pB,QAAA,EACA9pB,KAAA6pB,MACA7pB,KAAA6pB,MAAAhvB,QAAAyK,OACA,CACA,CAIA,eAAAmlB,GACA,OAAAzqB,KAAA6pB,MACA7pB,KAAAgqB,KAAA,MACA,CACA,CAIA,aAAAU,GACA,OAAA1qB,KAAA6pB,MACA7pB,KAAA4pB,SAAA5pB,KAAAgqB,KAAA,MACA,CACA,cC9UAxtB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAK/C,MACA6uB,GAAA,EADyB3rB,EAAQ,KACjCsqB,QAAA,CAAuGhrB,EAAA,EAAAuf,EAAA,EAAA1f,EAAA,i5BA8DvGtD,EAAA,QA7DA,MACA,WAAAkF,CAAA4pB,GACA3pB,KAAA2pB,SAAAA,EACA3pB,KAAAE,MAAA,EACAF,KAAAgE,OAAA,CACA,CACA,MAAApF,CAAAT,GACA6B,KAAAE,MAAA/B,EAAA,OAAAA,EAAA,OAAAA,EAAA,MAAAA,EAAA,GACA6B,KAAAgE,OAAA7F,EAAA,OAAAA,EAAA,OAAAA,EAAA,OAAAA,EAAA,IACA,MAAA4F,EAAA/D,KAAAE,MAAAF,KAAAgE,OACA4mB,EAAA,EAAA7mB,EACA8mB,EAAA1sB,EAAAJ,OAwBAqkB,EAAArmB,KAAAC,IAAA4uB,EAAAC,IAAA9uB,KAAAE,IAAA2uB,EAAAC,IAAA,QACA7qB,KAAA6pB,MAIA7pB,KAAAiqB,KAAA3sB,OAAAuH,WAAAud,IACApiB,KAAAiqB,KAAAE,KAAApuB,KAAAuI,MAAA8d,EAAApiB,KAAAiqB,KAAA3sB,OAAAuH,YAAA,QACA7E,KAAAuO,GAAA,OALAvO,KAAAiqB,KAAA,IAAA9oB,YAAAipB,OAAA,CAAiD7hB,QAAAxM,KAAAuI,KAAA8d,EAAA,SACjDpiB,KAAA6pB,MAAAc,EAAA,CAAyC1pB,IAAA,CAAO0B,OAAA3C,KAAAiqB,SAMhDjqB,KAAAuO,KACAvO,KAAAuO,GAAA,IAAAnR,WAAA4C,KAAAiqB,KAAA3sB,SAGA,MAAAwtB,EAAA9qB,KAAAiqB,KAAA3sB,OAAAuH,WAAAgmB,GAAA,IAGA,OAFA7qB,KAAAuO,GAAArL,IAAA/E,EAAA2sB,GACA9qB,KAAA6pB,MAAAhvB,QAAAsL,IAAA2kB,EAAAD,EAAA9mB,GACA/D,KAAAuO,GAAA9J,SAAA,UAAAmmB,EACA,CACA,OAAA3mB,GACAjE,KAAA6pB,OAEA7pB,KAAAiqB,KAAA3sB,OAAAuH,WAAA7E,KAAA2pB,WACA3pB,KAAA6pB,MAAA7pB,KAAAuO,GAAAvO,KAAAiqB,KAAA,KAEA,aC9DAztB,OAAAC,eAAA5B,EAAA,cAA+CiB,OAAA,IAC/CjB,EAAAyuB,OAYA,SAAAyB,GACA,GAAAA,EAAA5sB,EAAA,CACA,MAAA0f,EAAgBvf,EAAAA,EAAAH,EAAAA,GAAU4sB,EAC1B,IAAAtvB,EACAyuB,EACA,MAAAc,EAAA7pB,YACA,WAAA0c,EACAvf,EACAwJ,GAAA,IAAAkjB,EAAAxoB,SAAA0nB,IAAAA,EAAA,IAAAc,EAAAzoB,OAAA9G,IAAAA,EAAAwvB,EAAA9sB,MAAA2J,GACAA,GAAAoiB,EACAc,EAAA5pB,YAAA8oB,EAAApiB,GACAkjB,EAAA5pB,YAAA3F,IAAAA,EAAAwvB,EAAA9sB,IAAA2J,GAAAzG,KAAA9F,IAAA2uB,EAAA3uB,EAAAT,SAAAS,EAAAgG,UAEA,IAAAsc,EACAvf,EACA,IAAA4rB,IAAAA,EAAA,IAAAc,EAAAzoB,OAAA9G,IAAAA,EAAAwvB,EAAA9sB,MACA,IAAA+rB,EACAtY,QAAAC,QAAAqY,GACAc,EAAAE,QAAAzvB,IAAAA,EAAAwvB,EAAA9sB,KAAAkD,KAAA9F,GAAA2uB,EAAA3uB,GAEA+C,EACA,IAAA7C,IAAAA,EAAAwvB,EAAA9sB,IACA,IAAAyT,QAAAC,QAAApW,IAAAA,EAAAwvB,EAAA9sB,IACA,CACA,uBAAAgtB,SACA,UAAA/oB,MAAA,qBACA+oB,SAAA7jB,IAAAyjB,EACA,EAtCA,IAAAE,EAAA3sB,IACA,GAAAlB,WAAAguB,WACA,OAAAhuB,WAAAguB,WAAA9sB,GACA,uBAAAa,OACA,OAAAA,OAAAC,KAAAd,EAAA,UACA,MAAA7C,EAAA6D,KAAAhB,GACA/C,EAAA,IAAA6B,WAAA3B,EAAAsC,QACA,QAAAD,EAAA,EAAoBA,EAAAvC,EAAAwC,SAAcD,EAClCvC,EAAAuC,GAAArC,EAAA+D,WAAA1B,GACA,OAAAvC,KCfA8vB,EAAA,GAGA,SAAArsB,EAAAssB,GAEA,IAAAC,EAAAF,EAAAC,GACA,QAAAtjB,IAAAujB,EACA,OAAAA,EAAA1wB,QAGA,IAAAC,EAAAuwB,EAAAC,GAAA,CAGAzwB,QAAA,IAOA,OAHA2wB,EAAAF,GAAA9jB,KAAA1M,EAAAD,QAAAC,EAAAA,EAAAD,QAAAmE,GAGAlE,EAAAD,OACA,mGCfA,MAAA4wB,EAAAzsB,EAAA,KACA0sB,EAAA1sB,EAAA,KACAqK,EAAArK,EAAA,KACAsK,EAAAtK,EAAA,KACA2sB,EAAA3sB,EAAA,IACA4sB,EAAA5sB,EAAA,KACA6sB,EAAA7sB,EAAA,KACA8sB,EAAA9sB,EAAA,KACA+sB,EAAA/sB,EAAA,KA6CMuB,EAAsC,CAC1CyrB,mBAAmB,EACnB/e,WAAY,SACZgf,cAAc,EACdpN,gBAAgB,EAChBL,kBAAmB,KACnBC,eAAgB,SAChBrG,aAAc,IACdjF,iBAAiB,EACjB+Y,YAAY,EACZrhB,aAAc,SACdshB,cAAc,EACdzM,eAAgB,uBA0BlB,MAWE,WAAA3f,CAAYe,GANJd,KAAAyI,aAA8B,GAE9BzI,KAAAosB,UAAwC,IAAIpa,IACnChS,KAAAqsB,cAAgB,IAAIZ,EAAAa,QACrBtsB,KAAA0a,aAA6B1a,KAAKqsB,cAAc5lB,MAG9DzG,KAAKkC,MAAQ1F,OAAO2F,OAAO,GAAI5B,EAAiBO,GAChDd,KAAKusB,aAAe/vB,OAAO2F,OAAO,GAAI5B,EAAiBO,EACzD,CAEO,OAAA6G,GACL,IAAK,MAAMW,KAAWtI,KAAKosB,UAAUrX,SAAUzM,EAAQ4C,QACvD,IAAK,MAAMshB,KAAOxsB,KAAKyI,aACrB+jB,EAAI7kB,UAEN3H,KAAKyI,aAAa1K,OAAS,EAC3BiC,KAAKosB,UAAUtjB,QACf9I,KAAKqsB,cAAc1kB,SACrB,CAEQ,aAAA8kB,IAAiBC,GACvB,IAAK,MAAMF,KAAOE,EAChB1sB,KAAKyI,aAAa/J,KAAK8tB,EAE3B,CAEO,QAAAG,CAASC,SASd,GARA5sB,KAAK8R,UAAY8a,EAGjB5sB,KAAKkK,UAAY,IAAIb,EAAAiE,cAAcsf,GACnC5sB,KAAKmK,SAAW,IAAIb,EAAAujB,aAAaD,EAAU5sB,KAAKkK,UAAWlK,KAAKkC,OAChElC,KAAKmK,SAASuQ,aAAe,IAAM1a,KAAKqsB,cAAc9kB,OAGlDvH,KAAKkC,MAAM8pB,kBAAmB,CAChC,MAAMc,EAA0C,QAAjC1gB,EAAGwgB,EAASG,QAAQC,qBAAa,IAAA5gB,EAAAA,EAAI,GACpD0gB,EAAUG,kBAAmB,EAC7BH,EAAUI,mBAAoB,EAC9BJ,EAAUK,iBAAkB,EAC5BP,EAASG,QAAQC,cAAgBF,CACnC,CAiCA,GA/BA9sB,KAAKysB,cACHzsB,KAAKkK,UACLlK,KAAKmK,SAGLyiB,EAASQ,OAAOC,mBAAmB,CAAEC,OAAQ,IAAKznB,MAAO,KAAOqX,GAAUld,KAAKutB,QAAQrQ,IACvF0P,EAASQ,OAAOC,mBAAmB,CAAEC,OAAQ,IAAKznB,MAAO,KAAOqX,GAAUld,KAAKwtB,QAAQtQ,IACvF0P,EAASQ,OAAOC,mBAAmB,CAAExnB,MAAO,KAAOqX,GAAUld,KAAKytB,KAAKvQ,IACvE0P,EAASQ,OAAOC,mBAAmB,CAAEC,OAAQ,IAAKznB,MAAO,KAAOqX,GAAUld,KAAK0tB,yBAAyBxQ,IAGxG0P,EAASe,SAAS/S,IAAQ,IAAAxO,EAAA,OAAc,QAAbA,EAAApM,KAAKmK,gBAAQ,IAAAiC,OAAA,EAAAA,EAAEuO,OAAOC,KAQjDgS,EAASQ,OAAOC,mBAAmB,CAAEO,cAAe,IAAK/nB,MAAO,KAAO,IAAM7F,KAAKkL,SAClF0hB,EAASQ,OAAOS,mBAAmB,CAAEhoB,MAAO,KAAO,IAAM7F,KAAKkL,SAC9D0hB,EAASvgB,MAAMwN,cAAciU,eAAe,IAAM9tB,KAAKkL,SAGvD0hB,EAAStvB,OAAOywB,eAAe,KAAK,IAAA3hB,EAAA,OAAc,QAAbA,EAAApM,KAAKmK,gBAAQ,IAAAiC,OAAA,EAAAA,EAAE+M,kBAGpDyT,EAASoB,SAASnhB,IAAU,IAAAT,EAAA,OAAc,QAAbA,EAAApM,KAAKmK,gBAAQ,IAAAiC,OAAA,EAAAA,EAAEmP,eAAe1O,MAIzD7M,KAAKkC,MAAM+pB,aAAc,CAC3B,MAAMgC,EAAe,IAAInC,EAAAoC,kBAAkBluB,KAAKmK,SAAWnK,KAAKkC,MAAOlC,KAAKkK,UAAY0iB,GAClFuB,EAAe,IAAItC,EAAAuC,aAAapuB,KAAKkC,MAAO+rB,EAAcrB,GAChE5sB,KAAKosB,UAAUlpB,IAAI,QAASirB,GAC5BnuB,KAAKysB,cACHG,EAASvgB,MAAMwN,cAAcwU,QAAQC,mBAAmB,CAAEzoB,MAAO,KAAOsoB,GAE5E,CAGA,GAAInuB,KAAKkC,MAAMgqB,WAAY,CACzB,MAAMqC,EAAa,IAAIxC,EAAAyC,gBAAgBxuB,KAAKmK,UACtCskB,EAAa,IAAI/C,EAAAgD,WAAW1uB,KAAKkC,MAAOlC,KAAKkK,UAAYqkB,EAAY3B,GAC3E5sB,KAAKosB,UAAUlpB,IAAI,MAAOurB,GAC1BzuB,KAAKysB,cACHG,EAASvgB,MAAMwN,cAAcwU,QAAQM,mBAAmB,KAAMF,GAElE,CAGA,GAAIzuB,KAAKkC,MAAMiqB,aAAc,CAC3B,MAAMyC,EAAe,IAAIhD,EAAAvD,kBAAkBroB,KAAKmK,UAC1C0kB,EAAe,IAAIlD,EAAAmD,qBAAqB9uB,KAAKkC,MAAOlC,KAAKkK,UAAY0kB,EAAchC,GACzF5sB,KAAKosB,UAAUlpB,IAAI,QAAS2rB,GAC5B7uB,KAAKysB,cACHmC,EACAC,EACAjC,EAASvgB,MAAMwN,cAAcwU,QAAQU,mBAAmB,CAAElpB,MAAO,KAAOgpB,GAE5E,CACF,CAGO,KAAA3jB,SAELlL,KAAKkC,MAAM2c,eAAiB7e,KAAKusB,aAAa1N,eAC9C7e,KAAKkC,MAAMsc,kBAAoBxe,KAAKusB,aAAa/N,kBAEpC,QAAbpS,EAAApM,KAAKmK,gBAAQ,IAAAiC,GAAAA,EAAElB,QAEf,IAAK,MAAM5C,KAAWtI,KAAKosB,UAAUrX,SACnCzM,EAAQ4C,QAEV,OAAO,CACT,CAEA,gBAAWkN,SACT,OAAoB,QAAbhM,EAAApM,KAAKmK,gBAAQ,IAAAiC,OAAA,EAAAA,EAAEmM,cAAe,CACvC,CAEA,gBAAWH,CAAajH,SACT,QAAb/E,EAAApM,KAAKmK,gBAAQ,IAAAiC,GAAAA,EAAE+L,SAAShH,GACxBnR,KAAKkC,MAAMkW,aAAejH,CAC5B,CAEA,gBAAW6d,GACT,OAAIhvB,KAAKmK,SACAnK,KAAKmK,SAASyO,YAEf,CACV,CAEA,mBAAWzF,GACT,OAAOnT,KAAKkC,MAAMiR,eACpB,CAEA,mBAAWA,CAAgBrX,SACzBkE,KAAKkC,MAAMiR,gBAAkBrX,EACf,QAAdsQ,EAAApM,KAAKkK,iBAAS,IAAAkC,GAAAA,EAAE+G,gBAAgBrX,EAClC,CAEO,oBAAAigB,CAAqBrF,EAAWnD,SACrC,OAAoB,QAAbnH,EAAApM,KAAKmK,gBAAQ,IAAAiC,OAAA,EAAAA,EAAE2P,qBAAqBrF,EAAGnD,EAChD,CAEO,uBAAAyI,CAAwBtF,EAAWnD,SACxC,OAAoB,QAAbnH,EAAApM,KAAKmK,gBAAQ,IAAAiC,OAAA,EAAAA,EAAE4P,wBAAwBtF,EAAGnD,EACnD,CAEQ,OAAA0b,CAAQ3wB,SACA,QAAd8N,EAAApM,KAAK8R,iBAAS,IAAA1F,GAAAA,EAAEC,MAAMK,MAAMpO,GAAG,EACjC,CAEQ,OAAAivB,CAAQrQ,GACd,IAAK,IAAIpf,EAAI,EAAGA,EAAIof,EAAOnf,SAAUD,EAE5B,KADCof,EAAOpf,KAEXkC,KAAKkC,MAAM2c,gBAAiB,GAIlC,OAAO,CACT,CAEQ,OAAA2O,CAAQtQ,GACd,IAAK,IAAIpf,EAAI,EAAGA,EAAIof,EAAOnf,SAAUD,EAE5B,KADCof,EAAOpf,KAEXkC,KAAKkC,MAAM2c,gBAAiB,GAIlC,OAAO,CACT,CAGQ,IAAA4O,CAAKvQ,GACX,QAAIA,EAAO,MAQPld,KAAKkC,MAAM+pB,eACbjsB,KAAKivB,QAAQ,kBACN,EAGX,CAYQ,wBAAAvB,CAAyBxQ,mBAC/B,GAAIA,EAAOnf,OAAS,EAClB,OAAO,EAET,GAAa,IAATmf,EAAO,GACT,OAAQA,EAAO,IACb,OAEE,OADAld,KAAKivB,QAAQ,MAAS/R,EAAO,QAA0Bld,KAAKkC,MAAMsc,uBAC3D,EACT,OACExe,KAAKkC,MAAMsc,kBAAoBxe,KAAKusB,aAAa/N,kBACjDxe,KAAKivB,QAAQ,MAAS/R,EAAO,QAA0Bld,KAAKkC,MAAMsc,sBAElE,IAAK,MAAMlW,KAAWtI,KAAKosB,UAAUrX,SACnCzM,EAAQ4C,QAEV,OAAO,EACT,OAOE,OANIgS,EAAOnf,OAAS,KAAOmf,EAAO,aAAc9V,QAAU8V,EAAO,IA5P5C,MA6PnBld,KAAKkC,MAAMsc,kBAAoBtB,EAAO,GACtCld,KAAKivB,QAAQ,MAAS/R,EAAO,QAA0Bld,KAAKkC,MAAMsc,uBAElExe,KAAKivB,QAAQ,MAAS/R,EAAO,UAExB,EACT,OAEE,OADAld,KAAKivB,QAAQ,MAAS/R,EAAO,eACtB,EACT,QAEE,OADAld,KAAKivB,QAAQ,MAAS/R,EAAO,UACtB,EAGb,GAAa,IAATA,EAAO,GACT,OAAQA,EAAO,IAEb,OACE,IAAIhd,EAAkC,QAA1BsN,EAAc,QAAdpB,EAAApM,KAAKkK,iBAAS,IAAAkC,OAAA,EAAAA,EAAEP,kBAAU,IAAA2B,OAAA,EAAAA,EAAE1B,IAAIC,OAAO7L,MAC/C8D,EAAmC,QAA1BuK,EAAc,QAAdpC,EAAAnM,KAAKkK,iBAAS,IAAAiC,OAAA,EAAAA,EAAEN,kBAAU,IAAA0C,OAAA,EAAAA,EAAEzC,IAAIC,OAAO/H,OACpD,IAAK9D,IAAU8D,EAAQ,CAGrB,MAAMoP,EAAW9J,EAAAsC,kBACjB1L,IAAuB,QAAduT,EAAAzT,KAAK8R,iBAAS,IAAA2B,OAAA,EAAAA,EAAEzH,OAAQ,IAAMoH,EAASlT,MAChD8D,IAAwB,QAAd6c,EAAA7gB,KAAK8R,iBAAS,IAAA+O,OAAA,EAAAA,EAAE5U,OAAQ,IAAMmH,EAASpP,MACnD,CACA,GAAI9D,EAAQ8D,EAAShE,KAAKkC,MAAM+K,WAC9BjN,KAAKivB,QAAQ,MAAS/R,EAAO,QAA0Bhd,EAAMuM,QAAQ,MAAMzI,EAAOyI,QAAQ,WACrF,CAEL,MAAMiK,EAAI3a,KAAKoR,MAAMpR,KAAKmzB,KAAKlvB,KAAKkC,MAAM+K,aAC1CjN,KAAKivB,QAAQ,MAAS/R,EAAO,QAA0BxG,KAAKA,KAC9D,CACA,OAAO,EACT,OAEE,MAAMA,EAAI3a,KAAKoR,MAAMpR,KAAKmzB,KAAKlvB,KAAKkC,MAAM+K,aAE1C,OADAjN,KAAKivB,QAAQ,MAAS/R,EAAO,QAA0BxG,KAAKA,OACrD,EACT,QAEE,OADA1W,KAAKivB,QAAQ,MAAS/R,EAAO,UACtB,EAKb,OADAld,KAAKivB,QAAQ,MAAS/R,EAAO,UACtB,CACT","sources":["webpack://ImageAddon/webpack/universalModuleDefinition","webpack://ImageAddon/../node_modules/sixel/lib/Colors.js","webpack://ImageAddon/../node_modules/sixel/lib/Decoder.js","webpack://ImageAddon/../node_modules/sixel/lib/wasm.js","webpack://ImageAddon/../src/common/Event.ts","webpack://ImageAddon/../src/common/Lifecycle.ts","webpack://ImageAddon/./src/IIPHandler.ts","webpack://ImageAddon/./src/IIPHeaderParser.ts","webpack://ImageAddon/./src/IIPImageStorage.ts","webpack://ImageAddon/./src/IIPMetrics.ts","webpack://ImageAddon/./src/ImageRenderer.ts","webpack://ImageAddon/./src/ImageStorage.ts","webpack://ImageAddon/./src/SixelHandler.ts","webpack://ImageAddon/./src/SixelImageStorage.ts","webpack://ImageAddon/./src/kitty/KittyGraphicsHandler.ts","webpack://ImageAddon/./src/kitty/KittyGraphicsTypes.ts","webpack://ImageAddon/./src/kitty/KittyImageStorage.ts","webpack://ImageAddon/../node_modules/xterm-wasm-parts/lib/base64/Base64Decoder.wasm.js","webpack://ImageAddon/../node_modules/xterm-wasm-parts/lib/qoi/QoiDecoder.wasm.js","webpack://ImageAddon/javascript/node_modules/inwasm-runtime/lib/index.cjs","webpack://ImageAddon/webpack/bootstrap","webpack://ImageAddon/./src/ImageAddon.ts"],"sourcesContent":["(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine([], factory);\n\telse if(typeof exports === 'object')\n\t\texports[\"ImageAddon\"] = factory();\n\telse\n\t\troot[\"ImageAddon\"] = factory();\n})(globalThis, () => {\nreturn ","\"use strict\";\n/**\n * Copyright (c) 2019 Joerg Breitbart.\n * @license MIT\n */\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.DEFAULT_FOREGROUND = exports.DEFAULT_BACKGROUND = exports.PALETTE_ANSI_256 = exports.PALETTE_VT340_GREY = exports.PALETTE_VT340_COLOR = exports.normalizeHLS = exports.normalizeRGB = exports.nearestColorIndex = exports.fromRGBA8888 = exports.toRGBA8888 = exports.alpha = exports.blue = exports.green = exports.red = exports.BIG_ENDIAN = void 0;\n// FIXME: cleanup this mess, move things either to decoder/encoder, keep only shared things\n// system endianess\nexports.BIG_ENDIAN = new Uint8Array(new Uint32Array([0xFF000000]).buffer)[0] === 0xFF;\nif (exports.BIG_ENDIAN) {\n    console.warn('BE platform detected. This version of node-sixel works only on LE properly.');\n}\n// channel values\nfunction red(n) {\n    return n & 0xFF;\n}\nexports.red = red;\nfunction green(n) {\n    return (n >>> 8) & 0xFF;\n}\nexports.green = green;\nfunction blue(n) {\n    return (n >>> 16) & 0xFF;\n}\nexports.blue = blue;\nfunction alpha(n) {\n    return (n >>> 24) & 0xFF;\n}\nexports.alpha = alpha;\n/**\n * Convert RGB channels to native color RGBA8888.\n */\nfunction toRGBA8888(r, g, b, a = 255) {\n    return ((a & 0xFF) << 24 | (b & 0xFF) << 16 | (g & 0xFF) << 8 | (r & 0xFF)) >>> 0; // ABGR32\n}\nexports.toRGBA8888 = toRGBA8888;\n/**\n * Convert native color to [r, g, b, a].\n */\nfunction fromRGBA8888(color) {\n    return [color & 0xFF, (color >> 8) & 0xFF, (color >> 16) & 0xFF, color >>> 24];\n}\nexports.fromRGBA8888 = fromRGBA8888;\n/**\n * Get index of nearest color in `palette` for `color`.\n * Uses euclidean distance without any luminescence correction.\n */\nfunction nearestColorIndex(color, palette) {\n    const r = red(color);\n    const g = green(color);\n    const b = blue(color);\n    let min = Number.MAX_SAFE_INTEGER;\n    let idx = -1;\n    // use euclidean distance (manhattan gives very poor results)\n    for (let i = 0; i < palette.length; ++i) {\n        const dr = r - palette[i][0];\n        const dg = g - palette[i][1];\n        const db = b - palette[i][2];\n        const d = dr * dr + dg * dg + db * db;\n        if (!d)\n            return i;\n        if (d < min) {\n            min = d;\n            idx = i;\n        }\n    }\n    return idx;\n}\nexports.nearestColorIndex = nearestColorIndex;\n// color conversions\n// HLS taken from: http://www.niwa.nu/2013/05/math-behind-colorspace-conversions-rgb-hsl\nfunction clamp(low, high, value) {\n    return Math.max(low, Math.min(value, high));\n}\nfunction h2c(t1, t2, c) {\n    if (c < 0)\n        c += 1;\n    if (c > 1)\n        c -= 1;\n    return c * 6 < 1\n        ? t2 + (t1 - t2) * 6 * c\n        : c * 2 < 1\n            ? t1\n            : c * 3 < 2\n                ? t2 + (t1 - t2) * (4 - c * 6)\n                : t2;\n}\nfunction HLStoRGB(h, l, s) {\n    if (!s) {\n        const v = Math.round(l * 255);\n        return toRGBA8888(v, v, v);\n    }\n    const t1 = l < 0.5 ? l * (1 + s) : l + s - l * s;\n    const t2 = 2 * l - t1;\n    return toRGBA8888(clamp(0, 255, Math.round(h2c(t1, t2, h + 1 / 3) * 255)), clamp(0, 255, Math.round(h2c(t1, t2, h) * 255)), clamp(0, 255, Math.round(h2c(t1, t2, h - 1 / 3) * 255)));\n}\n/**\n * Normalize SIXEL RGB values (percent based, 0-100) to RGBA8888.\n */\nfunction normalizeRGB(r, g, b) {\n    return (0xFF000000 | Math.round(b / 100 * 255) << 16 | Math.round(g / 100 * 255) << 8 | Math.round(r / 100 * 255)) >>> 0; // ABGR32\n}\nexports.normalizeRGB = normalizeRGB;\n/**\n * Normalize SIXEL HLS values to RGBA8888. Applies hue correction of +240°.\n */\nfunction normalizeHLS(h, l, s) {\n    // Note: hue value is turned by 240° in VT340, all values given as fractions\n    return HLStoRGB((h + 240 % 360) / 360, l / 100, s / 100);\n}\nexports.normalizeHLS = normalizeHLS;\n/**\n * default palettes\n */\n// FIXME: move palettes to Decoder.ts\n/**\n * 16 predefined color registers of VT340 (values in %):\n * ```\n *                R   G   B\n * 0  Black       0   0   0\n * 1  Blue        20  20  80\n * 2  Red         80  13  13\n * 3  Green       20  80  20\n * 4  Magenta     80  20  80\n * 5  Cyan        20  80  80\n * 6  Yellow      80  80  20\n * 7  Gray 50%    53  53  53\n * 8  Gray 25%    26  26  26\n * 9  Blue*       33  33  60\n * 10 Red*        60  26  26\n * 11 Green*      33  60  33\n * 12 Magenta*    60  33  60\n * 13 Cyan*       33  60  60\n * 14 Yellow*     60  60  33\n * 15 Gray 75%    80  80  80\n * ```\n * (*) less saturated\n *\n * @see https://vt100.net/docs/vt3xx-gp/chapter2.html#S2.4\n*/\nexports.PALETTE_VT340_COLOR = new Uint32Array([\n    normalizeRGB(0, 0, 0),\n    normalizeRGB(20, 20, 80),\n    normalizeRGB(80, 13, 13),\n    normalizeRGB(20, 80, 20),\n    normalizeRGB(80, 20, 80),\n    normalizeRGB(20, 80, 80),\n    normalizeRGB(80, 80, 20),\n    normalizeRGB(53, 53, 53),\n    normalizeRGB(26, 26, 26),\n    normalizeRGB(33, 33, 60),\n    normalizeRGB(60, 26, 26),\n    normalizeRGB(33, 60, 33),\n    normalizeRGB(60, 33, 60),\n    normalizeRGB(33, 60, 60),\n    normalizeRGB(60, 60, 33),\n    normalizeRGB(80, 80, 80)\n]);\n/**\n * 16 predefined monochrome registers of VT340 (values in %):\n * ```\n *              R   G   B\n * 0  Black     0   0   0\n * 1  Gray-2    13  13  13\n * 2  Gray-4    26  26  26\n * 3  Gray-6    40  40  40\n * 4  Gray-1    6   6   6\n * 5  Gray-3    20  20  20\n * 6  Gray-5    33  33  33\n * 7  White 7   46  46  46\n * 8  Black 0   0   0   0\n * 9  Gray-2    13  13  13\n * 10 Gray-4    26  26  26\n * 11 Gray-6    40  40  40\n * 12 Gray-1    6   6   6\n * 13 Gray-3    20  20  20\n * 14 Gray-5    33  33  33\n * 15 White 7   46  46  46\n * ```\n *\n * @see https://vt100.net/docs/vt3xx-gp/chapter2.html#S2.4\n */\nexports.PALETTE_VT340_GREY = new Uint32Array([\n    normalizeRGB(0, 0, 0),\n    normalizeRGB(13, 13, 13),\n    normalizeRGB(26, 26, 26),\n    normalizeRGB(40, 40, 40),\n    normalizeRGB(6, 6, 6),\n    normalizeRGB(20, 20, 20),\n    normalizeRGB(33, 33, 33),\n    normalizeRGB(46, 46, 46),\n    normalizeRGB(0, 0, 0),\n    normalizeRGB(13, 13, 13),\n    normalizeRGB(26, 26, 26),\n    normalizeRGB(40, 40, 40),\n    normalizeRGB(6, 6, 6),\n    normalizeRGB(20, 20, 20),\n    normalizeRGB(33, 33, 33),\n    normalizeRGB(46, 46, 46)\n]);\n/**\n * 256 predefined ANSI colors.\n *\n * @see https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit\n */\nexports.PALETTE_ANSI_256 = (() => {\n    // 16 lower colors (taken from xterm)\n    const p = [\n        toRGBA8888(0, 0, 0),\n        toRGBA8888(205, 0, 0),\n        toRGBA8888(0, 205, 0),\n        toRGBA8888(205, 205, 0),\n        toRGBA8888(0, 0, 238),\n        toRGBA8888(205, 0, 205),\n        toRGBA8888(0, 250, 205),\n        toRGBA8888(229, 229, 229),\n        toRGBA8888(127, 127, 127),\n        toRGBA8888(255, 0, 0),\n        toRGBA8888(0, 255, 0),\n        toRGBA8888(255, 255, 0),\n        toRGBA8888(92, 92, 255),\n        toRGBA8888(255, 0, 255),\n        toRGBA8888(0, 255, 255),\n        toRGBA8888(255, 255, 255),\n    ];\n    // colors up to 232\n    const d = [0, 95, 135, 175, 215, 255];\n    for (let r = 0; r < 6; ++r) {\n        for (let g = 0; g < 6; ++g) {\n            for (let b = 0; b < 6; ++b) {\n                p.push(toRGBA8888(d[r], d[g], d[b]));\n            }\n        }\n    }\n    // grey scale to up 255\n    for (let v = 8; v <= 238; v += 10) {\n        p.push(toRGBA8888(v, v, v));\n    }\n    return new Uint32Array(p);\n})();\n/**\n * Background: Black by default.\n * Foreground: White by default.\n *\n * Background color is used whenever a fill color is needed and not explicitly set.\n * Foreground color is used as default initial sixel color.\n */\nexports.DEFAULT_BACKGROUND = toRGBA8888(0, 0, 0, 255);\nexports.DEFAULT_FOREGROUND = toRGBA8888(255, 255, 255, 255);\n//# sourceMappingURL=Colors.js.map","\"use strict\";\n/**\n * Copyright (c) 2021 Joerg Breitbart.\n * @license MIT\n */\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.decodeAsync = exports.decode = exports.Decoder = exports.DecoderAsync = void 0;\nconst Colors_1 = require(\"./Colors\");\nconst wasm_1 = require(\"./wasm\");\n/* istanbul ignore next */\nfunction decodeBase64(s) {\n    if (typeof Buffer !== 'undefined') {\n        return Buffer.from(s, 'base64');\n    }\n    const bytestring = atob(s);\n    const result = new Uint8Array(bytestring.length);\n    for (let i = 0; i < result.length; ++i) {\n        result[i] = bytestring.charCodeAt(i);\n    }\n    return result;\n}\nconst WASM_BYTES = decodeBase64(wasm_1.LIMITS.BYTES);\nlet WASM_MODULE;\n// empty canvas\nconst NULL_CANVAS = new Uint32Array();\n// proxy for lazy binding of decoder methods to wasm env callbacks\nclass CallbackProxy {\n    constructor() {\n        this.bandHandler = (width) => 1;\n        this.modeHandler = (mode) => 1;\n    }\n    handle_band(width) {\n        return this.bandHandler(width);\n    }\n    mode_parsed(mode) {\n        return this.modeHandler(mode);\n    }\n}\n// default decoder options\nconst DEFAULT_OPTIONS = {\n    memoryLimit: 2048 * 65536,\n    sixelColor: Colors_1.DEFAULT_FOREGROUND,\n    fillColor: Colors_1.DEFAULT_BACKGROUND,\n    palette: Colors_1.PALETTE_VT340_COLOR,\n    paletteLimit: wasm_1.LIMITS.PALETTE_SIZE,\n    truncate: true\n};\n/**\n * Create a decoder instance asynchronously.\n * To be used in the browser main thread.\n */\nfunction DecoderAsync(opts) {\n    const cbProxy = new CallbackProxy();\n    const importObj = {\n        env: {\n            handle_band: cbProxy.handle_band.bind(cbProxy),\n            mode_parsed: cbProxy.mode_parsed.bind(cbProxy)\n        }\n    };\n    return WebAssembly.instantiate(WASM_MODULE || WASM_BYTES, importObj)\n        .then((inst) => {\n        WASM_MODULE = WASM_MODULE || inst.module;\n        return new Decoder(opts, inst.instance || inst, cbProxy);\n    });\n}\nexports.DecoderAsync = DecoderAsync;\n/**\n * Decoder - web assembly based sixel stream decoder.\n *\n * Usage pattern:\n *  - call `init` to initialize decoder for new image\n *  - feed data chunks to `decode` or `decodeString`\n *  - grab pixels from `data32`\n *  - optional: call `release` to free memory (e.g. after big images)\n *  - start over with next image by calling `init`\n *\n * Properties:\n *  - max width of 2^14 - 4 pixels (compile time setting in wasm)\n *  - no explicit height limit (only limited by memory)\n *  - max 4096 colors palette (compile time setting in wasm)\n *\n * Explanation operation modes:\n * - M1   Mode chosen for level 1 images (no raster attributes),\n *        or for level 2 images with `truncate=false`.\n * - M2   Mode chosen for level 2 images with `truncate=true` (default).\n *        While this mode is not fully spec conform (decoder not expected to truncate),\n *        it is what spec conform encoders should create (should not excess raster).\n *        This mode has several advantages:\n *        - ~15% faster decoding speed\n *        - image dimensions can be evaluated early without processing the whole data\n *        - faster pixel access in `data32` (precalulated)\n *        - image height is not reported as multiple of 6 pixels\n * - M0   Undecided mode state after `init`.\n * The level of an image is determined during early decoding based on the fact,\n * whether the data contains valid raster attributes before any sixel data.\n * Until then the mode of an image is marked as M0, meaning the real operation mode\n * could not be decided yet.\n */\nclass Decoder {\n    /**\n     * Synchonous ctor. Can be called from nodejs or a webworker context.\n     * For instantiation in the browser main thread use `WasmDecoderAsync` instead.\n     */\n    constructor(opts, _instance, _cbProxy) {\n        this._PIXEL_OFFSET = wasm_1.LIMITS.MAX_WIDTH + 4;\n        this._canvas = NULL_CANVAS;\n        this._bandWidths = [];\n        this._maxWidth = 0;\n        this._minWidth = wasm_1.LIMITS.MAX_WIDTH;\n        this._lastOffset = 0;\n        this._currentHeight = 0;\n        this._opts = Object.assign({}, DEFAULT_OPTIONS, opts);\n        if (this._opts.paletteLimit > wasm_1.LIMITS.PALETTE_SIZE) {\n            throw new Error(`DecoderOptions.paletteLimit must not exceed ${wasm_1.LIMITS.PALETTE_SIZE}`);\n        }\n        if (!_instance) {\n            const module = WASM_MODULE || (WASM_MODULE = new WebAssembly.Module(WASM_BYTES));\n            _instance = new WebAssembly.Instance(module, {\n                env: {\n                    handle_band: this._handle_band.bind(this),\n                    mode_parsed: this._initCanvas.bind(this)\n                }\n            });\n        }\n        else {\n            _cbProxy.bandHandler = this._handle_band.bind(this);\n            _cbProxy.modeHandler = this._initCanvas.bind(this);\n        }\n        this._instance = _instance;\n        this._wasm = this._instance.exports;\n        this._chunk = new Uint8Array(this._wasm.memory.buffer, this._wasm.get_chunk_address(), wasm_1.LIMITS.CHUNK_SIZE);\n        this._states = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_state_address(), 12);\n        this._palette = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_palette_address(), wasm_1.LIMITS.PALETTE_SIZE);\n        this._palette.set(this._opts.palette);\n        this._pSrc = new Uint32Array(this._wasm.memory.buffer, this._wasm.get_p0_address());\n        this._wasm.init(Colors_1.DEFAULT_FOREGROUND, 0, this._opts.paletteLimit, 0);\n    }\n    // some readonly parser states for internal usage\n    get _fillColor() { return this._states[0]; }\n    get _truncate() { return this._states[8]; }\n    get _rasterWidth() { return this._states[6]; }\n    get _rasterHeight() { return this._states[7]; }\n    get _width() { return this._states[2] ? this._states[2] - 4 : 0; }\n    get _height() { return this._states[3]; }\n    get _level() { return this._states[9]; }\n    get _mode() { return this._states[10]; }\n    get _paletteLimit() { return this._states[11]; }\n    _initCanvas(mode) {\n        if (mode === 2 /* M2 */) {\n            const pixels = this.width * this.height;\n            if (pixels > this._canvas.length) {\n                if (this._opts.memoryLimit && pixels * 4 > this._opts.memoryLimit) {\n                    this.release();\n                    throw new Error('image exceeds memory limit');\n                }\n                this._canvas = new Uint32Array(pixels);\n            }\n            this._maxWidth = this._width;\n        }\n        else if (mode === 1 /* M1 */) {\n            if (this._level === 2) {\n                // got raster attributes, use them as initial size hint\n                const pixels = Math.min(this._rasterWidth, wasm_1.LIMITS.MAX_WIDTH) * this._rasterHeight;\n                if (pixels > this._canvas.length) {\n                    if (this._opts.memoryLimit && pixels * 4 > this._opts.memoryLimit) {\n                        this.release();\n                        throw new Error('image exceeds memory limit');\n                    }\n                    this._canvas = new Uint32Array(pixels);\n                }\n            }\n            else {\n                // else fallback to generic resizing, starting with 256*256 pixels\n                if (this._canvas.length < 65536) {\n                    this._canvas = new Uint32Array(65536);\n                }\n            }\n        }\n        return 0; // 0 - continue, 1 - abort right away\n    }\n    _realloc(offset, additionalPixels) {\n        const pixels = offset + additionalPixels;\n        if (pixels > this._canvas.length) {\n            if (this._opts.memoryLimit && pixels * 4 > this._opts.memoryLimit) {\n                this.release();\n                throw new Error('image exceeds memory limit');\n            }\n            // extend in 65536 pixel blocks\n            const newCanvas = new Uint32Array(Math.ceil(pixels / 65536) * 65536);\n            newCanvas.set(this._canvas);\n            this._canvas = newCanvas;\n        }\n    }\n    _handle_band(width) {\n        const adv = this._PIXEL_OFFSET;\n        let offset = this._lastOffset;\n        if (this._mode === 2 /* M2 */) {\n            let remaining = this.height - this._currentHeight;\n            let c = 0;\n            while (c < 6 && remaining > 0) {\n                this._canvas.set(this._pSrc.subarray(adv * c, adv * c + width), offset + width * c);\n                c++;\n                remaining--;\n            }\n            this._lastOffset += width * c;\n            this._currentHeight += c;\n        }\n        else if (this._mode === 1 /* M1 */) {\n            this._realloc(offset, width * 6);\n            this._maxWidth = Math.max(this._maxWidth, width);\n            this._minWidth = Math.min(this._minWidth, width);\n            for (let i = 0; i < 6; ++i) {\n                this._canvas.set(this._pSrc.subarray(adv * i, adv * i + width), offset + width * i);\n            }\n            this._bandWidths.push(width);\n            this._lastOffset += width * 6;\n            this._currentHeight += 6;\n        }\n        return 0; // 0 - continue, 1 - abort right away\n    }\n    /**\n     * Width of the image data.\n     * Returns the rasterWidth in level2/truncating mode,\n     * otherwise the max width, that has been seen so far.\n     */\n    get width() {\n        return this._mode !== 1 /* M1 */\n            ? this._width\n            : Math.max(this._maxWidth, this._wasm.current_width());\n    }\n    /**\n     * Height of the image data.\n     * Returns the rasterHeight in level2/truncating mode,\n     * otherwise height touched by sixels.\n     */\n    get height() {\n        return this._mode !== 1 /* M1 */\n            ? this._height\n            : this._wasm.current_width()\n                ? this._bandWidths.length * 6 + this._wasm.current_height()\n                : this._bandWidths.length * 6;\n    }\n    /**\n     * Get active palette colors as RGBA8888[] (borrowed).\n     */\n    get palette() {\n        return this._palette.subarray(0, this._paletteLimit);\n    }\n    /**\n     * Get the memory used by the decoder.\n     *\n     * This is a rough estimate accounting the wasm instance memory\n     * and pixel buffers held on JS side (real value will be slightly\n     * higher due to JS book-keeping).\n     * Note that the decoder does not free ressources on its own,\n     * call `release` to free excess memory.\n     */\n    get memoryUsage() {\n        return this._canvas.byteLength + this._wasm.memory.buffer.byteLength + 8 * this._bandWidths.length;\n    }\n    /**\n     * Get various properties of the decoder and the current image.\n     */\n    get properties() {\n        return {\n            width: this.width,\n            height: this.height,\n            mode: this._mode,\n            level: this._level,\n            truncate: !!this._truncate,\n            paletteLimit: this._paletteLimit,\n            fillColor: this._fillColor,\n            memUsage: this.memoryUsage,\n            rasterAttributes: {\n                numerator: this._states[4],\n                denominator: this._states[5],\n                width: this._rasterWidth,\n                height: this._rasterHeight,\n            }\n        };\n    }\n    /**\n     * Initialize decoder for next image. Must be called before\n     * any calls to `decode` or `decodeString`.\n     */\n    // FIXME: reorder arguments, better palette handling\n    init(fillColor = this._opts.fillColor, palette = this._opts.palette, paletteLimit = this._opts.paletteLimit, truncate = this._opts.truncate) {\n        this._wasm.init(this._opts.sixelColor, fillColor, paletteLimit, truncate ? 1 : 0);\n        if (palette) {\n            this._palette.set(palette.subarray(0, wasm_1.LIMITS.PALETTE_SIZE));\n        }\n        this._bandWidths.length = 0;\n        this._maxWidth = 0;\n        this._minWidth = wasm_1.LIMITS.MAX_WIDTH;\n        this._lastOffset = 0;\n        this._currentHeight = 0;\n    }\n    /**\n     * Decode next chunk of data from start to end index (exclusive).\n     * @throws Will throw if the image exceeds the memory limit.\n     */\n    decode(data, start = 0, end = data.length) {\n        let p = start;\n        while (p < end) {\n            const length = Math.min(end - p, wasm_1.LIMITS.CHUNK_SIZE);\n            this._chunk.set(data.subarray(p, p += length));\n            this._wasm.decode(0, length);\n        }\n    }\n    /**\n     * Decode next chunk of string data from start to end index (exclusive).\n     * Note: Decoding from string data is rather slow, use `decode` with byte data instead.\n     * @throws Will throw if the image exceeds the memory limit.\n     */\n    decodeString(data, start = 0, end = data.length) {\n        let p = start;\n        while (p < end) {\n            const length = Math.min(end - p, wasm_1.LIMITS.CHUNK_SIZE);\n            for (let i = 0, j = p; i < length; ++i, ++j) {\n                this._chunk[i] = data.charCodeAt(j);\n            }\n            p += length;\n            this._wasm.decode(0, length);\n        }\n    }\n    /**\n     * Get current pixel data as 32-bit typed array (RGBA8888).\n     * Also peeks into pixel data of the current band, that got not pushed yet.\n     */\n    get data32() {\n        if (this._mode === 0 /* M0 */ || !this.width || !this.height) {\n            return NULL_CANVAS;\n        }\n        // get width of pending band to peek into left-over data\n        const currentWidth = this._wasm.current_width();\n        if (this._mode === 2 /* M2 */) {\n            let remaining = this.height - this._currentHeight;\n            if (remaining > 0) {\n                const adv = this._PIXEL_OFFSET;\n                let offset = this._lastOffset;\n                let c = 0;\n                while (c < 6 && remaining > 0) {\n                    this._canvas.set(this._pSrc.subarray(adv * c, adv * c + currentWidth), offset + currentWidth * c);\n                    c++;\n                    remaining--;\n                }\n                if (remaining) {\n                    this._canvas.fill(this._fillColor, offset + currentWidth * c);\n                }\n            }\n            return this._canvas.subarray(0, this.width * this.height);\n        }\n        if (this._mode === 1 /* M1 */) {\n            if (this._minWidth === this._maxWidth) {\n                let escape = false;\n                if (currentWidth) {\n                    if (currentWidth !== this._minWidth) {\n                        escape = true;\n                    }\n                    else {\n                        const adv = this._PIXEL_OFFSET;\n                        let offset = this._lastOffset;\n                        this._realloc(offset, currentWidth * 6);\n                        for (let i = 0; i < 6; ++i) {\n                            this._canvas.set(this._pSrc.subarray(adv * i, adv * i + currentWidth), offset + currentWidth * i);\n                        }\n                    }\n                }\n                if (!escape) {\n                    return this._canvas.subarray(0, this.width * this.height);\n                }\n            }\n            // worst case: re-align pixels if we have bands with different width\n            // This is somewhat allocation intensive, any way to do that in-place, and just once?\n            const final = new Uint32Array(this.width * this.height);\n            final.fill(this._fillColor);\n            let finalOffset = 0;\n            let start = 0;\n            for (let i = 0; i < this._bandWidths.length; ++i) {\n                const bw = this._bandWidths[i];\n                for (let p = 0; p < 6; ++p) {\n                    final.set(this._canvas.subarray(start, start += bw), finalOffset);\n                    finalOffset += this.width;\n                }\n            }\n            // also handle left-over pixels of the current band\n            if (currentWidth) {\n                const adv = this._PIXEL_OFFSET;\n                // other than finished bands, this runs only up to currentHeight\n                const currentHeight = this._wasm.current_height();\n                for (let i = 0; i < currentHeight; ++i) {\n                    final.set(this._pSrc.subarray(adv * i, adv * i + currentWidth), finalOffset + this.width * i);\n                }\n            }\n            return final;\n        }\n        // fallthrough for all not handled cases\n        return NULL_CANVAS;\n    }\n    /**\n     * Same as `data32`, but returning pixel data as Uint8ClampedArray suitable\n     * for direct usage with `ImageData`.\n     */\n    get data8() {\n        return new Uint8ClampedArray(this.data32.buffer, 0, this.width * this.height * 4);\n    }\n    /**\n     * Release image ressources on JS side held by the decoder.\n     *\n     * The decoder tries to re-use memory ressources of a previous image\n     * to lower allocation and GC pressure. Decoding a single big image\n     * will grow the memory usage of the decoder permanently.\n     * Call `release` to reset the internal buffers and free the memory.\n     * Note that this destroys the image data, call it when done processing\n     * a rather big image, otherwise it is not needed. Use `memoryUsage`\n     * to decide, whether the held memory is still within your limits.\n     * This does not affect the wasm module (operates on static memory).\n     */\n    release() {\n        this._canvas = NULL_CANVAS;\n        this._bandWidths.length = 0;\n        this._maxWidth = 0;\n        this._minWidth = wasm_1.LIMITS.MAX_WIDTH;\n        // also nullify parser states in wasm to avoid\n        // width/height reporting potential out-of-bound values\n        this._wasm.init(Colors_1.DEFAULT_FOREGROUND, 0, this._opts.paletteLimit, 0);\n    }\n}\nexports.Decoder = Decoder;\n/**\n * Convenient decoding functions for easier usage.\n *\n * These can be used for casual decoding of sixel images,\n * that dont come in as stream chunks.\n * Note that the functions instantiate a stream decoder for every call,\n * which comes with a performance penalty of ~25%.\n */\n/**\n * Decode function with synchronous wasm loading.\n * Can be used in a web worker or in nodejs. Does not work reliable in normal browser context.\n * @throws Will throw if the image exceeds the memory limit.\n */\nfunction decode(data, opts) {\n    const dec = new Decoder(opts);\n    dec.init();\n    typeof data === 'string' ? dec.decodeString(data) : dec.decode(data);\n    return {\n        width: dec.width,\n        height: dec.height,\n        data32: dec.data32,\n        data8: dec.data8\n    };\n}\nexports.decode = decode;\n/**\n * Decode function with asynchronous wasm loading.\n * Use this version in normal browser context.\n * @throws Will throw if the image exceeds the memory limit.\n */\nasync function decodeAsync(data, opts) {\n    const dec = await DecoderAsync(opts);\n    dec.init();\n    typeof data === 'string' ? dec.decodeString(data) : dec.decode(data);\n    return {\n        width: dec.width,\n        height: dec.height,\n        data32: dec.data32,\n        data8: dec.data8\n    };\n}\nexports.decodeAsync = decodeAsync;\n//# sourceMappingURL=Decoder.js.map","\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.LIMITS = void 0;\nexports.LIMITS = {\n    CHUNK_SIZE: 16384,\n    PALETTE_SIZE: 4096,\n    MAX_WIDTH: 16384,\n    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//# sourceMappingURL=wasm.js.map","/**\n * Copyright (c) 2024-2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Minimal event utilities for xterm.js core.\n * Simplified from VS Code's event.ts - no leak detection/profiling.\n */\n\nimport { IDisposable, DisposableStore, toDisposable } from './Lifecycle';\n\nexport interface IEvent<T> {\n  (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore): IDisposable;\n}\n\nexport class Emitter<T> {\n  private _listeners: { fn: (e: T) => any, thisArgs: any }[] = [];\n  private _disposed = false;\n  private _event: IEvent<T> | undefined;\n\n  public get event(): IEvent<T> {\n    if (this._event) {\n      return this._event;\n    }\n    this._event = (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      if (this._disposed) {\n        return toDisposable(() => {});\n      }\n\n      const entry = { fn: listener, thisArgs };\n      this._listeners = this._listeners.slice();\n      this._listeners.push(entry);\n\n      const result = toDisposable(() => {\n        const idx = this._listeners.indexOf(entry);\n        if (idx !== -1) {\n          this._listeners = this._listeners.slice();\n          this._listeners.splice(idx, 1);\n        }\n      });\n\n      if (disposables) {\n        if (Array.isArray(disposables)) {\n          disposables.push(result);\n        } else {\n          disposables.add(result);\n        }\n      }\n\n      return result;\n    };\n    return this._event;\n  }\n\n  public fire(event: T): void {\n    if (this._disposed || !this._listeners.length) {\n      return;\n    }\n    if (this._listeners.length === 1) {\n      this._listeners[0].fn.call(this._listeners[0].thisArgs, event);\n      return;\n    }\n    const listeners = this._listeners;\n    for (let i = 0, len = listeners.length; i < len; ++i) {\n      listeners[i].fn.call(listeners[i].thisArgs, event);\n    }\n  }\n\n  public dispose(): void {\n    if (this._disposed) {\n      return;\n    }\n    this._disposed = true;\n    this._listeners.length = 0;\n  }\n}\n\nexport namespace EventUtils {\n  export function forward<T>(from: IEvent<T>, to: Emitter<T>): IDisposable {\n    return from(e => to.fire(e));\n  }\n\n  export function map<I, O>(event: IEvent<I>, map: (i: I) => O): IEvent<O> {\n    return (listener: (e: O) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      return event(i => listener.call(thisArgs, map(i)), undefined, disposables);\n    };\n  }\n\n  export function any<T>(...events: IEvent<T>[]): IEvent<T>;\n  export function any(...events: IEvent<any>[]): IEvent<void>;\n  export function any<T>(...events: IEvent<T>[]): IEvent<T> {\n    return (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      const store = new DisposableStore();\n      for (const event of events) {\n        store.add(event(e => listener.call(thisArgs, e)));\n      }\n      if (disposables) {\n        if (Array.isArray(disposables)) {\n          disposables.push(store);\n        } else {\n          disposables.add(store);\n        }\n      }\n      return store;\n    };\n  }\n\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T) => void, initial: T): IDisposable;\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T | undefined) => void): IDisposable;\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T | undefined) => void, initial?: T): IDisposable {\n    handler(initial);\n    return event(e => handler(e));\n  }\n}\n","/**\n * Copyright (c) 2024-2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Minimal lifecycle utilities for xterm.js core.\n * Simplified from VS Code's lifecycle.ts - no tracking/leak detection.\n */\n\nexport interface IDisposable {\n  dispose(): void;\n}\n\nexport function toDisposable(fn: () => void): IDisposable {\n  return { dispose: fn };\n}\n\nexport function dispose<T extends IDisposable>(disposable: T): T;\nexport function dispose<T extends IDisposable>(disposable: T | undefined): T | undefined;\nexport function dispose<T extends IDisposable>(disposables: T[]): T[];\nexport function dispose<T extends IDisposable>(arg: T | T[] | undefined): T | T[] | undefined {\n  if (!arg) {\n    return arg;\n  }\n  if (Array.isArray(arg)) {\n    for (const d of arg) {\n      d.dispose();\n    }\n    return [];\n  }\n  arg.dispose();\n  return arg;\n}\n\nexport function combinedDisposable(...disposables: IDisposable[]): IDisposable {\n  return toDisposable(() => dispose(disposables));\n}\n\nexport class DisposableStore implements IDisposable {\n  private readonly _disposables = new Set<IDisposable>();\n  private _isDisposed = false;\n\n  public get isDisposed(): boolean {\n    return this._isDisposed;\n  }\n\n  public add<T extends IDisposable>(o: T): T {\n    if (this._isDisposed) {\n      o.dispose();\n    } else {\n      this._disposables.add(o);\n    }\n    return o;\n  }\n\n  public dispose(): void {\n    if (this._isDisposed) {\n      return;\n    }\n    this._isDisposed = true;\n    for (const d of this._disposables) {\n      d.dispose();\n    }\n    this._disposables.clear();\n  }\n\n  public clear(): void {\n    for (const d of this._disposables) {\n      d.dispose();\n    }\n    this._disposables.clear();\n  }\n}\n\nexport abstract class Disposable implements IDisposable {\n  public static readonly None: IDisposable = Object.freeze({ dispose() { } });\n\n  protected readonly _store = new DisposableStore();\n\n  public dispose(): void {\n    this._store.dispose();\n  }\n\n  protected _register<T extends IDisposable>(o: T): T {\n    return this._store.add(o);\n  }\n}\n\nexport class MutableDisposable<T extends IDisposable> implements IDisposable {\n  private _value: T | undefined;\n  private _isDisposed = false;\n\n  public get value(): T | undefined {\n    return this._isDisposed ? undefined : this._value;\n  }\n\n  public set value(value: T | undefined) {\n    if (this._isDisposed || value === this._value) {\n      return;\n    }\n    this._value?.dispose();\n    this._value = value;\n  }\n\n  public clear(): void {\n    this.value = undefined;\n  }\n\n  public dispose(): void {\n    this._isDisposed = true;\n    this._value?.dispose();\n    this._value = undefined;\n  }\n}\n","/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nimport { IImageAddonOptions, IOscHandler, IResetHandler, ITerminalExt } from './Types';\nimport { ImageRenderer } from './ImageRenderer';\nimport { IIPImageStorage } from './IIPImageStorage';\nimport { CELL_SIZE_DEFAULT } from './ImageStorage';\nimport Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\nimport QoiDecoder from 'xterm-wasm-parts/lib/qoi/QoiDecoder.wasm';\nimport { HeaderParser, IHeaderFields, HeaderState, SequenceType } from './IIPHeaderParser';\nimport { imageType, UNSUPPORTED_TYPE } from './IIPMetrics';\n\n// Local const enum mirror - esbuild can't inline const enums from external packages\nconst enum DecoderConst {\n  // Held memory in base64/QOI decoders between images. Zero because each kept\n  // decoder pins a wasm memory, and V8 caps those per process (~124 in a\n  // sandboxed renderer), so idle terminals must not hold one.\n  KEEP_DATA = 0,\n  // Initial buffer allocation for the decoder.\n  INITIAL_DATA = 1048576,\n  // Local mirror of const enum (esbuild can't inline const enums from external packages)\n  OK = 0\n}\n\n// default IIP header values\nconst DEFAULT_HEADER: IHeaderFields = {\n  type: SequenceType.INVALID,\n  name: 'Unnamed file',\n  size: 0,\n  width: 'auto',\n  height: 'auto',\n  preserveAspectRatio: 1,\n  inline: 0\n};\n\n\nexport class IIPHandler implements IOscHandler, IResetHandler {\n  private _generation = 0;\n  private _aborted = false;\n  private _hp = new HeaderParser();\n  private _header: IHeaderFields = DEFAULT_HEADER;\n  private _dec: Base64Decoder;\n  private _qoiDec: QoiDecoder;\n  private _isMultipart = false;\n  private _abortMulti = false;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _storage: IIPImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    const maxEncodedBytes = Math.ceil(this._opts.iipSizeLimit * 4 / 3);\n    const initialBytes = Math.min(DecoderConst.INITIAL_DATA, maxEncodedBytes);\n    this._dec = new Base64Decoder(DecoderConst.KEEP_DATA, maxEncodedBytes, initialBytes);\n    this._qoiDec = new QoiDecoder(DecoderConst.KEEP_DATA);\n  }\n\n  public reset(): void {\n    this._generation++;\n    this._hp.reset();\n    this._dec.release();\n    this._qoiDec.release();\n  }\n\n  public start(): void {\n    this._aborted = false;\n    this._hp.reset();\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    if (this._hp.state === HeaderState.END) {\n      if ((this._dec.put(data.subarray(start, end)) as number) !== DecoderConst.OK) {\n        this._dec.release();\n        this._aborted = true;\n      }\n    } else {\n      const dataPos = this._hp.parse(data, start, end);\n      if (dataPos === -1) {\n        this._aborted = true;\n        return;\n      }\n      if (dataPos > 0) {\n        const seqType = this._hp.fields.type;\n        if (seqType === SequenceType.FILE) {\n          if (this._isMultipart) {\n            this._isMultipart = false;\n            this._abortMulti = false;\n            this._dec.release();\n          }\n          this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);\n          if (!this._header.inline) {\n            this._aborted = true;\n            return;\n          }\n          if (!this._initDecoder()) {\n            this._aborted = true;\n            return;\n          }\n        } else if (this._abortMulti) {\n          this._aborted = true;\n          return;\n        }\n        if ((this._dec.put(data.subarray(dataPos, end)) as number) !== DecoderConst.OK) {\n          this._dec.release();\n          this._aborted = true;\n          if (this._isMultipart) this._abortMulti = true;\n        }\n      }\n    }\n  }\n\n  public end(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted) return true;\n\n    if (this._hp.state !== HeaderState.END) {\n      if (this._hp.end()) return true;\n    }\n    const seqType = this._hp.fields.type;\n\n    if (seqType === SequenceType.FILEPART) return true;\n\n    if (seqType === SequenceType.REPORTCELLSIZE) {\n      // OSC 1337 ; ReportCellSize=[height];[width];[scale] ST\n      let w = CELL_SIZE_DEFAULT.width;\n      let h = CELL_SIZE_DEFAULT.height;\n      if (this._renderer.dimensions) {\n        w = this._renderer.dimensions.css.canvas.width / this._coreTerminal.cols;\n        h = this._renderer.dimensions.css.canvas.height / this._coreTerminal.rows;\n      }\n      const scale = this._coreTerminal._core._coreBrowserService?.dpr ?? 1;\n      const report = `\\x1b]1337;ReportCellSize=${h.toFixed(3)};${w.toFixed(3)};${scale.toFixed(3)}\\x1b\\\\`;\n      this._coreTerminal.input(report, false);\n      return true;\n    }\n\n    if (seqType === SequenceType.MULTIPARTFILE) {\n      this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);\n      this._isMultipart = true;\n      this._abortMulti = false;\n      this._dec.release();\n      if (!this._initDecoder()) {\n        this._abortMulti = true;\n      }\n      return true;\n    }\n\n    if (seqType === SequenceType.FILEEND) {\n      if (!this._isMultipart) return true;\n      this._isMultipart = false;\n      if (this._abortMulti || this._header.type !== SequenceType.MULTIPARTFILE) return true;\n    }\n\n    // fallthrough for SequenceType.FILE & SequenceType.FILEEND\n\n    let w = 0;\n    let h = 0;\n\n    // early exit condition chain\n    let cond: number | boolean;\n    let metrics = UNSUPPORTED_TYPE;\n    if (cond = success) {\n      if (cond = !this._dec.end()) {\n        metrics = imageType(this._dec.data8);\n        if (cond = metrics.mime !== 'unsupported') {\n          w = metrics.width;\n          h = metrics.height;\n          if (cond = w && h && w * h < this._opts.pixelLimit) {\n            [w, h] = this._resize(w, h).map(Math.floor);\n            cond = w && h && w * h < this._opts.pixelLimit;\n          } else {\n            console.warn(`IIP: image dimension issue ${metrics.width}x${metrics.height}`);\n          }\n        } else {\n          console.warn('IIP: unsupported image type');\n        }\n      } else {\n        console.warn('IIP: error during BASE64 decoding');\n      }\n    }\n    if (!cond) {\n      this._dec.release();\n      return true;\n    }\n\n    let blob: Blob | ImageData;\n    if (metrics.mime === 'image/qoi') {\n      let data: Uint8Array<ArrayBuffer>;\n      try {\n        data = this._qoiDec.decode(this._dec.data8);\n      } catch (e) {\n        console.warn('IIP: could not decode QOI image', e);\n        this._dec.release();\n        this._qoiDec.release();\n        return true;\n      }\n      blob = new ImageData(\n        new Uint8ClampedArray(data.buffer, data.byteOffset, data.byteLength),\n        this._qoiDec.width,\n        this._qoiDec.height\n      );\n      this._qoiDec.release();\n      if (w === this._qoiDec.width && h === this._qoiDec.height) {\n        // use fast-path if we don't need to rescale\n        this._dec.release();\n        const canvas = ImageRenderer.createCanvas(undefined, this._qoiDec.width, this._qoiDec.height);\n        canvas.getContext('2d')?.putImageData(blob, 0, 0);\n        this._storage.addImage(canvas);\n        return true;\n      }\n    } else {\n      blob = new Blob([this._dec.data8], { type: metrics.mime });\n    }\n    this._dec.release();\n    const generation = this._generation;\n    return createImageBitmap(blob, { resizeWidth: w, resizeHeight: h })\n      .then(bm => {\n        if (generation !== this._generation) {\n          bm.close();\n          return true;\n        }\n        this._storage.addImage(bm);\n        return true;\n      })\n      .catch(e => {\n        console.warn(`IIP: decoding error ${metrics.mime} ${metrics.width}x${metrics.height}`, e);\n        return true;\n      });\n  }\n\n  // Why: wasm memory exhaustion must drop this image, not throw out of the parser and wedge the write queue.\n  private _initDecoder(): boolean {\n    try {\n      this._dec.init();\n      return true;\n    } catch (e) {\n      console.warn('IIP: could not allocate decoder', e);\n      this._dec.release();\n      return false;\n    }\n  }\n\n  private _resize(w: number, h: number): [number, number] {\n    const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;\n    const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;\n    const width = this._renderer.dimensions?.css.canvas.width || cw * this._coreTerminal.cols;\n    const height = this._renderer.dimensions?.css.canvas.height || ch * this._coreTerminal.rows;\n\n    const rw = this._dim(this._header.width!, width, cw);\n    const rh = this._dim(this._header.height!, height, ch);\n    if (!rw && !rh) {\n      const wf = width / w;         // TODO: should this respect initial cursor offset?\n      const hf = (height - ch) / h; // TODO: fix offset issues from float cell height\n      const f = Math.min(wf, hf);\n      return f < 1 ? [w * f, h * f] : [w, h];\n    }\n    return !rw\n      ? [w * rh / h, rh]\n      : this._header.preserveAspectRatio || !rw || !rh\n        ? [rw, h * rw / w] : [rw, rh];\n  }\n\n  private _dim(s: string, total: number, cdim: number): number {\n    if (s === 'auto') return 0;\n    if (s.endsWith('%')) return parseInt(s.slice(0, -1), 10) * total / 100;\n    if (s.endsWith('px')) return parseInt(s.slice(0, -2), 10);\n    return parseInt(s, 10) * cdim;\n  }\n}\n","/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n// eslint-disable-next-line\ndeclare const Buffer: any;\n\nexport const enum HeaderState {\n  START = 0,\n  ABORT = 1,\n  KEY = 2,\n  VALUE = 3,\n  END = 4\n}\n\nexport const enum SequenceType {\n  INVALID = 0,\n  FILE = 1,\n  MULTIPARTFILE = 2,\n  FILEPART = 3,\n  FILEEND = 4,\n  REPORTCELLSIZE = 5\n}\n\nexport interface IHeaderFields {\n  [key: string]: number | string | Uint32Array | null | undefined;\n  // sequence type\n  type: SequenceType;\n  // base-64 encoded filename. Defaults to \"Unnamed file\".\n  name: string;\n  // File size in bytes. The file transfer will be canceled if this size is exceeded.\n  size: number;\n  /**\n   * Optional width and height to render:\n   * - N: N character cells.\n   * - Npx: N pixels.\n   * - N%: N percent of the session's width or height.\n   * - auto: The image's inherent size will be used to determine an appropriate dimension.\n   */\n  width?: string;\n  height?: string;\n  // Optional, defaults to 1 respecting aspect ratio (width takes precedence).\n  preserveAspectRatio?: number;\n  // Optional, defaults to 0. If set to 1, the file will be displayed inline, else downloaded\n  // (download not supported).\n  inline?: number;\n}\n\n// field value decoders\n\n// ASCII bytes to string\nfunction toStr(data: Uint32Array): string {\n  let s = '';\n  for (let i = 0; i < data.length; ++i) {\n    s += String.fromCharCode(data[i]);\n  }\n  return s;\n}\n\n// digits to integer\nfunction toInt(data: Uint32Array): number {\n  let v = 0;\n  for (let i = 0; i < data.length; ++i) {\n    if (data[i] < 48 || data[i] > 57) {\n      throw new Error('illegal char');\n    }\n    v = v * 10 + data[i] - 48;\n  }\n  return v;\n}\n\n// check for correct size entry\nfunction toSize(data: Uint32Array): string {\n  const v = toStr(data);\n  if (!v.match(/^((auto)|(\\d+?((px)|(%)){0,1}))$/)) {\n    throw new Error('illegal size');\n  }\n  return v;\n}\n\n// name is base64 encoded utf-8\nfunction toName(data: Uint32Array): string {\n  if (typeof Buffer !== 'undefined') {\n    return Buffer.from(toStr(data), 'base64').toString();\n  }\n  const bs = atob(toStr(data));\n  const b = new Uint8Array(bs.length);\n  for (let i = 0; i < b.length; ++i) {\n    b[i] = bs.charCodeAt(i);\n  }\n  return new TextDecoder().decode(b);\n}\n\nconst DECODERS: {[key: string]: (v: Uint32Array) => number | string} = {\n  inline: toInt,\n  size: toInt,\n  name: toName,\n  width: toSize,\n  height: toSize,\n  preserveAspectRatio: toInt\n};\n\n\n// sequence type markers\n// File\nconst FILE_MARKER = [70, 105, 108, 101];\n// MultipartFile\nconst MULTIPARTFILE_MARKER = [77, 117, 108, 116, 105, 112, 97, 114, 116, 70, 105, 108, 101];\n// FilePart\nconst FILEPART_MARKER = [70, 105, 108, 101, 80, 97, 114, 116];\n// FileEnd\nconst FILEEND_MARKER = [70, 105, 108, 101, 69, 110, 100];\n// ReportCellSize\nconst REPORTCELLSIZE_MARKER = [82, 101, 112, 111, 114, 116, 67, 101, 108, 108, 83, 105, 122, 101];\n\n// max allowed chars for sequence header\nconst MAX_FIELDCHARS = 1024;\n\n\nexport class HeaderParser {\n  public state: HeaderState = HeaderState.START;\n  private _buffer = new Uint32Array(MAX_FIELDCHARS);\n  private _position = 0;\n  private _key = '';\n  public fields: {[key: string]: number | string | Uint32Array | null | undefined} = {};\n\n  public reset(): void {\n    this._buffer.fill(0);\n    this.state = HeaderState.START;\n    this._position = 0;\n    this.fields = {};\n    this._key = '';\n  }\n\n  public end(): number {\n    if (this.state === HeaderState.START) {\n      if (this._position === FILEEND_MARKER.length) {\n        for (let k = 0; k < FILEEND_MARKER.length; ++k) {\n          if (this._buffer[k] !== FILEEND_MARKER[k]) return this._a();\n        }\n        this.fields['type'] = SequenceType.FILEEND;\n        this.state = HeaderState.END;\n        return 0;\n      }\n      if (this._position === REPORTCELLSIZE_MARKER.length) {\n        for (let k = 0; k < REPORTCELLSIZE_MARKER.length; ++k) {\n          if (this._buffer[k] !== REPORTCELLSIZE_MARKER[k]) return this._a();\n        }\n        this.fields['type'] = SequenceType.REPORTCELLSIZE;\n        this.state = HeaderState.END;\n        return 0;\n      }\n      return this._a();\n    }\n    if (this.state === HeaderState.END) return 0;\n    if (this.state === HeaderState.VALUE\n      && this.fields.type === SequenceType.MULTIPARTFILE\n    ) {\n      if (!this._storeValue(this._position)) return this._a();\n      this.state = HeaderState.END;\n      return 0;\n    }\n    return this._a();\n  }\n\n  public parse(data: Uint32Array, start: number, end: number): number {\n    let state = this.state;\n    let pos = this._position;\n    const buffer = this._buffer;\n    if (state === HeaderState.ABORT || state === HeaderState.END) return -1;\n    if (state === HeaderState.START && pos > 14) return -1;\n    for (let i = start; i < end; ++i) {\n      const c = data[i];\n      switch (c) {\n        case 59: // ;\n          if (!this._storeValue(pos)) return this._a();\n          state = HeaderState.KEY;\n          pos = 0;\n          break;\n        case 61: // =\n          if (state === HeaderState.START) {\n            if (buffer[0] === 70) {\n              // 'File' or 'FilePart'\n              let k = 0;\n              for (; k < FILE_MARKER.length; ++k) {\n                if (buffer[k] !== FILE_MARKER[k]) return this._a();\n              }\n              this.fields['type'] = SequenceType.FILE;\n              if (pos === FILEPART_MARKER.length) {\n                for (; k < FILEPART_MARKER.length; ++k) {\n                  if (buffer[k] !== FILEPART_MARKER[k]) return this._a();\n                }\n                this.fields['type'] = SequenceType.FILEPART;\n                this.state = HeaderState.END;\n                return i + 1;\n              }\n            } else if (buffer[0] === 77) {\n              // 'MultipartFile'\n              for (let k = 0; k < MULTIPARTFILE_MARKER.length; ++k) {\n                if (buffer[k] !== MULTIPARTFILE_MARKER[k]) return this._a();\n              }\n              this.fields['type'] = SequenceType.MULTIPARTFILE;\n            } else {\n              return this._a();\n            }\n            state = HeaderState.KEY;\n            pos = 0;\n          } else if (state === HeaderState.KEY) {\n            if (!this._storeKey(pos)) return this._a();\n            state = HeaderState.VALUE;\n            pos = 0;\n          } else if (state === HeaderState.VALUE) {\n            if (pos >= MAX_FIELDCHARS) return this._a();\n            buffer[pos++] = c;\n          }\n          break;\n        case 58: // :\n          if (state === HeaderState.VALUE) {\n            if (!this._storeValue(pos)) return this._a();\n          }\n          this.state = HeaderState.END;\n          return i + 1;\n        default:\n          if (pos >= MAX_FIELDCHARS) return this._a();\n          buffer[pos++] = c;\n      }\n    }\n    this.state = state;\n    this._position = pos;\n    return -2;\n  }\n\n  private _a(): number {\n    this.fields.type = SequenceType.INVALID;\n    this.state = HeaderState.ABORT;\n    return -1;\n  }\n\n  private _storeKey(pos: number): boolean {\n    const k = toStr(this._buffer.subarray(0, pos));\n    if (k) {\n      this._key = k;\n      this.fields[k] = null;\n      return true;\n    }\n    return false;\n  }\n\n  private _storeValue(pos: number): boolean {\n    if (this._key) {\n      try {\n        const v = this._buffer.slice(0, pos);\n        this.fields[this._key] = DECODERS[this._key] ? DECODERS[this._key](v) : v;\n      } catch {\n        return false;\n      }\n      return true;\n    }\n    return false;\n  }\n}\n","/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IAddImageOpts } from './Types';\nimport { ImageStorage } from './ImageStorage';\n\n/**\n * IIP (iTerm Image Protocol) specific image storage controller.\n *\n * Wraps the shared ImageStorage with IIP protocol semantics:\n * - Always uses scrolling mode (cursor advances with image)\n */\nexport class IIPImageStorage {\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };\n  constructor(\n    private readonly _storage: ImageStorage\n  ) {}\n\n  /**\n   * Add an IIP image to storage.\n   * Always uses scrolling mode — cursor advances past the image.\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap): void {\n    this._storage.addImage(img, this._addImageOpts);\n  }\n}\n","/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n\nexport type ImageType = 'image/png' | 'image/jpeg' | 'image/gif' | 'image/qoi' | 'image/webp' | 'image/avif' | 'unsupported' | '';\n\nexport interface IMetrics {\n  mime: ImageType;\n  width: number;\n  height: number;\n}\n\nexport const UNSUPPORTED_TYPE: IMetrics = {\n  mime: 'unsupported',\n  width: 0,\n  height: 0\n};\n\nexport function imageType(d: Uint8Array): IMetrics {\n  if (d.length < 32) {\n    return UNSUPPORTED_TYPE;\n  }\n  const d32 = new Uint32Array(d.buffer, d.byteOffset, 8);\n  // PNG: 89 50 4E 47 0D 0A 1A 0A (8 first bytes == magic number for PNG)\n  // + first chunk must be IHDR\n  if (d32[0] === 0x474E5089 && d32[1] === 0x0A1A0A0D && d32[3] === 0x52444849) {\n    return {\n      mime: 'image/png',\n      width:  d[16] << 24 | d[17] << 16 | d[18] << 8 | d[19],\n      height: d[20] << 24 | d[21] << 16 | d[22] << 8 | d[23]\n    };\n  }\n  // JPEG: FF D8 FF\n  if (d[0] === 0xFF && d[1] === 0xD8 && d[2] === 0xFF) {\n    const [width, height] = jpgSize(d);\n    return { mime: 'image/jpeg', width, height };\n  }\n  // GIF: GIF87a or GIF89a\n  if (d32[0] === 0x38464947 && (d[4] === 0x37 || d[4] === 0x39) && d[5] === 0x61) {\n    return {\n      mime: 'image/gif',\n      width:  d[7] << 8 | d[6],\n      height: d[9] << 8 | d[8]\n    };\n  }\n  // QOI: qoif\n  if (d32[0] === 0x66696F71) {\n    return {\n      mime: 'image/qoi',\n      width:  d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7],\n      height: d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11]\n    };\n  }\n  // WEBP: RIFF | xxxx | WEBP | VP8x\n  if (d32[0] === 0x46464952 && d32[2] === 0x50424557 && (d32[3] & 0xFFFFFF) === 0x385056) {\n    switch (d[15]) {\n      case 0x58:  // Extended WebP VP8X --> \"X\"\n        return {\n          mime: 'image/webp',\n          width:  (d[24] | d[25] << 8 | d[26] << 16) + 1,\n          height: (d[27] | d[28] << 8 | d[29] << 16) + 1\n        };\n      case 0x4C:  // Lossless WebP VP8L --> \"L\"\n        if (d[20] !== 0x2f) return UNSUPPORTED_TYPE;\n        const dim = d[21] | d[22] << 8 | d[23] << 16 | d[24] << 24;\n        return {\n          mime: 'image/webp',\n          width:  (dim        & 0x3FFF) + 1,\n          height: (dim >>> 14 & 0x3FFF) + 1\n        };\n      case 0x20:  // Lossy WebP VP8  --> \" \"\n        if (d[23] !== 0x9d || d[24] !== 0x01 || d[25] !== 0x2a) return UNSUPPORTED_TYPE;\n        return {\n          mime: 'image/webp',\n          width:  (d[26] | d[27] << 8) & 0x3FFF,\n          height: (d[28] | d[29] << 8) & 0x3FFF\n        };\n    }\n    return UNSUPPORTED_TYPE;\n  }\n  // AVIF: Box size | ftyp | avif/avis\n  if (d32[1] === 0x70797466 && (d32[2] === 0x66697661 || d32[2] === 0x73697661)) {\n    let pos = -1;\n    // search for ispe box within first 1024 bytes\n    const limit = Math.min(d.length - 16, 1024);\n    for (let i = 8; i < limit; i++) {\n      // scan for ispe\n      if (d[i] === 0x69 && d[i + 1] === 0x73 && d[i + 2] === 0x70 && d[i + 3] === 0x65) {\n        pos = i;\n        break;\n      }\n    }\n    if (pos !== -1) {\n      // dimensions are in BE at +8 (width) at +12 (height)\n      const width =\n        d[pos +  8] << 24 |\n        d[pos +  9] << 16 |\n        d[pos + 10] <<  8 |\n        d[pos + 11];\n      const height =\n        d[pos + 12] << 24 |\n        d[pos + 13] << 16 |\n        d[pos + 14] <<  8 |\n        d[pos + 15];\n      if (width > 0 && height > 0) {\n        return { mime: 'image/avif', width, height };\n      }\n    }\n    return UNSUPPORTED_TYPE;\n  }\n  return UNSUPPORTED_TYPE;\n}\n\n\nfunction jpgSize(d: Uint8Array): [number, number] {\n  const len = d.length;\n  let i = 4;\n  let blockLength = d[i] << 8 | d[i + 1];\n  while (true) {\n    i += blockLength;\n    if (i >= len) {\n      // exhausted without size info\n      return [0, 0];\n    }\n    if (d[i] !== 0xFF) {\n      return [0, 0];\n    }\n    if (d[i + 1] === 0xC0 || d[i + 1] === 0xC2) {\n      if (i + 8 < len) {\n        return [\n          d[i + 7] << 8 | d[i + 8],\n          d[i + 5] << 8 | d[i + 6]\n        ];\n      }\n      return [0, 0];\n    }\n    i += 2;\n    blockLength = d[i] << 8 | d[i + 1];\n  }\n}\n","/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { toRGBA8888 } from 'sixel/lib/Colors';\nimport { IDisposable } from '@xterm/xterm';\nimport { ICellSize, ImageLayer, ITerminalExt, IImageSpec, IRenderDimensions, IRenderService } from './Types';\nimport { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';\n\nconst enum Constants {\n  PLACEHOLDER_LENGTH = 4096,\n  PLACEHOLDER_HEIGHT = 24\n}\n\n/**\n * ImageRenderer - terminal frontend extension:\n * - provide primitives for canvas, ImageData, Bitmap (static)\n * - add canvas layer to DOM (browser only for now)\n * - draw image tiles onRender\n */\nexport class ImageRenderer extends Disposable implements IDisposable {\n  /** @deprecated Kept for backward compat — points to top layer canvas. */\n  public get canvas(): HTMLCanvasElement | undefined { return this._layers.get('top')?.canvas; }\n  private _layers = new Map<ImageLayer, CanvasRenderingContext2D>();\n  private _placeholder: HTMLCanvasElement | undefined;\n  private _placeholderBitmap: ImageBitmap | undefined;\n  private _optionsRefresh = this._register(new MutableDisposable());\n  private _oldOpen: ((parent: HTMLElement) => void) | undefined;\n  private _renderService: IRenderService | undefined;\n  private _oldSetRenderer: ((renderer: any) => void) | undefined;\n\n  // drawing primitive - canvas\n  public static createCanvas(localDocument: Document | undefined, width: number, height: number): HTMLCanvasElement {\n    /**\n     * NOTE: We normally dont care, from which document the canvas\n     * gets created, so we can fall back to global document,\n     * if the terminal has no document associated yet.\n     * This way early image loads before calling .open keep working\n     * (still discouraged though, as the metrics will be screwed up).\n     * Only the DOM output canvas should be on the terminal's document,\n     * which gets explicitly checked in `insertLayerToDom`.\n     */\n    const canvas = (localDocument ?? document).createElement('canvas');\n    canvas.width = width | 0;\n    canvas.height = height | 0;\n    return canvas;\n  }\n\n  // drawing primitive - ImageData with optional buffer\n  public static createImageData(ctx: CanvasRenderingContext2D, width: number, height: number, buffer?: ArrayBuffer): ImageData {\n    if (typeof ImageData !== 'function') {\n      const imgData = ctx.createImageData(width, height);\n      if (buffer) {\n        imgData.data.set(new Uint8ClampedArray(buffer, 0, width * height * 4));\n      }\n      return imgData;\n    }\n    return buffer\n      ? new ImageData(new Uint8ClampedArray(buffer, 0, width * height * 4), width, height)\n      : new ImageData(width, height);\n  }\n\n  // drawing primitive - ImageBitmap\n  public static createImageBitmap(img: ImageBitmapSource): Promise<ImageBitmap | undefined> {\n    if (typeof createImageBitmap !== 'function') {\n      return Promise.resolve(undefined);\n    }\n    return createImageBitmap(img);\n  }\n\n\n  constructor(private _terminal: ITerminalExt) {\n    super();\n    this._oldOpen = this._terminal._core.open;\n    this._terminal._core.open = (parent: HTMLElement): void => {\n      this._oldOpen?.call(this._terminal._core, parent);\n      this._open();\n    };\n    if (this._terminal._core.screenElement) {\n      this._open();\n    }\n    // hack to spot fontSize changes\n    this._optionsRefresh.value = this._terminal._core.optionsService.onOptionChange(option => {\n      if (option === 'fontSize') {\n        this.rescaleCanvas();\n        this._renderService?.refreshRows(0, this._terminal.rows);\n      }\n    });\n    this._register(toDisposable(() => {\n      this.removeLayerFromDom();\n      this.removeLayerFromDom('bottom');\n      if (this._terminal._core && this._oldOpen) {\n        this._terminal._core.open = this._oldOpen;\n        this._oldOpen = undefined;\n      }\n      if (this._renderService && this._oldSetRenderer) {\n        this._renderService.setRenderer = this._oldSetRenderer;\n        this._oldSetRenderer = undefined;\n      }\n      this._renderService = undefined;\n      this._layers.clear();\n      this._placeholderBitmap?.close();\n      this._placeholderBitmap = undefined;\n      this._placeholder = undefined;\n    }));\n  }\n\n  /**\n   * Enable the placeholder.\n   */\n  public showPlaceholder(value: boolean): void {\n    if (value) {\n      if (!this._placeholder && this.cellSize.height !== -1) {\n        this._createPlaceHolder(Math.max(this.cellSize.height + 1, Constants.PLACEHOLDER_HEIGHT));\n      }\n    } else {\n      this._placeholderBitmap?.close();\n      this._placeholderBitmap = undefined;\n      this._placeholder = undefined;\n    }\n    this._renderService?.refreshRows(0, this._terminal.rows);\n  }\n\n  /**\n   * Dimensions of the terminal.\n   * Forwarded from internal render service.\n   */\n  public get dimensions(): IRenderDimensions | undefined {\n    return this._terminal.dimensions;\n  }\n\n  /**\n   * Current cell size (float).\n   */\n  public get cellSize(): ICellSize {\n    return {\n      width: this.dimensions?.css.cell.width || -1,\n      height: this.dimensions?.css.cell.height || -1\n    };\n  }\n\n  /**\n   * Clear a region of the image layer canvas.\n   */\n  public clearLines(start: number, end: number, layer?: ImageLayer): void {\n    const y = start * (this.dimensions?.css.cell.height || 0);\n    const w = this.dimensions?.css.canvas.width || 0;\n    const h = (end + 1 - start) * (this.dimensions?.css.cell.height || 0);\n    if (!layer || layer === 'top') {\n      this._layers.get('top')?.clearRect(0, y, w, h);\n    }\n    if (!layer || layer === 'bottom') {\n      this._layers.get('bottom')?.clearRect(0, y, w, h);\n    }\n  }\n\n  /**\n   * Clear whole image canvas.\n   */\n  public clearAll(layer?: ImageLayer): void {\n    if (!layer || layer === 'top') {\n      const ctx = this._layers.get('top');\n      ctx?.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);\n    }\n    if (!layer || layer === 'bottom') {\n      const ctx = this._layers.get('bottom');\n      ctx?.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);\n    }\n  }\n\n  /**\n   * Draw neighboring tiles on the image layer canvas.\n   */\n  public draw(imgSpec: IImageSpec, tileId: number, col: number, row: number, count: number = 1): void {\n    const ctx = this._layers.get(imgSpec.layer);\n    if (!ctx) {\n      return;\n    }\n    const { width, height } = this.cellSize;\n\n    // Don't try to draw anything, if we cannot get valid renderer metrics.\n    if (width === -1 || height === -1) {\n      return;\n    }\n\n    this._rescaleImage(imgSpec, width, height);\n    const img = imgSpec.actual!;\n    const { width: sourceWidth, height: sourceHeight } = imgSpec.actualCellSize;\n    const cols = Math.ceil(img.width / sourceWidth);\n\n    const sx = (tileId % cols) * sourceWidth;\n    const sy = Math.floor(tileId / cols) * sourceHeight;\n    const dx = col * width;\n    const dy = row * height;\n\n    // safari bug: never access image source out of bounds\n    const finalWidth = count * sourceWidth + sx > img.width ? img.width - sx : count * sourceWidth;\n    const finalHeight = sy + sourceHeight > img.height ? img.height - sy : sourceHeight;\n\n    // Floor all pixel offsets to get stable tile mapping without any overflows.\n    // Note: For not pixel perfect aligned cells like in the DOM renderer\n    // this will move a tile slightly to the top/left (subpixel range, thus ignore it).\n    // FIX #34: avoid striping on displays with pixelDeviceRatio != 1 by ceiling height and width\n    ctx.drawImage(\n      img,\n      Math.floor(sx), Math.floor(sy), Math.ceil(finalWidth), Math.ceil(finalHeight),\n      Math.floor(dx), Math.floor(dy), Math.ceil(finalWidth * width / sourceWidth), Math.ceil(finalHeight * height / sourceHeight)\n    );\n  }\n\n  /**\n   * Extract a single tile from an image.\n   */\n  public extractTile(imgSpec: IImageSpec, tileId: number): HTMLCanvasElement | undefined {\n    const { width, height } = this.cellSize;\n    // Don't try to draw anything, if we cannot get valid renderer metrics.\n    if (width === -1 || height === -1) {\n      return;\n    }\n    this._rescaleImage(imgSpec, width, height);\n    const img = imgSpec.actual!;\n    const { width: sourceWidth, height: sourceHeight } = imgSpec.actualCellSize;\n    const cols = Math.ceil(img.width / sourceWidth);\n    const sx = (tileId % cols) * sourceWidth;\n    const sy = Math.floor(tileId / cols) * sourceHeight;\n    const finalWidth = sourceWidth + sx > img.width ? img.width - sx : sourceWidth;\n    const finalHeight = sy + sourceHeight > img.height ? img.height - sy : sourceHeight;\n\n    const canvas = ImageRenderer.createCanvas(this.document, Math.ceil(finalWidth * width / sourceWidth), Math.ceil(finalHeight * height / sourceHeight));\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      ctx.drawImage(\n        img,\n        Math.floor(sx), Math.floor(sy), Math.floor(finalWidth), Math.floor(finalHeight),\n        0, 0, canvas.width, canvas.height\n      );\n      return canvas;\n    }\n  }\n\n  /**\n   * Draw a line with placeholder on the image layer canvas.\n   */\n  public drawPlaceholder(col: number, row: number, count: number = 1): void {\n    const ctx = this._layers.get('top');\n    if (ctx) {\n      const { width, height } = this.cellSize;\n\n      // Don't try to draw anything, if we cannot get valid renderer metrics.\n      if (width === -1 || height === -1) {\n        return;\n      }\n\n      if (!this._placeholder) {\n        this._createPlaceHolder(Math.max(height + 1, Constants.PLACEHOLDER_HEIGHT));\n      } else if (height >= this._placeholder!.height) {\n        this._createPlaceHolder(height + 1);\n      }\n      if (!this._placeholder) return;\n      ctx.drawImage(\n        this._placeholderBitmap ?? this._placeholder!,\n        col * width,\n        (row * height) % 2 ? 0 : 1,  // needs %2 offset correction\n        width * count,\n        height,\n        col * width,\n        row * height,\n        width * count,\n        height\n      );\n    }\n  }\n\n  /**\n   * Rescale image layer canvas if needed.\n   * Checked once from `ImageStorage.render`.\n   */\n  public rescaleCanvas(): void {\n    const w = this.dimensions?.css.canvas.width || 0;\n    const h = this.dimensions?.css.canvas.height || 0;\n    for (const ctx of this._layers.values()) {\n      if (ctx.canvas.width !== w || ctx.canvas.height !== h) {\n        ctx.canvas.width = w;\n        ctx.canvas.height = h;\n      }\n    }\n  }\n\n  /**\n   * Rescale image in storage if needed.\n   */\n  private _rescaleImage(spec: IImageSpec, currentWidth: number, currentHeight: number): void {\n    if (currentWidth === spec.actualCellSize.width && currentHeight === spec.actualCellSize.height) {\n      return;\n    }\n    const { width: originalWidth, height: originalHeight } = spec.origCellSize;\n    if (currentWidth === originalWidth && currentHeight === originalHeight) {\n      spec.actual = spec.orig;\n      spec.actualCellSize.width = originalWidth;\n      spec.actualCellSize.height = originalHeight;\n      return;\n    }\n    const scaledWidth = Math.ceil(spec.orig!.width * currentWidth / originalWidth);\n    const scaledHeight = Math.ceil(spec.orig!.height * currentHeight / originalHeight);\n    // Upscale visible tiles directly; a full zoomed copy can dwarf the image budget.\n    if (scaledWidth * scaledHeight > spec.orig!.width * spec.orig!.height) {\n      spec.actual = spec.orig;\n      spec.actualCellSize.width = originalWidth;\n      spec.actualCellSize.height = originalHeight;\n      return;\n    }\n    const canvas = ImageRenderer.createCanvas(this.document, scaledWidth, scaledHeight);\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      ctx.drawImage(spec.orig!, 0, 0, canvas.width, canvas.height);\n      spec.actual = canvas;\n      spec.actualCellSize.width = currentWidth;\n      spec.actualCellSize.height = currentHeight;\n    }\n  }\n\n  /**\n   * Lazy init for the renderer.\n   */\n  private _open(): void {\n    this._renderService = this._terminal._core._renderService;\n    this._oldSetRenderer = this._renderService.setRenderer.bind(this._renderService);\n    this._renderService.setRenderer = (renderer: any) => {\n      for (const key of [...this._layers.keys()]) {\n        this.removeLayerFromDom(key);\n      }\n      this._oldSetRenderer?.call(this._renderService, renderer);\n    };\n  }\n\n  public insertLayerToDom(layer: ImageLayer = 'top'): void {\n    // make sure that the terminal is attached to a document and to DOM\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(layer)) {\n      return;\n    }\n    const canvas = ImageRenderer.createCanvas(\n      this.document, this.dimensions?.css.canvas.width || 0,\n      this.dimensions?.css.canvas.height || 0\n    );\n    canvas.classList.add(`xterm-image-layer-${layer}`);\n    const screenElement = this._terminal._core.screenElement;\n    // Use isolation to create a stacking context without overriding z-index,\n    // which would conflict with integrators (e.g. VS Code) that set their\n    // own z-index on the screen element.\n    screenElement.style.isolation = 'isolate';\n    if (layer === 'bottom') {\n      // Use z-index:-1 so it paints behind non-positioned text elements.\n      // The screen element needs to be a stacking context (via isolation)\n      // to contain the negative z-index, otherwise it would go behind the\n      // entire terminal.\n      canvas.style.zIndex = '-1';\n      screenElement.insertBefore(canvas, screenElement.firstChild);\n    } else {\n      // Explicit z-index ensures the image canvas reliably stacks above\n      // the text layer (DOM renderer rows). z-index: 0 is below the\n      // selection overlay (z-index: 1).\n      canvas.style.zIndex = '0';\n      screenElement.appendChild(canvas);\n    }\n    const ctx = canvas.getContext('2d', { alpha: true });\n    if (!ctx) {\n      canvas.remove();\n      return;\n    }\n    this._layers.set(layer, ctx);\n    this.clearAll(layer);\n  }\n\n  public removeLayerFromDom(layer: ImageLayer = 'top'): void {\n    const ctx = this._layers.get(layer);\n    if (ctx) {\n      ctx.canvas.remove();\n      this._layers.delete(layer);\n    }\n  }\n\n  public hasLayer(layer: ImageLayer): boolean {\n    return this._layers.has(layer);\n  }\n\n  private _createPlaceHolder(height: number = Constants.PLACEHOLDER_HEIGHT): void {\n    this._placeholderBitmap?.close();\n    this._placeholderBitmap = undefined;\n\n    // create blueprint to fill placeholder with\n    const bWidth = 32;  // must be 2^n\n    const blueprint = ImageRenderer.createCanvas(this.document, bWidth, height);\n    const ctx = blueprint.getContext('2d', { alpha: false });\n    if (!ctx) return;\n    const imgData = ImageRenderer.createImageData(ctx, bWidth, height);\n    const d32 = new Uint32Array(imgData.data.buffer);\n    const black = toRGBA8888(0, 0, 0);\n    const white = toRGBA8888(255, 255, 255);\n    d32.fill(black);\n    for (let y = 0; y < height; ++y) {\n      const shift = y % 2;\n      const offset = y * bWidth;\n      for (let x = 0; x < bWidth; x += 2) {\n        d32[offset + x + shift] = white;\n      }\n    }\n    ctx.putImageData(imgData, 0, 0);\n\n    // create placeholder line, width aligned to blueprint width\n    const width = (screen.width + bWidth - 1) & ~(bWidth - 1) || Constants.PLACEHOLDER_LENGTH;\n    this._placeholder = ImageRenderer.createCanvas(this.document, width, height);\n    const ctx2 = this._placeholder.getContext('2d', { alpha: false });\n    if (!ctx2) {\n      this._placeholder = undefined;\n      return;\n    }\n    for (let i = 0; i < width; i += bWidth) {\n      ctx2.drawImage(blueprint, i, 0);\n    }\n    const placeholder = this._placeholder;\n    ImageRenderer.createImageBitmap(placeholder).then(bitmap => {\n      if (this._placeholder !== placeholder) bitmap?.close();\n      else this._placeholderBitmap = bitmap;\n    }).catch(() => {});\n  }\n\n  public get document(): Document | undefined {\n    return this._terminal._core._coreBrowserService?.window.document;\n  }\n}\n","/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { ImageRenderer } from './ImageRenderer';\nimport {\n  ITerminalExt, IExtendedAttrsImage, IImageAddonOptions, IImageSpec,\n  IBufferLineExt, BgFlags, Cell, Content, ICellSize, ExtFlags, Attributes,\n  UnderlineStyle, IAddImageOpts\n} from './Types';\n\n\n// fallback default cell size\nexport const CELL_SIZE_DEFAULT: ICellSize = {\n  width: 7,\n  height: 14\n};\n\n/**\n * Extend extended attribute to also hold image tile information.\n *\n * Object definition is copied from base repo to fully mimick its behavior.\n * Image data is added as additional public properties `imageId` and `tileId`.\n */\nclass ExtendedAttrsImage implements IExtendedAttrsImage {\n  private _ext: number = 0;\n  public get ext(): number {\n    if (this._urlId) {\n      return (\n        (this._ext & ~ExtFlags.UNDERLINE_STYLE) |\n        (this.underlineStyle << 26)\n      );\n    }\n    return this._ext;\n  }\n  public set ext(value: number) { this._ext = value; }\n\n  public get underlineStyle(): UnderlineStyle {\n    // Always return the URL style if it has one\n    if (this._urlId) {\n      return UnderlineStyle.DASHED;\n    }\n    return (this._ext & ExtFlags.UNDERLINE_STYLE) >> 26;\n  }\n  public set underlineStyle(value: UnderlineStyle) {\n    this._ext &= ~ExtFlags.UNDERLINE_STYLE;\n    this._ext |= (value << 26) & ExtFlags.UNDERLINE_STYLE;\n  }\n\n  public get underlineColor(): number {\n    return this._ext & (Attributes.CM_MASK | Attributes.RGB_MASK);\n  }\n  public set underlineColor(value: number) {\n    this._ext &= ~(Attributes.CM_MASK | Attributes.RGB_MASK);\n    this._ext |= value & (Attributes.CM_MASK | Attributes.RGB_MASK);\n  }\n\n  public get underlineVariantOffset(): number {\n    const val = (this._ext & ExtFlags.VARIANT_OFFSET) >> 29;\n    if (val < 0) {\n      return val ^ 0xFFFFFFF8;\n    }\n    return val;\n  }\n  public set underlineVariantOffset(value: number) {\n    this._ext &= ~ExtFlags.VARIANT_OFFSET;\n    this._ext |= (value << 29) & ExtFlags.VARIANT_OFFSET;\n  }\n\n  private _urlId: number = 0;\n  public get urlId(): number {\n    return this._urlId;\n  }\n  public set urlId(value: number) {\n    this._urlId = value;\n  }\n\n  constructor(\n    ext: number = 0,\n    urlId: number = 0,\n    public imageId = -1,\n    public tileId = -1\n  ) {\n    this._ext = ext;\n    this._urlId = urlId;\n  }\n\n  public clone(): IExtendedAttrsImage {\n    /**\n     * Technically we dont need a clone variant of ExtendedAttrsImage,\n     * as we never clone a cell holding image data.\n     * Note: Clone is only meant to be used by the InputHandler for\n     * sticky attributes, which is never the case for image data.\n     * We still provide a proper clone method to reflect the full ext attr\n     * state in case there are future use cases for clone.\n     */\n    return new ExtendedAttrsImage(this._ext, this._urlId, this.imageId, this.tileId);\n  }\n\n  public isEmpty(): boolean {\n    return this.underlineStyle === UnderlineStyle.NONE && this._urlId === 0 && this.imageId === -1;\n  }\n}\nconst EMPTY_ATTRS = new ExtendedAttrsImage();\n\n\n/**\n * ImageStorage - extension of CoreTerminal:\n * - hold image data\n * - write/read image data to/from buffer\n *\n * TODO: image composition for overwrites\n */\nexport class ImageStorage implements IDisposable {\n  // storage\n  private _images: Map<number, IImageSpec> = new Map();\n  // last used id\n  private _lastId = 0;\n  // last evicted id\n  private _lowestId = 0;\n  // whether a full clear happened before\n  private _fullyCleared = false;\n  // whether render should do a full clear\n  private _needsFullClear = false;\n  // hard limit of stored pixels (fallback limit of 10 MB)\n  private _pixelLimit: number = 2500000;\n\n  private _viewportMetrics: { cols: number, rows: number };\n  public onImageAdded: (() => void) | undefined;\n  public onImageDeleted: ((storageId: number) => void) | undefined;\n\n  constructor(\n    private _terminal: ITerminalExt,\n    private _renderer: ImageRenderer,\n    private _opts: IImageAddonOptions\n  ) {\n    try {\n      this.setLimit(this._opts.storageLimit);\n    } catch (e: unknown) {\n      if (e instanceof Error) {\n        console.error(e.message);\n      }\n      console.warn(`storageLimit is set to ${this.getLimit()} MB`);\n    }\n    this._viewportMetrics = {\n      cols: this._terminal.cols,\n      rows: this._terminal.rows\n    };\n  }\n\n  public dispose(): void {\n    this.reset();\n  }\n\n  public reset(): void {\n    for (const spec of this._images.values()) {\n      spec.marker?.dispose();\n    }\n    // NOTE: marker.dispose above already calls ImageBitmap.close\n    // therefore we can just wipe the map here\n    this._images.clear();\n    this._renderer.clearAll();\n  }\n\n  public getLimit(): number {\n    return this._pixelLimit * 4 / 1000000;\n  }\n\n  public setLimit(value: number): void {\n    if (value < 0.5 || value > 1000) {\n      throw RangeError('invalid storageLimit, should be at least 0.5 MB and not exceed 1G');\n    }\n    this._pixelLimit = (value / 4 * 1000000) >>> 0;\n    this._evictOldest(0);\n  }\n\n  public getUsage(): number {\n    return this._getStoredPixels() * 4 / 1000000;\n  }\n\n  private _getStoredPixels(): number {\n    let storedPixels = 0;\n    for (const spec of this._images.values()) {\n      if (spec.orig) {\n        storedPixels += spec.orig.width * spec.orig.height;\n        if (spec.actual && spec.actual !== spec.orig) {\n          storedPixels += spec.actual.width * spec.actual.height;\n        }\n      }\n    }\n    return storedPixels;\n  }\n\n  private _delImg(id: number): void {\n    const spec = this._images.get(id);\n    if (!spec) return;\n    this._images.delete(id);\n    // FIXME: really ugly workaround to get bitmaps deallocated :(\n    if (window.ImageBitmap && spec.orig instanceof ImageBitmap) {\n      spec.orig.close();\n    }\n    this.onImageDeleted?.(id);\n  }\n\n  /**\n   * Wipe canvas and images on alternate buffer.\n   */\n  public wipeAlternate(): void {\n    // remove all alternate tagged images\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.bufferType === 'alternate') {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n    // mark canvas to be wiped on next render\n    this._needsFullClear = true;\n    this._fullyCleared = false;\n  }\n\n  /**\n   * Delete an image by its internal storage ID.\n   * Used by protocols that support explicit deletion (e.g. Kitty a=d).\n   */\n  public deleteImage(id: number): void {\n    const spec = this._images.get(id);\n    if (spec) {\n      spec.marker?.dispose();\n      this._delImg(id);\n    }\n  }\n\n  /**\n   * Method to add an image to the storage.\n   * @param img - The image to add (canvas or bitmap).\n   * @param opts - Options for addImage:\n   *   - scrolling:  When true, cursor advances with the image.\n   *                 When false, image is placed at ORIGIN and cursor does not move.\n   *   - layer:      Which canvas layer to render on ('top' or 'bottom').\n   *   - zIndex:     Z-index for image layering within the same layer.\n   *   - cursorPos:  'vt340' for bottom-left, 'iip' for bottom.right.\n   * @returns The internal image ID assigned to the stored image.\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap, opts: IAddImageOpts): number {\n    // never allow storage to exceed memory limit\n    this._evictOldest(img.width * img.height);\n\n    // calc rows x cols needed to display the image\n    let cellSize = this._renderer.cellSize;\n    if (cellSize.width === -1 || cellSize.height === -1) {\n      cellSize = CELL_SIZE_DEFAULT;\n    }\n    const cols = Math.ceil(img.width / cellSize.width);\n    const rows = Math.ceil(img.height / cellSize.height);\n\n    const imageId = ++this._lastId;\n\n    const buffer = this._terminal._core.buffer;\n    const termCols = this._terminal.cols;\n    const termRows = this._terminal.rows;\n    const originX = buffer.x;\n    const originY = buffer.y;\n    let offset = originX;\n    let tileCount = 0;\n\n    if (!opts.scrolling) {\n      buffer.x = 0;\n      buffer.y = 0;\n      offset = 0;\n    }\n\n    this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);\n    for (let row = 0; row < rows; ++row) {\n      const line = buffer.lines.get(buffer.y + buffer.ybase);\n      for (let col = 0; col < cols; ++col) {\n        if (offset + col >= termCols) break;\n        this._writeToCell(line as IBufferLineExt, offset + col, imageId, row * cols + col);\n        tileCount++;\n      }\n      if (opts.scrolling) {\n        if (row < rows - 1) this._terminal._core._inputHandler.lineFeed();\n      } else {\n        if (++buffer.y >= termRows) break;\n      }\n      buffer.x = offset;\n    }\n    this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);\n\n    // cursor positioning modes\n    if (opts.scrolling) {\n      if (opts.cursorPos === 'iip') {\n        buffer.x = Math.min(offset + cols, termCols);\n      } else {\n        buffer.x = offset;\n      }\n    } else {\n      buffer.x = originX;\n      buffer.y = originY;\n    }\n\n    // deleted images with zero tile count\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.tileCount < 1) {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n\n    // eviction marker:\n    // delete the image when the marker gets disposed\n    const endMarker = this._terminal.registerMarker(0);\n    endMarker?.onDispose(() => {\n      const spec = this._images.get(imageId);\n      if (spec) {\n        this._delImg(imageId);\n      }\n    });\n\n    // since markers do not work on alternate for some reason,\n    // we evict images here manually\n    if (this._terminal.buffer.active.type === 'alternate') {\n      this._evictOnAlternate();\n    }\n\n    // create storage entry\n    const imgSpec: IImageSpec = {\n      orig: img,\n      origCellSize: cellSize,\n      actual: img,\n      actualCellSize: { ...cellSize },  // clone needed, since later modified\n      marker: endMarker || undefined,\n      tileCount,\n      bufferType: this._terminal.buffer.active.type,\n      layer: opts.layer,\n      zIndex: opts.zIndex\n    };\n\n    // finally add the image\n    this._images.set(imageId, imgSpec);\n    this.onImageAdded?.();\n    return imageId;\n  }\n\n\n  /**\n   * Render method. Collects buffer information and triggers\n   * canvas updates.\n   */\n  // TODO: Should we move this to the ImageRenderer?\n  public render(range: { start: number, end: number }): void {\n    // Determine which layers have images\n    let hasTopImages = false;\n    let hasBottomImages = false;\n    for (const spec of this._images.values()) {\n      if (spec.layer === 'bottom') {\n        hasBottomImages = true;\n      } else {\n        hasTopImages = true;\n      }\n      if (hasTopImages && hasBottomImages) break;\n    }\n\n    // Lazily insert layers that are needed\n    if (hasTopImages && !this._renderer.hasLayer('top')) {\n      this._renderer.insertLayerToDom('top');\n      if (!this._renderer.hasLayer('top')) return;\n    }\n    if (hasBottomImages && !this._renderer.hasLayer('bottom')) {\n      this._renderer.insertLayerToDom('bottom');\n    }\n\n    // rescale if needed\n    this._renderer.rescaleCanvas();\n\n    // exit early if we dont have any images to test for\n    if (!this._images.size) {\n      if (!this._fullyCleared) {\n        this._renderer.clearAll();\n        this._fullyCleared = true;\n        this._needsFullClear = false;\n      }\n      if (this._renderer.hasLayer('top')) {\n        this._renderer.removeLayerFromDom('top');\n      }\n      if (this._renderer.hasLayer('bottom')) {\n        this._renderer.removeLayerFromDom('bottom');\n      }\n      return;\n    }\n\n    // Remove layers no longer needed\n    if (!hasTopImages && this._renderer.hasLayer('top')) {\n      this._renderer.clearAll('top');\n      this._renderer.removeLayerFromDom('top');\n    }\n    if (!hasBottomImages && this._renderer.hasLayer('bottom')) {\n      this._renderer.clearAll('bottom');\n      this._renderer.removeLayerFromDom('bottom');\n    }\n\n    // buffer switches force a full clear\n    if (this._needsFullClear) {\n      this._renderer.clearAll();\n      this._fullyCleared = true;\n      this._needsFullClear = false;\n    }\n\n    const { start, end } = range;\n    const buffer = this._terminal._core.buffer;\n    const cols = this._terminal._core.cols;\n\n    // clear drawing area\n    this._renderer.clearLines(start, end);\n\n    // Collect draw calls so we can sort by z-index (lower z drawn first).\n    const drawCalls: { imgSpec: IImageSpec, tileId: number, col: number, row: number, count: number }[] = [];\n    const placeholderCalls: { col: number, row: number, count: number }[] = [];\n\n    // walk all cells in viewport and collect tiles found\n    for (let row = start; row <= end; ++row) {\n      const line = buffer.lines.get(row + buffer.ydisp) as IBufferLineExt;\n      if (!line) return;\n      for (let col = 0; col < cols; ++col) {\n        if (line.getBg(col) & BgFlags.HAS_EXTENDED) {\n          let e: IExtendedAttrsImage = line._extendedAttrs[col] ?? EMPTY_ATTRS;\n          const imageId = e.imageId;\n          if (imageId === undefined || imageId === -1) {\n            continue;\n          }\n          const imgSpec = this._images.get(imageId);\n          if (e.tileId !== -1) {\n            const startTile = e.tileId;\n            const startCol = col;\n            let count = 1;\n            /**\n             * merge tiles to the right into a single draw call, if:\n             * - not at end of line\n             * - cell has same image id\n             * - cell has consecutive tile id\n             */\n            while (\n              ++col < cols\n              && (line.getBg(col) & BgFlags.HAS_EXTENDED)\n              && (e = line._extendedAttrs[col] ?? EMPTY_ATTRS)\n              && (e.imageId === imageId)\n              && (e.tileId === startTile + count)\n            ) {\n              count++;\n            }\n            col--;\n            if (imgSpec) {\n              if (imgSpec.actual) {\n                drawCalls.push({ imgSpec, tileId: startTile, col: startCol, row, count });\n              }\n            } else if (this._opts.showPlaceholder) {\n              placeholderCalls.push({ col: startCol, row, count });\n            }\n            this._fullyCleared = false;\n          }\n        }\n      }\n    }\n\n    // Sort by z-index so lower z draws first (higher z renders on top)\n    drawCalls.sort((a, b) => a.imgSpec.zIndex - b.imgSpec.zIndex);\n\n    // Draw placeholders first (lowest priority)\n    for (const call of placeholderCalls) {\n      this._renderer.drawPlaceholder(call.col, call.row, call.count);\n    }\n\n    // Draw images in z-index order\n    for (const call of drawCalls) {\n      this._renderer.draw(call.imgSpec, call.tileId, call.col, call.row, call.count);\n    }\n  }\n\n  public viewportResize(metrics: { cols: number, rows: number }): void {\n    // exit early if we have nothing in storage\n    if (!this._images.size) {\n      this._viewportMetrics = metrics;\n      return;\n    }\n\n    // handle only viewport width enlargements, exit all other cases\n    // TODO: needs patch for tile counter\n    if (this._viewportMetrics.cols >= metrics.cols) {\n      this._viewportMetrics = metrics;\n      return;\n    }\n\n    // walk scrollbuffer at old col width to find all possible expansion matches\n    const buffer = this._terminal._core.buffer;\n    const rows = buffer.lines.length;\n    const oldCol = this._viewportMetrics.cols - 1;\n    for (let row = 0; row < rows; ++row) {\n      const line = buffer.lines.get(row) as IBufferLineExt;\n      if (line.getBg(oldCol) & BgFlags.HAS_EXTENDED) {\n        const e: IExtendedAttrsImage = line._extendedAttrs[oldCol] ?? EMPTY_ATTRS;\n        const imageId = e.imageId;\n        if (imageId === undefined || imageId === -1) {\n          continue;\n        }\n        const imgSpec = this._images.get(imageId);\n        if (!imgSpec) {\n          continue;\n        }\n        // found an image tile at oldCol, check if it qualifies for right exapansion\n        const tilesPerRow = Math.ceil((imgSpec.actual?.width || 0) / imgSpec.actualCellSize.width);\n        if ((e.tileId % tilesPerRow) + 1 >= tilesPerRow) {\n          continue;\n        }\n        // expand only if right side is empty (nothing got wrapped from below)\n        let hasData = false;\n        for (let rightCol = oldCol + 1; rightCol > metrics.cols; ++rightCol) {\n          if (line._data[rightCol * Cell.SIZE + Cell.CONTENT] & Content.HAS_CONTENT_MASK) {\n            hasData = true;\n            break;\n          }\n        }\n        if (hasData) {\n          continue;\n        }\n        // do right expansion on terminal buffer\n        const end = Math.min(metrics.cols, tilesPerRow - (e.tileId % tilesPerRow) + oldCol);\n        let lastTile = e.tileId;\n        for (let expandCol = oldCol + 1; expandCol < end; ++expandCol) {\n          this._writeToCell(line as IBufferLineExt, expandCol, imageId, ++lastTile);\n          imgSpec.tileCount++;\n        }\n      }\n    }\n    // store new viewport metrics\n    this._viewportMetrics = metrics;\n  }\n\n  /**\n   * Retrieve original canvas at buffer position.\n   */\n  public getImageAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    const buffer = this._terminal._core.buffer;\n    const line = buffer.lines.get(y) as IBufferLineExt;\n    if (line && line.getBg(x) & BgFlags.HAS_EXTENDED) {\n      const e: IExtendedAttrsImage = line._extendedAttrs[x] ?? EMPTY_ATTRS;\n      if (e.imageId && e.imageId !== -1) {\n        const orig = this._images.get(e.imageId)?.orig;\n        if (window.ImageBitmap && orig instanceof ImageBitmap) {\n          const canvas = ImageRenderer.createCanvas(window.document, orig.width, orig.height);\n          canvas.getContext('2d')?.drawImage(orig, 0, 0, orig.width, orig.height);\n          return canvas;\n        }\n        return orig as HTMLCanvasElement;\n      }\n    }\n  }\n\n  /**\n   * Extract active single tile at buffer position.\n   */\n  public extractTileAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    const buffer = this._terminal._core.buffer;\n    const line = buffer.lines.get(y) as IBufferLineExt;\n    if (line && line.getBg(x) & BgFlags.HAS_EXTENDED) {\n      const e: IExtendedAttrsImage = line._extendedAttrs[x] ?? EMPTY_ATTRS;\n      if (e.imageId && e.imageId !== -1 && e.tileId !== -1) {\n        const spec = this._images.get(e.imageId);\n        if (spec) {\n          return this._renderer.extractTile(spec, e.tileId);\n        }\n      }\n    }\n  }\n\n  // TODO: Do we need some blob offloading tricks here to avoid early eviction?\n  // also see https://stackoverflow.com/questions/28307789/is-there-any-limitation-on-javascript-max-blob-size\n  private _evictOldest(room: number): number {\n    const used = this._getStoredPixels();\n    let current = used;\n    while (this._pixelLimit < current + room && this._images.size) {\n      const spec = this._images.get(++this._lowestId);\n      if (spec && spec.orig) {\n        current -= spec.orig.width * spec.orig.height;\n        if (spec.actual && spec.orig !== spec.actual) {\n          current -= spec.actual.width * spec.actual.height;\n        }\n        spec.marker?.dispose();\n        this._delImg(this._lowestId);\n      }\n    }\n    return used - current;\n  }\n\n  private _writeToCell(line: IBufferLineExt, x: number, imageId: number, tileId: number): void {\n    if (line._data[x * Cell.SIZE + Cell.BG] & BgFlags.HAS_EXTENDED) {\n      const old = line._extendedAttrs[x];\n      if (old) {\n        if (old.imageId !== undefined) {\n          // found an old ExtendedAttrsImage, since we know that\n          // they are always isolated instances (single cell usage),\n          // we can re-use it and just update their id entries\n          const oldSpec = this._images.get(old.imageId);\n          if (oldSpec) {\n            // early eviction for in-viewport overwrites\n            oldSpec.tileCount--;\n          }\n          old.imageId = imageId;\n          old.tileId = tileId;\n          return;\n        }\n        // found a plain ExtendedAttrs instance, clone it to new entry\n        line._extendedAttrs[x] = new ExtendedAttrsImage(old.ext, old.urlId, imageId, tileId);\n        return;\n      }\n    }\n    // fall-through: always create new ExtendedAttrsImage entry\n    line._data[x * Cell.SIZE + Cell.BG] |= BgFlags.HAS_EXTENDED;\n    line._extendedAttrs[x] = new ExtendedAttrsImage(0, 0, imageId, tileId);\n  }\n\n  private _evictOnAlternate(): void {\n    // nullify tile count of all images on alternate buffer\n    for (const spec of this._images.values()) {\n      if (spec.bufferType === 'alternate') {\n        spec.tileCount = 0;\n      }\n    }\n    // re-count tiles on whole buffer\n    const buffer = this._terminal._core.buffer;\n    for (let y = 0; y < this._terminal.rows; ++y) {\n      const line = buffer.lines.get(y) as IBufferLineExt;\n      if (!line) {\n        continue;\n      }\n      for (let x = 0; x < this._terminal.cols; ++x) {\n        if (line._data[x * Cell.SIZE + Cell.BG] & BgFlags.HAS_EXTENDED) {\n          const imgId = line._extendedAttrs[x]?.imageId;\n          if (imgId) {\n            const spec = this._images.get(imgId);\n            if (spec) {\n              spec.tileCount++;\n            }\n          }\n        }\n      }\n    }\n    // deleted images with zero tile count\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.bufferType === 'alternate' && !spec.tileCount) {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n  }\n}\n","/**\n * Copyright (c) 2020, 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { SixelImageStorage } from './SixelImageStorage';\nimport { IDcsHandler, IParams, IImageAddonOptions, ITerminalExt, AttributeData, IResetHandler, ReadonlyColorSet } from './Types';\nimport { toRGBA8888, BIG_ENDIAN, PALETTE_ANSI_256, PALETTE_VT340_COLOR } from 'sixel/lib/Colors';\nimport { RGBA8888 } from 'sixel/lib/Types';\nimport { ImageRenderer } from './ImageRenderer';\n\nimport { DecoderAsync, Decoder } from 'sixel/lib/Decoder';\nimport { LIMITS } from 'sixel/lib/wasm';\n\n// always free decoder ressources after decoding if it exceeds this limit\nconst MEM_PERMA_LIMIT = 4194304; // 1024 pixels * 1024 pixels * 4 channels = 4MB\n\n// custom default palette: VT340 (lower 16 colors) + ANSI256 (up to 256) + zeroed (up to 4096)\nconst DEFAULT_PALETTE = PALETTE_ANSI_256;\nDEFAULT_PALETTE.set(PALETTE_VT340_COLOR);\n\n// Why pooled: every decoder owns a wasm memory, and V8 caps live wasm memories\n// per process (~124 in a sandboxed renderer). Terminals borrow a decoder only\n// while a SIXEL sequence is open, so idle terminals hold none.\nconst MAX_IDLE_DECODERS = 2;\nconst idleDecoders = new Map<number, Decoder[]>();\nlet poolPrimed = false;\n\nfunction primeDecoderPool(memoryLimit: number): void {\n  if (poolPrimed) return;\n  poolPrimed = true;\n  // Async compile once, off the parser's hot path; later decoders reuse the cached module.\n  DecoderAsync({ memoryLimit, palette: DEFAULT_PALETTE }).then(\n    d => releaseDecoder(d, memoryLimit),\n    () => { poolPrimed = false; }\n  );\n}\n\nfunction acquireDecoder(memoryLimit: number): Decoder {\n  return idleDecoders.get(memoryLimit)?.pop() ?? new Decoder({ memoryLimit, palette: DEFAULT_PALETTE });\n}\n\nfunction releaseDecoder(dec: Decoder, memoryLimit: number): void {\n  if (dec.memoryUsage > MEM_PERMA_LIMIT) {\n    dec.release();\n  }\n  const idle = idleDecoders.get(memoryLimit) ?? [];\n  if (idle.length < MAX_IDLE_DECODERS) {\n    idle.push(dec);\n    idleDecoders.set(memoryLimit, idle);\n  }\n}\n\n\nexport class SixelHandler implements IDcsHandler, IResetHandler {\n  private _size = 0;\n  private _aborted = false;\n  private _dec: Decoder | undefined;\n  private _decMemoryLimit = 0;\n  // Color registers outlive a single image, so they live here rather than in a pooled decoder.\n  private readonly _palette = new Uint32Array(LIMITS.PALETTE_SIZE);\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _storage: SixelImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    this._palette.set(DEFAULT_PALETTE);\n    primeDecoderPool(this._opts.pixelLimit * 4);\n  }\n\n  public reset(): void {\n    this._returnDecoder();\n    this._palette.fill(0);\n    this._palette.set(DEFAULT_PALETTE);\n  }\n\n  public hook(params: IParams): void {\n    this._size = 0;\n    this._aborted = false;\n    this._returnDecoder();\n    const memoryLimit = this._opts.pixelLimit * 4;\n    try {\n      this._dec = acquireDecoder(memoryLimit);\n    } catch (e) {\n      // Why: exhausting wasm memory must drop this image, not throw out of the parser and wedge the write queue.\n      console.warn(`SIXEL: could not allocate decoder - ${e}`);\n      this._aborted = true;\n      return;\n    }\n    this._decMemoryLimit = memoryLimit;\n    const fillColor = params.params[1] === 1 ? 0 : extractActiveBg(\n      this._coreTerminal._core._inputHandler._curAttrData,\n      this._coreTerminal._core._themeService?.colors);\n    this._dec.init(fillColor, this._palette, this._opts.sixelPaletteLimit);\n  }\n\n  private _returnDecoder(): void {\n    const dec = this._dec;\n    if (!dec) return;\n    this._dec = undefined;\n    this._palette.set(dec.palette);\n    releaseDecoder(dec, this._decMemoryLimit);\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted || !this._dec) {\n      return;\n    }\n    this._size += end - start;\n    if (this._size > this._opts.sixelSizeLimit) {\n      console.warn(`SIXEL: too much data, aborting`);\n      this._aborted = true;\n      this._dec.release();\n      return;\n    }\n    try {\n      this._dec.decode(data, start, end);\n    } catch (e) {\n      console.warn(`SIXEL: error while decoding image - ${e}`);\n      this._aborted = true;\n      this._dec.release();\n    }\n  }\n\n  public unhook(success: boolean): boolean | Promise<boolean> {\n    try {\n      return this._unhook(success);\n    } finally {\n      this._returnDecoder();\n    }\n  }\n\n  private _unhook(success: boolean): boolean {\n    if (this._aborted || !success || !this._dec) {\n      return true;\n    }\n\n    const width = this._dec.width;\n    const height = this._dec.height;\n\n    // partial fix for https://github.com/jerch/xterm-addon-image/issues/37\n    if (!width || !height) {\n      if (height) {\n        this._storage.advanceCursor(height);\n      }\n      return true;\n    }\n\n    const canvas = ImageRenderer.createCanvas(undefined, width, height);\n    canvas.getContext('2d')?.putImageData(new ImageData(this._dec.data8 as Uint8ClampedArray<ArrayBuffer>, width, height), 0, 0);\n    this._storage.addImage(canvas);\n    return true;\n  }\n}\n\n\n/**\n * Some helpers to extract current terminal colors.\n */\n\n// get currently active background color from terminal\n// also respect INVERSE setting\nfunction extractActiveBg(attr: AttributeData, colors: ReadonlyColorSet | undefined): RGBA8888 {\n  let bg = 0;\n  if (!colors) {\n    // FIXME: theme service is prolly not available yet,\n    // happens if .open() was not called yet (bug in core?)\n    return bg;\n  }\n  if (attr.isInverse()) {\n    if (attr.isFgDefault()) {\n      bg = convertLe(colors.foreground.rgba);\n    } else if (attr.isFgRGB()) {\n      const t = (attr.constructor as typeof AttributeData).toColorRGB(attr.getFgColor());\n      bg = toRGBA8888(...t);\n    } else {\n      bg = convertLe(colors.ansi[attr.getFgColor()].rgba);\n    }\n  } else {\n    if (attr.isBgDefault()) {\n      bg = convertLe(colors.background.rgba);\n    } else if (attr.isBgRGB()) {\n      const t = (attr.constructor as typeof AttributeData).toColorRGB(attr.getBgColor());\n      bg = toRGBA8888(...t);\n    } else {\n      bg = convertLe(colors.ansi[attr.getBgColor()].rgba);\n    }\n  }\n  return bg;\n}\n\n// rgba values on the color managers are always in BE, thus convert to LE\nfunction convertLe(color: number): RGBA8888 {\n  if (BIG_ENDIAN) return color;\n  return (color & 0xFF) << 24 | (color >>> 8 & 0xFF) << 16 | (color >>> 16 & 0xFF) << 8 | color >>> 24 & 0xFF;\n}\n","/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';\nimport { IImageAddonOptions, ITerminalExt, IAddImageOpts } from './Types';\nimport { ImageRenderer } from './ImageRenderer';\n\n/**\n * Sixel-specific image storage controller.\n *\n * Wraps the shared ImageStorage with sixel protocol semantics:\n * - Cursor behavior governed by DECSET 80 (sixelScrolling option)\n * - advanceCursor for empty sixels carrying only height\n */\nexport class SixelImageStorage {\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'vt340' };\n  constructor(\n    private readonly _storage: ImageStorage,\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _terminal: ITerminalExt\n  ) {}\n\n  /**\n   * Add a sixel image to storage.\n   * Cursor behavior depends on the sixelScrolling option (DECSET 80).\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap): void {\n    this._addImageOpts.scrolling = this._opts.sixelScrolling;\n    this._storage.addImage(img, this._addImageOpts);\n  }\n\n  /**\n   * Only advance text cursor.\n   * This is an edge case from empty sixels carrying only a height but no pixels.\n   * Partially fixes https://github.com/jerch/xterm-addon-image/issues/37.\n   */\n  public advanceCursor(height: number): void {\n    if (this._opts.sixelScrolling) {\n      let cellSize = this._renderer.cellSize;\n      if (cellSize.width === -1 || cellSize.height === -1) {\n        cellSize = CELL_SIZE_DEFAULT;\n      }\n      const rows = Math.ceil(height / cellSize.height);\n      for (let i = 1; i < rows; ++i) {\n        this._terminal._core._inputHandler.lineFeed();\n      }\n    }\n  }\n}\n","/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { IApcHandler, IImageAddonOptions, IResetHandler, ITerminalExt, ImageLayer } from '../Types';\nimport { ImageRenderer } from '../ImageRenderer';\nimport { CELL_SIZE_DEFAULT } from '../ImageStorage';\nimport { imageType } from '../IIPMetrics';\nimport { KittyImageStorage } from './KittyImageStorage';\nimport Base64Decoder, { type DecodeStatus } from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\nimport {\n  KittyAction,\n  KittyFormat,\n  KittyCompression,\n  IKittyCommand,\n  IPendingTransmission,\n  IKittyImageData,\n  KittyPixelConstants,\n  parseKittyCommand\n} from './KittyGraphicsTypes';\n\nconst enum Constants {\n  // Memory limit for base64 decoder (4MB, same as IIPHandler)\n  DECODER_KEEP_DATA = 4194304,\n  DECODER_INITIAL_DATA = 4194304, // 4MB\n  // Local mirror of const enum (esbuild can't inline const enums from external packages)\n  DECODER_OK = 0,\n  // Maximum control data size\n  MAX_CONTROL_DATA_SIZE = 512,\n  // Semicolon codepoint\n  SEMICOLON = 0x3B\n}\n\nconst DECODER_OK = Constants.DECODER_OK as unknown as DecodeStatus.OK;\n\n// Kitty graphics protocol handler with streaming base64 decoding.\nexport class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDisposable {\n  private _aborted = false;\n  private _generation = 0;\n  private _decodeError = false;\n\n  private _activeDecoder: Base64Decoder | null = null;\n  private readonly _maxEncodedBytes: number;\n  private readonly _initialEncodedBytes: number;\n\n  // Streaming related states\n\n  // True while receiving control data (before semicolon).\n  private _inControlData = true;\n\n  // Buffer for control data.\n  private _controlData = new Uint32Array(Constants.MAX_CONTROL_DATA_SIZE);\n  private _controlLength = 0;\n\n  // Pre-calculated encoded size limit\n  private _encodedSizeLimit = 0;\n  private _totalEncodedSize = 0;\n\n  // Parsed command. These are the control data before semicolon.\n  private _parsedCommand: IKittyCommand | null = null;\n\n  // Storage related states\n\n  private _pendingTransmissions: Map<number, IPendingTransmission> = new Map();\n  // Tracks the pending key of the most recently started chunked upload.\n  // Per spec, subsequent chunks only need m= (and optionally q=), without i=.\n  // When a chunk arrives with no i=, this key is used to find the pending upload.\n  private _lastPendingKey: number | undefined;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _kittyStorage: KittyImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    // Convert decoded size limit -> max encoded bytes.\n    this._maxEncodedBytes = Math.ceil(this._opts.kittySizeLimit * 4 / 3);\n    // ensure we preallocate more than configured limit while using 4mb initial size.\n    this._initialEncodedBytes = Math.min(Constants.DECODER_INITIAL_DATA, this._maxEncodedBytes);\n  }\n\n  public reset(): void {\n    this._generation++;\n    this._cleanupAllPending();\n    if (this._activeDecoder) {\n      this._activeDecoder.release();\n      this._activeDecoder = null;\n    }\n    this._kittyStorage.reset();\n  }\n\n  public dispose(): void {\n    this.reset();\n  }\n\n  private _removePendingEntry(key: number): void {\n    this._pendingTransmissions.delete(key);\n    if (this._lastPendingKey === key) {\n      this._lastPendingKey = undefined;\n    }\n  }\n\n  private _cleanupAllPending(): void {\n    for (const pending of this._pendingTransmissions.values()) {\n      pending.decoder.release();\n    }\n    this._pendingTransmissions.clear();\n    this._lastPendingKey = undefined;\n  }\n\n  public start(): void {\n    this._aborted = false;\n    this._decodeError = false;\n    this._inControlData = true;\n    this._controlLength = 0;\n    this._parsedCommand = null;\n    // Pre-calculate encoded limit once: base64 is 4 bytes encoded → 3 bytes decoded\n    this._encodedSizeLimit = this._maxEncodedBytes;\n    this._totalEncodedSize = 0;\n    this._activeDecoder = null;\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    if (!this._inControlData) {\n      this._streamPayload(data, start, end);\n    } else {\n      // Scan for semicolon\n      let controlEnd = end;\n      for (let i = start; i < end; i++) {\n        if (data[i] === Constants.SEMICOLON) {\n          this._inControlData = false;\n          controlEnd = i;\n          break;\n        }\n      }\n\n      // Copy control data\n      const copyLength = controlEnd - start;\n      if (this._controlLength + copyLength > Constants.MAX_CONTROL_DATA_SIZE) {\n        this._aborted = true;\n        return;\n      }\n      this._controlData.set(data.subarray(start, controlEnd), this._controlLength);\n      this._controlLength += copyLength;\n\n      if (!this._inControlData) {\n        // Found semicolon - parse control data early for validation\n        this._parsedCommand = parseKittyCommand(this._parseControlDataString());\n\n        // Early validation: i+I conflict\n        if (this._parsedCommand.id !== undefined && this._parsedCommand.imageNumber !== undefined) {\n          this._sendResponse(this._parsedCommand.id, 'EINVAL:cannot specify both i and I keys', this._parsedCommand.quiet ?? 0);\n          this._aborted = true;\n          return;\n        }\n\n        // Delete action doesn't need payload - skip streaming\n        if (this._parsedCommand.action === KittyAction.DELETE) {\n          return;\n        }\n\n        // Stream remaining as payload\n        const payloadStart = controlEnd + 1;\n        if (payloadStart < end) {\n          this._streamPayload(data, payloadStart, end);\n        }\n      }\n    }\n  }\n\n  // Stream payload bytes into the base64 decoder.\n  private _streamPayload(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    // Check size limit (compare encoded bytes against pre-calculated limit)\n    // Include cumulative size from pending transmission for multi-chunk images.\n    // Per spec, subsequent chunks may omit i=, so fall back to _lastPendingKey.\n    const pendingKey = this._parsedCommand?.id ?? this._lastPendingKey ?? 0;\n    const pending = this._pendingTransmissions.get(pendingKey);\n    const previousEncodedSize = pending?.totalEncodedSize ?? 0;\n    this._totalEncodedSize += end - start;\n    const cumulativeEncodedSize = previousEncodedSize + this._totalEncodedSize;\n    if (cumulativeEncodedSize > this._encodedSizeLimit) {\n      const decoderToRelease = this._activeDecoder ?? pending?.decoder;\n      if (decoderToRelease) {\n        decoderToRelease.release();\n      }\n      this._activeDecoder = null;\n      if (pending) {\n        this._removePendingEntry(pendingKey);\n      }\n      this._aborted = true;\n      return;\n    }\n\n    if (this._decodeError) return;\n\n    if (pending?.decoder && !this._activeDecoder) {\n      this._activeDecoder = pending.decoder;\n    }\n    if (!this._activeDecoder) {\n      // Budget WASM capacity, including one page of decoder state and rounding.\n      const decoderCapacity = this._maxEncodedBytes + 131072;\n      if (decoderCapacity > this._opts.storageLimit * 1000000) {\n        this._aborted = true;\n        if (this._parsedCommand?.id !== undefined) {\n          this._sendResponse(this._parsedCommand.id, 'ENOMEM:pending image budget exceeded', this._parsedCommand.quiet ?? 0);\n        }\n        return;\n      }\n      const maxPending = Math.max(1, Math.floor(this._opts.storageLimit * 1000000 / decoderCapacity));\n      while (this._pendingTransmissions.size >= maxPending) {\n        const oldest = this._pendingTransmissions.entries().next().value;\n        if (!oldest) break;\n        oldest[1].decoder.release();\n        this._removePendingEntry(oldest[0]);\n        if (oldest[1].cmd.id !== undefined) {\n          this._sendResponse(oldest[1].cmd.id, 'ENOMEM:pending image budget exceeded', oldest[1].cmd.quiet ?? 0);\n        }\n      }\n      const decoder = new Base64Decoder(Constants.DECODER_KEEP_DATA, this._maxEncodedBytes, this._initialEncodedBytes);\n      try {\n        decoder.init();\n      } catch (e) {\n        // Why: wasm memory exhaustion must drop this image, not throw out of the parser and wedge the write queue.\n        console.warn('KITTY: could not allocate decoder', e);\n        this._aborted = true;\n        if (this._parsedCommand?.id !== undefined) {\n          this._sendResponse(this._parsedCommand.id, 'ENOMEM:could not allocate decoder', this._parsedCommand.quiet ?? 0);\n        }\n        return;\n      }\n      this._activeDecoder = decoder;\n    }\n\n    if (this._activeDecoder.put(data.subarray(start, end)) !== DECODER_OK) {\n      this._activeDecoder.release();\n      this._activeDecoder = null;\n      this._decodeError = true;\n      if (pending) {\n        this._removePendingEntry(pendingKey);\n      }\n    }\n  }\n\n  public end(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted || !success) {\n      if (this._activeDecoder) {\n        this._activeDecoder.release();\n        this._activeDecoder = null;\n      }\n      return true;\n    }\n\n    // No semicolon = no payload (delete, capability query)\n    if (this._inControlData) {\n      return this._handleNoPayloadCommand();\n    }\n\n    // Use command parsed early in put() - i+I already validated there\n    const cmd = this._parsedCommand!;\n\n    // Delete action was handled by skipping payload - just execute\n    if (cmd.action === KittyAction.DELETE) {\n      return this._handleDelete(cmd);\n    }\n\n    // Per spec, subsequent chunks may omit i=, so fall back to _lastPendingKey.\n    const pendingKey = cmd.id ?? this._lastPendingKey ?? 0;\n    const isMoreComing = cmd.more === 1;\n    const pending = this._pendingTransmissions.get(pendingKey);\n\n    if (isMoreComing) {\n      if (this._activeDecoder) {\n        if (pending) {\n          pending.totalEncodedSize += this._totalEncodedSize;\n          pending.decodeError = pending.decodeError || this._decodeError;\n        } else {\n          this._pendingTransmissions.set(pendingKey, {\n            cmd: { ...cmd },\n            decoder: this._activeDecoder,\n            totalEncodedSize: this._totalEncodedSize,\n            decodeError: this._decodeError\n          });\n        }\n        this._lastPendingKey = pendingKey;\n        this._activeDecoder = null;\n      }\n      return true;\n    }\n\n    // Final chunk received — clear the last pending key\n    if (pending) {\n      this._lastPendingKey = undefined;\n    }\n\n    let decodeError = this._decodeError;\n    let finalCmd = cmd;\n    let decoder = this._activeDecoder;\n\n    if (pending) {\n      finalCmd = pending.cmd;\n      decoder = pending.decoder;\n      decodeError = decodeError || pending.decodeError;\n      this._pendingTransmissions.delete(pendingKey);\n    }\n\n    let imageBytes = new Uint8Array(0);\n    if (decoder) {\n      if (decoder.end() !== DECODER_OK) {\n        decodeError = true;\n      }\n      imageBytes = decoder.data8;\n    }\n    this._activeDecoder = null;\n\n    // Handle command first — handlers create Blob/ImageData from imageBytes,\n    // which copies the data. Only then is it safe to release the decoder's\n    // wasm memory that imageBytes points into.\n    const result = this._handleCommandWithBytesAndCmd(finalCmd, imageBytes, decodeError);\n    if (decoder) {\n      decoder.release();\n    }\n    return result;\n  }\n\n  // Command handling\n\n  private _parseControlDataString(): string {\n    let str = '';\n    for (let i = 0; i < this._controlLength; i++) {\n      str += String.fromCodePoint(this._controlData[i]);\n    }\n    return str;\n  }\n\n  private _handleNoPayloadCommand(): boolean | Promise<boolean> {\n    const cmd = parseKittyCommand(this._parseControlDataString());\n\n    // Per spec: specifying both i and I is an error\n    if (cmd.id !== undefined && cmd.imageNumber !== undefined) {\n      this._sendResponse(cmd.id, 'EINVAL:cannot specify both i and I keys', cmd.quiet ?? 0);\n      return true;\n    }\n\n    const action = cmd.action ?? 't';\n\n    switch (action) {\n      case KittyAction.DELETE:\n        return this._handleDelete(cmd);\n      case KittyAction.QUERY:\n        this._sendResponse(cmd.id ?? 0, 'OK', cmd.quiet ?? 0);\n        return true;\n      case KittyAction.PLACEMENT:\n        return this._handlePlacement(cmd);\n      default:\n        // TODO: Implement remaining actions when needed:\n        // - a=f (frame): animation frame operations\n        // - a=a (animation): animation control\n        // - a=c (compose): compose images\n        if (cmd.id !== undefined) {\n          this._sendResponse(cmd.id, 'EINVAL:unsupported action', cmd.quiet ?? 0);\n        }\n        return true;\n    }\n  }\n\n  private _handleCommandWithBytesAndCmd(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean | Promise<boolean> {\n    const action = cmd.action ?? 't';\n\n    switch (action) {\n      case KittyAction.TRANSMIT: {\n        const result = this._handleTransmit(cmd, bytes, decodeError);\n        // Only send response when _handleTransmit didn't already respond\n        // (it handles unsupported transmission medium responses internally)\n        if ((cmd.transmission ?? 'd') === 'd' && cmd.id !== undefined) {\n          if (decodeError) {\n            this._sendResponse(cmd.id, 'EINVAL:invalid base64 data', cmd.quiet ?? 0);\n          } else if (bytes.length > 0) {\n            this._sendResponse(cmd.id, 'OK', cmd.quiet ?? 0);\n          }\n        }\n        return result;\n      }\n      case KittyAction.TRANSMIT_DISPLAY:\n        return this._handleTransmitDisplay(cmd, bytes, decodeError);\n      case KittyAction.QUERY:\n        return this._handleQuery(cmd, bytes, decodeError);\n      case KittyAction.PLACEMENT:\n        // a=p ignores any payload — image data was already transmitted\n        return this._handlePlacement(cmd);\n      default:\n        // TODO: Implement remaining actions when needed:\n        // - a=f (frame): animation frame operations\n        // - a=a (animation): animation control\n        // - a=c (compose): compose images\n        if (cmd.id !== undefined) {\n          this._sendResponse(cmd.id, 'EINVAL:unsupported action', cmd.quiet ?? 0);\n        }\n        return true;\n    }\n  }\n\n  private _handlePlacement(cmd: IKittyCommand): boolean | Promise<boolean> {\n    if (cmd.id === undefined) {\n      return true;\n    }\n    const id = cmd.id;\n    const image = this._kittyStorage.getImage(id);\n    if (!image) {\n      this._sendResponse(id, 'ENOENT:image not found', cmd.quiet ?? 0, cmd.placementId);\n      return true;\n    }\n    const result = this._displayImage(image, cmd);\n    return result.then(success => {\n      this._sendResponse(id, success ? 'OK' : 'EINVAL:image rendering failed', cmd.quiet ?? 0, cmd.placementId);\n      return true;\n    });\n  }\n\n  private _handleTransmit(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean {\n    // TODO: Support file-based transmission modes (t=f, t=t, t=s)\n    // Currently only supports direct transmission (t=d, the default).\n    // - t=f (file): Payload is base64-encoded file path. Terminal reads image from that path.\n    // - t=t (temp file): Payload is base64-encoded path in temp directory. Terminal reads, deletes.\n    // - t=s: Payload is base64-encoded POSIX shm name. Terminal reads from shared memory.\n    // These modes require filesystem/IPC access not available in browsers. For Node.js/Electron:\n    // 1. Check cmd.transmission (t key) before treating bytes as image data\n    // 2. For t=f/t/s: decode bytes as UTF-8 string (the path/name), then read file contents\n    // 3. For t=d: treat bytes as image data (current behavior)\n    // When implementing, also update _handleQuery to accept these transmission mediums.\n    const transmission = cmd.transmission ?? 'd';\n    if (transmission !== 'd') {\n      if (cmd.id !== undefined) {\n        this._sendResponse(cmd.id, 'EINVAL:unsupported transmission medium', cmd.quiet ?? 0);\n      }\n      return true;\n    }\n\n    if (decodeError || bytes.length === 0) return true;\n\n    this._kittyStorage.storeImage(cmd.id, {\n      data: new Blob([bytes as BlobPart]),\n      width: cmd.width ?? 0,\n      height: cmd.height ?? 0,\n      format: (cmd.format ?? KittyFormat.RGBA) as 24 | 32 | 100,\n      compression: cmd.compression ?? ''\n    });\n    return true;\n  }\n\n  private _handleTransmitDisplay(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean | Promise<boolean> {\n    if (decodeError) {\n      if (cmd.id !== undefined) {\n        this._sendResponse(cmd.id, 'EINVAL:invalid base64 data', cmd.quiet ?? 0);\n      }\n      return true;\n    }\n\n    this._handleTransmit(cmd, bytes, decodeError);\n\n    const id = cmd.id ?? this._kittyStorage.lastImageId;\n    const image = this._kittyStorage.getImage(id);\n    if (image) {\n      const result = this._displayImage(image, cmd);\n      if (cmd.id !== undefined) {\n        return result.then(success => {\n          this._sendResponse(id, success ? 'OK' : 'EINVAL:image rendering failed', cmd.quiet ?? 0);\n          return true;\n        });\n      }\n      return result.then(() => true);\n    }\n    return true;\n  }\n\n  private _handleQuery(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean {\n    const id = cmd.id ?? 0;\n    const quiet = cmd.quiet ?? 0;\n\n    // Per spec: reject unsupported transmission mediums (only t=d is supported atm)\n    // TODO: When filesystem support is added (Node.js/Electron), update this to accept\n    // t=f (file), t=t (temp file), and t=s (shared memory) and respond OK for queries.\n    const transmission = cmd.transmission ?? 'd';\n    if (transmission !== 'd') {\n      this._sendResponse(id, 'EINVAL:unsupported transmission medium', quiet);\n      return true;\n    }\n\n    // Check decode error first (invalid base64)\n    if (decodeError) {\n      this._sendResponse(id, 'EINVAL:invalid base64 data', quiet);\n      return true;\n    }\n\n    // Capability query (no payload) - just respond OK\n    if (bytes.length === 0) {\n      this._sendResponse(id, 'OK', quiet);\n      return true;\n    }\n\n    const format = cmd.format ?? KittyFormat.RGBA;\n\n    if (format === KittyFormat.PNG) {\n      this._sendResponse(id, 'OK', quiet);\n    } else {\n      const width = cmd.width ?? 0;\n      const height = cmd.height ?? 0;\n\n      if (!width || !height) {\n        this._sendResponse(id, 'EINVAL:width and height required for raw pixel data', quiet);\n        return true;\n      }\n\n      const bytesPerPixel = format === KittyFormat.RGBA ? KittyPixelConstants.BYTES_PER_PIXEL_RGBA : KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n      const expectedBytes = width * height * bytesPerPixel;\n\n      if (bytes.length < expectedBytes) {\n        this._sendResponse(id, `EINVAL:insufficient pixel data`, quiet);\n        return true;\n      }\n\n      this._sendResponse(id, 'OK', quiet);\n    }\n    return true;\n  }\n\n  private _handleDelete(cmd: IKittyCommand): boolean {\n    // Per spec: default delete selector is 'a' (delete all visible placements)\n    const selector = cmd.deleteSelector ?? 'a';\n\n    // TODO: Distinguish lowercase (delete placements only) from uppercase\n    // (delete placements + free stored image data). Currently both variants\n    // free everything since we don't separate stored data from placements.\n    switch (selector) {\n      case 'a':\n      case 'A':\n        this._cleanupAllPending();\n        this._kittyStorage.deleteAll();\n        break;\n      case 'i':\n      case 'I':\n        // TODO: When placement id tracking is implemented (see TODO in\n        // KittyImageStorage), d=i with p=<pid> should delete only that\n        // specific placement, while d=i without p should delete all\n        // placements for the image.\n        if (cmd.id !== undefined) {\n          const pending = this._pendingTransmissions.get(cmd.id);\n          if (pending) {\n            pending.decoder.release();\n          }\n          this._removePendingEntry(cmd.id);\n          this._kittyStorage.deleteById(cmd.id);\n        }\n        break;\n      default:\n        // Unsupported selectors (c, n, p, q, r, x, y, z, f) — ignore for now\n        break;\n    }\n    return true;\n  }\n\n  private _sendResponse(id: number, message: string, quiet: number, placementId?: number): void {\n    const isOk = message === 'OK';\n    if (isOk && quiet >= 1) return;\n    if (!isOk && quiet >= 2) return;\n\n    const pPart = placementId ? `,p=${placementId}` : '';\n    const response = `\\x1b_Gi=${id}${pPart};${message}\\x1b\\\\`;\n    this._coreTerminal._core.coreService.triggerDataEvent(response);\n  }\n\n  // Image display\n\n  private _displayImage(image: IKittyImageData, cmd: IKittyCommand): Promise<boolean> {\n    return this._decodeAndDisplay(image, cmd)\n      .then(() => true)\n      .catch(() => false);\n  }\n\n  private async _decodeAndDisplay(image: IKittyImageData, cmd: IKittyCommand): Promise<void> {\n    const generation = this._generation;\n    let bitmap: ImageBitmap | undefined = await this._createBitmap(image);\n\n    try {\n      if (generation !== this._generation) throw new Error('image decode canceled');\n      const cropX = Math.max(0, cmd.x ?? 0);\n      const cropY = Math.max(0, cmd.y ?? 0);\n      const cropW = cmd.sourceWidth || (bitmap.width - cropX);\n      const cropH = cmd.sourceHeight || (bitmap.height - cropY);\n\n      const maxCropW = Math.max(0, bitmap.width - cropX);\n      const maxCropH = Math.max(0, bitmap.height - cropY);\n      const finalCropW = Math.max(0, Math.min(cropW, maxCropW));\n      const finalCropH = Math.max(0, Math.min(cropH, maxCropH));\n\n      if (finalCropW === 0 || finalCropH === 0) {\n        throw new Error('invalid source rectangle');\n      }\n\n      if (cropX !== 0 || cropY !== 0 || finalCropW !== bitmap.width || finalCropH !== bitmap.height) {\n        const cropped = await createImageBitmap(bitmap, cropX, cropY, finalCropW, finalCropH);\n        bitmap.close();\n        bitmap = cropped;\n      }\n\n      const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;\n      const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;\n\n      // Per spec: c/r default to image's natural cell dimensions.\n      // If only one of c/r is specified, compute the other from image aspect ratio.\n      let imgCols: number;\n      let imgRows: number;\n      if (cmd.columns !== undefined && cmd.rows !== undefined) {\n        imgCols = cmd.columns;\n        imgRows = cmd.rows;\n      } else if (cmd.columns !== undefined) {\n        imgCols = cmd.columns;\n        imgRows = Math.max(1, Math.ceil((bitmap.height / bitmap.width) * (imgCols * cw) / ch));\n      } else if (cmd.rows !== undefined) {\n        imgRows = cmd.rows;\n        imgCols = Math.max(1, Math.ceil((bitmap.width / bitmap.height) * (imgRows * ch) / cw));\n      } else {\n        imgCols = Math.ceil(bitmap.width / cw);\n        imgRows = Math.ceil(bitmap.height / ch);\n      }\n\n      let w = bitmap.width;\n      let h = bitmap.height;\n\n      // Scale bitmap to fit placement rectangle when c/r are specified\n      if (cmd.columns !== undefined || cmd.rows !== undefined) {\n        w = Math.round(imgCols * cw);\n        h = Math.round(imgRows * ch);\n      }\n\n      if (w * h > this._opts.pixelLimit) {\n        throw new Error('image exceeds pixel limit');\n      }\n\n      // Save cursor position before addImage modifies it\n      const buffer = this._coreTerminal._core.buffer;\n      const savedX = buffer.x;\n      const savedY = buffer.y;\n      const savedYbase = buffer.ybase;\n\n      // Determine layer based on z-index: negative = behind text, 0+ = on top.\n      // When z<0 we always use the bottom layer even without allowTransparency —\n      // the image will simply be hidden behind the opaque text background, which\n      // is the correct behavior (client asked for \"behind text\").\n      const wantsBottom = cmd.zIndex !== undefined && cmd.zIndex < 0;\n      const layer: ImageLayer = wantsBottom ? 'bottom' : 'top';\n\n      if (w !== bitmap.width || h !== bitmap.height) {\n        const scaled = await createImageBitmap(bitmap, { resizeWidth: w, resizeHeight: h });\n        bitmap.close();\n        bitmap = scaled;\n      }\n\n      // Per spec: X/Y are pixel offsets within the first cell, so clamp to cell dimensions\n      const xOffset = Math.min(Math.max(0, cmd.xOffset ?? 0), cw - 1);\n      const yOffset = Math.min(Math.max(0, cmd.yOffset ?? 0), ch - 1);\n      if (xOffset !== 0 || yOffset !== 0) {\n        // Per spec: X/Y is not added to c/r area. When c/r are explicit, the\n        // total placement area remains c*cw × r*ch pixels and the offset image\n        // is clipped to fit. When c/r are unset, the padded canvas determines\n        // the natural cell dimensions.\n        const canvasW = (cmd.columns !== undefined) ? Math.round(imgCols * cw) : bitmap.width + xOffset;\n        const canvasH = (cmd.rows !== undefined) ? Math.round(imgRows * ch) : bitmap.height + yOffset;\n        const offsetCanvas = ImageRenderer.createCanvas(window.document, canvasW, canvasH);\n        const offsetCtx = offsetCanvas.getContext('2d');\n        if (!offsetCtx) {\n          throw new Error('Failed to create offset canvas context');\n        }\n        offsetCtx.drawImage(bitmap, xOffset, yOffset);\n\n        const offsetBitmap = await createImageBitmap(offsetCanvas);\n        offsetCanvas.width = offsetCanvas.height = 0;\n        bitmap.close();\n        bitmap = offsetBitmap;\n        w = bitmap.width;\n        h = bitmap.height;\n        if (w * h > this._opts.pixelLimit) {\n          throw new Error('image exceeds pixel limit');\n        }\n        if (cmd.columns === undefined) {\n          imgCols = Math.ceil(bitmap.width / cw);\n        }\n        if (cmd.rows === undefined) {\n          imgRows = Math.ceil(bitmap.height / ch);\n        }\n      }\n\n      if (generation !== this._generation) throw new Error('image decode canceled');\n      const zIndex = cmd.zIndex ?? 0;\n      this._kittyStorage.addImage(image.id, bitmap, true, layer, zIndex);\n      bitmap = undefined;  // ownership transferred to storage\n\n      // Kitty cursor movement\n      // Per spec: cursor placed at first column after last image column,\n      // on the last row of the image. C=1 means don't move cursor.\n      if (cmd.cursorMovement === 1) {\n        // C=1: restore cursor to position before image was placed\n        const scrolled = buffer.ybase - savedYbase;\n        buffer.x = savedX;\n        // Can't restore cursor to scrollback?\n        buffer.y = Math.max(savedY - scrolled, 0);\n      } else {\n        // Default (C=0): advance cursor horizontally past the image\n        // addImage already positioned cursor on the last row via lineFeeds\n        buffer.x = Math.min(savedX + imgCols, this._coreTerminal.cols);\n      }\n    } catch (e) {\n      bitmap?.close();\n      throw e;\n    }\n  }\n\n  // Create ImageBitmap from already-decoded image data.\n  private async _createBitmap(image: IKittyImageData): Promise<ImageBitmap> {\n    let bytes: Uint8Array = new Uint8Array(await image.data.arrayBuffer());\n\n    if (image.compression === KittyCompression.ZLIB) {\n      bytes = await this._decompressZlib(bytes);\n    }\n\n    if (image.format === KittyFormat.PNG) {\n      const metrics = imageType(bytes);\n      // IHDR dimensions are parsed with signed shifts, so a value >= 0x80000000 comes\n      // back negative and a bare `>` pixel-limit test passes it; require positive.\n      if (metrics.mime !== 'image/png' || !(metrics.width > 0) || !(metrics.height > 0) || metrics.width * metrics.height > this._opts.pixelLimit) {\n        throw new RangeError('PNG exceeds pixel limit or has invalid dimensions');\n      }\n      const blob = new Blob([bytes as BlobPart], { type: 'image/png' });\n      if (!window.createImageBitmap) {\n        const url = URL.createObjectURL(blob);\n        const img = new Image();\n        return new Promise<ImageBitmap>((resolve, reject) => {\n          img.addEventListener('load', () => {\n            URL.revokeObjectURL(url);\n            const canvas = ImageRenderer.createCanvas(window.document, img.width, img.height);\n            canvas.getContext('2d')?.drawImage(img, 0, 0);\n            createImageBitmap(canvas).then(resolve).catch(reject);\n          });\n          img.addEventListener('error', () => {\n            URL.revokeObjectURL(url);\n            reject(new Error('Failed to load image'));\n          });\n          img.src = url;\n        });\n      }\n      return createImageBitmap(blob);\n    }\n\n    // Raw pixel data\n    const width = image.width;\n    const height = image.height;\n\n    if (!width || !height) {\n      throw new Error('Width and height required for raw pixel data');\n    }\n\n    const bytesPerPixel = image.format === KittyFormat.RGBA ? KittyPixelConstants.BYTES_PER_PIXEL_RGBA : KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n    const expectedBytes = width * height * bytesPerPixel;\n\n    if (bytes.length < expectedBytes) {\n      throw new Error('Insufficient pixel data');\n    }\n\n    const pixelCount = width * height;\n\n    if (image.format === KittyFormat.RGBA) {\n      // RGBA: use bytes directly — no copy needed\n      return createImageBitmap(new ImageData(new Uint8ClampedArray(bytes.buffer as ArrayBuffer, bytes.byteOffset, pixelCount * KittyPixelConstants.BYTES_PER_PIXEL_RGBA), width, height));\n    }\n\n    // RGB→RGBA: interleave alpha using uint32 block processing (4 pixels per iteration).\n    // 3 uint32 reads + 4 uint32 writes per 4 pixels vs 28 byte reads/writes — ~6x faster.\n    // Assumes little-endian (all modern browsers/Node.js).\n    const data = new Uint8ClampedArray(pixelCount * KittyPixelConstants.BYTES_PER_PIXEL_RGBA);\n    const src32 = new Uint32Array(bytes.buffer, bytes.byteOffset, Math.floor(bytes.byteLength / 4));\n    const dst32 = new Uint32Array(data.buffer);\n    const alignedPixels = pixelCount & ~3;  // round down to multiple of 4\n\n    let srcOffset = 0;\n    let dstOffset = 0;\n    for (let i = 0; i < alignedPixels; i += 4) {\n      const b0 = src32[srcOffset++];\n      const b1 = src32[srcOffset++];\n      const b2 = src32[srcOffset++];\n      // Little-endian: pixel bytes are [R,G,B] → uint32 ABGR layout\n      dst32[dstOffset++] = 0xFF000000 | b0;\n      dst32[dstOffset++] = 0xFF000000 | (b0 >>> 24) | (b1 << 8);\n      dst32[dstOffset++] = 0xFF000000 | (b1 >>> 16) | (b2 << 16);\n      dst32[dstOffset++] = 0xFF000000 | (b2 >>> 8);\n    }\n\n    // Handle remaining 1–3 pixels\n    let srcByte = alignedPixels * KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n    let dstByte = alignedPixels * KittyPixelConstants.BYTES_PER_PIXEL_RGBA;\n    for (let i = alignedPixels; i < pixelCount; i++) {\n      data[dstByte]     = bytes[srcByte];\n      data[dstByte + 1] = bytes[srcByte + 1];\n      data[dstByte + 2] = bytes[srcByte + 2];\n      data[dstByte + 3] = KittyPixelConstants.ALPHA_OPAQUE;\n      srcByte += KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n      dstByte += KittyPixelConstants.BYTES_PER_PIXEL_RGBA;\n    }\n\n    return createImageBitmap(new ImageData(data, width, height));\n  }\n\n  private async _decompressZlib(compressed: Uint8Array): Promise<Uint8Array> {\n    try {\n      return await this._decompress(compressed, 'deflate');\n    } catch (error) {\n      if (error instanceof RangeError) throw error;\n      return await this._decompress(compressed, 'deflate-raw');\n    }\n  }\n\n  private async _decompress(compressed: Uint8Array, format: 'deflate' | 'deflate-raw'): Promise<Uint8Array> {\n    const limit = Math.min(this._opts.kittySizeLimit, this._opts.pixelLimit * 4, this._opts.storageLimit * 1000000);\n    let offsetIn = 0;\n    // Bound inflation within one native transform before its output is budgeted.\n    const source = new ReadableStream<BufferSource>({\n      pull(controller) {\n        if (offsetIn >= compressed.length) {\n          controller.close();\n          return;\n        }\n        const end = Math.min(offsetIn + 4096, compressed.length);\n        controller.enqueue(new Uint8Array(compressed.subarray(offsetIn, end)));\n        offsetIn = end;\n      }\n    });\n    const reader = source.pipeThrough(new DecompressionStream(format)).getReader();\n    const chunks: Uint8Array[] = [];\n    let totalLength = 0;\n    try {\n      while (true) {\n        const { done, value } = await reader.read();\n        if (done) break;\n        totalLength += value.byteLength;\n        if (totalLength > limit) {\n          await reader.cancel().catch(() => {});\n          throw new RangeError('decompressed image exceeds byte limit');\n        }\n        chunks.push(value);\n      }\n    } finally {\n      reader.releaseLock();\n    }\n\n    const result = new Uint8Array(totalLength);\n    let offset = 0;\n    for (const chunk of chunks) {\n      result.set(chunk, offset);\n      offset += chunk.length;\n    }\n    return result;\n  }\n\n  public get images(): ReadonlyMap<number, IKittyImageData> {\n    return this._kittyStorage.images;\n  }\n\n  public get _kittyIdToStorageId(): ReadonlyMap<number, number> {\n    return this._kittyStorage.kittyIdToStorageId;\n  }\n\n  public get pendingTransmissions(): ReadonlyMap<number, IPendingTransmission> {\n    return this._pendingTransmissions;\n  }\n}\n","/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Kitty graphics protocol types, constants, and parsing utilities.\n */\n\nimport type Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\n\n// Kitty graphics protocol action types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference under key 'a'.\nexport const enum KittyAction {\n  TRANSMIT = 't',\n  TRANSMIT_DISPLAY = 'T',\n  QUERY = 'q',\n  PLACEMENT = 'p',\n  DELETE = 'd'\n}\n\n// Kitty graphics protocol format types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference\nexport const enum KittyFormat {\n  RGB = 24,\n  RGBA = 32,\n  PNG = 100\n}\n\n// Kitty graphics protocol compression types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference under key 'o'.\nexport const enum KittyCompression {\n  NONE = '',\n  ZLIB = 'z'\n}\n\n// Kitty graphics protocol control data keys.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference\nexport const enum KittyKey {\n  // Action to perform (t=transmit, T=transmit+display, q=query, p=placement, d=delete)\n  ACTION = 'a',\n  // Image format (24=RGB, 32=RGBA, 100=PNG)\n  FORMAT = 'f',\n  // Image ID for referencing stored images\n  ID = 'i',\n  // Image number (alternative to ID, terminal assigns ID)\n  IMAGE_NUMBER = 'I',\n  // Source image width in pixels\n  WIDTH = 's',\n  // Source image height in pixels\n  HEIGHT = 'v',\n  // The left edge (in pixels) of the image area to display\n  X_OFFSET = 'x',\n  // The top edge (in pixels) of the image area to display\n  Y_OFFSET = 'y',\n  // Width (in pixels) of the source rectangle to display\n  SOURCE_WIDTH = 'w',\n  // Height (in pixels) of the source rectangle to display\n  SOURCE_HEIGHT = 'h',\n  // Horizontal offset (in pixels) within the first cell\n  X_PLACEMENT_OFFSET = 'X',\n  // Vertical offset (in pixels) within the first cell\n  Y_PLACEMENT_OFFSET = 'Y',\n  // Number of terminal columns to display the image over\n  COLUMNS = 'c',\n  // Number of terminal rows to display the image over\n  ROWS = 'r',\n  // More data flag (1=more chunks coming, 0=final chunk)\n  MORE = 'm',\n  // Compression type (z=zlib). This is essential for chunking larger images.\n  COMPRESSION = 'o',\n  // Quiet mode (1=suppress OK responses, 2=suppress error responses)\n  QUIET = 'q',\n  // Cursor movement policy (0=move cursor after image, 1=don't move cursor)\n  CURSOR_MOVEMENT = 'C',\n  // Z-index for image layering (negative = behind text, 0+ = on top)\n  Z_INDEX = 'z',\n  // Transmission medium (d=direct, f=file, t=temp file, s=shared memory)\n  TRANSMISSION = 't',\n  // Delete selector (a/A=all, i/I=by id, c/C=at cursor, etc.) — only used when a=d\n  DELETE_SELECTOR = 'd',\n  // Placement ID for targeting specific placements\n  PLACEMENT_ID = 'p'\n}\n\n// Pixel format constants\nexport const enum KittyPixelConstants {\n  BYTES_PER_PIXEL_RGB = 3,\n  BYTES_PER_PIXEL_RGBA = 4,\n  ALPHA_OPAQUE = 255\n}\n\n// Parsed Kitty graphics command.\nexport interface IKittyCommand {\n  action?: string;\n  format?: number;\n  id?: number;\n  imageNumber?: number;\n  width?: number;\n  height?: number;\n  x?: number;\n  y?: number;\n  sourceWidth?: number;\n  sourceHeight?: number;\n  xOffset?: number;\n  yOffset?: number;\n  columns?: number;\n  rows?: number;\n  more?: number;\n  quiet?: number;\n  cursorMovement?: number;\n  zIndex?: number;\n  transmission?: string;\n  deleteSelector?: string;\n  placementId?: number;\n  compression?: string;\n  payload?: string;\n}\n\n// Pending chunked transmission state.\n// Stores metadata from the first chunk while accumulating decoded payload data.\nexport interface IPendingTransmission {\n  // The parsed command from the first chunk (contains action, format, dimensions, etc.)\n  cmd: IKittyCommand;\n  // Decoder used across chunked payloads\n  decoder: Base64Decoder;\n  // Total encoded (base64) bytes received across all chunks - for size limit enforcement\n  totalEncodedSize: number;\n  // Whether any chunk has failed to decode\n  decodeError: boolean;\n}\n\n// Stored Kitty image data.\nexport interface IKittyImageData {\n  id: number;\n  // Decoded image data stored as Blob (off JS heap) to avoid 2GB heap limit\n  data: Blob;\n  width: number;\n  height: number;\n  format: 24 | 32 | 100;\n  compression?: string;\n}\n\n// Parses Kitty graphics control data into a command object.\nexport function parseKittyCommand(data: string): IKittyCommand {\n  const cmd: IKittyCommand = {};\n  const parts = data.split(',');\n\n  for (const part of parts) {\n    const eqIdx = part.indexOf('=');\n    if (eqIdx === -1) continue;\n\n    const key = part.substring(0, eqIdx);\n    const value = part.substring(eqIdx + 1);\n\n    // Handle string keys first\n    if (key === KittyKey.ACTION) {\n      cmd.action = value;\n      continue;\n    }\n    if (key === KittyKey.COMPRESSION) {\n      cmd.compression = value;\n      continue;\n    }\n    if (key === KittyKey.TRANSMISSION) {\n      cmd.transmission = value;\n      continue;\n    }\n    if (key === KittyKey.DELETE_SELECTOR) {\n      cmd.deleteSelector = value;\n      continue;\n    }\n    const numValue = parseInt(value, 10);\n    switch (key) {\n      case KittyKey.FORMAT: cmd.format = numValue; break;\n      case KittyKey.ID: cmd.id = numValue; break;\n      case KittyKey.IMAGE_NUMBER: cmd.imageNumber = numValue; break;\n      case KittyKey.WIDTH: cmd.width = numValue; break;\n      case KittyKey.HEIGHT: cmd.height = numValue; break;\n      case KittyKey.X_OFFSET: cmd.x = numValue; break;\n      case KittyKey.Y_OFFSET: cmd.y = numValue; break;\n      case KittyKey.SOURCE_WIDTH: cmd.sourceWidth = numValue; break;\n      case KittyKey.SOURCE_HEIGHT: cmd.sourceHeight = numValue; break;\n      case KittyKey.X_PLACEMENT_OFFSET: cmd.xOffset = numValue; break;\n      case KittyKey.Y_PLACEMENT_OFFSET: cmd.yOffset = numValue; break;\n      case KittyKey.COLUMNS: cmd.columns = numValue; break;\n      case KittyKey.ROWS: cmd.rows = numValue; break;\n      case KittyKey.MORE: cmd.more = numValue; break;\n      case KittyKey.QUIET: cmd.quiet = numValue; break;\n      case KittyKey.CURSOR_MOVEMENT: cmd.cursorMovement = numValue; break;\n      case KittyKey.Z_INDEX: cmd.zIndex = numValue; break;\n      case KittyKey.PLACEMENT_ID: cmd.placementId = numValue; break;\n    }\n  }\n\n  return cmd;\n}\n","/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { ImageStorage } from '../ImageStorage';\nimport { ImageLayer, IAddImageOpts } from '../Types';\nimport { IKittyImageData } from './KittyGraphicsTypes';\n\n// Kitty-specific image storage controller.\n//\n// Wraps shared ImageStorage with kitty protocol semantics:\n// - tracks transmitted image payloads by kitty image id\n// - tracks kitty image id -> shared ImageStorage id mapping for displayed images\n// - mirrors shared-storage evictions into kitty maps\n// - applies protocol-level undisplayed-image eviction policy\nexport class KittyImageStorage implements IDisposable {\n  private static readonly _maxStoredImages = 256;\n\n  private _nextImageId = 1;\n  private readonly _images: Map<number, IKittyImageData> = new Map();\n  // TODO: Support multiple placements per image. The kitty spec identifies\n  // placements by an (image id, placement id) pair — same i + different p\n  // values should coexist, and same i + same p should replace the prior\n  // placement. Currently we track only one storage entry per kitty image id,\n  // so multiple placements of the same image overwrite each other. Fixing\n  // this requires changing these maps to Map<number, Map<number, number>>\n  // (kittyId → placementId → storageId) and updating addImage/deleteById\n  // accordingly. The underlying shared ImageStorage would also need to\n  // support multiple entries per logical image.\n  private readonly _kittyIdToStorageId: Map<number, number> = new Map();\n  private readonly _storageIdToKittyId: Map<number, number> = new Map();\n\n  private readonly _previousOnImageDeleted: ((storageId: number) => void) | undefined;\n  private readonly _wrappedOnImageDeleted: (storageId: number) => void;\n  private readonly _handleStorageImageDeleted = (storageId: number): void => {\n    const kittyId = this._storageIdToKittyId.get(storageId);\n    if (kittyId !== undefined) {\n      this._kittyIdToStorageId.delete(kittyId);\n      this._storageIdToKittyId.delete(storageId);\n      this._images.delete(kittyId);\n    }\n  };\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };\n\n  constructor(\n    private readonly _storage: ImageStorage\n  ) {\n    this._previousOnImageDeleted = this._storage.onImageDeleted;\n    this._wrappedOnImageDeleted = (storageId: number) => {\n      this._previousOnImageDeleted?.(storageId);\n      this._handleStorageImageDeleted(storageId);\n    };\n    this._storage.onImageDeleted = this._wrappedOnImageDeleted;\n  }\n\n  public reset(): void {\n    this._nextImageId = 1;\n    this._images.clear();\n    this._kittyIdToStorageId.clear();\n    this._storageIdToKittyId.clear();\n  }\n\n  public dispose(): void {\n    this.reset();\n    if (this._storage.onImageDeleted === this._wrappedOnImageDeleted) {\n      this._storage.onImageDeleted = this._previousOnImageDeleted;\n    }\n  }\n\n  public storeImage(id: number | undefined, imageData: Omit<IKittyImageData, 'id'>): number {\n    const imageId = id ?? this._nextImageId++;\n\n    const oldStorageId = this._kittyIdToStorageId.get(imageId);\n    if (oldStorageId !== undefined) {\n      this._storage.deleteImage(oldStorageId);\n      this._kittyIdToStorageId.delete(imageId);\n      this._storageIdToKittyId.delete(oldStorageId);\n    }\n\n    if (!this._images.has(imageId) && this._images.size >= KittyImageStorage._maxStoredImages) {\n      this._evictUndisplayedImages();\n    }\n\n    // Encoded images awaiting placement are outside ImageStorage's pixel budget.\n    // Unplaced payloads are evicted first so a new upload cannot erase a visible\n    // image while abandoned blobs still hold budget; placed ones go only when\n    // that is not enough, because the byte cap is a hard bound. The new image is\n    // always stored, so an oversized one overshoots by at most one payload\n    // (itself bounded by kittySizeLimit) rather than being dropped after an OK ack.\n    const byteLimit = this._storage.getLimit() * 1000000;\n    this._images.delete(imageId);\n    let retainedBytes = 0;\n    for (const image of this._images.values()) retainedBytes += image.data.size;\n    for (const evictPlaced of [false, true]) {\n      for (const [oldestId, image] of this._images) {\n        if (retainedBytes + imageData.data.size <= byteLimit) break;\n        if (this._kittyIdToStorageId.has(oldestId) !== evictPlaced) continue;\n        retainedBytes -= image.data.size;\n        this.deleteById(oldestId);\n      }\n    }\n\n    this._images.set(imageId, {\n      ...imageData,\n      id: imageId\n    });\n    return imageId;\n  }\n\n  public addImage(kittyId: number, image: HTMLCanvasElement | ImageBitmap, scrolling: boolean, layer: ImageLayer, zIndex: number): void {\n    // Clean up stale reverse-mapping from a previous placement of the same\n    // kitty image.  The old shared-storage entry is kept (it may still be\n    // visible on screen) but its reverse mapping is removed so that eviction\n    // of the old entry won't incorrectly delete the kitty image data.\n    const oldStorageId = this._kittyIdToStorageId.get(kittyId);\n    if (oldStorageId !== undefined) {\n      this._storageIdToKittyId.delete(oldStorageId);\n    }\n    this._addImageOpts.scrolling = scrolling;\n    this._addImageOpts.layer = layer;\n    this._addImageOpts.zIndex = zIndex;\n    const storageId = this._storage.addImage(image, this._addImageOpts);\n    this._kittyIdToStorageId.set(kittyId, storageId);\n    this._storageIdToKittyId.set(storageId, kittyId);\n  }\n\n  public getImage(kittyId: number): IKittyImageData | undefined {\n    return this._images.get(kittyId);\n  }\n\n  public deleteById(kittyId: number): void {\n    this._images.delete(kittyId);\n    const storageId = this._kittyIdToStorageId.get(kittyId);\n    if (storageId !== undefined) {\n      this._storage.deleteImage(storageId);\n      this._kittyIdToStorageId.delete(kittyId);\n      this._storageIdToKittyId.delete(storageId);\n    }\n  }\n\n  public deleteAll(): void {\n    this._images.clear();\n    for (const storageId of this._kittyIdToStorageId.values()) {\n      this._storage.deleteImage(storageId);\n    }\n    this._kittyIdToStorageId.clear();\n    this._storageIdToKittyId.clear();\n  }\n\n  public get images(): ReadonlyMap<number, IKittyImageData> {\n    return this._images;\n  }\n\n  public get kittyIdToStorageId(): ReadonlyMap<number, number> {\n    return this._kittyIdToStorageId;\n  }\n\n  public get lastImageId(): number {\n    return this._nextImageId - 1;\n  }\n\n  private _evictUndisplayedImages(): void {\n    for (const [kittyId] of this._images) {\n      if (this._images.size <= KittyImageStorage._maxStoredImages / 2) {\n        break;\n      }\n      if (!this._kittyIdToStorageId.has(kittyId)) {\n        this._images.delete(kittyId);\n      }\n    }\n  }\n}\n","\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\n/**\n * Copyright (c) 2023, 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nconst inwasm_runtime_1 = require(\"inwasm-runtime\");\n/**\n * wasm base64 decoder.\n */\nconst wasmDecode = (0, inwasm_runtime_1.InWasm)(/*inwasm#828e69684093b2c6:rdef-start:\"decode\"*/{s:1,t:0,d:'AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML'}/*inwasm#828e69684093b2c6:rdef-end:\"decode\"*/);\n// SIMD version (speedup ~1.4x, not covered by tests yet)\n/*\nconst wasmDecode = InWasm({\n  name: 'decode',\n  type: OutputType.INSTANCE,\n  mode: OutputMode.SYNC,\n  srctype: 'Clang-C',\n  imports: {\n    env: { memory: new WebAssembly.Memory({ initial: 1 }) }\n  },\n  exports: {\n    dec: () => 0,\n    end: () => 0\n  },\n  compile: {\n    switches: ['-msimd128', '-Wl,-z,stack-size=0', '-Wl,--stack-first']\n  },\n  code: `\n    #include <wasm_simd128.h>\n    typedef struct {\n      unsigned int wp;\n      unsigned int sp;\n      unsigned int dp;\n      unsigned int e_size;\n      unsigned int dummy[4];\n      unsigned char data[0];\n    } State;\n\n    unsigned int *D0 = (unsigned int *) ${P32.D0 * 4};\n    unsigned int *D1 = (unsigned int *) ${P32.D1 * 4};\n    unsigned int *D2 = (unsigned int *) ${P32.D2 * 4};\n    unsigned int *D3 = (unsigned int *) ${P32.D3 * 4};\n    State *state = (State *) ${P32.STATE * 4};\n\n    #define packed_byte(x) wasm_i8x16_splat((char) x)\n    #define packed_dword(x) wasm_i32x4_splat(x)\n    #define masked(x, mask) wasm_v128_and(x, wasm_i32x4_splat(mask))\n\n    __attribute__((noinline)) int dec() {\n      unsigned int nsp = (state->wp - 1) & ~3;\n      unsigned char *src = state->data + state->sp;\n      unsigned char *end = state->data + nsp;\n      unsigned char *dst = state->data + state->dp;\n      unsigned int error = 0;\n\n      v128_t err = wasm_i8x16_splat(0);\n      unsigned char *end16 = state->data + (nsp & ~15);\n      while (src < end16) {\n        v128_t data = wasm_v128_load((v128_t *) src);\n\n        // wasm-simd rewrite of http://0x80.pl/notesen/2016-01-17-sse-base64-decoding.html#vector-lookup-pshufb\n        const v128_t higher_nibble = wasm_u32x4_shr(data, 4) & packed_byte(0x0f);\n        const char linv = 1;\n        const char hinv = 0;\n\n        const v128_t lower_bound_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          linv, linv, 0x2b, 0x30,\n          0x41, 0x50, 0x61, 0x70,\n          linv, linv, linv, linv,\n          linv, linv, linv, linv\n        );\n        const v128_t upper_bound_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          hinv, hinv, 0x2b, 0x39,\n          0x4f, 0x5a, 0x6f, 0x7a,\n          hinv, hinv, hinv, hinv,\n          hinv, hinv, hinv, hinv\n        );\n        // the difference between the shift and lower bound\n        const v128_t shift_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          0x00,        0x00,        0x3e - 0x2b, 0x34 - 0x30,\n          0x00 - 0x41, 0x0f - 0x50, 0x1a - 0x61, 0x29 - 0x70,\n          0x00,        0x00,        0x00,        0x00,\n          0x00,        0x00,        0x00,        0x00\n        );\n\n        const v128_t upper_bound = wasm_i8x16_swizzle(upper_bound_LUT, higher_nibble);\n        const v128_t lower_bound = wasm_i8x16_swizzle(lower_bound_LUT, higher_nibble);\n\n        const v128_t below = wasm_i8x16_lt(data, lower_bound);\n        const v128_t above = wasm_i8x16_gt(data, upper_bound);\n        const v128_t eq_2f = wasm_i8x16_eq(data, packed_byte(0x2f));\n\n        // in_range = not (below or above) or eq_2f\n        // outside  = not in_range = below or above and not eq_2f (from deMorgan law)\n        const v128_t outside = wasm_v128_andnot(eq_2f, above | below);\n        err = wasm_v128_or(err, outside);\n\n        const v128_t shift  = wasm_i8x16_swizzle(shift_LUT, higher_nibble);\n        const v128_t t0     = wasm_i8x16_add(data, shift);\n        v128_t v = wasm_i8x16_add(t0, wasm_v128_and(eq_2f, packed_byte(-3)));\n\n        // pack bytes\n        const v128_t ca = masked(v, 0x003f003f);\n        const v128_t db = masked(v, 0x3f003f00);\n        const v128_t t00 = wasm_v128_or(wasm_u32x4_shr(db, 8), wasm_i32x4_shl(ca, 6));\n        v128_t res = wasm_v128_or(wasm_u32x4_shr(t00, 16), wasm_i32x4_shl(t00, 12));\n        res = wasm_i8x16_swizzle(res, wasm_i8x16_const(2, 1, 0, 6, 5, 4, 10, 9, 8, 14, 13, 12, 16, 16, 16, 16));\n\n        wasm_v128_store((v128_t *) dst, res);\n        dst += 12;\n        src += 16;\n      }\n      //if (wasm_i8x16_bitmask(err) != 0) return -1;\n      if (wasm_v128_any_true(err)) return -1;\n\n      // operate on 4-byte blocks\n      while (src < end) {\n        error |= *((unsigned int *) dst) = D0[src[0]] | D1[src[1]] | D2[src[2]] | D3[src[3]];\n        dst += 3;\n        src += 4;\n      }\n      if (error >> 24) return -1;\n      state->sp = nsp;\n      state->dp = dst - state->data;\n      return 0;\n    }\n\n    int end() {\n      int rem = state->wp - state->sp;\n      if (rem > 4 && dec()) return -1;\n      rem = state->wp - state->sp;\n      if (rem < 2) return -1;\n\n      unsigned char *src = state->data + state->sp;\n      if (rem == 4) {\n        if (src[3] == 61) rem--;\n        if (src[2] == 61) rem--;\n      }\n      unsigned int accu = D0[src[0]] | D1[src[1]];\n      int dp = 1;\n      if (rem > 2) {\n        accu |= D2[src[2]];\n        dp++;\n        if (rem == 4) {\n          accu |= D3[src[3]];\n          dp++;\n        }\n      }\n      if (accu >> 24) return -1;\n      *((unsigned int *) (state->data + state->dp)) = accu;\n      state->dp += dp;\n      return 0;\n    }\n    `\n});\n*/\n// base64 map\nconst MAP = new Uint8Array('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'\n    .split('')\n    .map(el => el.charCodeAt(0)));\n// init decoder maps in LE order\nconst D = new Uint32Array(1024);\nD.fill(0xFF000000);\nfor (let i = 0; i < MAP.length; ++i)\n    D[MAP[i]] = i << 2;\nfor (let i = 0; i < MAP.length; ++i)\n    D[256 + MAP[i]] = i >> 4 | ((i << 4) & 0xFF) << 8;\nfor (let i = 0; i < MAP.length; ++i)\n    D[512 + MAP[i]] = (i >> 2) << 8 | ((i << 6) & 0xFF) << 16;\nfor (let i = 0; i < MAP.length; ++i)\n    D[768 + MAP[i]] = i << 16;\nconst EMPTY = new Uint8Array(0);\n/**\n * base64 stream decoder.\n *\n * Features / assumptions:\n * - lazy chunkwise decoding\n * - errors out on any non base64 chars (no support for NL formatted base64)\n * - decodes in wasm\n * - inplace decoding to save memory\n * - supports a keepSize for lazy memory release\n */\nclass Base64Decoder {\n    /**\n     * @param keepSize Keep the wasm instance below this limit when calling `release()`.\n     * @param maxBytes Max allowed bytes to allocate.\n     * @param initialBytes Initial bytes to allocate.\n     */\n    constructor(keepSize, maxBytes, initialBytes) {\n        this._inst = null;\n        this._ended = true;\n        this._bytes = 0;\n        this.keepSize = keepSize !== null && keepSize !== void 0 ? keepSize : 1048576 /* Bytes.KEEP */;\n        this.maxBytes = maxBytes !== null && maxBytes !== void 0 ? maxBytes : 4294901760 /* Bytes.MAX */;\n        this._bytes = initialBytes !== null && initialBytes !== void 0 ? initialBytes : 32768 /* Bytes.INITIAL */;\n        if (this._bytes > this.maxBytes || this.maxBytes > 4294901760 /* Bytes.MAX */) {\n            throw new Error('invalid byte settings');\n        }\n    }\n    /**\n     * Currently decoded bytes (borrowed).\n     * Must be accessed before calling `release` or `init`.\n     */\n    get data8() {\n        return this._inst ? this._d.subarray(0, this._m32[1282 /* P32.STATE_DP */]) : EMPTY;\n    }\n    /**\n     * Release memory conditionally based on `keepSize`.\n     * If memory gets released, also the wasm instance will be freed and recreated on next `init`,\n     * otherwise the instance will be reused.\n     */\n    release() {\n        if (!this._inst)\n            return;\n        if (this._bytes > this.keepSize) {\n            this._inst = this._m32 = this._d = this._mem = null;\n        }\n        else {\n            this._m32[1280 /* P32.STATE_WP */] = 0;\n            this._m32[1281 /* P32.STATE_SP */] = 0;\n            this._m32[1282 /* P32.STATE_DP */] = 0;\n        }\n    }\n    /**\n     * Initializes the decoder for new base64 data.\n     * Must be called before doing any decoding attempts.\n     * The method will either spawn a new wasm instance or grow\n     * the needed memory of an existing instance.\n     * @param maxBytes Max allowed bytes to allocate (overwrites ctor value).\n     * @param initialBytes Initial bytes to allocate (overwrites ctor value).\n     */\n    init(maxBytes, initialBytes) {\n        this.maxBytes = maxBytes !== null && maxBytes !== void 0 ? maxBytes : this.maxBytes;\n        this._bytes = initialBytes !== null && initialBytes !== void 0 ? initialBytes : Math.min(this._bytes, this.maxBytes);\n        if (this._bytes > this.maxBytes || this.maxBytes > 4294901760 /* Bytes.MAX */) {\n            throw Error('invalid byte settings');\n        }\n        let m = this._m32;\n        const bytes = this._bytes + 5152 /* Bytes._DATA_OFFSET */;\n        if (!this._inst) {\n            this._mem = new WebAssembly.Memory({ initial: Math.ceil(bytes / 65536) });\n            this._inst = wasmDecode({ env: { memory: this._mem } });\n            m = new Uint32Array(this._mem.buffer, 0);\n            m.set(D, 256 /* P32.D0 */);\n            this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n        }\n        else if (this._mem.buffer.byteLength < bytes) {\n            this._mem.grow(Math.ceil((bytes - this._mem.buffer.byteLength) / 65536));\n            m = new Uint32Array(this._mem.buffer, 0);\n            this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n        }\n        m[1280 /* P32.STATE_WP */] = 0;\n        m[1281 /* P32.STATE_SP */] = 0;\n        m[1282 /* P32.STATE_DP */] = 0;\n        this._m32 = m;\n        this._ended = false;\n    }\n    /**\n     * Realloc memory. Realloc only happens, if the requested\n     * size doesn't fit in the current memory.\n     * The new size will be capped by `maxBytes`.\n     * @param requested Bytes to be stored.\n     */\n    _realloc(requested) {\n        const needed = this._m32[1280 /* P32.STATE_WP */] + requested;\n        if (this._bytes < needed) {\n            if (needed > this.maxBytes) {\n                return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n            }\n            let newSize = this._bytes;\n            while ((newSize *= 2) < needed) { }\n            newSize = Math.min(newSize, this.maxBytes);\n            if (newSize < needed) {\n                return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n            }\n            if (newSize + 5152 /* Bytes._DATA_OFFSET */ > this._mem.buffer.byteLength) {\n                const addPages = Math.ceil((newSize + 5152 /* Bytes._DATA_OFFSET */ - this._mem.buffer.byteLength) / 65536);\n                this._mem.grow(addPages);\n                this._m32 = new Uint32Array(this._mem.buffer, 0);\n                this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n            }\n            this._bytes = newSize;\n        }\n        return 0 /* DecodeStatus.OK */;\n    }\n    /**\n     * Put bytes in `data` into the decoder.\n     * Additionally decodes the payload, if it reached 2^17 bytes.\n     * The return value indicates the type of issue.\n     * @param data Bytes to be loaded.\n     */\n    put(data) {\n        if (!this._inst || this._ended) {\n            return -2 /* DecodeStatus.NOT_INITIALIZED */;\n        }\n        if (this._realloc(data.length)) {\n            return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n        }\n        const m = this._m32;\n        this._d.set(data, m[1280 /* P32.STATE_WP */]);\n        m[1280 /* P32.STATE_WP */] += data.length;\n        // max chunk in input handler is 2^17, try to run in \"tandem mode\"\n        return m[1280 /* P32.STATE_WP */] - m[1281 /* P32.STATE_SP */] >= 131072\n            ? this._inst.exports.dec()\n            : 0 /* DecodeStatus.OK */;\n    }\n    /**\n     * End the current decoding.\n     * Also decodes leftover payload from previous put calls.\n     */\n    end() {\n        this._ended = true;\n        return this._inst\n            ? this._inst.exports.end()\n            : -2 /* DecodeStatus.NOT_INITIALIZED */;\n    }\n    /**\n     * Bytes loaded into the decoder.\n     */\n    get loadedBytes() {\n        return this._inst\n            ? this._m32[1280 /* P32.STATE_WP */]\n            : 0;\n    }\n    /**\n     * Free bytes to feed to the decoder.\n     */\n    get freeBytes() {\n        return this._inst\n            ? this.maxBytes - this._m32[1280 /* P32.STATE_WP */]\n            : 0;\n    }\n}\nexports.default = Base64Decoder;\n//# sourceMappingURL=Base64Decoder.wasm.js.map","\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\n/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nconst inwasm_runtime_1 = require(\"inwasm-runtime\");\nconst wasmQoiDecode = (0, inwasm_runtime_1.InWasm)(/*inwasm#459f9e1bfb80b1a8:rdef-start:\"qoi_decode\"*/{s:1,t:0,d:'AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw=='}/*inwasm#459f9e1bfb80b1a8:rdef-end:\"qoi_decode\"*/);\nclass QoiDecoder {\n    constructor(keepSize) {\n        this.keepSize = keepSize;\n        this.width = 0;\n        this.height = 0;\n    }\n    decode(d) {\n        this.width = d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7];\n        this.height = d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11];\n        const pixels = this.width * this.height;\n        const ib = pixels * 4;\n        const dl = d.length;\n        /**\n         * byte/offset calculation:\n         * To save some memory we dont reserve full memory for decoded + encoded,\n         * but place encoded at the end of decoded plus 50% security distance\n         * to avoid reads before writes positions:\n         *\n         * encoded < decoded (good compression)\n         *    enc                                              ####################\n         *    dec                 #######################################\n         *                        ^                            ^\n         *                        DST_P                        CHUNK_P\n         *\n         * encoded > decoded (degenerated compression, should not happen)\n         *    enc                           ##############################\n         *    dec                 ####################\n         *                        ^         ^\n         *                        DST_P     CHUNK_P\n         *\n         * There is still a chance for overlapping r/w positions in case the compressed\n         * data has very different pixel progression, yet the 50% security distance\n         * should deal with that, as QOI will bloat data by 25% at max (RGB -> OP byte + RGB).\n         * Since we always assume RGBA at decoding stage, the possible bloat reduces to 20% at max.\n         */\n        const bytes = Math.max(ib, dl) + (Math.min(ib, dl) >> 1) + 4096;\n        if (!this._inst) {\n            this._mem = new WebAssembly.Memory({ initial: Math.ceil(bytes / 65536) });\n            this._inst = wasmQoiDecode({ env: { memory: this._mem } });\n        }\n        else if (this._mem.buffer.byteLength < bytes) {\n            this._mem.grow(Math.ceil((bytes - this._mem.buffer.byteLength) / 65536));\n            this._d = null;\n        }\n        if (!this._d) {\n            this._d = new Uint8Array(this._mem.buffer);\n        }\n        // put src data at the end of memory, also align to 256\n        const chunkP = (this._mem.buffer.byteLength - dl) & ~0xFF;\n        this._d.set(d, chunkP);\n        this._inst.exports.dec(chunkP, dl, pixels);\n        return this._d.subarray(1024 /* P8.DST_P */, 1024 /* P8.DST_P */ + ib);\n    }\n    release() {\n        if (!this._inst)\n            return;\n        if (this._mem.buffer.byteLength > this.keepSize) {\n            this._inst = this._d = this._mem = null;\n        }\n    }\n}\nexports.default = QoiDecoder;\n//# sourceMappingURL=QoiDecoder.wasm.js.map","\"use strict\";\n/**\n * Copyright (c) 2022, 2026 Joerg Breitbart\n * @license MIT\n */\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.InWasm = InWasm;\nlet z = (s) => {\n    if (Uint8Array.fromBase64)\n        return Uint8Array.fromBase64(s);\n    if (typeof Buffer !== 'undefined')\n        return Buffer.from(s, 'base64');\n    const b = atob(s);\n    const r = new Uint8Array(b.length);\n    for (let i = 0; i < r.length; ++i)\n        r[i] = b.charCodeAt(i);\n    return r;\n};\nfunction InWasm(def) {\n    if (def.d) {\n        const { t, s, d } = def;\n        let b;\n        let m;\n        const W = WebAssembly;\n        if (t === 0 /* OutputType.INSTANCE */) {\n            if (s)\n                return (e) => new W.Instance(m || (m = new W.Module(b || (b = z(d)))), e);\n            return (e) => m\n                ? W.instantiate(m, e)\n                : W.instantiate(b || (b = z(d)), e).then(r => (m = r.module) && r.instance);\n        }\n        if (t === 1 /* OutputType.MODULE */) {\n            if (s)\n                return () => m || (m = new W.Module(b || (b = z(d))));\n            return () => m\n                ? Promise.resolve(m)\n                : W.compile(b || (b = z(d))).then(r => m = r);\n        }\n        if (s)\n            return () => b || (b = z(d));\n        return () => Promise.resolve(b || (b = z(d)));\n    }\n    if (typeof _wasmCtx === 'undefined')\n        throw new Error('must run \"inwasm\"');\n    _wasmCtx.add(def);\n}\n//# sourceMappingURL=index.js.map","// The module cache\nvar __webpack_module_cache__ = {};\n\n// The require function\nfunction __webpack_require__(moduleId) {\n\t// Check if module is in cache\n\tvar cachedModule = __webpack_module_cache__[moduleId];\n\tif (cachedModule !== undefined) {\n\t\treturn cachedModule.exports;\n\t}\n\t// Create a new module (and put it into the cache)\n\tvar module = __webpack_module_cache__[moduleId] = {\n\t\t// no module.id needed\n\t\t// no module.loaded needed\n\t\texports: {}\n\t};\n\n\t// Execute the module function\n\t__webpack_modules__[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n\t// Return the exports of the module\n\treturn module.exports;\n}\n\n","/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport type { ITerminalAddon, IDisposable } from '@xterm/xterm';\nimport type { ImageAddon as IImageApi } from '@xterm/addon-image';\nimport { Emitter, type IEvent } from 'common/Event';\nimport { IIPHandler } from './IIPHandler';\nimport { ImageRenderer } from './ImageRenderer';\nimport { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';\nimport { KittyGraphicsHandler } from './kitty/KittyGraphicsHandler';\nimport { KittyImageStorage } from './kitty/KittyImageStorage';\nimport { SixelHandler } from './SixelHandler';\nimport { SixelImageStorage } from './SixelImageStorage';\nimport { IIPImageStorage } from './IIPImageStorage';\nimport { ITerminalExt, IImageAddonOptions, IResetHandler } from './Types';\n\n\n/**\n * Document VT features provided by this addon.\n *\n * @vt: #E[Supported via @xterm/addon-image.] DCS SIXEL \"SIXEL Graphics\"  \"DCS Ps ; Ps ; Ps ; q Pt ST\"  \"Draw SIXEL image.\"\n *\n * Sixel support is provided by the addon @xterm/addon-image with these limitations:\n * - immediate coloring (no shared palette, allows high color settings of `img2sixel`)\n * - max. palette size of 4096 colors\n * - max. pixel width of 16K\n * - max. 25 MB per sixel sequence\n * - VT340 cursor positioning (begin of last sixel data row)\n *\n * See [addon readme](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image) for more details.\n *\n *\n * @vt: #E[Supported via @xterm/addon-image.] OSC 1337  \"iTerm2 Commands\"   \"OSC 1337 ; Pt BEL\"  \"Custom iTerm2 commands.\"\n *\n * Only the inline image protocol (IIP) is supported by the addon @xterm/addon-image with\n * the following limitations:\n * - sequence:\n *   - format: `OSC 1337 ; File=inline=1 ; size=<unencoded size> ; ... : <base64 payload> BEL`\n *   - size param must be set and payload may not exceed CEIL(size * 4 / 3)\n *   - strict base64 handling as of RFC4648 §4 (standard alphabet, optional padding,\n *     no separator bytes allowed)\n *   - supported params: size, name, width, height, preserveAspectRatio\n * - image formats: PNG, JPEG and GIF\n * - no animation support (renders first image of a GIF)\n * - no multipart support\n * - VT340 cursor positioning (begin of last sixel data row)\n *\n * See [addon readme](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image)\n * and [iTerm2 IIP docs](https://iterm2.com/documentation-images.html) for more details.\n *\n *\n * @vt: #E[Supported via @xterm/addon-image.] APC KITTY_GRAPHICS \"Kitty Graphics\"  \"APC G Pt ST\"  \"Kitty Graphics Protocol.\"\n *\n * Kitty graphics support is provided by the addon @xterm/addon-image.\n * Note that while basic image output already works, this is still work in progress.\n */\n\n// default values of addon ctor options\nconst DEFAULT_OPTIONS: IImageAddonOptions = {\n  enableSizeReports: true,\n  pixelLimit: 16777216, // limit to 4096 * 4096 pixels\n  sixelSupport: true,\n  sixelScrolling: true,\n  sixelPaletteLimit: 4096,\n  sixelSizeLimit: 33554432,\n  storageLimit: 128,\n  showPlaceholder: true,\n  iipSupport: true,\n  iipSizeLimit: 33554432,\n  kittySupport: true,\n  kittySizeLimit: 33554432\n};\n\n// max palette size supported by the sixel lib (compile time setting)\nconst MAX_SIXEL_PALETTE_SIZE = 4096;\n\n// definitions for _xtermGraphicsAttributes sequence\nconst enum GaItem {\n  COLORS = 1,\n  SIXEL_GEO = 2,\n  REGIS_GEO = 3\n}\nconst enum GaAction {\n  READ = 1,\n  SET_DEFAULT = 2,\n  SET = 3,\n  READ_MAX = 4\n}\nconst enum GaStatus {\n  SUCCESS = 0,\n  ITEM_ERROR = 1,\n  ACTION_ERROR = 2,\n  FAILURE = 3\n}\n\n\nexport class ImageAddon implements ITerminalAddon, IImageApi {\n  private _opts: IImageAddonOptions;\n  private _defaultOpts: IImageAddonOptions;\n  private _storage: ImageStorage | undefined;\n  private _renderer: ImageRenderer | undefined;\n  private _disposables: IDisposable[] = [];\n  private _terminal: ITerminalExt | undefined;\n  private _handlers: Map<String, IResetHandler> = new Map();\n  private readonly _onImageAdded = new Emitter<void>();\n  public readonly onImageAdded: IEvent<void> = this._onImageAdded.event;\n\n  constructor(opts?: Partial<IImageAddonOptions>) {\n    this._opts = Object.assign({}, DEFAULT_OPTIONS, opts);\n    this._defaultOpts = Object.assign({}, DEFAULT_OPTIONS, opts);\n  }\n\n  public dispose(): void {\n    for (const handler of this._handlers.values()) handler.reset();\n    for (const obj of this._disposables) {\n      obj.dispose();\n    }\n    this._disposables.length = 0;\n    this._handlers.clear();\n    this._onImageAdded.dispose();\n  }\n\n  private _disposeLater(...args: IDisposable[]): void {\n    for (const obj of args) {\n      this._disposables.push(obj);\n    }\n  }\n\n  public activate(terminal: ITerminalExt): void {\n    this._terminal = terminal;\n\n    // internal data structures\n    this._renderer = new ImageRenderer(terminal);\n    this._storage = new ImageStorage(terminal, this._renderer, this._opts);\n    this._storage.onImageAdded = () => this._onImageAdded.fire();\n\n    // enable size reports\n    if (this._opts.enableSizeReports) {\n      const windowOps = terminal.options.windowOptions ?? {};\n      windowOps.getWinSizePixels = true;\n      windowOps.getCellSizePixels = true;\n      windowOps.getWinSizeChars = true;\n      terminal.options.windowOptions = windowOps;\n    }\n\n    this._disposeLater(\n      this._renderer,\n      this._storage,\n\n      // DECSET/DECRST/DA1/XTSMGRAPHICS handlers\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'h' }, params => this._decset(params)),\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'l' }, params => this._decrst(params)),\n      terminal.parser.registerCsiHandler({ final: 'c' }, params => this._da1(params)),\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'S' }, params => this._xtermGraphicsAttributes(params)),\n\n      // render hook\n      terminal.onRender(range => this._storage?.render(range)),\n\n      /**\n       * reset handlers covered:\n       * - DECSTR\n       * - RIS\n       * - Terminal.reset()\n       */\n      terminal.parser.registerCsiHandler({ intermediates: '!', final: 'p' }, () => this.reset()),\n      terminal.parser.registerEscHandler({ final: 'c' }, () => this.reset()),\n      terminal._core._inputHandler.onRequestReset(() => this.reset()),\n\n      // wipe canvas and delete alternate images on buffer switch\n      terminal.buffer.onBufferChange(() => this._storage?.wipeAlternate()),\n\n      // extend images to the right on resize\n      terminal.onResize(metrics => this._storage?.viewportResize(metrics))\n    );\n\n    // SIXEL handler\n    if (this._opts.sixelSupport) {\n      const sixelStorage = new SixelImageStorage(this._storage!, this._opts, this._renderer!, terminal);\n      const sixelHandler = new SixelHandler(this._opts, sixelStorage, terminal);\n      this._handlers.set('sixel', sixelHandler);\n      this._disposeLater(\n        terminal._core._inputHandler._parser.registerDcsHandler({ final: 'q' }, sixelHandler)\n      );\n    }\n\n    // iTerm IIP handler\n    if (this._opts.iipSupport) {\n      const iipStorage = new IIPImageStorage(this._storage!);\n      const iipHandler = new IIPHandler(this._opts, this._renderer!, iipStorage, terminal);\n      this._handlers.set('iip', iipHandler);\n      this._disposeLater(\n        terminal._core._inputHandler._parser.registerOscHandler(1337, iipHandler)\n      );\n    }\n\n    // Kitty graphics handler\n    if (this._opts.kittySupport) {\n      const kittyStorage = new KittyImageStorage(this._storage!);\n      const kittyHandler = new KittyGraphicsHandler(this._opts, this._renderer!, kittyStorage, terminal);\n      this._handlers.set('kitty', kittyHandler);\n      this._disposeLater(\n        kittyStorage,\n        kittyHandler,\n        terminal._core._inputHandler._parser.registerApcHandler({ final: 'G' }, kittyHandler)\n      );\n    }\n  }\n\n  // Note: storageLimit is skipped here to not intoduce a surprising side effect.\n  public reset(): boolean {\n    // reset options customizable by sequences to defaults\n    this._opts.sixelScrolling = this._defaultOpts.sixelScrolling;\n    this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit;\n    // also clear image storage\n    this._storage?.reset();\n    // reset protocol handlers\n    for (const handler of this._handlers.values()) {\n      handler.reset();\n    }\n    return false;\n  }\n\n  public get storageLimit(): number {\n    return this._storage?.getLimit() || -1;\n  }\n\n  public set storageLimit(limit: number) {\n    this._storage?.setLimit(limit);\n    this._opts.storageLimit = limit;\n  }\n\n  public get storageUsage(): number {\n    if (this._storage) {\n      return this._storage.getUsage();\n    }\n    return -1;\n  }\n\n  public get showPlaceholder(): boolean {\n    return this._opts.showPlaceholder;\n  }\n\n  public set showPlaceholder(value: boolean) {\n    this._opts.showPlaceholder = value;\n    this._renderer?.showPlaceholder(value);\n  }\n\n  public getImageAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    return this._storage?.getImageAtBufferCell(x, y);\n  }\n\n  public extractTileAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    return this._storage?.extractTileAtBufferCell(x, y);\n  }\n\n  private _report(s: string): void {\n    this._terminal?._core.input(s, false);\n  }\n\n  private _decset(params: (number | number[])[]): boolean {\n    for (let i = 0; i < params.length; ++i) {\n      switch (params[i]) {\n        case 80:\n          this._opts.sixelScrolling = false;\n          break;\n      }\n    }\n    return false;\n  }\n\n  private _decrst(params: (number | number[])[]): boolean {\n    for (let i = 0; i < params.length; ++i) {\n      switch (params[i]) {\n        case 80:\n          this._opts.sixelScrolling = true;\n          break;\n      }\n    }\n    return false;\n  }\n\n  // overload DA to return something more appropriate\n  private _da1(params: (number | number[])[]): boolean {\n    if (params[0]) {\n      return true;\n    }\n    // reported features:\n    // 62 - VT220\n    // 4 - SIXEL support\n    // 9 - charsets\n    // 22 - ANSI colors\n    if (this._opts.sixelSupport) {\n      this._report(`\\x1b[?62;4;9;22c`);\n      return true;\n    }\n    return false;\n  }\n\n  /**\n   * Implementation of xterm's graphics attribute sequence.\n   *\n   * Supported features:\n   * - read/change palette limits (max 4096 by sixel lib)\n   * - read SIXEL canvas geometry (reports current window canvas or\n   *   squared pixelLimit if canvas > pixel limit)\n   *\n   * Everything else is deactivated.\n   */\n  private _xtermGraphicsAttributes(params: (number | number[])[]): boolean {\n    if (params.length < 2) {\n      return true;\n    }\n    if (params[0] === GaItem.COLORS) {\n      switch (params[1]) {\n        case GaAction.READ:\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          return true;\n        case GaAction.SET_DEFAULT:\n          this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit;\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          // also reset protocol handlers for now\n          for (const handler of this._handlers.values()) {\n            handler.reset();\n          }\n          return true;\n        case GaAction.SET:\n          if (params.length > 2 && !(params[2] instanceof Array) && params[2] <= MAX_SIXEL_PALETTE_SIZE) {\n            this._opts.sixelPaletteLimit = params[2];\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          } else {\n            this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          }\n          return true;\n        case GaAction.READ_MAX:\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${MAX_SIXEL_PALETTE_SIZE}S`);\n          return true;\n        default:\n          this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          return true;\n      }\n    }\n    if (params[0] === GaItem.SIXEL_GEO) {\n      switch (params[1]) {\n        // we only implement read and read_max here\n        case GaAction.READ:\n          let width = this._renderer?.dimensions?.css.canvas.width;\n          let height = this._renderer?.dimensions?.css.canvas.height;\n          if (!width || !height) {\n            // for some reason we have no working image renderer\n            // --> fallback to default cell size\n            const cellSize = CELL_SIZE_DEFAULT;\n            width = (this._terminal?.cols || 80) * cellSize.width;\n            height = (this._terminal?.rows || 24) * cellSize.height;\n          }\n          if (width * height < this._opts.pixelLimit) {\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${width.toFixed(0)};${height.toFixed(0)}S`);\n          } else {\n            // if we overflow pixelLimit report that squared instead\n            const x = Math.floor(Math.sqrt(this._opts.pixelLimit));\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${x};${x}S`);\n          }\n          return true;\n        case GaAction.READ_MAX:\n          // read_max returns pixelLimit as square area\n          const x = Math.floor(Math.sqrt(this._opts.pixelLimit));\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${x};${x}S`);\n          return true;\n        default:\n          this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          return true;\n      }\n    }\n    // exit with error on ReGIS or any other requests\n    this._report(`\\x1b[?${params[0]};${GaStatus.ITEM_ERROR}S`);\n    return true;\n  }\n}\n"],"names":["root","factory","exports","module","define","amd","globalThis","red","n","green","blue","toRGBA8888","r","g","b","a","clamp","low","high","value","Math","max","min","h2c","t1","t2","c","normalizeRGB","round","Object","defineProperty","DEFAULT_FOREGROUND","DEFAULT_BACKGROUND","PALETTE_ANSI_256","PALETTE_VT340_GREY","PALETTE_VT340_COLOR","normalizeHLS","nearestColorIndex","fromRGBA8888","alpha","BIG_ENDIAN","Uint8Array","Uint32Array","buffer","console","warn","color","palette","Number","MAX_SAFE_INTEGER","idx","i","length","dr","dg","db","d","h","l","s","v","HLStoRGB","p","push","decodeAsync","decode","Decoder","DecoderAsync","Colors_1","__webpack_require__","wasm_1","WASM_BYTES","Buffer","from","bytestring","atob","result","charCodeAt","decodeBase64","LIMITS","BYTES","WASM_MODULE","NULL_CANVAS","CallbackProxy","constructor","this","bandHandler","width","modeHandler","mode","handle_band","mode_parsed","DEFAULT_OPTIONS","memoryLimit","sixelColor","fillColor","paletteLimit","PALETTE_SIZE","truncate","opts","cbProxy","importObj","env","bind","WebAssembly","instantiate","then","inst","instance","_instance","_cbProxy","_PIXEL_OFFSET","MAX_WIDTH","_canvas","_bandWidths","_maxWidth","_minWidth","_lastOffset","_currentHeight","_opts","assign","Error","_handle_band","_initCanvas","Module","Instance","_wasm","_chunk","memory","get_chunk_address","CHUNK_SIZE","_states","get_state_address","_palette","get_palette_address","set","_pSrc","get_p0_address","init","_fillColor","_truncate","_rasterWidth","_rasterHeight","_width","_height","_level","_mode","_paletteLimit","pixels","height","release","_realloc","offset","additionalPixels","newCanvas","ceil","adv","remaining","subarray","current_width","current_height","memoryUsage","byteLength","properties","level","memUsage","rasterAttributes","numerator","denominator","data","start","end","decodeString","j","data32","currentWidth","fill","escape","final","finalOffset","bw","currentHeight","data8","Uint8ClampedArray","dec","async","Lifecycle_1","EventUtils","_listeners","_disposed","event","_event","listener","thisArgs","disposables","toDisposable","entry","fn","slice","indexOf","splice","Array","isArray","add","fire","call","listeners","len","dispose","forward","to","e","map","undefined","any","events","store","DisposableStore","runAndSubscribe","handler","initial","arg","_disposables","Set","_isDisposed","isDisposed","o","clear","Disposable","_store","_register","None","freeze","_value","ImageRenderer_1","ImageStorage_1","Base64Decoder_wasm_1","__importDefault","QoiDecoder_wasm_1","IIPHeaderParser_1","IIPMetrics_1","DEFAULT_HEADER","type","name","size","preserveAspectRatio","inline","_renderer","_storage","_coreTerminal","_generation","_aborted","_hp","HeaderParser","_header","_isMultipart","_abortMulti","maxEncodedBytes","iipSizeLimit","initialBytes","_dec","default","_qoiDec","reset","put","state","dataPos","parse","fields","_initDecoder","success","seqType","w","CELL_SIZE_DEFAULT","dimensions","css","canvas","cols","rows","scale","_c","_a","_core","_coreBrowserService","dpr","report","toFixed","input","cond","blob","metrics","UNSUPPORTED_TYPE","imageType","mime","pixelLimit","_resize","floor","ImageData","byteOffset","ImageRenderer","createCanvas","_b","getContext","putImageData","addImage","Blob","generation","createImageBitmap","resizeWidth","resizeHeight","bm","close","catch","cw","cell","ch","_d","rw","_dim","rh","wf","hf","f","total","cdim","endsWith","parseInt","toStr","String","fromCharCode","toInt","toSize","match","DECODERS","toString","bs","TextDecoder","FILE_MARKER","MULTIPARTFILE_MARKER","FILEPART_MARKER","FILEEND_MARKER","REPORTCELLSIZE_MARKER","MAX_FIELDCHARS","_buffer","_position","_key","k","_storeValue","pos","_storeKey","_addImageOpts","scrolling","layer","zIndex","cursorPos","img","d32","blockLength","jpgSize","dim","limit","_layers","get","localDocument","document","createElement","createImageData","ctx","imgData","Promise","resolve","_terminal","super","Map","_optionsRefresh","MutableDisposable","_oldOpen","open","parent","_open","screenElement","optionsService","onOptionChange","option","rescaleCanvas","_renderService","refreshRows","removeLayerFromDom","_oldSetRenderer","setRenderer","_placeholderBitmap","_placeholder","showPlaceholder","cellSize","_createPlaceHolder","clearLines","y","clearRect","_e","clearAll","draw","imgSpec","tileId","col","row","count","_rescaleImage","actual","sourceWidth","sourceHeight","actualCellSize","sx","sy","dx","dy","finalWidth","finalHeight","drawImage","extractTile","drawPlaceholder","values","spec","originalWidth","originalHeight","origCellSize","orig","scaledWidth","scaledHeight","renderer","key","keys","insertLayerToDom","has","classList","style","isolation","insertBefore","firstChild","appendChild","remove","delete","hasLayer","bWidth","blueprint","black","white","shift","x","screen","ctx2","placeholder","bitmap","window","ExtendedAttrsImage","ext","_urlId","_ext","underlineStyle","underlineColor","underlineVariantOffset","val","urlId","imageId","clone","isEmpty","EMPTY_ATTRS","_images","_lastId","_lowestId","_fullyCleared","_needsFullClear","_pixelLimit","setLimit","storageLimit","error","message","getLimit","_viewportMetrics","marker","RangeError","_evictOldest","getUsage","_getStoredPixels","storedPixels","_delImg","id","ImageBitmap","onImageDeleted","wipeAlternate","zero","entries","bufferType","deleteImage","termCols","termRows","originX","originY","tileCount","_inputHandler","_dirtyRowTracker","markDirty","line","lines","ybase","_writeToCell","lineFeed","endMarker","registerMarker","onDispose","active","_evictOnAlternate","onImageAdded","render","range","hasTopImages","hasBottomImages","drawCalls","placeholderCalls","ydisp","getBg","_extendedAttrs","startTile","startCol","sort","viewportResize","oldCol","tilesPerRow","hasData","rightCol","_data","lastTile","expandCol","getImageAtBufferCell","extractTileAtBufferCell","room","used","current","old","oldSpec","imgId","Decoder_1","DEFAULT_PALETTE","idleDecoders","poolPrimed","releaseDecoder","idle","convertLe","_size","_decMemoryLimit","_returnDecoder","hook","params","pop","acquireDecoder","attr","colors","bg","isInverse","isFgDefault","foreground","rgba","isFgRGB","t","toColorRGB","getFgColor","ansi","isBgDefault","background","isBgRGB","getBgColor","extractActiveBg","_curAttrData","_themeService","sixelPaletteLimit","sixelSizeLimit","unhook","_unhook","advanceCursor","sixelScrolling","KittyGraphicsTypes_1","_kittyStorage","_decodeError","_activeDecoder","_inControlData","_controlData","_controlLength","_encodedSizeLimit","_totalEncodedSize","_parsedCommand","_pendingTransmissions","_maxEncodedBytes","kittySizeLimit","_initialEncodedBytes","_cleanupAllPending","_removePendingEntry","_lastPendingKey","pending","decoder","controlEnd","copyLength","parseKittyCommand","_parseControlDataString","imageNumber","_sendResponse","quiet","action","payloadStart","_streamPayload","pendingKey","previousEncodedSize","_f","totalEncodedSize","decoderToRelease","_g","decoderCapacity","_h","maxPending","oldest","next","cmd","_j","_k","_handleNoPayloadCommand","_handleDelete","isMoreComing","more","decodeError","finalCmd","imageBytes","_handleCommandWithBytesAndCmd","str","fromCodePoint","_handlePlacement","bytes","_handleTransmit","transmission","_handleTransmitDisplay","_handleQuery","image","getImage","_displayImage","placementId","storeImage","format","compression","lastImageId","expectedBytes","deleteSelector","deleteAll","deleteById","isOk","response","coreService","triggerDataEvent","_decodeAndDisplay","_createBitmap","cropX","cropY","cropW","cropH","maxCropW","maxCropH","finalCropW","finalCropH","cropped","imgCols","imgRows","columns","savedX","savedY","savedYbase","scaled","xOffset","yOffset","canvasW","canvasH","offsetCanvas","offsetCtx","offsetBitmap","cursorMovement","scrolled","arrayBuffer","_decompressZlib","url","URL","createObjectURL","Image","reject","addEventListener","revokeObjectURL","src","pixelCount","src32","dst32","alignedPixels","srcOffset","dstOffset","b0","b1","b2","srcByte","dstByte","compressed","_decompress","offsetIn","reader","ReadableStream","pull","controller","enqueue","pipeThrough","DecompressionStream","getReader","chunks","totalLength","done","read","cancel","releaseLock","chunk","images","_kittyIdToStorageId","kittyIdToStorageId","pendingTransmissions","parts","split","part","eqIdx","substring","numValue","KittyImageStorage","_nextImageId","_storageIdToKittyId","_handleStorageImageDeleted","storageId","kittyId","_previousOnImageDeleted","_wrappedOnImageDeleted","imageData","oldStorageId","_maxStoredImages","_evictUndisplayedImages","byteLimit","retainedBytes","evictPlaced","oldestId","wasmDecode","InWasm","MAP","el","D","EMPTY","keepSize","maxBytes","_inst","_ended","_bytes","_m32","_mem","m","grow","Memory","requested","needed","newSize","addPages","loadedBytes","freeBytes","wasmQoiDecode","ib","dl","chunkP","def","W","z","compile","_wasmCtx","fromBase64","__webpack_module_cache__","moduleId","cachedModule","__webpack_modules__","Event_1","IIPHandler_1","KittyGraphicsHandler_1","KittyImageStorage_1","SixelHandler_1","SixelImageStorage_1","IIPImageStorage_1","enableSizeReports","sixelSupport","iipSupport","kittySupport","_handlers","_onImageAdded","Emitter","_defaultOpts","obj","_disposeLater","args","activate","terminal","ImageStorage","windowOps","options","windowOptions","getWinSizePixels","getCellSizePixels","getWinSizeChars","parser","registerCsiHandler","prefix","_decset","_decrst","_da1","_xtermGraphicsAttributes","onRender","intermediates","registerEscHandler","onRequestReset","onBufferChange","onResize","sixelStorage","SixelImageStorage","sixelHandler","SixelHandler","_parser","registerDcsHandler","iipStorage","IIPImageStorage","iipHandler","IIPHandler","registerOscHandler","kittyStorage","kittyHandler","KittyGraphicsHandler","registerApcHandler","storageUsage","_report","sqrt"],"sourceRoot":""}
 \ No newline at end of file
 diff --git a/lib/addon-image.mjs b/lib/addon-image.mjs
-index 753a4f833c038a3f45802377dcb16a93695f2161..29c3984db57b888a058165c8aa02ccbcf8efcd2f 100644
+index 753a4f833c038a3f45802377dcb16a93695f2161..aca74ad0c769e8525bc5e4ab8cc6dda03959f760 100644
 --- a/lib/addon-image.mjs
 +++ b/lib/addon-image.mjs
 @@ -14,5 +14,5 @@
@@ -26,10 +26,10 @@ index 753a4f833c038a3f45802377dcb16a93695f2161..29c3984db57b888a058165c8aa02ccbc
   *  Licensed under the MIT License. See License.txt in the project root for license information.
   *--------------------------------------------------------------------------------------------*/
 -var it=Object.create;var Te=Object.defineProperty;var At=Object.getOwnPropertyDescriptor;var rt=Object.getOwnPropertyNames;var st=Object.getPrototypeOf,nt=Object.prototype.hasOwnProperty;var x=(r,e)=>()=>{try{return e||r((e={exports:{}}).exports,e),e.exports}catch(t){throw e=0,t}};var at=(r,e,t,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let A of rt(e))!nt.call(r,A)&&A!==t&&Te(r,A,{get:()=>e[A],enumerable:!(i=At(e,A))||i.enumerable});return r};var M=(r,e,t)=>(t=r!=null?it(st(r)):{},at(e||!r||!r.__esModule?Te(t,"default",{value:r,enumerable:!0}):t,r));var X=x(_=>{"use strict";Object.defineProperty(_,"__esModule",{value:!0});_.DEFAULT_FOREGROUND=_.DEFAULT_BACKGROUND=_.PALETTE_ANSI_256=_.PALETTE_VT340_GREY=_.PALETTE_VT340_COLOR=_.normalizeHLS=_.normalizeRGB=_.nearestColorIndex=_.fromRGBA8888=_.toRGBA8888=_.alpha=_.blue=_.green=_.red=_.BIG_ENDIAN=void 0;_.BIG_ENDIAN=new Uint8Array(new Uint32Array([4278190080]).buffer)[0]===255;_.BIG_ENDIAN&&console.warn("BE platform detected. This version of node-sixel works only on LE properly.");function xe(r){return r&255}_.red=xe;function Me(r){return r>>>8&255}_.green=Me;function ve(r){return r>>>16&255}_.blue=ve;function ht(r){return r>>>24&255}_.alpha=ht;function B(r,e,t,i=255){return((i&255)<<24|(t&255)<<16|(e&255)<<8|r&255)>>>0}_.toRGBA8888=B;function gt(r){return[r&255,r>>8&255,r>>16&255,r>>>24]}_.fromRGBA8888=gt;function It(r,e){let t=xe(r),i=Me(r),A=ve(r),s=Number.MAX_SAFE_INTEGER,n=-1;for(let a=0;a<e.length;++a){let o=t-e[a][0],g=i-e[a][1],h=A-e[a][2],I=o*o+g*g+h*h;if(!I)return a;I<s&&(s=I,n=a)}return n}_.nearestColorIndex=It;function ge(r,e,t){return Math.max(r,Math.min(t,e))}function Ie(r,e,t){return t<0&&(t+=1),t>1&&(t-=1),t*6<1?e+(r-e)*6*t:t*2<1?r:t*3<2?e+(r-e)*(4-t*6):e}function dt(r,e,t){if(!t){let s=Math.round(e*255);return B(s,s,s)}let i=e<.5?e*(1+t):e+t-e*t,A=2*e-i;return B(ge(0,255,Math.round(Ie(i,A,r+1/3)*255)),ge(0,255,Math.round(Ie(i,A,r)*255)),ge(0,255,Math.round(Ie(i,A,r-1/3)*255)))}function m(r,e,t){return(4278190080|Math.round(t/100*255)<<16|Math.round(e/100*255)<<8|Math.round(r/100*255))>>>0}_.normalizeRGB=m;function lt(r,e,t){return dt((r+240%360)/360,e/100,t/100)}_.normalizeHLS=lt;_.PALETTE_VT340_COLOR=new Uint32Array([m(0,0,0),m(20,20,80),m(80,13,13),m(20,80,20),m(80,20,80),m(20,80,80),m(80,80,20),m(53,53,53),m(26,26,26),m(33,33,60),m(60,26,26),m(33,60,33),m(60,33,60),m(33,60,60),m(60,60,33),m(80,80,80)]);_.PALETTE_VT340_GREY=new Uint32Array([m(0,0,0),m(13,13,13),m(26,26,26),m(40,40,40),m(6,6,6),m(20,20,20),m(33,33,33),m(46,46,46),m(0,0,0),m(13,13,13),m(26,26,26),m(40,40,40),m(6,6,6),m(20,20,20),m(33,33,33),m(46,46,46)]);_.PALETTE_ANSI_256=(()=>{let r=[B(0,0,0),B(205,0,0),B(0,205,0),B(205,205,0),B(0,0,238),B(205,0,205),B(0,250,205),B(229,229,229),B(127,127,127),B(255,0,0),B(0,255,0),B(255,255,0),B(92,92,255),B(255,0,255),B(0,255,255),B(255,255,255)],e=[0,95,135,175,215,255];for(let t=0;t<6;++t)for(let i=0;i<6;++i)for(let A=0;A<6;++A)r.push(B(e[t],e[i],e[A]));for(let t=8;t<=238;t+=10)r.push(B(t,t,t));return new Uint32Array(r)})();_.DEFAULT_BACKGROUND=B(0,0,0,255);_.DEFAULT_FOREGROUND=B(255,255,255,255)});var ce=x(le=>{"use strict";Object.defineProperty(le,"__esModule",{value:!0});le.InWasm=Ct;var v=r=>{if(Uint8Array.fromBase64)return Uint8Array.fromBase64(r);if(typeof Buffer<"u")return Buffer.from(r,"base64");let e=atob(r),t=new Uint8Array(e.length);for(let i=0;i<t.length;++i)t[i]=e.charCodeAt(i);return t};function Ct(r){if(r.d){let{t:e,s:t,d:i}=r,A,s,n=WebAssembly;return e===0?t?a=>new n.Instance(s||(s=new n.Module(A||(A=v(i)))),a):a=>s?n.instantiate(s,a):n.instantiate(A||(A=v(i)),a).then(o=>(s=o.module)&&o.instance):e===1?t?()=>s||(s=new n.Module(A||(A=v(i)))):()=>s?Promise.resolve(s):n.compile(A||(A=v(i))).then(a=>s=a):t?()=>A||(A=v(i)):()=>Promise.resolve(A||(A=v(i)))}if(typeof _wasmCtx>"u")throw new Error('must run "inwasm"');_wasmCtx.add(r)}});var ue=x(_e=>{"use strict";Object.defineProperty(_e,"__esModule",{value:!0});var pt=ce(),Bt=(0,pt.InWasm)({s:1,t:0,d:"AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML"}),S=new Uint8Array("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("").map(r=>r.charCodeAt(0))),R=new Uint32Array(1024);R.fill(4278190080);for(let r=0;r<S.length;++r)R[S[r]]=r<<2;for(let r=0;r<S.length;++r)R[256+S[r]]=r>>4|(r<<4&255)<<8;for(let r=0;r<S.length;++r)R[512+S[r]]=r>>2<<8|(r<<6&255)<<16;for(let r=0;r<S.length;++r)R[768+S[r]]=r<<16;var ft=new Uint8Array(0),me=class{constructor(e,t,i){if(this._inst=null,this._ended=!0,this._bytes=0,this.keepSize=e??1048576,this.maxBytes=t??4294901760,this._bytes=i??32768,this._bytes>this.maxBytes||this.maxBytes>4294901760)throw new Error("invalid byte settings")}get data8(){return this._inst?this._d.subarray(0,this._m32[1282]):ft}release(){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))}init(e,t){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");let i=this._m32,A=this._bytes+5152;this._inst?this._mem.buffer.byteLength<A&&(this._mem.grow(Math.ceil((A-this._mem.buffer.byteLength)/65536)),i=new Uint32Array(this._mem.buffer,0),this._d=new Uint8Array(this._mem.buffer,5152)):(this._mem=new WebAssembly.Memory({initial:Math.ceil(A/65536)}),this._inst=Bt({env:{memory:this._mem}}),i=new Uint32Array(this._mem.buffer,0),i.set(R,256),this._d=new Uint8Array(this._mem.buffer,5152)),i[1280]=0,i[1281]=0,i[1282]=0,this._m32=i,this._ended=!1}_realloc(e){let t=this._m32[1280]+e;if(this._bytes<t){if(t>this.maxBytes)return-3;let i=this._bytes;for(;(i*=2)<t;);if(i=Math.min(i,this.maxBytes),i<t)return-3;if(i+5152>this._mem.buffer.byteLength){let A=Math.ceil((i+5152-this._mem.buffer.byteLength)/65536);this._mem.grow(A),this._m32=new Uint32Array(this._mem.buffer,0),this._d=new Uint8Array(this._mem.buffer,5152)}this._bytes=i}return 0}put(e){if(!this._inst||this._ended)return-2;if(this._realloc(e.length))return-3;let t=this._m32;return this._d.set(e,t[1280]),t[1280]+=e.length,t[1280]-t[1281]>=131072?this._inst.exports.dec():0}end(){return this._ended=!0,this._inst?this._inst.exports.end():-2}get loadedBytes(){return this._inst?this._m32[1280]:0}get freeBytes(){return this._inst?this.maxBytes-this._m32[1280]:0}};_e.default=me});var Re=x(Ce=>{"use strict";Object.defineProperty(Ce,"__esModule",{value:!0});var Qt=ce(),Dt=(0,Qt.InWasm)({s:1,t:0,d:"AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw=="}),Ee=class{constructor(e){this.keepSize=e,this.width=0,this.height=0}decode(e){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];let t=this.width*this.height,i=t*4,A=e.length,s=Math.max(i,A)+(Math.min(i,A)>>1)+4096;this._inst?this._mem.buffer.byteLength<s&&(this._mem.grow(Math.ceil((s-this._mem.buffer.byteLength)/65536)),this._d=null):(this._mem=new WebAssembly.Memory({initial:Math.ceil(s/65536)}),this._inst=Dt({env:{memory:this._mem}})),this._d||(this._d=new Uint8Array(this._mem.buffer));let n=this._mem.buffer.byteLength-A&-256;return this._d.set(e,n),this._inst.exports.dec(n,A,t),this._d.subarray(1024,1024+i)}release(){this._inst&&this._mem.buffer.byteLength>this.keepSize&&(this._inst=this._d=this._mem=null)}};Ce.default=Ee});var Ke=x(ie=>{"use strict";Object.defineProperty(ie,"__esModule",{value:!0});ie.LIMITS=void 0;ie.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"}});var We=x(b=>{"use strict";Object.defineProperty(b,"__esModule",{value:!0});b.decodeAsync=b.decode=b.Decoder=b.DecoderAsync=void 0;var O=X(),f=Ke();function yt(r){if(typeof Buffer<"u")return Buffer.from(r,"base64");let e=atob(r),t=new Uint8Array(e.length);for(let i=0;i<t.length;++i)t[i]=e.charCodeAt(i);return t}var Ye=yt(f.LIMITS.BYTES),J,Ae=new Uint32Array,ye=class{constructor(){this.bandHandler=e=>1,this.modeHandler=e=>1}handle_band(e){return this.bandHandler(e)}mode_parsed(e){return this.modeHandler(e)}},St={memoryLimit:2048*65536,sixelColor:O.DEFAULT_FOREGROUND,fillColor:O.DEFAULT_BACKGROUND,palette:O.PALETTE_VT340_COLOR,paletteLimit:f.LIMITS.PALETTE_SIZE,truncate:!0};function qe(r){let e=new ye,t={env:{handle_band:e.handle_band.bind(e),mode_parsed:e.mode_parsed.bind(e)}};return WebAssembly.instantiate(J||Ye,t).then(i=>(J=J||i.module,new P(r,i.instance||i,e)))}b.DecoderAsync=qe;var P=class{constructor(e,t,i){if(this._PIXEL_OFFSET=f.LIMITS.MAX_WIDTH+4,this._canvas=Ae,this._bandWidths=[],this._maxWidth=0,this._minWidth=f.LIMITS.MAX_WIDTH,this._lastOffset=0,this._currentHeight=0,this._opts=Object.assign({},St,e),this._opts.paletteLimit>f.LIMITS.PALETTE_SIZE)throw new Error(`DecoderOptions.paletteLimit must not exceed ${f.LIMITS.PALETTE_SIZE}`);if(t)i.bandHandler=this._handle_band.bind(this),i.modeHandler=this._initCanvas.bind(this);else{let A=J||(J=new WebAssembly.Module(Ye));t=new WebAssembly.Instance(A,{env:{handle_band:this._handle_band.bind(this),mode_parsed:this._initCanvas.bind(this)}})}this._instance=t,this._wasm=this._instance.exports,this._chunk=new Uint8Array(this._wasm.memory.buffer,this._wasm.get_chunk_address(),f.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(),f.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(O.DEFAULT_FOREGROUND,0,this._opts.paletteLimit,0)}get _fillColor(){return this._states[0]}get _truncate(){return this._states[8]}get _rasterWidth(){return this._states[6]}get _rasterHeight(){return this._states[7]}get _width(){return this._states[2]?this._states[2]-4:0}get _height(){return this._states[3]}get _level(){return this._states[9]}get _mode(){return this._states[10]}get _paletteLimit(){return this._states[11]}_initCanvas(e){if(e===2){let t=this.width*this.height;if(t>this._canvas.length){if(this._opts.memoryLimit&&t*4>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");this._canvas=new Uint32Array(t)}this._maxWidth=this._width}else if(e===1)if(this._level===2){let t=Math.min(this._rasterWidth,f.LIMITS.MAX_WIDTH)*this._rasterHeight;if(t>this._canvas.length){if(this._opts.memoryLimit&&t*4>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");this._canvas=new Uint32Array(t)}}else this._canvas.length<65536&&(this._canvas=new Uint32Array(65536));return 0}_realloc(e,t){let i=e+t;if(i>this._canvas.length){if(this._opts.memoryLimit&&i*4>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");let A=new Uint32Array(Math.ceil(i/65536)*65536);A.set(this._canvas),this._canvas=A}}_handle_band(e){let t=this._PIXEL_OFFSET,i=this._lastOffset;if(this._mode===2){let A=this.height-this._currentHeight,s=0;for(;s<6&&A>0;)this._canvas.set(this._pSrc.subarray(t*s,t*s+e),i+e*s),s++,A--;this._lastOffset+=e*s,this._currentHeight+=s}else if(this._mode===1){this._realloc(i,e*6),this._maxWidth=Math.max(this._maxWidth,e),this._minWidth=Math.min(this._minWidth,e);for(let A=0;A<6;++A)this._canvas.set(this._pSrc.subarray(t*A,t*A+e),i+e*A);this._bandWidths.push(e),this._lastOffset+=e*6,this._currentHeight+=6}return 0}get width(){return this._mode!==1?this._width:Math.max(this._maxWidth,this._wasm.current_width())}get height(){return this._mode!==1?this._height:this._wasm.current_width()?this._bandWidths.length*6+this._wasm.current_height():this._bandWidths.length*6}get palette(){return this._palette.subarray(0,this._paletteLimit)}get memoryUsage(){return this._canvas.byteLength+this._wasm.memory.buffer.byteLength+8*this._bandWidths.length}get properties(){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}}}init(e=this._opts.fillColor,t=this._opts.palette,i=this._opts.paletteLimit,A=this._opts.truncate){this._wasm.init(this._opts.sixelColor,e,i,A?1:0),t&&this._palette.set(t.subarray(0,f.LIMITS.PALETTE_SIZE)),this._bandWidths.length=0,this._maxWidth=0,this._minWidth=f.LIMITS.MAX_WIDTH,this._lastOffset=0,this._currentHeight=0}decode(e,t=0,i=e.length){let A=t;for(;A<i;){let s=Math.min(i-A,f.LIMITS.CHUNK_SIZE);this._chunk.set(e.subarray(A,A+=s)),this._wasm.decode(0,s)}}decodeString(e,t=0,i=e.length){let A=t;for(;A<i;){let s=Math.min(i-A,f.LIMITS.CHUNK_SIZE);for(let n=0,a=A;n<s;++n,++a)this._chunk[n]=e.charCodeAt(a);A+=s,this._wasm.decode(0,s)}}get data32(){if(this._mode===0||!this.width||!this.height)return Ae;let e=this._wasm.current_width();if(this._mode===2){let t=this.height-this._currentHeight;if(t>0){let i=this._PIXEL_OFFSET,A=this._lastOffset,s=0;for(;s<6&&t>0;)this._canvas.set(this._pSrc.subarray(i*s,i*s+e),A+e*s),s++,t--;t&&this._canvas.fill(this._fillColor,A+e*s)}return this._canvas.subarray(0,this.width*this.height)}if(this._mode===1){if(this._minWidth===this._maxWidth){let s=!1;if(e)if(e!==this._minWidth)s=!0;else{let n=this._PIXEL_OFFSET,a=this._lastOffset;this._realloc(a,e*6);for(let o=0;o<6;++o)this._canvas.set(this._pSrc.subarray(n*o,n*o+e),a+e*o)}if(!s)return this._canvas.subarray(0,this.width*this.height)}let t=new Uint32Array(this.width*this.height);t.fill(this._fillColor);let i=0,A=0;for(let s=0;s<this._bandWidths.length;++s){let n=this._bandWidths[s];for(let a=0;a<6;++a)t.set(this._canvas.subarray(A,A+=n),i),i+=this.width}if(e){let s=this._PIXEL_OFFSET,n=this._wasm.current_height();for(let a=0;a<n;++a)t.set(this._pSrc.subarray(s*a,s*a+e),i+this.width*a)}return t}return Ae}get data8(){return new Uint8ClampedArray(this.data32.buffer,0,this.width*this.height*4)}release(){this._canvas=Ae,this._bandWidths.length=0,this._maxWidth=0,this._minWidth=f.LIMITS.MAX_WIDTH,this._wasm.init(O.DEFAULT_FOREGROUND,0,this._opts.paletteLimit,0)}};b.Decoder=P;function Lt(r,e){let t=new P(e);return t.init(),typeof r=="string"?t.decodeString(r):t.decode(r),{width:t.width,height:t.height,data32:t.data32,data8:t.data8}}b.decode=Lt;async function Tt(r,e){let t=await qe(e);return t.init(),typeof r=="string"?t.decodeString(r):t.decode(r),{width:t.width,height:t.height,data32:t.data32,data8:t.data8}}b.decodeAsync=Tt});function H(r){return{dispose:r}}var N=class{constructor(){this._disposables=new Set;this._isDisposed=!1}get isDisposed(){return this._isDisposed}add(e){return this._isDisposed?e.dispose():this._disposables.add(e),e}dispose(){if(!this._isDisposed){this._isDisposed=!0;for(let e of this._disposables)e.dispose();this._disposables.clear()}}clear(){for(let e of this._disposables)e.dispose();this._disposables.clear()}},k=class{constructor(){this._store=new N}dispose(){this._store.dispose()}_register(e){return this._store.add(e)}};k.None=Object.freeze({dispose(){}});var W=class{constructor(){this._isDisposed=!1}get value(){return this._isDisposed?void 0:this._value}set value(e){this._isDisposed||e===this._value||(this._value?.dispose(),this._value=e)}clear(){this.value=void 0}dispose(){this._isDisposed=!0,this._value?.dispose(),this._value=void 0}};var z=class{constructor(){this._listeners=[];this._disposed=!1}get event(){return this._event?this._event:(this._event=(e,t,i)=>{if(this._disposed)return H(()=>{});let A={fn:e,thisArgs:t};this._listeners=this._listeners.slice(),this._listeners.push(A);let s=H(()=>{let n=this._listeners.indexOf(A);n!==-1&&(this._listeners=this._listeners.slice(),this._listeners.splice(n,1))});return i&&(Array.isArray(i)?i.push(s):i.add(s)),s},this._event)}fire(e){if(this._disposed||!this._listeners.length)return;if(this._listeners.length===1){this._listeners[0].fn.call(this._listeners[0].thisArgs,e);return}let t=this._listeners;for(let i=0,A=t.length;i<A;++i)t[i].fn.call(t[i].thisArgs,e)}dispose(){this._disposed||(this._disposed=!0,this._listeners.length=0)}},ot;(A=>{function r(s,n){return s(a=>n.fire(a))}A.forward=r;function e(s,n){return(a,o,g)=>s(h=>a.call(o,n(h)),void 0,g)}A.map=e;function t(...s){return(n,a,o)=>{let g=new N;for(let h of s)g.add(h(I=>n.call(a,I)));return o&&(Array.isArray(o)?o.push(g):o.add(g)),g}}A.any=t;function i(s,n,a){return n(a),s(o=>n(o))}A.runAndSubscribe=i})(ot||={});var de=M(X());var D=class r extends k{constructor(t){super();this._terminal=t;this._layers=new Map;this._optionsRefresh=this._register(new W);this._oldOpen=this._terminal._core.open,this._terminal._core.open=i=>{this._oldOpen?.call(this._terminal._core,i),this._open()},this._terminal._core.screenElement&&this._open(),this._optionsRefresh.value=this._terminal._core.optionsService.onOptionChange(i=>{i==="fontSize"&&(this.rescaleCanvas(),this._renderService?.refreshRows(0,this._terminal.rows))}),this._register(H(()=>{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}))}get canvas(){return this._layers.get("top")?.canvas}static createCanvas(t,i,A){let s=(t??document).createElement("canvas");return s.width=i|0,s.height=A|0,s}static createImageData(t,i,A,s){if(typeof ImageData!="function"){let n=t.createImageData(i,A);return s&&n.data.set(new Uint8ClampedArray(s,0,i*A*4)),n}return s?new ImageData(new Uint8ClampedArray(s,0,i*A*4),i,A):new ImageData(i,A)}static createImageBitmap(t){return typeof createImageBitmap!="function"?Promise.resolve(void 0):createImageBitmap(t)}showPlaceholder(t){t?!this._placeholder&&this.cellSize.height!==-1&&this._createPlaceHolder(Math.max(this.cellSize.height+1,24)):(this._placeholderBitmap?.close(),this._placeholderBitmap=void 0,this._placeholder=void 0),this._renderService?.refreshRows(0,this._terminal.rows)}get dimensions(){return this._terminal.dimensions}get cellSize(){return{width:this.dimensions?.css.cell.width||-1,height:this.dimensions?.css.cell.height||-1}}clearLines(t,i,A){let s=t*(this.dimensions?.css.cell.height||0),n=this.dimensions?.css.canvas.width||0,a=(i+1-t)*(this.dimensions?.css.cell.height||0);(!A||A==="top")&&this._layers.get("top")?.clearRect(0,s,n,a),(!A||A==="bottom")&&this._layers.get("bottom")?.clearRect(0,s,n,a)}clearAll(t){if(!t||t==="top"){let i=this._layers.get("top");i?.clearRect(0,0,i.canvas.width,i.canvas.height)}if(!t||t==="bottom"){let i=this._layers.get("bottom");i?.clearRect(0,0,i.canvas.width,i.canvas.height)}}draw(t,i,A,s,n=1){let a=this._layers.get(t.layer);if(!a)return;let{width:o,height:g}=this.cellSize;if(o===-1||g===-1)return;this._rescaleImage(t,o,g);let h=t.actual,I=Math.ceil(h.width/o),d=i%I*o,c=Math.floor(i/I)*g,l=A*o,E=s*g,p=n*o+d>h.width?h.width-d:n*o,u=c+g>h.height?h.height-c:g;a.drawImage(h,Math.floor(d),Math.floor(c),Math.ceil(p),Math.ceil(u),Math.floor(l),Math.floor(E),Math.ceil(p),Math.ceil(u))}extractTile(t,i){let{width:A,height:s}=this.cellSize;if(A===-1||s===-1)return;this._rescaleImage(t,A,s);let n=t.actual,a=Math.ceil(n.width/A),o=i%a*A,g=Math.floor(i/a)*s,h=A+o>n.width?n.width-o:A,I=g+s>n.height?n.height-g:s,d=r.createCanvas(this.document,h,I),c=d.getContext("2d");if(c)return c.drawImage(n,Math.floor(o),Math.floor(g),Math.floor(h),Math.floor(I),0,0,Math.floor(h),Math.floor(I)),d}drawPlaceholder(t,i,A=1){let s=this._layers.get("top");if(s){let{width:n,height:a}=this.cellSize;if(n===-1||a===-1||(this._placeholder?a>=this._placeholder.height&&this._createPlaceHolder(a+1):this._createPlaceHolder(Math.max(a+1,24)),!this._placeholder))return;s.drawImage(this._placeholderBitmap??this._placeholder,t*n,i*a%2?0:1,n*A,a,t*n,i*a,n*A,a)}}rescaleCanvas(){let t=this.dimensions?.css.canvas.width||0,i=this.dimensions?.css.canvas.height||0;for(let A of this._layers.values())(A.canvas.width!==t||A.canvas.height!==i)&&(A.canvas.width=t,A.canvas.height=i)}_rescaleImage(t,i,A){if(i===t.actualCellSize.width&&A===t.actualCellSize.height)return;let{width:s,height:n}=t.origCellSize;if(i===s&&A===n){t.actual=t.orig,t.actualCellSize.width=s,t.actualCellSize.height=n;return}let a=r.createCanvas(this.document,Math.ceil(t.orig.width*i/s),Math.ceil(t.orig.height*A/n)),o=a.getContext("2d");o&&(o.drawImage(t.orig,0,0,a.width,a.height),t.actual=a,t.actualCellSize.width=i,t.actualCellSize.height=A)}_open(){this._renderService=this._terminal._core._renderService,this._oldSetRenderer=this._renderService.setRenderer.bind(this._renderService),this._renderService.setRenderer=t=>{for(let i of[...this._layers.keys()])this.removeLayerFromDom(i);this._oldSetRenderer?.call(this._renderService,t)}}insertLayerToDom(t="top"){if(!this.document||!this._terminal._core.screenElement){console.warn("image addon: cannot insert output canvas to DOM, missing document or screenElement");return}if(this._layers.has(t))return;let i=r.createCanvas(this.document,this.dimensions?.css.canvas.width||0,this.dimensions?.css.canvas.height||0);i.classList.add(`xterm-image-layer-${t}`);let A=this._terminal._core.screenElement;A.style.isolation="isolate",t==="bottom"?(i.style.zIndex="-1",A.insertBefore(i,A.firstChild)):(i.style.zIndex="0",A.appendChild(i));let s=i.getContext("2d",{alpha:!0});if(!s){i.remove();return}this._layers.set(t,s),this.clearAll(t)}removeLayerFromDom(t="top"){let i=this._layers.get(t);i&&(i.canvas.remove(),this._layers.delete(t))}hasLayer(t){return this._layers.has(t)}_createPlaceHolder(t=24){this._placeholderBitmap?.close(),this._placeholderBitmap=void 0;let i=32,A=r.createCanvas(this.document,i,t),s=A.getContext("2d",{alpha:!1});if(!s)return;let n=r.createImageData(s,i,t),a=new Uint32Array(n.data.buffer),o=(0,de.toRGBA8888)(0,0,0),g=(0,de.toRGBA8888)(255,255,255);a.fill(o);for(let d=0;d<t;++d){let c=d%2,l=d*i;for(let E=0;E<i;E+=2)a[l+E+c]=g}s.putImageData(n,0,0);let h=screen.width+i-1&~(i-1)||4096;this._placeholder=r.createCanvas(this.document,h,t);let I=this._placeholder.getContext("2d",{alpha:!1});if(!I){this._placeholder=void 0;return}for(let d=0;d<h;d+=i)I.drawImage(A,d,0);r.createImageBitmap(this._placeholder).then(d=>this._placeholderBitmap=d)}get document(){return this._terminal._core._coreBrowserService?.window.document}};var w={width:7,height:14},G=class r{constructor(e=0,t=0,i=-1,A=-1){this.imageId=i;this.tileId=A;this._ext=0;this._urlId=0;this._ext=e,this._urlId=t}get ext(){return this._urlId?this._ext&-469762049|this.underlineStyle<<26:this._ext}set ext(e){this._ext=e}get underlineStyle(){return this._urlId?5:(this._ext&469762048)>>26}set underlineStyle(e){this._ext&=-469762049,this._ext|=e<<26&469762048}get underlineColor(){return this._ext&67108863}set underlineColor(e){this._ext&=-67108864,this._ext|=e&67108863}get underlineVariantOffset(){let e=(this._ext&3758096384)>>29;return e<0?e^4294967288:e}set underlineVariantOffset(e){this._ext&=536870911,this._ext|=e<<29&3758096384}get urlId(){return this._urlId}set urlId(e){this._urlId=e}clone(){return new r(this._ext,this._urlId,this.imageId,this.tileId)}isEmpty(){return this.underlineStyle===0&&this._urlId===0&&this.imageId===-1}},F=new G,Z=class{constructor(e,t,i){this._terminal=e;this._renderer=t;this._opts=i;this._images=new Map;this._lastId=0;this._lowestId=0;this._fullyCleared=!1;this._needsFullClear=!1;this._pixelLimit=25e5;try{this.setLimit(this._opts.storageLimit)}catch(A){A instanceof Error&&console.error(A.message),console.warn(`storageLimit is set to ${this.getLimit()} MB`)}this._viewportMetrics={cols:this._terminal.cols,rows:this._terminal.rows}}dispose(){this.reset()}reset(){for(let e of this._images.values())e.marker?.dispose();this._images.clear(),this._renderer.clearAll()}getLimit(){return this._pixelLimit*4/1e6}setLimit(e){if(e<.5||e>1e3)throw RangeError("invalid storageLimit, should be at least 0.5 MB and not exceed 1G");this._pixelLimit=e/4*1e6>>>0,this._evictOldest(0)}getUsage(){return this._getStoredPixels()*4/1e6}_getStoredPixels(){let e=0;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));return e}_delImg(e){let t=this._images.get(e);t&&(this._images.delete(e),window.ImageBitmap&&t.orig instanceof ImageBitmap&&t.orig.close(),this.onImageDeleted?.(e))}wipeAlternate(){let e=[];for(let[t,i]of this._images.entries())i.bufferType==="alternate"&&(i.marker?.dispose(),e.push(t));for(let t of e)this._delImg(t);this._needsFullClear=!0,this._fullyCleared=!1}deleteImage(e){let t=this._images.get(e);t&&(t.marker?.dispose(),this._delImg(e))}addImage(e,t){this._evictOldest(e.width*e.height);let i=this._renderer.cellSize;(i.width===-1||i.height===-1)&&(i=w);let A=Math.ceil(e.width/i.width),s=Math.ceil(e.height/i.height),n=++this._lastId,a=this._terminal._core.buffer,o=this._terminal.cols,g=this._terminal.rows,h=a.x,I=a.y,d=h,c=0;t.scrolling||(a.x=0,a.y=0,d=0),this._terminal._core._inputHandler._dirtyRowTracker.markDirty(a.y);for(let u=0;u<s;++u){let C=a.lines.get(a.y+a.ybase);for(let Q=0;Q<A&&!(d+Q>=o);++Q)this._writeToCell(C,d+Q,n,u*A+Q),c++;if(t.scrolling)u<s-1&&this._terminal._core._inputHandler.lineFeed();else if(++a.y>=g)break;a.x=d}this._terminal._core._inputHandler._dirtyRowTracker.markDirty(a.y),t.scrolling?t.cursorPos==="iip"?a.x=Math.min(d+A,o):a.x=d:(a.x=h,a.y=I);let l=[];for(let[u,C]of this._images.entries())C.tileCount<1&&(C.marker?.dispose(),l.push(u));for(let u of l)this._delImg(u);let E=this._terminal.registerMarker(0);E?.onDispose(()=>{this._images.get(n)&&this._delImg(n)}),this._terminal.buffer.active.type==="alternate"&&this._evictOnAlternate();let p={orig:e,origCellSize:i,actual:e,actualCellSize:{...i},marker:E||void 0,tileCount:c,bufferType:this._terminal.buffer.active.type,layer:t.layer,zIndex:t.zIndex};return this._images.set(n,p),this.onImageAdded?.(),n}render(e){let t=!1,i=!1;for(let h of this._images.values())if(h.layer==="bottom"?i=!0:t=!0,t&&i)break;if(t&&!this._renderer.hasLayer("top")&&(this._renderer.insertLayerToDom("top"),!this._renderer.hasLayer("top")))return;if(i&&!this._renderer.hasLayer("bottom")&&this._renderer.insertLayerToDom("bottom"),this._renderer.rescaleCanvas(),!this._images.size){this._fullyCleared||(this._renderer.clearAll(),this._fullyCleared=!0,this._needsFullClear=!1),this._renderer.hasLayer("top")&&this._renderer.removeLayerFromDom("top"),this._renderer.hasLayer("bottom")&&this._renderer.removeLayerFromDom("bottom");return}!t&&this._renderer.hasLayer("top")&&(this._renderer.clearAll("top"),this._renderer.removeLayerFromDom("top")),!i&&this._renderer.hasLayer("bottom")&&(this._renderer.clearAll("bottom"),this._renderer.removeLayerFromDom("bottom")),this._needsFullClear&&(this._renderer.clearAll(),this._fullyCleared=!0,this._needsFullClear=!1);let{start:A,end:s}=e,n=this._terminal._core.buffer,a=this._terminal._core.cols;this._renderer.clearLines(A,s);let o=[],g=[];for(let h=A;h<=s;++h){let I=n.lines.get(h+n.ydisp);if(!I)return;for(let d=0;d<a;++d)if(I.getBg(d)&268435456){let c=I._extendedAttrs[d]??F,l=c.imageId;if(l===void 0||l===-1)continue;let E=this._images.get(l);if(c.tileId!==-1){let p=c.tileId,u=d,C=1;for(;++d<a&&I.getBg(d)&268435456&&(c=I._extendedAttrs[d]??F)&&c.imageId===l&&c.tileId===p+C;)C++;d--,E?E.actual&&o.push({imgSpec:E,tileId:p,col:u,row:h,count:C}):this._opts.showPlaceholder&&g.push({col:u,row:h,count:C}),this._fullyCleared=!1}}}o.sort((h,I)=>h.imgSpec.zIndex-I.imgSpec.zIndex);for(let h of g)this._renderer.drawPlaceholder(h.col,h.row,h.count);for(let h of o)this._renderer.draw(h.imgSpec,h.tileId,h.col,h.row,h.count)}viewportResize(e){if(!this._images.size){this._viewportMetrics=e;return}if(this._viewportMetrics.cols>=e.cols){this._viewportMetrics=e;return}let t=this._terminal._core.buffer,i=t.lines.length,A=this._viewportMetrics.cols-1;for(let s=0;s<i;++s){let n=t.lines.get(s);if(n.getBg(A)&268435456){let a=n._extendedAttrs[A]??F,o=a.imageId;if(o===void 0||o===-1)continue;let g=this._images.get(o);if(!g)continue;let h=Math.ceil((g.actual?.width||0)/g.actualCellSize.width);if(a.tileId%h+1>=h)continue;let I=!1;for(let l=A+1;l>e.cols;++l)if(n._data[l*3+0]&4194303){I=!0;break}if(I)continue;let d=Math.min(e.cols,h-a.tileId%h+A),c=a.tileId;for(let l=A+1;l<d;++l)this._writeToCell(n,l,o,++c),g.tileCount++}}this._viewportMetrics=e}getImageAtBufferCell(e,t){let A=this._terminal._core.buffer.lines.get(t);if(A&&A.getBg(e)&268435456){let s=A._extendedAttrs[e]??F;if(s.imageId&&s.imageId!==-1){let n=this._images.get(s.imageId)?.orig;if(window.ImageBitmap&&n instanceof ImageBitmap){let a=D.createCanvas(window.document,n.width,n.height);return a.getContext("2d")?.drawImage(n,0,0,n.width,n.height),a}return n}}}extractTileAtBufferCell(e,t){let A=this._terminal._core.buffer.lines.get(t);if(A&&A.getBg(e)&268435456){let s=A._extendedAttrs[e]??F;if(s.imageId&&s.imageId!==-1&&s.tileId!==-1){let n=this._images.get(s.imageId);if(n)return this._renderer.extractTile(n,s.tileId)}}}_evictOldest(e){let t=this._getStoredPixels(),i=t;for(;this._pixelLimit<i+e&&this._images.size;){let A=this._images.get(++this._lowestId);A&&A.orig&&(i-=A.orig.width*A.orig.height,A.actual&&A.orig!==A.actual&&(i-=A.actual.width*A.actual.height),A.marker?.dispose(),this._delImg(this._lowestId))}return t-i}_writeToCell(e,t,i,A){if(e._data[t*3+2]&268435456){let s=e._extendedAttrs[t];if(s){if(s.imageId!==void 0){let n=this._images.get(s.imageId);n&&n.tileCount--,s.imageId=i,s.tileId=A;return}e._extendedAttrs[t]=new G(s.ext,s.urlId,i,A);return}}e._data[t*3+2]|=268435456,e._extendedAttrs[t]=new G(0,0,i,A)}_evictOnAlternate(){for(let i of this._images.values())i.bufferType==="alternate"&&(i.tileCount=0);let e=this._terminal._core.buffer;for(let i=0;i<this._terminal.rows;++i){let A=e.lines.get(i);if(A){for(let s=0;s<this._terminal.cols;++s)if(A._data[s*3+2]&268435456){let n=A._extendedAttrs[s]?.imageId;if(n){let a=this._images.get(n);a&&a.tileCount++}}}}let t=[];for(let[i,A]of this._images.entries())A.bufferType==="alternate"&&!A.tileCount&&(A.marker?.dispose(),t.push(i));for(let i of t)this._delImg(i)}};var Ue=M(ue()),Oe=M(Re());function j(r){let e="";for(let t=0;t<r.length;++t)e+=String.fromCharCode(r[t]);return e}function pe(r){let e=0;for(let t=0;t<r.length;++t){if(r[t]<48||r[t]>57)throw new Error("illegal char");e=e*10+r[t]-48}return e}function ke(r){let e=j(r);if(!e.match(/^((auto)|(\d+?((px)|(%)){0,1}))$/))throw new Error("illegal size");return e}function wt(r){if(typeof Buffer<"u")return Buffer.from(j(r),"base64").toString();let e=atob(j(r)),t=new Uint8Array(e.length);for(let i=0;i<t.length;++i)t[i]=e.charCodeAt(i);return new TextDecoder().decode(t)}var Ne={inline:pe,size:pe,name:wt,width:ke,height:ke,preserveAspectRatio:pe},He=[70,105,108,101],Fe=[77,117,108,116,105,112,97,114,116,70,105,108,101],Be=[70,105,108,101,80,97,114,116],fe=[70,105,108,101,69,110,100],Qe=[82,101,112,111,114,116,67,101,108,108,83,105,122,101],De=1024,V=class{constructor(){this.state=0;this._buffer=new Uint32Array(De);this._position=0;this._key="";this.fields={}}reset(){this._buffer.fill(0),this.state=0,this._position=0,this.fields={},this._key=""}end(){if(this.state===0){if(this._position===fe.length){for(let e=0;e<fe.length;++e)if(this._buffer[e]!==fe[e])return this._a();return this.fields.type=4,this.state=4,0}if(this._position===Qe.length){for(let e=0;e<Qe.length;++e)if(this._buffer[e]!==Qe[e])return this._a();return this.fields.type=5,this.state=4,0}return this._a()}return this.state===4?0:this.state===3&&this.fields.type===2?this._storeValue(this._position)?(this.state=4,0):this._a():this._a()}parse(e,t,i){let A=this.state,s=this._position,n=this._buffer;if(A===1||A===4||A===0&&s>14)return-1;for(let a=t;a<i;++a){let o=e[a];switch(o){case 59:if(!this._storeValue(s))return this._a();A=2,s=0;break;case 61:if(A===0){if(n[0]===70){let g=0;for(;g<He.length;++g)if(n[g]!==He[g])return this._a();if(this.fields.type=1,s===Be.length){for(;g<Be.length;++g)if(n[g]!==Be[g])return this._a();return this.fields.type=3,this.state=4,a+1}}else if(n[0]===77){for(let g=0;g<Fe.length;++g)if(n[g]!==Fe[g])return this._a();this.fields.type=2}else return this._a();A=2,s=0}else if(A===2){if(!this._storeKey(s))return this._a();A=3,s=0}else if(A===3){if(s>=De)return this._a();n[s++]=o}break;case 58:return A===3&&!this._storeValue(s)?this._a():(this.state=4,a+1);default:if(s>=De)return this._a();n[s++]=o}}return this.state=A,this._position=s,-2}_a(){return this.fields.type=0,this.state=1,-1}_storeKey(e){let t=j(this._buffer.subarray(0,e));return t?(this._key=t,this.fields[t]=null,!0):!1}_storeValue(e){if(this._key){try{let t=this._buffer.slice(0,e);this.fields[this._key]=Ne[this._key]?Ne[this._key](t):t}catch{return!1}return!0}return!1}};var L={mime:"unsupported",width:0,height:0};function Ge(r){if(r.length<32)return L;let e=new Uint32Array(r.buffer,r.byteOffset,8);if(e[0]===1196314761&&e[1]===169478669&&e[3]===1380206665)return{mime:"image/png",width:r[16]<<24|r[17]<<16|r[18]<<8|r[19],height:r[20]<<24|r[21]<<16|r[22]<<8|r[23]};if(r[0]===255&&r[1]===216&&r[2]===255){let[t,i]=bt(r);return{mime:"image/jpeg",width:t,height:i}}if(e[0]===944130375&&(r[4]===55||r[4]===57)&&r[5]===97)return{mime:"image/gif",width:r[7]<<8|r[6],height:r[9]<<8|r[8]};if(e[0]===1718185841)return{mime:"image/qoi",width:r[4]<<24|r[5]<<16|r[6]<<8|r[7],height:r[8]<<24|r[9]<<16|r[10]<<8|r[11]};if(e[0]===1179011410&&e[2]===1346520407&&(e[3]&16777215)===3690582){switch(r[15]){case 88:return{mime:"image/webp",width:(r[24]|r[25]<<8|r[26]<<16)+1,height:(r[27]|r[28]<<8|r[29]<<16)+1};case 76:if(r[20]!==47)return L;let t=r[21]|r[22]<<8|r[23]<<16|r[24]<<24;return{mime:"image/webp",width:(t&16383)+1,height:(t>>>14&16383)+1};case 32:return r[23]!==157||r[24]!==1||r[25]!==42?L:{mime:"image/webp",width:(r[26]|r[27]<<8)&16383,height:(r[28]|r[29]<<8)&16383}}return L}if(e[1]===1887007846&&(e[2]===1718187617||e[2]===1936291425)){let t=-1,i=Math.min(r.length-16,1024);for(let A=8;A<i;A++)if(r[A]===105&&r[A+1]===115&&r[A+2]===112&&r[A+3]===101){t=A;break}if(t!==-1){let A=r[t+8]<<24|r[t+9]<<16|r[t+10]<<8|r[t+11],s=r[t+12]<<24|r[t+13]<<16|r[t+14]<<8|r[t+15];if(A>0&&s>0)return{mime:"image/avif",width:A,height:s}}return L}return L}function bt(r){let e=r.length,t=4,i=r[t]<<8|r[t+1];for(;;){if(t+=i,t>=e)return[0,0];if(r[t]!==255)return[0,0];if(r[t+1]===192||r[t+1]===194)return t+8<e?[r[t+7]<<8|r[t+8],r[t+5]<<8|r[t+6]]:[0,0];t+=2,i=r[t]<<8|r[t+1]}}var we={type:0,name:"Unnamed file",size:0,width:"auto",height:"auto",preserveAspectRatio:1,inline:0},$=class{constructor(e,t,i,A){this._opts=e;this._renderer=t;this._storage=i;this._coreTerminal=A;this._aborted=!1;this._hp=new V;this._header=we;this._isMultipart=!1;this._abortMulti=!1;let s=Math.ceil(this._opts.iipSizeLimit*4/3),n=Math.min(1048576,s);this._dec=new Ue.default(4194304,s,n),this._qoiDec=new Oe.default(4194304)}reset(){this._hp.reset(),this._dec.release(),this._qoiDec.release()}start(){this._aborted=!1,this._hp.reset()}put(e,t,i){if(!this._aborted)if(this._hp.state===4)this._dec.put(e.subarray(t,i))!==0&&(this._dec.release(),this._aborted=!0);else{let A=this._hp.parse(e,t,i);if(A===-1){this._aborted=!0;return}if(A>0){if(this._hp.fields.type===1){if(this._isMultipart&&(this._isMultipart=!1,this._abortMulti=!1,this._dec.release()),this._header=Object.assign({},we,this._hp.fields),!this._header.inline){this._aborted=!0;return}this._dec.init()}else if(this._abortMulti){this._aborted=!0;return}this._dec.put(e.subarray(A,i))!==0&&(this._dec.release(),this._aborted=!0,this._isMultipart&&(this._abortMulti=!0))}}}end(e){if(this._aborted||this._hp.state!==4&&this._hp.end())return!0;let t=this._hp.fields.type;if(t===3)return!0;if(t===5){let o=w.width,g=w.height;this._renderer.dimensions&&(o=this._renderer.dimensions.css.canvas.width/this._coreTerminal.cols,g=this._renderer.dimensions.css.canvas.height/this._coreTerminal.rows);let h=this._coreTerminal._core._coreBrowserService?.dpr??1,I=`\x1B]1337;ReportCellSize=${g.toFixed(3)};${o.toFixed(3)};${h.toFixed(3)}\x1B\\`;return this._coreTerminal.input(I,!1),!0}if(t===2)return this._header=Object.assign({},we,this._hp.fields),this._isMultipart=!0,this._abortMulti=!1,this._dec.release(),this._dec.init(),!0;if(t===4&&(!this._isMultipart||(this._isMultipart=!1,this._abortMulti||this._header.type!==2)))return!0;let i=0,A=0,s,n=L;if((s=e)&&((s=!this._dec.end())?(n=Ge(this._dec.data8),(s=n.mime!=="unsupported")?(i=n.width,A=n.height,(s=i&&A&&i*A<this._opts.pixelLimit)?([i,A]=this._resize(i,A).map(Math.floor),s=i&&A&&i*A<this._opts.pixelLimit):console.warn(`IIP: image dimension issue ${n.width}x${n.height}`)):console.warn("IIP: unsupported image type")):console.warn("IIP: error during BASE64 decoding")),!s)return this._dec.release(),!0;let a;if(n.mime==="image/qoi"){let o=this._qoiDec.decode(this._dec.data8);if(a=new ImageData(new Uint8ClampedArray(o.buffer,o.byteOffset,o.byteLength),this._qoiDec.width,this._qoiDec.height),this._qoiDec.release(),i===this._qoiDec.width&&A===this._qoiDec.height){this._dec.release();let g=D.createCanvas(void 0,this._qoiDec.width,this._qoiDec.height);return g.getContext("2d")?.putImageData(a,0,0),this._storage.addImage(g),!0}}else a=new Blob([this._dec.data8],{type:n.mime});return this._dec.release(),createImageBitmap(a,{resizeWidth:i,resizeHeight:A}).then(o=>(this._storage.addImage(o),!0)).catch(o=>(console.warn(`IIP: decoding error ${n.mime} ${n.width}x${n.height}`,o),!0))}_resize(e,t){let i=this._renderer.dimensions?.css.cell.width||w.width,A=this._renderer.dimensions?.css.cell.height||w.height,s=this._renderer.dimensions?.css.canvas.width||i*this._coreTerminal.cols,n=this._renderer.dimensions?.css.canvas.height||A*this._coreTerminal.rows,a=this._dim(this._header.width,s,i),o=this._dim(this._header.height,n,A);if(!a&&!o){let g=s/e,h=(n-A)/t,I=Math.min(g,h);return I<1?[e*I,t*I]:[e,t]}return a?this._header.preserveAspectRatio||!a||!o?[a,t*a/e]:[a,o]:[e*o/t,o]}_dim(e,t,i){return e==="auto"?0:e.endsWith("%")?parseInt(e.slice(0,-1),10)*t/100:e.endsWith("px")?parseInt(e.slice(0,-2),10):parseInt(e,10)*i}};var Pe=M(ue());function be(r){let e={},t=r.split(",");for(let i of t){let A=i.indexOf("=");if(A===-1)continue;let s=i.substring(0,A),n=i.substring(A+1);if(s==="a"){e.action=n;continue}if(s==="o"){e.compression=n;continue}if(s==="t"){e.transmission=n;continue}if(s==="d"){e.deleteSelector=n;continue}let a=parseInt(n,10);switch(s){case"f":e.format=a;break;case"i":e.id=a;break;case"I":e.imageNumber=a;break;case"s":e.width=a;break;case"v":e.height=a;break;case"x":e.x=a;break;case"y":e.y=a;break;case"w":e.sourceWidth=a;break;case"h":e.sourceHeight=a;break;case"X":e.xOffset=a;break;case"Y":e.yOffset=a;break;case"c":e.columns=a;break;case"r":e.rows=a;break;case"m":e.more=a;break;case"q":e.quiet=a;break;case"C":e.cursorMovement=a;break;case"z":e.zIndex=a;break;case"p":e.placementId=a;break}}return e}var Je=0,ee=class{constructor(e,t,i,A){this._opts=e;this._renderer=t;this._kittyStorage=i;this._coreTerminal=A;this._aborted=!1;this._decodeError=!1;this._activeDecoder=null;this._inControlData=!0;this._controlData=new Uint32Array(512);this._controlLength=0;this._encodedSizeLimit=0;this._totalEncodedSize=0;this._parsedCommand=null;this._pendingTransmissions=new Map;this._maxEncodedBytes=Math.ceil(this._opts.kittySizeLimit*4/3),this._initialEncodedBytes=Math.min(4194304,this._maxEncodedBytes)}reset(){this._cleanupAllPending(),this._activeDecoder&&(this._activeDecoder.release(),this._activeDecoder=null),this._kittyStorage.reset()}dispose(){this.reset()}_removePendingEntry(e){this._pendingTransmissions.delete(e),this._lastPendingKey===e&&(this._lastPendingKey=void 0)}_cleanupAllPending(){for(let e of this._pendingTransmissions.values())e.decoder.release();this._pendingTransmissions.clear(),this._lastPendingKey=void 0}start(){this._aborted=!1,this._decodeError=!1,this._inControlData=!0,this._controlLength=0,this._parsedCommand=null,this._encodedSizeLimit=this._maxEncodedBytes,this._totalEncodedSize=0,this._activeDecoder=null}put(e,t,i){if(!this._aborted)if(!this._inControlData)this._streamPayload(e,t,i);else{let A=i;for(let n=t;n<i;n++)if(e[n]===59){this._inControlData=!1,A=n;break}let s=A-t;if(this._controlLength+s>512){this._aborted=!0;return}if(this._controlData.set(e.subarray(t,A),this._controlLength),this._controlLength+=s,!this._inControlData){if(this._parsedCommand=be(this._parseControlDataString()),this._parsedCommand.id!==void 0&&this._parsedCommand.imageNumber!==void 0){this._sendResponse(this._parsedCommand.id,"EINVAL:cannot specify both i and I keys",this._parsedCommand.quiet??0),this._aborted=!0;return}if(this._parsedCommand.action==="d")return;let n=A+1;n<i&&this._streamPayload(e,n,i)}}}_streamPayload(e,t,i){if(this._aborted)return;let A=this._parsedCommand?.id??this._lastPendingKey??0,s=this._pendingTransmissions.get(A),n=s?.totalEncodedSize??0;if(this._totalEncodedSize+=i-t,n+this._totalEncodedSize>this._encodedSizeLimit){let o=this._activeDecoder??s?.decoder;o&&o.release(),this._activeDecoder=null,s&&this._removePendingEntry(A),this._aborted=!0;return}this._decodeError||(s?.decoder&&!this._activeDecoder&&(this._activeDecoder=s.decoder),this._activeDecoder||(this._activeDecoder=new Pe.default(4194304,this._maxEncodedBytes,this._initialEncodedBytes),this._activeDecoder.init()),this._activeDecoder.put(e.subarray(t,i))!==Je&&(this._activeDecoder.release(),this._activeDecoder=null,this._decodeError=!0,s&&this._removePendingEntry(A)))}end(e){if(this._aborted||!e)return this._activeDecoder&&(this._activeDecoder.release(),this._activeDecoder=null),!0;if(this._inControlData)return this._handleNoPayloadCommand();let t=this._parsedCommand;if(t.action==="d")return this._handleDelete(t);let i=t.id??this._lastPendingKey??0,A=t.more===1,s=this._pendingTransmissions.get(i);if(A)return this._activeDecoder&&(s?(s.totalEncodedSize+=this._totalEncodedSize,s.decodeError=s.decodeError||this._decodeError):this._pendingTransmissions.set(i,{cmd:{...t},decoder:this._activeDecoder,totalEncodedSize:this._totalEncodedSize,decodeError:this._decodeError}),this._lastPendingKey=i,this._activeDecoder=null),!0;s&&(this._lastPendingKey=void 0);let n=this._decodeError,a=t,o=this._activeDecoder;s&&(a=s.cmd,o=s.decoder,n=n||s.decodeError,this._pendingTransmissions.delete(i));let g=new Uint8Array(0);o&&(o.end()!==Je&&(n=!0),g=o.data8),this._activeDecoder=null;let h=this._handleCommandWithBytesAndCmd(a,g,n);return o&&o.release(),h}_parseControlDataString(){let e="";for(let t=0;t<this._controlLength;t++)e+=String.fromCodePoint(this._controlData[t]);return e}_handleNoPayloadCommand(){let e=be(this._parseControlDataString());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),!0;switch(e.action??"t"){case"d":return this._handleDelete(e);case"q":return this._sendResponse(e.id??0,"OK",e.quiet??0),!0;case"p":return this._handlePlacement(e);default:return e.id!==void 0&&this._sendResponse(e.id,"EINVAL:unsupported action",e.quiet??0),!0}}_handleCommandWithBytesAndCmd(e,t,i){switch(e.action??"t"){case"t":{let s=this._handleTransmit(e,t,i);return(e.transmission??"d")==="d"&&e.id!==void 0&&(i?this._sendResponse(e.id,"EINVAL:invalid base64 data",e.quiet??0):t.length>0&&this._sendResponse(e.id,"OK",e.quiet??0)),s}case"T":return this._handleTransmitDisplay(e,t,i);case"q":return this._handleQuery(e,t,i);case"p":return this._handlePlacement(e);default:return e.id!==void 0&&this._sendResponse(e.id,"EINVAL:unsupported action",e.quiet??0),!0}}_handlePlacement(e){if(e.id===void 0)return!0;let t=e.id,i=this._kittyStorage.getImage(t);return i?this._displayImage(i,e).then(s=>(this._sendResponse(t,s?"OK":"EINVAL:image rendering failed",e.quiet??0,e.placementId),!0)):(this._sendResponse(t,"ENOENT:image not found",e.quiet??0,e.placementId),!0)}_handleTransmit(e,t,i){return(e.transmission??"d")!=="d"?(e.id!==void 0&&this._sendResponse(e.id,"EINVAL:unsupported transmission medium",e.quiet??0),!0):(i||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??""}),!0)}_handleTransmitDisplay(e,t,i){if(i)return e.id!==void 0&&this._sendResponse(e.id,"EINVAL:invalid base64 data",e.quiet??0),!0;this._handleTransmit(e,t,i);let A=e.id??this._kittyStorage.lastImageId,s=this._kittyStorage.getImage(A);if(s){let n=this._displayImage(s,e);return e.id!==void 0?n.then(a=>(this._sendResponse(A,a?"OK":"EINVAL:image rendering failed",e.quiet??0),!0)):n.then(()=>!0)}return!0}_handleQuery(e,t,i){let A=e.id??0,s=e.quiet??0;if((e.transmission??"d")!=="d")return this._sendResponse(A,"EINVAL:unsupported transmission medium",s),!0;if(i)return this._sendResponse(A,"EINVAL:invalid base64 data",s),!0;if(t.length===0)return this._sendResponse(A,"OK",s),!0;let a=e.format??32;if(a===100)this._sendResponse(A,"OK",s);else{let o=e.width??0,g=e.height??0;if(!o||!g)return this._sendResponse(A,"EINVAL:width and height required for raw pixel data",s),!0;let h=a===32?4:3,I=o*g*h;if(t.length<I)return this._sendResponse(A,"EINVAL:insufficient pixel data",s),!0;this._sendResponse(A,"OK",s)}return!0}_handleDelete(e){switch(e.deleteSelector??"a"){case"a":case"A":this._cleanupAllPending(),this._kittyStorage.deleteAll();break;case"i":case"I":if(e.id!==void 0){let i=this._pendingTransmissions.get(e.id);i&&i.decoder.release(),this._removePendingEntry(e.id),this._kittyStorage.deleteById(e.id)}break;default:break}return!0}_sendResponse(e,t,i,A){let s=t==="OK";if(s&&i>=1||!s&&i>=2)return;let n=A?`,p=${A}`:"",a=`\x1B_Gi=${e}${n};${t}\x1B\\`;this._coreTerminal._core.coreService.triggerDataEvent(a)}_displayImage(e,t){return this._decodeAndDisplay(e,t).then(()=>!0).catch(()=>!1)}async _decodeAndDisplay(e,t){let i=await this._createBitmap(e);try{let A=Math.max(0,t.x??0),s=Math.max(0,t.y??0),n=t.sourceWidth||i.width-A,a=t.sourceHeight||i.height-s,o=Math.max(0,i.width-A),g=Math.max(0,i.height-s),h=Math.max(0,Math.min(n,o)),I=Math.max(0,Math.min(a,g));if(h===0||I===0)throw new Error("invalid source rectangle");if(A!==0||s!==0||h!==i.width||I!==i.height){let T=await createImageBitmap(i,A,s,h,I);i.close(),i=T}let d=this._renderer.dimensions?.css.cell.width||w.width,c=this._renderer.dimensions?.css.cell.height||w.height,l,E;t.columns!==void 0&&t.rows!==void 0?(l=t.columns,E=t.rows):t.columns!==void 0?(l=t.columns,E=Math.max(1,Math.ceil(i.height/i.width*(l*d)/c))):t.rows!==void 0?(E=t.rows,l=Math.max(1,Math.ceil(i.width/i.height*(E*c)/d))):(l=Math.ceil(i.width/d),E=Math.ceil(i.height/c));let p=i.width,u=i.height;if((t.columns!==void 0||t.rows!==void 0)&&(p=Math.round(l*d),u=Math.round(E*c)),p*u>this._opts.pixelLimit)throw new Error("image exceeds pixel limit");let C=this._coreTerminal._core.buffer,Q=C.x,K=C.y,Y=C.ybase,Ve=t.zIndex!==void 0&&t.zIndex<0?"bottom":"top";if(p!==i.width||u!==i.height){let T=await createImageBitmap(i,{resizeWidth:p,resizeHeight:u});i.close(),i=T}let oe=Math.min(Math.max(0,t.xOffset??0),d-1),he=Math.min(Math.max(0,t.yOffset??0),c-1);if(oe!==0||he!==0){let T=t.columns!==void 0?Math.round(l*d):i.width+oe,et=t.rows!==void 0?Math.round(E*c):i.height+he,q=D.createCanvas(window.document,T,et),Le=q.getContext("2d");if(!Le)throw new Error("Failed to create offset canvas context");Le.drawImage(i,oe,he);let tt=await createImageBitmap(q);if(q.width=q.height=0,i.close(),i=tt,p=i.width,u=i.height,p*u>this._opts.pixelLimit)throw new Error("image exceeds pixel limit");t.columns===void 0&&(l=Math.ceil(i.width/d)),t.rows===void 0&&(E=Math.ceil(i.height/c))}let $e=t.zIndex??0;if(this._kittyStorage.addImage(e.id,i,!0,Ve,$e),i=void 0,t.cursorMovement===1){let T=C.ybase-Y;C.x=Q,C.y=Math.max(K-T,0)}else C.x=Math.min(Q+l,this._coreTerminal.cols)}catch(A){throw i?.close(),A}}async _createBitmap(e){let t=new Uint8Array(await e.data.arrayBuffer());if(e.compression==="z"&&(t=await this._decompressZlib(t)),e.format===100){let p=new Blob([t],{type:"image/png"});if(!window.createImageBitmap){let u=URL.createObjectURL(p),C=new Image;return new Promise((Q,K)=>{C.addEventListener("load",()=>{URL.revokeObjectURL(u);let Y=D.createCanvas(window.document,C.width,C.height);Y.getContext("2d")?.drawImage(C,0,0),createImageBitmap(Y).then(Q).catch(K)}),C.addEventListener("error",()=>{URL.revokeObjectURL(u),K(new Error("Failed to load image"))}),C.src=u})}return createImageBitmap(p)}let i=e.width,A=e.height;if(!i||!A)throw new Error("Width and height required for raw pixel data");let s=e.format===32?4:3,n=i*A*s;if(t.length<n)throw new Error("Insufficient pixel data");let a=i*A;if(e.format===32)return createImageBitmap(new ImageData(new Uint8ClampedArray(t.buffer,t.byteOffset,a*4),i,A));let o=new Uint8ClampedArray(a*4),g=new Uint32Array(t.buffer,t.byteOffset,Math.floor(t.byteLength/4)),h=new Uint32Array(o.buffer),I=a&-4,d=0,c=0;for(let p=0;p<I;p+=4){let u=g[d++],C=g[d++],Q=g[d++];h[c++]=4278190080|u,h[c++]=4278190080|u>>>24|C<<8,h[c++]=4278190080|C>>>16|Q<<16,h[c++]=4278190080|Q>>>8}let l=I*3,E=I*4;for(let p=I;p<a;p++)o[E]=t[l],o[E+1]=t[l+1],o[E+2]=t[l+2],o[E+3]=255,l+=3,E+=4;return createImageBitmap(new ImageData(o,i,A))}async _decompressZlib(e){try{return await this._decompress(e,"deflate")}catch{return await this._decompress(e,"deflate-raw")}}async _decompress(e,t){let i=new DecompressionStream(t),A=i.writable.getWriter();A.write(e),A.close();let s=[],n=i.readable.getReader();for(;;){let{done:h,value:I}=await n.read();if(h)break;s.push(I)}let a=s.reduce((h,I)=>h+I.length,0),o=new Uint8Array(a),g=0;for(let h of s)o.set(h,g),g+=h.length;return o}get images(){return this._kittyStorage.images}get _kittyIdToStorageId(){return this._kittyStorage.kittyIdToStorageId}get pendingTransmissions(){return this._pendingTransmissions}};var U=class U{constructor(e){this._storage=e;this._nextImageId=1;this._images=new Map;this._kittyIdToStorageId=new Map;this._storageIdToKittyId=new Map;this._handleStorageImageDeleted=e=>{let t=this._storageIdToKittyId.get(e);t!==void 0&&(this._kittyIdToStorageId.delete(t),this._storageIdToKittyId.delete(e),this._images.delete(t))};this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"iip"};this._previousOnImageDeleted=this._storage.onImageDeleted,this._wrappedOnImageDeleted=t=>{this._previousOnImageDeleted?.(t),this._handleStorageImageDeleted(t)},this._storage.onImageDeleted=this._wrappedOnImageDeleted}reset(){this._nextImageId=1,this._images.clear(),this._kittyIdToStorageId.clear(),this._storageIdToKittyId.clear()}dispose(){this.reset(),this._storage.onImageDeleted===this._wrappedOnImageDeleted&&(this._storage.onImageDeleted=this._previousOnImageDeleted)}storeImage(e,t){let i=e??this._nextImageId++,A=this._kittyIdToStorageId.get(i);return A!==void 0&&(this._storage.deleteImage(A),this._kittyIdToStorageId.delete(i),this._storageIdToKittyId.delete(A)),!this._images.has(i)&&this._images.size>=U._maxStoredImages&&this._evictUndisplayedImages(),this._images.set(i,{...t,id:i}),i}addImage(e,t,i,A,s){let n=this._kittyIdToStorageId.get(e);n!==void 0&&this._storageIdToKittyId.delete(n),this._addImageOpts.scrolling=i,this._addImageOpts.layer=A,this._addImageOpts.zIndex=s;let a=this._storage.addImage(t,this._addImageOpts);this._kittyIdToStorageId.set(e,a),this._storageIdToKittyId.set(a,e)}getImage(e){return this._images.get(e)}deleteById(e){this._images.delete(e);let t=this._kittyIdToStorageId.get(e);t!==void 0&&(this._storage.deleteImage(t),this._kittyIdToStorageId.delete(e),this._storageIdToKittyId.delete(t))}deleteAll(){this._images.clear();for(let e of this._kittyIdToStorageId.values())this._storage.deleteImage(e);this._kittyIdToStorageId.clear(),this._storageIdToKittyId.clear()}get images(){return this._images}get kittyIdToStorageId(){return this._kittyIdToStorageId}get lastImageId(){return this._nextImageId-1}_evictUndisplayedImages(){for(let[e]of this._images){if(this._images.size<=U._maxStoredImages/2)break;this._kittyIdToStorageId.has(e)||this._images.delete(e)}}};U._maxStoredImages=256;var te=U;var y=M(X());var ze=M(We());var xt=4194304,Se=y.PALETTE_ANSI_256;Se.set(y.PALETTE_VT340_COLOR);var se=class{constructor(e,t,i){this._opts=e;this._storage=t;this._coreTerminal=i;this._size=0;this._aborted=!1;(0,ze.DecoderAsync)({memoryLimit:this._opts.pixelLimit*4,palette:Se,paletteLimit:this._opts.sixelPaletteLimit}).then(A=>this._dec=A)}reset(){this._dec&&(this._dec.release(),this._dec._palette.fill(0),this._dec.init(0,Se,this._opts.sixelPaletteLimit))}hook(e){if(this._size=0,this._aborted=!1,this._dec){let t=e.params[1]===1?0:Mt(this._coreTerminal._core._inputHandler._curAttrData,this._coreTerminal._core._themeService?.colors);this._dec.init(t,null,this._opts.sixelPaletteLimit)}}put(e,t,i){if(!(this._aborted||!this._dec)){if(this._size+=i-t,this._size>this._opts.sixelSizeLimit){console.warn("SIXEL: too much data, aborting"),this._aborted=!0,this._dec.release();return}try{this._dec.decode(e,t,i)}catch(A){console.warn(`SIXEL: error while decoding image - ${A}`),this._aborted=!0,this._dec.release()}}}unhook(e){if(this._aborted||!e||!this._dec)return!0;let t=this._dec.width,i=this._dec.height;if(!t||!i)return i&&this._storage.advanceCursor(i),!0;let A=D.createCanvas(void 0,t,i);return A.getContext("2d")?.putImageData(new ImageData(this._dec.data8,t,i),0,0),this._dec.memoryUsage>xt&&this._dec.release(),this._storage.addImage(A),!0}};function Mt(r,e){let t=0;if(!e)return t;if(r.isInverse())if(r.isFgDefault())t=re(e.foreground.rgba);else if(r.isFgRGB()){let i=r.constructor.toColorRGB(r.getFgColor());t=(0,y.toRGBA8888)(...i)}else t=re(e.ansi[r.getFgColor()].rgba);else if(r.isBgDefault())t=re(e.background.rgba);else if(r.isBgRGB()){let i=r.constructor.toColorRGB(r.getBgColor());t=(0,y.toRGBA8888)(...i)}else t=re(e.ansi[r.getBgColor()].rgba);return t}function re(r){return y.BIG_ENDIAN?r:(r&255)<<24|(r>>>8&255)<<16|(r>>>16&255)<<8|r>>>24&255}var ne=class{constructor(e,t,i,A){this._storage=e;this._opts=t;this._renderer=i;this._terminal=A;this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"vt340"}}addImage(e){this._addImageOpts.scrolling=this._opts.sixelScrolling,this._storage.addImage(e,this._addImageOpts)}advanceCursor(e){if(this._opts.sixelScrolling){let t=this._renderer.cellSize;(t.width===-1||t.height===-1)&&(t=w);let i=Math.ceil(e/t.height);for(let A=1;A<i;++A)this._terminal._core._inputHandler.lineFeed()}}};var ae=class{constructor(e){this._storage=e;this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"iip"}}addImage(e){this._storage.addImage(e,this._addImageOpts)}};var Xe={enableSizeReports:!0,pixelLimit:16777216,sixelSupport:!0,sixelScrolling:!0,sixelPaletteLimit:4096,sixelSizeLimit:33554432,storageLimit:128,showPlaceholder:!0,iipSupport:!0,iipSizeLimit:33554432,kittySupport:!0,kittySizeLimit:33554432},Ze=4096;var je=class{constructor(e){this._disposables=[];this._handlers=new Map;this._onImageAdded=new z;this.onImageAdded=this._onImageAdded.event;this._opts=Object.assign({},Xe,e),this._defaultOpts=Object.assign({},Xe,e)}dispose(){for(let e of this._disposables)e.dispose();this._disposables.length=0,this._handlers.clear(),this._onImageAdded.dispose()}_disposeLater(...e){for(let t of e)this._disposables.push(t)}activate(e){if(this._terminal=e,this._renderer=new D(e),this._storage=new Z(e,this._renderer,this._opts),this._storage.onImageAdded=()=>this._onImageAdded.fire(),this._opts.enableSizeReports){let t=e.options.windowOptions??{};t.getWinSizePixels=!0,t.getCellSizePixels=!0,t.getWinSizeChars=!0,e.options.windowOptions=t}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){let t=new ne(this._storage,this._opts,this._renderer,e),i=new se(this._opts,t,e);this._handlers.set("sixel",i),this._disposeLater(e._core._inputHandler._parser.registerDcsHandler({final:"q"},i))}if(this._opts.iipSupport){let t=new ae(this._storage),i=new $(this._opts,this._renderer,t,e);this._handlers.set("iip",i),this._disposeLater(e._core._inputHandler._parser.registerOscHandler(1337,i))}if(this._opts.kittySupport){let t=new te(this._storage),i=new ee(this._opts,this._renderer,t,e);this._handlers.set("kitty",i),this._disposeLater(t,i,e._core._inputHandler._parser.registerApcHandler({final:"G"},i))}}reset(){this._opts.sixelScrolling=this._defaultOpts.sixelScrolling,this._opts.sixelPaletteLimit=this._defaultOpts.sixelPaletteLimit,this._storage?.reset();for(let e of this._handlers.values())e.reset();return!1}get storageLimit(){return this._storage?.getLimit()||-1}set storageLimit(e){this._storage?.setLimit(e),this._opts.storageLimit=e}get storageUsage(){return this._storage?this._storage.getUsage():-1}get showPlaceholder(){return this._opts.showPlaceholder}set showPlaceholder(e){this._opts.showPlaceholder=e,this._renderer?.showPlaceholder(e)}getImageAtBufferCell(e,t){return this._storage?.getImageAtBufferCell(e,t)}extractTileAtBufferCell(e,t){return this._storage?.extractTileAtBufferCell(e,t)}_report(e){this._terminal?._core.input(e,!1)}_decset(e){for(let t=0;t<e.length;++t)e[t]===80&&(this._opts.sixelScrolling=!1);return!1}_decrst(e){for(let t=0;t<e.length;++t)e[t]===80&&(this._opts.sixelScrolling=!0);return!1}_da1(e){return e[0]?!0:this._opts.sixelSupport?(this._report("\x1B[?62;4;9;22c"),!0):!1}_xtermGraphicsAttributes(e){if(e.length<2)return!0;if(e[0]===1)switch(e[1]){case 1:return this._report(`\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`),!0;case 2:this._opts.sixelPaletteLimit=this._defaultOpts.sixelPaletteLimit,this._report(`\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`);for(let t of this._handlers.values())t.reset();return!0;case 3: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`),!0;case 4:return this._report(`\x1B[?${e[0]};0;${Ze}S`),!0;default:return this._report(`\x1B[?${e[0]};2S`),!0}if(e[0]===2)switch(e[1]){case 1:let t=this._renderer?.dimensions?.css.canvas.width,i=this._renderer?.dimensions?.css.canvas.height;if(!t||!i){let s=w;t=(this._terminal?.cols||80)*s.width,i=(this._terminal?.rows||24)*s.height}if(t*i<this._opts.pixelLimit)this._report(`\x1B[?${e[0]};0;${t.toFixed(0)};${i.toFixed(0)}S`);else{let s=Math.floor(Math.sqrt(this._opts.pixelLimit));this._report(`\x1B[?${e[0]};0;${s};${s}S`)}return!0;case 4:let A=Math.floor(Math.sqrt(this._opts.pixelLimit));return this._report(`\x1B[?${e[0]};0;${A};${A}S`),!0;default:return this._report(`\x1B[?${e[0]};2S`),!0}return this._report(`\x1B[?${e[0]};1S`),!0}};export{je as ImageAddon};
-+var At=Object.create;var Me=Object.defineProperty;var st=Object.getOwnPropertyDescriptor;var rt=Object.getOwnPropertyNames;var nt=Object.getPrototypeOf,at=Object.prototype.hasOwnProperty;var x=(s,e)=>()=>{try{return e||s((e={exports:{}}).exports,e),e.exports}catch(t){throw e=0,t}};var ot=(s,e,t,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let A of rt(e))!at.call(s,A)&&A!==t&&Me(s,A,{get:()=>e[A],enumerable:!(i=st(e,A))||i.enumerable});return s};var M=(s,e,t)=>(t=s!=null?At(nt(s)):{},ot(e||!s||!s.__esModule?Me(t,"default",{value:s,enumerable:!0}):t,s));var Z=x(_=>{"use strict";Object.defineProperty(_,"__esModule",{value:!0});_.DEFAULT_FOREGROUND=_.DEFAULT_BACKGROUND=_.PALETTE_ANSI_256=_.PALETTE_VT340_GREY=_.PALETTE_VT340_COLOR=_.normalizeHLS=_.normalizeRGB=_.nearestColorIndex=_.fromRGBA8888=_.toRGBA8888=_.alpha=_.blue=_.green=_.red=_.BIG_ENDIAN=void 0;_.BIG_ENDIAN=new Uint8Array(new Uint32Array([4278190080]).buffer)[0]===255;_.BIG_ENDIAN&&console.warn("BE platform detected. This version of node-sixel works only on LE properly.");function ve(s){return s&255}_.red=ve;function Re(s){return s>>>8&255}_.green=Re;function ke(s){return s>>>16&255}_.blue=ke;function gt(s){return s>>>24&255}_.alpha=gt;function f(s,e,t,i=255){return((i&255)<<24|(t&255)<<16|(e&255)<<8|s&255)>>>0}_.toRGBA8888=f;function dt(s){return[s&255,s>>8&255,s>>16&255,s>>>24]}_.fromRGBA8888=dt;function It(s,e){let t=ve(s),i=Re(s),A=ke(s),r=Number.MAX_SAFE_INTEGER,n=-1;for(let a=0;a<e.length;++a){let o=t-e[a][0],h=i-e[a][1],g=A-e[a][2],d=o*o+h*h+g*g;if(!d)return a;d<r&&(r=d,n=a)}return n}_.nearestColorIndex=It;function Ie(s,e,t){return Math.max(s,Math.min(t,e))}function le(s,e,t){return t<0&&(t+=1),t>1&&(t-=1),t*6<1?e+(s-e)*6*t:t*2<1?s:t*3<2?e+(s-e)*(4-t*6):e}function lt(s,e,t){if(!t){let r=Math.round(e*255);return f(r,r,r)}let i=e<.5?e*(1+t):e+t-e*t,A=2*e-i;return f(Ie(0,255,Math.round(le(i,A,s+1/3)*255)),Ie(0,255,Math.round(le(i,A,s)*255)),Ie(0,255,Math.round(le(i,A,s-1/3)*255)))}function m(s,e,t){return(4278190080|Math.round(t/100*255)<<16|Math.round(e/100*255)<<8|Math.round(s/100*255))>>>0}_.normalizeRGB=m;function ct(s,e,t){return lt((s+240%360)/360,e/100,t/100)}_.normalizeHLS=ct;_.PALETTE_VT340_COLOR=new Uint32Array([m(0,0,0),m(20,20,80),m(80,13,13),m(20,80,20),m(80,20,80),m(20,80,80),m(80,80,20),m(53,53,53),m(26,26,26),m(33,33,60),m(60,26,26),m(33,60,33),m(60,33,60),m(33,60,60),m(60,60,33),m(80,80,80)]);_.PALETTE_VT340_GREY=new Uint32Array([m(0,0,0),m(13,13,13),m(26,26,26),m(40,40,40),m(6,6,6),m(20,20,20),m(33,33,33),m(46,46,46),m(0,0,0),m(13,13,13),m(26,26,26),m(40,40,40),m(6,6,6),m(20,20,20),m(33,33,33),m(46,46,46)]);_.PALETTE_ANSI_256=(()=>{let s=[f(0,0,0),f(205,0,0),f(0,205,0),f(205,205,0),f(0,0,238),f(205,0,205),f(0,250,205),f(229,229,229),f(127,127,127),f(255,0,0),f(0,255,0),f(255,255,0),f(92,92,255),f(255,0,255),f(0,255,255),f(255,255,255)],e=[0,95,135,175,215,255];for(let t=0;t<6;++t)for(let i=0;i<6;++i)for(let A=0;A<6;++A)s.push(f(e[t],e[i],e[A]));for(let t=8;t<=238;t+=10)s.push(f(t,t,t));return new Uint32Array(s)})();_.DEFAULT_BACKGROUND=f(0,0,0,255);_.DEFAULT_FOREGROUND=f(255,255,255,255)});var _e=x(me=>{"use strict";Object.defineProperty(me,"__esModule",{value:!0});me.InWasm=pt;var v=s=>{if(Uint8Array.fromBase64)return Uint8Array.fromBase64(s);if(typeof Buffer<"u")return Buffer.from(s,"base64");let e=atob(s),t=new Uint8Array(e.length);for(let i=0;i<t.length;++i)t[i]=e.charCodeAt(i);return t};function pt(s){if(s.d){let{t:e,s:t,d:i}=s,A,r,n=WebAssembly;return e===0?t?a=>new n.Instance(r||(r=new n.Module(A||(A=v(i)))),a):a=>r?n.instantiate(r,a):n.instantiate(A||(A=v(i)),a).then(o=>(r=o.module)&&o.instance):e===1?t?()=>r||(r=new n.Module(A||(A=v(i)))):()=>r?Promise.resolve(r):n.compile(A||(A=v(i))).then(a=>r=a):t?()=>A||(A=v(i)):()=>Promise.resolve(A||(A=v(i)))}if(typeof _wasmCtx>"u")throw new Error('must run "inwasm"');_wasmCtx.add(s)}});var Ce=x(Ee=>{"use strict";Object.defineProperty(Ee,"__esModule",{value:!0});var Bt=_e(),ft=(0,Bt.InWasm)({s:1,t:0,d:"AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML"}),S=new Uint8Array("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("").map(s=>s.charCodeAt(0))),R=new Uint32Array(1024);R.fill(4278190080);for(let s=0;s<S.length;++s)R[S[s]]=s<<2;for(let s=0;s<S.length;++s)R[256+S[s]]=s>>4|(s<<4&255)<<8;for(let s=0;s<S.length;++s)R[512+S[s]]=s>>2<<8|(s<<6&255)<<16;for(let s=0;s<S.length;++s)R[768+S[s]]=s<<16;var Qt=new Uint8Array(0),ue=class{constructor(e,t,i){if(this._inst=null,this._ended=!0,this._bytes=0,this.keepSize=e??1048576,this.maxBytes=t??4294901760,this._bytes=i??32768,this._bytes>this.maxBytes||this.maxBytes>4294901760)throw new Error("invalid byte settings")}get data8(){return this._inst?this._d.subarray(0,this._m32[1282]):Qt}release(){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))}init(e,t){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");let i=this._m32,A=this._bytes+5152;this._inst?this._mem.buffer.byteLength<A&&(this._mem.grow(Math.ceil((A-this._mem.buffer.byteLength)/65536)),i=new Uint32Array(this._mem.buffer,0),this._d=new Uint8Array(this._mem.buffer,5152)):(this._mem=new WebAssembly.Memory({initial:Math.ceil(A/65536)}),this._inst=ft({env:{memory:this._mem}}),i=new Uint32Array(this._mem.buffer,0),i.set(R,256),this._d=new Uint8Array(this._mem.buffer,5152)),i[1280]=0,i[1281]=0,i[1282]=0,this._m32=i,this._ended=!1}_realloc(e){let t=this._m32[1280]+e;if(this._bytes<t){if(t>this.maxBytes)return-3;let i=this._bytes;for(;(i*=2)<t;);if(i=Math.min(i,this.maxBytes),i<t)return-3;if(i+5152>this._mem.buffer.byteLength){let A=Math.ceil((i+5152-this._mem.buffer.byteLength)/65536);this._mem.grow(A),this._m32=new Uint32Array(this._mem.buffer,0),this._d=new Uint8Array(this._mem.buffer,5152)}this._bytes=i}return 0}put(e){if(!this._inst||this._ended)return-2;if(this._realloc(e.length))return-3;let t=this._m32;return this._d.set(e,t[1280]),t[1280]+=e.length,t[1280]-t[1281]>=131072?this._inst.exports.dec():0}end(){return this._ended=!0,this._inst?this._inst.exports.end():-2}get loadedBytes(){return this._inst?this._m32[1280]:0}get freeBytes(){return this._inst?this.maxBytes-this._m32[1280]:0}};Ee.default=ue});var Ne=x(Be=>{"use strict";Object.defineProperty(Be,"__esModule",{value:!0});var Dt=_e(),wt=(0,Dt.InWasm)({s:1,t:0,d:"AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw=="}),pe=class{constructor(e){this.keepSize=e,this.width=0,this.height=0}decode(e){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];let t=this.width*this.height,i=t*4,A=e.length,r=Math.max(i,A)+(Math.min(i,A)>>1)+4096;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=wt({env:{memory:this._mem}})),this._d||(this._d=new Uint8Array(this._mem.buffer));let n=this._mem.buffer.byteLength-A&-256;return this._d.set(e,n),this._inst.exports.dec(n,A,t),this._d.subarray(1024,1024+i)}release(){this._inst&&this._mem.buffer.byteLength>this.keepSize&&(this._inst=this._d=this._mem=null)}};Be.default=pe});var Ye=x(se=>{"use strict";Object.defineProperty(se,"__esModule",{value:!0});se.LIMITS=void 0;se.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"}});var We=x(b=>{"use strict";Object.defineProperty(b,"__esModule",{value:!0});b.decodeAsync=b.decode=b.Decoder=b.DecoderAsync=void 0;var O=Z(),Q=Ye();function St(s){if(typeof Buffer<"u")return Buffer.from(s,"base64");let e=atob(s),t=new Uint8Array(e.length);for(let i=0;i<t.length;++i)t[i]=e.charCodeAt(i);return t}var qe=St(Q.LIMITS.BYTES),J,re=new Uint32Array,Le=class{constructor(){this.bandHandler=e=>1,this.modeHandler=e=>1}handle_band(e){return this.bandHandler(e)}mode_parsed(e){return this.modeHandler(e)}},Lt={memoryLimit:2048*65536,sixelColor:O.DEFAULT_FOREGROUND,fillColor:O.DEFAULT_BACKGROUND,palette:O.PALETTE_VT340_COLOR,paletteLimit:Q.LIMITS.PALETTE_SIZE,truncate:!0};function ze(s){let e=new Le,t={env:{handle_band:e.handle_band.bind(e),mode_parsed:e.mode_parsed.bind(e)}};return WebAssembly.instantiate(J||qe,t).then(i=>(J=J||i.module,new P(s,i.instance||i,e)))}b.DecoderAsync=ze;var P=class{constructor(e,t,i){if(this._PIXEL_OFFSET=Q.LIMITS.MAX_WIDTH+4,this._canvas=re,this._bandWidths=[],this._maxWidth=0,this._minWidth=Q.LIMITS.MAX_WIDTH,this._lastOffset=0,this._currentHeight=0,this._opts=Object.assign({},Lt,e),this._opts.paletteLimit>Q.LIMITS.PALETTE_SIZE)throw new Error(`DecoderOptions.paletteLimit must not exceed ${Q.LIMITS.PALETTE_SIZE}`);if(t)i.bandHandler=this._handle_band.bind(this),i.modeHandler=this._initCanvas.bind(this);else{let A=J||(J=new WebAssembly.Module(qe));t=new WebAssembly.Instance(A,{env:{handle_band:this._handle_band.bind(this),mode_parsed:this._initCanvas.bind(this)}})}this._instance=t,this._wasm=this._instance.exports,this._chunk=new Uint8Array(this._wasm.memory.buffer,this._wasm.get_chunk_address(),Q.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(),Q.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(O.DEFAULT_FOREGROUND,0,this._opts.paletteLimit,0)}get _fillColor(){return this._states[0]}get _truncate(){return this._states[8]}get _rasterWidth(){return this._states[6]}get _rasterHeight(){return this._states[7]}get _width(){return this._states[2]?this._states[2]-4:0}get _height(){return this._states[3]}get _level(){return this._states[9]}get _mode(){return this._states[10]}get _paletteLimit(){return this._states[11]}_initCanvas(e){if(e===2){let t=this.width*this.height;if(t>this._canvas.length){if(this._opts.memoryLimit&&t*4>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");this._canvas=new Uint32Array(t)}this._maxWidth=this._width}else if(e===1)if(this._level===2){let t=Math.min(this._rasterWidth,Q.LIMITS.MAX_WIDTH)*this._rasterHeight;if(t>this._canvas.length){if(this._opts.memoryLimit&&t*4>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");this._canvas=new Uint32Array(t)}}else this._canvas.length<65536&&(this._canvas=new Uint32Array(65536));return 0}_realloc(e,t){let i=e+t;if(i>this._canvas.length){if(this._opts.memoryLimit&&i*4>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");let A=new Uint32Array(Math.ceil(i/65536)*65536);A.set(this._canvas),this._canvas=A}}_handle_band(e){let t=this._PIXEL_OFFSET,i=this._lastOffset;if(this._mode===2){let A=this.height-this._currentHeight,r=0;for(;r<6&&A>0;)this._canvas.set(this._pSrc.subarray(t*r,t*r+e),i+e*r),r++,A--;this._lastOffset+=e*r,this._currentHeight+=r}else if(this._mode===1){this._realloc(i,e*6),this._maxWidth=Math.max(this._maxWidth,e),this._minWidth=Math.min(this._minWidth,e);for(let A=0;A<6;++A)this._canvas.set(this._pSrc.subarray(t*A,t*A+e),i+e*A);this._bandWidths.push(e),this._lastOffset+=e*6,this._currentHeight+=6}return 0}get width(){return this._mode!==1?this._width:Math.max(this._maxWidth,this._wasm.current_width())}get height(){return this._mode!==1?this._height:this._wasm.current_width()?this._bandWidths.length*6+this._wasm.current_height():this._bandWidths.length*6}get palette(){return this._palette.subarray(0,this._paletteLimit)}get memoryUsage(){return this._canvas.byteLength+this._wasm.memory.buffer.byteLength+8*this._bandWidths.length}get properties(){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}}}init(e=this._opts.fillColor,t=this._opts.palette,i=this._opts.paletteLimit,A=this._opts.truncate){this._wasm.init(this._opts.sixelColor,e,i,A?1:0),t&&this._palette.set(t.subarray(0,Q.LIMITS.PALETTE_SIZE)),this._bandWidths.length=0,this._maxWidth=0,this._minWidth=Q.LIMITS.MAX_WIDTH,this._lastOffset=0,this._currentHeight=0}decode(e,t=0,i=e.length){let A=t;for(;A<i;){let r=Math.min(i-A,Q.LIMITS.CHUNK_SIZE);this._chunk.set(e.subarray(A,A+=r)),this._wasm.decode(0,r)}}decodeString(e,t=0,i=e.length){let A=t;for(;A<i;){let r=Math.min(i-A,Q.LIMITS.CHUNK_SIZE);for(let n=0,a=A;n<r;++n,++a)this._chunk[n]=e.charCodeAt(a);A+=r,this._wasm.decode(0,r)}}get data32(){if(this._mode===0||!this.width||!this.height)return re;let e=this._wasm.current_width();if(this._mode===2){let t=this.height-this._currentHeight;if(t>0){let i=this._PIXEL_OFFSET,A=this._lastOffset,r=0;for(;r<6&&t>0;)this._canvas.set(this._pSrc.subarray(i*r,i*r+e),A+e*r),r++,t--;t&&this._canvas.fill(this._fillColor,A+e*r)}return this._canvas.subarray(0,this.width*this.height)}if(this._mode===1){if(this._minWidth===this._maxWidth){let r=!1;if(e)if(e!==this._minWidth)r=!0;else{let n=this._PIXEL_OFFSET,a=this._lastOffset;this._realloc(a,e*6);for(let o=0;o<6;++o)this._canvas.set(this._pSrc.subarray(n*o,n*o+e),a+e*o)}if(!r)return this._canvas.subarray(0,this.width*this.height)}let t=new Uint32Array(this.width*this.height);t.fill(this._fillColor);let i=0,A=0;for(let r=0;r<this._bandWidths.length;++r){let n=this._bandWidths[r];for(let a=0;a<6;++a)t.set(this._canvas.subarray(A,A+=n),i),i+=this.width}if(e){let r=this._PIXEL_OFFSET,n=this._wasm.current_height();for(let a=0;a<n;++a)t.set(this._pSrc.subarray(r*a,r*a+e),i+this.width*a)}return t}return re}get data8(){return new Uint8ClampedArray(this.data32.buffer,0,this.width*this.height*4)}release(){this._canvas=re,this._bandWidths.length=0,this._maxWidth=0,this._minWidth=Q.LIMITS.MAX_WIDTH,this._wasm.init(O.DEFAULT_FOREGROUND,0,this._opts.paletteLimit,0)}};b.Decoder=P;function Tt(s,e){let t=new P(e);return t.init(),typeof s=="string"?t.decodeString(s):t.decode(s),{width:t.width,height:t.height,data32:t.data32,data8:t.data8}}b.decode=Tt;async function xt(s,e){let t=await ze(e);return t.init(),typeof s=="string"?t.decodeString(s):t.decode(s),{width:t.width,height:t.height,data32:t.data32,data8:t.data8}}b.decodeAsync=xt});function H(s){return{dispose:s}}var N=class{constructor(){this._disposables=new Set;this._isDisposed=!1}get isDisposed(){return this._isDisposed}add(e){return this._isDisposed?e.dispose():this._disposables.add(e),e}dispose(){if(!this._isDisposed){this._isDisposed=!0;for(let e of this._disposables)e.dispose();this._disposables.clear()}}clear(){for(let e of this._disposables)e.dispose();this._disposables.clear()}},k=class{constructor(){this._store=new N}dispose(){this._store.dispose()}_register(e){return this._store.add(e)}};k.None=Object.freeze({dispose(){}});var W=class{constructor(){this._isDisposed=!1}get value(){return this._isDisposed?void 0:this._value}set value(e){this._isDisposed||e===this._value||(this._value?.dispose(),this._value=e)}clear(){this.value=void 0}dispose(){this._isDisposed=!0,this._value?.dispose(),this._value=void 0}};var X=class{constructor(){this._listeners=[];this._disposed=!1}get event(){return this._event?this._event:(this._event=(e,t,i)=>{if(this._disposed)return H(()=>{});let A={fn:e,thisArgs:t};this._listeners=this._listeners.slice(),this._listeners.push(A);let r=H(()=>{let n=this._listeners.indexOf(A);n!==-1&&(this._listeners=this._listeners.slice(),this._listeners.splice(n,1))});return i&&(Array.isArray(i)?i.push(r):i.add(r)),r},this._event)}fire(e){if(this._disposed||!this._listeners.length)return;if(this._listeners.length===1){this._listeners[0].fn.call(this._listeners[0].thisArgs,e);return}let t=this._listeners;for(let i=0,A=t.length;i<A;++i)t[i].fn.call(t[i].thisArgs,e)}dispose(){this._disposed||(this._disposed=!0,this._listeners.length=0)}},ht;(A=>{function s(r,n){return r(a=>n.fire(a))}A.forward=s;function e(r,n){return(a,o,h)=>r(g=>a.call(o,n(g)),void 0,h)}A.map=e;function t(...r){return(n,a,o)=>{let h=new N;for(let g of r)h.add(g(d=>n.call(a,d)));return o&&(Array.isArray(o)?o.push(h):o.add(h)),h}}A.any=t;function i(r,n,a){return n(a),r(o=>n(o))}A.runAndSubscribe=i})(ht||={});var ce=M(Z());var D=class s extends k{constructor(t){super();this._terminal=t;this._layers=new Map;this._optionsRefresh=this._register(new W);this._oldOpen=this._terminal._core.open,this._terminal._core.open=i=>{this._oldOpen?.call(this._terminal._core,i),this._open()},this._terminal._core.screenElement&&this._open(),this._optionsRefresh.value=this._terminal._core.optionsService.onOptionChange(i=>{i==="fontSize"&&(this.rescaleCanvas(),this._renderService?.refreshRows(0,this._terminal.rows))}),this._register(H(()=>{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}))}get canvas(){return this._layers.get("top")?.canvas}static createCanvas(t,i,A){let r=(t??document).createElement("canvas");return r.width=i|0,r.height=A|0,r}static createImageData(t,i,A,r){if(typeof ImageData!="function"){let n=t.createImageData(i,A);return r&&n.data.set(new Uint8ClampedArray(r,0,i*A*4)),n}return r?new ImageData(new Uint8ClampedArray(r,0,i*A*4),i,A):new ImageData(i,A)}static createImageBitmap(t){return typeof createImageBitmap!="function"?Promise.resolve(void 0):createImageBitmap(t)}showPlaceholder(t){t?!this._placeholder&&this.cellSize.height!==-1&&this._createPlaceHolder(Math.max(this.cellSize.height+1,24)):(this._placeholderBitmap?.close(),this._placeholderBitmap=void 0,this._placeholder=void 0),this._renderService?.refreshRows(0,this._terminal.rows)}get dimensions(){return this._terminal.dimensions}get cellSize(){return{width:this.dimensions?.css.cell.width||-1,height:this.dimensions?.css.cell.height||-1}}clearLines(t,i,A){let r=t*(this.dimensions?.css.cell.height||0),n=this.dimensions?.css.canvas.width||0,a=(i+1-t)*(this.dimensions?.css.cell.height||0);(!A||A==="top")&&this._layers.get("top")?.clearRect(0,r,n,a),(!A||A==="bottom")&&this._layers.get("bottom")?.clearRect(0,r,n,a)}clearAll(t){if(!t||t==="top"){let i=this._layers.get("top");i?.clearRect(0,0,i.canvas.width,i.canvas.height)}if(!t||t==="bottom"){let i=this._layers.get("bottom");i?.clearRect(0,0,i.canvas.width,i.canvas.height)}}draw(t,i,A,r,n=1){let a=this._layers.get(t.layer);if(!a)return;let{width:o,height:h}=this.cellSize;if(o===-1||h===-1)return;this._rescaleImage(t,o,h);let g=t.actual,{width:d,height:I}=t.actualCellSize,l=Math.ceil(g.width/d),c=i%l*d,u=Math.floor(i/l)*I,E=A*o,C=r*h,p=n*d+c>g.width?g.width-c:n*d,B=u+I>g.height?g.height-u:I;a.drawImage(g,Math.floor(c),Math.floor(u),Math.ceil(p),Math.ceil(B),Math.floor(E),Math.floor(C),Math.ceil(p*o/d),Math.ceil(B*h/I))}extractTile(t,i){let{width:A,height:r}=this.cellSize;if(A===-1||r===-1)return;this._rescaleImage(t,A,r);let n=t.actual,{width:a,height:o}=t.actualCellSize,h=Math.ceil(n.width/a),g=i%h*a,d=Math.floor(i/h)*o,I=a+g>n.width?n.width-g:a,l=d+o>n.height?n.height-d:o,c=s.createCanvas(this.document,Math.ceil(I*A/a),Math.ceil(l*r/o)),u=c.getContext("2d");if(u)return u.drawImage(n,Math.floor(g),Math.floor(d),Math.floor(I),Math.floor(l),0,0,c.width,c.height),c}drawPlaceholder(t,i,A=1){let r=this._layers.get("top");if(r){let{width:n,height:a}=this.cellSize;if(n===-1||a===-1||(this._placeholder?a>=this._placeholder.height&&this._createPlaceHolder(a+1):this._createPlaceHolder(Math.max(a+1,24)),!this._placeholder))return;r.drawImage(this._placeholderBitmap??this._placeholder,t*n,i*a%2?0:1,n*A,a,t*n,i*a,n*A,a)}}rescaleCanvas(){let t=this.dimensions?.css.canvas.width||0,i=this.dimensions?.css.canvas.height||0;for(let A of this._layers.values())(A.canvas.width!==t||A.canvas.height!==i)&&(A.canvas.width=t,A.canvas.height=i)}_rescaleImage(t,i,A){if(i===t.actualCellSize.width&&A===t.actualCellSize.height)return;let{width:r,height:n}=t.origCellSize;if(i===r&&A===n){t.actual=t.orig,t.actualCellSize.width=r,t.actualCellSize.height=n;return}let a=Math.ceil(t.orig.width*i/r),o=Math.ceil(t.orig.height*A/n);if(a*o>t.orig.width*t.orig.height){t.actual=t.orig,t.actualCellSize.width=r,t.actualCellSize.height=n;return}let h=s.createCanvas(this.document,a,o),g=h.getContext("2d");g&&(g.drawImage(t.orig,0,0,h.width,h.height),t.actual=h,t.actualCellSize.width=i,t.actualCellSize.height=A)}_open(){this._renderService=this._terminal._core._renderService,this._oldSetRenderer=this._renderService.setRenderer.bind(this._renderService),this._renderService.setRenderer=t=>{for(let i of[...this._layers.keys()])this.removeLayerFromDom(i);this._oldSetRenderer?.call(this._renderService,t)}}insertLayerToDom(t="top"){if(!this.document||!this._terminal._core.screenElement){console.warn("image addon: cannot insert output canvas to DOM, missing document or screenElement");return}if(this._layers.has(t))return;let i=s.createCanvas(this.document,this.dimensions?.css.canvas.width||0,this.dimensions?.css.canvas.height||0);i.classList.add(`xterm-image-layer-${t}`);let A=this._terminal._core.screenElement;A.style.isolation="isolate",t==="bottom"?(i.style.zIndex="-1",A.insertBefore(i,A.firstChild)):(i.style.zIndex="0",A.appendChild(i));let r=i.getContext("2d",{alpha:!0});if(!r){i.remove();return}this._layers.set(t,r),this.clearAll(t)}removeLayerFromDom(t="top"){let i=this._layers.get(t);i&&(i.canvas.remove(),this._layers.delete(t))}hasLayer(t){return this._layers.has(t)}_createPlaceHolder(t=24){this._placeholderBitmap?.close(),this._placeholderBitmap=void 0;let i=32,A=s.createCanvas(this.document,i,t),r=A.getContext("2d",{alpha:!1});if(!r)return;let n=s.createImageData(r,i,t),a=new Uint32Array(n.data.buffer),o=(0,ce.toRGBA8888)(0,0,0),h=(0,ce.toRGBA8888)(255,255,255);a.fill(o);for(let l=0;l<t;++l){let c=l%2,u=l*i;for(let E=0;E<i;E+=2)a[u+E+c]=h}r.putImageData(n,0,0);let g=screen.width+i-1&~(i-1)||4096;this._placeholder=s.createCanvas(this.document,g,t);let d=this._placeholder.getContext("2d",{alpha:!1});if(!d){this._placeholder=void 0;return}for(let l=0;l<g;l+=i)d.drawImage(A,l,0);let I=this._placeholder;s.createImageBitmap(I).then(l=>{this._placeholder!==I?l?.close():this._placeholderBitmap=l}).catch(()=>{})}get document(){return this._terminal._core._coreBrowserService?.window.document}};var w={width:7,height:14},G=class s{constructor(e=0,t=0,i=-1,A=-1){this.imageId=i;this.tileId=A;this._ext=0;this._urlId=0;this._ext=e,this._urlId=t}get ext(){return this._urlId?this._ext&-469762049|this.underlineStyle<<26:this._ext}set ext(e){this._ext=e}get underlineStyle(){return this._urlId?5:(this._ext&469762048)>>26}set underlineStyle(e){this._ext&=-469762049,this._ext|=e<<26&469762048}get underlineColor(){return this._ext&67108863}set underlineColor(e){this._ext&=-67108864,this._ext|=e&67108863}get underlineVariantOffset(){let e=(this._ext&3758096384)>>29;return e<0?e^4294967288:e}set underlineVariantOffset(e){this._ext&=536870911,this._ext|=e<<29&3758096384}get urlId(){return this._urlId}set urlId(e){this._urlId=e}clone(){return new s(this._ext,this._urlId,this.imageId,this.tileId)}isEmpty(){return this.underlineStyle===0&&this._urlId===0&&this.imageId===-1}},F=new G,j=class{constructor(e,t,i){this._terminal=e;this._renderer=t;this._opts=i;this._images=new Map;this._lastId=0;this._lowestId=0;this._fullyCleared=!1;this._needsFullClear=!1;this._pixelLimit=25e5;try{this.setLimit(this._opts.storageLimit)}catch(A){A instanceof Error&&console.error(A.message),console.warn(`storageLimit is set to ${this.getLimit()} MB`)}this._viewportMetrics={cols:this._terminal.cols,rows:this._terminal.rows}}dispose(){this.reset()}reset(){for(let e of this._images.values())e.marker?.dispose();this._images.clear(),this._renderer.clearAll()}getLimit(){return this._pixelLimit*4/1e6}setLimit(e){if(e<.5||e>1e3)throw RangeError("invalid storageLimit, should be at least 0.5 MB and not exceed 1G");this._pixelLimit=e/4*1e6>>>0,this._evictOldest(0)}getUsage(){return this._getStoredPixels()*4/1e6}_getStoredPixels(){let e=0;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));return e}_delImg(e){let t=this._images.get(e);t&&(this._images.delete(e),window.ImageBitmap&&t.orig instanceof ImageBitmap&&t.orig.close(),this.onImageDeleted?.(e))}wipeAlternate(){let e=[];for(let[t,i]of this._images.entries())i.bufferType==="alternate"&&(i.marker?.dispose(),e.push(t));for(let t of e)this._delImg(t);this._needsFullClear=!0,this._fullyCleared=!1}deleteImage(e){let t=this._images.get(e);t&&(t.marker?.dispose(),this._delImg(e))}addImage(e,t){this._evictOldest(e.width*e.height);let i=this._renderer.cellSize;(i.width===-1||i.height===-1)&&(i=w);let A=Math.ceil(e.width/i.width),r=Math.ceil(e.height/i.height),n=++this._lastId,a=this._terminal._core.buffer,o=this._terminal.cols,h=this._terminal.rows,g=a.x,d=a.y,I=g,l=0;t.scrolling||(a.x=0,a.y=0,I=0),this._terminal._core._inputHandler._dirtyRowTracker.markDirty(a.y);for(let C=0;C<r;++C){let p=a.lines.get(a.y+a.ybase);for(let B=0;B<A&&!(I+B>=o);++B)this._writeToCell(p,I+B,n,C*A+B),l++;if(t.scrolling)C<r-1&&this._terminal._core._inputHandler.lineFeed();else if(++a.y>=h)break;a.x=I}this._terminal._core._inputHandler._dirtyRowTracker.markDirty(a.y),t.scrolling?t.cursorPos==="iip"?a.x=Math.min(I+A,o):a.x=I:(a.x=g,a.y=d);let c=[];for(let[C,p]of this._images.entries())p.tileCount<1&&(p.marker?.dispose(),c.push(C));for(let C of c)this._delImg(C);let u=this._terminal.registerMarker(0);u?.onDispose(()=>{this._images.get(n)&&this._delImg(n)}),this._terminal.buffer.active.type==="alternate"&&this._evictOnAlternate();let E={orig:e,origCellSize:i,actual:e,actualCellSize:{...i},marker:u||void 0,tileCount:l,bufferType:this._terminal.buffer.active.type,layer:t.layer,zIndex:t.zIndex};return this._images.set(n,E),this.onImageAdded?.(),n}render(e){let t=!1,i=!1;for(let g of this._images.values())if(g.layer==="bottom"?i=!0:t=!0,t&&i)break;if(t&&!this._renderer.hasLayer("top")&&(this._renderer.insertLayerToDom("top"),!this._renderer.hasLayer("top")))return;if(i&&!this._renderer.hasLayer("bottom")&&this._renderer.insertLayerToDom("bottom"),this._renderer.rescaleCanvas(),!this._images.size){this._fullyCleared||(this._renderer.clearAll(),this._fullyCleared=!0,this._needsFullClear=!1),this._renderer.hasLayer("top")&&this._renderer.removeLayerFromDom("top"),this._renderer.hasLayer("bottom")&&this._renderer.removeLayerFromDom("bottom");return}!t&&this._renderer.hasLayer("top")&&(this._renderer.clearAll("top"),this._renderer.removeLayerFromDom("top")),!i&&this._renderer.hasLayer("bottom")&&(this._renderer.clearAll("bottom"),this._renderer.removeLayerFromDom("bottom")),this._needsFullClear&&(this._renderer.clearAll(),this._fullyCleared=!0,this._needsFullClear=!1);let{start:A,end:r}=e,n=this._terminal._core.buffer,a=this._terminal._core.cols;this._renderer.clearLines(A,r);let o=[],h=[];for(let g=A;g<=r;++g){let d=n.lines.get(g+n.ydisp);if(!d)return;for(let I=0;I<a;++I)if(d.getBg(I)&268435456){let l=d._extendedAttrs[I]??F,c=l.imageId;if(c===void 0||c===-1)continue;let u=this._images.get(c);if(l.tileId!==-1){let E=l.tileId,C=I,p=1;for(;++I<a&&d.getBg(I)&268435456&&(l=d._extendedAttrs[I]??F)&&l.imageId===c&&l.tileId===E+p;)p++;I--,u?u.actual&&o.push({imgSpec:u,tileId:E,col:C,row:g,count:p}):this._opts.showPlaceholder&&h.push({col:C,row:g,count:p}),this._fullyCleared=!1}}}o.sort((g,d)=>g.imgSpec.zIndex-d.imgSpec.zIndex);for(let g of h)this._renderer.drawPlaceholder(g.col,g.row,g.count);for(let g of o)this._renderer.draw(g.imgSpec,g.tileId,g.col,g.row,g.count)}viewportResize(e){if(!this._images.size){this._viewportMetrics=e;return}if(this._viewportMetrics.cols>=e.cols){this._viewportMetrics=e;return}let t=this._terminal._core.buffer,i=t.lines.length,A=this._viewportMetrics.cols-1;for(let r=0;r<i;++r){let n=t.lines.get(r);if(n.getBg(A)&268435456){let a=n._extendedAttrs[A]??F,o=a.imageId;if(o===void 0||o===-1)continue;let h=this._images.get(o);if(!h)continue;let g=Math.ceil((h.actual?.width||0)/h.actualCellSize.width);if(a.tileId%g+1>=g)continue;let d=!1;for(let c=A+1;c>e.cols;++c)if(n._data[c*3+0]&4194303){d=!0;break}if(d)continue;let I=Math.min(e.cols,g-a.tileId%g+A),l=a.tileId;for(let c=A+1;c<I;++c)this._writeToCell(n,c,o,++l),h.tileCount++}}this._viewportMetrics=e}getImageAtBufferCell(e,t){let A=this._terminal._core.buffer.lines.get(t);if(A&&A.getBg(e)&268435456){let r=A._extendedAttrs[e]??F;if(r.imageId&&r.imageId!==-1){let n=this._images.get(r.imageId)?.orig;if(window.ImageBitmap&&n instanceof ImageBitmap){let a=D.createCanvas(window.document,n.width,n.height);return a.getContext("2d")?.drawImage(n,0,0,n.width,n.height),a}return n}}}extractTileAtBufferCell(e,t){let A=this._terminal._core.buffer.lines.get(t);if(A&&A.getBg(e)&268435456){let r=A._extendedAttrs[e]??F;if(r.imageId&&r.imageId!==-1&&r.tileId!==-1){let n=this._images.get(r.imageId);if(n)return this._renderer.extractTile(n,r.tileId)}}}_evictOldest(e){let t=this._getStoredPixels(),i=t;for(;this._pixelLimit<i+e&&this._images.size;){let A=this._images.get(++this._lowestId);A&&A.orig&&(i-=A.orig.width*A.orig.height,A.actual&&A.orig!==A.actual&&(i-=A.actual.width*A.actual.height),A.marker?.dispose(),this._delImg(this._lowestId))}return t-i}_writeToCell(e,t,i,A){if(e._data[t*3+2]&268435456){let r=e._extendedAttrs[t];if(r){if(r.imageId!==void 0){let n=this._images.get(r.imageId);n&&n.tileCount--,r.imageId=i,r.tileId=A;return}e._extendedAttrs[t]=new G(r.ext,r.urlId,i,A);return}}e._data[t*3+2]|=268435456,e._extendedAttrs[t]=new G(0,0,i,A)}_evictOnAlternate(){for(let i of this._images.values())i.bufferType==="alternate"&&(i.tileCount=0);let e=this._terminal._core.buffer;for(let i=0;i<this._terminal.rows;++i){let A=e.lines.get(i);if(A){for(let r=0;r<this._terminal.cols;++r)if(A._data[r*3+2]&268435456){let n=A._extendedAttrs[r]?.imageId;if(n){let a=this._images.get(n);a&&a.tileCount++}}}}let t=[];for(let[i,A]of this._images.entries())A.bufferType==="alternate"&&!A.tileCount&&(A.marker?.dispose(),t.push(i));for(let i of t)this._delImg(i)}};var Oe=M(Ce()),Je=M(Ne());function V(s){let e="";for(let t=0;t<s.length;++t)e+=String.fromCharCode(s[t]);return e}function fe(s){let e=0;for(let t=0;t<s.length;++t){if(s[t]<48||s[t]>57)throw new Error("illegal char");e=e*10+s[t]-48}return e}function He(s){let e=V(s);if(!e.match(/^((auto)|(\d+?((px)|(%)){0,1}))$/))throw new Error("illegal size");return e}function bt(s){if(typeof Buffer<"u")return Buffer.from(V(s),"base64").toString();let e=atob(V(s)),t=new Uint8Array(e.length);for(let i=0;i<t.length;++i)t[i]=e.charCodeAt(i);return new TextDecoder().decode(t)}var Fe={inline:fe,size:fe,name:bt,width:He,height:He,preserveAspectRatio:fe},Ge=[70,105,108,101],Ue=[77,117,108,116,105,112,97,114,116,70,105,108,101],Qe=[70,105,108,101,80,97,114,116],De=[70,105,108,101,69,110,100],we=[82,101,112,111,114,116,67,101,108,108,83,105,122,101],be=1024,$=class{constructor(){this.state=0;this._buffer=new Uint32Array(be);this._position=0;this._key="";this.fields={}}reset(){this._buffer.fill(0),this.state=0,this._position=0,this.fields={},this._key=""}end(){if(this.state===0){if(this._position===De.length){for(let e=0;e<De.length;++e)if(this._buffer[e]!==De[e])return this._a();return this.fields.type=4,this.state=4,0}if(this._position===we.length){for(let e=0;e<we.length;++e)if(this._buffer[e]!==we[e])return this._a();return this.fields.type=5,this.state=4,0}return this._a()}return this.state===4?0:this.state===3&&this.fields.type===2?this._storeValue(this._position)?(this.state=4,0):this._a():this._a()}parse(e,t,i){let A=this.state,r=this._position,n=this._buffer;if(A===1||A===4||A===0&&r>14)return-1;for(let a=t;a<i;++a){let o=e[a];switch(o){case 59:if(!this._storeValue(r))return this._a();A=2,r=0;break;case 61:if(A===0){if(n[0]===70){let h=0;for(;h<Ge.length;++h)if(n[h]!==Ge[h])return this._a();if(this.fields.type=1,r===Qe.length){for(;h<Qe.length;++h)if(n[h]!==Qe[h])return this._a();return this.fields.type=3,this.state=4,a+1}}else if(n[0]===77){for(let h=0;h<Ue.length;++h)if(n[h]!==Ue[h])return this._a();this.fields.type=2}else return this._a();A=2,r=0}else if(A===2){if(!this._storeKey(r))return this._a();A=3,r=0}else if(A===3){if(r>=be)return this._a();n[r++]=o}break;case 58:return A===3&&!this._storeValue(r)?this._a():(this.state=4,a+1);default:if(r>=be)return this._a();n[r++]=o}}return this.state=A,this._position=r,-2}_a(){return this.fields.type=0,this.state=1,-1}_storeKey(e){let t=V(this._buffer.subarray(0,e));return t?(this._key=t,this.fields[t]=null,!0):!1}_storeValue(e){if(this._key){try{let t=this._buffer.slice(0,e);this.fields[this._key]=Fe[this._key]?Fe[this._key](t):t}catch{return!1}return!0}return!1}};var L={mime:"unsupported",width:0,height:0};function ee(s){if(s.length<32)return L;let e=new Uint32Array(s.buffer,s.byteOffset,8);if(e[0]===1196314761&&e[1]===169478669&&e[3]===1380206665)return{mime:"image/png",width:s[16]<<24|s[17]<<16|s[18]<<8|s[19],height:s[20]<<24|s[21]<<16|s[22]<<8|s[23]};if(s[0]===255&&s[1]===216&&s[2]===255){let[t,i]=yt(s);return{mime:"image/jpeg",width:t,height:i}}if(e[0]===944130375&&(s[4]===55||s[4]===57)&&s[5]===97)return{mime:"image/gif",width:s[7]<<8|s[6],height:s[9]<<8|s[8]};if(e[0]===1718185841)return{mime:"image/qoi",width:s[4]<<24|s[5]<<16|s[6]<<8|s[7],height:s[8]<<24|s[9]<<16|s[10]<<8|s[11]};if(e[0]===1179011410&&e[2]===1346520407&&(e[3]&16777215)===3690582){switch(s[15]){case 88:return{mime:"image/webp",width:(s[24]|s[25]<<8|s[26]<<16)+1,height:(s[27]|s[28]<<8|s[29]<<16)+1};case 76:if(s[20]!==47)return L;let t=s[21]|s[22]<<8|s[23]<<16|s[24]<<24;return{mime:"image/webp",width:(t&16383)+1,height:(t>>>14&16383)+1};case 32:return s[23]!==157||s[24]!==1||s[25]!==42?L:{mime:"image/webp",width:(s[26]|s[27]<<8)&16383,height:(s[28]|s[29]<<8)&16383}}return L}if(e[1]===1887007846&&(e[2]===1718187617||e[2]===1936291425)){let t=-1,i=Math.min(s.length-16,1024);for(let A=8;A<i;A++)if(s[A]===105&&s[A+1]===115&&s[A+2]===112&&s[A+3]===101){t=A;break}if(t!==-1){let A=s[t+8]<<24|s[t+9]<<16|s[t+10]<<8|s[t+11],r=s[t+12]<<24|s[t+13]<<16|s[t+14]<<8|s[t+15];if(A>0&&r>0)return{mime:"image/avif",width:A,height:r}}return L}return L}function yt(s){let e=s.length,t=4,i=s[t]<<8|s[t+1];for(;;){if(t+=i,t>=e)return[0,0];if(s[t]!==255)return[0,0];if(s[t+1]===192||s[t+1]===194)return t+8<e?[s[t+7]<<8|s[t+8],s[t+5]<<8|s[t+6]]:[0,0];t+=2,i=s[t]<<8|s[t+1]}}var ye={type:0,name:"Unnamed file",size:0,width:"auto",height:"auto",preserveAspectRatio:1,inline:0},te=class{constructor(e,t,i,A){this._opts=e;this._renderer=t;this._storage=i;this._coreTerminal=A;this._generation=0;this._aborted=!1;this._hp=new $;this._header=ye;this._isMultipart=!1;this._abortMulti=!1;let r=Math.ceil(this._opts.iipSizeLimit*4/3),n=Math.min(1048576,r);this._dec=new Oe.default(4194304,r,n),this._qoiDec=new Je.default(4194304)}reset(){this._generation++,this._hp.reset(),this._dec.release(),this._qoiDec.release()}start(){this._aborted=!1,this._hp.reset()}put(e,t,i){if(!this._aborted)if(this._hp.state===4)this._dec.put(e.subarray(t,i))!==0&&(this._dec.release(),this._aborted=!0);else{let A=this._hp.parse(e,t,i);if(A===-1){this._aborted=!0;return}if(A>0){if(this._hp.fields.type===1){if(this._isMultipart&&(this._isMultipart=!1,this._abortMulti=!1,this._dec.release()),this._header=Object.assign({},ye,this._hp.fields),!this._header.inline){this._aborted=!0;return}this._dec.init()}else if(this._abortMulti){this._aborted=!0;return}this._dec.put(e.subarray(A,i))!==0&&(this._dec.release(),this._aborted=!0,this._isMultipart&&(this._abortMulti=!0))}}}end(e){if(this._aborted||this._hp.state!==4&&this._hp.end())return!0;let t=this._hp.fields.type;if(t===3)return!0;if(t===5){let h=w.width,g=w.height;this._renderer.dimensions&&(h=this._renderer.dimensions.css.canvas.width/this._coreTerminal.cols,g=this._renderer.dimensions.css.canvas.height/this._coreTerminal.rows);let d=this._coreTerminal._core._coreBrowserService?.dpr??1,I=`\x1B]1337;ReportCellSize=${g.toFixed(3)};${h.toFixed(3)};${d.toFixed(3)}\x1B\\`;return this._coreTerminal.input(I,!1),!0}if(t===2)return this._header=Object.assign({},ye,this._hp.fields),this._isMultipart=!0,this._abortMulti=!1,this._dec.release(),this._dec.init(),!0;if(t===4&&(!this._isMultipart||(this._isMultipart=!1,this._abortMulti||this._header.type!==2)))return!0;let i=0,A=0,r,n=L;if((r=e)&&((r=!this._dec.end())?(n=ee(this._dec.data8),(r=n.mime!=="unsupported")?(i=n.width,A=n.height,(r=i&&A&&i*A<this._opts.pixelLimit)?([i,A]=this._resize(i,A).map(Math.floor),r=i&&A&&i*A<this._opts.pixelLimit):console.warn(`IIP: image dimension issue ${n.width}x${n.height}`)):console.warn("IIP: unsupported image type")):console.warn("IIP: error during BASE64 decoding")),!r)return this._dec.release(),!0;let a;if(n.mime==="image/qoi"){let h=this._qoiDec.decode(this._dec.data8);if(a=new ImageData(new Uint8ClampedArray(h.buffer,h.byteOffset,h.byteLength),this._qoiDec.width,this._qoiDec.height),this._qoiDec.release(),i===this._qoiDec.width&&A===this._qoiDec.height){this._dec.release();let g=D.createCanvas(void 0,this._qoiDec.width,this._qoiDec.height);return g.getContext("2d")?.putImageData(a,0,0),this._storage.addImage(g),!0}}else a=new Blob([this._dec.data8],{type:n.mime});this._dec.release();let o=this._generation;return createImageBitmap(a,{resizeWidth:i,resizeHeight:A}).then(h=>o!==this._generation?(h.close(),!0):(this._storage.addImage(h),!0)).catch(h=>(console.warn(`IIP: decoding error ${n.mime} ${n.width}x${n.height}`,h),!0))}_resize(e,t){let i=this._renderer.dimensions?.css.cell.width||w.width,A=this._renderer.dimensions?.css.cell.height||w.height,r=this._renderer.dimensions?.css.canvas.width||i*this._coreTerminal.cols,n=this._renderer.dimensions?.css.canvas.height||A*this._coreTerminal.rows,a=this._dim(this._header.width,r,i),o=this._dim(this._header.height,n,A);if(!a&&!o){let h=r/e,g=(n-A)/t,d=Math.min(h,g);return d<1?[e*d,t*d]:[e,t]}return a?this._header.preserveAspectRatio||!a||!o?[a,t*a/e]:[a,o]:[e*o/t,o]}_dim(e,t,i){return e==="auto"?0:e.endsWith("%")?parseInt(e.slice(0,-1),10)*t/100:e.endsWith("px")?parseInt(e.slice(0,-2),10):parseInt(e,10)*i}};var Ke=M(Ce());function Se(s){let e={},t=s.split(",");for(let i of t){let A=i.indexOf("=");if(A===-1)continue;let r=i.substring(0,A),n=i.substring(A+1);if(r==="a"){e.action=n;continue}if(r==="o"){e.compression=n;continue}if(r==="t"){e.transmission=n;continue}if(r==="d"){e.deleteSelector=n;continue}let a=parseInt(n,10);switch(r){case"f":e.format=a;break;case"i":e.id=a;break;case"I":e.imageNumber=a;break;case"s":e.width=a;break;case"v":e.height=a;break;case"x":e.x=a;break;case"y":e.y=a;break;case"w":e.sourceWidth=a;break;case"h":e.sourceHeight=a;break;case"X":e.xOffset=a;break;case"Y":e.yOffset=a;break;case"c":e.columns=a;break;case"r":e.rows=a;break;case"m":e.more=a;break;case"q":e.quiet=a;break;case"C":e.cursorMovement=a;break;case"z":e.zIndex=a;break;case"p":e.placementId=a;break}}return e}var Pe=0,ie=class{constructor(e,t,i,A){this._opts=e;this._renderer=t;this._kittyStorage=i;this._coreTerminal=A;this._aborted=!1;this._generation=0;this._decodeError=!1;this._activeDecoder=null;this._inControlData=!0;this._controlData=new Uint32Array(512);this._controlLength=0;this._encodedSizeLimit=0;this._totalEncodedSize=0;this._parsedCommand=null;this._pendingTransmissions=new Map;this._maxEncodedBytes=Math.ceil(this._opts.kittySizeLimit*4/3),this._initialEncodedBytes=Math.min(4194304,this._maxEncodedBytes)}reset(){this._generation++,this._cleanupAllPending(),this._activeDecoder&&(this._activeDecoder.release(),this._activeDecoder=null),this._kittyStorage.reset()}dispose(){this.reset()}_removePendingEntry(e){this._pendingTransmissions.delete(e),this._lastPendingKey===e&&(this._lastPendingKey=void 0)}_cleanupAllPending(){for(let e of this._pendingTransmissions.values())e.decoder.release();this._pendingTransmissions.clear(),this._lastPendingKey=void 0}start(){this._aborted=!1,this._decodeError=!1,this._inControlData=!0,this._controlLength=0,this._parsedCommand=null,this._encodedSizeLimit=this._maxEncodedBytes,this._totalEncodedSize=0,this._activeDecoder=null}put(e,t,i){if(!this._aborted)if(!this._inControlData)this._streamPayload(e,t,i);else{let A=i;for(let n=t;n<i;n++)if(e[n]===59){this._inControlData=!1,A=n;break}let r=A-t;if(this._controlLength+r>512){this._aborted=!0;return}if(this._controlData.set(e.subarray(t,A),this._controlLength),this._controlLength+=r,!this._inControlData){if(this._parsedCommand=Se(this._parseControlDataString()),this._parsedCommand.id!==void 0&&this._parsedCommand.imageNumber!==void 0){this._sendResponse(this._parsedCommand.id,"EINVAL:cannot specify both i and I keys",this._parsedCommand.quiet??0),this._aborted=!0;return}if(this._parsedCommand.action==="d")return;let n=A+1;n<i&&this._streamPayload(e,n,i)}}}_streamPayload(e,t,i){if(this._aborted)return;let A=this._parsedCommand?.id??this._lastPendingKey??0,r=this._pendingTransmissions.get(A),n=r?.totalEncodedSize??0;if(this._totalEncodedSize+=i-t,n+this._totalEncodedSize>this._encodedSizeLimit){let o=this._activeDecoder??r?.decoder;o&&o.release(),this._activeDecoder=null,r&&this._removePendingEntry(A),this._aborted=!0;return}if(!this._decodeError){if(r?.decoder&&!this._activeDecoder&&(this._activeDecoder=r.decoder),!this._activeDecoder){let o=this._maxEncodedBytes+131072;if(o>this._opts.storageLimit*1e6){this._aborted=!0,this._parsedCommand?.id!==void 0&&this._sendResponse(this._parsedCommand.id,"ENOMEM:pending image budget exceeded",this._parsedCommand.quiet??0);return}let h=Math.max(1,Math.floor(this._opts.storageLimit*1e6/o));for(;this._pendingTransmissions.size>=h;){let g=this._pendingTransmissions.entries().next().value;if(!g)break;g[1].decoder.release(),this._removePendingEntry(g[0]),g[1].cmd.id!==void 0&&this._sendResponse(g[1].cmd.id,"ENOMEM:pending image budget exceeded",g[1].cmd.quiet??0)}this._activeDecoder=new Ke.default(4194304,this._maxEncodedBytes,this._initialEncodedBytes),this._activeDecoder.init()}this._activeDecoder.put(e.subarray(t,i))!==Pe&&(this._activeDecoder.release(),this._activeDecoder=null,this._decodeError=!0,r&&this._removePendingEntry(A))}}end(e){if(this._aborted||!e)return this._activeDecoder&&(this._activeDecoder.release(),this._activeDecoder=null),!0;if(this._inControlData)return this._handleNoPayloadCommand();let t=this._parsedCommand;if(t.action==="d")return this._handleDelete(t);let i=t.id??this._lastPendingKey??0,A=t.more===1,r=this._pendingTransmissions.get(i);if(A)return this._activeDecoder&&(r?(r.totalEncodedSize+=this._totalEncodedSize,r.decodeError=r.decodeError||this._decodeError):this._pendingTransmissions.set(i,{cmd:{...t},decoder:this._activeDecoder,totalEncodedSize:this._totalEncodedSize,decodeError:this._decodeError}),this._lastPendingKey=i,this._activeDecoder=null),!0;r&&(this._lastPendingKey=void 0);let n=this._decodeError,a=t,o=this._activeDecoder;r&&(a=r.cmd,o=r.decoder,n=n||r.decodeError,this._pendingTransmissions.delete(i));let h=new Uint8Array(0);o&&(o.end()!==Pe&&(n=!0),h=o.data8),this._activeDecoder=null;let g=this._handleCommandWithBytesAndCmd(a,h,n);return o&&o.release(),g}_parseControlDataString(){let e="";for(let t=0;t<this._controlLength;t++)e+=String.fromCodePoint(this._controlData[t]);return e}_handleNoPayloadCommand(){let e=Se(this._parseControlDataString());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),!0;switch(e.action??"t"){case"d":return this._handleDelete(e);case"q":return this._sendResponse(e.id??0,"OK",e.quiet??0),!0;case"p":return this._handlePlacement(e);default:return e.id!==void 0&&this._sendResponse(e.id,"EINVAL:unsupported action",e.quiet??0),!0}}_handleCommandWithBytesAndCmd(e,t,i){switch(e.action??"t"){case"t":{let r=this._handleTransmit(e,t,i);return(e.transmission??"d")==="d"&&e.id!==void 0&&(i?this._sendResponse(e.id,"EINVAL:invalid base64 data",e.quiet??0):t.length>0&&this._sendResponse(e.id,"OK",e.quiet??0)),r}case"T":return this._handleTransmitDisplay(e,t,i);case"q":return this._handleQuery(e,t,i);case"p":return this._handlePlacement(e);default:return e.id!==void 0&&this._sendResponse(e.id,"EINVAL:unsupported action",e.quiet??0),!0}}_handlePlacement(e){if(e.id===void 0)return!0;let t=e.id,i=this._kittyStorage.getImage(t);return i?this._displayImage(i,e).then(r=>(this._sendResponse(t,r?"OK":"EINVAL:image rendering failed",e.quiet??0,e.placementId),!0)):(this._sendResponse(t,"ENOENT:image not found",e.quiet??0,e.placementId),!0)}_handleTransmit(e,t,i){return(e.transmission??"d")!=="d"?(e.id!==void 0&&this._sendResponse(e.id,"EINVAL:unsupported transmission medium",e.quiet??0),!0):(i||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??""}),!0)}_handleTransmitDisplay(e,t,i){if(i)return e.id!==void 0&&this._sendResponse(e.id,"EINVAL:invalid base64 data",e.quiet??0),!0;this._handleTransmit(e,t,i);let A=e.id??this._kittyStorage.lastImageId,r=this._kittyStorage.getImage(A);if(r){let n=this._displayImage(r,e);return e.id!==void 0?n.then(a=>(this._sendResponse(A,a?"OK":"EINVAL:image rendering failed",e.quiet??0),!0)):n.then(()=>!0)}return!0}_handleQuery(e,t,i){let A=e.id??0,r=e.quiet??0;if((e.transmission??"d")!=="d")return this._sendResponse(A,"EINVAL:unsupported transmission medium",r),!0;if(i)return this._sendResponse(A,"EINVAL:invalid base64 data",r),!0;if(t.length===0)return this._sendResponse(A,"OK",r),!0;let a=e.format??32;if(a===100)this._sendResponse(A,"OK",r);else{let o=e.width??0,h=e.height??0;if(!o||!h)return this._sendResponse(A,"EINVAL:width and height required for raw pixel data",r),!0;let g=a===32?4:3,d=o*h*g;if(t.length<d)return this._sendResponse(A,"EINVAL:insufficient pixel data",r),!0;this._sendResponse(A,"OK",r)}return!0}_handleDelete(e){switch(e.deleteSelector??"a"){case"a":case"A":this._cleanupAllPending(),this._kittyStorage.deleteAll();break;case"i":case"I":if(e.id!==void 0){let i=this._pendingTransmissions.get(e.id);i&&i.decoder.release(),this._removePendingEntry(e.id),this._kittyStorage.deleteById(e.id)}break;default:break}return!0}_sendResponse(e,t,i,A){let r=t==="OK";if(r&&i>=1||!r&&i>=2)return;let n=A?`,p=${A}`:"",a=`\x1B_Gi=${e}${n};${t}\x1B\\`;this._coreTerminal._core.coreService.triggerDataEvent(a)}_displayImage(e,t){return this._decodeAndDisplay(e,t).then(()=>!0).catch(()=>!1)}async _decodeAndDisplay(e,t){let i=this._generation,A=await this._createBitmap(e);try{if(i!==this._generation)throw new Error("image decode canceled");let r=Math.max(0,t.x??0),n=Math.max(0,t.y??0),a=t.sourceWidth||A.width-r,o=t.sourceHeight||A.height-n,h=Math.max(0,A.width-r),g=Math.max(0,A.height-n),d=Math.max(0,Math.min(a,h)),I=Math.max(0,Math.min(o,g));if(d===0||I===0)throw new Error("invalid source rectangle");if(r!==0||n!==0||d!==A.width||I!==A.height){let T=await createImageBitmap(A,r,n,d,I);A.close(),A=T}let l=this._renderer.dimensions?.css.cell.width||w.width,c=this._renderer.dimensions?.css.cell.height||w.height,u,E;t.columns!==void 0&&t.rows!==void 0?(u=t.columns,E=t.rows):t.columns!==void 0?(u=t.columns,E=Math.max(1,Math.ceil(A.height/A.width*(u*l)/c))):t.rows!==void 0?(E=t.rows,u=Math.max(1,Math.ceil(A.width/A.height*(E*c)/l))):(u=Math.ceil(A.width/l),E=Math.ceil(A.height/c));let C=A.width,p=A.height;if((t.columns!==void 0||t.rows!==void 0)&&(C=Math.round(u*l),p=Math.round(E*c)),C*p>this._opts.pixelLimit)throw new Error("image exceeds pixel limit");let B=this._coreTerminal._core.buffer,K=B.x,Y=B.y,q=B.ybase,$e=t.zIndex!==void 0&&t.zIndex<0?"bottom":"top";if(C!==A.width||p!==A.height){let T=await createImageBitmap(A,{resizeWidth:C,resizeHeight:p});A.close(),A=T}let ge=Math.min(Math.max(0,t.xOffset??0),l-1),de=Math.min(Math.max(0,t.yOffset??0),c-1);if(ge!==0||de!==0){let T=t.columns!==void 0?Math.round(u*l):A.width+ge,tt=t.rows!==void 0?Math.round(E*c):A.height+de,z=D.createCanvas(window.document,T,tt),xe=z.getContext("2d");if(!xe)throw new Error("Failed to create offset canvas context");xe.drawImage(A,ge,de);let it=await createImageBitmap(z);if(z.width=z.height=0,A.close(),A=it,C=A.width,p=A.height,C*p>this._opts.pixelLimit)throw new Error("image exceeds pixel limit");t.columns===void 0&&(u=Math.ceil(A.width/l)),t.rows===void 0&&(E=Math.ceil(A.height/c))}if(i!==this._generation)throw new Error("image decode canceled");let et=t.zIndex??0;if(this._kittyStorage.addImage(e.id,A,!0,$e,et),A=void 0,t.cursorMovement===1){let T=B.ybase-q;B.x=K,B.y=Math.max(Y-T,0)}else B.x=Math.min(K+u,this._coreTerminal.cols)}catch(r){throw A?.close(),r}}async _createBitmap(e){let t=new Uint8Array(await e.data.arrayBuffer());if(e.compression==="z"&&(t=await this._decompressZlib(t)),e.format===100){let E=ee(t);if(E.mime!=="image/png"||!(E.width>0)||!(E.height>0)||E.width*E.height>this._opts.pixelLimit)throw new RangeError("PNG exceeds pixel limit or has invalid dimensions");let C=new Blob([t],{type:"image/png"});if(!window.createImageBitmap){let p=URL.createObjectURL(C),B=new Image;return new Promise((K,Y)=>{B.addEventListener("load",()=>{URL.revokeObjectURL(p);let q=D.createCanvas(window.document,B.width,B.height);q.getContext("2d")?.drawImage(B,0,0),createImageBitmap(q).then(K).catch(Y)}),B.addEventListener("error",()=>{URL.revokeObjectURL(p),Y(new Error("Failed to load image"))}),B.src=p})}return createImageBitmap(C)}let i=e.width,A=e.height;if(!i||!A)throw new Error("Width and height required for raw pixel data");let r=e.format===32?4:3,n=i*A*r;if(t.length<n)throw new Error("Insufficient pixel data");let a=i*A;if(e.format===32)return createImageBitmap(new ImageData(new Uint8ClampedArray(t.buffer,t.byteOffset,a*4),i,A));let o=new Uint8ClampedArray(a*4),h=new Uint32Array(t.buffer,t.byteOffset,Math.floor(t.byteLength/4)),g=new Uint32Array(o.buffer),d=a&-4,I=0,l=0;for(let E=0;E<d;E+=4){let C=h[I++],p=h[I++],B=h[I++];g[l++]=4278190080|C,g[l++]=4278190080|C>>>24|p<<8,g[l++]=4278190080|p>>>16|B<<16,g[l++]=4278190080|B>>>8}let c=d*3,u=d*4;for(let E=d;E<a;E++)o[u]=t[c],o[u+1]=t[c+1],o[u+2]=t[c+2],o[u+3]=255,c+=3,u+=4;return createImageBitmap(new ImageData(o,i,A))}async _decompressZlib(e){try{return await this._decompress(e,"deflate")}catch(t){if(t instanceof RangeError)throw t;return await this._decompress(e,"deflate-raw")}}async _decompress(e,t){let i=Math.min(this._opts.kittySizeLimit,this._opts.pixelLimit*4,this._opts.storageLimit*1e6),A=0,n=new ReadableStream({pull(d){if(A>=e.length){d.close();return}let I=Math.min(A+4096,e.length);d.enqueue(new Uint8Array(e.subarray(A,I))),A=I}}).pipeThrough(new DecompressionStream(t)).getReader(),a=[],o=0;try{for(;;){let{done:d,value:I}=await n.read();if(d)break;if(o+=I.byteLength,o>i)throw await n.cancel().catch(()=>{}),new RangeError("decompressed image exceeds byte limit");a.push(I)}}finally{n.releaseLock()}let h=new Uint8Array(o),g=0;for(let d of a)h.set(d,g),g+=d.length;return h}get images(){return this._kittyStorage.images}get _kittyIdToStorageId(){return this._kittyStorage.kittyIdToStorageId}get pendingTransmissions(){return this._pendingTransmissions}};var U=class U{constructor(e){this._storage=e;this._nextImageId=1;this._images=new Map;this._kittyIdToStorageId=new Map;this._storageIdToKittyId=new Map;this._handleStorageImageDeleted=e=>{let t=this._storageIdToKittyId.get(e);t!==void 0&&(this._kittyIdToStorageId.delete(t),this._storageIdToKittyId.delete(e),this._images.delete(t))};this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"iip"};this._previousOnImageDeleted=this._storage.onImageDeleted,this._wrappedOnImageDeleted=t=>{this._previousOnImageDeleted?.(t),this._handleStorageImageDeleted(t)},this._storage.onImageDeleted=this._wrappedOnImageDeleted}reset(){this._nextImageId=1,this._images.clear(),this._kittyIdToStorageId.clear(),this._storageIdToKittyId.clear()}dispose(){this.reset(),this._storage.onImageDeleted===this._wrappedOnImageDeleted&&(this._storage.onImageDeleted=this._previousOnImageDeleted)}storeImage(e,t){let i=e??this._nextImageId++,A=this._kittyIdToStorageId.get(i);A!==void 0&&(this._storage.deleteImage(A),this._kittyIdToStorageId.delete(i),this._storageIdToKittyId.delete(A)),!this._images.has(i)&&this._images.size>=U._maxStoredImages&&this._evictUndisplayedImages();let r=this._storage.getLimit()*1e6;this._images.delete(i);let n=0;for(let a of this._images.values())n+=a.data.size;for(let a of[!1,!0])for(let[o,h]of this._images){if(n+t.data.size<=r)break;this._kittyIdToStorageId.has(o)===a&&(n-=h.data.size,this.deleteById(o))}return this._images.set(i,{...t,id:i}),i}addImage(e,t,i,A,r){let n=this._kittyIdToStorageId.get(e);n!==void 0&&this._storageIdToKittyId.delete(n),this._addImageOpts.scrolling=i,this._addImageOpts.layer=A,this._addImageOpts.zIndex=r;let a=this._storage.addImage(t,this._addImageOpts);this._kittyIdToStorageId.set(e,a),this._storageIdToKittyId.set(a,e)}getImage(e){return this._images.get(e)}deleteById(e){this._images.delete(e);let t=this._kittyIdToStorageId.get(e);t!==void 0&&(this._storage.deleteImage(t),this._kittyIdToStorageId.delete(e),this._storageIdToKittyId.delete(t))}deleteAll(){this._images.clear();for(let e of this._kittyIdToStorageId.values())this._storage.deleteImage(e);this._kittyIdToStorageId.clear(),this._storageIdToKittyId.clear()}get images(){return this._images}get kittyIdToStorageId(){return this._kittyIdToStorageId}get lastImageId(){return this._nextImageId-1}_evictUndisplayedImages(){for(let[e]of this._images){if(this._images.size<=U._maxStoredImages/2)break;this._kittyIdToStorageId.has(e)||this._images.delete(e)}}};U._maxStoredImages=256;var Ae=U;var y=M(Z());var Xe=M(We());var Mt=4194304,Te=y.PALETTE_ANSI_256;Te.set(y.PALETTE_VT340_COLOR);var ae=class{constructor(e,t,i){this._opts=e;this._storage=t;this._coreTerminal=i;this._size=0;this._aborted=!1;(0,Xe.DecoderAsync)({memoryLimit:this._opts.pixelLimit*4,palette:Te,paletteLimit:this._opts.sixelPaletteLimit}).then(A=>this._dec=A)}reset(){this._dec&&(this._dec.release(),this._dec._palette.fill(0),this._dec.init(0,Te,this._opts.sixelPaletteLimit))}hook(e){if(this._size=0,this._aborted=!1,this._dec){let t=e.params[1]===1?0:vt(this._coreTerminal._core._inputHandler._curAttrData,this._coreTerminal._core._themeService?.colors);this._dec.init(t,null,this._opts.sixelPaletteLimit)}}put(e,t,i){if(!(this._aborted||!this._dec)){if(this._size+=i-t,this._size>this._opts.sixelSizeLimit){console.warn("SIXEL: too much data, aborting"),this._aborted=!0,this._dec.release();return}try{this._dec.decode(e,t,i)}catch(A){console.warn(`SIXEL: error while decoding image - ${A}`),this._aborted=!0,this._dec.release()}}}unhook(e){if(this._aborted||!e||!this._dec)return!0;let t=this._dec.width,i=this._dec.height;if(!t||!i)return i&&this._storage.advanceCursor(i),!0;let A=D.createCanvas(void 0,t,i);return A.getContext("2d")?.putImageData(new ImageData(this._dec.data8,t,i),0,0),this._dec.memoryUsage>Mt&&this._dec.release(),this._storage.addImage(A),!0}};function vt(s,e){let t=0;if(!e)return t;if(s.isInverse())if(s.isFgDefault())t=ne(e.foreground.rgba);else if(s.isFgRGB()){let i=s.constructor.toColorRGB(s.getFgColor());t=(0,y.toRGBA8888)(...i)}else t=ne(e.ansi[s.getFgColor()].rgba);else if(s.isBgDefault())t=ne(e.background.rgba);else if(s.isBgRGB()){let i=s.constructor.toColorRGB(s.getBgColor());t=(0,y.toRGBA8888)(...i)}else t=ne(e.ansi[s.getBgColor()].rgba);return t}function ne(s){return y.BIG_ENDIAN?s:(s&255)<<24|(s>>>8&255)<<16|(s>>>16&255)<<8|s>>>24&255}var oe=class{constructor(e,t,i,A){this._storage=e;this._opts=t;this._renderer=i;this._terminal=A;this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"vt340"}}addImage(e){this._addImageOpts.scrolling=this._opts.sixelScrolling,this._storage.addImage(e,this._addImageOpts)}advanceCursor(e){if(this._opts.sixelScrolling){let t=this._renderer.cellSize;(t.width===-1||t.height===-1)&&(t=w);let i=Math.ceil(e/t.height);for(let A=1;A<i;++A)this._terminal._core._inputHandler.lineFeed()}}};var he=class{constructor(e){this._storage=e;this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"iip"}}addImage(e){this._storage.addImage(e,this._addImageOpts)}};var Ze={enableSizeReports:!0,pixelLimit:16777216,sixelSupport:!0,sixelScrolling:!0,sixelPaletteLimit:4096,sixelSizeLimit:33554432,storageLimit:128,showPlaceholder:!0,iipSupport:!0,iipSizeLimit:33554432,kittySupport:!0,kittySizeLimit:33554432},je=4096;var Ve=class{constructor(e){this._disposables=[];this._handlers=new Map;this._onImageAdded=new X;this.onImageAdded=this._onImageAdded.event;this._opts=Object.assign({},Ze,e),this._defaultOpts=Object.assign({},Ze,e)}dispose(){for(let e of this._handlers.values())e.reset();for(let e of this._disposables)e.dispose();this._disposables.length=0,this._handlers.clear(),this._onImageAdded.dispose()}_disposeLater(...e){for(let t of e)this._disposables.push(t)}activate(e){if(this._terminal=e,this._renderer=new D(e),this._storage=new j(e,this._renderer,this._opts),this._storage.onImageAdded=()=>this._onImageAdded.fire(),this._opts.enableSizeReports){let t=e.options.windowOptions??{};t.getWinSizePixels=!0,t.getCellSizePixels=!0,t.getWinSizeChars=!0,e.options.windowOptions=t}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){let t=new oe(this._storage,this._opts,this._renderer,e),i=new ae(this._opts,t,e);this._handlers.set("sixel",i),this._disposeLater(e._core._inputHandler._parser.registerDcsHandler({final:"q"},i))}if(this._opts.iipSupport){let t=new he(this._storage),i=new te(this._opts,this._renderer,t,e);this._handlers.set("iip",i),this._disposeLater(e._core._inputHandler._parser.registerOscHandler(1337,i))}if(this._opts.kittySupport){let t=new Ae(this._storage),i=new ie(this._opts,this._renderer,t,e);this._handlers.set("kitty",i),this._disposeLater(t,i,e._core._inputHandler._parser.registerApcHandler({final:"G"},i))}}reset(){this._opts.sixelScrolling=this._defaultOpts.sixelScrolling,this._opts.sixelPaletteLimit=this._defaultOpts.sixelPaletteLimit,this._storage?.reset();for(let e of this._handlers.values())e.reset();return!1}get storageLimit(){return this._storage?.getLimit()||-1}set storageLimit(e){this._storage?.setLimit(e),this._opts.storageLimit=e}get storageUsage(){return this._storage?this._storage.getUsage():-1}get showPlaceholder(){return this._opts.showPlaceholder}set showPlaceholder(e){this._opts.showPlaceholder=e,this._renderer?.showPlaceholder(e)}getImageAtBufferCell(e,t){return this._storage?.getImageAtBufferCell(e,t)}extractTileAtBufferCell(e,t){return this._storage?.extractTileAtBufferCell(e,t)}_report(e){this._terminal?._core.input(e,!1)}_decset(e){for(let t=0;t<e.length;++t)e[t]===80&&(this._opts.sixelScrolling=!1);return!1}_decrst(e){for(let t=0;t<e.length;++t)e[t]===80&&(this._opts.sixelScrolling=!0);return!1}_da1(e){return e[0]?!0:this._opts.sixelSupport?(this._report("\x1B[?62;4;9;22c"),!0):!1}_xtermGraphicsAttributes(e){if(e.length<2)return!0;if(e[0]===1)switch(e[1]){case 1:return this._report(`\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`),!0;case 2:this._opts.sixelPaletteLimit=this._defaultOpts.sixelPaletteLimit,this._report(`\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`);for(let t of this._handlers.values())t.reset();return!0;case 3:return e.length>2&&!(e[2]instanceof Array)&&e[2]<=je?(this._opts.sixelPaletteLimit=e[2],this._report(`\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`)):this._report(`\x1B[?${e[0]};2S`),!0;case 4:return this._report(`\x1B[?${e[0]};0;${je}S`),!0;default:return this._report(`\x1B[?${e[0]};2S`),!0}if(e[0]===2)switch(e[1]){case 1:let t=this._renderer?.dimensions?.css.canvas.width,i=this._renderer?.dimensions?.css.canvas.height;if(!t||!i){let r=w;t=(this._terminal?.cols||80)*r.width,i=(this._terminal?.rows||24)*r.height}if(t*i<this._opts.pixelLimit)this._report(`\x1B[?${e[0]};0;${t.toFixed(0)};${i.toFixed(0)}S`);else{let r=Math.floor(Math.sqrt(this._opts.pixelLimit));this._report(`\x1B[?${e[0]};0;${r};${r}S`)}return!0;case 4:let A=Math.floor(Math.sqrt(this._opts.pixelLimit));return this._report(`\x1B[?${e[0]};0;${A};${A}S`),!0;default:return this._report(`\x1B[?${e[0]};2S`),!0}return this._report(`\x1B[?${e[0]};1S`),!0}};export{Ve as ImageAddon};
++var at=Object.create;var Ne=Object.defineProperty;var ot=Object.getOwnPropertyDescriptor;var ht=Object.getOwnPropertyNames;var dt=Object.getPrototypeOf,gt=Object.prototype.hasOwnProperty;var M=(r,e)=>()=>{try{return e||r((e={exports:{}}).exports,e),e.exports}catch(t){throw e=0,t}};var It=(r,e,t,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let A of ht(e))!gt.call(r,A)&&A!==t&&Ne(r,A,{get:()=>e[A],enumerable:!(i=ot(e,A))||i.enumerable});return r};var x=(r,e,t)=>(t=r!=null?at(dt(r)):{},It(e||!r||!r.__esModule?Ne(t,"default",{value:r,enumerable:!0}):t,r));var j=M(_=>{"use strict";Object.defineProperty(_,"__esModule",{value:!0});_.DEFAULT_FOREGROUND=_.DEFAULT_BACKGROUND=_.PALETTE_ANSI_256=_.PALETTE_VT340_GREY=_.PALETTE_VT340_COLOR=_.normalizeHLS=_.normalizeRGB=_.nearestColorIndex=_.fromRGBA8888=_.toRGBA8888=_.alpha=_.blue=_.green=_.red=_.BIG_ENDIAN=void 0;_.BIG_ENDIAN=new Uint8Array(new Uint32Array([4278190080]).buffer)[0]===255;_.BIG_ENDIAN&&console.warn("BE platform detected. This version of node-sixel works only on LE properly.");function He(r){return r&255}_.red=He;function Fe(r){return r>>>8&255}_.green=Fe;function Ge(r){return r>>>16&255}_.blue=Ge;function ct(r){return r>>>24&255}_.alpha=ct;function f(r,e,t,i=255){return((i&255)<<24|(t&255)<<16|(e&255)<<8|r&255)>>>0}_.toRGBA8888=f;function mt(r){return[r&255,r>>8&255,r>>16&255,r>>>24]}_.fromRGBA8888=mt;function _t(r,e){let t=He(r),i=Fe(r),A=Ge(r),s=Number.MAX_SAFE_INTEGER,n=-1;for(let a=0;a<e.length;++a){let o=t-e[a][0],h=i-e[a][1],d=A-e[a][2],g=o*o+h*h+d*d;if(!g)return a;g<s&&(s=g,n=a)}return n}_.nearestColorIndex=_t;function ce(r,e,t){return Math.max(r,Math.min(t,e))}function me(r,e,t){return t<0&&(t+=1),t>1&&(t-=1),t*6<1?e+(r-e)*6*t:t*2<1?r:t*3<2?e+(r-e)*(4-t*6):e}function ut(r,e,t){if(!t){let s=Math.round(e*255);return f(s,s,s)}let i=e<.5?e*(1+t):e+t-e*t,A=2*e-i;return f(ce(0,255,Math.round(me(i,A,r+1/3)*255)),ce(0,255,Math.round(me(i,A,r)*255)),ce(0,255,Math.round(me(i,A,r-1/3)*255)))}function m(r,e,t){return(4278190080|Math.round(t/100*255)<<16|Math.round(e/100*255)<<8|Math.round(r/100*255))>>>0}_.normalizeRGB=m;function Et(r,e,t){return ut((r+240%360)/360,e/100,t/100)}_.normalizeHLS=Et;_.PALETTE_VT340_COLOR=new Uint32Array([m(0,0,0),m(20,20,80),m(80,13,13),m(20,80,20),m(80,20,80),m(20,80,80),m(80,80,20),m(53,53,53),m(26,26,26),m(33,33,60),m(60,26,26),m(33,60,33),m(60,33,60),m(33,60,60),m(60,60,33),m(80,80,80)]);_.PALETTE_VT340_GREY=new Uint32Array([m(0,0,0),m(13,13,13),m(26,26,26),m(40,40,40),m(6,6,6),m(20,20,20),m(33,33,33),m(46,46,46),m(0,0,0),m(13,13,13),m(26,26,26),m(40,40,40),m(6,6,6),m(20,20,20),m(33,33,33),m(46,46,46)]);_.PALETTE_ANSI_256=(()=>{let r=[f(0,0,0),f(205,0,0),f(0,205,0),f(205,205,0),f(0,0,238),f(205,0,205),f(0,250,205),f(229,229,229),f(127,127,127),f(255,0,0),f(0,255,0),f(255,255,0),f(92,92,255),f(255,0,255),f(0,255,255),f(255,255,255)],e=[0,95,135,175,215,255];for(let t=0;t<6;++t)for(let i=0;i<6;++i)for(let A=0;A<6;++A)r.push(f(e[t],e[i],e[A]));for(let t=8;t<=238;t+=10)r.push(f(t,t,t));return new Uint32Array(r)})();_.DEFAULT_BACKGROUND=f(0,0,0,255);_.DEFAULT_FOREGROUND=f(255,255,255,255)});var Ee=M(ue=>{"use strict";Object.defineProperty(ue,"__esModule",{value:!0});ue.InWasm=Dt;var v=r=>{if(Uint8Array.fromBase64)return Uint8Array.fromBase64(r);if(typeof Buffer<"u")return Buffer.from(r,"base64");let e=atob(r),t=new Uint8Array(e.length);for(let i=0;i<t.length;++i)t[i]=e.charCodeAt(i);return t};function Dt(r){if(r.d){let{t:e,s:t,d:i}=r,A,s,n=WebAssembly;return e===0?t?a=>new n.Instance(s||(s=new n.Module(A||(A=v(i)))),a):a=>s?n.instantiate(s,a):n.instantiate(A||(A=v(i)),a).then(o=>(s=o.module)&&o.instance):e===1?t?()=>s||(s=new n.Module(A||(A=v(i)))):()=>s?Promise.resolve(s):n.compile(A||(A=v(i))).then(a=>s=a):t?()=>A||(A=v(i)):()=>Promise.resolve(A||(A=v(i)))}if(typeof _wasmCtx>"u")throw new Error('must run "inwasm"');_wasmCtx.add(r)}});var Be=M(pe=>{"use strict";Object.defineProperty(pe,"__esModule",{value:!0});var wt=Ee(),bt=(0,wt.InWasm)({s:1,t:0,d:"AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML"}),S=new Uint8Array("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("").map(r=>r.charCodeAt(0))),R=new Uint32Array(1024);R.fill(4278190080);for(let r=0;r<S.length;++r)R[S[r]]=r<<2;for(let r=0;r<S.length;++r)R[256+S[r]]=r>>4|(r<<4&255)<<8;for(let r=0;r<S.length;++r)R[512+S[r]]=r>>2<<8|(r<<6&255)<<16;for(let r=0;r<S.length;++r)R[768+S[r]]=r<<16;var yt=new Uint8Array(0),Ce=class{constructor(e,t,i){if(this._inst=null,this._ended=!0,this._bytes=0,this.keepSize=e??1048576,this.maxBytes=t??4294901760,this._bytes=i??32768,this._bytes>this.maxBytes||this.maxBytes>4294901760)throw new Error("invalid byte settings")}get data8(){return this._inst?this._d.subarray(0,this._m32[1282]):yt}release(){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))}init(e,t){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");let i=this._m32,A=this._bytes+5152;this._inst?this._mem.buffer.byteLength<A&&(this._mem.grow(Math.ceil((A-this._mem.buffer.byteLength)/65536)),i=new Uint32Array(this._mem.buffer,0),this._d=new Uint8Array(this._mem.buffer,5152)):(this._mem=new WebAssembly.Memory({initial:Math.ceil(A/65536)}),this._inst=bt({env:{memory:this._mem}}),i=new Uint32Array(this._mem.buffer,0),i.set(R,256),this._d=new Uint8Array(this._mem.buffer,5152)),i[1280]=0,i[1281]=0,i[1282]=0,this._m32=i,this._ended=!1}_realloc(e){let t=this._m32[1280]+e;if(this._bytes<t){if(t>this.maxBytes)return-3;let i=this._bytes;for(;(i*=2)<t;);if(i=Math.min(i,this.maxBytes),i<t)return-3;if(i+5152>this._mem.buffer.byteLength){let A=Math.ceil((i+5152-this._mem.buffer.byteLength)/65536);this._mem.grow(A),this._m32=new Uint32Array(this._mem.buffer,0),this._d=new Uint8Array(this._mem.buffer,5152)}this._bytes=i}return 0}put(e){if(!this._inst||this._ended)return-2;if(this._realloc(e.length))return-3;let t=this._m32;return this._d.set(e,t[1280]),t[1280]+=e.length,t[1280]-t[1281]>=131072?this._inst.exports.dec():0}end(){return this._ended=!0,this._inst?this._inst.exports.end():-2}get loadedBytes(){return this._inst?this._m32[1280]:0}get freeBytes(){return this._inst?this.maxBytes-this._m32[1280]:0}};pe.default=Ce});var Ue=M(Qe=>{"use strict";Object.defineProperty(Qe,"__esModule",{value:!0});var St=Ee(),Lt=(0,St.InWasm)({s:1,t:0,d:"AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw=="}),fe=class{constructor(e){this.keepSize=e,this.width=0,this.height=0}decode(e){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];let t=this.width*this.height,i=t*4,A=e.length,s=Math.max(i,A)+(Math.min(i,A)>>1)+4096;this._inst?this._mem.buffer.byteLength<s&&(this._mem.grow(Math.ceil((s-this._mem.buffer.byteLength)/65536)),this._d=null):(this._mem=new WebAssembly.Memory({initial:Math.ceil(s/65536)}),this._inst=Lt({env:{memory:this._mem}})),this._d||(this._d=new Uint8Array(this._mem.buffer));let n=this._mem.buffer.byteLength-A&-256;return this._d.set(e,n),this._inst.exports.dec(n,A,t),this._d.subarray(1024,1024+i)}release(){this._inst&&this._mem.buffer.byteLength>this.keepSize&&(this._inst=this._d=this._mem=null)}};Qe.default=fe});var xe=M(se=>{"use strict";Object.defineProperty(se,"__esModule",{value:!0});se.LIMITS=void 0;se.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"}});var je=M(b=>{"use strict";Object.defineProperty(b,"__esModule",{value:!0});b.decodeAsync=b.decode=b.Decoder=b.DecoderAsync=void 0;var O=j(),Q=xe();function Mt(r){if(typeof Buffer<"u")return Buffer.from(r,"base64");let e=atob(r),t=new Uint8Array(e.length);for(let i=0;i<t.length;++i)t[i]=e.charCodeAt(i);return t}var Xe=Mt(Q.LIMITS.BYTES),J,ne=new Uint32Array,Me=class{constructor(){this.bandHandler=e=>1,this.modeHandler=e=>1}handle_band(e){return this.bandHandler(e)}mode_parsed(e){return this.modeHandler(e)}},vt={memoryLimit:2048*65536,sixelColor:O.DEFAULT_FOREGROUND,fillColor:O.DEFAULT_BACKGROUND,palette:O.PALETTE_VT340_COLOR,paletteLimit:Q.LIMITS.PALETTE_SIZE,truncate:!0};function Ze(r){let e=new Me,t={env:{handle_band:e.handle_band.bind(e),mode_parsed:e.mode_parsed.bind(e)}};return WebAssembly.instantiate(J||Xe,t).then(i=>(J=J||i.module,new P(r,i.instance||i,e)))}b.DecoderAsync=Ze;var P=class{constructor(e,t,i){if(this._PIXEL_OFFSET=Q.LIMITS.MAX_WIDTH+4,this._canvas=ne,this._bandWidths=[],this._maxWidth=0,this._minWidth=Q.LIMITS.MAX_WIDTH,this._lastOffset=0,this._currentHeight=0,this._opts=Object.assign({},vt,e),this._opts.paletteLimit>Q.LIMITS.PALETTE_SIZE)throw new Error(`DecoderOptions.paletteLimit must not exceed ${Q.LIMITS.PALETTE_SIZE}`);if(t)i.bandHandler=this._handle_band.bind(this),i.modeHandler=this._initCanvas.bind(this);else{let A=J||(J=new WebAssembly.Module(Xe));t=new WebAssembly.Instance(A,{env:{handle_band:this._handle_band.bind(this),mode_parsed:this._initCanvas.bind(this)}})}this._instance=t,this._wasm=this._instance.exports,this._chunk=new Uint8Array(this._wasm.memory.buffer,this._wasm.get_chunk_address(),Q.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(),Q.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(O.DEFAULT_FOREGROUND,0,this._opts.paletteLimit,0)}get _fillColor(){return this._states[0]}get _truncate(){return this._states[8]}get _rasterWidth(){return this._states[6]}get _rasterHeight(){return this._states[7]}get _width(){return this._states[2]?this._states[2]-4:0}get _height(){return this._states[3]}get _level(){return this._states[9]}get _mode(){return this._states[10]}get _paletteLimit(){return this._states[11]}_initCanvas(e){if(e===2){let t=this.width*this.height;if(t>this._canvas.length){if(this._opts.memoryLimit&&t*4>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");this._canvas=new Uint32Array(t)}this._maxWidth=this._width}else if(e===1)if(this._level===2){let t=Math.min(this._rasterWidth,Q.LIMITS.MAX_WIDTH)*this._rasterHeight;if(t>this._canvas.length){if(this._opts.memoryLimit&&t*4>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");this._canvas=new Uint32Array(t)}}else this._canvas.length<65536&&(this._canvas=new Uint32Array(65536));return 0}_realloc(e,t){let i=e+t;if(i>this._canvas.length){if(this._opts.memoryLimit&&i*4>this._opts.memoryLimit)throw this.release(),new Error("image exceeds memory limit");let A=new Uint32Array(Math.ceil(i/65536)*65536);A.set(this._canvas),this._canvas=A}}_handle_band(e){let t=this._PIXEL_OFFSET,i=this._lastOffset;if(this._mode===2){let A=this.height-this._currentHeight,s=0;for(;s<6&&A>0;)this._canvas.set(this._pSrc.subarray(t*s,t*s+e),i+e*s),s++,A--;this._lastOffset+=e*s,this._currentHeight+=s}else if(this._mode===1){this._realloc(i,e*6),this._maxWidth=Math.max(this._maxWidth,e),this._minWidth=Math.min(this._minWidth,e);for(let A=0;A<6;++A)this._canvas.set(this._pSrc.subarray(t*A,t*A+e),i+e*A);this._bandWidths.push(e),this._lastOffset+=e*6,this._currentHeight+=6}return 0}get width(){return this._mode!==1?this._width:Math.max(this._maxWidth,this._wasm.current_width())}get height(){return this._mode!==1?this._height:this._wasm.current_width()?this._bandWidths.length*6+this._wasm.current_height():this._bandWidths.length*6}get palette(){return this._palette.subarray(0,this._paletteLimit)}get memoryUsage(){return this._canvas.byteLength+this._wasm.memory.buffer.byteLength+8*this._bandWidths.length}get properties(){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}}}init(e=this._opts.fillColor,t=this._opts.palette,i=this._opts.paletteLimit,A=this._opts.truncate){this._wasm.init(this._opts.sixelColor,e,i,A?1:0),t&&this._palette.set(t.subarray(0,Q.LIMITS.PALETTE_SIZE)),this._bandWidths.length=0,this._maxWidth=0,this._minWidth=Q.LIMITS.MAX_WIDTH,this._lastOffset=0,this._currentHeight=0}decode(e,t=0,i=e.length){let A=t;for(;A<i;){let s=Math.min(i-A,Q.LIMITS.CHUNK_SIZE);this._chunk.set(e.subarray(A,A+=s)),this._wasm.decode(0,s)}}decodeString(e,t=0,i=e.length){let A=t;for(;A<i;){let s=Math.min(i-A,Q.LIMITS.CHUNK_SIZE);for(let n=0,a=A;n<s;++n,++a)this._chunk[n]=e.charCodeAt(a);A+=s,this._wasm.decode(0,s)}}get data32(){if(this._mode===0||!this.width||!this.height)return ne;let e=this._wasm.current_width();if(this._mode===2){let t=this.height-this._currentHeight;if(t>0){let i=this._PIXEL_OFFSET,A=this._lastOffset,s=0;for(;s<6&&t>0;)this._canvas.set(this._pSrc.subarray(i*s,i*s+e),A+e*s),s++,t--;t&&this._canvas.fill(this._fillColor,A+e*s)}return this._canvas.subarray(0,this.width*this.height)}if(this._mode===1){if(this._minWidth===this._maxWidth){let s=!1;if(e)if(e!==this._minWidth)s=!0;else{let n=this._PIXEL_OFFSET,a=this._lastOffset;this._realloc(a,e*6);for(let o=0;o<6;++o)this._canvas.set(this._pSrc.subarray(n*o,n*o+e),a+e*o)}if(!s)return this._canvas.subarray(0,this.width*this.height)}let t=new Uint32Array(this.width*this.height);t.fill(this._fillColor);let i=0,A=0;for(let s=0;s<this._bandWidths.length;++s){let n=this._bandWidths[s];for(let a=0;a<6;++a)t.set(this._canvas.subarray(A,A+=n),i),i+=this.width}if(e){let s=this._PIXEL_OFFSET,n=this._wasm.current_height();for(let a=0;a<n;++a)t.set(this._pSrc.subarray(s*a,s*a+e),i+this.width*a)}return t}return ne}get data8(){return new Uint8ClampedArray(this.data32.buffer,0,this.width*this.height*4)}release(){this._canvas=ne,this._bandWidths.length=0,this._maxWidth=0,this._minWidth=Q.LIMITS.MAX_WIDTH,this._wasm.init(O.DEFAULT_FOREGROUND,0,this._opts.paletteLimit,0)}};b.Decoder=P;function Rt(r,e){let t=new P(e);return t.init(),typeof r=="string"?t.decodeString(r):t.decode(r),{width:t.width,height:t.height,data32:t.data32,data8:t.data8}}b.decode=Rt;async function kt(r,e){let t=await Ze(e);return t.init(),typeof r=="string"?t.decodeString(r):t.decode(r),{width:t.width,height:t.height,data32:t.data32,data8:t.data8}}b.decodeAsync=kt});function H(r){return{dispose:r}}var N=class{constructor(){this._disposables=new Set;this._isDisposed=!1}get isDisposed(){return this._isDisposed}add(e){return this._isDisposed?e.dispose():this._disposables.add(e),e}dispose(){if(!this._isDisposed){this._isDisposed=!0;for(let e of this._disposables)e.dispose();this._disposables.clear()}}clear(){for(let e of this._disposables)e.dispose();this._disposables.clear()}},k=class{constructor(){this._store=new N}dispose(){this._store.dispose()}_register(e){return this._store.add(e)}};k.None=Object.freeze({dispose(){}});var X=class{constructor(){this._isDisposed=!1}get value(){return this._isDisposed?void 0:this._value}set value(e){this._isDisposed||e===this._value||(this._value?.dispose(),this._value=e)}clear(){this.value=void 0}dispose(){this._isDisposed=!0,this._value?.dispose(),this._value=void 0}};var Z=class{constructor(){this._listeners=[];this._disposed=!1}get event(){return this._event?this._event:(this._event=(e,t,i)=>{if(this._disposed)return H(()=>{});let A={fn:e,thisArgs:t};this._listeners=this._listeners.slice(),this._listeners.push(A);let s=H(()=>{let n=this._listeners.indexOf(A);n!==-1&&(this._listeners=this._listeners.slice(),this._listeners.splice(n,1))});return i&&(Array.isArray(i)?i.push(s):i.add(s)),s},this._event)}fire(e){if(this._disposed||!this._listeners.length)return;if(this._listeners.length===1){this._listeners[0].fn.call(this._listeners[0].thisArgs,e);return}let t=this._listeners;for(let i=0,A=t.length;i<A;++i)t[i].fn.call(t[i].thisArgs,e)}dispose(){this._disposed||(this._disposed=!0,this._listeners.length=0)}},lt;(A=>{function r(s,n){return s(a=>n.fire(a))}A.forward=r;function e(s,n){return(a,o,h)=>s(d=>a.call(o,n(d)),void 0,h)}A.map=e;function t(...s){return(n,a,o)=>{let h=new N;for(let d of s)h.add(d(g=>n.call(a,g)));return o&&(Array.isArray(o)?o.push(h):o.add(h)),h}}A.any=t;function i(s,n,a){return n(a),s(o=>n(o))}A.runAndSubscribe=i})(lt||={});var _e=x(j());var D=class r extends k{constructor(t){super();this._terminal=t;this._layers=new Map;this._optionsRefresh=this._register(new X);this._oldOpen=this._terminal._core.open,this._terminal._core.open=i=>{this._oldOpen?.call(this._terminal._core,i),this._open()},this._terminal._core.screenElement&&this._open(),this._optionsRefresh.value=this._terminal._core.optionsService.onOptionChange(i=>{i==="fontSize"&&(this.rescaleCanvas(),this._renderService?.refreshRows(0,this._terminal.rows))}),this._register(H(()=>{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}))}get canvas(){return this._layers.get("top")?.canvas}static createCanvas(t,i,A){let s=(t??document).createElement("canvas");return s.width=i|0,s.height=A|0,s}static createImageData(t,i,A,s){if(typeof ImageData!="function"){let n=t.createImageData(i,A);return s&&n.data.set(new Uint8ClampedArray(s,0,i*A*4)),n}return s?new ImageData(new Uint8ClampedArray(s,0,i*A*4),i,A):new ImageData(i,A)}static createImageBitmap(t){return typeof createImageBitmap!="function"?Promise.resolve(void 0):createImageBitmap(t)}showPlaceholder(t){t?!this._placeholder&&this.cellSize.height!==-1&&this._createPlaceHolder(Math.max(this.cellSize.height+1,24)):(this._placeholderBitmap?.close(),this._placeholderBitmap=void 0,this._placeholder=void 0),this._renderService?.refreshRows(0,this._terminal.rows)}get dimensions(){return this._terminal.dimensions}get cellSize(){return{width:this.dimensions?.css.cell.width||-1,height:this.dimensions?.css.cell.height||-1}}clearLines(t,i,A){let s=t*(this.dimensions?.css.cell.height||0),n=this.dimensions?.css.canvas.width||0,a=(i+1-t)*(this.dimensions?.css.cell.height||0);(!A||A==="top")&&this._layers.get("top")?.clearRect(0,s,n,a),(!A||A==="bottom")&&this._layers.get("bottom")?.clearRect(0,s,n,a)}clearAll(t){if(!t||t==="top"){let i=this._layers.get("top");i?.clearRect(0,0,i.canvas.width,i.canvas.height)}if(!t||t==="bottom"){let i=this._layers.get("bottom");i?.clearRect(0,0,i.canvas.width,i.canvas.height)}}draw(t,i,A,s,n=1){let a=this._layers.get(t.layer);if(!a)return;let{width:o,height:h}=this.cellSize;if(o===-1||h===-1)return;this._rescaleImage(t,o,h);let d=t.actual,{width:g,height:I}=t.actualCellSize,l=Math.ceil(d.width/g),c=i%l*g,u=Math.floor(i/l)*I,E=A*o,C=s*h,p=n*g+c>d.width?d.width-c:n*g,B=u+I>d.height?d.height-u:I;a.drawImage(d,Math.floor(c),Math.floor(u),Math.ceil(p),Math.ceil(B),Math.floor(E),Math.floor(C),Math.ceil(p*o/g),Math.ceil(B*h/I))}extractTile(t,i){let{width:A,height:s}=this.cellSize;if(A===-1||s===-1)return;this._rescaleImage(t,A,s);let n=t.actual,{width:a,height:o}=t.actualCellSize,h=Math.ceil(n.width/a),d=i%h*a,g=Math.floor(i/h)*o,I=a+d>n.width?n.width-d:a,l=g+o>n.height?n.height-g:o,c=r.createCanvas(this.document,Math.ceil(I*A/a),Math.ceil(l*s/o)),u=c.getContext("2d");if(u)return u.drawImage(n,Math.floor(d),Math.floor(g),Math.floor(I),Math.floor(l),0,0,c.width,c.height),c}drawPlaceholder(t,i,A=1){let s=this._layers.get("top");if(s){let{width:n,height:a}=this.cellSize;if(n===-1||a===-1||(this._placeholder?a>=this._placeholder.height&&this._createPlaceHolder(a+1):this._createPlaceHolder(Math.max(a+1,24)),!this._placeholder))return;s.drawImage(this._placeholderBitmap??this._placeholder,t*n,i*a%2?0:1,n*A,a,t*n,i*a,n*A,a)}}rescaleCanvas(){let t=this.dimensions?.css.canvas.width||0,i=this.dimensions?.css.canvas.height||0;for(let A of this._layers.values())(A.canvas.width!==t||A.canvas.height!==i)&&(A.canvas.width=t,A.canvas.height=i)}_rescaleImage(t,i,A){if(i===t.actualCellSize.width&&A===t.actualCellSize.height)return;let{width:s,height:n}=t.origCellSize;if(i===s&&A===n){t.actual=t.orig,t.actualCellSize.width=s,t.actualCellSize.height=n;return}let a=Math.ceil(t.orig.width*i/s),o=Math.ceil(t.orig.height*A/n);if(a*o>t.orig.width*t.orig.height){t.actual=t.orig,t.actualCellSize.width=s,t.actualCellSize.height=n;return}let h=r.createCanvas(this.document,a,o),d=h.getContext("2d");d&&(d.drawImage(t.orig,0,0,h.width,h.height),t.actual=h,t.actualCellSize.width=i,t.actualCellSize.height=A)}_open(){this._renderService=this._terminal._core._renderService,this._oldSetRenderer=this._renderService.setRenderer.bind(this._renderService),this._renderService.setRenderer=t=>{for(let i of[...this._layers.keys()])this.removeLayerFromDom(i);this._oldSetRenderer?.call(this._renderService,t)}}insertLayerToDom(t="top"){if(!this.document||!this._terminal._core.screenElement){console.warn("image addon: cannot insert output canvas to DOM, missing document or screenElement");return}if(this._layers.has(t))return;let i=r.createCanvas(this.document,this.dimensions?.css.canvas.width||0,this.dimensions?.css.canvas.height||0);i.classList.add(`xterm-image-layer-${t}`);let A=this._terminal._core.screenElement;A.style.isolation="isolate",t==="bottom"?(i.style.zIndex="-1",A.insertBefore(i,A.firstChild)):(i.style.zIndex="0",A.appendChild(i));let s=i.getContext("2d",{alpha:!0});if(!s){i.remove();return}this._layers.set(t,s),this.clearAll(t)}removeLayerFromDom(t="top"){let i=this._layers.get(t);i&&(i.canvas.remove(),this._layers.delete(t))}hasLayer(t){return this._layers.has(t)}_createPlaceHolder(t=24){this._placeholderBitmap?.close(),this._placeholderBitmap=void 0;let i=32,A=r.createCanvas(this.document,i,t),s=A.getContext("2d",{alpha:!1});if(!s)return;let n=r.createImageData(s,i,t),a=new Uint32Array(n.data.buffer),o=(0,_e.toRGBA8888)(0,0,0),h=(0,_e.toRGBA8888)(255,255,255);a.fill(o);for(let l=0;l<t;++l){let c=l%2,u=l*i;for(let E=0;E<i;E+=2)a[u+E+c]=h}s.putImageData(n,0,0);let d=screen.width+i-1&~(i-1)||4096;this._placeholder=r.createCanvas(this.document,d,t);let g=this._placeholder.getContext("2d",{alpha:!1});if(!g){this._placeholder=void 0;return}for(let l=0;l<d;l+=i)g.drawImage(A,l,0);let I=this._placeholder;r.createImageBitmap(I).then(l=>{this._placeholder!==I?l?.close():this._placeholderBitmap=l}).catch(()=>{})}get document(){return this._terminal._core._coreBrowserService?.window.document}};var w={width:7,height:14},G=class r{constructor(e=0,t=0,i=-1,A=-1){this.imageId=i;this.tileId=A;this._ext=0;this._urlId=0;this._ext=e,this._urlId=t}get ext(){return this._urlId?this._ext&-469762049|this.underlineStyle<<26:this._ext}set ext(e){this._ext=e}get underlineStyle(){return this._urlId?5:(this._ext&469762048)>>26}set underlineStyle(e){this._ext&=-469762049,this._ext|=e<<26&469762048}get underlineColor(){return this._ext&67108863}set underlineColor(e){this._ext&=-67108864,this._ext|=e&67108863}get underlineVariantOffset(){let e=(this._ext&3758096384)>>29;return e<0?e^4294967288:e}set underlineVariantOffset(e){this._ext&=536870911,this._ext|=e<<29&3758096384}get urlId(){return this._urlId}set urlId(e){this._urlId=e}clone(){return new r(this._ext,this._urlId,this.imageId,this.tileId)}isEmpty(){return this.underlineStyle===0&&this._urlId===0&&this.imageId===-1}},F=new G,V=class{constructor(e,t,i){this._terminal=e;this._renderer=t;this._opts=i;this._images=new Map;this._lastId=0;this._lowestId=0;this._fullyCleared=!1;this._needsFullClear=!1;this._pixelLimit=25e5;try{this.setLimit(this._opts.storageLimit)}catch(A){A instanceof Error&&console.error(A.message),console.warn(`storageLimit is set to ${this.getLimit()} MB`)}this._viewportMetrics={cols:this._terminal.cols,rows:this._terminal.rows}}dispose(){this.reset()}reset(){for(let e of this._images.values())e.marker?.dispose();this._images.clear(),this._renderer.clearAll()}getLimit(){return this._pixelLimit*4/1e6}setLimit(e){if(e<.5||e>1e3)throw RangeError("invalid storageLimit, should be at least 0.5 MB and not exceed 1G");this._pixelLimit=e/4*1e6>>>0,this._evictOldest(0)}getUsage(){return this._getStoredPixels()*4/1e6}_getStoredPixels(){let e=0;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));return e}_delImg(e){let t=this._images.get(e);t&&(this._images.delete(e),window.ImageBitmap&&t.orig instanceof ImageBitmap&&t.orig.close(),this.onImageDeleted?.(e))}wipeAlternate(){let e=[];for(let[t,i]of this._images.entries())i.bufferType==="alternate"&&(i.marker?.dispose(),e.push(t));for(let t of e)this._delImg(t);this._needsFullClear=!0,this._fullyCleared=!1}deleteImage(e){let t=this._images.get(e);t&&(t.marker?.dispose(),this._delImg(e))}addImage(e,t){this._evictOldest(e.width*e.height);let i=this._renderer.cellSize;(i.width===-1||i.height===-1)&&(i=w);let A=Math.ceil(e.width/i.width),s=Math.ceil(e.height/i.height),n=++this._lastId,a=this._terminal._core.buffer,o=this._terminal.cols,h=this._terminal.rows,d=a.x,g=a.y,I=d,l=0;t.scrolling||(a.x=0,a.y=0,I=0),this._terminal._core._inputHandler._dirtyRowTracker.markDirty(a.y);for(let C=0;C<s;++C){let p=a.lines.get(a.y+a.ybase);for(let B=0;B<A&&!(I+B>=o);++B)this._writeToCell(p,I+B,n,C*A+B),l++;if(t.scrolling)C<s-1&&this._terminal._core._inputHandler.lineFeed();else if(++a.y>=h)break;a.x=I}this._terminal._core._inputHandler._dirtyRowTracker.markDirty(a.y),t.scrolling?t.cursorPos==="iip"?a.x=Math.min(I+A,o):a.x=I:(a.x=d,a.y=g);let c=[];for(let[C,p]of this._images.entries())p.tileCount<1&&(p.marker?.dispose(),c.push(C));for(let C of c)this._delImg(C);let u=this._terminal.registerMarker(0);u?.onDispose(()=>{this._images.get(n)&&this._delImg(n)}),this._terminal.buffer.active.type==="alternate"&&this._evictOnAlternate();let E={orig:e,origCellSize:i,actual:e,actualCellSize:{...i},marker:u||void 0,tileCount:l,bufferType:this._terminal.buffer.active.type,layer:t.layer,zIndex:t.zIndex};return this._images.set(n,E),this.onImageAdded?.(),n}render(e){let t=!1,i=!1;for(let d of this._images.values())if(d.layer==="bottom"?i=!0:t=!0,t&&i)break;if(t&&!this._renderer.hasLayer("top")&&(this._renderer.insertLayerToDom("top"),!this._renderer.hasLayer("top")))return;if(i&&!this._renderer.hasLayer("bottom")&&this._renderer.insertLayerToDom("bottom"),this._renderer.rescaleCanvas(),!this._images.size){this._fullyCleared||(this._renderer.clearAll(),this._fullyCleared=!0,this._needsFullClear=!1),this._renderer.hasLayer("top")&&this._renderer.removeLayerFromDom("top"),this._renderer.hasLayer("bottom")&&this._renderer.removeLayerFromDom("bottom");return}!t&&this._renderer.hasLayer("top")&&(this._renderer.clearAll("top"),this._renderer.removeLayerFromDom("top")),!i&&this._renderer.hasLayer("bottom")&&(this._renderer.clearAll("bottom"),this._renderer.removeLayerFromDom("bottom")),this._needsFullClear&&(this._renderer.clearAll(),this._fullyCleared=!0,this._needsFullClear=!1);let{start:A,end:s}=e,n=this._terminal._core.buffer,a=this._terminal._core.cols;this._renderer.clearLines(A,s);let o=[],h=[];for(let d=A;d<=s;++d){let g=n.lines.get(d+n.ydisp);if(!g)return;for(let I=0;I<a;++I)if(g.getBg(I)&268435456){let l=g._extendedAttrs[I]??F,c=l.imageId;if(c===void 0||c===-1)continue;let u=this._images.get(c);if(l.tileId!==-1){let E=l.tileId,C=I,p=1;for(;++I<a&&g.getBg(I)&268435456&&(l=g._extendedAttrs[I]??F)&&l.imageId===c&&l.tileId===E+p;)p++;I--,u?u.actual&&o.push({imgSpec:u,tileId:E,col:C,row:d,count:p}):this._opts.showPlaceholder&&h.push({col:C,row:d,count:p}),this._fullyCleared=!1}}}o.sort((d,g)=>d.imgSpec.zIndex-g.imgSpec.zIndex);for(let d of h)this._renderer.drawPlaceholder(d.col,d.row,d.count);for(let d of o)this._renderer.draw(d.imgSpec,d.tileId,d.col,d.row,d.count)}viewportResize(e){if(!this._images.size){this._viewportMetrics=e;return}if(this._viewportMetrics.cols>=e.cols){this._viewportMetrics=e;return}let t=this._terminal._core.buffer,i=t.lines.length,A=this._viewportMetrics.cols-1;for(let s=0;s<i;++s){let n=t.lines.get(s);if(n.getBg(A)&268435456){let a=n._extendedAttrs[A]??F,o=a.imageId;if(o===void 0||o===-1)continue;let h=this._images.get(o);if(!h)continue;let d=Math.ceil((h.actual?.width||0)/h.actualCellSize.width);if(a.tileId%d+1>=d)continue;let g=!1;for(let c=A+1;c>e.cols;++c)if(n._data[c*3+0]&4194303){g=!0;break}if(g)continue;let I=Math.min(e.cols,d-a.tileId%d+A),l=a.tileId;for(let c=A+1;c<I;++c)this._writeToCell(n,c,o,++l),h.tileCount++}}this._viewportMetrics=e}getImageAtBufferCell(e,t){let A=this._terminal._core.buffer.lines.get(t);if(A&&A.getBg(e)&268435456){let s=A._extendedAttrs[e]??F;if(s.imageId&&s.imageId!==-1){let n=this._images.get(s.imageId)?.orig;if(window.ImageBitmap&&n instanceof ImageBitmap){let a=D.createCanvas(window.document,n.width,n.height);return a.getContext("2d")?.drawImage(n,0,0,n.width,n.height),a}return n}}}extractTileAtBufferCell(e,t){let A=this._terminal._core.buffer.lines.get(t);if(A&&A.getBg(e)&268435456){let s=A._extendedAttrs[e]??F;if(s.imageId&&s.imageId!==-1&&s.tileId!==-1){let n=this._images.get(s.imageId);if(n)return this._renderer.extractTile(n,s.tileId)}}}_evictOldest(e){let t=this._getStoredPixels(),i=t;for(;this._pixelLimit<i+e&&this._images.size;){let A=this._images.get(++this._lowestId);A&&A.orig&&(i-=A.orig.width*A.orig.height,A.actual&&A.orig!==A.actual&&(i-=A.actual.width*A.actual.height),A.marker?.dispose(),this._delImg(this._lowestId))}return t-i}_writeToCell(e,t,i,A){if(e._data[t*3+2]&268435456){let s=e._extendedAttrs[t];if(s){if(s.imageId!==void 0){let n=this._images.get(s.imageId);n&&n.tileCount--,s.imageId=i,s.tileId=A;return}e._extendedAttrs[t]=new G(s.ext,s.urlId,i,A);return}}e._data[t*3+2]|=268435456,e._extendedAttrs[t]=new G(0,0,i,A)}_evictOnAlternate(){for(let i of this._images.values())i.bufferType==="alternate"&&(i.tileCount=0);let e=this._terminal._core.buffer;for(let i=0;i<this._terminal.rows;++i){let A=e.lines.get(i);if(A){for(let s=0;s<this._terminal.cols;++s)if(A._data[s*3+2]&268435456){let n=A._extendedAttrs[s]?.imageId;if(n){let a=this._images.get(n);a&&a.tileCount++}}}}let t=[];for(let[i,A]of this._images.entries())A.bufferType==="alternate"&&!A.tileCount&&(A.marker?.dispose(),t.push(i));for(let i of t)this._delImg(i)}};var Ye=x(Be()),qe=x(Ue());function $(r){let e="";for(let t=0;t<r.length;++t)e+=String.fromCharCode(r[t]);return e}function De(r){let e=0;for(let t=0;t<r.length;++t){if(r[t]<48||r[t]>57)throw new Error("illegal char");e=e*10+r[t]-48}return e}function Oe(r){let e=$(r);if(!e.match(/^((auto)|(\d+?((px)|(%)){0,1}))$/))throw new Error("illegal size");return e}function Tt(r){if(typeof Buffer<"u")return Buffer.from($(r),"base64").toString();let e=atob($(r)),t=new Uint8Array(e.length);for(let i=0;i<t.length;++i)t[i]=e.charCodeAt(i);return new TextDecoder().decode(t)}var Je={inline:De,size:De,name:Tt,width:Oe,height:Oe,preserveAspectRatio:De},Pe=[70,105,108,101],Ke=[77,117,108,116,105,112,97,114,116,70,105,108,101],we=[70,105,108,101,80,97,114,116],be=[70,105,108,101,69,110,100],ye=[82,101,112,111,114,116,67,101,108,108,83,105,122,101],Se=1024,ee=class{constructor(){this.state=0;this._buffer=new Uint32Array(Se);this._position=0;this._key="";this.fields={}}reset(){this._buffer.fill(0),this.state=0,this._position=0,this.fields={},this._key=""}end(){if(this.state===0){if(this._position===be.length){for(let e=0;e<be.length;++e)if(this._buffer[e]!==be[e])return this._a();return this.fields.type=4,this.state=4,0}if(this._position===ye.length){for(let e=0;e<ye.length;++e)if(this._buffer[e]!==ye[e])return this._a();return this.fields.type=5,this.state=4,0}return this._a()}return this.state===4?0:this.state===3&&this.fields.type===2?this._storeValue(this._position)?(this.state=4,0):this._a():this._a()}parse(e,t,i){let A=this.state,s=this._position,n=this._buffer;if(A===1||A===4||A===0&&s>14)return-1;for(let a=t;a<i;++a){let o=e[a];switch(o){case 59:if(!this._storeValue(s))return this._a();A=2,s=0;break;case 61:if(A===0){if(n[0]===70){let h=0;for(;h<Pe.length;++h)if(n[h]!==Pe[h])return this._a();if(this.fields.type=1,s===we.length){for(;h<we.length;++h)if(n[h]!==we[h])return this._a();return this.fields.type=3,this.state=4,a+1}}else if(n[0]===77){for(let h=0;h<Ke.length;++h)if(n[h]!==Ke[h])return this._a();this.fields.type=2}else return this._a();A=2,s=0}else if(A===2){if(!this._storeKey(s))return this._a();A=3,s=0}else if(A===3){if(s>=Se)return this._a();n[s++]=o}break;case 58:return A===3&&!this._storeValue(s)?this._a():(this.state=4,a+1);default:if(s>=Se)return this._a();n[s++]=o}}return this.state=A,this._position=s,-2}_a(){return this.fields.type=0,this.state=1,-1}_storeKey(e){let t=$(this._buffer.subarray(0,e));return t?(this._key=t,this.fields[t]=null,!0):!1}_storeValue(e){if(this._key){try{let t=this._buffer.slice(0,e);this.fields[this._key]=Je[this._key]?Je[this._key](t):t}catch{return!1}return!0}return!1}};var L={mime:"unsupported",width:0,height:0};function te(r){if(r.length<32)return L;let e=new Uint32Array(r.buffer,r.byteOffset,8);if(e[0]===1196314761&&e[1]===169478669&&e[3]===1380206665)return{mime:"image/png",width:r[16]<<24|r[17]<<16|r[18]<<8|r[19],height:r[20]<<24|r[21]<<16|r[22]<<8|r[23]};if(r[0]===255&&r[1]===216&&r[2]===255){let[t,i]=xt(r);return{mime:"image/jpeg",width:t,height:i}}if(e[0]===944130375&&(r[4]===55||r[4]===57)&&r[5]===97)return{mime:"image/gif",width:r[7]<<8|r[6],height:r[9]<<8|r[8]};if(e[0]===1718185841)return{mime:"image/qoi",width:r[4]<<24|r[5]<<16|r[6]<<8|r[7],height:r[8]<<24|r[9]<<16|r[10]<<8|r[11]};if(e[0]===1179011410&&e[2]===1346520407&&(e[3]&16777215)===3690582){switch(r[15]){case 88:return{mime:"image/webp",width:(r[24]|r[25]<<8|r[26]<<16)+1,height:(r[27]|r[28]<<8|r[29]<<16)+1};case 76:if(r[20]!==47)return L;let t=r[21]|r[22]<<8|r[23]<<16|r[24]<<24;return{mime:"image/webp",width:(t&16383)+1,height:(t>>>14&16383)+1};case 32:return r[23]!==157||r[24]!==1||r[25]!==42?L:{mime:"image/webp",width:(r[26]|r[27]<<8)&16383,height:(r[28]|r[29]<<8)&16383}}return L}if(e[1]===1887007846&&(e[2]===1718187617||e[2]===1936291425)){let t=-1,i=Math.min(r.length-16,1024);for(let A=8;A<i;A++)if(r[A]===105&&r[A+1]===115&&r[A+2]===112&&r[A+3]===101){t=A;break}if(t!==-1){let A=r[t+8]<<24|r[t+9]<<16|r[t+10]<<8|r[t+11],s=r[t+12]<<24|r[t+13]<<16|r[t+14]<<8|r[t+15];if(A>0&&s>0)return{mime:"image/avif",width:A,height:s}}return L}return L}function xt(r){let e=r.length,t=4,i=r[t]<<8|r[t+1];for(;;){if(t+=i,t>=e)return[0,0];if(r[t]!==255)return[0,0];if(r[t+1]===192||r[t+1]===194)return t+8<e?[r[t+7]<<8|r[t+8],r[t+5]<<8|r[t+6]]:[0,0];t+=2,i=r[t]<<8|r[t+1]}}var Le={type:0,name:"Unnamed file",size:0,width:"auto",height:"auto",preserveAspectRatio:1,inline:0},ie=class{constructor(e,t,i,A){this._opts=e;this._renderer=t;this._storage=i;this._coreTerminal=A;this._generation=0;this._aborted=!1;this._hp=new ee;this._header=Le;this._isMultipart=!1;this._abortMulti=!1;let s=Math.ceil(this._opts.iipSizeLimit*4/3),n=Math.min(1048576,s);this._dec=new Ye.default(0,s,n),this._qoiDec=new qe.default(0)}reset(){this._generation++,this._hp.reset(),this._dec.release(),this._qoiDec.release()}start(){this._aborted=!1,this._hp.reset()}put(e,t,i){if(!this._aborted)if(this._hp.state===4)this._dec.put(e.subarray(t,i))!==0&&(this._dec.release(),this._aborted=!0);else{let A=this._hp.parse(e,t,i);if(A===-1){this._aborted=!0;return}if(A>0){if(this._hp.fields.type===1){if(this._isMultipart&&(this._isMultipart=!1,this._abortMulti=!1,this._dec.release()),this._header=Object.assign({},Le,this._hp.fields),!this._header.inline){this._aborted=!0;return}if(!this._initDecoder()){this._aborted=!0;return}}else if(this._abortMulti){this._aborted=!0;return}this._dec.put(e.subarray(A,i))!==0&&(this._dec.release(),this._aborted=!0,this._isMultipart&&(this._abortMulti=!0))}}}end(e){if(this._aborted||this._hp.state!==4&&this._hp.end())return!0;let t=this._hp.fields.type;if(t===3)return!0;if(t===5){let h=w.width,d=w.height;this._renderer.dimensions&&(h=this._renderer.dimensions.css.canvas.width/this._coreTerminal.cols,d=this._renderer.dimensions.css.canvas.height/this._coreTerminal.rows);let g=this._coreTerminal._core._coreBrowserService?.dpr??1,I=`\x1B]1337;ReportCellSize=${d.toFixed(3)};${h.toFixed(3)};${g.toFixed(3)}\x1B\\`;return this._coreTerminal.input(I,!1),!0}if(t===2)return this._header=Object.assign({},Le,this._hp.fields),this._isMultipart=!0,this._abortMulti=!1,this._dec.release(),this._initDecoder()||(this._abortMulti=!0),!0;if(t===4&&(!this._isMultipart||(this._isMultipart=!1,this._abortMulti||this._header.type!==2)))return!0;let i=0,A=0,s,n=L;if((s=e)&&((s=!this._dec.end())?(n=te(this._dec.data8),(s=n.mime!=="unsupported")?(i=n.width,A=n.height,(s=i&&A&&i*A<this._opts.pixelLimit)?([i,A]=this._resize(i,A).map(Math.floor),s=i&&A&&i*A<this._opts.pixelLimit):console.warn(`IIP: image dimension issue ${n.width}x${n.height}`)):console.warn("IIP: unsupported image type")):console.warn("IIP: error during BASE64 decoding")),!s)return this._dec.release(),!0;let a;if(n.mime==="image/qoi"){let h;try{h=this._qoiDec.decode(this._dec.data8)}catch(d){return console.warn("IIP: could not decode QOI image",d),this._dec.release(),this._qoiDec.release(),!0}if(a=new ImageData(new Uint8ClampedArray(h.buffer,h.byteOffset,h.byteLength),this._qoiDec.width,this._qoiDec.height),this._qoiDec.release(),i===this._qoiDec.width&&A===this._qoiDec.height){this._dec.release();let d=D.createCanvas(void 0,this._qoiDec.width,this._qoiDec.height);return d.getContext("2d")?.putImageData(a,0,0),this._storage.addImage(d),!0}}else a=new Blob([this._dec.data8],{type:n.mime});this._dec.release();let o=this._generation;return createImageBitmap(a,{resizeWidth:i,resizeHeight:A}).then(h=>o!==this._generation?(h.close(),!0):(this._storage.addImage(h),!0)).catch(h=>(console.warn(`IIP: decoding error ${n.mime} ${n.width}x${n.height}`,h),!0))}_initDecoder(){try{return this._dec.init(),!0}catch(e){return console.warn("IIP: could not allocate decoder",e),this._dec.release(),!1}}_resize(e,t){let i=this._renderer.dimensions?.css.cell.width||w.width,A=this._renderer.dimensions?.css.cell.height||w.height,s=this._renderer.dimensions?.css.canvas.width||i*this._coreTerminal.cols,n=this._renderer.dimensions?.css.canvas.height||A*this._coreTerminal.rows,a=this._dim(this._header.width,s,i),o=this._dim(this._header.height,n,A);if(!a&&!o){let h=s/e,d=(n-A)/t,g=Math.min(h,d);return g<1?[e*g,t*g]:[e,t]}return a?this._header.preserveAspectRatio||!a||!o?[a,t*a/e]:[a,o]:[e*o/t,o]}_dim(e,t,i){return e==="auto"?0:e.endsWith("%")?parseInt(e.slice(0,-1),10)*t/100:e.endsWith("px")?parseInt(e.slice(0,-2),10):parseInt(e,10)*i}};var We=x(Be());function Te(r){let e={},t=r.split(",");for(let i of t){let A=i.indexOf("=");if(A===-1)continue;let s=i.substring(0,A),n=i.substring(A+1);if(s==="a"){e.action=n;continue}if(s==="o"){e.compression=n;continue}if(s==="t"){e.transmission=n;continue}if(s==="d"){e.deleteSelector=n;continue}let a=parseInt(n,10);switch(s){case"f":e.format=a;break;case"i":e.id=a;break;case"I":e.imageNumber=a;break;case"s":e.width=a;break;case"v":e.height=a;break;case"x":e.x=a;break;case"y":e.y=a;break;case"w":e.sourceWidth=a;break;case"h":e.sourceHeight=a;break;case"X":e.xOffset=a;break;case"Y":e.yOffset=a;break;case"c":e.columns=a;break;case"r":e.rows=a;break;case"m":e.more=a;break;case"q":e.quiet=a;break;case"C":e.cursorMovement=a;break;case"z":e.zIndex=a;break;case"p":e.placementId=a;break}}return e}var ze=0,Ae=class{constructor(e,t,i,A){this._opts=e;this._renderer=t;this._kittyStorage=i;this._coreTerminal=A;this._aborted=!1;this._generation=0;this._decodeError=!1;this._activeDecoder=null;this._inControlData=!0;this._controlData=new Uint32Array(512);this._controlLength=0;this._encodedSizeLimit=0;this._totalEncodedSize=0;this._parsedCommand=null;this._pendingTransmissions=new Map;this._maxEncodedBytes=Math.ceil(this._opts.kittySizeLimit*4/3),this._initialEncodedBytes=Math.min(4194304,this._maxEncodedBytes)}reset(){this._generation++,this._cleanupAllPending(),this._activeDecoder&&(this._activeDecoder.release(),this._activeDecoder=null),this._kittyStorage.reset()}dispose(){this.reset()}_removePendingEntry(e){this._pendingTransmissions.delete(e),this._lastPendingKey===e&&(this._lastPendingKey=void 0)}_cleanupAllPending(){for(let e of this._pendingTransmissions.values())e.decoder.release();this._pendingTransmissions.clear(),this._lastPendingKey=void 0}start(){this._aborted=!1,this._decodeError=!1,this._inControlData=!0,this._controlLength=0,this._parsedCommand=null,this._encodedSizeLimit=this._maxEncodedBytes,this._totalEncodedSize=0,this._activeDecoder=null}put(e,t,i){if(!this._aborted)if(!this._inControlData)this._streamPayload(e,t,i);else{let A=i;for(let n=t;n<i;n++)if(e[n]===59){this._inControlData=!1,A=n;break}let s=A-t;if(this._controlLength+s>512){this._aborted=!0;return}if(this._controlData.set(e.subarray(t,A),this._controlLength),this._controlLength+=s,!this._inControlData){if(this._parsedCommand=Te(this._parseControlDataString()),this._parsedCommand.id!==void 0&&this._parsedCommand.imageNumber!==void 0){this._sendResponse(this._parsedCommand.id,"EINVAL:cannot specify both i and I keys",this._parsedCommand.quiet??0),this._aborted=!0;return}if(this._parsedCommand.action==="d")return;let n=A+1;n<i&&this._streamPayload(e,n,i)}}}_streamPayload(e,t,i){if(this._aborted)return;let A=this._parsedCommand?.id??this._lastPendingKey??0,s=this._pendingTransmissions.get(A),n=s?.totalEncodedSize??0;if(this._totalEncodedSize+=i-t,n+this._totalEncodedSize>this._encodedSizeLimit){let o=this._activeDecoder??s?.decoder;o&&o.release(),this._activeDecoder=null,s&&this._removePendingEntry(A),this._aborted=!0;return}if(!this._decodeError){if(s?.decoder&&!this._activeDecoder&&(this._activeDecoder=s.decoder),!this._activeDecoder){let o=this._maxEncodedBytes+131072;if(o>this._opts.storageLimit*1e6){this._aborted=!0,this._parsedCommand?.id!==void 0&&this._sendResponse(this._parsedCommand.id,"ENOMEM:pending image budget exceeded",this._parsedCommand.quiet??0);return}let h=Math.max(1,Math.floor(this._opts.storageLimit*1e6/o));for(;this._pendingTransmissions.size>=h;){let g=this._pendingTransmissions.entries().next().value;if(!g)break;g[1].decoder.release(),this._removePendingEntry(g[0]),g[1].cmd.id!==void 0&&this._sendResponse(g[1].cmd.id,"ENOMEM:pending image budget exceeded",g[1].cmd.quiet??0)}let d=new We.default(4194304,this._maxEncodedBytes,this._initialEncodedBytes);try{d.init()}catch(g){console.warn("KITTY: could not allocate decoder",g),this._aborted=!0,this._parsedCommand?.id!==void 0&&this._sendResponse(this._parsedCommand.id,"ENOMEM:could not allocate decoder",this._parsedCommand.quiet??0);return}this._activeDecoder=d}this._activeDecoder.put(e.subarray(t,i))!==ze&&(this._activeDecoder.release(),this._activeDecoder=null,this._decodeError=!0,s&&this._removePendingEntry(A))}}end(e){if(this._aborted||!e)return this._activeDecoder&&(this._activeDecoder.release(),this._activeDecoder=null),!0;if(this._inControlData)return this._handleNoPayloadCommand();let t=this._parsedCommand;if(t.action==="d")return this._handleDelete(t);let i=t.id??this._lastPendingKey??0,A=t.more===1,s=this._pendingTransmissions.get(i);if(A)return this._activeDecoder&&(s?(s.totalEncodedSize+=this._totalEncodedSize,s.decodeError=s.decodeError||this._decodeError):this._pendingTransmissions.set(i,{cmd:{...t},decoder:this._activeDecoder,totalEncodedSize:this._totalEncodedSize,decodeError:this._decodeError}),this._lastPendingKey=i,this._activeDecoder=null),!0;s&&(this._lastPendingKey=void 0);let n=this._decodeError,a=t,o=this._activeDecoder;s&&(a=s.cmd,o=s.decoder,n=n||s.decodeError,this._pendingTransmissions.delete(i));let h=new Uint8Array(0);o&&(o.end()!==ze&&(n=!0),h=o.data8),this._activeDecoder=null;let d=this._handleCommandWithBytesAndCmd(a,h,n);return o&&o.release(),d}_parseControlDataString(){let e="";for(let t=0;t<this._controlLength;t++)e+=String.fromCodePoint(this._controlData[t]);return e}_handleNoPayloadCommand(){let e=Te(this._parseControlDataString());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),!0;switch(e.action??"t"){case"d":return this._handleDelete(e);case"q":return this._sendResponse(e.id??0,"OK",e.quiet??0),!0;case"p":return this._handlePlacement(e);default:return e.id!==void 0&&this._sendResponse(e.id,"EINVAL:unsupported action",e.quiet??0),!0}}_handleCommandWithBytesAndCmd(e,t,i){switch(e.action??"t"){case"t":{let s=this._handleTransmit(e,t,i);return(e.transmission??"d")==="d"&&e.id!==void 0&&(i?this._sendResponse(e.id,"EINVAL:invalid base64 data",e.quiet??0):t.length>0&&this._sendResponse(e.id,"OK",e.quiet??0)),s}case"T":return this._handleTransmitDisplay(e,t,i);case"q":return this._handleQuery(e,t,i);case"p":return this._handlePlacement(e);default:return e.id!==void 0&&this._sendResponse(e.id,"EINVAL:unsupported action",e.quiet??0),!0}}_handlePlacement(e){if(e.id===void 0)return!0;let t=e.id,i=this._kittyStorage.getImage(t);return i?this._displayImage(i,e).then(s=>(this._sendResponse(t,s?"OK":"EINVAL:image rendering failed",e.quiet??0,e.placementId),!0)):(this._sendResponse(t,"ENOENT:image not found",e.quiet??0,e.placementId),!0)}_handleTransmit(e,t,i){return(e.transmission??"d")!=="d"?(e.id!==void 0&&this._sendResponse(e.id,"EINVAL:unsupported transmission medium",e.quiet??0),!0):(i||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??""}),!0)}_handleTransmitDisplay(e,t,i){if(i)return e.id!==void 0&&this._sendResponse(e.id,"EINVAL:invalid base64 data",e.quiet??0),!0;this._handleTransmit(e,t,i);let A=e.id??this._kittyStorage.lastImageId,s=this._kittyStorage.getImage(A);if(s){let n=this._displayImage(s,e);return e.id!==void 0?n.then(a=>(this._sendResponse(A,a?"OK":"EINVAL:image rendering failed",e.quiet??0),!0)):n.then(()=>!0)}return!0}_handleQuery(e,t,i){let A=e.id??0,s=e.quiet??0;if((e.transmission??"d")!=="d")return this._sendResponse(A,"EINVAL:unsupported transmission medium",s),!0;if(i)return this._sendResponse(A,"EINVAL:invalid base64 data",s),!0;if(t.length===0)return this._sendResponse(A,"OK",s),!0;let a=e.format??32;if(a===100)this._sendResponse(A,"OK",s);else{let o=e.width??0,h=e.height??0;if(!o||!h)return this._sendResponse(A,"EINVAL:width and height required for raw pixel data",s),!0;let d=a===32?4:3,g=o*h*d;if(t.length<g)return this._sendResponse(A,"EINVAL:insufficient pixel data",s),!0;this._sendResponse(A,"OK",s)}return!0}_handleDelete(e){switch(e.deleteSelector??"a"){case"a":case"A":this._cleanupAllPending(),this._kittyStorage.deleteAll();break;case"i":case"I":if(e.id!==void 0){let i=this._pendingTransmissions.get(e.id);i&&i.decoder.release(),this._removePendingEntry(e.id),this._kittyStorage.deleteById(e.id)}break;default:break}return!0}_sendResponse(e,t,i,A){let s=t==="OK";if(s&&i>=1||!s&&i>=2)return;let n=A?`,p=${A}`:"",a=`\x1B_Gi=${e}${n};${t}\x1B\\`;this._coreTerminal._core.coreService.triggerDataEvent(a)}_displayImage(e,t){return this._decodeAndDisplay(e,t).then(()=>!0).catch(()=>!1)}async _decodeAndDisplay(e,t){let i=this._generation,A=await this._createBitmap(e);try{if(i!==this._generation)throw new Error("image decode canceled");let s=Math.max(0,t.x??0),n=Math.max(0,t.y??0),a=t.sourceWidth||A.width-s,o=t.sourceHeight||A.height-n,h=Math.max(0,A.width-s),d=Math.max(0,A.height-n),g=Math.max(0,Math.min(a,h)),I=Math.max(0,Math.min(o,d));if(g===0||I===0)throw new Error("invalid source rectangle");if(s!==0||n!==0||g!==A.width||I!==A.height){let T=await createImageBitmap(A,s,n,g,I);A.close(),A=T}let l=this._renderer.dimensions?.css.cell.width||w.width,c=this._renderer.dimensions?.css.cell.height||w.height,u,E;t.columns!==void 0&&t.rows!==void 0?(u=t.columns,E=t.rows):t.columns!==void 0?(u=t.columns,E=Math.max(1,Math.ceil(A.height/A.width*(u*l)/c))):t.rows!==void 0?(E=t.rows,u=Math.max(1,Math.ceil(A.width/A.height*(E*c)/l))):(u=Math.ceil(A.width/l),E=Math.ceil(A.height/c));let C=A.width,p=A.height;if((t.columns!==void 0||t.rows!==void 0)&&(C=Math.round(u*l),p=Math.round(E*c)),C*p>this._opts.pixelLimit)throw new Error("image exceeds pixel limit");let B=this._coreTerminal._core.buffer,Y=B.x,q=B.y,z=B.ybase,At=t.zIndex!==void 0&&t.zIndex<0?"bottom":"top";if(C!==A.width||p!==A.height){let T=await createImageBitmap(A,{resizeWidth:C,resizeHeight:p});A.close(),A=T}let Ie=Math.min(Math.max(0,t.xOffset??0),l-1),le=Math.min(Math.max(0,t.yOffset??0),c-1);if(Ie!==0||le!==0){let T=t.columns!==void 0?Math.round(u*l):A.width+Ie,st=t.rows!==void 0?Math.round(E*c):A.height+le,W=D.createCanvas(window.document,T,st),ke=W.getContext("2d");if(!ke)throw new Error("Failed to create offset canvas context");ke.drawImage(A,Ie,le);let nt=await createImageBitmap(W);if(W.width=W.height=0,A.close(),A=nt,C=A.width,p=A.height,C*p>this._opts.pixelLimit)throw new Error("image exceeds pixel limit");t.columns===void 0&&(u=Math.ceil(A.width/l)),t.rows===void 0&&(E=Math.ceil(A.height/c))}if(i!==this._generation)throw new Error("image decode canceled");let rt=t.zIndex??0;if(this._kittyStorage.addImage(e.id,A,!0,At,rt),A=void 0,t.cursorMovement===1){let T=B.ybase-z;B.x=Y,B.y=Math.max(q-T,0)}else B.x=Math.min(Y+u,this._coreTerminal.cols)}catch(s){throw A?.close(),s}}async _createBitmap(e){let t=new Uint8Array(await e.data.arrayBuffer());if(e.compression==="z"&&(t=await this._decompressZlib(t)),e.format===100){let E=te(t);if(E.mime!=="image/png"||!(E.width>0)||!(E.height>0)||E.width*E.height>this._opts.pixelLimit)throw new RangeError("PNG exceeds pixel limit or has invalid dimensions");let C=new Blob([t],{type:"image/png"});if(!window.createImageBitmap){let p=URL.createObjectURL(C),B=new Image;return new Promise((Y,q)=>{B.addEventListener("load",()=>{URL.revokeObjectURL(p);let z=D.createCanvas(window.document,B.width,B.height);z.getContext("2d")?.drawImage(B,0,0),createImageBitmap(z).then(Y).catch(q)}),B.addEventListener("error",()=>{URL.revokeObjectURL(p),q(new Error("Failed to load image"))}),B.src=p})}return createImageBitmap(C)}let i=e.width,A=e.height;if(!i||!A)throw new Error("Width and height required for raw pixel data");let s=e.format===32?4:3,n=i*A*s;if(t.length<n)throw new Error("Insufficient pixel data");let a=i*A;if(e.format===32)return createImageBitmap(new ImageData(new Uint8ClampedArray(t.buffer,t.byteOffset,a*4),i,A));let o=new Uint8ClampedArray(a*4),h=new Uint32Array(t.buffer,t.byteOffset,Math.floor(t.byteLength/4)),d=new Uint32Array(o.buffer),g=a&-4,I=0,l=0;for(let E=0;E<g;E+=4){let C=h[I++],p=h[I++],B=h[I++];d[l++]=4278190080|C,d[l++]=4278190080|C>>>24|p<<8,d[l++]=4278190080|p>>>16|B<<16,d[l++]=4278190080|B>>>8}let c=g*3,u=g*4;for(let E=g;E<a;E++)o[u]=t[c],o[u+1]=t[c+1],o[u+2]=t[c+2],o[u+3]=255,c+=3,u+=4;return createImageBitmap(new ImageData(o,i,A))}async _decompressZlib(e){try{return await this._decompress(e,"deflate")}catch(t){if(t instanceof RangeError)throw t;return await this._decompress(e,"deflate-raw")}}async _decompress(e,t){let i=Math.min(this._opts.kittySizeLimit,this._opts.pixelLimit*4,this._opts.storageLimit*1e6),A=0,n=new ReadableStream({pull(g){if(A>=e.length){g.close();return}let I=Math.min(A+4096,e.length);g.enqueue(new Uint8Array(e.subarray(A,I))),A=I}}).pipeThrough(new DecompressionStream(t)).getReader(),a=[],o=0;try{for(;;){let{done:g,value:I}=await n.read();if(g)break;if(o+=I.byteLength,o>i)throw await n.cancel().catch(()=>{}),new RangeError("decompressed image exceeds byte limit");a.push(I)}}finally{n.releaseLock()}let h=new Uint8Array(o),d=0;for(let g of a)h.set(g,d),d+=g.length;return h}get images(){return this._kittyStorage.images}get _kittyIdToStorageId(){return this._kittyStorage.kittyIdToStorageId}get pendingTransmissions(){return this._pendingTransmissions}};var U=class U{constructor(e){this._storage=e;this._nextImageId=1;this._images=new Map;this._kittyIdToStorageId=new Map;this._storageIdToKittyId=new Map;this._handleStorageImageDeleted=e=>{let t=this._storageIdToKittyId.get(e);t!==void 0&&(this._kittyIdToStorageId.delete(t),this._storageIdToKittyId.delete(e),this._images.delete(t))};this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"iip"};this._previousOnImageDeleted=this._storage.onImageDeleted,this._wrappedOnImageDeleted=t=>{this._previousOnImageDeleted?.(t),this._handleStorageImageDeleted(t)},this._storage.onImageDeleted=this._wrappedOnImageDeleted}reset(){this._nextImageId=1,this._images.clear(),this._kittyIdToStorageId.clear(),this._storageIdToKittyId.clear()}dispose(){this.reset(),this._storage.onImageDeleted===this._wrappedOnImageDeleted&&(this._storage.onImageDeleted=this._previousOnImageDeleted)}storeImage(e,t){let i=e??this._nextImageId++,A=this._kittyIdToStorageId.get(i);A!==void 0&&(this._storage.deleteImage(A),this._kittyIdToStorageId.delete(i),this._storageIdToKittyId.delete(A)),!this._images.has(i)&&this._images.size>=U._maxStoredImages&&this._evictUndisplayedImages();let s=this._storage.getLimit()*1e6;this._images.delete(i);let n=0;for(let a of this._images.values())n+=a.data.size;for(let a of[!1,!0])for(let[o,h]of this._images){if(n+t.data.size<=s)break;this._kittyIdToStorageId.has(o)===a&&(n-=h.data.size,this.deleteById(o))}return this._images.set(i,{...t,id:i}),i}addImage(e,t,i,A,s){let n=this._kittyIdToStorageId.get(e);n!==void 0&&this._storageIdToKittyId.delete(n),this._addImageOpts.scrolling=i,this._addImageOpts.layer=A,this._addImageOpts.zIndex=s;let a=this._storage.addImage(t,this._addImageOpts);this._kittyIdToStorageId.set(e,a),this._storageIdToKittyId.set(a,e)}getImage(e){return this._images.get(e)}deleteById(e){this._images.delete(e);let t=this._kittyIdToStorageId.get(e);t!==void 0&&(this._storage.deleteImage(t),this._kittyIdToStorageId.delete(e),this._storageIdToKittyId.delete(t))}deleteAll(){this._images.clear();for(let e of this._kittyIdToStorageId.values())this._storage.deleteImage(e);this._kittyIdToStorageId.clear(),this._storageIdToKittyId.clear()}get images(){return this._images}get kittyIdToStorageId(){return this._kittyIdToStorageId}get lastImageId(){return this._nextImageId-1}_evictUndisplayedImages(){for(let[e]of this._images){if(this._images.size<=U._maxStoredImages/2)break;this._kittyIdToStorageId.has(e)||this._images.delete(e)}}};U._maxStoredImages=256;var re=U;var y=x(j());var he=x(je()),Ve=x(xe());var Nt=4194304,K=y.PALETTE_ANSI_256;K.set(y.PALETTE_VT340_COLOR);var Ht=2,Re=new Map,ve=!1;function Ft(r){ve||(ve=!0,(0,he.DecoderAsync)({memoryLimit:r,palette:K}).then(e=>$e(e,r),()=>{ve=!1}))}function Gt(r){return Re.get(r)?.pop()??new he.Decoder({memoryLimit:r,palette:K})}function $e(r,e){r.memoryUsage>Nt&&r.release();let t=Re.get(e)??[];t.length<Ht&&(t.push(r),Re.set(e,t))}var oe=class{constructor(e,t,i){this._opts=e;this._storage=t;this._coreTerminal=i;this._size=0;this._aborted=!1;this._decMemoryLimit=0;this._palette=new Uint32Array(Ve.LIMITS.PALETTE_SIZE);this._palette.set(K),Ft(this._opts.pixelLimit*4)}reset(){this._returnDecoder(),this._palette.fill(0),this._palette.set(K)}hook(e){this._size=0,this._aborted=!1,this._returnDecoder();let t=this._opts.pixelLimit*4;try{this._dec=Gt(t)}catch(A){console.warn(`SIXEL: could not allocate decoder - ${A}`),this._aborted=!0;return}this._decMemoryLimit=t;let i=e.params[1]===1?0:Ut(this._coreTerminal._core._inputHandler._curAttrData,this._coreTerminal._core._themeService?.colors);this._dec.init(i,this._palette,this._opts.sixelPaletteLimit)}_returnDecoder(){let e=this._dec;e&&(this._dec=void 0,this._palette.set(e.palette),$e(e,this._decMemoryLimit))}put(e,t,i){if(!(this._aborted||!this._dec)){if(this._size+=i-t,this._size>this._opts.sixelSizeLimit){console.warn("SIXEL: too much data, aborting"),this._aborted=!0,this._dec.release();return}try{this._dec.decode(e,t,i)}catch(A){console.warn(`SIXEL: error while decoding image - ${A}`),this._aborted=!0,this._dec.release()}}}unhook(e){try{return this._unhook(e)}finally{this._returnDecoder()}}_unhook(e){if(this._aborted||!e||!this._dec)return!0;let t=this._dec.width,i=this._dec.height;if(!t||!i)return i&&this._storage.advanceCursor(i),!0;let A=D.createCanvas(void 0,t,i);return A.getContext("2d")?.putImageData(new ImageData(this._dec.data8,t,i),0,0),this._storage.addImage(A),!0}};function Ut(r,e){let t=0;if(!e)return t;if(r.isInverse())if(r.isFgDefault())t=ae(e.foreground.rgba);else if(r.isFgRGB()){let i=r.constructor.toColorRGB(r.getFgColor());t=(0,y.toRGBA8888)(...i)}else t=ae(e.ansi[r.getFgColor()].rgba);else if(r.isBgDefault())t=ae(e.background.rgba);else if(r.isBgRGB()){let i=r.constructor.toColorRGB(r.getBgColor());t=(0,y.toRGBA8888)(...i)}else t=ae(e.ansi[r.getBgColor()].rgba);return t}function ae(r){return y.BIG_ENDIAN?r:(r&255)<<24|(r>>>8&255)<<16|(r>>>16&255)<<8|r>>>24&255}var de=class{constructor(e,t,i,A){this._storage=e;this._opts=t;this._renderer=i;this._terminal=A;this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"vt340"}}addImage(e){this._addImageOpts.scrolling=this._opts.sixelScrolling,this._storage.addImage(e,this._addImageOpts)}advanceCursor(e){if(this._opts.sixelScrolling){let t=this._renderer.cellSize;(t.width===-1||t.height===-1)&&(t=w);let i=Math.ceil(e/t.height);for(let A=1;A<i;++A)this._terminal._core._inputHandler.lineFeed()}}};var ge=class{constructor(e){this._storage=e;this._addImageOpts={scrolling:!0,layer:"top",zIndex:0,cursorPos:"iip"}}addImage(e){this._storage.addImage(e,this._addImageOpts)}};var et={enableSizeReports:!0,pixelLimit:16777216,sixelSupport:!0,sixelScrolling:!0,sixelPaletteLimit:4096,sixelSizeLimit:33554432,storageLimit:128,showPlaceholder:!0,iipSupport:!0,iipSizeLimit:33554432,kittySupport:!0,kittySizeLimit:33554432},tt=4096;var it=class{constructor(e){this._disposables=[];this._handlers=new Map;this._onImageAdded=new Z;this.onImageAdded=this._onImageAdded.event;this._opts=Object.assign({},et,e),this._defaultOpts=Object.assign({},et,e)}dispose(){for(let e of this._handlers.values())e.reset();for(let e of this._disposables)e.dispose();this._disposables.length=0,this._handlers.clear(),this._onImageAdded.dispose()}_disposeLater(...e){for(let t of e)this._disposables.push(t)}activate(e){if(this._terminal=e,this._renderer=new D(e),this._storage=new V(e,this._renderer,this._opts),this._storage.onImageAdded=()=>this._onImageAdded.fire(),this._opts.enableSizeReports){let t=e.options.windowOptions??{};t.getWinSizePixels=!0,t.getCellSizePixels=!0,t.getWinSizeChars=!0,e.options.windowOptions=t}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){let t=new de(this._storage,this._opts,this._renderer,e),i=new oe(this._opts,t,e);this._handlers.set("sixel",i),this._disposeLater(e._core._inputHandler._parser.registerDcsHandler({final:"q"},i))}if(this._opts.iipSupport){let t=new ge(this._storage),i=new ie(this._opts,this._renderer,t,e);this._handlers.set("iip",i),this._disposeLater(e._core._inputHandler._parser.registerOscHandler(1337,i))}if(this._opts.kittySupport){let t=new re(this._storage),i=new Ae(this._opts,this._renderer,t,e);this._handlers.set("kitty",i),this._disposeLater(t,i,e._core._inputHandler._parser.registerApcHandler({final:"G"},i))}}reset(){this._opts.sixelScrolling=this._defaultOpts.sixelScrolling,this._opts.sixelPaletteLimit=this._defaultOpts.sixelPaletteLimit,this._storage?.reset();for(let e of this._handlers.values())e.reset();return!1}get storageLimit(){return this._storage?.getLimit()||-1}set storageLimit(e){this._storage?.setLimit(e),this._opts.storageLimit=e}get storageUsage(){return this._storage?this._storage.getUsage():-1}get showPlaceholder(){return this._opts.showPlaceholder}set showPlaceholder(e){this._opts.showPlaceholder=e,this._renderer?.showPlaceholder(e)}getImageAtBufferCell(e,t){return this._storage?.getImageAtBufferCell(e,t)}extractTileAtBufferCell(e,t){return this._storage?.extractTileAtBufferCell(e,t)}_report(e){this._terminal?._core.input(e,!1)}_decset(e){for(let t=0;t<e.length;++t)e[t]===80&&(this._opts.sixelScrolling=!1);return!1}_decrst(e){for(let t=0;t<e.length;++t)e[t]===80&&(this._opts.sixelScrolling=!0);return!1}_da1(e){return e[0]?!0:this._opts.sixelSupport?(this._report("\x1B[?62;4;9;22c"),!0):!1}_xtermGraphicsAttributes(e){if(e.length<2)return!0;if(e[0]===1)switch(e[1]){case 1:return this._report(`\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`),!0;case 2:this._opts.sixelPaletteLimit=this._defaultOpts.sixelPaletteLimit,this._report(`\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`);for(let t of this._handlers.values())t.reset();return!0;case 3:return e.length>2&&!(e[2]instanceof Array)&&e[2]<=tt?(this._opts.sixelPaletteLimit=e[2],this._report(`\x1B[?${e[0]};0;${this._opts.sixelPaletteLimit}S`)):this._report(`\x1B[?${e[0]};2S`),!0;case 4:return this._report(`\x1B[?${e[0]};0;${tt}S`),!0;default:return this._report(`\x1B[?${e[0]};2S`),!0}if(e[0]===2)switch(e[1]){case 1:let t=this._renderer?.dimensions?.css.canvas.width,i=this._renderer?.dimensions?.css.canvas.height;if(!t||!i){let s=w;t=(this._terminal?.cols||80)*s.width,i=(this._terminal?.rows||24)*s.height}if(t*i<this._opts.pixelLimit)this._report(`\x1B[?${e[0]};0;${t.toFixed(0)};${i.toFixed(0)}S`);else{let s=Math.floor(Math.sqrt(this._opts.pixelLimit));this._report(`\x1B[?${e[0]};0;${s};${s}S`)}return!0;case 4:let A=Math.floor(Math.sqrt(this._opts.pixelLimit));return this._report(`\x1B[?${e[0]};0;${A};${A}S`),!0;default:return this._report(`\x1B[?${e[0]};2S`),!0}return this._report(`\x1B[?${e[0]};1S`),!0}};export{it as ImageAddon};
  //# sourceMappingURL=addon-image.mjs.map
 diff --git a/lib/addon-image.mjs.map b/lib/addon-image.mjs.map
-index d376d495d729b9d6ed3b2ea1f7a5eeb3960d2697..1b68019e5d41d34664cd151b2c7d47ef4feff4dd 100644
+index d376d495d729b9d6ed3b2ea1f7a5eeb3960d2697..0092ce32d3298f4416915a9255ddcb777e30b873 100644
 --- a/lib/addon-image.mjs.map
 +++ b/lib/addon-image.mjs.map
 @@ -1,7 +1,7 @@
@@ -39,15 +39,28 @@ index d376d495d729b9d6ed3b2ea1f7a5eeb3960d2697..1b68019e5d41d34664cd151b2c7d47ef
 -  "sourcesContent": [null, "\"use strict\";\n/**\n * Copyright (c) 2022, 2026 Joerg Breitbart\n * @license MIT\n */\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.InWasm = InWasm;\nlet z = (s) => {\n    if (Uint8Array.fromBase64)\n        return Uint8Array.fromBase64(s);\n    if (typeof Buffer !== 'undefined')\n        return Buffer.from(s, 'base64');\n    const b = atob(s);\n    const r = new Uint8Array(b.length);\n    for (let i = 0; i < r.length; ++i)\n        r[i] = b.charCodeAt(i);\n    return r;\n};\nfunction InWasm(def) {\n    if (def.d) {\n        const { t, s, d } = def;\n        let b;\n        let m;\n        const W = WebAssembly;\n        if (t === 0 /* OutputType.INSTANCE */) {\n            if (s)\n                return (e) => new W.Instance(m || (m = new W.Module(b || (b = z(d)))), e);\n            return (e) => m\n                ? W.instantiate(m, e)\n                : W.instantiate(b || (b = z(d)), e).then(r => (m = r.module) && r.instance);\n        }\n        if (t === 1 /* OutputType.MODULE */) {\n            if (s)\n                return () => m || (m = new W.Module(b || (b = z(d))));\n            return () => m\n                ? Promise.resolve(m)\n                : W.compile(b || (b = z(d))).then(r => m = r);\n        }\n        if (s)\n            return () => b || (b = z(d));\n        return () => Promise.resolve(b || (b = z(d)));\n    }\n    if (typeof _wasmCtx === 'undefined')\n        throw new Error('must run \"inwasm\"');\n    _wasmCtx.add(def);\n}\n//# sourceMappingURL=index.js.map", "\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\n/**\n * Copyright (c) 2023, 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nconst inwasm_runtime_1 = require(\"inwasm-runtime\");\n/**\n * wasm base64 decoder.\n */\nconst wasmDecode = (0, inwasm_runtime_1.InWasm)(/*inwasm#828e69684093b2c6:rdef-start:\"decode\"*/{s:1,t:0,d:'AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML'}/*inwasm#828e69684093b2c6:rdef-end:\"decode\"*/);\n// SIMD version (speedup ~1.4x, not covered by tests yet)\n/*\nconst wasmDecode = InWasm({\n  name: 'decode',\n  type: OutputType.INSTANCE,\n  mode: OutputMode.SYNC,\n  srctype: 'Clang-C',\n  imports: {\n    env: { memory: new WebAssembly.Memory({ initial: 1 }) }\n  },\n  exports: {\n    dec: () => 0,\n    end: () => 0\n  },\n  compile: {\n    switches: ['-msimd128', '-Wl,-z,stack-size=0', '-Wl,--stack-first']\n  },\n  code: `\n    #include <wasm_simd128.h>\n    typedef struct {\n      unsigned int wp;\n      unsigned int sp;\n      unsigned int dp;\n      unsigned int e_size;\n      unsigned int dummy[4];\n      unsigned char data[0];\n    } State;\n\n    unsigned int *D0 = (unsigned int *) ${P32.D0 * 4};\n    unsigned int *D1 = (unsigned int *) ${P32.D1 * 4};\n    unsigned int *D2 = (unsigned int *) ${P32.D2 * 4};\n    unsigned int *D3 = (unsigned int *) ${P32.D3 * 4};\n    State *state = (State *) ${P32.STATE * 4};\n\n    #define packed_byte(x) wasm_i8x16_splat((char) x)\n    #define packed_dword(x) wasm_i32x4_splat(x)\n    #define masked(x, mask) wasm_v128_and(x, wasm_i32x4_splat(mask))\n\n    __attribute__((noinline)) int dec() {\n      unsigned int nsp = (state->wp - 1) & ~3;\n      unsigned char *src = state->data + state->sp;\n      unsigned char *end = state->data + nsp;\n      unsigned char *dst = state->data + state->dp;\n      unsigned int error = 0;\n\n      v128_t err = wasm_i8x16_splat(0);\n      unsigned char *end16 = state->data + (nsp & ~15);\n      while (src < end16) {\n        v128_t data = wasm_v128_load((v128_t *) src);\n\n        // wasm-simd rewrite of http://0x80.pl/notesen/2016-01-17-sse-base64-decoding.html#vector-lookup-pshufb\n        const v128_t higher_nibble = wasm_u32x4_shr(data, 4) & packed_byte(0x0f);\n        const char linv = 1;\n        const char hinv = 0;\n\n        const v128_t lower_bound_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          linv, linv, 0x2b, 0x30,\n          0x41, 0x50, 0x61, 0x70,\n          linv, linv, linv, linv,\n          linv, linv, linv, linv\n        );\n        const v128_t upper_bound_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          hinv, hinv, 0x2b, 0x39,\n          0x4f, 0x5a, 0x6f, 0x7a,\n          hinv, hinv, hinv, hinv,\n          hinv, hinv, hinv, hinv\n        );\n        // the difference between the shift and lower bound\n        const v128_t shift_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          0x00,        0x00,        0x3e - 0x2b, 0x34 - 0x30,\n          0x00 - 0x41, 0x0f - 0x50, 0x1a - 0x61, 0x29 - 0x70,\n          0x00,        0x00,        0x00,        0x00,\n          0x00,        0x00,        0x00,        0x00\n        );\n\n        const v128_t upper_bound = wasm_i8x16_swizzle(upper_bound_LUT, higher_nibble);\n        const v128_t lower_bound = wasm_i8x16_swizzle(lower_bound_LUT, higher_nibble);\n\n        const v128_t below = wasm_i8x16_lt(data, lower_bound);\n        const v128_t above = wasm_i8x16_gt(data, upper_bound);\n        const v128_t eq_2f = wasm_i8x16_eq(data, packed_byte(0x2f));\n\n        // in_range = not (below or above) or eq_2f\n        // outside  = not in_range = below or above and not eq_2f (from deMorgan law)\n        const v128_t outside = wasm_v128_andnot(eq_2f, above | below);\n        err = wasm_v128_or(err, outside);\n\n        const v128_t shift  = wasm_i8x16_swizzle(shift_LUT, higher_nibble);\n        const v128_t t0     = wasm_i8x16_add(data, shift);\n        v128_t v = wasm_i8x16_add(t0, wasm_v128_and(eq_2f, packed_byte(-3)));\n\n        // pack bytes\n        const v128_t ca = masked(v, 0x003f003f);\n        const v128_t db = masked(v, 0x3f003f00);\n        const v128_t t00 = wasm_v128_or(wasm_u32x4_shr(db, 8), wasm_i32x4_shl(ca, 6));\n        v128_t res = wasm_v128_or(wasm_u32x4_shr(t00, 16), wasm_i32x4_shl(t00, 12));\n        res = wasm_i8x16_swizzle(res, wasm_i8x16_const(2, 1, 0, 6, 5, 4, 10, 9, 8, 14, 13, 12, 16, 16, 16, 16));\n\n        wasm_v128_store((v128_t *) dst, res);\n        dst += 12;\n        src += 16;\n      }\n      //if (wasm_i8x16_bitmask(err) != 0) return -1;\n      if (wasm_v128_any_true(err)) return -1;\n\n      // operate on 4-byte blocks\n      while (src < end) {\n        error |= *((unsigned int *) dst) = D0[src[0]] | D1[src[1]] | D2[src[2]] | D3[src[3]];\n        dst += 3;\n        src += 4;\n      }\n      if (error >> 24) return -1;\n      state->sp = nsp;\n      state->dp = dst - state->data;\n      return 0;\n    }\n\n    int end() {\n      int rem = state->wp - state->sp;\n      if (rem > 4 && dec()) return -1;\n      rem = state->wp - state->sp;\n      if (rem < 2) return -1;\n\n      unsigned char *src = state->data + state->sp;\n      if (rem == 4) {\n        if (src[3] == 61) rem--;\n        if (src[2] == 61) rem--;\n      }\n      unsigned int accu = D0[src[0]] | D1[src[1]];\n      int dp = 1;\n      if (rem > 2) {\n        accu |= D2[src[2]];\n        dp++;\n        if (rem == 4) {\n          accu |= D3[src[3]];\n          dp++;\n        }\n      }\n      if (accu >> 24) return -1;\n      *((unsigned int *) (state->data + state->dp)) = accu;\n      state->dp += dp;\n      return 0;\n    }\n    `\n});\n*/\n// base64 map\nconst MAP = new Uint8Array('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'\n    .split('')\n    .map(el => el.charCodeAt(0)));\n// init decoder maps in LE order\nconst D = new Uint32Array(1024);\nD.fill(0xFF000000);\nfor (let i = 0; i < MAP.length; ++i)\n    D[MAP[i]] = i << 2;\nfor (let i = 0; i < MAP.length; ++i)\n    D[256 + MAP[i]] = i >> 4 | ((i << 4) & 0xFF) << 8;\nfor (let i = 0; i < MAP.length; ++i)\n    D[512 + MAP[i]] = (i >> 2) << 8 | ((i << 6) & 0xFF) << 16;\nfor (let i = 0; i < MAP.length; ++i)\n    D[768 + MAP[i]] = i << 16;\nconst EMPTY = new Uint8Array(0);\n/**\n * base64 stream decoder.\n *\n * Features / assumptions:\n * - lazy chunkwise decoding\n * - errors out on any non base64 chars (no support for NL formatted base64)\n * - decodes in wasm\n * - inplace decoding to save memory\n * - supports a keepSize for lazy memory release\n */\nclass Base64Decoder {\n    /**\n     * @param keepSize Keep the wasm instance below this limit when calling `release()`.\n     * @param maxBytes Max allowed bytes to allocate.\n     * @param initialBytes Initial bytes to allocate.\n     */\n    constructor(keepSize, maxBytes, initialBytes) {\n        this._inst = null;\n        this._ended = true;\n        this._bytes = 0;\n        this.keepSize = keepSize !== null && keepSize !== void 0 ? keepSize : 1048576 /* Bytes.KEEP */;\n        this.maxBytes = maxBytes !== null && maxBytes !== void 0 ? maxBytes : 4294901760 /* Bytes.MAX */;\n        this._bytes = initialBytes !== null && initialBytes !== void 0 ? initialBytes : 32768 /* Bytes.INITIAL */;\n        if (this._bytes > this.maxBytes || this.maxBytes > 4294901760 /* Bytes.MAX */) {\n            throw new Error('invalid byte settings');\n        }\n    }\n    /**\n     * Currently decoded bytes (borrowed).\n     * Must be accessed before calling `release` or `init`.\n     */\n    get data8() {\n        return this._inst ? this._d.subarray(0, this._m32[1282 /* P32.STATE_DP */]) : EMPTY;\n    }\n    /**\n     * Release memory conditionally based on `keepSize`.\n     * If memory gets released, also the wasm instance will be freed and recreated on next `init`,\n     * otherwise the instance will be reused.\n     */\n    release() {\n        if (!this._inst)\n            return;\n        if (this._bytes > this.keepSize) {\n            this._inst = this._m32 = this._d = this._mem = null;\n        }\n        else {\n            this._m32[1280 /* P32.STATE_WP */] = 0;\n            this._m32[1281 /* P32.STATE_SP */] = 0;\n            this._m32[1282 /* P32.STATE_DP */] = 0;\n        }\n    }\n    /**\n     * Initializes the decoder for new base64 data.\n     * Must be called before doing any decoding attempts.\n     * The method will either spawn a new wasm instance or grow\n     * the needed memory of an existing instance.\n     * @param maxBytes Max allowed bytes to allocate (overwrites ctor value).\n     * @param initialBytes Initial bytes to allocate (overwrites ctor value).\n     */\n    init(maxBytes, initialBytes) {\n        this.maxBytes = maxBytes !== null && maxBytes !== void 0 ? maxBytes : this.maxBytes;\n        this._bytes = initialBytes !== null && initialBytes !== void 0 ? initialBytes : Math.min(this._bytes, this.maxBytes);\n        if (this._bytes > this.maxBytes || this.maxBytes > 4294901760 /* Bytes.MAX */) {\n            throw Error('invalid byte settings');\n        }\n        let m = this._m32;\n        const bytes = this._bytes + 5152 /* Bytes._DATA_OFFSET */;\n        if (!this._inst) {\n            this._mem = new WebAssembly.Memory({ initial: Math.ceil(bytes / 65536) });\n            this._inst = wasmDecode({ env: { memory: this._mem } });\n            m = new Uint32Array(this._mem.buffer, 0);\n            m.set(D, 256 /* P32.D0 */);\n            this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n        }\n        else if (this._mem.buffer.byteLength < bytes) {\n            this._mem.grow(Math.ceil((bytes - this._mem.buffer.byteLength) / 65536));\n            m = new Uint32Array(this._mem.buffer, 0);\n            this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n        }\n        m[1280 /* P32.STATE_WP */] = 0;\n        m[1281 /* P32.STATE_SP */] = 0;\n        m[1282 /* P32.STATE_DP */] = 0;\n        this._m32 = m;\n        this._ended = false;\n    }\n    /**\n     * Realloc memory. Realloc only happens, if the requested\n     * size doesn't fit in the current memory.\n     * The new size will be capped by `maxBytes`.\n     * @param requested Bytes to be stored.\n     */\n    _realloc(requested) {\n        const needed = this._m32[1280 /* P32.STATE_WP */] + requested;\n        if (this._bytes < needed) {\n            if (needed > this.maxBytes) {\n                return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n            }\n            let newSize = this._bytes;\n            while ((newSize *= 2) < needed) { }\n            newSize = Math.min(newSize, this.maxBytes);\n            if (newSize < needed) {\n                return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n            }\n            if (newSize + 5152 /* Bytes._DATA_OFFSET */ > this._mem.buffer.byteLength) {\n                const addPages = Math.ceil((newSize + 5152 /* Bytes._DATA_OFFSET */ - this._mem.buffer.byteLength) / 65536);\n                this._mem.grow(addPages);\n                this._m32 = new Uint32Array(this._mem.buffer, 0);\n                this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n            }\n            this._bytes = newSize;\n        }\n        return 0 /* DecodeStatus.OK */;\n    }\n    /**\n     * Put bytes in `data` into the decoder.\n     * Additionally decodes the payload, if it reached 2^17 bytes.\n     * The return value indicates the type of issue.\n     * @param data Bytes to be loaded.\n     */\n    put(data) {\n        if (!this._inst || this._ended) {\n            return -2 /* DecodeStatus.NOT_INITIALIZED */;\n        }\n        if (this._realloc(data.length)) {\n            return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n        }\n        const m = this._m32;\n        this._d.set(data, m[1280 /* P32.STATE_WP */]);\n        m[1280 /* P32.STATE_WP */] += data.length;\n        // max chunk in input handler is 2^17, try to run in \"tandem mode\"\n        return m[1280 /* P32.STATE_WP */] - m[1281 /* P32.STATE_SP */] >= 131072\n            ? this._inst.exports.dec()\n            : 0 /* DecodeStatus.OK */;\n    }\n    /**\n     * End the current decoding.\n     * Also decodes leftover payload from previous put calls.\n     */\n    end() {\n        this._ended = true;\n        return this._inst\n            ? this._inst.exports.end()\n            : -2 /* DecodeStatus.NOT_INITIALIZED */;\n    }\n    /**\n     * Bytes loaded into the decoder.\n     */\n    get loadedBytes() {\n        return this._inst\n            ? this._m32[1280 /* P32.STATE_WP */]\n            : 0;\n    }\n    /**\n     * Free bytes to feed to the decoder.\n     */\n    get freeBytes() {\n        return this._inst\n            ? this.maxBytes - this._m32[1280 /* P32.STATE_WP */]\n            : 0;\n    }\n}\nexports.default = Base64Decoder;\n//# sourceMappingURL=Base64Decoder.wasm.js.map", "\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\n/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nconst inwasm_runtime_1 = require(\"inwasm-runtime\");\nconst wasmQoiDecode = (0, inwasm_runtime_1.InWasm)(/*inwasm#459f9e1bfb80b1a8:rdef-start:\"qoi_decode\"*/{s:1,t:0,d:'AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw=='}/*inwasm#459f9e1bfb80b1a8:rdef-end:\"qoi_decode\"*/);\nclass QoiDecoder {\n    constructor(keepSize) {\n        this.keepSize = keepSize;\n        this.width = 0;\n        this.height = 0;\n    }\n    decode(d) {\n        this.width = d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7];\n        this.height = d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11];\n        const pixels = this.width * this.height;\n        const ib = pixels * 4;\n        const dl = d.length;\n        /**\n         * byte/offset calculation:\n         * To save some memory we dont reserve full memory for decoded + encoded,\n         * but place encoded at the end of decoded plus 50% security distance\n         * to avoid reads before writes positions:\n         *\n         * encoded < decoded (good compression)\n         *    enc                                              ####################\n         *    dec                 #######################################\n         *                        ^                            ^\n         *                        DST_P                        CHUNK_P\n         *\n         * encoded > decoded (degenerated compression, should not happen)\n         *    enc                           ##############################\n         *    dec                 ####################\n         *                        ^         ^\n         *                        DST_P     CHUNK_P\n         *\n         * There is still a chance for overlapping r/w positions in case the compressed\n         * data has very different pixel progression, yet the 50% security distance\n         * should deal with that, as QOI will bloat data by 25% at max (RGB -> OP byte + RGB).\n         * Since we always assume RGBA at decoding stage, the possible bloat reduces to 20% at max.\n         */\n        const bytes = Math.max(ib, dl) + (Math.min(ib, dl) >> 1) + 4096;\n        if (!this._inst) {\n            this._mem = new WebAssembly.Memory({ initial: Math.ceil(bytes / 65536) });\n            this._inst = wasmQoiDecode({ env: { memory: this._mem } });\n        }\n        else if (this._mem.buffer.byteLength < bytes) {\n            this._mem.grow(Math.ceil((bytes - this._mem.buffer.byteLength) / 65536));\n            this._d = null;\n        }\n        if (!this._d) {\n            this._d = new Uint8Array(this._mem.buffer);\n        }\n        // put src data at the end of memory, also align to 256\n        const chunkP = (this._mem.buffer.byteLength - dl) & ~0xFF;\n        this._d.set(d, chunkP);\n        this._inst.exports.dec(chunkP, dl, pixels);\n        return this._d.subarray(1024 /* P8.DST_P */, 1024 /* P8.DST_P */ + ib);\n    }\n    release() {\n        if (!this._inst)\n            return;\n        if (this._mem.buffer.byteLength > this.keepSize) {\n            this._inst = this._d = this._mem = null;\n        }\n    }\n}\nexports.default = QoiDecoder;\n//# sourceMappingURL=QoiDecoder.wasm.js.map", null, null, "/**\n * Copyright (c) 2024-2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Minimal lifecycle utilities for xterm.js core.\n * Simplified from VS Code's lifecycle.ts - no tracking/leak detection.\n */\n\nexport interface IDisposable {\n  dispose(): void;\n}\n\nexport function toDisposable(fn: () => void): IDisposable {\n  return { dispose: fn };\n}\n\nexport function dispose<T extends IDisposable>(disposable: T): T;\nexport function dispose<T extends IDisposable>(disposable: T | undefined): T | undefined;\nexport function dispose<T extends IDisposable>(disposables: T[]): T[];\nexport function dispose<T extends IDisposable>(arg: T | T[] | undefined): T | T[] | undefined {\n  if (!arg) {\n    return arg;\n  }\n  if (Array.isArray(arg)) {\n    for (const d of arg) {\n      d.dispose();\n    }\n    return [];\n  }\n  arg.dispose();\n  return arg;\n}\n\nexport function combinedDisposable(...disposables: IDisposable[]): IDisposable {\n  return toDisposable(() => dispose(disposables));\n}\n\nexport class DisposableStore implements IDisposable {\n  private readonly _disposables = new Set<IDisposable>();\n  private _isDisposed = false;\n\n  public get isDisposed(): boolean {\n    return this._isDisposed;\n  }\n\n  public add<T extends IDisposable>(o: T): T {\n    if (this._isDisposed) {\n      o.dispose();\n    } else {\n      this._disposables.add(o);\n    }\n    return o;\n  }\n\n  public dispose(): void {\n    if (this._isDisposed) {\n      return;\n    }\n    this._isDisposed = true;\n    for (const d of this._disposables) {\n      d.dispose();\n    }\n    this._disposables.clear();\n  }\n\n  public clear(): void {\n    for (const d of this._disposables) {\n      d.dispose();\n    }\n    this._disposables.clear();\n  }\n}\n\nexport abstract class Disposable implements IDisposable {\n  public static readonly None: IDisposable = Object.freeze({ dispose() { } });\n\n  protected readonly _store = new DisposableStore();\n\n  public dispose(): void {\n    this._store.dispose();\n  }\n\n  protected _register<T extends IDisposable>(o: T): T {\n    return this._store.add(o);\n  }\n}\n\nexport class MutableDisposable<T extends IDisposable> implements IDisposable {\n  private _value: T | undefined;\n  private _isDisposed = false;\n\n  public get value(): T | undefined {\n    return this._isDisposed ? undefined : this._value;\n  }\n\n  public set value(value: T | undefined) {\n    if (this._isDisposed || value === this._value) {\n      return;\n    }\n    this._value?.dispose();\n    this._value = value;\n  }\n\n  public clear(): void {\n    this.value = undefined;\n  }\n\n  public dispose(): void {\n    this._isDisposed = true;\n    this._value?.dispose();\n    this._value = undefined;\n  }\n}\n", "/**\n * Copyright (c) 2024-2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Minimal event utilities for xterm.js core.\n * Simplified from VS Code's event.ts - no leak detection/profiling.\n */\n\nimport { IDisposable, DisposableStore, toDisposable } from './Lifecycle';\n\nexport interface IEvent<T> {\n  (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore): IDisposable;\n}\n\nexport class Emitter<T> {\n  private _listeners: { fn: (e: T) => any, thisArgs: any }[] = [];\n  private _disposed = false;\n  private _event: IEvent<T> | undefined;\n\n  public get event(): IEvent<T> {\n    if (this._event) {\n      return this._event;\n    }\n    this._event = (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      if (this._disposed) {\n        return toDisposable(() => {});\n      }\n\n      const entry = { fn: listener, thisArgs };\n      this._listeners = this._listeners.slice();\n      this._listeners.push(entry);\n\n      const result = toDisposable(() => {\n        const idx = this._listeners.indexOf(entry);\n        if (idx !== -1) {\n          this._listeners = this._listeners.slice();\n          this._listeners.splice(idx, 1);\n        }\n      });\n\n      if (disposables) {\n        if (Array.isArray(disposables)) {\n          disposables.push(result);\n        } else {\n          disposables.add(result);\n        }\n      }\n\n      return result;\n    };\n    return this._event;\n  }\n\n  public fire(event: T): void {\n    if (this._disposed || !this._listeners.length) {\n      return;\n    }\n    if (this._listeners.length === 1) {\n      this._listeners[0].fn.call(this._listeners[0].thisArgs, event);\n      return;\n    }\n    const listeners = this._listeners;\n    for (let i = 0, len = listeners.length; i < len; ++i) {\n      listeners[i].fn.call(listeners[i].thisArgs, event);\n    }\n  }\n\n  public dispose(): void {\n    if (this._disposed) {\n      return;\n    }\n    this._disposed = true;\n    this._listeners.length = 0;\n  }\n}\n\nexport namespace EventUtils {\n  export function forward<T>(from: IEvent<T>, to: Emitter<T>): IDisposable {\n    return from(e => to.fire(e));\n  }\n\n  export function map<I, O>(event: IEvent<I>, map: (i: I) => O): IEvent<O> {\n    return (listener: (e: O) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      return event(i => listener.call(thisArgs, map(i)), undefined, disposables);\n    };\n  }\n\n  export function any<T>(...events: IEvent<T>[]): IEvent<T>;\n  export function any(...events: IEvent<any>[]): IEvent<void>;\n  export function any<T>(...events: IEvent<T>[]): IEvent<T> {\n    return (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      const store = new DisposableStore();\n      for (const event of events) {\n        store.add(event(e => listener.call(thisArgs, e)));\n      }\n      if (disposables) {\n        if (Array.isArray(disposables)) {\n          disposables.push(store);\n        } else {\n          disposables.add(store);\n        }\n      }\n      return store;\n    };\n  }\n\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T) => void, initial: T): IDisposable;\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T | undefined) => void): IDisposable;\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T | undefined) => void, initial?: T): IDisposable {\n    handler(initial);\n    return event(e => handler(e));\n  }\n}\n", "/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { toRGBA8888 } from 'sixel/lib/Colors';\nimport { IDisposable } from '@xterm/xterm';\nimport { ICellSize, ImageLayer, ITerminalExt, IImageSpec, IRenderDimensions, IRenderService } from './Types';\nimport { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';\n\nconst enum Constants {\n  PLACEHOLDER_LENGTH = 4096,\n  PLACEHOLDER_HEIGHT = 24\n}\n\n/**\n * ImageRenderer - terminal frontend extension:\n * - provide primitives for canvas, ImageData, Bitmap (static)\n * - add canvas layer to DOM (browser only for now)\n * - draw image tiles onRender\n */\nexport class ImageRenderer extends Disposable implements IDisposable {\n  /** @deprecated Kept for backward compat \u2014 points to top layer canvas. */\n  public get canvas(): HTMLCanvasElement | undefined { return this._layers.get('top')?.canvas; }\n  private _layers = new Map<ImageLayer, CanvasRenderingContext2D>();\n  private _placeholder: HTMLCanvasElement | undefined;\n  private _placeholderBitmap: ImageBitmap | undefined;\n  private _optionsRefresh = this._register(new MutableDisposable());\n  private _oldOpen: ((parent: HTMLElement) => void) | undefined;\n  private _renderService: IRenderService | undefined;\n  private _oldSetRenderer: ((renderer: any) => void) | undefined;\n\n  // drawing primitive - canvas\n  public static createCanvas(localDocument: Document | undefined, width: number, height: number): HTMLCanvasElement {\n    /**\n     * NOTE: We normally dont care, from which document the canvas\n     * gets created, so we can fall back to global document,\n     * if the terminal has no document associated yet.\n     * This way early image loads before calling .open keep working\n     * (still discouraged though, as the metrics will be screwed up).\n     * Only the DOM output canvas should be on the terminal's document,\n     * which gets explicitly checked in `insertLayerToDom`.\n     */\n    const canvas = (localDocument ?? document).createElement('canvas');\n    canvas.width = width | 0;\n    canvas.height = height | 0;\n    return canvas;\n  }\n\n  // drawing primitive - ImageData with optional buffer\n  public static createImageData(ctx: CanvasRenderingContext2D, width: number, height: number, buffer?: ArrayBuffer): ImageData {\n    if (typeof ImageData !== 'function') {\n      const imgData = ctx.createImageData(width, height);\n      if (buffer) {\n        imgData.data.set(new Uint8ClampedArray(buffer, 0, width * height * 4));\n      }\n      return imgData;\n    }\n    return buffer\n      ? new ImageData(new Uint8ClampedArray(buffer, 0, width * height * 4), width, height)\n      : new ImageData(width, height);\n  }\n\n  // drawing primitive - ImageBitmap\n  public static createImageBitmap(img: ImageBitmapSource): Promise<ImageBitmap | undefined> {\n    if (typeof createImageBitmap !== 'function') {\n      return Promise.resolve(undefined);\n    }\n    return createImageBitmap(img);\n  }\n\n\n  constructor(private _terminal: ITerminalExt) {\n    super();\n    this._oldOpen = this._terminal._core.open;\n    this._terminal._core.open = (parent: HTMLElement): void => {\n      this._oldOpen?.call(this._terminal._core, parent);\n      this._open();\n    };\n    if (this._terminal._core.screenElement) {\n      this._open();\n    }\n    // hack to spot fontSize changes\n    this._optionsRefresh.value = this._terminal._core.optionsService.onOptionChange(option => {\n      if (option === 'fontSize') {\n        this.rescaleCanvas();\n        this._renderService?.refreshRows(0, this._terminal.rows);\n      }\n    });\n    this._register(toDisposable(() => {\n      this.removeLayerFromDom();\n      this.removeLayerFromDom('bottom');\n      if (this._terminal._core && this._oldOpen) {\n        this._terminal._core.open = this._oldOpen;\n        this._oldOpen = undefined;\n      }\n      if (this._renderService && this._oldSetRenderer) {\n        this._renderService.setRenderer = this._oldSetRenderer;\n        this._oldSetRenderer = undefined;\n      }\n      this._renderService = undefined;\n      this._layers.clear();\n      this._placeholderBitmap?.close();\n      this._placeholderBitmap = undefined;\n      this._placeholder = undefined;\n    }));\n  }\n\n  /**\n   * Enable the placeholder.\n   */\n  public showPlaceholder(value: boolean): void {\n    if (value) {\n      if (!this._placeholder && this.cellSize.height !== -1) {\n        this._createPlaceHolder(Math.max(this.cellSize.height + 1, Constants.PLACEHOLDER_HEIGHT));\n      }\n    } else {\n      this._placeholderBitmap?.close();\n      this._placeholderBitmap = undefined;\n      this._placeholder = undefined;\n    }\n    this._renderService?.refreshRows(0, this._terminal.rows);\n  }\n\n  /**\n   * Dimensions of the terminal.\n   * Forwarded from internal render service.\n   */\n  public get dimensions(): IRenderDimensions | undefined {\n    return this._terminal.dimensions;\n  }\n\n  /**\n   * Current cell size (float).\n   */\n  public get cellSize(): ICellSize {\n    return {\n      width: this.dimensions?.css.cell.width || -1,\n      height: this.dimensions?.css.cell.height || -1\n    };\n  }\n\n  /**\n   * Clear a region of the image layer canvas.\n   */\n  public clearLines(start: number, end: number, layer?: ImageLayer): void {\n    const y = start * (this.dimensions?.css.cell.height || 0);\n    const w = this.dimensions?.css.canvas.width || 0;\n    const h = (end + 1 - start) * (this.dimensions?.css.cell.height || 0);\n    if (!layer || layer === 'top') {\n      this._layers.get('top')?.clearRect(0, y, w, h);\n    }\n    if (!layer || layer === 'bottom') {\n      this._layers.get('bottom')?.clearRect(0, y, w, h);\n    }\n  }\n\n  /**\n   * Clear whole image canvas.\n   */\n  public clearAll(layer?: ImageLayer): void {\n    if (!layer || layer === 'top') {\n      const ctx = this._layers.get('top');\n      ctx?.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);\n    }\n    if (!layer || layer === 'bottom') {\n      const ctx = this._layers.get('bottom');\n      ctx?.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);\n    }\n  }\n\n  /**\n   * Draw neighboring tiles on the image layer canvas.\n   */\n  public draw(imgSpec: IImageSpec, tileId: number, col: number, row: number, count: number = 1): void {\n    const ctx = this._layers.get(imgSpec.layer);\n    if (!ctx) {\n      return;\n    }\n    const { width, height } = this.cellSize;\n\n    // Don't try to draw anything, if we cannot get valid renderer metrics.\n    if (width === -1 || height === -1) {\n      return;\n    }\n\n    this._rescaleImage(imgSpec, width, height);\n    const img = imgSpec.actual!;\n    const cols = Math.ceil(img.width / width);\n\n    const sx = (tileId % cols) * width;\n    const sy = Math.floor(tileId / cols) * height;\n    const dx = col * width;\n    const dy = row * height;\n\n    // safari bug: never access image source out of bounds\n    const finalWidth = count * width + sx > img.width ? img.width - sx : count * width;\n    const finalHeight = sy + height > img.height ? img.height - sy : height;\n\n    // Floor all pixel offsets to get stable tile mapping without any overflows.\n    // Note: For not pixel perfect aligned cells like in the DOM renderer\n    // this will move a tile slightly to the top/left (subpixel range, thus ignore it).\n    // FIX #34: avoid striping on displays with pixelDeviceRatio != 1 by ceiling height and width\n    ctx.drawImage(\n      img,\n      Math.floor(sx), Math.floor(sy), Math.ceil(finalWidth), Math.ceil(finalHeight),\n      Math.floor(dx), Math.floor(dy), Math.ceil(finalWidth), Math.ceil(finalHeight)\n    );\n  }\n\n  /**\n   * Extract a single tile from an image.\n   */\n  public extractTile(imgSpec: IImageSpec, tileId: number): HTMLCanvasElement | undefined {\n    const { width, height } = this.cellSize;\n    // Don't try to draw anything, if we cannot get valid renderer metrics.\n    if (width === -1 || height === -1) {\n      return;\n    }\n    this._rescaleImage(imgSpec, width, height);\n    const img = imgSpec.actual!;\n    const cols = Math.ceil(img.width / width);\n    const sx = (tileId % cols) * width;\n    const sy = Math.floor(tileId / cols) * height;\n    const finalWidth = width + sx > img.width ? img.width - sx : width;\n    const finalHeight = sy + height > img.height ? img.height - sy : height;\n\n    const canvas = ImageRenderer.createCanvas(this.document, finalWidth, finalHeight);\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      ctx.drawImage(\n        img,\n        Math.floor(sx), Math.floor(sy), Math.floor(finalWidth), Math.floor(finalHeight),\n        0, 0, Math.floor(finalWidth), Math.floor(finalHeight)\n      );\n      return canvas;\n    }\n  }\n\n  /**\n   * Draw a line with placeholder on the image layer canvas.\n   */\n  public drawPlaceholder(col: number, row: number, count: number = 1): void {\n    const ctx = this._layers.get('top');\n    if (ctx) {\n      const { width, height } = this.cellSize;\n\n      // Don't try to draw anything, if we cannot get valid renderer metrics.\n      if (width === -1 || height === -1) {\n        return;\n      }\n\n      if (!this._placeholder) {\n        this._createPlaceHolder(Math.max(height + 1, Constants.PLACEHOLDER_HEIGHT));\n      } else if (height >= this._placeholder!.height) {\n        this._createPlaceHolder(height + 1);\n      }\n      if (!this._placeholder) return;\n      ctx.drawImage(\n        this._placeholderBitmap ?? this._placeholder!,\n        col * width,\n        (row * height) % 2 ? 0 : 1,  // needs %2 offset correction\n        width * count,\n        height,\n        col * width,\n        row * height,\n        width * count,\n        height\n      );\n    }\n  }\n\n  /**\n   * Rescale image layer canvas if needed.\n   * Checked once from `ImageStorage.render`.\n   */\n  public rescaleCanvas(): void {\n    const w = this.dimensions?.css.canvas.width || 0;\n    const h = this.dimensions?.css.canvas.height || 0;\n    for (const ctx of this._layers.values()) {\n      if (ctx.canvas.width !== w || ctx.canvas.height !== h) {\n        ctx.canvas.width = w;\n        ctx.canvas.height = h;\n      }\n    }\n  }\n\n  /**\n   * Rescale image in storage if needed.\n   */\n  private _rescaleImage(spec: IImageSpec, currentWidth: number, currentHeight: number): void {\n    if (currentWidth === spec.actualCellSize.width && currentHeight === spec.actualCellSize.height) {\n      return;\n    }\n    const { width: originalWidth, height: originalHeight } = spec.origCellSize;\n    if (currentWidth === originalWidth && currentHeight === originalHeight) {\n      spec.actual = spec.orig;\n      spec.actualCellSize.width = originalWidth;\n      spec.actualCellSize.height = originalHeight;\n      return;\n    }\n    const canvas = ImageRenderer.createCanvas(\n      this.document,\n      Math.ceil(spec.orig!.width * currentWidth / originalWidth),\n      Math.ceil(spec.orig!.height * currentHeight / originalHeight)\n    );\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      ctx.drawImage(spec.orig!, 0, 0, canvas.width, canvas.height);\n      spec.actual = canvas;\n      spec.actualCellSize.width = currentWidth;\n      spec.actualCellSize.height = currentHeight;\n    }\n  }\n\n  /**\n   * Lazy init for the renderer.\n   */\n  private _open(): void {\n    this._renderService = this._terminal._core._renderService;\n    this._oldSetRenderer = this._renderService.setRenderer.bind(this._renderService);\n    this._renderService.setRenderer = (renderer: any) => {\n      for (const key of [...this._layers.keys()]) {\n        this.removeLayerFromDom(key);\n      }\n      this._oldSetRenderer?.call(this._renderService, renderer);\n    };\n  }\n\n  public insertLayerToDom(layer: ImageLayer = 'top'): void {\n    // make sure that the terminal is attached to a document and to DOM\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(layer)) {\n      return;\n    }\n    const canvas = ImageRenderer.createCanvas(\n      this.document, this.dimensions?.css.canvas.width || 0,\n      this.dimensions?.css.canvas.height || 0\n    );\n    canvas.classList.add(`xterm-image-layer-${layer}`);\n    const screenElement = this._terminal._core.screenElement;\n    // Use isolation to create a stacking context without overriding z-index,\n    // which would conflict with integrators (e.g. VS Code) that set their\n    // own z-index on the screen element.\n    screenElement.style.isolation = 'isolate';\n    if (layer === 'bottom') {\n      // Use z-index:-1 so it paints behind non-positioned text elements.\n      // The screen element needs to be a stacking context (via isolation)\n      // to contain the negative z-index, otherwise it would go behind the\n      // entire terminal.\n      canvas.style.zIndex = '-1';\n      screenElement.insertBefore(canvas, screenElement.firstChild);\n    } else {\n      // Explicit z-index ensures the image canvas reliably stacks above\n      // the text layer (DOM renderer rows). z-index: 0 is below the\n      // selection overlay (z-index: 1).\n      canvas.style.zIndex = '0';\n      screenElement.appendChild(canvas);\n    }\n    const ctx = canvas.getContext('2d', { alpha: true });\n    if (!ctx) {\n      canvas.remove();\n      return;\n    }\n    this._layers.set(layer, ctx);\n    this.clearAll(layer);\n  }\n\n  public removeLayerFromDom(layer: ImageLayer = 'top'): void {\n    const ctx = this._layers.get(layer);\n    if (ctx) {\n      ctx.canvas.remove();\n      this._layers.delete(layer);\n    }\n  }\n\n  public hasLayer(layer: ImageLayer): boolean {\n    return this._layers.has(layer);\n  }\n\n  private _createPlaceHolder(height: number = Constants.PLACEHOLDER_HEIGHT): void {\n    this._placeholderBitmap?.close();\n    this._placeholderBitmap = undefined;\n\n    // create blueprint to fill placeholder with\n    const bWidth = 32;  // must be 2^n\n    const blueprint = ImageRenderer.createCanvas(this.document, bWidth, height);\n    const ctx = blueprint.getContext('2d', { alpha: false });\n    if (!ctx) return;\n    const imgData = ImageRenderer.createImageData(ctx, bWidth, height);\n    const d32 = new Uint32Array(imgData.data.buffer);\n    const black = toRGBA8888(0, 0, 0);\n    const white = toRGBA8888(255, 255, 255);\n    d32.fill(black);\n    for (let y = 0; y < height; ++y) {\n      const shift = y % 2;\n      const offset = y * bWidth;\n      for (let x = 0; x < bWidth; x += 2) {\n        d32[offset + x + shift] = white;\n      }\n    }\n    ctx.putImageData(imgData, 0, 0);\n\n    // create placeholder line, width aligned to blueprint width\n    const width = (screen.width + bWidth - 1) & ~(bWidth - 1) || Constants.PLACEHOLDER_LENGTH;\n    this._placeholder = ImageRenderer.createCanvas(this.document, width, height);\n    const ctx2 = this._placeholder.getContext('2d', { alpha: false });\n    if (!ctx2) {\n      this._placeholder = undefined;\n      return;\n    }\n    for (let i = 0; i < width; i += bWidth) {\n      ctx2.drawImage(blueprint, i, 0);\n    }\n    ImageRenderer.createImageBitmap(this._placeholder).then(bitmap => this._placeholderBitmap = bitmap);\n  }\n\n  public get document(): Document | undefined {\n    return this._terminal._core._coreBrowserService?.window.document;\n  }\n}\n", "/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { ImageRenderer } from './ImageRenderer';\nimport {\n  ITerminalExt, IExtendedAttrsImage, IImageAddonOptions, IImageSpec,\n  IBufferLineExt, BgFlags, Cell, Content, ICellSize, ExtFlags, Attributes,\n  UnderlineStyle, IAddImageOpts\n} from './Types';\n\n\n// fallback default cell size\nexport const CELL_SIZE_DEFAULT: ICellSize = {\n  width: 7,\n  height: 14\n};\n\n/**\n * Extend extended attribute to also hold image tile information.\n *\n * Object definition is copied from base repo to fully mimick its behavior.\n * Image data is added as additional public properties `imageId` and `tileId`.\n */\nclass ExtendedAttrsImage implements IExtendedAttrsImage {\n  private _ext: number = 0;\n  public get ext(): number {\n    if (this._urlId) {\n      return (\n        (this._ext & ~ExtFlags.UNDERLINE_STYLE) |\n        (this.underlineStyle << 26)\n      );\n    }\n    return this._ext;\n  }\n  public set ext(value: number) { this._ext = value; }\n\n  public get underlineStyle(): UnderlineStyle {\n    // Always return the URL style if it has one\n    if (this._urlId) {\n      return UnderlineStyle.DASHED;\n    }\n    return (this._ext & ExtFlags.UNDERLINE_STYLE) >> 26;\n  }\n  public set underlineStyle(value: UnderlineStyle) {\n    this._ext &= ~ExtFlags.UNDERLINE_STYLE;\n    this._ext |= (value << 26) & ExtFlags.UNDERLINE_STYLE;\n  }\n\n  public get underlineColor(): number {\n    return this._ext & (Attributes.CM_MASK | Attributes.RGB_MASK);\n  }\n  public set underlineColor(value: number) {\n    this._ext &= ~(Attributes.CM_MASK | Attributes.RGB_MASK);\n    this._ext |= value & (Attributes.CM_MASK | Attributes.RGB_MASK);\n  }\n\n  public get underlineVariantOffset(): number {\n    const val = (this._ext & ExtFlags.VARIANT_OFFSET) >> 29;\n    if (val < 0) {\n      return val ^ 0xFFFFFFF8;\n    }\n    return val;\n  }\n  public set underlineVariantOffset(value: number) {\n    this._ext &= ~ExtFlags.VARIANT_OFFSET;\n    this._ext |= (value << 29) & ExtFlags.VARIANT_OFFSET;\n  }\n\n  private _urlId: number = 0;\n  public get urlId(): number {\n    return this._urlId;\n  }\n  public set urlId(value: number) {\n    this._urlId = value;\n  }\n\n  constructor(\n    ext: number = 0,\n    urlId: number = 0,\n    public imageId = -1,\n    public tileId = -1\n  ) {\n    this._ext = ext;\n    this._urlId = urlId;\n  }\n\n  public clone(): IExtendedAttrsImage {\n    /**\n     * Technically we dont need a clone variant of ExtendedAttrsImage,\n     * as we never clone a cell holding image data.\n     * Note: Clone is only meant to be used by the InputHandler for\n     * sticky attributes, which is never the case for image data.\n     * We still provide a proper clone method to reflect the full ext attr\n     * state in case there are future use cases for clone.\n     */\n    return new ExtendedAttrsImage(this._ext, this._urlId, this.imageId, this.tileId);\n  }\n\n  public isEmpty(): boolean {\n    return this.underlineStyle === UnderlineStyle.NONE && this._urlId === 0 && this.imageId === -1;\n  }\n}\nconst EMPTY_ATTRS = new ExtendedAttrsImage();\n\n\n/**\n * ImageStorage - extension of CoreTerminal:\n * - hold image data\n * - write/read image data to/from buffer\n *\n * TODO: image composition for overwrites\n */\nexport class ImageStorage implements IDisposable {\n  // storage\n  private _images: Map<number, IImageSpec> = new Map();\n  // last used id\n  private _lastId = 0;\n  // last evicted id\n  private _lowestId = 0;\n  // whether a full clear happened before\n  private _fullyCleared = false;\n  // whether render should do a full clear\n  private _needsFullClear = false;\n  // hard limit of stored pixels (fallback limit of 10 MB)\n  private _pixelLimit: number = 2500000;\n\n  private _viewportMetrics: { cols: number, rows: number };\n  public onImageAdded: (() => void) | undefined;\n  public onImageDeleted: ((storageId: number) => void) | undefined;\n\n  constructor(\n    private _terminal: ITerminalExt,\n    private _renderer: ImageRenderer,\n    private _opts: IImageAddonOptions\n  ) {\n    try {\n      this.setLimit(this._opts.storageLimit);\n    } catch (e: unknown) {\n      if (e instanceof Error) {\n        console.error(e.message);\n      }\n      console.warn(`storageLimit is set to ${this.getLimit()} MB`);\n    }\n    this._viewportMetrics = {\n      cols: this._terminal.cols,\n      rows: this._terminal.rows\n    };\n  }\n\n  public dispose(): void {\n    this.reset();\n  }\n\n  public reset(): void {\n    for (const spec of this._images.values()) {\n      spec.marker?.dispose();\n    }\n    // NOTE: marker.dispose above already calls ImageBitmap.close\n    // therefore we can just wipe the map here\n    this._images.clear();\n    this._renderer.clearAll();\n  }\n\n  public getLimit(): number {\n    return this._pixelLimit * 4 / 1000000;\n  }\n\n  public setLimit(value: number): void {\n    if (value < 0.5 || value > 1000) {\n      throw RangeError('invalid storageLimit, should be at least 0.5 MB and not exceed 1G');\n    }\n    this._pixelLimit = (value / 4 * 1000000) >>> 0;\n    this._evictOldest(0);\n  }\n\n  public getUsage(): number {\n    return this._getStoredPixels() * 4 / 1000000;\n  }\n\n  private _getStoredPixels(): number {\n    let storedPixels = 0;\n    for (const spec of this._images.values()) {\n      if (spec.orig) {\n        storedPixels += spec.orig.width * spec.orig.height;\n        if (spec.actual && spec.actual !== spec.orig) {\n          storedPixels += spec.actual.width * spec.actual.height;\n        }\n      }\n    }\n    return storedPixels;\n  }\n\n  private _delImg(id: number): void {\n    const spec = this._images.get(id);\n    if (!spec) return;\n    this._images.delete(id);\n    // FIXME: really ugly workaround to get bitmaps deallocated :(\n    if (window.ImageBitmap && spec.orig instanceof ImageBitmap) {\n      spec.orig.close();\n    }\n    this.onImageDeleted?.(id);\n  }\n\n  /**\n   * Wipe canvas and images on alternate buffer.\n   */\n  public wipeAlternate(): void {\n    // remove all alternate tagged images\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.bufferType === 'alternate') {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n    // mark canvas to be wiped on next render\n    this._needsFullClear = true;\n    this._fullyCleared = false;\n  }\n\n  /**\n   * Delete an image by its internal storage ID.\n   * Used by protocols that support explicit deletion (e.g. Kitty a=d).\n   */\n  public deleteImage(id: number): void {\n    const spec = this._images.get(id);\n    if (spec) {\n      spec.marker?.dispose();\n      this._delImg(id);\n    }\n  }\n\n  /**\n   * Method to add an image to the storage.\n   * @param img - The image to add (canvas or bitmap).\n   * @param opts - Options for addImage:\n   *   - scrolling:  When true, cursor advances with the image.\n   *                 When false, image is placed at ORIGIN and cursor does not move.\n   *   - layer:      Which canvas layer to render on ('top' or 'bottom').\n   *   - zIndex:     Z-index for image layering within the same layer.\n   *   - cursorPos:  'vt340' for bottom-left, 'iip' for bottom.right.\n   * @returns The internal image ID assigned to the stored image.\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap, opts: IAddImageOpts): number {\n    // never allow storage to exceed memory limit\n    this._evictOldest(img.width * img.height);\n\n    // calc rows x cols needed to display the image\n    let cellSize = this._renderer.cellSize;\n    if (cellSize.width === -1 || cellSize.height === -1) {\n      cellSize = CELL_SIZE_DEFAULT;\n    }\n    const cols = Math.ceil(img.width / cellSize.width);\n    const rows = Math.ceil(img.height / cellSize.height);\n\n    const imageId = ++this._lastId;\n\n    const buffer = this._terminal._core.buffer;\n    const termCols = this._terminal.cols;\n    const termRows = this._terminal.rows;\n    const originX = buffer.x;\n    const originY = buffer.y;\n    let offset = originX;\n    let tileCount = 0;\n\n    if (!opts.scrolling) {\n      buffer.x = 0;\n      buffer.y = 0;\n      offset = 0;\n    }\n\n    this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);\n    for (let row = 0; row < rows; ++row) {\n      const line = buffer.lines.get(buffer.y + buffer.ybase);\n      for (let col = 0; col < cols; ++col) {\n        if (offset + col >= termCols) break;\n        this._writeToCell(line as IBufferLineExt, offset + col, imageId, row * cols + col);\n        tileCount++;\n      }\n      if (opts.scrolling) {\n        if (row < rows - 1) this._terminal._core._inputHandler.lineFeed();\n      } else {\n        if (++buffer.y >= termRows) break;\n      }\n      buffer.x = offset;\n    }\n    this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);\n\n    // cursor positioning modes\n    if (opts.scrolling) {\n      if (opts.cursorPos === 'iip') {\n        buffer.x = Math.min(offset + cols, termCols);\n      } else {\n        buffer.x = offset;\n      }\n    } else {\n      buffer.x = originX;\n      buffer.y = originY;\n    }\n\n    // deleted images with zero tile count\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.tileCount < 1) {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n\n    // eviction marker:\n    // delete the image when the marker gets disposed\n    const endMarker = this._terminal.registerMarker(0);\n    endMarker?.onDispose(() => {\n      const spec = this._images.get(imageId);\n      if (spec) {\n        this._delImg(imageId);\n      }\n    });\n\n    // since markers do not work on alternate for some reason,\n    // we evict images here manually\n    if (this._terminal.buffer.active.type === 'alternate') {\n      this._evictOnAlternate();\n    }\n\n    // create storage entry\n    const imgSpec: IImageSpec = {\n      orig: img,\n      origCellSize: cellSize,\n      actual: img,\n      actualCellSize: { ...cellSize },  // clone needed, since later modified\n      marker: endMarker || undefined,\n      tileCount,\n      bufferType: this._terminal.buffer.active.type,\n      layer: opts.layer,\n      zIndex: opts.zIndex\n    };\n\n    // finally add the image\n    this._images.set(imageId, imgSpec);\n    this.onImageAdded?.();\n    return imageId;\n  }\n\n\n  /**\n   * Render method. Collects buffer information and triggers\n   * canvas updates.\n   */\n  // TODO: Should we move this to the ImageRenderer?\n  public render(range: { start: number, end: number }): void {\n    // Determine which layers have images\n    let hasTopImages = false;\n    let hasBottomImages = false;\n    for (const spec of this._images.values()) {\n      if (spec.layer === 'bottom') {\n        hasBottomImages = true;\n      } else {\n        hasTopImages = true;\n      }\n      if (hasTopImages && hasBottomImages) break;\n    }\n\n    // Lazily insert layers that are needed\n    if (hasTopImages && !this._renderer.hasLayer('top')) {\n      this._renderer.insertLayerToDom('top');\n      if (!this._renderer.hasLayer('top')) return;\n    }\n    if (hasBottomImages && !this._renderer.hasLayer('bottom')) {\n      this._renderer.insertLayerToDom('bottom');\n    }\n\n    // rescale if needed\n    this._renderer.rescaleCanvas();\n\n    // exit early if we dont have any images to test for\n    if (!this._images.size) {\n      if (!this._fullyCleared) {\n        this._renderer.clearAll();\n        this._fullyCleared = true;\n        this._needsFullClear = false;\n      }\n      if (this._renderer.hasLayer('top')) {\n        this._renderer.removeLayerFromDom('top');\n      }\n      if (this._renderer.hasLayer('bottom')) {\n        this._renderer.removeLayerFromDom('bottom');\n      }\n      return;\n    }\n\n    // Remove layers no longer needed\n    if (!hasTopImages && this._renderer.hasLayer('top')) {\n      this._renderer.clearAll('top');\n      this._renderer.removeLayerFromDom('top');\n    }\n    if (!hasBottomImages && this._renderer.hasLayer('bottom')) {\n      this._renderer.clearAll('bottom');\n      this._renderer.removeLayerFromDom('bottom');\n    }\n\n    // buffer switches force a full clear\n    if (this._needsFullClear) {\n      this._renderer.clearAll();\n      this._fullyCleared = true;\n      this._needsFullClear = false;\n    }\n\n    const { start, end } = range;\n    const buffer = this._terminal._core.buffer;\n    const cols = this._terminal._core.cols;\n\n    // clear drawing area\n    this._renderer.clearLines(start, end);\n\n    // Collect draw calls so we can sort by z-index (lower z drawn first).\n    const drawCalls: { imgSpec: IImageSpec, tileId: number, col: number, row: number, count: number }[] = [];\n    const placeholderCalls: { col: number, row: number, count: number }[] = [];\n\n    // walk all cells in viewport and collect tiles found\n    for (let row = start; row <= end; ++row) {\n      const line = buffer.lines.get(row + buffer.ydisp) as IBufferLineExt;\n      if (!line) return;\n      for (let col = 0; col < cols; ++col) {\n        if (line.getBg(col) & BgFlags.HAS_EXTENDED) {\n          let e: IExtendedAttrsImage = line._extendedAttrs[col] ?? EMPTY_ATTRS;\n          const imageId = e.imageId;\n          if (imageId === undefined || imageId === -1) {\n            continue;\n          }\n          const imgSpec = this._images.get(imageId);\n          if (e.tileId !== -1) {\n            const startTile = e.tileId;\n            const startCol = col;\n            let count = 1;\n            /**\n             * merge tiles to the right into a single draw call, if:\n             * - not at end of line\n             * - cell has same image id\n             * - cell has consecutive tile id\n             */\n            while (\n              ++col < cols\n              && (line.getBg(col) & BgFlags.HAS_EXTENDED)\n              && (e = line._extendedAttrs[col] ?? EMPTY_ATTRS)\n              && (e.imageId === imageId)\n              && (e.tileId === startTile + count)\n            ) {\n              count++;\n            }\n            col--;\n            if (imgSpec) {\n              if (imgSpec.actual) {\n                drawCalls.push({ imgSpec, tileId: startTile, col: startCol, row, count });\n              }\n            } else if (this._opts.showPlaceholder) {\n              placeholderCalls.push({ col: startCol, row, count });\n            }\n            this._fullyCleared = false;\n          }\n        }\n      }\n    }\n\n    // Sort by z-index so lower z draws first (higher z renders on top)\n    drawCalls.sort((a, b) => a.imgSpec.zIndex - b.imgSpec.zIndex);\n\n    // Draw placeholders first (lowest priority)\n    for (const call of placeholderCalls) {\n      this._renderer.drawPlaceholder(call.col, call.row, call.count);\n    }\n\n    // Draw images in z-index order\n    for (const call of drawCalls) {\n      this._renderer.draw(call.imgSpec, call.tileId, call.col, call.row, call.count);\n    }\n  }\n\n  public viewportResize(metrics: { cols: number, rows: number }): void {\n    // exit early if we have nothing in storage\n    if (!this._images.size) {\n      this._viewportMetrics = metrics;\n      return;\n    }\n\n    // handle only viewport width enlargements, exit all other cases\n    // TODO: needs patch for tile counter\n    if (this._viewportMetrics.cols >= metrics.cols) {\n      this._viewportMetrics = metrics;\n      return;\n    }\n\n    // walk scrollbuffer at old col width to find all possible expansion matches\n    const buffer = this._terminal._core.buffer;\n    const rows = buffer.lines.length;\n    const oldCol = this._viewportMetrics.cols - 1;\n    for (let row = 0; row < rows; ++row) {\n      const line = buffer.lines.get(row) as IBufferLineExt;\n      if (line.getBg(oldCol) & BgFlags.HAS_EXTENDED) {\n        const e: IExtendedAttrsImage = line._extendedAttrs[oldCol] ?? EMPTY_ATTRS;\n        const imageId = e.imageId;\n        if (imageId === undefined || imageId === -1) {\n          continue;\n        }\n        const imgSpec = this._images.get(imageId);\n        if (!imgSpec) {\n          continue;\n        }\n        // found an image tile at oldCol, check if it qualifies for right exapansion\n        const tilesPerRow = Math.ceil((imgSpec.actual?.width || 0) / imgSpec.actualCellSize.width);\n        if ((e.tileId % tilesPerRow) + 1 >= tilesPerRow) {\n          continue;\n        }\n        // expand only if right side is empty (nothing got wrapped from below)\n        let hasData = false;\n        for (let rightCol = oldCol + 1; rightCol > metrics.cols; ++rightCol) {\n          if (line._data[rightCol * Cell.SIZE + Cell.CONTENT] & Content.HAS_CONTENT_MASK) {\n            hasData = true;\n            break;\n          }\n        }\n        if (hasData) {\n          continue;\n        }\n        // do right expansion on terminal buffer\n        const end = Math.min(metrics.cols, tilesPerRow - (e.tileId % tilesPerRow) + oldCol);\n        let lastTile = e.tileId;\n        for (let expandCol = oldCol + 1; expandCol < end; ++expandCol) {\n          this._writeToCell(line as IBufferLineExt, expandCol, imageId, ++lastTile);\n          imgSpec.tileCount++;\n        }\n      }\n    }\n    // store new viewport metrics\n    this._viewportMetrics = metrics;\n  }\n\n  /**\n   * Retrieve original canvas at buffer position.\n   */\n  public getImageAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    const buffer = this._terminal._core.buffer;\n    const line = buffer.lines.get(y) as IBufferLineExt;\n    if (line && line.getBg(x) & BgFlags.HAS_EXTENDED) {\n      const e: IExtendedAttrsImage = line._extendedAttrs[x] ?? EMPTY_ATTRS;\n      if (e.imageId && e.imageId !== -1) {\n        const orig = this._images.get(e.imageId)?.orig;\n        if (window.ImageBitmap && orig instanceof ImageBitmap) {\n          const canvas = ImageRenderer.createCanvas(window.document, orig.width, orig.height);\n          canvas.getContext('2d')?.drawImage(orig, 0, 0, orig.width, orig.height);\n          return canvas;\n        }\n        return orig as HTMLCanvasElement;\n      }\n    }\n  }\n\n  /**\n   * Extract active single tile at buffer position.\n   */\n  public extractTileAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    const buffer = this._terminal._core.buffer;\n    const line = buffer.lines.get(y) as IBufferLineExt;\n    if (line && line.getBg(x) & BgFlags.HAS_EXTENDED) {\n      const e: IExtendedAttrsImage = line._extendedAttrs[x] ?? EMPTY_ATTRS;\n      if (e.imageId && e.imageId !== -1 && e.tileId !== -1) {\n        const spec = this._images.get(e.imageId);\n        if (spec) {\n          return this._renderer.extractTile(spec, e.tileId);\n        }\n      }\n    }\n  }\n\n  // TODO: Do we need some blob offloading tricks here to avoid early eviction?\n  // also see https://stackoverflow.com/questions/28307789/is-there-any-limitation-on-javascript-max-blob-size\n  private _evictOldest(room: number): number {\n    const used = this._getStoredPixels();\n    let current = used;\n    while (this._pixelLimit < current + room && this._images.size) {\n      const spec = this._images.get(++this._lowestId);\n      if (spec && spec.orig) {\n        current -= spec.orig.width * spec.orig.height;\n        if (spec.actual && spec.orig !== spec.actual) {\n          current -= spec.actual.width * spec.actual.height;\n        }\n        spec.marker?.dispose();\n        this._delImg(this._lowestId);\n      }\n    }\n    return used - current;\n  }\n\n  private _writeToCell(line: IBufferLineExt, x: number, imageId: number, tileId: number): void {\n    if (line._data[x * Cell.SIZE + Cell.BG] & BgFlags.HAS_EXTENDED) {\n      const old = line._extendedAttrs[x];\n      if (old) {\n        if (old.imageId !== undefined) {\n          // found an old ExtendedAttrsImage, since we know that\n          // they are always isolated instances (single cell usage),\n          // we can re-use it and just update their id entries\n          const oldSpec = this._images.get(old.imageId);\n          if (oldSpec) {\n            // early eviction for in-viewport overwrites\n            oldSpec.tileCount--;\n          }\n          old.imageId = imageId;\n          old.tileId = tileId;\n          return;\n        }\n        // found a plain ExtendedAttrs instance, clone it to new entry\n        line._extendedAttrs[x] = new ExtendedAttrsImage(old.ext, old.urlId, imageId, tileId);\n        return;\n      }\n    }\n    // fall-through: always create new ExtendedAttrsImage entry\n    line._data[x * Cell.SIZE + Cell.BG] |= BgFlags.HAS_EXTENDED;\n    line._extendedAttrs[x] = new ExtendedAttrsImage(0, 0, imageId, tileId);\n  }\n\n  private _evictOnAlternate(): void {\n    // nullify tile count of all images on alternate buffer\n    for (const spec of this._images.values()) {\n      if (spec.bufferType === 'alternate') {\n        spec.tileCount = 0;\n      }\n    }\n    // re-count tiles on whole buffer\n    const buffer = this._terminal._core.buffer;\n    for (let y = 0; y < this._terminal.rows; ++y) {\n      const line = buffer.lines.get(y) as IBufferLineExt;\n      if (!line) {\n        continue;\n      }\n      for (let x = 0; x < this._terminal.cols; ++x) {\n        if (line._data[x * Cell.SIZE + Cell.BG] & BgFlags.HAS_EXTENDED) {\n          const imgId = line._extendedAttrs[x]?.imageId;\n          if (imgId) {\n            const spec = this._images.get(imgId);\n            if (spec) {\n              spec.tileCount++;\n            }\n          }\n        }\n      }\n    }\n    // deleted images with zero tile count\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.bufferType === 'alternate' && !spec.tileCount) {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n  }\n}\n", "/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nimport { IImageAddonOptions, IOscHandler, IResetHandler, ITerminalExt } from './Types';\nimport { ImageRenderer } from './ImageRenderer';\nimport { IIPImageStorage } from './IIPImageStorage';\nimport { CELL_SIZE_DEFAULT } from './ImageStorage';\nimport Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\nimport QoiDecoder from 'xterm-wasm-parts/lib/qoi/QoiDecoder.wasm';\nimport { HeaderParser, IHeaderFields, HeaderState, SequenceType } from './IIPHeaderParser';\nimport { imageType, UNSUPPORTED_TYPE } from './IIPMetrics';\n\n// Local const enum mirror - esbuild can't inline const enums from external packages\nconst enum DecoderConst {\n  // Limit held memory in base64 decoder (encoded bytes).\n  KEEP_DATA = 4194304,\n  // Initial buffer allocation for the decoder.\n  INITIAL_DATA = 1048576,\n  // Local mirror of const enum (esbuild can't inline const enums from external packages)\n  OK = 0\n}\n\n// default IIP header values\nconst DEFAULT_HEADER: IHeaderFields = {\n  type: SequenceType.INVALID,\n  name: 'Unnamed file',\n  size: 0,\n  width: 'auto',\n  height: 'auto',\n  preserveAspectRatio: 1,\n  inline: 0\n};\n\n\nexport class IIPHandler implements IOscHandler, IResetHandler {\n  private _aborted = false;\n  private _hp = new HeaderParser();\n  private _header: IHeaderFields = DEFAULT_HEADER;\n  private _dec: Base64Decoder;\n  private _qoiDec: QoiDecoder;\n  private _isMultipart = false;\n  private _abortMulti = false;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _storage: IIPImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    const maxEncodedBytes = Math.ceil(this._opts.iipSizeLimit * 4 / 3);\n    const initialBytes = Math.min(DecoderConst.INITIAL_DATA, maxEncodedBytes);\n    this._dec = new Base64Decoder(DecoderConst.KEEP_DATA, maxEncodedBytes, initialBytes);\n    this._qoiDec = new QoiDecoder(DecoderConst.KEEP_DATA);\n  }\n\n  public reset(): void {\n    this._hp.reset();\n    this._dec.release();\n    this._qoiDec.release();\n  }\n\n  public start(): void {\n    this._aborted = false;\n    this._hp.reset();\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    if (this._hp.state === HeaderState.END) {\n      if ((this._dec.put(data.subarray(start, end)) as number) !== DecoderConst.OK) {\n        this._dec.release();\n        this._aborted = true;\n      }\n    } else {\n      const dataPos = this._hp.parse(data, start, end);\n      if (dataPos === -1) {\n        this._aborted = true;\n        return;\n      }\n      if (dataPos > 0) {\n        const seqType = this._hp.fields.type;\n        if (seqType === SequenceType.FILE) {\n          if (this._isMultipart) {\n            this._isMultipart = false;\n            this._abortMulti = false;\n            this._dec.release();\n          }\n          this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);\n          if (!this._header.inline) {\n            this._aborted = true;\n            return;\n          }\n          this._dec.init();\n        } else if (this._abortMulti) {\n          this._aborted = true;\n          return;\n        }\n        if ((this._dec.put(data.subarray(dataPos, end)) as number) !== DecoderConst.OK) {\n          this._dec.release();\n          this._aborted = true;\n          if (this._isMultipart) this._abortMulti = true;\n        }\n      }\n    }\n  }\n\n  public end(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted) return true;\n\n    if (this._hp.state !== HeaderState.END) {\n      if (this._hp.end()) return true;\n    }\n    const seqType = this._hp.fields.type;\n\n    if (seqType === SequenceType.FILEPART) return true;\n\n    if (seqType === SequenceType.REPORTCELLSIZE) {\n      // OSC 1337 ; ReportCellSize=[height];[width];[scale] ST\n      let w = CELL_SIZE_DEFAULT.width;\n      let h = CELL_SIZE_DEFAULT.height;\n      if (this._renderer.dimensions) {\n        w = this._renderer.dimensions.css.canvas.width / this._coreTerminal.cols;\n        h = this._renderer.dimensions.css.canvas.height / this._coreTerminal.rows;\n      }\n      const scale = this._coreTerminal._core._coreBrowserService?.dpr ?? 1;\n      const report = `\\x1b]1337;ReportCellSize=${h.toFixed(3)};${w.toFixed(3)};${scale.toFixed(3)}\\x1b\\\\`;\n      this._coreTerminal.input(report, false);\n      return true;\n    }\n\n    if (seqType === SequenceType.MULTIPARTFILE) {\n      this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);\n      this._isMultipart = true;\n      this._abortMulti = false;\n      this._dec.release();\n      this._dec.init();\n      return true;\n    }\n\n    if (seqType === SequenceType.FILEEND) {\n      if (!this._isMultipart) return true;\n      this._isMultipart = false;\n      if (this._abortMulti || this._header.type !== SequenceType.MULTIPARTFILE) return true;\n    }\n\n    // fallthrough for SequenceType.FILE & SequenceType.FILEEND\n\n    let w = 0;\n    let h = 0;\n\n    // early exit condition chain\n    let cond: number | boolean;\n    let metrics = UNSUPPORTED_TYPE;\n    if (cond = success) {\n      if (cond = !this._dec.end()) {\n        metrics = imageType(this._dec.data8);\n        if (cond = metrics.mime !== 'unsupported') {\n          w = metrics.width;\n          h = metrics.height;\n          if (cond = w && h && w * h < this._opts.pixelLimit) {\n            [w, h] = this._resize(w, h).map(Math.floor);\n            cond = w && h && w * h < this._opts.pixelLimit;\n          } else {\n            console.warn(`IIP: image dimension issue ${metrics.width}x${metrics.height}`);\n          }\n        } else {\n          console.warn('IIP: unsupported image type');\n        }\n      } else {\n        console.warn('IIP: error during BASE64 decoding');\n      }\n    }\n    if (!cond) {\n      this._dec.release();\n      return true;\n    }\n\n    let blob: Blob | ImageData;\n    if (metrics.mime === 'image/qoi') {\n      const data = this._qoiDec.decode(this._dec.data8);\n      blob = new ImageData(\n        new Uint8ClampedArray(data.buffer, data.byteOffset, data.byteLength),\n        this._qoiDec.width,\n        this._qoiDec.height\n      );\n      this._qoiDec.release();\n      if (w === this._qoiDec.width && h === this._qoiDec.height) {\n        // use fast-path if we don't need to rescale\n        this._dec.release();\n        const canvas = ImageRenderer.createCanvas(undefined, this._qoiDec.width, this._qoiDec.height);\n        canvas.getContext('2d')?.putImageData(blob, 0, 0);\n        this._storage.addImage(canvas);\n        return true;\n      }\n    } else {\n      blob = new Blob([this._dec.data8], { type: metrics.mime });\n    }\n    this._dec.release();\n    return createImageBitmap(blob, { resizeWidth: w, resizeHeight: h })\n      .then(bm => {\n        this._storage.addImage(bm);\n        return true;\n      })\n      .catch(e => {\n        console.warn(`IIP: decoding error ${metrics.mime} ${metrics.width}x${metrics.height}`, e);\n        return true;\n      });\n  }\n\n  private _resize(w: number, h: number): [number, number] {\n    const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;\n    const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;\n    const width = this._renderer.dimensions?.css.canvas.width || cw * this._coreTerminal.cols;\n    const height = this._renderer.dimensions?.css.canvas.height || ch * this._coreTerminal.rows;\n\n    const rw = this._dim(this._header.width!, width, cw);\n    const rh = this._dim(this._header.height!, height, ch);\n    if (!rw && !rh) {\n      const wf = width / w;         // TODO: should this respect initial cursor offset?\n      const hf = (height - ch) / h; // TODO: fix offset issues from float cell height\n      const f = Math.min(wf, hf);\n      return f < 1 ? [w * f, h * f] : [w, h];\n    }\n    return !rw\n      ? [w * rh / h, rh]\n      : this._header.preserveAspectRatio || !rw || !rh\n        ? [rw, h * rw / w] : [rw, rh];\n  }\n\n  private _dim(s: string, total: number, cdim: number): number {\n    if (s === 'auto') return 0;\n    if (s.endsWith('%')) return parseInt(s.slice(0, -1), 10) * total / 100;\n    if (s.endsWith('px')) return parseInt(s.slice(0, -2), 10);\n    return parseInt(s, 10) * cdim;\n  }\n}\n", "/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n// eslint-disable-next-line\ndeclare const Buffer: any;\n\nexport const enum HeaderState {\n  START = 0,\n  ABORT = 1,\n  KEY = 2,\n  VALUE = 3,\n  END = 4\n}\n\nexport const enum SequenceType {\n  INVALID = 0,\n  FILE = 1,\n  MULTIPARTFILE = 2,\n  FILEPART = 3,\n  FILEEND = 4,\n  REPORTCELLSIZE = 5\n}\n\nexport interface IHeaderFields {\n  [key: string]: number | string | Uint32Array | null | undefined;\n  // sequence type\n  type: SequenceType;\n  // base-64 encoded filename. Defaults to \"Unnamed file\".\n  name: string;\n  // File size in bytes. The file transfer will be canceled if this size is exceeded.\n  size: number;\n  /**\n   * Optional width and height to render:\n   * - N: N character cells.\n   * - Npx: N pixels.\n   * - N%: N percent of the session's width or height.\n   * - auto: The image's inherent size will be used to determine an appropriate dimension.\n   */\n  width?: string;\n  height?: string;\n  // Optional, defaults to 1 respecting aspect ratio (width takes precedence).\n  preserveAspectRatio?: number;\n  // Optional, defaults to 0. If set to 1, the file will be displayed inline, else downloaded\n  // (download not supported).\n  inline?: number;\n}\n\n// field value decoders\n\n// ASCII bytes to string\nfunction toStr(data: Uint32Array): string {\n  let s = '';\n  for (let i = 0; i < data.length; ++i) {\n    s += String.fromCharCode(data[i]);\n  }\n  return s;\n}\n\n// digits to integer\nfunction toInt(data: Uint32Array): number {\n  let v = 0;\n  for (let i = 0; i < data.length; ++i) {\n    if (data[i] < 48 || data[i] > 57) {\n      throw new Error('illegal char');\n    }\n    v = v * 10 + data[i] - 48;\n  }\n  return v;\n}\n\n// check for correct size entry\nfunction toSize(data: Uint32Array): string {\n  const v = toStr(data);\n  if (!v.match(/^((auto)|(\\d+?((px)|(%)){0,1}))$/)) {\n    throw new Error('illegal size');\n  }\n  return v;\n}\n\n// name is base64 encoded utf-8\nfunction toName(data: Uint32Array): string {\n  if (typeof Buffer !== 'undefined') {\n    return Buffer.from(toStr(data), 'base64').toString();\n  }\n  const bs = atob(toStr(data));\n  const b = new Uint8Array(bs.length);\n  for (let i = 0; i < b.length; ++i) {\n    b[i] = bs.charCodeAt(i);\n  }\n  return new TextDecoder().decode(b);\n}\n\nconst DECODERS: {[key: string]: (v: Uint32Array) => number | string} = {\n  inline: toInt,\n  size: toInt,\n  name: toName,\n  width: toSize,\n  height: toSize,\n  preserveAspectRatio: toInt\n};\n\n\n// sequence type markers\n// File\nconst FILE_MARKER = [70, 105, 108, 101];\n// MultipartFile\nconst MULTIPARTFILE_MARKER = [77, 117, 108, 116, 105, 112, 97, 114, 116, 70, 105, 108, 101];\n// FilePart\nconst FILEPART_MARKER = [70, 105, 108, 101, 80, 97, 114, 116];\n// FileEnd\nconst FILEEND_MARKER = [70, 105, 108, 101, 69, 110, 100];\n// ReportCellSize\nconst REPORTCELLSIZE_MARKER = [82, 101, 112, 111, 114, 116, 67, 101, 108, 108, 83, 105, 122, 101];\n\n// max allowed chars for sequence header\nconst MAX_FIELDCHARS = 1024;\n\n\nexport class HeaderParser {\n  public state: HeaderState = HeaderState.START;\n  private _buffer = new Uint32Array(MAX_FIELDCHARS);\n  private _position = 0;\n  private _key = '';\n  public fields: {[key: string]: number | string | Uint32Array | null | undefined} = {};\n\n  public reset(): void {\n    this._buffer.fill(0);\n    this.state = HeaderState.START;\n    this._position = 0;\n    this.fields = {};\n    this._key = '';\n  }\n\n  public end(): number {\n    if (this.state === HeaderState.START) {\n      if (this._position === FILEEND_MARKER.length) {\n        for (let k = 0; k < FILEEND_MARKER.length; ++k) {\n          if (this._buffer[k] !== FILEEND_MARKER[k]) return this._a();\n        }\n        this.fields['type'] = SequenceType.FILEEND;\n        this.state = HeaderState.END;\n        return 0;\n      }\n      if (this._position === REPORTCELLSIZE_MARKER.length) {\n        for (let k = 0; k < REPORTCELLSIZE_MARKER.length; ++k) {\n          if (this._buffer[k] !== REPORTCELLSIZE_MARKER[k]) return this._a();\n        }\n        this.fields['type'] = SequenceType.REPORTCELLSIZE;\n        this.state = HeaderState.END;\n        return 0;\n      }\n      return this._a();\n    }\n    if (this.state === HeaderState.END) return 0;\n    if (this.state === HeaderState.VALUE\n      && this.fields.type === SequenceType.MULTIPARTFILE\n    ) {\n      if (!this._storeValue(this._position)) return this._a();\n      this.state = HeaderState.END;\n      return 0;\n    }\n    return this._a();\n  }\n\n  public parse(data: Uint32Array, start: number, end: number): number {\n    let state = this.state;\n    let pos = this._position;\n    const buffer = this._buffer;\n    if (state === HeaderState.ABORT || state === HeaderState.END) return -1;\n    if (state === HeaderState.START && pos > 14) return -1;\n    for (let i = start; i < end; ++i) {\n      const c = data[i];\n      switch (c) {\n        case 59: // ;\n          if (!this._storeValue(pos)) return this._a();\n          state = HeaderState.KEY;\n          pos = 0;\n          break;\n        case 61: // =\n          if (state === HeaderState.START) {\n            if (buffer[0] === 70) {\n              // 'File' or 'FilePart'\n              let k = 0;\n              for (; k < FILE_MARKER.length; ++k) {\n                if (buffer[k] !== FILE_MARKER[k]) return this._a();\n              }\n              this.fields['type'] = SequenceType.FILE;\n              if (pos === FILEPART_MARKER.length) {\n                for (; k < FILEPART_MARKER.length; ++k) {\n                  if (buffer[k] !== FILEPART_MARKER[k]) return this._a();\n                }\n                this.fields['type'] = SequenceType.FILEPART;\n                this.state = HeaderState.END;\n                return i + 1;\n              }\n            } else if (buffer[0] === 77) {\n              // 'MultipartFile'\n              for (let k = 0; k < MULTIPARTFILE_MARKER.length; ++k) {\n                if (buffer[k] !== MULTIPARTFILE_MARKER[k]) return this._a();\n              }\n              this.fields['type'] = SequenceType.MULTIPARTFILE;\n            } else {\n              return this._a();\n            }\n            state = HeaderState.KEY;\n            pos = 0;\n          } else if (state === HeaderState.KEY) {\n            if (!this._storeKey(pos)) return this._a();\n            state = HeaderState.VALUE;\n            pos = 0;\n          } else if (state === HeaderState.VALUE) {\n            if (pos >= MAX_FIELDCHARS) return this._a();\n            buffer[pos++] = c;\n          }\n          break;\n        case 58: // :\n          if (state === HeaderState.VALUE) {\n            if (!this._storeValue(pos)) return this._a();\n          }\n          this.state = HeaderState.END;\n          return i + 1;\n        default:\n          if (pos >= MAX_FIELDCHARS) return this._a();\n          buffer[pos++] = c;\n      }\n    }\n    this.state = state;\n    this._position = pos;\n    return -2;\n  }\n\n  private _a(): number {\n    this.fields.type = SequenceType.INVALID;\n    this.state = HeaderState.ABORT;\n    return -1;\n  }\n\n  private _storeKey(pos: number): boolean {\n    const k = toStr(this._buffer.subarray(0, pos));\n    if (k) {\n      this._key = k;\n      this.fields[k] = null;\n      return true;\n    }\n    return false;\n  }\n\n  private _storeValue(pos: number): boolean {\n    if (this._key) {\n      try {\n        const v = this._buffer.slice(0, pos);\n        this.fields[this._key] = DECODERS[this._key] ? DECODERS[this._key](v) : v;\n      } catch {\n        return false;\n      }\n      return true;\n    }\n    return false;\n  }\n}\n", "/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n\nexport type ImageType = 'image/png' | 'image/jpeg' | 'image/gif' | 'image/qoi' | 'image/webp' | 'image/avif' | 'unsupported' | '';\n\nexport interface IMetrics {\n  mime: ImageType;\n  width: number;\n  height: number;\n}\n\nexport const UNSUPPORTED_TYPE: IMetrics = {\n  mime: 'unsupported',\n  width: 0,\n  height: 0\n};\n\nexport function imageType(d: Uint8Array): IMetrics {\n  if (d.length < 32) {\n    return UNSUPPORTED_TYPE;\n  }\n  const d32 = new Uint32Array(d.buffer, d.byteOffset, 8);\n  // PNG: 89 50 4E 47 0D 0A 1A 0A (8 first bytes == magic number for PNG)\n  // + first chunk must be IHDR\n  if (d32[0] === 0x474E5089 && d32[1] === 0x0A1A0A0D && d32[3] === 0x52444849) {\n    return {\n      mime: 'image/png',\n      width:  d[16] << 24 | d[17] << 16 | d[18] << 8 | d[19],\n      height: d[20] << 24 | d[21] << 16 | d[22] << 8 | d[23]\n    };\n  }\n  // JPEG: FF D8 FF\n  if (d[0] === 0xFF && d[1] === 0xD8 && d[2] === 0xFF) {\n    const [width, height] = jpgSize(d);\n    return { mime: 'image/jpeg', width, height };\n  }\n  // GIF: GIF87a or GIF89a\n  if (d32[0] === 0x38464947 && (d[4] === 0x37 || d[4] === 0x39) && d[5] === 0x61) {\n    return {\n      mime: 'image/gif',\n      width:  d[7] << 8 | d[6],\n      height: d[9] << 8 | d[8]\n    };\n  }\n  // QOI: qoif\n  if (d32[0] === 0x66696F71) {\n    return {\n      mime: 'image/qoi',\n      width:  d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7],\n      height: d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11]\n    };\n  }\n  // WEBP: RIFF | xxxx | WEBP | VP8x\n  if (d32[0] === 0x46464952 && d32[2] === 0x50424557 && (d32[3] & 0xFFFFFF) === 0x385056) {\n    switch (d[15]) {\n      case 0x58:  // Extended WebP VP8X --> \"X\"\n        return {\n          mime: 'image/webp',\n          width:  (d[24] | d[25] << 8 | d[26] << 16) + 1,\n          height: (d[27] | d[28] << 8 | d[29] << 16) + 1\n        };\n      case 0x4C:  // Lossless WebP VP8L --> \"L\"\n        if (d[20] !== 0x2f) return UNSUPPORTED_TYPE;\n        const dim = d[21] | d[22] << 8 | d[23] << 16 | d[24] << 24;\n        return {\n          mime: 'image/webp',\n          width:  (dim        & 0x3FFF) + 1,\n          height: (dim >>> 14 & 0x3FFF) + 1\n        };\n      case 0x20:  // Lossy WebP VP8  --> \" \"\n        if (d[23] !== 0x9d || d[24] !== 0x01 || d[25] !== 0x2a) return UNSUPPORTED_TYPE;\n        return {\n          mime: 'image/webp',\n          width:  (d[26] | d[27] << 8) & 0x3FFF,\n          height: (d[28] | d[29] << 8) & 0x3FFF\n        };\n    }\n    return UNSUPPORTED_TYPE;\n  }\n  // AVIF: Box size | ftyp | avif/avis\n  if (d32[1] === 0x70797466 && (d32[2] === 0x66697661 || d32[2] === 0x73697661)) {\n    let pos = -1;\n    // search for ispe box within first 1024 bytes\n    const limit = Math.min(d.length - 16, 1024);\n    for (let i = 8; i < limit; i++) {\n      // scan for ispe\n      if (d[i] === 0x69 && d[i + 1] === 0x73 && d[i + 2] === 0x70 && d[i + 3] === 0x65) {\n        pos = i;\n        break;\n      }\n    }\n    if (pos !== -1) {\n      // dimensions are in BE at +8 (width) at +12 (height)\n      const width =\n        d[pos +  8] << 24 |\n        d[pos +  9] << 16 |\n        d[pos + 10] <<  8 |\n        d[pos + 11];\n      const height =\n        d[pos + 12] << 24 |\n        d[pos + 13] << 16 |\n        d[pos + 14] <<  8 |\n        d[pos + 15];\n      if (width > 0 && height > 0) {\n        return { mime: 'image/avif', width, height };\n      }\n    }\n    return UNSUPPORTED_TYPE;\n  }\n  return UNSUPPORTED_TYPE;\n}\n\n\nfunction jpgSize(d: Uint8Array): [number, number] {\n  const len = d.length;\n  let i = 4;\n  let blockLength = d[i] << 8 | d[i + 1];\n  while (true) {\n    i += blockLength;\n    if (i >= len) {\n      // exhausted without size info\n      return [0, 0];\n    }\n    if (d[i] !== 0xFF) {\n      return [0, 0];\n    }\n    if (d[i + 1] === 0xC0 || d[i + 1] === 0xC2) {\n      if (i + 8 < len) {\n        return [\n          d[i + 7] << 8 | d[i + 8],\n          d[i + 5] << 8 | d[i + 6]\n        ];\n      }\n      return [0, 0];\n    }\n    i += 2;\n    blockLength = d[i] << 8 | d[i + 1];\n  }\n}\n", "/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { IApcHandler, IImageAddonOptions, IResetHandler, ITerminalExt, ImageLayer } from '../Types';\nimport { ImageRenderer } from '../ImageRenderer';\nimport { CELL_SIZE_DEFAULT } from '../ImageStorage';\nimport { KittyImageStorage } from './KittyImageStorage';\nimport Base64Decoder, { type DecodeStatus } from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\nimport {\n  KittyAction,\n  KittyFormat,\n  KittyCompression,\n  IKittyCommand,\n  IPendingTransmission,\n  IKittyImageData,\n  KittyPixelConstants,\n  parseKittyCommand\n} from './KittyGraphicsTypes';\n\nconst enum Constants {\n  // Memory limit for base64 decoder (4MB, same as IIPHandler)\n  DECODER_KEEP_DATA = 4194304,\n  DECODER_INITIAL_DATA = 4194304, // 4MB\n  // Local mirror of const enum (esbuild can't inline const enums from external packages)\n  DECODER_OK = 0,\n  // Maximum control data size\n  MAX_CONTROL_DATA_SIZE = 512,\n  // Semicolon codepoint\n  SEMICOLON = 0x3B\n}\n\nconst DECODER_OK = Constants.DECODER_OK as unknown as DecodeStatus.OK;\n\n// Kitty graphics protocol handler with streaming base64 decoding.\nexport class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDisposable {\n  private _aborted = false;\n  private _decodeError = false;\n\n  private _activeDecoder: Base64Decoder | null = null;\n  private readonly _maxEncodedBytes: number;\n  private readonly _initialEncodedBytes: number;\n\n  // Streaming related states\n\n  // True while receiving control data (before semicolon).\n  private _inControlData = true;\n\n  // Buffer for control data.\n  private _controlData = new Uint32Array(Constants.MAX_CONTROL_DATA_SIZE);\n  private _controlLength = 0;\n\n  // Pre-calculated encoded size limit\n  private _encodedSizeLimit = 0;\n  private _totalEncodedSize = 0;\n\n  // Parsed command. These are the control data before semicolon.\n  private _parsedCommand: IKittyCommand | null = null;\n\n  // Storage related states\n\n  private _pendingTransmissions: Map<number, IPendingTransmission> = new Map();\n  // Tracks the pending key of the most recently started chunked upload.\n  // Per spec, subsequent chunks only need m= (and optionally q=), without i=.\n  // When a chunk arrives with no i=, this key is used to find the pending upload.\n  private _lastPendingKey: number | undefined;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _kittyStorage: KittyImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    // Convert decoded size limit -> max encoded bytes.\n    this._maxEncodedBytes = Math.ceil(this._opts.kittySizeLimit * 4 / 3);\n    // ensure we preallocate more than configured limit while using 4mb initial size.\n    this._initialEncodedBytes = Math.min(Constants.DECODER_INITIAL_DATA, this._maxEncodedBytes);\n  }\n\n  public reset(): void {\n    this._cleanupAllPending();\n    if (this._activeDecoder) {\n      this._activeDecoder.release();\n      this._activeDecoder = null;\n    }\n    this._kittyStorage.reset();\n  }\n\n  public dispose(): void {\n    this.reset();\n  }\n\n  private _removePendingEntry(key: number): void {\n    this._pendingTransmissions.delete(key);\n    if (this._lastPendingKey === key) {\n      this._lastPendingKey = undefined;\n    }\n  }\n\n  private _cleanupAllPending(): void {\n    for (const pending of this._pendingTransmissions.values()) {\n      pending.decoder.release();\n    }\n    this._pendingTransmissions.clear();\n    this._lastPendingKey = undefined;\n  }\n\n  public start(): void {\n    this._aborted = false;\n    this._decodeError = false;\n    this._inControlData = true;\n    this._controlLength = 0;\n    this._parsedCommand = null;\n    // Pre-calculate encoded limit once: base64 is 4 bytes encoded \u2192 3 bytes decoded\n    this._encodedSizeLimit = this._maxEncodedBytes;\n    this._totalEncodedSize = 0;\n    this._activeDecoder = null;\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    if (!this._inControlData) {\n      this._streamPayload(data, start, end);\n    } else {\n      // Scan for semicolon\n      let controlEnd = end;\n      for (let i = start; i < end; i++) {\n        if (data[i] === Constants.SEMICOLON) {\n          this._inControlData = false;\n          controlEnd = i;\n          break;\n        }\n      }\n\n      // Copy control data\n      const copyLength = controlEnd - start;\n      if (this._controlLength + copyLength > Constants.MAX_CONTROL_DATA_SIZE) {\n        this._aborted = true;\n        return;\n      }\n      this._controlData.set(data.subarray(start, controlEnd), this._controlLength);\n      this._controlLength += copyLength;\n\n      if (!this._inControlData) {\n        // Found semicolon - parse control data early for validation\n        this._parsedCommand = parseKittyCommand(this._parseControlDataString());\n\n        // Early validation: i+I conflict\n        if (this._parsedCommand.id !== undefined && this._parsedCommand.imageNumber !== undefined) {\n          this._sendResponse(this._parsedCommand.id, 'EINVAL:cannot specify both i and I keys', this._parsedCommand.quiet ?? 0);\n          this._aborted = true;\n          return;\n        }\n\n        // Delete action doesn't need payload - skip streaming\n        if (this._parsedCommand.action === KittyAction.DELETE) {\n          return;\n        }\n\n        // Stream remaining as payload\n        const payloadStart = controlEnd + 1;\n        if (payloadStart < end) {\n          this._streamPayload(data, payloadStart, end);\n        }\n      }\n    }\n  }\n\n  // Stream payload bytes into the base64 decoder.\n  private _streamPayload(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    // Check size limit (compare encoded bytes against pre-calculated limit)\n    // Include cumulative size from pending transmission for multi-chunk images.\n    // Per spec, subsequent chunks may omit i=, so fall back to _lastPendingKey.\n    const pendingKey = this._parsedCommand?.id ?? this._lastPendingKey ?? 0;\n    const pending = this._pendingTransmissions.get(pendingKey);\n    const previousEncodedSize = pending?.totalEncodedSize ?? 0;\n    this._totalEncodedSize += end - start;\n    const cumulativeEncodedSize = previousEncodedSize + this._totalEncodedSize;\n    if (cumulativeEncodedSize > this._encodedSizeLimit) {\n      const decoderToRelease = this._activeDecoder ?? pending?.decoder;\n      if (decoderToRelease) {\n        decoderToRelease.release();\n      }\n      this._activeDecoder = null;\n      if (pending) {\n        this._removePendingEntry(pendingKey);\n      }\n      this._aborted = true;\n      return;\n    }\n\n    if (this._decodeError) return;\n\n    if (pending?.decoder && !this._activeDecoder) {\n      this._activeDecoder = pending.decoder;\n    }\n    if (!this._activeDecoder) {\n      this._activeDecoder = new Base64Decoder(Constants.DECODER_KEEP_DATA, this._maxEncodedBytes, this._initialEncodedBytes);\n      this._activeDecoder.init();\n    }\n\n    if (this._activeDecoder.put(data.subarray(start, end)) !== DECODER_OK) {\n      this._activeDecoder.release();\n      this._activeDecoder = null;\n      this._decodeError = true;\n      if (pending) {\n        this._removePendingEntry(pendingKey);\n      }\n    }\n  }\n\n  public end(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted || !success) {\n      if (this._activeDecoder) {\n        this._activeDecoder.release();\n        this._activeDecoder = null;\n      }\n      return true;\n    }\n\n    // No semicolon = no payload (delete, capability query)\n    if (this._inControlData) {\n      return this._handleNoPayloadCommand();\n    }\n\n    // Use command parsed early in put() - i+I already validated there\n    const cmd = this._parsedCommand!;\n\n    // Delete action was handled by skipping payload - just execute\n    if (cmd.action === KittyAction.DELETE) {\n      return this._handleDelete(cmd);\n    }\n\n    // Per spec, subsequent chunks may omit i=, so fall back to _lastPendingKey.\n    const pendingKey = cmd.id ?? this._lastPendingKey ?? 0;\n    const isMoreComing = cmd.more === 1;\n    const pending = this._pendingTransmissions.get(pendingKey);\n\n    if (isMoreComing) {\n      if (this._activeDecoder) {\n        if (pending) {\n          pending.totalEncodedSize += this._totalEncodedSize;\n          pending.decodeError = pending.decodeError || this._decodeError;\n        } else {\n          this._pendingTransmissions.set(pendingKey, {\n            cmd: { ...cmd },\n            decoder: this._activeDecoder,\n            totalEncodedSize: this._totalEncodedSize,\n            decodeError: this._decodeError\n          });\n        }\n        this._lastPendingKey = pendingKey;\n        this._activeDecoder = null;\n      }\n      return true;\n    }\n\n    // Final chunk received \u2014 clear the last pending key\n    if (pending) {\n      this._lastPendingKey = undefined;\n    }\n\n    let decodeError = this._decodeError;\n    let finalCmd = cmd;\n    let decoder = this._activeDecoder;\n\n    if (pending) {\n      finalCmd = pending.cmd;\n      decoder = pending.decoder;\n      decodeError = decodeError || pending.decodeError;\n      this._pendingTransmissions.delete(pendingKey);\n    }\n\n    let imageBytes = new Uint8Array(0);\n    if (decoder) {\n      if (decoder.end() !== DECODER_OK) {\n        decodeError = true;\n      }\n      imageBytes = decoder.data8;\n    }\n    this._activeDecoder = null;\n\n    // Handle command first \u2014 handlers create Blob/ImageData from imageBytes,\n    // which copies the data. Only then is it safe to release the decoder's\n    // wasm memory that imageBytes points into.\n    const result = this._handleCommandWithBytesAndCmd(finalCmd, imageBytes, decodeError);\n    if (decoder) {\n      decoder.release();\n    }\n    return result;\n  }\n\n  // Command handling\n\n  private _parseControlDataString(): string {\n    let str = '';\n    for (let i = 0; i < this._controlLength; i++) {\n      str += String.fromCodePoint(this._controlData[i]);\n    }\n    return str;\n  }\n\n  private _handleNoPayloadCommand(): boolean | Promise<boolean> {\n    const cmd = parseKittyCommand(this._parseControlDataString());\n\n    // Per spec: specifying both i and I is an error\n    if (cmd.id !== undefined && cmd.imageNumber !== undefined) {\n      this._sendResponse(cmd.id, 'EINVAL:cannot specify both i and I keys', cmd.quiet ?? 0);\n      return true;\n    }\n\n    const action = cmd.action ?? 't';\n\n    switch (action) {\n      case KittyAction.DELETE:\n        return this._handleDelete(cmd);\n      case KittyAction.QUERY:\n        this._sendResponse(cmd.id ?? 0, 'OK', cmd.quiet ?? 0);\n        return true;\n      case KittyAction.PLACEMENT:\n        return this._handlePlacement(cmd);\n      default:\n        // TODO: Implement remaining actions when needed:\n        // - a=f (frame): animation frame operations\n        // - a=a (animation): animation control\n        // - a=c (compose): compose images\n        if (cmd.id !== undefined) {\n          this._sendResponse(cmd.id, 'EINVAL:unsupported action', cmd.quiet ?? 0);\n        }\n        return true;\n    }\n  }\n\n  private _handleCommandWithBytesAndCmd(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean | Promise<boolean> {\n    const action = cmd.action ?? 't';\n\n    switch (action) {\n      case KittyAction.TRANSMIT: {\n        const result = this._handleTransmit(cmd, bytes, decodeError);\n        // Only send response when _handleTransmit didn't already respond\n        // (it handles unsupported transmission medium responses internally)\n        if ((cmd.transmission ?? 'd') === 'd' && cmd.id !== undefined) {\n          if (decodeError) {\n            this._sendResponse(cmd.id, 'EINVAL:invalid base64 data', cmd.quiet ?? 0);\n          } else if (bytes.length > 0) {\n            this._sendResponse(cmd.id, 'OK', cmd.quiet ?? 0);\n          }\n        }\n        return result;\n      }\n      case KittyAction.TRANSMIT_DISPLAY:\n        return this._handleTransmitDisplay(cmd, bytes, decodeError);\n      case KittyAction.QUERY:\n        return this._handleQuery(cmd, bytes, decodeError);\n      case KittyAction.PLACEMENT:\n        // a=p ignores any payload \u2014 image data was already transmitted\n        return this._handlePlacement(cmd);\n      default:\n        // TODO: Implement remaining actions when needed:\n        // - a=f (frame): animation frame operations\n        // - a=a (animation): animation control\n        // - a=c (compose): compose images\n        if (cmd.id !== undefined) {\n          this._sendResponse(cmd.id, 'EINVAL:unsupported action', cmd.quiet ?? 0);\n        }\n        return true;\n    }\n  }\n\n  private _handlePlacement(cmd: IKittyCommand): boolean | Promise<boolean> {\n    if (cmd.id === undefined) {\n      return true;\n    }\n    const id = cmd.id;\n    const image = this._kittyStorage.getImage(id);\n    if (!image) {\n      this._sendResponse(id, 'ENOENT:image not found', cmd.quiet ?? 0, cmd.placementId);\n      return true;\n    }\n    const result = this._displayImage(image, cmd);\n    return result.then(success => {\n      this._sendResponse(id, success ? 'OK' : 'EINVAL:image rendering failed', cmd.quiet ?? 0, cmd.placementId);\n      return true;\n    });\n  }\n\n  private _handleTransmit(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean {\n    // TODO: Support file-based transmission modes (t=f, t=t, t=s)\n    // Currently only supports direct transmission (t=d, the default).\n    // - t=f (file): Payload is base64-encoded file path. Terminal reads image from that path.\n    // - t=t (temp file): Payload is base64-encoded path in temp directory. Terminal reads, deletes.\n    // - t=s: Payload is base64-encoded POSIX shm name. Terminal reads from shared memory.\n    // These modes require filesystem/IPC access not available in browsers. For Node.js/Electron:\n    // 1. Check cmd.transmission (t key) before treating bytes as image data\n    // 2. For t=f/t/s: decode bytes as UTF-8 string (the path/name), then read file contents\n    // 3. For t=d: treat bytes as image data (current behavior)\n    // When implementing, also update _handleQuery to accept these transmission mediums.\n    const transmission = cmd.transmission ?? 'd';\n    if (transmission !== 'd') {\n      if (cmd.id !== undefined) {\n        this._sendResponse(cmd.id, 'EINVAL:unsupported transmission medium', cmd.quiet ?? 0);\n      }\n      return true;\n    }\n\n    if (decodeError || bytes.length === 0) return true;\n\n    this._kittyStorage.storeImage(cmd.id, {\n      data: new Blob([bytes as BlobPart]),\n      width: cmd.width ?? 0,\n      height: cmd.height ?? 0,\n      format: (cmd.format ?? KittyFormat.RGBA) as 24 | 32 | 100,\n      compression: cmd.compression ?? ''\n    });\n    return true;\n  }\n\n  private _handleTransmitDisplay(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean | Promise<boolean> {\n    if (decodeError) {\n      if (cmd.id !== undefined) {\n        this._sendResponse(cmd.id, 'EINVAL:invalid base64 data', cmd.quiet ?? 0);\n      }\n      return true;\n    }\n\n    this._handleTransmit(cmd, bytes, decodeError);\n\n    const id = cmd.id ?? this._kittyStorage.lastImageId;\n    const image = this._kittyStorage.getImage(id);\n    if (image) {\n      const result = this._displayImage(image, cmd);\n      if (cmd.id !== undefined) {\n        return result.then(success => {\n          this._sendResponse(id, success ? 'OK' : 'EINVAL:image rendering failed', cmd.quiet ?? 0);\n          return true;\n        });\n      }\n      return result.then(() => true);\n    }\n    return true;\n  }\n\n  private _handleQuery(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean {\n    const id = cmd.id ?? 0;\n    const quiet = cmd.quiet ?? 0;\n\n    // Per spec: reject unsupported transmission mediums (only t=d is supported atm)\n    // TODO: When filesystem support is added (Node.js/Electron), update this to accept\n    // t=f (file), t=t (temp file), and t=s (shared memory) and respond OK for queries.\n    const transmission = cmd.transmission ?? 'd';\n    if (transmission !== 'd') {\n      this._sendResponse(id, 'EINVAL:unsupported transmission medium', quiet);\n      return true;\n    }\n\n    // Check decode error first (invalid base64)\n    if (decodeError) {\n      this._sendResponse(id, 'EINVAL:invalid base64 data', quiet);\n      return true;\n    }\n\n    // Capability query (no payload) - just respond OK\n    if (bytes.length === 0) {\n      this._sendResponse(id, 'OK', quiet);\n      return true;\n    }\n\n    const format = cmd.format ?? KittyFormat.RGBA;\n\n    if (format === KittyFormat.PNG) {\n      this._sendResponse(id, 'OK', quiet);\n    } else {\n      const width = cmd.width ?? 0;\n      const height = cmd.height ?? 0;\n\n      if (!width || !height) {\n        this._sendResponse(id, 'EINVAL:width and height required for raw pixel data', quiet);\n        return true;\n      }\n\n      const bytesPerPixel = format === KittyFormat.RGBA ? KittyPixelConstants.BYTES_PER_PIXEL_RGBA : KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n      const expectedBytes = width * height * bytesPerPixel;\n\n      if (bytes.length < expectedBytes) {\n        this._sendResponse(id, `EINVAL:insufficient pixel data`, quiet);\n        return true;\n      }\n\n      this._sendResponse(id, 'OK', quiet);\n    }\n    return true;\n  }\n\n  private _handleDelete(cmd: IKittyCommand): boolean {\n    // Per spec: default delete selector is 'a' (delete all visible placements)\n    const selector = cmd.deleteSelector ?? 'a';\n\n    // TODO: Distinguish lowercase (delete placements only) from uppercase\n    // (delete placements + free stored image data). Currently both variants\n    // free everything since we don't separate stored data from placements.\n    switch (selector) {\n      case 'a':\n      case 'A':\n        this._cleanupAllPending();\n        this._kittyStorage.deleteAll();\n        break;\n      case 'i':\n      case 'I':\n        // TODO: When placement id tracking is implemented (see TODO in\n        // KittyImageStorage), d=i with p=<pid> should delete only that\n        // specific placement, while d=i without p should delete all\n        // placements for the image.\n        if (cmd.id !== undefined) {\n          const pending = this._pendingTransmissions.get(cmd.id);\n          if (pending) {\n            pending.decoder.release();\n          }\n          this._removePendingEntry(cmd.id);\n          this._kittyStorage.deleteById(cmd.id);\n        }\n        break;\n      default:\n        // Unsupported selectors (c, n, p, q, r, x, y, z, f) \u2014 ignore for now\n        break;\n    }\n    return true;\n  }\n\n  private _sendResponse(id: number, message: string, quiet: number, placementId?: number): void {\n    const isOk = message === 'OK';\n    if (isOk && quiet >= 1) return;\n    if (!isOk && quiet >= 2) return;\n\n    const pPart = placementId ? `,p=${placementId}` : '';\n    const response = `\\x1b_Gi=${id}${pPart};${message}\\x1b\\\\`;\n    this._coreTerminal._core.coreService.triggerDataEvent(response);\n  }\n\n  // Image display\n\n  private _displayImage(image: IKittyImageData, cmd: IKittyCommand): Promise<boolean> {\n    return this._decodeAndDisplay(image, cmd)\n      .then(() => true)\n      .catch(() => false);\n  }\n\n  private async _decodeAndDisplay(image: IKittyImageData, cmd: IKittyCommand): Promise<void> {\n    let bitmap: ImageBitmap | undefined = await this._createBitmap(image);\n\n    try {\n      const cropX = Math.max(0, cmd.x ?? 0);\n      const cropY = Math.max(0, cmd.y ?? 0);\n      const cropW = cmd.sourceWidth || (bitmap.width - cropX);\n      const cropH = cmd.sourceHeight || (bitmap.height - cropY);\n\n      const maxCropW = Math.max(0, bitmap.width - cropX);\n      const maxCropH = Math.max(0, bitmap.height - cropY);\n      const finalCropW = Math.max(0, Math.min(cropW, maxCropW));\n      const finalCropH = Math.max(0, Math.min(cropH, maxCropH));\n\n      if (finalCropW === 0 || finalCropH === 0) {\n        throw new Error('invalid source rectangle');\n      }\n\n      if (cropX !== 0 || cropY !== 0 || finalCropW !== bitmap.width || finalCropH !== bitmap.height) {\n        const cropped = await createImageBitmap(bitmap, cropX, cropY, finalCropW, finalCropH);\n        bitmap.close();\n        bitmap = cropped;\n      }\n\n      const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;\n      const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;\n\n      // Per spec: c/r default to image's natural cell dimensions.\n      // If only one of c/r is specified, compute the other from image aspect ratio.\n      let imgCols: number;\n      let imgRows: number;\n      if (cmd.columns !== undefined && cmd.rows !== undefined) {\n        imgCols = cmd.columns;\n        imgRows = cmd.rows;\n      } else if (cmd.columns !== undefined) {\n        imgCols = cmd.columns;\n        imgRows = Math.max(1, Math.ceil((bitmap.height / bitmap.width) * (imgCols * cw) / ch));\n      } else if (cmd.rows !== undefined) {\n        imgRows = cmd.rows;\n        imgCols = Math.max(1, Math.ceil((bitmap.width / bitmap.height) * (imgRows * ch) / cw));\n      } else {\n        imgCols = Math.ceil(bitmap.width / cw);\n        imgRows = Math.ceil(bitmap.height / ch);\n      }\n\n      let w = bitmap.width;\n      let h = bitmap.height;\n\n      // Scale bitmap to fit placement rectangle when c/r are specified\n      if (cmd.columns !== undefined || cmd.rows !== undefined) {\n        w = Math.round(imgCols * cw);\n        h = Math.round(imgRows * ch);\n      }\n\n      if (w * h > this._opts.pixelLimit) {\n        throw new Error('image exceeds pixel limit');\n      }\n\n      // Save cursor position before addImage modifies it\n      const buffer = this._coreTerminal._core.buffer;\n      const savedX = buffer.x;\n      const savedY = buffer.y;\n      const savedYbase = buffer.ybase;\n\n      // Determine layer based on z-index: negative = behind text, 0+ = on top.\n      // When z<0 we always use the bottom layer even without allowTransparency \u2014\n      // the image will simply be hidden behind the opaque text background, which\n      // is the correct behavior (client asked for \"behind text\").\n      const wantsBottom = cmd.zIndex !== undefined && cmd.zIndex < 0;\n      const layer: ImageLayer = wantsBottom ? 'bottom' : 'top';\n\n      if (w !== bitmap.width || h !== bitmap.height) {\n        const scaled = await createImageBitmap(bitmap, { resizeWidth: w, resizeHeight: h });\n        bitmap.close();\n        bitmap = scaled;\n      }\n\n      // Per spec: X/Y are pixel offsets within the first cell, so clamp to cell dimensions\n      const xOffset = Math.min(Math.max(0, cmd.xOffset ?? 0), cw - 1);\n      const yOffset = Math.min(Math.max(0, cmd.yOffset ?? 0), ch - 1);\n      if (xOffset !== 0 || yOffset !== 0) {\n        // Per spec: X/Y is not added to c/r area. When c/r are explicit, the\n        // total placement area remains c*cw \u00D7 r*ch pixels and the offset image\n        // is clipped to fit. When c/r are unset, the padded canvas determines\n        // the natural cell dimensions.\n        const canvasW = (cmd.columns !== undefined) ? Math.round(imgCols * cw) : bitmap.width + xOffset;\n        const canvasH = (cmd.rows !== undefined) ? Math.round(imgRows * ch) : bitmap.height + yOffset;\n        const offsetCanvas = ImageRenderer.createCanvas(window.document, canvasW, canvasH);\n        const offsetCtx = offsetCanvas.getContext('2d');\n        if (!offsetCtx) {\n          throw new Error('Failed to create offset canvas context');\n        }\n        offsetCtx.drawImage(bitmap, xOffset, yOffset);\n\n        const offsetBitmap = await createImageBitmap(offsetCanvas);\n        offsetCanvas.width = offsetCanvas.height = 0;\n        bitmap.close();\n        bitmap = offsetBitmap;\n        w = bitmap.width;\n        h = bitmap.height;\n        if (w * h > this._opts.pixelLimit) {\n          throw new Error('image exceeds pixel limit');\n        }\n        if (cmd.columns === undefined) {\n          imgCols = Math.ceil(bitmap.width / cw);\n        }\n        if (cmd.rows === undefined) {\n          imgRows = Math.ceil(bitmap.height / ch);\n        }\n      }\n\n      const zIndex = cmd.zIndex ?? 0;\n      this._kittyStorage.addImage(image.id, bitmap, true, layer, zIndex);\n      bitmap = undefined;  // ownership transferred to storage\n\n      // Kitty cursor movement\n      // Per spec: cursor placed at first column after last image column,\n      // on the last row of the image. C=1 means don't move cursor.\n      if (cmd.cursorMovement === 1) {\n        // C=1: restore cursor to position before image was placed\n        const scrolled = buffer.ybase - savedYbase;\n        buffer.x = savedX;\n        // Can't restore cursor to scrollback?\n        buffer.y = Math.max(savedY - scrolled, 0);\n      } else {\n        // Default (C=0): advance cursor horizontally past the image\n        // addImage already positioned cursor on the last row via lineFeeds\n        buffer.x = Math.min(savedX + imgCols, this._coreTerminal.cols);\n      }\n    } catch (e) {\n      bitmap?.close();\n      throw e;\n    }\n  }\n\n  // Create ImageBitmap from already-decoded image data.\n  private async _createBitmap(image: IKittyImageData): Promise<ImageBitmap> {\n    let bytes: Uint8Array = new Uint8Array(await image.data.arrayBuffer());\n\n    if (image.compression === KittyCompression.ZLIB) {\n      bytes = await this._decompressZlib(bytes);\n    }\n\n    if (image.format === KittyFormat.PNG) {\n      const blob = new Blob([bytes as BlobPart], { type: 'image/png' });\n      if (!window.createImageBitmap) {\n        const url = URL.createObjectURL(blob);\n        const img = new Image();\n        return new Promise<ImageBitmap>((resolve, reject) => {\n          img.addEventListener('load', () => {\n            URL.revokeObjectURL(url);\n            const canvas = ImageRenderer.createCanvas(window.document, img.width, img.height);\n            canvas.getContext('2d')?.drawImage(img, 0, 0);\n            createImageBitmap(canvas).then(resolve).catch(reject);\n          });\n          img.addEventListener('error', () => {\n            URL.revokeObjectURL(url);\n            reject(new Error('Failed to load image'));\n          });\n          img.src = url;\n        });\n      }\n      return createImageBitmap(blob);\n    }\n\n    // Raw pixel data\n    const width = image.width;\n    const height = image.height;\n\n    if (!width || !height) {\n      throw new Error('Width and height required for raw pixel data');\n    }\n\n    const bytesPerPixel = image.format === KittyFormat.RGBA ? KittyPixelConstants.BYTES_PER_PIXEL_RGBA : KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n    const expectedBytes = width * height * bytesPerPixel;\n\n    if (bytes.length < expectedBytes) {\n      throw new Error('Insufficient pixel data');\n    }\n\n    const pixelCount = width * height;\n\n    if (image.format === KittyFormat.RGBA) {\n      // RGBA: use bytes directly \u2014 no copy needed\n      return createImageBitmap(new ImageData(new Uint8ClampedArray(bytes.buffer as ArrayBuffer, bytes.byteOffset, pixelCount * KittyPixelConstants.BYTES_PER_PIXEL_RGBA), width, height));\n    }\n\n    // RGB\u2192RGBA: interleave alpha using uint32 block processing (4 pixels per iteration).\n    // 3 uint32 reads + 4 uint32 writes per 4 pixels vs 28 byte reads/writes \u2014 ~6x faster.\n    // Assumes little-endian (all modern browsers/Node.js).\n    const data = new Uint8ClampedArray(pixelCount * KittyPixelConstants.BYTES_PER_PIXEL_RGBA);\n    const src32 = new Uint32Array(bytes.buffer, bytes.byteOffset, Math.floor(bytes.byteLength / 4));\n    const dst32 = new Uint32Array(data.buffer);\n    const alignedPixels = pixelCount & ~3;  // round down to multiple of 4\n\n    let srcOffset = 0;\n    let dstOffset = 0;\n    for (let i = 0; i < alignedPixels; i += 4) {\n      const b0 = src32[srcOffset++];\n      const b1 = src32[srcOffset++];\n      const b2 = src32[srcOffset++];\n      // Little-endian: pixel bytes are [R,G,B] \u2192 uint32 ABGR layout\n      dst32[dstOffset++] = 0xFF000000 | b0;\n      dst32[dstOffset++] = 0xFF000000 | (b0 >>> 24) | (b1 << 8);\n      dst32[dstOffset++] = 0xFF000000 | (b1 >>> 16) | (b2 << 16);\n      dst32[dstOffset++] = 0xFF000000 | (b2 >>> 8);\n    }\n\n    // Handle remaining 1\u20133 pixels\n    let srcByte = alignedPixels * KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n    let dstByte = alignedPixels * KittyPixelConstants.BYTES_PER_PIXEL_RGBA;\n    for (let i = alignedPixels; i < pixelCount; i++) {\n      data[dstByte]     = bytes[srcByte];\n      data[dstByte + 1] = bytes[srcByte + 1];\n      data[dstByte + 2] = bytes[srcByte + 2];\n      data[dstByte + 3] = KittyPixelConstants.ALPHA_OPAQUE;\n      srcByte += KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n      dstByte += KittyPixelConstants.BYTES_PER_PIXEL_RGBA;\n    }\n\n    return createImageBitmap(new ImageData(data, width, height));\n  }\n\n  private async _decompressZlib(compressed: Uint8Array): Promise<Uint8Array> {\n    try {\n      return await this._decompress(compressed, 'deflate');\n    } catch {\n      return await this._decompress(compressed, 'deflate-raw');\n    }\n  }\n\n  private async _decompress(compressed: Uint8Array, format: 'deflate' | 'deflate-raw'): Promise<Uint8Array> {\n    const ds = new DecompressionStream(format);\n    const writer = ds.writable.getWriter();\n    writer.write(compressed as BufferSource);\n    writer.close();\n\n    const chunks: Uint8Array[] = [];\n    const reader = ds.readable.getReader();\n\n    while (true) {\n      const { done, value } = await reader.read();\n      if (done) break;\n      chunks.push(value);\n    }\n\n    const totalLength = chunks.reduce((sum, chunk) => sum + chunk.length, 0);\n    const result = new Uint8Array(totalLength);\n    let offset = 0;\n    for (const chunk of chunks) {\n      result.set(chunk, offset);\n      offset += chunk.length;\n    }\n    return result;\n  }\n\n  public get images(): ReadonlyMap<number, IKittyImageData> {\n    return this._kittyStorage.images;\n  }\n\n  public get _kittyIdToStorageId(): ReadonlyMap<number, number> {\n    return this._kittyStorage.kittyIdToStorageId;\n  }\n\n  public get pendingTransmissions(): ReadonlyMap<number, IPendingTransmission> {\n    return this._pendingTransmissions;\n  }\n}\n", "/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Kitty graphics protocol types, constants, and parsing utilities.\n */\n\nimport type Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\n\n// Kitty graphics protocol action types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference under key 'a'.\nexport const enum KittyAction {\n  TRANSMIT = 't',\n  TRANSMIT_DISPLAY = 'T',\n  QUERY = 'q',\n  PLACEMENT = 'p',\n  DELETE = 'd'\n}\n\n// Kitty graphics protocol format types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference\nexport const enum KittyFormat {\n  RGB = 24,\n  RGBA = 32,\n  PNG = 100\n}\n\n// Kitty graphics protocol compression types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference under key 'o'.\nexport const enum KittyCompression {\n  NONE = '',\n  ZLIB = 'z'\n}\n\n// Kitty graphics protocol control data keys.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference\nexport const enum KittyKey {\n  // Action to perform (t=transmit, T=transmit+display, q=query, p=placement, d=delete)\n  ACTION = 'a',\n  // Image format (24=RGB, 32=RGBA, 100=PNG)\n  FORMAT = 'f',\n  // Image ID for referencing stored images\n  ID = 'i',\n  // Image number (alternative to ID, terminal assigns ID)\n  IMAGE_NUMBER = 'I',\n  // Source image width in pixels\n  WIDTH = 's',\n  // Source image height in pixels\n  HEIGHT = 'v',\n  // The left edge (in pixels) of the image area to display\n  X_OFFSET = 'x',\n  // The top edge (in pixels) of the image area to display\n  Y_OFFSET = 'y',\n  // Width (in pixels) of the source rectangle to display\n  SOURCE_WIDTH = 'w',\n  // Height (in pixels) of the source rectangle to display\n  SOURCE_HEIGHT = 'h',\n  // Horizontal offset (in pixels) within the first cell\n  X_PLACEMENT_OFFSET = 'X',\n  // Vertical offset (in pixels) within the first cell\n  Y_PLACEMENT_OFFSET = 'Y',\n  // Number of terminal columns to display the image over\n  COLUMNS = 'c',\n  // Number of terminal rows to display the image over\n  ROWS = 'r',\n  // More data flag (1=more chunks coming, 0=final chunk)\n  MORE = 'm',\n  // Compression type (z=zlib). This is essential for chunking larger images.\n  COMPRESSION = 'o',\n  // Quiet mode (1=suppress OK responses, 2=suppress error responses)\n  QUIET = 'q',\n  // Cursor movement policy (0=move cursor after image, 1=don't move cursor)\n  CURSOR_MOVEMENT = 'C',\n  // Z-index for image layering (negative = behind text, 0+ = on top)\n  Z_INDEX = 'z',\n  // Transmission medium (d=direct, f=file, t=temp file, s=shared memory)\n  TRANSMISSION = 't',\n  // Delete selector (a/A=all, i/I=by id, c/C=at cursor, etc.) \u2014 only used when a=d\n  DELETE_SELECTOR = 'd',\n  // Placement ID for targeting specific placements\n  PLACEMENT_ID = 'p'\n}\n\n// Pixel format constants\nexport const enum KittyPixelConstants {\n  BYTES_PER_PIXEL_RGB = 3,\n  BYTES_PER_PIXEL_RGBA = 4,\n  ALPHA_OPAQUE = 255\n}\n\n// Parsed Kitty graphics command.\nexport interface IKittyCommand {\n  action?: string;\n  format?: number;\n  id?: number;\n  imageNumber?: number;\n  width?: number;\n  height?: number;\n  x?: number;\n  y?: number;\n  sourceWidth?: number;\n  sourceHeight?: number;\n  xOffset?: number;\n  yOffset?: number;\n  columns?: number;\n  rows?: number;\n  more?: number;\n  quiet?: number;\n  cursorMovement?: number;\n  zIndex?: number;\n  transmission?: string;\n  deleteSelector?: string;\n  placementId?: number;\n  compression?: string;\n  payload?: string;\n}\n\n// Pending chunked transmission state.\n// Stores metadata from the first chunk while accumulating decoded payload data.\nexport interface IPendingTransmission {\n  // The parsed command from the first chunk (contains action, format, dimensions, etc.)\n  cmd: IKittyCommand;\n  // Decoder used across chunked payloads\n  decoder: Base64Decoder;\n  // Total encoded (base64) bytes received across all chunks - for size limit enforcement\n  totalEncodedSize: number;\n  // Whether any chunk has failed to decode\n  decodeError: boolean;\n}\n\n// Stored Kitty image data.\nexport interface IKittyImageData {\n  id: number;\n  // Decoded image data stored as Blob (off JS heap) to avoid 2GB heap limit\n  data: Blob;\n  width: number;\n  height: number;\n  format: 24 | 32 | 100;\n  compression?: string;\n}\n\n// Parses Kitty graphics control data into a command object.\nexport function parseKittyCommand(data: string): IKittyCommand {\n  const cmd: IKittyCommand = {};\n  const parts = data.split(',');\n\n  for (const part of parts) {\n    const eqIdx = part.indexOf('=');\n    if (eqIdx === -1) continue;\n\n    const key = part.substring(0, eqIdx);\n    const value = part.substring(eqIdx + 1);\n\n    // Handle string keys first\n    if (key === KittyKey.ACTION) {\n      cmd.action = value;\n      continue;\n    }\n    if (key === KittyKey.COMPRESSION) {\n      cmd.compression = value;\n      continue;\n    }\n    if (key === KittyKey.TRANSMISSION) {\n      cmd.transmission = value;\n      continue;\n    }\n    if (key === KittyKey.DELETE_SELECTOR) {\n      cmd.deleteSelector = value;\n      continue;\n    }\n    const numValue = parseInt(value, 10);\n    switch (key) {\n      case KittyKey.FORMAT: cmd.format = numValue; break;\n      case KittyKey.ID: cmd.id = numValue; break;\n      case KittyKey.IMAGE_NUMBER: cmd.imageNumber = numValue; break;\n      case KittyKey.WIDTH: cmd.width = numValue; break;\n      case KittyKey.HEIGHT: cmd.height = numValue; break;\n      case KittyKey.X_OFFSET: cmd.x = numValue; break;\n      case KittyKey.Y_OFFSET: cmd.y = numValue; break;\n      case KittyKey.SOURCE_WIDTH: cmd.sourceWidth = numValue; break;\n      case KittyKey.SOURCE_HEIGHT: cmd.sourceHeight = numValue; break;\n      case KittyKey.X_PLACEMENT_OFFSET: cmd.xOffset = numValue; break;\n      case KittyKey.Y_PLACEMENT_OFFSET: cmd.yOffset = numValue; break;\n      case KittyKey.COLUMNS: cmd.columns = numValue; break;\n      case KittyKey.ROWS: cmd.rows = numValue; break;\n      case KittyKey.MORE: cmd.more = numValue; break;\n      case KittyKey.QUIET: cmd.quiet = numValue; break;\n      case KittyKey.CURSOR_MOVEMENT: cmd.cursorMovement = numValue; break;\n      case KittyKey.Z_INDEX: cmd.zIndex = numValue; break;\n      case KittyKey.PLACEMENT_ID: cmd.placementId = numValue; break;\n    }\n  }\n\n  return cmd;\n}\n", "/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { ImageStorage } from '../ImageStorage';\nimport { ImageLayer, IAddImageOpts } from '../Types';\nimport { IKittyImageData } from './KittyGraphicsTypes';\n\n// Kitty-specific image storage controller.\n//\n// Wraps shared ImageStorage with kitty protocol semantics:\n// - tracks transmitted image payloads by kitty image id\n// - tracks kitty image id -> shared ImageStorage id mapping for displayed images\n// - mirrors shared-storage evictions into kitty maps\n// - applies protocol-level undisplayed-image eviction policy\nexport class KittyImageStorage implements IDisposable {\n  private static readonly _maxStoredImages = 256;\n\n  private _nextImageId = 1;\n  private readonly _images: Map<number, IKittyImageData> = new Map();\n  // TODO: Support multiple placements per image. The kitty spec identifies\n  // placements by an (image id, placement id) pair \u2014 same i + different p\n  // values should coexist, and same i + same p should replace the prior\n  // placement. Currently we track only one storage entry per kitty image id,\n  // so multiple placements of the same image overwrite each other. Fixing\n  // this requires changing these maps to Map<number, Map<number, number>>\n  // (kittyId \u2192 placementId \u2192 storageId) and updating addImage/deleteById\n  // accordingly. The underlying shared ImageStorage would also need to\n  // support multiple entries per logical image.\n  private readonly _kittyIdToStorageId: Map<number, number> = new Map();\n  private readonly _storageIdToKittyId: Map<number, number> = new Map();\n\n  private readonly _previousOnImageDeleted: ((storageId: number) => void) | undefined;\n  private readonly _wrappedOnImageDeleted: (storageId: number) => void;\n  private readonly _handleStorageImageDeleted = (storageId: number): void => {\n    const kittyId = this._storageIdToKittyId.get(storageId);\n    if (kittyId !== undefined) {\n      this._kittyIdToStorageId.delete(kittyId);\n      this._storageIdToKittyId.delete(storageId);\n      this._images.delete(kittyId);\n    }\n  };\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };\n\n  constructor(\n    private readonly _storage: ImageStorage\n  ) {\n    this._previousOnImageDeleted = this._storage.onImageDeleted;\n    this._wrappedOnImageDeleted = (storageId: number) => {\n      this._previousOnImageDeleted?.(storageId);\n      this._handleStorageImageDeleted(storageId);\n    };\n    this._storage.onImageDeleted = this._wrappedOnImageDeleted;\n  }\n\n  public reset(): void {\n    this._nextImageId = 1;\n    this._images.clear();\n    this._kittyIdToStorageId.clear();\n    this._storageIdToKittyId.clear();\n  }\n\n  public dispose(): void {\n    this.reset();\n    if (this._storage.onImageDeleted === this._wrappedOnImageDeleted) {\n      this._storage.onImageDeleted = this._previousOnImageDeleted;\n    }\n  }\n\n  public storeImage(id: number | undefined, imageData: Omit<IKittyImageData, 'id'>): number {\n    const imageId = id ?? this._nextImageId++;\n\n    const oldStorageId = this._kittyIdToStorageId.get(imageId);\n    if (oldStorageId !== undefined) {\n      this._storage.deleteImage(oldStorageId);\n      this._kittyIdToStorageId.delete(imageId);\n      this._storageIdToKittyId.delete(oldStorageId);\n    }\n\n    if (!this._images.has(imageId) && this._images.size >= KittyImageStorage._maxStoredImages) {\n      this._evictUndisplayedImages();\n    }\n\n    this._images.set(imageId, {\n      ...imageData,\n      id: imageId\n    });\n    return imageId;\n  }\n\n  public addImage(kittyId: number, image: HTMLCanvasElement | ImageBitmap, scrolling: boolean, layer: ImageLayer, zIndex: number): void {\n    // Clean up stale reverse-mapping from a previous placement of the same\n    // kitty image.  The old shared-storage entry is kept (it may still be\n    // visible on screen) but its reverse mapping is removed so that eviction\n    // of the old entry won't incorrectly delete the kitty image data.\n    const oldStorageId = this._kittyIdToStorageId.get(kittyId);\n    if (oldStorageId !== undefined) {\n      this._storageIdToKittyId.delete(oldStorageId);\n    }\n    this._addImageOpts.scrolling = scrolling;\n    this._addImageOpts.layer = layer;\n    this._addImageOpts.zIndex = zIndex;\n    const storageId = this._storage.addImage(image, this._addImageOpts);\n    this._kittyIdToStorageId.set(kittyId, storageId);\n    this._storageIdToKittyId.set(storageId, kittyId);\n  }\n\n  public getImage(kittyId: number): IKittyImageData | undefined {\n    return this._images.get(kittyId);\n  }\n\n  public deleteById(kittyId: number): void {\n    this._images.delete(kittyId);\n    const storageId = this._kittyIdToStorageId.get(kittyId);\n    if (storageId !== undefined) {\n      this._storage.deleteImage(storageId);\n      this._kittyIdToStorageId.delete(kittyId);\n      this._storageIdToKittyId.delete(storageId);\n    }\n  }\n\n  public deleteAll(): void {\n    this._images.clear();\n    for (const storageId of this._kittyIdToStorageId.values()) {\n      this._storage.deleteImage(storageId);\n    }\n    this._kittyIdToStorageId.clear();\n    this._storageIdToKittyId.clear();\n  }\n\n  public get images(): ReadonlyMap<number, IKittyImageData> {\n    return this._images;\n  }\n\n  public get kittyIdToStorageId(): ReadonlyMap<number, number> {\n    return this._kittyIdToStorageId;\n  }\n\n  public get lastImageId(): number {\n    return this._nextImageId - 1;\n  }\n\n  private _evictUndisplayedImages(): void {\n    for (const [kittyId] of this._images) {\n      if (this._images.size <= KittyImageStorage._maxStoredImages / 2) {\n        break;\n      }\n      if (!this._kittyIdToStorageId.has(kittyId)) {\n        this._images.delete(kittyId);\n      }\n    }\n  }\n}\n", "/**\n * Copyright (c) 2020, 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { SixelImageStorage } from './SixelImageStorage';\nimport { IDcsHandler, IParams, IImageAddonOptions, ITerminalExt, AttributeData, IResetHandler, ReadonlyColorSet } from './Types';\nimport { toRGBA8888, BIG_ENDIAN, PALETTE_ANSI_256, PALETTE_VT340_COLOR } from 'sixel/lib/Colors';\nimport { RGBA8888 } from 'sixel/lib/Types';\nimport { ImageRenderer } from './ImageRenderer';\n\nimport { DecoderAsync, Decoder } from 'sixel/lib/Decoder';\n\n// always free decoder ressources after decoding if it exceeds this limit\nconst MEM_PERMA_LIMIT = 4194304; // 1024 pixels * 1024 pixels * 4 channels = 4MB\n\n// custom default palette: VT340 (lower 16 colors) + ANSI256 (up to 256) + zeroed (up to 4096)\nconst DEFAULT_PALETTE = PALETTE_ANSI_256;\nDEFAULT_PALETTE.set(PALETTE_VT340_COLOR);\n\n\nexport class SixelHandler implements IDcsHandler, IResetHandler {\n  private _size = 0;\n  private _aborted = false;\n  private _dec: Decoder | undefined;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _storage: SixelImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    DecoderAsync({\n      memoryLimit: this._opts.pixelLimit * 4,\n      palette: DEFAULT_PALETTE,\n      paletteLimit: this._opts.sixelPaletteLimit\n    }).then(d => this._dec = d);\n  }\n\n  public reset(): void {\n    /**\n     * reset sixel decoder to defaults:\n     * - release all memory\n     * - nullify palette (4096)\n     * - apply default palette (256)\n     */\n    if (this._dec) {\n      this._dec.release();\n      // FIXME: missing interface on decoder to nullify full palette\n      (this._dec as any)._palette.fill(0);\n      this._dec.init(0, DEFAULT_PALETTE, this._opts.sixelPaletteLimit);\n    }\n  }\n\n  public hook(params: IParams): void {\n    this._size = 0;\n    this._aborted = false;\n    if (this._dec) {\n      const fillColor = params.params[1] === 1 ? 0 : extractActiveBg(\n        this._coreTerminal._core._inputHandler._curAttrData,\n        this._coreTerminal._core._themeService?.colors);\n      this._dec.init(fillColor, null, this._opts.sixelPaletteLimit);\n    }\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted || !this._dec) {\n      return;\n    }\n    this._size += end - start;\n    if (this._size > this._opts.sixelSizeLimit) {\n      console.warn(`SIXEL: too much data, aborting`);\n      this._aborted = true;\n      this._dec.release();\n      return;\n    }\n    try {\n      this._dec.decode(data, start, end);\n    } catch (e) {\n      console.warn(`SIXEL: error while decoding image - ${e}`);\n      this._aborted = true;\n      this._dec.release();\n    }\n  }\n\n  public unhook(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted || !success || !this._dec) {\n      return true;\n    }\n\n    const width = this._dec.width;\n    const height = this._dec.height;\n\n    // partial fix for https://github.com/jerch/xterm-addon-image/issues/37\n    if (!width || !height) {\n      if (height) {\n        this._storage.advanceCursor(height);\n      }\n      return true;\n    }\n\n    const canvas = ImageRenderer.createCanvas(undefined, width, height);\n    canvas.getContext('2d')?.putImageData(new ImageData(this._dec.data8 as Uint8ClampedArray<ArrayBuffer>, width, height), 0, 0);\n    if (this._dec.memoryUsage > MEM_PERMA_LIMIT) {\n      this._dec.release();\n    }\n    this._storage.addImage(canvas);\n    return true;\n  }\n}\n\n\n/**\n * Some helpers to extract current terminal colors.\n */\n\n// get currently active background color from terminal\n// also respect INVERSE setting\nfunction extractActiveBg(attr: AttributeData, colors: ReadonlyColorSet | undefined): RGBA8888 {\n  let bg = 0;\n  if (!colors) {\n    // FIXME: theme service is prolly not available yet,\n    // happens if .open() was not called yet (bug in core?)\n    return bg;\n  }\n  if (attr.isInverse()) {\n    if (attr.isFgDefault()) {\n      bg = convertLe(colors.foreground.rgba);\n    } else if (attr.isFgRGB()) {\n      const t = (attr.constructor as typeof AttributeData).toColorRGB(attr.getFgColor());\n      bg = toRGBA8888(...t);\n    } else {\n      bg = convertLe(colors.ansi[attr.getFgColor()].rgba);\n    }\n  } else {\n    if (attr.isBgDefault()) {\n      bg = convertLe(colors.background.rgba);\n    } else if (attr.isBgRGB()) {\n      const t = (attr.constructor as typeof AttributeData).toColorRGB(attr.getBgColor());\n      bg = toRGBA8888(...t);\n    } else {\n      bg = convertLe(colors.ansi[attr.getBgColor()].rgba);\n    }\n  }\n  return bg;\n}\n\n// rgba values on the color managers are always in BE, thus convert to LE\nfunction convertLe(color: number): RGBA8888 {\n  if (BIG_ENDIAN) return color;\n  return (color & 0xFF) << 24 | (color >>> 8 & 0xFF) << 16 | (color >>> 16 & 0xFF) << 8 | color >>> 24 & 0xFF;\n}\n", "/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';\nimport { IImageAddonOptions, ITerminalExt, IAddImageOpts } from './Types';\nimport { ImageRenderer } from './ImageRenderer';\n\n/**\n * Sixel-specific image storage controller.\n *\n * Wraps the shared ImageStorage with sixel protocol semantics:\n * - Cursor behavior governed by DECSET 80 (sixelScrolling option)\n * - advanceCursor for empty sixels carrying only height\n */\nexport class SixelImageStorage {\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'vt340' };\n  constructor(\n    private readonly _storage: ImageStorage,\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _terminal: ITerminalExt\n  ) {}\n\n  /**\n   * Add a sixel image to storage.\n   * Cursor behavior depends on the sixelScrolling option (DECSET 80).\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap): void {\n    this._addImageOpts.scrolling = this._opts.sixelScrolling;\n    this._storage.addImage(img, this._addImageOpts);\n  }\n\n  /**\n   * Only advance text cursor.\n   * This is an edge case from empty sixels carrying only a height but no pixels.\n   * Partially fixes https://github.com/jerch/xterm-addon-image/issues/37.\n   */\n  public advanceCursor(height: number): void {\n    if (this._opts.sixelScrolling) {\n      let cellSize = this._renderer.cellSize;\n      if (cellSize.width === -1 || cellSize.height === -1) {\n        cellSize = CELL_SIZE_DEFAULT;\n      }\n      const rows = Math.ceil(height / cellSize.height);\n      for (let i = 1; i < rows; ++i) {\n        this._terminal._core._inputHandler.lineFeed();\n      }\n    }\n  }\n}\n", "/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IAddImageOpts } from './Types';\nimport { ImageStorage } from './ImageStorage';\n\n/**\n * IIP (iTerm Image Protocol) specific image storage controller.\n *\n * Wraps the shared ImageStorage with IIP protocol semantics:\n * - Always uses scrolling mode (cursor advances with image)\n */\nexport class IIPImageStorage {\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };\n  constructor(\n    private readonly _storage: ImageStorage\n  ) {}\n\n  /**\n   * Add an IIP image to storage.\n   * Always uses scrolling mode \u2014 cursor advances past the image.\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap): void {\n    this._storage.addImage(img, this._addImageOpts);\n  }\n}\n", "/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport type { ITerminalAddon, IDisposable } from '@xterm/xterm';\nimport type { ImageAddon as IImageApi } from '@xterm/addon-image';\nimport { Emitter, type IEvent } from 'common/Event';\nimport { IIPHandler } from './IIPHandler';\nimport { ImageRenderer } from './ImageRenderer';\nimport { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';\nimport { KittyGraphicsHandler } from './kitty/KittyGraphicsHandler';\nimport { KittyImageStorage } from './kitty/KittyImageStorage';\nimport { SixelHandler } from './SixelHandler';\nimport { SixelImageStorage } from './SixelImageStorage';\nimport { IIPImageStorage } from './IIPImageStorage';\nimport { ITerminalExt, IImageAddonOptions, IResetHandler } from './Types';\n\n\n/**\n * Document VT features provided by this addon.\n *\n * @vt: #E[Supported via @xterm/addon-image.] DCS SIXEL \"SIXEL Graphics\"  \"DCS Ps ; Ps ; Ps ; q Pt ST\"  \"Draw SIXEL image.\"\n *\n * Sixel support is provided by the addon @xterm/addon-image with these limitations:\n * - immediate coloring (no shared palette, allows high color settings of `img2sixel`)\n * - max. palette size of 4096 colors\n * - max. pixel width of 16K\n * - max. 25 MB per sixel sequence\n * - VT340 cursor positioning (begin of last sixel data row)\n *\n * See [addon readme](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image) for more details.\n *\n *\n * @vt: #E[Supported via @xterm/addon-image.] OSC 1337  \"iTerm2 Commands\"   \"OSC 1337 ; Pt BEL\"  \"Custom iTerm2 commands.\"\n *\n * Only the inline image protocol (IIP) is supported by the addon @xterm/addon-image with\n * the following limitations:\n * - sequence:\n *   - format: `OSC 1337 ; File=inline=1 ; size=<unencoded size> ; ... : <base64 payload> BEL`\n *   - size param must be set and payload may not exceed CEIL(size * 4 / 3)\n *   - strict base64 handling as of RFC4648 \u00A74 (standard alphabet, optional padding,\n *     no separator bytes allowed)\n *   - supported params: size, name, width, height, preserveAspectRatio\n * - image formats: PNG, JPEG and GIF\n * - no animation support (renders first image of a GIF)\n * - no multipart support\n * - VT340 cursor positioning (begin of last sixel data row)\n *\n * See [addon readme](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image)\n * and [iTerm2 IIP docs](https://iterm2.com/documentation-images.html) for more details.\n *\n *\n * @vt: #E[Supported via @xterm/addon-image.] APC KITTY_GRAPHICS \"Kitty Graphics\"  \"APC G Pt ST\"  \"Kitty Graphics Protocol.\"\n *\n * Kitty graphics support is provided by the addon @xterm/addon-image.\n * Note that while basic image output already works, this is still work in progress.\n */\n\n// default values of addon ctor options\nconst DEFAULT_OPTIONS: IImageAddonOptions = {\n  enableSizeReports: true,\n  pixelLimit: 16777216, // limit to 4096 * 4096 pixels\n  sixelSupport: true,\n  sixelScrolling: true,\n  sixelPaletteLimit: 4096,\n  sixelSizeLimit: 33554432,\n  storageLimit: 128,\n  showPlaceholder: true,\n  iipSupport: true,\n  iipSizeLimit: 33554432,\n  kittySupport: true,\n  kittySizeLimit: 33554432\n};\n\n// max palette size supported by the sixel lib (compile time setting)\nconst MAX_SIXEL_PALETTE_SIZE = 4096;\n\n// definitions for _xtermGraphicsAttributes sequence\nconst enum GaItem {\n  COLORS = 1,\n  SIXEL_GEO = 2,\n  REGIS_GEO = 3\n}\nconst enum GaAction {\n  READ = 1,\n  SET_DEFAULT = 2,\n  SET = 3,\n  READ_MAX = 4\n}\nconst enum GaStatus {\n  SUCCESS = 0,\n  ITEM_ERROR = 1,\n  ACTION_ERROR = 2,\n  FAILURE = 3\n}\n\n\nexport class ImageAddon implements ITerminalAddon, IImageApi {\n  private _opts: IImageAddonOptions;\n  private _defaultOpts: IImageAddonOptions;\n  private _storage: ImageStorage | undefined;\n  private _renderer: ImageRenderer | undefined;\n  private _disposables: IDisposable[] = [];\n  private _terminal: ITerminalExt | undefined;\n  private _handlers: Map<String, IResetHandler> = new Map();\n  private readonly _onImageAdded = new Emitter<void>();\n  public readonly onImageAdded: IEvent<void> = this._onImageAdded.event;\n\n  constructor(opts?: Partial<IImageAddonOptions>) {\n    this._opts = Object.assign({}, DEFAULT_OPTIONS, opts);\n    this._defaultOpts = Object.assign({}, DEFAULT_OPTIONS, opts);\n  }\n\n  public dispose(): void {\n    for (const obj of this._disposables) {\n      obj.dispose();\n    }\n    this._disposables.length = 0;\n    this._handlers.clear();\n    this._onImageAdded.dispose();\n  }\n\n  private _disposeLater(...args: IDisposable[]): void {\n    for (const obj of args) {\n      this._disposables.push(obj);\n    }\n  }\n\n  public activate(terminal: ITerminalExt): void {\n    this._terminal = terminal;\n\n    // internal data structures\n    this._renderer = new ImageRenderer(terminal);\n    this._storage = new ImageStorage(terminal, this._renderer, this._opts);\n    this._storage.onImageAdded = () => this._onImageAdded.fire();\n\n    // enable size reports\n    if (this._opts.enableSizeReports) {\n      const windowOps = terminal.options.windowOptions ?? {};\n      windowOps.getWinSizePixels = true;\n      windowOps.getCellSizePixels = true;\n      windowOps.getWinSizeChars = true;\n      terminal.options.windowOptions = windowOps;\n    }\n\n    this._disposeLater(\n      this._renderer,\n      this._storage,\n\n      // DECSET/DECRST/DA1/XTSMGRAPHICS handlers\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'h' }, params => this._decset(params)),\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'l' }, params => this._decrst(params)),\n      terminal.parser.registerCsiHandler({ final: 'c' }, params => this._da1(params)),\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'S' }, params => this._xtermGraphicsAttributes(params)),\n\n      // render hook\n      terminal.onRender(range => this._storage?.render(range)),\n\n      /**\n       * reset handlers covered:\n       * - DECSTR\n       * - RIS\n       * - Terminal.reset()\n       */\n      terminal.parser.registerCsiHandler({ intermediates: '!', final: 'p' }, () => this.reset()),\n      terminal.parser.registerEscHandler({ final: 'c' }, () => this.reset()),\n      terminal._core._inputHandler.onRequestReset(() => this.reset()),\n\n      // wipe canvas and delete alternate images on buffer switch\n      terminal.buffer.onBufferChange(() => this._storage?.wipeAlternate()),\n\n      // extend images to the right on resize\n      terminal.onResize(metrics => this._storage?.viewportResize(metrics))\n    );\n\n    // SIXEL handler\n    if (this._opts.sixelSupport) {\n      const sixelStorage = new SixelImageStorage(this._storage!, this._opts, this._renderer!, terminal);\n      const sixelHandler = new SixelHandler(this._opts, sixelStorage, terminal);\n      this._handlers.set('sixel', sixelHandler);\n      this._disposeLater(\n        terminal._core._inputHandler._parser.registerDcsHandler({ final: 'q' }, sixelHandler)\n      );\n    }\n\n    // iTerm IIP handler\n    if (this._opts.iipSupport) {\n      const iipStorage = new IIPImageStorage(this._storage!);\n      const iipHandler = new IIPHandler(this._opts, this._renderer!, iipStorage, terminal);\n      this._handlers.set('iip', iipHandler);\n      this._disposeLater(\n        terminal._core._inputHandler._parser.registerOscHandler(1337, iipHandler)\n      );\n    }\n\n    // Kitty graphics handler\n    if (this._opts.kittySupport) {\n      const kittyStorage = new KittyImageStorage(this._storage!);\n      const kittyHandler = new KittyGraphicsHandler(this._opts, this._renderer!, kittyStorage, terminal);\n      this._handlers.set('kitty', kittyHandler);\n      this._disposeLater(\n        kittyStorage,\n        kittyHandler,\n        terminal._core._inputHandler._parser.registerApcHandler({ final: 'G' }, kittyHandler)\n      );\n    }\n  }\n\n  // Note: storageLimit is skipped here to not intoduce a surprising side effect.\n  public reset(): boolean {\n    // reset options customizable by sequences to defaults\n    this._opts.sixelScrolling = this._defaultOpts.sixelScrolling;\n    this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit;\n    // also clear image storage\n    this._storage?.reset();\n    // reset protocol handlers\n    for (const handler of this._handlers.values()) {\n      handler.reset();\n    }\n    return false;\n  }\n\n  public get storageLimit(): number {\n    return this._storage?.getLimit() || -1;\n  }\n\n  public set storageLimit(limit: number) {\n    this._storage?.setLimit(limit);\n    this._opts.storageLimit = limit;\n  }\n\n  public get storageUsage(): number {\n    if (this._storage) {\n      return this._storage.getUsage();\n    }\n    return -1;\n  }\n\n  public get showPlaceholder(): boolean {\n    return this._opts.showPlaceholder;\n  }\n\n  public set showPlaceholder(value: boolean) {\n    this._opts.showPlaceholder = value;\n    this._renderer?.showPlaceholder(value);\n  }\n\n  public getImageAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    return this._storage?.getImageAtBufferCell(x, y);\n  }\n\n  public extractTileAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    return this._storage?.extractTileAtBufferCell(x, y);\n  }\n\n  private _report(s: string): void {\n    this._terminal?._core.input(s, false);\n  }\n\n  private _decset(params: (number | number[])[]): boolean {\n    for (let i = 0; i < params.length; ++i) {\n      switch (params[i]) {\n        case 80:\n          this._opts.sixelScrolling = false;\n          break;\n      }\n    }\n    return false;\n  }\n\n  private _decrst(params: (number | number[])[]): boolean {\n    for (let i = 0; i < params.length; ++i) {\n      switch (params[i]) {\n        case 80:\n          this._opts.sixelScrolling = true;\n          break;\n      }\n    }\n    return false;\n  }\n\n  // overload DA to return something more appropriate\n  private _da1(params: (number | number[])[]): boolean {\n    if (params[0]) {\n      return true;\n    }\n    // reported features:\n    // 62 - VT220\n    // 4 - SIXEL support\n    // 9 - charsets\n    // 22 - ANSI colors\n    if (this._opts.sixelSupport) {\n      this._report(`\\x1b[?62;4;9;22c`);\n      return true;\n    }\n    return false;\n  }\n\n  /**\n   * Implementation of xterm's graphics attribute sequence.\n   *\n   * Supported features:\n   * - read/change palette limits (max 4096 by sixel lib)\n   * - read SIXEL canvas geometry (reports current window canvas or\n   *   squared pixelLimit if canvas > pixel limit)\n   *\n   * Everything else is deactivated.\n   */\n  private _xtermGraphicsAttributes(params: (number | number[])[]): boolean {\n    if (params.length < 2) {\n      return true;\n    }\n    if (params[0] === GaItem.COLORS) {\n      switch (params[1]) {\n        case GaAction.READ:\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          return true;\n        case GaAction.SET_DEFAULT:\n          this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit;\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          // also reset protocol handlers for now\n          for (const handler of this._handlers.values()) {\n            handler.reset();\n          }\n          return true;\n        case GaAction.SET:\n          if (params.length > 2 && !(params[2] instanceof Array) && params[2] <= MAX_SIXEL_PALETTE_SIZE) {\n            this._opts.sixelPaletteLimit = params[2];\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          } else {\n            this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          }\n          return true;\n        case GaAction.READ_MAX:\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${MAX_SIXEL_PALETTE_SIZE}S`);\n          return true;\n        default:\n          this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          return true;\n      }\n    }\n    if (params[0] === GaItem.SIXEL_GEO) {\n      switch (params[1]) {\n        // we only implement read and read_max here\n        case GaAction.READ:\n          let width = this._renderer?.dimensions?.css.canvas.width;\n          let height = this._renderer?.dimensions?.css.canvas.height;\n          if (!width || !height) {\n            // for some reason we have no working image renderer\n            // --> fallback to default cell size\n            const cellSize = CELL_SIZE_DEFAULT;\n            width = (this._terminal?.cols || 80) * cellSize.width;\n            height = (this._terminal?.rows || 24) * cellSize.height;\n          }\n          if (width * height < this._opts.pixelLimit) {\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${width.toFixed(0)};${height.toFixed(0)}S`);\n          } else {\n            // if we overflow pixelLimit report that squared instead\n            const x = Math.floor(Math.sqrt(this._opts.pixelLimit));\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${x};${x}S`);\n          }\n          return true;\n        case GaAction.READ_MAX:\n          // read_max returns pixelLimit as square area\n          const x = Math.floor(Math.sqrt(this._opts.pixelLimit));\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${x};${x}S`);\n          return true;\n        default:\n          this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          return true;\n      }\n    }\n    // exit with error on ReGIS or any other requests\n    this._report(`\\x1b[?${params[0]};${GaStatus.ITEM_ERROR}S`);\n    return true;\n  }\n}\n"],
 -  "mappings": ";;;;;;;;;;;;;;;;02BAYaA,EAAA,WAAa,IAAI,WAAW,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,IAAM,IAClFA,EAAA,YACF,QAAQ,KAAK,6EAA6E,EAI5F,SAAgBC,GAAIC,EAAW,CAC7B,OAAOA,EAAI,GACb,CAFAF,EAAA,IAAAC,GAIA,SAAgBE,GAAMD,EAAW,CAC/B,OAAQA,IAAM,EAAK,GACrB,CAFAF,EAAA,MAAAG,GAIA,SAAgBC,GAAKF,EAAW,CAC9B,OAAQA,IAAM,GAAM,GACtB,CAFAF,EAAA,KAAAI,GAIA,SAAgBC,GAAMH,EAAW,CAC/B,OAAQA,IAAM,GAAM,GACtB,CAFAF,EAAA,MAAAK,GAQA,SAAgBC,EAAW,EAAWC,EAAWC,EAAWC,EAAY,IAAG,CACzE,QAASA,EAAI,MAAS,IAAMD,EAAI,MAAS,IAAMD,EAAI,MAAS,EAAK,EAAI,OAAW,CAClF,CAFAP,EAAA,WAAAM,EAQA,SAAgBI,GAAaC,EAAe,CAC1C,MAAO,CAACA,EAAQ,IAAOA,GAAS,EAAK,IAAOA,GAAS,GAAM,IAAMA,IAAU,EAAE,CAC/E,CAFAX,EAAA,aAAAU,GASA,SAAgBE,GAAkBD,EAAiBE,EAAmB,CACpE,IAAMC,EAAIb,GAAIU,CAAK,EACbJ,EAAIJ,GAAMQ,CAAK,EACfH,EAAIJ,GAAKO,CAAK,EAEhBI,EAAM,OAAO,iBACbC,EAAM,GAGV,QAASC,EAAI,EAAGA,EAAIJ,EAAQ,OAAQ,EAAEI,EAAG,CACvC,IAAMC,EAAKJ,EAAID,EAAQI,CAAC,EAAE,CAAC,EACrBE,EAAKZ,EAAIM,EAAQI,CAAC,EAAE,CAAC,EACrBG,EAAKZ,EAAIK,EAAQI,CAAC,EAAE,CAAC,EACrBI,EAAIH,EAAKA,EAAKC,EAAKA,EAAKC,EAAKA,EACnC,GAAI,CAACC,EAAG,OAAOJ,EACXI,EAAIN,IACNA,EAAMM,EACNL,EAAMC,GAIV,OAAOD,CACT,CAtBAhB,EAAA,kBAAAY,GA4BA,SAASU,GAAMC,EAAaC,EAAcC,EAAa,CACrD,OAAO,KAAK,IAAIF,EAAK,KAAK,IAAIE,EAAOD,CAAI,CAAC,CAC5C,CAEA,SAASE,GAAIC,EAAYC,EAAYC,EAAS,CAC5C,OAAIA,EAAI,IAAGA,GAAK,GACZA,EAAI,IAAGA,GAAK,GACTA,EAAI,EAAI,EACXD,GAAMD,EAAKC,GAAM,EAAIC,EACrBA,EAAI,EAAI,EACNF,EACAE,EAAI,EAAI,EACND,GAAMD,EAAKC,IAAO,EAAIC,EAAI,GAC1BD,CACV,CAEA,SAASE,GAASC,EAAWC,EAAWC,EAAS,CAC/C,GAAI,CAACA,EAAG,CACN,IAAMC,EAAI,KAAK,MAAMF,EAAI,GAAG,EAC5B,OAAO1B,EAAW4B,EAAGA,EAAGA,CAAC,EAE3B,IAAMP,EAAKK,EAAI,GAAMA,GAAK,EAAIC,GAAKD,EAAIC,EAAID,EAAIC,EACzCL,EAAK,EAAII,EAAIL,EACnB,OAAOrB,EACLgB,GAAM,EAAG,IAAK,KAAK,MAAMI,GAAIC,EAAIC,EAAIG,EAAI,EAAI,CAAC,EAAI,GAAG,CAAC,EACtDT,GAAM,EAAG,IAAK,KAAK,MAAMI,GAAIC,EAAIC,EAAIG,CAAC,EAAI,GAAG,CAAC,EAC9CT,GAAM,EAAG,IAAK,KAAK,MAAMI,GAAIC,EAAIC,EAAIG,EAAI,EAAI,CAAC,EAAI,GAAG,CAAC,CAAC,CAE3D,CAKA,SAAgBI,EAAa,EAAW5B,EAAWC,EAAS,CAC1D,OAAQ,WAAa,KAAK,MAAMA,EAAI,IAAM,GAAG,GAAK,GAAK,KAAK,MAAMD,EAAI,IAAM,GAAG,GAAK,EAAI,KAAK,MAAM,EAAI,IAAM,GAAG,KAAO,CACzH,CAFAP,EAAA,aAAAmC,EAQA,SAAgBC,GAAaL,EAAWC,EAAWC,EAAS,CAE1D,OAAOH,IAAUC,EAAI,IAAM,KAAO,IAAKC,EAAI,IAAKC,EAAI,GAAG,CACzD,CAHAjC,EAAA,aAAAoC,GAqCapC,EAAA,oBAAsB,IAAI,YAAY,CACjDmC,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACxB,EA0BYnC,EAAA,mBAAqB,IAAI,YAAY,CAChDmC,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACxB,EAOYnC,EAAA,kBAAoB,IAAK,CAEpC,IAAMqC,EAAgB,CACpB/B,EAAW,EAAG,EAAG,CAAC,EAClBA,EAAW,IAAK,EAAG,CAAC,EACpBA,EAAW,EAAG,IAAK,CAAC,EACpBA,EAAW,IAAK,IAAK,CAAC,EACtBA,EAAW,EAAG,EAAG,GAAG,EACpBA,EAAW,IAAK,EAAG,GAAG,EACtBA,EAAW,EAAG,IAAK,GAAG,EACtBA,EAAW,IAAK,IAAK,GAAG,EACxBA,EAAW,IAAK,IAAK,GAAG,EACxBA,EAAW,IAAK,EAAG,CAAC,EACpBA,EAAW,EAAG,IAAK,CAAC,EACpBA,EAAW,IAAK,IAAK,CAAC,EACtBA,EAAW,GAAI,GAAI,GAAG,EACtBA,EAAW,IAAK,EAAG,GAAG,EACtBA,EAAW,EAAG,IAAK,GAAG,EACtBA,EAAW,IAAK,IAAK,GAAG,GAGpBe,EAAI,CAAC,EAAG,GAAI,IAAK,IAAK,IAAK,GAAG,EACpC,QAASP,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB,QAASP,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB,QAASC,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB6B,EAAE,KAAK/B,EAAWe,EAAEP,CAAC,EAAGO,EAAEd,CAAC,EAAGc,EAAEb,CAAC,CAAC,CAAC,EAKzC,QAAS0B,EAAI,EAAGA,GAAK,IAAKA,GAAK,GAC7BG,EAAE,KAAK/B,EAAW4B,EAAGA,EAAGA,CAAC,CAAC,EAE5B,OAAO,IAAI,YAAYG,CAAC,CAC1B,GAAE,EASWrC,EAAA,mBAA+BM,EAAW,EAAG,EAAG,EAAG,GAAG,EACtDN,EAAA,mBAA+BM,EAAW,IAAK,IAAK,IAAK,GAAG,IChRzE,IAAAgC,GAAAC,EAAAC,IAAA,cAKA,OAAO,eAAeA,GAAS,aAAc,CAAE,MAAO,EAAK,CAAC,EAC5DA,GAAQ,OAASC,GACjB,IAAIC,EAAKC,GAAM,CACX,GAAI,WAAW,WACX,OAAO,WAAW,WAAWA,CAAC,EAClC,GAAI,OAAO,OAAW,IAClB,OAAO,OAAO,KAAKA,EAAG,QAAQ,EAClC,IAAMC,EAAI,KAAKD,CAAC,EACVE,EAAI,IAAI,WAAWD,EAAE,MAAM,EACjC,QAAS,EAAI,EAAG,EAAIC,EAAE,OAAQ,EAAE,EAC5BA,EAAE,CAAC,EAAID,EAAE,WAAW,CAAC,EACzB,OAAOC,CACX,EACA,SAASJ,GAAOK,EAAK,CACjB,GAAIA,EAAI,EAAG,CACP,GAAM,CAAE,EAAAC,EAAG,EAAAJ,EAAG,EAAAK,CAAE,EAAIF,EAChBF,EACAK,EACEC,EAAI,YACV,OAAIH,IAAM,EACFJ,EACQQ,GAAM,IAAID,EAAE,SAASD,IAAMA,EAAI,IAAIC,EAAE,OAAON,IAAMA,EAAIF,EAAEM,CAAC,EAAE,GAAIG,CAAC,EACpEA,GAAMF,EACRC,EAAE,YAAYD,EAAGE,CAAC,EAClBD,EAAE,YAAYN,IAAMA,EAAIF,EAAEM,CAAC,GAAIG,CAAC,EAAE,KAAKN,IAAMI,EAAIJ,EAAE,SAAWA,EAAE,QAAQ,EAE9EE,IAAM,EACFJ,EACO,IAAMM,IAAMA,EAAI,IAAIC,EAAE,OAAON,IAAMA,EAAIF,EAAEM,CAAC,EAAE,GAChD,IAAMC,EACP,QAAQ,QAAQA,CAAC,EACjBC,EAAE,QAAQN,IAAMA,EAAIF,EAAEM,CAAC,EAAE,EAAE,KAAKH,GAAKI,EAAIJ,CAAC,EAEhDF,EACO,IAAMC,IAAMA,EAAIF,EAAEM,CAAC,GACvB,IAAM,QAAQ,QAAQJ,IAAMA,EAAIF,EAAEM,CAAC,EAAE,CAChD,CACA,GAAI,OAAO,SAAa,IACpB,MAAM,IAAI,MAAM,mBAAmB,EACvC,SAAS,IAAIF,CAAG,CACpB,IC7CA,IAAAM,GAAAC,EAAAC,IAAA,cACA,OAAO,eAAeA,GAAS,aAAc,CAAE,MAAO,EAAK,CAAC,EAK5D,IAAMC,GAAmB,KAInBC,MAAiBD,GAAiB,QAAuD,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,0lCAA0lC,CAA8C,EAuJ5uCE,EAAM,IAAI,WAAW,mEACtB,MAAM,EAAE,EACR,IAAIC,GAAMA,EAAG,WAAW,CAAC,CAAC,CAAC,EAE1BC,EAAI,IAAI,YAAY,IAAI,EAC9BA,EAAE,KAAK,UAAU,EACjB,QAASC,EAAI,EAAGA,EAAIH,EAAI,OAAQ,EAAEG,EAC9BD,EAAEF,EAAIG,CAAC,CAAC,EAAIA,GAAK,EACrB,QAASA,EAAI,EAAGA,EAAIH,EAAI,OAAQ,EAAEG,EAC9BD,EAAE,IAAMF,EAAIG,CAAC,CAAC,EAAIA,GAAK,GAAMA,GAAK,EAAK,MAAS,EACpD,QAASA,EAAI,EAAGA,EAAIH,EAAI,OAAQ,EAAEG,EAC9BD,EAAE,IAAMF,EAAIG,CAAC,CAAC,EAAKA,GAAK,GAAM,GAAMA,GAAK,EAAK,MAAS,GAC3D,QAASA,EAAI,EAAGA,EAAIH,EAAI,OAAQ,EAAEG,EAC9BD,EAAE,IAAMF,EAAIG,CAAC,CAAC,EAAIA,GAAK,GAC3B,IAAMC,GAAQ,IAAI,WAAW,CAAC,EAWxBC,GAAN,KAAoB,CAMhB,YAAYC,EAAUC,EAAUC,EAAc,CAO1C,GANA,KAAK,MAAQ,KACb,KAAK,OAAS,GACd,KAAK,OAAS,EACd,KAAK,SAAWF,GAAsD,QACtE,KAAK,SAAWC,GAAsD,WACtE,KAAK,OAASC,GAAkE,MAC5E,KAAK,OAAS,KAAK,UAAY,KAAK,SAAW,WAC/C,MAAM,IAAI,MAAM,uBAAuB,CAE/C,CAKA,IAAI,OAAQ,CACR,OAAO,KAAK,MAAQ,KAAK,GAAG,SAAS,EAAG,KAAK,KAAK,IAAuB,CAAC,EAAIJ,EAClF,CAMA,SAAU,CACD,KAAK,QAEN,KAAK,OAAS,KAAK,SACnB,KAAK,MAAQ,KAAK,KAAO,KAAK,GAAK,KAAK,KAAO,MAG/C,KAAK,KAAK,IAAuB,EAAI,EACrC,KAAK,KAAK,IAAuB,EAAI,EACrC,KAAK,KAAK,IAAuB,EAAI,GAE7C,CASA,KAAKG,EAAUC,EAAc,CAGzB,GAFA,KAAK,SAAWD,GAAsD,KAAK,SAC3E,KAAK,OAASC,GAAkE,KAAK,IAAI,KAAK,OAAQ,KAAK,QAAQ,EAC/G,KAAK,OAAS,KAAK,UAAY,KAAK,SAAW,WAC/C,MAAM,MAAM,uBAAuB,EAEvC,IAAIC,EAAI,KAAK,KACPC,EAAQ,KAAK,OAAS,KACvB,KAAK,MAOD,KAAK,KAAK,OAAO,WAAaA,IACnC,KAAK,KAAK,KAAK,KAAK,MAAMA,EAAQ,KAAK,KAAK,OAAO,YAAc,KAAK,CAAC,EACvED,EAAI,IAAI,YAAY,KAAK,KAAK,OAAQ,CAAC,EACvC,KAAK,GAAK,IAAI,WAAW,KAAK,KAAK,OAAQ,IAA6B,IATxE,KAAK,KAAO,IAAI,YAAY,OAAO,CAAE,QAAS,KAAK,KAAKC,EAAQ,KAAK,CAAE,CAAC,EACxE,KAAK,MAAQX,GAAW,CAAE,IAAK,CAAE,OAAQ,KAAK,IAAK,CAAE,CAAC,EACtDU,EAAI,IAAI,YAAY,KAAK,KAAK,OAAQ,CAAC,EACvCA,EAAE,IAAIP,EAAG,GAAgB,EACzB,KAAK,GAAK,IAAI,WAAW,KAAK,KAAK,OAAQ,IAA6B,GAO5EO,EAAE,IAAuB,EAAI,EAC7BA,EAAE,IAAuB,EAAI,EAC7BA,EAAE,IAAuB,EAAI,EAC7B,KAAK,KAAOA,EACZ,KAAK,OAAS,EAClB,CAOA,SAASE,EAAW,CAChB,IAAMC,EAAS,KAAK,KAAK,IAAuB,EAAID,EACpD,GAAI,KAAK,OAASC,EAAQ,CACtB,GAAIA,EAAS,KAAK,SACd,MAAO,GAEX,IAAIC,EAAU,KAAK,OACnB,MAAQA,GAAW,GAAKD,GAAQ,CAEhC,GADAC,EAAU,KAAK,IAAIA,EAAS,KAAK,QAAQ,EACrCA,EAAUD,EACV,MAAO,GAEX,GAAIC,EAAU,KAAgC,KAAK,KAAK,OAAO,WAAY,CACvE,IAAMC,EAAW,KAAK,MAAMD,EAAU,KAAgC,KAAK,KAAK,OAAO,YAAc,KAAK,EAC1G,KAAK,KAAK,KAAKC,CAAQ,EACvB,KAAK,KAAO,IAAI,YAAY,KAAK,KAAK,OAAQ,CAAC,EAC/C,KAAK,GAAK,IAAI,WAAW,KAAK,KAAK,OAAQ,IAA6B,CAC5E,CACA,KAAK,OAASD,CAClB,CACA,MAAO,EACX,CAOA,IAAIE,EAAM,CACN,GAAI,CAAC,KAAK,OAAS,KAAK,OACpB,MAAO,GAEX,GAAI,KAAK,SAASA,EAAK,MAAM,EACzB,MAAO,GAEX,IAAMN,EAAI,KAAK,KACf,YAAK,GAAG,IAAIM,EAAMN,EAAE,IAAuB,CAAC,EAC5CA,EAAE,IAAuB,GAAKM,EAAK,OAE5BN,EAAE,IAAuB,EAAIA,EAAE,IAAuB,GAAK,OAC5D,KAAK,MAAM,QAAQ,IAAI,EACvB,CACV,CAKA,KAAM,CACF,YAAK,OAAS,GACP,KAAK,MACN,KAAK,MAAM,QAAQ,IAAI,EACvB,EACV,CAIA,IAAI,aAAc,CACd,OAAO,KAAK,MACN,KAAK,KAAK,IAAuB,EACjC,CACV,CAIA,IAAI,WAAY,CACZ,OAAO,KAAK,MACN,KAAK,SAAW,KAAK,KAAK,IAAuB,EACjD,CACV,CACJ,EACAZ,GAAQ,QAAUQ,KCjVlB,IAAAW,GAAAC,EAAAC,IAAA,cACA,OAAO,eAAeA,GAAS,aAAc,CAAE,MAAO,EAAK,CAAC,EAK5D,IAAMC,GAAmB,KACnBC,MAAoBD,GAAiB,QAA2D,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,84BAA84B,CAAkD,EAC3iCE,GAAN,KAAiB,CACb,YAAYC,EAAU,CAClB,KAAK,SAAWA,EAChB,KAAK,MAAQ,EACb,KAAK,OAAS,CAClB,CACA,OAAOC,EAAG,CACN,KAAK,MAAQA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,EAAIA,EAAE,CAAC,EACtD,KAAK,OAASA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,GAAKA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,EACzD,IAAMC,EAAS,KAAK,MAAQ,KAAK,OAC3BC,EAAKD,EAAS,EACdE,EAAKH,EAAE,OAwBPI,EAAQ,KAAK,IAAIF,EAAIC,CAAE,GAAK,KAAK,IAAID,EAAIC,CAAE,GAAK,GAAK,KACtD,KAAK,MAID,KAAK,KAAK,OAAO,WAAaC,IACnC,KAAK,KAAK,KAAK,KAAK,MAAMA,EAAQ,KAAK,KAAK,OAAO,YAAc,KAAK,CAAC,EACvE,KAAK,GAAK,OALV,KAAK,KAAO,IAAI,YAAY,OAAO,CAAE,QAAS,KAAK,KAAKA,EAAQ,KAAK,CAAE,CAAC,EACxE,KAAK,MAAQP,GAAc,CAAE,IAAK,CAAE,OAAQ,KAAK,IAAK,CAAE,CAAC,GAMxD,KAAK,KACN,KAAK,GAAK,IAAI,WAAW,KAAK,KAAK,MAAM,GAG7C,IAAMQ,EAAU,KAAK,KAAK,OAAO,WAAaF,EAAM,KACpD,YAAK,GAAG,IAAIH,EAAGK,CAAM,EACrB,KAAK,MAAM,QAAQ,IAAIA,EAAQF,EAAIF,CAAM,EAClC,KAAK,GAAG,SAAS,KAAqB,KAAsBC,CAAE,CACzE,CACA,SAAU,CACD,KAAK,OAEN,KAAK,KAAK,OAAO,WAAa,KAAK,WACnC,KAAK,MAAQ,KAAK,GAAK,KAAK,KAAO,KAE3C,CACJ,EACAP,GAAQ,QAAUG,mGCpELQ,GAAA,OAAS,CACpB,WAAY,MACZ,aAAc,KACd,UAAW,MACX,MAAO,wtdCCT,IAAAC,EAAA,IACAC,EAAA,KAIA,SAASC,GAAaC,EAAS,CAC7B,GAAI,OAAO,OAAW,IACpB,OAAO,OAAO,KAAKA,EAAG,QAAQ,EAEhC,IAAMC,EAAa,KAAKD,CAAC,EACnBE,EAAS,IAAI,WAAWD,EAAW,MAAM,EAC/C,QAAS,EAAI,EAAG,EAAIC,EAAO,OAAQ,EAAE,EACnCA,EAAO,CAAC,EAAID,EAAW,WAAW,CAAC,EAErC,OAAOC,CACT,CAEA,IAAMC,GAAaJ,GAAaD,EAAA,OAAO,KAAK,EACxCM,EAGEC,GAAc,IAAI,YAIlBC,GAAN,KAAmB,CAAnB,aAAA,CACS,KAAA,YAAeC,GAAkB,EACjC,KAAA,YAAeC,GAAoB,CAO5C,CANS,YAAYD,EAAa,CAC9B,OAAO,KAAK,YAAYA,CAAK,CAC/B,CACO,YAAYC,EAAY,CAC7B,OAAO,KAAK,YAAYA,CAAI,CAC9B,GAKIC,GAA2C,CAC/C,YAAa,KAAO,MACpB,WAAYZ,EAAA,mBACZ,UAAWA,EAAA,mBACX,QAASA,EAAA,oBACT,aAAcC,EAAA,OAAO,aACrB,SAAU,IAQZ,SAAgBY,GAAaC,EAAsB,CACjD,IAAMC,EAAU,IAAIN,GACdO,EAAY,CAChB,IAAK,CACH,YAAaD,EAAQ,YAAY,KAAKA,CAAO,EAC7C,YAAaA,EAAQ,YAAY,KAAKA,CAAO,IAGjD,OAAO,YAAY,YAAYR,GAAeD,GAAYU,CAAS,EAChE,KAAMC,IACLV,EAAcA,GAAeU,EAAK,OAC3B,IAAIC,EAAQJ,EAAMG,EAAK,UAAYA,EAAMF,CAAO,EACxD,CACL,CAbAI,EAAA,aAAAN,GAgDA,IAAaK,EAAb,KAAoB,CAwGlB,YACEJ,EACAM,EACAC,EAAwB,CAGxB,GAvGM,KAAA,cAAgBpB,EAAA,OAAO,UAAY,EAEnC,KAAA,QAAuBO,GACvB,KAAA,YAAwB,CAAA,EACxB,KAAA,UAAY,EACZ,KAAA,UAAYP,EAAA,OAAO,UACnB,KAAA,YAAc,EACd,KAAA,eAAiB,EA+FvB,KAAK,MAAQ,OAAO,OAAO,CAAA,EAAIW,GAAiBE,CAAI,EAChD,KAAK,MAAM,aAAeb,EAAA,OAAO,aACnC,MAAM,IAAI,MAAM,+CAA+CA,EAAA,OAAO,YAAY,EAAE,EAEtF,GAAKmB,EASHC,EAAU,YAAc,KAAK,aAAa,KAAK,IAAI,EACnDA,EAAU,YAAc,KAAK,YAAY,KAAK,IAAI,MAVpC,CACd,IAAMC,EAASf,IAAgBA,EAAc,IAAI,YAAY,OAAOD,EAAU,GAC9Ec,EAAY,IAAI,YAAY,SAASE,EAAQ,CAC3C,IAAK,CACH,YAAa,KAAK,aAAa,KAAK,IAAI,EACxC,YAAa,KAAK,YAAY,KAAK,IAAI,GAE1C,EAKH,KAAK,UAAYF,EACjB,KAAK,MAAQ,KAAK,UAAU,QAC5B,KAAK,OAAS,IAAI,WAAW,KAAK,MAAM,OAAO,OAAQ,KAAK,MAAM,kBAAiB,EAAInB,EAAA,OAAO,UAAU,EACxG,KAAK,QAAU,IAAI,YAAY,KAAK,MAAM,OAAO,OAAQ,KAAK,MAAM,kBAAiB,EAAI,EAAE,EAC3F,KAAK,SAAW,IAAI,YAAY,KAAK,MAAM,OAAO,OAAQ,KAAK,MAAM,oBAAmB,EAAIA,EAAA,OAAO,YAAY,EAC/G,KAAK,SAAS,IAAI,KAAK,MAAM,OAAO,EACpC,KAAK,MAAQ,IAAI,YAAY,KAAK,MAAM,OAAO,OAAQ,KAAK,MAAM,eAAc,CAAE,EAClF,KAAK,MAAM,KAAKD,EAAA,mBAAoB,EAAG,KAAK,MAAM,aAAc,CAAC,CACnE,CApHA,IAAY,YAAU,CAAe,OAAO,KAAK,QAAQ,CAAC,CAAG,CAC7D,IAAY,WAAS,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CAC1D,IAAY,cAAY,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CAC7D,IAAY,eAAa,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CAC9D,IAAY,QAAM,CAAa,OAAO,KAAK,QAAQ,CAAC,EAAI,KAAK,QAAQ,CAAC,EAAI,EAAI,CAAG,CACjF,IAAY,SAAO,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CACxD,IAAY,QAAM,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CACvD,IAAY,OAAK,CAAgB,OAAO,KAAK,QAAQ,EAAE,CAAG,CAC1D,IAAY,eAAa,CAAa,OAAO,KAAK,QAAQ,EAAE,CAAG,CAEvD,YAAYW,EAAe,CACjC,GAAIA,IAAI,EAAmB,CACzB,IAAMY,EAAS,KAAK,MAAQ,KAAK,OACjC,GAAIA,EAAS,KAAK,QAAQ,OAAQ,CAChC,GAAI,KAAK,MAAM,aAAeA,EAAS,EAAI,KAAK,MAAM,YACpD,WAAK,QAAO,EACN,IAAI,MAAM,4BAA4B,EAE9C,KAAK,QAAU,IAAI,YAAYA,CAAM,EAEvC,KAAK,UAAY,KAAK,eACbZ,IAAI,EACb,GAAI,KAAK,SAAW,EAAG,CAErB,IAAMY,EAAS,KAAK,IAAI,KAAK,aAActB,EAAA,OAAO,SAAS,EAAI,KAAK,cACpE,GAAIsB,EAAS,KAAK,QAAQ,OAAQ,CAChC,GAAI,KAAK,MAAM,aAAeA,EAAS,EAAI,KAAK,MAAM,YACpD,WAAK,QAAO,EACN,IAAI,MAAM,4BAA4B,EAE9C,KAAK,QAAU,IAAI,YAAYA,CAAM,QAInC,KAAK,QAAQ,OAAS,QACxB,KAAK,QAAU,IAAI,YAAY,KAAK,GAI1C,MAAO,EACT,CAEQ,SAASC,EAAgBC,EAAwB,CACvD,IAAMF,EAASC,EAASC,EACxB,GAAIF,EAAS,KAAK,QAAQ,OAAQ,CAChC,GAAI,KAAK,MAAM,aAAeA,EAAS,EAAI,KAAK,MAAM,YACpD,WAAK,QAAO,EACN,IAAI,MAAM,4BAA4B,EAG9C,IAAMG,EAAY,IAAI,YAAY,KAAK,KAAKH,EAAS,KAAK,EAAI,KAAK,EACnEG,EAAU,IAAI,KAAK,OAAO,EAC1B,KAAK,QAAUA,EAEnB,CAEQ,aAAahB,EAAa,CAChC,IAAMiB,EAAM,KAAK,cACbH,EAAS,KAAK,YAClB,GAAI,KAAK,QAAK,EAAmB,CAC/B,IAAII,EAAY,KAAK,OAAS,KAAK,eAC/BC,EAAI,EACR,KAAOA,EAAI,GAAKD,EAAY,GAC1B,KAAK,QAAQ,IAAI,KAAK,MAAM,SAASD,EAAME,EAAGF,EAAME,EAAInB,CAAK,EAAGc,EAASd,EAAQmB,CAAC,EAClFA,IACAD,IAEF,KAAK,aAAelB,EAAQmB,EAC5B,KAAK,gBAAkBA,UACd,KAAK,QAAK,EAAmB,CACtC,KAAK,SAASL,EAAQd,EAAQ,CAAC,EAC/B,KAAK,UAAY,KAAK,IAAI,KAAK,UAAWA,CAAK,EAC/C,KAAK,UAAY,KAAK,IAAI,KAAK,UAAWA,CAAK,EAC/C,QAASoB,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB,KAAK,QAAQ,IAAI,KAAK,MAAM,SAASH,EAAMG,EAAGH,EAAMG,EAAIpB,CAAK,EAAGc,EAASd,EAAQoB,CAAC,EAEpF,KAAK,YAAY,KAAKpB,CAAK,EAC3B,KAAK,aAAeA,EAAQ,EAC5B,KAAK,gBAAkB,EAEzB,MAAO,EACT,CA0CA,IAAW,OAAK,CACd,OAAO,KAAK,QAAK,EACb,KAAK,OACL,KAAK,IAAI,KAAK,UAAW,KAAK,MAAM,cAAa,CAAE,CACzD,CAOA,IAAW,QAAM,CACf,OAAO,KAAK,QAAK,EACb,KAAK,QACL,KAAK,MAAM,cAAa,EACtB,KAAK,YAAY,OAAS,EAAI,KAAK,MAAM,eAAc,EACvD,KAAK,YAAY,OAAS,CAClC,CAKA,IAAW,SAAO,CAChB,OAAO,KAAK,SAAS,SAAS,EAAG,KAAK,aAAa,CACrD,CAWA,IAAW,aAAW,CACpB,OAAO,KAAK,QAAQ,WAAa,KAAK,MAAM,OAAO,OAAO,WAAa,EAAI,KAAK,YAAY,MAC9F,CAKA,IAAW,YAAU,CACnB,MAAO,CACL,MAAO,KAAK,MACZ,OAAQ,KAAK,OACb,KAAM,KAAK,MACX,MAAO,KAAK,OACZ,SAAU,CAAC,CAAC,KAAK,UACjB,aAAc,KAAK,cACnB,UAAW,KAAK,WAChB,SAAU,KAAK,YACf,iBAAkB,CAChB,UAAW,KAAK,QAAQ,CAAC,EACzB,YAAa,KAAK,QAAQ,CAAC,EAC3B,MAAO,KAAK,aACZ,OAAQ,KAAK,eAGnB,CAOO,KACLqB,EAAsB,KAAK,MAAM,UACjCC,EAA8B,KAAK,MAAM,QACzCC,EAAuB,KAAK,MAAM,aAClCC,EAAoB,KAAK,MAAM,SAAQ,CAEvC,KAAK,MAAM,KAAK,KAAK,MAAM,WAAYH,EAAWE,EAAcC,EAAW,EAAI,CAAC,EAC5EF,GACF,KAAK,SAAS,IAAIA,EAAQ,SAAS,EAAG/B,EAAA,OAAO,YAAY,CAAC,EAE5D,KAAK,YAAY,OAAS,EAC1B,KAAK,UAAY,EACjB,KAAK,UAAYA,EAAA,OAAO,UACxB,KAAK,YAAc,EACnB,KAAK,eAAiB,CACxB,CAMO,OAAOkC,EAAsBC,EAAgB,EAAGC,EAAcF,EAAK,OAAM,CAC9E,IAAIG,EAAIF,EACR,KAAOE,EAAID,GAAK,CACd,IAAME,EAAS,KAAK,IAAIF,EAAMC,EAAGrC,EAAA,OAAO,UAAU,EAClD,KAAK,OAAO,IAAIkC,EAAK,SAASG,EAAGA,GAAKC,CAAM,CAAC,EAC7C,KAAK,MAAM,OAAO,EAAGA,CAAM,EAE/B,CAOO,aAAaJ,EAAcC,EAAgB,EAAGC,EAAcF,EAAK,OAAM,CAC5E,IAAIG,EAAIF,EACR,KAAOE,EAAID,GAAK,CACd,IAAME,EAAS,KAAK,IAAIF,EAAMC,EAAGrC,EAAA,OAAO,UAAU,EAClD,QAAS6B,EAAI,EAAGU,EAAIF,EAAGR,EAAIS,EAAQ,EAAET,EAAG,EAAEU,EACxC,KAAK,OAAOV,CAAC,EAAIK,EAAK,WAAWK,CAAC,EAEpCF,GAAKC,EACL,KAAK,MAAM,OAAO,EAAGA,CAAM,EAE/B,CAMA,IAAW,QAAM,CACf,GAAI,KAAK,QAAK,GAAqB,CAAC,KAAK,OAAS,CAAC,KAAK,OACtD,OAAO/B,GAIT,IAAMiC,EAAe,KAAK,MAAM,cAAa,EAE7C,GAAI,KAAK,QAAK,EAAmB,CAC/B,IAAIb,EAAY,KAAK,OAAS,KAAK,eACnC,GAAIA,EAAY,EAAG,CACjB,IAAMD,EAAM,KAAK,cACbH,EAAS,KAAK,YACdK,EAAI,EACR,KAAOA,EAAI,GAAKD,EAAY,GAC1B,KAAK,QAAQ,IAAI,KAAK,MAAM,SAASD,EAAME,EAAGF,EAAME,EAAIY,CAAY,EAAGjB,EAASiB,EAAeZ,CAAC,EAChGA,IACAD,IAEEA,GACF,KAAK,QAAQ,KAAK,KAAK,WAAYJ,EAASiB,EAAeZ,CAAC,EAGhE,OAAO,KAAK,QAAQ,SAAS,EAAG,KAAK,MAAQ,KAAK,MAAM,EAG1D,GAAI,KAAK,QAAK,EAAmB,CAC/B,GAAI,KAAK,YAAc,KAAK,UAAW,CACrC,IAAIa,EAAS,GACb,GAAID,EACF,GAAIA,IAAiB,KAAK,UACxBC,EAAS,OACJ,CACL,IAAMf,EAAM,KAAK,cACbH,EAAS,KAAK,YAClB,KAAK,SAASA,EAAQiB,EAAe,CAAC,EACtC,QAASX,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB,KAAK,QAAQ,IAAI,KAAK,MAAM,SAASH,EAAMG,EAAGH,EAAMG,EAAIW,CAAY,EAAGjB,EAASiB,EAAeX,CAAC,EAItG,GAAI,CAACY,EACH,OAAO,KAAK,QAAQ,SAAS,EAAG,KAAK,MAAQ,KAAK,MAAM,EAM5D,IAAMC,EAAQ,IAAI,YAAY,KAAK,MAAQ,KAAK,MAAM,EACtDA,EAAM,KAAK,KAAK,UAAU,EAC1B,IAAIC,EAAc,EACdR,EAAQ,EACZ,QAASN,EAAI,EAAGA,EAAI,KAAK,YAAY,OAAQ,EAAEA,EAAG,CAChD,IAAMe,EAAK,KAAK,YAAYf,CAAC,EAC7B,QAASQ,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvBK,EAAM,IAAI,KAAK,QAAQ,SAASP,EAAOA,GAASS,CAAE,EAAGD,CAAW,EAChEA,GAAe,KAAK,MAIxB,GAAIH,EAAc,CAChB,IAAMd,EAAM,KAAK,cAEXmB,EAAgB,KAAK,MAAM,eAAc,EAC/C,QAAShB,EAAI,EAAGA,EAAIgB,EAAe,EAAEhB,EACnCa,EAAM,IAAI,KAAK,MAAM,SAAShB,EAAMG,EAAGH,EAAMG,EAAIW,CAAY,EAAGG,EAAc,KAAK,MAAQd,CAAC,EAGhG,OAAOa,EAIT,OAAOnC,EACT,CAMA,IAAW,OAAK,CACd,OAAO,IAAI,kBAAkB,KAAK,OAAO,OAAQ,EAAG,KAAK,MAAQ,KAAK,OAAS,CAAC,CAClF,CAcO,SAAO,CACZ,KAAK,QAAUA,GACf,KAAK,YAAY,OAAS,EAC1B,KAAK,UAAY,EACjB,KAAK,UAAYP,EAAA,OAAO,UAGxB,KAAK,MAAM,KAAKD,EAAA,mBAAoB,EAAG,KAAK,MAAM,aAAc,CAAC,CACnE,GAxWFmB,EAAA,QAAAD,EA2XC,SAAgB6B,GACfZ,EACArB,EAAsB,CAEtB,IAAMkC,EAAM,IAAI9B,EAAQJ,CAAI,EAC5B,OAAAkC,EAAI,KAAI,EACR,OAAOb,GAAS,SAAWa,EAAI,aAAab,CAAI,EAAIa,EAAI,OAAOb,CAAI,EAC5D,CACL,MAAOa,EAAI,MACX,OAAQA,EAAI,OACZ,OAAQA,EAAI,OACZ,MAAOA,EAAI,MAEf,CAbC7B,EAAA,OAAA4B,GAoBM,eAAeE,GACpBd,EACArB,EAAsB,CAEtB,IAAMkC,EAAM,MAAMnC,GAAaC,CAAI,EACnC,OAAAkC,EAAI,KAAI,EACR,OAAOb,GAAS,SAAWa,EAAI,aAAab,CAAI,EAAIa,EAAI,OAAOb,CAAI,EAC5D,CACL,MAAOa,EAAI,MACX,OAAQA,EAAI,OACZ,OAAQA,EAAI,OACZ,MAAOA,EAAI,MAEf,CAbA7B,EAAA,YAAA8B,KC7eO,SAASC,EAAaC,EAA6B,CACxD,MAAO,CAAE,QAASA,CAAG,CACvB,CAuBO,IAAMC,EAAN,KAA6C,CAA7C,cACL,KAAiB,aAAe,IAAI,IACpC,KAAQ,YAAc,GAEtB,IAAW,YAAsB,CAC/B,OAAO,KAAK,WACd,CAEO,IAA2BC,EAAS,CACzC,OAAI,KAAK,YACPA,EAAE,QAAQ,EAEV,KAAK,aAAa,IAAIA,CAAC,EAElBA,CACT,CAEO,SAAgB,CACrB,GAAI,MAAK,YAGT,MAAK,YAAc,GACnB,QAAWC,KAAK,KAAK,aACnBA,EAAE,QAAQ,EAEZ,KAAK,aAAa,MAAM,EAC1B,CAEO,OAAc,CACnB,QAAWA,KAAK,KAAK,aACnBA,EAAE,QAAQ,EAEZ,KAAK,aAAa,MAAM,CAC1B,CACF,EAEsBC,EAAf,KAAiD,CAAjD,cAGL,KAAmB,OAAS,IAAIH,EAEzB,SAAgB,CACrB,KAAK,OAAO,QAAQ,CACtB,CAEU,UAAiCC,EAAS,CAClD,OAAO,KAAK,OAAO,IAAIA,CAAC,CAC1B,CACF,EAZsBE,EACG,KAAoB,OAAO,OAAO,CAAE,SAAU,CAAE,CAAE,CAAC,EAarE,IAAMC,EAAN,KAAsE,CAAtE,cAEL,KAAQ,YAAc,GAEtB,IAAW,OAAuB,CAChC,OAAO,KAAK,YAAc,OAAY,KAAK,MAC7C,CAEA,IAAW,MAAMC,EAAsB,CACjC,KAAK,aAAeA,IAAU,KAAK,SAGvC,KAAK,QAAQ,QAAQ,EACrB,KAAK,OAASA,EAChB,CAEO,OAAc,CACnB,KAAK,MAAQ,MACf,CAEO,SAAgB,CACrB,KAAK,YAAc,GACnB,KAAK,QAAQ,QAAQ,EACrB,KAAK,OAAS,MAChB,CACF,EClGO,IAAMC,EAAN,KAAiB,CAAjB,cACL,KAAQ,WAAqD,CAAC,EAC9D,KAAQ,UAAY,GAGpB,IAAW,OAAmB,CAC5B,OAAI,KAAK,OACA,KAAK,QAEd,KAAK,OAAS,CAACC,EAAyBC,EAAgBC,IAAkD,CACxG,GAAI,KAAK,UACP,OAAOC,EAAa,IAAM,CAAC,CAAC,EAG9B,IAAMC,EAAQ,CAAE,GAAIJ,EAAU,SAAAC,CAAS,EACvC,KAAK,WAAa,KAAK,WAAW,MAAM,EACxC,KAAK,WAAW,KAAKG,CAAK,EAE1B,IAAMC,EAASF,EAAa,IAAM,CAChC,IAAMG,EAAM,KAAK,WAAW,QAAQF,CAAK,EACrCE,IAAQ,KACV,KAAK,WAAa,KAAK,WAAW,MAAM,EACxC,KAAK,WAAW,OAAOA,EAAK,CAAC,EAEjC,CAAC,EAED,OAAIJ,IACE,MAAM,QAAQA,CAAW,EAC3BA,EAAY,KAAKG,CAAM,EAEvBH,EAAY,IAAIG,CAAM,GAInBA,CACT,EACO,KAAK,OACd,CAEO,KAAKE,EAAgB,CAC1B,GAAI,KAAK,WAAa,CAAC,KAAK,WAAW,OACrC,OAEF,GAAI,KAAK,WAAW,SAAW,EAAG,CAChC,KAAK,WAAW,CAAC,EAAE,GAAG,KAAK,KAAK,WAAW,CAAC,EAAE,SAAUA,CAAK,EAC7D,MACF,CACA,IAAMC,EAAY,KAAK,WACvB,QAAS,EAAI,EAAGC,EAAMD,EAAU,OAAQ,EAAIC,EAAK,EAAE,EACjDD,EAAU,CAAC,EAAE,GAAG,KAAKA,EAAU,CAAC,EAAE,SAAUD,CAAK,CAErD,CAEO,SAAgB,CACjB,KAAK,YAGT,KAAK,UAAY,GACjB,KAAK,WAAW,OAAS,EAC3B,CACF,EAEiBG,OAAV,CACE,SAASC,EAAWC,EAAiBC,EAA6B,CACvE,OAAOD,EAAKE,GAAKD,EAAG,KAAKC,CAAC,CAAC,CAC7B,CAFOJ,EAAS,QAAAC,EAIT,SAASI,EAAUR,EAAkBQ,EAA6B,CACvE,MAAO,CAACf,EAAyBC,EAAgBC,IACxCK,EAAMS,GAAKhB,EAAS,KAAKC,EAAUc,EAAIC,CAAC,CAAC,EAAG,OAAWd,CAAW,CAE7E,CAJOQ,EAAS,IAAAK,EAQT,SAASE,KAAUC,EAAgC,CACxD,MAAO,CAAClB,EAAyBC,EAAgBC,IAAkD,CACjG,IAAMiB,EAAQ,IAAIC,EAClB,QAAWb,KAASW,EAClBC,EAAM,IAAIZ,EAAMO,GAAKd,EAAS,KAAKC,EAAUa,CAAC,CAAC,CAAC,EAElD,OAAIZ,IACE,MAAM,QAAQA,CAAW,EAC3BA,EAAY,KAAKiB,CAAK,EAEtBjB,EAAY,IAAIiB,CAAK,GAGlBA,CACT,CACF,CAfOT,EAAS,IAAAO,EAmBT,SAASI,EAAmBd,EAAkBe,EAAqCC,EAA0B,CAClH,OAAAD,EAAQC,CAAO,EACRhB,EAAMO,GAAKQ,EAAQR,CAAC,CAAC,CAC9B,CAHOJ,EAAS,gBAAAW,IAhCDX,KAAA,ICvEjB,IAAAc,GAA2B,OAgBpB,IAAMC,EAAN,MAAMC,UAAsBC,CAAkC,CAmDnE,YAAoBC,EAAyB,CAC3C,MAAM,EADY,eAAAA,EAhDpB,KAAQ,QAAU,IAAI,IAGtB,KAAQ,gBAAkB,KAAK,UAAU,IAAIC,CAAmB,EA+C9D,KAAK,SAAW,KAAK,UAAU,MAAM,KACrC,KAAK,UAAU,MAAM,KAAQC,GAA8B,CACzD,KAAK,UAAU,KAAK,KAAK,UAAU,MAAOA,CAAM,EAChD,KAAK,MAAM,CACb,EACI,KAAK,UAAU,MAAM,eACvB,KAAK,MAAM,EAGb,KAAK,gBAAgB,MAAQ,KAAK,UAAU,MAAM,eAAe,eAAeC,GAAU,CACpFA,IAAW,aACb,KAAK,cAAc,EACnB,KAAK,gBAAgB,YAAY,EAAG,KAAK,UAAU,IAAI,EAE3D,CAAC,EACD,KAAK,UAAUC,EAAa,IAAM,CAChC,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,QAAQ,EAC5B,KAAK,UAAU,OAAS,KAAK,WAC/B,KAAK,UAAU,MAAM,KAAO,KAAK,SACjC,KAAK,SAAW,QAEd,KAAK,gBAAkB,KAAK,kBAC9B,KAAK,eAAe,YAAc,KAAK,gBACvC,KAAK,gBAAkB,QAEzB,KAAK,eAAiB,OACtB,KAAK,QAAQ,MAAM,EACnB,KAAK,oBAAoB,MAAM,EAC/B,KAAK,mBAAqB,OAC1B,KAAK,aAAe,MACtB,CAAC,CAAC,CACJ,CAnFA,IAAW,QAAwC,CAAE,OAAO,KAAK,QAAQ,IAAI,KAAK,GAAG,MAAQ,CAU7F,OAAc,aAAaC,EAAqCC,EAAeC,EAAmC,CAUhH,IAAMC,GAAUH,GAAiB,UAAU,cAAc,QAAQ,EACjE,OAAAG,EAAO,MAAQF,EAAQ,EACvBE,EAAO,OAASD,EAAS,EAClBC,CACT,CAGA,OAAc,gBAAgBC,EAA+BH,EAAeC,EAAgBG,EAAiC,CAC3H,GAAI,OAAO,WAAc,WAAY,CACnC,IAAMC,EAAUF,EAAI,gBAAgBH,EAAOC,CAAM,EACjD,OAAIG,GACFC,EAAQ,KAAK,IAAI,IAAI,kBAAkBD,EAAQ,EAAGJ,EAAQC,EAAS,CAAC,CAAC,EAEhEI,CACT,CACA,OAAOD,EACH,IAAI,UAAU,IAAI,kBAAkBA,EAAQ,EAAGJ,EAAQC,EAAS,CAAC,EAAGD,EAAOC,CAAM,EACjF,IAAI,UAAUD,EAAOC,CAAM,CACjC,CAGA,OAAc,kBAAkBK,EAA0D,CACxF,OAAI,OAAO,mBAAsB,WACxB,QAAQ,QAAQ,MAAS,EAE3B,kBAAkBA,CAAG,CAC9B,CA0CO,gBAAgBC,EAAsB,CACvCA,EACE,CAAC,KAAK,cAAgB,KAAK,SAAS,SAAW,IACjD,KAAK,mBAAmB,KAAK,IAAI,KAAK,SAAS,OAAS,EAAG,EAA4B,CAAC,GAG1F,KAAK,oBAAoB,MAAM,EAC/B,KAAK,mBAAqB,OAC1B,KAAK,aAAe,QAEtB,KAAK,gBAAgB,YAAY,EAAG,KAAK,UAAU,IAAI,CACzD,CAMA,IAAW,YAA4C,CACrD,OAAO,KAAK,UAAU,UACxB,CAKA,IAAW,UAAsB,CAC/B,MAAO,CACL,MAAO,KAAK,YAAY,IAAI,KAAK,OAAS,GAC1C,OAAQ,KAAK,YAAY,IAAI,KAAK,QAAU,EAC9C,CACF,CAKO,WAAWC,EAAeC,EAAaC,EAA0B,CACtE,IAAMC,EAAIH,GAAS,KAAK,YAAY,IAAI,KAAK,QAAU,GACjDI,EAAI,KAAK,YAAY,IAAI,OAAO,OAAS,EACzCC,GAAKJ,EAAM,EAAID,IAAU,KAAK,YAAY,IAAI,KAAK,QAAU,IAC/D,CAACE,GAASA,IAAU,QACtB,KAAK,QAAQ,IAAI,KAAK,GAAG,UAAU,EAAGC,EAAGC,EAAGC,CAAC,GAE3C,CAACH,GAASA,IAAU,WACtB,KAAK,QAAQ,IAAI,QAAQ,GAAG,UAAU,EAAGC,EAAGC,EAAGC,CAAC,CAEpD,CAKO,SAASH,EAA0B,CACxC,GAAI,CAACA,GAASA,IAAU,MAAO,CAC7B,IAAMP,EAAM,KAAK,QAAQ,IAAI,KAAK,EAClCA,GAAK,UAAU,EAAG,EAAGA,EAAI,OAAO,MAAOA,EAAI,OAAO,MAAM,CAC1D,CACA,GAAI,CAACO,GAASA,IAAU,SAAU,CAChC,IAAMP,EAAM,KAAK,QAAQ,IAAI,QAAQ,EACrCA,GAAK,UAAU,EAAG,EAAGA,EAAI,OAAO,MAAOA,EAAI,OAAO,MAAM,CAC1D,CACF,CAKO,KAAKW,EAAqBC,EAAgBC,EAAaC,EAAaC,EAAgB,EAAS,CAClG,IAAMf,EAAM,KAAK,QAAQ,IAAIW,EAAQ,KAAK,EAC1C,GAAI,CAACX,EACH,OAEF,GAAM,CAAE,MAAAH,EAAO,OAAAC,CAAO,EAAI,KAAK,SAG/B,GAAID,IAAU,IAAMC,IAAW,GAC7B,OAGF,KAAK,cAAca,EAASd,EAAOC,CAAM,EACzC,IAAMK,EAAMQ,EAAQ,OACdK,EAAO,KAAK,KAAKb,EAAI,MAAQN,CAAK,EAElCoB,EAAML,EAASI,EAAQnB,EACvBqB,EAAK,KAAK,MAAMN,EAASI,CAAI,EAAIlB,EACjCqB,EAAKN,EAAMhB,EACXuB,EAAKN,EAAMhB,EAGXuB,EAAaN,EAAQlB,EAAQoB,EAAKd,EAAI,MAAQA,EAAI,MAAQc,EAAKF,EAAQlB,EACvEyB,EAAcJ,EAAKpB,EAASK,EAAI,OAASA,EAAI,OAASe,EAAKpB,EAMjEE,EAAI,UACFG,EACA,KAAK,MAAMc,CAAE,EAAG,KAAK,MAAMC,CAAE,EAAG,KAAK,KAAKG,CAAU,EAAG,KAAK,KAAKC,CAAW,EAC5E,KAAK,MAAMH,CAAE,EAAG,KAAK,MAAMC,CAAE,EAAG,KAAK,KAAKC,CAAU,EAAG,KAAK,KAAKC,CAAW,CAC9E,CACF,CAKO,YAAYX,EAAqBC,EAA+C,CACrF,GAAM,CAAE,MAAAf,EAAO,OAAAC,CAAO,EAAI,KAAK,SAE/B,GAAID,IAAU,IAAMC,IAAW,GAC7B,OAEF,KAAK,cAAca,EAASd,EAAOC,CAAM,EACzC,IAAMK,EAAMQ,EAAQ,OACdK,EAAO,KAAK,KAAKb,EAAI,MAAQN,CAAK,EAClCoB,EAAML,EAASI,EAAQnB,EACvBqB,EAAK,KAAK,MAAMN,EAASI,CAAI,EAAIlB,EACjCuB,EAAaxB,EAAQoB,EAAKd,EAAI,MAAQA,EAAI,MAAQc,EAAKpB,EACvDyB,EAAcJ,EAAKpB,EAASK,EAAI,OAASA,EAAI,OAASe,EAAKpB,EAE3DC,EAASV,EAAc,aAAa,KAAK,SAAUgC,EAAYC,CAAW,EAC1EtB,EAAMD,EAAO,WAAW,IAAI,EAClC,GAAIC,EACF,OAAAA,EAAI,UACFG,EACA,KAAK,MAAMc,CAAE,EAAG,KAAK,MAAMC,CAAE,EAAG,KAAK,MAAMG,CAAU,EAAG,KAAK,MAAMC,CAAW,EAC9E,EAAG,EAAG,KAAK,MAAMD,CAAU,EAAG,KAAK,MAAMC,CAAW,CACtD,EACOvB,CAEX,CAKO,gBAAgBc,EAAaC,EAAaC,EAAgB,EAAS,CACxE,IAAMf,EAAM,KAAK,QAAQ,IAAI,KAAK,EAClC,GAAIA,EAAK,CACP,GAAM,CAAE,MAAAH,EAAO,OAAAC,CAAO,EAAI,KAAK,SAY/B,GATID,IAAU,IAAMC,IAAW,KAI1B,KAAK,aAECA,GAAU,KAAK,aAAc,QACtC,KAAK,mBAAmBA,EAAS,CAAC,EAFlC,KAAK,mBAAmB,KAAK,IAAIA,EAAS,EAAG,EAA4B,CAAC,EAIxE,CAAC,KAAK,cAAc,OACxBE,EAAI,UACF,KAAK,oBAAsB,KAAK,aAChCa,EAAMhB,EACLiB,EAAMhB,EAAU,EAAI,EAAI,EACzBD,EAAQkB,EACRjB,EACAe,EAAMhB,EACNiB,EAAMhB,EACND,EAAQkB,EACRjB,CACF,CACF,CACF,CAMO,eAAsB,CAC3B,IAAMW,EAAI,KAAK,YAAY,IAAI,OAAO,OAAS,EACzCC,EAAI,KAAK,YAAY,IAAI,OAAO,QAAU,EAChD,QAAWV,KAAO,KAAK,QAAQ,OAAO,GAChCA,EAAI,OAAO,QAAUS,GAAKT,EAAI,OAAO,SAAWU,KAClDV,EAAI,OAAO,MAAQS,EACnBT,EAAI,OAAO,OAASU,EAG1B,CAKQ,cAAca,EAAkBC,EAAsBC,EAA6B,CACzF,GAAID,IAAiBD,EAAK,eAAe,OAASE,IAAkBF,EAAK,eAAe,OACtF,OAEF,GAAM,CAAE,MAAOG,EAAe,OAAQC,CAAe,EAAIJ,EAAK,aAC9D,GAAIC,IAAiBE,GAAiBD,IAAkBE,EAAgB,CACtEJ,EAAK,OAASA,EAAK,KACnBA,EAAK,eAAe,MAAQG,EAC5BH,EAAK,eAAe,OAASI,EAC7B,MACF,CACA,IAAM5B,EAASV,EAAc,aAC3B,KAAK,SACL,KAAK,KAAKkC,EAAK,KAAM,MAAQC,EAAeE,CAAa,EACzD,KAAK,KAAKH,EAAK,KAAM,OAASE,EAAgBE,CAAc,CAC9D,EACM3B,EAAMD,EAAO,WAAW,IAAI,EAC9BC,IACFA,EAAI,UAAUuB,EAAK,KAAO,EAAG,EAAGxB,EAAO,MAAOA,EAAO,MAAM,EAC3DwB,EAAK,OAASxB,EACdwB,EAAK,eAAe,MAAQC,EAC5BD,EAAK,eAAe,OAASE,EAEjC,CAKQ,OAAc,CACpB,KAAK,eAAiB,KAAK,UAAU,MAAM,eAC3C,KAAK,gBAAkB,KAAK,eAAe,YAAY,KAAK,KAAK,cAAc,EAC/E,KAAK,eAAe,YAAeG,GAAkB,CACnD,QAAWC,IAAO,CAAC,GAAG,KAAK,QAAQ,KAAK,CAAC,EACvC,KAAK,mBAAmBA,CAAG,EAE7B,KAAK,iBAAiB,KAAK,KAAK,eAAgBD,CAAQ,CAC1D,CACF,CAEO,iBAAiBrB,EAAoB,MAAa,CAEvD,GAAI,CAAC,KAAK,UAAY,CAAC,KAAK,UAAU,MAAM,cAAe,CACzD,QAAQ,KAAK,oFAAoF,EACjG,MACF,CACA,GAAI,KAAK,QAAQ,IAAIA,CAAK,EACxB,OAEF,IAAMR,EAASV,EAAc,aAC3B,KAAK,SAAU,KAAK,YAAY,IAAI,OAAO,OAAS,EACpD,KAAK,YAAY,IAAI,OAAO,QAAU,CACxC,EACAU,EAAO,UAAU,IAAI,qBAAqBQ,CAAK,EAAE,EACjD,IAAMuB,EAAgB,KAAK,UAAU,MAAM,cAI3CA,EAAc,MAAM,UAAY,UAC5BvB,IAAU,UAKZR,EAAO,MAAM,OAAS,KACtB+B,EAAc,aAAa/B,EAAQ+B,EAAc,UAAU,IAK3D/B,EAAO,MAAM,OAAS,IACtB+B,EAAc,YAAY/B,CAAM,GAElC,IAAMC,EAAMD,EAAO,WAAW,KAAM,CAAE,MAAO,EAAK,CAAC,EACnD,GAAI,CAACC,EAAK,CACRD,EAAO,OAAO,EACd,MACF,CACA,KAAK,QAAQ,IAAIQ,EAAOP,CAAG,EAC3B,KAAK,SAASO,CAAK,CACrB,CAEO,mBAAmBA,EAAoB,MAAa,CACzD,IAAMP,EAAM,KAAK,QAAQ,IAAIO,CAAK,EAC9BP,IACFA,EAAI,OAAO,OAAO,EAClB,KAAK,QAAQ,OAAOO,CAAK,EAE7B,CAEO,SAASA,EAA4B,CAC1C,OAAO,KAAK,QAAQ,IAAIA,CAAK,CAC/B,CAEQ,mBAAmBT,EAAiB,GAAoC,CAC9E,KAAK,oBAAoB,MAAM,EAC/B,KAAK,mBAAqB,OAG1B,IAAMiC,EAAS,GACTC,EAAY3C,EAAc,aAAa,KAAK,SAAU0C,EAAQjC,CAAM,EACpEE,EAAMgC,EAAU,WAAW,KAAM,CAAE,MAAO,EAAM,CAAC,EACvD,GAAI,CAAChC,EAAK,OACV,IAAME,EAAUb,EAAc,gBAAgBW,EAAK+B,EAAQjC,CAAM,EAC3DmC,EAAM,IAAI,YAAY/B,EAAQ,KAAK,MAAM,EACzCgC,KAAQ,eAAW,EAAG,EAAG,CAAC,EAC1BC,KAAQ,eAAW,IAAK,IAAK,GAAG,EACtCF,EAAI,KAAKC,CAAK,EACd,QAAS1B,EAAI,EAAGA,EAAIV,EAAQ,EAAEU,EAAG,CAC/B,IAAM4B,EAAQ5B,EAAI,EACZ6B,EAAS7B,EAAIuB,EACnB,QAASO,EAAI,EAAGA,EAAIP,EAAQO,GAAK,EAC/BL,EAAII,EAASC,EAAIF,CAAK,EAAID,CAE9B,CACAnC,EAAI,aAAaE,EAAS,EAAG,CAAC,EAG9B,IAAML,EAAS,OAAO,MAAQkC,EAAS,EAAK,EAAEA,EAAS,IAAM,KAC7D,KAAK,aAAe1C,EAAc,aAAa,KAAK,SAAUQ,EAAOC,CAAM,EAC3E,IAAMyC,EAAO,KAAK,aAAa,WAAW,KAAM,CAAE,MAAO,EAAM,CAAC,EAChE,GAAI,CAACA,EAAM,CACT,KAAK,aAAe,OACpB,MACF,CACA,QAASC,EAAI,EAAGA,EAAI3C,EAAO2C,GAAKT,EAC9BQ,EAAK,UAAUP,EAAWQ,EAAG,CAAC,EAEhCnD,EAAc,kBAAkB,KAAK,YAAY,EAAE,KAAKoD,GAAU,KAAK,mBAAqBA,CAAM,CACpG,CAEA,IAAW,UAAiC,CAC1C,OAAO,KAAK,UAAU,MAAM,qBAAqB,OAAO,QAC1D,CACF,ECxZO,IAAMC,EAA+B,CAC1C,MAAO,EACP,OAAQ,EACV,EAQMC,EAAN,MAAMC,CAAkD,CAqDtD,YACEC,EAAc,EACdC,EAAgB,EACTC,EAAU,GACVC,EAAS,GAChB,CAFO,aAAAD,EACA,YAAAC,EAxDT,KAAQ,KAAe,EA4CvB,KAAQ,OAAiB,EAcvB,KAAK,KAAOH,EACZ,KAAK,OAASC,CAChB,CA3DA,IAAW,KAAc,CACvB,OAAI,KAAK,OAEJ,KAAK,KAAO,WACZ,KAAK,gBAAkB,GAGrB,KAAK,IACd,CACA,IAAW,IAAIG,EAAe,CAAE,KAAK,KAAOA,CAAO,CAEnD,IAAW,gBAAiC,CAE1C,OAAI,KAAK,UAGD,KAAK,KAAO,YAA6B,EACnD,CACA,IAAW,eAAeA,EAAuB,CAC/C,KAAK,MAAQ,WACb,KAAK,MAASA,GAAS,GAAM,SAC/B,CAEA,IAAW,gBAAyB,CAClC,OAAO,KAAK,KAAQ,QACtB,CACA,IAAW,eAAeA,EAAe,CACvC,KAAK,MAAQ,UACb,KAAK,MAAQA,EAAS,QACxB,CAEA,IAAW,wBAAiC,CAC1C,IAAMC,GAAO,KAAK,KAAO,aAA4B,GACrD,OAAIA,EAAM,EACDA,EAAM,WAERA,CACT,CACA,IAAW,uBAAuBD,EAAe,CAC/C,KAAK,MAAQ,UACb,KAAK,MAASA,GAAS,GAAM,UAC/B,CAGA,IAAW,OAAgB,CACzB,OAAO,KAAK,MACd,CACA,IAAW,MAAMA,EAAe,CAC9B,KAAK,OAASA,CAChB,CAYO,OAA6B,CASlC,OAAO,IAAIL,EAAmB,KAAK,KAAM,KAAK,OAAQ,KAAK,QAAS,KAAK,MAAM,CACjF,CAEO,SAAmB,CACxB,OAAO,KAAK,iBAAmB,GAAuB,KAAK,SAAW,GAAK,KAAK,UAAY,EAC9F,CACF,EACMO,EAAc,IAAIR,EAUXS,EAAN,KAA0C,CAkB/C,YACUC,EACAC,EACAC,EACR,CAHQ,eAAAF,EACA,eAAAC,EACA,WAAAC,EAnBV,KAAQ,QAAmC,IAAI,IAE/C,KAAQ,QAAU,EAElB,KAAQ,UAAY,EAEpB,KAAQ,cAAgB,GAExB,KAAQ,gBAAkB,GAE1B,KAAQ,YAAsB,KAW5B,GAAI,CACF,KAAK,SAAS,KAAK,MAAM,YAAY,CACvC,OAASC,EAAY,CACfA,aAAa,OACf,QAAQ,MAAMA,EAAE,OAAO,EAEzB,QAAQ,KAAK,0BAA0B,KAAK,SAAS,CAAC,KAAK,CAC7D,CACA,KAAK,iBAAmB,CACtB,KAAM,KAAK,UAAU,KACrB,KAAM,KAAK,UAAU,IACvB,CACF,CAEO,SAAgB,CACrB,KAAK,MAAM,CACb,CAEO,OAAc,CACnB,QAAWC,KAAQ,KAAK,QAAQ,OAAO,EACrCA,EAAK,QAAQ,QAAQ,EAIvB,KAAK,QAAQ,MAAM,EACnB,KAAK,UAAU,SAAS,CAC1B,CAEO,UAAmB,CACxB,OAAO,KAAK,YAAc,EAAI,GAChC,CAEO,SAASR,EAAqB,CACnC,GAAIA,EAAQ,IAAOA,EAAQ,IACzB,MAAM,WAAW,mEAAmE,EAEtF,KAAK,YAAeA,EAAQ,EAAI,MAAa,EAC7C,KAAK,aAAa,CAAC,CACrB,CAEO,UAAmB,CACxB,OAAO,KAAK,iBAAiB,EAAI,EAAI,GACvC,CAEQ,kBAA2B,CACjC,IAAIS,EAAe,EACnB,QAAWD,KAAQ,KAAK,QAAQ,OAAO,EACjCA,EAAK,OACPC,GAAgBD,EAAK,KAAK,MAAQA,EAAK,KAAK,OACxCA,EAAK,QAAUA,EAAK,SAAWA,EAAK,OACtCC,GAAgBD,EAAK,OAAO,MAAQA,EAAK,OAAO,SAItD,OAAOC,CACT,CAEQ,QAAQC,EAAkB,CAChC,IAAMF,EAAO,KAAK,QAAQ,IAAIE,CAAE,EAC3BF,IACL,KAAK,QAAQ,OAAOE,CAAE,EAElB,OAAO,aAAeF,EAAK,gBAAgB,aAC7CA,EAAK,KAAK,MAAM,EAElB,KAAK,iBAAiBE,CAAE,EAC1B,CAKO,eAAsB,CAE3B,IAAMC,EAAO,CAAC,EACd,OAAW,CAACD,EAAIF,CAAI,IAAK,KAAK,QAAQ,QAAQ,EACxCA,EAAK,aAAe,cACtBA,EAAK,QAAQ,QAAQ,EACrBG,EAAK,KAAKD,CAAE,GAGhB,QAAWA,KAAMC,EACf,KAAK,QAAQD,CAAE,EAGjB,KAAK,gBAAkB,GACvB,KAAK,cAAgB,EACvB,CAMO,YAAYA,EAAkB,CACnC,IAAMF,EAAO,KAAK,QAAQ,IAAIE,CAAE,EAC5BF,IACFA,EAAK,QAAQ,QAAQ,EACrB,KAAK,QAAQE,CAAE,EAEnB,CAaO,SAASE,EAAsCC,EAA6B,CAEjF,KAAK,aAAaD,EAAI,MAAQA,EAAI,MAAM,EAGxC,IAAIE,EAAW,KAAK,UAAU,UAC1BA,EAAS,QAAU,IAAMA,EAAS,SAAW,MAC/CA,EAAWrB,GAEb,IAAMsB,EAAO,KAAK,KAAKH,EAAI,MAAQE,EAAS,KAAK,EAC3CE,EAAO,KAAK,KAAKJ,EAAI,OAASE,EAAS,MAAM,EAE7ChB,EAAU,EAAE,KAAK,QAEjBmB,EAAS,KAAK,UAAU,MAAM,OAC9BC,EAAW,KAAK,UAAU,KAC1BC,EAAW,KAAK,UAAU,KAC1BC,EAAUH,EAAO,EACjBI,EAAUJ,EAAO,EACnBK,EAASF,EACTG,EAAY,EAEXV,EAAK,YACRI,EAAO,EAAI,EACXA,EAAO,EAAI,EACXK,EAAS,GAGX,KAAK,UAAU,MAAM,cAAc,iBAAiB,UAAUL,EAAO,CAAC,EACtE,QAASO,EAAM,EAAGA,EAAMR,EAAM,EAAEQ,EAAK,CACnC,IAAMC,EAAOR,EAAO,MAAM,IAAIA,EAAO,EAAIA,EAAO,KAAK,EACrD,QAASS,EAAM,EAAGA,EAAMX,GAClB,EAAAO,EAASI,GAAOR,GADQ,EAAEQ,EAE9B,KAAK,aAAaD,EAAwBH,EAASI,EAAK5B,EAAS0B,EAAMT,EAAOW,CAAG,EACjFH,IAEF,GAAIV,EAAK,UACHW,EAAMR,EAAO,GAAG,KAAK,UAAU,MAAM,cAAc,SAAS,UAE5D,EAAEC,EAAO,GAAKE,EAAU,MAE9BF,EAAO,EAAIK,CACb,CACA,KAAK,UAAU,MAAM,cAAc,iBAAiB,UAAUL,EAAO,CAAC,EAGlEJ,EAAK,UACHA,EAAK,YAAc,MACrBI,EAAO,EAAI,KAAK,IAAIK,EAASP,EAAMG,CAAQ,EAE3CD,EAAO,EAAIK,GAGbL,EAAO,EAAIG,EACXH,EAAO,EAAII,GAIb,IAAMV,EAAO,CAAC,EACd,OAAW,CAACD,EAAIF,CAAI,IAAK,KAAK,QAAQ,QAAQ,EACxCA,EAAK,UAAY,IACnBA,EAAK,QAAQ,QAAQ,EACrBG,EAAK,KAAKD,CAAE,GAGhB,QAAWA,KAAMC,EACf,KAAK,QAAQD,CAAE,EAKjB,IAAMiB,EAAY,KAAK,UAAU,eAAe,CAAC,EACjDA,GAAW,UAAU,IAAM,CACZ,KAAK,QAAQ,IAAI7B,CAAO,GAEnC,KAAK,QAAQA,CAAO,CAExB,CAAC,EAIG,KAAK,UAAU,OAAO,OAAO,OAAS,aACxC,KAAK,kBAAkB,EAIzB,IAAM8B,EAAsB,CAC1B,KAAMhB,EACN,aAAcE,EACd,OAAQF,EACR,eAAgB,CAAE,GAAGE,CAAS,EAC9B,OAAQa,GAAa,OACrB,UAAAJ,EACA,WAAY,KAAK,UAAU,OAAO,OAAO,KACzC,MAAOV,EAAK,MACZ,OAAQA,EAAK,MACf,EAGA,YAAK,QAAQ,IAAIf,EAAS8B,CAAO,EACjC,KAAK,eAAe,EACb9B,CACT,CAQO,OAAO+B,EAA6C,CAEzD,IAAIC,EAAe,GACfC,EAAkB,GACtB,QAAWvB,KAAQ,KAAK,QAAQ,OAAO,EAMrC,GALIA,EAAK,QAAU,SACjBuB,EAAkB,GAElBD,EAAe,GAEbA,GAAgBC,EAAiB,MAIvC,GAAID,GAAgB,CAAC,KAAK,UAAU,SAAS,KAAK,IAChD,KAAK,UAAU,iBAAiB,KAAK,EACjC,CAAC,KAAK,UAAU,SAAS,KAAK,GAAG,OAUvC,GARIC,GAAmB,CAAC,KAAK,UAAU,SAAS,QAAQ,GACtD,KAAK,UAAU,iBAAiB,QAAQ,EAI1C,KAAK,UAAU,cAAc,EAGzB,CAAC,KAAK,QAAQ,KAAM,CACjB,KAAK,gBACR,KAAK,UAAU,SAAS,EACxB,KAAK,cAAgB,GACrB,KAAK,gBAAkB,IAErB,KAAK,UAAU,SAAS,KAAK,GAC/B,KAAK,UAAU,mBAAmB,KAAK,EAErC,KAAK,UAAU,SAAS,QAAQ,GAClC,KAAK,UAAU,mBAAmB,QAAQ,EAE5C,MACF,CAGI,CAACD,GAAgB,KAAK,UAAU,SAAS,KAAK,IAChD,KAAK,UAAU,SAAS,KAAK,EAC7B,KAAK,UAAU,mBAAmB,KAAK,GAErC,CAACC,GAAmB,KAAK,UAAU,SAAS,QAAQ,IACtD,KAAK,UAAU,SAAS,QAAQ,EAChC,KAAK,UAAU,mBAAmB,QAAQ,GAIxC,KAAK,kBACP,KAAK,UAAU,SAAS,EACxB,KAAK,cAAgB,GACrB,KAAK,gBAAkB,IAGzB,GAAM,CAAE,MAAAC,EAAO,IAAAC,CAAI,EAAIJ,EACjBZ,EAAS,KAAK,UAAU,MAAM,OAC9BF,EAAO,KAAK,UAAU,MAAM,KAGlC,KAAK,UAAU,WAAWiB,EAAOC,CAAG,EAGpC,IAAMC,EAAgG,CAAC,EACjGC,EAAkE,CAAC,EAGzE,QAASX,EAAMQ,EAAOR,GAAOS,EAAK,EAAET,EAAK,CACvC,IAAMC,EAAOR,EAAO,MAAM,IAAIO,EAAMP,EAAO,KAAK,EAChD,GAAI,CAACQ,EAAM,OACX,QAASC,EAAM,EAAGA,EAAMX,EAAM,EAAEW,EAC9B,GAAID,EAAK,MAAMC,CAAG,EAAI,UAAsB,CAC1C,IAAInB,EAAyBkB,EAAK,eAAeC,CAAG,GAAKxB,EACnDJ,EAAUS,EAAE,QAClB,GAAIT,IAAY,QAAaA,IAAY,GACvC,SAEF,IAAM8B,EAAU,KAAK,QAAQ,IAAI9B,CAAO,EACxC,GAAIS,EAAE,SAAW,GAAI,CACnB,IAAM6B,EAAY7B,EAAE,OACd8B,EAAWX,EACbY,EAAQ,EAOZ,KACE,EAAEZ,EAAMX,GACJU,EAAK,MAAMC,CAAG,EAAI,YAClBnB,EAAIkB,EAAK,eAAeC,CAAG,GAAKxB,IAChCK,EAAE,UAAYT,GACdS,EAAE,SAAW6B,EAAYE,GAE7BA,IAEFZ,IACIE,EACEA,EAAQ,QACVM,EAAU,KAAK,CAAE,QAAAN,EAAS,OAAQQ,EAAW,IAAKC,EAAU,IAAAb,EAAK,MAAAc,CAAM,CAAC,EAEjE,KAAK,MAAM,iBACpBH,EAAiB,KAAK,CAAE,IAAKE,EAAU,IAAAb,EAAK,MAAAc,CAAM,CAAC,EAErD,KAAK,cAAgB,EACvB,CACF,CAEJ,CAGAJ,EAAU,KAAK,CAACK,EAAGC,IAAMD,EAAE,QAAQ,OAASC,EAAE,QAAQ,MAAM,EAG5D,QAAWC,KAAQN,EACjB,KAAK,UAAU,gBAAgBM,EAAK,IAAKA,EAAK,IAAKA,EAAK,KAAK,EAI/D,QAAWA,KAAQP,EACjB,KAAK,UAAU,KAAKO,EAAK,QAASA,EAAK,OAAQA,EAAK,IAAKA,EAAK,IAAKA,EAAK,KAAK,CAEjF,CAEO,eAAeC,EAA+C,CAEnE,GAAI,CAAC,KAAK,QAAQ,KAAM,CACtB,KAAK,iBAAmBA,EACxB,MACF,CAIA,GAAI,KAAK,iBAAiB,MAAQA,EAAQ,KAAM,CAC9C,KAAK,iBAAmBA,EACxB,MACF,CAGA,IAAMzB,EAAS,KAAK,UAAU,MAAM,OAC9BD,EAAOC,EAAO,MAAM,OACpB0B,EAAS,KAAK,iBAAiB,KAAO,EAC5C,QAASnB,EAAM,EAAGA,EAAMR,EAAM,EAAEQ,EAAK,CACnC,IAAMC,EAAOR,EAAO,MAAM,IAAIO,CAAG,EACjC,GAAIC,EAAK,MAAMkB,CAAM,EAAI,UAAsB,CAC7C,IAAMpC,EAAyBkB,EAAK,eAAekB,CAAM,GAAKzC,EACxDJ,EAAUS,EAAE,QAClB,GAAIT,IAAY,QAAaA,IAAY,GACvC,SAEF,IAAM8B,EAAU,KAAK,QAAQ,IAAI9B,CAAO,EACxC,GAAI,CAAC8B,EACH,SAGF,IAAMgB,EAAc,KAAK,MAAMhB,EAAQ,QAAQ,OAAS,GAAKA,EAAQ,eAAe,KAAK,EACzF,GAAKrB,EAAE,OAASqC,EAAe,GAAKA,EAClC,SAGF,IAAIC,EAAU,GACd,QAASC,EAAWH,EAAS,EAAGG,EAAWJ,EAAQ,KAAM,EAAEI,EACzD,GAAIrB,EAAK,MAAMqB,EAAW,EAAY,CAAY,EAAI,QAA0B,CAC9ED,EAAU,GACV,KACF,CAEF,GAAIA,EACF,SAGF,IAAMZ,EAAM,KAAK,IAAIS,EAAQ,KAAME,EAAerC,EAAE,OAASqC,EAAeD,CAAM,EAC9EI,EAAWxC,EAAE,OACjB,QAASyC,EAAYL,EAAS,EAAGK,EAAYf,EAAK,EAAEe,EAClD,KAAK,aAAavB,EAAwBuB,EAAWlD,EAAS,EAAEiD,CAAQ,EACxEnB,EAAQ,WAEZ,CACF,CAEA,KAAK,iBAAmBc,CAC1B,CAKO,qBAAqBO,EAAWC,EAA0C,CAE/E,IAAMzB,EADS,KAAK,UAAU,MAAM,OAChB,MAAM,IAAIyB,CAAC,EAC/B,GAAIzB,GAAQA,EAAK,MAAMwB,CAAC,EAAI,UAAsB,CAChD,IAAM1C,EAAyBkB,EAAK,eAAewB,CAAC,GAAK/C,EACzD,GAAIK,EAAE,SAAWA,EAAE,UAAY,GAAI,CACjC,IAAM4C,EAAO,KAAK,QAAQ,IAAI5C,EAAE,OAAO,GAAG,KAC1C,GAAI,OAAO,aAAe4C,aAAgB,YAAa,CACrD,IAAMC,EAASC,EAAc,aAAa,OAAO,SAAUF,EAAK,MAAOA,EAAK,MAAM,EAClF,OAAAC,EAAO,WAAW,IAAI,GAAG,UAAUD,EAAM,EAAG,EAAGA,EAAK,MAAOA,EAAK,MAAM,EAC/DC,CACT,CACA,OAAOD,CACT,CACF,CACF,CAKO,wBAAwBF,EAAWC,EAA0C,CAElF,IAAMzB,EADS,KAAK,UAAU,MAAM,OAChB,MAAM,IAAIyB,CAAC,EAC/B,GAAIzB,GAAQA,EAAK,MAAMwB,CAAC,EAAI,UAAsB,CAChD,IAAM1C,EAAyBkB,EAAK,eAAewB,CAAC,GAAK/C,EACzD,GAAIK,EAAE,SAAWA,EAAE,UAAY,IAAMA,EAAE,SAAW,GAAI,CACpD,IAAMC,EAAO,KAAK,QAAQ,IAAID,EAAE,OAAO,EACvC,GAAIC,EACF,OAAO,KAAK,UAAU,YAAYA,EAAMD,EAAE,MAAM,CAEpD,CACF,CACF,CAIQ,aAAa+C,EAAsB,CACzC,IAAMC,EAAO,KAAK,iBAAiB,EAC/BC,EAAUD,EACd,KAAO,KAAK,YAAcC,EAAUF,GAAQ,KAAK,QAAQ,MAAM,CAC7D,IAAM9C,EAAO,KAAK,QAAQ,IAAI,EAAE,KAAK,SAAS,EAC1CA,GAAQA,EAAK,OACfgD,GAAWhD,EAAK,KAAK,MAAQA,EAAK,KAAK,OACnCA,EAAK,QAAUA,EAAK,OAASA,EAAK,SACpCgD,GAAWhD,EAAK,OAAO,MAAQA,EAAK,OAAO,QAE7CA,EAAK,QAAQ,QAAQ,EACrB,KAAK,QAAQ,KAAK,SAAS,EAE/B,CACA,OAAO+C,EAAOC,CAChB,CAEQ,aAAa/B,EAAsBwB,EAAWnD,EAAiBC,EAAsB,CAC3F,GAAI0B,EAAK,MAAMwB,EAAI,EAAY,CAAO,EAAI,UAAsB,CAC9D,IAAMQ,EAAMhC,EAAK,eAAewB,CAAC,EACjC,GAAIQ,EAAK,CACP,GAAIA,EAAI,UAAY,OAAW,CAI7B,IAAMC,EAAU,KAAK,QAAQ,IAAID,EAAI,OAAO,EACxCC,GAEFA,EAAQ,YAEVD,EAAI,QAAU3D,EACd2D,EAAI,OAAS1D,EACb,MACF,CAEA0B,EAAK,eAAewB,CAAC,EAAI,IAAIvD,EAAmB+D,EAAI,IAAKA,EAAI,MAAO3D,EAASC,CAAM,EACnF,MACF,CACF,CAEA0B,EAAK,MAAMwB,EAAI,EAAY,CAAO,GAAK,UACvCxB,EAAK,eAAewB,CAAC,EAAI,IAAIvD,EAAmB,EAAG,EAAGI,EAASC,CAAM,CACvE,CAEQ,mBAA0B,CAEhC,QAAWS,KAAQ,KAAK,QAAQ,OAAO,EACjCA,EAAK,aAAe,cACtBA,EAAK,UAAY,GAIrB,IAAMS,EAAS,KAAK,UAAU,MAAM,OACpC,QAASiC,EAAI,EAAGA,EAAI,KAAK,UAAU,KAAM,EAAEA,EAAG,CAC5C,IAAMzB,EAAOR,EAAO,MAAM,IAAIiC,CAAC,EAC/B,GAAKzB,GAGL,QAASwB,EAAI,EAAGA,EAAI,KAAK,UAAU,KAAM,EAAEA,EACzC,GAAIxB,EAAK,MAAMwB,EAAI,EAAY,CAAO,EAAI,UAAsB,CAC9D,IAAMU,EAAQlC,EAAK,eAAewB,CAAC,GAAG,QACtC,GAAIU,EAAO,CACT,IAAMnD,EAAO,KAAK,QAAQ,IAAImD,CAAK,EAC/BnD,GACFA,EAAK,WAET,CACF,EAEJ,CAEA,IAAMG,EAAO,CAAC,EACd,OAAW,CAACD,EAAIF,CAAI,IAAK,KAAK,QAAQ,QAAQ,EACxCA,EAAK,aAAe,aAAe,CAACA,EAAK,YAC3CA,EAAK,QAAQ,QAAQ,EACrBG,EAAK,KAAKD,CAAE,GAGhB,QAAWA,KAAMC,EACf,KAAK,QAAQD,CAAE,CAEnB,CACF,ECnpBA,IAAAkD,GAA0B,QAC1BC,GAAuB,QC2CvB,SAASC,EAAMC,EAA2B,CACxC,IAAIC,EAAI,GACR,QAASC,EAAI,EAAGA,EAAIF,EAAK,OAAQ,EAAEE,EACjCD,GAAK,OAAO,aAAaD,EAAKE,CAAC,CAAC,EAElC,OAAOD,CACT,CAGA,SAASE,GAAMH,EAA2B,CACxC,IAAII,EAAI,EACR,QAASF,EAAI,EAAGA,EAAIF,EAAK,OAAQ,EAAEE,EAAG,CACpC,GAAIF,EAAKE,CAAC,EAAI,IAAMF,EAAKE,CAAC,EAAI,GAC5B,MAAM,IAAI,MAAM,cAAc,EAEhCE,EAAIA,EAAI,GAAKJ,EAAKE,CAAC,EAAI,EACzB,CACA,OAAOE,CACT,CAGA,SAASC,GAAOL,EAA2B,CACzC,IAAMI,EAAIL,EAAMC,CAAI,EACpB,GAAI,CAACI,EAAE,MAAM,kCAAkC,EAC7C,MAAM,IAAI,MAAM,cAAc,EAEhC,OAAOA,CACT,CAGA,SAASE,GAAON,EAA2B,CACzC,GAAI,OAAO,OAAW,IACpB,OAAO,OAAO,KAAKD,EAAMC,CAAI,EAAG,QAAQ,EAAE,SAAS,EAErD,IAAMO,EAAK,KAAKR,EAAMC,CAAI,CAAC,EACrBQ,EAAI,IAAI,WAAWD,EAAG,MAAM,EAClC,QAAS,EAAI,EAAG,EAAIC,EAAE,OAAQ,EAAE,EAC9BA,EAAE,CAAC,EAAID,EAAG,WAAW,CAAC,EAExB,OAAO,IAAI,YAAY,EAAE,OAAOC,CAAC,CACnC,CAEA,IAAMC,GAAiE,CACrE,OAAQN,GACR,KAAMA,GACN,KAAMG,GACN,MAAOD,GACP,OAAQA,GACR,oBAAqBF,EACvB,EAKMO,GAAc,CAAC,GAAI,IAAK,IAAK,GAAG,EAEhCC,GAAuB,CAAC,GAAI,IAAK,IAAK,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,GAAI,IAAK,IAAK,GAAG,EAEpFC,GAAkB,CAAC,GAAI,IAAK,IAAK,IAAK,GAAI,GAAI,IAAK,GAAG,EAEtDC,GAAiB,CAAC,GAAI,IAAK,IAAK,IAAK,GAAI,IAAK,GAAG,EAEjDC,GAAwB,CAAC,GAAI,IAAK,IAAK,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,GAAG,EAG1FC,GAAiB,KAGVC,EAAN,KAAmB,CAAnB,cACL,KAAO,MAAqB,EAC5B,KAAQ,QAAU,IAAI,YAAYD,EAAc,EAChD,KAAQ,UAAY,EACpB,KAAQ,KAAO,GACf,KAAO,OAA4E,CAAC,EAE7E,OAAc,CACnB,KAAK,QAAQ,KAAK,CAAC,EACnB,KAAK,MAAQ,EACb,KAAK,UAAY,EACjB,KAAK,OAAS,CAAC,EACf,KAAK,KAAO,EACd,CAEO,KAAc,CACnB,GAAI,KAAK,QAAU,EAAmB,CACpC,GAAI,KAAK,YAAcF,GAAe,OAAQ,CAC5C,QAASI,EAAI,EAAGA,EAAIJ,GAAe,OAAQ,EAAEI,EAC3C,GAAI,KAAK,QAAQA,CAAC,IAAMJ,GAAeI,CAAC,EAAG,OAAO,KAAK,GAAG,EAE5D,YAAK,OAAO,KAAU,EACtB,KAAK,MAAQ,EACN,CACT,CACA,GAAI,KAAK,YAAcH,GAAsB,OAAQ,CACnD,QAASG,EAAI,EAAGA,EAAIH,GAAsB,OAAQ,EAAEG,EAClD,GAAI,KAAK,QAAQA,CAAC,IAAMH,GAAsBG,CAAC,EAAG,OAAO,KAAK,GAAG,EAEnE,YAAK,OAAO,KAAU,EACtB,KAAK,MAAQ,EACN,CACT,CACA,OAAO,KAAK,GAAG,CACjB,CACA,OAAI,KAAK,QAAU,EAAwB,EACvC,KAAK,QAAU,GACd,KAAK,OAAO,OAAS,EAEnB,KAAK,YAAY,KAAK,SAAS,GACpC,KAAK,MAAQ,EACN,GAFuC,KAAK,GAAG,EAIjD,KAAK,GAAG,CACjB,CAEO,MAAMjB,EAAmBkB,EAAeC,EAAqB,CAClE,IAAIC,EAAQ,KAAK,MACbC,EAAM,KAAK,UACTC,EAAS,KAAK,QAEpB,GADIF,IAAU,GAAqBA,IAAU,GACzCA,IAAU,GAAqBC,EAAM,GAAI,MAAO,GACpD,QAASnB,EAAIgB,EAAOhB,EAAIiB,EAAK,EAAEjB,EAAG,CAChC,IAAMqB,EAAIvB,EAAKE,CAAC,EAChB,OAAQqB,EAAG,CACT,IAAK,IACH,GAAI,CAAC,KAAK,YAAYF,CAAG,EAAG,OAAO,KAAK,GAAG,EAC3CD,EAAQ,EACRC,EAAM,EACN,MACF,IAAK,IACH,GAAID,IAAU,EAAmB,CAC/B,GAAIE,EAAO,CAAC,IAAM,GAAI,CAEpB,IAAIL,EAAI,EACR,KAAOA,EAAIP,GAAY,OAAQ,EAAEO,EAC/B,GAAIK,EAAOL,CAAC,IAAMP,GAAYO,CAAC,EAAG,OAAO,KAAK,GAAG,EAGnD,GADA,KAAK,OAAO,KAAU,EAClBI,IAAQT,GAAgB,OAAQ,CAClC,KAAOK,EAAIL,GAAgB,OAAQ,EAAEK,EACnC,GAAIK,EAAOL,CAAC,IAAML,GAAgBK,CAAC,EAAG,OAAO,KAAK,GAAG,EAEvD,YAAK,OAAO,KAAU,EACtB,KAAK,MAAQ,EACNf,EAAI,CACb,CACF,SAAWoB,EAAO,CAAC,IAAM,GAAI,CAE3B,QAASL,EAAI,EAAGA,EAAIN,GAAqB,OAAQ,EAAEM,EACjD,GAAIK,EAAOL,CAAC,IAAMN,GAAqBM,CAAC,EAAG,OAAO,KAAK,GAAG,EAE5D,KAAK,OAAO,KAAU,CACxB,KACE,QAAO,KAAK,GAAG,EAEjBG,EAAQ,EACRC,EAAM,CACR,SAAWD,IAAU,EAAiB,CACpC,GAAI,CAAC,KAAK,UAAUC,CAAG,EAAG,OAAO,KAAK,GAAG,EACzCD,EAAQ,EACRC,EAAM,CACR,SAAWD,IAAU,EAAmB,CACtC,GAAIC,GAAON,GAAgB,OAAO,KAAK,GAAG,EAC1CO,EAAOD,GAAK,EAAIE,CAClB,CACA,MACF,IAAK,IACH,OAAIH,IAAU,GACR,CAAC,KAAK,YAAYC,CAAG,EAAU,KAAK,GAAG,GAE7C,KAAK,MAAQ,EACNnB,EAAI,GACb,QACE,GAAImB,GAAON,GAAgB,OAAO,KAAK,GAAG,EAC1CO,EAAOD,GAAK,EAAIE,CACpB,CACF,CACA,YAAK,MAAQH,EACb,KAAK,UAAYC,EACV,EACT,CAEQ,IAAa,CACnB,YAAK,OAAO,KAAO,EACnB,KAAK,MAAQ,EACN,EACT,CAEQ,UAAUA,EAAsB,CACtC,IAAMJ,EAAIlB,EAAM,KAAK,QAAQ,SAAS,EAAGsB,CAAG,CAAC,EAC7C,OAAIJ,GACF,KAAK,KAAOA,EACZ,KAAK,OAAOA,CAAC,EAAI,KACV,IAEF,EACT,CAEQ,YAAYI,EAAsB,CACxC,GAAI,KAAK,KAAM,CACb,GAAI,CACF,IAAMjB,EAAI,KAAK,QAAQ,MAAM,EAAGiB,CAAG,EACnC,KAAK,OAAO,KAAK,IAAI,EAAIZ,GAAS,KAAK,IAAI,EAAIA,GAAS,KAAK,IAAI,EAAEL,CAAC,EAAIA,CAC1E,MAAQ,CACN,MAAO,EACT,CACA,MAAO,EACT,CACA,MAAO,EACT,CACF,ECvPO,IAAMoB,EAA6B,CACxC,KAAM,cACN,MAAO,EACP,OAAQ,CACV,EAEO,SAASC,GAAUC,EAAyB,CACjD,GAAIA,EAAE,OAAS,GACb,OAAOF,EAET,IAAMG,EAAM,IAAI,YAAYD,EAAE,OAAQA,EAAE,WAAY,CAAC,EAGrD,GAAIC,EAAI,CAAC,IAAM,YAAcA,EAAI,CAAC,IAAM,WAAcA,EAAI,CAAC,IAAM,WAC/D,MAAO,CACL,KAAM,YACN,MAAQD,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,EACrD,OAAQA,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,CACvD,EAGF,GAAIA,EAAE,CAAC,IAAM,KAAQA,EAAE,CAAC,IAAM,KAAQA,EAAE,CAAC,IAAM,IAAM,CACnD,GAAM,CAACE,EAAOC,CAAM,EAAIC,GAAQJ,CAAC,EACjC,MAAO,CAAE,KAAM,aAAc,MAAAE,EAAO,OAAAC,CAAO,CAC7C,CAEA,GAAIF,EAAI,CAAC,IAAM,YAAeD,EAAE,CAAC,IAAM,IAAQA,EAAE,CAAC,IAAM,KAASA,EAAE,CAAC,IAAM,GACxE,MAAO,CACL,KAAM,YACN,MAAQA,EAAE,CAAC,GAAK,EAAIA,EAAE,CAAC,EACvB,OAAQA,EAAE,CAAC,GAAK,EAAIA,EAAE,CAAC,CACzB,EAGF,GAAIC,EAAI,CAAC,IAAM,WACb,MAAO,CACL,KAAM,YACN,MAAQD,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,EAAIA,EAAE,CAAC,EACjD,OAAQA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,GAAKA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,CACrD,EAGF,GAAIC,EAAI,CAAC,IAAM,YAAcA,EAAI,CAAC,IAAM,aAAeA,EAAI,CAAC,EAAI,YAAc,QAAU,CACtF,OAAQD,EAAE,EAAE,EAAG,CACb,IAAK,IACH,MAAO,CACL,KAAM,aACN,OAASA,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,GAAK,IAAM,EAC7C,QAASA,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,GAAK,IAAM,CAC/C,EACF,IAAK,IACH,GAAIA,EAAE,EAAE,IAAM,GAAM,OAAOF,EAC3B,IAAMO,EAAML,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,GACxD,MAAO,CACL,KAAM,aACN,OAASK,EAAa,OAAU,EAChC,QAASA,IAAQ,GAAK,OAAU,CAClC,EACF,IAAK,IACH,OAAIL,EAAE,EAAE,IAAM,KAAQA,EAAE,EAAE,IAAM,GAAQA,EAAE,EAAE,IAAM,GAAaF,EACxD,CACL,KAAM,aACN,OAASE,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,GAAK,MAC/B,QAASA,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,GAAK,KACjC,CACJ,CACA,OAAOF,CACT,CAEA,GAAIG,EAAI,CAAC,IAAM,aAAeA,EAAI,CAAC,IAAM,YAAcA,EAAI,CAAC,IAAM,YAAa,CAC7E,IAAIK,EAAM,GAEJC,EAAQ,KAAK,IAAIP,EAAE,OAAS,GAAI,IAAI,EAC1C,QAASQ,EAAI,EAAGA,EAAID,EAAOC,IAEzB,GAAIR,EAAEQ,CAAC,IAAM,KAAQR,EAAEQ,EAAI,CAAC,IAAM,KAAQR,EAAEQ,EAAI,CAAC,IAAM,KAAQR,EAAEQ,EAAI,CAAC,IAAM,IAAM,CAChFF,EAAME,EACN,KACF,CAEF,GAAIF,IAAQ,GAAI,CAEd,IAAMJ,EACJF,EAAEM,EAAO,CAAC,GAAK,GACfN,EAAEM,EAAO,CAAC,GAAK,GACfN,EAAEM,EAAM,EAAE,GAAM,EAChBN,EAAEM,EAAM,EAAE,EACNH,EACJH,EAAEM,EAAM,EAAE,GAAK,GACfN,EAAEM,EAAM,EAAE,GAAK,GACfN,EAAEM,EAAM,EAAE,GAAM,EAChBN,EAAEM,EAAM,EAAE,EACZ,GAAIJ,EAAQ,GAAKC,EAAS,EACxB,MAAO,CAAE,KAAM,aAAc,MAAAD,EAAO,OAAAC,CAAO,CAE/C,CACA,OAAOL,CACT,CACA,OAAOA,CACT,CAGA,SAASM,GAAQJ,EAAiC,CAChD,IAAMS,EAAMT,EAAE,OACVQ,EAAI,EACJE,EAAcV,EAAEQ,CAAC,GAAK,EAAIR,EAAEQ,EAAI,CAAC,EACrC,OAAa,CAEX,GADAA,GAAKE,EACDF,GAAKC,EAEP,MAAO,CAAC,EAAG,CAAC,EAEd,GAAIT,EAAEQ,CAAC,IAAM,IACX,MAAO,CAAC,EAAG,CAAC,EAEd,GAAIR,EAAEQ,EAAI,CAAC,IAAM,KAAQR,EAAEQ,EAAI,CAAC,IAAM,IACpC,OAAIA,EAAI,EAAIC,EACH,CACLT,EAAEQ,EAAI,CAAC,GAAK,EAAIR,EAAEQ,EAAI,CAAC,EACvBR,EAAEQ,EAAI,CAAC,GAAK,EAAIR,EAAEQ,EAAI,CAAC,CACzB,EAEK,CAAC,EAAG,CAAC,EAEdA,GAAK,EACLE,EAAcV,EAAEQ,CAAC,GAAK,EAAIR,EAAEQ,EAAI,CAAC,CACnC,CACF,CFrHA,IAAMG,GAAgC,CACpC,OACA,KAAM,eACN,KAAM,EACN,MAAO,OACP,OAAQ,OACR,oBAAqB,EACrB,OAAQ,CACV,EAGaC,EAAN,KAAuD,CAS5D,YACmBC,EACAC,EACAC,EACAC,EACjB,CAJiB,WAAAH,EACA,eAAAC,EACA,cAAAC,EACA,mBAAAC,EAZnB,KAAQ,SAAW,GACnB,KAAQ,IAAM,IAAIC,EAClB,KAAQ,QAAyBN,GAGjC,KAAQ,aAAe,GACvB,KAAQ,YAAc,GAQpB,IAAMO,EAAkB,KAAK,KAAK,KAAK,MAAM,aAAe,EAAI,CAAC,EAC3DC,EAAe,KAAK,IAAI,QAA2BD,CAAe,EACxE,KAAK,KAAO,IAAI,GAAAE,QAAc,QAAwBF,EAAiBC,CAAY,EACnF,KAAK,QAAU,IAAI,GAAAE,QAAW,OAAsB,CACtD,CAEO,OAAc,CACnB,KAAK,IAAI,MAAM,EACf,KAAK,KAAK,QAAQ,EAClB,KAAK,QAAQ,QAAQ,CACvB,CAEO,OAAc,CACnB,KAAK,SAAW,GAChB,KAAK,IAAI,MAAM,CACjB,CAEO,IAAIC,EAAmBC,EAAeC,EAAmB,CAC9D,GAAI,MAAK,SAET,GAAI,KAAK,IAAI,QAAU,EAChB,KAAK,KAAK,IAAIF,EAAK,SAASC,EAAOC,CAAG,CAAC,IAAiB,IAC3D,KAAK,KAAK,QAAQ,EAClB,KAAK,SAAW,QAEb,CACL,IAAMC,EAAU,KAAK,IAAI,MAAMH,EAAMC,EAAOC,CAAG,EAC/C,GAAIC,IAAY,GAAI,CAClB,KAAK,SAAW,GAChB,MACF,CACA,GAAIA,EAAU,EAAG,CAEf,GADgB,KAAK,IAAI,OAAO,OAChB,EAAmB,CAOjC,GANI,KAAK,eACP,KAAK,aAAe,GACpB,KAAK,YAAc,GACnB,KAAK,KAAK,QAAQ,GAEpB,KAAK,QAAU,OAAO,OAAO,CAAC,EAAGd,GAAgB,KAAK,IAAI,MAAM,EAC5D,CAAC,KAAK,QAAQ,OAAQ,CACxB,KAAK,SAAW,GAChB,MACF,CACA,KAAK,KAAK,KAAK,CACjB,SAAW,KAAK,YAAa,CAC3B,KAAK,SAAW,GAChB,MACF,CACK,KAAK,KAAK,IAAIW,EAAK,SAASG,EAASD,CAAG,CAAC,IAAiB,IAC7D,KAAK,KAAK,QAAQ,EAClB,KAAK,SAAW,GACZ,KAAK,eAAc,KAAK,YAAc,IAE9C,CACF,CACF,CAEO,IAAIE,EAA8C,CAGvD,GAFI,KAAK,UAEL,KAAK,IAAI,QAAU,GACjB,KAAK,IAAI,IAAI,EAAG,MAAO,GAE7B,IAAMC,EAAU,KAAK,IAAI,OAAO,KAEhC,GAAIA,IAAY,EAAuB,MAAO,GAE9C,GAAIA,IAAY,EAA6B,CAE3C,IAAIC,EAAIC,EAAkB,MACtBC,EAAID,EAAkB,OACtB,KAAK,UAAU,aACjBD,EAAI,KAAK,UAAU,WAAW,IAAI,OAAO,MAAQ,KAAK,cAAc,KACpEE,EAAI,KAAK,UAAU,WAAW,IAAI,OAAO,OAAS,KAAK,cAAc,MAEvE,IAAMC,EAAQ,KAAK,cAAc,MAAM,qBAAqB,KAAO,EAC7DC,EAAS,4BAA4BF,EAAE,QAAQ,CAAC,CAAC,IAAIF,EAAE,QAAQ,CAAC,CAAC,IAAIG,EAAM,QAAQ,CAAC,CAAC,SAC3F,YAAK,cAAc,MAAMC,EAAQ,EAAK,EAC/B,EACT,CAEA,GAAIL,IAAY,EACd,YAAK,QAAU,OAAO,OAAO,CAAC,EAAGhB,GAAgB,KAAK,IAAI,MAAM,EAChE,KAAK,aAAe,GACpB,KAAK,YAAc,GACnB,KAAK,KAAK,QAAQ,EAClB,KAAK,KAAK,KAAK,EACR,GAGT,GAAIgB,IAAY,IACV,CAAC,KAAK,eACV,KAAK,aAAe,GAChB,KAAK,aAAe,KAAK,QAAQ,OAAS,IAA4B,MAAO,GAKnF,IAAIC,EAAI,EACJE,EAAI,EAGJG,EACAC,EAAUC,EAoBd,IAnBIF,EAAOP,MACLO,EAAO,CAAC,KAAK,KAAK,IAAI,IACxBC,EAAUE,GAAU,KAAK,KAAK,KAAK,GAC/BH,EAAOC,EAAQ,OAAS,gBAC1BN,EAAIM,EAAQ,MACZJ,EAAII,EAAQ,QACRD,EAAOL,GAAKE,GAAKF,EAAIE,EAAI,KAAK,MAAM,aACtC,CAACF,EAAGE,CAAC,EAAI,KAAK,QAAQF,EAAGE,CAAC,EAAE,IAAI,KAAK,KAAK,EAC1CG,EAAOL,GAAKE,GAAKF,EAAIE,EAAI,KAAK,MAAM,YAEpC,QAAQ,KAAK,8BAA8BI,EAAQ,KAAK,IAAIA,EAAQ,MAAM,EAAE,GAG9E,QAAQ,KAAK,6BAA6B,GAG5C,QAAQ,KAAK,mCAAmC,GAGhD,CAACD,EACH,YAAK,KAAK,QAAQ,EACX,GAGT,IAAII,EACJ,GAAIH,EAAQ,OAAS,YAAa,CAChC,IAAMZ,EAAO,KAAK,QAAQ,OAAO,KAAK,KAAK,KAAK,EAOhD,GANAe,EAAO,IAAI,UACT,IAAI,kBAAkBf,EAAK,OAAQA,EAAK,WAAYA,EAAK,UAAU,EACnE,KAAK,QAAQ,MACb,KAAK,QAAQ,MACf,EACA,KAAK,QAAQ,QAAQ,EACjBM,IAAM,KAAK,QAAQ,OAASE,IAAM,KAAK,QAAQ,OAAQ,CAEzD,KAAK,KAAK,QAAQ,EAClB,IAAMQ,EAASC,EAAc,aAAa,OAAW,KAAK,QAAQ,MAAO,KAAK,QAAQ,MAAM,EAC5F,OAAAD,EAAO,WAAW,IAAI,GAAG,aAAaD,EAAM,EAAG,CAAC,EAChD,KAAK,SAAS,SAASC,CAAM,EACtB,EACT,CACF,MACED,EAAO,IAAI,KAAK,CAAC,KAAK,KAAK,KAAK,EAAG,CAAE,KAAMH,EAAQ,IAAK,CAAC,EAE3D,YAAK,KAAK,QAAQ,EACX,kBAAkBG,EAAM,CAAE,YAAaT,EAAG,aAAcE,CAAE,CAAC,EAC/D,KAAKU,IACJ,KAAK,SAAS,SAASA,CAAE,EAClB,GACR,EACA,MAAMC,IACL,QAAQ,KAAK,uBAAuBP,EAAQ,IAAI,IAAIA,EAAQ,KAAK,IAAIA,EAAQ,MAAM,GAAIO,CAAC,EACjF,GACR,CACL,CAEQ,QAAQb,EAAWE,EAA6B,CACtD,IAAMY,EAAK,KAAK,UAAU,YAAY,IAAI,KAAK,OAASb,EAAkB,MACpEc,EAAK,KAAK,UAAU,YAAY,IAAI,KAAK,QAAUd,EAAkB,OACrEe,EAAQ,KAAK,UAAU,YAAY,IAAI,OAAO,OAASF,EAAK,KAAK,cAAc,KAC/EG,EAAS,KAAK,UAAU,YAAY,IAAI,OAAO,QAAUF,EAAK,KAAK,cAAc,KAEjFG,EAAK,KAAK,KAAK,KAAK,QAAQ,MAAQF,EAAOF,CAAE,EAC7CK,EAAK,KAAK,KAAK,KAAK,QAAQ,OAASF,EAAQF,CAAE,EACrD,GAAI,CAACG,GAAM,CAACC,EAAI,CACd,IAAMC,EAAKJ,EAAQhB,EACbqB,GAAMJ,EAASF,GAAMb,EACrBoB,EAAI,KAAK,IAAIF,EAAIC,CAAE,EACzB,OAAOC,EAAI,EAAI,CAACtB,EAAIsB,EAAGpB,EAAIoB,CAAC,EAAI,CAACtB,EAAGE,CAAC,CACvC,CACA,OAAQgB,EAEJ,KAAK,QAAQ,qBAAuB,CAACA,GAAM,CAACC,EAC1C,CAACD,EAAIhB,EAAIgB,EAAKlB,CAAC,EAAI,CAACkB,EAAIC,CAAE,EAF5B,CAACnB,EAAImB,EAAKjB,EAAGiB,CAAE,CAGrB,CAEQ,KAAKI,EAAWC,EAAeC,EAAsB,CAC3D,OAAIF,IAAM,OAAe,EACrBA,EAAE,SAAS,GAAG,EAAU,SAASA,EAAE,MAAM,EAAG,EAAE,EAAG,EAAE,EAAIC,EAAQ,IAC/DD,EAAE,SAAS,IAAI,EAAU,SAASA,EAAE,MAAM,EAAG,EAAE,EAAG,EAAE,EACjD,SAASA,EAAG,EAAE,EAAIE,CAC3B,CACF,EGnOA,IAAAC,GAAiD,QCoI1C,SAASC,GAAkBC,EAA6B,CAC7D,IAAMC,EAAqB,CAAC,EACtBC,EAAQF,EAAK,MAAM,GAAG,EAE5B,QAAWG,KAAQD,EAAO,CACxB,IAAME,EAAQD,EAAK,QAAQ,GAAG,EAC9B,GAAIC,IAAU,GAAI,SAElB,IAAMC,EAAMF,EAAK,UAAU,EAAGC,CAAK,EAC7BE,EAAQH,EAAK,UAAUC,EAAQ,CAAC,EAGtC,GAAIC,IAAQ,IAAiB,CAC3BJ,EAAI,OAASK,EACb,QACF,CACA,GAAID,IAAQ,IAAsB,CAChCJ,EAAI,YAAcK,EAClB,QACF,CACA,GAAID,IAAQ,IAAuB,CACjCJ,EAAI,aAAeK,EACnB,QACF,CACA,GAAID,IAAQ,IAA0B,CACpCJ,EAAI,eAAiBK,EACrB,QACF,CACA,IAAMC,EAAW,SAASD,EAAO,EAAE,EACnC,OAAQD,EAAK,CACX,IAAK,IAAiBJ,EAAI,OAASM,EAAU,MAC7C,IAAK,IAAaN,EAAI,GAAKM,EAAU,MACrC,IAAK,IAAuBN,EAAI,YAAcM,EAAU,MACxD,IAAK,IAAgBN,EAAI,MAAQM,EAAU,MAC3C,IAAK,IAAiBN,EAAI,OAASM,EAAU,MAC7C,IAAK,IAAmBN,EAAI,EAAIM,EAAU,MAC1C,IAAK,IAAmBN,EAAI,EAAIM,EAAU,MAC1C,IAAK,IAAuBN,EAAI,YAAcM,EAAU,MACxD,IAAK,IAAwBN,EAAI,aAAeM,EAAU,MAC1D,IAAK,IAA6BN,EAAI,QAAUM,EAAU,MAC1D,IAAK,IAA6BN,EAAI,QAAUM,EAAU,MAC1D,IAAK,IAAkBN,EAAI,QAAUM,EAAU,MAC/C,IAAK,IAAeN,EAAI,KAAOM,EAAU,MACzC,IAAK,IAAeN,EAAI,KAAOM,EAAU,MACzC,IAAK,IAAgBN,EAAI,MAAQM,EAAU,MAC3C,IAAK,IAA0BN,EAAI,eAAiBM,EAAU,MAC9D,IAAK,IAAkBN,EAAI,OAASM,EAAU,MAC9C,IAAK,IAAuBN,EAAI,YAAcM,EAAU,KAC1D,CACF,CAEA,OAAON,CACT,CDhKA,IAAMO,GAAa,EAGNC,GAAN,KAA8E,CAgCnF,YACmBC,EACAC,EACAC,EACAC,EACjB,CAJiB,WAAAH,EACA,eAAAC,EACA,mBAAAC,EACA,mBAAAC,EAnCnB,KAAQ,SAAW,GACnB,KAAQ,aAAe,GAEvB,KAAQ,eAAuC,KAO/C,KAAQ,eAAiB,GAGzB,KAAQ,aAAe,IAAI,YAAY,GAA+B,EACtE,KAAQ,eAAiB,EAGzB,KAAQ,kBAAoB,EAC5B,KAAQ,kBAAoB,EAG5B,KAAQ,eAAuC,KAI/C,KAAQ,sBAA2D,IAAI,IAarE,KAAK,iBAAmB,KAAK,KAAK,KAAK,MAAM,eAAiB,EAAI,CAAC,EAEnE,KAAK,qBAAuB,KAAK,IAAI,QAAgC,KAAK,gBAAgB,CAC5F,CAEO,OAAc,CACnB,KAAK,mBAAmB,EACpB,KAAK,iBACP,KAAK,eAAe,QAAQ,EAC5B,KAAK,eAAiB,MAExB,KAAK,cAAc,MAAM,CAC3B,CAEO,SAAgB,CACrB,KAAK,MAAM,CACb,CAEQ,oBAAoBC,EAAmB,CAC7C,KAAK,sBAAsB,OAAOA,CAAG,EACjC,KAAK,kBAAoBA,IAC3B,KAAK,gBAAkB,OAE3B,CAEQ,oBAA2B,CACjC,QAAWC,KAAW,KAAK,sBAAsB,OAAO,EACtDA,EAAQ,QAAQ,QAAQ,EAE1B,KAAK,sBAAsB,MAAM,EACjC,KAAK,gBAAkB,MACzB,CAEO,OAAc,CACnB,KAAK,SAAW,GAChB,KAAK,aAAe,GACpB,KAAK,eAAiB,GACtB,KAAK,eAAiB,EACtB,KAAK,eAAiB,KAEtB,KAAK,kBAAoB,KAAK,iBAC9B,KAAK,kBAAoB,EACzB,KAAK,eAAiB,IACxB,CAEO,IAAIC,EAAmBC,EAAeC,EAAmB,CAC9D,GAAI,MAAK,SAET,GAAI,CAAC,KAAK,eACR,KAAK,eAAeF,EAAMC,EAAOC,CAAG,MAC/B,CAEL,IAAIC,EAAaD,EACjB,QAASE,EAAIH,EAAOG,EAAIF,EAAKE,IAC3B,GAAIJ,EAAKI,CAAC,IAAM,GAAqB,CACnC,KAAK,eAAiB,GACtBD,EAAaC,EACb,KACF,CAIF,IAAMC,EAAaF,EAAaF,EAChC,GAAI,KAAK,eAAiBI,EAAa,IAAiC,CACtE,KAAK,SAAW,GAChB,MACF,CAIA,GAHA,KAAK,aAAa,IAAIL,EAAK,SAASC,EAAOE,CAAU,EAAG,KAAK,cAAc,EAC3E,KAAK,gBAAkBE,EAEnB,CAAC,KAAK,eAAgB,CAKxB,GAHA,KAAK,eAAiBC,GAAkB,KAAK,wBAAwB,CAAC,EAGlE,KAAK,eAAe,KAAO,QAAa,KAAK,eAAe,cAAgB,OAAW,CACzF,KAAK,cAAc,KAAK,eAAe,GAAI,0CAA2C,KAAK,eAAe,OAAS,CAAC,EACpH,KAAK,SAAW,GAChB,MACF,CAGA,GAAI,KAAK,eAAe,SAAW,IACjC,OAIF,IAAMC,EAAeJ,EAAa,EAC9BI,EAAeL,GACjB,KAAK,eAAeF,EAAMO,EAAcL,CAAG,CAE/C,CACF,CACF,CAGQ,eAAeF,EAAmBC,EAAeC,EAAmB,CAC1E,GAAI,KAAK,SAAU,OAKnB,IAAMM,EAAa,KAAK,gBAAgB,IAAM,KAAK,iBAAmB,EAChET,EAAU,KAAK,sBAAsB,IAAIS,CAAU,EACnDC,EAAsBV,GAAS,kBAAoB,EAGzD,GAFA,KAAK,mBAAqBG,EAAMD,EACFQ,EAAsB,KAAK,kBAC7B,KAAK,kBAAmB,CAClD,IAAMC,EAAmB,KAAK,gBAAkBX,GAAS,QACrDW,GACFA,EAAiB,QAAQ,EAE3B,KAAK,eAAiB,KAClBX,GACF,KAAK,oBAAoBS,CAAU,EAErC,KAAK,SAAW,GAChB,MACF,CAEI,KAAK,eAELT,GAAS,SAAW,CAAC,KAAK,iBAC5B,KAAK,eAAiBA,EAAQ,SAE3B,KAAK,iBACR,KAAK,eAAiB,IAAI,GAAAY,QAAc,QAA6B,KAAK,iBAAkB,KAAK,oBAAoB,EACrH,KAAK,eAAe,KAAK,GAGvB,KAAK,eAAe,IAAIX,EAAK,SAASC,EAAOC,CAAG,CAAC,IAAMV,KACzD,KAAK,eAAe,QAAQ,EAC5B,KAAK,eAAiB,KACtB,KAAK,aAAe,GAChBO,GACF,KAAK,oBAAoBS,CAAU,GAGzC,CAEO,IAAII,EAA8C,CACvD,GAAI,KAAK,UAAY,CAACA,EACpB,OAAI,KAAK,iBACP,KAAK,eAAe,QAAQ,EAC5B,KAAK,eAAiB,MAEjB,GAIT,GAAI,KAAK,eACP,OAAO,KAAK,wBAAwB,EAItC,IAAMC,EAAM,KAAK,eAGjB,GAAIA,EAAI,SAAW,IACjB,OAAO,KAAK,cAAcA,CAAG,EAI/B,IAAML,EAAaK,EAAI,IAAM,KAAK,iBAAmB,EAC/CC,EAAeD,EAAI,OAAS,EAC5Bd,EAAU,KAAK,sBAAsB,IAAIS,CAAU,EAEzD,GAAIM,EACF,OAAI,KAAK,iBACHf,GACFA,EAAQ,kBAAoB,KAAK,kBACjCA,EAAQ,YAAcA,EAAQ,aAAe,KAAK,cAElD,KAAK,sBAAsB,IAAIS,EAAY,CACzC,IAAK,CAAE,GAAGK,CAAI,EACd,QAAS,KAAK,eACd,iBAAkB,KAAK,kBACvB,YAAa,KAAK,YACpB,CAAC,EAEH,KAAK,gBAAkBL,EACvB,KAAK,eAAiB,MAEjB,GAILT,IACF,KAAK,gBAAkB,QAGzB,IAAIgB,EAAc,KAAK,aACnBC,EAAWH,EACXI,EAAU,KAAK,eAEflB,IACFiB,EAAWjB,EAAQ,IACnBkB,EAAUlB,EAAQ,QAClBgB,EAAcA,GAAehB,EAAQ,YACrC,KAAK,sBAAsB,OAAOS,CAAU,GAG9C,IAAIU,EAAa,IAAI,WAAW,CAAC,EAC7BD,IACEA,EAAQ,IAAI,IAAMzB,KACpBuB,EAAc,IAEhBG,EAAaD,EAAQ,OAEvB,KAAK,eAAiB,KAKtB,IAAME,EAAS,KAAK,8BAA8BH,EAAUE,EAAYH,CAAW,EACnF,OAAIE,GACFA,EAAQ,QAAQ,EAEXE,CACT,CAIQ,yBAAkC,CACxC,IAAIC,EAAM,GACV,QAAShB,EAAI,EAAGA,EAAI,KAAK,eAAgBA,IACvCgB,GAAO,OAAO,cAAc,KAAK,aAAahB,CAAC,CAAC,EAElD,OAAOgB,CACT,CAEQ,yBAAsD,CAC5D,IAAMP,EAAMP,GAAkB,KAAK,wBAAwB,CAAC,EAG5D,GAAIO,EAAI,KAAO,QAAaA,EAAI,cAAgB,OAC9C,YAAK,cAAcA,EAAI,GAAI,0CAA2CA,EAAI,OAAS,CAAC,EAC7E,GAKT,OAFeA,EAAI,QAAU,IAEb,CACd,QACE,OAAO,KAAK,cAAcA,CAAG,EAC/B,QACE,YAAK,cAAcA,EAAI,IAAM,EAAG,KAAMA,EAAI,OAAS,CAAC,EAC7C,GACT,QACE,OAAO,KAAK,iBAAiBA,CAAG,EAClC,QAKE,OAAIA,EAAI,KAAO,QACb,KAAK,cAAcA,EAAI,GAAI,4BAA6BA,EAAI,OAAS,CAAC,EAEjE,EACX,CACF,CAEQ,8BAA8BA,EAAoBQ,EAAmBN,EAAkD,CAG7H,OAFeF,EAAI,QAAU,IAEb,CACd,QAA2B,CACzB,IAAMM,EAAS,KAAK,gBAAgBN,EAAKQ,EAAON,CAAW,EAG3D,OAAKF,EAAI,cAAgB,OAAS,KAAOA,EAAI,KAAO,SAC9CE,EACF,KAAK,cAAcF,EAAI,GAAI,6BAA8BA,EAAI,OAAS,CAAC,EAC9DQ,EAAM,OAAS,GACxB,KAAK,cAAcR,EAAI,GAAI,KAAMA,EAAI,OAAS,CAAC,GAG5CM,CACT,CACA,QACE,OAAO,KAAK,uBAAuBN,EAAKQ,EAAON,CAAW,EAC5D,QACE,OAAO,KAAK,aAAaF,EAAKQ,EAAON,CAAW,EAClD,QAEE,OAAO,KAAK,iBAAiBF,CAAG,EAClC,QAKE,OAAIA,EAAI,KAAO,QACb,KAAK,cAAcA,EAAI,GAAI,4BAA6BA,EAAI,OAAS,CAAC,EAEjE,EACX,CACF,CAEQ,iBAAiBA,EAAgD,CACvE,GAAIA,EAAI,KAAO,OACb,MAAO,GAET,IAAMS,EAAKT,EAAI,GACTU,EAAQ,KAAK,cAAc,SAASD,CAAE,EAC5C,OAAKC,EAIU,KAAK,cAAcA,EAAOV,CAAG,EAC9B,KAAKD,IACjB,KAAK,cAAcU,EAAIV,EAAU,KAAO,gCAAiCC,EAAI,OAAS,EAAGA,EAAI,WAAW,EACjG,GACR,GAPC,KAAK,cAAcS,EAAI,yBAA0BT,EAAI,OAAS,EAAGA,EAAI,WAAW,EACzE,GAOX,CAEQ,gBAAgBA,EAAoBQ,EAAmBN,EAA+B,CAY5F,OADqBF,EAAI,cAAgB,OACpB,KACfA,EAAI,KAAO,QACb,KAAK,cAAcA,EAAI,GAAI,yCAA0CA,EAAI,OAAS,CAAC,EAE9E,KAGLE,GAAeM,EAAM,SAAW,GAEpC,KAAK,cAAc,WAAWR,EAAI,GAAI,CACpC,KAAM,IAAI,KAAK,CAACQ,CAAiB,CAAC,EAClC,MAAOR,EAAI,OAAS,EACpB,OAAQA,EAAI,QAAU,EACtB,OAASA,EAAI,QAAU,GACvB,YAAaA,EAAI,aAAe,EAClC,CAAC,EACM,GACT,CAEQ,uBAAuBA,EAAoBQ,EAAmBN,EAAkD,CACtH,GAAIA,EACF,OAAIF,EAAI,KAAO,QACb,KAAK,cAAcA,EAAI,GAAI,6BAA8BA,EAAI,OAAS,CAAC,EAElE,GAGT,KAAK,gBAAgBA,EAAKQ,EAAON,CAAW,EAE5C,IAAMO,EAAKT,EAAI,IAAM,KAAK,cAAc,YAClCU,EAAQ,KAAK,cAAc,SAASD,CAAE,EAC5C,GAAIC,EAAO,CACT,IAAMJ,EAAS,KAAK,cAAcI,EAAOV,CAAG,EAC5C,OAAIA,EAAI,KAAO,OACNM,EAAO,KAAKP,IACjB,KAAK,cAAcU,EAAIV,EAAU,KAAO,gCAAiCC,EAAI,OAAS,CAAC,EAChF,GACR,EAEIM,EAAO,KAAK,IAAM,EAAI,CAC/B,CACA,MAAO,EACT,CAEQ,aAAaN,EAAoBQ,EAAmBN,EAA+B,CACzF,IAAMO,EAAKT,EAAI,IAAM,EACfW,EAAQX,EAAI,OAAS,EAM3B,IADqBA,EAAI,cAAgB,OACpB,IACnB,YAAK,cAAcS,EAAI,yCAA0CE,CAAK,EAC/D,GAIT,GAAIT,EACF,YAAK,cAAcO,EAAI,6BAA8BE,CAAK,EACnD,GAIT,GAAIH,EAAM,SAAW,EACnB,YAAK,cAAcC,EAAI,KAAME,CAAK,EAC3B,GAGT,IAAMC,EAASZ,EAAI,QAAU,GAE7B,GAAIY,IAAW,IACb,KAAK,cAAcH,EAAI,KAAME,CAAK,MAC7B,CACL,IAAME,EAAQb,EAAI,OAAS,EACrBc,EAASd,EAAI,QAAU,EAE7B,GAAI,CAACa,GAAS,CAACC,EACb,YAAK,cAAcL,EAAI,sDAAuDE,CAAK,EAC5E,GAGT,IAAMI,EAAgBH,IAAW,OAC3BI,EAAgBH,EAAQC,EAASC,EAEvC,GAAIP,EAAM,OAASQ,EACjB,YAAK,cAAcP,EAAI,iCAAkCE,CAAK,EACvD,GAGT,KAAK,cAAcF,EAAI,KAAME,CAAK,CACpC,CACA,MAAO,EACT,CAEQ,cAAcX,EAA6B,CAOjD,OALiBA,EAAI,gBAAkB,IAKrB,CAChB,IAAK,IACL,IAAK,IACH,KAAK,mBAAmB,EACxB,KAAK,cAAc,UAAU,EAC7B,MACF,IAAK,IACL,IAAK,IAKH,GAAIA,EAAI,KAAO,OAAW,CACxB,IAAMd,EAAU,KAAK,sBAAsB,IAAIc,EAAI,EAAE,EACjDd,GACFA,EAAQ,QAAQ,QAAQ,EAE1B,KAAK,oBAAoBc,EAAI,EAAE,EAC/B,KAAK,cAAc,WAAWA,EAAI,EAAE,CACtC,CACA,MACF,QAEE,KACJ,CACA,MAAO,EACT,CAEQ,cAAcS,EAAYQ,EAAiBN,EAAeO,EAA4B,CAC5F,IAAMC,EAAOF,IAAY,KAEzB,GADIE,GAAQR,GAAS,GACjB,CAACQ,GAAQR,GAAS,EAAG,OAEzB,IAAMS,EAAQF,EAAc,MAAMA,CAAW,GAAK,GAC5CG,EAAW,WAAWZ,CAAE,GAAGW,CAAK,IAAIH,CAAO,SACjD,KAAK,cAAc,MAAM,YAAY,iBAAiBI,CAAQ,CAChE,CAIQ,cAAcX,EAAwBV,EAAsC,CAClF,OAAO,KAAK,kBAAkBU,EAAOV,CAAG,EACrC,KAAK,IAAM,EAAI,EACf,MAAM,IAAM,EAAK,CACtB,CAEA,MAAc,kBAAkBU,EAAwBV,EAAmC,CACzF,IAAIsB,EAAkC,MAAM,KAAK,cAAcZ,CAAK,EAEpE,GAAI,CACF,IAAMa,EAAQ,KAAK,IAAI,EAAGvB,EAAI,GAAK,CAAC,EAC9BwB,EAAQ,KAAK,IAAI,EAAGxB,EAAI,GAAK,CAAC,EAC9ByB,EAAQzB,EAAI,aAAgBsB,EAAO,MAAQC,EAC3CG,EAAQ1B,EAAI,cAAiBsB,EAAO,OAASE,EAE7CG,EAAW,KAAK,IAAI,EAAGL,EAAO,MAAQC,CAAK,EAC3CK,EAAW,KAAK,IAAI,EAAGN,EAAO,OAASE,CAAK,EAC5CK,EAAa,KAAK,IAAI,EAAG,KAAK,IAAIJ,EAAOE,CAAQ,CAAC,EAClDG,EAAa,KAAK,IAAI,EAAG,KAAK,IAAIJ,EAAOE,CAAQ,CAAC,EAExD,GAAIC,IAAe,GAAKC,IAAe,EACrC,MAAM,IAAI,MAAM,0BAA0B,EAG5C,GAAIP,IAAU,GAAKC,IAAU,GAAKK,IAAeP,EAAO,OAASQ,IAAeR,EAAO,OAAQ,CAC7F,IAAMS,EAAU,MAAM,kBAAkBT,EAAQC,EAAOC,EAAOK,EAAYC,CAAU,EACpFR,EAAO,MAAM,EACbA,EAASS,CACX,CAEA,IAAMC,EAAK,KAAK,UAAU,YAAY,IAAI,KAAK,OAASC,EAAkB,MACpEC,EAAK,KAAK,UAAU,YAAY,IAAI,KAAK,QAAUD,EAAkB,OAIvEE,EACAC,EACApC,EAAI,UAAY,QAAaA,EAAI,OAAS,QAC5CmC,EAAUnC,EAAI,QACdoC,EAAUpC,EAAI,MACLA,EAAI,UAAY,QACzBmC,EAAUnC,EAAI,QACdoC,EAAU,KAAK,IAAI,EAAG,KAAK,KAAMd,EAAO,OAASA,EAAO,OAAUa,EAAUH,GAAME,CAAE,CAAC,GAC5ElC,EAAI,OAAS,QACtBoC,EAAUpC,EAAI,KACdmC,EAAU,KAAK,IAAI,EAAG,KAAK,KAAMb,EAAO,MAAQA,EAAO,QAAWc,EAAUF,GAAMF,CAAE,CAAC,IAErFG,EAAU,KAAK,KAAKb,EAAO,MAAQU,CAAE,EACrCI,EAAU,KAAK,KAAKd,EAAO,OAASY,CAAE,GAGxC,IAAIG,EAAIf,EAAO,MACXgB,EAAIhB,EAAO,OAQf,IALItB,EAAI,UAAY,QAAaA,EAAI,OAAS,UAC5CqC,EAAI,KAAK,MAAMF,EAAUH,CAAE,EAC3BM,EAAI,KAAK,MAAMF,EAAUF,CAAE,GAGzBG,EAAIC,EAAI,KAAK,MAAM,WACrB,MAAM,IAAI,MAAM,2BAA2B,EAI7C,IAAMC,EAAS,KAAK,cAAc,MAAM,OAClCC,EAASD,EAAO,EAChBE,EAASF,EAAO,EAChBG,EAAaH,EAAO,MAOpBI,GADc3C,EAAI,SAAW,QAAaA,EAAI,OAAS,EACrB,SAAW,MAEnD,GAAIqC,IAAMf,EAAO,OAASgB,IAAMhB,EAAO,OAAQ,CAC7C,IAAMsB,EAAS,MAAM,kBAAkBtB,EAAQ,CAAE,YAAae,EAAG,aAAcC,CAAE,CAAC,EAClFhB,EAAO,MAAM,EACbA,EAASsB,CACX,CAGA,IAAMC,GAAU,KAAK,IAAI,KAAK,IAAI,EAAG7C,EAAI,SAAW,CAAC,EAAGgC,EAAK,CAAC,EACxDc,GAAU,KAAK,IAAI,KAAK,IAAI,EAAG9C,EAAI,SAAW,CAAC,EAAGkC,EAAK,CAAC,EAC9D,GAAIW,KAAY,GAAKC,KAAY,EAAG,CAKlC,IAAMC,EAAW/C,EAAI,UAAY,OAAa,KAAK,MAAMmC,EAAUH,CAAE,EAAIV,EAAO,MAAQuB,GAClFG,GAAWhD,EAAI,OAAS,OAAa,KAAK,MAAMoC,EAAUF,CAAE,EAAIZ,EAAO,OAASwB,GAChFG,EAAeC,EAAc,aAAa,OAAO,SAAUH,EAASC,EAAO,EAC3EG,GAAYF,EAAa,WAAW,IAAI,EAC9C,GAAI,CAACE,GACH,MAAM,IAAI,MAAM,wCAAwC,EAE1DA,GAAU,UAAU7B,EAAQuB,GAASC,EAAO,EAE5C,IAAMM,GAAe,MAAM,kBAAkBH,CAAY,EAMzD,GALAA,EAAa,MAAQA,EAAa,OAAS,EAC3C3B,EAAO,MAAM,EACbA,EAAS8B,GACTf,EAAIf,EAAO,MACXgB,EAAIhB,EAAO,OACPe,EAAIC,EAAI,KAAK,MAAM,WACrB,MAAM,IAAI,MAAM,2BAA2B,EAEzCtC,EAAI,UAAY,SAClBmC,EAAU,KAAK,KAAKb,EAAO,MAAQU,CAAE,GAEnChC,EAAI,OAAS,SACfoC,EAAU,KAAK,KAAKd,EAAO,OAASY,CAAE,EAE1C,CAEA,IAAMmB,GAASrD,EAAI,QAAU,EAO7B,GANA,KAAK,cAAc,SAASU,EAAM,GAAIY,EAAQ,GAAMqB,GAAOU,EAAM,EACjE/B,EAAS,OAKLtB,EAAI,iBAAmB,EAAG,CAE5B,IAAMsD,EAAWf,EAAO,MAAQG,EAChCH,EAAO,EAAIC,EAEXD,EAAO,EAAI,KAAK,IAAIE,EAASa,EAAU,CAAC,CAC1C,MAGEf,EAAO,EAAI,KAAK,IAAIC,EAASL,EAAS,KAAK,cAAc,IAAI,CAEjE,OAASoB,EAAG,CACV,MAAAjC,GAAQ,MAAM,EACRiC,CACR,CACF,CAGA,MAAc,cAAc7C,EAA8C,CACxE,IAAIF,EAAoB,IAAI,WAAW,MAAME,EAAM,KAAK,YAAY,CAAC,EAMrE,GAJIA,EAAM,cAAgB,MACxBF,EAAQ,MAAM,KAAK,gBAAgBA,CAAK,GAGtCE,EAAM,SAAW,IAAiB,CACpC,IAAM8C,EAAO,IAAI,KAAK,CAAChD,CAAiB,EAAG,CAAE,KAAM,WAAY,CAAC,EAChE,GAAI,CAAC,OAAO,kBAAmB,CAC7B,IAAMiD,EAAM,IAAI,gBAAgBD,CAAI,EAC9BE,EAAM,IAAI,MAChB,OAAO,IAAI,QAAqB,CAACC,EAASC,IAAW,CACnDF,EAAI,iBAAiB,OAAQ,IAAM,CACjC,IAAI,gBAAgBD,CAAG,EACvB,IAAMI,EAASX,EAAc,aAAa,OAAO,SAAUQ,EAAI,MAAOA,EAAI,MAAM,EAChFG,EAAO,WAAW,IAAI,GAAG,UAAUH,EAAK,EAAG,CAAC,EAC5C,kBAAkBG,CAAM,EAAE,KAAKF,CAAO,EAAE,MAAMC,CAAM,CACtD,CAAC,EACDF,EAAI,iBAAiB,QAAS,IAAM,CAClC,IAAI,gBAAgBD,CAAG,EACvBG,EAAO,IAAI,MAAM,sBAAsB,CAAC,CAC1C,CAAC,EACDF,EAAI,IAAMD,CACZ,CAAC,CACH,CACA,OAAO,kBAAkBD,CAAI,CAC/B,CAGA,IAAM3C,EAAQH,EAAM,MACdI,EAASJ,EAAM,OAErB,GAAI,CAACG,GAAS,CAACC,EACb,MAAM,IAAI,MAAM,8CAA8C,EAGhE,IAAMC,EAAgBL,EAAM,SAAW,OACjCM,EAAgBH,EAAQC,EAASC,EAEvC,GAAIP,EAAM,OAASQ,EACjB,MAAM,IAAI,MAAM,yBAAyB,EAG3C,IAAM8C,EAAajD,EAAQC,EAE3B,GAAIJ,EAAM,SAAW,GAEnB,OAAO,kBAAkB,IAAI,UAAU,IAAI,kBAAkBF,EAAM,OAAuBA,EAAM,WAAYsD,EAAa,CAAwC,EAAGjD,EAAOC,CAAM,CAAC,EAMpL,IAAM3B,EAAO,IAAI,kBAAkB2E,EAAa,CAAwC,EAClFC,EAAQ,IAAI,YAAYvD,EAAM,OAAQA,EAAM,WAAY,KAAK,MAAMA,EAAM,WAAa,CAAC,CAAC,EACxFwD,EAAQ,IAAI,YAAY7E,EAAK,MAAM,EACnC8E,EAAgBH,EAAa,GAE/BI,EAAY,EACZC,EAAY,EAChB,QAAS5E,EAAI,EAAGA,EAAI0E,EAAe1E,GAAK,EAAG,CACzC,IAAM6E,EAAKL,EAAMG,GAAW,EACtBG,EAAKN,EAAMG,GAAW,EACtBI,EAAKP,EAAMG,GAAW,EAE5BF,EAAMG,GAAW,EAAI,WAAaC,EAClCJ,EAAMG,GAAW,EAAI,WAAcC,IAAO,GAAOC,GAAM,EACvDL,EAAMG,GAAW,EAAI,WAAcE,IAAO,GAAOC,GAAM,GACvDN,EAAMG,GAAW,EAAI,WAAcG,IAAO,CAC5C,CAGA,IAAIC,EAAUN,EAAgB,EAC1BO,EAAUP,EAAgB,EAC9B,QAAS1E,EAAI0E,EAAe1E,EAAIuE,EAAYvE,IAC1CJ,EAAKqF,CAAO,EAAQhE,EAAM+D,CAAO,EACjCpF,EAAKqF,EAAU,CAAC,EAAIhE,EAAM+D,EAAU,CAAC,EACrCpF,EAAKqF,EAAU,CAAC,EAAIhE,EAAM+D,EAAU,CAAC,EACrCpF,EAAKqF,EAAU,CAAC,EAAI,IACpBD,GAAW,EACXC,GAAW,EAGb,OAAO,kBAAkB,IAAI,UAAUrF,EAAM0B,EAAOC,CAAM,CAAC,CAC7D,CAEA,MAAc,gBAAgB2D,EAA6C,CACzE,GAAI,CACF,OAAO,MAAM,KAAK,YAAYA,EAAY,SAAS,CACrD,MAAQ,CACN,OAAO,MAAM,KAAK,YAAYA,EAAY,aAAa,CACzD,CACF,CAEA,MAAc,YAAYA,EAAwB7D,EAAwD,CACxG,IAAM8D,EAAK,IAAI,oBAAoB9D,CAAM,EACnC+D,EAASD,EAAG,SAAS,UAAU,EACrCC,EAAO,MAAMF,CAA0B,EACvCE,EAAO,MAAM,EAEb,IAAMC,EAAuB,CAAC,EACxBC,EAASH,EAAG,SAAS,UAAU,EAErC,OAAa,CACX,GAAM,CAAE,KAAAI,EAAM,MAAAC,CAAM,EAAI,MAAMF,EAAO,KAAK,EAC1C,GAAIC,EAAM,MACVF,EAAO,KAAKG,CAAK,CACnB,CAEA,IAAMC,EAAcJ,EAAO,OAAO,CAACK,EAAKC,IAAUD,EAAMC,EAAM,OAAQ,CAAC,EACjE5E,EAAS,IAAI,WAAW0E,CAAW,EACrCG,EAAS,EACb,QAAWD,KAASN,EAClBtE,EAAO,IAAI4E,EAAOC,CAAM,EACxBA,GAAUD,EAAM,OAElB,OAAO5E,CACT,CAEA,IAAW,QAA+C,CACxD,OAAO,KAAK,cAAc,MAC5B,CAEA,IAAW,qBAAmD,CAC5D,OAAO,KAAK,cAAc,kBAC5B,CAEA,IAAW,sBAAkE,CAC3E,OAAO,KAAK,qBACd,CACF,EEjyBO,IAAM8E,EAAN,MAAMA,CAAyC,CA6BpD,YACmBC,EACjB,CADiB,cAAAA,EA3BnB,KAAQ,aAAe,EACvB,KAAiB,QAAwC,IAAI,IAU7D,KAAiB,oBAA2C,IAAI,IAChE,KAAiB,oBAA2C,IAAI,IAIhE,KAAiB,2BAA8BC,GAA4B,CACzE,IAAMC,EAAU,KAAK,oBAAoB,IAAID,CAAS,EAClDC,IAAY,SACd,KAAK,oBAAoB,OAAOA,CAAO,EACvC,KAAK,oBAAoB,OAAOD,CAAS,EACzC,KAAK,QAAQ,OAAOC,CAAO,EAE/B,EACA,KAAQ,cAA+B,CAAE,UAAW,GAAM,MAAO,MAAO,OAAQ,EAAG,UAAW,KAAM,EAKlG,KAAK,wBAA0B,KAAK,SAAS,eAC7C,KAAK,uBAA0BD,GAAsB,CACnD,KAAK,0BAA0BA,CAAS,EACxC,KAAK,2BAA2BA,CAAS,CAC3C,EACA,KAAK,SAAS,eAAiB,KAAK,sBACtC,CAEO,OAAc,CACnB,KAAK,aAAe,EACpB,KAAK,QAAQ,MAAM,EACnB,KAAK,oBAAoB,MAAM,EAC/B,KAAK,oBAAoB,MAAM,CACjC,CAEO,SAAgB,CACrB,KAAK,MAAM,EACP,KAAK,SAAS,iBAAmB,KAAK,yBACxC,KAAK,SAAS,eAAiB,KAAK,wBAExC,CAEO,WAAWE,EAAwBC,EAAgD,CACxF,IAAMC,EAAUF,GAAM,KAAK,eAErBG,EAAe,KAAK,oBAAoB,IAAID,CAAO,EACzD,OAAIC,IAAiB,SACnB,KAAK,SAAS,YAAYA,CAAY,EACtC,KAAK,oBAAoB,OAAOD,CAAO,EACvC,KAAK,oBAAoB,OAAOC,CAAY,GAG1C,CAAC,KAAK,QAAQ,IAAID,CAAO,GAAK,KAAK,QAAQ,MAAQN,EAAkB,kBACvE,KAAK,wBAAwB,EAG/B,KAAK,QAAQ,IAAIM,EAAS,CACxB,GAAGD,EACH,GAAIC,CACN,CAAC,EACMA,CACT,CAEO,SAASH,EAAiBK,EAAwCC,EAAoBC,EAAmBC,EAAsB,CAKpI,IAAMJ,EAAe,KAAK,oBAAoB,IAAIJ,CAAO,EACrDI,IAAiB,QACnB,KAAK,oBAAoB,OAAOA,CAAY,EAE9C,KAAK,cAAc,UAAYE,EAC/B,KAAK,cAAc,MAAQC,EAC3B,KAAK,cAAc,OAASC,EAC5B,IAAMT,EAAY,KAAK,SAAS,SAASM,EAAO,KAAK,aAAa,EAClE,KAAK,oBAAoB,IAAIL,EAASD,CAAS,EAC/C,KAAK,oBAAoB,IAAIA,EAAWC,CAAO,CACjD,CAEO,SAASA,EAA8C,CAC5D,OAAO,KAAK,QAAQ,IAAIA,CAAO,CACjC,CAEO,WAAWA,EAAuB,CACvC,KAAK,QAAQ,OAAOA,CAAO,EAC3B,IAAMD,EAAY,KAAK,oBAAoB,IAAIC,CAAO,EAClDD,IAAc,SAChB,KAAK,SAAS,YAAYA,CAAS,EACnC,KAAK,oBAAoB,OAAOC,CAAO,EACvC,KAAK,oBAAoB,OAAOD,CAAS,EAE7C,CAEO,WAAkB,CACvB,KAAK,QAAQ,MAAM,EACnB,QAAWA,KAAa,KAAK,oBAAoB,OAAO,EACtD,KAAK,SAAS,YAAYA,CAAS,EAErC,KAAK,oBAAoB,MAAM,EAC/B,KAAK,oBAAoB,MAAM,CACjC,CAEA,IAAW,QAA+C,CACxD,OAAO,KAAK,OACd,CAEA,IAAW,oBAAkD,CAC3D,OAAO,KAAK,mBACd,CAEA,IAAW,aAAsB,CAC/B,OAAO,KAAK,aAAe,CAC7B,CAEQ,yBAAgC,CACtC,OAAW,CAACC,CAAO,IAAK,KAAK,QAAS,CACpC,GAAI,KAAK,QAAQ,MAAQH,EAAkB,iBAAmB,EAC5D,MAEG,KAAK,oBAAoB,IAAIG,CAAO,GACvC,KAAK,QAAQ,OAAOA,CAAO,CAE/B,CACF,CACF,EAzIaH,EACa,iBAAmB,IADtC,IAAMY,GAANZ,ECVP,IAAAa,EAA8E,OAI9E,IAAAC,GAAsC,QAGtC,IAAMC,GAAkB,QAGlBC,GAAkB,mBACxBA,GAAgB,IAAI,qBAAmB,EAGhC,IAAMC,GAAN,KAAyD,CAK9D,YACmBC,EACAC,EACAC,EACjB,CAHiB,WAAAF,EACA,cAAAC,EACA,mBAAAC,EAPnB,KAAQ,MAAQ,EAChB,KAAQ,SAAW,MAQjB,iBAAa,CACX,YAAa,KAAK,MAAM,WAAa,EACrC,QAASJ,GACT,aAAc,KAAK,MAAM,iBAC3B,CAAC,EAAE,KAAKK,GAAK,KAAK,KAAOA,CAAC,CAC5B,CAEO,OAAc,CAOf,KAAK,OACP,KAAK,KAAK,QAAQ,EAEjB,KAAK,KAAa,SAAS,KAAK,CAAC,EAClC,KAAK,KAAK,KAAK,EAAGL,GAAiB,KAAK,MAAM,iBAAiB,EAEnE,CAEO,KAAKM,EAAuB,CAGjC,GAFA,KAAK,MAAQ,EACb,KAAK,SAAW,GACZ,KAAK,KAAM,CACb,IAAMC,EAAYD,EAAO,OAAO,CAAC,IAAM,EAAI,EAAIE,GAC7C,KAAK,cAAc,MAAM,cAAc,aACvC,KAAK,cAAc,MAAM,eAAe,MAAM,EAChD,KAAK,KAAK,KAAKD,EAAW,KAAM,KAAK,MAAM,iBAAiB,CAC9D,CACF,CAEO,IAAIE,EAAmBC,EAAeC,EAAmB,CAC9D,GAAI,OAAK,UAAY,CAAC,KAAK,MAI3B,IADA,KAAK,OAASA,EAAMD,EAChB,KAAK,MAAQ,KAAK,MAAM,eAAgB,CAC1C,QAAQ,KAAK,gCAAgC,EAC7C,KAAK,SAAW,GAChB,KAAK,KAAK,QAAQ,EAClB,MACF,CACA,GAAI,CACF,KAAK,KAAK,OAAOD,EAAMC,EAAOC,CAAG,CACnC,OAASC,EAAG,CACV,QAAQ,KAAK,uCAAuCA,CAAC,EAAE,EACvD,KAAK,SAAW,GAChB,KAAK,KAAK,QAAQ,CACpB,EACF,CAEO,OAAOC,EAA8C,CAC1D,GAAI,KAAK,UAAY,CAACA,GAAW,CAAC,KAAK,KACrC,MAAO,GAGT,IAAMC,EAAQ,KAAK,KAAK,MAClBC,EAAS,KAAK,KAAK,OAGzB,GAAI,CAACD,GAAS,CAACC,EACb,OAAIA,GACF,KAAK,SAAS,cAAcA,CAAM,EAE7B,GAGT,IAAMC,EAASC,EAAc,aAAa,OAAWH,EAAOC,CAAM,EAClE,OAAAC,EAAO,WAAW,IAAI,GAAG,aAAa,IAAI,UAAU,KAAK,KAAK,MAAyCF,EAAOC,CAAM,EAAG,EAAG,CAAC,EACvH,KAAK,KAAK,YAAchB,IAC1B,KAAK,KAAK,QAAQ,EAEpB,KAAK,SAAS,SAASiB,CAAM,EACtB,EACT,CACF,EASA,SAASR,GAAgBU,EAAqBC,EAAgD,CAC5F,IAAIC,EAAK,EACT,GAAI,CAACD,EAGH,OAAOC,EAET,GAAIF,EAAK,UAAU,EACjB,GAAIA,EAAK,YAAY,EACnBE,EAAKC,GAAUF,EAAO,WAAW,IAAI,UAC5BD,EAAK,QAAQ,EAAG,CACzB,IAAMI,EAAKJ,EAAK,YAAqC,WAAWA,EAAK,WAAW,CAAC,EACjFE,KAAK,cAAW,GAAGE,CAAC,CACtB,MACEF,EAAKC,GAAUF,EAAO,KAAKD,EAAK,WAAW,CAAC,EAAE,IAAI,UAGhDA,EAAK,YAAY,EACnBE,EAAKC,GAAUF,EAAO,WAAW,IAAI,UAC5BD,EAAK,QAAQ,EAAG,CACzB,IAAMI,EAAKJ,EAAK,YAAqC,WAAWA,EAAK,WAAW,CAAC,EACjFE,KAAK,cAAW,GAAGE,CAAC,CACtB,MACEF,EAAKC,GAAUF,EAAO,KAAKD,EAAK,WAAW,CAAC,EAAE,IAAI,EAGtD,OAAOE,CACT,CAGA,SAASC,GAAUE,EAAyB,CAC1C,OAAI,aAAmBA,GACfA,EAAQ,MAAS,IAAMA,IAAU,EAAI,MAAS,IAAMA,IAAU,GAAK,MAAS,EAAIA,IAAU,GAAK,GACzG,CCtIO,IAAMC,GAAN,KAAwB,CAE7B,YACmBC,EACAC,EACAC,EACAC,EACjB,CAJiB,cAAAH,EACA,WAAAC,EACA,eAAAC,EACA,eAAAC,EALnB,KAAQ,cAA+B,CAAE,UAAW,GAAM,MAAO,MAAO,OAAQ,EAAG,UAAW,OAAQ,CAMnG,CAMI,SAASC,EAA4C,CAC1D,KAAK,cAAc,UAAY,KAAK,MAAM,eAC1C,KAAK,SAAS,SAASA,EAAK,KAAK,aAAa,CAChD,CAOO,cAAcC,EAAsB,CACzC,GAAI,KAAK,MAAM,eAAgB,CAC7B,IAAIC,EAAW,KAAK,UAAU,UAC1BA,EAAS,QAAU,IAAMA,EAAS,SAAW,MAC/CA,EAAWC,GAEb,IAAMC,EAAO,KAAK,KAAKH,EAASC,EAAS,MAAM,EAC/C,QAASG,EAAI,EAAGA,EAAID,EAAM,EAAEC,EAC1B,KAAK,UAAU,MAAM,cAAc,SAAS,CAEhD,CACF,CACF,ECrCO,IAAMC,GAAN,KAAsB,CAE3B,YACmBC,EACjB,CADiB,cAAAA,EAFnB,KAAQ,cAA+B,CAAE,UAAW,GAAM,MAAO,MAAO,OAAQ,EAAG,UAAW,KAAM,CAGjG,CAMI,SAASC,EAA4C,CAC1D,KAAK,SAAS,SAASA,EAAK,KAAK,aAAa,CAChD,CACF,ECiCA,IAAMC,GAAsC,CAC1C,kBAAmB,GACnB,WAAY,SACZ,aAAc,GACd,eAAgB,GAChB,kBAAmB,KACnB,eAAgB,SAChB,aAAc,IACd,gBAAiB,GACjB,WAAY,GACZ,aAAc,SACd,aAAc,GACd,eAAgB,QAClB,EAGMC,GAAyB,KAsBxB,IAAMC,GAAN,KAAsD,CAW3D,YAAYC,EAAoC,CANhD,KAAQ,aAA8B,CAAC,EAEvC,KAAQ,UAAwC,IAAI,IACpD,KAAiB,cAAgB,IAAIC,EACrC,KAAgB,aAA6B,KAAK,cAAc,MAG9D,KAAK,MAAQ,OAAO,OAAO,CAAC,EAAGC,GAAiBF,CAAI,EACpD,KAAK,aAAe,OAAO,OAAO,CAAC,EAAGE,GAAiBF,CAAI,CAC7D,CAEO,SAAgB,CACrB,QAAWG,KAAO,KAAK,aACrBA,EAAI,QAAQ,EAEd,KAAK,aAAa,OAAS,EAC3B,KAAK,UAAU,MAAM,EACrB,KAAK,cAAc,QAAQ,CAC7B,CAEQ,iBAAiBC,EAA2B,CAClD,QAAWD,KAAOC,EAChB,KAAK,aAAa,KAAKD,CAAG,CAE9B,CAEO,SAASE,EAA8B,CAS5C,GARA,KAAK,UAAYA,EAGjB,KAAK,UAAY,IAAIC,EAAcD,CAAQ,EAC3C,KAAK,SAAW,IAAIE,EAAaF,EAAU,KAAK,UAAW,KAAK,KAAK,EACrE,KAAK,SAAS,aAAe,IAAM,KAAK,cAAc,KAAK,EAGvD,KAAK,MAAM,kBAAmB,CAChC,IAAMG,EAAYH,EAAS,QAAQ,eAAiB,CAAC,EACrDG,EAAU,iBAAmB,GAC7BA,EAAU,kBAAoB,GAC9BA,EAAU,gBAAkB,GAC5BH,EAAS,QAAQ,cAAgBG,CACnC,CAiCA,GA/BA,KAAK,cACH,KAAK,UACL,KAAK,SAGLH,EAAS,OAAO,mBAAmB,CAAE,OAAQ,IAAK,MAAO,GAAI,EAAGI,GAAU,KAAK,QAAQA,CAAM,CAAC,EAC9FJ,EAAS,OAAO,mBAAmB,CAAE,OAAQ,IAAK,MAAO,GAAI,EAAGI,GAAU,KAAK,QAAQA,CAAM,CAAC,EAC9FJ,EAAS,OAAO,mBAAmB,CAAE,MAAO,GAAI,EAAGI,GAAU,KAAK,KAAKA,CAAM,CAAC,EAC9EJ,EAAS,OAAO,mBAAmB,CAAE,OAAQ,IAAK,MAAO,GAAI,EAAGI,GAAU,KAAK,yBAAyBA,CAAM,CAAC,EAG/GJ,EAAS,SAASK,GAAS,KAAK,UAAU,OAAOA,CAAK,CAAC,EAQvDL,EAAS,OAAO,mBAAmB,CAAE,cAAe,IAAK,MAAO,GAAI,EAAG,IAAM,KAAK,MAAM,CAAC,EACzFA,EAAS,OAAO,mBAAmB,CAAE,MAAO,GAAI,EAAG,IAAM,KAAK,MAAM,CAAC,EACrEA,EAAS,MAAM,cAAc,eAAe,IAAM,KAAK,MAAM,CAAC,EAG9DA,EAAS,OAAO,eAAe,IAAM,KAAK,UAAU,cAAc,CAAC,EAGnEA,EAAS,SAASM,GAAW,KAAK,UAAU,eAAeA,CAAO,CAAC,CACrE,EAGI,KAAK,MAAM,aAAc,CAC3B,IAAMC,EAAe,IAAIC,GAAkB,KAAK,SAAW,KAAK,MAAO,KAAK,UAAYR,CAAQ,EAC1FS,EAAe,IAAIC,GAAa,KAAK,MAAOH,EAAcP,CAAQ,EACxE,KAAK,UAAU,IAAI,QAASS,CAAY,EACxC,KAAK,cACHT,EAAS,MAAM,cAAc,QAAQ,mBAAmB,CAAE,MAAO,GAAI,EAAGS,CAAY,CACtF,CACF,CAGA,GAAI,KAAK,MAAM,WAAY,CACzB,IAAME,EAAa,IAAIC,GAAgB,KAAK,QAAS,EAC/CC,EAAa,IAAIC,EAAW,KAAK,MAAO,KAAK,UAAYH,EAAYX,CAAQ,EACnF,KAAK,UAAU,IAAI,MAAOa,CAAU,EACpC,KAAK,cACHb,EAAS,MAAM,cAAc,QAAQ,mBAAmB,KAAMa,CAAU,CAC1E,CACF,CAGA,GAAI,KAAK,MAAM,aAAc,CAC3B,IAAME,EAAe,IAAIC,GAAkB,KAAK,QAAS,EACnDC,EAAe,IAAIC,GAAqB,KAAK,MAAO,KAAK,UAAYH,EAAcf,CAAQ,EACjG,KAAK,UAAU,IAAI,QAASiB,CAAY,EACxC,KAAK,cACHF,EACAE,EACAjB,EAAS,MAAM,cAAc,QAAQ,mBAAmB,CAAE,MAAO,GAAI,EAAGiB,CAAY,CACtF,CACF,CACF,CAGO,OAAiB,CAEtB,KAAK,MAAM,eAAiB,KAAK,aAAa,eAC9C,KAAK,MAAM,kBAAoB,KAAK,aAAa,kBAEjD,KAAK,UAAU,MAAM,EAErB,QAAWE,KAAW,KAAK,UAAU,OAAO,EAC1CA,EAAQ,MAAM,EAEhB,MAAO,EACT,CAEA,IAAW,cAAuB,CAChC,OAAO,KAAK,UAAU,SAAS,GAAK,EACtC,CAEA,IAAW,aAAaC,EAAe,CACrC,KAAK,UAAU,SAASA,CAAK,EAC7B,KAAK,MAAM,aAAeA,CAC5B,CAEA,IAAW,cAAuB,CAChC,OAAI,KAAK,SACA,KAAK,SAAS,SAAS,EAEzB,EACT,CAEA,IAAW,iBAA2B,CACpC,OAAO,KAAK,MAAM,eACpB,CAEA,IAAW,gBAAgBC,EAAgB,CACzC,KAAK,MAAM,gBAAkBA,EAC7B,KAAK,WAAW,gBAAgBA,CAAK,CACvC,CAEO,qBAAqBC,EAAWC,EAA0C,CAC/E,OAAO,KAAK,UAAU,qBAAqBD,EAAGC,CAAC,CACjD,CAEO,wBAAwBD,EAAWC,EAA0C,CAClF,OAAO,KAAK,UAAU,wBAAwBD,EAAGC,CAAC,CACpD,CAEQ,QAAQC,EAAiB,CAC/B,KAAK,WAAW,MAAM,MAAMA,EAAG,EAAK,CACtC,CAEQ,QAAQpB,EAAwC,CACtD,QAASqB,EAAI,EAAGA,EAAIrB,EAAO,OAAQ,EAAEqB,EAC3BrB,EAAOqB,CAAC,IACT,KACH,KAAK,MAAM,eAAiB,IAIlC,MAAO,EACT,CAEQ,QAAQrB,EAAwC,CACtD,QAASqB,EAAI,EAAGA,EAAIrB,EAAO,OAAQ,EAAEqB,EAC3BrB,EAAOqB,CAAC,IACT,KACH,KAAK,MAAM,eAAiB,IAIlC,MAAO,EACT,CAGQ,KAAKrB,EAAwC,CACnD,OAAIA,EAAO,CAAC,EACH,GAOL,KAAK,MAAM,cACb,KAAK,QAAQ,kBAAkB,EACxB,IAEF,EACT,CAYQ,yBAAyBA,EAAwC,CACvE,GAAIA,EAAO,OAAS,EAClB,MAAO,GAET,GAAIA,EAAO,CAAC,IAAM,EAChB,OAAQA,EAAO,CAAC,EAAG,CACjB,IAAK,GACH,YAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,MAAwB,KAAK,MAAM,iBAAiB,GAAG,EAC/E,GACT,IAAK,GACH,KAAK,MAAM,kBAAoB,KAAK,aAAa,kBACjD,KAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,MAAwB,KAAK,MAAM,iBAAiB,GAAG,EAEtF,QAAWe,KAAW,KAAK,UAAU,OAAO,EAC1CA,EAAQ,MAAM,EAEhB,MAAO,GACT,IAAK,GACH,OAAIf,EAAO,OAAS,GAAK,EAAEA,EAAO,CAAC,YAAa,QAAUA,EAAO,CAAC,GAAKsB,IACrE,KAAK,MAAM,kBAAoBtB,EAAO,CAAC,EACvC,KAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,MAAwB,KAAK,MAAM,iBAAiB,GAAG,GAEtF,KAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,KAA4B,EAEtD,GACT,IAAK,GACH,YAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,MAAwBsB,EAAsB,GAAG,EACzE,GACT,QACE,YAAK,QAAQ,SAAStB,EAAO,CAAC,CAAC,KAA4B,EACpD,EACX,CAEF,GAAIA,EAAO,CAAC,IAAM,EAChB,OAAQA,EAAO,CAAC,EAAG,CAEjB,IAAK,GACH,IAAIuB,EAAQ,KAAK,WAAW,YAAY,IAAI,OAAO,MAC/CC,EAAS,KAAK,WAAW,YAAY,IAAI,OAAO,OACpD,GAAI,CAACD,GAAS,CAACC,EAAQ,CAGrB,IAAMC,EAAWC,EACjBH,GAAS,KAAK,WAAW,MAAQ,IAAME,EAAS,MAChDD,GAAU,KAAK,WAAW,MAAQ,IAAMC,EAAS,MACnD,CACA,GAAIF,EAAQC,EAAS,KAAK,MAAM,WAC9B,KAAK,QAAQ,SAASxB,EAAO,CAAC,CAAC,MAAwBuB,EAAM,QAAQ,CAAC,CAAC,IAAIC,EAAO,QAAQ,CAAC,CAAC,GAAG,MAC1F,CAEL,IAAMN,EAAI,KAAK,MAAM,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC,EACrD,KAAK,QAAQ,SAASlB,EAAO,CAAC,CAAC,MAAwBkB,CAAC,IAAIA,CAAC,GAAG,CAClE,CACA,MAAO,GACT,IAAK,GAEH,IAAMA,EAAI,KAAK,MAAM,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC,EACrD,YAAK,QAAQ,SAASlB,EAAO,CAAC,CAAC,MAAwBkB,CAAC,IAAIA,CAAC,GAAG,EACzD,GACT,QACE,YAAK,QAAQ,SAASlB,EAAO,CAAC,CAAC,KAA4B,EACpD,EACX,CAGF,YAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,KAA0B,EAClD,EACT,CACF",
 -  "names": ["exports", "red", "n", "green", "blue", "alpha", "toRGBA8888", "g", "b", "a", "fromRGBA8888", "color", "nearestColorIndex", "palette", "r", "min", "idx", "i", "dr", "dg", "db", "d", "clamp", "low", "high", "value", "h2c", "t1", "t2", "c", "HLStoRGB", "h", "l", "s", "v", "normalizeRGB", "normalizeHLS", "p", "require_lib", "__commonJSMin", "exports", "InWasm", "z", "s", "b", "r", "def", "t", "d", "m", "W", "e", "require_Base64Decoder_wasm", "__commonJSMin", "exports", "inwasm_runtime_1", "wasmDecode", "MAP", "el", "D", "i", "EMPTY", "Base64Decoder", "keepSize", "maxBytes", "initialBytes", "m", "bytes", "requested", "needed", "newSize", "addPages", "data", "require_QoiDecoder_wasm", "__commonJSMin", "exports", "inwasm_runtime_1", "wasmQoiDecode", "QoiDecoder", "keepSize", "d", "pixels", "ib", "dl", "bytes", "chunkP", "exports", "Colors_1", "wasm_1", "decodeBase64", "s", "bytestring", "result", "WASM_BYTES", "WASM_MODULE", "NULL_CANVAS", "CallbackProxy", "width", "mode", "DEFAULT_OPTIONS", "DecoderAsync", "opts", "cbProxy", "importObj", "inst", "Decoder", "exports", "_instance", "_cbProxy", "module", "pixels", "offset", "additionalPixels", "newCanvas", "adv", "remaining", "c", "i", "fillColor", "palette", "paletteLimit", "truncate", "data", "start", "end", "p", "length", "j", "currentWidth", "escape", "final", "finalOffset", "bw", "currentHeight", "decode", "dec", "decodeAsync", "toDisposable", "fn", "DisposableStore", "o", "d", "Disposable", "MutableDisposable", "value", "Emitter", "listener", "thisArgs", "disposables", "toDisposable", "entry", "result", "idx", "event", "listeners", "len", "EventUtils", "forward", "from", "to", "e", "map", "i", "any", "events", "store", "DisposableStore", "runAndSubscribe", "handler", "initial", "import_Colors", "ImageRenderer", "_ImageRenderer", "Disposable", "_terminal", "MutableDisposable", "parent", "option", "toDisposable", "localDocument", "width", "height", "canvas", "ctx", "buffer", "imgData", "img", "value", "start", "end", "layer", "y", "w", "h", "imgSpec", "tileId", "col", "row", "count", "cols", "sx", "sy", "dx", "dy", "finalWidth", "finalHeight", "spec", "currentWidth", "currentHeight", "originalWidth", "originalHeight", "renderer", "key", "screenElement", "bWidth", "blueprint", "d32", "black", "white", "shift", "offset", "x", "ctx2", "i", "bitmap", "CELL_SIZE_DEFAULT", "ExtendedAttrsImage", "_ExtendedAttrsImage", "ext", "urlId", "imageId", "tileId", "value", "val", "EMPTY_ATTRS", "ImageStorage", "_terminal", "_renderer", "_opts", "e", "spec", "storedPixels", "id", "zero", "img", "opts", "cellSize", "cols", "rows", "buffer", "termCols", "termRows", "originX", "originY", "offset", "tileCount", "row", "line", "col", "endMarker", "imgSpec", "range", "hasTopImages", "hasBottomImages", "start", "end", "drawCalls", "placeholderCalls", "startTile", "startCol", "count", "a", "b", "call", "metrics", "oldCol", "tilesPerRow", "hasData", "rightCol", "lastTile", "expandCol", "x", "y", "orig", "canvas", "ImageRenderer", "room", "used", "current", "old", "oldSpec", "imgId", "import_Base64Decoder", "import_QoiDecoder", "toStr", "data", "s", "i", "toInt", "v", "toSize", "toName", "bs", "b", "DECODERS", "FILE_MARKER", "MULTIPARTFILE_MARKER", "FILEPART_MARKER", "FILEEND_MARKER", "REPORTCELLSIZE_MARKER", "MAX_FIELDCHARS", "HeaderParser", "k", "start", "end", "state", "pos", "buffer", "c", "UNSUPPORTED_TYPE", "imageType", "d", "d32", "width", "height", "jpgSize", "dim", "pos", "limit", "i", "len", "blockLength", "DEFAULT_HEADER", "IIPHandler", "_opts", "_renderer", "_storage", "_coreTerminal", "HeaderParser", "maxEncodedBytes", "initialBytes", "Base64Decoder", "QoiDecoder", "data", "start", "end", "dataPos", "success", "seqType", "w", "CELL_SIZE_DEFAULT", "h", "scale", "report", "cond", "metrics", "UNSUPPORTED_TYPE", "imageType", "blob", "canvas", "ImageRenderer", "bm", "e", "cw", "ch", "width", "height", "rw", "rh", "wf", "hf", "f", "s", "total", "cdim", "import_Base64Decoder", "parseKittyCommand", "data", "cmd", "parts", "part", "eqIdx", "key", "value", "numValue", "DECODER_OK", "KittyGraphicsHandler", "_opts", "_renderer", "_kittyStorage", "_coreTerminal", "key", "pending", "data", "start", "end", "controlEnd", "i", "copyLength", "parseKittyCommand", "payloadStart", "pendingKey", "previousEncodedSize", "decoderToRelease", "Base64Decoder", "success", "cmd", "isMoreComing", "decodeError", "finalCmd", "decoder", "imageBytes", "result", "str", "bytes", "id", "image", "quiet", "format", "width", "height", "bytesPerPixel", "expectedBytes", "message", "placementId", "isOk", "pPart", "response", "bitmap", "cropX", "cropY", "cropW", "cropH", "maxCropW", "maxCropH", "finalCropW", "finalCropH", "cropped", "cw", "CELL_SIZE_DEFAULT", "ch", "imgCols", "imgRows", "w", "h", "buffer", "savedX", "savedY", "savedYbase", "layer", "scaled", "xOffset", "yOffset", "canvasW", "canvasH", "offsetCanvas", "ImageRenderer", "offsetCtx", "offsetBitmap", "zIndex", "scrolled", "e", "blob", "url", "img", "resolve", "reject", "canvas", "pixelCount", "src32", "dst32", "alignedPixels", "srcOffset", "dstOffset", "b0", "b1", "b2", "srcByte", "dstByte", "compressed", "ds", "writer", "chunks", "reader", "done", "value", "totalLength", "sum", "chunk", "offset", "_KittyImageStorage", "_storage", "storageId", "kittyId", "id", "imageData", "imageId", "oldStorageId", "image", "scrolling", "layer", "zIndex", "KittyImageStorage", "import_Colors", "import_Decoder", "MEM_PERMA_LIMIT", "DEFAULT_PALETTE", "SixelHandler", "_opts", "_storage", "_coreTerminal", "d", "params", "fillColor", "extractActiveBg", "data", "start", "end", "e", "success", "width", "height", "canvas", "ImageRenderer", "attr", "colors", "bg", "convertLe", "t", "color", "SixelImageStorage", "_storage", "_opts", "_renderer", "_terminal", "img", "height", "cellSize", "CELL_SIZE_DEFAULT", "rows", "i", "IIPImageStorage", "_storage", "img", "DEFAULT_OPTIONS", "MAX_SIXEL_PALETTE_SIZE", "ImageAddon", "opts", "Emitter", "DEFAULT_OPTIONS", "obj", "args", "terminal", "ImageRenderer", "ImageStorage", "windowOps", "params", "range", "metrics", "sixelStorage", "SixelImageStorage", "sixelHandler", "SixelHandler", "iipStorage", "IIPImageStorage", "iipHandler", "IIPHandler", "kittyStorage", "KittyImageStorage", "kittyHandler", "KittyGraphicsHandler", "handler", "limit", "value", "x", "y", "s", "i", "MAX_SIXEL_PALETTE_SIZE", "width", "height", "cellSize", "CELL_SIZE_DEFAULT"]
-+  "sourcesContent": [null, "\"use strict\";\n/**\n * Copyright (c) 2022, 2026 Joerg Breitbart\n * @license MIT\n */\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.InWasm = InWasm;\nlet z = (s) => {\n    if (Uint8Array.fromBase64)\n        return Uint8Array.fromBase64(s);\n    if (typeof Buffer !== 'undefined')\n        return Buffer.from(s, 'base64');\n    const b = atob(s);\n    const r = new Uint8Array(b.length);\n    for (let i = 0; i < r.length; ++i)\n        r[i] = b.charCodeAt(i);\n    return r;\n};\nfunction InWasm(def) {\n    if (def.d) {\n        const { t, s, d } = def;\n        let b;\n        let m;\n        const W = WebAssembly;\n        if (t === 0 /* OutputType.INSTANCE */) {\n            if (s)\n                return (e) => new W.Instance(m || (m = new W.Module(b || (b = z(d)))), e);\n            return (e) => m\n                ? W.instantiate(m, e)\n                : W.instantiate(b || (b = z(d)), e).then(r => (m = r.module) && r.instance);\n        }\n        if (t === 1 /* OutputType.MODULE */) {\n            if (s)\n                return () => m || (m = new W.Module(b || (b = z(d))));\n            return () => m\n                ? Promise.resolve(m)\n                : W.compile(b || (b = z(d))).then(r => m = r);\n        }\n        if (s)\n            return () => b || (b = z(d));\n        return () => Promise.resolve(b || (b = z(d)));\n    }\n    if (typeof _wasmCtx === 'undefined')\n        throw new Error('must run \"inwasm\"');\n    _wasmCtx.add(def);\n}\n//# sourceMappingURL=index.js.map", "\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\n/**\n * Copyright (c) 2023, 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nconst inwasm_runtime_1 = require(\"inwasm-runtime\");\n/**\n * wasm base64 decoder.\n */\nconst wasmDecode = (0, inwasm_runtime_1.InWasm)(/*inwasm#828e69684093b2c6:rdef-start:\"decode\"*/{s:1,t:0,d:'AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML'}/*inwasm#828e69684093b2c6:rdef-end:\"decode\"*/);\n// SIMD version (speedup ~1.4x, not covered by tests yet)\n/*\nconst wasmDecode = InWasm({\n  name: 'decode',\n  type: OutputType.INSTANCE,\n  mode: OutputMode.SYNC,\n  srctype: 'Clang-C',\n  imports: {\n    env: { memory: new WebAssembly.Memory({ initial: 1 }) }\n  },\n  exports: {\n    dec: () => 0,\n    end: () => 0\n  },\n  compile: {\n    switches: ['-msimd128', '-Wl,-z,stack-size=0', '-Wl,--stack-first']\n  },\n  code: `\n    #include <wasm_simd128.h>\n    typedef struct {\n      unsigned int wp;\n      unsigned int sp;\n      unsigned int dp;\n      unsigned int e_size;\n      unsigned int dummy[4];\n      unsigned char data[0];\n    } State;\n\n    unsigned int *D0 = (unsigned int *) ${P32.D0 * 4};\n    unsigned int *D1 = (unsigned int *) ${P32.D1 * 4};\n    unsigned int *D2 = (unsigned int *) ${P32.D2 * 4};\n    unsigned int *D3 = (unsigned int *) ${P32.D3 * 4};\n    State *state = (State *) ${P32.STATE * 4};\n\n    #define packed_byte(x) wasm_i8x16_splat((char) x)\n    #define packed_dword(x) wasm_i32x4_splat(x)\n    #define masked(x, mask) wasm_v128_and(x, wasm_i32x4_splat(mask))\n\n    __attribute__((noinline)) int dec() {\n      unsigned int nsp = (state->wp - 1) & ~3;\n      unsigned char *src = state->data + state->sp;\n      unsigned char *end = state->data + nsp;\n      unsigned char *dst = state->data + state->dp;\n      unsigned int error = 0;\n\n      v128_t err = wasm_i8x16_splat(0);\n      unsigned char *end16 = state->data + (nsp & ~15);\n      while (src < end16) {\n        v128_t data = wasm_v128_load((v128_t *) src);\n\n        // wasm-simd rewrite of http://0x80.pl/notesen/2016-01-17-sse-base64-decoding.html#vector-lookup-pshufb\n        const v128_t higher_nibble = wasm_u32x4_shr(data, 4) & packed_byte(0x0f);\n        const char linv = 1;\n        const char hinv = 0;\n\n        const v128_t lower_bound_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          linv, linv, 0x2b, 0x30,\n          0x41, 0x50, 0x61, 0x70,\n          linv, linv, linv, linv,\n          linv, linv, linv, linv\n        );\n        const v128_t upper_bound_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          hinv, hinv, 0x2b, 0x39,\n          0x4f, 0x5a, 0x6f, 0x7a,\n          hinv, hinv, hinv, hinv,\n          hinv, hinv, hinv, hinv\n        );\n        // the difference between the shift and lower bound\n        const v128_t shift_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          0x00,        0x00,        0x3e - 0x2b, 0x34 - 0x30,\n          0x00 - 0x41, 0x0f - 0x50, 0x1a - 0x61, 0x29 - 0x70,\n          0x00,        0x00,        0x00,        0x00,\n          0x00,        0x00,        0x00,        0x00\n        );\n\n        const v128_t upper_bound = wasm_i8x16_swizzle(upper_bound_LUT, higher_nibble);\n        const v128_t lower_bound = wasm_i8x16_swizzle(lower_bound_LUT, higher_nibble);\n\n        const v128_t below = wasm_i8x16_lt(data, lower_bound);\n        const v128_t above = wasm_i8x16_gt(data, upper_bound);\n        const v128_t eq_2f = wasm_i8x16_eq(data, packed_byte(0x2f));\n\n        // in_range = not (below or above) or eq_2f\n        // outside  = not in_range = below or above and not eq_2f (from deMorgan law)\n        const v128_t outside = wasm_v128_andnot(eq_2f, above | below);\n        err = wasm_v128_or(err, outside);\n\n        const v128_t shift  = wasm_i8x16_swizzle(shift_LUT, higher_nibble);\n        const v128_t t0     = wasm_i8x16_add(data, shift);\n        v128_t v = wasm_i8x16_add(t0, wasm_v128_and(eq_2f, packed_byte(-3)));\n\n        // pack bytes\n        const v128_t ca = masked(v, 0x003f003f);\n        const v128_t db = masked(v, 0x3f003f00);\n        const v128_t t00 = wasm_v128_or(wasm_u32x4_shr(db, 8), wasm_i32x4_shl(ca, 6));\n        v128_t res = wasm_v128_or(wasm_u32x4_shr(t00, 16), wasm_i32x4_shl(t00, 12));\n        res = wasm_i8x16_swizzle(res, wasm_i8x16_const(2, 1, 0, 6, 5, 4, 10, 9, 8, 14, 13, 12, 16, 16, 16, 16));\n\n        wasm_v128_store((v128_t *) dst, res);\n        dst += 12;\n        src += 16;\n      }\n      //if (wasm_i8x16_bitmask(err) != 0) return -1;\n      if (wasm_v128_any_true(err)) return -1;\n\n      // operate on 4-byte blocks\n      while (src < end) {\n        error |= *((unsigned int *) dst) = D0[src[0]] | D1[src[1]] | D2[src[2]] | D3[src[3]];\n        dst += 3;\n        src += 4;\n      }\n      if (error >> 24) return -1;\n      state->sp = nsp;\n      state->dp = dst - state->data;\n      return 0;\n    }\n\n    int end() {\n      int rem = state->wp - state->sp;\n      if (rem > 4 && dec()) return -1;\n      rem = state->wp - state->sp;\n      if (rem < 2) return -1;\n\n      unsigned char *src = state->data + state->sp;\n      if (rem == 4) {\n        if (src[3] == 61) rem--;\n        if (src[2] == 61) rem--;\n      }\n      unsigned int accu = D0[src[0]] | D1[src[1]];\n      int dp = 1;\n      if (rem > 2) {\n        accu |= D2[src[2]];\n        dp++;\n        if (rem == 4) {\n          accu |= D3[src[3]];\n          dp++;\n        }\n      }\n      if (accu >> 24) return -1;\n      *((unsigned int *) (state->data + state->dp)) = accu;\n      state->dp += dp;\n      return 0;\n    }\n    `\n});\n*/\n// base64 map\nconst MAP = new Uint8Array('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'\n    .split('')\n    .map(el => el.charCodeAt(0)));\n// init decoder maps in LE order\nconst D = new Uint32Array(1024);\nD.fill(0xFF000000);\nfor (let i = 0; i < MAP.length; ++i)\n    D[MAP[i]] = i << 2;\nfor (let i = 0; i < MAP.length; ++i)\n    D[256 + MAP[i]] = i >> 4 | ((i << 4) & 0xFF) << 8;\nfor (let i = 0; i < MAP.length; ++i)\n    D[512 + MAP[i]] = (i >> 2) << 8 | ((i << 6) & 0xFF) << 16;\nfor (let i = 0; i < MAP.length; ++i)\n    D[768 + MAP[i]] = i << 16;\nconst EMPTY = new Uint8Array(0);\n/**\n * base64 stream decoder.\n *\n * Features / assumptions:\n * - lazy chunkwise decoding\n * - errors out on any non base64 chars (no support for NL formatted base64)\n * - decodes in wasm\n * - inplace decoding to save memory\n * - supports a keepSize for lazy memory release\n */\nclass Base64Decoder {\n    /**\n     * @param keepSize Keep the wasm instance below this limit when calling `release()`.\n     * @param maxBytes Max allowed bytes to allocate.\n     * @param initialBytes Initial bytes to allocate.\n     */\n    constructor(keepSize, maxBytes, initialBytes) {\n        this._inst = null;\n        this._ended = true;\n        this._bytes = 0;\n        this.keepSize = keepSize !== null && keepSize !== void 0 ? keepSize : 1048576 /* Bytes.KEEP */;\n        this.maxBytes = maxBytes !== null && maxBytes !== void 0 ? maxBytes : 4294901760 /* Bytes.MAX */;\n        this._bytes = initialBytes !== null && initialBytes !== void 0 ? initialBytes : 32768 /* Bytes.INITIAL */;\n        if (this._bytes > this.maxBytes || this.maxBytes > 4294901760 /* Bytes.MAX */) {\n            throw new Error('invalid byte settings');\n        }\n    }\n    /**\n     * Currently decoded bytes (borrowed).\n     * Must be accessed before calling `release` or `init`.\n     */\n    get data8() {\n        return this._inst ? this._d.subarray(0, this._m32[1282 /* P32.STATE_DP */]) : EMPTY;\n    }\n    /**\n     * Release memory conditionally based on `keepSize`.\n     * If memory gets released, also the wasm instance will be freed and recreated on next `init`,\n     * otherwise the instance will be reused.\n     */\n    release() {\n        if (!this._inst)\n            return;\n        if (this._bytes > this.keepSize) {\n            this._inst = this._m32 = this._d = this._mem = null;\n        }\n        else {\n            this._m32[1280 /* P32.STATE_WP */] = 0;\n            this._m32[1281 /* P32.STATE_SP */] = 0;\n            this._m32[1282 /* P32.STATE_DP */] = 0;\n        }\n    }\n    /**\n     * Initializes the decoder for new base64 data.\n     * Must be called before doing any decoding attempts.\n     * The method will either spawn a new wasm instance or grow\n     * the needed memory of an existing instance.\n     * @param maxBytes Max allowed bytes to allocate (overwrites ctor value).\n     * @param initialBytes Initial bytes to allocate (overwrites ctor value).\n     */\n    init(maxBytes, initialBytes) {\n        this.maxBytes = maxBytes !== null && maxBytes !== void 0 ? maxBytes : this.maxBytes;\n        this._bytes = initialBytes !== null && initialBytes !== void 0 ? initialBytes : Math.min(this._bytes, this.maxBytes);\n        if (this._bytes > this.maxBytes || this.maxBytes > 4294901760 /* Bytes.MAX */) {\n            throw Error('invalid byte settings');\n        }\n        let m = this._m32;\n        const bytes = this._bytes + 5152 /* Bytes._DATA_OFFSET */;\n        if (!this._inst) {\n            this._mem = new WebAssembly.Memory({ initial: Math.ceil(bytes / 65536) });\n            this._inst = wasmDecode({ env: { memory: this._mem } });\n            m = new Uint32Array(this._mem.buffer, 0);\n            m.set(D, 256 /* P32.D0 */);\n            this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n        }\n        else if (this._mem.buffer.byteLength < bytes) {\n            this._mem.grow(Math.ceil((bytes - this._mem.buffer.byteLength) / 65536));\n            m = new Uint32Array(this._mem.buffer, 0);\n            this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n        }\n        m[1280 /* P32.STATE_WP */] = 0;\n        m[1281 /* P32.STATE_SP */] = 0;\n        m[1282 /* P32.STATE_DP */] = 0;\n        this._m32 = m;\n        this._ended = false;\n    }\n    /**\n     * Realloc memory. Realloc only happens, if the requested\n     * size doesn't fit in the current memory.\n     * The new size will be capped by `maxBytes`.\n     * @param requested Bytes to be stored.\n     */\n    _realloc(requested) {\n        const needed = this._m32[1280 /* P32.STATE_WP */] + requested;\n        if (this._bytes < needed) {\n            if (needed > this.maxBytes) {\n                return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n            }\n            let newSize = this._bytes;\n            while ((newSize *= 2) < needed) { }\n            newSize = Math.min(newSize, this.maxBytes);\n            if (newSize < needed) {\n                return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n            }\n            if (newSize + 5152 /* Bytes._DATA_OFFSET */ > this._mem.buffer.byteLength) {\n                const addPages = Math.ceil((newSize + 5152 /* Bytes._DATA_OFFSET */ - this._mem.buffer.byteLength) / 65536);\n                this._mem.grow(addPages);\n                this._m32 = new Uint32Array(this._mem.buffer, 0);\n                this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n            }\n            this._bytes = newSize;\n        }\n        return 0 /* DecodeStatus.OK */;\n    }\n    /**\n     * Put bytes in `data` into the decoder.\n     * Additionally decodes the payload, if it reached 2^17 bytes.\n     * The return value indicates the type of issue.\n     * @param data Bytes to be loaded.\n     */\n    put(data) {\n        if (!this._inst || this._ended) {\n            return -2 /* DecodeStatus.NOT_INITIALIZED */;\n        }\n        if (this._realloc(data.length)) {\n            return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n        }\n        const m = this._m32;\n        this._d.set(data, m[1280 /* P32.STATE_WP */]);\n        m[1280 /* P32.STATE_WP */] += data.length;\n        // max chunk in input handler is 2^17, try to run in \"tandem mode\"\n        return m[1280 /* P32.STATE_WP */] - m[1281 /* P32.STATE_SP */] >= 131072\n            ? this._inst.exports.dec()\n            : 0 /* DecodeStatus.OK */;\n    }\n    /**\n     * End the current decoding.\n     * Also decodes leftover payload from previous put calls.\n     */\n    end() {\n        this._ended = true;\n        return this._inst\n            ? this._inst.exports.end()\n            : -2 /* DecodeStatus.NOT_INITIALIZED */;\n    }\n    /**\n     * Bytes loaded into the decoder.\n     */\n    get loadedBytes() {\n        return this._inst\n            ? this._m32[1280 /* P32.STATE_WP */]\n            : 0;\n    }\n    /**\n     * Free bytes to feed to the decoder.\n     */\n    get freeBytes() {\n        return this._inst\n            ? this.maxBytes - this._m32[1280 /* P32.STATE_WP */]\n            : 0;\n    }\n}\nexports.default = Base64Decoder;\n//# sourceMappingURL=Base64Decoder.wasm.js.map", "\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\n/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nconst inwasm_runtime_1 = require(\"inwasm-runtime\");\nconst wasmQoiDecode = (0, inwasm_runtime_1.InWasm)(/*inwasm#459f9e1bfb80b1a8:rdef-start:\"qoi_decode\"*/{s:1,t:0,d:'AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw=='}/*inwasm#459f9e1bfb80b1a8:rdef-end:\"qoi_decode\"*/);\nclass QoiDecoder {\n    constructor(keepSize) {\n        this.keepSize = keepSize;\n        this.width = 0;\n        this.height = 0;\n    }\n    decode(d) {\n        this.width = d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7];\n        this.height = d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11];\n        const pixels = this.width * this.height;\n        const ib = pixels * 4;\n        const dl = d.length;\n        /**\n         * byte/offset calculation:\n         * To save some memory we dont reserve full memory for decoded + encoded,\n         * but place encoded at the end of decoded plus 50% security distance\n         * to avoid reads before writes positions:\n         *\n         * encoded < decoded (good compression)\n         *    enc                                              ####################\n         *    dec                 #######################################\n         *                        ^                            ^\n         *                        DST_P                        CHUNK_P\n         *\n         * encoded > decoded (degenerated compression, should not happen)\n         *    enc                           ##############################\n         *    dec                 ####################\n         *                        ^         ^\n         *                        DST_P     CHUNK_P\n         *\n         * There is still a chance for overlapping r/w positions in case the compressed\n         * data has very different pixel progression, yet the 50% security distance\n         * should deal with that, as QOI will bloat data by 25% at max (RGB -> OP byte + RGB).\n         * Since we always assume RGBA at decoding stage, the possible bloat reduces to 20% at max.\n         */\n        const bytes = Math.max(ib, dl) + (Math.min(ib, dl) >> 1) + 4096;\n        if (!this._inst) {\n            this._mem = new WebAssembly.Memory({ initial: Math.ceil(bytes / 65536) });\n            this._inst = wasmQoiDecode({ env: { memory: this._mem } });\n        }\n        else if (this._mem.buffer.byteLength < bytes) {\n            this._mem.grow(Math.ceil((bytes - this._mem.buffer.byteLength) / 65536));\n            this._d = null;\n        }\n        if (!this._d) {\n            this._d = new Uint8Array(this._mem.buffer);\n        }\n        // put src data at the end of memory, also align to 256\n        const chunkP = (this._mem.buffer.byteLength - dl) & ~0xFF;\n        this._d.set(d, chunkP);\n        this._inst.exports.dec(chunkP, dl, pixels);\n        return this._d.subarray(1024 /* P8.DST_P */, 1024 /* P8.DST_P */ + ib);\n    }\n    release() {\n        if (!this._inst)\n            return;\n        if (this._mem.buffer.byteLength > this.keepSize) {\n            this._inst = this._d = this._mem = null;\n        }\n    }\n}\nexports.default = QoiDecoder;\n//# sourceMappingURL=QoiDecoder.wasm.js.map", null, null, "/**\n * Copyright (c) 2024-2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Minimal lifecycle utilities for xterm.js core.\n * Simplified from VS Code's lifecycle.ts - no tracking/leak detection.\n */\n\nexport interface IDisposable {\n  dispose(): void;\n}\n\nexport function toDisposable(fn: () => void): IDisposable {\n  return { dispose: fn };\n}\n\nexport function dispose<T extends IDisposable>(disposable: T): T;\nexport function dispose<T extends IDisposable>(disposable: T | undefined): T | undefined;\nexport function dispose<T extends IDisposable>(disposables: T[]): T[];\nexport function dispose<T extends IDisposable>(arg: T | T[] | undefined): T | T[] | undefined {\n  if (!arg) {\n    return arg;\n  }\n  if (Array.isArray(arg)) {\n    for (const d of arg) {\n      d.dispose();\n    }\n    return [];\n  }\n  arg.dispose();\n  return arg;\n}\n\nexport function combinedDisposable(...disposables: IDisposable[]): IDisposable {\n  return toDisposable(() => dispose(disposables));\n}\n\nexport class DisposableStore implements IDisposable {\n  private readonly _disposables = new Set<IDisposable>();\n  private _isDisposed = false;\n\n  public get isDisposed(): boolean {\n    return this._isDisposed;\n  }\n\n  public add<T extends IDisposable>(o: T): T {\n    if (this._isDisposed) {\n      o.dispose();\n    } else {\n      this._disposables.add(o);\n    }\n    return o;\n  }\n\n  public dispose(): void {\n    if (this._isDisposed) {\n      return;\n    }\n    this._isDisposed = true;\n    for (const d of this._disposables) {\n      d.dispose();\n    }\n    this._disposables.clear();\n  }\n\n  public clear(): void {\n    for (const d of this._disposables) {\n      d.dispose();\n    }\n    this._disposables.clear();\n  }\n}\n\nexport abstract class Disposable implements IDisposable {\n  public static readonly None: IDisposable = Object.freeze({ dispose() { } });\n\n  protected readonly _store = new DisposableStore();\n\n  public dispose(): void {\n    this._store.dispose();\n  }\n\n  protected _register<T extends IDisposable>(o: T): T {\n    return this._store.add(o);\n  }\n}\n\nexport class MutableDisposable<T extends IDisposable> implements IDisposable {\n  private _value: T | undefined;\n  private _isDisposed = false;\n\n  public get value(): T | undefined {\n    return this._isDisposed ? undefined : this._value;\n  }\n\n  public set value(value: T | undefined) {\n    if (this._isDisposed || value === this._value) {\n      return;\n    }\n    this._value?.dispose();\n    this._value = value;\n  }\n\n  public clear(): void {\n    this.value = undefined;\n  }\n\n  public dispose(): void {\n    this._isDisposed = true;\n    this._value?.dispose();\n    this._value = undefined;\n  }\n}\n", "/**\n * Copyright (c) 2024-2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Minimal event utilities for xterm.js core.\n * Simplified from VS Code's event.ts - no leak detection/profiling.\n */\n\nimport { IDisposable, DisposableStore, toDisposable } from './Lifecycle';\n\nexport interface IEvent<T> {\n  (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore): IDisposable;\n}\n\nexport class Emitter<T> {\n  private _listeners: { fn: (e: T) => any, thisArgs: any }[] = [];\n  private _disposed = false;\n  private _event: IEvent<T> | undefined;\n\n  public get event(): IEvent<T> {\n    if (this._event) {\n      return this._event;\n    }\n    this._event = (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      if (this._disposed) {\n        return toDisposable(() => {});\n      }\n\n      const entry = { fn: listener, thisArgs };\n      this._listeners = this._listeners.slice();\n      this._listeners.push(entry);\n\n      const result = toDisposable(() => {\n        const idx = this._listeners.indexOf(entry);\n        if (idx !== -1) {\n          this._listeners = this._listeners.slice();\n          this._listeners.splice(idx, 1);\n        }\n      });\n\n      if (disposables) {\n        if (Array.isArray(disposables)) {\n          disposables.push(result);\n        } else {\n          disposables.add(result);\n        }\n      }\n\n      return result;\n    };\n    return this._event;\n  }\n\n  public fire(event: T): void {\n    if (this._disposed || !this._listeners.length) {\n      return;\n    }\n    if (this._listeners.length === 1) {\n      this._listeners[0].fn.call(this._listeners[0].thisArgs, event);\n      return;\n    }\n    const listeners = this._listeners;\n    for (let i = 0, len = listeners.length; i < len; ++i) {\n      listeners[i].fn.call(listeners[i].thisArgs, event);\n    }\n  }\n\n  public dispose(): void {\n    if (this._disposed) {\n      return;\n    }\n    this._disposed = true;\n    this._listeners.length = 0;\n  }\n}\n\nexport namespace EventUtils {\n  export function forward<T>(from: IEvent<T>, to: Emitter<T>): IDisposable {\n    return from(e => to.fire(e));\n  }\n\n  export function map<I, O>(event: IEvent<I>, map: (i: I) => O): IEvent<O> {\n    return (listener: (e: O) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      return event(i => listener.call(thisArgs, map(i)), undefined, disposables);\n    };\n  }\n\n  export function any<T>(...events: IEvent<T>[]): IEvent<T>;\n  export function any(...events: IEvent<any>[]): IEvent<void>;\n  export function any<T>(...events: IEvent<T>[]): IEvent<T> {\n    return (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      const store = new DisposableStore();\n      for (const event of events) {\n        store.add(event(e => listener.call(thisArgs, e)));\n      }\n      if (disposables) {\n        if (Array.isArray(disposables)) {\n          disposables.push(store);\n        } else {\n          disposables.add(store);\n        }\n      }\n      return store;\n    };\n  }\n\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T) => void, initial: T): IDisposable;\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T | undefined) => void): IDisposable;\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T | undefined) => void, initial?: T): IDisposable {\n    handler(initial);\n    return event(e => handler(e));\n  }\n}\n", "/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { toRGBA8888 } from 'sixel/lib/Colors';\nimport { IDisposable } from '@xterm/xterm';\nimport { ICellSize, ImageLayer, ITerminalExt, IImageSpec, IRenderDimensions, IRenderService } from './Types';\nimport { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';\n\nconst enum Constants {\n  PLACEHOLDER_LENGTH = 4096,\n  PLACEHOLDER_HEIGHT = 24\n}\n\n/**\n * ImageRenderer - terminal frontend extension:\n * - provide primitives for canvas, ImageData, Bitmap (static)\n * - add canvas layer to DOM (browser only for now)\n * - draw image tiles onRender\n */\nexport class ImageRenderer extends Disposable implements IDisposable {\n  /** @deprecated Kept for backward compat \u2014 points to top layer canvas. */\n  public get canvas(): HTMLCanvasElement | undefined { return this._layers.get('top')?.canvas; }\n  private _layers = new Map<ImageLayer, CanvasRenderingContext2D>();\n  private _placeholder: HTMLCanvasElement | undefined;\n  private _placeholderBitmap: ImageBitmap | undefined;\n  private _optionsRefresh = this._register(new MutableDisposable());\n  private _oldOpen: ((parent: HTMLElement) => void) | undefined;\n  private _renderService: IRenderService | undefined;\n  private _oldSetRenderer: ((renderer: any) => void) | undefined;\n\n  // drawing primitive - canvas\n  public static createCanvas(localDocument: Document | undefined, width: number, height: number): HTMLCanvasElement {\n    /**\n     * NOTE: We normally dont care, from which document the canvas\n     * gets created, so we can fall back to global document,\n     * if the terminal has no document associated yet.\n     * This way early image loads before calling .open keep working\n     * (still discouraged though, as the metrics will be screwed up).\n     * Only the DOM output canvas should be on the terminal's document,\n     * which gets explicitly checked in `insertLayerToDom`.\n     */\n    const canvas = (localDocument ?? document).createElement('canvas');\n    canvas.width = width | 0;\n    canvas.height = height | 0;\n    return canvas;\n  }\n\n  // drawing primitive - ImageData with optional buffer\n  public static createImageData(ctx: CanvasRenderingContext2D, width: number, height: number, buffer?: ArrayBuffer): ImageData {\n    if (typeof ImageData !== 'function') {\n      const imgData = ctx.createImageData(width, height);\n      if (buffer) {\n        imgData.data.set(new Uint8ClampedArray(buffer, 0, width * height * 4));\n      }\n      return imgData;\n    }\n    return buffer\n      ? new ImageData(new Uint8ClampedArray(buffer, 0, width * height * 4), width, height)\n      : new ImageData(width, height);\n  }\n\n  // drawing primitive - ImageBitmap\n  public static createImageBitmap(img: ImageBitmapSource): Promise<ImageBitmap | undefined> {\n    if (typeof createImageBitmap !== 'function') {\n      return Promise.resolve(undefined);\n    }\n    return createImageBitmap(img);\n  }\n\n\n  constructor(private _terminal: ITerminalExt) {\n    super();\n    this._oldOpen = this._terminal._core.open;\n    this._terminal._core.open = (parent: HTMLElement): void => {\n      this._oldOpen?.call(this._terminal._core, parent);\n      this._open();\n    };\n    if (this._terminal._core.screenElement) {\n      this._open();\n    }\n    // hack to spot fontSize changes\n    this._optionsRefresh.value = this._terminal._core.optionsService.onOptionChange(option => {\n      if (option === 'fontSize') {\n        this.rescaleCanvas();\n        this._renderService?.refreshRows(0, this._terminal.rows);\n      }\n    });\n    this._register(toDisposable(() => {\n      this.removeLayerFromDom();\n      this.removeLayerFromDom('bottom');\n      if (this._terminal._core && this._oldOpen) {\n        this._terminal._core.open = this._oldOpen;\n        this._oldOpen = undefined;\n      }\n      if (this._renderService && this._oldSetRenderer) {\n        this._renderService.setRenderer = this._oldSetRenderer;\n        this._oldSetRenderer = undefined;\n      }\n      this._renderService = undefined;\n      this._layers.clear();\n      this._placeholderBitmap?.close();\n      this._placeholderBitmap = undefined;\n      this._placeholder = undefined;\n    }));\n  }\n\n  /**\n   * Enable the placeholder.\n   */\n  public showPlaceholder(value: boolean): void {\n    if (value) {\n      if (!this._placeholder && this.cellSize.height !== -1) {\n        this._createPlaceHolder(Math.max(this.cellSize.height + 1, Constants.PLACEHOLDER_HEIGHT));\n      }\n    } else {\n      this._placeholderBitmap?.close();\n      this._placeholderBitmap = undefined;\n      this._placeholder = undefined;\n    }\n    this._renderService?.refreshRows(0, this._terminal.rows);\n  }\n\n  /**\n   * Dimensions of the terminal.\n   * Forwarded from internal render service.\n   */\n  public get dimensions(): IRenderDimensions | undefined {\n    return this._terminal.dimensions;\n  }\n\n  /**\n   * Current cell size (float).\n   */\n  public get cellSize(): ICellSize {\n    return {\n      width: this.dimensions?.css.cell.width || -1,\n      height: this.dimensions?.css.cell.height || -1\n    };\n  }\n\n  /**\n   * Clear a region of the image layer canvas.\n   */\n  public clearLines(start: number, end: number, layer?: ImageLayer): void {\n    const y = start * (this.dimensions?.css.cell.height || 0);\n    const w = this.dimensions?.css.canvas.width || 0;\n    const h = (end + 1 - start) * (this.dimensions?.css.cell.height || 0);\n    if (!layer || layer === 'top') {\n      this._layers.get('top')?.clearRect(0, y, w, h);\n    }\n    if (!layer || layer === 'bottom') {\n      this._layers.get('bottom')?.clearRect(0, y, w, h);\n    }\n  }\n\n  /**\n   * Clear whole image canvas.\n   */\n  public clearAll(layer?: ImageLayer): void {\n    if (!layer || layer === 'top') {\n      const ctx = this._layers.get('top');\n      ctx?.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);\n    }\n    if (!layer || layer === 'bottom') {\n      const ctx = this._layers.get('bottom');\n      ctx?.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);\n    }\n  }\n\n  /**\n   * Draw neighboring tiles on the image layer canvas.\n   */\n  public draw(imgSpec: IImageSpec, tileId: number, col: number, row: number, count: number = 1): void {\n    const ctx = this._layers.get(imgSpec.layer);\n    if (!ctx) {\n      return;\n    }\n    const { width, height } = this.cellSize;\n\n    // Don't try to draw anything, if we cannot get valid renderer metrics.\n    if (width === -1 || height === -1) {\n      return;\n    }\n\n    this._rescaleImage(imgSpec, width, height);\n    const img = imgSpec.actual!;\n    const { width: sourceWidth, height: sourceHeight } = imgSpec.actualCellSize;\n    const cols = Math.ceil(img.width / sourceWidth);\n\n    const sx = (tileId % cols) * sourceWidth;\n    const sy = Math.floor(tileId / cols) * sourceHeight;\n    const dx = col * width;\n    const dy = row * height;\n\n    // safari bug: never access image source out of bounds\n    const finalWidth = count * sourceWidth + sx > img.width ? img.width - sx : count * sourceWidth;\n    const finalHeight = sy + sourceHeight > img.height ? img.height - sy : sourceHeight;\n\n    // Floor all pixel offsets to get stable tile mapping without any overflows.\n    // Note: For not pixel perfect aligned cells like in the DOM renderer\n    // this will move a tile slightly to the top/left (subpixel range, thus ignore it).\n    // FIX #34: avoid striping on displays with pixelDeviceRatio != 1 by ceiling height and width\n    ctx.drawImage(\n      img,\n      Math.floor(sx), Math.floor(sy), Math.ceil(finalWidth), Math.ceil(finalHeight),\n      Math.floor(dx), Math.floor(dy), Math.ceil(finalWidth * width / sourceWidth), Math.ceil(finalHeight * height / sourceHeight)\n    );\n  }\n\n  /**\n   * Extract a single tile from an image.\n   */\n  public extractTile(imgSpec: IImageSpec, tileId: number): HTMLCanvasElement | undefined {\n    const { width, height } = this.cellSize;\n    // Don't try to draw anything, if we cannot get valid renderer metrics.\n    if (width === -1 || height === -1) {\n      return;\n    }\n    this._rescaleImage(imgSpec, width, height);\n    const img = imgSpec.actual!;\n    const { width: sourceWidth, height: sourceHeight } = imgSpec.actualCellSize;\n    const cols = Math.ceil(img.width / sourceWidth);\n    const sx = (tileId % cols) * sourceWidth;\n    const sy = Math.floor(tileId / cols) * sourceHeight;\n    const finalWidth = sourceWidth + sx > img.width ? img.width - sx : sourceWidth;\n    const finalHeight = sy + sourceHeight > img.height ? img.height - sy : sourceHeight;\n\n    const canvas = ImageRenderer.createCanvas(this.document, Math.ceil(finalWidth * width / sourceWidth), Math.ceil(finalHeight * height / sourceHeight));\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      ctx.drawImage(\n        img,\n        Math.floor(sx), Math.floor(sy), Math.floor(finalWidth), Math.floor(finalHeight),\n        0, 0, canvas.width, canvas.height\n      );\n      return canvas;\n    }\n  }\n\n  /**\n   * Draw a line with placeholder on the image layer canvas.\n   */\n  public drawPlaceholder(col: number, row: number, count: number = 1): void {\n    const ctx = this._layers.get('top');\n    if (ctx) {\n      const { width, height } = this.cellSize;\n\n      // Don't try to draw anything, if we cannot get valid renderer metrics.\n      if (width === -1 || height === -1) {\n        return;\n      }\n\n      if (!this._placeholder) {\n        this._createPlaceHolder(Math.max(height + 1, Constants.PLACEHOLDER_HEIGHT));\n      } else if (height >= this._placeholder!.height) {\n        this._createPlaceHolder(height + 1);\n      }\n      if (!this._placeholder) return;\n      ctx.drawImage(\n        this._placeholderBitmap ?? this._placeholder!,\n        col * width,\n        (row * height) % 2 ? 0 : 1,  // needs %2 offset correction\n        width * count,\n        height,\n        col * width,\n        row * height,\n        width * count,\n        height\n      );\n    }\n  }\n\n  /**\n   * Rescale image layer canvas if needed.\n   * Checked once from `ImageStorage.render`.\n   */\n  public rescaleCanvas(): void {\n    const w = this.dimensions?.css.canvas.width || 0;\n    const h = this.dimensions?.css.canvas.height || 0;\n    for (const ctx of this._layers.values()) {\n      if (ctx.canvas.width !== w || ctx.canvas.height !== h) {\n        ctx.canvas.width = w;\n        ctx.canvas.height = h;\n      }\n    }\n  }\n\n  /**\n   * Rescale image in storage if needed.\n   */\n  private _rescaleImage(spec: IImageSpec, currentWidth: number, currentHeight: number): void {\n    if (currentWidth === spec.actualCellSize.width && currentHeight === spec.actualCellSize.height) {\n      return;\n    }\n    const { width: originalWidth, height: originalHeight } = spec.origCellSize;\n    if (currentWidth === originalWidth && currentHeight === originalHeight) {\n      spec.actual = spec.orig;\n      spec.actualCellSize.width = originalWidth;\n      spec.actualCellSize.height = originalHeight;\n      return;\n    }\n    const scaledWidth = Math.ceil(spec.orig!.width * currentWidth / originalWidth);\n    const scaledHeight = Math.ceil(spec.orig!.height * currentHeight / originalHeight);\n    // Upscale visible tiles directly; a full zoomed copy can dwarf the image budget.\n    if (scaledWidth * scaledHeight > spec.orig!.width * spec.orig!.height) {\n      spec.actual = spec.orig;\n      spec.actualCellSize.width = originalWidth;\n      spec.actualCellSize.height = originalHeight;\n      return;\n    }\n    const canvas = ImageRenderer.createCanvas(this.document, scaledWidth, scaledHeight);\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      ctx.drawImage(spec.orig!, 0, 0, canvas.width, canvas.height);\n      spec.actual = canvas;\n      spec.actualCellSize.width = currentWidth;\n      spec.actualCellSize.height = currentHeight;\n    }\n  }\n\n  /**\n   * Lazy init for the renderer.\n   */\n  private _open(): void {\n    this._renderService = this._terminal._core._renderService;\n    this._oldSetRenderer = this._renderService.setRenderer.bind(this._renderService);\n    this._renderService.setRenderer = (renderer: any) => {\n      for (const key of [...this._layers.keys()]) {\n        this.removeLayerFromDom(key);\n      }\n      this._oldSetRenderer?.call(this._renderService, renderer);\n    };\n  }\n\n  public insertLayerToDom(layer: ImageLayer = 'top'): void {\n    // make sure that the terminal is attached to a document and to DOM\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(layer)) {\n      return;\n    }\n    const canvas = ImageRenderer.createCanvas(\n      this.document, this.dimensions?.css.canvas.width || 0,\n      this.dimensions?.css.canvas.height || 0\n    );\n    canvas.classList.add(`xterm-image-layer-${layer}`);\n    const screenElement = this._terminal._core.screenElement;\n    // Use isolation to create a stacking context without overriding z-index,\n    // which would conflict with integrators (e.g. VS Code) that set their\n    // own z-index on the screen element.\n    screenElement.style.isolation = 'isolate';\n    if (layer === 'bottom') {\n      // Use z-index:-1 so it paints behind non-positioned text elements.\n      // The screen element needs to be a stacking context (via isolation)\n      // to contain the negative z-index, otherwise it would go behind the\n      // entire terminal.\n      canvas.style.zIndex = '-1';\n      screenElement.insertBefore(canvas, screenElement.firstChild);\n    } else {\n      // Explicit z-index ensures the image canvas reliably stacks above\n      // the text layer (DOM renderer rows). z-index: 0 is below the\n      // selection overlay (z-index: 1).\n      canvas.style.zIndex = '0';\n      screenElement.appendChild(canvas);\n    }\n    const ctx = canvas.getContext('2d', { alpha: true });\n    if (!ctx) {\n      canvas.remove();\n      return;\n    }\n    this._layers.set(layer, ctx);\n    this.clearAll(layer);\n  }\n\n  public removeLayerFromDom(layer: ImageLayer = 'top'): void {\n    const ctx = this._layers.get(layer);\n    if (ctx) {\n      ctx.canvas.remove();\n      this._layers.delete(layer);\n    }\n  }\n\n  public hasLayer(layer: ImageLayer): boolean {\n    return this._layers.has(layer);\n  }\n\n  private _createPlaceHolder(height: number = Constants.PLACEHOLDER_HEIGHT): void {\n    this._placeholderBitmap?.close();\n    this._placeholderBitmap = undefined;\n\n    // create blueprint to fill placeholder with\n    const bWidth = 32;  // must be 2^n\n    const blueprint = ImageRenderer.createCanvas(this.document, bWidth, height);\n    const ctx = blueprint.getContext('2d', { alpha: false });\n    if (!ctx) return;\n    const imgData = ImageRenderer.createImageData(ctx, bWidth, height);\n    const d32 = new Uint32Array(imgData.data.buffer);\n    const black = toRGBA8888(0, 0, 0);\n    const white = toRGBA8888(255, 255, 255);\n    d32.fill(black);\n    for (let y = 0; y < height; ++y) {\n      const shift = y % 2;\n      const offset = y * bWidth;\n      for (let x = 0; x < bWidth; x += 2) {\n        d32[offset + x + shift] = white;\n      }\n    }\n    ctx.putImageData(imgData, 0, 0);\n\n    // create placeholder line, width aligned to blueprint width\n    const width = (screen.width + bWidth - 1) & ~(bWidth - 1) || Constants.PLACEHOLDER_LENGTH;\n    this._placeholder = ImageRenderer.createCanvas(this.document, width, height);\n    const ctx2 = this._placeholder.getContext('2d', { alpha: false });\n    if (!ctx2) {\n      this._placeholder = undefined;\n      return;\n    }\n    for (let i = 0; i < width; i += bWidth) {\n      ctx2.drawImage(blueprint, i, 0);\n    }\n    const placeholder = this._placeholder;\n    ImageRenderer.createImageBitmap(placeholder).then(bitmap => {\n      if (this._placeholder !== placeholder) bitmap?.close();\n      else this._placeholderBitmap = bitmap;\n    }).catch(() => {});\n  }\n\n  public get document(): Document | undefined {\n    return this._terminal._core._coreBrowserService?.window.document;\n  }\n}\n", "/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { ImageRenderer } from './ImageRenderer';\nimport {\n  ITerminalExt, IExtendedAttrsImage, IImageAddonOptions, IImageSpec,\n  IBufferLineExt, BgFlags, Cell, Content, ICellSize, ExtFlags, Attributes,\n  UnderlineStyle, IAddImageOpts\n} from './Types';\n\n\n// fallback default cell size\nexport const CELL_SIZE_DEFAULT: ICellSize = {\n  width: 7,\n  height: 14\n};\n\n/**\n * Extend extended attribute to also hold image tile information.\n *\n * Object definition is copied from base repo to fully mimick its behavior.\n * Image data is added as additional public properties `imageId` and `tileId`.\n */\nclass ExtendedAttrsImage implements IExtendedAttrsImage {\n  private _ext: number = 0;\n  public get ext(): number {\n    if (this._urlId) {\n      return (\n        (this._ext & ~ExtFlags.UNDERLINE_STYLE) |\n        (this.underlineStyle << 26)\n      );\n    }\n    return this._ext;\n  }\n  public set ext(value: number) { this._ext = value; }\n\n  public get underlineStyle(): UnderlineStyle {\n    // Always return the URL style if it has one\n    if (this._urlId) {\n      return UnderlineStyle.DASHED;\n    }\n    return (this._ext & ExtFlags.UNDERLINE_STYLE) >> 26;\n  }\n  public set underlineStyle(value: UnderlineStyle) {\n    this._ext &= ~ExtFlags.UNDERLINE_STYLE;\n    this._ext |= (value << 26) & ExtFlags.UNDERLINE_STYLE;\n  }\n\n  public get underlineColor(): number {\n    return this._ext & (Attributes.CM_MASK | Attributes.RGB_MASK);\n  }\n  public set underlineColor(value: number) {\n    this._ext &= ~(Attributes.CM_MASK | Attributes.RGB_MASK);\n    this._ext |= value & (Attributes.CM_MASK | Attributes.RGB_MASK);\n  }\n\n  public get underlineVariantOffset(): number {\n    const val = (this._ext & ExtFlags.VARIANT_OFFSET) >> 29;\n    if (val < 0) {\n      return val ^ 0xFFFFFFF8;\n    }\n    return val;\n  }\n  public set underlineVariantOffset(value: number) {\n    this._ext &= ~ExtFlags.VARIANT_OFFSET;\n    this._ext |= (value << 29) & ExtFlags.VARIANT_OFFSET;\n  }\n\n  private _urlId: number = 0;\n  public get urlId(): number {\n    return this._urlId;\n  }\n  public set urlId(value: number) {\n    this._urlId = value;\n  }\n\n  constructor(\n    ext: number = 0,\n    urlId: number = 0,\n    public imageId = -1,\n    public tileId = -1\n  ) {\n    this._ext = ext;\n    this._urlId = urlId;\n  }\n\n  public clone(): IExtendedAttrsImage {\n    /**\n     * Technically we dont need a clone variant of ExtendedAttrsImage,\n     * as we never clone a cell holding image data.\n     * Note: Clone is only meant to be used by the InputHandler for\n     * sticky attributes, which is never the case for image data.\n     * We still provide a proper clone method to reflect the full ext attr\n     * state in case there are future use cases for clone.\n     */\n    return new ExtendedAttrsImage(this._ext, this._urlId, this.imageId, this.tileId);\n  }\n\n  public isEmpty(): boolean {\n    return this.underlineStyle === UnderlineStyle.NONE && this._urlId === 0 && this.imageId === -1;\n  }\n}\nconst EMPTY_ATTRS = new ExtendedAttrsImage();\n\n\n/**\n * ImageStorage - extension of CoreTerminal:\n * - hold image data\n * - write/read image data to/from buffer\n *\n * TODO: image composition for overwrites\n */\nexport class ImageStorage implements IDisposable {\n  // storage\n  private _images: Map<number, IImageSpec> = new Map();\n  // last used id\n  private _lastId = 0;\n  // last evicted id\n  private _lowestId = 0;\n  // whether a full clear happened before\n  private _fullyCleared = false;\n  // whether render should do a full clear\n  private _needsFullClear = false;\n  // hard limit of stored pixels (fallback limit of 10 MB)\n  private _pixelLimit: number = 2500000;\n\n  private _viewportMetrics: { cols: number, rows: number };\n  public onImageAdded: (() => void) | undefined;\n  public onImageDeleted: ((storageId: number) => void) | undefined;\n\n  constructor(\n    private _terminal: ITerminalExt,\n    private _renderer: ImageRenderer,\n    private _opts: IImageAddonOptions\n  ) {\n    try {\n      this.setLimit(this._opts.storageLimit);\n    } catch (e: unknown) {\n      if (e instanceof Error) {\n        console.error(e.message);\n      }\n      console.warn(`storageLimit is set to ${this.getLimit()} MB`);\n    }\n    this._viewportMetrics = {\n      cols: this._terminal.cols,\n      rows: this._terminal.rows\n    };\n  }\n\n  public dispose(): void {\n    this.reset();\n  }\n\n  public reset(): void {\n    for (const spec of this._images.values()) {\n      spec.marker?.dispose();\n    }\n    // NOTE: marker.dispose above already calls ImageBitmap.close\n    // therefore we can just wipe the map here\n    this._images.clear();\n    this._renderer.clearAll();\n  }\n\n  public getLimit(): number {\n    return this._pixelLimit * 4 / 1000000;\n  }\n\n  public setLimit(value: number): void {\n    if (value < 0.5 || value > 1000) {\n      throw RangeError('invalid storageLimit, should be at least 0.5 MB and not exceed 1G');\n    }\n    this._pixelLimit = (value / 4 * 1000000) >>> 0;\n    this._evictOldest(0);\n  }\n\n  public getUsage(): number {\n    return this._getStoredPixels() * 4 / 1000000;\n  }\n\n  private _getStoredPixels(): number {\n    let storedPixels = 0;\n    for (const spec of this._images.values()) {\n      if (spec.orig) {\n        storedPixels += spec.orig.width * spec.orig.height;\n        if (spec.actual && spec.actual !== spec.orig) {\n          storedPixels += spec.actual.width * spec.actual.height;\n        }\n      }\n    }\n    return storedPixels;\n  }\n\n  private _delImg(id: number): void {\n    const spec = this._images.get(id);\n    if (!spec) return;\n    this._images.delete(id);\n    // FIXME: really ugly workaround to get bitmaps deallocated :(\n    if (window.ImageBitmap && spec.orig instanceof ImageBitmap) {\n      spec.orig.close();\n    }\n    this.onImageDeleted?.(id);\n  }\n\n  /**\n   * Wipe canvas and images on alternate buffer.\n   */\n  public wipeAlternate(): void {\n    // remove all alternate tagged images\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.bufferType === 'alternate') {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n    // mark canvas to be wiped on next render\n    this._needsFullClear = true;\n    this._fullyCleared = false;\n  }\n\n  /**\n   * Delete an image by its internal storage ID.\n   * Used by protocols that support explicit deletion (e.g. Kitty a=d).\n   */\n  public deleteImage(id: number): void {\n    const spec = this._images.get(id);\n    if (spec) {\n      spec.marker?.dispose();\n      this._delImg(id);\n    }\n  }\n\n  /**\n   * Method to add an image to the storage.\n   * @param img - The image to add (canvas or bitmap).\n   * @param opts - Options for addImage:\n   *   - scrolling:  When true, cursor advances with the image.\n   *                 When false, image is placed at ORIGIN and cursor does not move.\n   *   - layer:      Which canvas layer to render on ('top' or 'bottom').\n   *   - zIndex:     Z-index for image layering within the same layer.\n   *   - cursorPos:  'vt340' for bottom-left, 'iip' for bottom.right.\n   * @returns The internal image ID assigned to the stored image.\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap, opts: IAddImageOpts): number {\n    // never allow storage to exceed memory limit\n    this._evictOldest(img.width * img.height);\n\n    // calc rows x cols needed to display the image\n    let cellSize = this._renderer.cellSize;\n    if (cellSize.width === -1 || cellSize.height === -1) {\n      cellSize = CELL_SIZE_DEFAULT;\n    }\n    const cols = Math.ceil(img.width / cellSize.width);\n    const rows = Math.ceil(img.height / cellSize.height);\n\n    const imageId = ++this._lastId;\n\n    const buffer = this._terminal._core.buffer;\n    const termCols = this._terminal.cols;\n    const termRows = this._terminal.rows;\n    const originX = buffer.x;\n    const originY = buffer.y;\n    let offset = originX;\n    let tileCount = 0;\n\n    if (!opts.scrolling) {\n      buffer.x = 0;\n      buffer.y = 0;\n      offset = 0;\n    }\n\n    this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);\n    for (let row = 0; row < rows; ++row) {\n      const line = buffer.lines.get(buffer.y + buffer.ybase);\n      for (let col = 0; col < cols; ++col) {\n        if (offset + col >= termCols) break;\n        this._writeToCell(line as IBufferLineExt, offset + col, imageId, row * cols + col);\n        tileCount++;\n      }\n      if (opts.scrolling) {\n        if (row < rows - 1) this._terminal._core._inputHandler.lineFeed();\n      } else {\n        if (++buffer.y >= termRows) break;\n      }\n      buffer.x = offset;\n    }\n    this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);\n\n    // cursor positioning modes\n    if (opts.scrolling) {\n      if (opts.cursorPos === 'iip') {\n        buffer.x = Math.min(offset + cols, termCols);\n      } else {\n        buffer.x = offset;\n      }\n    } else {\n      buffer.x = originX;\n      buffer.y = originY;\n    }\n\n    // deleted images with zero tile count\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.tileCount < 1) {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n\n    // eviction marker:\n    // delete the image when the marker gets disposed\n    const endMarker = this._terminal.registerMarker(0);\n    endMarker?.onDispose(() => {\n      const spec = this._images.get(imageId);\n      if (spec) {\n        this._delImg(imageId);\n      }\n    });\n\n    // since markers do not work on alternate for some reason,\n    // we evict images here manually\n    if (this._terminal.buffer.active.type === 'alternate') {\n      this._evictOnAlternate();\n    }\n\n    // create storage entry\n    const imgSpec: IImageSpec = {\n      orig: img,\n      origCellSize: cellSize,\n      actual: img,\n      actualCellSize: { ...cellSize },  // clone needed, since later modified\n      marker: endMarker || undefined,\n      tileCount,\n      bufferType: this._terminal.buffer.active.type,\n      layer: opts.layer,\n      zIndex: opts.zIndex\n    };\n\n    // finally add the image\n    this._images.set(imageId, imgSpec);\n    this.onImageAdded?.();\n    return imageId;\n  }\n\n\n  /**\n   * Render method. Collects buffer information and triggers\n   * canvas updates.\n   */\n  // TODO: Should we move this to the ImageRenderer?\n  public render(range: { start: number, end: number }): void {\n    // Determine which layers have images\n    let hasTopImages = false;\n    let hasBottomImages = false;\n    for (const spec of this._images.values()) {\n      if (spec.layer === 'bottom') {\n        hasBottomImages = true;\n      } else {\n        hasTopImages = true;\n      }\n      if (hasTopImages && hasBottomImages) break;\n    }\n\n    // Lazily insert layers that are needed\n    if (hasTopImages && !this._renderer.hasLayer('top')) {\n      this._renderer.insertLayerToDom('top');\n      if (!this._renderer.hasLayer('top')) return;\n    }\n    if (hasBottomImages && !this._renderer.hasLayer('bottom')) {\n      this._renderer.insertLayerToDom('bottom');\n    }\n\n    // rescale if needed\n    this._renderer.rescaleCanvas();\n\n    // exit early if we dont have any images to test for\n    if (!this._images.size) {\n      if (!this._fullyCleared) {\n        this._renderer.clearAll();\n        this._fullyCleared = true;\n        this._needsFullClear = false;\n      }\n      if (this._renderer.hasLayer('top')) {\n        this._renderer.removeLayerFromDom('top');\n      }\n      if (this._renderer.hasLayer('bottom')) {\n        this._renderer.removeLayerFromDom('bottom');\n      }\n      return;\n    }\n\n    // Remove layers no longer needed\n    if (!hasTopImages && this._renderer.hasLayer('top')) {\n      this._renderer.clearAll('top');\n      this._renderer.removeLayerFromDom('top');\n    }\n    if (!hasBottomImages && this._renderer.hasLayer('bottom')) {\n      this._renderer.clearAll('bottom');\n      this._renderer.removeLayerFromDom('bottom');\n    }\n\n    // buffer switches force a full clear\n    if (this._needsFullClear) {\n      this._renderer.clearAll();\n      this._fullyCleared = true;\n      this._needsFullClear = false;\n    }\n\n    const { start, end } = range;\n    const buffer = this._terminal._core.buffer;\n    const cols = this._terminal._core.cols;\n\n    // clear drawing area\n    this._renderer.clearLines(start, end);\n\n    // Collect draw calls so we can sort by z-index (lower z drawn first).\n    const drawCalls: { imgSpec: IImageSpec, tileId: number, col: number, row: number, count: number }[] = [];\n    const placeholderCalls: { col: number, row: number, count: number }[] = [];\n\n    // walk all cells in viewport and collect tiles found\n    for (let row = start; row <= end; ++row) {\n      const line = buffer.lines.get(row + buffer.ydisp) as IBufferLineExt;\n      if (!line) return;\n      for (let col = 0; col < cols; ++col) {\n        if (line.getBg(col) & BgFlags.HAS_EXTENDED) {\n          let e: IExtendedAttrsImage = line._extendedAttrs[col] ?? EMPTY_ATTRS;\n          const imageId = e.imageId;\n          if (imageId === undefined || imageId === -1) {\n            continue;\n          }\n          const imgSpec = this._images.get(imageId);\n          if (e.tileId !== -1) {\n            const startTile = e.tileId;\n            const startCol = col;\n            let count = 1;\n            /**\n             * merge tiles to the right into a single draw call, if:\n             * - not at end of line\n             * - cell has same image id\n             * - cell has consecutive tile id\n             */\n            while (\n              ++col < cols\n              && (line.getBg(col) & BgFlags.HAS_EXTENDED)\n              && (e = line._extendedAttrs[col] ?? EMPTY_ATTRS)\n              && (e.imageId === imageId)\n              && (e.tileId === startTile + count)\n            ) {\n              count++;\n            }\n            col--;\n            if (imgSpec) {\n              if (imgSpec.actual) {\n                drawCalls.push({ imgSpec, tileId: startTile, col: startCol, row, count });\n              }\n            } else if (this._opts.showPlaceholder) {\n              placeholderCalls.push({ col: startCol, row, count });\n            }\n            this._fullyCleared = false;\n          }\n        }\n      }\n    }\n\n    // Sort by z-index so lower z draws first (higher z renders on top)\n    drawCalls.sort((a, b) => a.imgSpec.zIndex - b.imgSpec.zIndex);\n\n    // Draw placeholders first (lowest priority)\n    for (const call of placeholderCalls) {\n      this._renderer.drawPlaceholder(call.col, call.row, call.count);\n    }\n\n    // Draw images in z-index order\n    for (const call of drawCalls) {\n      this._renderer.draw(call.imgSpec, call.tileId, call.col, call.row, call.count);\n    }\n  }\n\n  public viewportResize(metrics: { cols: number, rows: number }): void {\n    // exit early if we have nothing in storage\n    if (!this._images.size) {\n      this._viewportMetrics = metrics;\n      return;\n    }\n\n    // handle only viewport width enlargements, exit all other cases\n    // TODO: needs patch for tile counter\n    if (this._viewportMetrics.cols >= metrics.cols) {\n      this._viewportMetrics = metrics;\n      return;\n    }\n\n    // walk scrollbuffer at old col width to find all possible expansion matches\n    const buffer = this._terminal._core.buffer;\n    const rows = buffer.lines.length;\n    const oldCol = this._viewportMetrics.cols - 1;\n    for (let row = 0; row < rows; ++row) {\n      const line = buffer.lines.get(row) as IBufferLineExt;\n      if (line.getBg(oldCol) & BgFlags.HAS_EXTENDED) {\n        const e: IExtendedAttrsImage = line._extendedAttrs[oldCol] ?? EMPTY_ATTRS;\n        const imageId = e.imageId;\n        if (imageId === undefined || imageId === -1) {\n          continue;\n        }\n        const imgSpec = this._images.get(imageId);\n        if (!imgSpec) {\n          continue;\n        }\n        // found an image tile at oldCol, check if it qualifies for right exapansion\n        const tilesPerRow = Math.ceil((imgSpec.actual?.width || 0) / imgSpec.actualCellSize.width);\n        if ((e.tileId % tilesPerRow) + 1 >= tilesPerRow) {\n          continue;\n        }\n        // expand only if right side is empty (nothing got wrapped from below)\n        let hasData = false;\n        for (let rightCol = oldCol + 1; rightCol > metrics.cols; ++rightCol) {\n          if (line._data[rightCol * Cell.SIZE + Cell.CONTENT] & Content.HAS_CONTENT_MASK) {\n            hasData = true;\n            break;\n          }\n        }\n        if (hasData) {\n          continue;\n        }\n        // do right expansion on terminal buffer\n        const end = Math.min(metrics.cols, tilesPerRow - (e.tileId % tilesPerRow) + oldCol);\n        let lastTile = e.tileId;\n        for (let expandCol = oldCol + 1; expandCol < end; ++expandCol) {\n          this._writeToCell(line as IBufferLineExt, expandCol, imageId, ++lastTile);\n          imgSpec.tileCount++;\n        }\n      }\n    }\n    // store new viewport metrics\n    this._viewportMetrics = metrics;\n  }\n\n  /**\n   * Retrieve original canvas at buffer position.\n   */\n  public getImageAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    const buffer = this._terminal._core.buffer;\n    const line = buffer.lines.get(y) as IBufferLineExt;\n    if (line && line.getBg(x) & BgFlags.HAS_EXTENDED) {\n      const e: IExtendedAttrsImage = line._extendedAttrs[x] ?? EMPTY_ATTRS;\n      if (e.imageId && e.imageId !== -1) {\n        const orig = this._images.get(e.imageId)?.orig;\n        if (window.ImageBitmap && orig instanceof ImageBitmap) {\n          const canvas = ImageRenderer.createCanvas(window.document, orig.width, orig.height);\n          canvas.getContext('2d')?.drawImage(orig, 0, 0, orig.width, orig.height);\n          return canvas;\n        }\n        return orig as HTMLCanvasElement;\n      }\n    }\n  }\n\n  /**\n   * Extract active single tile at buffer position.\n   */\n  public extractTileAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    const buffer = this._terminal._core.buffer;\n    const line = buffer.lines.get(y) as IBufferLineExt;\n    if (line && line.getBg(x) & BgFlags.HAS_EXTENDED) {\n      const e: IExtendedAttrsImage = line._extendedAttrs[x] ?? EMPTY_ATTRS;\n      if (e.imageId && e.imageId !== -1 && e.tileId !== -1) {\n        const spec = this._images.get(e.imageId);\n        if (spec) {\n          return this._renderer.extractTile(spec, e.tileId);\n        }\n      }\n    }\n  }\n\n  // TODO: Do we need some blob offloading tricks here to avoid early eviction?\n  // also see https://stackoverflow.com/questions/28307789/is-there-any-limitation-on-javascript-max-blob-size\n  private _evictOldest(room: number): number {\n    const used = this._getStoredPixels();\n    let current = used;\n    while (this._pixelLimit < current + room && this._images.size) {\n      const spec = this._images.get(++this._lowestId);\n      if (spec && spec.orig) {\n        current -= spec.orig.width * spec.orig.height;\n        if (spec.actual && spec.orig !== spec.actual) {\n          current -= spec.actual.width * spec.actual.height;\n        }\n        spec.marker?.dispose();\n        this._delImg(this._lowestId);\n      }\n    }\n    return used - current;\n  }\n\n  private _writeToCell(line: IBufferLineExt, x: number, imageId: number, tileId: number): void {\n    if (line._data[x * Cell.SIZE + Cell.BG] & BgFlags.HAS_EXTENDED) {\n      const old = line._extendedAttrs[x];\n      if (old) {\n        if (old.imageId !== undefined) {\n          // found an old ExtendedAttrsImage, since we know that\n          // they are always isolated instances (single cell usage),\n          // we can re-use it and just update their id entries\n          const oldSpec = this._images.get(old.imageId);\n          if (oldSpec) {\n            // early eviction for in-viewport overwrites\n            oldSpec.tileCount--;\n          }\n          old.imageId = imageId;\n          old.tileId = tileId;\n          return;\n        }\n        // found a plain ExtendedAttrs instance, clone it to new entry\n        line._extendedAttrs[x] = new ExtendedAttrsImage(old.ext, old.urlId, imageId, tileId);\n        return;\n      }\n    }\n    // fall-through: always create new ExtendedAttrsImage entry\n    line._data[x * Cell.SIZE + Cell.BG] |= BgFlags.HAS_EXTENDED;\n    line._extendedAttrs[x] = new ExtendedAttrsImage(0, 0, imageId, tileId);\n  }\n\n  private _evictOnAlternate(): void {\n    // nullify tile count of all images on alternate buffer\n    for (const spec of this._images.values()) {\n      if (spec.bufferType === 'alternate') {\n        spec.tileCount = 0;\n      }\n    }\n    // re-count tiles on whole buffer\n    const buffer = this._terminal._core.buffer;\n    for (let y = 0; y < this._terminal.rows; ++y) {\n      const line = buffer.lines.get(y) as IBufferLineExt;\n      if (!line) {\n        continue;\n      }\n      for (let x = 0; x < this._terminal.cols; ++x) {\n        if (line._data[x * Cell.SIZE + Cell.BG] & BgFlags.HAS_EXTENDED) {\n          const imgId = line._extendedAttrs[x]?.imageId;\n          if (imgId) {\n            const spec = this._images.get(imgId);\n            if (spec) {\n              spec.tileCount++;\n            }\n          }\n        }\n      }\n    }\n    // deleted images with zero tile count\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.bufferType === 'alternate' && !spec.tileCount) {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n  }\n}\n", "/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nimport { IImageAddonOptions, IOscHandler, IResetHandler, ITerminalExt } from './Types';\nimport { ImageRenderer } from './ImageRenderer';\nimport { IIPImageStorage } from './IIPImageStorage';\nimport { CELL_SIZE_DEFAULT } from './ImageStorage';\nimport Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\nimport QoiDecoder from 'xterm-wasm-parts/lib/qoi/QoiDecoder.wasm';\nimport { HeaderParser, IHeaderFields, HeaderState, SequenceType } from './IIPHeaderParser';\nimport { imageType, UNSUPPORTED_TYPE } from './IIPMetrics';\n\n// Local const enum mirror - esbuild can't inline const enums from external packages\nconst enum DecoderConst {\n  // Limit held memory in base64 decoder (encoded bytes).\n  KEEP_DATA = 4194304,\n  // Initial buffer allocation for the decoder.\n  INITIAL_DATA = 1048576,\n  // Local mirror of const enum (esbuild can't inline const enums from external packages)\n  OK = 0\n}\n\n// default IIP header values\nconst DEFAULT_HEADER: IHeaderFields = {\n  type: SequenceType.INVALID,\n  name: 'Unnamed file',\n  size: 0,\n  width: 'auto',\n  height: 'auto',\n  preserveAspectRatio: 1,\n  inline: 0\n};\n\n\nexport class IIPHandler implements IOscHandler, IResetHandler {\n  private _generation = 0;\n  private _aborted = false;\n  private _hp = new HeaderParser();\n  private _header: IHeaderFields = DEFAULT_HEADER;\n  private _dec: Base64Decoder;\n  private _qoiDec: QoiDecoder;\n  private _isMultipart = false;\n  private _abortMulti = false;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _storage: IIPImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    const maxEncodedBytes = Math.ceil(this._opts.iipSizeLimit * 4 / 3);\n    const initialBytes = Math.min(DecoderConst.INITIAL_DATA, maxEncodedBytes);\n    this._dec = new Base64Decoder(DecoderConst.KEEP_DATA, maxEncodedBytes, initialBytes);\n    this._qoiDec = new QoiDecoder(DecoderConst.KEEP_DATA);\n  }\n\n  public reset(): void {\n    this._generation++;\n    this._hp.reset();\n    this._dec.release();\n    this._qoiDec.release();\n  }\n\n  public start(): void {\n    this._aborted = false;\n    this._hp.reset();\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    if (this._hp.state === HeaderState.END) {\n      if ((this._dec.put(data.subarray(start, end)) as number) !== DecoderConst.OK) {\n        this._dec.release();\n        this._aborted = true;\n      }\n    } else {\n      const dataPos = this._hp.parse(data, start, end);\n      if (dataPos === -1) {\n        this._aborted = true;\n        return;\n      }\n      if (dataPos > 0) {\n        const seqType = this._hp.fields.type;\n        if (seqType === SequenceType.FILE) {\n          if (this._isMultipart) {\n            this._isMultipart = false;\n            this._abortMulti = false;\n            this._dec.release();\n          }\n          this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);\n          if (!this._header.inline) {\n            this._aborted = true;\n            return;\n          }\n          this._dec.init();\n        } else if (this._abortMulti) {\n          this._aborted = true;\n          return;\n        }\n        if ((this._dec.put(data.subarray(dataPos, end)) as number) !== DecoderConst.OK) {\n          this._dec.release();\n          this._aborted = true;\n          if (this._isMultipart) this._abortMulti = true;\n        }\n      }\n    }\n  }\n\n  public end(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted) return true;\n\n    if (this._hp.state !== HeaderState.END) {\n      if (this._hp.end()) return true;\n    }\n    const seqType = this._hp.fields.type;\n\n    if (seqType === SequenceType.FILEPART) return true;\n\n    if (seqType === SequenceType.REPORTCELLSIZE) {\n      // OSC 1337 ; ReportCellSize=[height];[width];[scale] ST\n      let w = CELL_SIZE_DEFAULT.width;\n      let h = CELL_SIZE_DEFAULT.height;\n      if (this._renderer.dimensions) {\n        w = this._renderer.dimensions.css.canvas.width / this._coreTerminal.cols;\n        h = this._renderer.dimensions.css.canvas.height / this._coreTerminal.rows;\n      }\n      const scale = this._coreTerminal._core._coreBrowserService?.dpr ?? 1;\n      const report = `\\x1b]1337;ReportCellSize=${h.toFixed(3)};${w.toFixed(3)};${scale.toFixed(3)}\\x1b\\\\`;\n      this._coreTerminal.input(report, false);\n      return true;\n    }\n\n    if (seqType === SequenceType.MULTIPARTFILE) {\n      this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);\n      this._isMultipart = true;\n      this._abortMulti = false;\n      this._dec.release();\n      this._dec.init();\n      return true;\n    }\n\n    if (seqType === SequenceType.FILEEND) {\n      if (!this._isMultipart) return true;\n      this._isMultipart = false;\n      if (this._abortMulti || this._header.type !== SequenceType.MULTIPARTFILE) return true;\n    }\n\n    // fallthrough for SequenceType.FILE & SequenceType.FILEEND\n\n    let w = 0;\n    let h = 0;\n\n    // early exit condition chain\n    let cond: number | boolean;\n    let metrics = UNSUPPORTED_TYPE;\n    if (cond = success) {\n      if (cond = !this._dec.end()) {\n        metrics = imageType(this._dec.data8);\n        if (cond = metrics.mime !== 'unsupported') {\n          w = metrics.width;\n          h = metrics.height;\n          if (cond = w && h && w * h < this._opts.pixelLimit) {\n            [w, h] = this._resize(w, h).map(Math.floor);\n            cond = w && h && w * h < this._opts.pixelLimit;\n          } else {\n            console.warn(`IIP: image dimension issue ${metrics.width}x${metrics.height}`);\n          }\n        } else {\n          console.warn('IIP: unsupported image type');\n        }\n      } else {\n        console.warn('IIP: error during BASE64 decoding');\n      }\n    }\n    if (!cond) {\n      this._dec.release();\n      return true;\n    }\n\n    let blob: Blob | ImageData;\n    if (metrics.mime === 'image/qoi') {\n      const data = this._qoiDec.decode(this._dec.data8);\n      blob = new ImageData(\n        new Uint8ClampedArray(data.buffer, data.byteOffset, data.byteLength),\n        this._qoiDec.width,\n        this._qoiDec.height\n      );\n      this._qoiDec.release();\n      if (w === this._qoiDec.width && h === this._qoiDec.height) {\n        // use fast-path if we don't need to rescale\n        this._dec.release();\n        const canvas = ImageRenderer.createCanvas(undefined, this._qoiDec.width, this._qoiDec.height);\n        canvas.getContext('2d')?.putImageData(blob, 0, 0);\n        this._storage.addImage(canvas);\n        return true;\n      }\n    } else {\n      blob = new Blob([this._dec.data8], { type: metrics.mime });\n    }\n    this._dec.release();\n    const generation = this._generation;\n    return createImageBitmap(blob, { resizeWidth: w, resizeHeight: h })\n      .then(bm => {\n        if (generation !== this._generation) {\n          bm.close();\n          return true;\n        }\n        this._storage.addImage(bm);\n        return true;\n      })\n      .catch(e => {\n        console.warn(`IIP: decoding error ${metrics.mime} ${metrics.width}x${metrics.height}`, e);\n        return true;\n      });\n  }\n\n  private _resize(w: number, h: number): [number, number] {\n    const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;\n    const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;\n    const width = this._renderer.dimensions?.css.canvas.width || cw * this._coreTerminal.cols;\n    const height = this._renderer.dimensions?.css.canvas.height || ch * this._coreTerminal.rows;\n\n    const rw = this._dim(this._header.width!, width, cw);\n    const rh = this._dim(this._header.height!, height, ch);\n    if (!rw && !rh) {\n      const wf = width / w;         // TODO: should this respect initial cursor offset?\n      const hf = (height - ch) / h; // TODO: fix offset issues from float cell height\n      const f = Math.min(wf, hf);\n      return f < 1 ? [w * f, h * f] : [w, h];\n    }\n    return !rw\n      ? [w * rh / h, rh]\n      : this._header.preserveAspectRatio || !rw || !rh\n        ? [rw, h * rw / w] : [rw, rh];\n  }\n\n  private _dim(s: string, total: number, cdim: number): number {\n    if (s === 'auto') return 0;\n    if (s.endsWith('%')) return parseInt(s.slice(0, -1), 10) * total / 100;\n    if (s.endsWith('px')) return parseInt(s.slice(0, -2), 10);\n    return parseInt(s, 10) * cdim;\n  }\n}\n", "/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n// eslint-disable-next-line\ndeclare const Buffer: any;\n\nexport const enum HeaderState {\n  START = 0,\n  ABORT = 1,\n  KEY = 2,\n  VALUE = 3,\n  END = 4\n}\n\nexport const enum SequenceType {\n  INVALID = 0,\n  FILE = 1,\n  MULTIPARTFILE = 2,\n  FILEPART = 3,\n  FILEEND = 4,\n  REPORTCELLSIZE = 5\n}\n\nexport interface IHeaderFields {\n  [key: string]: number | string | Uint32Array | null | undefined;\n  // sequence type\n  type: SequenceType;\n  // base-64 encoded filename. Defaults to \"Unnamed file\".\n  name: string;\n  // File size in bytes. The file transfer will be canceled if this size is exceeded.\n  size: number;\n  /**\n   * Optional width and height to render:\n   * - N: N character cells.\n   * - Npx: N pixels.\n   * - N%: N percent of the session's width or height.\n   * - auto: The image's inherent size will be used to determine an appropriate dimension.\n   */\n  width?: string;\n  height?: string;\n  // Optional, defaults to 1 respecting aspect ratio (width takes precedence).\n  preserveAspectRatio?: number;\n  // Optional, defaults to 0. If set to 1, the file will be displayed inline, else downloaded\n  // (download not supported).\n  inline?: number;\n}\n\n// field value decoders\n\n// ASCII bytes to string\nfunction toStr(data: Uint32Array): string {\n  let s = '';\n  for (let i = 0; i < data.length; ++i) {\n    s += String.fromCharCode(data[i]);\n  }\n  return s;\n}\n\n// digits to integer\nfunction toInt(data: Uint32Array): number {\n  let v = 0;\n  for (let i = 0; i < data.length; ++i) {\n    if (data[i] < 48 || data[i] > 57) {\n      throw new Error('illegal char');\n    }\n    v = v * 10 + data[i] - 48;\n  }\n  return v;\n}\n\n// check for correct size entry\nfunction toSize(data: Uint32Array): string {\n  const v = toStr(data);\n  if (!v.match(/^((auto)|(\\d+?((px)|(%)){0,1}))$/)) {\n    throw new Error('illegal size');\n  }\n  return v;\n}\n\n// name is base64 encoded utf-8\nfunction toName(data: Uint32Array): string {\n  if (typeof Buffer !== 'undefined') {\n    return Buffer.from(toStr(data), 'base64').toString();\n  }\n  const bs = atob(toStr(data));\n  const b = new Uint8Array(bs.length);\n  for (let i = 0; i < b.length; ++i) {\n    b[i] = bs.charCodeAt(i);\n  }\n  return new TextDecoder().decode(b);\n}\n\nconst DECODERS: {[key: string]: (v: Uint32Array) => number | string} = {\n  inline: toInt,\n  size: toInt,\n  name: toName,\n  width: toSize,\n  height: toSize,\n  preserveAspectRatio: toInt\n};\n\n\n// sequence type markers\n// File\nconst FILE_MARKER = [70, 105, 108, 101];\n// MultipartFile\nconst MULTIPARTFILE_MARKER = [77, 117, 108, 116, 105, 112, 97, 114, 116, 70, 105, 108, 101];\n// FilePart\nconst FILEPART_MARKER = [70, 105, 108, 101, 80, 97, 114, 116];\n// FileEnd\nconst FILEEND_MARKER = [70, 105, 108, 101, 69, 110, 100];\n// ReportCellSize\nconst REPORTCELLSIZE_MARKER = [82, 101, 112, 111, 114, 116, 67, 101, 108, 108, 83, 105, 122, 101];\n\n// max allowed chars for sequence header\nconst MAX_FIELDCHARS = 1024;\n\n\nexport class HeaderParser {\n  public state: HeaderState = HeaderState.START;\n  private _buffer = new Uint32Array(MAX_FIELDCHARS);\n  private _position = 0;\n  private _key = '';\n  public fields: {[key: string]: number | string | Uint32Array | null | undefined} = {};\n\n  public reset(): void {\n    this._buffer.fill(0);\n    this.state = HeaderState.START;\n    this._position = 0;\n    this.fields = {};\n    this._key = '';\n  }\n\n  public end(): number {\n    if (this.state === HeaderState.START) {\n      if (this._position === FILEEND_MARKER.length) {\n        for (let k = 0; k < FILEEND_MARKER.length; ++k) {\n          if (this._buffer[k] !== FILEEND_MARKER[k]) return this._a();\n        }\n        this.fields['type'] = SequenceType.FILEEND;\n        this.state = HeaderState.END;\n        return 0;\n      }\n      if (this._position === REPORTCELLSIZE_MARKER.length) {\n        for (let k = 0; k < REPORTCELLSIZE_MARKER.length; ++k) {\n          if (this._buffer[k] !== REPORTCELLSIZE_MARKER[k]) return this._a();\n        }\n        this.fields['type'] = SequenceType.REPORTCELLSIZE;\n        this.state = HeaderState.END;\n        return 0;\n      }\n      return this._a();\n    }\n    if (this.state === HeaderState.END) return 0;\n    if (this.state === HeaderState.VALUE\n      && this.fields.type === SequenceType.MULTIPARTFILE\n    ) {\n      if (!this._storeValue(this._position)) return this._a();\n      this.state = HeaderState.END;\n      return 0;\n    }\n    return this._a();\n  }\n\n  public parse(data: Uint32Array, start: number, end: number): number {\n    let state = this.state;\n    let pos = this._position;\n    const buffer = this._buffer;\n    if (state === HeaderState.ABORT || state === HeaderState.END) return -1;\n    if (state === HeaderState.START && pos > 14) return -1;\n    for (let i = start; i < end; ++i) {\n      const c = data[i];\n      switch (c) {\n        case 59: // ;\n          if (!this._storeValue(pos)) return this._a();\n          state = HeaderState.KEY;\n          pos = 0;\n          break;\n        case 61: // =\n          if (state === HeaderState.START) {\n            if (buffer[0] === 70) {\n              // 'File' or 'FilePart'\n              let k = 0;\n              for (; k < FILE_MARKER.length; ++k) {\n                if (buffer[k] !== FILE_MARKER[k]) return this._a();\n              }\n              this.fields['type'] = SequenceType.FILE;\n              if (pos === FILEPART_MARKER.length) {\n                for (; k < FILEPART_MARKER.length; ++k) {\n                  if (buffer[k] !== FILEPART_MARKER[k]) return this._a();\n                }\n                this.fields['type'] = SequenceType.FILEPART;\n                this.state = HeaderState.END;\n                return i + 1;\n              }\n            } else if (buffer[0] === 77) {\n              // 'MultipartFile'\n              for (let k = 0; k < MULTIPARTFILE_MARKER.length; ++k) {\n                if (buffer[k] !== MULTIPARTFILE_MARKER[k]) return this._a();\n              }\n              this.fields['type'] = SequenceType.MULTIPARTFILE;\n            } else {\n              return this._a();\n            }\n            state = HeaderState.KEY;\n            pos = 0;\n          } else if (state === HeaderState.KEY) {\n            if (!this._storeKey(pos)) return this._a();\n            state = HeaderState.VALUE;\n            pos = 0;\n          } else if (state === HeaderState.VALUE) {\n            if (pos >= MAX_FIELDCHARS) return this._a();\n            buffer[pos++] = c;\n          }\n          break;\n        case 58: // :\n          if (state === HeaderState.VALUE) {\n            if (!this._storeValue(pos)) return this._a();\n          }\n          this.state = HeaderState.END;\n          return i + 1;\n        default:\n          if (pos >= MAX_FIELDCHARS) return this._a();\n          buffer[pos++] = c;\n      }\n    }\n    this.state = state;\n    this._position = pos;\n    return -2;\n  }\n\n  private _a(): number {\n    this.fields.type = SequenceType.INVALID;\n    this.state = HeaderState.ABORT;\n    return -1;\n  }\n\n  private _storeKey(pos: number): boolean {\n    const k = toStr(this._buffer.subarray(0, pos));\n    if (k) {\n      this._key = k;\n      this.fields[k] = null;\n      return true;\n    }\n    return false;\n  }\n\n  private _storeValue(pos: number): boolean {\n    if (this._key) {\n      try {\n        const v = this._buffer.slice(0, pos);\n        this.fields[this._key] = DECODERS[this._key] ? DECODERS[this._key](v) : v;\n      } catch {\n        return false;\n      }\n      return true;\n    }\n    return false;\n  }\n}\n", "/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n\nexport type ImageType = 'image/png' | 'image/jpeg' | 'image/gif' | 'image/qoi' | 'image/webp' | 'image/avif' | 'unsupported' | '';\n\nexport interface IMetrics {\n  mime: ImageType;\n  width: number;\n  height: number;\n}\n\nexport const UNSUPPORTED_TYPE: IMetrics = {\n  mime: 'unsupported',\n  width: 0,\n  height: 0\n};\n\nexport function imageType(d: Uint8Array): IMetrics {\n  if (d.length < 32) {\n    return UNSUPPORTED_TYPE;\n  }\n  const d32 = new Uint32Array(d.buffer, d.byteOffset, 8);\n  // PNG: 89 50 4E 47 0D 0A 1A 0A (8 first bytes == magic number for PNG)\n  // + first chunk must be IHDR\n  if (d32[0] === 0x474E5089 && d32[1] === 0x0A1A0A0D && d32[3] === 0x52444849) {\n    return {\n      mime: 'image/png',\n      width:  d[16] << 24 | d[17] << 16 | d[18] << 8 | d[19],\n      height: d[20] << 24 | d[21] << 16 | d[22] << 8 | d[23]\n    };\n  }\n  // JPEG: FF D8 FF\n  if (d[0] === 0xFF && d[1] === 0xD8 && d[2] === 0xFF) {\n    const [width, height] = jpgSize(d);\n    return { mime: 'image/jpeg', width, height };\n  }\n  // GIF: GIF87a or GIF89a\n  if (d32[0] === 0x38464947 && (d[4] === 0x37 || d[4] === 0x39) && d[5] === 0x61) {\n    return {\n      mime: 'image/gif',\n      width:  d[7] << 8 | d[6],\n      height: d[9] << 8 | d[8]\n    };\n  }\n  // QOI: qoif\n  if (d32[0] === 0x66696F71) {\n    return {\n      mime: 'image/qoi',\n      width:  d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7],\n      height: d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11]\n    };\n  }\n  // WEBP: RIFF | xxxx | WEBP | VP8x\n  if (d32[0] === 0x46464952 && d32[2] === 0x50424557 && (d32[3] & 0xFFFFFF) === 0x385056) {\n    switch (d[15]) {\n      case 0x58:  // Extended WebP VP8X --> \"X\"\n        return {\n          mime: 'image/webp',\n          width:  (d[24] | d[25] << 8 | d[26] << 16) + 1,\n          height: (d[27] | d[28] << 8 | d[29] << 16) + 1\n        };\n      case 0x4C:  // Lossless WebP VP8L --> \"L\"\n        if (d[20] !== 0x2f) return UNSUPPORTED_TYPE;\n        const dim = d[21] | d[22] << 8 | d[23] << 16 | d[24] << 24;\n        return {\n          mime: 'image/webp',\n          width:  (dim        & 0x3FFF) + 1,\n          height: (dim >>> 14 & 0x3FFF) + 1\n        };\n      case 0x20:  // Lossy WebP VP8  --> \" \"\n        if (d[23] !== 0x9d || d[24] !== 0x01 || d[25] !== 0x2a) return UNSUPPORTED_TYPE;\n        return {\n          mime: 'image/webp',\n          width:  (d[26] | d[27] << 8) & 0x3FFF,\n          height: (d[28] | d[29] << 8) & 0x3FFF\n        };\n    }\n    return UNSUPPORTED_TYPE;\n  }\n  // AVIF: Box size | ftyp | avif/avis\n  if (d32[1] === 0x70797466 && (d32[2] === 0x66697661 || d32[2] === 0x73697661)) {\n    let pos = -1;\n    // search for ispe box within first 1024 bytes\n    const limit = Math.min(d.length - 16, 1024);\n    for (let i = 8; i < limit; i++) {\n      // scan for ispe\n      if (d[i] === 0x69 && d[i + 1] === 0x73 && d[i + 2] === 0x70 && d[i + 3] === 0x65) {\n        pos = i;\n        break;\n      }\n    }\n    if (pos !== -1) {\n      // dimensions are in BE at +8 (width) at +12 (height)\n      const width =\n        d[pos +  8] << 24 |\n        d[pos +  9] << 16 |\n        d[pos + 10] <<  8 |\n        d[pos + 11];\n      const height =\n        d[pos + 12] << 24 |\n        d[pos + 13] << 16 |\n        d[pos + 14] <<  8 |\n        d[pos + 15];\n      if (width > 0 && height > 0) {\n        return { mime: 'image/avif', width, height };\n      }\n    }\n    return UNSUPPORTED_TYPE;\n  }\n  return UNSUPPORTED_TYPE;\n}\n\n\nfunction jpgSize(d: Uint8Array): [number, number] {\n  const len = d.length;\n  let i = 4;\n  let blockLength = d[i] << 8 | d[i + 1];\n  while (true) {\n    i += blockLength;\n    if (i >= len) {\n      // exhausted without size info\n      return [0, 0];\n    }\n    if (d[i] !== 0xFF) {\n      return [0, 0];\n    }\n    if (d[i + 1] === 0xC0 || d[i + 1] === 0xC2) {\n      if (i + 8 < len) {\n        return [\n          d[i + 7] << 8 | d[i + 8],\n          d[i + 5] << 8 | d[i + 6]\n        ];\n      }\n      return [0, 0];\n    }\n    i += 2;\n    blockLength = d[i] << 8 | d[i + 1];\n  }\n}\n", "/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { IApcHandler, IImageAddonOptions, IResetHandler, ITerminalExt, ImageLayer } from '../Types';\nimport { ImageRenderer } from '../ImageRenderer';\nimport { CELL_SIZE_DEFAULT } from '../ImageStorage';\nimport { imageType } from '../IIPMetrics';\nimport { KittyImageStorage } from './KittyImageStorage';\nimport Base64Decoder, { type DecodeStatus } from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\nimport {\n  KittyAction,\n  KittyFormat,\n  KittyCompression,\n  IKittyCommand,\n  IPendingTransmission,\n  IKittyImageData,\n  KittyPixelConstants,\n  parseKittyCommand\n} from './KittyGraphicsTypes';\n\nconst enum Constants {\n  // Memory limit for base64 decoder (4MB, same as IIPHandler)\n  DECODER_KEEP_DATA = 4194304,\n  DECODER_INITIAL_DATA = 4194304, // 4MB\n  // Local mirror of const enum (esbuild can't inline const enums from external packages)\n  DECODER_OK = 0,\n  // Maximum control data size\n  MAX_CONTROL_DATA_SIZE = 512,\n  // Semicolon codepoint\n  SEMICOLON = 0x3B\n}\n\nconst DECODER_OK = Constants.DECODER_OK as unknown as DecodeStatus.OK;\n\n// Kitty graphics protocol handler with streaming base64 decoding.\nexport class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDisposable {\n  private _aborted = false;\n  private _generation = 0;\n  private _decodeError = false;\n\n  private _activeDecoder: Base64Decoder | null = null;\n  private readonly _maxEncodedBytes: number;\n  private readonly _initialEncodedBytes: number;\n\n  // Streaming related states\n\n  // True while receiving control data (before semicolon).\n  private _inControlData = true;\n\n  // Buffer for control data.\n  private _controlData = new Uint32Array(Constants.MAX_CONTROL_DATA_SIZE);\n  private _controlLength = 0;\n\n  // Pre-calculated encoded size limit\n  private _encodedSizeLimit = 0;\n  private _totalEncodedSize = 0;\n\n  // Parsed command. These are the control data before semicolon.\n  private _parsedCommand: IKittyCommand | null = null;\n\n  // Storage related states\n\n  private _pendingTransmissions: Map<number, IPendingTransmission> = new Map();\n  // Tracks the pending key of the most recently started chunked upload.\n  // Per spec, subsequent chunks only need m= (and optionally q=), without i=.\n  // When a chunk arrives with no i=, this key is used to find the pending upload.\n  private _lastPendingKey: number | undefined;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _kittyStorage: KittyImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    // Convert decoded size limit -> max encoded bytes.\n    this._maxEncodedBytes = Math.ceil(this._opts.kittySizeLimit * 4 / 3);\n    // ensure we preallocate more than configured limit while using 4mb initial size.\n    this._initialEncodedBytes = Math.min(Constants.DECODER_INITIAL_DATA, this._maxEncodedBytes);\n  }\n\n  public reset(): void {\n    this._generation++;\n    this._cleanupAllPending();\n    if (this._activeDecoder) {\n      this._activeDecoder.release();\n      this._activeDecoder = null;\n    }\n    this._kittyStorage.reset();\n  }\n\n  public dispose(): void {\n    this.reset();\n  }\n\n  private _removePendingEntry(key: number): void {\n    this._pendingTransmissions.delete(key);\n    if (this._lastPendingKey === key) {\n      this._lastPendingKey = undefined;\n    }\n  }\n\n  private _cleanupAllPending(): void {\n    for (const pending of this._pendingTransmissions.values()) {\n      pending.decoder.release();\n    }\n    this._pendingTransmissions.clear();\n    this._lastPendingKey = undefined;\n  }\n\n  public start(): void {\n    this._aborted = false;\n    this._decodeError = false;\n    this._inControlData = true;\n    this._controlLength = 0;\n    this._parsedCommand = null;\n    // Pre-calculate encoded limit once: base64 is 4 bytes encoded \u2192 3 bytes decoded\n    this._encodedSizeLimit = this._maxEncodedBytes;\n    this._totalEncodedSize = 0;\n    this._activeDecoder = null;\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    if (!this._inControlData) {\n      this._streamPayload(data, start, end);\n    } else {\n      // Scan for semicolon\n      let controlEnd = end;\n      for (let i = start; i < end; i++) {\n        if (data[i] === Constants.SEMICOLON) {\n          this._inControlData = false;\n          controlEnd = i;\n          break;\n        }\n      }\n\n      // Copy control data\n      const copyLength = controlEnd - start;\n      if (this._controlLength + copyLength > Constants.MAX_CONTROL_DATA_SIZE) {\n        this._aborted = true;\n        return;\n      }\n      this._controlData.set(data.subarray(start, controlEnd), this._controlLength);\n      this._controlLength += copyLength;\n\n      if (!this._inControlData) {\n        // Found semicolon - parse control data early for validation\n        this._parsedCommand = parseKittyCommand(this._parseControlDataString());\n\n        // Early validation: i+I conflict\n        if (this._parsedCommand.id !== undefined && this._parsedCommand.imageNumber !== undefined) {\n          this._sendResponse(this._parsedCommand.id, 'EINVAL:cannot specify both i and I keys', this._parsedCommand.quiet ?? 0);\n          this._aborted = true;\n          return;\n        }\n\n        // Delete action doesn't need payload - skip streaming\n        if (this._parsedCommand.action === KittyAction.DELETE) {\n          return;\n        }\n\n        // Stream remaining as payload\n        const payloadStart = controlEnd + 1;\n        if (payloadStart < end) {\n          this._streamPayload(data, payloadStart, end);\n        }\n      }\n    }\n  }\n\n  // Stream payload bytes into the base64 decoder.\n  private _streamPayload(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    // Check size limit (compare encoded bytes against pre-calculated limit)\n    // Include cumulative size from pending transmission for multi-chunk images.\n    // Per spec, subsequent chunks may omit i=, so fall back to _lastPendingKey.\n    const pendingKey = this._parsedCommand?.id ?? this._lastPendingKey ?? 0;\n    const pending = this._pendingTransmissions.get(pendingKey);\n    const previousEncodedSize = pending?.totalEncodedSize ?? 0;\n    this._totalEncodedSize += end - start;\n    const cumulativeEncodedSize = previousEncodedSize + this._totalEncodedSize;\n    if (cumulativeEncodedSize > this._encodedSizeLimit) {\n      const decoderToRelease = this._activeDecoder ?? pending?.decoder;\n      if (decoderToRelease) {\n        decoderToRelease.release();\n      }\n      this._activeDecoder = null;\n      if (pending) {\n        this._removePendingEntry(pendingKey);\n      }\n      this._aborted = true;\n      return;\n    }\n\n    if (this._decodeError) return;\n\n    if (pending?.decoder && !this._activeDecoder) {\n      this._activeDecoder = pending.decoder;\n    }\n    if (!this._activeDecoder) {\n      // Budget WASM capacity, including one page of decoder state and rounding.\n      const decoderCapacity = this._maxEncodedBytes + 131072;\n      if (decoderCapacity > this._opts.storageLimit * 1000000) {\n        this._aborted = true;\n        if (this._parsedCommand?.id !== undefined) {\n          this._sendResponse(this._parsedCommand.id, 'ENOMEM:pending image budget exceeded', this._parsedCommand.quiet ?? 0);\n        }\n        return;\n      }\n      const maxPending = Math.max(1, Math.floor(this._opts.storageLimit * 1000000 / decoderCapacity));\n      while (this._pendingTransmissions.size >= maxPending) {\n        const oldest = this._pendingTransmissions.entries().next().value;\n        if (!oldest) break;\n        oldest[1].decoder.release();\n        this._removePendingEntry(oldest[0]);\n        if (oldest[1].cmd.id !== undefined) {\n          this._sendResponse(oldest[1].cmd.id, 'ENOMEM:pending image budget exceeded', oldest[1].cmd.quiet ?? 0);\n        }\n      }\n      this._activeDecoder = new Base64Decoder(Constants.DECODER_KEEP_DATA, this._maxEncodedBytes, this._initialEncodedBytes);\n      this._activeDecoder.init();\n    }\n\n    if (this._activeDecoder.put(data.subarray(start, end)) !== DECODER_OK) {\n      this._activeDecoder.release();\n      this._activeDecoder = null;\n      this._decodeError = true;\n      if (pending) {\n        this._removePendingEntry(pendingKey);\n      }\n    }\n  }\n\n  public end(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted || !success) {\n      if (this._activeDecoder) {\n        this._activeDecoder.release();\n        this._activeDecoder = null;\n      }\n      return true;\n    }\n\n    // No semicolon = no payload (delete, capability query)\n    if (this._inControlData) {\n      return this._handleNoPayloadCommand();\n    }\n\n    // Use command parsed early in put() - i+I already validated there\n    const cmd = this._parsedCommand!;\n\n    // Delete action was handled by skipping payload - just execute\n    if (cmd.action === KittyAction.DELETE) {\n      return this._handleDelete(cmd);\n    }\n\n    // Per spec, subsequent chunks may omit i=, so fall back to _lastPendingKey.\n    const pendingKey = cmd.id ?? this._lastPendingKey ?? 0;\n    const isMoreComing = cmd.more === 1;\n    const pending = this._pendingTransmissions.get(pendingKey);\n\n    if (isMoreComing) {\n      if (this._activeDecoder) {\n        if (pending) {\n          pending.totalEncodedSize += this._totalEncodedSize;\n          pending.decodeError = pending.decodeError || this._decodeError;\n        } else {\n          this._pendingTransmissions.set(pendingKey, {\n            cmd: { ...cmd },\n            decoder: this._activeDecoder,\n            totalEncodedSize: this._totalEncodedSize,\n            decodeError: this._decodeError\n          });\n        }\n        this._lastPendingKey = pendingKey;\n        this._activeDecoder = null;\n      }\n      return true;\n    }\n\n    // Final chunk received \u2014 clear the last pending key\n    if (pending) {\n      this._lastPendingKey = undefined;\n    }\n\n    let decodeError = this._decodeError;\n    let finalCmd = cmd;\n    let decoder = this._activeDecoder;\n\n    if (pending) {\n      finalCmd = pending.cmd;\n      decoder = pending.decoder;\n      decodeError = decodeError || pending.decodeError;\n      this._pendingTransmissions.delete(pendingKey);\n    }\n\n    let imageBytes = new Uint8Array(0);\n    if (decoder) {\n      if (decoder.end() !== DECODER_OK) {\n        decodeError = true;\n      }\n      imageBytes = decoder.data8;\n    }\n    this._activeDecoder = null;\n\n    // Handle command first \u2014 handlers create Blob/ImageData from imageBytes,\n    // which copies the data. Only then is it safe to release the decoder's\n    // wasm memory that imageBytes points into.\n    const result = this._handleCommandWithBytesAndCmd(finalCmd, imageBytes, decodeError);\n    if (decoder) {\n      decoder.release();\n    }\n    return result;\n  }\n\n  // Command handling\n\n  private _parseControlDataString(): string {\n    let str = '';\n    for (let i = 0; i < this._controlLength; i++) {\n      str += String.fromCodePoint(this._controlData[i]);\n    }\n    return str;\n  }\n\n  private _handleNoPayloadCommand(): boolean | Promise<boolean> {\n    const cmd = parseKittyCommand(this._parseControlDataString());\n\n    // Per spec: specifying both i and I is an error\n    if (cmd.id !== undefined && cmd.imageNumber !== undefined) {\n      this._sendResponse(cmd.id, 'EINVAL:cannot specify both i and I keys', cmd.quiet ?? 0);\n      return true;\n    }\n\n    const action = cmd.action ?? 't';\n\n    switch (action) {\n      case KittyAction.DELETE:\n        return this._handleDelete(cmd);\n      case KittyAction.QUERY:\n        this._sendResponse(cmd.id ?? 0, 'OK', cmd.quiet ?? 0);\n        return true;\n      case KittyAction.PLACEMENT:\n        return this._handlePlacement(cmd);\n      default:\n        // TODO: Implement remaining actions when needed:\n        // - a=f (frame): animation frame operations\n        // - a=a (animation): animation control\n        // - a=c (compose): compose images\n        if (cmd.id !== undefined) {\n          this._sendResponse(cmd.id, 'EINVAL:unsupported action', cmd.quiet ?? 0);\n        }\n        return true;\n    }\n  }\n\n  private _handleCommandWithBytesAndCmd(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean | Promise<boolean> {\n    const action = cmd.action ?? 't';\n\n    switch (action) {\n      case KittyAction.TRANSMIT: {\n        const result = this._handleTransmit(cmd, bytes, decodeError);\n        // Only send response when _handleTransmit didn't already respond\n        // (it handles unsupported transmission medium responses internally)\n        if ((cmd.transmission ?? 'd') === 'd' && cmd.id !== undefined) {\n          if (decodeError) {\n            this._sendResponse(cmd.id, 'EINVAL:invalid base64 data', cmd.quiet ?? 0);\n          } else if (bytes.length > 0) {\n            this._sendResponse(cmd.id, 'OK', cmd.quiet ?? 0);\n          }\n        }\n        return result;\n      }\n      case KittyAction.TRANSMIT_DISPLAY:\n        return this._handleTransmitDisplay(cmd, bytes, decodeError);\n      case KittyAction.QUERY:\n        return this._handleQuery(cmd, bytes, decodeError);\n      case KittyAction.PLACEMENT:\n        // a=p ignores any payload \u2014 image data was already transmitted\n        return this._handlePlacement(cmd);\n      default:\n        // TODO: Implement remaining actions when needed:\n        // - a=f (frame): animation frame operations\n        // - a=a (animation): animation control\n        // - a=c (compose): compose images\n        if (cmd.id !== undefined) {\n          this._sendResponse(cmd.id, 'EINVAL:unsupported action', cmd.quiet ?? 0);\n        }\n        return true;\n    }\n  }\n\n  private _handlePlacement(cmd: IKittyCommand): boolean | Promise<boolean> {\n    if (cmd.id === undefined) {\n      return true;\n    }\n    const id = cmd.id;\n    const image = this._kittyStorage.getImage(id);\n    if (!image) {\n      this._sendResponse(id, 'ENOENT:image not found', cmd.quiet ?? 0, cmd.placementId);\n      return true;\n    }\n    const result = this._displayImage(image, cmd);\n    return result.then(success => {\n      this._sendResponse(id, success ? 'OK' : 'EINVAL:image rendering failed', cmd.quiet ?? 0, cmd.placementId);\n      return true;\n    });\n  }\n\n  private _handleTransmit(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean {\n    // TODO: Support file-based transmission modes (t=f, t=t, t=s)\n    // Currently only supports direct transmission (t=d, the default).\n    // - t=f (file): Payload is base64-encoded file path. Terminal reads image from that path.\n    // - t=t (temp file): Payload is base64-encoded path in temp directory. Terminal reads, deletes.\n    // - t=s: Payload is base64-encoded POSIX shm name. Terminal reads from shared memory.\n    // These modes require filesystem/IPC access not available in browsers. For Node.js/Electron:\n    // 1. Check cmd.transmission (t key) before treating bytes as image data\n    // 2. For t=f/t/s: decode bytes as UTF-8 string (the path/name), then read file contents\n    // 3. For t=d: treat bytes as image data (current behavior)\n    // When implementing, also update _handleQuery to accept these transmission mediums.\n    const transmission = cmd.transmission ?? 'd';\n    if (transmission !== 'd') {\n      if (cmd.id !== undefined) {\n        this._sendResponse(cmd.id, 'EINVAL:unsupported transmission medium', cmd.quiet ?? 0);\n      }\n      return true;\n    }\n\n    if (decodeError || bytes.length === 0) return true;\n\n    this._kittyStorage.storeImage(cmd.id, {\n      data: new Blob([bytes as BlobPart]),\n      width: cmd.width ?? 0,\n      height: cmd.height ?? 0,\n      format: (cmd.format ?? KittyFormat.RGBA) as 24 | 32 | 100,\n      compression: cmd.compression ?? ''\n    });\n    return true;\n  }\n\n  private _handleTransmitDisplay(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean | Promise<boolean> {\n    if (decodeError) {\n      if (cmd.id !== undefined) {\n        this._sendResponse(cmd.id, 'EINVAL:invalid base64 data', cmd.quiet ?? 0);\n      }\n      return true;\n    }\n\n    this._handleTransmit(cmd, bytes, decodeError);\n\n    const id = cmd.id ?? this._kittyStorage.lastImageId;\n    const image = this._kittyStorage.getImage(id);\n    if (image) {\n      const result = this._displayImage(image, cmd);\n      if (cmd.id !== undefined) {\n        return result.then(success => {\n          this._sendResponse(id, success ? 'OK' : 'EINVAL:image rendering failed', cmd.quiet ?? 0);\n          return true;\n        });\n      }\n      return result.then(() => true);\n    }\n    return true;\n  }\n\n  private _handleQuery(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean {\n    const id = cmd.id ?? 0;\n    const quiet = cmd.quiet ?? 0;\n\n    // Per spec: reject unsupported transmission mediums (only t=d is supported atm)\n    // TODO: When filesystem support is added (Node.js/Electron), update this to accept\n    // t=f (file), t=t (temp file), and t=s (shared memory) and respond OK for queries.\n    const transmission = cmd.transmission ?? 'd';\n    if (transmission !== 'd') {\n      this._sendResponse(id, 'EINVAL:unsupported transmission medium', quiet);\n      return true;\n    }\n\n    // Check decode error first (invalid base64)\n    if (decodeError) {\n      this._sendResponse(id, 'EINVAL:invalid base64 data', quiet);\n      return true;\n    }\n\n    // Capability query (no payload) - just respond OK\n    if (bytes.length === 0) {\n      this._sendResponse(id, 'OK', quiet);\n      return true;\n    }\n\n    const format = cmd.format ?? KittyFormat.RGBA;\n\n    if (format === KittyFormat.PNG) {\n      this._sendResponse(id, 'OK', quiet);\n    } else {\n      const width = cmd.width ?? 0;\n      const height = cmd.height ?? 0;\n\n      if (!width || !height) {\n        this._sendResponse(id, 'EINVAL:width and height required for raw pixel data', quiet);\n        return true;\n      }\n\n      const bytesPerPixel = format === KittyFormat.RGBA ? KittyPixelConstants.BYTES_PER_PIXEL_RGBA : KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n      const expectedBytes = width * height * bytesPerPixel;\n\n      if (bytes.length < expectedBytes) {\n        this._sendResponse(id, `EINVAL:insufficient pixel data`, quiet);\n        return true;\n      }\n\n      this._sendResponse(id, 'OK', quiet);\n    }\n    return true;\n  }\n\n  private _handleDelete(cmd: IKittyCommand): boolean {\n    // Per spec: default delete selector is 'a' (delete all visible placements)\n    const selector = cmd.deleteSelector ?? 'a';\n\n    // TODO: Distinguish lowercase (delete placements only) from uppercase\n    // (delete placements + free stored image data). Currently both variants\n    // free everything since we don't separate stored data from placements.\n    switch (selector) {\n      case 'a':\n      case 'A':\n        this._cleanupAllPending();\n        this._kittyStorage.deleteAll();\n        break;\n      case 'i':\n      case 'I':\n        // TODO: When placement id tracking is implemented (see TODO in\n        // KittyImageStorage), d=i with p=<pid> should delete only that\n        // specific placement, while d=i without p should delete all\n        // placements for the image.\n        if (cmd.id !== undefined) {\n          const pending = this._pendingTransmissions.get(cmd.id);\n          if (pending) {\n            pending.decoder.release();\n          }\n          this._removePendingEntry(cmd.id);\n          this._kittyStorage.deleteById(cmd.id);\n        }\n        break;\n      default:\n        // Unsupported selectors (c, n, p, q, r, x, y, z, f) \u2014 ignore for now\n        break;\n    }\n    return true;\n  }\n\n  private _sendResponse(id: number, message: string, quiet: number, placementId?: number): void {\n    const isOk = message === 'OK';\n    if (isOk && quiet >= 1) return;\n    if (!isOk && quiet >= 2) return;\n\n    const pPart = placementId ? `,p=${placementId}` : '';\n    const response = `\\x1b_Gi=${id}${pPart};${message}\\x1b\\\\`;\n    this._coreTerminal._core.coreService.triggerDataEvent(response);\n  }\n\n  // Image display\n\n  private _displayImage(image: IKittyImageData, cmd: IKittyCommand): Promise<boolean> {\n    return this._decodeAndDisplay(image, cmd)\n      .then(() => true)\n      .catch(() => false);\n  }\n\n  private async _decodeAndDisplay(image: IKittyImageData, cmd: IKittyCommand): Promise<void> {\n    const generation = this._generation;\n    let bitmap: ImageBitmap | undefined = await this._createBitmap(image);\n\n    try {\n      if (generation !== this._generation) throw new Error('image decode canceled');\n      const cropX = Math.max(0, cmd.x ?? 0);\n      const cropY = Math.max(0, cmd.y ?? 0);\n      const cropW = cmd.sourceWidth || (bitmap.width - cropX);\n      const cropH = cmd.sourceHeight || (bitmap.height - cropY);\n\n      const maxCropW = Math.max(0, bitmap.width - cropX);\n      const maxCropH = Math.max(0, bitmap.height - cropY);\n      const finalCropW = Math.max(0, Math.min(cropW, maxCropW));\n      const finalCropH = Math.max(0, Math.min(cropH, maxCropH));\n\n      if (finalCropW === 0 || finalCropH === 0) {\n        throw new Error('invalid source rectangle');\n      }\n\n      if (cropX !== 0 || cropY !== 0 || finalCropW !== bitmap.width || finalCropH !== bitmap.height) {\n        const cropped = await createImageBitmap(bitmap, cropX, cropY, finalCropW, finalCropH);\n        bitmap.close();\n        bitmap = cropped;\n      }\n\n      const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;\n      const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;\n\n      // Per spec: c/r default to image's natural cell dimensions.\n      // If only one of c/r is specified, compute the other from image aspect ratio.\n      let imgCols: number;\n      let imgRows: number;\n      if (cmd.columns !== undefined && cmd.rows !== undefined) {\n        imgCols = cmd.columns;\n        imgRows = cmd.rows;\n      } else if (cmd.columns !== undefined) {\n        imgCols = cmd.columns;\n        imgRows = Math.max(1, Math.ceil((bitmap.height / bitmap.width) * (imgCols * cw) / ch));\n      } else if (cmd.rows !== undefined) {\n        imgRows = cmd.rows;\n        imgCols = Math.max(1, Math.ceil((bitmap.width / bitmap.height) * (imgRows * ch) / cw));\n      } else {\n        imgCols = Math.ceil(bitmap.width / cw);\n        imgRows = Math.ceil(bitmap.height / ch);\n      }\n\n      let w = bitmap.width;\n      let h = bitmap.height;\n\n      // Scale bitmap to fit placement rectangle when c/r are specified\n      if (cmd.columns !== undefined || cmd.rows !== undefined) {\n        w = Math.round(imgCols * cw);\n        h = Math.round(imgRows * ch);\n      }\n\n      if (w * h > this._opts.pixelLimit) {\n        throw new Error('image exceeds pixel limit');\n      }\n\n      // Save cursor position before addImage modifies it\n      const buffer = this._coreTerminal._core.buffer;\n      const savedX = buffer.x;\n      const savedY = buffer.y;\n      const savedYbase = buffer.ybase;\n\n      // Determine layer based on z-index: negative = behind text, 0+ = on top.\n      // When z<0 we always use the bottom layer even without allowTransparency \u2014\n      // the image will simply be hidden behind the opaque text background, which\n      // is the correct behavior (client asked for \"behind text\").\n      const wantsBottom = cmd.zIndex !== undefined && cmd.zIndex < 0;\n      const layer: ImageLayer = wantsBottom ? 'bottom' : 'top';\n\n      if (w !== bitmap.width || h !== bitmap.height) {\n        const scaled = await createImageBitmap(bitmap, { resizeWidth: w, resizeHeight: h });\n        bitmap.close();\n        bitmap = scaled;\n      }\n\n      // Per spec: X/Y are pixel offsets within the first cell, so clamp to cell dimensions\n      const xOffset = Math.min(Math.max(0, cmd.xOffset ?? 0), cw - 1);\n      const yOffset = Math.min(Math.max(0, cmd.yOffset ?? 0), ch - 1);\n      if (xOffset !== 0 || yOffset !== 0) {\n        // Per spec: X/Y is not added to c/r area. When c/r are explicit, the\n        // total placement area remains c*cw \u00D7 r*ch pixels and the offset image\n        // is clipped to fit. When c/r are unset, the padded canvas determines\n        // the natural cell dimensions.\n        const canvasW = (cmd.columns !== undefined) ? Math.round(imgCols * cw) : bitmap.width + xOffset;\n        const canvasH = (cmd.rows !== undefined) ? Math.round(imgRows * ch) : bitmap.height + yOffset;\n        const offsetCanvas = ImageRenderer.createCanvas(window.document, canvasW, canvasH);\n        const offsetCtx = offsetCanvas.getContext('2d');\n        if (!offsetCtx) {\n          throw new Error('Failed to create offset canvas context');\n        }\n        offsetCtx.drawImage(bitmap, xOffset, yOffset);\n\n        const offsetBitmap = await createImageBitmap(offsetCanvas);\n        offsetCanvas.width = offsetCanvas.height = 0;\n        bitmap.close();\n        bitmap = offsetBitmap;\n        w = bitmap.width;\n        h = bitmap.height;\n        if (w * h > this._opts.pixelLimit) {\n          throw new Error('image exceeds pixel limit');\n        }\n        if (cmd.columns === undefined) {\n          imgCols = Math.ceil(bitmap.width / cw);\n        }\n        if (cmd.rows === undefined) {\n          imgRows = Math.ceil(bitmap.height / ch);\n        }\n      }\n\n      if (generation !== this._generation) throw new Error('image decode canceled');\n      const zIndex = cmd.zIndex ?? 0;\n      this._kittyStorage.addImage(image.id, bitmap, true, layer, zIndex);\n      bitmap = undefined;  // ownership transferred to storage\n\n      // Kitty cursor movement\n      // Per spec: cursor placed at first column after last image column,\n      // on the last row of the image. C=1 means don't move cursor.\n      if (cmd.cursorMovement === 1) {\n        // C=1: restore cursor to position before image was placed\n        const scrolled = buffer.ybase - savedYbase;\n        buffer.x = savedX;\n        // Can't restore cursor to scrollback?\n        buffer.y = Math.max(savedY - scrolled, 0);\n      } else {\n        // Default (C=0): advance cursor horizontally past the image\n        // addImage already positioned cursor on the last row via lineFeeds\n        buffer.x = Math.min(savedX + imgCols, this._coreTerminal.cols);\n      }\n    } catch (e) {\n      bitmap?.close();\n      throw e;\n    }\n  }\n\n  // Create ImageBitmap from already-decoded image data.\n  private async _createBitmap(image: IKittyImageData): Promise<ImageBitmap> {\n    let bytes: Uint8Array = new Uint8Array(await image.data.arrayBuffer());\n\n    if (image.compression === KittyCompression.ZLIB) {\n      bytes = await this._decompressZlib(bytes);\n    }\n\n    if (image.format === KittyFormat.PNG) {\n      const metrics = imageType(bytes);\n      // IHDR dimensions are parsed with signed shifts, so a value >= 0x80000000 comes\n      // back negative and a bare `>` pixel-limit test passes it; require positive.\n      if (metrics.mime !== 'image/png' || !(metrics.width > 0) || !(metrics.height > 0) || metrics.width * metrics.height > this._opts.pixelLimit) {\n        throw new RangeError('PNG exceeds pixel limit or has invalid dimensions');\n      }\n      const blob = new Blob([bytes as BlobPart], { type: 'image/png' });\n      if (!window.createImageBitmap) {\n        const url = URL.createObjectURL(blob);\n        const img = new Image();\n        return new Promise<ImageBitmap>((resolve, reject) => {\n          img.addEventListener('load', () => {\n            URL.revokeObjectURL(url);\n            const canvas = ImageRenderer.createCanvas(window.document, img.width, img.height);\n            canvas.getContext('2d')?.drawImage(img, 0, 0);\n            createImageBitmap(canvas).then(resolve).catch(reject);\n          });\n          img.addEventListener('error', () => {\n            URL.revokeObjectURL(url);\n            reject(new Error('Failed to load image'));\n          });\n          img.src = url;\n        });\n      }\n      return createImageBitmap(blob);\n    }\n\n    // Raw pixel data\n    const width = image.width;\n    const height = image.height;\n\n    if (!width || !height) {\n      throw new Error('Width and height required for raw pixel data');\n    }\n\n    const bytesPerPixel = image.format === KittyFormat.RGBA ? KittyPixelConstants.BYTES_PER_PIXEL_RGBA : KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n    const expectedBytes = width * height * bytesPerPixel;\n\n    if (bytes.length < expectedBytes) {\n      throw new Error('Insufficient pixel data');\n    }\n\n    const pixelCount = width * height;\n\n    if (image.format === KittyFormat.RGBA) {\n      // RGBA: use bytes directly \u2014 no copy needed\n      return createImageBitmap(new ImageData(new Uint8ClampedArray(bytes.buffer as ArrayBuffer, bytes.byteOffset, pixelCount * KittyPixelConstants.BYTES_PER_PIXEL_RGBA), width, height));\n    }\n\n    // RGB\u2192RGBA: interleave alpha using uint32 block processing (4 pixels per iteration).\n    // 3 uint32 reads + 4 uint32 writes per 4 pixels vs 28 byte reads/writes \u2014 ~6x faster.\n    // Assumes little-endian (all modern browsers/Node.js).\n    const data = new Uint8ClampedArray(pixelCount * KittyPixelConstants.BYTES_PER_PIXEL_RGBA);\n    const src32 = new Uint32Array(bytes.buffer, bytes.byteOffset, Math.floor(bytes.byteLength / 4));\n    const dst32 = new Uint32Array(data.buffer);\n    const alignedPixels = pixelCount & ~3;  // round down to multiple of 4\n\n    let srcOffset = 0;\n    let dstOffset = 0;\n    for (let i = 0; i < alignedPixels; i += 4) {\n      const b0 = src32[srcOffset++];\n      const b1 = src32[srcOffset++];\n      const b2 = src32[srcOffset++];\n      // Little-endian: pixel bytes are [R,G,B] \u2192 uint32 ABGR layout\n      dst32[dstOffset++] = 0xFF000000 | b0;\n      dst32[dstOffset++] = 0xFF000000 | (b0 >>> 24) | (b1 << 8);\n      dst32[dstOffset++] = 0xFF000000 | (b1 >>> 16) | (b2 << 16);\n      dst32[dstOffset++] = 0xFF000000 | (b2 >>> 8);\n    }\n\n    // Handle remaining 1\u20133 pixels\n    let srcByte = alignedPixels * KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n    let dstByte = alignedPixels * KittyPixelConstants.BYTES_PER_PIXEL_RGBA;\n    for (let i = alignedPixels; i < pixelCount; i++) {\n      data[dstByte]     = bytes[srcByte];\n      data[dstByte + 1] = bytes[srcByte + 1];\n      data[dstByte + 2] = bytes[srcByte + 2];\n      data[dstByte + 3] = KittyPixelConstants.ALPHA_OPAQUE;\n      srcByte += KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n      dstByte += KittyPixelConstants.BYTES_PER_PIXEL_RGBA;\n    }\n\n    return createImageBitmap(new ImageData(data, width, height));\n  }\n\n  private async _decompressZlib(compressed: Uint8Array): Promise<Uint8Array> {\n    try {\n      return await this._decompress(compressed, 'deflate');\n    } catch (error) {\n      if (error instanceof RangeError) throw error;\n      return await this._decompress(compressed, 'deflate-raw');\n    }\n  }\n\n  private async _decompress(compressed: Uint8Array, format: 'deflate' | 'deflate-raw'): Promise<Uint8Array> {\n    const limit = Math.min(this._opts.kittySizeLimit, this._opts.pixelLimit * 4, this._opts.storageLimit * 1000000);\n    let offsetIn = 0;\n    // Bound inflation within one native transform before its output is budgeted.\n    const source = new ReadableStream<BufferSource>({\n      pull(controller) {\n        if (offsetIn >= compressed.length) {\n          controller.close();\n          return;\n        }\n        const end = Math.min(offsetIn + 4096, compressed.length);\n        controller.enqueue(new Uint8Array(compressed.subarray(offsetIn, end)));\n        offsetIn = end;\n      }\n    });\n    const reader = source.pipeThrough(new DecompressionStream(format)).getReader();\n    const chunks: Uint8Array[] = [];\n    let totalLength = 0;\n    try {\n      while (true) {\n        const { done, value } = await reader.read();\n        if (done) break;\n        totalLength += value.byteLength;\n        if (totalLength > limit) {\n          await reader.cancel().catch(() => {});\n          throw new RangeError('decompressed image exceeds byte limit');\n        }\n        chunks.push(value);\n      }\n    } finally {\n      reader.releaseLock();\n    }\n\n    const result = new Uint8Array(totalLength);\n    let offset = 0;\n    for (const chunk of chunks) {\n      result.set(chunk, offset);\n      offset += chunk.length;\n    }\n    return result;\n  }\n\n  public get images(): ReadonlyMap<number, IKittyImageData> {\n    return this._kittyStorage.images;\n  }\n\n  public get _kittyIdToStorageId(): ReadonlyMap<number, number> {\n    return this._kittyStorage.kittyIdToStorageId;\n  }\n\n  public get pendingTransmissions(): ReadonlyMap<number, IPendingTransmission> {\n    return this._pendingTransmissions;\n  }\n}\n", "/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Kitty graphics protocol types, constants, and parsing utilities.\n */\n\nimport type Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\n\n// Kitty graphics protocol action types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference under key 'a'.\nexport const enum KittyAction {\n  TRANSMIT = 't',\n  TRANSMIT_DISPLAY = 'T',\n  QUERY = 'q',\n  PLACEMENT = 'p',\n  DELETE = 'd'\n}\n\n// Kitty graphics protocol format types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference\nexport const enum KittyFormat {\n  RGB = 24,\n  RGBA = 32,\n  PNG = 100\n}\n\n// Kitty graphics protocol compression types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference under key 'o'.\nexport const enum KittyCompression {\n  NONE = '',\n  ZLIB = 'z'\n}\n\n// Kitty graphics protocol control data keys.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference\nexport const enum KittyKey {\n  // Action to perform (t=transmit, T=transmit+display, q=query, p=placement, d=delete)\n  ACTION = 'a',\n  // Image format (24=RGB, 32=RGBA, 100=PNG)\n  FORMAT = 'f',\n  // Image ID for referencing stored images\n  ID = 'i',\n  // Image number (alternative to ID, terminal assigns ID)\n  IMAGE_NUMBER = 'I',\n  // Source image width in pixels\n  WIDTH = 's',\n  // Source image height in pixels\n  HEIGHT = 'v',\n  // The left edge (in pixels) of the image area to display\n  X_OFFSET = 'x',\n  // The top edge (in pixels) of the image area to display\n  Y_OFFSET = 'y',\n  // Width (in pixels) of the source rectangle to display\n  SOURCE_WIDTH = 'w',\n  // Height (in pixels) of the source rectangle to display\n  SOURCE_HEIGHT = 'h',\n  // Horizontal offset (in pixels) within the first cell\n  X_PLACEMENT_OFFSET = 'X',\n  // Vertical offset (in pixels) within the first cell\n  Y_PLACEMENT_OFFSET = 'Y',\n  // Number of terminal columns to display the image over\n  COLUMNS = 'c',\n  // Number of terminal rows to display the image over\n  ROWS = 'r',\n  // More data flag (1=more chunks coming, 0=final chunk)\n  MORE = 'm',\n  // Compression type (z=zlib). This is essential for chunking larger images.\n  COMPRESSION = 'o',\n  // Quiet mode (1=suppress OK responses, 2=suppress error responses)\n  QUIET = 'q',\n  // Cursor movement policy (0=move cursor after image, 1=don't move cursor)\n  CURSOR_MOVEMENT = 'C',\n  // Z-index for image layering (negative = behind text, 0+ = on top)\n  Z_INDEX = 'z',\n  // Transmission medium (d=direct, f=file, t=temp file, s=shared memory)\n  TRANSMISSION = 't',\n  // Delete selector (a/A=all, i/I=by id, c/C=at cursor, etc.) \u2014 only used when a=d\n  DELETE_SELECTOR = 'd',\n  // Placement ID for targeting specific placements\n  PLACEMENT_ID = 'p'\n}\n\n// Pixel format constants\nexport const enum KittyPixelConstants {\n  BYTES_PER_PIXEL_RGB = 3,\n  BYTES_PER_PIXEL_RGBA = 4,\n  ALPHA_OPAQUE = 255\n}\n\n// Parsed Kitty graphics command.\nexport interface IKittyCommand {\n  action?: string;\n  format?: number;\n  id?: number;\n  imageNumber?: number;\n  width?: number;\n  height?: number;\n  x?: number;\n  y?: number;\n  sourceWidth?: number;\n  sourceHeight?: number;\n  xOffset?: number;\n  yOffset?: number;\n  columns?: number;\n  rows?: number;\n  more?: number;\n  quiet?: number;\n  cursorMovement?: number;\n  zIndex?: number;\n  transmission?: string;\n  deleteSelector?: string;\n  placementId?: number;\n  compression?: string;\n  payload?: string;\n}\n\n// Pending chunked transmission state.\n// Stores metadata from the first chunk while accumulating decoded payload data.\nexport interface IPendingTransmission {\n  // The parsed command from the first chunk (contains action, format, dimensions, etc.)\n  cmd: IKittyCommand;\n  // Decoder used across chunked payloads\n  decoder: Base64Decoder;\n  // Total encoded (base64) bytes received across all chunks - for size limit enforcement\n  totalEncodedSize: number;\n  // Whether any chunk has failed to decode\n  decodeError: boolean;\n}\n\n// Stored Kitty image data.\nexport interface IKittyImageData {\n  id: number;\n  // Decoded image data stored as Blob (off JS heap) to avoid 2GB heap limit\n  data: Blob;\n  width: number;\n  height: number;\n  format: 24 | 32 | 100;\n  compression?: string;\n}\n\n// Parses Kitty graphics control data into a command object.\nexport function parseKittyCommand(data: string): IKittyCommand {\n  const cmd: IKittyCommand = {};\n  const parts = data.split(',');\n\n  for (const part of parts) {\n    const eqIdx = part.indexOf('=');\n    if (eqIdx === -1) continue;\n\n    const key = part.substring(0, eqIdx);\n    const value = part.substring(eqIdx + 1);\n\n    // Handle string keys first\n    if (key === KittyKey.ACTION) {\n      cmd.action = value;\n      continue;\n    }\n    if (key === KittyKey.COMPRESSION) {\n      cmd.compression = value;\n      continue;\n    }\n    if (key === KittyKey.TRANSMISSION) {\n      cmd.transmission = value;\n      continue;\n    }\n    if (key === KittyKey.DELETE_SELECTOR) {\n      cmd.deleteSelector = value;\n      continue;\n    }\n    const numValue = parseInt(value, 10);\n    switch (key) {\n      case KittyKey.FORMAT: cmd.format = numValue; break;\n      case KittyKey.ID: cmd.id = numValue; break;\n      case KittyKey.IMAGE_NUMBER: cmd.imageNumber = numValue; break;\n      case KittyKey.WIDTH: cmd.width = numValue; break;\n      case KittyKey.HEIGHT: cmd.height = numValue; break;\n      case KittyKey.X_OFFSET: cmd.x = numValue; break;\n      case KittyKey.Y_OFFSET: cmd.y = numValue; break;\n      case KittyKey.SOURCE_WIDTH: cmd.sourceWidth = numValue; break;\n      case KittyKey.SOURCE_HEIGHT: cmd.sourceHeight = numValue; break;\n      case KittyKey.X_PLACEMENT_OFFSET: cmd.xOffset = numValue; break;\n      case KittyKey.Y_PLACEMENT_OFFSET: cmd.yOffset = numValue; break;\n      case KittyKey.COLUMNS: cmd.columns = numValue; break;\n      case KittyKey.ROWS: cmd.rows = numValue; break;\n      case KittyKey.MORE: cmd.more = numValue; break;\n      case KittyKey.QUIET: cmd.quiet = numValue; break;\n      case KittyKey.CURSOR_MOVEMENT: cmd.cursorMovement = numValue; break;\n      case KittyKey.Z_INDEX: cmd.zIndex = numValue; break;\n      case KittyKey.PLACEMENT_ID: cmd.placementId = numValue; break;\n    }\n  }\n\n  return cmd;\n}\n", "/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { ImageStorage } from '../ImageStorage';\nimport { ImageLayer, IAddImageOpts } from '../Types';\nimport { IKittyImageData } from './KittyGraphicsTypes';\n\n// Kitty-specific image storage controller.\n//\n// Wraps shared ImageStorage with kitty protocol semantics:\n// - tracks transmitted image payloads by kitty image id\n// - tracks kitty image id -> shared ImageStorage id mapping for displayed images\n// - mirrors shared-storage evictions into kitty maps\n// - applies protocol-level undisplayed-image eviction policy\nexport class KittyImageStorage implements IDisposable {\n  private static readonly _maxStoredImages = 256;\n\n  private _nextImageId = 1;\n  private readonly _images: Map<number, IKittyImageData> = new Map();\n  // TODO: Support multiple placements per image. The kitty spec identifies\n  // placements by an (image id, placement id) pair \u2014 same i + different p\n  // values should coexist, and same i + same p should replace the prior\n  // placement. Currently we track only one storage entry per kitty image id,\n  // so multiple placements of the same image overwrite each other. Fixing\n  // this requires changing these maps to Map<number, Map<number, number>>\n  // (kittyId \u2192 placementId \u2192 storageId) and updating addImage/deleteById\n  // accordingly. The underlying shared ImageStorage would also need to\n  // support multiple entries per logical image.\n  private readonly _kittyIdToStorageId: Map<number, number> = new Map();\n  private readonly _storageIdToKittyId: Map<number, number> = new Map();\n\n  private readonly _previousOnImageDeleted: ((storageId: number) => void) | undefined;\n  private readonly _wrappedOnImageDeleted: (storageId: number) => void;\n  private readonly _handleStorageImageDeleted = (storageId: number): void => {\n    const kittyId = this._storageIdToKittyId.get(storageId);\n    if (kittyId !== undefined) {\n      this._kittyIdToStorageId.delete(kittyId);\n      this._storageIdToKittyId.delete(storageId);\n      this._images.delete(kittyId);\n    }\n  };\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };\n\n  constructor(\n    private readonly _storage: ImageStorage\n  ) {\n    this._previousOnImageDeleted = this._storage.onImageDeleted;\n    this._wrappedOnImageDeleted = (storageId: number) => {\n      this._previousOnImageDeleted?.(storageId);\n      this._handleStorageImageDeleted(storageId);\n    };\n    this._storage.onImageDeleted = this._wrappedOnImageDeleted;\n  }\n\n  public reset(): void {\n    this._nextImageId = 1;\n    this._images.clear();\n    this._kittyIdToStorageId.clear();\n    this._storageIdToKittyId.clear();\n  }\n\n  public dispose(): void {\n    this.reset();\n    if (this._storage.onImageDeleted === this._wrappedOnImageDeleted) {\n      this._storage.onImageDeleted = this._previousOnImageDeleted;\n    }\n  }\n\n  public storeImage(id: number | undefined, imageData: Omit<IKittyImageData, 'id'>): number {\n    const imageId = id ?? this._nextImageId++;\n\n    const oldStorageId = this._kittyIdToStorageId.get(imageId);\n    if (oldStorageId !== undefined) {\n      this._storage.deleteImage(oldStorageId);\n      this._kittyIdToStorageId.delete(imageId);\n      this._storageIdToKittyId.delete(oldStorageId);\n    }\n\n    if (!this._images.has(imageId) && this._images.size >= KittyImageStorage._maxStoredImages) {\n      this._evictUndisplayedImages();\n    }\n\n    // Encoded images awaiting placement are outside ImageStorage's pixel budget.\n    // Unplaced payloads are evicted first so a new upload cannot erase a visible\n    // image while abandoned blobs still hold budget; placed ones go only when\n    // that is not enough, because the byte cap is a hard bound. The new image is\n    // always stored, so an oversized one overshoots by at most one payload\n    // (itself bounded by kittySizeLimit) rather than being dropped after an OK ack.\n    const byteLimit = this._storage.getLimit() * 1000000;\n    this._images.delete(imageId);\n    let retainedBytes = 0;\n    for (const image of this._images.values()) retainedBytes += image.data.size;\n    for (const evictPlaced of [false, true]) {\n      for (const [oldestId, image] of this._images) {\n        if (retainedBytes + imageData.data.size <= byteLimit) break;\n        if (this._kittyIdToStorageId.has(oldestId) !== evictPlaced) continue;\n        retainedBytes -= image.data.size;\n        this.deleteById(oldestId);\n      }\n    }\n\n    this._images.set(imageId, {\n      ...imageData,\n      id: imageId\n    });\n    return imageId;\n  }\n\n  public addImage(kittyId: number, image: HTMLCanvasElement | ImageBitmap, scrolling: boolean, layer: ImageLayer, zIndex: number): void {\n    // Clean up stale reverse-mapping from a previous placement of the same\n    // kitty image.  The old shared-storage entry is kept (it may still be\n    // visible on screen) but its reverse mapping is removed so that eviction\n    // of the old entry won't incorrectly delete the kitty image data.\n    const oldStorageId = this._kittyIdToStorageId.get(kittyId);\n    if (oldStorageId !== undefined) {\n      this._storageIdToKittyId.delete(oldStorageId);\n    }\n    this._addImageOpts.scrolling = scrolling;\n    this._addImageOpts.layer = layer;\n    this._addImageOpts.zIndex = zIndex;\n    const storageId = this._storage.addImage(image, this._addImageOpts);\n    this._kittyIdToStorageId.set(kittyId, storageId);\n    this._storageIdToKittyId.set(storageId, kittyId);\n  }\n\n  public getImage(kittyId: number): IKittyImageData | undefined {\n    return this._images.get(kittyId);\n  }\n\n  public deleteById(kittyId: number): void {\n    this._images.delete(kittyId);\n    const storageId = this._kittyIdToStorageId.get(kittyId);\n    if (storageId !== undefined) {\n      this._storage.deleteImage(storageId);\n      this._kittyIdToStorageId.delete(kittyId);\n      this._storageIdToKittyId.delete(storageId);\n    }\n  }\n\n  public deleteAll(): void {\n    this._images.clear();\n    for (const storageId of this._kittyIdToStorageId.values()) {\n      this._storage.deleteImage(storageId);\n    }\n    this._kittyIdToStorageId.clear();\n    this._storageIdToKittyId.clear();\n  }\n\n  public get images(): ReadonlyMap<number, IKittyImageData> {\n    return this._images;\n  }\n\n  public get kittyIdToStorageId(): ReadonlyMap<number, number> {\n    return this._kittyIdToStorageId;\n  }\n\n  public get lastImageId(): number {\n    return this._nextImageId - 1;\n  }\n\n  private _evictUndisplayedImages(): void {\n    for (const [kittyId] of this._images) {\n      if (this._images.size <= KittyImageStorage._maxStoredImages / 2) {\n        break;\n      }\n      if (!this._kittyIdToStorageId.has(kittyId)) {\n        this._images.delete(kittyId);\n      }\n    }\n  }\n}\n", "/**\n * Copyright (c) 2020, 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { SixelImageStorage } from './SixelImageStorage';\nimport { IDcsHandler, IParams, IImageAddonOptions, ITerminalExt, AttributeData, IResetHandler, ReadonlyColorSet } from './Types';\nimport { toRGBA8888, BIG_ENDIAN, PALETTE_ANSI_256, PALETTE_VT340_COLOR } from 'sixel/lib/Colors';\nimport { RGBA8888 } from 'sixel/lib/Types';\nimport { ImageRenderer } from './ImageRenderer';\n\nimport { DecoderAsync, Decoder } from 'sixel/lib/Decoder';\n\n// always free decoder ressources after decoding if it exceeds this limit\nconst MEM_PERMA_LIMIT = 4194304; // 1024 pixels * 1024 pixels * 4 channels = 4MB\n\n// custom default palette: VT340 (lower 16 colors) + ANSI256 (up to 256) + zeroed (up to 4096)\nconst DEFAULT_PALETTE = PALETTE_ANSI_256;\nDEFAULT_PALETTE.set(PALETTE_VT340_COLOR);\n\n\nexport class SixelHandler implements IDcsHandler, IResetHandler {\n  private _size = 0;\n  private _aborted = false;\n  private _dec: Decoder | undefined;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _storage: SixelImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    DecoderAsync({\n      memoryLimit: this._opts.pixelLimit * 4,\n      palette: DEFAULT_PALETTE,\n      paletteLimit: this._opts.sixelPaletteLimit\n    }).then(d => this._dec = d);\n  }\n\n  public reset(): void {\n    /**\n     * reset sixel decoder to defaults:\n     * - release all memory\n     * - nullify palette (4096)\n     * - apply default palette (256)\n     */\n    if (this._dec) {\n      this._dec.release();\n      // FIXME: missing interface on decoder to nullify full palette\n      (this._dec as any)._palette.fill(0);\n      this._dec.init(0, DEFAULT_PALETTE, this._opts.sixelPaletteLimit);\n    }\n  }\n\n  public hook(params: IParams): void {\n    this._size = 0;\n    this._aborted = false;\n    if (this._dec) {\n      const fillColor = params.params[1] === 1 ? 0 : extractActiveBg(\n        this._coreTerminal._core._inputHandler._curAttrData,\n        this._coreTerminal._core._themeService?.colors);\n      this._dec.init(fillColor, null, this._opts.sixelPaletteLimit);\n    }\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted || !this._dec) {\n      return;\n    }\n    this._size += end - start;\n    if (this._size > this._opts.sixelSizeLimit) {\n      console.warn(`SIXEL: too much data, aborting`);\n      this._aborted = true;\n      this._dec.release();\n      return;\n    }\n    try {\n      this._dec.decode(data, start, end);\n    } catch (e) {\n      console.warn(`SIXEL: error while decoding image - ${e}`);\n      this._aborted = true;\n      this._dec.release();\n    }\n  }\n\n  public unhook(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted || !success || !this._dec) {\n      return true;\n    }\n\n    const width = this._dec.width;\n    const height = this._dec.height;\n\n    // partial fix for https://github.com/jerch/xterm-addon-image/issues/37\n    if (!width || !height) {\n      if (height) {\n        this._storage.advanceCursor(height);\n      }\n      return true;\n    }\n\n    const canvas = ImageRenderer.createCanvas(undefined, width, height);\n    canvas.getContext('2d')?.putImageData(new ImageData(this._dec.data8 as Uint8ClampedArray<ArrayBuffer>, width, height), 0, 0);\n    if (this._dec.memoryUsage > MEM_PERMA_LIMIT) {\n      this._dec.release();\n    }\n    this._storage.addImage(canvas);\n    return true;\n  }\n}\n\n\n/**\n * Some helpers to extract current terminal colors.\n */\n\n// get currently active background color from terminal\n// also respect INVERSE setting\nfunction extractActiveBg(attr: AttributeData, colors: ReadonlyColorSet | undefined): RGBA8888 {\n  let bg = 0;\n  if (!colors) {\n    // FIXME: theme service is prolly not available yet,\n    // happens if .open() was not called yet (bug in core?)\n    return bg;\n  }\n  if (attr.isInverse()) {\n    if (attr.isFgDefault()) {\n      bg = convertLe(colors.foreground.rgba);\n    } else if (attr.isFgRGB()) {\n      const t = (attr.constructor as typeof AttributeData).toColorRGB(attr.getFgColor());\n      bg = toRGBA8888(...t);\n    } else {\n      bg = convertLe(colors.ansi[attr.getFgColor()].rgba);\n    }\n  } else {\n    if (attr.isBgDefault()) {\n      bg = convertLe(colors.background.rgba);\n    } else if (attr.isBgRGB()) {\n      const t = (attr.constructor as typeof AttributeData).toColorRGB(attr.getBgColor());\n      bg = toRGBA8888(...t);\n    } else {\n      bg = convertLe(colors.ansi[attr.getBgColor()].rgba);\n    }\n  }\n  return bg;\n}\n\n// rgba values on the color managers are always in BE, thus convert to LE\nfunction convertLe(color: number): RGBA8888 {\n  if (BIG_ENDIAN) return color;\n  return (color & 0xFF) << 24 | (color >>> 8 & 0xFF) << 16 | (color >>> 16 & 0xFF) << 8 | color >>> 24 & 0xFF;\n}\n", "/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';\nimport { IImageAddonOptions, ITerminalExt, IAddImageOpts } from './Types';\nimport { ImageRenderer } from './ImageRenderer';\n\n/**\n * Sixel-specific image storage controller.\n *\n * Wraps the shared ImageStorage with sixel protocol semantics:\n * - Cursor behavior governed by DECSET 80 (sixelScrolling option)\n * - advanceCursor for empty sixels carrying only height\n */\nexport class SixelImageStorage {\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'vt340' };\n  constructor(\n    private readonly _storage: ImageStorage,\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _terminal: ITerminalExt\n  ) {}\n\n  /**\n   * Add a sixel image to storage.\n   * Cursor behavior depends on the sixelScrolling option (DECSET 80).\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap): void {\n    this._addImageOpts.scrolling = this._opts.sixelScrolling;\n    this._storage.addImage(img, this._addImageOpts);\n  }\n\n  /**\n   * Only advance text cursor.\n   * This is an edge case from empty sixels carrying only a height but no pixels.\n   * Partially fixes https://github.com/jerch/xterm-addon-image/issues/37.\n   */\n  public advanceCursor(height: number): void {\n    if (this._opts.sixelScrolling) {\n      let cellSize = this._renderer.cellSize;\n      if (cellSize.width === -1 || cellSize.height === -1) {\n        cellSize = CELL_SIZE_DEFAULT;\n      }\n      const rows = Math.ceil(height / cellSize.height);\n      for (let i = 1; i < rows; ++i) {\n        this._terminal._core._inputHandler.lineFeed();\n      }\n    }\n  }\n}\n", "/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IAddImageOpts } from './Types';\nimport { ImageStorage } from './ImageStorage';\n\n/**\n * IIP (iTerm Image Protocol) specific image storage controller.\n *\n * Wraps the shared ImageStorage with IIP protocol semantics:\n * - Always uses scrolling mode (cursor advances with image)\n */\nexport class IIPImageStorage {\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };\n  constructor(\n    private readonly _storage: ImageStorage\n  ) {}\n\n  /**\n   * Add an IIP image to storage.\n   * Always uses scrolling mode \u2014 cursor advances past the image.\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap): void {\n    this._storage.addImage(img, this._addImageOpts);\n  }\n}\n", "/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport type { ITerminalAddon, IDisposable } from '@xterm/xterm';\nimport type { ImageAddon as IImageApi } from '@xterm/addon-image';\nimport { Emitter, type IEvent } from 'common/Event';\nimport { IIPHandler } from './IIPHandler';\nimport { ImageRenderer } from './ImageRenderer';\nimport { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';\nimport { KittyGraphicsHandler } from './kitty/KittyGraphicsHandler';\nimport { KittyImageStorage } from './kitty/KittyImageStorage';\nimport { SixelHandler } from './SixelHandler';\nimport { SixelImageStorage } from './SixelImageStorage';\nimport { IIPImageStorage } from './IIPImageStorage';\nimport { ITerminalExt, IImageAddonOptions, IResetHandler } from './Types';\n\n\n/**\n * Document VT features provided by this addon.\n *\n * @vt: #E[Supported via @xterm/addon-image.] DCS SIXEL \"SIXEL Graphics\"  \"DCS Ps ; Ps ; Ps ; q Pt ST\"  \"Draw SIXEL image.\"\n *\n * Sixel support is provided by the addon @xterm/addon-image with these limitations:\n * - immediate coloring (no shared palette, allows high color settings of `img2sixel`)\n * - max. palette size of 4096 colors\n * - max. pixel width of 16K\n * - max. 25 MB per sixel sequence\n * - VT340 cursor positioning (begin of last sixel data row)\n *\n * See [addon readme](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image) for more details.\n *\n *\n * @vt: #E[Supported via @xterm/addon-image.] OSC 1337  \"iTerm2 Commands\"   \"OSC 1337 ; Pt BEL\"  \"Custom iTerm2 commands.\"\n *\n * Only the inline image protocol (IIP) is supported by the addon @xterm/addon-image with\n * the following limitations:\n * - sequence:\n *   - format: `OSC 1337 ; File=inline=1 ; size=<unencoded size> ; ... : <base64 payload> BEL`\n *   - size param must be set and payload may not exceed CEIL(size * 4 / 3)\n *   - strict base64 handling as of RFC4648 \u00A74 (standard alphabet, optional padding,\n *     no separator bytes allowed)\n *   - supported params: size, name, width, height, preserveAspectRatio\n * - image formats: PNG, JPEG and GIF\n * - no animation support (renders first image of a GIF)\n * - no multipart support\n * - VT340 cursor positioning (begin of last sixel data row)\n *\n * See [addon readme](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image)\n * and [iTerm2 IIP docs](https://iterm2.com/documentation-images.html) for more details.\n *\n *\n * @vt: #E[Supported via @xterm/addon-image.] APC KITTY_GRAPHICS \"Kitty Graphics\"  \"APC G Pt ST\"  \"Kitty Graphics Protocol.\"\n *\n * Kitty graphics support is provided by the addon @xterm/addon-image.\n * Note that while basic image output already works, this is still work in progress.\n */\n\n// default values of addon ctor options\nconst DEFAULT_OPTIONS: IImageAddonOptions = {\n  enableSizeReports: true,\n  pixelLimit: 16777216, // limit to 4096 * 4096 pixels\n  sixelSupport: true,\n  sixelScrolling: true,\n  sixelPaletteLimit: 4096,\n  sixelSizeLimit: 33554432,\n  storageLimit: 128,\n  showPlaceholder: true,\n  iipSupport: true,\n  iipSizeLimit: 33554432,\n  kittySupport: true,\n  kittySizeLimit: 33554432\n};\n\n// max palette size supported by the sixel lib (compile time setting)\nconst MAX_SIXEL_PALETTE_SIZE = 4096;\n\n// definitions for _xtermGraphicsAttributes sequence\nconst enum GaItem {\n  COLORS = 1,\n  SIXEL_GEO = 2,\n  REGIS_GEO = 3\n}\nconst enum GaAction {\n  READ = 1,\n  SET_DEFAULT = 2,\n  SET = 3,\n  READ_MAX = 4\n}\nconst enum GaStatus {\n  SUCCESS = 0,\n  ITEM_ERROR = 1,\n  ACTION_ERROR = 2,\n  FAILURE = 3\n}\n\n\nexport class ImageAddon implements ITerminalAddon, IImageApi {\n  private _opts: IImageAddonOptions;\n  private _defaultOpts: IImageAddonOptions;\n  private _storage: ImageStorage | undefined;\n  private _renderer: ImageRenderer | undefined;\n  private _disposables: IDisposable[] = [];\n  private _terminal: ITerminalExt | undefined;\n  private _handlers: Map<String, IResetHandler> = new Map();\n  private readonly _onImageAdded = new Emitter<void>();\n  public readonly onImageAdded: IEvent<void> = this._onImageAdded.event;\n\n  constructor(opts?: Partial<IImageAddonOptions>) {\n    this._opts = Object.assign({}, DEFAULT_OPTIONS, opts);\n    this._defaultOpts = Object.assign({}, DEFAULT_OPTIONS, opts);\n  }\n\n  public dispose(): void {\n    for (const handler of this._handlers.values()) handler.reset();\n    for (const obj of this._disposables) {\n      obj.dispose();\n    }\n    this._disposables.length = 0;\n    this._handlers.clear();\n    this._onImageAdded.dispose();\n  }\n\n  private _disposeLater(...args: IDisposable[]): void {\n    for (const obj of args) {\n      this._disposables.push(obj);\n    }\n  }\n\n  public activate(terminal: ITerminalExt): void {\n    this._terminal = terminal;\n\n    // internal data structures\n    this._renderer = new ImageRenderer(terminal);\n    this._storage = new ImageStorage(terminal, this._renderer, this._opts);\n    this._storage.onImageAdded = () => this._onImageAdded.fire();\n\n    // enable size reports\n    if (this._opts.enableSizeReports) {\n      const windowOps = terminal.options.windowOptions ?? {};\n      windowOps.getWinSizePixels = true;\n      windowOps.getCellSizePixels = true;\n      windowOps.getWinSizeChars = true;\n      terminal.options.windowOptions = windowOps;\n    }\n\n    this._disposeLater(\n      this._renderer,\n      this._storage,\n\n      // DECSET/DECRST/DA1/XTSMGRAPHICS handlers\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'h' }, params => this._decset(params)),\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'l' }, params => this._decrst(params)),\n      terminal.parser.registerCsiHandler({ final: 'c' }, params => this._da1(params)),\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'S' }, params => this._xtermGraphicsAttributes(params)),\n\n      // render hook\n      terminal.onRender(range => this._storage?.render(range)),\n\n      /**\n       * reset handlers covered:\n       * - DECSTR\n       * - RIS\n       * - Terminal.reset()\n       */\n      terminal.parser.registerCsiHandler({ intermediates: '!', final: 'p' }, () => this.reset()),\n      terminal.parser.registerEscHandler({ final: 'c' }, () => this.reset()),\n      terminal._core._inputHandler.onRequestReset(() => this.reset()),\n\n      // wipe canvas and delete alternate images on buffer switch\n      terminal.buffer.onBufferChange(() => this._storage?.wipeAlternate()),\n\n      // extend images to the right on resize\n      terminal.onResize(metrics => this._storage?.viewportResize(metrics))\n    );\n\n    // SIXEL handler\n    if (this._opts.sixelSupport) {\n      const sixelStorage = new SixelImageStorage(this._storage!, this._opts, this._renderer!, terminal);\n      const sixelHandler = new SixelHandler(this._opts, sixelStorage, terminal);\n      this._handlers.set('sixel', sixelHandler);\n      this._disposeLater(\n        terminal._core._inputHandler._parser.registerDcsHandler({ final: 'q' }, sixelHandler)\n      );\n    }\n\n    // iTerm IIP handler\n    if (this._opts.iipSupport) {\n      const iipStorage = new IIPImageStorage(this._storage!);\n      const iipHandler = new IIPHandler(this._opts, this._renderer!, iipStorage, terminal);\n      this._handlers.set('iip', iipHandler);\n      this._disposeLater(\n        terminal._core._inputHandler._parser.registerOscHandler(1337, iipHandler)\n      );\n    }\n\n    // Kitty graphics handler\n    if (this._opts.kittySupport) {\n      const kittyStorage = new KittyImageStorage(this._storage!);\n      const kittyHandler = new KittyGraphicsHandler(this._opts, this._renderer!, kittyStorage, terminal);\n      this._handlers.set('kitty', kittyHandler);\n      this._disposeLater(\n        kittyStorage,\n        kittyHandler,\n        terminal._core._inputHandler._parser.registerApcHandler({ final: 'G' }, kittyHandler)\n      );\n    }\n  }\n\n  // Note: storageLimit is skipped here to not intoduce a surprising side effect.\n  public reset(): boolean {\n    // reset options customizable by sequences to defaults\n    this._opts.sixelScrolling = this._defaultOpts.sixelScrolling;\n    this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit;\n    // also clear image storage\n    this._storage?.reset();\n    // reset protocol handlers\n    for (const handler of this._handlers.values()) {\n      handler.reset();\n    }\n    return false;\n  }\n\n  public get storageLimit(): number {\n    return this._storage?.getLimit() || -1;\n  }\n\n  public set storageLimit(limit: number) {\n    this._storage?.setLimit(limit);\n    this._opts.storageLimit = limit;\n  }\n\n  public get storageUsage(): number {\n    if (this._storage) {\n      return this._storage.getUsage();\n    }\n    return -1;\n  }\n\n  public get showPlaceholder(): boolean {\n    return this._opts.showPlaceholder;\n  }\n\n  public set showPlaceholder(value: boolean) {\n    this._opts.showPlaceholder = value;\n    this._renderer?.showPlaceholder(value);\n  }\n\n  public getImageAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    return this._storage?.getImageAtBufferCell(x, y);\n  }\n\n  public extractTileAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    return this._storage?.extractTileAtBufferCell(x, y);\n  }\n\n  private _report(s: string): void {\n    this._terminal?._core.input(s, false);\n  }\n\n  private _decset(params: (number | number[])[]): boolean {\n    for (let i = 0; i < params.length; ++i) {\n      switch (params[i]) {\n        case 80:\n          this._opts.sixelScrolling = false;\n          break;\n      }\n    }\n    return false;\n  }\n\n  private _decrst(params: (number | number[])[]): boolean {\n    for (let i = 0; i < params.length; ++i) {\n      switch (params[i]) {\n        case 80:\n          this._opts.sixelScrolling = true;\n          break;\n      }\n    }\n    return false;\n  }\n\n  // overload DA to return something more appropriate\n  private _da1(params: (number | number[])[]): boolean {\n    if (params[0]) {\n      return true;\n    }\n    // reported features:\n    // 62 - VT220\n    // 4 - SIXEL support\n    // 9 - charsets\n    // 22 - ANSI colors\n    if (this._opts.sixelSupport) {\n      this._report(`\\x1b[?62;4;9;22c`);\n      return true;\n    }\n    return false;\n  }\n\n  /**\n   * Implementation of xterm's graphics attribute sequence.\n   *\n   * Supported features:\n   * - read/change palette limits (max 4096 by sixel lib)\n   * - read SIXEL canvas geometry (reports current window canvas or\n   *   squared pixelLimit if canvas > pixel limit)\n   *\n   * Everything else is deactivated.\n   */\n  private _xtermGraphicsAttributes(params: (number | number[])[]): boolean {\n    if (params.length < 2) {\n      return true;\n    }\n    if (params[0] === GaItem.COLORS) {\n      switch (params[1]) {\n        case GaAction.READ:\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          return true;\n        case GaAction.SET_DEFAULT:\n          this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit;\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          // also reset protocol handlers for now\n          for (const handler of this._handlers.values()) {\n            handler.reset();\n          }\n          return true;\n        case GaAction.SET:\n          if (params.length > 2 && !(params[2] instanceof Array) && params[2] <= MAX_SIXEL_PALETTE_SIZE) {\n            this._opts.sixelPaletteLimit = params[2];\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          } else {\n            this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          }\n          return true;\n        case GaAction.READ_MAX:\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${MAX_SIXEL_PALETTE_SIZE}S`);\n          return true;\n        default:\n          this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          return true;\n      }\n    }\n    if (params[0] === GaItem.SIXEL_GEO) {\n      switch (params[1]) {\n        // we only implement read and read_max here\n        case GaAction.READ:\n          let width = this._renderer?.dimensions?.css.canvas.width;\n          let height = this._renderer?.dimensions?.css.canvas.height;\n          if (!width || !height) {\n            // for some reason we have no working image renderer\n            // --> fallback to default cell size\n            const cellSize = CELL_SIZE_DEFAULT;\n            width = (this._terminal?.cols || 80) * cellSize.width;\n            height = (this._terminal?.rows || 24) * cellSize.height;\n          }\n          if (width * height < this._opts.pixelLimit) {\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${width.toFixed(0)};${height.toFixed(0)}S`);\n          } else {\n            // if we overflow pixelLimit report that squared instead\n            const x = Math.floor(Math.sqrt(this._opts.pixelLimit));\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${x};${x}S`);\n          }\n          return true;\n        case GaAction.READ_MAX:\n          // read_max returns pixelLimit as square area\n          const x = Math.floor(Math.sqrt(this._opts.pixelLimit));\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${x};${x}S`);\n          return true;\n        default:\n          this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          return true;\n      }\n    }\n    // exit with error on ReGIS or any other requests\n    this._report(`\\x1b[?${params[0]};${GaStatus.ITEM_ERROR}S`);\n    return true;\n  }\n}\n"],
-+  "mappings": ";;;;;;;;;;;;;;;;02BAYaA,EAAA,WAAa,IAAI,WAAW,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,IAAM,IAClFA,EAAA,YACF,QAAQ,KAAK,6EAA6E,EAI5F,SAAgBC,GAAIC,EAAW,CAC7B,OAAOA,EAAI,GACb,CAFAF,EAAA,IAAAC,GAIA,SAAgBE,GAAMD,EAAW,CAC/B,OAAQA,IAAM,EAAK,GACrB,CAFAF,EAAA,MAAAG,GAIA,SAAgBC,GAAKF,EAAW,CAC9B,OAAQA,IAAM,GAAM,GACtB,CAFAF,EAAA,KAAAI,GAIA,SAAgBC,GAAMH,EAAW,CAC/B,OAAQA,IAAM,GAAM,GACtB,CAFAF,EAAA,MAAAK,GAQA,SAAgBC,EAAWC,EAAWC,EAAWC,EAAWC,EAAY,IAAG,CACzE,QAASA,EAAI,MAAS,IAAMD,EAAI,MAAS,IAAMD,EAAI,MAAS,EAAKD,EAAI,OAAW,CAClF,CAFAP,EAAA,WAAAM,EAQA,SAAgBK,GAAaC,EAAe,CAC1C,MAAO,CAACA,EAAQ,IAAOA,GAAS,EAAK,IAAOA,GAAS,GAAM,IAAMA,IAAU,EAAE,CAC/E,CAFAZ,EAAA,aAAAW,GASA,SAAgBE,GAAkBD,EAAiBE,EAAmB,CACpE,IAAMP,EAAIN,GAAIW,CAAK,EACbJ,EAAIL,GAAMS,CAAK,EACfH,EAAIL,GAAKQ,CAAK,EAEhBG,EAAM,OAAO,iBACbC,EAAM,GAGV,QAASC,EAAI,EAAGA,EAAIH,EAAQ,OAAQ,EAAEG,EAAG,CACvC,IAAMC,EAAKX,EAAIO,EAAQG,CAAC,EAAE,CAAC,EACrBE,EAAKX,EAAIM,EAAQG,CAAC,EAAE,CAAC,EACrBG,EAAKX,EAAIK,EAAQG,CAAC,EAAE,CAAC,EACrB,EAAIC,EAAKA,EAAKC,EAAKA,EAAKC,EAAKA,EACnC,GAAI,CAAC,EAAG,OAAOH,EACX,EAAIF,IACNA,EAAM,EACNC,EAAMC,GAIV,OAAOD,CACT,CAtBAhB,EAAA,kBAAAa,GA4BA,SAASQ,GAAMC,EAAaC,EAAcC,EAAa,CACrD,OAAO,KAAK,IAAIF,EAAK,KAAK,IAAIE,EAAOD,CAAI,CAAC,CAC5C,CAEA,SAASE,GAAIC,EAAYC,EAAYC,EAAS,CAC5C,OAAIA,EAAI,IAAGA,GAAK,GACZA,EAAI,IAAGA,GAAK,GACTA,EAAI,EAAI,EACXD,GAAMD,EAAKC,GAAM,EAAIC,EACrBA,EAAI,EAAI,EACNF,EACAE,EAAI,EAAI,EACND,GAAMD,EAAKC,IAAO,EAAIC,EAAI,GAC1BD,CACV,CAEA,SAASE,GAASC,EAAWC,EAAWC,EAAS,CAC/C,GAAI,CAACA,EAAG,CACN,IAAMC,EAAI,KAAK,MAAMF,EAAI,GAAG,EAC5B,OAAOzB,EAAW2B,EAAGA,EAAGA,CAAC,EAE3B,IAAMP,EAAKK,EAAI,GAAMA,GAAK,EAAIC,GAAKD,EAAIC,EAAID,EAAIC,EACzCL,EAAK,EAAII,EAAIL,EACnB,OAAOpB,EACLe,GAAM,EAAG,IAAK,KAAK,MAAMI,GAAIC,EAAIC,EAAIG,EAAI,EAAI,CAAC,EAAI,GAAG,CAAC,EACtDT,GAAM,EAAG,IAAK,KAAK,MAAMI,GAAIC,EAAIC,EAAIG,CAAC,EAAI,GAAG,CAAC,EAC9CT,GAAM,EAAG,IAAK,KAAK,MAAMI,GAAIC,EAAIC,EAAIG,EAAI,EAAI,CAAC,EAAI,GAAG,CAAC,CAAC,CAE3D,CAKA,SAAgBI,EAAa3B,EAAWC,EAAWC,EAAS,CAC1D,OAAQ,WAAa,KAAK,MAAMA,EAAI,IAAM,GAAG,GAAK,GAAK,KAAK,MAAMD,EAAI,IAAM,GAAG,GAAK,EAAI,KAAK,MAAMD,EAAI,IAAM,GAAG,KAAO,CACzH,CAFAP,EAAA,aAAAkC,EAQA,SAAgBC,GAAaL,EAAWC,EAAWC,EAAS,CAE1D,OAAOH,IAAUC,EAAI,IAAM,KAAO,IAAKC,EAAI,IAAKC,EAAI,GAAG,CACzD,CAHAhC,EAAA,aAAAmC,GAqCanC,EAAA,oBAAsB,IAAI,YAAY,CACjDkC,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACxB,EA0BYlC,EAAA,mBAAqB,IAAI,YAAY,CAChDkC,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACxB,EAOYlC,EAAA,kBAAoB,IAAK,CAEpC,IAAMoC,EAAgB,CACpB9B,EAAW,EAAG,EAAG,CAAC,EAClBA,EAAW,IAAK,EAAG,CAAC,EACpBA,EAAW,EAAG,IAAK,CAAC,EACpBA,EAAW,IAAK,IAAK,CAAC,EACtBA,EAAW,EAAG,EAAG,GAAG,EACpBA,EAAW,IAAK,EAAG,GAAG,EACtBA,EAAW,EAAG,IAAK,GAAG,EACtBA,EAAW,IAAK,IAAK,GAAG,EACxBA,EAAW,IAAK,IAAK,GAAG,EACxBA,EAAW,IAAK,EAAG,CAAC,EACpBA,EAAW,EAAG,IAAK,CAAC,EACpBA,EAAW,IAAK,IAAK,CAAC,EACtBA,EAAW,GAAI,GAAI,GAAG,EACtBA,EAAW,IAAK,EAAG,GAAG,EACtBA,EAAW,EAAG,IAAK,GAAG,EACtBA,EAAW,IAAK,IAAK,GAAG,GAGpB+B,EAAI,CAAC,EAAG,GAAI,IAAK,IAAK,IAAK,GAAG,EACpC,QAAS9B,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB,QAASC,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB,QAASC,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB2B,EAAE,KAAK9B,EAAW+B,EAAE9B,CAAC,EAAG8B,EAAE7B,CAAC,EAAG6B,EAAE5B,CAAC,CAAC,CAAC,EAKzC,QAASwB,EAAI,EAAGA,GAAK,IAAKA,GAAK,GAC7BG,EAAE,KAAK9B,EAAW2B,EAAGA,EAAGA,CAAC,CAAC,EAE5B,OAAO,IAAI,YAAYG,CAAC,CAC1B,GAAE,EASWpC,EAAA,mBAA+BM,EAAW,EAAG,EAAG,EAAG,GAAG,EACtDN,EAAA,mBAA+BM,EAAW,IAAK,IAAK,IAAK,GAAG,IChRzE,IAAAgC,GAAAC,EAAAC,IAAA,cAKA,OAAO,eAAeA,GAAS,aAAc,CAAE,MAAO,EAAK,CAAC,EAC5DA,GAAQ,OAASC,GACjB,IAAIC,EAAK,GAAM,CACX,GAAI,WAAW,WACX,OAAO,WAAW,WAAW,CAAC,EAClC,GAAI,OAAO,OAAW,IAClB,OAAO,OAAO,KAAK,EAAG,QAAQ,EAClC,IAAMC,EAAI,KAAK,CAAC,EACVC,EAAI,IAAI,WAAWD,EAAE,MAAM,EACjC,QAAS,EAAI,EAAG,EAAIC,EAAE,OAAQ,EAAE,EAC5BA,EAAE,CAAC,EAAID,EAAE,WAAW,CAAC,EACzB,OAAOC,CACX,EACA,SAASH,GAAOI,EAAK,CACjB,GAAIA,EAAI,EAAG,CACP,GAAM,CAAE,EAAAC,EAAG,EAAAC,EAAG,EAAAC,CAAE,EAAIH,EAChBF,EACAM,EACEC,EAAI,YACV,OAAIJ,IAAM,EACFC,EACQI,GAAM,IAAID,EAAE,SAASD,IAAMA,EAAI,IAAIC,EAAE,OAAOP,IAAMA,EAAID,EAAEM,CAAC,EAAE,GAAIG,CAAC,EACpEA,GAAMF,EACRC,EAAE,YAAYD,EAAGE,CAAC,EAClBD,EAAE,YAAYP,IAAMA,EAAID,EAAEM,CAAC,GAAIG,CAAC,EAAE,KAAKP,IAAMK,EAAIL,EAAE,SAAWA,EAAE,QAAQ,EAE9EE,IAAM,EACFC,EACO,IAAME,IAAMA,EAAI,IAAIC,EAAE,OAAOP,IAAMA,EAAID,EAAEM,CAAC,EAAE,GAChD,IAAMC,EACP,QAAQ,QAAQA,CAAC,EACjBC,EAAE,QAAQP,IAAMA,EAAID,EAAEM,CAAC,EAAE,EAAE,KAAKJ,GAAKK,EAAIL,CAAC,EAEhDG,EACO,IAAMJ,IAAMA,EAAID,EAAEM,CAAC,GACvB,IAAM,QAAQ,QAAQL,IAAMA,EAAID,EAAEM,CAAC,EAAE,CAChD,CACA,GAAI,OAAO,SAAa,IACpB,MAAM,IAAI,MAAM,mBAAmB,EACvC,SAAS,IAAIH,CAAG,CACpB,IC7CA,IAAAO,GAAAC,EAAAC,IAAA,cACA,OAAO,eAAeA,GAAS,aAAc,CAAE,MAAO,EAAK,CAAC,EAK5D,IAAMC,GAAmB,KAInBC,MAAiBD,GAAiB,QAAuD,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,0lCAA0lC,CAA8C,EAuJ5uCE,EAAM,IAAI,WAAW,mEACtB,MAAM,EAAE,EACR,IAAIC,GAAMA,EAAG,WAAW,CAAC,CAAC,CAAC,EAE1BC,EAAI,IAAI,YAAY,IAAI,EAC9BA,EAAE,KAAK,UAAU,EACjB,QAASC,EAAI,EAAGA,EAAIH,EAAI,OAAQ,EAAEG,EAC9BD,EAAEF,EAAIG,CAAC,CAAC,EAAIA,GAAK,EACrB,QAASA,EAAI,EAAGA,EAAIH,EAAI,OAAQ,EAAEG,EAC9BD,EAAE,IAAMF,EAAIG,CAAC,CAAC,EAAIA,GAAK,GAAMA,GAAK,EAAK,MAAS,EACpD,QAASA,EAAI,EAAGA,EAAIH,EAAI,OAAQ,EAAEG,EAC9BD,EAAE,IAAMF,EAAIG,CAAC,CAAC,EAAKA,GAAK,GAAM,GAAMA,GAAK,EAAK,MAAS,GAC3D,QAASA,EAAI,EAAGA,EAAIH,EAAI,OAAQ,EAAEG,EAC9BD,EAAE,IAAMF,EAAIG,CAAC,CAAC,EAAIA,GAAK,GAC3B,IAAMC,GAAQ,IAAI,WAAW,CAAC,EAWxBC,GAAN,KAAoB,CAMhB,YAAYC,EAAUC,EAAUC,EAAc,CAO1C,GANA,KAAK,MAAQ,KACb,KAAK,OAAS,GACd,KAAK,OAAS,EACd,KAAK,SAAWF,GAAsD,QACtE,KAAK,SAAWC,GAAsD,WACtE,KAAK,OAASC,GAAkE,MAC5E,KAAK,OAAS,KAAK,UAAY,KAAK,SAAW,WAC/C,MAAM,IAAI,MAAM,uBAAuB,CAE/C,CAKA,IAAI,OAAQ,CACR,OAAO,KAAK,MAAQ,KAAK,GAAG,SAAS,EAAG,KAAK,KAAK,IAAuB,CAAC,EAAIJ,EAClF,CAMA,SAAU,CACD,KAAK,QAEN,KAAK,OAAS,KAAK,SACnB,KAAK,MAAQ,KAAK,KAAO,KAAK,GAAK,KAAK,KAAO,MAG/C,KAAK,KAAK,IAAuB,EAAI,EACrC,KAAK,KAAK,IAAuB,EAAI,EACrC,KAAK,KAAK,IAAuB,EAAI,GAE7C,CASA,KAAKG,EAAUC,EAAc,CAGzB,GAFA,KAAK,SAAWD,GAAsD,KAAK,SAC3E,KAAK,OAASC,GAAkE,KAAK,IAAI,KAAK,OAAQ,KAAK,QAAQ,EAC/G,KAAK,OAAS,KAAK,UAAY,KAAK,SAAW,WAC/C,MAAM,MAAM,uBAAuB,EAEvC,IAAIC,EAAI,KAAK,KACPC,EAAQ,KAAK,OAAS,KACvB,KAAK,MAOD,KAAK,KAAK,OAAO,WAAaA,IACnC,KAAK,KAAK,KAAK,KAAK,MAAMA,EAAQ,KAAK,KAAK,OAAO,YAAc,KAAK,CAAC,EACvED,EAAI,IAAI,YAAY,KAAK,KAAK,OAAQ,CAAC,EACvC,KAAK,GAAK,IAAI,WAAW,KAAK,KAAK,OAAQ,IAA6B,IATxE,KAAK,KAAO,IAAI,YAAY,OAAO,CAAE,QAAS,KAAK,KAAKC,EAAQ,KAAK,CAAE,CAAC,EACxE,KAAK,MAAQX,GAAW,CAAE,IAAK,CAAE,OAAQ,KAAK,IAAK,CAAE,CAAC,EACtDU,EAAI,IAAI,YAAY,KAAK,KAAK,OAAQ,CAAC,EACvCA,EAAE,IAAIP,EAAG,GAAgB,EACzB,KAAK,GAAK,IAAI,WAAW,KAAK,KAAK,OAAQ,IAA6B,GAO5EO,EAAE,IAAuB,EAAI,EAC7BA,EAAE,IAAuB,EAAI,EAC7BA,EAAE,IAAuB,EAAI,EAC7B,KAAK,KAAOA,EACZ,KAAK,OAAS,EAClB,CAOA,SAASE,EAAW,CAChB,IAAMC,EAAS,KAAK,KAAK,IAAuB,EAAID,EACpD,GAAI,KAAK,OAASC,EAAQ,CACtB,GAAIA,EAAS,KAAK,SACd,MAAO,GAEX,IAAIC,EAAU,KAAK,OACnB,MAAQA,GAAW,GAAKD,GAAQ,CAEhC,GADAC,EAAU,KAAK,IAAIA,EAAS,KAAK,QAAQ,EACrCA,EAAUD,EACV,MAAO,GAEX,GAAIC,EAAU,KAAgC,KAAK,KAAK,OAAO,WAAY,CACvE,IAAMC,EAAW,KAAK,MAAMD,EAAU,KAAgC,KAAK,KAAK,OAAO,YAAc,KAAK,EAC1G,KAAK,KAAK,KAAKC,CAAQ,EACvB,KAAK,KAAO,IAAI,YAAY,KAAK,KAAK,OAAQ,CAAC,EAC/C,KAAK,GAAK,IAAI,WAAW,KAAK,KAAK,OAAQ,IAA6B,CAC5E,CACA,KAAK,OAASD,CAClB,CACA,MAAO,EACX,CAOA,IAAIE,EAAM,CACN,GAAI,CAAC,KAAK,OAAS,KAAK,OACpB,MAAO,GAEX,GAAI,KAAK,SAASA,EAAK,MAAM,EACzB,MAAO,GAEX,IAAMN,EAAI,KAAK,KACf,YAAK,GAAG,IAAIM,EAAMN,EAAE,IAAuB,CAAC,EAC5CA,EAAE,IAAuB,GAAKM,EAAK,OAE5BN,EAAE,IAAuB,EAAIA,EAAE,IAAuB,GAAK,OAC5D,KAAK,MAAM,QAAQ,IAAI,EACvB,CACV,CAKA,KAAM,CACF,YAAK,OAAS,GACP,KAAK,MACN,KAAK,MAAM,QAAQ,IAAI,EACvB,EACV,CAIA,IAAI,aAAc,CACd,OAAO,KAAK,MACN,KAAK,KAAK,IAAuB,EACjC,CACV,CAIA,IAAI,WAAY,CACZ,OAAO,KAAK,MACN,KAAK,SAAW,KAAK,KAAK,IAAuB,EACjD,CACV,CACJ,EACAZ,GAAQ,QAAUQ,KCjVlB,IAAAW,GAAAC,EAAAC,IAAA,cACA,OAAO,eAAeA,GAAS,aAAc,CAAE,MAAO,EAAK,CAAC,EAK5D,IAAMC,GAAmB,KACnBC,MAAoBD,GAAiB,QAA2D,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,84BAA84B,CAAkD,EAC3iCE,GAAN,KAAiB,CACb,YAAYC,EAAU,CAClB,KAAK,SAAWA,EAChB,KAAK,MAAQ,EACb,KAAK,OAAS,CAClB,CACA,OAAOC,EAAG,CACN,KAAK,MAAQA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,EAAIA,EAAE,CAAC,EACtD,KAAK,OAASA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,GAAKA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,EACzD,IAAMC,EAAS,KAAK,MAAQ,KAAK,OAC3BC,EAAKD,EAAS,EACdE,EAAKH,EAAE,OAwBPI,EAAQ,KAAK,IAAIF,EAAIC,CAAE,GAAK,KAAK,IAAID,EAAIC,CAAE,GAAK,GAAK,KACtD,KAAK,MAID,KAAK,KAAK,OAAO,WAAaC,IACnC,KAAK,KAAK,KAAK,KAAK,MAAMA,EAAQ,KAAK,KAAK,OAAO,YAAc,KAAK,CAAC,EACvE,KAAK,GAAK,OALV,KAAK,KAAO,IAAI,YAAY,OAAO,CAAE,QAAS,KAAK,KAAKA,EAAQ,KAAK,CAAE,CAAC,EACxE,KAAK,MAAQP,GAAc,CAAE,IAAK,CAAE,OAAQ,KAAK,IAAK,CAAE,CAAC,GAMxD,KAAK,KACN,KAAK,GAAK,IAAI,WAAW,KAAK,KAAK,MAAM,GAG7C,IAAMQ,EAAU,KAAK,KAAK,OAAO,WAAaF,EAAM,KACpD,YAAK,GAAG,IAAIH,EAAGK,CAAM,EACrB,KAAK,MAAM,QAAQ,IAAIA,EAAQF,EAAIF,CAAM,EAClC,KAAK,GAAG,SAAS,KAAqB,KAAsBC,CAAE,CACzE,CACA,SAAU,CACD,KAAK,OAEN,KAAK,KAAK,OAAO,WAAa,KAAK,WACnC,KAAK,MAAQ,KAAK,GAAK,KAAK,KAAO,KAE3C,CACJ,EACAP,GAAQ,QAAUG,mGCpELQ,GAAA,OAAS,CACpB,WAAY,MACZ,aAAc,KACd,UAAW,MACX,MAAO,wtdCCT,IAAAC,EAAA,IACAC,EAAA,KAIA,SAASC,GAAa,EAAS,CAC7B,GAAI,OAAO,OAAW,IACpB,OAAO,OAAO,KAAK,EAAG,QAAQ,EAEhC,IAAMC,EAAa,KAAK,CAAC,EACnBC,EAAS,IAAI,WAAWD,EAAW,MAAM,EAC/C,QAAS,EAAI,EAAG,EAAIC,EAAO,OAAQ,EAAE,EACnCA,EAAO,CAAC,EAAID,EAAW,WAAW,CAAC,EAErC,OAAOC,CACT,CAEA,IAAMC,GAAaH,GAAaD,EAAA,OAAO,KAAK,EACxCK,EAGEC,GAAc,IAAI,YAIlBC,GAAN,KAAmB,CAAnB,aAAA,CACS,KAAA,YAAeC,GAAkB,EACjC,KAAA,YAAeC,GAAoB,CAO5C,CANS,YAAYD,EAAa,CAC9B,OAAO,KAAK,YAAYA,CAAK,CAC/B,CACO,YAAYC,EAAY,CAC7B,OAAO,KAAK,YAAYA,CAAI,CAC9B,GAKIC,GAA2C,CAC/C,YAAa,KAAO,MACpB,WAAYX,EAAA,mBACZ,UAAWA,EAAA,mBACX,QAASA,EAAA,oBACT,aAAcC,EAAA,OAAO,aACrB,SAAU,IAQZ,SAAgBW,GAAaC,EAAsB,CACjD,IAAMC,EAAU,IAAIN,GACdO,EAAY,CAChB,IAAK,CACH,YAAaD,EAAQ,YAAY,KAAKA,CAAO,EAC7C,YAAaA,EAAQ,YAAY,KAAKA,CAAO,IAGjD,OAAO,YAAY,YAAYR,GAAeD,GAAYU,CAAS,EAChE,KAAMC,IACLV,EAAcA,GAAeU,EAAK,OAC3B,IAAIC,EAAQJ,EAAMG,EAAK,UAAYA,EAAMF,CAAO,EACxD,CACL,CAbAI,EAAA,aAAAN,GAgDA,IAAaK,EAAb,KAAoB,CAwGlB,YACEJ,EACAM,EACAC,EAAwB,CAGxB,GAvGM,KAAA,cAAgBnB,EAAA,OAAO,UAAY,EAEnC,KAAA,QAAuBM,GACvB,KAAA,YAAwB,CAAA,EACxB,KAAA,UAAY,EACZ,KAAA,UAAYN,EAAA,OAAO,UACnB,KAAA,YAAc,EACd,KAAA,eAAiB,EA+FvB,KAAK,MAAQ,OAAO,OAAO,CAAA,EAAIU,GAAiBE,CAAI,EAChD,KAAK,MAAM,aAAeZ,EAAA,OAAO,aACnC,MAAM,IAAI,MAAM,+CAA+CA,EAAA,OAAO,YAAY,EAAE,EAEtF,GAAKkB,EASHC,EAAU,YAAc,KAAK,aAAa,KAAK,IAAI,EACnDA,EAAU,YAAc,KAAK,YAAY,KAAK,IAAI,MAVpC,CACd,IAAMC,EAASf,IAAgBA,EAAc,IAAI,YAAY,OAAOD,EAAU,GAC9Ec,EAAY,IAAI,YAAY,SAASE,EAAQ,CAC3C,IAAK,CACH,YAAa,KAAK,aAAa,KAAK,IAAI,EACxC,YAAa,KAAK,YAAY,KAAK,IAAI,GAE1C,EAKH,KAAK,UAAYF,EACjB,KAAK,MAAQ,KAAK,UAAU,QAC5B,KAAK,OAAS,IAAI,WAAW,KAAK,MAAM,OAAO,OAAQ,KAAK,MAAM,kBAAiB,EAAIlB,EAAA,OAAO,UAAU,EACxG,KAAK,QAAU,IAAI,YAAY,KAAK,MAAM,OAAO,OAAQ,KAAK,MAAM,kBAAiB,EAAI,EAAE,EAC3F,KAAK,SAAW,IAAI,YAAY,KAAK,MAAM,OAAO,OAAQ,KAAK,MAAM,oBAAmB,EAAIA,EAAA,OAAO,YAAY,EAC/G,KAAK,SAAS,IAAI,KAAK,MAAM,OAAO,EACpC,KAAK,MAAQ,IAAI,YAAY,KAAK,MAAM,OAAO,OAAQ,KAAK,MAAM,eAAc,CAAE,EAClF,KAAK,MAAM,KAAKD,EAAA,mBAAoB,EAAG,KAAK,MAAM,aAAc,CAAC,CACnE,CApHA,IAAY,YAAU,CAAe,OAAO,KAAK,QAAQ,CAAC,CAAG,CAC7D,IAAY,WAAS,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CAC1D,IAAY,cAAY,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CAC7D,IAAY,eAAa,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CAC9D,IAAY,QAAM,CAAa,OAAO,KAAK,QAAQ,CAAC,EAAI,KAAK,QAAQ,CAAC,EAAI,EAAI,CAAG,CACjF,IAAY,SAAO,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CACxD,IAAY,QAAM,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CACvD,IAAY,OAAK,CAAgB,OAAO,KAAK,QAAQ,EAAE,CAAG,CAC1D,IAAY,eAAa,CAAa,OAAO,KAAK,QAAQ,EAAE,CAAG,CAEvD,YAAYU,EAAe,CACjC,GAAIA,IAAI,EAAmB,CACzB,IAAMY,EAAS,KAAK,MAAQ,KAAK,OACjC,GAAIA,EAAS,KAAK,QAAQ,OAAQ,CAChC,GAAI,KAAK,MAAM,aAAeA,EAAS,EAAI,KAAK,MAAM,YACpD,WAAK,QAAO,EACN,IAAI,MAAM,4BAA4B,EAE9C,KAAK,QAAU,IAAI,YAAYA,CAAM,EAEvC,KAAK,UAAY,KAAK,eACbZ,IAAI,EACb,GAAI,KAAK,SAAW,EAAG,CAErB,IAAMY,EAAS,KAAK,IAAI,KAAK,aAAcrB,EAAA,OAAO,SAAS,EAAI,KAAK,cACpE,GAAIqB,EAAS,KAAK,QAAQ,OAAQ,CAChC,GAAI,KAAK,MAAM,aAAeA,EAAS,EAAI,KAAK,MAAM,YACpD,WAAK,QAAO,EACN,IAAI,MAAM,4BAA4B,EAE9C,KAAK,QAAU,IAAI,YAAYA,CAAM,QAInC,KAAK,QAAQ,OAAS,QACxB,KAAK,QAAU,IAAI,YAAY,KAAK,GAI1C,MAAO,EACT,CAEQ,SAASC,EAAgBC,EAAwB,CACvD,IAAMF,EAASC,EAASC,EACxB,GAAIF,EAAS,KAAK,QAAQ,OAAQ,CAChC,GAAI,KAAK,MAAM,aAAeA,EAAS,EAAI,KAAK,MAAM,YACpD,WAAK,QAAO,EACN,IAAI,MAAM,4BAA4B,EAG9C,IAAMG,EAAY,IAAI,YAAY,KAAK,KAAKH,EAAS,KAAK,EAAI,KAAK,EACnEG,EAAU,IAAI,KAAK,OAAO,EAC1B,KAAK,QAAUA,EAEnB,CAEQ,aAAahB,EAAa,CAChC,IAAMiB,EAAM,KAAK,cACbH,EAAS,KAAK,YAClB,GAAI,KAAK,QAAK,EAAmB,CAC/B,IAAII,EAAY,KAAK,OAAS,KAAK,eAC/BC,EAAI,EACR,KAAOA,EAAI,GAAKD,EAAY,GAC1B,KAAK,QAAQ,IAAI,KAAK,MAAM,SAASD,EAAME,EAAGF,EAAME,EAAInB,CAAK,EAAGc,EAASd,EAAQmB,CAAC,EAClFA,IACAD,IAEF,KAAK,aAAelB,EAAQmB,EAC5B,KAAK,gBAAkBA,UACd,KAAK,QAAK,EAAmB,CACtC,KAAK,SAASL,EAAQd,EAAQ,CAAC,EAC/B,KAAK,UAAY,KAAK,IAAI,KAAK,UAAWA,CAAK,EAC/C,KAAK,UAAY,KAAK,IAAI,KAAK,UAAWA,CAAK,EAC/C,QAASoB,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB,KAAK,QAAQ,IAAI,KAAK,MAAM,SAASH,EAAMG,EAAGH,EAAMG,EAAIpB,CAAK,EAAGc,EAASd,EAAQoB,CAAC,EAEpF,KAAK,YAAY,KAAKpB,CAAK,EAC3B,KAAK,aAAeA,EAAQ,EAC5B,KAAK,gBAAkB,EAEzB,MAAO,EACT,CA0CA,IAAW,OAAK,CACd,OAAO,KAAK,QAAK,EACb,KAAK,OACL,KAAK,IAAI,KAAK,UAAW,KAAK,MAAM,cAAa,CAAE,CACzD,CAOA,IAAW,QAAM,CACf,OAAO,KAAK,QAAK,EACb,KAAK,QACL,KAAK,MAAM,cAAa,EACtB,KAAK,YAAY,OAAS,EAAI,KAAK,MAAM,eAAc,EACvD,KAAK,YAAY,OAAS,CAClC,CAKA,IAAW,SAAO,CAChB,OAAO,KAAK,SAAS,SAAS,EAAG,KAAK,aAAa,CACrD,CAWA,IAAW,aAAW,CACpB,OAAO,KAAK,QAAQ,WAAa,KAAK,MAAM,OAAO,OAAO,WAAa,EAAI,KAAK,YAAY,MAC9F,CAKA,IAAW,YAAU,CACnB,MAAO,CACL,MAAO,KAAK,MACZ,OAAQ,KAAK,OACb,KAAM,KAAK,MACX,MAAO,KAAK,OACZ,SAAU,CAAC,CAAC,KAAK,UACjB,aAAc,KAAK,cACnB,UAAW,KAAK,WAChB,SAAU,KAAK,YACf,iBAAkB,CAChB,UAAW,KAAK,QAAQ,CAAC,EACzB,YAAa,KAAK,QAAQ,CAAC,EAC3B,MAAO,KAAK,aACZ,OAAQ,KAAK,eAGnB,CAOO,KACLqB,EAAsB,KAAK,MAAM,UACjCC,EAA8B,KAAK,MAAM,QACzCC,EAAuB,KAAK,MAAM,aAClCC,EAAoB,KAAK,MAAM,SAAQ,CAEvC,KAAK,MAAM,KAAK,KAAK,MAAM,WAAYH,EAAWE,EAAcC,EAAW,EAAI,CAAC,EAC5EF,GACF,KAAK,SAAS,IAAIA,EAAQ,SAAS,EAAG9B,EAAA,OAAO,YAAY,CAAC,EAE5D,KAAK,YAAY,OAAS,EAC1B,KAAK,UAAY,EACjB,KAAK,UAAYA,EAAA,OAAO,UACxB,KAAK,YAAc,EACnB,KAAK,eAAiB,CACxB,CAMO,OAAOiC,EAAsBC,EAAgB,EAAGC,EAAcF,EAAK,OAAM,CAC9E,IAAIG,EAAIF,EACR,KAAOE,EAAID,GAAK,CACd,IAAME,EAAS,KAAK,IAAIF,EAAMC,EAAGpC,EAAA,OAAO,UAAU,EAClD,KAAK,OAAO,IAAIiC,EAAK,SAASG,EAAGA,GAAKC,CAAM,CAAC,EAC7C,KAAK,MAAM,OAAO,EAAGA,CAAM,EAE/B,CAOO,aAAaJ,EAAcC,EAAgB,EAAGC,EAAcF,EAAK,OAAM,CAC5E,IAAIG,EAAIF,EACR,KAAOE,EAAID,GAAK,CACd,IAAME,EAAS,KAAK,IAAIF,EAAMC,EAAGpC,EAAA,OAAO,UAAU,EAClD,QAAS4B,EAAI,EAAGU,EAAIF,EAAGR,EAAIS,EAAQ,EAAET,EAAG,EAAEU,EACxC,KAAK,OAAOV,CAAC,EAAIK,EAAK,WAAWK,CAAC,EAEpCF,GAAKC,EACL,KAAK,MAAM,OAAO,EAAGA,CAAM,EAE/B,CAMA,IAAW,QAAM,CACf,GAAI,KAAK,QAAK,GAAqB,CAAC,KAAK,OAAS,CAAC,KAAK,OACtD,OAAO/B,GAIT,IAAMiC,EAAe,KAAK,MAAM,cAAa,EAE7C,GAAI,KAAK,QAAK,EAAmB,CAC/B,IAAIb,EAAY,KAAK,OAAS,KAAK,eACnC,GAAIA,EAAY,EAAG,CACjB,IAAMD,EAAM,KAAK,cACbH,EAAS,KAAK,YACdK,EAAI,EACR,KAAOA,EAAI,GAAKD,EAAY,GAC1B,KAAK,QAAQ,IAAI,KAAK,MAAM,SAASD,EAAME,EAAGF,EAAME,EAAIY,CAAY,EAAGjB,EAASiB,EAAeZ,CAAC,EAChGA,IACAD,IAEEA,GACF,KAAK,QAAQ,KAAK,KAAK,WAAYJ,EAASiB,EAAeZ,CAAC,EAGhE,OAAO,KAAK,QAAQ,SAAS,EAAG,KAAK,MAAQ,KAAK,MAAM,EAG1D,GAAI,KAAK,QAAK,EAAmB,CAC/B,GAAI,KAAK,YAAc,KAAK,UAAW,CACrC,IAAIa,EAAS,GACb,GAAID,EACF,GAAIA,IAAiB,KAAK,UACxBC,EAAS,OACJ,CACL,IAAMf,EAAM,KAAK,cACbH,EAAS,KAAK,YAClB,KAAK,SAASA,EAAQiB,EAAe,CAAC,EACtC,QAASX,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB,KAAK,QAAQ,IAAI,KAAK,MAAM,SAASH,EAAMG,EAAGH,EAAMG,EAAIW,CAAY,EAAGjB,EAASiB,EAAeX,CAAC,EAItG,GAAI,CAACY,EACH,OAAO,KAAK,QAAQ,SAAS,EAAG,KAAK,MAAQ,KAAK,MAAM,EAM5D,IAAMC,EAAQ,IAAI,YAAY,KAAK,MAAQ,KAAK,MAAM,EACtDA,EAAM,KAAK,KAAK,UAAU,EAC1B,IAAIC,EAAc,EACdR,EAAQ,EACZ,QAASN,EAAI,EAAGA,EAAI,KAAK,YAAY,OAAQ,EAAEA,EAAG,CAChD,IAAMe,EAAK,KAAK,YAAYf,CAAC,EAC7B,QAASQ,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvBK,EAAM,IAAI,KAAK,QAAQ,SAASP,EAAOA,GAASS,CAAE,EAAGD,CAAW,EAChEA,GAAe,KAAK,MAIxB,GAAIH,EAAc,CAChB,IAAMd,EAAM,KAAK,cAEXmB,EAAgB,KAAK,MAAM,eAAc,EAC/C,QAAShB,EAAI,EAAGA,EAAIgB,EAAe,EAAEhB,EACnCa,EAAM,IAAI,KAAK,MAAM,SAAShB,EAAMG,EAAGH,EAAMG,EAAIW,CAAY,EAAGG,EAAc,KAAK,MAAQd,CAAC,EAGhG,OAAOa,EAIT,OAAOnC,EACT,CAMA,IAAW,OAAK,CACd,OAAO,IAAI,kBAAkB,KAAK,OAAO,OAAQ,EAAG,KAAK,MAAQ,KAAK,OAAS,CAAC,CAClF,CAcO,SAAO,CACZ,KAAK,QAAUA,GACf,KAAK,YAAY,OAAS,EAC1B,KAAK,UAAY,EACjB,KAAK,UAAYN,EAAA,OAAO,UAGxB,KAAK,MAAM,KAAKD,EAAA,mBAAoB,EAAG,KAAK,MAAM,aAAc,CAAC,CACnE,GAxWFkB,EAAA,QAAAD,EA2XC,SAAgB6B,GACfZ,EACArB,EAAsB,CAEtB,IAAMkC,EAAM,IAAI9B,EAAQJ,CAAI,EAC5B,OAAAkC,EAAI,KAAI,EACR,OAAOb,GAAS,SAAWa,EAAI,aAAab,CAAI,EAAIa,EAAI,OAAOb,CAAI,EAC5D,CACL,MAAOa,EAAI,MACX,OAAQA,EAAI,OACZ,OAAQA,EAAI,OACZ,MAAOA,EAAI,MAEf,CAbC7B,EAAA,OAAA4B,GAoBM,eAAeE,GACpBd,EACArB,EAAsB,CAEtB,IAAMkC,EAAM,MAAMnC,GAAaC,CAAI,EACnC,OAAAkC,EAAI,KAAI,EACR,OAAOb,GAAS,SAAWa,EAAI,aAAab,CAAI,EAAIa,EAAI,OAAOb,CAAI,EAC5D,CACL,MAAOa,EAAI,MACX,OAAQA,EAAI,OACZ,OAAQA,EAAI,OACZ,MAAOA,EAAI,MAEf,CAbA7B,EAAA,YAAA8B,KC7eO,SAASC,EAAaC,EAA6B,CACxD,MAAO,CAAE,QAASA,CAAG,CACvB,CAuBO,IAAMC,EAAN,KAA6C,CAA7C,cACL,KAAiB,aAAe,IAAI,IACpC,KAAQ,YAAc,GAEtB,IAAW,YAAsB,CAC/B,OAAO,KAAK,WACd,CAEO,IAA2BC,EAAS,CACzC,OAAI,KAAK,YACPA,EAAE,QAAQ,EAEV,KAAK,aAAa,IAAIA,CAAC,EAElBA,CACT,CAEO,SAAgB,CACrB,GAAI,MAAK,YAGT,MAAK,YAAc,GACnB,QAAWC,KAAK,KAAK,aACnBA,EAAE,QAAQ,EAEZ,KAAK,aAAa,MAAM,EAC1B,CAEO,OAAc,CACnB,QAAWA,KAAK,KAAK,aACnBA,EAAE,QAAQ,EAEZ,KAAK,aAAa,MAAM,CAC1B,CACF,EAEsBC,EAAf,KAAiD,CAAjD,cAGL,KAAmB,OAAS,IAAIH,EAEzB,SAAgB,CACrB,KAAK,OAAO,QAAQ,CACtB,CAEU,UAAiCC,EAAS,CAClD,OAAO,KAAK,OAAO,IAAIA,CAAC,CAC1B,CACF,EAZsBE,EACG,KAAoB,OAAO,OAAO,CAAE,SAAU,CAAE,CAAE,CAAC,EAarE,IAAMC,EAAN,KAAsE,CAAtE,cAEL,KAAQ,YAAc,GAEtB,IAAW,OAAuB,CAChC,OAAO,KAAK,YAAc,OAAY,KAAK,MAC7C,CAEA,IAAW,MAAMC,EAAsB,CACjC,KAAK,aAAeA,IAAU,KAAK,SAGvC,KAAK,QAAQ,QAAQ,EACrB,KAAK,OAASA,EAChB,CAEO,OAAc,CACnB,KAAK,MAAQ,MACf,CAEO,SAAgB,CACrB,KAAK,YAAc,GACnB,KAAK,QAAQ,QAAQ,EACrB,KAAK,OAAS,MAChB,CACF,EClGO,IAAMC,EAAN,KAAiB,CAAjB,cACL,KAAQ,WAAqD,CAAC,EAC9D,KAAQ,UAAY,GAGpB,IAAW,OAAmB,CAC5B,OAAI,KAAK,OACA,KAAK,QAEd,KAAK,OAAS,CAACC,EAAyBC,EAAgBC,IAAkD,CACxG,GAAI,KAAK,UACP,OAAOC,EAAa,IAAM,CAAC,CAAC,EAG9B,IAAMC,EAAQ,CAAE,GAAIJ,EAAU,SAAAC,CAAS,EACvC,KAAK,WAAa,KAAK,WAAW,MAAM,EACxC,KAAK,WAAW,KAAKG,CAAK,EAE1B,IAAMC,EAASF,EAAa,IAAM,CAChC,IAAMG,EAAM,KAAK,WAAW,QAAQF,CAAK,EACrCE,IAAQ,KACV,KAAK,WAAa,KAAK,WAAW,MAAM,EACxC,KAAK,WAAW,OAAOA,EAAK,CAAC,EAEjC,CAAC,EAED,OAAIJ,IACE,MAAM,QAAQA,CAAW,EAC3BA,EAAY,KAAKG,CAAM,EAEvBH,EAAY,IAAIG,CAAM,GAInBA,CACT,EACO,KAAK,OACd,CAEO,KAAKE,EAAgB,CAC1B,GAAI,KAAK,WAAa,CAAC,KAAK,WAAW,OACrC,OAEF,GAAI,KAAK,WAAW,SAAW,EAAG,CAChC,KAAK,WAAW,CAAC,EAAE,GAAG,KAAK,KAAK,WAAW,CAAC,EAAE,SAAUA,CAAK,EAC7D,MACF,CACA,IAAMC,EAAY,KAAK,WACvB,QAAS,EAAI,EAAGC,EAAMD,EAAU,OAAQ,EAAIC,EAAK,EAAE,EACjDD,EAAU,CAAC,EAAE,GAAG,KAAKA,EAAU,CAAC,EAAE,SAAUD,CAAK,CAErD,CAEO,SAAgB,CACjB,KAAK,YAGT,KAAK,UAAY,GACjB,KAAK,WAAW,OAAS,EAC3B,CACF,EAEiBG,OAAV,CACE,SAASC,EAAWC,EAAiBC,EAA6B,CACvE,OAAOD,EAAKE,GAAKD,EAAG,KAAKC,CAAC,CAAC,CAC7B,CAFOJ,EAAS,QAAAC,EAIT,SAASI,EAAUR,EAAkBQ,EAA6B,CACvE,MAAO,CAACf,EAAyBC,EAAgBC,IACxCK,EAAMS,GAAKhB,EAAS,KAAKC,EAAUc,EAAIC,CAAC,CAAC,EAAG,OAAWd,CAAW,CAE7E,CAJOQ,EAAS,IAAAK,EAQT,SAASE,KAAUC,EAAgC,CACxD,MAAO,CAAClB,EAAyBC,EAAgBC,IAAkD,CACjG,IAAMiB,EAAQ,IAAIC,EAClB,QAAWb,KAASW,EAClBC,EAAM,IAAIZ,EAAMO,GAAKd,EAAS,KAAKC,EAAUa,CAAC,CAAC,CAAC,EAElD,OAAIZ,IACE,MAAM,QAAQA,CAAW,EAC3BA,EAAY,KAAKiB,CAAK,EAEtBjB,EAAY,IAAIiB,CAAK,GAGlBA,CACT,CACF,CAfOT,EAAS,IAAAO,EAmBT,SAASI,EAAmBd,EAAkBe,EAAqCC,EAA0B,CAClH,OAAAD,EAAQC,CAAO,EACRhB,EAAMO,GAAKQ,EAAQR,CAAC,CAAC,CAC9B,CAHOJ,EAAS,gBAAAW,IAhCDX,KAAA,ICvEjB,IAAAc,GAA2B,OAgBpB,IAAMC,EAAN,MAAMC,UAAsBC,CAAkC,CAmDnE,YAAoBC,EAAyB,CAC3C,MAAM,EADY,eAAAA,EAhDpB,KAAQ,QAAU,IAAI,IAGtB,KAAQ,gBAAkB,KAAK,UAAU,IAAIC,CAAmB,EA+C9D,KAAK,SAAW,KAAK,UAAU,MAAM,KACrC,KAAK,UAAU,MAAM,KAAQC,GAA8B,CACzD,KAAK,UAAU,KAAK,KAAK,UAAU,MAAOA,CAAM,EAChD,KAAK,MAAM,CACb,EACI,KAAK,UAAU,MAAM,eACvB,KAAK,MAAM,EAGb,KAAK,gBAAgB,MAAQ,KAAK,UAAU,MAAM,eAAe,eAAeC,GAAU,CACpFA,IAAW,aACb,KAAK,cAAc,EACnB,KAAK,gBAAgB,YAAY,EAAG,KAAK,UAAU,IAAI,EAE3D,CAAC,EACD,KAAK,UAAUC,EAAa,IAAM,CAChC,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,QAAQ,EAC5B,KAAK,UAAU,OAAS,KAAK,WAC/B,KAAK,UAAU,MAAM,KAAO,KAAK,SACjC,KAAK,SAAW,QAEd,KAAK,gBAAkB,KAAK,kBAC9B,KAAK,eAAe,YAAc,KAAK,gBACvC,KAAK,gBAAkB,QAEzB,KAAK,eAAiB,OACtB,KAAK,QAAQ,MAAM,EACnB,KAAK,oBAAoB,MAAM,EAC/B,KAAK,mBAAqB,OAC1B,KAAK,aAAe,MACtB,CAAC,CAAC,CACJ,CAnFA,IAAW,QAAwC,CAAE,OAAO,KAAK,QAAQ,IAAI,KAAK,GAAG,MAAQ,CAU7F,OAAc,aAAaC,EAAqCC,EAAeC,EAAmC,CAUhH,IAAMC,GAAUH,GAAiB,UAAU,cAAc,QAAQ,EACjE,OAAAG,EAAO,MAAQF,EAAQ,EACvBE,EAAO,OAASD,EAAS,EAClBC,CACT,CAGA,OAAc,gBAAgBC,EAA+BH,EAAeC,EAAgBG,EAAiC,CAC3H,GAAI,OAAO,WAAc,WAAY,CACnC,IAAMC,EAAUF,EAAI,gBAAgBH,EAAOC,CAAM,EACjD,OAAIG,GACFC,EAAQ,KAAK,IAAI,IAAI,kBAAkBD,EAAQ,EAAGJ,EAAQC,EAAS,CAAC,CAAC,EAEhEI,CACT,CACA,OAAOD,EACH,IAAI,UAAU,IAAI,kBAAkBA,EAAQ,EAAGJ,EAAQC,EAAS,CAAC,EAAGD,EAAOC,CAAM,EACjF,IAAI,UAAUD,EAAOC,CAAM,CACjC,CAGA,OAAc,kBAAkBK,EAA0D,CACxF,OAAI,OAAO,mBAAsB,WACxB,QAAQ,QAAQ,MAAS,EAE3B,kBAAkBA,CAAG,CAC9B,CA0CO,gBAAgBC,EAAsB,CACvCA,EACE,CAAC,KAAK,cAAgB,KAAK,SAAS,SAAW,IACjD,KAAK,mBAAmB,KAAK,IAAI,KAAK,SAAS,OAAS,EAAG,EAA4B,CAAC,GAG1F,KAAK,oBAAoB,MAAM,EAC/B,KAAK,mBAAqB,OAC1B,KAAK,aAAe,QAEtB,KAAK,gBAAgB,YAAY,EAAG,KAAK,UAAU,IAAI,CACzD,CAMA,IAAW,YAA4C,CACrD,OAAO,KAAK,UAAU,UACxB,CAKA,IAAW,UAAsB,CAC/B,MAAO,CACL,MAAO,KAAK,YAAY,IAAI,KAAK,OAAS,GAC1C,OAAQ,KAAK,YAAY,IAAI,KAAK,QAAU,EAC9C,CACF,CAKO,WAAWC,EAAeC,EAAaC,EAA0B,CACtE,IAAMC,EAAIH,GAAS,KAAK,YAAY,IAAI,KAAK,QAAU,GACjDI,EAAI,KAAK,YAAY,IAAI,OAAO,OAAS,EACzCC,GAAKJ,EAAM,EAAID,IAAU,KAAK,YAAY,IAAI,KAAK,QAAU,IAC/D,CAACE,GAASA,IAAU,QACtB,KAAK,QAAQ,IAAI,KAAK,GAAG,UAAU,EAAGC,EAAGC,EAAGC,CAAC,GAE3C,CAACH,GAASA,IAAU,WACtB,KAAK,QAAQ,IAAI,QAAQ,GAAG,UAAU,EAAGC,EAAGC,EAAGC,CAAC,CAEpD,CAKO,SAASH,EAA0B,CACxC,GAAI,CAACA,GAASA,IAAU,MAAO,CAC7B,IAAMP,EAAM,KAAK,QAAQ,IAAI,KAAK,EAClCA,GAAK,UAAU,EAAG,EAAGA,EAAI,OAAO,MAAOA,EAAI,OAAO,MAAM,CAC1D,CACA,GAAI,CAACO,GAASA,IAAU,SAAU,CAChC,IAAMP,EAAM,KAAK,QAAQ,IAAI,QAAQ,EACrCA,GAAK,UAAU,EAAG,EAAGA,EAAI,OAAO,MAAOA,EAAI,OAAO,MAAM,CAC1D,CACF,CAKO,KAAKW,EAAqBC,EAAgBC,EAAaC,EAAaC,EAAgB,EAAS,CAClG,IAAMf,EAAM,KAAK,QAAQ,IAAIW,EAAQ,KAAK,EAC1C,GAAI,CAACX,EACH,OAEF,GAAM,CAAE,MAAAH,EAAO,OAAAC,CAAO,EAAI,KAAK,SAG/B,GAAID,IAAU,IAAMC,IAAW,GAC7B,OAGF,KAAK,cAAca,EAASd,EAAOC,CAAM,EACzC,IAAMK,EAAMQ,EAAQ,OACd,CAAE,MAAOK,EAAa,OAAQC,CAAa,EAAIN,EAAQ,eACvDO,EAAO,KAAK,KAAKf,EAAI,MAAQa,CAAW,EAExCG,EAAMP,EAASM,EAAQF,EACvBI,EAAK,KAAK,MAAMR,EAASM,CAAI,EAAID,EACjCI,EAAKR,EAAMhB,EACXyB,EAAKR,EAAMhB,EAGXyB,EAAaR,EAAQC,EAAcG,EAAKhB,EAAI,MAAQA,EAAI,MAAQgB,EAAKJ,EAAQC,EAC7EQ,EAAcJ,EAAKH,EAAed,EAAI,OAASA,EAAI,OAASiB,EAAKH,EAMvEjB,EAAI,UACFG,EACA,KAAK,MAAMgB,CAAE,EAAG,KAAK,MAAMC,CAAE,EAAG,KAAK,KAAKG,CAAU,EAAG,KAAK,KAAKC,CAAW,EAC5E,KAAK,MAAMH,CAAE,EAAG,KAAK,MAAMC,CAAE,EAAG,KAAK,KAAKC,EAAa1B,EAAQmB,CAAW,EAAG,KAAK,KAAKQ,EAAc1B,EAASmB,CAAY,CAC5H,CACF,CAKO,YAAYN,EAAqBC,EAA+C,CACrF,GAAM,CAAE,MAAAf,EAAO,OAAAC,CAAO,EAAI,KAAK,SAE/B,GAAID,IAAU,IAAMC,IAAW,GAC7B,OAEF,KAAK,cAAca,EAASd,EAAOC,CAAM,EACzC,IAAMK,EAAMQ,EAAQ,OACd,CAAE,MAAOK,EAAa,OAAQC,CAAa,EAAIN,EAAQ,eACvDO,EAAO,KAAK,KAAKf,EAAI,MAAQa,CAAW,EACxCG,EAAMP,EAASM,EAAQF,EACvBI,EAAK,KAAK,MAAMR,EAASM,CAAI,EAAID,EACjCM,EAAaP,EAAcG,EAAKhB,EAAI,MAAQA,EAAI,MAAQgB,EAAKH,EAC7DQ,EAAcJ,EAAKH,EAAed,EAAI,OAASA,EAAI,OAASiB,EAAKH,EAEjElB,EAASV,EAAc,aAAa,KAAK,SAAU,KAAK,KAAKkC,EAAa1B,EAAQmB,CAAW,EAAG,KAAK,KAAKQ,EAAc1B,EAASmB,CAAY,CAAC,EAC9IjB,EAAMD,EAAO,WAAW,IAAI,EAClC,GAAIC,EACF,OAAAA,EAAI,UACFG,EACA,KAAK,MAAMgB,CAAE,EAAG,KAAK,MAAMC,CAAE,EAAG,KAAK,MAAMG,CAAU,EAAG,KAAK,MAAMC,CAAW,EAC9E,EAAG,EAAGzB,EAAO,MAAOA,EAAO,MAC7B,EACOA,CAEX,CAKO,gBAAgBc,EAAaC,EAAaC,EAAgB,EAAS,CACxE,IAAMf,EAAM,KAAK,QAAQ,IAAI,KAAK,EAClC,GAAIA,EAAK,CACP,GAAM,CAAE,MAAAH,EAAO,OAAAC,CAAO,EAAI,KAAK,SAY/B,GATID,IAAU,IAAMC,IAAW,KAI1B,KAAK,aAECA,GAAU,KAAK,aAAc,QACtC,KAAK,mBAAmBA,EAAS,CAAC,EAFlC,KAAK,mBAAmB,KAAK,IAAIA,EAAS,EAAG,EAA4B,CAAC,EAIxE,CAAC,KAAK,cAAc,OACxBE,EAAI,UACF,KAAK,oBAAsB,KAAK,aAChCa,EAAMhB,EACLiB,EAAMhB,EAAU,EAAI,EAAI,EACzBD,EAAQkB,EACRjB,EACAe,EAAMhB,EACNiB,EAAMhB,EACND,EAAQkB,EACRjB,CACF,CACF,CACF,CAMO,eAAsB,CAC3B,IAAMW,EAAI,KAAK,YAAY,IAAI,OAAO,OAAS,EACzCC,EAAI,KAAK,YAAY,IAAI,OAAO,QAAU,EAChD,QAAWV,KAAO,KAAK,QAAQ,OAAO,GAChCA,EAAI,OAAO,QAAUS,GAAKT,EAAI,OAAO,SAAWU,KAClDV,EAAI,OAAO,MAAQS,EACnBT,EAAI,OAAO,OAASU,EAG1B,CAKQ,cAAce,EAAkBC,EAAsBC,EAA6B,CACzF,GAAID,IAAiBD,EAAK,eAAe,OAASE,IAAkBF,EAAK,eAAe,OACtF,OAEF,GAAM,CAAE,MAAOG,EAAe,OAAQC,CAAe,EAAIJ,EAAK,aAC9D,GAAIC,IAAiBE,GAAiBD,IAAkBE,EAAgB,CACtEJ,EAAK,OAASA,EAAK,KACnBA,EAAK,eAAe,MAAQG,EAC5BH,EAAK,eAAe,OAASI,EAC7B,MACF,CACA,IAAMC,EAAc,KAAK,KAAKL,EAAK,KAAM,MAAQC,EAAeE,CAAa,EACvEG,EAAe,KAAK,KAAKN,EAAK,KAAM,OAASE,EAAgBE,CAAc,EAEjF,GAAIC,EAAcC,EAAeN,EAAK,KAAM,MAAQA,EAAK,KAAM,OAAQ,CACrEA,EAAK,OAASA,EAAK,KACnBA,EAAK,eAAe,MAAQG,EAC5BH,EAAK,eAAe,OAASI,EAC7B,MACF,CACA,IAAM9B,EAASV,EAAc,aAAa,KAAK,SAAUyC,EAAaC,CAAY,EAC5E/B,EAAMD,EAAO,WAAW,IAAI,EAC9BC,IACFA,EAAI,UAAUyB,EAAK,KAAO,EAAG,EAAG1B,EAAO,MAAOA,EAAO,MAAM,EAC3D0B,EAAK,OAAS1B,EACd0B,EAAK,eAAe,MAAQC,EAC5BD,EAAK,eAAe,OAASE,EAEjC,CAKQ,OAAc,CACpB,KAAK,eAAiB,KAAK,UAAU,MAAM,eAC3C,KAAK,gBAAkB,KAAK,eAAe,YAAY,KAAK,KAAK,cAAc,EAC/E,KAAK,eAAe,YAAeK,GAAkB,CACnD,QAAWC,IAAO,CAAC,GAAG,KAAK,QAAQ,KAAK,CAAC,EACvC,KAAK,mBAAmBA,CAAG,EAE7B,KAAK,iBAAiB,KAAK,KAAK,eAAgBD,CAAQ,CAC1D,CACF,CAEO,iBAAiBzB,EAAoB,MAAa,CAEvD,GAAI,CAAC,KAAK,UAAY,CAAC,KAAK,UAAU,MAAM,cAAe,CACzD,QAAQ,KAAK,oFAAoF,EACjG,MACF,CACA,GAAI,KAAK,QAAQ,IAAIA,CAAK,EACxB,OAEF,IAAMR,EAASV,EAAc,aAC3B,KAAK,SAAU,KAAK,YAAY,IAAI,OAAO,OAAS,EACpD,KAAK,YAAY,IAAI,OAAO,QAAU,CACxC,EACAU,EAAO,UAAU,IAAI,qBAAqBQ,CAAK,EAAE,EACjD,IAAM2B,EAAgB,KAAK,UAAU,MAAM,cAI3CA,EAAc,MAAM,UAAY,UAC5B3B,IAAU,UAKZR,EAAO,MAAM,OAAS,KACtBmC,EAAc,aAAanC,EAAQmC,EAAc,UAAU,IAK3DnC,EAAO,MAAM,OAAS,IACtBmC,EAAc,YAAYnC,CAAM,GAElC,IAAMC,EAAMD,EAAO,WAAW,KAAM,CAAE,MAAO,EAAK,CAAC,EACnD,GAAI,CAACC,EAAK,CACRD,EAAO,OAAO,EACd,MACF,CACA,KAAK,QAAQ,IAAIQ,EAAOP,CAAG,EAC3B,KAAK,SAASO,CAAK,CACrB,CAEO,mBAAmBA,EAAoB,MAAa,CACzD,IAAMP,EAAM,KAAK,QAAQ,IAAIO,CAAK,EAC9BP,IACFA,EAAI,OAAO,OAAO,EAClB,KAAK,QAAQ,OAAOO,CAAK,EAE7B,CAEO,SAASA,EAA4B,CAC1C,OAAO,KAAK,QAAQ,IAAIA,CAAK,CAC/B,CAEQ,mBAAmBT,EAAiB,GAAoC,CAC9E,KAAK,oBAAoB,MAAM,EAC/B,KAAK,mBAAqB,OAG1B,IAAMqC,EAAS,GACTC,EAAY/C,EAAc,aAAa,KAAK,SAAU8C,EAAQrC,CAAM,EACpEE,EAAMoC,EAAU,WAAW,KAAM,CAAE,MAAO,EAAM,CAAC,EACvD,GAAI,CAACpC,EAAK,OACV,IAAME,EAAUb,EAAc,gBAAgBW,EAAKmC,EAAQrC,CAAM,EAC3DuC,EAAM,IAAI,YAAYnC,EAAQ,KAAK,MAAM,EACzCoC,KAAQ,eAAW,EAAG,EAAG,CAAC,EAC1BC,KAAQ,eAAW,IAAK,IAAK,GAAG,EACtCF,EAAI,KAAKC,CAAK,EACd,QAAS9B,EAAI,EAAGA,EAAIV,EAAQ,EAAEU,EAAG,CAC/B,IAAMgC,EAAQhC,EAAI,EACZiC,EAASjC,EAAI2B,EACnB,QAASO,EAAI,EAAGA,EAAIP,EAAQO,GAAK,EAC/BL,EAAII,EAASC,EAAIF,CAAK,EAAID,CAE9B,CACAvC,EAAI,aAAaE,EAAS,EAAG,CAAC,EAG9B,IAAML,EAAS,OAAO,MAAQsC,EAAS,EAAK,EAAEA,EAAS,IAAM,KAC7D,KAAK,aAAe9C,EAAc,aAAa,KAAK,SAAUQ,EAAOC,CAAM,EAC3E,IAAM6C,EAAO,KAAK,aAAa,WAAW,KAAM,CAAE,MAAO,EAAM,CAAC,EAChE,GAAI,CAACA,EAAM,CACT,KAAK,aAAe,OACpB,MACF,CACA,QAASC,EAAI,EAAGA,EAAI/C,EAAO+C,GAAKT,EAC9BQ,EAAK,UAAUP,EAAWQ,EAAG,CAAC,EAEhC,IAAMC,EAAc,KAAK,aACzBxD,EAAc,kBAAkBwD,CAAW,EAAE,KAAKC,GAAU,CACtD,KAAK,eAAiBD,EAAaC,GAAQ,MAAM,EAChD,KAAK,mBAAqBA,CACjC,CAAC,EAAE,MAAM,IAAM,CAAC,CAAC,CACnB,CAEA,IAAW,UAAiC,CAC1C,OAAO,KAAK,UAAU,MAAM,qBAAqB,OAAO,QAC1D,CACF,ECnaO,IAAMC,EAA+B,CAC1C,MAAO,EACP,OAAQ,EACV,EAQMC,EAAN,MAAMC,CAAkD,CAqDtD,YACEC,EAAc,EACdC,EAAgB,EACTC,EAAU,GACVC,EAAS,GAChB,CAFO,aAAAD,EACA,YAAAC,EAxDT,KAAQ,KAAe,EA4CvB,KAAQ,OAAiB,EAcvB,KAAK,KAAOH,EACZ,KAAK,OAASC,CAChB,CA3DA,IAAW,KAAc,CACvB,OAAI,KAAK,OAEJ,KAAK,KAAO,WACZ,KAAK,gBAAkB,GAGrB,KAAK,IACd,CACA,IAAW,IAAIG,EAAe,CAAE,KAAK,KAAOA,CAAO,CAEnD,IAAW,gBAAiC,CAE1C,OAAI,KAAK,UAGD,KAAK,KAAO,YAA6B,EACnD,CACA,IAAW,eAAeA,EAAuB,CAC/C,KAAK,MAAQ,WACb,KAAK,MAASA,GAAS,GAAM,SAC/B,CAEA,IAAW,gBAAyB,CAClC,OAAO,KAAK,KAAQ,QACtB,CACA,IAAW,eAAeA,EAAe,CACvC,KAAK,MAAQ,UACb,KAAK,MAAQA,EAAS,QACxB,CAEA,IAAW,wBAAiC,CAC1C,IAAMC,GAAO,KAAK,KAAO,aAA4B,GACrD,OAAIA,EAAM,EACDA,EAAM,WAERA,CACT,CACA,IAAW,uBAAuBD,EAAe,CAC/C,KAAK,MAAQ,UACb,KAAK,MAASA,GAAS,GAAM,UAC/B,CAGA,IAAW,OAAgB,CACzB,OAAO,KAAK,MACd,CACA,IAAW,MAAMA,EAAe,CAC9B,KAAK,OAASA,CAChB,CAYO,OAA6B,CASlC,OAAO,IAAIL,EAAmB,KAAK,KAAM,KAAK,OAAQ,KAAK,QAAS,KAAK,MAAM,CACjF,CAEO,SAAmB,CACxB,OAAO,KAAK,iBAAmB,GAAuB,KAAK,SAAW,GAAK,KAAK,UAAY,EAC9F,CACF,EACMO,EAAc,IAAIR,EAUXS,EAAN,KAA0C,CAkB/C,YACUC,EACAC,EACAC,EACR,CAHQ,eAAAF,EACA,eAAAC,EACA,WAAAC,EAnBV,KAAQ,QAAmC,IAAI,IAE/C,KAAQ,QAAU,EAElB,KAAQ,UAAY,EAEpB,KAAQ,cAAgB,GAExB,KAAQ,gBAAkB,GAE1B,KAAQ,YAAsB,KAW5B,GAAI,CACF,KAAK,SAAS,KAAK,MAAM,YAAY,CACvC,OAASC,EAAY,CACfA,aAAa,OACf,QAAQ,MAAMA,EAAE,OAAO,EAEzB,QAAQ,KAAK,0BAA0B,KAAK,SAAS,CAAC,KAAK,CAC7D,CACA,KAAK,iBAAmB,CACtB,KAAM,KAAK,UAAU,KACrB,KAAM,KAAK,UAAU,IACvB,CACF,CAEO,SAAgB,CACrB,KAAK,MAAM,CACb,CAEO,OAAc,CACnB,QAAWC,KAAQ,KAAK,QAAQ,OAAO,EACrCA,EAAK,QAAQ,QAAQ,EAIvB,KAAK,QAAQ,MAAM,EACnB,KAAK,UAAU,SAAS,CAC1B,CAEO,UAAmB,CACxB,OAAO,KAAK,YAAc,EAAI,GAChC,CAEO,SAASR,EAAqB,CACnC,GAAIA,EAAQ,IAAOA,EAAQ,IACzB,MAAM,WAAW,mEAAmE,EAEtF,KAAK,YAAeA,EAAQ,EAAI,MAAa,EAC7C,KAAK,aAAa,CAAC,CACrB,CAEO,UAAmB,CACxB,OAAO,KAAK,iBAAiB,EAAI,EAAI,GACvC,CAEQ,kBAA2B,CACjC,IAAIS,EAAe,EACnB,QAAWD,KAAQ,KAAK,QAAQ,OAAO,EACjCA,EAAK,OACPC,GAAgBD,EAAK,KAAK,MAAQA,EAAK,KAAK,OACxCA,EAAK,QAAUA,EAAK,SAAWA,EAAK,OACtCC,GAAgBD,EAAK,OAAO,MAAQA,EAAK,OAAO,SAItD,OAAOC,CACT,CAEQ,QAAQC,EAAkB,CAChC,IAAMF,EAAO,KAAK,QAAQ,IAAIE,CAAE,EAC3BF,IACL,KAAK,QAAQ,OAAOE,CAAE,EAElB,OAAO,aAAeF,EAAK,gBAAgB,aAC7CA,EAAK,KAAK,MAAM,EAElB,KAAK,iBAAiBE,CAAE,EAC1B,CAKO,eAAsB,CAE3B,IAAMC,EAAO,CAAC,EACd,OAAW,CAACD,EAAIF,CAAI,IAAK,KAAK,QAAQ,QAAQ,EACxCA,EAAK,aAAe,cACtBA,EAAK,QAAQ,QAAQ,EACrBG,EAAK,KAAKD,CAAE,GAGhB,QAAWA,KAAMC,EACf,KAAK,QAAQD,CAAE,EAGjB,KAAK,gBAAkB,GACvB,KAAK,cAAgB,EACvB,CAMO,YAAYA,EAAkB,CACnC,IAAMF,EAAO,KAAK,QAAQ,IAAIE,CAAE,EAC5BF,IACFA,EAAK,QAAQ,QAAQ,EACrB,KAAK,QAAQE,CAAE,EAEnB,CAaO,SAASE,EAAsCC,EAA6B,CAEjF,KAAK,aAAaD,EAAI,MAAQA,EAAI,MAAM,EAGxC,IAAIE,EAAW,KAAK,UAAU,UAC1BA,EAAS,QAAU,IAAMA,EAAS,SAAW,MAC/CA,EAAWrB,GAEb,IAAMsB,EAAO,KAAK,KAAKH,EAAI,MAAQE,EAAS,KAAK,EAC3CE,EAAO,KAAK,KAAKJ,EAAI,OAASE,EAAS,MAAM,EAE7ChB,EAAU,EAAE,KAAK,QAEjBmB,EAAS,KAAK,UAAU,MAAM,OAC9BC,EAAW,KAAK,UAAU,KAC1BC,EAAW,KAAK,UAAU,KAC1BC,EAAUH,EAAO,EACjBI,EAAUJ,EAAO,EACnBK,EAASF,EACTG,EAAY,EAEXV,EAAK,YACRI,EAAO,EAAI,EACXA,EAAO,EAAI,EACXK,EAAS,GAGX,KAAK,UAAU,MAAM,cAAc,iBAAiB,UAAUL,EAAO,CAAC,EACtE,QAASO,EAAM,EAAGA,EAAMR,EAAM,EAAEQ,EAAK,CACnC,IAAMC,EAAOR,EAAO,MAAM,IAAIA,EAAO,EAAIA,EAAO,KAAK,EACrD,QAASS,EAAM,EAAGA,EAAMX,GAClB,EAAAO,EAASI,GAAOR,GADQ,EAAEQ,EAE9B,KAAK,aAAaD,EAAwBH,EAASI,EAAK5B,EAAS0B,EAAMT,EAAOW,CAAG,EACjFH,IAEF,GAAIV,EAAK,UACHW,EAAMR,EAAO,GAAG,KAAK,UAAU,MAAM,cAAc,SAAS,UAE5D,EAAEC,EAAO,GAAKE,EAAU,MAE9BF,EAAO,EAAIK,CACb,CACA,KAAK,UAAU,MAAM,cAAc,iBAAiB,UAAUL,EAAO,CAAC,EAGlEJ,EAAK,UACHA,EAAK,YAAc,MACrBI,EAAO,EAAI,KAAK,IAAIK,EAASP,EAAMG,CAAQ,EAE3CD,EAAO,EAAIK,GAGbL,EAAO,EAAIG,EACXH,EAAO,EAAII,GAIb,IAAMV,EAAO,CAAC,EACd,OAAW,CAACD,EAAIF,CAAI,IAAK,KAAK,QAAQ,QAAQ,EACxCA,EAAK,UAAY,IACnBA,EAAK,QAAQ,QAAQ,EACrBG,EAAK,KAAKD,CAAE,GAGhB,QAAWA,KAAMC,EACf,KAAK,QAAQD,CAAE,EAKjB,IAAMiB,EAAY,KAAK,UAAU,eAAe,CAAC,EACjDA,GAAW,UAAU,IAAM,CACZ,KAAK,QAAQ,IAAI7B,CAAO,GAEnC,KAAK,QAAQA,CAAO,CAExB,CAAC,EAIG,KAAK,UAAU,OAAO,OAAO,OAAS,aACxC,KAAK,kBAAkB,EAIzB,IAAM8B,EAAsB,CAC1B,KAAMhB,EACN,aAAcE,EACd,OAAQF,EACR,eAAgB,CAAE,GAAGE,CAAS,EAC9B,OAAQa,GAAa,OACrB,UAAAJ,EACA,WAAY,KAAK,UAAU,OAAO,OAAO,KACzC,MAAOV,EAAK,MACZ,OAAQA,EAAK,MACf,EAGA,YAAK,QAAQ,IAAIf,EAAS8B,CAAO,EACjC,KAAK,eAAe,EACb9B,CACT,CAQO,OAAO+B,EAA6C,CAEzD,IAAIC,EAAe,GACfC,EAAkB,GACtB,QAAWvB,KAAQ,KAAK,QAAQ,OAAO,EAMrC,GALIA,EAAK,QAAU,SACjBuB,EAAkB,GAElBD,EAAe,GAEbA,GAAgBC,EAAiB,MAIvC,GAAID,GAAgB,CAAC,KAAK,UAAU,SAAS,KAAK,IAChD,KAAK,UAAU,iBAAiB,KAAK,EACjC,CAAC,KAAK,UAAU,SAAS,KAAK,GAAG,OAUvC,GARIC,GAAmB,CAAC,KAAK,UAAU,SAAS,QAAQ,GACtD,KAAK,UAAU,iBAAiB,QAAQ,EAI1C,KAAK,UAAU,cAAc,EAGzB,CAAC,KAAK,QAAQ,KAAM,CACjB,KAAK,gBACR,KAAK,UAAU,SAAS,EACxB,KAAK,cAAgB,GACrB,KAAK,gBAAkB,IAErB,KAAK,UAAU,SAAS,KAAK,GAC/B,KAAK,UAAU,mBAAmB,KAAK,EAErC,KAAK,UAAU,SAAS,QAAQ,GAClC,KAAK,UAAU,mBAAmB,QAAQ,EAE5C,MACF,CAGI,CAACD,GAAgB,KAAK,UAAU,SAAS,KAAK,IAChD,KAAK,UAAU,SAAS,KAAK,EAC7B,KAAK,UAAU,mBAAmB,KAAK,GAErC,CAACC,GAAmB,KAAK,UAAU,SAAS,QAAQ,IACtD,KAAK,UAAU,SAAS,QAAQ,EAChC,KAAK,UAAU,mBAAmB,QAAQ,GAIxC,KAAK,kBACP,KAAK,UAAU,SAAS,EACxB,KAAK,cAAgB,GACrB,KAAK,gBAAkB,IAGzB,GAAM,CAAE,MAAAC,EAAO,IAAAC,CAAI,EAAIJ,EACjBZ,EAAS,KAAK,UAAU,MAAM,OAC9BF,EAAO,KAAK,UAAU,MAAM,KAGlC,KAAK,UAAU,WAAWiB,EAAOC,CAAG,EAGpC,IAAMC,EAAgG,CAAC,EACjGC,EAAkE,CAAC,EAGzE,QAASX,EAAMQ,EAAOR,GAAOS,EAAK,EAAET,EAAK,CACvC,IAAMC,EAAOR,EAAO,MAAM,IAAIO,EAAMP,EAAO,KAAK,EAChD,GAAI,CAACQ,EAAM,OACX,QAASC,EAAM,EAAGA,EAAMX,EAAM,EAAEW,EAC9B,GAAID,EAAK,MAAMC,CAAG,EAAI,UAAsB,CAC1C,IAAInB,EAAyBkB,EAAK,eAAeC,CAAG,GAAKxB,EACnDJ,EAAUS,EAAE,QAClB,GAAIT,IAAY,QAAaA,IAAY,GACvC,SAEF,IAAM8B,EAAU,KAAK,QAAQ,IAAI9B,CAAO,EACxC,GAAIS,EAAE,SAAW,GAAI,CACnB,IAAM6B,EAAY7B,EAAE,OACd8B,EAAWX,EACbY,EAAQ,EAOZ,KACE,EAAEZ,EAAMX,GACJU,EAAK,MAAMC,CAAG,EAAI,YAClBnB,EAAIkB,EAAK,eAAeC,CAAG,GAAKxB,IAChCK,EAAE,UAAYT,GACdS,EAAE,SAAW6B,EAAYE,GAE7BA,IAEFZ,IACIE,EACEA,EAAQ,QACVM,EAAU,KAAK,CAAE,QAAAN,EAAS,OAAQQ,EAAW,IAAKC,EAAU,IAAAb,EAAK,MAAAc,CAAM,CAAC,EAEjE,KAAK,MAAM,iBACpBH,EAAiB,KAAK,CAAE,IAAKE,EAAU,IAAAb,EAAK,MAAAc,CAAM,CAAC,EAErD,KAAK,cAAgB,EACvB,CACF,CAEJ,CAGAJ,EAAU,KAAK,CAACK,EAAGC,IAAMD,EAAE,QAAQ,OAASC,EAAE,QAAQ,MAAM,EAG5D,QAAWC,KAAQN,EACjB,KAAK,UAAU,gBAAgBM,EAAK,IAAKA,EAAK,IAAKA,EAAK,KAAK,EAI/D,QAAWA,KAAQP,EACjB,KAAK,UAAU,KAAKO,EAAK,QAASA,EAAK,OAAQA,EAAK,IAAKA,EAAK,IAAKA,EAAK,KAAK,CAEjF,CAEO,eAAeC,EAA+C,CAEnE,GAAI,CAAC,KAAK,QAAQ,KAAM,CACtB,KAAK,iBAAmBA,EACxB,MACF,CAIA,GAAI,KAAK,iBAAiB,MAAQA,EAAQ,KAAM,CAC9C,KAAK,iBAAmBA,EACxB,MACF,CAGA,IAAMzB,EAAS,KAAK,UAAU,MAAM,OAC9BD,EAAOC,EAAO,MAAM,OACpB0B,EAAS,KAAK,iBAAiB,KAAO,EAC5C,QAASnB,EAAM,EAAGA,EAAMR,EAAM,EAAEQ,EAAK,CACnC,IAAMC,EAAOR,EAAO,MAAM,IAAIO,CAAG,EACjC,GAAIC,EAAK,MAAMkB,CAAM,EAAI,UAAsB,CAC7C,IAAMpC,EAAyBkB,EAAK,eAAekB,CAAM,GAAKzC,EACxDJ,EAAUS,EAAE,QAClB,GAAIT,IAAY,QAAaA,IAAY,GACvC,SAEF,IAAM8B,EAAU,KAAK,QAAQ,IAAI9B,CAAO,EACxC,GAAI,CAAC8B,EACH,SAGF,IAAMgB,EAAc,KAAK,MAAMhB,EAAQ,QAAQ,OAAS,GAAKA,EAAQ,eAAe,KAAK,EACzF,GAAKrB,EAAE,OAASqC,EAAe,GAAKA,EAClC,SAGF,IAAIC,EAAU,GACd,QAASC,EAAWH,EAAS,EAAGG,EAAWJ,EAAQ,KAAM,EAAEI,EACzD,GAAIrB,EAAK,MAAMqB,EAAW,EAAY,CAAY,EAAI,QAA0B,CAC9ED,EAAU,GACV,KACF,CAEF,GAAIA,EACF,SAGF,IAAMZ,EAAM,KAAK,IAAIS,EAAQ,KAAME,EAAerC,EAAE,OAASqC,EAAeD,CAAM,EAC9EI,EAAWxC,EAAE,OACjB,QAASyC,EAAYL,EAAS,EAAGK,EAAYf,EAAK,EAAEe,EAClD,KAAK,aAAavB,EAAwBuB,EAAWlD,EAAS,EAAEiD,CAAQ,EACxEnB,EAAQ,WAEZ,CACF,CAEA,KAAK,iBAAmBc,CAC1B,CAKO,qBAAqBO,EAAWC,EAA0C,CAE/E,IAAMzB,EADS,KAAK,UAAU,MAAM,OAChB,MAAM,IAAIyB,CAAC,EAC/B,GAAIzB,GAAQA,EAAK,MAAMwB,CAAC,EAAI,UAAsB,CAChD,IAAM1C,EAAyBkB,EAAK,eAAewB,CAAC,GAAK/C,EACzD,GAAIK,EAAE,SAAWA,EAAE,UAAY,GAAI,CACjC,IAAM4C,EAAO,KAAK,QAAQ,IAAI5C,EAAE,OAAO,GAAG,KAC1C,GAAI,OAAO,aAAe4C,aAAgB,YAAa,CACrD,IAAMC,EAASC,EAAc,aAAa,OAAO,SAAUF,EAAK,MAAOA,EAAK,MAAM,EAClF,OAAAC,EAAO,WAAW,IAAI,GAAG,UAAUD,EAAM,EAAG,EAAGA,EAAK,MAAOA,EAAK,MAAM,EAC/DC,CACT,CACA,OAAOD,CACT,CACF,CACF,CAKO,wBAAwBF,EAAWC,EAA0C,CAElF,IAAMzB,EADS,KAAK,UAAU,MAAM,OAChB,MAAM,IAAIyB,CAAC,EAC/B,GAAIzB,GAAQA,EAAK,MAAMwB,CAAC,EAAI,UAAsB,CAChD,IAAM1C,EAAyBkB,EAAK,eAAewB,CAAC,GAAK/C,EACzD,GAAIK,EAAE,SAAWA,EAAE,UAAY,IAAMA,EAAE,SAAW,GAAI,CACpD,IAAMC,EAAO,KAAK,QAAQ,IAAID,EAAE,OAAO,EACvC,GAAIC,EACF,OAAO,KAAK,UAAU,YAAYA,EAAMD,EAAE,MAAM,CAEpD,CACF,CACF,CAIQ,aAAa+C,EAAsB,CACzC,IAAMC,EAAO,KAAK,iBAAiB,EAC/BC,EAAUD,EACd,KAAO,KAAK,YAAcC,EAAUF,GAAQ,KAAK,QAAQ,MAAM,CAC7D,IAAM9C,EAAO,KAAK,QAAQ,IAAI,EAAE,KAAK,SAAS,EAC1CA,GAAQA,EAAK,OACfgD,GAAWhD,EAAK,KAAK,MAAQA,EAAK,KAAK,OACnCA,EAAK,QAAUA,EAAK,OAASA,EAAK,SACpCgD,GAAWhD,EAAK,OAAO,MAAQA,EAAK,OAAO,QAE7CA,EAAK,QAAQ,QAAQ,EACrB,KAAK,QAAQ,KAAK,SAAS,EAE/B,CACA,OAAO+C,EAAOC,CAChB,CAEQ,aAAa/B,EAAsBwB,EAAWnD,EAAiBC,EAAsB,CAC3F,GAAI0B,EAAK,MAAMwB,EAAI,EAAY,CAAO,EAAI,UAAsB,CAC9D,IAAMQ,EAAMhC,EAAK,eAAewB,CAAC,EACjC,GAAIQ,EAAK,CACP,GAAIA,EAAI,UAAY,OAAW,CAI7B,IAAMC,EAAU,KAAK,QAAQ,IAAID,EAAI,OAAO,EACxCC,GAEFA,EAAQ,YAEVD,EAAI,QAAU3D,EACd2D,EAAI,OAAS1D,EACb,MACF,CAEA0B,EAAK,eAAewB,CAAC,EAAI,IAAIvD,EAAmB+D,EAAI,IAAKA,EAAI,MAAO3D,EAASC,CAAM,EACnF,MACF,CACF,CAEA0B,EAAK,MAAMwB,EAAI,EAAY,CAAO,GAAK,UACvCxB,EAAK,eAAewB,CAAC,EAAI,IAAIvD,EAAmB,EAAG,EAAGI,EAASC,CAAM,CACvE,CAEQ,mBAA0B,CAEhC,QAAWS,KAAQ,KAAK,QAAQ,OAAO,EACjCA,EAAK,aAAe,cACtBA,EAAK,UAAY,GAIrB,IAAMS,EAAS,KAAK,UAAU,MAAM,OACpC,QAASiC,EAAI,EAAGA,EAAI,KAAK,UAAU,KAAM,EAAEA,EAAG,CAC5C,IAAMzB,EAAOR,EAAO,MAAM,IAAIiC,CAAC,EAC/B,GAAKzB,GAGL,QAASwB,EAAI,EAAGA,EAAI,KAAK,UAAU,KAAM,EAAEA,EACzC,GAAIxB,EAAK,MAAMwB,EAAI,EAAY,CAAO,EAAI,UAAsB,CAC9D,IAAMU,EAAQlC,EAAK,eAAewB,CAAC,GAAG,QACtC,GAAIU,EAAO,CACT,IAAMnD,EAAO,KAAK,QAAQ,IAAImD,CAAK,EAC/BnD,GACFA,EAAK,WAET,CACF,EAEJ,CAEA,IAAMG,EAAO,CAAC,EACd,OAAW,CAACD,EAAIF,CAAI,IAAK,KAAK,QAAQ,QAAQ,EACxCA,EAAK,aAAe,aAAe,CAACA,EAAK,YAC3CA,EAAK,QAAQ,QAAQ,EACrBG,EAAK,KAAKD,CAAE,GAGhB,QAAWA,KAAMC,EACf,KAAK,QAAQD,CAAE,CAEnB,CACF,ECnpBA,IAAAkD,GAA0B,QAC1BC,GAAuB,QC2CvB,SAASC,EAAMC,EAA2B,CACxC,IAAIC,EAAI,GACR,QAASC,EAAI,EAAGA,EAAIF,EAAK,OAAQ,EAAEE,EACjCD,GAAK,OAAO,aAAaD,EAAKE,CAAC,CAAC,EAElC,OAAOD,CACT,CAGA,SAASE,GAAMH,EAA2B,CACxC,IAAII,EAAI,EACR,QAASF,EAAI,EAAGA,EAAIF,EAAK,OAAQ,EAAEE,EAAG,CACpC,GAAIF,EAAKE,CAAC,EAAI,IAAMF,EAAKE,CAAC,EAAI,GAC5B,MAAM,IAAI,MAAM,cAAc,EAEhCE,EAAIA,EAAI,GAAKJ,EAAKE,CAAC,EAAI,EACzB,CACA,OAAOE,CACT,CAGA,SAASC,GAAOL,EAA2B,CACzC,IAAMI,EAAIL,EAAMC,CAAI,EACpB,GAAI,CAACI,EAAE,MAAM,kCAAkC,EAC7C,MAAM,IAAI,MAAM,cAAc,EAEhC,OAAOA,CACT,CAGA,SAASE,GAAON,EAA2B,CACzC,GAAI,OAAO,OAAW,IACpB,OAAO,OAAO,KAAKD,EAAMC,CAAI,EAAG,QAAQ,EAAE,SAAS,EAErD,IAAMO,EAAK,KAAKR,EAAMC,CAAI,CAAC,EACrBQ,EAAI,IAAI,WAAWD,EAAG,MAAM,EAClC,QAAS,EAAI,EAAG,EAAIC,EAAE,OAAQ,EAAE,EAC9BA,EAAE,CAAC,EAAID,EAAG,WAAW,CAAC,EAExB,OAAO,IAAI,YAAY,EAAE,OAAOC,CAAC,CACnC,CAEA,IAAMC,GAAiE,CACrE,OAAQN,GACR,KAAMA,GACN,KAAMG,GACN,MAAOD,GACP,OAAQA,GACR,oBAAqBF,EACvB,EAKMO,GAAc,CAAC,GAAI,IAAK,IAAK,GAAG,EAEhCC,GAAuB,CAAC,GAAI,IAAK,IAAK,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,GAAI,IAAK,IAAK,GAAG,EAEpFC,GAAkB,CAAC,GAAI,IAAK,IAAK,IAAK,GAAI,GAAI,IAAK,GAAG,EAEtDC,GAAiB,CAAC,GAAI,IAAK,IAAK,IAAK,GAAI,IAAK,GAAG,EAEjDC,GAAwB,CAAC,GAAI,IAAK,IAAK,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,GAAG,EAG1FC,GAAiB,KAGVC,EAAN,KAAmB,CAAnB,cACL,KAAO,MAAqB,EAC5B,KAAQ,QAAU,IAAI,YAAYD,EAAc,EAChD,KAAQ,UAAY,EACpB,KAAQ,KAAO,GACf,KAAO,OAA4E,CAAC,EAE7E,OAAc,CACnB,KAAK,QAAQ,KAAK,CAAC,EACnB,KAAK,MAAQ,EACb,KAAK,UAAY,EACjB,KAAK,OAAS,CAAC,EACf,KAAK,KAAO,EACd,CAEO,KAAc,CACnB,GAAI,KAAK,QAAU,EAAmB,CACpC,GAAI,KAAK,YAAcF,GAAe,OAAQ,CAC5C,QAASI,EAAI,EAAGA,EAAIJ,GAAe,OAAQ,EAAEI,EAC3C,GAAI,KAAK,QAAQA,CAAC,IAAMJ,GAAeI,CAAC,EAAG,OAAO,KAAK,GAAG,EAE5D,YAAK,OAAO,KAAU,EACtB,KAAK,MAAQ,EACN,CACT,CACA,GAAI,KAAK,YAAcH,GAAsB,OAAQ,CACnD,QAASG,EAAI,EAAGA,EAAIH,GAAsB,OAAQ,EAAEG,EAClD,GAAI,KAAK,QAAQA,CAAC,IAAMH,GAAsBG,CAAC,EAAG,OAAO,KAAK,GAAG,EAEnE,YAAK,OAAO,KAAU,EACtB,KAAK,MAAQ,EACN,CACT,CACA,OAAO,KAAK,GAAG,CACjB,CACA,OAAI,KAAK,QAAU,EAAwB,EACvC,KAAK,QAAU,GACd,KAAK,OAAO,OAAS,EAEnB,KAAK,YAAY,KAAK,SAAS,GACpC,KAAK,MAAQ,EACN,GAFuC,KAAK,GAAG,EAIjD,KAAK,GAAG,CACjB,CAEO,MAAMjB,EAAmBkB,EAAeC,EAAqB,CAClE,IAAIC,EAAQ,KAAK,MACbC,EAAM,KAAK,UACTC,EAAS,KAAK,QAEpB,GADIF,IAAU,GAAqBA,IAAU,GACzCA,IAAU,GAAqBC,EAAM,GAAI,MAAO,GACpD,QAASnB,EAAIgB,EAAOhB,EAAIiB,EAAK,EAAEjB,EAAG,CAChC,IAAMqB,EAAIvB,EAAKE,CAAC,EAChB,OAAQqB,EAAG,CACT,IAAK,IACH,GAAI,CAAC,KAAK,YAAYF,CAAG,EAAG,OAAO,KAAK,GAAG,EAC3CD,EAAQ,EACRC,EAAM,EACN,MACF,IAAK,IACH,GAAID,IAAU,EAAmB,CAC/B,GAAIE,EAAO,CAAC,IAAM,GAAI,CAEpB,IAAIL,EAAI,EACR,KAAOA,EAAIP,GAAY,OAAQ,EAAEO,EAC/B,GAAIK,EAAOL,CAAC,IAAMP,GAAYO,CAAC,EAAG,OAAO,KAAK,GAAG,EAGnD,GADA,KAAK,OAAO,KAAU,EAClBI,IAAQT,GAAgB,OAAQ,CAClC,KAAOK,EAAIL,GAAgB,OAAQ,EAAEK,EACnC,GAAIK,EAAOL,CAAC,IAAML,GAAgBK,CAAC,EAAG,OAAO,KAAK,GAAG,EAEvD,YAAK,OAAO,KAAU,EACtB,KAAK,MAAQ,EACNf,EAAI,CACb,CACF,SAAWoB,EAAO,CAAC,IAAM,GAAI,CAE3B,QAASL,EAAI,EAAGA,EAAIN,GAAqB,OAAQ,EAAEM,EACjD,GAAIK,EAAOL,CAAC,IAAMN,GAAqBM,CAAC,EAAG,OAAO,KAAK,GAAG,EAE5D,KAAK,OAAO,KAAU,CACxB,KACE,QAAO,KAAK,GAAG,EAEjBG,EAAQ,EACRC,EAAM,CACR,SAAWD,IAAU,EAAiB,CACpC,GAAI,CAAC,KAAK,UAAUC,CAAG,EAAG,OAAO,KAAK,GAAG,EACzCD,EAAQ,EACRC,EAAM,CACR,SAAWD,IAAU,EAAmB,CACtC,GAAIC,GAAON,GAAgB,OAAO,KAAK,GAAG,EAC1CO,EAAOD,GAAK,EAAIE,CAClB,CACA,MACF,IAAK,IACH,OAAIH,IAAU,GACR,CAAC,KAAK,YAAYC,CAAG,EAAU,KAAK,GAAG,GAE7C,KAAK,MAAQ,EACNnB,EAAI,GACb,QACE,GAAImB,GAAON,GAAgB,OAAO,KAAK,GAAG,EAC1CO,EAAOD,GAAK,EAAIE,CACpB,CACF,CACA,YAAK,MAAQH,EACb,KAAK,UAAYC,EACV,EACT,CAEQ,IAAa,CACnB,YAAK,OAAO,KAAO,EACnB,KAAK,MAAQ,EACN,EACT,CAEQ,UAAUA,EAAsB,CACtC,IAAMJ,EAAIlB,EAAM,KAAK,QAAQ,SAAS,EAAGsB,CAAG,CAAC,EAC7C,OAAIJ,GACF,KAAK,KAAOA,EACZ,KAAK,OAAOA,CAAC,EAAI,KACV,IAEF,EACT,CAEQ,YAAYI,EAAsB,CACxC,GAAI,KAAK,KAAM,CACb,GAAI,CACF,IAAMjB,EAAI,KAAK,QAAQ,MAAM,EAAGiB,CAAG,EACnC,KAAK,OAAO,KAAK,IAAI,EAAIZ,GAAS,KAAK,IAAI,EAAIA,GAAS,KAAK,IAAI,EAAEL,CAAC,EAAIA,CAC1E,MAAQ,CACN,MAAO,EACT,CACA,MAAO,EACT,CACA,MAAO,EACT,CACF,ECvPO,IAAMoB,EAA6B,CACxC,KAAM,cACN,MAAO,EACP,OAAQ,CACV,EAEO,SAASC,GAAUC,EAAyB,CACjD,GAAIA,EAAE,OAAS,GACb,OAAOF,EAET,IAAMG,EAAM,IAAI,YAAYD,EAAE,OAAQA,EAAE,WAAY,CAAC,EAGrD,GAAIC,EAAI,CAAC,IAAM,YAAcA,EAAI,CAAC,IAAM,WAAcA,EAAI,CAAC,IAAM,WAC/D,MAAO,CACL,KAAM,YACN,MAAQD,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,EACrD,OAAQA,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,CACvD,EAGF,GAAIA,EAAE,CAAC,IAAM,KAAQA,EAAE,CAAC,IAAM,KAAQA,EAAE,CAAC,IAAM,IAAM,CACnD,GAAM,CAACE,EAAOC,CAAM,EAAIC,GAAQJ,CAAC,EACjC,MAAO,CAAE,KAAM,aAAc,MAAAE,EAAO,OAAAC,CAAO,CAC7C,CAEA,GAAIF,EAAI,CAAC,IAAM,YAAeD,EAAE,CAAC,IAAM,IAAQA,EAAE,CAAC,IAAM,KAASA,EAAE,CAAC,IAAM,GACxE,MAAO,CACL,KAAM,YACN,MAAQA,EAAE,CAAC,GAAK,EAAIA,EAAE,CAAC,EACvB,OAAQA,EAAE,CAAC,GAAK,EAAIA,EAAE,CAAC,CACzB,EAGF,GAAIC,EAAI,CAAC,IAAM,WACb,MAAO,CACL,KAAM,YACN,MAAQD,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,EAAIA,EAAE,CAAC,EACjD,OAAQA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,GAAKA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,CACrD,EAGF,GAAIC,EAAI,CAAC,IAAM,YAAcA,EAAI,CAAC,IAAM,aAAeA,EAAI,CAAC,EAAI,YAAc,QAAU,CACtF,OAAQD,EAAE,EAAE,EAAG,CACb,IAAK,IACH,MAAO,CACL,KAAM,aACN,OAASA,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,GAAK,IAAM,EAC7C,QAASA,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,GAAK,IAAM,CAC/C,EACF,IAAK,IACH,GAAIA,EAAE,EAAE,IAAM,GAAM,OAAOF,EAC3B,IAAMO,EAAML,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,GACxD,MAAO,CACL,KAAM,aACN,OAASK,EAAa,OAAU,EAChC,QAASA,IAAQ,GAAK,OAAU,CAClC,EACF,IAAK,IACH,OAAIL,EAAE,EAAE,IAAM,KAAQA,EAAE,EAAE,IAAM,GAAQA,EAAE,EAAE,IAAM,GAAaF,EACxD,CACL,KAAM,aACN,OAASE,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,GAAK,MAC/B,QAASA,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,GAAK,KACjC,CACJ,CACA,OAAOF,CACT,CAEA,GAAIG,EAAI,CAAC,IAAM,aAAeA,EAAI,CAAC,IAAM,YAAcA,EAAI,CAAC,IAAM,YAAa,CAC7E,IAAIK,EAAM,GAEJC,EAAQ,KAAK,IAAIP,EAAE,OAAS,GAAI,IAAI,EAC1C,QAASQ,EAAI,EAAGA,EAAID,EAAOC,IAEzB,GAAIR,EAAEQ,CAAC,IAAM,KAAQR,EAAEQ,EAAI,CAAC,IAAM,KAAQR,EAAEQ,EAAI,CAAC,IAAM,KAAQR,EAAEQ,EAAI,CAAC,IAAM,IAAM,CAChFF,EAAME,EACN,KACF,CAEF,GAAIF,IAAQ,GAAI,CAEd,IAAMJ,EACJF,EAAEM,EAAO,CAAC,GAAK,GACfN,EAAEM,EAAO,CAAC,GAAK,GACfN,EAAEM,EAAM,EAAE,GAAM,EAChBN,EAAEM,EAAM,EAAE,EACNH,EACJH,EAAEM,EAAM,EAAE,GAAK,GACfN,EAAEM,EAAM,EAAE,GAAK,GACfN,EAAEM,EAAM,EAAE,GAAM,EAChBN,EAAEM,EAAM,EAAE,EACZ,GAAIJ,EAAQ,GAAKC,EAAS,EACxB,MAAO,CAAE,KAAM,aAAc,MAAAD,EAAO,OAAAC,CAAO,CAE/C,CACA,OAAOL,CACT,CACA,OAAOA,CACT,CAGA,SAASM,GAAQJ,EAAiC,CAChD,IAAMS,EAAMT,EAAE,OACVQ,EAAI,EACJE,EAAcV,EAAEQ,CAAC,GAAK,EAAIR,EAAEQ,EAAI,CAAC,EACrC,OAAa,CAEX,GADAA,GAAKE,EACDF,GAAKC,EAEP,MAAO,CAAC,EAAG,CAAC,EAEd,GAAIT,EAAEQ,CAAC,IAAM,IACX,MAAO,CAAC,EAAG,CAAC,EAEd,GAAIR,EAAEQ,EAAI,CAAC,IAAM,KAAQR,EAAEQ,EAAI,CAAC,IAAM,IACpC,OAAIA,EAAI,EAAIC,EACH,CACLT,EAAEQ,EAAI,CAAC,GAAK,EAAIR,EAAEQ,EAAI,CAAC,EACvBR,EAAEQ,EAAI,CAAC,GAAK,EAAIR,EAAEQ,EAAI,CAAC,CACzB,EAEK,CAAC,EAAG,CAAC,EAEdA,GAAK,EACLE,EAAcV,EAAEQ,CAAC,GAAK,EAAIR,EAAEQ,EAAI,CAAC,CACnC,CACF,CFrHA,IAAMG,GAAgC,CACpC,OACA,KAAM,eACN,KAAM,EACN,MAAO,OACP,OAAQ,OACR,oBAAqB,EACrB,OAAQ,CACV,EAGaC,GAAN,KAAuD,CAU5D,YACmBC,EACAC,EACAC,EACAC,EACjB,CAJiB,WAAAH,EACA,eAAAC,EACA,cAAAC,EACA,mBAAAC,EAbnB,KAAQ,YAAc,EACtB,KAAQ,SAAW,GACnB,KAAQ,IAAM,IAAIC,EAClB,KAAQ,QAAyBN,GAGjC,KAAQ,aAAe,GACvB,KAAQ,YAAc,GAQpB,IAAMO,EAAkB,KAAK,KAAK,KAAK,MAAM,aAAe,EAAI,CAAC,EAC3DC,EAAe,KAAK,IAAI,QAA2BD,CAAe,EACxE,KAAK,KAAO,IAAI,GAAAE,QAAc,QAAwBF,EAAiBC,CAAY,EACnF,KAAK,QAAU,IAAI,GAAAE,QAAW,OAAsB,CACtD,CAEO,OAAc,CACnB,KAAK,cACL,KAAK,IAAI,MAAM,EACf,KAAK,KAAK,QAAQ,EAClB,KAAK,QAAQ,QAAQ,CACvB,CAEO,OAAc,CACnB,KAAK,SAAW,GAChB,KAAK,IAAI,MAAM,CACjB,CAEO,IAAIC,EAAmBC,EAAeC,EAAmB,CAC9D,GAAI,MAAK,SAET,GAAI,KAAK,IAAI,QAAU,EAChB,KAAK,KAAK,IAAIF,EAAK,SAASC,EAAOC,CAAG,CAAC,IAAiB,IAC3D,KAAK,KAAK,QAAQ,EAClB,KAAK,SAAW,QAEb,CACL,IAAMC,EAAU,KAAK,IAAI,MAAMH,EAAMC,EAAOC,CAAG,EAC/C,GAAIC,IAAY,GAAI,CAClB,KAAK,SAAW,GAChB,MACF,CACA,GAAIA,EAAU,EAAG,CAEf,GADgB,KAAK,IAAI,OAAO,OAChB,EAAmB,CAOjC,GANI,KAAK,eACP,KAAK,aAAe,GACpB,KAAK,YAAc,GACnB,KAAK,KAAK,QAAQ,GAEpB,KAAK,QAAU,OAAO,OAAO,CAAC,EAAGd,GAAgB,KAAK,IAAI,MAAM,EAC5D,CAAC,KAAK,QAAQ,OAAQ,CACxB,KAAK,SAAW,GAChB,MACF,CACA,KAAK,KAAK,KAAK,CACjB,SAAW,KAAK,YAAa,CAC3B,KAAK,SAAW,GAChB,MACF,CACK,KAAK,KAAK,IAAIW,EAAK,SAASG,EAASD,CAAG,CAAC,IAAiB,IAC7D,KAAK,KAAK,QAAQ,EAClB,KAAK,SAAW,GACZ,KAAK,eAAc,KAAK,YAAc,IAE9C,CACF,CACF,CAEO,IAAIE,EAA8C,CAGvD,GAFI,KAAK,UAEL,KAAK,IAAI,QAAU,GACjB,KAAK,IAAI,IAAI,EAAG,MAAO,GAE7B,IAAMC,EAAU,KAAK,IAAI,OAAO,KAEhC,GAAIA,IAAY,EAAuB,MAAO,GAE9C,GAAIA,IAAY,EAA6B,CAE3C,IAAIC,EAAIC,EAAkB,MACtBC,EAAID,EAAkB,OACtB,KAAK,UAAU,aACjBD,EAAI,KAAK,UAAU,WAAW,IAAI,OAAO,MAAQ,KAAK,cAAc,KACpEE,EAAI,KAAK,UAAU,WAAW,IAAI,OAAO,OAAS,KAAK,cAAc,MAEvE,IAAMC,EAAQ,KAAK,cAAc,MAAM,qBAAqB,KAAO,EAC7DC,EAAS,4BAA4BF,EAAE,QAAQ,CAAC,CAAC,IAAIF,EAAE,QAAQ,CAAC,CAAC,IAAIG,EAAM,QAAQ,CAAC,CAAC,SAC3F,YAAK,cAAc,MAAMC,EAAQ,EAAK,EAC/B,EACT,CAEA,GAAIL,IAAY,EACd,YAAK,QAAU,OAAO,OAAO,CAAC,EAAGhB,GAAgB,KAAK,IAAI,MAAM,EAChE,KAAK,aAAe,GACpB,KAAK,YAAc,GACnB,KAAK,KAAK,QAAQ,EAClB,KAAK,KAAK,KAAK,EACR,GAGT,GAAIgB,IAAY,IACV,CAAC,KAAK,eACV,KAAK,aAAe,GAChB,KAAK,aAAe,KAAK,QAAQ,OAAS,IAA4B,MAAO,GAKnF,IAAIC,EAAI,EACJE,EAAI,EAGJG,EACAC,EAAUC,EAoBd,IAnBIF,EAAOP,MACLO,EAAO,CAAC,KAAK,KAAK,IAAI,IACxBC,EAAUE,GAAU,KAAK,KAAK,KAAK,GAC/BH,EAAOC,EAAQ,OAAS,gBAC1BN,EAAIM,EAAQ,MACZJ,EAAII,EAAQ,QACRD,EAAOL,GAAKE,GAAKF,EAAIE,EAAI,KAAK,MAAM,aACtC,CAACF,EAAGE,CAAC,EAAI,KAAK,QAAQF,EAAGE,CAAC,EAAE,IAAI,KAAK,KAAK,EAC1CG,EAAOL,GAAKE,GAAKF,EAAIE,EAAI,KAAK,MAAM,YAEpC,QAAQ,KAAK,8BAA8BI,EAAQ,KAAK,IAAIA,EAAQ,MAAM,EAAE,GAG9E,QAAQ,KAAK,6BAA6B,GAG5C,QAAQ,KAAK,mCAAmC,GAGhD,CAACD,EACH,YAAK,KAAK,QAAQ,EACX,GAGT,IAAII,EACJ,GAAIH,EAAQ,OAAS,YAAa,CAChC,IAAMZ,EAAO,KAAK,QAAQ,OAAO,KAAK,KAAK,KAAK,EAOhD,GANAe,EAAO,IAAI,UACT,IAAI,kBAAkBf,EAAK,OAAQA,EAAK,WAAYA,EAAK,UAAU,EACnE,KAAK,QAAQ,MACb,KAAK,QAAQ,MACf,EACA,KAAK,QAAQ,QAAQ,EACjBM,IAAM,KAAK,QAAQ,OAASE,IAAM,KAAK,QAAQ,OAAQ,CAEzD,KAAK,KAAK,QAAQ,EAClB,IAAMQ,EAASC,EAAc,aAAa,OAAW,KAAK,QAAQ,MAAO,KAAK,QAAQ,MAAM,EAC5F,OAAAD,EAAO,WAAW,IAAI,GAAG,aAAaD,EAAM,EAAG,CAAC,EAChD,KAAK,SAAS,SAASC,CAAM,EACtB,EACT,CACF,MACED,EAAO,IAAI,KAAK,CAAC,KAAK,KAAK,KAAK,EAAG,CAAE,KAAMH,EAAQ,IAAK,CAAC,EAE3D,KAAK,KAAK,QAAQ,EAClB,IAAMM,EAAa,KAAK,YACxB,OAAO,kBAAkBH,EAAM,CAAE,YAAaT,EAAG,aAAcE,CAAE,CAAC,EAC/D,KAAKW,GACAD,IAAe,KAAK,aACtBC,EAAG,MAAM,EACF,KAET,KAAK,SAAS,SAASA,CAAE,EAClB,GACR,EACA,MAAMC,IACL,QAAQ,KAAK,uBAAuBR,EAAQ,IAAI,IAAIA,EAAQ,KAAK,IAAIA,EAAQ,MAAM,GAAIQ,CAAC,EACjF,GACR,CACL,CAEQ,QAAQd,EAAWE,EAA6B,CACtD,IAAMa,EAAK,KAAK,UAAU,YAAY,IAAI,KAAK,OAASd,EAAkB,MACpEe,EAAK,KAAK,UAAU,YAAY,IAAI,KAAK,QAAUf,EAAkB,OACrEgB,EAAQ,KAAK,UAAU,YAAY,IAAI,OAAO,OAASF,EAAK,KAAK,cAAc,KAC/EG,EAAS,KAAK,UAAU,YAAY,IAAI,OAAO,QAAUF,EAAK,KAAK,cAAc,KAEjFG,EAAK,KAAK,KAAK,KAAK,QAAQ,MAAQF,EAAOF,CAAE,EAC7CK,EAAK,KAAK,KAAK,KAAK,QAAQ,OAASF,EAAQF,CAAE,EACrD,GAAI,CAACG,GAAM,CAACC,EAAI,CACd,IAAMC,EAAKJ,EAAQjB,EACbsB,GAAMJ,EAASF,GAAMd,EACrBqB,EAAI,KAAK,IAAIF,EAAIC,CAAE,EACzB,OAAOC,EAAI,EAAI,CAACvB,EAAIuB,EAAGrB,EAAIqB,CAAC,EAAI,CAACvB,EAAGE,CAAC,CACvC,CACA,OAAQiB,EAEJ,KAAK,QAAQ,qBAAuB,CAACA,GAAM,CAACC,EAC1C,CAACD,EAAIjB,EAAIiB,EAAKnB,CAAC,EAAI,CAACmB,EAAIC,CAAE,EAF5B,CAACpB,EAAIoB,EAAKlB,EAAGkB,CAAE,CAGrB,CAEQ,KAAKI,EAAWC,EAAeC,EAAsB,CAC3D,OAAIF,IAAM,OAAe,EACrBA,EAAE,SAAS,GAAG,EAAU,SAASA,EAAE,MAAM,EAAG,EAAE,EAAG,EAAE,EAAIC,EAAQ,IAC/DD,EAAE,SAAS,IAAI,EAAU,SAASA,EAAE,MAAM,EAAG,EAAE,EAAG,EAAE,EACjD,SAASA,EAAG,EAAE,EAAIE,CAC3B,CACF,EGzOA,IAAAC,GAAiD,QCmI1C,SAASC,GAAkBC,EAA6B,CAC7D,IAAMC,EAAqB,CAAC,EACtBC,EAAQF,EAAK,MAAM,GAAG,EAE5B,QAAWG,KAAQD,EAAO,CACxB,IAAME,EAAQD,EAAK,QAAQ,GAAG,EAC9B,GAAIC,IAAU,GAAI,SAElB,IAAMC,EAAMF,EAAK,UAAU,EAAGC,CAAK,EAC7BE,EAAQH,EAAK,UAAUC,EAAQ,CAAC,EAGtC,GAAIC,IAAQ,IAAiB,CAC3BJ,EAAI,OAASK,EACb,QACF,CACA,GAAID,IAAQ,IAAsB,CAChCJ,EAAI,YAAcK,EAClB,QACF,CACA,GAAID,IAAQ,IAAuB,CACjCJ,EAAI,aAAeK,EACnB,QACF,CACA,GAAID,IAAQ,IAA0B,CACpCJ,EAAI,eAAiBK,EACrB,QACF,CACA,IAAMC,EAAW,SAASD,EAAO,EAAE,EACnC,OAAQD,EAAK,CACX,IAAK,IAAiBJ,EAAI,OAASM,EAAU,MAC7C,IAAK,IAAaN,EAAI,GAAKM,EAAU,MACrC,IAAK,IAAuBN,EAAI,YAAcM,EAAU,MACxD,IAAK,IAAgBN,EAAI,MAAQM,EAAU,MAC3C,IAAK,IAAiBN,EAAI,OAASM,EAAU,MAC7C,IAAK,IAAmBN,EAAI,EAAIM,EAAU,MAC1C,IAAK,IAAmBN,EAAI,EAAIM,EAAU,MAC1C,IAAK,IAAuBN,EAAI,YAAcM,EAAU,MACxD,IAAK,IAAwBN,EAAI,aAAeM,EAAU,MAC1D,IAAK,IAA6BN,EAAI,QAAUM,EAAU,MAC1D,IAAK,IAA6BN,EAAI,QAAUM,EAAU,MAC1D,IAAK,IAAkBN,EAAI,QAAUM,EAAU,MAC/C,IAAK,IAAeN,EAAI,KAAOM,EAAU,MACzC,IAAK,IAAeN,EAAI,KAAOM,EAAU,MACzC,IAAK,IAAgBN,EAAI,MAAQM,EAAU,MAC3C,IAAK,IAA0BN,EAAI,eAAiBM,EAAU,MAC9D,IAAK,IAAkBN,EAAI,OAASM,EAAU,MAC9C,IAAK,IAAuBN,EAAI,YAAcM,EAAU,KAC1D,CACF,CAEA,OAAON,CACT,CD/JA,IAAMO,GAAa,EAGNC,GAAN,KAA8E,CAiCnF,YACmBC,EACAC,EACAC,EACAC,EACjB,CAJiB,WAAAH,EACA,eAAAC,EACA,mBAAAC,EACA,mBAAAC,EApCnB,KAAQ,SAAW,GACnB,KAAQ,YAAc,EACtB,KAAQ,aAAe,GAEvB,KAAQ,eAAuC,KAO/C,KAAQ,eAAiB,GAGzB,KAAQ,aAAe,IAAI,YAAY,GAA+B,EACtE,KAAQ,eAAiB,EAGzB,KAAQ,kBAAoB,EAC5B,KAAQ,kBAAoB,EAG5B,KAAQ,eAAuC,KAI/C,KAAQ,sBAA2D,IAAI,IAarE,KAAK,iBAAmB,KAAK,KAAK,KAAK,MAAM,eAAiB,EAAI,CAAC,EAEnE,KAAK,qBAAuB,KAAK,IAAI,QAAgC,KAAK,gBAAgB,CAC5F,CAEO,OAAc,CACnB,KAAK,cACL,KAAK,mBAAmB,EACpB,KAAK,iBACP,KAAK,eAAe,QAAQ,EAC5B,KAAK,eAAiB,MAExB,KAAK,cAAc,MAAM,CAC3B,CAEO,SAAgB,CACrB,KAAK,MAAM,CACb,CAEQ,oBAAoBC,EAAmB,CAC7C,KAAK,sBAAsB,OAAOA,CAAG,EACjC,KAAK,kBAAoBA,IAC3B,KAAK,gBAAkB,OAE3B,CAEQ,oBAA2B,CACjC,QAAWC,KAAW,KAAK,sBAAsB,OAAO,EACtDA,EAAQ,QAAQ,QAAQ,EAE1B,KAAK,sBAAsB,MAAM,EACjC,KAAK,gBAAkB,MACzB,CAEO,OAAc,CACnB,KAAK,SAAW,GAChB,KAAK,aAAe,GACpB,KAAK,eAAiB,GACtB,KAAK,eAAiB,EACtB,KAAK,eAAiB,KAEtB,KAAK,kBAAoB,KAAK,iBAC9B,KAAK,kBAAoB,EACzB,KAAK,eAAiB,IACxB,CAEO,IAAIC,EAAmBC,EAAeC,EAAmB,CAC9D,GAAI,MAAK,SAET,GAAI,CAAC,KAAK,eACR,KAAK,eAAeF,EAAMC,EAAOC,CAAG,MAC/B,CAEL,IAAIC,EAAaD,EACjB,QAASE,EAAIH,EAAOG,EAAIF,EAAKE,IAC3B,GAAIJ,EAAKI,CAAC,IAAM,GAAqB,CACnC,KAAK,eAAiB,GACtBD,EAAaC,EACb,KACF,CAIF,IAAMC,EAAaF,EAAaF,EAChC,GAAI,KAAK,eAAiBI,EAAa,IAAiC,CACtE,KAAK,SAAW,GAChB,MACF,CAIA,GAHA,KAAK,aAAa,IAAIL,EAAK,SAASC,EAAOE,CAAU,EAAG,KAAK,cAAc,EAC3E,KAAK,gBAAkBE,EAEnB,CAAC,KAAK,eAAgB,CAKxB,GAHA,KAAK,eAAiBC,GAAkB,KAAK,wBAAwB,CAAC,EAGlE,KAAK,eAAe,KAAO,QAAa,KAAK,eAAe,cAAgB,OAAW,CACzF,KAAK,cAAc,KAAK,eAAe,GAAI,0CAA2C,KAAK,eAAe,OAAS,CAAC,EACpH,KAAK,SAAW,GAChB,MACF,CAGA,GAAI,KAAK,eAAe,SAAW,IACjC,OAIF,IAAMC,EAAeJ,EAAa,EAC9BI,EAAeL,GACjB,KAAK,eAAeF,EAAMO,EAAcL,CAAG,CAE/C,CACF,CACF,CAGQ,eAAeF,EAAmBC,EAAeC,EAAmB,CAC1E,GAAI,KAAK,SAAU,OAKnB,IAAMM,EAAa,KAAK,gBAAgB,IAAM,KAAK,iBAAmB,EAChET,EAAU,KAAK,sBAAsB,IAAIS,CAAU,EACnDC,EAAsBV,GAAS,kBAAoB,EAGzD,GAFA,KAAK,mBAAqBG,EAAMD,EACFQ,EAAsB,KAAK,kBAC7B,KAAK,kBAAmB,CAClD,IAAMC,EAAmB,KAAK,gBAAkBX,GAAS,QACrDW,GACFA,EAAiB,QAAQ,EAE3B,KAAK,eAAiB,KAClBX,GACF,KAAK,oBAAoBS,CAAU,EAErC,KAAK,SAAW,GAChB,MACF,CAEA,GAAI,MAAK,aAKT,IAHIT,GAAS,SAAW,CAAC,KAAK,iBAC5B,KAAK,eAAiBA,EAAQ,SAE5B,CAAC,KAAK,eAAgB,CAExB,IAAMY,EAAkB,KAAK,iBAAmB,OAChD,GAAIA,EAAkB,KAAK,MAAM,aAAe,IAAS,CACvD,KAAK,SAAW,GACZ,KAAK,gBAAgB,KAAO,QAC9B,KAAK,cAAc,KAAK,eAAe,GAAI,uCAAwC,KAAK,eAAe,OAAS,CAAC,EAEnH,MACF,CACA,IAAMC,EAAa,KAAK,IAAI,EAAG,KAAK,MAAM,KAAK,MAAM,aAAe,IAAUD,CAAe,CAAC,EAC9F,KAAO,KAAK,sBAAsB,MAAQC,GAAY,CACpD,IAAMC,EAAS,KAAK,sBAAsB,QAAQ,EAAE,KAAK,EAAE,MAC3D,GAAI,CAACA,EAAQ,MACbA,EAAO,CAAC,EAAE,QAAQ,QAAQ,EAC1B,KAAK,oBAAoBA,EAAO,CAAC,CAAC,EAC9BA,EAAO,CAAC,EAAE,IAAI,KAAO,QACvB,KAAK,cAAcA,EAAO,CAAC,EAAE,IAAI,GAAI,uCAAwCA,EAAO,CAAC,EAAE,IAAI,OAAS,CAAC,CAEzG,CACA,KAAK,eAAiB,IAAI,GAAAC,QAAc,QAA6B,KAAK,iBAAkB,KAAK,oBAAoB,EACrH,KAAK,eAAe,KAAK,CAC3B,CAEI,KAAK,eAAe,IAAId,EAAK,SAASC,EAAOC,CAAG,CAAC,IAAMV,KACzD,KAAK,eAAe,QAAQ,EAC5B,KAAK,eAAiB,KACtB,KAAK,aAAe,GAChBO,GACF,KAAK,oBAAoBS,CAAU,GAGzC,CAEO,IAAIO,EAA8C,CACvD,GAAI,KAAK,UAAY,CAACA,EACpB,OAAI,KAAK,iBACP,KAAK,eAAe,QAAQ,EAC5B,KAAK,eAAiB,MAEjB,GAIT,GAAI,KAAK,eACP,OAAO,KAAK,wBAAwB,EAItC,IAAMC,EAAM,KAAK,eAGjB,GAAIA,EAAI,SAAW,IACjB,OAAO,KAAK,cAAcA,CAAG,EAI/B,IAAMR,EAAaQ,EAAI,IAAM,KAAK,iBAAmB,EAC/CC,EAAeD,EAAI,OAAS,EAC5BjB,EAAU,KAAK,sBAAsB,IAAIS,CAAU,EAEzD,GAAIS,EACF,OAAI,KAAK,iBACHlB,GACFA,EAAQ,kBAAoB,KAAK,kBACjCA,EAAQ,YAAcA,EAAQ,aAAe,KAAK,cAElD,KAAK,sBAAsB,IAAIS,EAAY,CACzC,IAAK,CAAE,GAAGQ,CAAI,EACd,QAAS,KAAK,eACd,iBAAkB,KAAK,kBACvB,YAAa,KAAK,YACpB,CAAC,EAEH,KAAK,gBAAkBR,EACvB,KAAK,eAAiB,MAEjB,GAILT,IACF,KAAK,gBAAkB,QAGzB,IAAImB,EAAc,KAAK,aACnBC,EAAWH,EACXI,EAAU,KAAK,eAEfrB,IACFoB,EAAWpB,EAAQ,IACnBqB,EAAUrB,EAAQ,QAClBmB,EAAcA,GAAenB,EAAQ,YACrC,KAAK,sBAAsB,OAAOS,CAAU,GAG9C,IAAIa,EAAa,IAAI,WAAW,CAAC,EAC7BD,IACEA,EAAQ,IAAI,IAAM5B,KACpB0B,EAAc,IAEhBG,EAAaD,EAAQ,OAEvB,KAAK,eAAiB,KAKtB,IAAME,EAAS,KAAK,8BAA8BH,EAAUE,EAAYH,CAAW,EACnF,OAAIE,GACFA,EAAQ,QAAQ,EAEXE,CACT,CAIQ,yBAAkC,CACxC,IAAIC,EAAM,GACV,QAASnB,EAAI,EAAGA,EAAI,KAAK,eAAgBA,IACvCmB,GAAO,OAAO,cAAc,KAAK,aAAanB,CAAC,CAAC,EAElD,OAAOmB,CACT,CAEQ,yBAAsD,CAC5D,IAAMP,EAAMV,GAAkB,KAAK,wBAAwB,CAAC,EAG5D,GAAIU,EAAI,KAAO,QAAaA,EAAI,cAAgB,OAC9C,YAAK,cAAcA,EAAI,GAAI,0CAA2CA,EAAI,OAAS,CAAC,EAC7E,GAKT,OAFeA,EAAI,QAAU,IAEb,CACd,QACE,OAAO,KAAK,cAAcA,CAAG,EAC/B,QACE,YAAK,cAAcA,EAAI,IAAM,EAAG,KAAMA,EAAI,OAAS,CAAC,EAC7C,GACT,QACE,OAAO,KAAK,iBAAiBA,CAAG,EAClC,QAKE,OAAIA,EAAI,KAAO,QACb,KAAK,cAAcA,EAAI,GAAI,4BAA6BA,EAAI,OAAS,CAAC,EAEjE,EACX,CACF,CAEQ,8BAA8BA,EAAoBQ,EAAmBN,EAAkD,CAG7H,OAFeF,EAAI,QAAU,IAEb,CACd,QAA2B,CACzB,IAAMM,EAAS,KAAK,gBAAgBN,EAAKQ,EAAON,CAAW,EAG3D,OAAKF,EAAI,cAAgB,OAAS,KAAOA,EAAI,KAAO,SAC9CE,EACF,KAAK,cAAcF,EAAI,GAAI,6BAA8BA,EAAI,OAAS,CAAC,EAC9DQ,EAAM,OAAS,GACxB,KAAK,cAAcR,EAAI,GAAI,KAAMA,EAAI,OAAS,CAAC,GAG5CM,CACT,CACA,QACE,OAAO,KAAK,uBAAuBN,EAAKQ,EAAON,CAAW,EAC5D,QACE,OAAO,KAAK,aAAaF,EAAKQ,EAAON,CAAW,EAClD,QAEE,OAAO,KAAK,iBAAiBF,CAAG,EAClC,QAKE,OAAIA,EAAI,KAAO,QACb,KAAK,cAAcA,EAAI,GAAI,4BAA6BA,EAAI,OAAS,CAAC,EAEjE,EACX,CACF,CAEQ,iBAAiBA,EAAgD,CACvE,GAAIA,EAAI,KAAO,OACb,MAAO,GAET,IAAMS,EAAKT,EAAI,GACTU,EAAQ,KAAK,cAAc,SAASD,CAAE,EAC5C,OAAKC,EAIU,KAAK,cAAcA,EAAOV,CAAG,EAC9B,KAAKD,IACjB,KAAK,cAAcU,EAAIV,EAAU,KAAO,gCAAiCC,EAAI,OAAS,EAAGA,EAAI,WAAW,EACjG,GACR,GAPC,KAAK,cAAcS,EAAI,yBAA0BT,EAAI,OAAS,EAAGA,EAAI,WAAW,EACzE,GAOX,CAEQ,gBAAgBA,EAAoBQ,EAAmBN,EAA+B,CAY5F,OADqBF,EAAI,cAAgB,OACpB,KACfA,EAAI,KAAO,QACb,KAAK,cAAcA,EAAI,GAAI,yCAA0CA,EAAI,OAAS,CAAC,EAE9E,KAGLE,GAAeM,EAAM,SAAW,GAEpC,KAAK,cAAc,WAAWR,EAAI,GAAI,CACpC,KAAM,IAAI,KAAK,CAACQ,CAAiB,CAAC,EAClC,MAAOR,EAAI,OAAS,EACpB,OAAQA,EAAI,QAAU,EACtB,OAASA,EAAI,QAAU,GACvB,YAAaA,EAAI,aAAe,EAClC,CAAC,EACM,GACT,CAEQ,uBAAuBA,EAAoBQ,EAAmBN,EAAkD,CACtH,GAAIA,EACF,OAAIF,EAAI,KAAO,QACb,KAAK,cAAcA,EAAI,GAAI,6BAA8BA,EAAI,OAAS,CAAC,EAElE,GAGT,KAAK,gBAAgBA,EAAKQ,EAAON,CAAW,EAE5C,IAAMO,EAAKT,EAAI,IAAM,KAAK,cAAc,YAClCU,EAAQ,KAAK,cAAc,SAASD,CAAE,EAC5C,GAAIC,EAAO,CACT,IAAMJ,EAAS,KAAK,cAAcI,EAAOV,CAAG,EAC5C,OAAIA,EAAI,KAAO,OACNM,EAAO,KAAKP,IACjB,KAAK,cAAcU,EAAIV,EAAU,KAAO,gCAAiCC,EAAI,OAAS,CAAC,EAChF,GACR,EAEIM,EAAO,KAAK,IAAM,EAAI,CAC/B,CACA,MAAO,EACT,CAEQ,aAAaN,EAAoBQ,EAAmBN,EAA+B,CACzF,IAAMO,EAAKT,EAAI,IAAM,EACfW,EAAQX,EAAI,OAAS,EAM3B,IADqBA,EAAI,cAAgB,OACpB,IACnB,YAAK,cAAcS,EAAI,yCAA0CE,CAAK,EAC/D,GAIT,GAAIT,EACF,YAAK,cAAcO,EAAI,6BAA8BE,CAAK,EACnD,GAIT,GAAIH,EAAM,SAAW,EACnB,YAAK,cAAcC,EAAI,KAAME,CAAK,EAC3B,GAGT,IAAMC,EAASZ,EAAI,QAAU,GAE7B,GAAIY,IAAW,IACb,KAAK,cAAcH,EAAI,KAAME,CAAK,MAC7B,CACL,IAAME,EAAQb,EAAI,OAAS,EACrBc,EAASd,EAAI,QAAU,EAE7B,GAAI,CAACa,GAAS,CAACC,EACb,YAAK,cAAcL,EAAI,sDAAuDE,CAAK,EAC5E,GAGT,IAAMI,EAAgBH,IAAW,OAC3BI,EAAgBH,EAAQC,EAASC,EAEvC,GAAIP,EAAM,OAASQ,EACjB,YAAK,cAAcP,EAAI,iCAAkCE,CAAK,EACvD,GAGT,KAAK,cAAcF,EAAI,KAAME,CAAK,CACpC,CACA,MAAO,EACT,CAEQ,cAAcX,EAA6B,CAOjD,OALiBA,EAAI,gBAAkB,IAKrB,CAChB,IAAK,IACL,IAAK,IACH,KAAK,mBAAmB,EACxB,KAAK,cAAc,UAAU,EAC7B,MACF,IAAK,IACL,IAAK,IAKH,GAAIA,EAAI,KAAO,OAAW,CACxB,IAAMjB,EAAU,KAAK,sBAAsB,IAAIiB,EAAI,EAAE,EACjDjB,GACFA,EAAQ,QAAQ,QAAQ,EAE1B,KAAK,oBAAoBiB,EAAI,EAAE,EAC/B,KAAK,cAAc,WAAWA,EAAI,EAAE,CACtC,CACA,MACF,QAEE,KACJ,CACA,MAAO,EACT,CAEQ,cAAcS,EAAYQ,EAAiBN,EAAeO,EAA4B,CAC5F,IAAMC,EAAOF,IAAY,KAEzB,GADIE,GAAQR,GAAS,GACjB,CAACQ,GAAQR,GAAS,EAAG,OAEzB,IAAMS,EAAQF,EAAc,MAAMA,CAAW,GAAK,GAC5CG,EAAW,WAAWZ,CAAE,GAAGW,CAAK,IAAIH,CAAO,SACjD,KAAK,cAAc,MAAM,YAAY,iBAAiBI,CAAQ,CAChE,CAIQ,cAAcX,EAAwBV,EAAsC,CAClF,OAAO,KAAK,kBAAkBU,EAAOV,CAAG,EACrC,KAAK,IAAM,EAAI,EACf,MAAM,IAAM,EAAK,CACtB,CAEA,MAAc,kBAAkBU,EAAwBV,EAAmC,CACzF,IAAMsB,EAAa,KAAK,YACpBC,EAAkC,MAAM,KAAK,cAAcb,CAAK,EAEpE,GAAI,CACF,GAAIY,IAAe,KAAK,YAAa,MAAM,IAAI,MAAM,uBAAuB,EAC5E,IAAME,EAAQ,KAAK,IAAI,EAAGxB,EAAI,GAAK,CAAC,EAC9ByB,EAAQ,KAAK,IAAI,EAAGzB,EAAI,GAAK,CAAC,EAC9B0B,EAAQ1B,EAAI,aAAgBuB,EAAO,MAAQC,EAC3CG,EAAQ3B,EAAI,cAAiBuB,EAAO,OAASE,EAE7CG,EAAW,KAAK,IAAI,EAAGL,EAAO,MAAQC,CAAK,EAC3CK,EAAW,KAAK,IAAI,EAAGN,EAAO,OAASE,CAAK,EAC5CK,EAAa,KAAK,IAAI,EAAG,KAAK,IAAIJ,EAAOE,CAAQ,CAAC,EAClDG,EAAa,KAAK,IAAI,EAAG,KAAK,IAAIJ,EAAOE,CAAQ,CAAC,EAExD,GAAIC,IAAe,GAAKC,IAAe,EACrC,MAAM,IAAI,MAAM,0BAA0B,EAG5C,GAAIP,IAAU,GAAKC,IAAU,GAAKK,IAAeP,EAAO,OAASQ,IAAeR,EAAO,OAAQ,CAC7F,IAAMS,EAAU,MAAM,kBAAkBT,EAAQC,EAAOC,EAAOK,EAAYC,CAAU,EACpFR,EAAO,MAAM,EACbA,EAASS,CACX,CAEA,IAAMC,EAAK,KAAK,UAAU,YAAY,IAAI,KAAK,OAASC,EAAkB,MACpEC,EAAK,KAAK,UAAU,YAAY,IAAI,KAAK,QAAUD,EAAkB,OAIvEE,EACAC,EACArC,EAAI,UAAY,QAAaA,EAAI,OAAS,QAC5CoC,EAAUpC,EAAI,QACdqC,EAAUrC,EAAI,MACLA,EAAI,UAAY,QACzBoC,EAAUpC,EAAI,QACdqC,EAAU,KAAK,IAAI,EAAG,KAAK,KAAMd,EAAO,OAASA,EAAO,OAAUa,EAAUH,GAAME,CAAE,CAAC,GAC5EnC,EAAI,OAAS,QACtBqC,EAAUrC,EAAI,KACdoC,EAAU,KAAK,IAAI,EAAG,KAAK,KAAMb,EAAO,MAAQA,EAAO,QAAWc,EAAUF,GAAMF,CAAE,CAAC,IAErFG,EAAU,KAAK,KAAKb,EAAO,MAAQU,CAAE,EACrCI,EAAU,KAAK,KAAKd,EAAO,OAASY,CAAE,GAGxC,IAAIG,EAAIf,EAAO,MACXgB,EAAIhB,EAAO,OAQf,IALIvB,EAAI,UAAY,QAAaA,EAAI,OAAS,UAC5CsC,EAAI,KAAK,MAAMF,EAAUH,CAAE,EAC3BM,EAAI,KAAK,MAAMF,EAAUF,CAAE,GAGzBG,EAAIC,EAAI,KAAK,MAAM,WACrB,MAAM,IAAI,MAAM,2BAA2B,EAI7C,IAAMC,EAAS,KAAK,cAAc,MAAM,OAClCC,EAASD,EAAO,EAChBE,EAASF,EAAO,EAChBG,EAAaH,EAAO,MAOpBI,GADc5C,EAAI,SAAW,QAAaA,EAAI,OAAS,EACrB,SAAW,MAEnD,GAAIsC,IAAMf,EAAO,OAASgB,IAAMhB,EAAO,OAAQ,CAC7C,IAAMsB,EAAS,MAAM,kBAAkBtB,EAAQ,CAAE,YAAae,EAAG,aAAcC,CAAE,CAAC,EAClFhB,EAAO,MAAM,EACbA,EAASsB,CACX,CAGA,IAAMC,GAAU,KAAK,IAAI,KAAK,IAAI,EAAG9C,EAAI,SAAW,CAAC,EAAGiC,EAAK,CAAC,EACxDc,GAAU,KAAK,IAAI,KAAK,IAAI,EAAG/C,EAAI,SAAW,CAAC,EAAGmC,EAAK,CAAC,EAC9D,GAAIW,KAAY,GAAKC,KAAY,EAAG,CAKlC,IAAMC,EAAWhD,EAAI,UAAY,OAAa,KAAK,MAAMoC,EAAUH,CAAE,EAAIV,EAAO,MAAQuB,GAClFG,GAAWjD,EAAI,OAAS,OAAa,KAAK,MAAMqC,EAAUF,CAAE,EAAIZ,EAAO,OAASwB,GAChFG,EAAeC,EAAc,aAAa,OAAO,SAAUH,EAASC,EAAO,EAC3EG,GAAYF,EAAa,WAAW,IAAI,EAC9C,GAAI,CAACE,GACH,MAAM,IAAI,MAAM,wCAAwC,EAE1DA,GAAU,UAAU7B,EAAQuB,GAASC,EAAO,EAE5C,IAAMM,GAAe,MAAM,kBAAkBH,CAAY,EAMzD,GALAA,EAAa,MAAQA,EAAa,OAAS,EAC3C3B,EAAO,MAAM,EACbA,EAAS8B,GACTf,EAAIf,EAAO,MACXgB,EAAIhB,EAAO,OACPe,EAAIC,EAAI,KAAK,MAAM,WACrB,MAAM,IAAI,MAAM,2BAA2B,EAEzCvC,EAAI,UAAY,SAClBoC,EAAU,KAAK,KAAKb,EAAO,MAAQU,CAAE,GAEnCjC,EAAI,OAAS,SACfqC,EAAU,KAAK,KAAKd,EAAO,OAASY,CAAE,EAE1C,CAEA,GAAIb,IAAe,KAAK,YAAa,MAAM,IAAI,MAAM,uBAAuB,EAC5E,IAAMgC,GAAStD,EAAI,QAAU,EAO7B,GANA,KAAK,cAAc,SAASU,EAAM,GAAIa,EAAQ,GAAMqB,GAAOU,EAAM,EACjE/B,EAAS,OAKLvB,EAAI,iBAAmB,EAAG,CAE5B,IAAMuD,EAAWf,EAAO,MAAQG,EAChCH,EAAO,EAAIC,EAEXD,EAAO,EAAI,KAAK,IAAIE,EAASa,EAAU,CAAC,CAC1C,MAGEf,EAAO,EAAI,KAAK,IAAIC,EAASL,EAAS,KAAK,cAAc,IAAI,CAEjE,OAASoB,EAAG,CACV,MAAAjC,GAAQ,MAAM,EACRiC,CACR,CACF,CAGA,MAAc,cAAc9C,EAA8C,CACxE,IAAIF,EAAoB,IAAI,WAAW,MAAME,EAAM,KAAK,YAAY,CAAC,EAMrE,GAJIA,EAAM,cAAgB,MACxBF,EAAQ,MAAM,KAAK,gBAAgBA,CAAK,GAGtCE,EAAM,SAAW,IAAiB,CACpC,IAAM+C,EAAUC,GAAUlD,CAAK,EAG/B,GAAIiD,EAAQ,OAAS,aAAe,EAAEA,EAAQ,MAAQ,IAAM,EAAEA,EAAQ,OAAS,IAAMA,EAAQ,MAAQA,EAAQ,OAAS,KAAK,MAAM,WAC/H,MAAM,IAAI,WAAW,mDAAmD,EAE1E,IAAME,EAAO,IAAI,KAAK,CAACnD,CAAiB,EAAG,CAAE,KAAM,WAAY,CAAC,EAChE,GAAI,CAAC,OAAO,kBAAmB,CAC7B,IAAMoD,EAAM,IAAI,gBAAgBD,CAAI,EAC9BE,EAAM,IAAI,MAChB,OAAO,IAAI,QAAqB,CAACC,EAASC,IAAW,CACnDF,EAAI,iBAAiB,OAAQ,IAAM,CACjC,IAAI,gBAAgBD,CAAG,EACvB,IAAMI,EAASb,EAAc,aAAa,OAAO,SAAUU,EAAI,MAAOA,EAAI,MAAM,EAChFG,EAAO,WAAW,IAAI,GAAG,UAAUH,EAAK,EAAG,CAAC,EAC5C,kBAAkBG,CAAM,EAAE,KAAKF,CAAO,EAAE,MAAMC,CAAM,CACtD,CAAC,EACDF,EAAI,iBAAiB,QAAS,IAAM,CAClC,IAAI,gBAAgBD,CAAG,EACvBG,EAAO,IAAI,MAAM,sBAAsB,CAAC,CAC1C,CAAC,EACDF,EAAI,IAAMD,CACZ,CAAC,CACH,CACA,OAAO,kBAAkBD,CAAI,CAC/B,CAGA,IAAM9C,EAAQH,EAAM,MACdI,EAASJ,EAAM,OAErB,GAAI,CAACG,GAAS,CAACC,EACb,MAAM,IAAI,MAAM,8CAA8C,EAGhE,IAAMC,EAAgBL,EAAM,SAAW,OACjCM,EAAgBH,EAAQC,EAASC,EAEvC,GAAIP,EAAM,OAASQ,EACjB,MAAM,IAAI,MAAM,yBAAyB,EAG3C,IAAMiD,EAAapD,EAAQC,EAE3B,GAAIJ,EAAM,SAAW,GAEnB,OAAO,kBAAkB,IAAI,UAAU,IAAI,kBAAkBF,EAAM,OAAuBA,EAAM,WAAYyD,EAAa,CAAwC,EAAGpD,EAAOC,CAAM,CAAC,EAMpL,IAAM9B,EAAO,IAAI,kBAAkBiF,EAAa,CAAwC,EAClFC,EAAQ,IAAI,YAAY1D,EAAM,OAAQA,EAAM,WAAY,KAAK,MAAMA,EAAM,WAAa,CAAC,CAAC,EACxF2D,EAAQ,IAAI,YAAYnF,EAAK,MAAM,EACnCoF,EAAgBH,EAAa,GAE/BI,EAAY,EACZC,EAAY,EAChB,QAASlF,EAAI,EAAGA,EAAIgF,EAAehF,GAAK,EAAG,CACzC,IAAMmF,EAAKL,EAAMG,GAAW,EACtBG,EAAKN,EAAMG,GAAW,EACtBI,EAAKP,EAAMG,GAAW,EAE5BF,EAAMG,GAAW,EAAI,WAAaC,EAClCJ,EAAMG,GAAW,EAAI,WAAcC,IAAO,GAAOC,GAAM,EACvDL,EAAMG,GAAW,EAAI,WAAcE,IAAO,GAAOC,GAAM,GACvDN,EAAMG,GAAW,EAAI,WAAcG,IAAO,CAC5C,CAGA,IAAIC,EAAUN,EAAgB,EAC1BO,EAAUP,EAAgB,EAC9B,QAAShF,EAAIgF,EAAehF,EAAI6E,EAAY7E,IAC1CJ,EAAK2F,CAAO,EAAQnE,EAAMkE,CAAO,EACjC1F,EAAK2F,EAAU,CAAC,EAAInE,EAAMkE,EAAU,CAAC,EACrC1F,EAAK2F,EAAU,CAAC,EAAInE,EAAMkE,EAAU,CAAC,EACrC1F,EAAK2F,EAAU,CAAC,EAAI,IACpBD,GAAW,EACXC,GAAW,EAGb,OAAO,kBAAkB,IAAI,UAAU3F,EAAM6B,EAAOC,CAAM,CAAC,CAC7D,CAEA,MAAc,gBAAgB8D,EAA6C,CACzE,GAAI,CACF,OAAO,MAAM,KAAK,YAAYA,EAAY,SAAS,CACrD,OAASC,EAAO,CACd,GAAIA,aAAiB,WAAY,MAAMA,EACvC,OAAO,MAAM,KAAK,YAAYD,EAAY,aAAa,CACzD,CACF,CAEA,MAAc,YAAYA,EAAwBhE,EAAwD,CACxG,IAAMkE,EAAQ,KAAK,IAAI,KAAK,MAAM,eAAgB,KAAK,MAAM,WAAa,EAAG,KAAK,MAAM,aAAe,GAAO,EAC1GC,EAAW,EAaTC,EAXS,IAAI,eAA6B,CAC9C,KAAKC,EAAY,CACf,GAAIF,GAAYH,EAAW,OAAQ,CACjCK,EAAW,MAAM,EACjB,MACF,CACA,IAAM/F,EAAM,KAAK,IAAI6F,EAAW,KAAMH,EAAW,MAAM,EACvDK,EAAW,QAAQ,IAAI,WAAWL,EAAW,SAASG,EAAU7F,CAAG,CAAC,CAAC,EACrE6F,EAAW7F,CACb,CACF,CAAC,EACqB,YAAY,IAAI,oBAAoB0B,CAAM,CAAC,EAAE,UAAU,EACvEsE,EAAuB,CAAC,EAC1BC,EAAc,EAClB,GAAI,CACF,OAAa,CACX,GAAM,CAAE,KAAAC,EAAM,MAAAC,CAAM,EAAI,MAAML,EAAO,KAAK,EAC1C,GAAII,EAAM,MAEV,GADAD,GAAeE,EAAM,WACjBF,EAAcL,EAChB,YAAME,EAAO,OAAO,EAAE,MAAM,IAAM,CAAC,CAAC,EAC9B,IAAI,WAAW,uCAAuC,EAE9DE,EAAO,KAAKG,CAAK,CACnB,CACF,QAAE,CACAL,EAAO,YAAY,CACrB,CAEA,IAAM1E,EAAS,IAAI,WAAW6E,CAAW,EACrCG,EAAS,EACb,QAAWC,KAASL,EAClB5E,EAAO,IAAIiF,EAAOD,CAAM,EACxBA,GAAUC,EAAM,OAElB,OAAOjF,CACT,CAEA,IAAW,QAA+C,CACxD,OAAO,KAAK,cAAc,MAC5B,CAEA,IAAW,qBAAmD,CAC5D,OAAO,KAAK,cAAc,kBAC5B,CAEA,IAAW,sBAAkE,CAC3E,OAAO,KAAK,qBACd,CACF,EEl1BO,IAAMkF,EAAN,MAAMA,CAAyC,CA6BpD,YACmBC,EACjB,CADiB,cAAAA,EA3BnB,KAAQ,aAAe,EACvB,KAAiB,QAAwC,IAAI,IAU7D,KAAiB,oBAA2C,IAAI,IAChE,KAAiB,oBAA2C,IAAI,IAIhE,KAAiB,2BAA8BC,GAA4B,CACzE,IAAMC,EAAU,KAAK,oBAAoB,IAAID,CAAS,EAClDC,IAAY,SACd,KAAK,oBAAoB,OAAOA,CAAO,EACvC,KAAK,oBAAoB,OAAOD,CAAS,EACzC,KAAK,QAAQ,OAAOC,CAAO,EAE/B,EACA,KAAQ,cAA+B,CAAE,UAAW,GAAM,MAAO,MAAO,OAAQ,EAAG,UAAW,KAAM,EAKlG,KAAK,wBAA0B,KAAK,SAAS,eAC7C,KAAK,uBAA0BD,GAAsB,CACnD,KAAK,0BAA0BA,CAAS,EACxC,KAAK,2BAA2BA,CAAS,CAC3C,EACA,KAAK,SAAS,eAAiB,KAAK,sBACtC,CAEO,OAAc,CACnB,KAAK,aAAe,EACpB,KAAK,QAAQ,MAAM,EACnB,KAAK,oBAAoB,MAAM,EAC/B,KAAK,oBAAoB,MAAM,CACjC,CAEO,SAAgB,CACrB,KAAK,MAAM,EACP,KAAK,SAAS,iBAAmB,KAAK,yBACxC,KAAK,SAAS,eAAiB,KAAK,wBAExC,CAEO,WAAWE,EAAwBC,EAAgD,CACxF,IAAMC,EAAUF,GAAM,KAAK,eAErBG,EAAe,KAAK,oBAAoB,IAAID,CAAO,EACrDC,IAAiB,SACnB,KAAK,SAAS,YAAYA,CAAY,EACtC,KAAK,oBAAoB,OAAOD,CAAO,EACvC,KAAK,oBAAoB,OAAOC,CAAY,GAG1C,CAAC,KAAK,QAAQ,IAAID,CAAO,GAAK,KAAK,QAAQ,MAAQN,EAAkB,kBACvE,KAAK,wBAAwB,EAS/B,IAAMQ,EAAY,KAAK,SAAS,SAAS,EAAI,IAC7C,KAAK,QAAQ,OAAOF,CAAO,EAC3B,IAAIG,EAAgB,EACpB,QAAWC,KAAS,KAAK,QAAQ,OAAO,EAAGD,GAAiBC,EAAM,KAAK,KACvE,QAAWC,IAAe,CAAC,GAAO,EAAI,EACpC,OAAW,CAACC,EAAUF,CAAK,IAAK,KAAK,QAAS,CAC5C,GAAID,EAAgBJ,EAAU,KAAK,MAAQG,EAAW,MAClD,KAAK,oBAAoB,IAAII,CAAQ,IAAMD,IAC/CF,GAAiBC,EAAM,KAAK,KAC5B,KAAK,WAAWE,CAAQ,EAC1B,CAGF,YAAK,QAAQ,IAAIN,EAAS,CACxB,GAAGD,EACH,GAAIC,CACN,CAAC,EACMA,CACT,CAEO,SAASH,EAAiBO,EAAwCG,EAAoBC,EAAmBC,EAAsB,CAKpI,IAAMR,EAAe,KAAK,oBAAoB,IAAIJ,CAAO,EACrDI,IAAiB,QACnB,KAAK,oBAAoB,OAAOA,CAAY,EAE9C,KAAK,cAAc,UAAYM,EAC/B,KAAK,cAAc,MAAQC,EAC3B,KAAK,cAAc,OAASC,EAC5B,IAAMb,EAAY,KAAK,SAAS,SAASQ,EAAO,KAAK,aAAa,EAClE,KAAK,oBAAoB,IAAIP,EAASD,CAAS,EAC/C,KAAK,oBAAoB,IAAIA,EAAWC,CAAO,CACjD,CAEO,SAASA,EAA8C,CAC5D,OAAO,KAAK,QAAQ,IAAIA,CAAO,CACjC,CAEO,WAAWA,EAAuB,CACvC,KAAK,QAAQ,OAAOA,CAAO,EAC3B,IAAMD,EAAY,KAAK,oBAAoB,IAAIC,CAAO,EAClDD,IAAc,SAChB,KAAK,SAAS,YAAYA,CAAS,EACnC,KAAK,oBAAoB,OAAOC,CAAO,EACvC,KAAK,oBAAoB,OAAOD,CAAS,EAE7C,CAEO,WAAkB,CACvB,KAAK,QAAQ,MAAM,EACnB,QAAWA,KAAa,KAAK,oBAAoB,OAAO,EACtD,KAAK,SAAS,YAAYA,CAAS,EAErC,KAAK,oBAAoB,MAAM,EAC/B,KAAK,oBAAoB,MAAM,CACjC,CAEA,IAAW,QAA+C,CACxD,OAAO,KAAK,OACd,CAEA,IAAW,oBAAkD,CAC3D,OAAO,KAAK,mBACd,CAEA,IAAW,aAAsB,CAC/B,OAAO,KAAK,aAAe,CAC7B,CAEQ,yBAAgC,CACtC,OAAW,CAACC,CAAO,IAAK,KAAK,QAAS,CACpC,GAAI,KAAK,QAAQ,MAAQH,EAAkB,iBAAmB,EAC5D,MAEG,KAAK,oBAAoB,IAAIG,CAAO,GACvC,KAAK,QAAQ,OAAOA,CAAO,CAE/B,CACF,CACF,EA5JaH,EACa,iBAAmB,IADtC,IAAMgB,GAANhB,ECVP,IAAAiB,EAA8E,OAI9E,IAAAC,GAAsC,QAGtC,IAAMC,GAAkB,QAGlBC,GAAkB,mBACxBA,GAAgB,IAAI,qBAAmB,EAGhC,IAAMC,GAAN,KAAyD,CAK9D,YACmBC,EACAC,EACAC,EACjB,CAHiB,WAAAF,EACA,cAAAC,EACA,mBAAAC,EAPnB,KAAQ,MAAQ,EAChB,KAAQ,SAAW,MAQjB,iBAAa,CACX,YAAa,KAAK,MAAM,WAAa,EACrC,QAASJ,GACT,aAAc,KAAK,MAAM,iBAC3B,CAAC,EAAE,KAAKK,GAAK,KAAK,KAAOA,CAAC,CAC5B,CAEO,OAAc,CAOf,KAAK,OACP,KAAK,KAAK,QAAQ,EAEjB,KAAK,KAAa,SAAS,KAAK,CAAC,EAClC,KAAK,KAAK,KAAK,EAAGL,GAAiB,KAAK,MAAM,iBAAiB,EAEnE,CAEO,KAAKM,EAAuB,CAGjC,GAFA,KAAK,MAAQ,EACb,KAAK,SAAW,GACZ,KAAK,KAAM,CACb,IAAMC,EAAYD,EAAO,OAAO,CAAC,IAAM,EAAI,EAAIE,GAC7C,KAAK,cAAc,MAAM,cAAc,aACvC,KAAK,cAAc,MAAM,eAAe,MAAM,EAChD,KAAK,KAAK,KAAKD,EAAW,KAAM,KAAK,MAAM,iBAAiB,CAC9D,CACF,CAEO,IAAIE,EAAmBC,EAAeC,EAAmB,CAC9D,GAAI,OAAK,UAAY,CAAC,KAAK,MAI3B,IADA,KAAK,OAASA,EAAMD,EAChB,KAAK,MAAQ,KAAK,MAAM,eAAgB,CAC1C,QAAQ,KAAK,gCAAgC,EAC7C,KAAK,SAAW,GAChB,KAAK,KAAK,QAAQ,EAClB,MACF,CACA,GAAI,CACF,KAAK,KAAK,OAAOD,EAAMC,EAAOC,CAAG,CACnC,OAASC,EAAG,CACV,QAAQ,KAAK,uCAAuCA,CAAC,EAAE,EACvD,KAAK,SAAW,GAChB,KAAK,KAAK,QAAQ,CACpB,EACF,CAEO,OAAOC,EAA8C,CAC1D,GAAI,KAAK,UAAY,CAACA,GAAW,CAAC,KAAK,KACrC,MAAO,GAGT,IAAMC,EAAQ,KAAK,KAAK,MAClBC,EAAS,KAAK,KAAK,OAGzB,GAAI,CAACD,GAAS,CAACC,EACb,OAAIA,GACF,KAAK,SAAS,cAAcA,CAAM,EAE7B,GAGT,IAAMC,EAASC,EAAc,aAAa,OAAWH,EAAOC,CAAM,EAClE,OAAAC,EAAO,WAAW,IAAI,GAAG,aAAa,IAAI,UAAU,KAAK,KAAK,MAAyCF,EAAOC,CAAM,EAAG,EAAG,CAAC,EACvH,KAAK,KAAK,YAAchB,IAC1B,KAAK,KAAK,QAAQ,EAEpB,KAAK,SAAS,SAASiB,CAAM,EACtB,EACT,CACF,EASA,SAASR,GAAgBU,EAAqBC,EAAgD,CAC5F,IAAIC,EAAK,EACT,GAAI,CAACD,EAGH,OAAOC,EAET,GAAIF,EAAK,UAAU,EACjB,GAAIA,EAAK,YAAY,EACnBE,EAAKC,GAAUF,EAAO,WAAW,IAAI,UAC5BD,EAAK,QAAQ,EAAG,CACzB,IAAMI,EAAKJ,EAAK,YAAqC,WAAWA,EAAK,WAAW,CAAC,EACjFE,KAAK,cAAW,GAAGE,CAAC,CACtB,MACEF,EAAKC,GAAUF,EAAO,KAAKD,EAAK,WAAW,CAAC,EAAE,IAAI,UAGhDA,EAAK,YAAY,EACnBE,EAAKC,GAAUF,EAAO,WAAW,IAAI,UAC5BD,EAAK,QAAQ,EAAG,CACzB,IAAMI,EAAKJ,EAAK,YAAqC,WAAWA,EAAK,WAAW,CAAC,EACjFE,KAAK,cAAW,GAAGE,CAAC,CACtB,MACEF,EAAKC,GAAUF,EAAO,KAAKD,EAAK,WAAW,CAAC,EAAE,IAAI,EAGtD,OAAOE,CACT,CAGA,SAASC,GAAUE,EAAyB,CAC1C,OAAI,aAAmBA,GACfA,EAAQ,MAAS,IAAMA,IAAU,EAAI,MAAS,IAAMA,IAAU,GAAK,MAAS,EAAIA,IAAU,GAAK,GACzG,CCtIO,IAAMC,GAAN,KAAwB,CAE7B,YACmBC,EACAC,EACAC,EACAC,EACjB,CAJiB,cAAAH,EACA,WAAAC,EACA,eAAAC,EACA,eAAAC,EALnB,KAAQ,cAA+B,CAAE,UAAW,GAAM,MAAO,MAAO,OAAQ,EAAG,UAAW,OAAQ,CAMnG,CAMI,SAASC,EAA4C,CAC1D,KAAK,cAAc,UAAY,KAAK,MAAM,eAC1C,KAAK,SAAS,SAASA,EAAK,KAAK,aAAa,CAChD,CAOO,cAAcC,EAAsB,CACzC,GAAI,KAAK,MAAM,eAAgB,CAC7B,IAAIC,EAAW,KAAK,UAAU,UAC1BA,EAAS,QAAU,IAAMA,EAAS,SAAW,MAC/CA,EAAWC,GAEb,IAAMC,EAAO,KAAK,KAAKH,EAASC,EAAS,MAAM,EAC/C,QAASG,EAAI,EAAGA,EAAID,EAAM,EAAEC,EAC1B,KAAK,UAAU,MAAM,cAAc,SAAS,CAEhD,CACF,CACF,ECrCO,IAAMC,GAAN,KAAsB,CAE3B,YACmBC,EACjB,CADiB,cAAAA,EAFnB,KAAQ,cAA+B,CAAE,UAAW,GAAM,MAAO,MAAO,OAAQ,EAAG,UAAW,KAAM,CAGjG,CAMI,SAASC,EAA4C,CAC1D,KAAK,SAAS,SAASA,EAAK,KAAK,aAAa,CAChD,CACF,ECiCA,IAAMC,GAAsC,CAC1C,kBAAmB,GACnB,WAAY,SACZ,aAAc,GACd,eAAgB,GAChB,kBAAmB,KACnB,eAAgB,SAChB,aAAc,IACd,gBAAiB,GACjB,WAAY,GACZ,aAAc,SACd,aAAc,GACd,eAAgB,QAClB,EAGMC,GAAyB,KAsBxB,IAAMC,GAAN,KAAsD,CAW3D,YAAYC,EAAoC,CANhD,KAAQ,aAA8B,CAAC,EAEvC,KAAQ,UAAwC,IAAI,IACpD,KAAiB,cAAgB,IAAIC,EACrC,KAAgB,aAA6B,KAAK,cAAc,MAG9D,KAAK,MAAQ,OAAO,OAAO,CAAC,EAAGC,GAAiBF,CAAI,EACpD,KAAK,aAAe,OAAO,OAAO,CAAC,EAAGE,GAAiBF,CAAI,CAC7D,CAEO,SAAgB,CACrB,QAAWG,KAAW,KAAK,UAAU,OAAO,EAAGA,EAAQ,MAAM,EAC7D,QAAWC,KAAO,KAAK,aACrBA,EAAI,QAAQ,EAEd,KAAK,aAAa,OAAS,EAC3B,KAAK,UAAU,MAAM,EACrB,KAAK,cAAc,QAAQ,CAC7B,CAEQ,iBAAiBC,EAA2B,CAClD,QAAWD,KAAOC,EAChB,KAAK,aAAa,KAAKD,CAAG,CAE9B,CAEO,SAASE,EAA8B,CAS5C,GARA,KAAK,UAAYA,EAGjB,KAAK,UAAY,IAAIC,EAAcD,CAAQ,EAC3C,KAAK,SAAW,IAAIE,EAAaF,EAAU,KAAK,UAAW,KAAK,KAAK,EACrE,KAAK,SAAS,aAAe,IAAM,KAAK,cAAc,KAAK,EAGvD,KAAK,MAAM,kBAAmB,CAChC,IAAMG,EAAYH,EAAS,QAAQ,eAAiB,CAAC,EACrDG,EAAU,iBAAmB,GAC7BA,EAAU,kBAAoB,GAC9BA,EAAU,gBAAkB,GAC5BH,EAAS,QAAQ,cAAgBG,CACnC,CAiCA,GA/BA,KAAK,cACH,KAAK,UACL,KAAK,SAGLH,EAAS,OAAO,mBAAmB,CAAE,OAAQ,IAAK,MAAO,GAAI,EAAGI,GAAU,KAAK,QAAQA,CAAM,CAAC,EAC9FJ,EAAS,OAAO,mBAAmB,CAAE,OAAQ,IAAK,MAAO,GAAI,EAAGI,GAAU,KAAK,QAAQA,CAAM,CAAC,EAC9FJ,EAAS,OAAO,mBAAmB,CAAE,MAAO,GAAI,EAAGI,GAAU,KAAK,KAAKA,CAAM,CAAC,EAC9EJ,EAAS,OAAO,mBAAmB,CAAE,OAAQ,IAAK,MAAO,GAAI,EAAGI,GAAU,KAAK,yBAAyBA,CAAM,CAAC,EAG/GJ,EAAS,SAASK,GAAS,KAAK,UAAU,OAAOA,CAAK,CAAC,EAQvDL,EAAS,OAAO,mBAAmB,CAAE,cAAe,IAAK,MAAO,GAAI,EAAG,IAAM,KAAK,MAAM,CAAC,EACzFA,EAAS,OAAO,mBAAmB,CAAE,MAAO,GAAI,EAAG,IAAM,KAAK,MAAM,CAAC,EACrEA,EAAS,MAAM,cAAc,eAAe,IAAM,KAAK,MAAM,CAAC,EAG9DA,EAAS,OAAO,eAAe,IAAM,KAAK,UAAU,cAAc,CAAC,EAGnEA,EAAS,SAASM,GAAW,KAAK,UAAU,eAAeA,CAAO,CAAC,CACrE,EAGI,KAAK,MAAM,aAAc,CAC3B,IAAMC,EAAe,IAAIC,GAAkB,KAAK,SAAW,KAAK,MAAO,KAAK,UAAYR,CAAQ,EAC1FS,EAAe,IAAIC,GAAa,KAAK,MAAOH,EAAcP,CAAQ,EACxE,KAAK,UAAU,IAAI,QAASS,CAAY,EACxC,KAAK,cACHT,EAAS,MAAM,cAAc,QAAQ,mBAAmB,CAAE,MAAO,GAAI,EAAGS,CAAY,CACtF,CACF,CAGA,GAAI,KAAK,MAAM,WAAY,CACzB,IAAME,EAAa,IAAIC,GAAgB,KAAK,QAAS,EAC/CC,EAAa,IAAIC,GAAW,KAAK,MAAO,KAAK,UAAYH,EAAYX,CAAQ,EACnF,KAAK,UAAU,IAAI,MAAOa,CAAU,EACpC,KAAK,cACHb,EAAS,MAAM,cAAc,QAAQ,mBAAmB,KAAMa,CAAU,CAC1E,CACF,CAGA,GAAI,KAAK,MAAM,aAAc,CAC3B,IAAME,EAAe,IAAIC,GAAkB,KAAK,QAAS,EACnDC,EAAe,IAAIC,GAAqB,KAAK,MAAO,KAAK,UAAYH,EAAcf,CAAQ,EACjG,KAAK,UAAU,IAAI,QAASiB,CAAY,EACxC,KAAK,cACHF,EACAE,EACAjB,EAAS,MAAM,cAAc,QAAQ,mBAAmB,CAAE,MAAO,GAAI,EAAGiB,CAAY,CACtF,CACF,CACF,CAGO,OAAiB,CAEtB,KAAK,MAAM,eAAiB,KAAK,aAAa,eAC9C,KAAK,MAAM,kBAAoB,KAAK,aAAa,kBAEjD,KAAK,UAAU,MAAM,EAErB,QAAWpB,KAAW,KAAK,UAAU,OAAO,EAC1CA,EAAQ,MAAM,EAEhB,MAAO,EACT,CAEA,IAAW,cAAuB,CAChC,OAAO,KAAK,UAAU,SAAS,GAAK,EACtC,CAEA,IAAW,aAAasB,EAAe,CACrC,KAAK,UAAU,SAASA,CAAK,EAC7B,KAAK,MAAM,aAAeA,CAC5B,CAEA,IAAW,cAAuB,CAChC,OAAI,KAAK,SACA,KAAK,SAAS,SAAS,EAEzB,EACT,CAEA,IAAW,iBAA2B,CACpC,OAAO,KAAK,MAAM,eACpB,CAEA,IAAW,gBAAgBC,EAAgB,CACzC,KAAK,MAAM,gBAAkBA,EAC7B,KAAK,WAAW,gBAAgBA,CAAK,CACvC,CAEO,qBAAqBC,EAAWC,EAA0C,CAC/E,OAAO,KAAK,UAAU,qBAAqBD,EAAGC,CAAC,CACjD,CAEO,wBAAwBD,EAAWC,EAA0C,CAClF,OAAO,KAAK,UAAU,wBAAwBD,EAAGC,CAAC,CACpD,CAEQ,QAAQC,EAAiB,CAC/B,KAAK,WAAW,MAAM,MAAMA,EAAG,EAAK,CACtC,CAEQ,QAAQnB,EAAwC,CACtD,QAASoB,EAAI,EAAGA,EAAIpB,EAAO,OAAQ,EAAEoB,EAC3BpB,EAAOoB,CAAC,IACT,KACH,KAAK,MAAM,eAAiB,IAIlC,MAAO,EACT,CAEQ,QAAQpB,EAAwC,CACtD,QAASoB,EAAI,EAAGA,EAAIpB,EAAO,OAAQ,EAAEoB,EAC3BpB,EAAOoB,CAAC,IACT,KACH,KAAK,MAAM,eAAiB,IAIlC,MAAO,EACT,CAGQ,KAAKpB,EAAwC,CACnD,OAAIA,EAAO,CAAC,EACH,GAOL,KAAK,MAAM,cACb,KAAK,QAAQ,kBAAkB,EACxB,IAEF,EACT,CAYQ,yBAAyBA,EAAwC,CACvE,GAAIA,EAAO,OAAS,EAClB,MAAO,GAET,GAAIA,EAAO,CAAC,IAAM,EAChB,OAAQA,EAAO,CAAC,EAAG,CACjB,IAAK,GACH,YAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,MAAwB,KAAK,MAAM,iBAAiB,GAAG,EAC/E,GACT,IAAK,GACH,KAAK,MAAM,kBAAoB,KAAK,aAAa,kBACjD,KAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,MAAwB,KAAK,MAAM,iBAAiB,GAAG,EAEtF,QAAWP,KAAW,KAAK,UAAU,OAAO,EAC1CA,EAAQ,MAAM,EAEhB,MAAO,GACT,IAAK,GACH,OAAIO,EAAO,OAAS,GAAK,EAAEA,EAAO,CAAC,YAAa,QAAUA,EAAO,CAAC,GAAKqB,IACrE,KAAK,MAAM,kBAAoBrB,EAAO,CAAC,EACvC,KAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,MAAwB,KAAK,MAAM,iBAAiB,GAAG,GAEtF,KAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,KAA4B,EAEtD,GACT,IAAK,GACH,YAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,MAAwBqB,EAAsB,GAAG,EACzE,GACT,QACE,YAAK,QAAQ,SAASrB,EAAO,CAAC,CAAC,KAA4B,EACpD,EACX,CAEF,GAAIA,EAAO,CAAC,IAAM,EAChB,OAAQA,EAAO,CAAC,EAAG,CAEjB,IAAK,GACH,IAAIsB,EAAQ,KAAK,WAAW,YAAY,IAAI,OAAO,MAC/CC,EAAS,KAAK,WAAW,YAAY,IAAI,OAAO,OACpD,GAAI,CAACD,GAAS,CAACC,EAAQ,CAGrB,IAAMC,EAAWC,EACjBH,GAAS,KAAK,WAAW,MAAQ,IAAME,EAAS,MAChDD,GAAU,KAAK,WAAW,MAAQ,IAAMC,EAAS,MACnD,CACA,GAAIF,EAAQC,EAAS,KAAK,MAAM,WAC9B,KAAK,QAAQ,SAASvB,EAAO,CAAC,CAAC,MAAwBsB,EAAM,QAAQ,CAAC,CAAC,IAAIC,EAAO,QAAQ,CAAC,CAAC,GAAG,MAC1F,CAEL,IAAMN,EAAI,KAAK,MAAM,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC,EACrD,KAAK,QAAQ,SAASjB,EAAO,CAAC,CAAC,MAAwBiB,CAAC,IAAIA,CAAC,GAAG,CAClE,CACA,MAAO,GACT,IAAK,GAEH,IAAMA,EAAI,KAAK,MAAM,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC,EACrD,YAAK,QAAQ,SAASjB,EAAO,CAAC,CAAC,MAAwBiB,CAAC,IAAIA,CAAC,GAAG,EACzD,GACT,QACE,YAAK,QAAQ,SAASjB,EAAO,CAAC,CAAC,KAA4B,EACpD,EACX,CAGF,YAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,KAA0B,EAClD,EACT,CACF",
-+  "names": ["exports", "red", "n", "green", "blue", "alpha", "toRGBA8888", "r", "g", "b", "a", "fromRGBA8888", "color", "nearestColorIndex", "palette", "min", "idx", "i", "dr", "dg", "db", "clamp", "low", "high", "value", "h2c", "t1", "t2", "c", "HLStoRGB", "h", "l", "s", "v", "normalizeRGB", "normalizeHLS", "p", "d", "require_lib", "__commonJSMin", "exports", "InWasm", "z", "b", "r", "def", "t", "s", "d", "m", "W", "e", "require_Base64Decoder_wasm", "__commonJSMin", "exports", "inwasm_runtime_1", "wasmDecode", "MAP", "el", "D", "i", "EMPTY", "Base64Decoder", "keepSize", "maxBytes", "initialBytes", "m", "bytes", "requested", "needed", "newSize", "addPages", "data", "require_QoiDecoder_wasm", "__commonJSMin", "exports", "inwasm_runtime_1", "wasmQoiDecode", "QoiDecoder", "keepSize", "d", "pixels", "ib", "dl", "bytes", "chunkP", "exports", "Colors_1", "wasm_1", "decodeBase64", "bytestring", "result", "WASM_BYTES", "WASM_MODULE", "NULL_CANVAS", "CallbackProxy", "width", "mode", "DEFAULT_OPTIONS", "DecoderAsync", "opts", "cbProxy", "importObj", "inst", "Decoder", "exports", "_instance", "_cbProxy", "module", "pixels", "offset", "additionalPixels", "newCanvas", "adv", "remaining", "c", "i", "fillColor", "palette", "paletteLimit", "truncate", "data", "start", "end", "p", "length", "j", "currentWidth", "escape", "final", "finalOffset", "bw", "currentHeight", "decode", "dec", "decodeAsync", "toDisposable", "fn", "DisposableStore", "o", "d", "Disposable", "MutableDisposable", "value", "Emitter", "listener", "thisArgs", "disposables", "toDisposable", "entry", "result", "idx", "event", "listeners", "len", "EventUtils", "forward", "from", "to", "e", "map", "i", "any", "events", "store", "DisposableStore", "runAndSubscribe", "handler", "initial", "import_Colors", "ImageRenderer", "_ImageRenderer", "Disposable", "_terminal", "MutableDisposable", "parent", "option", "toDisposable", "localDocument", "width", "height", "canvas", "ctx", "buffer", "imgData", "img", "value", "start", "end", "layer", "y", "w", "h", "imgSpec", "tileId", "col", "row", "count", "sourceWidth", "sourceHeight", "cols", "sx", "sy", "dx", "dy", "finalWidth", "finalHeight", "spec", "currentWidth", "currentHeight", "originalWidth", "originalHeight", "scaledWidth", "scaledHeight", "renderer", "key", "screenElement", "bWidth", "blueprint", "d32", "black", "white", "shift", "offset", "x", "ctx2", "i", "placeholder", "bitmap", "CELL_SIZE_DEFAULT", "ExtendedAttrsImage", "_ExtendedAttrsImage", "ext", "urlId", "imageId", "tileId", "value", "val", "EMPTY_ATTRS", "ImageStorage", "_terminal", "_renderer", "_opts", "e", "spec", "storedPixels", "id", "zero", "img", "opts", "cellSize", "cols", "rows", "buffer", "termCols", "termRows", "originX", "originY", "offset", "tileCount", "row", "line", "col", "endMarker", "imgSpec", "range", "hasTopImages", "hasBottomImages", "start", "end", "drawCalls", "placeholderCalls", "startTile", "startCol", "count", "a", "b", "call", "metrics", "oldCol", "tilesPerRow", "hasData", "rightCol", "lastTile", "expandCol", "x", "y", "orig", "canvas", "ImageRenderer", "room", "used", "current", "old", "oldSpec", "imgId", "import_Base64Decoder", "import_QoiDecoder", "toStr", "data", "s", "i", "toInt", "v", "toSize", "toName", "bs", "b", "DECODERS", "FILE_MARKER", "MULTIPARTFILE_MARKER", "FILEPART_MARKER", "FILEEND_MARKER", "REPORTCELLSIZE_MARKER", "MAX_FIELDCHARS", "HeaderParser", "k", "start", "end", "state", "pos", "buffer", "c", "UNSUPPORTED_TYPE", "imageType", "d", "d32", "width", "height", "jpgSize", "dim", "pos", "limit", "i", "len", "blockLength", "DEFAULT_HEADER", "IIPHandler", "_opts", "_renderer", "_storage", "_coreTerminal", "HeaderParser", "maxEncodedBytes", "initialBytes", "Base64Decoder", "QoiDecoder", "data", "start", "end", "dataPos", "success", "seqType", "w", "CELL_SIZE_DEFAULT", "h", "scale", "report", "cond", "metrics", "UNSUPPORTED_TYPE", "imageType", "blob", "canvas", "ImageRenderer", "generation", "bm", "e", "cw", "ch", "width", "height", "rw", "rh", "wf", "hf", "f", "s", "total", "cdim", "import_Base64Decoder", "parseKittyCommand", "data", "cmd", "parts", "part", "eqIdx", "key", "value", "numValue", "DECODER_OK", "KittyGraphicsHandler", "_opts", "_renderer", "_kittyStorage", "_coreTerminal", "key", "pending", "data", "start", "end", "controlEnd", "i", "copyLength", "parseKittyCommand", "payloadStart", "pendingKey", "previousEncodedSize", "decoderToRelease", "decoderCapacity", "maxPending", "oldest", "Base64Decoder", "success", "cmd", "isMoreComing", "decodeError", "finalCmd", "decoder", "imageBytes", "result", "str", "bytes", "id", "image", "quiet", "format", "width", "height", "bytesPerPixel", "expectedBytes", "message", "placementId", "isOk", "pPart", "response", "generation", "bitmap", "cropX", "cropY", "cropW", "cropH", "maxCropW", "maxCropH", "finalCropW", "finalCropH", "cropped", "cw", "CELL_SIZE_DEFAULT", "ch", "imgCols", "imgRows", "w", "h", "buffer", "savedX", "savedY", "savedYbase", "layer", "scaled", "xOffset", "yOffset", "canvasW", "canvasH", "offsetCanvas", "ImageRenderer", "offsetCtx", "offsetBitmap", "zIndex", "scrolled", "e", "metrics", "imageType", "blob", "url", "img", "resolve", "reject", "canvas", "pixelCount", "src32", "dst32", "alignedPixels", "srcOffset", "dstOffset", "b0", "b1", "b2", "srcByte", "dstByte", "compressed", "error", "limit", "offsetIn", "reader", "controller", "chunks", "totalLength", "done", "value", "offset", "chunk", "_KittyImageStorage", "_storage", "storageId", "kittyId", "id", "imageData", "imageId", "oldStorageId", "byteLimit", "retainedBytes", "image", "evictPlaced", "oldestId", "scrolling", "layer", "zIndex", "KittyImageStorage", "import_Colors", "import_Decoder", "MEM_PERMA_LIMIT", "DEFAULT_PALETTE", "SixelHandler", "_opts", "_storage", "_coreTerminal", "d", "params", "fillColor", "extractActiveBg", "data", "start", "end", "e", "success", "width", "height", "canvas", "ImageRenderer", "attr", "colors", "bg", "convertLe", "t", "color", "SixelImageStorage", "_storage", "_opts", "_renderer", "_terminal", "img", "height", "cellSize", "CELL_SIZE_DEFAULT", "rows", "i", "IIPImageStorage", "_storage", "img", "DEFAULT_OPTIONS", "MAX_SIXEL_PALETTE_SIZE", "ImageAddon", "opts", "Emitter", "DEFAULT_OPTIONS", "handler", "obj", "args", "terminal", "ImageRenderer", "ImageStorage", "windowOps", "params", "range", "metrics", "sixelStorage", "SixelImageStorage", "sixelHandler", "SixelHandler", "iipStorage", "IIPImageStorage", "iipHandler", "IIPHandler", "kittyStorage", "KittyImageStorage", "kittyHandler", "KittyGraphicsHandler", "limit", "value", "x", "y", "s", "i", "MAX_SIXEL_PALETTE_SIZE", "width", "height", "cellSize", "CELL_SIZE_DEFAULT"]
++  "sourcesContent": [null, "\"use strict\";\n/**\n * Copyright (c) 2022, 2026 Joerg Breitbart\n * @license MIT\n */\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.InWasm = InWasm;\nlet z = (s) => {\n    if (Uint8Array.fromBase64)\n        return Uint8Array.fromBase64(s);\n    if (typeof Buffer !== 'undefined')\n        return Buffer.from(s, 'base64');\n    const b = atob(s);\n    const r = new Uint8Array(b.length);\n    for (let i = 0; i < r.length; ++i)\n        r[i] = b.charCodeAt(i);\n    return r;\n};\nfunction InWasm(def) {\n    if (def.d) {\n        const { t, s, d } = def;\n        let b;\n        let m;\n        const W = WebAssembly;\n        if (t === 0 /* OutputType.INSTANCE */) {\n            if (s)\n                return (e) => new W.Instance(m || (m = new W.Module(b || (b = z(d)))), e);\n            return (e) => m\n                ? W.instantiate(m, e)\n                : W.instantiate(b || (b = z(d)), e).then(r => (m = r.module) && r.instance);\n        }\n        if (t === 1 /* OutputType.MODULE */) {\n            if (s)\n                return () => m || (m = new W.Module(b || (b = z(d))));\n            return () => m\n                ? Promise.resolve(m)\n                : W.compile(b || (b = z(d))).then(r => m = r);\n        }\n        if (s)\n            return () => b || (b = z(d));\n        return () => Promise.resolve(b || (b = z(d)));\n    }\n    if (typeof _wasmCtx === 'undefined')\n        throw new Error('must run \"inwasm\"');\n    _wasmCtx.add(def);\n}\n//# sourceMappingURL=index.js.map", "\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\n/**\n * Copyright (c) 2023, 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nconst inwasm_runtime_1 = require(\"inwasm-runtime\");\n/**\n * wasm base64 decoder.\n */\nconst wasmDecode = (0, inwasm_runtime_1.InWasm)(/*inwasm#828e69684093b2c6:rdef-start:\"decode\"*/{s:1,t:0,d:'AGFzbQEAAAABBQFgAAF/Ag8BA2VudgZtZW1vcnkCAAEDAwIAAAcNAgNkZWMAAANlbmQAAQqLBgKZBAEKf0GIKCgCAEGgKGohAUGEKCgCACIDQaAoaiEAQYAoKAIAQQFrQXxxIgRBoChqIQUgBEEQayADSgRAIARBkChqIQMDQCABIABBA2otAABBAnQoAoAgIABBAmotAABBAnQoAoAYIABBAWotAABBAnQoAoAQIAAtAABBAnQoAoAIcnJyIgY2AgAgAUEDaiAAQQdqLQAAQQJ0KAKAICAAQQZqLQAAQQJ0KAKAGCAAQQVqLQAAQQJ0KAKAECAAQQRqLQAAQQJ0KAKACHJyciIHNgIAIAFBBmogAEELai0AAEECdCgCgCAgAEEKai0AAEECdCgCgBggAEEJai0AAEECdCgCgBAgAEEIai0AAEECdCgCgAhycnIiCDYCACABQQlqIABBD2otAABBAnQoAoAgIABBDmotAABBAnQoAoAYIABBDWotAABBAnQoAoAQIABBDGotAABBAnQoAoAIcnJyIgk2AgAgAiAGciAHciAIciAJciECIAFBDGohASAAQRBqIgAgA0kNAAsLIAAgBUkEQANAIAEgAEEDai0AAEECdCgCgCAgAEECai0AAEECdCgCgBggAEEBai0AAEECdCgCgBAgAC0AAEECdCgCgAhycnIiAzYCACACIANyIQIgAUEDaiEBIABBBGoiACAFSQ0ACwtBfyEAIAJB////B00Ef0GEKCAENgIAQYgoIAFBoChrNgIAQQAFQX8LC+0BAQR/AkBBgCgoAgAiAUGEKCgCACIAa0EFTgRAQX8hAxAADQFBgCgoAgAhAUGEKCgCACEAC0F/IQMgASAAayIBQQJIDQAgAC0AoShBAnQoAoAQIAAtAKAoQQJ0KAKACHIhAgJ/IAFBBEYEQEEDQQQgAC0AoyhBPUYbIAAtAKIoQT1GayEBC0EBIAFBA0kNABogAC0AoihBAnQoAoAYIAJyIQJBAiABQQRHDQAaIAAtAKMoQQJ0KAKAICACciECQQMLIQEgAkH///8HSw0AQQAhA0GIKCgCACIAIAI2AKAoQYgoIAAgAWo2AgALIAML'}/*inwasm#828e69684093b2c6:rdef-end:\"decode\"*/);\n// SIMD version (speedup ~1.4x, not covered by tests yet)\n/*\nconst wasmDecode = InWasm({\n  name: 'decode',\n  type: OutputType.INSTANCE,\n  mode: OutputMode.SYNC,\n  srctype: 'Clang-C',\n  imports: {\n    env: { memory: new WebAssembly.Memory({ initial: 1 }) }\n  },\n  exports: {\n    dec: () => 0,\n    end: () => 0\n  },\n  compile: {\n    switches: ['-msimd128', '-Wl,-z,stack-size=0', '-Wl,--stack-first']\n  },\n  code: `\n    #include <wasm_simd128.h>\n    typedef struct {\n      unsigned int wp;\n      unsigned int sp;\n      unsigned int dp;\n      unsigned int e_size;\n      unsigned int dummy[4];\n      unsigned char data[0];\n    } State;\n\n    unsigned int *D0 = (unsigned int *) ${P32.D0 * 4};\n    unsigned int *D1 = (unsigned int *) ${P32.D1 * 4};\n    unsigned int *D2 = (unsigned int *) ${P32.D2 * 4};\n    unsigned int *D3 = (unsigned int *) ${P32.D3 * 4};\n    State *state = (State *) ${P32.STATE * 4};\n\n    #define packed_byte(x) wasm_i8x16_splat((char) x)\n    #define packed_dword(x) wasm_i32x4_splat(x)\n    #define masked(x, mask) wasm_v128_and(x, wasm_i32x4_splat(mask))\n\n    __attribute__((noinline)) int dec() {\n      unsigned int nsp = (state->wp - 1) & ~3;\n      unsigned char *src = state->data + state->sp;\n      unsigned char *end = state->data + nsp;\n      unsigned char *dst = state->data + state->dp;\n      unsigned int error = 0;\n\n      v128_t err = wasm_i8x16_splat(0);\n      unsigned char *end16 = state->data + (nsp & ~15);\n      while (src < end16) {\n        v128_t data = wasm_v128_load((v128_t *) src);\n\n        // wasm-simd rewrite of http://0x80.pl/notesen/2016-01-17-sse-base64-decoding.html#vector-lookup-pshufb\n        const v128_t higher_nibble = wasm_u32x4_shr(data, 4) & packed_byte(0x0f);\n        const char linv = 1;\n        const char hinv = 0;\n\n        const v128_t lower_bound_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          linv, linv, 0x2b, 0x30,\n          0x41, 0x50, 0x61, 0x70,\n          linv, linv, linv, linv,\n          linv, linv, linv, linv\n        );\n        const v128_t upper_bound_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          hinv, hinv, 0x2b, 0x39,\n          0x4f, 0x5a, 0x6f, 0x7a,\n          hinv, hinv, hinv, hinv,\n          hinv, hinv, hinv, hinv\n        );\n        // the difference between the shift and lower bound\n        const v128_t shift_LUT = wasm_i8x16_const(\n          // order: 0 1 2 3 4 5 6 7 8 9 a b c d e f\n          0x00,        0x00,        0x3e - 0x2b, 0x34 - 0x30,\n          0x00 - 0x41, 0x0f - 0x50, 0x1a - 0x61, 0x29 - 0x70,\n          0x00,        0x00,        0x00,        0x00,\n          0x00,        0x00,        0x00,        0x00\n        );\n\n        const v128_t upper_bound = wasm_i8x16_swizzle(upper_bound_LUT, higher_nibble);\n        const v128_t lower_bound = wasm_i8x16_swizzle(lower_bound_LUT, higher_nibble);\n\n        const v128_t below = wasm_i8x16_lt(data, lower_bound);\n        const v128_t above = wasm_i8x16_gt(data, upper_bound);\n        const v128_t eq_2f = wasm_i8x16_eq(data, packed_byte(0x2f));\n\n        // in_range = not (below or above) or eq_2f\n        // outside  = not in_range = below or above and not eq_2f (from deMorgan law)\n        const v128_t outside = wasm_v128_andnot(eq_2f, above | below);\n        err = wasm_v128_or(err, outside);\n\n        const v128_t shift  = wasm_i8x16_swizzle(shift_LUT, higher_nibble);\n        const v128_t t0     = wasm_i8x16_add(data, shift);\n        v128_t v = wasm_i8x16_add(t0, wasm_v128_and(eq_2f, packed_byte(-3)));\n\n        // pack bytes\n        const v128_t ca = masked(v, 0x003f003f);\n        const v128_t db = masked(v, 0x3f003f00);\n        const v128_t t00 = wasm_v128_or(wasm_u32x4_shr(db, 8), wasm_i32x4_shl(ca, 6));\n        v128_t res = wasm_v128_or(wasm_u32x4_shr(t00, 16), wasm_i32x4_shl(t00, 12));\n        res = wasm_i8x16_swizzle(res, wasm_i8x16_const(2, 1, 0, 6, 5, 4, 10, 9, 8, 14, 13, 12, 16, 16, 16, 16));\n\n        wasm_v128_store((v128_t *) dst, res);\n        dst += 12;\n        src += 16;\n      }\n      //if (wasm_i8x16_bitmask(err) != 0) return -1;\n      if (wasm_v128_any_true(err)) return -1;\n\n      // operate on 4-byte blocks\n      while (src < end) {\n        error |= *((unsigned int *) dst) = D0[src[0]] | D1[src[1]] | D2[src[2]] | D3[src[3]];\n        dst += 3;\n        src += 4;\n      }\n      if (error >> 24) return -1;\n      state->sp = nsp;\n      state->dp = dst - state->data;\n      return 0;\n    }\n\n    int end() {\n      int rem = state->wp - state->sp;\n      if (rem > 4 && dec()) return -1;\n      rem = state->wp - state->sp;\n      if (rem < 2) return -1;\n\n      unsigned char *src = state->data + state->sp;\n      if (rem == 4) {\n        if (src[3] == 61) rem--;\n        if (src[2] == 61) rem--;\n      }\n      unsigned int accu = D0[src[0]] | D1[src[1]];\n      int dp = 1;\n      if (rem > 2) {\n        accu |= D2[src[2]];\n        dp++;\n        if (rem == 4) {\n          accu |= D3[src[3]];\n          dp++;\n        }\n      }\n      if (accu >> 24) return -1;\n      *((unsigned int *) (state->data + state->dp)) = accu;\n      state->dp += dp;\n      return 0;\n    }\n    `\n});\n*/\n// base64 map\nconst MAP = new Uint8Array('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'\n    .split('')\n    .map(el => el.charCodeAt(0)));\n// init decoder maps in LE order\nconst D = new Uint32Array(1024);\nD.fill(0xFF000000);\nfor (let i = 0; i < MAP.length; ++i)\n    D[MAP[i]] = i << 2;\nfor (let i = 0; i < MAP.length; ++i)\n    D[256 + MAP[i]] = i >> 4 | ((i << 4) & 0xFF) << 8;\nfor (let i = 0; i < MAP.length; ++i)\n    D[512 + MAP[i]] = (i >> 2) << 8 | ((i << 6) & 0xFF) << 16;\nfor (let i = 0; i < MAP.length; ++i)\n    D[768 + MAP[i]] = i << 16;\nconst EMPTY = new Uint8Array(0);\n/**\n * base64 stream decoder.\n *\n * Features / assumptions:\n * - lazy chunkwise decoding\n * - errors out on any non base64 chars (no support for NL formatted base64)\n * - decodes in wasm\n * - inplace decoding to save memory\n * - supports a keepSize for lazy memory release\n */\nclass Base64Decoder {\n    /**\n     * @param keepSize Keep the wasm instance below this limit when calling `release()`.\n     * @param maxBytes Max allowed bytes to allocate.\n     * @param initialBytes Initial bytes to allocate.\n     */\n    constructor(keepSize, maxBytes, initialBytes) {\n        this._inst = null;\n        this._ended = true;\n        this._bytes = 0;\n        this.keepSize = keepSize !== null && keepSize !== void 0 ? keepSize : 1048576 /* Bytes.KEEP */;\n        this.maxBytes = maxBytes !== null && maxBytes !== void 0 ? maxBytes : 4294901760 /* Bytes.MAX */;\n        this._bytes = initialBytes !== null && initialBytes !== void 0 ? initialBytes : 32768 /* Bytes.INITIAL */;\n        if (this._bytes > this.maxBytes || this.maxBytes > 4294901760 /* Bytes.MAX */) {\n            throw new Error('invalid byte settings');\n        }\n    }\n    /**\n     * Currently decoded bytes (borrowed).\n     * Must be accessed before calling `release` or `init`.\n     */\n    get data8() {\n        return this._inst ? this._d.subarray(0, this._m32[1282 /* P32.STATE_DP */]) : EMPTY;\n    }\n    /**\n     * Release memory conditionally based on `keepSize`.\n     * If memory gets released, also the wasm instance will be freed and recreated on next `init`,\n     * otherwise the instance will be reused.\n     */\n    release() {\n        if (!this._inst)\n            return;\n        if (this._bytes > this.keepSize) {\n            this._inst = this._m32 = this._d = this._mem = null;\n        }\n        else {\n            this._m32[1280 /* P32.STATE_WP */] = 0;\n            this._m32[1281 /* P32.STATE_SP */] = 0;\n            this._m32[1282 /* P32.STATE_DP */] = 0;\n        }\n    }\n    /**\n     * Initializes the decoder for new base64 data.\n     * Must be called before doing any decoding attempts.\n     * The method will either spawn a new wasm instance or grow\n     * the needed memory of an existing instance.\n     * @param maxBytes Max allowed bytes to allocate (overwrites ctor value).\n     * @param initialBytes Initial bytes to allocate (overwrites ctor value).\n     */\n    init(maxBytes, initialBytes) {\n        this.maxBytes = maxBytes !== null && maxBytes !== void 0 ? maxBytes : this.maxBytes;\n        this._bytes = initialBytes !== null && initialBytes !== void 0 ? initialBytes : Math.min(this._bytes, this.maxBytes);\n        if (this._bytes > this.maxBytes || this.maxBytes > 4294901760 /* Bytes.MAX */) {\n            throw Error('invalid byte settings');\n        }\n        let m = this._m32;\n        const bytes = this._bytes + 5152 /* Bytes._DATA_OFFSET */;\n        if (!this._inst) {\n            this._mem = new WebAssembly.Memory({ initial: Math.ceil(bytes / 65536) });\n            this._inst = wasmDecode({ env: { memory: this._mem } });\n            m = new Uint32Array(this._mem.buffer, 0);\n            m.set(D, 256 /* P32.D0 */);\n            this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n        }\n        else if (this._mem.buffer.byteLength < bytes) {\n            this._mem.grow(Math.ceil((bytes - this._mem.buffer.byteLength) / 65536));\n            m = new Uint32Array(this._mem.buffer, 0);\n            this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n        }\n        m[1280 /* P32.STATE_WP */] = 0;\n        m[1281 /* P32.STATE_SP */] = 0;\n        m[1282 /* P32.STATE_DP */] = 0;\n        this._m32 = m;\n        this._ended = false;\n    }\n    /**\n     * Realloc memory. Realloc only happens, if the requested\n     * size doesn't fit in the current memory.\n     * The new size will be capped by `maxBytes`.\n     * @param requested Bytes to be stored.\n     */\n    _realloc(requested) {\n        const needed = this._m32[1280 /* P32.STATE_WP */] + requested;\n        if (this._bytes < needed) {\n            if (needed > this.maxBytes) {\n                return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n            }\n            let newSize = this._bytes;\n            while ((newSize *= 2) < needed) { }\n            newSize = Math.min(newSize, this.maxBytes);\n            if (newSize < needed) {\n                return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n            }\n            if (newSize + 5152 /* Bytes._DATA_OFFSET */ > this._mem.buffer.byteLength) {\n                const addPages = Math.ceil((newSize + 5152 /* Bytes._DATA_OFFSET */ - this._mem.buffer.byteLength) / 65536);\n                this._mem.grow(addPages);\n                this._m32 = new Uint32Array(this._mem.buffer, 0);\n                this._d = new Uint8Array(this._mem.buffer, 5152 /* Bytes._DATA_OFFSET */);\n            }\n            this._bytes = newSize;\n        }\n        return 0 /* DecodeStatus.OK */;\n    }\n    /**\n     * Put bytes in `data` into the decoder.\n     * Additionally decodes the payload, if it reached 2^17 bytes.\n     * The return value indicates the type of issue.\n     * @param data Bytes to be loaded.\n     */\n    put(data) {\n        if (!this._inst || this._ended) {\n            return -2 /* DecodeStatus.NOT_INITIALIZED */;\n        }\n        if (this._realloc(data.length)) {\n            return -3 /* DecodeStatus.SIZE_EXCEEDED */;\n        }\n        const m = this._m32;\n        this._d.set(data, m[1280 /* P32.STATE_WP */]);\n        m[1280 /* P32.STATE_WP */] += data.length;\n        // max chunk in input handler is 2^17, try to run in \"tandem mode\"\n        return m[1280 /* P32.STATE_WP */] - m[1281 /* P32.STATE_SP */] >= 131072\n            ? this._inst.exports.dec()\n            : 0 /* DecodeStatus.OK */;\n    }\n    /**\n     * End the current decoding.\n     * Also decodes leftover payload from previous put calls.\n     */\n    end() {\n        this._ended = true;\n        return this._inst\n            ? this._inst.exports.end()\n            : -2 /* DecodeStatus.NOT_INITIALIZED */;\n    }\n    /**\n     * Bytes loaded into the decoder.\n     */\n    get loadedBytes() {\n        return this._inst\n            ? this._m32[1280 /* P32.STATE_WP */]\n            : 0;\n    }\n    /**\n     * Free bytes to feed to the decoder.\n     */\n    get freeBytes() {\n        return this._inst\n            ? this.maxBytes - this._m32[1280 /* P32.STATE_WP */]\n            : 0;\n    }\n}\nexports.default = Base64Decoder;\n//# sourceMappingURL=Base64Decoder.wasm.js.map", "\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\n/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nconst inwasm_runtime_1 = require(\"inwasm-runtime\");\nconst wasmQoiDecode = (0, inwasm_runtime_1.InWasm)(/*inwasm#459f9e1bfb80b1a8:rdef-start:\"qoi_decode\"*/{s:1,t:0,d:'AGFzbQEAAAABCgJgAABgA39/fwACDwEDZW52Bm1lbW9yeQIAAQMDAgABBwcBA2RlYwABCAEACu4EAgwAQQBBAEGAAvwLAAveBAEJf0EAQQBBgAL8CwAgAUEXTgRAIAAgAWpBCGshCkGACCEBIAJBAnRBgAhqIQsgAEEOaiEDQf8BIQZBACECA0AgA0EBaiEHIAMtAAAiCEE/cSEAAkACQCAIQcABcSIJRQRAIABBAnQiAC0AAyEGIAAtAAIhBCAALQABIQUgAC0AACECIAchAwwBCwJAIAhB/QFLDQAgCUHAAUcNACAFQQVsIAJBA2xqIARBB2xqIAZBC2xqQT9xQQJ0IgMgBDoAAiADIAU6AAEgAyACOgAAIANBA2ogBjoAAANAIAEgAjoAACABQQNqIAY6AAAgAUECaiAEOgAAIAFBAWogBToAACABQQRqIQEgAEUEQCAHIQMMBAsgAEEBayEAIAEgC0kNAAsgByEDDAILAn8CQAJAAkAgCEH+AWsOAgABAgsgAy0AAyEEIAMtAAIhBSADLQABIQIgA0EEagwCCyADKAIBIgJBGHYhBiACQRB2IQQgAkEIdiEFIANBBWoMAQsgCUGAAUcEQCAHIAlBwABHDQEaIAQgCEEDcWpBAmshBCACIABBBHZqQQJrIQIgBSAIQQJ2QQNxakECayEFIAcMAQsgBCAAQShrIgkgAy0AASIHQQ9xamohBCACIAdBBHYgCWpqIQIgACAFakEgayEFIANBAmoLIQMgBUEFbCACQQNsaiAEQQdsaiAGQQtsakE/cUECdCIAIAQ6AAIgACAFOgABIAAgAjoAACAAQQNqIAY6AAALIAEgBjoAAyABIAQ6AAIgASAFOgABIAEgAjoAACABQQRqIQELIAMgCkkNAAsLCw=='}/*inwasm#459f9e1bfb80b1a8:rdef-end:\"qoi_decode\"*/);\nclass QoiDecoder {\n    constructor(keepSize) {\n        this.keepSize = keepSize;\n        this.width = 0;\n        this.height = 0;\n    }\n    decode(d) {\n        this.width = d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7];\n        this.height = d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11];\n        const pixels = this.width * this.height;\n        const ib = pixels * 4;\n        const dl = d.length;\n        /**\n         * byte/offset calculation:\n         * To save some memory we dont reserve full memory for decoded + encoded,\n         * but place encoded at the end of decoded plus 50% security distance\n         * to avoid reads before writes positions:\n         *\n         * encoded < decoded (good compression)\n         *    enc                                              ####################\n         *    dec                 #######################################\n         *                        ^                            ^\n         *                        DST_P                        CHUNK_P\n         *\n         * encoded > decoded (degenerated compression, should not happen)\n         *    enc                           ##############################\n         *    dec                 ####################\n         *                        ^         ^\n         *                        DST_P     CHUNK_P\n         *\n         * There is still a chance for overlapping r/w positions in case the compressed\n         * data has very different pixel progression, yet the 50% security distance\n         * should deal with that, as QOI will bloat data by 25% at max (RGB -> OP byte + RGB).\n         * Since we always assume RGBA at decoding stage, the possible bloat reduces to 20% at max.\n         */\n        const bytes = Math.max(ib, dl) + (Math.min(ib, dl) >> 1) + 4096;\n        if (!this._inst) {\n            this._mem = new WebAssembly.Memory({ initial: Math.ceil(bytes / 65536) });\n            this._inst = wasmQoiDecode({ env: { memory: this._mem } });\n        }\n        else if (this._mem.buffer.byteLength < bytes) {\n            this._mem.grow(Math.ceil((bytes - this._mem.buffer.byteLength) / 65536));\n            this._d = null;\n        }\n        if (!this._d) {\n            this._d = new Uint8Array(this._mem.buffer);\n        }\n        // put src data at the end of memory, also align to 256\n        const chunkP = (this._mem.buffer.byteLength - dl) & ~0xFF;\n        this._d.set(d, chunkP);\n        this._inst.exports.dec(chunkP, dl, pixels);\n        return this._d.subarray(1024 /* P8.DST_P */, 1024 /* P8.DST_P */ + ib);\n    }\n    release() {\n        if (!this._inst)\n            return;\n        if (this._mem.buffer.byteLength > this.keepSize) {\n            this._inst = this._d = this._mem = null;\n        }\n    }\n}\nexports.default = QoiDecoder;\n//# sourceMappingURL=QoiDecoder.wasm.js.map", null, null, "/**\n * Copyright (c) 2024-2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Minimal lifecycle utilities for xterm.js core.\n * Simplified from VS Code's lifecycle.ts - no tracking/leak detection.\n */\n\nexport interface IDisposable {\n  dispose(): void;\n}\n\nexport function toDisposable(fn: () => void): IDisposable {\n  return { dispose: fn };\n}\n\nexport function dispose<T extends IDisposable>(disposable: T): T;\nexport function dispose<T extends IDisposable>(disposable: T | undefined): T | undefined;\nexport function dispose<T extends IDisposable>(disposables: T[]): T[];\nexport function dispose<T extends IDisposable>(arg: T | T[] | undefined): T | T[] | undefined {\n  if (!arg) {\n    return arg;\n  }\n  if (Array.isArray(arg)) {\n    for (const d of arg) {\n      d.dispose();\n    }\n    return [];\n  }\n  arg.dispose();\n  return arg;\n}\n\nexport function combinedDisposable(...disposables: IDisposable[]): IDisposable {\n  return toDisposable(() => dispose(disposables));\n}\n\nexport class DisposableStore implements IDisposable {\n  private readonly _disposables = new Set<IDisposable>();\n  private _isDisposed = false;\n\n  public get isDisposed(): boolean {\n    return this._isDisposed;\n  }\n\n  public add<T extends IDisposable>(o: T): T {\n    if (this._isDisposed) {\n      o.dispose();\n    } else {\n      this._disposables.add(o);\n    }\n    return o;\n  }\n\n  public dispose(): void {\n    if (this._isDisposed) {\n      return;\n    }\n    this._isDisposed = true;\n    for (const d of this._disposables) {\n      d.dispose();\n    }\n    this._disposables.clear();\n  }\n\n  public clear(): void {\n    for (const d of this._disposables) {\n      d.dispose();\n    }\n    this._disposables.clear();\n  }\n}\n\nexport abstract class Disposable implements IDisposable {\n  public static readonly None: IDisposable = Object.freeze({ dispose() { } });\n\n  protected readonly _store = new DisposableStore();\n\n  public dispose(): void {\n    this._store.dispose();\n  }\n\n  protected _register<T extends IDisposable>(o: T): T {\n    return this._store.add(o);\n  }\n}\n\nexport class MutableDisposable<T extends IDisposable> implements IDisposable {\n  private _value: T | undefined;\n  private _isDisposed = false;\n\n  public get value(): T | undefined {\n    return this._isDisposed ? undefined : this._value;\n  }\n\n  public set value(value: T | undefined) {\n    if (this._isDisposed || value === this._value) {\n      return;\n    }\n    this._value?.dispose();\n    this._value = value;\n  }\n\n  public clear(): void {\n    this.value = undefined;\n  }\n\n  public dispose(): void {\n    this._isDisposed = true;\n    this._value?.dispose();\n    this._value = undefined;\n  }\n}\n", "/**\n * Copyright (c) 2024-2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Minimal event utilities for xterm.js core.\n * Simplified from VS Code's event.ts - no leak detection/profiling.\n */\n\nimport { IDisposable, DisposableStore, toDisposable } from './Lifecycle';\n\nexport interface IEvent<T> {\n  (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore): IDisposable;\n}\n\nexport class Emitter<T> {\n  private _listeners: { fn: (e: T) => any, thisArgs: any }[] = [];\n  private _disposed = false;\n  private _event: IEvent<T> | undefined;\n\n  public get event(): IEvent<T> {\n    if (this._event) {\n      return this._event;\n    }\n    this._event = (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      if (this._disposed) {\n        return toDisposable(() => {});\n      }\n\n      const entry = { fn: listener, thisArgs };\n      this._listeners = this._listeners.slice();\n      this._listeners.push(entry);\n\n      const result = toDisposable(() => {\n        const idx = this._listeners.indexOf(entry);\n        if (idx !== -1) {\n          this._listeners = this._listeners.slice();\n          this._listeners.splice(idx, 1);\n        }\n      });\n\n      if (disposables) {\n        if (Array.isArray(disposables)) {\n          disposables.push(result);\n        } else {\n          disposables.add(result);\n        }\n      }\n\n      return result;\n    };\n    return this._event;\n  }\n\n  public fire(event: T): void {\n    if (this._disposed || !this._listeners.length) {\n      return;\n    }\n    if (this._listeners.length === 1) {\n      this._listeners[0].fn.call(this._listeners[0].thisArgs, event);\n      return;\n    }\n    const listeners = this._listeners;\n    for (let i = 0, len = listeners.length; i < len; ++i) {\n      listeners[i].fn.call(listeners[i].thisArgs, event);\n    }\n  }\n\n  public dispose(): void {\n    if (this._disposed) {\n      return;\n    }\n    this._disposed = true;\n    this._listeners.length = 0;\n  }\n}\n\nexport namespace EventUtils {\n  export function forward<T>(from: IEvent<T>, to: Emitter<T>): IDisposable {\n    return from(e => to.fire(e));\n  }\n\n  export function map<I, O>(event: IEvent<I>, map: (i: I) => O): IEvent<O> {\n    return (listener: (e: O) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      return event(i => listener.call(thisArgs, map(i)), undefined, disposables);\n    };\n  }\n\n  export function any<T>(...events: IEvent<T>[]): IEvent<T>;\n  export function any(...events: IEvent<any>[]): IEvent<void>;\n  export function any<T>(...events: IEvent<T>[]): IEvent<T> {\n    return (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => {\n      const store = new DisposableStore();\n      for (const event of events) {\n        store.add(event(e => listener.call(thisArgs, e)));\n      }\n      if (disposables) {\n        if (Array.isArray(disposables)) {\n          disposables.push(store);\n        } else {\n          disposables.add(store);\n        }\n      }\n      return store;\n    };\n  }\n\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T) => void, initial: T): IDisposable;\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T | undefined) => void): IDisposable;\n  export function runAndSubscribe<T>(event: IEvent<T>, handler: (e: T | undefined) => void, initial?: T): IDisposable {\n    handler(initial);\n    return event(e => handler(e));\n  }\n}\n", "/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { toRGBA8888 } from 'sixel/lib/Colors';\nimport { IDisposable } from '@xterm/xterm';\nimport { ICellSize, ImageLayer, ITerminalExt, IImageSpec, IRenderDimensions, IRenderService } from './Types';\nimport { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';\n\nconst enum Constants {\n  PLACEHOLDER_LENGTH = 4096,\n  PLACEHOLDER_HEIGHT = 24\n}\n\n/**\n * ImageRenderer - terminal frontend extension:\n * - provide primitives for canvas, ImageData, Bitmap (static)\n * - add canvas layer to DOM (browser only for now)\n * - draw image tiles onRender\n */\nexport class ImageRenderer extends Disposable implements IDisposable {\n  /** @deprecated Kept for backward compat \u2014 points to top layer canvas. */\n  public get canvas(): HTMLCanvasElement | undefined { return this._layers.get('top')?.canvas; }\n  private _layers = new Map<ImageLayer, CanvasRenderingContext2D>();\n  private _placeholder: HTMLCanvasElement | undefined;\n  private _placeholderBitmap: ImageBitmap | undefined;\n  private _optionsRefresh = this._register(new MutableDisposable());\n  private _oldOpen: ((parent: HTMLElement) => void) | undefined;\n  private _renderService: IRenderService | undefined;\n  private _oldSetRenderer: ((renderer: any) => void) | undefined;\n\n  // drawing primitive - canvas\n  public static createCanvas(localDocument: Document | undefined, width: number, height: number): HTMLCanvasElement {\n    /**\n     * NOTE: We normally dont care, from which document the canvas\n     * gets created, so we can fall back to global document,\n     * if the terminal has no document associated yet.\n     * This way early image loads before calling .open keep working\n     * (still discouraged though, as the metrics will be screwed up).\n     * Only the DOM output canvas should be on the terminal's document,\n     * which gets explicitly checked in `insertLayerToDom`.\n     */\n    const canvas = (localDocument ?? document).createElement('canvas');\n    canvas.width = width | 0;\n    canvas.height = height | 0;\n    return canvas;\n  }\n\n  // drawing primitive - ImageData with optional buffer\n  public static createImageData(ctx: CanvasRenderingContext2D, width: number, height: number, buffer?: ArrayBuffer): ImageData {\n    if (typeof ImageData !== 'function') {\n      const imgData = ctx.createImageData(width, height);\n      if (buffer) {\n        imgData.data.set(new Uint8ClampedArray(buffer, 0, width * height * 4));\n      }\n      return imgData;\n    }\n    return buffer\n      ? new ImageData(new Uint8ClampedArray(buffer, 0, width * height * 4), width, height)\n      : new ImageData(width, height);\n  }\n\n  // drawing primitive - ImageBitmap\n  public static createImageBitmap(img: ImageBitmapSource): Promise<ImageBitmap | undefined> {\n    if (typeof createImageBitmap !== 'function') {\n      return Promise.resolve(undefined);\n    }\n    return createImageBitmap(img);\n  }\n\n\n  constructor(private _terminal: ITerminalExt) {\n    super();\n    this._oldOpen = this._terminal._core.open;\n    this._terminal._core.open = (parent: HTMLElement): void => {\n      this._oldOpen?.call(this._terminal._core, parent);\n      this._open();\n    };\n    if (this._terminal._core.screenElement) {\n      this._open();\n    }\n    // hack to spot fontSize changes\n    this._optionsRefresh.value = this._terminal._core.optionsService.onOptionChange(option => {\n      if (option === 'fontSize') {\n        this.rescaleCanvas();\n        this._renderService?.refreshRows(0, this._terminal.rows);\n      }\n    });\n    this._register(toDisposable(() => {\n      this.removeLayerFromDom();\n      this.removeLayerFromDom('bottom');\n      if (this._terminal._core && this._oldOpen) {\n        this._terminal._core.open = this._oldOpen;\n        this._oldOpen = undefined;\n      }\n      if (this._renderService && this._oldSetRenderer) {\n        this._renderService.setRenderer = this._oldSetRenderer;\n        this._oldSetRenderer = undefined;\n      }\n      this._renderService = undefined;\n      this._layers.clear();\n      this._placeholderBitmap?.close();\n      this._placeholderBitmap = undefined;\n      this._placeholder = undefined;\n    }));\n  }\n\n  /**\n   * Enable the placeholder.\n   */\n  public showPlaceholder(value: boolean): void {\n    if (value) {\n      if (!this._placeholder && this.cellSize.height !== -1) {\n        this._createPlaceHolder(Math.max(this.cellSize.height + 1, Constants.PLACEHOLDER_HEIGHT));\n      }\n    } else {\n      this._placeholderBitmap?.close();\n      this._placeholderBitmap = undefined;\n      this._placeholder = undefined;\n    }\n    this._renderService?.refreshRows(0, this._terminal.rows);\n  }\n\n  /**\n   * Dimensions of the terminal.\n   * Forwarded from internal render service.\n   */\n  public get dimensions(): IRenderDimensions | undefined {\n    return this._terminal.dimensions;\n  }\n\n  /**\n   * Current cell size (float).\n   */\n  public get cellSize(): ICellSize {\n    return {\n      width: this.dimensions?.css.cell.width || -1,\n      height: this.dimensions?.css.cell.height || -1\n    };\n  }\n\n  /**\n   * Clear a region of the image layer canvas.\n   */\n  public clearLines(start: number, end: number, layer?: ImageLayer): void {\n    const y = start * (this.dimensions?.css.cell.height || 0);\n    const w = this.dimensions?.css.canvas.width || 0;\n    const h = (end + 1 - start) * (this.dimensions?.css.cell.height || 0);\n    if (!layer || layer === 'top') {\n      this._layers.get('top')?.clearRect(0, y, w, h);\n    }\n    if (!layer || layer === 'bottom') {\n      this._layers.get('bottom')?.clearRect(0, y, w, h);\n    }\n  }\n\n  /**\n   * Clear whole image canvas.\n   */\n  public clearAll(layer?: ImageLayer): void {\n    if (!layer || layer === 'top') {\n      const ctx = this._layers.get('top');\n      ctx?.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);\n    }\n    if (!layer || layer === 'bottom') {\n      const ctx = this._layers.get('bottom');\n      ctx?.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);\n    }\n  }\n\n  /**\n   * Draw neighboring tiles on the image layer canvas.\n   */\n  public draw(imgSpec: IImageSpec, tileId: number, col: number, row: number, count: number = 1): void {\n    const ctx = this._layers.get(imgSpec.layer);\n    if (!ctx) {\n      return;\n    }\n    const { width, height } = this.cellSize;\n\n    // Don't try to draw anything, if we cannot get valid renderer metrics.\n    if (width === -1 || height === -1) {\n      return;\n    }\n\n    this._rescaleImage(imgSpec, width, height);\n    const img = imgSpec.actual!;\n    const { width: sourceWidth, height: sourceHeight } = imgSpec.actualCellSize;\n    const cols = Math.ceil(img.width / sourceWidth);\n\n    const sx = (tileId % cols) * sourceWidth;\n    const sy = Math.floor(tileId / cols) * sourceHeight;\n    const dx = col * width;\n    const dy = row * height;\n\n    // safari bug: never access image source out of bounds\n    const finalWidth = count * sourceWidth + sx > img.width ? img.width - sx : count * sourceWidth;\n    const finalHeight = sy + sourceHeight > img.height ? img.height - sy : sourceHeight;\n\n    // Floor all pixel offsets to get stable tile mapping without any overflows.\n    // Note: For not pixel perfect aligned cells like in the DOM renderer\n    // this will move a tile slightly to the top/left (subpixel range, thus ignore it).\n    // FIX #34: avoid striping on displays with pixelDeviceRatio != 1 by ceiling height and width\n    ctx.drawImage(\n      img,\n      Math.floor(sx), Math.floor(sy), Math.ceil(finalWidth), Math.ceil(finalHeight),\n      Math.floor(dx), Math.floor(dy), Math.ceil(finalWidth * width / sourceWidth), Math.ceil(finalHeight * height / sourceHeight)\n    );\n  }\n\n  /**\n   * Extract a single tile from an image.\n   */\n  public extractTile(imgSpec: IImageSpec, tileId: number): HTMLCanvasElement | undefined {\n    const { width, height } = this.cellSize;\n    // Don't try to draw anything, if we cannot get valid renderer metrics.\n    if (width === -1 || height === -1) {\n      return;\n    }\n    this._rescaleImage(imgSpec, width, height);\n    const img = imgSpec.actual!;\n    const { width: sourceWidth, height: sourceHeight } = imgSpec.actualCellSize;\n    const cols = Math.ceil(img.width / sourceWidth);\n    const sx = (tileId % cols) * sourceWidth;\n    const sy = Math.floor(tileId / cols) * sourceHeight;\n    const finalWidth = sourceWidth + sx > img.width ? img.width - sx : sourceWidth;\n    const finalHeight = sy + sourceHeight > img.height ? img.height - sy : sourceHeight;\n\n    const canvas = ImageRenderer.createCanvas(this.document, Math.ceil(finalWidth * width / sourceWidth), Math.ceil(finalHeight * height / sourceHeight));\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      ctx.drawImage(\n        img,\n        Math.floor(sx), Math.floor(sy), Math.floor(finalWidth), Math.floor(finalHeight),\n        0, 0, canvas.width, canvas.height\n      );\n      return canvas;\n    }\n  }\n\n  /**\n   * Draw a line with placeholder on the image layer canvas.\n   */\n  public drawPlaceholder(col: number, row: number, count: number = 1): void {\n    const ctx = this._layers.get('top');\n    if (ctx) {\n      const { width, height } = this.cellSize;\n\n      // Don't try to draw anything, if we cannot get valid renderer metrics.\n      if (width === -1 || height === -1) {\n        return;\n      }\n\n      if (!this._placeholder) {\n        this._createPlaceHolder(Math.max(height + 1, Constants.PLACEHOLDER_HEIGHT));\n      } else if (height >= this._placeholder!.height) {\n        this._createPlaceHolder(height + 1);\n      }\n      if (!this._placeholder) return;\n      ctx.drawImage(\n        this._placeholderBitmap ?? this._placeholder!,\n        col * width,\n        (row * height) % 2 ? 0 : 1,  // needs %2 offset correction\n        width * count,\n        height,\n        col * width,\n        row * height,\n        width * count,\n        height\n      );\n    }\n  }\n\n  /**\n   * Rescale image layer canvas if needed.\n   * Checked once from `ImageStorage.render`.\n   */\n  public rescaleCanvas(): void {\n    const w = this.dimensions?.css.canvas.width || 0;\n    const h = this.dimensions?.css.canvas.height || 0;\n    for (const ctx of this._layers.values()) {\n      if (ctx.canvas.width !== w || ctx.canvas.height !== h) {\n        ctx.canvas.width = w;\n        ctx.canvas.height = h;\n      }\n    }\n  }\n\n  /**\n   * Rescale image in storage if needed.\n   */\n  private _rescaleImage(spec: IImageSpec, currentWidth: number, currentHeight: number): void {\n    if (currentWidth === spec.actualCellSize.width && currentHeight === spec.actualCellSize.height) {\n      return;\n    }\n    const { width: originalWidth, height: originalHeight } = spec.origCellSize;\n    if (currentWidth === originalWidth && currentHeight === originalHeight) {\n      spec.actual = spec.orig;\n      spec.actualCellSize.width = originalWidth;\n      spec.actualCellSize.height = originalHeight;\n      return;\n    }\n    const scaledWidth = Math.ceil(spec.orig!.width * currentWidth / originalWidth);\n    const scaledHeight = Math.ceil(spec.orig!.height * currentHeight / originalHeight);\n    // Upscale visible tiles directly; a full zoomed copy can dwarf the image budget.\n    if (scaledWidth * scaledHeight > spec.orig!.width * spec.orig!.height) {\n      spec.actual = spec.orig;\n      spec.actualCellSize.width = originalWidth;\n      spec.actualCellSize.height = originalHeight;\n      return;\n    }\n    const canvas = ImageRenderer.createCanvas(this.document, scaledWidth, scaledHeight);\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      ctx.drawImage(spec.orig!, 0, 0, canvas.width, canvas.height);\n      spec.actual = canvas;\n      spec.actualCellSize.width = currentWidth;\n      spec.actualCellSize.height = currentHeight;\n    }\n  }\n\n  /**\n   * Lazy init for the renderer.\n   */\n  private _open(): void {\n    this._renderService = this._terminal._core._renderService;\n    this._oldSetRenderer = this._renderService.setRenderer.bind(this._renderService);\n    this._renderService.setRenderer = (renderer: any) => {\n      for (const key of [...this._layers.keys()]) {\n        this.removeLayerFromDom(key);\n      }\n      this._oldSetRenderer?.call(this._renderService, renderer);\n    };\n  }\n\n  public insertLayerToDom(layer: ImageLayer = 'top'): void {\n    // make sure that the terminal is attached to a document and to DOM\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(layer)) {\n      return;\n    }\n    const canvas = ImageRenderer.createCanvas(\n      this.document, this.dimensions?.css.canvas.width || 0,\n      this.dimensions?.css.canvas.height || 0\n    );\n    canvas.classList.add(`xterm-image-layer-${layer}`);\n    const screenElement = this._terminal._core.screenElement;\n    // Use isolation to create a stacking context without overriding z-index,\n    // which would conflict with integrators (e.g. VS Code) that set their\n    // own z-index on the screen element.\n    screenElement.style.isolation = 'isolate';\n    if (layer === 'bottom') {\n      // Use z-index:-1 so it paints behind non-positioned text elements.\n      // The screen element needs to be a stacking context (via isolation)\n      // to contain the negative z-index, otherwise it would go behind the\n      // entire terminal.\n      canvas.style.zIndex = '-1';\n      screenElement.insertBefore(canvas, screenElement.firstChild);\n    } else {\n      // Explicit z-index ensures the image canvas reliably stacks above\n      // the text layer (DOM renderer rows). z-index: 0 is below the\n      // selection overlay (z-index: 1).\n      canvas.style.zIndex = '0';\n      screenElement.appendChild(canvas);\n    }\n    const ctx = canvas.getContext('2d', { alpha: true });\n    if (!ctx) {\n      canvas.remove();\n      return;\n    }\n    this._layers.set(layer, ctx);\n    this.clearAll(layer);\n  }\n\n  public removeLayerFromDom(layer: ImageLayer = 'top'): void {\n    const ctx = this._layers.get(layer);\n    if (ctx) {\n      ctx.canvas.remove();\n      this._layers.delete(layer);\n    }\n  }\n\n  public hasLayer(layer: ImageLayer): boolean {\n    return this._layers.has(layer);\n  }\n\n  private _createPlaceHolder(height: number = Constants.PLACEHOLDER_HEIGHT): void {\n    this._placeholderBitmap?.close();\n    this._placeholderBitmap = undefined;\n\n    // create blueprint to fill placeholder with\n    const bWidth = 32;  // must be 2^n\n    const blueprint = ImageRenderer.createCanvas(this.document, bWidth, height);\n    const ctx = blueprint.getContext('2d', { alpha: false });\n    if (!ctx) return;\n    const imgData = ImageRenderer.createImageData(ctx, bWidth, height);\n    const d32 = new Uint32Array(imgData.data.buffer);\n    const black = toRGBA8888(0, 0, 0);\n    const white = toRGBA8888(255, 255, 255);\n    d32.fill(black);\n    for (let y = 0; y < height; ++y) {\n      const shift = y % 2;\n      const offset = y * bWidth;\n      for (let x = 0; x < bWidth; x += 2) {\n        d32[offset + x + shift] = white;\n      }\n    }\n    ctx.putImageData(imgData, 0, 0);\n\n    // create placeholder line, width aligned to blueprint width\n    const width = (screen.width + bWidth - 1) & ~(bWidth - 1) || Constants.PLACEHOLDER_LENGTH;\n    this._placeholder = ImageRenderer.createCanvas(this.document, width, height);\n    const ctx2 = this._placeholder.getContext('2d', { alpha: false });\n    if (!ctx2) {\n      this._placeholder = undefined;\n      return;\n    }\n    for (let i = 0; i < width; i += bWidth) {\n      ctx2.drawImage(blueprint, i, 0);\n    }\n    const placeholder = this._placeholder;\n    ImageRenderer.createImageBitmap(placeholder).then(bitmap => {\n      if (this._placeholder !== placeholder) bitmap?.close();\n      else this._placeholderBitmap = bitmap;\n    }).catch(() => {});\n  }\n\n  public get document(): Document | undefined {\n    return this._terminal._core._coreBrowserService?.window.document;\n  }\n}\n", "/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { ImageRenderer } from './ImageRenderer';\nimport {\n  ITerminalExt, IExtendedAttrsImage, IImageAddonOptions, IImageSpec,\n  IBufferLineExt, BgFlags, Cell, Content, ICellSize, ExtFlags, Attributes,\n  UnderlineStyle, IAddImageOpts\n} from './Types';\n\n\n// fallback default cell size\nexport const CELL_SIZE_DEFAULT: ICellSize = {\n  width: 7,\n  height: 14\n};\n\n/**\n * Extend extended attribute to also hold image tile information.\n *\n * Object definition is copied from base repo to fully mimick its behavior.\n * Image data is added as additional public properties `imageId` and `tileId`.\n */\nclass ExtendedAttrsImage implements IExtendedAttrsImage {\n  private _ext: number = 0;\n  public get ext(): number {\n    if (this._urlId) {\n      return (\n        (this._ext & ~ExtFlags.UNDERLINE_STYLE) |\n        (this.underlineStyle << 26)\n      );\n    }\n    return this._ext;\n  }\n  public set ext(value: number) { this._ext = value; }\n\n  public get underlineStyle(): UnderlineStyle {\n    // Always return the URL style if it has one\n    if (this._urlId) {\n      return UnderlineStyle.DASHED;\n    }\n    return (this._ext & ExtFlags.UNDERLINE_STYLE) >> 26;\n  }\n  public set underlineStyle(value: UnderlineStyle) {\n    this._ext &= ~ExtFlags.UNDERLINE_STYLE;\n    this._ext |= (value << 26) & ExtFlags.UNDERLINE_STYLE;\n  }\n\n  public get underlineColor(): number {\n    return this._ext & (Attributes.CM_MASK | Attributes.RGB_MASK);\n  }\n  public set underlineColor(value: number) {\n    this._ext &= ~(Attributes.CM_MASK | Attributes.RGB_MASK);\n    this._ext |= value & (Attributes.CM_MASK | Attributes.RGB_MASK);\n  }\n\n  public get underlineVariantOffset(): number {\n    const val = (this._ext & ExtFlags.VARIANT_OFFSET) >> 29;\n    if (val < 0) {\n      return val ^ 0xFFFFFFF8;\n    }\n    return val;\n  }\n  public set underlineVariantOffset(value: number) {\n    this._ext &= ~ExtFlags.VARIANT_OFFSET;\n    this._ext |= (value << 29) & ExtFlags.VARIANT_OFFSET;\n  }\n\n  private _urlId: number = 0;\n  public get urlId(): number {\n    return this._urlId;\n  }\n  public set urlId(value: number) {\n    this._urlId = value;\n  }\n\n  constructor(\n    ext: number = 0,\n    urlId: number = 0,\n    public imageId = -1,\n    public tileId = -1\n  ) {\n    this._ext = ext;\n    this._urlId = urlId;\n  }\n\n  public clone(): IExtendedAttrsImage {\n    /**\n     * Technically we dont need a clone variant of ExtendedAttrsImage,\n     * as we never clone a cell holding image data.\n     * Note: Clone is only meant to be used by the InputHandler for\n     * sticky attributes, which is never the case for image data.\n     * We still provide a proper clone method to reflect the full ext attr\n     * state in case there are future use cases for clone.\n     */\n    return new ExtendedAttrsImage(this._ext, this._urlId, this.imageId, this.tileId);\n  }\n\n  public isEmpty(): boolean {\n    return this.underlineStyle === UnderlineStyle.NONE && this._urlId === 0 && this.imageId === -1;\n  }\n}\nconst EMPTY_ATTRS = new ExtendedAttrsImage();\n\n\n/**\n * ImageStorage - extension of CoreTerminal:\n * - hold image data\n * - write/read image data to/from buffer\n *\n * TODO: image composition for overwrites\n */\nexport class ImageStorage implements IDisposable {\n  // storage\n  private _images: Map<number, IImageSpec> = new Map();\n  // last used id\n  private _lastId = 0;\n  // last evicted id\n  private _lowestId = 0;\n  // whether a full clear happened before\n  private _fullyCleared = false;\n  // whether render should do a full clear\n  private _needsFullClear = false;\n  // hard limit of stored pixels (fallback limit of 10 MB)\n  private _pixelLimit: number = 2500000;\n\n  private _viewportMetrics: { cols: number, rows: number };\n  public onImageAdded: (() => void) | undefined;\n  public onImageDeleted: ((storageId: number) => void) | undefined;\n\n  constructor(\n    private _terminal: ITerminalExt,\n    private _renderer: ImageRenderer,\n    private _opts: IImageAddonOptions\n  ) {\n    try {\n      this.setLimit(this._opts.storageLimit);\n    } catch (e: unknown) {\n      if (e instanceof Error) {\n        console.error(e.message);\n      }\n      console.warn(`storageLimit is set to ${this.getLimit()} MB`);\n    }\n    this._viewportMetrics = {\n      cols: this._terminal.cols,\n      rows: this._terminal.rows\n    };\n  }\n\n  public dispose(): void {\n    this.reset();\n  }\n\n  public reset(): void {\n    for (const spec of this._images.values()) {\n      spec.marker?.dispose();\n    }\n    // NOTE: marker.dispose above already calls ImageBitmap.close\n    // therefore we can just wipe the map here\n    this._images.clear();\n    this._renderer.clearAll();\n  }\n\n  public getLimit(): number {\n    return this._pixelLimit * 4 / 1000000;\n  }\n\n  public setLimit(value: number): void {\n    if (value < 0.5 || value > 1000) {\n      throw RangeError('invalid storageLimit, should be at least 0.5 MB and not exceed 1G');\n    }\n    this._pixelLimit = (value / 4 * 1000000) >>> 0;\n    this._evictOldest(0);\n  }\n\n  public getUsage(): number {\n    return this._getStoredPixels() * 4 / 1000000;\n  }\n\n  private _getStoredPixels(): number {\n    let storedPixels = 0;\n    for (const spec of this._images.values()) {\n      if (spec.orig) {\n        storedPixels += spec.orig.width * spec.orig.height;\n        if (spec.actual && spec.actual !== spec.orig) {\n          storedPixels += spec.actual.width * spec.actual.height;\n        }\n      }\n    }\n    return storedPixels;\n  }\n\n  private _delImg(id: number): void {\n    const spec = this._images.get(id);\n    if (!spec) return;\n    this._images.delete(id);\n    // FIXME: really ugly workaround to get bitmaps deallocated :(\n    if (window.ImageBitmap && spec.orig instanceof ImageBitmap) {\n      spec.orig.close();\n    }\n    this.onImageDeleted?.(id);\n  }\n\n  /**\n   * Wipe canvas and images on alternate buffer.\n   */\n  public wipeAlternate(): void {\n    // remove all alternate tagged images\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.bufferType === 'alternate') {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n    // mark canvas to be wiped on next render\n    this._needsFullClear = true;\n    this._fullyCleared = false;\n  }\n\n  /**\n   * Delete an image by its internal storage ID.\n   * Used by protocols that support explicit deletion (e.g. Kitty a=d).\n   */\n  public deleteImage(id: number): void {\n    const spec = this._images.get(id);\n    if (spec) {\n      spec.marker?.dispose();\n      this._delImg(id);\n    }\n  }\n\n  /**\n   * Method to add an image to the storage.\n   * @param img - The image to add (canvas or bitmap).\n   * @param opts - Options for addImage:\n   *   - scrolling:  When true, cursor advances with the image.\n   *                 When false, image is placed at ORIGIN and cursor does not move.\n   *   - layer:      Which canvas layer to render on ('top' or 'bottom').\n   *   - zIndex:     Z-index for image layering within the same layer.\n   *   - cursorPos:  'vt340' for bottom-left, 'iip' for bottom.right.\n   * @returns The internal image ID assigned to the stored image.\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap, opts: IAddImageOpts): number {\n    // never allow storage to exceed memory limit\n    this._evictOldest(img.width * img.height);\n\n    // calc rows x cols needed to display the image\n    let cellSize = this._renderer.cellSize;\n    if (cellSize.width === -1 || cellSize.height === -1) {\n      cellSize = CELL_SIZE_DEFAULT;\n    }\n    const cols = Math.ceil(img.width / cellSize.width);\n    const rows = Math.ceil(img.height / cellSize.height);\n\n    const imageId = ++this._lastId;\n\n    const buffer = this._terminal._core.buffer;\n    const termCols = this._terminal.cols;\n    const termRows = this._terminal.rows;\n    const originX = buffer.x;\n    const originY = buffer.y;\n    let offset = originX;\n    let tileCount = 0;\n\n    if (!opts.scrolling) {\n      buffer.x = 0;\n      buffer.y = 0;\n      offset = 0;\n    }\n\n    this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);\n    for (let row = 0; row < rows; ++row) {\n      const line = buffer.lines.get(buffer.y + buffer.ybase);\n      for (let col = 0; col < cols; ++col) {\n        if (offset + col >= termCols) break;\n        this._writeToCell(line as IBufferLineExt, offset + col, imageId, row * cols + col);\n        tileCount++;\n      }\n      if (opts.scrolling) {\n        if (row < rows - 1) this._terminal._core._inputHandler.lineFeed();\n      } else {\n        if (++buffer.y >= termRows) break;\n      }\n      buffer.x = offset;\n    }\n    this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);\n\n    // cursor positioning modes\n    if (opts.scrolling) {\n      if (opts.cursorPos === 'iip') {\n        buffer.x = Math.min(offset + cols, termCols);\n      } else {\n        buffer.x = offset;\n      }\n    } else {\n      buffer.x = originX;\n      buffer.y = originY;\n    }\n\n    // deleted images with zero tile count\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.tileCount < 1) {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n\n    // eviction marker:\n    // delete the image when the marker gets disposed\n    const endMarker = this._terminal.registerMarker(0);\n    endMarker?.onDispose(() => {\n      const spec = this._images.get(imageId);\n      if (spec) {\n        this._delImg(imageId);\n      }\n    });\n\n    // since markers do not work on alternate for some reason,\n    // we evict images here manually\n    if (this._terminal.buffer.active.type === 'alternate') {\n      this._evictOnAlternate();\n    }\n\n    // create storage entry\n    const imgSpec: IImageSpec = {\n      orig: img,\n      origCellSize: cellSize,\n      actual: img,\n      actualCellSize: { ...cellSize },  // clone needed, since later modified\n      marker: endMarker || undefined,\n      tileCount,\n      bufferType: this._terminal.buffer.active.type,\n      layer: opts.layer,\n      zIndex: opts.zIndex\n    };\n\n    // finally add the image\n    this._images.set(imageId, imgSpec);\n    this.onImageAdded?.();\n    return imageId;\n  }\n\n\n  /**\n   * Render method. Collects buffer information and triggers\n   * canvas updates.\n   */\n  // TODO: Should we move this to the ImageRenderer?\n  public render(range: { start: number, end: number }): void {\n    // Determine which layers have images\n    let hasTopImages = false;\n    let hasBottomImages = false;\n    for (const spec of this._images.values()) {\n      if (spec.layer === 'bottom') {\n        hasBottomImages = true;\n      } else {\n        hasTopImages = true;\n      }\n      if (hasTopImages && hasBottomImages) break;\n    }\n\n    // Lazily insert layers that are needed\n    if (hasTopImages && !this._renderer.hasLayer('top')) {\n      this._renderer.insertLayerToDom('top');\n      if (!this._renderer.hasLayer('top')) return;\n    }\n    if (hasBottomImages && !this._renderer.hasLayer('bottom')) {\n      this._renderer.insertLayerToDom('bottom');\n    }\n\n    // rescale if needed\n    this._renderer.rescaleCanvas();\n\n    // exit early if we dont have any images to test for\n    if (!this._images.size) {\n      if (!this._fullyCleared) {\n        this._renderer.clearAll();\n        this._fullyCleared = true;\n        this._needsFullClear = false;\n      }\n      if (this._renderer.hasLayer('top')) {\n        this._renderer.removeLayerFromDom('top');\n      }\n      if (this._renderer.hasLayer('bottom')) {\n        this._renderer.removeLayerFromDom('bottom');\n      }\n      return;\n    }\n\n    // Remove layers no longer needed\n    if (!hasTopImages && this._renderer.hasLayer('top')) {\n      this._renderer.clearAll('top');\n      this._renderer.removeLayerFromDom('top');\n    }\n    if (!hasBottomImages && this._renderer.hasLayer('bottom')) {\n      this._renderer.clearAll('bottom');\n      this._renderer.removeLayerFromDom('bottom');\n    }\n\n    // buffer switches force a full clear\n    if (this._needsFullClear) {\n      this._renderer.clearAll();\n      this._fullyCleared = true;\n      this._needsFullClear = false;\n    }\n\n    const { start, end } = range;\n    const buffer = this._terminal._core.buffer;\n    const cols = this._terminal._core.cols;\n\n    // clear drawing area\n    this._renderer.clearLines(start, end);\n\n    // Collect draw calls so we can sort by z-index (lower z drawn first).\n    const drawCalls: { imgSpec: IImageSpec, tileId: number, col: number, row: number, count: number }[] = [];\n    const placeholderCalls: { col: number, row: number, count: number }[] = [];\n\n    // walk all cells in viewport and collect tiles found\n    for (let row = start; row <= end; ++row) {\n      const line = buffer.lines.get(row + buffer.ydisp) as IBufferLineExt;\n      if (!line) return;\n      for (let col = 0; col < cols; ++col) {\n        if (line.getBg(col) & BgFlags.HAS_EXTENDED) {\n          let e: IExtendedAttrsImage = line._extendedAttrs[col] ?? EMPTY_ATTRS;\n          const imageId = e.imageId;\n          if (imageId === undefined || imageId === -1) {\n            continue;\n          }\n          const imgSpec = this._images.get(imageId);\n          if (e.tileId !== -1) {\n            const startTile = e.tileId;\n            const startCol = col;\n            let count = 1;\n            /**\n             * merge tiles to the right into a single draw call, if:\n             * - not at end of line\n             * - cell has same image id\n             * - cell has consecutive tile id\n             */\n            while (\n              ++col < cols\n              && (line.getBg(col) & BgFlags.HAS_EXTENDED)\n              && (e = line._extendedAttrs[col] ?? EMPTY_ATTRS)\n              && (e.imageId === imageId)\n              && (e.tileId === startTile + count)\n            ) {\n              count++;\n            }\n            col--;\n            if (imgSpec) {\n              if (imgSpec.actual) {\n                drawCalls.push({ imgSpec, tileId: startTile, col: startCol, row, count });\n              }\n            } else if (this._opts.showPlaceholder) {\n              placeholderCalls.push({ col: startCol, row, count });\n            }\n            this._fullyCleared = false;\n          }\n        }\n      }\n    }\n\n    // Sort by z-index so lower z draws first (higher z renders on top)\n    drawCalls.sort((a, b) => a.imgSpec.zIndex - b.imgSpec.zIndex);\n\n    // Draw placeholders first (lowest priority)\n    for (const call of placeholderCalls) {\n      this._renderer.drawPlaceholder(call.col, call.row, call.count);\n    }\n\n    // Draw images in z-index order\n    for (const call of drawCalls) {\n      this._renderer.draw(call.imgSpec, call.tileId, call.col, call.row, call.count);\n    }\n  }\n\n  public viewportResize(metrics: { cols: number, rows: number }): void {\n    // exit early if we have nothing in storage\n    if (!this._images.size) {\n      this._viewportMetrics = metrics;\n      return;\n    }\n\n    // handle only viewport width enlargements, exit all other cases\n    // TODO: needs patch for tile counter\n    if (this._viewportMetrics.cols >= metrics.cols) {\n      this._viewportMetrics = metrics;\n      return;\n    }\n\n    // walk scrollbuffer at old col width to find all possible expansion matches\n    const buffer = this._terminal._core.buffer;\n    const rows = buffer.lines.length;\n    const oldCol = this._viewportMetrics.cols - 1;\n    for (let row = 0; row < rows; ++row) {\n      const line = buffer.lines.get(row) as IBufferLineExt;\n      if (line.getBg(oldCol) & BgFlags.HAS_EXTENDED) {\n        const e: IExtendedAttrsImage = line._extendedAttrs[oldCol] ?? EMPTY_ATTRS;\n        const imageId = e.imageId;\n        if (imageId === undefined || imageId === -1) {\n          continue;\n        }\n        const imgSpec = this._images.get(imageId);\n        if (!imgSpec) {\n          continue;\n        }\n        // found an image tile at oldCol, check if it qualifies for right exapansion\n        const tilesPerRow = Math.ceil((imgSpec.actual?.width || 0) / imgSpec.actualCellSize.width);\n        if ((e.tileId % tilesPerRow) + 1 >= tilesPerRow) {\n          continue;\n        }\n        // expand only if right side is empty (nothing got wrapped from below)\n        let hasData = false;\n        for (let rightCol = oldCol + 1; rightCol > metrics.cols; ++rightCol) {\n          if (line._data[rightCol * Cell.SIZE + Cell.CONTENT] & Content.HAS_CONTENT_MASK) {\n            hasData = true;\n            break;\n          }\n        }\n        if (hasData) {\n          continue;\n        }\n        // do right expansion on terminal buffer\n        const end = Math.min(metrics.cols, tilesPerRow - (e.tileId % tilesPerRow) + oldCol);\n        let lastTile = e.tileId;\n        for (let expandCol = oldCol + 1; expandCol < end; ++expandCol) {\n          this._writeToCell(line as IBufferLineExt, expandCol, imageId, ++lastTile);\n          imgSpec.tileCount++;\n        }\n      }\n    }\n    // store new viewport metrics\n    this._viewportMetrics = metrics;\n  }\n\n  /**\n   * Retrieve original canvas at buffer position.\n   */\n  public getImageAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    const buffer = this._terminal._core.buffer;\n    const line = buffer.lines.get(y) as IBufferLineExt;\n    if (line && line.getBg(x) & BgFlags.HAS_EXTENDED) {\n      const e: IExtendedAttrsImage = line._extendedAttrs[x] ?? EMPTY_ATTRS;\n      if (e.imageId && e.imageId !== -1) {\n        const orig = this._images.get(e.imageId)?.orig;\n        if (window.ImageBitmap && orig instanceof ImageBitmap) {\n          const canvas = ImageRenderer.createCanvas(window.document, orig.width, orig.height);\n          canvas.getContext('2d')?.drawImage(orig, 0, 0, orig.width, orig.height);\n          return canvas;\n        }\n        return orig as HTMLCanvasElement;\n      }\n    }\n  }\n\n  /**\n   * Extract active single tile at buffer position.\n   */\n  public extractTileAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    const buffer = this._terminal._core.buffer;\n    const line = buffer.lines.get(y) as IBufferLineExt;\n    if (line && line.getBg(x) & BgFlags.HAS_EXTENDED) {\n      const e: IExtendedAttrsImage = line._extendedAttrs[x] ?? EMPTY_ATTRS;\n      if (e.imageId && e.imageId !== -1 && e.tileId !== -1) {\n        const spec = this._images.get(e.imageId);\n        if (spec) {\n          return this._renderer.extractTile(spec, e.tileId);\n        }\n      }\n    }\n  }\n\n  // TODO: Do we need some blob offloading tricks here to avoid early eviction?\n  // also see https://stackoverflow.com/questions/28307789/is-there-any-limitation-on-javascript-max-blob-size\n  private _evictOldest(room: number): number {\n    const used = this._getStoredPixels();\n    let current = used;\n    while (this._pixelLimit < current + room && this._images.size) {\n      const spec = this._images.get(++this._lowestId);\n      if (spec && spec.orig) {\n        current -= spec.orig.width * spec.orig.height;\n        if (spec.actual && spec.orig !== spec.actual) {\n          current -= spec.actual.width * spec.actual.height;\n        }\n        spec.marker?.dispose();\n        this._delImg(this._lowestId);\n      }\n    }\n    return used - current;\n  }\n\n  private _writeToCell(line: IBufferLineExt, x: number, imageId: number, tileId: number): void {\n    if (line._data[x * Cell.SIZE + Cell.BG] & BgFlags.HAS_EXTENDED) {\n      const old = line._extendedAttrs[x];\n      if (old) {\n        if (old.imageId !== undefined) {\n          // found an old ExtendedAttrsImage, since we know that\n          // they are always isolated instances (single cell usage),\n          // we can re-use it and just update their id entries\n          const oldSpec = this._images.get(old.imageId);\n          if (oldSpec) {\n            // early eviction for in-viewport overwrites\n            oldSpec.tileCount--;\n          }\n          old.imageId = imageId;\n          old.tileId = tileId;\n          return;\n        }\n        // found a plain ExtendedAttrs instance, clone it to new entry\n        line._extendedAttrs[x] = new ExtendedAttrsImage(old.ext, old.urlId, imageId, tileId);\n        return;\n      }\n    }\n    // fall-through: always create new ExtendedAttrsImage entry\n    line._data[x * Cell.SIZE + Cell.BG] |= BgFlags.HAS_EXTENDED;\n    line._extendedAttrs[x] = new ExtendedAttrsImage(0, 0, imageId, tileId);\n  }\n\n  private _evictOnAlternate(): void {\n    // nullify tile count of all images on alternate buffer\n    for (const spec of this._images.values()) {\n      if (spec.bufferType === 'alternate') {\n        spec.tileCount = 0;\n      }\n    }\n    // re-count tiles on whole buffer\n    const buffer = this._terminal._core.buffer;\n    for (let y = 0; y < this._terminal.rows; ++y) {\n      const line = buffer.lines.get(y) as IBufferLineExt;\n      if (!line) {\n        continue;\n      }\n      for (let x = 0; x < this._terminal.cols; ++x) {\n        if (line._data[x * Cell.SIZE + Cell.BG] & BgFlags.HAS_EXTENDED) {\n          const imgId = line._extendedAttrs[x]?.imageId;\n          if (imgId) {\n            const spec = this._images.get(imgId);\n            if (spec) {\n              spec.tileCount++;\n            }\n          }\n        }\n      }\n    }\n    // deleted images with zero tile count\n    const zero = [];\n    for (const [id, spec] of this._images.entries()) {\n      if (spec.bufferType === 'alternate' && !spec.tileCount) {\n        spec.marker?.dispose();\n        zero.push(id);\n      }\n    }\n    for (const id of zero) {\n      this._delImg(id);\n    }\n  }\n}\n", "/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\nimport { IImageAddonOptions, IOscHandler, IResetHandler, ITerminalExt } from './Types';\nimport { ImageRenderer } from './ImageRenderer';\nimport { IIPImageStorage } from './IIPImageStorage';\nimport { CELL_SIZE_DEFAULT } from './ImageStorage';\nimport Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\nimport QoiDecoder from 'xterm-wasm-parts/lib/qoi/QoiDecoder.wasm';\nimport { HeaderParser, IHeaderFields, HeaderState, SequenceType } from './IIPHeaderParser';\nimport { imageType, UNSUPPORTED_TYPE } from './IIPMetrics';\n\n// Local const enum mirror - esbuild can't inline const enums from external packages\nconst enum DecoderConst {\n  // Held memory in base64/QOI decoders between images. Zero because each kept\n  // decoder pins a wasm memory, and V8 caps those per process (~124 in a\n  // sandboxed renderer), so idle terminals must not hold one.\n  KEEP_DATA = 0,\n  // Initial buffer allocation for the decoder.\n  INITIAL_DATA = 1048576,\n  // Local mirror of const enum (esbuild can't inline const enums from external packages)\n  OK = 0\n}\n\n// default IIP header values\nconst DEFAULT_HEADER: IHeaderFields = {\n  type: SequenceType.INVALID,\n  name: 'Unnamed file',\n  size: 0,\n  width: 'auto',\n  height: 'auto',\n  preserveAspectRatio: 1,\n  inline: 0\n};\n\n\nexport class IIPHandler implements IOscHandler, IResetHandler {\n  private _generation = 0;\n  private _aborted = false;\n  private _hp = new HeaderParser();\n  private _header: IHeaderFields = DEFAULT_HEADER;\n  private _dec: Base64Decoder;\n  private _qoiDec: QoiDecoder;\n  private _isMultipart = false;\n  private _abortMulti = false;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _storage: IIPImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    const maxEncodedBytes = Math.ceil(this._opts.iipSizeLimit * 4 / 3);\n    const initialBytes = Math.min(DecoderConst.INITIAL_DATA, maxEncodedBytes);\n    this._dec = new Base64Decoder(DecoderConst.KEEP_DATA, maxEncodedBytes, initialBytes);\n    this._qoiDec = new QoiDecoder(DecoderConst.KEEP_DATA);\n  }\n\n  public reset(): void {\n    this._generation++;\n    this._hp.reset();\n    this._dec.release();\n    this._qoiDec.release();\n  }\n\n  public start(): void {\n    this._aborted = false;\n    this._hp.reset();\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    if (this._hp.state === HeaderState.END) {\n      if ((this._dec.put(data.subarray(start, end)) as number) !== DecoderConst.OK) {\n        this._dec.release();\n        this._aborted = true;\n      }\n    } else {\n      const dataPos = this._hp.parse(data, start, end);\n      if (dataPos === -1) {\n        this._aborted = true;\n        return;\n      }\n      if (dataPos > 0) {\n        const seqType = this._hp.fields.type;\n        if (seqType === SequenceType.FILE) {\n          if (this._isMultipart) {\n            this._isMultipart = false;\n            this._abortMulti = false;\n            this._dec.release();\n          }\n          this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);\n          if (!this._header.inline) {\n            this._aborted = true;\n            return;\n          }\n          if (!this._initDecoder()) {\n            this._aborted = true;\n            return;\n          }\n        } else if (this._abortMulti) {\n          this._aborted = true;\n          return;\n        }\n        if ((this._dec.put(data.subarray(dataPos, end)) as number) !== DecoderConst.OK) {\n          this._dec.release();\n          this._aborted = true;\n          if (this._isMultipart) this._abortMulti = true;\n        }\n      }\n    }\n  }\n\n  public end(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted) return true;\n\n    if (this._hp.state !== HeaderState.END) {\n      if (this._hp.end()) return true;\n    }\n    const seqType = this._hp.fields.type;\n\n    if (seqType === SequenceType.FILEPART) return true;\n\n    if (seqType === SequenceType.REPORTCELLSIZE) {\n      // OSC 1337 ; ReportCellSize=[height];[width];[scale] ST\n      let w = CELL_SIZE_DEFAULT.width;\n      let h = CELL_SIZE_DEFAULT.height;\n      if (this._renderer.dimensions) {\n        w = this._renderer.dimensions.css.canvas.width / this._coreTerminal.cols;\n        h = this._renderer.dimensions.css.canvas.height / this._coreTerminal.rows;\n      }\n      const scale = this._coreTerminal._core._coreBrowserService?.dpr ?? 1;\n      const report = `\\x1b]1337;ReportCellSize=${h.toFixed(3)};${w.toFixed(3)};${scale.toFixed(3)}\\x1b\\\\`;\n      this._coreTerminal.input(report, false);\n      return true;\n    }\n\n    if (seqType === SequenceType.MULTIPARTFILE) {\n      this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);\n      this._isMultipart = true;\n      this._abortMulti = false;\n      this._dec.release();\n      if (!this._initDecoder()) {\n        this._abortMulti = true;\n      }\n      return true;\n    }\n\n    if (seqType === SequenceType.FILEEND) {\n      if (!this._isMultipart) return true;\n      this._isMultipart = false;\n      if (this._abortMulti || this._header.type !== SequenceType.MULTIPARTFILE) return true;\n    }\n\n    // fallthrough for SequenceType.FILE & SequenceType.FILEEND\n\n    let w = 0;\n    let h = 0;\n\n    // early exit condition chain\n    let cond: number | boolean;\n    let metrics = UNSUPPORTED_TYPE;\n    if (cond = success) {\n      if (cond = !this._dec.end()) {\n        metrics = imageType(this._dec.data8);\n        if (cond = metrics.mime !== 'unsupported') {\n          w = metrics.width;\n          h = metrics.height;\n          if (cond = w && h && w * h < this._opts.pixelLimit) {\n            [w, h] = this._resize(w, h).map(Math.floor);\n            cond = w && h && w * h < this._opts.pixelLimit;\n          } else {\n            console.warn(`IIP: image dimension issue ${metrics.width}x${metrics.height}`);\n          }\n        } else {\n          console.warn('IIP: unsupported image type');\n        }\n      } else {\n        console.warn('IIP: error during BASE64 decoding');\n      }\n    }\n    if (!cond) {\n      this._dec.release();\n      return true;\n    }\n\n    let blob: Blob | ImageData;\n    if (metrics.mime === 'image/qoi') {\n      let data: Uint8Array<ArrayBuffer>;\n      try {\n        data = this._qoiDec.decode(this._dec.data8);\n      } catch (e) {\n        console.warn('IIP: could not decode QOI image', e);\n        this._dec.release();\n        this._qoiDec.release();\n        return true;\n      }\n      blob = new ImageData(\n        new Uint8ClampedArray(data.buffer, data.byteOffset, data.byteLength),\n        this._qoiDec.width,\n        this._qoiDec.height\n      );\n      this._qoiDec.release();\n      if (w === this._qoiDec.width && h === this._qoiDec.height) {\n        // use fast-path if we don't need to rescale\n        this._dec.release();\n        const canvas = ImageRenderer.createCanvas(undefined, this._qoiDec.width, this._qoiDec.height);\n        canvas.getContext('2d')?.putImageData(blob, 0, 0);\n        this._storage.addImage(canvas);\n        return true;\n      }\n    } else {\n      blob = new Blob([this._dec.data8], { type: metrics.mime });\n    }\n    this._dec.release();\n    const generation = this._generation;\n    return createImageBitmap(blob, { resizeWidth: w, resizeHeight: h })\n      .then(bm => {\n        if (generation !== this._generation) {\n          bm.close();\n          return true;\n        }\n        this._storage.addImage(bm);\n        return true;\n      })\n      .catch(e => {\n        console.warn(`IIP: decoding error ${metrics.mime} ${metrics.width}x${metrics.height}`, e);\n        return true;\n      });\n  }\n\n  // Why: wasm memory exhaustion must drop this image, not throw out of the parser and wedge the write queue.\n  private _initDecoder(): boolean {\n    try {\n      this._dec.init();\n      return true;\n    } catch (e) {\n      console.warn('IIP: could not allocate decoder', e);\n      this._dec.release();\n      return false;\n    }\n  }\n\n  private _resize(w: number, h: number): [number, number] {\n    const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;\n    const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;\n    const width = this._renderer.dimensions?.css.canvas.width || cw * this._coreTerminal.cols;\n    const height = this._renderer.dimensions?.css.canvas.height || ch * this._coreTerminal.rows;\n\n    const rw = this._dim(this._header.width!, width, cw);\n    const rh = this._dim(this._header.height!, height, ch);\n    if (!rw && !rh) {\n      const wf = width / w;         // TODO: should this respect initial cursor offset?\n      const hf = (height - ch) / h; // TODO: fix offset issues from float cell height\n      const f = Math.min(wf, hf);\n      return f < 1 ? [w * f, h * f] : [w, h];\n    }\n    return !rw\n      ? [w * rh / h, rh]\n      : this._header.preserveAspectRatio || !rw || !rh\n        ? [rw, h * rw / w] : [rw, rh];\n  }\n\n  private _dim(s: string, total: number, cdim: number): number {\n    if (s === 'auto') return 0;\n    if (s.endsWith('%')) return parseInt(s.slice(0, -1), 10) * total / 100;\n    if (s.endsWith('px')) return parseInt(s.slice(0, -2), 10);\n    return parseInt(s, 10) * cdim;\n  }\n}\n", "/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n// eslint-disable-next-line\ndeclare const Buffer: any;\n\nexport const enum HeaderState {\n  START = 0,\n  ABORT = 1,\n  KEY = 2,\n  VALUE = 3,\n  END = 4\n}\n\nexport const enum SequenceType {\n  INVALID = 0,\n  FILE = 1,\n  MULTIPARTFILE = 2,\n  FILEPART = 3,\n  FILEEND = 4,\n  REPORTCELLSIZE = 5\n}\n\nexport interface IHeaderFields {\n  [key: string]: number | string | Uint32Array | null | undefined;\n  // sequence type\n  type: SequenceType;\n  // base-64 encoded filename. Defaults to \"Unnamed file\".\n  name: string;\n  // File size in bytes. The file transfer will be canceled if this size is exceeded.\n  size: number;\n  /**\n   * Optional width and height to render:\n   * - N: N character cells.\n   * - Npx: N pixels.\n   * - N%: N percent of the session's width or height.\n   * - auto: The image's inherent size will be used to determine an appropriate dimension.\n   */\n  width?: string;\n  height?: string;\n  // Optional, defaults to 1 respecting aspect ratio (width takes precedence).\n  preserveAspectRatio?: number;\n  // Optional, defaults to 0. If set to 1, the file will be displayed inline, else downloaded\n  // (download not supported).\n  inline?: number;\n}\n\n// field value decoders\n\n// ASCII bytes to string\nfunction toStr(data: Uint32Array): string {\n  let s = '';\n  for (let i = 0; i < data.length; ++i) {\n    s += String.fromCharCode(data[i]);\n  }\n  return s;\n}\n\n// digits to integer\nfunction toInt(data: Uint32Array): number {\n  let v = 0;\n  for (let i = 0; i < data.length; ++i) {\n    if (data[i] < 48 || data[i] > 57) {\n      throw new Error('illegal char');\n    }\n    v = v * 10 + data[i] - 48;\n  }\n  return v;\n}\n\n// check for correct size entry\nfunction toSize(data: Uint32Array): string {\n  const v = toStr(data);\n  if (!v.match(/^((auto)|(\\d+?((px)|(%)){0,1}))$/)) {\n    throw new Error('illegal size');\n  }\n  return v;\n}\n\n// name is base64 encoded utf-8\nfunction toName(data: Uint32Array): string {\n  if (typeof Buffer !== 'undefined') {\n    return Buffer.from(toStr(data), 'base64').toString();\n  }\n  const bs = atob(toStr(data));\n  const b = new Uint8Array(bs.length);\n  for (let i = 0; i < b.length; ++i) {\n    b[i] = bs.charCodeAt(i);\n  }\n  return new TextDecoder().decode(b);\n}\n\nconst DECODERS: {[key: string]: (v: Uint32Array) => number | string} = {\n  inline: toInt,\n  size: toInt,\n  name: toName,\n  width: toSize,\n  height: toSize,\n  preserveAspectRatio: toInt\n};\n\n\n// sequence type markers\n// File\nconst FILE_MARKER = [70, 105, 108, 101];\n// MultipartFile\nconst MULTIPARTFILE_MARKER = [77, 117, 108, 116, 105, 112, 97, 114, 116, 70, 105, 108, 101];\n// FilePart\nconst FILEPART_MARKER = [70, 105, 108, 101, 80, 97, 114, 116];\n// FileEnd\nconst FILEEND_MARKER = [70, 105, 108, 101, 69, 110, 100];\n// ReportCellSize\nconst REPORTCELLSIZE_MARKER = [82, 101, 112, 111, 114, 116, 67, 101, 108, 108, 83, 105, 122, 101];\n\n// max allowed chars for sequence header\nconst MAX_FIELDCHARS = 1024;\n\n\nexport class HeaderParser {\n  public state: HeaderState = HeaderState.START;\n  private _buffer = new Uint32Array(MAX_FIELDCHARS);\n  private _position = 0;\n  private _key = '';\n  public fields: {[key: string]: number | string | Uint32Array | null | undefined} = {};\n\n  public reset(): void {\n    this._buffer.fill(0);\n    this.state = HeaderState.START;\n    this._position = 0;\n    this.fields = {};\n    this._key = '';\n  }\n\n  public end(): number {\n    if (this.state === HeaderState.START) {\n      if (this._position === FILEEND_MARKER.length) {\n        for (let k = 0; k < FILEEND_MARKER.length; ++k) {\n          if (this._buffer[k] !== FILEEND_MARKER[k]) return this._a();\n        }\n        this.fields['type'] = SequenceType.FILEEND;\n        this.state = HeaderState.END;\n        return 0;\n      }\n      if (this._position === REPORTCELLSIZE_MARKER.length) {\n        for (let k = 0; k < REPORTCELLSIZE_MARKER.length; ++k) {\n          if (this._buffer[k] !== REPORTCELLSIZE_MARKER[k]) return this._a();\n        }\n        this.fields['type'] = SequenceType.REPORTCELLSIZE;\n        this.state = HeaderState.END;\n        return 0;\n      }\n      return this._a();\n    }\n    if (this.state === HeaderState.END) return 0;\n    if (this.state === HeaderState.VALUE\n      && this.fields.type === SequenceType.MULTIPARTFILE\n    ) {\n      if (!this._storeValue(this._position)) return this._a();\n      this.state = HeaderState.END;\n      return 0;\n    }\n    return this._a();\n  }\n\n  public parse(data: Uint32Array, start: number, end: number): number {\n    let state = this.state;\n    let pos = this._position;\n    const buffer = this._buffer;\n    if (state === HeaderState.ABORT || state === HeaderState.END) return -1;\n    if (state === HeaderState.START && pos > 14) return -1;\n    for (let i = start; i < end; ++i) {\n      const c = data[i];\n      switch (c) {\n        case 59: // ;\n          if (!this._storeValue(pos)) return this._a();\n          state = HeaderState.KEY;\n          pos = 0;\n          break;\n        case 61: // =\n          if (state === HeaderState.START) {\n            if (buffer[0] === 70) {\n              // 'File' or 'FilePart'\n              let k = 0;\n              for (; k < FILE_MARKER.length; ++k) {\n                if (buffer[k] !== FILE_MARKER[k]) return this._a();\n              }\n              this.fields['type'] = SequenceType.FILE;\n              if (pos === FILEPART_MARKER.length) {\n                for (; k < FILEPART_MARKER.length; ++k) {\n                  if (buffer[k] !== FILEPART_MARKER[k]) return this._a();\n                }\n                this.fields['type'] = SequenceType.FILEPART;\n                this.state = HeaderState.END;\n                return i + 1;\n              }\n            } else if (buffer[0] === 77) {\n              // 'MultipartFile'\n              for (let k = 0; k < MULTIPARTFILE_MARKER.length; ++k) {\n                if (buffer[k] !== MULTIPARTFILE_MARKER[k]) return this._a();\n              }\n              this.fields['type'] = SequenceType.MULTIPARTFILE;\n            } else {\n              return this._a();\n            }\n            state = HeaderState.KEY;\n            pos = 0;\n          } else if (state === HeaderState.KEY) {\n            if (!this._storeKey(pos)) return this._a();\n            state = HeaderState.VALUE;\n            pos = 0;\n          } else if (state === HeaderState.VALUE) {\n            if (pos >= MAX_FIELDCHARS) return this._a();\n            buffer[pos++] = c;\n          }\n          break;\n        case 58: // :\n          if (state === HeaderState.VALUE) {\n            if (!this._storeValue(pos)) return this._a();\n          }\n          this.state = HeaderState.END;\n          return i + 1;\n        default:\n          if (pos >= MAX_FIELDCHARS) return this._a();\n          buffer[pos++] = c;\n      }\n    }\n    this.state = state;\n    this._position = pos;\n    return -2;\n  }\n\n  private _a(): number {\n    this.fields.type = SequenceType.INVALID;\n    this.state = HeaderState.ABORT;\n    return -1;\n  }\n\n  private _storeKey(pos: number): boolean {\n    const k = toStr(this._buffer.subarray(0, pos));\n    if (k) {\n      this._key = k;\n      this.fields[k] = null;\n      return true;\n    }\n    return false;\n  }\n\n  private _storeValue(pos: number): boolean {\n    if (this._key) {\n      try {\n        const v = this._buffer.slice(0, pos);\n        this.fields[this._key] = DECODERS[this._key] ? DECODERS[this._key](v) : v;\n      } catch {\n        return false;\n      }\n      return true;\n    }\n    return false;\n  }\n}\n", "/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\n\nexport type ImageType = 'image/png' | 'image/jpeg' | 'image/gif' | 'image/qoi' | 'image/webp' | 'image/avif' | 'unsupported' | '';\n\nexport interface IMetrics {\n  mime: ImageType;\n  width: number;\n  height: number;\n}\n\nexport const UNSUPPORTED_TYPE: IMetrics = {\n  mime: 'unsupported',\n  width: 0,\n  height: 0\n};\n\nexport function imageType(d: Uint8Array): IMetrics {\n  if (d.length < 32) {\n    return UNSUPPORTED_TYPE;\n  }\n  const d32 = new Uint32Array(d.buffer, d.byteOffset, 8);\n  // PNG: 89 50 4E 47 0D 0A 1A 0A (8 first bytes == magic number for PNG)\n  // + first chunk must be IHDR\n  if (d32[0] === 0x474E5089 && d32[1] === 0x0A1A0A0D && d32[3] === 0x52444849) {\n    return {\n      mime: 'image/png',\n      width:  d[16] << 24 | d[17] << 16 | d[18] << 8 | d[19],\n      height: d[20] << 24 | d[21] << 16 | d[22] << 8 | d[23]\n    };\n  }\n  // JPEG: FF D8 FF\n  if (d[0] === 0xFF && d[1] === 0xD8 && d[2] === 0xFF) {\n    const [width, height] = jpgSize(d);\n    return { mime: 'image/jpeg', width, height };\n  }\n  // GIF: GIF87a or GIF89a\n  if (d32[0] === 0x38464947 && (d[4] === 0x37 || d[4] === 0x39) && d[5] === 0x61) {\n    return {\n      mime: 'image/gif',\n      width:  d[7] << 8 | d[6],\n      height: d[9] << 8 | d[8]\n    };\n  }\n  // QOI: qoif\n  if (d32[0] === 0x66696F71) {\n    return {\n      mime: 'image/qoi',\n      width:  d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7],\n      height: d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11]\n    };\n  }\n  // WEBP: RIFF | xxxx | WEBP | VP8x\n  if (d32[0] === 0x46464952 && d32[2] === 0x50424557 && (d32[3] & 0xFFFFFF) === 0x385056) {\n    switch (d[15]) {\n      case 0x58:  // Extended WebP VP8X --> \"X\"\n        return {\n          mime: 'image/webp',\n          width:  (d[24] | d[25] << 8 | d[26] << 16) + 1,\n          height: (d[27] | d[28] << 8 | d[29] << 16) + 1\n        };\n      case 0x4C:  // Lossless WebP VP8L --> \"L\"\n        if (d[20] !== 0x2f) return UNSUPPORTED_TYPE;\n        const dim = d[21] | d[22] << 8 | d[23] << 16 | d[24] << 24;\n        return {\n          mime: 'image/webp',\n          width:  (dim        & 0x3FFF) + 1,\n          height: (dim >>> 14 & 0x3FFF) + 1\n        };\n      case 0x20:  // Lossy WebP VP8  --> \" \"\n        if (d[23] !== 0x9d || d[24] !== 0x01 || d[25] !== 0x2a) return UNSUPPORTED_TYPE;\n        return {\n          mime: 'image/webp',\n          width:  (d[26] | d[27] << 8) & 0x3FFF,\n          height: (d[28] | d[29] << 8) & 0x3FFF\n        };\n    }\n    return UNSUPPORTED_TYPE;\n  }\n  // AVIF: Box size | ftyp | avif/avis\n  if (d32[1] === 0x70797466 && (d32[2] === 0x66697661 || d32[2] === 0x73697661)) {\n    let pos = -1;\n    // search for ispe box within first 1024 bytes\n    const limit = Math.min(d.length - 16, 1024);\n    for (let i = 8; i < limit; i++) {\n      // scan for ispe\n      if (d[i] === 0x69 && d[i + 1] === 0x73 && d[i + 2] === 0x70 && d[i + 3] === 0x65) {\n        pos = i;\n        break;\n      }\n    }\n    if (pos !== -1) {\n      // dimensions are in BE at +8 (width) at +12 (height)\n      const width =\n        d[pos +  8] << 24 |\n        d[pos +  9] << 16 |\n        d[pos + 10] <<  8 |\n        d[pos + 11];\n      const height =\n        d[pos + 12] << 24 |\n        d[pos + 13] << 16 |\n        d[pos + 14] <<  8 |\n        d[pos + 15];\n      if (width > 0 && height > 0) {\n        return { mime: 'image/avif', width, height };\n      }\n    }\n    return UNSUPPORTED_TYPE;\n  }\n  return UNSUPPORTED_TYPE;\n}\n\n\nfunction jpgSize(d: Uint8Array): [number, number] {\n  const len = d.length;\n  let i = 4;\n  let blockLength = d[i] << 8 | d[i + 1];\n  while (true) {\n    i += blockLength;\n    if (i >= len) {\n      // exhausted without size info\n      return [0, 0];\n    }\n    if (d[i] !== 0xFF) {\n      return [0, 0];\n    }\n    if (d[i + 1] === 0xC0 || d[i + 1] === 0xC2) {\n      if (i + 8 < len) {\n        return [\n          d[i + 7] << 8 | d[i + 8],\n          d[i + 5] << 8 | d[i + 6]\n        ];\n      }\n      return [0, 0];\n    }\n    i += 2;\n    blockLength = d[i] << 8 | d[i + 1];\n  }\n}\n", "/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { IApcHandler, IImageAddonOptions, IResetHandler, ITerminalExt, ImageLayer } from '../Types';\nimport { ImageRenderer } from '../ImageRenderer';\nimport { CELL_SIZE_DEFAULT } from '../ImageStorage';\nimport { imageType } from '../IIPMetrics';\nimport { KittyImageStorage } from './KittyImageStorage';\nimport Base64Decoder, { type DecodeStatus } from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\nimport {\n  KittyAction,\n  KittyFormat,\n  KittyCompression,\n  IKittyCommand,\n  IPendingTransmission,\n  IKittyImageData,\n  KittyPixelConstants,\n  parseKittyCommand\n} from './KittyGraphicsTypes';\n\nconst enum Constants {\n  // Memory limit for base64 decoder (4MB, same as IIPHandler)\n  DECODER_KEEP_DATA = 4194304,\n  DECODER_INITIAL_DATA = 4194304, // 4MB\n  // Local mirror of const enum (esbuild can't inline const enums from external packages)\n  DECODER_OK = 0,\n  // Maximum control data size\n  MAX_CONTROL_DATA_SIZE = 512,\n  // Semicolon codepoint\n  SEMICOLON = 0x3B\n}\n\nconst DECODER_OK = Constants.DECODER_OK as unknown as DecodeStatus.OK;\n\n// Kitty graphics protocol handler with streaming base64 decoding.\nexport class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDisposable {\n  private _aborted = false;\n  private _generation = 0;\n  private _decodeError = false;\n\n  private _activeDecoder: Base64Decoder | null = null;\n  private readonly _maxEncodedBytes: number;\n  private readonly _initialEncodedBytes: number;\n\n  // Streaming related states\n\n  // True while receiving control data (before semicolon).\n  private _inControlData = true;\n\n  // Buffer for control data.\n  private _controlData = new Uint32Array(Constants.MAX_CONTROL_DATA_SIZE);\n  private _controlLength = 0;\n\n  // Pre-calculated encoded size limit\n  private _encodedSizeLimit = 0;\n  private _totalEncodedSize = 0;\n\n  // Parsed command. These are the control data before semicolon.\n  private _parsedCommand: IKittyCommand | null = null;\n\n  // Storage related states\n\n  private _pendingTransmissions: Map<number, IPendingTransmission> = new Map();\n  // Tracks the pending key of the most recently started chunked upload.\n  // Per spec, subsequent chunks only need m= (and optionally q=), without i=.\n  // When a chunk arrives with no i=, this key is used to find the pending upload.\n  private _lastPendingKey: number | undefined;\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _kittyStorage: KittyImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    // Convert decoded size limit -> max encoded bytes.\n    this._maxEncodedBytes = Math.ceil(this._opts.kittySizeLimit * 4 / 3);\n    // ensure we preallocate more than configured limit while using 4mb initial size.\n    this._initialEncodedBytes = Math.min(Constants.DECODER_INITIAL_DATA, this._maxEncodedBytes);\n  }\n\n  public reset(): void {\n    this._generation++;\n    this._cleanupAllPending();\n    if (this._activeDecoder) {\n      this._activeDecoder.release();\n      this._activeDecoder = null;\n    }\n    this._kittyStorage.reset();\n  }\n\n  public dispose(): void {\n    this.reset();\n  }\n\n  private _removePendingEntry(key: number): void {\n    this._pendingTransmissions.delete(key);\n    if (this._lastPendingKey === key) {\n      this._lastPendingKey = undefined;\n    }\n  }\n\n  private _cleanupAllPending(): void {\n    for (const pending of this._pendingTransmissions.values()) {\n      pending.decoder.release();\n    }\n    this._pendingTransmissions.clear();\n    this._lastPendingKey = undefined;\n  }\n\n  public start(): void {\n    this._aborted = false;\n    this._decodeError = false;\n    this._inControlData = true;\n    this._controlLength = 0;\n    this._parsedCommand = null;\n    // Pre-calculate encoded limit once: base64 is 4 bytes encoded \u2192 3 bytes decoded\n    this._encodedSizeLimit = this._maxEncodedBytes;\n    this._totalEncodedSize = 0;\n    this._activeDecoder = null;\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    if (!this._inControlData) {\n      this._streamPayload(data, start, end);\n    } else {\n      // Scan for semicolon\n      let controlEnd = end;\n      for (let i = start; i < end; i++) {\n        if (data[i] === Constants.SEMICOLON) {\n          this._inControlData = false;\n          controlEnd = i;\n          break;\n        }\n      }\n\n      // Copy control data\n      const copyLength = controlEnd - start;\n      if (this._controlLength + copyLength > Constants.MAX_CONTROL_DATA_SIZE) {\n        this._aborted = true;\n        return;\n      }\n      this._controlData.set(data.subarray(start, controlEnd), this._controlLength);\n      this._controlLength += copyLength;\n\n      if (!this._inControlData) {\n        // Found semicolon - parse control data early for validation\n        this._parsedCommand = parseKittyCommand(this._parseControlDataString());\n\n        // Early validation: i+I conflict\n        if (this._parsedCommand.id !== undefined && this._parsedCommand.imageNumber !== undefined) {\n          this._sendResponse(this._parsedCommand.id, 'EINVAL:cannot specify both i and I keys', this._parsedCommand.quiet ?? 0);\n          this._aborted = true;\n          return;\n        }\n\n        // Delete action doesn't need payload - skip streaming\n        if (this._parsedCommand.action === KittyAction.DELETE) {\n          return;\n        }\n\n        // Stream remaining as payload\n        const payloadStart = controlEnd + 1;\n        if (payloadStart < end) {\n          this._streamPayload(data, payloadStart, end);\n        }\n      }\n    }\n  }\n\n  // Stream payload bytes into the base64 decoder.\n  private _streamPayload(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted) return;\n\n    // Check size limit (compare encoded bytes against pre-calculated limit)\n    // Include cumulative size from pending transmission for multi-chunk images.\n    // Per spec, subsequent chunks may omit i=, so fall back to _lastPendingKey.\n    const pendingKey = this._parsedCommand?.id ?? this._lastPendingKey ?? 0;\n    const pending = this._pendingTransmissions.get(pendingKey);\n    const previousEncodedSize = pending?.totalEncodedSize ?? 0;\n    this._totalEncodedSize += end - start;\n    const cumulativeEncodedSize = previousEncodedSize + this._totalEncodedSize;\n    if (cumulativeEncodedSize > this._encodedSizeLimit) {\n      const decoderToRelease = this._activeDecoder ?? pending?.decoder;\n      if (decoderToRelease) {\n        decoderToRelease.release();\n      }\n      this._activeDecoder = null;\n      if (pending) {\n        this._removePendingEntry(pendingKey);\n      }\n      this._aborted = true;\n      return;\n    }\n\n    if (this._decodeError) return;\n\n    if (pending?.decoder && !this._activeDecoder) {\n      this._activeDecoder = pending.decoder;\n    }\n    if (!this._activeDecoder) {\n      // Budget WASM capacity, including one page of decoder state and rounding.\n      const decoderCapacity = this._maxEncodedBytes + 131072;\n      if (decoderCapacity > this._opts.storageLimit * 1000000) {\n        this._aborted = true;\n        if (this._parsedCommand?.id !== undefined) {\n          this._sendResponse(this._parsedCommand.id, 'ENOMEM:pending image budget exceeded', this._parsedCommand.quiet ?? 0);\n        }\n        return;\n      }\n      const maxPending = Math.max(1, Math.floor(this._opts.storageLimit * 1000000 / decoderCapacity));\n      while (this._pendingTransmissions.size >= maxPending) {\n        const oldest = this._pendingTransmissions.entries().next().value;\n        if (!oldest) break;\n        oldest[1].decoder.release();\n        this._removePendingEntry(oldest[0]);\n        if (oldest[1].cmd.id !== undefined) {\n          this._sendResponse(oldest[1].cmd.id, 'ENOMEM:pending image budget exceeded', oldest[1].cmd.quiet ?? 0);\n        }\n      }\n      const decoder = new Base64Decoder(Constants.DECODER_KEEP_DATA, this._maxEncodedBytes, this._initialEncodedBytes);\n      try {\n        decoder.init();\n      } catch (e) {\n        // Why: wasm memory exhaustion must drop this image, not throw out of the parser and wedge the write queue.\n        console.warn('KITTY: could not allocate decoder', e);\n        this._aborted = true;\n        if (this._parsedCommand?.id !== undefined) {\n          this._sendResponse(this._parsedCommand.id, 'ENOMEM:could not allocate decoder', this._parsedCommand.quiet ?? 0);\n        }\n        return;\n      }\n      this._activeDecoder = decoder;\n    }\n\n    if (this._activeDecoder.put(data.subarray(start, end)) !== DECODER_OK) {\n      this._activeDecoder.release();\n      this._activeDecoder = null;\n      this._decodeError = true;\n      if (pending) {\n        this._removePendingEntry(pendingKey);\n      }\n    }\n  }\n\n  public end(success: boolean): boolean | Promise<boolean> {\n    if (this._aborted || !success) {\n      if (this._activeDecoder) {\n        this._activeDecoder.release();\n        this._activeDecoder = null;\n      }\n      return true;\n    }\n\n    // No semicolon = no payload (delete, capability query)\n    if (this._inControlData) {\n      return this._handleNoPayloadCommand();\n    }\n\n    // Use command parsed early in put() - i+I already validated there\n    const cmd = this._parsedCommand!;\n\n    // Delete action was handled by skipping payload - just execute\n    if (cmd.action === KittyAction.DELETE) {\n      return this._handleDelete(cmd);\n    }\n\n    // Per spec, subsequent chunks may omit i=, so fall back to _lastPendingKey.\n    const pendingKey = cmd.id ?? this._lastPendingKey ?? 0;\n    const isMoreComing = cmd.more === 1;\n    const pending = this._pendingTransmissions.get(pendingKey);\n\n    if (isMoreComing) {\n      if (this._activeDecoder) {\n        if (pending) {\n          pending.totalEncodedSize += this._totalEncodedSize;\n          pending.decodeError = pending.decodeError || this._decodeError;\n        } else {\n          this._pendingTransmissions.set(pendingKey, {\n            cmd: { ...cmd },\n            decoder: this._activeDecoder,\n            totalEncodedSize: this._totalEncodedSize,\n            decodeError: this._decodeError\n          });\n        }\n        this._lastPendingKey = pendingKey;\n        this._activeDecoder = null;\n      }\n      return true;\n    }\n\n    // Final chunk received \u2014 clear the last pending key\n    if (pending) {\n      this._lastPendingKey = undefined;\n    }\n\n    let decodeError = this._decodeError;\n    let finalCmd = cmd;\n    let decoder = this._activeDecoder;\n\n    if (pending) {\n      finalCmd = pending.cmd;\n      decoder = pending.decoder;\n      decodeError = decodeError || pending.decodeError;\n      this._pendingTransmissions.delete(pendingKey);\n    }\n\n    let imageBytes = new Uint8Array(0);\n    if (decoder) {\n      if (decoder.end() !== DECODER_OK) {\n        decodeError = true;\n      }\n      imageBytes = decoder.data8;\n    }\n    this._activeDecoder = null;\n\n    // Handle command first \u2014 handlers create Blob/ImageData from imageBytes,\n    // which copies the data. Only then is it safe to release the decoder's\n    // wasm memory that imageBytes points into.\n    const result = this._handleCommandWithBytesAndCmd(finalCmd, imageBytes, decodeError);\n    if (decoder) {\n      decoder.release();\n    }\n    return result;\n  }\n\n  // Command handling\n\n  private _parseControlDataString(): string {\n    let str = '';\n    for (let i = 0; i < this._controlLength; i++) {\n      str += String.fromCodePoint(this._controlData[i]);\n    }\n    return str;\n  }\n\n  private _handleNoPayloadCommand(): boolean | Promise<boolean> {\n    const cmd = parseKittyCommand(this._parseControlDataString());\n\n    // Per spec: specifying both i and I is an error\n    if (cmd.id !== undefined && cmd.imageNumber !== undefined) {\n      this._sendResponse(cmd.id, 'EINVAL:cannot specify both i and I keys', cmd.quiet ?? 0);\n      return true;\n    }\n\n    const action = cmd.action ?? 't';\n\n    switch (action) {\n      case KittyAction.DELETE:\n        return this._handleDelete(cmd);\n      case KittyAction.QUERY:\n        this._sendResponse(cmd.id ?? 0, 'OK', cmd.quiet ?? 0);\n        return true;\n      case KittyAction.PLACEMENT:\n        return this._handlePlacement(cmd);\n      default:\n        // TODO: Implement remaining actions when needed:\n        // - a=f (frame): animation frame operations\n        // - a=a (animation): animation control\n        // - a=c (compose): compose images\n        if (cmd.id !== undefined) {\n          this._sendResponse(cmd.id, 'EINVAL:unsupported action', cmd.quiet ?? 0);\n        }\n        return true;\n    }\n  }\n\n  private _handleCommandWithBytesAndCmd(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean | Promise<boolean> {\n    const action = cmd.action ?? 't';\n\n    switch (action) {\n      case KittyAction.TRANSMIT: {\n        const result = this._handleTransmit(cmd, bytes, decodeError);\n        // Only send response when _handleTransmit didn't already respond\n        // (it handles unsupported transmission medium responses internally)\n        if ((cmd.transmission ?? 'd') === 'd' && cmd.id !== undefined) {\n          if (decodeError) {\n            this._sendResponse(cmd.id, 'EINVAL:invalid base64 data', cmd.quiet ?? 0);\n          } else if (bytes.length > 0) {\n            this._sendResponse(cmd.id, 'OK', cmd.quiet ?? 0);\n          }\n        }\n        return result;\n      }\n      case KittyAction.TRANSMIT_DISPLAY:\n        return this._handleTransmitDisplay(cmd, bytes, decodeError);\n      case KittyAction.QUERY:\n        return this._handleQuery(cmd, bytes, decodeError);\n      case KittyAction.PLACEMENT:\n        // a=p ignores any payload \u2014 image data was already transmitted\n        return this._handlePlacement(cmd);\n      default:\n        // TODO: Implement remaining actions when needed:\n        // - a=f (frame): animation frame operations\n        // - a=a (animation): animation control\n        // - a=c (compose): compose images\n        if (cmd.id !== undefined) {\n          this._sendResponse(cmd.id, 'EINVAL:unsupported action', cmd.quiet ?? 0);\n        }\n        return true;\n    }\n  }\n\n  private _handlePlacement(cmd: IKittyCommand): boolean | Promise<boolean> {\n    if (cmd.id === undefined) {\n      return true;\n    }\n    const id = cmd.id;\n    const image = this._kittyStorage.getImage(id);\n    if (!image) {\n      this._sendResponse(id, 'ENOENT:image not found', cmd.quiet ?? 0, cmd.placementId);\n      return true;\n    }\n    const result = this._displayImage(image, cmd);\n    return result.then(success => {\n      this._sendResponse(id, success ? 'OK' : 'EINVAL:image rendering failed', cmd.quiet ?? 0, cmd.placementId);\n      return true;\n    });\n  }\n\n  private _handleTransmit(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean {\n    // TODO: Support file-based transmission modes (t=f, t=t, t=s)\n    // Currently only supports direct transmission (t=d, the default).\n    // - t=f (file): Payload is base64-encoded file path. Terminal reads image from that path.\n    // - t=t (temp file): Payload is base64-encoded path in temp directory. Terminal reads, deletes.\n    // - t=s: Payload is base64-encoded POSIX shm name. Terminal reads from shared memory.\n    // These modes require filesystem/IPC access not available in browsers. For Node.js/Electron:\n    // 1. Check cmd.transmission (t key) before treating bytes as image data\n    // 2. For t=f/t/s: decode bytes as UTF-8 string (the path/name), then read file contents\n    // 3. For t=d: treat bytes as image data (current behavior)\n    // When implementing, also update _handleQuery to accept these transmission mediums.\n    const transmission = cmd.transmission ?? 'd';\n    if (transmission !== 'd') {\n      if (cmd.id !== undefined) {\n        this._sendResponse(cmd.id, 'EINVAL:unsupported transmission medium', cmd.quiet ?? 0);\n      }\n      return true;\n    }\n\n    if (decodeError || bytes.length === 0) return true;\n\n    this._kittyStorage.storeImage(cmd.id, {\n      data: new Blob([bytes as BlobPart]),\n      width: cmd.width ?? 0,\n      height: cmd.height ?? 0,\n      format: (cmd.format ?? KittyFormat.RGBA) as 24 | 32 | 100,\n      compression: cmd.compression ?? ''\n    });\n    return true;\n  }\n\n  private _handleTransmitDisplay(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean | Promise<boolean> {\n    if (decodeError) {\n      if (cmd.id !== undefined) {\n        this._sendResponse(cmd.id, 'EINVAL:invalid base64 data', cmd.quiet ?? 0);\n      }\n      return true;\n    }\n\n    this._handleTransmit(cmd, bytes, decodeError);\n\n    const id = cmd.id ?? this._kittyStorage.lastImageId;\n    const image = this._kittyStorage.getImage(id);\n    if (image) {\n      const result = this._displayImage(image, cmd);\n      if (cmd.id !== undefined) {\n        return result.then(success => {\n          this._sendResponse(id, success ? 'OK' : 'EINVAL:image rendering failed', cmd.quiet ?? 0);\n          return true;\n        });\n      }\n      return result.then(() => true);\n    }\n    return true;\n  }\n\n  private _handleQuery(cmd: IKittyCommand, bytes: Uint8Array, decodeError: boolean): boolean {\n    const id = cmd.id ?? 0;\n    const quiet = cmd.quiet ?? 0;\n\n    // Per spec: reject unsupported transmission mediums (only t=d is supported atm)\n    // TODO: When filesystem support is added (Node.js/Electron), update this to accept\n    // t=f (file), t=t (temp file), and t=s (shared memory) and respond OK for queries.\n    const transmission = cmd.transmission ?? 'd';\n    if (transmission !== 'd') {\n      this._sendResponse(id, 'EINVAL:unsupported transmission medium', quiet);\n      return true;\n    }\n\n    // Check decode error first (invalid base64)\n    if (decodeError) {\n      this._sendResponse(id, 'EINVAL:invalid base64 data', quiet);\n      return true;\n    }\n\n    // Capability query (no payload) - just respond OK\n    if (bytes.length === 0) {\n      this._sendResponse(id, 'OK', quiet);\n      return true;\n    }\n\n    const format = cmd.format ?? KittyFormat.RGBA;\n\n    if (format === KittyFormat.PNG) {\n      this._sendResponse(id, 'OK', quiet);\n    } else {\n      const width = cmd.width ?? 0;\n      const height = cmd.height ?? 0;\n\n      if (!width || !height) {\n        this._sendResponse(id, 'EINVAL:width and height required for raw pixel data', quiet);\n        return true;\n      }\n\n      const bytesPerPixel = format === KittyFormat.RGBA ? KittyPixelConstants.BYTES_PER_PIXEL_RGBA : KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n      const expectedBytes = width * height * bytesPerPixel;\n\n      if (bytes.length < expectedBytes) {\n        this._sendResponse(id, `EINVAL:insufficient pixel data`, quiet);\n        return true;\n      }\n\n      this._sendResponse(id, 'OK', quiet);\n    }\n    return true;\n  }\n\n  private _handleDelete(cmd: IKittyCommand): boolean {\n    // Per spec: default delete selector is 'a' (delete all visible placements)\n    const selector = cmd.deleteSelector ?? 'a';\n\n    // TODO: Distinguish lowercase (delete placements only) from uppercase\n    // (delete placements + free stored image data). Currently both variants\n    // free everything since we don't separate stored data from placements.\n    switch (selector) {\n      case 'a':\n      case 'A':\n        this._cleanupAllPending();\n        this._kittyStorage.deleteAll();\n        break;\n      case 'i':\n      case 'I':\n        // TODO: When placement id tracking is implemented (see TODO in\n        // KittyImageStorage), d=i with p=<pid> should delete only that\n        // specific placement, while d=i without p should delete all\n        // placements for the image.\n        if (cmd.id !== undefined) {\n          const pending = this._pendingTransmissions.get(cmd.id);\n          if (pending) {\n            pending.decoder.release();\n          }\n          this._removePendingEntry(cmd.id);\n          this._kittyStorage.deleteById(cmd.id);\n        }\n        break;\n      default:\n        // Unsupported selectors (c, n, p, q, r, x, y, z, f) \u2014 ignore for now\n        break;\n    }\n    return true;\n  }\n\n  private _sendResponse(id: number, message: string, quiet: number, placementId?: number): void {\n    const isOk = message === 'OK';\n    if (isOk && quiet >= 1) return;\n    if (!isOk && quiet >= 2) return;\n\n    const pPart = placementId ? `,p=${placementId}` : '';\n    const response = `\\x1b_Gi=${id}${pPart};${message}\\x1b\\\\`;\n    this._coreTerminal._core.coreService.triggerDataEvent(response);\n  }\n\n  // Image display\n\n  private _displayImage(image: IKittyImageData, cmd: IKittyCommand): Promise<boolean> {\n    return this._decodeAndDisplay(image, cmd)\n      .then(() => true)\n      .catch(() => false);\n  }\n\n  private async _decodeAndDisplay(image: IKittyImageData, cmd: IKittyCommand): Promise<void> {\n    const generation = this._generation;\n    let bitmap: ImageBitmap | undefined = await this._createBitmap(image);\n\n    try {\n      if (generation !== this._generation) throw new Error('image decode canceled');\n      const cropX = Math.max(0, cmd.x ?? 0);\n      const cropY = Math.max(0, cmd.y ?? 0);\n      const cropW = cmd.sourceWidth || (bitmap.width - cropX);\n      const cropH = cmd.sourceHeight || (bitmap.height - cropY);\n\n      const maxCropW = Math.max(0, bitmap.width - cropX);\n      const maxCropH = Math.max(0, bitmap.height - cropY);\n      const finalCropW = Math.max(0, Math.min(cropW, maxCropW));\n      const finalCropH = Math.max(0, Math.min(cropH, maxCropH));\n\n      if (finalCropW === 0 || finalCropH === 0) {\n        throw new Error('invalid source rectangle');\n      }\n\n      if (cropX !== 0 || cropY !== 0 || finalCropW !== bitmap.width || finalCropH !== bitmap.height) {\n        const cropped = await createImageBitmap(bitmap, cropX, cropY, finalCropW, finalCropH);\n        bitmap.close();\n        bitmap = cropped;\n      }\n\n      const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;\n      const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;\n\n      // Per spec: c/r default to image's natural cell dimensions.\n      // If only one of c/r is specified, compute the other from image aspect ratio.\n      let imgCols: number;\n      let imgRows: number;\n      if (cmd.columns !== undefined && cmd.rows !== undefined) {\n        imgCols = cmd.columns;\n        imgRows = cmd.rows;\n      } else if (cmd.columns !== undefined) {\n        imgCols = cmd.columns;\n        imgRows = Math.max(1, Math.ceil((bitmap.height / bitmap.width) * (imgCols * cw) / ch));\n      } else if (cmd.rows !== undefined) {\n        imgRows = cmd.rows;\n        imgCols = Math.max(1, Math.ceil((bitmap.width / bitmap.height) * (imgRows * ch) / cw));\n      } else {\n        imgCols = Math.ceil(bitmap.width / cw);\n        imgRows = Math.ceil(bitmap.height / ch);\n      }\n\n      let w = bitmap.width;\n      let h = bitmap.height;\n\n      // Scale bitmap to fit placement rectangle when c/r are specified\n      if (cmd.columns !== undefined || cmd.rows !== undefined) {\n        w = Math.round(imgCols * cw);\n        h = Math.round(imgRows * ch);\n      }\n\n      if (w * h > this._opts.pixelLimit) {\n        throw new Error('image exceeds pixel limit');\n      }\n\n      // Save cursor position before addImage modifies it\n      const buffer = this._coreTerminal._core.buffer;\n      const savedX = buffer.x;\n      const savedY = buffer.y;\n      const savedYbase = buffer.ybase;\n\n      // Determine layer based on z-index: negative = behind text, 0+ = on top.\n      // When z<0 we always use the bottom layer even without allowTransparency \u2014\n      // the image will simply be hidden behind the opaque text background, which\n      // is the correct behavior (client asked for \"behind text\").\n      const wantsBottom = cmd.zIndex !== undefined && cmd.zIndex < 0;\n      const layer: ImageLayer = wantsBottom ? 'bottom' : 'top';\n\n      if (w !== bitmap.width || h !== bitmap.height) {\n        const scaled = await createImageBitmap(bitmap, { resizeWidth: w, resizeHeight: h });\n        bitmap.close();\n        bitmap = scaled;\n      }\n\n      // Per spec: X/Y are pixel offsets within the first cell, so clamp to cell dimensions\n      const xOffset = Math.min(Math.max(0, cmd.xOffset ?? 0), cw - 1);\n      const yOffset = Math.min(Math.max(0, cmd.yOffset ?? 0), ch - 1);\n      if (xOffset !== 0 || yOffset !== 0) {\n        // Per spec: X/Y is not added to c/r area. When c/r are explicit, the\n        // total placement area remains c*cw \u00D7 r*ch pixels and the offset image\n        // is clipped to fit. When c/r are unset, the padded canvas determines\n        // the natural cell dimensions.\n        const canvasW = (cmd.columns !== undefined) ? Math.round(imgCols * cw) : bitmap.width + xOffset;\n        const canvasH = (cmd.rows !== undefined) ? Math.round(imgRows * ch) : bitmap.height + yOffset;\n        const offsetCanvas = ImageRenderer.createCanvas(window.document, canvasW, canvasH);\n        const offsetCtx = offsetCanvas.getContext('2d');\n        if (!offsetCtx) {\n          throw new Error('Failed to create offset canvas context');\n        }\n        offsetCtx.drawImage(bitmap, xOffset, yOffset);\n\n        const offsetBitmap = await createImageBitmap(offsetCanvas);\n        offsetCanvas.width = offsetCanvas.height = 0;\n        bitmap.close();\n        bitmap = offsetBitmap;\n        w = bitmap.width;\n        h = bitmap.height;\n        if (w * h > this._opts.pixelLimit) {\n          throw new Error('image exceeds pixel limit');\n        }\n        if (cmd.columns === undefined) {\n          imgCols = Math.ceil(bitmap.width / cw);\n        }\n        if (cmd.rows === undefined) {\n          imgRows = Math.ceil(bitmap.height / ch);\n        }\n      }\n\n      if (generation !== this._generation) throw new Error('image decode canceled');\n      const zIndex = cmd.zIndex ?? 0;\n      this._kittyStorage.addImage(image.id, bitmap, true, layer, zIndex);\n      bitmap = undefined;  // ownership transferred to storage\n\n      // Kitty cursor movement\n      // Per spec: cursor placed at first column after last image column,\n      // on the last row of the image. C=1 means don't move cursor.\n      if (cmd.cursorMovement === 1) {\n        // C=1: restore cursor to position before image was placed\n        const scrolled = buffer.ybase - savedYbase;\n        buffer.x = savedX;\n        // Can't restore cursor to scrollback?\n        buffer.y = Math.max(savedY - scrolled, 0);\n      } else {\n        // Default (C=0): advance cursor horizontally past the image\n        // addImage already positioned cursor on the last row via lineFeeds\n        buffer.x = Math.min(savedX + imgCols, this._coreTerminal.cols);\n      }\n    } catch (e) {\n      bitmap?.close();\n      throw e;\n    }\n  }\n\n  // Create ImageBitmap from already-decoded image data.\n  private async _createBitmap(image: IKittyImageData): Promise<ImageBitmap> {\n    let bytes: Uint8Array = new Uint8Array(await image.data.arrayBuffer());\n\n    if (image.compression === KittyCompression.ZLIB) {\n      bytes = await this._decompressZlib(bytes);\n    }\n\n    if (image.format === KittyFormat.PNG) {\n      const metrics = imageType(bytes);\n      // IHDR dimensions are parsed with signed shifts, so a value >= 0x80000000 comes\n      // back negative and a bare `>` pixel-limit test passes it; require positive.\n      if (metrics.mime !== 'image/png' || !(metrics.width > 0) || !(metrics.height > 0) || metrics.width * metrics.height > this._opts.pixelLimit) {\n        throw new RangeError('PNG exceeds pixel limit or has invalid dimensions');\n      }\n      const blob = new Blob([bytes as BlobPart], { type: 'image/png' });\n      if (!window.createImageBitmap) {\n        const url = URL.createObjectURL(blob);\n        const img = new Image();\n        return new Promise<ImageBitmap>((resolve, reject) => {\n          img.addEventListener('load', () => {\n            URL.revokeObjectURL(url);\n            const canvas = ImageRenderer.createCanvas(window.document, img.width, img.height);\n            canvas.getContext('2d')?.drawImage(img, 0, 0);\n            createImageBitmap(canvas).then(resolve).catch(reject);\n          });\n          img.addEventListener('error', () => {\n            URL.revokeObjectURL(url);\n            reject(new Error('Failed to load image'));\n          });\n          img.src = url;\n        });\n      }\n      return createImageBitmap(blob);\n    }\n\n    // Raw pixel data\n    const width = image.width;\n    const height = image.height;\n\n    if (!width || !height) {\n      throw new Error('Width and height required for raw pixel data');\n    }\n\n    const bytesPerPixel = image.format === KittyFormat.RGBA ? KittyPixelConstants.BYTES_PER_PIXEL_RGBA : KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n    const expectedBytes = width * height * bytesPerPixel;\n\n    if (bytes.length < expectedBytes) {\n      throw new Error('Insufficient pixel data');\n    }\n\n    const pixelCount = width * height;\n\n    if (image.format === KittyFormat.RGBA) {\n      // RGBA: use bytes directly \u2014 no copy needed\n      return createImageBitmap(new ImageData(new Uint8ClampedArray(bytes.buffer as ArrayBuffer, bytes.byteOffset, pixelCount * KittyPixelConstants.BYTES_PER_PIXEL_RGBA), width, height));\n    }\n\n    // RGB\u2192RGBA: interleave alpha using uint32 block processing (4 pixels per iteration).\n    // 3 uint32 reads + 4 uint32 writes per 4 pixels vs 28 byte reads/writes \u2014 ~6x faster.\n    // Assumes little-endian (all modern browsers/Node.js).\n    const data = new Uint8ClampedArray(pixelCount * KittyPixelConstants.BYTES_PER_PIXEL_RGBA);\n    const src32 = new Uint32Array(bytes.buffer, bytes.byteOffset, Math.floor(bytes.byteLength / 4));\n    const dst32 = new Uint32Array(data.buffer);\n    const alignedPixels = pixelCount & ~3;  // round down to multiple of 4\n\n    let srcOffset = 0;\n    let dstOffset = 0;\n    for (let i = 0; i < alignedPixels; i += 4) {\n      const b0 = src32[srcOffset++];\n      const b1 = src32[srcOffset++];\n      const b2 = src32[srcOffset++];\n      // Little-endian: pixel bytes are [R,G,B] \u2192 uint32 ABGR layout\n      dst32[dstOffset++] = 0xFF000000 | b0;\n      dst32[dstOffset++] = 0xFF000000 | (b0 >>> 24) | (b1 << 8);\n      dst32[dstOffset++] = 0xFF000000 | (b1 >>> 16) | (b2 << 16);\n      dst32[dstOffset++] = 0xFF000000 | (b2 >>> 8);\n    }\n\n    // Handle remaining 1\u20133 pixels\n    let srcByte = alignedPixels * KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n    let dstByte = alignedPixels * KittyPixelConstants.BYTES_PER_PIXEL_RGBA;\n    for (let i = alignedPixels; i < pixelCount; i++) {\n      data[dstByte]     = bytes[srcByte];\n      data[dstByte + 1] = bytes[srcByte + 1];\n      data[dstByte + 2] = bytes[srcByte + 2];\n      data[dstByte + 3] = KittyPixelConstants.ALPHA_OPAQUE;\n      srcByte += KittyPixelConstants.BYTES_PER_PIXEL_RGB;\n      dstByte += KittyPixelConstants.BYTES_PER_PIXEL_RGBA;\n    }\n\n    return createImageBitmap(new ImageData(data, width, height));\n  }\n\n  private async _decompressZlib(compressed: Uint8Array): Promise<Uint8Array> {\n    try {\n      return await this._decompress(compressed, 'deflate');\n    } catch (error) {\n      if (error instanceof RangeError) throw error;\n      return await this._decompress(compressed, 'deflate-raw');\n    }\n  }\n\n  private async _decompress(compressed: Uint8Array, format: 'deflate' | 'deflate-raw'): Promise<Uint8Array> {\n    const limit = Math.min(this._opts.kittySizeLimit, this._opts.pixelLimit * 4, this._opts.storageLimit * 1000000);\n    let offsetIn = 0;\n    // Bound inflation within one native transform before its output is budgeted.\n    const source = new ReadableStream<BufferSource>({\n      pull(controller) {\n        if (offsetIn >= compressed.length) {\n          controller.close();\n          return;\n        }\n        const end = Math.min(offsetIn + 4096, compressed.length);\n        controller.enqueue(new Uint8Array(compressed.subarray(offsetIn, end)));\n        offsetIn = end;\n      }\n    });\n    const reader = source.pipeThrough(new DecompressionStream(format)).getReader();\n    const chunks: Uint8Array[] = [];\n    let totalLength = 0;\n    try {\n      while (true) {\n        const { done, value } = await reader.read();\n        if (done) break;\n        totalLength += value.byteLength;\n        if (totalLength > limit) {\n          await reader.cancel().catch(() => {});\n          throw new RangeError('decompressed image exceeds byte limit');\n        }\n        chunks.push(value);\n      }\n    } finally {\n      reader.releaseLock();\n    }\n\n    const result = new Uint8Array(totalLength);\n    let offset = 0;\n    for (const chunk of chunks) {\n      result.set(chunk, offset);\n      offset += chunk.length;\n    }\n    return result;\n  }\n\n  public get images(): ReadonlyMap<number, IKittyImageData> {\n    return this._kittyStorage.images;\n  }\n\n  public get _kittyIdToStorageId(): ReadonlyMap<number, number> {\n    return this._kittyStorage.kittyIdToStorageId;\n  }\n\n  public get pendingTransmissions(): ReadonlyMap<number, IPendingTransmission> {\n    return this._pendingTransmissions;\n  }\n}\n", "/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n *\n * Kitty graphics protocol types, constants, and parsing utilities.\n */\n\nimport type Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';\n\n// Kitty graphics protocol action types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference under key 'a'.\nexport const enum KittyAction {\n  TRANSMIT = 't',\n  TRANSMIT_DISPLAY = 'T',\n  QUERY = 'q',\n  PLACEMENT = 'p',\n  DELETE = 'd'\n}\n\n// Kitty graphics protocol format types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference\nexport const enum KittyFormat {\n  RGB = 24,\n  RGBA = 32,\n  PNG = 100\n}\n\n// Kitty graphics protocol compression types.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference under key 'o'.\nexport const enum KittyCompression {\n  NONE = '',\n  ZLIB = 'z'\n}\n\n// Kitty graphics protocol control data keys.\n// See: https://sw.kovidgoyal.net/kitty/graphics-protocol/#control-data-reference\nexport const enum KittyKey {\n  // Action to perform (t=transmit, T=transmit+display, q=query, p=placement, d=delete)\n  ACTION = 'a',\n  // Image format (24=RGB, 32=RGBA, 100=PNG)\n  FORMAT = 'f',\n  // Image ID for referencing stored images\n  ID = 'i',\n  // Image number (alternative to ID, terminal assigns ID)\n  IMAGE_NUMBER = 'I',\n  // Source image width in pixels\n  WIDTH = 's',\n  // Source image height in pixels\n  HEIGHT = 'v',\n  // The left edge (in pixels) of the image area to display\n  X_OFFSET = 'x',\n  // The top edge (in pixels) of the image area to display\n  Y_OFFSET = 'y',\n  // Width (in pixels) of the source rectangle to display\n  SOURCE_WIDTH = 'w',\n  // Height (in pixels) of the source rectangle to display\n  SOURCE_HEIGHT = 'h',\n  // Horizontal offset (in pixels) within the first cell\n  X_PLACEMENT_OFFSET = 'X',\n  // Vertical offset (in pixels) within the first cell\n  Y_PLACEMENT_OFFSET = 'Y',\n  // Number of terminal columns to display the image over\n  COLUMNS = 'c',\n  // Number of terminal rows to display the image over\n  ROWS = 'r',\n  // More data flag (1=more chunks coming, 0=final chunk)\n  MORE = 'm',\n  // Compression type (z=zlib). This is essential for chunking larger images.\n  COMPRESSION = 'o',\n  // Quiet mode (1=suppress OK responses, 2=suppress error responses)\n  QUIET = 'q',\n  // Cursor movement policy (0=move cursor after image, 1=don't move cursor)\n  CURSOR_MOVEMENT = 'C',\n  // Z-index for image layering (negative = behind text, 0+ = on top)\n  Z_INDEX = 'z',\n  // Transmission medium (d=direct, f=file, t=temp file, s=shared memory)\n  TRANSMISSION = 't',\n  // Delete selector (a/A=all, i/I=by id, c/C=at cursor, etc.) \u2014 only used when a=d\n  DELETE_SELECTOR = 'd',\n  // Placement ID for targeting specific placements\n  PLACEMENT_ID = 'p'\n}\n\n// Pixel format constants\nexport const enum KittyPixelConstants {\n  BYTES_PER_PIXEL_RGB = 3,\n  BYTES_PER_PIXEL_RGBA = 4,\n  ALPHA_OPAQUE = 255\n}\n\n// Parsed Kitty graphics command.\nexport interface IKittyCommand {\n  action?: string;\n  format?: number;\n  id?: number;\n  imageNumber?: number;\n  width?: number;\n  height?: number;\n  x?: number;\n  y?: number;\n  sourceWidth?: number;\n  sourceHeight?: number;\n  xOffset?: number;\n  yOffset?: number;\n  columns?: number;\n  rows?: number;\n  more?: number;\n  quiet?: number;\n  cursorMovement?: number;\n  zIndex?: number;\n  transmission?: string;\n  deleteSelector?: string;\n  placementId?: number;\n  compression?: string;\n  payload?: string;\n}\n\n// Pending chunked transmission state.\n// Stores metadata from the first chunk while accumulating decoded payload data.\nexport interface IPendingTransmission {\n  // The parsed command from the first chunk (contains action, format, dimensions, etc.)\n  cmd: IKittyCommand;\n  // Decoder used across chunked payloads\n  decoder: Base64Decoder;\n  // Total encoded (base64) bytes received across all chunks - for size limit enforcement\n  totalEncodedSize: number;\n  // Whether any chunk has failed to decode\n  decodeError: boolean;\n}\n\n// Stored Kitty image data.\nexport interface IKittyImageData {\n  id: number;\n  // Decoded image data stored as Blob (off JS heap) to avoid 2GB heap limit\n  data: Blob;\n  width: number;\n  height: number;\n  format: 24 | 32 | 100;\n  compression?: string;\n}\n\n// Parses Kitty graphics control data into a command object.\nexport function parseKittyCommand(data: string): IKittyCommand {\n  const cmd: IKittyCommand = {};\n  const parts = data.split(',');\n\n  for (const part of parts) {\n    const eqIdx = part.indexOf('=');\n    if (eqIdx === -1) continue;\n\n    const key = part.substring(0, eqIdx);\n    const value = part.substring(eqIdx + 1);\n\n    // Handle string keys first\n    if (key === KittyKey.ACTION) {\n      cmd.action = value;\n      continue;\n    }\n    if (key === KittyKey.COMPRESSION) {\n      cmd.compression = value;\n      continue;\n    }\n    if (key === KittyKey.TRANSMISSION) {\n      cmd.transmission = value;\n      continue;\n    }\n    if (key === KittyKey.DELETE_SELECTOR) {\n      cmd.deleteSelector = value;\n      continue;\n    }\n    const numValue = parseInt(value, 10);\n    switch (key) {\n      case KittyKey.FORMAT: cmd.format = numValue; break;\n      case KittyKey.ID: cmd.id = numValue; break;\n      case KittyKey.IMAGE_NUMBER: cmd.imageNumber = numValue; break;\n      case KittyKey.WIDTH: cmd.width = numValue; break;\n      case KittyKey.HEIGHT: cmd.height = numValue; break;\n      case KittyKey.X_OFFSET: cmd.x = numValue; break;\n      case KittyKey.Y_OFFSET: cmd.y = numValue; break;\n      case KittyKey.SOURCE_WIDTH: cmd.sourceWidth = numValue; break;\n      case KittyKey.SOURCE_HEIGHT: cmd.sourceHeight = numValue; break;\n      case KittyKey.X_PLACEMENT_OFFSET: cmd.xOffset = numValue; break;\n      case KittyKey.Y_PLACEMENT_OFFSET: cmd.yOffset = numValue; break;\n      case KittyKey.COLUMNS: cmd.columns = numValue; break;\n      case KittyKey.ROWS: cmd.rows = numValue; break;\n      case KittyKey.MORE: cmd.more = numValue; break;\n      case KittyKey.QUIET: cmd.quiet = numValue; break;\n      case KittyKey.CURSOR_MOVEMENT: cmd.cursorMovement = numValue; break;\n      case KittyKey.Z_INDEX: cmd.zIndex = numValue; break;\n      case KittyKey.PLACEMENT_ID: cmd.placementId = numValue; break;\n    }\n  }\n\n  return cmd;\n}\n", "/**\n * Copyright (c) 2026 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IDisposable } from '@xterm/xterm';\nimport { ImageStorage } from '../ImageStorage';\nimport { ImageLayer, IAddImageOpts } from '../Types';\nimport { IKittyImageData } from './KittyGraphicsTypes';\n\n// Kitty-specific image storage controller.\n//\n// Wraps shared ImageStorage with kitty protocol semantics:\n// - tracks transmitted image payloads by kitty image id\n// - tracks kitty image id -> shared ImageStorage id mapping for displayed images\n// - mirrors shared-storage evictions into kitty maps\n// - applies protocol-level undisplayed-image eviction policy\nexport class KittyImageStorage implements IDisposable {\n  private static readonly _maxStoredImages = 256;\n\n  private _nextImageId = 1;\n  private readonly _images: Map<number, IKittyImageData> = new Map();\n  // TODO: Support multiple placements per image. The kitty spec identifies\n  // placements by an (image id, placement id) pair \u2014 same i + different p\n  // values should coexist, and same i + same p should replace the prior\n  // placement. Currently we track only one storage entry per kitty image id,\n  // so multiple placements of the same image overwrite each other. Fixing\n  // this requires changing these maps to Map<number, Map<number, number>>\n  // (kittyId \u2192 placementId \u2192 storageId) and updating addImage/deleteById\n  // accordingly. The underlying shared ImageStorage would also need to\n  // support multiple entries per logical image.\n  private readonly _kittyIdToStorageId: Map<number, number> = new Map();\n  private readonly _storageIdToKittyId: Map<number, number> = new Map();\n\n  private readonly _previousOnImageDeleted: ((storageId: number) => void) | undefined;\n  private readonly _wrappedOnImageDeleted: (storageId: number) => void;\n  private readonly _handleStorageImageDeleted = (storageId: number): void => {\n    const kittyId = this._storageIdToKittyId.get(storageId);\n    if (kittyId !== undefined) {\n      this._kittyIdToStorageId.delete(kittyId);\n      this._storageIdToKittyId.delete(storageId);\n      this._images.delete(kittyId);\n    }\n  };\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };\n\n  constructor(\n    private readonly _storage: ImageStorage\n  ) {\n    this._previousOnImageDeleted = this._storage.onImageDeleted;\n    this._wrappedOnImageDeleted = (storageId: number) => {\n      this._previousOnImageDeleted?.(storageId);\n      this._handleStorageImageDeleted(storageId);\n    };\n    this._storage.onImageDeleted = this._wrappedOnImageDeleted;\n  }\n\n  public reset(): void {\n    this._nextImageId = 1;\n    this._images.clear();\n    this._kittyIdToStorageId.clear();\n    this._storageIdToKittyId.clear();\n  }\n\n  public dispose(): void {\n    this.reset();\n    if (this._storage.onImageDeleted === this._wrappedOnImageDeleted) {\n      this._storage.onImageDeleted = this._previousOnImageDeleted;\n    }\n  }\n\n  public storeImage(id: number | undefined, imageData: Omit<IKittyImageData, 'id'>): number {\n    const imageId = id ?? this._nextImageId++;\n\n    const oldStorageId = this._kittyIdToStorageId.get(imageId);\n    if (oldStorageId !== undefined) {\n      this._storage.deleteImage(oldStorageId);\n      this._kittyIdToStorageId.delete(imageId);\n      this._storageIdToKittyId.delete(oldStorageId);\n    }\n\n    if (!this._images.has(imageId) && this._images.size >= KittyImageStorage._maxStoredImages) {\n      this._evictUndisplayedImages();\n    }\n\n    // Encoded images awaiting placement are outside ImageStorage's pixel budget.\n    // Unplaced payloads are evicted first so a new upload cannot erase a visible\n    // image while abandoned blobs still hold budget; placed ones go only when\n    // that is not enough, because the byte cap is a hard bound. The new image is\n    // always stored, so an oversized one overshoots by at most one payload\n    // (itself bounded by kittySizeLimit) rather than being dropped after an OK ack.\n    const byteLimit = this._storage.getLimit() * 1000000;\n    this._images.delete(imageId);\n    let retainedBytes = 0;\n    for (const image of this._images.values()) retainedBytes += image.data.size;\n    for (const evictPlaced of [false, true]) {\n      for (const [oldestId, image] of this._images) {\n        if (retainedBytes + imageData.data.size <= byteLimit) break;\n        if (this._kittyIdToStorageId.has(oldestId) !== evictPlaced) continue;\n        retainedBytes -= image.data.size;\n        this.deleteById(oldestId);\n      }\n    }\n\n    this._images.set(imageId, {\n      ...imageData,\n      id: imageId\n    });\n    return imageId;\n  }\n\n  public addImage(kittyId: number, image: HTMLCanvasElement | ImageBitmap, scrolling: boolean, layer: ImageLayer, zIndex: number): void {\n    // Clean up stale reverse-mapping from a previous placement of the same\n    // kitty image.  The old shared-storage entry is kept (it may still be\n    // visible on screen) but its reverse mapping is removed so that eviction\n    // of the old entry won't incorrectly delete the kitty image data.\n    const oldStorageId = this._kittyIdToStorageId.get(kittyId);\n    if (oldStorageId !== undefined) {\n      this._storageIdToKittyId.delete(oldStorageId);\n    }\n    this._addImageOpts.scrolling = scrolling;\n    this._addImageOpts.layer = layer;\n    this._addImageOpts.zIndex = zIndex;\n    const storageId = this._storage.addImage(image, this._addImageOpts);\n    this._kittyIdToStorageId.set(kittyId, storageId);\n    this._storageIdToKittyId.set(storageId, kittyId);\n  }\n\n  public getImage(kittyId: number): IKittyImageData | undefined {\n    return this._images.get(kittyId);\n  }\n\n  public deleteById(kittyId: number): void {\n    this._images.delete(kittyId);\n    const storageId = this._kittyIdToStorageId.get(kittyId);\n    if (storageId !== undefined) {\n      this._storage.deleteImage(storageId);\n      this._kittyIdToStorageId.delete(kittyId);\n      this._storageIdToKittyId.delete(storageId);\n    }\n  }\n\n  public deleteAll(): void {\n    this._images.clear();\n    for (const storageId of this._kittyIdToStorageId.values()) {\n      this._storage.deleteImage(storageId);\n    }\n    this._kittyIdToStorageId.clear();\n    this._storageIdToKittyId.clear();\n  }\n\n  public get images(): ReadonlyMap<number, IKittyImageData> {\n    return this._images;\n  }\n\n  public get kittyIdToStorageId(): ReadonlyMap<number, number> {\n    return this._kittyIdToStorageId;\n  }\n\n  public get lastImageId(): number {\n    return this._nextImageId - 1;\n  }\n\n  private _evictUndisplayedImages(): void {\n    for (const [kittyId] of this._images) {\n      if (this._images.size <= KittyImageStorage._maxStoredImages / 2) {\n        break;\n      }\n      if (!this._kittyIdToStorageId.has(kittyId)) {\n        this._images.delete(kittyId);\n      }\n    }\n  }\n}\n", "/**\n * Copyright (c) 2020, 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { SixelImageStorage } from './SixelImageStorage';\nimport { IDcsHandler, IParams, IImageAddonOptions, ITerminalExt, AttributeData, IResetHandler, ReadonlyColorSet } from './Types';\nimport { toRGBA8888, BIG_ENDIAN, PALETTE_ANSI_256, PALETTE_VT340_COLOR } from 'sixel/lib/Colors';\nimport { RGBA8888 } from 'sixel/lib/Types';\nimport { ImageRenderer } from './ImageRenderer';\n\nimport { DecoderAsync, Decoder } from 'sixel/lib/Decoder';\nimport { LIMITS } from 'sixel/lib/wasm';\n\n// always free decoder ressources after decoding if it exceeds this limit\nconst MEM_PERMA_LIMIT = 4194304; // 1024 pixels * 1024 pixels * 4 channels = 4MB\n\n// custom default palette: VT340 (lower 16 colors) + ANSI256 (up to 256) + zeroed (up to 4096)\nconst DEFAULT_PALETTE = PALETTE_ANSI_256;\nDEFAULT_PALETTE.set(PALETTE_VT340_COLOR);\n\n// Why pooled: every decoder owns a wasm memory, and V8 caps live wasm memories\n// per process (~124 in a sandboxed renderer). Terminals borrow a decoder only\n// while a SIXEL sequence is open, so idle terminals hold none.\nconst MAX_IDLE_DECODERS = 2;\nconst idleDecoders = new Map<number, Decoder[]>();\nlet poolPrimed = false;\n\nfunction primeDecoderPool(memoryLimit: number): void {\n  if (poolPrimed) return;\n  poolPrimed = true;\n  // Async compile once, off the parser's hot path; later decoders reuse the cached module.\n  DecoderAsync({ memoryLimit, palette: DEFAULT_PALETTE }).then(\n    d => releaseDecoder(d, memoryLimit),\n    () => { poolPrimed = false; }\n  );\n}\n\nfunction acquireDecoder(memoryLimit: number): Decoder {\n  return idleDecoders.get(memoryLimit)?.pop() ?? new Decoder({ memoryLimit, palette: DEFAULT_PALETTE });\n}\n\nfunction releaseDecoder(dec: Decoder, memoryLimit: number): void {\n  if (dec.memoryUsage > MEM_PERMA_LIMIT) {\n    dec.release();\n  }\n  const idle = idleDecoders.get(memoryLimit) ?? [];\n  if (idle.length < MAX_IDLE_DECODERS) {\n    idle.push(dec);\n    idleDecoders.set(memoryLimit, idle);\n  }\n}\n\n\nexport class SixelHandler implements IDcsHandler, IResetHandler {\n  private _size = 0;\n  private _aborted = false;\n  private _dec: Decoder | undefined;\n  private _decMemoryLimit = 0;\n  // Color registers outlive a single image, so they live here rather than in a pooled decoder.\n  private readonly _palette = new Uint32Array(LIMITS.PALETTE_SIZE);\n\n  constructor(\n    private readonly _opts: IImageAddonOptions,\n    private readonly _storage: SixelImageStorage,\n    private readonly _coreTerminal: ITerminalExt\n  ) {\n    this._palette.set(DEFAULT_PALETTE);\n    primeDecoderPool(this._opts.pixelLimit * 4);\n  }\n\n  public reset(): void {\n    this._returnDecoder();\n    this._palette.fill(0);\n    this._palette.set(DEFAULT_PALETTE);\n  }\n\n  public hook(params: IParams): void {\n    this._size = 0;\n    this._aborted = false;\n    this._returnDecoder();\n    const memoryLimit = this._opts.pixelLimit * 4;\n    try {\n      this._dec = acquireDecoder(memoryLimit);\n    } catch (e) {\n      // Why: exhausting wasm memory must drop this image, not throw out of the parser and wedge the write queue.\n      console.warn(`SIXEL: could not allocate decoder - ${e}`);\n      this._aborted = true;\n      return;\n    }\n    this._decMemoryLimit = memoryLimit;\n    const fillColor = params.params[1] === 1 ? 0 : extractActiveBg(\n      this._coreTerminal._core._inputHandler._curAttrData,\n      this._coreTerminal._core._themeService?.colors);\n    this._dec.init(fillColor, this._palette, this._opts.sixelPaletteLimit);\n  }\n\n  private _returnDecoder(): void {\n    const dec = this._dec;\n    if (!dec) return;\n    this._dec = undefined;\n    this._palette.set(dec.palette);\n    releaseDecoder(dec, this._decMemoryLimit);\n  }\n\n  public put(data: Uint32Array, start: number, end: number): void {\n    if (this._aborted || !this._dec) {\n      return;\n    }\n    this._size += end - start;\n    if (this._size > this._opts.sixelSizeLimit) {\n      console.warn(`SIXEL: too much data, aborting`);\n      this._aborted = true;\n      this._dec.release();\n      return;\n    }\n    try {\n      this._dec.decode(data, start, end);\n    } catch (e) {\n      console.warn(`SIXEL: error while decoding image - ${e}`);\n      this._aborted = true;\n      this._dec.release();\n    }\n  }\n\n  public unhook(success: boolean): boolean | Promise<boolean> {\n    try {\n      return this._unhook(success);\n    } finally {\n      this._returnDecoder();\n    }\n  }\n\n  private _unhook(success: boolean): boolean {\n    if (this._aborted || !success || !this._dec) {\n      return true;\n    }\n\n    const width = this._dec.width;\n    const height = this._dec.height;\n\n    // partial fix for https://github.com/jerch/xterm-addon-image/issues/37\n    if (!width || !height) {\n      if (height) {\n        this._storage.advanceCursor(height);\n      }\n      return true;\n    }\n\n    const canvas = ImageRenderer.createCanvas(undefined, width, height);\n    canvas.getContext('2d')?.putImageData(new ImageData(this._dec.data8 as Uint8ClampedArray<ArrayBuffer>, width, height), 0, 0);\n    this._storage.addImage(canvas);\n    return true;\n  }\n}\n\n\n/**\n * Some helpers to extract current terminal colors.\n */\n\n// get currently active background color from terminal\n// also respect INVERSE setting\nfunction extractActiveBg(attr: AttributeData, colors: ReadonlyColorSet | undefined): RGBA8888 {\n  let bg = 0;\n  if (!colors) {\n    // FIXME: theme service is prolly not available yet,\n    // happens if .open() was not called yet (bug in core?)\n    return bg;\n  }\n  if (attr.isInverse()) {\n    if (attr.isFgDefault()) {\n      bg = convertLe(colors.foreground.rgba);\n    } else if (attr.isFgRGB()) {\n      const t = (attr.constructor as typeof AttributeData).toColorRGB(attr.getFgColor());\n      bg = toRGBA8888(...t);\n    } else {\n      bg = convertLe(colors.ansi[attr.getFgColor()].rgba);\n    }\n  } else {\n    if (attr.isBgDefault()) {\n      bg = convertLe(colors.background.rgba);\n    } else if (attr.isBgRGB()) {\n      const t = (attr.constructor as typeof AttributeData).toColorRGB(attr.getBgColor());\n      bg = toRGBA8888(...t);\n    } else {\n      bg = convertLe(colors.ansi[attr.getBgColor()].rgba);\n    }\n  }\n  return bg;\n}\n\n// rgba values on the color managers are always in BE, thus convert to LE\nfunction convertLe(color: number): RGBA8888 {\n  if (BIG_ENDIAN) return color;\n  return (color & 0xFF) << 24 | (color >>> 8 & 0xFF) << 16 | (color >>> 16 & 0xFF) << 8 | color >>> 24 & 0xFF;\n}\n", "/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';\nimport { IImageAddonOptions, ITerminalExt, IAddImageOpts } from './Types';\nimport { ImageRenderer } from './ImageRenderer';\n\n/**\n * Sixel-specific image storage controller.\n *\n * Wraps the shared ImageStorage with sixel protocol semantics:\n * - Cursor behavior governed by DECSET 80 (sixelScrolling option)\n * - advanceCursor for empty sixels carrying only height\n */\nexport class SixelImageStorage {\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'vt340' };\n  constructor(\n    private readonly _storage: ImageStorage,\n    private readonly _opts: IImageAddonOptions,\n    private readonly _renderer: ImageRenderer,\n    private readonly _terminal: ITerminalExt\n  ) {}\n\n  /**\n   * Add a sixel image to storage.\n   * Cursor behavior depends on the sixelScrolling option (DECSET 80).\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap): void {\n    this._addImageOpts.scrolling = this._opts.sixelScrolling;\n    this._storage.addImage(img, this._addImageOpts);\n  }\n\n  /**\n   * Only advance text cursor.\n   * This is an edge case from empty sixels carrying only a height but no pixels.\n   * Partially fixes https://github.com/jerch/xterm-addon-image/issues/37.\n   */\n  public advanceCursor(height: number): void {\n    if (this._opts.sixelScrolling) {\n      let cellSize = this._renderer.cellSize;\n      if (cellSize.width === -1 || cellSize.height === -1) {\n        cellSize = CELL_SIZE_DEFAULT;\n      }\n      const rows = Math.ceil(height / cellSize.height);\n      for (let i = 1; i < rows; ++i) {\n        this._terminal._core._inputHandler.lineFeed();\n      }\n    }\n  }\n}\n", "/**\n * Copyright (c) 2023 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport { IAddImageOpts } from './Types';\nimport { ImageStorage } from './ImageStorage';\n\n/**\n * IIP (iTerm Image Protocol) specific image storage controller.\n *\n * Wraps the shared ImageStorage with IIP protocol semantics:\n * - Always uses scrolling mode (cursor advances with image)\n */\nexport class IIPImageStorage {\n  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };\n  constructor(\n    private readonly _storage: ImageStorage\n  ) {}\n\n  /**\n   * Add an IIP image to storage.\n   * Always uses scrolling mode \u2014 cursor advances past the image.\n   */\n  public addImage(img: HTMLCanvasElement | ImageBitmap): void {\n    this._storage.addImage(img, this._addImageOpts);\n  }\n}\n", "/**\n * Copyright (c) 2020 The xterm.js authors. All rights reserved.\n * @license MIT\n */\n\nimport type { ITerminalAddon, IDisposable } from '@xterm/xterm';\nimport type { ImageAddon as IImageApi } from '@xterm/addon-image';\nimport { Emitter, type IEvent } from 'common/Event';\nimport { IIPHandler } from './IIPHandler';\nimport { ImageRenderer } from './ImageRenderer';\nimport { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';\nimport { KittyGraphicsHandler } from './kitty/KittyGraphicsHandler';\nimport { KittyImageStorage } from './kitty/KittyImageStorage';\nimport { SixelHandler } from './SixelHandler';\nimport { SixelImageStorage } from './SixelImageStorage';\nimport { IIPImageStorage } from './IIPImageStorage';\nimport { ITerminalExt, IImageAddonOptions, IResetHandler } from './Types';\n\n\n/**\n * Document VT features provided by this addon.\n *\n * @vt: #E[Supported via @xterm/addon-image.] DCS SIXEL \"SIXEL Graphics\"  \"DCS Ps ; Ps ; Ps ; q Pt ST\"  \"Draw SIXEL image.\"\n *\n * Sixel support is provided by the addon @xterm/addon-image with these limitations:\n * - immediate coloring (no shared palette, allows high color settings of `img2sixel`)\n * - max. palette size of 4096 colors\n * - max. pixel width of 16K\n * - max. 25 MB per sixel sequence\n * - VT340 cursor positioning (begin of last sixel data row)\n *\n * See [addon readme](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image) for more details.\n *\n *\n * @vt: #E[Supported via @xterm/addon-image.] OSC 1337  \"iTerm2 Commands\"   \"OSC 1337 ; Pt BEL\"  \"Custom iTerm2 commands.\"\n *\n * Only the inline image protocol (IIP) is supported by the addon @xterm/addon-image with\n * the following limitations:\n * - sequence:\n *   - format: `OSC 1337 ; File=inline=1 ; size=<unencoded size> ; ... : <base64 payload> BEL`\n *   - size param must be set and payload may not exceed CEIL(size * 4 / 3)\n *   - strict base64 handling as of RFC4648 \u00A74 (standard alphabet, optional padding,\n *     no separator bytes allowed)\n *   - supported params: size, name, width, height, preserveAspectRatio\n * - image formats: PNG, JPEG and GIF\n * - no animation support (renders first image of a GIF)\n * - no multipart support\n * - VT340 cursor positioning (begin of last sixel data row)\n *\n * See [addon readme](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image)\n * and [iTerm2 IIP docs](https://iterm2.com/documentation-images.html) for more details.\n *\n *\n * @vt: #E[Supported via @xterm/addon-image.] APC KITTY_GRAPHICS \"Kitty Graphics\"  \"APC G Pt ST\"  \"Kitty Graphics Protocol.\"\n *\n * Kitty graphics support is provided by the addon @xterm/addon-image.\n * Note that while basic image output already works, this is still work in progress.\n */\n\n// default values of addon ctor options\nconst DEFAULT_OPTIONS: IImageAddonOptions = {\n  enableSizeReports: true,\n  pixelLimit: 16777216, // limit to 4096 * 4096 pixels\n  sixelSupport: true,\n  sixelScrolling: true,\n  sixelPaletteLimit: 4096,\n  sixelSizeLimit: 33554432,\n  storageLimit: 128,\n  showPlaceholder: true,\n  iipSupport: true,\n  iipSizeLimit: 33554432,\n  kittySupport: true,\n  kittySizeLimit: 33554432\n};\n\n// max palette size supported by the sixel lib (compile time setting)\nconst MAX_SIXEL_PALETTE_SIZE = 4096;\n\n// definitions for _xtermGraphicsAttributes sequence\nconst enum GaItem {\n  COLORS = 1,\n  SIXEL_GEO = 2,\n  REGIS_GEO = 3\n}\nconst enum GaAction {\n  READ = 1,\n  SET_DEFAULT = 2,\n  SET = 3,\n  READ_MAX = 4\n}\nconst enum GaStatus {\n  SUCCESS = 0,\n  ITEM_ERROR = 1,\n  ACTION_ERROR = 2,\n  FAILURE = 3\n}\n\n\nexport class ImageAddon implements ITerminalAddon, IImageApi {\n  private _opts: IImageAddonOptions;\n  private _defaultOpts: IImageAddonOptions;\n  private _storage: ImageStorage | undefined;\n  private _renderer: ImageRenderer | undefined;\n  private _disposables: IDisposable[] = [];\n  private _terminal: ITerminalExt | undefined;\n  private _handlers: Map<String, IResetHandler> = new Map();\n  private readonly _onImageAdded = new Emitter<void>();\n  public readonly onImageAdded: IEvent<void> = this._onImageAdded.event;\n\n  constructor(opts?: Partial<IImageAddonOptions>) {\n    this._opts = Object.assign({}, DEFAULT_OPTIONS, opts);\n    this._defaultOpts = Object.assign({}, DEFAULT_OPTIONS, opts);\n  }\n\n  public dispose(): void {\n    for (const handler of this._handlers.values()) handler.reset();\n    for (const obj of this._disposables) {\n      obj.dispose();\n    }\n    this._disposables.length = 0;\n    this._handlers.clear();\n    this._onImageAdded.dispose();\n  }\n\n  private _disposeLater(...args: IDisposable[]): void {\n    for (const obj of args) {\n      this._disposables.push(obj);\n    }\n  }\n\n  public activate(terminal: ITerminalExt): void {\n    this._terminal = terminal;\n\n    // internal data structures\n    this._renderer = new ImageRenderer(terminal);\n    this._storage = new ImageStorage(terminal, this._renderer, this._opts);\n    this._storage.onImageAdded = () => this._onImageAdded.fire();\n\n    // enable size reports\n    if (this._opts.enableSizeReports) {\n      const windowOps = terminal.options.windowOptions ?? {};\n      windowOps.getWinSizePixels = true;\n      windowOps.getCellSizePixels = true;\n      windowOps.getWinSizeChars = true;\n      terminal.options.windowOptions = windowOps;\n    }\n\n    this._disposeLater(\n      this._renderer,\n      this._storage,\n\n      // DECSET/DECRST/DA1/XTSMGRAPHICS handlers\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'h' }, params => this._decset(params)),\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'l' }, params => this._decrst(params)),\n      terminal.parser.registerCsiHandler({ final: 'c' }, params => this._da1(params)),\n      terminal.parser.registerCsiHandler({ prefix: '?', final: 'S' }, params => this._xtermGraphicsAttributes(params)),\n\n      // render hook\n      terminal.onRender(range => this._storage?.render(range)),\n\n      /**\n       * reset handlers covered:\n       * - DECSTR\n       * - RIS\n       * - Terminal.reset()\n       */\n      terminal.parser.registerCsiHandler({ intermediates: '!', final: 'p' }, () => this.reset()),\n      terminal.parser.registerEscHandler({ final: 'c' }, () => this.reset()),\n      terminal._core._inputHandler.onRequestReset(() => this.reset()),\n\n      // wipe canvas and delete alternate images on buffer switch\n      terminal.buffer.onBufferChange(() => this._storage?.wipeAlternate()),\n\n      // extend images to the right on resize\n      terminal.onResize(metrics => this._storage?.viewportResize(metrics))\n    );\n\n    // SIXEL handler\n    if (this._opts.sixelSupport) {\n      const sixelStorage = new SixelImageStorage(this._storage!, this._opts, this._renderer!, terminal);\n      const sixelHandler = new SixelHandler(this._opts, sixelStorage, terminal);\n      this._handlers.set('sixel', sixelHandler);\n      this._disposeLater(\n        terminal._core._inputHandler._parser.registerDcsHandler({ final: 'q' }, sixelHandler)\n      );\n    }\n\n    // iTerm IIP handler\n    if (this._opts.iipSupport) {\n      const iipStorage = new IIPImageStorage(this._storage!);\n      const iipHandler = new IIPHandler(this._opts, this._renderer!, iipStorage, terminal);\n      this._handlers.set('iip', iipHandler);\n      this._disposeLater(\n        terminal._core._inputHandler._parser.registerOscHandler(1337, iipHandler)\n      );\n    }\n\n    // Kitty graphics handler\n    if (this._opts.kittySupport) {\n      const kittyStorage = new KittyImageStorage(this._storage!);\n      const kittyHandler = new KittyGraphicsHandler(this._opts, this._renderer!, kittyStorage, terminal);\n      this._handlers.set('kitty', kittyHandler);\n      this._disposeLater(\n        kittyStorage,\n        kittyHandler,\n        terminal._core._inputHandler._parser.registerApcHandler({ final: 'G' }, kittyHandler)\n      );\n    }\n  }\n\n  // Note: storageLimit is skipped here to not intoduce a surprising side effect.\n  public reset(): boolean {\n    // reset options customizable by sequences to defaults\n    this._opts.sixelScrolling = this._defaultOpts.sixelScrolling;\n    this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit;\n    // also clear image storage\n    this._storage?.reset();\n    // reset protocol handlers\n    for (const handler of this._handlers.values()) {\n      handler.reset();\n    }\n    return false;\n  }\n\n  public get storageLimit(): number {\n    return this._storage?.getLimit() || -1;\n  }\n\n  public set storageLimit(limit: number) {\n    this._storage?.setLimit(limit);\n    this._opts.storageLimit = limit;\n  }\n\n  public get storageUsage(): number {\n    if (this._storage) {\n      return this._storage.getUsage();\n    }\n    return -1;\n  }\n\n  public get showPlaceholder(): boolean {\n    return this._opts.showPlaceholder;\n  }\n\n  public set showPlaceholder(value: boolean) {\n    this._opts.showPlaceholder = value;\n    this._renderer?.showPlaceholder(value);\n  }\n\n  public getImageAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    return this._storage?.getImageAtBufferCell(x, y);\n  }\n\n  public extractTileAtBufferCell(x: number, y: number): HTMLCanvasElement | undefined {\n    return this._storage?.extractTileAtBufferCell(x, y);\n  }\n\n  private _report(s: string): void {\n    this._terminal?._core.input(s, false);\n  }\n\n  private _decset(params: (number | number[])[]): boolean {\n    for (let i = 0; i < params.length; ++i) {\n      switch (params[i]) {\n        case 80:\n          this._opts.sixelScrolling = false;\n          break;\n      }\n    }\n    return false;\n  }\n\n  private _decrst(params: (number | number[])[]): boolean {\n    for (let i = 0; i < params.length; ++i) {\n      switch (params[i]) {\n        case 80:\n          this._opts.sixelScrolling = true;\n          break;\n      }\n    }\n    return false;\n  }\n\n  // overload DA to return something more appropriate\n  private _da1(params: (number | number[])[]): boolean {\n    if (params[0]) {\n      return true;\n    }\n    // reported features:\n    // 62 - VT220\n    // 4 - SIXEL support\n    // 9 - charsets\n    // 22 - ANSI colors\n    if (this._opts.sixelSupport) {\n      this._report(`\\x1b[?62;4;9;22c`);\n      return true;\n    }\n    return false;\n  }\n\n  /**\n   * Implementation of xterm's graphics attribute sequence.\n   *\n   * Supported features:\n   * - read/change palette limits (max 4096 by sixel lib)\n   * - read SIXEL canvas geometry (reports current window canvas or\n   *   squared pixelLimit if canvas > pixel limit)\n   *\n   * Everything else is deactivated.\n   */\n  private _xtermGraphicsAttributes(params: (number | number[])[]): boolean {\n    if (params.length < 2) {\n      return true;\n    }\n    if (params[0] === GaItem.COLORS) {\n      switch (params[1]) {\n        case GaAction.READ:\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          return true;\n        case GaAction.SET_DEFAULT:\n          this._opts.sixelPaletteLimit = this._defaultOpts.sixelPaletteLimit;\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          // also reset protocol handlers for now\n          for (const handler of this._handlers.values()) {\n            handler.reset();\n          }\n          return true;\n        case GaAction.SET:\n          if (params.length > 2 && !(params[2] instanceof Array) && params[2] <= MAX_SIXEL_PALETTE_SIZE) {\n            this._opts.sixelPaletteLimit = params[2];\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${this._opts.sixelPaletteLimit}S`);\n          } else {\n            this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          }\n          return true;\n        case GaAction.READ_MAX:\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${MAX_SIXEL_PALETTE_SIZE}S`);\n          return true;\n        default:\n          this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          return true;\n      }\n    }\n    if (params[0] === GaItem.SIXEL_GEO) {\n      switch (params[1]) {\n        // we only implement read and read_max here\n        case GaAction.READ:\n          let width = this._renderer?.dimensions?.css.canvas.width;\n          let height = this._renderer?.dimensions?.css.canvas.height;\n          if (!width || !height) {\n            // for some reason we have no working image renderer\n            // --> fallback to default cell size\n            const cellSize = CELL_SIZE_DEFAULT;\n            width = (this._terminal?.cols || 80) * cellSize.width;\n            height = (this._terminal?.rows || 24) * cellSize.height;\n          }\n          if (width * height < this._opts.pixelLimit) {\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${width.toFixed(0)};${height.toFixed(0)}S`);\n          } else {\n            // if we overflow pixelLimit report that squared instead\n            const x = Math.floor(Math.sqrt(this._opts.pixelLimit));\n            this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${x};${x}S`);\n          }\n          return true;\n        case GaAction.READ_MAX:\n          // read_max returns pixelLimit as square area\n          const x = Math.floor(Math.sqrt(this._opts.pixelLimit));\n          this._report(`\\x1b[?${params[0]};${GaStatus.SUCCESS};${x};${x}S`);\n          return true;\n        default:\n          this._report(`\\x1b[?${params[0]};${GaStatus.ACTION_ERROR}S`);\n          return true;\n      }\n    }\n    // exit with error on ReGIS or any other requests\n    this._report(`\\x1b[?${params[0]};${GaStatus.ITEM_ERROR}S`);\n    return true;\n  }\n}\n"],
++  "mappings": ";;;;;;;;;;;;;;;;02BAYaA,EAAA,WAAa,IAAI,WAAW,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,IAAM,IAClFA,EAAA,YACF,QAAQ,KAAK,6EAA6E,EAI5F,SAAgBC,GAAIC,EAAW,CAC7B,OAAOA,EAAI,GACb,CAFAF,EAAA,IAAAC,GAIA,SAAgBE,GAAMD,EAAW,CAC/B,OAAQA,IAAM,EAAK,GACrB,CAFAF,EAAA,MAAAG,GAIA,SAAgBC,GAAKF,EAAW,CAC9B,OAAQA,IAAM,GAAM,GACtB,CAFAF,EAAA,KAAAI,GAIA,SAAgBC,GAAMH,EAAW,CAC/B,OAAQA,IAAM,GAAM,GACtB,CAFAF,EAAA,MAAAK,GAQA,SAAgBC,EAAW,EAAWC,EAAWC,EAAWC,EAAY,IAAG,CACzE,QAASA,EAAI,MAAS,IAAMD,EAAI,MAAS,IAAMD,EAAI,MAAS,EAAK,EAAI,OAAW,CAClF,CAFAP,EAAA,WAAAM,EAQA,SAAgBI,GAAaC,EAAe,CAC1C,MAAO,CAACA,EAAQ,IAAOA,GAAS,EAAK,IAAOA,GAAS,GAAM,IAAMA,IAAU,EAAE,CAC/E,CAFAX,EAAA,aAAAU,GASA,SAAgBE,GAAkBD,EAAiBE,EAAmB,CACpE,IAAMC,EAAIb,GAAIU,CAAK,EACbJ,EAAIJ,GAAMQ,CAAK,EACfH,EAAIJ,GAAKO,CAAK,EAEhBI,EAAM,OAAO,iBACbC,EAAM,GAGV,QAASC,EAAI,EAAGA,EAAIJ,EAAQ,OAAQ,EAAEI,EAAG,CACvC,IAAMC,EAAKJ,EAAID,EAAQI,CAAC,EAAE,CAAC,EACrBE,EAAKZ,EAAIM,EAAQI,CAAC,EAAE,CAAC,EACrBG,EAAKZ,EAAIK,EAAQI,CAAC,EAAE,CAAC,EACrBI,EAAIH,EAAKA,EAAKC,EAAKA,EAAKC,EAAKA,EACnC,GAAI,CAACC,EAAG,OAAOJ,EACXI,EAAIN,IACNA,EAAMM,EACNL,EAAMC,GAIV,OAAOD,CACT,CAtBAhB,EAAA,kBAAAY,GA4BA,SAASU,GAAMC,EAAaC,EAAcC,EAAa,CACrD,OAAO,KAAK,IAAIF,EAAK,KAAK,IAAIE,EAAOD,CAAI,CAAC,CAC5C,CAEA,SAASE,GAAIC,EAAYC,EAAYC,EAAS,CAC5C,OAAIA,EAAI,IAAGA,GAAK,GACZA,EAAI,IAAGA,GAAK,GACTA,EAAI,EAAI,EACXD,GAAMD,EAAKC,GAAM,EAAIC,EACrBA,EAAI,EAAI,EACNF,EACAE,EAAI,EAAI,EACND,GAAMD,EAAKC,IAAO,EAAIC,EAAI,GAC1BD,CACV,CAEA,SAASE,GAASC,EAAWC,EAAWC,EAAS,CAC/C,GAAI,CAACA,EAAG,CACN,IAAMC,EAAI,KAAK,MAAMF,EAAI,GAAG,EAC5B,OAAO1B,EAAW4B,EAAGA,EAAGA,CAAC,EAE3B,IAAMP,EAAKK,EAAI,GAAMA,GAAK,EAAIC,GAAKD,EAAIC,EAAID,EAAIC,EACzCL,EAAK,EAAII,EAAIL,EACnB,OAAOrB,EACLgB,GAAM,EAAG,IAAK,KAAK,MAAMI,GAAIC,EAAIC,EAAIG,EAAI,EAAI,CAAC,EAAI,GAAG,CAAC,EACtDT,GAAM,EAAG,IAAK,KAAK,MAAMI,GAAIC,EAAIC,EAAIG,CAAC,EAAI,GAAG,CAAC,EAC9CT,GAAM,EAAG,IAAK,KAAK,MAAMI,GAAIC,EAAIC,EAAIG,EAAI,EAAI,CAAC,EAAI,GAAG,CAAC,CAAC,CAE3D,CAKA,SAAgBI,EAAa,EAAW5B,EAAWC,EAAS,CAC1D,OAAQ,WAAa,KAAK,MAAMA,EAAI,IAAM,GAAG,GAAK,GAAK,KAAK,MAAMD,EAAI,IAAM,GAAG,GAAK,EAAI,KAAK,MAAM,EAAI,IAAM,GAAG,KAAO,CACzH,CAFAP,EAAA,aAAAmC,EAQA,SAAgBC,GAAaL,EAAWC,EAAWC,EAAS,CAE1D,OAAOH,IAAUC,EAAI,IAAM,KAAO,IAAKC,EAAI,IAAKC,EAAI,GAAG,CACzD,CAHAjC,EAAA,aAAAoC,GAqCapC,EAAA,oBAAsB,IAAI,YAAY,CACjDmC,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACxB,EA0BYnC,EAAA,mBAAqB,IAAI,YAAY,CAChDmC,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAc,EAAI,EAAI,CAAC,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACvBA,EAAa,GAAI,GAAI,EAAE,EACxB,EAOYnC,EAAA,kBAAoB,IAAK,CAEpC,IAAMqC,EAAgB,CACpB/B,EAAW,EAAG,EAAG,CAAC,EAClBA,EAAW,IAAK,EAAG,CAAC,EACpBA,EAAW,EAAG,IAAK,CAAC,EACpBA,EAAW,IAAK,IAAK,CAAC,EACtBA,EAAW,EAAG,EAAG,GAAG,EACpBA,EAAW,IAAK,EAAG,GAAG,EACtBA,EAAW,EAAG,IAAK,GAAG,EACtBA,EAAW,IAAK,IAAK,GAAG,EACxBA,EAAW,IAAK,IAAK,GAAG,EACxBA,EAAW,IAAK,EAAG,CAAC,EACpBA,EAAW,EAAG,IAAK,CAAC,EACpBA,EAAW,IAAK,IAAK,CAAC,EACtBA,EAAW,GAAI,GAAI,GAAG,EACtBA,EAAW,IAAK,EAAG,GAAG,EACtBA,EAAW,EAAG,IAAK,GAAG,EACtBA,EAAW,IAAK,IAAK,GAAG,GAGpBe,EAAI,CAAC,EAAG,GAAI,IAAK,IAAK,IAAK,GAAG,EACpC,QAASP,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB,QAASP,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB,QAASC,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB6B,EAAE,KAAK/B,EAAWe,EAAEP,CAAC,EAAGO,EAAEd,CAAC,EAAGc,EAAEb,CAAC,CAAC,CAAC,EAKzC,QAAS0B,EAAI,EAAGA,GAAK,IAAKA,GAAK,GAC7BG,EAAE,KAAK/B,EAAW4B,EAAGA,EAAGA,CAAC,CAAC,EAE5B,OAAO,IAAI,YAAYG,CAAC,CAC1B,GAAE,EASWrC,EAAA,mBAA+BM,EAAW,EAAG,EAAG,EAAG,GAAG,EACtDN,EAAA,mBAA+BM,EAAW,IAAK,IAAK,IAAK,GAAG,IChRzE,IAAAgC,GAAAC,EAAAC,IAAA,cAKA,OAAO,eAAeA,GAAS,aAAc,CAAE,MAAO,EAAK,CAAC,EAC5DA,GAAQ,OAASC,GACjB,IAAIC,EAAKC,GAAM,CACX,GAAI,WAAW,WACX,OAAO,WAAW,WAAWA,CAAC,EAClC,GAAI,OAAO,OAAW,IAClB,OAAO,OAAO,KAAKA,EAAG,QAAQ,EAClC,IAAMC,EAAI,KAAKD,CAAC,EACVE,EAAI,IAAI,WAAWD,EAAE,MAAM,EACjC,QAAS,EAAI,EAAG,EAAIC,EAAE,OAAQ,EAAE,EAC5BA,EAAE,CAAC,EAAID,EAAE,WAAW,CAAC,EACzB,OAAOC,CACX,EACA,SAASJ,GAAOK,EAAK,CACjB,GAAIA,EAAI,EAAG,CACP,GAAM,CAAE,EAAAC,EAAG,EAAAJ,EAAG,EAAAK,CAAE,EAAIF,EAChBF,EACAK,EACEC,EAAI,YACV,OAAIH,IAAM,EACFJ,EACQQ,GAAM,IAAID,EAAE,SAASD,IAAMA,EAAI,IAAIC,EAAE,OAAON,IAAMA,EAAIF,EAAEM,CAAC,EAAE,GAAIG,CAAC,EACpEA,GAAMF,EACRC,EAAE,YAAYD,EAAGE,CAAC,EAClBD,EAAE,YAAYN,IAAMA,EAAIF,EAAEM,CAAC,GAAIG,CAAC,EAAE,KAAKN,IAAMI,EAAIJ,EAAE,SAAWA,EAAE,QAAQ,EAE9EE,IAAM,EACFJ,EACO,IAAMM,IAAMA,EAAI,IAAIC,EAAE,OAAON,IAAMA,EAAIF,EAAEM,CAAC,EAAE,GAChD,IAAMC,EACP,QAAQ,QAAQA,CAAC,EACjBC,EAAE,QAAQN,IAAMA,EAAIF,EAAEM,CAAC,EAAE,EAAE,KAAKH,GAAKI,EAAIJ,CAAC,EAEhDF,EACO,IAAMC,IAAMA,EAAIF,EAAEM,CAAC,GACvB,IAAM,QAAQ,QAAQJ,IAAMA,EAAIF,EAAEM,CAAC,EAAE,CAChD,CACA,GAAI,OAAO,SAAa,IACpB,MAAM,IAAI,MAAM,mBAAmB,EACvC,SAAS,IAAIF,CAAG,CACpB,IC7CA,IAAAM,GAAAC,EAAAC,IAAA,cACA,OAAO,eAAeA,GAAS,aAAc,CAAE,MAAO,EAAK,CAAC,EAK5D,IAAMC,GAAmB,KAInBC,MAAiBD,GAAiB,QAAuD,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,0lCAA0lC,CAA8C,EAuJ5uCE,EAAM,IAAI,WAAW,mEACtB,MAAM,EAAE,EACR,IAAIC,GAAMA,EAAG,WAAW,CAAC,CAAC,CAAC,EAE1BC,EAAI,IAAI,YAAY,IAAI,EAC9BA,EAAE,KAAK,UAAU,EACjB,QAASC,EAAI,EAAGA,EAAIH,EAAI,OAAQ,EAAEG,EAC9BD,EAAEF,EAAIG,CAAC,CAAC,EAAIA,GAAK,EACrB,QAASA,EAAI,EAAGA,EAAIH,EAAI,OAAQ,EAAEG,EAC9BD,EAAE,IAAMF,EAAIG,CAAC,CAAC,EAAIA,GAAK,GAAMA,GAAK,EAAK,MAAS,EACpD,QAASA,EAAI,EAAGA,EAAIH,EAAI,OAAQ,EAAEG,EAC9BD,EAAE,IAAMF,EAAIG,CAAC,CAAC,EAAKA,GAAK,GAAM,GAAMA,GAAK,EAAK,MAAS,GAC3D,QAASA,EAAI,EAAGA,EAAIH,EAAI,OAAQ,EAAEG,EAC9BD,EAAE,IAAMF,EAAIG,CAAC,CAAC,EAAIA,GAAK,GAC3B,IAAMC,GAAQ,IAAI,WAAW,CAAC,EAWxBC,GAAN,KAAoB,CAMhB,YAAYC,EAAUC,EAAUC,EAAc,CAO1C,GANA,KAAK,MAAQ,KACb,KAAK,OAAS,GACd,KAAK,OAAS,EACd,KAAK,SAAWF,GAAsD,QACtE,KAAK,SAAWC,GAAsD,WACtE,KAAK,OAASC,GAAkE,MAC5E,KAAK,OAAS,KAAK,UAAY,KAAK,SAAW,WAC/C,MAAM,IAAI,MAAM,uBAAuB,CAE/C,CAKA,IAAI,OAAQ,CACR,OAAO,KAAK,MAAQ,KAAK,GAAG,SAAS,EAAG,KAAK,KAAK,IAAuB,CAAC,EAAIJ,EAClF,CAMA,SAAU,CACD,KAAK,QAEN,KAAK,OAAS,KAAK,SACnB,KAAK,MAAQ,KAAK,KAAO,KAAK,GAAK,KAAK,KAAO,MAG/C,KAAK,KAAK,IAAuB,EAAI,EACrC,KAAK,KAAK,IAAuB,EAAI,EACrC,KAAK,KAAK,IAAuB,EAAI,GAE7C,CASA,KAAKG,EAAUC,EAAc,CAGzB,GAFA,KAAK,SAAWD,GAAsD,KAAK,SAC3E,KAAK,OAASC,GAAkE,KAAK,IAAI,KAAK,OAAQ,KAAK,QAAQ,EAC/G,KAAK,OAAS,KAAK,UAAY,KAAK,SAAW,WAC/C,MAAM,MAAM,uBAAuB,EAEvC,IAAIC,EAAI,KAAK,KACPC,EAAQ,KAAK,OAAS,KACvB,KAAK,MAOD,KAAK,KAAK,OAAO,WAAaA,IACnC,KAAK,KAAK,KAAK,KAAK,MAAMA,EAAQ,KAAK,KAAK,OAAO,YAAc,KAAK,CAAC,EACvED,EAAI,IAAI,YAAY,KAAK,KAAK,OAAQ,CAAC,EACvC,KAAK,GAAK,IAAI,WAAW,KAAK,KAAK,OAAQ,IAA6B,IATxE,KAAK,KAAO,IAAI,YAAY,OAAO,CAAE,QAAS,KAAK,KAAKC,EAAQ,KAAK,CAAE,CAAC,EACxE,KAAK,MAAQX,GAAW,CAAE,IAAK,CAAE,OAAQ,KAAK,IAAK,CAAE,CAAC,EACtDU,EAAI,IAAI,YAAY,KAAK,KAAK,OAAQ,CAAC,EACvCA,EAAE,IAAIP,EAAG,GAAgB,EACzB,KAAK,GAAK,IAAI,WAAW,KAAK,KAAK,OAAQ,IAA6B,GAO5EO,EAAE,IAAuB,EAAI,EAC7BA,EAAE,IAAuB,EAAI,EAC7BA,EAAE,IAAuB,EAAI,EAC7B,KAAK,KAAOA,EACZ,KAAK,OAAS,EAClB,CAOA,SAASE,EAAW,CAChB,IAAMC,EAAS,KAAK,KAAK,IAAuB,EAAID,EACpD,GAAI,KAAK,OAASC,EAAQ,CACtB,GAAIA,EAAS,KAAK,SACd,MAAO,GAEX,IAAIC,EAAU,KAAK,OACnB,MAAQA,GAAW,GAAKD,GAAQ,CAEhC,GADAC,EAAU,KAAK,IAAIA,EAAS,KAAK,QAAQ,EACrCA,EAAUD,EACV,MAAO,GAEX,GAAIC,EAAU,KAAgC,KAAK,KAAK,OAAO,WAAY,CACvE,IAAMC,EAAW,KAAK,MAAMD,EAAU,KAAgC,KAAK,KAAK,OAAO,YAAc,KAAK,EAC1G,KAAK,KAAK,KAAKC,CAAQ,EACvB,KAAK,KAAO,IAAI,YAAY,KAAK,KAAK,OAAQ,CAAC,EAC/C,KAAK,GAAK,IAAI,WAAW,KAAK,KAAK,OAAQ,IAA6B,CAC5E,CACA,KAAK,OAASD,CAClB,CACA,MAAO,EACX,CAOA,IAAIE,EAAM,CACN,GAAI,CAAC,KAAK,OAAS,KAAK,OACpB,MAAO,GAEX,GAAI,KAAK,SAASA,EAAK,MAAM,EACzB,MAAO,GAEX,IAAMN,EAAI,KAAK,KACf,YAAK,GAAG,IAAIM,EAAMN,EAAE,IAAuB,CAAC,EAC5CA,EAAE,IAAuB,GAAKM,EAAK,OAE5BN,EAAE,IAAuB,EAAIA,EAAE,IAAuB,GAAK,OAC5D,KAAK,MAAM,QAAQ,IAAI,EACvB,CACV,CAKA,KAAM,CACF,YAAK,OAAS,GACP,KAAK,MACN,KAAK,MAAM,QAAQ,IAAI,EACvB,EACV,CAIA,IAAI,aAAc,CACd,OAAO,KAAK,MACN,KAAK,KAAK,IAAuB,EACjC,CACV,CAIA,IAAI,WAAY,CACZ,OAAO,KAAK,MACN,KAAK,SAAW,KAAK,KAAK,IAAuB,EACjD,CACV,CACJ,EACAZ,GAAQ,QAAUQ,KCjVlB,IAAAW,GAAAC,EAAAC,IAAA,cACA,OAAO,eAAeA,GAAS,aAAc,CAAE,MAAO,EAAK,CAAC,EAK5D,IAAMC,GAAmB,KACnBC,MAAoBD,GAAiB,QAA2D,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,84BAA84B,CAAkD,EAC3iCE,GAAN,KAAiB,CACb,YAAYC,EAAU,CAClB,KAAK,SAAWA,EAChB,KAAK,MAAQ,EACb,KAAK,OAAS,CAClB,CACA,OAAOC,EAAG,CACN,KAAK,MAAQA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,EAAIA,EAAE,CAAC,EACtD,KAAK,OAASA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,GAAKA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,EACzD,IAAMC,EAAS,KAAK,MAAQ,KAAK,OAC3BC,EAAKD,EAAS,EACdE,EAAKH,EAAE,OAwBPI,EAAQ,KAAK,IAAIF,EAAIC,CAAE,GAAK,KAAK,IAAID,EAAIC,CAAE,GAAK,GAAK,KACtD,KAAK,MAID,KAAK,KAAK,OAAO,WAAaC,IACnC,KAAK,KAAK,KAAK,KAAK,MAAMA,EAAQ,KAAK,KAAK,OAAO,YAAc,KAAK,CAAC,EACvE,KAAK,GAAK,OALV,KAAK,KAAO,IAAI,YAAY,OAAO,CAAE,QAAS,KAAK,KAAKA,EAAQ,KAAK,CAAE,CAAC,EACxE,KAAK,MAAQP,GAAc,CAAE,IAAK,CAAE,OAAQ,KAAK,IAAK,CAAE,CAAC,GAMxD,KAAK,KACN,KAAK,GAAK,IAAI,WAAW,KAAK,KAAK,MAAM,GAG7C,IAAMQ,EAAU,KAAK,KAAK,OAAO,WAAaF,EAAM,KACpD,YAAK,GAAG,IAAIH,EAAGK,CAAM,EACrB,KAAK,MAAM,QAAQ,IAAIA,EAAQF,EAAIF,CAAM,EAClC,KAAK,GAAG,SAAS,KAAqB,KAAsBC,CAAE,CACzE,CACA,SAAU,CACD,KAAK,OAEN,KAAK,KAAK,OAAO,WAAa,KAAK,WACnC,KAAK,MAAQ,KAAK,GAAK,KAAK,KAAO,KAE3C,CACJ,EACAP,GAAQ,QAAUG,mGCpELQ,GAAA,OAAS,CACpB,WAAY,MACZ,aAAc,KACd,UAAW,MACX,MAAO,wtdCCT,IAAAC,EAAA,IACAC,EAAA,KAIA,SAASC,GAAaC,EAAS,CAC7B,GAAI,OAAO,OAAW,IACpB,OAAO,OAAO,KAAKA,EAAG,QAAQ,EAEhC,IAAMC,EAAa,KAAKD,CAAC,EACnBE,EAAS,IAAI,WAAWD,EAAW,MAAM,EAC/C,QAAS,EAAI,EAAG,EAAIC,EAAO,OAAQ,EAAE,EACnCA,EAAO,CAAC,EAAID,EAAW,WAAW,CAAC,EAErC,OAAOC,CACT,CAEA,IAAMC,GAAaJ,GAAaD,EAAA,OAAO,KAAK,EACxCM,EAGEC,GAAc,IAAI,YAIlBC,GAAN,KAAmB,CAAnB,aAAA,CACS,KAAA,YAAeC,GAAkB,EACjC,KAAA,YAAeC,GAAoB,CAO5C,CANS,YAAYD,EAAa,CAC9B,OAAO,KAAK,YAAYA,CAAK,CAC/B,CACO,YAAYC,EAAY,CAC7B,OAAO,KAAK,YAAYA,CAAI,CAC9B,GAKIC,GAA2C,CAC/C,YAAa,KAAO,MACpB,WAAYZ,EAAA,mBACZ,UAAWA,EAAA,mBACX,QAASA,EAAA,oBACT,aAAcC,EAAA,OAAO,aACrB,SAAU,IAQZ,SAAgBY,GAAaC,EAAsB,CACjD,IAAMC,EAAU,IAAIN,GACdO,EAAY,CAChB,IAAK,CACH,YAAaD,EAAQ,YAAY,KAAKA,CAAO,EAC7C,YAAaA,EAAQ,YAAY,KAAKA,CAAO,IAGjD,OAAO,YAAY,YAAYR,GAAeD,GAAYU,CAAS,EAChE,KAAMC,IACLV,EAAcA,GAAeU,EAAK,OAC3B,IAAIC,EAAQJ,EAAMG,EAAK,UAAYA,EAAMF,CAAO,EACxD,CACL,CAbAI,EAAA,aAAAN,GAgDA,IAAaK,EAAb,KAAoB,CAwGlB,YACEJ,EACAM,EACAC,EAAwB,CAGxB,GAvGM,KAAA,cAAgBpB,EAAA,OAAO,UAAY,EAEnC,KAAA,QAAuBO,GACvB,KAAA,YAAwB,CAAA,EACxB,KAAA,UAAY,EACZ,KAAA,UAAYP,EAAA,OAAO,UACnB,KAAA,YAAc,EACd,KAAA,eAAiB,EA+FvB,KAAK,MAAQ,OAAO,OAAO,CAAA,EAAIW,GAAiBE,CAAI,EAChD,KAAK,MAAM,aAAeb,EAAA,OAAO,aACnC,MAAM,IAAI,MAAM,+CAA+CA,EAAA,OAAO,YAAY,EAAE,EAEtF,GAAKmB,EASHC,EAAU,YAAc,KAAK,aAAa,KAAK,IAAI,EACnDA,EAAU,YAAc,KAAK,YAAY,KAAK,IAAI,MAVpC,CACd,IAAMC,EAASf,IAAgBA,EAAc,IAAI,YAAY,OAAOD,EAAU,GAC9Ec,EAAY,IAAI,YAAY,SAASE,EAAQ,CAC3C,IAAK,CACH,YAAa,KAAK,aAAa,KAAK,IAAI,EACxC,YAAa,KAAK,YAAY,KAAK,IAAI,GAE1C,EAKH,KAAK,UAAYF,EACjB,KAAK,MAAQ,KAAK,UAAU,QAC5B,KAAK,OAAS,IAAI,WAAW,KAAK,MAAM,OAAO,OAAQ,KAAK,MAAM,kBAAiB,EAAInB,EAAA,OAAO,UAAU,EACxG,KAAK,QAAU,IAAI,YAAY,KAAK,MAAM,OAAO,OAAQ,KAAK,MAAM,kBAAiB,EAAI,EAAE,EAC3F,KAAK,SAAW,IAAI,YAAY,KAAK,MAAM,OAAO,OAAQ,KAAK,MAAM,oBAAmB,EAAIA,EAAA,OAAO,YAAY,EAC/G,KAAK,SAAS,IAAI,KAAK,MAAM,OAAO,EACpC,KAAK,MAAQ,IAAI,YAAY,KAAK,MAAM,OAAO,OAAQ,KAAK,MAAM,eAAc,CAAE,EAClF,KAAK,MAAM,KAAKD,EAAA,mBAAoB,EAAG,KAAK,MAAM,aAAc,CAAC,CACnE,CApHA,IAAY,YAAU,CAAe,OAAO,KAAK,QAAQ,CAAC,CAAG,CAC7D,IAAY,WAAS,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CAC1D,IAAY,cAAY,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CAC7D,IAAY,eAAa,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CAC9D,IAAY,QAAM,CAAa,OAAO,KAAK,QAAQ,CAAC,EAAI,KAAK,QAAQ,CAAC,EAAI,EAAI,CAAG,CACjF,IAAY,SAAO,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CACxD,IAAY,QAAM,CAAa,OAAO,KAAK,QAAQ,CAAC,CAAG,CACvD,IAAY,OAAK,CAAgB,OAAO,KAAK,QAAQ,EAAE,CAAG,CAC1D,IAAY,eAAa,CAAa,OAAO,KAAK,QAAQ,EAAE,CAAG,CAEvD,YAAYW,EAAe,CACjC,GAAIA,IAAI,EAAmB,CACzB,IAAMY,EAAS,KAAK,MAAQ,KAAK,OACjC,GAAIA,EAAS,KAAK,QAAQ,OAAQ,CAChC,GAAI,KAAK,MAAM,aAAeA,EAAS,EAAI,KAAK,MAAM,YACpD,WAAK,QAAO,EACN,IAAI,MAAM,4BAA4B,EAE9C,KAAK,QAAU,IAAI,YAAYA,CAAM,EAEvC,KAAK,UAAY,KAAK,eACbZ,IAAI,EACb,GAAI,KAAK,SAAW,EAAG,CAErB,IAAMY,EAAS,KAAK,IAAI,KAAK,aAActB,EAAA,OAAO,SAAS,EAAI,KAAK,cACpE,GAAIsB,EAAS,KAAK,QAAQ,OAAQ,CAChC,GAAI,KAAK,MAAM,aAAeA,EAAS,EAAI,KAAK,MAAM,YACpD,WAAK,QAAO,EACN,IAAI,MAAM,4BAA4B,EAE9C,KAAK,QAAU,IAAI,YAAYA,CAAM,QAInC,KAAK,QAAQ,OAAS,QACxB,KAAK,QAAU,IAAI,YAAY,KAAK,GAI1C,MAAO,EACT,CAEQ,SAASC,EAAgBC,EAAwB,CACvD,IAAMF,EAASC,EAASC,EACxB,GAAIF,EAAS,KAAK,QAAQ,OAAQ,CAChC,GAAI,KAAK,MAAM,aAAeA,EAAS,EAAI,KAAK,MAAM,YACpD,WAAK,QAAO,EACN,IAAI,MAAM,4BAA4B,EAG9C,IAAMG,EAAY,IAAI,YAAY,KAAK,KAAKH,EAAS,KAAK,EAAI,KAAK,EACnEG,EAAU,IAAI,KAAK,OAAO,EAC1B,KAAK,QAAUA,EAEnB,CAEQ,aAAahB,EAAa,CAChC,IAAMiB,EAAM,KAAK,cACbH,EAAS,KAAK,YAClB,GAAI,KAAK,QAAK,EAAmB,CAC/B,IAAII,EAAY,KAAK,OAAS,KAAK,eAC/BC,EAAI,EACR,KAAOA,EAAI,GAAKD,EAAY,GAC1B,KAAK,QAAQ,IAAI,KAAK,MAAM,SAASD,EAAME,EAAGF,EAAME,EAAInB,CAAK,EAAGc,EAASd,EAAQmB,CAAC,EAClFA,IACAD,IAEF,KAAK,aAAelB,EAAQmB,EAC5B,KAAK,gBAAkBA,UACd,KAAK,QAAK,EAAmB,CACtC,KAAK,SAASL,EAAQd,EAAQ,CAAC,EAC/B,KAAK,UAAY,KAAK,IAAI,KAAK,UAAWA,CAAK,EAC/C,KAAK,UAAY,KAAK,IAAI,KAAK,UAAWA,CAAK,EAC/C,QAASoB,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB,KAAK,QAAQ,IAAI,KAAK,MAAM,SAASH,EAAMG,EAAGH,EAAMG,EAAIpB,CAAK,EAAGc,EAASd,EAAQoB,CAAC,EAEpF,KAAK,YAAY,KAAKpB,CAAK,EAC3B,KAAK,aAAeA,EAAQ,EAC5B,KAAK,gBAAkB,EAEzB,MAAO,EACT,CA0CA,IAAW,OAAK,CACd,OAAO,KAAK,QAAK,EACb,KAAK,OACL,KAAK,IAAI,KAAK,UAAW,KAAK,MAAM,cAAa,CAAE,CACzD,CAOA,IAAW,QAAM,CACf,OAAO,KAAK,QAAK,EACb,KAAK,QACL,KAAK,MAAM,cAAa,EACtB,KAAK,YAAY,OAAS,EAAI,KAAK,MAAM,eAAc,EACvD,KAAK,YAAY,OAAS,CAClC,CAKA,IAAW,SAAO,CAChB,OAAO,KAAK,SAAS,SAAS,EAAG,KAAK,aAAa,CACrD,CAWA,IAAW,aAAW,CACpB,OAAO,KAAK,QAAQ,WAAa,KAAK,MAAM,OAAO,OAAO,WAAa,EAAI,KAAK,YAAY,MAC9F,CAKA,IAAW,YAAU,CACnB,MAAO,CACL,MAAO,KAAK,MACZ,OAAQ,KAAK,OACb,KAAM,KAAK,MACX,MAAO,KAAK,OACZ,SAAU,CAAC,CAAC,KAAK,UACjB,aAAc,KAAK,cACnB,UAAW,KAAK,WAChB,SAAU,KAAK,YACf,iBAAkB,CAChB,UAAW,KAAK,QAAQ,CAAC,EACzB,YAAa,KAAK,QAAQ,CAAC,EAC3B,MAAO,KAAK,aACZ,OAAQ,KAAK,eAGnB,CAOO,KACLqB,EAAsB,KAAK,MAAM,UACjCC,EAA8B,KAAK,MAAM,QACzCC,EAAuB,KAAK,MAAM,aAClCC,EAAoB,KAAK,MAAM,SAAQ,CAEvC,KAAK,MAAM,KAAK,KAAK,MAAM,WAAYH,EAAWE,EAAcC,EAAW,EAAI,CAAC,EAC5EF,GACF,KAAK,SAAS,IAAIA,EAAQ,SAAS,EAAG/B,EAAA,OAAO,YAAY,CAAC,EAE5D,KAAK,YAAY,OAAS,EAC1B,KAAK,UAAY,EACjB,KAAK,UAAYA,EAAA,OAAO,UACxB,KAAK,YAAc,EACnB,KAAK,eAAiB,CACxB,CAMO,OAAOkC,EAAsBC,EAAgB,EAAGC,EAAcF,EAAK,OAAM,CAC9E,IAAIG,EAAIF,EACR,KAAOE,EAAID,GAAK,CACd,IAAME,EAAS,KAAK,IAAIF,EAAMC,EAAGrC,EAAA,OAAO,UAAU,EAClD,KAAK,OAAO,IAAIkC,EAAK,SAASG,EAAGA,GAAKC,CAAM,CAAC,EAC7C,KAAK,MAAM,OAAO,EAAGA,CAAM,EAE/B,CAOO,aAAaJ,EAAcC,EAAgB,EAAGC,EAAcF,EAAK,OAAM,CAC5E,IAAIG,EAAIF,EACR,KAAOE,EAAID,GAAK,CACd,IAAME,EAAS,KAAK,IAAIF,EAAMC,EAAGrC,EAAA,OAAO,UAAU,EAClD,QAAS6B,EAAI,EAAGU,EAAIF,EAAGR,EAAIS,EAAQ,EAAET,EAAG,EAAEU,EACxC,KAAK,OAAOV,CAAC,EAAIK,EAAK,WAAWK,CAAC,EAEpCF,GAAKC,EACL,KAAK,MAAM,OAAO,EAAGA,CAAM,EAE/B,CAMA,IAAW,QAAM,CACf,GAAI,KAAK,QAAK,GAAqB,CAAC,KAAK,OAAS,CAAC,KAAK,OACtD,OAAO/B,GAIT,IAAMiC,EAAe,KAAK,MAAM,cAAa,EAE7C,GAAI,KAAK,QAAK,EAAmB,CAC/B,IAAIb,EAAY,KAAK,OAAS,KAAK,eACnC,GAAIA,EAAY,EAAG,CACjB,IAAMD,EAAM,KAAK,cACbH,EAAS,KAAK,YACdK,EAAI,EACR,KAAOA,EAAI,GAAKD,EAAY,GAC1B,KAAK,QAAQ,IAAI,KAAK,MAAM,SAASD,EAAME,EAAGF,EAAME,EAAIY,CAAY,EAAGjB,EAASiB,EAAeZ,CAAC,EAChGA,IACAD,IAEEA,GACF,KAAK,QAAQ,KAAK,KAAK,WAAYJ,EAASiB,EAAeZ,CAAC,EAGhE,OAAO,KAAK,QAAQ,SAAS,EAAG,KAAK,MAAQ,KAAK,MAAM,EAG1D,GAAI,KAAK,QAAK,EAAmB,CAC/B,GAAI,KAAK,YAAc,KAAK,UAAW,CACrC,IAAIa,EAAS,GACb,GAAID,EACF,GAAIA,IAAiB,KAAK,UACxBC,EAAS,OACJ,CACL,IAAMf,EAAM,KAAK,cACbH,EAAS,KAAK,YAClB,KAAK,SAASA,EAAQiB,EAAe,CAAC,EACtC,QAASX,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvB,KAAK,QAAQ,IAAI,KAAK,MAAM,SAASH,EAAMG,EAAGH,EAAMG,EAAIW,CAAY,EAAGjB,EAASiB,EAAeX,CAAC,EAItG,GAAI,CAACY,EACH,OAAO,KAAK,QAAQ,SAAS,EAAG,KAAK,MAAQ,KAAK,MAAM,EAM5D,IAAMC,EAAQ,IAAI,YAAY,KAAK,MAAQ,KAAK,MAAM,EACtDA,EAAM,KAAK,KAAK,UAAU,EAC1B,IAAIC,EAAc,EACdR,EAAQ,EACZ,QAASN,EAAI,EAAGA,EAAI,KAAK,YAAY,OAAQ,EAAEA,EAAG,CAChD,IAAMe,EAAK,KAAK,YAAYf,CAAC,EAC7B,QAASQ,EAAI,EAAGA,EAAI,EAAG,EAAEA,EACvBK,EAAM,IAAI,KAAK,QAAQ,SAASP,EAAOA,GAASS,CAAE,EAAGD,CAAW,EAChEA,GAAe,KAAK,MAIxB,GAAIH,EAAc,CAChB,IAAMd,EAAM,KAAK,cAEXmB,EAAgB,KAAK,MAAM,eAAc,EAC/C,QAAShB,EAAI,EAAGA,EAAIgB,EAAe,EAAEhB,EACnCa,EAAM,IAAI,KAAK,MAAM,SAAShB,EAAMG,EAAGH,EAAMG,EAAIW,CAAY,EAAGG,EAAc,KAAK,MAAQd,CAAC,EAGhG,OAAOa,EAIT,OAAOnC,EACT,CAMA,IAAW,OAAK,CACd,OAAO,IAAI,kBAAkB,KAAK,OAAO,OAAQ,EAAG,KAAK,MAAQ,KAAK,OAAS,CAAC,CAClF,CAcO,SAAO,CACZ,KAAK,QAAUA,GACf,KAAK,YAAY,OAAS,EAC1B,KAAK,UAAY,EACjB,KAAK,UAAYP,EAAA,OAAO,UAGxB,KAAK,MAAM,KAAKD,EAAA,mBAAoB,EAAG,KAAK,MAAM,aAAc,CAAC,CACnE,GAxWFmB,EAAA,QAAAD,EA2XC,SAAgB6B,GACfZ,EACArB,EAAsB,CAEtB,IAAMkC,EAAM,IAAI9B,EAAQJ,CAAI,EAC5B,OAAAkC,EAAI,KAAI,EACR,OAAOb,GAAS,SAAWa,EAAI,aAAab,CAAI,EAAIa,EAAI,OAAOb,CAAI,EAC5D,CACL,MAAOa,EAAI,MACX,OAAQA,EAAI,OACZ,OAAQA,EAAI,OACZ,MAAOA,EAAI,MAEf,CAbC7B,EAAA,OAAA4B,GAoBM,eAAeE,GACpBd,EACArB,EAAsB,CAEtB,IAAMkC,EAAM,MAAMnC,GAAaC,CAAI,EACnC,OAAAkC,EAAI,KAAI,EACR,OAAOb,GAAS,SAAWa,EAAI,aAAab,CAAI,EAAIa,EAAI,OAAOb,CAAI,EAC5D,CACL,MAAOa,EAAI,MACX,OAAQA,EAAI,OACZ,OAAQA,EAAI,OACZ,MAAOA,EAAI,MAEf,CAbA7B,EAAA,YAAA8B,KC7eO,SAASC,EAAaC,EAA6B,CACxD,MAAO,CAAE,QAASA,CAAG,CACvB,CAuBO,IAAMC,EAAN,KAA6C,CAA7C,cACL,KAAiB,aAAe,IAAI,IACpC,KAAQ,YAAc,GAEtB,IAAW,YAAsB,CAC/B,OAAO,KAAK,WACd,CAEO,IAA2BC,EAAS,CACzC,OAAI,KAAK,YACPA,EAAE,QAAQ,EAEV,KAAK,aAAa,IAAIA,CAAC,EAElBA,CACT,CAEO,SAAgB,CACrB,GAAI,MAAK,YAGT,MAAK,YAAc,GACnB,QAAWC,KAAK,KAAK,aACnBA,EAAE,QAAQ,EAEZ,KAAK,aAAa,MAAM,EAC1B,CAEO,OAAc,CACnB,QAAWA,KAAK,KAAK,aACnBA,EAAE,QAAQ,EAEZ,KAAK,aAAa,MAAM,CAC1B,CACF,EAEsBC,EAAf,KAAiD,CAAjD,cAGL,KAAmB,OAAS,IAAIH,EAEzB,SAAgB,CACrB,KAAK,OAAO,QAAQ,CACtB,CAEU,UAAiCC,EAAS,CAClD,OAAO,KAAK,OAAO,IAAIA,CAAC,CAC1B,CACF,EAZsBE,EACG,KAAoB,OAAO,OAAO,CAAE,SAAU,CAAE,CAAE,CAAC,EAarE,IAAMC,EAAN,KAAsE,CAAtE,cAEL,KAAQ,YAAc,GAEtB,IAAW,OAAuB,CAChC,OAAO,KAAK,YAAc,OAAY,KAAK,MAC7C,CAEA,IAAW,MAAMC,EAAsB,CACjC,KAAK,aAAeA,IAAU,KAAK,SAGvC,KAAK,QAAQ,QAAQ,EACrB,KAAK,OAASA,EAChB,CAEO,OAAc,CACnB,KAAK,MAAQ,MACf,CAEO,SAAgB,CACrB,KAAK,YAAc,GACnB,KAAK,QAAQ,QAAQ,EACrB,KAAK,OAAS,MAChB,CACF,EClGO,IAAMC,EAAN,KAAiB,CAAjB,cACL,KAAQ,WAAqD,CAAC,EAC9D,KAAQ,UAAY,GAGpB,IAAW,OAAmB,CAC5B,OAAI,KAAK,OACA,KAAK,QAEd,KAAK,OAAS,CAACC,EAAyBC,EAAgBC,IAAkD,CACxG,GAAI,KAAK,UACP,OAAOC,EAAa,IAAM,CAAC,CAAC,EAG9B,IAAMC,EAAQ,CAAE,GAAIJ,EAAU,SAAAC,CAAS,EACvC,KAAK,WAAa,KAAK,WAAW,MAAM,EACxC,KAAK,WAAW,KAAKG,CAAK,EAE1B,IAAMC,EAASF,EAAa,IAAM,CAChC,IAAMG,EAAM,KAAK,WAAW,QAAQF,CAAK,EACrCE,IAAQ,KACV,KAAK,WAAa,KAAK,WAAW,MAAM,EACxC,KAAK,WAAW,OAAOA,EAAK,CAAC,EAEjC,CAAC,EAED,OAAIJ,IACE,MAAM,QAAQA,CAAW,EAC3BA,EAAY,KAAKG,CAAM,EAEvBH,EAAY,IAAIG,CAAM,GAInBA,CACT,EACO,KAAK,OACd,CAEO,KAAKE,EAAgB,CAC1B,GAAI,KAAK,WAAa,CAAC,KAAK,WAAW,OACrC,OAEF,GAAI,KAAK,WAAW,SAAW,EAAG,CAChC,KAAK,WAAW,CAAC,EAAE,GAAG,KAAK,KAAK,WAAW,CAAC,EAAE,SAAUA,CAAK,EAC7D,MACF,CACA,IAAMC,EAAY,KAAK,WACvB,QAAS,EAAI,EAAGC,EAAMD,EAAU,OAAQ,EAAIC,EAAK,EAAE,EACjDD,EAAU,CAAC,EAAE,GAAG,KAAKA,EAAU,CAAC,EAAE,SAAUD,CAAK,CAErD,CAEO,SAAgB,CACjB,KAAK,YAGT,KAAK,UAAY,GACjB,KAAK,WAAW,OAAS,EAC3B,CACF,EAEiBG,OAAV,CACE,SAASC,EAAWC,EAAiBC,EAA6B,CACvE,OAAOD,EAAKE,GAAKD,EAAG,KAAKC,CAAC,CAAC,CAC7B,CAFOJ,EAAS,QAAAC,EAIT,SAASI,EAAUR,EAAkBQ,EAA6B,CACvE,MAAO,CAACf,EAAyBC,EAAgBC,IACxCK,EAAMS,GAAKhB,EAAS,KAAKC,EAAUc,EAAIC,CAAC,CAAC,EAAG,OAAWd,CAAW,CAE7E,CAJOQ,EAAS,IAAAK,EAQT,SAASE,KAAUC,EAAgC,CACxD,MAAO,CAAClB,EAAyBC,EAAgBC,IAAkD,CACjG,IAAMiB,EAAQ,IAAIC,EAClB,QAAWb,KAASW,EAClBC,EAAM,IAAIZ,EAAMO,GAAKd,EAAS,KAAKC,EAAUa,CAAC,CAAC,CAAC,EAElD,OAAIZ,IACE,MAAM,QAAQA,CAAW,EAC3BA,EAAY,KAAKiB,CAAK,EAEtBjB,EAAY,IAAIiB,CAAK,GAGlBA,CACT,CACF,CAfOT,EAAS,IAAAO,EAmBT,SAASI,EAAmBd,EAAkBe,EAAqCC,EAA0B,CAClH,OAAAD,EAAQC,CAAO,EACRhB,EAAMO,GAAKQ,EAAQR,CAAC,CAAC,CAC9B,CAHOJ,EAAS,gBAAAW,IAhCDX,KAAA,ICvEjB,IAAAc,GAA2B,OAgBpB,IAAMC,EAAN,MAAMC,UAAsBC,CAAkC,CAmDnE,YAAoBC,EAAyB,CAC3C,MAAM,EADY,eAAAA,EAhDpB,KAAQ,QAAU,IAAI,IAGtB,KAAQ,gBAAkB,KAAK,UAAU,IAAIC,CAAmB,EA+C9D,KAAK,SAAW,KAAK,UAAU,MAAM,KACrC,KAAK,UAAU,MAAM,KAAQC,GAA8B,CACzD,KAAK,UAAU,KAAK,KAAK,UAAU,MAAOA,CAAM,EAChD,KAAK,MAAM,CACb,EACI,KAAK,UAAU,MAAM,eACvB,KAAK,MAAM,EAGb,KAAK,gBAAgB,MAAQ,KAAK,UAAU,MAAM,eAAe,eAAeC,GAAU,CACpFA,IAAW,aACb,KAAK,cAAc,EACnB,KAAK,gBAAgB,YAAY,EAAG,KAAK,UAAU,IAAI,EAE3D,CAAC,EACD,KAAK,UAAUC,EAAa,IAAM,CAChC,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,QAAQ,EAC5B,KAAK,UAAU,OAAS,KAAK,WAC/B,KAAK,UAAU,MAAM,KAAO,KAAK,SACjC,KAAK,SAAW,QAEd,KAAK,gBAAkB,KAAK,kBAC9B,KAAK,eAAe,YAAc,KAAK,gBACvC,KAAK,gBAAkB,QAEzB,KAAK,eAAiB,OACtB,KAAK,QAAQ,MAAM,EACnB,KAAK,oBAAoB,MAAM,EAC/B,KAAK,mBAAqB,OAC1B,KAAK,aAAe,MACtB,CAAC,CAAC,CACJ,CAnFA,IAAW,QAAwC,CAAE,OAAO,KAAK,QAAQ,IAAI,KAAK,GAAG,MAAQ,CAU7F,OAAc,aAAaC,EAAqCC,EAAeC,EAAmC,CAUhH,IAAMC,GAAUH,GAAiB,UAAU,cAAc,QAAQ,EACjE,OAAAG,EAAO,MAAQF,EAAQ,EACvBE,EAAO,OAASD,EAAS,EAClBC,CACT,CAGA,OAAc,gBAAgBC,EAA+BH,EAAeC,EAAgBG,EAAiC,CAC3H,GAAI,OAAO,WAAc,WAAY,CACnC,IAAMC,EAAUF,EAAI,gBAAgBH,EAAOC,CAAM,EACjD,OAAIG,GACFC,EAAQ,KAAK,IAAI,IAAI,kBAAkBD,EAAQ,EAAGJ,EAAQC,EAAS,CAAC,CAAC,EAEhEI,CACT,CACA,OAAOD,EACH,IAAI,UAAU,IAAI,kBAAkBA,EAAQ,EAAGJ,EAAQC,EAAS,CAAC,EAAGD,EAAOC,CAAM,EACjF,IAAI,UAAUD,EAAOC,CAAM,CACjC,CAGA,OAAc,kBAAkBK,EAA0D,CACxF,OAAI,OAAO,mBAAsB,WACxB,QAAQ,QAAQ,MAAS,EAE3B,kBAAkBA,CAAG,CAC9B,CA0CO,gBAAgBC,EAAsB,CACvCA,EACE,CAAC,KAAK,cAAgB,KAAK,SAAS,SAAW,IACjD,KAAK,mBAAmB,KAAK,IAAI,KAAK,SAAS,OAAS,EAAG,EAA4B,CAAC,GAG1F,KAAK,oBAAoB,MAAM,EAC/B,KAAK,mBAAqB,OAC1B,KAAK,aAAe,QAEtB,KAAK,gBAAgB,YAAY,EAAG,KAAK,UAAU,IAAI,CACzD,CAMA,IAAW,YAA4C,CACrD,OAAO,KAAK,UAAU,UACxB,CAKA,IAAW,UAAsB,CAC/B,MAAO,CACL,MAAO,KAAK,YAAY,IAAI,KAAK,OAAS,GAC1C,OAAQ,KAAK,YAAY,IAAI,KAAK,QAAU,EAC9C,CACF,CAKO,WAAWC,EAAeC,EAAaC,EAA0B,CACtE,IAAMC,EAAIH,GAAS,KAAK,YAAY,IAAI,KAAK,QAAU,GACjDI,EAAI,KAAK,YAAY,IAAI,OAAO,OAAS,EACzCC,GAAKJ,EAAM,EAAID,IAAU,KAAK,YAAY,IAAI,KAAK,QAAU,IAC/D,CAACE,GAASA,IAAU,QACtB,KAAK,QAAQ,IAAI,KAAK,GAAG,UAAU,EAAGC,EAAGC,EAAGC,CAAC,GAE3C,CAACH,GAASA,IAAU,WACtB,KAAK,QAAQ,IAAI,QAAQ,GAAG,UAAU,EAAGC,EAAGC,EAAGC,CAAC,CAEpD,CAKO,SAASH,EAA0B,CACxC,GAAI,CAACA,GAASA,IAAU,MAAO,CAC7B,IAAMP,EAAM,KAAK,QAAQ,IAAI,KAAK,EAClCA,GAAK,UAAU,EAAG,EAAGA,EAAI,OAAO,MAAOA,EAAI,OAAO,MAAM,CAC1D,CACA,GAAI,CAACO,GAASA,IAAU,SAAU,CAChC,IAAMP,EAAM,KAAK,QAAQ,IAAI,QAAQ,EACrCA,GAAK,UAAU,EAAG,EAAGA,EAAI,OAAO,MAAOA,EAAI,OAAO,MAAM,CAC1D,CACF,CAKO,KAAKW,EAAqBC,EAAgBC,EAAaC,EAAaC,EAAgB,EAAS,CAClG,IAAMf,EAAM,KAAK,QAAQ,IAAIW,EAAQ,KAAK,EAC1C,GAAI,CAACX,EACH,OAEF,GAAM,CAAE,MAAAH,EAAO,OAAAC,CAAO,EAAI,KAAK,SAG/B,GAAID,IAAU,IAAMC,IAAW,GAC7B,OAGF,KAAK,cAAca,EAASd,EAAOC,CAAM,EACzC,IAAMK,EAAMQ,EAAQ,OACd,CAAE,MAAOK,EAAa,OAAQC,CAAa,EAAIN,EAAQ,eACvDO,EAAO,KAAK,KAAKf,EAAI,MAAQa,CAAW,EAExCG,EAAMP,EAASM,EAAQF,EACvBI,EAAK,KAAK,MAAMR,EAASM,CAAI,EAAID,EACjCI,EAAKR,EAAMhB,EACXyB,EAAKR,EAAMhB,EAGXyB,EAAaR,EAAQC,EAAcG,EAAKhB,EAAI,MAAQA,EAAI,MAAQgB,EAAKJ,EAAQC,EAC7EQ,EAAcJ,EAAKH,EAAed,EAAI,OAASA,EAAI,OAASiB,EAAKH,EAMvEjB,EAAI,UACFG,EACA,KAAK,MAAMgB,CAAE,EAAG,KAAK,MAAMC,CAAE,EAAG,KAAK,KAAKG,CAAU,EAAG,KAAK,KAAKC,CAAW,EAC5E,KAAK,MAAMH,CAAE,EAAG,KAAK,MAAMC,CAAE,EAAG,KAAK,KAAKC,EAAa1B,EAAQmB,CAAW,EAAG,KAAK,KAAKQ,EAAc1B,EAASmB,CAAY,CAC5H,CACF,CAKO,YAAYN,EAAqBC,EAA+C,CACrF,GAAM,CAAE,MAAAf,EAAO,OAAAC,CAAO,EAAI,KAAK,SAE/B,GAAID,IAAU,IAAMC,IAAW,GAC7B,OAEF,KAAK,cAAca,EAASd,EAAOC,CAAM,EACzC,IAAMK,EAAMQ,EAAQ,OACd,CAAE,MAAOK,EAAa,OAAQC,CAAa,EAAIN,EAAQ,eACvDO,EAAO,KAAK,KAAKf,EAAI,MAAQa,CAAW,EACxCG,EAAMP,EAASM,EAAQF,EACvBI,EAAK,KAAK,MAAMR,EAASM,CAAI,EAAID,EACjCM,EAAaP,EAAcG,EAAKhB,EAAI,MAAQA,EAAI,MAAQgB,EAAKH,EAC7DQ,EAAcJ,EAAKH,EAAed,EAAI,OAASA,EAAI,OAASiB,EAAKH,EAEjElB,EAASV,EAAc,aAAa,KAAK,SAAU,KAAK,KAAKkC,EAAa1B,EAAQmB,CAAW,EAAG,KAAK,KAAKQ,EAAc1B,EAASmB,CAAY,CAAC,EAC9IjB,EAAMD,EAAO,WAAW,IAAI,EAClC,GAAIC,EACF,OAAAA,EAAI,UACFG,EACA,KAAK,MAAMgB,CAAE,EAAG,KAAK,MAAMC,CAAE,EAAG,KAAK,MAAMG,CAAU,EAAG,KAAK,MAAMC,CAAW,EAC9E,EAAG,EAAGzB,EAAO,MAAOA,EAAO,MAC7B,EACOA,CAEX,CAKO,gBAAgBc,EAAaC,EAAaC,EAAgB,EAAS,CACxE,IAAMf,EAAM,KAAK,QAAQ,IAAI,KAAK,EAClC,GAAIA,EAAK,CACP,GAAM,CAAE,MAAAH,EAAO,OAAAC,CAAO,EAAI,KAAK,SAY/B,GATID,IAAU,IAAMC,IAAW,KAI1B,KAAK,aAECA,GAAU,KAAK,aAAc,QACtC,KAAK,mBAAmBA,EAAS,CAAC,EAFlC,KAAK,mBAAmB,KAAK,IAAIA,EAAS,EAAG,EAA4B,CAAC,EAIxE,CAAC,KAAK,cAAc,OACxBE,EAAI,UACF,KAAK,oBAAsB,KAAK,aAChCa,EAAMhB,EACLiB,EAAMhB,EAAU,EAAI,EAAI,EACzBD,EAAQkB,EACRjB,EACAe,EAAMhB,EACNiB,EAAMhB,EACND,EAAQkB,EACRjB,CACF,CACF,CACF,CAMO,eAAsB,CAC3B,IAAMW,EAAI,KAAK,YAAY,IAAI,OAAO,OAAS,EACzCC,EAAI,KAAK,YAAY,IAAI,OAAO,QAAU,EAChD,QAAWV,KAAO,KAAK,QAAQ,OAAO,GAChCA,EAAI,OAAO,QAAUS,GAAKT,EAAI,OAAO,SAAWU,KAClDV,EAAI,OAAO,MAAQS,EACnBT,EAAI,OAAO,OAASU,EAG1B,CAKQ,cAAce,EAAkBC,EAAsBC,EAA6B,CACzF,GAAID,IAAiBD,EAAK,eAAe,OAASE,IAAkBF,EAAK,eAAe,OACtF,OAEF,GAAM,CAAE,MAAOG,EAAe,OAAQC,CAAe,EAAIJ,EAAK,aAC9D,GAAIC,IAAiBE,GAAiBD,IAAkBE,EAAgB,CACtEJ,EAAK,OAASA,EAAK,KACnBA,EAAK,eAAe,MAAQG,EAC5BH,EAAK,eAAe,OAASI,EAC7B,MACF,CACA,IAAMC,EAAc,KAAK,KAAKL,EAAK,KAAM,MAAQC,EAAeE,CAAa,EACvEG,EAAe,KAAK,KAAKN,EAAK,KAAM,OAASE,EAAgBE,CAAc,EAEjF,GAAIC,EAAcC,EAAeN,EAAK,KAAM,MAAQA,EAAK,KAAM,OAAQ,CACrEA,EAAK,OAASA,EAAK,KACnBA,EAAK,eAAe,MAAQG,EAC5BH,EAAK,eAAe,OAASI,EAC7B,MACF,CACA,IAAM9B,EAASV,EAAc,aAAa,KAAK,SAAUyC,EAAaC,CAAY,EAC5E/B,EAAMD,EAAO,WAAW,IAAI,EAC9BC,IACFA,EAAI,UAAUyB,EAAK,KAAO,EAAG,EAAG1B,EAAO,MAAOA,EAAO,MAAM,EAC3D0B,EAAK,OAAS1B,EACd0B,EAAK,eAAe,MAAQC,EAC5BD,EAAK,eAAe,OAASE,EAEjC,CAKQ,OAAc,CACpB,KAAK,eAAiB,KAAK,UAAU,MAAM,eAC3C,KAAK,gBAAkB,KAAK,eAAe,YAAY,KAAK,KAAK,cAAc,EAC/E,KAAK,eAAe,YAAeK,GAAkB,CACnD,QAAWC,IAAO,CAAC,GAAG,KAAK,QAAQ,KAAK,CAAC,EACvC,KAAK,mBAAmBA,CAAG,EAE7B,KAAK,iBAAiB,KAAK,KAAK,eAAgBD,CAAQ,CAC1D,CACF,CAEO,iBAAiBzB,EAAoB,MAAa,CAEvD,GAAI,CAAC,KAAK,UAAY,CAAC,KAAK,UAAU,MAAM,cAAe,CACzD,QAAQ,KAAK,oFAAoF,EACjG,MACF,CACA,GAAI,KAAK,QAAQ,IAAIA,CAAK,EACxB,OAEF,IAAMR,EAASV,EAAc,aAC3B,KAAK,SAAU,KAAK,YAAY,IAAI,OAAO,OAAS,EACpD,KAAK,YAAY,IAAI,OAAO,QAAU,CACxC,EACAU,EAAO,UAAU,IAAI,qBAAqBQ,CAAK,EAAE,EACjD,IAAM2B,EAAgB,KAAK,UAAU,MAAM,cAI3CA,EAAc,MAAM,UAAY,UAC5B3B,IAAU,UAKZR,EAAO,MAAM,OAAS,KACtBmC,EAAc,aAAanC,EAAQmC,EAAc,UAAU,IAK3DnC,EAAO,MAAM,OAAS,IACtBmC,EAAc,YAAYnC,CAAM,GAElC,IAAMC,EAAMD,EAAO,WAAW,KAAM,CAAE,MAAO,EAAK,CAAC,EACnD,GAAI,CAACC,EAAK,CACRD,EAAO,OAAO,EACd,MACF,CACA,KAAK,QAAQ,IAAIQ,EAAOP,CAAG,EAC3B,KAAK,SAASO,CAAK,CACrB,CAEO,mBAAmBA,EAAoB,MAAa,CACzD,IAAMP,EAAM,KAAK,QAAQ,IAAIO,CAAK,EAC9BP,IACFA,EAAI,OAAO,OAAO,EAClB,KAAK,QAAQ,OAAOO,CAAK,EAE7B,CAEO,SAASA,EAA4B,CAC1C,OAAO,KAAK,QAAQ,IAAIA,CAAK,CAC/B,CAEQ,mBAAmBT,EAAiB,GAAoC,CAC9E,KAAK,oBAAoB,MAAM,EAC/B,KAAK,mBAAqB,OAG1B,IAAMqC,EAAS,GACTC,EAAY/C,EAAc,aAAa,KAAK,SAAU8C,EAAQrC,CAAM,EACpEE,EAAMoC,EAAU,WAAW,KAAM,CAAE,MAAO,EAAM,CAAC,EACvD,GAAI,CAACpC,EAAK,OACV,IAAME,EAAUb,EAAc,gBAAgBW,EAAKmC,EAAQrC,CAAM,EAC3DuC,EAAM,IAAI,YAAYnC,EAAQ,KAAK,MAAM,EACzCoC,KAAQ,eAAW,EAAG,EAAG,CAAC,EAC1BC,KAAQ,eAAW,IAAK,IAAK,GAAG,EACtCF,EAAI,KAAKC,CAAK,EACd,QAAS9B,EAAI,EAAGA,EAAIV,EAAQ,EAAEU,EAAG,CAC/B,IAAMgC,EAAQhC,EAAI,EACZiC,EAASjC,EAAI2B,EACnB,QAASO,EAAI,EAAGA,EAAIP,EAAQO,GAAK,EAC/BL,EAAII,EAASC,EAAIF,CAAK,EAAID,CAE9B,CACAvC,EAAI,aAAaE,EAAS,EAAG,CAAC,EAG9B,IAAML,EAAS,OAAO,MAAQsC,EAAS,EAAK,EAAEA,EAAS,IAAM,KAC7D,KAAK,aAAe9C,EAAc,aAAa,KAAK,SAAUQ,EAAOC,CAAM,EAC3E,IAAM6C,EAAO,KAAK,aAAa,WAAW,KAAM,CAAE,MAAO,EAAM,CAAC,EAChE,GAAI,CAACA,EAAM,CACT,KAAK,aAAe,OACpB,MACF,CACA,QAASC,EAAI,EAAGA,EAAI/C,EAAO+C,GAAKT,EAC9BQ,EAAK,UAAUP,EAAWQ,EAAG,CAAC,EAEhC,IAAMC,EAAc,KAAK,aACzBxD,EAAc,kBAAkBwD,CAAW,EAAE,KAAKC,GAAU,CACtD,KAAK,eAAiBD,EAAaC,GAAQ,MAAM,EAChD,KAAK,mBAAqBA,CACjC,CAAC,EAAE,MAAM,IAAM,CAAC,CAAC,CACnB,CAEA,IAAW,UAAiC,CAC1C,OAAO,KAAK,UAAU,MAAM,qBAAqB,OAAO,QAC1D,CACF,ECnaO,IAAMC,EAA+B,CAC1C,MAAO,EACP,OAAQ,EACV,EAQMC,EAAN,MAAMC,CAAkD,CAqDtD,YACEC,EAAc,EACdC,EAAgB,EACTC,EAAU,GACVC,EAAS,GAChB,CAFO,aAAAD,EACA,YAAAC,EAxDT,KAAQ,KAAe,EA4CvB,KAAQ,OAAiB,EAcvB,KAAK,KAAOH,EACZ,KAAK,OAASC,CAChB,CA3DA,IAAW,KAAc,CACvB,OAAI,KAAK,OAEJ,KAAK,KAAO,WACZ,KAAK,gBAAkB,GAGrB,KAAK,IACd,CACA,IAAW,IAAIG,EAAe,CAAE,KAAK,KAAOA,CAAO,CAEnD,IAAW,gBAAiC,CAE1C,OAAI,KAAK,UAGD,KAAK,KAAO,YAA6B,EACnD,CACA,IAAW,eAAeA,EAAuB,CAC/C,KAAK,MAAQ,WACb,KAAK,MAASA,GAAS,GAAM,SAC/B,CAEA,IAAW,gBAAyB,CAClC,OAAO,KAAK,KAAQ,QACtB,CACA,IAAW,eAAeA,EAAe,CACvC,KAAK,MAAQ,UACb,KAAK,MAAQA,EAAS,QACxB,CAEA,IAAW,wBAAiC,CAC1C,IAAMC,GAAO,KAAK,KAAO,aAA4B,GACrD,OAAIA,EAAM,EACDA,EAAM,WAERA,CACT,CACA,IAAW,uBAAuBD,EAAe,CAC/C,KAAK,MAAQ,UACb,KAAK,MAASA,GAAS,GAAM,UAC/B,CAGA,IAAW,OAAgB,CACzB,OAAO,KAAK,MACd,CACA,IAAW,MAAMA,EAAe,CAC9B,KAAK,OAASA,CAChB,CAYO,OAA6B,CASlC,OAAO,IAAIL,EAAmB,KAAK,KAAM,KAAK,OAAQ,KAAK,QAAS,KAAK,MAAM,CACjF,CAEO,SAAmB,CACxB,OAAO,KAAK,iBAAmB,GAAuB,KAAK,SAAW,GAAK,KAAK,UAAY,EAC9F,CACF,EACMO,EAAc,IAAIR,EAUXS,EAAN,KAA0C,CAkB/C,YACUC,EACAC,EACAC,EACR,CAHQ,eAAAF,EACA,eAAAC,EACA,WAAAC,EAnBV,KAAQ,QAAmC,IAAI,IAE/C,KAAQ,QAAU,EAElB,KAAQ,UAAY,EAEpB,KAAQ,cAAgB,GAExB,KAAQ,gBAAkB,GAE1B,KAAQ,YAAsB,KAW5B,GAAI,CACF,KAAK,SAAS,KAAK,MAAM,YAAY,CACvC,OAASC,EAAY,CACfA,aAAa,OACf,QAAQ,MAAMA,EAAE,OAAO,EAEzB,QAAQ,KAAK,0BAA0B,KAAK,SAAS,CAAC,KAAK,CAC7D,CACA,KAAK,iBAAmB,CACtB,KAAM,KAAK,UAAU,KACrB,KAAM,KAAK,UAAU,IACvB,CACF,CAEO,SAAgB,CACrB,KAAK,MAAM,CACb,CAEO,OAAc,CACnB,QAAWC,KAAQ,KAAK,QAAQ,OAAO,EACrCA,EAAK,QAAQ,QAAQ,EAIvB,KAAK,QAAQ,MAAM,EACnB,KAAK,UAAU,SAAS,CAC1B,CAEO,UAAmB,CACxB,OAAO,KAAK,YAAc,EAAI,GAChC,CAEO,SAASR,EAAqB,CACnC,GAAIA,EAAQ,IAAOA,EAAQ,IACzB,MAAM,WAAW,mEAAmE,EAEtF,KAAK,YAAeA,EAAQ,EAAI,MAAa,EAC7C,KAAK,aAAa,CAAC,CACrB,CAEO,UAAmB,CACxB,OAAO,KAAK,iBAAiB,EAAI,EAAI,GACvC,CAEQ,kBAA2B,CACjC,IAAIS,EAAe,EACnB,QAAWD,KAAQ,KAAK,QAAQ,OAAO,EACjCA,EAAK,OACPC,GAAgBD,EAAK,KAAK,MAAQA,EAAK,KAAK,OACxCA,EAAK,QAAUA,EAAK,SAAWA,EAAK,OACtCC,GAAgBD,EAAK,OAAO,MAAQA,EAAK,OAAO,SAItD,OAAOC,CACT,CAEQ,QAAQC,EAAkB,CAChC,IAAMF,EAAO,KAAK,QAAQ,IAAIE,CAAE,EAC3BF,IACL,KAAK,QAAQ,OAAOE,CAAE,EAElB,OAAO,aAAeF,EAAK,gBAAgB,aAC7CA,EAAK,KAAK,MAAM,EAElB,KAAK,iBAAiBE,CAAE,EAC1B,CAKO,eAAsB,CAE3B,IAAMC,EAAO,CAAC,EACd,OAAW,CAACD,EAAIF,CAAI,IAAK,KAAK,QAAQ,QAAQ,EACxCA,EAAK,aAAe,cACtBA,EAAK,QAAQ,QAAQ,EACrBG,EAAK,KAAKD,CAAE,GAGhB,QAAWA,KAAMC,EACf,KAAK,QAAQD,CAAE,EAGjB,KAAK,gBAAkB,GACvB,KAAK,cAAgB,EACvB,CAMO,YAAYA,EAAkB,CACnC,IAAMF,EAAO,KAAK,QAAQ,IAAIE,CAAE,EAC5BF,IACFA,EAAK,QAAQ,QAAQ,EACrB,KAAK,QAAQE,CAAE,EAEnB,CAaO,SAASE,EAAsCC,EAA6B,CAEjF,KAAK,aAAaD,EAAI,MAAQA,EAAI,MAAM,EAGxC,IAAIE,EAAW,KAAK,UAAU,UAC1BA,EAAS,QAAU,IAAMA,EAAS,SAAW,MAC/CA,EAAWrB,GAEb,IAAMsB,EAAO,KAAK,KAAKH,EAAI,MAAQE,EAAS,KAAK,EAC3CE,EAAO,KAAK,KAAKJ,EAAI,OAASE,EAAS,MAAM,EAE7ChB,EAAU,EAAE,KAAK,QAEjBmB,EAAS,KAAK,UAAU,MAAM,OAC9BC,EAAW,KAAK,UAAU,KAC1BC,EAAW,KAAK,UAAU,KAC1BC,EAAUH,EAAO,EACjBI,EAAUJ,EAAO,EACnBK,EAASF,EACTG,EAAY,EAEXV,EAAK,YACRI,EAAO,EAAI,EACXA,EAAO,EAAI,EACXK,EAAS,GAGX,KAAK,UAAU,MAAM,cAAc,iBAAiB,UAAUL,EAAO,CAAC,EACtE,QAASO,EAAM,EAAGA,EAAMR,EAAM,EAAEQ,EAAK,CACnC,IAAMC,EAAOR,EAAO,MAAM,IAAIA,EAAO,EAAIA,EAAO,KAAK,EACrD,QAASS,EAAM,EAAGA,EAAMX,GAClB,EAAAO,EAASI,GAAOR,GADQ,EAAEQ,EAE9B,KAAK,aAAaD,EAAwBH,EAASI,EAAK5B,EAAS0B,EAAMT,EAAOW,CAAG,EACjFH,IAEF,GAAIV,EAAK,UACHW,EAAMR,EAAO,GAAG,KAAK,UAAU,MAAM,cAAc,SAAS,UAE5D,EAAEC,EAAO,GAAKE,EAAU,MAE9BF,EAAO,EAAIK,CACb,CACA,KAAK,UAAU,MAAM,cAAc,iBAAiB,UAAUL,EAAO,CAAC,EAGlEJ,EAAK,UACHA,EAAK,YAAc,MACrBI,EAAO,EAAI,KAAK,IAAIK,EAASP,EAAMG,CAAQ,EAE3CD,EAAO,EAAIK,GAGbL,EAAO,EAAIG,EACXH,EAAO,EAAII,GAIb,IAAMV,EAAO,CAAC,EACd,OAAW,CAACD,EAAIF,CAAI,IAAK,KAAK,QAAQ,QAAQ,EACxCA,EAAK,UAAY,IACnBA,EAAK,QAAQ,QAAQ,EACrBG,EAAK,KAAKD,CAAE,GAGhB,QAAWA,KAAMC,EACf,KAAK,QAAQD,CAAE,EAKjB,IAAMiB,EAAY,KAAK,UAAU,eAAe,CAAC,EACjDA,GAAW,UAAU,IAAM,CACZ,KAAK,QAAQ,IAAI7B,CAAO,GAEnC,KAAK,QAAQA,CAAO,CAExB,CAAC,EAIG,KAAK,UAAU,OAAO,OAAO,OAAS,aACxC,KAAK,kBAAkB,EAIzB,IAAM8B,EAAsB,CAC1B,KAAMhB,EACN,aAAcE,EACd,OAAQF,EACR,eAAgB,CAAE,GAAGE,CAAS,EAC9B,OAAQa,GAAa,OACrB,UAAAJ,EACA,WAAY,KAAK,UAAU,OAAO,OAAO,KACzC,MAAOV,EAAK,MACZ,OAAQA,EAAK,MACf,EAGA,YAAK,QAAQ,IAAIf,EAAS8B,CAAO,EACjC,KAAK,eAAe,EACb9B,CACT,CAQO,OAAO+B,EAA6C,CAEzD,IAAIC,EAAe,GACfC,EAAkB,GACtB,QAAWvB,KAAQ,KAAK,QAAQ,OAAO,EAMrC,GALIA,EAAK,QAAU,SACjBuB,EAAkB,GAElBD,EAAe,GAEbA,GAAgBC,EAAiB,MAIvC,GAAID,GAAgB,CAAC,KAAK,UAAU,SAAS,KAAK,IAChD,KAAK,UAAU,iBAAiB,KAAK,EACjC,CAAC,KAAK,UAAU,SAAS,KAAK,GAAG,OAUvC,GARIC,GAAmB,CAAC,KAAK,UAAU,SAAS,QAAQ,GACtD,KAAK,UAAU,iBAAiB,QAAQ,EAI1C,KAAK,UAAU,cAAc,EAGzB,CAAC,KAAK,QAAQ,KAAM,CACjB,KAAK,gBACR,KAAK,UAAU,SAAS,EACxB,KAAK,cAAgB,GACrB,KAAK,gBAAkB,IAErB,KAAK,UAAU,SAAS,KAAK,GAC/B,KAAK,UAAU,mBAAmB,KAAK,EAErC,KAAK,UAAU,SAAS,QAAQ,GAClC,KAAK,UAAU,mBAAmB,QAAQ,EAE5C,MACF,CAGI,CAACD,GAAgB,KAAK,UAAU,SAAS,KAAK,IAChD,KAAK,UAAU,SAAS,KAAK,EAC7B,KAAK,UAAU,mBAAmB,KAAK,GAErC,CAACC,GAAmB,KAAK,UAAU,SAAS,QAAQ,IACtD,KAAK,UAAU,SAAS,QAAQ,EAChC,KAAK,UAAU,mBAAmB,QAAQ,GAIxC,KAAK,kBACP,KAAK,UAAU,SAAS,EACxB,KAAK,cAAgB,GACrB,KAAK,gBAAkB,IAGzB,GAAM,CAAE,MAAAC,EAAO,IAAAC,CAAI,EAAIJ,EACjBZ,EAAS,KAAK,UAAU,MAAM,OAC9BF,EAAO,KAAK,UAAU,MAAM,KAGlC,KAAK,UAAU,WAAWiB,EAAOC,CAAG,EAGpC,IAAMC,EAAgG,CAAC,EACjGC,EAAkE,CAAC,EAGzE,QAASX,EAAMQ,EAAOR,GAAOS,EAAK,EAAET,EAAK,CACvC,IAAMC,EAAOR,EAAO,MAAM,IAAIO,EAAMP,EAAO,KAAK,EAChD,GAAI,CAACQ,EAAM,OACX,QAASC,EAAM,EAAGA,EAAMX,EAAM,EAAEW,EAC9B,GAAID,EAAK,MAAMC,CAAG,EAAI,UAAsB,CAC1C,IAAInB,EAAyBkB,EAAK,eAAeC,CAAG,GAAKxB,EACnDJ,EAAUS,EAAE,QAClB,GAAIT,IAAY,QAAaA,IAAY,GACvC,SAEF,IAAM8B,EAAU,KAAK,QAAQ,IAAI9B,CAAO,EACxC,GAAIS,EAAE,SAAW,GAAI,CACnB,IAAM6B,EAAY7B,EAAE,OACd8B,EAAWX,EACbY,EAAQ,EAOZ,KACE,EAAEZ,EAAMX,GACJU,EAAK,MAAMC,CAAG,EAAI,YAClBnB,EAAIkB,EAAK,eAAeC,CAAG,GAAKxB,IAChCK,EAAE,UAAYT,GACdS,EAAE,SAAW6B,EAAYE,GAE7BA,IAEFZ,IACIE,EACEA,EAAQ,QACVM,EAAU,KAAK,CAAE,QAAAN,EAAS,OAAQQ,EAAW,IAAKC,EAAU,IAAAb,EAAK,MAAAc,CAAM,CAAC,EAEjE,KAAK,MAAM,iBACpBH,EAAiB,KAAK,CAAE,IAAKE,EAAU,IAAAb,EAAK,MAAAc,CAAM,CAAC,EAErD,KAAK,cAAgB,EACvB,CACF,CAEJ,CAGAJ,EAAU,KAAK,CAACK,EAAGC,IAAMD,EAAE,QAAQ,OAASC,EAAE,QAAQ,MAAM,EAG5D,QAAWC,KAAQN,EACjB,KAAK,UAAU,gBAAgBM,EAAK,IAAKA,EAAK,IAAKA,EAAK,KAAK,EAI/D,QAAWA,KAAQP,EACjB,KAAK,UAAU,KAAKO,EAAK,QAASA,EAAK,OAAQA,EAAK,IAAKA,EAAK,IAAKA,EAAK,KAAK,CAEjF,CAEO,eAAeC,EAA+C,CAEnE,GAAI,CAAC,KAAK,QAAQ,KAAM,CACtB,KAAK,iBAAmBA,EACxB,MACF,CAIA,GAAI,KAAK,iBAAiB,MAAQA,EAAQ,KAAM,CAC9C,KAAK,iBAAmBA,EACxB,MACF,CAGA,IAAMzB,EAAS,KAAK,UAAU,MAAM,OAC9BD,EAAOC,EAAO,MAAM,OACpB0B,EAAS,KAAK,iBAAiB,KAAO,EAC5C,QAASnB,EAAM,EAAGA,EAAMR,EAAM,EAAEQ,EAAK,CACnC,IAAMC,EAAOR,EAAO,MAAM,IAAIO,CAAG,EACjC,GAAIC,EAAK,MAAMkB,CAAM,EAAI,UAAsB,CAC7C,IAAMpC,EAAyBkB,EAAK,eAAekB,CAAM,GAAKzC,EACxDJ,EAAUS,EAAE,QAClB,GAAIT,IAAY,QAAaA,IAAY,GACvC,SAEF,IAAM8B,EAAU,KAAK,QAAQ,IAAI9B,CAAO,EACxC,GAAI,CAAC8B,EACH,SAGF,IAAMgB,EAAc,KAAK,MAAMhB,EAAQ,QAAQ,OAAS,GAAKA,EAAQ,eAAe,KAAK,EACzF,GAAKrB,EAAE,OAASqC,EAAe,GAAKA,EAClC,SAGF,IAAIC,EAAU,GACd,QAASC,EAAWH,EAAS,EAAGG,EAAWJ,EAAQ,KAAM,EAAEI,EACzD,GAAIrB,EAAK,MAAMqB,EAAW,EAAY,CAAY,EAAI,QAA0B,CAC9ED,EAAU,GACV,KACF,CAEF,GAAIA,EACF,SAGF,IAAMZ,EAAM,KAAK,IAAIS,EAAQ,KAAME,EAAerC,EAAE,OAASqC,EAAeD,CAAM,EAC9EI,EAAWxC,EAAE,OACjB,QAASyC,EAAYL,EAAS,EAAGK,EAAYf,EAAK,EAAEe,EAClD,KAAK,aAAavB,EAAwBuB,EAAWlD,EAAS,EAAEiD,CAAQ,EACxEnB,EAAQ,WAEZ,CACF,CAEA,KAAK,iBAAmBc,CAC1B,CAKO,qBAAqBO,EAAWC,EAA0C,CAE/E,IAAMzB,EADS,KAAK,UAAU,MAAM,OAChB,MAAM,IAAIyB,CAAC,EAC/B,GAAIzB,GAAQA,EAAK,MAAMwB,CAAC,EAAI,UAAsB,CAChD,IAAM1C,EAAyBkB,EAAK,eAAewB,CAAC,GAAK/C,EACzD,GAAIK,EAAE,SAAWA,EAAE,UAAY,GAAI,CACjC,IAAM4C,EAAO,KAAK,QAAQ,IAAI5C,EAAE,OAAO,GAAG,KAC1C,GAAI,OAAO,aAAe4C,aAAgB,YAAa,CACrD,IAAMC,EAASC,EAAc,aAAa,OAAO,SAAUF,EAAK,MAAOA,EAAK,MAAM,EAClF,OAAAC,EAAO,WAAW,IAAI,GAAG,UAAUD,EAAM,EAAG,EAAGA,EAAK,MAAOA,EAAK,MAAM,EAC/DC,CACT,CACA,OAAOD,CACT,CACF,CACF,CAKO,wBAAwBF,EAAWC,EAA0C,CAElF,IAAMzB,EADS,KAAK,UAAU,MAAM,OAChB,MAAM,IAAIyB,CAAC,EAC/B,GAAIzB,GAAQA,EAAK,MAAMwB,CAAC,EAAI,UAAsB,CAChD,IAAM1C,EAAyBkB,EAAK,eAAewB,CAAC,GAAK/C,EACzD,GAAIK,EAAE,SAAWA,EAAE,UAAY,IAAMA,EAAE,SAAW,GAAI,CACpD,IAAMC,EAAO,KAAK,QAAQ,IAAID,EAAE,OAAO,EACvC,GAAIC,EACF,OAAO,KAAK,UAAU,YAAYA,EAAMD,EAAE,MAAM,CAEpD,CACF,CACF,CAIQ,aAAa+C,EAAsB,CACzC,IAAMC,EAAO,KAAK,iBAAiB,EAC/BC,EAAUD,EACd,KAAO,KAAK,YAAcC,EAAUF,GAAQ,KAAK,QAAQ,MAAM,CAC7D,IAAM9C,EAAO,KAAK,QAAQ,IAAI,EAAE,KAAK,SAAS,EAC1CA,GAAQA,EAAK,OACfgD,GAAWhD,EAAK,KAAK,MAAQA,EAAK,KAAK,OACnCA,EAAK,QAAUA,EAAK,OAASA,EAAK,SACpCgD,GAAWhD,EAAK,OAAO,MAAQA,EAAK,OAAO,QAE7CA,EAAK,QAAQ,QAAQ,EACrB,KAAK,QAAQ,KAAK,SAAS,EAE/B,CACA,OAAO+C,EAAOC,CAChB,CAEQ,aAAa/B,EAAsBwB,EAAWnD,EAAiBC,EAAsB,CAC3F,GAAI0B,EAAK,MAAMwB,EAAI,EAAY,CAAO,EAAI,UAAsB,CAC9D,IAAMQ,EAAMhC,EAAK,eAAewB,CAAC,EACjC,GAAIQ,EAAK,CACP,GAAIA,EAAI,UAAY,OAAW,CAI7B,IAAMC,EAAU,KAAK,QAAQ,IAAID,EAAI,OAAO,EACxCC,GAEFA,EAAQ,YAEVD,EAAI,QAAU3D,EACd2D,EAAI,OAAS1D,EACb,MACF,CAEA0B,EAAK,eAAewB,CAAC,EAAI,IAAIvD,EAAmB+D,EAAI,IAAKA,EAAI,MAAO3D,EAASC,CAAM,EACnF,MACF,CACF,CAEA0B,EAAK,MAAMwB,EAAI,EAAY,CAAO,GAAK,UACvCxB,EAAK,eAAewB,CAAC,EAAI,IAAIvD,EAAmB,EAAG,EAAGI,EAASC,CAAM,CACvE,CAEQ,mBAA0B,CAEhC,QAAWS,KAAQ,KAAK,QAAQ,OAAO,EACjCA,EAAK,aAAe,cACtBA,EAAK,UAAY,GAIrB,IAAMS,EAAS,KAAK,UAAU,MAAM,OACpC,QAASiC,EAAI,EAAGA,EAAI,KAAK,UAAU,KAAM,EAAEA,EAAG,CAC5C,IAAMzB,EAAOR,EAAO,MAAM,IAAIiC,CAAC,EAC/B,GAAKzB,GAGL,QAASwB,EAAI,EAAGA,EAAI,KAAK,UAAU,KAAM,EAAEA,EACzC,GAAIxB,EAAK,MAAMwB,EAAI,EAAY,CAAO,EAAI,UAAsB,CAC9D,IAAMU,EAAQlC,EAAK,eAAewB,CAAC,GAAG,QACtC,GAAIU,EAAO,CACT,IAAMnD,EAAO,KAAK,QAAQ,IAAImD,CAAK,EAC/BnD,GACFA,EAAK,WAET,CACF,EAEJ,CAEA,IAAMG,EAAO,CAAC,EACd,OAAW,CAACD,EAAIF,CAAI,IAAK,KAAK,QAAQ,QAAQ,EACxCA,EAAK,aAAe,aAAe,CAACA,EAAK,YAC3CA,EAAK,QAAQ,QAAQ,EACrBG,EAAK,KAAKD,CAAE,GAGhB,QAAWA,KAAMC,EACf,KAAK,QAAQD,CAAE,CAEnB,CACF,ECnpBA,IAAAkD,GAA0B,QAC1BC,GAAuB,QC2CvB,SAASC,EAAMC,EAA2B,CACxC,IAAIC,EAAI,GACR,QAASC,EAAI,EAAGA,EAAIF,EAAK,OAAQ,EAAEE,EACjCD,GAAK,OAAO,aAAaD,EAAKE,CAAC,CAAC,EAElC,OAAOD,CACT,CAGA,SAASE,GAAMH,EAA2B,CACxC,IAAII,EAAI,EACR,QAASF,EAAI,EAAGA,EAAIF,EAAK,OAAQ,EAAEE,EAAG,CACpC,GAAIF,EAAKE,CAAC,EAAI,IAAMF,EAAKE,CAAC,EAAI,GAC5B,MAAM,IAAI,MAAM,cAAc,EAEhCE,EAAIA,EAAI,GAAKJ,EAAKE,CAAC,EAAI,EACzB,CACA,OAAOE,CACT,CAGA,SAASC,GAAOL,EAA2B,CACzC,IAAMI,EAAIL,EAAMC,CAAI,EACpB,GAAI,CAACI,EAAE,MAAM,kCAAkC,EAC7C,MAAM,IAAI,MAAM,cAAc,EAEhC,OAAOA,CACT,CAGA,SAASE,GAAON,EAA2B,CACzC,GAAI,OAAO,OAAW,IACpB,OAAO,OAAO,KAAKD,EAAMC,CAAI,EAAG,QAAQ,EAAE,SAAS,EAErD,IAAMO,EAAK,KAAKR,EAAMC,CAAI,CAAC,EACrBQ,EAAI,IAAI,WAAWD,EAAG,MAAM,EAClC,QAAS,EAAI,EAAG,EAAIC,EAAE,OAAQ,EAAE,EAC9BA,EAAE,CAAC,EAAID,EAAG,WAAW,CAAC,EAExB,OAAO,IAAI,YAAY,EAAE,OAAOC,CAAC,CACnC,CAEA,IAAMC,GAAiE,CACrE,OAAQN,GACR,KAAMA,GACN,KAAMG,GACN,MAAOD,GACP,OAAQA,GACR,oBAAqBF,EACvB,EAKMO,GAAc,CAAC,GAAI,IAAK,IAAK,GAAG,EAEhCC,GAAuB,CAAC,GAAI,IAAK,IAAK,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,GAAI,IAAK,IAAK,GAAG,EAEpFC,GAAkB,CAAC,GAAI,IAAK,IAAK,IAAK,GAAI,GAAI,IAAK,GAAG,EAEtDC,GAAiB,CAAC,GAAI,IAAK,IAAK,IAAK,GAAI,IAAK,GAAG,EAEjDC,GAAwB,CAAC,GAAI,IAAK,IAAK,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,IAAK,GAAI,IAAK,IAAK,GAAG,EAG1FC,GAAiB,KAGVC,GAAN,KAAmB,CAAnB,cACL,KAAO,MAAqB,EAC5B,KAAQ,QAAU,IAAI,YAAYD,EAAc,EAChD,KAAQ,UAAY,EACpB,KAAQ,KAAO,GACf,KAAO,OAA4E,CAAC,EAE7E,OAAc,CACnB,KAAK,QAAQ,KAAK,CAAC,EACnB,KAAK,MAAQ,EACb,KAAK,UAAY,EACjB,KAAK,OAAS,CAAC,EACf,KAAK,KAAO,EACd,CAEO,KAAc,CACnB,GAAI,KAAK,QAAU,EAAmB,CACpC,GAAI,KAAK,YAAcF,GAAe,OAAQ,CAC5C,QAASI,EAAI,EAAGA,EAAIJ,GAAe,OAAQ,EAAEI,EAC3C,GAAI,KAAK,QAAQA,CAAC,IAAMJ,GAAeI,CAAC,EAAG,OAAO,KAAK,GAAG,EAE5D,YAAK,OAAO,KAAU,EACtB,KAAK,MAAQ,EACN,CACT,CACA,GAAI,KAAK,YAAcH,GAAsB,OAAQ,CACnD,QAASG,EAAI,EAAGA,EAAIH,GAAsB,OAAQ,EAAEG,EAClD,GAAI,KAAK,QAAQA,CAAC,IAAMH,GAAsBG,CAAC,EAAG,OAAO,KAAK,GAAG,EAEnE,YAAK,OAAO,KAAU,EACtB,KAAK,MAAQ,EACN,CACT,CACA,OAAO,KAAK,GAAG,CACjB,CACA,OAAI,KAAK,QAAU,EAAwB,EACvC,KAAK,QAAU,GACd,KAAK,OAAO,OAAS,EAEnB,KAAK,YAAY,KAAK,SAAS,GACpC,KAAK,MAAQ,EACN,GAFuC,KAAK,GAAG,EAIjD,KAAK,GAAG,CACjB,CAEO,MAAMjB,EAAmBkB,EAAeC,EAAqB,CAClE,IAAIC,EAAQ,KAAK,MACbC,EAAM,KAAK,UACTC,EAAS,KAAK,QAEpB,GADIF,IAAU,GAAqBA,IAAU,GACzCA,IAAU,GAAqBC,EAAM,GAAI,MAAO,GACpD,QAASnB,EAAIgB,EAAOhB,EAAIiB,EAAK,EAAEjB,EAAG,CAChC,IAAMqB,EAAIvB,EAAKE,CAAC,EAChB,OAAQqB,EAAG,CACT,IAAK,IACH,GAAI,CAAC,KAAK,YAAYF,CAAG,EAAG,OAAO,KAAK,GAAG,EAC3CD,EAAQ,EACRC,EAAM,EACN,MACF,IAAK,IACH,GAAID,IAAU,EAAmB,CAC/B,GAAIE,EAAO,CAAC,IAAM,GAAI,CAEpB,IAAIL,EAAI,EACR,KAAOA,EAAIP,GAAY,OAAQ,EAAEO,EAC/B,GAAIK,EAAOL,CAAC,IAAMP,GAAYO,CAAC,EAAG,OAAO,KAAK,GAAG,EAGnD,GADA,KAAK,OAAO,KAAU,EAClBI,IAAQT,GAAgB,OAAQ,CAClC,KAAOK,EAAIL,GAAgB,OAAQ,EAAEK,EACnC,GAAIK,EAAOL,CAAC,IAAML,GAAgBK,CAAC,EAAG,OAAO,KAAK,GAAG,EAEvD,YAAK,OAAO,KAAU,EACtB,KAAK,MAAQ,EACNf,EAAI,CACb,CACF,SAAWoB,EAAO,CAAC,IAAM,GAAI,CAE3B,QAASL,EAAI,EAAGA,EAAIN,GAAqB,OAAQ,EAAEM,EACjD,GAAIK,EAAOL,CAAC,IAAMN,GAAqBM,CAAC,EAAG,OAAO,KAAK,GAAG,EAE5D,KAAK,OAAO,KAAU,CACxB,KACE,QAAO,KAAK,GAAG,EAEjBG,EAAQ,EACRC,EAAM,CACR,SAAWD,IAAU,EAAiB,CACpC,GAAI,CAAC,KAAK,UAAUC,CAAG,EAAG,OAAO,KAAK,GAAG,EACzCD,EAAQ,EACRC,EAAM,CACR,SAAWD,IAAU,EAAmB,CACtC,GAAIC,GAAON,GAAgB,OAAO,KAAK,GAAG,EAC1CO,EAAOD,GAAK,EAAIE,CAClB,CACA,MACF,IAAK,IACH,OAAIH,IAAU,GACR,CAAC,KAAK,YAAYC,CAAG,EAAU,KAAK,GAAG,GAE7C,KAAK,MAAQ,EACNnB,EAAI,GACb,QACE,GAAImB,GAAON,GAAgB,OAAO,KAAK,GAAG,EAC1CO,EAAOD,GAAK,EAAIE,CACpB,CACF,CACA,YAAK,MAAQH,EACb,KAAK,UAAYC,EACV,EACT,CAEQ,IAAa,CACnB,YAAK,OAAO,KAAO,EACnB,KAAK,MAAQ,EACN,EACT,CAEQ,UAAUA,EAAsB,CACtC,IAAMJ,EAAIlB,EAAM,KAAK,QAAQ,SAAS,EAAGsB,CAAG,CAAC,EAC7C,OAAIJ,GACF,KAAK,KAAOA,EACZ,KAAK,OAAOA,CAAC,EAAI,KACV,IAEF,EACT,CAEQ,YAAYI,EAAsB,CACxC,GAAI,KAAK,KAAM,CACb,GAAI,CACF,IAAMjB,EAAI,KAAK,QAAQ,MAAM,EAAGiB,CAAG,EACnC,KAAK,OAAO,KAAK,IAAI,EAAIZ,GAAS,KAAK,IAAI,EAAIA,GAAS,KAAK,IAAI,EAAEL,CAAC,EAAIA,CAC1E,MAAQ,CACN,MAAO,EACT,CACA,MAAO,EACT,CACA,MAAO,EACT,CACF,ECvPO,IAAMoB,EAA6B,CACxC,KAAM,cACN,MAAO,EACP,OAAQ,CACV,EAEO,SAASC,GAAUC,EAAyB,CACjD,GAAIA,EAAE,OAAS,GACb,OAAOF,EAET,IAAMG,EAAM,IAAI,YAAYD,EAAE,OAAQA,EAAE,WAAY,CAAC,EAGrD,GAAIC,EAAI,CAAC,IAAM,YAAcA,EAAI,CAAC,IAAM,WAAcA,EAAI,CAAC,IAAM,WAC/D,MAAO,CACL,KAAM,YACN,MAAQD,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,EACrD,OAAQA,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,CACvD,EAGF,GAAIA,EAAE,CAAC,IAAM,KAAQA,EAAE,CAAC,IAAM,KAAQA,EAAE,CAAC,IAAM,IAAM,CACnD,GAAM,CAACE,EAAOC,CAAM,EAAIC,GAAQJ,CAAC,EACjC,MAAO,CAAE,KAAM,aAAc,MAAAE,EAAO,OAAAC,CAAO,CAC7C,CAEA,GAAIF,EAAI,CAAC,IAAM,YAAeD,EAAE,CAAC,IAAM,IAAQA,EAAE,CAAC,IAAM,KAASA,EAAE,CAAC,IAAM,GACxE,MAAO,CACL,KAAM,YACN,MAAQA,EAAE,CAAC,GAAK,EAAIA,EAAE,CAAC,EACvB,OAAQA,EAAE,CAAC,GAAK,EAAIA,EAAE,CAAC,CACzB,EAGF,GAAIC,EAAI,CAAC,IAAM,WACb,MAAO,CACL,KAAM,YACN,MAAQD,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,EAAIA,EAAE,CAAC,EACjD,OAAQA,EAAE,CAAC,GAAK,GAAKA,EAAE,CAAC,GAAK,GAAKA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,CACrD,EAGF,GAAIC,EAAI,CAAC,IAAM,YAAcA,EAAI,CAAC,IAAM,aAAeA,EAAI,CAAC,EAAI,YAAc,QAAU,CACtF,OAAQD,EAAE,EAAE,EAAG,CACb,IAAK,IACH,MAAO,CACL,KAAM,aACN,OAASA,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,GAAK,IAAM,EAC7C,QAASA,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,GAAK,IAAM,CAC/C,EACF,IAAK,IACH,GAAIA,EAAE,EAAE,IAAM,GAAM,OAAOF,EAC3B,IAAMO,EAAML,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,EAAIA,EAAE,EAAE,GAAK,GAAKA,EAAE,EAAE,GAAK,GACxD,MAAO,CACL,KAAM,aACN,OAASK,EAAa,OAAU,EAChC,QAASA,IAAQ,GAAK,OAAU,CAClC,EACF,IAAK,IACH,OAAIL,EAAE,EAAE,IAAM,KAAQA,EAAE,EAAE,IAAM,GAAQA,EAAE,EAAE,IAAM,GAAaF,EACxD,CACL,KAAM,aACN,OAASE,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,GAAK,MAC/B,QAASA,EAAE,EAAE,EAAIA,EAAE,EAAE,GAAK,GAAK,KACjC,CACJ,CACA,OAAOF,CACT,CAEA,GAAIG,EAAI,CAAC,IAAM,aAAeA,EAAI,CAAC,IAAM,YAAcA,EAAI,CAAC,IAAM,YAAa,CAC7E,IAAIK,EAAM,GAEJC,EAAQ,KAAK,IAAIP,EAAE,OAAS,GAAI,IAAI,EAC1C,QAASQ,EAAI,EAAGA,EAAID,EAAOC,IAEzB,GAAIR,EAAEQ,CAAC,IAAM,KAAQR,EAAEQ,EAAI,CAAC,IAAM,KAAQR,EAAEQ,EAAI,CAAC,IAAM,KAAQR,EAAEQ,EAAI,CAAC,IAAM,IAAM,CAChFF,EAAME,EACN,KACF,CAEF,GAAIF,IAAQ,GAAI,CAEd,IAAMJ,EACJF,EAAEM,EAAO,CAAC,GAAK,GACfN,EAAEM,EAAO,CAAC,GAAK,GACfN,EAAEM,EAAM,EAAE,GAAM,EAChBN,EAAEM,EAAM,EAAE,EACNH,EACJH,EAAEM,EAAM,EAAE,GAAK,GACfN,EAAEM,EAAM,EAAE,GAAK,GACfN,EAAEM,EAAM,EAAE,GAAM,EAChBN,EAAEM,EAAM,EAAE,EACZ,GAAIJ,EAAQ,GAAKC,EAAS,EACxB,MAAO,CAAE,KAAM,aAAc,MAAAD,EAAO,OAAAC,CAAO,CAE/C,CACA,OAAOL,CACT,CACA,OAAOA,CACT,CAGA,SAASM,GAAQJ,EAAiC,CAChD,IAAMS,EAAMT,EAAE,OACVQ,EAAI,EACJE,EAAcV,EAAEQ,CAAC,GAAK,EAAIR,EAAEQ,EAAI,CAAC,EACrC,OAAa,CAEX,GADAA,GAAKE,EACDF,GAAKC,EAEP,MAAO,CAAC,EAAG,CAAC,EAEd,GAAIT,EAAEQ,CAAC,IAAM,IACX,MAAO,CAAC,EAAG,CAAC,EAEd,GAAIR,EAAEQ,EAAI,CAAC,IAAM,KAAQR,EAAEQ,EAAI,CAAC,IAAM,IACpC,OAAIA,EAAI,EAAIC,EACH,CACLT,EAAEQ,EAAI,CAAC,GAAK,EAAIR,EAAEQ,EAAI,CAAC,EACvBR,EAAEQ,EAAI,CAAC,GAAK,EAAIR,EAAEQ,EAAI,CAAC,CACzB,EAEK,CAAC,EAAG,CAAC,EAEdA,GAAK,EACLE,EAAcV,EAAEQ,CAAC,GAAK,EAAIR,EAAEQ,EAAI,CAAC,CACnC,CACF,CFnHA,IAAMG,GAAgC,CACpC,OACA,KAAM,eACN,KAAM,EACN,MAAO,OACP,OAAQ,OACR,oBAAqB,EACrB,OAAQ,CACV,EAGaC,GAAN,KAAuD,CAU5D,YACmBC,EACAC,EACAC,EACAC,EACjB,CAJiB,WAAAH,EACA,eAAAC,EACA,cAAAC,EACA,mBAAAC,EAbnB,KAAQ,YAAc,EACtB,KAAQ,SAAW,GACnB,KAAQ,IAAM,IAAIC,GAClB,KAAQ,QAAyBN,GAGjC,KAAQ,aAAe,GACvB,KAAQ,YAAc,GAQpB,IAAMO,EAAkB,KAAK,KAAK,KAAK,MAAM,aAAe,EAAI,CAAC,EAC3DC,EAAe,KAAK,IAAI,QAA2BD,CAAe,EACxE,KAAK,KAAO,IAAI,GAAAE,QAAc,EAAwBF,EAAiBC,CAAY,EACnF,KAAK,QAAU,IAAI,GAAAE,QAAW,CAAsB,CACtD,CAEO,OAAc,CACnB,KAAK,cACL,KAAK,IAAI,MAAM,EACf,KAAK,KAAK,QAAQ,EAClB,KAAK,QAAQ,QAAQ,CACvB,CAEO,OAAc,CACnB,KAAK,SAAW,GAChB,KAAK,IAAI,MAAM,CACjB,CAEO,IAAIC,EAAmBC,EAAeC,EAAmB,CAC9D,GAAI,MAAK,SAET,GAAI,KAAK,IAAI,QAAU,EAChB,KAAK,KAAK,IAAIF,EAAK,SAASC,EAAOC,CAAG,CAAC,IAAiB,IAC3D,KAAK,KAAK,QAAQ,EAClB,KAAK,SAAW,QAEb,CACL,IAAMC,EAAU,KAAK,IAAI,MAAMH,EAAMC,EAAOC,CAAG,EAC/C,GAAIC,IAAY,GAAI,CAClB,KAAK,SAAW,GAChB,MACF,CACA,GAAIA,EAAU,EAAG,CAEf,GADgB,KAAK,IAAI,OAAO,OAChB,EAAmB,CAOjC,GANI,KAAK,eACP,KAAK,aAAe,GACpB,KAAK,YAAc,GACnB,KAAK,KAAK,QAAQ,GAEpB,KAAK,QAAU,OAAO,OAAO,CAAC,EAAGd,GAAgB,KAAK,IAAI,MAAM,EAC5D,CAAC,KAAK,QAAQ,OAAQ,CACxB,KAAK,SAAW,GAChB,MACF,CACA,GAAI,CAAC,KAAK,aAAa,EAAG,CACxB,KAAK,SAAW,GAChB,MACF,CACF,SAAW,KAAK,YAAa,CAC3B,KAAK,SAAW,GAChB,MACF,CACK,KAAK,KAAK,IAAIW,EAAK,SAASG,EAASD,CAAG,CAAC,IAAiB,IAC7D,KAAK,KAAK,QAAQ,EAClB,KAAK,SAAW,GACZ,KAAK,eAAc,KAAK,YAAc,IAE9C,CACF,CACF,CAEO,IAAIE,EAA8C,CAGvD,GAFI,KAAK,UAEL,KAAK,IAAI,QAAU,GACjB,KAAK,IAAI,IAAI,EAAG,MAAO,GAE7B,IAAMC,EAAU,KAAK,IAAI,OAAO,KAEhC,GAAIA,IAAY,EAAuB,MAAO,GAE9C,GAAIA,IAAY,EAA6B,CAE3C,IAAIC,EAAIC,EAAkB,MACtBC,EAAID,EAAkB,OACtB,KAAK,UAAU,aACjBD,EAAI,KAAK,UAAU,WAAW,IAAI,OAAO,MAAQ,KAAK,cAAc,KACpEE,EAAI,KAAK,UAAU,WAAW,IAAI,OAAO,OAAS,KAAK,cAAc,MAEvE,IAAMC,EAAQ,KAAK,cAAc,MAAM,qBAAqB,KAAO,EAC7DC,EAAS,4BAA4BF,EAAE,QAAQ,CAAC,CAAC,IAAIF,EAAE,QAAQ,CAAC,CAAC,IAAIG,EAAM,QAAQ,CAAC,CAAC,SAC3F,YAAK,cAAc,MAAMC,EAAQ,EAAK,EAC/B,EACT,CAEA,GAAIL,IAAY,EACd,YAAK,QAAU,OAAO,OAAO,CAAC,EAAGhB,GAAgB,KAAK,IAAI,MAAM,EAChE,KAAK,aAAe,GACpB,KAAK,YAAc,GACnB,KAAK,KAAK,QAAQ,EACb,KAAK,aAAa,IACrB,KAAK,YAAc,IAEd,GAGT,GAAIgB,IAAY,IACV,CAAC,KAAK,eACV,KAAK,aAAe,GAChB,KAAK,aAAe,KAAK,QAAQ,OAAS,IAA4B,MAAO,GAKnF,IAAIC,EAAI,EACJE,EAAI,EAGJG,EACAC,EAAUC,EAoBd,IAnBIF,EAAOP,MACLO,EAAO,CAAC,KAAK,KAAK,IAAI,IACxBC,EAAUE,GAAU,KAAK,KAAK,KAAK,GAC/BH,EAAOC,EAAQ,OAAS,gBAC1BN,EAAIM,EAAQ,MACZJ,EAAII,EAAQ,QACRD,EAAOL,GAAKE,GAAKF,EAAIE,EAAI,KAAK,MAAM,aACtC,CAACF,EAAGE,CAAC,EAAI,KAAK,QAAQF,EAAGE,CAAC,EAAE,IAAI,KAAK,KAAK,EAC1CG,EAAOL,GAAKE,GAAKF,EAAIE,EAAI,KAAK,MAAM,YAEpC,QAAQ,KAAK,8BAA8BI,EAAQ,KAAK,IAAIA,EAAQ,MAAM,EAAE,GAG9E,QAAQ,KAAK,6BAA6B,GAG5C,QAAQ,KAAK,mCAAmC,GAGhD,CAACD,EACH,YAAK,KAAK,QAAQ,EACX,GAGT,IAAII,EACJ,GAAIH,EAAQ,OAAS,YAAa,CAChC,IAAIZ,EACJ,GAAI,CACFA,EAAO,KAAK,QAAQ,OAAO,KAAK,KAAK,KAAK,CAC5C,OAASgB,EAAG,CACV,eAAQ,KAAK,kCAAmCA,CAAC,EACjD,KAAK,KAAK,QAAQ,EAClB,KAAK,QAAQ,QAAQ,EACd,EACT,CAOA,GANAD,EAAO,IAAI,UACT,IAAI,kBAAkBf,EAAK,OAAQA,EAAK,WAAYA,EAAK,UAAU,EACnE,KAAK,QAAQ,MACb,KAAK,QAAQ,MACf,EACA,KAAK,QAAQ,QAAQ,EACjBM,IAAM,KAAK,QAAQ,OAASE,IAAM,KAAK,QAAQ,OAAQ,CAEzD,KAAK,KAAK,QAAQ,EAClB,IAAMS,EAASC,EAAc,aAAa,OAAW,KAAK,QAAQ,MAAO,KAAK,QAAQ,MAAM,EAC5F,OAAAD,EAAO,WAAW,IAAI,GAAG,aAAaF,EAAM,EAAG,CAAC,EAChD,KAAK,SAAS,SAASE,CAAM,EACtB,EACT,CACF,MACEF,EAAO,IAAI,KAAK,CAAC,KAAK,KAAK,KAAK,EAAG,CAAE,KAAMH,EAAQ,IAAK,CAAC,EAE3D,KAAK,KAAK,QAAQ,EAClB,IAAMO,EAAa,KAAK,YACxB,OAAO,kBAAkBJ,EAAM,CAAE,YAAaT,EAAG,aAAcE,CAAE,CAAC,EAC/D,KAAKY,GACAD,IAAe,KAAK,aACtBC,EAAG,MAAM,EACF,KAET,KAAK,SAAS,SAASA,CAAE,EAClB,GACR,EACA,MAAMJ,IACL,QAAQ,KAAK,uBAAuBJ,EAAQ,IAAI,IAAIA,EAAQ,KAAK,IAAIA,EAAQ,MAAM,GAAII,CAAC,EACjF,GACR,CACL,CAGQ,cAAwB,CAC9B,GAAI,CACF,YAAK,KAAK,KAAK,EACR,EACT,OAAS,EAAG,CACV,eAAQ,KAAK,kCAAmC,CAAC,EACjD,KAAK,KAAK,QAAQ,EACX,EACT,CACF,CAEQ,QAAQV,EAAWE,EAA6B,CACtD,IAAMa,EAAK,KAAK,UAAU,YAAY,IAAI,KAAK,OAASd,EAAkB,MACpEe,EAAK,KAAK,UAAU,YAAY,IAAI,KAAK,QAAUf,EAAkB,OACrEgB,EAAQ,KAAK,UAAU,YAAY,IAAI,OAAO,OAASF,EAAK,KAAK,cAAc,KAC/EG,EAAS,KAAK,UAAU,YAAY,IAAI,OAAO,QAAUF,EAAK,KAAK,cAAc,KAEjFG,EAAK,KAAK,KAAK,KAAK,QAAQ,MAAQF,EAAOF,CAAE,EAC7CK,EAAK,KAAK,KAAK,KAAK,QAAQ,OAASF,EAAQF,CAAE,EACrD,GAAI,CAACG,GAAM,CAACC,EAAI,CACd,IAAMC,EAAKJ,EAAQjB,EACbsB,GAAMJ,EAASF,GAAMd,EACrBqB,EAAI,KAAK,IAAIF,EAAIC,CAAE,EACzB,OAAOC,EAAI,EAAI,CAACvB,EAAIuB,EAAGrB,EAAIqB,CAAC,EAAI,CAACvB,EAAGE,CAAC,CACvC,CACA,OAAQiB,EAEJ,KAAK,QAAQ,qBAAuB,CAACA,GAAM,CAACC,EAC1C,CAACD,EAAIjB,EAAIiB,EAAKnB,CAAC,EAAI,CAACmB,EAAIC,CAAE,EAF5B,CAACpB,EAAIoB,EAAKlB,EAAGkB,CAAE,CAGrB,CAEQ,KAAKI,EAAWC,EAAeC,EAAsB,CAC3D,OAAIF,IAAM,OAAe,EACrBA,EAAE,SAAS,GAAG,EAAU,SAASA,EAAE,MAAM,EAAG,EAAE,EAAG,EAAE,EAAIC,EAAQ,IAC/DD,EAAE,SAAS,IAAI,EAAU,SAASA,EAAE,MAAM,EAAG,EAAE,EAAG,EAAE,EACjD,SAASA,EAAG,EAAE,EAAIE,CAC3B,CACF,EGpQA,IAAAC,GAAiD,QCmI1C,SAASC,GAAkBC,EAA6B,CAC7D,IAAMC,EAAqB,CAAC,EACtBC,EAAQF,EAAK,MAAM,GAAG,EAE5B,QAAWG,KAAQD,EAAO,CACxB,IAAME,EAAQD,EAAK,QAAQ,GAAG,EAC9B,GAAIC,IAAU,GAAI,SAElB,IAAMC,EAAMF,EAAK,UAAU,EAAGC,CAAK,EAC7BE,EAAQH,EAAK,UAAUC,EAAQ,CAAC,EAGtC,GAAIC,IAAQ,IAAiB,CAC3BJ,EAAI,OAASK,EACb,QACF,CACA,GAAID,IAAQ,IAAsB,CAChCJ,EAAI,YAAcK,EAClB,QACF,CACA,GAAID,IAAQ,IAAuB,CACjCJ,EAAI,aAAeK,EACnB,QACF,CACA,GAAID,IAAQ,IAA0B,CACpCJ,EAAI,eAAiBK,EACrB,QACF,CACA,IAAMC,EAAW,SAASD,EAAO,EAAE,EACnC,OAAQD,EAAK,CACX,IAAK,IAAiBJ,EAAI,OAASM,EAAU,MAC7C,IAAK,IAAaN,EAAI,GAAKM,EAAU,MACrC,IAAK,IAAuBN,EAAI,YAAcM,EAAU,MACxD,IAAK,IAAgBN,EAAI,MAAQM,EAAU,MAC3C,IAAK,IAAiBN,EAAI,OAASM,EAAU,MAC7C,IAAK,IAAmBN,EAAI,EAAIM,EAAU,MAC1C,IAAK,IAAmBN,EAAI,EAAIM,EAAU,MAC1C,IAAK,IAAuBN,EAAI,YAAcM,EAAU,MACxD,IAAK,IAAwBN,EAAI,aAAeM,EAAU,MAC1D,IAAK,IAA6BN,EAAI,QAAUM,EAAU,MAC1D,IAAK,IAA6BN,EAAI,QAAUM,EAAU,MAC1D,IAAK,IAAkBN,EAAI,QAAUM,EAAU,MAC/C,IAAK,IAAeN,EAAI,KAAOM,EAAU,MACzC,IAAK,IAAeN,EAAI,KAAOM,EAAU,MACzC,IAAK,IAAgBN,EAAI,MAAQM,EAAU,MAC3C,IAAK,IAA0BN,EAAI,eAAiBM,EAAU,MAC9D,IAAK,IAAkBN,EAAI,OAASM,EAAU,MAC9C,IAAK,IAAuBN,EAAI,YAAcM,EAAU,KAC1D,CACF,CAEA,OAAON,CACT,CD/JA,IAAMO,GAAa,EAGNC,GAAN,KAA8E,CAiCnF,YACmBC,EACAC,EACAC,EACAC,EACjB,CAJiB,WAAAH,EACA,eAAAC,EACA,mBAAAC,EACA,mBAAAC,EApCnB,KAAQ,SAAW,GACnB,KAAQ,YAAc,EACtB,KAAQ,aAAe,GAEvB,KAAQ,eAAuC,KAO/C,KAAQ,eAAiB,GAGzB,KAAQ,aAAe,IAAI,YAAY,GAA+B,EACtE,KAAQ,eAAiB,EAGzB,KAAQ,kBAAoB,EAC5B,KAAQ,kBAAoB,EAG5B,KAAQ,eAAuC,KAI/C,KAAQ,sBAA2D,IAAI,IAarE,KAAK,iBAAmB,KAAK,KAAK,KAAK,MAAM,eAAiB,EAAI,CAAC,EAEnE,KAAK,qBAAuB,KAAK,IAAI,QAAgC,KAAK,gBAAgB,CAC5F,CAEO,OAAc,CACnB,KAAK,cACL,KAAK,mBAAmB,EACpB,KAAK,iBACP,KAAK,eAAe,QAAQ,EAC5B,KAAK,eAAiB,MAExB,KAAK,cAAc,MAAM,CAC3B,CAEO,SAAgB,CACrB,KAAK,MAAM,CACb,CAEQ,oBAAoBC,EAAmB,CAC7C,KAAK,sBAAsB,OAAOA,CAAG,EACjC,KAAK,kBAAoBA,IAC3B,KAAK,gBAAkB,OAE3B,CAEQ,oBAA2B,CACjC,QAAWC,KAAW,KAAK,sBAAsB,OAAO,EACtDA,EAAQ,QAAQ,QAAQ,EAE1B,KAAK,sBAAsB,MAAM,EACjC,KAAK,gBAAkB,MACzB,CAEO,OAAc,CACnB,KAAK,SAAW,GAChB,KAAK,aAAe,GACpB,KAAK,eAAiB,GACtB,KAAK,eAAiB,EACtB,KAAK,eAAiB,KAEtB,KAAK,kBAAoB,KAAK,iBAC9B,KAAK,kBAAoB,EACzB,KAAK,eAAiB,IACxB,CAEO,IAAIC,EAAmBC,EAAeC,EAAmB,CAC9D,GAAI,MAAK,SAET,GAAI,CAAC,KAAK,eACR,KAAK,eAAeF,EAAMC,EAAOC,CAAG,MAC/B,CAEL,IAAIC,EAAaD,EACjB,QAASE,EAAIH,EAAOG,EAAIF,EAAKE,IAC3B,GAAIJ,EAAKI,CAAC,IAAM,GAAqB,CACnC,KAAK,eAAiB,GACtBD,EAAaC,EACb,KACF,CAIF,IAAMC,EAAaF,EAAaF,EAChC,GAAI,KAAK,eAAiBI,EAAa,IAAiC,CACtE,KAAK,SAAW,GAChB,MACF,CAIA,GAHA,KAAK,aAAa,IAAIL,EAAK,SAASC,EAAOE,CAAU,EAAG,KAAK,cAAc,EAC3E,KAAK,gBAAkBE,EAEnB,CAAC,KAAK,eAAgB,CAKxB,GAHA,KAAK,eAAiBC,GAAkB,KAAK,wBAAwB,CAAC,EAGlE,KAAK,eAAe,KAAO,QAAa,KAAK,eAAe,cAAgB,OAAW,CACzF,KAAK,cAAc,KAAK,eAAe,GAAI,0CAA2C,KAAK,eAAe,OAAS,CAAC,EACpH,KAAK,SAAW,GAChB,MACF,CAGA,GAAI,KAAK,eAAe,SAAW,IACjC,OAIF,IAAMC,EAAeJ,EAAa,EAC9BI,EAAeL,GACjB,KAAK,eAAeF,EAAMO,EAAcL,CAAG,CAE/C,CACF,CACF,CAGQ,eAAeF,EAAmBC,EAAeC,EAAmB,CAC1E,GAAI,KAAK,SAAU,OAKnB,IAAMM,EAAa,KAAK,gBAAgB,IAAM,KAAK,iBAAmB,EAChET,EAAU,KAAK,sBAAsB,IAAIS,CAAU,EACnDC,EAAsBV,GAAS,kBAAoB,EAGzD,GAFA,KAAK,mBAAqBG,EAAMD,EACFQ,EAAsB,KAAK,kBAC7B,KAAK,kBAAmB,CAClD,IAAMC,EAAmB,KAAK,gBAAkBX,GAAS,QACrDW,GACFA,EAAiB,QAAQ,EAE3B,KAAK,eAAiB,KAClBX,GACF,KAAK,oBAAoBS,CAAU,EAErC,KAAK,SAAW,GAChB,MACF,CAEA,GAAI,MAAK,aAKT,IAHIT,GAAS,SAAW,CAAC,KAAK,iBAC5B,KAAK,eAAiBA,EAAQ,SAE5B,CAAC,KAAK,eAAgB,CAExB,IAAMY,EAAkB,KAAK,iBAAmB,OAChD,GAAIA,EAAkB,KAAK,MAAM,aAAe,IAAS,CACvD,KAAK,SAAW,GACZ,KAAK,gBAAgB,KAAO,QAC9B,KAAK,cAAc,KAAK,eAAe,GAAI,uCAAwC,KAAK,eAAe,OAAS,CAAC,EAEnH,MACF,CACA,IAAMC,EAAa,KAAK,IAAI,EAAG,KAAK,MAAM,KAAK,MAAM,aAAe,IAAUD,CAAe,CAAC,EAC9F,KAAO,KAAK,sBAAsB,MAAQC,GAAY,CACpD,IAAMC,EAAS,KAAK,sBAAsB,QAAQ,EAAE,KAAK,EAAE,MAC3D,GAAI,CAACA,EAAQ,MACbA,EAAO,CAAC,EAAE,QAAQ,QAAQ,EAC1B,KAAK,oBAAoBA,EAAO,CAAC,CAAC,EAC9BA,EAAO,CAAC,EAAE,IAAI,KAAO,QACvB,KAAK,cAAcA,EAAO,CAAC,EAAE,IAAI,GAAI,uCAAwCA,EAAO,CAAC,EAAE,IAAI,OAAS,CAAC,CAEzG,CACA,IAAMC,EAAU,IAAI,GAAAC,QAAc,QAA6B,KAAK,iBAAkB,KAAK,oBAAoB,EAC/G,GAAI,CACFD,EAAQ,KAAK,CACf,OAASE,EAAG,CAEV,QAAQ,KAAK,oCAAqCA,CAAC,EACnD,KAAK,SAAW,GACZ,KAAK,gBAAgB,KAAO,QAC9B,KAAK,cAAc,KAAK,eAAe,GAAI,oCAAqC,KAAK,eAAe,OAAS,CAAC,EAEhH,MACF,CACA,KAAK,eAAiBF,CACxB,CAEI,KAAK,eAAe,IAAId,EAAK,SAASC,EAAOC,CAAG,CAAC,IAAMV,KACzD,KAAK,eAAe,QAAQ,EAC5B,KAAK,eAAiB,KACtB,KAAK,aAAe,GAChBO,GACF,KAAK,oBAAoBS,CAAU,GAGzC,CAEO,IAAIS,EAA8C,CACvD,GAAI,KAAK,UAAY,CAACA,EACpB,OAAI,KAAK,iBACP,KAAK,eAAe,QAAQ,EAC5B,KAAK,eAAiB,MAEjB,GAIT,GAAI,KAAK,eACP,OAAO,KAAK,wBAAwB,EAItC,IAAMC,EAAM,KAAK,eAGjB,GAAIA,EAAI,SAAW,IACjB,OAAO,KAAK,cAAcA,CAAG,EAI/B,IAAMV,EAAaU,EAAI,IAAM,KAAK,iBAAmB,EAC/CC,EAAeD,EAAI,OAAS,EAC5BnB,EAAU,KAAK,sBAAsB,IAAIS,CAAU,EAEzD,GAAIW,EACF,OAAI,KAAK,iBACHpB,GACFA,EAAQ,kBAAoB,KAAK,kBACjCA,EAAQ,YAAcA,EAAQ,aAAe,KAAK,cAElD,KAAK,sBAAsB,IAAIS,EAAY,CACzC,IAAK,CAAE,GAAGU,CAAI,EACd,QAAS,KAAK,eACd,iBAAkB,KAAK,kBACvB,YAAa,KAAK,YACpB,CAAC,EAEH,KAAK,gBAAkBV,EACvB,KAAK,eAAiB,MAEjB,GAILT,IACF,KAAK,gBAAkB,QAGzB,IAAIqB,EAAc,KAAK,aACnBC,EAAWH,EACXJ,EAAU,KAAK,eAEff,IACFsB,EAAWtB,EAAQ,IACnBe,EAAUf,EAAQ,QAClBqB,EAAcA,GAAerB,EAAQ,YACrC,KAAK,sBAAsB,OAAOS,CAAU,GAG9C,IAAIc,EAAa,IAAI,WAAW,CAAC,EAC7BR,IACEA,EAAQ,IAAI,IAAMtB,KACpB4B,EAAc,IAEhBE,EAAaR,EAAQ,OAEvB,KAAK,eAAiB,KAKtB,IAAMS,EAAS,KAAK,8BAA8BF,EAAUC,EAAYF,CAAW,EACnF,OAAIN,GACFA,EAAQ,QAAQ,EAEXS,CACT,CAIQ,yBAAkC,CACxC,IAAIC,EAAM,GACV,QAASpB,EAAI,EAAGA,EAAI,KAAK,eAAgBA,IACvCoB,GAAO,OAAO,cAAc,KAAK,aAAapB,CAAC,CAAC,EAElD,OAAOoB,CACT,CAEQ,yBAAsD,CAC5D,IAAMN,EAAMZ,GAAkB,KAAK,wBAAwB,CAAC,EAG5D,GAAIY,EAAI,KAAO,QAAaA,EAAI,cAAgB,OAC9C,YAAK,cAAcA,EAAI,GAAI,0CAA2CA,EAAI,OAAS,CAAC,EAC7E,GAKT,OAFeA,EAAI,QAAU,IAEb,CACd,QACE,OAAO,KAAK,cAAcA,CAAG,EAC/B,QACE,YAAK,cAAcA,EAAI,IAAM,EAAG,KAAMA,EAAI,OAAS,CAAC,EAC7C,GACT,QACE,OAAO,KAAK,iBAAiBA,CAAG,EAClC,QAKE,OAAIA,EAAI,KAAO,QACb,KAAK,cAAcA,EAAI,GAAI,4BAA6BA,EAAI,OAAS,CAAC,EAEjE,EACX,CACF,CAEQ,8BAA8BA,EAAoBO,EAAmBL,EAAkD,CAG7H,OAFeF,EAAI,QAAU,IAEb,CACd,QAA2B,CACzB,IAAMK,EAAS,KAAK,gBAAgBL,EAAKO,EAAOL,CAAW,EAG3D,OAAKF,EAAI,cAAgB,OAAS,KAAOA,EAAI,KAAO,SAC9CE,EACF,KAAK,cAAcF,EAAI,GAAI,6BAA8BA,EAAI,OAAS,CAAC,EAC9DO,EAAM,OAAS,GACxB,KAAK,cAAcP,EAAI,GAAI,KAAMA,EAAI,OAAS,CAAC,GAG5CK,CACT,CACA,QACE,OAAO,KAAK,uBAAuBL,EAAKO,EAAOL,CAAW,EAC5D,QACE,OAAO,KAAK,aAAaF,EAAKO,EAAOL,CAAW,EAClD,QAEE,OAAO,KAAK,iBAAiBF,CAAG,EAClC,QAKE,OAAIA,EAAI,KAAO,QACb,KAAK,cAAcA,EAAI,GAAI,4BAA6BA,EAAI,OAAS,CAAC,EAEjE,EACX,CACF,CAEQ,iBAAiBA,EAAgD,CACvE,GAAIA,EAAI,KAAO,OACb,MAAO,GAET,IAAMQ,EAAKR,EAAI,GACTS,EAAQ,KAAK,cAAc,SAASD,CAAE,EAC5C,OAAKC,EAIU,KAAK,cAAcA,EAAOT,CAAG,EAC9B,KAAKD,IACjB,KAAK,cAAcS,EAAIT,EAAU,KAAO,gCAAiCC,EAAI,OAAS,EAAGA,EAAI,WAAW,EACjG,GACR,GAPC,KAAK,cAAcQ,EAAI,yBAA0BR,EAAI,OAAS,EAAGA,EAAI,WAAW,EACzE,GAOX,CAEQ,gBAAgBA,EAAoBO,EAAmBL,EAA+B,CAY5F,OADqBF,EAAI,cAAgB,OACpB,KACfA,EAAI,KAAO,QACb,KAAK,cAAcA,EAAI,GAAI,yCAA0CA,EAAI,OAAS,CAAC,EAE9E,KAGLE,GAAeK,EAAM,SAAW,GAEpC,KAAK,cAAc,WAAWP,EAAI,GAAI,CACpC,KAAM,IAAI,KAAK,CAACO,CAAiB,CAAC,EAClC,MAAOP,EAAI,OAAS,EACpB,OAAQA,EAAI,QAAU,EACtB,OAASA,EAAI,QAAU,GACvB,YAAaA,EAAI,aAAe,EAClC,CAAC,EACM,GACT,CAEQ,uBAAuBA,EAAoBO,EAAmBL,EAAkD,CACtH,GAAIA,EACF,OAAIF,EAAI,KAAO,QACb,KAAK,cAAcA,EAAI,GAAI,6BAA8BA,EAAI,OAAS,CAAC,EAElE,GAGT,KAAK,gBAAgBA,EAAKO,EAAOL,CAAW,EAE5C,IAAMM,EAAKR,EAAI,IAAM,KAAK,cAAc,YAClCS,EAAQ,KAAK,cAAc,SAASD,CAAE,EAC5C,GAAIC,EAAO,CACT,IAAMJ,EAAS,KAAK,cAAcI,EAAOT,CAAG,EAC5C,OAAIA,EAAI,KAAO,OACNK,EAAO,KAAKN,IACjB,KAAK,cAAcS,EAAIT,EAAU,KAAO,gCAAiCC,EAAI,OAAS,CAAC,EAChF,GACR,EAEIK,EAAO,KAAK,IAAM,EAAI,CAC/B,CACA,MAAO,EACT,CAEQ,aAAaL,EAAoBO,EAAmBL,EAA+B,CACzF,IAAMM,EAAKR,EAAI,IAAM,EACfU,EAAQV,EAAI,OAAS,EAM3B,IADqBA,EAAI,cAAgB,OACpB,IACnB,YAAK,cAAcQ,EAAI,yCAA0CE,CAAK,EAC/D,GAIT,GAAIR,EACF,YAAK,cAAcM,EAAI,6BAA8BE,CAAK,EACnD,GAIT,GAAIH,EAAM,SAAW,EACnB,YAAK,cAAcC,EAAI,KAAME,CAAK,EAC3B,GAGT,IAAMC,EAASX,EAAI,QAAU,GAE7B,GAAIW,IAAW,IACb,KAAK,cAAcH,EAAI,KAAME,CAAK,MAC7B,CACL,IAAME,EAAQZ,EAAI,OAAS,EACrBa,EAASb,EAAI,QAAU,EAE7B,GAAI,CAACY,GAAS,CAACC,EACb,YAAK,cAAcL,EAAI,sDAAuDE,CAAK,EAC5E,GAGT,IAAMI,EAAgBH,IAAW,OAC3BI,EAAgBH,EAAQC,EAASC,EAEvC,GAAIP,EAAM,OAASQ,EACjB,YAAK,cAAcP,EAAI,iCAAkCE,CAAK,EACvD,GAGT,KAAK,cAAcF,EAAI,KAAME,CAAK,CACpC,CACA,MAAO,EACT,CAEQ,cAAcV,EAA6B,CAOjD,OALiBA,EAAI,gBAAkB,IAKrB,CAChB,IAAK,IACL,IAAK,IACH,KAAK,mBAAmB,EACxB,KAAK,cAAc,UAAU,EAC7B,MACF,IAAK,IACL,IAAK,IAKH,GAAIA,EAAI,KAAO,OAAW,CACxB,IAAMnB,EAAU,KAAK,sBAAsB,IAAImB,EAAI,EAAE,EACjDnB,GACFA,EAAQ,QAAQ,QAAQ,EAE1B,KAAK,oBAAoBmB,EAAI,EAAE,EAC/B,KAAK,cAAc,WAAWA,EAAI,EAAE,CACtC,CACA,MACF,QAEE,KACJ,CACA,MAAO,EACT,CAEQ,cAAcQ,EAAYQ,EAAiBN,EAAeO,EAA4B,CAC5F,IAAMC,EAAOF,IAAY,KAEzB,GADIE,GAAQR,GAAS,GACjB,CAACQ,GAAQR,GAAS,EAAG,OAEzB,IAAMS,EAAQF,EAAc,MAAMA,CAAW,GAAK,GAC5CG,EAAW,WAAWZ,CAAE,GAAGW,CAAK,IAAIH,CAAO,SACjD,KAAK,cAAc,MAAM,YAAY,iBAAiBI,CAAQ,CAChE,CAIQ,cAAcX,EAAwBT,EAAsC,CAClF,OAAO,KAAK,kBAAkBS,EAAOT,CAAG,EACrC,KAAK,IAAM,EAAI,EACf,MAAM,IAAM,EAAK,CACtB,CAEA,MAAc,kBAAkBS,EAAwBT,EAAmC,CACzF,IAAMqB,EAAa,KAAK,YACpBC,EAAkC,MAAM,KAAK,cAAcb,CAAK,EAEpE,GAAI,CACF,GAAIY,IAAe,KAAK,YAAa,MAAM,IAAI,MAAM,uBAAuB,EAC5E,IAAME,EAAQ,KAAK,IAAI,EAAGvB,EAAI,GAAK,CAAC,EAC9BwB,EAAQ,KAAK,IAAI,EAAGxB,EAAI,GAAK,CAAC,EAC9ByB,EAAQzB,EAAI,aAAgBsB,EAAO,MAAQC,EAC3CG,EAAQ1B,EAAI,cAAiBsB,EAAO,OAASE,EAE7CG,EAAW,KAAK,IAAI,EAAGL,EAAO,MAAQC,CAAK,EAC3CK,EAAW,KAAK,IAAI,EAAGN,EAAO,OAASE,CAAK,EAC5CK,EAAa,KAAK,IAAI,EAAG,KAAK,IAAIJ,EAAOE,CAAQ,CAAC,EAClDG,EAAa,KAAK,IAAI,EAAG,KAAK,IAAIJ,EAAOE,CAAQ,CAAC,EAExD,GAAIC,IAAe,GAAKC,IAAe,EACrC,MAAM,IAAI,MAAM,0BAA0B,EAG5C,GAAIP,IAAU,GAAKC,IAAU,GAAKK,IAAeP,EAAO,OAASQ,IAAeR,EAAO,OAAQ,CAC7F,IAAMS,EAAU,MAAM,kBAAkBT,EAAQC,EAAOC,EAAOK,EAAYC,CAAU,EACpFR,EAAO,MAAM,EACbA,EAASS,CACX,CAEA,IAAMC,EAAK,KAAK,UAAU,YAAY,IAAI,KAAK,OAASC,EAAkB,MACpEC,EAAK,KAAK,UAAU,YAAY,IAAI,KAAK,QAAUD,EAAkB,OAIvEE,EACAC,EACApC,EAAI,UAAY,QAAaA,EAAI,OAAS,QAC5CmC,EAAUnC,EAAI,QACdoC,EAAUpC,EAAI,MACLA,EAAI,UAAY,QACzBmC,EAAUnC,EAAI,QACdoC,EAAU,KAAK,IAAI,EAAG,KAAK,KAAMd,EAAO,OAASA,EAAO,OAAUa,EAAUH,GAAME,CAAE,CAAC,GAC5ElC,EAAI,OAAS,QACtBoC,EAAUpC,EAAI,KACdmC,EAAU,KAAK,IAAI,EAAG,KAAK,KAAMb,EAAO,MAAQA,EAAO,QAAWc,EAAUF,GAAMF,CAAE,CAAC,IAErFG,EAAU,KAAK,KAAKb,EAAO,MAAQU,CAAE,EACrCI,EAAU,KAAK,KAAKd,EAAO,OAASY,CAAE,GAGxC,IAAIG,EAAIf,EAAO,MACXgB,EAAIhB,EAAO,OAQf,IALItB,EAAI,UAAY,QAAaA,EAAI,OAAS,UAC5CqC,EAAI,KAAK,MAAMF,EAAUH,CAAE,EAC3BM,EAAI,KAAK,MAAMF,EAAUF,CAAE,GAGzBG,EAAIC,EAAI,KAAK,MAAM,WACrB,MAAM,IAAI,MAAM,2BAA2B,EAI7C,IAAMC,EAAS,KAAK,cAAc,MAAM,OAClCC,EAASD,EAAO,EAChBE,EAASF,EAAO,EAChBG,EAAaH,EAAO,MAOpBI,GADc3C,EAAI,SAAW,QAAaA,EAAI,OAAS,EACrB,SAAW,MAEnD,GAAIqC,IAAMf,EAAO,OAASgB,IAAMhB,EAAO,OAAQ,CAC7C,IAAMsB,EAAS,MAAM,kBAAkBtB,EAAQ,CAAE,YAAae,EAAG,aAAcC,CAAE,CAAC,EAClFhB,EAAO,MAAM,EACbA,EAASsB,CACX,CAGA,IAAMC,GAAU,KAAK,IAAI,KAAK,IAAI,EAAG7C,EAAI,SAAW,CAAC,EAAGgC,EAAK,CAAC,EACxDc,GAAU,KAAK,IAAI,KAAK,IAAI,EAAG9C,EAAI,SAAW,CAAC,EAAGkC,EAAK,CAAC,EAC9D,GAAIW,KAAY,GAAKC,KAAY,EAAG,CAKlC,IAAMC,EAAW/C,EAAI,UAAY,OAAa,KAAK,MAAMmC,EAAUH,CAAE,EAAIV,EAAO,MAAQuB,GAClFG,GAAWhD,EAAI,OAAS,OAAa,KAAK,MAAMoC,EAAUF,CAAE,EAAIZ,EAAO,OAASwB,GAChFG,EAAeC,EAAc,aAAa,OAAO,SAAUH,EAASC,EAAO,EAC3EG,GAAYF,EAAa,WAAW,IAAI,EAC9C,GAAI,CAACE,GACH,MAAM,IAAI,MAAM,wCAAwC,EAE1DA,GAAU,UAAU7B,EAAQuB,GAASC,EAAO,EAE5C,IAAMM,GAAe,MAAM,kBAAkBH,CAAY,EAMzD,GALAA,EAAa,MAAQA,EAAa,OAAS,EAC3C3B,EAAO,MAAM,EACbA,EAAS8B,GACTf,EAAIf,EAAO,MACXgB,EAAIhB,EAAO,OACPe,EAAIC,EAAI,KAAK,MAAM,WACrB,MAAM,IAAI,MAAM,2BAA2B,EAEzCtC,EAAI,UAAY,SAClBmC,EAAU,KAAK,KAAKb,EAAO,MAAQU,CAAE,GAEnChC,EAAI,OAAS,SACfoC,EAAU,KAAK,KAAKd,EAAO,OAASY,CAAE,EAE1C,CAEA,GAAIb,IAAe,KAAK,YAAa,MAAM,IAAI,MAAM,uBAAuB,EAC5E,IAAMgC,GAASrD,EAAI,QAAU,EAO7B,GANA,KAAK,cAAc,SAASS,EAAM,GAAIa,EAAQ,GAAMqB,GAAOU,EAAM,EACjE/B,EAAS,OAKLtB,EAAI,iBAAmB,EAAG,CAE5B,IAAMsD,EAAWf,EAAO,MAAQG,EAChCH,EAAO,EAAIC,EAEXD,EAAO,EAAI,KAAK,IAAIE,EAASa,EAAU,CAAC,CAC1C,MAGEf,EAAO,EAAI,KAAK,IAAIC,EAASL,EAAS,KAAK,cAAc,IAAI,CAEjE,OAASrC,EAAG,CACV,MAAAwB,GAAQ,MAAM,EACRxB,CACR,CACF,CAGA,MAAc,cAAcW,EAA8C,CACxE,IAAIF,EAAoB,IAAI,WAAW,MAAME,EAAM,KAAK,YAAY,CAAC,EAMrE,GAJIA,EAAM,cAAgB,MACxBF,EAAQ,MAAM,KAAK,gBAAgBA,CAAK,GAGtCE,EAAM,SAAW,IAAiB,CACpC,IAAM8C,EAAUC,GAAUjD,CAAK,EAG/B,GAAIgD,EAAQ,OAAS,aAAe,EAAEA,EAAQ,MAAQ,IAAM,EAAEA,EAAQ,OAAS,IAAMA,EAAQ,MAAQA,EAAQ,OAAS,KAAK,MAAM,WAC/H,MAAM,IAAI,WAAW,mDAAmD,EAE1E,IAAME,EAAO,IAAI,KAAK,CAAClD,CAAiB,EAAG,CAAE,KAAM,WAAY,CAAC,EAChE,GAAI,CAAC,OAAO,kBAAmB,CAC7B,IAAMmD,EAAM,IAAI,gBAAgBD,CAAI,EAC9BE,EAAM,IAAI,MAChB,OAAO,IAAI,QAAqB,CAACC,EAASC,IAAW,CACnDF,EAAI,iBAAiB,OAAQ,IAAM,CACjC,IAAI,gBAAgBD,CAAG,EACvB,IAAMI,EAASZ,EAAc,aAAa,OAAO,SAAUS,EAAI,MAAOA,EAAI,MAAM,EAChFG,EAAO,WAAW,IAAI,GAAG,UAAUH,EAAK,EAAG,CAAC,EAC5C,kBAAkBG,CAAM,EAAE,KAAKF,CAAO,EAAE,MAAMC,CAAM,CACtD,CAAC,EACDF,EAAI,iBAAiB,QAAS,IAAM,CAClC,IAAI,gBAAgBD,CAAG,EACvBG,EAAO,IAAI,MAAM,sBAAsB,CAAC,CAC1C,CAAC,EACDF,EAAI,IAAMD,CACZ,CAAC,CACH,CACA,OAAO,kBAAkBD,CAAI,CAC/B,CAGA,IAAM7C,EAAQH,EAAM,MACdI,EAASJ,EAAM,OAErB,GAAI,CAACG,GAAS,CAACC,EACb,MAAM,IAAI,MAAM,8CAA8C,EAGhE,IAAMC,EAAgBL,EAAM,SAAW,OACjCM,EAAgBH,EAAQC,EAASC,EAEvC,GAAIP,EAAM,OAASQ,EACjB,MAAM,IAAI,MAAM,yBAAyB,EAG3C,IAAMgD,EAAanD,EAAQC,EAE3B,GAAIJ,EAAM,SAAW,GAEnB,OAAO,kBAAkB,IAAI,UAAU,IAAI,kBAAkBF,EAAM,OAAuBA,EAAM,WAAYwD,EAAa,CAAwC,EAAGnD,EAAOC,CAAM,CAAC,EAMpL,IAAM/B,EAAO,IAAI,kBAAkBiF,EAAa,CAAwC,EAClFC,EAAQ,IAAI,YAAYzD,EAAM,OAAQA,EAAM,WAAY,KAAK,MAAMA,EAAM,WAAa,CAAC,CAAC,EACxF0D,EAAQ,IAAI,YAAYnF,EAAK,MAAM,EACnCoF,EAAgBH,EAAa,GAE/BI,EAAY,EACZC,EAAY,EAChB,QAASlF,EAAI,EAAGA,EAAIgF,EAAehF,GAAK,EAAG,CACzC,IAAMmF,EAAKL,EAAMG,GAAW,EACtBG,EAAKN,EAAMG,GAAW,EACtBI,EAAKP,EAAMG,GAAW,EAE5BF,EAAMG,GAAW,EAAI,WAAaC,EAClCJ,EAAMG,GAAW,EAAI,WAAcC,IAAO,GAAOC,GAAM,EACvDL,EAAMG,GAAW,EAAI,WAAcE,IAAO,GAAOC,GAAM,GACvDN,EAAMG,GAAW,EAAI,WAAcG,IAAO,CAC5C,CAGA,IAAIC,EAAUN,EAAgB,EAC1BO,EAAUP,EAAgB,EAC9B,QAAShF,EAAIgF,EAAehF,EAAI6E,EAAY7E,IAC1CJ,EAAK2F,CAAO,EAAQlE,EAAMiE,CAAO,EACjC1F,EAAK2F,EAAU,CAAC,EAAIlE,EAAMiE,EAAU,CAAC,EACrC1F,EAAK2F,EAAU,CAAC,EAAIlE,EAAMiE,EAAU,CAAC,EACrC1F,EAAK2F,EAAU,CAAC,EAAI,IACpBD,GAAW,EACXC,GAAW,EAGb,OAAO,kBAAkB,IAAI,UAAU3F,EAAM8B,EAAOC,CAAM,CAAC,CAC7D,CAEA,MAAc,gBAAgB6D,EAA6C,CACzE,GAAI,CACF,OAAO,MAAM,KAAK,YAAYA,EAAY,SAAS,CACrD,OAASC,EAAO,CACd,GAAIA,aAAiB,WAAY,MAAMA,EACvC,OAAO,MAAM,KAAK,YAAYD,EAAY,aAAa,CACzD,CACF,CAEA,MAAc,YAAYA,EAAwB/D,EAAwD,CACxG,IAAMiE,EAAQ,KAAK,IAAI,KAAK,MAAM,eAAgB,KAAK,MAAM,WAAa,EAAG,KAAK,MAAM,aAAe,GAAO,EAC1GC,EAAW,EAaTC,EAXS,IAAI,eAA6B,CAC9C,KAAKC,EAAY,CACf,GAAIF,GAAYH,EAAW,OAAQ,CACjCK,EAAW,MAAM,EACjB,MACF,CACA,IAAM/F,EAAM,KAAK,IAAI6F,EAAW,KAAMH,EAAW,MAAM,EACvDK,EAAW,QAAQ,IAAI,WAAWL,EAAW,SAASG,EAAU7F,CAAG,CAAC,CAAC,EACrE6F,EAAW7F,CACb,CACF,CAAC,EACqB,YAAY,IAAI,oBAAoB2B,CAAM,CAAC,EAAE,UAAU,EACvEqE,EAAuB,CAAC,EAC1BC,EAAc,EAClB,GAAI,CACF,OAAa,CACX,GAAM,CAAE,KAAAC,EAAM,MAAAC,CAAM,EAAI,MAAML,EAAO,KAAK,EAC1C,GAAII,EAAM,MAEV,GADAD,GAAeE,EAAM,WACjBF,EAAcL,EAChB,YAAME,EAAO,OAAO,EAAE,MAAM,IAAM,CAAC,CAAC,EAC9B,IAAI,WAAW,uCAAuC,EAE9DE,EAAO,KAAKG,CAAK,CACnB,CACF,QAAE,CACAL,EAAO,YAAY,CACrB,CAEA,IAAMzE,EAAS,IAAI,WAAW4E,CAAW,EACrCG,EAAS,EACb,QAAWC,KAASL,EAClB3E,EAAO,IAAIgF,EAAOD,CAAM,EACxBA,GAAUC,EAAM,OAElB,OAAOhF,CACT,CAEA,IAAW,QAA+C,CACxD,OAAO,KAAK,cAAc,MAC5B,CAEA,IAAW,qBAAmD,CAC5D,OAAO,KAAK,cAAc,kBAC5B,CAEA,IAAW,sBAAkE,CAC3E,OAAO,KAAK,qBACd,CACF,EE71BO,IAAMiF,EAAN,MAAMA,CAAyC,CA6BpD,YACmBC,EACjB,CADiB,cAAAA,EA3BnB,KAAQ,aAAe,EACvB,KAAiB,QAAwC,IAAI,IAU7D,KAAiB,oBAA2C,IAAI,IAChE,KAAiB,oBAA2C,IAAI,IAIhE,KAAiB,2BAA8BC,GAA4B,CACzE,IAAMC,EAAU,KAAK,oBAAoB,IAAID,CAAS,EAClDC,IAAY,SACd,KAAK,oBAAoB,OAAOA,CAAO,EACvC,KAAK,oBAAoB,OAAOD,CAAS,EACzC,KAAK,QAAQ,OAAOC,CAAO,EAE/B,EACA,KAAQ,cAA+B,CAAE,UAAW,GAAM,MAAO,MAAO,OAAQ,EAAG,UAAW,KAAM,EAKlG,KAAK,wBAA0B,KAAK,SAAS,eAC7C,KAAK,uBAA0BD,GAAsB,CACnD,KAAK,0BAA0BA,CAAS,EACxC,KAAK,2BAA2BA,CAAS,CAC3C,EACA,KAAK,SAAS,eAAiB,KAAK,sBACtC,CAEO,OAAc,CACnB,KAAK,aAAe,EACpB,KAAK,QAAQ,MAAM,EACnB,KAAK,oBAAoB,MAAM,EAC/B,KAAK,oBAAoB,MAAM,CACjC,CAEO,SAAgB,CACrB,KAAK,MAAM,EACP,KAAK,SAAS,iBAAmB,KAAK,yBACxC,KAAK,SAAS,eAAiB,KAAK,wBAExC,CAEO,WAAWE,EAAwBC,EAAgD,CACxF,IAAMC,EAAUF,GAAM,KAAK,eAErBG,EAAe,KAAK,oBAAoB,IAAID,CAAO,EACrDC,IAAiB,SACnB,KAAK,SAAS,YAAYA,CAAY,EACtC,KAAK,oBAAoB,OAAOD,CAAO,EACvC,KAAK,oBAAoB,OAAOC,CAAY,GAG1C,CAAC,KAAK,QAAQ,IAAID,CAAO,GAAK,KAAK,QAAQ,MAAQN,EAAkB,kBACvE,KAAK,wBAAwB,EAS/B,IAAMQ,EAAY,KAAK,SAAS,SAAS,EAAI,IAC7C,KAAK,QAAQ,OAAOF,CAAO,EAC3B,IAAIG,EAAgB,EACpB,QAAWC,KAAS,KAAK,QAAQ,OAAO,EAAGD,GAAiBC,EAAM,KAAK,KACvE,QAAWC,IAAe,CAAC,GAAO,EAAI,EACpC,OAAW,CAACC,EAAUF,CAAK,IAAK,KAAK,QAAS,CAC5C,GAAID,EAAgBJ,EAAU,KAAK,MAAQG,EAAW,MAClD,KAAK,oBAAoB,IAAII,CAAQ,IAAMD,IAC/CF,GAAiBC,EAAM,KAAK,KAC5B,KAAK,WAAWE,CAAQ,EAC1B,CAGF,YAAK,QAAQ,IAAIN,EAAS,CACxB,GAAGD,EACH,GAAIC,CACN,CAAC,EACMA,CACT,CAEO,SAASH,EAAiBO,EAAwCG,EAAoBC,EAAmBC,EAAsB,CAKpI,IAAMR,EAAe,KAAK,oBAAoB,IAAIJ,CAAO,EACrDI,IAAiB,QACnB,KAAK,oBAAoB,OAAOA,CAAY,EAE9C,KAAK,cAAc,UAAYM,EAC/B,KAAK,cAAc,MAAQC,EAC3B,KAAK,cAAc,OAASC,EAC5B,IAAMb,EAAY,KAAK,SAAS,SAASQ,EAAO,KAAK,aAAa,EAClE,KAAK,oBAAoB,IAAIP,EAASD,CAAS,EAC/C,KAAK,oBAAoB,IAAIA,EAAWC,CAAO,CACjD,CAEO,SAASA,EAA8C,CAC5D,OAAO,KAAK,QAAQ,IAAIA,CAAO,CACjC,CAEO,WAAWA,EAAuB,CACvC,KAAK,QAAQ,OAAOA,CAAO,EAC3B,IAAMD,EAAY,KAAK,oBAAoB,IAAIC,CAAO,EAClDD,IAAc,SAChB,KAAK,SAAS,YAAYA,CAAS,EACnC,KAAK,oBAAoB,OAAOC,CAAO,EACvC,KAAK,oBAAoB,OAAOD,CAAS,EAE7C,CAEO,WAAkB,CACvB,KAAK,QAAQ,MAAM,EACnB,QAAWA,KAAa,KAAK,oBAAoB,OAAO,EACtD,KAAK,SAAS,YAAYA,CAAS,EAErC,KAAK,oBAAoB,MAAM,EAC/B,KAAK,oBAAoB,MAAM,CACjC,CAEA,IAAW,QAA+C,CACxD,OAAO,KAAK,OACd,CAEA,IAAW,oBAAkD,CAC3D,OAAO,KAAK,mBACd,CAEA,IAAW,aAAsB,CAC/B,OAAO,KAAK,aAAe,CAC7B,CAEQ,yBAAgC,CACtC,OAAW,CAACC,CAAO,IAAK,KAAK,QAAS,CACpC,GAAI,KAAK,QAAQ,MAAQH,EAAkB,iBAAmB,EAC5D,MAEG,KAAK,oBAAoB,IAAIG,CAAO,GACvC,KAAK,QAAQ,OAAOA,CAAO,CAE/B,CACF,CACF,EA5JaH,EACa,iBAAmB,IADtC,IAAMgB,GAANhB,ECVP,IAAAiB,EAA8E,OAI9E,IAAAC,GAAsC,QACtCC,GAAuB,QAGvB,IAAMC,GAAkB,QAGlBC,EAAkB,mBACxBA,EAAgB,IAAI,qBAAmB,EAKvC,IAAMC,GAAoB,EACpBC,GAAe,IAAI,IACrBC,GAAa,GAEjB,SAASC,GAAiBC,EAA2B,CAC/CF,KACJA,GAAa,MAEb,iBAAa,CAAE,YAAAE,EAAa,QAASL,CAAgB,CAAC,EAAE,KACtDM,GAAKC,GAAeD,EAAGD,CAAW,EAClC,IAAM,CAAEF,GAAa,EAAO,CAC9B,EACF,CAEA,SAASK,GAAeH,EAA8B,CACpD,OAAOH,GAAa,IAAIG,CAAW,GAAG,IAAI,GAAK,IAAI,WAAQ,CAAE,YAAAA,EAAa,QAASL,CAAgB,CAAC,CACtG,CAEA,SAASO,GAAeE,EAAcJ,EAA2B,CAC3DI,EAAI,YAAcV,IACpBU,EAAI,QAAQ,EAEd,IAAMC,EAAOR,GAAa,IAAIG,CAAW,GAAK,CAAC,EAC3CK,EAAK,OAAST,KAChBS,EAAK,KAAKD,CAAG,EACbP,GAAa,IAAIG,EAAaK,CAAI,EAEtC,CAGO,IAAMC,GAAN,KAAyD,CAQ9D,YACmBC,EACAC,EACAC,EACjB,CAHiB,WAAAF,EACA,cAAAC,EACA,mBAAAC,EAVnB,KAAQ,MAAQ,EAChB,KAAQ,SAAW,GAEnB,KAAQ,gBAAkB,EAE1B,KAAiB,SAAW,IAAI,YAAY,UAAO,YAAY,EAO7D,KAAK,SAAS,IAAId,CAAe,EACjCI,GAAiB,KAAK,MAAM,WAAa,CAAC,CAC5C,CAEO,OAAc,CACnB,KAAK,eAAe,EACpB,KAAK,SAAS,KAAK,CAAC,EACpB,KAAK,SAAS,IAAIJ,CAAe,CACnC,CAEO,KAAKe,EAAuB,CACjC,KAAK,MAAQ,EACb,KAAK,SAAW,GAChB,KAAK,eAAe,EACpB,IAAMV,EAAc,KAAK,MAAM,WAAa,EAC5C,GAAI,CACF,KAAK,KAAOG,GAAeH,CAAW,CACxC,OAASW,EAAG,CAEV,QAAQ,KAAK,uCAAuCA,CAAC,EAAE,EACvD,KAAK,SAAW,GAChB,MACF,CACA,KAAK,gBAAkBX,EACvB,IAAMY,EAAYF,EAAO,OAAO,CAAC,IAAM,EAAI,EAAIG,GAC7C,KAAK,cAAc,MAAM,cAAc,aACvC,KAAK,cAAc,MAAM,eAAe,MAAM,EAChD,KAAK,KAAK,KAAKD,EAAW,KAAK,SAAU,KAAK,MAAM,iBAAiB,CACvE,CAEQ,gBAAuB,CAC7B,IAAMR,EAAM,KAAK,KACZA,IACL,KAAK,KAAO,OACZ,KAAK,SAAS,IAAIA,EAAI,OAAO,EAC7BF,GAAeE,EAAK,KAAK,eAAe,EAC1C,CAEO,IAAIU,EAAmBC,EAAeC,EAAmB,CAC9D,GAAI,OAAK,UAAY,CAAC,KAAK,MAI3B,IADA,KAAK,OAASA,EAAMD,EAChB,KAAK,MAAQ,KAAK,MAAM,eAAgB,CAC1C,QAAQ,KAAK,gCAAgC,EAC7C,KAAK,SAAW,GAChB,KAAK,KAAK,QAAQ,EAClB,MACF,CACA,GAAI,CACF,KAAK,KAAK,OAAOD,EAAMC,EAAOC,CAAG,CACnC,OAASL,EAAG,CACV,QAAQ,KAAK,uCAAuCA,CAAC,EAAE,EACvD,KAAK,SAAW,GAChB,KAAK,KAAK,QAAQ,CACpB,EACF,CAEO,OAAOM,EAA8C,CAC1D,GAAI,CACF,OAAO,KAAK,QAAQA,CAAO,CAC7B,QAAE,CACA,KAAK,eAAe,CACtB,CACF,CAEQ,QAAQA,EAA2B,CACzC,GAAI,KAAK,UAAY,CAACA,GAAW,CAAC,KAAK,KACrC,MAAO,GAGT,IAAMC,EAAQ,KAAK,KAAK,MAClBC,EAAS,KAAK,KAAK,OAGzB,GAAI,CAACD,GAAS,CAACC,EACb,OAAIA,GACF,KAAK,SAAS,cAAcA,CAAM,EAE7B,GAGT,IAAMC,EAASC,EAAc,aAAa,OAAWH,EAAOC,CAAM,EAClE,OAAAC,EAAO,WAAW,IAAI,GAAG,aAAa,IAAI,UAAU,KAAK,KAAK,MAAyCF,EAAOC,CAAM,EAAG,EAAG,CAAC,EAC3H,KAAK,SAAS,SAASC,CAAM,EACtB,EACT,CACF,EASA,SAASP,GAAgBS,EAAqBC,EAAgD,CAC5F,IAAIC,EAAK,EACT,GAAI,CAACD,EAGH,OAAOC,EAET,GAAIF,EAAK,UAAU,EACjB,GAAIA,EAAK,YAAY,EACnBE,EAAKC,GAAUF,EAAO,WAAW,IAAI,UAC5BD,EAAK,QAAQ,EAAG,CACzB,IAAMI,EAAKJ,EAAK,YAAqC,WAAWA,EAAK,WAAW,CAAC,EACjFE,KAAK,cAAW,GAAGE,CAAC,CACtB,MACEF,EAAKC,GAAUF,EAAO,KAAKD,EAAK,WAAW,CAAC,EAAE,IAAI,UAGhDA,EAAK,YAAY,EACnBE,EAAKC,GAAUF,EAAO,WAAW,IAAI,UAC5BD,EAAK,QAAQ,EAAG,CACzB,IAAMI,EAAKJ,EAAK,YAAqC,WAAWA,EAAK,WAAW,CAAC,EACjFE,KAAK,cAAW,GAAGE,CAAC,CACtB,MACEF,EAAKC,GAAUF,EAAO,KAAKD,EAAK,WAAW,CAAC,EAAE,IAAI,EAGtD,OAAOE,CACT,CAGA,SAASC,GAAUE,EAAyB,CAC1C,OAAI,aAAmBA,GACfA,EAAQ,MAAS,IAAMA,IAAU,EAAI,MAAS,IAAMA,IAAU,GAAK,MAAS,EAAIA,IAAU,GAAK,GACzG,CCpLO,IAAMC,GAAN,KAAwB,CAE7B,YACmBC,EACAC,EACAC,EACAC,EACjB,CAJiB,cAAAH,EACA,WAAAC,EACA,eAAAC,EACA,eAAAC,EALnB,KAAQ,cAA+B,CAAE,UAAW,GAAM,MAAO,MAAO,OAAQ,EAAG,UAAW,OAAQ,CAMnG,CAMI,SAASC,EAA4C,CAC1D,KAAK,cAAc,UAAY,KAAK,MAAM,eAC1C,KAAK,SAAS,SAASA,EAAK,KAAK,aAAa,CAChD,CAOO,cAAcC,EAAsB,CACzC,GAAI,KAAK,MAAM,eAAgB,CAC7B,IAAIC,EAAW,KAAK,UAAU,UAC1BA,EAAS,QAAU,IAAMA,EAAS,SAAW,MAC/CA,EAAWC,GAEb,IAAMC,EAAO,KAAK,KAAKH,EAASC,EAAS,MAAM,EAC/C,QAASG,EAAI,EAAGA,EAAID,EAAM,EAAEC,EAC1B,KAAK,UAAU,MAAM,cAAc,SAAS,CAEhD,CACF,CACF,ECrCO,IAAMC,GAAN,KAAsB,CAE3B,YACmBC,EACjB,CADiB,cAAAA,EAFnB,KAAQ,cAA+B,CAAE,UAAW,GAAM,MAAO,MAAO,OAAQ,EAAG,UAAW,KAAM,CAGjG,CAMI,SAASC,EAA4C,CAC1D,KAAK,SAAS,SAASA,EAAK,KAAK,aAAa,CAChD,CACF,ECiCA,IAAMC,GAAsC,CAC1C,kBAAmB,GACnB,WAAY,SACZ,aAAc,GACd,eAAgB,GAChB,kBAAmB,KACnB,eAAgB,SAChB,aAAc,IACd,gBAAiB,GACjB,WAAY,GACZ,aAAc,SACd,aAAc,GACd,eAAgB,QAClB,EAGMC,GAAyB,KAsBxB,IAAMC,GAAN,KAAsD,CAW3D,YAAYC,EAAoC,CANhD,KAAQ,aAA8B,CAAC,EAEvC,KAAQ,UAAwC,IAAI,IACpD,KAAiB,cAAgB,IAAIC,EACrC,KAAgB,aAA6B,KAAK,cAAc,MAG9D,KAAK,MAAQ,OAAO,OAAO,CAAC,EAAGC,GAAiBF,CAAI,EACpD,KAAK,aAAe,OAAO,OAAO,CAAC,EAAGE,GAAiBF,CAAI,CAC7D,CAEO,SAAgB,CACrB,QAAWG,KAAW,KAAK,UAAU,OAAO,EAAGA,EAAQ,MAAM,EAC7D,QAAWC,KAAO,KAAK,aACrBA,EAAI,QAAQ,EAEd,KAAK,aAAa,OAAS,EAC3B,KAAK,UAAU,MAAM,EACrB,KAAK,cAAc,QAAQ,CAC7B,CAEQ,iBAAiBC,EAA2B,CAClD,QAAWD,KAAOC,EAChB,KAAK,aAAa,KAAKD,CAAG,CAE9B,CAEO,SAASE,EAA8B,CAS5C,GARA,KAAK,UAAYA,EAGjB,KAAK,UAAY,IAAIC,EAAcD,CAAQ,EAC3C,KAAK,SAAW,IAAIE,EAAaF,EAAU,KAAK,UAAW,KAAK,KAAK,EACrE,KAAK,SAAS,aAAe,IAAM,KAAK,cAAc,KAAK,EAGvD,KAAK,MAAM,kBAAmB,CAChC,IAAMG,EAAYH,EAAS,QAAQ,eAAiB,CAAC,EACrDG,EAAU,iBAAmB,GAC7BA,EAAU,kBAAoB,GAC9BA,EAAU,gBAAkB,GAC5BH,EAAS,QAAQ,cAAgBG,CACnC,CAiCA,GA/BA,KAAK,cACH,KAAK,UACL,KAAK,SAGLH,EAAS,OAAO,mBAAmB,CAAE,OAAQ,IAAK,MAAO,GAAI,EAAGI,GAAU,KAAK,QAAQA,CAAM,CAAC,EAC9FJ,EAAS,OAAO,mBAAmB,CAAE,OAAQ,IAAK,MAAO,GAAI,EAAGI,GAAU,KAAK,QAAQA,CAAM,CAAC,EAC9FJ,EAAS,OAAO,mBAAmB,CAAE,MAAO,GAAI,EAAGI,GAAU,KAAK,KAAKA,CAAM,CAAC,EAC9EJ,EAAS,OAAO,mBAAmB,CAAE,OAAQ,IAAK,MAAO,GAAI,EAAGI,GAAU,KAAK,yBAAyBA,CAAM,CAAC,EAG/GJ,EAAS,SAASK,GAAS,KAAK,UAAU,OAAOA,CAAK,CAAC,EAQvDL,EAAS,OAAO,mBAAmB,CAAE,cAAe,IAAK,MAAO,GAAI,EAAG,IAAM,KAAK,MAAM,CAAC,EACzFA,EAAS,OAAO,mBAAmB,CAAE,MAAO,GAAI,EAAG,IAAM,KAAK,MAAM,CAAC,EACrEA,EAAS,MAAM,cAAc,eAAe,IAAM,KAAK,MAAM,CAAC,EAG9DA,EAAS,OAAO,eAAe,IAAM,KAAK,UAAU,cAAc,CAAC,EAGnEA,EAAS,SAASM,GAAW,KAAK,UAAU,eAAeA,CAAO,CAAC,CACrE,EAGI,KAAK,MAAM,aAAc,CAC3B,IAAMC,EAAe,IAAIC,GAAkB,KAAK,SAAW,KAAK,MAAO,KAAK,UAAYR,CAAQ,EAC1FS,EAAe,IAAIC,GAAa,KAAK,MAAOH,EAAcP,CAAQ,EACxE,KAAK,UAAU,IAAI,QAASS,CAAY,EACxC,KAAK,cACHT,EAAS,MAAM,cAAc,QAAQ,mBAAmB,CAAE,MAAO,GAAI,EAAGS,CAAY,CACtF,CACF,CAGA,GAAI,KAAK,MAAM,WAAY,CACzB,IAAME,EAAa,IAAIC,GAAgB,KAAK,QAAS,EAC/CC,EAAa,IAAIC,GAAW,KAAK,MAAO,KAAK,UAAYH,EAAYX,CAAQ,EACnF,KAAK,UAAU,IAAI,MAAOa,CAAU,EACpC,KAAK,cACHb,EAAS,MAAM,cAAc,QAAQ,mBAAmB,KAAMa,CAAU,CAC1E,CACF,CAGA,GAAI,KAAK,MAAM,aAAc,CAC3B,IAAME,EAAe,IAAIC,GAAkB,KAAK,QAAS,EACnDC,EAAe,IAAIC,GAAqB,KAAK,MAAO,KAAK,UAAYH,EAAcf,CAAQ,EACjG,KAAK,UAAU,IAAI,QAASiB,CAAY,EACxC,KAAK,cACHF,EACAE,EACAjB,EAAS,MAAM,cAAc,QAAQ,mBAAmB,CAAE,MAAO,GAAI,EAAGiB,CAAY,CACtF,CACF,CACF,CAGO,OAAiB,CAEtB,KAAK,MAAM,eAAiB,KAAK,aAAa,eAC9C,KAAK,MAAM,kBAAoB,KAAK,aAAa,kBAEjD,KAAK,UAAU,MAAM,EAErB,QAAWpB,KAAW,KAAK,UAAU,OAAO,EAC1CA,EAAQ,MAAM,EAEhB,MAAO,EACT,CAEA,IAAW,cAAuB,CAChC,OAAO,KAAK,UAAU,SAAS,GAAK,EACtC,CAEA,IAAW,aAAasB,EAAe,CACrC,KAAK,UAAU,SAASA,CAAK,EAC7B,KAAK,MAAM,aAAeA,CAC5B,CAEA,IAAW,cAAuB,CAChC,OAAI,KAAK,SACA,KAAK,SAAS,SAAS,EAEzB,EACT,CAEA,IAAW,iBAA2B,CACpC,OAAO,KAAK,MAAM,eACpB,CAEA,IAAW,gBAAgBC,EAAgB,CACzC,KAAK,MAAM,gBAAkBA,EAC7B,KAAK,WAAW,gBAAgBA,CAAK,CACvC,CAEO,qBAAqBC,EAAWC,EAA0C,CAC/E,OAAO,KAAK,UAAU,qBAAqBD,EAAGC,CAAC,CACjD,CAEO,wBAAwBD,EAAWC,EAA0C,CAClF,OAAO,KAAK,UAAU,wBAAwBD,EAAGC,CAAC,CACpD,CAEQ,QAAQC,EAAiB,CAC/B,KAAK,WAAW,MAAM,MAAMA,EAAG,EAAK,CACtC,CAEQ,QAAQnB,EAAwC,CACtD,QAASoB,EAAI,EAAGA,EAAIpB,EAAO,OAAQ,EAAEoB,EAC3BpB,EAAOoB,CAAC,IACT,KACH,KAAK,MAAM,eAAiB,IAIlC,MAAO,EACT,CAEQ,QAAQpB,EAAwC,CACtD,QAASoB,EAAI,EAAGA,EAAIpB,EAAO,OAAQ,EAAEoB,EAC3BpB,EAAOoB,CAAC,IACT,KACH,KAAK,MAAM,eAAiB,IAIlC,MAAO,EACT,CAGQ,KAAKpB,EAAwC,CACnD,OAAIA,EAAO,CAAC,EACH,GAOL,KAAK,MAAM,cACb,KAAK,QAAQ,kBAAkB,EACxB,IAEF,EACT,CAYQ,yBAAyBA,EAAwC,CACvE,GAAIA,EAAO,OAAS,EAClB,MAAO,GAET,GAAIA,EAAO,CAAC,IAAM,EAChB,OAAQA,EAAO,CAAC,EAAG,CACjB,IAAK,GACH,YAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,MAAwB,KAAK,MAAM,iBAAiB,GAAG,EAC/E,GACT,IAAK,GACH,KAAK,MAAM,kBAAoB,KAAK,aAAa,kBACjD,KAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,MAAwB,KAAK,MAAM,iBAAiB,GAAG,EAEtF,QAAWP,KAAW,KAAK,UAAU,OAAO,EAC1CA,EAAQ,MAAM,EAEhB,MAAO,GACT,IAAK,GACH,OAAIO,EAAO,OAAS,GAAK,EAAEA,EAAO,CAAC,YAAa,QAAUA,EAAO,CAAC,GAAKqB,IACrE,KAAK,MAAM,kBAAoBrB,EAAO,CAAC,EACvC,KAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,MAAwB,KAAK,MAAM,iBAAiB,GAAG,GAEtF,KAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,KAA4B,EAEtD,GACT,IAAK,GACH,YAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,MAAwBqB,EAAsB,GAAG,EACzE,GACT,QACE,YAAK,QAAQ,SAASrB,EAAO,CAAC,CAAC,KAA4B,EACpD,EACX,CAEF,GAAIA,EAAO,CAAC,IAAM,EAChB,OAAQA,EAAO,CAAC,EAAG,CAEjB,IAAK,GACH,IAAIsB,EAAQ,KAAK,WAAW,YAAY,IAAI,OAAO,MAC/CC,EAAS,KAAK,WAAW,YAAY,IAAI,OAAO,OACpD,GAAI,CAACD,GAAS,CAACC,EAAQ,CAGrB,IAAMC,EAAWC,EACjBH,GAAS,KAAK,WAAW,MAAQ,IAAME,EAAS,MAChDD,GAAU,KAAK,WAAW,MAAQ,IAAMC,EAAS,MACnD,CACA,GAAIF,EAAQC,EAAS,KAAK,MAAM,WAC9B,KAAK,QAAQ,SAASvB,EAAO,CAAC,CAAC,MAAwBsB,EAAM,QAAQ,CAAC,CAAC,IAAIC,EAAO,QAAQ,CAAC,CAAC,GAAG,MAC1F,CAEL,IAAMN,EAAI,KAAK,MAAM,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC,EACrD,KAAK,QAAQ,SAASjB,EAAO,CAAC,CAAC,MAAwBiB,CAAC,IAAIA,CAAC,GAAG,CAClE,CACA,MAAO,GACT,IAAK,GAEH,IAAMA,EAAI,KAAK,MAAM,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC,EACrD,YAAK,QAAQ,SAASjB,EAAO,CAAC,CAAC,MAAwBiB,CAAC,IAAIA,CAAC,GAAG,EACzD,GACT,QACE,YAAK,QAAQ,SAASjB,EAAO,CAAC,CAAC,KAA4B,EACpD,EACX,CAGF,YAAK,QAAQ,SAASA,EAAO,CAAC,CAAC,KAA0B,EAClD,EACT,CACF",
++  "names": ["exports", "red", "n", "green", "blue", "alpha", "toRGBA8888", "g", "b", "a", "fromRGBA8888", "color", "nearestColorIndex", "palette", "r", "min", "idx", "i", "dr", "dg", "db", "d", "clamp", "low", "high", "value", "h2c", "t1", "t2", "c", "HLStoRGB", "h", "l", "s", "v", "normalizeRGB", "normalizeHLS", "p", "require_lib", "__commonJSMin", "exports", "InWasm", "z", "s", "b", "r", "def", "t", "d", "m", "W", "e", "require_Base64Decoder_wasm", "__commonJSMin", "exports", "inwasm_runtime_1", "wasmDecode", "MAP", "el", "D", "i", "EMPTY", "Base64Decoder", "keepSize", "maxBytes", "initialBytes", "m", "bytes", "requested", "needed", "newSize", "addPages", "data", "require_QoiDecoder_wasm", "__commonJSMin", "exports", "inwasm_runtime_1", "wasmQoiDecode", "QoiDecoder", "keepSize", "d", "pixels", "ib", "dl", "bytes", "chunkP", "exports", "Colors_1", "wasm_1", "decodeBase64", "s", "bytestring", "result", "WASM_BYTES", "WASM_MODULE", "NULL_CANVAS", "CallbackProxy", "width", "mode", "DEFAULT_OPTIONS", "DecoderAsync", "opts", "cbProxy", "importObj", "inst", "Decoder", "exports", "_instance", "_cbProxy", "module", "pixels", "offset", "additionalPixels", "newCanvas", "adv", "remaining", "c", "i", "fillColor", "palette", "paletteLimit", "truncate", "data", "start", "end", "p", "length", "j", "currentWidth", "escape", "final", "finalOffset", "bw", "currentHeight", "decode", "dec", "decodeAsync", "toDisposable", "fn", "DisposableStore", "o", "d", "Disposable", "MutableDisposable", "value", "Emitter", "listener", "thisArgs", "disposables", "toDisposable", "entry", "result", "idx", "event", "listeners", "len", "EventUtils", "forward", "from", "to", "e", "map", "i", "any", "events", "store", "DisposableStore", "runAndSubscribe", "handler", "initial", "import_Colors", "ImageRenderer", "_ImageRenderer", "Disposable", "_terminal", "MutableDisposable", "parent", "option", "toDisposable", "localDocument", "width", "height", "canvas", "ctx", "buffer", "imgData", "img", "value", "start", "end", "layer", "y", "w", "h", "imgSpec", "tileId", "col", "row", "count", "sourceWidth", "sourceHeight", "cols", "sx", "sy", "dx", "dy", "finalWidth", "finalHeight", "spec", "currentWidth", "currentHeight", "originalWidth", "originalHeight", "scaledWidth", "scaledHeight", "renderer", "key", "screenElement", "bWidth", "blueprint", "d32", "black", "white", "shift", "offset", "x", "ctx2", "i", "placeholder", "bitmap", "CELL_SIZE_DEFAULT", "ExtendedAttrsImage", "_ExtendedAttrsImage", "ext", "urlId", "imageId", "tileId", "value", "val", "EMPTY_ATTRS", "ImageStorage", "_terminal", "_renderer", "_opts", "e", "spec", "storedPixels", "id", "zero", "img", "opts", "cellSize", "cols", "rows", "buffer", "termCols", "termRows", "originX", "originY", "offset", "tileCount", "row", "line", "col", "endMarker", "imgSpec", "range", "hasTopImages", "hasBottomImages", "start", "end", "drawCalls", "placeholderCalls", "startTile", "startCol", "count", "a", "b", "call", "metrics", "oldCol", "tilesPerRow", "hasData", "rightCol", "lastTile", "expandCol", "x", "y", "orig", "canvas", "ImageRenderer", "room", "used", "current", "old", "oldSpec", "imgId", "import_Base64Decoder", "import_QoiDecoder", "toStr", "data", "s", "i", "toInt", "v", "toSize", "toName", "bs", "b", "DECODERS", "FILE_MARKER", "MULTIPARTFILE_MARKER", "FILEPART_MARKER", "FILEEND_MARKER", "REPORTCELLSIZE_MARKER", "MAX_FIELDCHARS", "HeaderParser", "k", "start", "end", "state", "pos", "buffer", "c", "UNSUPPORTED_TYPE", "imageType", "d", "d32", "width", "height", "jpgSize", "dim", "pos", "limit", "i", "len", "blockLength", "DEFAULT_HEADER", "IIPHandler", "_opts", "_renderer", "_storage", "_coreTerminal", "HeaderParser", "maxEncodedBytes", "initialBytes", "Base64Decoder", "QoiDecoder", "data", "start", "end", "dataPos", "success", "seqType", "w", "CELL_SIZE_DEFAULT", "h", "scale", "report", "cond", "metrics", "UNSUPPORTED_TYPE", "imageType", "blob", "e", "canvas", "ImageRenderer", "generation", "bm", "cw", "ch", "width", "height", "rw", "rh", "wf", "hf", "f", "s", "total", "cdim", "import_Base64Decoder", "parseKittyCommand", "data", "cmd", "parts", "part", "eqIdx", "key", "value", "numValue", "DECODER_OK", "KittyGraphicsHandler", "_opts", "_renderer", "_kittyStorage", "_coreTerminal", "key", "pending", "data", "start", "end", "controlEnd", "i", "copyLength", "parseKittyCommand", "payloadStart", "pendingKey", "previousEncodedSize", "decoderToRelease", "decoderCapacity", "maxPending", "oldest", "decoder", "Base64Decoder", "e", "success", "cmd", "isMoreComing", "decodeError", "finalCmd", "imageBytes", "result", "str", "bytes", "id", "image", "quiet", "format", "width", "height", "bytesPerPixel", "expectedBytes", "message", "placementId", "isOk", "pPart", "response", "generation", "bitmap", "cropX", "cropY", "cropW", "cropH", "maxCropW", "maxCropH", "finalCropW", "finalCropH", "cropped", "cw", "CELL_SIZE_DEFAULT", "ch", "imgCols", "imgRows", "w", "h", "buffer", "savedX", "savedY", "savedYbase", "layer", "scaled", "xOffset", "yOffset", "canvasW", "canvasH", "offsetCanvas", "ImageRenderer", "offsetCtx", "offsetBitmap", "zIndex", "scrolled", "metrics", "imageType", "blob", "url", "img", "resolve", "reject", "canvas", "pixelCount", "src32", "dst32", "alignedPixels", "srcOffset", "dstOffset", "b0", "b1", "b2", "srcByte", "dstByte", "compressed", "error", "limit", "offsetIn", "reader", "controller", "chunks", "totalLength", "done", "value", "offset", "chunk", "_KittyImageStorage", "_storage", "storageId", "kittyId", "id", "imageData", "imageId", "oldStorageId", "byteLimit", "retainedBytes", "image", "evictPlaced", "oldestId", "scrolling", "layer", "zIndex", "KittyImageStorage", "import_Colors", "import_Decoder", "import_wasm", "MEM_PERMA_LIMIT", "DEFAULT_PALETTE", "MAX_IDLE_DECODERS", "idleDecoders", "poolPrimed", "primeDecoderPool", "memoryLimit", "d", "releaseDecoder", "acquireDecoder", "dec", "idle", "SixelHandler", "_opts", "_storage", "_coreTerminal", "params", "e", "fillColor", "extractActiveBg", "data", "start", "end", "success", "width", "height", "canvas", "ImageRenderer", "attr", "colors", "bg", "convertLe", "t", "color", "SixelImageStorage", "_storage", "_opts", "_renderer", "_terminal", "img", "height", "cellSize", "CELL_SIZE_DEFAULT", "rows", "i", "IIPImageStorage", "_storage", "img", "DEFAULT_OPTIONS", "MAX_SIXEL_PALETTE_SIZE", "ImageAddon", "opts", "Emitter", "DEFAULT_OPTIONS", "handler", "obj", "args", "terminal", "ImageRenderer", "ImageStorage", "windowOps", "params", "range", "metrics", "sixelStorage", "SixelImageStorage", "sixelHandler", "SixelHandler", "iipStorage", "IIPImageStorage", "iipHandler", "IIPHandler", "kittyStorage", "KittyImageStorage", "kittyHandler", "KittyGraphicsHandler", "limit", "value", "x", "y", "s", "i", "MAX_SIXEL_PALETTE_SIZE", "width", "height", "cellSize", "CELL_SIZE_DEFAULT"]
  }
 diff --git a/src/IIPHandler.ts b/src/IIPHandler.ts
-index 559b907416eb38318f439d060d7f89311ed34c7e..8541b4b0ea0d6b451aaae49007d69df64c5bd088 100644
+index 559b907416eb38318f439d060d7f89311ed34c7e..73cedbe99f831bffd202697cc8ba80a46a39cb99 100644
 --- a/src/IIPHandler.ts
 +++ b/src/IIPHandler.ts
-@@ -34,6 +34,7 @@ const DEFAULT_HEADER: IHeaderFields = {
+@@ -13,8 +13,10 @@ import { imageType, UNSUPPORTED_TYPE } from './IIPMetrics';
+ 
+ // Local const enum mirror - esbuild can't inline const enums from external packages
+ const enum DecoderConst {
+-  // Limit held memory in base64 decoder (encoded bytes).
+-  KEEP_DATA = 4194304,
++  // Held memory in base64/QOI decoders between images. Zero because each kept
++  // decoder pins a wasm memory, and V8 caps those per process (~124 in a
++  // sandboxed renderer), so idle terminals must not hold one.
++  KEEP_DATA = 0,
+   // Initial buffer allocation for the decoder.
+   INITIAL_DATA = 1048576,
+   // Local mirror of const enum (esbuild can't inline const enums from external packages)
+@@ -34,6 +36,7 @@ const DEFAULT_HEADER: IHeaderFields = {
  
  
  export class IIPHandler implements IOscHandler, IResetHandler {
@@ -55,7 +68,7 @@ index 559b907416eb38318f439d060d7f89311ed34c7e..8541b4b0ea0d6b451aaae49007d69df6
    private _aborted = false;
    private _hp = new HeaderParser();
    private _header: IHeaderFields = DEFAULT_HEADER;
-@@ -55,6 +56,7 @@ export class IIPHandler implements IOscHandler, IResetHandler {
+@@ -55,6 +58,7 @@ export class IIPHandler implements IOscHandler, IResetHandler {
    }
  
    public reset(): void {
@@ -63,7 +76,47 @@ index 559b907416eb38318f439d060d7f89311ed34c7e..8541b4b0ea0d6b451aaae49007d69df6
      this._hp.reset();
      this._dec.release();
      this._qoiDec.release();
-@@ -198,8 +200,13 @@ export class IIPHandler implements IOscHandler, IResetHandler {
+@@ -92,7 +96,10 @@ export class IIPHandler implements IOscHandler, IResetHandler {
+             this._aborted = true;
+             return;
+           }
+-          this._dec.init();
++          if (!this._initDecoder()) {
++            this._aborted = true;
++            return;
++          }
+         } else if (this._abortMulti) {
+           this._aborted = true;
+           return;
+@@ -135,7 +142,9 @@ export class IIPHandler implements IOscHandler, IResetHandler {
+       this._isMultipart = true;
+       this._abortMulti = false;
+       this._dec.release();
+-      this._dec.init();
++      if (!this._initDecoder()) {
++        this._abortMulti = true;
++      }
+       return true;
+     }
+ 
+@@ -179,7 +188,15 @@ export class IIPHandler implements IOscHandler, IResetHandler {
+ 
+     let blob: Blob | ImageData;
+     if (metrics.mime === 'image/qoi') {
+-      const data = this._qoiDec.decode(this._dec.data8);
++      let data: Uint8Array<ArrayBuffer>;
++      try {
++        data = this._qoiDec.decode(this._dec.data8);
++      } catch (e) {
++        console.warn('IIP: could not decode QOI image', e);
++        this._dec.release();
++        this._qoiDec.release();
++        return true;
++      }
+       blob = new ImageData(
+         new Uint8ClampedArray(data.buffer, data.byteOffset, data.byteLength),
+         this._qoiDec.width,
+@@ -198,8 +215,13 @@ export class IIPHandler implements IOscHandler, IResetHandler {
        blob = new Blob([this._dec.data8], { type: metrics.mime });
      }
      this._dec.release();
@@ -77,6 +130,25 @@ index 559b907416eb38318f439d060d7f89311ed34c7e..8541b4b0ea0d6b451aaae49007d69df6
          this._storage.addImage(bm);
          return true;
        })
+@@ -209,6 +231,18 @@ export class IIPHandler implements IOscHandler, IResetHandler {
+       });
+   }
+ 
++  // Why: wasm memory exhaustion must drop this image, not throw out of the parser and wedge the write queue.
++  private _initDecoder(): boolean {
++    try {
++      this._dec.init();
++      return true;
++    } catch (e) {
++      console.warn('IIP: could not allocate decoder', e);
++      this._dec.release();
++      return false;
++    }
++  }
++
+   private _resize(w: number, h: number): [number, number] {
+     const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;
+     const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;
 diff --git a/src/ImageAddon.ts b/src/ImageAddon.ts
 index 8fd39543118cd420e36c1614c1af370b6c7bbfbb..0c44d2a81642113417bf8dc10a4faa76d7cc5864 100644
 --- a/src/ImageAddon.ts
@@ -189,8 +261,156 @@ index 5854efaec1fdf9dfcb886023542998a563b6d2f2..3afaf9bd63ffd7a4cdf32bf0ac24cf33
    }
  
    public get document(): Document | undefined {
+diff --git a/src/SixelHandler.ts b/src/SixelHandler.ts
+index 1af2d85bcdd541ed60b1e707f6186a91f1bbf1b2..0711a122ea43d5212a2851add9e744b65550ec85 100644
+--- a/src/SixelHandler.ts
++++ b/src/SixelHandler.ts
+@@ -10,6 +10,7 @@ import { RGBA8888 } from 'sixel/lib/Types';
+ import { ImageRenderer } from './ImageRenderer';
+ 
+ import { DecoderAsync, Decoder } from 'sixel/lib/Decoder';
++import { LIMITS } from 'sixel/lib/wasm';
+ 
+ // always free decoder ressources after decoding if it exceeds this limit
+ const MEM_PERMA_LIMIT = 4194304; // 1024 pixels * 1024 pixels * 4 channels = 4MB
+@@ -18,48 +19,88 @@ const MEM_PERMA_LIMIT = 4194304; // 1024 pixels * 1024 pixels * 4 channels = 4MB
+ const DEFAULT_PALETTE = PALETTE_ANSI_256;
+ DEFAULT_PALETTE.set(PALETTE_VT340_COLOR);
+ 
++// Why pooled: every decoder owns a wasm memory, and V8 caps live wasm memories
++// per process (~124 in a sandboxed renderer). Terminals borrow a decoder only
++// while a SIXEL sequence is open, so idle terminals hold none.
++const MAX_IDLE_DECODERS = 2;
++const idleDecoders = new Map<number, Decoder[]>();
++let poolPrimed = false;
++
++function primeDecoderPool(memoryLimit: number): void {
++  if (poolPrimed) return;
++  poolPrimed = true;
++  // Async compile once, off the parser's hot path; later decoders reuse the cached module.
++  DecoderAsync({ memoryLimit, palette: DEFAULT_PALETTE }).then(
++    d => releaseDecoder(d, memoryLimit),
++    () => { poolPrimed = false; }
++  );
++}
++
++function acquireDecoder(memoryLimit: number): Decoder {
++  return idleDecoders.get(memoryLimit)?.pop() ?? new Decoder({ memoryLimit, palette: DEFAULT_PALETTE });
++}
++
++function releaseDecoder(dec: Decoder, memoryLimit: number): void {
++  if (dec.memoryUsage > MEM_PERMA_LIMIT) {
++    dec.release();
++  }
++  const idle = idleDecoders.get(memoryLimit) ?? [];
++  if (idle.length < MAX_IDLE_DECODERS) {
++    idle.push(dec);
++    idleDecoders.set(memoryLimit, idle);
++  }
++}
++
+ 
+ export class SixelHandler implements IDcsHandler, IResetHandler {
+   private _size = 0;
+   private _aborted = false;
+   private _dec: Decoder | undefined;
++  private _decMemoryLimit = 0;
++  // Color registers outlive a single image, so they live here rather than in a pooled decoder.
++  private readonly _palette = new Uint32Array(LIMITS.PALETTE_SIZE);
+ 
+   constructor(
+     private readonly _opts: IImageAddonOptions,
+     private readonly _storage: SixelImageStorage,
+     private readonly _coreTerminal: ITerminalExt
+   ) {
+-    DecoderAsync({
+-      memoryLimit: this._opts.pixelLimit * 4,
+-      palette: DEFAULT_PALETTE,
+-      paletteLimit: this._opts.sixelPaletteLimit
+-    }).then(d => this._dec = d);
++    this._palette.set(DEFAULT_PALETTE);
++    primeDecoderPool(this._opts.pixelLimit * 4);
+   }
+ 
+   public reset(): void {
+-    /**
+-     * reset sixel decoder to defaults:
+-     * - release all memory
+-     * - nullify palette (4096)
+-     * - apply default palette (256)
+-     */
+-    if (this._dec) {
+-      this._dec.release();
+-      // FIXME: missing interface on decoder to nullify full palette
+-      (this._dec as any)._palette.fill(0);
+-      this._dec.init(0, DEFAULT_PALETTE, this._opts.sixelPaletteLimit);
+-    }
++    this._returnDecoder();
++    this._palette.fill(0);
++    this._palette.set(DEFAULT_PALETTE);
+   }
+ 
+   public hook(params: IParams): void {
+     this._size = 0;
+     this._aborted = false;
+-    if (this._dec) {
+-      const fillColor = params.params[1] === 1 ? 0 : extractActiveBg(
+-        this._coreTerminal._core._inputHandler._curAttrData,
+-        this._coreTerminal._core._themeService?.colors);
+-      this._dec.init(fillColor, null, this._opts.sixelPaletteLimit);
++    this._returnDecoder();
++    const memoryLimit = this._opts.pixelLimit * 4;
++    try {
++      this._dec = acquireDecoder(memoryLimit);
++    } catch (e) {
++      // Why: exhausting wasm memory must drop this image, not throw out of the parser and wedge the write queue.
++      console.warn(`SIXEL: could not allocate decoder - ${e}`);
++      this._aborted = true;
++      return;
+     }
++    this._decMemoryLimit = memoryLimit;
++    const fillColor = params.params[1] === 1 ? 0 : extractActiveBg(
++      this._coreTerminal._core._inputHandler._curAttrData,
++      this._coreTerminal._core._themeService?.colors);
++    this._dec.init(fillColor, this._palette, this._opts.sixelPaletteLimit);
++  }
++
++  private _returnDecoder(): void {
++    const dec = this._dec;
++    if (!dec) return;
++    this._dec = undefined;
++    this._palette.set(dec.palette);
++    releaseDecoder(dec, this._decMemoryLimit);
+   }
+ 
+   public put(data: Uint32Array, start: number, end: number): void {
+@@ -83,6 +124,14 @@ export class SixelHandler implements IDcsHandler, IResetHandler {
+   }
+ 
+   public unhook(success: boolean): boolean | Promise<boolean> {
++    try {
++      return this._unhook(success);
++    } finally {
++      this._returnDecoder();
++    }
++  }
++
++  private _unhook(success: boolean): boolean {
+     if (this._aborted || !success || !this._dec) {
+       return true;
+     }
+@@ -100,9 +149,6 @@ export class SixelHandler implements IDcsHandler, IResetHandler {
+ 
+     const canvas = ImageRenderer.createCanvas(undefined, width, height);
+     canvas.getContext('2d')?.putImageData(new ImageData(this._dec.data8 as Uint8ClampedArray<ArrayBuffer>, width, height), 0, 0);
+-    if (this._dec.memoryUsage > MEM_PERMA_LIMIT) {
+-      this._dec.release();
+-    }
+     this._storage.addImage(canvas);
+     return true;
+   }
 diff --git a/src/kitty/KittyGraphicsHandler.ts b/src/kitty/KittyGraphicsHandler.ts
-index de889dfff75d9ecc8ab47a025e6989ffe75bb202..54ebea9c061e5bb92b187cab7a53bc1fa320c4f8 100644
+index de889dfff75d9ecc8ab47a025e6989ffe75bb202..cf66e5b75c78645b1641e53d1425d88201134f78 100644
 --- a/src/kitty/KittyGraphicsHandler.ts
 +++ b/src/kitty/KittyGraphicsHandler.ts
 @@ -7,6 +7,7 @@ import { IDisposable } from '@xterm/xterm';
@@ -217,10 +437,12 @@ index de889dfff75d9ecc8ab47a025e6989ffe75bb202..54ebea9c061e5bb92b187cab7a53bc1f
      this._cleanupAllPending();
      if (this._activeDecoder) {
        this._activeDecoder.release();
-@@ -200,6 +203,25 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
+@@ -200,8 +203,38 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
        this._activeDecoder = pending.decoder;
      }
      if (!this._activeDecoder) {
+-      this._activeDecoder = new Base64Decoder(Constants.DECODER_KEEP_DATA, this._maxEncodedBytes, this._initialEncodedBytes);
+-      this._activeDecoder.init();
 +      // Budget WASM capacity, including one page of decoder state and rounding.
 +      const decoderCapacity = this._maxEncodedBytes + 131072;
 +      if (decoderCapacity > this._opts.storageLimit * 1000000) {
@@ -240,10 +462,23 @@ index de889dfff75d9ecc8ab47a025e6989ffe75bb202..54ebea9c061e5bb92b187cab7a53bc1f
 +          this._sendResponse(oldest[1].cmd.id, 'ENOMEM:pending image budget exceeded', oldest[1].cmd.quiet ?? 0);
 +        }
 +      }
-       this._activeDecoder = new Base64Decoder(Constants.DECODER_KEEP_DATA, this._maxEncodedBytes, this._initialEncodedBytes);
-       this._activeDecoder.init();
++      const decoder = new Base64Decoder(Constants.DECODER_KEEP_DATA, this._maxEncodedBytes, this._initialEncodedBytes);
++      try {
++        decoder.init();
++      } catch (e) {
++        // Why: wasm memory exhaustion must drop this image, not throw out of the parser and wedge the write queue.
++        console.warn('KITTY: could not allocate decoder', e);
++        this._aborted = true;
++        if (this._parsedCommand?.id !== undefined) {
++          this._sendResponse(this._parsedCommand.id, 'ENOMEM:could not allocate decoder', this._parsedCommand.quiet ?? 0);
++        }
++        return;
++      }
++      this._activeDecoder = decoder;
      }
-@@ -550,9 +572,11 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
+ 
+     if (this._activeDecoder.put(data.subarray(start, end)) !== DECODER_OK) {
+@@ -550,9 +583,11 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
    }
  
    private async _decodeAndDisplay(image: IKittyImageData, cmd: IKittyCommand): Promise<void> {
@@ -255,7 +490,7 @@ index de889dfff75d9ecc8ab47a025e6989ffe75bb202..54ebea9c061e5bb92b187cab7a53bc1f
        const cropX = Math.max(0, cmd.x ?? 0);
        const cropY = Math.max(0, cmd.y ?? 0);
        const cropW = cmd.sourceWidth || (bitmap.width - cropX);
-@@ -660,6 +684,7 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
+@@ -660,6 +695,7 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
          }
        }
  
@@ -263,7 +498,7 @@ index de889dfff75d9ecc8ab47a025e6989ffe75bb202..54ebea9c061e5bb92b187cab7a53bc1f
        const zIndex = cmd.zIndex ?? 0;
        this._kittyStorage.addImage(image.id, bitmap, true, layer, zIndex);
        bitmap = undefined;  // ownership transferred to storage
-@@ -693,6 +718,12 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
+@@ -693,6 +729,12 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
      }
  
      if (image.format === KittyFormat.PNG) {
@@ -276,7 +511,7 @@ index de889dfff75d9ecc8ab47a025e6989ffe75bb202..54ebea9c061e5bb92b187cab7a53bc1f
        const blob = new Blob([bytes as BlobPart], { type: 'image/png' });
        if (!window.createImageBitmap) {
          const url = URL.createObjectURL(blob);
-@@ -775,27 +806,45 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
+@@ -775,27 +817,45 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
    private async _decompressZlib(compressed: Uint8Array): Promise<Uint8Array> {
      try {
        return await this._decompress(compressed, 'deflate');
diff --git a/config/patches/i18next-cli@1.74.2.patch b/config/patches/i18next-cli@1.74.2.patch
new file mode 100644
index 000000000000..e4eb976d1ec7
--- /dev/null
+++ b/config/patches/i18next-cli@1.74.2.patch
@@ -0,0 +1,44 @@
+diff --git a/dist/cjs/extractor/core/extractor.js b/dist/cjs/extractor/core/extractor.js
+index 6d61ade2471c20bf1a253e3784bfadcb01440545..c1b001e78a215f89a8d4da1756a87562a5a6e723 100644
+--- a/dist/cjs/extractor/core/extractor.js
++++ b/dist/cjs/extractor/core/extractor.js
+@@ -143,6 +143,8 @@ const extractionSiteRegexes = new WeakMap();
+  * @internal
+  */
+ function mayContainExtractionSite(code, config) {
++    // Escaped identifiers need the parser; comments can separate a name from its call.
++    if (code.includes('\\u')) return true;
+     let re = extractionSiteRegexes.get(config);
+     if (!re) {
+         const calls = new Set(['t']);
+@@ -160,7 +162,7 @@ function mayContainExtractionSite(code, config) {
+         for (const component of config.extract.transComponents || ['Trans'])
+             names.add(component.split('.').pop());
+         const alt = (set) => [...set].map(s => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|');
+-        re = new RegExp(`(?<!\\w)(?:(?:${alt(calls)})\\s*(?:\\?\\.\\s*)?[(<]|(?:${alt(names)})(?![\\w$]))`);
++        re = new RegExp(`(?<![\\w$])(?:${alt(calls)}|${alt(names)})(?![\\w$])`);
+         extractionSiteRegexes.set(config, re);
+     }
+     return re.test(code);
+diff --git a/dist/esm/extractor/core/extractor.js b/dist/esm/extractor/core/extractor.js
+index 910bdb6e25e26c01ea6127191f1a00c7089693c1..00da4a6a7acb6c3da8d4b6fe7be106c409542f8d 100644
+--- a/dist/esm/extractor/core/extractor.js
++++ b/dist/esm/extractor/core/extractor.js
+@@ -141,6 +141,8 @@ const extractionSiteRegexes = new WeakMap();
+  * @internal
+  */
+ function mayContainExtractionSite(code, config) {
++    // Escaped identifiers need the parser; comments can separate a name from its call.
++    if (code.includes('\\u')) return true;
+     let re = extractionSiteRegexes.get(config);
+     if (!re) {
+         const calls = new Set(['t']);
+@@ -158,7 +160,7 @@ function mayContainExtractionSite(code, config) {
+         for (const component of config.extract.transComponents || ['Trans'])
+             names.add(component.split('.').pop());
+         const alt = (set) => [...set].map(s => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|');
+-        re = new RegExp(`(?<!\\w)(?:(?:${alt(calls)})\\s*(?:\\?\\.\\s*)?[(<]|(?:${alt(names)})(?![\\w$]))`);
++        re = new RegExp(`(?<![\\w$])(?:${alt(calls)}|${alt(names)})(?![\\w$])`);
+         extractionSiteRegexes.set(config, re);
+     }
+     return re.test(code);
diff --git a/config/patches/node-pty@1.1.0.patch b/config/patches/node-pty@1.1.0.patch
index d36bf36b63f5..40b240f3296c 100644
--- a/config/patches/node-pty@1.1.0.patch
+++ b/config/patches/node-pty@1.1.0.patch
@@ -707,7 +707,7 @@ index 98733dc0cd752b554bd94e45904ca341ad141bba..3dd5ad9b3124dbd5ba7f76679b26650d
            // Stop processing immediately on unexpected error and log
            this._writeQueue.length = 0;
 diff --git a/src/win/conpty.cc b/src/win/conpty.cc
-index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c6678cf86 100644
+index 7b286d3d64..5239ba4e40 100644
 --- a/src/win/conpty.cc
 +++ b/src/win/conpty.cc
 @@ -18,6 +18,7 @@
@@ -718,7 +718,7 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
  #include <vector>
  #include <Windows.h>
  #include <strsafe.h>
-@@ -44,12 +45,40 @@ struct pty_baton {
+@@ -44,15 +45,37 @@ struct pty_baton {
    HANDLE hOut;
    HPCON hpc;
  
@@ -749,18 +749,25 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
  };
  
  static std::vector<std::unique_ptr<pty_baton>> ptyHandles;
-+// Orca: guards the job accessors below, and PtyKill, against the exit watcher
-+// thread. It does NOT make the whole table safe -- PtyResize and PtyClear still
-+// read it unlocked, as they always have -- but it closes the window this patch
-+// opened, where the watcher can close hShell/hJob and free the baton between a
-+// lookup and its use.
-+// Handle VALUES are recycled aggressively, so an unguarded read could pass the
-+// shell-pid check against an unrelated process and terminate the wrong job.
++// Orca: every table access shares the exit watcher's lock; handles can be recycled.
 +static std::mutex ptyJobMutex;
  static volatile LONG ptyCounter;
  
- static pty_baton* get_pty_baton(int id) {
-@@ -102,8 +131,31 @@ void SetupExitCallback(Napi::Env env, Napi::Function cb, pty_baton* baton) {
+-static pty_baton* get_pty_baton(int id) {
++static pty_baton* get_pty_baton_locked(int id) {
+   auto it = std::find_if(ptyHandles.begin(), ptyHandles.end(), [id](const auto& ptyHandle) {
+     return ptyHandle->id == id;
+   });
+@@ -62,7 +85,7 @@ static pty_baton* get_pty_baton(int id) {
+   return nullptr;
+ }
+ 
+-static bool remove_pty_baton(int id) {
++static bool remove_pty_baton_locked(int id) {
+   auto it = std::remove_if(ptyHandles.begin(), ptyHandles.end(), [id](const auto& ptyHandle) {
+     return ptyHandle->id == id;
+   });
+@@ -102,8 +125,31 @@ void SetupExitCallback(Napi::Env env, Napi::Function cb, pty_baton* baton) {
      // Get process exit code.
      GetExitCodeProcess(baton->hShell, (LPDWORD)(&exit_event->exit_code));
      // Clean up handles
@@ -782,7 +789,7 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
 +      // NDEBUG would compile the call away and leak every baton.
 +      baton->shellExited = true;
 +      if (baton->consoleClosed) {
-+        const bool removed = remove_pty_baton(baton->id);
++        const bool removed = remove_pty_baton_locked(baton->id);
 +        assert(removed);
 +        (void)removed;
 +      }
@@ -794,7 +801,7 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
  
      auto status = tsfn.BlockingCall(exit_event, callback); // In main thread
      switch (status) {
-@@ -242,6 +294,20 @@
+@@ -242,6 +288,20 @@ HRESULT CreateNamedPipesAndPseudoConsole(const Napi::CallbackInfo& info,
    return HRESULT_FROM_WIN32(GetLastError());
  }
  
@@ -815,15 +822,40 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
  static Napi::Value PtyStartProcess(const Napi::CallbackInfo& info) {
    Napi::Env env(info.Env());
    Napi::HandleScope scope(env);
-@@ -303,6 +369,7 @@
+@@ -301,8 +361,10 @@ static Napi::Value PtyStartProcess(const Napi::CallbackInfo& info) {
+     // We were able to instantiate a conpty
+     const int ptyId = InterlockedIncrement(&ptyCounter);
      marshal.Set("pty", Napi::Number::New(env, ptyId));
-     ptyHandles.emplace_back(
-         std::make_unique<pty_baton>(ptyId, hIn, hOut, hpc));
-+    ptyHandles.back()->allowJobBreakaway = !usesCygwinRuntime(shellpath);
+-    ptyHandles.emplace_back(
+-        std::make_unique<pty_baton>(ptyId, hIn, hOut, hpc));
++    auto baton = std::make_unique<pty_baton>(ptyId, hIn, hOut, hpc);
++    baton->allowJobBreakaway = !usesCygwinRuntime(shellpath);
++    std::lock_guard<std::mutex> guard(ptyJobMutex);
++    ptyHandles.emplace_back(std::move(baton));
    } else {
      throw Napi::Error::New(env, "Cannot launch conpty");
    }
-@@ -409,6 +476,15 @@ static Napi::Value PtyConnect(const Napi::CallbackInfo& info) {
+@@ -350,11 +412,15 @@ static Napi::Value PtyConnect(const Napi::CallbackInfo& info) {
+   const bool useConptyDll = info[4].As<Napi::Boolean>().Value();
+   Napi::Function exitCallback = info[5].As<Napi::Function>();
+ 
+-  // Fetch pty handle from ID and start process
+-  pty_baton* handle = get_pty_baton(id);
+-  if (!handle) {
+-    throw Napi::Error::New(env, "Invalid pty handle");
++  pty_baton* handle;
++  {
++    std::lock_guard<std::mutex> guard(ptyJobMutex);
++    handle = get_pty_baton_locked(id);
++    if (!handle || handle->consoleClosed) {
++      throw Napi::Error::New(env, "Invalid pty handle");
++    }
+   }
++  // No watcher exists for this baton until SetupExitCallback below; pipe waits stay unlocked.
+ 
+   // Prepare command line
+   std::unique_ptr<wchar_t[]> mutableCommandline = std::make_unique<wchar_t[]>(cmdline.length() + 1);
+@@ -409,6 +475,15 @@ static Napi::Value PtyConnect(const Napi::CallbackInfo& info) {
      throw errorWithCode(info, "UpdateProcThreadAttribute failed");
    }
  
@@ -839,7 +871,7 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
    PROCESS_INFORMATION piClient{};
    fSuccess = !!CreateProcessW(
        nullptr,
-@@ -416,7 +492,10 @@ static Napi::Value PtyConnect(const Napi::CallbackInfo& info) {
+@@ -416,7 +491,10 @@ static Napi::Value PtyConnect(const Napi::CallbackInfo& info) {
        nullptr,                      // lpProcessAttributes
        nullptr,                      // lpThreadAttributes
        false,                        // bInheritHandles VERY IMPORTANT that this is false
@@ -851,7 +883,7 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
        envArg,                       // lpEnvironment
        mutableCwd.get(),             // lpCurrentDirectory
        &siEx.StartupInfo,            // lpStartupInfo
-@@ -426,8 +505,48 @@ static Napi::Value PtyConnect(const Napi::CallbackInfo& info) {
+@@ -426,8 +504,48 @@ static Napi::Value PtyConnect(const Napi::CallbackInfo& info) {
      throw errorWithCode(info, "Cannot create process");
    }
  
@@ -902,25 +934,52 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
    if (useConptyDll && fLoadedDll)
    {
      PFNRELEASEPSEUDOCONSOLE const pfnReleasePseudoConsole = (PFNRELEASEPSEUDOCONSOLE)GetProcAddress(
-@@ -440,6 +559,8 @@ static Napi::Value PtyConnect(const Napi::CallbackInfo& info) {
+@@ -438,8 +556,12 @@ static Napi::Value PtyConnect(const Napi::CallbackInfo& info) {
+     }
+   }
  
-   // Update handle
-   handle->hShell = piClient.hProcess;
-+  handle->shellPid = piClient.dwProcessId;
-+  handle->hJob = hJob;
+-  // Update handle
+-  handle->hShell = piClient.hProcess;
++  {
++    std::lock_guard<std::mutex> guard(ptyJobMutex);
++    handle->hShell = piClient.hProcess;
++    handle->shellPid = piClient.dwProcessId;
++    handle->hJob = hJob;
++  }
  
    // Close the thread handle to avoid resource leak
    CloseHandle(piClient.hThread);
-@@ -544,27 +665,213 @@ static Napi::Value PtyKill(const Napi::CallbackInfo& info) {
+@@ -472,9 +594,10 @@ static Napi::Value PtyResize(const Napi::CallbackInfo& info) {
+   SHORT rows = static_cast<SHORT>(info[2].As<Napi::Number>().Uint32Value());
+   const bool useConptyDll = info[3].As<Napi::Boolean>().Value();
+ 
+-  const pty_baton* handle = get_pty_baton(id);
++  std::lock_guard<std::mutex> guard(ptyJobMutex);
++  const pty_baton* handle = get_pty_baton_locked(id);
+ 
+-  if (handle != nullptr) {
++  if (handle != nullptr && !handle->consoleClosed) {
+     HANDLE hLibrary = LoadConptyDll(info, useConptyDll);
+     bool fLoadedDll = hLibrary != nullptr;
+     if (fLoadedDll)
+@@ -513,9 +636,10 @@ static Napi::Value PtyClear(const Napi::CallbackInfo& info) {
+     return env.Undefined();
+   }
+ 
+-  const pty_baton* handle = get_pty_baton(id);
++  std::lock_guard<std::mutex> guard(ptyJobMutex);
++  const pty_baton* handle = get_pty_baton_locked(id);
+ 
+-  if (handle != nullptr) {
++  if (handle != nullptr && !handle->consoleClosed) {
+     HANDLE hLibrary = LoadConptyDll(info, useConptyDll);
+     bool fLoadedDll = hLibrary != nullptr;
+     if (fLoadedDll)
+@@ -544,29 +668,215 @@ static Napi::Value PtyKill(const Napi::CallbackInfo& info) {
    int id = info[0].As<Napi::Number>().Int32Value();
    const bool useConptyDll = info[1].As<Napi::Boolean>().Value();
  
 -  const pty_baton* handle = get_pty_baton(id);
--
--  if (handle != nullptr) {
--    HANDLE hLibrary = LoadConptyDll(info, useConptyDll);
--    bool fLoadedDll = hLibrary != nullptr;
--    if (fLoadedDll)
 +  // Orca: resolve the DLL BEFORE touching any baton state, for the same reason
 +  // PtyConnect does it before creating anything. LoadConptyDll throws when
 +  // conpty.dll is missing, and a throw after consoleClosed was set would strand
@@ -934,7 +993,18 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
 +      (HMODULE)hLibrary,
 +      useConptyDll ? "ConptyClosePseudoConsole" : "ClosePseudoConsole");
 +  }
-+
+ 
+-  if (handle != nullptr) {
+-    HANDLE hLibrary = LoadConptyDll(info, useConptyDll);
+-    bool fLoadedDll = hLibrary != nullptr;
+-    if (fLoadedDll)
+-    {
+-      PFNCLOSEPSEUDOCONSOLE const pfnClosePseudoConsole = (PFNCLOSEPSEUDOCONSOLE)GetProcAddress(
+-        (HMODULE)hLibrary,
+-        useConptyDll ? "ConptyClosePseudoConsole" : "ClosePseudoConsole");
+-      if (pfnClosePseudoConsole)
+-      {
+-        pfnClosePseudoConsole(handle->hpc);
 +  // Orca: the baton now outlives the shell, so this runs on a self-exited pty
 +  // too -- that is the whole point. Take what we need under the lock: the
 +  // watcher thread nulls hShell the moment the shell dies, and TerminateProcess
@@ -945,7 +1015,7 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
 +  bool owed = false;
 +  {
 +    std::lock_guard<std::mutex> guard(ptyJobMutex);
-+    pty_baton* handle = get_pty_baton(id);
++    pty_baton* handle = get_pty_baton_locked(id);
 +    // Why the consoleClosed check: a second kill() would otherwise close the
 +    // same pseudoconsole twice. Upstream relied on the baton being gone.
 +    if (handle != nullptr && !handle->consoleClosed) {
@@ -965,9 +1035,9 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
 +          hShellDup = nullptr;
 +          TerminateProcess(handle->hShell, 1);
 +        }
-+      }
+       }
 +      if (handle->shellExited) {
-+        const bool removed = remove_pty_baton(id);
++        const bool removed = remove_pty_baton_locked(id);
 +        assert(removed);
 +        (void)removed;
 +      }
@@ -979,19 +1049,11 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
 +  // drained, and the watcher must be able to take the lock while it does.
 +  if (owed) {
 +    if (pfnClosePseudoConsole)
-     {
--      PFNCLOSEPSEUDOCONSOLE const pfnClosePseudoConsole = (PFNCLOSEPSEUDOCONSOLE)GetProcAddress(
--        (HMODULE)hLibrary,
--        useConptyDll ? "ConptyClosePseudoConsole" : "ClosePseudoConsole");
--      if (pfnClosePseudoConsole)
--      {
--        pfnClosePseudoConsole(handle->hpc);
--      }
--    }
++    {
++      pfnClosePseudoConsole(hpc);
+     }
 -    if (useConptyDll) {
 -      TerminateProcess(handle->hShell, 1);
-+      pfnClosePseudoConsole(hpc);
-+    }
 +    if (hShellDup != nullptr) {
 +      TerminateProcess(hShellDup, 1);
 +      CloseHandle(hShellDup);
@@ -999,8 +1061,8 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
    }
  
    return env.Undefined();
-+}
-+
+ }
+ 
 +/**
 + * Orca: confirm a baton really is the pty the caller means.
 + *
@@ -1032,7 +1094,7 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
 +  // Held across the lookup AND the Win32 call: the watcher thread can otherwise
 +  // close these handles and free the baton in between.
 +  std::lock_guard<std::mutex> guard(ptyJobMutex);
-+  const pty_baton* handle = get_pty_baton(info[0].As<Napi::Number>().Int32Value());
++  const pty_baton* handle = get_pty_baton_locked(info[0].As<Napi::Number>().Int32Value());
 +  if (!ownsShell(handle, info[1].As<Napi::Number>().Uint32Value())) {
 +    return Napi::Boolean::New(env, false);
 +  }
@@ -1064,7 +1126,7 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
 +  // Held across the lookup AND the Win32 call: the watcher thread can otherwise
 +  // close these handles and free the baton in between.
 +  std::lock_guard<std::mutex> guard(ptyJobMutex);
-+  const pty_baton* handle = get_pty_baton(info[0].As<Napi::Number>().Int32Value());
++  const pty_baton* handle = get_pty_baton_locked(info[0].As<Napi::Number>().Int32Value());
 +  if (!ownsShell(handle, info[1].As<Napi::Number>().Uint32Value())) {
 +    return env.Null();
 +  }
@@ -1138,10 +1200,12 @@ index 7b286d3d644c26141df516929703aa6e129df4b2..4b06d18576c807c3d1181a7bd714140c
 +  }
 +  hHostJob = job;
 +  return Napi::Boolean::New(env, true);
- }
- 
++}
++
  /**
-@@ -577,6 +884,9 @@ Napi::Object init(Napi::Env env, Napi::Object exports) {
+ * Init
+ */
+@@ -577,6 +887,9 @@ Napi::Object init(Napi::Env env, Napi::Object exports) {
    exports.Set("resize", Napi::Function::New(env, PtyResize));
    exports.Set("clear", Napi::Function::New(env, PtyClear));
    exports.Set("kill", Napi::Function::New(env, PtyKill));
diff --git a/config/patches/xterm-src/@xterm__addon-image@0.10.0-beta.300.src.patch b/config/patches/xterm-src/@xterm__addon-image@0.10.0-beta.300.src.patch
index 2c5aa15fac15..3b581c30477d 100644
--- a/config/patches/xterm-src/@xterm__addon-image@0.10.0-beta.300.src.patch
+++ b/config/patches/xterm-src/@xterm__addon-image@0.10.0-beta.300.src.patch
@@ -1,8 +1,21 @@
 diff --git a/src/IIPHandler.ts b/src/IIPHandler.ts
-index 559b907416eb38318f439d060d7f89311ed34c7e..8541b4b0ea0d6b451aaae49007d69df64c5bd088 100644
+index 559b907416eb38318f439d060d7f89311ed34c7e..73cedbe99f831bffd202697cc8ba80a46a39cb99 100644
 --- a/src/IIPHandler.ts
 +++ b/src/IIPHandler.ts
-@@ -34,6 +34,7 @@ const DEFAULT_HEADER: IHeaderFields = {
+@@ -13,8 +13,10 @@ import { imageType, UNSUPPORTED_TYPE } from './IIPMetrics';
+ 
+ // Local const enum mirror - esbuild can't inline const enums from external packages
+ const enum DecoderConst {
+-  // Limit held memory in base64 decoder (encoded bytes).
+-  KEEP_DATA = 4194304,
++  // Held memory in base64/QOI decoders between images. Zero because each kept
++  // decoder pins a wasm memory, and V8 caps those per process (~124 in a
++  // sandboxed renderer), so idle terminals must not hold one.
++  KEEP_DATA = 0,
+   // Initial buffer allocation for the decoder.
+   INITIAL_DATA = 1048576,
+   // Local mirror of const enum (esbuild can't inline const enums from external packages)
+@@ -34,6 +36,7 @@ const DEFAULT_HEADER: IHeaderFields = {
  
  
  export class IIPHandler implements IOscHandler, IResetHandler {
@@ -10,7 +23,7 @@ index 559b907416eb38318f439d060d7f89311ed34c7e..8541b4b0ea0d6b451aaae49007d69df6
    private _aborted = false;
    private _hp = new HeaderParser();
    private _header: IHeaderFields = DEFAULT_HEADER;
-@@ -55,6 +56,7 @@ export class IIPHandler implements IOscHandler, IResetHandler {
+@@ -55,6 +58,7 @@ export class IIPHandler implements IOscHandler, IResetHandler {
    }
  
    public reset(): void {
@@ -18,7 +31,47 @@ index 559b907416eb38318f439d060d7f89311ed34c7e..8541b4b0ea0d6b451aaae49007d69df6
      this._hp.reset();
      this._dec.release();
      this._qoiDec.release();
-@@ -198,8 +200,13 @@ export class IIPHandler implements IOscHandler, IResetHandler {
+@@ -92,7 +96,10 @@ export class IIPHandler implements IOscHandler, IResetHandler {
+             this._aborted = true;
+             return;
+           }
+-          this._dec.init();
++          if (!this._initDecoder()) {
++            this._aborted = true;
++            return;
++          }
+         } else if (this._abortMulti) {
+           this._aborted = true;
+           return;
+@@ -135,7 +142,9 @@ export class IIPHandler implements IOscHandler, IResetHandler {
+       this._isMultipart = true;
+       this._abortMulti = false;
+       this._dec.release();
+-      this._dec.init();
++      if (!this._initDecoder()) {
++        this._abortMulti = true;
++      }
+       return true;
+     }
+ 
+@@ -179,7 +188,15 @@ export class IIPHandler implements IOscHandler, IResetHandler {
+ 
+     let blob: Blob | ImageData;
+     if (metrics.mime === 'image/qoi') {
+-      const data = this._qoiDec.decode(this._dec.data8);
++      let data: Uint8Array<ArrayBuffer>;
++      try {
++        data = this._qoiDec.decode(this._dec.data8);
++      } catch (e) {
++        console.warn('IIP: could not decode QOI image', e);
++        this._dec.release();
++        this._qoiDec.release();
++        return true;
++      }
+       blob = new ImageData(
+         new Uint8ClampedArray(data.buffer, data.byteOffset, data.byteLength),
+         this._qoiDec.width,
+@@ -198,8 +215,13 @@ export class IIPHandler implements IOscHandler, IResetHandler {
        blob = new Blob([this._dec.data8], { type: metrics.mime });
      }
      this._dec.release();
@@ -32,6 +85,25 @@ index 559b907416eb38318f439d060d7f89311ed34c7e..8541b4b0ea0d6b451aaae49007d69df6
          this._storage.addImage(bm);
          return true;
        })
+@@ -209,6 +231,18 @@ export class IIPHandler implements IOscHandler, IResetHandler {
+       });
+   }
+ 
++  // Why: wasm memory exhaustion must drop this image, not throw out of the parser and wedge the write queue.
++  private _initDecoder(): boolean {
++    try {
++      this._dec.init();
++      return true;
++    } catch (e) {
++      console.warn('IIP: could not allocate decoder', e);
++      this._dec.release();
++      return false;
++    }
++  }
++
+   private _resize(w: number, h: number): [number, number] {
+     const cw = this._renderer.dimensions?.css.cell.width || CELL_SIZE_DEFAULT.width;
+     const ch = this._renderer.dimensions?.css.cell.height || CELL_SIZE_DEFAULT.height;
 diff --git a/src/ImageAddon.ts b/src/ImageAddon.ts
 index 8fd39543118cd420e36c1614c1af370b6c7bbfbb..0c44d2a81642113417bf8dc10a4faa76d7cc5864 100644
 --- a/src/ImageAddon.ts
@@ -144,8 +216,156 @@ index 5854efaec1fdf9dfcb886023542998a563b6d2f2..3afaf9bd63ffd7a4cdf32bf0ac24cf33
    }
  
    public get document(): Document | undefined {
+diff --git a/src/SixelHandler.ts b/src/SixelHandler.ts
+index 1af2d85bcdd541ed60b1e707f6186a91f1bbf1b2..0711a122ea43d5212a2851add9e744b65550ec85 100644
+--- a/src/SixelHandler.ts
++++ b/src/SixelHandler.ts
+@@ -10,6 +10,7 @@ import { RGBA8888 } from 'sixel/lib/Types';
+ import { ImageRenderer } from './ImageRenderer';
+ 
+ import { DecoderAsync, Decoder } from 'sixel/lib/Decoder';
++import { LIMITS } from 'sixel/lib/wasm';
+ 
+ // always free decoder ressources after decoding if it exceeds this limit
+ const MEM_PERMA_LIMIT = 4194304; // 1024 pixels * 1024 pixels * 4 channels = 4MB
+@@ -18,48 +19,88 @@ const MEM_PERMA_LIMIT = 4194304; // 1024 pixels * 1024 pixels * 4 channels = 4MB
+ const DEFAULT_PALETTE = PALETTE_ANSI_256;
+ DEFAULT_PALETTE.set(PALETTE_VT340_COLOR);
+ 
++// Why pooled: every decoder owns a wasm memory, and V8 caps live wasm memories
++// per process (~124 in a sandboxed renderer). Terminals borrow a decoder only
++// while a SIXEL sequence is open, so idle terminals hold none.
++const MAX_IDLE_DECODERS = 2;
++const idleDecoders = new Map<number, Decoder[]>();
++let poolPrimed = false;
++
++function primeDecoderPool(memoryLimit: number): void {
++  if (poolPrimed) return;
++  poolPrimed = true;
++  // Async compile once, off the parser's hot path; later decoders reuse the cached module.
++  DecoderAsync({ memoryLimit, palette: DEFAULT_PALETTE }).then(
++    d => releaseDecoder(d, memoryLimit),
++    () => { poolPrimed = false; }
++  );
++}
++
++function acquireDecoder(memoryLimit: number): Decoder {
++  return idleDecoders.get(memoryLimit)?.pop() ?? new Decoder({ memoryLimit, palette: DEFAULT_PALETTE });
++}
++
++function releaseDecoder(dec: Decoder, memoryLimit: number): void {
++  if (dec.memoryUsage > MEM_PERMA_LIMIT) {
++    dec.release();
++  }
++  const idle = idleDecoders.get(memoryLimit) ?? [];
++  if (idle.length < MAX_IDLE_DECODERS) {
++    idle.push(dec);
++    idleDecoders.set(memoryLimit, idle);
++  }
++}
++
+ 
+ export class SixelHandler implements IDcsHandler, IResetHandler {
+   private _size = 0;
+   private _aborted = false;
+   private _dec: Decoder | undefined;
++  private _decMemoryLimit = 0;
++  // Color registers outlive a single image, so they live here rather than in a pooled decoder.
++  private readonly _palette = new Uint32Array(LIMITS.PALETTE_SIZE);
+ 
+   constructor(
+     private readonly _opts: IImageAddonOptions,
+     private readonly _storage: SixelImageStorage,
+     private readonly _coreTerminal: ITerminalExt
+   ) {
+-    DecoderAsync({
+-      memoryLimit: this._opts.pixelLimit * 4,
+-      palette: DEFAULT_PALETTE,
+-      paletteLimit: this._opts.sixelPaletteLimit
+-    }).then(d => this._dec = d);
++    this._palette.set(DEFAULT_PALETTE);
++    primeDecoderPool(this._opts.pixelLimit * 4);
+   }
+ 
+   public reset(): void {
+-    /**
+-     * reset sixel decoder to defaults:
+-     * - release all memory
+-     * - nullify palette (4096)
+-     * - apply default palette (256)
+-     */
+-    if (this._dec) {
+-      this._dec.release();
+-      // FIXME: missing interface on decoder to nullify full palette
+-      (this._dec as any)._palette.fill(0);
+-      this._dec.init(0, DEFAULT_PALETTE, this._opts.sixelPaletteLimit);
+-    }
++    this._returnDecoder();
++    this._palette.fill(0);
++    this._palette.set(DEFAULT_PALETTE);
+   }
+ 
+   public hook(params: IParams): void {
+     this._size = 0;
+     this._aborted = false;
+-    if (this._dec) {
+-      const fillColor = params.params[1] === 1 ? 0 : extractActiveBg(
+-        this._coreTerminal._core._inputHandler._curAttrData,
+-        this._coreTerminal._core._themeService?.colors);
+-      this._dec.init(fillColor, null, this._opts.sixelPaletteLimit);
++    this._returnDecoder();
++    const memoryLimit = this._opts.pixelLimit * 4;
++    try {
++      this._dec = acquireDecoder(memoryLimit);
++    } catch (e) {
++      // Why: exhausting wasm memory must drop this image, not throw out of the parser and wedge the write queue.
++      console.warn(`SIXEL: could not allocate decoder - ${e}`);
++      this._aborted = true;
++      return;
+     }
++    this._decMemoryLimit = memoryLimit;
++    const fillColor = params.params[1] === 1 ? 0 : extractActiveBg(
++      this._coreTerminal._core._inputHandler._curAttrData,
++      this._coreTerminal._core._themeService?.colors);
++    this._dec.init(fillColor, this._palette, this._opts.sixelPaletteLimit);
++  }
++
++  private _returnDecoder(): void {
++    const dec = this._dec;
++    if (!dec) return;
++    this._dec = undefined;
++    this._palette.set(dec.palette);
++    releaseDecoder(dec, this._decMemoryLimit);
+   }
+ 
+   public put(data: Uint32Array, start: number, end: number): void {
+@@ -83,6 +124,14 @@ export class SixelHandler implements IDcsHandler, IResetHandler {
+   }
+ 
+   public unhook(success: boolean): boolean | Promise<boolean> {
++    try {
++      return this._unhook(success);
++    } finally {
++      this._returnDecoder();
++    }
++  }
++
++  private _unhook(success: boolean): boolean {
+     if (this._aborted || !success || !this._dec) {
+       return true;
+     }
+@@ -100,9 +149,6 @@ export class SixelHandler implements IDcsHandler, IResetHandler {
+ 
+     const canvas = ImageRenderer.createCanvas(undefined, width, height);
+     canvas.getContext('2d')?.putImageData(new ImageData(this._dec.data8 as Uint8ClampedArray<ArrayBuffer>, width, height), 0, 0);
+-    if (this._dec.memoryUsage > MEM_PERMA_LIMIT) {
+-      this._dec.release();
+-    }
+     this._storage.addImage(canvas);
+     return true;
+   }
 diff --git a/src/kitty/KittyGraphicsHandler.ts b/src/kitty/KittyGraphicsHandler.ts
-index de889dfff75d9ecc8ab47a025e6989ffe75bb202..54ebea9c061e5bb92b187cab7a53bc1fa320c4f8 100644
+index de889dfff75d9ecc8ab47a025e6989ffe75bb202..cf66e5b75c78645b1641e53d1425d88201134f78 100644
 --- a/src/kitty/KittyGraphicsHandler.ts
 +++ b/src/kitty/KittyGraphicsHandler.ts
 @@ -7,6 +7,7 @@ import { IDisposable } from '@xterm/xterm';
@@ -172,10 +392,12 @@ index de889dfff75d9ecc8ab47a025e6989ffe75bb202..54ebea9c061e5bb92b187cab7a53bc1f
      this._cleanupAllPending();
      if (this._activeDecoder) {
        this._activeDecoder.release();
-@@ -200,6 +203,25 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
+@@ -200,8 +203,38 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
        this._activeDecoder = pending.decoder;
      }
      if (!this._activeDecoder) {
+-      this._activeDecoder = new Base64Decoder(Constants.DECODER_KEEP_DATA, this._maxEncodedBytes, this._initialEncodedBytes);
+-      this._activeDecoder.init();
 +      // Budget WASM capacity, including one page of decoder state and rounding.
 +      const decoderCapacity = this._maxEncodedBytes + 131072;
 +      if (decoderCapacity > this._opts.storageLimit * 1000000) {
@@ -195,10 +417,23 @@ index de889dfff75d9ecc8ab47a025e6989ffe75bb202..54ebea9c061e5bb92b187cab7a53bc1f
 +          this._sendResponse(oldest[1].cmd.id, 'ENOMEM:pending image budget exceeded', oldest[1].cmd.quiet ?? 0);
 +        }
 +      }
-       this._activeDecoder = new Base64Decoder(Constants.DECODER_KEEP_DATA, this._maxEncodedBytes, this._initialEncodedBytes);
-       this._activeDecoder.init();
++      const decoder = new Base64Decoder(Constants.DECODER_KEEP_DATA, this._maxEncodedBytes, this._initialEncodedBytes);
++      try {
++        decoder.init();
++      } catch (e) {
++        // Why: wasm memory exhaustion must drop this image, not throw out of the parser and wedge the write queue.
++        console.warn('KITTY: could not allocate decoder', e);
++        this._aborted = true;
++        if (this._parsedCommand?.id !== undefined) {
++          this._sendResponse(this._parsedCommand.id, 'ENOMEM:could not allocate decoder', this._parsedCommand.quiet ?? 0);
++        }
++        return;
++      }
++      this._activeDecoder = decoder;
      }
-@@ -550,9 +572,11 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
+ 
+     if (this._activeDecoder.put(data.subarray(start, end)) !== DECODER_OK) {
+@@ -550,9 +583,11 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
    }
  
    private async _decodeAndDisplay(image: IKittyImageData, cmd: IKittyCommand): Promise<void> {
@@ -210,7 +445,7 @@ index de889dfff75d9ecc8ab47a025e6989ffe75bb202..54ebea9c061e5bb92b187cab7a53bc1f
        const cropX = Math.max(0, cmd.x ?? 0);
        const cropY = Math.max(0, cmd.y ?? 0);
        const cropW = cmd.sourceWidth || (bitmap.width - cropX);
-@@ -660,6 +684,7 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
+@@ -660,6 +695,7 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
          }
        }
  
@@ -218,7 +453,7 @@ index de889dfff75d9ecc8ab47a025e6989ffe75bb202..54ebea9c061e5bb92b187cab7a53bc1f
        const zIndex = cmd.zIndex ?? 0;
        this._kittyStorage.addImage(image.id, bitmap, true, layer, zIndex);
        bitmap = undefined;  // ownership transferred to storage
-@@ -693,6 +718,12 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
+@@ -693,6 +729,12 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
      }
  
      if (image.format === KittyFormat.PNG) {
@@ -231,7 +466,7 @@ index de889dfff75d9ecc8ab47a025e6989ffe75bb202..54ebea9c061e5bb92b187cab7a53bc1f
        const blob = new Blob([bytes as BlobPart], { type: 'image/png' });
        if (!window.createImageBitmap) {
          const url = URL.createObjectURL(blob);
-@@ -775,27 +806,45 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
+@@ -775,27 +817,45 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
    private async _decompressZlib(compressed: Uint8Array): Promise<Uint8Array> {
      try {
        return await this._decompress(compressed, 'deflate');
diff --git a/config/reliability-gates.jsonc b/config/reliability-gates.jsonc
index faab9baee825..5d06529a44e8 100644
--- a/config/reliability-gates.jsonc
+++ b/config/reliability-gates.jsonc
@@ -10,6 +10,94 @@
     }
   },
   "gates": [
+    {
+      "id": "terminal-preview.connection-settings-ownership",
+      "title": "Terminal preview connections survive unrelated settings updates",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "terminal-runtime",
+      "layer": "renderer-unit",
+      "surfaces": [
+        "dashboard terminal preview connection",
+        "preview settings updates",
+        "preview box fit and grid claim"
+      ],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["local", "daemon", "ssh", "wsl", "remote-runtime"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": ["local", "remote-runtime"],
+      "coverageNotes": "Mounted production component and real settings action with cloned IPC replies, inert xterm/input adapters, and simulated metrics. Local/remote-qualified renderer identities covered; no physical provider, native geometry, focus, IME or rendered app claim. Subsequent hidden/offscreen Electron component proof uses real xterm and synthetic snapshots, preserving the rendered terminal across unrelated updates and measuring equivalent fallback scale/fit requests after a font-size change.",
+      "motivatingLinks": [
+        "https://github.com/stablyai/orca/blob/main/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.tsx",
+        "https://github.com/stablyai/orca/pull/23099"
+      ],
+      "invariant": "Equal composed theme with unchanged PTY, mode, contrast and font/shaping settings keeps the current preview owner. Relevant changes replace it once, preserve explicit fit/grid negotiation, and reject retired pending completions.",
+      "oracle": "Ten unrelated settings replies produce one connect and xterm construction, no pre-unmount teardown, then one final cleanup. Changed colors/mode/contrast/font/shaping replace owners; pending retired connections never construct and obsolete grid claims are canceled.",
+      "commands": [
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-lifetime.test.tsx src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-geometry.test.tsx src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx src/renderer/src/components/dashboard-popout/AgentTerminalPreview.option-dead-key.test.tsx src/renderer/src/components/dashboard-popout/AgentTerminalPreview.clipboard-routes.test.tsx"
+      ],
+      "testFiles": [
+        "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-lifetime.test.tsx",
+        "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-geometry.test.tsx",
+        "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx",
+        "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.option-dead-key.test.tsx",
+        "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.clipboard-routes.test.tsx"
+      ],
+      "assertionRefs": [
+        {
+          "file": "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-lifetime.test.tsx",
+          "assertions": [
+            "keeps one preview connection across ten unrelated settings snapshots",
+            "ignores an old pending connection after a relevant theme change",
+            "does not install a terminal after unmounting a pending connection"
+          ]
+        },
+        {
+          "file": "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-geometry.test.tsx",
+          "assertions": [
+            "ignores a pending connection retired by a metric change",
+            "cancels an obsolete metric owner grid claim before the next change"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-09-25",
+          "runner": "local",
+          "platform": "macos",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-lifetime.test.tsx src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-geometry.test.tsx src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx src/renderer/src/components/dashboard-popout/AgentTerminalPreview.option-dead-key.test.tsx src/renderer/src/components/dashboard-popout/AgentTerminalPreview.clipboard-routes.test.tsx",
+          "result": "passed",
+          "durationSeconds": 2.23,
+          "summary": "63 tests /5 suites pass. Lifetime regressions: original 7 fail/7 pass, candidate14 pass; all8 metric/shaping cases pass both original and corrected candidate."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 15,
+        "scope": "Focused deterministic suites; local elapsed recorded, p95 not established."
+      },
+      "flakeHistory": {
+        "status": "not-started",
+        "evidence": "Local checks and independent adverse review only; no CI soak."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "Original reconnects/reconstructs11 times for10 unrelated updates; candidate1. Seven of14 lifetime cases fail original. Original and corrected candidate both pass all8 geometry preservation cases."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "Ten unrelated settings replies: connect/constructor11 to1, pre-unmount unsubscribe/dispose10 to0. One previous-theme ref and shallow comparison added; CPU/heap overhead unmeasured. No timer/polling/subprocess/subscriber added; broad settings render/composition work remains."
+      },
+      "knownGaps": [
+        "No full-dashboard interaction, native focus/input/IME, ligature shaping or physical PTY validation. Hidden Electron component rendering and one font-size transition were checked; fit endpoint was inert.",
+        "No live SSH/WSL/relay or Linux/Windows run. Provider/wire ownership and folder/git workspace paths unchanged.",
+        "Selection/buffer/input state now persists across unrelated and live cursor/scroll updates instead of incidental resets. Small comparison/ref overhead unmeasured.",
+        "No CI soak, heap, main snapshot serialization or frame latency claim."
+      ],
+      "promotionCriteria": [
+        "Retain count, stale-owner and explicit metric fit/grid oracles; add rendered native and provider/platform evidence plus CI soak."
+      ],
+      "demotionRule": "Keep experimental until soak; investigate failures without weakening owner counts, changed-theme behavior, fit/grid claims or late-disposal assertions."
+    },
     {
       "id": "workspace-hooks.execution-host-ownership",
       "title": "Hook reads and writes use the stored repository execution owner",
@@ -23,20 +111,9 @@
         "issue-command read and write",
         "hosted-review own-store host resolution"
       ],
-      "platforms": [
-        "macos",
-        "linux",
-        "windows"
-      ],
-      "providers": [
-        "local",
-        "ssh",
-        "wsl",
-        "remote-runtime"
-      ],
-      "coveredPlatforms": [
-        "macos"
-      ],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["local", "ssh", "wsl", "remote-runtime"],
+      "coveredPlatforms": ["macos"],
       "coveredProviders": [],
       "coverageNotes": "Actual hydration and authoritative desktop owner selection with mocked filesystem, Git, inspection and provider boundaries; synthetic local/SSH/runtime rows. No physical provider or native platform certification.",
       "motivatingLinks": [
@@ -47,9 +124,7 @@
       "commands": [
         "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/hooks/worktree-hook-execution-host.test.ts"
       ],
-      "testFiles": [
-        "src/main/ipc/hooks/worktree-hook-execution-host.test.ts"
-      ],
+      "testFiles": ["src/main/ipc/hooks/worktree-hook-execution-host.test.ts"],
       "assertionRefs": [
         {
           "file": "src/main/ipc/hooks/worktree-hook-execution-host.test.ts",
@@ -98,6 +173,460 @@
       ],
       "demotionRule": "Keep experimental until soak; investigate authority/routing failures without replacing exact-target or no-local-I/O assertions."
     },
+    {
+      "id": "runtime-files.renderer-document-watch-ownership",
+      "title": "Filesystem watches stay owned by their renderer document",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "runtime-platform",
+      "layer": "ipc-contract",
+      "surfaces": [
+        "desktop file explorer watchers",
+        "desktop editor file watchers",
+        "direct SSH file watchers"
+      ],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["local", "ssh", "wsl"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": ["local", "ssh", "wsl"],
+      "coverageNotes": "Actual desktop local/WSL subscription and SSH watcher controller logic under mocked filesystem/provider handles on macOS. Document events use an EventEmitter sender. Live remote/native Windows/Linux/WSL and rendered reload reattachment are unproved; PTY/process liveness and wire formats are unaffected.",
+      "motivatingLinks": [
+        "https://github.com/stablyai/orca/blob/main/src/main/ipc/filesystem-watcher-listener-lifecycle.ts"
+      ],
+      "invariant": "A replaced or crashed renderer document retains no file watches or pending ownership and cannot recreate them from an old asynchronous continuation. Shared roots retain live sibling owners; blocked and same-document navigation retain the current document. Shutdown removes registered lifecycle listeners.",
+      "oracle": "Run repeated reloads/crash, pending local/SSH installation cancellation with late success, aborted-install joiners, reconnect retry snapshots, failed-removal restoration and shutdown/reopen. Require zero obsolete roots/intent/listeners, no stale setup/retry, physical handle disposal and preservation of sibling notifications and same-tick remote handoff.",
+      "commands": [
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/filesystem-watcher-document-lifetime.test.ts src/main/ipc/filesystem-watcher-local-unsubscribe.test.ts src/main/ipc/filesystem-watcher-remote-cancellation.test.ts src/main/ipc/filesystem-watcher-native-capacity.test.ts --reporter=dot"
+      ],
+      "testFiles": [
+        "src/main/ipc/filesystem-watcher-document-lifetime.test.ts",
+        "src/main/ipc/filesystem-watcher-local-unsubscribe.test.ts",
+        "src/main/ipc/filesystem-watcher-remote-cancellation.test.ts",
+        "src/main/ipc/filesystem-watcher-native-capacity.test.ts"
+      ],
+      "assertionRefs": [
+        {
+          "file": "src/main/ipc/filesystem-watcher-document-lifetime.test.ts",
+          "assertions": [
+            "retains zero roots and listeners across 15 reloads and a renderer crash",
+            "does not revive a cancelled %s setup for a joiner whose document reloaded",
+            "does not re-arm an old provider snapshot into the same WebContents after replacement",
+            "does not restore a replaced sibling document after an awaited %s removal recovery",
+            "keeps same-document and blocked navigations alive, and removes lifecycle listeners at shutdown"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-09-25",
+          "runner": "local",
+          "platform": "macos",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/filesystem-watcher-document-lifetime.test.ts src/main/ipc/filesystem-watcher-local-unsubscribe.test.ts src/main/ipc/filesystem-watcher-remote-cancellation.test.ts src/main/ipc/filesystem-watcher-native-capacity.test.ts --reporter=dot",
+          "result": "passed",
+          "durationSeconds": 1.08,
+          "summary": "45 tests across four focused suites pass. Broader watcher suite passes 146 plus one existing skipped; isolated publication without sibling #22995 passes 145 plus one existing skipped."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 15,
+        "scope": "Focused deterministic IPC-contract suites; p95 not established."
+      },
+      "flakeHistory": {
+        "status": "not-started",
+        "evidence": "Local validation only; no CI soak."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "Seven permanent regressions fail with HEAD source substituted: cancelled joiner resurrection for local and SSH, restoration into replaced local/SSH documents, stale provider retry, shutdown listener retention, and root retention. All 13 document ownership cases pass after the change."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "15 reloads plus crash: retained local/SSH/desired roots 16→0 each; pending setup aborted; sender lifecycle listeners 1→0. Actual ownership modules with synthetic handles; no native process/heap/latency claim. No new timer, polling, process scan or provider fanout; existing root cleanup runs at document end."
+      },
+      "knownGaps": [
+        "No native Windows/Linux/WSL or live SSH execution.",
+        "No rendered Electron reload-reattachment/paint run or CI soak; broader watcher process isolation is a separate gate."
+      ],
+      "promotionCriteria": [
+        "Retain lifecycle, count and sibling-delivery assertions and add cross-platform and rendered reload evidence before promotion."
+      ],
+      "demotionRule": "Keep experimental until soak evidence; investigate lifecycle failures without suppressing assertions or retrying unexplained failures."
+    },
+    {
+      "id": "ephemeral-vm-recipe.output-tail-parity",
+      "title": "Recipe output capture preserves UTF-8 tails and releases settled storage",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "ephemeral-vm-runtime-store",
+      "layer": "shared-node-process-contract",
+      "surfaces": ["VM recipe stdout and stderr", "recipe cancellation and process errors"],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["local"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": ["local"],
+      "coverageNotes": "Actual recipe capture with synthetic child streams and real forced GC, plus real macOS shell output and descendant cancellation. Linux and Windows native execution, live VM providers and remote lifecycle journeys remain untested. Local/daemon PTY, SSH ownership, WSL launch, mobile and relay wire behavior are unaffected.",
+      "motivatingLinks": [
+        "https://github.com/stablyai/orca/blob/01ce5edf1aeec8a4b5cf06f531434be7d7c0cbcd/src/shared/ephemeral-vm-recipe-process.ts"
+      ],
+      "invariant": "Decoded stdout and stderr callback contents and order remain unchanged, final tails are the last capped run of raw output bytes with any leading partial UTF-8 sequence dropped, and success or failure releases capture storage without recapturing late output.",
+      "oracle": "Compare byte-bounded tails against the old per-chunk model and an independent code-point model across compaction, growth, oversized chunks and mid-character splits. Feed split and malformed UTF-8 through actual stream decoding. Require at most 5 MiB moved through the capture for 4 MiB of output with zero encoding, collectible backing buffers after close and error, zero late capture work with preserved callbacks, one decode per stream, unchanged tails on forced cancellation or synchronous kill-close, and every capture limit clamped to a bounded byte count.",
+      "commands": [
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/ephemeral-vm-recipe-process.test.ts src/shared/ephemeral-vm-recipe-output-capture.test.ts src/shared/growing-byte-buffer.test.ts src/main/ephemeral-vm-recipe-runner.test.ts"
+      ],
+      "testFiles": [
+        "src/shared/ephemeral-vm-recipe-process.test.ts",
+        "src/shared/ephemeral-vm-recipe-output-capture.test.ts",
+        "src/shared/growing-byte-buffer.test.ts",
+        "src/main/ephemeral-vm-recipe-runner.test.ts"
+      ],
+      "assertionRefs": [
+        {
+          "file": "src/shared/ephemeral-vm-recipe-output-capture.test.ts",
+          "assertions": [
+            "matches the old per-chunk UTF-8 tail for limit %s across varied chunk boundaries",
+            "retains the same code-point tail for limit %s wherever byte boundaries fall",
+            "preserves stream decoding, callback boundaries and independent tails",
+            "moves at most 5 MiB through the capture for 4 MiB of output",
+            "releases capture storage after %s while preserving late callbacks",
+            "decodes once per stream when force-kill closes synchronously",
+            "clamps a $limit capture limit to a bounded byte count"
+          ]
+        },
+        {
+          "file": "src/shared/growing-byte-buffer.test.ts",
+          "assertions": [
+            "reads and writes correctly after the head offset has advanced",
+            "keeps a bounded suffix stable across many small appends without unbounded growth"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-09-26",
+          "runner": "local",
+          "platform": "macos",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/ephemeral-vm-recipe-process.test.ts src/shared/ephemeral-vm-recipe-output-capture.test.ts src/shared/growing-byte-buffer.test.ts src/main/ephemeral-vm-recipe-runner.test.ts",
+          "result": "passed",
+          "durationSeconds": 0.48,
+          "summary": "60 tests across four suites passed, including forced-GC lifetime, synchronous SIGKILL-close and the shared byte buffer's head-offset cases."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 15,
+        "scope": "focused Node process and capture contracts with forced GC"
+      },
+      "flakeHistory": {
+        "status": "unknown",
+        "evidence": "Author and independent local runs pass; no CI or soak history collected."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "Baseline moves 943,194,112 bytes for 4 MiB output and fails the permanent 5 MiB budget. An earlier ring prototype retained two backing buffers after error and encoded late output after close; both permanent lifetime cases fail there and pass after cleanup correction. Dropping the head offset from GrowingByteBuffer keeps the byte budget but takes 12.36 ms instead of 0.25 ms."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "4 MiB in 4 KiB chunks, seven paired samples, macOS: the old per-chunk re-encode moves 943,194,112 bytes in 265.78 ms median; raw-byte capture into GrowingByteBuffer moves 4,194,304 appended plus 1,048,576 decoded bytes, encodes nothing, and takes 0.25 ms. End to end through runRecipeCommand is 0.26 ms with no output callback and 0.78 ms with one (the callback decoder is the work setEncoding already did). A 64-byte one-shot is 0.075 to 0.206 microseconds; retained storage reserves spare capacity and can exceed a string. No new polling, timers, subprocesses, wire fields or deadline changes."
+      },
+      "promotionCriteria": [
+        "Collect 100 consecutive CI passes or 14 days of soak history.",
+        "Exercise native Windows and Linux recipe output and cancellation."
+      ],
+      "knownGaps": [
+        "Synthetic output timings do not establish typical recipe prevalence, end-to-end provisioning gains or UI latency.",
+        "Retained storage reserves spare capacity and can use more memory than a string; CJK bytes can exceed UTF-16 storage. Tiny output is slower, and an oversized single chunk still copies its capped tail.",
+        "Malformed UTF-8 now yields a different tail than the old policy: replacement characters no longer inflate the byte count, so a malformed tail keeps more real output. No production override of the cap was found, and odd caps are clamped rather than coerced per chunk.",
+        "Live VM providers, SSH lifecycle journeys, and native Windows or Linux termination were not run."
+      ],
+      "demotionRule": "Keep experimental or demote if output differs, discarded bytes return, settled capture remains reachable, cancellation loses its tail, or the deterministic encoding budget regresses. Never weaken the oracle or increase retries to obtain a pass."
+    },
+    {
+      "id": "agent-session.trust-preflight-completion",
+      "title": "Agent launch preflight waits for its trust owner to settle",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "agent-session-runtime",
+      "layer": "cross-layer-unit",
+      "surfaces": [
+        "agent trust IPC",
+        "remote (SSH) agent workspace trust writer",
+        "renderer agent preflight",
+        "Codex continuation launch admission",
+        "main-process worktree startup trust",
+        "Codex launch and resume preparation"
+      ],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["local", "daemon", "ssh", "wsl", "remote-runtime"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": ["local", "ssh"],
+      "coverageNotes": "Actual main IPC handler, renderer preflight, session-continuation caller and config mutation queue with fake Electron bridge, config writer, launch and remote owner, plus the actual main-process worktree-startup, Codex quick-launch-prep and Codex resume-prep modules with mocked trust writer, runtime home and hook service. Counts prove admission ordering and the per-call trust-write bound only; no native PTY/CLI, actual config mutation or live provider evidence. Because codexHookService and ensureRealHomeCodexHookState are both mocked and isHostSystemDefaultRealHomeSelected defaults to false, no suite drives either config.toml lane the two launch-prep sites re-enter after the trust write, so nothing here speaks to whether a launch as a whole is bounded. The remote-preset suite calls markRemoteAgentWorkspaceTrusted directly and asserts its artifact shapes plus its unresolvable-home bail-out; nothing exercises markRemoteWorktreeTrusted, the unbounded caller that wraps it on the launch paths, so the SSH side of the bound is unmeasured here.",
+      "motivatingLinks": ["https://github.com/stablyai/orca/blob/main/src/main/ipc/agent-trust.ts"],
+      "invariant": "Every local Codex trust write a launch waits on - the five markCodexProjectTrusted call sites - settles before that launch proceeds, or is abandoned at a bounded deadline; rejected, abandoned and SSH-unreachable writes leave the workspace untrusted and never fall back to local trust. Two limits sit outside that claim and are not asserted. First, the deadline bounds the write, not the whole launch: a caller whose next step re-enters the same config.toml lane can still wait on that lane after its own write is abandoned. Second, one Codex trust write a launch waits on is not bounded at all - the remote write reached through markRemoteWorktreeTrusted in runtime/runtime-worktree-agent-startup.ts, which derives preset 'codex' from TUI_AGENT_CONFIG the same way the local path does and is awaited ahead of the agent spawn on every SSH launch path. Only the agentTrust:markTrusted handler's remote write is capped.",
+      "oracle": "Held local write or actual queue predecessor yields zero continuation launch calls until release, then exactly one; delayed local rejection settles successfully afterward. SSH awaits its remote writer and never invokes local trust. A never-settling local or SSH write resolves the handler at the deadline with a named warning, no leaked timer and no local fallback, and a rejection arriving after the deadline stays handled. An already-complete write admits the launch on microtasks with zero timers. Two concurrent launches for one workspace settle independently. In the main-process worktree-startup, Codex quick-launch-prep and Codex resume-prep modules a never-settling write resolves the caller at the deadline, still yields the launch home or resume outcome, leaks no timer, and writes no other preset artifact; the write stays ordered before the runtime-home and hook-repair steps the spawn waits on. Those three module cases mock codexHookService, so they establish that the write is abandoned at the deadline, not that the launch around it is bounded. No case drives markRemoteWorktreeTrusted, so nothing here bounds the remote Codex write that fronts an SSH launch; the remote-preset suite checks only what markRemoteAgentWorkspaceTrusted writes and when it bails out, never how long it may take.",
+      "commands": [
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts tests/e2e/agent-trust-completion.unit.test.ts src/renderer/src/lib/agent-trust-preflight.test.ts src/renderer/src/lib/launch-agent-session-continuation.test.ts src/main/remote-agent-trust-presets.test.ts src/main/startup/codex-launch-trust-write-deadline.test.ts src/main/runtime/runtime-worktree-agent-startup.test.ts"
+      ],
+      "testFiles": [
+        "tests/e2e/agent-trust-completion.unit.test.ts",
+        "src/renderer/src/lib/agent-trust-preflight.test.ts",
+        "src/renderer/src/lib/launch-agent-session-continuation.test.ts",
+        "src/main/remote-agent-trust-presets.test.ts",
+        "src/main/startup/codex-launch-trust-write-deadline.test.ts",
+        "src/main/runtime/runtime-worktree-agent-startup.test.ts"
+      ],
+      "assertionRefs": [
+        {
+          "file": "tests/e2e/agent-trust-completion.unit.test.ts",
+          "assertions": [
+            "holds the actual session-continuation launch call until the local write settles",
+            "keeps renderer preflight pending behind the actual config mutation queue",
+            "settles best-effort only after a queued local trust failure",
+            "bounds a never-settling local write and continues untrusted",
+            "admits an already-complete write without waiting for any timer",
+            "absorbs a local rejection that arrives after the deadline",
+            "bounds a never-settling SSH trust write without a local fallback",
+            "settles two concurrent launches for the same workspace independently",
+            "keeps remote failures best-effort without a local fallback"
+          ]
+        },
+        {
+          "file": "src/main/startup/codex-launch-trust-write-deadline.test.ts",
+          "assertions": [
+            "bounds a never-settling write in quick-launch prep and still returns the launch home",
+            "keeps the quick-launch trust write ahead of the home the spawn waits on",
+            "bounds a never-settling write in resume prep and still resolves the resume home",
+            "keeps the resume trust write ahead of the hook repair that precedes the spawn",
+            "contains a rejected resume trust write without trusting the workspace elsewhere"
+          ]
+        },
+        {
+          "file": "src/main/runtime/runtime-worktree-agent-startup.test.ts",
+          "assertions": [
+            "waits for the Codex trust write before resolving",
+            "bounds a never-settling Codex trust write instead of holding the launch open"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-09-27",
+          "runner": "local",
+          "platform": "macos",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts tests/e2e/agent-trust-completion.unit.test.ts src/renderer/src/lib/agent-trust-preflight.test.ts src/renderer/src/lib/launch-agent-session-continuation.test.ts src/main/remote-agent-trust-presets.test.ts src/main/startup/codex-launch-trust-write-deadline.test.ts src/main/runtime/runtime-worktree-agent-startup.test.ts",
+          "result": "passed",
+          "durationSeconds": 0.413,
+          "summary": "53 tests across six suites pass: 15 trust-completion (four deadline cases), 8 renderer preflight, 7 continuation-launch, 6 remote-preset, 5 Codex launch/resume prep deadline and 12 worktree-startup tests. Six of those are the bound and ordering cases this candidate adds. No native launch, PTY or actual config write."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 10,
+        "scope": "Focused mocked preflight/continuation/remote trust suites; p95 not established."
+      },
+      "flakeHistory": {
+        "status": "not-started",
+        "evidence": "Author and independent local mocked evidence; CI soak and native platform evidence pending."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "Trust-completion suite, re-run at the earlier head. Pre-await implementation: 5 fail/10 pass - the three launch-admission orderings plus the never-settling local and SSH cases, the SSH one only by exhausting the test timeout. Unbounded-await implementation: 3 fail/12 pass - never-settling local write, post-deadline rejection and never-settling SSH write all hang to the test timeout. The already-complete-write case passes unbounded too, so it is a timer control, not a red. Launch-prep and worktree-startup suites, this head: with the three call sites reverted to a bare await, 3 fail/14 pass - the quick-launch, resume and worktree-startup never-settling cases each hang to the 30s vitest timeout; restored, 17 pass. Whole gate at this head: 53 pass across six suites."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "No new subprocess, polling, retry or trust operation. Each of the five markCodexProjectTrusted call sites a launch awaits is capped by one per-call deadline timer, cleared on settlement, so none of those five can hold its caller indefinitely; the five share that one timer shape and no site gained a second write or a retry. The cap covers the local Codex writes only - the remote write through markRemoteWorktreeTrusted is still awaited with no timer, so an SSH launch can still be held open by a trust write. It also bounds the trust write, not the launch. At startup/codex-launch-preparation.ts the first awaited step after the write is ensureRealHomeHooksIfSelected, not codexHookService.prepareRuntimeHomeForLaunch: when the host system-default real home is selected it calls ensureRealHomeCodexHookState, which acquires runExclusivelyForCodexTrustConfig directly on ~/.codex/config.toml, the same lane the abandoned write still holds a queue slot for. When the real home is not selected that call returns without awaiting the lane and runtimeHome.prepareForCodexLaunchAsync is synchronous on this non-WSL path, so the first re-entry is prepareRuntimeHomeForLaunch through runExclusivelyForRuntimeAndSystemTrustConfig. At startup/codex-session-resume-launch.ts the first awaited step is the hook branch: ensureRealHomeCodexHookState when the resume home is ~/.codex, otherwise installForLaunchPrep or refreshRuntimeUserHooksForLaunchPrep through runExclusivelyForRuntimeAndSystemTrustConfig, whose inner acquire is that same ~/.codex/config.toml. Either way a wedged lane still stalls those two launches one step after the write is abandoned, and the earliest such step is the real-home ensure, not the hook-service call the gate used to name. Only markLocalWorktreeTrusted in runtime/runtime-worktree-agent-startup.ts has nothing after its Codex branch, so only it has an end-to-end bounded launch path. Reliability fix, no performance gain claim."
+      },
+      "knownGaps": [
+        "CI soak pending.",
+        "No live Codex CLI, PTY, trust prompt, native Electron app or actual trust-config mutation was exercised.",
+        "Windows/Linux/WSL/daemon/remote-runtime behavior was not executed; remote owner is mocked. No routing/wire/PTY ownership change.",
+        "Abandoning a write at the deadline does not cancel it; a legitimate slow write (WSL grant sessions run to 30s) can land after the launch already started, restoring the pre-fix ordering for that case only.",
+        "The deadline value is a reasoned cap over observed lane holders, not a measured p95.",
+        "All five awaited local Codex trust writes (markCodexProjectTrusted) are now bounded by the same helper: the agentTrust:markTrusted IPC handler, ipc/worktree-remote.ts, runtime/runtime-worktree-agent-startup.ts, startup/codex-launch-preparation.ts and startup/codex-session-resume-launch.ts. Four have a test in these suites; the ipc/worktree-remote.ts site is bounded but still has no test here. A sixth awaited Codex trust write - the remote one through markRemoteWorktreeTrusted - is not bounded at all; see the remote gap below.",
+        "Bounding the trust write does not bound the launch at two of the three new sites, and on both the first unbounded re-entry is earlier than the hook-service call. In startup/codex-launch-preparation.ts the next awaited call after the abandoned write is ensureRealHomeHooksIfSelected, which is conditional: only when the target is not WSL and runtimeHome.isHostSystemDefaultRealHomeSelected(launchEnv) is true does it call ensureRealHomeCodexHookState, which chains behind that module's own serial ensure promise and then acquires runExclusivelyForCodexTrustConfig on ~/.codex/config.toml (it skips the lane only when hooks are enabled, the lane is already unavailable and its retry backoff has not elapsed). When the real home is not selected that call returns without awaiting the lane, runtimeHome.prepareForCodexLaunchAsync is synchronous on the non-WSL path, and the first re-entry is codexHookService.prepareRuntimeHomeForLaunch. In startup/codex-session-resume-launch.ts the next awaited call is the hook branch: ensureRealHomeCodexHookState when the resume home is ~/.codex, otherwise installForLaunchPrep or refreshRuntimeUserHooksForLaunchPrep. All of those reach the same unbounded per-config.toml serial queue (runExclusivelyForCodexTrustConfig, FIFO with no depth cap and no timeout) on ~/.codex/config.toml; the runExclusivelyForRuntimeAndSystemTrustConfig wrapper takes the runtime home's config.toml first, and markCodexProjectTrusted itself takes both. A wedged lane therefore still stalls a quick-launch or a resume one step after the write is abandoned, and the abandoned write keeps its queue slot ahead of that step. The new launch-prep tests mock codexHookService and ensureRealHomeCodexHookState wholesale and default the real-home selection to false, so no test in these suites can catch this residual stall. Only markLocalWorktreeTrusted in runtime/runtime-worktree-agent-startup.ts, which has nothing after its Codex branch, is bounded end to end.",
+        "The cap remains per call site, not global. Two launches racing the same wedged lane each wait their own deadline, so the worst case a user can see is one deadline per launch, not one shared cap.",
+        "The remote (SSH) trust write reached through markRemoteWorktreeTrusted in runtime/runtime-worktree-agent-startup.ts is still awaited unbounded; only the agentTrust:markTrusted handler's remote write is capped. It is a Codex trust write a launch waits on, not merely an adjacent one: it reads TUI_AGENT_CONFIG[agent].preflightTrust, which is 'codex' for the codex agent, and markRemoteAgentWorkspaceTrusted then branches into markRemoteCodexProjectTrusted. Its only production caller is markRemoteWorkspaceTrustedForAgent in runtime/orca-runtime-activate-managed-worktree.ts, reached with a connectionId from seven launch entry points. On orca-runtime-create-agent-session.ts, orca-runtime-get-agent-session-execution-namespace.ts, orca-runtime-terminal-create-deduplication.ts, runtime-remote-managed-worktree-create.ts and runtime-folder-worktree-create.ts (wired in by orca-runtime-create-managed-worktree.ts) the await sits directly before the createTerminal that spawns the agent; on orca-runtime-resolve-mobile-session-terminal-command.ts and orca-runtime-resolve-worktree-removal-target.ts it instead gates the launch command those functions return for their caller to spawn, so the launch still waits on it. It chains a session.resolveHome multiplexer round trip, an SFTP realpath, a read, a createDir and a write, none with a timeout, over a link that may be half-open - so an SSH Codex launch can still hang with nothing happening, the same failure this branch bounds locally. Deliberately left out of scope here, and deliberately left out of the invariant."
+      ],
+      "promotionCriteria": [
+        "Retain pending-write/queue/launch-boundary red-green evidence and remote owner assertions; obtain actual platform/session evidence and CI soak before promotion."
+      ],
+      "demotionRule": "Remain experimental until repeated independent/CI evidence; investigate ordering or unbounded-wait regressions without weakening completion or deadline assertions."
+    },
+    {
+      "id": "settings.general-section-lifetime",
+      "title": "General settings search preserves matching section state",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "renderer-settings",
+      "layer": "renderer-unit",
+      "surfaces": [
+        "General settings search",
+        "app version and remote update display",
+        "autosave settings draft"
+      ],
+      "platforms": [
+        "macos",
+        "linux",
+        "windows"
+      ],
+      "providers": [
+        "local",
+        "remote-runtime",
+        "ssh",
+        "wsl"
+      ],
+      "coveredPlatforms": [
+        "macos"
+      ],
+      "coveredProviders": [],
+      "coverageNotes": "Actual GeneralPane, update/version and remote-status components with mocked store/API; actual autosave form. Windows runtime on/off simulated. No physical updater, paired host, settings write or native input.",
+      "motivatingLinks": [
+        "https://github.com/stablyai/orca/blob/main/src/renderer/src/components/settings/GeneralPane.tsx"
+      ],
+      "invariant": "A matching General settings section retains its owner and state as preceding search results disappear; an actually removed section releases its owner and reloads when shown again.",
+      "oracle": "Across 14 matching searches the Updates section keeps the same DOM node and the version-read and remote-refresh counts do not grow, instead of six each. Store-published remote update state still reaches the retained section. Explicit refresh and genuine hide/reopen still read; drafts yield to externally changed saved settings; a removed owner cannot publish its late version.",
+      "commands": [
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/settings/GeneralPane.section-lifetime.test.tsx"
+      ],
+      "testFiles": [
+        "src/renderer/src/components/settings/GeneralPane.section-lifetime.test.tsx"
+      ],
+      "assertionRefs": [
+        {
+          "file": "src/renderer/src/components/settings/GeneralPane.section-lifetime.test.tsx",
+          "assertions": [
+            "keeps showing store-published remote update state without a remount",
+            "keeps explicit remote refresh and true hide/reopen reads",
+            "preserves an autosave draft until external settings change or the section hides",
+            "does not publish a version result from a genuinely unmounted section"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-09-26",
+          "runner": "local",
+          "platform": "macos",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/settings/GeneralPane.section-lifetime.test.tsx",
+          "result": "passed",
+          "durationSeconds": 1.89,
+          "summary": "7 tests/1 suite pass after the shared SettingsSectionStack adoption. Read-count oracles restated as node identity plus non-growing counts; original main fails both retained-section cases, the draft, the release-picker reveal and the late-version publish."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 10,
+        "scope": "Focused renderer-unit suites, p95 not established."
+      },
+      "flakeHistory": {
+        "status": "not-started",
+        "evidence": "Author and independent local evidence only; no CI soak."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "Candidate permanent6pass versus original4fail2controls. Additional independent pending-version/error-context/store-refresh3pass versus original2fail1control."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "Actual version and remote-refresh admissions 6 to 1 across 14 matching queries, which also stops one paired-host update probe per keystroke. Section map now lives in the shared SettingsSectionStack; no added poll, cache, listener or subprocess. No packaged CPU/frame/heap claim."
+      },
+      "knownGaps": [
+        "CI soak pending.",
+        "Physical updater/install, local/daemon PTYs and mobile are unaffected; no execution-host routing, process authority or wire change.",
+        "Native Linux/Windows, SSH/WSL and paired remote-runtime behavior not exercised; synthetic runtime flags cover renderer branches only.",
+        "Matching search no longer incidentally refreshes version/remote-status/CLI discovery; explicit checks and real hide/reopen remain. The installed version cannot change in-process and remote update entries are store-published, so neither goes stale without a signal.",
+        "Retained drafts, release reveal and pending/error context last until a real hide or their own transition; programmatic-query draft test does not reproduce ordinary mouse-search blur/commit.",
+        "Hidden Electron actual-form proof is separate; no packaged latency, heap or native focus evidence."
+      ],
+      "promotionCriteria": [
+        "Retain count, draft, owner cleanup and refresh controls; collect CI soak and relevant full-app/provider evidence before promotion."
+      ],
+      "demotionRule": "Keep experimental until soak; investigate state or cleanup regressions without weakening owner, read-count or draft assertions."
+    },
+    {
+      "id": "settings.accounts-section-lifetime",
+      "title": "Accounts search preserves matching account section owners",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "renderer-settings",
+      "layer": "renderer-unit",
+      "surfaces": [
+        "Accounts settings search",
+        "Grok and Cursor account status",
+        "Codex pending sign-in link"
+      ],
+      "platforms": [
+        "macos",
+        "linux",
+        "windows"
+      ],
+      "providers": [
+        "local",
+        "remote-runtime",
+        "ssh",
+        "wsl"
+      ],
+      "coveredPlatforms": [
+        "macos"
+      ],
+      "coveredProviders": [],
+      "coverageNotes": "Actual AccountsPane, Grok, Cursor and Codex login components; synthetic APIs/store with Windows account support enabled/disabled. No real account, keychain or provider action.",
+      "motivatingLinks": [
+        "https://github.com/stablyai/orca/blob/main/src/renderer/src/components/settings/AccountsPane.tsx"
+      ],
+      "invariant": "Matching sections retain their owners as earlier search results disappear; genuine removal releases the Codex subscription and reopens fresh status reads.",
+      "oracle": "Across nine matching Grok, ten matching Cursor and eleven matching Codex queries each matched section keeps the same DOM node and its status-read, watcher and subscription counts do not grow, against four to six reads each before. Explicit refresh, store-published usage updates, pushed login URLs and genuine removal all still reach the retained section.",
+      "commands": [
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/settings/AccountsPane.section-lifetime.test.tsx"
+      ],
+      "testFiles": [
+        "src/renderer/src/components/settings/AccountsPane.section-lifetime.test.tsx"
+      ],
+      "assertionRefs": [
+        {
+          "file": "src/renderer/src/components/settings/AccountsPane.section-lifetime.test.tsx",
+          "assertions": [
+            "preserves explicit Grok refresh and real hide/reopen status reads",
+            "keeps the login subscription until Codex genuinely hides",
+            "keeps Cursor refresh driven by usage updates and genuine reopen"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-09-26",
+          "runner": "local",
+          "platform": "macos",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/settings/AccountsPane.section-lifetime.test.tsx",
+          "result": "passed",
+          "durationSeconds": 1.84,
+          "summary": "10 tests/1 suite pass after the shared SettingsSectionStack adoption. Read-count oracles restated as node identity plus non-growing counts; original main fails the three retained-section cases and the retained Codex subscription, and passes the explicit-refresh, usage-driven and genuine-removal controls."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 10,
+        "scope": "Focused renderer-unit suites, p95 not established."
+      },
+      "flakeHistory": {
+        "status": "not-started",
+        "evidence": "Author and independent local evidence only; no CI soak."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "Candidate ten pass; current-main original seven fail and three controls pass."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "Actual renderer status-read/subscription admissions counted; the section map now lives in the shared SettingsSectionStack and no cache, poll, listener or process is added. No CPU, latency or heap claim. Matching sections retain local state and lose only the incidental search-driven refresh that duplicated an existing subscription."
+      },
+      "knownGaps": [
+        "CI soak pending.",
+        "No native Linux/Windows or live SSH/WSL/paired provider behavior; platform flags are simulated.",
+        "Hidden Electron Grok proof uses the original audit baseline and synthetic status; current-main Cursor addition has unit evidence only.",
+        "Matching search no longer incidentally refreshes Grok/Cursor status or pending Codex URLs. Every one of those surfaces is store-subscribed or push-subscribed, so the retained section still tracks usage updates, pushed login URLs, explicit refresh and true hide/reopen; there is no bounded automatic freshness deadline and none of them relied on one before.",
+        "Child drafts, errors, copied feedback and timers remain until their own transition or real removal."
+      ],
+      "promotionCriteria": [
+        "Retain read/subscription counts and genuine-removal controls; collect CI soak and relevant full-app provider evidence."
+      ],
+      "demotionRule": "Keep experimental until soak; investigate owner and refresh regressions without weakening assertions or adding retries."
+    },
     {
       "id": "agent-session.journal-streaming-replay",
       "title": "Journal replay bounds obsolete revision memory without changing recovery",
@@ -138,37 +667,112 @@
       ],
       "evidenceRuns": [
         {
-          "date": "2026-09-11",
+          "date": "2026-09-11",
+          "runner": "local",
+          "platform": "macos",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/main/native-chat/agent-session-journal src/main/native-chat/agent-session-wire/agent-session-history-page.test.ts src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.test.ts src/main/native-chat/agent-session-wire/agent-session-journal-recovery.test.ts",
+          "result": "passed",
+          "durationSeconds": 7.71,
+          "summary": "245 tests passed across 22 files. Retained-heap oracle fails on baseline at 68.6 MB and passes under 8 MiB with streaming; gap/schema and cursor-cleanup assertions passed."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 30,
+        "scope": "Unit fixtures; p95 not established."
+      },
+      "flakeHistory": {
+        "status": "not-started",
+        "evidence": "Local candidate validation only; no CI soak."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "Production-function AB/BA benchmark samples 132.6 MB live heap in baseline vs 88-92 KB with streaming on a 66.7 MB revision-heavy journal. The retained-heap unit test fails against the original code and passes with streaming; value and cursor assertions pass in both implementations."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "Paged SQLite reads (one completed statement per page) and immediate reduction retain reduced state plus one page of rows. No cursor or read snapshot outlives its statement, so a WAL checkpoint can pass mid-replay; no new polling, subprocess, provider call or wire change."
+      },
+      "knownGaps": [
+        "No Windows/Linux runtime execution or real remote-host validation.",
+        "Latest live message bodies still require memory proportional to their total size; this removes superseded-history retention, not live-history storage."
+      ],
+      "promotionCriteria": ["Retain red/green heap and value assertions and complete CI soak."],
+      "demotionRule": "Keep experimental until cross-platform and soak evidence; investigate failures without weakening content or memory assertions."
+    },
+    {
+      "id": "relay-performance.ai-vault-ready-ownership",
+      "title": "AI Vault readiness releases canceled request owners",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "desktop-runtime",
+      "layer": "relay-service-client-contract",
+      "surfaces": ["AI Vault sidecar startup", "SSH title lookup cancellation"],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["ssh"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": ["ssh"],
+      "coverageNotes": "Production relay client with synthetic child events and real forced GC. Native remote process execution and live SSH remain untested. Local/daemon PTY, WSL shell selection and mobile terminal stream are unaffected.",
+      "motivatingLinks": ["https://github.com/stablyai/orca/issues/23024"],
+      "invariant": "Canceled unsent calls release request payloads before sidecar readiness, disposal releases all pending readiness owners, and live calls still start exactly once through cancellation and startup failures.",
+      "oracle": "Hold ready and cancel 1,000 title calls; require zero retained request arrays after GC and one child. Dispose before ready and require uncanceled payload collection and zero timers. Race ready with abort and spawn failure with a second lane; require only live calls delivered and successful results. Preserve existing restart and cancel-ack behavior.",
+      "commands": [
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/relay/ai-vault-service-ready-retention.test.ts src/relay/ai-vault-service-client.test.ts src/relay/ai-vault-service-restart-policy.test.ts src/relay/ai-vault-service-spawn.test.ts src/relay/ai-vault-handler.test.ts src/shared/promise-settlement-waiters.test.ts"
+      ],
+      "testFiles": [
+        "src/relay/ai-vault-service-ready-retention.test.ts",
+        "src/relay/ai-vault-service-client.test.ts",
+        "src/relay/ai-vault-service-restart-policy.test.ts",
+        "src/relay/ai-vault-service-spawn.test.ts",
+        "src/relay/ai-vault-handler.test.ts",
+        "src/shared/promise-settlement-waiters.test.ts"
+      ],
+      "assertionRefs": [
+        {
+          "file": "src/relay/ai-vault-service-ready-retention.test.ts",
+          "assertions": [
+            "releases canceled request payloads while readiness remains pending",
+            "releases uncanceled readiness payloads when the client is disposed",
+            "does not send a call canceled in the turn that readiness arrives",
+            "retries an unsent lane after spawn fails while the other lane starts a child"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-09-25",
           "runner": "local",
           "platform": "macos",
-          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/main/native-chat/agent-session-journal src/main/native-chat/agent-session-wire/agent-session-history-page.test.ts src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.test.ts src/main/native-chat/agent-session-wire/agent-session-journal-recovery.test.ts",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/relay/ai-vault-service-ready-retention.test.ts src/relay/ai-vault-service-client.test.ts src/relay/ai-vault-service-restart-policy.test.ts src/relay/ai-vault-service-spawn.test.ts src/relay/ai-vault-handler.test.ts src/shared/promise-settlement-waiters.test.ts",
           "result": "passed",
-          "durationSeconds": 7.71,
-          "summary": "245 tests passed across 22 files. Retained-heap oracle fails on baseline at 68.6 MB and passes under 8 MiB with streaming; gap/schema and cursor-cleanup assertions passed."
+          "durationSeconds": 0.616,
+          "summary": "38 tests across six suites passed, including real forced-GC retention and startup/cancel races."
         }
       ],
       "runtimeBudget": {
-        "p95Seconds": 30,
-        "scope": "Unit fixtures; p95 not established."
+        "p95Seconds": 10,
+        "scope": "focused Node contract tests with forced GC"
       },
       "flakeHistory": {
-        "status": "not-started",
-        "evidence": "Local candidate validation only; no CI soak."
+        "status": "unknown",
+        "evidence": "Local runs passed; CI/soak history not collected."
       },
       "redGreenEvidence": {
         "status": "complete",
-        "evidence": "Production-function AB/BA benchmark samples 132.6 MB live heap in baseline vs 88-92 KB with streaming on a 66.7 MB revision-heavy journal. The retained-heap unit test fails against the original code and passes with streaming; value and cursor assertions pass in both implementations."
+        "evidence": "Baseline retains all 1,000 canceled arrays and the disposed uncanceled payload; both permanent regressions fail there and pass after the fix. Independent spawn-failure race failed on the initial prototype, passed on baseline and passes after correction."
       },
       "performanceBudget": {
         "required": true,
-        "evidence": "Paged SQLite reads (one completed statement per page) and immediate reduction retain reduced state plus one page of rows. No cursor or read snapshot outlives its statement, so a WAL checkpoint can pass mid-replay; no new polling, subprocess, provider call or wire change."
+        "evidence": "Synthetic cold-start churn retains 1,000 to zero canceled arrays; incremental heap 34,771,464 to 492,504 bytes. One shared startup reaction, no new polling, timers, process starts, timeout changes or wire fields."
       },
+      "promotionCriteria": [
+        "Collect 100 consecutive CI passes or 14 days of soak history.",
+        "Exercise real SSH sidecar cancellation and restart on Linux and Windows."
+      ],
       "knownGaps": [
-        "No Windows/Linux runtime execution or real remote-host validation.",
-        "Latest live message bodies still require memory proportional to their total size; this removes superseded-history retention, not live-history storage."
+        "Synthetic churn does not measure typical user frequency or UI latency.",
+        "Physical sidecar/native Windows/Linux and live SSH paths were not exercised."
       ],
-      "promotionCriteria": ["Retain red/green heap and value assertions and complete CI soak."],
-      "demotionRule": "Keep experimental until cross-platform and soak evidence; investigate failures without weakening content or memory assertions."
+      "demotionRule": "Keep experimental or demote if canceled payloads survive GC, disposal retains startup owners, or live lanes stall/duplicate after startup failure."
     },
     {
       "id": "runtime.connection-owned-host-status",
@@ -339,7 +943,7 @@
       "invariant": "One structured-send operation id causes at most one provider dispatch. A recorded or transport-ambiguous send reuses that id across retry, caller reconnect, client remount, and journal recovery; only a terminal rejection may rotate to a first delivery.",
       "oracle": "Inject adapter acknowledgement loss, RPC response loss, caller replacement, logical-client close after response, auth recovery with a written request, missing journal submissions, legacy pending rows, stale fences, operation expiry, mobile remount, and durable-journal capacity. Assert one provider dispatch or one operation id for every ambiguous retry, fresh identity only after rejection, and no eviction of ambiguous mobile ids.",
       "commands": [
-        "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/agent-session-operation-ledger.test.ts src/shared/structured-agent-session-send-disposition.test.ts src/main/runtime/agent-session-operation-admission.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-refusal-retry.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts src/main/runtime/orchestration/structured-pointer-operation-id.test.ts src/renderer/src/components/native-chat/use-structured-agent-session-outbox.test.tsx src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx src/renderer/src/components/native-chat/NativeChatStructuredSession.transport-probe.test.tsx src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx src/renderer/src/lib/launch-structured-agent-session.test.ts",
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/agent-session-operation-ledger.test.ts src/shared/structured-agent-session-send-disposition.test.ts src/main/runtime/agent-session-operation-admission.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-refusal-retry.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts src/main/runtime/orchestration/structured-pointer-operation-id.test.ts src/renderer/src/components/native-chat/use-structured-agent-session-outbox.test.tsx src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx src/renderer/src/lib/launch-structured-agent-session.test.ts",
         "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir mobile test ../mobile/src/session/mobile-native-chat-image-attachment.test.ts ../mobile/src/session/use-mobile-native-chat-image-attachments.test.ts ../mobile/src/session/mobile-structured-send-operation-journal.test.ts ../mobile/src/session/mobile-structured-session-operation-retention.test.ts ../mobile/src/session/mobile-structured-send-delivery.test.ts ../mobile/src/session/use-mobile-structured-agent-session-send.test.tsx ../mobile/src/session/use-mobile-structured-agent-session.test.tsx ../mobile/src/transport/mobile-relay-rpc-session.test.ts ../mobile/src/transport/rpc-client-delivery-ambiguity.test.ts ../mobile/src/transport/stable-logical-rpc-client.test.ts"
       ],
       "testFiles": [
@@ -353,7 +957,6 @@
         "src/main/runtime/orchestration/structured-pointer-operation-id.test.ts",
         "src/renderer/src/components/native-chat/use-structured-agent-session-outbox.test.tsx",
         "src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx",
-        "src/renderer/src/components/native-chat/NativeChatStructuredSession.transport-probe.test.tsx",
         "src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx",
         "src/renderer/src/lib/launch-structured-agent-session.test.ts",
         "mobile/src/session/mobile-native-chat-image-attachment.test.ts",
@@ -429,7 +1032,7 @@
           "date": "2026-09-12",
           "runner": "local",
           "platform": "macos",
-          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/agent-session-operation-ledger.test.ts src/shared/structured-agent-session-send-disposition.test.ts src/main/runtime/agent-session-operation-admission.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-refusal-retry.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts src/main/runtime/orchestration/structured-pointer-operation-id.test.ts src/renderer/src/components/native-chat/use-structured-agent-session-outbox.test.tsx src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx src/renderer/src/components/native-chat/NativeChatStructuredSession.transport-probe.test.tsx src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx src/renderer/src/lib/launch-structured-agent-session.test.ts",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/agent-session-operation-ledger.test.ts src/shared/structured-agent-session-send-disposition.test.ts src/main/runtime/agent-session-operation-admission.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-refusal-retry.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts src/main/runtime/orchestration/structured-pointer-operation-id.test.ts src/renderer/src/components/native-chat/use-structured-agent-session-outbox.test.tsx src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx src/renderer/src/lib/launch-structured-agent-session.test.ts",
           "result": "passed",
           "durationSeconds": 22.1,
           "summary": "Thirteen focused host, shared, renderer, and orchestration files passed 148 tests."
@@ -8237,7 +8840,7 @@
         "Windows ConPTY, SSH-hosted PTYs, app-quit killAll, and daemon dispose retain foreground-tree-only teardown.",
         "A process born in the capture second is SIGTERMed but not SIGKILLed because ps cannot prove its recycled-PID identity.",
         "A descendant orphaned before or during root ownership loss requires the separate crash-orphan sweep and is not recovered from a stale kill-time snapshot.",
-        "recordTerminalSurfaceRetirement advances the INCOMING session's terminal topology revision, so a tombstoned close whose write carries a revision at or below the store's own is rebased away instead of persisting. Pre-existing for every repo already past revision 0 and unchanged by the host-admitted membership fix, which only makes more repos reach that state sooner; the authoritative close path (persistTerminalSurfaceRetirements) computes from the store's session and is unaffected. Known, unaddressed, and deliberately out of scope here: the safe correction is per-tab rather than per-worktree rebase arbitration, because raising the incoming revision wholesale would re-open the host-tab loss whenever a close coincides with a host create.",
+        "recordTerminalSurfaceRetirement advances the INCOMING session's terminal topology revision, so a tombstoned close whose write carries a revision at or below the store's own is rebased away instead of persisting. Pre-existing for every repo already past revision 0 and unchanged by the host-admitted membership fix, which only makes more repos reach that state sooner; the authoritative close path (stageTerminalSurfaceRetirements) computes from the store's session and is unaffected. Known, unaddressed, and deliberately out of scope here: the safe correction is per-tab rather than per-worktree rebase arbitration, because raising the incoming revision wholesale would re-open the host-tab loss whenever a close coincides with a host create.",
         "The SSH relay reattach binding (src/main/ssh/ssh-relay-session.ts persistPtyBinding) is NOT flagged host-admitted, so a lease rebind that has to mint a missing tab raises no fence. It rebinds an existing lease rather than admitting a new surface, so it is believed not to need one, but that was not established either way. Known, unaddressed, and deliberately out of scope here.",
         "The host-created retention journey is macOS-local; the reported incident was on a physical Windows host, which we did not run against."
       ],
@@ -8994,6 +9597,77 @@
       ],
       "demotionRule": "Demote if discovery and launch can resolve different authorities, a scoped Floating probe overwrites the active-project inventory, or local context selection adds recurring scans or retained in-flight entries."
     },
+    {
+      "id": "agent-session.opencode2-hook-cleanup",
+      "title": "OpenCode 2 setup releases acquired hook owners after failure",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "agent-integrations",
+      "layer": "main-unit",
+      "surfaces": ["OpenCode 2 generated plugin setup and unload"],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["local", "ssh", "wsl", "remote-runtime"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": [],
+      "coverageNotes": "Actual generated wrapper with synthetic factories, prompt registrations and event iterators. Supporting generated-module tests cover both OpenCode variants; no native provider execution.",
+      "motivatingLinks": [
+        "https://github.com/stablyai/orca/blob/main/src/main/opencode2/status-plugin-setup-source.ts"
+      ],
+      "invariant": "After a hook factory is acquired, prompt registration failure or a throwing/rejecting prompt disposer cannot skip hook disposal. Unload waits for in-flight event delivery before disposing the hook factory and remains fail-open.",
+      "oracle": "Fault-injected setup and unload each call hook disposal once. The ordered control completes delivery and subscription before hook cleanup. Normal unload disposes both owners once.",
+      "commands": [
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/opencode2/status-plugin-setup-lifetime.test.ts"
+      ],
+      "testFiles": ["src/main/opencode2/status-plugin-setup-lifetime.test.ts"],
+      "assertionRefs": [
+        {
+          "file": "src/main/opencode2/status-plugin-setup-lifetime.test.ts",
+          "assertions": [
+            "disposes the factory after prompt registration %s",
+            "disposes the factory after prompt cleanup %s",
+            "waits for in-flight delivery before factory cleanup after a prompt cleanup failure"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-09-26",
+          "runner": "local",
+          "platform": "macos",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/opencode2/status-plugin-setup-lifetime.test.ts",
+          "result": "passed",
+          "durationSeconds": 0.125,
+          "summary": "10 permanent cases pass; baseline seven fail and three controls pass. Fresh-main run including existing setup/lineage suites: 59 pass."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 10,
+        "scope": "Synthetic wrapper unit suite; p95 not established."
+      },
+      "flakeHistory": {
+        "status": "not-started",
+        "evidence": "Local deterministic validation only; no CI soak."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "Baseline seven failures and three controls; candidate ten passed. Hook disposal after prompt registration/cleanup failure changes from zero to one."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "No new polling, scans, subprocesses or successful-startup awaits. Failure paths now await the existing hook disposer; teardown retains event-delivery ordering. No latency or heap improvement claimed."
+      },
+      "knownGaps": [
+        "Native Linux/Windows, SSH/WSL and remote-runtime plugin execution not run.",
+        "Local/daemon PTY and mobile/relay transport behavior is unaffected.",
+        "Pending non-abortable registration, event delivery or disposal promises can still delay cleanup; no timeout or cancellation redesign.",
+        "Malformed form normalization remains a separate defect.",
+        "CI soak pending."
+      ],
+      "promotionCriteria": [
+        "Retain cleanup-count and delivery-order oracles; add provider/platform execution and CI soak."
+      ],
+      "demotionRule": "Keep experimental until soak; investigate failures without weakening cleanup or delivery-order assertions."
+    },
     {
       "id": "agent-session.provider-ownership",
       "title": "Provider sessions are resumed once per workspace ownership claim",
@@ -10006,6 +10680,83 @@
       ],
       "demotionRule": "Cannot promote without deterministic oracle and runtime history."
     },
+    {
+      "id": "worktree-listing.execution-host-ownership",
+      "title": "Worktree listings keep canonical SSH ownership and mutation fencing",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "worktree-listing",
+      "layer": "main-unit",
+      "surfaces": [
+        "detected worktree listing",
+        "known worktree catalog",
+        "worktree list and listAll"
+      ],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["local", "ssh", "wsl", "remote-runtime"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": [],
+      "coverageNotes": "Actual handlers, hydration, ownership, scan cache and provider authority with mocked providers/Git/store/IPC. Independent controls use real lineage pruning and an in-memory map. No physical SSH or native Git.",
+      "motivatingLinks": [
+        "https://github.com/stablyai/orca/blob/main/src/main/ipc/worktrees/listing/register-worktree-catalog-handlers.ts"
+      ],
+      "invariant": "Canonical SSH listings use the owning provider and cannot register remote roots locally or reuse local cache authority. A listing overtaken by a mutation or root revision cannot prune newer lineage.",
+      "oracle": "Both SSH owner spellings reach five read forms without local Git/root registration; disconnection and authority rotation invalidate detected answers. Both catalog channels suppress side effects after mutation/root revision. Two direct canonical scans require two provider listings instead of one cached listing.",
+      "commands": [
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/worktrees-canonical-ssh-listing.test.ts"
+      ],
+      "testFiles": ["src/main/ipc/worktrees-canonical-ssh-listing.test.ts"],
+      "assertionRefs": [
+        {
+          "file": "src/main/ipc/worktrees-canonical-ssh-listing.test.ts",
+          "assertions": [
+            "keeps %s on the direct SSH boundary",
+            "reports disconnection without replaying an authoritative local-cache answer",
+            "preserves lineage when %s is overtaken by a %s"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-09-26",
+          "runner": "local",
+          "platform": "macos",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/worktrees-canonical-ssh-listing.test.ts",
+          "result": "passed",
+          "durationSeconds": 0.884,
+          "summary": "26 permanent cases pass on isolated current main. Separate independent run40pass;8current-main related suites61pass. Author64scoped pass on shared checkout. Original permanent13fail/13controls. Initial candidate lineage regression repaired and revalidated."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 10,
+        "scope": "Focused mocked-provider unit suites; p95 not established."
+      },
+      "flakeHistory": {
+        "status": "not-started",
+        "evidence": "Local author/independent/current-main validation only; no CI soak."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "Original permanent13fail13controls; repaired26pass. Initial candidate lost actual lineage in2independent races; repaired40pass includes these controls."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "No added polling or concurrency; listAll remains bounded at8. Canonical SSH roots avoid local cache/registration. Trade-off:2connected direct scans use2provider listings instead of1cached result. No CPU/latency/heap improvement claim."
+      },
+      "knownGaps": [
+        "CI soak pending.",
+        "Local and daemon PTY, terminal output and mobile wire are unaffected.",
+        "Native Linux/Windows, live SSH/WSL and paired runtime-host integrations not executed. Generic runtime rows retain refusal.",
+        "Catalog list/listAll may still return a superseded plain-array snapshot; this gate prevents stale lineage side effects, not all response staleness.",
+        "Canonical forgetRemovedForExecutionHost remains outside scope; no new destructive authorization.",
+        "Filesystem classifier and registry defects are separate repairs; this gate only prevents listing-induced local-root admission.",
+        "Canonical SSH bypasses the improper5second local cache, increasing provider calls. No replacement cache or physical cancellation claim."
+      ],
+      "promotionCriteria": [
+        "Retain exact-owner, no-local-I/O, cache-admission and overtaken-lineage controls; collect CI soak and real provider coverage."
+      ],
+      "demotionRule": "Keep experimental until soak; investigate host/lineage regressions without weakening ownership assertions or adding blind retries."
+    },
     {
       "id": "xterm-addon.boundary-containment",
       "title": "xterm addon failures stay pane-scoped and input survives",
@@ -11552,7 +12303,7 @@
         "pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/pty-pending-projection-admissions.test.ts src/main/ipc/ssh-pty-legacy-projection.test.ts src/main/ipc/ssh-pty-model-admission.test.ts --reporter=dot",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orca-runtime-path-candidate-history.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orca-runtime.test.ts src/main/runtime/orca-runtime-tail-wait-memo.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts src/main/providers/ssh-pty-provider.test.ts src/main/providers/ssh-pty-source-delivery-ledger.test.ts src/main/ssh/ssh-pty-retired-source-deliveries.test.ts src/main/ssh/ssh-relay-session.test.ts src/main/ssh/ssh-relay-session-data-delivery.test.ts src/main/ssh/ssh-relay-session-recovery-races.test.ts src/main/ssh/ssh-relay-session-incarnation.test.ts src/main/ssh/ssh-relay-session-reconnect-incarnation.test.ts src/main/ssh/ssh-relay-session-terminal-error.test.ts src/main/ssh/ssh-pty-recovery-retention-budget.test.ts src/main/ssh/relay-protocol-backpressure.test.ts src/relay/protocol-backpressure.test.ts src/relay/pty-source-credit-ledger.test.ts src/relay/pty-source-credit-scheduler.test.ts src/relay/relay-pty-source-publication.test.ts src/relay/ssh-pty-source-credit-adapter.test.ts --reporter=dot",
+        "pnpm exec vitest run --config config/vitest.config.ts src/main/providers/ssh-pty-provider.test.ts src/main/providers/ssh-pty-source-delivery-ledger.test.ts src/main/ssh/ssh-pty-retired-source-deliveries.test.ts src/main/ssh/ssh-relay-session.test.ts src/main/ssh/ssh-relay-session-data-delivery.test.ts src/main/ssh/ssh-relay-session-recovery-races.test.ts src/main/ssh/ssh-relay-session-incarnation.test.ts src/main/ssh/ssh-relay-session-reconnect-incarnation.test.ts src/main/ssh/ssh-relay-session-terminal-error.test.ts src/main/ssh/ssh-pty-recovery-retention-budget.test.ts src/relay/protocol-backpressure.test.ts src/relay/pty-source-credit-ledger.test.ts src/relay/pty-source-credit-scheduler.test.ts src/relay/relay-pty-source-publication.test.ts src/relay/ssh-pty-source-credit-adapter.test.ts --reporter=dot",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/ssh-pty-model-admission.test.ts src/main/ipc/ssh-pty-output-model-migration.test.ts src/main/ssh/ssh-relay-session-model-migration.test.ts --reporter=dot",
         "pnpm exec vitest run --config config/vitest.config.ts src/relay/git-response-stream-ownership.test.ts src/relay/pty-handler-output-streaming.test.ts --reporter=dot",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/providers/ssh-pty-notification-routing.test.ts src/main/providers/ssh-pty-provider-agent-session-create-operation.test.ts src/main/providers/ssh-pty-provider-exit-race.test.ts src/main/providers/ssh-pty-provider-reattach-incarnation.test.ts --reporter=dot",
@@ -11599,7 +12350,6 @@
         "src/main/ssh/ssh-relay-session-terminal-error.test.ts",
         "src/main/ssh/ssh-pty-recovery-retention-budget.test.ts",
         "src/main/ssh/ssh-pty-retired-source-deliveries.test.ts",
-        "src/main/ssh/relay-protocol-backpressure.test.ts",
         "src/relay/protocol-backpressure.test.ts",
         "src/relay/git-response-stream-ownership.test.ts",
         "src/relay/pty-handler-output-streaming.test.ts",
@@ -11816,13 +12566,6 @@
             "invalid-checkpoint cancellation retains the exact delivery until restore response settlement, then retry mints a fresh activation and emits one live source frame"
           ]
         },
-        {
-          "file": "src/main/ssh/relay-protocol-backpressure.test.ts",
-          "assertions": [
-            "main SSH decoder accepts one maximum frame plus 1 MiB partial input and rejects one extra byte",
-            "a throwing continuation clears retained input, releases one pause epoch, and publishes one typed ownership error"
-          ]
-        },
         {
           "file": "src/relay/protocol-backpressure.test.ts",
           "assertions": [
@@ -12011,7 +12754,7 @@
           "date": "2026-07-29",
           "runner": "local",
           "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/main/providers/ssh-pty-provider.test.ts src/main/providers/ssh-pty-source-delivery-ledger.test.ts src/main/ssh/ssh-pty-retired-source-deliveries.test.ts src/main/ssh/ssh-relay-session.test.ts src/main/ssh/ssh-relay-session-data-delivery.test.ts src/main/ssh/ssh-relay-session-recovery-races.test.ts src/main/ssh/ssh-relay-session-incarnation.test.ts src/main/ssh/ssh-relay-session-reconnect-incarnation.test.ts src/main/ssh/ssh-relay-session-terminal-error.test.ts src/main/ssh/ssh-pty-recovery-retention-budget.test.ts src/main/ssh/relay-protocol-backpressure.test.ts src/relay/protocol-backpressure.test.ts src/relay/pty-source-credit-ledger.test.ts src/relay/pty-source-credit-scheduler.test.ts src/relay/relay-pty-source-publication.test.ts src/relay/ssh-pty-source-credit-adapter.test.ts --reporter=dot",
+          "command": "pnpm exec vitest run --config config/vitest.config.ts src/main/providers/ssh-pty-provider.test.ts src/main/providers/ssh-pty-source-delivery-ledger.test.ts src/main/ssh/ssh-pty-retired-source-deliveries.test.ts src/main/ssh/ssh-relay-session.test.ts src/main/ssh/ssh-relay-session-data-delivery.test.ts src/main/ssh/ssh-relay-session-recovery-races.test.ts src/main/ssh/ssh-relay-session-incarnation.test.ts src/main/ssh/ssh-relay-session-reconnect-incarnation.test.ts src/main/ssh/ssh-relay-session-terminal-error.test.ts src/main/ssh/ssh-pty-recovery-retention-budget.test.ts src/relay/protocol-backpressure.test.ts src/relay/pty-source-credit-ledger.test.ts src/relay/pty-source-credit-scheduler.test.ts src/relay/relay-pty-source-publication.test.ts src/relay/ssh-pty-source-credit-adapter.test.ts --reporter=dot",
           "result": "passed",
           "durationSeconds": 2.24,
           "summary": "Sixteen deterministic SSH relay/session/source/decoder files passed 192 tests, including exit-sealed private recovery, retained stale-transfer cancellation authority, exact private-frame proof watermarks, one retirement record across 10,000 same-PTY token rotations, stale-owner fallback, and scheduler rejection isolation; no live topology was exercised."
@@ -14631,7 +15374,7 @@
       "oracle": "Seed status, dispatch, and worker_done rows across direct-handle and canonical Run recipients in an isolated DB. Compare pointer count, RPC and built-CLI check output, direct SQLite rows, unread/peek/all/type filters, concurrent pollers, fixed Delivery IDs, explicit acknowledgment, restart, filtered check --wait, and coordinator remint. Route a 125-row old-handle backlog, inject a commit without notification, and require startup repair. Exercise duplicate Run/Dispatch owners, stale panes, 50-row pages, cancellation, lifecycle fencing, and absent PTYs. Drop a federation ACK, reconnect/restart v1/v2 peers, and require stable import plus no duplicate read-row wake. Hold a healthy SSH write past five seconds but below the 60-second settlement deadline, then distinguish the three settlement outcomes end to end: only a proven refusal releases the reservation and drains a delivery parked behind the watermark; a dropped in-flight settlement must surface as unverifiable with bytes handed to the transport, preserve the durable write-attempted reservation, and emit no duplicate pointer after restart; a settled write that throws mid-pointer is unverifiable, not a refusal; and an Enter whose settlement is lost stays at enter-attempted so restart emits no second Enter. Install the production PTY controller and verify that it routes settled writes through the owning provider and refuses before any byte when the routed provider cannot settle. Census every production PTY provider class and reject a settlement synthesized from the fire-and-forget write.",
       "commands": [
         "pnpm run build:cli && pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orchestration-message-delivery-identity.test.ts --reporter=dot --testTimeout=5000",
-        "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orchestration-mailbox-routing-races.test.ts src/main/runtime/orchestration-mailbox-notification-consistency.test.ts src/main/runtime/orchestration-mailbox-detached-routing.test.ts src/main/runtime/orchestration-mailbox-transport-settlement.test.ts src/main/ipc/pty-controller-ownership-routing.test.ts src/main/runtime/orchestration/run-coordinator-handle-migration.test.ts src/main/runtime/orchestration/orchestration-run-delivery-db.test.ts src/main/runtime/orchestration/orchestration-worker-dispatch-db.test.ts src/main/runtime/orchestration/formatter.test.ts src/main/providers/ssh-pty-provider.test.ts src/main/providers/ssh-pty-write.test.ts src/main/providers/settled-pty-writer-census.test.ts src/main/runtime/orchestration/mailbox-pointer-stage.test.ts src/main/daemon/client.test.ts src/main/daemon/daemon-pty-router.test.ts src/main/daemon/degraded-daemon-pty-provider.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orchestration-mailbox-routing-races.test.ts src/main/runtime/orchestration-mailbox-notification-consistency.test.ts src/main/runtime/orchestration-mailbox-detached-routing.test.ts src/main/runtime/orchestration-mailbox-transport-settlement.test.ts src/main/ipc/pty-controller-ownership-routing.test.ts src/main/runtime/orchestration/run-coordinator-handle-migration.test.ts src/main/runtime/orchestration/orchestration-run-delivery-db.test.ts src/main/runtime/orchestration/orchestration-worker-dispatch-db.test.ts src/main/runtime/orchestration/formatter.test.ts src/main/providers/ssh-pty-provider.test.ts src/main/providers/ssh-pty-write.test.ts src/main/runtime/orchestration/mailbox-pointer-stage.test.ts src/main/daemon/client.test.ts src/main/daemon/daemon-pty-router.test.ts src/main/daemon/degraded-daemon-pty-provider.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orca-runtime.test.ts src/main/runtime/terminal-send-stale-leaf-liveness.test.ts src/main/runtime/rpc/methods/orchestration/runs/runs.test.ts src/main/runtime/rpc/methods/orchestration/messaging/send.test.ts src/main/runtime/rpc/methods/orchestration/messaging/check.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orchestration/federation-sync.test.ts src/main/runtime/rpc/methods/orchestration/federation/federation.test.ts src/main/runtime/rpc/methods/orchestration/federation/federation-lifecycle-settlement.test.ts --reporter=dot"
       ],
@@ -14648,7 +15391,6 @@
         "src/main/runtime/orchestration/formatter.test.ts",
         "src/main/providers/ssh-pty-provider.test.ts",
         "src/main/providers/ssh-pty-write.test.ts",
-        "src/main/providers/settled-pty-writer-census.test.ts",
         "src/main/runtime/orchestration/mailbox-pointer-stage.test.ts",
         "src/main/daemon/client.test.ts",
         "src/main/daemon/daemon-pty-router.test.ts",
@@ -14750,13 +15492,6 @@
           "file": "src/main/runtime/orchestration/mailbox-pointer-stage.test.ts",
           "assertions": ["a refused pointer write drains a delivery parked behind its watermark"]
         },
-        {
-          "file": "src/main/providers/settled-pty-writer-census.test.ts",
-          "assertions": [
-            "every production IPtyProvider class exposes a settled writer",
-            "no settled writer synthesizes its settlement from the fire-and-forget write"
-          ]
-        },
         {
           "file": "src/main/ipc/pty-controller-ownership-routing.test.ts",
           "assertions": [
@@ -14796,7 +15531,7 @@
           "date": "2026-09-05",
           "runner": "local",
           "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orchestration-mailbox-routing-races.test.ts src/main/runtime/orchestration-mailbox-notification-consistency.test.ts src/main/runtime/orchestration-mailbox-detached-routing.test.ts src/main/runtime/orchestration-mailbox-transport-settlement.test.ts src/main/ipc/pty-controller-ownership-routing.test.ts src/main/runtime/orchestration/run-coordinator-handle-migration.test.ts src/main/runtime/orchestration/orchestration-run-delivery-db.test.ts src/main/runtime/orchestration/orchestration-worker-dispatch-db.test.ts src/main/runtime/orchestration/formatter.test.ts src/main/providers/ssh-pty-provider.test.ts src/main/providers/ssh-pty-write.test.ts src/main/providers/settled-pty-writer-census.test.ts src/main/runtime/orchestration/mailbox-pointer-stage.test.ts src/main/daemon/client.test.ts src/main/daemon/daemon-pty-router.test.ts src/main/daemon/degraded-daemon-pty-provider.test.ts",
+          "command": "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orchestration-mailbox-routing-races.test.ts src/main/runtime/orchestration-mailbox-notification-consistency.test.ts src/main/runtime/orchestration-mailbox-detached-routing.test.ts src/main/runtime/orchestration-mailbox-transport-settlement.test.ts src/main/ipc/pty-controller-ownership-routing.test.ts src/main/runtime/orchestration/run-coordinator-handle-migration.test.ts src/main/runtime/orchestration/orchestration-run-delivery-db.test.ts src/main/runtime/orchestration/orchestration-worker-dispatch-db.test.ts src/main/runtime/orchestration/formatter.test.ts src/main/providers/ssh-pty-provider.test.ts src/main/providers/ssh-pty-write.test.ts src/main/runtime/orchestration/mailbox-pointer-stage.test.ts src/main/daemon/client.test.ts src/main/daemon/daemon-pty-router.test.ts src/main/daemon/degraded-daemon-pty-provider.test.ts",
           "result": "passed",
           "durationSeconds": 4.73,
           "summary": "267 tests passed after the pointer-write path moved to the three-valued WriteSettlement union. New coverage: a dropped in-flight SSH settlement reaches the stager as unverifiable with bytes handed to the transport, a settled write that throws mid-pointer preserves the write-attempted reservation, an Enter whose settlement is lost stays at enter-attempted with no second Enter after restart, a refusal releases the reservation and drains a delivery parked behind its watermark, the production controller refuses before any byte when the routed provider cannot settle, and a census pins the five production IPtyProvider classes and rejects a settlement synthesized from the fire-and-forget write. Each new assertion was verified red against the pre-fix shape."
@@ -14805,7 +15540,7 @@
           "date": "2026-08-13",
           "runner": "local",
           "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orchestration-mailbox-routing-races.test.ts src/main/runtime/orchestration-mailbox-notification-consistency.test.ts src/main/runtime/orchestration-mailbox-detached-routing.test.ts src/main/runtime/orchestration-mailbox-transport-settlement.test.ts src/main/ipc/pty-controller-ownership-routing.test.ts src/main/runtime/orchestration/run-coordinator-handle-migration.test.ts src/main/runtime/orchestration/orchestration-run-delivery-db.test.ts src/main/runtime/orchestration/orchestration-worker-dispatch-db.test.ts src/main/runtime/orchestration/formatter.test.ts src/main/providers/ssh-pty-provider.test.ts src/main/providers/ssh-pty-write.test.ts src/main/providers/settled-pty-writer-census.test.ts src/main/runtime/orchestration/mailbox-pointer-stage.test.ts src/main/daemon/client.test.ts src/main/daemon/daemon-pty-router.test.ts src/main/daemon/degraded-daemon-pty-provider.test.ts",
+          "command": "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orchestration-mailbox-routing-races.test.ts src/main/runtime/orchestration-mailbox-notification-consistency.test.ts src/main/runtime/orchestration-mailbox-detached-routing.test.ts src/main/runtime/orchestration-mailbox-transport-settlement.test.ts src/main/ipc/pty-controller-ownership-routing.test.ts src/main/runtime/orchestration/run-coordinator-handle-migration.test.ts src/main/runtime/orchestration/orchestration-run-delivery-db.test.ts src/main/runtime/orchestration/orchestration-worker-dispatch-db.test.ts src/main/runtime/orchestration/formatter.test.ts src/main/providers/ssh-pty-provider.test.ts src/main/providers/ssh-pty-write.test.ts src/main/runtime/orchestration/mailbox-pointer-stage.test.ts src/main/daemon/client.test.ts src/main/daemon/daemon-pty-router.test.ts src/main/daemon/degraded-daemon-pty-provider.test.ts",
           "result": "passed",
           "durationSeconds": 8.22,
           "summary": "245 tests passed across mailbox identity, durable coordinator-handle migration, insertion-time canonicalization, duplicate-free 51-row ownership branch caps, unrestricted reservation merging, direct and Dispatch pointer suppression, persisted reconciliation, 50-row paging and filtered waits, cross-PTY serialization, lifecycle fencing, bounded daemon and SSH transport settlement, outstanding Deliveries, reminted Dispatch ownership, acknowledgment, cancellation, and bounded pane lookup."
@@ -17447,6 +18182,86 @@
       ],
       "demotionRule": "Demote or quarantine if the gate flakes once without a product bug or harness bug filed to the owner."
     },
+    {
+      "id": "runtime-events.renderer-subscription-ownership",
+      "title": "Runtime events stay owned by their renderer subscription",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "runtime-platform",
+      "layer": "ipc-contract",
+      "surfaces": [
+        "renderer runtime events",
+        "remote runtime reconnect replay",
+        "renderer Linear refresh"
+      ],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["remote-runtime"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": ["remote-runtime"],
+      "coverageNotes": "Actual renderer manager, bridge, store actions, adapter and preload dispatcher with synthetic IPC boundaries on macOS. No rendered/native lifecycle, live peer or real provider network claim.",
+      "motivatingLinks": [
+        "https://github.com/stablyai/orca/blob/main/src/renderer/src/hooks/runtime-client-events-sync.ts"
+      ],
+      "invariant": "Only the current subscription attempt can cause renderer event work or reconnect recovery. Current early frames and other hosts survive; canceled late setup handles dispose.",
+      "oracle": "Hold setup, clean up the bridge, deliver100 events and a replay, and require zero provider read dispatches/cache publications/recovery/re-subscriptions. Require initial/live delivery, same-ID replacement, rekey, stop during synchronous setup, sibling host survival and late disposal.",
+      "commands": [
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/hooks/runtime-client-events-sync-ownership.test.ts src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge-ownership.test.ts src/renderer/src/hooks/runtime-client-events-sync.test.ts src/renderer/src/hooks/ipc-events/runtime-reconnect-host-status.test.ts src/renderer/src/runtime/runtime-client-events.test.ts src/preload/runtime-environment-subscriptions.test.ts"
+      ],
+      "testFiles": [
+        "src/renderer/src/hooks/runtime-client-events-sync-ownership.test.ts",
+        "src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge-ownership.test.ts",
+        "src/renderer/src/hooks/runtime-client-events-sync.test.ts",
+        "src/renderer/src/hooks/ipc-events/runtime-reconnect-host-status.test.ts",
+        "src/renderer/src/runtime/runtime-client-events.test.ts",
+        "src/preload/runtime-environment-subscriptions.test.ts"
+      ],
+      "assertionRefs": [
+        {
+          "file": "src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge-ownership.test.ts",
+          "assertions": [
+            "does no Linear read dispatch or cache publication after cleanup while setup is pending",
+            "does no replay recovery or resubscription after cleanup",
+            "accepts a fresh bridge early frame while rejecting the previous bridge frame"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-09-25",
+          "runner": "local",
+          "platform": "macos",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/hooks/runtime-client-events-sync-ownership.test.ts src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge-ownership.test.ts src/renderer/src/hooks/runtime-client-events-sync.test.ts src/renderer/src/hooks/ipc-events/runtime-reconnect-host-status.test.ts src/renderer/src/runtime/runtime-client-events.test.ts src/preload/runtime-environment-subscriptions.test.ts",
+          "result": "passed",
+          "durationSeconds": 2.12,
+          "summary": "41 tests /6 suites pass;13 new regressions have12 failures /1 pass against original production source."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 15,
+        "scope": "Focused deterministic renderer/preload suites; p95 not established."
+      },
+      "flakeHistory": {
+        "status": "not-started",
+        "evidence": "Local validation only; no CI soak."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "12/13 new tests fail original source; candidate41 tests pass.100 stale dispatches/publications become0 each."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "No new timers, scans or IPC. Per-event O(1) owner guard adds paired median0.026ms/10k pending events and0.062ms/10k settled events. Each benchmark delivers2.2million events with no per-event desired/key reads. Synthetic timing, no rendered latency claim."
+      },
+      "knownGaps": [
+        "No native Windows/Linux/WSL, live SSH/remote or rendered app lifecycle test.",
+        "Already-admitted asynchronous handlers are not canceled; physical listener cleanup still waits for setup settlement.",
+        "No CI soak or mounted render/network/heap measurement."
+      ],
+      "promotionCriteria": [
+        "Retain actual composed dispatch/publication and late-disposal oracles; add CI soak and cross-platform lifecycle evidence before promotion."
+      ],
+      "demotionRule": "Keep experimental until soak; investigate failures without suppressing ownership assertions or unexplained retries."
+    },
     {
       "id": "runtime-files.watcher-process-isolation",
       "title": "Runtime and SSH relay watcher faults stay process-isolated without disrupting host services",
@@ -20305,6 +21120,162 @@
         "Retain red/green count and latency assertions; collect cross-platform and CI soak evidence."
       ],
       "demotionRule": "Keep experimental until soak evidence; investigate lifecycle failures without retries or weakening count, identity or cleanup assertions."
+    },
+    {
+      "id": "relay.assignment-headroom-scope",
+      "title": "Single-cell admission preserves capacity with bounded headroom reads",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "relay",
+      "layer": "sqlite-store-integration",
+      "surfaces": ["relay assignment admission", "relay migration target capacity"],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["relay"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": ["relay"],
+      "coverageNotes": "Actual assignment store and SQLite tests on macOS. No real PostgreSQL or live remote host/physical phone run. Local/daemon PTY, SSH execution ownership, WSL, folder/git workspace behavior and transport framing are unaffected.",
+      "motivatingLinks": ["https://github.com/stablyai/orca/issues/23035"],
+      "invariant": "A single-cell capacity check reads only that cell while retaining snapshot freshness, incarnation, outstanding reservation and missing-limit policy; new placement retains the full fleet inventory.",
+      "oracle": "With 32 capped cells, an existing active host stays on its pinned cell and reads one headroom row; new placement reads all 32. Missing, expired or prior-incarnation snapshots, capacity exhaustion and outstanding debt still refuse the active pinned host; an uncapped cell remains admissible.",
+      "commands": [
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir cloud/apps/relay exec vitest run ../../../cloud/apps/relay/src/assignment-headroom-scope.test.ts ../../../cloud/apps/relay/src/assignment-connection-headroom.test.ts ../../../cloud/apps/relay/src/assignment-store.test.ts ../../../cloud/apps/relay/src/assignment-store-lock-order.test.ts ../../../cloud/apps/relay/src/cell-inventory-lock-contention.test.ts ../../../cloud/apps/relay/src/assignment-isolated-cell-replacement.test.ts ../../../cloud/apps/relay/src/regional-rehome-target-selection.test.ts --silent=false"
+      ],
+      "testFiles": [
+        "cloud/apps/relay/src/assignment-headroom-scope.test.ts",
+        "cloud/apps/relay/src/assignment-connection-headroom.test.ts",
+        "cloud/apps/relay/src/assignment-store.test.ts",
+        "cloud/apps/relay/src/assignment-store-lock-order.test.ts",
+        "cloud/apps/relay/src/cell-inventory-lock-contention.test.ts",
+        "cloud/apps/relay/src/assignment-isolated-cell-replacement.test.ts",
+        "cloud/apps/relay/src/regional-rehome-target-selection.test.ts"
+      ],
+      "assertionRefs": [
+        {
+          "file": "cloud/apps/relay/src/assignment-headroom-scope.test.ts",
+          "assertions": [
+            "reads one cell for a sticky assignment even when the capped fleet grows",
+            "still considers the full fleet for a new placement",
+            "rejects the pinned active host with %s",
+            "preserves admission for cells without a connection limit",
+            "counts outstanding reservations at the admission boundary"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-09-25",
+          "runner": "local",
+          "platform": "macos",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir cloud/apps/relay exec vitest run ../../../cloud/apps/relay/src/assignment-headroom-scope.test.ts ../../../cloud/apps/relay/src/assignment-connection-headroom.test.ts ../../../cloud/apps/relay/src/assignment-store.test.ts ../../../cloud/apps/relay/src/assignment-store-lock-order.test.ts ../../../cloud/apps/relay/src/cell-inventory-lock-contention.test.ts ../../../cloud/apps/relay/src/assignment-isolated-cell-replacement.test.ts ../../../cloud/apps/relay/src/regional-rehome-target-selection.test.ts --silent=false",
+          "result": "passed",
+          "durationSeconds": 0.513,
+          "summary": "189 tests across seven files passed; independent root rerun also passed189 tests. Relay typecheck passed separately."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 30,
+        "scope": "Focused SQLite store/capacity/lock-order suites; p95 not established."
+      },
+      "flakeHistory": {
+        "status": "not-started",
+        "evidence": "Local validation only; no CI soak."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "Baseline two count regressions failed: sticky headroom 32 rows instead of 1 and uncapped target 31 unrelated rows instead of 0. Narrowed query passes all eight regression cases."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "Actual sticky path result rows 32 to 1; no new timer, polling, queue, cache or provider call. Supplemental SQLite query benchmark with 32 cells and 400 active reservations each measured median per-query 0.285ms to 0.022ms; not a production PostgreSQL latency claim."
+      },
+      "knownGaps": [
+        "Real PostgreSQL query plan and concurrent admission not rerun for the scoped variant.",
+        "Windows/Linux execution, live remote host/mobile flows and CI soak are not recorded."
+      ],
+      "promotionCriteria": [
+        "Retain red/green row budget and semantic admission cases; collect PostgreSQL, cross-platform and CI soak evidence."
+      ],
+      "demotionRule": "Keep experimental until soak evidence; investigate admission/ownership regressions without weakening row or capacity assertions."
+    },
+    {
+      "id": "terminal-history.tombstone-rescan-ownership",
+      "title": "Shell-history cleanup reuses one directory listing while preserving deletion ownership",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "desktop-runtime",
+      "layer": "main-filesystem-contract",
+      "surfaces": ["shell-history tombstone cleanup", "native and WSL history deletion"],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["local", "wsl"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": ["local", "wsl"],
+      "coverageNotes": "Actual macOS temp-filesystem deletion and fake WSL cleanup ownership. Live Windows, Linux and WSL execution untested; SSH and daemon replay unaffected because every path here is host-local.",
+      "motivatingLinks": ["https://github.com/stablyai/orca/issues/23030"],
+      "invariant": "Only renamed tombstones are recursively removed, active plus retry admissions stay at 64, retries retain their delays and exhaustion behavior, a root displaced at the cap is admitted from another root's freed slot, and no tombstone is handed to removal twice per listing.",
+      "oracle": "Drain 1,024 real directory entries in controlled batches using at most 8 directory listings and 64 active removals. Exercise late arrivals discovered after the listing, both roots draining under one shared cap, a failing listing mid-drain, delayed failure retries, exhausted attempt budgets, and cancellation of an in-flight listing.",
+      "commands": [
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/terminal-history-tombstone-scan-cost.test.ts src/main/terminal-history-async-delete.test.ts src/main/terminal-history-tombstone-retry.test.ts src/main/terminal-history-gc-fs-call-count.test.ts src/main/terminal-history-gc.test.ts src/main/terminal-history.test.ts"
+      ],
+      "testFiles": [
+        "src/main/terminal-history-tombstone-scan-cost.test.ts",
+        "src/main/terminal-history-async-delete.test.ts",
+        "src/main/terminal-history-tombstone-retry.test.ts",
+        "src/main/terminal-history-gc-fs-call-count.test.ts",
+        "src/main/terminal-history-gc.test.ts",
+        "src/main/terminal-history.test.ts"
+      ],
+      "assertionRefs": [
+        {
+          "file": "src/main/terminal-history-tombstone-scan-cost.test.ts",
+          "assertions": [
+            "drains 1024 tombstones without re-reading the directory per completion",
+            "picks up a tombstone created after the queued names were read",
+            "drains both roots within the shared admission cap without per-completion reads",
+            "keeps draining after a directory read fails mid-drain",
+            "drops an in-flight refill during fixture cleanup",
+            "preserves delayed failure retries while successful removals replenish the queue",
+            "does not retry a tombstone past its attempt budget when another root frees slots"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-09-26",
+          "runner": "local",
+          "platform": "macos",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/terminal-history-tombstone-scan-cost.test.ts src/main/terminal-history-async-delete.test.ts src/main/terminal-history-tombstone-retry.test.ts src/main/terminal-history-gc-fs-call-count.test.ts src/main/terminal-history-gc.test.ts src/main/terminal-history.test.ts",
+          "result": "passed",
+          "durationSeconds": 1.95,
+          "summary": "86 tests across six suites passed, repeated three times with no flakes."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 15,
+        "scope": "focused temp-filesystem history tests"
+      },
+      "flakeHistory": {
+        "status": "unknown",
+        "evidence": "Local author and independent runs pass; CI/soak history not collected."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "Pre-change main lists the tombstone directory 1,026 times for 1,024 tombstones and fails the bounded-listing oracle. Reusing one listing reduces it to 6 while still removing every entry."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "Five real-filesystem samples per version, 1,024 tombstone directories each holding a meta.json, macOS arm64 / Node 24, identical harness. Median directory listings 1,026 to 6, names enumerated 494,348 to 1,077, blocking main-thread time in the rescan path 820 to 7 ms (the listings themselves 266 to 2.7 ms, and now off-thread), total drain 886 to 75 ms. The remaining ~70 ms is the recursive rm itself and is unchanged. Average concurrent removals 62 of 64, restored from the 46 an event-loop-deferred refill left idle. No polling, no new timers, and no work deferred past process exit."
+      },
+      "promotionCriteria": [
+        "Collect 100 consecutive CI passes or 14 days of soak history.",
+        "Run native Windows and WSL history cleanup on real filesystems."
+      ],
+      "knownGaps": [
+        "No rendered UI latency measurement or physical Windows/Linux/WSL run.",
+        "One listing is retained per root while it drains, about 160 KB per 1,024 tombstones, shrinking as names are consumed.",
+        "A small backlog still costs roughly one listing per completion batch, of a directory that is nearly empty by then.",
+        "A tombstone that exhausts its retries stays on disk until the next startup, unchanged from before."
+      ],
+      "demotionRule": "Keep experimental or demote if the reused listing strands a displaced root, crosses the admission cap, rearms an exhausted retry through another root, hands one tombstone to removal twice, or touches a recreated live history path."
     }
   ]
 }
diff --git a/config/scripts/audit-localization-coverage.mjs b/config/scripts/audit-localization-coverage.mjs
index e25a7bc222e1..c5f27a664228 100644
--- a/config/scripts/audit-localization-coverage.mjs
+++ b/config/scripts/audit-localization-coverage.mjs
@@ -7,9 +7,9 @@ import process from 'node:process'
 import ts from 'typescript-api'
 
 const SOURCE_EXTENSIONS = new Set(['.ts', '.tsx', '.js', '.jsx', '.mts', '.cts'])
-// Why: test-only modules live beside their spec as `*-test-harness.ts` / `*-fixtures.ts` here, not under `__tests__/`.
+// Why: test-only modules live beside their spec as `*-test-harness.ts` / `*-test-rig.ts` / `*-fixtures.ts` here, not under `__tests__/`.
 const TEST_SUPPORT_FILE_PATTERN =
-  /[.-](?:test-harness|test-fixtures?|test-state|test-support|fixtures?)\.[cm]?[jt]sx?$/
+  /[.-](?:test-harness|test-rig|test-fixtures?|test-state|test-support|fixtures?)\.[cm]?[jt]sx?$/
 const SKIP_PATH_PARTS = new Set(['.git', 'dist', 'node_modules', 'out', '__snapshots__', 'assets'])
 const LOCALIZATION_CALL_NAMES = new Set(['t', 'translate'])
 const USER_VISIBLE_JSX_ATTRIBUTES = new Set([
diff --git a/config/scripts/audit-localization-coverage.test.mjs b/config/scripts/audit-localization-coverage.test.mjs
index 477054f2e8fa..6460dc9f36d3 100644
--- a/config/scripts/audit-localization-coverage.test.mjs
+++ b/config/scripts/audit-localization-coverage.test.mjs
@@ -50,6 +50,7 @@ describe('localization coverage file skipping', () => {
 
   it('skips test-only modules that sit beside their spec', () => {
     expect(skipped('src/renderer/src/components/browser-pane/stream-test-harness.ts')).toBe(true)
+    expect(skipped('src/renderer/src/runtime/browser-tab-creation-test-rig.ts')).toBe(true)
     expect(skipped('src/renderer/src/hooks/ipc-events-test-fixtures.ts')).toBe(true)
     expect(skipped('src/renderer/src/lib/session-test-state.ts')).toBe(true)
     expect(skipped('src/renderer/src/store/slices/routing-fixture.ts')).toBe(true)
diff --git a/config/scripts/build-mobile-web-app-bundle.mjs b/config/scripts/build-mobile-web-app-bundle.mjs
index 51178e9bed5f..1bfad89b6e73 100644
--- a/config/scripts/build-mobile-web-app-bundle.mjs
+++ b/config/scripts/build-mobile-web-app-bundle.mjs
@@ -1,4 +1,5 @@
 import { readFile } from 'node:fs/promises'
+import { readRouteSnapshot } from './mobile-web-app-route-snapshot.mjs'
 import { realpathSync } from 'node:fs'
 import { basename, extname, join, resolve } from 'node:path'
 import { createRequire } from 'node:module'
@@ -466,7 +467,10 @@ const isScriptOutput = (path) => path.endsWith('.js')
  * wrap every route, and their imports are part of the page as surely as the route module's.
  */
 export async function mobileWebAppRouteClosure(routeModule) {
-  return await mobileWebAppModuleClosure(['app/_layout', 'app/h/_layout', routeModule])
+  return (
+    readRouteSnapshot(routeModule) ??
+    (await mobileWebAppModuleClosure(['app/_layout', 'app/h/_layout', routeModule]))
+  )
 }
 
 /**
diff --git a/config/scripts/build-mobile-web-app-bundle.test.mjs b/config/scripts/build-mobile-web-app-bundle.test.mjs
index 1b0954167082..baa18b6b39d2 100644
--- a/config/scripts/build-mobile-web-app-bundle.test.mjs
+++ b/config/scripts/build-mobile-web-app-bundle.test.mjs
@@ -1,9 +1,13 @@
-import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
+import { mkdir, readFile, writeFile } from 'node:fs/promises'
 import { join, relative } from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { deserialize, serialize } from 'node:v8'
 import { describe, expect, it } from 'vitest'
+import {
+  withScratch,
+  readAppBundle,
+  readWrittenBundle,
+  copyWrittenBundle
+} from './mobile-web-app-bundle-test-fixture.mjs'
 import {
   MOBILE_WEB_APP_NATIVE_PARITY_STYLE,
   MOBILE_WEB_APP_ROOT_RESET,
@@ -66,34 +70,6 @@ function allScriptSource({ script, chunks }) {
   return [script, ...chunks.map((chunk) => chunk.bytes)].map((bytes) => bytes.toString('utf8'))
 }
 
-async function withScratch(run) {
-  const scratch = await mkdtemp(join(tmpdir(), 'orca-mobile-web-app-test-'))
-  try {
-    return await run(scratch)
-  } finally {
-    await rm(scratch, { recursive: true, force: true })
-  }
-}
-
-// Snapshots preserve Buffer methods and give each assertion its own mutable copy.
-let appBundleSnapshot
-let writtenBundleSnapshot
-
-async function readAppBundle() {
-  appBundleSnapshot ??= bundleMobileWebApp().then(serialize)
-  // Deserialized Buffers alias their snapshot, so copy it before exposing them.
-  return deserialize(Buffer.from(await appBundleSnapshot))
-}
-
-async function readWrittenBundle() {
-  writtenBundleSnapshot ??= withScratch(async (scratch) => {
-    const { outDir, ...result } = await buildMobileWebAppBundle({ outDir: join(scratch, 'bundle') })
-    const html = await readFile(join(outDir, 'index.html'), 'utf8')
-    return serialize({ ...result, html })
-  })
-  return deserialize(await writtenBundleSnapshot)
-}
-
 describe('the CRLF pin', () => {
   it('exempts the same extensions in .gitattributes as the CRLF scan skips', async () => {
     const attributes = await readFile(join(projectDir, '.gitattributes'), 'utf8')
@@ -124,6 +100,19 @@ describeBundling('the app bundle', () => {
     const written = await readWrittenBundle()
     written.manifest.assets.length = 0
     expect((await readWrittenBundle()).manifest.assets.length).toBeGreaterThan(0)
+    const originalByte = written.files[0].bytes[0]
+    written.files[0].bytes[0] ^= 255
+    expect((await readWrittenBundle()).files[0].bytes[0]).toBe(originalByte)
+    await withScratch(async (scratch) => {
+      const firstDir = join(scratch, 'first')
+      await copyWrittenBundle(firstDir)
+      await writeFile(join(firstDir, 'manifest.json'), 'corrupted')
+      const secondDir = join(scratch, 'second')
+      const second = await copyWrittenBundle(secondDir)
+      for (const { file, bytes } of second.files) {
+        expect((await readFile(join(secondDir, file))).equals(bytes), file).toBe(true)
+      }
+    })
   }, 120_000)
 
   it('resolves react-native to react-native-web and leaves no require.context', async () => {
@@ -642,7 +631,7 @@ describe('the verifier', () => {
     async () => {
       await withScratch(async (scratch) => {
         const outDir = join(scratch, 'mobile-web')
-        await buildMobileWebAppBundle({ outDir })
+        await copyWrittenBundle(outDir)
         await expect(verifyMobileWebAppBundle({ bundleDir: outDir })).resolves.toBeDefined()
       })
     },
@@ -654,7 +643,7 @@ describe('the verifier', () => {
     async () => {
       await withScratch(async (scratch) => {
         const outDir = join(scratch, 'mobile-web')
-        await buildMobileWebAppBundle({ outDir })
+        await copyWrittenBundle(outDir)
         const manifestPath = join(outDir, 'manifest.json')
         const manifest = JSON.parse(await readFile(manifestPath, 'utf8'))
         manifest.buildId = 'f'.repeat(64)
@@ -672,7 +661,7 @@ describe('the verifier', () => {
     async () => {
       await withScratch(async (scratch) => {
         const outDir = join(scratch, 'mobile-web')
-        const { manifest } = await buildMobileWebAppBundle({ outDir })
+        const { manifest } = await copyWrittenBundle(outDir)
         // What a stale out/ actually looks like: every digest agrees with its bytes and the
         // buildId derives from the asset list, but the source has moved on. Only the two fresh
         // builds the verifier runs can tell, which is the check this covers.
diff --git a/config/scripts/build-relay.mjs b/config/scripts/build-relay.mjs
index c67ece1dca84..a122c661df13 100644
--- a/config/scripts/build-relay.mjs
+++ b/config/scripts/build-relay.mjs
@@ -118,13 +118,7 @@ const OUT_ROOT = process.env.ORCA_RELAY_OUT_ROOT ?? join(ROOT, 'out', 'relay')
 
 const RELAY_VERSION = '0.1.0'
 
-for (const platform of RELAY_BUILD_PLATFORMS) {
-  const outDir = join(OUT_ROOT, platform)
-  // Why: a stale companion left by an earlier build would otherwise satisfy the
-  // manifest check and be hashed into .version, shipping mixed-generation bytes.
-  rmSync(outDir, { recursive: true, force: true })
-  mkdirSync(outDir, { recursive: true })
-
+async function buildRelayBundles(outDir) {
   await build({
     entryPoints: [RELAY_ENTRY],
     bundle: true,
@@ -142,22 +136,6 @@ for (const platform of RELAY_BUILD_PLATFORMS) {
     }
   })
 
-  if (isWindowsRelayPlatform(platform)) {
-    copyFileSync(
-      NODE_PTY_CONSOLE_LIST_PATCH_SOURCE,
-      join(outDir, NODE_PTY_CONSOLE_LIST_PATCH_FILENAME)
-    )
-    copyFileSync(
-      NODE_PTY_WINDOWS_TEARDOWN_PATCH_SOURCE,
-      join(outDir, NODE_PTY_WINDOWS_TEARDOWN_PATCH_FILENAME)
-    )
-  }
-  copyFileSync(
-    NODE_PTY_MASTER_CLOEXEC_PATCH_SOURCE,
-    join(outDir, NODE_PTY_MASTER_CLOEXEC_PATCH_FILENAME)
-  )
-  stageWindowsProcessTreeAddon(platform, outDir)
-
   await build({
     entryPoints: [WATCHER_ENTRY],
     bundle: true,
@@ -234,6 +212,44 @@ for (const platform of RELAY_BUILD_PLATFORMS) {
       'process.env.NODE_ENV': '"production"'
     }
   })
+}
+
+let bundledSourceDir
+let bundledFilenames = []
+
+for (const platform of RELAY_BUILD_PLATFORMS) {
+  const outDir = join(OUT_ROOT, platform)
+  // Why: a stale companion left by an earlier build would otherwise satisfy the
+  // manifest check and be hashed into .version, shipping mixed-generation bytes.
+  rmSync(outDir, { recursive: true, force: true })
+  mkdirSync(outDir, { recursive: true })
+
+  // The JavaScript selects its host at runtime; only native addons and patches vary.
+  if (bundledSourceDir) {
+    for (const filename of bundledFilenames) {
+      copyFileSync(join(bundledSourceDir, filename), join(outDir, filename))
+    }
+  } else {
+    await buildRelayBundles(outDir)
+    bundledSourceDir = outDir
+    bundledFilenames = readdirSync(outDir)
+  }
+
+  if (isWindowsRelayPlatform(platform)) {
+    copyFileSync(
+      NODE_PTY_CONSOLE_LIST_PATCH_SOURCE,
+      join(outDir, NODE_PTY_CONSOLE_LIST_PATCH_FILENAME)
+    )
+    copyFileSync(
+      NODE_PTY_WINDOWS_TEARDOWN_PATCH_SOURCE,
+      join(outDir, NODE_PTY_WINDOWS_TEARDOWN_PATCH_FILENAME)
+    )
+  }
+  copyFileSync(
+    NODE_PTY_MASTER_CLOEXEC_PATCH_SOURCE,
+    join(outDir, NODE_PTY_MASTER_CLOEXEC_PATCH_FILENAME)
+  )
+  stageWindowsProcessTreeAddon(platform, outDir)
 
   // Why: include a content hash so the deploy check detects code changes even
   // when RELAY_VERSION hasn't been bumped. Hashing the whole manifest means a
diff --git a/config/scripts/build-windows-cli-launcher.mjs b/config/scripts/build-windows-cli-launcher.mjs
index 9d3c9020706c..cc4e5ad3d0f1 100644
--- a/config/scripts/build-windows-cli-launcher.mjs
+++ b/config/scripts/build-windows-cli-launcher.mjs
@@ -1,24 +1,41 @@
 #!/usr/bin/env node
 
 import { spawnSync } from 'node:child_process'
-import { existsSync, mkdirSync, statSync } from 'node:fs'
+import { createHash } from 'node:crypto'
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { dirname, join, resolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
 
-export function shouldReuseCompiledWindowsCliLauncher(
-  outputPath,
-  sourcePath,
-  { reuseCached = false } = {}
-) {
-  if (!existsSync(outputPath)) {
-    return false
+export function windowsCliLauncherFingerprint(inputPaths, version) {
+  const hash = createHash('sha256').update(version)
+  for (const inputPath of inputPaths) {
+    hash.update('\0').update(readFileSync(inputPath))
   }
-  // Why reuseCached: Actions cache keys already hash the C# source, but restore
-  // does not preserve mtimes, so a hit would look stale and recompile anyway.
-  if (reuseCached) {
-    return true
+  return hash.digest('hex')
+}
+
+export function shouldReuseCompiledWindowsCliLauncher(outputPath, fingerprint) {
+  const fingerprintPath = `${outputPath}.sha256`
+  return (
+    existsSync(outputPath) &&
+    existsSync(fingerprintPath) &&
+    readFileSync(fingerprintPath, 'utf8') === fingerprint
+  )
+}
+
+export function windowsCliLauncherVersionSource(version) {
+  const match = /^(\d+)\.(\d+)\.(\d+)(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/.exec(version)
+  if (!match || match.slice(1).some((part) => Number(part) > 65534)) {
+    throw new Error(`Invalid Windows CLI launcher version: ${version}`)
   }
-  return statSync(outputPath).mtimeMs >= statSync(sourcePath).mtimeMs
+  const fileVersion = `${match.slice(1).join('.')}.0`
+  return [
+    'using System.Reflection;',
+    `[assembly: AssemblyVersion("${fileVersion}")]`,
+    `[assembly: AssemblyFileVersion("${fileVersion}")]`,
+    `[assembly: AssemblyInformationalVersion("${version}")]`,
+    ''
+  ].join('\n')
 }
 
 function defaultOutputPath(projectRoot) {
@@ -53,6 +70,19 @@ if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href)
 
   const repoRoot = resolve(import.meta.dirname, '../..')
   const sourcePath = join(repoRoot, 'native', 'windows-cli-launcher', 'OrcaCliLauncher.cs')
+  const manifestPath = join(repoRoot, 'native', 'windows-cli-launcher', 'app.manifest')
+  const iconPath = join(repoRoot, 'resources', 'build', 'icon.ico')
+  const { version } = JSON.parse(readFileSync(join(repoRoot, 'package.json'), 'utf8'))
+  const versionSource = windowsCliLauncherVersionSource(version)
+  const fingerprint = windowsCliLauncherFingerprint(
+    [
+      sourcePath,
+      manifestPath,
+      iconPath,
+      join(repoRoot, 'config/scripts/build-windows-cli-launcher.mjs')
+    ],
+    version
+  )
   const outputPath = readArg('--output') ?? defaultOutputPath(repoRoot)
   const compilerPath = findFrameworkCompiler(process.env)
 
@@ -61,17 +91,26 @@ if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href)
   }
 
   mkdirSync(dirname(outputPath), { recursive: true })
-  if (
-    shouldReuseCompiledWindowsCliLauncher(outputPath, sourcePath, {
-      reuseCached: process.env.ORCA_REUSE_WINDOWS_CLI_LAUNCHER === '1'
-    })
-  ) {
+  if (shouldReuseCompiledWindowsCliLauncher(outputPath, fingerprint)) {
     console.log(`[native-build] reusing Windows CLI launcher at ${outputPath}`)
     process.exit(0)
   }
+  const versionPath = join(dirname(outputPath), 'OrcaCliLauncher.Version.cs')
+  writeFileSync(versionPath, versionSource)
+  rmSync(`${outputPath}.sha256`, { force: true })
   const result = spawnSync(
     compilerPath,
-    ['/nologo', '/target:exe', '/optimize+', '/warnaserror+', `/out:${outputPath}`, sourcePath],
+    [
+      '/nologo',
+      '/target:exe',
+      '/optimize+',
+      '/warnaserror+',
+      `/win32manifest:${manifestPath}`,
+      `/win32icon:${iconPath}`,
+      `/out:${outputPath}`,
+      sourcePath,
+      versionPath
+    ],
     { cwd: repoRoot, stdio: 'inherit' }
   )
 
@@ -84,4 +123,5 @@ if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href)
   if (result.status !== 0) {
     process.exit(result.status ?? 1)
   }
+  writeFileSync(`${outputPath}.sha256`, fingerprint)
 }
diff --git a/config/scripts/build-windows-cli-launcher.test.mjs b/config/scripts/build-windows-cli-launcher.test.mjs
index 823328977152..1e0f363acd03 100644
--- a/config/scripts/build-windows-cli-launcher.test.mjs
+++ b/config/scripts/build-windows-cli-launcher.test.mjs
@@ -5,7 +5,6 @@ import {
   mkdtempSync,
   readFileSync,
   rmSync,
-  statSync,
   utimesSync,
   writeFileSync
 } from 'node:fs'
@@ -13,7 +12,11 @@ import { tmpdir } from 'node:os'
 import { dirname, join, resolve } from 'node:path'
 import { spawnSync } from 'node:child_process'
 import { describe, expect, it } from 'vitest'
-import { shouldReuseCompiledWindowsCliLauncher } from './build-windows-cli-launcher.mjs'
+import {
+  shouldReuseCompiledWindowsCliLauncher,
+  windowsCliLauncherFingerprint,
+  windowsCliLauncherVersionSource
+} from './build-windows-cli-launcher.mjs'
 
 const itCrossHost = process.platform === 'win32' ? it.skip : it
 const projectRoot = resolve(import.meta.dirname, '../..')
@@ -40,33 +43,102 @@ function itWindows(name, test) {
 }
 
 describe('Windows CLI launcher', () => {
-  it('reuses a compiled launcher that is at least as new as the C# source', () => {
+  it('reuses restored builds only while all embedded inputs and the release version match', () => {
     const root = mkdtempSync(join(tmpdir(), 'orca-cli-launcher-reuse-'))
     try {
-      const sourcePath = join(root, 'OrcaCliLauncher.cs')
-      const outputPath = join(root, '.build', 'orca.exe')
-      mkdirSync(join(root, '.build'))
-      writeFileSync(sourcePath, 'source\n')
-      writeFileSync(outputPath, 'binary\n')
-      const later = new Date(statSync(sourcePath).mtimeMs + 1_000)
-      utimesSync(outputPath, later, later)
-
-      expect(shouldReuseCompiledWindowsCliLauncher(outputPath, sourcePath)).toBe(true)
-      writeFileSync(sourcePath, 'changed\n')
-      const sourceLater = new Date(statSync(outputPath).mtimeMs + 1_000)
-      utimesSync(sourcePath, sourceLater, sourceLater)
-      expect(shouldReuseCompiledWindowsCliLauncher(outputPath, sourcePath)).toBe(false)
+      const inputs = ['source.cs', 'app.manifest', 'icon.ico', 'build.mjs'].map((name) => {
+        const path = join(root, name)
+        writeFileSync(path, name)
+        return path
+      })
+      const outputPath = join(root, 'orca.exe')
+      const fingerprint = windowsCliLauncherFingerprint(inputs, '1.4.214')
+      expect(shouldReuseCompiledWindowsCliLauncher(outputPath, fingerprint)).toBe(false)
+      writeFileSync(outputPath, 'binary')
+      expect(shouldReuseCompiledWindowsCliLauncher(outputPath, fingerprint)).toBe(false)
+      writeFileSync(`${outputPath}.sha256`, fingerprint)
+      for (const input of inputs) {
+        utimesSync(input, new Date(), new Date())
+      }
       expect(
-        shouldReuseCompiledWindowsCliLauncher(outputPath, sourcePath, { reuseCached: true })
+        shouldReuseCompiledWindowsCliLauncher(
+          outputPath,
+          windowsCliLauncherFingerprint(inputs, '1.4.214')
+        )
       ).toBe(true)
-      expect(shouldReuseCompiledWindowsCliLauncher(join(root, 'missing.exe'), sourcePath)).toBe(
-        false
-      )
+      expect(
+        shouldReuseCompiledWindowsCliLauncher(
+          outputPath,
+          windowsCliLauncherFingerprint(inputs, '1.4.215')
+        )
+      ).toBe(false)
+      for (const input of inputs) {
+        const original = readFileSync(input)
+        writeFileSync(input, 'changed')
+        expect(
+          shouldReuseCompiledWindowsCliLauncher(
+            outputPath,
+            windowsCliLauncherFingerprint(inputs, '1.4.214')
+          )
+        ).toBe(false)
+        writeFileSync(input, original)
+      }
     } finally {
       removeFixtureTree(root)
     }
   })
 
+  it('keeps prerelease identity while emitting a valid Windows numeric version', () => {
+    const source = windowsCliLauncherVersionSource('1.4.214-daily.202609281300')
+    expect(source).toContain('AssemblyFileVersion("1.4.214.0")')
+    expect(source).toContain('AssemblyInformationalVersion("1.4.214-daily.202609281300")')
+    for (const version of ['1.4.65535', '1.4', '1.4.214"', undefined]) {
+      expect(() => windowsCliLauncherVersionSource(version)).toThrow('Invalid Windows')
+    }
+  })
+
+  itWindows(
+    'embeds publisher, release version, icon and an unelevated application manifest',
+    () => {
+      const root = mkdtempSync(join(tmpdir(), 'orca launcher metadata '))
+      try {
+        const launcherPath = join(root, 'orca.exe')
+        const build = spawnSync(
+          process.execPath,
+          ['config/scripts/build-windows-cli-launcher.mjs', '--output', launcherPath],
+          { cwd: projectRoot, encoding: 'utf8' }
+        )
+        expect(build.status, `${build.stdout}\n${build.stderr}`).toBe(0)
+        const inspect = spawnSync(
+          'powershell.exe',
+          [
+            '-NoProfile',
+            '-NonInteractive',
+            '-Command',
+            '[Diagnostics.FileVersionInfo]::GetVersionInfo($env:ORCA_TEST_LAUNCHER) | ConvertTo-Json -Compress'
+          ],
+          { encoding: 'utf8', env: { ...process.env, ORCA_TEST_LAUNCHER: launcherPath } }
+        )
+        expect(inspect.status, inspect.stderr).toBe(0)
+        const info = JSON.parse(inspect.stdout)
+        const { version } = JSON.parse(readFileSync(join(projectRoot, 'package.json'), 'utf8'))
+        expect(info.CompanyName).toBe('Stably AI')
+        expect(info.ProductName).toBe('Orca')
+        expect(info.FileDescription).toBe('Orca CLI Launcher')
+        expect(info.FileVersion).toBe(`${version.split(/[+-]/)[0]}.0`)
+        expect(info.ProductVersion).toBe(version)
+        const binary = readFileSync(launcherPath)
+        expect(binary.includes(Buffer.from('requestedExecutionLevel level="asInvoker"'))).toBe(true)
+        const icon = readFileSync(join(projectRoot, 'resources', 'build', 'icon.ico'))
+        const imageSize = icon.readUInt32LE(14)
+        const imageOffset = icon.readUInt32LE(18)
+        expect(binary.includes(icon.subarray(imageOffset, imageOffset + imageSize))).toBe(true)
+      } finally {
+        removeFixtureTree(root)
+      }
+    }
+  )
+
   itCrossHost('fails closed when the Windows launcher cannot be compiled on this host', () => {
     const outputRoot = mkdtempSync(join(tmpdir(), 'orca cross-host launcher '))
     try {
diff --git a/config/scripts/bun-profile-change-scope.mjs b/config/scripts/bun-profile-change-scope.mjs
index c30c4a282ac3..dc464a5dc030 100644
--- a/config/scripts/bun-profile-change-scope.mjs
+++ b/config/scripts/bun-profile-change-scope.mjs
@@ -8,6 +8,7 @@ import {
   ORCAD_ENTRY_POINT
 } from './orcad-entry-build.mjs'
 import { bunProfileTestPaths } from './bun-profile-test-paths.mjs'
+import { bunProfileQualification } from './bun-profile-qualification.mjs'
 
 const ROOT = resolve(import.meta.dirname, '../..')
 const BUILD_SCRIPTS = [
@@ -29,7 +30,9 @@ const ALWAYS_FILES = new Set([
   'tsconfig.json',
   '.github/workflows/bun-profile-tests.yml',
   'config/scripts/bun-profile-change-scope.mjs',
-  'config/scripts/bun-profile-change-scope.test.mjs'
+  'config/scripts/bun-profile-change-scope.test.mjs',
+  'config/scripts/bun-profile-qualification.mjs',
+  'config/scripts/bun-profile-qualification.test.mjs'
 ])
 const ALWAYS_PREFIXES = [
   '.github/actions/install-node-dependencies/',
@@ -110,7 +113,11 @@ export async function classifyBunProfileChanges(changedFiles, collect = collectB
       reason: matched ? `Runtime or test dependency changed: ${matched}` : 'No Bun inputs changed'
     }
   } catch (error) {
-    return { shouldRun: true, reason: `Dependency graph unavailable: ${String(error)}` }
+    return {
+      shouldRun: true,
+      graphUnavailable: true,
+      reason: `Dependency graph unavailable: ${String(error)}`
+    }
   }
 }
 
@@ -118,7 +125,8 @@ if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href)
   const changedFiles = readFileSync(process.argv[2], 'utf8').split('\0').filter(Boolean)
   const result = await classifyBunProfileChanges(changedFiles)
   console.log(result.reason)
-  const output = `should_run=${String(result.shouldRun)}\n`
+  const policy = bunProfileQualification(changedFiles, result)
+  const output = `should_run=${result.shouldRun}\nqualification=${policy.qualification}\nrunners=${JSON.stringify(policy.runners)}\n`
   if (process.env.GITHUB_OUTPUT) {
     appendFileSync(process.env.GITHUB_OUTPUT, output)
   } else {
diff --git a/config/scripts/bun-profile-change-scope.test.mjs b/config/scripts/bun-profile-change-scope.test.mjs
index 4b6d1647ffcd..15258cea96d9 100644
--- a/config/scripts/bun-profile-change-scope.test.mjs
+++ b/config/scripts/bun-profile-change-scope.test.mjs
@@ -78,6 +78,7 @@ it.each([
   '.npmrc',
   'tsconfig.json',
   'config/tsconfig.node.json',
+  'config/scripts/bun-profile-qualification.mjs',
   'config/patches/node-pty@1.1.0.patch',
   'native/windows-registry/src/addon.cc',
   '.github/actions/install-node-dependencies/action.yml',
@@ -118,15 +119,13 @@ describe('the actual Bun build and profile-test dependency graph', () => {
     expect((await classifyBunProfileChanges([file], async () => inputs)).shouldRun).toBe(true)
   })
 
-  it('retains all selected tests and uses the same selectors as the Bun runner', () => {
+  it('retains all selected tests and the selectors the Bun runner uses', () => {
     const tests = discoverBunProfileTests()
     expect(tests.length).toBeGreaterThan(80)
     expect(tests.every((file) => inputs.has(file))).toBe(true)
     expect(
       bunProfileTestPaths().every((selector) => tests.some((file) => file.includes(selector)))
     ).toBe(true)
-    const runner = readFileSync(new URL('./run-bun-profile-tests.mjs', import.meta.url), 'utf8')
-    expect(runner).toContain('testArgs.length > 0 ? testArgs : bunProfileTestPaths({ artifact })')
   })
 })
 
@@ -140,12 +139,22 @@ it('keeps all ten platform jobs and runs them when detection is skipped or fails
   expect(workflow.jobs.changes.steps[0].with['persist-credentials']).toBe(false)
   const detect = workflow.jobs.changes.steps.find((step) => step.id === 'scope')
   expect(detect.run).toContain('git diff --name-only --no-renames -z HEAD^1 HEAD')
-  let count = 0
-  for (const jobName of ['persistence', 'linux_glibc_floor', 'linux_musl']) {
+  expect(workflow.on.pull_request.types).toContain('ready_for_review')
+  expect(workflow.on.schedule).toHaveLength(1)
+  // A pull request may qualify one platform, so the merged commit must re-qualify all six.
+  expect(workflow.on.push.branches).toEqual(['main'])
+  expect(workflow.on.push.paths).toEqual(workflow.on.pull_request.paths)
+  // The push and schedule paths must not rest on a null property comparison.
+  expect(workflow.jobs.persistence.if).toContain(
+    "github.event_name != 'pull_request' || github.event.pull_request.draft != true"
+  )
+  expect(workflow.jobs.persistence.strategy.matrix.os).toContain('needs.changes.outputs.runners')
+  for (const jobName of ['linux_glibc_floor', 'linux_musl']) {
     const job = workflow.jobs[jobName]
-    expect(job.needs).toBe('changes')
-    expect(job.if).toBe("${{ !cancelled() && needs.changes.outputs.should_run != 'false' }}")
-    count += job.strategy.matrix.os.length
+    expect(job.needs).toEqual(['changes', 'persistence'])
+    expect(job.if).toContain("needs.persistence.result == 'success'")
+    expect(job.if).toContain("needs.changes.outputs.qualification != 'false'")
+    expect(job.if).toContain("needs.changes.outputs.should_run != 'false'")
+    expect(job.strategy.matrix.os).toEqual(['ubuntu-22.04', 'ubuntu-24.04-arm'])
   }
-  expect(count).toBe(10)
 })
diff --git a/config/scripts/bun-profile-qualification.mjs b/config/scripts/bun-profile-qualification.mjs
new file mode 100644
index 000000000000..dafd137f95e2
--- /dev/null
+++ b/config/scripts/bun-profile-qualification.mjs
@@ -0,0 +1,43 @@
+export const BUN_PERSISTENCE_RUNNERS = [
+  'ubuntu-22.04',
+  'ubuntu-24.04-arm',
+  'macos-14',
+  'macos-15-intel',
+  'windows-2022',
+  'windows-11-arm'
+]
+
+// Only surfaces whose behaviour actually differs per platform. Escalating on `config/`,
+// `resources/` and `.github/` wholesale took 36.5% of the last 1100 commits through all six
+// platforms where a platform-flavoured predicate takes 19%.
+const PLATFORM_PREFIXES = [
+  'native/',
+  'config/patches/',
+  '.github/actions/install-node-dependencies/',
+  'src/main/persistence/',
+  'src/main/sqlite/',
+  'src/main/orcad/',
+  'src/main/providers/',
+  'src/main/daemon/',
+  'src/main/ssh/',
+  'src/main/wsl/',
+  'src/relay/',
+  'src/shared/child-process/'
+]
+
+export function bunProfileQualification(changedFiles, scope) {
+  const platformSpecific = changedFiles.some(
+    (file) =>
+      // A root manifest can move a native dependency on every platform at once.
+      !file.includes('/') ||
+      PLATFORM_PREFIXES.some((prefix) => file.startsWith(prefix)) ||
+      /(?:^|[/.-])(?:windows|win32|wsl|macos|darwin|linux|posix|bun)(?:[/.-]|$)/i.test(file)
+  )
+  // A pull request qualifies one platform unless the change is platform-flavoured; the push to
+  // main re-qualifies all six, so an unescalated miss surfaces minutes after merge, not a day.
+  const full = changedFiles.length === 0 || scope.graphUnavailable === true || platformSpecific
+  return {
+    qualification: full,
+    runners: full ? BUN_PERSISTENCE_RUNNERS : ['ubuntu-22.04']
+  }
+}
diff --git a/config/scripts/bun-profile-qualification.test.mjs b/config/scripts/bun-profile-qualification.test.mjs
new file mode 100644
index 000000000000..520cd76fb213
--- /dev/null
+++ b/config/scripts/bun-profile-qualification.test.mjs
@@ -0,0 +1,56 @@
+import { expect, it } from 'vitest'
+import { BUN_PERSISTENCE_RUNNERS, bunProfileQualification } from './bun-profile-qualification.mjs'
+
+const scope = { shouldRun: true }
+
+it('qualifies one platform for a change no platform can alter', () => {
+  expect(bunProfileQualification(['src/main/runtime/rpc/methods/example.ts'], scope)).toEqual({
+    qualification: false,
+    runners: ['ubuntu-22.04']
+  })
+})
+
+it.each([
+  'src/renderer/src/components/TabStrip.tsx',
+  'config/vitest.config.ts',
+  'config/scripts/ci-unit-plan.mjs',
+  'resources/icons/tray.png',
+  '.github/workflows/pr.yml',
+  'docs/reference/agent-status-store.md'
+])('keeps one platform for unflavoured input %s', (file) => {
+  expect(bunProfileQualification([file], scope).runners).toEqual(['ubuntu-22.04'])
+})
+
+it.each([
+  'package.json',
+  'pnpm-lock.yaml',
+  'native/windows-registry/src/addon.cc',
+  'config/patches/node-pty.patch',
+  '.github/actions/install-node-dependencies/action.yml',
+  'src/main/ssh/ssh-provider.ts',
+  'src/main/providers/local-pty-provider.ts',
+  'src/shared/child-process/run-process.ts',
+  'src/main/persistence/profile-state/store.ts',
+  'src/main/sqlite/database.ts',
+  'src/main/orcad/entry.ts',
+  'src/main/runtime/windows-terminal.ts',
+  'src/shared/linux-glibc.ts',
+  'src/main/daemon/entry.ts',
+  'src/relay/index.ts',
+  'src/main/wsl/runner.ts'
+])('retains all platforms for platform-flavoured input %s', (file) => {
+  expect(bunProfileQualification([file], scope)).toEqual({
+    qualification: true,
+    runners: BUN_PERSISTENCE_RUNNERS
+  })
+})
+
+it('fails closed to every platform when the evidence is incomplete', () => {
+  expect(bunProfileQualification([], scope).qualification).toBe(true)
+  expect(
+    bunProfileQualification(['src/main/runtime/rpc/methods/example.ts'], {
+      ...scope,
+      graphUnavailable: true
+    }).qualification
+  ).toBe(true)
+})
diff --git a/config/scripts/check-changed-code-quality.mjs b/config/scripts/check-changed-code-quality.mjs
index 25a2da969c91..7906ad8b9ca2 100644
--- a/config/scripts/check-changed-code-quality.mjs
+++ b/config/scripts/check-changed-code-quality.mjs
@@ -150,9 +150,14 @@ function resolveBase(root, requestedBase) {
 }
 
 export function collectAddedLineRanges(root, requestedBase) {
-  const base = resolveBase(root, requestedBase)
-  const mergeBase = runGit(root, ['merge-base', base, 'HEAD']).trim()
-  const comparisonBase = resolvePullRequestDiffBase(root, mergeBase)
+  // On a pull_request checkout HEAD is the merge commit, so its first parent is the base side and
+  // no merge base has to be computed. Resolving it first is what lets CI checkout shallowly: the
+  // payload base SHA can lag HEAD^1 by any number of commits and need not be in the graph at all.
+  // Off that ref (local runs) the requested base is an arbitrary branch tip, so the merge base is
+  // still what isolates this branch's own lines.
+  const comparisonBase =
+    resolvePullRequestDiffBase(root, null) ??
+    runGit(root, ['merge-base', resolveBase(root, requestedBase), 'HEAD']).trim()
   const changedFiles = splitNullDelimited(
     runGit(root, ['diff', '--name-only', '-z', '--diff-filter=ACMRTUB', comparisonBase, '--'])
   )
@@ -188,7 +193,7 @@ export function collectAddedLineRanges(root, requestedBase) {
     const lineCount = readFileSync(absolutePath, 'utf8').split(/\r?\n/).length
     rangesByFile.set(file, [{ start: 1, end: lineCount }])
   }
-  return { base, comparisonBase, rangesByFile }
+  return { comparisonBase, rangesByFile }
 }
 
 function parseOxlintOutput(stdout, label) {
@@ -438,10 +443,12 @@ export function main(
   root = process.cwd(),
   requestedBase = process.argv.slice(2).find((argument) => argument !== '--')
 ) {
-  const { base, comparisonBase, rangesByFile } = collectAddedLineRanges(root, requestedBase)
+  const { comparisonBase, rangesByFile } = collectAddedLineRanges(root, requestedBase)
   const files = [...rangesByFile.keys()]
   if (files.length === 0) {
-    console.log(`Changed-code quality gate: no changed JavaScript or TypeScript since ${base}.`)
+    console.log(
+      `Changed-code quality gate: no changed JavaScript or TypeScript since ${comparisonBase.slice(0, 12)}.`
+    )
     return 0
   }
 
diff --git a/config/scripts/check-root-directory-entries.test.mjs b/config/scripts/check-root-directory-entries.test.mjs
index f606d5623fd7..6de07a053c71 100644
--- a/config/scripts/check-root-directory-entries.test.mjs
+++ b/config/scripts/check-root-directory-entries.test.mjs
@@ -228,8 +228,14 @@ describe('root directory guard', () => {
 
     expect(guardJob.if).toBeUndefined()
     expect(guardStep.if).toBeUndefined()
-    expect(guardJob.steps[0].with['fetch-depth']).toBe(0)
+    // Why >= 2 rather than 0: the guard compares the merge commit's first parent against the
+    // merged tree, so it needs both parents present but no history beyond them. Depth 1 would
+    // leave HEAD^1 unreachable and the guard would fail closed on every run.
+    expect(guardJob.steps[0].with['fetch-depth']).toBeGreaterThanOrEqual(2)
     expect(guardStep.run).toContain('node .github/scripts/check-root-directory-entries.mjs')
+    // The base side must come from the merge ref, not the event payload, or a shallow checkout
+    // cannot resolve it.
+    expect(guardStep.run).toContain('git-pull-request-diff-base.mjs')
     expect(workflow.jobs.verify.needs).toContain('code_paths')
   })
 })
diff --git a/config/scripts/ci-background-step-barriers.test.mjs b/config/scripts/ci-background-step-barriers.test.mjs
new file mode 100644
index 000000000000..f731d9d08cb3
--- /dev/null
+++ b/config/scripts/ci-background-step-barriers.test.mjs
@@ -0,0 +1,148 @@
+import { readFileSync } from 'node:fs'
+import { parse } from 'yaml'
+import { describe, expect, it } from 'vitest'
+
+const pr = parse(readFileSync('.github/workflows/pr.yml', 'utf8'))
+const mobile = parse(readFileSync('.github/workflows/mobile.yml', 'utf8'))
+const cloud = parse(readFileSync('.github/workflows/cloud-verify.yml', 'utf8'))
+
+function assertJoinedBefore(steps, id, consumer) {
+  const start = steps.findIndex((step) => step.id === id)
+  const join = steps.findIndex((step) => [step.wait].flat().includes(id))
+  const end = steps.findIndex(consumer)
+  expect(start).toBeGreaterThanOrEqual(0)
+  expect(steps[start].background).toBe(true)
+  expect(join).toBeGreaterThan(start)
+  expect(end).toBeGreaterThan(join)
+}
+
+describe('CI background step barriers', () => {
+  it('joins every background check without suppressing failures', () => {
+    for (const job of [
+      pr.jobs.static_analysis,
+      pr.jobs.mobile_web_app,
+      pr.jobs.package,
+      pr.jobs.shell_contracts,
+      mobile.jobs.verify,
+      cloud.jobs.security
+    ]) {
+      const pending = new Set()
+      for (const step of job.steps) {
+        if (step.background) {
+          expect(step.id).toBeTruthy()
+          expect(pending.has(step.id)).toBe(false)
+          expect(step['continue-on-error']).toBeUndefined()
+          pending.add(step.id)
+        }
+        if (step.wait) {
+          expect(step.if).toBeUndefined()
+          expect(step['continue-on-error']).toBeUndefined()
+          for (const id of [step.wait].flat()) {
+            expect(pending.delete(id), `missing background step ${id}`).toBe(true)
+          }
+        }
+        expect(pending.size).toBeLessThanOrEqual(job === pr.jobs.package ? 4 : 3)
+      }
+      expect([...pending]).toEqual([])
+    }
+  })
+
+  it('finishes native import-cycle analysis before mobile installation changes resolution', () => {
+    const steps = pr.jobs.static_analysis.steps
+    assertJoinedBefore(steps, 'native-code-quality', (step) =>
+      step.uses?.endsWith('/install-mobile-dependencies')
+    )
+    const install = steps.findIndex((step) => step.uses?.endsWith('/install-mobile-dependencies'))
+    expect(steps[install].background).toBeUndefined()
+    expect(steps.findIndex((step) => step.id === 'changed-code-quality')).toBeGreaterThan(install)
+  })
+
+  it('finishes both mobile typechecks before allocating test workers', () => {
+    const steps = mobile.jobs.verify.steps
+    assertJoinedBefore(steps, 'production-types', (step) => step.name === 'Test')
+    const ratchet = steps.findIndex((step) => step.name === 'Typecheck tests (ratchet)')
+    const join = steps.findIndex((step) => step.wait === 'production-types')
+    expect(steps[ratchet].background).toBeUndefined()
+    expect(ratchet).toBeLessThan(join)
+  })
+
+  it('waits for WebKit and the bundle before any browser tests', () => {
+    const steps = pr.jobs.mobile_web_app.steps
+    assertJoinedBefore(
+      steps,
+      'webkit',
+      (step) => step.name === 'Builder, override census and render checks'
+    )
+    const build = steps.findIndex((step) => step.name === 'Build and verify the app bundle')
+    expect(steps[build].background).toBeUndefined()
+    expect(build).toBeLessThan(steps.findIndex((step) => [step.wait].flat().includes('webkit')))
+    expect(steps.findIndex((step) => step.id === 'webkit')).toBeLessThan(build)
+  })
+
+  it('joins shell installation before checking fish and running live shell tests', () => {
+    const steps = pr.jobs.shell_contracts.steps
+    assertJoinedBefore(steps, 'shells', (step) => step.name === 'Require fish 4+')
+    assertJoinedBefore(steps, 'shells', (step) => step.name === 'Test real shell contracts')
+    const install = steps.findIndex((step) => step.uses?.endsWith('/install-node-dependencies'))
+    expect(install).toBeGreaterThan(steps.findIndex((step) => step.id === 'shells'))
+    expect(install).toBeLessThan(steps.findIndex((step) => step.wait === 'shells'))
+  })
+
+  it('prepares fresh mobile routes after dependencies and before the browser tests', () => {
+    const steps = pr.jobs.mobile_web_app.steps
+    assertJoinedBefore(
+      steps,
+      'mobile-routes',
+      (step) => step.name === 'Builder, override census and render checks'
+    )
+    const prepare = steps.findIndex((step) => step.id === 'mobile-routes')
+    expect(prepare).toBeGreaterThan(
+      steps.findIndex((step) => step.uses?.endsWith('/install-mobile-dependencies'))
+    )
+    expect(prepare).toBeLessThan(
+      steps.findIndex((step) => step.name === 'Build and verify the app bundle')
+    )
+  })
+
+  it('joins package setup before reading outputs and preserves isolated native probes', () => {
+    const steps = pr.jobs.package.steps
+    // Parallel composites must not race to download their shared cache action on first use.
+    const cacheAction = steps.findIndex((step) => step.uses === 'actions/cache/restore@v5')
+    expect(cacheAction).toBeGreaterThanOrEqual(0)
+    expect(cacheAction).toBeLessThan(
+      steps.findIndex((step) => step.id === 'shutdown-fixture-cache')
+    )
+    for (const [id, consumer] of [
+      ['linux-package-tools', 'Package unpacked app'],
+      ['web-client', 'Package unpacked app'],
+      ['shutdown-fixture-cache', 'Verify headless serve signal shutdown'],
+      ['cli-fixture-cache', 'Verify Linux CLI launch contract']
+    ]) {
+      assertJoinedBefore(steps, id, (step) => step.name === consumer)
+      expect(steps.findIndex((step) => step.id === id)).toBeGreaterThan(
+        steps.findIndex((step) => step.name === 'Test Linux Electron lifecycle boundary')
+      )
+    }
+  })
+
+  it('joins digest-pinned scanner downloads and the history scan without hiding failures', () => {
+    const steps = cloud.jobs.security.steps
+    const history = steps.findIndex((step) => step.name === 'Fetch complete scan history')
+    for (const [id, imageName] of [
+      ['gitleaks-image', 'gitleaks'],
+      ['trufflehog-image', 'trufflehog']
+    ]) {
+      const download = steps.find((step) => step.id === id)
+      const scan = steps.find(
+        (step) => step.run?.includes('docker run') && step.run.includes(imageName)
+      )
+      const digestImage = scan.run.match(/\S+@sha256:[a-f0-9]{64}/)[0]
+      expect(download.run).toBe(`docker pull ${digestImage}`)
+      expect(steps.indexOf(download)).toBeLessThan(history)
+      assertJoinedBefore(steps, id, (step) => step === scan)
+      expect(steps.indexOf(scan)).toBeGreaterThan(history)
+      expect(scan.run).toContain('/repo:ro')
+    }
+    expect(steps.at(-1).wait).toBe('history-scan')
+  })
+})
diff --git a/config/scripts/ci-cache-warmup-workflow.test.mjs b/config/scripts/ci-cache-warmup-workflow.test.mjs
index e3fa25f7eadb..322cf982d828 100644
--- a/config/scripts/ci-cache-warmup-workflow.test.mjs
+++ b/config/scripts/ci-cache-warmup-workflow.test.mjs
@@ -1,6 +1,7 @@
 import { readFileSync } from 'node:fs'
 import { expect, it } from 'vitest'
 import { parse } from 'yaml'
+import { BUN_PERSISTENCE_RUNNERS } from './bun-profile-qualification.mjs'
 
 const readWorkflow = (name) =>
   parse(readFileSync(new URL(`../../.github/workflows/${name}.yml`, import.meta.url), 'utf8'))
@@ -8,10 +9,28 @@ const workflow = readWorkflow('ci-cache-warmup')
 const steps = workflow.jobs.warm.steps
 
 it('warms the same Linux Node runtime the PR shards restore', () => {
-  const install = steps.find((step) => step.uses === './.github/actions/install-node-dependencies')
+  const arm = workflow.jobs['warm-linux-arm']
+  const install = arm.steps.find(
+    (step) => step.uses === './.github/actions/install-node-dependencies'
+  )
   const primer = readWorkflow('pr').jobs.test_native_cache
-  expect(workflow.jobs.warm['runs-on']).toBe(primer['runs-on'])
-  expect(install.with).toEqual(primer.steps.find((step) => step.uses === install.uses).with)
+  expect(arm['runs-on']).toBe(primer['runs-on'])
+  expect(arm.steps.at(-1).run).toBe('node config/scripts/ensure-native-runtime.mjs --check-only')
+  expect(install.with).toMatchObject(primer.steps.find((step) => step.uses === install.uses).with)
+})
+
+it('populates shared Electron archives on both Linux architectures without changing the Node ABI', () => {
+  for (const name of ['warm', 'warm-linux-arm']) {
+    const steps = workflow.jobs[name].steps
+    const install = steps.find(
+      (step) => step.uses === './.github/actions/install-node-dependencies'
+    )
+    expect(install.with['native-runtime']).toBe('node')
+    expect(install.with['cache-electron-package']).toBe('true')
+    const populate = steps.find((step) => step.name === 'Populate shared Electron archive')
+    expect(populate.run).toBe('node config/scripts/install-electron-package-binary.mjs')
+    expect(steps.indexOf(populate)).toBeGreaterThan(steps.indexOf(install))
+  }
 })
 
 it('publishes incremental state under a key and prefix that new PRs restore', () => {
@@ -27,8 +46,13 @@ it('publishes incremental state under a key and prefix that new PRs restore', ()
   expect(steps.indexOf(check)).toBeGreaterThan(steps.indexOf(cache))
 })
 
-it('bounds warming to one hosted job and validates changes without granting writes', () => {
-  expect(Object.keys(workflow.jobs)).toEqual(['warm'])
+it('bounds warming to the required platforms and validates changes without granting writes', () => {
+  expect(Object.keys(workflow.jobs)).toEqual([
+    'warm',
+    'warm-linux-arm',
+    'warm-windows',
+    'warm-linux-package-fixtures'
+  ])
   expect(workflow.jobs.warm['timeout-minutes']).toBeLessThanOrEqual(10)
   expect(workflow.permissions).toEqual({ contents: 'read' })
   expect(workflow.on.push.branches).toEqual(['main'])
@@ -38,3 +62,20 @@ it('bounds warming to one hosted job and validates changes without granting writ
   expect(workflow.concurrency.group).toContain('github.event.pull_request.number || github.ref')
   expect(steps[0].with['persist-credentials']).toBe(false)
 })
+
+it('warms and probes both Windows images with the persistence job runtime', () => {
+  const job = workflow.jobs['warm-windows']
+  expect(job.strategy.matrix.os).toEqual(
+    BUN_PERSISTENCE_RUNNERS.filter((os) => os.startsWith('windows-'))
+  )
+  expect(job['runs-on']).toBe('${{ matrix.os }}')
+  expect(job.strategy['fail-fast']).toBe(false)
+  expect(job['timeout-minutes']).toBeLessThanOrEqual(20)
+  expect(job.env.ORCA_BACKGROUND_LAUNCH).toBe('1')
+  expect(job.steps[0].with['persist-credentials']).toBe(false)
+  const install = job.steps.find(
+    (step) => step.uses === './.github/actions/install-node-dependencies'
+  )
+  expect(install.with).toEqual({ 'native-runtime': 'node' })
+  expect(job.steps.at(-1).run).toBe('node config/scripts/ensure-native-runtime.mjs --check-only')
+})
diff --git a/config/scripts/ci-closed-pr-caches.test.mjs b/config/scripts/ci-closed-pr-caches.test.mjs
new file mode 100644
index 000000000000..44edb5e48df7
--- /dev/null
+++ b/config/scripts/ci-closed-pr-caches.test.mjs
@@ -0,0 +1,57 @@
+import { readFileSync } from 'node:fs'
+import { runInNewContext } from 'node:vm'
+import { expect, it, vi } from 'vitest'
+import { parse } from 'yaml'
+
+const workflow = parse(readFileSync('.github/workflows/ci-closed-pr-caches.yml', 'utf8'))
+const script = workflow.jobs.clean.steps[0].with.script
+const ref = 'refs/pull/123/merge'
+
+function run(caches, remove = vi.fn().mockResolvedValue(undefined)) {
+  const list = vi.fn()
+  const paginate = vi.fn().mockResolvedValue(caches)
+  const result = runInNewContext(`(async () => { ${script} })()`, {
+    context: { repo: { owner: 'owner', repo: 'repo' }, payload: { pull_request: { number: 123 } } },
+    github: {
+      paginate,
+      rest: { actions: { getActionsCacheList: list, deleteActionsCacheById: remove } }
+    },
+    core: { info: vi.fn() }
+  })
+  return { result, remove, paginate, list }
+}
+
+it('uses default-branch code without checking out a closed PR', () => {
+  expect(workflow.on).toEqual({ pull_request_target: { types: ['closed'] } })
+  expect(workflow.permissions).toEqual({ actions: 'write' })
+  expect(workflow.jobs.clean.steps).toHaveLength(1)
+  expect(workflow.jobs.clean.steps[0].uses).toBe('actions/github-script@v8')
+})
+
+it('lists and deletes only caches scoped to the closed merge ref', async () => {
+  const { result, paginate, list, remove } = run([
+    { id: 12, ref },
+    { id: 13, ref }
+  ])
+  await result
+  expect(paginate).toHaveBeenCalledWith(list, { owner: 'owner', repo: 'repo', ref, per_page: 100 })
+  expect(remove.mock.calls).toEqual([
+    [{ owner: 'owner', repo: 'repo', cache_id: 12 }],
+    [{ owner: 'owner', repo: 'repo', cache_id: 13 }]
+  ])
+})
+
+it('refuses a default-branch cache even if the API returns one', async () => {
+  const { result, remove } = run([{ id: 12, ref: 'refs/heads/main' }])
+  await expect(result).rejects.toThrow('Unexpected cache ref')
+  expect(remove).not.toHaveBeenCalled()
+})
+
+it('tolerates an eviction race but surfaces permission failures', async () => {
+  await expect(
+    run([{ id: 12, ref }], vi.fn().mockRejectedValue({ status: 404 })).result
+  ).resolves.toBeUndefined()
+  await expect(
+    run([{ id: 12, ref }], vi.fn().mockRejectedValue({ status: 403 })).result
+  ).rejects.toEqual({ status: 403 })
+})
diff --git a/config/scripts/ci-dependency-download-cache.test.mjs b/config/scripts/ci-dependency-download-cache.test.mjs
index 40cce83136c2..44b6dc96b94e 100644
--- a/config/scripts/ci-dependency-download-cache.test.mjs
+++ b/config/scripts/ci-dependency-download-cache.test.mjs
@@ -48,7 +48,11 @@ describe('CI dependency download caches', () => {
       action.runs.steps.findIndex((step) => step.name === 'Install dependencies')
     )
     const saves = action.runs.steps.filter((step) => step.uses === 'actions/cache/save@v5')
-    expect(saves).toEqual([])
+    expect(saves).toHaveLength(1)
+    expect(saves[0].name).toBe('Save pnpm verification record on main')
+    expect(saves[0].if).toContain("github.ref == 'refs/heads/main'")
+    expect(saves[0].if).toContain("github.event_name != 'pull_request'")
+    expect(saves[0].with.path).toBe('${{ steps.verification-cache.outputs.path }}')
   })
 
   it('seeds the existing Linux PR tool cache from successful main x64 release builds', () => {
@@ -71,8 +75,8 @@ describe('CI dependency download caches', () => {
     expect(writer.with['restore-keys']).toBeUndefined()
     expect(writer.with['lookup-only']).toBe(true)
     expect(release.steps.indexOf(writer)).toBeGreaterThan(release.steps.indexOf(combined))
-    // Retain PR fallback saves until a successful release seeds the default-branch entry.
-    expect(consumer.uses).toBe('actions/cache@v5')
+    expect(consumer.uses).toBe('actions/cache/restore@v5')
+    expect(consumer.with['restore-keys'].trim()).toBe('electron-builder-linux-')
     expect(combined.uses).toBe('actions/cache@v5')
     expect(linux.eb_cache_path.trim().split('\n')).toEqual([
       '~/.cache/electron',
@@ -81,6 +85,20 @@ describe('CI dependency download caches', () => {
   })
 })
 
+it('shares Electron archives with PRs without uploading PR-local copies', () => {
+  const save = action.runs.steps.find((step) => step.name === 'Cache Electron package archive')
+  const restore = action.runs.steps.find(
+    (step) => step.name === 'Restore Electron package archive without saving'
+  )
+  expect(save.if).toContain("github.event_name != 'pull_request' || runner.os != 'Linux'")
+  expect(restore.if).toContain("github.event_name == 'pull_request' && runner.os == 'Linux'")
+  expect(save.if).toContain("steps.electron-package-cache.outputs.version != ''")
+  expect(restore.if).toContain("steps.electron-package-cache.outputs.version != ''")
+  expect(save.uses).toBe('actions/cache@v5')
+  expect(restore.uses).toBe('actions/cache/restore@v5')
+  expect(restore.with).toEqual(save.with)
+})
+
 describe('release install targets', () => {
   const macCpuFlag = '--cpu=current,x64,arm64'
   // Both shapes: `run:` steps and steps wrapped in nick-fields/retry (`with.command`).
diff --git a/config/scripts/ci-e2e-failure-summary.mjs b/config/scripts/ci-e2e-failure-summary.mjs
new file mode 100644
index 000000000000..f95fed20dac0
--- /dev/null
+++ b/config/scripts/ci-e2e-failure-summary.mjs
@@ -0,0 +1,92 @@
+import { appendFileSync, readFileSync } from 'node:fs'
+import { pathToFileURL } from 'node:url'
+import { trackE2eFailures } from './ci-e2e-failure-tracking.mjs'
+
+export function e2eFailureSummary(report) {
+  const failures = []
+  let passed = 0
+  let skipped = 0
+  function visit(suite, parents = [], parentFile) {
+    const titles = [...parents, suite.title].filter(Boolean)
+    const file = suite.file ?? parentFile
+    for (const spec of suite.specs ?? []) {
+      for (const test of spec.tests ?? []) {
+        if (test.status === 'expected') {
+          passed++
+          continue
+        }
+        if (test.status === 'skipped') {
+          skipped++
+          continue
+        }
+        const errors = test.results.flatMap((result) => result.errors ?? [])
+        failures.push({
+          file: spec.file ?? file,
+          title: [...titles, spec.title].join(' › '),
+          project: test.projectName,
+          status: test.status,
+          message: errors
+            .map((error) => error.message ?? error.value ?? '')
+            .join('\n')
+            .slice(0, 2000)
+        })
+      }
+    }
+    for (const child of suite.suites ?? []) {
+      visit(child, titles, file)
+    }
+  }
+  for (const suite of report.suites ?? []) {
+    visit(suite)
+  }
+  return { passed, skipped, failures, errors: report.errors ?? [] }
+}
+
+export function renderE2eFailures(summary, records = [], now = new Date()) {
+  const escape = (value) =>
+    String(value ?? '')
+      .replaceAll('&', '&amp;')
+      .replaceAll('<', '&lt;')
+      .replaceAll('>', '&gt;')
+  const tracked = trackE2eFailures(summary.failures, records, now)
+  const details = (failure) =>
+    `<details><summary>${escape(failure.status)}: ${escape(failure.file)} — ${escape(failure.title)}</summary><pre>${escape(failure.message)}</pre></details>`
+  return [
+    '## E2E results',
+    '',
+    `${summary.passed} expected results; ${summary.skipped} skipped; ${summary.failures.length} unexpected/flaky results; ${summary.errors.length} run errors.`,
+    '',
+    `### Untracked failures (${tracked.untracked.length})`,
+    '',
+    ...tracked.untracked.map(details),
+    '',
+    `### Tracked failures (${tracked.known.length})`,
+    '',
+    ...tracked.known.flatMap((failure) => [
+      details(failure),
+      `Owner: ${escape(failure.tracking.owner)}; ${escape(failure.tracking.issue)}; expires ${escape(failure.tracking.expires)}.`
+    ]),
+    ...(tracked.invalid.length
+      ? [`${tracked.invalid.length} invalid/expired tracking entries were not used.`]
+      : []),
+    ...summary.errors.map((error) => `<pre>${escape(error.message ?? error.value)}</pre>`),
+    '',
+    'Failures retain their original verdict. Repeated failures need a tracked owner, reproduction and review date; do not treat a red baseline as passing.',
+    ''
+  ].join('\n')
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  try {
+    const summary = e2eFailureSummary(JSON.parse(readFileSync(process.argv[2], 'utf8')))
+    const records = JSON.parse(
+      readFileSync(new URL('../e2e-failure-tracking.json', import.meta.url), 'utf8')
+    )
+    appendFileSync(process.env.GITHUB_STEP_SUMMARY, renderE2eFailures(summary, records))
+  } catch (error) {
+    appendFileSync(
+      process.env.GITHUB_STEP_SUMMARY,
+      `E2E report unavailable (${error.code ?? 'invalid report'}); inspect the failing step and traces.\n`
+    )
+  }
+}
diff --git a/config/scripts/ci-e2e-failure-summary.test.mjs b/config/scripts/ci-e2e-failure-summary.test.mjs
new file mode 100644
index 000000000000..5594e4faa565
--- /dev/null
+++ b/config/scripts/ci-e2e-failure-summary.test.mjs
@@ -0,0 +1,79 @@
+import { expect, it } from 'vitest'
+import { e2eFailureSummary, renderE2eFailures } from './ci-e2e-failure-summary.mjs'
+import { trackE2eFailures } from './ci-e2e-failure-tracking.mjs'
+
+it('requires exact failures with an owner, issue and unexpired review date', () => {
+  const failure = {
+    file: 'test.spec.ts',
+    title: 'case',
+    project: 'electron',
+    message: 'expected focus failed'
+  }
+  const record = {
+    ...failure,
+    message: 'expected focus',
+    owner: '@owner',
+    issue: 'https://github.com/stablyai/orca/issues/123',
+    expires: '2026-10-01'
+  }
+  const now = new Date('2026-09-28')
+  expect(trackE2eFailures([failure], [null, record], now)).toMatchObject({
+    known: [{ ...failure, tracking: record }],
+    invalid: [null]
+  })
+  expect(trackE2eFailures([failure], null, now).untracked).toEqual([failure])
+  for (const change of [
+    { expires: '2026-09-27' },
+    { expires: '2026-09-31' },
+    { owner: '' },
+    { issue: '' },
+    { title: 'different' },
+    { message: 'different' },
+    { project: 'other' }
+  ]) {
+    expect(trackE2eFailures([failure], [{ ...record, ...change }], now).untracked).toEqual([
+      failure
+    ])
+  }
+})
+
+it('keeps failure, flaky, skipped and startup-error evidence separate', () => {
+  const report = {
+    errors: [{ message: 'startup failed' }],
+    suites: [
+      {
+        title: 'file',
+        file: 'tests/e2e/test.spec.ts',
+        suites: [
+          {
+            title: 'feature',
+            specs: [
+              {
+                title: 'case',
+                tests: [
+                  { status: 'expected' },
+                  { status: 'skipped' },
+                  {
+                    status: 'unexpected',
+                    projectName: 'electron-headless',
+                    results: [{ errors: [{ message: '<timeout>' }] }]
+                  },
+                  {
+                    status: 'flaky',
+                    results: [{ errors: [{ message: 'first try' }] }, { errors: [] }]
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  }
+  const summary = e2eFailureSummary(report)
+  expect(summary).toMatchObject({ passed: 1, skipped: 1, errors: report.errors })
+  expect(summary.failures).toHaveLength(2)
+  expect(summary.failures[0].title).toBe('file › feature › case')
+  expect(renderE2eFailures(summary)).toContain('&lt;timeout&gt;')
+  expect(renderE2eFailures(summary)).toContain('startup failed')
+})
diff --git a/config/scripts/ci-e2e-failure-tracking.mjs b/config/scripts/ci-e2e-failure-tracking.mjs
new file mode 100644
index 000000000000..3415c023ad56
--- /dev/null
+++ b/config/scripts/ci-e2e-failure-tracking.mjs
@@ -0,0 +1,42 @@
+export function trackE2eFailures(failures, records, now = new Date()) {
+  const known = []
+  const untracked = []
+  const invalid = []
+  const active = (Array.isArray(records) ? records : [records]).filter((record) => {
+    if (!record || typeof record !== 'object' || Array.isArray(record)) {
+      invalid.push(record)
+      return false
+    }
+    const expiry = new Date(`${record.expires}T23:59:59Z`)
+    const valid =
+      typeof record.file === 'string' &&
+      typeof record.title === 'string' &&
+      typeof record.message === 'string' &&
+      record.message.length > 0 &&
+      /^@[\w-]+(?:\/[\w-]+)?$/.test(record.owner ?? '') &&
+      /^https:\/\/github\.com\/stablyai\/orca\/issues\/\d+$/.test(record.issue ?? '') &&
+      /^\d{4}-\d{2}-\d{2}$/.test(record.expires ?? '') &&
+      Number.isFinite(expiry.getTime()) &&
+      expiry.toISOString().slice(0, 10) === record.expires &&
+      expiry.getTime() >= now.getTime()
+    if (!valid) {
+      invalid.push(record)
+    }
+    return valid
+  })
+  for (const failure of failures) {
+    const record = active.find(
+      (entry) =>
+        entry.file === failure.file &&
+        entry.title === failure.title &&
+        entry.project === failure.project &&
+        failure.message.includes(entry.message)
+    )
+    if (record) {
+      known.push({ ...failure, tracking: record })
+    } else {
+      untracked.push(failure)
+    }
+  }
+  return { known, untracked, invalid }
+}
diff --git a/config/scripts/ci-runner-demand.mjs b/config/scripts/ci-runner-demand.mjs
new file mode 100644
index 000000000000..7690ea358db6
--- /dev/null
+++ b/config/scripts/ci-runner-demand.mjs
@@ -0,0 +1,100 @@
+import { appendFileSync, mkdirSync, writeFileSync } from 'node:fs'
+import { pathToFileURL } from 'node:url'
+import { runnerDemand, sampleWorkflowRuns } from './ci-runner-metrics.mjs'
+
+async function api(path, env) {
+  const response = await fetch(
+    `${env.GITHUB_API_URL ?? 'https://api.github.com'}/repos/${env.GITHUB_REPOSITORY}/${path}`,
+    {
+      headers: {
+        Authorization: `Bearer ${env.GH_TOKEN}`,
+        Accept: 'application/vnd.github+json',
+        'X-GitHub-Api-Version': '2022-11-28'
+      },
+      signal: AbortSignal.timeout(30_000)
+    }
+  )
+  if (!response.ok) {
+    throw new Error(`Actions API: ${response.status}`)
+  }
+  return response.json()
+}
+
+export async function collectRunnerDemand(env = process.env, request = (path) => api(path, env)) {
+  const end = new Date(env.CI_METRICS_END ?? Date.now())
+  end.setUTCMinutes(0, 0, 0)
+  if (!Number.isFinite(end.getTime())) {
+    throw new Error('Invalid window end')
+  }
+  const runs = []
+  for (let hour = 0; hour < 24; hour++) {
+    const until = new Date(end.getTime() - hour * 3_600_000 - 1000)
+    const since = new Date(end.getTime() - (hour + 1) * 3_600_000)
+    const range = `${since.toISOString()}..${until.toISOString()}`
+    const path = `actions/runs?per_page=100&created=${encodeURIComponent(range)}`
+    const first = await request(path)
+    if (first.total_count > 1000) {
+      throw new Error('Hourly run inventory exceeds API limit; split the interval')
+    }
+    runs.push(...first.workflow_runs)
+    for (let page = 2; page <= Math.ceil(first.total_count / 100); page++) {
+      runs.push(...(await request(`${path}&page=${page}`)).workflow_runs)
+    }
+  }
+  const samples = sampleWorkflowRuns(runs)
+  // Bound API concurrency and preserve every selected observation, including zero-job runs.
+  for (let index = 0; index < samples.length; index += 4) {
+    await Promise.all(
+      samples.slice(index, index + 4).map(async (sample) => {
+        const path = `actions/runs/${sample.run.id}/jobs?per_page=100`
+        const first = await request(path)
+        sample.jobs = first.jobs
+        for (let page = 2; page <= Math.ceil(first.total_count / 100); page++) {
+          sample.jobs.push(...(await request(`${path}&page=${page}`)).jobs)
+        }
+      })
+    )
+  }
+  const report = {
+    start: new Date(end.getTime() - 86_400_000).toISOString(),
+    end: end.toISOString(),
+    method:
+      'Stratified by workflow/conclusion, six sampled runs per stratum; latest attempts only; incomplete jobs excluded',
+    ...runnerDemand(runs, samples)
+  }
+  return { report, runs, samples }
+}
+
+export function demandMarkdown(report) {
+  return [
+    `## CI demand: ${report.start} to ${report.end}`,
+    '',
+    `Estimated full job duration for runs created in this window (not window-clipped occupancy); ${report.sampledRuns}/${report.populationRuns} runs sampled. ${report.method}.`,
+    '',
+    '| Workflow | Runs | Runner hours | Cancelled-run hours | Minutes/completed PR run |',
+    '| --- | ---: | ---: | ---: | ---: |',
+    ...report.workflows.map(
+      (row) =>
+        `| ${row.workflow} | ${row.runs} | ${(row.runnerMinutes / 60).toFixed(1)} | ${(row.cancelledRunnerMinutes / 60).toFixed(1)} | ${row.runnerMinutesPerCompletedPrRun?.toFixed(1) ?? '—'} |`
+    ),
+    '',
+    '| Runner labels | Hours | Queue/provisioning p95 minutes |',
+    '| --- | ---: | ---: |',
+    ...report.pools.map(
+      (pool) =>
+        `| ${pool.label} | ${(pool.runnerMinutes / 60).toFixed(1)} | ${pool.queueP95Minutes?.toFixed(1) ?? '—'} |`
+    ),
+    ''
+  ].join('\n')
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  const evidence = await collectRunnerDemand()
+  mkdirSync('ci-demand', { recursive: true })
+  writeFileSync('ci-demand/evidence.json', JSON.stringify(evidence))
+  const markdown = demandMarkdown(evidence.report)
+  writeFileSync('ci-demand/report.md', markdown)
+  if (process.env.GITHUB_STEP_SUMMARY) {
+    appendFileSync(process.env.GITHUB_STEP_SUMMARY, markdown)
+  }
+}
diff --git a/config/scripts/ci-runner-metrics.mjs b/config/scripts/ci-runner-metrics.mjs
new file mode 100644
index 000000000000..d01ae3d0153c
--- /dev/null
+++ b/config/scripts/ci-runner-metrics.mjs
@@ -0,0 +1,110 @@
+const minutesBetween = (start, end) => {
+  const value = (Date.parse(end) - Date.parse(start)) / 60_000
+  return Number.isFinite(value) ? Math.max(0, value) : 0
+}
+
+const workflowPath = (run) => run.path.split('@')[0]
+const workflowKey = (run) => run.workflow_id ?? workflowPath(run)
+
+export function weightedPercentile(values, percentile) {
+  const sorted = [...values].sort((a, b) => a.value - b.value)
+  const target = sorted.reduce((sum, item) => sum + item.weight, 0) * percentile
+  let seen = 0
+  for (const item of sorted) {
+    seen += item.weight
+    if (seen >= target) {
+      return item.value
+    }
+  }
+  return null
+}
+
+export function runnerDemand(runs, samples) {
+  const workflows = new Map()
+  const pools = new Map()
+  for (const run of runs) {
+    if (!workflows.has(workflowKey(run))) {
+      workflows.set(workflowKey(run), {
+        workflow: workflowPath(run),
+        runs: 0,
+        sampledRuns: 0,
+        runnerMinutes: 0,
+        cancelledRunnerMinutes: 0,
+        completedPrRuns: 0,
+        completedPrRunnerMinutes: 0
+      })
+    }
+    workflows.get(workflowKey(run)).runs++
+  }
+  let incompleteJobs = 0
+  for (const { run, jobs, weight } of samples) {
+    const row = workflows.get(workflowKey(run))
+    row.sampledRuns++
+    for (const job of jobs) {
+      if (!job.runner_name || !job.started_at) {
+        continue
+      }
+      if (!job.completed_at) {
+        incompleteJobs++
+        continue
+      }
+      const duration = minutesBetween(job.started_at, job.completed_at)
+      const weighted = duration * weight
+      row.runnerMinutes += weighted
+      if (run.conclusion === 'cancelled') {
+        row.cancelledRunnerMinutes += weighted
+      }
+      if (run.event === 'pull_request' && ['success', 'failure'].includes(run.conclusion)) {
+        row.completedPrRunnerMinutes += weighted
+      }
+      const label = [...job.labels].sort().join(', ') || 'unknown'
+      if (!pools.has(label)) {
+        pools.set(label, { label, runnerMinutes: 0, waits: [] })
+      }
+      const pool = pools.get(label)
+      pool.runnerMinutes += weighted
+      if (job.created_at) {
+        pool.waits.push({ value: minutesBetween(job.created_at, job.started_at), weight })
+      }
+    }
+    if (run.event === 'pull_request' && ['success', 'failure'].includes(run.conclusion)) {
+      row.completedPrRuns += weight
+    }
+  }
+  return {
+    populationRuns: runs.length,
+    sampledRuns: samples.length,
+    incompleteJobs,
+    workflows: [...workflows.values()]
+      .map((row) => ({
+        ...row,
+        runnerMinutesPerCompletedPrRun: row.completedPrRuns
+          ? row.completedPrRunnerMinutes / row.completedPrRuns
+          : null
+      }))
+      .sort((a, b) => b.runnerMinutes - a.runnerMinutes),
+    pools: [...pools.values()]
+      .map(({ waits, ...pool }) => ({ ...pool, queueP95Minutes: weightedPercentile(waits, 0.95) }))
+      .sort((a, b) => b.runnerMinutes - a.runnerMinutes)
+  }
+}
+
+export function sampleWorkflowRuns(runs, perStratum = 6, random = Math.random) {
+  const groups = new Map()
+  for (const run of runs) {
+    const key = `${workflowKey(run)}:${run.conclusion ?? run.status}`
+    if (!groups.has(key)) {
+      groups.set(key, [])
+    }
+    groups.get(key).push(run)
+  }
+  return [...groups.values()].flatMap((group) => {
+    const shuffled = [...group]
+    for (let index = shuffled.length - 1; index > 0; index--) {
+      const target = Math.floor(random() * (index + 1))
+      ;[shuffled[index], shuffled[target]] = [shuffled[target], shuffled[index]]
+    }
+    const selected = shuffled.slice(0, perStratum)
+    return selected.map((run) => ({ run, weight: group.length / selected.length }))
+  })
+}
diff --git a/config/scripts/ci-runner-metrics.test.mjs b/config/scripts/ci-runner-metrics.test.mjs
new file mode 100644
index 000000000000..ebf45cc7c357
--- /dev/null
+++ b/config/scripts/ci-runner-metrics.test.mjs
@@ -0,0 +1,95 @@
+import { expect, it } from 'vitest'
+import { runnerDemand, sampleWorkflowRuns } from './ci-runner-metrics.mjs'
+import { collectRunnerDemand } from './ci-runner-demand.mjs'
+
+const run = {
+  id: 1,
+  path: '.github/workflows/pr.yml',
+  event: 'pull_request',
+  conclusion: 'success'
+}
+const job = {
+  runner_name: 'hosted',
+  labels: ['ubuntu-latest'],
+  created_at: '2026-09-27T00:00:00Z',
+  started_at: '2026-09-27T00:03:00Z',
+  completed_at: '2026-09-27T00:08:00Z'
+}
+
+it('separates occupancy, queueing, cancellations and zero-job observations', () => {
+  const cancelled = { ...run, id: 2, conclusion: 'cancelled' }
+  const report = runnerDemand(
+    [run, cancelled],
+    [
+      { run, weight: 2, jobs: [job, { ...job, runner_name: null }] },
+      { run: cancelled, weight: 3, jobs: [job, { ...job, completed_at: null }] }
+    ]
+  )
+  expect(report.workflows[0]).toMatchObject({
+    runnerMinutes: 25,
+    cancelledRunnerMinutes: 15,
+    runnerMinutesPerCompletedPrRun: 5
+  })
+  expect(report.pools[0].queueP95Minutes).toBe(3)
+  expect(report.incompleteJobs).toBe(1)
+  expect(runnerDemand([run], [{ run, weight: 1, jobs: [] }]).workflows[0].runnerMinutes).toBe(0)
+})
+
+it('weights each workflow/outcome stratum back to the full inventory', () => {
+  const runs = Array.from({ length: 20 }, (_, index) => ({
+    ...run,
+    id: index,
+    conclusion: index < 10 ? 'success' : 'failure'
+  }))
+  const sample = sampleWorkflowRuns(runs, 2, () => 0.5)
+  expect(sample).toHaveLength(4)
+  expect(sample.reduce((sum, row) => sum + row.weight, 0)).toBe(20)
+  expect(new Set(sample.map((row) => row.run.id)).size).toBe(4)
+})
+
+it('paginates jobs and bounds run discovery to 24 complete hours', async () => {
+  const requests = []
+  const result = await collectRunnerDemand(
+    { CI_METRICS_END: '2026-09-28T04:59:00Z' },
+    async (path) => {
+      requests.push(path)
+      if (path.includes('/jobs')) {
+        return {
+          total_count: 101,
+          jobs: path.includes('page=2') ? [job] : Array.from({ length: 100 }, () => job)
+        }
+      }
+      return {
+        total_count: requests.length === 1 ? 1 : 0,
+        workflow_runs: requests.length === 1 ? [run] : []
+      }
+    }
+  )
+  expect(result.report.start).toBe('2026-09-27T04:00:00.000Z')
+  expect(result.report.end).toBe('2026-09-28T04:00:00.000Z')
+  expect(requests.filter((path) => path.startsWith('actions/runs?'))).toHaveLength(24)
+  expect(result.samples[0].jobs).toHaveLength(101)
+  expect(result.report.workflows[0].runnerMinutes).toBe(505)
+})
+
+it('refuses to publish a silently truncated inventory', async () => {
+  await expect(
+    collectRunnerDemand({}, async () => ({ total_count: 1001, workflow_runs: [] }))
+  ).rejects.toThrow('API limit')
+})
+
+it('groups ref-qualified paths under the stable workflow ID', () => {
+  const runs = [
+    { ...run, id: 1, workflow_id: 42, path: '.github/workflows/pr.yml@main' },
+    { ...run, id: 2, workflow_id: 42, path: '.github/workflows/pr.yml@feature' }
+  ]
+  const sample = sampleWorkflowRuns(runs, 1, () => 0.5)
+  expect(sample).toHaveLength(1)
+  expect(sample[0].weight).toBe(2)
+  expect(
+    runnerDemand(
+      runs,
+      sample.map((row) => ({ ...row, jobs: [job] }))
+    ).workflows
+  ).toMatchObject([{ workflow: '.github/workflows/pr.yml', runs: 2, runnerMinutes: 10 }])
+})
diff --git a/config/scripts/ci-shard-timings.json b/config/scripts/ci-shard-timings.json
index bfa2ce14f61a..a0931951704d 100644
--- a/config/scripts/ci-shard-timings.json
+++ b/config/scripts/ci-shard-timings.json
@@ -1,9695 +1,9855 @@
 {
   "unit": {
-    "runId": "36221874572",
+    "runId": "36294142683",
     "runAttempt": "1",
-    "sourceSha": "f68ecf8c4aeb396795a8f0f9dbd8ef58fd634d43",
+    "sourceSha": "cc35c1b422e9c20197bc59aa27a71019ffc18b5b",
     "nodeVersion": "24.21.0",
     "metric": "module-duration-v1",
     "overheadMs": 0,
     "timings": {
-      "config/scripts/adhoc-build-version.test.mjs": 94,
-      "config/scripts/agent-status-hot-path-benchmark.test.ts": 4155,
-      "config/scripts/app-store-performance-plugin.test.mjs": 1327,
-      "config/scripts/assert-github-release-is-draft.test.mjs": 509,
-      "config/scripts/audit-localization-coverage.test.mjs": 424,
-      "config/scripts/benchmark-artifact-comparison.test.mjs": 198,
-      "config/scripts/benchmark-sample-summary.test.mjs": 41,
-      "config/scripts/build-linux-local.test.mjs": 68,
-      "config/scripts/build-mac-local.test.mjs": 50,
-      "config/scripts/build-mobile-web-app-bundle.test.mjs": 387,
-      "config/scripts/build-native-for-platform.test.mjs": 43,
-      "config/scripts/build-orcad-prebuilds.test.mjs": 70,
-      "config/scripts/build-windows-cli-launcher.test.mjs": 95,
-      "config/scripts/casting-code-quality.test.mjs": 1088,
-      "config/scripts/check-changed-code-quality.test.mjs": 71,
-      "config/scripts/check-max-lines-ratchet.test.mjs": 922,
-      "config/scripts/check-react-doctor-changed.test.mjs": 291,
-      "config/scripts/check-readme-local-links.test.mjs": 484,
-      "config/scripts/check-reliability-gates.test.mjs": 230,
-      "config/scripts/check-root-directory-entries.test.mjs": 1090,
-      "config/scripts/check-runtime-electron-ratchet.test.mjs": 2287,
-      "config/scripts/check-terminal-perf-report-budgets.test.mjs": 2190,
-      "config/scripts/check-ts-nocheck-ratchet.test.mjs": 60,
-      "config/scripts/ci-cache-warmup-workflow.test.mjs": 154,
-      "config/scripts/ci-dependency-download-cache.test.mjs": 265,
-      "config/scripts/ci-e2e-shard-selection.test.mjs": 14066,
-      "config/scripts/ci-native-toolchain.test.mjs": 135,
-      "config/scripts/ci-shard-assignment.test.mjs": 410,
-      "config/scripts/ci-unit-timing-reporter.test.mjs": 96,
-      "config/scripts/cli-main-module-bundle-parity.test.ts": 452,
-      "config/scripts/client-hosted-browser-package-coverage.test.mjs": 143,
-      "config/scripts/cloud-security-history-workflow.test.mjs": 354,
-      "config/scripts/codex-index-heal-contract-workflow.test.mjs": 138,
-      "config/scripts/codex-primary-home-tripwire.test.ts": 361,
+      "config/scripts/adhoc-build-version.test.mjs": 90,
+      "config/scripts/agent-status-hot-path-benchmark.test.ts": 2954,
+      "config/scripts/app-store-performance-plugin.test.mjs": 1255,
+      "config/scripts/assert-github-release-is-draft.test.mjs": 348,
+      "config/scripts/audit-localization-coverage.test.mjs": 412,
+      "config/scripts/benchmark-artifact-comparison.test.mjs": 193,
+      "config/scripts/benchmark-sample-summary.test.mjs": 45,
+      "config/scripts/build-linux-local.test.mjs": 35,
+      "config/scripts/build-mac-local.test.mjs": 52,
+      "config/scripts/build-mobile-web-app-bundle.test.mjs": 213,
+      "config/scripts/build-native-for-platform.test.mjs": 42,
+      "config/scripts/build-orcad-bun.test.mjs": 122,
+      "config/scripts/build-orcad-prebuilds.test.mjs": 85,
+      "config/scripts/build-windows-cli-launcher.test.mjs": 84,
+      "config/scripts/bun-profile-change-scope.test.mjs": 3355,
+      "config/scripts/casting-code-quality.test.mjs": 874,
+      "config/scripts/check-changed-code-quality.test.mjs": 79,
+      "config/scripts/check-max-lines-ratchet.test.mjs": 945,
+      "config/scripts/check-react-doctor-changed.test.mjs": 300,
+      "config/scripts/check-readme-local-links.test.mjs": 520,
+      "config/scripts/check-reliability-gates.test.mjs": 175,
+      "config/scripts/check-root-directory-entries.test.mjs": 1241,
+      "config/scripts/check-runtime-electron-ratchet.test.mjs": 2494,
+      "config/scripts/check-terminal-perf-report-budgets.test.mjs": 2243,
+      "config/scripts/check-ts-nocheck-ratchet.test.mjs": 44,
+      "config/scripts/ci-cache-warmup-workflow.test.mjs": 110,
+      "config/scripts/ci-dependency-download-cache.test.mjs": 401,
+      "config/scripts/ci-e2e-shard-selection.test.mjs": 14257,
+      "config/scripts/ci-native-toolchain.test.mjs": 92,
+      "config/scripts/ci-shard-assignment.test.mjs": 308,
+      "config/scripts/ci-unit-timing-reporter.test.mjs": 62,
+      "config/scripts/cli-main-module-bundle-parity.test.ts": 594,
+      "config/scripts/client-hosted-browser-package-coverage.test.mjs": 124,
+      "config/scripts/cloud-security-history-workflow.test.mjs": 344,
+      "config/scripts/codex-index-heal-contract-workflow.test.mjs": 145,
+      "config/scripts/codex-primary-home-tripwire.test.ts": 344,
       "config/scripts/computer-e2e-workflow.test.mjs": 159,
-      "config/scripts/computer-use-modifier-safety.test.mjs": 38,
-      "config/scripts/computer-use-mouse-button-routing.test.mjs": 36,
-      "config/scripts/computer-use-skill-guidance.test.mjs": 129,
-      "config/scripts/computer-use-smoke.test.mjs": 474,
-      "config/scripts/computer-use-windows-horizontal-scroll.test.mjs": 38,
-      "config/scripts/counterbalanced-benchmark-schedule.test.mjs": 50,
-      "config/scripts/create-draft-release.test.mjs": 67,
-      "config/scripts/daily-build-version.test.mjs": 91,
-      "config/scripts/daily-e2e-dispatch-contract.test.mjs": 141,
-      "config/scripts/dev-channel-base-version.test.mjs": 52,
-      "config/scripts/dev-channel-windows-workflow-contract.test.mjs": 208,
-      "config/scripts/dev-cli-terminal-wrapper.test.mjs": 41,
-      "config/scripts/dev-electron-bundle-cache.test.ts": 49,
-      "config/scripts/dev-electron-bundle-identity.test.ts": 78,
-      "config/scripts/electron-builder-config.test.mjs": 1065,
-      "config/scripts/electron-builder-mac-channel-config.test.mjs": 840,
-      "config/scripts/electron-builder-markdown-associations.test.mjs": 246,
-      "config/scripts/electron-builder-native-rebuild.test.mjs": 52,
-      "config/scripts/electron-builder-runtime-resources.test.mjs": 847,
-      "config/scripts/electron-builder-speech-config.test.mjs": 270,
-      "config/scripts/electron-runtime-floor.test.ts": 36,
-      "config/scripts/electron-vite-output-contract.test.ts": 847,
-      "config/scripts/ensure-native-runtime-job-ownership.test.mjs": 59,
-      "config/scripts/ensure-native-runtime.test.mjs": 679,
-      "config/scripts/ephemeral-vm-runtime-store-cross-version.test.ts": 37,
-      "config/scripts/generate-bundled-skill-guides.test.mjs": 625,
-      "config/scripts/generate-runtime-required-english-catalog.test.mjs": 350,
-      "config/scripts/generate-skill-bundle-manifest.test.mjs": 636,
-      "config/scripts/generate-terminal-perf-html-report.test.mjs": 105,
-      "config/scripts/git-binary-compatibility-workflow.test.mjs": 191,
-      "config/scripts/git-pull-request-diff-base.test.mjs": 44,
-      "config/scripts/hang-watchdog-process-metrics.test.mjs": 40,
-      "config/scripts/happy-dom-mutation-observer-retention.test.ts": 516,
-      "config/scripts/happy-dom-offscreen-canvas.test.ts": 604,
-      "config/scripts/headless-serve-shutdown-matrix.test.mjs": 93,
-      "config/scripts/headless-serve-shutdown-workflow.test.mjs": 144,
-      "config/scripts/hourly-build-version.test.mjs": 80,
-      "config/scripts/hourly-preflight-workflow.test.mjs": 175,
-      "config/scripts/idle-cpu-process-sampling.test.mjs": 53,
-      "config/scripts/install-electron-package-binary.test.mjs": 2169,
-      "config/scripts/install-node-dependencies-action.test.mjs": 200,
-      "config/scripts/lag-probe-failures.test.mjs": 55,
-      "config/scripts/latest-stable-release.test.mjs": 52,
-      "config/scripts/lint-staged-worktree-backup.test.mjs": 326,
-      "config/scripts/linux-package-maintainer-scripts.test.mjs": 32,
-      "config/scripts/live-freeze-bounded-history.test.mjs": 53,
-      "config/scripts/live-remote-bulk-open-freeze-metrics.test.mjs": 62,
-      "config/scripts/live-remote-freeze-rpc.test.mjs": 42,
-      "config/scripts/live-remote-status-watchdog.test.mjs": 302,
-      "config/scripts/locale-brand-prefilter.test.mjs": 112,
-      "config/scripts/locale-count-fragment-separator.test.mjs": 129,
-      "config/scripts/locale-generic-ui-terms.test.mjs": 304,
-      "config/scripts/locale-ko-frozen-terminal-search-keywords.test.mjs": 190,
-      "config/scripts/locale-ko-key-overrides.test.mjs": 91,
-      "config/scripts/locale-repair-catalog-missing-leaves.test.mjs": 153,
-      "config/scripts/locale-translation-policy-ko-round5.test.mjs": 257,
-      "config/scripts/locale-translation-policy.es-pr.test.mjs": 411,
-      "config/scripts/locale-translation-policy.es-round5.test.mjs": 152,
-      "config/scripts/locale-translation-policy.ja-relocalization.test.mjs": 268,
-      "config/scripts/locale-translation-policy.ja-round5.test.mjs": 213,
-      "config/scripts/locale-translation-policy.test.mjs": 217,
-      "config/scripts/locale-translation-policy.zh-round5.test.mjs": 318,
-      "config/scripts/locale-translation-policy.zh-status-bar-usage.test.mjs": 124,
-      "config/scripts/localization-package-contract.test.mjs": 30,
-      "config/scripts/mac-build-compatibility.test.mjs": 48,
-      "config/scripts/macos-computer-helper-owner-loss-group-recovery.test.mjs": 71,
-      "config/scripts/macos-computer-helper-owner-loss-processes.test.mjs": 63,
-      "config/scripts/macos-tcc-prompt-localization.test.mjs": 201,
-      "config/scripts/mobile-launch-contract-workflow.test.mjs": 400,
-      "config/scripts/mobile-mirrored-storage-write-path.test.mjs": 145,
-      "config/scripts/mobile-pairing-qrcode-import-plugin.test.mjs": 503,
+      "config/scripts/computer-use-modifier-safety.test.mjs": 51,
+      "config/scripts/computer-use-mouse-button-routing.test.mjs": 43,
+      "config/scripts/computer-use-skill-guidance.test.mjs": 130,
+      "config/scripts/computer-use-smoke.test.mjs": 580,
+      "config/scripts/computer-use-windows-horizontal-scroll.test.mjs": 42,
+      "config/scripts/counterbalanced-benchmark-schedule.test.mjs": 47,
+      "config/scripts/create-draft-release.test.mjs": 72,
+      "config/scripts/daily-build-version.test.mjs": 87,
+      "config/scripts/daily-e2e-dispatch-contract.test.mjs": 168,
+      "config/scripts/dev-channel-base-version.test.mjs": 60,
+      "config/scripts/dev-channel-windows-workflow-contract.test.mjs": 141,
+      "config/scripts/dev-cli-terminal-wrapper.test.mjs": 34,
+      "config/scripts/dev-electron-bundle-cache.test.ts": 52,
+      "config/scripts/dev-electron-bundle-identity.test.ts": 82,
+      "config/scripts/electron-builder-config.test.mjs": 1072,
+      "config/scripts/electron-builder-mac-channel-config.test.mjs": 1002,
+      "config/scripts/electron-builder-markdown-associations.test.mjs": 269,
+      "config/scripts/electron-builder-native-rebuild.test.mjs": 41,
+      "config/scripts/electron-builder-runtime-resources.test.mjs": 1124,
+      "config/scripts/electron-builder-speech-config.test.mjs": 485,
+      "config/scripts/electron-runtime-floor.test.ts": 37,
+      "config/scripts/electron-vite-output-contract.test.ts": 1042,
+      "config/scripts/ensure-native-runtime-job-ownership.test.mjs": 35,
+      "config/scripts/ensure-native-runtime.test.mjs": 771,
+      "config/scripts/ephemeral-vm-runtime-store-cross-version.test.ts": 42,
+      "config/scripts/generate-bundled-skill-guides.test.mjs": 510,
+      "config/scripts/generate-runtime-required-english-catalog.test.mjs": 452,
+      "config/scripts/generate-skill-bundle-manifest.test.mjs": 721,
+      "config/scripts/generate-terminal-perf-html-report.test.mjs": 71,
+      "config/scripts/git-binary-compatibility-workflow.test.mjs": 153,
+      "config/scripts/git-pull-request-diff-base.test.mjs": 36,
+      "config/scripts/hang-watchdog-process-metrics.test.mjs": 34,
+      "config/scripts/happy-dom-mutation-observer-retention.test.ts": 384,
+      "config/scripts/happy-dom-offscreen-canvas.test.ts": 319,
+      "config/scripts/headless-serve-shutdown-matrix.test.mjs": 112,
+      "config/scripts/headless-serve-shutdown-workflow.test.mjs": 148,
+      "config/scripts/hourly-build-version.test.mjs": 136,
+      "config/scripts/hourly-preflight-workflow.test.mjs": 165,
+      "config/scripts/idle-cpu-process-sampling.test.mjs": 60,
+      "config/scripts/install-electron-package-binary.test.mjs": 3284,
+      "config/scripts/install-node-dependencies-action.test.mjs": 434,
+      "config/scripts/lag-probe-failures.test.mjs": 52,
+      "config/scripts/latest-stable-release.test.mjs": 60,
+      "config/scripts/lint-staged-worktree-backup.test.mjs": 436,
+      "config/scripts/linux-package-fixture-cache.test.mjs": 200,
+      "config/scripts/linux-package-maintainer-scripts.test.mjs": 19,
+      "config/scripts/live-freeze-bounded-history.test.mjs": 49,
+      "config/scripts/live-remote-bulk-open-freeze-metrics.test.mjs": 72,
+      "config/scripts/live-remote-freeze-rpc.test.mjs": 53,
+      "config/scripts/live-remote-status-watchdog.test.mjs": 285,
+      "config/scripts/locale-brand-prefilter.test.mjs": 263,
+      "config/scripts/locale-count-fragment-separator.test.mjs": 200,
+      "config/scripts/locale-generic-ui-terms.test.mjs": 111,
+      "config/scripts/locale-ko-frozen-terminal-search-keywords.test.mjs": 127,
+      "config/scripts/locale-ko-key-overrides.test.mjs": 95,
+      "config/scripts/locale-repair-catalog-missing-leaves.test.mjs": 124,
+      "config/scripts/locale-translation-policy-ko-round5.test.mjs": 249,
+      "config/scripts/locale-translation-policy.es-pr.test.mjs": 132,
+      "config/scripts/locale-translation-policy.es-round5.test.mjs": 118,
+      "config/scripts/locale-translation-policy.ja-relocalization.test.mjs": 207,
+      "config/scripts/locale-translation-policy.ja-round5.test.mjs": 137,
+      "config/scripts/locale-translation-policy.test.mjs": 283,
+      "config/scripts/locale-translation-policy.zh-round5.test.mjs": 290,
+      "config/scripts/locale-translation-policy.zh-status-bar-usage.test.mjs": 138,
+      "config/scripts/localization-extraction-change-scope.test.mjs": 133,
+      "config/scripts/localization-package-contract.test.mjs": 40,
+      "config/scripts/mac-build-compatibility.test.mjs": 41,
+      "config/scripts/macos-computer-helper-owner-loss-group-recovery.test.mjs": 33,
+      "config/scripts/macos-computer-helper-owner-loss-processes.test.mjs": 64,
+      "config/scripts/macos-tcc-prompt-localization.test.mjs": 213,
+      "config/scripts/mobile-launch-contract-workflow.test.mjs": 439,
+      "config/scripts/mobile-mirrored-storage-write-path.test.mjs": 136,
+      "config/scripts/mobile-pairing-qrcode-import-plugin.test.mjs": 421,
+      "config/scripts/mobile-recording-pin-checkout.test.mjs": 309,
+      "config/scripts/mobile-release-check-scope.test.mjs": 610,
       "config/scripts/mobile-release-shell-switch-workflow.test.mjs": 227,
-      "config/scripts/mobile-set-native-props-web-siblings.test.mjs": 1756,
-      "config/scripts/mobile-web-app-agent-history-render.test.mjs": 533,
-      "config/scripts/mobile-web-app-browser-pane-render.test.mjs": 623,
-      "config/scripts/mobile-web-app-browser-pane-text-inputs.test.mjs": 528,
-      "config/scripts/mobile-web-app-clipboard-image-resize-render.test.mjs": 548,
-      "config/scripts/mobile-web-app-drawer-render.test.mjs": 584,
-      "config/scripts/mobile-web-app-editable-host-font-size.test.mjs": 443,
-      "config/scripts/mobile-web-app-external-link-seam.test.mjs": 428,
-      "config/scripts/mobile-web-app-external-navigation-grant.test.mjs": 71,
-      "config/scripts/mobile-web-app-files-external-links.test.mjs": 353,
-      "config/scripts/mobile-web-app-files-render.test.mjs": 563,
-      "config/scripts/mobile-web-app-frame-budget-sweep.test.ts": 427,
-      "config/scripts/mobile-web-app-handoff-grants-render.test.mjs": 419,
-      "config/scripts/mobile-web-app-haptics-seam.test.mjs": 469,
-      "config/scripts/mobile-web-app-html-preview-render.test.mjs": 690,
-      "config/scripts/mobile-web-app-mermaid-render.test.mjs": 510,
-      "config/scripts/mobile-web-app-native-parity-render.test.mjs": 573,
-      "config/scripts/mobile-web-app-page-closure-families.test.mjs": 83,
-      "config/scripts/mobile-web-app-page-grant-call-sites.test.mjs": 539,
-      "config/scripts/mobile-web-app-push-subsystem-closure.test.mjs": 53,
-      "config/scripts/mobile-web-app-render.test.mjs": 765,
-      "config/scripts/mobile-web-app-rich-markdown-render.test.mjs": 885,
-      "config/scripts/mobile-web-app-route-manifest.test.mjs": 164,
-      "config/scripts/mobile-web-app-safe-area-render.test.mjs": 589,
-      "config/scripts/mobile-web-app-screencast-lane-grant.test.mjs": 94,
-      "config/scripts/mobile-web-app-session-dictation-capture.test.mjs": 152,
-      "config/scripts/mobile-web-app-session-external-links.test.mjs": 350,
-      "config/scripts/mobile-web-app-session-media-picker.test.mjs": 526,
-      "config/scripts/mobile-web-app-session-render.test.mjs": 579,
-      "config/scripts/mobile-web-app-session-terminal-closure.test.mjs": 615,
-      "config/scripts/mobile-web-app-session-terminal-init.test.mjs": 329,
-      "config/scripts/mobile-web-app-session-text-inputs.test.mjs": 397,
-      "config/scripts/mobile-web-app-session-webview-consumers.test.mjs": 53,
-      "config/scripts/mobile-web-app-source-control-external-links.test.mjs": 422,
-      "config/scripts/mobile-web-app-source-control-keyboard.test.mjs": 53,
-      "config/scripts/mobile-web-app-source-control-render.test.mjs": 612,
-      "config/scripts/mobile-web-app-source-control-text-inputs.test.mjs": 541,
-      "config/scripts/mobile-web-app-tasks-external-links.test.mjs": 387,
-      "config/scripts/mobile-web-app-tasks-render.test.mjs": 344,
-      "config/scripts/mobile-web-app-terminal-live-input-render.test.mjs": 591,
-      "config/scripts/mobile-web-app-terminal-render-fixture.test.mjs": 423,
-      "config/scripts/mobile-web-app-terminal-render.test.mjs": 674,
-      "config/scripts/mobile-web-app-web-overrides.test.mjs": 109,
-      "config/scripts/mobile-web-bundle-manifest.test.mjs": 72,
-      "config/scripts/mobile-web-bundle-packaging-workflow-contract.test.mjs": 1165,
-      "config/scripts/mobile-web-bundle-serializer-parity.test.mjs": 157,
-      "config/scripts/mobile-web-page-route-hop-coverage.test.mjs": 4627,
-      "config/scripts/mobile-web-page-routes.test.mjs": 131,
-      "config/scripts/mobile-web-source-line-endings.test.mjs": 646,
-      "config/scripts/mobile-web-terminal-engine-closure.test.mjs": 73,
-      "config/scripts/node-old-space-limit.test.mjs": 49,
-      "config/scripts/node-pty-console-list-agent-patch.test.mjs": 81,
-      "config/scripts/node-pty-master-cloexec-patch.test.mjs": 117,
-      "config/scripts/node-pty-windows-pty-teardown-patch.test.mjs": 81,
-      "config/scripts/orca-cli-skill-guidance.test.mjs": 46,
-      "config/scripts/orca-dev-bin.test.mjs": 115,
-      "config/scripts/orca-linear-skill-guidance.test.mjs": 76,
-      "config/scripts/orcad-artifact-version.test.mjs": 59,
-      "config/scripts/orcad-operations-restart-safety.test.mjs": 43,
-      "config/scripts/orchestration-guide-command-contract.test.mjs": 45,
-      "config/scripts/orchestration-skill-guidance.test.mjs": 69,
-      "config/scripts/oxc-cli-invocation.test.mjs": 130,
-      "config/scripts/oxlint-cli-invocation.test.mjs": 105,
-      "config/scripts/package-electron-install-owner.test.mjs": 224,
-      "config/scripts/package-electron-runtime-contract.test.mjs": 260,
-      "config/scripts/packaged-browser-lane-contract.test.mjs": 70,
-      "config/scripts/packaged-hang-watchdog-worker-contract.test.mjs": 107,
-      "config/scripts/packaged-node-pty-prebuild-prune.test.mjs": 85,
-      "config/scripts/packaged-source-map-prune.test.mjs": 93,
-      "config/scripts/patched-dependencies-frozen-install.test.mjs": 699,
-      "config/scripts/plain-node-entry-guard.test.ts": 700,
-      "config/scripts/pnpm-cli-invocation.test.mjs": 53,
-      "config/scripts/pr-code-change-scope.test.mjs": 507,
-      "config/scripts/pr-e2e-gate-contract.test.mjs": 354,
-      "config/scripts/pr-e2e-native-only-routing.test.mjs": 99,
-      "config/scripts/pr-e2e-pane-close-routing.test.mjs": 80,
-      "config/scripts/pr-test-loc-summary.test.mjs": 224,
-      "config/scripts/pr-workflow-lint-parity.test.mjs": 78,
-      "config/scripts/pr-workflow-parallelism.test.mjs": 1029,
-      "config/scripts/profile-state-worker-smoke.test.mjs": 2736,
-      "config/scripts/project-renderer-web-client.test.mjs": 249,
-      "config/scripts/pty-transcript-secret-scan.test.mjs": 82,
-      "config/scripts/publish-complete-draft-releases.test.mjs": 190,
-      "config/scripts/quadratic-buffer-concat-plugin.test.mjs": 2300,
-      "config/scripts/rebuild-native-deps-node-pty.test.mjs": 3978,
-      "config/scripts/rebuild-native-deps-windows-process-tree.test.mjs": 34,
-      "config/scripts/rebuild-native-deps.test.mjs": 1038,
-      "config/scripts/reclaim-dev-electron-bundles.test.ts": 296,
-      "config/scripts/regenerate-xterm-patches.test.mjs": 496,
-      "config/scripts/relay-artifact-manifest.test.mjs": 4162,
-      "config/scripts/relay-asset-line-ending-pin.test.mjs": 185,
-      "config/scripts/release-blocker-fixes.test.mjs": 105,
-      "config/scripts/release-cut-signpath-slack.test.mjs": 112,
-      "config/scripts/release-cut-sourcemap-publish.test.mjs": 156,
-      "config/scripts/release-cut-token-permissions.test.mjs": 245,
-      "config/scripts/release-e2e-dispatch-contract.test.mjs": 193,
-      "config/scripts/release-mac-build-workflow-dispatch.test.mjs": 57,
-      "config/scripts/release-rc-history.test.mjs": 221,
-      "config/scripts/renderer-boot-graph.test.mjs": 116,
-      "config/scripts/renderer-scrollbar-style-plugin.test.mjs": 3511,
-      "config/scripts/replace-cached-nsis-elevate.test.mjs": 1986,
-      "config/scripts/resolve-7za-path.test.mjs": 1528,
-      "config/scripts/run-codex-real-account-validation.test.ts": 3022,
-      "config/scripts/run-internal-dev-setup.test.mjs": 65,
-      "config/scripts/run-linux-packaged-node-pty-floor-smoke.test.mjs": 32,
-      "config/scripts/run-terminal-scale-perf-report-gate.test.mjs": 54,
-      "config/scripts/run-typecheck-projects-in-parallel.test.mjs": 48,
-      "config/scripts/script-entry-detection.test.mjs": 93,
-      "config/scripts/script-module-dependencies.test.mjs": 50,
-      "config/scripts/shared-electron-dist-cache.test.ts": 121,
-      "config/scripts/shebang-script-line-ending-pin.test.mjs": 117,
-      "config/scripts/skill-critical-guidance.test.mjs": 48,
-      "config/scripts/skill-description-length.test.mjs": 101,
-      "config/scripts/skill-recipe-shell.test.mjs": 109,
-      "config/scripts/skill-sharing-release-workflow.test.mjs": 102,
-      "config/scripts/skill-update-roundtrip-workflow.test.mjs": 91,
-      "config/scripts/skills-cli-package-workflow.test.mjs": 142,
-      "config/scripts/sort-comparator-performance-plugin.test.mjs": 359,
-      "config/scripts/space-sharing-copy.test.ts": 113,
-      "config/scripts/ssh-browser-e2e-routing.test.mjs": 135,
-      "config/scripts/ssh-localhost-e2e-routing.test.mjs": 113,
-      "config/scripts/static-appimage-package-contract.test.mjs": 50,
-      "config/scripts/summarize-terminal-perf-report.test.mjs": 110,
-      "config/scripts/telemetry-bundle-constant-patterns.test.mjs": 50,
-      "config/scripts/terminal-ime-e2e-workflow.test.mjs": 93,
-      "config/scripts/terminal-ime-engagement-receipt.test.mjs": 50,
-      "config/scripts/terminal-perf-report-annotations.test.mjs": 36,
-      "config/scripts/trim-windows-icon-source.test.mjs": 186,
-      "config/scripts/verify-cli-bin.test.mjs": 124,
-      "config/scripts/verify-dev-channel-packaging.test.mjs": 685,
-      "config/scripts/verify-linux-glibc-floor.test.mjs": 168,
-      "config/scripts/verify-localization-catalog.test.mjs": 543,
-      "config/scripts/verify-localization-extraction.test.mjs": 38,
-      "config/scripts/verify-packaged-browser-participation.test.mjs": 71,
-      "config/scripts/verify-packaged-daemon-entry.test.mjs": 192,
-      "config/scripts/verify-packaged-mobile-web-bundle.test.mjs": 507,
-      "config/scripts/verify-packaged-node-pty-job-ownership.test.mjs": 94,
-      "config/scripts/verify-packaged-plugin-resources.test.mjs": 91,
-      "config/scripts/verify-release-required-assets.test.mjs": 60,
-      "config/scripts/verify-skills-cli-runtime.test.mjs": 366,
-      "config/scripts/verify-windows-inner-signature.test.mjs": 83,
-      "config/scripts/verify-wsl-e2e-participation.test.mjs": 42,
-      "config/scripts/websocket-server-loopback-bind.test.ts": 982,
-      "config/scripts/win-crash-survival-e2e.test.mjs": 808,
-      "config/scripts/win32-test-lane-registration.test.mjs": 3820,
-      "config/scripts/windows-bin-spawn-predicate.test.mjs": 404,
-      "config/scripts/windows-cmd-shim-spawn-boundary.test.mjs": 1434,
-      "config/scripts/windows-pe-machine.test.mjs": 33,
-      "config/scripts/windows-process-tree-gyp-path.test.mjs": 44,
-      "config/scripts/windows-process-tree-gyp-rebuild.test.mjs": 89,
-      "config/scripts/windows-process-tree-patch-contract.test.mjs": 428,
-      "config/scripts/windows-pty-native-capability-workflow.test.mjs": 135,
-      "config/scripts/windows-signing-gate-toolset.test.mjs": 123,
-      "config/scripts/windows-signing-workflow-contract.test.mjs": 841,
-      "config/scripts/windows-uninstaller-signing.test.mjs": 83,
-      "config/scripts/workflow-ref-mirror-case-safety.test.mjs": 594,
-      "config/scripts/workflow-ref-reachability.test.mjs": 650,
-      "config/scripts/wsl-e2e-lane-contract.test.mjs": 129,
-      "config/scripts/xterm-image-lifecycle-contract.test.mjs": 502,
-      "config/scripts/xterm-image-memory-contract.test.mjs": 300,
-      "config/scripts/xterm-image-resize-contract.test.mjs": 89,
-      "config/scripts/xterm-webgl-runtime-contract.test.mjs": 55,
-      "src/cli/agent-context.test.ts": 74,
+      "config/scripts/mobile-set-native-props-web-siblings.test.mjs": 959,
+      "config/scripts/mobile-test-change-scope.test.mjs": 107,
+      "config/scripts/mobile-web-app-agent-history-render.test.mjs": 695,
+      "config/scripts/mobile-web-app-browser-pane-render.test.mjs": 416,
+      "config/scripts/mobile-web-app-browser-pane-text-inputs.test.mjs": 380,
+      "config/scripts/mobile-web-app-clipboard-image-resize-render.test.mjs": 544,
+      "config/scripts/mobile-web-app-drawer-render.test.mjs": 379,
+      "config/scripts/mobile-web-app-editable-host-font-size.test.mjs": 590,
+      "config/scripts/mobile-web-app-external-link-seam.test.mjs": 340,
+      "config/scripts/mobile-web-app-external-navigation-grant.test.mjs": 81,
+      "config/scripts/mobile-web-app-files-external-links.test.mjs": 383,
+      "config/scripts/mobile-web-app-files-render.test.mjs": 315,
+      "config/scripts/mobile-web-app-frame-budget-sweep.test.ts": 545,
+      "config/scripts/mobile-web-app-handoff-grants-render.test.mjs": 476,
+      "config/scripts/mobile-web-app-haptics-seam.test.mjs": 491,
+      "config/scripts/mobile-web-app-html-preview-render.test.mjs": 1035,
+      "config/scripts/mobile-web-app-mermaid-render.test.mjs": 567,
+      "config/scripts/mobile-web-app-native-parity-render.test.mjs": 554,
+      "config/scripts/mobile-web-app-page-closure-families.test.mjs": 75,
+      "config/scripts/mobile-web-app-page-grant-call-sites.test.mjs": 567,
+      "config/scripts/mobile-web-app-push-subsystem-closure.test.mjs": 70,
+      "config/scripts/mobile-web-app-render.test.mjs": 339,
+      "config/scripts/mobile-web-app-rich-markdown-render.test.mjs": 991,
+      "config/scripts/mobile-web-app-route-manifest.test.mjs": 220,
+      "config/scripts/mobile-web-app-route-snapshot.test.mjs": 95,
+      "config/scripts/mobile-web-app-safe-area-render.test.mjs": 503,
+      "config/scripts/mobile-web-app-screencast-lane-grant.test.mjs": 56,
+      "config/scripts/mobile-web-app-session-dictation-capture.test.mjs": 98,
+      "config/scripts/mobile-web-app-session-external-links.test.mjs": 210,
+      "config/scripts/mobile-web-app-session-media-picker.test.mjs": 375,
+      "config/scripts/mobile-web-app-session-render.test.mjs": 495,
+      "config/scripts/mobile-web-app-session-terminal-closure.test.mjs": 444,
+      "config/scripts/mobile-web-app-session-terminal-init.test.mjs": 529,
+      "config/scripts/mobile-web-app-session-text-inputs.test.mjs": 391,
+      "config/scripts/mobile-web-app-session-webview-consumers.test.mjs": 76,
+      "config/scripts/mobile-web-app-source-control-external-links.test.mjs": 317,
+      "config/scripts/mobile-web-app-source-control-keyboard.test.mjs": 59,
+      "config/scripts/mobile-web-app-source-control-render.test.mjs": 432,
+      "config/scripts/mobile-web-app-source-control-text-inputs.test.mjs": 295,
+      "config/scripts/mobile-web-app-tasks-external-links.test.mjs": 349,
+      "config/scripts/mobile-web-app-tasks-render.test.mjs": 356,
+      "config/scripts/mobile-web-app-terminal-live-input-render.test.mjs": 431,
+      "config/scripts/mobile-web-app-terminal-render-fixture.test.mjs": 548,
+      "config/scripts/mobile-web-app-terminal-render.test.mjs": 346,
+      "config/scripts/mobile-web-app-web-overrides.test.mjs": 69,
+      "config/scripts/mobile-web-bundle-manifest.test.mjs": 54,
+      "config/scripts/mobile-web-bundle-packaging-workflow-contract.test.mjs": 1102,
+      "config/scripts/mobile-web-bundle-serializer-parity.test.mjs": 138,
+      "config/scripts/mobile-web-page-route-hop-coverage.test.mjs": 4953,
+      "config/scripts/mobile-web-page-routes.test.mjs": 162,
+      "config/scripts/mobile-web-source-line-endings.test.mjs": 661,
+      "config/scripts/mobile-web-terminal-engine-closure.test.mjs": 79,
+      "config/scripts/node-old-space-limit.test.mjs": 32,
+      "config/scripts/node-pty-console-list-agent-patch.test.mjs": 46,
+      "config/scripts/node-pty-master-cloexec-patch.test.mjs": 114,
+      "config/scripts/node-pty-windows-pty-teardown-patch.test.mjs": 98,
+      "config/scripts/nsis-process-check.test.mjs": 62,
+      "config/scripts/orca-cli-skill-guidance.test.mjs": 62,
+      "config/scripts/orca-dev-bin.test.mjs": 79,
+      "config/scripts/orca-linear-skill-guidance.test.mjs": 50,
+      "config/scripts/orcad-artifact-version.test.mjs": 470,
+      "config/scripts/orcad-operations-restart-safety.test.mjs": 45,
+      "config/scripts/orcad-terminal-smoke-change-scope.test.mjs": 1510,
+      "config/scripts/orcad-watcher-package.test.mjs": 132,
+      "config/scripts/orcad-windows-process-tree.test.mjs": 63,
+      "config/scripts/orchestration-guide-command-contract.test.mjs": 44,
+      "config/scripts/orchestration-skill-guidance.test.mjs": 58,
+      "config/scripts/oxc-cli-invocation.test.mjs": 85,
+      "config/scripts/oxlint-cli-invocation.test.mjs": 106,
+      "config/scripts/package-electron-install-owner.test.mjs": 91,
+      "config/scripts/package-electron-runtime-contract.test.mjs": 447,
+      "config/scripts/package-linux-formats.test.mjs": 208,
+      "config/scripts/packaged-browser-lane-contract.test.mjs": 104,
+      "config/scripts/packaged-node-pty-prebuild-prune.test.mjs": 93,
+      "config/scripts/packaged-source-map-prune.test.mjs": 117,
+      "config/scripts/patched-dependencies-frozen-install.test.mjs": 900,
+      "config/scripts/pdfjs-viewer-assets-stream.test.ts": 246,
+      "config/scripts/plain-node-entry-guard.test.ts": 728,
+      "config/scripts/playwright-focused-workflow-selection.test.mjs": 3690,
+      "config/scripts/pnpm-cli-invocation.test.mjs": 38,
+      "config/scripts/pr-code-change-scope.test.mjs": 638,
+      "config/scripts/pr-e2e-gate-contract.test.mjs": 409,
+      "config/scripts/pr-e2e-native-only-routing.test.mjs": 169,
+      "config/scripts/pr-e2e-pane-close-routing.test.mjs": 55,
+      "config/scripts/pr-ready-check-gate.test.mjs": 303,
+      "config/scripts/pr-ready-check-reuse.test.mjs": 190,
+      "config/scripts/pr-test-loc-summary.test.mjs": 178,
+      "config/scripts/pr-workflow-lint-parity.test.mjs": 81,
+      "config/scripts/pr-workflow-parallelism.test.mjs": 1324,
+      "config/scripts/profile-state-worker-smoke.test.mjs": 2754,
+      "config/scripts/project-renderer-web-client.test.mjs": 251,
+      "config/scripts/pty-transcript-secret-scan.test.mjs": 68,
+      "config/scripts/publish-complete-draft-releases.test.mjs": 230,
+      "config/scripts/quadratic-buffer-concat-plugin.test.mjs": 2182,
+      "config/scripts/rebuild-native-deps-node-pty.test.mjs": 4426,
+      "config/scripts/rebuild-native-deps-windows-process-tree.test.mjs": 40,
+      "config/scripts/rebuild-native-deps.test.mjs": 1467,
+      "config/scripts/reclaim-dev-electron-bundles.test.ts": 57,
+      "config/scripts/regenerate-xterm-patches.test.mjs": 432,
+      "config/scripts/relay-artifact-manifest.test.mjs": 4048,
+      "config/scripts/relay-asset-line-ending-pin.test.mjs": 110,
+      "config/scripts/release-blocker-fixes.test.mjs": 80,
+      "config/scripts/release-cut-signpath-slack.test.mjs": 95,
+      "config/scripts/release-cut-sourcemap-publish.test.mjs": 175,
+      "config/scripts/release-cut-token-permissions.test.mjs": 210,
+      "config/scripts/release-e2e-dispatch-contract.test.mjs": 184,
+      "config/scripts/release-mac-build-workflow-dispatch.test.mjs": 45,
+      "config/scripts/release-rc-history.test.mjs": 244,
+      "config/scripts/renderer-boot-graph.test.mjs": 98,
+      "config/scripts/renderer-scrollbar-style-plugin.test.mjs": 2119,
+      "config/scripts/replace-cached-nsis-elevate.test.mjs": 1919,
+      "config/scripts/resolve-7za-path.test.mjs": 1815,
+      "config/scripts/run-codex-real-account-validation.test.ts": 4165,
+      "config/scripts/run-internal-dev-setup.test.mjs": 54,
+      "config/scripts/run-linux-packaged-node-pty-floor-smoke.test.mjs": 71,
+      "config/scripts/run-terminal-scale-perf-report-gate.test.mjs": 73,
+      "config/scripts/run-typecheck-projects-in-parallel.test.mjs": 47,
+      "config/scripts/script-entry-detection.test.mjs": 72,
+      "config/scripts/script-module-dependencies.test.mjs": 57,
+      "config/scripts/shared-electron-dist-cache.test.ts": 90,
+      "config/scripts/shebang-script-line-ending-pin.test.mjs": 119,
+      "config/scripts/skill-critical-guidance.test.mjs": 37,
+      "config/scripts/skill-description-length.test.mjs": 83,
+      "config/scripts/skill-recipe-shell.test.mjs": 76,
+      "config/scripts/skill-sharing-release-workflow.test.mjs": 130,
+      "config/scripts/skill-update-roundtrip-workflow.test.mjs": 86,
+      "config/scripts/skills-cli-package-workflow.test.mjs": 137,
+      "config/scripts/sort-comparator-performance-plugin.test.mjs": 332,
+      "config/scripts/space-sharing-copy.test.ts": 110,
+      "config/scripts/ssh-browser-e2e-routing.test.mjs": 138,
+      "config/scripts/ssh-docker-ci-sharding.test.mjs": 7004,
+      "config/scripts/ssh-localhost-e2e-routing.test.mjs": 163,
+      "config/scripts/static-appimage-package-contract.test.mjs": 83,
+      "config/scripts/summarize-terminal-perf-report.test.mjs": 74,
+      "config/scripts/telemetry-bundle-constant-patterns.test.mjs": 45,
+      "config/scripts/terminal-ime-e2e-workflow.test.mjs": 79,
+      "config/scripts/terminal-ime-engagement-receipt.test.mjs": 37,
+      "config/scripts/terminal-perf-report-annotations.test.mjs": 60,
+      "config/scripts/trim-windows-icon-source.test.mjs": 289,
+      "config/scripts/verify-cli-bin.test.mjs": 102,
+      "config/scripts/verify-dev-channel-packaging.test.mjs": 655,
+      "config/scripts/verify-linux-glibc-floor.test.mjs": 142,
+      "config/scripts/verify-linux-glibc-payloads.test.mjs": 223,
+      "config/scripts/verify-localization-catalog.test.mjs": 671,
+      "config/scripts/verify-localization-extraction.test.mjs": 36,
+      "config/scripts/verify-packaged-browser-participation.test.mjs": 43,
+      "config/scripts/verify-packaged-daemon-entry.test.mjs": 135,
+      "config/scripts/verify-packaged-mobile-web-bundle.test.mjs": 439,
+      "config/scripts/verify-packaged-node-pty-job-ownership.test.mjs": 61,
+      "config/scripts/verify-packaged-orcad-template.test.mjs": 466,
+      "config/scripts/verify-packaged-plugin-resources.test.mjs": 68,
+      "config/scripts/verify-release-required-assets.test.mjs": 33,
+      "config/scripts/verify-skills-cli-runtime.test.mjs": 381,
+      "config/scripts/verify-windows-inner-signature.test.mjs": 46,
+      "config/scripts/verify-wsl-e2e-participation.test.mjs": 58,
+      "config/scripts/websocket-server-loopback-bind.test.ts": 898,
+      "config/scripts/win-crash-survival-e2e.test.mjs": 775,
+      "config/scripts/win32-test-lane-registration.test.mjs": 2421,
+      "config/scripts/windows-bin-spawn-predicate.test.mjs": 363,
+      "config/scripts/windows-cmd-shim-spawn-boundary.test.mjs": 2079,
+      "config/scripts/windows-pe-machine.test.mjs": 41,
+      "config/scripts/windows-process-tree-creation-time.test.mjs": 43,
+      "config/scripts/windows-process-tree-gyp-path.test.mjs": 47,
+      "config/scripts/windows-process-tree-gyp-rebuild.test.mjs": 104,
+      "config/scripts/windows-process-tree-patch-contract.test.mjs": 711,
+      "config/scripts/windows-pty-native-capability-workflow.test.mjs": 142,
+      "config/scripts/windows-signing-gate-toolset.test.mjs": 148,
+      "config/scripts/windows-signing-workflow-contract.test.mjs": 589,
+      "config/scripts/windows-uninstaller-signing.test.mjs": 65,
+      "config/scripts/workflow-ref-mirror-case-safety.test.mjs": 435,
+      "config/scripts/workflow-ref-reachability.test.mjs": 783,
+      "config/scripts/wsl-e2e-lane-contract.test.mjs": 208,
+      "config/scripts/xterm-image-lifecycle-contract.test.mjs": 458,
+      "config/scripts/xterm-image-memory-contract.test.mjs": 240,
+      "config/scripts/xterm-image-resize-contract.test.mjs": 69,
+      "config/scripts/xterm-webgl-runtime-contract.test.mjs": 51,
+      "config/scripts/zip-extractor-command.test.mjs": 83,
+      "src/cli/agent-context.test.ts": 56,
       "src/cli/agent-session-search-format.test.ts": 56,
-      "src/cli/args-repeatable-flags.test.ts": 46,
-      "src/cli/args.test.ts": 161,
-      "src/cli/automation-format.test.ts": 93,
-      "src/cli/automation-owner-conflict-recovery.test.ts": 212,
-      "src/cli/base64-payload-byte-count.test.ts": 36,
-      "src/cli/browser-cookie-credentials-empty-value.test.ts": 160,
-      "src/cli/browser-storage-empty-value.test.ts": 168,
-      "src/cli/browser.test.ts": 683,
-      "src/cli/cli-command-name-parity.test.ts": 79,
-      "src/cli/cli-version.test.ts": 42,
-      "src/cli/codex-command-classification.test.ts": 50,
-      "src/cli/command-suggestion-budget.test.ts": 32,
-      "src/cli/command-suggestion.test.ts": 56,
-      "src/cli/computer-format.test.ts": 42,
-      "src/cli/emulator-logcat-format.test.ts": 32,
-      "src/cli/execution-host-flag.test.ts": 84,
-      "src/cli/flags.test.ts": 62,
-      "src/cli/format-recovery.test.ts": 425,
-      "src/cli/format.test.ts": 413,
-      "src/cli/handler-group-manifest.test.ts": 700,
-      "src/cli/handlers/account.test.ts": 1382,
-      "src/cli/handlers/agent-hooks-load-boundary.test.ts": 313,
-      "src/cli/handlers/agent-hooks.test.ts": 776,
-      "src/cli/handlers/artifacts.test.ts": 331,
-      "src/cli/handlers/automation-destination-fencing.test.ts": 337,
-      "src/cli/handlers/automation-owner-fencing.test.ts": 308,
-      "src/cli/handlers/computer-action-routing.test.ts": 188,
-      "src/cli/handlers/computer-action-validation.test.ts": 140,
-      "src/cli/handlers/computer-state-formatting.test.ts": 116,
-      "src/cli/handlers/computer.test.ts": 160,
-      "src/cli/handlers/core.test.ts": 234,
-      "src/cli/handlers/emulator.test.ts": 178,
-      "src/cli/handlers/file-absolute-paths.test.ts": 122,
-      "src/cli/handlers/file.test.ts": 129,
-      "src/cli/handlers/interactive-login-interruption.test.ts": 50,
-      "src/cli/handlers/linear.test.ts": 621,
-      "src/cli/handlers/orchestration-caller-identity-cli.test.ts": 464,
-      "src/cli/handlers/orchestration-check-identity.test.ts": 185,
-      "src/cli/handlers/orchestration-federated-legacy-settlement.test.ts": 184,
-      "src/cli/handlers/orchestration-gate-cli.test.ts": 145,
-      "src/cli/handlers/orchestration-legacy-read-only.test.ts": 377,
-      "src/cli/handlers/orchestration-lifecycle-json-rejection.test.ts": 214,
-      "src/cli/handlers/orchestration-lifecycle-rejection.test.ts": 439,
-      "src/cli/handlers/orchestration-migration.test.ts": 331,
-      "src/cli/handlers/orchestration-module-boundaries.test.ts": 256,
-      "src/cli/handlers/orchestration-request-show-cli.test.ts": 161,
-      "src/cli/handlers/orchestration-run-cli.test.ts": 286,
-      "src/cli/handlers/orchestration-send-receipt-warnings.test.ts": 291,
-      "src/cli/handlers/orchestration-task-create-cli.test.ts": 286,
-      "src/cli/handlers/orchestration-task-list-brief.test.ts": 331,
-      "src/cli/handlers/orchestration-timeout-cli.test.ts": 278,
-      "src/cli/handlers/orchestration-timeout.test.ts": 273,
-      "src/cli/handlers/orchestration-windows-ask-cli.test.ts": 270,
-      "src/cli/handlers/orchestration-worker-cli.test.ts": 653,
-      "src/cli/handlers/orchestration-worker-show-wait-cli.test.ts": 295,
-      "src/cli/handlers/orchestration.test.ts": 433,
-      "src/cli/handlers/orchestration/worker-list-run-scope.test.ts": 271,
-      "src/cli/handlers/orchestration/worker-output.test.ts": 58,
-      "src/cli/handlers/profile-state-recovery-admission.test.ts": 1518,
-      "src/cli/handlers/profile-state.test.ts": 1215,
-      "src/cli/handlers/search.test.ts": 364,
-      "src/cli/handlers/skill-sharing.test.ts": 275,
-      "src/cli/handlers/terminal.test.ts": 543,
-      "src/cli/host-selector-alternatives.test.ts": 69,
-      "src/cli/index-automation-identifiers.test.ts": 196,
-      "src/cli/index-automation-schedule.test.ts": 167,
-      "src/cli/index-automation-session-reuse.test.ts": 134,
-      "src/cli/index-automation-source-context.test.ts": 163,
-      "src/cli/index-automation-target.test.ts": 231,
-      "src/cli/index-device-commands.test.ts": 217,
-      "src/cli/index-environment-commands.test.ts": 238,
-      "src/cli/index-local-command-routing-flags.test.ts": 273,
-      "src/cli/index-memory-diagnostics.test.ts": 141,
-      "src/cli/index-omitted-host-scope-selectors.test.ts": 173,
-      "src/cli/index-orchestration.test.ts": 181,
-      "src/cli/index-project-setup.test.ts": 372,
-      "src/cli/index-serve-command.test.ts": 261,
-      "src/cli/index-terminal-commands.test.ts": 235,
-      "src/cli/index-terminal-list-host-scope.test.ts": 121,
-      "src/cli/index-vm-recipe-doctor.test.ts": 260,
-      "src/cli/index-worktree-create-agent.test.ts": 282,
-      "src/cli/index-worktree-create-linear.test.ts": 164,
-      "src/cli/index-worktree-create-parent.test.ts": 267,
-      "src/cli/index-worktree-create-target.test.ts": 193,
-      "src/cli/index-worktree-selector-resolution.test.ts": 459,
-      "src/cli/index-worktree-set.test.ts": 220,
-      "src/cli/index.test.ts": 656,
-      "src/cli/linear-format.test.ts": 28,
-      "src/cli/orchestration-dispatch-refusal-format.test.ts": 86,
-      "src/cli/orchestration-mutation-recovery.test.ts": 403,
-      "src/cli/orchestration-structured-sender-identity.test.ts": 218,
-      "src/cli/orchestration-structured-session-no-identity.test.ts": 304,
-      "src/cli/quote-stripped-json-flag.test.ts": 44,
-      "src/cli/registry-parity.test.ts": 89,
-      "src/cli/retry-request-flag.test.ts": 382,
-      "src/cli/runtime-client-deferral.test.ts": 659,
-      "src/cli/runtime-client.test.ts": 343,
-      "src/cli/runtime/client-recovery.test.ts": 547,
-      "src/cli/runtime/client-timeout-policy.test.ts": 205,
-      "src/cli/runtime/envelope-schema.test.ts": 73,
-      "src/cli/runtime/environments.test.ts": 213,
-      "src/cli/runtime/launch.test.ts": 178,
-      "src/cli/runtime/orchestration-recovery-command.test.ts": 43,
-      "src/cli/runtime/profile-state-recovery-launch.test.ts": 153,
-      "src/cli/runtime/runtime-access-denied.test.ts": 245,
-      "src/cli/runtime/serve-signal-exit-diagnostic.test.ts": 92,
-      "src/cli/runtime/status.test.ts": 298,
-      "src/cli/runtime/transport-framing.test.ts": 208,
-      "src/cli/runtime/transport.test.ts": 665,
-      "src/cli/runtime/types.test.ts": 59,
-      "src/cli/runtime/websocket-transport-error.test.ts": 223,
-      "src/cli/runtime/websocket-transport.test.ts": 470,
-      "src/cli/search-command-arguments.test.ts": 219,
-      "src/cli/serve-electron-flag-parity.test.ts": 67,
-      "src/cli/shell-command-quote.test.ts": 45,
-      "src/cli/skill-guide-cli-parity.test.ts": 64,
-      "src/cli/skills-reference-selector.test.ts": 163,
-      "src/cli/skills.test.ts": 1645,
-      "src/cli/specs/account.test.ts": 66,
-      "src/cli/specs/bundled-guide-flags.test.ts": 157,
-      "src/cli/specs/computer.test.ts": 63,
-      "src/cli/specs/orchestration.test.ts": 43,
-      "src/cli/specs/profile-state.test.ts": 60,
-      "src/cli/specs/search.test.ts": 116,
-      "src/cli/specs/skills.test.ts": 61,
-      "src/cli/terminal-format-draft.test.ts": 49,
-      "src/cli/terminal-format.test.ts": 52,
-      "src/cli/terminal-list-host-scope-format.test.ts": 85,
-      "src/cli/terminal-read-screen.test.ts": 303,
-      "src/cli/vocabulary-policy.test.ts": 56,
-      "src/cli/worktree-selector-wsl-posix-path.test.ts": 67,
-      "src/main/active-view-persistence-boundary.test.ts": 910,
-      "src/main/active-view-preference-sync-flush-veto.test.ts": 730,
-      "src/main/active-view-preference.test.ts": 51,
-      "src/main/agent-auth-restart-preservation.test.ts": 72,
-      "src/main/agent-awake-service-platform-assertions.test.ts": 88,
-      "src/main/agent-awake-service.test.ts": 91,
-      "src/main/agent-hooks/branch-rename-failure-output.test.ts": 60,
-      "src/main/agent-hooks/ended-process-reconciliation.test.ts": 512,
-      "src/main/agent-hooks/first-work-branch-rename.test.ts": 212,
-      "src/main/agent-hooks/first-work-folder-rename.test.ts": 95,
-      "src/main/agent-hooks/grok-replay-guard.test.ts": 111,
-      "src/main/agent-hooks/hook-script-outside-orca.test.ts": 151,
-      "src/main/agent-hooks/hook-status-session-tabs-republish.test.ts": 613,
-      "src/main/agent-hooks/install-telemetry.test.ts": 49,
-      "src/main/agent-hooks/installer-utils-remote.test.ts": 79,
-      "src/main/agent-hooks/installer-utils.test.ts": 276,
-      "src/main/agent-hooks/local-agent-cli-presence.test.ts": 46,
-      "src/main/agent-hooks/managed-agent-hook-controls.test.ts": 270,
-      "src/main/agent-hooks/managed-hook-command-contract.test.ts": 298,
-      "src/main/agent-hooks/managed-hook-detection-commands.test.ts": 52,
-      "src/main/agent-hooks/managed-hook-install-lock.test.ts": 387,
-      "src/main/agent-hooks/managed-hook-local-filesystem.test.ts": 495,
-      "src/main/agent-hooks/managed-hook-owner-identity.test.ts": 120,
-      "src/main/agent-hooks/managed-hook-runtime.test.ts": 377,
-      "src/main/agent-hooks/managed-hook-script-refresh-main-thread.test.ts": 307,
-      "src/main/agent-hooks/managed-hook-script-refresh.test.ts": 340,
-      "src/main/agent-hooks/managed-hook-stdin-lifecycle.test.ts": 2594,
-      "src/main/agent-hooks/managed-hook-timeout.test.ts": 1752,
-      "src/main/agent-hooks/managed-toml-ownership.test.ts": 57,
-      "src/main/agent-hooks/manual-compact-hook-stream.test.ts": 609,
-      "src/main/agent-hooks/manual-compact-status-cleanup.test.ts": 521,
-      "src/main/agent-hooks/migration-unsupported-pty-state.test.ts": 48,
-      "src/main/agent-hooks/opencode-message-part-flood-bench.test.ts": 1438,
-      "src/main/agent-hooks/posix-hook-json-stdin-reader.test.ts": 3511,
-      "src/main/agent-hooks/remote-hook-service-installers.test.ts": 446,
-      "src/main/agent-hooks/remote-hook-service-registry-coverage.test.ts": 301,
-      "src/main/agent-hooks/restored-subagent-liveness-sweep.test.ts": 874,
-      "src/main/agent-hooks/server-ai-vault-liveness.test.ts": 631,
-      "src/main/agent-hooks/server-amp-normalization.test.ts": 518,
-      "src/main/agent-hooks/server-authority-evidence.test.ts": 506,
-      "src/main/agent-hooks/server-claude-cancel-captures.test.ts": 822,
-      "src/main/agent-hooks/server-claude-child-permission-lifecycle.test.ts": 730,
-      "src/main/agent-hooks/server-claude-normalization.test.ts": 622,
-      "src/main/agent-hooks/server-claude-permission-visibility.test.ts": 674,
-      "src/main/agent-hooks/server-claude-statusline.test.ts": 627,
-      "src/main/agent-hooks/server-closed-tab-suppression.test.ts": 1893,
-      "src/main/agent-hooks/server-codex-normalization.test.ts": 599,
-      "src/main/agent-hooks/server-codex-subagent-transcript.test.ts": 4774,
-      "src/main/agent-hooks/server-copilot-normalization.test.ts": 941,
-      "src/main/agent-hooks/server-cursor-normalization.test.ts": 584,
-      "src/main/agent-hooks/server-droid-normalization.test.ts": 561,
-      "src/main/agent-hooks/server-endpoint-file-lifecycle.test.ts": 816,
-      "src/main/agent-hooks/server-escape-navigation-inference.test.ts": 722,
-      "src/main/agent-hooks/server-gemini-normalization.test.ts": 399,
-      "src/main/agent-hooks/server-grok-background-status.test.ts": 674,
-      "src/main/agent-hooks/server-grok-cancel.test.ts": 693,
-      "src/main/agent-hooks/server-grok-discovery.test.ts": 1063,
-      "src/main/agent-hooks/server-hook-http-ingest.test.ts": 792,
-      "src/main/agent-hooks/server-ingest-remote.test.ts": 653,
-      "src/main/agent-hooks/server-ingest-structured-children.test.ts": 585,
-      "src/main/agent-hooks/server-ingest-structured-state-clock.test.ts": 401,
-      "src/main/agent-hooks/server-ingest-structured-status.test.ts": 605,
-      "src/main/agent-hooks/server-ingest-terminal-status.test.ts": 579,
-      "src/main/agent-hooks/server-interrupt-inference-guards.test.ts": 591,
-      "src/main/agent-hooks/server-interrupt-inference-resurrection.test.ts": 550,
-      "src/main/agent-hooks/server-interrupt-inference-validation.test.ts": 390,
-      "src/main/agent-hooks/server-last-status-child-held-main-agent.test.ts": 759,
-      "src/main/agent-hooks/server-last-status-hydrate-confirmation.test.ts": 735,
-      "src/main/agent-hooks/server-last-status-hydrate-validation.test.ts": 738,
-      "src/main/agent-hooks/server-last-status-lead-boundary.test.ts": 601,
-      "src/main/agent-hooks/server-last-status-main-agent-fact.test.ts": 758,
-      "src/main/agent-hooks/server-last-status-restored-children.test.ts": 790,
-      "src/main/agent-hooks/server-last-status-write.test.ts": 404,
-      "src/main/agent-hooks/server-main-agent-turn-verdicts.test.ts": 721,
-      "src/main/agent-hooks/server-muse-session-log-poll.test.ts": 2675,
-      "src/main/agent-hooks/server-observation-provenance.test.ts": 462,
-      "src/main/agent-hooks/server-omp-retired-ingress.test.ts": 531,
-      "src/main/agent-hooks/server-omp-retirement-ack.test.ts": 449,
-      "src/main/agent-hooks/server-opencode-binder.test.ts": 659,
-      "src/main/agent-hooks/server-opencode-lifecycle.test.ts": 759,
-      "src/main/agent-hooks/server-opencode-normalization.test.ts": 458,
-      "src/main/agent-hooks/server-pane-authority.test.ts": 813,
-      "src/main/agent-hooks/server-pi-normalization.test.ts": 576,
-      "src/main/agent-hooks/server-prompt-sent-telemetry.test.ts": 697,
-      "src/main/agent-hooks/server-relay-listener-replay.test.ts": 587,
-      "src/main/agent-hooks/server-relayed-claude-cancel.test.ts": 710,
-      "src/main/agent-hooks/server-reminted-pane-key.test.ts": 503,
-      "src/main/agent-hooks/server-replay-evidence-clock.test.ts": 595,
-      "src/main/agent-hooks/server-retired-pane-new-turn.test.ts": 403,
-      "src/main/agent-hooks/server-start-failure-lifecycle.test.ts": 694,
-      "src/main/agent-hooks/server-status-listener-fanout.test.ts": 702,
-      "src/main/agent-hooks/server-structured-canonical-status.test.ts": 493,
-      "src/main/agent-hooks/server-transport-interference.test.ts": 6380,
-      "src/main/agent-hooks/server.claude-interactive-question.test.ts": 556,
-      "src/main/agent-hooks/spool.test.ts": 823,
-      "src/main/agent-hooks/terminal-handle-row-identity.test.ts": 655,
-      "src/main/agent-hooks/windows-direct-cmd-hook-command.test.ts": 83,
-      "src/main/agent-hooks/windows-hook-payload-delivery.test.ts": 178,
-      "src/main/agent-hooks/windows-hook-post-interpreter.test.ts": 308,
-      "src/main/agent-hooks/windows-powershell-hook-launcher.test.ts": 38,
-      "src/main/agent-hooks/wsl-guest-plugin-install.test.ts": 70,
-      "src/main/agent-hooks/wsl-hook-relay-launch.test.ts": 89,
-      "src/main/agent-hooks/wsl-hook-relay-live.integration.test.ts": 5305,
-      "src/main/agent-hooks/wsl-hook-relay-manager.test.ts": 2451,
-      "src/main/agent-hooks/wsl-hook-relay-reattach.test.ts": 834,
-      "src/main/agent-hooks/wsl-hook-relay-recovery.test.ts": 2368,
-      "src/main/agent-hooks/wsl-hook-relay-sentinel.test.ts": 57,
-      "src/main/agent-launch/agent-launch-executor.test.ts": 271,
-      "src/main/agent-state-file-reader.test.ts": 68,
-      "src/main/agent-trust-presets.test.ts": 133,
-      "src/main/ai-vault-search/session-search-child-service.test.ts": 304,
-      "src/main/ai-vault-search/session-search-content-hash.test.ts": 72,
-      "src/main/ai-vault-search/session-search-cwd-key.test.ts": 74,
-      "src/main/ai-vault-search/session-search-deleted-sources.test.ts": 564,
-      "src/main/ai-vault-search/session-search-directory-listings.test.ts": 60,
-      "src/main/ai-vault-search/session-search-engine.test.ts": 1707,
+      "src/cli/args-repeatable-flags.test.ts": 51,
+      "src/cli/args.test.ts": 259,
+      "src/cli/automation-format.test.ts": 48,
+      "src/cli/automation-owner-conflict-recovery.test.ts": 236,
+      "src/cli/base64-payload-byte-count.test.ts": 28,
+      "src/cli/browser-cookie-credentials-empty-value.test.ts": 190,
+      "src/cli/browser-storage-empty-value.test.ts": 97,
+      "src/cli/browser.test.ts": 279,
+      "src/cli/cli-command-name-parity.test.ts": 80,
+      "src/cli/cli-version.test.ts": 60,
+      "src/cli/codex-command-classification.test.ts": 44,
+      "src/cli/command-suggestion-budget.test.ts": 77,
+      "src/cli/command-suggestion.test.ts": 103,
+      "src/cli/computer-format.test.ts": 35,
+      "src/cli/emulator-logcat-format.test.ts": 41,
+      "src/cli/execution-host-flag.test.ts": 83,
+      "src/cli/flags.test.ts": 34,
+      "src/cli/format-recovery.test.ts": 275,
+      "src/cli/format.test.ts": 481,
+      "src/cli/handler-group-manifest.test.ts": 813,
+      "src/cli/handlers/account.test.ts": 957,
+      "src/cli/handlers/agent-hooks-load-boundary.test.ts": 282,
+      "src/cli/handlers/agent-hooks.test.ts": 998,
+      "src/cli/handlers/artifacts.test.ts": 201,
+      "src/cli/handlers/automation-destination-fencing.test.ts": 171,
+      "src/cli/handlers/automation-owner-fencing.test.ts": 306,
+      "src/cli/handlers/computer-action-routing.test.ts": 137,
+      "src/cli/handlers/computer-action-validation.test.ts": 204,
+      "src/cli/handlers/computer-state-formatting.test.ts": 94,
+      "src/cli/handlers/computer.test.ts": 204,
+      "src/cli/handlers/core.test.ts": 182,
+      "src/cli/handlers/emulator.test.ts": 192,
+      "src/cli/handlers/file-absolute-paths.test.ts": 94,
+      "src/cli/handlers/file.test.ts": 398,
+      "src/cli/handlers/interactive-login-interruption.test.ts": 37,
+      "src/cli/handlers/linear.test.ts": 207,
+      "src/cli/handlers/orchestration-caller-identity-cli.test.ts": 283,
+      "src/cli/handlers/orchestration-check-identity.test.ts": 294,
+      "src/cli/handlers/orchestration-federated-legacy-settlement.test.ts": 251,
+      "src/cli/handlers/orchestration-gate-cli.test.ts": 385,
+      "src/cli/handlers/orchestration-legacy-read-only.test.ts": 238,
+      "src/cli/handlers/orchestration-lifecycle-json-rejection.test.ts": 261,
+      "src/cli/handlers/orchestration-lifecycle-rejection.test.ts": 297,
+      "src/cli/handlers/orchestration-migration.test.ts": 312,
+      "src/cli/handlers/orchestration-module-boundaries.test.ts": 358,
+      "src/cli/handlers/orchestration-request-show-cli.test.ts": 293,
+      "src/cli/handlers/orchestration-run-cli.test.ts": 200,
+      "src/cli/handlers/orchestration-send-receipt-warnings.test.ts": 284,
+      "src/cli/handlers/orchestration-task-create-cli.test.ts": 201,
+      "src/cli/handlers/orchestration-task-list-brief.test.ts": 155,
+      "src/cli/handlers/orchestration-timeout-cli.test.ts": 361,
+      "src/cli/handlers/orchestration-timeout.test.ts": 280,
+      "src/cli/handlers/orchestration-windows-ask-cli.test.ts": 160,
+      "src/cli/handlers/orchestration-worker-cli.test.ts": 527,
+      "src/cli/handlers/orchestration-worker-show-wait-cli.test.ts": 214,
+      "src/cli/handlers/orchestration.test.ts": 549,
+      "src/cli/handlers/orchestration/worker-list-run-scope.test.ts": 243,
+      "src/cli/handlers/orchestration/worker-output.test.ts": 56,
+      "src/cli/handlers/profile-state-recovery-admission.test.ts": 1544,
+      "src/cli/handlers/profile-state.test.ts": 783,
+      "src/cli/handlers/search.test.ts": 251,
+      "src/cli/handlers/skill-sharing.test.ts": 232,
+      "src/cli/handlers/terminal.test.ts": 318,
+      "src/cli/host-selector-alternatives.test.ts": 46,
+      "src/cli/index-automation-identifiers.test.ts": 189,
+      "src/cli/index-automation-schedule.test.ts": 151,
+      "src/cli/index-automation-session-reuse.test.ts": 162,
+      "src/cli/index-automation-source-context.test.ts": 103,
+      "src/cli/index-automation-target.test.ts": 197,
+      "src/cli/index-device-commands.test.ts": 170,
+      "src/cli/index-environment-commands.test.ts": 139,
+      "src/cli/index-local-command-routing-flags.test.ts": 430,
+      "src/cli/index-memory-diagnostics.test.ts": 160,
+      "src/cli/index-omitted-host-scope-selectors.test.ts": 230,
+      "src/cli/index-orchestration.test.ts": 201,
+      "src/cli/index-project-setup.test.ts": 143,
+      "src/cli/index-serve-command.test.ts": 193,
+      "src/cli/index-terminal-commands.test.ts": 344,
+      "src/cli/index-terminal-list-host-scope.test.ts": 161,
+      "src/cli/index-vm-recipe-doctor.test.ts": 408,
+      "src/cli/index-worktree-create-agent.test.ts": 143,
+      "src/cli/index-worktree-create-linear.test.ts": 94,
+      "src/cli/index-worktree-create-parent.test.ts": 386,
+      "src/cli/index-worktree-create-target.test.ts": 98,
+      "src/cli/index-worktree-selector-resolution.test.ts": 352,
+      "src/cli/index-worktree-set.test.ts": 184,
+      "src/cli/index.test.ts": 981,
+      "src/cli/linear-format.test.ts": 47,
+      "src/cli/orchestration-dispatch-refusal-format.test.ts": 75,
+      "src/cli/orchestration-mutation-recovery.test.ts": 212,
+      "src/cli/orchestration-structured-sender-identity.test.ts": 137,
+      "src/cli/orchestration-structured-session-no-identity.test.ts": 389,
+      "src/cli/quote-stripped-json-flag.test.ts": 29,
+      "src/cli/registry-parity.test.ts": 78,
+      "src/cli/retry-request-flag.test.ts": 367,
+      "src/cli/runtime-client-deferral.test.ts": 715,
+      "src/cli/runtime-client.test.ts": 424,
+      "src/cli/runtime/client-recovery.test.ts": 463,
+      "src/cli/runtime/client-timeout-policy.test.ts": 250,
+      "src/cli/runtime/envelope-schema.test.ts": 87,
+      "src/cli/runtime/environments.test.ts": 217,
+      "src/cli/runtime/launch.test.ts": 181,
+      "src/cli/runtime/orchestration-recovery-command.test.ts": 60,
+      "src/cli/runtime/profile-state-recovery-launch.test.ts": 185,
+      "src/cli/runtime/runtime-access-denied.test.ts": 122,
+      "src/cli/runtime/serve-signal-exit-diagnostic.test.ts": 66,
+      "src/cli/runtime/status.test.ts": 233,
+      "src/cli/runtime/transport-framing.test.ts": 222,
+      "src/cli/runtime/transport.test.ts": 656,
+      "src/cli/runtime/types.test.ts": 38,
+      "src/cli/runtime/websocket-transport-error.test.ts": 243,
+      "src/cli/runtime/websocket-transport.test.ts": 355,
+      "src/cli/search-command-arguments.test.ts": 275,
+      "src/cli/serve-electron-flag-parity.test.ts": 58,
+      "src/cli/shell-command-quote.test.ts": 38,
+      "src/cli/skill-guide-cli-parity.test.ts": 106,
+      "src/cli/skills-reference-selector.test.ts": 194,
+      "src/cli/skills.test.ts": 1332,
+      "src/cli/specs/account.test.ts": 50,
+      "src/cli/specs/bundled-guide-flags.test.ts": 262,
+      "src/cli/specs/computer.test.ts": 44,
+      "src/cli/specs/orchestration.test.ts": 33,
+      "src/cli/specs/profile-state.test.ts": 43,
+      "src/cli/specs/search.test.ts": 121,
+      "src/cli/specs/skills.test.ts": 50,
+      "src/cli/terminal-format-draft.test.ts": 50,
+      "src/cli/terminal-format.test.ts": 44,
+      "src/cli/terminal-list-host-scope-format.test.ts": 71,
+      "src/cli/terminal-read-screen.test.ts": 126,
+      "src/cli/vocabulary-policy.test.ts": 67,
+      "src/cli/worktree-selector-wsl-posix-path.test.ts": 49,
+      "src/main/active-view-persistence-boundary.test.ts": 783,
+      "src/main/active-view-preference-sync-flush-veto.test.ts": 788,
+      "src/main/active-view-preference.test.ts": 64,
+      "src/main/agent-auth-restart-preservation.test.ts": 71,
+      "src/main/agent-awake-service-platform-assertions.test.ts": 99,
+      "src/main/agent-awake-service.test.ts": 106,
+      "src/main/agent-hooks/branch-rename-failure-output.test.ts": 26,
+      "src/main/agent-hooks/ended-process-reconciliation.test.ts": 510,
+      "src/main/agent-hooks/first-work-branch-rename.test.ts": 365,
+      "src/main/agent-hooks/first-work-folder-rename.test.ts": 87,
+      "src/main/agent-hooks/grok-replay-guard.test.ts": 101,
+      "src/main/agent-hooks/hook-script-outside-orca.test.ts": 210,
+      "src/main/agent-hooks/hook-status-session-tabs-republish.test.ts": 578,
+      "src/main/agent-hooks/install-telemetry.test.ts": 58,
+      "src/main/agent-hooks/installer-utils-remote.test.ts": 66,
+      "src/main/agent-hooks/installer-utils.test.ts": 180,
+      "src/main/agent-hooks/local-agent-cli-presence.test.ts": 76,
+      "src/main/agent-hooks/managed-agent-hook-controls.test.ts": 261,
+      "src/main/agent-hooks/managed-hook-command-contract.test.ts": 309,
+      "src/main/agent-hooks/managed-hook-detection-commands.test.ts": 64,
+      "src/main/agent-hooks/managed-hook-install-lock.test.ts": 388,
+      "src/main/agent-hooks/managed-hook-local-filesystem.test.ts": 327,
+      "src/main/agent-hooks/managed-hook-owner-identity.test.ts": 84,
+      "src/main/agent-hooks/managed-hook-runtime.test.ts": 409,
+      "src/main/agent-hooks/managed-hook-script-refresh-main-thread.test.ts": 330,
+      "src/main/agent-hooks/managed-hook-script-refresh.test.ts": 471,
+      "src/main/agent-hooks/managed-hook-stdin-lifecycle.test.ts": 2177,
+      "src/main/agent-hooks/managed-hook-timeout.test.ts": 1803,
+      "src/main/agent-hooks/managed-toml-ownership.test.ts": 50,
+      "src/main/agent-hooks/manual-compact-hook-stream.test.ts": 582,
+      "src/main/agent-hooks/manual-compact-status-cleanup.test.ts": 553,
+      "src/main/agent-hooks/migration-unsupported-pty-state.test.ts": 31,
+      "src/main/agent-hooks/opencode-message-part-flood-bench.test.ts": 1229,
+      "src/main/agent-hooks/posix-hook-json-stdin-reader.test.ts": 3494,
+      "src/main/agent-hooks/remote-hook-service-installers.test.ts": 367,
+      "src/main/agent-hooks/remote-hook-service-registry-coverage.test.ts": 238,
+      "src/main/agent-hooks/restored-subagent-liveness-sweep.test.ts": 930,
+      "src/main/agent-hooks/server-ai-vault-liveness.test.ts": 606,
+      "src/main/agent-hooks/server-amp-normalization.test.ts": 570,
+      "src/main/agent-hooks/server-authority-evidence.test.ts": 639,
+      "src/main/agent-hooks/server-claude-cancel-captures.test.ts": 856,
+      "src/main/agent-hooks/server-claude-child-permission-lifecycle.test.ts": 508,
+      "src/main/agent-hooks/server-claude-normalization.test.ts": 497,
+      "src/main/agent-hooks/server-claude-permission-visibility.test.ts": 836,
+      "src/main/agent-hooks/server-claude-statusline.test.ts": 592,
+      "src/main/agent-hooks/server-closed-tab-suppression.test.ts": 614,
+      "src/main/agent-hooks/server-codex-normalization.test.ts": 575,
+      "src/main/agent-hooks/server-codex-subagent-transcript.test.ts": 4597,
+      "src/main/agent-hooks/server-copilot-normalization.test.ts": 1055,
+      "src/main/agent-hooks/server-cursor-normalization.test.ts": 550,
+      "src/main/agent-hooks/server-droid-normalization.test.ts": 592,
+      "src/main/agent-hooks/server-endpoint-file-lifecycle.test.ts": 568,
+      "src/main/agent-hooks/server-escape-navigation-inference.test.ts": 739,
+      "src/main/agent-hooks/server-gemini-normalization.test.ts": 565,
+      "src/main/agent-hooks/server-grok-background-status.test.ts": 760,
+      "src/main/agent-hooks/server-grok-cancel.test.ts": 610,
+      "src/main/agent-hooks/server-grok-discovery.test.ts": 1077,
+      "src/main/agent-hooks/server-hook-http-ingest.test.ts": 388,
+      "src/main/agent-hooks/server-ingest-remote.test.ts": 449,
+      "src/main/agent-hooks/server-ingest-structured-children.test.ts": 590,
+      "src/main/agent-hooks/server-ingest-structured-state-clock.test.ts": 630,
+      "src/main/agent-hooks/server-ingest-structured-status.test.ts": 585,
+      "src/main/agent-hooks/server-ingest-terminal-status.test.ts": 382,
+      "src/main/agent-hooks/server-interrupt-inference-guards.test.ts": 693,
+      "src/main/agent-hooks/server-interrupt-inference-resurrection.test.ts": 646,
+      "src/main/agent-hooks/server-interrupt-inference-validation.test.ts": 419,
+      "src/main/agent-hooks/server-last-status-child-held-main-agent.test.ts": 713,
+      "src/main/agent-hooks/server-last-status-hydrate-confirmation.test.ts": 389,
+      "src/main/agent-hooks/server-last-status-hydrate-validation.test.ts": 488,
+      "src/main/agent-hooks/server-last-status-lead-boundary.test.ts": 647,
+      "src/main/agent-hooks/server-last-status-main-agent-fact.test.ts": 584,
+      "src/main/agent-hooks/server-last-status-restored-children.test.ts": 766,
+      "src/main/agent-hooks/server-last-status-write.test.ts": 699,
+      "src/main/agent-hooks/server-main-agent-turn-verdicts.test.ts": 702,
+      "src/main/agent-hooks/server-muse-session-log-poll.test.ts": 2487,
+      "src/main/agent-hooks/server-observation-provenance.test.ts": 625,
+      "src/main/agent-hooks/server-omp-retired-ingress.test.ts": 610,
+      "src/main/agent-hooks/server-omp-retirement-ack.test.ts": 557,
+      "src/main/agent-hooks/server-opencode-binder.test.ts": 652,
+      "src/main/agent-hooks/server-opencode-lifecycle.test.ts": 765,
+      "src/main/agent-hooks/server-opencode-normalization.test.ts": 380,
+      "src/main/agent-hooks/server-pane-authority.test.ts": 655,
+      "src/main/agent-hooks/server-pi-normalization.test.ts": 557,
+      "src/main/agent-hooks/server-prompt-sent-telemetry.test.ts": 643,
+      "src/main/agent-hooks/server-relay-listener-replay.test.ts": 551,
+      "src/main/agent-hooks/server-relayed-claude-cancel.test.ts": 678,
+      "src/main/agent-hooks/server-reminted-pane-key.test.ts": 672,
+      "src/main/agent-hooks/server-replay-evidence-clock.test.ts": 552,
+      "src/main/agent-hooks/server-retired-pane-new-turn.test.ts": 383,
+      "src/main/agent-hooks/server-start-failure-lifecycle.test.ts": 597,
+      "src/main/agent-hooks/server-status-listener-fanout.test.ts": 739,
+      "src/main/agent-hooks/server-structured-canonical-status.test.ts": 408,
+      "src/main/agent-hooks/server-transport-interference.test.ts": 6270,
+      "src/main/agent-hooks/server.claude-interactive-question.test.ts": 396,
+      "src/main/agent-hooks/spool.test.ts": 891,
+      "src/main/agent-hooks/terminal-handle-row-identity.test.ts": 367,
+      "src/main/agent-hooks/windows-direct-cmd-hook-command.test.ts": 69,
+      "src/main/agent-hooks/windows-hook-payload-delivery.test.ts": 151,
+      "src/main/agent-hooks/windows-hook-post-interpreter.test.ts": 330,
+      "src/main/agent-hooks/windows-powershell-hook-launcher.test.ts": 49,
+      "src/main/agent-hooks/wsl-guest-plugin-install.test.ts": 68,
+      "src/main/agent-hooks/wsl-hook-relay-launch.test.ts": 90,
+      "src/main/agent-hooks/wsl-hook-relay-live.integration.test.ts": 4381,
+      "src/main/agent-hooks/wsl-hook-relay-manager.test.ts": 1974,
+      "src/main/agent-hooks/wsl-hook-relay-reattach.test.ts": 713,
+      "src/main/agent-hooks/wsl-hook-relay-recovery.test.ts": 2365,
+      "src/main/agent-hooks/wsl-hook-relay-sentinel.test.ts": 37,
+      "src/main/agent-launch/agent-launch-executor.test.ts": 330,
+      "src/main/agent-state-file-reader.test.ts": 97,
+      "src/main/agent-trust-presets.test.ts": 137,
+      "src/main/ai-vault-search/session-search-child-service.test.ts": 338,
+      "src/main/ai-vault-search/session-search-content-hash.test.ts": 71,
+      "src/main/ai-vault-search/session-search-cwd-key.test.ts": 78,
+      "src/main/ai-vault-search/session-search-deleted-sources.test.ts": 377,
+      "src/main/ai-vault-search/session-search-directory-listings.test.ts": 50,
+      "src/main/ai-vault-search/session-search-engine.test.ts": 3299,
       "src/main/ai-vault-search/session-search-file-id.test.ts": 211,
-      "src/main/ai-vault-search/session-search-file-write.test.ts": 574,
-      "src/main/ai-vault-search/session-search-fts5-contract.test.ts": 142,
-      "src/main/ai-vault-search/session-search-hit-ranking.test.ts": 83,
-      "src/main/ai-vault-search/session-search-host-registration.test.ts": 920,
-      "src/main/ai-vault-search/session-search-identifier-split.test.ts": 47,
-      "src/main/ai-vault-search/session-search-index-consumer.test.ts": 263,
-      "src/main/ai-vault-search/session-search-index-generation.test.ts": 552,
-      "src/main/ai-vault-search/session-search-index-pass.test.ts": 413,
-      "src/main/ai-vault-search/session-search-index-writer.test.ts": 456,
-      "src/main/ai-vault-search/session-search-indexer.test.ts": 4898,
-      "src/main/ai-vault-search/session-search-instance.test.ts": 741,
-      "src/main/ai-vault-search/session-search-lifecycle-matrix.test.ts": 4092,
-      "src/main/ai-vault-search/session-search-live-transcript.test.ts": 268,
-      "src/main/ai-vault-search/session-search-merged-roots.test.ts": 500,
-      "src/main/ai-vault-search/session-search-message-rows.test.ts": 211,
-      "src/main/ai-vault-search/session-search-native-chat-indexing.test.ts": 322,
-      "src/main/ai-vault-search/session-search-opencode-index.test.ts": 884,
-      "src/main/ai-vault-search/session-search-orphan-rows.test.ts": 375,
-      "src/main/ai-vault-search/session-search-paging.test.ts": 706,
-      "src/main/ai-vault-search/session-search-query-planner.test.ts": 60,
-      "src/main/ai-vault-search/session-search-read-decision.test.ts": 34,
-      "src/main/ai-vault-search/session-search-retention-delete.test.ts": 541,
-      "src/main/ai-vault-search/session-search-retention-policy.test.ts": 123,
-      "src/main/ai-vault-search/session-search-root-refresh.test.ts": 746,
-      "src/main/ai-vault-search/session-search-row-filter.test.ts": 246,
-      "src/main/ai-vault-search/session-search-row-identity.test.ts": 114,
-      "src/main/ai-vault-search/session-search-scan-roots.test.ts": 150,
-      "src/main/ai-vault-search/session-search-schema.test.ts": 399,
-      "src/main/ai-vault-search/session-search-scope-entry-points.test.ts": 3777,
-      "src/main/ai-vault-search/session-search-scope-resolution.test.ts": 98,
-      "src/main/ai-vault-search/session-search-scope-service.test.ts": 154,
-      "src/main/ai-vault-search/session-search-service-registry.test.ts": 178,
-      "src/main/ai-vault-search/session-search-service.test.ts": 289,
-      "src/main/ai-vault-search/session-search-sidebar-parity.test.ts": 373,
-      "src/main/ai-vault-search/session-search-snippet-marks.test.ts": 311,
-      "src/main/ai-vault-search/session-search-store-is-memory.test.ts": 615,
-      "src/main/ai-vault-search/session-search-store-scope-catalog.test.ts": 54,
-      "src/main/ai-vault-search/session-search-synthetic-corpus.test.ts": 290,
-      "src/main/ai-vault-search/session-search-typo-policy.test.ts": 495,
-      "src/main/ai-vault-search/session-search-typo-scope.test.ts": 200,
-      "src/main/ai-vault-search/session-search-write-lifetime.test.ts": 181,
-      "src/main/ai-vault/ai-vault-scan-cancellation.test.ts": 28,
-      "src/main/ai-vault/ai-vault-scan-coordinator.test.ts": 64,
-      "src/main/ai-vault/cached-session-list-wsl-probe.test.ts": 208,
-      "src/main/ai-vault/cached-session-list.test.ts": 242,
-      "src/main/ai-vault/claude-project-dir-encoding.test.ts": 65,
-      "src/main/ai-vault/codex-session-collection.test.ts": 108,
-      "src/main/ai-vault/codex-session-root-dedup.test.ts": 128,
-      "src/main/ai-vault/local-log-tail-reader.test.ts": 74,
-      "src/main/ai-vault/omp-session-root.test.ts": 154,
+      "src/main/ai-vault-search/session-search-file-write.test.ts": 622,
+      "src/main/ai-vault-search/session-search-fts5-contract.test.ts": 144,
+      "src/main/ai-vault-search/session-search-hit-ranking.test.ts": 90,
+      "src/main/ai-vault-search/session-search-host-registration.test.ts": 993,
+      "src/main/ai-vault-search/session-search-identifier-split.test.ts": 39,
+      "src/main/ai-vault-search/session-search-index-consumer.test.ts": 255,
+      "src/main/ai-vault-search/session-search-index-generation.test.ts": 579,
+      "src/main/ai-vault-search/session-search-index-pass.test.ts": 419,
+      "src/main/ai-vault-search/session-search-index-writer.test.ts": 480,
+      "src/main/ai-vault-search/session-search-indexer.test.ts": 4288,
+      "src/main/ai-vault-search/session-search-instance.test.ts": 869,
+      "src/main/ai-vault-search/session-search-lifecycle-matrix.test.ts": 3013,
+      "src/main/ai-vault-search/session-search-live-transcript.test.ts": 289,
+      "src/main/ai-vault-search/session-search-merged-roots.test.ts": 409,
+      "src/main/ai-vault-search/session-search-message-rows.test.ts": 420,
+      "src/main/ai-vault-search/session-search-native-chat-indexing.test.ts": 332,
+      "src/main/ai-vault-search/session-search-opencode-index.test.ts": 955,
+      "src/main/ai-vault-search/session-search-orphan-rows.test.ts": 302,
+      "src/main/ai-vault-search/session-search-paging.test.ts": 540,
+      "src/main/ai-vault-search/session-search-query-planner.test.ts": 29,
+      "src/main/ai-vault-search/session-search-read-decision.test.ts": 55,
+      "src/main/ai-vault-search/session-search-retention-delete.test.ts": 171,
+      "src/main/ai-vault-search/session-search-retention-policy.test.ts": 76,
+      "src/main/ai-vault-search/session-search-root-refresh.test.ts": 503,
+      "src/main/ai-vault-search/session-search-row-filter.test.ts": 190,
+      "src/main/ai-vault-search/session-search-row-identity.test.ts": 105,
+      "src/main/ai-vault-search/session-search-scan-roots.test.ts": 195,
+      "src/main/ai-vault-search/session-search-schema.test.ts": 458,
+      "src/main/ai-vault-search/session-search-scope-entry-points.test.ts": 3912,
+      "src/main/ai-vault-search/session-search-scope-resolution.test.ts": 121,
+      "src/main/ai-vault-search/session-search-scope-service.test.ts": 179,
+      "src/main/ai-vault-search/session-search-service-registry.test.ts": 217,
+      "src/main/ai-vault-search/session-search-service.test.ts": 197,
+      "src/main/ai-vault-search/session-search-sidebar-parity.test.ts": 288,
+      "src/main/ai-vault-search/session-search-snippet-marks.test.ts": 213,
+      "src/main/ai-vault-search/session-search-store-is-memory.test.ts": 604,
+      "src/main/ai-vault-search/session-search-store-scope-catalog.test.ts": 40,
+      "src/main/ai-vault-search/session-search-synthetic-corpus.test.ts": 252,
+      "src/main/ai-vault-search/session-search-typo-policy.test.ts": 148,
+      "src/main/ai-vault-search/session-search-typo-scope.test.ts": 162,
+      "src/main/ai-vault-search/session-search-write-lifetime.test.ts": 246,
+      "src/main/ai-vault/ai-vault-scan-cancellation.test.ts": 49,
+      "src/main/ai-vault/ai-vault-scan-coordinator.test.ts": 81,
+      "src/main/ai-vault/cached-session-list-wsl-probe.test.ts": 209,
+      "src/main/ai-vault/cached-session-list.test.ts": 447,
+      "src/main/ai-vault/claude-project-dir-encoding.test.ts": 28,
+      "src/main/ai-vault/codex-session-collection.test.ts": 127,
+      "src/main/ai-vault/codex-session-root-dedup.test.ts": 116,
+      "src/main/ai-vault/local-log-tail-reader.test.ts": 35,
+      "src/main/ai-vault/omp-session-root.test.ts": 159,
+      "src/main/ai-vault/opencode-wsl-runtime-preparation.test.ts": 917,
       "src/main/ai-vault/remote-session-content-lines.test.ts": 74,
-      "src/main/ai-vault/remote-session-large-transcripts.test.ts": 2055,
-      "src/main/ai-vault/remote-session-parse-cache.test.ts": 304,
-      "src/main/ai-vault/remote-session-scan-batching.test.ts": 52,
-      "src/main/ai-vault/remote-session-scanner-muse.test.ts": 174,
-      "src/main/ai-vault/remote-session-scanner-omp-subagents.test.ts": 169,
-      "src/main/ai-vault/remote-session-scanner-sources.test.ts": 152,
-      "src/main/ai-vault/remote-session-scanner.test.ts": 332,
-      "src/main/ai-vault/remote-session-sidecar-observation.test.ts": 187,
-      "src/main/ai-vault/remote-session-stream-lifecycle.test.ts": 86,
-      "src/main/ai-vault/runtime-session-scanner.test.ts": 149,
-      "src/main/ai-vault/runtime-session-search-call.test.ts": 67,
-      "src/main/ai-vault/session-cwd-bucket-layouts.test.ts": 30,
-      "src/main/ai-vault/session-delete-target.test.ts": 162,
-      "src/main/ai-vault/session-delete.test.ts": 167,
-      "src/main/ai-vault/session-document-stream-boundaries.test.ts": 119,
-      "src/main/ai-vault/session-document-stream-parity.test.ts": 130,
-      "src/main/ai-vault/session-document-stream-projection.test.ts": 105,
-      "src/main/ai-vault/session-first-user-prompt-read.test.ts": 170,
-      "src/main/ai-vault/session-list-result-validation.test.ts": 127,
-      "src/main/ai-vault/session-list-results.test.ts": 104,
-      "src/main/ai-vault/session-newest-files.test.ts": 260,
-      "src/main/ai-vault/session-parse-cache-devin-upgrade.test.ts": 176,
-      "src/main/ai-vault/session-parse-cache-persistence.test.ts": 316,
-      "src/main/ai-vault/session-scan-cutoff.test.ts": 106,
-      "src/main/ai-vault/session-scanner-agent-root-overrides.test.ts": 976,
-      "src/main/ai-vault/session-scanner-antigravity-parser.test.ts": 102,
-      "src/main/ai-vault/session-scanner-antigravity-source.test.ts": 281,
-      "src/main/ai-vault/session-scanner-background.test.ts": 309,
-      "src/main/ai-vault/session-scanner-claude-cwd-drift.test.ts": 252,
-      "src/main/ai-vault/session-scanner-claude-subagent-prune.test.ts": 232,
-      "src/main/ai-vault/session-scanner-claude-subagents.test.ts": 161,
-      "src/main/ai-vault/session-scanner-claude-title.test.ts": 244,
-      "src/main/ai-vault/session-scanner-claude-unicode-scope.test.ts": 278,
-      "src/main/ai-vault/session-scanner-cline-parser.test.ts": 251,
-      "src/main/ai-vault/session-scanner-codex-dual-root.test.ts": 258,
-      "src/main/ai-vault/session-scanner-codex-fast-path.test.ts": 359,
-      "src/main/ai-vault/session-scanner-codex-non-user-origin.test.ts": 45,
-      "src/main/ai-vault/session-scanner-codex-parser.test.ts": 128,
-      "src/main/ai-vault/session-scanner-codex-title-index.test.ts": 292,
-      "src/main/ai-vault/session-scanner-codex-tool-records.test.ts": 81,
-      "src/main/ai-vault/session-scanner-codex-workers.test.ts": 312,
-      "src/main/ai-vault/session-scanner-core-parser-wsl-stall.test.ts": 175,
-      "src/main/ai-vault/session-scanner-cursor-chat-meta.test.ts": 622,
-      "src/main/ai-vault/session-scanner-cutoff.test.ts": 444,
-      "src/main/ai-vault/session-scanner-dedup-batches.test.ts": 446,
-      "src/main/ai-vault/session-scanner-devin-contention.test.ts": 260,
-      "src/main/ai-vault/session-scanner-devin-db.test.ts": 337,
-      "src/main/ai-vault/session-scanner-devin-dedup.test.ts": 292,
-      "src/main/ai-vault/session-scanner-devin-parser.test.ts": 111,
-      "src/main/ai-vault/session-scanner-directory-reader.test.ts": 82,
-      "src/main/ai-vault/session-scanner-discovery-wsl-gate.test.ts": 100,
-      "src/main/ai-vault/session-scanner-first-user-prompt.test.ts": 64,
-      "src/main/ai-vault/session-scanner-fs-import-guard.test.ts": 50,
-      "src/main/ai-vault/session-scanner-graph-parsers.test.ts": 95,
-      "src/main/ai-vault/session-scanner-grok-parser.test.ts": 88,
-      "src/main/ai-vault/session-scanner-grok-user-text.test.ts": 41,
-      "src/main/ai-vault/session-scanner-index-cache-wsl-stall.test.ts": 95,
-      "src/main/ai-vault/session-scanner-injected-title.test.ts": 243,
-      "src/main/ai-vault/session-scanner-jsonl-reader.test.ts": 332,
-      "src/main/ai-vault/session-scanner-kimi-index-cache.test.ts": 99,
-      "src/main/ai-vault/session-scanner-kimi-parser.test.ts": 136,
-      "src/main/ai-vault/session-scanner-muse.test.ts": 242,
-      "src/main/ai-vault/session-scanner-omp-subagent-listing.test.ts": 143,
-      "src/main/ai-vault/session-scanner-omp-subagent-prune.test.ts": 325,
-      "src/main/ai-vault/session-scanner-omp-subagent-transcripts.test.ts": 119,
-      "src/main/ai-vault/session-scanner-omp-title.test.ts": 119,
-      "src/main/ai-vault/session-scanner-opencode-parser.test.ts": 97,
-      "src/main/ai-vault/session-scanner-opencode-sources-wsl-stall.test.ts": 92,
-      "src/main/ai-vault/session-scanner-opencode-sources.test.ts": 88,
-      "src/main/ai-vault/session-scanner-opencode-sqlite-bounds.test.ts": 634,
-      "src/main/ai-vault/session-scanner-opencode-sqlite-coexistence.test.ts": 375,
-      "src/main/ai-vault/session-scanner-opencode-sqlite-open.test.ts": 3570,
-      "src/main/ai-vault/session-scanner-opencode-sqlite-paths.test.ts": 37,
-      "src/main/ai-vault/session-scanner-opencode-sqlite-worker-client.test.ts": 69,
-      "src/main/ai-vault/session-scanner-opencode-sqlite-worker-spawn.test.ts": 94,
-      "src/main/ai-vault/session-scanner-opencode-sqlite.test.ts": 263,
-      "src/main/ai-vault/session-scanner-opencode2-message.test.ts": 76,
-      "src/main/ai-vault/session-scanner-opencode2-sqlite.test.ts": 199,
-      "src/main/ai-vault/session-scanner-parse-cache-agents.test.ts": 415,
-      "src/main/ai-vault/session-scanner-parse-cache.test.ts": 255,
-      "src/main/ai-vault/session-scanner-parse-wsl-stall.test.ts": 214,
-      "src/main/ai-vault/session-scanner-parser-stream-cleanup.test.ts": 76,
-      "src/main/ai-vault/session-scanner-pi-scope.test.ts": 288,
-      "src/main/ai-vault/session-scanner-preview-window-truncation.test.ts": 84,
-      "src/main/ai-vault/session-scanner-record-budget.test.ts": 321,
-      "src/main/ai-vault/session-scanner-recoverable-empty.test.ts": 371,
-      "src/main/ai-vault/session-scanner-roots.test.ts": 77,
-      "src/main/ai-vault/session-scanner-scope.test.ts": 228,
-      "src/main/ai-vault/session-scanner-service-cancellation.test.ts": 349,
-      "src/main/ai-vault/session-scanner-service-client.test.ts": 524,
-      "src/main/ai-vault/session-scanner-service-entry-path.test.ts": 49,
-      "src/main/ai-vault/session-scanner-service-entry.test.ts": 760,
-      "src/main/ai-vault/session-scanner-service-env.test.ts": 55,
-      "src/main/ai-vault/session-scanner-service-restart-policy.test.ts": 65,
-      "src/main/ai-vault/session-scanner-service-root-request.test.ts": 41,
-      "src/main/ai-vault/session-scanner-service-root-response.test.ts": 204,
-      "src/main/ai-vault/session-scanner-service-search-roots.test.ts": 1251,
-      "src/main/ai-vault/session-scanner-service-search.test.ts": 1129,
-      "src/main/ai-vault/session-scanner-service-spawn.test.ts": 289,
-      "src/main/ai-vault/session-scanner-timeline.test.ts": 95,
-      "src/main/ai-vault/session-scanner-unlimited-dedup.test.ts": 5611,
-      "src/main/ai-vault/session-scanner-values.test.ts": 79,
-      "src/main/ai-vault/session-scanner-worker-client.test.ts": 49,
-      "src/main/ai-vault/session-scanner.test.ts": 455,
-      "src/main/ai-vault/session-sidecar-stat.test.ts": 55,
-      "src/main/ai-vault/session-title-file-reader-wsl-stall.test.ts": 143,
-      "src/main/ai-vault/session-title-file-reader.test.ts": 90,
-      "src/main/ai-vault/session-transcript-consumers.test.ts": 462,
-      "src/main/ai-vault/session-transcript-every-agent-capture.test.ts": 513,
-      "src/main/ai-vault/session-transcript-message-content.test.ts": 59,
-      "src/main/ai-vault/session-transcript-record-budget.test.ts": 41,
-      "src/main/ai-vault/ssh-session-list.test.ts": 248,
-      "src/main/ai-vault/structured-session-ownership.test.ts": 143,
-      "src/main/amp/hook-service.test.ts": 58,
-      "src/main/antigravity/hook-service.test.ts": 131,
-      "src/main/antigravity/windows-hook-payload-delivery.test.ts": 179,
-      "src/main/app-icon.test.ts": 74,
-      "src/main/app-relaunch.test.ts": 54,
-      "src/main/appimage-runtime-identity.test.ts": 108,
-      "src/main/appkit-scene-mutation.test.ts": 54,
-      "src/main/artifacts/artifact-cloud-config.test.ts": 50,
-      "src/main/artifacts/artifact-cloud-recovery.test.ts": 457,
-      "src/main/artifacts/artifact-cloud-service-races.test.ts": 401,
-      "src/main/artifacts/artifact-cloud-service.test.ts": 947,
-      "src/main/artifacts/artifact-create-intent-store.test.ts": 432,
-      "src/main/artifacts/artifact-recovery-directory-fsync.test.ts": 75,
-      "src/main/artifacts/artifact-share-record-store.test.ts": 280,
-      "src/main/asar-transparent-fs.test.ts": 52,
-      "src/main/automations/automation-dispatch-host-fence.test.ts": 4745,
-      "src/main/automations/automation-owner-fencing.test.ts": 2674,
+      "src/main/ai-vault/remote-session-large-transcripts.test.ts": 2163,
+      "src/main/ai-vault/remote-session-parse-cache.test.ts": 229,
+      "src/main/ai-vault/remote-session-scan-batching.test.ts": 32,
+      "src/main/ai-vault/remote-session-scanner-muse.test.ts": 167,
+      "src/main/ai-vault/remote-session-scanner-omp-subagents.test.ts": 172,
+      "src/main/ai-vault/remote-session-scanner-opencode.test.ts": 238,
+      "src/main/ai-vault/remote-session-scanner-sources.test.ts": 118,
+      "src/main/ai-vault/remote-session-scanner.test.ts": 289,
+      "src/main/ai-vault/remote-session-sidecar-observation.test.ts": 134,
+      "src/main/ai-vault/remote-session-stream-lifecycle.test.ts": 74,
+      "src/main/ai-vault/runtime-session-scanner.test.ts": 87,
+      "src/main/ai-vault/runtime-session-search-call.test.ts": 57,
+      "src/main/ai-vault/session-cwd-bucket-layouts.test.ts": 26,
+      "src/main/ai-vault/session-delete-target.test.ts": 112,
+      "src/main/ai-vault/session-delete.test.ts": 215,
+      "src/main/ai-vault/session-document-stream-boundaries.test.ts": 140,
+      "src/main/ai-vault/session-document-stream-parity.test.ts": 115,
+      "src/main/ai-vault/session-document-stream-projection.test.ts": 100,
+      "src/main/ai-vault/session-first-user-prompt-opencode.test.ts": 155,
+      "src/main/ai-vault/session-first-user-prompt-read.test.ts": 110,
+      "src/main/ai-vault/session-list-result-validation.test.ts": 155,
+      "src/main/ai-vault/session-list-results.test.ts": 90,
+      "src/main/ai-vault/session-newest-files.test.ts": 126,
+      "src/main/ai-vault/session-parse-cache-devin-upgrade.test.ts": 214,
+      "src/main/ai-vault/session-parse-cache-persistence.test.ts": 568,
+      "src/main/ai-vault/session-scan-cutoff.test.ts": 68,
+      "src/main/ai-vault/session-scanner-agent-root-overrides.test.ts": 1121,
+      "src/main/ai-vault/session-scanner-antigravity-parser.test.ts": 72,
+      "src/main/ai-vault/session-scanner-antigravity-source.test.ts": 330,
+      "src/main/ai-vault/session-scanner-background.test.ts": 354,
+      "src/main/ai-vault/session-scanner-claude-cwd-drift.test.ts": 245,
+      "src/main/ai-vault/session-scanner-claude-subagent-prune.test.ts": 170,
+      "src/main/ai-vault/session-scanner-claude-subagents.test.ts": 137,
+      "src/main/ai-vault/session-scanner-claude-title.test.ts": 235,
+      "src/main/ai-vault/session-scanner-claude-unicode-scope.test.ts": 176,
+      "src/main/ai-vault/session-scanner-cline-parser.test.ts": 247,
+      "src/main/ai-vault/session-scanner-codex-dual-root.test.ts": 317,
+      "src/main/ai-vault/session-scanner-codex-fast-path.test.ts": 404,
+      "src/main/ai-vault/session-scanner-codex-non-user-origin.test.ts": 41,
+      "src/main/ai-vault/session-scanner-codex-parser.test.ts": 127,
+      "src/main/ai-vault/session-scanner-codex-title-index.test.ts": 213,
+      "src/main/ai-vault/session-scanner-codex-tool-records.test.ts": 75,
+      "src/main/ai-vault/session-scanner-codex-workers.test.ts": 273,
+      "src/main/ai-vault/session-scanner-core-parser-wsl-stall.test.ts": 204,
+      "src/main/ai-vault/session-scanner-cursor-chat-meta.test.ts": 493,
+      "src/main/ai-vault/session-scanner-cutoff.test.ts": 340,
+      "src/main/ai-vault/session-scanner-dedup-batches.test.ts": 320,
+      "src/main/ai-vault/session-scanner-devin-contention.test.ts": 265,
+      "src/main/ai-vault/session-scanner-devin-db.test.ts": 385,
+      "src/main/ai-vault/session-scanner-devin-dedup.test.ts": 305,
+      "src/main/ai-vault/session-scanner-devin-parser.test.ts": 115,
+      "src/main/ai-vault/session-scanner-directory-reader.test.ts": 66,
+      "src/main/ai-vault/session-scanner-discovery-wsl-gate.test.ts": 101,
+      "src/main/ai-vault/session-scanner-first-user-prompt.test.ts": 60,
+      "src/main/ai-vault/session-scanner-fs-import-guard.test.ts": 109,
+      "src/main/ai-vault/session-scanner-graph-parsers.test.ts": 223,
+      "src/main/ai-vault/session-scanner-grok-parser.test.ts": 111,
+      "src/main/ai-vault/session-scanner-grok-user-text.test.ts": 47,
+      "src/main/ai-vault/session-scanner-index-cache-wsl-stall.test.ts": 73,
+      "src/main/ai-vault/session-scanner-injected-title.test.ts": 265,
+      "src/main/ai-vault/session-scanner-jsonl-reader.test.ts": 355,
+      "src/main/ai-vault/session-scanner-kimi-index-cache.test.ts": 103,
+      "src/main/ai-vault/session-scanner-kimi-parser.test.ts": 152,
+      "src/main/ai-vault/session-scanner-muse.test.ts": 250,
+      "src/main/ai-vault/session-scanner-omp-subagent-listing.test.ts": 94,
+      "src/main/ai-vault/session-scanner-omp-subagent-prune.test.ts": 234,
+      "src/main/ai-vault/session-scanner-omp-subagent-transcripts.test.ts": 91,
+      "src/main/ai-vault/session-scanner-omp-title.test.ts": 105,
+      "src/main/ai-vault/session-scanner-opencode-cancellation.test.ts": 393,
+      "src/main/ai-vault/session-scanner-opencode-parser.test.ts": 112,
+      "src/main/ai-vault/session-scanner-opencode-process-admission.test.ts": 264,
+      "src/main/ai-vault/session-scanner-opencode-sources-wsl-stall.test.ts": 103,
+      "src/main/ai-vault/session-scanner-opencode-sources.test.ts": 65,
+      "src/main/ai-vault/session-scanner-opencode-sqlite-bounds.test.ts": 656,
+      "src/main/ai-vault/session-scanner-opencode-sqlite-coexistence.test.ts": 373,
+      "src/main/ai-vault/session-scanner-opencode-sqlite-open.test.ts": 3466,
+      "src/main/ai-vault/session-scanner-opencode-sqlite-paths.test.ts": 35,
+      "src/main/ai-vault/session-scanner-opencode-sqlite-process.test.ts": 3607,
+      "src/main/ai-vault/session-scanner-opencode-sqlite-worker-client.test.ts": 87,
+      "src/main/ai-vault/session-scanner-opencode-sqlite-worker-spawn.test.ts": 103,
+      "src/main/ai-vault/session-scanner-opencode-sqlite.test.ts": 207,
+      "src/main/ai-vault/session-scanner-opencode-wsl-client.test.ts": 80,
+      "src/main/ai-vault/session-scanner-opencode-wsl-routing.test.ts": 129,
+      "src/main/ai-vault/session-scanner-opencode2-message.test.ts": 47,
+      "src/main/ai-vault/session-scanner-opencode2-sqlite.test.ts": 139,
+      "src/main/ai-vault/session-scanner-parse-cache-agents.test.ts": 663,
+      "src/main/ai-vault/session-scanner-parse-cache.test.ts": 294,
+      "src/main/ai-vault/session-scanner-parse-wsl-stall.test.ts": 230,
+      "src/main/ai-vault/session-scanner-parser-stream-cleanup.test.ts": 115,
+      "src/main/ai-vault/session-scanner-pi-scope.test.ts": 310,
+      "src/main/ai-vault/session-scanner-preview-window-truncation.test.ts": 55,
+      "src/main/ai-vault/session-scanner-record-budget.test.ts": 443,
+      "src/main/ai-vault/session-scanner-recoverable-empty.test.ts": 316,
+      "src/main/ai-vault/session-scanner-roots.test.ts": 79,
+      "src/main/ai-vault/session-scanner-scope.test.ts": 200,
+      "src/main/ai-vault/session-scanner-service-cancellation.test.ts": 203,
+      "src/main/ai-vault/session-scanner-service-client.test.ts": 502,
+      "src/main/ai-vault/session-scanner-service-entry-path.test.ts": 43,
+      "src/main/ai-vault/session-scanner-service-entry.test.ts": 541,
+      "src/main/ai-vault/session-scanner-service-env.test.ts": 63,
+      "src/main/ai-vault/session-scanner-service-restart-policy.test.ts": 47,
+      "src/main/ai-vault/session-scanner-service-root-request.test.ts": 31,
+      "src/main/ai-vault/session-scanner-service-root-response.test.ts": 228,
+      "src/main/ai-vault/session-scanner-service-search-roots.test.ts": 577,
+      "src/main/ai-vault/session-scanner-service-search.test.ts": 1214,
+      "src/main/ai-vault/session-scanner-service-spawn.test.ts": 435,
+      "src/main/ai-vault/session-scanner-timeline.test.ts": 75,
+      "src/main/ai-vault/session-scanner-unlimited-dedup.test.ts": 3562,
+      "src/main/ai-vault/session-scanner-values.test.ts": 92,
+      "src/main/ai-vault/session-scanner-worker-client.test.ts": 48,
+      "src/main/ai-vault/session-scanner.test.ts": 343,
+      "src/main/ai-vault/session-sidecar-stat.test.ts": 25,
+      "src/main/ai-vault/session-title-file-reader-wsl-stall.test.ts": 173,
+      "src/main/ai-vault/session-title-file-reader.test.ts": 130,
+      "src/main/ai-vault/session-transcript-consumers.test.ts": 384,
+      "src/main/ai-vault/session-transcript-every-agent-capture.test.ts": 551,
+      "src/main/ai-vault/session-transcript-message-content.test.ts": 48,
+      "src/main/ai-vault/session-transcript-record-budget.test.ts": 63,
+      "src/main/ai-vault/ssh-session-list.test.ts": 288,
+      "src/main/ai-vault/structured-session-ownership.test.ts": 106,
+      "src/main/amp/hook-service.test.ts": 83,
+      "src/main/antigravity/hook-service.test.ts": 144,
+      "src/main/antigravity/windows-hook-payload-delivery.test.ts": 84,
+      "src/main/app-icon.test.ts": 79,
+      "src/main/app-relaunch.test.ts": 60,
+      "src/main/appimage-runtime-identity.test.ts": 91,
+      "src/main/appkit-scene-mutation.test.ts": 28,
+      "src/main/artifacts/artifact-cloud-config.test.ts": 54,
+      "src/main/artifacts/artifact-cloud-recovery.test.ts": 477,
+      "src/main/artifacts/artifact-cloud-service-races.test.ts": 642,
+      "src/main/artifacts/artifact-cloud-service.test.ts": 1148,
+      "src/main/artifacts/artifact-create-intent-store.test.ts": 411,
+      "src/main/artifacts/artifact-recovery-directory-fsync.test.ts": 76,
+      "src/main/artifacts/artifact-share-record-allocation.test.ts": 181,
+      "src/main/artifacts/artifact-share-record-store.test.ts": 300,
+      "src/main/asar-transparent-fs.test.ts": 58,
+      "src/main/automations/automation-dispatch-host-fence.test.ts": 5212,
+      "src/main/automations/automation-owner-fencing.test.ts": 3123,
       "src/main/automations/automation-owner-migration.test.ts": 64,
-      "src/main/automations/automation-run-terminal-surface.test.ts": 2420,
-      "src/main/automations/automation-run-writer.test.ts": 206,
-      "src/main/automations/automation-skip-coalescing.test.ts": 5713,
-      "src/main/automations/automation-ssh-readoption-migration.test.ts": 51,
-      "src/main/automations/automation-update-host-retarget.test.ts": 1816,
-      "src/main/automations/automation-worker-durability.test.ts": 6133,
-      "src/main/automations/automation-workspace-host-attribution.test.ts": 4297,
-      "src/main/automations/automation-zero-grace-tick-latency.test.ts": 4479,
-      "src/main/automations/dispatch-refusal.test.ts": 45,
-      "src/main/automations/dispatch-tokens.test.ts": 76,
-      "src/main/automations/external-automation-manager-cache.test.ts": 54,
-      "src/main/automations/external-automation-owner-guard.test.ts": 76,
-      "src/main/automations/external-automation-probe-scheduler.test.ts": 143,
-      "src/main/automations/external-job-run-sorting.test.ts": 174,
-      "src/main/automations/external-manager-scoped.test.ts": 151,
-      "src/main/automations/external-manager.test.ts": 190,
-      "src/main/automations/headless-dispatch-durability.test.ts": 385,
-      "src/main/automations/headless-workspace-create.test.ts": 51,
-      "src/main/automations/hermes-cron-output.test.ts": 146,
-      "src/main/automations/precheck-runner.test.ts": 1201,
-      "src/main/automations/refused-manual-run.test.ts": 4650,
-      "src/main/automations/retained-run-reconciliation.test.ts": 4650,
-      "src/main/automations/run-completion-watcher.test.ts": 4643,
+      "src/main/automations/automation-run-terminal-surface.test.ts": 3148,
+      "src/main/automations/automation-run-writer.test.ts": 190,
+      "src/main/automations/automation-skip-coalescing.test.ts": 5292,
+      "src/main/automations/automation-ssh-readoption-migration.test.ts": 63,
+      "src/main/automations/automation-update-host-retarget.test.ts": 2563,
+      "src/main/automations/automation-worker-durability.test.ts": 4821,
+      "src/main/automations/automation-workspace-host-attribution.test.ts": 4398,
+      "src/main/automations/automation-zero-grace-tick-latency.test.ts": 4426,
+      "src/main/automations/dispatch-refusal.test.ts": 64,
+      "src/main/automations/dispatch-tokens.test.ts": 62,
+      "src/main/automations/external-automation-manager-cache.test.ts": 111,
+      "src/main/automations/external-automation-owner-guard.test.ts": 73,
+      "src/main/automations/external-automation-probe-scheduler.test.ts": 150,
+      "src/main/automations/external-job-run-sorting.test.ts": 136,
+      "src/main/automations/external-manager-scoped.test.ts": 90,
+      "src/main/automations/external-manager.test.ts": 157,
+      "src/main/automations/headless-dispatch-durability.test.ts": 348,
+      "src/main/automations/headless-workspace-create.test.ts": 55,
+      "src/main/automations/hermes-cron-output.test.ts": 196,
+      "src/main/automations/precheck-runner.test.ts": 1128,
+      "src/main/automations/refused-manual-run.test.ts": 3358,
+      "src/main/automations/retained-run-reconciliation.test.ts": 4350,
+      "src/main/automations/run-completion-watcher.test.ts": 4513,
       "src/main/automations/run-target-resolution.test.ts": 51,
-      "src/main/automations/runtime-terminal-run-observer.test.ts": 95,
-      "src/main/automations/schedule-drift-report.test.ts": 75,
-      "src/main/automations/service-precheck.test.ts": 1708,
-      "src/main/automations/service.test.ts": 8449,
-      "src/main/azure-devops/azure-devops-api-request.test.ts": 121,
-      "src/main/azure-devops/client.test.ts": 211,
+      "src/main/automations/runtime-terminal-run-observer.test.ts": 51,
+      "src/main/automations/schedule-drift-report.test.ts": 62,
+      "src/main/automations/service-precheck.test.ts": 1864,
+      "src/main/automations/service.test.ts": 10184,
+      "src/main/azure-devops/azure-devops-api-request.test.ts": 93,
+      "src/main/azure-devops/client.test.ts": 232,
       "src/main/azure-devops/pull-request-creation.test.ts": 167,
-      "src/main/azure-devops/pull-request-mappers.test.ts": 70,
-      "src/main/azure-devops/repository-ref.test.ts": 101,
-      "src/main/bitbucket/client.test.ts": 221,
-      "src/main/bitbucket/credential-connection.test.ts": 191,
-      "src/main/bitbucket/credential-store.test.ts": 154,
-      "src/main/bitbucket/pull-request-creation.test.ts": 196,
-      "src/main/bitbucket/pull-request-mappers.test.ts": 39,
-      "src/main/bitbucket/repository-ref.test.ts": 87,
-      "src/main/bitbucket/status-no-decrypt.test.ts": 234,
-      "src/main/browser/agent-browser-bridge-capture-paint-hold.test.ts": 194,
-      "src/main/browser/agent-browser-bridge-command-transport.test.ts": 370,
-      "src/main/browser/agent-browser-bridge-keypress-input.test.ts": 315,
-      "src/main/browser/agent-browser-bridge-mouse-input.test.ts": 275,
-      "src/main/browser/agent-browser-bridge-navigation.test.ts": 485,
-      "src/main/browser/agent-browser-bridge-pointer-input.test.ts": 387,
-      "src/main/browser/agent-browser-bridge-session-lifecycle.test.ts": 718,
-      "src/main/browser/agent-browser-bridge-tab-routing.test.ts": 365,
-      "src/main/browser/agent-browser-bridge-text-input.test.ts": 339,
-      "src/main/browser/agent-browser-orphan-sweep.test.ts": 48,
-      "src/main/browser/agent-browser-process-environment.test.ts": 66,
-      "src/main/browser/agent-browser-session-reset.test.ts": 63,
-      "src/main/browser/browser-certificate-trust-controller.test.ts": 345,
-      "src/main/browser/browser-clicked-link-routing.test.ts": 616,
-      "src/main/browser/browser-client-download-relay.test.ts": 157,
-      "src/main/browser/browser-client-download-routing.test.ts": 89,
-      "src/main/browser/browser-client-file-channel-negotiation.test.ts": 173,
-      "src/main/browser/browser-client-file-channel-reconnect.test.ts": 427,
-      "src/main/browser/browser-client-host-attach-request.test.ts": 170,
-      "src/main/browser/browser-client-host-authority-replacement.test.ts": 156,
-      "src/main/browser/browser-client-host-command-dispatcher.test.ts": 202,
-      "src/main/browser/browser-client-host-command-retention.test.ts": 614,
-      "src/main/browser/browser-client-host-id.test.ts": 58,
-      "src/main/browser/browser-client-host-placement-preparation.test.ts": 51,
-      "src/main/browser/browser-client-host-published-url-wiring.test.ts": 608,
-      "src/main/browser/browser-client-host-reconciliation-command-order.test.ts": 352,
-      "src/main/browser/browser-client-network-route-registry.test.ts": 202,
-      "src/main/browser/browser-client-page-automation-runtime.test.ts": 49,
-      "src/main/browser/browser-client-page-command-executor-fencing.test.ts": 246,
-      "src/main/browser/browser-client-page-command-executor.test.ts": 356,
-      "src/main/browser/browser-client-page-command-integration.test.ts": 352,
-      "src/main/browser/browser-client-page-execution-host-supersession.test.ts": 268,
-      "src/main/browser/browser-client-page-inventory.test.ts": 196,
-      "src/main/browser/browser-client-page-metadata-transport.test.ts": 143,
-      "src/main/browser/browser-client-page-published-url.test.ts": 163,
-      "src/main/browser/browser-client-page-reconciliation-adapters.test.ts": 216,
-      "src/main/browser/browser-client-page-renderer-bridge.test.ts": 152,
-      "src/main/browser/browser-client-page-renderer-lifecycle.electron.test.ts": 1125,
-      "src/main/browser/browser-client-page-renderer-runtime.test.ts": 171,
-      "src/main/browser/browser-client-page-unavailability.test.ts": 225,
-      "src/main/browser/browser-client-page-upload-routing.test.ts": 301,
-      "src/main/browser/browser-client-route-cookie-import-partition-parity.test.ts": 177,
+      "src/main/azure-devops/pull-request-mappers.test.ts": 39,
+      "src/main/azure-devops/repository-ref.test.ts": 57,
+      "src/main/bitbucket/client.test.ts": 248,
+      "src/main/bitbucket/credential-connection.test.ts": 186,
+      "src/main/bitbucket/credential-store.test.ts": 147,
+      "src/main/bitbucket/pull-request-creation.test.ts": 163,
+      "src/main/bitbucket/pull-request-mappers.test.ts": 43,
+      "src/main/bitbucket/repository-ref.test.ts": 47,
+      "src/main/bitbucket/status-no-decrypt.test.ts": 188,
+      "src/main/browser/agent-browser-bridge-capture-paint-hold.test.ts": 263,
+      "src/main/browser/agent-browser-bridge-command-transport.test.ts": 550,
+      "src/main/browser/agent-browser-bridge-keypress-input.test.ts": 246,
+      "src/main/browser/agent-browser-bridge-mouse-input.test.ts": 323,
+      "src/main/browser/agent-browser-bridge-navigation.test.ts": 484,
+      "src/main/browser/agent-browser-bridge-pointer-input.test.ts": 342,
+      "src/main/browser/agent-browser-bridge-session-lifecycle.test.ts": 608,
+      "src/main/browser/agent-browser-bridge-tab-routing.test.ts": 501,
+      "src/main/browser/agent-browser-bridge-text-input.test.ts": 609,
+      "src/main/browser/agent-browser-orphan-sweep.test.ts": 63,
+      "src/main/browser/agent-browser-process-environment.test.ts": 55,
+      "src/main/browser/agent-browser-session-reset.test.ts": 66,
+      "src/main/browser/browser-certificate-trust-controller.test.ts": 382,
+      "src/main/browser/browser-clicked-link-routing.test.ts": 565,
+      "src/main/browser/browser-client-download-relay.test.ts": 168,
+      "src/main/browser/browser-client-download-routing.test.ts": 185,
+      "src/main/browser/browser-client-file-channel-negotiation.test.ts": 185,
+      "src/main/browser/browser-client-file-channel-reconnect.test.ts": 486,
+      "src/main/browser/browser-client-host-attach-request.test.ts": 153,
+      "src/main/browser/browser-client-host-authority-replacement.test.ts": 138,
+      "src/main/browser/browser-client-host-command-dispatcher.test.ts": 154,
+      "src/main/browser/browser-client-host-command-retention.test.ts": 436,
+      "src/main/browser/browser-client-host-id.test.ts": 85,
+      "src/main/browser/browser-client-host-placement-preparation.test.ts": 93,
+      "src/main/browser/browser-client-host-published-url-wiring.test.ts": 592,
+      "src/main/browser/browser-client-host-reconciliation-command-order.test.ts": 214,
+      "src/main/browser/browser-client-network-route-registry.test.ts": 118,
+      "src/main/browser/browser-client-page-automation-runtime.test.ts": 52,
+      "src/main/browser/browser-client-page-command-executor-fencing.test.ts": 284,
+      "src/main/browser/browser-client-page-command-executor.test.ts": 216,
+      "src/main/browser/browser-client-page-command-integration.test.ts": 231,
+      "src/main/browser/browser-client-page-execution-host-supersession.test.ts": 203,
+      "src/main/browser/browser-client-page-inventory.test.ts": 212,
+      "src/main/browser/browser-client-page-metadata-transport.test.ts": 147,
+      "src/main/browser/browser-client-page-published-url.test.ts": 118,
+      "src/main/browser/browser-client-page-reconciliation-adapters.test.ts": 239,
+      "src/main/browser/browser-client-page-renderer-bridge.test.ts": 109,
+      "src/main/browser/browser-client-page-renderer-lifecycle.electron.test.ts": 843,
+      "src/main/browser/browser-client-page-renderer-runtime.test.ts": 161,
+      "src/main/browser/browser-client-page-unavailability.test.ts": 212,
+      "src/main/browser/browser-client-page-upload-routing.test.ts": 273,
+      "src/main/browser/browser-client-route-cookie-import-partition-parity.test.ts": 220,
       "src/main/browser/browser-client-route-cookie-import.test.ts": 68,
-      "src/main/browser/browser-client-upload-command.test.ts": 172,
-      "src/main/browser/browser-client-upload-staging.test.ts": 234,
-      "src/main/browser/browser-client-upload-transfer.test.ts": 7777,
-      "src/main/browser/browser-cookie-clear-preserve.test.ts": 121,
-      "src/main/browser/browser-cookie-clear-store-lifecycle.test.ts": 84,
-      "src/main/browser/browser-cookie-clear-store.test.ts": 100,
-      "src/main/browser/browser-cookie-decryption.test.ts": 44,
-      "src/main/browser/browser-cookie-import-app-bound-prefix.test.ts": 424,
-      "src/main/browser/browser-cookie-import-clear-atomicity.test.ts": 92,
-      "src/main/browser/browser-cookie-import-concurrency.test.ts": 416,
-      "src/main/browser/browser-cookie-import-google-exclusion.test.ts": 318,
-      "src/main/browser/browser-cookie-import-partition-fidelity.test.ts": 459,
-      "src/main/browser/browser-cookie-import-partition-reland.electron.test.ts": 3096,
-      "src/main/browser/browser-cookie-import-partition-rollback.electron.test.ts": 687,
-      "src/main/browser/browser-cookie-import-partition-success.electron.test.ts": 1073,
-      "src/main/browser/browser-cookie-import-partition.electron.test.ts": 992,
-      "src/main/browser/browser-cookie-import-plan-writes.test.ts": 56,
-      "src/main/browser/browser-cookie-import-policy.test.ts": 197,
-      "src/main/browser/browser-cookie-import-replace-partition-rollback.electron.test.ts": 1287,
-      "src/main/browser/browser-cookie-import-replacement.test.ts": 299,
-      "src/main/browser/browser-cookie-import-route-partition-staging.test.ts": 299,
-      "src/main/browser/browser-cookie-import-scope.test.ts": 368,
-      "src/main/browser/browser-cookie-import-undecryptable.test.ts": 878,
-      "src/main/browser/browser-cookie-import-validated-partition.electron.test.ts": 977,
-      "src/main/browser/browser-cookie-import-write.test.ts": 76,
-      "src/main/browser/browser-cookie-import.comet.test.ts": 654,
-      "src/main/browser/browser-cookie-import.helium.test.ts": 575,
-      "src/main/browser/browser-cookie-import.test.ts": 1892,
-      "src/main/browser/browser-cookie-public-suffix-scope.test.ts": 71,
-      "src/main/browser/browser-cookie-registrable-family.test.ts": 67,
-      "src/main/browser/browser-cookie-samesite.electron.test.ts": 958,
-      "src/main/browser/browser-cookie-source-partition.test.ts": 56,
-      "src/main/browser/browser-cookie-validation.test.ts": 52,
-      "src/main/browser/browser-download-destination.test.ts": 54,
-      "src/main/browser/browser-execution-host-storage-identity.test.ts": 158,
-      "src/main/browser/browser-google-auth-ua.test.ts": 38,
+      "src/main/browser/browser-client-upload-command.test.ts": 139,
+      "src/main/browser/browser-client-upload-staging.test.ts": 346,
+      "src/main/browser/browser-client-upload-transfer.test.ts": 7621,
+      "src/main/browser/browser-cookie-clear-preserve.test.ts": 125,
+      "src/main/browser/browser-cookie-clear-store-lifecycle.test.ts": 89,
+      "src/main/browser/browser-cookie-clear-store.test.ts": 68,
+      "src/main/browser/browser-cookie-decryption.test.ts": 74,
+      "src/main/browser/browser-cookie-import-app-bound-prefix.test.ts": 400,
+      "src/main/browser/browser-cookie-import-clear-atomicity.test.ts": 71,
+      "src/main/browser/browser-cookie-import-concurrency.test.ts": 490,
+      "src/main/browser/browser-cookie-import-google-exclusion.test.ts": 358,
+      "src/main/browser/browser-cookie-import-partition-fidelity.test.ts": 482,
+      "src/main/browser/browser-cookie-import-partition-reland.electron.test.ts": 2260,
+      "src/main/browser/browser-cookie-import-partition-rollback.electron.test.ts": 675,
+      "src/main/browser/browser-cookie-import-partition-success.electron.test.ts": 893,
+      "src/main/browser/browser-cookie-import-partition.electron.test.ts": 814,
+      "src/main/browser/browser-cookie-import-plan-writes.test.ts": 74,
+      "src/main/browser/browser-cookie-import-policy.test.ts": 248,
+      "src/main/browser/browser-cookie-import-replace-partition-rollback.electron.test.ts": 1224,
+      "src/main/browser/browser-cookie-import-replacement.test.ts": 204,
+      "src/main/browser/browser-cookie-import-route-partition-staging.test.ts": 314,
+      "src/main/browser/browser-cookie-import-scope.test.ts": 285,
+      "src/main/browser/browser-cookie-import-undecryptable.test.ts": 443,
+      "src/main/browser/browser-cookie-import-validated-partition.electron.test.ts": 1035,
+      "src/main/browser/browser-cookie-import-write.test.ts": 38,
+      "src/main/browser/browser-cookie-import.comet.test.ts": 737,
+      "src/main/browser/browser-cookie-import.helium.test.ts": 567,
+      "src/main/browser/browser-cookie-import.test.ts": 3476,
+      "src/main/browser/browser-cookie-public-suffix-scope.test.ts": 42,
+      "src/main/browser/browser-cookie-registrable-family.test.ts": 57,
+      "src/main/browser/browser-cookie-samesite.electron.test.ts": 898,
+      "src/main/browser/browser-cookie-source-partition.test.ts": 42,
+      "src/main/browser/browser-cookie-validation.test.ts": 40,
+      "src/main/browser/browser-download-destination.test.ts": 55,
+      "src/main/browser/browser-execution-host-storage-identity.test.ts": 146,
+      "src/main/browser/browser-google-auth-ua.test.ts": 32,
       "src/main/browser/browser-grab-payload.test.ts": 39,
-      "src/main/browser/browser-guest-shortcut-forwarding.test.ts": 450,
-      "src/main/browser/browser-guest-wheel-zoom-scroll.test.ts": 47,
-      "src/main/browser/browser-host-client-identity.test.ts": 86,
-      "src/main/browser/browser-host-lease-reconnect-delay.test.ts": 37,
-      "src/main/browser/browser-identity-mode-record.test.ts": 41,
-      "src/main/browser/browser-identity-mode-store.test.ts": 92,
-      "src/main/browser/browser-manager-annotation-bridge.test.ts": 274,
-      "src/main/browser/browser-manager-auth-user-agent.test.ts": 349,
-      "src/main/browser/browser-manager-client-hosted-downloads.test.ts": 423,
-      "src/main/browser/browser-manager-destroyed-guest-downloads.test.ts": 311,
-      "src/main/browser/browser-manager-destroyed-guest.test.ts": 308,
-      "src/main/browser/browser-manager-downloads.test.ts": 287,
-      "src/main/browser/browser-manager-grab-capture.test.ts": 352,
-      "src/main/browser/browser-manager-grab-mode.test.ts": 303,
-      "src/main/browser/browser-manager-grab-selection.test.ts": 381,
-      "src/main/browser/browser-manager-grab-shortcuts.test.ts": 222,
-      "src/main/browser/browser-manager-guest-lifecycle.test.ts": 346,
-      "src/main/browser/browser-manager-guest-policy-profile.test.ts": 246,
-      "src/main/browser/browser-manager-guest-shortcuts.test.ts": 290,
-      "src/main/browser/browser-manager-guest-visibility.test.ts": 317,
-      "src/main/browser/browser-manager-load-failure-replay.test.ts": 304,
-      "src/main/browser/browser-manager-popup-child.test.ts": 292,
-      "src/main/browser/browser-manager-popup-routing.test.ts": 374,
-      "src/main/browser/browser-manager-viewport-override.test.ts": 1493,
-      "src/main/browser/browser-manager-viewport-ownership.test.ts": 316,
-      "src/main/browser/browser-manager-viewport-partial-failure.test.ts": 289,
-      "src/main/browser/browser-manager-worker-request-user-agent.test.ts": 274,
-      "src/main/browser/browser-network-deferred-socket.test.ts": 41,
-      "src/main/browser/browser-network-execution-route.test.ts": 121,
-      "src/main/browser/browser-network-tunnel-client-memory-budget.test.ts": 76,
-      "src/main/browser/browser-network-tunnel-client.test.ts": 100,
-      "src/main/browser/browser-network-tunnel-conformance.test.ts": 196,
-      "src/main/browser/browser-network-tunnel-outbound-memory-budget.test.ts": 53,
-      "src/main/browser/browser-network-tunnel-session-aggregate-memory.test.ts": 63,
-      "src/main/browser/browser-network-tunnel-session-stream-scoped-failure.test.ts": 53,
-      "src/main/browser/browser-network-tunnel-session.test.ts": 113,
-      "src/main/browser/browser-page-initiated-tab-budget.test.ts": 47,
-      "src/main/browser/browser-process-user-agent.test.ts": 41,
-      "src/main/browser/browser-route-dns-prefetch.electron.test.ts": 4488,
-      "src/main/browser/browser-route-guest-popups.test.ts": 309,
-      "src/main/browser/browser-route-h3-egress.electron.test.ts": 14142,
-      "src/main/browser/browser-route-identity.test.ts": 78,
-      "src/main/browser/browser-route-partition-binding-capacity.test.ts": 89,
-      "src/main/browser/browser-route-partition-binding-store.test.ts": 106,
-      "src/main/browser/browser-route-partition-migration.test.ts": 80,
-      "src/main/browser/browser-route-partition-stability.test.ts": 175,
-      "src/main/browser/browser-route-partition-storage-lifecycle.test.ts": 290,
-      "src/main/browser/browser-route-partition-storage-retirement.test.ts": 141,
-      "src/main/browser/browser-route-partition-storage-runtime.test.ts": 75,
-      "src/main/browser/browser-route-persisted-worker-egress.electron.test.ts": 2797,
-      "src/main/browser/browser-route-prepared-page-rekey.test.ts": 28,
-      "src/main/browser/browser-route-session-registry.test.ts": 137,
-      "src/main/browser/browser-route-tcp-egress.electron.test.ts": 5657,
-      "src/main/browser/browser-route-webcontents-registry.test.ts": 338,
-      "src/main/browser/browser-route-webrtc-egress.electron.test.ts": 9267,
-      "src/main/browser/browser-screencast-dialog-settlement.test.ts": 74,
-      "src/main/browser/browser-screencast-lifecycle.test.ts": 87,
-      "src/main/browser/browser-screencast-snapshot-scaling.test.ts": 195,
-      "src/main/browser/browser-screencast-stream.test.ts": 813,
-      "src/main/browser/browser-session-cookie-staging.scoped.test.ts": 410,
-      "src/main/browser/browser-session-cookie-staging.test.ts": 252,
-      "src/main/browser/browser-session-partition-policies.test.ts": 90,
-      "src/main/browser/browser-session-partition-proxy-install.test.ts": 392,
-      "src/main/browser/browser-session-proxy.test.ts": 230,
-      "src/main/browser/browser-session-registry-identity.persistence.test.ts": 376,
-      "src/main/browser/browser-session-registry-import-boundary.test.ts": 29,
-      "src/main/browser/browser-session-registry.persistence.test.ts": 693,
-      "src/main/browser/browser-session-registry.test.ts": 926,
-      "src/main/browser/browser-session-startup.test.ts": 58,
-      "src/main/browser/browser-session-ua-cloudflare-live.electron.test.ts": 585,
-      "src/main/browser/browser-session-ua-wire-identity-cross-context.electron.test.ts": 6446,
-      "src/main/browser/browser-session-ua-wire-identity.electron.test.ts": 8711,
-      "src/main/browser/browser-session-user-agent-migration-inspection.test.ts": 159,
-      "src/main/browser/browser-text-insertion.test.ts": 66,
-      "src/main/browser/browser-viewport-user-agent.test.ts": 50,
-      "src/main/browser/browser-webauthn-access.test.ts": 35,
-      "src/main/browser/browser-webauthn-account-picker.test.ts": 76,
-      "src/main/browser/browser-webauthn-profile-delete.test.ts": 346,
-      "src/main/browser/cdp-bridge-integration.test.ts": 8238,
-      "src/main/browser/cdp-bridge-state.test.ts": 92,
-      "src/main/browser/cdp-client-response-writer.test.ts": 820,
-      "src/main/browser/cdp-keyboard-us-layout.test.ts": 33,
-      "src/main/browser/cdp-print-to-pdf.test.ts": 66,
-      "src/main/browser/cdp-screenshot.test.ts": 66,
-      "src/main/browser/cdp-ws-proxy-focus-replay.test.ts": 457,
-      "src/main/browser/cdp-ws-proxy.test.ts": 2580,
-      "src/main/browser/chromium-cookie-snapshot.test.ts": 483,
-      "src/main/browser/client-route-cookie-import-source-store.test.ts": 97,
-      "src/main/browser/doc-preview-download-block-notice.test.ts": 50,
-      "src/main/browser/doc-preview-failure-notice.test.ts": 39,
-      "src/main/browser/doc-preview-file-reader.test.ts": 97,
-      "src/main/browser/doc-preview-grant-registry.test.ts": 76,
-      "src/main/browser/doc-preview-guest-policy.test.ts": 224,
-      "src/main/browser/doc-preview-protocol.test.ts": 168,
-      "src/main/browser/electron-debugger-lease.test.ts": 38,
-      "src/main/browser/electron-probe-display-launch.test.ts": 40,
-      "src/main/browser/execution-route-socket-duplex.test.ts": 67,
-      "src/main/browser/grab-guest-script.test.ts": 86,
-      "src/main/browser/local-ssh-browser-partition-identity.test.ts": 391,
-      "src/main/browser/local-ssh-browser-partitions.probe-cache.test.ts": 54,
-      "src/main/browser/local-ssh-browser-route.test.ts": 129,
-      "src/main/browser/offscreen-browser-backend-lifecycle.test.ts": 263,
-      "src/main/browser/offscreen-browser-backend.web-preferences.test.ts": 28,
-      "src/main/browser/paired-runtime-browser-client-host-composition.test.ts": 127,
-      "src/main/browser/paired-runtime-browser-client-host-identity-wiring.test.ts": 785,
-      "src/main/browser/paired-runtime-browser-client-host-reconnect.test.ts": 429,
-      "src/main/browser/paired-runtime-browser-client-host-registry.test.ts": 68,
-      "src/main/browser/paired-runtime-browser-client-host-route-identity.test.ts": 469,
-      "src/main/browser/paired-runtime-browser-client-host-runtime.test.ts": 528,
-      "src/main/browser/paired-runtime-browser-client-host.test.ts": 399,
-      "src/main/browser/paired-runtime-browser-host-command-admission.test.ts": 159,
-      "src/main/browser/paired-runtime-browser-host-lease-reconnect.test.ts": 901,
-      "src/main/browser/paired-runtime-browser-host-lease.test.ts": 907,
-      "src/main/browser/paired-runtime-browser-host-reconciliation-negotiation.test.ts": 232,
-      "src/main/browser/paired-runtime-browser-network-route.test.ts": 1170,
-      "src/main/browser/popup-origin-bar-window.test.ts": 57,
-      "src/main/browser/remote-browser-socks-buffering.test.ts": 1471,
-      "src/main/browser/remote-browser-socks-server.test.ts": 335,
-      "src/main/browser/snapshot-engine-iframe-sessions.test.ts": 138,
-      "src/main/browser/snapshot-engine.test.ts": 49,
-      "src/main/browser/ssh-browser-network-execution-route.test.ts": 371,
-      "src/main/browser/system-ssh-socks-client-socket.test.ts": 50,
-      "src/main/browser/wsl-browser-network-execution-route.test.ts": 216,
-      "src/main/browser/wsl-browser-network-relay-launch.test.ts": 96,
-      "src/main/claude-accounts/claude-account-service-account-selection.test.ts": 215,
-      "src/main/claude-accounts/claude-account-service-add-account.test.ts": 167,
-      "src/main/claude-accounts/claude-account-service-api-parity.test.ts": 147,
-      "src/main/claude-accounts/claude-account-service-config-dir-capture.test.ts": 163,
-      "src/main/claude-accounts/claude-account-service-credential-capture.test.ts": 127,
-      "src/main/claude-accounts/claude-account-service-login-process.test.ts": 612,
-      "src/main/claude-accounts/claude-account-service-reauth-rollback.test.ts": 200,
-      "src/main/claude-accounts/claude-duplicate-account.test.ts": 51,
-      "src/main/claude-accounts/claude-login-completion.oracle.test.ts": 259,
-      "src/main/claude-accounts/claude-structured-auth-policy.test.ts": 49,
-      "src/main/claude-accounts/claude-windows-interactive-login.test.ts": 218,
-      "src/main/claude-accounts/keychain-config-directory-aliases.test.ts": 96,
-      "src/main/claude-accounts/keychain.test.ts": 123,
-      "src/main/claude-accounts/live-pty-gate.test.ts": 62,
-      "src/main/claude-accounts/oauth-refresh.test.ts": 63,
-      "src/main/claude-accounts/runtime-auth-path-materialization.test.ts": 425,
-      "src/main/claude-accounts/runtime-auth-service-account-switching.test.ts": 435,
-      "src/main/claude-accounts/runtime-auth-service-deselect-restore.test.ts": 399,
-      "src/main/claude-accounts/runtime-auth-service-keychain-snapshots.test.ts": 741,
-      "src/main/claude-accounts/runtime-auth-service-launch-refresh.test.ts": 270,
-      "src/main/claude-accounts/runtime-auth-service-materialization.test.ts": 506,
-      "src/main/claude-accounts/runtime-auth-service-readback-identity.test.ts": 640,
-      "src/main/claude-accounts/runtime-auth-service-snapshot-validation.test.ts": 585,
-      "src/main/claude-accounts/runtime-auth-service-wsl-runtime.test.ts": 240,
-      "src/main/claude-accounts/runtime-paths.test.ts": 80,
-      "src/main/claude-accounts/runtime-selection.test.ts": 45,
-      "src/main/claude-accounts/windows-command-invocation.test.ts": 47,
-      "src/main/claude-usage/claude-model-pricing.test.ts": 46,
-      "src/main/claude-usage/claude-usage-report-aggregation.test.ts": 85,
-      "src/main/claude-usage/scanner-large-directory.test.ts": 694,
-      "src/main/claude-usage/scanner-scan.test.ts": 246,
-      "src/main/claude-usage/scanner.test.ts": 77,
-      "src/main/claude-usage/store.test.ts": 181,
-      "src/main/claude-usage/transcript-record-parser-prefilter.test.ts": 47,
-      "src/main/claude-usage/worktree-attribution-scaling.test.ts": 46,
-      "src/main/claude/claude-agent-sdk-contract-pins.test.ts": 3031,
-      "src/main/claude/claude-agent-sdk-control-requests.test.ts": 50,
-      "src/main/claude/claude-agent-sdk-exit-proof-identity.test.ts": 112,
-      "src/main/claude/claude-agent-sdk-exit-proof.test.ts": 12813,
-      "src/main/claude/claude-agent-sdk-import-boundary.test.ts": 1716,
-      "src/main/claude/claude-agent-sdk-process-spawn.test.ts": 71,
-      "src/main/claude/claude-agent-sdk-root-kill-fallback.test.ts": 99,
-      "src/main/claude/claude-agent-sdk-user-message-queue.test.ts": 137,
-      "src/main/claude/claude-background-task-resume.test.ts": 51,
-      "src/main/claude/claude-background-task-retention.test.ts": 465,
-      "src/main/claude/claude-background-task-row-journal.test.ts": 116,
-      "src/main/claude/claude-background-task-rows.test.ts": 126,
-      "src/main/claude/claude-background-task-terminal-frames.test.ts": 92,
-      "src/main/claude/claude-background-task-tracker.test.ts": 145,
-      "src/main/claude/claude-background-task-turn-resumption.test.ts": 179,
-      "src/main/claude/claude-child-process-environment.test.ts": 34,
-      "src/main/claude/claude-child-work-decoder.test.ts": 84,
-      "src/main/claude/claude-command-lifecycle-frames.test.ts": 127,
-      "src/main/claude/claude-config-dir-pin.test.ts": 51,
-      "src/main/claude/claude-context-model-switch.test.ts": 152,
-      "src/main/claude/claude-context-usage-restart.test.ts": 416,
-      "src/main/claude/claude-context-usage-unloaded-turn.test.ts": 2555,
-      "src/main/claude/claude-context-usage.test.ts": 135,
-      "src/main/claude/claude-context-window-hint.test.ts": 106,
-      "src/main/claude/claude-descendant-escalation-boundary.test.ts": 573,
-      "src/main/claude/claude-history-window-source-budget.test.ts": 672,
-      "src/main/claude/claude-model-catalog-probe.test.ts": 354,
-      "src/main/claude/claude-provisional-row-corrections.test.ts": 61,
-      "src/main/claude/claude-session-end-hook-capability.test.ts": 54,
+      "src/main/browser/browser-guest-shortcut-forwarding.test.ts": 333,
+      "src/main/browser/browser-guest-wheel-zoom-scroll.test.ts": 34,
+      "src/main/browser/browser-host-client-identity.test.ts": 97,
+      "src/main/browser/browser-host-lease-reconnect-delay.test.ts": 34,
+      "src/main/browser/browser-identity-mode-record.test.ts": 82,
+      "src/main/browser/browser-identity-mode-store.test.ts": 100,
+      "src/main/browser/browser-manager-annotation-bridge.test.ts": 214,
+      "src/main/browser/browser-manager-auth-user-agent.test.ts": 263,
+      "src/main/browser/browser-manager-client-hosted-downloads.test.ts": 366,
+      "src/main/browser/browser-manager-destroyed-guest-downloads.test.ts": 165,
+      "src/main/browser/browser-manager-destroyed-guest.test.ts": 445,
+      "src/main/browser/browser-manager-downloads.test.ts": 320,
+      "src/main/browser/browser-manager-grab-capture.test.ts": 216,
+      "src/main/browser/browser-manager-grab-mode.test.ts": 305,
+      "src/main/browser/browser-manager-grab-selection.test.ts": 169,
+      "src/main/browser/browser-manager-grab-shortcuts.test.ts": 249,
+      "src/main/browser/browser-manager-guest-lifecycle.test.ts": 412,
+      "src/main/browser/browser-manager-guest-policy-profile.test.ts": 279,
+      "src/main/browser/browser-manager-guest-shortcuts.test.ts": 329,
+      "src/main/browser/browser-manager-guest-visibility.test.ts": 178,
+      "src/main/browser/browser-manager-load-failure-replay.test.ts": 280,
+      "src/main/browser/browser-manager-popup-child.test.ts": 189,
+      "src/main/browser/browser-manager-popup-routing.test.ts": 552,
+      "src/main/browser/browser-manager-viewport-override.test.ts": 1098,
+      "src/main/browser/browser-manager-viewport-ownership.test.ts": 298,
+      "src/main/browser/browser-manager-viewport-partial-failure.test.ts": 249,
+      "src/main/browser/browser-manager-worker-request-user-agent.test.ts": 208,
+      "src/main/browser/browser-network-deferred-socket.test.ts": 71,
+      "src/main/browser/browser-network-execution-route.test.ts": 102,
+      "src/main/browser/browser-network-tunnel-client-memory-budget.test.ts": 77,
+      "src/main/browser/browser-network-tunnel-client.test.ts": 107,
+      "src/main/browser/browser-network-tunnel-conformance.test.ts": 162,
+      "src/main/browser/browser-network-tunnel-outbound-memory-budget.test.ts": 71,
+      "src/main/browser/browser-network-tunnel-session-aggregate-memory.test.ts": 32,
+      "src/main/browser/browser-network-tunnel-session-stream-scoped-failure.test.ts": 47,
+      "src/main/browser/browser-network-tunnel-session.test.ts": 93,
+      "src/main/browser/browser-page-initiated-tab-budget.test.ts": 44,
+      "src/main/browser/browser-process-user-agent.test.ts": 40,
+      "src/main/browser/browser-route-dns-prefetch.electron.test.ts": 4575,
+      "src/main/browser/browser-route-guest-popups.test.ts": 126,
+      "src/main/browser/browser-route-h3-egress.electron.test.ts": 14983,
+      "src/main/browser/browser-route-identity.test.ts": 57,
+      "src/main/browser/browser-route-partition-binding-capacity.test.ts": 70,
+      "src/main/browser/browser-route-partition-binding-store.test.ts": 93,
+      "src/main/browser/browser-route-partition-migration.test.ts": 112,
+      "src/main/browser/browser-route-partition-stability.test.ts": 188,
+      "src/main/browser/browser-route-partition-storage-lifecycle.test.ts": 80,
+      "src/main/browser/browser-route-partition-storage-retirement.test.ts": 151,
+      "src/main/browser/browser-route-partition-storage-runtime.test.ts": 57,
+      "src/main/browser/browser-route-persisted-worker-egress.electron.test.ts": 3440,
+      "src/main/browser/browser-route-prepared-page-rekey.test.ts": 45,
+      "src/main/browser/browser-route-session-registry.test.ts": 147,
+      "src/main/browser/browser-route-tcp-egress.electron.test.ts": 1248,
+      "src/main/browser/browser-route-webcontents-registry.test.ts": 264,
+      "src/main/browser/browser-route-webrtc-egress.electron.test.ts": 10714,
+      "src/main/browser/browser-screencast-dialog-settlement.test.ts": 116,
+      "src/main/browser/browser-screencast-lifecycle.test.ts": 69,
+      "src/main/browser/browser-screencast-snapshot-scaling.test.ts": 192,
+      "src/main/browser/browser-screencast-stream.test.ts": 729,
+      "src/main/browser/browser-session-cookie-staging.scoped.test.ts": 370,
+      "src/main/browser/browser-session-cookie-staging.test.ts": 204,
+      "src/main/browser/browser-session-partition-policies.test.ts": 102,
+      "src/main/browser/browser-session-partition-proxy-install.test.ts": 327,
+      "src/main/browser/browser-session-proxy.test.ts": 205,
+      "src/main/browser/browser-session-registry-identity.persistence.test.ts": 400,
+      "src/main/browser/browser-session-registry-import-boundary.test.ts": 33,
+      "src/main/browser/browser-session-registry.persistence.test.ts": 353,
+      "src/main/browser/browser-session-registry.test.ts": 745,
+      "src/main/browser/browser-session-startup.test.ts": 77,
+      "src/main/browser/browser-session-ua-cloudflare-live.electron.test.ts": 657,
+      "src/main/browser/browser-session-ua-wire-identity-cross-context.electron.test.ts": 6292,
+      "src/main/browser/browser-session-ua-wire-identity.electron.test.ts": 9753,
+      "src/main/browser/browser-session-user-agent-migration-inspection.test.ts": 131,
+      "src/main/browser/browser-text-insertion.test.ts": 76,
+      "src/main/browser/browser-viewport-user-agent.test.ts": 43,
+      "src/main/browser/browser-webauthn-access.test.ts": 29,
+      "src/main/browser/browser-webauthn-account-picker.test.ts": 74,
+      "src/main/browser/browser-webauthn-profile-delete.test.ts": 305,
+      "src/main/browser/cdp-bridge-integration.test.ts": 7871,
+      "src/main/browser/cdp-bridge-state.test.ts": 86,
+      "src/main/browser/cdp-client-response-writer.test.ts": 856,
+      "src/main/browser/cdp-keyboard-us-layout.test.ts": 64,
+      "src/main/browser/cdp-print-to-pdf.test.ts": 63,
+      "src/main/browser/cdp-screenshot.test.ts": 105,
+      "src/main/browser/cdp-ws-proxy-focus-replay.test.ts": 336,
+      "src/main/browser/cdp-ws-proxy.test.ts": 2626,
+      "src/main/browser/chromium-cookie-snapshot.test.ts": 889,
+      "src/main/browser/client-route-cookie-import-source-store.test.ts": 103,
+      "src/main/browser/doc-preview-download-block-notice.test.ts": 47,
+      "src/main/browser/doc-preview-failure-notice.test.ts": 42,
+      "src/main/browser/doc-preview-file-reader.test.ts": 107,
+      "src/main/browser/doc-preview-grant-registry.test.ts": 101,
+      "src/main/browser/doc-preview-guest-policy.test.ts": 277,
+      "src/main/browser/doc-preview-protocol.test.ts": 171,
+      "src/main/browser/electron-debugger-lease.test.ts": 37,
+      "src/main/browser/electron-probe-display-launch.test.ts": 57,
+      "src/main/browser/execution-route-socket-duplex.test.ts": 103,
+      "src/main/browser/grab-guest-script.test.ts": 107,
+      "src/main/browser/local-ssh-browser-partition-identity.test.ts": 321,
+      "src/main/browser/local-ssh-browser-partitions.probe-cache.test.ts": 60,
+      "src/main/browser/local-ssh-browser-route.test.ts": 104,
+      "src/main/browser/offscreen-browser-backend-lifecycle.test.ts": 259,
+      "src/main/browser/offscreen-browser-backend.web-preferences.test.ts": 45,
+      "src/main/browser/paired-runtime-browser-client-host-composition.test.ts": 143,
+      "src/main/browser/paired-runtime-browser-client-host-identity-wiring.test.ts": 583,
+      "src/main/browser/paired-runtime-browser-client-host-reconnect.test.ts": 482,
+      "src/main/browser/paired-runtime-browser-client-host-registry.test.ts": 33,
+      "src/main/browser/paired-runtime-browser-client-host-route-identity.test.ts": 503,
+      "src/main/browser/paired-runtime-browser-client-host-runtime.test.ts": 766,
+      "src/main/browser/paired-runtime-browser-client-host.test.ts": 294,
+      "src/main/browser/paired-runtime-browser-host-command-admission.test.ts": 260,
+      "src/main/browser/paired-runtime-browser-host-lease-reconnect.test.ts": 880,
+      "src/main/browser/paired-runtime-browser-host-lease.test.ts": 856,
+      "src/main/browser/paired-runtime-browser-host-reconciliation-negotiation.test.ts": 269,
+      "src/main/browser/paired-runtime-browser-network-route.test.ts": 1212,
+      "src/main/browser/popup-origin-bar-window.test.ts": 96,
+      "src/main/browser/remote-browser-socks-buffering.test.ts": 1704,
+      "src/main/browser/remote-browser-socks-server.test.ts": 290,
+      "src/main/browser/snapshot-engine-iframe-sessions.test.ts": 92,
+      "src/main/browser/snapshot-engine.test.ts": 45,
+      "src/main/browser/ssh-browser-network-execution-route.test.ts": 532,
+      "src/main/browser/system-ssh-socks-client-socket.test.ts": 49,
+      "src/main/browser/wsl-browser-network-execution-route.test.ts": 269,
+      "src/main/browser/wsl-browser-network-relay-launch.test.ts": 65,
+      "src/main/claude-accounts/claude-account-service-account-selection.test.ts": 175,
+      "src/main/claude-accounts/claude-account-service-add-account.test.ts": 190,
+      "src/main/claude-accounts/claude-account-service-api-parity.test.ts": 206,
+      "src/main/claude-accounts/claude-account-service-config-dir-capture.test.ts": 235,
+      "src/main/claude-accounts/claude-account-service-credential-capture.test.ts": 214,
+      "src/main/claude-accounts/claude-account-service-login-process.test.ts": 499,
+      "src/main/claude-accounts/claude-account-service-reauth-rollback.test.ts": 165,
+      "src/main/claude-accounts/claude-duplicate-account.test.ts": 27,
+      "src/main/claude-accounts/claude-login-completion.oracle.test.ts": 162,
+      "src/main/claude-accounts/claude-structured-auth-policy.test.ts": 57,
+      "src/main/claude-accounts/claude-windows-interactive-login.test.ts": 238,
+      "src/main/claude-accounts/keychain-config-directory-aliases.test.ts": 98,
+      "src/main/claude-accounts/keychain.test.ts": 108,
+      "src/main/claude-accounts/live-pty-gate.test.ts": 42,
+      "src/main/claude-accounts/oauth-refresh.test.ts": 95,
+      "src/main/claude-accounts/runtime-auth-path-materialization.test.ts": 294,
+      "src/main/claude-accounts/runtime-auth-service-account-switching.test.ts": 447,
+      "src/main/claude-accounts/runtime-auth-service-deselect-restore.test.ts": 472,
+      "src/main/claude-accounts/runtime-auth-service-keychain-snapshots.test.ts": 695,
+      "src/main/claude-accounts/runtime-auth-service-launch-refresh.test.ts": 255,
+      "src/main/claude-accounts/runtime-auth-service-materialization.test.ts": 355,
+      "src/main/claude-accounts/runtime-auth-service-readback-identity.test.ts": 598,
+      "src/main/claude-accounts/runtime-auth-service-snapshot-validation.test.ts": 278,
+      "src/main/claude-accounts/runtime-auth-service-wsl-runtime.test.ts": 427,
+      "src/main/claude-accounts/runtime-paths.test.ts": 48,
+      "src/main/claude-accounts/runtime-selection.test.ts": 39,
+      "src/main/claude-accounts/windows-command-invocation.test.ts": 39,
+      "src/main/claude-usage/claude-model-pricing.test.ts": 47,
+      "src/main/claude-usage/claude-usage-report-aggregation.test.ts": 57,
+      "src/main/claude-usage/scanner-large-directory.test.ts": 480,
+      "src/main/claude-usage/scanner-scan.test.ts": 128,
+      "src/main/claude-usage/scanner.test.ts": 61,
+      "src/main/claude-usage/store.test.ts": 157,
+      "src/main/claude-usage/transcript-record-parser-prefilter.test.ts": 62,
+      "src/main/claude-usage/worktree-attribution-scaling.test.ts": 63,
+      "src/main/claude/claude-agent-sdk-contract-pins.test.ts": 3181,
+      "src/main/claude/claude-agent-sdk-control-requests.test.ts": 28,
+      "src/main/claude/claude-agent-sdk-exit-proof-identity.test.ts": 125,
+      "src/main/claude/claude-agent-sdk-exit-proof.test.ts": 12835,
+      "src/main/claude/claude-agent-sdk-import-boundary.test.ts": 1974,
+      "src/main/claude/claude-agent-sdk-process-spawn.test.ts": 87,
+      "src/main/claude/claude-agent-sdk-root-kill-fallback.test.ts": 137,
+      "src/main/claude/claude-agent-sdk-user-message-queue.test.ts": 133,
+      "src/main/claude/claude-background-task-resume.test.ts": 66,
+      "src/main/claude/claude-background-task-retention.test.ts": 585,
+      "src/main/claude/claude-background-task-row-journal.test.ts": 142,
+      "src/main/claude/claude-background-task-rows.test.ts": 316,
+      "src/main/claude/claude-background-task-terminal-frames.test.ts": 64,
+      "src/main/claude/claude-background-task-tracker.test.ts": 147,
+      "src/main/claude/claude-background-task-turn-resumption.test.ts": 108,
+      "src/main/claude/claude-child-process-environment.test.ts": 41,
+      "src/main/claude/claude-child-work-decoder.test.ts": 46,
+      "src/main/claude/claude-command-lifecycle-frames.test.ts": 109,
+      "src/main/claude/claude-config-dir-pin.test.ts": 40,
+      "src/main/claude/claude-context-model-switch.test.ts": 165,
+      "src/main/claude/claude-context-usage-restart.test.ts": 376,
+      "src/main/claude/claude-context-usage-unloaded-turn.test.ts": 1419,
+      "src/main/claude/claude-context-usage.test.ts": 124,
+      "src/main/claude/claude-context-window-hint.test.ts": 185,
+      "src/main/claude/claude-descendant-escalation-boundary.test.ts": 514,
+      "src/main/claude/claude-history-window-source-budget.test.ts": 610,
+      "src/main/claude/claude-model-catalog-probe.test.ts": 293,
+      "src/main/claude/claude-provisional-row-corrections.test.ts": 39,
+      "src/main/claude/claude-session-end-hook-capability.test.ts": 33,
       "src/main/claude/claude-session-end-install.test.ts": 73,
-      "src/main/claude/claude-slash-command-catalog.test.ts": 108,
-      "src/main/claude/claude-stream-json-connection-close.test.ts": 507,
-      "src/main/claude/claude-stream-json-connection.test.ts": 24928,
-      "src/main/claude/claude-streamed-text-checkpoints.test.ts": 69,
-      "src/main/claude/claude-structured-applied-options.test.ts": 509,
-      "src/main/claude/claude-structured-auth-parity.test.ts": 587,
-      "src/main/claude/claude-structured-child-work-captures.test.ts": 979,
-      "src/main/claude/claude-structured-child-work-producer.test.ts": 625,
-      "src/main/claude/claude-structured-compaction.test.ts": 258,
-      "src/main/claude/claude-structured-content-parts.test.ts": 157,
-      "src/main/claude/claude-structured-control-actions.test.ts": 356,
-      "src/main/claude/claude-structured-dispatch-admission.test.ts": 350,
-      "src/main/claude/claude-structured-dispatch-boundary.test.ts": 517,
-      "src/main/claude/claude-structured-dispatch-content.test.ts": 83,
-      "src/main/claude/claude-structured-dispatch-queue-boundary.test.ts": 449,
-      "src/main/claude/claude-structured-dispatch.test.ts": 1960,
-      "src/main/claude/claude-structured-effort-reporting.test.ts": 514,
-      "src/main/claude/claude-structured-history-window.test.ts": 202,
-      "src/main/claude/claude-structured-inbound-control.test.ts": 70,
-      "src/main/claude/claude-structured-journal-prompt-retry.test.ts": 160,
-      "src/main/claude/claude-structured-journal-translation-background-tasks.test.ts": 302,
-      "src/main/claude/claude-structured-journal-translation-context-usage.test.ts": 443,
-      "src/main/claude/claude-structured-journal-translation-subagents.test.ts": 671,
-      "src/main/claude/claude-structured-journal-translation-turn-timing.test.ts": 522,
-      "src/main/claude/claude-structured-journal-translation.plan.test.ts": 96,
-      "src/main/claude/claude-structured-journal-translation.test.ts": 606,
-      "src/main/claude/claude-structured-launch-resolution.test.ts": 386,
-      "src/main/claude/claude-structured-location-support.test.ts": 71,
-      "src/main/claude/claude-structured-model-confirmation.test.ts": 440,
-      "src/main/claude/claude-structured-model-preflight.test.ts": 156,
-      "src/main/claude/claude-structured-option-confirmation.test.ts": 348,
-      "src/main/claude/claude-structured-options-context-window.test.ts": 374,
-      "src/main/claude/claude-structured-options.test.ts": 354,
-      "src/main/claude/claude-structured-owner-identity.test.ts": 52,
-      "src/main/claude/claude-structured-permission-mode.test.ts": 71,
-      "src/main/claude/claude-structured-prompt-items.test.ts": 260,
-      "src/main/claude/claude-structured-prompt-ownership.test.ts": 429,
-      "src/main/claude/claude-structured-provider-fallback.test.ts": 245,
-      "src/main/claude/claude-structured-real-cli.test.ts": 428,
-      "src/main/claude/claude-structured-resume-point.test.ts": 485,
-      "src/main/claude/claude-structured-session-acquisition-processless.test.ts": 470,
-      "src/main/claude/claude-structured-session-adapter-turns.test.ts": 332,
-      "src/main/claude/claude-structured-session-adapter.test.ts": 2130,
-      "src/main/claude/claude-structured-session-close.test.ts": 559,
-      "src/main/claude/claude-structured-session-commands.test.ts": 474,
-      "src/main/claude/claude-structured-session-reading-control.test.ts": 590,
-      "src/main/claude/claude-structured-session-recovery.test.ts": 421,
-      "src/main/claude/claude-structured-session-startup.test.ts": 288,
-      "src/main/claude/claude-structured-turn-resume-point.test.ts": 508,
-      "src/main/claude/claude-subagent-group-row.test.ts": 43,
-      "src/main/claude/claude-subagent-id-aliases.test.ts": 42,
-      "src/main/claude/claude-subagent-roster.test.ts": 134,
-      "src/main/claude/claude-subagent-task-frames.test.ts": 79,
-      "src/main/claude/claude-transcript-branch-graph.test.ts": 50,
-      "src/main/claude/claude-transcript-branch-streaming.test.ts": 254,
-      "src/main/claude/claude-transcript-entry-uuid.test.ts": 40,
-      "src/main/claude/claude-transcript-marker-branch-proof.test.ts": 94,
+      "src/main/claude/claude-slash-command-catalog.test.ts": 64,
+      "src/main/claude/claude-stream-json-connection-close.test.ts": 462,
+      "src/main/claude/claude-stream-json-connection.test.ts": 24821,
+      "src/main/claude/claude-streamed-text-checkpoints.test.ts": 41,
+      "src/main/claude/claude-structured-applied-options.test.ts": 472,
+      "src/main/claude/claude-structured-auth-parity.test.ts": 638,
+      "src/main/claude/claude-structured-child-work-captures.test.ts": 755,
+      "src/main/claude/claude-structured-child-work-producer.test.ts": 835,
+      "src/main/claude/claude-structured-compaction.test.ts": 382,
+      "src/main/claude/claude-structured-content-parts.test.ts": 124,
+      "src/main/claude/claude-structured-control-actions.test.ts": 443,
+      "src/main/claude/claude-structured-dispatch-admission.test.ts": 405,
+      "src/main/claude/claude-structured-dispatch-boundary.test.ts": 459,
+      "src/main/claude/claude-structured-dispatch-content.test.ts": 46,
+      "src/main/claude/claude-structured-dispatch-queue-boundary.test.ts": 473,
+      "src/main/claude/claude-structured-dispatch.test.ts": 1776,
+      "src/main/claude/claude-structured-effort-reporting.test.ts": 496,
+      "src/main/claude/claude-structured-history-window.test.ts": 211,
+      "src/main/claude/claude-structured-inbound-control.test.ts": 78,
+      "src/main/claude/claude-structured-journal-prompt-retry.test.ts": 157,
+      "src/main/claude/claude-structured-journal-translation-background-tasks.test.ts": 346,
+      "src/main/claude/claude-structured-journal-translation-context-usage.test.ts": 417,
+      "src/main/claude/claude-structured-journal-translation-subagents.test.ts": 589,
+      "src/main/claude/claude-structured-journal-translation-turn-timing.test.ts": 524,
+      "src/main/claude/claude-structured-journal-translation.plan.test.ts": 87,
+      "src/main/claude/claude-structured-journal-translation.test.ts": 369,
+      "src/main/claude/claude-structured-launch-resolution.test.ts": 396,
+      "src/main/claude/claude-structured-location-support.test.ts": 65,
+      "src/main/claude/claude-structured-model-confirmation.test.ts": 332,
+      "src/main/claude/claude-structured-model-preflight.test.ts": 125,
+      "src/main/claude/claude-structured-option-confirmation.test.ts": 379,
+      "src/main/claude/claude-structured-options-context-window.test.ts": 452,
+      "src/main/claude/claude-structured-options.test.ts": 296,
+      "src/main/claude/claude-structured-owner-identity.test.ts": 64,
+      "src/main/claude/claude-structured-permission-mode.test.ts": 57,
+      "src/main/claude/claude-structured-prompt-items.test.ts": 157,
+      "src/main/claude/claude-structured-prompt-ownership.test.ts": 592,
+      "src/main/claude/claude-structured-provider-fallback.test.ts": 338,
+      "src/main/claude/claude-structured-real-cli.test.ts": 257,
+      "src/main/claude/claude-structured-resume-point.test.ts": 426,
+      "src/main/claude/claude-structured-session-acquisition-processless.test.ts": 471,
+      "src/main/claude/claude-structured-session-adapter-turns.test.ts": 333,
+      "src/main/claude/claude-structured-session-adapter.test.ts": 1001,
+      "src/main/claude/claude-structured-session-close.test.ts": 504,
+      "src/main/claude/claude-structured-session-commands.test.ts": 263,
+      "src/main/claude/claude-structured-session-reading-control.test.ts": 446,
+      "src/main/claude/claude-structured-session-recovery.test.ts": 282,
+      "src/main/claude/claude-structured-session-startup.test.ts": 309,
+      "src/main/claude/claude-structured-turn-resume-point.test.ts": 390,
+      "src/main/claude/claude-subagent-group-row.test.ts": 37,
+      "src/main/claude/claude-subagent-id-aliases.test.ts": 45,
+      "src/main/claude/claude-subagent-roster.test.ts": 105,
+      "src/main/claude/claude-subagent-task-frames.test.ts": 55,
+      "src/main/claude/claude-transcript-branch-graph.test.ts": 60,
+      "src/main/claude/claude-transcript-branch-streaming.test.ts": 224,
+      "src/main/claude/claude-transcript-entry-uuid.test.ts": 36,
+      "src/main/claude/claude-transcript-marker-branch-proof.test.ts": 86,
       "src/main/claude/claude-transcript-rewind-proof.test.ts": 56,
-      "src/main/claude/claude-turn-outcome.test.ts": 124,
-      "src/main/claude/claude-turn-ownership.test.ts": 3519,
-      "src/main/claude/claude-turn-resumption.test.ts": 102,
-      "src/main/claude/compact-status-registration.test.ts": 191,
-      "src/main/claude/hook-service.test.ts": 372,
-      "src/main/claude/statusline-script.test.ts": 231,
-      "src/main/cli/appimage-extracted-root.test.ts": 162,
-      "src/main/cli/appimage-extraction-pruning.test.ts": 104,
-      "src/main/cli/appimage-payload-removal.reentrancy.test.ts": 39,
+      "src/main/claude/claude-turn-outcome.test.ts": 121,
+      "src/main/claude/claude-turn-ownership.test.ts": 3385,
+      "src/main/claude/claude-turn-resumption.test.ts": 185,
+      "src/main/claude/compact-status-registration.test.ts": 175,
+      "src/main/claude/hook-service.test.ts": 401,
+      "src/main/claude/statusline-script.test.ts": 207,
+      "src/main/cli/appimage-extracted-root.test.ts": 198,
+      "src/main/cli/appimage-extraction-pruning.test.ts": 90,
+      "src/main/cli/appimage-payload-removal.reentrancy.test.ts": 49,
       "src/main/cli/appimage-payload-removal.test.ts": 66,
-      "src/main/cli/appimage-registration-lock.test.ts": 63,
-      "src/main/cli/appimage-stable-launcher.test.ts": 264,
-      "src/main/cli/cli-command-installation-races.test.ts": 189,
-      "src/main/cli/cli-command-privileged-transaction.test.ts": 112,
-      "src/main/cli/cli-installer-appimage-ownership.test.ts": 225,
-      "src/main/cli/cli-installer-appimage-removal.test.ts": 283,
-      "src/main/cli/cli-installer-command-conflicts.test.ts": 132,
-      "src/main/cli/cli-installer-macos-command-path.test.ts": 269,
-      "src/main/cli/cli-installer-windows-path.test.ts": 202,
-      "src/main/cli/cli-installer.test.ts": 386,
-      "src/main/cli/cli-privileged-processes.test.ts": 59,
-      "src/main/cli/keyed-promise-queue.test.ts": 39,
-      "src/main/cli/legacy-appimage-cli-wrapper.test.ts": 51,
-      "src/main/cli/linux-bare-orca-dispatcher.test.ts": 145,
-      "src/main/cli/linux-terminal-orca-cli-shim.test.ts": 161,
-      "src/main/cli/native-cli-powershell-argv-boundary.test.ts": 65,
-      "src/main/cli/orca-cli-child-path.test.ts": 81,
-      "src/main/cli/packaged-cli-assets.test.ts": 840,
-      "src/main/cli/windows-launcher-asset.test.ts": 36,
-      "src/main/cli/windows-user-path-registry.test.ts": 51,
-      "src/main/cli/wsl-cli-installer.test.ts": 367,
-      "src/main/cli/wsl-cli-powershell-boundary.test.ts": 116,
-      "src/main/cli/wsl-cli-registration-operation.test.ts": 105,
-      "src/main/cli/wsl-cli-registration-reconciliation.test.ts": 252,
-      "src/main/cli/wsl-cli-registration-registry.test.ts": 167,
-      "src/main/cli/wsl-managed-cli.test.ts": 74,
-      "src/main/cli/wsl-managed-cli.wsl.test.ts": 75,
-      "src/main/codex-accounts/async-file-rename.test.ts": 1038,
-      "src/main/codex-accounts/codex-account-identity-api-key-guard.test.ts": 58,
-      "src/main/codex-accounts/codex-auth-workspace-identity.test.ts": 58,
-      "src/main/codex-accounts/codex-config-mirror.test.ts": 301,
-      "src/main/codex-accounts/codex-credential-absence-grace.test.ts": 155,
-      "src/main/codex-accounts/codex-login-auth-url.test.ts": 51,
-      "src/main/codex-accounts/codex-reset-credit-ledger.test.ts": 264,
-      "src/main/codex-accounts/codex-windows-interactive-login.test.ts": 335,
-      "src/main/codex-accounts/fs-utils.test.ts": 155,
-      "src/main/codex-accounts/host-codex-managed-home-ownership.test.ts": 58,
-      "src/main/codex-accounts/legacy-shared-auth-migration.test.ts": 128,
-      "src/main/codex-accounts/legacy-shared-config-compatibility.test.ts": 103,
-      "src/main/codex-accounts/legacy-wsl-runtime-auth-drain-apply-script.test.ts": 17930,
-      "src/main/codex-accounts/legacy-wsl-runtime-auth-drain-rollback-script.test.ts": 633,
-      "src/main/codex-accounts/legacy-wsl-runtime-auth-drain.test.ts": 106,
-      "src/main/codex-accounts/managed-codex-auth-readiness.test.ts": 79,
-      "src/main/codex-accounts/runtime-home-legacy-migration.test.ts": 700,
-      "src/main/codex-accounts/runtime-home-managed-auth-recovery.test.ts": 603,
-      "src/main/codex-accounts/runtime-home-mirrored-status-home.test.ts": 329,
-      "src/main/codex-accounts/runtime-home-per-account-homes.test.ts": 528,
-      "src/main/codex-accounts/runtime-home-read-only-launch-resolution.test.ts": 445,
-      "src/main/codex-accounts/runtime-home-real-home-lane-routing.test.ts": 604,
-      "src/main/codex-accounts/runtime-home-resume-selection-gate.test.ts": 374,
-      "src/main/codex-accounts/runtime-home-retained-auth-provenance.test.ts": 1238,
-      "src/main/codex-accounts/runtime-home-service-per-account-migration.test.ts": 489,
-      "src/main/codex-accounts/runtime-home-session-migration-pass.test.ts": 585,
-      "src/main/codex-accounts/runtime-home-system-default-mirror-readback.test.ts": 995,
-      "src/main/codex-accounts/runtime-home-system-default-snapshot.test.ts": 763,
-      "src/main/codex-accounts/runtime-home-system-resource-materialization.test.ts": 504,
-      "src/main/codex-accounts/runtime-home-windows-profile-ownership.test.ts": 143,
-      "src/main/codex-accounts/runtime-home-wsl-managed-accounts.test.ts": 967,
-      "src/main/codex-accounts/runtime-home-wsl-session-bridge.test.ts": 904,
-      "src/main/codex-accounts/runtime-home-wsl-system-default.test.ts": 469,
-      "src/main/codex-accounts/runtime-selection.test.ts": 340,
-      "src/main/codex-accounts/service-abandoned-login-supersede.test.ts": 717,
-      "src/main/codex-accounts/service-account-add-login.test.ts": 849,
-      "src/main/codex-accounts/service-account-selection-and-removal.test.ts": 497,
-      "src/main/codex-accounts/service-add-account-from-home.test.ts": 568,
-      "src/main/codex-accounts/service-login-process-teardown.test.ts": 461,
-      "src/main/codex-accounts/service-managed-home-removal-retries.test.ts": 280,
-      "src/main/codex-accounts/service-quota-refresh-decoupling.test.ts": 306,
-      "src/main/codex-accounts/service-reauthenticate-activation.test.ts": 412,
-      "src/main/codex-accounts/service-reset-credit-durability.test.ts": 1007,
-      "src/main/codex-accounts/service-reset-credit-home-ownership.test.ts": 576,
-      "src/main/codex-accounts/service-reset-credit-target-routing.test.ts": 493,
-      "src/main/codex-accounts/service-system-default-identity.test.ts": 409,
-      "src/main/codex-accounts/service-wsl-accounts.test.ts": 570,
-      "src/main/codex-accounts/service.test.ts": 817,
-      "src/main/codex-accounts/sta-4422-transient-ownership-error.test.ts": 588,
-      "src/main/codex-accounts/sta-4734-login-rollback-deletes-authenticated-home.test.ts": 591,
-      "src/main/codex-accounts/sta-4735-unreadable-host-lane-writes.test.ts": 383,
-      "src/main/codex-accounts/wsl-codex-command.test.ts": 63,
-      "src/main/codex-cli/codex-home-process-lock.test.ts": 44,
-      "src/main/codex-cli/command.test.ts": 77,
-      "src/main/codex-usage/codex-rollout-resume-state.test.ts": 93,
-      "src/main/codex-usage/codex-usage-cost-estimate.test.ts": 142,
-      "src/main/codex-usage/codex-usage-long-context-billing.test.ts": 209,
-      "src/main/codex-usage/scanner-attribution-memo.test.ts": 275,
-      "src/main/codex-usage/scanner-file-identity.test.ts": 245,
-      "src/main/codex-usage/scanner-incremental-append.test.ts": 745,
-      "src/main/codex-usage/scanner-large-directory.test.ts": 1101,
-      "src/main/codex-usage/scanner-paths.test.ts": 319,
-      "src/main/codex-usage/scanner.test.ts": 169,
-      "src/main/codex-usage/store-automation-usage.test.ts": 120,
-      "src/main/codex-usage/store-model-pricing.test.ts": 129,
-      "src/main/codex-usage/store-orca-scope.test.ts": 193,
-      "src/main/codex-usage/store-persistence.test.ts": 170,
-      "src/main/codex-usage/store-snapshot.benchmark.test.ts": 241,
-      "src/main/codex/codex-account-session-bridge.test.ts": 98,
-      "src/main/codex/codex-ai-vault-session-resume.test.ts": 108,
-      "src/main/codex/codex-app-server-capability-cache.test.ts": 61,
-      "src/main/codex/codex-app-server-client.test.ts": 1554,
-      "src/main/codex/codex-app-server-connection.test.ts": 5157,
-      "src/main/codex/codex-app-server-posix-supervisor.test.ts": 41,
-      "src/main/codex/codex-app-server-process-teardown.test.ts": 134,
-      "src/main/codex/codex-app-server-session.test.ts": 135,
-      "src/main/codex/codex-app-server-teardown.integration.test.ts": 18066,
-      "src/main/codex/codex-background-command-tracker.test.ts": 300,
-      "src/main/codex/codex-background-task-tracker.test.ts": 137,
-      "src/main/codex/codex-config-mirror-mcp-ownership.test.ts": 147,
-      "src/main/codex/codex-config-mirror.test.ts": 496,
-      "src/main/codex/codex-config-settings-removal.test.ts": 45,
-      "src/main/codex/codex-configured-launch-defaults.test.ts": 77,
-      "src/main/codex/codex-daemon-socket-path-guard.test.ts": 130,
-      "src/main/codex/codex-goal-journal-rows.test.ts": 67,
-      "src/main/codex/codex-home-paths.test.ts": 166,
-      "src/main/codex/codex-hook-legacy-profile-block.test.ts": 157,
-      "src/main/codex/codex-hook-trust-grant.test.ts": 1266,
-      "src/main/codex/codex-hooks-read-denial-followup.test.ts": 168,
-      "src/main/codex/codex-index-heal-binary-contract.test.ts": 61,
-      "src/main/codex/codex-legacy-session-resume.test.ts": 164,
-      "src/main/codex/codex-model-catalog-probe.test.ts": 3181,
-      "src/main/codex/codex-model-provider-config.test.ts": 66,
-      "src/main/codex/codex-notice-item-translation.test.ts": 212,
-      "src/main/codex/codex-pane-account-registry-mutations.test.ts": 35,
-      "src/main/codex/codex-pane-launch-account.test.ts": 46,
-      "src/main/codex/codex-persistent-command-retention.test.ts": 456,
-      "src/main/codex/codex-pinned-rollout-proof.test.ts": 71,
-      "src/main/codex/codex-prompt-registry-retention.test.ts": 402,
-      "src/main/codex/codex-real-home-hook-install.test.ts": 305,
-      "src/main/codex/codex-real-home-path.test.ts": 48,
-      "src/main/codex/codex-requested-close-turn-timing.test.ts": 200,
-      "src/main/codex/codex-rollout-session-meta.test.ts": 83,
-      "src/main/codex/codex-server-request-disposition.test.ts": 175,
-      "src/main/codex/codex-session-backfill-marker.test.ts": 111,
-      "src/main/codex/codex-session-backfill-scan-dates.test.ts": 69,
-      "src/main/codex/codex-session-backfill.test.ts": 983,
-      "src/main/codex/codex-session-bridge.test.ts": 110,
-      "src/main/codex/codex-session-index-heal-state.test.ts": 525,
-      "src/main/codex/codex-session-index-heal.test.ts": 1739,
-      "src/main/codex/codex-session-migration-recent-exits.test.ts": 48,
-      "src/main/codex/codex-session-migration-scheduler.test.ts": 416,
-      "src/main/codex/codex-session-resume-home.test.ts": 75,
-      "src/main/codex/codex-session-resume-preparation.test.ts": 54,
-      "src/main/codex/codex-session-resume-windows.test.ts": 67,
-      "src/main/codex/codex-session-resume-wrong-account.test.ts": 116,
-      "src/main/codex/codex-session-source-home.test.ts": 49,
-      "src/main/codex/codex-stale-pane-accounts.test.ts": 166,
-      "src/main/codex/codex-state-db-backfill-recovery.test.ts": 260,
-      "src/main/codex/codex-state-db.test.ts": 86,
-      "src/main/codex/codex-structured-acquisition-exit-proof.test.ts": 421,
-      "src/main/codex/codex-structured-child-environment.test.ts": 223,
-      "src/main/codex/codex-structured-dispatch-admission.test.ts": 473,
-      "src/main/codex/codex-structured-dispatch-boundary.test.ts": 342,
-      "src/main/codex/codex-structured-dispatch-echo.test.ts": 39,
-      "src/main/codex/codex-structured-fast-mode.test.ts": 424,
-      "src/main/codex/codex-structured-item-translation.test.ts": 279,
-      "src/main/codex/codex-structured-journal-compactions.test.ts": 245,
-      "src/main/codex/codex-structured-journal-goal-admission.test.ts": 284,
-      "src/main/codex/codex-structured-journal-goal-resume.test.ts": 416,
-      "src/main/codex/codex-structured-journal-goal-revision.test.ts": 283,
-      "src/main/codex/codex-structured-journal-goal-rows.test.ts": 211,
-      "src/main/codex/codex-structured-journal-subagent-readers.test.ts": 375,
-      "src/main/codex/codex-structured-journal-translation-settlement.test.ts": 1027,
-      "src/main/codex/codex-structured-journal-translation-streams.test.ts": 339,
-      "src/main/codex/codex-structured-journal-translation-subagent-linkage.test.ts": 179,
-      "src/main/codex/codex-structured-journal-translation-subagents.test.ts": 279,
-      "src/main/codex/codex-structured-journal-translation-turn-lifecycle.test.ts": 362,
-      "src/main/codex/codex-structured-journal-translation-turn-state.test.ts": 72,
-      "src/main/codex/codex-structured-journal-translation.test.ts": 314,
-      "src/main/codex/codex-structured-launch-resolution.test.ts": 135,
-      "src/main/codex/codex-structured-location-support.test.ts": 67,
-      "src/main/codex/codex-structured-owner-identity.test.ts": 69,
-      "src/main/codex/codex-structured-permission-policy.test.ts": 60,
-      "src/main/codex/codex-structured-prompt-items.test.ts": 150,
-      "src/main/codex/codex-structured-prompt-ownership.test.ts": 542,
-      "src/main/codex/codex-structured-prompt-replies.test.ts": 129,
-      "src/main/codex/codex-structured-rewind.test.ts": 294,
-      "src/main/codex/codex-structured-session-adapter-lifecycle.test.ts": 409,
-      "src/main/codex/codex-structured-session-adapter.test.ts": 428,
-      "src/main/codex/codex-structured-session-background-tasks.test.ts": 382,
-      "src/main/codex/codex-structured-session-cancel.test.ts": 545,
-      "src/main/codex/codex-structured-session-close.test.ts": 435,
-      "src/main/codex/codex-structured-session-options-catalog.test.ts": 358,
-      "src/main/codex/codex-structured-session-options.test.ts": 270,
-      "src/main/codex/codex-structured-session-shutdown.test.ts": 454,
-      "src/main/codex/codex-structured-thread-goal.test.ts": 132,
-      "src/main/codex/codex-structured-thread-open.test.ts": 258,
-      "src/main/codex/codex-structured-turn-processes.integration.test.ts": 250,
-      "src/main/codex/codex-subagent-execution-projection.test.ts": 262,
-      "src/main/codex/codex-subagent-executions.test.ts": 75,
-      "src/main/codex/codex-subagent-roster.test.ts": 221,
-      "src/main/codex/codex-tool-identity-translation.test.ts": 75,
-      "src/main/codex/codex-trust-config-concurrent-launch.test.ts": 211,
-      "src/main/codex/codex-trust-config-mutation-queue.test.ts": 42,
-      "src/main/codex/codex-trust-config-rollback.test.ts": 69,
-      "src/main/codex/codex-trust-grant-host.test.ts": 111,
-      "src/main/codex/codex-trust-grant-ledger.test.ts": 83,
-      "src/main/codex/codex-trust-grant-main-thread-boundary.test.ts": 69,
-      "src/main/codex/codex-trust-grant-telemetry.test.ts": 91,
-      "src/main/codex/codex-turn-ordinals.test.ts": 89,
-      "src/main/codex/codex-user-hook-trust-rebase-client.test.ts": 93,
-      "src/main/codex/codex-user-hook-trust-rebase.test.ts": 153,
+      "src/main/cli/appimage-registration-lock.test.ts": 57,
+      "src/main/cli/appimage-stable-launcher.test.ts": 231,
+      "src/main/cli/cli-command-installation-races.test.ts": 187,
+      "src/main/cli/cli-command-privileged-transaction.test.ts": 133,
+      "src/main/cli/cli-installer-appimage-ownership.test.ts": 206,
+      "src/main/cli/cli-installer-appimage-removal.test.ts": 281,
+      "src/main/cli/cli-installer-command-conflicts.test.ts": 230,
+      "src/main/cli/cli-installer-macos-command-path.test.ts": 250,
+      "src/main/cli/cli-installer-windows-path.test.ts": 148,
+      "src/main/cli/cli-installer.test.ts": 323,
+      "src/main/cli/cli-privileged-processes.test.ts": 51,
+      "src/main/cli/keyed-promise-queue.test.ts": 33,
+      "src/main/cli/legacy-appimage-cli-wrapper.test.ts": 57,
+      "src/main/cli/linux-bare-orca-dispatcher.test.ts": 173,
+      "src/main/cli/linux-terminal-orca-cli-shim.test.ts": 154,
+      "src/main/cli/native-cli-powershell-argv-boundary.test.ts": 54,
+      "src/main/cli/orca-cli-child-path.test.ts": 71,
+      "src/main/cli/packaged-cli-assets.test.ts": 863,
+      "src/main/cli/windows-launcher-asset.test.ts": 42,
+      "src/main/cli/windows-user-path-registry.test.ts": 63,
+      "src/main/cli/wsl-cli-installer.test.ts": 298,
+      "src/main/cli/wsl-cli-powershell-boundary.test.ts": 104,
+      "src/main/cli/wsl-cli-registration-operation.test.ts": 90,
+      "src/main/cli/wsl-cli-registration-reconciliation.test.ts": 264,
+      "src/main/cli/wsl-cli-registration-registry.test.ts": 174,
+      "src/main/cli/wsl-managed-cli.test.ts": 51,
+      "src/main/cli/wsl-managed-cli.wsl.test.ts": 93,
+      "src/main/codex-accounts/async-file-rename.test.ts": 1055,
+      "src/main/codex-accounts/codex-account-identity-api-key-guard.test.ts": 49,
+      "src/main/codex-accounts/codex-auth-workspace-identity.test.ts": 57,
+      "src/main/codex-accounts/codex-config-mirror.test.ts": 218,
+      "src/main/codex-accounts/codex-credential-absence-grace.test.ts": 138,
+      "src/main/codex-accounts/codex-login-auth-url.test.ts": 49,
+      "src/main/codex-accounts/codex-reset-credit-ledger.test.ts": 274,
+      "src/main/codex-accounts/codex-windows-interactive-login.test.ts": 343,
+      "src/main/codex-accounts/fs-utils.test.ts": 174,
+      "src/main/codex-accounts/host-codex-managed-home-ownership.test.ts": 40,
+      "src/main/codex-accounts/legacy-shared-auth-migration.test.ts": 121,
+      "src/main/codex-accounts/legacy-shared-config-compatibility.test.ts": 124,
+      "src/main/codex-accounts/legacy-wsl-runtime-auth-drain-apply-script.test.ts": 17191,
+      "src/main/codex-accounts/legacy-wsl-runtime-auth-drain-rollback-script.test.ts": 622,
+      "src/main/codex-accounts/legacy-wsl-runtime-auth-drain.test.ts": 77,
+      "src/main/codex-accounts/managed-codex-auth-readiness.test.ts": 76,
+      "src/main/codex-accounts/runtime-home-legacy-migration.test.ts": 608,
+      "src/main/codex-accounts/runtime-home-managed-auth-recovery.test.ts": 326,
+      "src/main/codex-accounts/runtime-home-mirrored-status-home.test.ts": 224,
+      "src/main/codex-accounts/runtime-home-per-account-homes.test.ts": 722,
+      "src/main/codex-accounts/runtime-home-read-only-launch-resolution.test.ts": 848,
+      "src/main/codex-accounts/runtime-home-real-home-lane-routing.test.ts": 445,
+      "src/main/codex-accounts/runtime-home-resume-selection-gate.test.ts": 295,
+      "src/main/codex-accounts/runtime-home-retained-auth-provenance.test.ts": 1201,
+      "src/main/codex-accounts/runtime-home-service-per-account-migration.test.ts": 482,
+      "src/main/codex-accounts/runtime-home-session-migration-pass.test.ts": 408,
+      "src/main/codex-accounts/runtime-home-system-default-mirror-readback.test.ts": 1006,
+      "src/main/codex-accounts/runtime-home-system-default-snapshot.test.ts": 740,
+      "src/main/codex-accounts/runtime-home-system-resource-materialization.test.ts": 490,
+      "src/main/codex-accounts/runtime-home-windows-profile-ownership.test.ts": 136,
+      "src/main/codex-accounts/runtime-home-wsl-managed-accounts.test.ts": 1054,
+      "src/main/codex-accounts/runtime-home-wsl-session-bridge.test.ts": 890,
+      "src/main/codex-accounts/runtime-home-wsl-system-default.test.ts": 503,
+      "src/main/codex-accounts/runtime-selection.test.ts": 73,
+      "src/main/codex-accounts/service-abandoned-login-supersede.test.ts": 861,
+      "src/main/codex-accounts/service-account-add-login.test.ts": 509,
+      "src/main/codex-accounts/service-account-selection-and-removal.test.ts": 846,
+      "src/main/codex-accounts/service-add-account-from-home.test.ts": 444,
+      "src/main/codex-accounts/service-login-process-teardown.test.ts": 426,
+      "src/main/codex-accounts/service-managed-home-removal-retries.test.ts": 186,
+      "src/main/codex-accounts/service-quota-refresh-decoupling.test.ts": 280,
+      "src/main/codex-accounts/service-reauthenticate-activation.test.ts": 268,
+      "src/main/codex-accounts/service-reset-credit-durability.test.ts": 703,
+      "src/main/codex-accounts/service-reset-credit-home-ownership.test.ts": 473,
+      "src/main/codex-accounts/service-reset-credit-target-routing.test.ts": 580,
+      "src/main/codex-accounts/service-system-default-identity.test.ts": 490,
+      "src/main/codex-accounts/service-wsl-accounts.test.ts": 660,
+      "src/main/codex-accounts/service.test.ts": 260,
+      "src/main/codex-accounts/sta-4422-transient-ownership-error.test.ts": 409,
+      "src/main/codex-accounts/sta-4734-login-rollback-deletes-authenticated-home.test.ts": 292,
+      "src/main/codex-accounts/sta-4735-unreadable-host-lane-writes.test.ts": 392,
+      "src/main/codex-accounts/wsl-codex-command.test.ts": 40,
+      "src/main/codex-cli/codex-home-process-lock.test.ts": 54,
+      "src/main/codex-cli/command.test.ts": 88,
+      "src/main/codex-usage/codex-rollout-resume-state.test.ts": 67,
+      "src/main/codex-usage/codex-usage-cost-estimate.test.ts": 46,
+      "src/main/codex-usage/codex-usage-long-context-billing.test.ts": 242,
+      "src/main/codex-usage/scanner-attribution-memo.test.ts": 170,
+      "src/main/codex-usage/scanner-file-identity.test.ts": 211,
+      "src/main/codex-usage/scanner-incremental-append.test.ts": 1002,
+      "src/main/codex-usage/scanner-large-directory.test.ts": 1168,
+      "src/main/codex-usage/scanner-paths.test.ts": 340,
+      "src/main/codex-usage/scanner.test.ts": 158,
+      "src/main/codex-usage/store-automation-usage.test.ts": 117,
+      "src/main/codex-usage/store-model-pricing.test.ts": 215,
+      "src/main/codex-usage/store-orca-scope.test.ts": 185,
+      "src/main/codex-usage/store-persistence.test.ts": 125,
+      "src/main/codex-usage/store-snapshot.benchmark.test.ts": 310,
+      "src/main/codex/codex-account-session-bridge.test.ts": 77,
+      "src/main/codex/codex-ai-vault-session-resume.test.ts": 127,
+      "src/main/codex/codex-app-server-capability-cache.test.ts": 64,
+      "src/main/codex/codex-app-server-client.test.ts": 1502,
+      "src/main/codex/codex-app-server-connection.test.ts": 5199,
+      "src/main/codex/codex-app-server-posix-supervisor.test.ts": 38,
+      "src/main/codex/codex-app-server-process-teardown.test.ts": 71,
+      "src/main/codex/codex-app-server-session.test.ts": 129,
+      "src/main/codex/codex-app-server-teardown.integration.test.ts": 21677,
+      "src/main/codex/codex-background-command-tracker.test.ts": 221,
+      "src/main/codex/codex-background-task-tracker.test.ts": 163,
+      "src/main/codex/codex-config-mirror-mcp-ownership.test.ts": 138,
+      "src/main/codex/codex-config-mirror.test.ts": 181,
+      "src/main/codex/codex-config-settings-removal.test.ts": 49,
+      "src/main/codex/codex-configured-launch-defaults.test.ts": 30,
+      "src/main/codex/codex-daemon-socket-path-guard.test.ts": 153,
+      "src/main/codex/codex-goal-journal-rows.test.ts": 90,
+      "src/main/codex/codex-home-paths.test.ts": 76,
+      "src/main/codex/codex-hook-legacy-profile-block.test.ts": 132,
+      "src/main/codex/codex-hook-trust-grant.test.ts": 1397,
+      "src/main/codex/codex-hooks-read-denial-followup.test.ts": 179,
+      "src/main/codex/codex-index-heal-binary-contract.test.ts": 49,
+      "src/main/codex/codex-legacy-session-resume.test.ts": 208,
+      "src/main/codex/codex-model-catalog-probe.test.ts": 3179,
+      "src/main/codex/codex-model-provider-config.test.ts": 32,
+      "src/main/codex/codex-notice-item-translation.test.ts": 226,
+      "src/main/codex/codex-pane-account-registry-mutations.test.ts": 50,
+      "src/main/codex/codex-pane-launch-account.test.ts": 64,
+      "src/main/codex/codex-persistent-command-retention.test.ts": 276,
+      "src/main/codex/codex-pinned-rollout-proof.test.ts": 53,
+      "src/main/codex/codex-prompt-registry-retention.test.ts": 376,
+      "src/main/codex/codex-real-home-hook-install.test.ts": 339,
+      "src/main/codex/codex-real-home-path.test.ts": 57,
+      "src/main/codex/codex-requested-close-turn-timing.test.ts": 134,
+      "src/main/codex/codex-rollout-session-meta.test.ts": 81,
+      "src/main/codex/codex-server-request-disposition.test.ts": 112,
+      "src/main/codex/codex-session-backfill-marker.test.ts": 89,
+      "src/main/codex/codex-session-backfill-scan-dates.test.ts": 83,
+      "src/main/codex/codex-session-backfill.test.ts": 647,
+      "src/main/codex/codex-session-bridge.test.ts": 112,
+      "src/main/codex/codex-session-index-heal-state.test.ts": 345,
+      "src/main/codex/codex-session-index-heal.test.ts": 1408,
+      "src/main/codex/codex-session-migration-recent-exits.test.ts": 61,
+      "src/main/codex/codex-session-migration-scheduler.test.ts": 401,
+      "src/main/codex/codex-session-resume-home.test.ts": 66,
+      "src/main/codex/codex-session-resume-preparation.test.ts": 65,
+      "src/main/codex/codex-session-resume-windows.test.ts": 59,
+      "src/main/codex/codex-session-resume-wrong-account.test.ts": 60,
+      "src/main/codex/codex-session-source-home.test.ts": 30,
+      "src/main/codex/codex-stale-pane-accounts.test.ts": 130,
+      "src/main/codex/codex-state-db-backfill-recovery.test.ts": 307,
+      "src/main/codex/codex-state-db.test.ts": 70,
+      "src/main/codex/codex-structured-acquisition-exit-proof.test.ts": 417,
+      "src/main/codex/codex-structured-child-environment.test.ts": 134,
+      "src/main/codex/codex-structured-dispatch-admission.test.ts": 507,
+      "src/main/codex/codex-structured-dispatch-boundary.test.ts": 414,
+      "src/main/codex/codex-structured-dispatch-echo.test.ts": 57,
+      "src/main/codex/codex-structured-fast-mode.test.ts": 320,
+      "src/main/codex/codex-structured-item-translation.test.ts": 161,
+      "src/main/codex/codex-structured-journal-compactions.test.ts": 267,
+      "src/main/codex/codex-structured-journal-goal-admission.test.ts": 258,
+      "src/main/codex/codex-structured-journal-goal-resume.test.ts": 327,
+      "src/main/codex/codex-structured-journal-goal-revision.test.ts": 242,
+      "src/main/codex/codex-structured-journal-goal-rows.test.ts": 107,
+      "src/main/codex/codex-structured-journal-subagent-readers.test.ts": 292,
+      "src/main/codex/codex-structured-journal-translation-settlement.test.ts": 1118,
+      "src/main/codex/codex-structured-journal-translation-streams.test.ts": 275,
+      "src/main/codex/codex-structured-journal-translation-subagent-linkage.test.ts": 245,
+      "src/main/codex/codex-structured-journal-translation-subagents.test.ts": 186,
+      "src/main/codex/codex-structured-journal-translation-turn-lifecycle.test.ts": 398,
+      "src/main/codex/codex-structured-journal-translation-turn-state.test.ts": 35,
+      "src/main/codex/codex-structured-journal-translation.test.ts": 282,
+      "src/main/codex/codex-structured-launch-resolution.test.ts": 102,
+      "src/main/codex/codex-structured-location-support.test.ts": 46,
+      "src/main/codex/codex-structured-owner-identity.test.ts": 45,
+      "src/main/codex/codex-structured-permission-policy.test.ts": 63,
+      "src/main/codex/codex-structured-prompt-items.test.ts": 224,
+      "src/main/codex/codex-structured-prompt-ownership.test.ts": 512,
+      "src/main/codex/codex-structured-prompt-replies.test.ts": 165,
+      "src/main/codex/codex-structured-rewind.test.ts": 306,
+      "src/main/codex/codex-structured-session-adapter-lifecycle.test.ts": 367,
+      "src/main/codex/codex-structured-session-adapter.test.ts": 318,
+      "src/main/codex/codex-structured-session-background-tasks.test.ts": 502,
+      "src/main/codex/codex-structured-session-cancel.test.ts": 456,
+      "src/main/codex/codex-structured-session-close.test.ts": 420,
+      "src/main/codex/codex-structured-session-options-catalog.test.ts": 246,
+      "src/main/codex/codex-structured-session-options.test.ts": 356,
+      "src/main/codex/codex-structured-session-shutdown.test.ts": 471,
+      "src/main/codex/codex-structured-thread-goal.test.ts": 73,
+      "src/main/codex/codex-structured-thread-open.test.ts": 300,
+      "src/main/codex/codex-structured-turn-processes.integration.test.ts": 194,
+      "src/main/codex/codex-subagent-execution-projection.test.ts": 202,
+      "src/main/codex/codex-subagent-executions.test.ts": 71,
+      "src/main/codex/codex-subagent-roster.test.ts": 118,
+      "src/main/codex/codex-tool-identity-translation.test.ts": 117,
+      "src/main/codex/codex-trust-config-concurrent-launch.test.ts": 225,
+      "src/main/codex/codex-trust-config-mutation-queue.test.ts": 45,
+      "src/main/codex/codex-trust-config-rollback.test.ts": 76,
+      "src/main/codex/codex-trust-grant-host.test.ts": 94,
+      "src/main/codex/codex-trust-grant-ledger.test.ts": 54,
+      "src/main/codex/codex-trust-grant-main-thread-boundary.test.ts": 43,
+      "src/main/codex/codex-trust-grant-telemetry.test.ts": 70,
+      "src/main/codex/codex-turn-ordinals.test.ts": 96,
+      "src/main/codex/codex-user-hook-trust-rebase-client.test.ts": 104,
+      "src/main/codex/codex-user-hook-trust-rebase.test.ts": 127,
       "src/main/codex/codex-wsl-hook-install-plan.test.ts": 51,
-      "src/main/codex/config-plugin-registration-promotion.test.ts": 346,
-      "src/main/codex/config-settings-baseline-upgrade.test.ts": 158,
-      "src/main/codex/config-settings-promotion.test.ts": 304,
-      "src/main/codex/config-sync-stall.test.ts": 428,
-      "src/main/codex/config-toml-hook-trust-scaling.test.ts": 158,
-      "src/main/codex/config-toml-mcp-servers.test.ts": 54,
-      "src/main/codex/config-toml-trust-api-parity.test.ts": 71,
-      "src/main/codex/config-toml-trust-hash.test.ts": 57,
-      "src/main/codex/config-toml-trust-hook-read.test.ts": 84,
-      "src/main/codex/config-toml-trust-hook-removal.test.ts": 120,
-      "src/main/codex/config-toml-trust-hook-upsert.test.ts": 119,
-      "src/main/codex/config-toml-trust-key.test.ts": 87,
-      "src/main/codex/config-toml-trust-paths.test.ts": 72,
-      "src/main/codex/config-toml-trust-project.test.ts": 126,
-      "src/main/codex/hook-service-concurrent-launch-install.test.ts": 753,
-      "src/main/codex/hook-service-legacy-cleanup.test.ts": 1211,
-      "src/main/codex/hook-service-managed-install.test.ts": 400,
-      "src/main/codex/hook-service-runtime-trust-repair.test.ts": 327,
-      "src/main/codex/hook-service-trust-grant.test.ts": 344,
-      "src/main/codex/hook-service-user-hook-mirroring.test.ts": 522,
-      "src/main/codex/hook-service-wsl-runtime.test.ts": 400,
-      "src/main/codex/hook-trust-promotion.test.ts": 465,
-      "src/main/codex/managed-home-shell-preflight.test.ts": 214,
-      "src/main/codex/retained-codex-hook-state.test.ts": 51,
-      "src/main/codex/sta-4735-hook-trust-provenance-overwrite.test.ts": 100,
-      "src/main/codex/sta-4737-unreadable-is-not-absent.test.ts": 184,
-      "src/main/codex/sta-4823-shared-state-survives-a-failed-read.test.ts": 255,
-      "src/main/codex/windows-hook-command.test.ts": 182,
-      "src/main/codex/windows-hook-upgrade.test.ts": 143,
-      "src/main/codex/wsl-codex-session-bridge.test.ts": 138,
-      "src/main/command-code/hook-service.test.ts": 216,
-      "src/main/computer/computer-action-verification-normalization.test.ts": 36,
-      "src/main/computer/computer-provider-lifecycle.test.ts": 146,
-      "src/main/computer/computer-provider-unavailable-message.test.ts": 57,
-      "src/main/computer/computer-sidecar-diagnostics.test.ts": 25,
-      "src/main/computer/desktop-script-provider-action-errors.test.ts": 183,
-      "src/main/computer/desktop-script-provider-actions.test.ts": 144,
-      "src/main/computer/desktop-script-provider-bridge.test.ts": 65,
-      "src/main/computer/desktop-script-provider-cache-lifecycle.test.ts": 106,
-      "src/main/computer/desktop-script-provider-cache.test.ts": 134,
+      "src/main/codex/config-plugin-registration-promotion.test.ts": 370,
+      "src/main/codex/config-settings-baseline-upgrade.test.ts": 104,
+      "src/main/codex/config-settings-promotion.test.ts": 508,
+      "src/main/codex/config-sync-stall.test.ts": 161,
+      "src/main/codex/config-toml-hook-trust-scaling.test.ts": 126,
+      "src/main/codex/config-toml-mcp-servers.test.ts": 37,
+      "src/main/codex/config-toml-trust-api-parity.test.ts": 91,
+      "src/main/codex/config-toml-trust-hash.test.ts": 44,
+      "src/main/codex/config-toml-trust-hook-read.test.ts": 125,
+      "src/main/codex/config-toml-trust-hook-removal.test.ts": 108,
+      "src/main/codex/config-toml-trust-hook-upsert.test.ts": 163,
+      "src/main/codex/config-toml-trust-key.test.ts": 54,
+      "src/main/codex/config-toml-trust-paths.test.ts": 86,
+      "src/main/codex/config-toml-trust-project.test.ts": 105,
+      "src/main/codex/hook-service-concurrent-launch-install.test.ts": 749,
+      "src/main/codex/hook-service-legacy-cleanup.test.ts": 1004,
+      "src/main/codex/hook-service-managed-install.test.ts": 286,
+      "src/main/codex/hook-service-runtime-trust-repair.test.ts": 330,
+      "src/main/codex/hook-service-trust-grant.test.ts": 355,
+      "src/main/codex/hook-service-user-hook-mirroring.test.ts": 371,
+      "src/main/codex/hook-service-wsl-runtime.test.ts": 389,
+      "src/main/codex/hook-trust-promotion.test.ts": 569,
+      "src/main/codex/managed-home-shell-preflight.test.ts": 161,
+      "src/main/codex/retained-codex-hook-state.test.ts": 41,
+      "src/main/codex/sta-4735-hook-trust-provenance-overwrite.test.ts": 82,
+      "src/main/codex/sta-4737-unreadable-is-not-absent.test.ts": 179,
+      "src/main/codex/sta-4823-shared-state-survives-a-failed-read.test.ts": 226,
+      "src/main/codex/windows-hook-command.test.ts": 161,
+      "src/main/codex/windows-hook-upgrade.test.ts": 122,
+      "src/main/codex/wsl-codex-session-bridge.test.ts": 133,
+      "src/main/command-code/hook-service.test.ts": 407,
+      "src/main/computer/computer-action-verification-normalization.test.ts": 37,
+      "src/main/computer/computer-provider-lifecycle.test.ts": 159,
+      "src/main/computer/computer-provider-unavailable-message.test.ts": 40,
+      "src/main/computer/computer-sidecar-diagnostics.test.ts": 37,
+      "src/main/computer/desktop-script-provider-action-errors.test.ts": 162,
+      "src/main/computer/desktop-script-provider-actions.test.ts": 167,
+      "src/main/computer/desktop-script-provider-bridge.test.ts": 45,
+      "src/main/computer/desktop-script-provider-cache-lifecycle.test.ts": 114,
+      "src/main/computer/desktop-script-provider-cache.test.ts": 191,
       "src/main/computer/desktop-script-provider-client.test.ts": 205,
-      "src/main/computer/desktop-script-provider-errors.test.ts": 216,
-      "src/main/computer/desktop-script-provider-paste-validation.test.ts": 97,
-      "src/main/computer/desktop-script-provider-runtime-host-routing.test.ts": 101,
-      "src/main/computer/desktop-script-runtime-host.test.ts": 286,
-      "src/main/computer/desktop-script-runtime-host.win32.test.ts": 54,
-      "src/main/computer/desktop-script-serve-channel.test.ts": 158,
-      "src/main/computer/macos-computer-use-permission-status.test.ts": 72,
-      "src/main/computer/macos-computer-use-permissions.test.ts": 117,
-      "src/main/computer/macos-native-provider-client.test.ts": 1152,
-      "src/main/computer/macos-native-provider-line-buffer.test.ts": 71,
-      "src/main/computer/macos-native-provider-paste-validation.test.ts": 153,
-      "src/main/computer/macos-native-provider-process-reaping.test.ts": 129,
-      "src/main/computer/macos-native-provider-reaping.integration.test.ts": 4184,
-      "src/main/computer/macos-native-provider-socket.test.ts": 60,
-      "src/main/computer/macos-native-provider-startup-cleanup.test.ts": 88,
-      "src/main/computer/sidecar-client.test.ts": 93,
-      "src/main/computer/sidecar-provider-reaping.integration.test.ts": 470,
-      "src/main/computer/windows-powershell-execution-policy.test.ts": 49,
-      "src/main/copilot/hook-service.test.ts": 199,
-      "src/main/crash-reporting/crash-breadcrumb-renderer-attribution.test.ts": 59,
-      "src/main/crash-reporting/crash-breadcrumb-store-leak.test.ts": 96,
-      "src/main/crash-reporting/crash-breadcrumb-store-orphan-cleanup.test.ts": 116,
-      "src/main/crash-reporting/crash-breadcrumb-store.test.ts": 319,
-      "src/main/crash-reporting/crash-report-copy-text.test.ts": 59,
-      "src/main/crash-reporting/crash-report-store.test.ts": 474,
-      "src/main/crash-reporting/crashpad-capture-read-limit.test.ts": 302,
-      "src/main/crash-reporting/crashpad-capture.test.ts": 146,
-      "src/main/crash-reporting/durable-crash-breadcrumb.test.ts": 75,
-      "src/main/crash-reporting/expected-teardown-state.test.ts": 37,
-      "src/main/crash-reporting/gpu-crash-diagnostics.test.ts": 47,
-      "src/main/crash-reporting/gpu-crash-fallback-decision.test.ts": 62,
-      "src/main/crash-reporting/gpu-crash-fallback-field-sessions.test.ts": 64,
-      "src/main/crash-reporting/gpu-fallback-engagement.test.ts": 47,
-      "src/main/crash-reporting/gpu-fallback-recovered-launch.test.ts": 49,
-      "src/main/crash-reporting/gpu-fallback-restart-prompt.test.ts": 56,
-      "src/main/crash-reporting/main-process-lifecycle-identity.test.ts": 46,
-      "src/main/crash-reporting/minidump-crash-signature.test.ts": 108,
-      "src/main/crash-reporting/minidump-file-source.test.ts": 258,
-      "src/main/crash-reporting/pre-gone-host-memory.test.ts": 103,
-      "src/main/crash-reporting/process-gone-classification.test.ts": 47,
-      "src/main/crash-reporting/process-gone-dedupe.test.ts": 51,
-      "src/main/crash-reporting/process-gone-diagnostics.test.ts": 98,
-      "src/main/crash-reporting/process-gone-killed-one-ordering.test.ts": 140,
-      "src/main/crash-reporting/process-gone-recorder.test.ts": 839,
-      "src/main/crash-reporting/process-gone-sibling-correlation.test.ts": 626,
-      "src/main/crash-reporting/renderer-recovery-circuit-breaker.test.ts": 43,
-      "src/main/crash-reporting/self-initiated-tree-kill-log.test.ts": 222,
-      "src/main/crash-reporting/suppressed-process-gone-breadcrumb.test.ts": 54,
-      "src/main/cursor/hook-service.test.ts": 289,
-      "src/main/daemon/agent-startup-prompt-latency.node-pty.test.ts": 2437,
-      "src/main/daemon/bash-prompt-command-composition.test.ts": 4252,
-      "src/main/daemon/client.test.ts": 403,
-      "src/main/daemon/cold-restore-payload-cache.test.ts": 54,
-      "src/main/daemon/daemon-adoption-telemetry-event.test.ts": 180,
-      "src/main/daemon/daemon-audit-eligibility-event.test.ts": 731,
-      "src/main/daemon/daemon-authenticated-client-activity.test.ts": 432,
-      "src/main/daemon/daemon-background-transient-facts.test.ts": 52,
-      "src/main/daemon/daemon-bundle-staleness.test.ts": 406,
-      "src/main/daemon/daemon-cgroup-scope.test.ts": 52,
-      "src/main/daemon/daemon-checkpoint-session-queue.test.ts": 249,
-      "src/main/daemon/daemon-client-notify-settlement.test.ts": 57,
-      "src/main/daemon/daemon-client-rpc-request.test.ts": 82,
-      "src/main/daemon/daemon-client-stream-keepalive.test.ts": 52,
-      "src/main/daemon/daemon-durable-checkpoint-live-rebase.test.ts": 1170,
-      "src/main/daemon/daemon-endpoint-ownership.test.ts": 460,
-      "src/main/daemon/daemon-endpoint-publish.test.ts": 197,
-      "src/main/daemon/daemon-endpoint-windows.test.ts": 56,
-      "src/main/daemon/daemon-entry-path-layouts.test.ts": 431,
-      "src/main/daemon/daemon-entry.test.ts": 402,
-      "src/main/daemon/daemon-errors.test.ts": 183,
-      "src/main/daemon/daemon-file-log.test.ts": 55,
-      "src/main/daemon/daemon-folder-access-mismatch.test.ts": 252,
-      "src/main/daemon/daemon-folder-access-probe-script.test.ts": 211,
-      "src/main/daemon/daemon-folder-access-probe.test.ts": 58,
-      "src/main/daemon/daemon-folder-access-reset.test.ts": 223,
-      "src/main/daemon/daemon-foreground-confirmation-protocol.test.ts": 55,
-      "src/main/daemon/daemon-health-endpoint-entry.test.ts": 61,
-      "src/main/daemon/daemon-health-socket-cleanup.test.ts": 91,
-      "src/main/daemon/daemon-health.test.ts": 3639,
-      "src/main/daemon/daemon-host-relocation.test.ts": 210,
-      "src/main/daemon/daemon-idle-shutdown.test.ts": 1071,
-      "src/main/daemon/daemon-incarnation-evidence-main-thread.test.ts": 75,
-      "src/main/daemon/daemon-incarnation-evidence.test.ts": 76,
-      "src/main/daemon/daemon-init-child-readiness.test.ts": 460,
-      "src/main/daemon/daemon-init-child-startup-failure.test.ts": 763,
-      "src/main/daemon/daemon-init-endpoint-adoption.test.ts": 1469,
-      "src/main/daemon/daemon-init-live-session-preservation.test.ts": 686,
-      "src/main/daemon/daemon-init-packaged-bundle-staleness.test.ts": 422,
-      "src/main/daemon/daemon-init-provider-installation.test.ts": 452,
-      "src/main/daemon/daemon-init-replacement-reporting.test.ts": 607,
-      "src/main/daemon/daemon-init-restart-sequence.test.ts": 912,
-      "src/main/daemon/daemon-init-wedged-daemon-grace.test.ts": 678,
-      "src/main/daemon/daemon-launched-child-identity.test.ts": 64,
-      "src/main/daemon/daemon-launched-child-spawn.test.ts": 51,
-      "src/main/daemon/daemon-lifecycle-event.test.ts": 175,
-      "src/main/daemon/daemon-mac-code-identity.test.ts": 66,
-      "src/main/daemon/daemon-main.test.ts": 466,
-      "src/main/daemon/daemon-native-pty-exception.test.ts": 56,
-      "src/main/daemon/daemon-pid-file-parse.test.ts": 40,
-      "src/main/daemon/daemon-preflight-client-replacement.test.ts": 628,
-      "src/main/daemon/daemon-process-identity-time-zone.test.ts": 64,
-      "src/main/daemon/daemon-process-inspection.test.ts": 65,
-      "src/main/daemon/daemon-protocol-version.test.ts": 55,
-      "src/main/daemon/daemon-pty-adapter-cold-restore-reanchor.test.ts": 2605,
-      "src/main/daemon/daemon-pty-adapter-cold-restore-seed.test.ts": 1300,
-      "src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts": 940,
-      "src/main/daemon/daemon-pty-adapter-daemon-recovery.test.ts": 1408,
-      "src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts": 2551,
-      "src/main/daemon/daemon-pty-adapter-history-recovery.test.ts": 1838,
-      "src/main/daemon/daemon-pty-adapter-inventory-respawn.test.ts": 734,
-      "src/main/daemon/daemon-pty-adapter-live-rebased-checkpoint.test.ts": 1810,
-      "src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts": 3436,
-      "src/main/daemon/daemon-pty-adapter-replacement-exit-race.test.ts": 796,
-      "src/main/daemon/daemon-pty-adapter-session-adoption.test.ts": 1424,
-      "src/main/daemon/daemon-pty-adapter-steady-state-compat.test.ts": 508,
-      "src/main/daemon/daemon-pty-adapter.test.ts": 3941,
-      "src/main/daemon/daemon-pty-router-history-handoff.test.ts": 1214,
-      "src/main/daemon/daemon-pty-router.test.ts": 712,
-      "src/main/daemon/daemon-pty-startup-delivery.test.ts": 2802,
-      "src/main/daemon/daemon-pty-upgrade-adoption.test.ts": 732,
-      "src/main/daemon/daemon-pty-write-settlement-recovery.test.ts": 560,
-      "src/main/daemon/daemon-ready-identity.test.ts": 45,
-      "src/main/daemon/daemon-reattach-checkpoint-isolation.test.ts": 10979,
-      "src/main/daemon/daemon-respawn-throttle.test.ts": 64,
-      "src/main/daemon/daemon-restore-scrollback-depth.test.ts": 3640,
-      "src/main/daemon/daemon-scope-death-watch.test.ts": 80,
-      "src/main/daemon/daemon-self-retirement-respawn.test.ts": 830,
-      "src/main/daemon/daemon-server-async-spawn-cancellation.test.ts": 1093,
-      "src/main/daemon/daemon-server-attach-only.test.ts": 455,
-      "src/main/daemon/daemon-server-attachment-lifecycle.test.ts": 620,
-      "src/main/daemon/daemon-server-error-handling.test.ts": 584,
-      "src/main/daemon/daemon-server-kill-attribution.test.ts": 384,
-      "src/main/daemon/daemon-server.test.ts": 1155,
-      "src/main/daemon/daemon-session-owner-resolution.test.ts": 82,
-      "src/main/daemon/daemon-session-scrollback-window.test.ts": 319,
-      "src/main/daemon/daemon-shared-owner-incarnation-retention.test.ts": 691,
-      "src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts": 2330,
-      "src/main/daemon/daemon-spawner.test.ts": 423,
-      "src/main/daemon/daemon-stream-backpressure-socket.test.ts": 486,
-      "src/main/daemon/daemon-stream-backpressure.test.ts": 40,
-      "src/main/daemon/daemon-stream-data-batcher.test.ts": 265,
-      "src/main/daemon/daemon-stream-data-split.test.ts": 1282,
-      "src/main/daemon/daemon-stream-droppability-lifecycle.test.ts": 478,
-      "src/main/daemon/daemon-stream-droppable-membership.test.ts": 101,
-      "src/main/daemon/daemon-stream-producer-stall-watchdog.test.ts": 97,
-      "src/main/daemon/daemon-tcc-attribution-main-thread.test.ts": 76,
-      "src/main/daemon/daemon-tcc-attribution.test.ts": 71,
-      "src/main/daemon/daemon-transport-attachment-release.test.ts": 714,
-      "src/main/daemon/degraded-daemon-pty-provider.test.ts": 127,
-      "src/main/daemon/hangul-cell-width-agreement.test.ts": 82,
-      "src/main/daemon/headless-emulator-fidelity.fuzz.test.ts": 18351,
-      "src/main/daemon/headless-emulator-restored-osc-links.test.ts": 154,
-      "src/main/daemon/headless-emulator-shrink-snapshot.test.ts": 155,
-      "src/main/daemon/headless-emulator-snapshot-cost.bench.test.ts": 82,
-      "src/main/daemon/headless-emulator-unicode-width.test.ts": 90,
-      "src/main/daemon/headless-emulator-wide-char-repaint.test.ts": 1877,
-      "src/main/daemon/headless-emulator-wide-char-snapshot.test.ts": 189,
-      "src/main/daemon/headless-emulator.test.ts": 415,
-      "src/main/daemon/headless-osc-link-ranges.test.ts": 231,
-      "src/main/daemon/hibernation-cold-restore-repro.test.ts": 288,
-      "src/main/daemon/history-manager-disabled-sessions-leak.test.ts": 207,
-      "src/main/daemon/history-manager.test.ts": 516,
-      "src/main/daemon/history-reader-memory.test.ts": 561,
+      "src/main/computer/desktop-script-provider-errors.test.ts": 205,
+      "src/main/computer/desktop-script-provider-paste-validation.test.ts": 107,
+      "src/main/computer/desktop-script-provider-runtime-host-routing.test.ts": 204,
+      "src/main/computer/desktop-script-runtime-host.test.ts": 199,
+      "src/main/computer/desktop-script-runtime-host.win32.test.ts": 94,
+      "src/main/computer/desktop-script-serve-channel.test.ts": 170,
+      "src/main/computer/macos-computer-use-permission-status.test.ts": 97,
+      "src/main/computer/macos-computer-use-permissions.test.ts": 90,
+      "src/main/computer/macos-native-provider-client.test.ts": 1206,
+      "src/main/computer/macos-native-provider-line-buffer.test.ts": 62,
+      "src/main/computer/macos-native-provider-paste-validation.test.ts": 192,
+      "src/main/computer/macos-native-provider-process-reaping.test.ts": 94,
+      "src/main/computer/macos-native-provider-reaping.integration.test.ts": 4215,
+      "src/main/computer/macos-native-provider-socket.test.ts": 71,
+      "src/main/computer/macos-native-provider-startup-cleanup.test.ts": 73,
+      "src/main/computer/sidecar-client.test.ts": 96,
+      "src/main/computer/sidecar-provider-reaping.integration.test.ts": 313,
+      "src/main/computer/windows-powershell-execution-policy.test.ts": 62,
+      "src/main/copilot/hook-service.test.ts": 164,
+      "src/main/crash-reporting/crash-breadcrumb-renderer-attribution.test.ts": 34,
+      "src/main/crash-reporting/crash-breadcrumb-store-leak.test.ts": 111,
+      "src/main/crash-reporting/crash-breadcrumb-store-orphan-cleanup.test.ts": 108,
+      "src/main/crash-reporting/crash-breadcrumb-store.test.ts": 166,
+      "src/main/crash-reporting/crash-report-copy-text.test.ts": 56,
+      "src/main/crash-reporting/crash-report-store.test.ts": 453,
+      "src/main/crash-reporting/crashpad-capture-read-limit.test.ts": 267,
+      "src/main/crash-reporting/crashpad-capture.test.ts": 94,
+      "src/main/crash-reporting/durable-crash-breadcrumb.test.ts": 71,
+      "src/main/crash-reporting/expected-teardown-state.test.ts": 38,
+      "src/main/crash-reporting/gpu-crash-diagnostics.test.ts": 49,
+      "src/main/crash-reporting/gpu-crash-fallback-decision.test.ts": 38,
+      "src/main/crash-reporting/gpu-crash-fallback-field-sessions.test.ts": 40,
+      "src/main/crash-reporting/gpu-fallback-engagement.test.ts": 60,
+      "src/main/crash-reporting/gpu-fallback-recovered-launch.test.ts": 69,
+      "src/main/crash-reporting/gpu-fallback-restart-prompt.test.ts": 39,
+      "src/main/crash-reporting/main-process-lifecycle-identity.test.ts": 68,
+      "src/main/crash-reporting/minidump-crash-signature.test.ts": 59,
+      "src/main/crash-reporting/minidump-file-source.test.ts": 200,
+      "src/main/crash-reporting/pre-gone-host-memory.test.ts": 96,
+      "src/main/crash-reporting/process-gone-classification.test.ts": 51,
+      "src/main/crash-reporting/process-gone-dedupe.test.ts": 33,
+      "src/main/crash-reporting/process-gone-diagnostics.test.ts": 114,
+      "src/main/crash-reporting/process-gone-killed-one-ordering.test.ts": 108,
+      "src/main/crash-reporting/process-gone-recorder.test.ts": 967,
+      "src/main/crash-reporting/process-gone-sibling-correlation.test.ts": 686,
+      "src/main/crash-reporting/renderer-recovery-circuit-breaker.test.ts": 48,
+      "src/main/crash-reporting/self-initiated-tree-kill-log.test.ts": 296,
+      "src/main/crash-reporting/suppressed-process-gone-breadcrumb.test.ts": 24,
+      "src/main/cursor/hook-service.test.ts": 281,
+      "src/main/daemon/agent-startup-prompt-latency.node-pty.test.ts": 2349,
+      "src/main/daemon/bash-prompt-command-composition.test.ts": 2955,
+      "src/main/daemon/client.test.ts": 523,
+      "src/main/daemon/cold-restore-payload-cache.test.ts": 34,
+      "src/main/daemon/daemon-adoption-telemetry-event.test.ts": 269,
+      "src/main/daemon/daemon-audit-eligibility-event.test.ts": 807,
+      "src/main/daemon/daemon-authenticated-client-activity.test.ts": 408,
+      "src/main/daemon/daemon-background-transient-facts.test.ts": 89,
+      "src/main/daemon/daemon-bundle-staleness.test.ts": 461,
+      "src/main/daemon/daemon-cgroup-scope.test.ts": 87,
+      "src/main/daemon/daemon-checkpoint-session-queue.test.ts": 243,
+      "src/main/daemon/daemon-client-notify-settlement.test.ts": 66,
+      "src/main/daemon/daemon-client-rpc-request.test.ts": 97,
+      "src/main/daemon/daemon-client-stream-keepalive.test.ts": 43,
+      "src/main/daemon/daemon-durable-checkpoint-live-rebase.test.ts": 1035,
+      "src/main/daemon/daemon-endpoint-ownership.test.ts": 525,
+      "src/main/daemon/daemon-endpoint-publish.test.ts": 114,
+      "src/main/daemon/daemon-endpoint-windows.test.ts": 50,
+      "src/main/daemon/daemon-entry-path-layouts.test.ts": 353,
+      "src/main/daemon/daemon-entry.test.ts": 517,
+      "src/main/daemon/daemon-errors.test.ts": 159,
+      "src/main/daemon/daemon-file-log.test.ts": 63,
+      "src/main/daemon/daemon-folder-access-mismatch.test.ts": 241,
+      "src/main/daemon/daemon-folder-access-probe-script.test.ts": 198,
+      "src/main/daemon/daemon-folder-access-probe.test.ts": 68,
+      "src/main/daemon/daemon-folder-access-reset.test.ts": 215,
+      "src/main/daemon/daemon-foreground-confirmation-protocol.test.ts": 50,
+      "src/main/daemon/daemon-health-endpoint-entry.test.ts": 78,
+      "src/main/daemon/daemon-health-socket-cleanup.test.ts": 83,
+      "src/main/daemon/daemon-health.test.ts": 3556,
+      "src/main/daemon/daemon-host-relocation.test.ts": 486,
+      "src/main/daemon/daemon-idle-shutdown.test.ts": 1312,
+      "src/main/daemon/daemon-incarnation-evidence-main-thread.test.ts": 52,
+      "src/main/daemon/daemon-incarnation-evidence.test.ts": 62,
+      "src/main/daemon/daemon-init-child-readiness.test.ts": 488,
+      "src/main/daemon/daemon-init-child-startup-failure.test.ts": 630,
+      "src/main/daemon/daemon-init-endpoint-adoption.test.ts": 1191,
+      "src/main/daemon/daemon-init-live-session-preservation.test.ts": 667,
+      "src/main/daemon/daemon-init-packaged-bundle-staleness.test.ts": 303,
+      "src/main/daemon/daemon-init-provider-installation.test.ts": 493,
+      "src/main/daemon/daemon-init-replacement-reporting.test.ts": 568,
+      "src/main/daemon/daemon-init-restart-sequence.test.ts": 865,
+      "src/main/daemon/daemon-init-wedged-daemon-grace.test.ts": 452,
+      "src/main/daemon/daemon-launched-child-identity.test.ts": 119,
+      "src/main/daemon/daemon-launched-child-spawn.test.ts": 64,
+      "src/main/daemon/daemon-lifecycle-event.test.ts": 196,
+      "src/main/daemon/daemon-mac-code-identity.test.ts": 76,
+      "src/main/daemon/daemon-main.test.ts": 421,
+      "src/main/daemon/daemon-native-pty-exception.test.ts": 39,
+      "src/main/daemon/daemon-pid-file-parse.test.ts": 41,
+      "src/main/daemon/daemon-preflight-client-replacement.test.ts": 704,
+      "src/main/daemon/daemon-process-identity-time-zone.test.ts": 90,
+      "src/main/daemon/daemon-process-inspection.test.ts": 63,
+      "src/main/daemon/daemon-protocol-version.test.ts": 34,
+      "src/main/daemon/daemon-pty-adapter-cold-restore-reanchor.test.ts": 1246,
+      "src/main/daemon/daemon-pty-adapter-cold-restore-seed.test.ts": 1188,
+      "src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts": 887,
+      "src/main/daemon/daemon-pty-adapter-daemon-recovery.test.ts": 1496,
+      "src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts": 2334,
+      "src/main/daemon/daemon-pty-adapter-history-recovery.test.ts": 1236,
+      "src/main/daemon/daemon-pty-adapter-inventory-respawn.test.ts": 593,
+      "src/main/daemon/daemon-pty-adapter-live-rebased-checkpoint.test.ts": 1713,
+      "src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts": 2069,
+      "src/main/daemon/daemon-pty-adapter-replacement-exit-race.test.ts": 767,
+      "src/main/daemon/daemon-pty-adapter-session-adoption.test.ts": 1235,
+      "src/main/daemon/daemon-pty-adapter-steady-state-compat.test.ts": 468,
+      "src/main/daemon/daemon-pty-adapter.test.ts": 4255,
+      "src/main/daemon/daemon-pty-router-history-handoff.test.ts": 1329,
+      "src/main/daemon/daemon-pty-router.test.ts": 658,
+      "src/main/daemon/daemon-pty-startup-delivery.test.ts": 2827,
+      "src/main/daemon/daemon-pty-upgrade-adoption.test.ts": 679,
+      "src/main/daemon/daemon-pty-write-settlement-recovery.test.ts": 410,
+      "src/main/daemon/daemon-ready-identity.test.ts": 55,
+      "src/main/daemon/daemon-reattach-checkpoint-isolation.test.ts": 10993,
+      "src/main/daemon/daemon-respawn-throttle.test.ts": 58,
+      "src/main/daemon/daemon-restore-scrollback-depth.test.ts": 3415,
+      "src/main/daemon/daemon-scope-death-watch.test.ts": 70,
+      "src/main/daemon/daemon-self-retirement-respawn.test.ts": 786,
+      "src/main/daemon/daemon-server-async-spawn-cancellation.test.ts": 1078,
+      "src/main/daemon/daemon-server-attach-only.test.ts": 466,
+      "src/main/daemon/daemon-server-attachment-lifecycle.test.ts": 631,
+      "src/main/daemon/daemon-server-error-handling.test.ts": 457,
+      "src/main/daemon/daemon-server-kill-attribution.test.ts": 256,
+      "src/main/daemon/daemon-server.test.ts": 2072,
+      "src/main/daemon/daemon-session-owner-resolution.test.ts": 60,
+      "src/main/daemon/daemon-session-scrollback-window.test.ts": 408,
+      "src/main/daemon/daemon-shared-owner-incarnation-retention.test.ts": 667,
+      "src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts": 2293,
+      "src/main/daemon/daemon-spawner.test.ts": 472,
+      "src/main/daemon/daemon-stream-backpressure-socket.test.ts": 305,
+      "src/main/daemon/daemon-stream-backpressure.test.ts": 42,
+      "src/main/daemon/daemon-stream-data-batcher.test.ts": 196,
+      "src/main/daemon/daemon-stream-data-split.test.ts": 1339,
+      "src/main/daemon/daemon-stream-droppability-lifecycle.test.ts": 485,
+      "src/main/daemon/daemon-stream-droppable-membership.test.ts": 127,
+      "src/main/daemon/daemon-stream-producer-stall-watchdog.test.ts": 74,
+      "src/main/daemon/daemon-tcc-attribution-main-thread.test.ts": 91,
+      "src/main/daemon/daemon-tcc-attribution.test.ts": 75,
+      "src/main/daemon/daemon-transport-attachment-release.test.ts": 791,
+      "src/main/daemon/degraded-daemon-pty-provider.test.ts": 151,
+      "src/main/daemon/hangul-cell-width-agreement.test.ts": 91,
+      "src/main/daemon/headless-emulator-fidelity.fuzz.test.ts": 18873,
+      "src/main/daemon/headless-emulator-restored-osc-links.test.ts": 124,
+      "src/main/daemon/headless-emulator-shrink-snapshot.test.ts": 177,
+      "src/main/daemon/headless-emulator-snapshot-cost.bench.test.ts": 53,
+      "src/main/daemon/headless-emulator-unicode-width.test.ts": 108,
+      "src/main/daemon/headless-emulator-wide-char-repaint.test.ts": 1505,
+      "src/main/daemon/headless-emulator-wide-char-snapshot.test.ts": 265,
+      "src/main/daemon/headless-emulator.test.ts": 232,
+      "src/main/daemon/headless-osc-link-ranges.test.ts": 141,
+      "src/main/daemon/hibernation-cold-restore-repro.test.ts": 202,
+      "src/main/daemon/history-manager-disabled-sessions-leak.test.ts": 150,
+      "src/main/daemon/history-manager.test.ts": 437,
+      "src/main/daemon/history-reader-memory.test.ts": 366,
       "src/main/daemon/history-reader.test.ts": 306,
-      "src/main/daemon/issue-6814-daemon-failure-classification.test.ts": 6468,
-      "src/main/daemon/macos-login-session-death-watch.test.ts": 104,
-      "src/main/daemon/ndjson.test.ts": 206,
-      "src/main/daemon/node-pty-error-hints.test.ts": 54,
-      "src/main/daemon/node-pty-windows-input-error.win32.test.ts": 46,
-      "src/main/daemon/osc7-file-uri.test.ts": 59,
-      "src/main/daemon/osc7-uri-extraction.test.ts": 32,
-      "src/main/daemon/post-ready-flush-gate.test.ts": 41,
-      "src/main/daemon/process-boundary-ground.test.ts": 263,
-      "src/main/daemon/process-boundary-host-focus.test.ts": 284,
-      "src/main/daemon/pty-session-id.test.ts": 81,
-      "src/main/daemon/pty-subprocess-cwd-cancel-identity.test.ts": 239,
-      "src/main/daemon/pty-subprocess-env-inheritance.test.ts": 301,
-      "src/main/daemon/pty-subprocess-env-retention.test.ts": 267,
-      "src/main/daemon/pty-subprocess-foreground-degraded-scan.test.ts": 223,
-      "src/main/daemon/pty-subprocess-foreground-identity.test.ts": 439,
-      "src/main/daemon/pty-subprocess-foreground-scan-cadence.test.ts": 283,
-      "src/main/daemon/pty-subprocess-git-credential-guard.test.ts": 265,
-      "src/main/daemon/pty-subprocess-handle-lifecycle.test.ts": 333,
-      "src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts": 10442,
-      "src/main/daemon/pty-subprocess-io-failure-native.test.ts": 2768,
-      "src/main/daemon/pty-subprocess-managed-agent-env.test.ts": 243,
-      "src/main/daemon/pty-subprocess-windows-shell-launch.test.ts": 278,
-      "src/main/daemon/pty-subprocess-wsl-launch.test.ts": 313,
-      "src/main/daemon/pty-subprocess.test.ts": 300,
-      "src/main/daemon/reattach-snapshot.test.ts": 971,
-      "src/main/daemon/repro-12101-mouse-tracking-survives-agent-death.test.ts": 263,
-      "src/main/daemon/repro-7329-remote-snapshot-corruption.test.ts": 178,
-      "src/main/daemon/serialize-addon-edge-cases.test.ts": 127,
-      "src/main/daemon/serialize-grid-transcript-replay.test.ts": 27302,
-      "src/main/daemon/serialize-grid.differential.fuzz.test.ts": 607,
-      "src/main/daemon/session-ingest-throughput.bench.test.ts": 193,
-      "src/main/daemon/session-pending-output.test.ts": 406,
-      "src/main/daemon/session-producer-pause.test.ts": 71,
-      "src/main/daemon/session-shell-recovery.test.ts": 272,
-      "src/main/daemon/session-terminal-control.test.ts": 219,
-      "src/main/daemon/session.test.ts": 503,
-      "src/main/daemon/shell-ready-bash-wrapper.test.ts": 751,
-      "src/main/daemon/slow-daemon-session-verification.test.ts": 13961,
-      "src/main/daemon/startup-device-attributes-responder.test.ts": 50,
-      "src/main/daemon/terminal-checkpoint-serializer.test.ts": 239,
-      "src/main/daemon/terminal-checkpoint-writer-bounds.test.ts": 286,
-      "src/main/daemon/terminal-cursor-line-context.test.ts": 73,
-      "src/main/daemon/terminal-descendant-shutdown.test.ts": 127,
-      "src/main/daemon/terminal-history-incremental-restore.test.ts": 402,
-      "src/main/daemon/terminal-history-large-checkpoint-cold-restore.test.ts": 9132,
-      "src/main/daemon/terminal-history-log.test.ts": 50,
-      "src/main/daemon/terminal-history-permissions.test.ts": 254,
-      "src/main/daemon/terminal-history-restorable-retention.test.ts": 53,
-      "src/main/daemon/terminal-history-seed-chunks.test.ts": 67,
-      "src/main/daemon/terminal-history-seed-segments.test.ts": 109,
-      "src/main/daemon/terminal-history-seed-transfer-registry.test.ts": 69,
-      "src/main/daemon/terminal-history-session-tombstone-retry.test.ts": 82,
-      "src/main/daemon/terminal-host-agent-session.test.ts": 352,
-      "src/main/daemon/terminal-host-attach-only.test.ts": 284,
-      "src/main/daemon/terminal-host-cheap-tier-ps-scan-volume.test.ts": 304,
-      "src/main/daemon/terminal-host-concurrent-create.test.ts": 335,
-      "src/main/daemon/terminal-host-cwd-readability.test.ts": 248,
-      "src/main/daemon/terminal-host-non-agent-foreground.test.ts": 113,
-      "src/main/daemon/terminal-host-process-inspection-cheap-tier.test.ts": 195,
-      "src/main/daemon/terminal-host-process-inspection.test.ts": 288,
-      "src/main/daemon/terminal-host-pty-owner-backend.test.ts": 405,
-      "src/main/daemon/terminal-host-readiness-reporting.test.ts": 262,
-      "src/main/daemon/terminal-host-session-reaping-leak.test.ts": 431,
-      "src/main/daemon/terminal-host-spawn-input-retention.test.ts": 338,
-      "src/main/daemon/terminal-host-startup.test.ts": 292,
-      "src/main/daemon/terminal-host-teardown-recreate.test.ts": 441,
-      "src/main/daemon/terminal-host-wsl-context.test.ts": 321,
-      "src/main/daemon/terminal-host.test.ts": 470,
-      "src/main/daemon/terminal-mouse-tail-retention.test.ts": 225,
-      "src/main/daemon/terminal-session-teardown.test.ts": 68,
-      "src/main/daemon/terminal-shell-armed-input-mode-recovery.test.ts": 264,
-      "src/main/daemon/terminal-shell-lifecycle-scanner.test.ts": 70,
-      "src/main/daemon/terminal-shell-recovery-barrier.test.ts": 841,
-      "src/main/daemon/terminal-shell-recovery-clean-exit-retirement.test.ts": 67,
-      "src/main/daemon/terminal-snapshot-color-parity.test.ts": 141,
-      "src/main/daemon/terminal-snapshot-osc8-roundtrip.test.ts": 75,
-      "src/main/daemon/terminal-snapshot-serialize-roundtrip.test.ts": 270,
-      "src/main/daemon/windows-conpty-warmup.test.ts": 80,
-      "src/main/daemon/wsl-cold-restore-cwd.test.ts": 53,
-      "src/main/destination-serialized-local-rename.test.ts": 3897,
-      "src/main/devin/hook-config-json.test.ts": 116,
-      "src/main/devin/hook-service.test.ts": 151,
-      "src/main/diagnostics/main-thread-churn-probe.test.ts": 50,
-      "src/main/dock/unread-badge.test.ts": 52,
-      "src/main/droid/hook-service.test.ts": 96,
-      "src/main/durable-file-write-syscall-proof.test.ts": 92,
-      "src/main/durable-file-write.test.ts": 148,
-      "src/main/emulator/android/adb-devices.test.ts": 43,
-      "src/main/emulator/android/android-app-control.test.ts": 36,
-      "src/main/emulator/android/android-capability-operations.test.ts": 43,
-      "src/main/emulator/android/android-device-inventory.test.ts": 61,
-      "src/main/emulator/android/android-input-commands.test.ts": 63,
-      "src/main/emulator/android/android-input-mapping.test.ts": 40,
-      "src/main/emulator/android/android-logcat.test.ts": 66,
-      "src/main/emulator/android/android-permissions.test.ts": 51,
-      "src/main/emulator/android/android-sdk-discovery.test.ts": 50,
+      "src/main/daemon/issue-6814-daemon-failure-classification.test.ts": 6483,
+      "src/main/daemon/macos-login-session-death-watch.test.ts": 93,
+      "src/main/daemon/ndjson.test.ts": 180,
+      "src/main/daemon/node-pty-error-hints.test.ts": 46,
+      "src/main/daemon/node-pty-windows-input-error.win32.test.ts": 37,
+      "src/main/daemon/osc7-file-uri.test.ts": 48,
+      "src/main/daemon/osc7-uri-extraction.test.ts": 34,
+      "src/main/daemon/post-ready-flush-gate.test.ts": 43,
+      "src/main/daemon/process-boundary-ground.test.ts": 256,
+      "src/main/daemon/process-boundary-host-focus.test.ts": 314,
+      "src/main/daemon/pty-session-id.test.ts": 54,
+      "src/main/daemon/pty-subprocess-cwd-cancel-identity.test.ts": 277,
+      "src/main/daemon/pty-subprocess-env-inheritance.test.ts": 312,
+      "src/main/daemon/pty-subprocess-env-retention.test.ts": 248,
+      "src/main/daemon/pty-subprocess-foreground-degraded-scan.test.ts": 235,
+      "src/main/daemon/pty-subprocess-foreground-identity.test.ts": 589,
+      "src/main/daemon/pty-subprocess-foreground-scan-cadence.test.ts": 336,
+      "src/main/daemon/pty-subprocess-git-credential-guard.test.ts": 249,
+      "src/main/daemon/pty-subprocess-handle-lifecycle.test.ts": 413,
+      "src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts": 10411,
+      "src/main/daemon/pty-subprocess-io-failure-native.test.ts": 2523,
+      "src/main/daemon/pty-subprocess-managed-agent-env.test.ts": 337,
+      "src/main/daemon/pty-subprocess-spawn-file-foreground.test.ts": 440,
+      "src/main/daemon/pty-subprocess-windows-shell-launch.test.ts": 310,
+      "src/main/daemon/pty-subprocess-wsl-launch.test.ts": 370,
+      "src/main/daemon/pty-subprocess.test.ts": 269,
+      "src/main/daemon/pty-subprocess/bun-pty-job-control.integration.test.ts": 27,
+      "src/main/daemon/pty-subprocess/bun-pty-process-flow-control.test.ts": 111,
+      "src/main/daemon/pty-subprocess/bun-pty-process-pause-retry.test.ts": 80,
+      "src/main/daemon/pty-subprocess/bun-pty-process-suspension.test.ts": 118,
+      "src/main/daemon/pty-subprocess/bun-pty-process.integration.test.ts": 49,
+      "src/main/daemon/pty-subprocess/bun-pty-process.test.ts": 352,
+      "src/main/daemon/pty-subprocess/native-pty-spawn-bun.test.ts": 70,
+      "src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts": 83,
+      "src/main/daemon/pty-subprocess/spawn-file-foreground-rejected-agents.test.ts": 102,
+      "src/main/daemon/pty-subprocess/spawn-preflight-bun.test.ts": 91,
+      "src/main/daemon/pty-subprocess/windows-bun-pty-gate.integration.test.ts": 80,
+      "src/main/daemon/pty-subprocess/windows-bun-pty-gate.test.ts": 68,
+      "src/main/daemon/pty-subprocess/windows-bun-pty-job.test.ts": 53,
+      "src/main/daemon/pty-subprocess/windows-bun-pty-launch.test.ts": 70,
+      "src/main/daemon/pty-subprocess/windows-bun-pty-native.test.ts": 30,
+      "src/main/daemon/pty-subprocess/windows-bun-pty-spawn-receipt.test.ts": 70,
+      "src/main/daemon/reattach-snapshot.test.ts": 878,
+      "src/main/daemon/repro-12101-mouse-tracking-survives-agent-death.test.ts": 156,
+      "src/main/daemon/repro-7329-remote-snapshot-corruption.test.ts": 122,
+      "src/main/daemon/serialize-addon-edge-cases.test.ts": 71,
+      "src/main/daemon/serialize-grid-transcript-replay.test.ts": 14365,
+      "src/main/daemon/serialize-grid.differential.fuzz.test.ts": 582,
+      "src/main/daemon/session-ingest-throughput.bench.test.ts": 191,
+      "src/main/daemon/session-pending-output.test.ts": 426,
+      "src/main/daemon/session-producer-pause.test.ts": 33,
+      "src/main/daemon/session-shell-recovery.test.ts": 338,
+      "src/main/daemon/session-terminal-control.test.ts": 245,
+      "src/main/daemon/session.test.ts": 626,
+      "src/main/daemon/shell-ready-bash-wrapper.test.ts": 337,
+      "src/main/daemon/slow-daemon-session-verification.test.ts": 14043,
+      "src/main/daemon/startup-device-attributes-responder.test.ts": 38,
+      "src/main/daemon/terminal-attach-cancellation.test.ts": 24,
+      "src/main/daemon/terminal-checkpoint-serializer.test.ts": 127,
+      "src/main/daemon/terminal-checkpoint-writer-bounds.test.ts": 237,
+      "src/main/daemon/terminal-cursor-line-context.test.ts": 124,
+      "src/main/daemon/terminal-descendant-shutdown.test.ts": 97,
+      "src/main/daemon/terminal-history-incremental-restore.test.ts": 505,
+      "src/main/daemon/terminal-history-large-checkpoint-cold-restore.test.ts": 7048,
+      "src/main/daemon/terminal-history-log-encode-allocation.test.ts": 96,
+      "src/main/daemon/terminal-history-log.test.ts": 54,
+      "src/main/daemon/terminal-history-permissions.test.ts": 202,
+      "src/main/daemon/terminal-history-restorable-retention.test.ts": 34,
+      "src/main/daemon/terminal-history-seed-chunks.test.ts": 64,
+      "src/main/daemon/terminal-history-seed-segments.test.ts": 78,
+      "src/main/daemon/terminal-history-seed-transfer-registry.test.ts": 62,
+      "src/main/daemon/terminal-history-session-tombstone-retry.test.ts": 68,
+      "src/main/daemon/terminal-host-agent-session.test.ts": 227,
+      "src/main/daemon/terminal-host-attach-only.test.ts": 297,
+      "src/main/daemon/terminal-host-cheap-tier-ps-scan-volume.test.ts": 196,
+      "src/main/daemon/terminal-host-concurrent-create.test.ts": 240,
+      "src/main/daemon/terminal-host-cwd-readability.test.ts": 261,
+      "src/main/daemon/terminal-host-non-agent-foreground.test.ts": 189,
+      "src/main/daemon/terminal-host-process-inspection-cheap-tier.test.ts": 163,
+      "src/main/daemon/terminal-host-process-inspection.test.ts": 236,
+      "src/main/daemon/terminal-host-pty-owner-backend.test.ts": 324,
+      "src/main/daemon/terminal-host-readiness-reporting.test.ts": 317,
+      "src/main/daemon/terminal-host-session-reaping-leak.test.ts": 460,
+      "src/main/daemon/terminal-host-spawn-input-retention.test.ts": 543,
+      "src/main/daemon/terminal-host-startup.test.ts": 299,
+      "src/main/daemon/terminal-host-teardown-recreate.test.ts": 484,
+      "src/main/daemon/terminal-host-wsl-context.test.ts": 249,
+      "src/main/daemon/terminal-host.test.ts": 691,
+      "src/main/daemon/terminal-session-teardown.test.ts": 95,
+      "src/main/daemon/terminal-shell-armed-input-mode-recovery.test.ts": 215,
+      "src/main/daemon/terminal-shell-lifecycle-scanner.test.ts": 56,
+      "src/main/daemon/terminal-shell-recovery-barrier.test.ts": 748,
+      "src/main/daemon/terminal-shell-recovery-clean-exit-retirement.test.ts": 61,
+      "src/main/daemon/terminal-snapshot-color-parity.test.ts": 147,
+      "src/main/daemon/terminal-snapshot-osc8-roundtrip.test.ts": 102,
+      "src/main/daemon/terminal-snapshot-serialize-roundtrip.test.ts": 286,
+      "src/main/daemon/windows-conpty-warmup.test.ts": 113,
+      "src/main/daemon/wsl-cold-restore-cwd.test.ts": 54,
+      "src/main/destination-serialized-local-rename.test.ts": 3857,
+      "src/main/devin/hook-config-json.test.ts": 89,
+      "src/main/devin/hook-service.test.ts": 138,
+      "src/main/diagnostics/main-thread-churn-probe.test.ts": 63,
+      "src/main/dock/unread-badge.test.ts": 59,
+      "src/main/droid/hook-service.test.ts": 53,
+      "src/main/durable-file-write-syscall-proof.test.ts": 72,
+      "src/main/durable-file-write.test.ts": 167,
+      "src/main/emulator/android/adb-devices.test.ts": 54,
+      "src/main/emulator/android/android-app-control.test.ts": 53,
+      "src/main/emulator/android/android-capability-operations.test.ts": 82,
+      "src/main/emulator/android/android-device-inventory.test.ts": 48,
+      "src/main/emulator/android/android-input-commands.test.ts": 47,
+      "src/main/emulator/android/android-input-mapping.test.ts": 63,
+      "src/main/emulator/android/android-logcat.test.ts": 35,
+      "src/main/emulator/android/android-permissions.test.ts": 32,
+      "src/main/emulator/android/android-sdk-discovery.test.ts": 58,
       "src/main/emulator/android/avd-manager.test.ts": 51,
-      "src/main/emulator/android/scrcpy-server-deploy.test.ts": 45,
-      "src/main/emulator/android/scrcpy-stream-session.test.ts": 4444,
-      "src/main/emulator/android/scrcpy-video-frame-parser.test.ts": 167,
-      "src/main/emulator/android/uiautomator-tree.test.ts": 52,
-      "src/main/emulator/backends/android-emulator-backend.test.ts": 194,
-      "src/main/emulator/backends/ios-emulator-backend.test.ts": 167,
-      "src/main/emulator/emulator-availability.test.ts": 46,
-      "src/main/emulator/emulator-bridge.test.ts": 321,
-      "src/main/emulator/emulator-gesture-sender.test.ts": 212,
-      "src/main/emulator/emulator-session-registry.test.ts": 41,
-      "src/main/emulator/emulator-start-lease-registry.test.ts": 94,
-      "src/main/emulator/mjpeg-frame-parser.test.ts": 62,
-      "src/main/emulator/mjpeg-frame-stream.test.ts": 108,
-      "src/main/emulator/scrcpy-video-registry.test.ts": 38,
-      "src/main/emulator/serve-sim-accessibility-tree.test.ts": 77,
-      "src/main/emulator/serve-sim-ax-normalization.test.ts": 54,
-      "src/main/emulator/serve-sim-detached-session.test.ts": 58,
-      "src/main/emulator/serve-sim-execution.test.ts": 81,
-      "src/main/emulator/serve-sim-helper-processes.test.ts": 49,
-      "src/main/emulator/serve-sim-runtime-materializer.test.ts": 101,
-      "src/main/emulator/simctl-simulator-devices.test.ts": 48,
-      "src/main/ephemeral-vm-recipe-runner.test.ts": 595,
-      "src/main/ephemeral-vm-resume-integrity.test.ts": 134,
-      "src/main/ephemeral-vm-runtime-service.test.ts": 947,
-      "src/main/ephemeral-vm-runtime-ssh-cleanup.test.ts": 227,
-      "src/main/external-editor-launch.test.ts": 129,
-      "src/main/fish-history-session.test.ts": 64,
-      "src/main/folder-upgrade-worktree-path.test.ts": 51,
-      "src/main/gemini/hook-service.test.ts": 88,
-      "src/main/ghostty/discovery.test.ts": 88,
-      "src/main/ghostty/index.test.ts": 94,
-      "src/main/ghostty/mapper-extended.test.ts": 92,
-      "src/main/ghostty/mapper.test.ts": 83,
-      "src/main/ghostty/parser.test.ts": 67,
-      "src/main/ghostty/theme-import.test.ts": 77,
-      "src/main/ghostty/theme-resolution.test.ts": 87,
-      "src/main/git-bash.test.ts": 43,
-      "src/main/git/add-sparse-worktree.test.ts": 165,
-      "src/main/git/admission-tier-plumbing.test.ts": 53,
-      "src/main/git/branch-rename.test.ts": 61,
-      "src/main/git/canonical-repo-key.test.ts": 199,
-      "src/main/git/check-ignored-paths.test.ts": 78,
-      "src/main/git/coalesced-probe.test.ts": 78,
-      "src/main/git/command-runner/gh-exec-file-deadline.test.ts": 133,
-      "src/main/git/command-runner/gh-spawn-boundary.test.ts": 814,
-      "src/main/git/command-runner/git-admission-output-parity.test.ts": 205,
-      "src/main/git/command-runner/git-admission-span.test.ts": 280,
-      "src/main/git/command-runner/git-admission-storm-measurement.test.ts": 25966,
-      "src/main/git/command-runner/git-command-timeout-behavior.test.ts": 1846,
-      "src/main/git/command-runner/git-command-timeout.test.ts": 62,
-      "src/main/git/command-runner/git-exec-admission-lifetime.test.ts": 483,
-      "src/main/git/command-runner/git-operation-executor.test.ts": 60,
-      "src/main/git/command-runner/git-spawn-admission-lifetime.test.ts": 129,
-      "src/main/git/command-runner/git-stream-admission-lifetime.test.ts": 247,
-      "src/main/git/command-runner/git-subprocess-admission.test.ts": 478,
-      "src/main/git/command-runner/hosted-cli-deadline-log.test.ts": 156,
-      "src/main/git/command-runner/spawned-command-tree-kill.test.ts": 82,
+      "src/main/emulator/android/scrcpy-server-deploy.test.ts": 31,
+      "src/main/emulator/android/scrcpy-stream-session.test.ts": 2989,
+      "src/main/emulator/android/scrcpy-video-frame-parser.test.ts": 238,
+      "src/main/emulator/android/uiautomator-tree.test.ts": 33,
+      "src/main/emulator/backends/android-emulator-backend.test.ts": 176,
+      "src/main/emulator/backends/ios-emulator-backend.test.ts": 162,
+      "src/main/emulator/emulator-availability.test.ts": 52,
+      "src/main/emulator/emulator-bridge.test.ts": 417,
+      "src/main/emulator/emulator-gesture-sender.test.ts": 194,
+      "src/main/emulator/emulator-session-registry.test.ts": 38,
+      "src/main/emulator/emulator-start-lease-registry.test.ts": 116,
+      "src/main/emulator/mjpeg-frame-parser.test.ts": 50,
+      "src/main/emulator/mjpeg-frame-stream.test.ts": 143,
+      "src/main/emulator/scrcpy-video-registry.test.ts": 43,
+      "src/main/emulator/serve-sim-accessibility-tree.test.ts": 134,
+      "src/main/emulator/serve-sim-ax-normalization.test.ts": 50,
+      "src/main/emulator/serve-sim-detached-session.test.ts": 32,
+      "src/main/emulator/serve-sim-execution.test.ts": 100,
+      "src/main/emulator/serve-sim-helper-processes.test.ts": 64,
+      "src/main/emulator/serve-sim-runtime-materializer.test.ts": 98,
+      "src/main/emulator/simctl-simulator-devices.test.ts": 61,
+      "src/main/ephemeral-vm-recipe-runner.test.ts": 516,
+      "src/main/ephemeral-vm-resume-integrity.test.ts": 163,
+      "src/main/ephemeral-vm-runtime-service.test.ts": 944,
+      "src/main/ephemeral-vm-runtime-ssh-cleanup.test.ts": 133,
+      "src/main/external-editor-launch.test.ts": 58,
+      "src/main/fish-history-session.test.ts": 91,
+      "src/main/folder-upgrade-worktree-path.test.ts": 45,
+      "src/main/gemini/hook-service.test.ts": 59,
+      "src/main/ghostty/discovery.test.ts": 79,
+      "src/main/ghostty/index.test.ts": 89,
+      "src/main/ghostty/mapper-extended.test.ts": 56,
+      "src/main/ghostty/mapper.test.ts": 74,
+      "src/main/ghostty/parser.test.ts": 40,
+      "src/main/ghostty/theme-import.test.ts": 100,
+      "src/main/ghostty/theme-resolution.test.ts": 75,
+      "src/main/git-bash.test.ts": 49,
+      "src/main/git/add-sparse-worktree.test.ts": 166,
+      "src/main/git/admission-tier-plumbing.test.ts": 38,
+      "src/main/git/branch-rename.test.ts": 50,
+      "src/main/git/canonical-repo-key.test.ts": 112,
+      "src/main/git/check-ignored-paths.test.ts": 45,
+      "src/main/git/coalesced-probe.test.ts": 54,
+      "src/main/git/command-runner/gh-exec-file-deadline.test.ts": 135,
+      "src/main/git/command-runner/gh-spawn-boundary.test.ts": 802,
+      "src/main/git/command-runner/git-admission-output-parity.test.ts": 246,
+      "src/main/git/command-runner/git-admission-span.test.ts": 324,
+      "src/main/git/command-runner/git-admission-storm-measurement.test.ts": 26034,
+      "src/main/git/command-runner/git-command-timeout-behavior.test.ts": 1860,
+      "src/main/git/command-runner/git-command-timeout.test.ts": 55,
+      "src/main/git/command-runner/git-exec-admission-lifetime.test.ts": 485,
+      "src/main/git/command-runner/git-operation-executor.test.ts": 86,
+      "src/main/git/command-runner/git-spawn-admission-lifetime.test.ts": 108,
+      "src/main/git/command-runner/git-stream-admission-lifetime.test.ts": 224,
+      "src/main/git/command-runner/git-subprocess-admission.test.ts": 364,
+      "src/main/git/command-runner/hosted-cli-deadline-log.test.ts": 103,
+      "src/main/git/command-runner/spawned-command-tree-kill.test.ts": 43,
       "src/main/git/command-runner/wsl-command-resolution-windows-binary.test.ts": 95,
-      "src/main/git/command-runner/wsl-host-failure.test.ts": 143,
-      "src/main/git/commit-object-ref.test.ts": 40,
-      "src/main/git/commit.test.ts": 183,
-      "src/main/git/exact-ref-probe.test.ts": 64,
-      "src/main/git/fetch-error-classification.test.ts": 58,
-      "src/main/git/fork-remote-refspec.test.ts": 55,
-      "src/main/git/fork-remote-stale-branch-refspec.test.ts": 57,
-      "src/main/git/gh-rate-limit-breaker.test.ts": 52,
+      "src/main/git/command-runner/wsl-host-failure.test.ts": 155,
+      "src/main/git/commit-object-ref.test.ts": 46,
+      "src/main/git/commit.test.ts": 129,
+      "src/main/git/exact-ref-probe.test.ts": 45,
+      "src/main/git/fetch-error-classification.test.ts": 43,
+      "src/main/git/fork-remote-refspec.test.ts": 50,
+      "src/main/git/fork-remote-stale-branch-refspec.test.ts": 54,
+      "src/main/git/gh-rate-limit-breaker.test.ts": 80,
       "src/main/git/git-capability-state.test.ts": 51,
-      "src/main/git/git-status-read-lease-owner.test.ts": 69,
-      "src/main/git/git-upstream-status-read-owner.test.ts": 51,
-      "src/main/git/git-username.test.ts": 124,
-      "src/main/git/hosted-remote-url.test.ts": 40,
-      "src/main/git/huge-folder-ignore.test.ts": 70,
-      "src/main/git/local-repo-ref-maintenance.test.ts": 279,
-      "src/main/git/pack-refs-lock-ownership.test.ts": 101,
-      "src/main/git/porcelain-v1-records.test.ts": 112,
-      "src/main/git/remote-name-listing.test.ts": 67,
-      "src/main/git/remote-ref-probe-cache.test.ts": 81,
-      "src/main/git/remote-url-probe.test.ts": 66,
-      "src/main/git/remote.test.ts": 884,
-      "src/main/git/remove-worktree-branch-cleanup.test.ts": 167,
-      "src/main/git/remove-worktree-clean-preflight.test.ts": 114,
-      "src/main/git/remove-worktree.test.ts": 176,
-      "src/main/git/repo-api-parity.test.ts": 105,
-      "src/main/git/repo-branch-conflict-batched-probe.test.ts": 56,
-      "src/main/git/repo-branch-conflict-real-git.test.ts": 363,
-      "src/main/git/repo-branch-conflict.test.ts": 151,
-      "src/main/git/repo-clone-path.test.ts": 67,
-      "src/main/git/repo-default-base-timeout.test.ts": 103,
-      "src/main/git/repo-default-remote.test.ts": 99,
-      "src/main/git/repo-detection.test.ts": 496,
-      "src/main/git/repo-ref-maintenance-real-git.test.ts": 1346,
-      "src/main/git/repo-remote-drift-real.test.ts": 345,
-      "src/main/git/repo-remote-drift.test.ts": 211,
-      "src/main/git/repo-search-ref-compat.test.ts": 95,
-      "src/main/git/repo-username.test.ts": 224,
-      "src/main/git/repo.test.ts": 2341,
-      "src/main/git/runner-command-exec.test.ts": 711,
-      "src/main/git/runner-gh-account-binding.test.ts": 186,
-      "src/main/git/runner-gh-host-args.test.ts": 177,
-      "src/main/git/runner-gh-rate-limit-breaker.test.ts": 198,
-      "src/main/git/runner-windows-host-environment.test.ts": 176,
-      "src/main/git/runner-wsl-direct-read.test.ts": 1810,
-      "src/main/git/runner-wsl-gh-fallback.test.ts": 990,
-      "src/main/git/runner-wsl-linked-gitdir-timeout.test.ts": 167,
-      "src/main/git/runner-wsl-linked-gitdir-windows.test.ts": 304,
-      "src/main/git/runner-wsl-login-shell-capture.test.ts": 161,
-      "src/main/git/runner-wsl-read-routing.test.ts": 138,
-      "src/main/git/runner.test.ts": 145,
-      "src/main/git/settled-diff-cache-bounds.test.ts": 42,
-      "src/main/git/source-control/bulk-pathspec-command-line-budget.test.ts": 250,
-      "src/main/git/source-control/resolve-git-dir.test.ts": 57,
-      "src/main/git/source-control/wsl-tracked-pathspec-banner.test.ts": 146,
-      "src/main/git/status-branch-compare-real-ref.test.ts": 363,
-      "src/main/git/status-branch-compare.test.ts": 215,
-      "src/main/git/status-branch-line-total-exec-contract.test.ts": 1324,
-      "src/main/git/status-branch-line-total-real-git.test.ts": 1211,
-      "src/main/git/status-branch-line-total-relay-parity.test.ts": 763,
-      "src/main/git/status-conflict-operations.test.ts": 130,
-      "src/main/git/status-conflict-overlap.bench.test.ts": 285,
-      "src/main/git/status-cquoted-paths.test.ts": 332,
-      "src/main/git/status-diff-settled-cache.test.ts": 332,
-      "src/main/git/status-diff.test.ts": 168,
-      "src/main/git/status-discard-and-bulk-staging.test.ts": 325,
-      "src/main/git/status-discard-symlink.test.ts": 636,
-      "src/main/git/status-line-stats-host-paths.test.ts": 77,
-      "src/main/git/status-pathspec-literals.test.ts": 373,
-      "src/main/git/status-porcelain-parser.test.ts": 40,
-      "src/main/git/status-read-coalescing.test.ts": 156,
-      "src/main/git/status-shared-symlinks.test.ts": 883,
-      "src/main/git/status-submodule-path-cache.test.ts": 892,
-      "src/main/git/status-submodule.test.ts": 171,
+      "src/main/git/git-status-read-lease-owner.test.ts": 33,
+      "src/main/git/git-upstream-status-read-owner.test.ts": 40,
+      "src/main/git/git-username.test.ts": 173,
+      "src/main/git/hosted-remote-url.test.ts": 44,
+      "src/main/git/huge-folder-ignore.test.ts": 59,
+      "src/main/git/local-repo-ref-maintenance.test.ts": 298,
+      "src/main/git/pack-refs-lock-ownership.test.ts": 80,
+      "src/main/git/porcelain-v1-records.test.ts": 197,
+      "src/main/git/remote-name-listing.test.ts": 59,
+      "src/main/git/remote-ref-probe-cache.test.ts": 46,
+      "src/main/git/remote-url-probe.test.ts": 73,
+      "src/main/git/remote.test.ts": 564,
+      "src/main/git/remove-worktree-branch-cleanup.test.ts": 163,
+      "src/main/git/remove-worktree-clean-preflight.test.ts": 125,
+      "src/main/git/remove-worktree.test.ts": 159,
+      "src/main/git/repo-branch-conflict-batched-probe.test.ts": 73,
+      "src/main/git/repo-branch-conflict-real-git.test.ts": 351,
+      "src/main/git/repo-branch-conflict.test.ts": 214,
+      "src/main/git/repo-clone-path.test.ts": 50,
+      "src/main/git/repo-default-base-timeout.test.ts": 66,
+      "src/main/git/repo-default-remote.test.ts": 73,
+      "src/main/git/repo-detection.test.ts": 697,
+      "src/main/git/repo-ref-maintenance-real-git.test.ts": 1124,
+      "src/main/git/repo-remote-drift-real.test.ts": 320,
+      "src/main/git/repo-remote-drift.test.ts": 190,
+      "src/main/git/repo-search-ref-compat.test.ts": 93,
+      "src/main/git/repo-username.test.ts": 190,
+      "src/main/git/repo.test.ts": 2242,
+      "src/main/git/runner-command-exec.test.ts": 708,
+      "src/main/git/runner-gh-account-binding.test.ts": 199,
+      "src/main/git/runner-gh-host-args.test.ts": 184,
+      "src/main/git/runner-gh-rate-limit-breaker.test.ts": 204,
+      "src/main/git/runner-windows-host-environment.test.ts": 285,
+      "src/main/git/runner-wsl-direct-read.test.ts": 1893,
+      "src/main/git/runner-wsl-gh-fallback.test.ts": 924,
+      "src/main/git/runner-wsl-linked-gitdir-timeout.test.ts": 175,
+      "src/main/git/runner-wsl-linked-gitdir-windows.test.ts": 292,
+      "src/main/git/runner-wsl-login-shell-capture.test.ts": 125,
+      "src/main/git/runner-wsl-read-routing.test.ts": 169,
+      "src/main/git/runner.test.ts": 120,
+      "src/main/git/settled-diff-cache-bounds.test.ts": 66,
+      "src/main/git/source-control/bulk-pathspec-command-line-budget.test.ts": 218,
+      "src/main/git/source-control/resolve-git-dir.test.ts": 42,
+      "src/main/git/source-control/wsl-tracked-pathspec-banner.test.ts": 171,
+      "src/main/git/status-branch-compare-real-ref.test.ts": 229,
+      "src/main/git/status-branch-compare.test.ts": 157,
+      "src/main/git/status-branch-line-total-exec-contract.test.ts": 1673,
+      "src/main/git/status-branch-line-total-real-git.test.ts": 1107,
+      "src/main/git/status-branch-line-total-relay-parity.test.ts": 590,
+      "src/main/git/status-conflict-operations.test.ts": 216,
+      "src/main/git/status-conflict-overlap.bench.test.ts": 272,
+      "src/main/git/status-cquoted-paths.test.ts": 237,
+      "src/main/git/status-diff-settled-cache.test.ts": 426,
+      "src/main/git/status-diff.test.ts": 235,
+      "src/main/git/status-discard-and-bulk-staging.test.ts": 300,
+      "src/main/git/status-discard-symlink.test.ts": 661,
+      "src/main/git/status-line-stats-host-paths.test.ts": 78,
+      "src/main/git/status-pathspec-literals.test.ts": 464,
+      "src/main/git/status-porcelain-parser.test.ts": 47,
+      "src/main/git/status-read-coalescing.test.ts": 223,
+      "src/main/git/status-shared-symlinks.test.ts": 803,
+      "src/main/git/status-submodule-path-cache.test.ts": 895,
+      "src/main/git/status-submodule.test.ts": 231,
       "src/main/git/status-symlink-probe-budget.test.ts": 145,
-      "src/main/git/status-upstream-negative-cache.test.ts": 1469,
-      "src/main/git/status-upstream-probe-churn.test.ts": 211,
-      "src/main/git/status-upstream-ref.test.ts": 31,
-      "src/main/git/status-wsl-pathspecs.test.ts": 198,
-      "src/main/git/status.test.ts": 312,
-      "src/main/git/upstream-deferred-fork-remote-real.test.ts": 236,
-      "src/main/git/upstream.test.ts": 384,
-      "src/main/git/worktree-add-creation-config.test.ts": 279,
-      "src/main/git/worktree-add-local-base-refresh.test.ts": 216,
-      "src/main/git/worktree-add-local-base-suggestion.test.ts": 190,
-      "src/main/git/worktree-add-timeout-override.test.ts": 249,
-      "src/main/git/worktree-base-divergence-real-git.test.ts": 1596,
-      "src/main/git/worktree-base-divergence.test.ts": 111,
-      "src/main/git/worktree-base-ref-probe.test.ts": 63,
-      "src/main/git/worktree-common-dir-comparison.test.ts": 237,
-      "src/main/git/worktree-configured-paths-concurrency.test.ts": 88,
-      "src/main/git/worktree-create-admission-tier.test.ts": 244,
-      "src/main/git/worktree-create-git-executor-real-git.test.ts": 452,
-      "src/main/git/worktree-create-preparation-real-git.test.ts": 2328,
-      "src/main/git/worktree-create-preparation-real-wsl.test.ts": 232,
-      "src/main/git/worktree-created-description-real-git.test.ts": 1363,
-      "src/main/git/worktree-created-disk-witness.test.ts": 156,
-      "src/main/git/worktree-deferred-removal-real-git.test.ts": 878,
-      "src/main/git/worktree-diff-stamp-guest-gitdir.test.ts": 46,
-      "src/main/git/worktree-diff-stamp-host-paths.test.ts": 51,
-      "src/main/git/worktree-git-capabilities.test.ts": 277,
-      "src/main/git/worktree-graph-listing.test.ts": 244,
-      "src/main/git/worktree-include-file.test.ts": 107,
-      "src/main/git/worktree-list-paths.test.ts": 556,
-      "src/main/git/worktree-list-porcelain.test.ts": 173,
-      "src/main/git/worktree-listing-created-sparse-distro.test.ts": 188,
-      "src/main/git/worktree-listing-sparse-distro.test.ts": 180,
-      "src/main/git/worktree-move.test.ts": 131,
-      "src/main/git/worktree-mutation-route-invalidation.test.ts": 199,
-      "src/main/git/worktree-porcelain-parsing.test.ts": 258,
-      "src/main/git/worktree-posix-path-case-sensitivity.test.ts": 125,
-      "src/main/git/worktree-preparation-base-oid.test.ts": 162,
-      "src/main/git/worktree-preparation-cancel-latency.bench.test.ts": 292,
-      "src/main/git/worktree-removal-large-tree.bench.test.ts": 266,
-      "src/main/git/worktree-remove-branch-deletion.test.ts": 217,
-      "src/main/git/worktree-scan-cache-annotation-reuse.test.ts": 290,
-      "src/main/git/worktree-scan-cache-sharing.test.ts": 270,
-      "src/main/git/worktree-separate-git-dir.test.ts": 507,
-      "src/main/git/worktree-shared-directories.test.ts": 1222,
-      "src/main/git/worktree-sparse-checkout-cache.test.ts": 223,
-      "src/main/git/worktree-sparse-checkout.test.ts": 603,
-      "src/main/git/worktree-sparse-state-host-paths.test.ts": 225,
-      "src/main/git/worktree-symlink-detection.test.ts": 38,
-      "src/main/git/wsl-direct-git-read-commands.test.ts": 50,
-      "src/main/git/wsl-linked-worktree-git-route-invalidation.test.ts": 59,
-      "src/main/git/wsl-linked-worktree-git-routing.test.ts": 156,
-      "src/main/git/wsl-process-group-termination.test.ts": 75,
-      "src/main/gitea/client.test.ts": 173,
-      "src/main/gitea/pull-request-creation.test.ts": 140,
-      "src/main/gitea/pull-request-mappers.test.ts": 43,
-      "src/main/gitea/repository-ref.test.ts": 120,
-      "src/main/github/auth-diagnose.test.ts": 60,
-      "src/main/github/client-create-pr.test.ts": 303,
-      "src/main/github/client-file-viewed.test.ts": 306,
-      "src/main/github/client-issue-origin-preference.test.ts": 262,
-      "src/main/github/client-issue-source.test.ts": 559,
-      "src/main/github/client-merge-queue-auto-merge.test.ts": 378,
-      "src/main/github/client-merged-pr-visibility.test.ts": 362,
-      "src/main/github/client-pr-branch-discovery.test.ts": 343,
-      "src/main/github/client-pr-check-details.test.ts": 289,
-      "src/main/github/client-pr-checks.test.ts": 355,
-      "src/main/github/client-pr-comment-reactions.test.ts": 341,
-      "src/main/github/client-pr-conflict-summary.test.ts": 355,
-      "src/main/github/client-pr-fallback-number.test.ts": 393,
-      "src/main/github/client-pr-linked-lookup.test.ts": 364,
-      "src/main/github/client-pr-local-runtime.test.ts": 219,
-      "src/main/github/client-pr-push-target.test.ts": 330,
-      "src/main/github/client-pr-state.test.ts": 354,
-      "src/main/github/client-rate-limit-block.test.ts": 322,
-      "src/main/github/client-ssh-provider-execution-boundary.test.ts": 322,
-      "src/main/github/client-stack-merge-guard.test.ts": 385,
-      "src/main/github/client-starred.test.ts": 374,
-      "src/main/github/client-tracked-upstream-fork-owner.test.ts": 228,
-      "src/main/github/client-tracked-upstream-snapshot.test.ts": 640,
-      "src/main/github/client-work-item-check-summary.test.ts": 308,
-      "src/main/github/client-work-items-query-paging.test.ts": 266,
-      "src/main/github/client-work-items.test.ts": 338,
-      "src/main/github/comment-reactions.test.ts": 24,
-      "src/main/github/conflict-summary.test.ts": 104,
-      "src/main/github/default-branch-stale-pr.test.ts": 232,
-      "src/main/github/gh-account-token.test.ts": 59,
-      "src/main/github/gh-capability-state.test.ts": 54,
-      "src/main/github/gh-utils-concurrency.test.ts": 186,
-      "src/main/github/gh-utils.test.ts": 542,
-      "src/main/github/github-api-repository-validation.test.ts": 52,
-      "src/main/github/github-api-repository.test.ts": 395,
-      "src/main/github/github-enterprise-repository.test.ts": 75,
-      "src/main/github/github-pr-stack.test.ts": 143,
-      "src/main/github/github-remote-identity-parsing.test.ts": 53,
+      "src/main/git/status-upstream-negative-cache.test.ts": 1303,
+      "src/main/git/status-upstream-probe-churn.test.ts": 169,
+      "src/main/git/status-upstream-ref.test.ts": 42,
+      "src/main/git/status-wsl-pathspecs.test.ts": 132,
+      "src/main/git/status.test.ts": 212,
+      "src/main/git/upstream-deferred-fork-remote-real.test.ts": 217,
+      "src/main/git/upstream.test.ts": 388,
+      "src/main/git/worktree-add-creation-config.test.ts": 237,
+      "src/main/git/worktree-add-local-base-refresh.test.ts": 281,
+      "src/main/git/worktree-add-local-base-suggestion.test.ts": 178,
+      "src/main/git/worktree-add-timeout-override.test.ts": 199,
+      "src/main/git/worktree-base-divergence-real-git.test.ts": 1614,
+      "src/main/git/worktree-base-divergence.test.ts": 93,
+      "src/main/git/worktree-base-ref-probe.test.ts": 38,
+      "src/main/git/worktree-common-dir-comparison.test.ts": 177,
+      "src/main/git/worktree-configured-paths-concurrency.test.ts": 86,
+      "src/main/git/worktree-create-admission-tier.test.ts": 245,
+      "src/main/git/worktree-create-git-executor-real-git.test.ts": 356,
+      "src/main/git/worktree-create-preparation-real-git.test.ts": 1406,
+      "src/main/git/worktree-create-preparation-real-wsl.test.ts": 271,
+      "src/main/git/worktree-created-description-real-git.test.ts": 1340,
+      "src/main/git/worktree-created-disk-witness.test.ts": 149,
+      "src/main/git/worktree-deferred-removal-real-git.test.ts": 587,
+      "src/main/git/worktree-diff-stamp-guest-gitdir.test.ts": 40,
+      "src/main/git/worktree-diff-stamp-host-paths.test.ts": 55,
+      "src/main/git/worktree-git-capabilities.test.ts": 248,
+      "src/main/git/worktree-graph-listing.test.ts": 205,
+      "src/main/git/worktree-include-file.test.ts": 104,
+      "src/main/git/worktree-list-paths.test.ts": 571,
+      "src/main/git/worktree-list-porcelain.test.ts": 163,
+      "src/main/git/worktree-listing-created-sparse-distro.test.ts": 291,
+      "src/main/git/worktree-listing-sparse-distro.test.ts": 188,
+      "src/main/git/worktree-move.test.ts": 195,
+      "src/main/git/worktree-mutation-route-invalidation.test.ts": 145,
+      "src/main/git/worktree-porcelain-parsing.test.ts": 210,
+      "src/main/git/worktree-posix-path-case-sensitivity.test.ts": 134,
+      "src/main/git/worktree-preparation-base-oid.test.ts": 99,
+      "src/main/git/worktree-preparation-cancel-latency.bench.test.ts": 248,
+      "src/main/git/worktree-removal-large-tree.bench.test.ts": 291,
+      "src/main/git/worktree-remove-branch-deletion.test.ts": 194,
+      "src/main/git/worktree-scan-cache-annotation-reuse.test.ts": 241,
+      "src/main/git/worktree-scan-cache-sharing.test.ts": 284,
+      "src/main/git/worktree-separate-git-dir.test.ts": 614,
+      "src/main/git/worktree-shared-directories.test.ts": 1301,
+      "src/main/git/worktree-sparse-checkout-cache.test.ts": 234,
+      "src/main/git/worktree-sparse-checkout.test.ts": 675,
+      "src/main/git/worktree-sparse-state-host-paths.test.ts": 252,
+      "src/main/git/worktree-symlink-detection.test.ts": 55,
+      "src/main/git/wsl-direct-git-read-commands.test.ts": 54,
+      "src/main/git/wsl-linked-worktree-git-route-invalidation.test.ts": 81,
+      "src/main/git/wsl-linked-worktree-git-routing.test.ts": 105,
+      "src/main/git/wsl-process-group-termination.test.ts": 44,
+      "src/main/gitea/client-scan-invalidation.test.ts": 181,
+      "src/main/gitea/client.test.ts": 192,
+      "src/main/gitea/pull-request-creation.test.ts": 228,
+      "src/main/gitea/pull-request-mappers.test.ts": 56,
+      "src/main/gitea/repository-ref.test.ts": 71,
+      "src/main/github/auth-diagnose.test.ts": 51,
+      "src/main/github/client-create-pr.test.ts": 356,
+      "src/main/github/client-file-viewed.test.ts": 430,
+      "src/main/github/client-issue-origin-preference.test.ts": 247,
+      "src/main/github/client-issue-source.test.ts": 1603,
+      "src/main/github/client-merge-queue-auto-merge.test.ts": 342,
+      "src/main/github/client-merged-pr-visibility.test.ts": 343,
+      "src/main/github/client-pr-branch-discovery.test.ts": 352,
+      "src/main/github/client-pr-check-details.test.ts": 228,
+      "src/main/github/client-pr-checks.test.ts": 383,
+      "src/main/github/client-pr-comment-reactions.test.ts": 281,
+      "src/main/github/client-pr-conflict-summary.test.ts": 374,
+      "src/main/github/client-pr-fallback-number.test.ts": 347,
+      "src/main/github/client-pr-linked-lookup.test.ts": 310,
+      "src/main/github/client-pr-local-runtime.test.ts": 291,
+      "src/main/github/client-pr-push-target.test.ts": 222,
+      "src/main/github/client-pr-state.test.ts": 355,
+      "src/main/github/client-rate-limit-block.test.ts": 298,
+      "src/main/github/client-ssh-provider-execution-boundary.test.ts": 341,
+      "src/main/github/client-stack-merge-guard.test.ts": 422,
+      "src/main/github/client-starred.test.ts": 335,
+      "src/main/github/client-tracked-upstream-fork-owner.test.ts": 366,
+      "src/main/github/client-tracked-upstream-snapshot.test.ts": 618,
+      "src/main/github/client-work-item-check-summary.test.ts": 193,
+      "src/main/github/client-work-items-query-paging.test.ts": 354,
+      "src/main/github/client-work-items.test.ts": 235,
+      "src/main/github/comment-reactions.test.ts": 28,
+      "src/main/github/conflict-summary.test.ts": 50,
+      "src/main/github/default-branch-stale-pr.test.ts": 295,
+      "src/main/github/gh-account-token.test.ts": 66,
+      "src/main/github/gh-capability-state.test.ts": 37,
+      "src/main/github/gh-utils-concurrency.test.ts": 95,
+      "src/main/github/gh-utils.test.ts": 172,
+      "src/main/github/github-api-repository-validation.test.ts": 33,
+      "src/main/github/github-api-repository.test.ts": 276,
+      "src/main/github/github-enterprise-repository.test.ts": 144,
+      "src/main/github/github-pr-stack.test.ts": 79,
+      "src/main/github/github-remote-identity-parsing.test.ts": 40,
       "src/main/github/github-repository-identity.fork-owner-repo.test.ts": 404,
-      "src/main/github/github-repository-identity.gh-account.test.ts": 107,
-      "src/main/github/github-repository-identity.signed-cache.test.ts": 151,
-      "src/main/github/github-repository-identity.ssh-host-alias.test.ts": 201,
-      "src/main/github/issues.test.ts": 247,
-      "src/main/github/pr-head-tracking-ref.test.ts": 58,
-      "src/main/github/pr-refresh-coordinator-active-burst-pacing.test.ts": 374,
-      "src/main/github/pr-refresh-coordinator-active-visible-priority.test.ts": 315,
-      "src/main/github/pr-refresh-coordinator-alias-coalescing.test.ts": 402,
-      "src/main/github/pr-refresh-coordinator-rate-limit-budget.test.ts": 222,
-      "src/main/github/pr-refresh-coordinator-refresh-events.test.ts": 408,
-      "src/main/github/pr-refresh-coordinator-visible-follow-up.test.ts": 295,
-      "src/main/github/pr-refresh-error-classification.test.ts": 38,
-      "src/main/github/pr-refresh-queue-growth-bound.test.ts": 365,
-      "src/main/github/pr-refresh-validation-backoff.test.ts": 51,
-      "src/main/github/pr-review-comment-lines.test.ts": 49,
-      "src/main/github/pr-start-point-compare-base.test.ts": 71,
-      "src/main/github/pr-start-point.test.ts": 86,
-      "src/main/github/project-view-host-auth.test.ts": 111,
-      "src/main/github/project-view.test.ts": 216,
-      "src/main/github/project-view/mutations.test.ts": 83,
-      "src/main/github/project-view/project-field-mutations.test.ts": 48,
-      "src/main/github/project-view/project-view-table.test.ts": 202,
-      "src/main/github/project-view/repository-field-options.test.ts": 70,
-      "src/main/github/rate-limit.test.ts": 79,
-      "src/main/github/review-head-remote.test.ts": 64,
-      "src/main/github/stacked-pr-creation.test.ts": 70,
-      "src/main/github/work-item-details-api-parity.test.ts": 412,
-      "src/main/github/work-item-details-concurrency.test.ts": 73,
-      "src/main/github/work-item-details-enterprise-host.test.ts": 183,
-      "src/main/github/work-item-details-file-viewed.test.ts": 212,
-      "src/main/github/work-item-details-pr-files.test.ts": 206,
-      "src/main/github/work-item-details.test.ts": 257,
-      "src/main/github/work-item-search-fallback-environment.test.ts": 232,
-      "src/main/github/work-item-search-freshness.test.ts": 1073,
-      "src/main/github/work-item-search-isolation.test.ts": 364,
-      "src/main/github/work-item-search-pagination.test.ts": 391,
-      "src/main/github/work-item-search-semantics.test.ts": 333,
-      "src/main/gitlab/client-mr-auth-rate-limit.test.ts": 181,
-      "src/main/gitlab/client-mr-branch-lookup.test.ts": 173,
-      "src/main/gitlab/client-mr-job-ci.test.ts": 141,
-      "src/main/gitlab/client-mr-listing.test.ts": 174,
-      "src/main/gitlab/client-mr-review-actions.test.ts": 186,
-      "src/main/gitlab/client-work-items.test.ts": 152,
-      "src/main/gitlab/client.test.ts": 182,
-      "src/main/gitlab/gitlab-known-host-probe-wsl-fallback.test.ts": 173,
-      "src/main/gitlab/gitlab-known-host-probe.test.ts": 77,
-      "src/main/gitlab/gitlab-known-host-retirement.test.ts": 140,
-      "src/main/gitlab/gl-utils.test.ts": 167,
-      "src/main/gitlab/issues.test.ts": 230,
-      "src/main/gitlab/mappers-workitem.test.ts": 44,
-      "src/main/gitlab/mappers.test.ts": 59,
-      "src/main/gitlab/merge-request-creation.test.ts": 63,
-      "src/main/gitlab/mr-head-tracking-ref.test.ts": 47,
-      "src/main/gitlab/project-ref-parser.test.ts": 46,
-      "src/main/gitlab/work-item-details.test.ts": 104,
-      "src/main/global-fetch-call-site-audit.test.ts": 304,
-      "src/main/grok-accounts/status.test.ts": 47,
-      "src/main/grok/grok-hook-config-file.test.ts": 159,
-      "src/main/grok/grok-hook-owners.test.ts": 68,
-      "src/main/grok/grok-hook-remnant-removal.test.ts": 103,
-      "src/main/grok/grok-hook-stdin-no-eof.test.ts": 485,
-      "src/main/grok/hook-service.test.ts": 243,
-      "src/main/grok/windows-grok-hook-script.test.ts": 107,
-      "src/main/grok/windows-hook-launcher-chain.test.ts": 79,
+      "src/main/github/github-repository-identity.gh-account.test.ts": 164,
+      "src/main/github/github-repository-identity.signed-cache.test.ts": 171,
+      "src/main/github/github-repository-identity.ssh-host-alias.test.ts": 171,
+      "src/main/github/issues.test.ts": 109,
+      "src/main/github/pr-head-tracking-ref.test.ts": 74,
+      "src/main/github/pr-refresh-coordinator-active-burst-pacing.test.ts": 202,
+      "src/main/github/pr-refresh-coordinator-active-visible-priority.test.ts": 297,
+      "src/main/github/pr-refresh-coordinator-alias-coalescing.test.ts": 329,
+      "src/main/github/pr-refresh-coordinator-rate-limit-budget.test.ts": 302,
+      "src/main/github/pr-refresh-coordinator-refresh-events.test.ts": 331,
+      "src/main/github/pr-refresh-coordinator-visible-follow-up.test.ts": 280,
+      "src/main/github/pr-refresh-error-classification.test.ts": 45,
+      "src/main/github/pr-refresh-queue-growth-bound.test.ts": 623,
+      "src/main/github/pr-refresh-validation-backoff.test.ts": 58,
+      "src/main/github/pr-review-comment-lines.test.ts": 36,
+      "src/main/github/pr-start-point-compare-base.test.ts": 76,
+      "src/main/github/pr-start-point.test.ts": 95,
+      "src/main/github/project-view-host-auth.test.ts": 116,
+      "src/main/github/project-view.test.ts": 113,
+      "src/main/github/project-view/mutations.test.ts": 57,
+      "src/main/github/project-view/project-field-mutations.test.ts": 58,
+      "src/main/github/project-view/project-view-table.test.ts": 175,
+      "src/main/github/project-view/repository-field-options.test.ts": 44,
+      "src/main/github/rate-limit.test.ts": 68,
+      "src/main/github/review-head-remote.test.ts": 54,
+      "src/main/github/stacked-pr-creation.test.ts": 62,
+      "src/main/github/work-item-details-api-parity.test.ts": 295,
+      "src/main/github/work-item-details-concurrency.test.ts": 50,
+      "src/main/github/work-item-details-enterprise-host.test.ts": 203,
+      "src/main/github/work-item-details-file-viewed.test.ts": 236,
+      "src/main/github/work-item-details-pr-files.test.ts": 225,
+      "src/main/github/work-item-details.test.ts": 249,
+      "src/main/github/work-item-search-fallback-environment.test.ts": 208,
+      "src/main/github/work-item-search-freshness.test.ts": 1026,
+      "src/main/github/work-item-search-isolation.test.ts": 434,
+      "src/main/github/work-item-search-pagination.test.ts": 284,
+      "src/main/github/work-item-search-semantics.test.ts": 372,
+      "src/main/gitlab/client-mr-auth-rate-limit.test.ts": 142,
+      "src/main/gitlab/client-mr-branch-lookup.test.ts": 184,
+      "src/main/gitlab/client-mr-job-ci.test.ts": 83,
+      "src/main/gitlab/client-mr-listing.test.ts": 138,
+      "src/main/gitlab/client-mr-review-actions.test.ts": 154,
+      "src/main/gitlab/client-work-items.test.ts": 230,
+      "src/main/gitlab/client.test.ts": 260,
+      "src/main/gitlab/gitlab-known-host-probe-wsl-fallback.test.ts": 180,
+      "src/main/gitlab/gitlab-known-host-probe.test.ts": 71,
+      "src/main/gitlab/gitlab-known-host-retirement.test.ts": 235,
+      "src/main/gitlab/gl-utils.test.ts": 120,
+      "src/main/gitlab/issues.test.ts": 257,
+      "src/main/gitlab/mappers-workitem.test.ts": 62,
+      "src/main/gitlab/mappers.test.ts": 68,
+      "src/main/gitlab/merge-request-creation.test.ts": 70,
+      "src/main/gitlab/mr-head-tracking-ref.test.ts": 75,
+      "src/main/gitlab/project-ref-parser.test.ts": 58,
+      "src/main/gitlab/work-item-details.test.ts": 114,
+      "src/main/global-fetch-call-site-audit.test.ts": 314,
+      "src/main/grok-accounts/status.test.ts": 56,
+      "src/main/grok/grok-hook-config-file.test.ts": 123,
+      "src/main/grok/grok-hook-owners.test.ts": 97,
+      "src/main/grok/grok-hook-remnant-removal.test.ts": 116,
+      "src/main/grok/grok-hook-stdin-no-eof.test.ts": 472,
+      "src/main/grok/hook-service.test.ts": 174,
+      "src/main/grok/windows-grok-hook-script.test.ts": 133,
+      "src/main/grok/windows-hook-launcher-chain.test.ts": 97,
       "src/main/hang-watchdog/hang-detection-marker.test.ts": 43,
-      "src/main/hang-watchdog/hang-watchdog-detection-loop.test.ts": 45,
-      "src/main/hang-watchdog/hang-watchdog-worker-path.test.ts": 37,
-      "src/main/hang-watchdog/main-thread-hang-telemetry.test.ts": 199,
-      "src/main/hang-watchdog/main-thread-hang-watchdog-entry.test.ts": 61,
-      "src/main/hang-watchdog/main-thread-hang-watchdog.test.ts": 92,
-      "src/main/headless-automation-dispatcher-source-boundary.test.ts": 32,
-      "src/main/hermes/hook-service.test.ts": 444,
-      "src/main/hook-archive-timeout-observation.test.ts": 1033,
-      "src/main/hook-termination-real-process.test.ts": 8170,
-      "src/main/hooks-archive-exit-observation.test.ts": 228,
-      "src/main/hooks-effective-hook-resolution.test.ts": 290,
-      "src/main/hooks-issue-command.test.ts": 399,
-      "src/main/hooks-orca-yaml-parsing.test.ts": 397,
-      "src/main/hooks-runner.test.ts": 186,
-      "src/main/hooks-setup-runner-script.test.ts": 228,
-      "src/main/hooks.test.ts": 409,
-      "src/main/host-tree-removal-asar.electron.test.ts": 664,
-      "src/main/host/deferred-secret-protection-report.test.ts": 91,
-      "src/main/host/electron-secret-store.test.ts": 54,
-      "src/main/host/secret-protection-report.test.ts": 60,
-      "src/main/i18n/main-i18n-lazy-locale.test.ts": 1015,
-      "src/main/ipc/agent-hooks.test.ts": 644,
-      "src/main/ipc/agent-pane-authority-ownership.test.ts": 41,
-      "src/main/ipc/agent-pane-retirement-ipc.test.ts": 71,
-      "src/main/ipc/ai-vault-scan-coalescing.test.ts": 698,
-      "src/main/ipc/ai-vault-search-all-hosts-real-index.test.ts": 2083,
-      "src/main/ipc/ai-vault-search-all-hosts.test.ts": 188,
-      "src/main/ipc/ai-vault-search-merged-cursor.test.ts": 107,
-      "src/main/ipc/ai-vault-search.test.ts": 624,
-      "src/main/ipc/ai-vault.test.ts": 1011,
-      "src/main/ipc/app.test.ts": 415,
-      "src/main/ipc/automations-external-scope.test.ts": 134,
-      "src/main/ipc/bounded-warning-dedupe.test.ts": 50,
-      "src/main/ipc/browser-client-page-metadata-ipc.test.ts": 115,
-      "src/main/ipc/browser-preview-tool-authorization.test.ts": 481,
-      "src/main/ipc/browser-session-profile-ipc.test.ts": 302,
-      "src/main/ipc/browser-tab-registration-wait.test.ts": 204,
-      "src/main/ipc/browser.test.ts": 1575,
-      "src/main/ipc/cli-appimage-stale-registration.test.ts": 276,
+      "src/main/hang-watchdog/hang-watchdog-detection-loop.test.ts": 61,
+      "src/main/hang-watchdog/hang-watchdog-worker-path.test.ts": 59,
+      "src/main/hang-watchdog/main-thread-hang-telemetry.test.ts": 175,
+      "src/main/hang-watchdog/main-thread-hang-watchdog-entry.test.ts": 58,
+      "src/main/hang-watchdog/main-thread-hang-watchdog.test.ts": 78,
+      "src/main/headless-automation-dispatcher-source-boundary.test.ts": 39,
+      "src/main/hermes/hook-service.test.ts": 434,
+      "src/main/hook-archive-timeout-observation.test.ts": 1092,
+      "src/main/hook-termination-real-process.test.ts": 8201,
+      "src/main/hooks-archive-exit-observation.test.ts": 187,
+      "src/main/hooks-effective-hook-resolution.test.ts": 209,
+      "src/main/hooks-issue-command.test.ts": 340,
+      "src/main/hooks-orca-yaml-parsing.test.ts": 201,
+      "src/main/hooks-runner.test.ts": 197,
+      "src/main/hooks-setup-runner-script.test.ts": 219,
+      "src/main/hooks.test.ts": 344,
+      "src/main/host-tree-removal-asar.electron.test.ts": 359,
+      "src/main/host/deferred-secret-protection-report.test.ts": 51,
+      "src/main/host/electron-secret-store.test.ts": 66,
+      "src/main/host/secret-protection-report.test.ts": 74,
+      "src/main/i18n/main-i18n-lazy-locale.test.ts": 323,
+      "src/main/ipc/agent-hooks.test.ts": 661,
+      "src/main/ipc/agent-pane-authority-ownership.test.ts": 31,
+      "src/main/ipc/agent-pane-retirement-ipc.test.ts": 74,
+      "src/main/ipc/ai-vault-scan-coalescing.test.ts": 824,
+      "src/main/ipc/ai-vault-search-all-hosts-real-index.test.ts": 1337,
+      "src/main/ipc/ai-vault-search-all-hosts.test.ts": 194,
+      "src/main/ipc/ai-vault-search-merged-cursor.test.ts": 135,
+      "src/main/ipc/ai-vault-search.test.ts": 517,
+      "src/main/ipc/ai-vault.test.ts": 1998,
+      "src/main/ipc/app.test.ts": 458,
+      "src/main/ipc/automations-external-scope.test.ts": 184,
+      "src/main/ipc/bounded-warning-dedupe.test.ts": 35,
+      "src/main/ipc/browser-client-page-metadata-ipc.test.ts": 144,
+      "src/main/ipc/browser-preview-tool-authorization.test.ts": 582,
+      "src/main/ipc/browser-session-profile-ipc.test.ts": 227,
+      "src/main/ipc/browser-tab-registration-wait.test.ts": 133,
+      "src/main/ipc/browser.test.ts": 824,
+      "src/main/ipc/cli-appimage-stale-registration.test.ts": 285,
       "src/main/ipc/cli.test.ts": 162,
-      "src/main/ipc/codex-config-sync.test.ts": 78,
-      "src/main/ipc/command-path-resolver.test.ts": 44,
-      "src/main/ipc/computer-use-permissions.test.ts": 71,
-      "src/main/ipc/crash-reporting-renderer-breadcrumbs.test.ts": 163,
-      "src/main/ipc/crash-reporting-renderer-error-report-attribution.test.ts": 49,
-      "src/main/ipc/crash-reporting-replay-guard-wedge-burst.test.ts": 71,
-      "src/main/ipc/crash-reporting.test.ts": 135,
-      "src/main/ipc/created-worktree-reconciliation.test.ts": 117,
-      "src/main/ipc/created-worktree-root-prune.test.ts": 349,
-      "src/main/ipc/dashboard-payload-validation.test.ts": 231,
-      "src/main/ipc/dashboard-popout.test.ts": 107,
-      "src/main/ipc/deferred-emoji-shortcode-dataset.test.ts": 140,
-      "src/main/ipc/desktop-renderer-runtime-capabilities.test.ts": 506,
-      "src/main/ipc/developer-permissions.test.ts": 160,
-      "src/main/ipc/diagnostics.test.ts": 100,
-      "src/main/ipc/doc-preview-grant-ipc.test.ts": 81,
-      "src/main/ipc/dropped-path-resolution.test.ts": 69,
-      "src/main/ipc/emulator-stream-listener-cleanup.test.ts": 56,
-      "src/main/ipc/ephemeral-vm-provision-cancel.test.ts": 4157,
-      "src/main/ipc/ephemeral-vm-provisioned-root-ref.test.ts": 1629,
-      "src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts": 885,
-      "src/main/ipc/ephemeral-vm.test.ts": 1094,
-      "src/main/ipc/feedback-image-attachments.test.ts": 92,
-      "src/main/ipc/feedback.test.ts": 233,
-      "src/main/ipc/filesystem-allowed-roots.test.ts": 644,
-      "src/main/ipc/filesystem-auth.test.ts": 1063,
-      "src/main/ipc/filesystem-branch-compare-diff.test.ts": 3135,
-      "src/main/ipc/filesystem-commit-message-generation.test.ts": 3695,
-      "src/main/ipc/filesystem-commit-message-model-discovery.test.ts": 4360,
+      "src/main/ipc/codex-config-sync.test.ts": 46,
+      "src/main/ipc/command-path-resolver.test.ts": 39,
+      "src/main/ipc/computer-use-permissions.test.ts": 73,
+      "src/main/ipc/crash-reporting-renderer-breadcrumbs.test.ts": 100,
+      "src/main/ipc/crash-reporting-renderer-error-report-attribution.test.ts": 67,
+      "src/main/ipc/crash-reporting-replay-guard-wedge-burst.test.ts": 56,
+      "src/main/ipc/crash-reporting.test.ts": 155,
+      "src/main/ipc/created-worktree-reconciliation.test.ts": 118,
+      "src/main/ipc/created-worktree-root-prune.test.ts": 307,
+      "src/main/ipc/dashboard-payload-validation.test.ts": 241,
+      "src/main/ipc/dashboard-popout.test.ts": 97,
+      "src/main/ipc/deferred-emoji-shortcode-dataset.test.ts": 94,
+      "src/main/ipc/desktop-renderer-runtime-capabilities.test.ts": 597,
+      "src/main/ipc/developer-permissions.test.ts": 132,
+      "src/main/ipc/diagnostics.test.ts": 78,
+      "src/main/ipc/doc-preview-grant-ipc.test.ts": 92,
+      "src/main/ipc/dropped-path-resolution.test.ts": 81,
+      "src/main/ipc/emulator-frame-stream-socket-lifetime.test.ts": 139,
+      "src/main/ipc/emulator-renderer-lifetime.test.ts": 113,
+      "src/main/ipc/emulator-stream-listener-cleanup.test.ts": 52,
+      "src/main/ipc/ephemeral-vm-provision-cancel.test.ts": 2605,
+      "src/main/ipc/ephemeral-vm-provisioned-root-ref.test.ts": 1162,
+      "src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts": 816,
+      "src/main/ipc/ephemeral-vm.test.ts": 1095,
+      "src/main/ipc/feedback-image-attachments.test.ts": 78,
+      "src/main/ipc/feedback.test.ts": 175,
+      "src/main/ipc/filesystem-allowed-roots.test.ts": 437,
+      "src/main/ipc/filesystem-auth.test.ts": 1145,
+      "src/main/ipc/filesystem-branch-compare-diff.test.ts": 2519,
+      "src/main/ipc/filesystem-commit-message-generation.test.ts": 3728,
+      "src/main/ipc/filesystem-commit-message-model-discovery.test.ts": 4612,
       "src/main/ipc/filesystem-conflict-operation-routing.test.ts": 3748,
-      "src/main/ipc/filesystem-download-transfers.test.ts": 6684,
-      "src/main/ipc/filesystem-git-commit-dispatch.test.ts": 3047,
-      "src/main/ipc/filesystem-git-status-staging.test.ts": 4466,
-      "src/main/ipc/filesystem-import-ssh-ops.test.ts": 695,
-      "src/main/ipc/filesystem-import-ssh-path-safety.test.ts": 77,
-      "src/main/ipc/filesystem-import-ssh.test.ts": 671,
-      "src/main/ipc/filesystem-import.test.ts": 4711,
-      "src/main/ipc/filesystem-list-files-handler-name-filter.test.ts": 3822,
-      "src/main/ipc/filesystem-list-files-name-filter.test.ts": 268,
-      "src/main/ipc/filesystem-list-files.test.ts": 309,
-      "src/main/ipc/filesystem-markdown-document-listing.test.ts": 3604,
-      "src/main/ipc/filesystem-mutations-runtime-upload.test.ts": 2690,
-      "src/main/ipc/filesystem-mutations.test.ts": 3512,
-      "src/main/ipc/filesystem-path-containment-remote-enoent.test.ts": 48,
-      "src/main/ipc/filesystem-path-containment-unicode-normalization.test.ts": 322,
-      "src/main/ipc/filesystem-pull-request-field-generation.test.ts": 3635,
-      "src/main/ipc/filesystem-runtime-upload-staging.test.ts": 92,
-      "src/main/ipc/filesystem-search-file-paths.test.ts": 521,
-      "src/main/ipc/filesystem-search-rg-timeout.test.ts": 964,
+      "src/main/ipc/filesystem-download-lifetime.test.ts": 673,
+      "src/main/ipc/filesystem-download-transfers.test.ts": 4793,
+      "src/main/ipc/filesystem-git-commit-dispatch.test.ts": 2595,
+      "src/main/ipc/filesystem-git-status-staging.test.ts": 3013,
+      "src/main/ipc/filesystem-import-local-rollback.test.ts": 86,
+      "src/main/ipc/filesystem-import-ssh-ops.test.ts": 545,
+      "src/main/ipc/filesystem-import-ssh-path-safety.test.ts": 94,
+      "src/main/ipc/filesystem-import-ssh.test.ts": 490,
+      "src/main/ipc/filesystem-import.test.ts": 6057,
+      "src/main/ipc/filesystem-list-files-handler-name-filter.test.ts": 3031,
+      "src/main/ipc/filesystem-list-files-name-filter.test.ts": 314,
+      "src/main/ipc/filesystem-list-files.test.ts": 320,
+      "src/main/ipc/filesystem-markdown-document-listing.test.ts": 3120,
+      "src/main/ipc/filesystem-mutations-runtime-upload.test.ts": 2064,
+      "src/main/ipc/filesystem-mutations.test.ts": 3581,
+      "src/main/ipc/filesystem-path-containment-remote-enoent.test.ts": 32,
+      "src/main/ipc/filesystem-path-containment-unicode-normalization.test.ts": 218,
+      "src/main/ipc/filesystem-pull-request-field-generation.test.ts": 3228,
+      "src/main/ipc/filesystem-pull-request-linked-issue-lifetime.test.ts": 2896,
+      "src/main/ipc/filesystem-runtime-upload-staging.test.ts": 140,
+      "src/main/ipc/filesystem-search-file-paths.test.ts": 426,
+      "src/main/ipc/filesystem-search-rg-timeout.test.ts": 1022,
       "src/main/ipc/filesystem-watcher-canonical-root-paths.test.ts": 435,
-      "src/main/ipc/filesystem-watcher-dormant-rearm.test.ts": 138,
-      "src/main/ipc/filesystem-watcher-event-batch.test.ts": 50,
-      "src/main/ipc/filesystem-watcher-ignore.test.ts": 46,
-      "src/main/ipc/filesystem-watcher-large-batch.test.ts": 702,
-      "src/main/ipc/filesystem-watcher-local-events.test.ts": 463,
-      "src/main/ipc/filesystem-watcher-local-unsubscribe.test.ts": 1329,
-      "src/main/ipc/filesystem-watcher-native-capacity.test.ts": 137,
-      "src/main/ipc/filesystem-watcher-real.test.ts": 597,
-      "src/main/ipc/filesystem-watcher-remote-batch.test.ts": 150,
-      "src/main/ipc/filesystem-watcher-remote-cancellation.test.ts": 430,
-      "src/main/ipc/filesystem-watcher-remote-capacity.test.ts": 145,
-      "src/main/ipc/filesystem-watcher-remote-rearm.test.ts": 134,
-      "src/main/ipc/filesystem-watcher-removal-deadline.test.ts": 370,
-      "src/main/ipc/filesystem-watcher-terminal-resync.test.ts": 289,
-      "src/main/ipc/filesystem-watcher-unwatchable-roots.test.ts": 118,
-      "src/main/ipc/filesystem-watcher-wsl.test.ts": 113,
-      "src/main/ipc/filesystem-watcher.test.ts": 2300,
-      "src/main/ipc/filesystem.test.ts": 6346,
-      "src/main/ipc/floating-workspace-directory.test.ts": 94,
-      "src/main/ipc/folder-repo-git-upgrade.test.ts": 2630,
-      "src/main/ipc/git-status-upstream-ref-watch-request.test.ts": 68,
-      "src/main/ipc/github-ipc-channel-parity.test.ts": 298,
-      "src/main/ipc/github-issue-source-preference.test.ts": 384,
-      "src/main/ipc/github-pr-refresh-routing.test.ts": 425,
-      "src/main/ipc/github-repo-access-guards.test.ts": 421,
-      "src/main/ipc/github-ssh-connection-routing.test.ts": 356,
-      "src/main/ipc/github-star-telemetry.test.ts": 382,
-      "src/main/ipc/github-work-item-args.test.ts": 64,
-      "src/main/ipc/github-wsl-runtime-routing.test.ts": 346,
-      "src/main/ipc/gitlab-repo-access.test.ts": 91,
-      "src/main/ipc/gitlab.test.ts": 174,
-      "src/main/ipc/hosted-review.test.ts": 359,
-      "src/main/ipc/jira-cancellable-requests.test.ts": 56,
-      "src/main/ipc/keybindings.test.ts": 49,
-      "src/main/ipc/linear.test.ts": 98,
-      "src/main/ipc/local-log-tail-lifetime.test.ts": 110,
-      "src/main/ipc/local-log-tail.test.ts": 57,
+      "src/main/ipc/filesystem-watcher-document-lifetime.test.ts": 309,
+      "src/main/ipc/filesystem-watcher-dormant-rearm.test.ts": 188,
+      "src/main/ipc/filesystem-watcher-event-batch.test.ts": 38,
+      "src/main/ipc/filesystem-watcher-ignore.test.ts": 53,
+      "src/main/ipc/filesystem-watcher-large-batch.test.ts": 423,
+      "src/main/ipc/filesystem-watcher-local-events.test.ts": 482,
+      "src/main/ipc/filesystem-watcher-local-unsubscribe.test.ts": 1128,
+      "src/main/ipc/filesystem-watcher-native-capacity.test.ts": 198,
+      "src/main/ipc/filesystem-watcher-real.test.ts": 699,
+      "src/main/ipc/filesystem-watcher-remote-batch.test.ts": 127,
+      "src/main/ipc/filesystem-watcher-remote-cancellation.test.ts": 457,
+      "src/main/ipc/filesystem-watcher-remote-capacity.test.ts": 188,
+      "src/main/ipc/filesystem-watcher-remote-rearm.test.ts": 133,
+      "src/main/ipc/filesystem-watcher-removal-deadline.test.ts": 397,
+      "src/main/ipc/filesystem-watcher-terminal-resync.test.ts": 353,
+      "src/main/ipc/filesystem-watcher-unwatchable-roots.test.ts": 125,
+      "src/main/ipc/filesystem-watcher-wsl.test.ts": 90,
+      "src/main/ipc/filesystem-watcher.test.ts": 2230,
+      "src/main/ipc/filesystem.test.ts": 2871,
+      "src/main/ipc/floating-workspace-directory.test.ts": 82,
+      "src/main/ipc/folder-repo-git-upgrade-lifetime.test.ts": 103,
+      "src/main/ipc/folder-repo-git-upgrade.test.ts": 2578,
+      "src/main/ipc/git-status-upstream-ref-watch-request.test.ts": 58,
+      "src/main/ipc/github-ipc-channel-parity.test.ts": 396,
+      "src/main/ipc/github-issue-source-preference.test.ts": 273,
+      "src/main/ipc/github-pr-refresh-routing.test.ts": 206,
+      "src/main/ipc/github-repo-access-guards.test.ts": 398,
+      "src/main/ipc/github-ssh-connection-routing.test.ts": 340,
+      "src/main/ipc/github-star-telemetry.test.ts": 319,
+      "src/main/ipc/github-work-item-args.test.ts": 36,
+      "src/main/ipc/github-wsl-runtime-routing.test.ts": 360,
+      "src/main/ipc/gitlab-repo-access.test.ts": 84,
+      "src/main/ipc/gitlab.test.ts": 122,
+      "src/main/ipc/hooks/worktree-hook-execution-host.test.ts": 516,
+      "src/main/ipc/hosted-review.test.ts": 419,
+      "src/main/ipc/jira-cancellable-requests.test.ts": 55,
+      "src/main/ipc/keybindings.test.ts": 46,
+      "src/main/ipc/linear.test.ts": 72,
+      "src/main/ipc/local-log-tail-lifetime.test.ts": 78,
+      "src/main/ipc/local-log-tail.test.ts": 63,
       "src/main/ipc/local-network-connection-test.test.ts": 221,
-      "src/main/ipc/local-worktree-runtime-options.test.ts": 75,
-      "src/main/ipc/macos-keyboard-layout-change-notifications.test.ts": 70,
-      "src/main/ipc/macos-keyboard-layout-snapshot.test.ts": 34,
-      "src/main/ipc/markdown-documents.test.ts": 42,
-      "src/main/ipc/minimax-credentials.test.ts": 67,
-      "src/main/ipc/mobile.test.ts": 16022,
-      "src/main/ipc/native-chat-subscribe-lifecycle.test.ts": 178,
-      "src/main/ipc/native-chat.test.ts": 1875,
-      "src/main/ipc/notebook.test.ts": 106,
+      "src/main/ipc/local-worktree-runtime-options.test.ts": 46,
+      "src/main/ipc/macos-keyboard-layout-change-notifications.test.ts": 46,
+      "src/main/ipc/macos-keyboard-layout-snapshot.test.ts": 50,
+      "src/main/ipc/markdown-documents.test.ts": 34,
+      "src/main/ipc/minimax-credentials.test.ts": 94,
+      "src/main/ipc/mobile.test.ts": 15914,
+      "src/main/ipc/native-chat-renderer-lifetime.test.ts": 57,
+      "src/main/ipc/native-chat-renderer-watcher-cleanup.test.ts": 327,
+      "src/main/ipc/native-chat-subscribe-lifecycle.test.ts": 209,
+      "src/main/ipc/native-chat.test.ts": 1810,
+      "src/main/ipc/notebook.test.ts": 102,
       "src/main/ipc/notifications-custom-sound.test.ts": 167,
-      "src/main/ipc/notifications-delivery-gating.test.ts": 209,
-      "src/main/ipc/notifications-message-formatting.test.ts": 229,
-      "src/main/ipc/notifications-mobile-fanout.test.ts": 136,
-      "src/main/ipc/notifications-permission-onboarding.test.ts": 150,
-      "src/main/ipc/notifications-retention-lifecycle.test.ts": 150,
-      "src/main/ipc/notifications-subject-retirement.test.ts": 79,
-      "src/main/ipc/orca-profile-auth-handlers.test.ts": 448,
-      "src/main/ipc/orca-profile-org-members-handlers.test.ts": 62,
-      "src/main/ipc/orca-profiles-switch-persistence.test.ts": 1506,
-      "src/main/ipc/orca-profiles.test.ts": 598,
-      "src/main/ipc/parcel-watcher-child-launch.test.ts": 51,
-      "src/main/ipc/parcel-watcher-child-registry.test.ts": 99,
-      "src/main/ipc/parcel-watcher-crash-fuse.test.ts": 52,
-      "src/main/ipc/parcel-watcher-disconnect-termination.test.ts": 125,
-      "src/main/ipc/parcel-watcher-entry-path.test.ts": 39,
-      "src/main/ipc/parcel-watcher-event-cancellation.test.ts": 49,
-      "src/main/ipc/parcel-watcher-event-delivery.test.ts": 57,
-      "src/main/ipc/parcel-watcher-process-entry.test.ts": 160,
-      "src/main/ipc/parcel-watcher-process.test.ts": 966,
-      "src/main/ipc/parcel-watcher-root-path-rewrite.test.ts": 117,
-      "src/main/ipc/parcel-watcher-shallow-subscription.test.ts": 86,
-      "src/main/ipc/parcel-watcher-supervisor-capacity-wait.test.ts": 340,
-      "src/main/ipc/parcel-watcher-supervisor-capacity.test.ts": 197,
-      "src/main/ipc/parcel-watcher-unsubscribe-timeout.test.ts": 73,
-      "src/main/ipc/pet-bundle.test.ts": 56,
-      "src/main/ipc/pet.test.ts": 264,
-      "src/main/ipc/plugin-marketplaces.test.ts": 174,
-      "src/main/ipc/plugins.test.ts": 351,
-      "src/main/ipc/preflight-agent-detection-no-subprocess.test.ts": 245,
-      "src/main/ipc/preflight-agent-detection.test.ts": 249,
-      "src/main/ipc/preflight-agent-refresh.test.ts": 225,
-      "src/main/ipc/preflight-command-exec.test.ts": 58,
-      "src/main/ipc/preflight-host-cli-status.test.ts": 234,
-      "src/main/ipc/preflight-remote-ssh.test.ts": 223,
-      "src/main/ipc/preflight-windows-path-refresh.repro.test.ts": 67,
-      "src/main/ipc/preflight-wsl-agent-detection.test.ts": 172,
-      "src/main/ipc/preflight-wsl-command.test.ts": 69,
-      "src/main/ipc/pty-activation-inventory-scope.test.ts": 1636,
-      "src/main/ipc/pty-applied-size-reporting.test.ts": 1724,
-      "src/main/ipc/pty-buffer-snapshot-dispatch.test.ts": 1935,
-      "src/main/ipc/pty-codex-account-attribution.test.ts": 1366,
-      "src/main/ipc/pty-controller-owner-recovery.test.ts": 1874,
-      "src/main/ipc/pty-controller-ownership-routing.test.ts": 1567,
-      "src/main/ipc/pty-controller-process-inventory.test.ts": 1847,
-      "src/main/ipc/pty-controller-spawn-admission.test.ts": 3804,
-      "src/main/ipc/pty-cumulative-ack-accounting.test.ts": 1616,
-      "src/main/ipc/pty-daemon-controller-teardown.test.ts": 1878,
-      "src/main/ipc/pty-daemon-spawn-agent-home-env.test.ts": 4334,
-      "src/main/ipc/pty-daemon-spawn-codex-auth.test.ts": 1842,
-      "src/main/ipc/pty-daemon-spawn-session-identity.test.ts": 2673,
-      "src/main/ipc/pty-daemon-spawn-wsl-runtime.test.ts": 1865,
-      "src/main/ipc/pty-daemon-ssh-lease-lifecycle.test.ts": 1440,
-      "src/main/ipc/pty-dead-owner-respawn.test.ts": 1754,
-      "src/main/ipc/pty-delivery-health-heal.test.ts": 1927,
-      "src/main/ipc/pty-dispatcher-handshake-osc-answers.test.ts": 1960,
-      "src/main/ipc/pty-encoding.test.ts": 49,
-      "src/main/ipc/pty-global-renderer-credit.test.ts": 1922,
-      "src/main/ipc/pty-hidden-at-spawn-mark.test.ts": 3563,
-      "src/main/ipc/pty-hidden-delivery-gate.test.ts": 41,
-      "src/main/ipc/pty-ipc-hidden-delivery-gate.test.ts": 3264,
-      "src/main/ipc/pty-ipc-producer-flow-control.test.ts": 1501,
-      "src/main/ipc/pty-listener-teardown-and-orphans.test.ts": 3541,
-      "src/main/ipc/pty-login-shell-startup-commands.test.ts": 1758,
-      "src/main/ipc/pty-management.test.ts": 146,
-      "src/main/ipc/pty-output-batching-drain.test.ts": 1693,
-      "src/main/ipc/pty-output-drain-rounds.test.ts": 1799,
-      "src/main/ipc/pty-pane-claim-arbitration.test.ts": 4511,
-      "src/main/ipc/pty-pane-materialization-race.test.ts": 2235,
-      "src/main/ipc/pty-pane-reservation-settlement.test.ts": 1274,
-      "src/main/ipc/pty-pane-restart-replace.test.ts": 1637,
-      "src/main/ipc/pty-pending-data-drain-queue-differential.test.ts": 2111,
-      "src/main/ipc/pty-pending-data-drain-queue.test.ts": 66,
-      "src/main/ipc/pty-pending-data-drain-scheduler-differential.test.ts": 62,
-      "src/main/ipc/pty-pending-output-cap.test.ts": 1956,
-      "src/main/ipc/pty-pending-projection-admissions.test.ts": 139,
-      "src/main/ipc/pty-persisted-incarnation-repair.test.ts": 1625,
-      "src/main/ipc/pty-producer-flow-control.test.ts": 55,
-      "src/main/ipc/pty-renderer-inflight-credit.test.ts": 1855,
-      "src/main/ipc/pty-renderer-lifecycle-delivery-reset.test.ts": 1786,
-      "src/main/ipc/pty-renderer-liveness-guard.test.ts": 1786,
-      "src/main/ipc/pty-renderer-send-failure-recovery.test.ts": 1854,
-      "src/main/ipc/pty-restore-record-seeding.test.ts": 3822,
-      "src/main/ipc/pty-restored-appimage-cli-shim-refresh.test.ts": 1180,
-      "src/main/ipc/pty-runtime-hidden-at-spawn-mark.test.ts": 4444,
-      "src/main/ipc/pty-runtime-kill-and-exit.test.ts": 1501,
-      "src/main/ipc/pty-runtime-ssh-binding-persistence.test.ts": 1506,
-      "src/main/ipc/pty-serializer-settlement-mapping.test.ts": 4471,
-      "src/main/ipc/pty-session-liveness-and-ownership.test.ts": 1645,
-      "src/main/ipc/pty-spawn-codex-home-unavailable.test.ts": 1256,
-      "src/main/ipc/pty-spawn-cwd-fallback.test.ts": 1876,
-      "src/main/ipc/pty-spawn-env-agent-overlays.test.ts": 1816,
-      "src/main/ipc/pty-spawn-env-codex-home-routing.test.ts": 1838,
-      "src/main/ipc/pty-spawn-env-codex-resume-provenance.test.ts": 1642,
-      "src/main/ipc/pty-spawn-env-terminal-basics.test.ts": 2938,
-      "src/main/ipc/pty-spawn-pi-owner-env.test.ts": 1474,
-      "src/main/ipc/pty-spawn-runtime-handle-binding.test.ts": 3625,
-      "src/main/ipc/pty-spawn-timing.test.ts": 60,
-      "src/main/ipc/pty-ssh-stop-verdict.test.ts": 1801,
-      "src/main/ipc/pty-ssh-undelivered-kill.test.ts": 1427,
-      "src/main/ipc/pty-startup-barrier-and-listing.test.ts": 1740,
-      "src/main/ipc/pty-startup-barrier-ordering.test.ts": 82,
-      "src/main/ipc/pty-startup-swap-window-presence.test.ts": 1575,
-      "src/main/ipc/pty-windows-shell-selection.test.ts": 1677,
-      "src/main/ipc/pty-write-ipc-validation.test.ts": 1774,
-      "src/main/ipc/pty-wsl-cwd-validation.test.ts": 1746,
-      "src/main/ipc/pty/configured-terminal-shell-args.test.ts": 36,
-      "src/main/ipc/pty/daemon-late-exit.test.ts": 4269,
-      "src/main/ipc/pty/delivery/attached-pty-size.test.ts": 35,
-      "src/main/ipc/pty/host-env/omp-launch-environment.test.ts": 63,
-      "src/main/ipc/pty/ipc/spawn-commit-ssh-lease-cardinality.test.ts": 1387,
-      "src/main/ipc/pty/ipc/spawn-options-terminal-shell-args.test.ts": 763,
-      "src/main/ipc/pty/ipc/spawn-push-target-materialization-real-git.test.ts": 1227,
-      "src/main/ipc/pty/ipc/spawn-push-target-materialization.test.ts": 44,
-      "src/main/ipc/pty/ipc/spawn-reattach-size-cache.test.ts": 1056,
-      "src/main/ipc/pty/ipc/write-input-chunk-yield.test.ts": 81,
-      "src/main/ipc/pty/pane/launch-authority.test.ts": 51,
-      "src/main/ipc/pty/pane/stable-pane-absence-death-certificate.test.ts": 3426,
-      "src/main/ipc/pty/pane/stable-pane-relay-absence-respawn.test.ts": 801,
-      "src/main/ipc/pty/pty-spawn-shell-override-parity.test.ts": 36,
-      "src/main/ipc/pty/register-headless-runtime.test.ts": 46,
-      "src/main/ipc/pty/runtime/queried-host-kinds.test.ts": 280,
-      "src/main/ipc/pty/runtime/spawn-commit-pty-size.test.ts": 1022,
-      "src/main/ipc/pty/runtime/spawn-preflight-requested-shell.test.ts": 1200,
-      "src/main/ipc/rate-limits.test.ts": 63,
-      "src/main/ipc/readdir-error-diagnostics.test.ts": 45,
-      "src/main/ipc/register-core-handlers/register-core-handlers.test.ts": 3554,
-      "src/main/ipc/remote-watcher-event-batch.test.ts": 89,
-      "src/main/ipc/remote-workspace-cache.test.ts": 3804,
-      "src/main/ipc/remote-workspace-connected-clients.test.ts": 64,
-      "src/main/ipc/remote-workspace-patch-queue.test.ts": 420,
-      "src/main/ipc/remote-workspace-snapshot-normalization.test.ts": 39,
-      "src/main/ipc/remote-workspace-stale-resync.test.ts": 307,
-      "src/main/ipc/remote-workspace.test.ts": 281,
-      "src/main/ipc/renderer-lifetime-abort.test.ts": 35,
-      "src/main/ipc/renderer-shutdown-checkpoint.test.ts": 73,
-      "src/main/ipc/renderer-terminal-serializer-readiness.test.ts": 55,
-      "src/main/ipc/repos-add-linked-worktree.test.ts": 1155,
-      "src/main/ipc/repos-create.test.ts": 1100,
-      "src/main/ipc/repos-execution-host-catalog.test.ts": 1314,
-      "src/main/ipc/repos-local-add-and-project-setup.test.ts": 1200,
-      "src/main/ipc/repos-local-clone-lifecycle.test.ts": 1501,
-      "src/main/ipc/repos-nested-import.test.ts": 999,
-      "src/main/ipc/repos-nested-scan.test.ts": 1274,
-      "src/main/ipc/repos-picker.test.ts": 992,
-      "src/main/ipc/repos-remote-base-ref-queries.test.ts": 1463,
-      "src/main/ipc/repos-remote-client-events.test.ts": 1637,
-      "src/main/ipc/repos-remote-git-username.test.ts": 1132,
-      "src/main/ipc/repos-remote.test.ts": 934,
-      "src/main/ipc/repos-sparse-presets.test.ts": 1036,
-      "src/main/ipc/repos/remote-repo-registration.test.ts": 211,
-      "src/main/ipc/repos/repo-creation-git-availability.test.ts": 231,
-      "src/main/ipc/runtime-agent-launch-capability.test.ts": 1960,
-      "src/main/ipc/runtime-environment-browser-client-host-handler.test.ts": 147,
-      "src/main/ipc/runtime-environment-capability-evidence.test.ts": 32,
-      "src/main/ipc/runtime-environment-cli-removal-routing.test.ts": 218,
-      "src/main/ipc/runtime-environment-diagnostics-broadcast.test.ts": 57,
-      "src/main/ipc/runtime-environment-federated-read-routing.test.ts": 237,
-      "src/main/ipc/runtime-environment-federated-read-transport.bench.test.ts": 152,
-      "src/main/ipc/runtime-environment-removal-storage.test.ts": 796,
-      "src/main/ipc/runtime-environment-request-connections.test.ts": 1579,
-      "src/main/ipc/runtime-environment-revision-guard.test.ts": 50,
-      "src/main/ipc/runtime-environment-status-connection.test.ts": 771,
-      "src/main/ipc/runtime-environment-status-recovery.test.ts": 314,
-      "src/main/ipc/runtime-environment-support-routing.test.ts": 238,
-      "src/main/ipc/runtime-environment-transport-generation.test.ts": 48,
-      "src/main/ipc/runtime-environment-transport-routing-tailscale-hint.test.ts": 1054,
-      "src/main/ipc/runtime-environments-call-routing.test.ts": 1970,
-      "src/main/ipc/runtime-environments-capability-cache.test.ts": 747,
-      "src/main/ipc/runtime-environments-pairing.test.ts": 848,
-      "src/main/ipc/runtime-environments-status-diagnostics.test.ts": 1036,
-      "src/main/ipc/runtime-environments-subscription-lifecycle.test.ts": 608,
-      "src/main/ipc/runtime-environments-subscription-routing.test.ts": 603,
-      "src/main/ipc/runtime-environments-subscription-teardown.test.ts": 572,
-      "src/main/ipc/runtime-import-limits.test.ts": 41,
-      "src/main/ipc/runtime-subscribe-lifecycle.test.ts": 2045,
-      "src/main/ipc/runtime-upload-file-stream.test.ts": 150,
-      "src/main/ipc/runtime-upload-slice-boundaries.test.ts": 322,
-      "src/main/ipc/runtime-upload-temp-sweep.test.ts": 1075,
-      "src/main/ipc/runtime-watcher-pending-assignment.test.ts": 493,
-      "src/main/ipc/runtime-watcher-process-pool.test.ts": 113,
-      "src/main/ipc/runtime.test.ts": 1965,
-      "src/main/ipc/settings.test.ts": 3425,
-      "src/main/ipc/shallow-watch-delivery-probe.test.ts": 112,
-      "src/main/ipc/shell.test.ts": 183,
-      "src/main/ipc/skill-cloud-install-ipc-schemas.test.ts": 174,
-      "src/main/ipc/skill-cloud-ipc-handlers.test.ts": 221,
-      "src/main/ipc/skill-install-management-ipc-handlers.test.ts": 198,
-      "src/main/ipc/skill-install-progress-ipc.test.ts": 29,
-      "src/main/ipc/skill-ipc-main-window.test.ts": 60,
-      "src/main/ipc/skills.test.ts": 257,
-      "src/main/ipc/source-control-ai-linked-issue.test.ts": 52,
-      "src/main/ipc/speech.test.ts": 71,
-      "src/main/ipc/ssh-active-relay-sessions.test.ts": 47,
-      "src/main/ipc/ssh-app-shutdown.test.ts": 2963,
-      "src/main/ipc/ssh-browse.test.ts": 746,
-      "src/main/ipc/ssh-disconnect-cancellation.test.ts": 3961,
-      "src/main/ipc/ssh-handler-reregistration.test.ts": 2773,
-      "src/main/ipc/ssh-host-partition-session-export.test.ts": 1192,
-      "src/main/ipc/ssh-passphrase.test.ts": 138,
-      "src/main/ipc/ssh-pty-closed-generation-ranges.test.ts": 88,
-      "src/main/ipc/ssh-pty-consumer-identity.test.ts": 2967,
-      "src/main/ipc/ssh-pty-legacy-projection.test.ts": 51,
-      "src/main/ipc/ssh-pty-model-admission-generation-scope.test.ts": 56,
-      "src/main/ipc/ssh-pty-model-admission.test.ts": 45,
-      "src/main/ipc/ssh-pty-output-exit-deadline.test.ts": 89,
-      "src/main/ipc/ssh-pty-output-generation-guard.test.ts": 51,
-      "src/main/ipc/ssh-pty-output-intake.test.ts": 170,
-      "src/main/ipc/ssh-pty-output-model-migration.test.ts": 117,
-      "src/main/ipc/ssh-pty-remote-source-range-consumers.test.ts": 51,
-      "src/main/ipc/ssh-pty-source-ack-coalescer.test.ts": 69,
-      "src/main/ipc/ssh-pty-source-ack-session-contract.test.ts": 89,
-      "src/main/ipc/ssh-pty-source-obligation-coordinator.test.ts": 56,
-      "src/main/ipc/ssh-pty-source-obligation-ledger.test.ts": 149,
-      "src/main/ipc/ssh-relay-reset-resume.test.ts": 4054,
-      "src/main/ipc/ssh-state-broadcast-fanout.test.ts": 2204,
-      "src/main/ipc/ssh-target-registry.test.ts": 4139,
-      "src/main/ipc/ssh-terminate-sessions.test.ts": 2920,
-      "src/main/ipc/ssh.test.ts": 3490,
+      "src/main/ipc/notifications-delivery-gating.test.ts": 226,
+      "src/main/ipc/notifications-message-formatting.test.ts": 81,
+      "src/main/ipc/notifications-mobile-fanout.test.ts": 141,
+      "src/main/ipc/notifications-permission-onboarding.test.ts": 216,
+      "src/main/ipc/notifications-retention-lifecycle.test.ts": 378,
+      "src/main/ipc/notifications-subject-retirement.test.ts": 56,
+      "src/main/ipc/orca-profile-auth-handlers.test.ts": 461,
+      "src/main/ipc/orca-profile-org-members-handlers.test.ts": 57,
+      "src/main/ipc/orca-profiles-switch-persistence.test.ts": 1121,
+      "src/main/ipc/orca-profiles.test.ts": 419,
+      "src/main/ipc/parcel-watcher-child-launch.test.ts": 73,
+      "src/main/ipc/parcel-watcher-child-registry.test.ts": 91,
+      "src/main/ipc/parcel-watcher-crash-fuse.test.ts": 42,
+      "src/main/ipc/parcel-watcher-disconnect-termination.test.ts": 97,
+      "src/main/ipc/parcel-watcher-entry-path.test.ts": 36,
+      "src/main/ipc/parcel-watcher-event-cancellation.test.ts": 61,
+      "src/main/ipc/parcel-watcher-event-delivery.test.ts": 37,
+      "src/main/ipc/parcel-watcher-module-loader.test.ts": 39,
+      "src/main/ipc/parcel-watcher-process-entry.test.ts": 234,
+      "src/main/ipc/parcel-watcher-process.test.ts": 678,
+      "src/main/ipc/parcel-watcher-root-path-rewrite.test.ts": 88,
+      "src/main/ipc/parcel-watcher-shallow-subscription.test.ts": 54,
+      "src/main/ipc/parcel-watcher-supervisor-capacity-wait.test.ts": 254,
+      "src/main/ipc/parcel-watcher-supervisor-capacity.test.ts": 244,
+      "src/main/ipc/parcel-watcher-unsubscribe-timeout.test.ts": 113,
+      "src/main/ipc/pet-bundle.test.ts": 60,
+      "src/main/ipc/pet.test.ts": 252,
+      "src/main/ipc/plugin-marketplaces.test.ts": 227,
+      "src/main/ipc/plugins.test.ts": 258,
+      "src/main/ipc/preflight-agent-detection-no-subprocess.test.ts": 249,
+      "src/main/ipc/preflight-agent-detection.test.ts": 212,
+      "src/main/ipc/preflight-agent-refresh.test.ts": 190,
+      "src/main/ipc/preflight-command-exec.test.ts": 59,
+      "src/main/ipc/preflight-host-cli-status.test.ts": 311,
+      "src/main/ipc/preflight-remote-ssh.test.ts": 137,
+      "src/main/ipc/preflight-windows-path-refresh.repro.test.ts": 69,
+      "src/main/ipc/preflight-wsl-agent-detection.test.ts": 151,
+      "src/main/ipc/preflight-wsl-command.test.ts": 43,
+      "src/main/ipc/pty-activation-inventory-scope.test.ts": 1650,
+      "src/main/ipc/pty-applied-size-reporting.test.ts": 1519,
+      "src/main/ipc/pty-buffer-snapshot-dispatch.test.ts": 1738,
+      "src/main/ipc/pty-codex-account-attribution.test.ts": 1477,
+      "src/main/ipc/pty-controller-owner-recovery.test.ts": 1749,
+      "src/main/ipc/pty-controller-ownership-routing.test.ts": 1531,
+      "src/main/ipc/pty-controller-process-inventory.test.ts": 1860,
+      "src/main/ipc/pty-controller-spawn-admission.test.ts": 3580,
+      "src/main/ipc/pty-cumulative-ack-accounting.test.ts": 1219,
+      "src/main/ipc/pty-daemon-controller-teardown.test.ts": 2798,
+      "src/main/ipc/pty-daemon-spawn-agent-home-env.test.ts": 2463,
+      "src/main/ipc/pty-daemon-spawn-codex-auth.test.ts": 1802,
+      "src/main/ipc/pty-daemon-spawn-session-identity.test.ts": 2434,
+      "src/main/ipc/pty-daemon-spawn-wsl-runtime.test.ts": 2656,
+      "src/main/ipc/pty-daemon-ssh-lease-lifecycle.test.ts": 2110,
+      "src/main/ipc/pty-dead-owner-respawn.test.ts": 1289,
+      "src/main/ipc/pty-delivery-health-heal.test.ts": 1942,
+      "src/main/ipc/pty-dispatcher-handshake-osc-answers.test.ts": 1892,
+      "src/main/ipc/pty-encoding.test.ts": 26,
+      "src/main/ipc/pty-global-renderer-credit.test.ts": 1376,
+      "src/main/ipc/pty-hidden-at-spawn-mark.test.ts": 3652,
+      "src/main/ipc/pty-hidden-delivery-gate.test.ts": 57,
+      "src/main/ipc/pty-ipc-hidden-delivery-gate.test.ts": 3043,
+      "src/main/ipc/pty-ipc-producer-flow-control.test.ts": 1520,
+      "src/main/ipc/pty-listener-teardown-and-orphans.test.ts": 3968,
+      "src/main/ipc/pty-login-shell-startup-commands.test.ts": 1723,
+      "src/main/ipc/pty-management.test.ts": 102,
+      "src/main/ipc/pty-output-batching-drain.test.ts": 1696,
+      "src/main/ipc/pty-output-drain-rounds.test.ts": 1804,
+      "src/main/ipc/pty-pane-claim-arbitration.test.ts": 4553,
+      "src/main/ipc/pty-pane-materialization-race.test.ts": 2447,
+      "src/main/ipc/pty-pane-reservation-settlement.test.ts": 1450,
+      "src/main/ipc/pty-pane-restart-replace.test.ts": 1575,
+      "src/main/ipc/pty-pending-data-drain-queue-differential.test.ts": 2040,
+      "src/main/ipc/pty-pending-data-drain-queue.test.ts": 59,
+      "src/main/ipc/pty-pending-data-drain-scheduler-differential.test.ts": 99,
+      "src/main/ipc/pty-pending-output-cap.test.ts": 1823,
+      "src/main/ipc/pty-pending-projection-admissions.test.ts": 95,
+      "src/main/ipc/pty-persisted-incarnation-repair.test.ts": 940,
+      "src/main/ipc/pty-producer-flow-control.test.ts": 44,
+      "src/main/ipc/pty-renderer-inflight-credit.test.ts": 1965,
+      "src/main/ipc/pty-renderer-lifecycle-delivery-reset.test.ts": 1732,
+      "src/main/ipc/pty-renderer-liveness-guard.test.ts": 1889,
+      "src/main/ipc/pty-renderer-send-failure-recovery.test.ts": 1697,
+      "src/main/ipc/pty-restore-record-seeding.test.ts": 4503,
+      "src/main/ipc/pty-restored-appimage-cli-shim-refresh.test.ts": 1001,
+      "src/main/ipc/pty-runtime-hidden-at-spawn-mark.test.ts": 2902,
+      "src/main/ipc/pty-runtime-kill-and-exit.test.ts": 1637,
+      "src/main/ipc/pty-runtime-ssh-binding-persistence.test.ts": 1369,
+      "src/main/ipc/pty-serializer-settlement-mapping.test.ts": 4239,
+      "src/main/ipc/pty-session-liveness-and-ownership.test.ts": 1832,
+      "src/main/ipc/pty-spawn-codex-home-unavailable.test.ts": 880,
+      "src/main/ipc/pty-spawn-cwd-fallback.test.ts": 2294,
+      "src/main/ipc/pty-spawn-env-agent-overlays.test.ts": 1925,
+      "src/main/ipc/pty-spawn-env-codex-home-routing.test.ts": 1578,
+      "src/main/ipc/pty-spawn-env-codex-resume-provenance.test.ts": 1188,
+      "src/main/ipc/pty-spawn-env-terminal-basics.test.ts": 2674,
+      "src/main/ipc/pty-spawn-pi-owner-env.test.ts": 2317,
+      "src/main/ipc/pty-spawn-runtime-handle-binding.test.ts": 2425,
+      "src/main/ipc/pty-spawn-timing.test.ts": 74,
+      "src/main/ipc/pty-ssh-stop-verdict.test.ts": 1688,
+      "src/main/ipc/pty-ssh-undelivered-kill.test.ts": 1930,
+      "src/main/ipc/pty-startup-barrier-and-listing.test.ts": 1269,
+      "src/main/ipc/pty-startup-barrier-ordering.test.ts": 32,
+      "src/main/ipc/pty-startup-swap-window-presence.test.ts": 1724,
+      "src/main/ipc/pty-windows-shell-selection.test.ts": 1559,
+      "src/main/ipc/pty-write-ipc-validation.test.ts": 1475,
+      "src/main/ipc/pty-wsl-cwd-validation.test.ts": 1804,
+      "src/main/ipc/pty/configured-terminal-shell-args.test.ts": 52,
+      "src/main/ipc/pty/daemon-late-exit.test.ts": 3152,
+      "src/main/ipc/pty/delivery/attached-pty-size.test.ts": 36,
+      "src/main/ipc/pty/host-env/omp-launch-environment.test.ts": 84,
+      "src/main/ipc/pty/ipc/spawn-commit-ssh-lease-cardinality.test.ts": 1617,
+      "src/main/ipc/pty/ipc/spawn-options-terminal-shell-args.test.ts": 672,
+      "src/main/ipc/pty/ipc/spawn-push-target-materialization-real-git.test.ts": 811,
+      "src/main/ipc/pty/ipc/spawn-push-target-materialization.test.ts": 67,
+      "src/main/ipc/pty/ipc/spawn-reattach-size-cache.test.ts": 814,
+      "src/main/ipc/pty/ipc/write-input-chunk-yield.test.ts": 66,
+      "src/main/ipc/pty/pane/launch-authority.test.ts": 82,
+      "src/main/ipc/pty/pane/stable-pane-absence-death-certificate.test.ts": 2925,
+      "src/main/ipc/pty/pane/stable-pane-relay-absence-respawn.test.ts": 692,
+      "src/main/ipc/pty/pty-spawn-shell-override-parity.test.ts": 127,
+      "src/main/ipc/pty/register-headless-runtime.test.ts": 43,
+      "src/main/ipc/pty/register-without-renderer.test.ts": 3683,
+      "src/main/ipc/pty/runtime/queried-host-kinds.test.ts": 212,
+      "src/main/ipc/pty/runtime/spawn-commit-pty-size.test.ts": 1027,
+      "src/main/ipc/pty/runtime/spawn-preflight-requested-shell.test.ts": 970,
+      "src/main/ipc/rate-limits.test.ts": 73,
+      "src/main/ipc/readdir-error-diagnostics.test.ts": 27,
+      "src/main/ipc/register-core-handlers/register-core-handlers.test.ts": 1578,
+      "src/main/ipc/registered-worktree-root-ownership.test.ts": 366,
+      "src/main/ipc/registered-worktree-root-refresh.test.ts": 122,
+      "src/main/ipc/remote-watcher-event-batch.test.ts": 49,
+      "src/main/ipc/remote-workspace-cache.test.ts": 2439,
+      "src/main/ipc/remote-workspace-connected-clients.test.ts": 70,
+      "src/main/ipc/remote-workspace-patch-queue.test.ts": 474,
+      "src/main/ipc/remote-workspace-snapshot-normalization.test.ts": 43,
+      "src/main/ipc/remote-workspace-stale-resync.test.ts": 1371,
+      "src/main/ipc/remote-workspace.test.ts": 292,
+      "src/main/ipc/renderer-lifetime-abort.test.ts": 53,
+      "src/main/ipc/renderer-shutdown-checkpoint.test.ts": 62,
+      "src/main/ipc/renderer-terminal-serializer-readiness.test.ts": 59,
+      "src/main/ipc/repos-add-linked-worktree.test.ts": 1070,
+      "src/main/ipc/repos-create.test.ts": 966,
+      "src/main/ipc/repos-execution-host-catalog.test.ts": 943,
+      "src/main/ipc/repos-local-add-and-project-setup.test.ts": 1193,
+      "src/main/ipc/repos-local-clone-lifecycle.test.ts": 1467,
+      "src/main/ipc/repos-nested-import.test.ts": 1374,
+      "src/main/ipc/repos-nested-scan.test.ts": 586,
+      "src/main/ipc/repos-picker.test.ts": 1130,
+      "src/main/ipc/repos-remote-base-ref-queries.test.ts": 1008,
+      "src/main/ipc/repos-remote-client-events.test.ts": 1549,
+      "src/main/ipc/repos-remote-git-username.test.ts": 940,
+      "src/main/ipc/repos-remote.test.ts": 958,
+      "src/main/ipc/repos-sparse-presets.test.ts": 1305,
+      "src/main/ipc/repos/remote-repo-registration.test.ts": 230,
+      "src/main/ipc/repos/repo-creation-git-availability.test.ts": 150,
+      "src/main/ipc/runtime-agent-launch-capability.test.ts": 2099,
+      "src/main/ipc/runtime-environment-browser-client-host-handler.test.ts": 179,
+      "src/main/ipc/runtime-environment-capability-evidence.test.ts": 31,
+      "src/main/ipc/runtime-environment-cli-removal-routing.test.ts": 212,
+      "src/main/ipc/runtime-environment-diagnostics-broadcast.test.ts": 42,
+      "src/main/ipc/runtime-environment-federated-read-routing.test.ts": 233,
+      "src/main/ipc/runtime-environment-federated-read-transport.bench.test.ts": 163,
+      "src/main/ipc/runtime-environment-removal-storage.test.ts": 810,
+      "src/main/ipc/runtime-environment-request-connections.test.ts": 1502,
+      "src/main/ipc/runtime-environment-revision-guard.test.ts": 48,
+      "src/main/ipc/runtime-environment-status-connection.test.ts": 637,
+      "src/main/ipc/runtime-environment-status-recovery.test.ts": 246,
+      "src/main/ipc/runtime-environment-support-routing.test.ts": 361,
+      "src/main/ipc/runtime-environment-transport-generation.test.ts": 45,
+      "src/main/ipc/runtime-environment-transport-routing-tailscale-hint.test.ts": 1055,
+      "src/main/ipc/runtime-environments-call-routing.test.ts": 626,
+      "src/main/ipc/runtime-environments-capability-cache.test.ts": 482,
+      "src/main/ipc/runtime-environments-pairing.test.ts": 1362,
+      "src/main/ipc/runtime-environments-status-diagnostics.test.ts": 637,
+      "src/main/ipc/runtime-environments-subscription-lifecycle.test.ts": 989,
+      "src/main/ipc/runtime-environments-subscription-routing.test.ts": 524,
+      "src/main/ipc/runtime-environments-subscription-teardown.test.ts": 324,
+      "src/main/ipc/runtime-import-limits.test.ts": 46,
+      "src/main/ipc/runtime-subscribe-lifecycle.test.ts": 2028,
+      "src/main/ipc/runtime-upload-file-stream.test.ts": 167,
+      "src/main/ipc/runtime-upload-slice-boundaries.test.ts": 352,
+      "src/main/ipc/runtime-upload-temp-sweep.test.ts": 1063,
+      "src/main/ipc/runtime-watcher-pending-assignment.test.ts": 307,
+      "src/main/ipc/runtime-watcher-process-pool.test.ts": 143,
+      "src/main/ipc/runtime.test.ts": 2155,
+      "src/main/ipc/sender-scoped-request-cancellation.test.ts": 99,
+      "src/main/ipc/settings.test.ts": 4454,
+      "src/main/ipc/shallow-watch-delivery-probe-lifetime.test.ts": 58,
+      "src/main/ipc/shallow-watch-delivery-probe.test.ts": 161,
+      "src/main/ipc/shell.test.ts": 91,
+      "src/main/ipc/skill-cloud-install-ipc-schemas.test.ts": 91,
+      "src/main/ipc/skill-cloud-ipc-handlers.test.ts": 220,
+      "src/main/ipc/skill-install-management-ipc-handlers.test.ts": 178,
+      "src/main/ipc/skill-install-progress-ipc.test.ts": 35,
+      "src/main/ipc/skill-ipc-main-window.test.ts": 61,
+      "src/main/ipc/skills.test.ts": 543,
+      "src/main/ipc/source-control-ai-linked-issue.test.ts": 51,
+      "src/main/ipc/speech-worker-exit-lifetime.test.ts": 337,
+      "src/main/ipc/speech.test.ts": 75,
+      "src/main/ipc/ssh-active-relay-sessions.test.ts": 41,
+      "src/main/ipc/ssh-app-shutdown.test.ts": 1719,
+      "src/main/ipc/ssh-browse.test.ts": 737,
+      "src/main/ipc/ssh-disconnect-cancellation.test.ts": 3816,
+      "src/main/ipc/ssh-handler-reregistration.test.ts": 2634,
+      "src/main/ipc/ssh-host-partition-session-export.test.ts": 1162,
+      "src/main/ipc/ssh-passphrase.test.ts": 137,
+      "src/main/ipc/ssh-pty-closed-generation-ranges.test.ts": 67,
+      "src/main/ipc/ssh-pty-consumer-identity.test.ts": 3105,
+      "src/main/ipc/ssh-pty-legacy-projection.test.ts": 62,
+      "src/main/ipc/ssh-pty-model-admission-generation-scope.test.ts": 58,
+      "src/main/ipc/ssh-pty-model-admission.test.ts": 76,
+      "src/main/ipc/ssh-pty-output-exit-deadline.test.ts": 83,
+      "src/main/ipc/ssh-pty-output-generation-guard.test.ts": 48,
+      "src/main/ipc/ssh-pty-output-intake.test.ts": 165,
+      "src/main/ipc/ssh-pty-output-model-migration.test.ts": 109,
+      "src/main/ipc/ssh-pty-remote-source-range-consumers.test.ts": 85,
+      "src/main/ipc/ssh-pty-source-ack-coalescer.test.ts": 48,
+      "src/main/ipc/ssh-pty-source-ack-session-contract.test.ts": 62,
+      "src/main/ipc/ssh-pty-source-obligation-coordinator.test.ts": 45,
+      "src/main/ipc/ssh-pty-source-obligation-ledger.test.ts": 170,
+      "src/main/ipc/ssh-relay-reset-resume.test.ts": 3804,
+      "src/main/ipc/ssh-state-broadcast-fanout.test.ts": 2574,
+      "src/main/ipc/ssh-target-registry.test.ts": 3704,
+      "src/main/ipc/ssh-terminate-sessions.test.ts": 3008,
+      "src/main/ipc/ssh.test.ts": 2028,
       "src/main/ipc/telemetry.test.ts": 230,
-      "src/main/ipc/terminal-git-credential-guard.test.ts": 64,
-      "src/main/ipc/terminal-preview-output-stream.test.ts": 77,
-      "src/main/ipc/terminal-preview.test.ts": 214,
-      "src/main/ipc/terminal-render-desync-evidence.test.ts": 90,
-      "src/main/ipc/terminal-startup-color-query-replies.test.ts": 181,
-      "src/main/ipc/tui-agent-detection-commands.test.ts": 59,
-      "src/main/ipc/ui.test.ts": 73,
-      "src/main/ipc/usage-provider-handlers.test.ts": 65,
-      "src/main/ipc/watched-worktree-catalog-notification.test.ts": 64,
-      "src/main/ipc/watcher-event-root-path-rewrite.test.ts": 49,
-      "src/main/ipc/watcher-removal-gate.test.ts": 58,
-      "src/main/ipc/workspace-cleanup-activity.test.ts": 72,
-      "src/main/ipc/workspace-cleanup-broad-scan.test.ts": 502,
-      "src/main/ipc/workspace-cleanup-execution-host-routing.test.ts": 439,
-      "src/main/ipc/workspace-cleanup-local-git-routing.test.ts": 391,
-      "src/main/ipc/workspace-cleanup-snapshot-ipc.test.ts": 109,
-      "src/main/ipc/workspace-cleanup.test.ts": 5055,
-      "src/main/ipc/workspace-create-error-classifier.test.ts": 56,
-      "src/main/ipc/workspace-ports.test.ts": 128,
-      "src/main/ipc/workspace-space.test.ts": 39,
-      "src/main/ipc/worktree-base-directory-change-collector.test.ts": 70,
-      "src/main/ipc/worktree-base-directory-event-filter.test.ts": 58,
-      "src/main/ipc/worktree-base-directory-poller-marker-fanout.test.ts": 177,
-      "src/main/ipc/worktree-base-directory-poller.test.ts": 2644,
-      "src/main/ipc/worktree-base-directory-watch-targets.test.ts": 400,
-      "src/main/ipc/worktree-base-directory-watcher.test.ts": 339,
-      "src/main/ipc/worktree-create-lineage.test.ts": 628,
-      "src/main/ipc/worktree-folder-rename-target.test.ts": 76,
-      "src/main/ipc/worktree-git-common-polling.test.ts": 1089,
-      "src/main/ipc/worktree-git-common-watch.test.ts": 2771,
-      "src/main/ipc/worktree-git-status-ref-watch.test.ts": 72,
-      "src/main/ipc/worktree-head-identity-reader-concurrency.test.ts": 70,
-      "src/main/ipc/worktree-head-identity-reader-incremental.test.ts": 258,
-      "src/main/ipc/worktree-head-identity-reader.test.ts": 108,
-      "src/main/ipc/worktree-head-identity-refresh.test.ts": 76,
-      "src/main/ipc/worktree-include-copy-budget.test.ts": 149,
-      "src/main/ipc/worktree-logic-created-agent.test.ts": 74,
-      "src/main/ipc/worktree-logic-wsl.test.ts": 106,
-      "src/main/ipc/worktree-logic.test.ts": 135,
-      "src/main/ipc/worktree-metadata-merge.test.ts": 42,
-      "src/main/ipc/worktree-path-deduplication.test.ts": 94,
-      "src/main/ipc/worktree-push-target-cleanup.test.ts": 185,
-      "src/main/ipc/worktree-push-target-reconciliation-real-git.test.ts": 1130,
-      "src/main/ipc/worktree-push-target-reconciliation.test.ts": 361,
-      "src/main/ipc/worktree-push-target-refspec-migration.test.ts": 177,
-      "src/main/ipc/worktree-push-target-refspec-real-git.test.ts": 2351,
-      "src/main/ipc/worktree-push-target-remote-scan.test.ts": 202,
-      "src/main/ipc/worktree-push-target-setup.test.ts": 203,
-      "src/main/ipc/worktree-remote-push-target-materialization.test.ts": 776,
-      "src/main/ipc/worktree-remote-ssh-branch-conflict.test.ts": 810,
-      "src/main/ipc/worktree-symlink-reconciliation.real.test.ts": 303,
-      "src/main/ipc/worktree-symlinks.test.ts": 199,
-      "src/main/ipc/worktree-watcher-removal-binding.test.ts": 267,
-      "src/main/ipc/worktrees-authoritative-local-metadata-pruning.test.ts": 1278,
-      "src/main/ipc/worktrees-create-execution-host-routing.test.ts": 1051,
-      "src/main/ipc/worktrees-create-metadata-persistence.test.ts": 1579,
-      "src/main/ipc/worktrees-delete-pty-teardown.test.ts": 918,
-      "src/main/ipc/worktrees-detected-scan-cache.test.ts": 1468,
-      "src/main/ipc/worktrees-discovery-metadata-backfill.test.ts": 822,
-      "src/main/ipc/worktrees-existing-branch-checkout.test.ts": 803,
-      "src/main/ipc/worktrees-forget-local.test.ts": 894,
-      "src/main/ipc/worktrees-issue-command-overrides.test.ts": 681,
-      "src/main/ipc/worktrees-lineage-hydration.test.ts": 1053,
-      "src/main/ipc/worktrees-listing-fallback-rows.test.ts": 742,
-      "src/main/ipc/worktrees-local-base-ref-resolution.test.ts": 1037,
-      "src/main/ipc/worktrees-local-create-flow.test.ts": 1510,
-      "src/main/ipc/worktrees-mutation-scan-generation-order.test.ts": 889,
-      "src/main/ipc/worktrees-orphan-directory-cleanup.test.ts": 1008,
-      "src/main/ipc/worktrees-preserved-branch-fork-remote.test.ts": 932,
-      "src/main/ipc/worktrees-removal-recovery.test.ts": 1949,
-      "src/main/ipc/worktrees-remove-archive-hooks.test.ts": 935,
-      "src/main/ipc/worktrees-remove-host-disambiguation.test.ts": 707,
-      "src/main/ipc/worktrees-remove-preflight.test.ts": 679,
-      "src/main/ipc/worktrees-setup-launch-sparse-checkout.test.ts": 1012,
-      "src/main/ipc/worktrees-ssh-base-ref-resolution.test.ts": 916,
-      "src/main/ipc/worktrees-ssh-branch-conflict-suffixing.test.ts": 866,
-      "src/main/ipc/worktrees-ssh-create-base-prefetch.test.ts": 1017,
-      "src/main/ipc/worktrees-ssh-fork-push-target-remote.test.ts": 845,
-      "src/main/ipc/worktrees-ssh-local-base-refresh.test.ts": 1417,
-      "src/main/ipc/worktrees-ssh-pr-head-fetch.test.ts": 916,
-      "src/main/ipc/worktrees-ssh-provider-authority.test.ts": 865,
-      "src/main/ipc/worktrees-ssh-repo-owner-resolution.test.ts": 1039,
-      "src/main/ipc/worktrees-ssh-setup-launch.test.ts": 885,
-      "src/main/ipc/worktrees-windows.test.ts": 996,
-      "src/main/ipc/worktrees-wsl-runtime-routing.test.ts": 1032,
-      "src/main/ipc/worktrees/listing/detected-provider-listing-catalog-version.test.ts": 117,
-      "src/main/ipc/worktrees/listing/detected-provider-listing-meta-index.test.ts": 412,
-      "src/main/ipc/worktrees/listing/detected-provider-listing-overtaken-scan.test.ts": 164,
-      "src/main/ipc/worktrees/listing/detected-scan-failure-authority.test.ts": 356,
-      "src/main/ipc/worktrees/listing/detected-worktree-classification.test.ts": 152,
-      "src/main/ipc/worktrees/listing/detected-worktree-scan-hygiene-gate.test.ts": 99,
-      "src/main/ipc/worktrees/listing/detected-worktree-scan-superseded.test.ts": 83,
-      "src/main/ipc/worktrees/listing/register-sparse-checkout-cache-invalidation.test.ts": 159,
-      "src/main/ipc/worktrees/removal/remove-unregistered-worktree-host-home.test.ts": 89,
-      "src/main/ipc/worktrees/removal/worktree-archive-hook.test.ts": 377,
-      "src/main/issue-command-ignore.test.ts": 570,
-      "src/main/jira/adf-markdown.test.ts": 53,
-      "src/main/jira/attachment-image-cache-generation.test.ts": 49,
-      "src/main/jira/attachment-image-cache.test.ts": 39,
-      "src/main/jira/attachment-images.test.ts": 72,
-      "src/main/jira/client.test.ts": 320,
-      "src/main/jira/issues.test.ts": 268,
-      "src/main/jira/jira-issue-mutations.test.ts": 74,
-      "src/main/jira/jira-issue-summary-timeout.test.ts": 85,
-      "src/main/jira/jira-search-abort.test.ts": 89,
-      "src/main/keybindings/keybinding-file.test.ts": 133,
-      "src/main/keybindings/keybinding-service.test.ts": 100,
-      "src/main/kimi/hook-service-mode-read-failure.test.ts": 84,
-      "src/main/kimi/hook-service.test.ts": 84,
-      "src/main/kimi/kimi-hook-config-toml.test.ts": 117,
-      "src/main/kimi/kimi-runtime-home.test.ts": 81,
-      "src/main/lib/unread-response-body.test.ts": 111,
-      "src/main/line-editor-ready-output-scanner.test.ts": 43,
-      "src/main/linear/client.test.ts": 144,
-      "src/main/linear/issue-context-client.test.ts": 63,
-      "src/main/linear/issue-context-current.test.ts": 52,
-      "src/main/linear/issue-context-errors.test.ts": 41,
-      "src/main/linear/issue-context-includes.test.ts": 110,
-      "src/main/linear/issue-context-inline-media.test.ts": 63,
-      "src/main/linear/issue-context-relations.test.ts": 47,
-      "src/main/linear/issue-context.test.ts": 80,
-      "src/main/linear/issue-list-filter.test.ts": 55,
-      "src/main/linear/issue-relation-write.test.ts": 59,
-      "src/main/linear/issue-search-summary.test.ts": 40,
-      "src/main/linear/issues.test.ts": 131,
-      "src/main/linear/linear-workspace-registry.test.ts": 41,
-      "src/main/linear/mappers.test.ts": 49,
-      "src/main/linear/mcp-issue-list-pagination.test.ts": 109,
-      "src/main/linear/mcp-issue-list.test.ts": 152,
-      "src/main/linear/projects.test.ts": 394,
-      "src/main/linear/teams.test.ts": 97,
-      "src/main/linux-lid-sleep-assertion.test.ts": 87,
-      "src/main/linux-package-install-command.test.ts": 73,
-      "src/main/linux-package-install-diagnostic.test.ts": 75,
-      "src/main/linux-package-update-recovery.test.ts": 321,
-      "src/main/linux-update-package-type.test.ts": 128,
-      "src/main/local-builds/local-build-candidate.test.ts": 218,
-      "src/main/local-builds/local-build-compatibility-contract.test.ts": 165,
-      "src/main/local-builds/local-build-feed-server.test.ts": 113,
-      "src/main/local-downloaded-folder-promotion.test.ts": 218,
+      "src/main/ipc/terminal-git-credential-guard.test.ts": 82,
+      "src/main/ipc/terminal-preview-output-stream.test.ts": 28,
+      "src/main/ipc/terminal-preview.test.ts": 242,
+      "src/main/ipc/terminal-render-desync-evidence.test.ts": 63,
+      "src/main/ipc/terminal-startup-color-query-replies.test.ts": 138,
+      "src/main/ipc/tui-agent-detection-commands.test.ts": 44,
+      "src/main/ipc/ui.test.ts": 84,
+      "src/main/ipc/usage-provider-handlers.test.ts": 44,
+      "src/main/ipc/watched-worktree-catalog-notification.test.ts": 71,
+      "src/main/ipc/watcher-event-root-path-rewrite.test.ts": 61,
+      "src/main/ipc/watcher-removal-gate.test.ts": 37,
+      "src/main/ipc/workspace-cleanup-activity.test.ts": 80,
+      "src/main/ipc/workspace-cleanup-broad-scan.test.ts": 531,
+      "src/main/ipc/workspace-cleanup-execution-host-routing.test.ts": 305,
+      "src/main/ipc/workspace-cleanup-local-git-routing.test.ts": 461,
+      "src/main/ipc/workspace-cleanup-snapshot-ipc.test.ts": 114,
+      "src/main/ipc/workspace-cleanup.test.ts": 4644,
+      "src/main/ipc/workspace-create-error-classifier.test.ts": 52,
+      "src/main/ipc/workspace-ports.test.ts": 103,
+      "src/main/ipc/workspace-space.test.ts": 63,
+      "src/main/ipc/worktree-base-directory-change-collector.test.ts": 42,
+      "src/main/ipc/worktree-base-directory-event-filter.test.ts": 61,
+      "src/main/ipc/worktree-base-directory-poller-marker-fanout.test.ts": 219,
+      "src/main/ipc/worktree-base-directory-poller.test.ts": 2702,
+      "src/main/ipc/worktree-base-directory-watch-targets.test.ts": 388,
+      "src/main/ipc/worktree-base-directory-watcher.test.ts": 454,
+      "src/main/ipc/worktree-create-lineage.test.ts": 570,
+      "src/main/ipc/worktree-folder-rename-target.test.ts": 65,
+      "src/main/ipc/worktree-git-common-polling.test.ts": 1240,
+      "src/main/ipc/worktree-git-common-watch.test.ts": 2604,
+      "src/main/ipc/worktree-git-status-ref-watch.test.ts": 40,
+      "src/main/ipc/worktree-head-identity-reader-concurrency.test.ts": 72,
+      "src/main/ipc/worktree-head-identity-reader-incremental.test.ts": 255,
+      "src/main/ipc/worktree-head-identity-reader.test.ts": 99,
+      "src/main/ipc/worktree-head-identity-refresh.test.ts": 84,
+      "src/main/ipc/worktree-head-identity-retirement.test.ts": 80,
+      "src/main/ipc/worktree-include-copy-budget.test.ts": 119,
+      "src/main/ipc/worktree-logic-created-agent.test.ts": 82,
+      "src/main/ipc/worktree-logic-wsl.test.ts": 102,
+      "src/main/ipc/worktree-logic.test.ts": 185,
+      "src/main/ipc/worktree-metadata-merge.test.ts": 60,
+      "src/main/ipc/worktree-path-deduplication.test.ts": 69,
+      "src/main/ipc/worktree-push-target-cleanup.test.ts": 182,
+      "src/main/ipc/worktree-push-target-reconciliation-real-git.test.ts": 862,
+      "src/main/ipc/worktree-push-target-reconciliation.test.ts": 305,
+      "src/main/ipc/worktree-push-target-refspec-migration.test.ts": 178,
+      "src/main/ipc/worktree-push-target-refspec-real-git.test.ts": 2471,
+      "src/main/ipc/worktree-push-target-remote-scan.test.ts": 135,
+      "src/main/ipc/worktree-push-target-setup.test.ts": 223,
+      "src/main/ipc/worktree-remote-push-target-materialization.test.ts": 717,
+      "src/main/ipc/worktree-remote-ssh-branch-conflict.test.ts": 500,
+      "src/main/ipc/worktree-symlink-reconciliation.real.test.ts": 239,
+      "src/main/ipc/worktree-symlinks.test.ts": 136,
+      "src/main/ipc/worktree-watcher-removal-binding.test.ts": 150,
+      "src/main/ipc/worktrees-authoritative-local-metadata-pruning.test.ts": 1279,
+      "src/main/ipc/worktrees-canonical-ssh-listing.test.ts": 577,
+      "src/main/ipc/worktrees-create-execution-host-routing.test.ts": 588,
+      "src/main/ipc/worktrees-create-metadata-persistence.test.ts": 1369,
+      "src/main/ipc/worktrees-delete-pty-teardown.test.ts": 536,
+      "src/main/ipc/worktrees-detected-scan-cache.test.ts": 1356,
+      "src/main/ipc/worktrees-discovery-metadata-backfill.test.ts": 452,
+      "src/main/ipc/worktrees-existing-branch-checkout.test.ts": 1249,
+      "src/main/ipc/worktrees-forget-local.test.ts": 638,
+      "src/main/ipc/worktrees-issue-command-overrides.test.ts": 430,
+      "src/main/ipc/worktrees-lineage-hydration.test.ts": 886,
+      "src/main/ipc/worktrees-listing-fallback-rows.test.ts": 778,
+      "src/main/ipc/worktrees-local-base-ref-resolution.test.ts": 872,
+      "src/main/ipc/worktrees-local-create-flow.test.ts": 922,
+      "src/main/ipc/worktrees-mutation-scan-generation-order.test.ts": 971,
+      "src/main/ipc/worktrees-orphan-directory-cleanup.test.ts": 933,
+      "src/main/ipc/worktrees-preserved-branch-fork-remote.test.ts": 816,
+      "src/main/ipc/worktrees-removal-recovery.test.ts": 1234,
+      "src/main/ipc/worktrees-remove-archive-hooks.test.ts": 1347,
+      "src/main/ipc/worktrees-remove-host-disambiguation.test.ts": 868,
+      "src/main/ipc/worktrees-remove-preflight.test.ts": 840,
+      "src/main/ipc/worktrees-setup-launch-sparse-checkout.test.ts": 664,
+      "src/main/ipc/worktrees-ssh-base-ref-resolution.test.ts": 917,
+      "src/main/ipc/worktrees-ssh-branch-conflict-suffixing.test.ts": 925,
+      "src/main/ipc/worktrees-ssh-create-base-prefetch.test.ts": 717,
+      "src/main/ipc/worktrees-ssh-fork-push-target-remote.test.ts": 914,
+      "src/main/ipc/worktrees-ssh-local-base-refresh.test.ts": 906,
+      "src/main/ipc/worktrees-ssh-pr-head-fetch.test.ts": 768,
+      "src/main/ipc/worktrees-ssh-provider-authority.test.ts": 895,
+      "src/main/ipc/worktrees-ssh-repo-owner-resolution.test.ts": 1245,
+      "src/main/ipc/worktrees-ssh-setup-launch.test.ts": 927,
+      "src/main/ipc/worktrees-windows.test.ts": 1052,
+      "src/main/ipc/worktrees-wsl-runtime-routing.test.ts": 812,
+      "src/main/ipc/worktrees/listing/detected-provider-listing-catalog-version.test.ts": 107,
+      "src/main/ipc/worktrees/listing/detected-provider-listing-meta-index.test.ts": 358,
+      "src/main/ipc/worktrees/listing/detected-provider-listing-overtaken-scan.test.ts": 127,
+      "src/main/ipc/worktrees/listing/detected-scan-failure-authority.test.ts": 431,
+      "src/main/ipc/worktrees/listing/detected-worktree-classification.test.ts": 148,
+      "src/main/ipc/worktrees/listing/detected-worktree-scan-hygiene-gate.test.ts": 55,
+      "src/main/ipc/worktrees/listing/detected-worktree-scan-superseded.test.ts": 89,
+      "src/main/ipc/worktrees/listing/register-sparse-checkout-cache-invalidation.test.ts": 168,
+      "src/main/ipc/worktrees/metadata/workspace-lineage-candidate-scan.test.ts": 54,
+      "src/main/ipc/worktrees/removal/remove-unregistered-worktree-host-home.test.ts": 99,
+      "src/main/ipc/worktrees/removal/worktree-archive-hook.test.ts": 211,
+      "src/main/issue-command-ignore.test.ts": 395,
+      "src/main/jira/adf-markdown.test.ts": 58,
+      "src/main/jira/attachment-image-cache-generation.test.ts": 46,
+      "src/main/jira/attachment-image-cache.test.ts": 47,
+      "src/main/jira/attachment-images.test.ts": 82,
+      "src/main/jira/client.test.ts": 304,
+      "src/main/jira/issues.test.ts": 172,
+      "src/main/jira/jira-issue-mutations.test.ts": 56,
+      "src/main/jira/jira-issue-summary-timeout.test.ts": 78,
+      "src/main/jira/jira-search-abort.test.ts": 42,
+      "src/main/keybindings/keybinding-file.test.ts": 119,
+      "src/main/keybindings/keybinding-service.test.ts": 140,
+      "src/main/kimi/hook-service-config-delete-race.test.ts": 124,
+      "src/main/kimi/hook-service-mode-read-failure.test.ts": 86,
+      "src/main/kimi/hook-service.test.ts": 161,
+      "src/main/kimi/kimi-hook-config-toml.test.ts": 94,
+      "src/main/kimi/kimi-runtime-home.test.ts": 62,
+      "src/main/lib/unread-response-body.test.ts": 92,
+      "src/main/line-editor-ready-output-scanner.test.ts": 55,
+      "src/main/linear/client.test.ts": 107,
+      "src/main/linear/issue-context-client.test.ts": 61,
+      "src/main/linear/issue-context-current.test.ts": 63,
+      "src/main/linear/issue-context-errors.test.ts": 52,
+      "src/main/linear/issue-context-includes.test.ts": 66,
+      "src/main/linear/issue-context-inline-media.test.ts": 76,
+      "src/main/linear/issue-context-relations.test.ts": 37,
+      "src/main/linear/issue-context.test.ts": 66,
+      "src/main/linear/issue-list-filter.test.ts": 44,
+      "src/main/linear/issue-relation-write.test.ts": 79,
+      "src/main/linear/issue-search-summary.test.ts": 50,
+      "src/main/linear/issues.test.ts": 114,
+      "src/main/linear/linear-workspace-registry.test.ts": 39,
+      "src/main/linear/mappers.test.ts": 53,
+      "src/main/linear/mcp-issue-list-pagination.test.ts": 93,
+      "src/main/linear/mcp-issue-list.test.ts": 105,
+      "src/main/linear/projects.test.ts": 369,
+      "src/main/linear/teams.test.ts": 84,
+      "src/main/linux-lid-sleep-assertion.test.ts": 93,
+      "src/main/linux-package-install-command.test.ts": 46,
+      "src/main/linux-package-install-diagnostic.test.ts": 79,
+      "src/main/linux-package-update-recovery.test.ts": 361,
+      "src/main/linux-update-package-type.test.ts": 98,
+      "src/main/local-builds/local-build-candidate.test.ts": 265,
+      "src/main/local-builds/local-build-compatibility-contract.test.ts": 162,
+      "src/main/local-builds/local-build-feed-server.test.ts": 191,
+      "src/main/local-downloaded-folder-promotion.test.ts": 185,
       "src/main/local-worktree-filesystem-wsl-banner.wsl.test.ts": 54,
-      "src/main/local-worktree-filesystem.test.ts": 328,
-      "src/main/local-worktree-metadata-prune-gate.test.ts": 45,
-      "src/main/local-worktree-path-presence.test.ts": 73,
-      "src/main/local-worktree-removal-recovery-live.test.ts": 295,
-      "src/main/local-worktree-removal-recovery.test.ts": 75,
-      "src/main/localhost-worktree-label-proxy.test.ts": 193,
-      "src/main/macos-full-disk-access-status.test.ts": 42,
-      "src/main/macos-keychain/generic-password.test.ts": 35,
-      "src/main/macos-press-and-hold-default.defaults-domain.test.ts": 83,
-      "src/main/macos-press-and-hold-default.test.ts": 102,
-      "src/main/macos-system-sleep-assertion.test.ts": 70,
-      "src/main/macos-tcc-prompt-notice.test.ts": 93,
-      "src/main/macos-tcc-prompt-watch.test.ts": 77,
-      "src/main/macos-tcc-reset.test.ts": 63,
-      "src/main/main-process-tree-kill-gate.test.ts": 464,
-      "src/main/memory/collector-windows-sweep.test.ts": 195,
-      "src/main/memory/collector.test.ts": 474,
-      "src/main/memory/host-memory.test.ts": 69,
-      "src/main/memory/hydrate-local-pty-registry.test.ts": 1182,
-      "src/main/memory/memory-snapshot-buckets.test.ts": 68,
-      "src/main/memory/process-memory-metric.test.ts": 45,
-      "src/main/memory/windows-process-sample-parsing.test.ts": 110,
-      "src/main/menu/gpu-acceleration-about-panel.test.ts": 53,
-      "src/main/menu/register-app-menu.test.ts": 92,
-      "src/main/mimo/hook-service.test.ts": 64,
-      "src/main/minimax/minimax-api-key-store.test.ts": 90,
+      "src/main/local-worktree-filesystem.test.ts": 348,
+      "src/main/local-worktree-metadata-prune-gate.test.ts": 60,
+      "src/main/local-worktree-path-presence.test.ts": 77,
+      "src/main/local-worktree-removal-recovery-live.test.ts": 198,
+      "src/main/local-worktree-removal-recovery.test.ts": 123,
+      "src/main/localhost-worktree-label-proxy.test.ts": 141,
+      "src/main/macos-full-disk-access-status.test.ts": 54,
+      "src/main/macos-keychain/generic-password.test.ts": 61,
+      "src/main/macos-press-and-hold-default.defaults-domain.test.ts": 51,
+      "src/main/macos-press-and-hold-default.test.ts": 95,
+      "src/main/macos-system-sleep-assertion.test.ts": 73,
+      "src/main/macos-tcc-prompt-notice.test.ts": 61,
+      "src/main/macos-tcc-prompt-watch.test.ts": 66,
+      "src/main/macos-tcc-reset.test.ts": 41,
+      "src/main/main-process-tree-kill-gate.test.ts": 378,
+      "src/main/memory/collector-windows-sweep.test.ts": 455,
+      "src/main/memory/collector.test.ts": 333,
+      "src/main/memory/host-memory.test.ts": 78,
+      "src/main/memory/hydrate-local-pty-registry.test.ts": 774,
+      "src/main/memory/memory-snapshot-buckets.test.ts": 56,
+      "src/main/memory/process-memory-metric.test.ts": 49,
+      "src/main/memory/windows-process-sample-parsing.test.ts": 95,
+      "src/main/menu/gpu-acceleration-about-panel.test.ts": 30,
+      "src/main/menu/register-app-menu.test.ts": 65,
+      "src/main/mimo/hook-service.test.ts": 66,
+      "src/main/minimax/minimax-api-key-store.test.ts": 88,
       "src/main/minimax/minimax-cookie-store.test.ts": 71,
-      "src/main/muse-usage/scanner.test.ts": 268,
-      "src/main/muse-usage/snapshot-rollups.test.ts": 47,
-      "src/main/muse/hook-config-json.test.ts": 74,
-      "src/main/muse/hook-service.test.ts": 122,
-      "src/main/native-chat/agent-model-catalog/agent-model-catalog-service.test.ts": 63,
-      "src/main/native-chat/agent-model-catalog/agent-model-catalog-store.test.ts": 611,
-      "src/main/native-chat/agent-model-catalog/agent-project-model-override.test.ts": 66,
-      "src/main/native-chat/agent-session-journal/journal-corruption-repair.test.ts": 354,
-      "src/main/native-chat/agent-session-journal/journal-crash-boundary.test.ts": 302,
-      "src/main/native-chat/agent-session-journal/journal-cursor.test.ts": 32,
-      "src/main/native-chat/agent-session-journal/journal-database.test.ts": 285,
-      "src/main/native-chat/agent-session-journal/journal-dispatch-observation.test.ts": 48,
-      "src/main/native-chat/agent-session-journal/journal-dispatch-reason-bound.test.ts": 222,
-      "src/main/native-chat/agent-session-journal/journal-epoch-replacement.test.ts": 389,
-      "src/main/native-chat/agent-session-journal/journal-file-format-remnant.test.ts": 340,
-      "src/main/native-chat/agent-session-journal/journal-handle-ownership.test.ts": 5314,
-      "src/main/native-chat/agent-session-journal/journal-item-identity.test.ts": 69,
-      "src/main/native-chat/agent-session-journal/journal-legacy-import-source-bound.test.ts": 233,
-      "src/main/native-chat/agent-session-journal/journal-legacy-import.test.ts": 369,
-      "src/main/native-chat/agent-session-journal/journal-producer-inheritance.test.ts": 267,
-      "src/main/native-chat/agent-session-journal/journal-reducer.test.ts": 230,
-      "src/main/native-chat/agent-session-journal/journal-restart-reconciliation.test.ts": 312,
-      "src/main/native-chat/agent-session-journal/journal-row-context-usage.test.ts": 207,
-      "src/main/native-chat/agent-session-journal/journal-row-schema-version.test.ts": 214,
-      "src/main/native-chat/agent-session-journal/journal-row-schema.test.ts": 211,
-      "src/main/native-chat/agent-session-journal/journal-row-writer.test.ts": 184,
-      "src/main/native-chat/agent-session-journal/journal-store-close.test.ts": 246,
-      "src/main/native-chat/agent-session-journal/journal-store-schema.test.ts": 322,
-      "src/main/native-chat/agent-session-journal/journal-store.test.ts": 446,
-      "src/main/native-chat/agent-session-journal/journal-streaming-replay.test.ts": 821,
-      "src/main/native-chat/agent-session-journal/journal-subagent-liveness.test.ts": 241,
-      "src/main/native-chat/agent-session-wire/agent-session-conversation-outline.test.ts": 277,
-      "src/main/native-chat/agent-session-wire/agent-session-delta-coalescer-protected.test.ts": 70,
-      "src/main/native-chat/agent-session-wire/agent-session-delta-coalescer.test.ts": 65,
-      "src/main/native-chat/agent-session-wire/agent-session-empty-delta-retention.test.ts": 302,
-      "src/main/native-chat/agent-session-wire/agent-session-history-byte-accounting.test.ts": 456,
-      "src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts": 615,
-      "src/main/native-chat/agent-session-wire/agent-session-history-page-grouping-parity.test.ts": 214,
-      "src/main/native-chat/agent-session-wire/agent-session-history-page-scaling.test.ts": 72,
-      "src/main/native-chat/agent-session-wire/agent-session-history-page.test.ts": 1969,
-      "src/main/native-chat/agent-session-wire/agent-session-journal-recovery.test.ts": 406,
-      "src/main/native-chat/agent-session-wire/agent-session-retired-provider-exit-copy-ratchet.test.ts": 2604,
-      "src/main/native-chat/agent-session-wire/provider-frame-activity.test.ts": 35,
-      "src/main/native-chat/agent-session-wire/provider-frame-disposition.test.ts": 62,
-      "src/main/native-chat/agent-session-wire/provider-turn-activity-routing.test.ts": 310,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-acquisition-options.test.ts": 1377,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-adapter-router.test.ts": 64,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-adapter.test.ts": 44,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts": 578,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-append-delivery.test.ts": 757,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-attach-reconciliation.test.ts": 379,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-claude-option-queue.test.ts": 667,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-claude-root-exit.test.ts": 597,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-close-retry.test.ts": 443,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-command-publication.test.ts": 559,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-conversations.test.ts": 343,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-crash-mid-start.test.ts": 1153,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.test.ts": 280,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.test.ts": 198,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-eviction.test.ts": 268,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-owner-verdict.test.ts": 562,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-sink-release.test.ts": 644,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-forget-status.test.ts": 733,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-grouped-prompt.test.ts": 536,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-hold-resume-race.test.ts": 80,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-holds.test.ts": 292,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-host-runtime-state.test.ts": 244,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.test.ts": 278,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-host.test.ts": 5943,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-journal-handles.test.ts": 518,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement.test.ts": 871,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-launch-env.test.ts": 341,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-launch-send-after-create.test.ts": 522,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-lease-renewer.test.ts": 395,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-legacy-handoff-record.test.ts": 959,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-operation-settlement.test.ts": 656,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-option-settlement.test.ts": 584,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-owed-work-release.test.ts": 1729,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-processless-reservation.test.ts": 480,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel.test.ts": 224,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-provider-restore.test.ts": 523,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-provider-started.test.ts": 929,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-read-restore.test.ts": 326,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-readable-restorer.test.ts": 42,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-recovered-turn-clock.test.ts": 577,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-recovery-exits.test.ts": 953,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-recovery-resolution.test.ts": 378,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-refusal-retry.test.ts": 10113,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-resolved-append.test.ts": 45,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-child-work.test.ts": 825,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.test.ts": 294,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-filing.test.ts": 1402,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-after-reattach.test.ts": 909,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-endings.test.ts": 1046,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts": 4132,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-reconcile.test.ts": 310,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-restore-gate.test.ts": 45,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-restore.test.ts": 96,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume.test.ts": 405,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-status-publication.test.ts": 617,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-teardown.test.ts": 1822,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-reveal.test.ts": 363,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-rewind.test.ts": 1915,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts": 237,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-send-preparation.test.ts": 2743,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-send-restarts-failed-start.test.ts": 854,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.test.ts": 51,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts": 1586,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-settled-attach-retry.test.ts": 653,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-shown-work.test.ts": 379,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.test.ts": 221,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-startup-failure-exit.test.ts": 165,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-child-work.test.ts": 280,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-clock.test.ts": 275,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.test.ts": 835,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-status-ownership.test.ts": 166,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-status-reentry.test.ts": 486,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-subagent-recency.test.ts": 713,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.test.ts": 673,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-surface-lifetime.test.ts": 2960,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-task-queue.test.ts": 105,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.test.ts": 321,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.test.ts": 72,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-turns.test.ts": 292,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-unanswered-dispatch-release.test.ts": 289,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.test.ts": 189,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-wedged-profile-migration.test.ts": 3032,
-      "src/main/native-chat/agent-session-wire/structured-agent-session-wire-admission.test.ts": 864,
-      "src/main/native-chat/agent-session-wire/structured-conversation-command-admission.test.ts": 47,
-      "src/main/native-chat/agent-session-wire/structured-conversation-command.test.ts": 1459,
-      "src/main/native-chat/agent-session-wire/structured-conversation-replacements.test.ts": 340,
-      "src/main/native-chat/agent-session-wire/structured-rewind-journal-body.test.ts": 161,
-      "src/main/native-chat/agent-session-wire/structured-session-compaction.test.ts": 67,
-      "src/main/native-chat/agent-session-wire/unhandled-provider-frame.test.ts": 106,
-      "src/main/native-chat/claude-structured-managed-account-support.test.ts": 45,
-      "src/main/native-chat/host-readable-transcript-path-fs-gate.test.ts": 268,
-      "src/main/native-chat/host-readable-transcript-path.test.ts": 83,
-      "src/main/native-chat/native-chat-file-provenance.test.ts": 132,
-      "src/main/native-chat/session-file-resolver-claude-roots.test.ts": 129,
-      "src/main/native-chat/session-file-resolver-codex-roots.test.ts": 96,
-      "src/main/native-chat/session-file-resolver-wsl-scan-gate.test.ts": 98,
-      "src/main/native-chat/session-file-resolver-wsl.test.ts": 111,
-      "src/main/native-chat/session-file-resolver.test.ts": 167,
-      "src/main/native-chat/structured-agent-session-create-support.test.ts": 58,
-      "src/main/native-chat/structured-agent-session-history-adoption.test.ts": 128,
-      "src/main/native-chat/subagent-entry-id-bounds.test.ts": 64,
-      "src/main/native-chat/transcript-fallback-id.test.ts": 38,
-      "src/main/native-chat/transcript-interruption-message.test.ts": 62,
-      "src/main/native-chat/transcript-line-decoders-claude-control-bytes.test.ts": 66,
-      "src/main/native-chat/transcript-line-decoders-claude-image-companion.test.ts": 144,
-      "src/main/native-chat/transcript-line-decoders-codex-skill-context.test.ts": 81,
-      "src/main/native-chat/transcript-line-decoders.grok.test.ts": 80,
-      "src/main/native-chat/transcript-line-decoders.omp.test.ts": 96,
-      "src/main/native-chat/transcript-read-cache-refusal-recovery.test.ts": 96,
-      "src/main/native-chat/transcript-read-cache-wsl-stall.test.ts": 133,
-      "src/main/native-chat/transcript-read-cache.test.ts": 128,
-      "src/main/native-chat/transcript-reader-codex-history-mode.test.ts": 166,
-      "src/main/native-chat/transcript-reader-wsl-stall.test.ts": 148,
-      "src/main/native-chat/transcript-reader.test.ts": 179,
-      "src/main/native-chat/transcript-stream-lines.test.ts": 110,
-      "src/main/native-chat/transcript-tail-reader-cancellation.test.ts": 204,
-      "src/main/native-chat/transcript-tail-reader-wsl-gate.test.ts": 100,
-      "src/main/native-chat/transcript-turn-lifecycle.test.ts": 87,
-      "src/main/native-chat/transcript-watch-engine-wsl-lifecycle.test.ts": 252,
-      "src/main/native-chat/transcript-watch-error.test.ts": 2211,
-      "src/main/native-chat/transcript-watch-liveness.test.ts": 797,
-      "src/main/native-chat/transcript-watch-resolve-poll.test.ts": 202,
-      "src/main/native-chat/transcript-watch-unflushed-settle.test.ts": 232,
-      "src/main/native-chat/transcript-watch-unsubscribe-race.test.ts": 106,
-      "src/main/native-chat/transcript-watch-wsl-exact-path.test.ts": 98,
-      "src/main/native-chat/transcript-watch-wsl-stall.test.ts": 136,
-      "src/main/native-chat/transcript-watch.test.ts": 3400,
-      "src/main/native-chat/transcript-window-tool-attribution.test.ts": 160,
-      "src/main/native-chat/wsl-codex-session-path-scan.test.ts": 88,
-      "src/main/native-chat/wsl-transcript-fs-access.test.ts": 93,
-      "src/main/native-chat/wsl-transcript-fs-gate.test.ts": 519,
-      "src/main/native-chat/wsl-transcript-fs-process-client.test.ts": 91,
-      "src/main/native-chat/wsl-transcript-fs-process-operations.test.ts": 39,
-      "src/main/native-chat/wsl-transcript-fs-route-quarantine.test.ts": 80,
+      "src/main/muse-usage/scanner.test.ts": 162,
+      "src/main/muse-usage/snapshot-rollups.test.ts": 49,
+      "src/main/muse-usage/store-snapshot-filtering.test.ts": 475,
+      "src/main/muse/hook-config-json.test.ts": 85,
+      "src/main/muse/hook-service.test.ts": 134,
+      "src/main/native-chat/agent-model-catalog/agent-model-catalog-service.test.ts": 59,
+      "src/main/native-chat/agent-model-catalog/agent-model-catalog-store.test.ts": 550,
+      "src/main/native-chat/agent-model-catalog/agent-project-model-override.test.ts": 52,
+      "src/main/native-chat/agent-session-journal/journal-corruption-repair.test.ts": 355,
+      "src/main/native-chat/agent-session-journal/journal-crash-boundary.test.ts": 346,
+      "src/main/native-chat/agent-session-journal/journal-cursor.test.ts": 54,
+      "src/main/native-chat/agent-session-journal/journal-database.test.ts": 177,
+      "src/main/native-chat/agent-session-journal/journal-dispatch-observation.test.ts": 45,
+      "src/main/native-chat/agent-session-journal/journal-dispatch-reason-bound.test.ts": 246,
+      "src/main/native-chat/agent-session-journal/journal-epoch-replacement.test.ts": 234,
+      "src/main/native-chat/agent-session-journal/journal-file-format-remnant.test.ts": 269,
+      "src/main/native-chat/agent-session-journal/journal-handle-ownership.test.ts": 5325,
+      "src/main/native-chat/agent-session-journal/journal-item-identity.test.ts": 64,
+      "src/main/native-chat/agent-session-journal/journal-legacy-import-source-bound.test.ts": 236,
+      "src/main/native-chat/agent-session-journal/journal-legacy-import.test.ts": 451,
+      "src/main/native-chat/agent-session-journal/journal-producer-inheritance.test.ts": 238,
+      "src/main/native-chat/agent-session-journal/journal-reducer.test.ts": 155,
+      "src/main/native-chat/agent-session-journal/journal-restart-reconciliation.test.ts": 324,
+      "src/main/native-chat/agent-session-journal/journal-row-context-usage.test.ts": 232,
+      "src/main/native-chat/agent-session-journal/journal-row-schema-version.test.ts": 248,
+      "src/main/native-chat/agent-session-journal/journal-row-schema.test.ts": 127,
+      "src/main/native-chat/agent-session-journal/journal-row-writer.test.ts": 187,
+      "src/main/native-chat/agent-session-journal/journal-store-close.test.ts": 249,
+      "src/main/native-chat/agent-session-journal/journal-store-schema.test.ts": 222,
+      "src/main/native-chat/agent-session-journal/journal-store.test.ts": 401,
+      "src/main/native-chat/agent-session-journal/journal-streaming-replay.test.ts": 1019,
+      "src/main/native-chat/agent-session-journal/journal-subagent-liveness.test.ts": 243,
+      "src/main/native-chat/agent-session-wire/agent-session-conversation-outline.test.ts": 200,
+      "src/main/native-chat/agent-session-wire/agent-session-delta-coalescer-protected.test.ts": 40,
+      "src/main/native-chat/agent-session-wire/agent-session-delta-coalescer.test.ts": 41,
+      "src/main/native-chat/agent-session-wire/agent-session-empty-delta-retention.test.ts": 173,
+      "src/main/native-chat/agent-session-wire/agent-session-history-byte-accounting.test.ts": 497,
+      "src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts": 1663,
+      "src/main/native-chat/agent-session-wire/agent-session-history-page-grouping-parity.test.ts": 309,
+      "src/main/native-chat/agent-session-wire/agent-session-history-page-scaling.test.ts": 75,
+      "src/main/native-chat/agent-session-wire/agent-session-history-page.test.ts": 2331,
+      "src/main/native-chat/agent-session-wire/agent-session-journal-recovery.test.ts": 427,
+      "src/main/native-chat/agent-session-wire/agent-session-retired-provider-exit-copy-ratchet.test.ts": 1719,
+      "src/main/native-chat/agent-session-wire/provider-frame-activity.test.ts": 52,
+      "src/main/native-chat/agent-session-wire/provider-frame-disposition.test.ts": 97,
+      "src/main/native-chat/agent-session-wire/provider-turn-activity-routing.test.ts": 210,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-acquisition-options.test.ts": 1113,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-adapter-router.test.ts": 83,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-adapter.test.ts": 47,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts": 386,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-append-delivery.test.ts": 626,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-attach-reconciliation.test.ts": 393,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-claude-option-queue.test.ts": 687,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-claude-root-exit.test.ts": 674,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-close-retry.test.ts": 404,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-command-publication.test.ts": 556,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-conversations.test.ts": 297,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-crash-mid-start.test.ts": 1198,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.test.ts": 409,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.test.ts": 259,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-eviction.test.ts": 255,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-owner-verdict.test.ts": 514,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-sink-release.test.ts": 766,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-forget-status.test.ts": 780,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-grouped-prompt.test.ts": 448,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-hold-resume-race.test.ts": 72,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-holds.test.ts": 300,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-host-runtime-state.test.ts": 170,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.test.ts": 369,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-host.test.ts": 1870,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-journal-handles.test.ts": 442,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement.test.ts": 736,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-launch-env.test.ts": 301,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-launch-send-after-create.test.ts": 423,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-lease-renewer.test.ts": 389,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-legacy-handoff-record.test.ts": 809,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-operation-settlement.test.ts": 600,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-option-settlement.test.ts": 718,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-owed-work-release.test.ts": 1713,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-processless-reservation.test.ts": 477,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel.test.ts": 255,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-provider-restore.test.ts": 558,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-provider-started.test.ts": 972,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-read-restore.test.ts": 370,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-readable-restorer.test.ts": 51,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-recovered-turn-clock.test.ts": 816,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-recovery-exits.test.ts": 739,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-recovery-resolution.test.ts": 297,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-refusal-retry.test.ts": 3078,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-resolved-append.test.ts": 48,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-child-work.test.ts": 785,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.test.ts": 330,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-filing.test.ts": 1273,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-after-reattach.test.ts": 829,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-endings.test.ts": 711,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts": 3393,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-reconcile.test.ts": 320,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-restore-gate.test.ts": 48,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-restore.test.ts": 131,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume.test.ts": 354,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-status-publication.test.ts": 613,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-restart-teardown.test.ts": 900,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-reveal.test.ts": 351,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-rewind.test.ts": 1675,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts": 225,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-send-preparation.test.ts": 2117,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-send-restarts-failed-start.test.ts": 871,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.test.ts": 42,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts": 1405,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-settled-attach-retry.test.ts": 812,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-shown-work.test.ts": 358,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.test.ts": 271,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-startup-failure-exit.test.ts": 168,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-child-work.test.ts": 288,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-clock.test.ts": 311,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.test.ts": 699,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-status-ownership.test.ts": 99,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-status-reentry.test.ts": 791,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-subagent-recency.test.ts": 1004,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.test.ts": 551,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-surface-lifetime.test.ts": 2023,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-task-queue.test.ts": 89,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.test.ts": 284,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.test.ts": 67,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-turns.test.ts": 295,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-unanswered-dispatch-release.test.ts": 405,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.test.ts": 127,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-wedged-profile-migration.test.ts": 2947,
+      "src/main/native-chat/agent-session-wire/structured-agent-session-wire-admission.test.ts": 643,
+      "src/main/native-chat/agent-session-wire/structured-conversation-command-admission.test.ts": 57,
+      "src/main/native-chat/agent-session-wire/structured-conversation-command.test.ts": 1455,
+      "src/main/native-chat/agent-session-wire/structured-conversation-replacements.test.ts": 330,
+      "src/main/native-chat/agent-session-wire/structured-rewind-journal-body.test.ts": 123,
+      "src/main/native-chat/agent-session-wire/structured-session-compaction.test.ts": 36,
+      "src/main/native-chat/agent-session-wire/unhandled-provider-frame.test.ts": 64,
+      "src/main/native-chat/claude-structured-managed-account-support.test.ts": 37,
+      "src/main/native-chat/host-readable-transcript-path-fs-gate.test.ts": 257,
+      "src/main/native-chat/host-readable-transcript-path.test.ts": 89,
+      "src/main/native-chat/native-chat-file-provenance.test.ts": 134,
+      "src/main/native-chat/session-file-resolver-claude-roots.test.ts": 131,
+      "src/main/native-chat/session-file-resolver-codex-roots.test.ts": 66,
+      "src/main/native-chat/session-file-resolver-wsl-scan-gate.test.ts": 95,
+      "src/main/native-chat/session-file-resolver-wsl.test.ts": 92,
+      "src/main/native-chat/session-file-resolver.test.ts": 108,
+      "src/main/native-chat/structured-agent-session-create-support.test.ts": 39,
+      "src/main/native-chat/structured-agent-session-history-adoption.test.ts": 141,
+      "src/main/native-chat/subagent-entry-id-bounds.test.ts": 37,
+      "src/main/native-chat/transcript-fallback-id.test.ts": 47,
+      "src/main/native-chat/transcript-interruption-message.test.ts": 50,
+      "src/main/native-chat/transcript-line-decoders-claude-control-bytes.test.ts": 51,
+      "src/main/native-chat/transcript-line-decoders-claude-image-companion.test.ts": 81,
+      "src/main/native-chat/transcript-line-decoders-codex-skill-context.test.ts": 48,
+      "src/main/native-chat/transcript-line-decoders.grok.test.ts": 64,
+      "src/main/native-chat/transcript-line-decoders.omp.test.ts": 95,
+      "src/main/native-chat/transcript-read-cache-inflight.test.ts": 512,
+      "src/main/native-chat/transcript-read-cache-refusal-recovery.test.ts": 135,
+      "src/main/native-chat/transcript-read-cache-wsl-stall.test.ts": 58,
+      "src/main/native-chat/transcript-read-cache.test.ts": 193,
+      "src/main/native-chat/transcript-reader-codex-history-mode.test.ts": 132,
+      "src/main/native-chat/transcript-reader-wsl-stall.test.ts": 114,
+      "src/main/native-chat/transcript-reader.test.ts": 176,
+      "src/main/native-chat/transcript-stream-lines.test.ts": 83,
+      "src/main/native-chat/transcript-tail-reader-cancellation.test.ts": 210,
+      "src/main/native-chat/transcript-tail-reader-wsl-gate.test.ts": 91,
+      "src/main/native-chat/transcript-turn-lifecycle.test.ts": 95,
+      "src/main/native-chat/transcript-watch-engine-wsl-lifecycle.test.ts": 217,
+      "src/main/native-chat/transcript-watch-error.test.ts": 2170,
+      "src/main/native-chat/transcript-watch-liveness.test.ts": 762,
+      "src/main/native-chat/transcript-watch-resolve-poll.test.ts": 203,
+      "src/main/native-chat/transcript-watch-unflushed-settle.test.ts": 201,
+      "src/main/native-chat/transcript-watch-unsubscribe-race.test.ts": 133,
+      "src/main/native-chat/transcript-watch-wsl-exact-path.test.ts": 105,
+      "src/main/native-chat/transcript-watch-wsl-stall.test.ts": 170,
+      "src/main/native-chat/transcript-watch.test.ts": 3388,
+      "src/main/native-chat/transcript-window-tool-attribution.test.ts": 146,
+      "src/main/native-chat/wsl-codex-session-path-scan.test.ts": 100,
+      "src/main/native-chat/wsl-transcript-fs-access.test.ts": 147,
+      "src/main/native-chat/wsl-transcript-fs-gate.test.ts": 538,
+      "src/main/native-chat/wsl-transcript-fs-process-client.test.ts": 79,
+      "src/main/native-chat/wsl-transcript-fs-process-operations.test.ts": 38,
+      "src/main/native-chat/wsl-transcript-fs-route-quarantine.test.ts": 76,
       "src/main/native-chat/wsl-transcript-fs-route.test.ts": 44,
-      "src/main/native-chat/wsl-transcript-running-observer.test.ts": 121,
-      "src/main/network/electron-proxy-request-guard.test.ts": 366,
-      "src/main/network/macos-system-resolver-health.test.ts": 79,
-      "src/main/network/macos-tailscale-dns-diagnostic.test.ts": 49,
-      "src/main/network/proxy-settings-session.test.ts": 820,
-      "src/main/network/proxy-settings.test.ts": 132,
-      "src/main/notebook/notebook-kernel.test.ts": 72,
-      "src/main/notebook/python-environments.test.ts": 90,
-      "src/main/notifications/announced-notification-registry.test.ts": 53,
-      "src/main/notifications/desktop-away-state.test.ts": 40,
-      "src/main/notifications/notification-delivery-service.test.ts": 46,
-      "src/main/observability/architecture.test.ts": 37,
-      "src/main/observability/bundle.test.ts": 659,
-      "src/main/observability/diagnostic-upload-http.test.ts": 60,
-      "src/main/observability/instrumentation.test.ts": 263,
-      "src/main/observability/local-file-sink-memory.test.ts": 210,
-      "src/main/observability/local-file-sink.test.ts": 78,
-      "src/main/observability/redactor-environment-lines.test.ts": 528,
-      "src/main/observability/redactor.test.ts": 72,
-      "src/main/observability/tracer.test.ts": 91,
-      "src/main/opencode-usage/cache-read-reproduction.test.ts": 160,
-      "src/main/opencode-usage/opencode2-session-usage.test.ts": 527,
-      "src/main/opencode-usage/scanner-windows-data-directory.test.ts": 252,
-      "src/main/opencode-usage/scanner-wsl-gate.test.ts": 63,
-      "src/main/opencode-usage/scanner.test.ts": 323,
-      "src/main/opencode-usage/store.test.ts": 99,
-      "src/main/opencode/hook-plugin-background-child-completion.test.ts": 353,
-      "src/main/opencode/hook-plugin-child-attention.test.ts": 740,
-      "src/main/opencode/hook-plugin-fail-open-ownership.test.ts": 444,
-      "src/main/opencode/hook-plugin-lifecycle-delivery.test.ts": 919,
-      "src/main/opencode/hook-plugin-message-part-throttle.test.ts": 216,
-      "src/main/opencode/hook-plugin-module-contract.test.ts": 650,
-      "src/main/opencode/hook-plugin-opencode2-session-lineage.test.ts": 1128,
-      "src/main/opencode/hook-plugin-opencode2-setup.test.ts": 2315,
-      "src/main/opencode/hook-service.test.ts": 295,
-      "src/main/opencode/opencode-client-sweep.test.ts": 93,
-      "src/main/opencode/opencode-data-directory.test.ts": 49,
-      "src/main/opencode/opencode-session-binder.test.ts": 108,
-      "src/main/orca-profiles/profile-active-transfer-worker.test.ts": 2727,
-      "src/main/orca-profiles/profile-active-transfer.test.ts": 1594,
-      "src/main/orca-profiles/profile-artifact-cloud-cleanup.test.ts": 338,
-      "src/main/orca-profiles/profile-cloud-auth-config.test.ts": 75,
-      "src/main/orca-profiles/profile-cloud-auth-status.test.ts": 63,
-      "src/main/orca-profiles/profile-cloud-client.test.ts": 134,
-      "src/main/orca-profiles/profile-cloud-dev-service.test.ts": 330,
-      "src/main/orca-profiles/profile-cloud-org-members-client.test.ts": 47,
-      "src/main/orca-profiles/profile-cloud-org-members-service.test.ts": 300,
-      "src/main/orca-profiles/profile-cloud-pkce.test.ts": 609,
-      "src/main/orca-profiles/profile-cloud-refresh-replay-guard.test.ts": 61,
-      "src/main/orca-profiles/profile-cloud-service-auth-retry.test.ts": 310,
-      "src/main/orca-profiles/profile-cloud-service-connect-overlap.test.ts": 436,
-      "src/main/orca-profiles/profile-cloud-service-refresh.test.ts": 321,
-      "src/main/orca-profiles/profile-cloud-service-sign-out-connect-race.test.ts": 271,
-      "src/main/orca-profiles/profile-cloud-service.test.ts": 401,
-      "src/main/orca-profiles/profile-cloud-session-mutation.test.ts": 55,
-      "src/main/orca-profiles/profile-cloud-session-refresh.test.ts": 74,
-      "src/main/orca-profiles/profile-cloud-session-store.test.ts": 193,
-      "src/main/orca-profiles/profile-index-store.test.ts": 411,
-      "src/main/orca-profiles/profile-persistence-deadline.test.ts": 41,
-      "src/main/orca-profiles/profile-project-domain-transfer.test.ts": 3077,
-      "src/main/orca-profiles/profile-project-presence.test.ts": 276,
-      "src/main/orca-profiles/profile-project-session-field-disposition.test.ts": 258,
-      "src/main/orca-profiles/profile-project-session-state.test.ts": 203,
-      "src/main/orca-profiles/profile-project-state-file.test.ts": 261,
-      "src/main/orca-profiles/profile-project-transfer-migration.test.ts": 776,
-      "src/main/orca-profiles/profile-project-transfer.test.ts": 1469,
-      "src/main/orca-profiles/profile-ui-scope.test.ts": 43,
-      "src/main/orcad/electron-serve-browser-process.test.ts": 3432,
-      "src/main/orcad/electron-serve-provider-selection.test.ts": 756,
-      "src/main/orcad/electron-sidecar-method-routing.test.ts": 250,
-      "src/main/orcad/electron-sidecar-tab-registry.test.ts": 124,
-      "src/main/orcad/external-chromium-browser-process.integration.test.ts": 161,
-      "src/main/orcad/external-chromium-browser-session.test.ts": 207,
-      "src/main/orcad/main-preflight-order.test.ts": 44,
-      "src/main/orcad/native-host-abi.test.ts": 68,
-      "src/main/orcad/node-pty-prebuilt-slot.test.ts": 54,
-      "src/main/orcad/node-pty-precondition.test.ts": 350,
-      "src/main/orcad/orcad-app-paths.test.ts": 66,
-      "src/main/orcad/orcad-bind-address.test.ts": 38,
-      "src/main/orcad/orcad-browser-provider.test.ts": 322,
-      "src/main/orcad/orcad-bundle-native-load-order.test.ts": 4024,
-      "src/main/orcad/orcad-daemon-supervision.test.ts": 57,
-      "src/main/orcad/orcad-entry.test.ts": 369,
-      "src/main/orcad/orcad-forked-child-paths.test.ts": 285,
-      "src/main/orcad/orcad-health.test.ts": 83,
-      "src/main/orcad/orcad-instance-lock.test.ts": 78,
-      "src/main/orcad/orcad-launch-contract.test.ts": 333,
-      "src/main/orcad/orcad-native-preflight.test.ts": 73,
-      "src/main/orcad/orcad-profile-state-startup.test.ts": 58,
-      "src/main/orcad/orcad-profile-state-telemetry.test.ts": 40,
-      "src/main/orcad/orcad-push-startup.test.ts": 1245,
-      "src/main/orcad/orcad-sidecar-runtime-client.test.ts": 218,
-      "src/main/own-chromium-tree-kill-guard.test.ts": 94,
-      "src/main/persistence-async-write-syscalls.test.ts": 9239,
-      "src/main/persistence-automations.test.ts": 1642,
-      "src/main/persistence-clipboard-selection-migration.test.ts": 1006,
-      "src/main/persistence-cohort-and-identity-migration.test.ts": 1053,
-      "src/main/persistence-cross-host-pane-identity.test.ts": 1087,
-      "src/main/persistence-deregistered-repo-residue.test.ts": 1097,
-      "src/main/persistence-duplicate-repo-id-host-scope.test.ts": 1629,
-      "src/main/persistence-feature-interaction-broadcast.benchmark.test.ts": 1178,
-      "src/main/persistence-floating-terminal-trust.test.ts": 900,
-      "src/main/persistence-flush-and-save-scheduling.test.ts": 2256,
-      "src/main/persistence-folder-workspace-notes.test.ts": 1014,
-      "src/main/persistence-host-admitted-terminal-membership.test.ts": 745,
-      "src/main/persistence-host-partitioned-sessions.test.ts": 1353,
-      "src/main/persistence-host-partitioned-ssh-pty-bindings.test.ts": 1045,
-      "src/main/persistence-initial-load.test.ts": 1270,
-      "src/main/persistence-layout-binding-recovery.test.ts": 1047,
-      "src/main/persistence-load-repair-durability.test.ts": 1256,
-      "src/main/persistence-loading-store-extraction.test.ts": 908,
-      "src/main/persistence-loading-store-write-risks.test.ts": 1004,
-      "src/main/persistence-native-chat-tab-view-mode.test.ts": 926,
-      "src/main/persistence-pane-identity-migration.test.ts": 28384,
-      "src/main/persistence-protected-secret-fail-closed.test.ts": 4726,
-      "src/main/persistence-protected-secret-write-race.test.ts": 1157,
-      "src/main/persistence-proxy-secret-recovery.test.ts": 1667,
-      "src/main/persistence-pty-binding-leaf-tab-resolution.test.ts": 994,
-      "src/main/persistence-pty-binding-reconciliation.test.ts": 1021,
-      "src/main/persistence-remote-session-startup.test.ts": 1033,
-      "src/main/persistence-repo-lifecycle.test.ts": 5369,
-      "src/main/persistence-right-sidebar-tab.test.ts": 988,
-      "src/main/persistence-settings-ui-defaults.test.ts": 1095,
-      "src/main/persistence-settings-update.test.ts": 1219,
-      "src/main/persistence-single-serialize.test.ts": 1511,
-      "src/main/persistence-source-control-ai-migration.test.ts": 1146,
-      "src/main/persistence-split-pane-incarnation.test.ts": 1116,
-      "src/main/persistence-ssh-lease-reattach-reclaim.test.ts": 827,
-      "src/main/persistence-ssh-lease-tombstone-retention.test.ts": 1005,
-      "src/main/persistence-ssh-pending-pty-kill.test.ts": 1557,
-      "src/main/persistence-ssh-readoption-automation-migration.test.ts": 2350,
-      "src/main/persistence-ssh-remote-pty-binding-replay.test.ts": 1058,
-      "src/main/persistence-ssh-remote-pty-leases.test.ts": 1758,
-      "src/main/persistence-ssh-targets-and-pane-keys.test.ts": 1091,
-      "src/main/persistence-terminal-option-key-migration.test.ts": 1043,
-      "src/main/persistence-ui-state.test.ts": 4151,
-      "src/main/persistence-update-repo.test.ts": 1170,
-      "src/main/persistence-workspace-pinned-automation-fence.test.ts": 1907,
-      "src/main/persistence-workspace-repin-automation-owner.test.ts": 1435,
-      "src/main/persistence-workspace-session-scrollback.test.ts": 1288,
-      "src/main/persistence-workspace-status-workflow.test.ts": 767,
-      "src/main/persistence-worktree-card-properties.test.ts": 1160,
-      "src/main/persistence-worktree-deletion-fencing.test.ts": 911,
-      "src/main/persistence-worktree-lineage-and-backups.test.ts": 1469,
-      "src/main/persistence-worktree-meta-and-folder-workspaces.test.ts": 1121,
-      "src/main/persistence-worktree-name-retirement.test.ts": 6019,
-      "src/main/persistence-worktree-visibility.test.ts": 1149,
-      "src/main/persistence/applying-settings/settings-update-machine-name.test.ts": 237,
-      "src/main/persistence/applying-settings/settings-update-terminal-contrast.test.ts": 169,
-      "src/main/persistence/applying-settings/terminal-settings-migrations.test.ts": 48,
-      "src/main/persistence/leasing-ssh-ptys/ssh-pty-binding-cleanup.test.ts": 188,
-      "src/main/persistence/loading-store/metadata-lineage-batch-pruning.test.ts": 453,
-      "src/main/persistence/loading-store/normalize-loaded-global-settings.test.ts": 223,
-      "src/main/persistence/loading-store/normalize-loaded-project-catalog.test.ts": 199,
-      "src/main/persistence/loading-store/persisted-state-redundancy.test.ts": 1588,
-      "src/main/persistence/loading-store/profile-state-caller-cancellation.test.ts": 1404,
-      "src/main/persistence/loading-store/profile-state-checkpoints.test.ts": 1475,
-      "src/main/persistence/loading-store/profile-state-direct-flush.test.ts": 1345,
-      "src/main/persistence/loading-store/profile-state-import-lifetime.test.ts": 1253,
-      "src/main/persistence/loading-store/profile-state-maintenance-compatibility.test.ts": 2209,
-      "src/main/persistence/loading-store/profile-state-maintenance-final-failure.test.ts": 1718,
-      "src/main/persistence/loading-store/profile-state-maintenance-recovery.test.ts": 2116,
-      "src/main/persistence/loading-store/profile-state-maintenance.test.ts": 2802,
+      "src/main/native-chat/wsl-transcript-running-observer.test.ts": 119,
+      "src/main/network/electron-proxy-request-guard.test.ts": 351,
+      "src/main/network/macos-system-resolver-health.test.ts": 74,
+      "src/main/network/macos-tailscale-dns-diagnostic.test.ts": 47,
+      "src/main/network/proxy-settings-session.test.ts": 837,
+      "src/main/network/proxy-settings.test.ts": 90,
+      "src/main/notebook/notebook-kernel.test.ts": 160,
+      "src/main/notebook/python-environments.test.ts": 82,
+      "src/main/notifications/announced-notification-registry.test.ts": 38,
+      "src/main/notifications/desktop-away-state.test.ts": 54,
+      "src/main/notifications/notification-delivery-service.test.ts": 69,
+      "src/main/observability/architecture.test.ts": 56,
+      "src/main/observability/bundle.test.ts": 471,
+      "src/main/observability/diagnostic-upload-http.test.ts": 50,
+      "src/main/observability/instrumentation.test.ts": 472,
+      "src/main/observability/local-file-sink-memory.test.ts": 149,
+      "src/main/observability/local-file-sink.test.ts": 84,
+      "src/main/observability/redactor-environment-lines.test.ts": 546,
+      "src/main/observability/redactor.test.ts": 74,
+      "src/main/observability/tracer.test.ts": 74,
+      "src/main/opencode-usage/cache-read-reproduction.test.ts": 173,
+      "src/main/opencode-usage/opencode2-session-usage.test.ts": 528,
+      "src/main/opencode-usage/scanner-windows-data-directory.test.ts": 164,
+      "src/main/opencode-usage/scanner-wsl-gate.test.ts": 49,
+      "src/main/opencode-usage/scanner.test.ts": 182,
+      "src/main/opencode-usage/store.test.ts": 141,
+      "src/main/opencode/hook-plugin-background-child-completion.test.ts": 405,
+      "src/main/opencode/hook-plugin-child-attention.test.ts": 698,
+      "src/main/opencode/hook-plugin-fail-open-ownership.test.ts": 519,
+      "src/main/opencode/hook-plugin-lifecycle-delivery.test.ts": 1151,
+      "src/main/opencode/hook-plugin-message-part-throttle.test.ts": 306,
+      "src/main/opencode/hook-plugin-module-contract.test.ts": 601,
+      "src/main/opencode/hook-plugin-opencode2-session-lineage.test.ts": 1056,
+      "src/main/opencode/hook-plugin-opencode2-setup.test.ts": 1712,
+      "src/main/opencode/hook-service.test.ts": 275,
+      "src/main/opencode/opencode-client-sweep.test.ts": 66,
+      "src/main/opencode/opencode-data-directory.test.ts": 51,
+      "src/main/opencode/opencode-session-binder.test.ts": 118,
+      "src/main/opencode2/status-plugin-setup-lifetime.test.ts": 51,
+      "src/main/orca-profiles/profile-active-transfer-worker.test.ts": 2219,
+      "src/main/orca-profiles/profile-active-transfer.test.ts": 1956,
+      "src/main/orca-profiles/profile-artifact-cloud-cleanup.test.ts": 371,
+      "src/main/orca-profiles/profile-cloud-auth-config.test.ts": 57,
+      "src/main/orca-profiles/profile-cloud-auth-status.test.ts": 66,
+      "src/main/orca-profiles/profile-cloud-client.test.ts": 127,
+      "src/main/orca-profiles/profile-cloud-dev-service.test.ts": 328,
+      "src/main/orca-profiles/profile-cloud-org-members-client.test.ts": 68,
+      "src/main/orca-profiles/profile-cloud-org-members-service.test.ts": 197,
+      "src/main/orca-profiles/profile-cloud-pkce.test.ts": 620,
+      "src/main/orca-profiles/profile-cloud-refresh-replay-guard.test.ts": 53,
+      "src/main/orca-profiles/profile-cloud-service-auth-retry.test.ts": 296,
+      "src/main/orca-profiles/profile-cloud-service-connect-overlap.test.ts": 311,
+      "src/main/orca-profiles/profile-cloud-service-refresh.test.ts": 315,
+      "src/main/orca-profiles/profile-cloud-service-sign-out-connect-race.test.ts": 378,
+      "src/main/orca-profiles/profile-cloud-service.test.ts": 445,
+      "src/main/orca-profiles/profile-cloud-session-mutation.test.ts": 95,
+      "src/main/orca-profiles/profile-cloud-session-refresh.test.ts": 97,
+      "src/main/orca-profiles/profile-cloud-session-store.test.ts": 130,
+      "src/main/orca-profiles/profile-index-store.test.ts": 700,
+      "src/main/orca-profiles/profile-persistence-deadline.test.ts": 39,
+      "src/main/orca-profiles/profile-project-domain-transfer.test.ts": 1889,
+      "src/main/orca-profiles/profile-project-presence.test.ts": 408,
+      "src/main/orca-profiles/profile-project-session-field-disposition.test.ts": 190,
+      "src/main/orca-profiles/profile-project-session-state.test.ts": 175,
+      "src/main/orca-profiles/profile-project-state-file.test.ts": 264,
+      "src/main/orca-profiles/profile-project-transfer-migration.test.ts": 1155,
+      "src/main/orca-profiles/profile-project-transfer.test.ts": 1755,
+      "src/main/orca-profiles/profile-telemetry-consent-seed.test.ts": 221,
+      "src/main/orca-profiles/profile-ui-scope.test.ts": 28,
+      "src/main/orcad/electron-serve-browser-process.test.ts": 2507,
+      "src/main/orcad/electron-serve-provider-selection.test.ts": 696,
+      "src/main/orcad/electron-sidecar-method-routing.test.ts": 105,
+      "src/main/orcad/electron-sidecar-tab-registry.test.ts": 78,
+      "src/main/orcad/external-chromium-browser-process.integration.test.ts": 233,
+      "src/main/orcad/external-chromium-browser-session.test.ts": 172,
+      "src/main/orcad/main-preflight-order.test.ts": 106,
+      "src/main/orcad/native-host-abi.test.ts": 58,
+      "src/main/orcad/node-pty-prebuilt-slot.test.ts": 64,
+      "src/main/orcad/node-pty-precondition.test.ts": 310,
+      "src/main/orcad/orcad-app-paths.test.ts": 73,
+      "src/main/orcad/orcad-artifact-preflight.test.ts": 377,
+      "src/main/orcad/orcad-bind-address.test.ts": 57,
+      "src/main/orcad/orcad-browser-provider.test.ts": 336,
+      "src/main/orcad/orcad-bun-launcher.integration.test.ts": 50,
+      "src/main/orcad/orcad-bun-native-preflight.test.ts": 113,
+      "src/main/orcad/orcad-bundle-native-load-order.test.ts": 2639,
+      "src/main/orcad/orcad-bundled-runtime.integration.test.ts": 5450,
+      "src/main/orcad/orcad-bundled-runtime.test.ts": 90,
+      "src/main/orcad/orcad-daemon-supervision.test.ts": 35,
+      "src/main/orcad/orcad-entry.test.ts": 287,
+      "src/main/orcad/orcad-forked-child-paths.test.ts": 352,
+      "src/main/orcad/orcad-health.test.ts": 49,
+      "src/main/orcad/orcad-instance-lock.test.ts": 91,
+      "src/main/orcad/orcad-launch-contract.test.ts": 405,
+      "src/main/orcad/orcad-native-preflight.test.ts": 71,
+      "src/main/orcad/orcad-profile-preflight.test.ts": 246,
+      "src/main/orcad/orcad-profile-state-startup.test.ts": 55,
+      "src/main/orcad/orcad-profile-state-telemetry.test.ts": 36,
+      "src/main/orcad/orcad-push-startup.test.ts": 1287,
+      "src/main/orcad/orcad-sidecar-runtime-client.test.ts": 211,
+      "src/main/own-chromium-tree-kill-guard.test.ts": 99,
+      "src/main/persistence-async-write-syscalls.test.ts": 3167,
+      "src/main/persistence-automations.test.ts": 2205,
+      "src/main/persistence-clipboard-selection-migration.test.ts": 1235,
+      "src/main/persistence-cohort-and-identity-migration.test.ts": 1307,
+      "src/main/persistence-cross-host-pane-identity.test.ts": 1023,
+      "src/main/persistence-deregistered-repo-residue.test.ts": 1319,
+      "src/main/persistence-duplicate-repo-id-host-scope.test.ts": 1500,
+      "src/main/persistence-feature-interaction-broadcast.benchmark.test.ts": 1424,
+      "src/main/persistence-floating-terminal-trust.test.ts": 1342,
+      "src/main/persistence-flush-and-save-scheduling.test.ts": 3251,
+      "src/main/persistence-folder-workspace-notes.test.ts": 1466,
+      "src/main/persistence-host-admitted-terminal-membership.test.ts": 1200,
+      "src/main/persistence-host-partitioned-sessions.test.ts": 1016,
+      "src/main/persistence-host-partitioned-ssh-pty-bindings.test.ts": 1205,
+      "src/main/persistence-initial-load.test.ts": 1188,
+      "src/main/persistence-layout-binding-recovery.test.ts": 1127,
+      "src/main/persistence-load-repair-durability.test.ts": 693,
+      "src/main/persistence-loading-store-extraction.test.ts": 1319,
+      "src/main/persistence-loading-store-write-risks.test.ts": 1386,
+      "src/main/persistence-native-chat-tab-view-mode.test.ts": 1121,
+      "src/main/persistence-pane-identity-migration.test.ts": 28713,
+      "src/main/persistence-protected-secret-fail-closed.test.ts": 5578,
+      "src/main/persistence-protected-secret-write-race.test.ts": 1294,
+      "src/main/persistence-proxy-secret-recovery.test.ts": 1954,
+      "src/main/persistence-pty-binding-leaf-tab-resolution.test.ts": 938,
+      "src/main/persistence-pty-binding-reconciliation.test.ts": 1174,
+      "src/main/persistence-remote-session-startup.test.ts": 1128,
+      "src/main/persistence-repo-lifecycle.test.ts": 3659,
+      "src/main/persistence-right-sidebar-tab.test.ts": 1040,
+      "src/main/persistence-settings-ui-defaults.test.ts": 1660,
+      "src/main/persistence-settings-update.test.ts": 1245,
+      "src/main/persistence-single-serialize.test.ts": 2736,
+      "src/main/persistence-source-control-ai-migration.test.ts": 683,
+      "src/main/persistence-split-pane-incarnation.test.ts": 1213,
+      "src/main/persistence-ssh-lease-reattach-reclaim.test.ts": 1164,
+      "src/main/persistence-ssh-lease-tombstone-retention.test.ts": 1178,
+      "src/main/persistence-ssh-pending-pty-kill.test.ts": 1764,
+      "src/main/persistence-ssh-readoption-automation-migration.test.ts": 1863,
+      "src/main/persistence-ssh-remote-pty-binding-replay.test.ts": 799,
+      "src/main/persistence-ssh-remote-pty-leases.test.ts": 1111,
+      "src/main/persistence-ssh-targets-and-pane-keys.test.ts": 1001,
+      "src/main/persistence-terminal-option-key-migration.test.ts": 1316,
+      "src/main/persistence-ui-state.test.ts": 3909,
+      "src/main/persistence-update-repo.test.ts": 1077,
+      "src/main/persistence-workspace-pinned-automation-fence.test.ts": 1833,
+      "src/main/persistence-workspace-repin-automation-owner.test.ts": 1750,
+      "src/main/persistence-workspace-session-scrollback.test.ts": 1387,
+      "src/main/persistence-workspace-status-workflow.test.ts": 1055,
+      "src/main/persistence-worktree-card-properties.test.ts": 576,
+      "src/main/persistence-worktree-deletion-fencing.test.ts": 1370,
+      "src/main/persistence-worktree-lineage-and-backups.test.ts": 1778,
+      "src/main/persistence-worktree-meta-and-folder-workspaces.test.ts": 818,
+      "src/main/persistence-worktree-name-retirement.test.ts": 6044,
+      "src/main/persistence-worktree-visibility.test.ts": 1446,
+      "src/main/persistence/applying-settings/settings-update-machine-name.test.ts": 235,
+      "src/main/persistence/applying-settings/settings-update-terminal-contrast.test.ts": 177,
+      "src/main/persistence/applying-settings/terminal-settings-migrations.test.ts": 55,
+      "src/main/persistence/leasing-ssh-ptys/ssh-pty-binding-cleanup.test.ts": 221,
+      "src/main/persistence/loading-store/metadata-lineage-batch-pruning.test.ts": 356,
+      "src/main/persistence/loading-store/normalize-loaded-global-settings.test.ts": 261,
+      "src/main/persistence/loading-store/normalize-loaded-project-catalog.test.ts": 228,
+      "src/main/persistence/loading-store/persisted-state-redundancy.test.ts": 1195,
+      "src/main/persistence/loading-store/profile-state-caller-cancellation.test.ts": 1418,
+      "src/main/persistence/loading-store/profile-state-checkpoints.test.ts": 1468,
+      "src/main/persistence/loading-store/profile-state-direct-flush.test.ts": 776,
+      "src/main/persistence/loading-store/profile-state-import-lifetime.test.ts": 882,
+      "src/main/persistence/loading-store/profile-state-maintenance-compatibility.test.ts": 2555,
+      "src/main/persistence/loading-store/profile-state-maintenance-final-failure.test.ts": 1334,
+      "src/main/persistence/loading-store/profile-state-maintenance-recovery.test.ts": 1797,
+      "src/main/persistence/loading-store/profile-state-maintenance.test.ts": 2795,
       "src/main/persistence/loading-store/profile-state-pty-retirement-finalization.test.ts": 3208,
-      "src/main/persistence/loading-store/profile-state-settings-writes.test.ts": 1508,
-      "src/main/persistence/loading-store/profile-state-sqlite-authority.test.ts": 14862,
-      "src/main/persistence/loading-store/profile-state-store-backups.test.ts": 3121,
-      "src/main/persistence/loading-store/profile-state-update-quit.test.ts": 1376,
-      "src/main/persistence/loading-store/profile-state-worker-coordination.test.ts": 1393,
-      "src/main/persistence/loading-store/profile-state-worker-secret-retention.test.ts": 1309,
-      "src/main/persistence/loading-store/profile-state-write-batching.test.ts": 1498,
-      "src/main/persistence/loading-store/pty-binding-async-durability.test.ts": 1409,
-      "src/main/persistence/loading-store/pty-binding-created-surface-rollback.test.ts": 1188,
-      "src/main/persistence/loading-store/pty-binding-fast-lane.test.ts": 126,
-      "src/main/persistence/loading-store/pty-binding-span.test.ts": 95,
-      "src/main/persistence/loading-store/pty-reattach-failure-routing.test.ts": 4061,
-      "src/main/persistence/loading-store/pty-retirement-async-durability.test.ts": 1542,
-      "src/main/persistence/loading-store/pty-retirement-publication-during-read.test.ts": 3269,
-      "src/main/persistence/loading-store/pty-spawn-exit-durability.test.ts": 4407,
-      "src/main/persistence/loading-store/pty-spawn-handle-publication.test.ts": 4132,
-      "src/main/persistence/loading-store/pty-spawn-replacement-durability.test.ts": 5470,
-      "src/main/persistence/loading-store/pty-spawn-restore-durability.test.ts": 3800,
-      "src/main/persistence/loading-store/secret-sentinel-substitution.test.ts": 64,
-      "src/main/persistence/loading-store/ssh-lease-async-durability.test.ts": 1601,
-      "src/main/persistence/loading-store/state-write-round-trip.test.ts": 987,
-      "src/main/persistence/loading-store/store-prune-gate-signals.test.ts": 1136,
-      "src/main/persistence/loading-store/store-runtime-authored-session-writes.test.ts": 1114,
-      "src/main/persistence/loading-store/terminal-tab-pty-ownership.test.ts": 55,
-      "src/main/persistence/loading-store/workspace-session-partitions.test.ts": 231,
-      "src/main/persistence/loading-store/workspace-session-terminal-binding-replay.test.ts": 71,
-      "src/main/persistence/loading-store/worktree-meta-alias-projection.test.ts": 1224,
-      "src/main/persistence/loading-store/worktree-meta-write-normalization.test.ts": 81,
-      "src/main/persistence/profile-state-cutover-fixture.test.ts": 1254,
-      "src/main/persistence/profile-state-cutover-soak.test.ts": 2149,
-      "src/main/persistence/profile-state/profile-state-access-identity.test.ts": 89,
-      "src/main/persistence/profile-state/profile-state-access-process.test.ts": 464,
-      "src/main/persistence/profile-state/profile-state-access.test.ts": 275,
-      "src/main/persistence/profile-state/profile-state-authority-bootstrap.test.ts": 2771,
-      "src/main/persistence/profile-state/profile-state-authority-export-fencing.test.ts": 202,
-      "src/main/persistence/profile-state/profile-state-automation-runs-equality.test.ts": 217,
-      "src/main/persistence/profile-state/profile-state-automation-runs-serialization.test.ts": 273,
-      "src/main/persistence/profile-state/profile-state-automation-storage-upgrade.test.ts": 2824,
-      "src/main/persistence/profile-state/profile-state-backup-path.test.ts": 50,
-      "src/main/persistence/profile-state/profile-state-backup-rotation.test.ts": 507,
-      "src/main/persistence/profile-state/profile-state-backup-temporary-files.test.ts": 101,
-      "src/main/persistence/profile-state/profile-state-backup-worker.test.ts": 4792,
-      "src/main/persistence/profile-state/profile-state-bootstrap-publication-race.test.ts": 1163,
-      "src/main/persistence/profile-state/profile-state-complete-domain-writes.test.ts": 259,
-      "src/main/persistence/profile-state/profile-state-crash-recovery.test.ts": 448,
-      "src/main/persistence/profile-state/profile-state-current-json-command.test.ts": 3447,
-      "src/main/persistence/profile-state/profile-state-database-export-crash.test.ts": 210,
-      "src/main/persistence/profile-state/profile-state-database-recovery.test.ts": 1264,
-      "src/main/persistence/profile-state/profile-state-database-rollback-export.test.ts": 1278,
-      "src/main/persistence/profile-state/profile-state-database-snapshot.test.ts": 1546,
-      "src/main/persistence/profile-state/profile-state-database.test.ts": 824,
-      "src/main/persistence/profile-state/profile-state-documents.test.ts": 363,
-      "src/main/persistence/profile-state/profile-state-domain-equality.test.ts": 173,
-      "src/main/persistence/profile-state/profile-state-domain-reader.test.ts": 122,
-      "src/main/persistence/profile-state/profile-state-domain-writes.test.ts": 386,
-      "src/main/persistence/profile-state/profile-state-fragment-validation.test.ts": 1142,
-      "src/main/persistence/profile-state/profile-state-json-compatibility-recovery.test.ts": 1345,
-      "src/main/persistence/profile-state/profile-state-large-recovery-crash.test.ts": 4696,
-      "src/main/persistence/profile-state/profile-state-live-store-factory.test.ts": 1861,
-      "src/main/persistence/profile-state/profile-state-offline-settings.test.ts": 256,
-      "src/main/persistence/profile-state/profile-state-parsed-snapshot.test.ts": 184,
-      "src/main/persistence/profile-state/profile-state-read-concurrency.test.ts": 195,
-      "src/main/persistence/profile-state/profile-state-recovery-batch.test.ts": 153,
-      "src/main/persistence/profile-state/profile-state-recovery-copy.test.ts": 99,
-      "src/main/persistence/profile-state/profile-state-recovery-crash-boundaries.test.ts": 33103,
-      "src/main/persistence/profile-state/profile-state-startup-authority.test.ts": 2259,
+      "src/main/persistence/loading-store/profile-state-selective-serialization.test.ts": 216,
+      "src/main/persistence/loading-store/profile-state-settings-writes.test.ts": 1551,
+      "src/main/persistence/loading-store/profile-state-sqlite-authority.test.ts": 8170,
+      "src/main/persistence/loading-store/profile-state-store-backups.test.ts": 3107,
+      "src/main/persistence/loading-store/profile-state-temp-cleanup-lifetime.test.ts": 1081,
+      "src/main/persistence/loading-store/profile-state-update-quit.test.ts": 1347,
+      "src/main/persistence/loading-store/profile-state-worker-coordination.test.ts": 1583,
+      "src/main/persistence/loading-store/profile-state-worker-secret-retention.test.ts": 1293,
+      "src/main/persistence/loading-store/profile-state-write-batching.test.ts": 1364,
+      "src/main/persistence/loading-store/pty-binding-async-durability.test.ts": 1459,
+      "src/main/persistence/loading-store/pty-binding-created-surface-rollback.test.ts": 806,
+      "src/main/persistence/loading-store/pty-binding-fast-lane.test.ts": 168,
+      "src/main/persistence/loading-store/pty-binding-span.test.ts": 104,
+      "src/main/persistence/loading-store/pty-reattach-failure-routing.test.ts": 3450,
+      "src/main/persistence/loading-store/pty-retirement-async-durability.test.ts": 893,
+      "src/main/persistence/loading-store/pty-retirement-publication-during-read.test.ts": 2239,
+      "src/main/persistence/loading-store/pty-spawn-exit-durability.test.ts": 4488,
+      "src/main/persistence/loading-store/pty-spawn-handle-publication.test.ts": 3961,
+      "src/main/persistence/loading-store/pty-spawn-replacement-durability.test.ts": 4045,
+      "src/main/persistence/loading-store/pty-spawn-restore-durability.test.ts": 4185,
+      "src/main/persistence/loading-store/secret-sentinel-substitution.test.ts": 92,
+      "src/main/persistence/loading-store/ssh-lease-async-durability.test.ts": 914,
+      "src/main/persistence/loading-store/state-write-round-trip.test.ts": 1233,
+      "src/main/persistence/loading-store/store-prune-gate-signals.test.ts": 1151,
+      "src/main/persistence/loading-store/store-runtime-authored-session-writes.test.ts": 1062,
+      "src/main/persistence/loading-store/terminal-tab-pty-ownership.test.ts": 35,
+      "src/main/persistence/loading-store/workspace-session-partitions.test.ts": 252,
+      "src/main/persistence/loading-store/workspace-session-terminal-binding-replay.test.ts": 68,
+      "src/main/persistence/loading-store/worktree-meta-alias-projection.test.ts": 1809,
+      "src/main/persistence/loading-store/worktree-meta-write-normalization.test.ts": 68,
+      "src/main/persistence/profile-state-cutover-fixture.test.ts": 1259,
+      "src/main/persistence/profile-state-cutover-soak.test.ts": 1782,
+      "src/main/persistence/profile-state/legacy-json/profile-state-versioned-export.test.ts": 122,
+      "src/main/persistence/profile-state/profile-state-access-identity.test.ts": 125,
+      "src/main/persistence/profile-state/profile-state-access-process.test.ts": 706,
+      "src/main/persistence/profile-state/profile-state-access-windows-native.win32.test.ts": 50,
+      "src/main/persistence/profile-state/profile-state-access-windows.test.ts": 181,
+      "src/main/persistence/profile-state/profile-state-access.test.ts": 218,
+      "src/main/persistence/profile-state/profile-state-authority-bootstrap.test.ts": 2390,
+      "src/main/persistence/profile-state/profile-state-authority-export-fencing.test.ts": 187,
+      "src/main/persistence/profile-state/profile-state-automation-runs-equality.test.ts": 206,
+      "src/main/persistence/profile-state/profile-state-automation-runs-serialization.test.ts": 225,
+      "src/main/persistence/profile-state/profile-state-automation-storage-upgrade.test.ts": 2866,
+      "src/main/persistence/profile-state/profile-state-backup-path.test.ts": 40,
+      "src/main/persistence/profile-state/profile-state-backup-rotation.test.ts": 519,
+      "src/main/persistence/profile-state/profile-state-backup-temporary-files.test.ts": 76,
+      "src/main/persistence/profile-state/profile-state-backup-worker.test.ts": 2514,
+      "src/main/persistence/profile-state/profile-state-bootstrap-publication-race.test.ts": 1143,
+      "src/main/persistence/profile-state/profile-state-complete-domain-writes.test.ts": 324,
+      "src/main/persistence/profile-state/profile-state-crash-recovery.test.ts": 442,
+      "src/main/persistence/profile-state/profile-state-current-json-command.test.ts": 2724,
+      "src/main/persistence/profile-state/profile-state-current-sqlite-command.test.ts": 1546,
+      "src/main/persistence/profile-state/profile-state-database-export-crash.test.ts": 221,
+      "src/main/persistence/profile-state/profile-state-database-recovery.test.ts": 1228,
+      "src/main/persistence/profile-state/profile-state-database-rollback-export.test.ts": 1283,
+      "src/main/persistence/profile-state/profile-state-database-snapshot.test.ts": 1947,
+      "src/main/persistence/profile-state/profile-state-database.test.ts": 1004,
+      "src/main/persistence/profile-state/profile-state-documents.test.ts": 758,
+      "src/main/persistence/profile-state/profile-state-domain-equality.test.ts": 197,
+      "src/main/persistence/profile-state/profile-state-domain-reader.test.ts": 134,
+      "src/main/persistence/profile-state/profile-state-domain-writes.test.ts": 354,
+      "src/main/persistence/profile-state/profile-state-fragment-validation.test.ts": 978,
+      "src/main/persistence/profile-state/profile-state-json-compatibility-recovery.test.ts": 1250,
+      "src/main/persistence/profile-state/profile-state-large-recovery-crash.test.ts": 3070,
+      "src/main/persistence/profile-state/profile-state-live-store-factory.test.ts": 1747,
+      "src/main/persistence/profile-state/profile-state-offline-settings.test.ts": 286,
+      "src/main/persistence/profile-state/profile-state-parsed-snapshot.test.ts": 367,
+      "src/main/persistence/profile-state/profile-state-read-concurrency.test.ts": 112,
+      "src/main/persistence/profile-state/profile-state-recovery-batch.test.ts": 142,
+      "src/main/persistence/profile-state/profile-state-recovery-copy.test.ts": 92,
+      "src/main/persistence/profile-state/profile-state-recovery-crash-boundaries.test.ts": 34081,
+      "src/main/persistence/profile-state/profile-state-runtime-preflight.test.ts": 567,
+      "src/main/persistence/profile-state/profile-state-startup-authority.test.ts": 2198,
       "src/main/persistence/profile-state/profile-state-startup-failure.test.ts": 1080,
-      "src/main/persistence/profile-state/profile-state-startup-recovery-dialog.test.ts": 53,
-      "src/main/persistence/profile-state/profile-state-startup-secrets.test.ts": 1310,
-      "src/main/persistence/profile-state/profile-state-startup-snapshot.test.ts": 1389,
-      "src/main/persistence/profile-state/profile-state-store-factory.test.ts": 2177,
-      "src/main/persistence/profile-state/profile-state-streaming-validation.test.ts": 170,
-      "src/main/persistence/profile-state/profile-state-versioned-export.test.ts": 109,
-      "src/main/persistence/profile-state/profile-state-worker-authority.test.ts": 2348,
-      "src/main/persistence/profile-state/profile-state-worker-export-failures.test.ts": 809,
-      "src/main/persistence/profile-state/profile-state-write-transaction.test.ts": 59,
-      "src/main/persistence/profile-state/profile-state-writer-protocol-faults.test.ts": 2031,
-      "src/main/persistence/profile-state/profile-state-writer-worker.test.ts": 1466,
-      "src/main/persistence/restoring-sessions/pane-alias-normalization-scaling.test.ts": 60,
-      "src/main/persistence/restoring-sessions/pane-alias-normalization.test.ts": 442,
-      "src/main/persistence/restoring-sessions/pane-key-remapping.test.ts": 42,
-      "src/main/persistence/restoring-sessions/session-owner-fields.test.ts": 155,
-      "src/main/persistence/restoring-sessions/session-worktree-ownership.test.ts": 220,
-      "src/main/persistence/restoring-sessions/terminal-layout-normalization.test.ts": 51,
-      "src/main/persistence/restoring-sessions/workspace-pane-normalization-index.test.ts": 83,
-      "src/main/persistence/runtime-authored-workspace-session-fields.test.ts": 45,
-      "src/main/persistence/scheduling-automations/automation-run-operations.test.ts": 76,
-      "src/main/persistence/tracking-repos/local-worktree-metadata-batch-pruning.bench.test.ts": 272,
-      "src/main/persistence/tracking-repos/local-worktree-metadata-scan-expectation.test.ts": 286,
-      "src/main/persistence/tracking-repos/missing-local-worktree-metadata-pruning.test.ts": 310,
-      "src/main/persistence/tracking-repos/probeable-local-worktree-metadata-candidates.test.ts": 222,
-      "src/main/persistence/tracking-repos/project-host-compatibility.test.ts": 51,
-      "src/main/persistence/tracking-repos/worktree-identity-migration-field-coverage.test.ts": 232,
-      "src/main/persistence/tracking-repos/worktree-metadata-normalization.test.ts": 183,
-      "src/main/pi/agent-status-completion-delivery.test.ts": 1098,
-      "src/main/pi/agent-status-extension-async-subagents.test.ts": 775,
-      "src/main/pi/agent-status-extension-nested-run-settlement.test.ts": 599,
-      "src/main/pi/agent-status-extension-omp-lifecycle.test.ts": 2223,
-      "src/main/pi/agent-status-extension-omp-model.test.ts": 1202,
-      "src/main/pi/agent-status-extension-omp-prefill.test.ts": 730,
-      "src/main/pi/agent-status-extension-source.test.ts": 3126,
-      "src/main/pi/agent-status-input-redaction.test.ts": 1767,
-      "src/main/pi/agent-status-omp-approval-forwarding.test.ts": 989,
-      "src/main/pi/agent-status-owner-recovery.test.ts": 1075,
-      "src/main/pi/agent-status-ui-prompt.test.ts": 1746,
-      "src/main/pi/omp-model-command-source.test.ts": 959,
-      "src/main/pi/omp-session-status-owner.test.ts": 1116,
-      "src/main/pi/omp-transcript-metadata.test.ts": 1471,
-      "src/main/pi/prefill-extension-source.test.ts": 41,
-      "src/main/pi/titlebar-extension-overlay-path.test.ts": 82,
-      "src/main/pi/titlebar-extension-service.test.ts": 263,
-      "src/main/pi/titlebar-extension-source.test.ts": 1263,
-      "src/main/plugins/plugin-agent-status-event.test.ts": 134,
-      "src/main/plugins/plugin-atomic-file-write.test.ts": 2055,
-      "src/main/plugins/plugin-audit-log-scaling.test.ts": 518,
-      "src/main/plugins/plugin-audit-log.test.ts": 64,
-      "src/main/plugins/plugin-bundled-bootstrap-coordinator.test.ts": 382,
-      "src/main/plugins/plugin-bundled-bootstrap.test.ts": 560,
-      "src/main/plugins/plugin-command-registry.test.ts": 177,
-      "src/main/plugins/plugin-content-pack-registry.test.ts": 296,
-      "src/main/plugins/plugin-content-safety.test.ts": 765,
-      "src/main/plugins/plugin-dev-watcher.test.ts": 172,
-      "src/main/plugins/plugin-discovery.test.ts": 262,
-      "src/main/plugins/plugin-enablement.test.ts": 188,
-      "src/main/plugins/plugin-host-conformance.test.ts": 160,
-      "src/main/plugins/plugin-host-methods.test.ts": 228,
-      "src/main/plugins/plugin-host-process.test.ts": 171,
-      "src/main/plugins/plugin-host-runtime.test.ts": 180,
-      "src/main/plugins/plugin-install-trust.test.ts": 340,
-      "src/main/plugins/plugin-install.test.ts": 739,
-      "src/main/plugins/plugin-kill-list-content-revocation.test.ts": 498,
-      "src/main/plugins/plugin-kill-list-service.test.ts": 290,
-      "src/main/plugins/plugin-language-pack-registry.test.ts": 293,
-      "src/main/plugins/plugin-launch-content.test.ts": 437,
-      "src/main/plugins/plugin-list-projection.test.ts": 285,
-      "src/main/plugins/plugin-marketplace-installer.test.ts": 563,
-      "src/main/plugins/plugin-marketplace-service.test.ts": 455,
-      "src/main/plugins/plugin-marketplace-store.test.ts": 190,
-      "src/main/plugins/plugin-panel-controller.test.ts": 327,
-      "src/main/plugins/plugin-panel-navigation-guard.test.ts": 155,
-      "src/main/plugins/plugin-panel-owner-lifecycle.test.ts": 50,
+      "src/main/persistence/profile-state/profile-state-startup-recovery-dialog.test.ts": 95,
+      "src/main/persistence/profile-state/profile-state-startup-secrets.test.ts": 1403,
+      "src/main/persistence/profile-state/profile-state-startup-snapshot.test.ts": 1390,
+      "src/main/persistence/profile-state/profile-state-store-factory.test.ts": 2255,
+      "src/main/persistence/profile-state/profile-state-streaming-validation.test.ts": 246,
+      "src/main/persistence/profile-state/profile-state-worker-authority.test.ts": 1304,
+      "src/main/persistence/profile-state/profile-state-worker-export-failures.test.ts": 905,
+      "src/main/persistence/profile-state/profile-state-write-transaction.test.ts": 42,
+      "src/main/persistence/profile-state/profile-state-writer-protocol-faults.test.ts": 2015,
+      "src/main/persistence/profile-state/profile-state-writer-worker.test.ts": 1074,
+      "src/main/persistence/restoring-sessions/pane-alias-normalization-scaling.test.ts": 70,
+      "src/main/persistence/restoring-sessions/pane-alias-normalization.test.ts": 399,
+      "src/main/persistence/restoring-sessions/pane-key-remapping.test.ts": 26,
+      "src/main/persistence/restoring-sessions/session-owner-fields.test.ts": 141,
+      "src/main/persistence/restoring-sessions/session-worktree-ownership.test.ts": 205,
+      "src/main/persistence/restoring-sessions/terminal-layout-normalization.test.ts": 53,
+      "src/main/persistence/restoring-sessions/workspace-pane-normalization-index.test.ts": 69,
+      "src/main/persistence/runtime-authored-workspace-session-fields.test.ts": 51,
+      "src/main/persistence/scheduling-automations/automation-run-operations.test.ts": 62,
+      "src/main/persistence/tracking-repos/local-worktree-metadata-batch-pruning.bench.test.ts": 248,
+      "src/main/persistence/tracking-repos/local-worktree-metadata-scan-expectation.test.ts": 152,
+      "src/main/persistence/tracking-repos/missing-local-worktree-metadata-pruning.test.ts": 301,
+      "src/main/persistence/tracking-repos/probeable-local-worktree-metadata-candidates.test.ts": 218,
+      "src/main/persistence/tracking-repos/project-host-compatibility.test.ts": 36,
+      "src/main/persistence/tracking-repos/worktree-identity-migration-field-coverage.test.ts": 147,
+      "src/main/persistence/tracking-repos/worktree-metadata-normalization.test.ts": 182,
+      "src/main/pi/agent-status-completion-delivery.test.ts": 899,
+      "src/main/pi/agent-status-extension-async-subagents.test.ts": 1070,
+      "src/main/pi/agent-status-extension-nested-run-settlement.test.ts": 588,
+      "src/main/pi/agent-status-extension-omp-lifecycle.test.ts": 2513,
+      "src/main/pi/agent-status-extension-omp-model.test.ts": 1180,
+      "src/main/pi/agent-status-extension-omp-prefill.test.ts": 615,
+      "src/main/pi/agent-status-extension-source.test.ts": 2899,
+      "src/main/pi/agent-status-input-redaction.test.ts": 1930,
+      "src/main/pi/agent-status-omp-approval-forwarding.test.ts": 1049,
+      "src/main/pi/agent-status-owner-recovery.test.ts": 1135,
+      "src/main/pi/agent-status-ui-prompt.test.ts": 1344,
+      "src/main/pi/omp-model-command-source.test.ts": 619,
+      "src/main/pi/omp-session-status-owner.test.ts": 780,
+      "src/main/pi/omp-transcript-metadata.test.ts": 1593,
+      "src/main/pi/prefill-extension-source.test.ts": 36,
+      "src/main/pi/titlebar-extension-overlay-path.test.ts": 92,
+      "src/main/pi/titlebar-extension-service.test.ts": 524,
+      "src/main/pi/titlebar-extension-source.test.ts": 1416,
+      "src/main/plugins/plugin-agent-status-event.test.ts": 86,
+      "src/main/plugins/plugin-atomic-file-write.test.ts": 2056,
+      "src/main/plugins/plugin-audit-log-scaling.test.ts": 497,
+      "src/main/plugins/plugin-audit-log.test.ts": 73,
+      "src/main/plugins/plugin-bundled-bootstrap-coordinator.test.ts": 364,
+      "src/main/plugins/plugin-bundled-bootstrap.test.ts": 468,
+      "src/main/plugins/plugin-command-registry.test.ts": 271,
+      "src/main/plugins/plugin-content-pack-registry.test.ts": 303,
+      "src/main/plugins/plugin-content-safety.test.ts": 716,
+      "src/main/plugins/plugin-dev-watcher.test.ts": 165,
+      "src/main/plugins/plugin-discovery.test.ts": 193,
+      "src/main/plugins/plugin-enablement.test.ts": 194,
+      "src/main/plugins/plugin-host-conformance.test.ts": 202,
+      "src/main/plugins/plugin-host-methods.test.ts": 173,
+      "src/main/plugins/plugin-host-process.test.ts": 208,
+      "src/main/plugins/plugin-host-runtime.test.ts": 193,
+      "src/main/plugins/plugin-install-trust.test.ts": 378,
+      "src/main/plugins/plugin-install.test.ts": 787,
+      "src/main/plugins/plugin-kill-list-content-revocation.test.ts": 321,
+      "src/main/plugins/plugin-kill-list-service.test.ts": 239,
+      "src/main/plugins/plugin-language-pack-registry.test.ts": 179,
+      "src/main/plugins/plugin-launch-content.test.ts": 470,
+      "src/main/plugins/plugin-list-projection.test.ts": 145,
+      "src/main/plugins/plugin-marketplace-installer.test.ts": 480,
+      "src/main/plugins/plugin-marketplace-service.test.ts": 369,
+      "src/main/plugins/plugin-marketplace-store.test.ts": 135,
+      "src/main/plugins/plugin-panel-controller.test.ts": 210,
+      "src/main/plugins/plugin-panel-navigation-guard.test.ts": 140,
+      "src/main/plugins/plugin-panel-owner-lifecycle.test.ts": 54,
       "src/main/plugins/plugin-panel-sessions.test.ts": 50,
-      "src/main/plugins/plugin-private-marketplace.integration.test.ts": 797,
-      "src/main/plugins/plugin-secrets-store.test.ts": 238,
-      "src/main/plugins/plugin-service-integrity.test.ts": 381,
-      "src/main/plugins/plugin-service-reconciliation.test.ts": 891,
-      "src/main/plugins/plugin-startup-budget.test.ts": 848,
-      "src/main/plugins/plugin-storage-store.test.ts": 170,
-      "src/main/plugins/plugin-uninstall-lifecycle.test.ts": 883,
-      "src/main/plugins/plugin-uninstall-log-retention.test.ts": 1352,
-      "src/main/plugins/plugin-uninstall-ordering.test.ts": 854,
-      "src/main/plugins/plugin-vm-recipe-registry.test.ts": 191,
-      "src/main/plugins/plugin-worker-controller.test.ts": 421,
-      "src/main/plugins/plugin-worker-env.test.ts": 56,
-      "src/main/plugins/plugin-worker-manager.test.ts": 198,
-      "src/main/plugins/plugin-worker-output-buffer.test.ts": 60,
-      "src/main/plugins/plugin-worker-output-retention.test.ts": 335,
-      "src/main/plugins/plugin-worker-supervision.integration.test.ts": 8197,
-      "src/main/ports/advertised-url-retention.test.ts": 141,
-      "src/main/ports/advertised-url-watcher-pid-validation.test.ts": 55,
-      "src/main/ports/advertised-url-watcher.test.ts": 69,
-      "src/main/ports/local-workspace-port-scanner.test.ts": 140,
-      "src/main/ports/port-scan-command-client.test.ts": 1851,
-      "src/main/ports/port-scan-command-execution.test.ts": 5261,
-      "src/main/ports/port-scan-command-import-boundary.test.ts": 38,
-      "src/main/ports/ssh-advertised-url-enrichment.test.ts": 65,
-      "src/main/ports/workspace-port-ownership.test.ts": 58,
-      "src/main/powershell-osc133-bootstrap-windows-clm.test.ts": 95,
-      "src/main/powershell-osc133-bootstrap.test.ts": 139,
-      "src/main/project-groups/folder-workspace-path-status.test.ts": 111,
-      "src/main/project-groups/nested-repo-discovery-queue.test.ts": 177,
-      "src/main/project-groups/nested-repo-discovery.test.ts": 269,
-      "src/main/project-groups/nested-repo-import-target.test.ts": 56,
-      "src/main/project-groups/nested-repo-import.test.ts": 42,
-      "src/main/project-groups/nested-repo-scan-rules.test.ts": 56,
-      "src/main/project-runtime-git-options.test.ts": 84,
-      "src/main/protected-secret-persistence-concurrency.test.ts": 57,
-      "src/main/protected-secret-persistence.test.ts": 57,
-      "src/main/providers/agent-foreground-process-batch.test.ts": 64,
-      "src/main/providers/agent-foreground-process-git-bash-launcher.test.ts": 119,
-      "src/main/providers/agent-foreground-process-git-bash.win32.test.ts": 221,
-      "src/main/providers/agent-foreground-process-pi.test.ts": 112,
-      "src/main/providers/agent-foreground-process-ps-scan-volume.test.ts": 128,
-      "src/main/providers/agent-foreground-process-real-rows.test.ts": 64,
-      "src/main/providers/agent-foreground-process-remote-evidence.test.ts": 63,
-      "src/main/providers/agent-foreground-process-shell-path.test.ts": 75,
-      "src/main/providers/agent-foreground-process-windows-job-rejection.test.ts": 102,
-      "src/main/providers/agent-foreground-process-wsl-shell-proof.test.ts": 95,
-      "src/main/providers/agent-foreground-process.test.ts": 232,
-      "src/main/providers/execution-host-provider-dispatch.test.ts": 54,
-      "src/main/providers/local-pty-child-process-verdict.test.ts": 311,
-      "src/main/providers/local-pty-default-shell.test.ts": 148,
-      "src/main/providers/local-pty-foreground-inspection-cheap-tier.test.ts": 189,
-      "src/main/providers/local-pty-pi-owner-env.test.ts": 92,
-      "src/main/providers/local-pty-provider-foreground-process.test.ts": 311,
-      "src/main/providers/local-pty-provider-io-events.test.ts": 291,
-      "src/main/providers/local-pty-provider-session-inventory.test.ts": 278,
-      "src/main/providers/local-pty-provider-shell-readiness.test.ts": 296,
-      "src/main/providers/local-pty-provider-shutdown.test.ts": 547,
-      "src/main/providers/local-pty-provider-spawn-cwd-safety.test.ts": 295,
-      "src/main/providers/local-pty-provider-spawn-env.test.ts": 363,
-      "src/main/providers/local-pty-provider-spawn-session.test.ts": 293,
-      "src/main/providers/local-pty-provider-windows-shell-launch.test.ts": 325,
-      "src/main/providers/local-pty-shell-ready-marker-scan.test.ts": 70,
-      "src/main/providers/local-pty-shell-ready-startup-command.test.ts": 50,
-      "src/main/providers/local-pty-shell-ready-wrapper-generation.test.ts": 652,
-      "src/main/providers/local-pty-shell-startup-command.node-pty.test.ts": 260,
-      "src/main/providers/local-pty-utils-windows-fallback.test.ts": 51,
-      "src/main/providers/local-pty-utils.test.ts": 67,
-      "src/main/providers/macos-login-session-pty-probe.test.ts": 66,
-      "src/main/providers/macos-tcc-login-shell.test.ts": 133,
-      "src/main/providers/posix-pane-foreground-fingerprint.test.ts": 51,
-      "src/main/providers/process-cwd.test.ts": 145,
-      "src/main/providers/provider-dispatch.test.ts": 2130,
-      "src/main/providers/pty-default-cwd.test.ts": 63,
-      "src/main/providers/pty-process-inspection.test.ts": 32,
-      "src/main/providers/pty-process-list-admission.test.ts": 140,
-      "src/main/providers/pty-repaint-wide-char-buffer.node-pty.test.ts": 1987,
-      "src/main/providers/settled-pty-writer-census.test.ts": 805,
-      "src/main/providers/ssh-filesystem-dispatch.test.ts": 44,
-      "src/main/providers/ssh-filesystem-doc-preview.test.ts": 62,
-      "src/main/providers/ssh-filesystem-download.test.ts": 165,
-      "src/main/providers/ssh-filesystem-provider-capabilities.test.ts": 53,
-      "src/main/providers/ssh-filesystem-provider-download-folder.test.ts": 108,
-      "src/main/providers/ssh-filesystem-provider-range.test.ts": 96,
-      "src/main/providers/ssh-filesystem-provider-stream.test.ts": 116,
-      "src/main/providers/ssh-filesystem-provider-watch-waiters.test.ts": 568,
-      "src/main/providers/ssh-filesystem-provider.test.ts": 384,
-      "src/main/providers/ssh-filesystem-watch-notifications.test.ts": 70,
-      "src/main/providers/ssh-git-dispatch.test.ts": 44,
-      "src/main/providers/ssh-git-provider-api.test.ts": 83,
-      "src/main/providers/ssh-git-provider-commit-message.test.ts": 95,
-      "src/main/providers/ssh-git-provider-diff.test.ts": 149,
-      "src/main/providers/ssh-git-provider-exec.test.ts": 208,
-      "src/main/providers/ssh-git-provider-merge.test.ts": 75,
-      "src/main/providers/ssh-git-provider-remote-sync.test.ts": 95,
-      "src/main/providers/ssh-git-provider-staging.test.ts": 64,
-      "src/main/providers/ssh-git-provider-status-lease.test.ts": 96,
-      "src/main/providers/ssh-git-provider-status.test.ts": 114,
-      "src/main/providers/ssh-git-provider-upstream-lease.test.ts": 104,
-      "src/main/providers/ssh-git-provider-worktree.test.ts": 167,
-      "src/main/providers/ssh-git-worktree-list-dedupe.test.ts": 96,
-      "src/main/providers/ssh-pty-inspect-observation-identity.test.ts": 52,
-      "src/main/providers/ssh-pty-live-source-restore-respawn.test.ts": 167,
-      "src/main/providers/ssh-pty-notification-rejection-routing.test.ts": 214,
-      "src/main/providers/ssh-pty-notification-routing.test.ts": 117,
-      "src/main/providers/ssh-pty-provider-agent-session-create-operation.test.ts": 224,
-      "src/main/providers/ssh-pty-provider-claim-incarnation.test.ts": 168,
-      "src/main/providers/ssh-pty-provider-exit-race.test.ts": 227,
-      "src/main/providers/ssh-pty-provider-process-events.test.ts": 207,
-      "src/main/providers/ssh-pty-provider-reattach-incarnation.test.ts": 159,
-      "src/main/providers/ssh-pty-provider-spawn.test.ts": 245,
-      "src/main/providers/ssh-pty-provider-terminal-repair.test.ts": 208,
-      "src/main/providers/ssh-pty-provider.test.ts": 222,
-      "src/main/providers/ssh-pty-reattach-absence-discrimination.test.ts": 52,
-      "src/main/providers/ssh-pty-relay-absence-verdict.test.ts": 202,
-      "src/main/providers/ssh-pty-source-delivery-ledger.test.ts": 54,
-      "src/main/providers/ssh-pty-write.test.ts": 223,
-      "src/main/providers/ssh-worktree-catalog-authority.test.ts": 411,
-      "src/main/providers/stable-foreground-process.test.ts": 65,
-      "src/main/providers/terminal-path-existence-batch.integration.test.ts": 183,
-      "src/main/providers/windows-agent-foreground-process-scan-volume.test.ts": 95,
-      "src/main/providers/windows-cached-agent-revalidation.test.ts": 57,
-      "src/main/providers/windows-conpty-wide-char-duplication.node-pty.test.ts": 72,
-      "src/main/providers/windows-console-attached-processes.test.ts": 66,
-      "src/main/providers/windows-foreground-process-inspection-cost.test.ts": 70,
-      "src/main/providers/windows-foreground-process-rows.test.ts": 61,
-      "src/main/providers/windows-powershell-executable.test.ts": 54,
-      "src/main/providers/windows-powershell.test.ts": 46,
-      "src/main/providers/windows-pty-job-membership.test.ts": 90,
-      "src/main/providers/windows-shell-args.test.ts": 96,
-      "src/main/providers/windows-shell-fallback-chain.test.ts": 117,
-      "src/main/providers/windows-shell-preflight-runtime.windows.test.ts": 108,
-      "src/main/providers/working-directory-validation-retention.test.ts": 158,
-      "src/main/providers/working-directory-validation.test.ts": 109,
-      "src/main/provisioned-root-ssh-adoption.test.ts": 303,
-      "src/main/proxy-guarded-fetch-call-site-audit.test.ts": 311,
-      "src/main/pty-descendant-exit-verification.test.ts": 120,
-      "src/main/pty-descendant-termination-job-coverage.test.ts": 361,
-      "src/main/pty-descendant-termination.test.ts": 163,
-      "src/main/pty/appimage-terminal-env.test.ts": 46,
-      "src/main/pty/build-mode-env.test.ts": 45,
-      "src/main/pty/codex-home-wsl-env.test.ts": 52,
-      "src/main/pty/codex-preflight-profile-path-rewrite.test.ts": 179,
-      "src/main/pty/codex-shell-launch-preflight.test.ts": 3021,
-      "src/main/pty/conda-activation-env.test.ts": 50,
-      "src/main/pty/legacy-terminal-shim-dir.test.ts": 487,
-      "src/main/pty/legacy-terminal-windows-tombstone.test.ts": 79,
-      "src/main/pty/node-pty-master-fd-retirement.test.ts": 5186,
-      "src/main/pty/node-pty-self-exit-pseudoconsole-close.test.ts": 50,
-      "src/main/pty/omp-sqlite-overlay.test.ts": 67,
-      "src/main/pty/overlay-mirror.test.ts": 71,
-      "src/main/pty/pi-process-owner-env.test.ts": 1019,
-      "src/main/pty/posix-pty-foreground-group.test.ts": 70,
-      "src/main/pty/posix-pty-process-groups.integration.test.ts": 185,
-      "src/main/pty/posix-pty-process-groups.test.ts": 49,
-      "src/main/pty/shell-startup-env.test.ts": 120,
-      "src/main/pty/terminal-color-env.test.ts": 52,
-      "src/main/pty/windows-environment-path-main-loop.test.ts": 421,
-      "src/main/pty/windows-environment-path.test.ts": 112,
-      "src/main/pty/windows-path-registry-change.test.ts": 27,
-      "src/main/pty/windows-path-registry-fallback.test.ts": 47,
-      "src/main/pty/windows-path-registry-reader.test.ts": 43,
-      "src/main/pty/wsl-orca-env.test.ts": 74,
-      "src/main/pwsh.test.ts": 58,
-      "src/main/quit-path-durable-write-blocking.test.ts": 2123,
-      "src/main/quit-teardown-agent-browser-daemons.test.ts": 52,
-      "src/main/quit-teardown-deadline.test.ts": 43,
-      "src/main/quit-teardown-start-gate.test.ts": 30,
-      "src/main/rate-limits/account-runtime-target-sync.test.ts": 177,
-      "src/main/rate-limits/antigravity-usage-mirror.test.ts": 48,
-      "src/main/rate-limits/auth-filesystem-operation-retention.test.ts": 96,
-      "src/main/rate-limits/auth-filesystem-operation.test.ts": 63,
-      "src/main/rate-limits/claude-fetcher-cli-fallback.test.ts": 265,
-      "src/main/rate-limits/claude-fetcher-fable-usage.test.ts": 296,
-      "src/main/rate-limits/claude-fetcher-keychain-credentials.test.ts": 264,
-      "src/main/rate-limits/claude-fetcher-managed-account-usage.test.ts": 224,
-      "src/main/rate-limits/claude-oauth-usage-error.test.ts": 118,
-      "src/main/rate-limits/claude-pty.test.ts": 167,
-      "src/main/rate-limits/claude-usage-error-classification.test.ts": 51,
-      "src/main/rate-limits/claude-usage-refresh-plan.test.ts": 36,
-      "src/main/rate-limits/codex-auth-presence.test.ts": 55,
-      "src/main/rate-limits/codex-fetcher-auth-errors.test.ts": 243,
-      "src/main/rate-limits/codex-fetcher-backend.test.ts": 327,
-      "src/main/rate-limits/codex-fetcher-probe-shutdown.test.ts": 250,
-      "src/main/rate-limits/codex-fetcher-process-contract.test.ts": 242,
-      "src/main/rate-limits/codex-fetcher-pty-settle.test.ts": 110,
-      "src/main/rate-limits/codex-fetcher-rpc-exit-diagnostics.test.ts": 575,
-      "src/main/rate-limits/codex-fetcher-runtime-pairing.test.ts": 127,
-      "src/main/rate-limits/codex-fetcher-session-supplement.test.ts": 253,
-      "src/main/rate-limits/codex-fetcher.test.ts": 244,
-      "src/main/rate-limits/codex-probe-termination.test.ts": 90,
-      "src/main/rate-limits/codex-pty-rate-limit-probe.test.ts": 57,
-      "src/main/rate-limits/codex-pty-status-parser.test.ts": 55,
-      "src/main/rate-limits/codex-rate-limit-window-classification.test.ts": 50,
-      "src/main/rate-limits/codex-rpc-rate-limit-probe.test.ts": 90,
+      "src/main/plugins/plugin-private-marketplace.integration.test.ts": 685,
+      "src/main/plugins/plugin-secrets-store.test.ts": 219,
+      "src/main/plugins/plugin-service-integrity.test.ts": 408,
+      "src/main/plugins/plugin-service-reconciliation.test.ts": 597,
+      "src/main/plugins/plugin-startup-budget.test.ts": 768,
+      "src/main/plugins/plugin-storage-store.test.ts": 198,
+      "src/main/plugins/plugin-uninstall-lifecycle.test.ts": 740,
+      "src/main/plugins/plugin-uninstall-log-retention.test.ts": 974,
+      "src/main/plugins/plugin-uninstall-ordering.test.ts": 967,
+      "src/main/plugins/plugin-vm-recipe-registry.test.ts": 236,
+      "src/main/plugins/plugin-worker-controller.test.ts": 393,
+      "src/main/plugins/plugin-worker-env.test.ts": 35,
+      "src/main/plugins/plugin-worker-manager.test.ts": 165,
+      "src/main/plugins/plugin-worker-output-buffer.test.ts": 54,
+      "src/main/plugins/plugin-worker-output-retention.test.ts": 229,
+      "src/main/plugins/plugin-worker-supervision.integration.test.ts": 8081,
+      "src/main/ports/advertised-url-retention.test.ts": 163,
+      "src/main/ports/advertised-url-watcher-pid-validation.test.ts": 53,
+      "src/main/ports/advertised-url-watcher.test.ts": 59,
+      "src/main/ports/local-workspace-port-scanner.test.ts": 119,
+      "src/main/ports/port-scan-command-client.test.ts": 1765,
+      "src/main/ports/port-scan-command-execution.test.ts": 5284,
+      "src/main/ports/port-scan-command-import-boundary.test.ts": 39,
+      "src/main/ports/ssh-advertised-url-enrichment.test.ts": 96,
+      "src/main/ports/workspace-port-ownership.test.ts": 36,
+      "src/main/powershell-osc133-bootstrap-windows-clm.test.ts": 84,
+      "src/main/powershell-osc133-bootstrap.test.ts": 81,
+      "src/main/project-groups/folder-workspace-path-status.test.ts": 72,
+      "src/main/project-groups/nested-repo-discovery-queue.test.ts": 201,
+      "src/main/project-groups/nested-repo-discovery.test.ts": 177,
+      "src/main/project-groups/nested-repo-glob-budget.test.ts": 841,
+      "src/main/project-groups/nested-repo-import-target.test.ts": 58,
+      "src/main/project-groups/nested-repo-import.test.ts": 58,
+      "src/main/project-groups/nested-repo-scan-rules.test.ts": 31,
+      "src/main/project-runtime-git-options.test.ts": 73,
+      "src/main/protected-secret-persistence-concurrency.test.ts": 68,
+      "src/main/protected-secret-persistence.test.ts": 50,
+      "src/main/providers/agent-foreground-process-batch.test.ts": 91,
+      "src/main/providers/agent-foreground-process-git-bash-launcher.test.ts": 87,
+      "src/main/providers/agent-foreground-process-git-bash.win32.test.ts": 196,
+      "src/main/providers/agent-foreground-process-pi.test.ts": 82,
+      "src/main/providers/agent-foreground-process-ps-scan-volume.test.ts": 105,
+      "src/main/providers/agent-foreground-process-real-rows.test.ts": 105,
+      "src/main/providers/agent-foreground-process-remote-evidence.test.ts": 81,
+      "src/main/providers/agent-foreground-process-shell-path.test.ts": 76,
+      "src/main/providers/agent-foreground-process-windows-job-rejection.test.ts": 48,
+      "src/main/providers/agent-foreground-process-wsl-shell-proof.test.ts": 108,
+      "src/main/providers/agent-foreground-process.test.ts": 149,
+      "src/main/providers/execution-host-provider-dispatch.test.ts": 33,
+      "src/main/providers/local-pty-bun-artifact.integration.test.ts": 50,
+      "src/main/providers/local-pty-bun-posix-inspection.test.ts": 238,
+      "src/main/providers/local-pty-bun-windows-identity.test.ts": 132,
+      "src/main/providers/local-pty-child-process-verdict.test.ts": 280,
+      "src/main/providers/local-pty-default-shell.test.ts": 124,
+      "src/main/providers/local-pty-foreground-inspection-cheap-tier.test.ts": 140,
+      "src/main/providers/local-pty-pending-native-spawn.test.ts": 281,
+      "src/main/providers/local-pty-pi-owner-env.test.ts": 108,
+      "src/main/providers/local-pty-provider-foreground-process.test.ts": 413,
+      "src/main/providers/local-pty-provider-io-events.test.ts": 295,
+      "src/main/providers/local-pty-provider-session-inventory.test.ts": 323,
+      "src/main/providers/local-pty-provider-shell-readiness.test.ts": 240,
+      "src/main/providers/local-pty-provider-shutdown.test.ts": 652,
+      "src/main/providers/local-pty-provider-spawn-cwd-safety.test.ts": 305,
+      "src/main/providers/local-pty-provider-spawn-env.test.ts": 308,
+      "src/main/providers/local-pty-provider-spawn-session.test.ts": 410,
+      "src/main/providers/local-pty-provider-windows-shell-launch.test.ts": 301,
+      "src/main/providers/local-pty-shell-ready-marker-scan.test.ts": 61,
+      "src/main/providers/local-pty-shell-ready-startup-command.test.ts": 66,
+      "src/main/providers/local-pty-shell-ready-wrapper-generation.test.ts": 544,
+      "src/main/providers/local-pty-shell-startup-command.node-pty.test.ts": 253,
+      "src/main/providers/local-pty-utils-windows-fallback.test.ts": 81,
+      "src/main/providers/local-pty-utils.test.ts": 81,
+      "src/main/providers/macos-login-session-pty-probe.test.ts": 42,
+      "src/main/providers/macos-tcc-login-shell.test.ts": 146,
+      "src/main/providers/posix-pane-foreground-fingerprint.test.ts": 42,
+      "src/main/providers/process-cwd.test.ts": 141,
+      "src/main/providers/provider-dispatch.test.ts": 1559,
+      "src/main/providers/pty-default-cwd.test.ts": 58,
+      "src/main/providers/pty-process-inspection.test.ts": 54,
+      "src/main/providers/pty-process-list-admission.test.ts": 108,
+      "src/main/providers/pty-repaint-wide-char-buffer.node-pty.test.ts": 1943,
+      "src/main/providers/settled-pty-writer-census.test.ts": 646,
+      "src/main/providers/ssh-filesystem-dispatch.test.ts": 41,
+      "src/main/providers/ssh-filesystem-doc-preview.test.ts": 61,
+      "src/main/providers/ssh-filesystem-download.test.ts": 183,
+      "src/main/providers/ssh-filesystem-provider-capabilities.test.ts": 74,
+      "src/main/providers/ssh-filesystem-provider-download-folder.test.ts": 79,
+      "src/main/providers/ssh-filesystem-provider-range.test.ts": 84,
+      "src/main/providers/ssh-filesystem-provider-stream.test.ts": 164,
+      "src/main/providers/ssh-filesystem-provider-watch-waiters.test.ts": 617,
+      "src/main/providers/ssh-filesystem-provider.test.ts": 323,
+      "src/main/providers/ssh-filesystem-watch-notifications.test.ts": 53,
+      "src/main/providers/ssh-git-dispatch.test.ts": 55,
+      "src/main/providers/ssh-git-provider-api.test.ts": 54,
+      "src/main/providers/ssh-git-provider-commit-message.test.ts": 68,
+      "src/main/providers/ssh-git-provider-diff.test.ts": 141,
+      "src/main/providers/ssh-git-provider-exec.test.ts": 104,
+      "src/main/providers/ssh-git-provider-merge.test.ts": 95,
+      "src/main/providers/ssh-git-provider-remote-sync.test.ts": 99,
+      "src/main/providers/ssh-git-provider-staging.test.ts": 112,
+      "src/main/providers/ssh-git-provider-status-lease.test.ts": 79,
+      "src/main/providers/ssh-git-provider-status.test.ts": 106,
+      "src/main/providers/ssh-git-provider-upstream-lease.test.ts": 78,
+      "src/main/providers/ssh-git-provider-worktree.test.ts": 140,
+      "src/main/providers/ssh-git-worktree-list-dedupe.test.ts": 103,
+      "src/main/providers/ssh-pty-inspect-observation-identity.test.ts": 54,
+      "src/main/providers/ssh-pty-live-source-restore-respawn.test.ts": 207,
+      "src/main/providers/ssh-pty-notification-rejection-routing.test.ts": 196,
+      "src/main/providers/ssh-pty-notification-routing.test.ts": 92,
+      "src/main/providers/ssh-pty-provider-agent-session-create-operation.test.ts": 123,
+      "src/main/providers/ssh-pty-provider-claim-incarnation.test.ts": 109,
+      "src/main/providers/ssh-pty-provider-exit-race.test.ts": 200,
+      "src/main/providers/ssh-pty-provider-process-events.test.ts": 157,
+      "src/main/providers/ssh-pty-provider-reattach-incarnation.test.ts": 138,
+      "src/main/providers/ssh-pty-provider-spawn.test.ts": 124,
+      "src/main/providers/ssh-pty-provider-terminal-repair.test.ts": 213,
+      "src/main/providers/ssh-pty-provider.test.ts": 232,
+      "src/main/providers/ssh-pty-reattach-absence-discrimination.test.ts": 69,
+      "src/main/providers/ssh-pty-relay-absence-verdict.test.ts": 157,
+      "src/main/providers/ssh-pty-source-delivery-ledger.test.ts": 49,
+      "src/main/providers/ssh-pty-write.test.ts": 182,
+      "src/main/providers/ssh-worktree-catalog-authority.test.ts": 429,
+      "src/main/providers/stable-foreground-process.test.ts": 68,
+      "src/main/providers/terminal-path-existence-batch.integration.test.ts": 171,
+      "src/main/providers/windows-agent-foreground-process-scan-volume.test.ts": 70,
+      "src/main/providers/windows-cached-agent-revalidation.test.ts": 56,
+      "src/main/providers/windows-conpty-wide-char-duplication.node-pty.test.ts": 34,
+      "src/main/providers/windows-console-attached-processes.test.ts": 69,
+      "src/main/providers/windows-foreground-process-inspection-cost.test.ts": 88,
+      "src/main/providers/windows-foreground-process-rows.test.ts": 40,
+      "src/main/providers/windows-powershell-executable.test.ts": 67,
+      "src/main/providers/windows-powershell.test.ts": 53,
+      "src/main/providers/windows-pty-job-membership.test.ts": 95,
+      "src/main/providers/windows-shell-args.test.ts": 131,
+      "src/main/providers/windows-shell-fallback-chain.test.ts": 124,
+      "src/main/providers/windows-shell-preflight-runtime.windows.test.ts": 123,
+      "src/main/providers/working-directory-validation-retention.test.ts": 125,
+      "src/main/providers/working-directory-validation.test.ts": 111,
+      "src/main/provisioned-root-ssh-adoption.test.ts": 285,
+      "src/main/proxy-guarded-fetch-call-site-audit.test.ts": 266,
+      "src/main/pty-descendant-exit-verification.test.ts": 83,
+      "src/main/pty-descendant-termination-job-coverage.test.ts": 303,
+      "src/main/pty-descendant-termination.test.ts": 205,
+      "src/main/pty/appimage-terminal-env.test.ts": 42,
+      "src/main/pty/build-mode-env.test.ts": 42,
+      "src/main/pty/codex-home-wsl-env.test.ts": 33,
+      "src/main/pty/codex-preflight-profile-path-rewrite.test.ts": 168,
+      "src/main/pty/codex-shell-launch-preflight.test.ts": 2210,
+      "src/main/pty/conda-activation-env.test.ts": 36,
+      "src/main/pty/legacy-terminal-shim-dir.test.ts": 444,
+      "src/main/pty/legacy-terminal-windows-tombstone.test.ts": 59,
+      "src/main/pty/node-pty-master-fd-retirement.test.ts": 5222,
+      "src/main/pty/node-pty-self-exit-pseudoconsole-close.test.ts": 42,
+      "src/main/pty/omp-sqlite-overlay.test.ts": 43,
+      "src/main/pty/overlay-mirror.test.ts": 41,
+      "src/main/pty/pi-process-owner-env.test.ts": 929,
+      "src/main/pty/posix-pty-foreground-group.test.ts": 60,
+      "src/main/pty/posix-pty-process-groups.integration.test.ts": 123,
+      "src/main/pty/posix-pty-process-groups.test.ts": 78,
+      "src/main/pty/shell-startup-env.test.ts": 116,
+      "src/main/pty/terminal-color-env.test.ts": 49,
+      "src/main/pty/windows-environment-path-main-loop.test.ts": 414,
+      "src/main/pty/windows-environment-path.test.ts": 72,
+      "src/main/pty/windows-path-registry-change.test.ts": 37,
+      "src/main/pty/windows-path-registry-fallback.test.ts": 66,
+      "src/main/pty/windows-path-registry-reader.test.ts": 61,
+      "src/main/pty/wsl-orca-env.test.ts": 85,
+      "src/main/pwsh.test.ts": 74,
+      "src/main/quit-path-durable-write-blocking.test.ts": 2121,
+      "src/main/quit-teardown-agent-browser-daemons.test.ts": 27,
+      "src/main/quit-teardown-deadline.test.ts": 52,
+      "src/main/quit-teardown-start-gate.test.ts": 45,
+      "src/main/rate-limits/account-runtime-target-sync.test.ts": 205,
+      "src/main/rate-limits/antigravity-usage-mirror.test.ts": 38,
+      "src/main/rate-limits/auth-filesystem-operation-retention.test.ts": 132,
+      "src/main/rate-limits/auth-filesystem-operation.test.ts": 56,
+      "src/main/rate-limits/claude-fetcher-cli-fallback.test.ts": 183,
+      "src/main/rate-limits/claude-fetcher-fable-usage.test.ts": 251,
+      "src/main/rate-limits/claude-fetcher-keychain-credentials.test.ts": 273,
+      "src/main/rate-limits/claude-fetcher-managed-account-usage.test.ts": 167,
+      "src/main/rate-limits/claude-oauth-usage-error.test.ts": 102,
+      "src/main/rate-limits/claude-pty.test.ts": 178,
+      "src/main/rate-limits/claude-usage-error-classification.test.ts": 70,
+      "src/main/rate-limits/claude-usage-refresh-plan.test.ts": 33,
+      "src/main/rate-limits/codex-auth-presence.test.ts": 45,
+      "src/main/rate-limits/codex-fetcher-auth-errors.test.ts": 152,
+      "src/main/rate-limits/codex-fetcher-backend.test.ts": 251,
+      "src/main/rate-limits/codex-fetcher-probe-shutdown.test.ts": 223,
+      "src/main/rate-limits/codex-fetcher-process-contract.test.ts": 190,
+      "src/main/rate-limits/codex-fetcher-pty-settle.test.ts": 271,
+      "src/main/rate-limits/codex-fetcher-rpc-exit-diagnostics.test.ts": 465,
+      "src/main/rate-limits/codex-fetcher-runtime-pairing.test.ts": 108,
+      "src/main/rate-limits/codex-fetcher-session-supplement.test.ts": 186,
+      "src/main/rate-limits/codex-fetcher.test.ts": 339,
+      "src/main/rate-limits/codex-probe-termination.test.ts": 63,
+      "src/main/rate-limits/codex-pty-rate-limit-probe.test.ts": 70,
+      "src/main/rate-limits/codex-pty-status-parser.test.ts": 47,
+      "src/main/rate-limits/codex-rate-limit-window-classification.test.ts": 26,
+      "src/main/rate-limits/codex-rpc-rate-limit-probe.test.ts": 109,
       "src/main/rate-limits/cursor-auth.test.ts": 133,
-      "src/main/rate-limits/cursor-fetcher.test.ts": 165,
-      "src/main/rate-limits/cursor-session-token.test.ts": 117,
-      "src/main/rate-limits/cursor-usage-mapping.test.ts": 178,
-      "src/main/rate-limits/gemini-bucket-formatting.test.ts": 56,
-      "src/main/rate-limits/gemini-usage-fetcher.fallback.test.ts": 71,
-      "src/main/rate-limits/gemini-usage-fetcher.test.ts": 71,
-      "src/main/rate-limits/grok-auth.test.ts": 79,
-      "src/main/rate-limits/grok-fetcher.test.ts": 110,
-      "src/main/rate-limits/hidden-pty-cleanup.test.ts": 39,
-      "src/main/rate-limits/initial-account-rate-limit-target.test.ts": 198,
-      "src/main/rate-limits/kimi-fetcher-wsl-home.test.ts": 112,
-      "src/main/rate-limits/kimi-fetcher.test.ts": 123,
-      "src/main/rate-limits/minimax/minimax-fetcher.test.ts": 167,
-      "src/main/rate-limits/minimax/minimax-request-context.test.ts": 98,
-      "src/main/rate-limits/opencode-go-api-key-source.test.ts": 87,
-      "src/main/rate-limits/opencode-go-status-parsing.test.ts": 56,
-      "src/main/rate-limits/opencode-go-usage-api.test.ts": 136,
-      "src/main/rate-limits/opencode-go-usage-fetcher.test.ts": 114,
-      "src/main/rate-limits/opencode-go-usage-source-selection.test.ts": 71,
-      "src/main/rate-limits/service-account-target-selection.test.ts": 797,
-      "src/main/rate-limits/service-antigravity-usage.test.ts": 124,
-      "src/main/rate-limits/service-cursor-usage.test.ts": 209,
-      "src/main/rate-limits/service-inactive-account-previews.test.ts": 240,
-      "src/main/rate-limits/service-live-claude-usage.test.ts": 130,
-      "src/main/rate-limits/service-minimax-usage.test.ts": 111,
-      "src/main/rate-limits/service-refresh-orchestration.test.ts": 295,
-      "src/main/rate-limits/service-window-activation.test.ts": 230,
-      "src/main/refused-tree-kill-root-termination.test.ts": 3212,
-      "src/main/remote-agent-trust-presets.test.ts": 94,
-      "src/main/remote-worktree-history-cleanup.test.ts": 47,
-      "src/main/repo-git-remote-avatar-refresh.test.ts": 111,
-      "src/main/repo-git-remote-identity-enrichment.test.ts": 105,
-      "src/main/repo-git-remote-identity.test.ts": 78,
-      "src/main/repo-git-username-enrichment.test.ts": 98,
-      "src/main/repo-icon-autodetect.test.ts": 528,
-      "src/main/repo-icon-file-detection.test.ts": 106,
-      "src/main/repo-icon-source-href.test.ts": 106,
-      "src/main/repo-maintenance-idle-gate.test.ts": 71,
-      "src/main/repo-worktrees.test.ts": 110,
-      "src/main/ripgrep/bare-ripgrep-spawn-boundary.test.ts": 1035,
-      "src/main/ripgrep/bundled-ripgrep-path.test.ts": 107,
-      "src/main/ripgrep/bundled-ripgrep-real.test.ts": 146,
-      "src/main/ripgrep/bundled-ripgrep-spawn.test.ts": 59,
-      "src/main/ripgrep/fd-exhausted-spawn.test.ts": 61,
-      "src/main/ripgrep/synchronous-spawn-failure.test.ts": 74,
-      "src/main/ripgrep/wsl-missing-cwd-exit.test.ts": 90,
-      "src/main/runtime/acknowledged-terminal-tab-retirement.test.ts": 4207,
-      "src/main/runtime/agent-prompt-line-settle.test.ts": 3086,
-      "src/main/runtime/agent-prompt-receipt-correlation.test.ts": 3211,
-      "src/main/runtime/agent-prompt-request-correlation.test.ts": 54,
-      "src/main/runtime/agent-prompt-submission-runtime-hook-and-generation.test.ts": 3950,
-      "src/main/runtime/agent-prompt-submission-runtime.test.ts": 4657,
-      "src/main/runtime/agent-prompt-submission-verification.test.ts": 129,
-      "src/main/runtime/agent-prompt-submission-windows-submit-delay.test.ts": 2306,
-      "src/main/runtime/agent-session-backup-recovery.test.ts": 510,
-      "src/main/runtime/agent-session-claim-identity.test.ts": 77,
-      "src/main/runtime/agent-session-conversation-name-store.test.ts": 230,
-      "src/main/runtime/agent-session-launch-env-admission.test.ts": 239,
-      "src/main/runtime/agent-session-launch-env-backfill.test.ts": 302,
-      "src/main/runtime/agent-session-lease-renewal.test.ts": 325,
-      "src/main/runtime/agent-session-operation-admission.test.ts": 193,
-      "src/main/runtime/agent-session-orphan-child-reaper.test.ts": 76,
-      "src/main/runtime/agent-session-process-identity-probe-windows-batch.test.ts": 75,
-      "src/main/runtime/agent-session-process-identity-probe.test.ts": 65,
-      "src/main/runtime/agent-session-provider-handle-transition.test.ts": 118,
-      "src/main/runtime/agent-session-record-conversation-name.test.ts": 152,
-      "src/main/runtime/agent-session-record-options.test.ts": 214,
-      "src/main/runtime/agent-session-record-store-legacy-handoff-lease.test.ts": 321,
-      "src/main/runtime/agent-session-record-store-security.test.ts": 162,
-      "src/main/runtime/agent-session-record-store-tab-table.test.ts": 493,
-      "src/main/runtime/agent-session-record-store.test.ts": 1114,
-      "src/main/runtime/agent-session-record-unsupported-schema.test.ts": 235,
-      "src/main/runtime/agent-session-recovery-capsule.test.ts": 837,
-      "src/main/runtime/agent-session-recovery-publish-fault.test.ts": 223,
-      "src/main/runtime/agent-session-released-reservation-replay.test.ts": 378,
-      "src/main/runtime/agent-session-reservation-admission.test.ts": 181,
-      "src/main/runtime/agent-session-spawn-token-process-scan.test.ts": 65,
+      "src/main/rate-limits/cursor-fetcher.test.ts": 173,
+      "src/main/rate-limits/cursor-session-token.test.ts": 71,
+      "src/main/rate-limits/cursor-usage-mapping.test.ts": 97,
+      "src/main/rate-limits/gemini-bucket-formatting.test.ts": 37,
+      "src/main/rate-limits/gemini-usage-fetcher.fallback.test.ts": 113,
+      "src/main/rate-limits/gemini-usage-fetcher.test.ts": 100,
+      "src/main/rate-limits/grok-auth.test.ts": 101,
+      "src/main/rate-limits/grok-fetcher.test.ts": 152,
+      "src/main/rate-limits/hidden-pty-cleanup.test.ts": 53,
+      "src/main/rate-limits/initial-account-rate-limit-target.test.ts": 233,
+      "src/main/rate-limits/kimi-fetcher-wsl-home.test.ts": 92,
+      "src/main/rate-limits/kimi-fetcher.test.ts": 129,
+      "src/main/rate-limits/minimax/minimax-fetcher.test.ts": 109,
+      "src/main/rate-limits/minimax/minimax-request-context.test.ts": 89,
+      "src/main/rate-limits/opencode-go-api-key-source.test.ts": 73,
+      "src/main/rate-limits/opencode-go-status-parsing.test.ts": 63,
+      "src/main/rate-limits/opencode-go-usage-api.test.ts": 109,
+      "src/main/rate-limits/opencode-go-usage-fetcher.test.ts": 79,
+      "src/main/rate-limits/opencode-go-usage-source-selection.test.ts": 104,
+      "src/main/rate-limits/service-account-target-selection.test.ts": 780,
+      "src/main/rate-limits/service-antigravity-usage.test.ts": 123,
+      "src/main/rate-limits/service-cursor-usage.test.ts": 229,
+      "src/main/rate-limits/service-inactive-account-previews.test.ts": 187,
+      "src/main/rate-limits/service-live-claude-usage.test.ts": 173,
+      "src/main/rate-limits/service-minimax-usage.test.ts": 91,
+      "src/main/rate-limits/service-refresh-orchestration.test.ts": 243,
+      "src/main/rate-limits/service-window-activation.test.ts": 321,
+      "src/main/refused-tree-kill-root-termination.test.ts": 2628,
+      "src/main/remote-agent-trust-presets.test.ts": 166,
+      "src/main/remote-worktree-history-cleanup.test.ts": 59,
+      "src/main/repo-git-remote-avatar-refresh.test.ts": 108,
+      "src/main/repo-git-remote-identity-enrichment.test.ts": 91,
+      "src/main/repo-git-remote-identity.test.ts": 71,
+      "src/main/repo-git-username-enrichment.test.ts": 43,
+      "src/main/repo-icon-autodetect.test.ts": 606,
+      "src/main/repo-icon-file-detection.test.ts": 92,
+      "src/main/repo-icon-source-href.test.ts": 109,
+      "src/main/repo-maintenance-idle-gate.test.ts": 53,
+      "src/main/repo-worktrees.test.ts": 104,
+      "src/main/ripgrep/bare-ripgrep-spawn-boundary.test.ts": 1021,
+      "src/main/ripgrep/bundled-ripgrep-path.test.ts": 104,
+      "src/main/ripgrep/bundled-ripgrep-real.test.ts": 150,
+      "src/main/ripgrep/bundled-ripgrep-spawn.test.ts": 67,
+      "src/main/ripgrep/fd-exhausted-spawn.test.ts": 68,
+      "src/main/ripgrep/synchronous-spawn-failure.test.ts": 63,
+      "src/main/ripgrep/wsl-missing-cwd-exit.test.ts": 92,
+      "src/main/runtime/acknowledged-terminal-tab-retirement.test.ts": 3317,
+      "src/main/runtime/agent-prompt-line-settle.test.ts": 2927,
+      "src/main/runtime/agent-prompt-receipt-correlation.test.ts": 3413,
+      "src/main/runtime/agent-prompt-request-correlation.test.ts": 46,
+      "src/main/runtime/agent-prompt-submission-runtime-hook-and-generation.test.ts": 3872,
+      "src/main/runtime/agent-prompt-submission-runtime.test.ts": 4515,
+      "src/main/runtime/agent-prompt-submission-verification.test.ts": 193,
+      "src/main/runtime/agent-prompt-submission-windows-submit-delay.test.ts": 2931,
+      "src/main/runtime/agent-session-backup-recovery.test.ts": 422,
+      "src/main/runtime/agent-session-claim-identity.test.ts": 71,
+      "src/main/runtime/agent-session-conversation-name-store.test.ts": 302,
+      "src/main/runtime/agent-session-launch-env-admission.test.ts": 253,
+      "src/main/runtime/agent-session-launch-env-backfill.test.ts": 264,
+      "src/main/runtime/agent-session-lease-renewal.test.ts": 242,
+      "src/main/runtime/agent-session-operation-admission.test.ts": 165,
+      "src/main/runtime/agent-session-process-identity-probe-windows-batch.test.ts": 47,
+      "src/main/runtime/agent-session-process-identity-probe.test.ts": 78,
+      "src/main/runtime/agent-session-provider-handle-transition.test.ts": 104,
+      "src/main/runtime/agent-session-record-conversation-name.test.ts": 164,
+      "src/main/runtime/agent-session-record-options.test.ts": 203,
+      "src/main/runtime/agent-session-record-store-legacy-handoff-lease.test.ts": 303,
+      "src/main/runtime/agent-session-record-store-security.test.ts": 156,
+      "src/main/runtime/agent-session-record-store-tab-table.test.ts": 420,
+      "src/main/runtime/agent-session-record-store.test.ts": 4639,
+      "src/main/runtime/agent-session-record-unsupported-schema.test.ts": 255,
+      "src/main/runtime/agent-session-recovery-capsule.test.ts": 642,
+      "src/main/runtime/agent-session-recovery-publish-fault.test.ts": 252,
+      "src/main/runtime/agent-session-released-reservation-replay.test.ts": 351,
+      "src/main/runtime/agent-session-reservation-admission.test.ts": 150,
+      "src/main/runtime/agent-session-spawn-token-process-scan.test.ts": 54,
       "src/main/runtime/agent-session-spawn-token-readback.test.ts": 52,
-      "src/main/runtime/agent-session-surface-release-transition.test.ts": 134,
-      "src/main/runtime/agent-session-unreadable-record-salvage.test.ts": 335,
-      "src/main/runtime/agent-session-unsaved-creation-supersession.test.ts": 384,
-      "src/main/runtime/agent-startup-input-assembly-census.test.ts": 40,
-      "src/main/runtime/agent-terminal-launch-trust-host.test.ts": 3354,
-      "src/main/runtime/agent-terminal-startup-prompt.test.ts": 2648,
-      "src/main/runtime/antigravity-readiness-transcripts.test.ts": 7262,
-      "src/main/runtime/antigravity-terminal-readiness.test.ts": 45,
-      "src/main/runtime/automation-change-publication.test.ts": 8406,
-      "src/main/runtime/browser-client-download-transfers.test.ts": 188,
-      "src/main/runtime/browser-dialog-settlement.test.ts": 397,
-      "src/main/runtime/browser-execution-host-key-resolution.test.ts": 3212,
-      "src/main/runtime/browser-host-capability-selection.test.ts": 102,
-      "src/main/runtime/browser-host-client-page-adoption-grants.test.ts": 40,
-      "src/main/runtime/browser-host-client-page-adoption.test.ts": 66,
-      "src/main/runtime/browser-host-client-page-creation.test.ts": 210,
-      "src/main/runtime/browser-host-command-ledger-capacity.test.ts": 174,
-      "src/main/runtime/browser-host-command-ledger.test.ts": 151,
-      "src/main/runtime/browser-host-file-channel-admission.test.ts": 117,
-      "src/main/runtime/browser-host-lease-download-transfer-cleanup.test.ts": 287,
-      "src/main/runtime/browser-host-lease-fenced-page-release.test.ts": 191,
-      "src/main/runtime/browser-host-lease-placement-retirement.test.ts": 231,
-      "src/main/runtime/browser-host-lease-registry.test.ts": 178,
-      "src/main/runtime/browser-host-page-placement-replacement.test.ts": 136,
-      "src/main/runtime/browser-host-page-placement.test.ts": 191,
+      "src/main/runtime/agent-session-surface-release-transition.test.ts": 167,
+      "src/main/runtime/agent-session-unreadable-record-salvage.test.ts": 310,
+      "src/main/runtime/agent-session-unsaved-creation-supersession.test.ts": 363,
+      "src/main/runtime/agent-startup-input-assembly-census.test.ts": 41,
+      "src/main/runtime/agent-terminal-launch-trust-host.test.ts": 3780,
+      "src/main/runtime/agent-terminal-startup-prompt.test.ts": 2169,
+      "src/main/runtime/antigravity-readiness-transcripts.test.ts": 6110,
+      "src/main/runtime/antigravity-terminal-readiness.test.ts": 78,
+      "src/main/runtime/automation-change-publication.test.ts": 8897,
+      "src/main/runtime/browser-client-download-transfers.test.ts": 201,
+      "src/main/runtime/browser-dialog-settlement.test.ts": 359,
+      "src/main/runtime/browser-execution-host-key-resolution.test.ts": 1993,
+      "src/main/runtime/browser-host-capability-selection.test.ts": 172,
+      "src/main/runtime/browser-host-client-page-adoption-grants.test.ts": 46,
+      "src/main/runtime/browser-host-client-page-adoption.test.ts": 36,
+      "src/main/runtime/browser-host-client-page-creation.test.ts": 133,
+      "src/main/runtime/browser-host-command-ledger-capacity.test.ts": 157,
+      "src/main/runtime/browser-host-command-ledger.test.ts": 138,
+      "src/main/runtime/browser-host-file-channel-admission.test.ts": 154,
+      "src/main/runtime/browser-host-lease-download-transfer-cleanup.test.ts": 319,
+      "src/main/runtime/browser-host-lease-fenced-page-release.test.ts": 206,
+      "src/main/runtime/browser-host-lease-placement-retirement.test.ts": 189,
+      "src/main/runtime/browser-host-lease-registry.test.ts": 243,
+      "src/main/runtime/browser-host-page-placement-replacement.test.ts": 169,
+      "src/main/runtime/browser-host-page-placement.test.ts": 156,
       "src/main/runtime/browser-host-page-reconciliation-executor.test.ts": 64,
-      "src/main/runtime/browser-host-page-reconciliation-orchestration.test.ts": 420,
-      "src/main/runtime/browser-host-page-reconciliation-plan.test.ts": 59,
-      "src/main/runtime/browser-host-page-reconciliation-preconditions.test.ts": 151,
-      "src/main/runtime/browser-host-page-retirement.test.ts": 55,
-      "src/main/runtime/browser-network-tunnel-paired-runtime.integration.test.ts": 4226,
-      "src/main/runtime/browser-screencast-driver-attribution.test.ts": 4247,
-      "src/main/runtime/browser-screencast-driver-scope.test.ts": 34,
-      "src/main/runtime/browser-screencast-ghost-subscriber-eviction.test.ts": 43,
-      "src/main/runtime/browser-screencast-remote-viewer-retention.test.ts": 3665,
-      "src/main/runtime/browser-session-tab-selection-snapshot.test.ts": 45,
-      "src/main/runtime/browser-tab-create-caller-navigation.test.ts": 3578,
-      "src/main/runtime/browser-tab-create-publication.test.ts": 1190,
-      "src/main/runtime/claude-agent-teams-pty-exit-leak.test.ts": 3278,
-      "src/main/runtime/claude-agent-teams-service.test.ts": 93,
-      "src/main/runtime/claude-agent-teams-shim-env.test.ts": 77,
-      "src/main/runtime/claude-structured-failed-start-resume.test.ts": 1196,
-      "src/main/runtime/claude-structured-resumed-start-failure.test.ts": 1189,
-      "src/main/runtime/claude-structured-send-held-for-startup.test.ts": 1341,
-      "src/main/runtime/claude-structured-send-restart-dies-before-dispatch.test.ts": 2011,
-      "src/main/runtime/claude-structured-session-integration.test.ts": 13044,
-      "src/main/runtime/claude-structured-startup-unanswered-control-request.test.ts": 1752,
-      "src/main/runtime/cli-terminal-create-host-session-binding.test.ts": 3151,
-      "src/main/runtime/client-hosted-browser-page-persistence.integration.test.ts": 2601,
-      "src/main/runtime/client-hosted-browser-page-persistence.test.ts": 251,
-      "src/main/runtime/client-hosted-browser-row-hydration-census.test.ts": 753,
-      "src/main/runtime/client-hosted-browser-row-projection.test.ts": 49,
-      "src/main/runtime/client-hosted-browser-row-publication.test.ts": 76,
-      "src/main/runtime/client-hosted-browser-row-push.integration.test.ts": 3349,
-      "src/main/runtime/client-hosted-page-reconciliation-hold.integration.test.ts": 3150,
-      "src/main/runtime/client-hosted-page-reconciliation-window.test.ts": 54,
-      "src/main/runtime/client-session-tab-selection.test.ts": 55,
-      "src/main/runtime/decorative-title-fact-emission.test.ts": 70,
-      "src/main/runtime/exit-provenance-audit.test.ts": 3418,
-      "src/main/runtime/expired-ssh-lease-pane-candidacy.test.ts": 4059,
-      "src/main/runtime/external-worktree-paired-client-discovery.integration.test.ts": 4520,
-      "src/main/runtime/fetch-remote-cache.test.ts": 3448,
-      "src/main/runtime/file-watcher-host.test.ts": 802,
-      "src/main/runtime/fit-override-integration.test.ts": 2984,
-      "src/main/runtime/folder-workspace-pty-identity.test.ts": 3504,
-      "src/main/runtime/graph-sync-deletion-fence.test.ts": 3140,
-      "src/main/runtime/graph-sync-live-daemon-pty-tab-preservation.test.ts": 3253,
-      "src/main/runtime/graph-sync-mobile-snapshot-gating.test.ts": 11806,
-      "src/main/runtime/graph-sync-payload-partition.test.ts": 3695,
-      "src/main/runtime/headless-close-keeps-publication-epoch.test.ts": 3277,
-      "src/main/runtime/headless-hydration-ownership.test.ts": 4784,
-      "src/main/runtime/headless-placeholder-graph-surface-standing.test.ts": 3136,
-      "src/main/runtime/headless-seed-ownership.test.ts": 4389,
-      "src/main/runtime/headless-tab-group-split-layout.test.ts": 72,
-      "src/main/runtime/headless-tab-order-stability.test.ts": 3306,
-      "src/main/runtime/headless-terminal-dispose-write-ordering.test.ts": 2646,
-      "src/main/runtime/headless-terminal-query-reply-policy.test.ts": 54,
-      "src/main/runtime/headless-terminal-split-layout.test.ts": 39,
-      "src/main/runtime/hidden-output-restored-provider-snapshot.test.ts": 4108,
-      "src/main/runtime/host-terminal-close-persistence-durability.test.ts": 1298,
-      "src/main/runtime/leaf-pty-verdict-expiry.test.ts": 2650,
-      "src/main/runtime/linear-save-issue.test.ts": 3296,
-      "src/main/runtime/managed-worktree-create-execution-host.test.ts": 3395,
-      "src/main/runtime/missing-worktree-terminal-reconciliation.test.ts": 241,
-      "src/main/runtime/mobile-agent-status-permission-renewal.test.ts": 3155,
-      "src/main/runtime/mobile-notification-dismissal-read-failure.test.ts": 90,
-      "src/main/runtime/mobile-notification-dismissal-store.test.ts": 75,
-      "src/main/runtime/mobile-notification-replay.test.ts": 65,
-      "src/main/runtime/mobile-pairing-qr.test.ts": 1453,
-      "src/main/runtime/mobile-pairing-userdata-path.test.ts": 2162,
-      "src/main/runtime/mobile-presence-lock.test.ts": 16297,
-      "src/main/runtime/mobile-rpc-allowlist.test.ts": 2276,
-      "src/main/runtime/mobile-session-tab-close-refusal-message.test.ts": 45,
-      "src/main/runtime/mobile-session-tabs-agent-status-heartbeat.test.ts": 75,
-      "src/main/runtime/mobile-session-tabs-churn-coalescing.test.ts": 3143,
-      "src/main/runtime/mobile-session-tabs-notify-coalescer.test.ts": 42,
-      "src/main/runtime/mobile-session-terminal-persistence-retirement.test.ts": 186,
-      "src/main/runtime/mobile-session-terminal-retirement-proof.test.ts": 38,
-      "src/main/runtime/mobile-session-terminal-retirement.test.ts": 193,
-      "src/main/runtime/mobile-subscribe-integration.test.ts": 15410,
-      "src/main/runtime/multi-client-navigation-isolation.integration.test.ts": 5388,
-      "src/main/runtime/muse-readiness-transcript.test.ts": 7555,
-      "src/main/runtime/opencode-finished-session-authority.test.ts": 3797,
-      "src/main/runtime/orca-runtime-agent-session-operation.test.ts": 2641,
-      "src/main/runtime/orca-runtime-agent-skill-share.test.ts": 3574,
-      "src/main/runtime/orca-runtime-automations.test.ts": 3322,
-      "src/main/runtime/orca-runtime-browser-client-hosted.test.ts": 461,
-      "src/main/runtime/orca-runtime-browser-ghost-session-row-close.test.ts": 454,
-      "src/main/runtime/orca-runtime-browser-headless.test.ts": 359,
-      "src/main/runtime/orca-runtime-browser-screencast-fanout.test.ts": 374,
-      "src/main/runtime/orca-runtime-browser.test.ts": 801,
-      "src/main/runtime/orca-runtime-create-base-prefetch.test.ts": 3374,
-      "src/main/runtime/orca-runtime-emulator-folder-workspace.test.ts": 2660,
-      "src/main/runtime/orca-runtime-exact-worker-provider-session.test.ts": 2577,
-      "src/main/runtime/orca-runtime-files-mobile-explorer-reads.test.ts": 453,
-      "src/main/runtime/orca-runtime-files-preview-budget.test.ts": 561,
-      "src/main/runtime/orca-runtime-files-rename-authority.test.ts": 365,
-      "src/main/runtime/orca-runtime-files-search.test.ts": 301,
-      "src/main/runtime/orca-runtime-files-ssh-chunk-reads.test.ts": 549,
-      "src/main/runtime/orca-runtime-files-ssh-rearm.test.ts": 597,
-      "src/main/runtime/orca-runtime-files-terminal-artifact-grants.test.ts": 488,
-      "src/main/runtime/orca-runtime-files-terminal-artifact-io.test.ts": 695,
-      "src/main/runtime/orca-runtime-files-terminal-artifact-swap-detection.test.ts": 381,
-      "src/main/runtime/orca-runtime-files-terminal-link-host-translation.test.ts": 503,
-      "src/main/runtime/orca-runtime-files-terminal-path-resolution.test.ts": 370,
-      "src/main/runtime/orca-runtime-files-watch-host-scope.test.ts": 376,
-      "src/main/runtime/orca-runtime-files-watch.test.ts": 598,
-      "src/main/runtime/orca-runtime-git-branch-diff.test.ts": 882,
-      "src/main/runtime/orca-runtime-git-diff-budget.test.ts": 858,
-      "src/main/runtime/orca-runtime-git.test.ts": 4220,
-      "src/main/runtime/orca-runtime-headless-hydration-repo-gate.test.ts": 3331,
-      "src/main/runtime/orca-runtime-hook-agent-status-projection.test.ts": 3462,
-      "src/main/runtime/orca-runtime-linked-issue-live-meta.integration.test.ts": 2536,
-      "src/main/runtime/orca-runtime-mobile-agent-status-title-truthfulness.test.ts": 2666,
-      "src/main/runtime/orca-runtime-mobile-close-preserved-resurrection.test.ts": 3501,
-      "src/main/runtime/orca-runtime-module-size.test.ts": 49,
-      "src/main/runtime/orca-runtime-path-candidate-history.test.ts": 65,
-      "src/main/runtime/orca-runtime-process-incarnation-liveness.test.ts": 3017,
-      "src/main/runtime/orca-runtime-provider-reattach-launch-identity.test.ts": 3200,
-      "src/main/runtime/orca-runtime-skill-recovery.test.ts": 3296,
-      "src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts": 2640,
-      "src/main/runtime/orca-runtime-structured-claude-account-gate.test.ts": 3111,
-      "src/main/runtime/orca-runtime-structured-claude-gate-wiring.test.ts": 2554,
-      "src/main/runtime/orca-runtime-structured-native-chat-settings.test.ts": 3325,
-      "src/main/runtime/orca-runtime-structured-session-restore.test.ts": 2811,
-      "src/main/runtime/orca-runtime-structured-status-sink-wiring.test.ts": 2818,
-      "src/main/runtime/orca-runtime-tab-id-collision.test.ts": 2618,
-      "src/main/runtime/orca-runtime-tail-wait-memo.test.ts": 3015,
-      "src/main/runtime/orca-runtime-terminal-close-continuity.test.ts": 3863,
-      "src/main/runtime/orca-runtime-terminal-create-idempotency.test.ts": 2537,
-      "src/main/runtime/orca-runtime-terminal-cwd.test.ts": 2871,
-      "src/main/runtime/orca-runtime-terminal-handle-incarnation.test.ts": 3364,
-      "src/main/runtime/orca-runtime-terminal-rename-retention.test.ts": 3667,
-      "src/main/runtime/orca-runtime-terminal-retirement-host-partition.test.ts": 2987,
-      "src/main/runtime/orca-runtime-terminal-retirement.test.ts": 3555,
-      "src/main/runtime/orca-runtime-terminal-split-authority.test.ts": 3308,
-      "src/main/runtime/orca-runtime-test-fragment-coverage.test.ts": 36,
-      "src/main/runtime/orca-runtime-worktree-change-invalidation.test.ts": 3219,
-      "src/main/runtime/orca-runtime.test.ts": 20610,
-      "src/main/runtime/orchestration-cli-subprocess.test.ts": 4124,
-      "src/main/runtime/orchestration-codex-completion-title.test.ts": 4094,
-      "src/main/runtime/orchestration-codex-real-pty.integration.test.ts": 3941,
-      "src/main/runtime/orchestration-compatibility-authority.test.ts": 2671,
-      "src/main/runtime/orchestration-dispatch-mailbox-delivery.test.ts": 3742,
-      "src/main/runtime/orchestration-mailbox-cold-park-idle.test.ts": 3344,
-      "src/main/runtime/orchestration-mailbox-crash-recovery.test.ts": 4178,
-      "src/main/runtime/orchestration-mailbox-detached-routing.test.ts": 3166,
-      "src/main/runtime/orchestration-mailbox-filtered-waiters.test.ts": 3792,
-      "src/main/runtime/orchestration-mailbox-notification-consistency.test.ts": 6161,
-      "src/main/runtime/orchestration-mailbox-pointer-cli-command.test.ts": 4261,
-      "src/main/runtime/orchestration-mailbox-routing-races.test.ts": 4691,
-      "src/main/runtime/orchestration-mailbox-transport-settlement.test.ts": 4114,
-      "src/main/runtime/orchestration-message-delivery-identity.test.ts": 4119,
-      "src/main/runtime/orchestration-messages-fake-parity.test.ts": 387,
-      "src/main/runtime/orchestration-worker-workspace-resolution.test.ts": 3296,
-      "src/main/runtime/orchestration/cli-command.test.ts": 47,
-      "src/main/runtime/orchestration/coordinator-decision-gates.test.ts": 361,
-      "src/main/runtime/orchestration/coordinator-dispatch-unobserved-prompt.test.ts": 406,
-      "src/main/runtime/orchestration/coordinator-drift-probe-coalescing.test.ts": 536,
-      "src/main/runtime/orchestration/coordinator-escalation-triage.test.ts": 262,
-      "src/main/runtime/orchestration/coordinator-stale-base-flag.test.ts": 54,
-      "src/main/runtime/orchestration/coordinator-terminal-census-unavailable.test.ts": 259,
-      "src/main/runtime/orchestration/coordinator.test.ts": 3749,
-      "src/main/runtime/orchestration/db-empty-dispatch-shortcircuit.benchmark.test.ts": 354,
-      "src/main/runtime/orchestration/db-heartbeat-straggler-guard.test.ts": 396,
-      "src/main/runtime/orchestration/db-message-timestamp.test.ts": 366,
-      "src/main/runtime/orchestration/db-messages.test.ts": 487,
-      "src/main/runtime/orchestration/db-stopping-worker-task-guard.test.ts": 447,
-      "src/main/runtime/orchestration/db-task-create-readiness.test.ts": 503,
-      "src/main/runtime/orchestration/db-task-dispatch-invariant.test.ts": 990,
-      "src/main/runtime/orchestration/db-task-dispatch-lifecycle-guards.test.ts": 1225,
-      "src/main/runtime/orchestration/db-task-dispatch-races.test.ts": 1123,
-      "src/main/runtime/orchestration/db-undelivered-mailboxes.test.ts": 398,
-      "src/main/runtime/orchestration/db.test.ts": 2238,
-      "src/main/runtime/orchestration/db/attempt-outcome-projection.test.ts": 445,
-      "src/main/runtime/orchestration/db/decision-gate-lifecycle.test.ts": 304,
-      "src/main/runtime/orchestration/db/dispatch-context/dispatch-capability.test.ts": 291,
-      "src/main/runtime/orchestration/db/dispatch-depth.test.ts": 576,
-      "src/main/runtime/orchestration/db/dispatch-mailbox-consumer-fencing.test.ts": 345,
-      "src/main/runtime/orchestration/db/dispatch-row-writer-boundary.test.ts": 781,
-      "src/main/runtime/orchestration/db/federated-worker-report-outcome.test.ts": 41,
-      "src/main/runtime/orchestration/db/federation/federated-dispatch-observation-fence.test.ts": 376,
-      "src/main/runtime/orchestration/db/federation/remote-dispatch-attachment-release.test.ts": 462,
-      "src/main/runtime/orchestration/db/hot-path-statement-compilation.test.ts": 378,
-      "src/main/runtime/orchestration/db/legacy-question-identity.test.ts": 40,
-      "src/main/runtime/orchestration/db/lifecycle-rejection-marker.test.ts": 40,
-      "src/main/runtime/orchestration/db/lifecycle-transition-boundary.test.ts": 42,
-      "src/main/runtime/orchestration/db/lifecycle-transition.test.ts": 415,
-      "src/main/runtime/orchestration/db/messages/mailbox-consumer-lifecycle-fencing.test.ts": 641,
-      "src/main/runtime/orchestration/db/pane-key-match.test.ts": 42,
+      "src/main/runtime/browser-host-page-reconciliation-orchestration.test.ts": 369,
+      "src/main/runtime/browser-host-page-reconciliation-plan.test.ts": 74,
+      "src/main/runtime/browser-host-page-reconciliation-preconditions.test.ts": 166,
+      "src/main/runtime/browser-host-page-retirement.test.ts": 32,
+      "src/main/runtime/browser-network-tunnel-paired-runtime.integration.test.ts": 2930,
+      "src/main/runtime/browser-screencast-driver-attribution.test.ts": 4314,
+      "src/main/runtime/browser-screencast-driver-scope.test.ts": 38,
+      "src/main/runtime/browser-screencast-ghost-subscriber-eviction.test.ts": 59,
+      "src/main/runtime/browser-screencast-remote-viewer-retention.test.ts": 3782,
+      "src/main/runtime/browser-session-tab-selection-snapshot.test.ts": 57,
+      "src/main/runtime/browser-tab-create-caller-navigation.test.ts": 3696,
+      "src/main/runtime/browser-tab-create-publication.test.ts": 775,
+      "src/main/runtime/claude-agent-teams-pty-exit-leak.test.ts": 3509,
+      "src/main/runtime/claude-agent-teams-service.test.ts": 86,
+      "src/main/runtime/claude-agent-teams-shim-env.test.ts": 102,
+      "src/main/runtime/claude-structured-failed-start-resume.test.ts": 1167,
+      "src/main/runtime/claude-structured-resumed-start-failure.test.ts": 1250,
+      "src/main/runtime/claude-structured-send-held-for-startup.test.ts": 1153,
+      "src/main/runtime/claude-structured-send-restart-dies-before-dispatch.test.ts": 1691,
+      "src/main/runtime/claude-structured-session-integration.test.ts": 4718,
+      "src/main/runtime/claude-structured-startup-unanswered-control-request.test.ts": 1435,
+      "src/main/runtime/cli-terminal-create-host-session-binding.test.ts": 1988,
+      "src/main/runtime/client-hosted-browser-page-persistence.integration.test.ts": 3289,
+      "src/main/runtime/client-hosted-browser-page-persistence.test.ts": 233,
+      "src/main/runtime/client-hosted-browser-row-hydration-census.test.ts": 485,
+      "src/main/runtime/client-hosted-browser-row-projection.test.ts": 57,
+      "src/main/runtime/client-hosted-browser-row-publication.test.ts": 59,
+      "src/main/runtime/client-hosted-browser-row-push.integration.test.ts": 2544,
+      "src/main/runtime/client-hosted-page-reconciliation-hold.integration.test.ts": 3363,
+      "src/main/runtime/client-hosted-page-reconciliation-window.test.ts": 57,
+      "src/main/runtime/client-session-tab-selection.test.ts": 57,
+      "src/main/runtime/decorative-title-fact-emission.test.ts": 33,
+      "src/main/runtime/exit-provenance-audit.test.ts": 3844,
+      "src/main/runtime/expired-ssh-lease-pane-candidacy.test.ts": 2958,
+      "src/main/runtime/external-worktree-paired-client-discovery.integration.test.ts": 4448,
+      "src/main/runtime/fetch-remote-cache.test.ts": 3566,
+      "src/main/runtime/file-watcher-host.test.ts": 816,
+      "src/main/runtime/fit-override-integration.test.ts": 3341,
+      "src/main/runtime/folder-workspace-pty-identity.test.ts": 2999,
+      "src/main/runtime/graph-sync-deletion-fence.test.ts": 3314,
+      "src/main/runtime/graph-sync-live-daemon-pty-tab-preservation.test.ts": 3308,
+      "src/main/runtime/graph-sync-mobile-snapshot-gating.test.ts": 9743,
+      "src/main/runtime/graph-sync-payload-partition.test.ts": 2285,
+      "src/main/runtime/headless-close-keeps-publication-epoch.test.ts": 2149,
+      "src/main/runtime/headless-hydration-ownership.test.ts": 4098,
+      "src/main/runtime/headless-placeholder-graph-surface-standing.test.ts": 2838,
+      "src/main/runtime/headless-seed-ownership.test.ts": 4790,
+      "src/main/runtime/headless-tab-group-split-layout.test.ts": 55,
+      "src/main/runtime/headless-tab-order-stability.test.ts": 2511,
+      "src/main/runtime/headless-terminal-dispose-write-ordering.test.ts": 3202,
+      "src/main/runtime/headless-terminal-query-reply-policy.test.ts": 49,
+      "src/main/runtime/headless-terminal-split-layout.test.ts": 34,
+      "src/main/runtime/hidden-output-restored-provider-snapshot.test.ts": 3364,
+      "src/main/runtime/host-terminal-close-persistence-durability.test.ts": 838,
+      "src/main/runtime/leaf-pty-verdict-expiry.test.ts": 3418,
+      "src/main/runtime/linear-save-issue.test.ts": 3157,
+      "src/main/runtime/managed-worktree-create-execution-host.test.ts": 2508,
+      "src/main/runtime/missing-worktree-terminal-reconciliation.test.ts": 197,
+      "src/main/runtime/mobile-agent-status-permission-renewal.test.ts": 3290,
+      "src/main/runtime/mobile-notification-dismissal-read-failure.test.ts": 78,
+      "src/main/runtime/mobile-notification-dismissal-store.test.ts": 73,
+      "src/main/runtime/mobile-notification-replay.test.ts": 77,
+      "src/main/runtime/mobile-pairing-qr.test.ts": 973,
+      "src/main/runtime/mobile-pairing-userdata-path.test.ts": 2117,
+      "src/main/runtime/mobile-presence-lock.test.ts": 15604,
+      "src/main/runtime/mobile-rpc-allowlist.test.ts": 1726,
+      "src/main/runtime/mobile-session-tab-close-refusal-message.test.ts": 54,
+      "src/main/runtime/mobile-session-tabs-agent-status-heartbeat.test.ts": 44,
+      "src/main/runtime/mobile-session-tabs-churn-coalescing.test.ts": 2760,
+      "src/main/runtime/mobile-session-tabs-notify-coalescer.test.ts": 35,
+      "src/main/runtime/mobile-session-terminal-persistence-retirement.test.ts": 179,
+      "src/main/runtime/mobile-session-terminal-retirement-proof.test.ts": 37,
+      "src/main/runtime/mobile-session-terminal-retirement.test.ts": 153,
+      "src/main/runtime/mobile-subscribe-integration.test.ts": 18419,
+      "src/main/runtime/multi-client-navigation-isolation.integration.test.ts": 4776,
+      "src/main/runtime/muse-readiness-transcript.test.ts": 6923,
+      "src/main/runtime/opencode-finished-session-authority.test.ts": 3824,
+      "src/main/runtime/orca-runtime-agent-session-operation.test.ts": 2429,
+      "src/main/runtime/orca-runtime-agent-skill-share.test.ts": 2486,
+      "src/main/runtime/orca-runtime-automations.test.ts": 3439,
+      "src/main/runtime/orca-runtime-browser-client-hosted.test.ts": 425,
+      "src/main/runtime/orca-runtime-browser-ghost-session-row-close.test.ts": 373,
+      "src/main/runtime/orca-runtime-browser-headless.test.ts": 784,
+      "src/main/runtime/orca-runtime-browser-screencast-fanout.test.ts": 429,
+      "src/main/runtime/orca-runtime-browser.test.ts": 747,
+      "src/main/runtime/orca-runtime-create-base-prefetch.test.ts": 3300,
+      "src/main/runtime/orca-runtime-emulator-folder-workspace.test.ts": 2993,
+      "src/main/runtime/orca-runtime-exact-worker-provider-session.test.ts": 2563,
+      "src/main/runtime/orca-runtime-files-mobile-explorer-reads.test.ts": 439,
+      "src/main/runtime/orca-runtime-files-preview-budget.test.ts": 346,
+      "src/main/runtime/orca-runtime-files-rename-authority.test.ts": 469,
+      "src/main/runtime/orca-runtime-files-search.test.ts": 325,
+      "src/main/runtime/orca-runtime-files-ssh-chunk-reads.test.ts": 436,
+      "src/main/runtime/orca-runtime-files-ssh-rearm.test.ts": 273,
+      "src/main/runtime/orca-runtime-files-terminal-artifact-grants.test.ts": 400,
+      "src/main/runtime/orca-runtime-files-terminal-artifact-io.test.ts": 554,
+      "src/main/runtime/orca-runtime-files-terminal-artifact-swap-detection.test.ts": 501,
+      "src/main/runtime/orca-runtime-files-terminal-link-host-translation.test.ts": 547,
+      "src/main/runtime/orca-runtime-files-terminal-path-resolution.test.ts": 362,
+      "src/main/runtime/orca-runtime-files-watch-host-scope.test.ts": 484,
+      "src/main/runtime/orca-runtime-files-watch.test.ts": 517,
+      "src/main/runtime/orca-runtime-git-branch-diff.test.ts": 732,
+      "src/main/runtime/orca-runtime-git-diff-budget.test.ts": 871,
+      "src/main/runtime/orca-runtime-git.test.ts": 464,
+      "src/main/runtime/orca-runtime-headless-hydration-repo-gate.test.ts": 3261,
+      "src/main/runtime/orca-runtime-hook-agent-status-projection.test.ts": 2257,
+      "src/main/runtime/orca-runtime-linked-issue-live-meta.integration.test.ts": 2750,
+      "src/main/runtime/orca-runtime-mobile-agent-status-title-truthfulness.test.ts": 3103,
+      "src/main/runtime/orca-runtime-mobile-close-preserved-resurrection.test.ts": 3435,
+      "src/main/runtime/orca-runtime-module-size.test.ts": 31,
+      "src/main/runtime/orca-runtime-path-candidate-history.test.ts": 50,
+      "src/main/runtime/orca-runtime-process-incarnation-liveness.test.ts": 1851,
+      "src/main/runtime/orca-runtime-provider-reattach-launch-identity.test.ts": 3259,
+      "src/main/runtime/orca-runtime-skill-recovery.test.ts": 2176,
+      "src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts": 2913,
+      "src/main/runtime/orca-runtime-structured-claude-account-gate.test.ts": 2897,
+      "src/main/runtime/orca-runtime-structured-claude-gate-wiring.test.ts": 2908,
+      "src/main/runtime/orca-runtime-structured-native-chat-settings.test.ts": 2429,
+      "src/main/runtime/orca-runtime-structured-session-restore.test.ts": 3480,
+      "src/main/runtime/orca-runtime-structured-status-sink-wiring.test.ts": 2007,
+      "src/main/runtime/orca-runtime-tab-id-collision.test.ts": 3392,
+      "src/main/runtime/orca-runtime-tail-wait-memo.test.ts": 2831,
+      "src/main/runtime/orca-runtime-terminal-close-continuity.test.ts": 2299,
+      "src/main/runtime/orca-runtime-terminal-create-idempotency.test.ts": 3332,
+      "src/main/runtime/orca-runtime-terminal-cwd.test.ts": 3470,
+      "src/main/runtime/orca-runtime-terminal-handle-incarnation.test.ts": 2155,
+      "src/main/runtime/orca-runtime-terminal-rename-retention.test.ts": 2085,
+      "src/main/runtime/orca-runtime-terminal-retirement-host-partition.test.ts": 3504,
+      "src/main/runtime/orca-runtime-terminal-retirement.test.ts": 3035,
+      "src/main/runtime/orca-runtime-terminal-split-authority.test.ts": 4293,
+      "src/main/runtime/orca-runtime-test-fragment-coverage.test.ts": 54,
+      "src/main/runtime/orca-runtime-worktree-change-invalidation.test.ts": 3002,
+      "src/main/runtime/orca-runtime.test.ts": 20016,
+      "src/main/runtime/orchestration-cli-subprocess.test.ts": 4022,
+      "src/main/runtime/orchestration-codex-completion-title.test.ts": 4864,
+      "src/main/runtime/orchestration-codex-real-pty.integration.test.ts": 3073,
+      "src/main/runtime/orchestration-compatibility-authority.test.ts": 3514,
+      "src/main/runtime/orchestration-dispatch-mailbox-delivery.test.ts": 4228,
+      "src/main/runtime/orchestration-mailbox-cold-park-idle.test.ts": 4102,
+      "src/main/runtime/orchestration-mailbox-crash-recovery.test.ts": 3847,
+      "src/main/runtime/orchestration-mailbox-detached-routing.test.ts": 3792,
+      "src/main/runtime/orchestration-mailbox-filtered-waiters.test.ts": 2765,
+      "src/main/runtime/orchestration-mailbox-notification-consistency.test.ts": 15860,
+      "src/main/runtime/orchestration-mailbox-pointer-cli-command.test.ts": 3401,
+      "src/main/runtime/orchestration-mailbox-routing-races.test.ts": 4303,
+      "src/main/runtime/orchestration-mailbox-transport-settlement.test.ts": 3583,
+      "src/main/runtime/orchestration-message-delivery-identity.test.ts": 4561,
+      "src/main/runtime/orchestration-messages-fake-parity.test.ts": 237,
+      "src/main/runtime/orchestration-worker-workspace-resolution.test.ts": 3441,
+      "src/main/runtime/orchestration/cli-command.test.ts": 45,
+      "src/main/runtime/orchestration/coordinator-decision-gates.test.ts": 435,
+      "src/main/runtime/orchestration/coordinator-dispatch-unobserved-prompt.test.ts": 419,
+      "src/main/runtime/orchestration/coordinator-drift-probe-coalescing.test.ts": 503,
+      "src/main/runtime/orchestration/coordinator-escalation-triage.test.ts": 388,
+      "src/main/runtime/orchestration/coordinator-stale-base-flag.test.ts": 31,
+      "src/main/runtime/orchestration/coordinator-terminal-census-unavailable.test.ts": 245,
+      "src/main/runtime/orchestration/coordinator.test.ts": 3812,
+      "src/main/runtime/orchestration/db-empty-dispatch-shortcircuit.benchmark.test.ts": 355,
+      "src/main/runtime/orchestration/db-heartbeat-straggler-guard.test.ts": 433,
+      "src/main/runtime/orchestration/db-message-timestamp.test.ts": 322,
+      "src/main/runtime/orchestration/db-messages.test.ts": 277,
+      "src/main/runtime/orchestration/db-stopping-worker-task-guard.test.ts": 391,
+      "src/main/runtime/orchestration/db-task-create-readiness.test.ts": 412,
+      "src/main/runtime/orchestration/db-task-dispatch-invariant.test.ts": 954,
+      "src/main/runtime/orchestration/db-task-dispatch-lifecycle-guards.test.ts": 948,
+      "src/main/runtime/orchestration/db-task-dispatch-races.test.ts": 595,
+      "src/main/runtime/orchestration/db-undelivered-mailboxes.test.ts": 291,
+      "src/main/runtime/orchestration/db.test.ts": 1046,
+      "src/main/runtime/orchestration/db/attempt-outcome-projection.test.ts": 489,
+      "src/main/runtime/orchestration/db/decision-gate-lifecycle.test.ts": 216,
+      "src/main/runtime/orchestration/db/dispatch-context/dispatch-capability.test.ts": 405,
+      "src/main/runtime/orchestration/db/dispatch-depth.test.ts": 608,
+      "src/main/runtime/orchestration/db/dispatch-mailbox-consumer-fencing.test.ts": 367,
+      "src/main/runtime/orchestration/db/dispatch-row-writer-boundary.test.ts": 592,
+      "src/main/runtime/orchestration/db/federated-worker-report-outcome.test.ts": 45,
+      "src/main/runtime/orchestration/db/federation/federated-dispatch-observation-fence.test.ts": 275,
+      "src/main/runtime/orchestration/db/federation/remote-dispatch-attachment-release.test.ts": 382,
+      "src/main/runtime/orchestration/db/hot-path-statement-compilation.test.ts": 425,
+      "src/main/runtime/orchestration/db/legacy-question-identity.test.ts": 43,
+      "src/main/runtime/orchestration/db/lifecycle-rejection-marker.test.ts": 27,
+      "src/main/runtime/orchestration/db/lifecycle-transition-boundary.test.ts": 47,
+      "src/main/runtime/orchestration/db/lifecycle-transition.test.ts": 355,
+      "src/main/runtime/orchestration/db/messages/mailbox-consumer-lifecycle-fencing.test.ts": 732,
+      "src/main/runtime/orchestration/db/pane-key-match.test.ts": 33,
       "src/main/runtime/orchestration/db/row-column-lists.test.ts": 397,
-      "src/main/runtime/orchestration/db/run-list-cursor.test.ts": 43,
-      "src/main/runtime/orchestration/db/runs/run-coordinator-orca-session-binding.test.ts": 517,
-      "src/main/runtime/orchestration/db/schema/derived-delivery-migration.test.ts": 401,
-      "src/main/runtime/orchestration/db/schema/federated-home-run-migration.test.ts": 444,
-      "src/main/runtime/orchestration/db/schema/structured-pointer-schema-migration.test.ts": 339,
-      "src/main/runtime/orchestration/db/schema/structured-worker-orca-session-backfill.test.ts": 459,
-      "src/main/runtime/orchestration/db/worker-dispatch/worker-dispatch-assignee-orca-session.test.ts": 346,
-      "src/main/runtime/orchestration/db/writer-run-required.test.ts": 422,
-      "src/main/runtime/orchestration/dispatch-consumer-generation-migration.test.ts": 479,
-      "src/main/runtime/orchestration/dispatch-creator-identity-migration.test.ts": 501,
-      "src/main/runtime/orchestration/dispatch-failure-idempotency.test.ts": 413,
-      "src/main/runtime/orchestration/federation-ack-checkpoints.test.ts": 37,
-      "src/main/runtime/orchestration/federation-acknowledgment-integrity.test.ts": 428,
-      "src/main/runtime/orchestration/federation-acknowledgment-migration.test.ts": 397,
-      "src/main/runtime/orchestration/federation-lifecycle-settlement.test.ts": 84,
-      "src/main/runtime/orchestration/federation-sync.test.ts": 3029,
-      "src/main/runtime/orchestration/federation-terminal-recovery.test.ts": 3802,
-      "src/main/runtime/orchestration/formatter.test.ts": 48,
-      "src/main/runtime/orchestration/groups.test.ts": 62,
-      "src/main/runtime/orchestration/lifecycle-caller-edges.test.ts": 356,
-      "src/main/runtime/orchestration/lifecycle-reconciliation.test.ts": 784,
-      "src/main/runtime/orchestration/lightweight-run-worker-exit-escalation.test.ts": 3294,
-      "src/main/runtime/orchestration/mailbox-pointer-eligibility.test.ts": 349,
-      "src/main/runtime/orchestration/mailbox-pointer-release-query.test.ts": 390,
-      "src/main/runtime/orchestration/mailbox-pointer-stage.test.ts": 517,
-      "src/main/runtime/orchestration/mailbox-pointer-submit.test.ts": 826,
-      "src/main/runtime/orchestration/message-batch-atomicity.test.ts": 492,
-      "src/main/runtime/orchestration/mutation-receipt-capacity.test.ts": 571,
-      "src/main/runtime/orchestration/nested-worker-depth-migration.test.ts": 593,
-      "src/main/runtime/orchestration/orchestration-adopted-run-binding.test.ts": 968,
-      "src/main/runtime/orchestration/orchestration-all-start-versions-migration.test.ts": 2260,
-      "src/main/runtime/orchestration/orchestration-creator-authority-performance.test.ts": 579,
-      "src/main/runtime/orchestration/orchestration-db-permissions.test.ts": 267,
-      "src/main/runtime/orchestration/orchestration-db-retention-pagination.test.ts": 551,
-      "src/main/runtime/orchestration/orchestration-delivery-consumption.test.ts": 499,
-      "src/main/runtime/orchestration/orchestration-derived-delivery.test.ts": 375,
-      "src/main/runtime/orchestration/orchestration-federated-legacy-probe.test.ts": 639,
-      "src/main/runtime/orchestration/orchestration-legacy-coordinator-authority-db.test.ts": 725,
-      "src/main/runtime/orchestration/orchestration-legacy-question-migration-db.test.ts": 742,
-      "src/main/runtime/orchestration/orchestration-legacy-storage-db.test.ts": 1391,
-      "src/main/runtime/orchestration/orchestration-legacy-worker-terminal-recovery.test.ts": 216,
-      "src/main/runtime/orchestration/orchestration-mutation-question-db.test.ts": 333,
-      "src/main/runtime/orchestration/orchestration-orca-session-column-migration.test.ts": 854,
-      "src/main/runtime/orchestration/orchestration-peer-capability-cache.test.ts": 221,
-      "src/main/runtime/orchestration/orchestration-reset-db.test.ts": 394,
-      "src/main/runtime/orchestration/orchestration-run-delivery-db.test.ts": 552,
-      "src/main/runtime/orchestration/orchestration-run-list-compatibility.test.ts": 317,
-      "src/main/runtime/orchestration/orchestration-version-skew-migration.test.ts": 884,
-      "src/main/runtime/orchestration/orchestration-worker-dispatch-db.test.ts": 444,
-      "src/main/runtime/orchestration/preamble.test.ts": 233,
-      "src/main/runtime/orchestration/r1-identity-migration.test.ts": 459,
-      "src/main/runtime/orchestration/run-coordinator-handle-migration.test.ts": 395,
-      "src/main/runtime/orchestration/run-coordinator-orca-session-address.test.ts": 430,
-      "src/main/runtime/orchestration/settled-question-threads-migration.test.ts": 354,
-      "src/main/runtime/orchestration/setup-completion-signal.test.ts": 41,
-      "src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts": 377,
-      "src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts": 210,
-      "src/main/runtime/orchestration/structured-pointer-operation-id.test.ts": 62,
-      "src/main/runtime/orchestration/structured-session-pointer-delivery.test.ts": 75,
-      "src/main/runtime/orchestration/structured-worker-direct-mailbox-target.test.ts": 3354,
-      "src/main/runtime/orchestration/structured-worker-group-addressing.test.ts": 397,
-      "src/main/runtime/orchestration/structured-worker-journal-archive.test.ts": 110,
-      "src/main/runtime/orchestration/task-deps-flag.test.ts": 58,
-      "src/main/runtime/orchestration/worker-attention-context.test.ts": 55,
-      "src/main/runtime/orchestration/worker-output-archive-bounding.test.ts": 368,
-      "src/main/runtime/orchestration/worker-output-archive.test.ts": 400,
-      "src/main/runtime/orchestration/worker-output-cursor.test.ts": 46,
-      "src/main/runtime/orchestration/worker-provider-session.test.ts": 52,
-      "src/main/runtime/orchestration/worker-start-unobserved-prompt-settlement.test.ts": 392,
-      "src/main/runtime/orchestration/worker-transcript-payload.test.ts": 73,
-      "src/main/runtime/orchestration/worker-transcript-read.test.ts": 193,
-      "src/main/runtime/orchestration/worker-transcript-remote-read.test.ts": 224,
-      "src/main/runtime/paired-close-retirement-proof-publication-order.test.ts": 3325,
-      "src/main/runtime/pairing-endpoint.test.ts": 103,
-      "src/main/runtime/proven-absent-leaf-pty-verdicts.test.ts": 25,
-      "src/main/runtime/pty-exit-agent-status-reconciliation.test.ts": 3295,
-      "src/main/runtime/pty-exit-per-pty-map-reaper-ratchet.test.ts": 3232,
-      "src/main/runtime/pty-inventory-lifecycle-admission.test.ts": 3437,
-      "src/main/runtime/pty-inventory-lifecycle-scope.test.ts": 3333,
-      "src/main/runtime/pty-inventory-liveness-verdict.test.ts": 3344,
-      "src/main/runtime/pty-inventory-partial-relay-liveness.test.ts": 2541,
-      "src/main/runtime/pty-recorded-surface-topology.test.ts": 41,
-      "src/main/runtime/pty-shell-ownership-mirror.test.ts": 1560,
-      "src/main/runtime/pty-transcript-prune-wait-cache.test.ts": 3387,
-      "src/main/runtime/pty-waiver-source-invariant.test.ts": 49,
-      "src/main/runtime/public-ssh-state.test.ts": 45,
-      "src/main/runtime/push/desktop-push-service-unreadable-outbox.test.ts": 321,
-      "src/main/runtime/push/desktop-push-service.test.ts": 328,
-      "src/main/runtime/push/push-agent-state.test.ts": 60,
-      "src/main/runtime/push/push-cleanup-auth-expiry.test.ts": 222,
-      "src/main/runtime/push/push-delivery-policy.test.ts": 63,
-      "src/main/runtime/push/push-device-registration-persistence.test.ts": 91,
-      "src/main/runtime/push/push-dispatcher.test.ts": 54,
-      "src/main/runtime/push/push-gateway-client.test.ts": 381,
-      "src/main/runtime/push/push-gateway-session.test.ts": 313,
-      "src/main/runtime/push/push-host-proof-vector.test.ts": 71,
-      "src/main/runtime/push/push-host-proof.test.ts": 137,
-      "src/main/runtime/push/push-outcome-counters.test.ts": 48,
-      "src/main/runtime/push/push-policy-pipeline.integration.test.ts": 198,
-      "src/main/runtime/push/push-preferences.test.ts": 78,
-      "src/main/runtime/push/push-registration-races.test.ts": 322,
-      "src/main/runtime/push/push-registration-rpc.test.ts": 3893,
-      "src/main/runtime/push/push-unpair-persistence.test.ts": 3480,
-      "src/main/runtime/push/push-unregister-outbox.test.ts": 101,
-      "src/main/runtime/quarter-circle-title-send-authorization.test.ts": 19357,
-      "src/main/runtime/queued-terminal-graph-exit.test.ts": 2693,
-      "src/main/runtime/recent-pty-output-buffer.test.ts": 132,
-      "src/main/runtime/recent-pty-output-retention.test.ts": 96,
-      "src/main/runtime/relay/desktop-relay-service-broker-liveness.test.ts": 245,
-      "src/main/runtime/relay/desktop-relay-service.test.ts": 472,
-      "src/main/runtime/relay/mobile-relay-e2ee.integration.test.ts": 461,
-      "src/main/runtime/relay/relay-auth-coordinator-recovery.test.ts": 209,
-      "src/main/runtime/relay/relay-auth-coordinator.test.ts": 1313,
+      "src/main/runtime/orchestration/db/run-list-cursor.test.ts": 30,
+      "src/main/runtime/orchestration/db/runs/run-coordinator-orca-session-binding.test.ts": 408,
+      "src/main/runtime/orchestration/db/schema/derived-delivery-migration.test.ts": 669,
+      "src/main/runtime/orchestration/db/schema/federated-home-run-migration.test.ts": 348,
+      "src/main/runtime/orchestration/db/schema/structured-pointer-schema-migration.test.ts": 440,
+      "src/main/runtime/orchestration/db/schema/structured-worker-orca-session-backfill.test.ts": 361,
+      "src/main/runtime/orchestration/db/worker-dispatch/worker-dispatch-assignee-orca-session.test.ts": 261,
+      "src/main/runtime/orchestration/db/writer-run-required.test.ts": 365,
+      "src/main/runtime/orchestration/dispatch-consumer-generation-migration.test.ts": 498,
+      "src/main/runtime/orchestration/dispatch-creator-identity-migration.test.ts": 480,
+      "src/main/runtime/orchestration/dispatch-failure-idempotency.test.ts": 434,
+      "src/main/runtime/orchestration/federation-ack-checkpoints.test.ts": 33,
+      "src/main/runtime/orchestration/federation-acknowledgment-integrity.test.ts": 277,
+      "src/main/runtime/orchestration/federation-acknowledgment-migration.test.ts": 373,
+      "src/main/runtime/orchestration/federation-lifecycle-settlement.test.ts": 23,
+      "src/main/runtime/orchestration/federation-sync.test.ts": 2820,
+      "src/main/runtime/orchestration/federation-terminal-recovery.test.ts": 3474,
+      "src/main/runtime/orchestration/formatter.test.ts": 61,
+      "src/main/runtime/orchestration/groups.test.ts": 42,
+      "src/main/runtime/orchestration/lifecycle-caller-edges.test.ts": 352,
+      "src/main/runtime/orchestration/lifecycle-reconciliation.test.ts": 786,
+      "src/main/runtime/orchestration/lightweight-run-worker-exit-escalation.test.ts": 3611,
+      "src/main/runtime/orchestration/mailbox-pointer-eligibility.test.ts": 343,
+      "src/main/runtime/orchestration/mailbox-pointer-release-query.test.ts": 339,
+      "src/main/runtime/orchestration/mailbox-pointer-stage.test.ts": 504,
+      "src/main/runtime/orchestration/mailbox-pointer-submit.test.ts": 696,
+      "src/main/runtime/orchestration/message-batch-atomicity.test.ts": 395,
+      "src/main/runtime/orchestration/mutation-receipt-capacity.test.ts": 400,
+      "src/main/runtime/orchestration/nested-worker-depth-migration.test.ts": 579,
+      "src/main/runtime/orchestration/orchestration-adopted-run-binding.test.ts": 1024,
+      "src/main/runtime/orchestration/orchestration-all-start-versions-migration.test.ts": 1741,
+      "src/main/runtime/orchestration/orchestration-creator-authority-performance.test.ts": 1165,
+      "src/main/runtime/orchestration/orchestration-db-permissions.test.ts": 240,
+      "src/main/runtime/orchestration/orchestration-db-retention-pagination.test.ts": 706,
+      "src/main/runtime/orchestration/orchestration-delivery-consumption.test.ts": 464,
+      "src/main/runtime/orchestration/orchestration-derived-delivery.test.ts": 327,
+      "src/main/runtime/orchestration/orchestration-federated-legacy-probe.test.ts": 500,
+      "src/main/runtime/orchestration/orchestration-legacy-coordinator-authority-db.test.ts": 712,
+      "src/main/runtime/orchestration/orchestration-legacy-question-migration-db.test.ts": 751,
+      "src/main/runtime/orchestration/orchestration-legacy-storage-db.test.ts": 1661,
+      "src/main/runtime/orchestration/orchestration-legacy-worker-terminal-recovery.test.ts": 192,
+      "src/main/runtime/orchestration/orchestration-mutation-question-db.test.ts": 289,
+      "src/main/runtime/orchestration/orchestration-orca-session-column-migration.test.ts": 641,
+      "src/main/runtime/orchestration/orchestration-peer-capability-cache.test.ts": 74,
+      "src/main/runtime/orchestration/orchestration-reset-db.test.ts": 323,
+      "src/main/runtime/orchestration/orchestration-run-delivery-db.test.ts": 532,
+      "src/main/runtime/orchestration/orchestration-run-list-compatibility.test.ts": 364,
+      "src/main/runtime/orchestration/orchestration-version-skew-migration.test.ts": 1040,
+      "src/main/runtime/orchestration/orchestration-worker-dispatch-db.test.ts": 712,
+      "src/main/runtime/orchestration/preamble.test.ts": 144,
+      "src/main/runtime/orchestration/r1-identity-migration.test.ts": 407,
+      "src/main/runtime/orchestration/run-coordinator-handle-migration.test.ts": 520,
+      "src/main/runtime/orchestration/run-coordinator-orca-session-address.test.ts": 557,
+      "src/main/runtime/orchestration/settled-question-threads-migration.test.ts": 297,
+      "src/main/runtime/orchestration/setup-completion-signal.test.ts": 28,
+      "src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts": 431,
+      "src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts": 224,
+      "src/main/runtime/orchestration/structured-pointer-operation-id.test.ts": 84,
+      "src/main/runtime/orchestration/structured-session-pointer-delivery.test.ts": 73,
+      "src/main/runtime/orchestration/structured-worker-direct-mailbox-target.test.ts": 3260,
+      "src/main/runtime/orchestration/structured-worker-group-addressing.test.ts": 337,
+      "src/main/runtime/orchestration/structured-worker-journal-archive.test.ts": 91,
+      "src/main/runtime/orchestration/task-deps-flag.test.ts": 84,
+      "src/main/runtime/orchestration/worker-attention-context.test.ts": 58,
+      "src/main/runtime/orchestration/worker-output-archive-bounding.test.ts": 460,
+      "src/main/runtime/orchestration/worker-output-archive.test.ts": 386,
+      "src/main/runtime/orchestration/worker-output-cursor.test.ts": 65,
+      "src/main/runtime/orchestration/worker-provider-session.test.ts": 60,
+      "src/main/runtime/orchestration/worker-start-unobserved-prompt-settlement.test.ts": 394,
+      "src/main/runtime/orchestration/worker-transcript-payload.test.ts": 83,
+      "src/main/runtime/orchestration/worker-transcript-read.test.ts": 267,
+      "src/main/runtime/orchestration/worker-transcript-remote-read.test.ts": 201,
+      "src/main/runtime/paired-close-retirement-proof-publication-order.test.ts": 3296,
+      "src/main/runtime/pairing-endpoint.test.ts": 170,
+      "src/main/runtime/proven-absent-leaf-pty-verdicts.test.ts": 34,
+      "src/main/runtime/pty-exit-agent-status-reconciliation.test.ts": 3395,
+      "src/main/runtime/pty-exit-per-pty-map-reaper-ratchet.test.ts": 3330,
+      "src/main/runtime/pty-inventory-lifecycle-admission.test.ts": 2868,
+      "src/main/runtime/pty-inventory-lifecycle-scope.test.ts": 2608,
+      "src/main/runtime/pty-inventory-liveness-verdict.test.ts": 3469,
+      "src/main/runtime/pty-inventory-partial-relay-liveness.test.ts": 3435,
+      "src/main/runtime/pty-recorded-surface-topology.test.ts": 46,
+      "src/main/runtime/pty-shell-ownership-mirror.test.ts": 1555,
+      "src/main/runtime/pty-transcript-prune-wait-cache.test.ts": 3233,
+      "src/main/runtime/pty-waiver-source-invariant.test.ts": 50,
+      "src/main/runtime/public-ssh-state.test.ts": 27,
+      "src/main/runtime/push/desktop-push-service-unreadable-outbox.test.ts": 223,
+      "src/main/runtime/push/desktop-push-service.test.ts": 391,
+      "src/main/runtime/push/push-agent-state.test.ts": 54,
+      "src/main/runtime/push/push-cleanup-auth-expiry.test.ts": 219,
+      "src/main/runtime/push/push-delivery-policy.test.ts": 47,
+      "src/main/runtime/push/push-device-registration-persistence.test.ts": 85,
+      "src/main/runtime/push/push-dispatcher.test.ts": 73,
+      "src/main/runtime/push/push-gateway-client.test.ts": 230,
+      "src/main/runtime/push/push-gateway-session.test.ts": 312,
+      "src/main/runtime/push/push-host-proof-vector.test.ts": 84,
+      "src/main/runtime/push/push-host-proof.test.ts": 142,
+      "src/main/runtime/push/push-outcome-counters.test.ts": 34,
+      "src/main/runtime/push/push-policy-pipeline.integration.test.ts": 226,
+      "src/main/runtime/push/push-preferences.test.ts": 59,
+      "src/main/runtime/push/push-registration-races.test.ts": 320,
+      "src/main/runtime/push/push-registration-rpc.test.ts": 2997,
+      "src/main/runtime/push/push-unpair-persistence.test.ts": 4171,
+      "src/main/runtime/push/push-unregister-outbox.test.ts": 83,
+      "src/main/runtime/quarter-circle-title-send-authorization.test.ts": 19888,
+      "src/main/runtime/queued-terminal-graph-exit.test.ts": 3355,
+      "src/main/runtime/recent-pty-output-buffer.test.ts": 118,
+      "src/main/runtime/recent-pty-output-retention.test.ts": 101,
+      "src/main/runtime/relay/desktop-relay-service-broker-liveness.test.ts": 215,
+      "src/main/runtime/relay/desktop-relay-service.test.ts": 667,
+      "src/main/runtime/relay/mobile-relay-e2ee.integration.test.ts": 281,
+      "src/main/runtime/relay/relay-auth-coordinator-recovery.test.ts": 166,
+      "src/main/runtime/relay/relay-auth-coordinator.test.ts": 1240,
       "src/main/runtime/relay/relay-auth-host-close-reason.test.ts": 184,
-      "src/main/runtime/relay/relay-control-client.test.ts": 697,
-      "src/main/runtime/relay/relay-control-close-reason.test.ts": 231,
-      "src/main/runtime/relay/relay-control-origin.test.ts": 204,
-      "src/main/runtime/relay/relay-control-request-retirement.test.ts": 165,
-      "src/main/runtime/relay/relay-control-timeout-classification.test.ts": 154,
-      "src/main/runtime/relay/relay-demand-ledger.test.ts": 99,
-      "src/main/runtime/relay/relay-host-proof.test.ts": 121,
-      "src/main/runtime/relay/relay-http-client.test.ts": 336,
+      "src/main/runtime/relay/relay-control-client.test.ts": 602,
+      "src/main/runtime/relay/relay-control-close-reason.test.ts": 293,
+      "src/main/runtime/relay/relay-control-origin.test.ts": 138,
+      "src/main/runtime/relay/relay-control-request-retirement.test.ts": 160,
+      "src/main/runtime/relay/relay-control-timeout-classification.test.ts": 159,
+      "src/main/runtime/relay/relay-demand-ledger.test.ts": 100,
+      "src/main/runtime/relay/relay-host-proof.test.ts": 131,
+      "src/main/runtime/relay/relay-http-client.test.ts": 341,
       "src/main/runtime/relay/relay-region-correction.test.ts": 297,
-      "src/main/runtime/relay/relay-region-preference.test.ts": 384,
-      "src/main/runtime/relay/relay-region-probe-log.test.ts": 269,
-      "src/main/runtime/relay/relay-region-refresh.test.ts": 189,
-      "src/main/runtime/relay/relay-renewal-jitter.test.ts": 531,
-      "src/main/runtime/relay/relay-revoke-outbox.test.ts": 70,
-      "src/main/runtime/relay/relay-session-broker.test.ts": 739,
-      "src/main/runtime/remote-agent-session-host-authority.integration.test.ts": 5136,
-      "src/main/runtime/remote-browser-screencast-frame-admission.test.ts": 442,
-      "src/main/runtime/remote-desktop-driver.test.ts": 3760,
-      "src/main/runtime/remote-runtime-close-intent.integration.test.ts": 2279,
-      "src/main/runtime/remote-runtime-request-connection.integration.test.ts": 2323,
-      "src/main/runtime/remote-server-updater.test.ts": 54,
-      "src/main/runtime/renderer-browser-session-reconciliation.test.ts": 2927,
-      "src/main/runtime/repo-icon-fork-backfill.test.ts": 3345,
-      "src/main/runtime/repo-worktree-admin-fingerprint.test.ts": 874,
-      "src/main/runtime/repo-worktree-resolution-scan.test.ts": 49,
-      "src/main/runtime/repo-worktree-row-resolution.test.ts": 118,
-      "src/main/runtime/retained-tail-redraw-window.equivalence.test.ts": 4402,
-      "src/main/runtime/rpc/core-typed-method-contract.test.ts": 112,
-      "src/main/runtime/rpc/dispatcher-browser-client-automation.test.ts": 1592,
-      "src/main/runtime/rpc/dispatcher-computer-errors.test.ts": 1427,
-      "src/main/runtime/rpc/dispatcher-feature-interactions.test.ts": 1502,
-      "src/main/runtime/rpc/dispatcher-request-parsing.test.ts": 157,
-      "src/main/runtime/rpc/e2ee-channel-text-backpressure.test.ts": 179,
-      "src/main/runtime/rpc/e2ee-channel-v2.test.ts": 473,
-      "src/main/runtime/rpc/e2ee-channel.test.ts": 500,
-      "src/main/runtime/rpc/e2ee-crypto.test.ts": 134,
-      "src/main/runtime/rpc/e2ee-integration.test.ts": 319,
-      "src/main/runtime/rpc/errors.test.ts": 184,
-      "src/main/runtime/rpc/methods/accounts.test.ts": 131,
-      "src/main/runtime/rpc/methods/agent-hooks.test.ts": 152,
-      "src/main/runtime/rpc/methods/agent-launch-floating-workspace.test.ts": 3175,
-      "src/main/runtime/rpc/methods/agent-launch-pane-reservation.test.ts": 2127,
-      "src/main/runtime/rpc/methods/agent-launch-replay.test.ts": 3019,
-      "src/main/runtime/rpc/methods/agent-launch-session-reservation.test.ts": 1774,
-      "src/main/runtime/rpc/methods/agent-launch-structured-prompt.test.ts": 76,
-      "src/main/runtime/rpc/methods/agent-launch-terminal-identity.test.ts": 501,
-      "src/main/runtime/rpc/methods/agent-launch-terminal-preferences.test.ts": 451,
-      "src/main/runtime/rpc/methods/agent-launch-terminal-prompt.test.ts": 52,
-      "src/main/runtime/rpc/methods/agent-launch.test.ts": 580,
-      "src/main/runtime/rpc/methods/agent-session.test.ts": 1674,
-      "src/main/runtime/rpc/methods/agent-skill-sharing-capability-grant.test.ts": 3372,
-      "src/main/runtime/rpc/methods/ai-vault-search.test.ts": 4036,
-      "src/main/runtime/rpc/methods/ai-vault.test.ts": 2544,
-      "src/main/runtime/rpc/methods/artifact-sharing-capability-grant.test.ts": 3431,
-      "src/main/runtime/rpc/methods/artifacts.test.ts": 591,
-      "src/main/runtime/rpc/methods/automation-scoped-list-methods.test.ts": 1826,
-      "src/main/runtime/rpc/methods/automations.test.ts": 1385,
-      "src/main/runtime/rpc/methods/browser-client-host-attach-adoption.test.ts": 2131,
-      "src/main/runtime/rpc/methods/browser-client-host-reconciliation.test.ts": 1712,
-      "src/main/runtime/rpc/methods/browser-client-host.test.ts": 1923,
-      "src/main/runtime/rpc/methods/browser-client-page-metadata.test.ts": 2073,
-      "src/main/runtime/rpc/methods/browser-identity-rpc.test.ts": 2007,
-      "src/main/runtime/rpc/methods/browser-network-tunnel.test.ts": 2454,
-      "src/main/runtime/rpc/methods/browser-tab-create-schema.test.ts": 111,
-      "src/main/runtime/rpc/methods/browser.test.ts": 1601,
-      "src/main/runtime/rpc/methods/client-events.test.ts": 1982,
-      "src/main/runtime/rpc/methods/client-native-chat-settings.test.ts": 2058,
-      "src/main/runtime/rpc/methods/client-ui-pairing-local-fields.test.ts": 1605,
-      "src/main/runtime/rpc/methods/client-ui-task-resume-state.test.ts": 1962,
-      "src/main/runtime/rpc/methods/client-ui.test.ts": 1864,
-      "src/main/runtime/rpc/methods/clipboard.test.ts": 2325,
-      "src/main/runtime/rpc/methods/computer-actions.test.ts": 131,
-      "src/main/runtime/rpc/methods/computer.test.ts": 210,
-      "src/main/runtime/rpc/methods/diagnostics.test.ts": 2030,
-      "src/main/runtime/rpc/methods/file-watch-event-batcher.test.ts": 49,
-      "src/main/runtime/rpc/methods/files-base64-padding.test.ts": 1884,
-      "src/main/runtime/rpc/methods/files-doc-preview.test.ts": 1602,
-      "src/main/runtime/rpc/methods/files-list-all-page-size.test.ts": 1941,
-      "src/main/runtime/rpc/methods/files-path-search.test.ts": 2137,
-      "src/main/runtime/rpc/methods/files-preview-transport-budget.test.ts": 1907,
-      "src/main/runtime/rpc/methods/files-terminal-path-resolution.test.ts": 2029,
-      "src/main/runtime/rpc/methods/files-watch-cancellation.test.ts": 1444,
-      "src/main/runtime/rpc/methods/files-watch-cleanup.test.ts": 1936,
-      "src/main/runtime/rpc/methods/files.test.ts": 2225,
-      "src/main/runtime/rpc/methods/git-diff-transport-budget.test.ts": 2212,
-      "src/main/runtime/rpc/methods/git.test.ts": 1553,
-      "src/main/runtime/rpc/methods/github-pr-refresh-reason.test.ts": 1822,
-      "src/main/runtime/rpc/methods/github.test.ts": 2466,
-      "src/main/runtime/rpc/methods/gitlab.test.ts": 2109,
-      "src/main/runtime/rpc/methods/host-capabilities.test.ts": 1932,
-      "src/main/runtime/rpc/methods/hosted-review.test.ts": 2060,
-      "src/main/runtime/rpc/methods/jira.test.ts": 2032,
-      "src/main/runtime/rpc/methods/linear-agent-access.test.ts": 4117,
-      "src/main/runtime/rpc/methods/linear-agent-project-access.test.ts": 4244,
-      "src/main/runtime/rpc/methods/linear.test.ts": 1890,
-      "src/main/runtime/rpc/methods/mobile-web-bundle-range.test.ts": 2135,
-      "src/main/runtime/rpc/methods/mobile-web-bundle-read-concurrency.test.ts": 1889,
-      "src/main/runtime/rpc/methods/mobile-web-bundle-window-refusals.test.ts": 2281,
-      "src/main/runtime/rpc/methods/mobile-web-bundle.test.ts": 1653,
-      "src/main/runtime/rpc/methods/native-chat-rpc-block-sanitize.test.ts": 70,
-      "src/main/runtime/rpc/methods/native-chat.test.ts": 191,
-      "src/main/runtime/rpc/methods/notification-preferences.test.ts": 342,
-      "src/main/runtime/rpc/methods/notification-reconnect-cooldown.test.ts": 199,
-      "src/main/runtime/rpc/methods/orchestration-dispatch-error-codes.test.ts": 4268,
-      "src/main/runtime/rpc/methods/orchestration-structured-worker-abandon.test.ts": 3299,
-      "src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.test.ts": 243,
-      "src/main/runtime/rpc/methods/orchestration-structured-worker-redrive.test.ts": 2547,
-      "src/main/runtime/rpc/methods/orchestration-structured-worker-session.test.ts": 283,
-      "src/main/runtime/rpc/methods/orchestration-structured-worker-start-failure.test.ts": 311,
-      "src/main/runtime/rpc/methods/orchestration-worker-mode-opacity.test.ts": 3402,
-      "src/main/runtime/rpc/methods/orchestration-worker-start-mode-selection.test.ts": 3653,
-      "src/main/runtime/rpc/methods/orchestration-worker-start-mode.test.ts": 168,
-      "src/main/runtime/rpc/methods/orchestration-worker-start-receipt-wording.test.ts": 178,
-      "src/main/runtime/rpc/methods/orchestration-worker-support-unknown.test.ts": 136,
-      "src/main/runtime/rpc/methods/orchestration/cli-runtime-boundary.test.ts": 3575,
-      "src/main/runtime/rpc/methods/orchestration/federation/federated-attach-receipt.test.ts": 58,
-      "src/main/runtime/rpc/methods/orchestration/federation/federated-fleet-snapshot.test.ts": 414,
-      "src/main/runtime/rpc/methods/orchestration/federation/federated-message-targeting.test.ts": 3885,
-      "src/main/runtime/rpc/methods/orchestration/federation/federated-release-safety.test.ts": 3157,
-      "src/main/runtime/rpc/methods/orchestration/federation/federated-transport-safety.test.ts": 3091,
-      "src/main/runtime/rpc/methods/orchestration/federation/federated-worker-start-receipt.test.ts": 3184,
-      "src/main/runtime/rpc/methods/orchestration/federation/federation-agent-launch.test.ts": 3330,
-      "src/main/runtime/rpc/methods/orchestration/federation/federation-control-mail.test.ts": 4369,
-      "src/main/runtime/rpc/methods/orchestration/federation/federation-effects.test.ts": 43,
-      "src/main/runtime/rpc/methods/orchestration/federation/federation-folder-placement.test.ts": 3443,
-      "src/main/runtime/rpc/methods/orchestration/federation/federation-lifecycle-settlement.test.ts": 8889,
-      "src/main/runtime/rpc/methods/orchestration/federation/federation-liveness-verdict.test.ts": 3743,
-      "src/main/runtime/rpc/methods/orchestration/federation/federation-output.test.ts": 9222,
-      "src/main/runtime/rpc/methods/orchestration/federation/federation-setup.test.ts": 3790,
-      "src/main/runtime/rpc/methods/orchestration/federation/federation-start-prompt-budget.test.ts": 3494,
-      "src/main/runtime/rpc/methods/orchestration/federation/federation-start-schema.test.ts": 121,
-      "src/main/runtime/rpc/methods/orchestration/federation/federation.test.ts": 4949,
-      "src/main/runtime/rpc/methods/orchestration/gates/gate-run-authorization.test.ts": 4379,
-      "src/main/runtime/rpc/methods/orchestration/gates/gates.test.ts": 3470,
-      "src/main/runtime/rpc/methods/orchestration/messaging/ask.test.ts": 3567,
-      "src/main/runtime/rpc/methods/orchestration/messaging/check-delivery-history.test.ts": 3048,
-      "src/main/runtime/rpc/methods/orchestration/messaging/check-superseded-terminal.test.ts": 2456,
-      "src/main/runtime/rpc/methods/orchestration/messaging/check-worker-consumer-fencing.test.ts": 3336,
-      "src/main/runtime/rpc/methods/orchestration/messaging/check-worker-federated-attachment.test.ts": 3702,
-      "src/main/runtime/rpc/methods/orchestration/messaging/check.test.ts": 3450,
-      "src/main/runtime/rpc/methods/orchestration/messaging/recipient-routing.test.ts": 3867,
-      "src/main/runtime/rpc/methods/orchestration/messaging/send-dispatch-authority.test.ts": 3368,
-      "src/main/runtime/rpc/methods/orchestration/messaging/send-group.test.ts": 4109,
-      "src/main/runtime/rpc/methods/orchestration/messaging/send-invalid-type.test.ts": 3712,
-      "src/main/runtime/rpc/methods/orchestration/messaging/send-receipt-plumbing.test.ts": 3171,
-      "src/main/runtime/rpc/methods/orchestration/messaging/send-unbound-terminals.test.ts": 2727,
-      "src/main/runtime/rpc/methods/orchestration/messaging/send.test.ts": 6696,
-      "src/main/runtime/rpc/methods/orchestration/messaging/settled-dispatch-mail.test.ts": 2403,
-      "src/main/runtime/rpc/methods/orchestration/runs/migration-behavior.test.ts": 3878,
-      "src/main/runtime/rpc/methods/orchestration/runs/run-receipt.test.ts": 119,
-      "src/main/runtime/rpc/methods/orchestration/runs/runs.test.ts": 4613,
-      "src/main/runtime/rpc/methods/orchestration/runs/tasks-dispatch.test.ts": 3906,
-      "src/main/runtime/rpc/methods/orchestration/worker/agent-status-producer-census.test.ts": 4819,
-      "src/main/runtime/rpc/methods/orchestration/worker/antigravity-worker-lifecycle.test.ts": 3464,
-      "src/main/runtime/rpc/methods/orchestration/worker/composed-workers.test.ts": 3675,
-      "src/main/runtime/rpc/methods/orchestration/worker/context-only-dispatch-retry.test.ts": 3479,
-      "src/main/runtime/rpc/methods/orchestration/worker/fleet-status-observed-identity.test.ts": 3158,
-      "src/main/runtime/rpc/methods/orchestration/worker/fleet-status-terminal-identity.test.ts": 2442,
-      "src/main/runtime/rpc/methods/orchestration/worker/legacy-dispatch-projection.test.ts": 3114,
-      "src/main/runtime/rpc/methods/orchestration/worker/manual-dispatch-observation.test.ts": 3508,
-      "src/main/runtime/rpc/methods/orchestration/worker/manual-dispatch-release.test.ts": 2131,
-      "src/main/runtime/rpc/methods/orchestration/worker/self-dispatch-nesting-depth.test.ts": 3419,
-      "src/main/runtime/rpc/methods/orchestration/worker/structured-worker-launch-seed-options.test.ts": 252,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-interactive-wait.test.ts": 3615,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-launch-preferences.test.ts": 189,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-list-pagination.test.ts": 3163,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-list-run-scope-rpc.test.ts": 2704,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-observation.test.ts": 321,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-output.test.ts": 223,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-read-projection.test.ts": 2831,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-release-archive.test.ts": 3708,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-release-inventory.test.ts": 2839,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-release-liveness-verdict.test.ts": 356,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-release-mobile-report.test.ts": 2577,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-release-ownership-guard.test.ts": 3289,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-release-recovery.test.ts": 4158,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-release.test.ts": 4075,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-start-budgets.test.ts": 39,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-start-outcome-classification.test.ts": 382,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-start-prompt-budget.test.ts": 156,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-start-prompt-contract.test.ts": 4498,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-start-terminal-target.test.ts": 3406,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-start-turn-observation.test.ts": 52,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-stop-capability.test.ts": 396,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-stop-exit-race.test.ts": 4306,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-stop-liveness-verdict.test.ts": 3463,
-      "src/main/runtime/rpc/methods/orchestration/worker/worker-terminal-custody-at-creation.test.ts": 3042,
-      "src/main/runtime/rpc/methods/orchestration/worker/workers-new-worktree.test.ts": 4466,
-      "src/main/runtime/rpc/methods/orchestration/worker/workers-recovery.test.ts": 2500,
-      "src/main/runtime/rpc/methods/paired-caller-host-id.test.ts": 47,
-      "src/main/runtime/rpc/methods/pairing.test.ts": 3875,
-      "src/main/runtime/rpc/methods/plugins.test.ts": 322,
-      "src/main/runtime/rpc/methods/preflight.test.ts": 1947,
-      "src/main/runtime/rpc/methods/project-host-setup-self-host-stamp.test.ts": 127,
-      "src/main/runtime/rpc/methods/repo-badge-color.test.ts": 1463,
-      "src/main/runtime/rpc/methods/repo.test.ts": 4074,
-      "src/main/runtime/rpc/methods/runtime-client-capabilities.test.ts": 2093,
-      "src/main/runtime/rpc/methods/session-tab-agent-capability-mutations.test.ts": 1572,
-      "src/main/runtime/rpc/methods/session-tab-agent-status-projection.test.ts": 53,
-      "src/main/runtime/rpc/methods/session-tab-browser-placement-mutations.test.ts": 1972,
-      "src/main/runtime/rpc/methods/session-tab-browser-placement-projection.test.ts": 60,
-      "src/main/runtime/rpc/methods/session-tabs-inventory-census-race.test.ts": 3422,
-      "src/main/runtime/rpc/methods/session-tabs-inventory-rpc.test.ts": 4083,
-      "src/main/runtime/rpc/methods/session-tabs-move-validation.test.ts": 3102,
-      "src/main/runtime/rpc/methods/session-tabs-retirement-proof-delta.test.ts": 2076,
-      "src/main/runtime/rpc/methods/session-tabs-schemas.test.ts": 156,
-      "src/main/runtime/rpc/methods/session-tabs-structured-restore.test.ts": 2005,
-      "src/main/runtime/rpc/methods/session-tabs-unsubscribe.test.ts": 2058,
-      "src/main/runtime/rpc/methods/session-tabs.test.ts": 7857,
-      "src/main/runtime/rpc/methods/skills.test.ts": 234,
-      "src/main/runtime/rpc/methods/speech.test.ts": 2103,
-      "src/main/runtime/rpc/methods/ssh.test.ts": 1445,
-      "src/main/runtime/rpc/methods/status-machine-name-publish-budget.test.ts": 3018,
-      "src/main/runtime/rpc/methods/status.test.ts": 3182,
-      "src/main/runtime/rpc/methods/structured-agent-session-admission.test.ts": 1515,
-      "src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts": 4110,
-      "src/main/runtime/rpc/methods/structured-agent-session-background-task-capability.test.ts": 2099,
-      "src/main/runtime/rpc/methods/structured-agent-session-conversation-outline.test.ts": 1973,
-      "src/main/runtime/rpc/methods/structured-agent-session-hold.test.ts": 4511,
-      "src/main/runtime/rpc/methods/structured-agent-session-options-read.test.ts": 2017,
-      "src/main/runtime/rpc/methods/structured-agent-session-policy.test.ts": 55,
-      "src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.test.ts": 1341,
-      "src/main/runtime/rpc/methods/structured-agent-session-respond-params.test.ts": 2062,
-      "src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.test.ts": 1878,
-      "src/main/runtime/rpc/methods/structured-agent-session.test.ts": 2385,
-      "src/main/runtime/rpc/methods/structured-chat-tab-table.test.ts": 4940,
-      "src/main/runtime/rpc/methods/structured-worker-read-cursor.test.ts": 284,
-      "src/main/runtime/rpc/methods/structured-worker-stop-receipt.test.ts": 3240,
-      "src/main/runtime/rpc/methods/structured-worker-tab-retirement.test.ts": 3212,
-      "src/main/runtime/rpc/methods/task-provider-identity.test.ts": 138,
-      "src/main/runtime/rpc/methods/terminal-create-idempotency.test.ts": 230,
-      "src/main/runtime/rpc/methods/terminal-legacy-stream-id-characterization.test.ts": 2402,
-      "src/main/runtime/rpc/methods/terminal-manifest-characterization.test.ts": 241,
-      "src/main/runtime/rpc/methods/terminal-navigation.test.ts": 1837,
-      "src/main/runtime/rpc/methods/terminal-read-screen-cursor.test.ts": 190,
-      "src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts": 92,
-      "src/main/runtime/rpc/methods/terminal/terminal-inspect-process-params.test.ts": 133,
-      "src/main/runtime/rpc/methods/terminal/terminal-output-batcher.test.ts": 53,
-      "src/main/runtime/rpc/methods/terminal/terminal-snapshot-json-byte-budget.test.ts": 360,
-      "src/main/runtime/rpc/methods/updater.test.ts": 123,
-      "src/main/runtime/rpc/methods/workspace-cleanup-ui-schema.test.ts": 231,
-      "src/main/runtime/rpc/methods/workspace-ports.test.ts": 1917,
-      "src/main/runtime/rpc/methods/worktree-catalog-snapshot-method.test.ts": 2038,
-      "src/main/runtime/rpc/methods/worktree-catalog-version-stamp.test.ts": 1977,
-      "src/main/runtime/rpc/methods/worktree-create-args.test.ts": 260,
-      "src/main/runtime/rpc/methods/worktree-create-navigation.test.ts": 1652,
-      "src/main/runtime/rpc/methods/worktree-github-pr-suppression.test.ts": 2111,
-      "src/main/runtime/rpc/methods/worktree-missing-terminal-teardown.test.ts": 1991,
-      "src/main/runtime/rpc/methods/worktree-retired-names.test.ts": 2212,
-      "src/main/runtime/rpc/methods/worktree-rm-host-qualification.test.ts": 2000,
-      "src/main/runtime/rpc/methods/worktree-rm-pty-waiver.test.ts": 1877,
-      "src/main/runtime/rpc/methods/worktree-schemas.test.ts": 298,
-      "src/main/runtime/rpc/methods/worktree.test.ts": 1471,
-      "src/main/runtime/rpc/mobile-auth-acl-critical-path.test.ts": 710,
-      "src/main/runtime/rpc/mobile-clipboard-image-provenance.test.ts": 45,
-      "src/main/runtime/rpc/mobile-e2ee-outbound-memory-budget.test.ts": 41,
-      "src/main/runtime/rpc/mobile-e2ee-v2-desktop-session.test.ts": 103,
-      "src/main/runtime/rpc/mobile-e2ee-v2-key-schedule.test.ts": 107,
-      "src/main/runtime/rpc/mobile-socket-wiring.test.ts": 441,
-      "src/main/runtime/rpc/orchestration-11745-regression-verification.test.ts": 7275,
-      "src/main/runtime/rpc/orchestration-commit-notify-characterization.test.ts": 3386,
-      "src/main/runtime/rpc/orchestration-contract-fence.test.ts": 3907,
-      "src/main/runtime/rpc/orchestration-current-authority-precedence.test.ts": 4484,
-      "src/main/runtime/rpc/orchestration-legacy-compatibility-dispatcher.test.ts": 4152,
-      "src/main/runtime/rpc/orchestration-legacy-coordinator-race.test.ts": 4765,
-      "src/main/runtime/rpc/orchestration-legacy-fence-jurisdiction.test.ts": 4088,
-      "src/main/runtime/rpc/orchestration-legacy-question-takeover.test.ts": 3698,
-      "src/main/runtime/rpc/orchestration-legacy-run-routing.test.ts": 4109,
-      "src/main/runtime/rpc/orchestration-legacy-takeover-current-authority.test.ts": 3343,
-      "src/main/runtime/rpc/orchestration-legacy-takeover-delivery.test.ts": 4260,
-      "src/main/runtime/rpc/orchestration-legacy-takeover-dispatcher.test.ts": 4822,
-      "src/main/runtime/rpc/orchestration-mutation-executor.test.ts": 3341,
-      "src/main/runtime/rpc/orchestration-mutation-ledger.test.ts": 4129,
-      "src/main/runtime/rpc/orchestration-mutation-request-show-legacy.test.ts": 3964,
-      "src/main/runtime/rpc/orchestration-mutation-request-show.test.ts": 3652,
-      "src/main/runtime/rpc/orchestration-party-addressing.test.ts": 3296,
-      "src/main/runtime/rpc/orchestration-party-agreement.test.ts": 3214,
-      "src/main/runtime/rpc/orchestration-runtime-update-settlement.test.ts": 3957,
-      "src/main/runtime/rpc/orchestration-session-caller.test.ts": 4997,
-      "src/main/runtime/rpc/orchestration-session-coordinator.test.ts": 4082,
-      "src/main/runtime/rpc/orchestration-session-recipient.test.ts": 4141,
-      "src/main/runtime/rpc/orchestration-task-dispatch-invariant.test.ts": 4247,
-      "src/main/runtime/rpc/relay-transport.test.ts": 199,
-      "src/main/runtime/rpc/remote-runtime-server-heartbeat-missed-probe-tolerance.test.ts": 54,
-      "src/main/runtime/rpc/remote-runtime-server-heartbeat.test.ts": 64,
-      "src/main/runtime/rpc/runtime-client-capabilities.test.ts": 57,
-      "src/main/runtime/rpc/runtime-close-attribution-topology.test.ts": 1858,
-      "src/main/runtime/rpc/runtime-close-attribution.test.ts": 2037,
-      "src/main/runtime/rpc/schemas.test.ts": 362,
-      "src/main/runtime/rpc/streaming.test.ts": 2016,
-      "src/main/runtime/rpc/terminal-agent-prompt-send.test.ts": 1590,
-      "src/main/runtime/rpc/terminal-agent-send-guard.test.ts": 2048,
-      "src/main/runtime/rpc/terminal-geometry-stale-handle.test.ts": 1506,
-      "src/main/runtime/rpc/terminal-lease-stale-handle-survival.test.ts": 2220,
-      "src/main/runtime/rpc/terminal-list-host-scope-transport.test.ts": 2122,
-      "src/main/runtime/rpc/terminal-multiplex-ack-output-budget.test.ts": 2415,
-      "src/main/runtime/rpc/terminal-multiplex-ack-overflow-recovery.test.ts": 4052,
-      "src/main/runtime/rpc/terminal-multiplex-desktop-resize-routing.test.ts": 2581,
-      "src/main/runtime/rpc/terminal-multiplex-end-verdict.test.ts": 2031,
-      "src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts": 1520,
-      "src/main/runtime/rpc/terminal-multiplex-flow-control.bench.test.ts": 75,
-      "src/main/runtime/rpc/terminal-multiplex-initial-snapshot-buffering.test.ts": 1681,
-      "src/main/runtime/rpc/terminal-multiplex-input-write-rejection.test.ts": 2746,
-      "src/main/runtime/rpc/terminal-multiplex-output-pause-and-viewport.test.ts": 1999,
-      "src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts": 1808,
-      "src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts": 2118,
-      "src/main/runtime/rpc/terminal-multiplex-round-robin.test.ts": 38,
-      "src/main/runtime/rpc/terminal-multiplex-snapshot-serialization.test.ts": 2148,
-      "src/main/runtime/rpc/terminal-multiplex-source-range-admission.test.ts": 2691,
-      "src/main/runtime/rpc/terminal-multiplex-subscribe-slot-recovery.test.ts": 1837,
-      "src/main/runtime/rpc/terminal-opencode-send-guard.integration.test.ts": 4505,
-      "src/main/runtime/rpc/terminal-output-batching.test.ts": 2237,
-      "src/main/runtime/rpc/terminal-output-frame-chunks-equivalence.test.ts": 24472,
-      "src/main/runtime/rpc/terminal-output-frame-source-ranges.test.ts": 47,
-      "src/main/runtime/rpc/terminal-prompt-delivery-receipt.test.ts": 3911,
-      "src/main/runtime/rpc/terminal-provider-snapshot-sequence.test.ts": 2394,
-      "src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts": 2216,
-      "src/main/runtime/rpc/terminal-send-launch-draft-resolution.test.ts": 1932,
-      "src/main/runtime/rpc/terminal-send.test.ts": 2284,
-      "src/main/runtime/rpc/terminal-source-range-ledger.test.ts": 66,
-      "src/main/runtime/rpc/terminal-stream-byte-length.test.ts": 6138,
-      "src/main/runtime/rpc/terminal-subscribe-blank-mount.test.ts": 1748,
-      "src/main/runtime/rpc/terminal-subscribe-buffer.test.ts": 4104,
-      "src/main/runtime/rpc/terminal-subscribe-lease-only.test.ts": 2054,
-      "src/main/runtime/rpc/terminal-subscribe-mount-replay.test.ts": 2211,
-      "src/main/runtime/rpc/terminal-subscribe-ownership.test.ts": 1660,
-      "src/main/runtime/rpc/terminal-subscribe-reconnect-rebind.test.ts": 1877,
-      "src/main/runtime/rpc/terminal-subscribe-relay-drop-lease-survival.test.ts": 3929,
-      "src/main/runtime/rpc/terminal-subscribe-renderer-recovery-output.test.ts": 2140,
-      "src/main/runtime/rpc/unix-socket-transport.test.ts": 82,
-      "src/main/runtime/rpc/unpaired-device-auth-throttle.test.ts": 33,
-      "src/main/runtime/rpc/worktree-catalog-snapshot.test.ts": 50,
-      "src/main/runtime/rpc/ws-fallback-port-store.test.ts": 56,
-      "src/main/runtime/rpc/ws-transport-accept-order.test.ts": 150,
-      "src/main/runtime/rpc/ws-transport-static-web.test.ts": 204,
+      "src/main/runtime/relay/relay-region-preference.test.ts": 180,
+      "src/main/runtime/relay/relay-region-probe-log.test.ts": 297,
+      "src/main/runtime/relay/relay-region-refresh.test.ts": 188,
+      "src/main/runtime/relay/relay-renewal-jitter.test.ts": 969,
+      "src/main/runtime/relay/relay-revoke-outbox.test.ts": 79,
+      "src/main/runtime/relay/relay-session-broker.test.ts": 667,
+      "src/main/runtime/remote-agent-session-host-authority.integration.test.ts": 3521,
+      "src/main/runtime/remote-browser-screencast-frame-admission.test.ts": 360,
+      "src/main/runtime/remote-desktop-driver.test.ts": 2835,
+      "src/main/runtime/remote-runtime-close-intent.integration.test.ts": 1447,
+      "src/main/runtime/remote-runtime-request-connection.integration.test.ts": 2224,
+      "src/main/runtime/remote-server-updater.test.ts": 39,
+      "src/main/runtime/renderer-browser-session-reconciliation.test.ts": 2331,
+      "src/main/runtime/repo-icon-fork-backfill.test.ts": 3128,
+      "src/main/runtime/repo-worktree-admin-fingerprint.test.ts": 856,
+      "src/main/runtime/repo-worktree-resolution-scan.test.ts": 54,
+      "src/main/runtime/repo-worktree-row-resolution.test.ts": 221,
+      "src/main/runtime/retained-tail-redraw-window.equivalence.test.ts": 3753,
+      "src/main/runtime/rpc/core-typed-method-contract.test.ts": 107,
+      "src/main/runtime/rpc/dispatcher-browser-client-automation.test.ts": 1502,
+      "src/main/runtime/rpc/dispatcher-computer-errors.test.ts": 2001,
+      "src/main/runtime/rpc/dispatcher-feature-interactions.test.ts": 1855,
+      "src/main/runtime/rpc/dispatcher-request-parsing.test.ts": 143,
+      "src/main/runtime/rpc/e2ee-channel-text-backpressure.test.ts": 183,
+      "src/main/runtime/rpc/e2ee-channel-v2.test.ts": 226,
+      "src/main/runtime/rpc/e2ee-channel.test.ts": 490,
+      "src/main/runtime/rpc/e2ee-crypto.test.ts": 99,
+      "src/main/runtime/rpc/e2ee-integration.test.ts": 267,
+      "src/main/runtime/rpc/errors.test.ts": 190,
+      "src/main/runtime/rpc/methods/accounts.test.ts": 152,
+      "src/main/runtime/rpc/methods/agent-hooks.test.ts": 138,
+      "src/main/runtime/rpc/methods/agent-launch-floating-workspace.test.ts": 2274,
+      "src/main/runtime/rpc/methods/agent-launch-pane-reservation.test.ts": 1814,
+      "src/main/runtime/rpc/methods/agent-launch-replay.test.ts": 2245,
+      "src/main/runtime/rpc/methods/agent-launch-session-reservation.test.ts": 925,
+      "src/main/runtime/rpc/methods/agent-launch-structured-prompt.test.ts": 72,
+      "src/main/runtime/rpc/methods/agent-launch-terminal-identity.test.ts": 349,
+      "src/main/runtime/rpc/methods/agent-launch-terminal-preferences.test.ts": 301,
+      "src/main/runtime/rpc/methods/agent-launch-terminal-prompt.test.ts": 93,
+      "src/main/runtime/rpc/methods/agent-launch.test.ts": 545,
+      "src/main/runtime/rpc/methods/agent-session.test.ts": 1701,
+      "src/main/runtime/rpc/methods/agent-skill-sharing-capability-grant.test.ts": 2731,
+      "src/main/runtime/rpc/methods/ai-vault-search.test.ts": 3943,
+      "src/main/runtime/rpc/methods/ai-vault.test.ts": 3245,
+      "src/main/runtime/rpc/methods/artifact-sharing-capability-grant.test.ts": 2728,
+      "src/main/runtime/rpc/methods/artifacts.test.ts": 419,
+      "src/main/runtime/rpc/methods/automation-scoped-list-methods.test.ts": 2331,
+      "src/main/runtime/rpc/methods/automations.test.ts": 1969,
+      "src/main/runtime/rpc/methods/browser-client-host-attach-adoption.test.ts": 1420,
+      "src/main/runtime/rpc/methods/browser-client-host-reconciliation.test.ts": 1886,
+      "src/main/runtime/rpc/methods/browser-client-host.test.ts": 1978,
+      "src/main/runtime/rpc/methods/browser-client-page-metadata.test.ts": 2040,
+      "src/main/runtime/rpc/methods/browser-identity-rpc.test.ts": 2038,
+      "src/main/runtime/rpc/methods/browser-network-tunnel.test.ts": 2142,
+      "src/main/runtime/rpc/methods/browser-tab-create-schema.test.ts": 75,
+      "src/main/runtime/rpc/methods/browser.test.ts": 2100,
+      "src/main/runtime/rpc/methods/client-events.test.ts": 1168,
+      "src/main/runtime/rpc/methods/client-native-chat-settings.test.ts": 2581,
+      "src/main/runtime/rpc/methods/client-ui-pairing-local-fields.test.ts": 2057,
+      "src/main/runtime/rpc/methods/client-ui-task-resume-state.test.ts": 1201,
+      "src/main/runtime/rpc/methods/client-ui.test.ts": 5509,
+      "src/main/runtime/rpc/methods/clipboard.test.ts": 1919,
+      "src/main/runtime/rpc/methods/computer-actions.test.ts": 203,
+      "src/main/runtime/rpc/methods/computer.test.ts": 185,
+      "src/main/runtime/rpc/methods/diagnostics.test.ts": 2205,
+      "src/main/runtime/rpc/methods/file-watch-event-batcher.test.ts": 78,
+      "src/main/runtime/rpc/methods/files-base64-padding.test.ts": 1950,
+      "src/main/runtime/rpc/methods/files-doc-preview.test.ts": 2034,
+      "src/main/runtime/rpc/methods/files-list-all-page-size.test.ts": 2043,
+      "src/main/runtime/rpc/methods/files-path-search.test.ts": 1362,
+      "src/main/runtime/rpc/methods/files-preview-transport-budget.test.ts": 1828,
+      "src/main/runtime/rpc/methods/files-terminal-path-resolution.test.ts": 2031,
+      "src/main/runtime/rpc/methods/files-watch-cancellation.test.ts": 2085,
+      "src/main/runtime/rpc/methods/files-watch-cleanup.test.ts": 2050,
+      "src/main/runtime/rpc/methods/files.test.ts": 2096,
+      "src/main/runtime/rpc/methods/git-diff-transport-budget.test.ts": 1619,
+      "src/main/runtime/rpc/methods/git.test.ts": 1380,
+      "src/main/runtime/rpc/methods/github-pr-refresh-reason.test.ts": 1972,
+      "src/main/runtime/rpc/methods/github.test.ts": 1972,
+      "src/main/runtime/rpc/methods/gitlab.test.ts": 2078,
+      "src/main/runtime/rpc/methods/host-capabilities.test.ts": 2054,
+      "src/main/runtime/rpc/methods/hosted-review.test.ts": 1980,
+      "src/main/runtime/rpc/methods/jira.test.ts": 1754,
+      "src/main/runtime/rpc/methods/linear-agent-access.test.ts": 3679,
+      "src/main/runtime/rpc/methods/linear-agent-project-access.test.ts": 4428,
+      "src/main/runtime/rpc/methods/linear.test.ts": 2000,
+      "src/main/runtime/rpc/methods/mobile-web-bundle-range.test.ts": 2006,
+      "src/main/runtime/rpc/methods/mobile-web-bundle-read-concurrency.test.ts": 1627,
+      "src/main/runtime/rpc/methods/mobile-web-bundle-window-refusals.test.ts": 1956,
+      "src/main/runtime/rpc/methods/mobile-web-bundle.test.ts": 2278,
+      "src/main/runtime/rpc/methods/native-chat-rpc-block-sanitize.test.ts": 59,
+      "src/main/runtime/rpc/methods/native-chat.test.ts": 205,
+      "src/main/runtime/rpc/methods/notification-preferences.test.ts": 187,
+      "src/main/runtime/rpc/methods/notification-reconnect-cooldown.test.ts": 125,
+      "src/main/runtime/rpc/methods/orchestration-dispatch-error-codes.test.ts": 3127,
+      "src/main/runtime/rpc/methods/orchestration-structured-worker-abandon.test.ts": 3454,
+      "src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.test.ts": 177,
+      "src/main/runtime/rpc/methods/orchestration-structured-worker-redrive.test.ts": 2861,
+      "src/main/runtime/rpc/methods/orchestration-structured-worker-session.test.ts": 202,
+      "src/main/runtime/rpc/methods/orchestration-structured-worker-start-failure.test.ts": 257,
+      "src/main/runtime/rpc/methods/orchestration-worker-mode-opacity.test.ts": 3575,
+      "src/main/runtime/rpc/methods/orchestration-worker-start-mode-selection.test.ts": 3617,
+      "src/main/runtime/rpc/methods/orchestration-worker-start-mode.test.ts": 221,
+      "src/main/runtime/rpc/methods/orchestration-worker-start-receipt-wording.test.ts": 181,
+      "src/main/runtime/rpc/methods/orchestration-worker-support-unknown.test.ts": 146,
+      "src/main/runtime/rpc/methods/orchestration/cli-runtime-boundary.test.ts": 2942,
+      "src/main/runtime/rpc/methods/orchestration/federation/federated-attach-receipt.test.ts": 59,
+      "src/main/runtime/rpc/methods/orchestration/federation/federated-fleet-snapshot.test.ts": 306,
+      "src/main/runtime/rpc/methods/orchestration/federation/federated-message-targeting.test.ts": 3006,
+      "src/main/runtime/rpc/methods/orchestration/federation/federated-release-safety.test.ts": 3590,
+      "src/main/runtime/rpc/methods/orchestration/federation/federated-transport-safety.test.ts": 3305,
+      "src/main/runtime/rpc/methods/orchestration/federation/federated-worker-start-receipt.test.ts": 3044,
+      "src/main/runtime/rpc/methods/orchestration/federation/federation-agent-launch.test.ts": 3886,
+      "src/main/runtime/rpc/methods/orchestration/federation/federation-control-mail.test.ts": 2200,
+      "src/main/runtime/rpc/methods/orchestration/federation/federation-effects.test.ts": 48,
+      "src/main/runtime/rpc/methods/orchestration/federation/federation-folder-placement.test.ts": 3459,
+      "src/main/runtime/rpc/methods/orchestration/federation/federation-lifecycle-settlement.test.ts": 8330,
+      "src/main/runtime/rpc/methods/orchestration/federation/federation-liveness-verdict.test.ts": 3459,
+      "src/main/runtime/rpc/methods/orchestration/federation/federation-output.test.ts": 5069,
+      "src/main/runtime/rpc/methods/orchestration/federation/federation-setup.test.ts": 3127,
+      "src/main/runtime/rpc/methods/orchestration/federation/federation-start-prompt-budget.test.ts": 3354,
+      "src/main/runtime/rpc/methods/orchestration/federation/federation-start-schema.test.ts": 135,
+      "src/main/runtime/rpc/methods/orchestration/federation/federation.test.ts": 5899,
+      "src/main/runtime/rpc/methods/orchestration/gates/gate-run-authorization.test.ts": 4327,
+      "src/main/runtime/rpc/methods/orchestration/gates/gates.test.ts": 4254,
+      "src/main/runtime/rpc/methods/orchestration/messaging/ask.test.ts": 3642,
+      "src/main/runtime/rpc/methods/orchestration/messaging/check-delivery-history.test.ts": 3832,
+      "src/main/runtime/rpc/methods/orchestration/messaging/check-superseded-terminal.test.ts": 2154,
+      "src/main/runtime/rpc/methods/orchestration/messaging/check-worker-consumer-fencing.test.ts": 3774,
+      "src/main/runtime/rpc/methods/orchestration/messaging/check-worker-federated-attachment.test.ts": 2399,
+      "src/main/runtime/rpc/methods/orchestration/messaging/check.test.ts": 4320,
+      "src/main/runtime/rpc/methods/orchestration/messaging/recipient-routing.test.ts": 3153,
+      "src/main/runtime/rpc/methods/orchestration/messaging/send-dispatch-authority.test.ts": 3500,
+      "src/main/runtime/rpc/methods/orchestration/messaging/send-group.test.ts": 1944,
+      "src/main/runtime/rpc/methods/orchestration/messaging/send-invalid-type.test.ts": 3325,
+      "src/main/runtime/rpc/methods/orchestration/messaging/send-receipt-plumbing.test.ts": 3305,
+      "src/main/runtime/rpc/methods/orchestration/messaging/send-unbound-terminals.test.ts": 3760,
+      "src/main/runtime/rpc/methods/orchestration/messaging/send.test.ts": 3572,
+      "src/main/runtime/rpc/methods/orchestration/messaging/settled-dispatch-mail.test.ts": 3495,
+      "src/main/runtime/rpc/methods/orchestration/runs/migration-behavior.test.ts": 3989,
+      "src/main/runtime/rpc/methods/orchestration/runs/run-receipt.test.ts": 170,
+      "src/main/runtime/rpc/methods/orchestration/runs/runs.test.ts": 3653,
+      "src/main/runtime/rpc/methods/orchestration/runs/tasks-dispatch.test.ts": 3767,
+      "src/main/runtime/rpc/methods/orchestration/worker/agent-status-producer-census.test.ts": 5044,
+      "src/main/runtime/rpc/methods/orchestration/worker/antigravity-worker-lifecycle.test.ts": 3631,
+      "src/main/runtime/rpc/methods/orchestration/worker/composed-workers.test.ts": 3335,
+      "src/main/runtime/rpc/methods/orchestration/worker/context-only-dispatch-retry.test.ts": 3459,
+      "src/main/runtime/rpc/methods/orchestration/worker/fleet-status-observed-identity.test.ts": 2831,
+      "src/main/runtime/rpc/methods/orchestration/worker/fleet-status-terminal-identity.test.ts": 2477,
+      "src/main/runtime/rpc/methods/orchestration/worker/legacy-dispatch-projection.test.ts": 3377,
+      "src/main/runtime/rpc/methods/orchestration/worker/manual-dispatch-observation.test.ts": 3653,
+      "src/main/runtime/rpc/methods/orchestration/worker/manual-dispatch-release.test.ts": 2997,
+      "src/main/runtime/rpc/methods/orchestration/worker/self-dispatch-nesting-depth.test.ts": 3581,
+      "src/main/runtime/rpc/methods/orchestration/worker/structured-worker-launch-seed-options.test.ts": 301,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-interactive-wait.test.ts": 2671,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-launch-preferences.test.ts": 185,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-list-pagination.test.ts": 2921,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-list-run-scope-rpc.test.ts": 3483,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-observation.test.ts": 226,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-output.test.ts": 189,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-read-projection.test.ts": 2982,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-release-archive.test.ts": 2904,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-release-inventory.test.ts": 3642,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-release-liveness-verdict.test.ts": 386,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-release-mobile-report.test.ts": 2795,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-release-ownership-guard.test.ts": 3055,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-release-recovery.test.ts": 3085,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-release.test.ts": 3192,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-start-budgets.test.ts": 37,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-start-outcome-classification.test.ts": 306,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-start-prompt-budget.test.ts": 103,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-start-prompt-contract.test.ts": 3639,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-start-terminal-target.test.ts": 3746,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-start-turn-observation.test.ts": 47,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-stop-capability.test.ts": 394,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-stop-exit-race.test.ts": 2902,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-stop-liveness-verdict.test.ts": 2444,
+      "src/main/runtime/rpc/methods/orchestration/worker/worker-terminal-custody-at-creation.test.ts": 3618,
+      "src/main/runtime/rpc/methods/orchestration/worker/workers-new-worktree.test.ts": 4522,
+      "src/main/runtime/rpc/methods/orchestration/worker/workers-recovery.test.ts": 2613,
+      "src/main/runtime/rpc/methods/paired-caller-host-id.test.ts": 57,
+      "src/main/runtime/rpc/methods/pairing.test.ts": 4021,
+      "src/main/runtime/rpc/methods/plugins.test.ts": 357,
+      "src/main/runtime/rpc/methods/preflight.test.ts": 1474,
+      "src/main/runtime/rpc/methods/project-host-setup-self-host-stamp.test.ts": 147,
+      "src/main/runtime/rpc/methods/repo-badge-color.test.ts": 1628,
+      "src/main/runtime/rpc/methods/repo.test.ts": 3091,
+      "src/main/runtime/rpc/methods/runtime-client-capabilities.test.ts": 2076,
+      "src/main/runtime/rpc/methods/session-tab-agent-capability-mutations.test.ts": 1544,
+      "src/main/runtime/rpc/methods/session-tab-agent-status-projection.test.ts": 72,
+      "src/main/runtime/rpc/methods/session-tab-browser-placement-mutations.test.ts": 1954,
+      "src/main/runtime/rpc/methods/session-tab-browser-placement-projection.test.ts": 43,
+      "src/main/runtime/rpc/methods/session-tabs-inventory-census-race.test.ts": 7364,
+      "src/main/runtime/rpc/methods/session-tabs-inventory-rpc.test.ts": 3424,
+      "src/main/runtime/rpc/methods/session-tabs-move-validation.test.ts": 3387,
+      "src/main/runtime/rpc/methods/session-tabs-retirement-proof-delta.test.ts": 1812,
+      "src/main/runtime/rpc/methods/session-tabs-schemas.test.ts": 214,
+      "src/main/runtime/rpc/methods/session-tabs-structured-restore.test.ts": 1499,
+      "src/main/runtime/rpc/methods/session-tabs-unsubscribe.test.ts": 1741,
+      "src/main/runtime/rpc/methods/session-tabs.test.ts": 2523,
+      "src/main/runtime/rpc/methods/skills.test.ts": 145,
+      "src/main/runtime/rpc/methods/speech.test.ts": 2115,
+      "src/main/runtime/rpc/methods/ssh.test.ts": 2113,
+      "src/main/runtime/rpc/methods/status-machine-name-publish-budget.test.ts": 4507,
+      "src/main/runtime/rpc/methods/status.test.ts": 3576,
+      "src/main/runtime/rpc/methods/structured-agent-session-admission.test.ts": 1748,
+      "src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts": 3622,
+      "src/main/runtime/rpc/methods/structured-agent-session-background-task-capability.test.ts": 1976,
+      "src/main/runtime/rpc/methods/structured-agent-session-conversation-outline.test.ts": 2085,
+      "src/main/runtime/rpc/methods/structured-agent-session-hold.test.ts": 5554,
+      "src/main/runtime/rpc/methods/structured-agent-session-options-read.test.ts": 1458,
+      "src/main/runtime/rpc/methods/structured-agent-session-policy.test.ts": 56,
+      "src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.test.ts": 2074,
+      "src/main/runtime/rpc/methods/structured-agent-session-respond-params.test.ts": 2079,
+      "src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.test.ts": 1973,
+      "src/main/runtime/rpc/methods/structured-agent-session.test.ts": 3566,
+      "src/main/runtime/rpc/methods/structured-chat-tab-table.test.ts": 4222,
+      "src/main/runtime/rpc/methods/structured-worker-read-cursor.test.ts": 278,
+      "src/main/runtime/rpc/methods/structured-worker-stop-receipt.test.ts": 3571,
+      "src/main/runtime/rpc/methods/structured-worker-tab-retirement.test.ts": 3424,
+      "src/main/runtime/rpc/methods/task-provider-identity.test.ts": 199,
+      "src/main/runtime/rpc/methods/terminal-create-idempotency.test.ts": 243,
+      "src/main/runtime/rpc/methods/terminal-legacy-stream-id-characterization.test.ts": 1363,
+      "src/main/runtime/rpc/methods/terminal-manifest-characterization.test.ts": 218,
+      "src/main/runtime/rpc/methods/terminal-navigation.test.ts": 1906,
+      "src/main/runtime/rpc/methods/terminal-read-screen-cursor.test.ts": 257,
+      "src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts": 99,
+      "src/main/runtime/rpc/methods/terminal/terminal-inspect-process-params.test.ts": 171,
+      "src/main/runtime/rpc/methods/terminal/terminal-output-batcher.test.ts": 56,
+      "src/main/runtime/rpc/methods/terminal/terminal-snapshot-json-byte-budget.test.ts": 440,
+      "src/main/runtime/rpc/methods/updater.test.ts": 96,
+      "src/main/runtime/rpc/methods/workspace-cleanup-ui-schema.test.ts": 174,
+      "src/main/runtime/rpc/methods/workspace-ports.test.ts": 1990,
+      "src/main/runtime/rpc/methods/worktree-catalog-snapshot-method.test.ts": 1995,
+      "src/main/runtime/rpc/methods/worktree-catalog-version-stamp.test.ts": 1225,
+      "src/main/runtime/rpc/methods/worktree-create-args.test.ts": 229,
+      "src/main/runtime/rpc/methods/worktree-create-navigation.test.ts": 2179,
+      "src/main/runtime/rpc/methods/worktree-github-pr-suppression.test.ts": 1632,
+      "src/main/runtime/rpc/methods/worktree-missing-terminal-teardown.test.ts": 2053,
+      "src/main/runtime/rpc/methods/worktree-retired-names.test.ts": 2044,
+      "src/main/runtime/rpc/methods/worktree-rm-host-qualification.test.ts": 1170,
+      "src/main/runtime/rpc/methods/worktree-rm-pty-waiver.test.ts": 1653,
+      "src/main/runtime/rpc/methods/worktree-schemas.test.ts": 213,
+      "src/main/runtime/rpc/methods/worktree.test.ts": 1890,
+      "src/main/runtime/rpc/mobile-auth-acl-critical-path.test.ts": 738,
+      "src/main/runtime/rpc/mobile-clipboard-image-provenance.test.ts": 75,
+      "src/main/runtime/rpc/mobile-e2ee-outbound-memory-budget.test.ts": 39,
+      "src/main/runtime/rpc/mobile-e2ee-v2-desktop-session.test.ts": 88,
+      "src/main/runtime/rpc/mobile-e2ee-v2-key-schedule.test.ts": 58,
+      "src/main/runtime/rpc/mobile-socket-wiring.test.ts": 407,
+      "src/main/runtime/rpc/orchestration-11745-regression-verification.test.ts": 6095,
+      "src/main/runtime/rpc/orchestration-commit-notify-characterization.test.ts": 4449,
+      "src/main/runtime/rpc/orchestration-contract-fence.test.ts": 3677,
+      "src/main/runtime/rpc/orchestration-current-authority-precedence.test.ts": 4165,
+      "src/main/runtime/rpc/orchestration-legacy-compatibility-dispatcher.test.ts": 4292,
+      "src/main/runtime/rpc/orchestration-legacy-coordinator-race.test.ts": 5243,
+      "src/main/runtime/rpc/orchestration-legacy-fence-jurisdiction.test.ts": 4116,
+      "src/main/runtime/rpc/orchestration-legacy-question-takeover.test.ts": 4209,
+      "src/main/runtime/rpc/orchestration-legacy-run-routing.test.ts": 4083,
+      "src/main/runtime/rpc/orchestration-legacy-takeover-current-authority.test.ts": 3570,
+      "src/main/runtime/rpc/orchestration-legacy-takeover-delivery.test.ts": 3472,
+      "src/main/runtime/rpc/orchestration-legacy-takeover-dispatcher.test.ts": 3978,
+      "src/main/runtime/rpc/orchestration-mutation-executor.test.ts": 2234,
+      "src/main/runtime/rpc/orchestration-mutation-ledger.test.ts": 4386,
+      "src/main/runtime/rpc/orchestration-mutation-request-show-legacy.test.ts": 3422,
+      "src/main/runtime/rpc/orchestration-mutation-request-show.test.ts": 3415,
+      "src/main/runtime/rpc/orchestration-party-addressing.test.ts": 2984,
+      "src/main/runtime/rpc/orchestration-party-agreement.test.ts": 4332,
+      "src/main/runtime/rpc/orchestration-runtime-update-settlement.test.ts": 3707,
+      "src/main/runtime/rpc/orchestration-session-caller.test.ts": 3095,
+      "src/main/runtime/rpc/orchestration-session-coordinator.test.ts": 4617,
+      "src/main/runtime/rpc/orchestration-session-recipient.test.ts": 3497,
+      "src/main/runtime/rpc/orchestration-task-dispatch-invariant.test.ts": 4509,
+      "src/main/runtime/rpc/relay-transport.test.ts": 232,
+      "src/main/runtime/rpc/remote-runtime-server-heartbeat-missed-probe-tolerance.test.ts": 66,
+      "src/main/runtime/rpc/remote-runtime-server-heartbeat.test.ts": 66,
+      "src/main/runtime/rpc/runtime-client-capabilities.test.ts": 51,
+      "src/main/runtime/rpc/runtime-close-attribution-topology.test.ts": 1449,
+      "src/main/runtime/rpc/runtime-close-attribution.test.ts": 1499,
+      "src/main/runtime/rpc/schemas.test.ts": 342,
+      "src/main/runtime/rpc/static-web-client-handler-stream.test.ts": 4560,
+      "src/main/runtime/rpc/streaming.test.ts": 2073,
+      "src/main/runtime/rpc/terminal-agent-prompt-send.test.ts": 1690,
+      "src/main/runtime/rpc/terminal-agent-send-guard.test.ts": 2687,
+      "src/main/runtime/rpc/terminal-geometry-stale-handle.test.ts": 1909,
+      "src/main/runtime/rpc/terminal-lease-stale-handle-survival.test.ts": 1995,
+      "src/main/runtime/rpc/terminal-list-host-scope-transport.test.ts": 1877,
+      "src/main/runtime/rpc/terminal-multiplex-ack-output-budget.test.ts": 2532,
+      "src/main/runtime/rpc/terminal-multiplex-ack-overflow-recovery.test.ts": 3965,
+      "src/main/runtime/rpc/terminal-multiplex-desktop-resize-routing.test.ts": 1743,
+      "src/main/runtime/rpc/terminal-multiplex-end-verdict.test.ts": 2073,
+      "src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts": 1942,
+      "src/main/runtime/rpc/terminal-multiplex-flow-control.bench.test.ts": 42,
+      "src/main/runtime/rpc/terminal-multiplex-initial-snapshot-buffering.test.ts": 2257,
+      "src/main/runtime/rpc/terminal-multiplex-input-write-rejection.test.ts": 2087,
+      "src/main/runtime/rpc/terminal-multiplex-output-pause-and-viewport.test.ts": 2541,
+      "src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts": 2115,
+      "src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts": 2070,
+      "src/main/runtime/rpc/terminal-multiplex-round-robin.test.ts": 53,
+      "src/main/runtime/rpc/terminal-multiplex-snapshot-serialization.test.ts": 2326,
+      "src/main/runtime/rpc/terminal-multiplex-source-range-admission.test.ts": 2706,
+      "src/main/runtime/rpc/terminal-multiplex-subscribe-slot-recovery.test.ts": 1321,
+      "src/main/runtime/rpc/terminal-opencode-send-guard.integration.test.ts": 4114,
+      "src/main/runtime/rpc/terminal-output-batching.test.ts": 1858,
+      "src/main/runtime/rpc/terminal-output-frame-chunks-equivalence.test.ts": 24855,
+      "src/main/runtime/rpc/terminal-output-frame-source-ranges.test.ts": 48,
+      "src/main/runtime/rpc/terminal-prompt-delivery-receipt.test.ts": 2576,
+      "src/main/runtime/rpc/terminal-provider-snapshot-sequence.test.ts": 2196,
+      "src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts": 2186,
+      "src/main/runtime/rpc/terminal-send-launch-draft-resolution.test.ts": 1892,
+      "src/main/runtime/rpc/terminal-send.test.ts": 2332,
+      "src/main/runtime/rpc/terminal-source-range-ledger.test.ts": 56,
+      "src/main/runtime/rpc/terminal-stream-byte-length.test.ts": 6429,
+      "src/main/runtime/rpc/terminal-subscribe-blank-mount.test.ts": 1622,
+      "src/main/runtime/rpc/terminal-subscribe-buffer.test.ts": 8969,
+      "src/main/runtime/rpc/terminal-subscribe-lease-only.test.ts": 2041,
+      "src/main/runtime/rpc/terminal-subscribe-mount-replay.test.ts": 1193,
+      "src/main/runtime/rpc/terminal-subscribe-ownership.test.ts": 2029,
+      "src/main/runtime/rpc/terminal-subscribe-reconnect-rebind.test.ts": 1967,
+      "src/main/runtime/rpc/terminal-subscribe-relay-drop-lease-survival.test.ts": 3468,
+      "src/main/runtime/rpc/terminal-subscribe-renderer-recovery-output.test.ts": 1930,
+      "src/main/runtime/rpc/unix-socket-transport.test.ts": 88,
+      "src/main/runtime/rpc/unpaired-device-auth-throttle.test.ts": 37,
+      "src/main/runtime/rpc/worktree-catalog-snapshot.test.ts": 65,
+      "src/main/runtime/rpc/ws-fallback-port-store.test.ts": 43,
+      "src/main/runtime/rpc/ws-transport-accept-order.test.ts": 157,
+      "src/main/runtime/rpc/ws-transport-static-web.test.ts": 218,
       "src/main/runtime/rpc/ws-transport-transient-packet-loss.test.ts": 721,
-      "src/main/runtime/rpc/ws-transport.test.ts": 1178,
-      "src/main/runtime/runtime-agent-row-main-agent-projection.test.ts": 70,
-      "src/main/runtime/runtime-binary-message-router.test.ts": 45,
-      "src/main/runtime/runtime-browser-client-automation.test.ts": 194,
-      "src/main/runtime/runtime-browser-client-page-adoption.test.ts": 156,
-      "src/main/runtime/runtime-browser-client-page-creation.test.ts": 170,
-      "src/main/runtime/runtime-browser-client-page-recovery.test.ts": 189,
-      "src/main/runtime/runtime-browser-client-page-restored-recovery.test.ts": 149,
-      "src/main/runtime/runtime-browser-network-execution-host.test.ts": 47,
-      "src/main/runtime/runtime-browser-page-registry.test.ts": 44,
-      "src/main/runtime/runtime-client-settings-linear-team-projection.test.ts": 530,
-      "src/main/runtime/runtime-client-settings-minimax-projection.test.ts": 559,
-      "src/main/runtime/runtime-client-settings-terminal-copy-projection.test.ts": 583,
-      "src/main/runtime/runtime-extraction-regressions.test.ts": 3383,
-      "src/main/runtime/runtime-file-path-existence.test.ts": 1526,
-      "src/main/runtime/runtime-file-target-connection-field-ratchet.test.ts": 36,
-      "src/main/runtime/runtime-file-target-execution-host.test.ts": 3253,
-      "src/main/runtime/runtime-folder-workspace.test.ts": 76,
-      "src/main/runtime/runtime-folder-worktree-create.test.ts": 106,
-      "src/main/runtime/runtime-git-api-contract.test.ts": 865,
-      "src/main/runtime/runtime-git-branch-compare-admission.test.ts": 69,
-      "src/main/runtime/runtime-git-command-target.test.ts": 69,
-      "src/main/runtime/runtime-git-conflict-operation-routing.test.ts": 429,
-      "src/main/runtime/runtime-git-execution-host-ownership.test.ts": 801,
-      "src/main/runtime/runtime-git-generation-admission.test.ts": 67,
-      "src/main/runtime/runtime-git-status-admission.test.ts": 2135,
-      "src/main/runtime/runtime-git-sync-commands.test.ts": 858,
-      "src/main/runtime/runtime-git-target-execution-host.test.ts": 3228,
-      "src/main/runtime/runtime-graph-reload-lifecycle.test.ts": 55,
-      "src/main/runtime/runtime-hook-agent-row-selection.test.ts": 86,
-      "src/main/runtime/runtime-legacy-worker-terminal-recovery-retry.test.ts": 49,
-      "src/main/runtime/runtime-linear-read-commands.test.ts": 173,
-      "src/main/runtime/runtime-local-create-rearm-ordering.test.ts": 3445,
-      "src/main/runtime/runtime-local-worktree-create.test.ts": 295,
-      "src/main/runtime/runtime-local-worktree-materialization.test.ts": 80,
-      "src/main/runtime/runtime-local-worktree-terminal-startup.test.ts": 86,
-      "src/main/runtime/runtime-machine-name.test.ts": 90,
-      "src/main/runtime/runtime-managed-worktree-metadata-sweep.test.ts": 1015,
-      "src/main/runtime/runtime-managed-worktree-metadata.test.ts": 97,
-      "src/main/runtime/runtime-managed-worktree-queries.test.ts": 356,
-      "src/main/runtime/runtime-metadata-ownership-watch.test.ts": 138,
-      "src/main/runtime/runtime-metadata.test.ts": 176,
-      "src/main/runtime/runtime-mobile-agent-status-builder.test.ts": 65,
-      "src/main/runtime/runtime-mobile-file-path-search.test.ts": 63,
-      "src/main/runtime/runtime-owned-terminal-publication-lineage.test.ts": 3771,
-      "src/main/runtime/runtime-project-group-controller-folder-delete.test.ts": 55,
-      "src/main/runtime/runtime-project-host-setup-controller.test.ts": 239,
-      "src/main/runtime/runtime-remote-fetch-ref-maintenance.test.ts": 274,
-      "src/main/runtime/runtime-remote-managed-worktree-create.test.ts": 64,
-      "src/main/runtime/runtime-remove-project-host-scope.test.ts": 3261,
-      "src/main/runtime/runtime-repository-issue-command.test.ts": 373,
-      "src/main/runtime/runtime-resolved-worktree-cache.test.ts": 70,
-      "src/main/runtime/runtime-rpc-browser-host-admission.test.ts": 3929,
-      "src/main/runtime/runtime-rpc-device-revocation.test.ts": 4203,
-      "src/main/runtime/runtime-rpc-long-poll-transport.test.ts": 8802,
-      "src/main/runtime/runtime-rpc-metadata-lifecycle.test.ts": 3465,
-      "src/main/runtime/runtime-rpc-mobile-method-allowlist.test.ts": 2487,
-      "src/main/runtime/runtime-rpc-mobile-native-chat-settings.test.ts": 42,
-      "src/main/runtime/runtime-rpc-mobile-terminal-streaming.test.ts": 4542,
-      "src/main/runtime/runtime-rpc-mobile-unknown-method-scope-refusal.test.ts": 1633,
-      "src/main/runtime/runtime-rpc-orchestration-db-migration.test.ts": 405,
-      "src/main/runtime/runtime-rpc-pairing-mode-persistence.test.ts": 3991,
-      "src/main/runtime/runtime-rpc-pairing-offer.test.ts": 4205,
-      "src/main/runtime/runtime-rpc-relay-pairing.test.ts": 3995,
-      "src/main/runtime/runtime-rpc-request-authorization.test.ts": 4106,
-      "src/main/runtime/runtime-rpc-startup-failure.test.ts": 68,
-      "src/main/runtime/runtime-rpc-terminal-list.test.ts": 4448,
-      "src/main/runtime/runtime-rpc-websocket-bind-host.test.ts": 4468,
-      "src/main/runtime/runtime-rpc-websocket-long-poll-caps.test.ts": 3958,
-      "src/main/runtime/runtime-rpc-worktree-queries.test.ts": 4267,
-      "src/main/runtime/runtime-search-line-fragments.test.ts": 360,
-      "src/main/runtime/runtime-server-git-availability.test.ts": 79,
-      "src/main/runtime/runtime-session-search-settings.test.ts": 151,
-      "src/main/runtime/runtime-skill-install-authority.test.ts": 79,
-      "src/main/runtime/runtime-skill-install-commands.test.ts": 453,
-      "src/main/runtime/runtime-skill-install-queries.test.ts": 389,
-      "src/main/runtime/runtime-socket-sweep.test.ts": 2055,
-      "src/main/runtime/runtime-subscription-registry.test.ts": 39,
-      "src/main/runtime/runtime-terminal-idle-polls.test.ts": 67,
-      "src/main/runtime/runtime-terminal-orphan-topology-validation.test.ts": 55,
-      "src/main/runtime/runtime-terminal-spawn-push-target-materialization.test.ts": 70,
-      "src/main/runtime/runtime-unregistered-worktree-removal-host-home.test.ts": 765,
-      "src/main/runtime/runtime-worktree-agent-rows-structured.test.ts": 429,
-      "src/main/runtime/runtime-worktree-agent-sources.test.ts": 33,
-      "src/main/runtime/runtime-worktree-agent-startup.test.ts": 296,
-      "src/main/runtime/runtime-worktree-ps-summaries.test.ts": 52,
-      "src/main/runtime/runtime-worktree-selection.test.ts": 70,
-      "src/main/runtime/runtime-worktree-structured-agent-rows-liveness.test.ts": 667,
-      "src/main/runtime/saved-structured-agent-session-restoration.test.ts": 50,
-      "src/main/runtime/selected-review-branch.test.ts": 56,
-      "src/main/runtime/session-tabs-inventory-publication.test.ts": 3516,
-      "src/main/runtime/settled-worker-process-replacement.test.ts": 2629,
-      "src/main/runtime/structured-agent-session-close.test.ts": 192,
-      "src/main/runtime/structured-agent-session-integration-replay.test.ts": 2567,
-      "src/main/runtime/structured-agent-session-integration.test.ts": 14329,
-      "src/main/runtime/structured-agent-session-rollback-compatibility.test.ts": 372,
-      "src/main/runtime/structured-agent-session-runtime-exit.test.ts": 1193,
-      "src/main/runtime/structured-agent-session-runtime-provider-started.test.ts": 1564,
-      "src/main/runtime/structured-agent-session-runtime.test.ts": 543,
-      "src/main/runtime/structured-agent-session-support-probe.test.ts": 3098,
+      "src/main/runtime/rpc/ws-transport.test.ts": 1076,
+      "src/main/runtime/runtime-agent-row-main-agent-projection.test.ts": 51,
+      "src/main/runtime/runtime-binary-message-router.test.ts": 36,
+      "src/main/runtime/runtime-browser-client-automation.test.ts": 181,
+      "src/main/runtime/runtime-browser-client-page-adoption.test.ts": 210,
+      "src/main/runtime/runtime-browser-client-page-creation.test.ts": 126,
+      "src/main/runtime/runtime-browser-client-page-recovery.test.ts": 250,
+      "src/main/runtime/runtime-browser-client-page-restored-recovery.test.ts": 116,
+      "src/main/runtime/runtime-browser-network-execution-host.test.ts": 43,
+      "src/main/runtime/runtime-browser-page-registry.test.ts": 57,
+      "src/main/runtime/runtime-client-settings-linear-team-projection.test.ts": 453,
+      "src/main/runtime/runtime-client-settings-minimax-projection.test.ts": 289,
+      "src/main/runtime/runtime-client-settings-terminal-copy-projection.test.ts": 429,
+      "src/main/runtime/runtime-extraction-regressions.test.ts": 3371,
+      "src/main/runtime/runtime-file-path-existence.test.ts": 1374,
+      "src/main/runtime/runtime-file-target-connection-field-ratchet.test.ts": 37,
+      "src/main/runtime/runtime-file-target-execution-host.test.ts": 3281,
+      "src/main/runtime/runtime-file-upload-decode.test.ts": 3770,
+      "src/main/runtime/runtime-folder-workspace.test.ts": 50,
+      "src/main/runtime/runtime-folder-worktree-create.test.ts": 71,
+      "src/main/runtime/runtime-git-api-contract.test.ts": 722,
+      "src/main/runtime/runtime-git-branch-compare-admission.test.ts": 66,
+      "src/main/runtime/runtime-git-command-target.test.ts": 34,
+      "src/main/runtime/runtime-git-conflict-operation-routing.test.ts": 501,
+      "src/main/runtime/runtime-git-execution-host-ownership.test.ts": 819,
+      "src/main/runtime/runtime-git-generation-admission.test.ts": 132,
+      "src/main/runtime/runtime-git-status-admission.test.ts": 2074,
+      "src/main/runtime/runtime-git-sync-commands.test.ts": 795,
+      "src/main/runtime/runtime-git-target-execution-host.test.ts": 2543,
+      "src/main/runtime/runtime-graph-reload-lifecycle.test.ts": 39,
+      "src/main/runtime/runtime-hook-agent-row-selection.test.ts": 91,
+      "src/main/runtime/runtime-legacy-worker-terminal-recovery-retry.test.ts": 40,
+      "src/main/runtime/runtime-linear-read-commands.test.ts": 118,
+      "src/main/runtime/runtime-local-create-rearm-ordering.test.ts": 3195,
+      "src/main/runtime/runtime-local-worktree-create.test.ts": 258,
+      "src/main/runtime/runtime-local-worktree-materialization.test.ts": 71,
+      "src/main/runtime/runtime-local-worktree-terminal-startup.test.ts": 46,
+      "src/main/runtime/runtime-machine-name.test.ts": 76,
+      "src/main/runtime/runtime-managed-worktree-metadata-sweep.test.ts": 1074,
+      "src/main/runtime/runtime-managed-worktree-metadata.test.ts": 75,
+      "src/main/runtime/runtime-managed-worktree-queries.test.ts": 275,
+      "src/main/runtime/runtime-metadata-ownership-watch.test.ts": 119,
+      "src/main/runtime/runtime-metadata.test.ts": 168,
+      "src/main/runtime/runtime-mobile-agent-status-builder.test.ts": 62,
+      "src/main/runtime/runtime-mobile-file-path-search.test.ts": 32,
+      "src/main/runtime/runtime-owned-terminal-publication-lineage.test.ts": 3962,
+      "src/main/runtime/runtime-project-group-controller-folder-delete.test.ts": 53,
+      "src/main/runtime/runtime-project-host-setup-controller.test.ts": 328,
+      "src/main/runtime/runtime-remote-fetch-ref-maintenance.test.ts": 292,
+      "src/main/runtime/runtime-remote-managed-worktree-create.test.ts": 42,
+      "src/main/runtime/runtime-remove-project-host-scope.test.ts": 2613,
+      "src/main/runtime/runtime-repository-issue-command.test.ts": 280,
+      "src/main/runtime/runtime-resolved-worktree-cache.test.ts": 54,
+      "src/main/runtime/runtime-rpc-browser-host-admission.test.ts": 4251,
+      "src/main/runtime/runtime-rpc-device-revocation.test.ts": 4197,
+      "src/main/runtime/runtime-rpc-long-poll-transport.test.ts": 6862,
+      "src/main/runtime/runtime-rpc-metadata-lifecycle.test.ts": 3056,
+      "src/main/runtime/runtime-rpc-mobile-method-allowlist.test.ts": 1796,
+      "src/main/runtime/runtime-rpc-mobile-native-chat-settings.test.ts": 29,
+      "src/main/runtime/runtime-rpc-mobile-terminal-streaming.test.ts": 4788,
+      "src/main/runtime/runtime-rpc-mobile-unknown-method-scope-refusal.test.ts": 1513,
+      "src/main/runtime/runtime-rpc-orchestration-db-migration.test.ts": 424,
+      "src/main/runtime/runtime-rpc-pairing-mode-persistence.test.ts": 3549,
+      "src/main/runtime/runtime-rpc-pairing-offer.test.ts": 4433,
+      "src/main/runtime/runtime-rpc-relay-pairing.test.ts": 4084,
+      "src/main/runtime/runtime-rpc-request-authorization.test.ts": 4122,
+      "src/main/runtime/runtime-rpc-startup-failure.test.ts": 66,
+      "src/main/runtime/runtime-rpc-terminal-list.test.ts": 4158,
+      "src/main/runtime/runtime-rpc-websocket-bind-host.test.ts": 4774,
+      "src/main/runtime/runtime-rpc-websocket-long-poll-caps.test.ts": 4036,
+      "src/main/runtime/runtime-rpc-worktree-queries.test.ts": 4031,
+      "src/main/runtime/runtime-search-line-fragments.test.ts": 264,
+      "src/main/runtime/runtime-server-git-availability.test.ts": 60,
+      "src/main/runtime/runtime-session-search-settings.test.ts": 66,
+      "src/main/runtime/runtime-skill-install-authority.test.ts": 64,
+      "src/main/runtime/runtime-skill-install-commands.test.ts": 428,
+      "src/main/runtime/runtime-skill-install-queries.test.ts": 263,
+      "src/main/runtime/runtime-socket-sweep.test.ts": 2436,
+      "src/main/runtime/runtime-subscription-registry.test.ts": 30,
+      "src/main/runtime/runtime-terminal-idle-polls.test.ts": 62,
+      "src/main/runtime/runtime-terminal-orphan-topology-validation.test.ts": 44,
+      "src/main/runtime/runtime-terminal-spawn-push-target-materialization.test.ts": 93,
+      "src/main/runtime/runtime-unregistered-worktree-removal-host-home.test.ts": 617,
+      "src/main/runtime/runtime-worktree-agent-rows-structured.test.ts": 473,
+      "src/main/runtime/runtime-worktree-agent-sources.test.ts": 49,
+      "src/main/runtime/runtime-worktree-agent-startup.test.ts": 166,
+      "src/main/runtime/runtime-worktree-ps-summaries.test.ts": 40,
+      "src/main/runtime/runtime-worktree-selection.test.ts": 53,
+      "src/main/runtime/runtime-worktree-structured-agent-rows-liveness.test.ts": 663,
+      "src/main/runtime/saved-structured-agent-session-restoration.test.ts": 24,
+      "src/main/runtime/selected-review-branch.test.ts": 44,
+      "src/main/runtime/session-tabs-inventory-publication.test.ts": 3283,
+      "src/main/runtime/settled-worker-process-replacement.test.ts": 2400,
+      "src/main/runtime/structured-agent-session-close.test.ts": 115,
+      "src/main/runtime/structured-agent-session-integration-replay.test.ts": 2654,
+      "src/main/runtime/structured-agent-session-integration.test.ts": 11330,
+      "src/main/runtime/structured-agent-session-rollback-compatibility.test.ts": 352,
+      "src/main/runtime/structured-agent-session-runtime-exit.test.ts": 1281,
+      "src/main/runtime/structured-agent-session-runtime-provider-started.test.ts": 1074,
+      "src/main/runtime/structured-agent-session-runtime.test.ts": 861,
+      "src/main/runtime/structured-agent-session-support-probe.test.ts": 3514,
       "src/main/runtime/structured-agent-shell-environment.test.ts": 57,
-      "src/main/runtime/structured-claude-auth-policy-wiring.test.ts": 915,
-      "src/main/runtime/structured-claude-pending-rewind.test.ts": 1081,
-      "src/main/runtime/structured-conversation-tab-replacement.test.ts": 53,
-      "src/main/runtime/structured-session-worktree-teardown.test.ts": 3286,
-      "src/main/runtime/structured-worker-agent-presence.test.ts": 94,
-      "src/main/runtime/structured-worker-authority.test.ts": 183,
-      "src/main/runtime/structured-worker-child-identity-env.test.ts": 187,
-      "src/main/runtime/structured-worker-hook-attestation.test.ts": 2404,
-      "src/main/runtime/structured-worker-identity.test.ts": 253,
-      "src/main/runtime/structured-worker-mail-routing.test.ts": 1997,
-      "src/main/runtime/structured-worker-takeover-pane-key.test.ts": 3368,
-      "src/main/runtime/structured-worker-terminal-read.test.ts": 2560,
-      "src/main/runtime/structured-worker-terminal-refusal.test.ts": 189,
-      "src/main/runtime/terminal-ansi-pending-retention.test.ts": 406,
-      "src/main/runtime/terminal-chat-owner-persistence.test.ts": 4123,
-      "src/main/runtime/terminal-close-observed-exit.test.ts": 3764,
-      "src/main/runtime/terminal-close-slow-agent-exit.test.ts": 5960,
-      "src/main/runtime/terminal-focus-navigation-coalescer.test.ts": 75,
-      "src/main/runtime/terminal-identity-probe.test.ts": 46,
-      "src/main/runtime/terminal-interactive-wait-visibility.test.ts": 8920,
-      "src/main/runtime/terminal-leaf-tab-resolution.test.ts": 80,
-      "src/main/runtime/terminal-list-execution-host-scope.test.ts": 5764,
-      "src/main/runtime/terminal-list-payload-size.test.ts": 3433,
-      "src/main/runtime/terminal-list-pending-pty-registration.test.ts": 3041,
-      "src/main/runtime/terminal-list-stale-leaf-liveness.test.ts": 2654,
-      "src/main/runtime/terminal-list-surface-lost-orphan.test.ts": 3036,
-      "src/main/runtime/terminal-mobile-subscribe-tab-mount.test.ts": 2732,
-      "src/main/runtime/terminal-model-query-authority.test.ts": 48,
-      "src/main/runtime/terminal-orphan-owner.test.ts": 47,
-      "src/main/runtime/terminal-orphan-topology.test.ts": 49,
-      "src/main/runtime/terminal-pane-recovery-liveness-gate.test.ts": 4059,
-      "src/main/runtime/terminal-projection.test.ts": 3356,
-      "src/main/runtime/terminal-pty-exit-waiter.test.ts": 3165,
-      "src/main/runtime/terminal-query-responder.test.ts": 12345,
-      "src/main/runtime/terminal-restore-record-seed.test.ts": 2649,
-      "src/main/runtime/terminal-retirement-async-durability.test.ts": 3947,
-      "src/main/runtime/terminal-retirement-proof-emitted-frame.test.ts": 3893,
-      "src/main/runtime/terminal-retirement-proof-publication.test.ts": 3555,
-      "src/main/runtime/terminal-send-stale-leaf-liveness.test.ts": 4021,
-      "src/main/runtime/terminal-shell-override-host-support.test.ts": 43,
-      "src/main/runtime/terminal-subscribe-exit-waiter-leak.test.ts": 3716,
-      "src/main/runtime/terminal-subscriber-driven-daemon-attach.test.ts": 4749,
-      "src/main/runtime/terminal-tail-buffer.test.ts": 6252,
-      "src/main/runtime/terminal-tail-row-retention.test.ts": 192,
-      "src/main/runtime/terminal-tail-sentinel-index.test.ts": 4884,
-      "src/main/runtime/terminal-tail-whitespace.test.ts": 90,
-      "src/main/runtime/terminal-vertical-control-scan.test.ts": 97,
-      "src/main/runtime/terminal-wait-detection.test.ts": 130,
-      "src/main/runtime/terminal-wait-name-only-idle.test.ts": 7818,
+      "src/main/runtime/structured-claude-auth-policy-wiring.test.ts": 777,
+      "src/main/runtime/structured-claude-pending-rewind.test.ts": 1026,
+      "src/main/runtime/structured-conversation-tab-replacement.test.ts": 30,
+      "src/main/runtime/structured-session-worktree-teardown.test.ts": 3171,
+      "src/main/runtime/structured-worker-agent-presence.test.ts": 89,
+      "src/main/runtime/structured-worker-authority.test.ts": 207,
+      "src/main/runtime/structured-worker-child-identity-env.test.ts": 213,
+      "src/main/runtime/structured-worker-hook-attestation.test.ts": 1582,
+      "src/main/runtime/structured-worker-identity.test.ts": 263,
+      "src/main/runtime/structured-worker-mail-routing.test.ts": 1584,
+      "src/main/runtime/structured-worker-takeover-pane-key.test.ts": 3936,
+      "src/main/runtime/structured-worker-terminal-read.test.ts": 1912,
+      "src/main/runtime/structured-worker-terminal-refusal.test.ts": 170,
+      "src/main/runtime/terminal-ansi-pending-retention.test.ts": 524,
+      "src/main/runtime/terminal-chat-owner-persistence.test.ts": 4208,
+      "src/main/runtime/terminal-close-observed-exit.test.ts": 3596,
+      "src/main/runtime/terminal-close-slow-agent-exit.test.ts": 5694,
+      "src/main/runtime/terminal-focus-navigation-coalescer.test.ts": 64,
+      "src/main/runtime/terminal-identity-probe.test.ts": 31,
+      "src/main/runtime/terminal-interactive-wait-visibility.test.ts": 9863,
+      "src/main/runtime/terminal-leaf-tab-resolution.test.ts": 70,
+      "src/main/runtime/terminal-list-execution-host-scope.test.ts": 6496,
+      "src/main/runtime/terminal-list-payload-size.test.ts": 3401,
+      "src/main/runtime/terminal-list-pending-pty-registration.test.ts": 3228,
+      "src/main/runtime/terminal-list-stale-leaf-liveness.test.ts": 3332,
+      "src/main/runtime/terminal-list-surface-lost-orphan.test.ts": 3567,
+      "src/main/runtime/terminal-mobile-subscribe-tab-mount.test.ts": 3510,
+      "src/main/runtime/terminal-model-query-authority.test.ts": 64,
+      "src/main/runtime/terminal-orphan-owner.test.ts": 28,
+      "src/main/runtime/terminal-orphan-topology.test.ts": 52,
+      "src/main/runtime/terminal-pane-recovery-liveness-gate.test.ts": 2841,
+      "src/main/runtime/terminal-projection.test.ts": 3216,
+      "src/main/runtime/terminal-pty-exit-waiter.test.ts": 2056,
+      "src/main/runtime/terminal-query-responder.test.ts": 13500,
+      "src/main/runtime/terminal-restore-record-seed.test.ts": 3311,
+      "src/main/runtime/terminal-retirement-async-durability.test.ts": 3860,
+      "src/main/runtime/terminal-retirement-proof-emitted-frame.test.ts": 3415,
+      "src/main/runtime/terminal-retirement-proof-publication.test.ts": 3354,
+      "src/main/runtime/terminal-send-stale-leaf-liveness.test.ts": 3416,
+      "src/main/runtime/terminal-shell-override-host-support.test.ts": 42,
+      "src/main/runtime/terminal-subscribe-exit-waiter-leak.test.ts": 1849,
+      "src/main/runtime/terminal-subscriber-driven-daemon-attach.test.ts": 4855,
+      "src/main/runtime/terminal-tail-buffer.test.ts": 5683,
+      "src/main/runtime/terminal-tail-row-retention.test.ts": 314,
+      "src/main/runtime/terminal-tail-sentinel-index.test.ts": 2880,
+      "src/main/runtime/terminal-tail-whitespace.test.ts": 80,
+      "src/main/runtime/terminal-vertical-control-scan.test.ts": 74,
+      "src/main/runtime/terminal-wait-detection.test.ts": 84,
+      "src/main/runtime/terminal-wait-name-only-idle.test.ts": 7790,
       "src/main/runtime/terminal-wait-results.test.ts": 36,
-      "src/main/runtime/terminal-wait-tail-window.test.ts": 174,
-      "src/main/runtime/tui-idle-delivery-and-quiescence.test.ts": 5347,
-      "src/main/runtime/tui-idle-evidence.test.ts": 67,
-      "src/main/runtime/tui-idle-name-only-real-pty.integration.test.ts": 20812,
-      "src/main/runtime/unreadable-secret-store-preservation.win32.test.ts": 61,
-      "src/main/runtime/wait-blocked-check-state.test.ts": 118,
-      "src/main/runtime/wait-blocked-keyword-carry-retention.test.ts": 2598,
-      "src/main/runtime/windows-default-route-interfaces.test.ts": 52,
-      "src/main/runtime/windows-drive-listing.test.ts": 47,
-      "src/main/runtime/windows-firewall-remote-scope.test.ts": 87,
-      "src/main/runtime/windows-mobile-firewall.test.ts": 54,
-      "src/main/runtime/workspace-session-membership-scaling.test.ts": 79,
-      "src/main/runtime/workspace-session-worktree-id.test.ts": 208,
-      "src/main/runtime/worktree-launch-host-repo.test.ts": 35,
-      "src/main/runtime/worktree-list-host-scope.test.ts": 400,
-      "src/main/runtime/worktree-path-selector-wsl-posix.test.ts": 2915,
-      "src/main/runtime/worktree-ps-degraded-repo-scan.test.ts": 3105,
-      "src/main/runtime/worktree-ps-host-scope.test.ts": 2922,
-      "src/main/runtime/worktree-rm-id-selector-path-spelling.test.ts": 3173,
-      "src/main/runtime/worktree-scan-admin-fingerprint-gate.test.ts": 9168,
-      "src/main/runtime/worktree-scan-execution-host-routing.test.ts": 3254,
-      "src/main/runtime/worktree-teardown-unstopped-pty.test.ts": 389,
-      "src/main/runtime/worktree-teardown.test.ts": 1449,
-      "src/main/runtime/worktree-terminal-mutation-lock.test.ts": 64,
-      "src/main/runtime/zcode-readiness-transcript.test.ts": 3640,
-      "src/main/serve-update-handoff.app-environment.test.ts": 1174,
-      "src/main/serve-update-handoff.test.ts": 49,
-      "src/main/server/serve-readiness.test.ts": 60,
-      "src/main/server/serve-stdout-boundary.test.ts": 44,
-      "src/main/shell-prompt-readiness-probe.test.ts": 87,
-      "src/main/shell-startup-identity-scanner.test.ts": 34,
+      "src/main/runtime/terminal-wait-tail-window.test.ts": 173,
+      "src/main/runtime/tui-idle-delivery-and-quiescence.test.ts": 5355,
+      "src/main/runtime/tui-idle-evidence.test.ts": 75,
+      "src/main/runtime/tui-idle-name-only-real-pty.integration.test.ts": 20972,
+      "src/main/runtime/unreadable-secret-store-preservation.win32.test.ts": 38,
+      "src/main/runtime/wait-blocked-check-state.test.ts": 93,
+      "src/main/runtime/wait-blocked-keyword-carry-retention.test.ts": 2640,
+      "src/main/runtime/windows-default-route-interfaces.test.ts": 43,
+      "src/main/runtime/windows-drive-listing.test.ts": 65,
+      "src/main/runtime/windows-firewall-remote-scope.test.ts": 53,
+      "src/main/runtime/windows-mobile-firewall.test.ts": 101,
+      "src/main/runtime/workspace-session-membership-scaling.test.ts": 47,
+      "src/main/runtime/workspace-session-worktree-id.test.ts": 124,
+      "src/main/runtime/worktree-launch-host-repo.test.ts": 42,
+      "src/main/runtime/worktree-list-host-scope.test.ts": 479,
+      "src/main/runtime/worktree-path-selector-wsl-posix.test.ts": 2032,
+      "src/main/runtime/worktree-ps-degraded-repo-scan.test.ts": 2660,
+      "src/main/runtime/worktree-ps-host-scope.test.ts": 3244,
+      "src/main/runtime/worktree-rm-id-selector-path-spelling.test.ts": 3632,
+      "src/main/runtime/worktree-scan-admin-fingerprint-gate.test.ts": 2610,
+      "src/main/runtime/worktree-scan-execution-host-routing.test.ts": 2961,
+      "src/main/runtime/worktree-teardown-unstopped-pty.test.ts": 436,
+      "src/main/runtime/worktree-teardown.test.ts": 1806,
+      "src/main/runtime/worktree-terminal-mutation-lock.test.ts": 104,
+      "src/main/runtime/zcode-readiness-transcript.test.ts": 3116,
+      "src/main/serve-update-handoff.app-environment.test.ts": 860,
+      "src/main/serve-update-handoff.test.ts": 42,
+      "src/main/server/serve-readiness.test.ts": 67,
+      "src/main/server/serve-stdout-boundary.test.ts": 39,
+      "src/main/shell-prompt-readiness-probe.test.ts": 55,
+      "src/main/shell-startup-identity-scanner.test.ts": 39,
       "src/main/shell-startup-output-scanner.test.ts": 67,
-      "src/main/shell-wrapper-content-address.test.ts": 63,
-      "src/main/shell-wrapper-generated-file-snapshot.test.ts": 94,
-      "src/main/sidecar-snapshot-file.test.ts": 71,
-      "src/main/skills/agent-skill-selection.test.ts": 113,
-      "src/main/skills/claude-plugin-skill-sources-wsl.test.ts": 76,
-      "src/main/skills/claude-plugin-skill-sources.test.ts": 72,
-      "src/main/skills/discovery-filter-sharing.test.ts": 409,
-      "src/main/skills/discovery-source-filter-order.test.ts": 151,
-      "src/main/skills/discovery.test.ts": 264,
-      "src/main/skills/skill-bundle-artifacts.test.ts": 175,
-      "src/main/skills/skill-bundle-creation.test.ts": 695,
-      "src/main/skills/skill-bundle-install-service.test.ts": 530,
-      "src/main/skills/skill-bundle-observability-summary.test.ts": 49,
-      "src/main/skills/skill-bundle-process-termination-child.test.ts": 245,
-      "src/main/skills/skill-bundle-process-termination.integration.test.ts": 198,
-      "src/main/skills/skill-bundle-ssh-relay-service.test.ts": 307,
-      "src/main/skills/skill-candidate-concurrency.test.ts": 62,
-      "src/main/skills/skill-client-mediated-transfer-cancellation.test.ts": 188,
-      "src/main/skills/skill-client-mediated-transfer.test.ts": 215,
-      "src/main/skills/skill-cloud-direct-upload.test.ts": 171,
-      "src/main/skills/skill-cloud-grant-installation.test.ts": 149,
-      "src/main/skills/skill-cloud-install-target.test.ts": 49,
-      "src/main/skills/skill-cloud-request.test.ts": 148,
-      "src/main/skills/skill-cloud-service.test.ts": 479,
-      "src/main/skills/skill-delete/plan.test.ts": 265,
-      "src/main/skills/skill-delete/recovery.test.ts": 247,
-      "src/main/skills/skill-delete/roots.test.ts": 90,
-      "src/main/skills/skill-delete/service.test.ts": 533,
-      "src/main/skills/skill-delete/staging-visibility.test.ts": 86,
+      "src/main/shell-wrapper-content-address.test.ts": 67,
+      "src/main/shell-wrapper-generated-file-snapshot.test.ts": 111,
+      "src/main/sidecar-snapshot-file.test.ts": 52,
+      "src/main/skills/agent-skill-selection.test.ts": 142,
+      "src/main/skills/claude-plugin-skill-sources-wsl.test.ts": 85,
+      "src/main/skills/claude-plugin-skill-sources.test.ts": 42,
+      "src/main/skills/discovery-filter-sharing.test.ts": 275,
+      "src/main/skills/discovery-source-filter-order.test.ts": 127,
+      "src/main/skills/discovery.test.ts": 199,
+      "src/main/skills/skill-bundle-artifacts.test.ts": 114,
+      "src/main/skills/skill-bundle-creation.test.ts": 456,
+      "src/main/skills/skill-bundle-install-service.test.ts": 533,
+      "src/main/skills/skill-bundle-observability-summary.test.ts": 47,
+      "src/main/skills/skill-bundle-process-termination-child.test.ts": 248,
+      "src/main/skills/skill-bundle-process-termination.integration.test.ts": 205,
+      "src/main/skills/skill-bundle-ssh-relay-service.test.ts": 339,
+      "src/main/skills/skill-candidate-concurrency.test.ts": 84,
+      "src/main/skills/skill-client-mediated-transfer-cancellation.test.ts": 105,
+      "src/main/skills/skill-client-mediated-transfer.test.ts": 197,
+      "src/main/skills/skill-cloud-direct-upload.test.ts": 182,
+      "src/main/skills/skill-cloud-grant-installation.test.ts": 172,
+      "src/main/skills/skill-cloud-install-target.test.ts": 28,
+      "src/main/skills/skill-cloud-request.test.ts": 152,
+      "src/main/skills/skill-cloud-service.test.ts": 377,
+      "src/main/skills/skill-delete/plan.test.ts": 272,
+      "src/main/skills/skill-delete/recovery.test.ts": 253,
+      "src/main/skills/skill-delete/roots.test.ts": 71,
+      "src/main/skills/skill-delete/service.test.ts": 549,
+      "src/main/skills/skill-delete/staging-visibility.test.ts": 96,
       "src/main/skills/skill-delete/wsl-enumeration-protocol.test.ts": 44,
-      "src/main/skills/skill-discovery-concurrency.test.ts": 233,
-      "src/main/skills/skill-discovery-order.test.ts": 472,
-      "src/main/skills/skill-discovery-source-filter.test.ts": 30,
-      "src/main/skills/skill-discovery-target.test.ts": 101,
-      "src/main/skills/skill-discovery-wsl-alias-sharing.test.ts": 90,
-      "src/main/skills/skill-discovery-wsl-bash-filter.test.ts": 2757,
-      "src/main/skills/skill-discovery-wsl-plugins.test.ts": 75,
-      "src/main/skills/skill-discovery-wsl-script-roundtrip.test.ts": 149,
-      "src/main/skills/skill-discovery-wsl.test.ts": 136,
-      "src/main/skills/skill-freshness-eligibility.test.ts": 50,
-      "src/main/skills/skill-freshness-inventory-limits.test.ts": 156,
-      "src/main/skills/skill-freshness-inventory.test.ts": 2442,
-      "src/main/skills/skill-git-tree-identity.test.ts": 123,
-      "src/main/skills/skill-install-destinations.test.ts": 83,
-      "src/main/skills/skill-install-discovery-verification.test.ts": 117,
-      "src/main/skills/skill-install-lock-release.test.ts": 29,
-      "src/main/skills/skill-install-lock.test.ts": 405,
-      "src/main/skills/skill-install-management-service.test.ts": 230,
-      "src/main/skills/skill-install-provenance.test.ts": 84,
-      "src/main/skills/skill-install-recovery.test.ts": 486,
-      "src/main/skills/skill-install-request-service.test.ts": 589,
-      "src/main/skills/skill-install-service.test.ts": 1201,
-      "src/main/skills/skill-install-transaction.test.ts": 1904,
-      "src/main/skills/skill-operation-observability.test.ts": 318,
-      "src/main/skills/skill-package-creation.test.ts": 443,
-      "src/main/skills/skill-package-deterministic-gzip.test.ts": 1019,
-      "src/main/skills/skill-package-download.test.ts": 285,
-      "src/main/skills/skill-package-identity.test.ts": 166,
-      "src/main/skills/skill-package-tar.test.ts": 277,
-      "src/main/skills/skill-placement-alias-repair.test.ts": 214,
-      "src/main/skills/skill-placement-copy-drift.test.ts": 182,
-      "src/main/skills/skill-placement-reconciliation.test.ts": 231,
-      "src/main/skills/skill-placement-transaction.test.ts": 186,
-      "src/main/skills/skill-plugin-cache-scan.test.ts": 899,
-      "src/main/skills/skill-process-contention-child.test.ts": 209,
-      "src/main/skills/skill-process-contention.integration.test.ts": 158,
-      "src/main/skills/skill-process-termination-child.test.ts": 174,
-      "src/main/skills/skill-process-termination.integration.test.ts": 220,
-      "src/main/skills/skill-provider-destinations.test.ts": 36,
-      "src/main/skills/skill-provider-runtime-roots.test.ts": 60,
-      "src/main/skills/skill-remote-error-category-parity.test.ts": 143,
-      "src/main/skills/skill-remote-install-cancellation.test.ts": 48,
-      "src/main/skills/skill-remote-install-service.test.ts": 240,
-      "src/main/skills/skill-remove-transaction.test.ts": 652,
-      "src/main/skills/skill-root-file-walk.test.ts": 95,
-      "src/main/skills/skill-runtime-capability.test.ts": 66,
-      "src/main/skills/skill-scan-coalescer.test.ts": 64,
-      "src/main/skills/skill-share-preparation-service.test.ts": 462,
-      "src/main/skills/skill-ssh-relay-service.test.ts": 221,
-      "src/main/skills/skill-transaction-startup-recovery.test.ts": 406,
-      "src/main/skills/skill-update-convergence.test.ts": 55,
-      "src/main/skills/skill-update-outcome.test.ts": 311,
-      "src/main/skills/skill-update-registration.test.ts": 65,
-      "src/main/skills/skill-update-run.test.ts": 188,
-      "src/main/skills/skill-upload-process-restart-child.test.ts": 167,
-      "src/main/skills/skill-upload-process-restart.integration.test.ts": 186,
-      "src/main/skills/skill-upload-session-admission-regression.test.ts": 187,
-      "src/main/skills/skill-upload-session-service.test.ts": 326,
-      "src/main/skills/skill-windows-rename-contention.integration.test.ts": 30,
-      "src/main/skills/skill-windows-workspace.integration.test.ts": 250,
-      "src/main/skills/skill-wsl-delete.integration.test.ts": 81,
-      "src/main/skills/skill-wsl-install-filesystem.test.ts": 85,
-      "src/main/skills/skill-wsl-install-transaction.integration.test.ts": 222,
-      "src/main/skills/skill-wsl-posix-semantics.integration.test.ts": 264,
-      "src/main/skills/skill-wsl-provider-detection.test.ts": 58,
-      "src/main/source-control/forge-provider.test.ts": 239,
-      "src/main/source-control/hosted-review-azure-devops.integration.test.ts": 726,
-      "src/main/source-control/hosted-review-base-ref-suffix.test.ts": 208,
-      "src/main/source-control/hosted-review-bitbucket.integration.test.ts": 901,
-      "src/main/source-control/hosted-review-branch-cache.test.ts": 735,
-      "src/main/source-control/hosted-review-creation-eligibility.test.ts": 229,
-      "src/main/source-control/hosted-review-creation-gitlab-self-hosted.test.ts": 222,
-      "src/main/source-control/hosted-review-creation-shared-symlinks.test.ts": 230,
-      "src/main/source-control/hosted-review-creation.test.ts": 281,
-      "src/main/source-control/hosted-review-dirty-preflight-wsl-paths.test.ts": 216,
-      "src/main/source-control/hosted-review-execution-host-routing.test.ts": 130,
-      "src/main/source-control/hosted-review-gitea.integration.test.ts": 905,
-      "src/main/source-control/hosted-review.test.ts": 218,
-      "src/main/source-control/pull-request-linked-issue.test.ts": 53,
-      "src/main/source-control/repo-default-branch.test.ts": 84,
-      "src/main/source-control/stacked-hosted-review-creation.test.ts": 59,
-      "src/main/speech/model-catalog.test.ts": 29,
-      "src/main/speech/model-manager-download-error.test.ts": 62,
-      "src/main/speech/model-manager-download-resume.test.ts": 3113,
-      "src/main/speech/model-manager-progress-callback.test.ts": 88,
-      "src/main/speech/model-manager-stream-cleanup.test.ts": 109,
-      "src/main/speech/model-manager-windows-path.test.ts": 172,
-      "src/main/speech/model-manager.test.ts": 141,
-      "src/main/speech/openai-api-key-store.test.ts": 82,
-      "src/main/speech/openai-transcription-client.test.ts": 57,
-      "src/main/speech/speech-model-deletion.test.ts": 207,
-      "src/main/speech/speech-model-download-response.test.ts": 51,
-      "src/main/speech/stt-offline-audio-chunker.test.ts": 214,
-      "src/main/speech/stt-service.test.ts": 105,
-      "src/main/speech/stt-worker-model-config.test.ts": 60,
-      "src/main/speech/stt-worker.test.ts": 44,
-      "src/main/sqlite/sqlite-read-failure.test.ts": 46,
-      "src/main/sqlite/sync-database.test.ts": 853,
-      "src/main/ssh-expired-lease-pane-readoption.test.ts": 1299,
-      "src/main/ssh-reattach-pane-cardinality.test.ts": 1417,
-      "src/main/ssh/orcad-activation-gate.test.ts": 58,
-      "src/main/ssh/orcad-activation-record.test.ts": 40,
-      "src/main/ssh/orcad-remote-deploy.test.ts": 259,
-      "src/main/ssh/orcad-remote-gc.test.ts": 126,
-      "src/main/ssh/orcad-remote-launch.test.ts": 147,
-      "src/main/ssh/orcad-remote-rollback.test.ts": 285,
-      "src/main/ssh/orcad-remote-shell-commands.integration.test.ts": 4689,
-      "src/main/ssh/orcad-state-snapshot.test.ts": 159,
-      "src/main/ssh/orcad-update-plan.test.ts": 49,
-      "src/main/ssh/relay-native-dependency-coverage.test.ts": 773,
-      "src/main/ssh/relay-protocol-backpressure.test.ts": 94,
-      "src/main/ssh/relay-protocol.test.ts": 172,
-      "src/main/ssh/relay-socket-path-limit-shell.integration.test.ts": 159,
-      "src/main/ssh/relay-socket-path-limit.test.ts": 210,
-      "src/main/ssh/remote-install-coexistence.test.ts": 44,
-      "src/main/ssh/remote-install-model.test.ts": 196,
-      "src/main/ssh/removed-ssh-target-tombstone-retention.test.ts": 66,
-      "src/main/ssh/sftp-namespace-resolution.test.ts": 109,
-      "src/main/ssh/sftp-stream-late-error.test.ts": 185,
-      "src/main/ssh/sftp-upload.test.ts": 198,
-      "src/main/ssh/ssh-agent-identity-filter.test.ts": 64,
-      "src/main/ssh/ssh-channel-multiplexer-backpressure.test.ts": 134,
-      "src/main/ssh/ssh-channel-multiplexer-saturation-wedge.test.ts": 72,
-      "src/main/ssh/ssh-channel-multiplexer-settlement.test.ts": 51,
-      "src/main/ssh/ssh-channel-multiplexer.test.ts": 100,
-      "src/main/ssh/ssh-config-alias-claim.test.ts": 38,
-      "src/main/ssh/ssh-config-host-picker.test.ts": 335,
-      "src/main/ssh/ssh-config-loader-regression.test.ts": 138,
-      "src/main/ssh/ssh-config-loader.test.ts": 169,
-      "src/main/ssh/ssh-config-parser-host-patterns.test.ts": 59,
-      "src/main/ssh/ssh-config-parser.test.ts": 282,
-      "src/main/ssh/ssh-config-resolver.test.ts": 88,
-      "src/main/ssh/ssh-connect-attempt-cancellation.test.ts": 108,
-      "src/main/ssh/ssh-connection-auth-fallback.test.ts": 266,
-      "src/main/ssh/ssh-connection-channel-open.test.ts": 822,
-      "src/main/ssh/ssh-connection-direct-startup.test.ts": 170,
-      "src/main/ssh/ssh-connection-file-transfer.test.ts": 167,
-      "src/main/ssh/ssh-connection-generation.test.ts": 70,
-      "src/main/ssh/ssh-connection-github-probe.test.ts": 122,
-      "src/main/ssh/ssh-connection-gssapi-fallback.test.ts": 441,
-      "src/main/ssh/ssh-connection-host-key-store-wiring.test.ts": 678,
-      "src/main/ssh/ssh-connection-host-key-verification.test.ts": 222,
-      "src/main/ssh/ssh-connection-manager-registry.test.ts": 188,
-      "src/main/ssh/ssh-connection-manager.test.ts": 56,
-      "src/main/ssh/ssh-connection-reconnect-ladder.test.ts": 327,
-      "src/main/ssh/ssh-connection-sftp-namespace.test.ts": 970,
-      "src/main/ssh/ssh-connection-sftp-wire.test.ts": 2698,
-      "src/main/ssh/ssh-connection-store.test.ts": 108,
-      "src/main/ssh/ssh-connection-system-transport.test.ts": 211,
-      "src/main/ssh/ssh-connection-utils.test.ts": 258,
-      "src/main/ssh/ssh-connection.test.ts": 285,
-      "src/main/ssh/ssh-control-socket.test.ts": 53,
-      "src/main/ssh/ssh-file-stream-inactivity-deadline.test.ts": 61,
-      "src/main/ssh/ssh-file-transfer-abort.test.ts": 150,
-      "src/main/ssh/ssh-filesystem-stream-retention.test.ts": 171,
-      "src/main/ssh/ssh-g-config-resolution.test.ts": 136,
-      "src/main/ssh/ssh-git-response-stream-reader.test.ts": 59,
-      "src/main/ssh/ssh-git-stream-idle-timer.test.ts": 73,
-      "src/main/ssh/ssh-host-key-decision.test.ts": 42,
-      "src/main/ssh/ssh-host-key-store.test.ts": 218,
-      "src/main/ssh/ssh-host-key-verifier.test.ts": 114,
-      "src/main/ssh/ssh-known-hosts-source.test.ts": 132,
-      "src/main/ssh/ssh-known-hosts.test.ts": 98,
-      "src/main/ssh/ssh-multi-factor-authentication.test.ts": 1340,
-      "src/main/ssh/ssh-multi-key-authentication.test.ts": 182,
-      "src/main/ssh/ssh-multiplexer-transport-writer.test.ts": 71,
-      "src/main/ssh/ssh-multiplexer-writer-retention.test.ts": 582,
-      "src/main/ssh/ssh-orphan-relay-pty-sweep.test.ts": 95,
-      "src/main/ssh/ssh-orphan-sweep-pane-state-verdicts.test.ts": 105,
-      "src/main/ssh/ssh-owner-recovery-retry.test.ts": 90,
-      "src/main/ssh/ssh-pending-pty-kill-replay.test.ts": 87,
-      "src/main/ssh/ssh-port-forward.test.ts": 232,
-      "src/main/ssh/ssh-port-scanner.test.ts": 74,
-      "src/main/ssh/ssh-posix-command-wrapper.test.ts": 116,
-      "src/main/ssh/ssh-provider-authority.test.ts": 77,
-      "src/main/ssh/ssh-proxy-command.test.ts": 142,
-      "src/main/ssh/ssh-pty-consumer-recovery.test.ts": 50,
-      "src/main/ssh/ssh-pty-consumer-session.test.ts": 60,
-      "src/main/ssh/ssh-pty-recovery-retention-budget.test.ts": 63,
-      "src/main/ssh/ssh-pty-retired-source-deliveries.test.ts": 68,
-      "src/main/ssh/ssh-reconnect-error-classification.test.ts": 130,
-      "src/main/ssh/ssh-reconnect-ladder.test.ts": 112,
-      "src/main/ssh/ssh-relay-build-toolchain.test.ts": 168,
-      "src/main/ssh/ssh-relay-bundled-ripgrep.docker.test.ts": 201,
-      "src/main/ssh/ssh-relay-cross-version-isolation.test.ts": 398,
-      "src/main/ssh/ssh-relay-deploy-helpers.test.ts": 509,
-      "src/main/ssh/ssh-relay-deploy-incumbent-verdict.test.ts": 160,
-      "src/main/ssh/ssh-relay-deploy-staged-upload.test.ts": 431,
-      "src/main/ssh/ssh-relay-deploy-windows-pipe.test.ts": 247,
-      "src/main/ssh/ssh-relay-deploy.test.ts": 956,
-      "src/main/ssh/ssh-relay-endpoint-incumbent-shell.integration.test.ts": 2762,
-      "src/main/ssh/ssh-relay-endpoint-incumbent.test.ts": 177,
-      "src/main/ssh/ssh-relay-endpoint-takeover.test.ts": 156,
-      "src/main/ssh/ssh-relay-gc-retry.test.ts": 261,
-      "src/main/ssh/ssh-relay-incumbent-process.test.ts": 16149,
-      "src/main/ssh/ssh-relay-install-lock.test.ts": 142,
-      "src/main/ssh/ssh-relay-install-namespace.test.ts": 222,
-      "src/main/ssh/ssh-relay-live-connect.test.ts": 315,
-      "src/main/ssh/ssh-relay-native-deps-cache-deploy.test.ts": 1511,
-      "src/main/ssh/ssh-relay-native-deps-cache-shell.test.ts": 449,
-      "src/main/ssh/ssh-relay-native-deps-cache.test.ts": 188,
-      "src/main/ssh/ssh-relay-native-deps-install-staged-upload.test.ts": 233,
-      "src/main/ssh/ssh-relay-native-deps-install.test.ts": 14675,
-      "src/main/ssh/ssh-relay-native-deps-probe-verdict.test.ts": 433,
-      "src/main/ssh/ssh-relay-node-headers.test.ts": 930,
+      "src/main/skills/skill-discovery-concurrency.test.ts": 194,
+      "src/main/skills/skill-discovery-order.test.ts": 565,
+      "src/main/skills/skill-discovery-source-filter.test.ts": 43,
+      "src/main/skills/skill-discovery-target.test.ts": 116,
+      "src/main/skills/skill-discovery-wsl-alias-sharing.test.ts": 108,
+      "src/main/skills/skill-discovery-wsl-bash-filter.test.ts": 3445,
+      "src/main/skills/skill-discovery-wsl-plugins.test.ts": 87,
+      "src/main/skills/skill-discovery-wsl-script-roundtrip.test.ts": 115,
+      "src/main/skills/skill-discovery-wsl.test.ts": 106,
+      "src/main/skills/skill-freshness-eligibility.test.ts": 92,
+      "src/main/skills/skill-freshness-inventory-limits.test.ts": 174,
+      "src/main/skills/skill-freshness-inventory.test.ts": 1854,
+      "src/main/skills/skill-git-tree-identity.test.ts": 122,
+      "src/main/skills/skill-install-destinations.test.ts": 75,
+      "src/main/skills/skill-install-discovery-verification.test.ts": 87,
+      "src/main/skills/skill-install-lock-release.test.ts": 70,
+      "src/main/skills/skill-install-lock.test.ts": 398,
+      "src/main/skills/skill-install-management-service.test.ts": 327,
+      "src/main/skills/skill-install-provenance.test.ts": 61,
+      "src/main/skills/skill-install-recovery.test.ts": 479,
+      "src/main/skills/skill-install-request-service.test.ts": 421,
+      "src/main/skills/skill-install-service.test.ts": 1067,
+      "src/main/skills/skill-install-transaction.test.ts": 2836,
+      "src/main/skills/skill-operation-observability.test.ts": 316,
+      "src/main/skills/skill-package-creation.test.ts": 427,
+      "src/main/skills/skill-package-deterministic-gzip.test.ts": 1123,
+      "src/main/skills/skill-package-download.test.ts": 270,
+      "src/main/skills/skill-package-identity.test.ts": 196,
+      "src/main/skills/skill-package-tar.test.ts": 429,
+      "src/main/skills/skill-placement-alias-repair.test.ts": 192,
+      "src/main/skills/skill-placement-copy-drift.test.ts": 110,
+      "src/main/skills/skill-placement-reconciliation.test.ts": 233,
+      "src/main/skills/skill-placement-transaction.test.ts": 233,
+      "src/main/skills/skill-plugin-cache-scan.test.ts": 766,
+      "src/main/skills/skill-process-contention-child.test.ts": 236,
+      "src/main/skills/skill-process-contention.integration.test.ts": 125,
+      "src/main/skills/skill-process-termination-child.test.ts": 228,
+      "src/main/skills/skill-process-termination.integration.test.ts": 169,
+      "src/main/skills/skill-provider-destinations.test.ts": 39,
+      "src/main/skills/skill-provider-runtime-roots.test.ts": 38,
+      "src/main/skills/skill-remote-error-category-parity.test.ts": 228,
+      "src/main/skills/skill-remote-install-cancellation.test.ts": 28,
+      "src/main/skills/skill-remote-install-service.test.ts": 220,
+      "src/main/skills/skill-remove-transaction.test.ts": 494,
+      "src/main/skills/skill-root-file-walk.test.ts": 87,
+      "src/main/skills/skill-runtime-capability.test.ts": 59,
+      "src/main/skills/skill-scan-coalescer.test.ts": 34,
+      "src/main/skills/skill-share-preparation-service.test.ts": 305,
+      "src/main/skills/skill-ssh-relay-service.test.ts": 312,
+      "src/main/skills/skill-transaction-startup-recovery.test.ts": 332,
+      "src/main/skills/skill-update-convergence.test.ts": 76,
+      "src/main/skills/skill-update-outcome.test.ts": 306,
+      "src/main/skills/skill-update-registration.test.ts": 30,
+      "src/main/skills/skill-update-run.test.ts": 157,
+      "src/main/skills/skill-upload-process-restart-child.test.ts": 158,
+      "src/main/skills/skill-upload-process-restart.integration.test.ts": 155,
+      "src/main/skills/skill-upload-session-admission-regression.test.ts": 199,
+      "src/main/skills/skill-upload-session-service.test.ts": 240,
+      "src/main/skills/skill-windows-rename-contention.integration.test.ts": 43,
+      "src/main/skills/skill-windows-workspace.integration.test.ts": 180,
+      "src/main/skills/skill-wsl-delete.integration.test.ts": 55,
+      "src/main/skills/skill-wsl-install-filesystem.test.ts": 63,
+      "src/main/skills/skill-wsl-install-transaction.integration.test.ts": 256,
+      "src/main/skills/skill-wsl-posix-semantics.integration.test.ts": 225,
+      "src/main/skills/skill-wsl-provider-detection.test.ts": 46,
+      "src/main/source-control/forge-provider.test.ts": 259,
+      "src/main/source-control/hosted-review-azure-devops.integration.test.ts": 548,
+      "src/main/source-control/hosted-review-base-ref-suffix.test.ts": 210,
+      "src/main/source-control/hosted-review-bitbucket.integration.test.ts": 1294,
+      "src/main/source-control/hosted-review-branch-cache.test.ts": 669,
+      "src/main/source-control/hosted-review-creation-eligibility.test.ts": 325,
+      "src/main/source-control/hosted-review-creation-gitlab-self-hosted.test.ts": 194,
+      "src/main/source-control/hosted-review-creation-shared-symlinks.test.ts": 192,
+      "src/main/source-control/hosted-review-creation.test.ts": 230,
+      "src/main/source-control/hosted-review-dirty-preflight-wsl-paths.test.ts": 222,
+      "src/main/source-control/hosted-review-execution-host-routing.test.ts": 101,
+      "src/main/source-control/hosted-review-gitea.integration.test.ts": 850,
+      "src/main/source-control/hosted-review.test.ts": 112,
+      "src/main/source-control/pull-request-linked-issue.test.ts": 54,
+      "src/main/source-control/repo-default-branch.test.ts": 88,
+      "src/main/source-control/stacked-hosted-review-creation.test.ts": 44,
+      "src/main/speech/model-catalog.test.ts": 41,
+      "src/main/speech/model-manager-download-error.test.ts": 83,
+      "src/main/speech/model-manager-download-resume.test.ts": 3099,
+      "src/main/speech/model-manager-progress-callback.test.ts": 64,
+      "src/main/speech/model-manager-stream-cleanup.test.ts": 77,
+      "src/main/speech/model-manager-windows-path.test.ts": 242,
+      "src/main/speech/model-manager.test.ts": 140,
+      "src/main/speech/openai-api-key-store.test.ts": 53,
+      "src/main/speech/openai-transcription-client.test.ts": 51,
+      "src/main/speech/speech-model-deletion.test.ts": 158,
+      "src/main/speech/speech-model-download-response.test.ts": 62,
+      "src/main/speech/stt-offline-audio-chunker.test.ts": 155,
+      "src/main/speech/stt-service.test.ts": 86,
+      "src/main/speech/stt-worker-model-config.test.ts": 48,
+      "src/main/speech/stt-worker.test.ts": 38,
+      "src/main/sqlite/bun-readonly-wal.test.ts": 137,
+      "src/main/sqlite/sqlite-read-failure.test.ts": 60,
+      "src/main/sqlite/sync-database-concurrent-backup.test.ts": 815,
+      "src/main/sqlite/sync-database-portability.test.ts": 108,
+      "src/main/sqlite/sync-database.test.ts": 806,
+      "src/main/ssh-expired-lease-pane-readoption.test.ts": 1542,
+      "src/main/ssh-reattach-pane-cardinality.test.ts": 1109,
+      "src/main/ssh/orcad-activation-gate.test.ts": 56,
+      "src/main/ssh/orcad-activation-record.test.ts": 44,
+      "src/main/ssh/orcad-artifact-materializer.test.ts": 681,
+      "src/main/ssh/orcad-bun-runtime-materializer.test.ts": 357,
+      "src/main/ssh/orcad-deployment-target.test.ts": 195,
+      "src/main/ssh/orcad-remote-deploy.test.ts": 479,
+      "src/main/ssh/orcad-remote-gc.test.ts": 161,
+      "src/main/ssh/orcad-remote-install-termination.test.ts": 201,
+      "src/main/ssh/orcad-remote-launch.test.ts": 169,
+      "src/main/ssh/orcad-remote-rollback.test.ts": 254,
+      "src/main/ssh/orcad-remote-runtime.test.ts": 228,
+      "src/main/ssh/orcad-remote-shell-commands.integration.test.ts": 4806,
+      "src/main/ssh/orcad-state-snapshot.test.ts": 135,
+      "src/main/ssh/orcad-update-plan.test.ts": 62,
+      "src/main/ssh/relay-native-dependency-coverage.test.ts": 504,
+      "src/main/ssh/relay-protocol-backpressure.test.ts": 103,
+      "src/main/ssh/relay-protocol.test.ts": 70,
+      "src/main/ssh/relay-socket-path-limit-shell.integration.test.ts": 95,
+      "src/main/ssh/relay-socket-path-limit.test.ts": 194,
+      "src/main/ssh/remote-install-coexistence.test.ts": 50,
+      "src/main/ssh/remote-install-gc-termination.test.ts": 195,
+      "src/main/ssh/remote-install-model.test.ts": 224,
+      "src/main/ssh/removed-ssh-target-tombstone-retention.test.ts": 59,
+      "src/main/ssh/sftp-namespace-resolution.test.ts": 94,
+      "src/main/ssh/sftp-stream-late-error.test.ts": 177,
+      "src/main/ssh/sftp-upload.test.ts": 175,
+      "src/main/ssh/ssh-agent-identity-filter.test.ts": 47,
+      "src/main/ssh/ssh-channel-multiplexer-backpressure.test.ts": 98,
+      "src/main/ssh/ssh-channel-multiplexer-saturation-wedge.test.ts": 73,
+      "src/main/ssh/ssh-channel-multiplexer-settlement.test.ts": 77,
+      "src/main/ssh/ssh-channel-multiplexer.test.ts": 63,
+      "src/main/ssh/ssh-config-alias-claim.test.ts": 74,
+      "src/main/ssh/ssh-config-host-picker.test.ts": 318,
+      "src/main/ssh/ssh-config-loader-regression.test.ts": 156,
+      "src/main/ssh/ssh-config-loader.test.ts": 95,
+      "src/main/ssh/ssh-config-parser-host-patterns.test.ts": 51,
+      "src/main/ssh/ssh-config-parser.test.ts": 392,
+      "src/main/ssh/ssh-config-resolver.test.ts": 55,
+      "src/main/ssh/ssh-connect-attempt-cancellation.test.ts": 784,
+      "src/main/ssh/ssh-connection-auth-fallback.test.ts": 232,
+      "src/main/ssh/ssh-connection-channel-open.test.ts": 877,
+      "src/main/ssh/ssh-connection-direct-startup.test.ts": 192,
+      "src/main/ssh/ssh-connection-file-transfer.test.ts": 130,
+      "src/main/ssh/ssh-connection-generation.test.ts": 62,
+      "src/main/ssh/ssh-connection-github-probe.test.ts": 123,
+      "src/main/ssh/ssh-connection-gssapi-fallback.test.ts": 259,
+      "src/main/ssh/ssh-connection-host-key-store-wiring.test.ts": 462,
+      "src/main/ssh/ssh-connection-host-key-verification.test.ts": 157,
+      "src/main/ssh/ssh-connection-manager-registry.test.ts": 163,
+      "src/main/ssh/ssh-connection-manager.test.ts": 60,
+      "src/main/ssh/ssh-connection-reconnect-ladder.test.ts": 420,
+      "src/main/ssh/ssh-connection-sftp-namespace.test.ts": 901,
+      "src/main/ssh/ssh-connection-sftp-wire.test.ts": 2538,
+      "src/main/ssh/ssh-connection-store.test.ts": 100,
+      "src/main/ssh/ssh-connection-system-transport.test.ts": 252,
+      "src/main/ssh/ssh-connection-utils.test.ts": 213,
+      "src/main/ssh/ssh-connection.test.ts": 395,
+      "src/main/ssh/ssh-control-socket.test.ts": 47,
+      "src/main/ssh/ssh-file-stream-inactivity-deadline.test.ts": 68,
+      "src/main/ssh/ssh-file-transfer-abort.test.ts": 109,
+      "src/main/ssh/ssh-filesystem-stream-retention.test.ts": 122,
+      "src/main/ssh/ssh-g-config-resolution.test.ts": 82,
+      "src/main/ssh/ssh-git-response-stream-reader.test.ts": 61,
+      "src/main/ssh/ssh-git-stream-idle-timer.test.ts": 63,
+      "src/main/ssh/ssh-host-key-decision.test.ts": 60,
+      "src/main/ssh/ssh-host-key-store.test.ts": 238,
+      "src/main/ssh/ssh-host-key-verifier.test.ts": 70,
+      "src/main/ssh/ssh-known-hosts-source.test.ts": 104,
+      "src/main/ssh/ssh-known-hosts.test.ts": 106,
+      "src/main/ssh/ssh-multi-factor-authentication.test.ts": 1337,
+      "src/main/ssh/ssh-multi-key-authentication.test.ts": 161,
+      "src/main/ssh/ssh-multiplexer-transport-writer.test.ts": 77,
+      "src/main/ssh/ssh-multiplexer-writer-retention.test.ts": 538,
+      "src/main/ssh/ssh-orphan-relay-pty-sweep.test.ts": 72,
+      "src/main/ssh/ssh-orphan-sweep-pane-state-verdicts.test.ts": 95,
+      "src/main/ssh/ssh-owner-recovery-retry.test.ts": 69,
+      "src/main/ssh/ssh-pending-pty-kill-replay.test.ts": 78,
+      "src/main/ssh/ssh-port-forward.test.ts": 221,
+      "src/main/ssh/ssh-port-scanner.test.ts": 80,
+      "src/main/ssh/ssh-posix-command-wrapper.test.ts": 124,
+      "src/main/ssh/ssh-provider-authority.test.ts": 44,
+      "src/main/ssh/ssh-proxy-command.test.ts": 148,
+      "src/main/ssh/ssh-pty-consumer-recovery.test.ts": 61,
+      "src/main/ssh/ssh-pty-consumer-session.test.ts": 70,
+      "src/main/ssh/ssh-pty-recovery-retention-budget.test.ts": 34,
+      "src/main/ssh/ssh-pty-retired-source-deliveries.test.ts": 46,
+      "src/main/ssh/ssh-reconnect-error-classification.test.ts": 86,
+      "src/main/ssh/ssh-reconnect-ladder.test.ts": 153,
+      "src/main/ssh/ssh-relay-build-toolchain.test.ts": 154,
+      "src/main/ssh/ssh-relay-bundled-ripgrep.docker.test.ts": 318,
+      "src/main/ssh/ssh-relay-cross-version-isolation.test.ts": 265,
+      "src/main/ssh/ssh-relay-deploy-helpers.test.ts": 313,
+      "src/main/ssh/ssh-relay-deploy-incumbent-verdict.test.ts": 260,
+      "src/main/ssh/ssh-relay-deploy-staged-upload.test.ts": 502,
+      "src/main/ssh/ssh-relay-deploy-windows-pipe.test.ts": 207,
+      "src/main/ssh/ssh-relay-deploy.test.ts": 690,
+      "src/main/ssh/ssh-relay-endpoint-incumbent-shell.integration.test.ts": 2168,
+      "src/main/ssh/ssh-relay-endpoint-incumbent.test.ts": 99,
+      "src/main/ssh/ssh-relay-endpoint-takeover.test.ts": 116,
+      "src/main/ssh/ssh-relay-gc-claim-termination.test.ts": 174,
+      "src/main/ssh/ssh-relay-gc-retry.test.ts": 332,
+      "src/main/ssh/ssh-relay-incumbent-process.test.ts": 15877,
+      "src/main/ssh/ssh-relay-install-lock-termination.test.ts": 229,
+      "src/main/ssh/ssh-relay-install-lock.test.ts": 203,
+      "src/main/ssh/ssh-relay-install-namespace.test.ts": 186,
+      "src/main/ssh/ssh-relay-live-connect.test.ts": 214,
+      "src/main/ssh/ssh-relay-native-deps-cache-deploy.test.ts": 1792,
+      "src/main/ssh/ssh-relay-native-deps-cache-gc-real.test.ts": 1158,
+      "src/main/ssh/ssh-relay-native-deps-cache-shell.test.ts": 525,
+      "src/main/ssh/ssh-relay-native-deps-cache.test.ts": 236,
+      "src/main/ssh/ssh-relay-native-deps-install-staged-upload.test.ts": 255,
+      "src/main/ssh/ssh-relay-native-deps-install.test.ts": 14222,
+      "src/main/ssh/ssh-relay-native-deps-probe-verdict.test.ts": 418,
+      "src/main/ssh/ssh-relay-node-headers.test.ts": 1899,
       "src/main/ssh/ssh-relay-node-pty-repair.test.ts": 124,
-      "src/main/ssh/ssh-relay-node-pty-spawn-repair.test.ts": 194,
-      "src/main/ssh/ssh-relay-offline-node-headers.docker.test.ts": 234,
-      "src/main/ssh/ssh-relay-orphan-abandon-paths.test.ts": 2548,
-      "src/main/ssh/ssh-relay-pty-master-cloexec-install.test.ts": 2094,
-      "src/main/ssh/ssh-relay-reset.test.ts": 188,
-      "src/main/ssh/ssh-relay-ripgrep-cache-gc-real.test.ts": 417,
-      "src/main/ssh/ssh-relay-ripgrep-cache-gc.test.ts": 215,
-      "src/main/ssh/ssh-relay-ripgrep-install.test.ts": 419,
-      "src/main/ssh/ssh-relay-sentinel-copy-budget.test.ts": 121,
-      "src/main/ssh/ssh-relay-session-agent-hooks.integration.test.ts": 3197,
-      "src/main/ssh/ssh-relay-session-data-delivery.test.ts": 3378,
-      "src/main/ssh/ssh-relay-session-incarnation.test.ts": 2669,
-      "src/main/ssh/ssh-relay-session-managed-hooks.test.ts": 2224,
-      "src/main/ssh/ssh-relay-session-model-migration.test.ts": 2690,
-      "src/main/ssh/ssh-relay-session-orphan-sweep.test.ts": 1802,
-      "src/main/ssh/ssh-relay-session-pending-kill-replay.test.ts": 2288,
-      "src/main/ssh/ssh-relay-session-reconnect-incarnation.test.ts": 3212,
-      "src/main/ssh/ssh-relay-session-recovery-durability.test.ts": 3545,
-      "src/main/ssh/ssh-relay-session-recovery-races.test.ts": 3578,
-      "src/main/ssh/ssh-relay-session-rejected-delivery.test.ts": 5293,
-      "src/main/ssh/ssh-relay-session-relay-loss.test.ts": 2893,
-      "src/main/ssh/ssh-relay-session-terminal-error.test.ts": 1968,
-      "src/main/ssh/ssh-relay-session.test.ts": 14261,
-      "src/main/ssh/ssh-relay-sftp-namespace-install.test.ts": 548,
-      "src/main/ssh/ssh-relay-superseded-endpoints.test.ts": 138,
-      "src/main/ssh/ssh-relay-upload-cancel.docker.test.ts": 234,
-      "src/main/ssh/ssh-relay-upload-stage-commands.test.ts": 64074,
-      "src/main/ssh/ssh-relay-versioned-install.test.ts": 465,
-      "src/main/ssh/ssh-remote-cli-dispatch-refusal-passthrough.test.ts": 3967,
-      "src/main/ssh/ssh-remote-cli-format.test.ts": 35,
-      "src/main/ssh/ssh-remote-cli-host-passthrough.test.ts": 123,
-      "src/main/ssh/ssh-remote-cli-launcher.test.ts": 94,
-      "src/main/ssh/ssh-remote-cli-terminal-host-scope.test.ts": 3808,
-      "src/main/ssh/ssh-remote-commands.test.ts": 15331,
-      "src/main/ssh/ssh-remote-linear-activity-output.test.ts": 50,
-      "src/main/ssh/ssh-remote-linear-cli.test.ts": 2442,
-      "src/main/ssh/ssh-remote-linear-list-issues.test.ts": 43,
-      "src/main/ssh/ssh-remote-linear-relation-write.test.ts": 1507,
-      "src/main/ssh/ssh-remote-linear-save-issue.test.ts": 1780,
-      "src/main/ssh/ssh-remote-linear-truncation-output.test.ts": 41,
-      "src/main/ssh/ssh-remote-node-resolution.test.ts": 272,
-      "src/main/ssh/ssh-remote-node-toolchain-probe.test.ts": 170,
-      "src/main/ssh/ssh-remote-orca-cli.test.ts": 4932,
-      "src/main/ssh/ssh-remote-orchestration-compatibility.test.ts": 3985,
-      "src/main/ssh/ssh-remote-orchestration-send.test.ts": 55,
-      "src/main/ssh/ssh-remote-platform-detection.test.ts": 240,
-      "src/main/ssh/ssh-remote-platform.test.ts": 164,
-      "src/main/ssh/ssh-remote-powershell.test.ts": 328,
-      "src/main/ssh/ssh-remote-windows-command-line-limit.test.ts": 253,
-      "src/main/ssh/ssh-request-outcome-verdict.test.ts": 55,
-      "src/main/ssh/ssh-security-key-identity.test.ts": 194,
-      "src/main/ssh/ssh-session-limit-error.test.ts": 35,
-      "src/main/ssh/ssh-system-fallback.test.ts": 554,
-      "src/main/ssh/ssh-system-transport.integration.test.ts": 1235,
-      "src/main/ssh/ssh-target-id-migration.test.ts": 61,
-      "src/main/ssh/ssh-target-readoption.test.ts": 48,
-      "src/main/ssh/system-ssh-binary.test.ts": 64,
-      "src/main/ssh/system-ssh-dynamic-forward-process.test.ts": 238,
-      "src/main/ssh/system-ssh-forward-process.test.ts": 173,
-      "src/main/ssh/system-ssh-sftp-args.test.ts": 31,
-      "src/main/ssh/system-ssh-sftp-path.test.ts": 36,
-      "src/main/ssh/system-ssh-windows-upload.test.ts": 449,
-      "src/main/ssh/system-ssh-windows-write-capabilities.test.ts": 38,
+      "src/main/ssh/ssh-relay-node-pty-spawn-repair.test.ts": 215,
+      "src/main/ssh/ssh-relay-offline-node-headers.docker.test.ts": 302,
+      "src/main/ssh/ssh-relay-opencode-runtime-commands.test.ts": 588,
+      "src/main/ssh/ssh-relay-opencode-runtime-retry.test.ts": 77,
+      "src/main/ssh/ssh-relay-opencode-runtime.test.ts": 392,
+      "src/main/ssh/ssh-relay-orphan-abandon-paths.test.ts": 2554,
+      "src/main/ssh/ssh-relay-pty-master-cloexec-install.test.ts": 2127,
+      "src/main/ssh/ssh-relay-repair-lock-termination.test.ts": 237,
+      "src/main/ssh/ssh-relay-reset.test.ts": 133,
+      "src/main/ssh/ssh-relay-ripgrep-cache-gc-real.test.ts": 521,
+      "src/main/ssh/ssh-relay-ripgrep-cache-gc.test.ts": 131,
+      "src/main/ssh/ssh-relay-ripgrep-install.test.ts": 389,
+      "src/main/ssh/ssh-relay-sentinel-copy-budget.test.ts": 115,
+      "src/main/ssh/ssh-relay-session-agent-hooks.integration.test.ts": 4019,
+      "src/main/ssh/ssh-relay-session-data-delivery.test.ts": 2680,
+      "src/main/ssh/ssh-relay-session-incarnation.test.ts": 2776,
+      "src/main/ssh/ssh-relay-session-managed-hooks.test.ts": 2737,
+      "src/main/ssh/ssh-relay-session-model-migration.test.ts": 3018,
+      "src/main/ssh/ssh-relay-session-orphan-sweep.test.ts": 2684,
+      "src/main/ssh/ssh-relay-session-pending-kill-replay.test.ts": 2344,
+      "src/main/ssh/ssh-relay-session-reconnect-incarnation.test.ts": 3189,
+      "src/main/ssh/ssh-relay-session-recovery-durability.test.ts": 4088,
+      "src/main/ssh/ssh-relay-session-recovery-races.test.ts": 3683,
+      "src/main/ssh/ssh-relay-session-rejected-delivery.test.ts": 3066,
+      "src/main/ssh/ssh-relay-session-relay-loss.test.ts": 2301,
+      "src/main/ssh/ssh-relay-session-terminal-error.test.ts": 2096,
+      "src/main/ssh/ssh-relay-session.test.ts": 10932,
+      "src/main/ssh/ssh-relay-sftp-namespace-install.test.ts": 475,
+      "src/main/ssh/ssh-relay-superseded-endpoints.test.ts": 197,
+      "src/main/ssh/ssh-relay-upload-cancel.docker.test.ts": 357,
+      "src/main/ssh/ssh-relay-upload-stage-commands.test.ts": 27518,
+      "src/main/ssh/ssh-relay-versioned-install-termination.test.ts": 155,
+      "src/main/ssh/ssh-relay-versioned-install.test.ts": 549,
+      "src/main/ssh/ssh-remote-cli-dispatch-refusal-passthrough.test.ts": 4113,
+      "src/main/ssh/ssh-remote-cli-format.test.ts": 54,
+      "src/main/ssh/ssh-remote-cli-host-passthrough.test.ts": 200,
+      "src/main/ssh/ssh-remote-cli-launcher.test.ts": 80,
+      "src/main/ssh/ssh-remote-cli-terminal-host-scope.test.ts": 3331,
+      "src/main/ssh/ssh-remote-commands.test.ts": 15974,
+      "src/main/ssh/ssh-remote-linear-activity-output.test.ts": 36,
+      "src/main/ssh/ssh-remote-linear-cli.test.ts": 4061,
+      "src/main/ssh/ssh-remote-linear-list-issues.test.ts": 61,
+      "src/main/ssh/ssh-remote-linear-relation-write.test.ts": 1192,
+      "src/main/ssh/ssh-remote-linear-save-issue.test.ts": 2067,
+      "src/main/ssh/ssh-remote-linear-truncation-output.test.ts": 39,
+      "src/main/ssh/ssh-remote-node-resolution.test.ts": 273,
+      "src/main/ssh/ssh-remote-node-toolchain-probe.test.ts": 241,
+      "src/main/ssh/ssh-remote-orca-cli.test.ts": 3176,
+      "src/main/ssh/ssh-remote-orchestration-compatibility.test.ts": 3146,
+      "src/main/ssh/ssh-remote-orchestration-send.test.ts": 29,
+      "src/main/ssh/ssh-remote-platform-detection.test.ts": 130,
+      "src/main/ssh/ssh-remote-platform.test.ts": 190,
+      "src/main/ssh/ssh-remote-powershell.test.ts": 238,
+      "src/main/ssh/ssh-remote-windows-command-line-limit.test.ts": 222,
+      "src/main/ssh/ssh-request-outcome-verdict.test.ts": 40,
+      "src/main/ssh/ssh-security-key-identity.test.ts": 179,
+      "src/main/ssh/ssh-session-limit-error.test.ts": 27,
+      "src/main/ssh/ssh-system-fallback.test.ts": 556,
+      "src/main/ssh/ssh-system-transport.integration.test.ts": 878,
+      "src/main/ssh/ssh-target-id-migration.test.ts": 41,
+      "src/main/ssh/ssh-target-readoption.test.ts": 64,
+      "src/main/ssh/system-ssh-binary.test.ts": 59,
+      "src/main/ssh/system-ssh-dynamic-forward-process.test.ts": 237,
+      "src/main/ssh/system-ssh-forward-process.test.ts": 233,
+      "src/main/ssh/system-ssh-sftp-args.test.ts": 38,
+      "src/main/ssh/system-ssh-sftp-path.test.ts": 54,
+      "src/main/ssh/system-ssh-windows-upload.test.ts": 415,
+      "src/main/ssh/system-ssh-windows-write-capabilities.test.ts": 56,
       "src/main/ssh/vscode-ssh-authority.test.ts": 73,
-      "src/main/star-nag/service-direct-star.test.ts": 194,
-      "src/main/star-nag/service-force-show-races.test.ts": 238,
-      "src/main/star-nag/service-outcome-telemetry.test.ts": 264,
-      "src/main/star-nag/service-prompt-moments.test.ts": 208,
-      "src/main/star-nag/service-threshold-prompt.test.ts": 201,
-      "src/main/startup/bootstrap-fatal-exit-guard.test.ts": 51,
-      "src/main/startup/branch-rename-hook-structured-session.test.ts": 186,
-      "src/main/startup/browser-process-user-agent-ordering.test.ts": 3371,
-      "src/main/startup/cli-launch-redirect.test.ts": 76,
-      "src/main/startup/configure-process-dev-parent-shutdown.test.ts": 135,
-      "src/main/startup/configure-process-profile-state.test.ts": 97,
-      "src/main/startup/configure-process.test.ts": 570,
-      "src/main/startup/desktop-startup-ordering.test.ts": 63,
-      "src/main/startup/dev-education-suppression.test.ts": 162,
-      "src/main/startup/dev-instance-identity.test.ts": 53,
-      "src/main/startup/ensure-virtual-display.test.ts": 5147,
-      "src/main/startup/first-window-startup-services.test.ts": 46,
-      "src/main/startup/gpu-fallback-marker.test.ts": 39,
-      "src/main/startup/gpu-fallback-switches.test.ts": 49,
-      "src/main/startup/gpu-lifecycle-install-dir-acl-guard.test.ts": 623,
-      "src/main/startup/headless-pty-hydration-ordering.test.ts": 39,
-      "src/main/startup/host-port-bootstrap-wiring.test.ts": 36,
-      "src/main/startup/http1-compatibility-profile-state.test.ts": 86,
-      "src/main/startup/hydrate-shell-path.test.ts": 278,
-      "src/main/startup/hydrate-shell-path.windows.test.ts": 333,
-      "src/main/startup/legacy-worker-renderer-recovery.test.ts": 67,
-      "src/main/startup/login-shell-environment-cache.test.ts": 90,
-      "src/main/startup/login-shell-environment.test.ts": 116,
-      "src/main/startup/main-process-error-guards.test.ts": 112,
-      "src/main/startup/main-process-ready-identity-write.test.ts": 359,
-      "src/main/startup/main-process-ready-persistence-cleanup.test.ts": 162,
-      "src/main/startup/main-process-ready-phase-ordering.test.ts": 312,
-      "src/main/startup/main-window-core-services.test.ts": 41,
-      "src/main/startup/main-window-structured-status-filter.test.ts": 380,
-      "src/main/startup/os-opened-markdown-delivery.test.ts": 324,
-      "src/main/startup/os-opened-markdown-files.test.ts": 169,
-      "src/main/startup/os-opened-markdown-wiring.test.ts": 42,
-      "src/main/startup/pre-gone-crash-sampling-wiring.test.ts": 35,
-      "src/main/startup/profile-state-recovery-preflight.test.ts": 456,
-      "src/main/startup/profile-state-write-failure.test.ts": 97,
-      "src/main/startup/renderer-heap-headroom.test.ts": 59,
-      "src/main/startup/run-electron-vite-dev-web.test.ts": 450,
-      "src/main/startup/run-electron-vite-dev.test.ts": 953,
-      "src/main/startup/secret-protection-report-deferral-wiring.test.ts": 52,
-      "src/main/startup/secure-dns-census.test.ts": 662,
-      "src/main/startup/serve-desktop-activation-wiring.test.ts": 34,
-      "src/main/startup/serve-desktop-activation.test.ts": 38,
-      "src/main/startup/serve-mode-argv-cli-redirect-order.test.ts": 71,
-      "src/main/startup/serve-mode-argv.test.ts": 100,
-      "src/main/startup/serve-options.test.ts": 77,
-      "src/main/startup/serve-signal-handlers.test.ts": 55,
-      "src/main/startup/single-instance-lock-exit.electron.test.ts": 372,
-      "src/main/startup/single-instance-lock-headless-exit.test.ts": 55,
-      "src/main/startup/single-instance-lock.test.ts": 71,
-      "src/main/startup/skill-share-deep-link-state.test.ts": 38,
-      "src/main/startup/startup-diagnostics.test.ts": 35,
-      "src/main/startup/window-all-closed-quit-policy.test.ts": 50,
-      "src/main/startup/windows-desktop-shell-path-startup.test.ts": 52,
-      "src/main/startup/windows-install-dir-acl-probe.test.ts": 123,
-      "src/main/startup/windows-install-dir-acl-recovery.test.ts": 843,
-      "src/main/startup/windows-install-dir-acl-repair.win32.test.ts": 82,
-      "src/main/startup/windows-install-dir-acl-startup-wiring.test.ts": 47,
-      "src/main/startup/windows-install-dir-package-acl-repair.test.ts": 119,
-      "src/main/startup/windows-shell-path-hydration.test.ts": 378,
-      "src/main/startup/windows-shell-path-ownership.test.ts": 71,
-      "src/main/startup/windows-shell-path-restoration.windows.test.ts": 45,
-      "src/main/startup/windows-user-data-acl.test.ts": 59,
-      "src/main/startup/wsl-cli-reconciliation-startup-barrier.test.ts": 55,
-      "src/main/stats/agent-session-transition-recorder.test.ts": 561,
-      "src/main/stats/collector-async-save.test.ts": 1171,
-      "src/main/stats/stats-title-detection-independence.test.ts": 48,
-      "src/main/synthetic-title-frame-routing.test.ts": 26,
-      "src/main/synthetic-title-spinner.test.ts": 61,
-      "src/main/synthetic-title-visibility.test.ts": 28,
-      "src/main/system-fonts.test.ts": 76,
-      "src/main/system-power-lifecycle.test.ts": 37,
-      "src/main/system-resume-broadcast.test.ts": 78,
-      "src/main/telemetry/burst-cap.test.ts": 161,
-      "src/main/telemetry/classify-error.test.ts": 41,
-      "src/main/telemetry/client-lifecycle.test.ts": 255,
-      "src/main/telemetry/client.test.ts": 332,
-      "src/main/telemetry/cohort-classifier.test.ts": 46,
-      "src/main/telemetry/consent.test.ts": 59,
-      "src/main/telemetry/install-id.test.ts": 60,
-      "src/main/telemetry/onboarding-cohort-classifier.test.ts": 210,
-      "src/main/telemetry/onboarding-feature-setup-validator.test.ts": 152,
-      "src/main/telemetry/validator-warn-cache.test.ts": 224,
-      "src/main/telemetry/validator.test.ts": 127,
-      "src/main/terminal-history-async-delete.test.ts": 289,
-      "src/main/terminal-history-gc-fs-call-count.test.ts": 137,
-      "src/main/terminal-history-gc.test.ts": 630,
-      "src/main/terminal-history-tombstone-retry.test.ts": 5136,
-      "src/main/terminal-history.test.ts": 173,
-      "src/main/text-generation/agent-failure-output.test.ts": 46,
-      "src/main/text-generation/command-environment-process.test.ts": 589,
-      "src/main/text-generation/command-environment-wsl.test.ts": 83,
-      "src/main/text-generation/commit-message-agent-environment.test.ts": 78,
-      "src/main/text-generation/commit-message-command-backslash-mode.test.ts": 244,
-      "src/main/text-generation/commit-message-text-generation-branch-name.test.ts": 231,
-      "src/main/text-generation/commit-message-text-generation-cancellation.test.ts": 726,
-      "src/main/text-generation/commit-message-text-generation-failure-sanitization.test.ts": 189,
-      "src/main/text-generation/commit-message-text-generation-generated-output.test.ts": 196,
-      "src/main/text-generation/commit-message-text-generation-linked-issue.test.ts": 224,
-      "src/main/text-generation/commit-message-text-generation-local-subprocess.test.ts": 177,
-      "src/main/text-generation/commit-message-text-generation-model-discovery.test.ts": 287,
-      "src/main/text-generation/commit-message-text-generation-regression.test.ts": 197,
-      "src/main/text-generation/commit-message-text-generation-remote-execution.test.ts": 198,
-      "src/main/text-generation/commit-message-text-generation-settings.test.ts": 304,
-      "src/main/text-generation/omp-model-discovery-policy.test.ts": 46,
+      "src/main/star-nag/service-direct-star.test.ts": 171,
+      "src/main/star-nag/service-force-show-races.test.ts": 260,
+      "src/main/star-nag/service-outcome-telemetry.test.ts": 189,
+      "src/main/star-nag/service-prompt-moments.test.ts": 229,
+      "src/main/star-nag/service-threshold-prompt.test.ts": 214,
+      "src/main/startup/bootstrap-fatal-exit-guard.test.ts": 26,
+      "src/main/startup/branch-rename-hook-structured-session.test.ts": 91,
+      "src/main/startup/browser-process-user-agent-ordering.test.ts": 3534,
+      "src/main/startup/cli-launch-redirect.test.ts": 77,
+      "src/main/startup/configure-process-dev-parent-shutdown.test.ts": 138,
+      "src/main/startup/configure-process-profile-state.test.ts": 86,
+      "src/main/startup/configure-process.test.ts": 457,
+      "src/main/startup/desktop-startup-ordering.test.ts": 54,
+      "src/main/startup/dev-education-suppression.test.ts": 195,
+      "src/main/startup/dev-instance-identity.test.ts": 49,
+      "src/main/startup/ensure-virtual-display.test.ts": 5118,
+      "src/main/startup/first-window-startup-services.test.ts": 59,
+      "src/main/startup/gpu-fallback-marker.test.ts": 51,
+      "src/main/startup/gpu-fallback-switches.test.ts": 61,
+      "src/main/startup/gpu-lifecycle-install-dir-acl-guard.test.ts": 549,
+      "src/main/startup/headless-pty-hydration-ordering.test.ts": 42,
+      "src/main/startup/host-port-bootstrap-wiring.test.ts": 37,
+      "src/main/startup/http1-compatibility-profile-state.test.ts": 65,
+      "src/main/startup/hydrate-shell-path.test.ts": 258,
+      "src/main/startup/hydrate-shell-path.windows.test.ts": 319,
+      "src/main/startup/legacy-worker-renderer-recovery.test.ts": 59,
+      "src/main/startup/login-shell-environment-cache.test.ts": 87,
+      "src/main/startup/login-shell-environment.test.ts": 112,
+      "src/main/startup/main-process-error-guards.test.ts": 73,
+      "src/main/startup/main-process-ready-activation-failure.test.ts": 351,
+      "src/main/startup/main-process-ready-identity-write.test.ts": 356,
+      "src/main/startup/main-process-ready-persistence-cleanup.test.ts": 216,
+      "src/main/startup/main-process-ready-phase-ordering.test.ts": 230,
+      "src/main/startup/main-process-runtime-launch-activation.test.ts": 356,
+      "src/main/startup/main-window-core-services.test.ts": 39,
+      "src/main/startup/main-window-structured-status-filter.test.ts": 347,
+      "src/main/startup/os-opened-markdown-delivery.test.ts": 218,
+      "src/main/startup/os-opened-markdown-files.test.ts": 130,
+      "src/main/startup/os-opened-markdown-wiring.test.ts": 48,
+      "src/main/startup/pre-gone-crash-sampling-wiring.test.ts": 36,
+      "src/main/startup/profile-state-recovery-preflight.test.ts": 556,
+      "src/main/startup/profile-state-write-failure.test.ts": 112,
+      "src/main/startup/renderer-heap-headroom.test.ts": 55,
+      "src/main/startup/run-electron-vite-dev-web.test.ts": 588,
+      "src/main/startup/run-electron-vite-dev.test.ts": 968,
+      "src/main/startup/secret-protection-report-deferral-wiring.test.ts": 58,
+      "src/main/startup/secure-dns-census.test.ts": 789,
+      "src/main/startup/serve-desktop-activation-wiring.test.ts": 30,
+      "src/main/startup/serve-desktop-activation.test.ts": 40,
+      "src/main/startup/serve-mode-argv-cli-redirect-order.test.ts": 53,
+      "src/main/startup/serve-mode-argv.test.ts": 85,
+      "src/main/startup/serve-options.test.ts": 67,
+      "src/main/startup/serve-signal-handlers.test.ts": 52,
+      "src/main/startup/single-instance-lock-exit.electron.test.ts": 622,
+      "src/main/startup/single-instance-lock-headless-exit.test.ts": 44,
+      "src/main/startup/single-instance-lock.test.ts": 59,
+      "src/main/startup/skill-share-deep-link-state.test.ts": 44,
+      "src/main/startup/startup-diagnostics.test.ts": 61,
+      "src/main/startup/window-all-closed-quit-policy.test.ts": 32,
+      "src/main/startup/windows-desktop-shell-path-startup.test.ts": 44,
+      "src/main/startup/windows-install-dir-acl-probe.test.ts": 147,
+      "src/main/startup/windows-install-dir-acl-recovery.test.ts": 887,
+      "src/main/startup/windows-install-dir-acl-repair.win32.test.ts": 78,
+      "src/main/startup/windows-install-dir-acl-startup-wiring.test.ts": 42,
+      "src/main/startup/windows-install-dir-package-acl-repair.test.ts": 112,
+      "src/main/startup/windows-shell-path-hydration.test.ts": 383,
+      "src/main/startup/windows-shell-path-ownership.test.ts": 62,
+      "src/main/startup/windows-shell-path-restoration.windows.test.ts": 51,
+      "src/main/startup/windows-user-data-acl.test.ts": 69,
+      "src/main/startup/wsl-cli-reconciliation-startup-barrier.test.ts": 34,
+      "src/main/stats/agent-session-transition-recorder.test.ts": 665,
+      "src/main/stats/collector-async-save.test.ts": 1081,
+      "src/main/stats/stats-title-detection-independence.test.ts": 45,
+      "src/main/synthetic-title-frame-routing.test.ts": 27,
+      "src/main/synthetic-title-spinner.test.ts": 52,
+      "src/main/synthetic-title-visibility.test.ts": 24,
+      "src/main/system-fonts.test.ts": 80,
+      "src/main/system-power-lifecycle.test.ts": 54,
+      "src/main/system-resume-broadcast.test.ts": 84,
+      "src/main/telemetry/burst-cap.test.ts": 206,
+      "src/main/telemetry/classify-error.test.ts": 43,
+      "src/main/telemetry/client-lifecycle.test.ts": 155,
+      "src/main/telemetry/client.test.ts": 258,
+      "src/main/telemetry/cohort-classifier.test.ts": 59,
+      "src/main/telemetry/consent.test.ts": 31,
+      "src/main/telemetry/install-id.test.ts": 65,
+      "src/main/telemetry/onboarding-cohort-classifier.test.ts": 171,
+      "src/main/telemetry/onboarding-feature-setup-validator.test.ts": 172,
+      "src/main/telemetry/validator-warn-cache.test.ts": 168,
+      "src/main/telemetry/validator.test.ts": 128,
+      "src/main/terminal-history-async-delete.test.ts": 569,
+      "src/main/terminal-history-gc-fs-call-count.test.ts": 181,
+      "src/main/terminal-history-gc.test.ts": 951,
+      "src/main/terminal-history-tombstone-retry.test.ts": 982,
+      "src/main/terminal-history-tombstone-scan-cost.test.ts": 428,
+      "src/main/terminal-history.test.ts": 92,
+      "src/main/text-generation/agent-failure-output.test.ts": 31,
+      "src/main/text-generation/command-environment-process.test.ts": 562,
+      "src/main/text-generation/command-environment-wsl.test.ts": 56,
+      "src/main/text-generation/commit-message-agent-environment.test.ts": 50,
+      "src/main/text-generation/commit-message-command-backslash-mode.test.ts": 182,
+      "src/main/text-generation/commit-message-text-generation-branch-name.test.ts": 172,
+      "src/main/text-generation/commit-message-text-generation-cancellation.test.ts": 672,
+      "src/main/text-generation/commit-message-text-generation-failure-sanitization.test.ts": 127,
+      "src/main/text-generation/commit-message-text-generation-generated-output.test.ts": 149,
+      "src/main/text-generation/commit-message-text-generation-linked-issue.test.ts": 216,
+      "src/main/text-generation/commit-message-text-generation-local-subprocess.test.ts": 228,
+      "src/main/text-generation/commit-message-text-generation-model-discovery.test.ts": 214,
+      "src/main/text-generation/commit-message-text-generation-regression.test.ts": 223,
+      "src/main/text-generation/commit-message-text-generation-remote-execution.test.ts": 215,
+      "src/main/text-generation/commit-message-text-generation-settings.test.ts": 299,
+      "src/main/text-generation/omp-model-discovery-policy.test.ts": 112,
       "src/main/text-generation/pull-request-context-errors.test.ts": 61,
-      "src/main/text-generation/pull-request-context.test.ts": 93,
-      "src/main/tray/system-tray.test.ts": 213,
-      "src/main/tray/tray-attention-icon.test.ts": 71,
-      "src/main/tray/tray-dev-badge.test.ts": 67,
-      "src/main/update-install-exit-watchdog.test.ts": 75,
-      "src/main/updater-changelog.test.ts": 47,
-      "src/main/updater-events.test.ts": 270,
-      "src/main/updater-lifecycle-diagnostics.test.ts": 65,
-      "src/main/updater-linux-package-recovery-actions.test.ts": 2204,
-      "src/main/updater-nudge.test.ts": 51,
-      "src/main/updater-prerelease-feed-readiness.test.ts": 221,
-      "src/main/updater-prerelease-feed.test.ts": 234,
-      "src/main/updater-release-api-token.test.ts": 67,
-      "src/main/updater-release-build-cache.test.ts": 53,
-      "src/main/updater-release-builds.test.ts": 139,
-      "src/main/updater-test-harness.leaked-timers.test.ts": 2842,
-      "src/main/updater-test-module-loader.test.ts": 537,
-      "src/main/updater.build-channel-selection.test.ts": 3890,
-      "src/main/updater.check-failure.test.ts": 2747,
-      "src/main/updater.check-preflight.test.ts": 3562,
-      "src/main/updater.check-settlement.test.ts": 3057,
-      "src/main/updater.fallback.test.ts": 47,
-      "src/main/updater.headless-serve-install.test.ts": 395,
-      "src/main/updater.install-failure-cause.test.ts": 3137,
-      "src/main/updater.linux-externally-managed.test.ts": 2055,
-      "src/main/updater.linux-root-package-install.test.ts": 2569,
-      "src/main/updater.mac-install.test.ts": 56,
-      "src/main/updater.nudge-campaign.test.ts": 2487,
-      "src/main/updater.prerelease-fallback.test.ts": 3858,
-      "src/main/updater.publishing-window-feed.test.ts": 4104,
-      "src/main/updater.quit-and-install.test.ts": 3484,
-      "src/main/updater.startup-scheduling.test.ts": 2533,
-      "src/main/usage-worktree-canonicalizer.test.ts": 46,
-      "src/main/usage-worktree-metadata.test.ts": 61,
-      "src/main/usage/highest-usage-key.test.ts": 47,
-      "src/main/usage/jsonl-line-offsets.test.ts": 55,
-      "src/main/usage/usage-breakdown-scaling.test.ts": 103,
-      "src/main/usage/usage-calendar-range.test.ts": 49,
-      "src/main/usage/usage-provider-store-lifecycle.test.ts": 306,
-      "src/main/usage/usage-scan-worker-client.test.ts": 87,
-      "src/main/usage/usage-scan-worker-event-loop.test.ts": 2953,
-      "src/main/usage/usage-worktree-refs.test.ts": 50,
-      "src/main/usage/usage-worktree-resolver.test.ts": 118,
-      "src/main/warp-themes/discovery.test.ts": 112,
-      "src/main/warp-themes/index.test.ts": 692,
-      "src/main/warp-themes/manual-warp-theme-files.test.ts": 124,
-      "src/main/warp-themes/parser-runner.test.ts": 48,
-      "src/main/warp-themes/parser.test.ts": 75,
-      "src/main/warp-themes/theme-file-scanner.test.ts": 73,
-      "src/main/win32-utils-async-acl.test.ts": 48,
-      "src/main/win32-utils.test.ts": 210,
-      "src/main/window/attach-main-window-services.test.ts": 8521,
-      "src/main/window/clipboard-dashboard-popout-access.test.ts": 566,
-      "src/main/window/clipboard-file-copy.test.ts": 50,
-      "src/main/window/clipboard-image-temp-file.test.ts": 63,
-      "src/main/window/clipboard-image-thumbnail.test.ts": 43,
-      "src/main/window/clipboard-ipc-handlers.test.ts": 225,
-      "src/main/window/clipboard-remote-file-cleanup.bench.test.ts": 38,
-      "src/main/window/clipboard-remote-file-copy.test.ts": 66,
-      "src/main/window/clipboard-remote-file-staging-fs.test.ts": 61,
-      "src/main/window/clipboard-remote-file-staging.test.ts": 80,
-      "src/main/window/clipboard-runtime-owned-ssh-paste.test.ts": 75,
-      "src/main/window/clipboard-text-write-verify.test.ts": 62,
-      "src/main/window/clipboard-windows-image-file.test.ts": 77,
-      "src/main/window/createMainWindow-close-confirmation.test.ts": 1285,
-      "src/main/window/createMainWindow-markdown-editor-focus.test.ts": 1451,
-      "src/main/window/createMainWindow-recovery-reload-watchdog.test.ts": 1357,
-      "src/main/window/createMainWindow-renderer-crash-recovery.test.ts": 2238,
+      "src/main/text-generation/pull-request-context.test.ts": 58,
+      "src/main/tray/system-tray.test.ts": 134,
+      "src/main/tray/tray-attention-icon.test.ts": 58,
+      "src/main/tray/tray-dev-badge.test.ts": 60,
+      "src/main/update-install-exit-watchdog.test.ts": 64,
+      "src/main/updater-changelog.test.ts": 79,
+      "src/main/updater-events.test.ts": 205,
+      "src/main/updater-lifecycle-diagnostics.test.ts": 56,
+      "src/main/updater-linux-package-recovery-actions.test.ts": 2071,
+      "src/main/updater-nudge.test.ts": 74,
+      "src/main/updater-prerelease-feed-readiness.test.ts": 204,
+      "src/main/updater-prerelease-feed.test.ts": 210,
+      "src/main/updater-release-api-token.test.ts": 62,
+      "src/main/updater-release-build-cache.test.ts": 38,
+      "src/main/updater-release-builds.test.ts": 164,
+      "src/main/updater-test-harness.leaked-timers.test.ts": 2646,
+      "src/main/updater-test-module-loader.test.ts": 540,
+      "src/main/updater.build-channel-selection.test.ts": 2969,
+      "src/main/updater.check-failure.test.ts": 2612,
+      "src/main/updater.check-preflight.test.ts": 2566,
+      "src/main/updater.check-settlement.test.ts": 2937,
+      "src/main/updater.fallback.test.ts": 51,
+      "src/main/updater.feed-attempt-lifetime.test.ts": 1577,
+      "src/main/updater.headless-serve-install.test.ts": 315,
+      "src/main/updater.install-failure-cause.test.ts": 3143,
+      "src/main/updater.linux-externally-managed.test.ts": 2828,
+      "src/main/updater.linux-root-package-install.test.ts": 2144,
+      "src/main/updater.mac-install.test.ts": 54,
+      "src/main/updater.nudge-campaign.test.ts": 1952,
+      "src/main/updater.prerelease-fallback.test.ts": 4132,
+      "src/main/updater.publishing-window-feed.test.ts": 2272,
+      "src/main/updater.quit-and-install.test.ts": 2406,
+      "src/main/updater.startup-scheduling.test.ts": 2192,
+      "src/main/usage-worktree-canonicalizer.test.ts": 38,
+      "src/main/usage-worktree-metadata.test.ts": 57,
+      "src/main/usage/highest-usage-key.test.ts": 68,
+      "src/main/usage/jsonl-line-offsets.test.ts": 64,
+      "src/main/usage/usage-breakdown-scaling.test.ts": 109,
+      "src/main/usage/usage-calendar-range.test.ts": 62,
+      "src/main/usage/usage-provider-store-lifecycle.test.ts": 245,
+      "src/main/usage/usage-scan-worker-client.test.ts": 70,
+      "src/main/usage/usage-scan-worker-event-loop.test.ts": 3290,
+      "src/main/usage/usage-worktree-refs.test.ts": 45,
+      "src/main/usage/usage-worktree-resolver.test.ts": 114,
+      "src/main/warp-themes/discovery.test.ts": 98,
+      "src/main/warp-themes/index.test.ts": 679,
+      "src/main/warp-themes/manual-warp-theme-files.test.ts": 106,
+      "src/main/warp-themes/parser-runner.test.ts": 65,
+      "src/main/warp-themes/parser.test.ts": 55,
+      "src/main/warp-themes/theme-file-scanner.test.ts": 66,
+      "src/main/win32-utils-async-acl.test.ts": 49,
+      "src/main/win32-utils.test.ts": 73,
+      "src/main/window/attach-main-window-services.test.ts": 13208,
+      "src/main/window/clipboard-dashboard-popout-access.test.ts": 330,
+      "src/main/window/clipboard-file-copy.test.ts": 38,
+      "src/main/window/clipboard-image-temp-file.test.ts": 46,
+      "src/main/window/clipboard-image-thumbnail.test.ts": 35,
+      "src/main/window/clipboard-ipc-handlers.test.ts": 188,
+      "src/main/window/clipboard-remote-file-cleanup.bench.test.ts": 30,
+      "src/main/window/clipboard-remote-file-copy.test.ts": 70,
+      "src/main/window/clipboard-remote-file-staging-fs.test.ts": 56,
+      "src/main/window/clipboard-remote-file-staging.test.ts": 141,
+      "src/main/window/clipboard-runtime-owned-ssh-paste.test.ts": 99,
+      "src/main/window/clipboard-text-write-verify.test.ts": 37,
+      "src/main/window/clipboard-windows-image-file.test.ts": 57,
+      "src/main/window/createMainWindow-close-confirmation.test.ts": 1201,
+      "src/main/window/createMainWindow-markdown-editor-focus.test.ts": 1169,
+      "src/main/window/createMainWindow-recovery-reload-watchdog.test.ts": 1850,
+      "src/main/window/createMainWindow-renderer-crash-recovery.test.ts": 1634,
       "src/main/window/createMainWindow-startup-reveal.test.ts": 1360,
-      "src/main/window/createMainWindow-system-resume-relay.test.ts": 1142,
-      "src/main/window/createMainWindow-terminal-focus-shortcuts.test.ts": 1333,
-      "src/main/window/createMainWindow-tray-minimize-close.test.ts": 918,
-      "src/main/window/createMainWindow-zoom-and-tab-switch-shortcuts.test.ts": 1259,
-      "src/main/window/createMainWindow.test.ts": 2047,
-      "src/main/window/dashboard-popout-window.test.ts": 85,
-      "src/main/window/editable-context-menu.test.ts": 60,
-      "src/main/window/focus-existing-window.test.ts": 72,
-      "src/main/window/foreground-activation-policy.test.ts": 49,
-      "src/main/window/history-gc-profile-worktree-ids.test.ts": 547,
-      "src/main/window/history-gc-worktree-ids.test.ts": 267,
-      "src/main/window/macos-app-activation.test.ts": 41,
-      "src/main/window/macos-tahoe-release.test.ts": 40,
-      "src/main/window/main-window-visibility.test.ts": 36,
-      "src/main/window/main-window-webview-security.test.ts": 177,
-      "src/main/window/mobile-markdown-request-relay.test.ts": 73,
-      "src/main/window/privileged-window-navigation.test.ts": 186,
-      "src/main/window/renderer-document-navigation.test.ts": 55,
-      "src/main/window/renderer-publication-throttle.test.ts": 47,
-      "src/main/window/renderer-recovery-prompt.test.ts": 87,
-      "src/main/window/renderer-recovery-reload-watchdog.test.ts": 60,
-      "src/main/window/runtime-renderer-notification-sender.test.ts": 52,
-      "src/main/window/session-tab-close-request-relay.test.ts": 89,
-      "src/main/window/terminal-tab-close-request-relay.test.ts": 69,
-      "src/main/window/updater-package-recovery-ipc.test.ts": 2474,
-      "src/main/window/window-close-decision.test.ts": 39,
-      "src/main/windows-descendant-exit-verification.test.ts": 98,
-      "src/main/windows-live-tree-kill.win32.test.ts": 85,
-      "src/main/windows-process-tree-kill.test.ts": 104,
-      "src/main/windows-pty-root-identity.test.ts": 84,
-      "src/main/windows-registry-addon.test.ts": 50,
-      "src/main/windows/windows-command-line-recovery-health.test.ts": 47,
-      "src/main/windows/windows-host-job.win32.test.ts": 38,
-      "src/main/windows/windows-msys-job.win32.test.ts": 72,
-      "src/main/windows/windows-process-table-cim-scan.test.ts": 61,
-      "src/main/windows/windows-process-table-native-addon.win32.test.ts": 60,
-      "src/main/windows/windows-process-table.test.ts": 252,
-      "src/main/windows/windows-process-tree-command-line-patch.test.ts": 69,
-      "src/main/windows/windows-pty-job.test.ts": 51,
-      "src/main/windows/windows-pty-job.win32.test.ts": 53,
-      "src/main/worker-thread-request-queue.test.ts": 54,
-      "src/main/workspace-cleanup-removal-snapshot-prune.test.ts": 51,
-      "src/main/workspace-cleanup-scan-snapshot.test.ts": 175,
-      "src/main/workspace-snapshot-pruning.bench.test.ts": 58,
-      "src/main/workspace-space-analysis-capacity.test.ts": 159,
-      "src/main/workspace-space-analysis-du-timeout.test.ts": 366,
-      "src/main/workspace-space-analysis-snapshot.test.ts": 130,
-      "src/main/workspace-space-analysis.test.ts": 458,
-      "src/main/workspace-space-repo-scan.test.ts": 326,
-      "src/main/workspace-space-scan-control.test.ts": 57,
-      "src/main/worktree-archive-hook-cannot-run.test.ts": 62,
-      "src/main/worktree-create-base-prefetch.test.ts": 280,
-      "src/main/worktree-create-base.test.ts": 48,
-      "src/main/worktree-create-candidates.test.ts": 52,
-      "src/main/worktree-create-execution-host-route.test.ts": 50,
-      "src/main/worktree-create-preparation-cancellation.test.ts": 161,
-      "src/main/worktree-create-preparation-claim.test.ts": 45,
-      "src/main/worktree-create-preparation-contention.test.ts": 123,
-      "src/main/worktree-create-preparation-timing.test.ts": 80,
-      "src/main/worktree-create-preparation-wsl-root.test.ts": 227,
-      "src/main/worktree-create-preparation.test.ts": 505,
-      "src/main/worktree-create-timing.test.ts": 47,
-      "src/main/worktree-identity-persistence.test.ts": 1193,
-      "src/main/worktree-lineage-pruning.test.ts": 89,
+      "src/main/window/createMainWindow-system-resume-relay.test.ts": 1385,
+      "src/main/window/createMainWindow-terminal-focus-shortcuts.test.ts": 1341,
+      "src/main/window/createMainWindow-tray-minimize-close.test.ts": 876,
+      "src/main/window/createMainWindow-zoom-and-tab-switch-shortcuts.test.ts": 1287,
+      "src/main/window/createMainWindow.test.ts": 2476,
+      "src/main/window/dashboard-popout-window.test.ts": 162,
+      "src/main/window/editable-context-menu.test.ts": 89,
+      "src/main/window/focus-existing-window.test.ts": 75,
+      "src/main/window/foreground-activation-policy.test.ts": 36,
+      "src/main/window/history-gc-profile-worktree-ids.test.ts": 246,
+      "src/main/window/history-gc-worktree-ids.test.ts": 319,
+      "src/main/window/macos-app-activation.test.ts": 40,
+      "src/main/window/macos-tahoe-release.test.ts": 39,
+      "src/main/window/main-window-mouse-shortcuts.test.ts": 1533,
+      "src/main/window/main-window-visibility.test.ts": 38,
+      "src/main/window/main-window-webview-security.test.ts": 165,
+      "src/main/window/mobile-markdown-request-relay.test.ts": 57,
+      "src/main/window/privileged-window-navigation.test.ts": 178,
+      "src/main/window/renderer-document-navigation.test.ts": 40,
+      "src/main/window/renderer-publication-throttle.test.ts": 40,
+      "src/main/window/renderer-recovery-prompt.test.ts": 100,
+      "src/main/window/renderer-recovery-reload-watchdog.test.ts": 86,
+      "src/main/window/runtime-renderer-notification-sender.test.ts": 44,
+      "src/main/window/session-tab-close-request-relay.test.ts": 82,
+      "src/main/window/terminal-tab-close-request-relay.test.ts": 55,
+      "src/main/window/updater-package-recovery-ipc.test.ts": 4430,
+      "src/main/window/window-close-decision.test.ts": 41,
+      "src/main/windows-descendant-exit-verification.test.ts": 100,
+      "src/main/windows-live-tree-kill.win32.test.ts": 46,
+      "src/main/windows-process-tree-kill.test.ts": 61,
+      "src/main/windows-pty-root-identity.test.ts": 94,
+      "src/main/windows-registry-addon.test.ts": 33,
+      "src/main/windows/windows-command-line-recovery-health.test.ts": 49,
+      "src/main/windows/windows-host-job.win32.test.ts": 31,
+      "src/main/windows/windows-msys-job.win32.test.ts": 65,
+      "src/main/windows/windows-process-creation-time.test.ts": 51,
+      "src/main/windows/windows-process-table-cim-scan.test.ts": 51,
+      "src/main/windows/windows-process-table-native-addon.win32.test.ts": 37,
+      "src/main/windows/windows-process-table.test.ts": 261,
+      "src/main/windows/windows-process-tree-command-line-patch.test.ts": 37,
+      "src/main/windows/windows-pty-job.test.ts": 46,
+      "src/main/windows/windows-pty-job.win32.test.ts": 57,
+      "src/main/worker-thread-request-queue.test.ts": 75,
+      "src/main/workspace-cleanup-removal-snapshot-prune.test.ts": 70,
+      "src/main/workspace-cleanup-scan-snapshot.test.ts": 174,
+      "src/main/workspace-snapshot-pruning.bench.test.ts": 38,
+      "src/main/workspace-space-analysis-capacity.test.ts": 176,
+      "src/main/workspace-space-analysis-du-timeout.test.ts": 358,
+      "src/main/workspace-space-analysis-snapshot.test.ts": 134,
+      "src/main/workspace-space-analysis.test.ts": 359,
+      "src/main/workspace-space-repo-scan.test.ts": 330,
+      "src/main/workspace-space-scan-control.test.ts": 52,
+      "src/main/worktree-archive-hook-cannot-run.test.ts": 55,
+      "src/main/worktree-create-base-prefetch.test.ts": 287,
+      "src/main/worktree-create-base.test.ts": 37,
+      "src/main/worktree-create-candidates.test.ts": 38,
+      "src/main/worktree-create-execution-host-route.test.ts": 35,
+      "src/main/worktree-create-preparation-cancellation.test.ts": 148,
+      "src/main/worktree-create-preparation-claim.test.ts": 58,
+      "src/main/worktree-create-preparation-contention.test.ts": 95,
+      "src/main/worktree-create-preparation-timing.test.ts": 72,
+      "src/main/worktree-create-preparation-wsl-root.test.ts": 149,
+      "src/main/worktree-create-preparation.test.ts": 545,
+      "src/main/worktree-create-timing.test.ts": 39,
+      "src/main/worktree-identity-persistence.test.ts": 1325,
+      "src/main/worktree-lineage-pruning.test.ts": 81,
       "src/main/worktree-metadata-ownership.test.ts": 39,
-      "src/main/worktree-name-retirement.test.ts": 123,
-      "src/main/worktree-prunable-git-file.test.ts": 66,
-      "src/main/worktree-removal-authority.test.ts": 80,
-      "src/main/worktree-removal-execution-host-route.test.ts": 71,
-      "src/main/worktree-removal-home-guard.test.ts": 111,
-      "src/main/worktree-removal-repo-owner.test.ts": 32,
-      "src/main/worktree-removal-safety.test.ts": 151,
-      "src/main/worktree-removal-session-partition-fencing.test.ts": 1818,
-      "src/main/worktree-retirement-backfill-scan.test.ts": 75,
-      "src/main/worktree-retirement-backfill-stall.test.ts": 138,
-      "src/main/worktree-retirement-discovery-wsl.test.ts": 163,
-      "src/main/worktree-retirement-discovery.test.ts": 130,
-      "src/main/worktree-retirement-namespace.test.ts": 70,
-      "src/main/worktree-root-preparation.test.ts": 81,
-      "src/main/worktree-trash.test.ts": 190,
-      "src/main/wsl-approved-root-race.wsl.test.ts": 45,
-      "src/main/wsl-availability-missing-kernel.test.ts": 69,
-      "src/main/wsl-bash-command.test.ts": 42,
-      "src/main/wsl-distro-list-output.test.ts": 46,
-      "src/main/wsl-distro-list-single-flight.test.ts": 96,
-      "src/main/wsl-fish-history-cleanup.test.ts": 70,
-      "src/main/wsl-interop-spawn-directory.test.ts": 39,
-      "src/main/wsl-managed-cli-path-restore.test.ts": 81,
-      "src/main/wsl-running-distros.test.ts": 189,
-      "src/main/wsl-running-path-filter.test.ts": 58,
-      "src/main/wsl-unc-delete-symlink-repro.test.ts": 82,
-      "src/main/wsl-unc-delete.test.ts": 93,
-      "src/main/wsl-unc-delete.wsl.test.ts": 49,
-      "src/main/wsl.test.ts": 143,
-      "src/main/wsl/wsl-executable-path.win32.test.ts": 30,
-      "src/main/wsl/wsl-guest-environment.test.ts": 104,
-      "src/main/wsl/wsl-invocation-boundary.test.ts": 10535,
-      "src/main/wsl/wsl-probe-failure-semantics.test.ts": 560,
-      "src/main/wsl/wsl-runner.test.ts": 73,
-      "src/main/wsl/wsl-runner.wsl.test.ts": 40,
-      "src/main/wsl/wsl-w1-w3-contract.test.ts": 68,
-      "src/main/zcode/hook-service.test.ts": 139,
-      "src/main/zcode/interactive-capability.live.test.ts": 48,
-      "src/preload/api/platform-bridge.test.ts": 62,
-      "src/preload/app-restart-checkpoint-routing.test.ts": 1157,
-      "src/preload/browser-client-page-renderer-requests.test.ts": 151,
-      "src/preload/browser-find-subscriptions.test.ts": 47,
-      "src/preload/browser-window-close.test.ts": 44,
-      "src/preload/close-active-tab-payload-admission.test.ts": 41,
-      "src/preload/doc-preview-link-interception.test.ts": 476,
-      "src/preload/pty-snapshot-capability-ipc.test.ts": 562,
-      "src/preload/renderer-heap-statistics-reader.test.ts": 37,
-      "src/preload/renderer-process-memory-reader.test.ts": 50,
-      "src/preload/renderer-restart-wiring.test.ts": 67,
-      "src/preload/runtime-environment-subscriptions.test.ts": 71,
-      "src/preload/ssh-authority-forwarding.test.ts": 821,
-      "src/preload/updater-package-recovery.test.ts": 617,
+      "src/main/worktree-name-retirement.test.ts": 115,
+      "src/main/worktree-prunable-git-file.test.ts": 58,
+      "src/main/worktree-removal-authority.test.ts": 64,
+      "src/main/worktree-removal-execution-host-route.test.ts": 52,
+      "src/main/worktree-removal-home-guard.test.ts": 88,
+      "src/main/worktree-removal-repo-owner.test.ts": 64,
+      "src/main/worktree-removal-safety.test.ts": 115,
+      "src/main/worktree-removal-session-partition-fencing.test.ts": 1523,
+      "src/main/worktree-retirement-backfill-scan.test.ts": 44,
+      "src/main/worktree-retirement-backfill-stall.test.ts": 141,
+      "src/main/worktree-retirement-discovery-wsl.test.ts": 148,
+      "src/main/worktree-retirement-discovery.test.ts": 121,
+      "src/main/worktree-retirement-namespace.test.ts": 80,
+      "src/main/worktree-root-preparation.test.ts": 106,
+      "src/main/worktree-trash.test.ts": 203,
+      "src/main/wsl-approved-root-race.wsl.test.ts": 68,
+      "src/main/wsl-availability-missing-kernel.test.ts": 74,
+      "src/main/wsl-bash-command.test.ts": 25,
+      "src/main/wsl-distro-list-output.test.ts": 35,
+      "src/main/wsl-distro-list-single-flight.test.ts": 81,
+      "src/main/wsl-fish-history-cleanup.test.ts": 55,
+      "src/main/wsl-interop-spawn-directory.test.ts": 56,
+      "src/main/wsl-managed-cli-path-restore.test.ts": 57,
+      "src/main/wsl-running-distros.test.ts": 242,
+      "src/main/wsl-running-path-filter.test.ts": 47,
+      "src/main/wsl-unc-delete-symlink-repro.test.ts": 61,
+      "src/main/wsl-unc-delete.test.ts": 111,
+      "src/main/wsl-unc-delete.wsl.test.ts": 88,
+      "src/main/wsl.test.ts": 128,
+      "src/main/wsl/wsl-executable-path.win32.test.ts": 34,
+      "src/main/wsl/wsl-guest-environment.test.ts": 110,
+      "src/main/wsl/wsl-invocation-boundary.test.ts": 10984,
+      "src/main/wsl/wsl-probe-failure-semantics.test.ts": 357,
+      "src/main/wsl/wsl-runner.test.ts": 58,
+      "src/main/wsl/wsl-runner.wsl.test.ts": 64,
+      "src/main/wsl/wsl-w1-w3-contract.test.ts": 42,
+      "src/main/zcode/hook-service.test.ts": 89,
+      "src/main/zcode/interactive-capability.live.test.ts": 45,
+      "src/preload/api/platform-bridge.test.ts": 46,
+      "src/preload/app-restart-checkpoint-routing.test.ts": 934,
+      "src/preload/browser-client-page-renderer-requests.test.ts": 158,
+      "src/preload/browser-find-subscriptions.test.ts": 45,
+      "src/preload/browser-window-close.test.ts": 39,
+      "src/preload/close-active-tab-payload-admission.test.ts": 51,
+      "src/preload/doc-preview-link-interception.test.ts": 446,
+      "src/preload/pty-snapshot-capability-ipc.test.ts": 678,
+      "src/preload/renderer-heap-statistics-reader.test.ts": 30,
+      "src/preload/renderer-process-memory-reader.test.ts": 53,
+      "src/preload/renderer-restart-wiring.test.ts": 44,
+      "src/preload/runtime-environment-subscriptions.test.ts": 66,
+      "src/preload/ssh-authority-forwarding.test.ts": 604,
+      "src/preload/updater-package-recovery.test.ts": 534,
       "src/preload/usage-provider-api.test.ts": 47,
-      "src/relay/agent-exec-handler-windows.test.ts": 78,
-      "src/relay/agent-exec-handler.test.ts": 149,
-      "src/relay/agent-hook-envelope-publication.test.ts": 346,
-      "src/relay/agent-hook-integration.test.ts": 542,
-      "src/relay/agent-hook-retired-pane-suppression.test.ts": 315,
-      "src/relay/agent-hook-server-codex-subagent-transcript.test.ts": 1335,
-      "src/relay/agent-hook-server.test.ts": 1477,
-      "src/relay/agent-status-store-relay-context.test.ts": 142,
-      "src/relay/ai-vault-handler.test.ts": 641,
-      "src/relay/ai-vault-service-client.test.ts": 103,
-      "src/relay/ai-vault-service-restart-policy.test.ts": 44,
-      "src/relay/ai-vault-service-spawn.test.ts": 52,
-      "src/relay/context.test.ts": 48,
-      "src/relay/dispatcher-capacity-degradation.test.ts": 330,
-      "src/relay/dispatcher-client-close-cause.test.ts": 167,
-      "src/relay/dispatcher-client-writer.test.ts": 81,
-      "src/relay/dispatcher-frame-guard-regressions.test.ts": 156,
-      "src/relay/dispatcher-json-payload.test.ts": 163,
-      "src/relay/dispatcher-notification-ownership.test.ts": 187,
-      "src/relay/dispatcher-per-connection-state-baseline.test.ts": 187,
-      "src/relay/dispatcher-rpc-cancel-id-coercion.test.ts": 179,
-      "src/relay/dispatcher-silent-client-reaper.test.ts": 140,
-      "src/relay/dispatcher-structured-error.test.ts": 141,
-      "src/relay/dispatcher-timeout.test.ts": 137,
-      "src/relay/dispatcher-writer-admission.test.ts": 145,
-      "src/relay/dispatcher.test.ts": 419,
-      "src/relay/external-automation-provider-catalog.test.ts": 84,
-      "src/relay/external-automations-handler-log-path.test.ts": 54,
-      "src/relay/external-automations-handler.test.ts": 140,
-      "src/relay/fs-handler-doc-preview.test.ts": 203,
-      "src/relay/fs-handler-file-range-dispatch.test.ts": 381,
-      "src/relay/fs-handler-file-range.test.ts": 148,
-      "src/relay/fs-handler-git-search.test.ts": 73,
-      "src/relay/fs-handler-list-files-cancel.test.ts": 109,
-      "src/relay/fs-handler-list-files-ignored.test.ts": 877,
-      "src/relay/fs-handler-list-files-result-limit.test.ts": 192,
-      "src/relay/fs-handler-readdir-fallback.test.ts": 82,
-      "src/relay/fs-handler-ripgrep-fallback.test.ts": 334,
-      "src/relay/fs-handler-stream.test.ts": 487,
-      "src/relay/fs-handler.test.ts": 694,
-      "src/relay/fs-list-files-cancel.integration.test.ts": 490,
-      "src/relay/fs-list-files-large-response.integration.test.ts": 557,
-      "src/relay/fs-list-files-scan-coordinator.test.ts": 82,
-      "src/relay/fs-path-metadata-requests.test.ts": 75,
-      "src/relay/fs-path-metadata-symlink-concurrency.test.ts": 64,
-      "src/relay/fs-search-line-fragments.test.ts": 118,
-      "src/relay/fs-stream-pty-echo-backpressure.integration.test.ts": 580,
-      "src/relay/git-branch-delete-refusal-parity.test.ts": 132,
-      "src/relay/git-exec-validator.test.ts": 61,
-      "src/relay/git-handler-blob-readers.test.ts": 42,
-      "src/relay/git-handler-branch-cleanup.test.ts": 150,
-      "src/relay/git-handler-branch-compare.test.ts": 101,
-      "src/relay/git-handler-branch-diff-equivalence.test.ts": 1016,
-      "src/relay/git-handler-branch-diff.test.ts": 379,
-      "src/relay/git-handler-check-ignore.test.ts": 43,
-      "src/relay/git-handler-diff-read-coalescing.test.ts": 386,
-      "src/relay/git-handler-file-diff.test.ts": 1651,
-      "src/relay/git-handler-fork-remote-exec.test.ts": 242,
-      "src/relay/git-handler-pull-reconciliation.test.ts": 885,
-      "src/relay/git-handler-push-target.test.ts": 65,
-      "src/relay/git-handler-remote-sync.test.ts": 1922,
-      "src/relay/git-handler-staging.test.ts": 532,
-      "src/relay/git-handler-status-ops.test.ts": 115,
-      "src/relay/git-handler-submodule-cache-invalidation.test.ts": 159,
-      "src/relay/git-handler-submodule-ops.test.ts": 103,
-      "src/relay/git-handler-submodule-status-cancellation.test.ts": 213,
-      "src/relay/git-handler-termination.test.ts": 171,
-      "src/relay/git-handler-utils.test.ts": 41,
-      "src/relay/git-handler-working-tree-changes.test.ts": 1321,
-      "src/relay/git-handler-worktree-clean.test.ts": 52,
-      "src/relay/git-handler-worktree-git-capabilities.test.ts": 174,
-      "src/relay/git-handler-worktree-inspection.test.ts": 444,
-      "src/relay/git-handler-worktree-list-authority.test.ts": 186,
-      "src/relay/git-handler-worktree-list.test.ts": 50,
-      "src/relay/git-handler-worktree-ops.test.ts": 107,
-      "src/relay/git-handler-worktree-paths.test.ts": 53,
-      "src/relay/git-handler-worktree-provisioning.test.ts": 1081,
-      "src/relay/git-handler.test.ts": 868,
-      "src/relay/git-porcelain-local-parity.test.ts": 361,
-      "src/relay/git-push-target-local-parity.test.ts": 333,
-      "src/relay/git-response-pty-echo-backpressure.integration.test.ts": 1019,
-      "src/relay/git-response-stream-ownership.test.ts": 65,
-      "src/relay/git-status-branch-line-total.test.ts": 411,
-      "src/relay/git-status-upstream-negative-cache.test.ts": 347,
-      "src/relay/git-stdout-stream.test.ts": 76,
-      "src/relay/git-working-file-read.test.ts": 77,
-      "src/relay/hermes-run-correlation.test.ts": 31,
-      "src/relay/hermes-run-history.test.ts": 125,
-      "src/relay/integration.test.ts": 1843,
-      "src/relay/legacy-relay-publication-ledger.test.ts": 52,
-      "src/relay/managed-hook-installer.test.ts": 96,
-      "src/relay/node-pty-binding-survey.test.ts": 155,
-      "src/relay/node-pty-unavailable-diagnosis.test.ts": 91,
-      "src/relay/omp-config-root.test.ts": 143,
-      "src/relay/omp-fresh-launch-environment.test.ts": 673,
-      "src/relay/plugin-overlay-env.test.ts": 78,
-      "src/relay/plugin-overlay.test.ts": 187,
-      "src/relay/plugin-source-limit.test.ts": 64,
-      "src/relay/port-scan-handler.test.ts": 214,
-      "src/relay/preflight-handler.test.ts": 87,
-      "src/relay/protocol-backpressure.test.ts": 120,
-      "src/relay/protocol-handshake.test.ts": 62,
-      "src/relay/protocol-json-payload.test.ts": 341,
-      "src/relay/pty-handler-attach-replay.test.ts": 433,
-      "src/relay/pty-handler-dispose-lifecycle.test.ts": 558,
-      "src/relay/pty-handler-grace-timer.test.ts": 250,
-      "src/relay/pty-handler-immediate-descendants.test.ts": 492,
-      "src/relay/pty-handler-inventory-process-evidence.test.ts": 443,
-      "src/relay/pty-handler-output-drain-differential.test.ts": 641,
-      "src/relay/pty-handler-output-streaming.test.ts": 440,
-      "src/relay/pty-handler-ownership-attestation.test.ts": 333,
-      "src/relay/pty-handler-pi-owner-env.test.ts": 354,
-      "src/relay/pty-handler-resize-stale-pty.test.ts": 252,
-      "src/relay/pty-handler-retired-pane-surface.test.ts": 307,
-      "src/relay/pty-handler-revive.test.ts": 589,
-      "src/relay/pty-handler-shell-resolution.test.ts": 329,
-      "src/relay/pty-handler-shutdown-signals.test.ts": 456,
-      "src/relay/pty-handler-source-publication.test.ts": 1110,
-      "src/relay/pty-handler-spawn-admission.test.ts": 875,
-      "src/relay/pty-handler-spawn-cwd.test.ts": 336,
-      "src/relay/pty-handler-spawn-environment.test.ts": 631,
-      "src/relay/pty-handler-startup-command-delivery.test.ts": 435,
-      "src/relay/pty-handler-windows-child-process-evidence.test.ts": 221,
-      "src/relay/pty-replay-buffer-equivalence.test.ts": 397,
-      "src/relay/pty-shell-launch.test.ts": 506,
-      "src/relay/pty-shell-utils-process-cycles.test.ts": 92,
-      "src/relay/pty-shell-utils.test.ts": 203,
-      "src/relay/pty-source-credit-ledger.test.ts": 358,
-      "src/relay/pty-source-credit-scheduler.test.ts": 47,
-      "src/relay/pty-source-sent-boundaries.test.ts": 193,
-      "src/relay/relay-bundled-ripgrep.test.ts": 94,
-      "src/relay/relay-command-env.test.ts": 83,
-      "src/relay/relay-daemon-fatal-reap.test.ts": 1040,
-      "src/relay/relay-diagnostic-log.test.ts": 37,
-      "src/relay/relay-endpoint-credential-publication.test.ts": 2830,
-      "src/relay/relay-filesystem-watch-registry.test.ts": 300,
-      "src/relay/relay-grace-branch.test.ts": 60,
-      "src/relay/relay-handshake-roundtrip.test.ts": 510,
-      "src/relay/relay-hot-path-operation-counts.test.ts": 189,
-      "src/relay/relay-launch-options.test.ts": 39,
-      "src/relay/relay-oversized-notification-survival.test.ts": 209,
-      "src/relay/relay-primary-channel.test.ts": 146,
-      "src/relay/relay-pty-consumer-owner-displacement.test.ts": 285,
-      "src/relay/relay-pty-publication-admission.test.ts": 331,
-      "src/relay/relay-pty-source-cancellation-exit.test.ts": 237,
-      "src/relay/relay-pty-source-exit-publication.test.ts": 104,
-      "src/relay/relay-pty-source-publication.test.ts": 386,
-      "src/relay/relay-pty-source-recovery-completion.test.ts": 33,
-      "src/relay/relay-pty-source-recovery-interleavings.test.ts": 267,
-      "src/relay/relay-pty-source-recovery-window.test.ts": 296,
-      "src/relay/relay-pty-source-restore-retry.test.ts": 202,
-      "src/relay/relay-pty-source-send-scheduler.test.ts": 72,
-      "src/relay/relay-pty-source-superseded-activation.test.ts": 231,
-      "src/relay/relay-reconnect-listener-credential-gate.test.ts": 85,
-      "src/relay/relay-ripgrep-cwd-env.test.ts": 128,
-      "src/relay/relay-watch-root-capacity.test.ts": 392,
-      "src/relay/relay-watcher-event-emitter.test.ts": 939,
-      "src/relay/relay-watcher-frame-chunking.test.ts": 602,
-      "src/relay/relay-watcher-parent-removal.test.ts": 87,
-      "src/relay/relay-watcher-pending-setup-waiters.test.ts": 304,
-      "src/relay/relay-watcher-setup-wait.test.ts": 286,
+      "src/relay/agent-exec-handler-windows.test.ts": 71,
+      "src/relay/agent-exec-handler.test.ts": 157,
+      "src/relay/agent-hook-envelope-publication.test.ts": 351,
+      "src/relay/agent-hook-integration.test.ts": 848,
+      "src/relay/agent-hook-retired-pane-suppression.test.ts": 451,
+      "src/relay/agent-hook-server-codex-subagent-transcript.test.ts": 1327,
+      "src/relay/agent-hook-server.test.ts": 1396,
+      "src/relay/agent-status-store-relay-context.test.ts": 144,
+      "src/relay/ai-vault-handler.test.ts": 689,
+      "src/relay/ai-vault-opencode-reader.test.ts": 405,
+      "src/relay/ai-vault-service-client.test.ts": 89,
+      "src/relay/ai-vault-service-ready-retention.test.ts": 195,
+      "src/relay/ai-vault-service-restart-policy.test.ts": 69,
+      "src/relay/ai-vault-service-spawn.test.ts": 54,
+      "src/relay/context.test.ts": 39,
+      "src/relay/dispatcher-capacity-degradation.test.ts": 194,
+      "src/relay/dispatcher-client-close-cause.test.ts": 194,
+      "src/relay/dispatcher-client-writer.test.ts": 92,
+      "src/relay/dispatcher-frame-guard-regressions.test.ts": 169,
+      "src/relay/dispatcher-json-payload.test.ts": 122,
+      "src/relay/dispatcher-notification-ownership.test.ts": 140,
+      "src/relay/dispatcher-per-connection-state-baseline.test.ts": 146,
+      "src/relay/dispatcher-rpc-cancel-id-coercion.test.ts": 134,
+      "src/relay/dispatcher-silent-client-reaper.test.ts": 213,
+      "src/relay/dispatcher-structured-error.test.ts": 136,
+      "src/relay/dispatcher-timeout.test.ts": 210,
+      "src/relay/dispatcher-writer-admission.test.ts": 161,
+      "src/relay/dispatcher.test.ts": 306,
+      "src/relay/external-automation-provider-catalog.test.ts": 59,
+      "src/relay/external-automations-handler-log-path.test.ts": 46,
+      "src/relay/external-automations-handler.test.ts": 77,
+      "src/relay/fs-handler-doc-preview.test.ts": 302,
+      "src/relay/fs-handler-file-range-dispatch.test.ts": 303,
+      "src/relay/fs-handler-file-range.test.ts": 201,
+      "src/relay/fs-handler-git-search.test.ts": 102,
+      "src/relay/fs-handler-list-files-cancel.test.ts": 83,
+      "src/relay/fs-handler-list-files-ignored.test.ts": 816,
+      "src/relay/fs-handler-list-files-result-limit.test.ts": 334,
+      "src/relay/fs-handler-readdir-fallback.test.ts": 88,
+      "src/relay/fs-handler-ripgrep-fallback.test.ts": 260,
+      "src/relay/fs-handler-stream.test.ts": 660,
+      "src/relay/fs-handler.test.ts": 805,
+      "src/relay/fs-list-files-cancel.integration.test.ts": 320,
+      "src/relay/fs-list-files-large-response.integration.test.ts": 596,
+      "src/relay/fs-list-files-scan-coordinator.test.ts": 42,
+      "src/relay/fs-path-metadata-requests.test.ts": 93,
+      "src/relay/fs-path-metadata-symlink-concurrency.test.ts": 79,
+      "src/relay/fs-search-cancellation.test.ts": 399,
+      "src/relay/fs-search-diagnosis-cancellation.test.ts": 165,
+      "src/relay/fs-search-line-fragments.test.ts": 204,
+      "src/relay/fs-stream-pty-echo-backpressure.integration.test.ts": 547,
+      "src/relay/git-branch-delete-refusal-parity.test.ts": 177,
+      "src/relay/git-exec-validator.test.ts": 41,
+      "src/relay/git-handler-blob-readers.test.ts": 45,
+      "src/relay/git-handler-branch-cleanup.test.ts": 95,
+      "src/relay/git-handler-branch-compare.test.ts": 98,
+      "src/relay/git-handler-branch-diff-equivalence.test.ts": 1189,
+      "src/relay/git-handler-branch-diff.test.ts": 348,
+      "src/relay/git-handler-check-ignore.test.ts": 39,
+      "src/relay/git-handler-diff-read-coalescing.test.ts": 448,
+      "src/relay/git-handler-file-diff.test.ts": 1263,
+      "src/relay/git-handler-fork-remote-exec.test.ts": 222,
+      "src/relay/git-handler-pull-reconciliation.test.ts": 1652,
+      "src/relay/git-handler-push-target.test.ts": 70,
+      "src/relay/git-handler-remote-sync.test.ts": 1894,
+      "src/relay/git-handler-staging.test.ts": 381,
+      "src/relay/git-handler-status-ops.test.ts": 101,
+      "src/relay/git-handler-submodule-cache-invalidation.test.ts": 181,
+      "src/relay/git-handler-submodule-ops.test.ts": 126,
+      "src/relay/git-handler-submodule-status-cancellation.test.ts": 141,
+      "src/relay/git-handler-termination.test.ts": 144,
+      "src/relay/git-handler-utils.test.ts": 25,
+      "src/relay/git-handler-working-tree-changes.test.ts": 1110,
+      "src/relay/git-handler-worktree-clean.test.ts": 41,
+      "src/relay/git-handler-worktree-git-capabilities.test.ts": 118,
+      "src/relay/git-handler-worktree-inspection.test.ts": 429,
+      "src/relay/git-handler-worktree-list-authority.test.ts": 110,
+      "src/relay/git-handler-worktree-list.test.ts": 41,
+      "src/relay/git-handler-worktree-ops.test.ts": 145,
+      "src/relay/git-handler-worktree-paths.test.ts": 63,
+      "src/relay/git-handler-worktree-provisioning.test.ts": 886,
+      "src/relay/git-handler.test.ts": 797,
+      "src/relay/git-porcelain-local-parity.test.ts": 314,
+      "src/relay/git-push-target-local-parity.test.ts": 192,
+      "src/relay/git-response-pty-echo-backpressure.integration.test.ts": 1021,
+      "src/relay/git-response-stream-ownership.test.ts": 61,
+      "src/relay/git-status-branch-line-total.test.ts": 362,
+      "src/relay/git-status-upstream-negative-cache.test.ts": 344,
+      "src/relay/git-stdout-stream.test.ts": 46,
+      "src/relay/git-working-file-read.test.ts": 58,
+      "src/relay/hermes-run-correlation.test.ts": 44,
+      "src/relay/hermes-run-history.test.ts": 85,
+      "src/relay/integration.test.ts": 1877,
+      "src/relay/legacy-relay-publication-ledger.test.ts": 36,
+      "src/relay/managed-hook-installer.test.ts": 117,
+      "src/relay/node-pty-binding-survey.test.ts": 246,
+      "src/relay/node-pty-unavailable-diagnosis.test.ts": 185,
+      "src/relay/omp-config-root.test.ts": 152,
+      "src/relay/omp-fresh-launch-environment.test.ts": 600,
+      "src/relay/plugin-overlay-env.test.ts": 60,
+      "src/relay/plugin-overlay.test.ts": 164,
+      "src/relay/plugin-source-limit.test.ts": 41,
+      "src/relay/port-scan-handler.test.ts": 190,
+      "src/relay/preflight-handler.test.ts": 97,
+      "src/relay/protocol-backpressure.test.ts": 87,
+      "src/relay/protocol-handshake.test.ts": 63,
+      "src/relay/protocol-json-payload.test.ts": 188,
+      "src/relay/pty-handler-attach-replay.test.ts": 414,
+      "src/relay/pty-handler-dispose-lifecycle.test.ts": 481,
+      "src/relay/pty-handler-grace-timer.test.ts": 346,
+      "src/relay/pty-handler-immediate-descendants.test.ts": 353,
+      "src/relay/pty-handler-inventory-process-evidence.test.ts": 324,
+      "src/relay/pty-handler-output-drain-differential.test.ts": 359,
+      "src/relay/pty-handler-output-streaming.test.ts": 1038,
+      "src/relay/pty-handler-ownership-attestation.test.ts": 450,
+      "src/relay/pty-handler-pi-owner-env.test.ts": 243,
+      "src/relay/pty-handler-resize-stale-pty.test.ts": 213,
+      "src/relay/pty-handler-retired-pane-surface.test.ts": 599,
+      "src/relay/pty-handler-revive.test.ts": 526,
+      "src/relay/pty-handler-shell-resolution.test.ts": 378,
+      "src/relay/pty-handler-shutdown-signals.test.ts": 373,
+      "src/relay/pty-handler-source-publication.test.ts": 1048,
+      "src/relay/pty-handler-spawn-admission.test.ts": 560,
+      "src/relay/pty-handler-spawn-cwd.test.ts": 328,
+      "src/relay/pty-handler-spawn-environment.test.ts": 555,
+      "src/relay/pty-handler-startup-command-delivery.test.ts": 381,
+      "src/relay/pty-handler-windows-child-process-evidence.test.ts": 208,
+      "src/relay/pty-replay-buffer-equivalence.test.ts": 356,
+      "src/relay/pty-shell-launch.test.ts": 229,
+      "src/relay/pty-shell-utils-process-cycles.test.ts": 122,
+      "src/relay/pty-shell-utils.test.ts": 195,
+      "src/relay/pty-source-credit-ledger.test.ts": 265,
+      "src/relay/pty-source-credit-scheduler.test.ts": 106,
+      "src/relay/pty-source-sent-boundaries.test.ts": 181,
+      "src/relay/relay-bundled-ripgrep.test.ts": 151,
+      "src/relay/relay-command-env.test.ts": 96,
+      "src/relay/relay-daemon-fatal-reap.test.ts": 1107,
+      "src/relay/relay-diagnostic-log.test.ts": 62,
+      "src/relay/relay-endpoint-credential-publication.test.ts": 2995,
+      "src/relay/relay-filesystem-watch-registry.test.ts": 344,
+      "src/relay/relay-grace-branch.test.ts": 52,
+      "src/relay/relay-handshake-roundtrip.test.ts": 495,
+      "src/relay/relay-hot-path-operation-counts.test.ts": 211,
+      "src/relay/relay-launch-options.test.ts": 48,
+      "src/relay/relay-oversized-notification-survival.test.ts": 335,
+      "src/relay/relay-primary-channel.test.ts": 104,
+      "src/relay/relay-pty-consumer-owner-displacement.test.ts": 199,
+      "src/relay/relay-pty-publication-admission.test.ts": 373,
+      "src/relay/relay-pty-source-cancellation-exit.test.ts": 238,
+      "src/relay/relay-pty-source-exit-publication.test.ts": 70,
+      "src/relay/relay-pty-source-publication.test.ts": 395,
+      "src/relay/relay-pty-source-recovery-completion.test.ts": 30,
+      "src/relay/relay-pty-source-recovery-interleavings.test.ts": 192,
+      "src/relay/relay-pty-source-recovery-window.test.ts": 220,
+      "src/relay/relay-pty-source-restore-retry.test.ts": 226,
+      "src/relay/relay-pty-source-send-scheduler.test.ts": 44,
+      "src/relay/relay-pty-source-superseded-activation.test.ts": 193,
+      "src/relay/relay-reconnect-listener-credential-gate.test.ts": 95,
+      "src/relay/relay-ripgrep-cwd-env.test.ts": 99,
+      "src/relay/relay-watch-root-capacity.test.ts": 208,
+      "src/relay/relay-watcher-event-emitter.test.ts": 673,
+      "src/relay/relay-watcher-frame-chunking.test.ts": 708,
+      "src/relay/relay-watcher-parent-removal.test.ts": 110,
+      "src/relay/relay-watcher-pending-setup-waiters.test.ts": 467,
+      "src/relay/relay-watcher-setup-wait.test.ts": 394,
       "src/relay/relay-windows-path-ripgrep.test.ts": 68,
-      "src/relay/remote-artifact-cli-input.test.ts": 183,
-      "src/relay/remote-cli-env.test.ts": 36,
-      "src/relay/remote-cli-stdin.test.ts": 48,
-      "src/relay/remote-cli-timeout.test.ts": 54,
-      "src/relay/retired-pane-surfaces.test.ts": 46,
-      "src/relay/rotating-log-writer.test.ts": 75,
-      "src/relay/session-search-transport.test.ts": 286,
-      "src/relay/skill-install-handler.test.ts": 645,
-      "src/relay/skill-upload-multi-relay.integration.test.ts": 987,
-      "src/relay/ssh-pty-consumer-session-adapter.test.ts": 250,
-      "src/relay/ssh-pty-source-credit-adapter.test.ts": 87,
-      "src/relay/subprocess-tree-termination.test.ts": 43,
-      "src/relay/subprocess.test.ts": 25950,
-      "src/relay/terminal-history-wsl.test.ts": 84,
-      "src/relay/terminal-history.test.ts": 92,
-      "src/relay/windows-port-scan.test.ts": 160,
-      "src/relay/windows-port-scan.win32.test.ts": 95,
-      "src/relay/workspace-session-handler.test.ts": 187,
-      "src/relay/workspace-snapshot-publication.test.ts": 288,
-      "src/relay/workspace-space-scan-du-capacity.test.ts": 127,
-      "src/relay/workspace-space-scan.test.ts": 65,
-      "src/relay/wsl-agent-hook-relay.test.ts": 287,
-      "src/relay/wsl-hook-fs-bridge.test.ts": 62,
-      "src/relay/wsl-install-plugins-handler.test.ts": 96,
-      "src/renderer/src/app-shell/app-command-handlers-tab-rename.test.ts": 1334,
-      "src/renderer/src/app-shell/app-command-handlers-workspace-delete.test.ts": 82,
-      "src/renderer/src/app-shell/app-root-surface-settings.test.tsx": 591,
-      "src/renderer/src/app-shell/reconcile-hydrated-workspace-tab-models.test.ts": 52,
-      "src/renderer/src/app-shell/remote-workspace-unplaced-upload-suppression.test.tsx": 2364,
-      "src/renderer/src/app-shell/shutdown-checkpoint-persist.test.ts": 48,
-      "src/renderer/src/app-shell/shutdown-checkpoint-restart-lifecycle.test.ts": 381,
-      "src/renderer/src/app-shell/startup-actions-selector.test.ts": 102,
-      "src/renderer/src/app-shell/use-document-appearance.test.tsx": 2207,
-      "src/renderer/src/app-shell/window-visibility-actions-selector.test.ts": 658,
-      "src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx": 1137,
-      "src/renderer/src/app-startup-routing.test.ts": 79,
-      "src/renderer/src/assets/mobile-page-qr-layout.test.ts": 41,
-      "src/renderer/src/assets/rich-markdown-task-list-style.test.ts": 34,
-      "src/renderer/src/assets/terminal-container-geometry.test.ts": 32,
-      "src/renderer/src/assets/terminal-scrollbar-style.test.ts": 47,
-      "src/renderer/src/assets/theme-utility-generation.test.ts": 32,
-      "src/renderer/src/assets/worktree-card-active-style.test.ts": 32,
-      "src/renderer/src/attention/agent-attention-policy.test.ts": 43,
-      "src/renderer/src/components/AgentStateDot.test.ts": 252,
-      "src/renderer/src/components/AgentWorkingSpinner.test.tsx": 485,
-      "src/renderer/src/components/LinuxPackageInstallRecoveryCard.test.tsx": 817,
-      "src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx": 3623,
-      "src/renderer/src/components/NewWorkspaceComposerCard.set-location-warm.test.tsx": 1557,
-      "src/renderer/src/components/NewWorkspaceComposerCard.set-location.test.tsx": 1054,
-      "src/renderer/src/components/NewWorkspaceComposerCard.start-from.test.tsx": 1738,
-      "src/renderer/src/components/NewWorkspaceComposerCard.test.tsx": 2676,
-      "src/renderer/src/components/QuickOpen.mount-gating.test.tsx": 2052,
-      "src/renderer/src/components/SelectedTextCopyMenu.test.tsx": 726,
-      "src/renderer/src/components/StarNagCard.test.tsx": 687,
-      "src/renderer/src/components/StateIndicatorTooltip.test.tsx": 104,
-      "src/renderer/src/components/TerminalSearch.test.tsx": 1139,
-      "src/renderer/src/components/TerminalTitlebarTabs.test.tsx": 521,
-      "src/renderer/src/components/TerminalWorkbenchContainer.test.tsx": 532,
-      "src/renderer/src/components/UpdateCard.error-card.test.tsx": 3007,
-      "src/renderer/src/components/UpdateCard.test.ts": 1741,
-      "src/renderer/src/components/WorktreeBaseFallbackDialog.test.tsx": 2233,
-      "src/renderer/src/components/WorktreeJumpPalette.linear-url.test.tsx": 3440,
-      "src/renderer/src/components/WorktreeJumpPalette.mount-gating.test.tsx": 2930,
-      "src/renderer/src/components/WorktreeJumpPalette.recent-tabs.behavior.test.tsx": 4107,
-      "src/renderer/src/components/WorktreeJumpPalette.recent-tabs.test.tsx": 8509,
-      "src/renderer/src/components/WorktreeJumpPalette.test.tsx": 2582,
-      "src/renderer/src/components/activity/ActivityPrototypePage.filter-focus-shortcut.test.ts": 2256,
-      "src/renderer/src/components/activity/ActivityPrototypePage.test.ts": 2481,
-      "src/renderer/src/components/activity/ActivityPrototypePage.thread-grouping.test.ts": 3639,
-      "src/renderer/src/components/activity/ActivityThreadOptionsMenu.test.tsx": 4079,
-      "src/renderer/src/components/activity/activity-answered-ask-timeline.test.tsx": 2953,
-      "src/renderer/src/components/activity/activity-auto-mark-read-loop.react185.test.tsx": 3791,
-      "src/renderer/src/components/activity/activity-clear-completed-hmr.test.ts": 2602,
-      "src/renderer/src/components/activity/activity-clear-completed.test.ts": 2072,
-      "src/renderer/src/components/activity/activity-event-builder-agent-context.test.ts": 2390,
-      "src/renderer/src/components/activity/activity-event-builder.bounded-history.test.ts": 2363,
-      "src/renderer/src/components/activity/activity-event-builder.host-ownership.test.ts": 2779,
-      "src/renderer/src/components/activity/activity-event-builder.identity-reuse.test.ts": 2730,
-      "src/renderer/src/components/activity/activity-event-builder.live-cap.test.ts": 2379,
-      "src/renderer/src/components/activity/activity-portal-churn-budget.test.ts": 48,
-      "src/renderer/src/components/activity/activity-portal-readiness-decay.react185.test.tsx": 2743,
-      "src/renderer/src/components/activity/activity-portal-readiness-loop.react185.test.tsx": 2342,
-      "src/renderer/src/components/activity/activity-portal-readiness-oscillation.test.ts": 56,
-      "src/renderer/src/components/activity/activity-portal-readiness-subscription-churn.react185.test.tsx": 4178,
-      "src/renderer/src/components/activity/activity-portal-thread-reconciliation.test.ts": 38,
-      "src/renderer/src/components/activity/activity-scope-filter.test.ts": 2567,
-      "src/renderer/src/components/activity/activity-terminal-portal-publication-loop.react185.test.tsx": 527,
-      "src/renderer/src/components/activity/activity-terminal-portal.test.tsx": 511,
-      "src/renderer/src/components/activity/activity-thread-actions.test.ts": 1881,
-      "src/renderer/src/components/activity/activity-thread-child-agent.test.ts": 1603,
-      "src/renderer/src/components/activity/activity-thread-grouping.search-cache.test.ts": 1779,
-      "src/renderer/src/components/activity/activity-thread-grouping.status-order.test.ts": 2350,
-      "src/renderer/src/components/activity/activity-thread-hover-card.test.tsx": 2342,
-      "src/renderer/src/components/activity/activity-thread-list-pane-collapsible.test.tsx": 2476,
-      "src/renderer/src/components/activity/activity-thread-list-pane.virtualization.test.tsx": 2746,
-      "src/renderer/src/components/activity/activity-thread-presentation.test.ts": 2134,
-      "src/renderer/src/components/activity/activity-thread-virtual-items.test.ts": 2238,
-      "src/renderer/src/components/activity/dev-activity-fixture.test.ts": 66,
-      "src/renderer/src/components/activity/event-time-clock-refresh.test.tsx": 1654,
-      "src/renderer/src/components/activity/use-activity-thread-action-bindings.test.tsx": 1456,
-      "src/renderer/src/components/activity/useActivityUnreadCount.freshness.test.tsx": 1882,
-      "src/renderer/src/components/activity/useActivityUnreadCount.test.ts": 1621,
-      "src/renderer/src/components/agent-session-continuation/AgentSessionContinuationDialog.test.tsx": 896,
-      "src/renderer/src/components/agent-session-continuation/agent-session-continuation-selection.test.ts": 29,
-      "src/renderer/src/components/agent/AgentCombobox.test.tsx": 1868,
-      "src/renderer/src/components/agent/AgentSettingsDialog.test.tsx": 579,
-      "src/renderer/src/components/agent/agent-combobox-command-state.test.ts": 43,
-      "src/renderer/src/components/artifacts/ArtifactCollection.test.tsx": 2509,
-      "src/renderer/src/components/artifacts/ArtifactPreview.test.tsx": 857,
-      "src/renderer/src/components/artifacts/ArtifactPublishButton.test.tsx": 1200,
-      "src/renderer/src/components/artifacts/ArtifactsPage.test.tsx": 2443,
-      "src/renderer/src/components/artifacts/artifact-display-labels.test.ts": 139,
-      "src/renderer/src/components/artifacts/artifact-list-search.test.ts": 107,
-      "src/renderer/src/components/artifacts/artifact-list-windowing.test.tsx": 6960,
-      "src/renderer/src/components/artifacts/artifact-publish-flow.test.ts": 147,
-      "src/renderer/src/components/artifacts/artifact-published-link-client.test.ts": 42,
-      "src/renderer/src/components/automations/AutomationDestinationField.test.tsx": 937,
-      "src/renderer/src/components/automations/AutomationDetail.host.test.tsx": 1098,
-      "src/renderer/src/components/automations/AutomationDetail.test.tsx": 1315,
-      "src/renderer/src/components/automations/AutomationEditorPromptEditor.test.tsx": 718,
-      "src/renderer/src/components/automations/AutomationHostBadges.test.tsx": 734,
-      "src/renderer/src/components/automations/AutomationHostFilterNotice.test.tsx": 1002,
-      "src/renderer/src/components/automations/AutomationListEmptyView.test.tsx": 690,
-      "src/renderer/src/components/automations/AutomationListHostGroups.test.tsx": 585,
-      "src/renderer/src/components/automations/AutomationListLocalRows.test.tsx": 1476,
-      "src/renderer/src/components/automations/AutomationListSearchField.test.tsx": 506,
-      "src/renderer/src/components/automations/AutomationListTableHeader.test.tsx": 836,
-      "src/renderer/src/components/automations/AutomationOwnerConflictNotice.test.tsx": 543,
-      "src/renderer/src/components/automations/AutomationPromptDisclosure.test.tsx": 1008,
-      "src/renderer/src/components/automations/AutomationRunHistory.test.tsx": 1374,
-      "src/renderer/src/components/automations/AutomationRunsDashboardSurface.test.tsx": 655,
-      "src/renderer/src/components/automations/AutomationRunsTable.test.tsx": 1046,
-      "src/renderer/src/components/automations/AutomationSchedulePicker.render.test.tsx": 2050,
-      "src/renderer/src/components/automations/AutomationSchedulePicker.test.ts": 927,
-      "src/renderer/src/components/automations/AutomationTimeField.test.tsx": 688,
-      "src/renderer/src/components/automations/AutomationsDetailPane.run-count.test.tsx": 2463,
-      "src/renderer/src/components/automations/AutomationsDetailPane.test.tsx": 2987,
-      "src/renderer/src/components/automations/AutomationsListPanel.test.tsx": 1508,
-      "src/renderer/src/components/automations/AutomationsPage.create-destination.test.tsx": 3123,
-      "src/renderer/src/components/automations/AutomationsPage.cross-authority-actions.test.tsx": 2253,
-      "src/renderer/src/components/automations/AutomationsPage.escape-precedence.test.tsx": 1633,
-      "src/renderer/src/components/automations/AutomationsPage.external-scope.test.tsx": 2263,
-      "src/renderer/src/components/automations/AutomationsPage.notice-recovery.test.tsx": 1741,
-      "src/renderer/src/components/automations/AutomationsPage.refresh-selection.test.tsx": 2636,
-      "src/renderer/src/components/automations/AutomationsPage.run-visibility.test.tsx": 1757,
-      "src/renderer/src/components/automations/AutomationsPage.save-visibility.test.tsx": 1837,
-      "src/renderer/src/components/automations/AutomationsPage.strict-mode-save-visibility.test.tsx": 1804,
-      "src/renderer/src/components/automations/AutomationsPage.test.tsx": 2407,
-      "src/renderer/src/components/automations/AutomationsPageBreadcrumb.test.tsx": 929,
-      "src/renderer/src/components/automations/ExternalAutomationManagers.test.tsx": 1378,
-      "src/renderer/src/components/automations/automation-authority-identity.test.ts": 36,
-      "src/renderer/src/components/automations/automation-captured-owner.test.ts": 135,
-      "src/renderer/src/components/automations/automation-create-destination.test.ts": 113,
-      "src/renderer/src/components/automations/automation-create-projects.test.ts": 29,
-      "src/renderer/src/components/automations/automation-detail-tab-navigation.test.ts": 401,
-      "src/renderer/src/components/automations/automation-editor-prompt-options.test.ts": 54,
-      "src/renderer/src/components/automations/automation-external-target-match.test.ts": 44,
-      "src/renderer/src/components/automations/automation-host-cache-controller.test.ts": 203,
-      "src/renderer/src/components/automations/automation-host-cache-health.test.ts": 43,
-      "src/renderer/src/components/automations/automation-host-cache.test.ts": 82,
-      "src/renderer/src/components/automations/automation-host-catalog-generation.test.ts": 79,
-      "src/renderer/src/components/automations/automation-host-catalog-order.test.ts": 62,
-      "src/renderer/src/components/automations/automation-host-catalog-source.test.ts": 52,
-      "src/renderer/src/components/automations/automation-host-catalog.test.ts": 111,
-      "src/renderer/src/components/automations/automation-host-client.test.ts": 64,
-      "src/renderer/src/components/automations/automation-host-detail-display.test.ts": 54,
-      "src/renderer/src/components/automations/automation-host-diagnostics.test.ts": 145,
-      "src/renderer/src/components/automations/automation-host-filter-resolution.test.ts": 106,
-      "src/renderer/src/components/automations/automation-host-health.test.ts": 54,
-      "src/renderer/src/components/automations/automation-host-invalidation-window-events.test.ts": 51,
-      "src/renderer/src/components/automations/automation-host-invalidation.test.ts": 78,
-      "src/renderer/src/components/automations/automation-host-list-rows.test.ts": 107,
-      "src/renderer/src/components/automations/automation-host-orphan-entry.test.ts": 215,
-      "src/renderer/src/components/automations/automation-host-picker-groups.test.ts": 62,
-      "src/renderer/src/components/automations/automation-host-recovery.test.ts": 62,
-      "src/renderer/src/components/automations/automation-host-scale-gates.test.ts": 349,
-      "src/renderer/src/components/automations/automation-host-scheduler.test.ts": 218,
-      "src/renderer/src/components/automations/automation-host-status-descriptors.test.ts": 116,
-      "src/renderer/src/components/automations/automation-legacy-schedule-editing.test.ts": 1615,
-      "src/renderer/src/components/automations/automation-list-empty-state.test.ts": 122,
-      "src/renderer/src/components/automations/automation-list-focus-recovery.test.ts": 42,
-      "src/renderer/src/components/automations/automation-list-keyboard-navigation.test.ts": 77,
-      "src/renderer/src/components/automations/automation-list-last-run.test.ts": 123,
-      "src/renderer/src/components/automations/automation-list-row-identity.test.ts": 339,
-      "src/renderer/src/components/automations/automation-list-search-rows.test.ts": 434,
-      "src/renderer/src/components/automations/automation-list-search.test.ts": 82,
-      "src/renderer/src/components/automations/automation-list-view-sort.test.ts": 610,
-      "src/renderer/src/components/automations/automation-list-view.test.ts": 164,
-      "src/renderer/src/components/automations/automation-project-groups.test.ts": 51,
-      "src/renderer/src/components/automations/automation-run-completion-evidence.test.ts": 48,
-      "src/renderer/src/components/automations/automation-run-context.test.ts": 49,
-      "src/renderer/src/components/automations/automation-run-history-keyboard-navigation.test.ts": 631,
-      "src/renderer/src/components/automations/automation-run-open-target.test.ts": 49,
-      "src/renderer/src/components/automations/automation-run-output-snapshot-equivalence.test.ts": 140,
-      "src/renderer/src/components/automations/automation-run-output-snapshot.test.ts": 106,
-      "src/renderer/src/components/automations/automation-run-view-state.test.ts": 48,
-      "src/renderer/src/components/automations/automation-runs-dashboard-model.test.ts": 56,
-      "src/renderer/src/components/automations/automation-scoped-list-client.test.ts": 142,
-      "src/renderer/src/components/automations/automation-setup-decision.test.ts": 1550,
-      "src/renderer/src/components/automations/automation-source-display.test.ts": 67,
-      "src/renderer/src/components/automations/automation-target-availability.test.ts": 57,
-      "src/renderer/src/components/automations/automation-usage-model.test.ts": 47,
-      "src/renderer/src/components/automations/automation-write-invalidation.test.ts": 54,
-      "src/renderer/src/components/automations/external-automation-display.test.ts": 81,
-      "src/renderer/src/components/automations/external-automation-list-entries.test.ts": 37,
-      "src/renderer/src/components/automations/external-automation-run-table-state.test.ts": 46,
-      "src/renderer/src/components/automations/external-automation-scope-gating.test.ts": 61,
-      "src/renderer/src/components/automations/external-automation-scope-keys.test.ts": 60,
-      "src/renderer/src/components/automations/external-automation-source-availability.test.ts": 51,
-      "src/renderer/src/components/automations/hermes-cron-output-parse.test.ts": 49,
-      "src/renderer/src/components/automations/use-automation-host-catalog-readoption.test.tsx": 872,
-      "src/renderer/src/components/automations/use-automation-host-catalog.test.tsx": 424,
-      "src/renderer/src/components/automations/use-automation-list-focus-recovery.test.tsx": 513,
-      "src/renderer/src/components/automations/use-automation-list-search.test.tsx": 849,
-      "src/renderer/src/components/automations/use-automation-runs-dashboard.test.tsx": 893,
-      "src/renderer/src/components/automations/use-external-automation-scope-retention.test.tsx": 496,
-      "src/renderer/src/components/automations/use-selected-automation-run-history.test.tsx": 466,
-      "src/renderer/src/components/browser-cookie-import-google-disclosure.test.tsx": 1294,
-      "src/renderer/src/components/browser-favicon.test.tsx": 685,
-      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.chrome-parity.test.tsx": 3229,
-      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.dead-guest.test.tsx": 3302,
-      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.download-notices.test.tsx": 2704,
-      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.drag-focus.test.tsx": 2774,
-      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.failure-remount.test.tsx": 1827,
-      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.markup.test.tsx": 2206,
-      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.popup-notices.test.tsx": 2374,
-      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.test.tsx": 3298,
-      "src/renderer/src/components/browser-pane/ReopenBrowserPageOnServerButton.test.tsx": 1009,
-      "src/renderer/src/components/browser-pane/annotate/BrowserAnnotationSendMenuContent.test.tsx": 39,
-      "src/renderer/src/components/browser-pane/annotate/GrabConfirmationSheet.test.ts": 384,
-      "src/renderer/src/components/browser-pane/annotate/browser-annotation-output.test.ts": 81,
-      "src/renderer/src/components/browser-pane/annotate/browser-page-annotation-tray.test.tsx": 2927,
-      "src/renderer/src/components/browser-pane/annotate/markup-drawing-model.test.ts": 56,
-      "src/renderer/src/components/browser-pane/annotate/markup-screenshot-compose.test.ts": 53,
-      "src/renderer/src/components/browser-pane/annotate/markup-shape-render.test.ts": 63,
-      "src/renderer/src/components/browser-pane/annotate/use-browser-page-annotation-send.test.tsx": 1025,
-      "src/renderer/src/components/browser-pane/annotate/use-markup-draw-hint.test.ts": 592,
-      "src/renderer/src/components/browser-pane/annotate/useGrabMode.test.ts": 767,
-      "src/renderer/src/components/browser-pane/annotate/useMarkupEditor.test.ts": 550,
-      "src/renderer/src/components/browser-pane/annotate/useMarkupPointerHandlers.test.ts": 590,
-      "src/renderer/src/components/browser-pane/assemble-chrome/BrowserAddressBar.test.tsx": 903,
-      "src/renderer/src/components/browser-pane/assemble-chrome/BrowserFind.test.tsx": 944,
-      "src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.remote-link-routing.test.ts": 44,
-      "src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.render-ipc.test.ts": 66,
-      "src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.webview-preferences.test.ts": 465,
-      "src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.test.tsx": 1370,
-      "src/renderer/src/components/browser-pane/assemble-chrome/browser-address-bar-expansion.test.ts": 45,
-      "src/renderer/src/components/browser-pane/assemble-chrome/browser-address-bar-suggestions.test.ts": 332,
-      "src/renderer/src/components/browser-pane/assemble-chrome/browser-deferred-lifecycle.test.tsx": 2274,
-      "src/renderer/src/components/browser-pane/assemble-chrome/browser-detected-browsers-summary.test.ts": 36,
-      "src/renderer/src/components/browser-pane/assemble-chrome/browser-egress-indicator.test.tsx": 2441,
-      "src/renderer/src/components/browser-pane/assemble-chrome/browser-import-hint-visibility.test.ts": 45,
-      "src/renderer/src/components/browser-pane/assemble-chrome/browser-navigation-control-row.test.tsx": 595,
-      "src/renderer/src/components/browser-pane/assemble-chrome/browser-page-zoom-indicator.test.tsx": 493,
-      "src/renderer/src/components/browser-pane/assemble-chrome/browser-pane-page-selection.test.ts": 41,
-      "src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.adoption-chrome.test.tsx": 7688,
-      "src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.retention-props.test.tsx": 2278,
-      "src/renderer/src/components/browser-pane/assemble-chrome/context-menu-positioning.test.ts": 58,
-      "src/renderer/src/components/browser-pane/assemble-chrome/ssh-routed-browser-page-gate.test.tsx": 1727,
-      "src/renderer/src/components/browser-pane/assemble-chrome/use-browser-page-chrome-focus.test.tsx": 2294,
-      "src/renderer/src/components/browser-pane/assemble-chrome/use-browser-page-find-shortcuts.test.tsx": 1973,
-      "src/renderer/src/components/browser-pane/browser-client-page-metadata-publisher.test.ts": 341,
-      "src/renderer/src/components/browser-pane/browser-client-page-metadata-route-census.test.ts": 51,
-      "src/renderer/src/components/browser-pane/browser-client-page-position-driver.test.ts": 604,
-      "src/renderer/src/components/browser-pane/browser-client-page-renderer-installation.test.ts": 604,
-      "src/renderer/src/components/browser-pane/browser-client-page-retained-drag-passthrough.test.ts": 608,
-      "src/renderer/src/components/browser-pane/browser-client-page-retained-registry.test.ts": 667,
-      "src/renderer/src/components/browser-pane/browser-download-destination-toast.test.ts": 48,
-      "src/renderer/src/components/browser-pane/browser-reopen-on-server.test.ts": 203,
-      "src/renderer/src/components/browser-pane/describe-page/browser-annotation-geometry.test.ts": 206,
-      "src/renderer/src/components/browser-pane/describe-page/browser-artifact-upload.test.ts": 2031,
-      "src/renderer/src/components/browser-pane/describe-page/browser-favicon-url.test.ts": 53,
-      "src/renderer/src/components/browser-pane/describe-page/browser-overlay-shortcut-target.test.ts": 1521,
-      "src/renderer/src/components/browser-pane/describe-page/browser-page-url-display.test.ts": 1493,
-      "src/renderer/src/components/browser-pane/describe-page/live-browser-url-registry.test.ts": 27,
-      "src/renderer/src/components/browser-pane/host-guest/browser-automation-visibility.test.ts": 45,
-      "src/renderer/src/components/browser-pane/host-guest/browser-focus.test.ts": 310,
-      "src/renderer/src/components/browser-pane/host-guest/browser-guest-eviction-veto.test.ts": 1662,
-      "src/renderer/src/components/browser-pane/host-guest/browser-guest-page-id-identity.test.ts": 1526,
-      "src/renderer/src/components/browser-pane/host-guest/browser-guest-paint-retention.test.ts": 1638,
-      "src/renderer/src/components/browser-pane/host-guest/browser-guest-retention-site-census.test.ts": 1003,
-      "src/renderer/src/components/browser-pane/host-guest/browser-guest-worktree-retention.test.ts": 1572,
-      "src/renderer/src/components/browser-pane/host-guest/browser-keyboard.test.ts": 479,
-      "src/renderer/src/components/browser-pane/host-guest/browser-page-evicted-guest-recovery.test.ts": 862,
-      "src/renderer/src/components/browser-pane/host-guest/browser-page-favicon-retention.test.ts": 1603,
-      "src/renderer/src/components/browser-pane/host-guest/browser-page-guest-recovery.test.ts": 739,
-      "src/renderer/src/components/browser-pane/host-guest/browser-page-paintability.test.ts": 48,
-      "src/renderer/src/components/browser-pane/host-guest/browser-page-registration-ownership.test.ts": 922,
-      "src/renderer/src/components/browser-pane/host-guest/browser-page-viewport.test.ts": 510,
-      "src/renderer/src/components/browser-pane/host-guest/browser-page-webview-surface.test.ts": 569,
-      "src/renderer/src/components/browser-pane/host-guest/browser-page-webview.test.ts": 605,
-      "src/renderer/src/components/browser-pane/host-guest/browser-page-zoom.test.ts": 65,
-      "src/renderer/src/components/browser-pane/host-guest/browser-system-resume.test.ts": 382,
-      "src/renderer/src/components/browser-pane/host-guest/browser-worktree-surface-paintability.test.ts": 48,
-      "src/renderer/src/components/browser-pane/host-guest/use-browser-page-keyboard-shortcuts.split.test.tsx": 2057,
-      "src/renderer/src/components/browser-pane/host-guest/use-browser-page-slot-viewport.test.ts": 573,
-      "src/renderer/src/components/browser-pane/host-guest/use-browser-page-viewport-scroll-reporting.test.tsx": 648,
-      "src/renderer/src/components/browser-pane/host-guest/use-webview-drag-passthrough-active.test.tsx": 637,
-      "src/renderer/src/components/browser-pane/host-guest/webview-registry.test.ts": 96,
-      "src/renderer/src/components/browser-pane/navigate/browser-address-bar-navigation.test.ts": 189,
-      "src/renderer/src/components/browser-pane/navigate/browser-download-progress.test.ts": 63,
-      "src/renderer/src/components/browser-pane/navigate/browser-load-failure-overlay.test.tsx": 1236,
-      "src/renderer/src/components/browser-pane/navigate/browser-notices.test.ts": 112,
-      "src/renderer/src/components/browser-pane/navigate/browser-page-download-activity.test.ts": 48,
-      "src/renderer/src/components/browser-pane/navigate/browser-reload-action.test.ts": 63,
-      "src/renderer/src/components/browser-pane/navigate/browser-webview-load-failure.test.ts": 122,
-      "src/renderer/src/components/browser-pane/navigate/chromium-error-page-poll-visibility.test.ts": 1982,
-      "src/renderer/src/components/browser-pane/navigate/chromium-error-page-polling.test.ts": 59,
-      "src/renderer/src/components/browser-pane/navigate/use-browser-page-reload-actions.test.tsx": 2171,
-      "src/renderer/src/components/browser-pane/restored-client-hosted-recovery-window.test.tsx": 2868,
-      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-frame-style.test.ts": 62,
-      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-keyboard.test.ts": 45,
-      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-input-model.test.ts": 42,
-      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.address-bar.test.tsx": 2496,
-      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.chrome-chords.test.tsx": 2694,
-      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-errors.test.ts": 109,
-      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle.test.ts": 405,
-      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-restart-scheduler.test.ts": 51,
-      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-status.test.ts": 101,
-      "src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-navigation.test.ts": 1539,
-      "src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-stream-activation.test.ts": 521,
-      "src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.failure-message.test.tsx": 3798,
-      "src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx": 4684,
-      "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts": 300,
-      "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-identity.test.ts": 36,
-      "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts": 172,
-      "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-webview-attach.test.ts": 495,
-      "src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.lazy-ref.test.tsx": 519,
-      "src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts": 375,
-      "src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx": 480,
-      "src/renderer/src/components/browser-webauthn-account-dialog.test.tsx": 1028,
-      "src/renderer/src/components/cmd-j/palette-activation-focus-routing.test.ts": 35,
-      "src/renderer/src/components/cmd-j/palette-duplicate-key-ghost-rows.test.tsx": 404,
-      "src/renderer/src/components/cmd-j/palette-filter-option-list.test.ts": 67,
-      "src/renderer/src/components/cmd-j/palette-filter-options.test.ts": 151,
-      "src/renderer/src/components/cmd-j/palette-filter.test.ts": 110,
-      "src/renderer/src/components/cmd-j/palette-focus-restore-target.test.ts": 510,
-      "src/renderer/src/components/cmd-j/palette-host-badge.test.ts": 93,
-      "src/renderer/src/components/cmd-j/palette-list-entry-render-keys.test.ts": 49,
-      "src/renderer/src/components/cmd-j/palette-live-status.test.tsx": 1712,
-      "src/renderer/src/components/cmd-j/palette-query-tokens.test.ts": 62,
-      "src/renderer/src/components/cmd-j/palette-results.test.ts": 423,
-      "src/renderer/src/components/cmd-j/palette-section-render-cap.test.ts": 76,
-      "src/renderer/src/components/cmd-j/palette-session-age.test.ts": 104,
-      "src/renderer/src/components/cmd-j/plugin-quick-actions.test.ts": 265,
-      "src/renderer/src/components/cmd-j/quick-action-context.test.ts": 1362,
-      "src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts": 213,
-      "src/renderer/src/components/cmd-j/worktree-palette-cache-inputs.test.ts": 49,
-      "src/renderer/src/components/codex-restart-chip.test.tsx": 2024,
-      "src/renderer/src/components/codex-restart-notice-key.test.ts": 42,
-      "src/renderer/src/components/comment-code-context-state.test.ts": 35,
-      "src/renderer/src/components/comment-reply-target-state.test.ts": 37,
-      "src/renderer/src/components/confirmation-dialog-refresh-boundary.test.ts": 1664,
-      "src/renderer/src/components/confirmation-dialog.test.tsx": 1442,
-      "src/renderer/src/components/confirmation-skip-preference.test.ts": 160,
-      "src/renderer/src/components/connect-dialog-outside-dismiss.test.tsx": 1013,
-      "src/renderer/src/components/contextual-tours/ContextualTourControl.test.ts": 1575,
-      "src/renderer/src/components/contextual-tours/ContextualTourOverlay.remeasure.test.tsx": 2194,
-      "src/renderer/src/components/contextual-tours/ContextualTourOverlay.test.tsx": 2297,
-      "src/renderer/src/components/contextual-tours/ContextualTourOverlay.visibility.test.tsx": 4450,
-      "src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.localization.test.tsx": 2341,
-      "src/renderer/src/components/contextual-tours/contextual-tour-floating-position.test.ts": 2265,
-      "src/renderer/src/components/contextual-tours/contextual-tour-gate.test.ts": 64,
-      "src/renderer/src/components/contextual-tours/contextual-tour-overlay-measurement.test.ts": 1880,
-      "src/renderer/src/components/contextual-tours/contextual-tour-step-actions.test.ts": 53,
-      "src/renderer/src/components/contextual-tours/request-contextual-tour-when-ready.test.ts": 1521,
-      "src/renderer/src/components/contextual-tours/use-contextual-tour.test.ts": 1417,
-      "src/renderer/src/components/contextual-tours/workspace-creation-tour-handoff.test.ts": 1371,
-      "src/renderer/src/components/crash-report/CrashReportDialogSurface.overflow.test.tsx": 701,
+      "src/relay/remote-artifact-cli-input.test.ts": 111,
+      "src/relay/remote-cli-env.test.ts": 31,
+      "src/relay/remote-cli-stdin.test.ts": 30,
+      "src/relay/remote-cli-timeout.test.ts": 61,
+      "src/relay/retired-pane-surfaces.test.ts": 29,
+      "src/relay/rotating-log-writer.test.ts": 68,
+      "src/relay/session-search-transport.test.ts": 172,
+      "src/relay/skill-install-handler.test.ts": 589,
+      "src/relay/skill-upload-multi-relay.integration.test.ts": 667,
+      "src/relay/ssh-pty-consumer-session-adapter.test.ts": 304,
+      "src/relay/ssh-pty-source-credit-adapter.test.ts": 124,
+      "src/relay/subprocess-tree-termination.test.ts": 41,
+      "src/relay/subprocess.test.ts": 26565,
+      "src/relay/terminal-history-wsl.test.ts": 77,
+      "src/relay/terminal-history.test.ts": 63,
+      "src/relay/windows-port-scan.test.ts": 107,
+      "src/relay/windows-port-scan.win32.test.ts": 71,
+      "src/relay/workspace-session-handler.test.ts": 87,
+      "src/relay/workspace-snapshot-publication.test.ts": 126,
+      "src/relay/workspace-space-scan-du-capacity.test.ts": 110,
+      "src/relay/workspace-space-scan.test.ts": 66,
+      "src/relay/wsl-agent-hook-relay.test.ts": 317,
+      "src/relay/wsl-hook-fs-bridge.test.ts": 39,
+      "src/relay/wsl-install-plugins-handler.test.ts": 161,
+      "src/renderer/src/app-shell/app-command-handlers-tab-rename.test.ts": 1093,
+      "src/renderer/src/app-shell/app-command-handlers-workspace-delete.test.ts": 97,
+      "src/renderer/src/app-shell/app-root-surface-settings.test.tsx": 721,
+      "src/renderer/src/app-shell/reconcile-hydrated-workspace-tab-models.test.ts": 35,
+      "src/renderer/src/app-shell/remote-workspace-unplaced-upload-suppression.test.tsx": 2317,
+      "src/renderer/src/app-shell/shutdown-checkpoint-persist.test.ts": 65,
+      "src/renderer/src/app-shell/shutdown-checkpoint-restart-lifecycle.test.ts": 401,
+      "src/renderer/src/app-shell/startup-actions-selector.test.ts": 127,
+      "src/renderer/src/app-shell/use-document-appearance.test.tsx": 2017,
+      "src/renderer/src/app-shell/window-visibility-actions-selector.test.ts": 697,
+      "src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx": 1163,
+      "src/renderer/src/app-startup-routing.test.ts": 76,
+      "src/renderer/src/assets/diff-comment-draft-card-shadow-style.test.ts": 54,
+      "src/renderer/src/assets/mobile-page-qr-layout.test.ts": 39,
+      "src/renderer/src/assets/rich-markdown-task-list-style.test.ts": 48,
+      "src/renderer/src/assets/terminal-container-geometry.test.ts": 28,
+      "src/renderer/src/assets/terminal-scrollbar-style.test.ts": 27,
+      "src/renderer/src/assets/theme-utility-generation.test.ts": 45,
+      "src/renderer/src/assets/worktree-card-active-style.test.ts": 37,
+      "src/renderer/src/attention/agent-attention-policy.test.ts": 60,
+      "src/renderer/src/components/AgentStateDot.test.ts": 245,
+      "src/renderer/src/components/AgentWorkingSpinner.test.tsx": 531,
+      "src/renderer/src/components/LinuxPackageInstallRecoveryCard.test.tsx": 1570,
+      "src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx": 2709,
+      "src/renderer/src/components/NewWorkspaceComposerCard.set-location-warm.test.tsx": 1009,
+      "src/renderer/src/components/NewWorkspaceComposerCard.set-location.test.tsx": 1670,
+      "src/renderer/src/components/NewWorkspaceComposerCard.start-from.test.tsx": 1503,
+      "src/renderer/src/components/NewWorkspaceComposerCard.test.tsx": 3004,
+      "src/renderer/src/components/QuickOpen.mount-gating.test.tsx": 2554,
+      "src/renderer/src/components/SelectedTextCopyMenu.test.tsx": 725,
+      "src/renderer/src/components/StarNagCard.test.tsx": 617,
+      "src/renderer/src/components/StateIndicatorTooltip.test.tsx": 96,
+      "src/renderer/src/components/TerminalSearch.test.tsx": 663,
+      "src/renderer/src/components/TerminalTitlebarTabs.test.tsx": 583,
+      "src/renderer/src/components/TerminalWorkbenchContainer.test.tsx": 640,
+      "src/renderer/src/components/UpdateCard.error-card.test.tsx": 2112,
+      "src/renderer/src/components/UpdateCard.test.ts": 1299,
+      "src/renderer/src/components/WorktreeBaseFallbackDialog.test.tsx": 2306,
+      "src/renderer/src/components/WorktreeJumpPalette.linear-url.test.tsx": 5178,
+      "src/renderer/src/components/WorktreeJumpPalette.mount-gating.test.tsx": 2600,
+      "src/renderer/src/components/WorktreeJumpPalette.recent-tabs.behavior.test.tsx": 2441,
+      "src/renderer/src/components/WorktreeJumpPalette.recent-tabs.test.tsx": 8351,
+      "src/renderer/src/components/WorktreeJumpPalette.test.tsx": 4265,
+      "src/renderer/src/components/activity/ActivityPrototypePage.filter-focus-shortcut.test.ts": 1835,
+      "src/renderer/src/components/activity/ActivityPrototypePage.test.ts": 2064,
+      "src/renderer/src/components/activity/ActivityPrototypePage.thread-grouping.test.ts": 2740,
+      "src/renderer/src/components/activity/ActivityThreadOptionsMenu.test.tsx": 3734,
+      "src/renderer/src/components/activity/activity-answered-ask-timeline.test.tsx": 1929,
+      "src/renderer/src/components/activity/activity-auto-mark-read-loop.react185.test.tsx": 2221,
+      "src/renderer/src/components/activity/activity-clear-completed-hmr.test.ts": 2023,
+      "src/renderer/src/components/activity/activity-clear-completed.test.ts": 1835,
+      "src/renderer/src/components/activity/activity-event-builder-agent-context.test.ts": 1527,
+      "src/renderer/src/components/activity/activity-event-builder.bounded-history.test.ts": 2432,
+      "src/renderer/src/components/activity/activity-event-builder.host-ownership.test.ts": 2802,
+      "src/renderer/src/components/activity/activity-event-builder.identity-reuse.test.ts": 3038,
+      "src/renderer/src/components/activity/activity-event-builder.live-cap.test.ts": 2280,
+      "src/renderer/src/components/activity/activity-portal-churn-budget.test.ts": 53,
+      "src/renderer/src/components/activity/activity-portal-readiness-decay.react185.test.tsx": 2960,
+      "src/renderer/src/components/activity/activity-portal-readiness-loop.react185.test.tsx": 3091,
+      "src/renderer/src/components/activity/activity-portal-readiness-oscillation.test.ts": 47,
+      "src/renderer/src/components/activity/activity-portal-readiness-subscription-churn.react185.test.tsx": 3186,
+      "src/renderer/src/components/activity/activity-portal-thread-reconciliation.test.ts": 45,
+      "src/renderer/src/components/activity/activity-scope-filter.test.ts": 2628,
+      "src/renderer/src/components/activity/activity-terminal-portal-publication-loop.react185.test.tsx": 288,
+      "src/renderer/src/components/activity/activity-terminal-portal.test.tsx": 451,
+      "src/renderer/src/components/activity/activity-thread-actions.test.ts": 1194,
+      "src/renderer/src/components/activity/activity-thread-child-agent.test.ts": 1802,
+      "src/renderer/src/components/activity/activity-thread-grouping.search-cache.test.ts": 1360,
+      "src/renderer/src/components/activity/activity-thread-grouping.status-order.test.ts": 3981,
+      "src/renderer/src/components/activity/activity-thread-hover-card.test.tsx": 2877,
+      "src/renderer/src/components/activity/activity-thread-list-pane-collapsible.test.tsx": 3116,
+      "src/renderer/src/components/activity/activity-thread-list-pane.virtualization.test.tsx": 2331,
+      "src/renderer/src/components/activity/activity-thread-presentation.test.ts": 2334,
+      "src/renderer/src/components/activity/activity-thread-virtual-items.test.ts": 2318,
+      "src/renderer/src/components/activity/dev-activity-fixture.test.ts": 45,
+      "src/renderer/src/components/activity/event-time-clock-refresh.test.tsx": 1277,
+      "src/renderer/src/components/activity/use-activity-thread-action-bindings.test.tsx": 858,
+      "src/renderer/src/components/activity/useActivityUnreadCount.freshness.test.tsx": 1349,
+      "src/renderer/src/components/activity/useActivityUnreadCount.test.ts": 1568,
+      "src/renderer/src/components/agent-session-continuation/AgentSessionContinuationDialog.test.tsx": 567,
+      "src/renderer/src/components/agent-session-continuation/agent-session-continuation-selection.test.ts": 59,
+      "src/renderer/src/components/agent/AgentCombobox.test.tsx": 1607,
+      "src/renderer/src/components/agent/AgentSettingsDialog.test.tsx": 627,
+      "src/renderer/src/components/agent/agent-combobox-command-state.test.ts": 38,
+      "src/renderer/src/components/artifacts/ArtifactCollection.test.tsx": 2261,
+      "src/renderer/src/components/artifacts/ArtifactPreview.test.tsx": 778,
+      "src/renderer/src/components/artifacts/ArtifactPublishButton.test.tsx": 842,
+      "src/renderer/src/components/artifacts/ArtifactsPage.test.tsx": 1366,
+      "src/renderer/src/components/artifacts/artifact-display-labels.test.ts": 106,
+      "src/renderer/src/components/artifacts/artifact-list-search.test.ts": 120,
+      "src/renderer/src/components/artifacts/artifact-list-windowing.test.tsx": 6815,
+      "src/renderer/src/components/artifacts/artifact-publish-flow.test.ts": 77,
+      "src/renderer/src/components/artifacts/artifact-published-link-client.test.ts": 52,
+      "src/renderer/src/components/automations/AutomationDestinationField.test.tsx": 1082,
+      "src/renderer/src/components/automations/AutomationDetail.host.test.tsx": 647,
+      "src/renderer/src/components/automations/AutomationDetail.test.tsx": 780,
+      "src/renderer/src/components/automations/AutomationEditorPromptEditor.test.tsx": 454,
+      "src/renderer/src/components/automations/AutomationHostBadges.test.tsx": 695,
+      "src/renderer/src/components/automations/AutomationHostFilterNotice.test.tsx": 1055,
+      "src/renderer/src/components/automations/AutomationListEmptyView.test.tsx": 798,
+      "src/renderer/src/components/automations/AutomationListHostGroups.test.tsx": 926,
+      "src/renderer/src/components/automations/AutomationListLocalRows.test.tsx": 955,
+      "src/renderer/src/components/automations/AutomationListSearchField.test.tsx": 511,
+      "src/renderer/src/components/automations/AutomationListTableHeader.test.tsx": 928,
+      "src/renderer/src/components/automations/AutomationOwnerConflictNotice.test.tsx": 892,
+      "src/renderer/src/components/automations/AutomationPromptDisclosure.test.tsx": 1140,
+      "src/renderer/src/components/automations/AutomationRunHistory.test.tsx": 1578,
+      "src/renderer/src/components/automations/AutomationRunsDashboardSurface.test.tsx": 623,
+      "src/renderer/src/components/automations/AutomationRunsTable.test.tsx": 1058,
+      "src/renderer/src/components/automations/AutomationSchedulePicker.render.test.tsx": 1285,
+      "src/renderer/src/components/automations/AutomationSchedulePicker.test.ts": 1456,
+      "src/renderer/src/components/automations/AutomationTimeField.test.tsx": 1061,
+      "src/renderer/src/components/automations/AutomationsDetailPane.run-count.test.tsx": 1899,
+      "src/renderer/src/components/automations/AutomationsDetailPane.test.tsx": 2085,
+      "src/renderer/src/components/automations/AutomationsListPanel.test.tsx": 1538,
+      "src/renderer/src/components/automations/AutomationsPage.create-destination.test.tsx": 2720,
+      "src/renderer/src/components/automations/AutomationsPage.cross-authority-actions.test.tsx": 1339,
+      "src/renderer/src/components/automations/AutomationsPage.escape-precedence.test.tsx": 2204,
+      "src/renderer/src/components/automations/AutomationsPage.external-scope.test.tsx": 1221,
+      "src/renderer/src/components/automations/AutomationsPage.notice-recovery.test.tsx": 1235,
+      "src/renderer/src/components/automations/AutomationsPage.refresh-selection.test.tsx": 1796,
+      "src/renderer/src/components/automations/AutomationsPage.run-visibility.test.tsx": 1594,
+      "src/renderer/src/components/automations/AutomationsPage.save-visibility.test.tsx": 1106,
+      "src/renderer/src/components/automations/AutomationsPage.strict-mode-save-visibility.test.tsx": 1789,
+      "src/renderer/src/components/automations/AutomationsPage.test.tsx": 3102,
+      "src/renderer/src/components/automations/AutomationsPageBreadcrumb.test.tsx": 708,
+      "src/renderer/src/components/automations/ExternalAutomationManagers.test.tsx": 922,
+      "src/renderer/src/components/automations/automation-authority-identity.test.ts": 54,
+      "src/renderer/src/components/automations/automation-captured-owner.test.ts": 107,
+      "src/renderer/src/components/automations/automation-create-destination.test.ts": 85,
+      "src/renderer/src/components/automations/automation-create-projects.test.ts": 35,
+      "src/renderer/src/components/automations/automation-detail-tab-navigation.test.ts": 300,
+      "src/renderer/src/components/automations/automation-editor-prompt-options.test.ts": 52,
+      "src/renderer/src/components/automations/automation-external-target-match.test.ts": 58,
+      "src/renderer/src/components/automations/automation-host-cache-controller.test.ts": 139,
+      "src/renderer/src/components/automations/automation-host-cache-health.test.ts": 56,
+      "src/renderer/src/components/automations/automation-host-cache.test.ts": 83,
+      "src/renderer/src/components/automations/automation-host-catalog-generation.test.ts": 84,
+      "src/renderer/src/components/automations/automation-host-catalog-order.test.ts": 51,
+      "src/renderer/src/components/automations/automation-host-catalog-source.test.ts": 64,
+      "src/renderer/src/components/automations/automation-host-catalog.test.ts": 140,
+      "src/renderer/src/components/automations/automation-host-client.test.ts": 70,
+      "src/renderer/src/components/automations/automation-host-detail-display.test.ts": 47,
+      "src/renderer/src/components/automations/automation-host-diagnostics.test.ts": 141,
+      "src/renderer/src/components/automations/automation-host-filter-resolution.test.ts": 84,
+      "src/renderer/src/components/automations/automation-host-health.test.ts": 26,
+      "src/renderer/src/components/automations/automation-host-invalidation-window-events.test.ts": 69,
+      "src/renderer/src/components/automations/automation-host-invalidation.test.ts": 50,
+      "src/renderer/src/components/automations/automation-host-list-rows.test.ts": 140,
+      "src/renderer/src/components/automations/automation-host-orphan-entry.test.ts": 160,
+      "src/renderer/src/components/automations/automation-host-picker-groups.test.ts": 58,
+      "src/renderer/src/components/automations/automation-host-recovery.test.ts": 56,
+      "src/renderer/src/components/automations/automation-host-scale-gates.test.ts": 400,
+      "src/renderer/src/components/automations/automation-host-scheduler.test.ts": 147,
+      "src/renderer/src/components/automations/automation-host-status-descriptors.test.ts": 90,
+      "src/renderer/src/components/automations/automation-legacy-schedule-editing.test.ts": 1751,
+      "src/renderer/src/components/automations/automation-list-empty-state.test.ts": 144,
+      "src/renderer/src/components/automations/automation-list-focus-recovery.test.ts": 43,
+      "src/renderer/src/components/automations/automation-list-keyboard-navigation.test.ts": 38,
+      "src/renderer/src/components/automations/automation-list-last-run.test.ts": 146,
+      "src/renderer/src/components/automations/automation-list-row-identity.test.ts": 377,
+      "src/renderer/src/components/automations/automation-list-search-rows.test.ts": 318,
+      "src/renderer/src/components/automations/automation-list-search.test.ts": 75,
+      "src/renderer/src/components/automations/automation-list-view-sort.test.ts": 458,
+      "src/renderer/src/components/automations/automation-list-view.test.ts": 99,
+      "src/renderer/src/components/automations/automation-project-groups.test.ts": 62,
+      "src/renderer/src/components/automations/automation-run-completion-evidence.test.ts": 58,
+      "src/renderer/src/components/automations/automation-run-context.test.ts": 36,
+      "src/renderer/src/components/automations/automation-run-history-keyboard-navigation.test.ts": 400,
+      "src/renderer/src/components/automations/automation-run-open-target.test.ts": 54,
+      "src/renderer/src/components/automations/automation-run-output-snapshot-equivalence.test.ts": 135,
+      "src/renderer/src/components/automations/automation-run-output-snapshot.test.ts": 78,
+      "src/renderer/src/components/automations/automation-run-view-state.test.ts": 40,
+      "src/renderer/src/components/automations/automation-runs-dashboard-model.test.ts": 38,
+      "src/renderer/src/components/automations/automation-scoped-list-client.test.ts": 127,
+      "src/renderer/src/components/automations/automation-setup-decision.test.ts": 1515,
+      "src/renderer/src/components/automations/automation-source-display.test.ts": 41,
+      "src/renderer/src/components/automations/automation-target-availability.test.ts": 60,
+      "src/renderer/src/components/automations/automation-usage-model.test.ts": 65,
+      "src/renderer/src/components/automations/automation-write-invalidation.test.ts": 53,
+      "src/renderer/src/components/automations/external-automation-display.test.ts": 66,
+      "src/renderer/src/components/automations/external-automation-list-entries.test.ts": 43,
+      "src/renderer/src/components/automations/external-automation-run-table-state.test.ts": 43,
+      "src/renderer/src/components/automations/external-automation-scope-gating.test.ts": 66,
+      "src/renderer/src/components/automations/external-automation-scope-keys.test.ts": 58,
+      "src/renderer/src/components/automations/external-automation-source-availability.test.ts": 55,
+      "src/renderer/src/components/automations/hermes-cron-output-parse.test.ts": 65,
+      "src/renderer/src/components/automations/use-automation-host-catalog-readoption.test.tsx": 810,
+      "src/renderer/src/components/automations/use-automation-host-catalog.test.tsx": 602,
+      "src/renderer/src/components/automations/use-automation-list-focus-recovery.test.tsx": 556,
+      "src/renderer/src/components/automations/use-automation-list-search.test.tsx": 673,
+      "src/renderer/src/components/automations/use-automation-runs-dashboard.test.tsx": 805,
+      "src/renderer/src/components/automations/use-external-automation-scope-retention.test.tsx": 329,
+      "src/renderer/src/components/automations/use-selected-automation-run-history.test.tsx": 747,
+      "src/renderer/src/components/browser-cookie-import-google-disclosure.test.tsx": 1424,
+      "src/renderer/src/components/browser-favicon.test.tsx": 631,
+      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.chrome-parity.test.tsx": 2176,
+      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.dead-guest.test.tsx": 2978,
+      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.download-notices.test.tsx": 2775,
+      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.drag-focus.test.tsx": 2007,
+      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.failure-remount.test.tsx": 2651,
+      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.markup.test.tsx": 2864,
+      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.popup-notices.test.tsx": 1804,
+      "src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.test.tsx": 1822,
+      "src/renderer/src/components/browser-pane/ReopenBrowserPageOnServerButton.test.tsx": 986,
+      "src/renderer/src/components/browser-pane/annotate/BrowserAnnotationSendMenuContent.test.tsx": 69,
+      "src/renderer/src/components/browser-pane/annotate/GrabConfirmationSheet.test.ts": 400,
+      "src/renderer/src/components/browser-pane/annotate/browser-annotation-output.test.ts": 95,
+      "src/renderer/src/components/browser-pane/annotate/browser-page-annotation-tray.test.tsx": 2934,
+      "src/renderer/src/components/browser-pane/annotate/markup-drawing-model.test.ts": 55,
+      "src/renderer/src/components/browser-pane/annotate/markup-screenshot-compose.test.ts": 70,
+      "src/renderer/src/components/browser-pane/annotate/markup-shape-render.test.ts": 69,
+      "src/renderer/src/components/browser-pane/annotate/use-browser-page-annotation-send.test.tsx": 1194,
+      "src/renderer/src/components/browser-pane/annotate/use-markup-draw-hint.test.ts": 587,
+      "src/renderer/src/components/browser-pane/annotate/useGrabMode.test.ts": 823,
+      "src/renderer/src/components/browser-pane/annotate/useMarkupEditor.test.ts": 590,
+      "src/renderer/src/components/browser-pane/annotate/useMarkupPointerHandlers.test.ts": 455,
+      "src/renderer/src/components/browser-pane/assemble-chrome/BrowserAddressBar.test.tsx": 651,
+      "src/renderer/src/components/browser-pane/assemble-chrome/BrowserFind.test.tsx": 996,
+      "src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.remote-link-routing.test.ts": 70,
+      "src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.render-ipc.test.ts": 35,
+      "src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.webview-preferences.test.ts": 607,
+      "src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.test.tsx": 830,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-address-bar-expansion.test.ts": 39,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-address-bar-suggestions.test.ts": 155,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-folded-tools.test.tsx": 529,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-toolbar.test.tsx": 1087,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-deferred-lifecycle.test.tsx": 2498,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-detected-browsers-summary.test.ts": 30,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-egress-indicator.test.tsx": 1863,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-import-hint-visibility.test.ts": 51,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-navigation-control-row.test.tsx": 1001,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-page-zoom-indicator.test.tsx": 652,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-pane-page-selection.test.ts": 48,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.adoption-chrome.test.tsx": 11725,
+      "src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.retention-props.test.tsx": 2366,
+      "src/renderer/src/components/browser-pane/assemble-chrome/context-menu-positioning.test.ts": 29,
+      "src/renderer/src/components/browser-pane/assemble-chrome/ssh-routed-browser-page-gate.test.tsx": 2237,
+      "src/renderer/src/components/browser-pane/assemble-chrome/use-browser-chrome-tool-fold.test.tsx": 439,
+      "src/renderer/src/components/browser-pane/assemble-chrome/use-browser-page-chrome-focus.test.tsx": 2365,
+      "src/renderer/src/components/browser-pane/assemble-chrome/use-browser-page-find-shortcuts.test.tsx": 1627,
+      "src/renderer/src/components/browser-pane/browser-client-page-metadata-publisher.test.ts": 302,
+      "src/renderer/src/components/browser-pane/browser-client-page-metadata-route-census.test.ts": 39,
+      "src/renderer/src/components/browser-pane/browser-client-page-position-driver.test.ts": 369,
+      "src/renderer/src/components/browser-pane/browser-client-page-renderer-installation.test.ts": 502,
+      "src/renderer/src/components/browser-pane/browser-client-page-retained-drag-passthrough.test.ts": 538,
+      "src/renderer/src/components/browser-pane/browser-client-page-retained-registry.test.ts": 441,
+      "src/renderer/src/components/browser-pane/browser-download-destination-toast.test.ts": 47,
+      "src/renderer/src/components/browser-pane/browser-reopen-on-server.test.ts": 150,
+      "src/renderer/src/components/browser-pane/describe-page/browser-annotation-geometry.test.ts": 197,
+      "src/renderer/src/components/browser-pane/describe-page/browser-artifact-upload.test.ts": 1993,
+      "src/renderer/src/components/browser-pane/describe-page/browser-favicon-url.test.ts": 31,
+      "src/renderer/src/components/browser-pane/describe-page/browser-overlay-shortcut-target.test.ts": 1253,
+      "src/renderer/src/components/browser-pane/describe-page/browser-page-url-display.test.ts": 1564,
+      "src/renderer/src/components/browser-pane/describe-page/live-browser-url-registry.test.ts": 44,
+      "src/renderer/src/components/browser-pane/host-guest/browser-automation-visibility.test.ts": 32,
+      "src/renderer/src/components/browser-pane/host-guest/browser-focus.test.ts": 304,
+      "src/renderer/src/components/browser-pane/host-guest/browser-guest-eviction-veto.test.ts": 1550,
+      "src/renderer/src/components/browser-pane/host-guest/browser-guest-page-id-identity.test.ts": 1555,
+      "src/renderer/src/components/browser-pane/host-guest/browser-guest-paint-retention.test.ts": 1611,
+      "src/renderer/src/components/browser-pane/host-guest/browser-guest-retention-site-census.test.ts": 743,
+      "src/renderer/src/components/browser-pane/host-guest/browser-guest-worktree-retention.test.ts": 1570,
+      "src/renderer/src/components/browser-pane/host-guest/browser-keyboard.test.ts": 483,
+      "src/renderer/src/components/browser-pane/host-guest/browser-page-evicted-guest-recovery.test.ts": 592,
+      "src/renderer/src/components/browser-pane/host-guest/browser-page-favicon-retention.test.ts": 875,
+      "src/renderer/src/components/browser-pane/host-guest/browser-page-guest-recovery.test.ts": 829,
+      "src/renderer/src/components/browser-pane/host-guest/browser-page-paintability.test.ts": 35,
+      "src/renderer/src/components/browser-pane/host-guest/browser-page-registration-ownership.test.ts": 994,
+      "src/renderer/src/components/browser-pane/host-guest/browser-page-viewport.test.ts": 389,
+      "src/renderer/src/components/browser-pane/host-guest/browser-page-webview-surface.test.ts": 554,
+      "src/renderer/src/components/browser-pane/host-guest/browser-page-webview.test.ts": 316,
+      "src/renderer/src/components/browser-pane/host-guest/browser-page-zoom.test.ts": 83,
+      "src/renderer/src/components/browser-pane/host-guest/browser-system-resume.test.ts": 314,
+      "src/renderer/src/components/browser-pane/host-guest/browser-worktree-surface-paintability.test.ts": 45,
+      "src/renderer/src/components/browser-pane/host-guest/use-browser-page-keyboard-shortcuts.split.test.tsx": 2091,
+      "src/renderer/src/components/browser-pane/host-guest/use-browser-page-slot-viewport.test.ts": 517,
+      "src/renderer/src/components/browser-pane/host-guest/use-browser-page-viewport-scroll-reporting.test.tsx": 605,
+      "src/renderer/src/components/browser-pane/host-guest/use-webview-drag-passthrough-active.test.tsx": 365,
+      "src/renderer/src/components/browser-pane/host-guest/webview-registry.test.ts": 73,
+      "src/renderer/src/components/browser-pane/navigate/browser-address-bar-navigation.test.ts": 206,
+      "src/renderer/src/components/browser-pane/navigate/browser-download-progress.test.ts": 59,
+      "src/renderer/src/components/browser-pane/navigate/browser-load-failure-overlay.test.tsx": 670,
+      "src/renderer/src/components/browser-pane/navigate/browser-notices.test.ts": 114,
+      "src/renderer/src/components/browser-pane/navigate/browser-page-download-activity.test.ts": 39,
+      "src/renderer/src/components/browser-pane/navigate/browser-reload-action.test.ts": 60,
+      "src/renderer/src/components/browser-pane/navigate/browser-webview-load-failure.test.ts": 143,
+      "src/renderer/src/components/browser-pane/navigate/chromium-error-page-poll-visibility.test.ts": 1983,
+      "src/renderer/src/components/browser-pane/navigate/chromium-error-page-polling.test.ts": 40,
+      "src/renderer/src/components/browser-pane/navigate/use-browser-page-reload-actions.test.tsx": 2074,
+      "src/renderer/src/components/browser-pane/restored-client-hosted-recovery-window.test.tsx": 2926,
+      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-frame-style.test.ts": 30,
+      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-keyboard.test.ts": 51,
+      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-input-model.test.ts": 32,
+      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.address-bar.test.tsx": 2538,
+      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.chrome-chords.test.tsx": 1822,
+      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-errors.test.ts": 97,
+      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle.test.ts": 349,
+      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-restart-scheduler.test.ts": 60,
+      "src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-status.test.ts": 104,
+      "src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-navigation.test.ts": 2231,
+      "src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-stream-activation.test.ts": 542,
+      "src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.failure-message.test.tsx": 3716,
+      "src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx": 3550,
+      "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts": 365,
+      "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-identity.test.ts": 52,
+      "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts": 168,
+      "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-webview-attach.test.ts": 433,
+      "src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.lazy-ref.test.tsx": 513,
+      "src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts": 414,
+      "src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx": 390,
+      "src/renderer/src/components/browser-webauthn-account-dialog.test.tsx": 813,
+      "src/renderer/src/components/cmd-j/palette-activation-focus-routing.test.ts": 57,
+      "src/renderer/src/components/cmd-j/palette-duplicate-key-ghost-rows.test.tsx": 467,
+      "src/renderer/src/components/cmd-j/palette-filter-option-list.test.ts": 33,
+      "src/renderer/src/components/cmd-j/palette-filter-options.test.ts": 107,
+      "src/renderer/src/components/cmd-j/palette-filter.test.ts": 73,
+      "src/renderer/src/components/cmd-j/palette-focus-restore-target.test.ts": 491,
+      "src/renderer/src/components/cmd-j/palette-host-badge.test.ts": 126,
+      "src/renderer/src/components/cmd-j/palette-list-entry-render-keys.test.ts": 45,
+      "src/renderer/src/components/cmd-j/palette-live-status.test.tsx": 1777,
+      "src/renderer/src/components/cmd-j/palette-query-tokens.test.ts": 65,
+      "src/renderer/src/components/cmd-j/palette-results.test.ts": 271,
+      "src/renderer/src/components/cmd-j/palette-section-render-cap.test.ts": 53,
+      "src/renderer/src/components/cmd-j/palette-session-age.test.ts": 69,
+      "src/renderer/src/components/cmd-j/plugin-quick-actions.test.ts": 150,
+      "src/renderer/src/components/cmd-j/quick-action-context.test.ts": 1653,
+      "src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts": 104,
+      "src/renderer/src/components/cmd-j/worktree-palette-cache-inputs.test.ts": 41,
+      "src/renderer/src/components/codex-restart-chip.test.tsx": 2063,
+      "src/renderer/src/components/codex-restart-notice-key.test.ts": 63,
+      "src/renderer/src/components/comment-code-context-state.test.ts": 34,
+      "src/renderer/src/components/comment-reply-target-state.test.ts": 51,
+      "src/renderer/src/components/confirmation-dialog-refresh-boundary.test.ts": 1586,
+      "src/renderer/src/components/confirmation-dialog.test.tsx": 1122,
+      "src/renderer/src/components/confirmation-skip-preference.test.ts": 157,
+      "src/renderer/src/components/connect-dialog-outside-dismiss.test.tsx": 1677,
+      "src/renderer/src/components/contextual-tours/ContextualTourControl.test.ts": 1553,
+      "src/renderer/src/components/contextual-tours/ContextualTourOverlay.remeasure.test.tsx": 2477,
+      "src/renderer/src/components/contextual-tours/ContextualTourOverlay.test.tsx": 2265,
+      "src/renderer/src/components/contextual-tours/ContextualTourOverlay.visibility.test.tsx": 4465,
+      "src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.localization.test.tsx": 1925,
+      "src/renderer/src/components/contextual-tours/contextual-tour-floating-position.test.ts": 2237,
+      "src/renderer/src/components/contextual-tours/contextual-tour-gate.test.ts": 52,
+      "src/renderer/src/components/contextual-tours/contextual-tour-overlay-measurement.test.ts": 2147,
+      "src/renderer/src/components/contextual-tours/contextual-tour-step-actions.test.ts": 55,
+      "src/renderer/src/components/contextual-tours/request-contextual-tour-when-ready.test.ts": 1567,
+      "src/renderer/src/components/contextual-tours/use-contextual-tour.test.ts": 1611,
+      "src/renderer/src/components/contextual-tours/workspace-creation-tour-handoff.test.ts": 1626,
+      "src/renderer/src/components/crash-report/CrashReportDialogSurface.overflow.test.tsx": 1063,
       "src/renderer/src/components/crash-report/crash-report-submit-notice.test.ts": 99,
-      "src/renderer/src/components/crash-report/use-crash-report-copy.test.tsx": 688,
-      "src/renderer/src/components/dashboard-popout/AgentKanbanBoard.test.tsx": 1700,
-      "src/renderer/src/components/dashboard-popout/AgentKanbanCard.test.tsx": 1444,
-      "src/renderer/src/components/dashboard-popout/AgentTerminalDialog.test.tsx": 1255,
-      "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.clipboard-routes.test.tsx": 2845,
-      "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.option-dead-key.test.tsx": 1525,
-      "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx": 2544,
-      "src/renderer/src/components/dashboard-popout/DashboardHostBadge.test.tsx": 1122,
-      "src/renderer/src/components/dashboard-popout/DashboardPopoutRoot.test.tsx": 742,
+      "src/renderer/src/components/crash-report/use-crash-report-copy.test.tsx": 469,
+      "src/renderer/src/components/dashboard-popout/AgentKanbanBoard.test.tsx": 1770,
+      "src/renderer/src/components/dashboard-popout/AgentKanbanCard.test.tsx": 1455,
+      "src/renderer/src/components/dashboard-popout/AgentTerminalDialog.test.tsx": 1261,
+      "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.clipboard-routes.test.tsx": 2804,
+      "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.option-dead-key.test.tsx": 1099,
+      "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-geometry.test.tsx": 2141,
+      "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-lifetime.test.tsx": 1461,
+      "src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx": 2518,
+      "src/renderer/src/components/dashboard-popout/DashboardHostBadge.test.tsx": 824,
+      "src/renderer/src/components/dashboard-popout/DashboardPopoutRoot.test.tsx": 406,
       "src/renderer/src/components/dashboard-popout/agent-board-filtering.test.ts": 45,
-      "src/renderer/src/components/dashboard-popout/dashboard-agent-status-patch.test.ts": 44,
-      "src/renderer/src/components/dashboard-popout/preview-grid-claim.test.ts": 502,
-      "src/renderer/src/components/dashboard-popout/preview-terminal-ime-bridge-kitty-bytes.test.ts": 843,
-      "src/renderer/src/components/dashboard-popout/preview-terminal-options.test.ts": 373,
-      "src/renderer/src/components/dashboard-popout/preview-terminal-right-click-paste.test.ts": 2086,
-      "src/renderer/src/components/dashboard-popout/preview-terminal-shortcuts.test.ts": 394,
-      "src/renderer/src/components/dashboard-popout/preview-terminal-snapshot-replay.test.ts": 50,
-      "src/renderer/src/components/dashboard-popout/terminal-preview-unavailable-message.test.ts": 94,
-      "src/renderer/src/components/dashboard-popout/useDashboardSnapshot.test.tsx": 665,
-      "src/renderer/src/components/dashboard/AgentDashboardDrawer.test.tsx": 2259,
-      "src/renderer/src/components/dashboard/AgentDashboardSettingsMenu.test.tsx": 1073,
-      "src/renderer/src/components/dashboard/DashboardAgentRow.test.tsx": 1993,
-      "src/renderer/src/components/dashboard/agent-dashboard-performance-isolation.test.ts": 51,
-      "src/renderer/src/components/dashboard/agent-finished-timestamp.test.ts": 49,
-      "src/renderer/src/components/dashboard/agent-row-lineage-model.test.ts": 75,
-      "src/renderer/src/components/dashboard/agent-row-pane-live-title.test.ts": 63,
-      "src/renderer/src/components/dashboard/build-dashboard-bucket-counts.allocation.test.ts": 302,
-      "src/renderer/src/components/dashboard/build-dashboard-bucket-counts.cache.test.ts": 203,
-      "src/renderer/src/components/dashboard/build-dashboard-bucket-counts.equivalence.test.ts": 358,
-      "src/renderer/src/components/dashboard/build-dashboard-snapshot-folder-workspace.test.ts": 1607,
-      "src/renderer/src/components/dashboard/build-dashboard-snapshot-orchestration-routing.test.ts": 1560,
-      "src/renderer/src/components/dashboard/build-dashboard-snapshot.rows-cache.test.ts": 1721,
-      "src/renderer/src/components/dashboard/build-dashboard-snapshot.test.ts": 4293,
-      "src/renderer/src/components/dashboard/dashboard-card-context.test.ts": 49,
-      "src/renderer/src/components/dashboard/dashboard-card-labels.test.ts": 53,
-      "src/renderer/src/components/dashboard/dashboard-card-terminal-input.test.ts": 2079,
-      "src/renderer/src/components/dashboard/dashboard-worktree-launch-options.test.ts": 55,
-      "src/renderer/src/components/dashboard/launch-dashboard-agent.test.ts": 54,
-      "src/renderer/src/components/dashboard/use-agent-row-conversation-name.test.ts": 94,
-      "src/renderer/src/components/dashboard/useAgentBucketCounts.gate.test.ts": 174,
-      "src/renderer/src/components/dashboard/useAgentBucketCounts.test.tsx": 559,
-      "src/renderer/src/components/dashboard/useDashboardPopoutBridge.test.tsx": 1311,
-      "src/renderer/src/components/dashboard/useLiveDashboardSnapshot.test.ts": 2352,
-      "src/renderer/src/components/dashboard/useRetainedAgents.test.ts": 1870,
-      "src/renderer/src/components/dashboard/useRetainedAgentsSync.test.ts": 1214,
-      "src/renderer/src/components/dictation/DictationIndicator.localization.test.ts": 556,
-      "src/renderer/src/components/dictation/DictationIndicator.test.tsx": 922,
-      "src/renderer/src/components/dictation/dictation-audio-meter.test.ts": 49,
-      "src/renderer/src/components/dictation/dictation-final-segments.test.ts": 42,
-      "src/renderer/src/components/dictation/dictation-insertion-target.test.ts": 778,
-      "src/renderer/src/components/dictation/dictation-meter-store.test.tsx": 495,
-      "src/renderer/src/components/dictation/dictation-stopped-sessions.test.ts": 49,
-      "src/renderer/src/components/dictation/microphone-devices.test.ts": 200,
-      "src/renderer/src/components/dictation/use-hold-dictation-gesture.test.tsx": 661,
-      "src/renderer/src/components/diff-comments/DiffCommentCard.resize.test.tsx": 1148,
-      "src/renderer/src/components/diff-comments/diff-comment-drag-auto-scroll.test.ts": 55,
-      "src/renderer/src/components/diff-comments/diff-comment-line-range.test.ts": 48,
-      "src/renderer/src/components/diff-comments/diff-comment-popover-outside-click.test.tsx": 2206,
-      "src/renderer/src/components/diff-comments/diff-comment-popover-position.test.ts": 46,
-      "src/renderer/src/components/diff-comments/diff-comment-range-drag.test.ts": 8612,
-      "src/renderer/src/components/diff-comments/diff-comment-zone-mouse-events.test.ts": 46,
-      "src/renderer/src/components/diff-comments/useDiffCommentDecorator.commentable-lines.test.tsx": 3346,
-      "src/renderer/src/components/diff-comments/useDiffCommentDecorator.model-lifecycle.test.tsx": 3679,
-      "src/renderer/src/components/diff-comments/useDiffCommentDecorator.range-selection.test.tsx": 10270,
-      "src/renderer/src/components/editor/ChangesModeView.test.tsx": 964,
-      "src/renderer/src/components/editor/CheckRunCopyButton.test.tsx": 873,
-      "src/renderer/src/components/editor/CheckRunDetailsPanel.copy.test.tsx": 1977,
-      "src/renderer/src/components/editor/ConflictComponents.test.tsx": 357,
-      "src/renderer/src/components/editor/EditorContent.markdown-classification.test.tsx": 2830,
-      "src/renderer/src/components/editor/EditorContent.monaco-lifecycle.test.tsx": 2348,
-      "src/renderer/src/components/editor/EditorContent.test.tsx": 3437,
-      "src/renderer/src/components/editor/EditorEditFileSurface.monaco-containment.test.tsx": 2017,
-      "src/renderer/src/components/editor/EditorFileLoadErrorView.test.tsx": 1053,
-      "src/renderer/src/components/editor/EditorPanel.markdown-classification-memoization.test.tsx": 3217,
-      "src/renderer/src/components/editor/EditorPanelHeader.test.tsx": 1288,
-      "src/renderer/src/components/editor/EditorPanelHeaderPath.test.tsx": 2745,
-      "src/renderer/src/components/editor/EditorPanelMarkdownActionsMenu.test.tsx": 209,
-      "src/renderer/src/components/editor/EditorPanelShell.header.test.tsx": 215,
-      "src/renderer/src/components/editor/ExternalFileChangeBanner.test.tsx": 547,
-      "src/renderer/src/components/editor/ExternalFileChangeCompareDialog.test.tsx": 905,
-      "src/renderer/src/components/editor/ImageViewer.test.tsx": 152,
-      "src/renderer/src/components/editor/IpynbKernelToolbar.test.tsx": 793,
-      "src/renderer/src/components/editor/IpynbRendering.test.tsx": 2627,
-      "src/renderer/src/components/editor/LargeDiffLoadPrompt.test.tsx": 563,
-      "src/renderer/src/components/editor/MarkdownPreview.link-routing.interaction.test.tsx": 1229,
-      "src/renderer/src/components/editor/MarkdownPreview.test.ts": 2482,
-      "src/renderer/src/components/editor/MarkdownPreview.toc-visibility-gate.test.tsx": 1322,
-      "src/renderer/src/components/editor/MarkdownPreviewBody.test.tsx": 590,
-      "src/renderer/src/components/editor/MarkdownTableOfContentsPanel.test.tsx": 1794,
-      "src/renderer/src/components/editor/MonacoEditor.content-owner.test.tsx": 3796,
-      "src/renderer/src/components/editor/MonacoEditor.font-family.test.tsx": 3923,
-      "src/renderer/src/components/editor/NotesSendMenu.test.tsx": 261,
-      "src/renderer/src/components/editor/PdfFind.test.tsx": 1219,
-      "src/renderer/src/components/editor/ReviewNotesSendMenuContent.test.tsx": 212,
-      "src/renderer/src/components/editor/RichMarkdownErrorBoundary.lazy-chunk.test.tsx": 571,
-      "src/renderer/src/components/editor/RichMarkdownLinkBubble.render.test.tsx": 979,
-      "src/renderer/src/components/editor/RichMarkdownLinkBubble.test.ts": 432,
-      "src/renderer/src/components/editor/RichMarkdownSearchBar.ime-enter.test.tsx": 928,
-      "src/renderer/src/components/editor/RichMarkdownSlashMenu.test.tsx": 329,
-      "src/renderer/src/components/editor/RichMarkdownTableControls.test.tsx": 2539,
-      "src/renderer/src/components/editor/check-annotation-open.test.ts": 54,
-      "src/renderer/src/components/editor/check-annotation-path.test.ts": 51,
-      "src/renderer/src/components/editor/check-job-step-status.test.ts": 108,
-      "src/renderer/src/components/editor/check-run-clipboard-text.test.ts": 49,
-      "src/renderer/src/components/editor/check-run-details-fix-with-ai.test.ts": 572,
-      "src/renderer/src/components/editor/check-run-details-tab.test.ts": 62,
-      "src/renderer/src/components/editor/closed-editor-model-lifetime.test.ts": 10861,
-      "src/renderer/src/components/editor/closed-editor-model-reentrancy.test.ts": 8920,
-      "src/renderer/src/components/editor/closed-editor-model-registry.test.ts": 10774,
-      "src/renderer/src/components/editor/closed-editor-model-shell.test.tsx": 7992,
-      "src/renderer/src/components/editor/closed-editor-tab-cache-sweep.test.ts": 48,
-      "src/renderer/src/components/editor/closed-editor-tab-disposal.test.ts": 127,
-      "src/renderer/src/components/editor/closed-editor-view-state-retention.test.ts": 10295,
-      "src/renderer/src/components/editor/combined-diff-on-demand-load.test.ts": 71,
-      "src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-collapsed-work.test.tsx": 1266,
-      "src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-render.test.tsx": 1552,
-      "src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-row-drag.test.tsx": 636,
-      "src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-windowing.test.tsx": 1322,
-      "src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree.test.ts": 76,
-      "src/renderer/src/components/editor/combined-diff/browse-files/use-combined-diff-file-tree-resize.test.tsx": 574,
-      "src/renderer/src/components/editor/combined-diff/browse-files/use-combined-diff-tree-navigation.test.ts": 645,
-      "src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-initial-section-load.test.ts": 39,
-      "src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-load-scheduler.test.ts": 72,
-      "src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.test.ts": 1538,
-      "src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-load-state.test.ts": 36,
-      "src/renderer/src/components/editor/combined-diff/remember-view/use-combined-diff-view-restore.test.tsx": 885,
-      "src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-entries.test.ts": 84,
-      "src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-section-cache-match.test.ts": 36,
-      "src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-section-scaling.test.tsx": 758,
-      "src/renderer/src/components/editor/combined-diff/resolve-changes/use-combined-diff-section-index-map.test.tsx": 490,
-      "src/renderer/src/components/editor/combined-diff/review-controls/combined-diff-commit-message.test.ts": 43,
-      "src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-restore-signal-equivalence.test.tsx": 626,
-      "src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-scrollbar-drag.test.ts": 39,
-      "src/renderer/src/components/editor/conflict-review-file-tree-windowing.test.tsx": 2064,
-      "src/renderer/src/components/editor/csv-parse.test.ts": 79,
-      "src/renderer/src/components/editor/details-markdown-html.test.ts": 79,
-      "src/renderer/src/components/editor/diff-editor-hide-unchanged-options.test.ts": 46,
-      "src/renderer/src/components/editor/diff-editor-line-number-options.test.ts": 60,
-      "src/renderer/src/components/editor/diff-editor-shift-wheel-scroll.test.ts": 533,
-      "src/renderer/src/components/editor/diff-editor-whitespace-options.test.ts": 52,
-      "src/renderer/src/components/editor/diff-editor-word-wrap-options.test.ts": 31,
-      "src/renderer/src/components/editor/diff-line-stats.test.ts": 62,
-      "src/renderer/src/components/editor/diff-model-swap-view-state.test.ts": 259,
-      "src/renderer/src/components/editor/diff-monaco-model-disposal.test.ts": 41,
-      "src/renderer/src/components/editor/diff-navigation-context.test.tsx": 1934,
-      "src/renderer/src/components/editor/diff-section-layout.test.ts": 67,
-      "src/renderer/src/components/editor/diff-section-preview.test.ts": 1590,
-      "src/renderer/src/components/editor/diff-viewer-large-diff-save-action.test.ts": 69,
-      "src/renderer/src/components/editor/editor-autosave-conflict-flow.test.ts": 551,
-      "src/renderer/src/components/editor/editor-autosave-controller.test.ts": 658,
-      "src/renderer/src/components/editor/editor-autosave.test.ts": 236,
-      "src/renderer/src/components/editor/editor-cmd-save-target.test.ts": 221,
-      "src/renderer/src/components/editor/editor-content-dirty-state.test.ts": 46,
-      "src/renderer/src/components/editor/editor-external-watch-path-index.test.ts": 1734,
-      "src/renderer/src/components/editor/editor-file-save-attempt.test.ts": 61,
-      "src/renderer/src/components/editor/editor-header-file-rename.test.ts": 558,
-      "src/renderer/src/components/editor/editor-header.test.ts": 66,
-      "src/renderer/src/components/editor/editor-labels.test.ts": 50,
-      "src/renderer/src/components/editor/editor-model-uri.test.ts": 86,
-      "src/renderer/src/components/editor/editor-panel-diff-reload.test.ts": 49,
-      "src/renderer/src/components/editor/editor-panel-draft-selector.test.ts": 62,
-      "src/renderer/src/components/editor/editor-panel-git-entry-selector.test.ts": 66,
-      "src/renderer/src/components/editor/editor-panel-render-model.test.ts": 2869,
-      "src/renderer/src/components/editor/editor-path-display.test.ts": 26,
-      "src/renderer/src/components/editor/editor-path-move-inflight.test.ts": 57,
-      "src/renderer/src/components/editor/editor-restored-tab-conflict-scan.test.ts": 487,
-      "src/renderer/src/components/editor/editor-self-write-registry.test.ts": 94,
-      "src/renderer/src/components/editor/editor-shortcuts.test.ts": 551,
-      "src/renderer/src/components/editor/export-active-markdown.test.ts": 449,
-      "src/renderer/src/components/editor/file-editor-word-wrap-options.test.ts": 55,
-      "src/renderer/src/components/editor/image-viewer-zoom.test.ts": 56,
-      "src/renderer/src/components/editor/ipynb-ansi.test.ts": 63,
-      "src/renderer/src/components/editor/ipynb-code-cell-lines.test.ts": 97,
-      "src/renderer/src/components/editor/ipynb-kernel-outputs.test.ts": 47,
-      "src/renderer/src/components/editor/ipynb-kernel-session.test.ts": 181,
-      "src/renderer/src/components/editor/ipynb-kernel-setup-commands.test.ts": 37,
-      "src/renderer/src/components/editor/ipynb-parse.test.ts": 115,
-      "src/renderer/src/components/editor/large-diff-render-limit.test.ts": 112,
-      "src/renderer/src/components/editor/line-copy-path.test.ts": 35,
-      "src/renderer/src/components/editor/local-log-tail-decoder.test.ts": 55,
-      "src/renderer/src/components/editor/markdown-artifact-upload.test.ts": 69,
-      "src/renderer/src/components/editor/markdown-dirty-state.test.ts": 270,
-      "src/renderer/src/components/editor/markdown-doc-completions.test.ts": 47,
-      "src/renderer/src/components/editor/markdown-doc-links.test.ts": 229,
-      "src/renderer/src/components/editor/markdown-document-list-request.test.ts": 244,
-      "src/renderer/src/components/editor/markdown-document-worktree-path-selector.test.ts": 1621,
-      "src/renderer/src/components/editor/markdown-export-extract.test.ts": 578,
-      "src/renderer/src/components/editor/markdown-export-html.test.ts": 41,
-      "src/renderer/src/components/editor/markdown-frontmatter.test.ts": 51,
+      "src/renderer/src/components/dashboard-popout/dashboard-agent-status-patch.test.ts": 42,
+      "src/renderer/src/components/dashboard-popout/preview-grid-claim.test.ts": 467,
+      "src/renderer/src/components/dashboard-popout/preview-terminal-ime-bridge-kitty-bytes.test.ts": 611,
+      "src/renderer/src/components/dashboard-popout/preview-terminal-options.test.ts": 450,
+      "src/renderer/src/components/dashboard-popout/preview-terminal-right-click-paste.test.ts": 1921,
+      "src/renderer/src/components/dashboard-popout/preview-terminal-shortcuts.test.ts": 391,
+      "src/renderer/src/components/dashboard-popout/preview-terminal-snapshot-replay.test.ts": 54,
+      "src/renderer/src/components/dashboard-popout/terminal-preview-unavailable-message.test.ts": 77,
+      "src/renderer/src/components/dashboard-popout/useDashboardSnapshot.test.tsx": 381,
+      "src/renderer/src/components/dashboard/AgentDashboardDrawer.test.tsx": 2133,
+      "src/renderer/src/components/dashboard/AgentDashboardSettingsMenu.test.tsx": 1129,
+      "src/renderer/src/components/dashboard/DashboardAgentRow.test.tsx": 1861,
+      "src/renderer/src/components/dashboard/agent-dashboard-performance-isolation.test.ts": 46,
+      "src/renderer/src/components/dashboard/agent-finished-timestamp.test.ts": 56,
+      "src/renderer/src/components/dashboard/agent-row-lineage-model.test.ts": 117,
+      "src/renderer/src/components/dashboard/agent-row-pane-live-title.test.ts": 34,
+      "src/renderer/src/components/dashboard/build-dashboard-bucket-counts.allocation.test.ts": 192,
+      "src/renderer/src/components/dashboard/build-dashboard-bucket-counts.cache.test.ts": 213,
+      "src/renderer/src/components/dashboard/build-dashboard-bucket-counts.equivalence.test.ts": 129,
+      "src/renderer/src/components/dashboard/build-dashboard-snapshot-folder-workspace.test.ts": 1728,
+      "src/renderer/src/components/dashboard/build-dashboard-snapshot-orchestration-routing.test.ts": 1618,
+      "src/renderer/src/components/dashboard/build-dashboard-snapshot.rows-cache.test.ts": 907,
+      "src/renderer/src/components/dashboard/build-dashboard-snapshot.test.ts": 1818,
+      "src/renderer/src/components/dashboard/dashboard-card-context.test.ts": 60,
+      "src/renderer/src/components/dashboard/dashboard-card-labels.test.ts": 43,
+      "src/renderer/src/components/dashboard/dashboard-card-terminal-input.test.ts": 1383,
+      "src/renderer/src/components/dashboard/dashboard-worktree-launch-options.test.ts": 75,
+      "src/renderer/src/components/dashboard/launch-dashboard-agent.test.ts": 53,
+      "src/renderer/src/components/dashboard/use-agent-row-conversation-name.test.ts": 90,
+      "src/renderer/src/components/dashboard/useAgentBucketCounts.gate.test.ts": 218,
+      "src/renderer/src/components/dashboard/useAgentBucketCounts.test.tsx": 594,
+      "src/renderer/src/components/dashboard/useDashboardPopoutBridge.test.tsx": 824,
+      "src/renderer/src/components/dashboard/useLiveDashboardSnapshot.test.ts": 2326,
+      "src/renderer/src/components/dashboard/useRetainedAgents.test.ts": 1992,
+      "src/renderer/src/components/dashboard/useRetainedAgentsSync.test.ts": 971,
+      "src/renderer/src/components/dictation/DictationIndicator.localization.test.ts": 394,
+      "src/renderer/src/components/dictation/DictationIndicator.test.tsx": 761,
+      "src/renderer/src/components/dictation/dictation-audio-meter.test.ts": 37,
+      "src/renderer/src/components/dictation/dictation-final-segments.test.ts": 53,
+      "src/renderer/src/components/dictation/dictation-insertion-target.test.ts": 535,
+      "src/renderer/src/components/dictation/dictation-meter-store.test.tsx": 356,
+      "src/renderer/src/components/dictation/dictation-stopped-sessions.test.ts": 39,
+      "src/renderer/src/components/dictation/microphone-devices.test.ts": 225,
+      "src/renderer/src/components/dictation/use-hold-dictation-gesture.test.tsx": 436,
+      "src/renderer/src/components/diff-comments/DiffCommentCard.resize.test.tsx": 833,
+      "src/renderer/src/components/diff-comments/DiffCommentDraftCard.test.tsx": 2221,
+      "src/renderer/src/components/diff-comments/diff-comment-draft-zone.test.tsx": 2636,
+      "src/renderer/src/components/diff-comments/diff-comment-drag-auto-scroll.test.ts": 35,
+      "src/renderer/src/components/diff-comments/diff-comment-line-range.test.ts": 45,
+      "src/renderer/src/components/diff-comments/diff-comment-popover-outside-click.test.tsx": 1653,
+      "src/renderer/src/components/diff-comments/diff-comment-popover-position.test.ts": 51,
+      "src/renderer/src/components/diff-comments/diff-comment-range-drag.test.ts": 4994,
+      "src/renderer/src/components/diff-comments/diff-comment-zone-mouse-events.test.ts": 75,
+      "src/renderer/src/components/diff-comments/useDiffCommentDecorator.commentable-lines.test.tsx": 2302,
+      "src/renderer/src/components/diff-comments/useDiffCommentDecorator.model-lifecycle.test.tsx": 10560,
+      "src/renderer/src/components/diff-comments/useDiffCommentDecorator.range-selection.test.tsx": 9340,
+      "src/renderer/src/components/editor/ChangesModeView.test.tsx": 732,
+      "src/renderer/src/components/editor/CheckRunCopyButton.test.tsx": 913,
+      "src/renderer/src/components/editor/CheckRunDetailsPanel.copy.test.tsx": 2524,
+      "src/renderer/src/components/editor/ConflictComponents.test.tsx": 456,
+      "src/renderer/src/components/editor/EditorContent.markdown-classification.test.tsx": 2582,
+      "src/renderer/src/components/editor/EditorContent.monaco-lifecycle.test.tsx": 2668,
+      "src/renderer/src/components/editor/EditorContent.test.tsx": 2479,
+      "src/renderer/src/components/editor/EditorEditFileSurface.monaco-containment.test.tsx": 2094,
+      "src/renderer/src/components/editor/EditorFileLoadErrorView.test.tsx": 931,
+      "src/renderer/src/components/editor/EditorPanel.markdown-classification-memoization.test.tsx": 3127,
+      "src/renderer/src/components/editor/EditorPanelHeader.test.tsx": 1141,
+      "src/renderer/src/components/editor/EditorPanelHeaderPath.test.tsx": 3424,
+      "src/renderer/src/components/editor/EditorPanelMarkdownActionsMenu.test.tsx": 234,
+      "src/renderer/src/components/editor/EditorPanelShell.header.test.tsx": 157,
+      "src/renderer/src/components/editor/ExternalFileChangeBanner.test.tsx": 261,
+      "src/renderer/src/components/editor/ExternalFileChangeCompareDialog.test.tsx": 671,
+      "src/renderer/src/components/editor/ImageViewer.test.tsx": 132,
+      "src/renderer/src/components/editor/IpynbKernelToolbar.test.tsx": 1349,
+      "src/renderer/src/components/editor/IpynbRendering.test.tsx": 2742,
+      "src/renderer/src/components/editor/LargeDiffLoadPrompt.test.tsx": 657,
+      "src/renderer/src/components/editor/MarkdownPreview.link-routing.interaction.test.tsx": 1262,
+      "src/renderer/src/components/editor/MarkdownPreview.test.ts": 2737,
+      "src/renderer/src/components/editor/MarkdownPreview.toc-visibility-gate.test.tsx": 1364,
+      "src/renderer/src/components/editor/MarkdownPreviewBody.test.tsx": 579,
+      "src/renderer/src/components/editor/MarkdownTableOfContentsPanel.test.tsx": 1063,
+      "src/renderer/src/components/editor/MonacoEditor.content-owner.test.tsx": 6383,
+      "src/renderer/src/components/editor/MonacoEditor.font-family.test.tsx": 2152,
+      "src/renderer/src/components/editor/NotesSendMenu.test.tsx": 302,
+      "src/renderer/src/components/editor/PdfFind.test.tsx": 881,
+      "src/renderer/src/components/editor/ReviewNotesSendMenuContent.test.tsx": 156,
+      "src/renderer/src/components/editor/RichMarkdownErrorBoundary.lazy-chunk.test.tsx": 640,
+      "src/renderer/src/components/editor/RichMarkdownLinkBubble.render.test.tsx": 1046,
+      "src/renderer/src/components/editor/RichMarkdownLinkBubble.test.ts": 437,
+      "src/renderer/src/components/editor/RichMarkdownSearchBar.ime-enter.test.tsx": 1007,
+      "src/renderer/src/components/editor/RichMarkdownSlashMenu.test.tsx": 326,
+      "src/renderer/src/components/editor/RichMarkdownTableControls.test.tsx": 2235,
+      "src/renderer/src/components/editor/check-annotation-open.test.ts": 84,
+      "src/renderer/src/components/editor/check-annotation-path.test.ts": 39,
+      "src/renderer/src/components/editor/check-job-step-status.test.ts": 34,
+      "src/renderer/src/components/editor/check-run-clipboard-text.test.ts": 42,
+      "src/renderer/src/components/editor/check-run-details-fix-with-ai.test.ts": 542,
+      "src/renderer/src/components/editor/check-run-details-tab.test.ts": 33,
+      "src/renderer/src/components/editor/closed-editor-model-lifetime.test.ts": 2002,
+      "src/renderer/src/components/editor/closed-editor-model-reentrancy.test.ts": 7076,
+      "src/renderer/src/components/editor/closed-editor-model-registry.test.ts": 8037,
+      "src/renderer/src/components/editor/closed-editor-model-shell.test.tsx": 4841,
+      "src/renderer/src/components/editor/closed-editor-tab-cache-sweep.test.ts": 55,
+      "src/renderer/src/components/editor/closed-editor-tab-disposal.test.ts": 219,
+      "src/renderer/src/components/editor/closed-editor-view-state-retention.test.ts": 4770,
+      "src/renderer/src/components/editor/combined-diff-on-demand-load.test.ts": 49,
+      "src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-collapsed-work.test.tsx": 780,
+      "src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-render.test.tsx": 1657,
+      "src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-row-drag.test.tsx": 501,
+      "src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-windowing.test.tsx": 970,
+      "src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree.test.ts": 86,
+      "src/renderer/src/components/editor/combined-diff/browse-files/use-combined-diff-file-tree-resize.test.tsx": 368,
+      "src/renderer/src/components/editor/combined-diff/browse-files/use-combined-diff-tree-navigation.test.ts": 591,
+      "src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-initial-section-load.test.ts": 46,
+      "src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-load-scheduler.test.ts": 53,
+      "src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.test.ts": 1433,
+      "src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-load-state.test.ts": 38,
+      "src/renderer/src/components/editor/combined-diff/remember-view/use-combined-diff-view-restore.test.tsx": 560,
+      "src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-entries.test.ts": 50,
+      "src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-section-cache-match.test.ts": 55,
+      "src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-section-scaling.test.tsx": 602,
+      "src/renderer/src/components/editor/combined-diff/resolve-changes/use-combined-diff-section-index-map.test.tsx": 664,
+      "src/renderer/src/components/editor/combined-diff/review-controls/combined-diff-commit-message.test.ts": 48,
+      "src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-restore-signal-equivalence.test.tsx": 552,
+      "src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-scrollbar-drag.test.ts": 59,
+      "src/renderer/src/components/editor/conflict-review-file-tree-windowing.test.tsx": 2238,
+      "src/renderer/src/components/editor/csv-parse.test.ts": 122,
+      "src/renderer/src/components/editor/details-markdown-html.test.ts": 99,
+      "src/renderer/src/components/editor/diff-editor-hide-unchanged-options.test.ts": 35,
+      "src/renderer/src/components/editor/diff-editor-line-number-options.test.ts": 48,
+      "src/renderer/src/components/editor/diff-editor-shift-wheel-scroll.test.ts": 484,
+      "src/renderer/src/components/editor/diff-editor-whitespace-options.test.ts": 30,
+      "src/renderer/src/components/editor/diff-editor-word-wrap-options.test.ts": 43,
+      "src/renderer/src/components/editor/diff-line-stats.test.ts": 56,
+      "src/renderer/src/components/editor/diff-model-swap-view-state.test.ts": 524,
+      "src/renderer/src/components/editor/diff-monaco-model-disposal.test.ts": 67,
+      "src/renderer/src/components/editor/diff-navigation-context.test.tsx": 1956,
+      "src/renderer/src/components/editor/diff-section-comment-submit.test.ts": 114,
+      "src/renderer/src/components/editor/diff-section-layout.test.ts": 68,
+      "src/renderer/src/components/editor/diff-section-preview.test.ts": 1595,
+      "src/renderer/src/components/editor/diff-viewer-large-diff-save-action.test.ts": 112,
+      "src/renderer/src/components/editor/editor-autosave-conflict-flow.test.ts": 574,
+      "src/renderer/src/components/editor/editor-autosave-controller.test.ts": 500,
+      "src/renderer/src/components/editor/editor-autosave.test.ts": 152,
+      "src/renderer/src/components/editor/editor-cmd-save-target.test.ts": 225,
+      "src/renderer/src/components/editor/editor-content-dirty-state.test.ts": 62,
+      "src/renderer/src/components/editor/editor-external-watch-path-index.test.ts": 1558,
+      "src/renderer/src/components/editor/editor-file-save-attempt.test.ts": 70,
+      "src/renderer/src/components/editor/editor-header-file-rename.test.ts": 608,
+      "src/renderer/src/components/editor/editor-header.test.ts": 37,
+      "src/renderer/src/components/editor/editor-labels.test.ts": 37,
+      "src/renderer/src/components/editor/editor-model-uri.test.ts": 127,
+      "src/renderer/src/components/editor/editor-panel-diff-reload.test.ts": 26,
+      "src/renderer/src/components/editor/editor-panel-draft-selector.test.ts": 38,
+      "src/renderer/src/components/editor/editor-panel-git-entry-selector.test.ts": 63,
+      "src/renderer/src/components/editor/editor-panel-render-model.test.ts": 2036,
+      "src/renderer/src/components/editor/editor-path-display.test.ts": 38,
+      "src/renderer/src/components/editor/editor-path-move-inflight.test.ts": 60,
+      "src/renderer/src/components/editor/editor-restored-tab-conflict-scan.test.ts": 445,
+      "src/renderer/src/components/editor/editor-self-write-registry.test.ts": 69,
+      "src/renderer/src/components/editor/editor-shortcuts.test.ts": 526,
+      "src/renderer/src/components/editor/export-active-markdown.test.ts": 396,
+      "src/renderer/src/components/editor/file-editor-word-wrap-options.test.ts": 46,
+      "src/renderer/src/components/editor/image-viewer-zoom.test.ts": 55,
+      "src/renderer/src/components/editor/ipynb-ansi.test.ts": 54,
+      "src/renderer/src/components/editor/ipynb-code-cell-lines.test.ts": 121,
+      "src/renderer/src/components/editor/ipynb-kernel-outputs.test.ts": 33,
+      "src/renderer/src/components/editor/ipynb-kernel-session.test.ts": 183,
+      "src/renderer/src/components/editor/ipynb-kernel-setup-commands.test.ts": 54,
+      "src/renderer/src/components/editor/ipynb-parse.test.ts": 77,
+      "src/renderer/src/components/editor/large-diff-render-limit.test.ts": 171,
+      "src/renderer/src/components/editor/line-copy-path.test.ts": 34,
+      "src/renderer/src/components/editor/local-log-tail-decoder.test.ts": 47,
+      "src/renderer/src/components/editor/markdown-artifact-upload.test.ts": 64,
+      "src/renderer/src/components/editor/markdown-dirty-state.test.ts": 317,
+      "src/renderer/src/components/editor/markdown-doc-completions.test.ts": 57,
+      "src/renderer/src/components/editor/markdown-doc-links.test.ts": 173,
+      "src/renderer/src/components/editor/markdown-document-list-request.test.ts": 308,
+      "src/renderer/src/components/editor/markdown-document-worktree-path-selector.test.ts": 1467,
+      "src/renderer/src/components/editor/markdown-export-extract.test.ts": 606,
+      "src/renderer/src/components/editor/markdown-export-html.test.ts": 47,
+      "src/renderer/src/components/editor/markdown-frontmatter.test.ts": 49,
       "src/renderer/src/components/editor/markdown-heading-slug.test.ts": 48,
-      "src/renderer/src/components/editor/markdown-internal-links.test.ts": 83,
-      "src/renderer/src/components/editor/markdown-preview-annotation-shortcut.test.ts": 557,
-      "src/renderer/src/components/editor/markdown-preview-controls.test.ts": 63,
-      "src/renderer/src/components/editor/markdown-preview-links.test.ts": 71,
-      "src/renderer/src/components/editor/markdown-preview-local-images.test.ts": 578,
-      "src/renderer/src/components/editor/markdown-preview-search-crash.test.tsx": 380,
-      "src/renderer/src/components/editor/markdown-preview-search.test.ts": 61,
-      "src/renderer/src/components/editor/markdown-preview-url-transform.test.ts": 190,
-      "src/renderer/src/components/editor/markdown-reference-link-normalization.test.ts": 112,
-      "src/renderer/src/components/editor/markdown-render-mode.test.ts": 42,
-      "src/renderer/src/components/editor/markdown-rich-comment-scan.test.ts": 251,
-      "src/renderer/src/components/editor/markdown-rich-line-scan.test.ts": 1784,
-      "src/renderer/src/components/editor/markdown-rich-mode-eligibility-cache.test.ts": 1762,
-      "src/renderer/src/components/editor/markdown-rich-mode.test.ts": 1631,
-      "src/renderer/src/components/editor/markdown-rich-size-limit.test.ts": 202,
-      "src/renderer/src/components/editor/markdown-round-trip.test.ts": 2429,
-      "src/renderer/src/components/editor/markdown-scanner-boundaries.test.ts": 78,
-      "src/renderer/src/components/editor/markdown-table-of-contents.test.ts": 266,
-      "src/renderer/src/components/editor/markdown-toc-collapse-state.test.ts": 52,
-      "src/renderer/src/components/editor/markdown-toc-visibility-gate.test.ts": 250,
-      "src/renderer/src/components/editor/mermaid-config.test.ts": 39,
-      "src/renderer/src/components/editor/monaco-auto-height.test.ts": 110,
-      "src/renderer/src/components/editor/monaco-codebase-search.test.ts": 52,
-      "src/renderer/src/components/editor/monaco-conflict-decorations.test.ts": 52,
-      "src/renderer/src/components/editor/monaco-content-sync.test.ts": 129,
-      "src/renderer/src/components/editor/monaco-content-sync.undo-history.test.ts": 2764,
-      "src/renderer/src/components/editor/monaco-context-menu-paste.test.ts": 475,
-      "src/renderer/src/components/editor/monaco-find-options.test.ts": 48,
-      "src/renderer/src/components/editor/monaco-find-widget.test.ts": 501,
-      "src/renderer/src/components/editor/monaco-large-text-paste.test.ts": 485,
-      "src/renderer/src/components/editor/monaco-markdown-doc-link-decorations.offset-scan.test.ts": 181,
-      "src/renderer/src/components/editor/monaco-markdown-doc-link-decorations.test.ts": 64,
-      "src/renderer/src/components/editor/monaco-markdown-selection-annotation.test.ts": 37,
-      "src/renderer/src/components/editor/monaco-programmatic-sync.test.ts": 54,
-      "src/renderer/src/components/editor/monaco-reveal-range.test.ts": 49,
-      "src/renderer/src/components/editor/monaco-view-state-persistence.test.ts": 64,
-      "src/renderer/src/components/editor/pdf-js-document-options.test.ts": 50,
-      "src/renderer/src/components/editor/pdf-scale-preference-storage.test.ts": 61,
-      "src/renderer/src/components/editor/pdf-scale-preference.test.ts": 59,
-      "src/renderer/src/components/editor/pdf-view-position.test.ts": 81,
-      "src/renderer/src/components/editor/pending-editor-focus-request.test.ts": 60,
-      "src/renderer/src/components/editor/position-stable-node-view-update.test.ts": 39,
-      "src/renderer/src/components/editor/raw-markdown-comment-scan.test.ts": 205,
-      "src/renderer/src/components/editor/raw-markdown-html.blank-run.test.ts": 295,
-      "src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts": 2133,
-      "src/renderer/src/components/editor/rich-markdown-auto-focus.test.ts": 487,
-      "src/renderer/src/components/editor/rich-markdown-code-block-languages.test.ts": 93,
-      "src/renderer/src/components/editor/rich-markdown-commands.test.ts": 1912,
-      "src/renderer/src/components/editor/rich-markdown-context-command-routing.test.ts": 2197,
-      "src/renderer/src/components/editor/rich-markdown-cut.test.ts": 827,
-      "src/renderer/src/components/editor/rich-markdown-details-keyboard.test.ts": 1421,
+      "src/renderer/src/components/editor/markdown-internal-links.test.ts": 54,
+      "src/renderer/src/components/editor/markdown-preview-annotation-shortcut.test.ts": 458,
+      "src/renderer/src/components/editor/markdown-preview-controls.test.ts": 45,
+      "src/renderer/src/components/editor/markdown-preview-links.test.ts": 74,
+      "src/renderer/src/components/editor/markdown-preview-local-images.test.ts": 458,
+      "src/renderer/src/components/editor/markdown-preview-search-crash.test.tsx": 408,
+      "src/renderer/src/components/editor/markdown-preview-search.test.ts": 87,
+      "src/renderer/src/components/editor/markdown-preview-url-transform.test.ts": 151,
+      "src/renderer/src/components/editor/markdown-reference-link-normalization.test.ts": 64,
+      "src/renderer/src/components/editor/markdown-render-mode.test.ts": 53,
+      "src/renderer/src/components/editor/markdown-rich-comment-scan.test.ts": 191,
+      "src/renderer/src/components/editor/markdown-rich-line-scan.test.ts": 1513,
+      "src/renderer/src/components/editor/markdown-rich-mode-eligibility-cache.test.ts": 1351,
+      "src/renderer/src/components/editor/markdown-rich-mode.test.ts": 2072,
+      "src/renderer/src/components/editor/markdown-rich-size-limit.test.ts": 117,
+      "src/renderer/src/components/editor/markdown-round-trip.test.ts": 2234,
+      "src/renderer/src/components/editor/markdown-scanner-boundaries.test.ts": 121,
+      "src/renderer/src/components/editor/markdown-table-of-contents.test.ts": 275,
+      "src/renderer/src/components/editor/markdown-toc-collapse-state.test.ts": 56,
+      "src/renderer/src/components/editor/markdown-toc-visibility-gate.test.ts": 229,
+      "src/renderer/src/components/editor/markdown-tokenizer-start.test.ts": 80,
+      "src/renderer/src/components/editor/mermaid-config.test.ts": 27,
+      "src/renderer/src/components/editor/monaco-auto-height.test.ts": 97,
+      "src/renderer/src/components/editor/monaco-codebase-search.test.ts": 71,
+      "src/renderer/src/components/editor/monaco-conflict-decorations.test.ts": 83,
+      "src/renderer/src/components/editor/monaco-content-sync.test.ts": 53,
+      "src/renderer/src/components/editor/monaco-content-sync.undo-history.test.ts": 1055,
+      "src/renderer/src/components/editor/monaco-context-menu-paste.test.ts": 547,
+      "src/renderer/src/components/editor/monaco-cursor-line-lifetime.test.ts": 552,
+      "src/renderer/src/components/editor/monaco-find-options.test.ts": 36,
+      "src/renderer/src/components/editor/monaco-find-widget.test.ts": 492,
+      "src/renderer/src/components/editor/monaco-large-text-paste.test.ts": 282,
+      "src/renderer/src/components/editor/monaco-markdown-doc-link-decorations.offset-scan.test.ts": 169,
+      "src/renderer/src/components/editor/monaco-markdown-doc-link-decorations.test.ts": 74,
+      "src/renderer/src/components/editor/monaco-markdown-selection-annotation.test.ts": 41,
+      "src/renderer/src/components/editor/monaco-programmatic-sync.test.ts": 35,
+      "src/renderer/src/components/editor/monaco-reveal-range.test.ts": 53,
+      "src/renderer/src/components/editor/monaco-view-state-persistence.test.ts": 31,
+      "src/renderer/src/components/editor/pdf-js-document-options.test.ts": 34,
+      "src/renderer/src/components/editor/pdf-scale-preference-storage.test.ts": 42,
+      "src/renderer/src/components/editor/pdf-scale-preference.test.ts": 67,
+      "src/renderer/src/components/editor/pdf-view-position.test.ts": 51,
+      "src/renderer/src/components/editor/pending-editor-focus-request.test.ts": 23,
+      "src/renderer/src/components/editor/position-stable-node-view-update.test.ts": 49,
+      "src/renderer/src/components/editor/raw-markdown-comment-scan.test.ts": 88,
+      "src/renderer/src/components/editor/raw-markdown-html.blank-run.test.ts": 302,
+      "src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts": 2399,
+      "src/renderer/src/components/editor/rich-markdown-auto-focus.test.ts": 425,
+      "src/renderer/src/components/editor/rich-markdown-block-source-work.test.ts": 2647,
+      "src/renderer/src/components/editor/rich-markdown-code-block-languages.test.ts": 135,
+      "src/renderer/src/components/editor/rich-markdown-commands.test.ts": 1938,
+      "src/renderer/src/components/editor/rich-markdown-context-command-routing.test.ts": 2415,
+      "src/renderer/src/components/editor/rich-markdown-cut.test.ts": 794,
+      "src/renderer/src/components/editor/rich-markdown-details-case.test.ts": 1964,
+      "src/renderer/src/components/editor/rich-markdown-details-keyboard.test.ts": 2040,
       "src/renderer/src/components/editor/rich-markdown-doc-link.test.ts": 40,
-      "src/renderer/src/components/editor/rich-markdown-editor-click-routing.test.ts": 141,
-      "src/renderer/src/components/editor/rich-markdown-editor-config.test.ts": 1741,
-      "src/renderer/src/components/editor/rich-markdown-empty-paragraph-delete.test.ts": 244,
-      "src/renderer/src/components/editor/rich-markdown-extension.test.ts": 212,
-      "src/renderer/src/components/editor/rich-markdown-html-superscript-link.test.ts": 2898,
-      "src/renderer/src/components/editor/rich-markdown-image-insert-code-block.test.ts": 1428,
-      "src/renderer/src/components/editor/rich-markdown-image-insert.test.ts": 1144,
-      "src/renderer/src/components/editor/rich-markdown-inline-image-paragraph.test.ts": 1832,
-      "src/renderer/src/components/editor/rich-markdown-inline-source-tokenization.test.ts": 2494,
-      "src/renderer/src/components/editor/rich-markdown-key-handler.test.ts": 2053,
-      "src/renderer/src/components/editor/rich-markdown-large-text-paste.test.ts": 485,
-      "src/renderer/src/components/editor/rich-markdown-link-clipboard.test.ts": 503,
-      "src/renderer/src/components/editor/rich-markdown-link-shortcut.test.ts": 2428,
-      "src/renderer/src/components/editor/rich-markdown-list-continuation.test.ts": 197,
-      "src/renderer/src/components/editor/rich-markdown-list-tokenizers.test.ts": 135,
-      "src/renderer/src/components/editor/rich-markdown-literal-serialization.test.ts": 217,
-      "src/renderer/src/components/editor/rich-markdown-local-image.test.ts": 2190,
-      "src/renderer/src/components/editor/rich-markdown-lowlight-cache.test.ts": 295,
-      "src/renderer/src/components/editor/rich-markdown-lowlight.test.ts": 3498,
-      "src/renderer/src/components/editor/rich-markdown-normalize.test.ts": 176,
-      "src/renderer/src/components/editor/rich-markdown-paragraph.test.ts": 77,
-      "src/renderer/src/components/editor/rich-markdown-paste-handler.test.ts": 60,
-      "src/renderer/src/components/editor/rich-markdown-paste-image.test.ts": 398,
-      "src/renderer/src/components/editor/rich-markdown-range-bounds.test.ts": 124,
-      "src/renderer/src/components/editor/rich-markdown-review-annotations.test.ts": 91,
-      "src/renderer/src/components/editor/rich-markdown-review-note-layout.test.ts": 59,
-      "src/renderer/src/components/editor/rich-markdown-review-rail-benchmark.test.ts": 1684,
-      "src/renderer/src/components/editor/rich-markdown-review-rail-blocks.test.ts": 2667,
-      "src/renderer/src/components/editor/rich-markdown-review-text-ranges.test.ts": 94,
-      "src/renderer/src/components/editor/rich-markdown-search-matches-cache.test.ts": 123,
-      "src/renderer/src/components/editor/rich-markdown-search.test.ts": 118,
-      "src/renderer/src/components/editor/rich-markdown-serialization-commit.test.ts": 1566,
-      "src/renderer/src/components/editor/rich-markdown-slash-command-filter.test.ts": 43,
-      "src/renderer/src/components/editor/rich-markdown-source-reconcile.test.ts": 2512,
-      "src/renderer/src/components/editor/rich-markdown-tab-key-handler.test.ts": 2093,
-      "src/renderer/src/components/editor/rich-markdown-table-actions.test.ts": 2940,
-      "src/renderer/src/components/editor/rich-markdown-table-control-layout.test.ts": 39,
-      "src/renderer/src/components/editor/rich-markdown-table-keyboard.test.ts": 2027,
-      "src/renderer/src/components/editor/rich-markdown-terminal-path-paste.test.ts": 461,
-      "src/renderer/src/components/editor/rich-markdown-toc-heading-target.test.ts": 456,
-      "src/renderer/src/components/editor/selection-copy.test.ts": 45,
-      "src/renderer/src/components/editor/setup-contextual-copy.test.ts": 111,
-      "src/renderer/src/components/editor/untitled-file-rename-path.test.ts": 26,
-      "src/renderer/src/components/editor/use-monaco-editor-decorations.doc-link-refresh.test.tsx": 588,
-      "src/renderer/src/components/editor/use-rich-markdown-table-context-menu.test.tsx": 2477,
-      "src/renderer/src/components/editor/use-rich-markdown-table-control-target.test.tsx": 2298,
-      "src/renderer/src/components/editor/useDiffViewerLargeDiffLifecycle.test.tsx": 570,
-      "src/renderer/src/components/editor/useEditorCmdSaveRequest.test.tsx": 696,
-      "src/renderer/src/components/editor/useEditorPanelContentState.test.tsx": 3015,
-      "src/renderer/src/components/editor/useEditorPanelExternalContentEvents.test.tsx": 757,
-      "src/renderer/src/components/editor/useEditorPanelFileLoadRetry.test.tsx": 528,
-      "src/renderer/src/components/editor/useEditorPanelHostUnresolvedContentState.test.tsx": 822,
-      "src/renderer/src/components/editor/useEditorPanelRemoteSiblingContentState.test.tsx": 418,
-      "src/renderer/src/components/editor/useEditorPanelVisibilityContentState.test.tsx": 976,
-      "src/renderer/src/components/editor/useIpynbCellExecution.test.tsx": 599,
-      "src/renderer/src/components/editor/useIpynbDocumentEditing.test.tsx": 565,
-      "src/renderer/src/components/editor/useLinkBubble.test.tsx": 852,
-      "src/renderer/src/components/editor/useLocalImageSrc.test.ts": 653,
-      "src/renderer/src/components/editor/useLocalLogTail.test.tsx": 843,
-      "src/renderer/src/components/editor/useMarkdownDocuments.navigation.test.ts": 694,
-      "src/renderer/src/components/editor/useMarkdownDocuments.test.ts": 1241,
-      "src/renderer/src/components/editor/useRichMarkdownEditorInstance.integration.test.tsx": 799,
-      "src/renderer/src/components/editor/useRichMarkdownEditorInstance.test.tsx": 573,
-      "src/renderer/src/components/editor/useRichMarkdownPendingFocus.test.ts": 506,
-      "src/renderer/src/components/editor/useRichMarkdownProgrammaticSync.test.ts": 2445,
-      "src/renderer/src/components/editor/useRichMarkdownReviewController.open-guard.test.ts": 726,
-      "src/renderer/src/components/editor/useRichMarkdownSearch.reuse.test.tsx": 676,
-      "src/renderer/src/components/editor/useRichMarkdownSearch.test.tsx": 2103,
-      "src/renderer/src/components/emulator-pane/MobileEmulatorTabIntroCallout.test.tsx": 973,
-      "src/renderer/src/components/emulator-pane/emulator-device-frame-layout.test.ts": 46,
-      "src/renderer/src/components/emulator-pane/emulator-device-frame-visibility.test.tsx": 617,
-      "src/renderer/src/components/emulator-pane/emulator-device-frame.input.test.tsx": 974,
-      "src/renderer/src/components/emulator-pane/emulator-device-state.test.ts": 47,
-      "src/renderer/src/components/emulator-pane/emulator-keyboard-paste.test.ts": 402,
-      "src/renderer/src/components/emulator-pane/emulator-screen-gesture.test.ts": 62,
-      "src/renderer/src/components/emulator-pane/emulator-screen-stream-content.test.tsx": 729,
-      "src/renderer/src/components/emulator-pane/mobile-emulator-agent-setup-cli-state.test.ts": 73,
-      "src/renderer/src/components/emulator-pane/mobile-emulator-agent-setup-visibility.test.ts": 44,
-      "src/renderer/src/components/emulator-pane/mobile-emulator-hidden-toast.test.tsx": 547,
-      "src/renderer/src/components/emulator-pane/mobile-emulator-tab-intro-visibility.test.ts": 50,
-      "src/renderer/src/components/emulator-pane/use-emulator-pane-session.test.tsx": 1691,
-      "src/renderer/src/components/emulator-pane/use-mobile-emulator-tab-intro-actions.test.tsx": 2074,
-      "src/renderer/src/components/error-boundaries/RecoverableRenderErrorBoundary.lazy-chunk.test.tsx": 941,
-      "src/renderer/src/components/error-boundaries/RecoverableRenderErrorBoundary.never-landed-reload.test.tsx": 917,
-      "src/renderer/src/components/error-boundaries/react-185-bystander-attribution.test.tsx": 978,
-      "src/renderer/src/components/feature-interaction-writer-boundaries.test.ts": 94,
-      "src/renderer/src/components/feature-tips/CliSkillSetupTerminal.test.tsx": 2243,
-      "src/renderer/src/components/feature-tips/CmdJPaletteFeatureTipVisual.test.tsx": 799,
-      "src/renderer/src/components/feature-tips/CmdJPaletteTipDialog.test.tsx": 334,
-      "src/renderer/src/components/feature-tips/SessionSearchTipDialog.test.tsx": 622,
-      "src/renderer/src/components/feature-tips/VoiceDictationFeatureTipVisual.test.tsx": 572,
-      "src/renderer/src/components/feature-tips/VoiceDictationTipDialog.test.tsx": 509,
-      "src/renderer/src/components/feature-tips/feature-tip-cli-install-action.test.ts": 38,
-      "src/renderer/src/components/feature-tips/feature-tip-modal-state.test.ts": 193,
-      "src/renderer/src/components/feature-tips/feature-tip-startup-gate.test.ts": 187,
-      "src/renderer/src/components/feature-tips/feature-tip-telemetry.test.ts": 49,
-      "src/renderer/src/components/feature-tips/use-session-search-tip-setup.test.tsx": 621,
-      "src/renderer/src/components/feature-wall/AgentCapabilitiesSetupAction.test.ts": 1618,
-      "src/renderer/src/components/feature-wall/ConnectIntegrationsList.test.tsx": 880,
-      "src/renderer/src/components/feature-wall/FeatureWallSetupWorkflowActions.test.tsx": 2008,
-      "src/renderer/src/components/feature-wall/FullDiskAccessSetupPrompt.test.ts": 901,
-      "src/renderer/src/components/feature-wall/KeepAwakeCard.test.tsx": 784,
-      "src/renderer/src/components/feature-wall/agents-orchestration/UsageAccountsCard.test.tsx": 1060,
-      "src/renderer/src/components/feature-wall/browser-animated-visual-sequence.test.ts": 56,
-      "src/renderer/src/components/feature-wall/feature-wall-animation-visibility.test.tsx": 808,
+      "src/renderer/src/components/editor/rich-markdown-document-fidelity.test.ts": 2200,
+      "src/renderer/src/components/editor/rich-markdown-editor-click-routing.test.ts": 145,
+      "src/renderer/src/components/editor/rich-markdown-editor-config.test.ts": 1687,
+      "src/renderer/src/components/editor/rich-markdown-empty-paragraph-delete.test.ts": 277,
+      "src/renderer/src/components/editor/rich-markdown-escape-fidelity.test.ts": 2267,
+      "src/renderer/src/components/editor/rich-markdown-extension.test.ts": 278,
+      "src/renderer/src/components/editor/rich-markdown-html-superscript-link.test.ts": 2950,
+      "src/renderer/src/components/editor/rich-markdown-image-insert-code-block.test.ts": 1229,
+      "src/renderer/src/components/editor/rich-markdown-image-insert.test.ts": 1296,
+      "src/renderer/src/components/editor/rich-markdown-inline-image-paragraph.test.ts": 1666,
+      "src/renderer/src/components/editor/rich-markdown-inline-source-tokenization.test.ts": 1619,
+      "src/renderer/src/components/editor/rich-markdown-key-handler.test.ts": 2540,
+      "src/renderer/src/components/editor/rich-markdown-large-text-paste.test.ts": 435,
+      "src/renderer/src/components/editor/rich-markdown-link-clipboard.test.ts": 346,
+      "src/renderer/src/components/editor/rich-markdown-link-shortcut.test.ts": 2061,
+      "src/renderer/src/components/editor/rich-markdown-list-continuation.test.ts": 337,
+      "src/renderer/src/components/editor/rich-markdown-list-tokenizers.test.ts": 94,
+      "src/renderer/src/components/editor/rich-markdown-literal-serialization.test.ts": 189,
+      "src/renderer/src/components/editor/rich-markdown-local-image.test.ts": 1442,
+      "src/renderer/src/components/editor/rich-markdown-lowlight-cache.test.ts": 173,
+      "src/renderer/src/components/editor/rich-markdown-lowlight.test.ts": 3282,
+      "src/renderer/src/components/editor/rich-markdown-normalize.test.ts": 217,
+      "src/renderer/src/components/editor/rich-markdown-paragraph.test.ts": 72,
+      "src/renderer/src/components/editor/rich-markdown-paste-handler.test.ts": 71,
+      "src/renderer/src/components/editor/rich-markdown-paste-image.test.ts": 290,
+      "src/renderer/src/components/editor/rich-markdown-range-bounds.test.ts": 77,
+      "src/renderer/src/components/editor/rich-markdown-review-annotations.test.ts": 62,
+      "src/renderer/src/components/editor/rich-markdown-review-note-layout.test.ts": 69,
+      "src/renderer/src/components/editor/rich-markdown-review-rail-benchmark.test.ts": 1569,
+      "src/renderer/src/components/editor/rich-markdown-review-rail-blocks.test.ts": 2656,
+      "src/renderer/src/components/editor/rich-markdown-review-text-ranges.test.ts": 70,
+      "src/renderer/src/components/editor/rich-markdown-save-benchmark.test.ts": 1966,
+      "src/renderer/src/components/editor/rich-markdown-search-matches-cache.test.ts": 98,
+      "src/renderer/src/components/editor/rich-markdown-search.test.ts": 84,
+      "src/renderer/src/components/editor/rich-markdown-serialization-commit.test.ts": 1584,
+      "src/renderer/src/components/editor/rich-markdown-slash-command-filter.test.ts": 59,
+      "src/renderer/src/components/editor/rich-markdown-source-reconcile.test.ts": 2386,
+      "src/renderer/src/components/editor/rich-markdown-tab-key-handler.test.ts": 2323,
+      "src/renderer/src/components/editor/rich-markdown-table-actions.test.ts": 2946,
+      "src/renderer/src/components/editor/rich-markdown-table-control-layout.test.ts": 54,
+      "src/renderer/src/components/editor/rich-markdown-table-keyboard.test.ts": 2006,
+      "src/renderer/src/components/editor/rich-markdown-table.test.ts": 108,
+      "src/renderer/src/components/editor/rich-markdown-terminal-path-paste.test.ts": 333,
+      "src/renderer/src/components/editor/rich-markdown-toc-heading-target.test.ts": 261,
+      "src/renderer/src/components/editor/rich-markdown-trailing-paragraph.test.ts": 1766,
+      "src/renderer/src/components/editor/selection-copy.test.ts": 56,
+      "src/renderer/src/components/editor/setup-contextual-copy.test.ts": 93,
+      "src/renderer/src/components/editor/untitled-file-rename-path.test.ts": 49,
+      "src/renderer/src/components/editor/use-monaco-editor-decorations.doc-link-refresh.test.tsx": 398,
+      "src/renderer/src/components/editor/use-monaco-editor-mount.cursor-owner.test.tsx": 1210,
+      "src/renderer/src/components/editor/use-rich-markdown-table-context-menu.test.tsx": 1455,
+      "src/renderer/src/components/editor/use-rich-markdown-table-control-target.test.tsx": 2651,
+      "src/renderer/src/components/editor/useDiffViewerLargeDiffLifecycle.test.tsx": 628,
+      "src/renderer/src/components/editor/useEditorCmdSaveRequest.test.tsx": 494,
+      "src/renderer/src/components/editor/useEditorPanelContentState.test.tsx": 2597,
+      "src/renderer/src/components/editor/useEditorPanelExternalContentEvents.test.tsx": 567,
+      "src/renderer/src/components/editor/useEditorPanelFileLoadRetry.test.tsx": 600,
+      "src/renderer/src/components/editor/useEditorPanelHostUnresolvedContentState.test.tsx": 550,
+      "src/renderer/src/components/editor/useEditorPanelRemoteSiblingContentState.test.tsx": 556,
+      "src/renderer/src/components/editor/useEditorPanelVisibilityContentState.test.tsx": 791,
+      "src/renderer/src/components/editor/useIpynbCellExecution.test.tsx": 768,
+      "src/renderer/src/components/editor/useIpynbDocumentEditing.test.tsx": 359,
+      "src/renderer/src/components/editor/useLinkBubble.test.tsx": 638,
+      "src/renderer/src/components/editor/useLocalImageSrc.test.ts": 819,
+      "src/renderer/src/components/editor/useLocalLogTail.test.tsx": 506,
+      "src/renderer/src/components/editor/useMarkdownDocuments.navigation.test.ts": 674,
+      "src/renderer/src/components/editor/useMarkdownDocuments.test.ts": 964,
+      "src/renderer/src/components/editor/useRichMarkdownEditorInstance.integration.test.tsx": 384,
+      "src/renderer/src/components/editor/useRichMarkdownEditorInstance.test.tsx": 589,
+      "src/renderer/src/components/editor/useRichMarkdownPendingFocus.test.ts": 532,
+      "src/renderer/src/components/editor/useRichMarkdownProgrammaticSync.test.ts": 2348,
+      "src/renderer/src/components/editor/useRichMarkdownReviewController.open-guard.test.ts": 673,
+      "src/renderer/src/components/editor/useRichMarkdownSearch.reuse.test.tsx": 500,
+      "src/renderer/src/components/editor/useRichMarkdownSearch.test.tsx": 1658,
+      "src/renderer/src/components/emulator-pane/MobileEmulatorTabIntroCallout.test.tsx": 939,
+      "src/renderer/src/components/emulator-pane/emulator-device-frame-layout.test.ts": 32,
+      "src/renderer/src/components/emulator-pane/emulator-device-frame-visibility.test.tsx": 951,
+      "src/renderer/src/components/emulator-pane/emulator-device-frame.input.test.tsx": 761,
+      "src/renderer/src/components/emulator-pane/emulator-device-state.test.ts": 29,
+      "src/renderer/src/components/emulator-pane/emulator-keyboard-paste.test.ts": 325,
+      "src/renderer/src/components/emulator-pane/emulator-screen-gesture.test.ts": 66,
+      "src/renderer/src/components/emulator-pane/emulator-screen-stream-content.test.tsx": 754,
+      "src/renderer/src/components/emulator-pane/mobile-emulator-agent-setup-cli-state.test.ts": 60,
+      "src/renderer/src/components/emulator-pane/mobile-emulator-agent-setup-visibility.test.ts": 37,
+      "src/renderer/src/components/emulator-pane/mobile-emulator-hidden-toast.test.tsx": 525,
+      "src/renderer/src/components/emulator-pane/mobile-emulator-tab-intro-visibility.test.ts": 37,
+      "src/renderer/src/components/emulator-pane/use-emulator-pane-session.test.tsx": 2088,
+      "src/renderer/src/components/emulator-pane/use-mobile-emulator-tab-intro-actions.test.tsx": 1609,
+      "src/renderer/src/components/error-boundaries/RecoverableRenderErrorBoundary.lazy-chunk.test.tsx": 1006,
+      "src/renderer/src/components/error-boundaries/RecoverableRenderErrorBoundary.never-landed-reload.test.tsx": 524,
+      "src/renderer/src/components/error-boundaries/react-185-bystander-attribution.test.tsx": 542,
+      "src/renderer/src/components/feature-interaction-writer-boundaries.test.ts": 51,
+      "src/renderer/src/components/feature-tips/CliSkillSetupTerminal.test.tsx": 1232,
+      "src/renderer/src/components/feature-tips/CmdJPaletteFeatureTipVisual.test.tsx": 812,
+      "src/renderer/src/components/feature-tips/CmdJPaletteTipDialog.test.tsx": 264,
+      "src/renderer/src/components/feature-tips/SessionSearchTipDialog.test.tsx": 601,
+      "src/renderer/src/components/feature-tips/VoiceDictationFeatureTipVisual.test.tsx": 557,
+      "src/renderer/src/components/feature-tips/VoiceDictationTipDialog.test.tsx": 875,
+      "src/renderer/src/components/feature-tips/feature-tip-cli-install-action.test.ts": 52,
+      "src/renderer/src/components/feature-tips/feature-tip-modal-state.test.ts": 179,
+      "src/renderer/src/components/feature-tips/feature-tip-startup-gate.test.ts": 218,
+      "src/renderer/src/components/feature-tips/feature-tip-telemetry.test.ts": 57,
+      "src/renderer/src/components/feature-tips/use-session-search-tip-setup.test.tsx": 702,
+      "src/renderer/src/components/feature-wall/AgentCapabilitiesSetupAction.test.ts": 1578,
+      "src/renderer/src/components/feature-wall/ConnectIntegrationsList.test.tsx": 658,
+      "src/renderer/src/components/feature-wall/FeatureWallSetupWorkflowActions.test.tsx": 1337,
+      "src/renderer/src/components/feature-wall/FullDiskAccessSetupPrompt.test.ts": 881,
+      "src/renderer/src/components/feature-wall/KeepAwakeCard.test.tsx": 1030,
+      "src/renderer/src/components/feature-wall/agents-orchestration/UsageAccountsCard.test.tsx": 711,
+      "src/renderer/src/components/feature-wall/browser-animated-visual-sequence.test.ts": 62,
+      "src/renderer/src/components/feature-wall/feature-wall-animation-visibility.test.tsx": 729,
       "src/renderer/src/components/feature-wall/feature-wall-rail-navigation.test.ts": 62,
       "src/renderer/src/components/feature-wall/feature-wall-setup-checklist-localized-copy.test.ts": 233,
-      "src/renderer/src/components/feature-wall/feature-wall-setup-progress.test.ts": 54,
-      "src/renderer/src/components/feature-wall/feature-wall-shortcut-labels.test.tsx": 1856,
+      "src/renderer/src/components/feature-wall/feature-wall-setup-progress.test.ts": 69,
+      "src/renderer/src/components/feature-wall/feature-wall-shortcut-labels.test.tsx": 2097,
       "src/renderer/src/components/feature-wall/feature-wall-usage-tracking.test.ts": 104,
-      "src/renderer/src/components/feature-wall/use-feature-wall-completion.test.ts": 71,
-      "src/renderer/src/components/feature-wall/use-feature-wall-tour-telemetry.test.ts": 63,
-      "src/renderer/src/components/feature-wall/use-integration-connection-status.test.ts": 1694,
-      "src/renderer/src/components/feature-wall/workbench-terminal-storyboard-sequence.test.ts": 49,
-      "src/renderer/src/components/file-path-cursor-tooltip.test.ts": 678,
-      "src/renderer/src/components/floating-terminal/FloatingBrowserSlot.test.tsx": 498,
-      "src/renderer/src/components/floating-terminal/FloatingTerminalOrchestrationDialog.freshness.test.tsx": 1080,
-      "src/renderer/src/components/floating-terminal/FloatingTerminalPanel.bounds.test.tsx": 1204,
-      "src/renderer/src/components/floating-terminal/FloatingTerminalPanel.empty-state.test.tsx": 675,
-      "src/renderer/src/components/floating-terminal/FloatingTerminalPanel.focus.test.tsx": 957,
-      "src/renderer/src/components/floating-terminal/FloatingTerminalPanel.markdown-editor.test.tsx": 449,
-      "src/renderer/src/components/floating-terminal/FloatingTerminalPanel.shortcuts.test.tsx": 834,
-      "src/renderer/src/components/floating-terminal/FloatingTerminalPanel.tab-lifecycle.test.tsx": 834,
-      "src/renderer/src/components/floating-terminal/FloatingTerminalToggleButton.test.tsx": 117,
-      "src/renderer/src/components/floating-terminal/FloatingTerminalWindowControls.test.tsx": 198,
-      "src/renderer/src/components/floating-terminal/floating-terminal-panel-bounds.test.ts": 43,
-      "src/renderer/src/components/floating-terminal/floating-terminal-panel-inputs.test.ts": 187,
-      "src/renderer/src/components/floating-terminal/floating-terminal-panel-view-state.test.ts": 509,
-      "src/renderer/src/components/floating-terminal/floating-terminal-trigger-position.test.ts": 63,
-      "src/renderer/src/components/floating-terminal/floating-workspace-tab-reorder.test.ts": 2288,
-      "src/renderer/src/components/floating-terminal/terminal-pane-handle-registry.test.ts": 53,
-      "src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.test.ts": 1576,
-      "src/renderer/src/components/github-body-draft-state.test.ts": 47,
-      "src/renderer/src/components/github-checks-tab-state.test.ts": 61,
-      "src/renderer/src/components/github-enterprise-slug-routing-boundary.test.ts": 57,
-      "src/renderer/src/components/github-item-dialog-source-boundary.test.ts": 56,
-      "src/renderer/src/components/github-item-dialog/inspect-pull-request/pr-files-combined-diff-section-index.test.tsx": 1025,
+      "src/renderer/src/components/feature-wall/use-feature-wall-completion.test.ts": 44,
+      "src/renderer/src/components/feature-wall/use-feature-wall-tour-telemetry.test.ts": 69,
+      "src/renderer/src/components/feature-wall/use-integration-connection-status.test.ts": 1530,
+      "src/renderer/src/components/feature-wall/workbench-terminal-storyboard-sequence.test.ts": 58,
+      "src/renderer/src/components/file-path-cursor-tooltip.test.ts": 428,
+      "src/renderer/src/components/floating-terminal/FloatingBrowserSlot.test.tsx": 379,
+      "src/renderer/src/components/floating-terminal/FloatingTerminalOrchestrationDialog.freshness.test.tsx": 624,
+      "src/renderer/src/components/floating-terminal/FloatingTerminalPanel.bounds.test.tsx": 740,
+      "src/renderer/src/components/floating-terminal/FloatingTerminalPanel.empty-state.test.tsx": 576,
+      "src/renderer/src/components/floating-terminal/FloatingTerminalPanel.focus.test.tsx": 1034,
+      "src/renderer/src/components/floating-terminal/FloatingTerminalPanel.markdown-editor.test.tsx": 428,
+      "src/renderer/src/components/floating-terminal/FloatingTerminalPanel.shortcuts.test.tsx": 904,
+      "src/renderer/src/components/floating-terminal/FloatingTerminalPanel.tab-lifecycle.test.tsx": 1123,
+      "src/renderer/src/components/floating-terminal/FloatingTerminalToggleButton.test.tsx": 152,
+      "src/renderer/src/components/floating-terminal/FloatingTerminalWindowControls.test.tsx": 238,
+      "src/renderer/src/components/floating-terminal/floating-terminal-panel-bounds.test.ts": 44,
+      "src/renderer/src/components/floating-terminal/floating-terminal-panel-inputs.test.ts": 102,
+      "src/renderer/src/components/floating-terminal/floating-terminal-panel-view-state.test.ts": 242,
+      "src/renderer/src/components/floating-terminal/floating-terminal-trigger-position.test.ts": 69,
+      "src/renderer/src/components/floating-terminal/floating-workspace-tab-reorder.test.ts": 1642,
+      "src/renderer/src/components/floating-terminal/terminal-pane-handle-registry.test.ts": 59,
+      "src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.test.ts": 1592,
+      "src/renderer/src/components/github-body-draft-state.test.ts": 61,
+      "src/renderer/src/components/github-checks-tab-state.test.ts": 51,
+      "src/renderer/src/components/github-enterprise-slug-routing-boundary.test.ts": 50,
+      "src/renderer/src/components/github-item-dialog-source-boundary.test.ts": 47,
+      "src/renderer/src/components/github-item-dialog/inspect-pull-request/pr-files-combined-diff-section-index.test.tsx": 647,
       "src/renderer/src/components/github-link-copy-state.test.ts": 56,
-      "src/renderer/src/components/github-pr-merge-state.test.ts": 134,
-      "src/renderer/src/components/github-pr-reviewer-display.test.ts": 34,
-      "src/renderer/src/components/github-project/GhAuthErrorHelp.test.ts": 474,
-      "src/renderer/src/components/github-project/ProjectRoadmap.test.tsx": 2603,
-      "src/renderer/src/components/github-project/ProjectViewStates.test.tsx": 602,
-      "src/renderer/src/components/github-project/github-project-picker-filter.test.ts": 46,
-      "src/renderer/src/components/github-project/group-sort.test.ts": 103,
-      "src/renderer/src/components/github-project/project-dialog-state.test.ts": 58,
-      "src/renderer/src/components/github-project/project-picker-browse-cache.test.ts": 50,
-      "src/renderer/src/components/github-project/project-picker-input.test.ts": 1441,
-      "src/renderer/src/components/github-project/project-row-filtering.test.ts": 49,
-      "src/renderer/src/components/github-project/project-view-wrapper-source-context-boundary.test.ts": 63,
-      "src/renderer/src/components/github-project/project-visible-table-cache.test.ts": 55,
-      "src/renderer/src/components/github/PRFilterPickers.test.ts": 260,
-      "src/renderer/src/components/github/github-markdown-image-url.test.ts": 63,
-      "src/renderer/src/components/github/github-mention-option-filter.test.ts": 46,
-      "src/renderer/src/components/github/github-pr-reviewer-candidate-filter.test.ts": 58,
-      "src/renderer/src/components/github/github-user-avatar.test.tsx": 450,
-      "src/renderer/src/components/github/github-work-item-assignee-filter.test.ts": 34,
-      "src/renderer/src/components/github/github-work-item-label-filter.test.ts": 48,
-      "src/renderer/src/components/github/pr-comment-code-context.test.ts": 71,
-      "src/renderer/src/components/github/pr-file-content-size.test.ts": 51,
-      "src/renderer/src/components/github/repro-8784-ghe-avatar-fallback.test.ts": 57,
-      "src/renderer/src/components/github/use-image-input.test.ts": 2527,
-      "src/renderer/src/components/hover-reveal-touch-action-visibility.test.ts": 34,
-      "src/renderer/src/components/jira-create-adf.test.ts": 71,
-      "src/renderer/src/components/jira-project-picker-filter.test.ts": 69,
-      "src/renderer/src/components/landing-preflight-dismissal.test.ts": 70,
-      "src/renderer/src/components/landing-preflight-issues.test.ts": 98,
-      "src/renderer/src/components/landing-preflight-runtime-boundary.test.ts": 2213,
-      "src/renderer/src/components/landing-preflight-unverifiable-host.test.tsx": 2193,
+      "src/renderer/src/components/github-pr-merge-state.test.ts": 94,
+      "src/renderer/src/components/github-pr-reviewer-display.test.ts": 57,
+      "src/renderer/src/components/github-project/GhAuthErrorHelp.test.ts": 414,
+      "src/renderer/src/components/github-project/ProjectRoadmap.test.tsx": 2001,
+      "src/renderer/src/components/github-project/ProjectViewStates.test.tsx": 757,
+      "src/renderer/src/components/github-project/github-project-picker-filter.test.ts": 62,
+      "src/renderer/src/components/github-project/group-sort.test.ts": 40,
+      "src/renderer/src/components/github-project/project-dialog-state.test.ts": 55,
+      "src/renderer/src/components/github-project/project-picker-browse-cache.test.ts": 51,
+      "src/renderer/src/components/github-project/project-picker-input.test.ts": 918,
+      "src/renderer/src/components/github-project/project-row-filtering.test.ts": 51,
+      "src/renderer/src/components/github-project/project-view-wrapper-source-context-boundary.test.ts": 44,
+      "src/renderer/src/components/github-project/project-visible-table-cache.test.ts": 49,
+      "src/renderer/src/components/github/PRFilterPickers.test.ts": 310,
+      "src/renderer/src/components/github/github-markdown-image-url.test.ts": 33,
+      "src/renderer/src/components/github/github-mention-option-filter.test.ts": 34,
+      "src/renderer/src/components/github/github-pr-reviewer-candidate-filter.test.ts": 74,
+      "src/renderer/src/components/github/github-user-avatar.test.tsx": 560,
+      "src/renderer/src/components/github/github-work-item-assignee-filter.test.ts": 61,
+      "src/renderer/src/components/github/github-work-item-label-filter.test.ts": 42,
+      "src/renderer/src/components/github/pr-comment-code-context.test.ts": 73,
+      "src/renderer/src/components/github/pr-file-content-size.test.ts": 36,
+      "src/renderer/src/components/github/repro-8784-ghe-avatar-fallback.test.ts": 63,
+      "src/renderer/src/components/github/use-image-input.test.ts": 2130,
+      "src/renderer/src/components/hover-reveal-touch-action-visibility.test.ts": 40,
+      "src/renderer/src/components/jira-create-adf.test.ts": 61,
+      "src/renderer/src/components/jira-project-picker-filter.test.ts": 40,
+      "src/renderer/src/components/landing-preflight-dismissal.test.ts": 67,
+      "src/renderer/src/components/landing-preflight-issues.test.ts": 123,
+      "src/renderer/src/components/landing-preflight-runtime-boundary.test.ts": 1359,
+      "src/renderer/src/components/landing-preflight-unverifiable-host.test.tsx": 2022,
       "src/renderer/src/components/linear-api-key-dialog-state.test.ts": 51,
-      "src/renderer/src/components/linear-issue-attribute-filter-coverage-agreement.test.ts": 722,
-      "src/renderer/src/components/linear-issue-attribute-filter-dropdowns.test.tsx": 2877,
-      "src/renderer/src/components/linear-issue-attribute-filter-primary-team.test.ts": 63,
-      "src/renderer/src/components/linear-issue-attribute-filter-team-ids.test.ts": 60,
-      "src/renderer/src/components/linear-issue-project-selector.test.tsx": 912,
-      "src/renderer/src/components/linear-issue-text-draft-state.test.ts": 43,
-      "src/renderer/src/components/linear-issue-text-save-plan.test.ts": 45,
-      "src/renderer/src/components/linear-issue-view-storage.test.ts": 496,
-      "src/renderer/src/components/linear-issue-workspace-api-parity.test.ts": 44,
-      "src/renderer/src/components/linear-issue-workspace-detail-state.test.tsx": 530,
-      "src/renderer/src/components/linear-issue-workspace-header.test.ts": 46,
-      "src/renderer/src/components/linear-issue-workspace-text.test.ts": 104,
-      "src/renderer/src/components/linear-project-presentation.test.ts": 49,
-      "src/renderer/src/components/linear-project-search-query.test.ts": 40,
-      "src/renderer/src/components/linear-project-view-surfaces.test.tsx": 1027,
-      "src/renderer/src/components/linear-scope-selector.test.ts": 454,
-      "src/renderer/src/components/link-actions/LinkActionPopover.test.tsx": 1090,
-      "src/renderer/src/components/maintenance/update-card/update-card-error-model.test.ts": 130,
-      "src/renderer/src/components/mobile/MobileHero.test.tsx": 2866,
-      "src/renderer/src/components/mobile/MobilePage.test.tsx": 2296,
-      "src/renderer/src/components/mobile/MobilePageToolbar.test.tsx": 736,
-      "src/renderer/src/components/mobile/NetworkInterfacePicker.test.tsx": 732,
-      "src/renderer/src/components/mobile/WindowsFirewallNotice.test.tsx": 888,
-      "src/renderer/src/components/mobile/mobile-page-stage.test.ts": 41,
-      "src/renderer/src/components/mobile/paired-mobile-devices.test.ts": 460,
-      "src/renderer/src/components/mobile/use-mobile-page-paired-devices.test.ts": 446,
-      "src/renderer/src/components/mobile/use-mobile-pairing-address-preference.test.tsx": 385,
-      "src/renderer/src/components/native-chat-restart-action-notifications.test.ts": 105,
-      "src/renderer/src/components/native-chat-resume-activity-label.test.ts": 103,
-      "src/renderer/src/components/native-chat-resume-failed-chat-watch.test.ts": 1839,
-      "src/renderer/src/components/native-chat-resume-failure-guidance.test.ts": 124,
-      "src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts": 76,
-      "src/renderer/src/components/native-chat/NativeChatApprovalCard.test.tsx": 2232,
-      "src/renderer/src/components/native-chat/NativeChatAutocompleteMenus.test.tsx": 518,
-      "src/renderer/src/components/native-chat/NativeChatBackgroundTaskRun.test.tsx": 516,
-      "src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.test.tsx": 827,
-      "src/renderer/src/components/native-chat/NativeChatCodeBlock.test.tsx": 804,
-      "src/renderer/src/components/native-chat/NativeChatComposer.test.tsx": 1617,
-      "src/renderer/src/components/native-chat/NativeChatComposerActions.test.tsx": 966,
-      "src/renderer/src/components/native-chat/NativeChatContextUsageRing.test.tsx": 1144,
-      "src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.test.tsx": 898,
-      "src/renderer/src/components/native-chat/NativeChatInteractiveCard.test.tsx": 1474,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.growth-windowing.test.tsx": 7855,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.message-rail-windowing.test.tsx": 4064,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.older-history.test.tsx": 4805,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.provider-frame.test.tsx": 2269,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.rail-history-jump.test.tsx": 11308,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.stream-render.perf.test.tsx": 3206,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.task-list-frames.test.tsx": 2791,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.test.tsx": 2922,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.tool-stream-cost.test.tsx": 6076,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.turn-fold.test.tsx": 2614,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.turn-history.test.tsx": 2433,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.turn-indicator.test.tsx": 1977,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.turn-timing.test.tsx": 2432,
-      "src/renderer/src/components/native-chat/NativeChatMessageList.windowing.test.tsx": 4682,
-      "src/renderer/src/components/native-chat/NativeChatMessageRail.test.tsx": 1027,
-      "src/renderer/src/components/native-chat/NativeChatMessageRow.test.tsx": 2412,
-      "src/renderer/src/components/native-chat/NativeChatMessageTimestamp.test.tsx": 688,
-      "src/renderer/src/components/native-chat/NativeChatNoticeRow.test.tsx": 2578,
-      "src/renderer/src/components/native-chat/NativeChatPromptEditor.test.tsx": 1204,
-      "src/renderer/src/components/native-chat/NativeChatQuestionCard.test.tsx": 560,
-      "src/renderer/src/components/native-chat/NativeChatResolutionReceipt.test.tsx": 1158,
-      "src/renderer/src/components/native-chat/NativeChatSessionOptionPickers.test.tsx": 784,
-      "src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx": 2096,
-      "src/renderer/src/components/native-chat/NativeChatStructuredSession.launch-lifecycle.test.tsx": 2813,
-      "src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx": 3958,
-      "src/renderer/src/components/native-chat/NativeChatStructuredSession.transport-probe.test.tsx": 18021,
-      "src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx": 20411,
-      "src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.test.tsx": 1071,
-      "src/renderer/src/components/native-chat/NativeChatSubagentRun.test.tsx": 1204,
-      "src/renderer/src/components/native-chat/NativeChatTaskList.test.tsx": 1179,
-      "src/renderer/src/components/native-chat/NativeChatThreadGoalBanner.test.tsx": 1048,
-      "src/renderer/src/components/native-chat/NativeChatToolRun.ask-row.test.tsx": 972,
-      "src/renderer/src/components/native-chat/NativeChatToolRun.identity.test.tsx": 1224,
-      "src/renderer/src/components/native-chat/NativeChatToolRun.test.tsx": 1735,
-      "src/renderer/src/components/native-chat/NativeChatTranscriptChrome.test.tsx": 1017,
-      "src/renderer/src/components/native-chat/NativeChatView.test.tsx": 568,
-      "src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx": 2176,
-      "src/renderer/src/components/native-chat/StructuredAgentSessionPaneOverlayLayer.test.tsx": 646,
-      "src/renderer/src/components/native-chat/StructuredAgentSessionStatusBridge.test.tsx": 2615,
-      "src/renderer/src/components/native-chat/background-task-roster.test.ts": 101,
-      "src/renderer/src/components/native-chat/claude-model-switch-confirmation.test.ts": 1973,
-      "src/renderer/src/components/native-chat/claude-terminal-session-options.test.ts": 119,
-      "src/renderer/src/components/native-chat/native-chat-active-rail-item.test.ts": 47,
-      "src/renderer/src/components/native-chat/native-chat-assembler-merge-parity.test.ts": 52,
-      "src/renderer/src/components/native-chat/native-chat-attachment-upload.test.ts": 1118,
-      "src/renderer/src/components/native-chat/native-chat-autoscroll.test.ts": 54,
-      "src/renderer/src/components/native-chat/native-chat-availability.test.ts": 63,
-      "src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx": 1528,
-      "src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx": 2524,
-      "src/renderer/src/components/native-chat/native-chat-composer-containment.test.ts": 37,
-      "src/renderer/src/components/native-chat/native-chat-composer-drop-scope.test.tsx": 1604,
-      "src/renderer/src/components/native-chat/native-chat-composer-reveal-focus.test.tsx": 585,
-      "src/renderer/src/components/native-chat/native-chat-composer-scope-cache.test.ts": 24,
-      "src/renderer/src/components/native-chat/native-chat-composer-state.test.ts": 63,
-      "src/renderer/src/components/native-chat/native-chat-composer-workspace-file-drop.test.tsx": 1521,
-      "src/renderer/src/components/native-chat/native-chat-context-usage-summary.test.ts": 43,
-      "src/renderer/src/components/native-chat/native-chat-diff.test.ts": 40,
-      "src/renderer/src/components/native-chat/native-chat-dismiss-key.test.ts": 34,
-      "src/renderer/src/components/native-chat/native-chat-draft-cache.test.ts": 51,
-      "src/renderer/src/components/native-chat/native-chat-file-link.test.ts": 182,
-      "src/renderer/src/components/native-chat/native-chat-font-scale.test.ts": 58,
-      "src/renderer/src/components/native-chat/native-chat-http-link-source-owner.test.ts": 79,
-      "src/renderer/src/components/native-chat/native-chat-image-paste.test.ts": 61,
-      "src/renderer/src/components/native-chat/native-chat-image-runtime-context.test.ts": 1614,
-      "src/renderer/src/components/native-chat/native-chat-incremental-assembler.test.ts": 90,
-      "src/renderer/src/components/native-chat/native-chat-interactive-prompt.test.ts": 108,
-      "src/renderer/src/components/native-chat/native-chat-launch-default-adoption.test.ts": 110,
-      "src/renderer/src/components/native-chat/native-chat-launch-draft-resolution.test.ts": 54,
-      "src/renderer/src/components/native-chat/native-chat-launch-draft-send.test.ts": 113,
-      "src/renderer/src/components/native-chat/native-chat-launch-session-options.test.ts": 77,
-      "src/renderer/src/components/native-chat/native-chat-layout-actions.test.ts": 1613,
-      "src/renderer/src/components/native-chat/native-chat-leaf-routing.test.ts": 58,
-      "src/renderer/src/components/native-chat/native-chat-live-status.test.ts": 52,
-      "src/renderer/src/components/native-chat/native-chat-message-grouping.test.ts": 37,
-      "src/renderer/src/components/native-chat/native-chat-message-list-projection.test.ts": 79,
-      "src/renderer/src/components/native-chat/native-chat-message-rail-items.test.ts": 105,
-      "src/renderer/src/components/native-chat/native-chat-noise.test.ts": 54,
-      "src/renderer/src/components/native-chat/native-chat-pagination.test.ts": 44,
-      "src/renderer/src/components/native-chat/native-chat-pane-file-drop.test.tsx": 577,
-      "src/renderer/src/components/native-chat/native-chat-pane-resolution.test.ts": 49,
-      "src/renderer/src/components/native-chat/native-chat-pending-occurrence.test.ts": 47,
-      "src/renderer/src/components/native-chat/native-chat-pending.test.ts": 113,
-      "src/renderer/src/components/native-chat/native-chat-pinned-rows.test.ts": 55,
-      "src/renderer/src/components/native-chat/native-chat-preassembled-session-parity.test.ts": 431,
-      "src/renderer/src/components/native-chat/native-chat-pty-retired-model.test.ts": 120,
-      "src/renderer/src/components/native-chat/native-chat-pty-session-options.test.ts": 377,
-      "src/renderer/src/components/native-chat/native-chat-rail-outline-parity.test.ts": 91,
-      "src/renderer/src/components/native-chat/native-chat-resolved-path-ownership.test.ts": 64,
-      "src/renderer/src/components/native-chat/native-chat-retire-persisted-model.test.ts": 603,
-      "src/renderer/src/components/native-chat/native-chat-row-height-estimate.test.ts": 44,
-      "src/renderer/src/components/native-chat/native-chat-runtime-owner.test.ts": 198,
-      "src/renderer/src/components/native-chat/native-chat-runtime-send-launch-draft.test.ts": 1285,
-      "src/renderer/src/components/native-chat/native-chat-runtime-send.test.ts": 302,
-      "src/renderer/src/components/native-chat/native-chat-scrape-fallback.test.ts": 104,
-      "src/renderer/src/components/native-chat/native-chat-send-eligibility.test.ts": 52,
-      "src/renderer/src/components/native-chat/native-chat-send.test.ts": 49,
-      "src/renderer/src/components/native-chat/native-chat-session-assembler.test.ts": 90,
-      "src/renderer/src/components/native-chat/native-chat-session-option-enrichment.test.ts": 1532,
-      "src/renderer/src/components/native-chat/native-chat-session-option-labels.test.ts": 54,
-      "src/renderer/src/components/native-chat/native-chat-session-transport.test.ts": 59,
-      "src/renderer/src/components/native-chat/native-chat-shared-copy-matches-catalog.test.ts": 452,
-      "src/renderer/src/components/native-chat/native-chat-shortcut.test.ts": 36,
-      "src/renderer/src/components/native-chat/native-chat-split-shortcut.test.ts": 62,
-      "src/renderer/src/components/native-chat/native-chat-stop-layering.test.ts": 42,
-      "src/renderer/src/components/native-chat/native-chat-structured-send-composition-clear.test.tsx": 1836,
-      "src/renderer/src/components/native-chat/native-chat-tab-agent-entry.test.ts": 48,
-      "src/renderer/src/components/native-chat/native-chat-task-list-history.test.ts": 71,
-      "src/renderer/src/components/native-chat/native-chat-task-list-state.test.ts": 74,
-      "src/renderer/src/components/native-chat/native-chat-thread-goal-rows.test.ts": 54,
-      "src/renderer/src/components/native-chat/native-chat-tool-fold.test.ts": 166,
-      "src/renderer/src/components/native-chat/native-chat-tool-summary.test.ts": 46,
-      "src/renderer/src/components/native-chat/native-chat-transcript-slots.test.ts": 71,
-      "src/renderer/src/components/native-chat/native-chat-turn-diffs.test.ts": 160,
-      "src/renderer/src/components/native-chat/native-chat-typing-indicator.test.ts": 97,
-      "src/renderer/src/components/native-chat/native-chat-typing-redirect.test.ts": 45,
-      "src/renderer/src/components/native-chat/native-chat-view-file-drop.test.tsx": 503,
-      "src/renderer/src/components/native-chat/native-chat-view-state.test.ts": 48,
-      "src/renderer/src/components/native-chat/native-chat-web-link-actions.test.ts": 306,
-      "src/renderer/src/components/native-chat/native-chat-working-status-shared-clock.test.tsx": 641,
-      "src/renderer/src/components/native-chat/native-chat-working-suppression.test.ts": 36,
-      "src/renderer/src/components/native-chat/omp-model-switch-capability.test.ts": 142,
-      "src/renderer/src/components/native-chat/serialized-screen-background-rows.test.ts": 181,
-      "src/renderer/src/components/native-chat/structured-agent-question-projection.test.ts": 83,
-      "src/renderer/src/components/native-chat/structured-agent-session-message-projection.test.ts": 66,
-      "src/renderer/src/components/native-chat/structured-agent-session-outbox-storage.test.ts": 464,
-      "src/renderer/src/components/native-chat/structured-agent-session-rail-outline.test.ts": 37,
-      "src/renderer/src/components/native-chat/structured-agent-session-read-transport.test.ts": 228,
-      "src/renderer/src/components/native-chat/structured-agent-session-status-bridge-clock.test.tsx": 2123,
-      "src/renderer/src/components/native-chat/structured-attention-dispatch.test.ts": 1328,
-      "src/renderer/src/components/native-chat/structured-attention-surface.test.ts": 1256,
-      "src/renderer/src/components/native-chat/structured-session-takeover-report.test.tsx": 676,
-      "src/renderer/src/components/native-chat/use-native-chat-composer-app-menu-selection.test.tsx": 580,
-      "src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx": 612,
-      "src/renderer/src/components/native-chat/use-native-chat-composer-catalog.test.tsx": 524,
-      "src/renderer/src/components/native-chat/use-native-chat-composer-keydown.test.tsx": 635,
-      "src/renderer/src/components/native-chat/use-native-chat-composer-paste.test.tsx": 582,
-      "src/renderer/src/components/native-chat/use-native-chat-composer-submit.test.tsx": 721,
-      "src/renderer/src/components/native-chat/use-native-chat-context-menu.test.tsx": 521,
-      "src/renderer/src/components/native-chat/use-native-chat-external-attachments.test.tsx": 832,
-      "src/renderer/src/components/native-chat/use-native-chat-file-link-click.test.tsx": 1529,
-      "src/renderer/src/components/native-chat/use-native-chat-hook-status.test.ts": 1180,
-      "src/renderer/src/components/native-chat/use-native-chat-interactive-send.test.tsx": 768,
-      "src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.test.tsx": 649,
-      "src/renderer/src/components/native-chat/use-native-chat-link-actions.test.tsx": 1460,
-      "src/renderer/src/components/native-chat/use-native-chat-live-session-pending.test.ts": 1922,
-      "src/renderer/src/components/native-chat/use-native-chat-live-session-visibility.test.ts": 2143,
-      "src/renderer/src/components/native-chat/use-native-chat-live-session.test.ts": 7519,
-      "src/renderer/src/components/native-chat/use-native-chat-message-rail.test.ts": 834,
-      "src/renderer/src/components/native-chat/use-native-chat-picker-command-dispatch.test.tsx": 1901,
-      "src/renderer/src/components/native-chat/use-native-chat-provisional-launch.test.tsx": 2333,
-      "src/renderer/src/components/native-chat/use-native-chat-rail-history-jump.test.ts": 901,
-      "src/renderer/src/components/native-chat/use-native-chat-retained-session.test.ts": 585,
-      "src/renderer/src/components/native-chat/use-native-chat-send-lifecycle.test.tsx": 615,
-      "src/renderer/src/components/native-chat/use-native-chat-session-option-command.test.tsx": 2041,
-      "src/renderer/src/components/native-chat/use-native-chat-session-options.test.ts": 1084,
-      "src/renderer/src/components/native-chat/use-native-chat-skills.react.test.tsx": 1103,
-      "src/renderer/src/components/native-chat/use-native-chat-skills.test.ts": 1529,
-      "src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx": 716,
-      "src/renderer/src/components/native-chat/use-native-chat-toggle-shortcut.test.ts": 1469,
-      "src/renderer/src/components/native-chat/use-native-chat-transcript-scroll.test.tsx": 580,
-      "src/renderer/src/components/native-chat/use-native-chat-transcript-window.options.test.tsx": 689,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.test.tsx": 2697,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-hold.test.tsx": 887,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-messages.test.tsx": 641,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-options.test.tsx": 869,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-outbox-admission.test.tsx": 1450,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-outbox-rejection-cause.test.tsx": 647,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-outbox.test.tsx": 1860,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-prompt-cancel.test.tsx": 2391,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-prompt-state.test.tsx": 2228,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-provisional.test.tsx": 2123,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-question-answers.test.tsx": 2620,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-rail-outline.test.tsx": 855,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-read.test.tsx": 1318,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-thread-goal.test.tsx": 377,
-      "src/renderer/src/components/native-chat/use-structured-agent-session-transport.test.tsx": 858,
-      "src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx": 4367,
-      "src/renderer/src/components/native-chat/use-structured-agent-turn-timing.test.tsx": 717,
-      "src/renderer/src/components/network/CustomAddressDialog.test.tsx": 716,
-      "src/renderer/src/components/new-workspace/ComposerParentWorktreePicker.test.tsx": 1127,
-      "src/renderer/src/components/new-workspace/ProjectCombobox.dialog-handoff.test.tsx": 1324,
-      "src/renderer/src/components/new-workspace/ProjectCombobox.test.tsx": 954,
-      "src/renderer/src/components/new-workspace/ProjectComboboxRow.test.tsx": 734,
-      "src/renderer/src/components/new-workspace/SetProjectLocationDialog.test.tsx": 1308,
-      "src/renderer/src/components/new-workspace/SmartWorkspaceNameField-provider-boundaries.test.ts": 1860,
-      "src/renderer/src/components/new-workspace/SmartWorkspaceNameField-repo-slug-routing.test.ts": 1297,
-      "src/renderer/src/components/new-workspace/SmartWorkspaceNameField-source-boundaries.test.ts": 49,
-      "src/renderer/src/components/new-workspace/SmartWorkspaceNameField.ime-enter.test.tsx": 1308,
-      "src/renderer/src/components/new-workspace/SmartWorkspaceNameField.jira-accessibility.test.tsx": 1811,
-      "src/renderer/src/components/new-workspace/base-ref-picker-visibility.test.ts": 43,
-      "src/renderer/src/components/new-workspace/project-combobox-matching.test.ts": 71,
-      "src/renderer/src/components/new-workspace/smart-workspace-command-value.test.ts": 47,
-      "src/renderer/src/components/new-workspace/smart-workspace-localized-options.test.ts": 329,
-      "src/renderer/src/components/new-workspace/smart-workspace-source-popover-focus.test.ts": 319,
-      "src/renderer/src/components/new-workspace/smart-workspace-source-results.test.ts": 96,
-      "src/renderer/src/components/new-workspace/use-jira-source-connection.test.tsx": 663,
-      "src/renderer/src/components/new-workspace/use-jira-url-source.test.tsx": 686,
-      "src/renderer/src/components/new-workspace/use-recent-project-ids.test.ts": 1680,
-      "src/renderer/src/components/onboarding/AgentStep.test.tsx": 403,
-      "src/renderer/src/components/onboarding/FeatureSetupInlineTerminal.test.tsx": 2166,
-      "src/renderer/src/components/onboarding/NotificationStep.test.tsx": 1597,
-      "src/renderer/src/components/onboarding/OnboardingFlow.test.tsx": 5515,
-      "src/renderer/src/components/onboarding/OnboardingInlineCommandTerminal.command-finished.test.tsx": 730,
-      "src/renderer/src/components/onboarding/OnboardingInlineCommandTerminal.test.ts": 4481,
-      "src/renderer/src/components/onboarding/ThemeStep.test.ts": 195,
-      "src/renderer/src/components/onboarding/WindowsTerminalStep.test.tsx": 614,
-      "src/renderer/src/components/onboarding/agent-picked-payload.test.ts": 46,
-      "src/renderer/src/components/onboarding/onboarding-dismiss-target.test.ts": 40,
-      "src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts": 1605,
-      "src/renderer/src/components/onboarding/onboarding-folder-agent-startup.test.ts": 353,
-      "src/renderer/src/components/onboarding/onboarding-settings-hydration.test.ts": 42,
-      "src/renderer/src/components/onboarding/use-onboarding-flow-persistence.test.ts": 2027,
-      "src/renderer/src/components/onboarding/use-onboarding-flow.test.ts": 213,
-      "src/renderer/src/components/onboarding/windows-terminal-onboarding-telemetry.test.ts": 43,
-      "src/renderer/src/components/orca-profiles/OrcaProfileSignOutConfirmDialog.test.tsx": 681,
-      "src/renderer/src/components/pet/PetOverlay.frame-durations.test.tsx": 446,
-      "src/renderer/src/components/pet/PetOverlay.keyframes.test.tsx": 834,
-      "src/renderer/src/components/pet/PetOverlay.pet-switch.test.tsx": 549,
-      "src/renderer/src/components/pet/PetOverlay.pointer-interaction.test.tsx": 581,
-      "src/renderer/src/components/pet/PetOverlay.test.ts": 1118,
-      "src/renderer/src/components/pet/pet-agent-state.test.ts": 96,
-      "src/renderer/src/components/pet/pet-blob-cache.test.ts": 66,
-      "src/renderer/src/components/pet/pet-overlay-hit-area.test.tsx": 748,
-      "src/renderer/src/components/pet/pet-overlay-position.test.ts": 1328,
-      "src/renderer/src/components/pet/pet-overlay-visibility.test.ts": 41,
-      "src/renderer/src/components/pet/sprite-animation-css.test.ts": 55,
-      "src/renderer/src/components/pet/usePetPointerInteraction.test.ts": 580,
-      "src/renderer/src/components/pet/usePetUrl.test.tsx": 681,
-      "src/renderer/src/components/ports/WorkspacePortScanner.test.tsx": 4356,
-      "src/renderer/src/components/pr-check-counts.test.ts": 94,
-      "src/renderer/src/components/pr-checks-fix-prompt.test.ts": 63,
-      "src/renderer/src/components/pr-comments-resolution-prompt.test.ts": 70,
-      "src/renderer/src/components/provider-check-classification-parity.test.ts": 134,
-      "src/renderer/src/components/pull-request-page-host-boundary.test.ts": 68,
-      "src/renderer/src/components/pull-request-page/cache/file-content.test.ts": 94,
-      "src/renderer/src/components/pull-request-page/files/combined-diff-section-index.test.tsx": 540,
-      "src/renderer/src/components/pull-request-page/mentions/options.test.ts": 54,
-      "src/renderer/src/components/pull-request-page/mentions/query.test.ts": 68,
-      "src/renderer/src/components/pull-request-page/presentation/state-badge.test.ts": 249,
-      "src/renderer/src/components/quick-open-file-list-host-name-filter.react.test.tsx": 2043,
-      "src/renderer/src/components/quick-open-file-list.react.test.tsx": 1720,
-      "src/renderer/src/components/quick-open-file-list.test.ts": 1472,
-      "src/renderer/src/components/quick-open-install-rg-guidance.render.test.tsx": 774,
-      "src/renderer/src/components/quick-open-install-rg-guidance.test.ts": 178,
-      "src/renderer/src/components/quick-open-search.test.ts": 322,
-      "src/renderer/src/components/repo/CreateFromPicker.test.tsx": 1306,
-      "src/renderer/src/components/repo/NestedRepoChecklist.test.tsx": 214,
-      "src/renderer/src/components/repo/NestedRepoScanLimitNotice.test.ts": 399,
-      "src/renderer/src/components/repo/repo-icon.emoji-centering.test.tsx": 781,
-      "src/renderer/src/components/repo/repo-icon.test.tsx": 924,
-      "src/renderer/src/components/right-sidebar/ActionButton.test.tsx": 3739,
-      "src/renderer/src/components/right-sidebar/AiVaultPanel.legacy-filter.test.tsx": 2709,
-      "src/renderer/src/components/right-sidebar/AiVaultPanelHeader.focus.test.tsx": 916,
-      "src/renderer/src/components/right-sidebar/AiVaultPanelSearch.test.tsx": 1048,
-      "src/renderer/src/components/right-sidebar/AiVaultSearchEvidence.test.tsx": 2047,
-      "src/renderer/src/components/right-sidebar/AiVaultSessionListBar.test.tsx": 1219,
-      "src/renderer/src/components/right-sidebar/AiVaultSessionRow.test.tsx": 2861,
-      "src/renderer/src/components/right-sidebar/AiVaultSessionSubagents.test.tsx": 2797,
-      "src/renderer/src/components/right-sidebar/AiVaultShowMoreSessionsRow.test.tsx": 945,
-      "src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx": 2804,
-      "src/renderer/src/components/right-sidebar/ChecksPanel.review-header.test.tsx": 2582,
-      "src/renderer/src/components/right-sidebar/ChecksPanel.updated-at-metadata.test.tsx": 533,
-      "src/renderer/src/components/right-sidebar/CommitArea.chevron-spinner.test.tsx": 3738,
-      "src/renderer/src/components/right-sidebar/CommitArea.generate.test.tsx": 3240,
-      "src/renderer/src/components/right-sidebar/CommitArea.primary-icons.test.tsx": 2127,
-      "src/renderer/src/components/right-sidebar/CommitArea.test.tsx": 7861,
-      "src/renderer/src/components/right-sidebar/FileExplorerNameFilter.test.tsx": 407,
-      "src/renderer/src/components/right-sidebar/FileExplorerRow.actions.test.tsx": 285,
-      "src/renderer/src/components/right-sidebar/FileExplorerToolbar.test.tsx": 1647,
-      "src/renderer/src/components/right-sidebar/FileExplorerViewSwitch.test.tsx": 330,
-      "src/renderer/src/components/right-sidebar/FileExplorerVirtualRows.row-handlers.test.tsx": 1859,
-      "src/renderer/src/components/right-sidebar/FileExplorerVirtualRowsAddProject.test.tsx": 1881,
-      "src/renderer/src/components/right-sidebar/FolderWorkspacePrChecksPanel.test.tsx": 997,
-      "src/renderer/src/components/right-sidebar/FolderWorkspacePrChecksRow.test.tsx": 704,
-      "src/renderer/src/components/right-sidebar/FolderWorkspaceWorktreesPanel.test.tsx": 565,
-      "src/renderer/src/components/right-sidebar/GitHistoryPanel.test.tsx": 1537,
-      "src/renderer/src/components/right-sidebar/GitHubPRStackMap.test.tsx": 807,
-      "src/renderer/src/components/right-sidebar/HostedReviewActions.draft.test.tsx": 1369,
-      "src/renderer/src/components/right-sidebar/PluginPanel.test.tsx": 784,
-      "src/renderer/src/components/right-sidebar/PortsPanel.test.tsx": 2908,
-      "src/renderer/src/components/right-sidebar/PullRequestComposer.generate-tooltip.test.tsx": 1968,
-      "src/renderer/src/components/right-sidebar/SearchResultItems.test.tsx": 444,
-      "src/renderer/src/components/right-sidebar/SessionRowTrailingActions.test.tsx": 404,
-      "src/renderer/src/components/right-sidebar/SourceControl.branch-line-total.test.tsx": 4316,
-      "src/renderer/src/components/right-sidebar/SourceControl.commit-drafts.test.ts": 2162,
-      "src/renderer/src/components/right-sidebar/SourceControl.commit-failure-recovery.test.ts": 59,
-      "src/renderer/src/components/right-sidebar/SourceControl.commit-generation-records.test.ts": 54,
-      "src/renderer/src/components/right-sidebar/SourceControl.compare-summary.test.ts": 3362,
-      "src/renderer/src/components/right-sidebar/SourceControl.host-context-boundary.test.ts": 56,
-      "src/renderer/src/components/right-sidebar/SourceControl.hosted-review-header-link.test.tsx": 203,
-      "src/renderer/src/components/right-sidebar/SourceControl.open-file-highlight.test.tsx": 1876,
-      "src/renderer/src/components/right-sidebar/SourceControl.pr-generation-records.test.ts": 58,
-      "src/renderer/src/components/right-sidebar/SourceControl.preview-open.test.tsx": 2525,
-      "src/renderer/src/components/right-sidebar/SourceControl.push-failure-recovery.test.ts": 50,
-      "src/renderer/src/components/right-sidebar/SourceControl.remote-action-errors.test.ts": 3382,
-      "src/renderer/src/components/right-sidebar/SourceControl.resolve-conflicts-prompt.test.ts": 3537,
-      "src/renderer/src/components/right-sidebar/SourceControl.virtual-file-list.test.tsx": 5561,
-      "src/renderer/src/components/right-sidebar/SourceControlAgentActionDialog.test.tsx": 2882,
-      "src/renderer/src/components/right-sidebar/SourceControlAgentActionDialogForm.test.tsx": 517,
-      "src/renderer/src/components/right-sidebar/SourceControlTextGenerationDialog.test.ts": 644,
-      "src/renderer/src/components/right-sidebar/active-checks-status.test.ts": 1127,
-      "src/renderer/src/components/right-sidebar/activity-bar-buttons.test.tsx": 928,
-      "src/renderer/src/components/right-sidebar/activity-bar-overflow.test.ts": 57,
-      "src/renderer/src/components/right-sidebar/ai-vault-first-prompt-card.test.tsx": 1070,
-      "src/renderer/src/components/right-sidebar/ai-vault-host-scope.test.ts": 628,
-      "src/renderer/src/components/right-sidebar/ai-vault-original-pane-index.test.ts": 64,
-      "src/renderer/src/components/right-sidebar/ai-vault-original-pane.test.ts": 52,
-      "src/renderer/src/components/right-sidebar/ai-vault-scan-issue-state.test.ts": 48,
-      "src/renderer/src/components/right-sidebar/ai-vault-scope-paths.test.ts": 52,
-      "src/renderer/src/components/right-sidebar/ai-vault-scope-state.test.ts": 53,
-      "src/renderer/src/components/right-sidebar/ai-vault-search-scope-identity.test.tsx": 713,
-      "src/renderer/src/components/right-sidebar/ai-vault-search-session.test.ts": 116,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-continuation.test.ts": 55,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-deletability.test.ts": 102,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-display.test.ts": 52,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-filters.test.ts": 144,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-identity.test.ts": 72,
+      "src/renderer/src/components/linear-issue-attribute-filter-coverage-agreement.test.ts": 1177,
+      "src/renderer/src/components/linear-issue-attribute-filter-dropdowns.test.tsx": 1616,
+      "src/renderer/src/components/linear-issue-attribute-filter-primary-team.test.ts": 64,
+      "src/renderer/src/components/linear-issue-attribute-filter-team-ids.test.ts": 86,
+      "src/renderer/src/components/linear-issue-project-selector.test.tsx": 766,
+      "src/renderer/src/components/linear-issue-text-draft-state.test.ts": 54,
+      "src/renderer/src/components/linear-issue-text-save-plan.test.ts": 32,
+      "src/renderer/src/components/linear-issue-view-storage.test.ts": 528,
+      "src/renderer/src/components/linear-issue-workspace-api-parity.test.ts": 27,
+      "src/renderer/src/components/linear-issue-workspace-detail-state.test.tsx": 393,
+      "src/renderer/src/components/linear-issue-workspace-header.test.ts": 50,
+      "src/renderer/src/components/linear-issue-workspace-text.test.ts": 127,
+      "src/renderer/src/components/linear-project-presentation.test.ts": 44,
+      "src/renderer/src/components/linear-project-search-query.test.ts": 50,
+      "src/renderer/src/components/linear-project-view-surfaces.test.tsx": 1038,
+      "src/renderer/src/components/linear-scope-selector.test.ts": 450,
+      "src/renderer/src/components/link-actions/LinkActionPopover.test.tsx": 804,
+      "src/renderer/src/components/maintenance/update-card/update-card-error-model.test.ts": 116,
+      "src/renderer/src/components/mobile/MobileHero.test.tsx": 2957,
+      "src/renderer/src/components/mobile/MobilePage.test.tsx": 1990,
+      "src/renderer/src/components/mobile/MobilePageToolbar.test.tsx": 606,
+      "src/renderer/src/components/mobile/NetworkInterfacePicker.test.tsx": 1041,
+      "src/renderer/src/components/mobile/WindowsFirewallNotice.test.tsx": 827,
+      "src/renderer/src/components/mobile/mobile-page-stage.test.ts": 45,
+      "src/renderer/src/components/mobile/paired-mobile-devices.test.ts": 481,
+      "src/renderer/src/components/mobile/use-mobile-page-paired-devices.test.ts": 361,
+      "src/renderer/src/components/mobile/use-mobile-pairing-address-preference.test.tsx": 623,
+      "src/renderer/src/components/native-chat-restart-action-notifications.test.ts": 113,
+      "src/renderer/src/components/native-chat-resume-activity-label.test.ts": 108,
+      "src/renderer/src/components/native-chat-resume-failed-chat-watch.test.ts": 1229,
+      "src/renderer/src/components/native-chat-resume-failure-guidance.test.ts": 84,
+      "src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts": 56,
+      "src/renderer/src/components/native-chat/NativeChatApprovalCard.test.tsx": 1564,
+      "src/renderer/src/components/native-chat/NativeChatAutocompleteMenus.test.tsx": 872,
+      "src/renderer/src/components/native-chat/NativeChatBackgroundTaskRun.test.tsx": 990,
+      "src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.test.tsx": 1274,
+      "src/renderer/src/components/native-chat/NativeChatCodeBlock.test.tsx": 874,
+      "src/renderer/src/components/native-chat/NativeChatComposer.test.tsx": 1457,
+      "src/renderer/src/components/native-chat/NativeChatComposerActions.test.tsx": 565,
+      "src/renderer/src/components/native-chat/NativeChatContextUsageRing.test.tsx": 750,
+      "src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.test.tsx": 688,
+      "src/renderer/src/components/native-chat/NativeChatInteractiveCard.test.tsx": 986,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.growth-windowing.test.tsx": 3718,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.message-rail-windowing.test.tsx": 4072,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.older-history.test.tsx": 4416,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.provider-frame.test.tsx": 2482,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.rail-history-jump.test.tsx": 11804,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.stream-render.perf.test.tsx": 3611,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.task-list-frames.test.tsx": 3017,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.test.tsx": 3343,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.tool-stream-cost.test.tsx": 4901,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.turn-fold.test.tsx": 2633,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.turn-history.test.tsx": 2349,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.turn-indicator.test.tsx": 3391,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.turn-timing.test.tsx": 1597,
+      "src/renderer/src/components/native-chat/NativeChatMessageList.windowing.test.tsx": 5207,
+      "src/renderer/src/components/native-chat/NativeChatMessageRail.test.tsx": 1294,
+      "src/renderer/src/components/native-chat/NativeChatMessageRow.test.tsx": 2046,
+      "src/renderer/src/components/native-chat/NativeChatMessageTimestamp.test.tsx": 752,
+      "src/renderer/src/components/native-chat/NativeChatNoticeRow.test.tsx": 2656,
+      "src/renderer/src/components/native-chat/NativeChatPromptEditor.test.tsx": 1266,
+      "src/renderer/src/components/native-chat/NativeChatQuestionCard.test.tsx": 947,
+      "src/renderer/src/components/native-chat/NativeChatResolutionReceipt.test.tsx": 1217,
+      "src/renderer/src/components/native-chat/NativeChatSessionOptionPickers.test.tsx": 950,
+      "src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx": 2046,
+      "src/renderer/src/components/native-chat/NativeChatStructuredSession.launch-lifecycle.test.tsx": 2769,
+      "src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx": 1475,
+      "src/renderer/src/components/native-chat/NativeChatStructuredSession.transport-probe.test.tsx": 16705,
+      "src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx": 17563,
+      "src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.test.tsx": 979,
+      "src/renderer/src/components/native-chat/NativeChatSubagentRun.test.tsx": 1078,
+      "src/renderer/src/components/native-chat/NativeChatTaskList.test.tsx": 1027,
+      "src/renderer/src/components/native-chat/NativeChatThreadGoalBanner.test.tsx": 1215,
+      "src/renderer/src/components/native-chat/NativeChatToolRun.ask-row.test.tsx": 868,
+      "src/renderer/src/components/native-chat/NativeChatToolRun.identity.test.tsx": 898,
+      "src/renderer/src/components/native-chat/NativeChatToolRun.test.tsx": 967,
+      "src/renderer/src/components/native-chat/NativeChatTranscriptChrome.test.tsx": 1191,
+      "src/renderer/src/components/native-chat/NativeChatView.test.tsx": 586,
+      "src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx": 1682,
+      "src/renderer/src/components/native-chat/StructuredAgentSessionPaneOverlayLayer.test.tsx": 419,
+      "src/renderer/src/components/native-chat/StructuredAgentSessionStatusBridge.test.tsx": 5346,
+      "src/renderer/src/components/native-chat/background-task-roster.test.ts": 98,
+      "src/renderer/src/components/native-chat/claude-model-switch-confirmation.test.ts": 1924,
+      "src/renderer/src/components/native-chat/claude-terminal-session-options.test.ts": 124,
+      "src/renderer/src/components/native-chat/native-chat-active-rail-item.test.ts": 45,
+      "src/renderer/src/components/native-chat/native-chat-assembler-merge-parity.test.ts": 95,
+      "src/renderer/src/components/native-chat/native-chat-attachment-upload.test.ts": 1516,
+      "src/renderer/src/components/native-chat/native-chat-autoscroll.test.ts": 33,
+      "src/renderer/src/components/native-chat/native-chat-availability.test.ts": 39,
+      "src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx": 2042,
+      "src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx": 2490,
+      "src/renderer/src/components/native-chat/native-chat-composer-containment.test.ts": 38,
+      "src/renderer/src/components/native-chat/native-chat-composer-drop-scope.test.tsx": 1320,
+      "src/renderer/src/components/native-chat/native-chat-composer-reveal-focus.test.tsx": 622,
+      "src/renderer/src/components/native-chat/native-chat-composer-scope-cache.test.ts": 47,
+      "src/renderer/src/components/native-chat/native-chat-composer-state.test.ts": 98,
+      "src/renderer/src/components/native-chat/native-chat-composer-workspace-file-drop.test.tsx": 1742,
+      "src/renderer/src/components/native-chat/native-chat-context-usage-summary.test.ts": 54,
+      "src/renderer/src/components/native-chat/native-chat-diff.test.ts": 53,
+      "src/renderer/src/components/native-chat/native-chat-dismiss-key.test.ts": 56,
+      "src/renderer/src/components/native-chat/native-chat-draft-cache.test.ts": 53,
+      "src/renderer/src/components/native-chat/native-chat-file-link.test.ts": 161,
+      "src/renderer/src/components/native-chat/native-chat-font-scale.test.ts": 60,
+      "src/renderer/src/components/native-chat/native-chat-http-link-source-owner.test.ts": 69,
+      "src/renderer/src/components/native-chat/native-chat-image-paste.test.ts": 40,
+      "src/renderer/src/components/native-chat/native-chat-image-runtime-context.test.ts": 1250,
+      "src/renderer/src/components/native-chat/native-chat-incremental-assembler.test.ts": 96,
+      "src/renderer/src/components/native-chat/native-chat-interactive-prompt.test.ts": 148,
+      "src/renderer/src/components/native-chat/native-chat-launch-default-adoption.test.ts": 117,
+      "src/renderer/src/components/native-chat/native-chat-launch-draft-resolution.test.ts": 52,
+      "src/renderer/src/components/native-chat/native-chat-launch-draft-send.test.ts": 75,
+      "src/renderer/src/components/native-chat/native-chat-launch-session-options.test.ts": 74,
+      "src/renderer/src/components/native-chat/native-chat-layout-actions.test.ts": 1739,
+      "src/renderer/src/components/native-chat/native-chat-leaf-routing.test.ts": 44,
+      "src/renderer/src/components/native-chat/native-chat-live-status.test.ts": 83,
+      "src/renderer/src/components/native-chat/native-chat-message-grouping.test.ts": 73,
+      "src/renderer/src/components/native-chat/native-chat-message-list-projection.test.ts": 83,
+      "src/renderer/src/components/native-chat/native-chat-message-rail-items.test.ts": 102,
+      "src/renderer/src/components/native-chat/native-chat-noise.test.ts": 32,
+      "src/renderer/src/components/native-chat/native-chat-pagination.test.ts": 62,
+      "src/renderer/src/components/native-chat/native-chat-pane-file-drop.test.tsx": 558,
+      "src/renderer/src/components/native-chat/native-chat-pane-resolution.test.ts": 48,
+      "src/renderer/src/components/native-chat/native-chat-pending-occurrence.test.ts": 66,
+      "src/renderer/src/components/native-chat/native-chat-pending.test.ts": 86,
+      "src/renderer/src/components/native-chat/native-chat-pinned-rows.test.ts": 34,
+      "src/renderer/src/components/native-chat/native-chat-preassembled-session-parity.test.ts": 189,
+      "src/renderer/src/components/native-chat/native-chat-pty-retired-model.test.ts": 157,
+      "src/renderer/src/components/native-chat/native-chat-pty-session-options.test.ts": 375,
+      "src/renderer/src/components/native-chat/native-chat-rail-outline-parity.test.ts": 110,
+      "src/renderer/src/components/native-chat/native-chat-resolved-path-ownership.test.ts": 57,
+      "src/renderer/src/components/native-chat/native-chat-retire-persisted-model.test.ts": 455,
+      "src/renderer/src/components/native-chat/native-chat-row-height-estimate.test.ts": 39,
+      "src/renderer/src/components/native-chat/native-chat-runtime-owner.test.ts": 231,
+      "src/renderer/src/components/native-chat/native-chat-runtime-send-launch-draft.test.ts": 1274,
+      "src/renderer/src/components/native-chat/native-chat-runtime-send.test.ts": 306,
+      "src/renderer/src/components/native-chat/native-chat-scrape-fallback.test.ts": 69,
+      "src/renderer/src/components/native-chat/native-chat-send-eligibility.test.ts": 50,
+      "src/renderer/src/components/native-chat/native-chat-send.test.ts": 52,
+      "src/renderer/src/components/native-chat/native-chat-session-assembler.test.ts": 107,
+      "src/renderer/src/components/native-chat/native-chat-session-option-enrichment.test.ts": 1585,
+      "src/renderer/src/components/native-chat/native-chat-session-option-labels.test.ts": 55,
+      "src/renderer/src/components/native-chat/native-chat-session-transport.test.ts": 88,
+      "src/renderer/src/components/native-chat/native-chat-shared-copy-matches-catalog.test.ts": 411,
+      "src/renderer/src/components/native-chat/native-chat-shortcut.test.ts": 44,
+      "src/renderer/src/components/native-chat/native-chat-split-shortcut.test.ts": 68,
+      "src/renderer/src/components/native-chat/native-chat-stop-layering.test.ts": 31,
+      "src/renderer/src/components/native-chat/native-chat-structured-send-composition-clear.test.tsx": 1959,
+      "src/renderer/src/components/native-chat/native-chat-tab-agent-entry.test.ts": 31,
+      "src/renderer/src/components/native-chat/native-chat-task-list-history.test.ts": 57,
+      "src/renderer/src/components/native-chat/native-chat-task-list-state.test.ts": 45,
+      "src/renderer/src/components/native-chat/native-chat-thread-goal-rows.test.ts": 56,
+      "src/renderer/src/components/native-chat/native-chat-tool-fold.test.ts": 69,
+      "src/renderer/src/components/native-chat/native-chat-tool-summary.test.ts": 58,
+      "src/renderer/src/components/native-chat/native-chat-transcript-slots.test.ts": 76,
+      "src/renderer/src/components/native-chat/native-chat-turn-diffs.test.ts": 99,
+      "src/renderer/src/components/native-chat/native-chat-typing-indicator.test.ts": 91,
+      "src/renderer/src/components/native-chat/native-chat-typing-redirect.test.ts": 66,
+      "src/renderer/src/components/native-chat/native-chat-view-file-drop.test.tsx": 806,
+      "src/renderer/src/components/native-chat/native-chat-view-state.test.ts": 57,
+      "src/renderer/src/components/native-chat/native-chat-web-link-actions.test.ts": 135,
+      "src/renderer/src/components/native-chat/native-chat-working-status-shared-clock.test.tsx": 680,
+      "src/renderer/src/components/native-chat/native-chat-working-suppression.test.ts": 53,
+      "src/renderer/src/components/native-chat/omp-model-switch-capability.test.ts": 84,
+      "src/renderer/src/components/native-chat/serialized-screen-background-rows.test.ts": 134,
+      "src/renderer/src/components/native-chat/structured-agent-question-projection.test.ts": 97,
+      "src/renderer/src/components/native-chat/structured-agent-session-message-projection.test.ts": 77,
+      "src/renderer/src/components/native-chat/structured-agent-session-outbox-storage.test.ts": 437,
+      "src/renderer/src/components/native-chat/structured-agent-session-rail-outline.test.ts": 36,
+      "src/renderer/src/components/native-chat/structured-agent-session-read-transport.test.ts": 246,
+      "src/renderer/src/components/native-chat/structured-agent-session-status-bridge-clock.test.tsx": 2216,
+      "src/renderer/src/components/native-chat/structured-attention-dispatch.test.ts": 1416,
+      "src/renderer/src/components/native-chat/structured-attention-surface.test.ts": 994,
+      "src/renderer/src/components/native-chat/structured-session-takeover-report.test.tsx": 697,
+      "src/renderer/src/components/native-chat/use-native-chat-composer-app-menu-selection.test.tsx": 528,
+      "src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx": 718,
+      "src/renderer/src/components/native-chat/use-native-chat-composer-catalog.test.tsx": 631,
+      "src/renderer/src/components/native-chat/use-native-chat-composer-keydown.test.tsx": 580,
+      "src/renderer/src/components/native-chat/use-native-chat-composer-paste.test.tsx": 564,
+      "src/renderer/src/components/native-chat/use-native-chat-composer-submit.test.tsx": 708,
+      "src/renderer/src/components/native-chat/use-native-chat-context-menu.test.tsx": 493,
+      "src/renderer/src/components/native-chat/use-native-chat-external-attachments.test.tsx": 578,
+      "src/renderer/src/components/native-chat/use-native-chat-file-link-click.test.tsx": 1460,
+      "src/renderer/src/components/native-chat/use-native-chat-hook-status.test.ts": 1638,
+      "src/renderer/src/components/native-chat/use-native-chat-interactive-send.test.tsx": 620,
+      "src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.test.tsx": 567,
+      "src/renderer/src/components/native-chat/use-native-chat-link-actions.test.tsx": 1582,
+      "src/renderer/src/components/native-chat/use-native-chat-live-session-pending.test.ts": 1421,
+      "src/renderer/src/components/native-chat/use-native-chat-live-session-visibility.test.ts": 2357,
+      "src/renderer/src/components/native-chat/use-native-chat-live-session.test.ts": 5417,
+      "src/renderer/src/components/native-chat/use-native-chat-message-rail.test.ts": 790,
+      "src/renderer/src/components/native-chat/use-native-chat-picker-command-dispatch.test.tsx": 2127,
+      "src/renderer/src/components/native-chat/use-native-chat-provisional-launch.test.tsx": 1713,
+      "src/renderer/src/components/native-chat/use-native-chat-rail-history-jump.test.ts": 665,
+      "src/renderer/src/components/native-chat/use-native-chat-retained-session.test.ts": 563,
+      "src/renderer/src/components/native-chat/use-native-chat-send-lifecycle.test.tsx": 346,
+      "src/renderer/src/components/native-chat/use-native-chat-session-option-command.test.tsx": 2103,
+      "src/renderer/src/components/native-chat/use-native-chat-session-options.test.ts": 792,
+      "src/renderer/src/components/native-chat/use-native-chat-skills.react.test.tsx": 862,
+      "src/renderer/src/components/native-chat/use-native-chat-skills.test.ts": 835,
+      "src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx": 746,
+      "src/renderer/src/components/native-chat/use-native-chat-toggle-shortcut.test.ts": 1599,
+      "src/renderer/src/components/native-chat/use-native-chat-transcript-scroll.test.tsx": 556,
+      "src/renderer/src/components/native-chat/use-native-chat-transcript-window.options.test.tsx": 660,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.test.tsx": 2782,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-hold.test.tsx": 935,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-messages.test.tsx": 448,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-options.test.tsx": 1272,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-outbox-admission.test.tsx": 1393,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-outbox-rejection-cause.test.tsx": 608,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-outbox.test.tsx": 1632,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-prompt-cancel.test.tsx": 2498,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-prompt-state.test.tsx": 2251,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-provisional.test.tsx": 2510,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-question-answers.test.tsx": 2546,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-rail-outline.test.tsx": 707,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-read.test.tsx": 1321,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-thread-goal.test.tsx": 570,
+      "src/renderer/src/components/native-chat/use-structured-agent-session-transport.test.tsx": 605,
+      "src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx": 2591,
+      "src/renderer/src/components/native-chat/use-structured-agent-turn-timing.test.tsx": 481,
+      "src/renderer/src/components/network/CustomAddressDialog.test.tsx": 584,
+      "src/renderer/src/components/new-workspace/ComposerParentWorktreePicker.test.tsx": 1181,
+      "src/renderer/src/components/new-workspace/ProjectCombobox.dialog-handoff.test.tsx": 936,
+      "src/renderer/src/components/new-workspace/ProjectCombobox.test.tsx": 1046,
+      "src/renderer/src/components/new-workspace/ProjectComboboxRow.test.tsx": 407,
+      "src/renderer/src/components/new-workspace/SetProjectLocationDialog.test.tsx": 1539,
+      "src/renderer/src/components/new-workspace/SmartWorkspaceNameField-provider-boundaries.test.ts": 1258,
+      "src/renderer/src/components/new-workspace/SmartWorkspaceNameField-repo-slug-routing.test.ts": 1446,
+      "src/renderer/src/components/new-workspace/SmartWorkspaceNameField-source-boundaries.test.ts": 42,
+      "src/renderer/src/components/new-workspace/SmartWorkspaceNameField.ime-enter.test.tsx": 1142,
+      "src/renderer/src/components/new-workspace/SmartWorkspaceNameField.jira-accessibility.test.tsx": 1292,
+      "src/renderer/src/components/new-workspace/base-ref-picker-visibility.test.ts": 49,
+      "src/renderer/src/components/new-workspace/project-combobox-matching.test.ts": 89,
+      "src/renderer/src/components/new-workspace/smart-workspace-command-value.test.ts": 33,
+      "src/renderer/src/components/new-workspace/smart-workspace-localized-options.test.ts": 247,
+      "src/renderer/src/components/new-workspace/smart-workspace-source-popover-focus.test.ts": 503,
+      "src/renderer/src/components/new-workspace/smart-workspace-source-results.test.ts": 116,
+      "src/renderer/src/components/new-workspace/use-jira-source-connection.test.tsx": 629,
+      "src/renderer/src/components/new-workspace/use-jira-url-source.test.tsx": 454,
+      "src/renderer/src/components/new-workspace/use-recent-project-ids.test.ts": 966,
+      "src/renderer/src/components/onboarding/AgentStep.test.tsx": 408,
+      "src/renderer/src/components/onboarding/FeatureSetupInlineTerminal.test.tsx": 1399,
+      "src/renderer/src/components/onboarding/NotificationStep.test.tsx": 1357,
+      "src/renderer/src/components/onboarding/OnboardingFlow.test.tsx": 5689,
+      "src/renderer/src/components/onboarding/OnboardingInlineCommandTerminal.command-finished.test.tsx": 579,
+      "src/renderer/src/components/onboarding/OnboardingInlineCommandTerminal.test.ts": 2643,
+      "src/renderer/src/components/onboarding/ThemeStep.test.ts": 271,
+      "src/renderer/src/components/onboarding/WindowsTerminalStep.test.tsx": 673,
+      "src/renderer/src/components/onboarding/agent-picked-payload.test.ts": 55,
+      "src/renderer/src/components/onboarding/onboarding-dismiss-target.test.ts": 37,
+      "src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts": 1585,
+      "src/renderer/src/components/onboarding/onboarding-folder-agent-startup.test.ts": 281,
+      "src/renderer/src/components/onboarding/onboarding-settings-hydration.test.ts": 65,
+      "src/renderer/src/components/onboarding/use-onboarding-flow-persistence.test.ts": 1229,
+      "src/renderer/src/components/onboarding/use-onboarding-flow.test.ts": 284,
+      "src/renderer/src/components/onboarding/windows-terminal-onboarding-telemetry.test.ts": 37,
+      "src/renderer/src/components/orca-profiles/OrcaProfileSignOutConfirmDialog.test.tsx": 515,
+      "src/renderer/src/components/pet/PetOverlay.frame-durations.test.tsx": 430,
+      "src/renderer/src/components/pet/PetOverlay.keyframes.test.tsx": 447,
+      "src/renderer/src/components/pet/PetOverlay.pet-switch.test.tsx": 622,
+      "src/renderer/src/components/pet/PetOverlay.pointer-interaction.test.tsx": 654,
+      "src/renderer/src/components/pet/PetOverlay.test.ts": 1580,
+      "src/renderer/src/components/pet/pet-agent-state.test.ts": 55,
+      "src/renderer/src/components/pet/pet-blob-cache.test.ts": 65,
+      "src/renderer/src/components/pet/pet-overlay-hit-area.test.tsx": 743,
+      "src/renderer/src/components/pet/pet-overlay-position.test.ts": 1053,
+      "src/renderer/src/components/pet/pet-overlay-visibility.test.ts": 39,
+      "src/renderer/src/components/pet/sprite-animation-css.test.ts": 38,
+      "src/renderer/src/components/pet/usePetPointerInteraction.test.ts": 328,
+      "src/renderer/src/components/pet/usePetUrl.test.tsx": 651,
+      "src/renderer/src/components/ports/WorkspacePortScanner.test.tsx": 3020,
+      "src/renderer/src/components/pr-check-counts.test.ts": 107,
+      "src/renderer/src/components/pr-checks-fix-prompt.test.ts": 56,
+      "src/renderer/src/components/pr-comments-resolution-prompt.test.ts": 40,
+      "src/renderer/src/components/provider-check-classification-parity.test.ts": 112,
+      "src/renderer/src/components/pull-request-page-host-boundary.test.ts": 60,
+      "src/renderer/src/components/pull-request-page/cache/file-content.test.ts": 61,
+      "src/renderer/src/components/pull-request-page/files/combined-diff-section-index.test.tsx": 898,
+      "src/renderer/src/components/pull-request-page/mentions/options.test.ts": 53,
+      "src/renderer/src/components/pull-request-page/mentions/query.test.ts": 46,
+      "src/renderer/src/components/pull-request-page/presentation/state-badge.test.ts": 241,
+      "src/renderer/src/components/quick-open-file-list-host-name-filter.react.test.tsx": 2090,
+      "src/renderer/src/components/quick-open-file-list.react.test.tsx": 1637,
+      "src/renderer/src/components/quick-open-file-list.test.ts": 1005,
+      "src/renderer/src/components/quick-open-install-rg-guidance.render.test.tsx": 799,
+      "src/renderer/src/components/quick-open-install-rg-guidance.test.ts": 254,
+      "src/renderer/src/components/quick-open-search.test.ts": 259,
+      "src/renderer/src/components/repo/CreateFromPicker.test.tsx": 1041,
+      "src/renderer/src/components/repo/NestedRepoChecklist.test.tsx": 274,
+      "src/renderer/src/components/repo/NestedRepoScanLimitNotice.test.ts": 414,
+      "src/renderer/src/components/repo/repo-icon.emoji-centering.test.tsx": 469,
+      "src/renderer/src/components/repo/repo-icon.test.tsx": 554,
+      "src/renderer/src/components/right-sidebar/ActionButton.test.tsx": 3109,
+      "src/renderer/src/components/right-sidebar/AiVaultPanel.legacy-filter.test.tsx": 3107,
+      "src/renderer/src/components/right-sidebar/AiVaultPanelHeader.focus.test.tsx": 837,
+      "src/renderer/src/components/right-sidebar/AiVaultPanelSearch.test.tsx": 1050,
+      "src/renderer/src/components/right-sidebar/AiVaultSearchEvidence.test.tsx": 2126,
+      "src/renderer/src/components/right-sidebar/AiVaultSessionListBar.test.tsx": 1195,
+      "src/renderer/src/components/right-sidebar/AiVaultSessionRow.test.tsx": 1968,
+      "src/renderer/src/components/right-sidebar/AiVaultSessionSubagents.test.tsx": 2633,
+      "src/renderer/src/components/right-sidebar/AiVaultShowMoreSessionsRow.test.tsx": 851,
+      "src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx": 2132,
+      "src/renderer/src/components/right-sidebar/ChecksPanel.review-header.test.tsx": 2283,
+      "src/renderer/src/components/right-sidebar/ChecksPanel.updated-at-metadata.test.tsx": 566,
+      "src/renderer/src/components/right-sidebar/CommitArea.chevron-spinner.test.tsx": 2283,
+      "src/renderer/src/components/right-sidebar/CommitArea.generate.test.tsx": 2862,
+      "src/renderer/src/components/right-sidebar/CommitArea.primary-icons.test.tsx": 3772,
+      "src/renderer/src/components/right-sidebar/CommitArea.test.tsx": 9563,
+      "src/renderer/src/components/right-sidebar/FileExplorerNameFilter.test.tsx": 442,
+      "src/renderer/src/components/right-sidebar/FileExplorerRow.actions.test.tsx": 251,
+      "src/renderer/src/components/right-sidebar/FileExplorerToolbar.test.tsx": 1137,
+      "src/renderer/src/components/right-sidebar/FileExplorerViewSwitch.test.tsx": 286,
+      "src/renderer/src/components/right-sidebar/FileExplorerVirtualRows.row-handlers.test.tsx": 1865,
+      "src/renderer/src/components/right-sidebar/FileExplorerVirtualRowsAddProject.test.tsx": 1859,
+      "src/renderer/src/components/right-sidebar/FolderWorkspacePrChecksPanel.test.tsx": 756,
+      "src/renderer/src/components/right-sidebar/FolderWorkspacePrChecksRow.test.tsx": 540,
+      "src/renderer/src/components/right-sidebar/FolderWorkspaceWorktreesPanel.test.tsx": 713,
+      "src/renderer/src/components/right-sidebar/GitHistoryPanel.test.tsx": 1252,
+      "src/renderer/src/components/right-sidebar/GitHubPRStackMap.test.tsx": 916,
+      "src/renderer/src/components/right-sidebar/HostedReviewActions.draft.test.tsx": 922,
+      "src/renderer/src/components/right-sidebar/PluginPanel.test.tsx": 883,
+      "src/renderer/src/components/right-sidebar/PortsPanel.test.tsx": 2949,
+      "src/renderer/src/components/right-sidebar/PullRequestComposer.generate-tooltip.test.tsx": 1959,
+      "src/renderer/src/components/right-sidebar/SearchResultItems.test.tsx": 526,
+      "src/renderer/src/components/right-sidebar/SessionRowTrailingActions.test.tsx": 565,
+      "src/renderer/src/components/right-sidebar/SourceControl.branch-line-total.test.tsx": 1480,
+      "src/renderer/src/components/right-sidebar/SourceControl.commit-drafts.test.ts": 3776,
+      "src/renderer/src/components/right-sidebar/SourceControl.commit-failure-recovery.test.ts": 48,
+      "src/renderer/src/components/right-sidebar/SourceControl.commit-generation-records.test.ts": 47,
+      "src/renderer/src/components/right-sidebar/SourceControl.compare-summary.test.ts": 3689,
+      "src/renderer/src/components/right-sidebar/SourceControl.host-context-boundary.test.ts": 24,
+      "src/renderer/src/components/right-sidebar/SourceControl.hosted-review-header-link.test.tsx": 134,
+      "src/renderer/src/components/right-sidebar/SourceControl.open-file-highlight.test.tsx": 4632,
+      "src/renderer/src/components/right-sidebar/SourceControl.pr-generation-records.test.ts": 56,
+      "src/renderer/src/components/right-sidebar/SourceControl.preview-open.test.tsx": 4125,
+      "src/renderer/src/components/right-sidebar/SourceControl.push-failure-recovery.test.ts": 53,
+      "src/renderer/src/components/right-sidebar/SourceControl.remote-action-errors.test.ts": 2135,
+      "src/renderer/src/components/right-sidebar/SourceControl.resolve-conflicts-prompt.test.ts": 2081,
+      "src/renderer/src/components/right-sidebar/SourceControl.virtual-file-list.test.tsx": 3225,
+      "src/renderer/src/components/right-sidebar/SourceControlAgentActionDialog.test.tsx": 2339,
+      "src/renderer/src/components/right-sidebar/SourceControlAgentActionDialogForm.test.tsx": 361,
+      "src/renderer/src/components/right-sidebar/SourceControlTextGenerationDialog.test.ts": 551,
+      "src/renderer/src/components/right-sidebar/active-checks-status.test.ts": 1236,
+      "src/renderer/src/components/right-sidebar/activity-bar-buttons.test.tsx": 599,
+      "src/renderer/src/components/right-sidebar/activity-bar-overflow.test.ts": 49,
+      "src/renderer/src/components/right-sidebar/ai-vault-first-prompt-card.test.tsx": 997,
+      "src/renderer/src/components/right-sidebar/ai-vault-host-scope.test.ts": 531,
+      "src/renderer/src/components/right-sidebar/ai-vault-original-pane-index.test.ts": 67,
+      "src/renderer/src/components/right-sidebar/ai-vault-original-pane.test.ts": 49,
+      "src/renderer/src/components/right-sidebar/ai-vault-scan-issue-state.test.ts": 29,
+      "src/renderer/src/components/right-sidebar/ai-vault-scope-paths.test.ts": 47,
+      "src/renderer/src/components/right-sidebar/ai-vault-scope-state.test.ts": 43,
+      "src/renderer/src/components/right-sidebar/ai-vault-search-scope-identity.test.tsx": 731,
+      "src/renderer/src/components/right-sidebar/ai-vault-search-session.test.ts": 142,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-continuation.test.ts": 38,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-deletability.test.ts": 127,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-display.test.ts": 58,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-filters.test.ts": 64,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-identity.test.ts": 42,
       "src/renderer/src/components/right-sidebar/ai-vault-session-log-open.test.ts": 81,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-path-actions.test.ts": 67,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-projects.test.ts": 94,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-publication-gate.test.ts": 404,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-refresh.test.ts": 1953,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts": 851,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat.test.ts": 57,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-resume.test.ts": 182,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-worktree-map.test.tsx": 477,
-      "src/renderer/src/components/right-sidebar/ai-vault-session-worktree.test.ts": 171,
-      "src/renderer/src/components/right-sidebar/ai-vault-view-defaults.test.ts": 68,
-      "src/renderer/src/components/right-sidebar/ai-vault-view-options-persistence.test.ts": 75,
-      "src/renderer/src/components/right-sidebar/branch-line-total-request-gate.test.ts": 32,
-      "src/renderer/src/components/right-sidebar/check-details-resize.test.ts": 32,
-      "src/renderer/src/components/right-sidebar/checks-entry-refresh.test.ts": 56,
-      "src/renderer/src/components/right-sidebar/checks-list-expanded-details.test.tsx": 1489,
-      "src/renderer/src/components/right-sidebar/checks-panel-async-result-key.test.ts": 65,
-      "src/renderer/src/components/right-sidebar/checks-panel-content.test.tsx": 1970,
-      "src/renderer/src/components/right-sidebar/checks-panel-empty-state.test.ts": 111,
-      "src/renderer/src/components/right-sidebar/checks-panel-git-status-snapshot.test.ts": 62,
-      "src/renderer/src/components/right-sidebar/checks-panel-hosted-review-click-routing.test.ts": 47,
-      "src/renderer/src/components/right-sidebar/checks-panel-pr-refresh-breadcrumb.test.ts": 57,
-      "src/renderer/src/components/right-sidebar/checks-panel-pr-refresh-request.test.ts": 58,
-      "src/renderer/src/components/right-sidebar/checks-panel-review-creation.test.ts": 73,
-      "src/renderer/src/components/right-sidebar/checks-panel-review-lookup-authority.test.ts": 48,
-      "src/renderer/src/components/right-sidebar/checks-panel-review.test.ts": 60,
-      "src/renderer/src/components/right-sidebar/checks-panel-terminal-worktree.test.ts": 48,
-      "src/renderer/src/components/right-sidebar/checks-panel/gitlab-review-client.test.ts": 47,
-      "src/renderer/src/components/right-sidebar/checks-panel/panel-content-rendering.test.tsx": 4910,
-      "src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-check-and-review-actions.test.tsx": 2642,
-      "src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-create-review.test.tsx": 851,
-      "src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-generation.test.tsx": 1739,
-      "src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-git-status-effects.test.tsx": 589,
-      "src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-manual-refresh.test.tsx": 1438,
-      "src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-polling.test.tsx": 662,
-      "src/renderer/src/components/right-sidebar/coalesced-poll-runner.test.ts": 77,
-      "src/renderer/src/components/right-sidebar/commit-failure-dialog-state.test.ts": 42,
-      "src/renderer/src/components/right-sidebar/commit-failure-summary.test.ts": 59,
-      "src/renderer/src/components/right-sidebar/create-review-draft-title.test.ts": 43,
-      "src/renderer/src/components/right-sidebar/diff-comments-clear-dialog-state.test.ts": 44,
-      "src/renderer/src/components/right-sidebar/discard-all-sequence.test.ts": 41,
-      "src/renderer/src/components/right-sidebar/file-explorer-add-project-action.test.ts": 60,
-      "src/renderer/src/components/right-sidebar/file-explorer-batch-deletion.test.ts": 171,
-      "src/renderer/src/components/right-sidebar/file-explorer-dir-load-tracker.test.ts": 54,
-      "src/renderer/src/components/right-sidebar/file-explorer-dir-toggle-timing.test.ts": 465,
-      "src/renderer/src/components/right-sidebar/file-explorer-directory-listing.test.ts": 62,
-      "src/renderer/src/components/right-sidebar/file-explorer-drag-scroll-marker.test.tsx": 2431,
-      "src/renderer/src/components/right-sidebar/file-explorer-entries.test.ts": 35,
-      "src/renderer/src/components/right-sidebar/file-explorer-expanded-dirs-refresh.test.ts": 1560,
-      "src/renderer/src/components/right-sidebar/file-explorer-inline-input-outside-click.test.tsx": 773,
-      "src/renderer/src/components/right-sidebar/file-explorer-inline-rename-flow.test.tsx": 1055,
-      "src/renderer/src/components/right-sidebar/file-explorer-instant-dir-toggle.test.ts": 737,
-      "src/renderer/src/components/right-sidebar/file-explorer-keyboard-navigation.test.ts": 74,
-      "src/renderer/src/components/right-sidebar/file-explorer-name-filter-projection.test.ts": 89,
-      "src/renderer/src/components/right-sidebar/file-explorer-operation-generation.test.ts": 1652,
-      "src/renderer/src/components/right-sidebar/file-explorer-paths.test.ts": 45,
-      "src/renderer/src/components/right-sidebar/file-explorer-refresh-concurrency.test.ts": 25,
-      "src/renderer/src/components/right-sidebar/file-explorer-reset.test.ts": 47,
-      "src/renderer/src/components/right-sidebar/file-explorer-row-projection.test.ts": 58,
-      "src/renderer/src/components/right-sidebar/file-explorer-runtime-owner-boundary.test.ts": 58,
-      "src/renderer/src/components/right-sidebar/file-explorer-selection.test.ts": 39,
-      "src/renderer/src/components/right-sidebar/file-explorer-stale-dir-cache.test.ts": 49,
-      "src/renderer/src/components/right-sidebar/file-explorer-watch-drive-root.test.ts": 1646,
-      "src/renderer/src/components/right-sidebar/file-explorer-watch-reconcile.test.ts": 1791,
-      "src/renderer/src/components/right-sidebar/file-explorer-watch-refresh-scheduler.test.ts": 95,
-      "src/renderer/src/components/right-sidebar/file-search-include-pattern.test.ts": 67,
-      "src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.test.ts": 45,
-      "src/renderer/src/components/right-sidebar/fork-push-target-label.test.ts": 51,
-      "src/renderer/src/components/right-sidebar/git-status-push-signal-refresh.test.ts": 73,
-      "src/renderer/src/components/right-sidebar/git-status-refresh-branch-line-total.test.ts": 211,
-      "src/renderer/src/components/right-sidebar/git-status-refresh-scheduler.test.ts": 71,
-      "src/renderer/src/components/right-sidebar/git-status-refresh.test.ts": 247,
-      "src/renderer/src/components/right-sidebar/github-pr-link-modal.test.ts": 52,
-      "src/renderer/src/components/right-sidebar/github-pr-stack-merge.test.ts": 62,
-      "src/renderer/src/components/right-sidebar/gitlab-mr-merge-state.test.ts": 101,
-      "src/renderer/src/components/right-sidebar/local-workspace-port-sections.test.ts": 38,
-      "src/renderer/src/components/right-sidebar/parent-pr-checks-projection-selector.test.ts": 279,
-      "src/renderer/src/components/right-sidebar/parent-pr-checks-refresh.test.ts": 188,
-      "src/renderer/src/components/right-sidebar/parent-pr-checks-rows.test.ts": 201,
-      "src/renderer/src/components/right-sidebar/plugin-panel-activity-items.test.ts": 216,
-      "src/renderer/src/components/right-sidebar/plugin-panel-bridge-host.test.ts": 155,
-      "src/renderer/src/components/right-sidebar/plugin-panel-watchdog-visibility.test.ts": 632,
-      "src/renderer/src/components/right-sidebar/plugin-panel-watchdog.test.ts": 161,
-      "src/renderer/src/components/right-sidebar/pr-comment-ack-summary.test.ts": 54,
-      "src/renderer/src/components/right-sidebar/pr-comment-presentation.test.ts": 272,
-      "src/renderer/src/components/right-sidebar/pr-comment-snapshotted-thread-resolver.test.ts": 43,
-      "src/renderer/src/components/right-sidebar/pr-comment-thread-resolution.test.ts": 49,
-      "src/renderer/src/components/right-sidebar/pr-comments-ai-launch-ack.test.ts": 78,
-      "src/renderer/src/components/right-sidebar/pr-comments-list-selection.test.tsx": 3845,
-      "src/renderer/src/components/right-sidebar/push-target-upstream-refresh-cache.test.ts": 243,
-      "src/renderer/src/components/right-sidebar/review-cache-entry-selection.test.ts": 50,
-      "src/renderer/src/components/right-sidebar/right-panel-comment-composer.ime-enter.test.tsx": 974,
-      "src/renderer/src/components/right-sidebar/right-panel-comment-focus-timers.test.ts": 64,
-      "src/renderer/src/components/right-sidebar/right-sidebar-activity-visibility.test.ts": 130,
-      "src/renderer/src/components/right-sidebar/right-sidebar-effective-tab.test.ts": 45,
-      "src/renderer/src/components/right-sidebar/right-sidebar-primary-action-layout.test.ts": 53,
-      "src/renderer/src/components/right-sidebar/right-sidebar-titlebar-drag-regions.render.test.tsx": 1081,
-      "src/renderer/src/components/right-sidebar/right-sidebar-titlebar-drag-regions.test.ts": 45,
-      "src/renderer/src/components/right-sidebar/right-sidebar-width.test.ts": 53,
-      "src/renderer/src/components/right-sidebar/runSourceControlAgentActionStart.test.ts": 211,
-      "src/renderer/src/components/right-sidebar/search-match-open.test.ts": 52,
-      "src/renderer/src/components/right-sidebar/search-rows.test.ts": 41,
-      "src/renderer/src/components/right-sidebar/source-control-action-recipe-match.test.ts": 196,
-      "src/renderer/src/components/right-sidebar/source-control-actions.test.ts": 43,
-      "src/renderer/src/components/right-sidebar/source-control-active-open-file-keys.test.ts": 47,
-      "src/renderer/src/components/right-sidebar/source-control-agent-action-dialog-support.test.ts": 130,
-      "src/renderer/src/components/right-sidebar/source-control-branch-context-row.test.tsx": 650,
-      "src/renderer/src/components/right-sidebar/source-control-branch-context-stats.test.ts": 92,
-      "src/renderer/src/components/right-sidebar/source-control-branch-section-heading.test.tsx": 1738,
-      "src/renderer/src/components/right-sidebar/source-control-commit-eligibility.test.ts": 48,
-      "src/renderer/src/components/right-sidebar/source-control-commit-message-rows.test.ts": 100,
-      "src/renderer/src/components/right-sidebar/source-control-create-pr-intent-flow.test.ts": 64,
-      "src/renderer/src/components/right-sidebar/source-control-create-pr-intent-state.test.ts": 32,
-      "src/renderer/src/components/right-sidebar/source-control-create-review-blocked-action.test.ts": 113,
-      "src/renderer/src/components/right-sidebar/source-control-created-review-link.test.ts": 60,
-      "src/renderer/src/components/right-sidebar/source-control-discard-confirmation.test.ts": 89,
-      "src/renderer/src/components/right-sidebar/source-control-discard-dialog.test.tsx": 322,
-      "src/renderer/src/components/right-sidebar/source-control-dropdown-items.create-pr-intent.test.ts": 137,
-      "src/renderer/src/components/right-sidebar/source-control-dropdown-items.test.ts": 436,
-      "src/renderer/src/components/right-sidebar/source-control-entry-actions.test.ts": 43,
-      "src/renderer/src/components/right-sidebar/source-control-entry-context-menu.test.tsx": 166,
-      "src/renderer/src/components/right-sidebar/source-control-file-filter.test.ts": 61,
-      "src/renderer/src/components/right-sidebar/source-control-header-toolbar-identity.test.tsx": 594,
-      "src/renderer/src/components/right-sidebar/source-control-header-toolbar.test.ts": 413,
-      "src/renderer/src/components/right-sidebar/source-control-hosted-review-creation-eligibility-snapshot.test.ts": 68,
-      "src/renderer/src/components/right-sidebar/source-control-hosted-review-push-target.test.ts": 56,
-      "src/renderer/src/components/right-sidebar/source-control-huge-repo-warning-dismissals.test.ts": 314,
-      "src/renderer/src/components/right-sidebar/source-control-launch-agent-args-applicability.test.ts": 282,
-      "src/renderer/src/components/right-sidebar/source-control-manual-review-url.test.ts": 75,
-      "src/renderer/src/components/right-sidebar/source-control-primary-action-tooltip.test.ts": 168,
-      "src/renderer/src/components/right-sidebar/source-control-primary-action.create-pr-intent.test.ts": 167,
-      "src/renderer/src/components/right-sidebar/source-control-primary-action.test.ts": 169,
-      "src/renderer/src/components/right-sidebar/source-control-push-recovery.test.ts": 67,
-      "src/renderer/src/components/right-sidebar/source-control-section-order.test.ts": 42,
-      "src/renderer/src/components/right-sidebar/source-control-split-open.test.ts": 47,
-      "src/renderer/src/components/right-sidebar/source-control-status-sort.test.ts": 55,
-      "src/renderer/src/components/right-sidebar/source-control-submodule-expansion.test.ts": 88,
-      "src/renderer/src/components/right-sidebar/source-control-text-generation-defaults.test.ts": 179,
-      "src/renderer/src/components/right-sidebar/source-control-too-many-changes-banner.test.tsx": 3016,
-      "src/renderer/src/components/right-sidebar/source-control-tree.test.ts": 71,
-      "src/renderer/src/components/right-sidebar/source-control/commit/discard-all-failure-description.test.tsx": 2186,
-      "src/renderer/src/components/right-sidebar/source-control/commit/source-control-entry-failure-toast.test.ts": 533,
-      "src/renderer/src/components/right-sidebar/source-control/commit/source-control-entry-mutation-failures.test.tsx": 583,
-      "src/renderer/src/components/right-sidebar/source-control/listing/section-action-buttons.test.tsx": 2272,
-      "src/renderer/src/components/right-sidebar/source-control/listing/section-header.test.tsx": 746,
-      "src/renderer/src/components/right-sidebar/source-control/listing/use-file-projection-work.test.tsx": 616,
-      "src/renderer/src/components/right-sidebar/source-control/listing/use-store-actions.store-subscriptions.test.tsx": 1952,
-      "src/renderer/src/components/right-sidebar/source-control/notes/use-diff-comment-notes.test.tsx": 631,
-      "src/renderer/src/components/right-sidebar/source-control/review/suppressed-github-pr.test.ts": 42,
-      "src/renderer/src/components/right-sidebar/source-control/review/use-action-model.test.tsx": 627,
-      "src/renderer/src/components/right-sidebar/source-control/review/use-hosted-review-state.test.tsx": 608,
-      "src/renderer/src/components/right-sidebar/status-display.test.ts": 45,
-      "src/renderer/src/components/right-sidebar/use-ai-vault-search-focus-request.test.tsx": 2126,
-      "src/renderer/src/components/right-sidebar/use-ai-vault-search.test.tsx": 468,
-      "src/renderer/src/components/right-sidebar/use-checks-panel-terminal-worktree.test.ts": 2105,
-      "src/renderer/src/components/right-sidebar/use-file-explorer-name-filter.runtime-listing.test.tsx": 2042,
-      "src/renderer/src/components/right-sidebar/use-file-explorer-name-filter.test.ts": 2059,
-      "src/renderer/src/components/right-sidebar/use-git-status-upstream-ref-watch.test.ts": 64,
-      "src/renderer/src/components/right-sidebar/use-hosted-review-actions.test.tsx": 360,
-      "src/renderer/src/components/right-sidebar/use-installed-plugin-route-reconciliation.test.tsx": 628,
-      "src/renderer/src/components/right-sidebar/use-persisted-ai-vault-view-options.test.tsx": 506,
-      "src/renderer/src/components/right-sidebar/use-plugin-panel-theme-revision.test.tsx": 670,
-      "src/renderer/src/components/right-sidebar/use-source-control-ai.test.ts": 1976,
-      "src/renderer/src/components/right-sidebar/use-source-control-branch-compare.test.tsx": 1059,
-      "src/renderer/src/components/right-sidebar/use-source-control-git-history.test.tsx": 576,
-      "src/renderer/src/components/right-sidebar/useCreatePullRequestDialogFields.repo-default.test.ts": 2050,
-      "src/renderer/src/components/right-sidebar/useCreatePullRequestDialogFields.test.ts": 2107,
-      "src/renderer/src/components/right-sidebar/useFileExplorerDragDrop.test.ts": 50,
-      "src/renderer/src/components/right-sidebar/useFileExplorerHandlers.test.ts": 1480,
-      "src/renderer/src/components/right-sidebar/useFileExplorerKeys.test.ts": 1482,
-      "src/renderer/src/components/right-sidebar/useFileExplorerRowDrag.test.ts": 68,
-      "src/renderer/src/components/right-sidebar/useFileExplorerTree.refresh-projection-churn.test.tsx": 1891,
-      "src/renderer/src/components/right-sidebar/useFileExplorerTree.stale-dirs.test.tsx": 1507,
-      "src/renderer/src/components/right-sidebar/useFileExplorerVisibleRowProjection.debounce.test.tsx": 2312,
-      "src/renderer/src/components/right-sidebar/useFileExplorerVisibleRowProjection.test.ts": 1486,
-      "src/renderer/src/components/right-sidebar/useFileExplorerWatch.pending-refresh.test.tsx": 646,
-      "src/renderer/src/components/right-sidebar/useFileExplorerWatch.test.ts": 1490,
-      "src/renderer/src/components/right-sidebar/useFileSearchRunner.test.tsx": 545,
-      "src/renderer/src/components/right-sidebar/useGitStatusPolling.rerender.test.ts": 2288,
-      "src/renderer/src/components/right-sidebar/useGitStatusPolling.test.ts": 2702,
-      "src/renderer/src/components/right-sidebar/useHostedReviewStackParent.test.tsx": 553,
-      "src/renderer/src/components/right-sidebar/useSourceControlSelection.test.ts": 53,
-      "src/renderer/src/components/right-sidebar/useSourceControlSubmoduleStatus.test.tsx": 513,
-      "src/renderer/src/components/settings/AccountsPane.test.tsx": 2530,
-      "src/renderer/src/components/settings/AdvancedNetworkSettingsSection.interaction.test.tsx": 2302,
-      "src/renderer/src/components/settings/AdvancedNetworkSettingsSection.test.ts": 1556,
-      "src/renderer/src/components/settings/AdvancedPane.test.tsx": 726,
-      "src/renderer/src/components/settings/AgentSkillSetupPanel.freshness.test.tsx": 2114,
-      "src/renderer/src/components/settings/AgentSkillSetupPanel.test.tsx": 2509,
-      "src/renderer/src/components/settings/AgentsPane.test.tsx": 2094,
-      "src/renderer/src/components/settings/AppearancePane.test.tsx": 2149,
-      "src/renderer/src/components/settings/ArtifactsSettingsPane.test.tsx": 1236,
-      "src/renderer/src/components/settings/AutomationsSettingsPane.test.tsx": 700,
-      "src/renderer/src/components/settings/BranchPrefixFeedback.test.tsx": 140,
-      "src/renderer/src/components/settings/BrowserClientHostedRemoteSetting.test.tsx": 1224,
-      "src/renderer/src/components/settings/BrowserPane.test.ts": 49,
-      "src/renderer/src/components/settings/BrowserSshWorkspaceRoutingSetting.test.tsx": 1161,
-      "src/renderer/src/components/settings/BrowserUseSkillStep.test.tsx": 304,
-      "src/renderer/src/components/settings/BrowserUserAgentSetting.test.tsx": 2155,
-      "src/renderer/src/components/settings/CliSection.install-failure.test.tsx": 1744,
-      "src/renderer/src/components/settings/CliSection.test.tsx": 1629,
-      "src/renderer/src/components/settings/CliSkillRuntimeSetup.test.tsx": 1655,
-      "src/renderer/src/components/settings/CloudVmSetupGuide.test.tsx": 1499,
-      "src/renderer/src/components/settings/CodexLoginLinkNotice.test.tsx": 914,
-      "src/renderer/src/components/settings/CommitMessageAiPane.test.tsx": 2209,
-      "src/renderer/src/components/settings/DefaultWindowsProjectRuntimeSetting.test.tsx": 627,
-      "src/renderer/src/components/settings/DeveloperPermissionsPane.test.tsx": 2179,
-      "src/renderer/src/components/settings/DiffShowWhitespaceSetting.test.tsx": 640,
-      "src/renderer/src/components/settings/EditorWordWrapSetting.test.tsx": 1096,
-      "src/renderer/src/components/settings/EphemeralVmRuntimesSection.test.tsx": 1226,
-      "src/renderer/src/components/settings/EphemeralVmsPane.test.tsx": 5005,
-      "src/renderer/src/components/settings/ExperimentalPane.test.tsx": 1725,
-      "src/renderer/src/components/settings/FloatingWorkspacePane.test.tsx": 1429,
-      "src/renderer/src/components/settings/GeneralPane.test.ts": 6400,
-      "src/renderer/src/components/settings/GeneralRemoteServerUpdates.test.tsx": 817,
-      "src/renderer/src/components/settings/GeneralUpdateSettingsSection.test.tsx": 2043,
-      "src/renderer/src/components/settings/GeneralWorkspaceSettingsSection.test.tsx": 2474,
-      "src/renderer/src/components/settings/GhosttyImportModal.test.ts": 336,
-      "src/renderer/src/components/settings/GitPane.test.ts": 1676,
-      "src/renderer/src/components/settings/GitPane.test.tsx": 1852,
-      "src/renderer/src/components/settings/GrokAccountsSection.test.tsx": 1001,
-      "src/renderer/src/components/settings/HiddenExperimentalGroup.test.tsx": 1015,
-      "src/renderer/src/components/settings/KagiSessionLinkForm.test.ts": 988,
-      "src/renderer/src/components/settings/LinearAgentSkillGuide.test.tsx": 503,
-      "src/renderer/src/components/settings/LinearAgentSkillNotes.test.tsx": 261,
-      "src/renderer/src/components/settings/LinearAgentSkillPane.test.tsx": 1258,
-      "src/renderer/src/components/settings/LocalNetworkConnectionTest.test.tsx": 941,
-      "src/renderer/src/components/settings/MachineNameField.test.tsx": 1017,
-      "src/renderer/src/components/settings/MobileEmulatorAgentControlRow.test.tsx": 1601,
-      "src/renderer/src/components/settings/MobilePairingConnectionOptions.test.tsx": 601,
-      "src/renderer/src/components/settings/MobilePairingQrSection.test.tsx": 752,
-      "src/renderer/src/components/settings/MobilePairingSetupSection.test.tsx": 1855,
-      "src/renderer/src/components/settings/MobilePane.test.tsx": 2296,
-      "src/renderer/src/components/settings/MobilePaneAddressSearch.test.tsx": 1144,
-      "src/renderer/src/components/settings/NativeChatExperimentalSetting.test.tsx": 1745,
-      "src/renderer/src/components/settings/NativeChatSupportedAgents.test.tsx": 860,
-      "src/renderer/src/components/settings/NotificationsPane.test.tsx": 1548,
-      "src/renderer/src/components/settings/OpenInMenuSetting.test.ts": 470,
-      "src/renderer/src/components/settings/OrcaAccountSettingsPane.test.tsx": 1045,
-      "src/renderer/src/components/settings/OrchestrationPane.test.tsx": 2457,
-      "src/renderer/src/components/settings/OrchestrationSkillAgentCoverage.test.tsx": 171,
-      "src/renderer/src/components/settings/PluginConsentDialog.test.tsx": 2470,
-      "src/renderer/src/components/settings/PluginInstallDialog.test.tsx": 1100,
-      "src/renderer/src/components/settings/PluginKeybindingConsentPreview.test.ts": 1235,
-      "src/renderer/src/components/settings/PluginMarketplaceBrowser.test.tsx": 1295,
-      "src/renderer/src/components/settings/PluginMarketplaceSourceDialog.test.tsx": 633,
-      "src/renderer/src/components/settings/PluginSettingsRow.test.tsx": 735,
-      "src/renderer/src/components/settings/PluginsSettingsSection.lifecycle.test.tsx": 1604,
-      "src/renderer/src/components/settings/PrivacyPane.test.ts": 2346,
-      "src/renderer/src/components/settings/ProjectWindowsRuntimeSetting.test.tsx": 1152,
-      "src/renderer/src/components/settings/QuickCommandsList.test.tsx": 1135,
-      "src/renderer/src/components/settings/QuickCommandsPane.test.ts": 1630,
-      "src/renderer/src/components/settings/RemoteServerUpdateDialog.test.tsx": 736,
-      "src/renderer/src/components/settings/RepositoryForkSyncSection.test.tsx": 770,
-      "src/renderer/src/components/settings/RepositoryGitHubAccountSection.test.tsx": 1104,
-      "src/renderer/src/components/settings/RepositoryHooksSection.test.ts": 1180,
-      "src/renderer/src/components/settings/RepositoryHostSetupsSection.test.tsx": 2699,
-      "src/renderer/src/components/settings/RepositoryHostSetupsSection.workspace-window.test.tsx": 2134,
-      "src/renderer/src/components/settings/RepositoryIconEmojiPicker.test.tsx": 478,
-      "src/renderer/src/components/settings/RepositoryIconPicker.github-avatar-refresh.test.tsx": 1072,
-      "src/renderer/src/components/settings/RepositoryPane.test.ts": 3610,
-      "src/renderer/src/components/settings/RepositoryPaneDraftInput.test.tsx": 580,
-      "src/renderer/src/components/settings/RepositorySourceControlAiSection.test.ts": 661,
-      "src/renderer/src/components/settings/RepositoryWorktreeDefaultsSection.test.tsx": 598,
-      "src/renderer/src/components/settings/RuntimeEnvironmentsPane.test.ts": 1942,
-      "src/renderer/src/components/settings/RuntimeHostAccessForm.test.tsx": 686,
-      "src/renderer/src/components/settings/RuntimePairingGeneratorForm.test.tsx": 598,
-      "src/renderer/src/components/settings/RuntimePairingUrlGenerator.test.tsx": 667,
-      "src/renderer/src/components/settings/SessionHistoryComputerRow.test.tsx": 1598,
-      "src/renderer/src/components/settings/SessionHistorySettingsPane.test.tsx": 1678,
-      "src/renderer/src/components/settings/Settings.load-performance.test.ts": 52,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-path-actions.test.ts": 52,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-projects.test.ts": 112,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-publication-gate.test.ts": 531,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-refresh.test.ts": 5506,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts": 575,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat.test.ts": 66,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-resume.test.ts": 169,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-worktree-map.test.tsx": 705,
+      "src/renderer/src/components/right-sidebar/ai-vault-session-worktree.test.ts": 95,
+      "src/renderer/src/components/right-sidebar/ai-vault-view-defaults.test.ts": 45,
+      "src/renderer/src/components/right-sidebar/ai-vault-view-options-persistence.test.ts": 49,
+      "src/renderer/src/components/right-sidebar/branch-line-total-request-gate.test.ts": 48,
+      "src/renderer/src/components/right-sidebar/check-details-resize.test.ts": 30,
+      "src/renderer/src/components/right-sidebar/checks-entry-refresh.test.ts": 58,
+      "src/renderer/src/components/right-sidebar/checks-list-expanded-details.test.tsx": 1439,
+      "src/renderer/src/components/right-sidebar/checks-panel-async-result-key.test.ts": 46,
+      "src/renderer/src/components/right-sidebar/checks-panel-content.test.tsx": 1497,
+      "src/renderer/src/components/right-sidebar/checks-panel-empty-state.test.ts": 113,
+      "src/renderer/src/components/right-sidebar/checks-panel-git-status-snapshot.test.ts": 59,
+      "src/renderer/src/components/right-sidebar/checks-panel-hosted-review-click-routing.test.ts": 65,
+      "src/renderer/src/components/right-sidebar/checks-panel-pr-refresh-breadcrumb.test.ts": 51,
+      "src/renderer/src/components/right-sidebar/checks-panel-pr-refresh-request.test.ts": 31,
+      "src/renderer/src/components/right-sidebar/checks-panel-review-creation.test.ts": 85,
+      "src/renderer/src/components/right-sidebar/checks-panel-review-lookup-authority.test.ts": 52,
+      "src/renderer/src/components/right-sidebar/checks-panel-review.test.ts": 44,
+      "src/renderer/src/components/right-sidebar/checks-panel-terminal-worktree.test.ts": 79,
+      "src/renderer/src/components/right-sidebar/checks-panel/gitlab-review-client.test.ts": 40,
+      "src/renderer/src/components/right-sidebar/checks-panel/panel-content-rendering.test.tsx": 4868,
+      "src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-check-and-review-actions.test.tsx": 2604,
+      "src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-create-review.test.tsx": 597,
+      "src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-generation.test.tsx": 2098,
+      "src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-git-status-effects.test.tsx": 471,
+      "src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-manual-refresh.test.tsx": 2233,
+      "src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-polling.test.tsx": 678,
+      "src/renderer/src/components/right-sidebar/coalesced-poll-runner.test.ts": 69,
+      "src/renderer/src/components/right-sidebar/commit-failure-dialog-state.test.ts": 40,
+      "src/renderer/src/components/right-sidebar/commit-failure-summary.test.ts": 43,
+      "src/renderer/src/components/right-sidebar/create-review-draft-title.test.ts": 38,
+      "src/renderer/src/components/right-sidebar/diff-comments-clear-dialog-state.test.ts": 37,
+      "src/renderer/src/components/right-sidebar/discard-all-sequence.test.ts": 66,
+      "src/renderer/src/components/right-sidebar/file-explorer-add-project-action.test.ts": 41,
+      "src/renderer/src/components/right-sidebar/file-explorer-batch-deletion.test.ts": 147,
+      "src/renderer/src/components/right-sidebar/file-explorer-dir-load-tracker.test.ts": 40,
+      "src/renderer/src/components/right-sidebar/file-explorer-dir-toggle-timing.test.ts": 239,
+      "src/renderer/src/components/right-sidebar/file-explorer-directory-listing.test.ts": 87,
+      "src/renderer/src/components/right-sidebar/file-explorer-drag-scroll-marker.test.tsx": 2626,
+      "src/renderer/src/components/right-sidebar/file-explorer-entries.test.ts": 29,
+      "src/renderer/src/components/right-sidebar/file-explorer-expanded-dirs-refresh.test.ts": 1574,
+      "src/renderer/src/components/right-sidebar/file-explorer-inline-input-outside-click.test.tsx": 842,
+      "src/renderer/src/components/right-sidebar/file-explorer-inline-rename-flow.test.tsx": 646,
+      "src/renderer/src/components/right-sidebar/file-explorer-instant-dir-toggle.test.ts": 677,
+      "src/renderer/src/components/right-sidebar/file-explorer-keyboard-navigation.test.ts": 66,
+      "src/renderer/src/components/right-sidebar/file-explorer-name-filter-projection.test.ts": 51,
+      "src/renderer/src/components/right-sidebar/file-explorer-operation-generation.test.ts": 1352,
+      "src/renderer/src/components/right-sidebar/file-explorer-paths.test.ts": 58,
+      "src/renderer/src/components/right-sidebar/file-explorer-refresh-concurrency.test.ts": 42,
+      "src/renderer/src/components/right-sidebar/file-explorer-reset.test.ts": 40,
+      "src/renderer/src/components/right-sidebar/file-explorer-row-projection.test.ts": 41,
+      "src/renderer/src/components/right-sidebar/file-explorer-runtime-owner-boundary.test.ts": 28,
+      "src/renderer/src/components/right-sidebar/file-explorer-selection.test.ts": 51,
+      "src/renderer/src/components/right-sidebar/file-explorer-stale-dir-cache.test.ts": 64,
+      "src/renderer/src/components/right-sidebar/file-explorer-watch-drive-root.test.ts": 1568,
+      "src/renderer/src/components/right-sidebar/file-explorer-watch-reconcile.test.ts": 2028,
+      "src/renderer/src/components/right-sidebar/file-explorer-watch-refresh-scheduler.test.ts": 58,
+      "src/renderer/src/components/right-sidebar/file-search-include-pattern.test.ts": 54,
+      "src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.test.ts": 67,
+      "src/renderer/src/components/right-sidebar/fork-push-target-label.test.ts": 47,
+      "src/renderer/src/components/right-sidebar/git-status-push-signal-refresh.test.ts": 60,
+      "src/renderer/src/components/right-sidebar/git-status-refresh-branch-line-total.test.ts": 247,
+      "src/renderer/src/components/right-sidebar/git-status-refresh-scheduler.test.ts": 40,
+      "src/renderer/src/components/right-sidebar/git-status-refresh.test.ts": 173,
+      "src/renderer/src/components/right-sidebar/github-pr-link-modal.test.ts": 42,
+      "src/renderer/src/components/right-sidebar/github-pr-stack-merge.test.ts": 58,
+      "src/renderer/src/components/right-sidebar/gitlab-mr-merge-state.test.ts": 91,
+      "src/renderer/src/components/right-sidebar/local-workspace-port-sections.test.ts": 57,
+      "src/renderer/src/components/right-sidebar/parent-pr-checks-projection-selector.test.ts": 294,
+      "src/renderer/src/components/right-sidebar/parent-pr-checks-refresh.test.ts": 176,
+      "src/renderer/src/components/right-sidebar/parent-pr-checks-rows.test.ts": 172,
+      "src/renderer/src/components/right-sidebar/plugin-panel-activity-items.test.ts": 145,
+      "src/renderer/src/components/right-sidebar/plugin-panel-bridge-host.test.ts": 256,
+      "src/renderer/src/components/right-sidebar/plugin-panel-watchdog-visibility.test.ts": 585,
+      "src/renderer/src/components/right-sidebar/plugin-panel-watchdog.test.ts": 189,
+      "src/renderer/src/components/right-sidebar/pr-comment-ack-summary.test.ts": 40,
+      "src/renderer/src/components/right-sidebar/pr-comment-presentation.test.ts": 516,
+      "src/renderer/src/components/right-sidebar/pr-comment-snapshotted-thread-resolver.test.ts": 46,
+      "src/renderer/src/components/right-sidebar/pr-comment-thread-resolution.test.ts": 73,
+      "src/renderer/src/components/right-sidebar/pr-comments-ai-launch-ack.test.ts": 70,
+      "src/renderer/src/components/right-sidebar/pr-comments-list-selection.test.tsx": 3795,
+      "src/renderer/src/components/right-sidebar/push-target-upstream-refresh-cache.test.ts": 203,
+      "src/renderer/src/components/right-sidebar/review-cache-entry-selection.test.ts": 52,
+      "src/renderer/src/components/right-sidebar/right-panel-comment-composer.ime-enter.test.tsx": 679,
+      "src/renderer/src/components/right-sidebar/right-panel-comment-focus-timers.test.ts": 39,
+      "src/renderer/src/components/right-sidebar/right-sidebar-activity-visibility.test.ts": 143,
+      "src/renderer/src/components/right-sidebar/right-sidebar-effective-tab.test.ts": 30,
+      "src/renderer/src/components/right-sidebar/right-sidebar-primary-action-layout.test.ts": 42,
+      "src/renderer/src/components/right-sidebar/right-sidebar-titlebar-drag-regions.render.test.tsx": 1020,
+      "src/renderer/src/components/right-sidebar/right-sidebar-titlebar-drag-regions.test.ts": 55,
+      "src/renderer/src/components/right-sidebar/right-sidebar-width.test.ts": 44,
+      "src/renderer/src/components/right-sidebar/runSourceControlAgentActionStart.test.ts": 203,
+      "src/renderer/src/components/right-sidebar/search-match-open.test.ts": 51,
+      "src/renderer/src/components/right-sidebar/search-rows.test.ts": 32,
+      "src/renderer/src/components/right-sidebar/source-control-action-recipe-match.test.ts": 154,
+      "src/renderer/src/components/right-sidebar/source-control-actions.test.ts": 51,
+      "src/renderer/src/components/right-sidebar/source-control-active-open-file-keys.test.ts": 33,
+      "src/renderer/src/components/right-sidebar/source-control-agent-action-dialog-support.test.ts": 143,
+      "src/renderer/src/components/right-sidebar/source-control-branch-context-row.test.tsx": 732,
+      "src/renderer/src/components/right-sidebar/source-control-branch-context-stats.test.ts": 120,
+      "src/renderer/src/components/right-sidebar/source-control-branch-section-heading.test.tsx": 1334,
+      "src/renderer/src/components/right-sidebar/source-control-commit-eligibility.test.ts": 49,
+      "src/renderer/src/components/right-sidebar/source-control-commit-message-rows.test.ts": 99,
+      "src/renderer/src/components/right-sidebar/source-control-create-pr-intent-flow.test.ts": 72,
+      "src/renderer/src/components/right-sidebar/source-control-create-pr-intent-state.test.ts": 38,
+      "src/renderer/src/components/right-sidebar/source-control-create-review-blocked-action.test.ts": 115,
+      "src/renderer/src/components/right-sidebar/source-control-created-review-link.test.ts": 50,
+      "src/renderer/src/components/right-sidebar/source-control-discard-confirmation.test.ts": 109,
+      "src/renderer/src/components/right-sidebar/source-control-discard-dialog.test.tsx": 321,
+      "src/renderer/src/components/right-sidebar/source-control-dropdown-items.create-pr-intent.test.ts": 135,
+      "src/renderer/src/components/right-sidebar/source-control-dropdown-items.test.ts": 222,
+      "src/renderer/src/components/right-sidebar/source-control-entry-actions.test.ts": 27,
+      "src/renderer/src/components/right-sidebar/source-control-entry-context-menu.test.tsx": 179,
+      "src/renderer/src/components/right-sidebar/source-control-file-filter.test.ts": 53,
+      "src/renderer/src/components/right-sidebar/source-control-header-toolbar-identity.test.tsx": 602,
+      "src/renderer/src/components/right-sidebar/source-control-header-toolbar.test.ts": 416,
+      "src/renderer/src/components/right-sidebar/source-control-hosted-review-creation-eligibility-snapshot.test.ts": 99,
+      "src/renderer/src/components/right-sidebar/source-control-hosted-review-push-target.test.ts": 35,
+      "src/renderer/src/components/right-sidebar/source-control-huge-repo-warning-dismissals.test.ts": 153,
+      "src/renderer/src/components/right-sidebar/source-control-launch-agent-args-applicability.test.ts": 195,
+      "src/renderer/src/components/right-sidebar/source-control-manual-review-url.test.ts": 56,
+      "src/renderer/src/components/right-sidebar/source-control-primary-action-tooltip.test.ts": 224,
+      "src/renderer/src/components/right-sidebar/source-control-primary-action.create-pr-intent.test.ts": 97,
+      "src/renderer/src/components/right-sidebar/source-control-primary-action.test.ts": 172,
+      "src/renderer/src/components/right-sidebar/source-control-push-recovery.test.ts": 37,
+      "src/renderer/src/components/right-sidebar/source-control-section-order.test.ts": 44,
+      "src/renderer/src/components/right-sidebar/source-control-split-open.test.ts": 50,
+      "src/renderer/src/components/right-sidebar/source-control-status-sort.test.ts": 83,
+      "src/renderer/src/components/right-sidebar/source-control-submodule-expansion.test.ts": 62,
+      "src/renderer/src/components/right-sidebar/source-control-text-generation-defaults.test.ts": 153,
+      "src/renderer/src/components/right-sidebar/source-control-too-many-changes-banner.test.tsx": 2910,
+      "src/renderer/src/components/right-sidebar/source-control-tree.test.ts": 73,
+      "src/renderer/src/components/right-sidebar/source-control/commit/discard-all-failure-description.test.tsx": 1290,
+      "src/renderer/src/components/right-sidebar/source-control/commit/source-control-entry-failure-toast.test.ts": 238,
+      "src/renderer/src/components/right-sidebar/source-control/commit/source-control-entry-mutation-failures.test.tsx": 513,
+      "src/renderer/src/components/right-sidebar/source-control/listing/section-action-buttons.test.tsx": 1796,
+      "src/renderer/src/components/right-sidebar/source-control/listing/section-header.test.tsx": 559,
+      "src/renderer/src/components/right-sidebar/source-control/listing/use-file-projection-work.test.tsx": 766,
+      "src/renderer/src/components/right-sidebar/source-control/listing/use-store-actions.store-subscriptions.test.tsx": 1386,
+      "src/renderer/src/components/right-sidebar/source-control/notes/use-diff-comment-notes.test.tsx": 351,
+      "src/renderer/src/components/right-sidebar/source-control/review/suppressed-github-pr.test.ts": 35,
+      "src/renderer/src/components/right-sidebar/source-control/review/use-action-model.test.tsx": 369,
+      "src/renderer/src/components/right-sidebar/source-control/review/use-hosted-review-state.test.tsx": 657,
+      "src/renderer/src/components/right-sidebar/status-display.test.ts": 38,
+      "src/renderer/src/components/right-sidebar/use-ai-vault-search-focus-request.test.tsx": 1291,
+      "src/renderer/src/components/right-sidebar/use-ai-vault-search.test.tsx": 737,
+      "src/renderer/src/components/right-sidebar/use-checks-panel-terminal-worktree.test.ts": 1386,
+      "src/renderer/src/components/right-sidebar/use-file-explorer-name-filter.runtime-listing.test.tsx": 1514,
+      "src/renderer/src/components/right-sidebar/use-file-explorer-name-filter.test.ts": 1249,
+      "src/renderer/src/components/right-sidebar/use-git-status-upstream-ref-watch.test.ts": 63,
+      "src/renderer/src/components/right-sidebar/use-hosted-review-actions.test.tsx": 546,
+      "src/renderer/src/components/right-sidebar/use-installed-plugin-route-reconciliation.test.tsx": 487,
+      "src/renderer/src/components/right-sidebar/use-persisted-ai-vault-view-options.test.tsx": 625,
+      "src/renderer/src/components/right-sidebar/use-plugin-panel-theme-revision.test.tsx": 526,
+      "src/renderer/src/components/right-sidebar/use-source-control-ai.test.ts": 1472,
+      "src/renderer/src/components/right-sidebar/use-source-control-branch-compare.test.tsx": 790,
+      "src/renderer/src/components/right-sidebar/use-source-control-git-history.test.tsx": 608,
+      "src/renderer/src/components/right-sidebar/useCreatePullRequestDialogFields.repo-default.test.ts": 2037,
+      "src/renderer/src/components/right-sidebar/useCreatePullRequestDialogFields.test.ts": 1565,
+      "src/renderer/src/components/right-sidebar/useFileExplorerDragDrop.test.ts": 58,
+      "src/renderer/src/components/right-sidebar/useFileExplorerHandlers.test.ts": 1455,
+      "src/renderer/src/components/right-sidebar/useFileExplorerKeys.test.ts": 1591,
+      "src/renderer/src/components/right-sidebar/useFileExplorerRowDrag.test.ts": 52,
+      "src/renderer/src/components/right-sidebar/useFileExplorerTree.refresh-projection-churn.test.tsx": 2884,
+      "src/renderer/src/components/right-sidebar/useFileExplorerTree.stale-dirs.test.tsx": 2223,
+      "src/renderer/src/components/right-sidebar/useFileExplorerVisibleRowProjection.debounce.test.tsx": 2363,
+      "src/renderer/src/components/right-sidebar/useFileExplorerVisibleRowProjection.test.ts": 1640,
+      "src/renderer/src/components/right-sidebar/useFileExplorerWatch.pending-refresh.test.tsx": 745,
+      "src/renderer/src/components/right-sidebar/useFileExplorerWatch.test.ts": 2024,
+      "src/renderer/src/components/right-sidebar/useFileSearchRunner.test.tsx": 594,
+      "src/renderer/src/components/right-sidebar/useGitStatusPolling.rerender.test.ts": 2104,
+      "src/renderer/src/components/right-sidebar/useGitStatusPolling.test.ts": 1852,
+      "src/renderer/src/components/right-sidebar/useHostedReviewStackParent.test.tsx": 650,
+      "src/renderer/src/components/right-sidebar/useSourceControlSelection.test.ts": 64,
+      "src/renderer/src/components/right-sidebar/useSourceControlSubmoduleStatus.test.tsx": 558,
+      "src/renderer/src/components/settings/AccountsPane.test.tsx": 2350,
+      "src/renderer/src/components/settings/AdvancedNetworkSettingsSection.interaction.test.tsx": 2044,
+      "src/renderer/src/components/settings/AdvancedNetworkSettingsSection.test.ts": 1623,
+      "src/renderer/src/components/settings/AdvancedPane.test.tsx": 427,
+      "src/renderer/src/components/settings/AgentSkillSetupPanel.freshness.test.tsx": 2107,
+      "src/renderer/src/components/settings/AgentSkillSetupPanel.test.tsx": 2692,
+      "src/renderer/src/components/settings/AgentsPane.test.tsx": 2430,
+      "src/renderer/src/components/settings/AppearancePane.test.tsx": 2232,
+      "src/renderer/src/components/settings/ArtifactsSettingsPane.test.tsx": 1005,
+      "src/renderer/src/components/settings/AutomationsSettingsPane.test.tsx": 903,
+      "src/renderer/src/components/settings/BranchPrefixFeedback.test.tsx": 155,
+      "src/renderer/src/components/settings/BrowserClientHostedRemoteSetting.test.tsx": 1136,
+      "src/renderer/src/components/settings/BrowserPane.search-catalog.test.tsx": 710,
+      "src/renderer/src/components/settings/BrowserPane.test.ts": 54,
+      "src/renderer/src/components/settings/BrowserSshWorkspaceRoutingSetting.test.tsx": 801,
+      "src/renderer/src/components/settings/BrowserUseSkillStep.test.tsx": 178,
+      "src/renderer/src/components/settings/BrowserUserAgentSetting.test.tsx": 1325,
+      "src/renderer/src/components/settings/CliSection.install-failure.test.tsx": 2294,
+      "src/renderer/src/components/settings/CliSection.test.tsx": 2339,
+      "src/renderer/src/components/settings/CliSkillRuntimeSetup.test.tsx": 977,
+      "src/renderer/src/components/settings/CloudVmSetupGuide.test.tsx": 1314,
+      "src/renderer/src/components/settings/CodexLoginLinkNotice.test.tsx": 764,
+      "src/renderer/src/components/settings/CommitMessageAiPane.test.tsx": 1754,
+      "src/renderer/src/components/settings/DefaultWindowsProjectRuntimeSetting.test.tsx": 658,
+      "src/renderer/src/components/settings/DeveloperPermissionsPane.test.tsx": 1844,
+      "src/renderer/src/components/settings/DiffShowWhitespaceSetting.test.tsx": 1090,
+      "src/renderer/src/components/settings/EditorWordWrapSetting.test.tsx": 1118,
+      "src/renderer/src/components/settings/EphemeralVmRuntimesSection.test.tsx": 1144,
+      "src/renderer/src/components/settings/EphemeralVmsPane.test.tsx": 4524,
+      "src/renderer/src/components/settings/ExperimentalPane.test.tsx": 2064,
+      "src/renderer/src/components/settings/FloatingWorkspacePane.test.tsx": 1671,
+      "src/renderer/src/components/settings/GeneralPane.test.ts": 3742,
+      "src/renderer/src/components/settings/GeneralRemoteServerUpdates.test.tsx": 832,
+      "src/renderer/src/components/settings/GeneralUpdateSettingsSection.test.tsx": 1415,
+      "src/renderer/src/components/settings/GeneralWorkspaceSettingsSection.test.tsx": 1460,
+      "src/renderer/src/components/settings/GhosttyImportModal.test.ts": 268,
+      "src/renderer/src/components/settings/GitPane.test.ts": 1095,
+      "src/renderer/src/components/settings/GitPane.test.tsx": 1415,
+      "src/renderer/src/components/settings/GrokAccountsSection.test.tsx": 954,
+      "src/renderer/src/components/settings/HiddenExperimentalGroup.test.tsx": 513,
+      "src/renderer/src/components/settings/KagiSessionLinkForm.test.ts": 1135,
+      "src/renderer/src/components/settings/LinearAgentSkillGuide.test.tsx": 374,
+      "src/renderer/src/components/settings/LinearAgentSkillNotes.test.tsx": 163,
+      "src/renderer/src/components/settings/LinearAgentSkillPane.test.tsx": 1432,
+      "src/renderer/src/components/settings/LocalNetworkConnectionTest.test.tsx": 585,
+      "src/renderer/src/components/settings/MachineNameField.test.tsx": 561,
+      "src/renderer/src/components/settings/MobileEmulatorAgentControlRow.test.tsx": 1349,
+      "src/renderer/src/components/settings/MobilePairingConnectionOptions.test.tsx": 1228,
+      "src/renderer/src/components/settings/MobilePairingQrSection.test.tsx": 574,
+      "src/renderer/src/components/settings/MobilePairingSetupSection.test.tsx": 1897,
+      "src/renderer/src/components/settings/MobilePane.test.tsx": 1448,
+      "src/renderer/src/components/settings/MobilePaneAddressSearch.test.tsx": 1173,
+      "src/renderer/src/components/settings/NativeChatExperimentalSetting.test.tsx": 2849,
+      "src/renderer/src/components/settings/NativeChatSupportedAgents.test.tsx": 965,
+      "src/renderer/src/components/settings/NotificationsPane.test.tsx": 1611,
+      "src/renderer/src/components/settings/OpenInMenuSetting.test.ts": 483,
+      "src/renderer/src/components/settings/OrcaAccountSettingsPane.test.tsx": 660,
+      "src/renderer/src/components/settings/OrchestrationPane.test.tsx": 2500,
+      "src/renderer/src/components/settings/OrchestrationSkillAgentCoverage.test.tsx": 142,
+      "src/renderer/src/components/settings/PluginConsentDialog.test.tsx": 1603,
+      "src/renderer/src/components/settings/PluginInstallDialog.test.tsx": 1086,
+      "src/renderer/src/components/settings/PluginKeybindingConsentPreview.test.ts": 880,
+      "src/renderer/src/components/settings/PluginMarketplaceBrowser.test.tsx": 857,
+      "src/renderer/src/components/settings/PluginMarketplaceSourceDialog.test.tsx": 587,
+      "src/renderer/src/components/settings/PluginSettingsRow.test.tsx": 1082,
+      "src/renderer/src/components/settings/PluginsSettingsSection.lifecycle.test.tsx": 1906,
+      "src/renderer/src/components/settings/PrivacyPane.test.ts": 1541,
+      "src/renderer/src/components/settings/ProjectWindowsRuntimeSetting.test.tsx": 1249,
+      "src/renderer/src/components/settings/QuickCommandsList.test.tsx": 1098,
+      "src/renderer/src/components/settings/QuickCommandsPane.test.ts": 1711,
+      "src/renderer/src/components/settings/RemoteServerUpdateDialog.test.tsx": 935,
+      "src/renderer/src/components/settings/RepositoryForkSyncSection.test.tsx": 866,
+      "src/renderer/src/components/settings/RepositoryGitHubAccountSection.test.tsx": 989,
+      "src/renderer/src/components/settings/RepositoryHooksSection.test.ts": 838,
+      "src/renderer/src/components/settings/RepositoryHostSetupsSection.test.tsx": 2695,
+      "src/renderer/src/components/settings/RepositoryHostSetupsSection.workspace-window.test.tsx": 2705,
+      "src/renderer/src/components/settings/RepositoryIconEmojiPicker.test.tsx": 555,
+      "src/renderer/src/components/settings/RepositoryIconPicker.github-avatar-refresh.test.tsx": 1099,
+      "src/renderer/src/components/settings/RepositoryPane.test.ts": 3138,
+      "src/renderer/src/components/settings/RepositoryPaneDraftInput.test.tsx": 450,
+      "src/renderer/src/components/settings/RepositorySourceControlAiSection.test.ts": 593,
+      "src/renderer/src/components/settings/RepositoryWorktreeDefaultsSection.test.tsx": 532,
+      "src/renderer/src/components/settings/RuntimeEnvironmentsPane.test.ts": 1724,
+      "src/renderer/src/components/settings/RuntimeHostAccessForm.test.tsx": 589,
+      "src/renderer/src/components/settings/RuntimePairingGeneratorForm.test.tsx": 434,
+      "src/renderer/src/components/settings/RuntimePairingUrlGenerator.test.tsx": 935,
+      "src/renderer/src/components/settings/SessionHistoryComputerRow.test.tsx": 1157,
+      "src/renderer/src/components/settings/SessionHistorySettingsPane.test.tsx": 2196,
+      "src/renderer/src/components/settings/Settings.load-performance.test.ts": 36,
       "src/renderer/src/components/settings/SettingsConstants.test.ts": 179,
-      "src/renderer/src/components/settings/SettingsFormControls.font-autocomplete.test.tsx": 1208,
-      "src/renderer/src/components/settings/SettingsFormControls.number-field.test.tsx": 1216,
-      "src/renderer/src/components/settings/SettingsFormControls.segmented-control.test.tsx": 1153,
-      "src/renderer/src/components/settings/SettingsSidebar.test.tsx": 2106,
-      "src/renderer/src/components/settings/ShareSkillsSettingsPane.test.tsx": 1233,
-      "src/renderer/src/components/settings/ShortcutCommandBlock.test.tsx": 2174,
-      "src/renderer/src/components/settings/ShortcutFilterRail.test.ts": 259,
-      "src/renderer/src/components/settings/SourceControlActionRepoOverrideNote.test.tsx": 852,
-      "src/renderer/src/components/settings/SparsePresetSettingsSection.test.tsx": 585,
-      "src/renderer/src/components/settings/SshTargetCard.test.tsx": 845,
-      "src/renderer/src/components/settings/SshTargetForm.test.tsx": 1398,
-      "src/renderer/src/components/settings/TaskSourceLinearSetup.test.tsx": 872,
-      "src/renderer/src/components/settings/TaskSourceProviderCard.test.tsx": 757,
-      "src/renderer/src/components/settings/TaskSourceShowInTasksStep.test.tsx": 502,
-      "src/renderer/src/components/settings/TaskSourceSimpleSetup.test.tsx": 527,
-      "src/renderer/src/components/settings/TasksPane.test.tsx": 1532,
-      "src/renderer/src/components/settings/TerminalAdvancedSection.test.tsx": 2110,
-      "src/renderer/src/components/settings/TerminalAppearanceSection.ghostty.test.ts": 648,
-      "src/renderer/src/components/settings/TerminalContrastSetting.test.tsx": 859,
-      "src/renderer/src/components/settings/TerminalFontSizeSetting.test.tsx": 2030,
-      "src/renderer/src/components/settings/TerminalPane.pwsh.test.ts": 697,
-      "src/renderer/src/components/settings/TerminalSettingsPreview.lifecycle.test.tsx": 743,
-      "src/renderer/src/components/settings/TerminalTccAttributionNotice.test.tsx": 872,
-      "src/renderer/src/components/settings/TerminalThemeSections.lifecycle.test.ts": 1662,
-      "src/renderer/src/components/settings/VoiceMicrophoneSetting.test.tsx": 1325,
-      "src/renderer/src/components/settings/VoicePane.test.tsx": 1594,
-      "src/renderer/src/components/settings/VoiceSpeechModelSection.test.tsx": 953,
-      "src/renderer/src/components/settings/WorkspaceDirectorySetting.test.tsx": 2023,
-      "src/renderer/src/components/settings/accounts-search.test.ts": 66,
-      "src/renderer/src/components/settings/agent-availability-settings.test.ts": 205,
-      "src/renderer/src/components/settings/agent-default-env-draft.test.ts": 56,
-      "src/renderer/src/components/settings/agent-skill-installed-command-callers.test.ts": 197,
-      "src/renderer/src/components/settings/appearance-interface-summary.test.ts": 124,
-      "src/renderer/src/components/settings/appearance-search.test.ts": 846,
-      "src/renderer/src/components/settings/appearance-status-bar-search.test.ts": 83,
-      "src/renderer/src/components/settings/appearance-usage-percentage-search.test.ts": 108,
-      "src/renderer/src/components/settings/bitbucket-integration-card.test.tsx": 979,
-      "src/renderer/src/components/settings/browser-cookie-import-label.test.ts": 182,
-      "src/renderer/src/components/settings/browser-link-routing-localization.test.ts": 426,
-      "src/renderer/src/components/settings/browser-search.test.ts": 647,
-      "src/renderer/src/components/settings/browser-session-host-selection.test.ts": 47,
-      "src/renderer/src/components/settings/cli-install-failure.test.ts": 61,
-      "src/renderer/src/components/settings/cli-source-control-integration-cards.test.tsx": 570,
-      "src/renderer/src/components/settings/codex-account-auth-warning.test.ts": 32,
-      "src/renderer/src/components/settings/codex-config-sync-warning.test.ts": 39,
-      "src/renderer/src/components/settings/codex-session-source-home-control.test.tsx": 401,
-      "src/renderer/src/components/settings/developer-permissions-search.test.ts": 807,
-      "src/renderer/src/components/settings/general-editor-search.test.ts": 96,
-      "src/renderer/src/components/settings/general-preview-tab-search.test.ts": 83,
-      "src/renderer/src/components/settings/host-scoped-setting-scope.test.ts": 51,
-      "src/renderer/src/components/settings/integrations-pane-status.test.ts": 65,
-      "src/renderer/src/components/settings/jira-integration-card.test.tsx": 954,
-      "src/renderer/src/components/settings/linear-agent-skill-install-cta.test.tsx": 1970,
-      "src/renderer/src/components/settings/mobile-network-interface-selection.test.ts": 42,
-      "src/renderer/src/components/settings/mobile-pairing-device-polling.test.ts": 30,
-      "src/renderer/src/components/settings/mobile-pane-search.test.ts": 126,
-      "src/renderer/src/components/settings/native-chat-experimental-search-entry.test.ts": 90,
-      "src/renderer/src/components/settings/osc52-clipboard-copy.test.ts": 672,
-      "src/renderer/src/components/settings/plugin-install-source.test.ts": 153,
-      "src/renderer/src/components/settings/provider-account-scope.test.ts": 118,
-      "src/renderer/src/components/settings/provider-account-visibility.test.ts": 51,
-      "src/renderer/src/components/settings/provider-rate-limit-scope-panels.test.tsx": 469,
-      "src/renderer/src/components/settings/repository-hook-settings-draft.test.ts": 242,
-      "src/renderer/src/components/settings/repository-host-setup-options.test.ts": 66,
-      "src/renderer/src/components/settings/repository-icon-github.test.ts": 53,
-      "src/renderer/src/components/settings/repository-source-control-ai-global-ux.test.ts": 773,
-      "src/renderer/src/components/settings/repository-source-control-ai-persist-queue.test.ts": 101,
-      "src/renderer/src/components/settings/runtime-server-row-unverifiable-host.test.tsx": 2189,
-      "src/renderer/src/components/settings/runtime-server-workflow-sections.test.tsx": 950,
-      "src/renderer/src/components/settings/session-history-status-copy.test.ts": 198,
-      "src/renderer/src/components/settings/session-search-computer-rollup.test.ts": 55,
-      "src/renderer/src/components/settings/setting-ownership.test.ts": 96,
-      "src/renderer/src/components/settings/settings-deep-link-target-watcher.test.ts": 232,
-      "src/renderer/src/components/settings/settings-form-option-filter.test.ts": 56,
-      "src/renderer/src/components/settings/settings-project-list.test.ts": 56,
-      "src/renderer/src/components/settings/settings-search-keywords.test.ts": 226,
-      "src/renderer/src/components/settings/settings-search.test.ts": 56,
-      "src/renderer/src/components/settings/settings-setup-guide-progress-hook.test.tsx": 104,
-      "src/renderer/src/components/settings/settings-setup-guide-progress.test.ts": 1599,
-      "src/renderer/src/components/settings/shortcut-binding-list-mutations.test.ts": 50,
-      "src/renderer/src/components/settings/shortcut-definition-catalog.test.ts": 872,
-      "src/renderer/src/components/settings/shortcut-groups.test.ts": 153,
-      "src/renderer/src/components/settings/shortcut-recording-state.test.ts": 38,
-      "src/renderer/src/components/settings/shortcut-row-visibility.test.ts": 298,
-      "src/renderer/src/components/settings/sparse-preset-date.test.ts": 63,
-      "src/renderer/src/components/settings/sparse-preset-operation-error.test.ts": 59,
-      "src/renderer/src/components/settings/ssh-target-action-state.test.ts": 45,
-      "src/renderer/src/components/settings/ssh-target-draft.test.ts": 58,
-      "src/renderer/src/components/settings/ssh-target-remove.test.ts": 201,
-      "src/renderer/src/components/settings/ssh-target-save-payload.test.ts": 127,
-      "src/renderer/src/components/settings/task-source-setup-state.test.ts": 53,
-      "src/renderer/src/components/settings/task-tracker-integration-cards.test.tsx": 1075,
-      "src/renderer/src/components/settings/terminal-preview-content.test.ts": 42,
-      "src/renderer/src/components/settings/terminal-search.test.ts": 258,
-      "src/renderer/src/components/settings/use-debounced-settings-text-draft.test.ts": 612,
-      "src/renderer/src/components/settings/use-mac-captured-digit-chords.test.ts": 856,
-      "src/renderer/src/components/settings/use-published-machine-name.test.tsx": 595,
-      "src/renderer/src/components/settings/use-repository-hook-settings-draft.test.tsx": 723,
-      "src/renderer/src/components/settings/use-session-search-status.test.tsx": 849,
-      "src/renderer/src/components/settings/use-task-source-provider-readiness.test.tsx": 578,
-      "src/renderer/src/components/settings/useGhosttyImport.test.ts": 63,
-      "src/renderer/src/components/settings/useWarpThemeImport.test.ts": 117,
-      "src/renderer/src/components/settings/worktree-symlink-path-filter.test.ts": 57,
-      "src/renderer/src/components/setup-guide/SetupGuideModal.mount-gating.test.tsx": 2923,
-      "src/renderer/src/components/setup-guide/use-setup-guide-progress.test.ts": 1456,
-      "src/renderer/src/components/setup-guide/use-setup-guide-telemetry.test.ts": 45,
-      "src/renderer/src/components/shared/MacFolderAccessFixDialog.test.tsx": 1893,
-      "src/renderer/src/components/shared/kill-all-terminal-surfaces.test.ts": 2002,
-      "src/renderer/src/components/shared/useDaemonActions.test.tsx": 1002,
-      "src/renderer/src/components/sidebar/AddProjectFromFolderDialog.test.tsx": 326,
-      "src/renderer/src/components/sidebar/AddRemoteHostDialog.config-picker.test.tsx": 1909,
-      "src/renderer/src/components/sidebar/AddRemoteHostFields.test.tsx": 415,
-      "src/renderer/src/components/sidebar/AddRepoCreateStep.test.tsx": 556,
-      "src/renderer/src/components/sidebar/AddRepoDialog.default-checkout.test.ts": 58,
-      "src/renderer/src/components/sidebar/AddRepoDialogStepContent.test.tsx": 787,
-      "src/renderer/src/components/sidebar/AddRepoHostSelector.test.tsx": 323,
-      "src/renderer/src/components/sidebar/AddRepoNestedImportStep.test.tsx": 945,
-      "src/renderer/src/components/sidebar/AddRepoStartSteps.test.tsx": 1144,
-      "src/renderer/src/components/sidebar/AddRepoSteps.default-checkout.test.ts": 151,
-      "src/renderer/src/components/sidebar/AgentDashboardSidebarHost.test.tsx": 2285,
-      "src/renderer/src/components/sidebar/AutoRenameFailedDialog.test.tsx": 1024,
-      "src/renderer/src/components/sidebar/CacheTimer.test.tsx": 484,
-      "src/renderer/src/components/sidebar/CommentMarkdown.github-attachment-image.test.tsx": 1766,
-      "src/renderer/src/components/sidebar/CommentMarkdown.link-click.test.tsx": 2464,
-      "src/renderer/src/components/sidebar/CommentMarkdown.test.tsx": 2078,
-      "src/renderer/src/components/sidebar/DeleteWorktreeDialog.host-context-boundary.test.ts": 47,
-      "src/renderer/src/components/sidebar/DeleteWorktreeDialog.test.tsx": 1001,
-      "src/renderer/src/components/sidebar/DeleteWorktreeTargetPreview.test.tsx": 733,
-      "src/renderer/src/components/sidebar/FilterToggleRow.test.tsx": 870,
-      "src/renderer/src/components/sidebar/ImportedWorktreesVisibilityLine.test.tsx": 1462,
-      "src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.reminder-toast.test.tsx": 2284,
-      "src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.test.tsx": 6476,
-      "src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.update-command.test.tsx": 2341,
-      "src/renderer/src/components/sidebar/LocalGitToolchainScanBanner.test.tsx": 1475,
-      "src/renderer/src/components/sidebar/MarkdownImageLightbox.test.tsx": 1174,
-      "src/renderer/src/components/sidebar/NewExternalWorktreesInboxLine.test.tsx": 2035,
-      "src/renderer/src/components/sidebar/NonGitFolderDialog.test.tsx": 741,
-      "src/renderer/src/components/sidebar/NoticeHostGlyph.test.tsx": 1187,
-      "src/renderer/src/components/sidebar/OrcaYamlTrustDialog.test.tsx": 119,
-      "src/renderer/src/components/sidebar/ProjectAddedDialog.test.tsx": 138,
-      "src/renderer/src/components/sidebar/ProjectGroupDeleteDialog.test.tsx": 1102,
-      "src/renderer/src/components/sidebar/ProjectHeaderActions.test.tsx": 513,
-      "src/renderer/src/components/sidebar/RemoteFileBrowser.paste.test.tsx": 995,
-      "src/renderer/src/components/sidebar/RemoveFolderDialog.test.tsx": 102,
-      "src/renderer/src/components/sidebar/SetupGuideSidebarEntry.test.tsx": 676,
-      "src/renderer/src/components/sidebar/SetupScriptPromptCard.test.ts": 70,
-      "src/renderer/src/components/sidebar/SetupScriptPromptCardShell.test.tsx": 975,
-      "src/renderer/src/components/sidebar/Sidebar.test.tsx": 946,
-      "src/renderer/src/components/sidebar/SidebarAgentsList.test.tsx": 1925,
-      "src/renderer/src/components/sidebar/SidebarFeedbackDialog.test.tsx": 2935,
-      "src/renderer/src/components/sidebar/SidebarGroupByToggle.test.tsx": 977,
-      "src/renderer/src/components/sidebar/SidebarHeader.test.tsx": 1112,
-      "src/renderer/src/components/sidebar/SidebarNav.test.tsx": 2154,
-      "src/renderer/src/components/sidebar/SidebarRepositoryFilterSection.test.tsx": 1393,
-      "src/renderer/src/components/sidebar/SidebarSettingsHelpMenu.test.tsx": 886,
-      "src/renderer/src/components/sidebar/SidebarToolbar.test.tsx": 1252,
-      "src/renderer/src/components/sidebar/SidebarWorkspaceFilterSection.test.tsx": 1089,
-      "src/renderer/src/components/sidebar/StatusIndicator.test.ts": 225,
-      "src/renderer/src/components/sidebar/WorkspaceKanbanCard.host-identity.test.tsx": 1400,
-      "src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.mount-gating.test.tsx": 2733,
-      "src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.search.test.tsx": 2265,
-      "src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.task-status-sync.test.tsx": 1860,
-      "src/renderer/src/components/sidebar/WorkspaceKanbanDrawerHeader.test.tsx": 1542,
-      "src/renderer/src/components/sidebar/WorkspaceKanbanLaneCardList.test.tsx": 2050,
-      "src/renderer/src/components/sidebar/WorkspaceKanbanLaneGrid.test.tsx": 698,
-      "src/renderer/src/components/sidebar/WorkspaceKanbanSearchField.test.tsx": 1071,
-      "src/renderer/src/components/sidebar/WorkspaceKanbanSettingsMenu.test.tsx": 893,
-      "src/renderer/src/components/sidebar/WorkspaceKanbanStatusLane.test.tsx": 605,
-      "src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx": 2200,
-      "src/renderer/src/components/sidebar/WorktreeCard.compact-hover.test.tsx": 1812,
-      "src/renderer/src/components/sidebar/WorktreeCard.compact-ports-hover-independence.test.tsx": 2049,
-      "src/renderer/src/components/sidebar/WorktreeCard.hosted-review-refresh.test.tsx": 1938,
-      "src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx": 1293,
-      "src/renderer/src/components/sidebar/WorktreeCard.merged-pr-display.test.tsx": 1756,
-      "src/renderer/src/components/sidebar/WorktreeCard.pinned-repo-icon.test.tsx": 1347,
-      "src/renderer/src/components/sidebar/WorktreeCard.pr-display.test.tsx": 2698,
-      "src/renderer/src/components/sidebar/WorktreeCard.quick-actions.test.tsx": 1788,
-      "src/renderer/src/components/sidebar/WorktreeCard.ssh-reconnect-prompt.test.tsx": 1661,
-      "src/renderer/src/components/sidebar/WorktreeCard.test.ts": 1915,
-      "src/renderer/src/components/sidebar/WorktreeCardAgents.activation.test.tsx": 1386,
-      "src/renderer/src/components/sidebar/WorktreeCardAgents.expansion-remount.test.tsx": 1296,
-      "src/renderer/src/components/sidebar/WorktreeCardAgents.send-target.test.tsx": 1290,
-      "src/renderer/src/components/sidebar/WorktreeCardAgents.test.tsx": 778,
-      "src/renderer/src/components/sidebar/WorktreeCardAutomationDetailSection.test.tsx": 903,
-      "src/renderer/src/components/sidebar/WorktreeCardDisplayMenuSection.test.tsx": 562,
-      "src/renderer/src/components/sidebar/WorktreeCardMeta.interaction.test.tsx": 2834,
-      "src/renderer/src/components/sidebar/WorktreeCardMeta.test.tsx": 1771,
-      "src/renderer/src/components/sidebar/WorktreeCardPorts.test.tsx": 932,
-      "src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx": 2370,
-      "src/renderer/src/components/sidebar/WorktreeCardStatusSlot.test.tsx": 277,
-      "src/renderer/src/components/sidebar/WorktreeContextMenu.copy-worktree-name.test.tsx": 2347,
-      "src/renderer/src/components/sidebar/WorktreeContextMenu.delete-shortcut.test.tsx": 1355,
-      "src/renderer/src/components/sidebar/WorktreeContextMenu.react185-bystander.test.tsx": 2517,
-      "src/renderer/src/components/sidebar/WorktreeContextMenu.test.ts": 1400,
-      "src/renderer/src/components/sidebar/WorktreeDeveloperMenu.test.tsx": 210,
-      "src/renderer/src/components/sidebar/WorktreeDeveloperMenuReveal.test.tsx": 792,
-      "src/renderer/src/components/sidebar/WorktreeList.card-memo-stability.test.tsx": 1245,
-      "src/renderer/src/components/sidebar/WorktreeList.empty-project-rows.test.ts": 1445,
-      "src/renderer/src/components/sidebar/WorktreeList.folder-workspace-rows.test.ts": 2124,
-      "src/renderer/src/components/sidebar/WorktreeList.group-headers.test.ts": 1788,
-      "src/renderer/src/components/sidebar/WorktreeList.lineage-agent-expansion-coupling.test.tsx": 4708,
-      "src/renderer/src/components/sidebar/WorktreeList.lineage-child-card.test.ts": 2456,
-      "src/renderer/src/components/sidebar/WorktreeList.lineage-child-real-card.test.tsx": 3909,
-      "src/renderer/src/components/sidebar/WorktreeList.status-lane-lineage-drop.test.tsx": 2991,
-      "src/renderer/src/components/sidebar/WorktreeMetaDialog.test.tsx": 3771,
-      "src/renderer/src/components/sidebar/WorktreeOpenInMenu.test.tsx": 521,
-      "src/renderer/src/components/sidebar/WorktreeParentPickerPopover.test.ts": 1524,
-      "src/renderer/src/components/sidebar/WorktreeTitleInlineRename.begin-editing.test.tsx": 138,
-      "src/renderer/src/components/sidebar/WorktreeTitleInlineRename.editor-lifecycle.test.tsx": 1022,
-      "src/renderer/src/components/sidebar/WorktreeTitleInlineRename.test.tsx": 419,
-      "src/renderer/src/components/sidebar/WorktreeVisibilityDialog.test.tsx": 2810,
-      "src/renderer/src/components/sidebar/WorktreeVisibilityHelpPopover.test.tsx": 611,
-      "src/renderer/src/components/sidebar/WorktreeVisibilitySourceList.test.tsx": 1449,
-      "src/renderer/src/components/sidebar/active-worktree-focus-after-delete.test.ts": 87,
-      "src/renderer/src/components/sidebar/add-remote-host-ssh-actions.test.ts": 145,
-      "src/renderer/src/components/sidebar/add-repo-browse-authority.test.ts": 57,
-      "src/renderer/src/components/sidebar/add-repo-existing-workspaces-telemetry.test.ts": 52,
-      "src/renderer/src/components/sidebar/add-repo-skip-finalization.test.ts": 59,
-      "src/renderer/src/components/sidebar/clone-defaults.test.ts": 55,
-      "src/renderer/src/components/sidebar/create-project-defaults.test.ts": 38,
-      "src/renderer/src/components/sidebar/default-branch-visible-under-hide-sleeping.test.ts": 1208,
-      "src/renderer/src/components/sidebar/delete-worktree-dirty-change-counts.test.ts": 156,
-      "src/renderer/src/components/sidebar/delete-worktree-failure-toast.test.tsx": 790,
-      "src/renderer/src/components/sidebar/delete-worktree-flow.test.ts": 894,
-      "src/renderer/src/components/sidebar/delete-worktree-parallel-flow.test.ts": 374,
-      "src/renderer/src/components/sidebar/delete-worktree-toast.test.ts": 90,
-      "src/renderer/src/components/sidebar/empty-project-placeholder-repos.test.ts": 59,
-      "src/renderer/src/components/sidebar/focused-agent-row-highlight.test.ts": 1243,
-      "src/renderer/src/components/sidebar/folder-workspace-card-pr-display.test.ts": 121,
-      "src/renderer/src/components/sidebar/folder-workspace-composer-helpers.test.ts": 105,
-      "src/renderer/src/components/sidebar/folder-workspace-composer-path-status.test.tsx": 2063,
-      "src/renderer/src/components/sidebar/folder-workspace-composer-submit.test.ts": 7983,
-      "src/renderer/src/components/sidebar/folder-workspace-linked-startup-plan.test.ts": 1909,
-      "src/renderer/src/components/sidebar/host-header-drag.test.tsx": 643,
-      "src/renderer/src/components/sidebar/host-header-menu-items.test.ts": 55,
-      "src/renderer/src/components/sidebar/host-rename-remove.test.ts": 37,
-      "src/renderer/src/components/sidebar/host-section-folder-workspace-counts.test.ts": 32,
-      "src/renderer/src/components/sidebar/host-section-order.test.ts": 49,
-      "src/renderer/src/components/sidebar/host-section-rows.test.ts": 208,
-      "src/renderer/src/components/sidebar/hovered-workspace-delete.test.ts": 1529,
-      "src/renderer/src/components/sidebar/imported-worktrees-card-actions.test.ts": 61,
-      "src/renderer/src/components/sidebar/imported-worktrees-card-candidates.test.ts": 68,
-      "src/renderer/src/components/sidebar/linear-agent-skill-runtime.shell-override.test.ts": 82,
-      "src/renderer/src/components/sidebar/linear-agent-skill-setup-reminders.test.ts": 38,
-      "src/renderer/src/components/sidebar/local-base-ref-suggestion-toast.test.tsx": 779,
-      "src/renderer/src/components/sidebar/mobile-sidebar-onboarding-badge.test.ts": 505,
-      "src/renderer/src/components/sidebar/natural-worktree-ids.test.ts": 214,
-      "src/renderer/src/components/sidebar/new-external-worktrees-inbox-actions.test.ts": 87,
-      "src/renderer/src/components/sidebar/new-external-worktrees-inbox-candidates.test.ts": 60,
-      "src/renderer/src/components/sidebar/pinned-section-worktrees.test.ts": 645,
-      "src/renderer/src/components/sidebar/preserved-branch-batch-toast.test.tsx": 800,
-      "src/renderer/src/components/sidebar/preserved-branch-toast.test.tsx": 787,
-      "src/renderer/src/components/sidebar/project-added-default-checkout.test.ts": 231,
-      "src/renderer/src/components/sidebar/project-filter-reveal.test.ts": 54,
-      "src/renderer/src/components/sidebar/project-group-header-dom.test.ts": 34,
-      "src/renderer/src/components/sidebar/project-group-header-drag-commit.test.ts": 440,
-      "src/renderer/src/components/sidebar/project-group-header-drag-start.test.ts": 528,
-      "src/renderer/src/components/sidebar/project-group-header-drag.test.ts": 513,
-      "src/renderer/src/components/sidebar/project-group-header-drop.test.ts": 506,
-      "src/renderer/src/components/sidebar/project-header-action-selector-lockstep.test.ts": 456,
-      "src/renderer/src/components/sidebar/project-header-color.test.ts": 187,
-      "src/renderer/src/components/sidebar/project-header-drag-commit.test.ts": 523,
-      "src/renderer/src/components/sidebar/project-header-drag-start.test.ts": 394,
-      "src/renderer/src/components/sidebar/project-header-drag.test.ts": 495,
-      "src/renderer/src/components/sidebar/project-header-drop.test.ts": 424,
-      "src/renderer/src/components/sidebar/project-order-manual-default-notice-visibility.test.ts": 44,
-      "src/renderer/src/components/sidebar/prompt-cache-countdown-clock.test.ts": 62,
-      "src/renderer/src/components/sidebar/prompt-cache-timer-selection.test.ts": 43,
-      "src/renderer/src/components/sidebar/remote-file-browser-drive-paths.test.ts": 45,
-      "src/renderer/src/components/sidebar/remote-file-browser-helpers.test.ts": 163,
-      "src/renderer/src/components/sidebar/rendered-sidebar-worktree-order.test.ts": 1286,
-      "src/renderer/src/components/sidebar/repo-header-create-state.test.ts": 111,
-      "src/renderer/src/components/sidebar/sidebar-empty-state-gate.test.ts": 57,
-      "src/renderer/src/components/sidebar/sidebar-filter-state.test.ts": 1651,
-      "src/renderer/src/components/sidebar/sidebar-host-options.test.ts": 81,
-      "src/renderer/src/components/sidebar/sidebar-project-drop.test.ts": 119,
-      "src/renderer/src/components/sidebar/sidebar-resize-handle.test.ts": 1930,
-      "src/renderer/src/components/sidebar/sidebar-workspace-option-items.test.ts": 208,
-      "src/renderer/src/components/sidebar/sleep-worktree-activation-race.test.ts": 90,
-      "src/renderer/src/components/sidebar/sleep-worktree-flow.test.ts": 134,
-      "src/renderer/src/components/sidebar/smart-attention.test.ts": 124,
-      "src/renderer/src/components/sidebar/smart-sort.test.ts": 91,
-      "src/renderer/src/components/sidebar/ssh-host-remove-resolution.test.ts": 52,
-      "src/renderer/src/components/sidebar/ssh-target-duplicate.test.ts": 47,
-      "src/renderer/src/components/sidebar/ssh-workspace-forget-resolution.test.ts": 43,
-      "src/renderer/src/components/sidebar/stale-agent-row-unverifiable.test.ts": 1572,
-      "src/renderer/src/components/sidebar/truncated-sidebar-label.test.tsx": 509,
-      "src/renderer/src/components/sidebar/use-add-repo-host-selection.test.ts": 255,
-      "src/renderer/src/components/sidebar/use-add-repo-hosted-controller.test.ts": 60,
-      "src/renderer/src/components/sidebar/use-feedback-image-drop.test.tsx": 568,
-      "src/renderer/src/components/sidebar/use-sidebar-feedback-images.test.tsx": 523,
-      "src/renderer/src/components/sidebar/use-visible-workspace-kanban-worktree-ids.test.tsx": 2091,
-      "src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.test.ts": 1107,
-      "src/renderer/src/components/sidebar/use-workspace-kanban-drawer-lingering.test.tsx": 596,
-      "src/renderer/src/components/sidebar/use-workspace-kanban-outside-dismiss.test.ts": 51,
-      "src/renderer/src/components/sidebar/use-workspace-kanban-selection.test.tsx": 554,
-      "src/renderer/src/components/sidebar/use-workspace-reveal-body-redirect.test.tsx": 560,
-      "src/renderer/src/components/sidebar/use-workspace-status-drop.test.ts": 241,
-      "src/renderer/src/components/sidebar/use-worktree-activity-status.test.tsx": 174,
-      "src/renderer/src/components/sidebar/use-worktree-activity-statuses.test.ts": 1267,
-      "src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx": 2463,
-      "src/renderer/src/components/sidebar/use-worktree-sleep-state.test.tsx": 113,
-      "src/renderer/src/components/sidebar/useAddRepoCloneFlow.test.ts": 119,
-      "src/renderer/src/components/sidebar/useAddRepoLocalFolderFlow.test.ts": 222,
-      "src/renderer/src/components/sidebar/useAddRepoNestedImportFlow.test.ts": 136,
-      "src/renderer/src/components/sidebar/useAddRepoServerPathFlow.test.ts": 79,
-      "src/renderer/src/components/sidebar/useCreateProjectDefaults.test.ts": 95,
-      "src/renderer/src/components/sidebar/useCreateRepo.default-checkout.test.ts": 164,
-      "src/renderer/src/components/sidebar/useRenderedSetupScriptPromptState.test.ts": 390,
-      "src/renderer/src/components/sidebar/useSetupScriptPromptRevalidation.test.tsx": 1558,
-      "src/renderer/src/components/sidebar/useWorkspaceBoardPanel.test.tsx": 640,
-      "src/renderer/src/components/sidebar/useWorktreeAgentRows.test.ts": 108,
+      "src/renderer/src/components/settings/SettingsFormControls.font-autocomplete.test.tsx": 1401,
+      "src/renderer/src/components/settings/SettingsFormControls.number-field.test.tsx": 816,
+      "src/renderer/src/components/settings/SettingsFormControls.segmented-control.test.tsx": 904,
+      "src/renderer/src/components/settings/SettingsSidebar.test.tsx": 2031,
+      "src/renderer/src/components/settings/ShareSkillsSettingsPane.test.tsx": 791,
+      "src/renderer/src/components/settings/ShortcutCommandBlock.test.tsx": 1722,
+      "src/renderer/src/components/settings/ShortcutFilterRail.test.ts": 463,
+      "src/renderer/src/components/settings/SourceControlActionRepoOverrideNote.test.tsx": 1006,
+      "src/renderer/src/components/settings/SparsePresetSettingsSection.test.tsx": 577,
+      "src/renderer/src/components/settings/SshTargetCard.test.tsx": 776,
+      "src/renderer/src/components/settings/SshTargetForm.test.tsx": 1083,
+      "src/renderer/src/components/settings/TaskSourceLinearSetup.test.tsx": 1195,
+      "src/renderer/src/components/settings/TaskSourceProviderCard.test.tsx": 592,
+      "src/renderer/src/components/settings/TaskSourceShowInTasksStep.test.tsx": 359,
+      "src/renderer/src/components/settings/TaskSourceSimpleSetup.test.tsx": 960,
+      "src/renderer/src/components/settings/TasksPane.test.tsx": 1403,
+      "src/renderer/src/components/settings/TerminalAdvancedSection.test.tsx": 1646,
+      "src/renderer/src/components/settings/TerminalAppearanceSection.ghostty.test.ts": 398,
+      "src/renderer/src/components/settings/TerminalContrastSetting.test.tsx": 1310,
+      "src/renderer/src/components/settings/TerminalFontSizeSetting.test.tsx": 1537,
+      "src/renderer/src/components/settings/TerminalPane.pwsh.test.ts": 765,
+      "src/renderer/src/components/settings/TerminalSettingsPreview.lifecycle.test.tsx": 664,
+      "src/renderer/src/components/settings/TerminalTccAttributionNotice.test.tsx": 885,
+      "src/renderer/src/components/settings/TerminalThemeSections.lifecycle.test.ts": 1380,
+      "src/renderer/src/components/settings/VoiceMicrophoneSetting.test.tsx": 1149,
+      "src/renderer/src/components/settings/VoicePane.test.tsx": 1609,
+      "src/renderer/src/components/settings/VoiceSpeechModelSection.test.tsx": 672,
+      "src/renderer/src/components/settings/WorkspaceDirectorySetting.test.tsx": 2196,
+      "src/renderer/src/components/settings/accounts-search.test.ts": 45,
+      "src/renderer/src/components/settings/agent-availability-settings.test.ts": 209,
+      "src/renderer/src/components/settings/agent-default-env-draft.test.ts": 41,
+      "src/renderer/src/components/settings/agent-skill-installed-command-callers.test.ts": 122,
+      "src/renderer/src/components/settings/appearance-interface-summary.test.ts": 170,
+      "src/renderer/src/components/settings/appearance-search.test.ts": 835,
+      "src/renderer/src/components/settings/appearance-status-bar-search.test.ts": 58,
+      "src/renderer/src/components/settings/appearance-usage-percentage-search.test.ts": 97,
+      "src/renderer/src/components/settings/bitbucket-integration-card.test.tsx": 882,
+      "src/renderer/src/components/settings/browser-cookie-import-label.test.ts": 115,
+      "src/renderer/src/components/settings/browser-link-routing-localization.test.ts": 422,
+      "src/renderer/src/components/settings/browser-search.test.ts": 394,
+      "src/renderer/src/components/settings/browser-session-host-selection.test.ts": 51,
+      "src/renderer/src/components/settings/cli-install-failure.test.ts": 41,
+      "src/renderer/src/components/settings/cli-source-control-integration-cards.test.tsx": 739,
+      "src/renderer/src/components/settings/codex-account-auth-warning.test.ts": 44,
+      "src/renderer/src/components/settings/codex-config-sync-warning.test.ts": 29,
+      "src/renderer/src/components/settings/codex-session-source-home-control.test.tsx": 389,
+      "src/renderer/src/components/settings/developer-permissions-search.test.ts": 410,
+      "src/renderer/src/components/settings/general-editor-search.test.ts": 109,
+      "src/renderer/src/components/settings/general-preview-tab-search.test.ts": 113,
+      "src/renderer/src/components/settings/host-scoped-setting-scope.test.ts": 40,
+      "src/renderer/src/components/settings/integrations-pane-status.test.ts": 56,
+      "src/renderer/src/components/settings/jira-integration-card.test.tsx": 546,
+      "src/renderer/src/components/settings/linear-agent-skill-install-cta.test.tsx": 1244,
+      "src/renderer/src/components/settings/mobile-network-interface-selection.test.ts": 87,
+      "src/renderer/src/components/settings/mobile-pairing-device-polling.test.ts": 48,
+      "src/renderer/src/components/settings/mobile-pane-search.test.ts": 87,
+      "src/renderer/src/components/settings/native-chat-experimental-search-entry.test.ts": 86,
+      "src/renderer/src/components/settings/osc52-clipboard-copy.test.ts": 365,
+      "src/renderer/src/components/settings/plugin-install-source.test.ts": 167,
+      "src/renderer/src/components/settings/provider-account-scope.test.ts": 110,
+      "src/renderer/src/components/settings/provider-account-visibility.test.ts": 53,
+      "src/renderer/src/components/settings/provider-rate-limit-scope-panels.test.tsx": 486,
+      "src/renderer/src/components/settings/repository-hook-settings-draft.test.ts": 201,
+      "src/renderer/src/components/settings/repository-host-setup-options.test.ts": 71,
+      "src/renderer/src/components/settings/repository-icon-github.test.ts": 56,
+      "src/renderer/src/components/settings/repository-source-control-ai-global-ux.test.ts": 689,
+      "src/renderer/src/components/settings/repository-source-control-ai-persist-queue.test.ts": 70,
+      "src/renderer/src/components/settings/runtime-server-row-unverifiable-host.test.tsx": 2289,
+      "src/renderer/src/components/settings/runtime-server-workflow-sections.test.tsx": 936,
+      "src/renderer/src/components/settings/session-history-status-copy.test.ts": 150,
+      "src/renderer/src/components/settings/session-search-computer-rollup.test.ts": 49,
+      "src/renderer/src/components/settings/setting-ownership.test.ts": 66,
+      "src/renderer/src/components/settings/settings-deep-link-target-watcher.test.ts": 479,
+      "src/renderer/src/components/settings/settings-form-option-filter.test.ts": 60,
+      "src/renderer/src/components/settings/settings-project-list.test.ts": 75,
+      "src/renderer/src/components/settings/settings-search-keywords.test.ts": 195,
+      "src/renderer/src/components/settings/settings-search.test.ts": 54,
+      "src/renderer/src/components/settings/settings-setup-guide-progress-hook.test.tsx": 90,
+      "src/renderer/src/components/settings/settings-setup-guide-progress.test.ts": 1590,
+      "src/renderer/src/components/settings/shortcut-binding-list-mutations.test.ts": 44,
+      "src/renderer/src/components/settings/shortcut-definition-catalog.test.ts": 537,
+      "src/renderer/src/components/settings/shortcut-groups.test.ts": 116,
+      "src/renderer/src/components/settings/shortcut-recording-state.test.ts": 39,
+      "src/renderer/src/components/settings/shortcut-row-visibility.test.ts": 485,
+      "src/renderer/src/components/settings/sparse-preset-date.test.ts": 64,
+      "src/renderer/src/components/settings/sparse-preset-operation-error.test.ts": 46,
+      "src/renderer/src/components/settings/ssh-target-action-state.test.ts": 35,
+      "src/renderer/src/components/settings/ssh-target-draft.test.ts": 67,
+      "src/renderer/src/components/settings/ssh-target-remove.test.ts": 110,
+      "src/renderer/src/components/settings/ssh-target-save-payload.test.ts": 118,
+      "src/renderer/src/components/settings/task-source-setup-state.test.ts": 79,
+      "src/renderer/src/components/settings/task-tracker-integration-cards.test.tsx": 892,
+      "src/renderer/src/components/settings/terminal-preview-content.test.ts": 56,
+      "src/renderer/src/components/settings/terminal-search.test.ts": 193,
+      "src/renderer/src/components/settings/use-debounced-settings-text-draft.test.ts": 578,
+      "src/renderer/src/components/settings/use-mac-captured-digit-chords.test.ts": 885,
+      "src/renderer/src/components/settings/use-published-machine-name.test.tsx": 593,
+      "src/renderer/src/components/settings/use-repository-hook-settings-draft.test.tsx": 412,
+      "src/renderer/src/components/settings/use-session-search-status.test.tsx": 462,
+      "src/renderer/src/components/settings/use-task-source-provider-readiness.test.tsx": 464,
+      "src/renderer/src/components/settings/useGhosttyImport.test.ts": 81,
+      "src/renderer/src/components/settings/useWarpThemeImport.test.ts": 96,
+      "src/renderer/src/components/settings/worktree-symlink-path-filter.scan-budget.test.ts": 125,
+      "src/renderer/src/components/settings/worktree-symlink-path-filter.test.ts": 45,
+      "src/renderer/src/components/setup-guide/SetupGuideModal.mount-gating.test.tsx": 1855,
+      "src/renderer/src/components/setup-guide/use-setup-guide-progress.test.ts": 1157,
+      "src/renderer/src/components/setup-guide/use-setup-guide-telemetry.test.ts": 40,
+      "src/renderer/src/components/shared/MacFolderAccessFixDialog.test.tsx": 1694,
+      "src/renderer/src/components/shared/kill-all-terminal-surfaces.test.ts": 1721,
+      "src/renderer/src/components/shared/useDaemonActions.test.tsx": 665,
+      "src/renderer/src/components/sidebar/AddProjectFromFolderDialog.test.tsx": 345,
+      "src/renderer/src/components/sidebar/AddRemoteHostDialog.config-picker.test.tsx": 1413,
+      "src/renderer/src/components/sidebar/AddRemoteHostFields.test.tsx": 411,
+      "src/renderer/src/components/sidebar/AddRepoCreateStep.test.tsx": 555,
+      "src/renderer/src/components/sidebar/AddRepoDialog.default-checkout.test.ts": 46,
+      "src/renderer/src/components/sidebar/AddRepoDialogStepContent.test.tsx": 748,
+      "src/renderer/src/components/sidebar/AddRepoHostSelector.test.tsx": 568,
+      "src/renderer/src/components/sidebar/AddRepoNestedImportStep.test.tsx": 891,
+      "src/renderer/src/components/sidebar/AddRepoStartSteps.test.tsx": 1413,
+      "src/renderer/src/components/sidebar/AddRepoSteps.default-checkout.test.ts": 158,
+      "src/renderer/src/components/sidebar/AgentDashboardSidebarHost.test.tsx": 2111,
+      "src/renderer/src/components/sidebar/AutoRenameFailedDialog.test.tsx": 534,
+      "src/renderer/src/components/sidebar/CacheTimer.test.tsx": 303,
+      "src/renderer/src/components/sidebar/CommentMarkdown.github-attachment-image.test.tsx": 1751,
+      "src/renderer/src/components/sidebar/CommentMarkdown.link-click.test.tsx": 2429,
+      "src/renderer/src/components/sidebar/CommentMarkdown.test.tsx": 2215,
+      "src/renderer/src/components/sidebar/DeleteWorktreeDialog.host-context-boundary.test.ts": 49,
+      "src/renderer/src/components/sidebar/DeleteWorktreeDialog.test.tsx": 1072,
+      "src/renderer/src/components/sidebar/DeleteWorktreeTargetPreview.test.tsx": 1045,
+      "src/renderer/src/components/sidebar/FilterToggleRow.test.tsx": 792,
+      "src/renderer/src/components/sidebar/ImportedWorktreesVisibilityLine.test.tsx": 1329,
+      "src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.reminder-toast.test.tsx": 1307,
+      "src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.test.tsx": 7136,
+      "src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.update-command.test.tsx": 1428,
+      "src/renderer/src/components/sidebar/LocalGitToolchainScanBanner.test.tsx": 2144,
+      "src/renderer/src/components/sidebar/MarkdownImageLightbox.test.tsx": 1145,
+      "src/renderer/src/components/sidebar/NewExternalWorktreesInboxLine.test.tsx": 2102,
+      "src/renderer/src/components/sidebar/NonGitFolderDialog.test.tsx": 627,
+      "src/renderer/src/components/sidebar/NoticeHostGlyph.test.tsx": 1725,
+      "src/renderer/src/components/sidebar/OrcaYamlTrustDialog.test.tsx": 89,
+      "src/renderer/src/components/sidebar/ProjectAddedDialog.test.tsx": 59,
+      "src/renderer/src/components/sidebar/ProjectGroupDeleteDialog.test.tsx": 946,
+      "src/renderer/src/components/sidebar/ProjectHeaderActions.test.tsx": 455,
+      "src/renderer/src/components/sidebar/RemoteFileBrowser.paste.test.tsx": 1115,
+      "src/renderer/src/components/sidebar/RemoveFolderDialog.test.tsx": 90,
+      "src/renderer/src/components/sidebar/SetupGuideSidebarEntry.test.tsx": 589,
+      "src/renderer/src/components/sidebar/SetupScriptPromptCard.test.ts": 43,
+      "src/renderer/src/components/sidebar/SetupScriptPromptCardShell.test.tsx": 538,
+      "src/renderer/src/components/sidebar/Sidebar.test.tsx": 747,
+      "src/renderer/src/components/sidebar/SidebarAgentsList.test.tsx": 2134,
+      "src/renderer/src/components/sidebar/SidebarFeedbackDialog.test.tsx": 3073,
+      "src/renderer/src/components/sidebar/SidebarGroupByToggle.test.tsx": 522,
+      "src/renderer/src/components/sidebar/SidebarHeader.test.tsx": 1124,
+      "src/renderer/src/components/sidebar/SidebarNav.test.tsx": 1553,
+      "src/renderer/src/components/sidebar/SidebarRepositoryFilterSection.test.tsx": 1398,
+      "src/renderer/src/components/sidebar/SidebarSettingsHelpMenu.test.tsx": 1068,
+      "src/renderer/src/components/sidebar/SidebarToolbar.test.tsx": 1152,
+      "src/renderer/src/components/sidebar/SidebarWorkspaceFilterSection.test.tsx": 765,
+      "src/renderer/src/components/sidebar/StatusIndicator.test.ts": 312,
+      "src/renderer/src/components/sidebar/WorkspaceKanbanCard.host-identity.test.tsx": 1203,
+      "src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.mount-gating.test.tsx": 2186,
+      "src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.search.test.tsx": 2422,
+      "src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.task-status-sync.test.tsx": 2043,
+      "src/renderer/src/components/sidebar/WorkspaceKanbanDrawerHeader.test.tsx": 1839,
+      "src/renderer/src/components/sidebar/WorkspaceKanbanLaneCardList.test.tsx": 1498,
+      "src/renderer/src/components/sidebar/WorkspaceKanbanLaneGrid.test.tsx": 686,
+      "src/renderer/src/components/sidebar/WorkspaceKanbanSearchField.test.tsx": 796,
+      "src/renderer/src/components/sidebar/WorkspaceKanbanSettingsMenu.test.tsx": 1013,
+      "src/renderer/src/components/sidebar/WorkspaceKanbanStatusLane.test.tsx": 969,
+      "src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx": 1815,
+      "src/renderer/src/components/sidebar/WorktreeCard.compact-hover.test.tsx": 3499,
+      "src/renderer/src/components/sidebar/WorktreeCard.compact-ports-hover-independence.test.tsx": 1988,
+      "src/renderer/src/components/sidebar/WorktreeCard.hosted-review-refresh.test.tsx": 1492,
+      "src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx": 1128,
+      "src/renderer/src/components/sidebar/WorktreeCard.merged-pr-display.test.tsx": 976,
+      "src/renderer/src/components/sidebar/WorktreeCard.pinned-repo-icon.test.tsx": 722,
+      "src/renderer/src/components/sidebar/WorktreeCard.pr-display.test.tsx": 1607,
+      "src/renderer/src/components/sidebar/WorktreeCard.quick-actions.test.tsx": 1815,
+      "src/renderer/src/components/sidebar/WorktreeCard.ssh-reconnect-prompt.test.tsx": 1253,
+      "src/renderer/src/components/sidebar/WorktreeCard.test.ts": 2003,
+      "src/renderer/src/components/sidebar/WorktreeCardAgents.activation.test.tsx": 1121,
+      "src/renderer/src/components/sidebar/WorktreeCardAgents.expansion-remount.test.tsx": 715,
+      "src/renderer/src/components/sidebar/WorktreeCardAgents.send-target.test.tsx": 951,
+      "src/renderer/src/components/sidebar/WorktreeCardAgents.test.tsx": 625,
+      "src/renderer/src/components/sidebar/WorktreeCardAutomationDetailSection.test.tsx": 608,
+      "src/renderer/src/components/sidebar/WorktreeCardDisplayMenuSection.test.tsx": 765,
+      "src/renderer/src/components/sidebar/WorktreeCardMeta.interaction.test.tsx": 3427,
+      "src/renderer/src/components/sidebar/WorktreeCardMeta.test.tsx": 2336,
+      "src/renderer/src/components/sidebar/WorktreeCardPorts.test.tsx": 997,
+      "src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx": 2296,
+      "src/renderer/src/components/sidebar/WorktreeCardStatusSlot.test.tsx": 306,
+      "src/renderer/src/components/sidebar/WorktreeContextMenu.copy-worktree-name.test.tsx": 1296,
+      "src/renderer/src/components/sidebar/WorktreeContextMenu.delete-shortcut.test.tsx": 1521,
+      "src/renderer/src/components/sidebar/WorktreeContextMenu.react185-bystander.test.tsx": 2442,
+      "src/renderer/src/components/sidebar/WorktreeContextMenu.test.ts": 1831,
+      "src/renderer/src/components/sidebar/WorktreeDeveloperMenu.test.tsx": 156,
+      "src/renderer/src/components/sidebar/WorktreeDeveloperMenuReveal.test.tsx": 837,
+      "src/renderer/src/components/sidebar/WorktreeList.card-memo-stability.test.tsx": 1550,
+      "src/renderer/src/components/sidebar/WorktreeList.empty-project-rows.test.ts": 1867,
+      "src/renderer/src/components/sidebar/WorktreeList.folder-workspace-rows.test.ts": 1777,
+      "src/renderer/src/components/sidebar/WorktreeList.group-headers.test.ts": 2092,
+      "src/renderer/src/components/sidebar/WorktreeList.lineage-agent-expansion-coupling.test.tsx": 5067,
+      "src/renderer/src/components/sidebar/WorktreeList.lineage-child-card.test.ts": 1705,
+      "src/renderer/src/components/sidebar/WorktreeList.lineage-child-real-card.test.tsx": 3618,
+      "src/renderer/src/components/sidebar/WorktreeList.status-lane-lineage-drop.test.tsx": 1918,
+      "src/renderer/src/components/sidebar/WorktreeMetaDialog.test.tsx": 2111,
+      "src/renderer/src/components/sidebar/WorktreeOpenInMenu.test.tsx": 392,
+      "src/renderer/src/components/sidebar/WorktreeParentPickerPopover.test.ts": 1434,
+      "src/renderer/src/components/sidebar/WorktreeTitleInlineRename.begin-editing.test.tsx": 160,
+      "src/renderer/src/components/sidebar/WorktreeTitleInlineRename.editor-lifecycle.test.tsx": 537,
+      "src/renderer/src/components/sidebar/WorktreeTitleInlineRename.test.tsx": 476,
+      "src/renderer/src/components/sidebar/WorktreeVisibilityDialog.test.tsx": 1597,
+      "src/renderer/src/components/sidebar/WorktreeVisibilityHelpPopover.test.tsx": 917,
+      "src/renderer/src/components/sidebar/WorktreeVisibilitySourceList.test.tsx": 957,
+      "src/renderer/src/components/sidebar/active-worktree-focus-after-delete.test.ts": 109,
+      "src/renderer/src/components/sidebar/add-remote-host-ssh-actions.test.ts": 163,
+      "src/renderer/src/components/sidebar/add-repo-browse-authority.test.ts": 56,
+      "src/renderer/src/components/sidebar/add-repo-existing-workspaces-telemetry.test.ts": 60,
+      "src/renderer/src/components/sidebar/add-repo-skip-finalization.test.ts": 33,
+      "src/renderer/src/components/sidebar/clone-defaults.test.ts": 72,
+      "src/renderer/src/components/sidebar/create-project-defaults.test.ts": 33,
+      "src/renderer/src/components/sidebar/default-branch-folder-project-root.test.ts": 924,
+      "src/renderer/src/components/sidebar/default-branch-visible-under-hide-sleeping.test.ts": 1322,
+      "src/renderer/src/components/sidebar/delete-worktree-dirty-change-counts.test.ts": 46,
+      "src/renderer/src/components/sidebar/delete-worktree-failure-toast.test.tsx": 634,
+      "src/renderer/src/components/sidebar/delete-worktree-flow.test.ts": 799,
+      "src/renderer/src/components/sidebar/delete-worktree-parallel-flow.test.ts": 320,
+      "src/renderer/src/components/sidebar/delete-worktree-toast.test.ts": 89,
+      "src/renderer/src/components/sidebar/empty-project-placeholder-repos.test.ts": 65,
+      "src/renderer/src/components/sidebar/focused-agent-row-highlight.test.ts": 1580,
+      "src/renderer/src/components/sidebar/folder-workspace-card-pr-display.test.ts": 159,
+      "src/renderer/src/components/sidebar/folder-workspace-composer-expiry.test.tsx": 2105,
+      "src/renderer/src/components/sidebar/folder-workspace-composer-helpers.test.ts": 89,
+      "src/renderer/src/components/sidebar/folder-workspace-composer-path-status.test.tsx": 1905,
+      "src/renderer/src/components/sidebar/folder-workspace-composer-submit.test.ts": 3745,
+      "src/renderer/src/components/sidebar/folder-workspace-linked-startup-plan.test.ts": 1959,
+      "src/renderer/src/components/sidebar/host-header-drag.test.tsx": 386,
+      "src/renderer/src/components/sidebar/host-header-menu-items.test.ts": 49,
+      "src/renderer/src/components/sidebar/host-rename-remove.test.ts": 49,
+      "src/renderer/src/components/sidebar/host-section-folder-workspace-counts.test.ts": 51,
+      "src/renderer/src/components/sidebar/host-section-order.test.ts": 33,
+      "src/renderer/src/components/sidebar/host-section-rows.test.ts": 223,
+      "src/renderer/src/components/sidebar/hovered-workspace-delete.test.ts": 1960,
+      "src/renderer/src/components/sidebar/imported-worktrees-card-actions.test.ts": 54,
+      "src/renderer/src/components/sidebar/imported-worktrees-card-candidates.test.ts": 60,
+      "src/renderer/src/components/sidebar/linear-agent-skill-runtime.shell-override.test.ts": 66,
+      "src/renderer/src/components/sidebar/linear-agent-skill-setup-reminders.test.ts": 51,
+      "src/renderer/src/components/sidebar/local-base-ref-suggestion-toast.test.tsx": 727,
+      "src/renderer/src/components/sidebar/mobile-sidebar-onboarding-badge.test.ts": 447,
+      "src/renderer/src/components/sidebar/natural-worktree-ids.test.ts": 266,
+      "src/renderer/src/components/sidebar/new-external-worktrees-inbox-actions.test.ts": 80,
+      "src/renderer/src/components/sidebar/new-external-worktrees-inbox-candidates.test.ts": 42,
+      "src/renderer/src/components/sidebar/pinned-section-worktrees.test.ts": 535,
+      "src/renderer/src/components/sidebar/preserved-branch-batch-toast.test.tsx": 548,
+      "src/renderer/src/components/sidebar/preserved-branch-toast.test.tsx": 937,
+      "src/renderer/src/components/sidebar/project-added-default-checkout.test.ts": 134,
+      "src/renderer/src/components/sidebar/project-filter-reveal.test.ts": 49,
+      "src/renderer/src/components/sidebar/project-group-header-dom.test.ts": 33,
+      "src/renderer/src/components/sidebar/project-group-header-drag-commit.test.ts": 450,
+      "src/renderer/src/components/sidebar/project-group-header-drag-start.test.ts": 375,
+      "src/renderer/src/components/sidebar/project-group-header-drag.test.ts": 565,
+      "src/renderer/src/components/sidebar/project-group-header-drop.test.ts": 360,
+      "src/renderer/src/components/sidebar/project-header-action-selector-lockstep.test.ts": 394,
+      "src/renderer/src/components/sidebar/project-header-color.test.ts": 200,
+      "src/renderer/src/components/sidebar/project-header-drag-commit.test.ts": 356,
+      "src/renderer/src/components/sidebar/project-header-drag-start.test.ts": 478,
+      "src/renderer/src/components/sidebar/project-header-drag.test.ts": 465,
+      "src/renderer/src/components/sidebar/project-header-drop.test.ts": 226,
+      "src/renderer/src/components/sidebar/project-order-manual-default-notice-visibility.test.ts": 53,
+      "src/renderer/src/components/sidebar/prompt-cache-countdown-clock.test.ts": 65,
+      "src/renderer/src/components/sidebar/prompt-cache-timer-selection.test.ts": 55,
+      "src/renderer/src/components/sidebar/remote-file-browser-drive-paths.test.ts": 58,
+      "src/renderer/src/components/sidebar/remote-file-browser-helpers.test.ts": 155,
+      "src/renderer/src/components/sidebar/rendered-sidebar-worktree-order.test.ts": 1657,
+      "src/renderer/src/components/sidebar/repo-header-create-state.test.ts": 110,
+      "src/renderer/src/components/sidebar/sidebar-empty-state-gate.test.ts": 45,
+      "src/renderer/src/components/sidebar/sidebar-filter-state.test.ts": 1063,
+      "src/renderer/src/components/sidebar/sidebar-host-options.test.ts": 109,
+      "src/renderer/src/components/sidebar/sidebar-project-drop.test.ts": 93,
+      "src/renderer/src/components/sidebar/sidebar-resize-handle.test.ts": 4515,
+      "src/renderer/src/components/sidebar/sidebar-workspace-option-items.test.ts": 205,
+      "src/renderer/src/components/sidebar/sleep-worktree-activation-race.test.ts": 69,
+      "src/renderer/src/components/sidebar/sleep-worktree-flow.test.ts": 101,
+      "src/renderer/src/components/sidebar/smart-attention.test.ts": 142,
+      "src/renderer/src/components/sidebar/smart-sort.test.ts": 85,
+      "src/renderer/src/components/sidebar/ssh-host-remove-resolution.test.ts": 33,
+      "src/renderer/src/components/sidebar/ssh-target-duplicate.test.ts": 39,
+      "src/renderer/src/components/sidebar/ssh-workspace-forget-resolution.test.ts": 60,
+      "src/renderer/src/components/sidebar/stale-agent-row-unverifiable.test.ts": 1707,
+      "src/renderer/src/components/sidebar/truncated-sidebar-label.test.tsx": 396,
+      "src/renderer/src/components/sidebar/use-add-repo-host-selection.test.ts": 266,
+      "src/renderer/src/components/sidebar/use-add-repo-hosted-controller.test.ts": 63,
+      "src/renderer/src/components/sidebar/use-feedback-image-drop.test.tsx": 678,
+      "src/renderer/src/components/sidebar/use-sidebar-feedback-images.test.tsx": 560,
+      "src/renderer/src/components/sidebar/use-visible-workspace-kanban-worktree-ids.test.tsx": 2267,
+      "src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.test.ts": 986,
+      "src/renderer/src/components/sidebar/use-workspace-kanban-drawer-lingering.test.tsx": 606,
+      "src/renderer/src/components/sidebar/use-workspace-kanban-outside-dismiss.test.ts": 34,
+      "src/renderer/src/components/sidebar/use-workspace-kanban-selection.test.tsx": 283,
+      "src/renderer/src/components/sidebar/use-workspace-reveal-body-redirect.test.tsx": 611,
+      "src/renderer/src/components/sidebar/use-workspace-status-drop.test.ts": 256,
+      "src/renderer/src/components/sidebar/use-worktree-activity-status.test.tsx": 140,
+      "src/renderer/src/components/sidebar/use-worktree-activity-statuses.test.ts": 1246,
+      "src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx": 2448,
+      "src/renderer/src/components/sidebar/use-worktree-sleep-state.test.tsx": 79,
+      "src/renderer/src/components/sidebar/useAddRepoCloneFlow.test.ts": 145,
+      "src/renderer/src/components/sidebar/useAddRepoLocalFolderFlow.test.ts": 162,
+      "src/renderer/src/components/sidebar/useAddRepoNestedImportFlow.test.ts": 105,
+      "src/renderer/src/components/sidebar/useAddRepoServerPathFlow.test.ts": 95,
+      "src/renderer/src/components/sidebar/useCreateProjectDefaults.test.ts": 101,
+      "src/renderer/src/components/sidebar/useCreateRepo.default-checkout.test.ts": 147,
+      "src/renderer/src/components/sidebar/useRenderedSetupScriptPromptState.test.ts": 476,
+      "src/renderer/src/components/sidebar/useSetupScriptPromptRevalidation.test.tsx": 1585,
+      "src/renderer/src/components/sidebar/useWorkspaceBoardPanel.test.tsx": 556,
+      "src/renderer/src/components/sidebar/useWorktreeAgentRows.test.ts": 168,
       "src/renderer/src/components/sidebar/visible-worktree-activity-inputs.test.ts": 32,
-      "src/renderer/src/components/sidebar/visible-worktree-indexes.test.ts": 1778,
-      "src/renderer/src/components/sidebar/visible-worktrees.test.ts": 3843,
-      "src/renderer/src/components/sidebar/workspace-board-task-status-sync.test.ts": 68,
-      "src/renderer/src/components/sidebar/workspace-creator-visibility.test.ts": 53,
-      "src/renderer/src/components/sidebar/workspace-delete-lineage.test.ts": 41,
-      "src/renderer/src/components/sidebar/workspace-kanban-area-selection.test.ts": 300,
-      "src/renderer/src/components/sidebar/workspace-kanban-card-pointer-drag-dom.test.ts": 81,
-      "src/renderer/src/components/sidebar/workspace-kanban-filtered-drop-index.test.ts": 57,
-      "src/renderer/src/components/sidebar/workspace-kanban-search.test.ts": 141,
-      "src/renderer/src/components/sidebar/workspace-kanban-sidebar-drop.test.ts": 226,
-      "src/renderer/src/components/sidebar/workspace-kanban-virtual-lane-layout.test.ts": 79,
-      "src/renderer/src/components/sidebar/workspace-kanban-worktree-groups.test.ts": 189,
-      "src/renderer/src/components/sidebar/workspace-lineage-menu-actions.test.ts": 50,
-      "src/renderer/src/components/sidebar/workspace-status.test.ts": 275,
-      "src/renderer/src/components/sidebar/worktree-agent-activity-summary.test.ts": 109,
-      "src/renderer/src/components/sidebar/worktree-agent-freshness-selector.test.ts": 79,
-      "src/renderer/src/components/sidebar/worktree-agent-host-attribution.test.ts": 46,
-      "src/renderer/src/components/sidebar/worktree-agent-orchestration-batch.test.ts": 110,
-      "src/renderer/src/components/sidebar/worktree-agent-orchestration-index.test.ts": 167,
-      "src/renderer/src/components/sidebar/worktree-agent-remote-attribution.test.ts": 727,
-      "src/renderer/src/components/sidebar/worktree-agent-row-selectors.test.ts": 90,
-      "src/renderer/src/components/sidebar/worktree-card-agent-ack-inputs.test.tsx": 490,
-      "src/renderer/src/components/sidebar/worktree-card-agent-summary.test.ts": 1831,
-      "src/renderer/src/components/sidebar/worktree-card-compact-agent-row.stable-message.test.tsx": 999,
-      "src/renderer/src/components/sidebar/worktree-card-details-hover-state.test.tsx": 569,
-      "src/renderer/src/components/sidebar/worktree-card-dom-events.test.ts": 208,
-      "src/renderer/src/components/sidebar/worktree-card-jira-issue-display.test.ts": 51,
-      "src/renderer/src/components/sidebar/worktree-card-markdown-isolation.test.ts": 352,
-      "src/renderer/src/components/sidebar/worktree-card-pr-display.test.ts": 36,
-      "src/renderer/src/components/sidebar/worktree-card-send-target-inputs.test.ts": 79,
-      "src/renderer/src/components/sidebar/worktree-card-status-inputs.test.ts": 53,
-      "src/renderer/src/components/sidebar/worktree-card-title-display.test.ts": 46,
-      "src/renderer/src/components/sidebar/worktree-context-menu-delete-intent.test.ts": 61,
-      "src/renderer/src/components/sidebar/worktree-delete-host-qualification.test.ts": 1674,
-      "src/renderer/src/components/sidebar/worktree-delete-position-scaling.test.ts": 644,
-      "src/renderer/src/components/sidebar/worktree-delete-request.test.ts": 47,
-      "src/renderer/src/components/sidebar/worktree-drag-units.test.ts": 234,
-      "src/renderer/src/components/sidebar/worktree-filter-visibility.test.ts": 484,
-      "src/renderer/src/components/sidebar/worktree-header-section-boundaries.test.ts": 216,
-      "src/renderer/src/components/sidebar/worktree-keyboard-cycle.test.ts": 223,
-      "src/renderer/src/components/sidebar/worktree-lineage-drag-drop.test.ts": 494,
-      "src/renderer/src/components/sidebar/worktree-lineage-expansion.performance.test.ts": 307,
-      "src/renderer/src/components/sidebar/worktree-lineage-projection.test.ts": 59,
-      "src/renderer/src/components/sidebar/worktree-lineage-toggle-handler-cache.test.ts": 43,
-      "src/renderer/src/components/sidebar/worktree-list-groups-host-collision.test.ts": 293,
-      "src/renderer/src/components/sidebar/worktree-list-groups-host-labels.test.ts": 261,
-      "src/renderer/src/components/sidebar/worktree-list-groups-imported-worktrees.test.ts": 285,
-      "src/renderer/src/components/sidebar/worktree-list-groups-lineage-nesting.test.ts": 398,
-      "src/renderer/src/components/sidebar/worktree-list-groups-nested-project-groups.test.ts": 271,
-      "src/renderer/src/components/sidebar/worktree-list-groups-notice-host-labels.test.ts": 282,
-      "src/renderer/src/components/sidebar/worktree-list-groups-pending-creations.test.ts": 313,
-      "src/renderer/src/components/sidebar/worktree-list-groups-pinned-host-labels.test.ts": 230,
-      "src/renderer/src/components/sidebar/worktree-list-groups-project-groups.test.ts": 368,
-      "src/renderer/src/components/sidebar/worktree-list-groups-project-host-setups.test.ts": 369,
-      "src/renderer/src/components/sidebar/worktree-list-groups-project-order.test.ts": 1440,
-      "src/renderer/src/components/sidebar/worktree-list-groups-section-label-disambiguation.test.ts": 216,
-      "src/renderer/src/components/sidebar/worktree-list/drag/pointer-flush.test.ts": 863,
-      "src/renderer/src/components/sidebar/worktree-list/drag/row-state.test.ts": 61,
-      "src/renderer/src/components/sidebar/worktree-list/grouping/build-rows.folder-workspace-lanes.test.ts": 320,
-      "src/renderer/src/components/sidebar/worktree-list/grouping/build-rows.test.ts": 269,
-      "src/renderer/src/components/sidebar/worktree-list/grouping/host-labels.test.ts": 39,
-      "src/renderer/src/components/sidebar/worktree-list/grouping/imported-rows.test.ts": 1514,
-      "src/renderer/src/components/sidebar/worktree-list/listing/host-filtering.test.ts": 57,
-      "src/renderer/src/components/sidebar/worktree-list/listing/pending-worktree-creation-keys.test.ts": 53,
-      "src/renderer/src/components/sidebar/worktree-list/listing/review-cache-inputs.test.ts": 56,
-      "src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.test.tsx": 2208,
-      "src/renderer/src/components/sidebar/worktree-list/navigation/active-descendant-option.test.ts": 244,
-      "src/renderer/src/components/sidebar/worktree-list/navigation/folder-reveal.test.ts": 224,
-      "src/renderer/src/components/sidebar/worktree-list/navigation/render-row-lookup.folder-workspace.test.ts": 247,
-      "src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.host-identity.test.tsx": 707,
-      "src/renderer/src/components/sidebar/worktree-list/navigation/use-reveal-requests.test.tsx": 905,
-      "src/renderer/src/components/sidebar/worktree-list/navigation/use-selection-host-collision.test.tsx": 2157,
-      "src/renderer/src/components/sidebar/worktree-list/rows/FolderPathStatusIndicator.test.tsx": 839,
-      "src/renderer/src/components/sidebar/worktree-list/rows/RepoScanUnavailableIndicator.test.tsx": 2056,
-      "src/renderer/src/components/sidebar/worktree-list/rows/indentation.test.ts": 55,
-      "src/renderer/src/components/sidebar/worktree-list/rows/option-dom-host-collision.test.ts": 330,
-      "src/renderer/src/components/sidebar/worktree-list/rows/use-project-group-dialogs-owner-host.test.tsx": 590,
-      "src/renderer/src/components/sidebar/worktree-list/viewport/hard-scroll-up.test.ts": 60,
-      "src/renderer/src/components/sidebar/worktree-list/viewport/scroll-adjustment.test.ts": 2086,
-      "src/renderer/src/components/sidebar/worktree-list/viewport/sticky-headers.test.ts": 288,
-      "src/renderer/src/components/sidebar/worktree-list/viewport/use-row-removal-animation.test.ts": 42,
-      "src/renderer/src/components/sidebar/worktree-list/viewport/use-scroll-to-top.test.ts": 608,
-      "src/renderer/src/components/sidebar/worktree-list/viewport/use-scroll-to-top.test.tsx": 649,
-      "src/renderer/src/components/sidebar/worktree-list/viewport/virtual-rows.test.ts": 203,
-      "src/renderer/src/components/sidebar/worktree-list/viewport/visible-refresh.test.ts": 908,
-      "src/renderer/src/components/sidebar/worktree-manual-order-catalog.test.ts": 157,
-      "src/renderer/src/components/sidebar/worktree-manual-order-store-write.test.ts": 1535,
-      "src/renderer/src/components/sidebar/worktree-manual-order.test.ts": 373,
-      "src/renderer/src/components/sidebar/worktree-meta-updates.test.ts": 89,
-      "src/renderer/src/components/sidebar/worktree-multi-selection.test.ts": 47,
-      "src/renderer/src/components/sidebar/worktree-name-suggestions.test.ts": 164,
-      "src/renderer/src/components/sidebar/worktree-parent-eligibility.test.ts": 51,
-      "src/renderer/src/components/sidebar/worktree-review-helpers.test.tsx": 268,
-      "src/renderer/src/components/sidebar/worktree-scroll-to-current-button.test.ts": 131,
-      "src/renderer/src/components/sidebar/worktree-sidebar-drag-autoscroll.test.ts": 65,
-      "src/renderer/src/components/sidebar/worktree-sidebar-drag-geometry.test.ts": 59,
-      "src/renderer/src/components/sidebar/worktree-sidebar-drop-preview.test.ts": 78,
-      "src/renderer/src/components/sidebar/worktree-sidebar-pointer-drag-dom.test.ts": 406,
-      "src/renderer/src/components/sidebar/worktree-sidebar-reveal-scroll-settle.test.ts": 40,
-      "src/renderer/src/components/sidebar/worktree-sidebar-reveal.test.ts": 228,
-      "src/renderer/src/components/sidebar/worktree-sidebar-row-preference.test.ts": 239,
-      "src/renderer/src/components/sidebar/worktree-sort-label-ordering.test.ts": 190,
-      "src/renderer/src/components/sidebar/worktree-subagent-child-rows.test.ts": 40,
-      "src/renderer/src/components/sidebar/worktree-title-derived-agent-rows.test.ts": 147,
-      "src/renderer/src/components/sidebar/worktree-unambiguous-id-index.test.ts": 51,
-      "src/renderer/src/components/sidebar/worktree-unnest.test.ts": 113,
-      "src/renderer/src/components/sidebar/worktree-visibility-source-provenance.test.ts": 38,
-      "src/renderer/src/components/skills/SkillFreshnessNudge.test.tsx": 528,
-      "src/renderer/src/components/skills/SkillFreshnessStatusPill.test.tsx": 949,
-      "src/renderer/src/components/skills/SkillFreshnessUpdateDialog.test.tsx": 1053,
-      "src/renderer/src/components/skills/SkillInstallAgentPicker.test.tsx": 1349,
-      "src/renderer/src/components/skills/SkillInstallDialog.test.tsx": 3822,
-      "src/renderer/src/components/skills/SkillInstallManagementDialog.test.tsx": 1913,
-      "src/renderer/src/components/skills/SkillInstallTargetFields.test.tsx": 1282,
-      "src/renderer/src/components/skills/SkillInstallWorkspaceCombobox.test.tsx": 1286,
-      "src/renderer/src/components/skills/SkillShareDialog.test.tsx": 2968,
-      "src/renderer/src/components/skills/SkillSharedLinkRow.test.tsx": 1326,
-      "src/renderer/src/components/skills/SkillsPage.test.tsx": 2397,
-      "src/renderer/src/components/skills/skill-agent-filter.test.ts": 186,
-      "src/renderer/src/components/skills/skill-bundle-name.test.ts": 138,
-      "src/renderer/src/components/skills/skill-bundle-retry-selection.test.ts": 37,
-      "src/renderer/src/components/skills/skill-delete-copy.test.ts": 147,
-      "src/renderer/src/components/skills/skill-delete-selection.test.ts": 210,
-      "src/renderer/src/components/skills/skill-description-length.test.ts": 63,
-      "src/renderer/src/components/skills/skill-freshness-grouping.test.ts": 75,
-      "src/renderer/src/components/skills/skill-freshness-skipped-reason.test.ts": 114,
-      "src/renderer/src/components/skills/skill-install-progress-state.test.tsx": 400,
-      "src/renderer/src/components/skills/skill-install-provider-groups.test.ts": 60,
-      "src/renderer/src/components/skills/skill-install-workspace-choices.test.ts": 54,
-      "src/renderer/src/components/skills/skill-package-checklist-items.test.ts": 123,
-      "src/renderer/src/components/skills/skill-package-digest.test.ts": 45,
-      "src/renderer/src/components/skills/skill-package-install-risk.test.ts": 53,
-      "src/renderer/src/components/skills/skill-share-link.test.ts": 39,
-      "src/renderer/src/components/skills/skill-share-package-selection.test.ts": 54,
-      "src/renderer/src/components/skills/skill-share-preview-summary.test.ts": 76,
-      "src/renderer/src/components/skills/skill-share-selection.test.ts": 75,
-      "src/renderer/src/components/skills/skill-source-inventory.test.ts": 57,
-      "src/renderer/src/components/skills/skills-filter.test.ts": 106,
-      "src/renderer/src/components/source-control/SourceControlActionVariableChips.test.tsx": 503,
-      "src/renderer/src/components/star-nag/StarNagAgentValueMomentObserver.test.tsx": 1465,
-      "src/renderer/src/components/star-nag/StarNagToastHost.test.tsx": 1005,
-      "src/renderer/src/components/stats/CodexUsagePane.test.tsx": 1164,
-      "src/renderer/src/components/stats/GrokUsagePane.test.tsx": 1104,
-      "src/renderer/src/components/stats/UsageBreakdownSection.test.tsx": 697,
-      "src/renderer/src/components/stats/UsageTrackingPaneShell.test.tsx": 1015,
-      "src/renderer/src/components/stats/usage-daily-chart.test.tsx": 489,
-      "src/renderer/src/components/stats/usage-overview-model.test.ts": 564,
-      "src/renderer/src/components/status-bar/CaffeinateStatusSegment.localization.test.tsx": 1240,
-      "src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.test.tsx": 2445,
-      "src/renderer/src/components/status-bar/PetStatusSegment.layout.test.ts": 43,
-      "src/renderer/src/components/status-bar/PortsStatusSegment.host-routing.test.tsx": 1035,
-      "src/renderer/src/components/status-bar/PortsStatusSegment.render-stability.test.tsx": 2093,
-      "src/renderer/src/components/status-bar/ResourceUsageStatusSegment.rows.test.tsx": 1839,
-      "src/renderer/src/components/status-bar/ResourceUsageStatusSegment.session-polling.test.ts": 44,
-      "src/renderer/src/components/status-bar/RuntimeHostStatusRow.test.tsx": 882,
-      "src/renderer/src/components/status-bar/SkillUpdateStatusSegment.test.tsx": 680,
-      "src/renderer/src/components/status-bar/SshStatusSegment.test.ts": 1240,
-      "src/renderer/src/components/status-bar/UpdateStatusSegment.test.tsx": 2692,
-      "src/renderer/src/components/status-bar/UsagePercentageDisplayChangeNotice.test.tsx": 930,
-      "src/renderer/src/components/status-bar/UsageRosterPanel.test.tsx": 1102,
-      "src/renderer/src/components/status-bar/codex-restart-status-summary.test.ts": 45,
-      "src/renderer/src/components/status-bar/codex-status-sign-in.test.tsx": 2101,
-      "src/renderer/src/components/status-bar/icons.test.tsx": 100,
-      "src/renderer/src/components/status-bar/inline-usage-bars.test.tsx": 1084,
-      "src/renderer/src/components/status-bar/mergeSnapshotAndSessions.test.ts": 77,
-      "src/renderer/src/components/status-bar/ports-status-popover-rows.test.tsx": 962,
-      "src/renderer/src/components/status-bar/provider-account-sync-key.test.ts": 35,
-      "src/renderer/src/components/status-bar/provider-segment-monthly-window.test.tsx": 1000,
-      "src/renderer/src/components/status-bar/remote-host-connection-status.test.ts": 107,
-      "src/renderer/src/components/status-bar/resource-manager-terminal-copy.test.ts": 63,
-      "src/renderer/src/components/status-bar/resource-manager-worktree-target.test.ts": 24,
-      "src/renderer/src/components/status-bar/resource-memory-metric-copy.test.ts": 75,
-      "src/renderer/src/components/status-bar/resource-session-bindings.test.ts": 56,
-      "src/renderer/src/components/status-bar/resource-session-classification-parity.test.ts": 51,
-      "src/renderer/src/components/status-bar/resource-session-inventory.test.ts": 62,
-      "src/renderer/src/components/status-bar/resource-session-kill-confirmation.test.ts": 49,
-      "src/renderer/src/components/status-bar/resource-session-navigation.test.ts": 47,
-      "src/renderer/src/components/status-bar/resource-usage-folder-merge.test.ts": 73,
-      "src/renderer/src/components/status-bar/resource-usage-open-slices.test.ts": 1502,
-      "src/renderer/src/components/status-bar/resource-usage-space-scan-ready.test.ts": 29,
-      "src/renderer/src/components/status-bar/ssh-status-segment-copy.test.ts": 61,
-      "src/renderer/src/components/status-bar/status-bar-agent-gating.test.ts": 37,
-      "src/renderer/src/components/status-bar/status-bar-context-menu-policy.test.ts": 44,
-      "src/renderer/src/components/status-bar/status-bar-copy-localization.test.tsx": 1484,
-      "src/renderer/src/components/status-bar/status-bar-cursor-segment.test.tsx": 792,
-      "src/renderer/src/components/status-bar/status-bar-provider-menu-focus.test.tsx": 1189,
-      "src/renderer/src/components/status-bar/status-bar-provider-visibility.test.ts": 74,
-      "src/renderer/src/components/status-bar/status-bar-runtime-groups.test.ts": 1480,
-      "src/renderer/src/components/status-bar/tooltip.test.ts": 135,
-      "src/renderer/src/components/status-bar/usage-error-copy.test.ts": 72,
-      "src/renderer/src/components/status-bar/usage-percentage-label.test.ts": 41,
-      "src/renderer/src/components/status-bar/usage-provider-settings-target.test.ts": 51,
-      "src/renderer/src/components/status-bar/usage-roster-formatting.test.ts": 37,
-      "src/renderer/src/components/status-bar/usage-roster-row-state.test.ts": 62,
-      "src/renderer/src/components/status-bar/use-resource-session-inventory.test.tsx": 1195,
-      "src/renderer/src/components/status-bar/use-resource-usage-actions.test.tsx": 792,
-      "src/renderer/src/components/status-bar/use-resource-usage-derived-model.test.tsx": 848,
-      "src/renderer/src/components/status-bar/workspace-space-breakdown-list.test.tsx": 732,
-      "src/renderer/src/components/status-bar/workspace-space-delete-host-routing.test.ts": 49,
-      "src/renderer/src/components/status-bar/workspace-space-format.test.ts": 78,
-      "src/renderer/src/components/status-bar/workspace-space-layout.test.ts": 49,
-      "src/renderer/src/components/status-bar/workspace-space-manager-source-boundary.test.ts": 61,
-      "src/renderer/src/components/status-bar/workspace-space-presentation.test.ts": 402,
-      "src/renderer/src/components/tab-bar/BrowserTab.test.tsx": 1772,
-      "src/renderer/src/components/tab-bar/ClientHostedBrowserTabRows.test.tsx": 1544,
-      "src/renderer/src/components/tab-bar/EditorFileTab.test.tsx": 970,
-      "src/renderer/src/components/tab-bar/EditorFileTabContextMenu.test.tsx": 695,
-      "src/renderer/src/components/tab-bar/QuickLaunchButton.test.ts": 887,
-      "src/renderer/src/components/tab-bar/RecentTabSwitcher.test.tsx": 549,
-      "src/renderer/src/components/tab-bar/SortableTab.rename-shortcut.test.tsx": 748,
-      "src/renderer/src/components/tab-bar/SortableTab.update-depth-probe.test.tsx": 1339,
-      "src/renderer/src/components/tab-bar/SortableTabContextMenu.test.tsx": 1015,
-      "src/renderer/src/components/tab-bar/TabBar.client-hosted-row-active-state.test.ts": 1661,
-      "src/renderer/src/components/tab-bar/TabBar.context-menu.test.ts": 3638,
-      "src/renderer/src/components/tab-bar/TabBar.windows-shell-launch.test.ts": 1935,
-      "src/renderer/src/components/tab-bar/TabBar.windows-shell-remote-runtime.test.ts": 1669,
-      "src/renderer/src/components/tab-bar/TabBar.windows-shell-ssh-host.test.ts": 1352,
-      "src/renderer/src/components/tab-bar/TabBar.worktree-write-gate.test.tsx": 1173,
-      "src/renderer/src/components/tab-bar/TabBar.worktree-write-gate.windows.test.tsx": 1231,
-      "src/renderer/src/components/tab-bar/TabBarCreateEntry.history.test.tsx": 2072,
-      "src/renderer/src/components/tab-bar/TabBarCreateEntry.keyboard.test.tsx": 2639,
-      "src/renderer/src/components/tab-bar/TabBarCreateEntry.search.test.tsx": 2871,
-      "src/renderer/src/components/tab-bar/TabBarCreateEntry.tab-results.test.tsx": 2635,
-      "src/renderer/src/components/tab-bar/TabBarCreateEntryRow.test.tsx": 966,
-      "src/renderer/src/components/tab-bar/TabBarQuickCommandItem.test.tsx": 630,
+      "src/renderer/src/components/sidebar/visible-worktree-indexes.test.ts": 1479,
+      "src/renderer/src/components/sidebar/visible-worktrees.test.ts": 3541,
+      "src/renderer/src/components/sidebar/workspace-board-task-status-sync.test.ts": 58,
+      "src/renderer/src/components/sidebar/workspace-creator-visibility.test.ts": 29,
+      "src/renderer/src/components/sidebar/workspace-delete-lineage.test.ts": 52,
+      "src/renderer/src/components/sidebar/workspace-kanban-area-selection.test.ts": 343,
+      "src/renderer/src/components/sidebar/workspace-kanban-card-pointer-drag-dom.test.ts": 69,
+      "src/renderer/src/components/sidebar/workspace-kanban-filtered-drop-index.test.ts": 54,
+      "src/renderer/src/components/sidebar/workspace-kanban-search.test.ts": 100,
+      "src/renderer/src/components/sidebar/workspace-kanban-sidebar-drop.test.ts": 253,
+      "src/renderer/src/components/sidebar/workspace-kanban-virtual-lane-layout.test.ts": 48,
+      "src/renderer/src/components/sidebar/workspace-kanban-worktree-groups.test.ts": 142,
+      "src/renderer/src/components/sidebar/workspace-lineage-menu-actions.test.ts": 41,
+      "src/renderer/src/components/sidebar/workspace-status.test.ts": 254,
+      "src/renderer/src/components/sidebar/worktree-agent-activity-summary.test.ts": 113,
+      "src/renderer/src/components/sidebar/worktree-agent-freshness-selector.test.ts": 82,
+      "src/renderer/src/components/sidebar/worktree-agent-host-attribution.test.ts": 36,
+      "src/renderer/src/components/sidebar/worktree-agent-orchestration-batch.test.ts": 75,
+      "src/renderer/src/components/sidebar/worktree-agent-orchestration-index.test.ts": 163,
+      "src/renderer/src/components/sidebar/worktree-agent-remote-attribution.test.ts": 613,
+      "src/renderer/src/components/sidebar/worktree-agent-row-selectors.test.ts": 98,
+      "src/renderer/src/components/sidebar/worktree-card-agent-ack-inputs.test.tsx": 455,
+      "src/renderer/src/components/sidebar/worktree-card-agent-summary.test.ts": 1674,
+      "src/renderer/src/components/sidebar/worktree-card-compact-agent-row.stable-message.test.tsx": 777,
+      "src/renderer/src/components/sidebar/worktree-card-details-hover-state.test.tsx": 292,
+      "src/renderer/src/components/sidebar/worktree-card-dom-events.test.ts": 428,
+      "src/renderer/src/components/sidebar/worktree-card-jira-issue-display.test.ts": 49,
+      "src/renderer/src/components/sidebar/worktree-card-markdown-isolation.test.ts": 555,
+      "src/renderer/src/components/sidebar/worktree-card-pr-display.test.ts": 35,
+      "src/renderer/src/components/sidebar/worktree-card-send-target-inputs.test.ts": 33,
+      "src/renderer/src/components/sidebar/worktree-card-status-inputs.test.ts": 51,
+      "src/renderer/src/components/sidebar/worktree-card-title-display.test.ts": 62,
+      "src/renderer/src/components/sidebar/worktree-context-menu-delete-intent.test.ts": 72,
+      "src/renderer/src/components/sidebar/worktree-delete-host-qualification.test.ts": 1795,
+      "src/renderer/src/components/sidebar/worktree-delete-position-scaling.test.ts": 669,
+      "src/renderer/src/components/sidebar/worktree-delete-request.test.ts": 46,
+      "src/renderer/src/components/sidebar/worktree-drag-units.test.ts": 194,
+      "src/renderer/src/components/sidebar/worktree-filter-visibility.test.ts": 466,
+      "src/renderer/src/components/sidebar/worktree-header-section-boundaries.test.ts": 206,
+      "src/renderer/src/components/sidebar/worktree-keyboard-cycle.test.ts": 286,
+      "src/renderer/src/components/sidebar/worktree-lineage-drag-drop.test.ts": 483,
+      "src/renderer/src/components/sidebar/worktree-lineage-expansion.performance.test.ts": 193,
+      "src/renderer/src/components/sidebar/worktree-lineage-projection.test.ts": 43,
+      "src/renderer/src/components/sidebar/worktree-lineage-toggle-handler-cache.test.ts": 56,
+      "src/renderer/src/components/sidebar/worktree-list-groups-host-collision.test.ts": 200,
+      "src/renderer/src/components/sidebar/worktree-list-groups-host-labels.test.ts": 238,
+      "src/renderer/src/components/sidebar/worktree-list-groups-imported-worktrees.test.ts": 243,
+      "src/renderer/src/components/sidebar/worktree-list-groups-lineage-nesting.test.ts": 173,
+      "src/renderer/src/components/sidebar/worktree-list-groups-nested-project-groups.test.ts": 187,
+      "src/renderer/src/components/sidebar/worktree-list-groups-notice-host-labels.test.ts": 208,
+      "src/renderer/src/components/sidebar/worktree-list-groups-pending-creations.test.ts": 365,
+      "src/renderer/src/components/sidebar/worktree-list-groups-pinned-host-labels.test.ts": 238,
+      "src/renderer/src/components/sidebar/worktree-list-groups-project-groups.test.ts": 226,
+      "src/renderer/src/components/sidebar/worktree-list-groups-project-host-setups.test.ts": 181,
+      "src/renderer/src/components/sidebar/worktree-list-groups-project-order.test.ts": 1153,
+      "src/renderer/src/components/sidebar/worktree-list-groups-section-label-disambiguation.test.ts": 221,
+      "src/renderer/src/components/sidebar/worktree-list/drag/pointer-flush.test.ts": 845,
+      "src/renderer/src/components/sidebar/worktree-list/drag/row-state.test.ts": 57,
+      "src/renderer/src/components/sidebar/worktree-list/grouping/build-rows.folder-workspace-lanes.test.ts": 240,
+      "src/renderer/src/components/sidebar/worktree-list/grouping/build-rows.test.ts": 319,
+      "src/renderer/src/components/sidebar/worktree-list/grouping/host-labels.test.ts": 58,
+      "src/renderer/src/components/sidebar/worktree-list/grouping/imported-rows.test.ts": 1449,
+      "src/renderer/src/components/sidebar/worktree-list/listing/host-filtering.test.ts": 37,
+      "src/renderer/src/components/sidebar/worktree-list/listing/pending-worktree-creation-keys.test.ts": 24,
+      "src/renderer/src/components/sidebar/worktree-list/listing/review-cache-inputs.test.ts": 54,
+      "src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.test.tsx": 1710,
+      "src/renderer/src/components/sidebar/worktree-list/navigation/active-descendant-option.test.ts": 235,
+      "src/renderer/src/components/sidebar/worktree-list/navigation/folder-reveal.test.ts": 231,
+      "src/renderer/src/components/sidebar/worktree-list/navigation/render-row-lookup.folder-workspace.test.ts": 253,
+      "src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.host-identity.test.tsx": 794,
+      "src/renderer/src/components/sidebar/worktree-list/navigation/use-reveal-requests.test.tsx": 883,
+      "src/renderer/src/components/sidebar/worktree-list/navigation/use-selection-host-collision.test.tsx": 2056,
+      "src/renderer/src/components/sidebar/worktree-list/rows/FolderPathStatusIndicator.test.tsx": 754,
+      "src/renderer/src/components/sidebar/worktree-list/rows/RepoScanUnavailableIndicator.test.tsx": 2106,
+      "src/renderer/src/components/sidebar/worktree-list/rows/indentation.test.ts": 65,
+      "src/renderer/src/components/sidebar/worktree-list/rows/option-dom-host-collision.test.ts": 475,
+      "src/renderer/src/components/sidebar/worktree-list/rows/use-project-group-dialogs-owner-host.test.tsx": 396,
+      "src/renderer/src/components/sidebar/worktree-list/viewport/hard-scroll-up.test.ts": 64,
+      "src/renderer/src/components/sidebar/worktree-list/viewport/scroll-adjustment.test.ts": 2365,
+      "src/renderer/src/components/sidebar/worktree-list/viewport/sticky-headers.test.ts": 303,
+      "src/renderer/src/components/sidebar/worktree-list/viewport/use-row-removal-animation.test.ts": 62,
+      "src/renderer/src/components/sidebar/worktree-list/viewport/use-scroll-to-top.test.ts": 496,
+      "src/renderer/src/components/sidebar/worktree-list/viewport/use-scroll-to-top.test.tsx": 401,
+      "src/renderer/src/components/sidebar/worktree-list/viewport/virtual-rows.test.ts": 254,
+      "src/renderer/src/components/sidebar/worktree-list/viewport/visible-refresh.test.ts": 1519,
+      "src/renderer/src/components/sidebar/worktree-manual-order-catalog.test.ts": 106,
+      "src/renderer/src/components/sidebar/worktree-manual-order-store-write.test.ts": 2148,
+      "src/renderer/src/components/sidebar/worktree-manual-order.test.ts": 386,
+      "src/renderer/src/components/sidebar/worktree-meta-updates.test.ts": 76,
+      "src/renderer/src/components/sidebar/worktree-multi-selection.test.ts": 27,
+      "src/renderer/src/components/sidebar/worktree-name-suggestions.test.ts": 168,
+      "src/renderer/src/components/sidebar/worktree-parent-eligibility.test.ts": 37,
+      "src/renderer/src/components/sidebar/worktree-review-helpers.test.tsx": 266,
+      "src/renderer/src/components/sidebar/worktree-scroll-to-current-button.test.ts": 254,
+      "src/renderer/src/components/sidebar/worktree-sidebar-drag-autoscroll.test.ts": 46,
+      "src/renderer/src/components/sidebar/worktree-sidebar-drag-geometry.test.ts": 77,
+      "src/renderer/src/components/sidebar/worktree-sidebar-drop-preview.test.ts": 56,
+      "src/renderer/src/components/sidebar/worktree-sidebar-pointer-drag-dom.test.ts": 337,
+      "src/renderer/src/components/sidebar/worktree-sidebar-reveal-scroll-settle.test.ts": 28,
+      "src/renderer/src/components/sidebar/worktree-sidebar-reveal.test.ts": 134,
+      "src/renderer/src/components/sidebar/worktree-sidebar-row-preference.test.ts": 152,
+      "src/renderer/src/components/sidebar/worktree-sort-label-ordering.test.ts": 172,
+      "src/renderer/src/components/sidebar/worktree-subagent-child-rows.test.ts": 47,
+      "src/renderer/src/components/sidebar/worktree-title-derived-agent-rows.test.ts": 164,
+      "src/renderer/src/components/sidebar/worktree-unambiguous-id-index.test.ts": 43,
+      "src/renderer/src/components/sidebar/worktree-unnest.test.ts": 103,
+      "src/renderer/src/components/sidebar/worktree-visibility-source-provenance.test.ts": 52,
+      "src/renderer/src/components/skills/SkillFreshnessNudge.test.tsx": 443,
+      "src/renderer/src/components/skills/SkillFreshnessStatusPill.test.tsx": 770,
+      "src/renderer/src/components/skills/SkillFreshnessUpdateDialog.test.tsx": 834,
+      "src/renderer/src/components/skills/SkillInstallAgentPicker.test.tsx": 869,
+      "src/renderer/src/components/skills/SkillInstallDialog.test.tsx": 4156,
+      "src/renderer/src/components/skills/SkillInstallManagementDialog.test.tsx": 3656,
+      "src/renderer/src/components/skills/SkillInstallTargetFields.test.tsx": 1232,
+      "src/renderer/src/components/skills/SkillInstallWorkspaceCombobox.test.tsx": 965,
+      "src/renderer/src/components/skills/SkillShareDialog.test.tsx": 2329,
+      "src/renderer/src/components/skills/SkillSharedLinkRow.test.tsx": 1251,
+      "src/renderer/src/components/skills/SkillsPage.test.tsx": 4219,
+      "src/renderer/src/components/skills/skill-agent-filter.test.ts": 202,
+      "src/renderer/src/components/skills/skill-bundle-name.test.ts": 122,
+      "src/renderer/src/components/skills/skill-bundle-retry-selection.test.ts": 47,
+      "src/renderer/src/components/skills/skill-delete-copy.test.ts": 69,
+      "src/renderer/src/components/skills/skill-delete-selection.test.ts": 229,
+      "src/renderer/src/components/skills/skill-description-length.test.ts": 52,
+      "src/renderer/src/components/skills/skill-freshness-grouping.test.ts": 67,
+      "src/renderer/src/components/skills/skill-freshness-skipped-reason.test.ts": 137,
+      "src/renderer/src/components/skills/skill-install-progress-state.test.tsx": 673,
+      "src/renderer/src/components/skills/skill-install-provider-groups.test.ts": 62,
+      "src/renderer/src/components/skills/skill-install-workspace-choices.test.ts": 25,
+      "src/renderer/src/components/skills/skill-package-checklist-items.test.ts": 81,
+      "src/renderer/src/components/skills/skill-package-digest.test.ts": 46,
+      "src/renderer/src/components/skills/skill-package-install-risk.test.ts": 55,
+      "src/renderer/src/components/skills/skill-share-link.test.ts": 36,
+      "src/renderer/src/components/skills/skill-share-package-selection.test.ts": 45,
+      "src/renderer/src/components/skills/skill-share-preview-summary.test.ts": 80,
+      "src/renderer/src/components/skills/skill-share-selection.test.ts": 91,
+      "src/renderer/src/components/skills/skill-source-inventory.test.ts": 61,
+      "src/renderer/src/components/skills/skills-filter.test.ts": 113,
+      "src/renderer/src/components/source-control/SourceControlActionVariableChips.test.tsx": 386,
+      "src/renderer/src/components/star-nag/StarNagAgentValueMomentObserver.test.tsx": 2099,
+      "src/renderer/src/components/star-nag/StarNagToastHost.test.tsx": 984,
+      "src/renderer/src/components/stats/CodexUsagePane.test.tsx": 840,
+      "src/renderer/src/components/stats/GrokUsagePane.test.tsx": 1024,
+      "src/renderer/src/components/stats/UsageBreakdownSection.test.tsx": 622,
+      "src/renderer/src/components/stats/UsageTrackingPaneShell.test.tsx": 858,
+      "src/renderer/src/components/stats/usage-daily-chart.test.tsx": 668,
+      "src/renderer/src/components/stats/usage-overview-model.test.ts": 531,
+      "src/renderer/src/components/status-bar/CaffeinateStatusSegment.localization.test.tsx": 1458,
+      "src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.test.tsx": 2493,
+      "src/renderer/src/components/status-bar/PetStatusSegment.layout.test.ts": 40,
+      "src/renderer/src/components/status-bar/PortsStatusSegment.host-routing.test.tsx": 620,
+      "src/renderer/src/components/status-bar/PortsStatusSegment.render-stability.test.tsx": 1943,
+      "src/renderer/src/components/status-bar/ResourceUsageStatusSegment.rows.test.tsx": 1928,
+      "src/renderer/src/components/status-bar/ResourceUsageStatusSegment.session-polling.test.ts": 50,
+      "src/renderer/src/components/status-bar/RuntimeHostStatusRow.test.tsx": 809,
+      "src/renderer/src/components/status-bar/SkillUpdateStatusSegment.test.tsx": 485,
+      "src/renderer/src/components/status-bar/SshStatusSegment.test.ts": 1996,
+      "src/renderer/src/components/status-bar/UpdateStatusSegment.test.tsx": 2381,
+      "src/renderer/src/components/status-bar/UsagePercentageDisplayChangeNotice.test.tsx": 794,
+      "src/renderer/src/components/status-bar/UsageRosterPanel.test.tsx": 1073,
+      "src/renderer/src/components/status-bar/codex-restart-status-summary.test.ts": 47,
+      "src/renderer/src/components/status-bar/codex-status-sign-in.test.tsx": 1799,
+      "src/renderer/src/components/status-bar/icons.test.tsx": 92,
+      "src/renderer/src/components/status-bar/inline-usage-bars.test.tsx": 754,
+      "src/renderer/src/components/status-bar/mergeSnapshotAndSessions.test.ts": 79,
+      "src/renderer/src/components/status-bar/ports-status-popover-rows.test.tsx": 742,
+      "src/renderer/src/components/status-bar/provider-account-sync-key.test.ts": 53,
+      "src/renderer/src/components/status-bar/provider-segment-monthly-window.test.tsx": 1108,
+      "src/renderer/src/components/status-bar/remote-host-connection-status.test.ts": 71,
+      "src/renderer/src/components/status-bar/resource-manager-terminal-copy.test.ts": 62,
+      "src/renderer/src/components/status-bar/resource-manager-worktree-target.test.ts": 53,
+      "src/renderer/src/components/status-bar/resource-memory-metric-copy.test.ts": 27,
+      "src/renderer/src/components/status-bar/resource-session-bindings.test.ts": 43,
+      "src/renderer/src/components/status-bar/resource-session-classification-parity.test.ts": 42,
+      "src/renderer/src/components/status-bar/resource-session-inventory.test.ts": 33,
+      "src/renderer/src/components/status-bar/resource-session-kill-confirmation.test.ts": 65,
+      "src/renderer/src/components/status-bar/resource-session-navigation.test.ts": 60,
+      "src/renderer/src/components/status-bar/resource-usage-folder-merge.test.ts": 94,
+      "src/renderer/src/components/status-bar/resource-usage-open-slices.test.ts": 1536,
+      "src/renderer/src/components/status-bar/resource-usage-space-scan-ready.test.ts": 61,
+      "src/renderer/src/components/status-bar/ssh-status-segment-copy.test.ts": 40,
+      "src/renderer/src/components/status-bar/status-bar-agent-gating.test.ts": 45,
+      "src/renderer/src/components/status-bar/status-bar-context-menu-policy.test.ts": 35,
+      "src/renderer/src/components/status-bar/status-bar-copy-localization.test.tsx": 1540,
+      "src/renderer/src/components/status-bar/status-bar-cursor-segment.test.tsx": 757,
+      "src/renderer/src/components/status-bar/status-bar-provider-menu-focus.test.tsx": 1039,
+      "src/renderer/src/components/status-bar/status-bar-provider-visibility.test.ts": 35,
+      "src/renderer/src/components/status-bar/status-bar-runtime-groups.test.ts": 1341,
+      "src/renderer/src/components/status-bar/tooltip.test.ts": 139,
+      "src/renderer/src/components/status-bar/usage-error-copy.test.ts": 65,
+      "src/renderer/src/components/status-bar/usage-percentage-label.test.ts": 38,
+      "src/renderer/src/components/status-bar/usage-provider-settings-target.test.ts": 37,
+      "src/renderer/src/components/status-bar/usage-roster-formatting.test.ts": 27,
+      "src/renderer/src/components/status-bar/usage-roster-row-state.test.ts": 53,
+      "src/renderer/src/components/status-bar/use-resource-session-inventory.test.tsx": 1022,
+      "src/renderer/src/components/status-bar/use-resource-usage-actions.test.tsx": 472,
+      "src/renderer/src/components/status-bar/use-resource-usage-derived-model.test.tsx": 823,
+      "src/renderer/src/components/status-bar/workspace-space-breakdown-list.test.tsx": 448,
+      "src/renderer/src/components/status-bar/workspace-space-delete-host-routing.test.ts": 43,
+      "src/renderer/src/components/status-bar/workspace-space-format.test.ts": 97,
+      "src/renderer/src/components/status-bar/workspace-space-layout.test.ts": 51,
+      "src/renderer/src/components/status-bar/workspace-space-manager-source-boundary.test.ts": 64,
+      "src/renderer/src/components/status-bar/workspace-space-presentation.test.ts": 217,
+      "src/renderer/src/components/tab-bar/BrowserTab.test.tsx": 1511,
+      "src/renderer/src/components/tab-bar/ClientHostedBrowserTabRows.test.tsx": 1260,
+      "src/renderer/src/components/tab-bar/EditorFileTab.test.tsx": 1020,
+      "src/renderer/src/components/tab-bar/EditorFileTabContextMenu.test.tsx": 660,
+      "src/renderer/src/components/tab-bar/QuickLaunchButton.test.ts": 667,
+      "src/renderer/src/components/tab-bar/RecentTabSwitcher.test.tsx": 660,
+      "src/renderer/src/components/tab-bar/SortableTab.rename-shortcut.test.tsx": 831,
+      "src/renderer/src/components/tab-bar/SortableTab.update-depth-probe.test.tsx": 1389,
+      "src/renderer/src/components/tab-bar/SortableTabContextMenu.test.tsx": 1143,
+      "src/renderer/src/components/tab-bar/TabBar.client-hosted-row-active-state.test.ts": 1679,
+      "src/renderer/src/components/tab-bar/TabBar.context-menu.test.ts": 2690,
+      "src/renderer/src/components/tab-bar/TabBar.windows-shell-launch.test.ts": 1682,
+      "src/renderer/src/components/tab-bar/TabBar.windows-shell-remote-runtime.test.ts": 1585,
+      "src/renderer/src/components/tab-bar/TabBar.windows-shell-ssh-host.test.ts": 1937,
+      "src/renderer/src/components/tab-bar/TabBar.worktree-write-gate.test.tsx": 1156,
+      "src/renderer/src/components/tab-bar/TabBar.worktree-write-gate.windows.test.tsx": 1568,
+      "src/renderer/src/components/tab-bar/TabBarCreateEntry.history.test.tsx": 1865,
+      "src/renderer/src/components/tab-bar/TabBarCreateEntry.keyboard.test.tsx": 2588,
+      "src/renderer/src/components/tab-bar/TabBarCreateEntry.search.test.tsx": 2749,
+      "src/renderer/src/components/tab-bar/TabBarCreateEntry.tab-results.test.tsx": 1967,
+      "src/renderer/src/components/tab-bar/TabBarCreateEntryRow.test.tsx": 1179,
+      "src/renderer/src/components/tab-bar/TabBarQuickCommandItem.test.tsx": 983,
       "src/renderer/src/components/tab-bar/TabBarQuickCommandsMenu.keyboard.test.ts": 100,
-      "src/renderer/src/components/tab-bar/TabStripScrollIndicator.test.tsx": 529,
-      "src/renderer/src/components/tab-bar/TerminalTabLeadingIcon.test.tsx": 409,
-      "src/renderer/src/components/tab-bar/client-hosted-browser-row-strip-placement.test.ts": 66,
-      "src/renderer/src/components/tab-bar/drop-indicator.test.ts": 44,
-      "src/renderer/src/components/tab-bar/editor-tab-local-open-guard.test.ts": 108,
-      "src/renderer/src/components/tab-bar/group-tab-order.test.ts": 1872,
-      "src/renderer/src/components/tab-bar/middle-button-default-guard.test.ts": 49,
-      "src/renderer/src/components/tab-bar/native-chat-tab-agent-evidence.test.ts": 71,
-      "src/renderer/src/components/tab-bar/open-tab-entry-dedupe.test.ts": 171,
-      "src/renderer/src/components/tab-bar/open-tab-search-retention.test.ts": 303,
-      "src/renderer/src/components/tab-bar/open-tab-search.test.ts": 308,
-      "src/renderer/src/components/tab-bar/open-tab-selection-routing.test.ts": 488,
-      "src/renderer/src/components/tab-bar/query-token-match.test.ts": 47,
-      "src/renderer/src/components/tab-bar/recent-tab-switching.test.ts": 76,
-      "src/renderer/src/components/tab-bar/reconcile-order.test.ts": 53,
-      "src/renderer/src/components/tab-bar/tab-agent-launch-options.test.ts": 131,
-      "src/renderer/src/components/tab-bar/tab-agent-types-by-tab-id.test.ts": 69,
-      "src/renderer/src/components/tab-bar/tab-bar-item-surface.client-hosted-active-state.test.tsx": 2161,
-      "src/renderer/src/components/tab-bar/tab-context-menu-consistency.test.tsx": 52,
-      "src/renderer/src/components/tab-bar/tab-create-entry-action.test.ts": 1312,
-      "src/renderer/src/components/tab-bar/tab-create-entry-classifier.runtime-listing.test.tsx": 1471,
-      "src/renderer/src/components/tab-bar/tab-create-entry-classifier.test.ts": 1119,
-      "src/renderer/src/components/tab-bar/tab-create-entry-file-matches.test.ts": 109,
-      "src/renderer/src/components/tab-bar/tab-create-entry-forced-search.test.ts": 78,
-      "src/renderer/src/components/tab-bar/tab-create-entry-history-placement.test.ts": 228,
-      "src/renderer/src/components/tab-bar/tab-create-entry-local-path.test.ts": 1970,
-      "src/renderer/src/components/tab-bar/tab-create-entry-url-classification.test.ts": 246,
-      "src/renderer/src/components/tab-bar/tab-create-menu-options.test.ts": 106,
-      "src/renderer/src/components/tab-bar/tab-move-to-pane-column.test.ts": 1453,
-      "src/renderer/src/components/tab-bar/tab-strip-content-resize-observers.test.ts": 454,
-      "src/renderer/src/components/tab-bar/tab-strip-overflow-navigation.test.ts": 34,
-      "src/renderer/src/components/tab-bar/tab-strip-pointer-activation.test.tsx": 2341,
-      "src/renderer/src/components/tab-bar/tab-strip-scroll-metrics.test.ts": 57,
-      "src/renderer/src/components/tab-bar/tab-title-tooltip.test.tsx": 1168,
-      "src/renderer/src/components/tab-bar/terminal-tab-activity-status.test.ts": 181,
-      "src/renderer/src/components/tab-bar/terminal-tab-spinner-launch-agent.test.ts": 94,
-      "src/renderer/src/components/tab-bar/use-open-tab-search.test.ts": 2002,
-      "src/renderer/src/components/tab-bar/use-tab-bar-quick-command-search-input.test.ts": 555,
-      "src/renderer/src/components/tab-bar/windows-shell-launch.test.ts": 64,
-      "src/renderer/src/components/tab-bar/windows-shell-menu-visibility.test.ts": 65,
-      "src/renderer/src/components/tab-group/RetainedPaneHost.test.tsx": 565,
-      "src/renderer/src/components/tab-group/TabGroupPanel.context-menu.test.ts": 46,
-      "src/renderer/src/components/tab-group/TabGroupSplitLayout.drag.test.tsx": 718,
-      "src/renderer/src/components/tab-group/TabGroupSplitLayout.test.ts": 314,
-      "src/renderer/src/components/tab-group/TabPaneColumnSplitDragOverlay.test.tsx": 91,
-      "src/renderer/src/components/tab-group/tab-drag-pointer-sensor.test.ts": 407,
-      "src/renderer/src/components/tab-group/tab-drag-pointer.test.ts": 49,
-      "src/renderer/src/components/tab-group/tab-drag-preview-activation.test.ts": 1224,
-      "src/renderer/src/components/tab-group/tab-drag-retained-guest-passthrough.test.tsx": 2209,
-      "src/renderer/src/components/tab-group/tab-drop-zone.test.ts": 22,
-      "src/renderer/src/components/tab-group/tab-group-body-anchor.test.ts": 44,
-      "src/renderer/src/components/tab-group/tab-group-panel-split-target.test.ts": 82,
-      "src/renderer/src/components/tab-group/tab-insertion.test.ts": 57,
-      "src/renderer/src/components/tab-group/useTabDragSplit.test.ts": 1978,
-      "src/renderer/src/components/tab-group/useTabGroupCreationCommands.local-shell.test.ts": 772,
-      "src/renderer/src/components/tab-group/useTabGroupTabCloseCommands.structured-session.test.ts": 383,
-      "src/renderer/src/components/tab-group/useTabGroupTabCloseCommands.test.tsx": 2132,
-      "src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.focus.test.ts": 1093,
-      "src/renderer/src/components/task-drawer-source-boundary.test.ts": 54,
-      "src/renderer/src/components/task-page-cache-selectors.test.ts": 77,
-      "src/renderer/src/components/task-page-checks-pill.test.ts": 34,
-      "src/renderer/src/components/task-page-default-repo-selection.test.ts": 76,
-      "src/renderer/src/components/task-page-empty-state.test.ts": 71,
-      "src/renderer/src/components/task-page-github-dialog-state-authority.test.ts": 173,
-      "src/renderer/src/components/task-page-github-issue-creation.test.ts": 345,
-      "src/renderer/src/components/task-page-github-list-scroll-restore.test.ts": 371,
-      "src/renderer/src/components/task-page-github-resume-cache.test.ts": 51,
-      "src/renderer/src/components/task-page-github-reviewer-suggestions.test.ts": 83,
-      "src/renderer/src/components/task-page-github-status-actions.test.ts": 63,
-      "src/renderer/src/components/task-page-github-status-state.test.ts": 46,
-      "src/renderer/src/components/task-page-github-task-kind.test.ts": 75,
-      "src/renderer/src/components/task-page-github-work-item-filter-membership.test.ts": 53,
-      "src/renderer/src/components/task-page-github-work-item-mutation-patches.test.ts": 77,
-      "src/renderer/src/components/task-page-github-work-item-mutation-regressions.test.ts": 100,
-      "src/renderer/src/components/task-page-github-work-item-mutations.test.ts": 198,
-      "src/renderer/src/components/task-page-github-work-item-status.test.ts": 71,
-      "src/renderer/src/components/task-page-gitlab-task-filters.test.ts": 1655,
-      "src/renderer/src/components/task-page-initial-selection-scaling.test.tsx": 1626,
-      "src/renderer/src/components/task-page-jira-cache-selectors.test.ts": 32,
-      "src/renderer/src/components/task-page-jira-create-fields.test.ts": 52,
-      "src/renderer/src/components/task-page-jira-grouping.test.ts": 1169,
-      "src/renderer/src/components/task-page-jira-item-source-context.test.ts": 57,
-      "src/renderer/src/components/task-page-jira-load-state.test.ts": 41,
-      "src/renderer/src/components/task-page-jira-project-selection.test.ts": 87,
-      "src/renderer/src/components/task-page-jira-sort-controls.test.tsx": 1301,
-      "src/renderer/src/components/task-page-jira-sorting.test.ts": 244,
-      "src/renderer/src/components/task-page-linear-in-orca-issues.test.ts": 67,
-      "src/renderer/src/components/task-page-linear-issue-dialog-popover-scroll.test.ts": 36,
-      "src/renderer/src/components/task-page-linear-issue-empty-state.test.ts": 44,
-      "src/renderer/src/components/task-page-linear-issue-grouping.test.ts": 1157,
-      "src/renderer/src/components/task-page-linear-issue-request.test.ts": 59,
+      "src/renderer/src/components/tab-bar/TabStripScrollIndicator.test.tsx": 608,
+      "src/renderer/src/components/tab-bar/TerminalTabLeadingIcon.test.tsx": 313,
+      "src/renderer/src/components/tab-bar/client-hosted-browser-row-strip-placement.test.ts": 44,
+      "src/renderer/src/components/tab-bar/drop-indicator.test.ts": 50,
+      "src/renderer/src/components/tab-bar/editor-tab-local-open-guard.test.ts": 68,
+      "src/renderer/src/components/tab-bar/group-tab-order.test.ts": 1929,
+      "src/renderer/src/components/tab-bar/middle-button-default-guard.test.ts": 31,
+      "src/renderer/src/components/tab-bar/native-chat-tab-agent-evidence.test.ts": 52,
+      "src/renderer/src/components/tab-bar/open-tab-entry-dedupe.test.ts": 152,
+      "src/renderer/src/components/tab-bar/open-tab-search-retention.test.ts": 450,
+      "src/renderer/src/components/tab-bar/open-tab-search.test.ts": 353,
+      "src/renderer/src/components/tab-bar/open-tab-selection-routing.test.ts": 625,
+      "src/renderer/src/components/tab-bar/query-token-match.test.ts": 48,
+      "src/renderer/src/components/tab-bar/recent-tab-switching.test.ts": 59,
+      "src/renderer/src/components/tab-bar/reconcile-order.test.ts": 52,
+      "src/renderer/src/components/tab-bar/tab-agent-launch-options.test.ts": 99,
+      "src/renderer/src/components/tab-bar/tab-agent-types-by-tab-id.test.ts": 80,
+      "src/renderer/src/components/tab-bar/tab-bar-item-surface.client-hosted-active-state.test.tsx": 2562,
+      "src/renderer/src/components/tab-bar/tab-context-menu-consistency.test.tsx": 42,
+      "src/renderer/src/components/tab-bar/tab-create-entry-action.test.ts": 1242,
+      "src/renderer/src/components/tab-bar/tab-create-entry-classifier.runtime-listing.test.tsx": 2034,
+      "src/renderer/src/components/tab-bar/tab-create-entry-classifier.test.ts": 1823,
+      "src/renderer/src/components/tab-bar/tab-create-entry-file-matches.test.ts": 93,
+      "src/renderer/src/components/tab-bar/tab-create-entry-forced-search.test.ts": 33,
+      "src/renderer/src/components/tab-bar/tab-create-entry-history-placement.test.ts": 158,
+      "src/renderer/src/components/tab-bar/tab-create-entry-local-path.test.ts": 1887,
+      "src/renderer/src/components/tab-bar/tab-create-entry-url-classification.test.ts": 194,
+      "src/renderer/src/components/tab-bar/tab-create-menu-options.test.ts": 75,
+      "src/renderer/src/components/tab-bar/tab-move-to-pane-column.test.ts": 1424,
+      "src/renderer/src/components/tab-bar/tab-strip-content-resize-observers.test.ts": 236,
+      "src/renderer/src/components/tab-bar/tab-strip-overflow-navigation.test.ts": 73,
+      "src/renderer/src/components/tab-bar/tab-strip-pointer-activation.test.tsx": 1784,
+      "src/renderer/src/components/tab-bar/tab-strip-scroll-metrics.test.ts": 38,
+      "src/renderer/src/components/tab-bar/tab-title-tooltip.test.tsx": 1090,
+      "src/renderer/src/components/tab-bar/terminal-tab-activity-status.test.ts": 131,
+      "src/renderer/src/components/tab-bar/terminal-tab-spinner-launch-agent.test.ts": 53,
+      "src/renderer/src/components/tab-bar/use-open-tab-search.test.ts": 1977,
+      "src/renderer/src/components/tab-bar/use-tab-bar-quick-command-search-input.test.ts": 425,
+      "src/renderer/src/components/tab-bar/windows-shell-launch.test.ts": 29,
+      "src/renderer/src/components/tab-bar/windows-shell-menu-visibility.test.ts": 53,
+      "src/renderer/src/components/tab-group/RetainedPaneHost.test.tsx": 528,
+      "src/renderer/src/components/tab-group/TabGroupPanel.context-menu.test.ts": 35,
+      "src/renderer/src/components/tab-group/TabGroupSplitLayout.drag.test.tsx": 662,
+      "src/renderer/src/components/tab-group/TabGroupSplitLayout.test.ts": 319,
+      "src/renderer/src/components/tab-group/TabPaneColumnSplitDragOverlay.test.tsx": 110,
+      "src/renderer/src/components/tab-group/tab-drag-pointer-sensor.test.ts": 527,
+      "src/renderer/src/components/tab-group/tab-drag-pointer.test.ts": 41,
+      "src/renderer/src/components/tab-group/tab-drag-preview-activation.test.ts": 1253,
+      "src/renderer/src/components/tab-group/tab-drag-retained-guest-passthrough.test.tsx": 2070,
+      "src/renderer/src/components/tab-group/tab-drop-zone.test.ts": 38,
+      "src/renderer/src/components/tab-group/tab-group-body-anchor.test.ts": 38,
+      "src/renderer/src/components/tab-group/tab-group-panel-split-target.test.ts": 84,
+      "src/renderer/src/components/tab-group/tab-insertion.test.ts": 50,
+      "src/renderer/src/components/tab-group/useTabDragSplit.test.ts": 1851,
+      "src/renderer/src/components/tab-group/useTabGroupCreationCommands.local-shell.test.ts": 734,
+      "src/renderer/src/components/tab-group/useTabGroupTabCloseCommands.structured-session.test.ts": 263,
+      "src/renderer/src/components/tab-group/useTabGroupTabCloseCommands.test.tsx": 2028,
+      "src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.focus.test.ts": 1358,
+      "src/renderer/src/components/task-drawer-source-boundary.test.ts": 40,
+      "src/renderer/src/components/task-page-cache-selectors.test.ts": 102,
+      "src/renderer/src/components/task-page-checks-pill.test.ts": 31,
+      "src/renderer/src/components/task-page-default-repo-selection.test.ts": 55,
+      "src/renderer/src/components/task-page-empty-state.test.ts": 95,
+      "src/renderer/src/components/task-page-github-dialog-state-authority.test.ts": 376,
+      "src/renderer/src/components/task-page-github-issue-creation.test.ts": 401,
+      "src/renderer/src/components/task-page-github-list-scroll-restore.test.ts": 277,
+      "src/renderer/src/components/task-page-github-resume-cache.test.ts": 52,
+      "src/renderer/src/components/task-page-github-reviewer-suggestions.test.ts": 50,
+      "src/renderer/src/components/task-page-github-status-actions.test.ts": 52,
+      "src/renderer/src/components/task-page-github-status-state.test.ts": 56,
+      "src/renderer/src/components/task-page-github-task-kind.test.ts": 56,
+      "src/renderer/src/components/task-page-github-work-item-filter-membership.test.ts": 51,
+      "src/renderer/src/components/task-page-github-work-item-mutation-patches.test.ts": 41,
+      "src/renderer/src/components/task-page-github-work-item-mutation-regressions.test.ts": 92,
+      "src/renderer/src/components/task-page-github-work-item-mutations.test.ts": 123,
+      "src/renderer/src/components/task-page-github-work-item-status.test.ts": 61,
+      "src/renderer/src/components/task-page-gitlab-task-filters.test.ts": 1702,
+      "src/renderer/src/components/task-page-initial-selection-scaling.test.tsx": 1727,
+      "src/renderer/src/components/task-page-jira-cache-selectors.test.ts": 56,
+      "src/renderer/src/components/task-page-jira-create-fields.test.ts": 51,
+      "src/renderer/src/components/task-page-jira-grouping.test.ts": 1262,
+      "src/renderer/src/components/task-page-jira-item-source-context.test.ts": 29,
+      "src/renderer/src/components/task-page-jira-load-state.test.ts": 55,
+      "src/renderer/src/components/task-page-jira-project-selection.test.ts": 57,
+      "src/renderer/src/components/task-page-jira-sort-controls.test.tsx": 932,
+      "src/renderer/src/components/task-page-jira-sorting.test.ts": 236,
+      "src/renderer/src/components/task-page-linear-in-orca-issues.test.ts": 79,
+      "src/renderer/src/components/task-page-linear-issue-dialog-popover-scroll.test.ts": 35,
+      "src/renderer/src/components/task-page-linear-issue-empty-state.test.ts": 45,
+      "src/renderer/src/components/task-page-linear-issue-grouping.test.ts": 966,
+      "src/renderer/src/components/task-page-linear-issue-request.test.ts": 52,
       "src/renderer/src/components/task-page-linear-team-selection.test.ts": 45,
-      "src/renderer/src/components/task-page-list-chrome-visibility.test.ts": 39,
-      "src/renderer/src/components/task-page-localized-options.test.ts": 379,
-      "src/renderer/src/components/task-page-mutation-page-allocation.test.ts": 88,
-      "src/renderer/src/components/task-page-new-issue-draft.test.ts": 51,
-      "src/renderer/src/components/task-page-pagination-page-numbers.test.ts": 40,
-      "src/renderer/src/components/task-page-pr-check-summary.test.ts": 47,
-      "src/renderer/src/components/task-page-repo-source-context.test.ts": 1212,
-      "src/renderer/src/components/task-page-repo-source-divergence.test.ts": 1469,
-      "src/renderer/src/components/task-page-source-switch-boundary.test.ts": 385,
-      "src/renderer/src/components/task-page-task-creation-drafts.test.ts": 415,
-      "src/renderer/src/components/task-page-task-source-host-availability.test.ts": 1598,
-      "src/renderer/src/components/task-page-work-item-pagination.test.ts": 85,
-      "src/renderer/src/components/task-page-workspace-composer-boundary.test.ts": 392,
-      "src/renderer/src/components/task-source-context-summary.test.ts": 132,
-      "src/renderer/src/components/task-source-provider-availability.test.ts": 41,
-      "src/renderer/src/components/terminal-pane/CloseTerminalDialog.test.tsx": 771,
-      "src/renderer/src/components/terminal-pane/MobileDriverOverlay.test.tsx": 453,
-      "src/renderer/src/components/terminal-pane/PinnedTabCloseDialog.test.tsx": 2180,
-      "src/renderer/src/components/terminal-pane/RunningTerminalCloseDialog.test.tsx": 1697,
-      "src/renderer/src/components/terminal-pane/SessionRestoredBanner.test.tsx": 491,
-      "src/renderer/src/components/terminal-pane/TerminalAgentSessionForkDialog.test.tsx": 280,
-      "src/renderer/src/components/terminal-pane/TerminalContextMenu.test.tsx": 1989,
-      "src/renderer/src/components/terminal-pane/TerminalErrorToast.test.ts": 1049,
-      "src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx": 1526,
-      "src/renderer/src/components/terminal-pane/TerminalPaneNativeChatPortal.test.tsx": 336,
-      "src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.react185.test.tsx": 878,
-      "src/renderer/src/components/terminal-pane/TerminalProcessExitOverlay.test.tsx": 945,
-      "src/renderer/src/components/terminal-pane/TerminalRemoteRuntimeReconnectBanner.test.tsx": 1070,
-      "src/renderer/src/components/terminal-pane/TerminalSshReconnectOverlay.test.tsx": 1482,
-      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-attention-dispatch.test.ts": 187,
-      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-completion-replay-guard.test.ts": 178,
-      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-dispose-leak.test.ts": 135,
-      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-hook-done-quiet-window.test.ts": 191,
-      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-hook-title-precedence.test.ts": 168,
-      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-monitoring-turn-end.test.ts": 235,
-      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-pending-title-inspection.test.ts": 134,
-      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-process-cadence.test.ts": 191,
-      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-queued-inspection-disposal.test.ts": 174,
-      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-stamped-turn-boundary.test.ts": 139,
-      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-stamped-turn-replay.test.ts": 183,
-      "src/renderer/src/components/terminal-pane/agent-completion-no-evidence-cadence.test.ts": 1571,
-      "src/renderer/src/components/terminal-pane/agent-completion-poll-interval.test.ts": 226,
-      "src/renderer/src/components/terminal-pane/agent-completion-stale-evidence-backoff.test.ts": 110,
-      "src/renderer/src/components/terminal-pane/agent-completion-steady-state-opt-in.test.ts": 163,
-      "src/renderer/src/components/terminal-pane/agent-hook-terminal-lifecycle.test.ts": 40,
-      "src/renderer/src/components/terminal-pane/agent-interrupt-inference.test.ts": 107,
-      "src/renderer/src/components/terminal-pane/agent-process-inspection-queue-rejection-containment.test.ts": 41,
+      "src/renderer/src/components/task-page-list-chrome-visibility.test.ts": 41,
+      "src/renderer/src/components/task-page-localized-options.test.ts": 264,
+      "src/renderer/src/components/task-page-mutation-page-allocation.test.ts": 50,
+      "src/renderer/src/components/task-page-new-issue-draft.test.ts": 64,
+      "src/renderer/src/components/task-page-pagination-page-numbers.test.ts": 60,
+      "src/renderer/src/components/task-page-pr-check-summary.test.ts": 40,
+      "src/renderer/src/components/task-page-repo-source-context.test.ts": 1554,
+      "src/renderer/src/components/task-page-repo-source-divergence.test.ts": 1245,
+      "src/renderer/src/components/task-page-source-switch-boundary.test.ts": 258,
+      "src/renderer/src/components/task-page-task-creation-drafts.test.ts": 407,
+      "src/renderer/src/components/task-page-task-source-host-availability.test.ts": 1030,
+      "src/renderer/src/components/task-page-work-item-pagination.test.ts": 70,
+      "src/renderer/src/components/task-page-workspace-composer-boundary.test.ts": 463,
+      "src/renderer/src/components/task-source-context-summary.test.ts": 58,
+      "src/renderer/src/components/task-source-provider-availability.test.ts": 60,
+      "src/renderer/src/components/terminal-pane/CloseTerminalDialog.test.tsx": 1022,
+      "src/renderer/src/components/terminal-pane/MobileDriverOverlay.test.tsx": 466,
+      "src/renderer/src/components/terminal-pane/PinnedTabCloseDialog.test.tsx": 2509,
+      "src/renderer/src/components/terminal-pane/RunningTerminalCloseDialog.test.tsx": 1716,
+      "src/renderer/src/components/terminal-pane/SessionRestoredBanner.test.tsx": 306,
+      "src/renderer/src/components/terminal-pane/TerminalAgentSessionForkDialog.test.tsx": 220,
+      "src/renderer/src/components/terminal-pane/TerminalContextMenu.test.tsx": 1724,
+      "src/renderer/src/components/terminal-pane/TerminalErrorToast.test.ts": 911,
+      "src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx": 1966,
+      "src/renderer/src/components/terminal-pane/TerminalPaneNativeChatPortal.test.tsx": 684,
+      "src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.react185.test.tsx": 1403,
+      "src/renderer/src/components/terminal-pane/TerminalProcessExitOverlay.test.tsx": 513,
+      "src/renderer/src/components/terminal-pane/TerminalRemoteRuntimeReconnectBanner.test.tsx": 580,
+      "src/renderer/src/components/terminal-pane/TerminalSshReconnectOverlay.test.tsx": 1805,
+      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-attention-dispatch.test.ts": 217,
+      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-completion-replay-guard.test.ts": 147,
+      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-dispose-leak.test.ts": 170,
+      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-hook-done-quiet-window.test.ts": 104,
+      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-hook-title-precedence.test.ts": 135,
+      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-monitoring-turn-end.test.ts": 186,
+      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-pending-title-inspection.test.ts": 168,
+      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-process-cadence.test.ts": 170,
+      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-queued-inspection-disposal.test.ts": 119,
+      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-stamped-turn-boundary.test.ts": 102,
+      "src/renderer/src/components/terminal-pane/agent-completion-coordinator-stamped-turn-replay.test.ts": 181,
+      "src/renderer/src/components/terminal-pane/agent-completion-no-evidence-cadence.test.ts": 966,
+      "src/renderer/src/components/terminal-pane/agent-completion-poll-interval.test.ts": 217,
+      "src/renderer/src/components/terminal-pane/agent-completion-stale-evidence-backoff.test.ts": 112,
+      "src/renderer/src/components/terminal-pane/agent-completion-steady-state-opt-in.test.ts": 123,
+      "src/renderer/src/components/terminal-pane/agent-hook-terminal-lifecycle.test.ts": 50,
+      "src/renderer/src/components/terminal-pane/agent-interrupt-inference.test.ts": 135,
+      "src/renderer/src/components/terminal-pane/agent-process-inspection-queue-rejection-containment.test.ts": 46,
       "src/renderer/src/components/terminal-pane/agent-process-inspection-round.test.ts": 48,
-      "src/renderer/src/components/terminal-pane/agent-question-answered-inference.test.ts": 86,
-      "src/renderer/src/components/terminal-pane/cache-timer-seeding.test.ts": 78,
-      "src/renderer/src/components/terminal-pane/codex-backfill-error-detector.test.ts": 40,
-      "src/renderer/src/components/terminal-pane/codex-detached-pane-restart.test.ts": 1802,
-      "src/renderer/src/components/terminal-pane/command-code-done-settle.test.ts": 45,
+      "src/renderer/src/components/terminal-pane/agent-question-answered-inference.test.ts": 52,
+      "src/renderer/src/components/terminal-pane/cache-timer-seeding.test.ts": 84,
+      "src/renderer/src/components/terminal-pane/codex-backfill-error-detector.test.ts": 24,
+      "src/renderer/src/components/terminal-pane/codex-detached-pane-restart.test.ts": 1008,
+      "src/renderer/src/components/terminal-pane/command-code-done-settle.test.ts": 66,
       "src/renderer/src/components/terminal-pane/command-code-output-ownership.test.ts": 34,
-      "src/renderer/src/components/terminal-pane/compose-active-terminal-theme.test.ts": 94,
-      "src/renderer/src/components/terminal-pane/deferred-reattach-live-data-queue.test.ts": 184,
-      "src/renderer/src/components/terminal-pane/deferred-split-pane-handoff.test.ts": 73,
-      "src/renderer/src/components/terminal-pane/desktop-fit-fallback.test.ts": 54,
-      "src/renderer/src/components/terminal-pane/direct-ssh-hidden-output-restore-unavailable-banner.test.ts": 1285,
-      "src/renderer/src/components/terminal-pane/edge-wrapped-terminal-http-links.test.ts": 2292,
-      "src/renderer/src/components/terminal-pane/expand-collapse-render-stability.test.ts": 2300,
-      "src/renderer/src/components/terminal-pane/expand-collapse.test.ts": 85,
-      "src/renderer/src/components/terminal-pane/focus-terminal-pane-event.test.ts": 65,
-      "src/renderer/src/components/terminal-pane/focused-pane-rim-flash.test.ts": 69,
-      "src/renderer/src/components/terminal-pane/git-bash-console-capacity.test.ts": 39,
-      "src/renderer/src/components/terminal-pane/hard-wrapped-terminal-http-links.test.ts": 74,
-      "src/renderer/src/components/terminal-pane/hidden-output-restore-scheduler.test.ts": 50,
-      "src/renderer/src/components/terminal-pane/hidden-reveal-reconciliation.fuzz.test.ts": 7992,
+      "src/renderer/src/components/terminal-pane/compose-active-terminal-theme.test.ts": 93,
+      "src/renderer/src/components/terminal-pane/deferred-reattach-live-data-queue.test.ts": 144,
+      "src/renderer/src/components/terminal-pane/deferred-split-pane-handoff.test.ts": 50,
+      "src/renderer/src/components/terminal-pane/desktop-fit-fallback.test.ts": 61,
+      "src/renderer/src/components/terminal-pane/direct-ssh-hidden-output-restore-unavailable-banner.test.ts": 921,
+      "src/renderer/src/components/terminal-pane/edge-wrapped-terminal-http-links.test.ts": 1446,
+      "src/renderer/src/components/terminal-pane/expand-collapse-render-stability.test.ts": 2192,
+      "src/renderer/src/components/terminal-pane/expand-collapse.test.ts": 86,
+      "src/renderer/src/components/terminal-pane/focus-terminal-pane-event.test.ts": 43,
+      "src/renderer/src/components/terminal-pane/focused-pane-rim-flash.test.ts": 47,
+      "src/renderer/src/components/terminal-pane/git-bash-console-capacity.test.ts": 40,
+      "src/renderer/src/components/terminal-pane/hard-wrapped-terminal-http-links.test.ts": 69,
+      "src/renderer/src/components/terminal-pane/hidden-output-restore-scheduler.test.ts": 73,
+      "src/renderer/src/components/terminal-pane/hidden-reveal-reconciliation.fuzz.test.ts": 7285,
       "src/renderer/src/components/terminal-pane/issue-12112-agent-pane-startup-color-reply-leak.repro.test.ts": 220,
-      "src/renderer/src/components/terminal-pane/issue-21762-tracking-mode-middle-click-double-paste.repro.test.ts": 549,
-      "src/renderer/src/components/terminal-pane/issue-4631-terminal-hover-link-provider.repro.test.ts": 733,
-      "src/renderer/src/components/terminal-pane/keyboard-handlers-ime-composing-chord.test.tsx": 2360,
-      "src/renderer/src/components/terminal-pane/keyboard-handlers-ime-enter-keyup.test.tsx": 2220,
-      "src/renderer/src/components/terminal-pane/keyboard-handlers-ime.test.tsx": 2711,
-      "src/renderer/src/components/terminal-pane/keyboard-handlers.test.ts": 1751,
-      "src/renderer/src/components/terminal-pane/layout-serialization.test.ts": 49,
-      "src/renderer/src/components/terminal-pane/leaf-scrollback-resolution.test.ts": 199,
+      "src/renderer/src/components/terminal-pane/issue-21762-tracking-mode-middle-click-double-paste.repro.test.ts": 657,
+      "src/renderer/src/components/terminal-pane/issue-4631-terminal-hover-link-provider.repro.test.ts": 769,
+      "src/renderer/src/components/terminal-pane/keyboard-handlers-ime-composing-chord.test.tsx": 2192,
+      "src/renderer/src/components/terminal-pane/keyboard-handlers-ime-enter-keyup.test.tsx": 2539,
+      "src/renderer/src/components/terminal-pane/keyboard-handlers-ime.test.tsx": 2043,
+      "src/renderer/src/components/terminal-pane/keyboard-handlers.test.ts": 1892,
+      "src/renderer/src/components/terminal-pane/layout-serialization.test.ts": 78,
+      "src/renderer/src/components/terminal-pane/leaf-scrollback-resolution.test.ts": 204,
       "src/renderer/src/components/terminal-pane/manual-terminal-worktree-park-eligibility.test.ts": 1568,
-      "src/renderer/src/components/terminal-pane/merge-captured-leaf-state.test.ts": 36,
-      "src/renderer/src/components/terminal-pane/mobile-driver-overlay-collapse.test.ts": 45,
-      "src/renderer/src/components/terminal-pane/mobile-driver-overlay-focus.test.ts": 40,
-      "src/renderer/src/components/terminal-pane/mobile-driver-overlay-visibility.test.ts": 33,
-      "src/renderer/src/components/terminal-pane/mouse-hide-while-typing.test.ts": 52,
-      "src/renderer/src/components/terminal-pane/native-chat-leaf-title-agent.test.ts": 88,
-      "src/renderer/src/components/terminal-pane/osc52-clipboard-default-on-notice.test.ts": 662,
-      "src/renderer/src/components/terminal-pane/osc52-clipboard-toast.test.ts": 987,
-      "src/renderer/src/components/terminal-pane/osc52-clipboard.test.ts": 134,
+      "src/renderer/src/components/terminal-pane/merge-captured-leaf-state.test.ts": 39,
+      "src/renderer/src/components/terminal-pane/mobile-driver-overlay-collapse.test.ts": 29,
+      "src/renderer/src/components/terminal-pane/mobile-driver-overlay-focus.test.ts": 50,
+      "src/renderer/src/components/terminal-pane/mobile-driver-overlay-visibility.test.ts": 50,
+      "src/renderer/src/components/terminal-pane/mouse-hide-while-typing.test.ts": 53,
+      "src/renderer/src/components/terminal-pane/native-chat-leaf-title-agent.test.ts": 83,
+      "src/renderer/src/components/terminal-pane/osc52-clipboard-default-on-notice.test.ts": 389,
+      "src/renderer/src/components/terminal-pane/osc52-clipboard-toast.test.ts": 621,
+      "src/renderer/src/components/terminal-pane/osc52-clipboard.test.ts": 130,
       "src/renderer/src/components/terminal-pane/override-affected-panes.test.ts": 49,
-      "src/renderer/src/components/terminal-pane/paired-parking-unverifiable-host.test.ts": 48,
-      "src/renderer/src/components/terminal-pane/paired-reconnect-multi-pane-materialization.test.ts": 2109,
-      "src/renderer/src/components/terminal-pane/pane-agent-session-id.test.ts": 51,
-      "src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.test.ts": 895,
-      "src/renderer/src/components/terminal-pane/pane-foreground-inspect-observation-identity.test.ts": 63,
-      "src/renderer/src/components/terminal-pane/pane-helpers.test.ts": 66,
-      "src/renderer/src/components/terminal-pane/pane-restart-transport-handoff.test.ts": 1811,
-      "src/renderer/src/components/terminal-pane/pane-title-overlay-rects.test.ts": 43,
-      "src/renderer/src/components/terminal-pane/pane-title-update-global-scan-budget.test.tsx": 2611,
-      "src/renderer/src/components/terminal-pane/parked-terminal-buffer-capture.test.ts": 219,
-      "src/renderer/src/components/terminal-pane/parked-terminal-byte-watcher.test.ts": 2458,
-      "src/renderer/src/components/terminal-pane/parked-terminal-command-status.test.ts": 89,
-      "src/renderer/src/components/terminal-pane/parked-terminal-tab-capture-episodes.test.ts": 225,
-      "src/renderer/src/components/terminal-pane/parse-osc7.test.ts": 52,
-      "src/renderer/src/components/terminal-pane/pending-pane-close-confirmation.test.ts": 1158,
-      "src/renderer/src/components/terminal-pane/pending-runtime-pane-close.test.ts": 827,
-      "src/renderer/src/components/terminal-pane/pending-split-close.test.ts": 907,
-      "src/renderer/src/components/terminal-pane/pty-buffer-serializer.test.ts": 54,
-      "src/renderer/src/components/terminal-pane/pty-connection-agent-session-resume.test.ts": 1821,
-      "src/renderer/src/components/terminal-pane/pty-connection-cold-restore-agent-resume.test.ts": 1538,
-      "src/renderer/src/components/terminal-pane/pty-connection-cold-restore-repaint.test.ts": 982,
-      "src/renderer/src/components/terminal-pane/pty-connection-cold-restore-resume-command.test.ts": 1447,
-      "src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.test.ts": 4219,
-      "src/renderer/src/components/terminal-pane/pty-connection-daemon-snapshot-replay.test.ts": 3476,
-      "src/renderer/src/components/terminal-pane/pty-connection-deferred-reattach-live-output.test.ts": 1732,
-      "src/renderer/src/components/terminal-pane/pty-connection-deferred-ssh-passphrase.test.ts": 1469,
-      "src/renderer/src/components/terminal-pane/pty-connection-deliberate-sleep-guard.test.ts": 1115,
-      "src/renderer/src/components/terminal-pane/pty-connection-direct-ssh-reattach-retry.test.ts": 1225,
-      "src/renderer/src/components/terminal-pane/pty-connection-direct-ssh-spawn-retry.test.ts": 1467,
-      "src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-routing.test.ts": 1638,
-      "src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-sampling.test.ts": 2182,
-      "src/renderer/src/components/terminal-pane/pty-connection-foreground-routing-confirmation.test.ts": 1304,
-      "src/renderer/src/components/terminal-pane/pty-connection-foreground-write-path.test.ts": 1664,
-      "src/renderer/src/components/terminal-pane/pty-connection-fresh-spawn-guards.test.ts": 1544,
-      "src/renderer/src/components/terminal-pane/pty-connection-hibernation-wake.test.ts": 2248,
-      "src/renderer/src/components/terminal-pane/pty-connection-hidden-atlas-recovery.test.ts": 1720,
-      "src/renderer/src/components/terminal-pane/pty-connection-hidden-backlog-reconciliation.test.ts": 1267,
-      "src/renderer/src/components/terminal-pane/pty-connection-hidden-backlog-snapshot.test.ts": 1850,
-      "src/renderer/src/components/terminal-pane/pty-connection-hidden-codex-queries.test.ts": 1593,
-      "src/renderer/src/components/terminal-pane/pty-connection-hidden-delivery-gate.test.ts": 1773,
-      "src/renderer/src/components/terminal-pane/pty-connection-hidden-output-restore.test.ts": 884,
-      "src/renderer/src/components/terminal-pane/pty-connection-hidden-query-snapshot-restore.test.ts": 1055,
-      "src/renderer/src/components/terminal-pane/pty-connection-hidden-restore-fit-overflow.test.ts": 833,
-      "src/renderer/src/components/terminal-pane/pty-connection-hidden-snapshot-live-overlap.test.ts": 958,
-      "src/renderer/src/components/terminal-pane/pty-connection-hidden-snapshot-resize-signals.test.ts": 2549,
-      "src/renderer/src/components/terminal-pane/pty-connection-hidden-tui-snapshot-replay.test.ts": 848,
-      "src/renderer/src/components/terminal-pane/pty-connection-hook-completion-bell-arbitration.test.ts": 952,
-      "src/renderer/src/components/terminal-pane/pty-connection-hook-completion-side-effects.test.ts": 1344,
-      "src/renderer/src/components/terminal-pane/pty-connection-hook-idle-arbitration.test.ts": 737,
-      "src/renderer/src/components/terminal-pane/pty-connection-interrupt-inference.test.ts": 1112,
-      "src/renderer/src/components/terminal-pane/pty-connection-main-side-effect-authority.test.ts": 1606,
-      "src/renderer/src/components/terminal-pane/pty-connection-mode-2031-subscriptions.test.ts": 1590,
-      "src/renderer/src/components/terminal-pane/pty-connection-notification-settings-gating.test.ts": 1703,
-      "src/renderer/src/components/terminal-pane/pty-connection-parked-ssh-snapshot.test.ts": 2053,
-      "src/renderer/src/components/terminal-pane/pty-connection-pi-synchronized-input.test.ts": 796,
-      "src/renderer/src/components/terminal-pane/pty-connection-post-dispose-restore-termination.test.ts": 886,
-      "src/renderer/src/components/terminal-pane/pty-connection-pty-exit-teardown.test.ts": 5839,
-      "src/renderer/src/components/terminal-pane/pty-connection-queued-startup-consume.test.ts": 815,
-      "src/renderer/src/components/terminal-pane/pty-connection-reattach-binding.test.ts": 4195,
-      "src/renderer/src/components/terminal-pane/pty-connection-reattach-mode-reset.test.ts": 4958,
-      "src/renderer/src/components/terminal-pane/pty-connection-remote-runtime-attach.test.ts": 2115,
-      "src/renderer/src/components/terminal-pane/pty-connection-remote-snapshot-source-grid.test.ts": 894,
-      "src/renderer/src/components/terminal-pane/pty-connection-renderer-risk-repaint.test.ts": 1650,
-      "src/renderer/src/components/terminal-pane/pty-connection-replay-payload-handling.test.ts": 1820,
-      "src/renderer/src/components/terminal-pane/pty-connection-restored-baseline-shortfall.test.ts": 872,
-      "src/renderer/src/components/terminal-pane/pty-connection-runtime-owner-spawn-routing.test.ts": 1386,
-      "src/renderer/src/components/terminal-pane/pty-connection-session-liveness.test.ts": 2213,
-      "src/renderer/src/components/terminal-pane/pty-connection-setup-split-spawn.test.ts": 1501,
-      "src/renderer/src/components/terminal-pane/pty-connection-sleeping-resume-banner.test.ts": 1167,
-      "src/renderer/src/components/terminal-pane/pty-connection-spawn-left-pane-unbound.test.ts": 1146,
-      "src/renderer/src/components/terminal-pane/pty-connection-split-cwd-resolution.test.ts": 991,
-      "src/renderer/src/components/terminal-pane/pty-connection-ssh-startup-draft-delivery.test.ts": 1196,
-      "src/renderer/src/components/terminal-pane/pty-connection-stalled-hidden-restore.test.ts": 2666,
-      "src/renderer/src/components/terminal-pane/pty-connection-startup-command-delivery.test.ts": 1537,
-      "src/renderer/src/components/terminal-pane/pty-connection-task-complete-dispatch.test.ts": 1717,
-      "src/renderer/src/components/terminal-pane/pty-connection-terminal-input-gating.test.ts": 4494,
-      "src/renderer/src/components/terminal-pane/pty-connection-typed-agent-identity.test.ts": 1445,
-      "src/renderer/src/components/terminal-pane/pty-connection-visibility-resume-size.test.ts": 2090,
-      "src/renderer/src/components/terminal-pane/pty-connection-visible-pane-output-pause-latch.test.ts": 882,
-      "src/renderer/src/components/terminal-pane/pty-connection-windows-cjk-repaint.test.ts": 1599,
-      "src/renderer/src/components/terminal-pane/pty-connection-windows-keyboard-reset.test.ts": 1578,
-      "src/renderer/src/components/terminal-pane/pty-connection/direct-ssh-reattach-recovery.test.ts": 42,
-      "src/renderer/src/components/terminal-pane/pty-connection/foreground-output-budgets.test.ts": 36,
-      "src/renderer/src/components/terminal-pane/pty-connection/foreground-renderer-risk-scan-tail.test.ts": 97,
-      "src/renderer/src/components/terminal-pane/pty-connection/pane-pty-layout-binding.test.ts": 49,
-      "src/renderer/src/components/terminal-pane/pty-connection/park-reveal-snapshot-verdict.test.ts": 1090,
-      "src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts": 1606,
-      "src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-ssh-reconnect-model-paint.test.ts": 1744,
-      "src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts": 152,
-      "src/renderer/src/components/terminal-pane/pty-connection/reattach-success-settle.test.ts": 182,
-      "src/renderer/src/components/terminal-pane/pty-connection/ssh-session-gone-verdict.test.ts": 27,
-      "src/renderer/src/components/terminal-pane/pty-connection/terminal-tab-id.test.ts": 49,
-      "src/renderer/src/components/terminal-pane/pty-connection/unbound-pane-spawn-recovery.test.ts": 49,
-      "src/renderer/src/components/terminal-pane/pty-connection/write-pty-output-to-xterm-startup-callback.test.ts": 85,
-      "src/renderer/src/components/terminal-pane/pty-dispatcher-delivery-interest.test.ts": 160,
-      "src/renderer/src/components/terminal-pane/pty-dispatcher-delivery-resync.test.ts": 111,
-      "src/renderer/src/components/terminal-pane/pty-dispatcher-pi-routing.test.ts": 239,
-      "src/renderer/src/components/terminal-pane/pty-dispatcher-push-reattach.test.ts": 121,
-      "src/renderer/src/components/terminal-pane/pty-input-write-queue.test.ts": 839,
-      "src/renderer/src/components/terminal-pane/pty-model-restore-channel.test.ts": 40,
-      "src/renderer/src/components/terminal-pane/pty-pre-handler-buffer-warn-eviction.test.ts": 69,
-      "src/renderer/src/components/terminal-pane/pty-pre-handler-buffer.test.ts": 108,
-      "src/renderer/src/components/terminal-pane/pty-preconnect-input-buffer.test.ts": 120,
-      "src/renderer/src/components/terminal-pane/pty-renderer-delivery-claims.test.ts": 51,
-      "src/renderer/src/components/terminal-pane/pty-shutdown-data-suspension.test.ts": 92,
-      "src/renderer/src/components/terminal-pane/pty-shutdown-exit-deferral.test.ts": 127,
-      "src/renderer/src/components/terminal-pane/pty-shutdown-output-queue.test.ts": 2278,
-      "src/renderer/src/components/terminal-pane/pty-side-effect-pending-census.test.ts": 210,
-      "src/renderer/src/components/terminal-pane/pty-size-reassertion.test.ts": 53,
-      "src/renderer/src/components/terminal-pane/pty-size-reconcile.test.ts": 75,
-      "src/renderer/src/components/terminal-pane/pty-transport-connect-spawn.test.ts": 459,
-      "src/renderer/src/components/terminal-pane/pty-transport-detach-attach-handoff.test.ts": 263,
-      "src/renderer/src/components/terminal-pane/pty-transport-eager-buffer-replay.test.ts": 561,
-      "src/renderer/src/components/terminal-pane/pty-transport-handler-suspension.test.ts": 241,
-      "src/renderer/src/components/terminal-pane/pty-transport-input-write.test.ts": 1937,
-      "src/renderer/src/components/terminal-pane/pty-transport-output-side-effects.test.ts": 558,
-      "src/renderer/src/components/terminal-pane/pty-transport-pi-coalesce.test.ts": 237,
-      "src/renderer/src/components/terminal-pane/pty-transport-pi-spinner.test.ts": 216,
-      "src/renderer/src/components/terminal-pane/pty-transport-reattach-admission.test.ts": 479,
-      "src/renderer/src/components/terminal-pane/pty-transport-recycled-pty-incarnation.test.ts": 284,
-      "src/renderer/src/components/terminal-pane/pty-transport-spawn-errors.test.ts": 243,
-      "src/renderer/src/components/terminal-pane/regular-terminal-focus-ownership.test.ts": 518,
-      "src/renderer/src/components/terminal-pane/remote-desktop-viewport-claim.test.ts": 58,
-      "src/renderer/src/components/terminal-pane/remote-execution-host-pty.test.ts": 1641,
-      "src/renderer/src/components/terminal-pane/remote-hidden-output-restore-outcomes.test.ts": 1431,
-      "src/renderer/src/components/terminal-pane/remote-hidden-output-restore-unavailable-banner.repro.test.ts": 1145,
-      "src/renderer/src/components/terminal-pane/remote-layout-scrollback-retention.test.ts": 46,
-      "src/renderer/src/components/terminal-pane/remote-pane-layout-push.test.ts": 49,
-      "src/renderer/src/components/terminal-pane/remote-park-reveal-unverifiable-retry.test.ts": 872,
-      "src/renderer/src/components/terminal-pane/remote-runtime-connect-failure-recovery.test.ts": 1714,
-      "src/renderer/src/components/terminal-pane/remote-runtime-error-surface-dismissal.test.ts": 1944,
-      "src/renderer/src/components/terminal-pane/remote-runtime-outage-toast-flood-and-stuck-reconnect.test.ts": 2111,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-batching.test.ts": 147,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-deadline-reattach.test.ts": 2045,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-latched-pane-retention.test.ts": 4175,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-query-reply-immediate.test.ts": 2284,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-recovery-state.test.ts": 85,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-snapshot-escape-tail.test.ts": 1162,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-snapshot-source-grid.test.ts": 1096,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-activation-inventory-fallback.test.ts": 1989,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-attach-subscription.test.ts": 3514,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-create-handoff.test.ts": 3393,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-create-outcome-recovery.test.ts": 3063,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-end-verdict.test.ts": 1788,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-expired-pane-recovery.test.ts": 2181,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-absence-evidence.test.ts": 1704,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-session-launch.test.ts": 2453,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-surface-replacement.test.ts": 5371,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-input-coalescing.test.ts": 3225,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-input-fallback.test.ts": 2654,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-pane-handle-resolution.test.ts": 4013,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-pending-host-surface-attach.test.ts": 2465,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-snapshot-replay.test.ts": 2014,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-split-leaf-activation.test.ts": 2103,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-stale-handle-recovery.test.ts": 2995,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-sticky-replacement-policy.test.ts": 2643,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-stream-reconnect.test.ts": 3819,
-      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-web-mirror-recovery.test.ts": 2767,
-      "src/renderer/src/components/terminal-pane/remote-runtime-resubscribe-failure-recovery-routing.test.ts": 2390,
-      "src/renderer/src/components/terminal-pane/renderer-owned-agent-status-registry.test.ts": 63,
-      "src/renderer/src/components/terminal-pane/replay-guard.test.ts": 111,
-      "src/renderer/src/components/terminal-pane/replayed-scrollback-store-release.test.ts": 168,
-      "src/renderer/src/components/terminal-pane/repro-8299-shift-space-input-source.test.ts": 117,
-      "src/renderer/src/components/terminal-pane/repro-8832-url-next-line.test.ts": 2007,
-      "src/renderer/src/components/terminal-pane/resolve-split-cwd.test.ts": 1167,
-      "src/renderer/src/components/terminal-pane/restored-snapshot-coverage.test.ts": 40,
-      "src/renderer/src/components/terminal-pane/session-restored-banner-pane-state.test.tsx": 575,
-      "src/renderer/src/components/terminal-pane/shell-ready-marker-scan.test.ts": 62,
-      "src/renderer/src/components/terminal-pane/shutdown-buffer-captures.test.ts": 46,
-      "src/renderer/src/components/terminal-pane/sleeping-record-park-exemption.test.ts": 70,
+      "src/renderer/src/components/terminal-pane/paired-parking-unverifiable-host.test.ts": 82,
+      "src/renderer/src/components/terminal-pane/paired-reconnect-multi-pane-materialization.test.ts": 2000,
+      "src/renderer/src/components/terminal-pane/pane-agent-session-id.test.ts": 28,
+      "src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.test.ts": 513,
+      "src/renderer/src/components/terminal-pane/pane-foreground-inspect-observation-identity.test.ts": 50,
+      "src/renderer/src/components/terminal-pane/pane-helpers.test.ts": 59,
+      "src/renderer/src/components/terminal-pane/pane-restart-transport-handoff.test.ts": 1459,
+      "src/renderer/src/components/terminal-pane/pane-title-overlay-rects.test.ts": 39,
+      "src/renderer/src/components/terminal-pane/pane-title-update-global-scan-budget.test.tsx": 3714,
+      "src/renderer/src/components/terminal-pane/parked-terminal-buffer-capture.test.ts": 183,
+      "src/renderer/src/components/terminal-pane/parked-terminal-byte-watcher.test.ts": 1531,
+      "src/renderer/src/components/terminal-pane/parked-terminal-command-status.test.ts": 130,
+      "src/renderer/src/components/terminal-pane/parked-terminal-tab-capture-episodes.test.ts": 150,
+      "src/renderer/src/components/terminal-pane/parse-osc7.test.ts": 56,
+      "src/renderer/src/components/terminal-pane/pending-pane-close-confirmation.test.ts": 1233,
+      "src/renderer/src/components/terminal-pane/pending-runtime-pane-close.test.ts": 1002,
+      "src/renderer/src/components/terminal-pane/pending-split-close.test.ts": 1013,
+      "src/renderer/src/components/terminal-pane/pty-buffer-serializer.test.ts": 32,
+      "src/renderer/src/components/terminal-pane/pty-connection-agent-session-resume.test.ts": 1595,
+      "src/renderer/src/components/terminal-pane/pty-connection-cold-restore-agent-resume.test.ts": 1581,
+      "src/renderer/src/components/terminal-pane/pty-connection-cold-restore-repaint.test.ts": 1145,
+      "src/renderer/src/components/terminal-pane/pty-connection-cold-restore-resume-command.test.ts": 1253,
+      "src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.test.ts": 7780,
+      "src/renderer/src/components/terminal-pane/pty-connection-daemon-snapshot-replay.test.ts": 1637,
+      "src/renderer/src/components/terminal-pane/pty-connection-deferred-reattach-live-output.test.ts": 1762,
+      "src/renderer/src/components/terminal-pane/pty-connection-deferred-ssh-passphrase.test.ts": 642,
+      "src/renderer/src/components/terminal-pane/pty-connection-deliberate-sleep-guard.test.ts": 1014,
+      "src/renderer/src/components/terminal-pane/pty-connection-direct-ssh-reattach-retry.test.ts": 1017,
+      "src/renderer/src/components/terminal-pane/pty-connection-direct-ssh-spawn-retry.test.ts": 1177,
+      "src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-routing.test.ts": 960,
+      "src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-sampling.test.ts": 1709,
+      "src/renderer/src/components/terminal-pane/pty-connection-foreground-routing-confirmation.test.ts": 994,
+      "src/renderer/src/components/terminal-pane/pty-connection-foreground-write-path.test.ts": 1595,
+      "src/renderer/src/components/terminal-pane/pty-connection-fresh-spawn-guards.test.ts": 1457,
+      "src/renderer/src/components/terminal-pane/pty-connection-hibernation-wake.test.ts": 1511,
+      "src/renderer/src/components/terminal-pane/pty-connection-hidden-atlas-recovery.test.ts": 1949,
+      "src/renderer/src/components/terminal-pane/pty-connection-hidden-backlog-reconciliation.test.ts": 2482,
+      "src/renderer/src/components/terminal-pane/pty-connection-hidden-backlog-snapshot.test.ts": 2106,
+      "src/renderer/src/components/terminal-pane/pty-connection-hidden-codex-queries.test.ts": 1397,
+      "src/renderer/src/components/terminal-pane/pty-connection-hidden-delivery-gate.test.ts": 1974,
+      "src/renderer/src/components/terminal-pane/pty-connection-hidden-output-restore.test.ts": 1212,
+      "src/renderer/src/components/terminal-pane/pty-connection-hidden-query-snapshot-restore.test.ts": 1575,
+      "src/renderer/src/components/terminal-pane/pty-connection-hidden-restore-fit-overflow.test.ts": 993,
+      "src/renderer/src/components/terminal-pane/pty-connection-hidden-snapshot-live-overlap.test.ts": 903,
+      "src/renderer/src/components/terminal-pane/pty-connection-hidden-snapshot-resize-signals.test.ts": 2255,
+      "src/renderer/src/components/terminal-pane/pty-connection-hidden-tui-snapshot-replay.test.ts": 796,
+      "src/renderer/src/components/terminal-pane/pty-connection-hook-completion-bell-arbitration.test.ts": 1097,
+      "src/renderer/src/components/terminal-pane/pty-connection-hook-completion-side-effects.test.ts": 1520,
+      "src/renderer/src/components/terminal-pane/pty-connection-hook-idle-arbitration.test.ts": 1109,
+      "src/renderer/src/components/terminal-pane/pty-connection-interrupt-inference.test.ts": 1194,
+      "src/renderer/src/components/terminal-pane/pty-connection-main-side-effect-authority.test.ts": 1194,
+      "src/renderer/src/components/terminal-pane/pty-connection-mode-2031-subscriptions.test.ts": 1082,
+      "src/renderer/src/components/terminal-pane/pty-connection-notification-settings-gating.test.ts": 1779,
+      "src/renderer/src/components/terminal-pane/pty-connection-parked-ssh-snapshot.test.ts": 1899,
+      "src/renderer/src/components/terminal-pane/pty-connection-pi-synchronized-input.test.ts": 595,
+      "src/renderer/src/components/terminal-pane/pty-connection-post-dispose-restore-termination.test.ts": 829,
+      "src/renderer/src/components/terminal-pane/pty-connection-pty-exit-teardown.test.ts": 6007,
+      "src/renderer/src/components/terminal-pane/pty-connection-queued-startup-consume.test.ts": 1073,
+      "src/renderer/src/components/terminal-pane/pty-connection-reattach-binding.test.ts": 4696,
+      "src/renderer/src/components/terminal-pane/pty-connection-reattach-mode-reset.test.ts": 4241,
+      "src/renderer/src/components/terminal-pane/pty-connection-remote-runtime-attach.test.ts": 2097,
+      "src/renderer/src/components/terminal-pane/pty-connection-remote-snapshot-source-grid.test.ts": 852,
+      "src/renderer/src/components/terminal-pane/pty-connection-renderer-risk-repaint.test.ts": 1509,
+      "src/renderer/src/components/terminal-pane/pty-connection-replay-payload-handling.test.ts": 1105,
+      "src/renderer/src/components/terminal-pane/pty-connection-restored-baseline-shortfall.test.ts": 676,
+      "src/renderer/src/components/terminal-pane/pty-connection-runtime-owner-spawn-routing.test.ts": 889,
+      "src/renderer/src/components/terminal-pane/pty-connection-session-liveness.test.ts": 1647,
+      "src/renderer/src/components/terminal-pane/pty-connection-setup-split-spawn.test.ts": 1562,
+      "src/renderer/src/components/terminal-pane/pty-connection-sleeping-resume-banner.test.ts": 1195,
+      "src/renderer/src/components/terminal-pane/pty-connection-spawn-left-pane-unbound.test.ts": 703,
+      "src/renderer/src/components/terminal-pane/pty-connection-split-cwd-resolution.test.ts": 729,
+      "src/renderer/src/components/terminal-pane/pty-connection-ssh-startup-draft-delivery.test.ts": 1351,
+      "src/renderer/src/components/terminal-pane/pty-connection-stalled-hidden-restore.test.ts": 2466,
+      "src/renderer/src/components/terminal-pane/pty-connection-startup-command-delivery.test.ts": 964,
+      "src/renderer/src/components/terminal-pane/pty-connection-task-complete-dispatch.test.ts": 1078,
+      "src/renderer/src/components/terminal-pane/pty-connection-terminal-input-gating.test.ts": 5951,
+      "src/renderer/src/components/terminal-pane/pty-connection-typed-agent-identity.test.ts": 1837,
+      "src/renderer/src/components/terminal-pane/pty-connection-visibility-resume-size.test.ts": 1270,
+      "src/renderer/src/components/terminal-pane/pty-connection-visible-pane-output-pause-latch.test.ts": 926,
+      "src/renderer/src/components/terminal-pane/pty-connection-windows-cjk-repaint.test.ts": 1272,
+      "src/renderer/src/components/terminal-pane/pty-connection-windows-keyboard-reset.test.ts": 1294,
+      "src/renderer/src/components/terminal-pane/pty-connection/direct-ssh-reattach-recovery.test.ts": 37,
+      "src/renderer/src/components/terminal-pane/pty-connection/disposed-spawn-retention.test.ts": 65,
+      "src/renderer/src/components/terminal-pane/pty-connection/foreground-output-budgets.test.ts": 52,
+      "src/renderer/src/components/terminal-pane/pty-connection/foreground-output-scan.test.ts": 63,
+      "src/renderer/src/components/terminal-pane/pty-connection/foreground-renderer-risk-scan-tail.test.ts": 74,
+      "src/renderer/src/components/terminal-pane/pty-connection/pane-pty-layout-binding.test.ts": 33,
+      "src/renderer/src/components/terminal-pane/pty-connection/park-reveal-snapshot-verdict.test.ts": 993,
+      "src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts": 1537,
+      "src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-ssh-reconnect-model-paint.test.ts": 1308,
+      "src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts": 167,
+      "src/renderer/src/components/terminal-pane/pty-connection/reattach-success-settle.test.ts": 186,
+      "src/renderer/src/components/terminal-pane/pty-connection/ssh-session-gone-verdict.test.ts": 42,
+      "src/renderer/src/components/terminal-pane/pty-connection/terminal-tab-id.test.ts": 41,
+      "src/renderer/src/components/terminal-pane/pty-connection/unbound-pane-spawn-recovery.test.ts": 51,
+      "src/renderer/src/components/terminal-pane/pty-connection/write-pty-output-to-xterm-startup-callback.test.ts": 69,
+      "src/renderer/src/components/terminal-pane/pty-dispatcher-delivery-interest.test.ts": 196,
+      "src/renderer/src/components/terminal-pane/pty-dispatcher-delivery-resync.test.ts": 71,
+      "src/renderer/src/components/terminal-pane/pty-dispatcher-pi-routing.test.ts": 389,
+      "src/renderer/src/components/terminal-pane/pty-dispatcher-push-reattach.test.ts": 142,
+      "src/renderer/src/components/terminal-pane/pty-input-write-queue.test.ts": 877,
+      "src/renderer/src/components/terminal-pane/pty-model-restore-channel.test.ts": 33,
+      "src/renderer/src/components/terminal-pane/pty-pre-handler-buffer-warn-eviction.test.ts": 55,
+      "src/renderer/src/components/terminal-pane/pty-pre-handler-buffer.test.ts": 107,
+      "src/renderer/src/components/terminal-pane/pty-preconnect-input-buffer.test.ts": 56,
+      "src/renderer/src/components/terminal-pane/pty-renderer-delivery-claims.test.ts": 61,
+      "src/renderer/src/components/terminal-pane/pty-shutdown-data-suspension.test.ts": 42,
+      "src/renderer/src/components/terminal-pane/pty-shutdown-exit-deferral.test.ts": 133,
+      "src/renderer/src/components/terminal-pane/pty-shutdown-output-queue.test.ts": 2353,
+      "src/renderer/src/components/terminal-pane/pty-side-effect-pending-census.test.ts": 138,
+      "src/renderer/src/components/terminal-pane/pty-size-reassertion.test.ts": 49,
+      "src/renderer/src/components/terminal-pane/pty-size-reconcile.test.ts": 60,
+      "src/renderer/src/components/terminal-pane/pty-transport-connect-spawn.test.ts": 435,
+      "src/renderer/src/components/terminal-pane/pty-transport-detach-attach-handoff.test.ts": 310,
+      "src/renderer/src/components/terminal-pane/pty-transport-eager-buffer-replay.test.ts": 520,
+      "src/renderer/src/components/terminal-pane/pty-transport-handler-suspension.test.ts": 277,
+      "src/renderer/src/components/terminal-pane/pty-transport-input-write.test.ts": 1210,
+      "src/renderer/src/components/terminal-pane/pty-transport-output-side-effects.test.ts": 603,
+      "src/renderer/src/components/terminal-pane/pty-transport-pi-coalesce.test.ts": 229,
+      "src/renderer/src/components/terminal-pane/pty-transport-pi-spinner.test.ts": 233,
+      "src/renderer/src/components/terminal-pane/pty-transport-reattach-admission.test.ts": 363,
+      "src/renderer/src/components/terminal-pane/pty-transport-recycled-pty-incarnation.test.ts": 258,
+      "src/renderer/src/components/terminal-pane/pty-transport-spawn-errors.test.ts": 189,
+      "src/renderer/src/components/terminal-pane/regular-terminal-focus-ownership.test.ts": 459,
+      "src/renderer/src/components/terminal-pane/remote-desktop-viewport-claim.test.ts": 55,
+      "src/renderer/src/components/terminal-pane/remote-execution-host-pty.test.ts": 1028,
+      "src/renderer/src/components/terminal-pane/remote-hidden-output-restore-outcomes.test.ts": 1239,
+      "src/renderer/src/components/terminal-pane/remote-hidden-output-restore-unavailable-banner.repro.test.ts": 873,
+      "src/renderer/src/components/terminal-pane/remote-layout-scrollback-retention.test.ts": 43,
+      "src/renderer/src/components/terminal-pane/remote-pane-layout-push.test.ts": 66,
+      "src/renderer/src/components/terminal-pane/remote-park-reveal-unverifiable-retry.test.ts": 567,
+      "src/renderer/src/components/terminal-pane/remote-runtime-connect-failure-recovery.test.ts": 1496,
+      "src/renderer/src/components/terminal-pane/remote-runtime-error-surface-dismissal.test.ts": 1919,
+      "src/renderer/src/components/terminal-pane/remote-runtime-outage-toast-flood-and-stuck-reconnect.test.ts": 1098,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-batching.test.ts": 119,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-deadline-reattach.test.ts": 2442,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-latched-pane-retention.test.ts": 5019,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-query-reply-immediate.test.ts": 2214,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-recovery-state.test.ts": 79,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-snapshot-escape-tail.test.ts": 1574,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-snapshot-source-grid.test.ts": 1311,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-activation-inventory-fallback.test.ts": 1933,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-attach-subscription.test.ts": 3688,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-create-handoff.test.ts": 2192,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-create-outcome-recovery.test.ts": 2020,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-end-verdict.test.ts": 1894,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-expired-pane-recovery.test.ts": 2760,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-absence-evidence.test.ts": 1849,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-session-launch.test.ts": 2998,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-surface-replacement.test.ts": 5439,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-input-coalescing.test.ts": 5313,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-input-fallback.test.ts": 1946,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-pane-handle-resolution.test.ts": 3291,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-pending-host-surface-attach.test.ts": 2620,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-snapshot-replay.test.ts": 2114,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-split-leaf-activation.test.ts": 3201,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-stale-handle-recovery.test.ts": 2981,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-sticky-replacement-policy.test.ts": 2126,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-stream-reconnect.test.ts": 4074,
+      "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-web-mirror-recovery.test.ts": 2942,
+      "src/renderer/src/components/terminal-pane/remote-runtime-resubscribe-failure-recovery-routing.test.ts": 3115,
+      "src/renderer/src/components/terminal-pane/renderer-owned-agent-status-registry.test.ts": 34,
+      "src/renderer/src/components/terminal-pane/replay-guard.test.ts": 130,
+      "src/renderer/src/components/terminal-pane/replayed-scrollback-store-release.test.ts": 147,
+      "src/renderer/src/components/terminal-pane/repro-8299-shift-space-input-source.test.ts": 167,
+      "src/renderer/src/components/terminal-pane/repro-8832-url-next-line.test.ts": 1961,
+      "src/renderer/src/components/terminal-pane/resolve-split-cwd.test.ts": 1427,
+      "src/renderer/src/components/terminal-pane/restored-snapshot-coverage.test.ts": 91,
+      "src/renderer/src/components/terminal-pane/scan22-ssh-new-tab-disposed-spawn-kill.repro.test.ts": 176,
+      "src/renderer/src/components/terminal-pane/session-restored-banner-pane-state.test.tsx": 409,
+      "src/renderer/src/components/terminal-pane/shell-ready-marker-scan.test.ts": 39,
+      "src/renderer/src/components/terminal-pane/shutdown-buffer-captures.test.ts": 48,
+      "src/renderer/src/components/terminal-pane/sleeping-record-park-exemption.test.ts": 75,
       "src/renderer/src/components/terminal-pane/split-right-white-screen.test.ts": 36,
-      "src/renderer/src/components/terminal-pane/ssh-pane-connect-gate.test.ts": 62,
-      "src/renderer/src/components/terminal-pane/ssh-reattach-model-restore.test.ts": 73,
-      "src/renderer/src/components/terminal-pane/ssh-reconnect-model-paint-gate.test.ts": 56,
-      "src/renderer/src/components/terminal-pane/stale-document-visibility.test.ts": 51,
-      "src/renderer/src/components/terminal-pane/terminal-agent-paste-bracketing.test.ts": 69,
-      "src/renderer/src/components/terminal-pane/terminal-agent-session-continuation.test.ts": 83,
-      "src/renderer/src/components/terminal-pane/terminal-agent-session-fork.test.ts": 801,
-      "src/renderer/src/components/terminal-pane/terminal-alternate-screen-parse.test.ts": 91,
-      "src/renderer/src/components/terminal-pane/terminal-appearance.test.ts": 306,
-      "src/renderer/src/components/terminal-pane/terminal-attention-surface.test.ts": 1552,
-      "src/renderer/src/components/terminal-pane/terminal-bracketed-paste.test.ts": 63,
+      "src/renderer/src/components/terminal-pane/ssh-pane-connect-gate.test.ts": 48,
+      "src/renderer/src/components/terminal-pane/ssh-reattach-model-restore.test.ts": 67,
+      "src/renderer/src/components/terminal-pane/ssh-reconnect-model-paint-gate.test.ts": 51,
+      "src/renderer/src/components/terminal-pane/stale-document-visibility.test.ts": 43,
+      "src/renderer/src/components/terminal-pane/terminal-agent-paste-bracketing.test.ts": 59,
+      "src/renderer/src/components/terminal-pane/terminal-agent-session-continuation.test.ts": 101,
+      "src/renderer/src/components/terminal-pane/terminal-agent-session-fork.test.ts": 599,
+      "src/renderer/src/components/terminal-pane/terminal-alternate-screen-parse.test.ts": 124,
+      "src/renderer/src/components/terminal-pane/terminal-appearance.test.ts": 303,
+      "src/renderer/src/components/terminal-pane/terminal-attention-surface.test.ts": 1639,
+      "src/renderer/src/components/terminal-pane/terminal-bracketed-paste.test.ts": 33,
       "src/renderer/src/components/terminal-pane/terminal-capability-replies.test.ts": 144,
-      "src/renderer/src/components/terminal-pane/terminal-capped-buffer-retention.test.ts": 609,
-      "src/renderer/src/components/terminal-pane/terminal-captured-input-dispatch.test.ts": 48,
-      "src/renderer/src/components/terminal-pane/terminal-chat-ownership-lifecycle.test.tsx": 784,
-      "src/renderer/src/components/terminal-pane/terminal-cjk-cursor-cell-placement.test.ts": 634,
-      "src/renderer/src/components/terminal-pane/terminal-clipboard-event-paste.test.ts": 46,
-      "src/renderer/src/components/terminal-pane/terminal-clipboard-paste.test.ts": 69,
-      "src/renderer/src/components/terminal-pane/terminal-clipboard-selection-text.test.ts": 76,
-      "src/renderer/src/components/terminal-pane/terminal-cold-park-exempt-flip.react185.test.tsx": 1625,
-      "src/renderer/src/components/terminal-pane/terminal-cold-park-pre-gate-loop.react185.test.tsx": 818,
-      "src/renderer/src/components/terminal-pane/terminal-cold-park-recheck-deadlines.test.ts": 1571,
-      "src/renderer/src/components/terminal-pane/terminal-cold-park-subscription-narrowing.react185.test.tsx": 511,
-      "src/renderer/src/components/terminal-pane/terminal-cold-park-tab-model-identity.react185.test.tsx": 960,
-      "src/renderer/src/components/terminal-pane/terminal-cold-park-timer-rearm.test.tsx": 796,
-      "src/renderer/src/components/terminal-pane/terminal-cold-park-verdict-loop.test.tsx": 694,
+      "src/renderer/src/components/terminal-pane/terminal-capped-buffer-retention.test.ts": 379,
+      "src/renderer/src/components/terminal-pane/terminal-captured-input-dispatch.test.ts": 39,
+      "src/renderer/src/components/terminal-pane/terminal-chat-ownership-lifecycle.test.tsx": 1028,
+      "src/renderer/src/components/terminal-pane/terminal-cjk-cursor-cell-placement.test.ts": 562,
+      "src/renderer/src/components/terminal-pane/terminal-clipboard-event-paste.test.ts": 57,
+      "src/renderer/src/components/terminal-pane/terminal-clipboard-paste.test.ts": 97,
+      "src/renderer/src/components/terminal-pane/terminal-clipboard-selection-text.test.ts": 63,
+      "src/renderer/src/components/terminal-pane/terminal-cold-park-exempt-flip.react185.test.tsx": 1585,
+      "src/renderer/src/components/terminal-pane/terminal-cold-park-pre-gate-loop.react185.test.tsx": 581,
+      "src/renderer/src/components/terminal-pane/terminal-cold-park-recheck-deadlines.test.ts": 1522,
+      "src/renderer/src/components/terminal-pane/terminal-cold-park-subscription-narrowing.react185.test.tsx": 729,
+      "src/renderer/src/components/terminal-pane/terminal-cold-park-tab-model-identity.react185.test.tsx": 946,
+      "src/renderer/src/components/terminal-pane/terminal-cold-park-timer-rearm.test.tsx": 704,
+      "src/renderer/src/components/terminal-pane/terminal-cold-park-verdict-loop.test.tsx": 587,
       "src/renderer/src/components/terminal-pane/terminal-cold-park-withheld-tabs.test.ts": 54,
-      "src/renderer/src/components/terminal-pane/terminal-command-lifecycle.test.ts": 67,
-      "src/renderer/src/components/terminal-pane/terminal-context-menu-dismiss.test.ts": 61,
-      "src/renderer/src/components/terminal-pane/terminal-copy-rejection-handling.test.ts": 45,
-      "src/renderer/src/components/terminal-pane/terminal-ctrl-arrow-conpty.test.ts": 1566,
-      "src/renderer/src/components/terminal-pane/terminal-ctrl-enter.test.ts": 68,
-      "src/renderer/src/components/terminal-pane/terminal-cursor-appearance-precedence.test.ts": 401,
-      "src/renderer/src/components/terminal-pane/terminal-cursor-inactive-style.test.ts": 258,
-      "src/renderer/src/components/terminal-pane/terminal-dead-session-reconcile.test.ts": 50,
-      "src/renderer/src/components/terminal-pane/terminal-delivery-watchdog.test.ts": 90,
-      "src/renderer/src/components/terminal-pane/terminal-drop-handler.test.ts": 464,
-      "src/renderer/src/components/terminal-pane/terminal-drop-image-path.test.ts": 42,
-      "src/renderer/src/components/terminal-pane/terminal-drop-internal-handler.test.ts": 369,
-      "src/renderer/src/components/terminal-pane/terminal-drop-path-writer.test.ts": 123,
-      "src/renderer/src/components/terminal-pane/terminal-drop-runtime-owner.test.ts": 212,
-      "src/renderer/src/components/terminal-pane/terminal-drop-shell.test.ts": 51,
-      "src/renderer/src/components/terminal-pane/terminal-drop-upload-report.test.ts": 77,
-      "src/renderer/src/components/terminal-pane/terminal-drop-write-failure.test.ts": 60,
-      "src/renderer/src/components/terminal-pane/terminal-error-accumulation.test.ts": 364,
-      "src/renderer/src/components/terminal-pane/terminal-error-remote-closed-localization.test.ts": 129,
-      "src/renderer/src/components/terminal-pane/terminal-eviction-exempt-tabs.test.ts": 633,
-      "src/renderer/src/components/terminal-pane/terminal-file-link-actions.test.ts": 196,
-      "src/renderer/src/components/terminal-pane/terminal-fit-restore.test.ts": 79,
-      "src/renderer/src/components/terminal-pane/terminal-freeze-report.test.ts": 87,
-      "src/renderer/src/components/terminal-pane/terminal-handle-copy.test.ts": 36,
-      "src/renderer/src/components/terminal-pane/terminal-handle-links.test.ts": 400,
-      "src/renderer/src/components/terminal-pane/terminal-hidden-restore-scrollback.test.ts": 44,
-      "src/renderer/src/components/terminal-pane/terminal-hidden-view-parking.test.ts": 1487,
-      "src/renderer/src/components/terminal-pane/terminal-hidden-worktree-retention.test.ts": 1633,
-      "src/renderer/src/components/terminal-pane/terminal-http-link-activation.test.ts": 253,
-      "src/renderer/src/components/terminal-pane/terminal-http-link-source-owner.test.ts": 84,
-      "src/renderer/src/components/terminal-pane/terminal-http-url-extraction.test.ts": 50,
-      "src/renderer/src/components/terminal-pane/terminal-ime-candidate-key-release-guard.test.ts": 75,
-      "src/renderer/src/components/terminal-pane/terminal-ime-composer-placeholder-mask.test.ts": 1616,
-      "src/renderer/src/components/terminal-pane/terminal-ime-composition-route.test.ts": 477,
-      "src/renderer/src/components/terminal-pane/terminal-ime-composition-tracker.test.ts": 509,
-      "src/renderer/src/components/terminal-pane/terminal-ime-composition-transaction-ownership.test.ts": 513,
-      "src/renderer/src/components/terminal-pane/terminal-ime-deferred-chord.test.ts": 432,
-      "src/renderer/src/components/terminal-pane/terminal-ime-deferred-newline.test.ts": 506,
-      "src/renderer/src/components/terminal-pane/terminal-ime-forwarder-space-claim.test.ts": 695,
-      "src/renderer/src/components/terminal-pane/terminal-ime-hangul-syllable-flush.test.ts": 1217,
-      "src/renderer/src/components/terminal-pane/terminal-ime-hangul-terminating-digit.test.ts": 550,
-      "src/renderer/src/components/terminal-pane/terminal-ime-input-context-refresh.test.ts": 441,
-      "src/renderer/src/components/terminal-pane/terminal-ime-linux-candidate-state.test.ts": 62,
-      "src/renderer/src/components/terminal-pane/terminal-ime-linux-claimed-preedit-release.test.ts": 517,
-      "src/renderer/src/components/terminal-pane/terminal-ime-linux-claimed-preedit-selector.test.ts": 60,
-      "src/renderer/src/components/terminal-pane/terminal-ime-macos-keybinding-dict-trace.test.ts": 518,
-      "src/renderer/src/components/terminal-pane/terminal-ime-native-text-forwarder.test.ts": 399,
-      "src/renderer/src/components/terminal-pane/terminal-ime-substituted-text-commit.test.ts": 576,
-      "src/renderer/src/components/terminal-pane/terminal-ime-won-composition-order.test.ts": 955,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-adversarial.test.ts": 3040,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-cancelled-preedit-visibility.test.ts": 865,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-composition-cancel.test.ts": 974,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-composition-deduplication.test.ts": 2111,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-consumed-key-commit.test.ts": 1028,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-korean-enter-commit-order.test.ts": 931,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-linux-native-trace-replay.test.ts": 6376,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-midline-preedit-tail.test.ts": 1580,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-preedit-cell-grid.test.ts": 1944,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-resumed-preedit-visibility.test.ts": 917,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-trailing-preedit-occlusion.test.ts": 929,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-transaction-events.test.ts": 870,
-      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-windows-resumed-preedit-trace.test.ts": 1239,
-      "src/renderer/src/components/terminal-pane/terminal-inline-image-da1.test.ts": 158,
-      "src/renderer/src/components/terminal-pane/terminal-input-host-platform.test.ts": 1617,
-      "src/renderer/src/components/terminal-pane/terminal-input-quarantine.test.ts": 65,
-      "src/renderer/src/components/terminal-pane/terminal-ios-hangul-preedit-coexistence.test.ts": 728,
-      "src/renderer/src/components/terminal-pane/terminal-ios-hangul-preedit-device-trace.test.ts": 948,
-      "src/renderer/src/components/terminal-pane/terminal-ios-hangul-preedit.test.ts": 1058,
-      "src/renderer/src/components/terminal-pane/terminal-jis-yen-input.test.ts": 54,
-      "src/renderer/src/components/terminal-pane/terminal-keyboard-event-handlers-focus.test.ts": 2195,
-      "src/renderer/src/components/terminal-pane/terminal-keyboard-pane-resolution.test.ts": 482,
-      "src/renderer/src/components/terminal-pane/terminal-keyboard-protocol-pane-agent.test.ts": 50,
-      "src/renderer/src/components/terminal-pane/terminal-keyboard-search-dispatch.test.ts": 2090,
-      "src/renderer/src/components/terminal-pane/terminal-kitty-csi-u-encoding.test.ts": 56,
-      "src/renderer/src/components/terminal-pane/terminal-layout-duplicate-pty-replay.test.ts": 64,
-      "src/renderer/src/components/terminal-pane/terminal-layout-leaf-detach.test.ts": 50,
-      "src/renderer/src/components/terminal-pane/terminal-layout-leaf-ids.test.ts": 43,
-      "src/renderer/src/components/terminal-pane/terminal-layout-overlay-focus.test.tsx": 505,
-      "src/renderer/src/components/terminal-pane/terminal-layout-pty-ownership-depth.test.ts": 93,
-      "src/renderer/src/components/terminal-pane/terminal-layout-pty-ownership.test.ts": 103,
-      "src/renderer/src/components/terminal-pane/terminal-link-action-routing.test.ts": 1894,
-      "src/renderer/src/components/terminal-pane/terminal-link-activation.test.ts": 228,
-      "src/renderer/src/components/terminal-pane/terminal-link-click-behavior.test.ts": 32,
-      "src/renderer/src/components/terminal-pane/terminal-link-click-fallback.test.ts": 695,
-      "src/renderer/src/components/terminal-pane/terminal-link-file-open-routing.test.ts": 551,
-      "src/renderer/src/components/terminal-pane/terminal-link-missing-file-open.test.ts": 565,
-      "src/renderer/src/components/terminal-pane/terminal-link-open-hints.test.ts": 252,
-      "src/renderer/src/components/terminal-pane/terminal-link-osc-file-targets.test.ts": 641,
-      "src/renderer/src/components/terminal-pane/terminal-link-osc-url-routing.test.ts": 523,
-      "src/renderer/src/components/terminal-pane/terminal-link-pointer-gesture.test.ts": 708,
-      "src/renderer/src/components/terminal-pane/terminal-link-provider-batching.test.ts": 407,
-      "src/renderer/src/components/terminal-pane/terminal-link-provider-link-detection.test.ts": 517,
-      "src/renderer/src/components/terminal-pane/terminal-link-pty-mouse-suppression.test.ts": 631,
-      "src/renderer/src/components/terminal-pane/terminal-link-remote-runtime-ssh-open.test.ts": 397,
-      "src/renderer/src/components/terminal-pane/terminal-link-worktree-root-activation.test.ts": 585,
-      "src/renderer/src/components/terminal-pane/terminal-link-wsl-path-mapping.test.ts": 484,
-      "src/renderer/src/components/terminal-pane/terminal-linkifier-click-priming.test.ts": 258,
-      "src/renderer/src/components/terminal-pane/terminal-live-layout-reconciliation.test.ts": 1614,
-      "src/renderer/src/components/terminal-pane/terminal-native-copy-gutter.test.ts": 484,
-      "src/renderer/src/components/terminal-pane/terminal-non-latin-control-chord.test.ts": 71,
-      "src/renderer/src/components/terminal-pane/terminal-notification-state.test.ts": 1862,
-      "src/renderer/src/components/terminal-pane/terminal-option-kitty-release.test.ts": 65,
-      "src/renderer/src/components/terminal-pane/terminal-output-visibility.test.ts": 49,
-      "src/renderer/src/components/terminal-pane/terminal-pane-attention-subscriptions.test.ts": 88,
-      "src/renderer/src/components/terminal-pane/terminal-pane-close-identity.test.ts": 52,
-      "src/renderer/src/components/terminal-pane/terminal-pane-hook-order-parity.test.ts": 373,
-      "src/renderer/src/components/terminal-pane/terminal-pane-host-state-memo.test.ts": 1479,
-      "src/renderer/src/components/terminal-pane/terminal-pane-host-state.test.ts": 1594,
-      "src/renderer/src/components/terminal-pane/terminal-pane-listener-order-parity.test.ts": 511,
-      "src/renderer/src/components/terminal-pane/terminal-pane-recovery-unsettled-fallback.test.ts": 341,
-      "src/renderer/src/components/terminal-pane/terminal-pane-recovery.test.ts": 571,
-      "src/renderer/src/components/terminal-pane/terminal-pane-split-completion.test.ts": 59,
-      "src/renderer/src/components/terminal-pane/terminal-pane-split-request-routing.test.ts": 482,
-      "src/renderer/src/components/terminal-pane/terminal-pane-split-with-inherited-cwd.test.ts": 121,
-      "src/renderer/src/components/terminal-pane/terminal-pane-split-writer-paths.test.ts": 1691,
-      "src/renderer/src/components/terminal-pane/terminal-pane-store-subscription-budget.test.tsx": 5326,
-      "src/renderer/src/components/terminal-pane/terminal-pane-surface-ownership.test.ts": 178,
-      "src/renderer/src/components/terminal-pane/terminal-pane-tab-detach.test.ts": 83,
-      "src/renderer/src/components/terminal-pane/terminal-park-verdict-flip-telemetry.test.ts": 62,
-      "src/renderer/src/components/terminal-pane/terminal-park-verdict-worktree-driver-loop.test.tsx": 894,
-      "src/renderer/src/components/terminal-pane/terminal-parked-pane-candidates.test.ts": 1433,
-      "src/renderer/src/components/terminal-pane/terminal-parked-tab-eviction-exemption.test.ts": 240,
-      "src/renderer/src/components/terminal-pane/terminal-parked-tab-watchers-batch-sync.test.ts": 465,
-      "src/renderer/src/components/terminal-pane/terminal-parked-tab-watchers.test.ts": 663,
-      "src/renderer/src/components/terminal-pane/terminal-parked-watcher-partial-reconciliation.test.ts": 213,
-      "src/renderer/src/components/terminal-pane/terminal-parked-watcher-reconciliation.test.ts": 151,
+      "src/renderer/src/components/terminal-pane/terminal-command-lifecycle.test.ts": 42,
+      "src/renderer/src/components/terminal-pane/terminal-context-menu-dismiss.test.ts": 31,
+      "src/renderer/src/components/terminal-pane/terminal-copy-rejection-handling.test.ts": 49,
+      "src/renderer/src/components/terminal-pane/terminal-ctrl-arrow-conpty.test.ts": 868,
+      "src/renderer/src/components/terminal-pane/terminal-ctrl-enter.test.ts": 86,
+      "src/renderer/src/components/terminal-pane/terminal-cursor-appearance-precedence.test.ts": 525,
+      "src/renderer/src/components/terminal-pane/terminal-cursor-inactive-style.test.ts": 205,
+      "src/renderer/src/components/terminal-pane/terminal-dead-session-reconcile.test.ts": 39,
+      "src/renderer/src/components/terminal-pane/terminal-delivery-watchdog.test.ts": 73,
+      "src/renderer/src/components/terminal-pane/terminal-drop-handler.test.ts": 346,
+      "src/renderer/src/components/terminal-pane/terminal-drop-image-path.test.ts": 56,
+      "src/renderer/src/components/terminal-pane/terminal-drop-internal-handler.test.ts": 411,
+      "src/renderer/src/components/terminal-pane/terminal-drop-path-writer.test.ts": 72,
+      "src/renderer/src/components/terminal-pane/terminal-drop-runtime-owner.test.ts": 115,
+      "src/renderer/src/components/terminal-pane/terminal-drop-shell.test.ts": 46,
+      "src/renderer/src/components/terminal-pane/terminal-drop-upload-report.test.ts": 52,
+      "src/renderer/src/components/terminal-pane/terminal-drop-write-failure.test.ts": 52,
+      "src/renderer/src/components/terminal-pane/terminal-error-accumulation.test.ts": 223,
+      "src/renderer/src/components/terminal-pane/terminal-error-remote-closed-localization.test.ts": 289,
+      "src/renderer/src/components/terminal-pane/terminal-eviction-exempt-tabs.test.ts": 809,
+      "src/renderer/src/components/terminal-pane/terminal-file-link-actions.test.ts": 195,
+      "src/renderer/src/components/terminal-pane/terminal-fit-restore.test.ts": 85,
+      "src/renderer/src/components/terminal-pane/terminal-freeze-report.test.ts": 73,
+      "src/renderer/src/components/terminal-pane/terminal-handle-copy.test.ts": 70,
+      "src/renderer/src/components/terminal-pane/terminal-handle-links.test.ts": 354,
+      "src/renderer/src/components/terminal-pane/terminal-hidden-restore-scrollback.test.ts": 23,
+      "src/renderer/src/components/terminal-pane/terminal-hidden-view-parking.test.ts": 966,
+      "src/renderer/src/components/terminal-pane/terminal-hidden-worktree-retention.test.ts": 851,
+      "src/renderer/src/components/terminal-pane/terminal-http-link-activation.test.ts": 173,
+      "src/renderer/src/components/terminal-pane/terminal-http-link-source-owner.test.ts": 76,
+      "src/renderer/src/components/terminal-pane/terminal-http-url-extraction.test.ts": 53,
+      "src/renderer/src/components/terminal-pane/terminal-ime-candidate-key-release-guard.test.ts": 57,
+      "src/renderer/src/components/terminal-pane/terminal-ime-composer-placeholder-mask.test.ts": 1182,
+      "src/renderer/src/components/terminal-pane/terminal-ime-composition-route.test.ts": 281,
+      "src/renderer/src/components/terminal-pane/terminal-ime-composition-tracker.test.ts": 479,
+      "src/renderer/src/components/terminal-pane/terminal-ime-composition-transaction-ownership.test.ts": 249,
+      "src/renderer/src/components/terminal-pane/terminal-ime-deferred-chord.test.ts": 324,
+      "src/renderer/src/components/terminal-pane/terminal-ime-deferred-newline.test.ts": 383,
+      "src/renderer/src/components/terminal-pane/terminal-ime-forwarder-space-claim.test.ts": 356,
+      "src/renderer/src/components/terminal-pane/terminal-ime-hangul-syllable-flush.test.ts": 1285,
+      "src/renderer/src/components/terminal-pane/terminal-ime-hangul-terminating-digit.test.ts": 268,
+      "src/renderer/src/components/terminal-pane/terminal-ime-input-context-refresh.test.ts": 395,
+      "src/renderer/src/components/terminal-pane/terminal-ime-linux-candidate-state.test.ts": 72,
+      "src/renderer/src/components/terminal-pane/terminal-ime-linux-claimed-preedit-release.test.ts": 546,
+      "src/renderer/src/components/terminal-pane/terminal-ime-linux-claimed-preedit-selector.test.ts": 104,
+      "src/renderer/src/components/terminal-pane/terminal-ime-macos-keybinding-dict-trace.test.ts": 482,
+      "src/renderer/src/components/terminal-pane/terminal-ime-native-text-forwarder.test.ts": 429,
+      "src/renderer/src/components/terminal-pane/terminal-ime-substituted-text-commit.test.ts": 703,
+      "src/renderer/src/components/terminal-pane/terminal-ime-won-composition-order.test.ts": 989,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-adversarial.test.ts": 4544,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-cancelled-preedit-visibility.test.ts": 606,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-composition-cancel.test.ts": 885,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-composition-deduplication.test.ts": 2544,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-consumed-key-commit.test.ts": 634,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-korean-enter-commit-order.test.ts": 670,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-linux-native-trace-replay.test.ts": 4862,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-midline-preedit-tail.test.ts": 1276,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-preedit-cell-grid.test.ts": 2107,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-resumed-preedit-visibility.test.ts": 897,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-trailing-preedit-occlusion.test.ts": 965,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-transaction-events.test.ts": 899,
+      "src/renderer/src/components/terminal-pane/terminal-ime-xterm-windows-resumed-preedit-trace.test.ts": 900,
+      "src/renderer/src/components/terminal-pane/terminal-inline-image-da1.test.ts": 118,
+      "src/renderer/src/components/terminal-pane/terminal-input-host-platform.test.ts": 1508,
+      "src/renderer/src/components/terminal-pane/terminal-input-quarantine.test.ts": 46,
+      "src/renderer/src/components/terminal-pane/terminal-ios-hangul-preedit-coexistence.test.ts": 869,
+      "src/renderer/src/components/terminal-pane/terminal-ios-hangul-preedit-device-trace.test.ts": 656,
+      "src/renderer/src/components/terminal-pane/terminal-ios-hangul-preedit.test.ts": 683,
+      "src/renderer/src/components/terminal-pane/terminal-jis-yen-input.test.ts": 40,
+      "src/renderer/src/components/terminal-pane/terminal-keyboard-event-handlers-focus.test.ts": 2134,
+      "src/renderer/src/components/terminal-pane/terminal-keyboard-pane-resolution.test.ts": 355,
+      "src/renderer/src/components/terminal-pane/terminal-keyboard-protocol-pane-agent.test.ts": 38,
+      "src/renderer/src/components/terminal-pane/terminal-keyboard-search-dispatch.test.ts": 1683,
+      "src/renderer/src/components/terminal-pane/terminal-kitty-csi-u-encoding.test.ts": 39,
+      "src/renderer/src/components/terminal-pane/terminal-layout-duplicate-pty-replay.test.ts": 73,
+      "src/renderer/src/components/terminal-pane/terminal-layout-leaf-detach.test.ts": 62,
+      "src/renderer/src/components/terminal-pane/terminal-layout-leaf-ids.test.ts": 39,
+      "src/renderer/src/components/terminal-pane/terminal-layout-overlay-focus.test.tsx": 328,
+      "src/renderer/src/components/terminal-pane/terminal-layout-pty-ownership-depth.test.ts": 103,
+      "src/renderer/src/components/terminal-pane/terminal-layout-pty-ownership.test.ts": 111,
+      "src/renderer/src/components/terminal-pane/terminal-link-action-routing.test.ts": 1448,
+      "src/renderer/src/components/terminal-pane/terminal-link-activation.test.ts": 226,
+      "src/renderer/src/components/terminal-pane/terminal-link-click-behavior.test.ts": 33,
+      "src/renderer/src/components/terminal-pane/terminal-link-click-fallback.test.ts": 902,
+      "src/renderer/src/components/terminal-pane/terminal-link-file-open-routing.test.ts": 549,
+      "src/renderer/src/components/terminal-pane/terminal-link-missing-file-open.test.ts": 398,
+      "src/renderer/src/components/terminal-pane/terminal-link-open-hints.test.ts": 263,
+      "src/renderer/src/components/terminal-pane/terminal-link-osc-file-targets.test.ts": 659,
+      "src/renderer/src/components/terminal-pane/terminal-link-osc-url-routing.test.ts": 384,
+      "src/renderer/src/components/terminal-pane/terminal-link-pointer-gesture.test.ts": 642,
+      "src/renderer/src/components/terminal-pane/terminal-link-provider-batching.test.ts": 478,
+      "src/renderer/src/components/terminal-pane/terminal-link-provider-link-detection.test.ts": 687,
+      "src/renderer/src/components/terminal-pane/terminal-link-pty-mouse-suppression.test.ts": 716,
+      "src/renderer/src/components/terminal-pane/terminal-link-remote-runtime-ssh-open.test.ts": 470,
+      "src/renderer/src/components/terminal-pane/terminal-link-worktree-root-activation.test.ts": 412,
+      "src/renderer/src/components/terminal-pane/terminal-link-wsl-path-mapping.test.ts": 497,
+      "src/renderer/src/components/terminal-pane/terminal-linkifier-click-priming.test.ts": 191,
+      "src/renderer/src/components/terminal-pane/terminal-live-layout-reconciliation.test.ts": 1437,
+      "src/renderer/src/components/terminal-pane/terminal-native-copy-gutter.test.ts": 296,
+      "src/renderer/src/components/terminal-pane/terminal-non-latin-control-chord.test.ts": 66,
+      "src/renderer/src/components/terminal-pane/terminal-notification-state.test.ts": 960,
+      "src/renderer/src/components/terminal-pane/terminal-option-kitty-release.test.ts": 47,
+      "src/renderer/src/components/terminal-pane/terminal-output-visibility.test.ts": 32,
+      "src/renderer/src/components/terminal-pane/terminal-pane-attention-subscriptions.test.ts": 64,
+      "src/renderer/src/components/terminal-pane/terminal-pane-close-identity.test.ts": 51,
+      "src/renderer/src/components/terminal-pane/terminal-pane-hook-order-parity.test.ts": 504,
+      "src/renderer/src/components/terminal-pane/terminal-pane-host-state-memo.test.ts": 1306,
+      "src/renderer/src/components/terminal-pane/terminal-pane-host-state.test.ts": 1222,
+      "src/renderer/src/components/terminal-pane/terminal-pane-listener-order-parity.test.ts": 491,
+      "src/renderer/src/components/terminal-pane/terminal-pane-recovery-unsettled-fallback.test.ts": 362,
+      "src/renderer/src/components/terminal-pane/terminal-pane-recovery.test.ts": 289,
+      "src/renderer/src/components/terminal-pane/terminal-pane-split-completion.test.ts": 38,
+      "src/renderer/src/components/terminal-pane/terminal-pane-split-request-routing.test.ts": 401,
+      "src/renderer/src/components/terminal-pane/terminal-pane-split-with-inherited-cwd.test.ts": 89,
+      "src/renderer/src/components/terminal-pane/terminal-pane-split-writer-paths.test.ts": 2320,
+      "src/renderer/src/components/terminal-pane/terminal-pane-store-subscription-budget.test.tsx": 5213,
+      "src/renderer/src/components/terminal-pane/terminal-pane-surface-ownership.test.ts": 254,
+      "src/renderer/src/components/terminal-pane/terminal-pane-tab-detach.test.ts": 119,
+      "src/renderer/src/components/terminal-pane/terminal-park-verdict-flip-telemetry.test.ts": 116,
+      "src/renderer/src/components/terminal-pane/terminal-park-verdict-worktree-driver-loop.test.tsx": 741,
+      "src/renderer/src/components/terminal-pane/terminal-parked-pane-candidates.test.ts": 1367,
+      "src/renderer/src/components/terminal-pane/terminal-parked-tab-eviction-exemption.test.ts": 298,
+      "src/renderer/src/components/terminal-pane/terminal-parked-tab-watchers-batch-sync.test.ts": 253,
+      "src/renderer/src/components/terminal-pane/terminal-parked-tab-watchers.test.ts": 1059,
+      "src/renderer/src/components/terminal-pane/terminal-parked-watcher-partial-reconciliation.test.ts": 262,
+      "src/renderer/src/components/terminal-pane/terminal-parked-watcher-reconciliation.test.ts": 161,
       "src/renderer/src/components/terminal-pane/terminal-parked-watcher-registry.test.ts": 184,
-      "src/renderer/src/components/terminal-pane/terminal-parked-watcher-sleep-preserved-exit.test.ts": 288,
-      "src/renderer/src/components/terminal-pane/terminal-parked-watcher-sole-newborn-exit.test.ts": 332,
-      "src/renderer/src/components/terminal-pane/terminal-parking-e2e-overrides.test.ts": 1887,
-      "src/renderer/src/components/terminal-pane/terminal-parser-handler-guard.test.ts": 82,
-      "src/renderer/src/components/terminal-pane/terminal-paste-coordinator.test.ts": 100,
-      "src/renderer/src/components/terminal-pane/terminal-paste-executor-default-yield.test.ts": 60,
-      "src/renderer/src/components/terminal-pane/terminal-paste-multiline-policy.test.ts": 47,
-      "src/renderer/src/components/terminal-pane/terminal-paste-operation-order.test.ts": 1576,
-      "src/renderer/src/components/terminal-pane/terminal-paste-payload-metadata.test.ts": 75,
-      "src/renderer/src/components/terminal-pane/terminal-paste-runtime.test.ts": 35,
-      "src/renderer/src/components/terminal-pane/terminal-paste-target-state.test.ts": 32,
-      "src/renderer/src/components/terminal-pane/terminal-path-existence-batch.test.ts": 76,
-      "src/renderer/src/components/terminal-pane/terminal-process-exit-restart.test.ts": 54,
-      "src/renderer/src/components/terminal-pane/terminal-programmatic-text-paste.test.ts": 1589,
-      "src/renderer/src/components/terminal-pane/terminal-pty-ack-gate.test.ts": 450,
-      "src/renderer/src/components/terminal-pane/terminal-pty-paste-writer.test.ts": 54,
-      "src/renderer/src/components/terminal-pane/terminal-quick-command-dispatch.test.ts": 49,
-      "src/renderer/src/components/terminal-pane/terminal-remote-runtime-recovery-ui-state.test.ts": 43,
-      "src/renderer/src/components/terminal-pane/terminal-render-desync-evidence-persistence.test.ts": 79,
-      "src/renderer/src/components/terminal-pane/terminal-render-desync-frame.test.ts": 54,
-      "src/renderer/src/components/terminal-pane/terminal-render-desync-sentinel.test.ts": 463,
-      "src/renderer/src/components/terminal-pane/terminal-render-desync-weight-probe.test.ts": 60,
-      "src/renderer/src/components/terminal-pane/terminal-renderer-policy.test.ts": 83,
-      "src/renderer/src/components/terminal-pane/terminal-replay-application-continuity.test.ts": 375,
-      "src/renderer/src/components/terminal-pane/terminal-replay-cursor-state.test.ts": 105,
-      "src/renderer/src/components/terminal-pane/terminal-restore-sgr-latch.test.ts": 148,
-      "src/renderer/src/components/terminal-pane/terminal-restored-viewport.test.ts": 62,
-      "src/renderer/src/components/terminal-pane/terminal-retention-exempt-growth.test.ts": 1257,
-      "src/renderer/src/components/terminal-pane/terminal-runtime-host-link-routing.test.ts": 1613,
-      "src/renderer/src/components/terminal-pane/terminal-selection-copy.test.ts": 1578,
-      "src/renderer/src/components/terminal-pane/terminal-selection-fit-guard.test.ts": 26,
-      "src/renderer/src/components/terminal-pane/terminal-shortcut-ctrl-arrow.test.ts": 78,
-      "src/renderer/src/components/terminal-pane/terminal-shortcut-option-compose.test.ts": 97,
-      "src/renderer/src/components/terminal-pane/terminal-shortcut-policy.test.ts": 102,
-      "src/renderer/src/components/terminal-pane/terminal-shortcut-select-all.test.ts": 114,
-      "src/renderer/src/components/terminal-pane/terminal-shutdown-layout-capture.test.ts": 251,
-      "src/renderer/src/components/terminal-pane/terminal-side-effect-facts-handler.test.ts": 73,
-      "src/renderer/src/components/terminal-pane/terminal-snapshot-replay-paint.test.ts": 803,
-      "src/renderer/src/components/terminal-pane/terminal-startup-command-classifier.test.ts": 65,
-      "src/renderer/src/components/terminal-pane/terminal-startup-grid-settle.test.ts": 62,
-      "src/renderer/src/components/terminal-pane/terminal-startup-timing-scheduler.test.ts": 103,
-      "src/renderer/src/components/terminal-pane/terminal-startup-timing.test.ts": 54,
-      "src/renderer/src/components/terminal-pane/terminal-tab-agent-type-index.test.ts": 53,
-      "src/renderer/src/components/terminal-pane/terminal-tab-lookup.test.ts": 43,
-      "src/renderer/src/components/terminal-pane/terminal-title-evidence.test.ts": 63,
-      "src/renderer/src/components/terminal-pane/terminal-title-tracker-parity.test.ts": 236,
-      "src/renderer/src/components/terminal-pane/terminal-unified-tab-lookup.test.ts": 66,
-      "src/renderer/src/components/terminal-pane/terminal-url-link-click.test.ts": 1876,
-      "src/renderer/src/components/terminal-pane/terminal-url-link-hit-testing.test.ts": 1929,
-      "src/renderer/src/components/terminal-pane/terminal-user-input-signal.test.ts": 70,
-      "src/renderer/src/components/terminal-pane/terminal-view-attributes-publisher.test.ts": 309,
-      "src/renderer/src/components/terminal-pane/terminal-visibility-resume.test.ts": 1592,
-      "src/renderer/src/components/terminal-pane/terminal-webgl-atlas-recovery.test.ts": 53,
-      "src/renderer/src/components/terminal-pane/terminal-webgl-diagnostics-breadcrumbs.test.ts": 74,
-      "src/renderer/src/components/terminal-pane/terminal-windows-shift-enter.test.ts": 72,
-      "src/renderer/src/components/terminal-pane/terminal-worktree-path-link.test.ts": 1471,
-      "src/renderer/src/components/terminal-pane/title-agent-identity.test.ts": 77,
-      "src/renderer/src/components/terminal-pane/use-manual-terminal-worktree-parking.test.ts": 1295,
-      "src/renderer/src/components/terminal-pane/use-mobile-overlay-ticks.perf.test.tsx": 806,
-      "src/renderer/src/components/terminal-pane/use-notification-dispatch.test.ts": 406,
-      "src/renderer/src/components/terminal-pane/use-parked-terminal-watcher-synchronization.react185.test.tsx": 702,
-      "src/renderer/src/components/terminal-pane/use-system-prefers-dark.test.ts": 51,
-      "src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-active-pty-reporting.test.ts": 1223,
-      "src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-file-drop.test.ts": 1566,
-      "src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-paste-events.test.ts": 1725,
-      "src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-sync-fit-registration.test.ts": 1485,
-      "src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-visibility-resume.test.ts": 1568,
-      "src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-window-focus-recovery.test.ts": 1657,
-      "src/renderer/src/components/terminal-pane/use-terminal-pane-lifecycle.test.ts": 2591,
-      "src/renderer/src/components/terminal-pane/use-terminal-park-mount-intent.react185.test.tsx": 685,
-      "src/renderer/src/components/terminal-pane/use-terminal-scroll-visibility-memory.test.ts": 70,
-      "src/renderer/src/components/terminal-pane/use-terminal-tab-cold-parking.test.ts": 768,
-      "src/renderer/src/components/terminal-pane/use-terminal-window-wake-recovery.test.ts": 545,
-      "src/renderer/src/components/terminal-pane/use-visible-terminal-tab-claim.test.ts": 63,
-      "src/renderer/src/components/terminal-pane/useSessionRestoredBannerDismiss.test.tsx": 537,
-      "src/renderer/src/components/terminal-pane/useTerminalFontZoom.test.ts": 486,
-      "src/renderer/src/components/terminal-pane/wrapped-terminal-link-ranges.test.ts": 55,
-      "src/renderer/src/components/terminal-pane/xterm-bypass-policy-interrupt.test.ts": 65,
-      "src/renderer/src/components/terminal-pane/xterm-bypass-policy-ios.test.ts": 75,
-      "src/renderer/src/components/terminal-pane/xterm-bypass-policy-non-mac.test.ts": 111,
-      "src/renderer/src/components/terminal-pane/xterm-bypass-policy.test.ts": 84,
-      "src/renderer/src/components/terminal-pane/xterm-write-buffer-stall.repro.test.ts": 87,
-      "src/renderer/src/components/terminal-parked-watcher-sync-entries.test.tsx": 841,
-      "src/renderer/src/components/terminal-quick-commands/TerminalQuickCommandDialog.test.tsx": 1480,
-      "src/renderer/src/components/terminal-quick-commands/terminal-quick-command-agent-options.test.ts": 153,
-      "src/renderer/src/components/terminal-quick-commands/terminal-quick-command-dialog-draft.test.ts": 435,
-      "src/renderer/src/components/terminal-scrollback-decoration-eviction.test.ts": 1114,
-      "src/renderer/src/components/terminal-search-decoration-leak.test.ts": 2344,
-      "src/renderer/src/components/terminal-search-long-wrapped-line.test.ts": 5363,
-      "src/renderer/src/components/terminal-search-safe-find.test.ts": 54,
-      "src/renderer/src/components/terminal-workspace-keydown.test.ts": 722,
-      "src/renderer/src/components/terminal-workspace-surface-ids.test.tsx": 2677,
-      "src/renderer/src/components/terminal/activation-deferred-tab-admission.test.ts": 77,
-      "src/renderer/src/components/terminal/active-terminal-repair-loop.react185.test.tsx": 2018,
-      "src/renderer/src/components/terminal/active-terminal-repair.test.ts": 50,
-      "src/renderer/src/components/terminal/background-terminal-worktree-mount.test.ts": 1557,
-      "src/renderer/src/components/terminal/background-terminal-worktree-visibility.test.ts": 60,
-      "src/renderer/src/components/terminal/cold-activation-deferral-stranding.test.ts": 2367,
-      "src/renderer/src/components/terminal/initial-terminal-structured-launch.test.tsx": 376,
-      "src/renderer/src/components/terminal/initial-terminal-wiring.test.ts": 53,
-      "src/renderer/src/components/terminal/initial-terminal.test.ts": 33,
-      "src/renderer/src/components/terminal/pty-running-work-probe-child-evidence.test.ts": 45,
-      "src/renderer/src/components/terminal/running-terminal-close-guard.test.ts": 98,
-      "src/renderer/src/components/terminal/split-group-mount.test.ts": 41,
-      "src/renderer/src/components/terminal/tab-type-cycle.test.ts": 60,
-      "src/renderer/src/components/terminal/terminal-close-confirm-keyboard-vs-mouse.test.ts": 267,
-      "src/renderer/src/components/terminal/terminal-close-copy-kind.test.ts": 50,
-      "src/renderer/src/components/terminal/terminal-close-incarnation.test.ts": 76,
-      "src/renderer/src/components/terminal/terminal-provider-snapshot-bound-pty-ids.test.ts": 1813,
-      "src/renderer/src/components/terminal/terminal-provider-snapshot-capability-resettlement.test.ts": 1611,
-      "src/renderer/src/components/terminal/terminal-provider-snapshot-capability.test.ts": 82,
-      "src/renderer/src/components/terminal/terminal-tab-actions-kill-all.test.ts": 290,
-      "src/renderer/src/components/terminal/terminal-tab-actions-unified-close.test.ts": 1333,
-      "src/renderer/src/components/terminal/terminal-tab-actions.test.ts": 372,
-      "src/renderer/src/components/terminal/terminal-tab-close-running-confirm.test.ts": 250,
-      "src/renderer/src/components/terminal/unsaved-close-queue.test.ts": 56,
-      "src/renderer/src/components/terminal/use-terminal-provider-snapshot-capability.test.tsx": 733,
-      "src/renderer/src/components/terminal/use-worktree-files.test.tsx": 650,
-      "src/renderer/src/components/terminal/window-close-running-work.test.ts": 77,
-      "src/renderer/src/components/ui/color-picker.test.tsx": 332,
-      "src/renderer/src/components/ui/popover-wheel-scroll.test.tsx": 970,
-      "src/renderer/src/components/ui/repo-multi-combobox.test.ts": 332,
-      "src/renderer/src/components/ui/scroll-area.test.tsx": 718,
-      "src/renderer/src/components/ui/slider.test.tsx": 981,
-      "src/renderer/src/components/ui/switch.test.tsx": 266,
-      "src/renderer/src/components/unexpected-signout/unexpected-signout-card.test.tsx": 2385,
-      "src/renderer/src/components/unexpected-signout/unexpected-signout-visibility.test.ts": 43,
-      "src/renderer/src/components/use-github-task-search-commit.test.ts": 531,
-      "src/renderer/src/components/use-task-creation-draft-retention.test.ts": 525,
-      "src/renderer/src/components/use-task-page-jira-list-effects.test.ts": 2137,
-      "src/renderer/src/components/use-terminal-create-actions.test.tsx": 661,
-      "src/renderer/src/components/use-terminal-editor-close-foundation.window-close.test.tsx": 1963,
-      "src/renderer/src/components/use-terminal-window-lifecycle.lazy-ref.test.tsx": 386,
-      "src/renderer/src/components/use-worktree-jump-palette-browser-ownership.test.ts": 2306,
-      "src/renderer/src/components/virtualized-list.test.tsx": 813,
-      "src/renderer/src/components/window-close-request-coordinator.test.ts": 386,
-      "src/renderer/src/components/workspace-cleanup/WorkspaceCleanupDialog.mount-gating.test.tsx": 2731,
-      "src/renderer/src/components/workspace-cleanup/WorkspaceCleanupDialog.stale-while-revalidate.test.tsx": 3305,
-      "src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-browse-state.test.tsx": 437,
-      "src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-facet-rows.test.tsx": 811,
-      "src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-git-evidence.test.tsx": 647,
-      "src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-row-order.test.ts": 646,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-active-facets.test.ts": 52,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-background-removal-late-settlement.test.ts": 1514,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-background-removal-snapshot-batch.test.ts": 1627,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-background-removal.test.ts": 184,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-candidate-list.test.tsx": 1566,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-candidate-row-data.test.ts": 77,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-candidate-row.test.tsx": 2991,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-confirm-remove.test.tsx": 907,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-deletion-phases.test.ts": 78,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-dialog-notices.test.tsx": 967,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-controls.test.tsx": 1379,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-filter.test.ts": 167,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-sort.test.ts": 85,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-filter-bar.test.tsx": 1269,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-flat-list.test.tsx": 1993,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-git-evidence.test.ts": 93,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-presentation.test.ts": 157,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-removal-candidates.test.ts": 78,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-removal-settlement.test.ts": 120,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-removal-timeout-recovery.test.ts": 1563,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-scanned-host-confirmation-removal.test.tsx": 2529,
-      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-sort-header.test.tsx": 986,
-      "src/renderer/src/components/workspace-emoji/WorkspaceEmojiSuggestionPopover.test.tsx": 898,
-      "src/renderer/src/components/workspace-emoji/useWorkspaceEmojiShortcodeInput.test.tsx": 528,
-      "src/renderer/src/components/workspace-surface-projection.test.ts": 62,
-      "src/renderer/src/components/worktree-creation/WorktreeCreationPanel.test.tsx": 472,
-      "src/renderer/src/components/worktree-jump-palette-interleaved-sections.test.tsx": 4847,
-      "src/renderer/src/components/worktree-jump-palette-primitives.test.tsx": 863,
-      "src/renderer/src/components/worktree-jump-palette-quick-action-availability.test.tsx": 688,
-      "src/renderer/src/components/worktree-jump-palette-sleeping-filter.test.ts": 1655,
-      "src/renderer/src/components/worktree-jump-palette-source-context-boundary.test.ts": 47,
-      "src/renderer/src/components/worktree-jump-palette-status-inputs.test.ts": 76,
-      "src/renderer/src/hooks/agent-hook-completion-background-turn-notifications.test.ts": 313,
-      "src/renderer/src/hooks/agent-hook-completion-fresh-working.test.ts": 179,
-      "src/renderer/src/hooks/agent-hook-completion-grok-notifications.test.ts": 441,
-      "src/renderer/src/hooks/agent-hook-completion-notifications-import.test.ts": 160,
-      "src/renderer/src/hooks/agent-hook-completion-notifications.test.ts": 661,
-      "src/renderer/src/hooks/agent-hook-completion-store-sync.test.ts": 45,
-      "src/renderer/src/hooks/automation-agent-status-entry-change.test.ts": 55,
-      "src/renderer/src/hooks/automation-dispatch-unverifiable-loss.test.ts": 180,
-      "src/renderer/src/hooks/automations-changed-event-attribution.test.ts": 1963,
-      "src/renderer/src/hooks/composer-branch-selection.test.ts": 56,
-      "src/renderer/src/hooks/composer-drop-failure-toast.test.ts": 75,
-      "src/renderer/src/hooks/composer-drop-owner.test.ts": 47,
-      "src/renderer/src/hooks/composer-drop-result.test.ts": 54,
-      "src/renderer/src/hooks/composer-native-file-drop.test.ts": 51,
-      "src/renderer/src/hooks/composer-state/attachment-drop-failure.test.tsx": 724,
-      "src/renderer/src/hooks/composer-state/branch-start-point-actions.test.ts": 899,
-      "src/renderer/src/hooks/composer-state/composer-drop-listener.test.ts": 513,
-      "src/renderer/src/hooks/composer-state/composer-name-source-selection.test.ts": 2168,
-      "src/renderer/src/hooks/composer-state/draft-target-sync.test.ts": 562,
-      "src/renderer/src/hooks/composer-state/full-creation-execution.test.ts": 3059,
-      "src/renderer/src/hooks/composer-state/full-creation-structured-launch.test.ts": 1360,
-      "src/renderer/src/hooks/composer-state/full-submit-orchestration.test.ts": 418,
-      "src/renderer/src/hooks/composer-state/multiple-create-reset.test.ts": 2164,
-      "src/renderer/src/hooks/composer-state/provider-runtime-sync.test.ts": 2107,
-      "src/renderer/src/hooks/composer-state/quick-creation-request.test.ts": 109,
-      "src/renderer/src/hooks/direct-ssh-host-hydration.test.ts": 106,
-      "src/renderer/src/hooks/direct-ssh-reconnect-coordinator.test.ts": 103,
-      "src/renderer/src/hooks/direct-ssh-reconnect-rollout.test.ts": 39,
-      "src/renderer/src/hooks/direct-ssh-reconnect-tokens.test.ts": 49,
-      "src/renderer/src/hooks/direct-ssh-runtime-wake-isolation.test.tsx": 1941,
-      "src/renderer/src/hooks/direct-ssh-state-routing.test.ts": 469,
-      "src/renderer/src/hooks/direct-ssh-worktree-refresh-scheduler.test.ts": 75,
-      "src/renderer/src/hooks/fork-push-warning.test.ts": 35,
-      "src/renderer/src/hooks/installed-agent-skill-discovery-cache.test.ts": 66,
-      "src/renderer/src/hooks/installed-agent-skill-discovery.test.ts": 90,
-      "src/renderer/src/hooks/installed-agent-skill-runtime-eviction.test.ts": 70,
-      "src/renderer/src/hooks/installed-agent-skill-verdict.test.ts": 1224,
-      "src/renderer/src/hooks/ipc-events/agent-status-pane-routing-index.test.ts": 1373,
-      "src/renderer/src/hooks/ipc-events/agent-status-pending-retry-gate.test.ts": 334,
-      "src/renderer/src/hooks/ipc-events/agent-status-terminal-title-tab-write.test.ts": 1485,
-      "src/renderer/src/hooks/ipc-events/browser-automation-bootstrap-lease.test.ts": 485,
-      "src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.profile-switch.test.ts": 582,
-      "src/renderer/src/hooks/ipc-events/browser-state-capture-paint-hold.test.ts": 146,
-      "src/renderer/src/hooks/ipc-events/browser-state-open-link-profile.test.ts": 162,
-      "src/renderer/src/hooks/ipc-events/direct-ssh-connect-reply-routing.test.ts": 1655,
-      "src/renderer/src/hooks/ipc-events/direct-ssh-hydration-fanout.test.ts": 1578,
-      "src/renderer/src/hooks/ipc-events/direct-ssh-hydration-target-metadata.test.ts": 1473,
-      "src/renderer/src/hooks/ipc-events/normalize-agent-status-event.test.ts": 55,
-      "src/renderer/src/hooks/ipc-events/orca-profile-auth-ipc-bridge.test.ts": 1579,
-      "src/renderer/src/hooks/ipc-events/os-markdown-file-open-bridge.test.ts": 175,
-      "src/renderer/src/hooks/ipc-events/runtime-reconnect-host-status.test.ts": 1650,
-      "src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge-split.test.ts": 524,
-      "src/renderer/src/hooks/ipc-events/updater-status-ipc-bridge.test.ts": 44,
-      "src/renderer/src/hooks/ipc-tab-switch-group-order-hydration.test.ts": 57,
-      "src/renderer/src/hooks/ipc-tab-switch-structured-tab-cycle.test.ts": 46,
-      "src/renderer/src/hooks/ipc-tab-switch.test.ts": 96,
-      "src/renderer/src/hooks/legacy-worker-terminal-recovery-event.test.ts": 48,
-      "src/renderer/src/hooks/macos-tcc-prompt-notice-subscription.test.ts": 58,
-      "src/renderer/src/hooks/metadata-request-cache.test.ts": 204,
-      "src/renderer/src/hooks/mobile-terminal-reveal-tab-adoption.test.ts": 2340,
-      "src/renderer/src/hooks/modal-return-focus-action.test.ts": 40,
-      "src/renderer/src/hooks/programmatic-scroll-marks.test.ts": 54,
-      "src/renderer/src/hooks/remote-workspace-deferred-placement-retry.test.ts": 321,
-      "src/renderer/src/hooks/remote-workspace-session-merge-close-tombstones.test.ts": 108,
-      "src/renderer/src/hooks/remote-workspace-session-merge-closed-terminal-tombstone.test.ts": 1835,
-      "src/renderer/src/hooks/remote-workspace-session-merge-local-survival.test.ts": 174,
-      "src/renderer/src/hooks/remote-workspace-session-merge-parked-scrollback.test.ts": 209,
-      "src/renderer/src/hooks/remote-workspace-snapshot-apply-deferred-session-write.test.ts": 1486,
-      "src/renderer/src/hooks/remote-workspace-snapshot-arrival-coordinator.test.ts": 39,
-      "src/renderer/src/hooks/remote-workspace-snapshot-duplicate-tab-repair.test.ts": 1171,
-      "src/renderer/src/hooks/remote-workspace-snapshot-fresh-client-tab-seeding.test.ts": 1329,
-      "src/renderer/src/hooks/remote-workspace-snapshot-local-tab-survival.test.ts": 1317,
-      "src/renderer/src/hooks/remote-workspace-snapshot-unplaced-tab-adoption.test.ts": 1654,
-      "src/renderer/src/hooks/remote-workspace-target-sync.test.ts": 458,
-      "src/renderer/src/hooks/runtime-client-events-sync.test.ts": 101,
-      "src/renderer/src/hooks/runtime-project-refresh-scheduler.test.ts": 100,
-      "src/renderer/src/hooks/shortcut-label-cache.test.tsx": 1903,
-      "src/renderer/src/hooks/ssh-reconnect-pane-retry.test.ts": 65,
-      "src/renderer/src/hooks/structured-session-completion-focus.test.ts": 1791,
-      "src/renderer/src/hooks/unpaired-device-auth-notification.test.ts": 55,
-      "src/renderer/src/hooks/use-audio-capture.capture-loss.test.ts": 612,
-      "src/renderer/src/hooks/use-clipboard-text-copy-feedback.test.ts": 452,
-      "src/renderer/src/hooks/use-now.test.ts": 514,
-      "src/renderer/src/hooks/use-palette-search-evaluation-context.test.ts": 403,
-      "src/renderer/src/hooks/use-task-page-github-work-item-mutation-host.test.ts": 1830,
-      "src/renderer/src/hooks/use-terminal-quick-command-hosts.test.ts": 610,
-      "src/renderer/src/hooks/use-window-stream-visibility.test.ts": 560,
-      "src/renderer/src/hooks/useActiveProjectSkillRuntime.test.tsx": 2195,
-      "src/renderer/src/hooks/useAgentDetectionTarget.test.ts": 1345,
-      "src/renderer/src/hooks/useAppMenuPaste.test.tsx": 590,
-      "src/renderer/src/hooks/useAppMenuSelectionActions.test.tsx": 612,
-      "src/renderer/src/hooks/useAutoAckViewedAgent.away.test.ts": 1684,
-      "src/renderer/src/hooks/useAutoAckViewedAgent.clock-skew.test.ts": 2116,
-      "src/renderer/src/hooks/useAutoAckViewedAgent.floating-panel.test.ts": 1439,
-      "src/renderer/src/hooks/useAutoAckViewedAgent.focus-group.test.ts": 2065,
-      "src/renderer/src/hooks/useAutoAckViewedAgent.mixed-workspace.test.ts": 1597,
-      "src/renderer/src/hooks/useAutoAckViewedAgent.test.ts": 1622,
-      "src/renderer/src/hooks/useAutomationDispatchEvents.test.ts": 951,
-      "src/renderer/src/hooks/useComposerState-decisions.test.ts": 1939,
-      "src/renderer/src/hooks/useComposerState-host-context-boundaries.test.ts": 10357,
-      "src/renderer/src/hooks/useComposerState-host-retarget.test.ts": 2477,
-      "src/renderer/src/hooks/useComposerState.integration.test.ts": 3023,
-      "src/renderer/src/hooks/useDetectedAgents.test.tsx": 1935,
-      "src/renderer/src/hooks/useEditorExternalWatch-complexity.test.ts": 5240,
-      "src/renderer/src/hooks/useEditorExternalWatch-self-move.test.ts": 425,
-      "src/renderer/src/hooks/useEditorExternalWatch-subscriptions.test.tsx": 489,
-      "src/renderer/src/hooks/useEditorExternalWatch-targets.test.ts": 501,
-      "src/renderer/src/hooks/useEditorExternalWatch-wsl-repro.test.ts": 361,
-      "src/renderer/src/hooks/useEditorExternalWatch.test.ts": 550,
-      "src/renderer/src/hooks/useEphemeralVmRecipeOptions.test.tsx": 512,
-      "src/renderer/src/hooks/useGitHubSlugMetadata.test.tsx": 612,
-      "src/renderer/src/hooks/useGlobalFileDrop.test.ts": 1236,
-      "src/renderer/src/hooks/useInstalledAgentSkills.react.test.tsx": 7199,
-      "src/renderer/src/hooks/useInstalledAgentSkills.test.ts": 1207,
-      "src/renderer/src/hooks/useIpcEvents-agent-dashboard-shortcut.test.ts": 41,
-      "src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts": 2827,
-      "src/renderer/src/hooks/useIpcEvents-agent-status-connection-attribution.test.ts": 3362,
-      "src/renderer/src/hooks/useIpcEvents-agent-status-hook-titles.test.ts": 2880,
-      "src/renderer/src/hooks/useIpcEvents-agent-status-pane-teardown.test.ts": 2611,
-      "src/renderer/src/hooks/useIpcEvents-agent-status-queue-ordering.test.ts": 2106,
-      "src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-hydration.test.ts": 2317,
-      "src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-replay.test.ts": 2527,
-      "src/renderer/src/hooks/useIpcEvents-agent-status-ssh-authority.test.ts": 2418,
-      "src/renderer/src/hooks/useIpcEvents-agent-status-turn-completion.test.ts": 1053,
-      "src/renderer/src/hooks/useIpcEvents-browser-certificate-failure.test.ts": 2189,
-      "src/renderer/src/hooks/useIpcEvents-browser-navigation.test.ts": 1399,
-      "src/renderer/src/hooks/useIpcEvents-browser-tab-create.test.ts": 2420,
-      "src/renderer/src/hooks/useIpcEvents-cli-worktree-activation.test.ts": 2588,
-      "src/renderer/src/hooks/useIpcEvents-client-hosted-browser-rows.test.ts": 2474,
-      "src/renderer/src/hooks/useIpcEvents-close-routing-active-browser-tab.test.ts": 2650,
-      "src/renderer/src/hooks/useIpcEvents-close-routing-browser-pages.test.ts": 2888,
-      "src/renderer/src/hooks/useIpcEvents-close-routing-floating-guest.test.ts": 1763,
-      "src/renderer/src/hooks/useIpcEvents-close-routing-session-tabs.test.ts": 2646,
-      "src/renderer/src/hooks/useIpcEvents-cmd-j-digit-chord.test.ts": 2005,
-      "src/renderer/src/hooks/useIpcEvents-lifecycle.test.ts": 1887,
-      "src/renderer/src/hooks/useIpcEvents-new-workspace-shortcut.test.ts": 90,
-      "src/renderer/src/hooks/useIpcEvents-rate-limit-hydration.test.ts": 1142,
-      "src/renderer/src/hooks/useIpcEvents-repos-changed-catalogs.test.ts": 2058,
-      "src/renderer/src/hooks/useIpcEvents-runtime-environment-selectors.test.ts": 301,
-      "src/renderer/src/hooks/useIpcEvents-session-tab-close-request.test.ts": 2062,
-      "src/renderer/src/hooks/useIpcEvents-silent-terminal-adoption.test.ts": 1423,
-      "src/renderer/src/hooks/useIpcEvents-ssh-disconnect-cleanup.test.ts": 1274,
-      "src/renderer/src/hooks/useIpcEvents-terminal-create-surfacing.test.ts": 4132,
-      "src/renderer/src/hooks/useIpcEvents-updater-status.test.ts": 1359,
-      "src/renderer/src/hooks/useIssueMetadata.test.tsx": 363,
-      "src/renderer/src/hooks/useLinearProviderConnected.test.tsx": 2122,
-      "src/renderer/src/hooks/useMacTccAttributionSeveredNotice.test.tsx": 2374,
-      "src/renderer/src/hooks/useMacosTccPromptNotice.test.tsx": 2024,
-      "src/renderer/src/hooks/useMetadataListRequest.test.tsx": 584,
-      "src/renderer/src/hooks/useModalReturnFocus.test.tsx": 1540,
-      "src/renderer/src/hooks/usePrimarySelectionPaste.terminal-native-paste.test.tsx": 478,
-      "src/renderer/src/hooks/usePrimarySelectionPaste.test.tsx": 645,
-      "src/renderer/src/hooks/useResetCountdownClock.test.ts": 606,
-      "src/renderer/src/hooks/useRetiredWorktreeNames.test.ts": 981,
-      "src/renderer/src/hooks/useSettingsNavigationMetadata.capability-owner.test.tsx": 1300,
-      "src/renderer/src/hooks/useSettingsNavigationMetadata.language-switch.test.tsx": 2868,
-      "src/renderer/src/hooks/useSettingsNavigationMetadata.test.ts": 2136,
-      "src/renderer/src/hooks/useSidebarResize.test.ts": 32,
-      "src/renderer/src/hooks/useSkillFreshness.test.tsx": 436,
-      "src/renderer/src/hooks/useUnreadDockBadge.test.ts": 2131,
-      "src/renderer/src/hooks/useVirtualizedScrollAnchor.listener-deps.test.ts": 72,
-      "src/renderer/src/hooks/useVirtualizedScrollAnchor.marks-restore-signal.test.ts": 65,
-      "src/renderer/src/hooks/useVirtualizedScrollAnchor.test.ts": 22,
-      "src/renderer/src/hooks/useWindowsTerminalCapabilityOwnerKey.test.tsx": 293,
-      "src/renderer/src/hooks/viewport-size-change-listener.test.ts": 55,
-      "src/renderer/src/hooks/worktree-change-refresh-queue.test.ts": 44,
-      "src/renderer/src/hooks/worktree-head-identity-apply.test.ts": 53,
-      "src/renderer/src/hooks/zoom-routing.test.ts": 317,
-      "src/renderer/src/i18n/I18nProvider.test.tsx": 1386,
-      "src/renderer/src/i18n/integration-card-status-localization.test.ts": 105,
-      "src/renderer/src/i18n/intl-locale.test.ts": 383,
-      "src/renderer/src/i18n/ja-technical-literal-mistranslations.test.ts": 140,
-      "src/renderer/src/i18n/ko-ui-semantic-mistranslations.test.ts": 161,
-      "src/renderer/src/i18n/lazy-locale.test.ts": 577,
-      "src/renderer/src/i18n/locale-english-regression.test.ts": 1127,
-      "src/renderer/src/i18n/native-chat-locales.test.ts": 595,
-      "src/renderer/src/i18n/no-top-level-translate.test.ts": 3378,
-      "src/renderer/src/i18n/plugin-chrome-allowlist.test.ts": 166,
-      "src/renderer/src/i18n/pseudo-localization.test.ts": 104,
-      "src/renderer/src/i18n/relative-time-format.test.ts": 77,
-      "src/renderer/src/i18n/runtime-required-catalog.test.ts": 634,
-      "src/renderer/src/i18n/settings-status-label-localization.test.ts": 1149,
-      "src/renderer/src/i18n/smart-workspace-jira-locales.test.ts": 484,
-      "src/renderer/src/i18n/technical-literal-catalog-values.test.ts": 704,
-      "src/renderer/src/i18n/weekday-names.test.ts": 98,
-      "src/renderer/src/i18n/worktree-visibility-locales.test.ts": 449,
-      "src/renderer/src/i18n/zh-technical-literal-mistranslations.test.ts": 410,
-      "src/renderer/src/lazy-modal-mount-state.test.ts": 134,
-      "src/renderer/src/lazy-use-ref-ratchet.test.ts": 172,
-      "src/renderer/src/lib/activate-ai-vault-structured-session-reveal.test.ts": 2148,
-      "src/renderer/src/lib/activate-ai-vault-structured-session.test.ts": 1297,
-      "src/renderer/src/lib/activate-tab-and-focus-pane.test.ts": 46,
-      "src/renderer/src/lib/active-agent-note-send-explicit-target.test.ts": 670,
-      "src/renderer/src/lib/active-agent-note-send-focused-session.test.ts": 466,
-      "src/renderer/src/lib/active-agent-note-send-runtime-error-codes.test.ts": 66,
-      "src/renderer/src/lib/active-agent-note-send-target-detection.test.ts": 417,
-      "src/renderer/src/lib/active-view-persist.test.ts": 48,
-      "src/renderer/src/lib/activity-thread-display.test.ts": 38,
-      "src/renderer/src/lib/agent-background-session-launch-host.test.ts": 1543,
-      "src/renderer/src/lib/agent-catalog-links.test.ts": 127,
-      "src/renderer/src/lib/agent-draft-readiness.test.ts": 83,
-      "src/renderer/src/lib/agent-followup-delivery.test.ts": 18746,
-      "src/renderer/src/lib/agent-hibernation-confirmation.test.ts": 38,
-      "src/renderer/src/lib/agent-hibernation-coordinator.test.ts": 1636,
-      "src/renderer/src/lib/agent-hibernation-output-activity.test.ts": 30,
-      "src/renderer/src/lib/agent-hibernation-pane-age.test.ts": 52,
-      "src/renderer/src/lib/agent-hibernation-planner.test.ts": 165,
-      "src/renderer/src/lib/agent-hibernation-runtime-liveness-race.test.ts": 1609,
-      "src/renderer/src/lib/agent-hibernation-visibility.test.ts": 1874,
-      "src/renderer/src/lib/agent-launch-caller-permissions.test.ts": 798,
-      "src/renderer/src/lib/agent-launch-caller-placement.test.ts": 747,
-      "src/renderer/src/lib/agent-launch-caller-profile-census.test.ts": 609,
-      "src/renderer/src/lib/agent-launch-caller-prompt-transport.test.ts": 942,
-      "src/renderer/src/lib/agent-launch-caller-routing.test.ts": 775,
-      "src/renderer/src/lib/agent-launch-prompt-delivery.test.ts": 86,
-      "src/renderer/src/lib/agent-launch-route-connection-fallback.test.ts": 1733,
-      "src/renderer/src/lib/agent-launch-route-input.test.ts": 206,
-      "src/renderer/src/lib/agent-launch-routing-caller-census.test.ts": 956,
-      "src/renderer/src/lib/agent-launch-routing.test.ts": 69,
-      "src/renderer/src/lib/agent-paste-draft-readiness-budget.test.ts": 262,
-      "src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts": 334,
-      "src/renderer/src/lib/agent-paste-draft.test.ts": 656,
-      "src/renderer/src/lib/agent-picker-search.test.ts": 151,
-      "src/renderer/src/lib/agent-ready-wait.test.ts": 71,
-      "src/renderer/src/lib/agent-resume-launch-target.test.ts": 2635,
-      "src/renderer/src/lib/agent-row-primary-text.test.ts": 51,
-      "src/renderer/src/lib/agent-row-tool-preview.test.ts": 44,
-      "src/renderer/src/lib/agent-send-title-status.test.ts": 76,
-      "src/renderer/src/lib/agent-session-fork-context.test.ts": 64,
-      "src/renderer/src/lib/agent-session-launch-plan.test.ts": 76,
-      "src/renderer/src/lib/agent-skill-cli-prerequisite.test.ts": 172,
-      "src/renderer/src/lib/agent-skill-nav-install-status.test.ts": 1572,
-      "src/renderer/src/lib/agent-startup-delayed-delivery-perf.test.ts": 1588,
-      "src/renderer/src/lib/agent-status-connection-ownership.test.ts": 89,
-      "src/renderer/src/lib/agent-status-count.test.ts": 71,
-      "src/renderer/src/lib/agent-status-epoch-clock.test.ts": 36,
-      "src/renderer/src/lib/agent-status-evidence-clock.test.ts": 71,
-      "src/renderer/src/lib/agent-status-terminal-title.test.ts": 78,
-      "src/renderer/src/lib/agent-status-worktree-attribution.test.ts": 52,
-      "src/renderer/src/lib/agent-status.test.ts": 1160,
-      "src/renderer/src/lib/agent-tab-shortcuts.test.ts": 62,
-      "src/renderer/src/lib/agent-trust-preflight.test.ts": 68,
-      "src/renderer/src/lib/ai-vault-omp-cold-resume.test.ts": 1707,
-      "src/renderer/src/lib/ai-vault-resume-command.drop-repin.test.ts": 273,
-      "src/renderer/src/lib/ai-vault-resume-command.resumable-agent.test.ts": 290,
-      "src/renderer/src/lib/ai-vault-resume-command.test.ts": 358,
-      "src/renderer/src/lib/ai-vault-resume-shell.test.ts": 279,
-      "src/renderer/src/lib/ai-vault-resume-target.test.ts": 65,
-      "src/renderer/src/lib/ai-vault-session-drag.test.ts": 77,
-      "src/renderer/src/lib/ai-vault-session-resume-preparation.test.ts": 64,
-      "src/renderer/src/lib/ai-vault-tab-title-sync-inputs.test.ts": 275,
-      "src/renderer/src/lib/ai-vault-tab-title-sync.test.ts": 734,
-      "src/renderer/src/lib/app-command-dispatch.test.ts": 54,
-      "src/renderer/src/lib/app-font-family.test.ts": 178,
-      "src/renderer/src/lib/app-menu-paste.test.ts": 529,
-      "src/renderer/src/lib/app-menu-selection-actions.test.ts": 415,
-      "src/renderer/src/lib/automation-session-observer.test.ts": 94,
-      "src/renderer/src/lib/automation-session-reuse.test.ts": 55,
-      "src/renderer/src/lib/automation-terminal-ownership.test.ts": 1531,
-      "src/renderer/src/lib/browser-cookie-import-toast.test.ts": 105,
-      "src/renderer/src/lib/browser-history-match.performance.test.ts": 191,
-      "src/renderer/src/lib/browser-history-match.test.ts": 259,
-      "src/renderer/src/lib/browser-page-conversion-history.test.ts": 62,
-      "src/renderer/src/lib/browser-page-palette-activation.test.ts": 1960,
-      "src/renderer/src/lib/browser-palette-page-entries.test.ts": 415,
-      "src/renderer/src/lib/browser-palette-search.test.ts": 218,
-      "src/renderer/src/lib/browser-uuid.test.ts": 57,
-      "src/renderer/src/lib/browser-workspace-tab-activation.test.ts": 1719,
-      "src/renderer/src/lib/client-creation-action-policy.test.ts": 179,
-      "src/renderer/src/lib/cmd-j-github-url-lookup.test.ts": 41,
-      "src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts": 449,
-      "src/renderer/src/lib/cmd-j-linear-issue-intent.test.ts": 47,
-      "src/renderer/src/lib/cmd-j-section-leadership.test.ts": 55,
-      "src/renderer/src/lib/codex-account-display-label.test.ts": 51,
-      "src/renderer/src/lib/codex-pane-restart-eligibility.test.ts": 79,
-      "src/renderer/src/lib/codex-pane-selection-lane.test.ts": 277,
-      "src/renderer/src/lib/codex-session-restart-route-recheck.test.ts": 1187,
-      "src/renderer/src/lib/codex-session-restart-shell-flap.test.ts": 1721,
-      "src/renderer/src/lib/codex-session-restart.test.ts": 4543,
-      "src/renderer/src/lib/codex-stale-pane-account-identity.test.ts": 1404,
-      "src/renderer/src/lib/codex-stale-pane-sweep.test.ts": 1646,
-      "src/renderer/src/lib/comment-body-line-count.test.ts": 104,
-      "src/renderer/src/lib/comment-body-submit-state.test.ts": 61,
-      "src/renderer/src/lib/composer-issue-command.test.ts": 1637,
-      "src/renderer/src/lib/composer-submit-cancellation.test.ts": 53,
-      "src/renderer/src/lib/connection-context.test.ts": 1662,
-      "src/renderer/src/lib/crash-diagnostics.test.ts": 147,
-      "src/renderer/src/lib/create-untitled-markdown.test.ts": 334,
-      "src/renderer/src/lib/default-terminal-tabs-applied-persist.test.ts": 1506,
-      "src/renderer/src/lib/desktop-window-chrome.test.ts": 38,
-      "src/renderer/src/lib/diff-comment-compat.test.ts": 25,
-      "src/renderer/src/lib/diff-comments-format.test.ts": 49,
-      "src/renderer/src/lib/direct-ssh-reconnect-product-telemetry.test.ts": 59,
-      "src/renderer/src/lib/direct-ssh-target-scope.test.ts": 51,
-      "src/renderer/src/lib/doc-preview-grants.test.ts": 331,
-      "src/renderer/src/lib/document-theme.test.ts": 43,
-      "src/renderer/src/lib/editable-target.test.ts": 301,
-      "src/renderer/src/lib/editor-file-operation-owner.test.ts": 1934,
+      "src/renderer/src/components/terminal-pane/terminal-parked-watcher-sleep-preserved-exit.test.ts": 189,
+      "src/renderer/src/components/terminal-pane/terminal-parked-watcher-sole-newborn-exit.test.ts": 316,
+      "src/renderer/src/components/terminal-pane/terminal-parking-e2e-overrides.test.ts": 2679,
+      "src/renderer/src/components/terminal-pane/terminal-parser-handler-guard.test.ts": 62,
+      "src/renderer/src/components/terminal-pane/terminal-paste-coordinator.test.ts": 105,
+      "src/renderer/src/components/terminal-pane/terminal-paste-executor-default-yield.test.ts": 52,
+      "src/renderer/src/components/terminal-pane/terminal-paste-multiline-policy.test.ts": 72,
+      "src/renderer/src/components/terminal-pane/terminal-paste-operation-order.test.ts": 1530,
+      "src/renderer/src/components/terminal-pane/terminal-paste-payload-metadata.test.ts": 45,
+      "src/renderer/src/components/terminal-pane/terminal-paste-runtime.test.ts": 39,
+      "src/renderer/src/components/terminal-pane/terminal-paste-target-state.test.ts": 52,
+      "src/renderer/src/components/terminal-pane/terminal-path-existence-batch.test.ts": 40,
+      "src/renderer/src/components/terminal-pane/terminal-process-exit-restart.test.ts": 49,
+      "src/renderer/src/components/terminal-pane/terminal-programmatic-text-paste.test.ts": 1734,
+      "src/renderer/src/components/terminal-pane/terminal-pty-ack-gate.test.ts": 335,
+      "src/renderer/src/components/terminal-pane/terminal-pty-paste-writer.test.ts": 28,
+      "src/renderer/src/components/terminal-pane/terminal-quick-command-dispatch.test.ts": 71,
+      "src/renderer/src/components/terminal-pane/terminal-remote-runtime-recovery-ui-state.test.ts": 42,
+      "src/renderer/src/components/terminal-pane/terminal-render-desync-evidence-persistence.test.ts": 67,
+      "src/renderer/src/components/terminal-pane/terminal-render-desync-frame.test.ts": 67,
+      "src/renderer/src/components/terminal-pane/terminal-render-desync-sentinel.test.ts": 430,
+      "src/renderer/src/components/terminal-pane/terminal-render-desync-weight-probe.test.ts": 52,
+      "src/renderer/src/components/terminal-pane/terminal-renderer-policy.test.ts": 115,
+      "src/renderer/src/components/terminal-pane/terminal-replay-application-continuity.test.ts": 363,
+      "src/renderer/src/components/terminal-pane/terminal-replay-cursor-state.test.ts": 117,
+      "src/renderer/src/components/terminal-pane/terminal-restore-sgr-latch.test.ts": 179,
+      "src/renderer/src/components/terminal-pane/terminal-restored-viewport.test.ts": 42,
+      "src/renderer/src/components/terminal-pane/terminal-retention-churn-pins.test.tsx": 569,
+      "src/renderer/src/components/terminal-pane/terminal-retention-exempt-growth.test.ts": 1509,
+      "src/renderer/src/components/terminal-pane/terminal-runtime-host-link-routing.test.ts": 2008,
+      "src/renderer/src/components/terminal-pane/terminal-selection-copy.test.ts": 980,
+      "src/renderer/src/components/terminal-pane/terminal-selection-fit-guard.test.ts": 37,
+      "src/renderer/src/components/terminal-pane/terminal-shortcut-ctrl-arrow.test.ts": 57,
+      "src/renderer/src/components/terminal-pane/terminal-shortcut-option-compose.test.ts": 120,
+      "src/renderer/src/components/terminal-pane/terminal-shortcut-policy.test.ts": 133,
+      "src/renderer/src/components/terminal-pane/terminal-shortcut-select-all.test.ts": 85,
+      "src/renderer/src/components/terminal-pane/terminal-shutdown-layout-capture.test.ts": 90,
+      "src/renderer/src/components/terminal-pane/terminal-side-effect-facts-handler.test.ts": 36,
+      "src/renderer/src/components/terminal-pane/terminal-snapshot-replay-paint.test.ts": 704,
+      "src/renderer/src/components/terminal-pane/terminal-startup-command-classifier.test.ts": 44,
+      "src/renderer/src/components/terminal-pane/terminal-startup-grid-settle.test.ts": 56,
+      "src/renderer/src/components/terminal-pane/terminal-startup-timing-scheduler.test.ts": 114,
+      "src/renderer/src/components/terminal-pane/terminal-startup-timing.test.ts": 62,
+      "src/renderer/src/components/terminal-pane/terminal-tab-agent-type-index.test.ts": 58,
+      "src/renderer/src/components/terminal-pane/terminal-tab-lookup.test.ts": 30,
+      "src/renderer/src/components/terminal-pane/terminal-title-evidence.test.ts": 84,
+      "src/renderer/src/components/terminal-pane/terminal-title-tracker-parity.test.ts": 263,
+      "src/renderer/src/components/terminal-pane/terminal-unified-tab-lookup.test.ts": 42,
+      "src/renderer/src/components/terminal-pane/terminal-url-link-click.test.ts": 1229,
+      "src/renderer/src/components/terminal-pane/terminal-url-link-hit-testing.test.ts": 1570,
+      "src/renderer/src/components/terminal-pane/terminal-user-input-signal.test.ts": 160,
+      "src/renderer/src/components/terminal-pane/terminal-view-attributes-publisher.test.ts": 274,
+      "src/renderer/src/components/terminal-pane/terminal-visibility-resume.test.ts": 1249,
+      "src/renderer/src/components/terminal-pane/terminal-webgl-atlas-recovery.test.ts": 41,
+      "src/renderer/src/components/terminal-pane/terminal-webgl-diagnostics-breadcrumbs.test.ts": 71,
+      "src/renderer/src/components/terminal-pane/terminal-windows-shift-enter.test.ts": 65,
+      "src/renderer/src/components/terminal-pane/terminal-worktree-path-link.test.ts": 1613,
+      "src/renderer/src/components/terminal-pane/title-agent-identity.test.ts": 35,
+      "src/renderer/src/components/terminal-pane/use-manual-terminal-worktree-parking.test.ts": 1809,
+      "src/renderer/src/components/terminal-pane/use-mobile-overlay-ticks.perf.test.tsx": 764,
+      "src/renderer/src/components/terminal-pane/use-notification-dispatch.test.ts": 291,
+      "src/renderer/src/components/terminal-pane/use-parked-terminal-watcher-synchronization.react185.test.tsx": 587,
+      "src/renderer/src/components/terminal-pane/use-system-prefers-dark.test.ts": 45,
+      "src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-active-pty-reporting.test.ts": 1301,
+      "src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-file-drop.test.ts": 1219,
+      "src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-paste-events.test.ts": 1149,
+      "src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-sync-fit-registration.test.ts": 1211,
+      "src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-visibility-resume.test.ts": 1904,
+      "src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-window-focus-recovery.test.ts": 1363,
+      "src/renderer/src/components/terminal-pane/use-terminal-pane-lifecycle.test.ts": 2216,
+      "src/renderer/src/components/terminal-pane/use-terminal-park-mount-intent.react185.test.tsx": 627,
+      "src/renderer/src/components/terminal-pane/use-terminal-scroll-visibility-memory.test.ts": 50,
+      "src/renderer/src/components/terminal-pane/use-terminal-tab-cold-parking.test.ts": 975,
+      "src/renderer/src/components/terminal-pane/use-terminal-window-wake-recovery.test.ts": 611,
+      "src/renderer/src/components/terminal-pane/use-visible-terminal-tab-claim.test.ts": 72,
+      "src/renderer/src/components/terminal-pane/useSessionRestoredBannerDismiss.test.tsx": 511,
+      "src/renderer/src/components/terminal-pane/useTerminalFontZoom.test.ts": 340,
+      "src/renderer/src/components/terminal-pane/wrapped-terminal-link-ranges.test.ts": 74,
+      "src/renderer/src/components/terminal-pane/xterm-bypass-policy-interrupt.test.ts": 77,
+      "src/renderer/src/components/terminal-pane/xterm-bypass-policy-ios.test.ts": 142,
+      "src/renderer/src/components/terminal-pane/xterm-bypass-policy-non-mac.test.ts": 52,
+      "src/renderer/src/components/terminal-pane/xterm-bypass-policy.test.ts": 62,
+      "src/renderer/src/components/terminal-pane/xterm-write-buffer-stall.repro.test.ts": 82,
+      "src/renderer/src/components/terminal-parked-watcher-sync-entries.test.tsx": 994,
+      "src/renderer/src/components/terminal-quick-commands/TerminalQuickCommandDialog.test.tsx": 1832,
+      "src/renderer/src/components/terminal-quick-commands/terminal-quick-command-agent-options.test.ts": 177,
+      "src/renderer/src/components/terminal-quick-commands/terminal-quick-command-dialog-draft.test.ts": 241,
+      "src/renderer/src/components/terminal-scrollback-decoration-eviction.test.ts": 1037,
+      "src/renderer/src/components/terminal-search-decoration-leak.test.ts": 2437,
+      "src/renderer/src/components/terminal-search-long-wrapped-line.test.ts": 5608,
+      "src/renderer/src/components/terminal-search-safe-find.test.ts": 51,
+      "src/renderer/src/components/terminal-workspace-keydown.test.ts": 822,
+      "src/renderer/src/components/terminal-workspace-surface-ids.test.tsx": 2751,
+      "src/renderer/src/components/terminal/activation-deferred-tab-admission.test.ts": 55,
+      "src/renderer/src/components/terminal/active-terminal-repair-loop.react185.test.tsx": 1990,
+      "src/renderer/src/components/terminal/active-terminal-repair.test.ts": 47,
+      "src/renderer/src/components/terminal/background-terminal-worktree-mount.test.ts": 1529,
+      "src/renderer/src/components/terminal/background-terminal-worktree-visibility.test.ts": 43,
+      "src/renderer/src/components/terminal/cold-activation-deferral-stranding.test.ts": 1885,
+      "src/renderer/src/components/terminal/initial-terminal-structured-launch.test.tsx": 556,
+      "src/renderer/src/components/terminal/initial-terminal-wiring.test.ts": 41,
+      "src/renderer/src/components/terminal/initial-terminal.test.ts": 48,
+      "src/renderer/src/components/terminal/pty-running-work-probe-child-evidence.test.ts": 33,
+      "src/renderer/src/components/terminal/running-terminal-close-guard.test.ts": 67,
+      "src/renderer/src/components/terminal/split-group-mount.test.ts": 30,
+      "src/renderer/src/components/terminal/tab-type-cycle.test.ts": 46,
+      "src/renderer/src/components/terminal/terminal-close-confirm-keyboard-vs-mouse.test.ts": 226,
+      "src/renderer/src/components/terminal/terminal-close-copy-kind.test.ts": 67,
+      "src/renderer/src/components/terminal/terminal-close-incarnation.test.ts": 70,
+      "src/renderer/src/components/terminal/terminal-provider-snapshot-bound-pty-ids.test.ts": 2039,
+      "src/renderer/src/components/terminal/terminal-provider-snapshot-capability-resettlement.test.ts": 1467,
+      "src/renderer/src/components/terminal/terminal-provider-snapshot-capability.test.ts": 65,
+      "src/renderer/src/components/terminal/terminal-tab-actions-kill-all.test.ts": 294,
+      "src/renderer/src/components/terminal/terminal-tab-actions-unified-close.test.ts": 1627,
+      "src/renderer/src/components/terminal/terminal-tab-actions.test.ts": 322,
+      "src/renderer/src/components/terminal/terminal-tab-close-running-confirm.test.ts": 178,
+      "src/renderer/src/components/terminal/unsaved-close-queue.test.ts": 49,
+      "src/renderer/src/components/terminal/use-terminal-provider-snapshot-capability.test.tsx": 750,
+      "src/renderer/src/components/terminal/use-worktree-files.test.tsx": 359,
+      "src/renderer/src/components/terminal/window-close-running-work.test.ts": 67,
+      "src/renderer/src/components/ui/color-picker.test.tsx": 537,
+      "src/renderer/src/components/ui/popover-wheel-scroll.test.tsx": 931,
+      "src/renderer/src/components/ui/repo-multi-combobox.test.ts": 461,
+      "src/renderer/src/components/ui/scroll-area.test.tsx": 420,
+      "src/renderer/src/components/ui/slider.test.tsx": 848,
+      "src/renderer/src/components/ui/switch.test.tsx": 180,
+      "src/renderer/src/components/unexpected-signout/unexpected-signout-card.test.tsx": 1887,
+      "src/renderer/src/components/unexpected-signout/unexpected-signout-visibility.test.ts": 59,
+      "src/renderer/src/components/use-github-task-search-commit.test.ts": 679,
+      "src/renderer/src/components/use-task-creation-draft-retention.test.ts": 550,
+      "src/renderer/src/components/use-task-page-jira-list-effects.test.ts": 2187,
+      "src/renderer/src/components/use-terminal-create-actions.test.tsx": 444,
+      "src/renderer/src/components/use-terminal-editor-close-foundation.window-close.test.tsx": 1796,
+      "src/renderer/src/components/use-terminal-window-lifecycle.lazy-ref.test.tsx": 381,
+      "src/renderer/src/components/use-worktree-jump-palette-browser-ownership.test.ts": 2178,
+      "src/renderer/src/components/virtualized-list.test.tsx": 788,
+      "src/renderer/src/components/window-close-request-coordinator.test.ts": 436,
+      "src/renderer/src/components/workspace-cleanup/WorkspaceCleanupDialog.mount-gating.test.tsx": 1869,
+      "src/renderer/src/components/workspace-cleanup/WorkspaceCleanupDialog.stale-while-revalidate.test.tsx": 2614,
+      "src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-browse-state.test.tsx": 512,
+      "src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-facet-rows.test.tsx": 758,
+      "src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-git-evidence.test.tsx": 637,
+      "src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-row-order.test.ts": 328,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-active-facets.test.ts": 92,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-background-removal-late-settlement.test.ts": 1640,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-background-removal-snapshot-batch.test.ts": 1286,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-background-removal.test.ts": 126,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-candidate-list.test.tsx": 2448,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-candidate-row-data.test.ts": 175,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-candidate-row.test.tsx": 2561,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-confirm-remove.test.tsx": 818,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-deletion-phases.test.ts": 103,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-dialog-notices.test.tsx": 972,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-controls.test.tsx": 1353,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-filter.test.ts": 115,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-sort.test.ts": 68,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-filter-bar.test.tsx": 1202,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-flat-list.test.tsx": 2644,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-git-evidence.test.ts": 92,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-presentation.test.ts": 106,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-removal-candidates.test.ts": 116,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-removal-settlement.test.ts": 77,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-removal-timeout-recovery.test.ts": 1354,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-scanned-host-confirmation-removal.test.tsx": 1810,
+      "src/renderer/src/components/workspace-cleanup/workspace-cleanup-sort-header.test.tsx": 957,
+      "src/renderer/src/components/workspace-emoji/WorkspaceEmojiSuggestionPopover.test.tsx": 737,
+      "src/renderer/src/components/workspace-emoji/useWorkspaceEmojiShortcodeInput.test.tsx": 786,
+      "src/renderer/src/components/workspace-surface-projection.test.ts": 57,
+      "src/renderer/src/components/worktree-creation/WorktreeCreationPanel.test.tsx": 591,
+      "src/renderer/src/components/worktree-jump-palette-interleaved-sections.test.tsx": 5202,
+      "src/renderer/src/components/worktree-jump-palette-primitives.test.tsx": 836,
+      "src/renderer/src/components/worktree-jump-palette-quick-action-availability.test.tsx": 939,
+      "src/renderer/src/components/worktree-jump-palette-sleeping-filter.test.ts": 2023,
+      "src/renderer/src/components/worktree-jump-palette-source-context-boundary.test.ts": 52,
+      "src/renderer/src/components/worktree-jump-palette-status-inputs.test.ts": 62,
+      "src/renderer/src/hooks/agent-hook-completion-background-turn-notifications.test.ts": 334,
+      "src/renderer/src/hooks/agent-hook-completion-fresh-working.test.ts": 111,
+      "src/renderer/src/hooks/agent-hook-completion-grok-notifications.test.ts": 471,
+      "src/renderer/src/hooks/agent-hook-completion-notifications-import.test.ts": 148,
+      "src/renderer/src/hooks/agent-hook-completion-notifications.test.ts": 371,
+      "src/renderer/src/hooks/agent-hook-completion-store-sync.test.ts": 77,
+      "src/renderer/src/hooks/automation-agent-status-entry-change.test.ts": 45,
+      "src/renderer/src/hooks/automation-dispatch-unverifiable-loss.test.ts": 169,
+      "src/renderer/src/hooks/automations-changed-event-attribution.test.ts": 1405,
+      "src/renderer/src/hooks/composer-branch-selection.test.ts": 54,
+      "src/renderer/src/hooks/composer-drop-failure-toast.test.ts": 83,
+      "src/renderer/src/hooks/composer-drop-owner.test.ts": 32,
+      "src/renderer/src/hooks/composer-drop-result.test.ts": 33,
+      "src/renderer/src/hooks/composer-native-file-drop.test.ts": 57,
+      "src/renderer/src/hooks/composer-state/attachment-drop-failure.test.tsx": 668,
+      "src/renderer/src/hooks/composer-state/attachment-drop-lifetime.test.tsx": 1076,
+      "src/renderer/src/hooks/composer-state/branch-start-point-actions.test.ts": 560,
+      "src/renderer/src/hooks/composer-state/composer-drop-listener.test.ts": 663,
+      "src/renderer/src/hooks/composer-state/composer-name-source-selection.test.ts": 2276,
+      "src/renderer/src/hooks/composer-state/draft-target-sync.test.ts": 571,
+      "src/renderer/src/hooks/composer-state/full-creation-execution.test.ts": 1939,
+      "src/renderer/src/hooks/composer-state/full-creation-structured-launch.test.ts": 1517,
+      "src/renderer/src/hooks/composer-state/full-submit-orchestration.test.ts": 610,
+      "src/renderer/src/hooks/composer-state/multiple-create-reset.test.ts": 1387,
+      "src/renderer/src/hooks/composer-state/provider-runtime-sync.test.ts": 1981,
+      "src/renderer/src/hooks/composer-state/quick-creation-request.test.ts": 113,
+      "src/renderer/src/hooks/direct-ssh-host-hydration.test.ts": 113,
+      "src/renderer/src/hooks/direct-ssh-reconnect-coordinator.test.ts": 108,
+      "src/renderer/src/hooks/direct-ssh-reconnect-rollout.test.ts": 40,
+      "src/renderer/src/hooks/direct-ssh-reconnect-tokens.test.ts": 54,
+      "src/renderer/src/hooks/direct-ssh-runtime-wake-isolation.test.tsx": 1496,
+      "src/renderer/src/hooks/direct-ssh-state-routing.test.ts": 302,
+      "src/renderer/src/hooks/direct-ssh-worktree-refresh-scheduler.test.ts": 63,
+      "src/renderer/src/hooks/fork-push-warning.test.ts": 59,
+      "src/renderer/src/hooks/installed-agent-skill-discovery-cache.test.ts": 67,
+      "src/renderer/src/hooks/installed-agent-skill-discovery.test.ts": 70,
+      "src/renderer/src/hooks/installed-agent-skill-runtime-eviction.test.ts": 50,
+      "src/renderer/src/hooks/installed-agent-skill-verdict.test.ts": 927,
+      "src/renderer/src/hooks/ipc-events/agent-status-pane-routing-index.test.ts": 1777,
+      "src/renderer/src/hooks/ipc-events/agent-status-pending-retry-gate.test.ts": 339,
+      "src/renderer/src/hooks/ipc-events/agent-status-terminal-title-tab-write.test.ts": 1508,
+      "src/renderer/src/hooks/ipc-events/browser-automation-bootstrap-lease.test.ts": 461,
+      "src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.profile-switch.test.ts": 503,
+      "src/renderer/src/hooks/ipc-events/browser-state-capture-paint-hold.test.ts": 198,
+      "src/renderer/src/hooks/ipc-events/browser-state-open-link-profile.test.ts": 206,
+      "src/renderer/src/hooks/ipc-events/direct-ssh-connect-reply-routing.test.ts": 1662,
+      "src/renderer/src/hooks/ipc-events/direct-ssh-hydration-fanout.test.ts": 945,
+      "src/renderer/src/hooks/ipc-events/direct-ssh-hydration-target-metadata.test.ts": 1392,
+      "src/renderer/src/hooks/ipc-events/normalize-agent-status-event.test.ts": 30,
+      "src/renderer/src/hooks/ipc-events/orca-profile-auth-ipc-bridge.test.ts": 1618,
+      "src/renderer/src/hooks/ipc-events/os-markdown-file-open-bridge.test.ts": 207,
+      "src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge-ownership.test.ts": 1063,
+      "src/renderer/src/hooks/ipc-events/runtime-reconnect-host-status.test.ts": 1734,
+      "src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge-split.test.ts": 361,
+      "src/renderer/src/hooks/ipc-events/updater-status-ipc-bridge.test.ts": 57,
+      "src/renderer/src/hooks/ipc-tab-switch-group-order-hydration.test.ts": 69,
+      "src/renderer/src/hooks/ipc-tab-switch-structured-tab-cycle.test.ts": 57,
+      "src/renderer/src/hooks/ipc-tab-switch.test.ts": 98,
+      "src/renderer/src/hooks/legacy-worker-terminal-recovery-event.test.ts": 61,
+      "src/renderer/src/hooks/macos-tcc-prompt-notice-subscription.test.ts": 53,
+      "src/renderer/src/hooks/metadata-request-cache.test.ts": 179,
+      "src/renderer/src/hooks/mobile-terminal-reveal-tab-adoption.test.ts": 2329,
+      "src/renderer/src/hooks/modal-return-focus-action.test.ts": 27,
+      "src/renderer/src/hooks/programmatic-scroll-marks.test.ts": 46,
+      "src/renderer/src/hooks/remote-workspace-deferred-placement-retry.test.ts": 329,
+      "src/renderer/src/hooks/remote-workspace-session-merge-close-tombstones.test.ts": 102,
+      "src/renderer/src/hooks/remote-workspace-session-merge-closed-terminal-tombstone.test.ts": 1845,
+      "src/renderer/src/hooks/remote-workspace-session-merge-local-survival.test.ts": 94,
+      "src/renderer/src/hooks/remote-workspace-session-merge-parked-scrollback.test.ts": 159,
+      "src/renderer/src/hooks/remote-workspace-snapshot-apply-deferred-session-write.test.ts": 1341,
+      "src/renderer/src/hooks/remote-workspace-snapshot-arrival-coordinator.test.ts": 56,
+      "src/renderer/src/hooks/remote-workspace-snapshot-duplicate-tab-repair.test.ts": 1373,
+      "src/renderer/src/hooks/remote-workspace-snapshot-fresh-client-tab-seeding.test.ts": 1712,
+      "src/renderer/src/hooks/remote-workspace-snapshot-local-tab-survival.test.ts": 1572,
+      "src/renderer/src/hooks/remote-workspace-snapshot-unplaced-tab-adoption.test.ts": 1734,
+      "src/renderer/src/hooks/remote-workspace-target-sync.test.ts": 336,
+      "src/renderer/src/hooks/runtime-client-events-sync-ownership.test.ts": 78,
+      "src/renderer/src/hooks/runtime-client-events-sync.test.ts": 100,
+      "src/renderer/src/hooks/runtime-project-refresh-scheduler.test.ts": 93,
+      "src/renderer/src/hooks/shortcut-label-cache.test.tsx": 2047,
+      "src/renderer/src/hooks/ssh-reconnect-pane-retry.test.ts": 71,
+      "src/renderer/src/hooks/structured-session-completion-focus.test.ts": 1246,
+      "src/renderer/src/hooks/unpaired-device-auth-notification.test.ts": 49,
+      "src/renderer/src/hooks/use-audio-capture.capture-loss.test.ts": 393,
+      "src/renderer/src/hooks/use-clipboard-text-copy-feedback.test.ts": 420,
+      "src/renderer/src/hooks/use-now.test.ts": 318,
+      "src/renderer/src/hooks/use-palette-search-evaluation-context.test.ts": 586,
+      "src/renderer/src/hooks/use-task-page-github-work-item-mutation-host.test.ts": 1951,
+      "src/renderer/src/hooks/use-terminal-quick-command-hosts.test.ts": 675,
+      "src/renderer/src/hooks/use-window-stream-visibility.test.ts": 368,
+      "src/renderer/src/hooks/useActiveProjectSkillRuntime.test.tsx": 2208,
+      "src/renderer/src/hooks/useAgentDetectionTarget.test.ts": 1593,
+      "src/renderer/src/hooks/useAppMenuPaste.test.tsx": 525,
+      "src/renderer/src/hooks/useAppMenuSelectionActions.test.tsx": 561,
+      "src/renderer/src/hooks/useAutoAckViewedAgent.away.test.ts": 2063,
+      "src/renderer/src/hooks/useAutoAckViewedAgent.clock-skew.test.ts": 2020,
+      "src/renderer/src/hooks/useAutoAckViewedAgent.floating-panel.test.ts": 1984,
+      "src/renderer/src/hooks/useAutoAckViewedAgent.focus-group.test.ts": 1361,
+      "src/renderer/src/hooks/useAutoAckViewedAgent.mixed-workspace.test.ts": 1339,
+      "src/renderer/src/hooks/useAutoAckViewedAgent.test.ts": 1829,
+      "src/renderer/src/hooks/useAutomationDispatchEvents.test.ts": 716,
+      "src/renderer/src/hooks/useComposerState-decisions.test.ts": 2092,
+      "src/renderer/src/hooks/useComposerState-host-context-boundaries.test.ts": 7756,
+      "src/renderer/src/hooks/useComposerState-host-retarget.test.ts": 2531,
+      "src/renderer/src/hooks/useComposerState.integration.test.ts": 3242,
+      "src/renderer/src/hooks/useDetectedAgents.test.tsx": 1651,
+      "src/renderer/src/hooks/useEditorExternalWatch-complexity.test.ts": 5198,
+      "src/renderer/src/hooks/useEditorExternalWatch-self-move.test.ts": 533,
+      "src/renderer/src/hooks/useEditorExternalWatch-subscriptions.test.tsx": 404,
+      "src/renderer/src/hooks/useEditorExternalWatch-targets.test.ts": 324,
+      "src/renderer/src/hooks/useEditorExternalWatch-wsl-repro.test.ts": 307,
+      "src/renderer/src/hooks/useEditorExternalWatch.test.ts": 492,
+      "src/renderer/src/hooks/useEphemeralVmRecipeOptions.test.tsx": 420,
+      "src/renderer/src/hooks/useGitHubSlugMetadata.test.tsx": 556,
+      "src/renderer/src/hooks/useGlobalFileDrop.test.ts": 1582,
+      "src/renderer/src/hooks/useInstalledAgentSkills.react.test.tsx": 6914,
+      "src/renderer/src/hooks/useInstalledAgentSkills.test.ts": 1496,
+      "src/renderer/src/hooks/useIpcEvents-agent-dashboard-shortcut.test.ts": 50,
+      "src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts": 2975,
+      "src/renderer/src/hooks/useIpcEvents-agent-status-connection-attribution.test.ts": 2091,
+      "src/renderer/src/hooks/useIpcEvents-agent-status-hook-titles.test.ts": 3465,
+      "src/renderer/src/hooks/useIpcEvents-agent-status-pane-teardown.test.ts": 1791,
+      "src/renderer/src/hooks/useIpcEvents-agent-status-queue-ordering.test.ts": 1553,
+      "src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-hydration.test.ts": 3794,
+      "src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-replay.test.ts": 1645,
+      "src/renderer/src/hooks/useIpcEvents-agent-status-ssh-authority.test.ts": 2844,
+      "src/renderer/src/hooks/useIpcEvents-agent-status-turn-completion.test.ts": 1232,
+      "src/renderer/src/hooks/useIpcEvents-browser-certificate-failure.test.ts": 1339,
+      "src/renderer/src/hooks/useIpcEvents-browser-navigation.test.ts": 1691,
+      "src/renderer/src/hooks/useIpcEvents-browser-tab-create.test.ts": 1564,
+      "src/renderer/src/hooks/useIpcEvents-cli-worktree-activation.test.ts": 2045,
+      "src/renderer/src/hooks/useIpcEvents-client-hosted-browser-rows.test.ts": 2146,
+      "src/renderer/src/hooks/useIpcEvents-close-routing-active-browser-tab.test.ts": 2721,
+      "src/renderer/src/hooks/useIpcEvents-close-routing-browser-pages.test.ts": 3181,
+      "src/renderer/src/hooks/useIpcEvents-close-routing-floating-guest.test.ts": 1386,
+      "src/renderer/src/hooks/useIpcEvents-close-routing-session-tabs.test.ts": 3166,
+      "src/renderer/src/hooks/useIpcEvents-cmd-j-digit-chord.test.ts": 1969,
+      "src/renderer/src/hooks/useIpcEvents-lifecycle.test.ts": 1286,
+      "src/renderer/src/hooks/useIpcEvents-new-workspace-shortcut.test.ts": 63,
+      "src/renderer/src/hooks/useIpcEvents-rate-limit-hydration.test.ts": 1530,
+      "src/renderer/src/hooks/useIpcEvents-repos-changed-catalogs.test.ts": 1613,
+      "src/renderer/src/hooks/useIpcEvents-runtime-environment-selectors.test.ts": 344,
+      "src/renderer/src/hooks/useIpcEvents-session-tab-close-request.test.ts": 1973,
+      "src/renderer/src/hooks/useIpcEvents-silent-terminal-adoption.test.ts": 1127,
+      "src/renderer/src/hooks/useIpcEvents-ssh-disconnect-cleanup.test.ts": 1093,
+      "src/renderer/src/hooks/useIpcEvents-terminal-create-surfacing.test.ts": 2062,
+      "src/renderer/src/hooks/useIpcEvents-updater-status.test.ts": 1760,
+      "src/renderer/src/hooks/useIssueMetadata.test.tsx": 329,
+      "src/renderer/src/hooks/useLinearProviderConnected.test.tsx": 1480,
+      "src/renderer/src/hooks/useMacTccAttributionSeveredNotice.test.tsx": 2293,
+      "src/renderer/src/hooks/useMacosTccPromptNotice.test.tsx": 2393,
+      "src/renderer/src/hooks/useMetadataListRequest.test.tsx": 555,
+      "src/renderer/src/hooks/useModalReturnFocus.test.tsx": 1404,
+      "src/renderer/src/hooks/usePrimarySelectionPaste.terminal-native-paste.test.tsx": 342,
+      "src/renderer/src/hooks/usePrimarySelectionPaste.test.tsx": 582,
+      "src/renderer/src/hooks/useResetCountdownClock.test.ts": 380,
+      "src/renderer/src/hooks/useRetiredWorktreeNames.test.ts": 729,
+      "src/renderer/src/hooks/useSettingsNavigationMetadata.capability-owner.test.tsx": 1128,
+      "src/renderer/src/hooks/useSettingsNavigationMetadata.language-switch.test.tsx": 1648,
+      "src/renderer/src/hooks/useSettingsNavigationMetadata.test.ts": 1342,
+      "src/renderer/src/hooks/useSidebarResize.test.ts": 42,
+      "src/renderer/src/hooks/useSkillFreshness.test.tsx": 461,
+      "src/renderer/src/hooks/useUnreadDockBadge.test.ts": 2344,
+      "src/renderer/src/hooks/useVirtualizedScrollAnchor.listener-deps.test.ts": 71,
+      "src/renderer/src/hooks/useVirtualizedScrollAnchor.marks-restore-signal.test.ts": 56,
+      "src/renderer/src/hooks/useVirtualizedScrollAnchor.test.ts": 49,
+      "src/renderer/src/hooks/useWindowsTerminalCapabilityOwnerKey.test.tsx": 613,
+      "src/renderer/src/hooks/viewport-size-change-listener.test.ts": 46,
+      "src/renderer/src/hooks/worktree-change-refresh-queue.test.ts": 81,
+      "src/renderer/src/hooks/worktree-head-identity-apply.test.ts": 41,
+      "src/renderer/src/hooks/zoom-routing.test.ts": 195,
+      "src/renderer/src/i18n/I18nProvider.test.tsx": 2173,
+      "src/renderer/src/i18n/integration-card-status-localization.test.ts": 257,
+      "src/renderer/src/i18n/intl-locale.test.ts": 135,
+      "src/renderer/src/i18n/ja-technical-literal-mistranslations.test.ts": 158,
+      "src/renderer/src/i18n/ko-ui-semantic-mistranslations.test.ts": 214,
+      "src/renderer/src/i18n/lazy-locale.test.ts": 299,
+      "src/renderer/src/i18n/locale-english-regression.test.ts": 1231,
+      "src/renderer/src/i18n/native-chat-locales.test.ts": 461,
+      "src/renderer/src/i18n/no-top-level-translate.test.ts": 3326,
+      "src/renderer/src/i18n/plugin-chrome-allowlist.test.ts": 170,
+      "src/renderer/src/i18n/pseudo-localization.test.ts": 89,
+      "src/renderer/src/i18n/relative-duration-copy-localization.test.ts": 810,
+      "src/renderer/src/i18n/relative-time-format.test.ts": 112,
+      "src/renderer/src/i18n/runtime-required-catalog.test.ts": 544,
+      "src/renderer/src/i18n/settings-status-label-localization.test.ts": 1029,
+      "src/renderer/src/i18n/smart-workspace-jira-locales.test.ts": 598,
+      "src/renderer/src/i18n/technical-literal-catalog-values.test.ts": 829,
+      "src/renderer/src/i18n/weekday-names.test.ts": 94,
+      "src/renderer/src/i18n/worktree-visibility-locales.test.ts": 120,
+      "src/renderer/src/i18n/zh-technical-literal-mistranslations.test.ts": 317,
+      "src/renderer/src/lazy-modal-mount-state.test.ts": 37,
+      "src/renderer/src/lazy-use-ref-ratchet.test.ts": 260,
+      "src/renderer/src/lib/activate-ai-vault-structured-session-reveal.test.ts": 1763,
+      "src/renderer/src/lib/activate-ai-vault-structured-session.test.ts": 1827,
+      "src/renderer/src/lib/activate-tab-and-focus-pane.test.ts": 34,
+      "src/renderer/src/lib/active-agent-note-send-explicit-target.test.ts": 818,
+      "src/renderer/src/lib/active-agent-note-send-focused-session.test.ts": 297,
+      "src/renderer/src/lib/active-agent-note-send-runtime-error-codes.test.ts": 61,
+      "src/renderer/src/lib/active-agent-note-send-target-detection.test.ts": 339,
+      "src/renderer/src/lib/active-view-persist.test.ts": 42,
+      "src/renderer/src/lib/activity-thread-display.test.ts": 84,
+      "src/renderer/src/lib/agent-background-session-launch-host.test.ts": 980,
+      "src/renderer/src/lib/agent-catalog-links.test.ts": 113,
+      "src/renderer/src/lib/agent-draft-readiness.test.ts": 79,
+      "src/renderer/src/lib/agent-followup-delivery.test.ts": 18686,
+      "src/renderer/src/lib/agent-hibernation-confirmation.test.ts": 35,
+      "src/renderer/src/lib/agent-hibernation-coordinator.test.ts": 1424,
+      "src/renderer/src/lib/agent-hibernation-output-activity.test.ts": 53,
+      "src/renderer/src/lib/agent-hibernation-pane-age.test.ts": 43,
+      "src/renderer/src/lib/agent-hibernation-planner.test.ts": 154,
+      "src/renderer/src/lib/agent-hibernation-runtime-liveness-race.test.ts": 1670,
+      "src/renderer/src/lib/agent-hibernation-visibility.test.ts": 1583,
+      "src/renderer/src/lib/agent-launch-caller-permissions.test.ts": 1042,
+      "src/renderer/src/lib/agent-launch-caller-placement.test.ts": 615,
+      "src/renderer/src/lib/agent-launch-caller-profile-census.test.ts": 625,
+      "src/renderer/src/lib/agent-launch-caller-prompt-transport.test.ts": 735,
+      "src/renderer/src/lib/agent-launch-caller-routing.test.ts": 667,
+      "src/renderer/src/lib/agent-launch-prompt-delivery.test.ts": 72,
+      "src/renderer/src/lib/agent-launch-route-connection-fallback.test.ts": 1361,
+      "src/renderer/src/lib/agent-launch-route-input.test.ts": 200,
+      "src/renderer/src/lib/agent-launch-routing-caller-census.test.ts": 1308,
+      "src/renderer/src/lib/agent-launch-routing.test.ts": 64,
+      "src/renderer/src/lib/agent-paste-draft-readiness-budget.test.ts": 177,
+      "src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts": 188,
+      "src/renderer/src/lib/agent-paste-draft.test.ts": 610,
+      "src/renderer/src/lib/agent-picker-search.test.ts": 180,
+      "src/renderer/src/lib/agent-ready-wait.test.ts": 68,
+      "src/renderer/src/lib/agent-resume-launch-target.test.ts": 2569,
+      "src/renderer/src/lib/agent-row-primary-text.test.ts": 65,
+      "src/renderer/src/lib/agent-row-tool-preview.test.ts": 61,
+      "src/renderer/src/lib/agent-send-title-status.test.ts": 70,
+      "src/renderer/src/lib/agent-session-fork-context.test.ts": 49,
+      "src/renderer/src/lib/agent-session-launch-plan.test.ts": 46,
+      "src/renderer/src/lib/agent-skill-cli-prerequisite.test.ts": 135,
+      "src/renderer/src/lib/agent-skill-nav-install-status.test.ts": 1277,
+      "src/renderer/src/lib/agent-startup-delayed-delivery-perf.test.ts": 1657,
+      "src/renderer/src/lib/agent-status-connection-ownership.test.ts": 53,
+      "src/renderer/src/lib/agent-status-count.test.ts": 86,
+      "src/renderer/src/lib/agent-status-epoch-clock.test.ts": 54,
+      "src/renderer/src/lib/agent-status-evidence-clock.test.ts": 68,
+      "src/renderer/src/lib/agent-status-terminal-title.test.ts": 92,
+      "src/renderer/src/lib/agent-status-worktree-attribution.test.ts": 43,
+      "src/renderer/src/lib/agent-status.test.ts": 1192,
+      "src/renderer/src/lib/agent-tab-shortcuts.test.ts": 77,
+      "src/renderer/src/lib/agent-trust-preflight.test.ts": 71,
+      "src/renderer/src/lib/ai-vault-omp-cold-resume.test.ts": 1575,
+      "src/renderer/src/lib/ai-vault-resume-command.drop-repin.test.ts": 226,
+      "src/renderer/src/lib/ai-vault-resume-command.resumable-agent.test.ts": 231,
+      "src/renderer/src/lib/ai-vault-resume-command.test.ts": 229,
+      "src/renderer/src/lib/ai-vault-resume-shell.test.ts": 214,
+      "src/renderer/src/lib/ai-vault-resume-target.test.ts": 59,
+      "src/renderer/src/lib/ai-vault-session-drag.test.ts": 58,
+      "src/renderer/src/lib/ai-vault-session-resume-preparation.test.ts": 58,
+      "src/renderer/src/lib/ai-vault-tab-title-sync-inputs.test.ts": 246,
+      "src/renderer/src/lib/ai-vault-tab-title-sync.test.ts": 763,
+      "src/renderer/src/lib/app-command-dispatch.test.ts": 53,
+      "src/renderer/src/lib/app-font-family.test.ts": 151,
+      "src/renderer/src/lib/app-menu-paste.test.ts": 494,
+      "src/renderer/src/lib/app-menu-selection-actions.test.ts": 465,
+      "src/renderer/src/lib/automation-session-observer.test.ts": 120,
+      "src/renderer/src/lib/automation-session-reuse.test.ts": 59,
+      "src/renderer/src/lib/automation-terminal-ownership.test.ts": 1270,
+      "src/renderer/src/lib/browser-cookie-import-toast.test.ts": 143,
+      "src/renderer/src/lib/browser-history-match.performance.test.ts": 185,
+      "src/renderer/src/lib/browser-history-match.test.ts": 175,
+      "src/renderer/src/lib/browser-page-conversion-history.test.ts": 64,
+      "src/renderer/src/lib/browser-page-palette-activation.test.ts": 1954,
+      "src/renderer/src/lib/browser-palette-page-entries.test.ts": 341,
+      "src/renderer/src/lib/browser-palette-search.test.ts": 193,
+      "src/renderer/src/lib/browser-uuid.test.ts": 48,
+      "src/renderer/src/lib/browser-workspace-tab-activation.test.ts": 2061,
+      "src/renderer/src/lib/client-creation-action-policy.test.ts": 199,
+      "src/renderer/src/lib/cmd-j-github-url-lookup.test.ts": 27,
+      "src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts": 231,
+      "src/renderer/src/lib/cmd-j-linear-issue-intent.test.ts": 38,
+      "src/renderer/src/lib/cmd-j-section-leadership.test.ts": 51,
+      "src/renderer/src/lib/codex-account-display-label.test.ts": 48,
+      "src/renderer/src/lib/codex-pane-restart-eligibility.test.ts": 82,
+      "src/renderer/src/lib/codex-pane-selection-lane.test.ts": 249,
+      "src/renderer/src/lib/codex-session-restart-route-recheck.test.ts": 1547,
+      "src/renderer/src/lib/codex-session-restart-shell-flap.test.ts": 1603,
+      "src/renderer/src/lib/codex-session-restart.test.ts": 6689,
+      "src/renderer/src/lib/codex-stale-pane-account-identity.test.ts": 1587,
+      "src/renderer/src/lib/codex-stale-pane-sweep.test.ts": 1143,
+      "src/renderer/src/lib/comment-body-line-count.test.ts": 78,
+      "src/renderer/src/lib/comment-body-submit-state.test.ts": 77,
+      "src/renderer/src/lib/composer-issue-command.test.ts": 1677,
+      "src/renderer/src/lib/composer-submit-cancellation.test.ts": 36,
+      "src/renderer/src/lib/connection-context.test.ts": 978,
+      "src/renderer/src/lib/crash-diagnostics.test.ts": 117,
+      "src/renderer/src/lib/create-untitled-markdown.test.ts": 332,
+      "src/renderer/src/lib/default-terminal-tabs-applied-persist.test.ts": 1574,
+      "src/renderer/src/lib/desktop-window-chrome.test.ts": 44,
+      "src/renderer/src/lib/diff-comment-compat.test.ts": 44,
+      "src/renderer/src/lib/diff-comments-format.test.ts": 64,
+      "src/renderer/src/lib/direct-ssh-reconnect-product-telemetry.test.ts": 33,
+      "src/renderer/src/lib/direct-ssh-target-scope.test.ts": 38,
+      "src/renderer/src/lib/doc-preview-grants.test.ts": 338,
+      "src/renderer/src/lib/document-theme.test.ts": 53,
+      "src/renderer/src/lib/editable-target.test.ts": 436,
+      "src/renderer/src/lib/editor-file-operation-owner.test.ts": 1407,
       "src/renderer/src/lib/editor-font-zoom.test.ts": 67,
-      "src/renderer/src/lib/ensure-hooks-confirmed.test.ts": 498,
-      "src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts": 258,
-      "src/renderer/src/lib/ensure-simulator-tab.test.ts": 47,
-      "src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts": 28,
-      "src/renderer/src/lib/ephemeral-vm-runtime-cleanup.test.ts": 46,
-      "src/renderer/src/lib/ephemeral-vm-workspace-target.integration.test.ts": 212,
-      "src/renderer/src/lib/ephemeral-vm-workspace-target.test.ts": 194,
-      "src/renderer/src/lib/ephemeral-vm-worktree-creation.test.ts": 144,
-      "src/renderer/src/lib/execute-open-editor-path-move.test.ts": 1473,
-      "src/renderer/src/lib/external-editor-open-capability.test.ts": 41,
-      "src/renderer/src/lib/feature-education-telemetry.test.ts": 52,
-      "src/renderer/src/lib/feedback-image-attachments.test.ts": 362,
-      "src/renderer/src/lib/file-preview-action-visibility.test.tsx": 853,
-      "src/renderer/src/lib/file-preview.test.ts": 405,
-      "src/renderer/src/lib/file-search-result-owner.test.ts": 43,
-      "src/renderer/src/lib/file-search-selection.test.ts": 52,
-      "src/renderer/src/lib/file-type-icons.test.ts": 179,
-      "src/renderer/src/lib/find-query-bounds.test.ts": 50,
-      "src/renderer/src/lib/finished-agent-resume-resurrection.test.ts": 1637,
-      "src/renderer/src/lib/fix-checks-agent-launch.test.ts": 356,
-      "src/renderer/src/lib/flatten-retained-slice.test.ts": 185,
-      "src/renderer/src/lib/floating-terminal.test.ts": 56,
-      "src/renderer/src/lib/floating-workspace-terminal-actions.test.ts": 272,
-      "src/renderer/src/lib/floating-workspace-tour-interaction-snapshot.test.ts": 60,
-      "src/renderer/src/lib/focus-terminal-tab-surface.test.ts": 172,
-      "src/renderer/src/lib/folder-workspace-path-status.test.ts": 118,
-      "src/renderer/src/lib/foreground-terminal-tabs.test.ts": 48,
-      "src/renderer/src/lib/github-links.test.ts": 35,
-      "src/renderer/src/lib/github-pr-start-point.test.ts": 64,
-      "src/renderer/src/lib/github-source-runtime-context.test.ts": 65,
-      "src/renderer/src/lib/github-work-item-source-lookup.test.ts": 64,
-      "src/renderer/src/lib/github-work-item-workspace-attachment.test.ts": 64,
-      "src/renderer/src/lib/gitlab-links.test.ts": 65,
-      "src/renderer/src/lib/gitlab-work-item-source-lookup.test.ts": 76,
-      "src/renderer/src/lib/hook-command-delayed-delivery-perf.test.ts": 1605,
-      "src/renderer/src/lib/hook-command-delayed-delivery.test.ts": 1524,
-      "src/renderer/src/lib/host-mirror-handle-gap-drain.test.ts": 1482,
-      "src/renderer/src/lib/host-mirror-handle-gap-landed-handle.test.ts": 1551,
-      "src/renderer/src/lib/host-mirror-handle-gap-resume.test.ts": 4165,
-      "src/renderer/src/lib/host-mirror-handle-gap-subscription-lifetime.test.ts": 1609,
-      "src/renderer/src/lib/host-mirror-handle-gap-teardown.test.ts": 1359,
-      "src/renderer/src/lib/host-mirror-handle-gap-verdict-union.test.ts": 2188,
-      "src/renderer/src/lib/host-mirrored-pane-resume-replay.test.ts": 2087,
-      "src/renderer/src/lib/http-link-destinations.test.ts": 237,
-      "src/renderer/src/lib/http-link-modifier-routing.test.ts": 216,
-      "src/renderer/src/lib/http-link-routing.test.ts": 164,
-      "src/renderer/src/lib/i18n-jsx-spacing-guard.test.ts": 63,
-      "src/renderer/src/lib/ime-composition-keyboard-event.test.ts": 467,
-      "src/renderer/src/lib/ios-web-platform.test.ts": 53,
-      "src/renderer/src/lib/ipc-error.test.ts": 53,
-      "src/renderer/src/lib/jira-source-host.test.ts": 70,
-      "src/renderer/src/lib/keyboard-layout/detect-option-as-alt.test.ts": 52,
-      "src/renderer/src/lib/keyboard-layout/input-source-id.test.ts": 42,
-      "src/renderer/src/lib/keyboard-layout/layout-base-character.test.ts": 46,
-      "src/renderer/src/lib/keyboard-layout/option-as-alt-probe.test.ts": 91,
-      "src/renderer/src/lib/keyboard-layout/option-key-location-state.test.ts": 56,
-      "src/renderer/src/lib/language-detect.test.ts": 68,
-      "src/renderer/src/lib/large-text-control-paste.test.ts": 472,
-      "src/renderer/src/lib/launch-agent-background-session-remote.test.ts": 620,
-      "src/renderer/src/lib/launch-agent-background-session.test.ts": 513,
-      "src/renderer/src/lib/launch-agent-in-new-tab-cwd.test.ts": 647,
-      "src/renderer/src/lib/launch-agent-in-new-tab-host-resolution.test.ts": 510,
-      "src/renderer/src/lib/launch-agent-in-new-tab-main-surface.test.ts": 2356,
-      "src/renderer/src/lib/launch-agent-in-new-tab-placement.test.ts": 623,
-      "src/renderer/src/lib/launch-agent-in-new-tab-structured.test.ts": 2134,
-      "src/renderer/src/lib/launch-agent-in-new-tab-web-runtime.test.ts": 1090,
-      "src/renderer/src/lib/launch-agent-in-new-tab-windows-quoting.test.ts": 706,
-      "src/renderer/src/lib/launch-agent-in-new-tab.test.ts": 1106,
-      "src/renderer/src/lib/launch-agent-session-continuation.test.ts": 89,
-      "src/renderer/src/lib/launch-agent-structured-chat-guard.test.ts": 1005,
-      "src/renderer/src/lib/launch-ai-vault-session.test.ts": 73,
-      "src/renderer/src/lib/launch-structured-agent-session.test.ts": 2305,
-      "src/renderer/src/lib/launch-work-item-direct-agent-routing.test.ts": 1739,
-      "src/renderer/src/lib/launch-work-item-direct-agent.test.ts": 143,
-      "src/renderer/src/lib/launch-work-item-direct-messages.test.ts": 40,
-      "src/renderer/src/lib/launch-work-item-direct.test.ts": 905,
-      "src/renderer/src/lib/launch-worktree-background-terminals.test.ts": 389,
-      "src/renderer/src/lib/lazy-chunk-recovery-reload.test.ts": 531,
-      "src/renderer/src/lib/lazy-with-retry.never-landed-reload.test.ts": 457,
-      "src/renderer/src/lib/lazy-with-retry.right-sidebar-syntax-error.test.ts": 480,
-      "src/renderer/src/lib/lazy-with-retry.test.ts": 474,
-      "src/renderer/src/lib/left-sidebar-appearance.test.ts": 226,
-      "src/renderer/src/lib/linear-agent-skill-update-command.test.ts": 1558,
-      "src/renderer/src/lib/linear-board-drag-payload.test.ts": 48,
-      "src/renderer/src/lib/linear-issue-context-snapshot.test.ts": 110,
-      "src/renderer/src/lib/linear-issue-url-lookup.test.ts": 44,
-      "src/renderer/src/lib/linear-issue-workspace-attachment.test.ts": 68,
-      "src/renderer/src/lib/linear-issue-workspace-open.test.ts": 127,
-      "src/renderer/src/lib/linear-linked-work-item.test.ts": 63,
-      "src/renderer/src/lib/linked-work-item-context.test.ts": 1606,
-      "src/renderer/src/lib/linked-work-item-provider.test.ts": 1550,
-      "src/renderer/src/lib/list-row-interaction.test.ts": 397,
-      "src/renderer/src/lib/local-path-open-guard.test.ts": 99,
-      "src/renderer/src/lib/local-preflight-context-cache.test.ts": 187,
-      "src/renderer/src/lib/local-preflight-context.test.ts": 255,
-      "src/renderer/src/lib/locale-text-collators.test.ts": 63,
-      "src/renderer/src/lib/manual-terminal-worktree-parking.test.ts": 382,
-      "src/renderer/src/lib/markdown-comment-blocks.test.ts": 49,
-      "src/renderer/src/lib/markdown-document-templates.test.ts": 254,
-      "src/renderer/src/lib/markdown-review-note-copy.test.ts": 64,
-      "src/renderer/src/lib/markdown-review-notes.test.ts": 99,
-      "src/renderer/src/lib/migration-unsupported-agent-entry.test.ts": 46,
+      "src/renderer/src/lib/ensure-hooks-confirmed.test.ts": 508,
+      "src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts": 287,
+      "src/renderer/src/lib/ensure-simulator-tab.test.ts": 32,
+      "src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts": 29,
+      "src/renderer/src/lib/ephemeral-vm-runtime-cleanup.test.ts": 72,
+      "src/renderer/src/lib/ephemeral-vm-workspace-target.integration.test.ts": 238,
+      "src/renderer/src/lib/ephemeral-vm-workspace-target.test.ts": 241,
+      "src/renderer/src/lib/ephemeral-vm-worktree-creation.test.ts": 68,
+      "src/renderer/src/lib/execute-open-editor-path-move.test.ts": 1470,
+      "src/renderer/src/lib/external-editor-open-capability.test.ts": 40,
+      "src/renderer/src/lib/feature-education-telemetry.test.ts": 65,
+      "src/renderer/src/lib/feedback-image-attachments.test.ts": 598,
+      "src/renderer/src/lib/file-preview-action-visibility.test.tsx": 516,
+      "src/renderer/src/lib/file-preview.test.ts": 321,
+      "src/renderer/src/lib/file-search-result-owner.test.ts": 66,
+      "src/renderer/src/lib/file-search-selection.test.ts": 41,
+      "src/renderer/src/lib/file-type-icons.test.ts": 130,
+      "src/renderer/src/lib/find-query-bounds.test.ts": 29,
+      "src/renderer/src/lib/finished-agent-resume-resurrection.test.ts": 1379,
+      "src/renderer/src/lib/fix-checks-agent-launch.test.ts": 325,
+      "src/renderer/src/lib/flatten-retained-slice.test.ts": 163,
+      "src/renderer/src/lib/floating-terminal.test.ts": 43,
+      "src/renderer/src/lib/floating-workspace-terminal-actions.test.ts": 235,
+      "src/renderer/src/lib/floating-workspace-tour-interaction-snapshot.test.ts": 33,
+      "src/renderer/src/lib/focus-terminal-tab-surface.test.ts": 81,
+      "src/renderer/src/lib/folder-workspace-path-status.test.ts": 76,
+      "src/renderer/src/lib/foreground-terminal-tabs.test.ts": 57,
+      "src/renderer/src/lib/github-links.test.ts": 69,
+      "src/renderer/src/lib/github-pr-start-point.test.ts": 78,
+      "src/renderer/src/lib/github-source-runtime-context.test.ts": 63,
+      "src/renderer/src/lib/github-work-item-source-lookup.test.ts": 97,
+      "src/renderer/src/lib/github-work-item-workspace-attachment.test.ts": 31,
+      "src/renderer/src/lib/gitlab-links.test.ts": 71,
+      "src/renderer/src/lib/gitlab-work-item-source-lookup.test.ts": 84,
+      "src/renderer/src/lib/hook-command-delayed-delivery-perf.test.ts": 1720,
+      "src/renderer/src/lib/hook-command-delayed-delivery.test.ts": 1168,
+      "src/renderer/src/lib/host-mirror-handle-gap-drain.test.ts": 1659,
+      "src/renderer/src/lib/host-mirror-handle-gap-landed-handle.test.ts": 1250,
+      "src/renderer/src/lib/host-mirror-handle-gap-resume.test.ts": 4216,
+      "src/renderer/src/lib/host-mirror-handle-gap-subscription-lifetime.test.ts": 1642,
+      "src/renderer/src/lib/host-mirror-handle-gap-teardown.test.ts": 1351,
+      "src/renderer/src/lib/host-mirror-handle-gap-verdict-union.test.ts": 1927,
+      "src/renderer/src/lib/host-mirrored-pane-resume-replay.test.ts": 1687,
+      "src/renderer/src/lib/http-link-destinations.test.ts": 207,
+      "src/renderer/src/lib/http-link-modifier-routing.test.ts": 196,
+      "src/renderer/src/lib/http-link-routing.test.ts": 206,
+      "src/renderer/src/lib/i18n-jsx-spacing-guard.test.ts": 57,
+      "src/renderer/src/lib/ime-composition-keyboard-event.test.ts": 477,
+      "src/renderer/src/lib/ios-web-platform.test.ts": 45,
+      "src/renderer/src/lib/ipc-error.test.ts": 50,
+      "src/renderer/src/lib/jira-source-host.test.ts": 30,
+      "src/renderer/src/lib/keyboard-layout/detect-option-as-alt.test.ts": 62,
+      "src/renderer/src/lib/keyboard-layout/input-source-id.test.ts": 50,
+      "src/renderer/src/lib/keyboard-layout/layout-base-character.test.ts": 36,
+      "src/renderer/src/lib/keyboard-layout/option-as-alt-probe.test.ts": 87,
+      "src/renderer/src/lib/keyboard-layout/option-key-location-state.test.ts": 44,
+      "src/renderer/src/lib/language-detect.test.ts": 84,
+      "src/renderer/src/lib/large-text-control-paste.test.ts": 482,
+      "src/renderer/src/lib/launch-agent-background-session-remote.test.ts": 522,
+      "src/renderer/src/lib/launch-agent-background-session.test.ts": 367,
+      "src/renderer/src/lib/launch-agent-in-new-tab-cwd.test.ts": 596,
+      "src/renderer/src/lib/launch-agent-in-new-tab-host-resolution.test.ts": 777,
+      "src/renderer/src/lib/launch-agent-in-new-tab-main-surface.test.ts": 1850,
+      "src/renderer/src/lib/launch-agent-in-new-tab-placement.test.ts": 568,
+      "src/renderer/src/lib/launch-agent-in-new-tab-structured.test.ts": 1042,
+      "src/renderer/src/lib/launch-agent-in-new-tab-web-runtime.test.ts": 477,
+      "src/renderer/src/lib/launch-agent-in-new-tab-windows-quoting.test.ts": 719,
+      "src/renderer/src/lib/launch-agent-in-new-tab.test.ts": 1384,
+      "src/renderer/src/lib/launch-agent-session-continuation.test.ts": 93,
+      "src/renderer/src/lib/launch-agent-structured-chat-guard.test.ts": 1070,
+      "src/renderer/src/lib/launch-ai-vault-session.test.ts": 77,
+      "src/renderer/src/lib/launch-structured-agent-session.test.ts": 1925,
+      "src/renderer/src/lib/launch-work-item-direct-agent-routing.test.ts": 1859,
+      "src/renderer/src/lib/launch-work-item-direct-agent.test.ts": 102,
+      "src/renderer/src/lib/launch-work-item-direct-messages.test.ts": 67,
+      "src/renderer/src/lib/launch-work-item-direct.test.ts": 760,
+      "src/renderer/src/lib/launch-worktree-background-terminals.test.ts": 529,
+      "src/renderer/src/lib/lazy-chunk-recovery-reload.test.ts": 327,
+      "src/renderer/src/lib/lazy-with-retry.never-landed-reload.test.ts": 487,
+      "src/renderer/src/lib/lazy-with-retry.right-sidebar-syntax-error.test.ts": 400,
+      "src/renderer/src/lib/lazy-with-retry.test.ts": 342,
+      "src/renderer/src/lib/left-sidebar-appearance.test.ts": 135,
+      "src/renderer/src/lib/linear-agent-skill-update-command.test.ts": 949,
+      "src/renderer/src/lib/linear-board-drag-payload.test.ts": 64,
+      "src/renderer/src/lib/linear-issue-context-snapshot.test.ts": 95,
+      "src/renderer/src/lib/linear-issue-url-lookup.test.ts": 54,
+      "src/renderer/src/lib/linear-issue-workspace-attachment.test.ts": 34,
+      "src/renderer/src/lib/linear-issue-workspace-open.test.ts": 73,
+      "src/renderer/src/lib/linear-linked-work-item.test.ts": 58,
+      "src/renderer/src/lib/linked-work-item-context.test.ts": 1261,
+      "src/renderer/src/lib/linked-work-item-provider.test.ts": 1731,
+      "src/renderer/src/lib/list-row-interaction.test.ts": 249,
+      "src/renderer/src/lib/local-path-open-guard.test.ts": 96,
+      "src/renderer/src/lib/local-preflight-context-cache.test.ts": 204,
+      "src/renderer/src/lib/local-preflight-context.test.ts": 270,
+      "src/renderer/src/lib/locale-text-collators.test.ts": 108,
+      "src/renderer/src/lib/manual-terminal-worktree-parking.test.ts": 510,
+      "src/renderer/src/lib/markdown-comment-blocks.test.ts": 34,
+      "src/renderer/src/lib/markdown-document-templates.test.ts": 227,
+      "src/renderer/src/lib/markdown-review-note-copy.test.ts": 45,
+      "src/renderer/src/lib/markdown-review-notes.test.ts": 47,
+      "src/renderer/src/lib/migration-unsupported-agent-entry.test.ts": 44,
       "src/renderer/src/lib/mobile-terminal-tab-mount.test.ts": 41,
-      "src/renderer/src/lib/monaco-delayer-cancellation-guard.test.ts": 119,
-      "src/renderer/src/lib/monaco-diff-editor-disposal.test.ts": 37,
-      "src/renderer/src/lib/monaco-languages/monarch-embed-entry-recursion.test.ts": 958,
-      "src/renderer/src/lib/monaco-languages/monarch-upstream-mdx-recursion.test.ts": 2586,
-      "src/renderer/src/lib/monaco-languages/register-astro.test.ts": 325,
-      "src/renderer/src/lib/monaco-languages/register-jsonl.test.ts": 306,
-      "src/renderer/src/lib/monaco-languages/register-nim.test.ts": 63,
-      "src/renderer/src/lib/monaco-languages/register-shell-markdown-aliases.test.ts": 45,
-      "src/renderer/src/lib/monaco-languages/register-svelte.test.ts": 377,
-      "src/renderer/src/lib/monaco-languages/register-vue.test.ts": 389,
-      "src/renderer/src/lib/monaco-languages/textmate-language-registration.test.ts": 60,
-      "src/renderer/src/lib/monaco-languages/textmate-token-provider.test.ts": 261,
-      "src/renderer/src/lib/monaco-peek-preview-options.test.ts": 1197,
-      "src/renderer/src/lib/monaco-setup-steps.test.ts": 61,
-      "src/renderer/src/lib/monospace-font-family.test.ts": 49,
-      "src/renderer/src/lib/native-chat-initial-view-mode.test.ts": 74,
-      "src/renderer/src/lib/native-chat-launch-draft-mirrorability.test.ts": 339,
-      "src/renderer/src/lib/native-chat-transcript-readability.test.ts": 40,
-      "src/renderer/src/lib/nested-repo-selected-paths.test.ts": 53,
-      "src/renderer/src/lib/new-workspace-composer-repo.test.ts": 46,
-      "src/renderer/src/lib/new-workspace-create-gates.test.ts": 68,
-      "src/renderer/src/lib/new-workspace-enter-guard.test.ts": 51,
-      "src/renderer/src/lib/new-workspace-project-options.test.ts": 88,
-      "src/renderer/src/lib/new-workspace-ssh-gate.test.ts": 50,
-      "src/renderer/src/lib/new-workspace.test.ts": 4507,
-      "src/renderer/src/lib/non-secure-context-crypto.repro.test.ts": 1717,
-      "src/renderer/src/lib/notes-send-agent-targets.test.ts": 103,
-      "src/renderer/src/lib/onboarding-project-checklist.test.ts": 187,
-      "src/renderer/src/lib/open-markdown-in-floating-workspace.test.ts": 208,
-      "src/renderer/src/lib/open-mobile-emulator-tab.test.ts": 265,
-      "src/renderer/src/lib/open-tab-occupant-agent.test.ts": 86,
-      "src/renderer/src/lib/orca-hook-trust.test.ts": 46,
-      "src/renderer/src/lib/orca-yaml-trust-prompt-slot-eviction.test.ts": 573,
-      "src/renderer/src/lib/orchestration-setup-state.test.ts": 41,
-      "src/renderer/src/lib/orchestration-skill-coverage.test.ts": 158,
-      "src/renderer/src/lib/order-empty-query-worktrees.test.ts": 75,
-      "src/renderer/src/lib/outside-dismiss-guard.test.ts": 48,
-      "src/renderer/src/lib/palette-match/cmd-j-ranking-contract.test.ts": 96,
-      "src/renderer/src/lib/palette-match/match-field-allocation.test.ts": 115,
-      "src/renderer/src/lib/palette-match/palette-match-core.test.ts": 138,
-      "src/renderer/src/lib/palette-match/palette-match-performance.test.ts": 9843,
-      "src/renderer/src/lib/palette-match/palette-phrase-placement.test.ts": 78,
-      "src/renderer/src/lib/palette-match/palette-ranking.test.ts": 65,
-      "src/renderer/src/lib/palette-repo-resolution.test.ts": 70,
-      "src/renderer/src/lib/palette-type-alias-match.test.ts": 49,
-      "src/renderer/src/lib/pane-agent-evidence.test.ts": 96,
-      "src/renderer/src/lib/pane-manager/browser-mobile-driver-state.test.ts": 54,
-      "src/renderer/src/lib/pane-manager/browser-remote-viewer-state.test.ts": 54,
-      "src/renderer/src/lib/pane-manager/client-hosted-browser-row-ephemerality.test.ts": 1499,
-      "src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.test.ts": 75,
-      "src/renderer/src/lib/pane-manager/focus-follows-mouse.test.ts": 50,
-      "src/renderer/src/lib/pane-manager/mobile-driver-state.test.ts": 40,
-      "src/renderer/src/lib/pane-manager/mobile-fit-overrides-hydration.test.ts": 24,
-      "src/renderer/src/lib/pane-manager/mobile-fit-overrides.test.ts": 74,
-      "src/renderer/src/lib/pane-manager/pane-container-listener-lifecycle.test.ts": 229,
-      "src/renderer/src/lib/pane-manager/pane-cursor-blink-suspension.test.ts": 747,
-      "src/renderer/src/lib/pane-manager/pane-divider-capture-loss.test.ts": 64,
-      "src/renderer/src/lib/pane-manager/pane-divider-stray-touch.test.ts": 45,
-      "src/renderer/src/lib/pane-manager/pane-divider.test.ts": 83,
-      "src/renderer/src/lib/pane-manager/pane-dom-creation.test.ts": 698,
-      "src/renderer/src/lib/pane-manager/pane-drag-reorder.test.ts": 120,
-      "src/renderer/src/lib/pane-manager/pane-drop-no-op.test.ts": 506,
-      "src/renderer/src/lib/pane-manager/pane-fit-resize-observer.test.ts": 85,
-      "src/renderer/src/lib/pane-manager/pane-fit.test.ts": 119,
-      "src/renderer/src/lib/pane-manager/pane-initial-fit-lifecycle.test.ts": 237,
-      "src/renderer/src/lib/pane-manager/pane-inline-image-recovery.test.ts": 80,
-      "src/renderer/src/lib/pane-manager/pane-inline-images.test.ts": 88,
-      "src/renderer/src/lib/pane-manager/pane-key-resolution.test.ts": 41,
-      "src/renderer/src/lib/pane-manager/pane-lifecycle.test.ts": 453,
-      "src/renderer/src/lib/pane-manager/pane-manager-registry.test.ts": 67,
-      "src/renderer/src/lib/pane-manager/pane-metric-options-deferral.test.ts": 61,
-      "src/renderer/src/lib/pane-manager/pane-overlay-focus.test.ts": 695,
-      "src/renderer/src/lib/pane-manager/pane-pointer-focus.test.ts": 57,
-      "src/renderer/src/lib/pane-manager/pane-pty-resize-hold.test.ts": 47,
-      "src/renderer/src/lib/pane-manager/pane-reveal-fit.test.ts": 50,
-      "src/renderer/src/lib/pane-manager/pane-reveal-repaint.test.ts": 533,
-      "src/renderer/src/lib/pane-manager/pane-scroll.test.ts": 195,
+      "src/renderer/src/lib/monaco-delayer-cancellation-guard.test.ts": 182,
+      "src/renderer/src/lib/monaco-diff-editor-disposal.test.ts": 50,
+      "src/renderer/src/lib/monaco-languages/monarch-embed-entry-recursion.test.ts": 750,
+      "src/renderer/src/lib/monaco-languages/monarch-upstream-mdx-recursion.test.ts": 5097,
+      "src/renderer/src/lib/monaco-languages/register-astro.test.ts": 129,
+      "src/renderer/src/lib/monaco-languages/register-jsonl.test.ts": 248,
+      "src/renderer/src/lib/monaco-languages/register-nim.test.ts": 78,
+      "src/renderer/src/lib/monaco-languages/register-shell-markdown-aliases.test.ts": 42,
+      "src/renderer/src/lib/monaco-languages/register-svelte.test.ts": 285,
+      "src/renderer/src/lib/monaco-languages/register-vue.test.ts": 442,
+      "src/renderer/src/lib/monaco-languages/textmate-language-registration.test.ts": 64,
+      "src/renderer/src/lib/monaco-languages/textmate-token-provider.test.ts": 232,
+      "src/renderer/src/lib/monaco-peek-preview-options.test.ts": 988,
+      "src/renderer/src/lib/monaco-setup-steps.test.ts": 28,
+      "src/renderer/src/lib/monospace-font-family.test.ts": 53,
+      "src/renderer/src/lib/mouse-shortcut-dispatch.test.ts": 366,
+      "src/renderer/src/lib/native-chat-initial-view-mode.test.ts": 51,
+      "src/renderer/src/lib/native-chat-launch-draft-mirrorability.test.ts": 226,
+      "src/renderer/src/lib/native-chat-transcript-readability.test.ts": 49,
+      "src/renderer/src/lib/nested-repo-selected-paths.test.ts": 45,
+      "src/renderer/src/lib/new-workspace-composer-repo.test.ts": 38,
+      "src/renderer/src/lib/new-workspace-create-gates.test.ts": 43,
+      "src/renderer/src/lib/new-workspace-enter-guard.test.ts": 52,
+      "src/renderer/src/lib/new-workspace-project-options.test.ts": 72,
+      "src/renderer/src/lib/new-workspace-ssh-gate.test.ts": 72,
+      "src/renderer/src/lib/new-workspace.test.ts": 4497,
+      "src/renderer/src/lib/non-secure-context-crypto.repro.test.ts": 1038,
+      "src/renderer/src/lib/notes-send-agent-targets.test.ts": 155,
+      "src/renderer/src/lib/onboarding-project-checklist.test.ts": 114,
+      "src/renderer/src/lib/open-markdown-in-floating-workspace.test.ts": 138,
+      "src/renderer/src/lib/open-mobile-emulator-tab.test.ts": 297,
+      "src/renderer/src/lib/open-tab-occupant-agent.test.ts": 102,
+      "src/renderer/src/lib/orca-hook-trust.test.ts": 59,
+      "src/renderer/src/lib/orca-yaml-trust-prompt-slot-eviction.test.ts": 597,
+      "src/renderer/src/lib/orchestration-setup-state.test.ts": 61,
+      "src/renderer/src/lib/orchestration-skill-coverage.test.ts": 80,
+      "src/renderer/src/lib/order-empty-query-worktrees.test.ts": 38,
+      "src/renderer/src/lib/outside-dismiss-guard.test.ts": 61,
+      "src/renderer/src/lib/palette-match/cmd-j-ranking-contract.test.ts": 114,
+      "src/renderer/src/lib/palette-match/match-field-allocation.test.ts": 127,
+      "src/renderer/src/lib/palette-match/palette-match-core.test.ts": 115,
+      "src/renderer/src/lib/palette-match/palette-match-performance.test.ts": 10210,
+      "src/renderer/src/lib/palette-match/palette-phrase-placement.test.ts": 65,
+      "src/renderer/src/lib/palette-match/palette-ranking.test.ts": 39,
+      "src/renderer/src/lib/palette-repo-resolution.test.ts": 40,
+      "src/renderer/src/lib/palette-type-alias-match.test.ts": 29,
+      "src/renderer/src/lib/pane-agent-evidence.test.ts": 74,
+      "src/renderer/src/lib/pane-manager/browser-mobile-driver-state.test.ts": 64,
+      "src/renderer/src/lib/pane-manager/browser-remote-viewer-state.test.ts": 41,
+      "src/renderer/src/lib/pane-manager/client-hosted-browser-row-ephemerality.test.ts": 1735,
+      "src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.test.ts": 69,
+      "src/renderer/src/lib/pane-manager/focus-follows-mouse.test.ts": 40,
+      "src/renderer/src/lib/pane-manager/mobile-driver-state.test.ts": 56,
+      "src/renderer/src/lib/pane-manager/mobile-fit-overrides-hydration.test.ts": 56,
+      "src/renderer/src/lib/pane-manager/mobile-fit-overrides.test.ts": 62,
+      "src/renderer/src/lib/pane-manager/pane-container-listener-lifecycle.test.ts": 230,
+      "src/renderer/src/lib/pane-manager/pane-cursor-blink-suspension.test.ts": 1047,
+      "src/renderer/src/lib/pane-manager/pane-divider-capture-loss.test.ts": 45,
+      "src/renderer/src/lib/pane-manager/pane-divider-stray-touch.test.ts": 60,
+      "src/renderer/src/lib/pane-manager/pane-divider.test.ts": 74,
+      "src/renderer/src/lib/pane-manager/pane-dom-creation.test.ts": 485,
+      "src/renderer/src/lib/pane-manager/pane-drag-reorder.test.ts": 81,
+      "src/renderer/src/lib/pane-manager/pane-drop-no-op.test.ts": 237,
+      "src/renderer/src/lib/pane-manager/pane-fit-resize-observer.test.ts": 79,
+      "src/renderer/src/lib/pane-manager/pane-fit.test.ts": 145,
+      "src/renderer/src/lib/pane-manager/pane-initial-fit-lifecycle.test.ts": 245,
+      "src/renderer/src/lib/pane-manager/pane-inline-image-recovery.test.ts": 67,
+      "src/renderer/src/lib/pane-manager/pane-inline-images.test.ts": 102,
+      "src/renderer/src/lib/pane-manager/pane-key-resolution.test.ts": 42,
+      "src/renderer/src/lib/pane-manager/pane-lifecycle.test.ts": 435,
+      "src/renderer/src/lib/pane-manager/pane-manager-registry.test.ts": 41,
+      "src/renderer/src/lib/pane-manager/pane-metric-options-deferral.test.ts": 60,
+      "src/renderer/src/lib/pane-manager/pane-overlay-focus.test.ts": 722,
+      "src/renderer/src/lib/pane-manager/pane-pointer-focus.test.ts": 45,
+      "src/renderer/src/lib/pane-manager/pane-pty-resize-hold.test.ts": 53,
+      "src/renderer/src/lib/pane-manager/pane-reveal-fit.test.ts": 64,
+      "src/renderer/src/lib/pane-manager/pane-reveal-repaint.test.ts": 394,
+      "src/renderer/src/lib/pane-manager/pane-scroll.test.ts": 118,
       "src/renderer/src/lib/pane-manager/pane-split-close.test.ts": 65,
-      "src/renderer/src/lib/pane-manager/pane-split-scroll.test.ts": 55,
-      "src/renderer/src/lib/pane-manager/pane-terminal-foreground-render-settle.test.ts": 63,
-      "src/renderer/src/lib/pane-manager/pane-terminal-gpu-acceleration.test.ts": 108,
-      "src/renderer/src/lib/pane-manager/pane-terminal-mouse-wheel.test.ts": 56,
-      "src/renderer/src/lib/pane-manager/pane-terminal-output-queue-chunks.test.ts": 36,
-      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-ack-credit.test.ts": 145,
-      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-backlog-cap.test.ts": 138,
-      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-disposed-writes.test.ts": 75,
-      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-foreground-refresh.test.ts": 117,
-      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-queue-retention.test.ts": 274,
-      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-synchronized-frames.test.ts": 190,
-      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-throughput.bench.test.ts": 339,
-      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler.test.ts": 171,
-      "src/renderer/src/lib/pane-manager/pane-tree-equalization-parity.test.ts": 1474,
-      "src/renderer/src/lib/pane-manager/pane-tree-equalization-scaling.test.ts": 502,
-      "src/renderer/src/lib/pane-manager/pane-tree-ops.test.ts": 99,
-      "src/renderer/src/lib/pane-manager/pane-tree-reparent-frame.test.ts": 63,
-      "src/renderer/src/lib/pane-manager/pane-webgl-context-recovery.test.ts": 131,
-      "src/renderer/src/lib/pane-manager/pane-webgl-refresh-lifecycle.test.ts": 216,
-      "src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts": 362,
-      "src/renderer/src/lib/pane-manager/terminal-arabic-shaping-joiner.test.ts": 68,
-      "src/renderer/src/lib/pane-manager/terminal-canvas-dpr-repair.test.ts": 68,
-      "src/renderer/src/lib/pane-manager/terminal-complex-script.test.ts": 71,
-      "src/renderer/src/lib/pane-manager/terminal-delivery-credit.test.ts": 55,
-      "src/renderer/src/lib/pane-manager/terminal-foreground-repair-convergence.test.ts": 282,
-      "src/renderer/src/lib/pane-manager/terminal-ime-anchor.test.ts": 50,
-      "src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.test.ts": 546,
-      "src/renderer/src/lib/pane-manager/terminal-keyboard-protocol.test.ts": 179,
-      "src/renderer/src/lib/pane-manager/terminal-ligatures-addon.test.ts": 60,
-      "src/renderer/src/lib/pane-manager/terminal-link-provider-guard.test.ts": 51,
-      "src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-mouseleave.test.ts": 64,
-      "src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-write.test.ts": 97,
-      "src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset.test.ts": 44,
-      "src/renderer/src/lib/pane-manager/terminal-render-pause-release-parked-resize.test.ts": 56,
-      "src/renderer/src/lib/pane-manager/terminal-render-pause-release.test.ts": 49,
-      "src/renderer/src/lib/pane-manager/terminal-scroll-intent-input-resync.test.ts": 60,
-      "src/renderer/src/lib/pane-manager/terminal-scroll-intent-key-retention.test.ts": 97,
-      "src/renderer/src/lib/pane-manager/terminal-scroll-intent-structural-transitions.test.ts": 46,
-      "src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts": 299,
-      "src/renderer/src/lib/pane-manager/terminal-structural-replay-coordinator.test.ts": 39,
-      "src/renderer/src/lib/pane-manager/terminal-webgl-auto-policy.test.ts": 62,
-      "src/renderer/src/lib/pane-manager/terminal-webgl-hidden-retention.test.ts": 310,
-      "src/renderer/src/lib/pane-manager/terminal-windows-ctrl-alt-chord-classification.test.ts": 519,
-      "src/renderer/src/lib/pane-manager/terminal-write-pipeline-health.test.ts": 58,
-      "src/renderer/src/lib/pane-manager/windows-pty-compatibility.test.ts": 74,
-      "src/renderer/src/lib/pane-manager/xterm-instance-disposed.test.ts": 92,
-      "src/renderer/src/lib/pane-manager/xterm-user-scrolling-contract.test.ts": 5040,
-      "src/renderer/src/lib/pane-manager/xterm-write-callback-guard.test.ts": 66,
-      "src/renderer/src/lib/parked-terminal-host-hydration.test.ts": 167,
-      "src/renderer/src/lib/passive-macos-app-data-access.test.ts": 30,
-      "src/renderer/src/lib/paste-payload-metadata.test.ts": 40,
-      "src/renderer/src/lib/path-head-elision.test.ts": 55,
-      "src/renderer/src/lib/path.test.ts": 59,
+      "src/renderer/src/lib/pane-manager/pane-split-scroll.test.ts": 62,
+      "src/renderer/src/lib/pane-manager/pane-terminal-foreground-render-settle.test.ts": 57,
+      "src/renderer/src/lib/pane-manager/pane-terminal-gpu-acceleration.test.ts": 107,
+      "src/renderer/src/lib/pane-manager/pane-terminal-mouse-wheel.test.ts": 65,
+      "src/renderer/src/lib/pane-manager/pane-terminal-output-queue-chunks.test.ts": 47,
+      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-ack-credit.test.ts": 95,
+      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-backlog-cap.test.ts": 118,
+      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-disposed-writes.test.ts": 79,
+      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-foreground-refresh.test.ts": 160,
+      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-queue-retention.test.ts": 266,
+      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-synchronized-frames.test.ts": 178,
+      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-throughput.bench.test.ts": 312,
+      "src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler.test.ts": 181,
+      "src/renderer/src/lib/pane-manager/pane-tree-equalization-parity.test.ts": 1669,
+      "src/renderer/src/lib/pane-manager/pane-tree-equalization-scaling.test.ts": 411,
+      "src/renderer/src/lib/pane-manager/pane-tree-ops.test.ts": 140,
+      "src/renderer/src/lib/pane-manager/pane-tree-reparent-frame.test.ts": 53,
+      "src/renderer/src/lib/pane-manager/pane-webgl-context-recovery.test.ts": 173,
+      "src/renderer/src/lib/pane-manager/pane-webgl-refresh-lifecycle.test.ts": 382,
+      "src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts": 423,
+      "src/renderer/src/lib/pane-manager/terminal-arabic-shaping-joiner.test.ts": 48,
+      "src/renderer/src/lib/pane-manager/terminal-canvas-dpr-repair.test.ts": 62,
+      "src/renderer/src/lib/pane-manager/terminal-complex-script.test.ts": 52,
+      "src/renderer/src/lib/pane-manager/terminal-delivery-credit.test.ts": 40,
+      "src/renderer/src/lib/pane-manager/terminal-foreground-repair-convergence.test.ts": 187,
+      "src/renderer/src/lib/pane-manager/terminal-ime-anchor.test.ts": 39,
+      "src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.test.ts": 487,
+      "src/renderer/src/lib/pane-manager/terminal-keyboard-protocol.test.ts": 62,
+      "src/renderer/src/lib/pane-manager/terminal-ligatures-addon.test.ts": 66,
+      "src/renderer/src/lib/pane-manager/terminal-link-provider-guard.test.ts": 38,
+      "src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-mouseleave.test.ts": 53,
+      "src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-write.test.ts": 41,
+      "src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset.test.ts": 58,
+      "src/renderer/src/lib/pane-manager/terminal-render-pause-release-parked-resize.test.ts": 30,
+      "src/renderer/src/lib/pane-manager/terminal-render-pause-release.test.ts": 77,
+      "src/renderer/src/lib/pane-manager/terminal-scroll-intent-input-resync.test.ts": 78,
+      "src/renderer/src/lib/pane-manager/terminal-scroll-intent-key-retention.test.ts": 125,
+      "src/renderer/src/lib/pane-manager/terminal-scroll-intent-structural-transitions.test.ts": 51,
+      "src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts": 117,
+      "src/renderer/src/lib/pane-manager/terminal-structural-replay-coordinator.test.ts": 62,
+      "src/renderer/src/lib/pane-manager/terminal-webgl-auto-policy.test.ts": 61,
+      "src/renderer/src/lib/pane-manager/terminal-webgl-hidden-retention.test.ts": 321,
+      "src/renderer/src/lib/pane-manager/terminal-windows-ctrl-alt-chord-classification.test.ts": 358,
+      "src/renderer/src/lib/pane-manager/terminal-write-pipeline-health.test.ts": 71,
+      "src/renderer/src/lib/pane-manager/windows-pty-compatibility.test.ts": 87,
+      "src/renderer/src/lib/pane-manager/xterm-instance-disposed.test.ts": 131,
+      "src/renderer/src/lib/pane-manager/xterm-user-scrolling-contract.test.ts": 4939,
+      "src/renderer/src/lib/pane-manager/xterm-write-callback-guard.test.ts": 72,
+      "src/renderer/src/lib/parked-terminal-host-hydration.test.ts": 187,
+      "src/renderer/src/lib/passive-macos-app-data-access.test.ts": 26,
+      "src/renderer/src/lib/paste-payload-metadata.test.ts": 51,
+      "src/renderer/src/lib/path-head-elision.test.ts": 45,
+      "src/renderer/src/lib/path.test.ts": 42,
       "src/renderer/src/lib/pending-worktree-creation.test.ts": 46,
-      "src/renderer/src/lib/pi-live-session-no-duplicate-tab.test.ts": 1729,
-      "src/renderer/src/lib/pi-session-resume-wake.test.ts": 1656,
-      "src/renderer/src/lib/plugin-command-execution.test.ts": 291,
-      "src/renderer/src/lib/plugin-command-keybindings.test.ts": 139,
-      "src/renderer/src/lib/pr-bot-author-overrides.test.ts": 321,
-      "src/renderer/src/lib/pr-comment-action-state.test.ts": 45,
-      "src/renderer/src/lib/pr-comment-reactions.test.ts": 55,
-      "src/renderer/src/lib/primary-selection-paste.test.ts": 301,
-      "src/renderer/src/lib/primary-selection.test.ts": 72,
-      "src/renderer/src/lib/project-clone-url-prefill.test.ts": 32,
+      "src/renderer/src/lib/pi-live-session-no-duplicate-tab.test.ts": 1695,
+      "src/renderer/src/lib/pi-session-resume-wake.test.ts": 1680,
+      "src/renderer/src/lib/plugin-command-execution.test.ts": 480,
+      "src/renderer/src/lib/plugin-command-keybindings.test.ts": 100,
+      "src/renderer/src/lib/pr-bot-author-overrides.test.ts": 298,
+      "src/renderer/src/lib/pr-comment-action-state.test.ts": 46,
+      "src/renderer/src/lib/pr-comment-reactions.test.ts": 30,
+      "src/renderer/src/lib/primary-selection-paste.test.ts": 551,
+      "src/renderer/src/lib/primary-selection.test.ts": 67,
+      "src/renderer/src/lib/project-clone-url-prefill.test.ts": 63,
       "src/renderer/src/lib/project-host-clone-url.test.ts": 39,
-      "src/renderer/src/lib/project-host-setup-options.test.ts": 117,
-      "src/renderer/src/lib/project-host-workspace-target.test.ts": 84,
-      "src/renderer/src/lib/project-skill-runtime.test.ts": 61,
-      "src/renderer/src/lib/provisioned-root-create-options.test.ts": 39,
-      "src/renderer/src/lib/quick-workspace-agent-selection.test.ts": 171,
-      "src/renderer/src/lib/react-commit-cascade-install-order.test.ts": 46,
-      "src/renderer/src/lib/react-commit-cascade-observer.react185.test.tsx": 562,
-      "src/renderer/src/lib/react-commit-cascade-observer.test.ts": 227,
-      "src/renderer/src/lib/react-commit-cascade-store-write-samples.test.ts": 58,
-      "src/renderer/src/lib/react-commit-cascade-telemetry.test.ts": 163,
-      "src/renderer/src/lib/react-error-boundary-reporting.test.ts": 65,
-      "src/renderer/src/lib/react-grab-dev-gate.test.ts": 58,
-      "src/renderer/src/lib/react-renderer-root.test.ts": 46,
-      "src/renderer/src/lib/recent-workspace-tab-rows.test.ts": 84,
-      "src/renderer/src/lib/remap-open-editor-tabs-for-path-change.test.ts": 1548,
-      "src/renderer/src/lib/renderer-agent-status-observation-ingress.test.ts": 104,
-      "src/renderer/src/lib/renderer-app-platform.test.ts": 443,
-      "src/renderer/src/lib/renderer-memory-profile.test.ts": 49,
-      "src/renderer/src/lib/repo-display-labels.test.ts": 52,
-      "src/renderer/src/lib/repo-runtime-owner.test.ts": 69,
-      "src/renderer/src/lib/repo-search.test.ts": 49,
-      "src/renderer/src/lib/repo-slug-cache.test.ts": 52,
-      "src/renderer/src/lib/repo-slug-index.test.ts": 2622,
-      "src/renderer/src/lib/resolved-worktree-execution-host.test.ts": 176,
-      "src/renderer/src/lib/resume-sleeping-agent-session-direct-ssh-hydration-gap.test.ts": 1753,
-      "src/renderer/src/lib/resume-sleeping-agent-session-execution-host-scope.test.ts": 1684,
-      "src/renderer/src/lib/resume-sleeping-agent-session-provider-claim.test.ts": 1595,
-      "src/renderer/src/lib/resume-sleeping-agent-session-remote-compat.test.ts": 1762,
-      "src/renderer/src/lib/resume-sleeping-agent-session-replay.test.ts": 1390,
-      "src/renderer/src/lib/resume-sleeping-agent-session-slept-pane-recovery.test.ts": 1612,
-      "src/renderer/src/lib/resume-sleeping-agent-session-suppress-navigation.test.ts": 1709,
-      "src/renderer/src/lib/resume-sleeping-agent-session.test.ts": 6770,
-      "src/renderer/src/lib/resume-stale-structured-agent-session.test.ts": 1759,
-      "src/renderer/src/lib/right-sidebar-visibility.test.ts": 47,
-      "src/renderer/src/lib/run-quick-command-in-new-tab.test.ts": 86,
-      "src/renderer/src/lib/running-agent-targets.test.ts": 105,
-      "src/renderer/src/lib/runtime-host-unverifiable-probe-readers.test.ts": 271,
-      "src/renderer/src/lib/runtime-pane-title-leaf-id.test.ts": 49,
-      "src/renderer/src/lib/runtime-session-mirror-targets.test.ts": 53,
-      "src/renderer/src/lib/runtime-session-mirror-unverifiable-host.test.ts": 56,
-      "src/renderer/src/lib/runtime-workspace-file-route.test.ts": 199,
-      "src/renderer/src/lib/screen-submit-shortcut.test.ts": 55,
-      "src/renderer/src/lib/script-textarea-rows.test.ts": 76,
-      "src/renderer/src/lib/scroll-cache.test.ts": 45,
-      "src/renderer/src/lib/serve-desktop-promotion-session-continuity.test.ts": 1664,
-      "src/renderer/src/lib/session-write-subscriber-allocation.test.ts": 295,
-      "src/renderer/src/lib/session-write-subscriber-deferred-persist.test.ts": 1502,
-      "src/renderer/src/lib/session-write-subscriber.test.ts": 1489,
-      "src/renderer/src/lib/settled-worker-wake-policy.test.ts": 1709,
-      "src/renderer/src/lib/setup-runner.test.ts": 46,
-      "src/renderer/src/lib/setup-script-prompt.test.ts": 182,
-      "src/renderer/src/lib/sha256.test.ts": 66,
-      "src/renderer/src/lib/shutdown-checkpoint-guard.test.ts": 515,
-      "src/renderer/src/lib/sidebar-worktree-activation.test.ts": 88,
-      "src/renderer/src/lib/simulator-launch-coordination.test.ts": 159,
-      "src/renderer/src/lib/simulator-palette-search.test.ts": 215,
-      "src/renderer/src/lib/simulator-pane-shutdown-scheduler.test.ts": 1569,
-      "src/renderer/src/lib/simulator-tab-palette-activation.test.ts": 1846,
-      "src/renderer/src/lib/skill-freshness-display-status.test.ts": 56,
-      "src/renderer/src/lib/sleeping-agent-session-launch-windows-quoting.test.ts": 308,
-      "src/renderer/src/lib/smart-github-submit.test.ts": 86,
-      "src/renderer/src/lib/source-control-agent-action-plan.test.ts": 1631,
-      "src/renderer/src/lib/source-control-generation-plan.test.ts": 101,
-      "src/renderer/src/lib/source-control-launch-agent-selection.test.ts": 239,
-      "src/renderer/src/lib/source-control-launch-platform.test.ts": 61,
-      "src/renderer/src/lib/source-control-remote-error.test.ts": 85,
-      "src/renderer/src/lib/sparse-preset-draft.test.ts": 103,
-      "src/renderer/src/lib/ssh-background-startup-delivery.test.ts": 86,
-      "src/renderer/src/lib/ssh-failed-target-sleeping-agent-resume.test.ts": 1713,
-      "src/renderer/src/lib/ssh-mutation-expectation.test.ts": 64,
-      "src/renderer/src/lib/startup-ui-hydration.test.ts": 166,
-      "src/renderer/src/lib/state-collection-byte-estimate.test.ts": 117,
-      "src/renderer/src/lib/structured-agent-launch-no-terminal-fallback.test.ts": 269,
-      "src/renderer/src/lib/structured-agent-launch-settlement.test.ts": 54,
-      "src/renderer/src/lib/structured-agent-session-launch-cancellation.test.ts": 1600,
-      "src/renderer/src/lib/structured-agent-session-launch-exited-owner.test.ts": 976,
-      "src/renderer/src/lib/structured-agent-session-launch-join-delivery.test.ts": 528,
-      "src/renderer/src/lib/structured-agent-session-launch-options.test.ts": 575,
-      "src/renderer/src/lib/structured-agent-session-launch-persistence.test.ts": 487,
-      "src/renderer/src/lib/structured-agent-session-launch-prompt.test.ts": 441,
-      "src/renderer/src/lib/structured-agent-session-launch-reload.test.ts": 488,
-      "src/renderer/src/lib/structured-agent-session-launch-resume-identity.test.ts": 603,
-      "src/renderer/src/lib/structured-agent-session-launch.test.ts": 1367,
-      "src/renderer/src/lib/structured-agent-session-tab-activation.test.ts": 54,
-      "src/renderer/src/lib/structured-agent-startup-label-census.test.ts": 310,
-      "src/renderer/src/lib/tab-agent-identity-decision-table.test.ts": 689,
-      "src/renderer/src/lib/tab-agent-status-index.test.ts": 304,
-      "src/renderer/src/lib/tab-agent.test.ts": 59,
-      "src/renderer/src/lib/tab-has-live-pty.test.ts": 34,
-      "src/renderer/src/lib/tab-number-shortcuts.test.ts": 1635,
-      "src/renderer/src/lib/terminal-contrast-correction.test.ts": 68,
-      "src/renderer/src/lib/terminal-file-uri-link.test.ts": 70,
-      "src/renderer/src/lib/terminal-input-activity-coalescing.test.ts": 43,
-      "src/renderer/src/lib/terminal-links-redos.test.ts": 82,
-      "src/renderer/src/lib/terminal-links.test.ts": 332,
+      "src/renderer/src/lib/project-host-setup-options.test.ts": 182,
+      "src/renderer/src/lib/project-host-workspace-target.test.ts": 105,
+      "src/renderer/src/lib/project-skill-runtime.test.ts": 87,
+      "src/renderer/src/lib/provisioned-root-create-options.test.ts": 42,
+      "src/renderer/src/lib/quick-workspace-agent-selection.test.ts": 143,
+      "src/renderer/src/lib/react-commit-cascade-install-order.test.ts": 31,
+      "src/renderer/src/lib/react-commit-cascade-observer.react185.test.tsx": 465,
+      "src/renderer/src/lib/react-commit-cascade-observer.test.ts": 187,
+      "src/renderer/src/lib/react-commit-cascade-store-write-samples.test.ts": 55,
+      "src/renderer/src/lib/react-commit-cascade-telemetry.test.ts": 223,
+      "src/renderer/src/lib/react-error-boundary-reporting.test.ts": 43,
+      "src/renderer/src/lib/react-grab-dev-gate.test.ts": 39,
+      "src/renderer/src/lib/react-renderer-root.test.ts": 40,
+      "src/renderer/src/lib/recent-workspace-tab-rows.test.ts": 81,
+      "src/renderer/src/lib/remap-open-editor-tabs-for-path-change.test.ts": 1606,
+      "src/renderer/src/lib/renderer-agent-status-observation-ingress.test.ts": 136,
+      "src/renderer/src/lib/renderer-app-platform.test.ts": 338,
+      "src/renderer/src/lib/renderer-memory-profile.test.ts": 40,
+      "src/renderer/src/lib/repo-display-labels.test.ts": 55,
+      "src/renderer/src/lib/repo-runtime-owner.test.ts": 77,
+      "src/renderer/src/lib/repo-search.test.ts": 57,
+      "src/renderer/src/lib/repo-slug-cache.test.ts": 62,
+      "src/renderer/src/lib/repo-slug-index.test.ts": 2511,
+      "src/renderer/src/lib/resolved-worktree-execution-host.test.ts": 127,
+      "src/renderer/src/lib/resume-sleeping-agent-session-direct-ssh-hydration-gap.test.ts": 1502,
+      "src/renderer/src/lib/resume-sleeping-agent-session-execution-host-scope.test.ts": 1425,
+      "src/renderer/src/lib/resume-sleeping-agent-session-provider-claim.test.ts": 1617,
+      "src/renderer/src/lib/resume-sleeping-agent-session-remote-compat.test.ts": 1603,
+      "src/renderer/src/lib/resume-sleeping-agent-session-replay.test.ts": 1351,
+      "src/renderer/src/lib/resume-sleeping-agent-session-slept-pane-recovery.test.ts": 1692,
+      "src/renderer/src/lib/resume-sleeping-agent-session-suppress-navigation.test.ts": 1627,
+      "src/renderer/src/lib/resume-sleeping-agent-session.test.ts": 5799,
+      "src/renderer/src/lib/resume-stale-structured-agent-session.test.ts": 1670,
+      "src/renderer/src/lib/right-sidebar-visibility.test.ts": 30,
+      "src/renderer/src/lib/run-quick-command-in-new-tab.test.ts": 106,
+      "src/renderer/src/lib/running-agent-targets.test.ts": 61,
+      "src/renderer/src/lib/runtime-host-unverifiable-probe-readers.test.ts": 317,
+      "src/renderer/src/lib/runtime-pane-title-leaf-id.test.ts": 67,
+      "src/renderer/src/lib/runtime-session-mirror-targets.test.ts": 67,
+      "src/renderer/src/lib/runtime-session-mirror-unverifiable-host.test.ts": 64,
+      "src/renderer/src/lib/runtime-workspace-file-route.test.ts": 140,
+      "src/renderer/src/lib/screen-submit-shortcut.test.ts": 50,
+      "src/renderer/src/lib/script-textarea-rows.test.ts": 123,
+      "src/renderer/src/lib/scroll-cache.test.ts": 51,
+      "src/renderer/src/lib/serve-desktop-promotion-session-continuity.test.ts": 1709,
+      "src/renderer/src/lib/session-write-subscriber-allocation.test.ts": 215,
+      "src/renderer/src/lib/session-write-subscriber-deferred-persist.test.ts": 1599,
+      "src/renderer/src/lib/session-write-subscriber.test.ts": 1398,
+      "src/renderer/src/lib/settled-worker-wake-policy.test.ts": 1859,
+      "src/renderer/src/lib/setup-runner.test.ts": 39,
+      "src/renderer/src/lib/setup-script-prompt.test.ts": 215,
+      "src/renderer/src/lib/sha256.test.ts": 46,
+      "src/renderer/src/lib/shutdown-checkpoint-guard.test.ts": 523,
+      "src/renderer/src/lib/sidebar-worktree-activation.test.ts": 91,
+      "src/renderer/src/lib/simulator-launch-coordination.test.ts": 173,
+      "src/renderer/src/lib/simulator-palette-search.test.ts": 101,
+      "src/renderer/src/lib/simulator-pane-shutdown-scheduler.test.ts": 1567,
+      "src/renderer/src/lib/simulator-tab-palette-activation.test.ts": 2039,
+      "src/renderer/src/lib/skill-freshness-display-status.test.ts": 36,
+      "src/renderer/src/lib/sleeping-agent-session-launch-windows-quoting.test.ts": 283,
+      "src/renderer/src/lib/smart-github-submit.test.ts": 80,
+      "src/renderer/src/lib/source-control-agent-action-plan.test.ts": 954,
+      "src/renderer/src/lib/source-control-generation-plan.test.ts": 130,
+      "src/renderer/src/lib/source-control-launch-agent-selection.test.ts": 180,
+      "src/renderer/src/lib/source-control-launch-platform.test.ts": 73,
+      "src/renderer/src/lib/source-control-remote-error.test.ts": 50,
+      "src/renderer/src/lib/sparse-preset-draft.test.ts": 84,
+      "src/renderer/src/lib/ssh-background-startup-delivery.test.ts": 79,
+      "src/renderer/src/lib/ssh-failed-target-sleeping-agent-resume.test.ts": 1878,
+      "src/renderer/src/lib/ssh-mutation-expectation.test.ts": 46,
+      "src/renderer/src/lib/startup-ui-hydration.test.ts": 152,
+      "src/renderer/src/lib/state-collection-byte-estimate.test.ts": 84,
+      "src/renderer/src/lib/structured-agent-launch-no-terminal-fallback.test.ts": 272,
+      "src/renderer/src/lib/structured-agent-launch-settlement.test.ts": 81,
+      "src/renderer/src/lib/structured-agent-session-launch-cancellation.test.ts": 2166,
+      "src/renderer/src/lib/structured-agent-session-launch-exited-owner.test.ts": 948,
+      "src/renderer/src/lib/structured-agent-session-launch-join-delivery.test.ts": 378,
+      "src/renderer/src/lib/structured-agent-session-launch-options.test.ts": 660,
+      "src/renderer/src/lib/structured-agent-session-launch-persistence.test.ts": 449,
+      "src/renderer/src/lib/structured-agent-session-launch-prompt.test.ts": 357,
+      "src/renderer/src/lib/structured-agent-session-launch-reload.test.ts": 576,
+      "src/renderer/src/lib/structured-agent-session-launch-resume-identity.test.ts": 499,
+      "src/renderer/src/lib/structured-agent-session-launch.test.ts": 1259,
+      "src/renderer/src/lib/structured-agent-session-tab-activation.test.ts": 50,
+      "src/renderer/src/lib/structured-agent-startup-label-census.test.ts": 222,
+      "src/renderer/src/lib/tab-agent-identity-decision-table.test.ts": 420,
+      "src/renderer/src/lib/tab-agent-status-index.test.ts": 308,
+      "src/renderer/src/lib/tab-agent.test.ts": 74,
+      "src/renderer/src/lib/tab-has-live-pty.test.ts": 48,
+      "src/renderer/src/lib/tab-number-shortcuts.test.ts": 1493,
+      "src/renderer/src/lib/terminal-contrast-correction.test.ts": 44,
+      "src/renderer/src/lib/terminal-file-uri-link.test.ts": 33,
+      "src/renderer/src/lib/terminal-input-activity-coalescing.test.ts": 61,
+      "src/renderer/src/lib/terminal-links-redos.test.ts": 69,
+      "src/renderer/src/lib/terminal-links.test.ts": 274,
       "src/renderer/src/lib/terminal-pane-title-sanitization.test.ts": 51,
-      "src/renderer/src/lib/terminal-quick-command-project-scope.test.ts": 82,
-      "src/renderer/src/lib/terminal-quick-command-score-budget.test.ts": 49,
-      "src/renderer/src/lib/terminal-quick-command-search.test.ts": 70,
-      "src/renderer/src/lib/terminal-reveal-identity.test.ts": 63,
-      "src/renderer/src/lib/terminal-shortcut-capture-notification.test.tsx": 1332,
-      "src/renderer/src/lib/terminal-tab-for-pty-id.test.ts": 60,
-      "src/renderer/src/lib/terminal-theme.test.ts": 67,
-      "src/renderer/src/lib/terminal-worktree-route.test.ts": 222,
-      "src/renderer/src/lib/text-control-paste-ownership.test.ts": 547,
-      "src/renderer/src/lib/text-control-paste.test.ts": 533,
-      "src/renderer/src/lib/titlebar-left-chrome.test.ts": 37,
-      "src/renderer/src/lib/titlebar-worktree-history-controls.test.ts": 35,
-      "src/renderer/src/lib/tui-agent-startup.test.ts": 130,
-      "src/renderer/src/lib/typing-latency/diagnostic-lifecycle.test.ts": 424,
-      "src/renderer/src/lib/typing-latency/diagnostic-summary.test.ts": 74,
-      "src/renderer/src/lib/typing-latency/echo-instrumentation.test.ts": 175,
-      "src/renderer/src/lib/typing-latency/input-events.test.ts": 283,
+      "src/renderer/src/lib/terminal-quick-command-project-scope.test.ts": 76,
+      "src/renderer/src/lib/terminal-quick-command-score-budget.test.ts": 61,
+      "src/renderer/src/lib/terminal-quick-command-search.test.ts": 73,
+      "src/renderer/src/lib/terminal-reveal-identity.test.ts": 41,
+      "src/renderer/src/lib/terminal-shortcut-capture-notification.test.tsx": 1568,
+      "src/renderer/src/lib/terminal-tab-for-pty-id.test.ts": 31,
+      "src/renderer/src/lib/terminal-theme.test.ts": 80,
+      "src/renderer/src/lib/terminal-worktree-route.test.ts": 210,
+      "src/renderer/src/lib/text-control-paste-ownership.test.ts": 475,
+      "src/renderer/src/lib/text-control-paste.test.ts": 490,
+      "src/renderer/src/lib/titlebar-left-chrome.test.ts": 27,
+      "src/renderer/src/lib/titlebar-worktree-history-controls.test.ts": 50,
+      "src/renderer/src/lib/tui-agent-startup.test.ts": 103,
+      "src/renderer/src/lib/typing-latency/diagnostic-lifecycle.test.ts": 562,
+      "src/renderer/src/lib/typing-latency/diagnostic-summary.test.ts": 61,
+      "src/renderer/src/lib/typing-latency/echo-instrumentation.test.ts": 246,
+      "src/renderer/src/lib/typing-latency/input-events.test.ts": 385,
       "src/renderer/src/lib/typing-latency/input-source.test.ts": 75,
-      "src/renderer/src/lib/typing-latency/sample-window.test.ts": 63,
-      "src/renderer/src/lib/ui-zoom.test.ts": 50,
-      "src/renderer/src/lib/unread-badge-count.test.ts": 33,
-      "src/renderer/src/lib/update-check-click-options.test.ts": 56,
-      "src/renderer/src/lib/updater-beforeunload.test.ts": 29,
-      "src/renderer/src/lib/use-tab-agent-observed-signal-dispatch.test.tsx": 1692,
-      "src/renderer/src/lib/use-tab-agent-opencode-native-title.test.ts": 2110,
-      "src/renderer/src/lib/use-tab-agent-pi-identity.test.ts": 78,
-      "src/renderer/src/lib/use-tab-agent-process-signals.test.ts": 2054,
-      "src/renderer/src/lib/use-tab-agent-remote-pty-selector.test.ts": 87,
-      "src/renderer/src/lib/use-tab-agent-retained-identity.test.ts": 1725,
-      "src/renderer/src/lib/use-tab-agent-sleeping-session.test.ts": 1931,
-      "src/renderer/src/lib/use-tab-agent.test.ts": 1850,
-      "src/renderer/src/lib/visible-overlay.test.ts": 468,
-      "src/renderer/src/lib/wake-sleeping-agents-in-background.test.ts": 511,
-      "src/renderer/src/lib/wake-sleeping-agents-live-done.test.ts": 444,
-      "src/renderer/src/lib/web-client-location.test.ts": 32,
-      "src/renderer/src/lib/window-label-formatter.test.ts": 58,
-      "src/renderer/src/lib/window-visibility-interval.test.ts": 60,
-      "src/renderer/src/lib/window-visibility-timeout-poller.test.ts": 51,
-      "src/renderer/src/lib/windows-terminal-capabilities-race.test.ts": 520,
-      "src/renderer/src/lib/windows-terminal-capabilities.test.ts": 578,
-      "src/renderer/src/lib/windows-terminal-capability-reprobe.test.ts": 367,
-      "src/renderer/src/lib/work-item-link-query-bounds.test.ts": 56,
-      "src/renderer/src/lib/work-item-lookup-text.test.ts": 73,
-      "src/renderer/src/lib/worker-terminal-takeover-report.test.ts": 299,
-      "src/renderer/src/lib/workspace-activation-path-gate.test.ts": 1386,
-      "src/renderer/src/lib/workspace-activation-terminal-focus.test.ts": 248,
-      "src/renderer/src/lib/workspace-browser-tab-open.test.ts": 323,
-      "src/renderer/src/lib/workspace-composer-initial-focus.test.ts": 443,
-      "src/renderer/src/lib/workspace-create-error-format.test.ts": 103,
-      "src/renderer/src/lib/workspace-doc-address-input.test.ts": 225,
-      "src/renderer/src/lib/workspace-emoji-shortcodes.lazy.test.ts": 112,
-      "src/renderer/src/lib/workspace-emoji-shortcodes.test.ts": 91,
-      "src/renderer/src/lib/workspace-file-drag.test.ts": 56,
-      "src/renderer/src/lib/workspace-port-groups.test.ts": 32,
-      "src/renderer/src/lib/workspace-port-host-availability.test.ts": 39,
-      "src/renderer/src/lib/workspace-port-scan-debounce.test.ts": 61,
-      "src/renderer/src/lib/workspace-port-scan-publish.test.ts": 439,
-      "src/renderer/src/lib/workspace-session-browser-history.test.ts": 227,
-      "src/renderer/src/lib/workspace-session-closed-tab-tombstones.test.ts": 171,
-      "src/renderer/src/lib/workspace-session-editor-drafts.test.ts": 212,
-      "src/renderer/src/lib/workspace-session-host-contention.test.ts": 239,
-      "src/renderer/src/lib/workspace-session-host-persistence.test.ts": 292,
-      "src/renderer/src/lib/workspace-session-host-split.test.ts": 223,
-      "src/renderer/src/lib/workspace-session-hydration-keys.test.ts": 56,
-      "src/renderer/src/lib/workspace-session-liveness.test.ts": 214,
-      "src/renderer/src/lib/workspace-session-patch.test.ts": 204,
-      "src/renderer/src/lib/workspace-session-persistence-gate.test.ts": 180,
-      "src/renderer/src/lib/workspace-session-relevant-fields.test.ts": 180,
-      "src/renderer/src/lib/workspace-session-ssh-partition-ownership.test.ts": 239,
-      "src/renderer/src/lib/workspace-session-ssh-partition-round-trip.test.ts": 333,
-      "src/renderer/src/lib/workspace-session-staged-browser-tabs.test.ts": 52,
-      "src/renderer/src/lib/workspace-session.test.ts": 229,
-      "src/renderer/src/lib/workspace-tab-agent-metadata.test.ts": 62,
-      "src/renderer/src/lib/workspace-tab-palette-activation.store.test.ts": 2025,
-      "src/renderer/src/lib/workspace-tab-palette-activation.test.ts": 60,
-      "src/renderer/src/lib/workspace-tab-palette-results.test.ts": 144,
-      "src/renderer/src/lib/workspace-tab-palette-search.test.ts": 352,
-      "src/renderer/src/lib/workspace-terminal-host-authority.test.ts": 1343,
-      "src/renderer/src/lib/worktree-activation-agent-startup.test.ts": 1657,
-      "src/renderer/src/lib/worktree-activation-automation-filter.test.ts": 1772,
-      "src/renderer/src/lib/worktree-activation-created-agent.test.ts": 1992,
-      "src/renderer/src/lib/worktree-activation-default-tabs.test.ts": 1140,
-      "src/renderer/src/lib/worktree-activation-emptied-workspace-reseed.test.ts": 1898,
-      "src/renderer/src/lib/worktree-activation-empty-remote.test.ts": 1803,
-      "src/renderer/src/lib/worktree-activation-issue-command.test.ts": 1663,
-      "src/renderer/src/lib/worktree-activation-pty-inventory.test.ts": 168,
-      "src/renderer/src/lib/worktree-activation-reveal.test.ts": 1750,
-      "src/renderer/src/lib/worktree-activation-setup-script.test.ts": 1714,
-      "src/renderer/src/lib/worktree-activation-structured-chat-surface.test.ts": 1766,
-      "src/renderer/src/lib/worktree-activation-surface-caller-wiring.test.ts": 494,
-      "src/renderer/src/lib/worktree-activation-web-runtime.test.ts": 1939,
-      "src/renderer/src/lib/worktree-activity-state.test.ts": 73,
-      "src/renderer/src/lib/worktree-agent-activation-gate.test.ts": 4811,
-      "src/renderer/src/lib/worktree-agent-activation-seam.test.ts": 1137,
-      "src/renderer/src/lib/worktree-agent-structured-inventory.test.ts": 162,
-      "src/renderer/src/lib/worktree-attachment-label.test.ts": 50,
-      "src/renderer/src/lib/worktree-creation-agent-seeding.test.ts": 657,
-      "src/renderer/src/lib/worktree-creation-agent-seeds.test.ts": 1571,
-      "src/renderer/src/lib/worktree-creation-chat-setup.test.ts": 1963,
-      "src/renderer/src/lib/worktree-creation-flow-agent-trust-preflight.test.ts": 57,
-      "src/renderer/src/lib/worktree-creation-flow-dedupe.test.ts": 794,
-      "src/renderer/src/lib/worktree-creation-flow-stranded-surface.test.ts": 893,
-      "src/renderer/src/lib/worktree-creation-flow.test.ts": 1524,
-      "src/renderer/src/lib/worktree-creation-structured-session.test.ts": 1105,
-      "src/renderer/src/lib/worktree-creation-surface.test.ts": 58,
-      "src/renderer/src/lib/worktree-default-display-name.test.ts": 61,
-      "src/renderer/src/lib/worktree-display-name-order.test.ts": 53,
-      "src/renderer/src/lib/worktree-draft-startup-view-mode.test.ts": 1189,
-      "src/renderer/src/lib/worktree-git-identity-display.test.ts": 54,
-      "src/renderer/src/lib/worktree-jump-navigation.test.ts": 174,
-      "src/renderer/src/lib/worktree-live-terminal-surface-owners.test.ts": 157,
-      "src/renderer/src/lib/worktree-operation-generation.test.ts": 243,
-      "src/renderer/src/lib/worktree-operation-route.test.ts": 97,
-      "src/renderer/src/lib/worktree-palette-comment-snippet.test.ts": 59,
-      "src/renderer/src/lib/worktree-palette-create-action.test.ts": 65,
-      "src/renderer/src/lib/worktree-palette-multi-keyword.test.ts": 234,
-      "src/renderer/src/lib/worktree-palette-review-match.test.ts": 152,
-      "src/renderer/src/lib/worktree-palette-runtime-owner-identity.test.ts": 103,
-      "src/renderer/src/lib/worktree-palette-search.test.ts": 270,
-      "src/renderer/src/lib/worktree-palette-task-url-match.test.ts": 108,
-      "src/renderer/src/lib/worktree-reactivation-preserved-pane-replacement.test.ts": 1876,
-      "src/renderer/src/lib/worktree-reactivation-runtime-owned-resume-deferral.test.ts": 1754,
-      "src/renderer/src/lib/worktree-reactivation-tab-forkbomb.test.ts": 1544,
-      "src/renderer/src/lib/worktree-runtime-owner-index.detected-perf.test.ts": 705,
-      "src/renderer/src/lib/worktree-runtime-owner-index.detected.test.ts": 127,
-      "src/renderer/src/lib/worktree-runtime-owner-index.test.ts": 49,
-      "src/renderer/src/lib/worktree-runtime-owner.test.ts": 297,
-      "src/renderer/src/lib/worktree-sort-order-host-split.test.ts": 207,
-      "src/renderer/src/lib/worktree-sort-order-persistence.test.ts": 251,
-      "src/renderer/src/lib/worktree-status-spinner-launch-agent.test.ts": 83,
-      "src/renderer/src/lib/worktree-status-terminal-layout-roots.test.ts": 71,
-      "src/renderer/src/lib/worktree-status.interrupted.test.ts": 75,
-      "src/renderer/src/lib/worktree-status.test.ts": 93,
-      "src/renderer/src/lib/worktree-visit-recency.test.ts": 40,
-      "src/renderer/src/renderer-node-builtin-boundary.test.ts": 2543,
-      "src/renderer/src/runtime/agent-resume-host-authority-capability.test.ts": 54,
-      "src/renderer/src/runtime/agent-session-keyboard-capability.test.ts": 67,
+      "src/renderer/src/lib/typing-latency/sample-window.test.ts": 57,
+      "src/renderer/src/lib/ui-zoom.test.ts": 59,
+      "src/renderer/src/lib/unread-badge-count.test.ts": 51,
+      "src/renderer/src/lib/update-check-click-options.test.ts": 40,
+      "src/renderer/src/lib/updater-beforeunload.test.ts": 60,
+      "src/renderer/src/lib/use-tab-agent-observed-signal-dispatch.test.tsx": 1567,
+      "src/renderer/src/lib/use-tab-agent-opencode-native-title.test.ts": 1480,
+      "src/renderer/src/lib/use-tab-agent-pi-identity.test.ts": 92,
+      "src/renderer/src/lib/use-tab-agent-process-signals.test.ts": 2086,
+      "src/renderer/src/lib/use-tab-agent-remote-pty-selector.test.ts": 118,
+      "src/renderer/src/lib/use-tab-agent-retained-identity.test.ts": 1549,
+      "src/renderer/src/lib/use-tab-agent-sleeping-session.test.ts": 1948,
+      "src/renderer/src/lib/use-tab-agent.test.ts": 1893,
+      "src/renderer/src/lib/visible-overlay.test.ts": 464,
+      "src/renderer/src/lib/wake-sleeping-agents-in-background.test.ts": 276,
+      "src/renderer/src/lib/wake-sleeping-agents-live-done.test.ts": 437,
+      "src/renderer/src/lib/web-client-location.test.ts": 52,
+      "src/renderer/src/lib/window-label-formatter.test.ts": 27,
+      "src/renderer/src/lib/window-visibility-interval.test.ts": 70,
+      "src/renderer/src/lib/window-visibility-timeout-poller.test.ts": 67,
+      "src/renderer/src/lib/windows-terminal-capabilities-race.test.ts": 317,
+      "src/renderer/src/lib/windows-terminal-capabilities.test.ts": 401,
+      "src/renderer/src/lib/windows-terminal-capability-reprobe.test.ts": 432,
+      "src/renderer/src/lib/work-item-link-query-bounds.test.ts": 49,
+      "src/renderer/src/lib/work-item-lookup-text.test.ts": 55,
+      "src/renderer/src/lib/worker-terminal-takeover-report.test.ts": 314,
+      "src/renderer/src/lib/workspace-activation-path-gate.test.ts": 1954,
+      "src/renderer/src/lib/workspace-activation-terminal-focus.test.ts": 345,
+      "src/renderer/src/lib/workspace-browser-tab-open.test.ts": 325,
+      "src/renderer/src/lib/workspace-composer-initial-focus.test.ts": 351,
+      "src/renderer/src/lib/workspace-create-error-format.test.ts": 99,
+      "src/renderer/src/lib/workspace-doc-address-input.test.ts": 208,
+      "src/renderer/src/lib/workspace-emoji-shortcodes.lazy.test.ts": 103,
+      "src/renderer/src/lib/workspace-emoji-shortcodes.test.ts": 79,
+      "src/renderer/src/lib/workspace-file-drag.test.ts": 94,
+      "src/renderer/src/lib/workspace-port-groups.test.ts": 49,
+      "src/renderer/src/lib/workspace-port-host-availability.test.ts": 40,
+      "src/renderer/src/lib/workspace-port-scan-debounce.test.ts": 48,
+      "src/renderer/src/lib/workspace-port-scan-publish.test.ts": 672,
+      "src/renderer/src/lib/workspace-session-browser-history.test.ts": 196,
+      "src/renderer/src/lib/workspace-session-closed-tab-tombstones.test.ts": 146,
+      "src/renderer/src/lib/workspace-session-editor-drafts.test.ts": 156,
+      "src/renderer/src/lib/workspace-session-host-contention.test.ts": 236,
+      "src/renderer/src/lib/workspace-session-host-persistence.test.ts": 301,
+      "src/renderer/src/lib/workspace-session-host-split.test.ts": 128,
+      "src/renderer/src/lib/workspace-session-hydration-keys.test.ts": 36,
+      "src/renderer/src/lib/workspace-session-liveness.test.ts": 133,
+      "src/renderer/src/lib/workspace-session-patch.test.ts": 196,
+      "src/renderer/src/lib/workspace-session-persistence-gate.test.ts": 209,
+      "src/renderer/src/lib/workspace-session-relevant-fields.test.ts": 200,
+      "src/renderer/src/lib/workspace-session-ssh-partition-ownership.test.ts": 210,
+      "src/renderer/src/lib/workspace-session-ssh-partition-round-trip.test.ts": 235,
+      "src/renderer/src/lib/workspace-session-staged-browser-tabs.test.ts": 39,
+      "src/renderer/src/lib/workspace-session.test.ts": 150,
+      "src/renderer/src/lib/workspace-tab-agent-metadata.test.ts": 49,
+      "src/renderer/src/lib/workspace-tab-palette-activation.store.test.ts": 1538,
+      "src/renderer/src/lib/workspace-tab-palette-activation.test.ts": 73,
+      "src/renderer/src/lib/workspace-tab-palette-results.test.ts": 105,
+      "src/renderer/src/lib/workspace-tab-palette-search.test.ts": 216,
+      "src/renderer/src/lib/workspace-terminal-host-authority.test.ts": 1735,
+      "src/renderer/src/lib/worktree-activation-agent-startup.test.ts": 1648,
+      "src/renderer/src/lib/worktree-activation-automation-filter.test.ts": 1897,
+      "src/renderer/src/lib/worktree-activation-created-agent.test.ts": 1592,
+      "src/renderer/src/lib/worktree-activation-default-tabs.test.ts": 1319,
+      "src/renderer/src/lib/worktree-activation-emptied-workspace-reseed.test.ts": 2006,
+      "src/renderer/src/lib/worktree-activation-empty-remote.test.ts": 1783,
+      "src/renderer/src/lib/worktree-activation-issue-command.test.ts": 1036,
+      "src/renderer/src/lib/worktree-activation-pty-inventory.test.ts": 182,
+      "src/renderer/src/lib/worktree-activation-reveal.test.ts": 1804,
+      "src/renderer/src/lib/worktree-activation-setup-script.test.ts": 1979,
+      "src/renderer/src/lib/worktree-activation-structured-chat-surface.test.ts": 1880,
+      "src/renderer/src/lib/worktree-activation-surface-caller-wiring.test.ts": 290,
+      "src/renderer/src/lib/worktree-activation-web-runtime.test.ts": 1340,
+      "src/renderer/src/lib/worktree-activity-state.test.ts": 69,
+      "src/renderer/src/lib/worktree-agent-activation-gate.test.ts": 1546,
+      "src/renderer/src/lib/worktree-agent-activation-seam.test.ts": 1685,
+      "src/renderer/src/lib/worktree-agent-structured-inventory.test.ts": 132,
+      "src/renderer/src/lib/worktree-attachment-label.test.ts": 56,
+      "src/renderer/src/lib/worktree-creation-agent-seeding.test.ts": 622,
+      "src/renderer/src/lib/worktree-creation-agent-seeds.test.ts": 1725,
+      "src/renderer/src/lib/worktree-creation-chat-setup.test.ts": 1752,
+      "src/renderer/src/lib/worktree-creation-flow-agent-trust-preflight.test.ts": 34,
+      "src/renderer/src/lib/worktree-creation-flow-dedupe.test.ts": 887,
+      "src/renderer/src/lib/worktree-creation-flow-stranded-surface.test.ts": 1050,
+      "src/renderer/src/lib/worktree-creation-flow.test.ts": 2555,
+      "src/renderer/src/lib/worktree-creation-structured-session.test.ts": 922,
+      "src/renderer/src/lib/worktree-creation-surface.test.ts": 43,
+      "src/renderer/src/lib/worktree-default-display-name.test.ts": 67,
+      "src/renderer/src/lib/worktree-display-name-order.test.ts": 33,
+      "src/renderer/src/lib/worktree-draft-startup-view-mode.test.ts": 1565,
+      "src/renderer/src/lib/worktree-git-identity-display.test.ts": 78,
+      "src/renderer/src/lib/worktree-jump-navigation.test.ts": 231,
+      "src/renderer/src/lib/worktree-live-terminal-surface-owners.test.ts": 210,
+      "src/renderer/src/lib/worktree-operation-generation.test.ts": 319,
+      "src/renderer/src/lib/worktree-operation-route.test.ts": 63,
+      "src/renderer/src/lib/worktree-palette-comment-snippet.test.ts": 56,
+      "src/renderer/src/lib/worktree-palette-create-action.test.ts": 52,
+      "src/renderer/src/lib/worktree-palette-multi-keyword.test.ts": 216,
+      "src/renderer/src/lib/worktree-palette-review-match.test.ts": 96,
+      "src/renderer/src/lib/worktree-palette-runtime-owner-identity.test.ts": 81,
+      "src/renderer/src/lib/worktree-palette-search.test.ts": 166,
+      "src/renderer/src/lib/worktree-palette-task-url-match.test.ts": 118,
+      "src/renderer/src/lib/worktree-reactivation-preserved-pane-replacement.test.ts": 2149,
+      "src/renderer/src/lib/worktree-reactivation-runtime-owned-resume-deferral.test.ts": 1803,
+      "src/renderer/src/lib/worktree-reactivation-tab-forkbomb.test.ts": 1778,
+      "src/renderer/src/lib/worktree-runtime-owner-index.detected-perf.test.ts": 956,
+      "src/renderer/src/lib/worktree-runtime-owner-index.detected.test.ts": 184,
+      "src/renderer/src/lib/worktree-runtime-owner-index.test.ts": 37,
+      "src/renderer/src/lib/worktree-runtime-owner.test.ts": 233,
+      "src/renderer/src/lib/worktree-sort-order-host-split.test.ts": 150,
+      "src/renderer/src/lib/worktree-sort-order-persistence.test.ts": 179,
+      "src/renderer/src/lib/worktree-status-spinner-launch-agent.test.ts": 59,
+      "src/renderer/src/lib/worktree-status-terminal-layout-roots.test.ts": 58,
+      "src/renderer/src/lib/worktree-status.interrupted.test.ts": 74,
+      "src/renderer/src/lib/worktree-status.test.ts": 98,
+      "src/renderer/src/lib/worktree-visit-recency.test.ts": 37,
+      "src/renderer/src/renderer-node-builtin-boundary.test.ts": 1218,
+      "src/renderer/src/runtime/agent-resume-host-authority-capability.test.ts": 39,
+      "src/renderer/src/runtime/agent-session-keyboard-capability.test.ts": 66,
       "src/renderer/src/runtime/agent-session-operation-id.test.ts": 64,
-      "src/renderer/src/runtime/antigravity-generation-compatibility.test.ts": 265,
-      "src/renderer/src/runtime/browser-client-host-identity.test.ts": 51,
-      "src/renderer/src/runtime/browser-workspace-tab-close-census.test.ts": 329,
-      "src/renderer/src/runtime/browser-workspace-tab-close-plan.test.ts": 32,
-      "src/renderer/src/runtime/browser-workspace-tab-close.test.ts": 167,
-      "src/renderer/src/runtime/client-hosted-browser-close-intent-replay.test.ts": 237,
-      "src/renderer/src/runtime/client-hosted-browser-close-intents.test.ts": 131,
-      "src/renderer/src/runtime/client-hosted-browser-row-close.test.ts": 236,
-      "src/renderer/src/runtime/close-mirrored-editor-tab.test.ts": 93,
-      "src/renderer/src/runtime/file-explorer-delete-owner-provenance.test.ts": 2214,
-      "src/renderer/src/runtime/focus-runtime-terminal-surface-chat-view.test.ts": 452,
-      "src/renderer/src/runtime/github-check-details-timeout.test.ts": 35,
-      "src/renderer/src/runtime/gitlab-job-trace-client.test.ts": 120,
-      "src/renderer/src/runtime/host-session-mirror-empty-inventory-settle.test.ts": 629,
-      "src/renderer/src/runtime/host-session-mirror-flap-hydration.test.ts": 271,
-      "src/renderer/src/runtime/host-session-mirror-hydration-drain.test.ts": 308,
-      "src/renderer/src/runtime/host-session-mirror-hydration-frame-ordering.test.tsx": 2921,
-      "src/renderer/src/runtime/host-session-mirror-settle-census.test.ts": 341,
-      "src/renderer/src/runtime/host-session-mirror-settle-receipt-frames.test.tsx": 2343,
-      "src/renderer/src/runtime/host-session-snapshot-authority-client-hosted.test.ts": 48,
-      "src/renderer/src/runtime/local-runtime-capabilities.test.ts": 391,
-      "src/renderer/src/runtime/local-session-tab-close-owner.test.ts": 50,
-      "src/renderer/src/runtime/local-structured-session-empty-worktree-visibility.test.ts": 1213,
-      "src/renderer/src/runtime/local-structured-session-retired-epoch-repair.test.ts": 1817,
-      "src/renderer/src/runtime/local-structured-session-reveal-visibility.test.ts": 2188,
-      "src/renderer/src/runtime/local-structured-session-tabs-host-isolation.test.ts": 853,
-      "src/renderer/src/runtime/local-structured-session-tabs-sync.test.ts": 1907,
-      "src/renderer/src/runtime/local-structured-session-tabs-sync/retired-epoch-repair.test.ts": 46,
-      "src/renderer/src/runtime/mirrored-agent-status-clock-skew.test.ts": 1395,
-      "src/renderer/src/runtime/mobile-markdown-bridge-save-guards.test.ts": 1170,
-      "src/renderer/src/runtime/mobile-markdown-bridge.test.ts": 1529,
-      "src/renderer/src/runtime/native-chat-launch-draft-runtime-resolution.test.ts": 53,
-      "src/renderer/src/runtime/paired-reconnect-sidebar-agent-count.test.ts": 1881,
-      "src/renderer/src/runtime/remote-agent-row-last-assistant-message.test.ts": 1728,
-      "src/renderer/src/runtime/remote-agent-session-launch.test.ts": 79,
-      "src/renderer/src/runtime/remote-host-file-delete-repro.test.ts": 1979,
-      "src/renderer/src/runtime/remote-host-file-open-repro.test.ts": 1598,
-      "src/renderer/src/runtime/remote-runtime-session-tabs-inflight.test.ts": 55,
-      "src/renderer/src/runtime/remote-runtime-snapshot-outcome.test.ts": 105,
-      "src/renderer/src/runtime/remote-runtime-terminal-end-verdict.test.ts": 81,
-      "src/renderer/src/runtime/remote-runtime-terminal-frame-drop-resync.test.ts": 103,
-      "src/renderer/src/runtime/remote-runtime-terminal-parse-backpressure.test.ts": 413,
-      "src/renderer/src/runtime/remote-runtime-terminal-snapshot-kitty-flags.test.ts": 87,
-      "src/renderer/src/runtime/remote-runtime-terminal-stale-stream-frames.test.ts": 85,
-      "src/renderer/src/runtime/remote-runtime-terminal-stall-recovery.test.ts": 168,
-      "src/renderer/src/runtime/remote-server-install-failure-probe.test.ts": 47,
-      "src/renderer/src/runtime/remote-server-parity.test.ts": 1711,
+      "src/renderer/src/runtime/antigravity-generation-compatibility.test.ts": 167,
+      "src/renderer/src/runtime/browser-client-host-identity.test.ts": 60,
+      "src/renderer/src/runtime/browser-workspace-tab-close-census.test.ts": 361,
+      "src/renderer/src/runtime/browser-workspace-tab-close-plan.test.ts": 33,
+      "src/renderer/src/runtime/browser-workspace-tab-close.test.ts": 92,
+      "src/renderer/src/runtime/client-hosted-browser-close-intent-replay.test.ts": 172,
+      "src/renderer/src/runtime/client-hosted-browser-close-intents.test.ts": 103,
+      "src/renderer/src/runtime/client-hosted-browser-row-close.test.ts": 216,
+      "src/renderer/src/runtime/close-mirrored-editor-tab.test.ts": 107,
+      "src/renderer/src/runtime/file-explorer-delete-owner-provenance.test.ts": 2077,
+      "src/renderer/src/runtime/focus-runtime-terminal-surface-chat-view.test.ts": 502,
+      "src/renderer/src/runtime/github-check-details-timeout.test.ts": 41,
+      "src/renderer/src/runtime/gitlab-job-trace-client.test.ts": 141,
+      "src/renderer/src/runtime/host-session-mirror-empty-inventory-settle.test.ts": 630,
+      "src/renderer/src/runtime/host-session-mirror-flap-hydration.test.ts": 197,
+      "src/renderer/src/runtime/host-session-mirror-hydration-drain.test.ts": 239,
+      "src/renderer/src/runtime/host-session-mirror-hydration-frame-ordering.test.tsx": 1759,
+      "src/renderer/src/runtime/host-session-mirror-settle-census.test.ts": 505,
+      "src/renderer/src/runtime/host-session-mirror-settle-receipt-frames.test.tsx": 1864,
+      "src/renderer/src/runtime/host-session-snapshot-authority-client-hosted.test.ts": 52,
+      "src/renderer/src/runtime/local-runtime-capabilities.test.ts": 473,
+      "src/renderer/src/runtime/local-session-tab-close-owner.test.ts": 58,
+      "src/renderer/src/runtime/local-structured-session-empty-worktree-visibility.test.ts": 1132,
+      "src/renderer/src/runtime/local-structured-session-retired-epoch-repair.test.ts": 1743,
+      "src/renderer/src/runtime/local-structured-session-reveal-visibility.test.ts": 1580,
+      "src/renderer/src/runtime/local-structured-session-tabs-host-isolation.test.ts": 779,
+      "src/renderer/src/runtime/local-structured-session-tabs-sync.test.ts": 2524,
+      "src/renderer/src/runtime/local-structured-session-tabs-sync/retired-epoch-repair.test.ts": 67,
+      "src/renderer/src/runtime/mirrored-agent-status-clock-skew.test.ts": 1299,
+      "src/renderer/src/runtime/mobile-markdown-bridge-save-guards.test.ts": 1242,
+      "src/renderer/src/runtime/mobile-markdown-bridge.test.ts": 1361,
+      "src/renderer/src/runtime/native-chat-launch-draft-runtime-resolution.test.ts": 38,
+      "src/renderer/src/runtime/paired-reconnect-sidebar-agent-count.test.ts": 1002,
+      "src/renderer/src/runtime/remote-agent-row-last-assistant-message.test.ts": 1196,
+      "src/renderer/src/runtime/remote-agent-session-launch.test.ts": 62,
+      "src/renderer/src/runtime/remote-host-file-delete-repro.test.ts": 2161,
+      "src/renderer/src/runtime/remote-host-file-open-repro.test.ts": 1628,
+      "src/renderer/src/runtime/remote-runtime-session-tabs-inflight.test.ts": 50,
+      "src/renderer/src/runtime/remote-runtime-snapshot-outcome.test.ts": 118,
+      "src/renderer/src/runtime/remote-runtime-terminal-end-verdict.test.ts": 86,
+      "src/renderer/src/runtime/remote-runtime-terminal-frame-drop-resync.test.ts": 109,
+      "src/renderer/src/runtime/remote-runtime-terminal-parse-backpressure.test.ts": 334,
+      "src/renderer/src/runtime/remote-runtime-terminal-snapshot-kitty-flags.test.ts": 96,
+      "src/renderer/src/runtime/remote-runtime-terminal-stale-stream-frames.test.ts": 87,
+      "src/renderer/src/runtime/remote-runtime-terminal-stall-recovery.test.ts": 263,
+      "src/renderer/src/runtime/remote-server-install-failure-probe.test.ts": 61,
+      "src/renderer/src/runtime/remote-server-parity.test.ts": 1760,
       "src/renderer/src/runtime/remote-server-restart-wait.test.ts": 43,
-      "src/renderer/src/runtime/remote-server-update-coordinator.test.ts": 87,
-      "src/renderer/src/runtime/remote-terminal-layout-resolution.test.ts": 68,
-      "src/renderer/src/runtime/remote-terminal-stream-watchdog.test.ts": 76,
-      "src/renderer/src/runtime/restored-client-hosted-browser-host-attach.test.ts": 64,
-      "src/renderer/src/runtime/restored-client-hosted-browser-host-restart-attach.test.ts": 274,
-      "src/renderer/src/runtime/runtime-client-events.test.ts": 66,
-      "src/renderer/src/runtime/runtime-environment-ssh-state.test.ts": 1512,
-      "src/renderer/src/runtime/runtime-file-client-download.test.ts": 335,
-      "src/renderer/src/runtime/runtime-file-client-external-import.test.ts": 342,
-      "src/renderer/src/runtime/runtime-file-client-mutation-ownership.test.ts": 354,
-      "src/renderer/src/runtime/runtime-file-client-search-listing.test.ts": 438,
-      "src/renderer/src/runtime/runtime-file-client-watch.test.ts": 381,
-      "src/renderer/src/runtime/runtime-file-client.test.ts": 293,
-      "src/renderer/src/runtime/runtime-file-import-pairing-revision.test.ts": 365,
-      "src/renderer/src/runtime/runtime-file-search-bounds.test.ts": 56,
-      "src/renderer/src/runtime/runtime-git-client-api-contract.test.ts": 171,
-      "src/renderer/src/runtime/runtime-git-client-branch-line-total.test.ts": 192,
-      "src/renderer/src/runtime/runtime-git-client-merge.test.ts": 169,
-      "src/renderer/src/runtime/runtime-git-client.test.ts": 166,
-      "src/renderer/src/runtime/runtime-hooks-client.test.ts": 57,
-      "src/renderer/src/runtime/runtime-host-connection-state.test.ts": 68,
-      "src/renderer/src/runtime/runtime-host-contact-parity.test.ts": 48,
-      "src/renderer/src/runtime/runtime-jira-client.test.ts": 520,
-      "src/renderer/src/runtime/runtime-jira-payload-stream.test.ts": 267,
-      "src/renderer/src/runtime/runtime-linear-client.test.ts": 111,
-      "src/renderer/src/runtime/runtime-path-existence-batch.test.ts": 261,
-      "src/renderer/src/runtime/runtime-path-existence-error-parity.test.ts": 229,
-      "src/renderer/src/runtime/runtime-path-existence-pairing.test.ts": 189,
-      "src/renderer/src/runtime/runtime-path-existence-queue-pairing.test.ts": 186,
-      "src/renderer/src/runtime/runtime-provider-accounts-client.test.ts": 103,
-      "src/renderer/src/runtime/runtime-provider-search-bounds.test.ts": 47,
-      "src/renderer/src/runtime/runtime-repo-client.test.ts": 529,
-      "src/renderer/src/runtime/runtime-repo-search-bounds.test.ts": 40,
-      "src/renderer/src/runtime/runtime-rpc-client-pairing-revision.test.ts": 51,
-      "src/renderer/src/runtime/runtime-rpc-client.test.ts": 85,
-      "src/renderer/src/runtime/runtime-rpc-result.test.ts": 44,
-      "src/renderer/src/runtime/runtime-server-directory-browser.test.ts": 78,
-      "src/renderer/src/runtime/runtime-skills-client.test.ts": 83,
-      "src/renderer/src/runtime/runtime-skills-delete-client.test.ts": 68,
-      "src/renderer/src/runtime/runtime-terminal-inspection.test.ts": 1862,
-      "src/renderer/src/runtime/runtime-terminal-stream.test.ts": 399,
-      "src/renderer/src/runtime/runtime-worktree-selector.test.ts": 172,
-      "src/renderer/src/runtime/structured-agent-session-client.test.ts": 418,
-      "src/renderer/src/runtime/structured-agent-session-close.test.ts": 40,
-      "src/renderer/src/runtime/structured-agent-session-status-feed-lifecycle.test.ts": 65,
-      "src/renderer/src/runtime/structured-agent-session-status-feed.test.ts": 52,
-      "src/renderer/src/runtime/structured-agent-session-tab-retirement.test.ts": 47,
-      "src/renderer/src/runtime/structured-agent-session-turn-completion-feed.test.ts": 88,
-      "src/renderer/src/runtime/structured-conversation-tab-replacement.test.ts": 2021,
-      "src/renderer/src/runtime/sync-runtime-graph-agent-status-projection-join.test.ts": 408,
-      "src/renderer/src/runtime/sync-runtime-graph-agent-status-projection.test.ts": 320,
-      "src/renderer/src/runtime/sync-runtime-graph-automation-leaf.test.ts": 282,
-      "src/renderer/src/runtime/sync-runtime-graph-browser.test.ts": 227,
-      "src/renderer/src/runtime/sync-runtime-graph-conversion-publish.test.ts": 1475,
-      "src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts": 299,
-      "src/renderer/src/runtime/sync-runtime-graph-key-reuse.test.ts": 352,
-      "src/renderer/src/runtime/sync-runtime-graph-parked-leaf.test.ts": 341,
-      "src/renderer/src/runtime/sync-runtime-graph-payload-partition.test.ts": 387,
-      "src/renderer/src/runtime/sync-runtime-graph-projection-hot-path.test.ts": 474,
-      "src/renderer/src/runtime/sync-runtime-graph-publication-cost.test.ts": 432,
-      "src/renderer/src/runtime/sync-runtime-graph-scheduling.test.ts": 376,
-      "src/renderer/src/runtime/sync-runtime-graph-terminal-layout.test.ts": 1366,
-      "src/renderer/src/runtime/sync-runtime-graph-terminal-registration-ownership.test.ts": 315,
-      "src/renderer/src/runtime/sync-runtime-graph-terminal-surface-projection.test.ts": 387,
-      "src/renderer/src/runtime/sync-runtime-graph-workspace-publication.test.ts": 401,
-      "src/renderer/src/runtime/sync-runtime-graph.test.ts": 388,
+      "src/renderer/src/runtime/remote-server-update-coordinator.test.ts": 95,
+      "src/renderer/src/runtime/remote-terminal-layout-resolution.test.ts": 61,
+      "src/renderer/src/runtime/remote-terminal-stream-watchdog.test.ts": 52,
+      "src/renderer/src/runtime/restored-client-hosted-browser-host-attach.test.ts": 67,
+      "src/renderer/src/runtime/restored-client-hosted-browser-host-restart-attach.test.ts": 286,
+      "src/renderer/src/runtime/runtime-client-events.test.ts": 55,
+      "src/renderer/src/runtime/runtime-environment-ssh-state.test.ts": 1134,
+      "src/renderer/src/runtime/runtime-file-client-download.test.ts": 218,
+      "src/renderer/src/runtime/runtime-file-client-external-import.test.ts": 324,
+      "src/renderer/src/runtime/runtime-file-client-mutation-ownership.test.ts": 208,
+      "src/renderer/src/runtime/runtime-file-client-search-listing.test.ts": 276,
+      "src/renderer/src/runtime/runtime-file-client-watch.test.ts": 388,
+      "src/renderer/src/runtime/runtime-file-client.test.ts": 367,
+      "src/renderer/src/runtime/runtime-file-import-pairing-revision.test.ts": 311,
+      "src/renderer/src/runtime/runtime-file-search-bounds.test.ts": 38,
+      "src/renderer/src/runtime/runtime-git-client-api-contract.test.ts": 156,
+      "src/renderer/src/runtime/runtime-git-client-branch-line-total.test.ts": 182,
+      "src/renderer/src/runtime/runtime-git-client-merge.test.ts": 137,
+      "src/renderer/src/runtime/runtime-git-client.test.ts": 255,
+      "src/renderer/src/runtime/runtime-hooks-client.test.ts": 73,
+      "src/renderer/src/runtime/runtime-host-connection-state.test.ts": 50,
+      "src/renderer/src/runtime/runtime-host-contact-parity.test.ts": 81,
+      "src/renderer/src/runtime/runtime-jira-client.test.ts": 555,
+      "src/renderer/src/runtime/runtime-jira-payload-stream.test.ts": 242,
+      "src/renderer/src/runtime/runtime-linear-client.test.ts": 89,
+      "src/renderer/src/runtime/runtime-path-existence-batch.test.ts": 249,
+      "src/renderer/src/runtime/runtime-path-existence-error-parity.test.ts": 192,
+      "src/renderer/src/runtime/runtime-path-existence-pairing.test.ts": 236,
+      "src/renderer/src/runtime/runtime-path-existence-queue-pairing.test.ts": 252,
+      "src/renderer/src/runtime/runtime-provider-accounts-client.test.ts": 107,
+      "src/renderer/src/runtime/runtime-provider-search-bounds.test.ts": 44,
+      "src/renderer/src/runtime/runtime-repo-client.test.ts": 219,
+      "src/renderer/src/runtime/runtime-repo-search-bounds.test.ts": 38,
+      "src/renderer/src/runtime/runtime-rpc-client-pairing-revision.test.ts": 50,
+      "src/renderer/src/runtime/runtime-rpc-client.test.ts": 102,
+      "src/renderer/src/runtime/runtime-rpc-result.test.ts": 28,
+      "src/renderer/src/runtime/runtime-server-directory-browser.test.ts": 72,
+      "src/renderer/src/runtime/runtime-skills-client.test.ts": 78,
+      "src/renderer/src/runtime/runtime-skills-delete-client.test.ts": 61,
+      "src/renderer/src/runtime/runtime-terminal-inspection.test.ts": 1867,
+      "src/renderer/src/runtime/runtime-terminal-stream.test.ts": 341,
+      "src/renderer/src/runtime/runtime-worktree-selector.test.ts": 123,
+      "src/renderer/src/runtime/structured-agent-session-client.test.ts": 324,
+      "src/renderer/src/runtime/structured-agent-session-close.test.ts": 59,
+      "src/renderer/src/runtime/structured-agent-session-status-feed-lifecycle.test.ts": 37,
+      "src/renderer/src/runtime/structured-agent-session-status-feed.test.ts": 83,
+      "src/renderer/src/runtime/structured-agent-session-tab-retirement.test.ts": 55,
+      "src/renderer/src/runtime/structured-agent-session-turn-completion-feed.test.ts": 89,
+      "src/renderer/src/runtime/structured-conversation-tab-replacement.test.ts": 1641,
+      "src/renderer/src/runtime/sync-runtime-graph-agent-status-projection-join.test.ts": 422,
+      "src/renderer/src/runtime/sync-runtime-graph-agent-status-projection.test.ts": 334,
+      "src/renderer/src/runtime/sync-runtime-graph-automation-leaf.test.ts": 289,
+      "src/renderer/src/runtime/sync-runtime-graph-browser.test.ts": 244,
+      "src/renderer/src/runtime/sync-runtime-graph-conversion-publish.test.ts": 1365,
+      "src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts": 332,
+      "src/renderer/src/runtime/sync-runtime-graph-key-reuse.test.ts": 358,
+      "src/renderer/src/runtime/sync-runtime-graph-parked-leaf.test.ts": 237,
+      "src/renderer/src/runtime/sync-runtime-graph-payload-partition.test.ts": 305,
+      "src/renderer/src/runtime/sync-runtime-graph-projection-hot-path.test.ts": 542,
+      "src/renderer/src/runtime/sync-runtime-graph-publication-cost.test.ts": 270,
+      "src/renderer/src/runtime/sync-runtime-graph-scheduling.test.ts": 264,
+      "src/renderer/src/runtime/sync-runtime-graph-terminal-layout.test.ts": 1061,
+      "src/renderer/src/runtime/sync-runtime-graph-terminal-registration-ownership.test.ts": 349,
+      "src/renderer/src/runtime/sync-runtime-graph-terminal-surface-projection.test.ts": 225,
+      "src/renderer/src/runtime/sync-runtime-graph-workspace-publication.test.ts": 369,
+      "src/renderer/src/runtime/sync-runtime-graph.test.ts": 342,
       "src/renderer/src/runtime/sync-runtime-graph/mobile-terminal-theme.test.ts": 82,
-      "src/renderer/src/runtime/use-remote-runtime-recovery-triggers.test.ts": 548,
-      "src/renderer/src/runtime/use-runtime-session-mirror-environment-key.test.ts": 2253,
-      "src/renderer/src/runtime/use-worktree-runtime-target.test.ts": 2185,
-      "src/renderer/src/runtime/web-runtime-browser-capability-cleanup.test.ts": 405,
-      "src/renderer/src/runtime/web-runtime-browser-materialization.test.ts": 36,
-      "src/renderer/src/runtime/web-runtime-browser-tab-staging-hosting-intent.test.ts": 35,
-      "src/renderer/src/runtime/web-runtime-session-browser-client-placement.test.ts": 493,
-      "src/renderer/src/runtime/web-runtime-session-browser-create-failure.test.ts": 494,
-      "src/renderer/src/runtime/web-runtime-session-browser-create-focus.test.ts": 706,
-      "src/renderer/src/runtime/web-runtime-session-browser-create-split-placement.test.ts": 609,
-      "src/renderer/src/runtime/web-runtime-session-browser-create-staged-focus.test.ts": 574,
-      "src/renderer/src/runtime/web-runtime-session-browser-create-staged-hosting-intent.test.ts": 315,
-      "src/renderer/src/runtime/web-runtime-session-browser-create-staging.test.ts": 842,
-      "src/renderer/src/runtime/web-runtime-session-browser-placement-staleness.test.ts": 430,
-      "src/renderer/src/runtime/web-runtime-session-tab-activate-close.test.ts": 315,
-      "src/renderer/src/runtime/web-runtime-session-tab-move.test.ts": 430,
-      "src/renderer/src/runtime/web-runtime-session-tab-props.test.ts": 461,
-      "src/renderer/src/runtime/web-runtime-session-terminal-host-authority.test.ts": 501,
-      "src/renderer/src/runtime/web-runtime-session-terminal-legacy-create.test.ts": 397,
-      "src/renderer/src/runtime/web-runtime-session-terminal-pane-delegation.test.ts": 863,
-      "src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts": 390,
-      "src/renderer/src/runtime/web-runtime-session.test.ts": 274,
-      "src/renderer/src/runtime/web-runtime-terminal-identity.test.ts": 36,
-      "src/renderer/src/runtime/web-runtime-wake-terminal-respawn.test.ts": 34,
-      "src/renderer/src/runtime/web-session-browser-placement.test.ts": 51,
-      "src/renderer/src/runtime/web-session-close-intent.test.ts": 28,
-      "src/renderer/src/runtime/web-session-existing-tab-index.test.ts": 44,
-      "src/renderer/src/runtime/web-session-focus-intent-visible-tab.test.ts": 1848,
-      "src/renderer/src/runtime/web-session-intent-owner.test.ts": 61,
-      "src/renderer/src/runtime/web-session-open-files-batch-equivalence.test.ts": 1104,
-      "src/renderer/src/runtime/web-session-structured-tab-focus.test.ts": 1804,
-      "src/renderer/src/runtime/web-session-tabs-agent-completion-notifications.test.ts": 1791,
-      "src/renderer/src/runtime/web-session-tabs-late-merged-predecessor-lockout.test.ts": 540,
-      "src/renderer/src/runtime/web-session-tabs-publisher-identity-lineage.test.ts": 668,
-      "src/renderer/src/runtime/web-session-tabs-removed-frame-retires-live-publisher.test.ts": 656,
-      "src/renderer/src/runtime/web-session-tabs-sync-agent-handoff.test.ts": 765,
-      "src/renderer/src/runtime/web-session-tabs-sync-agent-status.test.ts": 510,
-      "src/renderer/src/runtime/web-session-tabs-sync-browser-tabs.test.ts": 668,
-      "src/renderer/src/runtime/web-session-tabs-sync-client-owned-page-content.test.ts": 746,
-      "src/renderer/src/runtime/web-session-tabs-sync-client-owned-placement.test.ts": 753,
-      "src/renderer/src/runtime/web-session-tabs-sync-diff-focus-steal.test.ts": 694,
-      "src/renderer/src/runtime/web-session-tabs-sync-editor-tabs.test.ts": 756,
-      "src/renderer/src/runtime/web-session-tabs-sync-emptied-workspace-tombstone.test.ts": 700,
-      "src/renderer/src/runtime/web-session-tabs-sync-focus-intent.test.ts": 1005,
-      "src/renderer/src/runtime/web-session-tabs-sync-host-restart-browser-rows.test.ts": 740,
-      "src/renderer/src/runtime/web-session-tabs-sync-host-tab-retraction-ghost-rows.test.ts": 2081,
-      "src/renderer/src/runtime/web-session-tabs-sync-html-preview-focus.test.ts": 728,
-      "src/renderer/src/runtime/web-session-tabs-sync-initial-terminal-relaunch.test.tsx": 2293,
-      "src/renderer/src/runtime/web-session-tabs-sync-layout-duplicate-groups.test.ts": 735,
-      "src/renderer/src/runtime/web-session-tabs-sync-layout-groups.test.ts": 602,
-      "src/renderer/src/runtime/web-session-tabs-sync-mirror-identity.test.ts": 1935,
-      "src/renderer/src/runtime/web-session-tabs-sync-mirrored-draft-close.test.ts": 2125,
-      "src/renderer/src/runtime/web-session-tabs-sync-reconnect-resubscribe.test.tsx": 2317,
-      "src/renderer/src/runtime/web-session-tabs-sync-remote-status-title-flap.test.ts": 1682,
-      "src/renderer/src/runtime/web-session-tabs-sync-restored-browser-rows.test.ts": 624,
-      "src/renderer/src/runtime/web-session-tabs-sync-snapshot-batch.test.ts": 945,
-      "src/renderer/src/runtime/web-session-tabs-sync-staged-browser-adoption.test.ts": 569,
-      "src/renderer/src/runtime/web-session-tabs-sync-staged-browser-authority.test.ts": 692,
-      "src/renderer/src/runtime/web-session-tabs-sync-terminal-bootstrap.test.ts": 772,
-      "src/renderer/src/runtime/web-session-tabs-sync-terminal-mirroring.test.ts": 822,
-      "src/renderer/src/runtime/web-session-tabs-sync-tracking-teardown.test.ts": 734,
-      "src/renderer/src/runtime/web-session-tabs-sync-unverifiable-host.test.tsx": 2392,
-      "src/renderer/src/runtime/web-session-tabs-sync-visibility-collision.test.tsx": 2630,
-      "src/renderer/src/runtime/web-session-tabs-sync-window-visibility.test.tsx": 8378,
-      "src/renderer/src/runtime/web-session-tabs-sync.test.ts": 582,
-      "src/renderer/src/runtime/web-session-tabs-sync/mirrored-agent-tab-label.test.ts": 1636,
-      "src/renderer/src/runtime/web-session-tabs-sync/mirrored-status-tab-retractions.test.ts": 1245,
-      "src/renderer/src/runtime/web-session-tabs-sync/mirrored-terminal-recovery-ledger.test.ts": 1612,
-      "src/renderer/src/runtime/web-session-tabs-sync/retraction-pane-ownership.test.ts": 1826,
-      "src/renderer/src/runtime/web-session-tabs-sync/tracking-lifecycle.test.ts": 1592,
-      "src/renderer/src/runtime/web-session-terminal-handle-events.test.ts": 45,
-      "src/renderer/src/runtime/web-session-terminal-orphan-absence-across-republication.test.ts": 496,
-      "src/renderer/src/runtime/web-session-terminal-orphan-inventory-retry.test.ts": 1704,
-      "src/renderer/src/runtime/web-session-terminal-orphan-mixed-version.test.ts": 742,
-      "src/renderer/src/runtime/web-session-terminal-orphan-recovery-adoption-regressions.test.ts": 1154,
-      "src/renderer/src/runtime/web-session-terminal-orphan-recovery-host-scope-gate.test.ts": 287,
-      "src/renderer/src/runtime/web-session-terminal-orphan-recovery-prior-removal.test.ts": 325,
-      "src/renderer/src/runtime/web-session-terminal-orphan-recovery-regressions.test.ts": 661,
-      "src/renderer/src/runtime/web-session-terminal-orphan-recovery-topology-fence.test.ts": 387,
-      "src/renderer/src/runtime/web-session-terminal-orphan-recovery.test.ts": 444,
-      "src/renderer/src/runtime/web-session-terminal-pending-handle-recovery.test.ts": 364,
-      "src/renderer/src/runtime/web-session-terminal-recovery-snapshot-validation.test.ts": 427,
-      "src/renderer/src/runtime/web-session-terminal-retirement-proof-ledger.test.ts": 300,
-      "src/renderer/src/runtime/window-visibility-subscription-parking.test.ts": 436,
-      "src/renderer/src/runtime/worktree-create-base.test.ts": 62,
-      "src/renderer/src/ssh/ssh-connect-in-flight.test.ts": 56,
+      "src/renderer/src/runtime/use-remote-runtime-recovery-triggers.test.ts": 555,
+      "src/renderer/src/runtime/use-runtime-session-mirror-environment-key.test.ts": 2476,
+      "src/renderer/src/runtime/use-worktree-runtime-target.test.ts": 2118,
+      "src/renderer/src/runtime/web-runtime-browser-capability-cleanup.test.ts": 230,
+      "src/renderer/src/runtime/web-runtime-browser-materialization.test.ts": 35,
+      "src/renderer/src/runtime/web-runtime-browser-tab-staging-hosting-intent.test.ts": 54,
+      "src/renderer/src/runtime/web-runtime-session-browser-client-placement.test.ts": 508,
+      "src/renderer/src/runtime/web-runtime-session-browser-create-failure.test.ts": 508,
+      "src/renderer/src/runtime/web-runtime-session-browser-create-focus.test.ts": 494,
+      "src/renderer/src/runtime/web-runtime-session-browser-create-split-placement.test.ts": 500,
+      "src/renderer/src/runtime/web-runtime-session-browser-create-staged-focus.test.ts": 530,
+      "src/renderer/src/runtime/web-runtime-session-browser-create-staged-hosting-intent.test.ts": 347,
+      "src/renderer/src/runtime/web-runtime-session-browser-create-staging.test.ts": 876,
+      "src/renderer/src/runtime/web-runtime-session-browser-placement-staleness.test.ts": 390,
+      "src/renderer/src/runtime/web-runtime-session-tab-activate-close.test.ts": 470,
+      "src/renderer/src/runtime/web-runtime-session-tab-move.test.ts": 317,
+      "src/renderer/src/runtime/web-runtime-session-tab-props.test.ts": 512,
+      "src/renderer/src/runtime/web-runtime-session-terminal-host-authority.test.ts": 461,
+      "src/renderer/src/runtime/web-runtime-session-terminal-legacy-create.test.ts": 336,
+      "src/renderer/src/runtime/web-runtime-session-terminal-pane-delegation.test.ts": 1290,
+      "src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts": 366,
+      "src/renderer/src/runtime/web-runtime-session.test.ts": 384,
+      "src/renderer/src/runtime/web-runtime-terminal-identity.test.ts": 57,
+      "src/renderer/src/runtime/web-runtime-wake-terminal-respawn.test.ts": 47,
+      "src/renderer/src/runtime/web-session-browser-placement.test.ts": 48,
+      "src/renderer/src/runtime/web-session-close-intent.test.ts": 53,
+      "src/renderer/src/runtime/web-session-existing-tab-index.test.ts": 35,
+      "src/renderer/src/runtime/web-session-focus-intent-visible-tab.test.ts": 1811,
+      "src/renderer/src/runtime/web-session-intent-owner.test.ts": 41,
+      "src/renderer/src/runtime/web-session-open-files-batch-equivalence.test.ts": 1150,
+      "src/renderer/src/runtime/web-session-structured-tab-focus.test.ts": 1370,
+      "src/renderer/src/runtime/web-session-tabs-agent-completion-notifications.test.ts": 1511,
+      "src/renderer/src/runtime/web-session-tabs-late-merged-predecessor-lockout.test.ts": 699,
+      "src/renderer/src/runtime/web-session-tabs-publisher-identity-lineage.test.ts": 472,
+      "src/renderer/src/runtime/web-session-tabs-removed-frame-retires-live-publisher.test.ts": 648,
+      "src/renderer/src/runtime/web-session-tabs-sync-agent-handoff.test.ts": 643,
+      "src/renderer/src/runtime/web-session-tabs-sync-agent-status.test.ts": 732,
+      "src/renderer/src/runtime/web-session-tabs-sync-browser-tabs.test.ts": 699,
+      "src/renderer/src/runtime/web-session-tabs-sync-client-owned-page-content.test.ts": 617,
+      "src/renderer/src/runtime/web-session-tabs-sync-client-owned-placement.test.ts": 727,
+      "src/renderer/src/runtime/web-session-tabs-sync-diff-focus-steal.test.ts": 468,
+      "src/renderer/src/runtime/web-session-tabs-sync-editor-tabs.test.ts": 668,
+      "src/renderer/src/runtime/web-session-tabs-sync-emptied-workspace-tombstone.test.ts": 817,
+      "src/renderer/src/runtime/web-session-tabs-sync-focus-intent.test.ts": 603,
+      "src/renderer/src/runtime/web-session-tabs-sync-host-restart-browser-rows.test.ts": 722,
+      "src/renderer/src/runtime/web-session-tabs-sync-host-tab-retraction-ghost-rows.test.ts": 2099,
+      "src/renderer/src/runtime/web-session-tabs-sync-html-preview-focus.test.ts": 659,
+      "src/renderer/src/runtime/web-session-tabs-sync-initial-terminal-relaunch.test.tsx": 2154,
+      "src/renderer/src/runtime/web-session-tabs-sync-layout-duplicate-groups.test.ts": 763,
+      "src/renderer/src/runtime/web-session-tabs-sync-layout-groups.test.ts": 671,
+      "src/renderer/src/runtime/web-session-tabs-sync-mirror-identity.test.ts": 1309,
+      "src/renderer/src/runtime/web-session-tabs-sync-mirrored-draft-close.test.ts": 2175,
+      "src/renderer/src/runtime/web-session-tabs-sync-reconnect-resubscribe.test.tsx": 2266,
+      "src/renderer/src/runtime/web-session-tabs-sync-remote-status-title-flap.test.ts": 1052,
+      "src/renderer/src/runtime/web-session-tabs-sync-restored-browser-rows.test.ts": 735,
+      "src/renderer/src/runtime/web-session-tabs-sync-snapshot-batch.test.ts": 666,
+      "src/renderer/src/runtime/web-session-tabs-sync-staged-browser-adoption.test.ts": 789,
+      "src/renderer/src/runtime/web-session-tabs-sync-staged-browser-authority.test.ts": 732,
+      "src/renderer/src/runtime/web-session-tabs-sync-terminal-bootstrap.test.ts": 603,
+      "src/renderer/src/runtime/web-session-tabs-sync-terminal-mirroring.test.ts": 756,
+      "src/renderer/src/runtime/web-session-tabs-sync-tracking-teardown.test.ts": 700,
+      "src/renderer/src/runtime/web-session-tabs-sync-unverifiable-host.test.tsx": 1481,
+      "src/renderer/src/runtime/web-session-tabs-sync-visibility-collision.test.tsx": 2322,
+      "src/renderer/src/runtime/web-session-tabs-sync-window-visibility.test.tsx": 6067,
+      "src/renderer/src/runtime/web-session-tabs-sync.test.ts": 610,
+      "src/renderer/src/runtime/web-session-tabs-sync/mirrored-agent-tab-label.test.ts": 1260,
+      "src/renderer/src/runtime/web-session-tabs-sync/mirrored-status-tab-retractions.test.ts": 1840,
+      "src/renderer/src/runtime/web-session-tabs-sync/mirrored-terminal-recovery-ledger.test.ts": 1252,
+      "src/renderer/src/runtime/web-session-tabs-sync/retraction-pane-ownership.test.ts": 1429,
+      "src/renderer/src/runtime/web-session-tabs-sync/tracking-lifecycle.test.ts": 1590,
+      "src/renderer/src/runtime/web-session-terminal-handle-events.test.ts": 29,
+      "src/renderer/src/runtime/web-session-terminal-orphan-absence-across-republication.test.ts": 313,
+      "src/renderer/src/runtime/web-session-terminal-orphan-inventory-retry.test.ts": 1303,
+      "src/renderer/src/runtime/web-session-terminal-orphan-mixed-version.test.ts": 607,
+      "src/renderer/src/runtime/web-session-terminal-orphan-recovery-adoption-regressions.test.ts": 754,
+      "src/renderer/src/runtime/web-session-terminal-orphan-recovery-host-scope-gate.test.ts": 306,
+      "src/renderer/src/runtime/web-session-terminal-orphan-recovery-prior-removal.test.ts": 328,
+      "src/renderer/src/runtime/web-session-terminal-orphan-recovery-regressions.test.ts": 607,
+      "src/renderer/src/runtime/web-session-terminal-orphan-recovery-topology-fence.test.ts": 370,
+      "src/renderer/src/runtime/web-session-terminal-orphan-recovery.test.ts": 327,
+      "src/renderer/src/runtime/web-session-terminal-pending-handle-recovery.test.ts": 229,
+      "src/renderer/src/runtime/web-session-terminal-recovery-snapshot-validation.test.ts": 444,
+      "src/renderer/src/runtime/web-session-terminal-retirement-proof-ledger.test.ts": 350,
+      "src/renderer/src/runtime/window-visibility-subscription-parking.test.ts": 524,
+      "src/renderer/src/runtime/worktree-create-base.test.ts": 45,
+      "src/renderer/src/ssh/ssh-connect-in-flight.test.ts": 69,
       "src/renderer/src/ssh/ssh-connect-ui-timeout.test.ts": 51,
-      "src/renderer/src/ssh/ssh-connect-verb.test.ts": 48,
-      "src/renderer/src/ssh/ssh-connection-recoverability.test.ts": 31,
-      "src/renderer/src/startup/active-workspace-ssh-targets.test.ts": 64,
-      "src/renderer/src/startup/ssh-startup-reconnect.test.ts": 67,
-      "src/renderer/src/startup/startup-ssh-connection-restore.test.ts": 76,
-      "src/renderer/src/store/active-terminal-chrome-selector.test.ts": 67,
-      "src/renderer/src/store/always-mounted-selector-scan-cost.test.ts": 1640,
-      "src/renderer/src/store/copy-on-write-record.test.ts": 50,
-      "src/renderer/src/store/folder-workspaces/folder-workspace-catalog.test.ts": 69,
-      "src/renderer/src/store/github/refresh-event-noop-notification.test.ts": 1219,
-      "src/renderer/src/store/pinned-tab-close-guard.test.ts": 66,
-      "src/renderer/src/store/plugin-language-packs.test.ts": 548,
-      "src/renderer/src/store/plugin-panels.test.ts": 448,
-      "src/renderer/src/store/project-host-setup-selector.test.ts": 67,
-      "src/renderer/src/store/projects/project-catalog-null-field-ingest.test.ts": 64,
-      "src/renderer/src/store/projects/project-wsl-filesystem-boundary-advisory.test.ts": 55,
+      "src/renderer/src/ssh/ssh-connect-verb.test.ts": 35,
+      "src/renderer/src/ssh/ssh-connection-recoverability.test.ts": 50,
+      "src/renderer/src/startup/active-workspace-ssh-targets.test.ts": 68,
+      "src/renderer/src/startup/ssh-startup-reconnect.test.ts": 68,
+      "src/renderer/src/startup/startup-ssh-connection-restore.test.ts": 51,
+      "src/renderer/src/store/active-terminal-chrome-selector.test.ts": 44,
+      "src/renderer/src/store/always-mounted-selector-scan-cost.test.ts": 1670,
+      "src/renderer/src/store/copy-on-write-record.test.ts": 31,
+      "src/renderer/src/store/folder-workspaces/folder-workspace-catalog.test.ts": 51,
+      "src/renderer/src/store/github/cache-persistence.test.ts": 1363,
+      "src/renderer/src/store/github/refresh-event-noop-notification.test.ts": 1047,
+      "src/renderer/src/store/pinned-tab-close-guard.test.ts": 44,
+      "src/renderer/src/store/plugin-language-packs.test.ts": 321,
+      "src/renderer/src/store/plugin-panels.test.ts": 372,
+      "src/renderer/src/store/project-host-setup-selector.test.ts": 92,
+      "src/renderer/src/store/projects/project-catalog-null-field-ingest.test.ts": 57,
+      "src/renderer/src/store/projects/project-wsl-filesystem-boundary-advisory.test.ts": 64,
       "src/renderer/src/store/react-commit-cascade-write-probe.test.ts": 56,
-      "src/renderer/src/store/repos/safe-auto-fork-sync.test.ts": 296,
+      "src/renderer/src/store/repos/safe-auto-fork-sync.test.ts": 349,
       "src/renderer/src/store/right-sidebar-route.test.ts": 48,
-      "src/renderer/src/store/running-terminal-close-confirm.test.ts": 58,
-      "src/renderer/src/store/selectors.test.ts": 1226,
-      "src/renderer/src/store/slices/active-tab-owner-worktree.test.ts": 53,
-      "src/renderer/src/store/slices/activity-cleared-at.test.ts": 2001,
-      "src/renderer/src/store/slices/agent-generated-tab-title.test.ts": 1546,
-      "src/renderer/src/store/slices/agent-hibernation-live-anchor-e2e.test.ts": 1542,
-      "src/renderer/src/store/slices/agent-pane-authority.test.ts": 1258,
-      "src/renderer/src/store/slices/agent-status-ack-cleanup.test.ts": 1594,
-      "src/renderer/src/store/slices/agent-status-batch.test.ts": 1612,
-      "src/renderer/src/store/slices/agent-status-drop-ipc.test.ts": 2470,
-      "src/renderer/src/store/slices/agent-status-drop.test.ts": 1730,
-      "src/renderer/src/store/slices/agent-status-freshness-cache.test.ts": 73,
-      "src/renderer/src/store/slices/agent-status-freshness-scheduler.test.ts": 43,
-      "src/renderer/src/store/slices/agent-status-live-freshness-request.test.ts": 133,
-      "src/renderer/src/store/slices/agent-status-live-map-leak.test.ts": 14935,
-      "src/renderer/src/store/slices/agent-status-main-agent-fact.test.ts": 1492,
-      "src/renderer/src/store/slices/agent-status-manual-sleep-capture.test.ts": 1132,
-      "src/renderer/src/store/slices/agent-status-observation-neutrality.test.ts": 1298,
-      "src/renderer/src/store/slices/agent-status-pane-keyed-records.test.ts": 79,
-      "src/renderer/src/store/slices/agent-status-pr-refresh-handoff.test.ts": 1064,
-      "src/renderer/src/store/slices/agent-status-provider-session.test.ts": 1277,
-      "src/renderer/src/store/slices/agent-status-quit-capture-resumable-agents.test.ts": 1535,
-      "src/renderer/src/store/slices/agent-status-quit-capture.test.ts": 1543,
-      "src/renderer/src/store/slices/agent-status-reminted-pane-key.test.ts": 1601,
-      "src/renderer/src/store/slices/agent-status-retained-leak.test.ts": 2499,
-      "src/renderer/src/store/slices/agent-status-retention-prefix-sweep.test.ts": 1555,
-      "src/renderer/src/store/slices/agent-status-runtime-orchestration.test.ts": 1662,
-      "src/renderer/src/store/slices/agent-status-session-boundary-done.test.ts": 1589,
-      "src/renderer/src/store/slices/agent-status-ssh-connection-clear.test.ts": 1442,
-      "src/renderer/src/store/slices/agent-status-tool-assistant-fields.test.ts": 1565,
-      "src/renderer/src/store/slices/agent-status-worktree-purge-leak.test.ts": 1633,
-      "src/renderer/src/store/slices/agent-status.test.ts": 1564,
-      "src/renderer/src/store/slices/ambiguous-owner-warning-worktree-removal-leak.test.ts": 1499,
-      "src/renderer/src/store/slices/browser-cleanup-close.test.ts": 1072,
-      "src/renderer/src/store/slices/browser-page-close-intent-recording.test.ts": 1627,
-      "src/renderer/src/store/slices/browser-page-conversion.test.ts": 1690,
-      "src/renderer/src/store/slices/browser-remote-page-lifecycle.test.ts": 530,
-      "src/renderer/src/store/slices/browser-remote-tab-creation.test.ts": 347,
-      "src/renderer/src/store/slices/browser-session-host-selection.test.ts": 545,
-      "src/renderer/src/store/slices/browser-session-profiles.test.ts": 300,
-      "src/renderer/src/store/slices/browser-webview-cleanup.test.ts": 37,
-      "src/renderer/src/store/slices/browser-workspace-doc-location.test.ts": 1765,
-      "src/renderer/src/store/slices/browser-workspace-host-ownership.test.ts": 293,
-      "src/renderer/src/store/slices/browser.test.ts": 445,
-      "src/renderer/src/store/slices/bulk-worktree-purge-terminal-maps-leak.test.ts": 1646,
-      "src/renderer/src/store/slices/cmd-j-create-actions.test.ts": 1666,
-      "src/renderer/src/store/slices/codex-restart-notice-lifecycle.test.ts": 1660,
-      "src/renderer/src/store/slices/degraded-repo-hydration.test.ts": 1570,
-      "src/renderer/src/store/slices/detected-agents-environment-prune-leak.test.ts": 1487,
-      "src/renderer/src/store/slices/detected-agents.test.ts": 318,
-      "src/renderer/src/store/slices/detected-worktree-refresh-leases.test.ts": 73,
-      "src/renderer/src/store/slices/dictation-model-state-stabilisation.test.ts": 534,
-      "src/renderer/src/store/slices/diffComments.test.ts": 1607,
-      "src/renderer/src/store/slices/direct-ssh-pane-detach-ledger.test.ts": 1570,
-      "src/renderer/src/store/slices/direct-ssh-terminal-recovery.test.ts": 1610,
-      "src/renderer/src/store/slices/direct-ssh-terminal-retry.test.ts": 1612,
-      "src/renderer/src/store/slices/direct-ssh-terminal-workspace-scope.test.ts": 60,
-      "src/renderer/src/store/slices/editor-branch-diff-snapshots.test.ts": 481,
-      "src/renderer/src/store/slices/editor-branch-line-total.test.ts": 359,
-      "src/renderer/src/store/slices/editor-check-details-tabs.test.ts": 542,
-      "src/renderer/src/store/slices/editor-close-file-cleanup.test.ts": 769,
-      "src/renderer/src/store/slices/editor-git-status-reconciliation.test.ts": 500,
-      "src/renderer/src/store/slices/editor-hydration-scaling.test.ts": 1685,
-      "src/renderer/src/store/slices/editor-markdown-link-activation.test.ts": 515,
-      "src/renderer/src/store/slices/editor-markdown-view-state.test.ts": 586,
-      "src/renderer/src/store/slices/editor-open-diff.test.ts": 639,
-      "src/renderer/src/store/slices/editor-preview-tab-setting.test.ts": 544,
-      "src/renderer/src/store/slices/editor-read-only-tabs.test.ts": 523,
-      "src/renderer/src/store/slices/editor-recently-closed-tabs.test.ts": 601,
-      "src/renderer/src/store/slices/editor-rekey-open-files.test.ts": 1761,
-      "src/renderer/src/store/slices/editor-remote-branch-actions.test.ts": 1496,
-      "src/renderer/src/store/slices/editor-rich-markdown-size-override.test.ts": 495,
-      "src/renderer/src/store/slices/editor-right-sidebar-state.test.ts": 530,
-      "src/renderer/src/store/slices/editor-session-duplicate-restore.test.ts": 1530,
-      "src/renderer/src/store/slices/editor-state-worktree-purge-leak.test.ts": 1602,
-      "src/renderer/src/store/slices/editor-tab-placement.test.ts": 323,
-      "src/renderer/src/store/slices/editor/actions/markdown-preview-actions.test.ts": 204,
-      "src/renderer/src/store/slices/editor/file-ids/hydrated-editor-file-index.test.ts": 818,
-      "src/renderer/src/store/slices/editor/file-ids/hydrated-editor-projections.test.ts": 371,
-      "src/renderer/src/store/slices/editor/git/git-status-reconciliation.perf.test.ts": 127,
-      "src/renderer/src/store/slices/empty-update-notifications.test.ts": 1607,
-      "src/renderer/src/store/slices/folder-workspace-activation-and-activity.test.ts": 1610,
-      "src/renderer/src/store/slices/folder-workspace-diff-comments.test.ts": 555,
-      "src/renderer/src/store/slices/folder-workspace-owner-routed-mutations.test.ts": 1105,
-      "src/renderer/src/store/slices/generation-records-worktree-removal-leak.test.ts": 1547,
-      "src/renderer/src/store/slices/github-branch-mismatched-linked-pr.test.ts": 247,
-      "src/renderer/src/store/slices/github-cache-eviction-and-bounds.test.ts": 452,
-      "src/renderer/src/store/slices/github-checks-cache.test.ts": 255,
-      "src/renderer/src/store/slices/github-checks.test.ts": 59,
-      "src/renderer/src/store/slices/github-issue-source-indicator-suppression.test.ts": 231,
-      "src/renderer/src/store/slices/github-issue-state-machine.test.ts": 146,
-      "src/renderer/src/store/slices/github-pr-branch-coordinator-events.test.ts": 222,
-      "src/renderer/src/store/slices/github-pr-branch-direct-refresh-scope.test.ts": 261,
-      "src/renderer/src/store/slices/github-pr-branch-fallback-results.test.ts": 252,
-      "src/renderer/src/store/slices/github-pr-branch-hosted-review-cache.test.ts": 164,
-      "src/renderer/src/store/slices/github-pr-branch-linked-pr-divergence.test.ts": 243,
-      "src/renderer/src/store/slices/github-pr-checks-fetch.test.ts": 368,
-      "src/renderer/src/store/slices/github-pr-comments.test.ts": 332,
-      "src/renderer/src/store/slices/github-pr-refresh-host-guard.test.ts": 180,
-      "src/renderer/src/store/slices/github-pr-refresh-hosted-review-cache-leak.test.ts": 1151,
-      "src/renderer/src/store/slices/github-pr-refresh-owner-routing.test.ts": 401,
-      "src/renderer/src/store/slices/github-pr-refresh-sequences-leak.test.ts": 154,
-      "src/renderer/src/store/slices/github-pr-refresh-states-leak.test.ts": 4537,
-      "src/renderer/src/store/slices/github-project-request-coordination.test.ts": 235,
-      "src/renderer/src/store/slices/github-project-row-owner.test.ts": 41,
-      "src/renderer/src/store/slices/github-project-view-tables.test.ts": 235,
-      "src/renderer/src/store/slices/github-provider-request-concurrency.test.ts": 217,
-      "src/renderer/src/store/slices/github-refresh-sweep.test.ts": 460,
-      "src/renderer/src/store/slices/github-repo-lookup-index.test.ts": 47,
-      "src/renderer/src/store/slices/github-review-thread-actions.test.ts": 224,
-      "src/renderer/src/store/slices/github-work-item-cache-identity.test.ts": 159,
-      "src/renderer/src/store/slices/github-work-items-error-envelope.test.ts": 169,
-      "src/renderer/src/store/slices/github-work-items-pagination.test.ts": 242,
-      "src/renderer/src/store/slices/github-work-items-query-bounds.test.ts": 52,
-      "src/renderer/src/store/slices/github-work-items-runtime-routing.test.ts": 359,
-      "src/renderer/src/store/slices/github-worktree-refresh-if-stale.test.ts": 175,
-      "src/renderer/src/store/slices/hosted-review-cache-race.test.ts": 84,
-      "src/renderer/src/store/slices/hosted-review-cache.test.ts": 179,
-      "src/renderer/src/store/slices/hosted-review.test.ts": 98,
-      "src/renderer/src/store/slices/jira.test.ts": 176,
-      "src/renderer/src/store/slices/linear-credential-error-recovery.test.ts": 151,
-      "src/renderer/src/store/slices/linear-invalidation.test.ts": 178,
-      "src/renderer/src/store/slices/linear-issue-cache-refresh.test.ts": 184,
-      "src/renderer/src/store/slices/linear-scoped-collection-cache.test.ts": 137,
-      "src/renderer/src/store/slices/linear-source-context-cache-scope.test.ts": 198,
-      "src/renderer/src/store/slices/linear.test.ts": 202,
-      "src/renderer/src/store/slices/local-detected-agent-state.test.ts": 186,
-      "src/renderer/src/store/slices/memory.test.ts": 64,
-      "src/renderer/src/store/slices/native-chat-launch-draft-teardown.test.ts": 1116,
-      "src/renderer/src/store/slices/new-issue-draft.test.ts": 48,
-      "src/renderer/src/store/slices/new-markdown.test.ts": 290,
-      "src/renderer/src/store/slices/orca-profiles-auth-actions-connect-overlap.test.ts": 1563,
-      "src/renderer/src/store/slices/orca-profiles-auth-actions.test.ts": 1562,
-      "src/renderer/src/store/slices/orca-profiles.test.ts": 1734,
-      "src/renderer/src/store/slices/pane-column-split-drop-no-op.test.ts": 41,
-      "src/renderer/src/store/slices/pane-foreground-agent.test.ts": 1463,
-      "src/renderer/src/store/slices/persisted-ui-write-baseline.test.ts": 57,
-      "src/renderer/src/store/slices/pinned-tab-close-confirm.test.ts": 80,
-      "src/renderer/src/store/slices/preflight.test.ts": 292,
-      "src/renderer/src/store/slices/project-group-removal-targets.test.ts": 50,
-      "src/renderer/src/store/slices/purge-stale-runtime-host-ownership.test.ts": 1520,
-      "src/renderer/src/store/slices/purge-stale-runtime-host-state.test.ts": 1747,
-      "src/renderer/src/store/slices/rate-limits.test.ts": 51,
-      "src/renderer/src/store/slices/readopted-ssh-worktree-rows.test.ts": 41,
-      "src/renderer/src/store/slices/recently-closed-tabs.test.ts": 1824,
-      "src/renderer/src/store/slices/remote-server-updates.integration.test.ts": 151,
-      "src/renderer/src/store/slices/repo-identity-reconcile.test.ts": 63,
+      "src/renderer/src/store/running-terminal-close-confirm.test.ts": 64,
+      "src/renderer/src/store/selectors.test.ts": 855,
+      "src/renderer/src/store/slices/active-tab-owner-worktree.test.ts": 35,
+      "src/renderer/src/store/slices/activity-cleared-at.test.ts": 1576,
+      "src/renderer/src/store/slices/agent-generated-tab-title.test.ts": 1560,
+      "src/renderer/src/store/slices/agent-hibernation-live-anchor-e2e.test.ts": 1193,
+      "src/renderer/src/store/slices/agent-pane-authority.test.ts": 1347,
+      "src/renderer/src/store/slices/agent-status-ack-cleanup.test.ts": 1530,
+      "src/renderer/src/store/slices/agent-status-batch.test.ts": 1745,
+      "src/renderer/src/store/slices/agent-status-drop-ipc.test.ts": 2454,
+      "src/renderer/src/store/slices/agent-status-drop.test.ts": 1626,
+      "src/renderer/src/store/slices/agent-status-freshness-cache.test.ts": 53,
+      "src/renderer/src/store/slices/agent-status-freshness-scheduler.test.ts": 66,
+      "src/renderer/src/store/slices/agent-status-live-freshness-request.test.ts": 105,
+      "src/renderer/src/store/slices/agent-status-live-map-leak.test.ts": 14465,
+      "src/renderer/src/store/slices/agent-status-main-agent-fact.test.ts": 1154,
+      "src/renderer/src/store/slices/agent-status-manual-sleep-capture.test.ts": 1706,
+      "src/renderer/src/store/slices/agent-status-observation-neutrality.test.ts": 1545,
+      "src/renderer/src/store/slices/agent-status-pane-keyed-records.test.ts": 81,
+      "src/renderer/src/store/slices/agent-status-pr-refresh-handoff.test.ts": 1297,
+      "src/renderer/src/store/slices/agent-status-provider-session.test.ts": 1545,
+      "src/renderer/src/store/slices/agent-status-quit-capture-resumable-agents.test.ts": 1507,
+      "src/renderer/src/store/slices/agent-status-quit-capture.test.ts": 1864,
+      "src/renderer/src/store/slices/agent-status-reminted-pane-key.test.ts": 1189,
+      "src/renderer/src/store/slices/agent-status-retained-leak.test.ts": 1428,
+      "src/renderer/src/store/slices/agent-status-retention-prefix-sweep.test.ts": 1493,
+      "src/renderer/src/store/slices/agent-status-runtime-orchestration.test.ts": 1552,
+      "src/renderer/src/store/slices/agent-status-session-boundary-done.test.ts": 1464,
+      "src/renderer/src/store/slices/agent-status-ssh-connection-clear.test.ts": 1418,
+      "src/renderer/src/store/slices/agent-status-tool-assistant-fields.test.ts": 1612,
+      "src/renderer/src/store/slices/agent-status-worktree-purge-leak.test.ts": 1555,
+      "src/renderer/src/store/slices/agent-status.test.ts": 1634,
+      "src/renderer/src/store/slices/ambiguous-owner-warning-worktree-removal-leak.test.ts": 1263,
+      "src/renderer/src/store/slices/browser-cleanup-close.test.ts": 1227,
+      "src/renderer/src/store/slices/browser-page-close-intent-recording.test.ts": 1104,
+      "src/renderer/src/store/slices/browser-page-conversion.test.ts": 1151,
+      "src/renderer/src/store/slices/browser-remote-page-lifecycle.test.ts": 575,
+      "src/renderer/src/store/slices/browser-remote-tab-creation.test.ts": 381,
+      "src/renderer/src/store/slices/browser-session-host-selection.test.ts": 570,
+      "src/renderer/src/store/slices/browser-session-profiles.test.ts": 260,
+      "src/renderer/src/store/slices/browser-webview-cleanup.test.ts": 58,
+      "src/renderer/src/store/slices/browser-workspace-doc-location.test.ts": 1651,
+      "src/renderer/src/store/slices/browser-workspace-host-ownership.test.ts": 331,
+      "src/renderer/src/store/slices/browser.test.ts": 315,
+      "src/renderer/src/store/slices/bulk-worktree-purge-terminal-maps-leak.test.ts": 959,
+      "src/renderer/src/store/slices/cmd-j-create-actions.test.ts": 1073,
+      "src/renderer/src/store/slices/codex-restart-notice-lifecycle.test.ts": 1538,
+      "src/renderer/src/store/slices/degraded-repo-hydration.test.ts": 1492,
+      "src/renderer/src/store/slices/detected-agents-environment-prune-leak.test.ts": 998,
+      "src/renderer/src/store/slices/detected-agents.test.ts": 330,
+      "src/renderer/src/store/slices/detected-worktree-refresh-leases.test.ts": 66,
+      "src/renderer/src/store/slices/dictation-model-state-stabilisation.test.ts": 270,
+      "src/renderer/src/store/slices/diffComments.test.ts": 948,
+      "src/renderer/src/store/slices/direct-ssh-pane-detach-ledger.test.ts": 951,
+      "src/renderer/src/store/slices/direct-ssh-terminal-recovery.test.ts": 1210,
+      "src/renderer/src/store/slices/direct-ssh-terminal-retry.test.ts": 1067,
+      "src/renderer/src/store/slices/direct-ssh-terminal-workspace-scope.test.ts": 75,
+      "src/renderer/src/store/slices/editor-branch-diff-snapshots.test.ts": 600,
+      "src/renderer/src/store/slices/editor-branch-line-total.test.ts": 345,
+      "src/renderer/src/store/slices/editor-check-details-tabs.test.ts": 568,
+      "src/renderer/src/store/slices/editor-close-file-cleanup.test.ts": 563,
+      "src/renderer/src/store/slices/editor-git-status-reconciliation.test.ts": 392,
+      "src/renderer/src/store/slices/editor-hydration-scaling.test.ts": 1744,
+      "src/renderer/src/store/slices/editor-markdown-link-activation.test.ts": 432,
+      "src/renderer/src/store/slices/editor-markdown-view-state.test.ts": 273,
+      "src/renderer/src/store/slices/editor-open-diff.test.ts": 567,
+      "src/renderer/src/store/slices/editor-preview-tab-setting.test.ts": 318,
+      "src/renderer/src/store/slices/editor-read-only-tabs.test.ts": 391,
+      "src/renderer/src/store/slices/editor-recently-closed-tabs.test.ts": 635,
+      "src/renderer/src/store/slices/editor-rekey-open-files.test.ts": 918,
+      "src/renderer/src/store/slices/editor-remote-branch-actions.test.ts": 1644,
+      "src/renderer/src/store/slices/editor-rich-markdown-size-override.test.ts": 519,
+      "src/renderer/src/store/slices/editor-right-sidebar-state.test.ts": 451,
+      "src/renderer/src/store/slices/editor-session-duplicate-restore.test.ts": 1199,
+      "src/renderer/src/store/slices/editor-state-worktree-purge-leak.test.ts": 1615,
+      "src/renderer/src/store/slices/editor-tab-placement.test.ts": 440,
+      "src/renderer/src/store/slices/editor/actions/editor-cursor-line.test.ts": 537,
+      "src/renderer/src/store/slices/editor/actions/editor-draft-state.test.ts": 351,
+      "src/renderer/src/store/slices/editor/actions/markdown-preview-actions.test.ts": 121,
+      "src/renderer/src/store/slices/editor/file-ids/hydrated-editor-file-index.test.ts": 788,
+      "src/renderer/src/store/slices/editor/file-ids/hydrated-editor-projections.test.ts": 367,
+      "src/renderer/src/store/slices/editor/git/git-status-reconciliation.perf.test.ts": 71,
+      "src/renderer/src/store/slices/empty-update-notifications.test.ts": 1193,
+      "src/renderer/src/store/slices/folder-workspace-activation-and-activity.test.ts": 1724,
+      "src/renderer/src/store/slices/folder-workspace-diff-comments.test.ts": 540,
+      "src/renderer/src/store/slices/folder-workspace-owner-routed-mutations.test.ts": 1058,
+      "src/renderer/src/store/slices/generation-records-worktree-removal-leak.test.ts": 1546,
+      "src/renderer/src/store/slices/github-branch-mismatched-linked-pr.test.ts": 232,
+      "src/renderer/src/store/slices/github-cache-eviction-and-bounds.test.ts": 472,
+      "src/renderer/src/store/slices/github-checks-cache.test.ts": 227,
+      "src/renderer/src/store/slices/github-checks.test.ts": 49,
+      "src/renderer/src/store/slices/github-issue-source-indicator-suppression.test.ts": 261,
+      "src/renderer/src/store/slices/github-issue-state-machine.test.ts": 219,
+      "src/renderer/src/store/slices/github-pr-branch-coordinator-events.test.ts": 182,
+      "src/renderer/src/store/slices/github-pr-branch-direct-refresh-scope.test.ts": 183,
+      "src/renderer/src/store/slices/github-pr-branch-fallback-results.test.ts": 224,
+      "src/renderer/src/store/slices/github-pr-branch-hosted-review-cache.test.ts": 218,
+      "src/renderer/src/store/slices/github-pr-branch-linked-pr-divergence.test.ts": 195,
+      "src/renderer/src/store/slices/github-pr-checks-fetch.test.ts": 260,
+      "src/renderer/src/store/slices/github-pr-comments.test.ts": 338,
+      "src/renderer/src/store/slices/github-pr-refresh-host-guard.test.ts": 165,
+      "src/renderer/src/store/slices/github-pr-refresh-hosted-review-cache-leak.test.ts": 878,
+      "src/renderer/src/store/slices/github-pr-refresh-owner-routing.test.ts": 387,
+      "src/renderer/src/store/slices/github-pr-refresh-sequences-leak.test.ts": 132,
+      "src/renderer/src/store/slices/github-pr-refresh-states-leak.test.ts": 4096,
+      "src/renderer/src/store/slices/github-project-request-coordination.test.ts": 199,
+      "src/renderer/src/store/slices/github-project-row-owner.test.ts": 58,
+      "src/renderer/src/store/slices/github-project-view-tables.test.ts": 260,
+      "src/renderer/src/store/slices/github-provider-request-concurrency.test.ts": 214,
+      "src/renderer/src/store/slices/github-refresh-sweep.test.ts": 487,
+      "src/renderer/src/store/slices/github-repo-lookup-index.test.ts": 42,
+      "src/renderer/src/store/slices/github-review-thread-actions.test.ts": 105,
+      "src/renderer/src/store/slices/github-work-item-cache-identity.test.ts": 165,
+      "src/renderer/src/store/slices/github-work-items-error-envelope.test.ts": 211,
+      "src/renderer/src/store/slices/github-work-items-pagination.test.ts": 147,
+      "src/renderer/src/store/slices/github-work-items-query-bounds.test.ts": 43,
+      "src/renderer/src/store/slices/github-work-items-runtime-routing.test.ts": 433,
+      "src/renderer/src/store/slices/github-worktree-refresh-if-stale.test.ts": 251,
+      "src/renderer/src/store/slices/hosted-review-cache-race.test.ts": 63,
+      "src/renderer/src/store/slices/hosted-review-cache.test.ts": 112,
+      "src/renderer/src/store/slices/hosted-review.test.ts": 74,
+      "src/renderer/src/store/slices/jira.test.ts": 234,
+      "src/renderer/src/store/slices/linear-credential-error-recovery.test.ts": 124,
+      "src/renderer/src/store/slices/linear-invalidation.test.ts": 174,
+      "src/renderer/src/store/slices/linear-issue-cache-refresh.test.ts": 190,
+      "src/renderer/src/store/slices/linear-scoped-collection-cache.test.ts": 220,
+      "src/renderer/src/store/slices/linear-source-context-cache-scope.test.ts": 257,
+      "src/renderer/src/store/slices/linear.test.ts": 172,
+      "src/renderer/src/store/slices/local-detected-agent-state.test.ts": 217,
+      "src/renderer/src/store/slices/memory.test.ts": 44,
+      "src/renderer/src/store/slices/native-chat-launch-draft-teardown.test.ts": 1308,
+      "src/renderer/src/store/slices/new-issue-draft.test.ts": 32,
+      "src/renderer/src/store/slices/new-markdown.test.ts": 548,
+      "src/renderer/src/store/slices/orca-profiles-auth-actions-connect-overlap.test.ts": 1110,
+      "src/renderer/src/store/slices/orca-profiles-auth-actions.test.ts": 1336,
+      "src/renderer/src/store/slices/orca-profiles.test.ts": 1591,
+      "src/renderer/src/store/slices/pane-column-split-drop-no-op.test.ts": 36,
+      "src/renderer/src/store/slices/pane-foreground-agent.test.ts": 1584,
+      "src/renderer/src/store/slices/persisted-ui-write-baseline.test.ts": 31,
+      "src/renderer/src/store/slices/pinned-tab-close-confirm.test.ts": 46,
+      "src/renderer/src/store/slices/preflight.test.ts": 198,
+      "src/renderer/src/store/slices/project-group-removal-targets.test.ts": 73,
+      "src/renderer/src/store/slices/purge-stale-runtime-host-ownership.test.ts": 979,
+      "src/renderer/src/store/slices/purge-stale-runtime-host-state.test.ts": 1687,
+      "src/renderer/src/store/slices/rate-limits.test.ts": 40,
+      "src/renderer/src/store/slices/readopted-ssh-worktree-rows.test.ts": 55,
+      "src/renderer/src/store/slices/recently-closed-tabs.test.ts": 1723,
+      "src/renderer/src/store/slices/remote-server-updates.integration.test.ts": 239,
+      "src/renderer/src/store/slices/repo-identity-reconcile.test.ts": 55,
       "src/renderer/src/store/slices/repo-owner-cache-identity.test.ts": 36,
-      "src/renderer/src/store/slices/repo-reorder-host-split.test.ts": 44,
-      "src/renderer/src/store/slices/repos-add-races.test.ts": 1607,
-      "src/renderer/src/store/slices/repos-all-hosts-folder-workspaces.test.ts": 1658,
-      "src/renderer/src/store/slices/repos-all-hosts-generation.test.ts": 1539,
-      "src/renderer/src/store/slices/repos-all-hosts.test.ts": 1748,
-      "src/renderer/src/store/slices/repos-catalog-merge-identity.test.ts": 1636,
-      "src/renderer/src/store/slices/repos-cross-host-project-collisions.test.ts": 1638,
-      "src/renderer/src/store/slices/repos-cross-host-refresh-identity.test.ts": 1502,
-      "src/renderer/src/store/slices/repos-ephemeral-vm-cleanup-retention.test.ts": 1458,
-      "src/renderer/src/store/slices/repos-host-identity-routing.test.ts": 1374,
-      "src/renderer/src/store/slices/repos-manual-order-hydration.test.ts": 1591,
-      "src/renderer/src/store/slices/repos-module-lifetime-coordinators.test.ts": 1103,
-      "src/renderer/src/store/slices/repos-nested-import-refresh-failures.test.ts": 1474,
-      "src/renderer/src/store/slices/repos-nested-ssh-projection.test.ts": 1716,
-      "src/renderer/src/store/slices/repos-onboarding-folder-startup.test.ts": 1830,
-      "src/renderer/src/store/slices/repos-paired-runtime-add.test.ts": 1498,
-      "src/renderer/src/store/slices/repos-project-group-create-race.test.ts": 1523,
-      "src/renderer/src/store/slices/repos-project-groups-delete.test.ts": 1711,
-      "src/renderer/src/store/slices/repos-project-groups-owner-routing.test.ts": 1232,
-      "src/renderer/src/store/slices/repos-project-groups.test.ts": 6045,
-      "src/renderer/src/store/slices/repos-project-host-capability.test.ts": 1642,
-      "src/renderer/src/store/slices/repos-project-host-lifecycle.test.ts": 1507,
-      "src/renderer/src/store/slices/repos-project-runtime.test.ts": 1632,
-      "src/renderer/src/store/slices/repos-refresh-identity.test.ts": 1664,
-      "src/renderer/src/store/slices/repos-remove-missing-remote-project.test.ts": 1511,
-      "src/renderer/src/store/slices/repos-remove-project-purge-leak.test.ts": 1896,
-      "src/renderer/src/store/slices/repos-runtime-project-groups.test.ts": 1495,
-      "src/renderer/src/store/slices/repos-runtime-visibility-defaults.test.ts": 1478,
-      "src/renderer/src/store/slices/repos-selected-owner-routing.test.ts": 1691,
-      "src/renderer/src/store/slices/repos-setup-script-dismissals.test.ts": 1231,
-      "src/renderer/src/store/slices/repos-shared-project-badge-color.test.ts": 1511,
-      "src/renderer/src/store/slices/repos-ssh-host-reconciliation.test.ts": 1631,
-      "src/renderer/src/store/slices/repos-stale-fetch.test.ts": 1420,
-      "src/renderer/src/store/slices/repos-update-serialization.test.ts": 1569,
-      "src/renderer/src/store/slices/repos.runtime-fallback.test.ts": 1594,
-      "src/renderer/src/store/slices/repos.test.ts": 1520,
-      "src/renderer/src/store/slices/restored-editor-owner-reparent.test.ts": 2028,
-      "src/renderer/src/store/slices/runtime-catalog-merge-removed-env-guard.test.ts": 1552,
-      "src/renderer/src/store/slices/runtime-environment-ssh.test.ts": 1596,
-      "src/renderer/src/store/slices/runtime-host-purge-session-partition-split.test.ts": 1191,
-      "src/renderer/src/store/slices/runtime-host-status-entry-parity.test.ts": 50,
-      "src/renderer/src/store/slices/runtime-pane-title-sort-epoch.test.ts": 1494,
-      "src/renderer/src/store/slices/runtime-status-catalog-identity.test.ts": 1590,
-      "src/renderer/src/store/slices/runtime-status-first-publication.test.ts": 301,
-      "src/renderer/src/store/slices/runtime-status-reconnect-connection-generation.test.ts": 1506,
-      "src/renderer/src/store/slices/runtime-status-refresh-diagnostics.test.ts": 51,
-      "src/renderer/src/store/slices/runtime-status-restored-browser-host-attach.test.ts": 102,
-      "src/renderer/src/store/slices/runtime-status-skill-cache-eviction.test.ts": 1892,
-      "src/renderer/src/store/slices/runtime-status-snapshot.test.ts": 155,
-      "src/renderer/src/store/slices/runtime-status.test.ts": 1215,
-      "src/renderer/src/store/slices/runtime-switch-settings-persistence.test.ts": 1740,
-      "src/renderer/src/store/slices/selected-host-active-workspace-identity.test.ts": 1670,
-      "src/renderer/src/store/slices/set-runtime-environments-purge-wiring.test.ts": 1494,
-      "src/renderer/src/store/slices/settings-owner-hydration-write-fence.test.ts": 1756,
-      "src/renderer/src/store/slices/settings-search-state.test.ts": 40,
-      "src/renderer/src/store/slices/settings.test.ts": 1864,
-      "src/renderer/src/store/slices/sparse-presets-repo-removal-purge-leak.test.ts": 1470,
-      "src/renderer/src/store/slices/sparse-presets.test.ts": 91,
-      "src/renderer/src/store/slices/ssh-target-cleanup.test.ts": 1602,
+      "src/renderer/src/store/slices/repo-reorder-host-split.test.ts": 29,
+      "src/renderer/src/store/slices/repos-add-races.test.ts": 934,
+      "src/renderer/src/store/slices/repos-all-hosts-folder-workspaces.test.ts": 774,
+      "src/renderer/src/store/slices/repos-all-hosts-generation.test.ts": 1525,
+      "src/renderer/src/store/slices/repos-all-hosts.test.ts": 1100,
+      "src/renderer/src/store/slices/repos-catalog-merge-identity.test.ts": 1706,
+      "src/renderer/src/store/slices/repos-cross-host-project-collisions.test.ts": 1577,
+      "src/renderer/src/store/slices/repos-cross-host-refresh-identity.test.ts": 1132,
+      "src/renderer/src/store/slices/repos-ephemeral-vm-cleanup-retention.test.ts": 1217,
+      "src/renderer/src/store/slices/repos-host-identity-routing.test.ts": 1791,
+      "src/renderer/src/store/slices/repos-manual-order-hydration.test.ts": 1316,
+      "src/renderer/src/store/slices/repos-module-lifetime-coordinators.test.ts": 1062,
+      "src/renderer/src/store/slices/repos-nested-import-refresh-failures.test.ts": 1660,
+      "src/renderer/src/store/slices/repos-nested-ssh-projection.test.ts": 1438,
+      "src/renderer/src/store/slices/repos-onboarding-folder-startup.test.ts": 1911,
+      "src/renderer/src/store/slices/repos-paired-runtime-add.test.ts": 1182,
+      "src/renderer/src/store/slices/repos-project-group-create-race.test.ts": 1670,
+      "src/renderer/src/store/slices/repos-project-groups-delete.test.ts": 1213,
+      "src/renderer/src/store/slices/repos-project-groups-owner-routing.test.ts": 1649,
+      "src/renderer/src/store/slices/repos-project-groups.test.ts": 2702,
+      "src/renderer/src/store/slices/repos-project-host-capability.test.ts": 1491,
+      "src/renderer/src/store/slices/repos-project-host-lifecycle.test.ts": 1516,
+      "src/renderer/src/store/slices/repos-project-runtime.test.ts": 1510,
+      "src/renderer/src/store/slices/repos-refresh-identity.test.ts": 1727,
+      "src/renderer/src/store/slices/repos-remove-missing-remote-project.test.ts": 1182,
+      "src/renderer/src/store/slices/repos-remove-project-purge-leak.test.ts": 1574,
+      "src/renderer/src/store/slices/repos-runtime-project-groups.test.ts": 1141,
+      "src/renderer/src/store/slices/repos-runtime-visibility-defaults.test.ts": 1266,
+      "src/renderer/src/store/slices/repos-selected-owner-routing.test.ts": 1652,
+      "src/renderer/src/store/slices/repos-setup-script-dismissals.test.ts": 1196,
+      "src/renderer/src/store/slices/repos-shared-project-badge-color.test.ts": 1489,
+      "src/renderer/src/store/slices/repos-ssh-host-reconciliation.test.ts": 1869,
+      "src/renderer/src/store/slices/repos-stale-fetch.test.ts": 1671,
+      "src/renderer/src/store/slices/repos-update-serialization.test.ts": 1181,
+      "src/renderer/src/store/slices/repos.runtime-fallback.test.ts": 1080,
+      "src/renderer/src/store/slices/repos.test.ts": 1828,
+      "src/renderer/src/store/slices/restored-editor-owner-reparent.test.ts": 2296,
+      "src/renderer/src/store/slices/runtime-catalog-merge-removed-env-guard.test.ts": 964,
+      "src/renderer/src/store/slices/runtime-environment-ssh.test.ts": 1253,
+      "src/renderer/src/store/slices/runtime-host-purge-session-partition-split.test.ts": 1218,
+      "src/renderer/src/store/slices/runtime-host-status-entry-parity.test.ts": 27,
+      "src/renderer/src/store/slices/runtime-pane-title-sort-epoch.test.ts": 1555,
+      "src/renderer/src/store/slices/runtime-status-catalog-identity.test.ts": 1572,
+      "src/renderer/src/store/slices/runtime-status-first-publication.test.ts": 231,
+      "src/renderer/src/store/slices/runtime-status-reconnect-connection-generation.test.ts": 940,
+      "src/renderer/src/store/slices/runtime-status-refresh-diagnostics.test.ts": 43,
+      "src/renderer/src/store/slices/runtime-status-restored-browser-host-attach.test.ts": 85,
+      "src/renderer/src/store/slices/runtime-status-skill-cache-eviction.test.ts": 1361,
+      "src/renderer/src/store/slices/runtime-status-snapshot.test.ts": 159,
+      "src/renderer/src/store/slices/runtime-status.test.ts": 744,
+      "src/renderer/src/store/slices/runtime-switch-settings-persistence.test.ts": 1535,
+      "src/renderer/src/store/slices/selected-host-active-workspace-identity.test.ts": 1441,
+      "src/renderer/src/store/slices/set-runtime-environments-purge-wiring.test.ts": 1292,
+      "src/renderer/src/store/slices/settings-owner-hydration-write-fence.test.ts": 1693,
+      "src/renderer/src/store/slices/settings-search-state.test.ts": 28,
+      "src/renderer/src/store/slices/settings.test.ts": 1774,
+      "src/renderer/src/store/slices/sparse-presets-repo-removal-purge-leak.test.ts": 1003,
+      "src/renderer/src/store/slices/sparse-presets.test.ts": 154,
+      "src/renderer/src/store/slices/ssh-target-cleanup.test.ts": 1183,
       "src/renderer/src/store/slices/ssh.test.ts": 1594,
-      "src/renderer/src/store/slices/stale-runtime-host-rows.test.ts": 75,
-      "src/renderer/src/store/slices/store-active-worktree-selection.test.ts": 1521,
-      "src/renderer/src/store/slices/store-active-worktree-split-groups.test.ts": 1405,
-      "src/renderer/src/store/slices/store-active-worktree-tab-close.test.ts": 1380,
-      "src/renderer/src/store/slices/store-active-worktree-terminal-creation.test.ts": 1552,
-      "src/renderer/src/store/slices/store-create-tab-id-hint.test.ts": 1484,
-      "src/renderer/src/store/slices/store-session-browser-hydration.test.ts": 1609,
-      "src/renderer/src/store/slices/store-session-cascades.test.ts": 1287,
-      "src/renderer/src/store/slices/store-session-editor-hydration.test.ts": 1639,
-      "src/renderer/src/store/slices/store-session-terminal-activity.test.ts": 1751,
-      "src/renderer/src/store/slices/store-session-terminal-reconnect.test.ts": 1381,
-      "src/renderer/src/store/slices/store-session-workspace-hydration.test.ts": 1577,
-      "src/renderer/src/store/slices/store-sleep-agent-status-retention.test.ts": 1728,
-      "src/renderer/src/store/slices/store-sleep-exact-runtime-stop.test.ts": 1288,
-      "src/renderer/src/store/slices/store-sleep-pane-hibernation.test.ts": 1415,
-      "src/renderer/src/store/slices/store-sleep-runtime-convergence.test.ts": 1906,
-      "src/renderer/src/store/slices/store-sleep-shutdown-order.test.ts": 1542,
-      "src/renderer/src/store/slices/store-worktree-removal-cascade.test.ts": 1178,
-      "src/renderer/src/store/slices/superseded-ssh-repo-rows.test.ts": 40,
-      "src/renderer/src/store/slices/tab-group-reference-repair.test.ts": 67,
-      "src/renderer/src/store/slices/tab-group-state.test.ts": 68,
-      "src/renderer/src/store/slices/tab-view-mode.test.ts": 1587,
-      "src/renderer/src/store/slices/tab-worktree-orphan-map-purge-leak.test.ts": 1640,
-      "src/renderer/src/store/slices/tabs-empty-split-activation.test.ts": 1542,
-      "src/renderer/src/store/slices/tabs-hydration-generated-title.test.ts": 60,
-      "src/renderer/src/store/slices/tabs-hydration-group-validation.test.ts": 54,
-      "src/renderer/src/store/slices/tabs-hydration.test.ts": 62,
-      "src/renderer/src/store/slices/tabs-label-and-pin-state.test.ts": 1707,
-      "src/renderer/src/store/slices/tabs-model-reconciliation.test.ts": 1671,
-      "src/renderer/src/store/slices/tabs-open-close-lifecycle.test.ts": 1682,
-      "src/renderer/src/store/slices/tabs-pane-layout-operations.test.ts": 1607,
-      "src/renderer/src/store/slices/tabs-session-hydration.test.ts": 1198,
-      "src/renderer/src/store/slices/tabs-unread-and-focus.test.ts": 1746,
-      "src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-batch.test.ts": 1901,
-      "src/renderer/src/store/slices/tabs/tab-selection-contract.test.ts": 68,
-      "src/renderer/src/store/slices/tabs/tabs-reconciliation-batch-identity.test.ts": 1141,
-      "src/renderer/src/store/slices/task-creation-drafts.test.ts": 60,
-      "src/renderer/src/store/slices/terminal-helpers.test.ts": 53,
-      "src/renderer/src/store/slices/terminal-input-activity-store-write.test.ts": 1641,
-      "src/renderer/src/store/slices/terminal-layout-pty-ownership.test.ts": 1221,
-      "src/renderer/src/store/slices/terminal-orphan-helpers.test.ts": 207,
-      "src/renderer/src/store/slices/terminal-pane-detach-agent-identity.test.ts": 1564,
-      "src/renderer/src/store/slices/terminal-pane-detach-agent-retention.test.ts": 1657,
-      "src/renderer/src/store/slices/terminal-pane-retirement-ownership.test.ts": 181,
-      "src/renderer/src/store/slices/terminal-pty-identity-replacement.test.ts": 1549,
-      "src/renderer/src/store/slices/terminal-quick-command-hosts.test.ts": 1603,
-      "src/renderer/src/store/slices/terminal-startup-command-retention.test.ts": 1149,
-      "src/renderer/src/store/slices/terminal-tab-id-hydration.test.ts": 1567,
-      "src/renderer/src/store/slices/terminal-tab-owner-index.test.ts": 40,
-      "src/renderer/src/store/slices/terminal-tab-recovery-remount.test.ts": 1607,
-      "src/renderer/src/store/slices/terminal-tab-retirement-store.test.ts": 1734,
-      "src/renderer/src/store/slices/terminal-tab-retirement.test.ts": 289,
-      "src/renderer/src/store/slices/terminal-tab-title-batch.test.ts": 1555,
-      "src/renderer/src/store/slices/terminal-write-identity-bailouts.test.ts": 1646,
-      "src/renderer/src/store/slices/terminals-explicit-empty-hydration.test.ts": 1560,
-      "src/renderer/src/store/slices/terminals-hydration-canonical-pty-overlap.test.ts": 1439,
-      "src/renderer/src/store/slices/terminals-hydration-canonical-rows.test.ts": 1557,
-      "src/renderer/src/store/slices/terminals-hydration.test.ts": 1273,
-      "src/renderer/src/store/slices/ui-acknowledge-agents-clock-skew.test.ts": 366,
-      "src/renderer/src/store/slices/ui-agent-send-target.test.ts": 482,
-      "src/renderer/src/store/slices/ui-contextual-tours.test.ts": 327,
-      "src/renderer/src/store/slices/ui-feature-interactions.test.ts": 297,
-      "src/renderer/src/store/slices/ui-hydration-view-layout.test.ts": 400,
-      "src/renderer/src/store/slices/ui-hydration-workspace-cleanup-browse.test.ts": 373,
-      "src/renderer/src/store/slices/ui-hydration-workspace-preferences.test.ts": 350,
-      "src/renderer/src/store/slices/ui-modal-slot-dismissal.test.ts": 615,
-      "src/renderer/src/store/slices/ui-new-workspace-draft.test.ts": 283,
-      "src/renderer/src/store/slices/ui-notice-dismissals.test.ts": 437,
-      "src/renderer/src/store/slices/ui-page-navigation.test.ts": 422,
-      "src/renderer/src/store/slices/ui/ui-slice-surface-actions.test.ts": 1406,
-      "src/renderer/src/store/slices/usage-snapshot-refresh.benchmark.test.ts": 43,
-      "src/renderer/src/store/slices/usage-web-client-fallback.test.ts": 40,
-      "src/renderer/src/store/slices/workspace-cleanup-browse.test.ts": 47,
-      "src/renderer/src/store/slices/workspace-cleanup-cache-hydration.test.ts": 375,
-      "src/renderer/src/store/slices/workspace-cleanup-enrichment-performance.test.ts": 461,
-      "src/renderer/src/store/slices/workspace-cleanup-host-qualified-list-state.test.ts": 1531,
-      "src/renderer/src/store/slices/workspace-cleanup-local-evidence-invariants.test.ts": 184,
-      "src/renderer/src/store/slices/workspace-cleanup-removal-preflight.test.ts": 300,
-      "src/renderer/src/store/slices/workspace-cleanup-scan-progress-boundary.test.ts": 57,
-      "src/renderer/src/store/slices/workspace-cleanup-scan-progress.test.ts": 783,
-      "src/renderer/src/store/slices/workspace-cleanup-unverified-removal-consent.test.ts": 157,
-      "src/renderer/src/store/slices/workspace-cleanup-wrong-host-removal-guard.test.ts": 1721,
-      "src/renderer/src/store/slices/workspace-cleanup-wrong-host-removal.test.ts": 1571,
-      "src/renderer/src/store/slices/workspace-document-title-refresh.test.ts": 1120,
-      "src/renderer/src/store/slices/workspace-space.test.ts": 60,
-      "src/renderer/src/store/slices/worktree-by-id-index.test.ts": 59,
-      "src/renderer/src/store/slices/worktree-catalog-reconciliation.test.ts": 55,
-      "src/renderer/src/store/slices/worktree-helpers.test.ts": 50,
-      "src/renderer/src/store/slices/worktree-listing-branch-switch.test.ts": 61,
-      "src/renderer/src/store/slices/worktree-meta-update-application.test.ts": 53,
-      "src/renderer/src/store/slices/worktree-nav-history-view-entries.test.ts": 79,
-      "src/renderer/src/store/slices/worktree-nav-history.test.ts": 46,
-      "src/renderer/src/store/slices/worktree-removal-maps-leak.test.ts": 1482,
-      "src/renderer/src/store/slices/worktree-sleep-intent-lifecycle.test.ts": 1362,
-      "src/renderer/src/store/slices/worktree-terminal-removal-teardown.test.ts": 1287,
-      "src/renderer/src/store/slices/worktree-visibility-owner-settings.test.ts": 63,
-      "src/renderer/src/store/slices/worktree-visibility-settings-write.test.ts": 1483,
-      "src/renderer/src/store/slices/worktrees-activity-persistence.test.ts": 919,
-      "src/renderer/src/store/slices/worktrees-create-base-status.test.ts": 927,
-      "src/renderer/src/store/slices/worktrees-create-parent-pick.test.ts": 734,
-      "src/renderer/src/store/slices/worktrees-fetch-listing-merge.test.ts": 634,
-      "src/renderer/src/store/slices/worktrees-fetch-owner-routing.test.ts": 1775,
-      "src/renderer/src/store/slices/worktrees-fetch-persisted-metadata-fallback.test.ts": 555,
-      "src/renderer/src/store/slices/worktrees-fetch-refresh-coalescing.test.ts": 799,
-      "src/renderer/src/store/slices/worktrees-fetch-remote-lineage.test.ts": 932,
-      "src/renderer/src/store/slices/worktrees-fetch-removal-purge.test.ts": 994,
-      "src/renderer/src/store/slices/worktrees-fetch-stale-catalog-version.test.ts": 548,
-      "src/renderer/src/store/slices/worktrees-git-identity-branch-title.test.ts": 583,
-      "src/renderer/src/store/slices/worktrees-git-identity-review-clear-persistence.test.ts": 1423,
-      "src/renderer/src/store/slices/worktrees-hydration-purge.test.ts": 634,
-      "src/renderer/src/store/slices/worktrees-identity-migration.test.ts": 1053,
-      "src/renderer/src/store/slices/worktrees-lineage-state.test.ts": 852,
-      "src/renderer/src/store/slices/worktrees-linked-review-push-target.test.ts": 1006,
-      "src/renderer/src/store/slices/worktrees-metadata-persistence.test.ts": 804,
-      "src/renderer/src/store/slices/worktrees-pending-creation-state.test.ts": 822,
-      "src/renderer/src/store/slices/worktrees-purge-terminal-state.test.ts": 508,
-      "src/renderer/src/store/slices/worktrees-remote-runtime-create.test.ts": 769,
-      "src/renderer/src/store/slices/worktrees-remote-runtime-removal.test.ts": 953,
-      "src/renderer/src/store/slices/worktrees-removal-state-cleanup.test.ts": 921,
-      "src/renderer/src/store/slices/worktrees-runtime-connection-generation-fence.test.ts": 885,
-      "src/renderer/src/store/slices/worktrees-runtime-host-metadata-retirement.test.ts": 769,
-      "src/renderer/src/store/slices/worktrees-terminal-pr-url-linking.test.ts": 915,
-      "src/renderer/src/store/slices/worktrees-unread-state.test.ts": 813,
-      "src/renderer/src/store/slices/worktrees-workspace-selection-state.test.ts": 829,
-      "src/renderer/src/store/slices/worktrees/listing/detected-worktree-meta.test.ts": 60,
-      "src/renderer/src/store/slices/worktrees/listing/detected-worktree-unavailable-reason.test.ts": 62,
-      "src/renderer/src/store/slices/worktrees/listing/stale-listing-purges-created-worktree.test.ts": 1746,
-      "src/renderer/src/store/slices/worktrees/metadata/worktree-meta-persist.test.ts": 232,
-      "src/renderer/src/store/slices/worktrees/session/worktree-identity-rename-row-worktree-ids.test.ts": 890,
-      "src/renderer/src/store/slices/worktrees/session/worktree-no-op-notifications.test.ts": 753,
-      "src/renderer/src/store/slices/worktrees/teardown/host-qualified-removal-refusal.test.ts": 589,
-      "src/renderer/src/store/slices/worktrees/teardown/record-key-omission.test.ts": 28,
-      "src/renderer/src/store/slices/worktrees/teardown/remove-worktree-map-identity.test.ts": 251,
-      "src/renderer/src/store/slices/worktrees/teardown/worktree-teardown-array-identity.test.ts": 250,
-      "src/renderer/src/store/store-identity-churn-probe.test.ts": 74,
-      "src/renderer/src/store/store-listener-census.test.ts": 43,
-      "src/renderer/src/store/terminals/restored-relay-session-identity.test.ts": 1641,
-      "src/renderer/src/store/terminals/structured-chat-tab-rename.test.ts": 1470,
-      "src/renderer/src/store/terminals/terminal-no-op-subscriber.test.ts": 1531,
-      "src/renderer/src/store/terminals/terminal-pane-expansion-write-bailout.test.tsx": 2149,
-      "src/renderer/src/store/terminals/terminal-shutdown-guards-identity.test.ts": 60,
-      "src/renderer/src/store/terminals/terminal-shutdown-map-identity.test.ts": 216,
-      "src/renderer/src/store/terminals/terminal-tab-close-map-identity.test.ts": 1664,
-      "src/renderer/src/store/terminals/terminal-tab-close-tombstone.test.ts": 1507,
-      "src/renderer/src/store/terminals/terminal-workspace-routing.scale.test.ts": 188,
-      "src/renderer/src/store/terminals/workspace-terminal-placeholders.test.ts": 181,
-      "src/renderer/src/store/worktree-diff-comments-selector.test.ts": 150,
+      "src/renderer/src/store/slices/stale-runtime-host-rows.test.ts": 66,
+      "src/renderer/src/store/slices/store-active-worktree-selection.test.ts": 1363,
+      "src/renderer/src/store/slices/store-active-worktree-split-groups.test.ts": 936,
+      "src/renderer/src/store/slices/store-active-worktree-tab-close.test.ts": 1825,
+      "src/renderer/src/store/slices/store-active-worktree-terminal-creation.test.ts": 1764,
+      "src/renderer/src/store/slices/store-create-tab-id-hint.test.ts": 1193,
+      "src/renderer/src/store/slices/store-session-browser-hydration.test.ts": 1304,
+      "src/renderer/src/store/slices/store-session-cascades.test.ts": 1595,
+      "src/renderer/src/store/slices/store-session-editor-hydration.test.ts": 1660,
+      "src/renderer/src/store/slices/store-session-terminal-activity.test.ts": 1743,
+      "src/renderer/src/store/slices/store-session-terminal-reconnect.test.ts": 1259,
+      "src/renderer/src/store/slices/store-session-workspace-hydration.test.ts": 1696,
+      "src/renderer/src/store/slices/store-sleep-agent-status-retention.test.ts": 1821,
+      "src/renderer/src/store/slices/store-sleep-exact-runtime-stop.test.ts": 1576,
+      "src/renderer/src/store/slices/store-sleep-pane-hibernation.test.ts": 4925,
+      "src/renderer/src/store/slices/store-sleep-runtime-convergence.test.ts": 2006,
+      "src/renderer/src/store/slices/store-sleep-shutdown-order.test.ts": 1064,
+      "src/renderer/src/store/slices/store-worktree-removal-cascade.test.ts": 1619,
+      "src/renderer/src/store/slices/superseded-ssh-repo-rows.test.ts": 47,
+      "src/renderer/src/store/slices/tab-group-reference-repair.test.ts": 44,
+      "src/renderer/src/store/slices/tab-group-state.test.ts": 48,
+      "src/renderer/src/store/slices/tab-view-mode.test.ts": 1209,
+      "src/renderer/src/store/slices/tab-worktree-orphan-map-purge-leak.test.ts": 1020,
+      "src/renderer/src/store/slices/tabs-empty-split-activation.test.ts": 1261,
+      "src/renderer/src/store/slices/tabs-hydration-generated-title.test.ts": 30,
+      "src/renderer/src/store/slices/tabs-hydration-group-validation.test.ts": 74,
+      "src/renderer/src/store/slices/tabs-hydration.test.ts": 40,
+      "src/renderer/src/store/slices/tabs-label-and-pin-state.test.ts": 963,
+      "src/renderer/src/store/slices/tabs-model-reconciliation.test.ts": 1467,
+      "src/renderer/src/store/slices/tabs-open-close-lifecycle.test.ts": 1598,
+      "src/renderer/src/store/slices/tabs-pane-layout-operations.test.ts": 1646,
+      "src/renderer/src/store/slices/tabs-session-hydration.test.ts": 1685,
+      "src/renderer/src/store/slices/tabs-unread-and-focus.test.ts": 931,
+      "src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-batch.test.ts": 1267,
+      "src/renderer/src/store/slices/tabs/tab-selection-contract.test.ts": 79,
+      "src/renderer/src/store/slices/tabs/tabs-reconciliation-batch-identity.test.ts": 1578,
+      "src/renderer/src/store/slices/task-creation-drafts.test.ts": 57,
+      "src/renderer/src/store/slices/terminal-helpers.test.ts": 83,
+      "src/renderer/src/store/slices/terminal-input-activity-store-write.test.ts": 1592,
+      "src/renderer/src/store/slices/terminal-layout-pty-ownership.test.ts": 1199,
+      "src/renderer/src/store/slices/terminal-orphan-helpers.test.ts": 157,
+      "src/renderer/src/store/slices/terminal-pane-detach-agent-identity.test.ts": 1531,
+      "src/renderer/src/store/slices/terminal-pane-detach-agent-retention.test.ts": 1305,
+      "src/renderer/src/store/slices/terminal-pane-retirement-ownership.test.ts": 187,
+      "src/renderer/src/store/slices/terminal-pty-identity-replacement.test.ts": 1171,
+      "src/renderer/src/store/slices/terminal-quick-command-hosts.test.ts": 1465,
+      "src/renderer/src/store/slices/terminal-startup-command-retention.test.ts": 1601,
+      "src/renderer/src/store/slices/terminal-tab-id-hydration.test.ts": 1215,
+      "src/renderer/src/store/slices/terminal-tab-owner-index.test.ts": 42,
+      "src/renderer/src/store/slices/terminal-tab-recovery-remount.test.ts": 1542,
+      "src/renderer/src/store/slices/terminal-tab-retirement-store.test.ts": 1666,
+      "src/renderer/src/store/slices/terminal-tab-retirement.test.ts": 195,
+      "src/renderer/src/store/slices/terminal-tab-title-batch.test.ts": 1100,
+      "src/renderer/src/store/slices/terminal-write-identity-bailouts.test.ts": 1607,
+      "src/renderer/src/store/slices/terminals-explicit-empty-hydration.test.ts": 1078,
+      "src/renderer/src/store/slices/terminals-hydration-canonical-pty-overlap.test.ts": 1366,
+      "src/renderer/src/store/slices/terminals-hydration-canonical-rows.test.ts": 1490,
+      "src/renderer/src/store/slices/terminals-hydration.test.ts": 2826,
+      "src/renderer/src/store/slices/ui-acknowledge-agents-clock-skew.test.ts": 355,
+      "src/renderer/src/store/slices/ui-agent-send-target.test.ts": 413,
+      "src/renderer/src/store/slices/ui-contextual-tours.test.ts": 211,
+      "src/renderer/src/store/slices/ui-feature-interactions.test.ts": 408,
+      "src/renderer/src/store/slices/ui-hydration-view-layout.test.ts": 224,
+      "src/renderer/src/store/slices/ui-hydration-workspace-cleanup-browse.test.ts": 284,
+      "src/renderer/src/store/slices/ui-hydration-workspace-preferences.test.ts": 462,
+      "src/renderer/src/store/slices/ui-modal-slot-dismissal.test.ts": 580,
+      "src/renderer/src/store/slices/ui-new-workspace-draft.test.ts": 247,
+      "src/renderer/src/store/slices/ui-notice-dismissals.test.ts": 465,
+      "src/renderer/src/store/slices/ui-page-navigation.test.ts": 403,
+      "src/renderer/src/store/slices/ui/ui-slice-surface-actions.test.ts": 1254,
+      "src/renderer/src/store/slices/usage-snapshot-refresh.benchmark.test.ts": 55,
+      "src/renderer/src/store/slices/usage-web-client-fallback.test.ts": 51,
+      "src/renderer/src/store/slices/workspace-cleanup-browse.test.ts": 62,
+      "src/renderer/src/store/slices/workspace-cleanup-cache-hydration.test.ts": 369,
+      "src/renderer/src/store/slices/workspace-cleanup-enrichment-performance.test.ts": 404,
+      "src/renderer/src/store/slices/workspace-cleanup-host-qualified-list-state.test.ts": 1418,
+      "src/renderer/src/store/slices/workspace-cleanup-local-evidence-invariants.test.ts": 196,
+      "src/renderer/src/store/slices/workspace-cleanup-removal-preflight.test.ts": 260,
+      "src/renderer/src/store/slices/workspace-cleanup-scan-progress-boundary.test.ts": 64,
+      "src/renderer/src/store/slices/workspace-cleanup-scan-progress.test.ts": 818,
+      "src/renderer/src/store/slices/workspace-cleanup-unverified-removal-consent.test.ts": 138,
+      "src/renderer/src/store/slices/workspace-cleanup-wrong-host-removal-guard.test.ts": 1879,
+      "src/renderer/src/store/slices/workspace-cleanup-wrong-host-removal.test.ts": 1391,
+      "src/renderer/src/store/slices/workspace-document-title-refresh.test.ts": 1426,
+      "src/renderer/src/store/slices/workspace-space.test.ts": 40,
+      "src/renderer/src/store/slices/worktree-by-id-index.test.ts": 52,
+      "src/renderer/src/store/slices/worktree-catalog-reconciliation.test.ts": 38,
+      "src/renderer/src/store/slices/worktree-helpers.test.ts": 55,
+      "src/renderer/src/store/slices/worktree-listing-branch-switch.test.ts": 52,
+      "src/renderer/src/store/slices/worktree-meta-update-application.test.ts": 71,
+      "src/renderer/src/store/slices/worktree-nav-history-view-entries.test.ts": 68,
+      "src/renderer/src/store/slices/worktree-nav-history.test.ts": 51,
+      "src/renderer/src/store/slices/worktree-removal-maps-leak.test.ts": 1074,
+      "src/renderer/src/store/slices/worktree-sleep-intent-lifecycle.test.ts": 1593,
+      "src/renderer/src/store/slices/worktree-terminal-removal-teardown.test.ts": 1486,
+      "src/renderer/src/store/slices/worktree-visibility-owner-settings.test.ts": 67,
+      "src/renderer/src/store/slices/worktree-visibility-settings-write.test.ts": 1508,
+      "src/renderer/src/store/slices/worktrees-activity-persistence.test.ts": 937,
+      "src/renderer/src/store/slices/worktrees-create-base-status.test.ts": 516,
+      "src/renderer/src/store/slices/worktrees-create-parent-pick.test.ts": 587,
+      "src/renderer/src/store/slices/worktrees-fetch-listing-merge.test.ts": 520,
+      "src/renderer/src/store/slices/worktrees-fetch-owner-routing.test.ts": 1805,
+      "src/renderer/src/store/slices/worktrees-fetch-persisted-metadata-fallback.test.ts": 566,
+      "src/renderer/src/store/slices/worktrees-fetch-refresh-coalescing.test.ts": 689,
+      "src/renderer/src/store/slices/worktrees-fetch-remote-lineage.test.ts": 377,
+      "src/renderer/src/store/slices/worktrees-fetch-removal-purge.test.ts": 920,
+      "src/renderer/src/store/slices/worktrees-fetch-stale-catalog-version.test.ts": 629,
+      "src/renderer/src/store/slices/worktrees-git-identity-branch-title.test.ts": 515,
+      "src/renderer/src/store/slices/worktrees-git-identity-review-clear-persistence.test.ts": 1035,
+      "src/renderer/src/store/slices/worktrees-hydration-purge.test.ts": 604,
+      "src/renderer/src/store/slices/worktrees-identity-migration.test.ts": 1146,
+      "src/renderer/src/store/slices/worktrees-lineage-state.test.ts": 642,
+      "src/renderer/src/store/slices/worktrees-linked-review-push-target.test.ts": 506,
+      "src/renderer/src/store/slices/worktrees-metadata-persistence.test.ts": 853,
+      "src/renderer/src/store/slices/worktrees-pending-creation-state.test.ts": 915,
+      "src/renderer/src/store/slices/worktrees-purge-terminal-state.test.ts": 442,
+      "src/renderer/src/store/slices/worktrees-remote-runtime-create.test.ts": 749,
+      "src/renderer/src/store/slices/worktrees-remote-runtime-removal.test.ts": 909,
+      "src/renderer/src/store/slices/worktrees-removal-state-cleanup.test.ts": 949,
+      "src/renderer/src/store/slices/worktrees-runtime-connection-generation-fence.test.ts": 1207,
+      "src/renderer/src/store/slices/worktrees-runtime-host-metadata-retirement.test.ts": 819,
+      "src/renderer/src/store/slices/worktrees-terminal-pr-url-linking.test.ts": 729,
+      "src/renderer/src/store/slices/worktrees-unread-state.test.ts": 663,
+      "src/renderer/src/store/slices/worktrees-workspace-selection-state.test.ts": 726,
+      "src/renderer/src/store/slices/worktrees/listing/detected-worktree-meta.test.ts": 102,
+      "src/renderer/src/store/slices/worktrees/listing/detected-worktree-unavailable-reason.test.ts": 52,
+      "src/renderer/src/store/slices/worktrees/listing/stale-listing-purges-created-worktree.test.ts": 1634,
+      "src/renderer/src/store/slices/worktrees/metadata/worktree-meta-persist.test.ts": 178,
+      "src/renderer/src/store/slices/worktrees/session/worktree-identity-rename-row-worktree-ids.test.ts": 842,
+      "src/renderer/src/store/slices/worktrees/session/worktree-no-op-notifications.test.ts": 839,
+      "src/renderer/src/store/slices/worktrees/teardown/host-qualified-removal-refusal.test.ts": 673,
+      "src/renderer/src/store/slices/worktrees/teardown/record-key-omission.test.ts": 39,
+      "src/renderer/src/store/slices/worktrees/teardown/remove-worktree-map-identity.test.ts": 340,
+      "src/renderer/src/store/slices/worktrees/teardown/worktree-teardown-array-identity.test.ts": 228,
+      "src/renderer/src/store/store-identity-churn-probe.test.ts": 73,
+      "src/renderer/src/store/store-listener-census.test.ts": 32,
+      "src/renderer/src/store/terminals/restored-relay-session-identity.test.ts": 1454,
+      "src/renderer/src/store/terminals/structured-chat-tab-rename.test.ts": 1252,
+      "src/renderer/src/store/terminals/terminal-no-op-subscriber.test.ts": 1508,
+      "src/renderer/src/store/terminals/terminal-pane-expansion-write-bailout.test.tsx": 1675,
+      "src/renderer/src/store/terminals/terminal-shutdown-guards-identity.test.ts": 39,
+      "src/renderer/src/store/terminals/terminal-shutdown-map-identity.test.ts": 213,
+      "src/renderer/src/store/terminals/terminal-tab-close-map-identity.test.ts": 2043,
+      "src/renderer/src/store/terminals/terminal-tab-close-tombstone.test.ts": 1822,
+      "src/renderer/src/store/terminals/terminal-workspace-routing.scale.test.ts": 182,
+      "src/renderer/src/store/terminals/workspace-terminal-placeholders.test.ts": 102,
+      "src/renderer/src/store/worktree-diff-comments-selector.test.ts": 86,
       "src/renderer/src/store/worktree-host-collision-index.test.ts": 53,
-      "src/renderer/src/store/worktree-visibility-defaults-by-host.test.ts": 43,
-      "src/renderer/src/web/preload-api/web-ai-vault-search-compat.test.ts": 223,
-      "src/renderer/src/web/preload-api/web-gitlab-api.test.ts": 59,
-      "src/renderer/src/web/web-clipboard-copy-fallback.test.ts": 51,
-      "src/renderer/src/web/web-clipboard-copy-terminal-selection.test.ts": 373,
-      "src/renderer/src/web/web-file-mutation-methods.test.ts": 172,
-      "src/renderer/src/web/web-pairing.test.ts": 69,
-      "src/renderer/src/web/web-preload-api-agent-providers.test.ts": 600,
-      "src/renderer/src/web/web-preload-api-clipboard.test.ts": 1027,
-      "src/renderer/src/web/web-preload-api-composition.test.ts": 298,
-      "src/renderer/src/web/web-preload-api-filesystem.test.ts": 402,
-      "src/renderer/src/web/web-preload-api-git.test.ts": 722,
-      "src/renderer/src/web/web-preload-api-github.test.ts": 518,
-      "src/renderer/src/web/web-preload-api-gitlab.test.ts": 1051,
-      "src/renderer/src/web/web-preload-api-keybindings.test.ts": 817,
-      "src/renderer/src/web/web-preload-api-runtime-calls.test.ts": 788,
-      "src/renderer/src/web/web-preload-api-runtime-environment.test.ts": 1376,
-      "src/renderer/src/web/web-preload-api-settings.test.ts": 1881,
-      "src/renderer/src/web/web-preload-api-ssh.test.ts": 353,
-      "src/renderer/src/web/web-preload-api-ui.test.ts": 1677,
-      "src/renderer/src/web/web-preload-api-workspace-catalog.test.ts": 1225,
-      "src/renderer/src/web/web-preload-updater-package-recovery.test.ts": 413,
-      "src/renderer/src/web/web-runtime-client-export-parity.test.ts": 206,
-      "src/renderer/src/web/web-runtime-client-file-watch-replay.test.ts": 260,
-      "src/renderer/src/web/web-runtime-client-heartbeat.test.ts": 205,
-      "src/renderer/src/web/web-runtime-client-timeout-budget.test.ts": 212,
-      "src/renderer/src/web/web-runtime-client.test.ts": 656,
-      "src/renderer/src/web/web-runtime-connection-frame-router.test.ts": 165,
-      "src/renderer/src/web/web-runtime-connection-heartbeat-unsendable-probe.test.ts": 100,
-      "src/renderer/src/web/web-runtime-direct-proxy-live.integration.test.ts": 158,
-      "src/renderer/src/web/web-runtime-status-owner.test.ts": 973,
-      "src/renderer/src/web/web-shell-paths-exist.test.ts": 40,
-      "src/renderer/src/web/web-viewport-shell.test.ts": 36,
-      "src/renderer/src/web/web-workspace-session.test.ts": 193,
-      "src/shared/absolute-dir-override.test.ts": 55,
-      "src/shared/add-repo-existing-workspaces-telemetry.test.ts": 178,
-      "src/shared/agent-cli-flag-detection.test.ts": 48,
-      "src/shared/agent-cli-install-dir-fallback.test.ts": 88,
-      "src/shared/agent-decorative-title-signature.test.ts": 60,
-      "src/shared/agent-detection.test.ts": 88,
-      "src/shared/agent-feature-install-commands.test.ts": 55,
-      "src/shared/agent-hook-endpoint-file.test.ts": 56,
-      "src/shared/agent-hook-endpoint-temp-cleanup.test.ts": 34,
-      "src/shared/agent-hook-listener-antigravity.test.ts": 183,
-      "src/shared/agent-hook-listener-claude-compatible-vendors.test.ts": 193,
-      "src/shared/agent-hook-listener-claude-subagents.test.ts": 245,
-      "src/shared/agent-hook-listener-claude-turn-state.test.ts": 203,
-      "src/shared/agent-hook-listener-codex-approval-ownership.test.ts": 180,
-      "src/shared/agent-hook-listener-codex-main-agent.test.ts": 118,
-      "src/shared/agent-hook-listener-command-code-transcript.test.ts": 319,
-      "src/shared/agent-hook-listener-extraction-characterization.test.ts": 166,
-      "src/shared/agent-hook-listener-grok-completion.test.ts": 187,
-      "src/shared/agent-hook-listener-grok.test.ts": 203,
-      "src/shared/agent-hook-listener-hermes-codex-droid.test.ts": 145,
-      "src/shared/agent-hook-listener-interactive-prompts.test.ts": 170,
-      "src/shared/agent-hook-listener-omp-approval-ownership.test.ts": 138,
-      "src/shared/agent-hook-listener-opencode-reattribution.test.ts": 142,
-      "src/shared/agent-hook-listener-opencode-session-correlation.test.ts": 66,
-      "src/shared/agent-hook-listener-opencode-session-registry.test.ts": 47,
-      "src/shared/agent-hook-listener-pi-compatible.test.ts": 202,
-      "src/shared/agent-hook-listener-relay-dependency.test.ts": 62,
-      "src/shared/agent-hook-listener-roster-retention.test.ts": 207,
-      "src/shared/agent-hook-listener-session-replacement.test.ts": 113,
-      "src/shared/agent-hook-listener-startless-child-lifecycle.test.ts": 204,
-      "src/shared/agent-hook-listener-transport.test.ts": 180,
-      "src/shared/agent-hook-listener/providers/muse-events.test.ts": 185,
-      "src/shared/agent-hook-listener/providers/zcode-events.test.ts": 139,
-      "src/shared/agent-hook-listener/transcript-reader.test.ts": 88,
-      "src/shared/agent-hook-relay.test.ts": 61,
-      "src/shared/agent-hook-request-body-memory.test.ts": 84,
-      "src/shared/agent-hook-spool-read.test.ts": 62,
-      "src/shared/agent-hook-status-cache.test.ts": 61,
-      "src/shared/agent-hook-transport-interference.test.ts": 63,
-      "src/shared/agent-image-paste.test.ts": 68,
-      "src/shared/agent-kind.test.ts": 107,
-      "src/shared/agent-launch-operation.test.ts": 75,
-      "src/shared/agent-launch-preferences.test.ts": 42,
-      "src/shared/agent-launch-remote.test.ts": 35,
-      "src/shared/agent-lead-status-fold.test.ts": 56,
-      "src/shared/agent-model-probe-spec.test.ts": 76,
-      "src/shared/agent-notification-id.test.ts": 33,
-      "src/shared/agent-process-recognition.test.ts": 130,
-      "src/shared/agent-prompt-injection.test.ts": 50,
+      "src/renderer/src/store/worktree-visibility-defaults-by-host.test.ts": 36,
+      "src/renderer/src/web/preload-api/web-ai-vault-search-compat.test.ts": 195,
+      "src/renderer/src/web/preload-api/web-gitlab-api.test.ts": 45,
+      "src/renderer/src/web/web-clipboard-copy-fallback.test.ts": 75,
+      "src/renderer/src/web/web-clipboard-copy-terminal-selection.test.ts": 443,
+      "src/renderer/src/web/web-file-mutation-methods.test.ts": 234,
+      "src/renderer/src/web/web-pairing.test.ts": 54,
+      "src/renderer/src/web/web-preload-api-agent-providers.test.ts": 494,
+      "src/renderer/src/web/web-preload-api-clipboard.test.ts": 940,
+      "src/renderer/src/web/web-preload-api-composition.test.ts": 532,
+      "src/renderer/src/web/web-preload-api-filesystem.test.ts": 519,
+      "src/renderer/src/web/web-preload-api-git.test.ts": 455,
+      "src/renderer/src/web/web-preload-api-github.test.ts": 506,
+      "src/renderer/src/web/web-preload-api-gitlab.test.ts": 962,
+      "src/renderer/src/web/web-preload-api-keybindings.test.ts": 505,
+      "src/renderer/src/web/web-preload-api-runtime-calls.test.ts": 554,
+      "src/renderer/src/web/web-preload-api-runtime-environment.test.ts": 1261,
+      "src/renderer/src/web/web-preload-api-settings.test.ts": 1773,
+      "src/renderer/src/web/web-preload-api-ssh.test.ts": 398,
+      "src/renderer/src/web/web-preload-api-ui.test.ts": 1867,
+      "src/renderer/src/web/web-preload-api-workspace-catalog.test.ts": 1039,
+      "src/renderer/src/web/web-preload-updater-package-recovery.test.ts": 292,
+      "src/renderer/src/web/web-runtime-client-export-parity.test.ts": 214,
+      "src/renderer/src/web/web-runtime-client-file-watch-replay.test.ts": 282,
+      "src/renderer/src/web/web-runtime-client-heartbeat.test.ts": 254,
+      "src/renderer/src/web/web-runtime-client-timeout-budget.test.ts": 217,
+      "src/renderer/src/web/web-runtime-client.test.ts": 593,
+      "src/renderer/src/web/web-runtime-connection-frame-router.test.ts": 140,
+      "src/renderer/src/web/web-runtime-connection-heartbeat-unsendable-probe.test.ts": 76,
+      "src/renderer/src/web/web-runtime-direct-proxy-live.integration.test.ts": 138,
+      "src/renderer/src/web/web-runtime-status-owner.test.ts": 882,
+      "src/renderer/src/web/web-shell-paths-exist.test.ts": 34,
+      "src/renderer/src/web/web-viewport-shell.test.ts": 48,
+      "src/renderer/src/web/web-workspace-session.test.ts": 169,
+      "src/shared/absolute-dir-override.test.ts": 80,
+      "src/shared/add-repo-existing-workspaces-telemetry.test.ts": 104,
+      "src/shared/agent-cli-flag-detection.test.ts": 40,
+      "src/shared/agent-cli-install-dir-fallback.test.ts": 65,
+      "src/shared/agent-decorative-title-signature.test.ts": 54,
+      "src/shared/agent-detection.test.ts": 112,
+      "src/shared/agent-feature-install-commands.test.ts": 48,
+      "src/shared/agent-hook-endpoint-file.test.ts": 36,
+      "src/shared/agent-hook-endpoint-temp-cleanup.test.ts": 53,
+      "src/shared/agent-hook-listener-antigravity.test.ts": 102,
+      "src/shared/agent-hook-listener-claude-compatible-vendors.test.ts": 174,
+      "src/shared/agent-hook-listener-claude-subagents.test.ts": 150,
+      "src/shared/agent-hook-listener-claude-turn-state.test.ts": 112,
+      "src/shared/agent-hook-listener-codex-approval-ownership.test.ts": 174,
+      "src/shared/agent-hook-listener-codex-main-agent.test.ts": 165,
+      "src/shared/agent-hook-listener-command-code-transcript.test.ts": 126,
+      "src/shared/agent-hook-listener-extraction-characterization.test.ts": 89,
+      "src/shared/agent-hook-listener-grok-completion.test.ts": 155,
+      "src/shared/agent-hook-listener-grok.test.ts": 160,
+      "src/shared/agent-hook-listener-hermes-codex-droid.test.ts": 206,
+      "src/shared/agent-hook-listener-interactive-prompts.test.ts": 207,
+      "src/shared/agent-hook-listener-omp-approval-ownership.test.ts": 166,
+      "src/shared/agent-hook-listener-opencode-reattribution.test.ts": 154,
+      "src/shared/agent-hook-listener-opencode-session-correlation.test.ts": 44,
+      "src/shared/agent-hook-listener-opencode-session-registry.test.ts": 38,
+      "src/shared/agent-hook-listener-pi-compatible.test.ts": 89,
+      "src/shared/agent-hook-listener-relay-dependency.test.ts": 33,
+      "src/shared/agent-hook-listener-roster-retention.test.ts": 177,
+      "src/shared/agent-hook-listener-session-replacement.test.ts": 130,
+      "src/shared/agent-hook-listener-startless-child-lifecycle.test.ts": 180,
+      "src/shared/agent-hook-listener-transport.test.ts": 151,
+      "src/shared/agent-hook-listener/providers/muse-events.test.ts": 192,
+      "src/shared/agent-hook-listener/providers/zcode-events.test.ts": 107,
+      "src/shared/agent-hook-listener/transcript-reader.test.ts": 170,
+      "src/shared/agent-hook-relay.test.ts": 34,
+      "src/shared/agent-hook-request-body-memory.test.ts": 63,
+      "src/shared/agent-hook-spool-read.test.ts": 72,
+      "src/shared/agent-hook-status-cache.test.ts": 60,
+      "src/shared/agent-hook-transport-interference.test.ts": 64,
+      "src/shared/agent-image-paste.test.ts": 34,
+      "src/shared/agent-kind.test.ts": 131,
+      "src/shared/agent-launch-operation.test.ts": 43,
+      "src/shared/agent-launch-preferences.test.ts": 47,
+      "src/shared/agent-launch-remote.test.ts": 45,
+      "src/shared/agent-lead-status-fold.test.ts": 93,
+      "src/shared/agent-model-probe-spec.test.ts": 61,
+      "src/shared/agent-notification-id.test.ts": 28,
+      "src/shared/agent-process-recognition.test.ts": 139,
+      "src/shared/agent-prompt-injection.test.ts": 59,
       "src/shared/agent-resume-argv-drop.test.ts": 87,
       "src/shared/agent-resume-launch-command.test.ts": 87,
-      "src/shared/agent-row-conversation-name.test.ts": 68,
-      "src/shared/agent-scratch-worktrees.test.ts": 51,
-      "src/shared/agent-session-conversation-name.test.ts": 57,
-      "src/shared/agent-session-definitive-refusal.test.ts": 168,
-      "src/shared/agent-session-fence-mint-boundary.test.ts": 1569,
-      "src/shared/agent-session-journal-producer.test.ts": 49,
-      "src/shared/agent-session-journal-schemas.test.ts": 207,
-      "src/shared/agent-session-lease-adjudication.test.ts": 60,
-      "src/shared/agent-session-legacy-handoff-lease.test.ts": 120,
+      "src/shared/agent-row-conversation-name.test.ts": 51,
+      "src/shared/agent-scratch-worktrees.test.ts": 67,
+      "src/shared/agent-session-conversation-name.test.ts": 32,
+      "src/shared/agent-session-definitive-refusal.test.ts": 100,
+      "src/shared/agent-session-fence-mint-boundary.test.ts": 2032,
+      "src/shared/agent-session-journal-producer.test.ts": 36,
+      "src/shared/agent-session-journal-schemas.test.ts": 184,
+      "src/shared/agent-session-lease-adjudication.test.ts": 40,
+      "src/shared/agent-session-legacy-handoff-lease.test.ts": 89,
       "src/shared/agent-session-mutation-envelope.test.ts": 183,
-      "src/shared/agent-session-operation-ledger.test.ts": 130,
-      "src/shared/agent-session-option-catalog-grok.test.ts": 97,
-      "src/shared/agent-session-option-catalog-omp.test.ts": 70,
-      "src/shared/agent-session-option-catalog.test.ts": 67,
-      "src/shared/agent-session-provider-handle.test.ts": 84,
-      "src/shared/agent-session-question-answer.test.ts": 48,
+      "src/shared/agent-session-operation-ledger.test.ts": 115,
+      "src/shared/agent-session-option-catalog-grok.test.ts": 106,
+      "src/shared/agent-session-option-catalog-omp.test.ts": 86,
+      "src/shared/agent-session-option-catalog.test.ts": 94,
+      "src/shared/agent-session-provider-handle.test.ts": 75,
+      "src/shared/agent-session-question-answer.test.ts": 38,
       "src/shared/agent-session-restart-continuation.test.ts": 32,
-      "src/shared/agent-session-resume.test.ts": 50,
-      "src/shared/agent-session-thread-goal.test.ts": 45,
+      "src/shared/agent-session-resume.test.ts": 53,
+      "src/shared/agent-session-thread-goal.test.ts": 60,
       "src/shared/agent-session-turn-record.test.ts": 58,
-      "src/shared/agent-skill-sharing-contract.test.ts": 124,
-      "src/shared/agent-skill-sharing-gate.test.ts": 189,
-      "src/shared/agent-startup-plan-inputs.test.ts": 105,
-      "src/shared/agent-status-child-work-admission-activity.test.ts": 233,
-      "src/shared/agent-status-child-work-admission-collision.test.ts": 123,
-      "src/shared/agent-status-child-work-admission-parse.test.ts": 456,
-      "src/shared/agent-status-child-work-admission-sparse.test.ts": 216,
-      "src/shared/agent-status-child-work-admission.test.ts": 284,
-      "src/shared/agent-status-child-work-codec-boundary.test.ts": 668,
-      "src/shared/agent-status-child-work-legacy-golden.test.ts": 58,
-      "src/shared/agent-status-child-work-legality.test.ts": 252,
-      "src/shared/agent-status-child-work-lifetime.test.ts": 233,
-      "src/shared/agent-status-child-work-liveness.test.ts": 32,
-      "src/shared/agent-status-child-work-projection.test.ts": 63,
-      "src/shared/agent-status-child-work-reconciliation.test.ts": 516,
-      "src/shared/agent-status-child-work-view.test.ts": 285,
-      "src/shared/agent-status-child-work.test.ts": 216,
-      "src/shared/agent-status-legacy-adapter.test.ts": 66,
-      "src/shared/agent-status-legacy-ingress-ratchet.test.ts": 7288,
-      "src/shared/agent-status-observation.test.ts": 44,
-      "src/shared/agent-status-osc-pending-retention.test.ts": 148,
-      "src/shared/agent-status-osc-scan-budget.test.ts": 346,
-      "src/shared/agent-status-osc-split-frame-scan-budget.test.ts": 160,
-      "src/shared/agent-status-osc.test.ts": 76,
-      "src/shared/agent-status-run-alias-index.test.ts": 318,
-      "src/shared/agent-status-run-capability.test.ts": 34,
-      "src/shared/agent-status-run.test.ts": 71,
-      "src/shared/agent-status-serving-readiness.test.ts": 37,
-      "src/shared/agent-status-store-bounds.test.ts": 2662,
-      "src/shared/agent-status-store-byte-budget.test.ts": 2035,
-      "src/shared/agent-status-store-in-place.test.ts": 69880,
-      "src/shared/agent-status-store-reopen.test.ts": 173,
-      "src/shared/agent-status-store-scaling.test.ts": 748,
-      "src/shared/agent-status-store.test.ts": 240,
-      "src/shared/agent-status-subject.test.ts": 183,
-      "src/shared/agent-status-transport-envelope.test.ts": 275,
-      "src/shared/agent-status-types.test.ts": 133,
-      "src/shared/agent-tab-title.test.ts": 59,
-      "src/shared/agent-terminal-status-equivalence.test.ts": 46,
-      "src/shared/agent-title-agy-gemini-collision.test.ts": 78,
-      "src/shared/agent-title-decoration.test.ts": 27,
-      "src/shared/agent-title-evidence.test.ts": 161,
-      "src/shared/agent-title-identity-characterization.test.ts": 50,
-      "src/shared/agent-tui-input-clear.test.ts": 38,
-      "src/shared/ai-vault-resume-command.test.ts": 56,
-      "src/shared/ai-vault-resume-preparation.test.ts": 38,
-      "src/shared/ai-vault-scan-error-message.test.ts": 49,
-      "src/shared/ai-vault-search-contract.test.ts": 166,
-      "src/shared/ai-vault-search-query-operators.test.ts": 39,
-      "src/shared/ai-vault-search-scope-contract.test.ts": 167,
-      "src/shared/ai-vault-search-settings.test.ts": 114,
-      "src/shared/ai-vault-session-depth.test.ts": 52,
-      "src/shared/ai-vault-session-filters.test.ts": 194,
-      "src/shared/ai-vault-types.test.ts": 50,
-      "src/shared/antigravity-source-control.test.ts": 193,
+      "src/shared/agent-skill-sharing-contract.test.ts": 67,
+      "src/shared/agent-skill-sharing-gate.test.ts": 138,
+      "src/shared/agent-startup-plan-inputs.test.ts": 84,
+      "src/shared/agent-status-child-work-admission-activity.test.ts": 304,
+      "src/shared/agent-status-child-work-admission-collision.test.ts": 163,
+      "src/shared/agent-status-child-work-admission-parse.test.ts": 418,
+      "src/shared/agent-status-child-work-admission-sparse.test.ts": 228,
+      "src/shared/agent-status-child-work-admission.test.ts": 295,
+      "src/shared/agent-status-child-work-codec-boundary.test.ts": 740,
+      "src/shared/agent-status-child-work-legacy-golden.test.ts": 57,
+      "src/shared/agent-status-child-work-legality.test.ts": 234,
+      "src/shared/agent-status-child-work-lifetime.test.ts": 216,
+      "src/shared/agent-status-child-work-liveness.test.ts": 28,
+      "src/shared/agent-status-child-work-projection.test.ts": 54,
+      "src/shared/agent-status-child-work-reconciliation.test.ts": 439,
+      "src/shared/agent-status-child-work-view.test.ts": 128,
+      "src/shared/agent-status-child-work.test.ts": 192,
+      "src/shared/agent-status-legacy-adapter.test.ts": 38,
+      "src/shared/agent-status-legacy-ingress-ratchet.test.ts": 5709,
+      "src/shared/agent-status-observation.test.ts": 55,
+      "src/shared/agent-status-osc-pending-retention.test.ts": 96,
+      "src/shared/agent-status-osc-scan-budget.test.ts": 340,
+      "src/shared/agent-status-osc-split-frame-scan-budget.test.ts": 170,
+      "src/shared/agent-status-osc.test.ts": 65,
+      "src/shared/agent-status-run-alias-index.test.ts": 245,
+      "src/shared/agent-status-run-capability.test.ts": 42,
+      "src/shared/agent-status-run.test.ts": 64,
+      "src/shared/agent-status-serving-readiness.test.ts": 32,
+      "src/shared/agent-status-store-bounds.test.ts": 2561,
+      "src/shared/agent-status-store-byte-budget.test.ts": 1188,
+      "src/shared/agent-status-store-in-place.test.ts": 40880,
+      "src/shared/agent-status-store-reopen.test.ts": 168,
+      "src/shared/agent-status-store-scaling.test.ts": 904,
+      "src/shared/agent-status-store.test.ts": 361,
+      "src/shared/agent-status-subject.test.ts": 174,
+      "src/shared/agent-status-transport-envelope.test.ts": 295,
+      "src/shared/agent-status-types.test.ts": 130,
+      "src/shared/agent-tab-title.test.ts": 76,
+      "src/shared/agent-terminal-status-equivalence.test.ts": 59,
+      "src/shared/agent-title-agy-gemini-collision.test.ts": 70,
+      "src/shared/agent-title-decoration.test.ts": 48,
+      "src/shared/agent-title-evidence.test.ts": 122,
+      "src/shared/agent-title-identity-characterization.test.ts": 73,
+      "src/shared/agent-tui-input-clear.test.ts": 39,
+      "src/shared/ai-vault-resume-command.test.ts": 68,
+      "src/shared/ai-vault-resume-preparation.test.ts": 49,
+      "src/shared/ai-vault-scan-error-message.test.ts": 26,
+      "src/shared/ai-vault-search-contract.test.ts": 138,
+      "src/shared/ai-vault-search-query-operators.test.ts": 70,
+      "src/shared/ai-vault-search-scope-contract.test.ts": 178,
+      "src/shared/ai-vault-search-settings.test.ts": 115,
+      "src/shared/ai-vault-session-depth.test.ts": 65,
+      "src/shared/ai-vault-session-filters.test.ts": 172,
+      "src/shared/ai-vault-types.test.ts": 52,
+      "src/shared/antigravity-source-control.test.ts": 165,
       "src/shared/app-version.test.ts": 44,
-      "src/shared/artifact-sharing-gate.test.ts": 175,
-      "src/shared/automation-cron-dialect.test.ts": 58,
-      "src/shared/automation-cron-input-validation.test.ts": 66,
-      "src/shared/automation-execution-target.test.ts": 69,
-      "src/shared/automation-host-filter.test.ts": 46,
-      "src/shared/automation-legacy-list-partition.test.ts": 45,
-      "src/shared/automation-list-response.test.ts": 53,
-      "src/shared/automation-list-scope.test.ts": 48,
-      "src/shared/automation-owner-key.test.ts": 61,
-      "src/shared/automation-owner-precondition.test.ts": 65,
-      "src/shared/automation-run-identity.test.ts": 46,
-      "src/shared/automation-run-retention.test.ts": 78,
-      "src/shared/automation-schedule-drift.test.ts": 88,
-      "src/shared/automation-schedules.test.ts": 195,
-      "src/shared/automation-usage-summary.test.ts": 55,
-      "src/shared/base-ref-search-result.test.ts": 62,
-      "src/shared/binary-file-extensions.test.ts": 43,
-      "src/shared/bounded-map.test.ts": 57,
-      "src/shared/branch-name-from-work.test.ts": 44,
-      "src/shared/branch-prefix.test.ts": 62,
-      "src/shared/browser-client-automation-protocol.test.ts": 103,
-      "src/shared/browser-client-host-id-argument.test.ts": 32,
-      "src/shared/browser-client-host-protocol.test.ts": 355,
-      "src/shared/browser-client-host-reconciliation-protocol.test.ts": 154,
-      "src/shared/browser-client-hosting-eligibility.test.ts": 59,
-      "src/shared/browser-cookie-import-sources.test.ts": 24,
-      "src/shared/browser-grab-types.test.ts": 47,
-      "src/shared/browser-network-capabilities.test.ts": 74,
-      "src/shared/browser-network-tunnel-protocol.test.ts": 49,
-      "src/shared/browser-network-tunnel-stream-framing.test.ts": 1144,
-      "src/shared/browser-screencast-protocol.test.ts": 59,
-      "src/shared/browser-url.test.ts": 172,
-      "src/shared/bundled-ripgrep.test.ts": 52,
-      "src/shared/cheap-process-table-snapshot.test.ts": 71,
-      "src/shared/check-job-log-byte-cap.test.ts": 70,
-      "src/shared/check-job-log-retention.test.ts": 195,
-      "src/shared/check-job-log-tail-slice.test.ts": 47,
-      "src/shared/child-process/bounded-output-sink.test.ts": 66,
-      "src/shared/child-process/child-process-import-boundary.test.ts": 752,
-      "src/shared/child-process/close-process-registry.test.ts": 37,
-      "src/shared/child-process/posix-lsof-probe.test.ts": 4635,
-      "src/shared/child-process/process-tree-termination.test.ts": 69,
+      "src/shared/artifact-sharing-gate.test.ts": 149,
+      "src/shared/automation-cron-dialect.test.ts": 50,
+      "src/shared/automation-cron-input-validation.test.ts": 78,
+      "src/shared/automation-execution-target.test.ts": 54,
+      "src/shared/automation-host-filter.test.ts": 53,
+      "src/shared/automation-legacy-list-partition.test.ts": 33,
+      "src/shared/automation-list-response.test.ts": 44,
+      "src/shared/automation-list-scope.test.ts": 51,
+      "src/shared/automation-owner-key.test.ts": 43,
+      "src/shared/automation-owner-precondition.test.ts": 75,
+      "src/shared/automation-run-identity.test.ts": 47,
+      "src/shared/automation-run-retention.test.ts": 45,
+      "src/shared/automation-schedule-drift.test.ts": 87,
+      "src/shared/automation-schedules.test.ts": 199,
+      "src/shared/automation-usage-summary.test.ts": 64,
+      "src/shared/base-ref-search-result.test.ts": 40,
+      "src/shared/binary-file-extensions.test.ts": 54,
+      "src/shared/bounded-map.test.ts": 68,
+      "src/shared/branch-name-from-work.test.ts": 59,
+      "src/shared/branch-prefix.test.ts": 55,
+      "src/shared/browser-client-automation-protocol.test.ts": 145,
+      "src/shared/browser-client-host-id-argument.test.ts": 51,
+      "src/shared/browser-client-host-protocol.test.ts": 255,
+      "src/shared/browser-client-host-reconciliation-protocol.test.ts": 81,
+      "src/shared/browser-client-hosting-eligibility.test.ts": 39,
+      "src/shared/browser-cookie-import-sources.test.ts": 31,
+      "src/shared/browser-grab-types.test.ts": 49,
+      "src/shared/browser-network-capabilities.test.ts": 28,
+      "src/shared/browser-network-tunnel-protocol.test.ts": 86,
+      "src/shared/browser-network-tunnel-stream-framing.test.ts": 1565,
+      "src/shared/browser-screencast-protocol.test.ts": 48,
+      "src/shared/browser-url.test.ts": 128,
+      "src/shared/bundled-ripgrep.test.ts": 24,
+      "src/shared/cheap-process-table-snapshot.test.ts": 55,
+      "src/shared/check-job-log-byte-cap.test.ts": 77,
+      "src/shared/check-job-log-retention.test.ts": 186,
+      "src/shared/check-job-log-tail-slice.test.ts": 55,
+      "src/shared/child-process/bounded-output-sink.test.ts": 48,
+      "src/shared/child-process/child-process-import-boundary.test.ts": 1004,
+      "src/shared/child-process/close-process-registry.test.ts": 40,
+      "src/shared/child-process/posix-lsof-probe.test.ts": 4289,
+      "src/shared/child-process/process-tree-termination.test.ts": 68,
       "src/shared/child-process/retryable-process-exit-proof.test.ts": 38,
-      "src/shared/child-process/run-process-termination-failure.test.ts": 91,
-      "src/shared/child-process/run-process.test.ts": 7242,
-      "src/shared/child-process/windows-cmd-shim-resolution.test.ts": 64,
-      "src/shared/child-process/windows-cmd-shim-resolution.win32.test.ts": 39,
-      "src/shared/child-process/windows-command-line.test.ts": 65,
-      "src/shared/child-process/windows-command-line.win32.test.ts": 58,
-      "src/shared/child-process/windows-console-visibility.test.ts": 2953,
-      "src/shared/claimed-agent-pty-owner.test.ts": 81,
-      "src/shared/claude-agent-teams-tmux-compat.test.ts": 46,
-      "src/shared/claude-background-task-kind.test.ts": 48,
-      "src/shared/claude-background-task-status.test.ts": 171,
-      "src/shared/claude-model-list-probe.test.ts": 75,
-      "src/shared/claude-statusline-rate-limits.test.ts": 37,
-      "src/shared/claude-subagent-roster.test.ts": 61,
-      "src/shared/claude-subagent-row-lifecycle.test.ts": 191,
-      "src/shared/cli-argument-boundary.test.ts": 62,
-      "src/shared/cli-runtime-pairing-boundary.test.ts": 248,
-      "src/shared/cli-workspace-provenance.test.ts": 50,
-      "src/shared/client-environment-info.test.ts": 62,
-      "src/shared/clipboard-image.test.ts": 46,
-      "src/shared/clipboard-text.test.ts": 81,
-      "src/shared/closed-terminal-tab-tombstones.test.ts": 81,
-      "src/shared/cloud-service-url.test.ts": 46,
-      "src/shared/codex-auth-errors.test.ts": 74,
-      "src/shared/codex-pet-sprite-defaults.test.ts": 56,
-      "src/shared/codex-reset-credit-attempt-ledger.test.ts": 72,
-      "src/shared/codex-reset-credit-scope.test.ts": 43,
-      "src/shared/codex-startup-delivery.test.ts": 70,
-      "src/shared/codex-subagent-poll-scheduler.test.ts": 43,
-      "src/shared/codex-subagent-rollout-lifecycle.test.ts": 161,
-      "src/shared/codex-subagent-roster.test.ts": 51,
-      "src/shared/codex-subagent-transcript.test.ts": 77,
-      "src/shared/combined-diff-file-tree-width.test.ts": 53,
-      "src/shared/command-code-output-retention.test.ts": 99,
-      "src/shared/command-code-output-status.test.ts": 323,
-      "src/shared/command-code-turn-boundary.test.ts": 40,
-      "src/shared/command-environment.test.ts": 72,
-      "src/shared/command-token-scanner.test.ts": 38,
-      "src/shared/commit-message-agent-spec.test.ts": 77,
-      "src/shared/commit-message-generation.test.ts": 42,
-      "src/shared/commit-message-omp.test.ts": 154,
-      "src/shared/commit-message-plan.test.ts": 83,
-      "src/shared/commit-message-prompt.test.ts": 65,
-      "src/shared/computer-awake-mode.test.ts": 40,
-      "src/shared/computer-use-error-recovery.test.ts": 57,
-      "src/shared/computer-use-key-spec.test.ts": 49,
-      "src/shared/constants.test.ts": 205,
-      "src/shared/contextual-tours.test.ts": 52,
-      "src/shared/crash-reporting.test.ts": 69,
-      "src/shared/cross-platform-path-guards.test.ts": 908,
-      "src/shared/cross-platform-path.test.ts": 60,
-      "src/shared/daemon-adoption-telemetry.test.ts": 125,
-      "src/shared/direct-ssh-reconnect-telemetry-schema.test.ts": 202,
-      "src/shared/doc-preview-file-access.test.ts": 100,
-      "src/shared/doc-preview-scheme.test.ts": 42,
-      "src/shared/draft-paste-ready-scanner-grok-trace-replay.test.ts": 90,
-      "src/shared/draft-paste-ready-scanner.test.ts": 65,
-      "src/shared/emoji-shortcode-catalog.lazy.test.ts": 117,
-      "src/shared/emulator-keyboard-frame.test.ts": 46,
-      "src/shared/emulator-touch-frame.test.ts": 49,
-      "src/shared/ephemeral-setup-terminal-worktree-id.test.ts": 45,
-      "src/shared/ephemeral-vm-recipe-checkout-mode.test.ts": 174,
-      "src/shared/ephemeral-vm-recipe-doctor.test.ts": 43,
-      "src/shared/ephemeral-vm-recipe-process.test.ts": 307,
-      "src/shared/ephemeral-vm-recipe-repo-url.test.ts": 40,
-      "src/shared/ephemeral-vm-recipes.test.ts": 182,
-      "src/shared/ephemeral-vm-runtime-feature-sorting.test.ts": 328,
-      "src/shared/ephemeral-vm-runtime-store-rollback.test.ts": 646,
-      "src/shared/ephemeral-vm-runtime-store.test.ts": 239,
-      "src/shared/event-loop-yield.test.ts": 62,
-      "src/shared/execution-host-registry.test.ts": 63,
-      "src/shared/execution-host.test.ts": 35,
-      "src/shared/export-let-function-initializer-ban.test.ts": 5544,
-      "src/shared/external-automation-jobs-file.test.ts": 102,
-      "src/shared/external-worktree-inbox.test.ts": 75,
-      "src/shared/feature-education-telemetry.test.ts": 41,
-      "src/shared/feature-interactions.test.ts": 2043,
-      "src/shared/feature-tips.test.ts": 52,
-      "src/shared/feature-wall-tour-depth.test.ts": 32,
-      "src/shared/feedback-image-limits.test.ts": 44,
-      "src/shared/file-link-location.test.ts": 42,
-      "src/shared/file-name-sort.test.ts": 58,
-      "src/shared/filesystem-directory-listing-limit.test.ts": 42,
-      "src/shared/fish-binary-requirement.test.ts": 65,
-      "src/shared/folder-workspace-execution-host.test.ts": 49,
-      "src/shared/folder-workspace-worktree.test.ts": 62,
-      "src/shared/folder-workspaces.test.ts": 40,
-      "src/shared/foreground-process-ancestry-parity.test.ts": 429,
-      "src/shared/foreground-process-selection.test.ts": 83,
-      "src/shared/foreground-wrapper-agent.test.ts": 54,
-      "src/shared/generated-code-path.test.ts": 44,
-      "src/shared/git-binary-compatibility.test.ts": 48,
-      "src/shared/git-branch-cleanup.test.ts": 68,
-      "src/shared/git-branch-compare-head.test.ts": 51,
-      "src/shared/git-branch-line-total-soft-deadline.test.ts": 3573,
-      "src/shared/git-branch-line-total.test.ts": 88,
-      "src/shared/git-capability-cache.test.ts": 41,
-      "src/shared/git-check-ignore-stdio.test.ts": 50,
-      "src/shared/git-clone-failure-message.test.ts": 80,
-      "src/shared/git-config-snapshot-runner.test.ts": 69,
-      "src/shared/git-configured-branch-target.test.ts": 68,
-      "src/shared/git-cquoted-path.test.ts": 31,
-      "src/shared/git-diff-transport-budget.test.ts": 2176,
-      "src/shared/git-discard-path-safety.test.ts": 60,
-      "src/shared/git-exec-mutation.test.ts": 49,
-      "src/shared/git-fetch-head-capability.test.ts": 46,
-      "src/shared/git-fetch-head-lock-key-derivation.test.ts": 124,
-      "src/shared/git-fetch-head-lock.test.ts": 165,
-      "src/shared/git-fork-sync.test.ts": 61,
-      "src/shared/git-history-graph.test.ts": 47,
-      "src/shared/git-history-message-allocation.test.ts": 37,
-      "src/shared/git-history-ref-display.test.ts": 46,
-      "src/shared/git-history.test.ts": 74,
-      "src/shared/git-merge-tree-capability.test.ts": 25,
-      "src/shared/git-metadata-path.test.ts": 31,
-      "src/shared/git-push-target-validation.test.ts": 47,
-      "src/shared/git-remote-error.test.ts": 87,
-      "src/shared/git-remote-identity.test.ts": 57,
-      "src/shared/git-remote-url-index.test.ts": 39,
-      "src/shared/git-rev-list-output.test.ts": 40,
-      "src/shared/git-status-branch-line-total-cache.test.ts": 68,
-      "src/shared/git-status-conflict-entries.test.ts": 43,
-      "src/shared/git-status-limit.test.ts": 46,
-      "src/shared/git-status-line-stat-inputs.test.ts": 37,
-      "src/shared/git-status-line-stats-cache.test.ts": 79,
-      "src/shared/git-status-upstream-ref.test.ts": 51,
-      "src/shared/git-tracked-pathspecs.test.ts": 189,
-      "src/shared/git-uncommitted-line-stats.test.ts": 68,
-      "src/shared/git-upstream-status.test.ts": 55,
-      "src/shared/git-worktree-operation-lock.test.ts": 35,
-      "src/shared/github/account-binding.test.ts": 52,
-      "src/shared/github/api-availability.test.ts": 50,
-      "src/shared/github/owner-slug.test.ts": 50,
-      "src/shared/github/project-identity.test.ts": 34,
-      "src/shared/github/project-ref-input.test.ts": 65,
-      "src/shared/github/project-roadmap-timeline.test.ts": 74,
-      "src/shared/github/pull-request-auto-merge-availability.test.ts": 30,
-      "src/shared/github/pull-request-for-branch-outcome.test.ts": 69,
-      "src/shared/github/pull-request-merge-methods.test.ts": 31,
-      "src/shared/github/repository-identity-key.test.ts": 46,
-      "src/shared/github/work-items-query-bounds.test.ts": 54,
-      "src/shared/gitlab-job-log-excerpt.test.ts": 155,
-      "src/shared/gitlab-job-trace-check-details.test.ts": 50,
-      "src/shared/gitlab-pipeline-checks.test.ts": 40,
-      "src/shared/gitlab-projects.test.ts": 34,
-      "src/shared/grok-model-list-probe.test.ts": 44,
-      "src/shared/grok-session-paths.test.ts": 85,
-      "src/shared/growing-byte-buffer.test.ts": 134,
-      "src/shared/handled-wire-discriminant.test.ts": 35,
-      "src/shared/harness-injected-user-turns.test.ts": 37,
-      "src/shared/hermes-run-ref-retention.test.ts": 62,
-      "src/shared/hermes-session-run-index.test.ts": 701,
-      "src/shared/hermes-startup-query.windows.test.ts": 32,
-      "src/shared/hook-command-source-policy.test.ts": 45,
-      "src/shared/host-balanced-listing-scaling.test.ts": 65,
-      "src/shared/host-display-resolution.test.ts": 59,
-      "src/shared/host-setting-overrides.test.ts": 46,
-      "src/shared/hosted-review-creation-providers.test.ts": 47,
-      "src/shared/hosted-review-github.test.ts": 43,
-      "src/shared/hosted-review-ready-capabilities.test.ts": 51,
-      "src/shared/hosted-review-refs.test.ts": 212,
-      "src/shared/image-data-uri.test.ts": 49,
-      "src/shared/image-paste-following-text.test.ts": 35,
-      "src/shared/in-flight-promise-dedupe.test.ts": 86,
-      "src/shared/issue-link-input.test.ts": 45,
-      "src/shared/jira-issue-url.test.ts": 61,
-      "src/shared/json-text-structure-limit.test.ts": 84,
-      "src/shared/keybindings-conflicts.test.ts": 70,
-      "src/shared/keybindings-default-bindings.test.ts": 78,
-      "src/shared/keybindings-digit-index.test.ts": 66,
-      "src/shared/keybindings-double-tap.test.ts": 64,
-      "src/shared/keybindings-keyboard-layout.test.ts": 73,
-      "src/shared/keybindings-parse-cache.test.ts": 124,
-      "src/shared/keybindings-parsing.test.ts": 79,
-      "src/shared/keybindings-terminal-context.test.ts": 66,
-      "src/shared/keybindings-unassigned-actions.test.ts": 57,
-      "src/shared/linear/inline-media.test.ts": 30,
-      "src/shared/linear/issue-attribute-filter.test.ts": 62,
-      "src/shared/linear/issue-view-resume-state.test.ts": 75,
-      "src/shared/linear/links.test.ts": 49,
-      "src/shared/linear/workspace-types.test.ts": 43,
-      "src/shared/linux-proc-port-scan-limits.test.ts": 57,
-      "src/shared/local-account-runtime.test.ts": 170,
-      "src/shared/local-build-compatibility.test.ts": 60,
-      "src/shared/localhost-worktree-labels.test.ts": 39,
-      "src/shared/loose-ref-count.test.ts": 298,
-      "src/shared/machine-name.test.ts": 49,
-      "src/shared/macos-symbolic-hotkeys.test.ts": 82,
-      "src/shared/main-agent-status-parity.test.ts": 164,
-      "src/shared/managed-agent-command-token.test.ts": 34,
-      "src/shared/manual-repo-order.test.ts": 56,
-      "src/shared/map-settled-with-concurrency.test.ts": 46,
-      "src/shared/map-with-concurrency.test.ts": 81,
-      "src/shared/markdown-document-listing-limits.test.ts": 73,
-      "src/shared/markdown-toc-panel-width.test.ts": 49,
-      "src/shared/mcp-config.test.ts": 105,
-      "src/shared/mobile-e2ee-v2-contract.test.ts": 49,
-      "src/shared/mobile-e2ee-v2-framing.test.ts": 71,
-      "src/shared/mobile-file-directory-limit.test.ts": 50,
-      "src/shared/mobile-markdown-document.test.ts": 45,
-      "src/shared/mobile-pairing-connection-mode.test.ts": 50,
-      "src/shared/mobile-pairing-custom-address.test.ts": 49,
+      "src/shared/child-process/run-process-termination-failure.test.ts": 49,
+      "src/shared/child-process/run-process.test.ts": 7245,
+      "src/shared/child-process/windows-cmd-shim-resolution.test.ts": 57,
+      "src/shared/child-process/windows-cmd-shim-resolution.win32.test.ts": 42,
+      "src/shared/child-process/windows-command-line.test.ts": 55,
+      "src/shared/child-process/windows-command-line.win32.test.ts": 39,
+      "src/shared/child-process/windows-console-visibility.test.ts": 3436,
+      "src/shared/claimed-agent-pty-owner.test.ts": 94,
+      "src/shared/claude-agent-teams-tmux-compat.test.ts": 57,
+      "src/shared/claude-background-task-kind.test.ts": 26,
+      "src/shared/claude-background-task-status.test.ts": 168,
+      "src/shared/claude-model-list-probe.test.ts": 50,
+      "src/shared/claude-statusline-rate-limits.test.ts": 54,
+      "src/shared/claude-subagent-roster.test.ts": 65,
+      "src/shared/claude-subagent-row-lifecycle.test.ts": 193,
+      "src/shared/cli-argument-boundary.test.ts": 35,
+      "src/shared/cli-runtime-pairing-boundary.test.ts": 201,
+      "src/shared/cli-workspace-provenance.test.ts": 35,
+      "src/shared/client-environment-info.test.ts": 55,
+      "src/shared/clipboard-image.test.ts": 36,
+      "src/shared/clipboard-text.test.ts": 75,
+      "src/shared/closed-terminal-tab-tombstones.test.ts": 125,
+      "src/shared/cloud-service-url.test.ts": 38,
+      "src/shared/codex-auth-errors.test.ts": 51,
+      "src/shared/codex-pet-sprite-defaults.test.ts": 62,
+      "src/shared/codex-reset-credit-attempt-ledger.test.ts": 129,
+      "src/shared/codex-reset-credit-scope.test.ts": 48,
+      "src/shared/codex-startup-delivery.test.ts": 43,
+      "src/shared/codex-subagent-poll-scheduler.test.ts": 54,
+      "src/shared/codex-subagent-rollout-lifecycle.test.ts": 109,
+      "src/shared/codex-subagent-roster.test.ts": 75,
+      "src/shared/codex-subagent-transcript.test.ts": 72,
+      "src/shared/combined-diff-file-tree-width.test.ts": 49,
+      "src/shared/command-code-output-retention.test.ts": 64,
+      "src/shared/command-code-output-status.test.ts": 214,
+      "src/shared/command-code-turn-boundary.test.ts": 48,
+      "src/shared/command-environment.test.ts": 69,
+      "src/shared/command-token-scanner.test.ts": 48,
+      "src/shared/commit-message-agent-spec.test.ts": 122,
+      "src/shared/commit-message-generation.test.ts": 57,
+      "src/shared/commit-message-omp.test.ts": 239,
+      "src/shared/commit-message-plan.test.ts": 51,
+      "src/shared/commit-message-prompt.test.ts": 60,
+      "src/shared/computer-awake-mode.test.ts": 36,
+      "src/shared/computer-use-error-recovery.test.ts": 50,
+      "src/shared/computer-use-key-spec.test.ts": 27,
+      "src/shared/constants.test.ts": 193,
+      "src/shared/contextual-tours.test.ts": 63,
+      "src/shared/crash-reporting.test.ts": 45,
+      "src/shared/cross-platform-path-guards.test.ts": 1653,
+      "src/shared/cross-platform-path.test.ts": 47,
+      "src/shared/daemon-adoption-telemetry.test.ts": 168,
+      "src/shared/direct-ssh-reconnect-telemetry-schema.test.ts": 152,
+      "src/shared/doc-preview-file-access.test.ts": 80,
+      "src/shared/doc-preview-scheme.test.ts": 46,
+      "src/shared/draft-paste-ready-scanner-grok-trace-replay.test.ts": 98,
+      "src/shared/draft-paste-ready-scanner.test.ts": 46,
+      "src/shared/emoji-shortcode-catalog.lazy.test.ts": 116,
+      "src/shared/emulator-keyboard-frame.test.ts": 53,
+      "src/shared/emulator-touch-frame.test.ts": 36,
+      "src/shared/ephemeral-setup-terminal-worktree-id.test.ts": 50,
+      "src/shared/ephemeral-vm-recipe-checkout-mode.test.ts": 130,
+      "src/shared/ephemeral-vm-recipe-doctor.test.ts": 47,
+      "src/shared/ephemeral-vm-recipe-output-capture.test.ts": 223,
+      "src/shared/ephemeral-vm-recipe-process.test.ts": 237,
+      "src/shared/ephemeral-vm-recipe-repo-url.test.ts": 51,
+      "src/shared/ephemeral-vm-recipes.test.ts": 122,
+      "src/shared/ephemeral-vm-runtime-feature-sorting.test.ts": 285,
+      "src/shared/ephemeral-vm-runtime-store-rollback.test.ts": 661,
+      "src/shared/ephemeral-vm-runtime-store.test.ts": 213,
+      "src/shared/event-loop-yield.test.ts": 68,
+      "src/shared/execution-host-registry.test.ts": 70,
+      "src/shared/execution-host.test.ts": 66,
+      "src/shared/export-let-function-initializer-ban.test.ts": 3945,
+      "src/shared/external-automation-jobs-file.test.ts": 95,
+      "src/shared/external-worktree-inbox.test.ts": 35,
+      "src/shared/feature-education-telemetry.test.ts": 38,
+      "src/shared/feature-interactions.test.ts": 2141,
+      "src/shared/feature-tips.test.ts": 68,
+      "src/shared/feature-wall-tour-depth.test.ts": 27,
+      "src/shared/feedback-image-limits.test.ts": 49,
+      "src/shared/file-link-location.test.ts": 51,
+      "src/shared/file-name-sort.test.ts": 48,
+      "src/shared/filesystem-directory-listing-limit.test.ts": 53,
+      "src/shared/fish-binary-requirement.test.ts": 45,
+      "src/shared/folder-workspace-execution-host.test.ts": 79,
+      "src/shared/folder-workspace-worktree.test.ts": 46,
+      "src/shared/folder-workspaces.test.ts": 33,
+      "src/shared/foreground-process-ancestry-parity.test.ts": 379,
+      "src/shared/foreground-process-selection.test.ts": 96,
+      "src/shared/foreground-wrapper-agent.test.ts": 51,
+      "src/shared/generated-code-path.test.ts": 46,
+      "src/shared/git-binary-compatibility.test.ts": 52,
+      "src/shared/git-branch-cleanup.test.ts": 62,
+      "src/shared/git-branch-compare-head.test.ts": 30,
+      "src/shared/git-branch-line-total-soft-deadline.test.ts": 3579,
+      "src/shared/git-branch-line-total.test.ts": 60,
+      "src/shared/git-capability-cache.test.ts": 58,
+      "src/shared/git-check-ignore-stdio.test.ts": 54,
+      "src/shared/git-clone-failure-message.test.ts": 74,
+      "src/shared/git-config-snapshot-runner.test.ts": 67,
+      "src/shared/git-configured-branch-target.test.ts": 60,
+      "src/shared/git-cquoted-path.test.ts": 29,
+      "src/shared/git-diff-transport-budget.test.ts": 2035,
+      "src/shared/git-discard-path-safety.test.ts": 40,
+      "src/shared/git-exec-mutation.test.ts": 53,
+      "src/shared/git-fetch-head-capability.test.ts": 39,
+      "src/shared/git-fetch-head-lock-key-derivation.test.ts": 133,
+      "src/shared/git-fetch-head-lock.test.ts": 169,
+      "src/shared/git-fork-sync.test.ts": 54,
+      "src/shared/git-history-graph.test.ts": 95,
+      "src/shared/git-history-message-allocation.test.ts": 45,
+      "src/shared/git-history-ref-display.test.ts": 65,
+      "src/shared/git-history.test.ts": 68,
+      "src/shared/git-merge-tree-capability.test.ts": 31,
+      "src/shared/git-metadata-path.test.ts": 63,
+      "src/shared/git-push-target-validation.test.ts": 44,
+      "src/shared/git-remote-error.test.ts": 73,
+      "src/shared/git-remote-identity.test.ts": 56,
+      "src/shared/git-remote-url-index.test.ts": 53,
+      "src/shared/git-rev-list-output.test.ts": 43,
+      "src/shared/git-status-branch-line-total-cache.test.ts": 55,
+      "src/shared/git-status-conflict-entries.test.ts": 33,
+      "src/shared/git-status-limit.test.ts": 37,
+      "src/shared/git-status-line-stat-inputs.test.ts": 32,
+      "src/shared/git-status-line-stats-cache.test.ts": 67,
+      "src/shared/git-status-upstream-ref.test.ts": 59,
+      "src/shared/git-tracked-pathspecs.test.ts": 207,
+      "src/shared/git-uncommitted-line-stats.test.ts": 85,
+      "src/shared/git-upstream-status.test.ts": 33,
+      "src/shared/git-worktree-operation-lock.test.ts": 32,
+      "src/shared/github/account-binding.test.ts": 41,
+      "src/shared/github/api-availability.test.ts": 38,
+      "src/shared/github/owner-slug.test.ts": 40,
+      "src/shared/github/project-identity.test.ts": 25,
+      "src/shared/github/project-ref-input.test.ts": 39,
+      "src/shared/github/project-roadmap-timeline.test.ts": 77,
+      "src/shared/github/pull-request-auto-merge-availability.test.ts": 64,
+      "src/shared/github/pull-request-for-branch-outcome.test.ts": 45,
+      "src/shared/github/pull-request-merge-methods.test.ts": 50,
+      "src/shared/github/repository-identity-key.test.ts": 49,
+      "src/shared/github/work-items-query-bounds.test.ts": 58,
+      "src/shared/gitlab-job-log-excerpt.test.ts": 91,
+      "src/shared/gitlab-job-trace-check-details.test.ts": 32,
+      "src/shared/gitlab-pipeline-checks.test.ts": 34,
+      "src/shared/gitlab-projects.test.ts": 40,
+      "src/shared/grok-model-list-probe.test.ts": 49,
+      "src/shared/grok-session-paths.test.ts": 87,
+      "src/shared/growing-byte-buffer.test.ts": 96,
+      "src/shared/handled-wire-discriminant.test.ts": 36,
+      "src/shared/harness-injected-user-turns.test.ts": 42,
+      "src/shared/hermes-run-ref-retention.test.ts": 29,
+      "src/shared/hermes-session-run-index.test.ts": 692,
+      "src/shared/hermes-startup-query.windows.test.ts": 41,
+      "src/shared/hook-command-source-policy.test.ts": 52,
+      "src/shared/host-balanced-listing-scaling.test.ts": 56,
+      "src/shared/host-display-resolution.test.ts": 33,
+      "src/shared/host-setting-overrides.test.ts": 37,
+      "src/shared/hosted-review-creation-providers.test.ts": 52,
+      "src/shared/hosted-review-github.test.ts": 48,
+      "src/shared/hosted-review-ready-capabilities.test.ts": 37,
+      "src/shared/hosted-review-refs.test.ts": 109,
+      "src/shared/image-data-uri.test.ts": 41,
+      "src/shared/image-paste-following-text.test.ts": 68,
+      "src/shared/in-flight-promise-dedupe.test.ts": 61,
+      "src/shared/issue-link-input.test.ts": 60,
+      "src/shared/jira-issue-url.test.ts": 57,
+      "src/shared/json-text-structure-limit.test.ts": 40,
+      "src/shared/keybindings-conflicts.test.ts": 94,
+      "src/shared/keybindings-default-bindings.test.ts": 109,
+      "src/shared/keybindings-digit-index.test.ts": 110,
+      "src/shared/keybindings-double-tap.test.ts": 85,
+      "src/shared/keybindings-keyboard-layout.test.ts": 56,
+      "src/shared/keybindings-mouse.test.ts": 44,
+      "src/shared/keybindings-parse-cache.test.ts": 142,
+      "src/shared/keybindings-parsing.test.ts": 47,
+      "src/shared/keybindings-terminal-context.test.ts": 49,
+      "src/shared/keybindings-unassigned-actions.test.ts": 61,
+      "src/shared/linear/inline-media.test.ts": 36,
+      "src/shared/linear/issue-attribute-filter.test.ts": 58,
+      "src/shared/linear/issue-view-resume-state.test.ts": 67,
+      "src/shared/linear/links.test.ts": 74,
+      "src/shared/linear/workspace-types.test.ts": 25,
+      "src/shared/linux-proc-port-scan-limits.test.ts": 42,
+      "src/shared/local-account-runtime.test.ts": 93,
+      "src/shared/local-build-compatibility.test.ts": 34,
+      "src/shared/localhost-worktree-labels.test.ts": 52,
+      "src/shared/loose-ref-count.test.ts": 358,
+      "src/shared/machine-name.test.ts": 35,
+      "src/shared/macos-symbolic-hotkeys.test.ts": 100,
+      "src/shared/main-agent-status-parity.test.ts": 206,
+      "src/shared/managed-agent-command-token.test.ts": 26,
+      "src/shared/manual-repo-order.test.ts": 36,
+      "src/shared/map-settled-with-concurrency.test.ts": 60,
+      "src/shared/map-with-concurrency.test.ts": 82,
+      "src/shared/markdown-document-listing-limits.test.ts": 47,
+      "src/shared/markdown-toc-panel-width.test.ts": 53,
+      "src/shared/mcp-config.test.ts": 128,
+      "src/shared/mobile-e2ee-v2-contract.test.ts": 41,
+      "src/shared/mobile-e2ee-v2-framing.test.ts": 55,
+      "src/shared/mobile-file-directory-limit.test.ts": 49,
+      "src/shared/mobile-markdown-document.test.ts": 40,
+      "src/shared/mobile-pairing-connection-mode.test.ts": 49,
+      "src/shared/mobile-pairing-custom-address.test.ts": 57,
       "src/shared/mobile-push-contract.test.ts": 44,
-      "src/shared/mobile-relay-close-codes.test.ts": 60,
-      "src/shared/mobile-relay-mint-failure.test.ts": 44,
-      "src/shared/mobile-relay-pairing-offer.test.ts": 141,
-      "src/shared/mobile-relay-phone-protocol.test.ts": 140,
-      "src/shared/mobile-web-bundle/bundle-range-rpc-contract.test.ts": 143,
-      "src/shared/mobile-web-bundle/bundle-rpc-contract.test.ts": 184,
-      "src/shared/mobile-web-bundle/manifest-contract.test.ts": 188,
-      "src/shared/model-id-label.test.ts": 42,
-      "src/shared/modifier-double-tap-detector.test.ts": 57,
-      "src/shared/muse-session-log.test.ts": 55,
-      "src/shared/native-chat-activity-tail-line.test.ts": 175,
-      "src/shared/native-chat-agent-profiles.test.ts": 45,
-      "src/shared/native-chat-agent-support.test.ts": 35,
-      "src/shared/native-chat-ask-fifo.test.ts": 261,
-      "src/shared/native-chat-ask-row.test.ts": 51,
-      "src/shared/native-chat-ask.test.ts": 71,
-      "src/shared/native-chat-background-task-row.test.ts": 56,
-      "src/shared/native-chat-command-envelope.test.ts": 42,
-      "src/shared/native-chat-edit-normalize.test.ts": 155,
-      "src/shared/native-chat-href-routing.test.ts": 45,
-      "src/shared/native-chat-image-transcript-markers.test.ts": 67,
-      "src/shared/native-chat-session-option-commands.test.ts": 78,
-      "src/shared/native-chat-session-option-defaults.test.ts": 73,
-      "src/shared/native-chat-session-option-snapshot.test.ts": 86,
-      "src/shared/native-chat-session-option-state.test.ts": 46,
-      "src/shared/native-chat-shell-environment.test.ts": 31,
-      "src/shared/native-chat-slash-commands.omp.test.ts": 49,
-      "src/shared/native-chat-slash-commands.test.ts": 85,
-      "src/shared/native-chat-stream-unsubscribe.test.ts": 40,
-      "src/shared/native-chat-streaming.test.ts": 31,
-      "src/shared/native-chat-subagent-summary.test.ts": 58,
-      "src/shared/native-chat-task-list.test.ts": 54,
-      "src/shared/native-chat-tool-activity.test.ts": 42,
-      "src/shared/native-chat-tool-attribution-allocation.test.ts": 53,
-      "src/shared/native-chat-tool-icon.test.ts": 72,
-      "src/shared/native-chat-tool-identity.test.ts": 50,
-      "src/shared/native-chat-tool-pair-limit.test.ts": 123,
-      "src/shared/native-chat-tool-pairing.test.ts": 58,
-      "src/shared/native-chat-tool-preview-prefix.test.ts": 49,
-      "src/shared/native-chat-tool-preview-scan.test.ts": 61,
-      "src/shared/native-chat-tool-run-outcome.test.ts": 76,
-      "src/shared/native-chat-tool-run-sentence.test.ts": 71,
-      "src/shared/native-chat-tool-summary.test.ts": 74,
-      "src/shared/native-chat-transcript-retention.test.ts": 37,
-      "src/shared/native-chat-turn-activity.test.ts": 60,
-      "src/shared/native-chat-turn-fold.test.ts": 52,
-      "src/shared/native-chat-turn-status.test.ts": 46,
-      "src/shared/native-chat-types.test.ts": 37,
-      "src/shared/native-chat-unverifiable-turn-status.test.ts": 47,
-      "src/shared/native-file-drop.test.ts": 75,
-      "src/shared/nested-repo-telemetry-schema.test.ts": 144,
-      "src/shared/nested-repo-telemetry.test.ts": 44,
-      "src/shared/nested-worker-depth.test.ts": 34,
+      "src/shared/mobile-relay-close-codes.test.ts": 49,
+      "src/shared/mobile-relay-mint-failure.test.ts": 33,
+      "src/shared/mobile-relay-pairing-offer.test.ts": 151,
+      "src/shared/mobile-relay-phone-protocol.test.ts": 109,
+      "src/shared/mobile-web-bundle/bundle-range-rpc-contract.test.ts": 108,
+      "src/shared/mobile-web-bundle/bundle-rpc-contract.test.ts": 153,
+      "src/shared/mobile-web-bundle/manifest-contract.test.ts": 204,
+      "src/shared/model-id-label.test.ts": 45,
+      "src/shared/modifier-double-tap-detector.test.ts": 47,
+      "src/shared/mouse-shortcut-input.test.ts": 49,
+      "src/shared/muse-session-log.test.ts": 63,
+      "src/shared/native-chat-activity-tail-line.test.ts": 155,
+      "src/shared/native-chat-agent-profiles.test.ts": 68,
+      "src/shared/native-chat-agent-support.test.ts": 52,
+      "src/shared/native-chat-ask-fifo.test.ts": 386,
+      "src/shared/native-chat-ask-row.test.ts": 41,
+      "src/shared/native-chat-ask.test.ts": 41,
+      "src/shared/native-chat-background-task-row.test.ts": 61,
+      "src/shared/native-chat-command-envelope.test.ts": 45,
+      "src/shared/native-chat-edit-normalize.test.ts": 189,
+      "src/shared/native-chat-href-routing.test.ts": 32,
+      "src/shared/native-chat-image-transcript-markers.test.ts": 45,
+      "src/shared/native-chat-session-option-commands.test.ts": 61,
+      "src/shared/native-chat-session-option-defaults.test.ts": 59,
+      "src/shared/native-chat-session-option-snapshot.test.ts": 107,
+      "src/shared/native-chat-session-option-state.test.ts": 31,
+      "src/shared/native-chat-shell-environment.test.ts": 39,
+      "src/shared/native-chat-slash-commands.omp.test.ts": 152,
+      "src/shared/native-chat-slash-commands.test.ts": 47,
+      "src/shared/native-chat-stream-unsubscribe.test.ts": 52,
+      "src/shared/native-chat-streaming.test.ts": 53,
+      "src/shared/native-chat-subagent-summary.test.ts": 42,
+      "src/shared/native-chat-task-list.test.ts": 40,
+      "src/shared/native-chat-tool-activity.test.ts": 30,
+      "src/shared/native-chat-tool-attribution-allocation.test.ts": 79,
+      "src/shared/native-chat-tool-icon.test.ts": 70,
+      "src/shared/native-chat-tool-identity.test.ts": 150,
+      "src/shared/native-chat-tool-pair-limit.test.ts": 119,
+      "src/shared/native-chat-tool-pairing.test.ts": 56,
+      "src/shared/native-chat-tool-preview-prefix.test.ts": 60,
+      "src/shared/native-chat-tool-preview-scan.test.ts": 40,
+      "src/shared/native-chat-tool-run-outcome.test.ts": 59,
+      "src/shared/native-chat-tool-run-sentence.test.ts": 66,
+      "src/shared/native-chat-tool-summary.test.ts": 55,
+      "src/shared/native-chat-transcript-retention.test.ts": 43,
+      "src/shared/native-chat-turn-activity.test.ts": 74,
+      "src/shared/native-chat-turn-fold.test.ts": 29,
+      "src/shared/native-chat-turn-status.test.ts": 65,
+      "src/shared/native-chat-types.test.ts": 46,
+      "src/shared/native-chat-unverifiable-turn-status.test.ts": 44,
+      "src/shared/native-file-drop.test.ts": 73,
+      "src/shared/nested-repo-telemetry-schema.test.ts": 152,
+      "src/shared/nested-repo-telemetry.test.ts": 50,
+      "src/shared/nested-worker-depth.test.ts": 37,
       "src/shared/network-proxy.test.ts": 52,
-      "src/shared/network/manual-address.test.ts": 59,
-      "src/shared/network/server-share-address.test.ts": 68,
-      "src/shared/new-workspace-dialog-repo.test.ts": 46,
-      "src/shared/new-workspace/smart-workspace-url-source-results.test.ts": 57,
-      "src/shared/new-workspace/work-item-lookup-text.test.ts": 55,
-      "src/shared/new-workspace/workspace-source.test.ts": 50,
-      "src/shared/new-workspace/worktree-create-retry-policy.test.ts": 49,
-      "src/shared/node-bounded-file-reader-sync.test.ts": 35,
-      "src/shared/node-bounded-file-reader.test.ts": 48,
-      "src/shared/node-bounded-json-stringify.test.ts": 59,
-      "src/shared/node-file-content-equality.test.ts": 58,
-      "src/shared/node-markdown-document-discovery.test.ts": 48,
-      "src/shared/node-pty-spawn-helper.test.ts": 41,
-      "src/shared/node-readable-text.test.ts": 69,
-      "src/shared/node-source-copy-content-equality.test.ts": 54,
-      "src/shared/notebook-venv-location.test.ts": 30,
-      "src/shared/nul-delimited-fields.test.ts": 29,
-      "src/shared/nvm-default-alias.test.ts": 90,
-      "src/shared/omp-draft-launch-shell.test.ts": 238,
-      "src/shared/omp-draft-launch-windows.test.ts": 103,
-      "src/shared/omp-fresh-launch-shell.test.ts": 167,
-      "src/shared/omp-fresh-launch.test.ts": 107,
-      "src/shared/omp-owner-state-title.test.ts": 81,
-      "src/shared/omp-pi-semantic-title-preservation.test.ts": 102,
-      "src/shared/omp-source-control-discovery.test.ts": 197,
-      "src/shared/onboarding-tour-telemetry-events.test.ts": 199,
-      "src/shared/open-in-applications.test.ts": 38,
-      "src/shared/opencode-launch-command.test.ts": 41,
-      "src/shared/opencode-permission-status.test.ts": 173,
-      "src/shared/opencode-terminal-title.test.ts": 50,
-      "src/shared/orca-session-address.test.ts": 108,
-      "src/shared/orca-yaml-alias-bounds.test.ts": 98,
-      "src/shared/orca-yaml-bounds.test.ts": 69,
-      "src/shared/orcad-artifacts.test.ts": 41,
-      "src/shared/orchestration-ask-timeout.test.ts": 35,
-      "src/shared/orchestration-check-output.test.ts": 45,
-      "src/shared/orchestration-compatibility-evidence.test.ts": 34,
-      "src/shared/orchestration-dispatch-refusal-contract.test.ts": 69,
-      "src/shared/orchestration-fleet-attention.test.ts": 48,
-      "src/shared/orchestration-fleet-evidence-clock.test.ts": 65,
-      "src/shared/orchestration-fleet-projection.test.ts": 91,
-      "src/shared/orchestration-rpc-contract.test.ts": 70,
-      "src/shared/orchestration-task-display.test.ts": 55,
-      "src/shared/orchestration-task-summary.test.ts": 55,
-      "src/shared/orchestration-timing-budgets.test.ts": 33,
-      "src/shared/osc-title-scan-tail-retention.test.ts": 71,
-      "src/shared/osc-title-scan-tail.test.ts": 50,
-      "src/shared/osc52-clipboard-settings.test.ts": 36,
-      "src/shared/own-retained-string.test.ts": 185,
-      "src/shared/pairing-address-auto-selection.test.ts": 55,
-      "src/shared/pairing-local-ui-fields.test.ts": 37,
-      "src/shared/pairing.test.ts": 87,
-      "src/shared/pane-agent-identity-adapter.test.ts": 97,
-      "src/shared/pane-agent-identity-inventory.test.ts": 771,
-      "src/shared/pane-agent-identity-resolver.test.ts": 100,
-      "src/shared/pane-agent-identity-surface-inventory.test.ts": 2496,
-      "src/shared/pane-agent-identity-title-corpus.test.ts": 81,
-      "src/shared/pane-agent-owner.test.ts": 44,
-      "src/shared/pane-key-alias.test.ts": 70,
-      "src/shared/physical-exit-tracker.test.ts": 39,
-      "src/shared/pi-agent-kind.test.ts": 50,
-      "src/shared/pi-overlay-ui-settings.test.ts": 49,
-      "src/shared/pi-state-title-marker.test.ts": 84,
-      "src/shared/plugins/plugin-consent-fingerprint.test.ts": 201,
-      "src/shared/plugins/plugin-consent-request.test.ts": 106,
-      "src/shared/plugins/plugin-content-pack-contributions.test.ts": 168,
-      "src/shared/plugins/plugin-demo-fixture.test.ts": 166,
-      "src/shared/plugins/plugin-hostile-fixture.test.ts": 36,
-      "src/shared/plugins/plugin-install-lockfile.test.ts": 164,
-      "src/shared/plugins/plugin-kill-list.test.ts": 170,
-      "src/shared/plugins/plugin-language-pack-artifact.test.ts": 225,
-      "src/shared/plugins/plugin-manifest.test.ts": 163,
-      "src/shared/plugins/plugin-marketplace.test.ts": 276,
-      "src/shared/plugins/plugin-panel-call-admission.test.ts": 137,
-      "src/shared/plugins/plugin-panel-message-budget-traversal.test.ts": 177,
-      "src/shared/plugins/plugin-panel-message-budget.test.ts": 209,
-      "src/shared/plugins/plugin-panel-pong-frame.test.ts": 125,
-      "src/shared/plugins/plugin-panel-shell.test.ts": 672,
-      "src/shared/plugins/plugin-path-safety.test.ts": 180,
-      "src/shared/plugins/plugin-vm-recipe-artifact.test.ts": 150,
-      "src/shared/posix-wait-status.test.ts": 44,
-      "src/shared/powershell-native-argument.test.ts": 45,
-      "src/shared/pr-bot-author-overrides.test.ts": 47,
-      "src/shared/pr-check-severity-order.test.ts": 49,
-      "src/shared/pr-check-status.test.ts": 42,
-      "src/shared/pr-comment-audience.test.ts": 54,
-      "src/shared/pr-comment-groups.test.ts": 31,
-      "src/shared/pr-comment-time.test.ts": 38,
-      "src/shared/preferred-git-remote.test.ts": 55,
-      "src/shared/priority-semaphore.test.ts": 63,
-      "src/shared/process-output-field-scanner.test.ts": 63,
-      "src/shared/process-table-index.test.ts": 207,
-      "src/shared/process-table-snapshot.test.ts": 160,
-      "src/shared/profile-state-recovery-command.test.ts": 131,
-      "src/shared/profile-state-telemetry-schema.test.ts": 170,
-      "src/shared/project-catalog-row-normalization.test.ts": 68,
-      "src/shared/project-execution-runtime.test.ts": 55,
-      "src/shared/project-groups.test.ts": 158,
-      "src/shared/project-host-setup-projection.test.ts": 84,
-      "src/shared/project-identity-succession.test.ts": 60,
-      "src/shared/promise-settlement-waiters.test.ts": 265,
-      "src/shared/protocol-compat.test.ts": 51,
-      "src/shared/pty-consumer-session.test.ts": 77,
-      "src/shared/pty-delivery-diagnostics.test.ts": 49,
-      "src/shared/pty-liveness-verdict.test.ts": 49,
-      "src/shared/pty-owner-backend.test.ts": 40,
-      "src/shared/pty-slave-line-discipline-echo.test.ts": 50,
-      "src/shared/pty-startup-ingress-kitty.test.ts": 104,
-      "src/shared/pty-startup-ingress-live-query-reply.test.ts": 91,
-      "src/shared/pty-startup-ingress.test.ts": 125,
-      "src/shared/pty-startup-reply-echo-shapes.test.ts": 66,
-      "src/shared/published-pane-agent-identity.test.ts": 74,
-      "src/shared/pull-request-generation.test.ts": 63,
-      "src/shared/quick-open-directory-reader.test.ts": 47,
-      "src/shared/quick-open-expansion-paths.test.ts": 62,
-      "src/shared/quick-open-filter.renderer-safety.test.ts": 55,
-      "src/shared/quick-open-filter.test.ts": 88,
-      "src/shared/quick-open-fuzzy-scan.test.ts": 854,
-      "src/shared/quick-open-git-directory-collapse.test.ts": 77,
-      "src/shared/quick-open-install-rg.test.ts": 64,
-      "src/shared/quick-open-listing-limits.test.ts": 56,
-      "src/shared/quick-open-readdir-memory.test.ts": 104,
-      "src/shared/quick-open-readdir-walk.test.ts": 391,
-      "src/shared/quick-open-transport-budget.test.ts": 63,
-      "src/shared/raster-image-base64-preview.test.ts": 406,
-      "src/shared/raster-image-dimensions.test.ts": 67,
-      "src/shared/raster-image-preview-limits.test.ts": 45,
-      "src/shared/rate-limit-reset-format.test.ts": 36,
-      "src/shared/rate-limit-types.test.ts": 36,
-      "src/shared/react-update-depth-attribution.test.ts": 49,
-      "src/shared/reconnect-jitter.test.ts": 49,
-      "src/shared/relay-frame-buffer.test.ts": 399,
-      "src/shared/relay-optional-artifacts.test.ts": 46,
-      "src/shared/relay-version-marker.test.ts": 65,
-      "src/shared/release-channel.test.ts": 86,
-      "src/shared/remote-foreground-evidence.test.ts": 38,
-      "src/shared/remote-pairing-address.test.ts": 163,
-      "src/shared/remote-pairing-verification.test.ts": 38,
-      "src/shared/remote-rpc-content-budget.test.ts": 138,
-      "src/shared/remote-runtime-client-error-classification.test.ts": 53,
-      "src/shared/remote-runtime-client.test.ts": 5091,
-      "src/shared/remote-runtime-connect-bound.test.ts": 458,
-      "src/shared/remote-runtime-memory-limits.test.ts": 144,
-      "src/shared/remote-runtime-outbound-admission.test.ts": 1492,
-      "src/shared/remote-runtime-request-connection-stale.test.ts": 217,
-      "src/shared/remote-runtime-request-connection.test.ts": 385,
-      "src/shared/remote-runtime-request-frames.test.ts": 133,
-      "src/shared/remote-runtime-request-response-router.test.ts": 122,
-      "src/shared/remote-runtime-request-websocket.test.ts": 129,
-      "src/shared/remote-runtime-shared-control-boundary.test.ts": 1650,
-      "src/shared/remote-runtime-shared-control-connection.test.ts": 3576,
-      "src/shared/remote-runtime-shared-control-keepalive-refresh.test.ts": 220,
-      "src/shared/remote-runtime-shared-control-reconnect.test.ts": 185,
-      "src/shared/remote-runtime-shared-control-retired-request-ids.test.ts": 43,
-      "src/shared/remote-runtime-shared-control-socket-generation.test.ts": 114,
-      "src/shared/remote-runtime-shared-control-standing-intent.test.ts": 916,
-      "src/shared/remote-runtime-shared-control-subscription-close.test.ts": 153,
-      "src/shared/remote-runtime-shared-control-subscriptions.test.ts": 155,
-      "src/shared/remote-runtime-socket-liveness.test.ts": 42,
-      "src/shared/remote-runtime-subscription-connect-bound.test.ts": 358,
-      "src/shared/remote-runtime-subscription-frame-router.test.ts": 143,
-      "src/shared/remote-runtime-subscription-request.test.ts": 577,
-      "src/shared/remote-runtime-tailscale-hint.test.ts": 53,
-      "src/shared/remote-runtime-transport-error-agreement.test.ts": 208,
-      "src/shared/remote-workspace-session-projection.test.ts": 346,
-      "src/shared/renderer-restart-preparation.test.ts": 288,
-      "src/shared/repo-badge-color.test.ts": 201,
-      "src/shared/repo-icon.test.ts": 78,
-      "src/shared/repo-ref-maintenance.test.ts": 1006,
-      "src/shared/repo-search-limits.test.ts": 63,
-      "src/shared/repro-13889-claude-quarter-circle-busy-title.test.ts": 64,
-      "src/shared/repro-7732-gitlab-job-id-dropped.test.ts": 48,
-      "src/shared/repro-8478-opencode-native-title-icon.test.ts": 62,
-      "src/shared/require-tui-agent-config.test.ts": 53,
-      "src/shared/resolved-worktree-lineage.test.ts": 68,
-      "src/shared/retired-pty-incarnations.test.ts": 35,
-      "src/shared/review-head-tracking-ref.test.ts": 53,
-      "src/shared/ripgrep-process-availability.test.ts": 77,
-      "src/shared/rpc-contract/agent-launch-params.test.ts": 206,
-      "src/shared/rpc-contract/terminal-create-shell-param.test.ts": 155,
-      "src/shared/runtime-client-export-parity.test.ts": 217,
-      "src/shared/runtime-environment-store.test.ts": 172,
-      "src/shared/runtime-host-status-owner.test.ts": 52,
-      "src/shared/runtime-listing-host-scope.test.ts": 42,
-      "src/shared/runtime-navigation.test.ts": 59,
-      "src/shared/runtime-rpc-call-queue-retention.test.ts": 255,
-      "src/shared/runtime-rpc-call-queue.test.ts": 51,
-      "src/shared/runtime-workspace-file-owner.test.ts": 39,
-      "src/shared/runtime-workspace-window-availability.test.ts": 63,
-      "src/shared/search-match-count.test.ts": 38,
-      "src/shared/search-subprocess-lines.test.ts": 94,
-      "src/shared/secret-store.test.ts": 49,
-      "src/shared/secure-file-coarse-ctime.test.ts": 110,
-      "src/shared/secure-file-fsync-flags.test.ts": 111,
-      "src/shared/secure-file.test.ts": 675,
-      "src/shared/secure-path-hardening-cache.test.ts": 49,
-      "src/shared/secure-path-hardening-retry-budget.test.ts": 77,
-      "src/shared/secure-path-windows-acl.win32.test.ts": 49,
-      "src/shared/serve-option-validation.test.ts": 64,
-      "src/shared/session-tab-placement.test.ts": 61,
-      "src/shared/setup-agent-sequencing.test.ts": 6836,
-      "src/shared/setup-agent-sequencing.windows.test.ts": 55,
-      "src/shared/setup-runner-command.test.ts": 67,
-      "src/shared/setup-script-imports.test.ts": 102,
-      "src/shared/setup-script-package-manager-suggestion.test.ts": 61,
-      "src/shared/setup-script-shebang.test.ts": 50,
-      "src/shared/setup-script-telemetry-events.test.ts": 145,
-      "src/shared/setup-script-telemetry.test.ts": 37,
-      "src/shared/sha256.test.ts": 60,
-      "src/shared/shell-foreground-snapshot.test.ts": 169,
-      "src/shared/shell-process-readiness.test.ts": 54,
-      "src/shared/skill-bundle-install-contract.test.ts": 106,
-      "src/shared/skill-bundle-name.test.ts": 47,
-      "src/shared/skill-delete-contract.test.ts": 130,
-      "src/shared/skill-deletion-eligibility.test.ts": 43,
-      "src/shared/skill-install-contract.test.ts": 171,
-      "src/shared/skill-install-failure.test.ts": 135,
-      "src/shared/skill-metadata.test.ts": 167,
-      "src/shared/skill-package-manifest.test.ts": 255,
-      "src/shared/skill-path-containment.test.ts": 44,
-      "src/shared/skills-cli-agent-keys.test.ts": 51,
-      "src/shared/source-control-ai-action-recipes.test.ts": 201,
-      "src/shared/source-control-ai-action-variables.test.ts": 94,
-      "src/shared/source-control-ai-actions.test.ts": 38,
-      "src/shared/source-control-ai-policy-regression.test.ts": 177,
-      "src/shared/source-control-ai-recipe-save.test.ts": 199,
-      "src/shared/source-control-ai.test.ts": 207,
-      "src/shared/source-control-create-review-intent.test.ts": 42,
-      "src/shared/source-control-group-order.test.ts": 39,
-      "src/shared/source-control-primary-action-decision.test.ts": 70,
-      "src/shared/source-control-push-failure.test.ts": 46,
+      "src/shared/network/manual-address.test.ts": 82,
+      "src/shared/network/server-share-address.test.ts": 30,
+      "src/shared/new-workspace-dialog-repo.test.ts": 25,
+      "src/shared/new-workspace/smart-workspace-url-source-results.test.ts": 92,
+      "src/shared/new-workspace/work-item-lookup-text.test.ts": 26,
+      "src/shared/new-workspace/workspace-source.test.ts": 51,
+      "src/shared/new-workspace/worktree-create-retry-policy.test.ts": 38,
+      "src/shared/node-bounded-file-reader-sync.test.ts": 36,
+      "src/shared/node-bounded-file-reader.test.ts": 35,
+      "src/shared/node-bounded-json-stringify.test.ts": 73,
+      "src/shared/node-file-content-equality.test.ts": 55,
+      "src/shared/node-markdown-document-discovery.test.ts": 57,
+      "src/shared/node-pty-spawn-helper.test.ts": 34,
+      "src/shared/node-readable-text.test.ts": 54,
+      "src/shared/node-source-copy-content-equality.test.ts": 69,
+      "src/shared/notebook-venv-location.test.ts": 44,
+      "src/shared/nul-delimited-fields.test.ts": 30,
+      "src/shared/nvm-default-alias.test.ts": 56,
+      "src/shared/omp-draft-launch-shell.test.ts": 173,
+      "src/shared/omp-draft-launch-windows.test.ts": 86,
+      "src/shared/omp-fresh-launch-shell.test.ts": 134,
+      "src/shared/omp-fresh-launch.test.ts": 102,
+      "src/shared/omp-owner-state-title.test.ts": 88,
+      "src/shared/omp-pi-semantic-title-preservation.test.ts": 49,
+      "src/shared/omp-source-control-discovery.test.ts": 150,
+      "src/shared/onboarding-tour-telemetry-events.test.ts": 165,
+      "src/shared/open-in-applications.test.ts": 36,
+      "src/shared/opencode-launch-command.test.ts": 52,
+      "src/shared/opencode-permission-status.test.ts": 154,
+      "src/shared/opencode-terminal-title.test.ts": 41,
+      "src/shared/orca-session-address.test.ts": 189,
+      "src/shared/orca-yaml-alias-bounds.test.ts": 102,
+      "src/shared/orca-yaml-bounds.test.ts": 64,
+      "src/shared/orcad-artifacts.test.ts": 27,
+      "src/shared/orcad-profile-preflight.test.ts": 135,
+      "src/shared/orchestration-ask-timeout.test.ts": 46,
+      "src/shared/orchestration-check-output.test.ts": 50,
+      "src/shared/orchestration-compatibility-evidence.test.ts": 41,
+      "src/shared/orchestration-dispatch-refusal-contract.test.ts": 71,
+      "src/shared/orchestration-fleet-attention.test.ts": 38,
+      "src/shared/orchestration-fleet-evidence-clock.test.ts": 39,
+      "src/shared/orchestration-fleet-projection.test.ts": 64,
+      "src/shared/orchestration-rpc-contract.test.ts": 34,
+      "src/shared/orchestration-task-display.test.ts": 38,
+      "src/shared/orchestration-task-summary.test.ts": 45,
+      "src/shared/orchestration-timing-budgets.test.ts": 38,
+      "src/shared/osc-title-scan-tail-retention.test.ts": 59,
+      "src/shared/osc-title-scan-tail.test.ts": 36,
+      "src/shared/osc52-clipboard-settings.test.ts": 40,
+      "src/shared/own-retained-string.test.ts": 115,
+      "src/shared/pairing-address-auto-selection.test.ts": 58,
+      "src/shared/pairing-local-ui-fields.test.ts": 29,
+      "src/shared/pairing.test.ts": 112,
+      "src/shared/pane-agent-identity-adapter.test.ts": 83,
+      "src/shared/pane-agent-identity-inventory.test.ts": 1015,
+      "src/shared/pane-agent-identity-resolver.test.ts": 90,
+      "src/shared/pane-agent-identity-surface-inventory.test.ts": 2736,
+      "src/shared/pane-agent-identity-title-corpus.test.ts": 95,
+      "src/shared/pane-agent-owner.test.ts": 53,
+      "src/shared/pane-key-alias.test.ts": 69,
+      "src/shared/physical-exit-tracker.test.ts": 45,
+      "src/shared/pi-agent-kind.test.ts": 58,
+      "src/shared/pi-overlay-ui-settings.test.ts": 50,
+      "src/shared/pi-state-title-marker.test.ts": 72,
+      "src/shared/plugins/plugin-consent-fingerprint.test.ts": 159,
+      "src/shared/plugins/plugin-consent-request.test.ts": 84,
+      "src/shared/plugins/plugin-content-pack-contributions.test.ts": 136,
+      "src/shared/plugins/plugin-demo-fixture.test.ts": 177,
+      "src/shared/plugins/plugin-hostile-fixture.test.ts": 53,
+      "src/shared/plugins/plugin-install-lockfile.test.ts": 134,
+      "src/shared/plugins/plugin-kill-list.test.ts": 208,
+      "src/shared/plugins/plugin-language-pack-artifact.test.ts": 176,
+      "src/shared/plugins/plugin-manifest.test.ts": 145,
+      "src/shared/plugins/plugin-marketplace.test.ts": 224,
+      "src/shared/plugins/plugin-panel-call-admission.test.ts": 139,
+      "src/shared/plugins/plugin-panel-message-budget-traversal.test.ts": 196,
+      "src/shared/plugins/plugin-panel-message-budget.test.ts": 140,
+      "src/shared/plugins/plugin-panel-pong-frame.test.ts": 134,
+      "src/shared/plugins/plugin-panel-shell.test.ts": 566,
+      "src/shared/plugins/plugin-path-safety.test.ts": 161,
+      "src/shared/plugins/plugin-vm-recipe-artifact.test.ts": 172,
+      "src/shared/posix-wait-status.test.ts": 61,
+      "src/shared/powershell-native-argument.test.ts": 23,
+      "src/shared/pr-bot-author-overrides.test.ts": 36,
+      "src/shared/pr-check-severity-order.test.ts": 36,
+      "src/shared/pr-check-status.test.ts": 50,
+      "src/shared/pr-comment-audience.test.ts": 52,
+      "src/shared/pr-comment-groups.test.ts": 33,
+      "src/shared/pr-comment-time.test.ts": 49,
+      "src/shared/preferred-git-remote.test.ts": 27,
+      "src/shared/priority-semaphore.test.ts": 38,
+      "src/shared/process-output-field-scanner.test.ts": 49,
+      "src/shared/process-table-index.test.ts": 152,
+      "src/shared/process-table-snapshot.test.ts": 174,
+      "src/shared/profile-state-recovery-command.test.ts": 156,
+      "src/shared/profile-state-telemetry-schema.test.ts": 187,
+      "src/shared/project-catalog-row-normalization.test.ts": 64,
+      "src/shared/project-execution-runtime.test.ts": 47,
+      "src/shared/project-groups.test.ts": 141,
+      "src/shared/project-host-setup-projection.test.ts": 45,
+      "src/shared/project-identity-succession.test.ts": 54,
+      "src/shared/promise-settlement-waiters.test.ts": 305,
+      "src/shared/protocol-compat.test.ts": 43,
+      "src/shared/pty-consumer-session.test.ts": 34,
+      "src/shared/pty-delivery-diagnostics.test.ts": 46,
+      "src/shared/pty-liveness-verdict.test.ts": 27,
+      "src/shared/pty-owner-backend.test.ts": 25,
+      "src/shared/pty-slave-line-discipline-echo.test.ts": 42,
+      "src/shared/pty-startup-ingress-kitty.test.ts": 67,
+      "src/shared/pty-startup-ingress-live-query-reply.test.ts": 54,
+      "src/shared/pty-startup-ingress.test.ts": 148,
+      "src/shared/pty-startup-reply-echo-shapes.test.ts": 67,
+      "src/shared/published-pane-agent-identity.test.ts": 82,
+      "src/shared/pull-request-generation.test.ts": 79,
+      "src/shared/quick-open-directory-reader.test.ts": 64,
+      "src/shared/quick-open-expansion-paths.test.ts": 60,
+      "src/shared/quick-open-filter.renderer-safety.test.ts": 53,
+      "src/shared/quick-open-filter.test.ts": 66,
+      "src/shared/quick-open-fuzzy-scan.test.ts": 1098,
+      "src/shared/quick-open-git-directory-collapse.test.ts": 140,
+      "src/shared/quick-open-install-rg.test.ts": 27,
+      "src/shared/quick-open-listing-limits.test.ts": 45,
+      "src/shared/quick-open-readdir-memory.test.ts": 73,
+      "src/shared/quick-open-readdir-walk.test.ts": 445,
+      "src/shared/quick-open-transport-budget.test.ts": 43,
+      "src/shared/raster-image-base64-preview.test.ts": 501,
+      "src/shared/raster-image-dimensions.test.ts": 53,
+      "src/shared/raster-image-preview-limits.test.ts": 57,
+      "src/shared/rate-limit-reset-format.test.ts": 50,
+      "src/shared/rate-limit-types.test.ts": 32,
+      "src/shared/react-update-depth-attribution.test.ts": 48,
+      "src/shared/reconnect-jitter.test.ts": 34,
+      "src/shared/relay-frame-buffer.test.ts": 517,
+      "src/shared/relay-optional-artifacts.test.ts": 42,
+      "src/shared/relay-version-marker.test.ts": 42,
+      "src/shared/release-channel.test.ts": 36,
+      "src/shared/remote-foreground-evidence.test.ts": 30,
+      "src/shared/remote-pairing-address.test.ts": 143,
+      "src/shared/remote-pairing-verification.test.ts": 52,
+      "src/shared/remote-rpc-content-budget.test.ts": 93,
+      "src/shared/remote-runtime-client-error-classification.test.ts": 70,
+      "src/shared/remote-runtime-client.test.ts": 4934,
+      "src/shared/remote-runtime-connect-bound.test.ts": 387,
+      "src/shared/remote-runtime-memory-limits.test.ts": 159,
+      "src/shared/remote-runtime-outbound-admission.test.ts": 1513,
+      "src/shared/remote-runtime-request-connection-stale.test.ts": 297,
+      "src/shared/remote-runtime-request-connection.test.ts": 349,
+      "src/shared/remote-runtime-request-frames.test.ts": 99,
+      "src/shared/remote-runtime-request-response-router.test.ts": 174,
+      "src/shared/remote-runtime-request-websocket.test.ts": 180,
+      "src/shared/remote-runtime-shared-control-boundary.test.ts": 3236,
+      "src/shared/remote-runtime-shared-control-connection.test.ts": 3372,
+      "src/shared/remote-runtime-shared-control-keepalive-refresh.test.ts": 150,
+      "src/shared/remote-runtime-shared-control-reconnect.test.ts": 176,
+      "src/shared/remote-runtime-shared-control-retired-request-ids.test.ts": 47,
+      "src/shared/remote-runtime-shared-control-socket-generation.test.ts": 111,
+      "src/shared/remote-runtime-shared-control-standing-intent.test.ts": 883,
+      "src/shared/remote-runtime-shared-control-subscription-close.test.ts": 128,
+      "src/shared/remote-runtime-shared-control-subscriptions.test.ts": 161,
+      "src/shared/remote-runtime-socket-liveness.test.ts": 33,
+      "src/shared/remote-runtime-subscription-connect-bound.test.ts": 293,
+      "src/shared/remote-runtime-subscription-frame-router.test.ts": 89,
+      "src/shared/remote-runtime-subscription-request.test.ts": 526,
+      "src/shared/remote-runtime-tailscale-hint.test.ts": 41,
+      "src/shared/remote-runtime-transport-error-agreement.test.ts": 353,
+      "src/shared/remote-workspace-session-projection.test.ts": 156,
+      "src/shared/renderer-restart-preparation.test.ts": 537,
+      "src/shared/repo-badge-color.test.ts": 181,
+      "src/shared/repo-icon.test.ts": 68,
+      "src/shared/repo-ref-maintenance.test.ts": 861,
+      "src/shared/repo-search-limits.test.ts": 41,
+      "src/shared/repro-13889-claude-quarter-circle-busy-title.test.ts": 82,
+      "src/shared/repro-7732-gitlab-job-id-dropped.test.ts": 52,
+      "src/shared/repro-8478-opencode-native-title-icon.test.ts": 69,
+      "src/shared/require-tui-agent-config.test.ts": 51,
+      "src/shared/resolved-worktree-lineage.test.ts": 38,
+      "src/shared/retired-pty-incarnations.test.ts": 44,
+      "src/shared/review-head-tracking-ref.test.ts": 56,
+      "src/shared/ripgrep-process-availability.test.ts": 70,
+      "src/shared/rpc-contract/agent-launch-params.test.ts": 167,
+      "src/shared/rpc-contract/terminal-create-shell-param.test.ts": 156,
+      "src/shared/runtime-client-export-parity.test.ts": 136,
+      "src/shared/runtime-environment-store.test.ts": 259,
+      "src/shared/runtime-host-status-owner.test.ts": 40,
+      "src/shared/runtime-listing-host-scope.test.ts": 38,
+      "src/shared/runtime-navigation.test.ts": 49,
+      "src/shared/runtime-rpc-call-queue-retention.test.ts": 215,
+      "src/shared/runtime-rpc-call-queue.test.ts": 77,
+      "src/shared/runtime-workspace-file-owner.test.ts": 45,
+      "src/shared/runtime-workspace-window-availability.test.ts": 57,
+      "src/shared/search-match-count.test.ts": 48,
+      "src/shared/search-subprocess-lines.test.ts": 117,
+      "src/shared/secret-store.test.ts": 39,
+      "src/shared/secure-file-coarse-ctime.test.ts": 51,
+      "src/shared/secure-file-fsync-flags.test.ts": 93,
+      "src/shared/secure-file.test.ts": 713,
+      "src/shared/secure-path-hardening-cache.test.ts": 37,
+      "src/shared/secure-path-hardening-retry-budget.test.ts": 65,
+      "src/shared/secure-path-windows-acl.win32.test.ts": 84,
+      "src/shared/serve-option-validation.test.ts": 65,
+      "src/shared/session-tab-placement.test.ts": 40,
+      "src/shared/setup-agent-sequencing.test.ts": 4298,
+      "src/shared/setup-agent-sequencing.windows.test.ts": 39,
+      "src/shared/setup-runner-command.test.ts": 58,
+      "src/shared/setup-script-imports.test.ts": 101,
+      "src/shared/setup-script-package-manager-suggestion.test.ts": 37,
+      "src/shared/setup-script-shebang.test.ts": 53,
+      "src/shared/setup-script-telemetry-events.test.ts": 153,
+      "src/shared/setup-script-telemetry.test.ts": 63,
+      "src/shared/sha256.test.ts": 75,
+      "src/shared/shell-foreground-snapshot.test.ts": 157,
+      "src/shared/shell-process-readiness.test.ts": 66,
+      "src/shared/skill-bundle-install-contract.test.ts": 123,
+      "src/shared/skill-bundle-name.test.ts": 37,
+      "src/shared/skill-delete-contract.test.ts": 127,
+      "src/shared/skill-deletion-eligibility.test.ts": 62,
+      "src/shared/skill-install-contract.test.ts": 145,
+      "src/shared/skill-install-failure.test.ts": 88,
+      "src/shared/skill-metadata.test.ts": 40,
+      "src/shared/skill-package-manifest.test.ts": 233,
+      "src/shared/skill-path-containment.test.ts": 35,
+      "src/shared/skills-cli-agent-keys.test.ts": 40,
+      "src/shared/source-control-ai-action-recipes.test.ts": 176,
+      "src/shared/source-control-ai-action-variables.test.ts": 52,
+      "src/shared/source-control-ai-actions.test.ts": 65,
+      "src/shared/source-control-ai-policy-regression.test.ts": 220,
+      "src/shared/source-control-ai-recipe-save.test.ts": 179,
+      "src/shared/source-control-ai.test.ts": 148,
+      "src/shared/source-control-create-review-intent.test.ts": 37,
+      "src/shared/source-control-group-order.test.ts": 52,
+      "src/shared/source-control-primary-action-decision.test.ts": 55,
+      "src/shared/source-control-push-failure.test.ts": 60,
       "src/shared/source-control-recovery-agent-command.test.ts": 62,
-      "src/shared/source-scan/source-tree-scan.test.ts": 112,
-      "src/shared/source-scan/source-tree-walk.test.ts": 78,
-      "src/shared/ssh-pending-pty-kill.test.ts": 50,
-      "src/shared/ssh-pty-id.test.ts": 52,
-      "src/shared/ssh-relay-pty-ownership-proof.test.ts": 74,
-      "src/shared/ssh-retained-payload-admission.test.ts": 74,
-      "src/shared/ssh-target-generation.test.ts": 51,
-      "src/shared/ssh-types.test.ts": 50,
-      "src/shared/stable-pane-id.test.ts": 41,
-      "src/shared/startup-command-submission.test.ts": 51,
-      "src/shared/status-bar-usage-mode.test.ts": 44,
-      "src/shared/string-chunk-compaction.test.ts": 45,
-      "src/shared/structural-value-equality.test.ts": 68,
-      "src/shared/structured-agent-session-agent-status.test.ts": 58,
-      "src/shared/structured-agent-session-coalescer.test.ts": 35,
-      "src/shared/structured-agent-session-composer.test.ts": 80,
-      "src/shared/structured-agent-session-context-usage.test.ts": 50,
-      "src/shared/structured-agent-session-create.test.ts": 50,
-      "src/shared/structured-agent-session-item-retention.test.ts": 910,
-      "src/shared/structured-agent-session-live-turn.test.ts": 68,
-      "src/shared/structured-agent-session-model-catalog-application.test.ts": 75,
-      "src/shared/structured-agent-session-mutation.test.ts": 88,
-      "src/shared/structured-agent-session-option-codec.test.ts": 30,
-      "src/shared/structured-agent-session-option-picks.test.ts": 97,
-      "src/shared/structured-agent-session-options.test.ts": 87,
-      "src/shared/structured-agent-session-projection.test.ts": 90,
-      "src/shared/structured-agent-session-reducer.test.ts": 187,
+      "src/shared/source-scan/source-tree-scan.test.ts": 80,
+      "src/shared/source-scan/source-tree-walk.test.ts": 58,
+      "src/shared/ssh-pending-pty-kill.test.ts": 47,
+      "src/shared/ssh-pty-id.test.ts": 56,
+      "src/shared/ssh-relay-pty-ownership-proof.test.ts": 53,
+      "src/shared/ssh-retained-payload-admission.test.ts": 68,
+      "src/shared/ssh-target-generation.test.ts": 50,
+      "src/shared/ssh-types.test.ts": 61,
+      "src/shared/stable-pane-id.test.ts": 37,
+      "src/shared/startup-command-submission.test.ts": 35,
+      "src/shared/status-bar-usage-mode.test.ts": 40,
+      "src/shared/string-chunk-compaction.test.ts": 44,
+      "src/shared/structural-value-equality.test.ts": 47,
+      "src/shared/structured-agent-session-agent-status.test.ts": 67,
+      "src/shared/structured-agent-session-coalescer.test.ts": 49,
+      "src/shared/structured-agent-session-composer.test.ts": 50,
+      "src/shared/structured-agent-session-context-usage.test.ts": 44,
+      "src/shared/structured-agent-session-create.test.ts": 64,
+      "src/shared/structured-agent-session-item-retention.test.ts": 937,
+      "src/shared/structured-agent-session-live-turn.test.ts": 117,
+      "src/shared/structured-agent-session-model-catalog-application.test.ts": 61,
+      "src/shared/structured-agent-session-mutation.test.ts": 49,
+      "src/shared/structured-agent-session-option-codec.test.ts": 25,
+      "src/shared/structured-agent-session-option-picks.test.ts": 79,
+      "src/shared/structured-agent-session-options.test.ts": 81,
+      "src/shared/structured-agent-session-projection.test.ts": 83,
+      "src/shared/structured-agent-session-reducer.test.ts": 146,
       "src/shared/structured-agent-session-send-disposition.test.ts": 54,
-      "src/shared/structured-agent-session-status-started-at.test.ts": 54,
-      "src/shared/structured-agent-session-status-tool-line.test.ts": 67,
-      "src/shared/structured-agent-session-turn-timing-retention.test.ts": 159,
-      "src/shared/structured-agent-session-turn-timing.test.ts": 53,
-      "src/shared/structured-agent-turn-clock-anchor.test.ts": 58,
-      "src/shared/structured-native-chat-launch-route.test.ts": 60,
-      "src/shared/subprocess-stdin-write.test.ts": 25,
-      "src/shared/synthetic-agent-title.test.ts": 53,
-      "src/shared/tab-title-resolution.test.ts": 39,
-      "src/shared/tailnet-address.test.ts": 40,
-      "src/shared/task-providers.test.ts": 26,
-      "src/shared/task-query.test.ts": 39,
-      "src/shared/task-source-context.test.ts": 141,
-      "src/shared/telemetry-common-props.test.ts": 291,
-      "src/shared/telemetry-events-feature-education.test.ts": 164,
-      "src/shared/telemetry-events.test.ts": 205,
-      "src/shared/telemetry-feature-wall-events.test.ts": 157,
-      "src/shared/telemetry-orca-cli-feature-tip.test.ts": 178,
-      "src/shared/terminal-bell-detector.test.ts": 52,
-      "src/shared/terminal-color-scheme-protocol.test.ts": 56,
-      "src/shared/terminal-composer-draft.test.ts": 46,
-      "src/shared/terminal-custom-themes.test.ts": 33,
+      "src/shared/structured-agent-session-status-started-at.test.ts": 94,
+      "src/shared/structured-agent-session-status-tool-line.test.ts": 77,
+      "src/shared/structured-agent-session-turn-timing-retention.test.ts": 185,
+      "src/shared/structured-agent-session-turn-timing.test.ts": 95,
+      "src/shared/structured-agent-turn-clock-anchor.test.ts": 36,
+      "src/shared/structured-native-chat-launch-route.test.ts": 38,
+      "src/shared/subprocess-stdin-write.test.ts": 54,
+      "src/shared/synthetic-agent-title.test.ts": 35,
+      "src/shared/tab-title-resolution.test.ts": 32,
+      "src/shared/tailnet-address.test.ts": 44,
+      "src/shared/task-providers.test.ts": 41,
+      "src/shared/task-query.test.ts": 51,
+      "src/shared/task-source-context.test.ts": 93,
+      "src/shared/telemetry-common-props.test.ts": 183,
+      "src/shared/telemetry-events-feature-education.test.ts": 198,
+      "src/shared/telemetry-events.test.ts": 189,
+      "src/shared/telemetry-feature-wall-events.test.ts": 175,
+      "src/shared/telemetry-orca-cli-feature-tip.test.ts": 182,
+      "src/shared/terminal-bell-detector.test.ts": 42,
+      "src/shared/terminal-color-scheme-protocol.test.ts": 50,
+      "src/shared/terminal-composer-draft.test.ts": 49,
+      "src/shared/terminal-custom-themes.test.ts": 42,
       "src/shared/terminal-escape-introducer.test.ts": 61,
-      "src/shared/terminal-exit-cause.test.ts": 72,
+      "src/shared/terminal-exit-cause.test.ts": 30,
       "src/shared/terminal-file-url-target.test.ts": 36,
-      "src/shared/terminal-fonts.test.ts": 40,
-      "src/shared/terminal-github-pr-link-detector.test.ts": 34,
-      "src/shared/terminal-input.test.ts": 117,
-      "src/shared/terminal-kitty-keyboard-mode-tracker.test.ts": 52,
-      "src/shared/terminal-kitty-keyboard-tail-retention.test.ts": 144,
-      "src/shared/terminal-line-height-settings.test.ts": 52,
-      "src/shared/terminal-mode-2031-final-state.test.ts": 81,
-      "src/shared/terminal-mode-reset-profiles.test.ts": 62,
-      "src/shared/terminal-osc-color-reply.test.ts": 39,
-      "src/shared/terminal-osc133-carry-retention.test.ts": 360,
-      "src/shared/terminal-output-side-effects.test.ts": 84,
-      "src/shared/terminal-partial-escape-tail-ground-scan.test.ts": 56,
-      "src/shared/terminal-partial-escape-tail.fuzz.test.ts": 1531,
-      "src/shared/terminal-partial-escape-tail.test.ts": 56,
-      "src/shared/terminal-query-reply.test.ts": 102,
-      "src/shared/terminal-quick-commands.test.ts": 59,
-      "src/shared/terminal-reply-query-scan.test.ts": 42,
+      "src/shared/terminal-fonts.test.ts": 28,
+      "src/shared/terminal-github-pr-link-detector.test.ts": 73,
+      "src/shared/terminal-input.test.ts": 68,
+      "src/shared/terminal-kitty-keyboard-mode-tracker.test.ts": 61,
+      "src/shared/terminal-kitty-keyboard-tail-retention.test.ts": 180,
+      "src/shared/terminal-line-height-settings.test.ts": 51,
+      "src/shared/terminal-mode-2031-final-state.test.ts": 90,
+      "src/shared/terminal-mode-reset-profiles.test.ts": 95,
+      "src/shared/terminal-osc-color-reply.test.ts": 28,
+      "src/shared/terminal-osc133-carry-retention.test.ts": 266,
+      "src/shared/terminal-output-side-effects.test.ts": 79,
+      "src/shared/terminal-partial-escape-tail-ground-scan.test.ts": 41,
+      "src/shared/terminal-partial-escape-tail.fuzz.test.ts": 1380,
+      "src/shared/terminal-partial-escape-tail.test.ts": 61,
+      "src/shared/terminal-query-reply.test.ts": 86,
+      "src/shared/terminal-quick-commands.test.ts": 33,
+      "src/shared/terminal-reply-query-scan.test.ts": 43,
       "src/shared/terminal-scrollback-policy.test.ts": 53,
-      "src/shared/terminal-selection-gutter.test.ts": 59,
-      "src/shared/terminal-startup-cwd.test.ts": 203,
-      "src/shared/terminal-stream-json-byte-length.test.ts": 63,
-      "src/shared/terminal-stream-protocol.test.ts": 64,
-      "src/shared/terminal-title-agent-type.test.ts": 93,
-      "src/shared/terminal-title-classification-corpus.test.ts": 119,
-      "src/shared/terminal-title-classification-memo.test.ts": 92,
-      "src/shared/terminal-view-attributes.test.ts": 59,
-      "src/shared/terminal-wait-blocked-reason-legacy-alias.test.ts": 47,
-      "src/shared/terminal-zero-dimensions-diagnostic.test.ts": 33,
-      "src/shared/test-code-path.test.ts": 44,
-      "src/shared/text-search.test.ts": 125,
-      "src/shared/timer-delay.test.ts": 43,
-      "src/shared/tui-agent-config.test.ts": 47,
-      "src/shared/tui-agent-launch-defaults.test.ts": 56,
-      "src/shared/tui-agent-permissions.test.ts": 63,
-      "src/shared/tui-agent-prompt-transport.test.ts": 103,
-      "src/shared/tui-agent-selection.test.ts": 43,
-      "src/shared/tui-agent-startup-copilot-resume.test.ts": 106,
-      "src/shared/tui-agent-startup-hermes.test.ts": 99,
+      "src/shared/terminal-selection-gutter.test.ts": 50,
+      "src/shared/terminal-startup-cwd.test.ts": 220,
+      "src/shared/terminal-stream-json-byte-length.test.ts": 41,
+      "src/shared/terminal-stream-protocol.test.ts": 55,
+      "src/shared/terminal-title-agent-type.test.ts": 62,
+      "src/shared/terminal-title-classification-corpus.test.ts": 94,
+      "src/shared/terminal-title-classification-memo.test.ts": 49,
+      "src/shared/terminal-view-attributes.test.ts": 35,
+      "src/shared/terminal-wait-blocked-reason-legacy-alias.test.ts": 33,
+      "src/shared/terminal-zero-dimensions-diagnostic.test.ts": 45,
+      "src/shared/test-code-path.test.ts": 41,
+      "src/shared/text-search.test.ts": 114,
+      "src/shared/timer-delay.test.ts": 52,
+      "src/shared/tui-agent-config.test.ts": 65,
+      "src/shared/tui-agent-launch-defaults.test.ts": 61,
+      "src/shared/tui-agent-permissions.test.ts": 41,
+      "src/shared/tui-agent-prompt-transport.test.ts": 94,
+      "src/shared/tui-agent-selection.test.ts": 47,
+      "src/shared/tui-agent-startup-copilot-resume.test.ts": 53,
+      "src/shared/tui-agent-startup-hermes.test.ts": 139,
       "src/shared/tui-agent-startup-session-options.test.ts": 88,
-      "src/shared/tui-agent-startup-shell.test.ts": 110,
-      "src/shared/tui-agent-startup.test.ts": 148,
-      "src/shared/ui-language.test.ts": 42,
-      "src/shared/ui-locale.test.ts": 52,
-      "src/shared/ui-zoom-level.test.ts": 40,
-      "src/shared/updated-at-order.test.ts": 159,
-      "src/shared/updater-windows-signature-check.test.ts": 34,
-      "src/shared/usage-percentage-display-change-notice.test.ts": 49,
-      "src/shared/usage-percentage-display.test.ts": 37,
-      "src/shared/utf8-byte-limits.test.ts": 105,
-      "src/shared/uuid-v4.test.ts": 47,
-      "src/shared/vscode-remote-ssh-launcher.test.ts": 50,
-      "src/shared/window-shortcut-policy-agent-dashboard.test.ts": 75,
-      "src/shared/window-shortcut-policy.test.ts": 102,
-      "src/shared/windows-cmd-runner-delayed-launch.test.ts": 47,
-      "src/shared/windows-command-line-budget.test.ts": 1234,
-      "src/shared/windows-console-input.test.ts": 49,
-      "src/shared/windows-environment-expansion.test.ts": 146,
-      "src/shared/windows-interactive-login-spawn.test.ts": 57,
-      "src/shared/windows-lane-tree-removal-boundary.test.ts": 59,
-      "src/shared/windows-long-path-git-args.test.ts": 54,
-      "src/shared/windows-security-descriptor.test.ts": 74,
-      "src/shared/windows-terminal-shell.test.ts": 61,
-      "src/shared/windows-transient-lock-removal.test.ts": 1406,
-      "src/shared/worker-terminal-host-scope.test.ts": 70,
-      "src/shared/worker-transcript-background-task-text.test.ts": 43,
-      "src/shared/worker-transcript-text-scaling.test.ts": 45,
-      "src/shared/workspace-cleanup-applied-filters.test.ts": 63,
-      "src/shared/workspace-cleanup-browse-state-persistence.test.ts": 51,
-      "src/shared/workspace-cleanup-ui-state.test.ts": 45,
-      "src/shared/workspace-cleanup.test.ts": 53,
-      "src/shared/workspace-doc-history.test.ts": 79,
-      "src/shared/workspace-linked-item-equality.test.ts": 47,
-      "src/shared/workspace-linked-item-source-context.test.ts": 48,
-      "src/shared/workspace-name.test.ts": 56,
-      "src/shared/workspace-session-browser-history.test.ts": 218,
-      "src/shared/workspace-session-partition-owner.test.ts": 51,
-      "src/shared/workspace-session-salvage-equivalence.test.ts": 367,
-      "src/shared/workspace-session-salvage.test.ts": 1090,
-      "src/shared/workspace-session-schema-field-coverage.test.ts": 201,
-      "src/shared/workspace-session-schema.sleeping-agent.test.ts": 238,
-      "src/shared/workspace-session-schema.test.ts": 262,
-      "src/shared/workspace-session-tab-focus-schema.test.ts": 232,
-      "src/shared/workspace-session-terminal-buffers.test.ts": 283,
-      "src/shared/workspace-session-terminal-schema.test.ts": 320,
-      "src/shared/workspace-session-terminal-tab-close.test.ts": 233,
-      "src/shared/workspace-session-validation-work.test.ts": 275,
-      "src/shared/workspace-space-compaction.test.ts": 43,
-      "src/shared/workspace-space-entry-traversal.test.ts": 1412,
+      "src/shared/tui-agent-startup-shell.test.ts": 108,
+      "src/shared/tui-agent-startup.test.ts": 119,
+      "src/shared/ui-language.test.ts": 36,
+      "src/shared/ui-locale.test.ts": 48,
+      "src/shared/ui-zoom-level.test.ts": 45,
+      "src/shared/updated-at-order.test.ts": 93,
+      "src/shared/updater-windows-signature-check.test.ts": 39,
+      "src/shared/usage-percentage-display-change-notice.test.ts": 94,
+      "src/shared/usage-percentage-display.test.ts": 40,
+      "src/shared/utf8-byte-limits.test.ts": 117,
+      "src/shared/uuid-v4.test.ts": 56,
+      "src/shared/vscode-remote-ssh-launcher.test.ts": 27,
+      "src/shared/window-shortcut-policy-agent-dashboard.test.ts": 48,
+      "src/shared/window-shortcut-policy.test.ts": 78,
+      "src/shared/windows-cmd-runner-delayed-launch.test.ts": 60,
+      "src/shared/windows-command-line-budget.test.ts": 1127,
+      "src/shared/windows-console-input.test.ts": 41,
+      "src/shared/windows-environment-expansion.test.ts": 132,
+      "src/shared/windows-interactive-login-spawn.test.ts": 42,
+      "src/shared/windows-lane-tree-removal-boundary.test.ts": 57,
+      "src/shared/windows-long-path-git-args.test.ts": 41,
+      "src/shared/windows-security-descriptor.test.ts": 33,
+      "src/shared/windows-terminal-shell.test.ts": 60,
+      "src/shared/windows-transient-lock-removal.test.ts": 1028,
+      "src/shared/worker-terminal-host-scope.test.ts": 65,
+      "src/shared/worker-transcript-background-task-text.test.ts": 56,
+      "src/shared/worker-transcript-text-scaling.test.ts": 46,
+      "src/shared/workspace-cleanup-applied-filters.test.ts": 60,
+      "src/shared/workspace-cleanup-browse-state-persistence.test.ts": 65,
+      "src/shared/workspace-cleanup-ui-state.test.ts": 39,
+      "src/shared/workspace-cleanup.test.ts": 40,
+      "src/shared/workspace-doc-history.test.ts": 59,
+      "src/shared/workspace-linked-item-equality.test.ts": 32,
+      "src/shared/workspace-linked-item-source-context.test.ts": 55,
+      "src/shared/workspace-name.test.ts": 55,
+      "src/shared/workspace-session-browser-history.test.ts": 173,
+      "src/shared/workspace-session-partition-owner.test.ts": 38,
+      "src/shared/workspace-session-salvage-equivalence.test.ts": 226,
+      "src/shared/workspace-session-salvage.test.ts": 1142,
+      "src/shared/workspace-session-schema-field-coverage.test.ts": 205,
+      "src/shared/workspace-session-schema.sleeping-agent.test.ts": 247,
+      "src/shared/workspace-session-schema.test.ts": 289,
+      "src/shared/workspace-session-tab-focus-schema.test.ts": 174,
+      "src/shared/workspace-session-terminal-buffers.test.ts": 276,
+      "src/shared/workspace-session-terminal-schema.test.ts": 155,
+      "src/shared/workspace-session-terminal-tab-close.test.ts": 242,
+      "src/shared/workspace-session-validation-work.test.ts": 279,
+      "src/shared/workspace-space-compaction.test.ts": 49,
+      "src/shared/workspace-space-entry-traversal.test.ts": 1467,
       "src/shared/workspace-space-scan-budget.test.ts": 80,
-      "src/shared/workspace-statuses.test.ts": 54,
-      "src/shared/worktree-execution-host-resolution.test.ts": 69,
-      "src/shared/worktree-name-suggestion.test.ts": 67,
-      "src/shared/worktree-scan-failure.test.ts": 24,
-      "src/shared/worktree/archive-failure-blocking-capability.test.ts": 56,
+      "src/shared/workspace-statuses.test.ts": 70,
+      "src/shared/worktree-execution-host-resolution.test.ts": 48,
+      "src/shared/worktree-name-suggestion.test.ts": 39,
+      "src/shared/worktree-scan-failure.test.ts": 39,
+      "src/shared/worktree/archive-failure-blocking-capability.test.ts": 31,
       "src/shared/worktree/base-ref.test.ts": 43,
-      "src/shared/worktree/card-properties.test.ts": 73,
-      "src/shared/worktree/catalog-version.test.ts": 49,
-      "src/shared/worktree/create-preparation.test.ts": 42,
-      "src/shared/worktree/github-pr-suppression.test.ts": 42,
-      "src/shared/worktree/host-context-labels.test.ts": 53,
-      "src/shared/worktree/host-qualified-identity.test.ts": 49,
-      "src/shared/worktree/id.test.ts": 71,
+      "src/shared/worktree/card-properties.test.ts": 56,
+      "src/shared/worktree/catalog-version.test.ts": 29,
+      "src/shared/worktree/create-preparation.test.ts": 35,
+      "src/shared/worktree/github-pr-suppression.test.ts": 57,
+      "src/shared/worktree/host-context-labels.test.ts": 59,
+      "src/shared/worktree/host-qualified-identity.test.ts": 61,
+      "src/shared/worktree/id.test.ts": 58,
       "src/shared/worktree/identity.test.ts": 38,
-      "src/shared/worktree/ownership-configured-base-visibility.test.ts": 74,
-      "src/shared/worktree/ownership-worktree-base-path.test.ts": 44,
-      "src/shared/worktree/ownership.test.ts": 322,
-      "src/shared/worktree/removal-fence-error.test.ts": 46,
-      "src/shared/worktree/removal-force-classification.test.ts": 43,
-      "src/shared/worktree/retired-name-cache.test.ts": 44,
-      "src/shared/worktree/retired-name-registry.test.ts": 469,
-      "src/shared/worktree/sort-order-update.test.ts": 41,
-      "src/shared/worktree/submodule-removal.test.ts": 36,
-      "src/shared/worktree/visibility-sources.test.ts": 75,
-      "src/shared/ws-outbound-backpressure-queue.test.ts": 79,
-      "src/shared/wsl-exec-mode-separator.test.ts": 2134,
-      "src/shared/wsl-login-shell-command.test.ts": 112,
-      "src/shared/wsl-paths.test.ts": 45,
-      "src/shared/zcode-missing-tui.test.ts": 34,
-      "src/shared/zcode-orchestration-contract.test.ts": 106,
-      "src/shared/zod-salvage-absence.test.ts": 74,
-      "tests/e2e/accumulated-workspace-state-builder.unit.test.ts": 103,
-      "tests/e2e/alternate-screen-fixture-script.unit.test.ts": 64,
-      "tests/e2e/codex-child-approval-activity-row.unit.test.ts": 4429,
-      "tests/e2e/completed-worker-retirement-resume.unit.test.ts": 3649,
-      "tests/e2e/e2e-worker-env-isolation.unit.test.ts": 69,
-      "tests/e2e/folder-upgrade-identity-persistence.unit.test.ts": 860,
-      "tests/e2e/github-work-item-search-burst.unit.test.ts": 938,
-      "tests/e2e/global-teardown.unit.test.ts": 86,
-      "tests/e2e/helpers/alt-screen-frame.unit.test.ts": 97,
-      "tests/e2e/helpers/client-hosted-browser-fixture.unit.test.ts": 896,
-      "tests/e2e/helpers/electron-crashpad-cleanup.unit.test.ts": 81,
-      "tests/e2e/helpers/electron-home-isolation.unit.test.ts": 55,
+      "src/shared/worktree/ownership-configured-base-visibility.test.ts": 77,
+      "src/shared/worktree/ownership-worktree-base-path.test.ts": 57,
+      "src/shared/worktree/ownership.test.ts": 264,
+      "src/shared/worktree/removal-fence-error.test.ts": 27,
+      "src/shared/worktree/removal-force-classification.test.ts": 30,
+      "src/shared/worktree/retired-name-cache.test.ts": 52,
+      "src/shared/worktree/retired-name-registry.test.ts": 289,
+      "src/shared/worktree/sort-order-update.test.ts": 43,
+      "src/shared/worktree/submodule-removal.test.ts": 48,
+      "src/shared/worktree/visibility-sources.test.ts": 87,
+      "src/shared/ws-outbound-backpressure-queue.test.ts": 67,
+      "src/shared/wsl-exec-mode-separator.test.ts": 1946,
+      "src/shared/wsl-login-shell-command.test.ts": 140,
+      "src/shared/wsl-paths.test.ts": 93,
+      "src/shared/zcode-missing-tui.test.ts": 43,
+      "src/shared/zcode-orchestration-contract.test.ts": 98,
+      "src/shared/zod-salvage-absence.test.ts": 106,
+      "tests/e2e/accumulated-workspace-state-builder.unit.test.ts": 88,
+      "tests/e2e/alternate-screen-fixture-script.unit.test.ts": 55,
+      "tests/e2e/codex-child-approval-activity-row.unit.test.ts": 4306,
+      "tests/e2e/completed-worker-retirement-resume.unit.test.ts": 5834,
+      "tests/e2e/daemon-running-work-probe.unit.test.ts": 311,
+      "tests/e2e/direct-ssh-snapshot-parking.unit.test.ts": 2238,
+      "tests/e2e/e2e-worker-env-isolation.unit.test.ts": 84,
+      "tests/e2e/folder-upgrade-identity-persistence.unit.test.ts": 1410,
+      "tests/e2e/github-work-item-search-burst.unit.test.ts": 1152,
+      "tests/e2e/global-teardown.unit.test.ts": 136,
+      "tests/e2e/helpers/alt-screen-frame.unit.test.ts": 110,
+      "tests/e2e/helpers/client-hosted-browser-fixture.unit.test.ts": 753,
+      "tests/e2e/helpers/electron-crashpad-cleanup.unit.test.ts": 50,
+      "tests/e2e/helpers/electron-home-isolation.unit.test.ts": 37,
       "tests/e2e/helpers/electron-launch-args.unit.test.ts": 52,
-      "tests/e2e/helpers/electron-main-evaluate-retry.unit.test.ts": 2463,
-      "tests/e2e/helpers/electron-process-shutdown.unit.test.ts": 70,
-      "tests/e2e/helpers/fake-agent-command-override.unit.test.ts": 71,
-      "tests/e2e/helpers/fake-agent-paste-end-scanner.unit.test.ts": 80,
-      "tests/e2e/helpers/git-status-retry-barrier.unit.test.ts": 28,
-      "tests/e2e/helpers/golden-source-control.unit.test.ts": 575,
-      "tests/e2e/helpers/headless-paired-runtime-serve-readiness.unit.test.ts": 46,
-      "tests/e2e/helpers/nested-runtime-proxy-jump-fixture.unit.test.ts": 54,
-      "tests/e2e/helpers/paired-client-runtime-environment.unit.test.ts": 61,
-      "tests/e2e/helpers/paired-client-window-reveal.unit.test.ts": 39,
-      "tests/e2e/helpers/persisted-profile-state.unit.test.ts": 319,
-      "tests/e2e/helpers/remote-skill-cloud-fixture.unit.test.ts": 457,
-      "tests/e2e/helpers/remote-terminal-source-range-contract-fixture.unit.test.ts": 58,
-      "tests/e2e/helpers/ssh-port-forward-snapshot-barrier.unit.test.ts": 111,
-      "tests/e2e/helpers/streaming-terminal-cleanup.unit.test.ts": 60,
-      "tests/e2e/host-cold-park-remote-subscriber.unit.test.ts": 4964,
-      "tests/e2e/host-guest-paint-retention-remote-viewer.unit.test.ts": 3411,
-      "tests/e2e/omp-child-session-recovery.unit.test.ts": 1708,
-      "tests/e2e/omp-retired-host-renderer.unit.test.ts": 2015,
-      "tests/e2e/omp-risk-remote-review.unit.test.ts": 770,
-      "tests/e2e/orca-restart-navigation.unit.test.ts": 936,
-      "tests/e2e/orchestration-run-pagination.unit.test.ts": 41,
-      "tests/e2e/paced-terminal-typing.unit.test.ts": 746,
-      "tests/e2e/paired-runtime-rejected-input-remount.unit.test.ts": 2177,
-      "tests/e2e/remote-agent-completion-authority.unit.test.ts": 1468,
-      "tests/e2e/remote-terminal-tab-retirement.unit.test.ts": 2188,
-      "tests/e2e/restored-terminal-input-readiness.unit.test.ts": 90,
-      "tests/e2e/runtime-graph-publication-probe.unit.test.ts": 62,
-      "tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts": 12319,
-      "tests/e2e/session-tabs-empty-inventory-daemon-oracle.unit.test.ts": 844,
-      "tests/e2e/session-tabs-rich-status-boundaries.unit.test.ts": 3408,
-      "tests/e2e/ssh-browser-network-execution-route.docker.unit.test.ts": 215,
-      "tests/e2e/ssh-codex-replay-reply-probe.unit.test.ts": 49,
-      "tests/e2e/structured-agent-session-read-owner.unit.test.ts": 782,
-      "tests/e2e/structured-chat-owner-status-activation.unit.test.ts": 2048,
-      "tests/e2e/structured-native-chat-routing-authority.unit.test.ts": 366,
-      "tests/e2e/sustained-agent-typing-load-scripts.unit.test.ts": 2209,
-      "tests/e2e/terminal-binding-crash-hydration.unit.test.ts": 1422,
-      "tests/e2e/terminal-foreground-confirmation.unit.test.ts": 274,
-      "tests/e2e/terminal-perf-presentation.unit.test.ts": 98,
-      "tests/e2e/terminal-probe-input-sequence.unit.test.ts": 37,
-      "tests/e2e/terminal-split-activation-latency-artifact.unit.test.ts": 57,
+      "tests/e2e/helpers/electron-main-evaluate-retry.unit.test.ts": 2464,
+      "tests/e2e/helpers/electron-process-shutdown.unit.test.ts": 60,
+      "tests/e2e/helpers/fake-agent-command-override.unit.test.ts": 35,
+      "tests/e2e/helpers/fake-agent-paste-end-scanner.unit.test.ts": 79,
+      "tests/e2e/helpers/git-status-retry-barrier.unit.test.ts": 57,
+      "tests/e2e/helpers/golden-source-control.unit.test.ts": 640,
+      "tests/e2e/helpers/headless-paired-runtime-serve-readiness.unit.test.ts": 59,
+      "tests/e2e/helpers/nested-runtime-proxy-jump-fixture.unit.test.ts": 30,
+      "tests/e2e/helpers/paired-client-runtime-environment.unit.test.ts": 82,
+      "tests/e2e/helpers/paired-client-window-reveal.unit.test.ts": 67,
+      "tests/e2e/helpers/persisted-profile-state.unit.test.ts": 356,
+      "tests/e2e/helpers/remote-skill-cloud-fixture.unit.test.ts": 328,
+      "tests/e2e/helpers/remote-terminal-source-range-contract-fixture.unit.test.ts": 46,
+      "tests/e2e/helpers/ssh-port-forward-snapshot-barrier.unit.test.ts": 107,
+      "tests/e2e/helpers/streaming-terminal-cleanup.unit.test.ts": 51,
+      "tests/e2e/host-cold-park-remote-subscriber.unit.test.ts": 5055,
+      "tests/e2e/host-guest-paint-retention-remote-viewer.unit.test.ts": 3075,
+      "tests/e2e/omp-child-session-recovery.unit.test.ts": 1630,
+      "tests/e2e/omp-retired-host-renderer.unit.test.ts": 2215,
+      "tests/e2e/omp-risk-remote-review.unit.test.ts": 816,
+      "tests/e2e/orca-restart-navigation.unit.test.ts": 622,
+      "tests/e2e/orchestration-run-pagination.unit.test.ts": 52,
+      "tests/e2e/paced-terminal-typing.unit.test.ts": 656,
+      "tests/e2e/paired-runtime-rejected-input-remount.unit.test.ts": 2375,
+      "tests/e2e/remote-agent-completion-authority.unit.test.ts": 1540,
+      "tests/e2e/remote-terminal-tab-retirement.unit.test.ts": 4050,
+      "tests/e2e/restored-terminal-input-readiness.unit.test.ts": 57,
+      "tests/e2e/runtime-graph-publication-probe.unit.test.ts": 40,
+      "tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts": 3808,
+      "tests/e2e/session-tabs-empty-inventory-daemon-oracle.unit.test.ts": 775,
+      "tests/e2e/session-tabs-rich-status-boundaries.unit.test.ts": 1914,
+      "tests/e2e/ssh-browser-network-execution-route.docker.unit.test.ts": 287,
+      "tests/e2e/ssh-codex-replay-reply-probe.unit.test.ts": 53,
+      "tests/e2e/structured-agent-session-read-owner.unit.test.ts": 739,
+      "tests/e2e/structured-chat-owner-status-activation.unit.test.ts": 1707,
+      "tests/e2e/structured-native-chat-routing-authority.unit.test.ts": 214,
+      "tests/e2e/sustained-agent-typing-load-scripts.unit.test.ts": 2194,
+      "tests/e2e/terminal-binding-crash-hydration.unit.test.ts": 920,
+      "tests/e2e/terminal-foreground-confirmation.unit.test.ts": 196,
+      "tests/e2e/terminal-perf-presentation.unit.test.ts": 44,
+      "tests/e2e/terminal-probe-input-sequence.unit.test.ts": 53,
+      "tests/e2e/terminal-split-activation-latency-artifact.unit.test.ts": 53,
       "tests/e2e/terminal-split-activation-latency-report.unit.test.ts": 68,
-      "tests/tools/omp-close-lifecycle.test.mjs": 235,
-      "tests/tools/omp-config-root-local-shell.test.mjs": 211,
-      "tests/tools/omp-config-root-relay-shell.test.mjs": 102,
-      "tests/tools/omp-relay-close-lifecycle.test.mjs": 353,
-      "tests/tools/relay-bench/phone-e2ee-desktop-parity.test.mjs": 118,
-      "tests/tools/relay-bench/region-probe-replay.test.mjs": 106,
-      "tests/tools/relay-bench/relay-bench-invocation.test.mjs": 84,
-      "tests/tools/relay-bench/relay-bench-state-file.test.mjs": 66,
-      "tests/tools/relay-bench/relay-phone-connect-bench.test.mjs": 106,
-      "tests/tools/win-update-e2e/app-driver.test.mjs": 753,
-      "tests/tools/windows-pty-native-capability-smoke/packaged-node-pty-capability-oracle.test.mjs": 61,
-      "tests/tools/windows-pty-native-capability-smoke/packaged-node-pty-capability-probe.test.mjs": 108,
-      "tests/tools/windows-pty-native-capability-smoke/run.test.mjs": 53
+      "tests/tools/omp-close-lifecycle.test.mjs": 255,
+      "tests/tools/omp-config-root-local-shell.test.mjs": 196,
+      "tests/tools/omp-config-root-relay-shell.test.mjs": 169,
+      "tests/tools/omp-relay-close-lifecycle.test.mjs": 329,
+      "tests/tools/relay-bench/phone-e2ee-desktop-parity.test.mjs": 126,
+      "tests/tools/relay-bench/region-probe-replay.test.mjs": 134,
+      "tests/tools/relay-bench/relay-bench-invocation.test.mjs": 94,
+      "tests/tools/relay-bench/relay-bench-state-file.test.mjs": 52,
+      "tests/tools/relay-bench/relay-phone-connect-bench.test.mjs": 134,
+      "tests/tools/win-update-e2e/app-driver.test.mjs": 671,
+      "tests/tools/win-update-e2e/app-shutdown.test.mjs": 656,
+      "tests/tools/windows-pty-native-capability-smoke/packaged-node-pty-capability-oracle.test.mjs": 46,
+      "tests/tools/windows-pty-native-capability-smoke/packaged-node-pty-capability-probe.test.mjs": 89,
+      "tests/tools/windows-pty-native-capability-smoke/run.test.mjs": 32
     }
   },
   "e2e": {
diff --git a/config/scripts/ci-shard-timings.md b/config/scripts/ci-shard-timings.md
index 738751c0a7fb..db79660a1837 100644
--- a/config/scripts/ci-shard-timings.md
+++ b/config/scripts/ci-shard-timings.md
@@ -46,9 +46,25 @@ age as specs change. Full CI runs on the existing runner classes are required to
 measure elapsed-time and occupancy improvements, including discovery overhead.
 No retries, assertions, coverage exclusions, runner classes or shard counts changed.
 
-## Unit refresh: September 26, 2026
+## Current unit refresh: September 27, 2026
 
-The current baseline imports all eight successful unit shards from
+The baseline imports every successful Node 24 shard from
+[run 36294142683, attempt 1](https://github.com/stablyai/orca/actions/runs/36294142683/attempts/1).
+The recorded checkout was `cc35c1b422e9c20197bc59aa27a71019ffc18b5b`, with Node
+24.21.0 and unchanged Linux workers. All 9,847 report entries match their saved
+assignments and current discovery exactly once, with no unhandled errors. The old
+baseline lacked 165 files and retained one deleted path. The E2E weights are unchanged.
+
+Using these measurements for both assignments, the maximum projected load falls
+from 1,043.811 to 919.695 worker-seconds (11.9%); each shard selects 1,230–1,231 files.
+Observed source-run test steps ranged from 282 to 429 seconds. The fastest runner's
+common-file durations were broadly lower than its prior measurements, so runner
+variation may contribute to that spread. The projection does not establish a
+hosted wall-clock improvement. No worker, shard-count, or algorithm change is made.
+
+## Previous unit refresh: September 26, 2026
+
+The previous baseline imported all eight successful unit shards from
 [run 36221874572, attempt 1](https://github.com/stablyai/orca/actions/runs/36221874572/attempts/1).
 They ran Node **24.21.0** on `ubuntu-latest` with Vitest's default Linux worker
 count and isolation. The checked-out merge was
diff --git a/config/scripts/ci-unit-dependency-graph.mjs b/config/scripts/ci-unit-dependency-graph.mjs
new file mode 100644
index 000000000000..f491c1749ded
--- /dev/null
+++ b/config/scripts/ci-unit-dependency-graph.mjs
@@ -0,0 +1,84 @@
+import { globSync, readFileSync } from 'node:fs'
+import { posix, join } from 'node:path'
+import ts from 'typescript-api'
+
+const EXTENSIONS = [
+  '',
+  '.ts',
+  '.tsx',
+  '.mjs',
+  '.js',
+  '.cjs',
+  '.json',
+  '/index.ts',
+  '/index.tsx',
+  '/index.js'
+]
+const INDIRECT_INPUT =
+  /\b(?:readFile\w*|readdir\w*|glob\w*|spawn\w*|execFile\w*|execSync|runProcess\w*|fork|Worker)\b|\bimport\s*\(\s*[^'"\s]|\brequire\s*\(\s*[^'"\s]|\bnew\s+URL\s*\(/
+
+function localPath(file, specifier) {
+  if (specifier.startsWith('.')) {
+    return posix.join(posix.dirname(file), specifier)
+  }
+  if (specifier.startsWith('@renderer/')) {
+    return `src/renderer/src/${specifier.slice(10)}`
+  }
+  if (specifier.startsWith('@/')) {
+    return `src/renderer/src/${specifier.slice(2)}`
+  }
+  return null
+}
+
+export function buildUnitDependencyGraph(sources) {
+  const reverse = new Map()
+  const opaque = new Set()
+  for (const [file, source] of sources) {
+    if (INDIRECT_INPUT.test(source) || file.startsWith('config/') || file.startsWith('tests/')) {
+      opaque.add(file)
+    }
+    for (const imported of ts.preProcessFile(source, true, true).importedFiles) {
+      const path = localPath(file, imported.fileName)
+      if (path === null) {
+        continue
+      }
+      const resolved = EXTENSIONS.map((extension) => path + extension).find((candidate) =>
+        sources.has(candidate)
+      )
+      if (!resolved) {
+        opaque.add(file)
+        continue
+      }
+      if (!reverse.has(resolved)) {
+        reverse.set(resolved, new Set())
+      }
+      reverse.get(resolved).add(file)
+    }
+  }
+  return { reverse, opaque }
+}
+
+export function collectUnitDependencyGraph(root = process.cwd()) {
+  const files = globSync(
+    [
+      'src/**/*.{ts,tsx,js,mjs,cjs,json}',
+      'config/**/*.{ts,tsx,js,mjs,cjs,json}',
+      'tests/**/*.{ts,tsx,js,mjs,cjs,json}'
+    ],
+    { cwd: root }
+  )
+  const sources = new Map(
+    files.map((file) => [file.replaceAll('\\', '/'), readFileSync(join(root, file), 'utf8')])
+  )
+  return { ...buildUnitDependencyGraph(sources), files: new Set(sources.keys()) }
+}
+
+export function unitConsumers(seeds, reverse) {
+  const result = new Set(seeds)
+  for (const file of result) {
+    for (const consumer of reverse.get(file) ?? []) {
+      result.add(consumer)
+    }
+  }
+  return result
+}
diff --git a/config/scripts/ci-unit-files.mjs b/config/scripts/ci-unit-files.mjs
new file mode 100644
index 000000000000..ab8d5038aed9
--- /dev/null
+++ b/config/scripts/ci-unit-files.mjs
@@ -0,0 +1,42 @@
+import { globSync } from 'node:fs'
+import { defaultExclude } from 'vitest/config'
+
+export const UNIT_INCLUDE = [
+  'src/**/*.test.ts',
+  'src/**/*.test.tsx',
+  'config/scripts/**/*.test.ts',
+  'config/scripts/**/*.test.mjs',
+  'tests/tools/**/*.test.mjs',
+  'tests/e2e/**/*.unit.test.ts'
+]
+
+export const UNIT_EXCLUDE = [
+  ...defaultExclude,
+  'src/main/daemon/repro-13767-shell-ready-marker-lost-to-exec.test.ts',
+  'src/main/daemon/shell-ready.test.ts',
+  'src/main/daemon/node-pty-fd-leak.test.ts',
+  'src/main/providers/local-pty-shell-ready-zsh-launch-environment.test.ts',
+  'src/main/providers/__tests__/shell-ready-framework-example.test.ts',
+  'src/main/pty/omp-shell-wrapper-alias-safety.test.ts',
+  'src/main/pty/omp-shell-wrapper.node-pty.test.ts',
+  'src/main/shell-startup-feature-channel.test.ts',
+  'src/main/terminal-history-fish-session.node-pty.test.ts',
+  'src/main/zsh-scoped-histfile.live-shell.test.ts',
+  'src/main/zsh-startup-hook-user-config-equivalence.live-shell.test.ts',
+  'src/main/zsh-wrapper-version-mismatch.live-shell.test.ts',
+  'src/main/runtime/structured-session-cli-login-shell.live-shell.test.ts',
+  'src/renderer/src/components/terminal-pane/fish-color-scheme-child-stdin.node-pty.test.ts',
+  'src/shared/fish-query-reply-child-stdin.node-pty.test.ts',
+  'src/shared/pty-reply-echo-shapes.node-pty.test.ts',
+  'src/shared/startup-shell-portability.live-shell.test.ts',
+  'src/shared/posix-command-path-lookup.test.ts',
+  'tests/e2e/relay-region-compatibility.unit.test.ts',
+  'tests/e2e/relay-region-correction.unit.test.ts',
+  'tests/e2e/cross-version-wire/**'
+]
+
+export function discoverUnitFiles(root = process.cwd()) {
+  return globSync(UNIT_INCLUDE, { cwd: root, exclude: UNIT_EXCLUDE })
+    .map((file) => file.replaceAll('\\', '/'))
+    .sort()
+}
diff --git a/config/scripts/ci-unit-plan.mjs b/config/scripts/ci-unit-plan.mjs
new file mode 100644
index 000000000000..db7a13070d01
--- /dev/null
+++ b/config/scripts/ci-unit-plan.mjs
@@ -0,0 +1,63 @@
+import { appendFileSync, readFileSync } from 'node:fs'
+import { pathToFileURL } from 'node:url'
+import { runProcessSync } from './script-child-process.mjs'
+import { collectUnitDependencyGraph } from './ci-unit-dependency-graph.mjs'
+import { discoverUnitFiles } from './ci-unit-files.mjs'
+import { FULL_SHARD_COUNT, planUnitSelection } from './ci-unit-selection.mjs'
+import { readTimingBaseline, writeAssignment } from './ci-shard-assignment.mjs'
+
+export function prepareUnitPlan(env = process.env) {
+  const files = discoverUnitFiles()
+  let plan
+  try {
+    const event = JSON.parse(readFileSync(env.GITHUB_EVENT_PATH, 'utf8'))
+    if (env.GITHUB_EVENT_NAME !== 'pull_request') {
+      throw new Error('Full reference run')
+    }
+    const diff = runProcessSync({
+      program: 'git',
+      args: ['diff', '--name-only', '--no-renames', '-z', 'HEAD^1', 'HEAD'],
+      maxOutputBytes: 16 * 1024 * 1024
+    })
+    if (diff.code !== 0 || diff.timedOut) {
+      throw new Error('Changed paths unavailable')
+    }
+    plan = planUnitSelection({
+      files,
+      changed: diff.stdout.split('\0').filter(Boolean),
+      graph: collectUnitDependencyGraph(),
+      timings: readTimingBaseline('unit').timings,
+      event,
+      mode: env.ORCA_UNIT_SELECTION_MODE
+    })
+  } catch (error) {
+    plan = {
+      version: 1,
+      mode: 'shadow',
+      selectionAvailable: false,
+      reason: String(error),
+      files,
+      candidateFiles: files,
+      executionFiles: files,
+      shards: Array.from({ length: FULL_SHARD_COUNT }, (_, index) => ({
+        index: index + 1,
+        count: FULL_SHARD_COUNT
+      }))
+    }
+  }
+  writeAssignment('ci-shards/unit-selection.json', plan)
+  if (env.GITHUB_OUTPUT) {
+    appendFileSync(env.GITHUB_OUTPUT, `shards=${JSON.stringify(plan.shards)}\n`)
+  }
+  if (env.GITHUB_STEP_SUMMARY) {
+    appendFileSync(
+      env.GITHUB_STEP_SUMMARY,
+      `Unit selection: **${plan.mode}**; ${plan.candidateFiles.length}/${files.length} candidate files; ${plan.shards.length} execution shards. ${plan.reason}\n`
+    )
+  }
+  return plan
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  prepareUnitPlan()
+}
diff --git a/config/scripts/ci-unit-plan.test.mjs b/config/scripts/ci-unit-plan.test.mjs
new file mode 100644
index 000000000000..eda7903ae1de
--- /dev/null
+++ b/config/scripts/ci-unit-plan.test.mjs
@@ -0,0 +1,79 @@
+import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { expect, it } from 'vitest'
+import { runProcessSync } from './script-child-process.mjs'
+import { FULL_SHARD_COUNT } from './ci-unit-selection.mjs'
+
+it.each([true, false])(
+  'plans from a real Git diff, with parent evidence available: %s',
+  (withParent) => {
+    const root = mkdtempSync(join(tmpdir(), 'orca-unit-plan-'))
+    const git = (args) => {
+      const result = runProcessSync({ program: 'git', args, cwd: root })
+      expect(result.code, result.stderr).toBe(0)
+      return result.stdout.trim()
+    }
+    try {
+      mkdirSync(join(root, 'src'))
+      writeFileSync(join(root, 'src/value.ts'), 'export const value = 1')
+      writeFileSync(join(root, 'src/consumer.test.ts'), "import './value'")
+      writeFileSync(join(root, 'src/unrelated.test.ts'), 'export const unrelated = true')
+      git(['init', '--quiet'])
+      git(['add', 'src'])
+      const commit = [
+        '-c',
+        'user.name=CI Test',
+        '-c',
+        'user.email=ci-test@example.invalid',
+        '-c',
+        'commit.gpgsign=false',
+        'commit',
+        '--quiet',
+        '-m',
+        'fixture'
+      ]
+      git(commit)
+      if (withParent) {
+        writeFileSync(join(root, 'src/value.ts'), 'export const value = 2')
+        git(['add', 'src'])
+        git(commit)
+      }
+      const sourceSha = git(['rev-parse', 'HEAD'])
+      const eventPath = join(root, 'event.json')
+      writeFileSync(eventPath, JSON.stringify({ pull_request: { draft: true } }))
+      const result = runProcessSync({
+        program: process.execPath,
+        args: [fileURLToPath(new URL('./ci-unit-plan.mjs', import.meta.url))],
+        cwd: root,
+        env: {
+          ...process.env,
+          ORCA_BACKGROUND_LAUNCH: '1',
+          ORCA_UNIT_SELECTION_MODE: 'selected',
+          GITHUB_EVENT_NAME: 'pull_request',
+          GITHUB_EVENT_PATH: eventPath,
+          GITHUB_SHA: sourceSha,
+          ORCA_SHARD_SOURCE_SHA: sourceSha,
+          GITHUB_OUTPUT: join(root, 'outputs'),
+          GITHUB_STEP_SUMMARY: join(root, 'summary')
+        }
+      })
+      expect(result.code, result.stderr).toBe(0)
+      const plan = JSON.parse(readFileSync(join(root, 'ci-shards/unit-selection.json'), 'utf8'))
+      expect(plan.sourceSha).toBe(sourceSha)
+      expect(plan.mode).toBe(withParent ? 'selected' : 'shadow')
+      expect(plan.executionFiles).toEqual(
+        withParent ? ['src/consumer.test.ts'] : ['src/consumer.test.ts', 'src/unrelated.test.ts']
+      )
+      expect(plan.reason).toBe(
+        withParent
+          ? 'Transitive imports plus indirect-input consumers'
+          : 'Error: Changed paths unavailable'
+      )
+      expect(plan.shards).toHaveLength(withParent ? 1 : FULL_SHARD_COUNT)
+    } finally {
+      rmSync(root, { recursive: true, force: true })
+    }
+  }
+)
diff --git a/config/scripts/ci-unit-selection-review.mjs b/config/scripts/ci-unit-selection-review.mjs
new file mode 100644
index 000000000000..ae976a064286
--- /dev/null
+++ b/config/scripts/ci-unit-selection-review.mjs
@@ -0,0 +1,113 @@
+import { appendFileSync, globSync, readFileSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+
+export function reviewUnitSelection(records) {
+  const groups = new Map()
+  for (const { plan, timing } of records) {
+    const key = JSON.stringify([
+      timing.sourceSha,
+      timing.runId,
+      timing.runAttempt,
+      timing.nodeVersion
+    ])
+    if (!groups.has(key)) {
+      groups.set(key, [])
+    }
+    groups.get(key).push({ plan, timing })
+  }
+  return [...groups.values()].map((group) => {
+    const { plan, timing: first } = group[0]
+    const selected = new Set(plan.candidateFiles)
+    const files = new Set()
+    const shards = new Set()
+    const missedFailures = []
+    let invalid = false
+    let omittedMs = 0
+    let totalMs = 0
+    for (const { plan: other, timing } of group) {
+      invalid ||=
+        JSON.stringify(other) !== JSON.stringify(plan) ||
+        !first.sourceSha ||
+        plan.sourceSha !== first.sourceSha ||
+        timing.unhandledErrors !== 0 ||
+        !['passed', 'failed'].includes(timing.status) ||
+        timing.shard.count !== first.shard.count ||
+        shards.has(timing.shard.index) ||
+        timing.shard.index < 1 ||
+        timing.shard.index > first.shard.count
+      shards.add(timing.shard.index)
+      for (const [file, duration] of Object.entries(timing.timings)) {
+        invalid ||=
+          files.has(file) ||
+          !Number.isFinite(duration) ||
+          duration <= 0 ||
+          !['passed', 'failed', 'skipped'].includes(timing.results?.[file])
+        files.add(file)
+        totalMs += duration
+        if (!selected.has(file)) {
+          omittedMs += duration
+          if (timing.results?.[file] === 'failed') {
+            missedFailures.push(file)
+          }
+        }
+      }
+    }
+    const complete =
+      !invalid &&
+      shards.size === first.shard.count &&
+      JSON.stringify([...files].sort()) === JSON.stringify([...plan.files].sort())
+    return {
+      sourceSha: first.sourceSha,
+      runId: first.runId,
+      runAttempt: first.runAttempt,
+      nodeVersion: first.nodeVersion,
+      mode: plan.mode,
+      completeFullRun: complete && plan.mode === 'shadow',
+      selectionEvaluated: complete && plan.mode === 'shadow' && plan.selectionAvailable === true,
+      reason: plan.reason,
+      missedFailures,
+      files: files.size,
+      candidateFiles: selected.size,
+      measuredWorkerMs: totalMs,
+      potentiallyOmittedWorkerMs: omittedMs
+    }
+  })
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  const directory = process.argv[2]
+  if (!directory) {
+    throw new Error('Usage: ci-unit-selection-review.mjs ARTIFACT_DIRECTORY')
+  }
+  const records = globSync('**/unit-timings.json', { cwd: directory }).map((file) => {
+    const timing = JSON.parse(readFileSync(join(directory, file), 'utf8'))
+    const plan = JSON.parse(
+      readFileSync(
+        join(directory, file.replace('unit-timings.json', 'unit-selection.json')),
+        'utf8'
+      )
+    )
+    return { timing, plan }
+  })
+  if (!records.length) {
+    throw new Error('No unit selection evidence')
+  }
+  const review = reviewUnitSelection(records)
+  writeFileSync(join(directory, 'selection-review.json'), `${JSON.stringify(review, null, 2)}\n`)
+  const summary = [
+    '## Unit selection evidence',
+    '',
+    ...review.map(
+      (row) =>
+        `- Node ${row.nodeVersion}: ${row.completeFullRun ? 'complete full reference' : 'incomplete or selected evidence'}; ${row.selectionEvaluated ? 'selection evaluated' : 'not selection-validation evidence'}; ${row.candidateFiles}/${row.files} candidate files; ${row.missedFailures.length} failures outside selection; ${(row.potentiallyOmittedWorkerMs / 60_000).toFixed(1)} potentially omitted worker-minutes. ${row.reason ?? ''}`
+    ),
+    '',
+    'Worker time overlaps across processes; it is not runner time. Promote only after representative complete references show no missed failures.',
+    ''
+  ].join('\n')
+  if (process.env.GITHUB_STEP_SUMMARY) {
+    appendFileSync(process.env.GITHUB_STEP_SUMMARY, summary)
+  }
+  console.log(summary)
+}
diff --git a/config/scripts/ci-unit-selection-review.test.mjs b/config/scripts/ci-unit-selection-review.test.mjs
new file mode 100644
index 000000000000..ff8f4c385687
--- /dev/null
+++ b/config/scripts/ci-unit-selection-review.test.mjs
@@ -0,0 +1,55 @@
+import { expect, it } from 'vitest'
+import { reviewUnitSelection } from './ci-unit-selection-review.mjs'
+
+const plan = {
+  sourceSha: 'sha',
+  mode: 'shadow',
+  selectionAvailable: true,
+  files: ['a', 'b'],
+  candidateFiles: ['a']
+}
+
+it('does not present full fallback runs as selection-validation evidence', () => {
+  const records = [record(1, 'a', 'passed'), record(2, 'b', 'passed')].map((row) => ({
+    ...row,
+    plan: { ...plan, selectionAvailable: false }
+  }))
+  expect(reviewUnitSelection(records)[0]).toMatchObject({
+    completeFullRun: true,
+    selectionEvaluated: false
+  })
+})
+const record = (index, file, state) => ({
+  plan,
+  timing: {
+    sourceSha: 'sha',
+    runId: '1',
+    runAttempt: '1',
+    nodeVersion: '24',
+    status: state,
+    unhandledErrors: 0,
+    shard: { index, count: 2 },
+    timings: { [file]: 100 },
+    results: { [file]: state }
+  }
+})
+
+it('finds omitted failures in a complete failing reference run', () => {
+  expect(
+    reviewUnitSelection([record(1, 'a', 'passed'), record(2, 'b', 'failed')])[0]
+  ).toMatchObject({ completeFullRun: true, missedFailures: ['b'], potentiallyOmittedWorkerMs: 100 })
+})
+
+it('does not call incomplete, duplicate, interrupted or selected evidence a full reference', () => {
+  const a = record(1, 'a', 'passed'),
+    b = record(2, 'b', 'passed')
+  for (const rows of [
+    [a],
+    [a, a],
+    [a, { ...b, timing: { ...b.timing, unhandledErrors: 1 } }],
+    [a, { ...b, timing: { ...b.timing, status: 'interrupted' } }],
+    [a, b].map((row) => ({ ...row, plan: { ...plan, mode: 'selected' } }))
+  ]) {
+    expect(reviewUnitSelection(rows).every((row) => !row.completeFullRun)).toBe(true)
+  }
+})
diff --git a/config/scripts/ci-unit-selection.mjs b/config/scripts/ci-unit-selection.mjs
new file mode 100644
index 000000000000..841bad422e70
--- /dev/null
+++ b/config/scripts/ci-unit-selection.mjs
@@ -0,0 +1,68 @@
+import { unitConsumers } from './ci-unit-dependency-graph.mjs'
+import { balanceFiles } from './ci-shard-assignment.mjs'
+
+export function selectUnitFiles(files, changed, graph) {
+  const full = (reason) => ({ files, reason, full: true })
+  if (!changed.length) {
+    return full('Missing changed-path evidence')
+  }
+  if (changed.some((file) => !file.startsWith('src/') || !graph.files.has(file))) {
+    return full('Global, deleted, renamed or unknown input')
+  }
+  for (const file of changed) {
+    const consumers = unitConsumers([file], graph.reverse)
+    if (!files.some((test) => consumers.has(test))) {
+      return full('No proven test coverage for changed inputs')
+    }
+  }
+  const affected = unitConsumers([...changed, ...graph.opaque], graph.reverse)
+  const selected = files.filter((file) => affected.has(file))
+  if (!selected.length) {
+    return full('No proven test coverage for changed inputs')
+  }
+  return {
+    files: selected,
+    reason: 'Transitive imports plus indirect-input consumers',
+    full: false
+  }
+}
+
+// A concurrency slot is charged per job, not per core, so eight 6.5-minute shards cost eight of
+// the account's slots and made the unit matrix 68% of daily slot demand. Against the checked-in
+// baseline, five shards each carry 24.7 test-minutes over four workers plus ~2.6 minutes of fixed
+// setup, so ~8.8 minutes -- less than the 10.5-minute p95 queue the oversharding was causing.
+export const FULL_SHARD_COUNT = 5
+
+export function planUnitSelection({ files, changed, graph, timings, event, mode = 'shadow' }) {
+  const candidate = selectUnitFiles(files, changed, graph)
+  const selected = mode === 'selected' && event?.pull_request?.draft === true && !candidate.full
+  const executionFiles = selected ? candidate.files : files
+  const totalMs = balanceFiles(executionFiles, 1, timings).shards[0].durationMs
+  const count = selected
+    ? Math.max(1, Math.min(FULL_SHARD_COUNT, Math.ceil(totalMs / 900_000), executionFiles.length))
+    : FULL_SHARD_COUNT
+  return {
+    version: 1,
+    mode: selected ? 'selected' : 'shadow',
+    selectionAvailable: !candidate.full,
+    reason: candidate.reason,
+    files,
+    candidateFiles: candidate.files,
+    executionFiles,
+    shards: Array.from({ length: count }, (_, index) => ({ index: index + 1, count }))
+  }
+}
+
+export function auditUnitSelection(plan, results) {
+  const candidates = new Set(plan.candidateFiles)
+  const omittedFailures = Object.entries(results)
+    .filter(([file, state]) => state === 'failed' && !candidates.has(file))
+    .map(([file]) => file)
+  return {
+    mode: plan.mode,
+    discovered: plan.files.length,
+    candidate: candidates.size,
+    executed: Object.keys(results).length,
+    omittedFailures
+  }
+}
diff --git a/config/scripts/ci-unit-selection.test.mjs b/config/scripts/ci-unit-selection.test.mjs
new file mode 100644
index 000000000000..69370a675f6e
--- /dev/null
+++ b/config/scripts/ci-unit-selection.test.mjs
@@ -0,0 +1,108 @@
+import { describe, expect, it } from 'vitest'
+import { buildUnitDependencyGraph } from './ci-unit-dependency-graph.mjs'
+import {
+  FULL_SHARD_COUNT,
+  auditUnitSelection,
+  planUnitSelection,
+  selectUnitFiles
+} from './ci-unit-selection.mjs'
+
+const sources = new Map(
+  Object.entries({
+    'src/leaf.ts': 'export const value = 1',
+    'src/forward.ts': `export * from './leaf'`,
+    'src/consumer.test.ts': `import './forward'`,
+    'src/dynamic.test.ts': `import('./leaf')`,
+    'src/require.test.ts': `require('./leaf')`,
+    'src/scan.test.ts': `import { readFileSync } from 'node:fs'; readFileSync('src/leaf.ts')`,
+    'src/indirect.ts': `import(pathFromSettings)`,
+    'src/indirect.test.ts': `import './indirect'`,
+    'src/unrelated.test.ts': 'export const test = 1',
+    'src/renderer/src/view.tsx': 'export const value = 1',
+    'src/view.test.ts': `import '@renderer/view'; import '@/view'`
+  })
+)
+const graph = { ...buildUnitDependencyGraph(sources), files: new Set(sources.keys()) }
+const files = [...sources.keys()].filter((file) => file.endsWith('.test.ts')).sort()
+
+describe('conservative unit selection', () => {
+  it('follows re-exports, literal dynamic imports and requires, retaining indirect readers', () => {
+    expect(selectUnitFiles(files, ['src/leaf.ts'], graph).files).toEqual([
+      'src/consumer.test.ts',
+      'src/dynamic.test.ts',
+      'src/indirect.test.ts',
+      'src/require.test.ts',
+      'src/scan.test.ts'
+    ])
+  })
+
+  it('resolves renderer aliases and changed tests without executing their source', () => {
+    expect(selectUnitFiles(files, ['src/renderer/src/view.tsx'], graph).files).toContain(
+      'src/view.test.ts'
+    )
+    expect(selectUnitFiles(files, ['src/unrelated.test.ts'], graph).files).toContain(
+      'src/unrelated.test.ts'
+    )
+  })
+
+  it('does not mistake unrelated opaque readers for coverage of a new entry point', () => {
+    const uncovered = { ...graph, files: new Set([...graph.files, 'src/entry.ts']) }
+    expect(selectUnitFiles(files, ['src/entry.ts'], uncovered)).toMatchObject({ full: true, files })
+  })
+
+  it.each(
+    [
+      [],
+      ['src/deleted.ts'],
+      ['src/deleted.ts', 'src/leaf.ts'],
+      ['pnpm-lock.yaml'],
+      ['config/vitest.config.ts']
+    ].map((changed) => ({ changed }))
+  )('runs everything for incomplete/global evidence: $changed', ({ changed }) => {
+    expect(selectUnitFiles(files, changed, graph)).toMatchObject({ files, full: true })
+  })
+
+  it('keeps full coverage by default and on every non-draft commit', () => {
+    const base = { files, changed: ['src/leaf.ts'], graph, timings: {} }
+    for (const event of [
+      {},
+      { pull_request: { draft: false } },
+      { pull_request: { draft: true } }
+    ]) {
+      expect(planUnitSelection({ ...base, event }).executionFiles).toEqual(files)
+    }
+    expect(
+      planUnitSelection({ ...base, mode: 'selected', event: { pull_request: { draft: false } } })
+        .executionFiles
+    ).toEqual(files)
+    const selected = planUnitSelection({
+      ...base,
+      mode: 'selected',
+      event: { pull_request: { draft: true } }
+    })
+    expect(selected.executionFiles).not.toContain('src/unrelated.test.ts')
+    expect(selected.shards).toEqual([{ index: 1, count: 1 }])
+  })
+
+  it('spends five concurrency slots on a full run', () => {
+    const plan = planUnitSelection({ files, changed: ['src/leaf.ts'], graph, timings: {} })
+    expect(plan.shards).toEqual(
+      Array.from({ length: FULL_SHARD_COUNT }, (_, index) => ({
+        index: index + 1,
+        count: FULL_SHARD_COUNT
+      }))
+    )
+    expect(FULL_SHARD_COUNT).toBe(5)
+  })
+
+  it('records failures that would have been missed while shadow runs remain full', () => {
+    const plan = planUnitSelection({ files, changed: ['src/leaf.ts'], graph, timings: {} })
+    expect(
+      auditUnitSelection(plan, {
+        'src/consumer.test.ts': 'failed',
+        'src/unrelated.test.ts': 'failed',
+        'src/view.test.ts': 'passed'
+      }).omittedFailures
+    ).toEqual(['src/unrelated.test.ts'])
+  })
+})
diff --git a/config/scripts/ci-unit-sequencer.mjs b/config/scripts/ci-unit-sequencer.mjs
index cd55b3343b26..6b580bdb0025 100644
--- a/config/scripts/ci-unit-sequencer.mjs
+++ b/config/scripts/ci-unit-sequencer.mjs
@@ -1,4 +1,5 @@
 import { relative } from 'node:path'
+import { readFileSync } from 'node:fs'
 import { BaseSequencer } from 'vitest/node'
 import { balanceFiles, readTimingBaseline, writeAssignment } from './ci-shard-assignment.mjs'
 
@@ -6,12 +7,46 @@ export default class TimingSequencer extends BaseSequencer {
   async shard(specs) {
     const { index, count } = this.ctx.config.shard
     const key = (spec) => relative(this.ctx.config.root, spec.moduleId).replaceAll('\\', '/')
+    let execution = specs
+    let selectionReason = 'Full suite: no verified selection plan'
+    try {
+      const plan = JSON.parse(
+        readFileSync(
+          process.env.ORCA_UNIT_SELECTION_PLAN ?? 'ci-shards/unit-selection.json',
+          'utf8'
+        )
+      )
+      if (
+        plan.version !== 1 ||
+        !plan.sourceSha ||
+        plan.sourceSha !== process.env.ORCA_SHARD_SOURCE_SHA ||
+        JSON.stringify([...plan.files].sort()) !== JSON.stringify(specs.map(key).sort()) ||
+        !Array.isArray(plan.executionFiles) ||
+        plan.executionFiles.some((file) => !plan.files.includes(file))
+      ) {
+        throw new Error('Selection provenance or discovery differs')
+      }
+      const allowed = new Set(plan.executionFiles)
+      if (allowed.size === 0) {
+        throw new Error('Empty execution selection')
+      }
+      execution = specs.filter((spec) => allowed.has(key(spec)))
+      selectionReason = plan.reason
+    } catch (error) {
+      console.log(`Running every discovered unit test: ${error.message}`)
+    }
     const baseline = readTimingBaseline('unit')
-    const assignment = balanceFiles(specs.map(key), count, baseline.timings, baseline.overheadMs)
+    const assignment = balanceFiles(
+      execution.map(key),
+      count,
+      baseline.timings,
+      baseline.overheadMs
+    )
     writeAssignment(process.env.ORCA_SHARD_MANIFEST ?? 'ci-shards/unit-assignment.json', {
       ...assignment,
       baselineSha256: baseline.baselineSha256,
-      selectedShard: index
+      selectedShard: index,
+      selectionReason
     })
     const selected = new Set(assignment.shards[index - 1].files)
     return specs.filter((spec) => selected.has(key(spec)))
diff --git a/config/scripts/ci-unit-sequencer.test.mjs b/config/scripts/ci-unit-sequencer.test.mjs
new file mode 100644
index 000000000000..931a3ccd1582
--- /dev/null
+++ b/config/scripts/ci-unit-sequencer.test.mjs
@@ -0,0 +1,44 @@
+import { mkdtempSync, writeFileSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, expect, it, vi } from 'vitest'
+import TimingSequencer from './ci-unit-sequencer.mjs'
+
+let root
+afterEach(() => {
+  vi.unstubAllEnvs()
+  if (root) {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+
+it.each(['valid', 'stale', 'missing-file', 'missing-artifact'])(
+  'preserves complete shard coverage with %s planning evidence',
+  async (kind) => {
+    root = mkdtempSync(join(tmpdir(), 'unit-sequencer-'))
+    const files = ['src/a.test.ts', 'src/b.test.ts', 'src/c.test.ts', 'src/d.test.ts']
+    const plan = {
+      version: 1,
+      sourceSha: kind === 'stale' ? 'old' : 'current',
+      files: kind === 'missing-file' ? files.slice(1) : files,
+      executionFiles: files.slice(0, 2)
+    }
+    const planPath = join(root, 'selection.json')
+    if (kind !== 'missing-artifact') {
+      writeFileSync(planPath, JSON.stringify(plan))
+    }
+    vi.stubEnv('ORCA_UNIT_SELECTION_PLAN', planPath)
+    vi.stubEnv('ORCA_SHARD_SOURCE_SHA', 'current')
+    vi.stubEnv('ORCA_SHARD_MANIFEST', join(root, 'assignment.json'))
+    const assigned = []
+    for (const index of [1, 2]) {
+      const sequencer = new TimingSequencer({ config: { root, shard: { index, count: 2 } } })
+      const specs = files.map((file) => ({ moduleId: join(root, file) }))
+      assigned.push(...(await sequencer.shard(specs)).map((spec) => spec.moduleId))
+    }
+    expect(assigned.sort()).toEqual(
+      (kind === 'valid' ? files.slice(0, 2) : files).map((file) => join(root, file)).sort()
+    )
+    expect(new Set(assigned).size).toBe(assigned.length)
+  }
+)
diff --git a/config/scripts/ci-unit-timing-reporter.mjs b/config/scripts/ci-unit-timing-reporter.mjs
index 58ccc8de768c..fa54aa1072af 100644
--- a/config/scripts/ci-unit-timing-reporter.mjs
+++ b/config/scripts/ci-unit-timing-reporter.mjs
@@ -1,5 +1,7 @@
 import { relative } from 'node:path'
+import { appendFileSync, readFileSync } from 'node:fs'
 import { writeAssignment } from './ci-shard-assignment.mjs'
+import { auditUnitSelection } from './ci-unit-selection.mjs'
 
 export function moduleDuration(diagnostic) {
   return Math.max(
@@ -20,12 +22,19 @@ export default class UnitTimingReporter {
   }
 
   onTestRunEnd(modules, errors, reason) {
+    const results = Object.fromEntries(
+      modules.map((module) => [
+        relative(this.ctx.config.root, module.moduleId).replaceAll('\\', '/'),
+        module.state?.() ?? 'unknown'
+      ])
+    )
     writeAssignment(process.env.ORCA_UNIT_TIMING_REPORT ?? 'ci-shards/unit-timings.json', {
       metric: 'module-duration-v1',
       nodeVersion: process.versions.node,
       shard: this.ctx.config.shard ?? { index: 1, count: 1 },
       status: reason,
       unhandledErrors: errors.length,
+      results,
       timings: Object.fromEntries(
         modules.map((module) => [
           relative(this.ctx.config.root, module.moduleId).replaceAll('\\', '/'),
@@ -33,5 +42,23 @@ export default class UnitTimingReporter {
         ])
       )
     })
+    try {
+      const plan = JSON.parse(
+        readFileSync(
+          process.env.ORCA_UNIT_SELECTION_PLAN ?? 'ci-shards/unit-selection.json',
+          'utf8'
+        )
+      )
+      const audit = auditUnitSelection(plan, results)
+      writeAssignment('ci-shards/unit-selection-audit.json', audit)
+      if (process.env.GITHUB_STEP_SUMMARY) {
+        appendFileSync(
+          process.env.GITHUB_STEP_SUMMARY,
+          `Unit selection (${audit.mode}): ${audit.candidate}/${audit.discovered} candidate files; ${audit.omittedFailures.length} failures outside selection.\n`
+        )
+      }
+    } catch {
+      // Timing evidence remains useful when selection planning was unavailable.
+    }
   }
 }
diff --git a/config/scripts/cli-main-module-bundle-parity.test.ts b/config/scripts/cli-main-module-bundle-parity.test.ts
deleted file mode 100644
index b545579facfe..000000000000
--- a/config/scripts/cli-main-module-bundle-parity.test.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { readFileSync, readdirSync } from 'node:fs'
-import { join, matchesGlob, resolve } from 'node:path'
-import { createRequire } from 'node:module'
-import { describe, expect, it } from 'vitest'
-import { electronViteConfig } from '../../electron.vite.config'
-import { GUARDED_ENTRY_NAMES } from '../build-plugins/plain-node-entry-guard'
-
-const REPO_ROOT = resolve(__dirname, '..', '..')
-const CLI_ROOT = join(REPO_ROOT, 'src', 'cli')
-const packaging = createRequire(import.meta.url)('../electron-builder.config.cjs')
-
-function listCliSourceFiles(dir: string): string[] {
-  return readdirSync(dir, { withFileTypes: true }).flatMap((entry) => {
-    const path = join(dir, entry.name)
-    if (entry.isDirectory()) {
-      return listCliSourceFiles(path)
-    }
-    return entry.isFile() && entry.name.endsWith('.ts') && !entry.name.endsWith('.test.ts')
-      ? [path]
-      : []
-  })
-}
-
-// Why: `import type` is erased by tsc, so it needs no emitted module at runtime.
-const VALUE_IMPORT_FROM_MAIN = /(?<!\btype\s)from '(?:\.\.\/)+main\/([^']+)'/g
-const DYNAMIC_IMPORT_FROM_MAIN = /import\(\s*['"](?:\.\.\/)+main\/([^'"]+)['"]\s*\)/g
-
-function findMainImports(): { file: string; module: string }[] {
-  return listCliSourceFiles(CLI_ROOT).flatMap((file) => {
-    const source = readFileSync(file, 'utf-8')
-    return [
-      ...source.matchAll(VALUE_IMPORT_FROM_MAIN),
-      ...source.matchAll(DYNAMIC_IMPORT_FROM_MAIN)
-    ].map((match) => ({
-      file: file.slice(REPO_ROOT.length + 1),
-      module: match[1].replace(/\.js$/, '')
-    }))
-  })
-}
-
-function findElectronViteMainEntries(): Record<string, string> {
-  const input = electronViteConfig.main?.build?.rollupOptions?.input
-  if (!input || typeof input !== 'object' || Array.isArray(input)) {
-    throw new Error('Expected named main-process inputs')
-  }
-  return input
-}
-
-describe('CLI imports of main-process modules', () => {
-  // Why: electron-vite cleans out/main and emits only its declared entries, so a
-  // `src/main/*` module the CLI imports but the config omits is deleted by the
-  // build that runs after `build:cli` — keep source-level feedback ahead of the
-  // final-artifact runtime verifier.
-  it('has an electron-vite entry for every main module the CLI imports', () => {
-    const entries = findElectronViteMainEntries()
-    const missing = findMainImports().filter(
-      ({ module }) => entries[module] !== join(REPO_ROOT, 'src', 'main', `${module}.ts`)
-    )
-
-    expect(missing).toEqual([])
-  })
-
-  it('guards every CLI main module against Electron imports', () => {
-    const guarded = new Set<string>(GUARDED_ENTRY_NAMES)
-    expect(findMainImports().filter(({ module }) => !guarded.has(module))).toEqual([])
-  })
-
-  it('unpacks every CLI main entry for plain Node outside Electron', () => {
-    const missing = findMainImports().filter(
-      ({ module }) =>
-        !packaging.asarUnpack.some((pattern: string) =>
-          matchesGlob(`out/main/${module}.js`, pattern)
-        )
-    )
-    expect(missing).toEqual([])
-  })
-
-  it('finds the imports it is meant to guard', () => {
-    // Why: a broken matcher would make the guard above vacuously pass.
-    expect(findMainImports()).toContainEqual({
-      file: join('src', 'cli', 'profile-state-location.ts'),
-      module: 'persistence/profile-state/profile-state-active-location'
-    })
-    expect(findMainImports()).toContainEqual({
-      file: join('src', 'cli', 'handlers', 'agent-hooks.ts'),
-      module: 'orca-profiles/profile-index-store'
-    })
-    expect(findMainImports().length).toBeGreaterThanOrEqual(2)
-    expect(Object.keys(findElectronViteMainEntries()).length).toBeGreaterThanOrEqual(2)
-  })
-})
diff --git a/config/scripts/cloud-security-history-workflow.test.mjs b/config/scripts/cloud-security-history-workflow.test.mjs
index 5c91ac95028d..fc28e55b9961 100644
--- a/config/scripts/cloud-security-history-workflow.test.mjs
+++ b/config/scripts/cloud-security-history-workflow.test.mjs
@@ -81,7 +81,9 @@ it('fetches both merge parents and deleted content without unrelated branches or
 it('completes history before scanning the same HEAD and Cloud paths', () => {
   expect(steps[0].with['fetch-depth']).toBe(1)
   expect(history['working-directory']).toBe('.')
-  const scanIndex = steps.findIndex((step) => step.run?.includes('gitleaks@'))
+  const scanIndex = steps.findIndex(
+    (step) => step.run?.includes('docker run') && step.run.includes('gitleaks@')
+  )
   expect(steps.indexOf(history)).toBeLessThan(scanIndex)
   expect(steps[scanIndex].run).toContain(
     '--log-opts="HEAD -- cloud :(glob).github/workflows/cloud-*.yml .github/actions/cloud-sql-rollout-lease"'
diff --git a/config/scripts/codex-index-heal-contract-workflow.test.mjs b/config/scripts/codex-index-heal-contract-workflow.test.mjs
index 62c9787a12e5..096c4b876a8a 100644
--- a/config/scripts/codex-index-heal-contract-workflow.test.mjs
+++ b/config/scripts/codex-index-heal-contract-workflow.test.mjs
@@ -34,4 +34,21 @@ describe('Codex index-heal contract PR gate', () => {
       'set -euo pipefail'
     )
   })
+
+  it('pins the --no-daemon contract to one Codex version and fails when it is missing', () => {
+    const install = job.steps.find((step) => step.name === 'Install pinned no-daemon Codex CLI')
+    const verify = job.steps.find((step) => step.name === 'Verify Codex --no-daemon contract')
+
+    expect(job.env.CODEX_NO_DAEMON_CLI_VERSION).toMatch(/^\d+\.\d+\.\d+$/)
+    expect(install.run).toContain('"@openai/codex@$CODEX_NO_DAEMON_CLI_VERSION"')
+    expect(verify.env.ORCA_CODEX_NO_DAEMON_CONTRACT_VERSION).toBe(
+      '${{ env.CODEX_NO_DAEMON_CLI_VERSION }}'
+    )
+    expect(verify.env.ORCA_CODEX_NO_DAEMON_CONTRACT_REQUIRED).toBe('1')
+    expect(install.run).toContain('--prefix "$RUNNER_TEMP/codex-cli-no-daemon"')
+    expect(verify.run).toContain(
+      'ORCA_CODEX_NO_DAEMON_CONTRACT_BINARY="$RUNNER_TEMP/codex-cli-no-daemon/node_modules/.bin/codex"'
+    )
+    expect(verify.run).toContain('src/main/pty/codex-no-daemon-binary-contract.test.ts')
+  })
 })
diff --git a/config/scripts/computer-e2e-workflow.test.mjs b/config/scripts/computer-e2e-workflow.test.mjs
index fc605bac5bdc..3e31ccf5a807 100644
--- a/config/scripts/computer-e2e-workflow.test.mjs
+++ b/config/scripts/computer-e2e-workflow.test.mjs
@@ -6,197 +6,6 @@ import { parse } from 'yaml'
 const projectDir = resolve(import.meta.dirname, '../..')
 
 describe('computer-use e2e workflow', () => {
-  it('cancels superseded pull request runs without cancelling scheduled runs', () => {
-    const workflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/computer-e2e.yml'), 'utf8')
-    )
-
-    expect(workflow.concurrency).toEqual({
-      group: 'computer-e2e-${{ github.event.pull_request.number || github.ref }}',
-      'cancel-in-progress': "${{ github.event_name == 'pull_request' }}"
-    })
-  })
-
-  it('runs computer-use e2e files serially because they share desktop focus', () => {
-    const config = readFileSync(join(projectDir, 'tests/e2e/vitest.config.ts'), 'utf8')
-
-    expect(config).toContain('fileParallelism: false')
-  })
-
-  it('guards e2e source against fragile waits and Windows Calculator drift', () => {
-    const driver = readFileSync(join(projectDir, 'tests/e2e/helpers/computer-driver.ts'), 'utf8')
-    const cliDriver = readFileSync(
-      join(projectDir, 'tests/e2e/helpers/computer-cli-driver.ts'),
-      'utf8'
-    )
-    const windowsStoreE2e = readFileSync(
-      join(projectDir, 'tests/e2e/computer-windows-store.e2e.ts'),
-      'utf8'
-    )
-
-    expect(driver).not.toContain('await delay(3500)')
-    expect(driver).toContain("await waitForComputerWindowTitle('gedit', fileName, 15000)")
-    expect(cliDriver).toContain('ORCA_DEV_USER_DATA_PATH')
-    expect(cliDriver).toContain('orca-computer-runtime-')
-    expect(cliDriver).toContain('retryMissingRuntimeMetadata')
-    expect(cliDriver).toContain('Could not read Orca runtime metadata')
-    expect(cliDriver).toContain("'serve', '--no-pairing', '--json'")
-
-    expect(windowsStoreE2e).toContain("app.bundleId === 'ApplicationFrameHost'")
-    expect(windowsStoreE2e).toContain("app.bundleId === 'win32calc'")
-    expect(windowsStoreE2e).toContain('buttonIndex >= 0')
-    expect(windowsStoreE2e).toContain('pane(?:\\s|$)/m')
-    expect(windowsStoreE2e).toContain('String(clickIndex)')
-    expect(windowsStoreE2e).not.toContain(
-      "for (const buttonName of ['One', 'Plus', 'Two', 'Equals'])"
-    )
-  })
-
-  it('triggers on computer-use shared contracts, scripts, and agent skill changes', () => {
-    const workflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/computer-e2e.yml'), 'utf8')
-    )
-    const triggerPaths = workflow.on.pull_request.paths
-
-    expect(triggerPaths).toEqual(
-      expect.arrayContaining([
-        'config/scripts/computer-e2e-workflow.test.mjs',
-        'config/scripts/macos-computer-helper-owner-loss-group-recovery.test.mjs',
-        'config/scripts/computer-use-modifier-safety.test.mjs',
-        'config/scripts/computer-use-skill-guidance.test.mjs',
-        'config/scripts/computer-use-smoke.mjs',
-        'config/scripts/computer-use-smoke.test.mjs',
-        'skills/computer-use/SKILL.md',
-        'src/main/computer/**',
-        'src/main/runtime/rpc/dispatcher.ts',
-        'src/main/runtime/rpc/errors.ts',
-        'src/main/runtime/rpc/methods/computer*.ts',
-        'src/shared/computer-use-*.ts',
-        'tests/e2e/vitest.config.ts'
-      ])
-    )
-    expect(triggerPaths).not.toContain('src/shared/runtime-types.ts')
-  })
-
-  it('runs focused computer-use regression tests in the PR native-smoke job', () => {
-    const workflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/computer-e2e.yml'), 'utf8')
-    )
-    const nativeSmokeRuns = workflow.jobs['native-smoke'].steps
-      .map((step) => step.run)
-      .filter((run) => typeof run === 'string')
-    const checkout = workflow.jobs['native-smoke'].steps.find(
-      (step) => step.uses === 'actions/checkout@v6'
-    )
-    const regressionRun = nativeSmokeRuns.find((run) => run.includes('pnpm vitest run'))
-    const expectedRegressionFiles = [
-      'config/scripts/macos-computer-helper-owner-loss-group-recovery.test.mjs',
-      'config/scripts/macos-computer-helper-owner-loss-processes.test.mjs',
-      'config/scripts/computer-use-modifier-safety.test.mjs',
-      'config/scripts/computer-use-skill-guidance.test.mjs',
-      'config/scripts/computer-use-smoke.test.mjs',
-      'src/main/computer/computer-provider-lifecycle.test.ts',
-      'src/main/computer/computer-provider-unavailable-message.test.ts',
-      'src/main/computer/sidecar-client.test.ts',
-      'src/main/computer/macos-native-provider-client.test.ts',
-      'src/main/computer/macos-native-provider-socket.test.ts',
-      'src/main/computer/macos-computer-use-permissions.test.ts',
-      'src/main/computer/macos-computer-use-permission-status.test.ts',
-      'src/main/computer/desktop-script-provider-client.test.ts',
-      'src/main/computer/desktop-script-provider-cache.test.ts',
-      'src/main/computer/desktop-script-provider-actions.test.ts',
-      'src/main/computer/desktop-script-provider-cache-lifecycle.test.ts',
-      'src/main/computer/desktop-script-provider-errors.test.ts',
-      'src/main/computer/desktop-script-provider-action-errors.test.ts',
-      'src/shared/computer-use-error-recovery.test.ts',
-      'src/shared/computer-use-key-spec.test.ts',
-      'src/cli/format.test.ts',
-      'src/cli/handlers/computer.test.ts',
-      'src/cli/handlers/computer-action-routing.test.ts',
-      'src/cli/handlers/computer-action-validation.test.ts',
-      'src/cli/handlers/computer-state-formatting.test.ts',
-      'src/cli/specs/computer.test.ts',
-      'src/cli/index.test.ts',
-      'src/main/runtime/rpc/dispatcher-computer-errors.test.ts',
-      'src/main/runtime/rpc/errors.test.ts',
-      'src/main/runtime/rpc/methods/computer.test.ts',
-      'src/main/runtime/rpc/methods/computer-actions.test.ts',
-      'src/cli/runtime/envelope-schema.test.ts',
-      'src/shared/remote-runtime-client.test.ts'
-    ]
-
-    expect(checkout.with['persist-credentials']).toBe(false)
-    expect(regressionRun).toBeTruthy()
-    for (const file of expectedRegressionFiles) {
-      expect(regressionRun).toContain(file)
-    }
-  })
-
-  it('keeps Linux native imports available without installing the GUI-only stack in PR smoke', () => {
-    const workflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/computer-e2e.yml'), 'utf8')
-    )
-    const nativeSmokeInstall = workflow.jobs['native-smoke'].steps.find(
-      (step) => step.if === "runner.os == 'Linux'"
-    )
-    const scheduledLinuxInstall = workflow.jobs.linux.steps.find((step) =>
-      step.run?.includes('apt-get install')
-    )
-
-    expect(nativeSmokeInstall.run).toContain('python3')
-    expect(nativeSmokeInstall.run).toContain('python3-gi')
-    expect(nativeSmokeInstall.run).toContain('gir1.2-atspi-2.0')
-    expect(nativeSmokeInstall.run).toContain('at-spi2-core')
-    expect(nativeSmokeInstall.run).not.toContain('gedit')
-    expect(nativeSmokeInstall.run).not.toContain('xvfb')
-    expect(nativeSmokeInstall.run).not.toContain('xdotool')
-    expect(scheduledLinuxInstall.run).toContain('gedit')
-    expect(scheduledLinuxInstall.run).toContain('xvfb')
-    expect(scheduledLinuxInstall.run).toContain('xdotool')
-  })
-
-  it('builds and tests the macOS helper on every trigger without hosted TCC e2e', () => {
-    const workflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/computer-e2e.yml'), 'utf8')
-    )
-    const job = workflow.jobs['mac-native-owner-smoke']
-    const runs = job.steps.map((step) => step.run).filter((run) => typeof run === 'string')
-    const checkout = job.steps.find((step) => step.uses === 'actions/checkout@v6')
-    const install = job.steps.find(
-      (step) => step.uses === './.github/actions/install-node-dependencies'
-    )
-
-    expect(job.if).toBeUndefined()
-    expect(job['runs-on']).toBe('macos-15')
-    expect(checkout.with['persist-credentials']).toBe(false)
-    expect(install.with['native-runtime']).toBe('electron')
-    expect(runs).toContain('pnpm bench:macos-computer-helper-owner-loss --expect reaped --trials 1')
-    const cleanupRun = runs.find((run) =>
-      run.includes('config/scripts/macos-computer-helper-owner-loss-processes.test.mjs')
-    )
-    expect(cleanupRun).toContain(
-      'config/scripts/macos-computer-helper-owner-loss-group-recovery.test.mjs'
-    )
-    expect(runs).toContain('pnpm verify:computer-native')
-    expect(
-      runs.find((run) => run.includes('config/scripts/build-native-for-platform.test.mjs'))
-    ).toContain('--config config/vitest.config.ts')
-    expect(runs.join('\n')).not.toContain('test:e2e:computer')
-    expect(workflow.jobs.mac).toBeUndefined()
-    expect(workflow.on.pull_request.paths).toEqual(
-      expect.arrayContaining([
-        'config/scripts/build-native-for-platform.mjs',
-        'config/scripts/build-native-for-platform.test.mjs',
-        'config/scripts/macos-computer-helper-owner-loss-benchmark.mjs',
-        'config/scripts/macos-computer-helper-owner-loss-group-recovery.test.mjs',
-        'config/scripts/macos-computer-helper-owner-loss-metrics.mjs',
-        'config/scripts/macos-computer-helper-owner-loss-processes.mjs',
-        'config/scripts/macos-computer-helper-owner-loss-processes.test.mjs',
-        'config/scripts/macos-computer-helper-owner-loss-trial-cleanup.mjs'
-      ])
-    )
-  })
-
   it('uses the cached Electron dependency path for scheduled Linux and Windows e2e', () => {
     const workflow = parse(
       readFileSync(join(projectDir, '.github/workflows/computer-e2e.yml'), 'utf8')
@@ -220,29 +29,6 @@ describe('computer-use e2e workflow', () => {
     }
   })
 
-  it('runs deterministic macOS owner-loss benchmark cleanup coverage', () => {
-    const benchmark = readFileSync(
-      join(projectDir, 'config/scripts/macos-computer-helper-owner-loss-benchmark.mjs'),
-      'utf8'
-    )
-    const cleanup = readFileSync(
-      join(projectDir, 'config/scripts/macos-computer-helper-owner-loss-trial-cleanup.mjs'),
-      'utf8'
-    )
-
-    expect(benchmark).toContain('spawnBenchmarkProcess(executable, [launcherDir]')
-    expect(benchmark).toContain("stdio: ['ignore', stdoutDescriptor, stderrDescriptor]")
-    expect(benchmark).toContain('cleanupOwnerLossTrial({')
-    const parseIndex = benchmark.indexOf('parseBenchmarkTrialResult(serializedResult)')
-    const cleanupIndex = benchmark.indexOf('cleanupOwnerLossTrial({')
-    expect(parseIndex).toBeGreaterThanOrEqual(0)
-    expect(cleanupIndex).toBeGreaterThanOrEqual(0)
-    expect(parseIndex).toBeLessThan(cleanupIndex)
-    expect(benchmark).toContain('trialCleanupSha256: artifactSha256(trialCleanupPath)')
-    expect(cleanup).toContain('killRecordedAndMatchingProcesses(options.recordPath')
-    expect(cleanup).toContain("signalValidatedProcessGroup(options.pid, options.marker, 'SIGKILL'")
-  })
-
   it('boots the built daemon under plain Node in the PR native-smoke job after the main build', () => {
     const workflow = parse(
       readFileSync(join(projectDir, '.github/workflows/computer-e2e.yml'), 'utf8')
@@ -279,34 +65,6 @@ describe('computer-use e2e workflow', () => {
     )
   })
 
-  it('re-runs the native-smoke job when the daemon bundle graph changes', () => {
-    const workflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/computer-e2e.yml'), 'utf8')
-    )
-    const triggerPaths = workflow.on.pull_request.paths
-
-    expect(triggerPaths).toEqual(
-      expect.arrayContaining([
-        'config/scripts/daemon-boot-smoke.mjs',
-        'config/scripts/windows-daemon-workspace-close-repro.mjs',
-        'electron.vite.config.ts',
-        'config/build-plugins/**',
-        'src/main/daemon/**'
-      ])
-    )
-  })
-
-  it('does not run computer-use e2e in PR smoke jobs', () => {
-    const workflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/computer-e2e.yml'), 'utf8')
-    )
-    const nativeSmokeRuns = workflow.jobs['native-smoke'].steps
-      .map((step) => step.run)
-      .filter((run) => typeof run === 'string')
-
-    expect(nativeSmokeRuns.join('\n')).not.toContain('test:e2e:computer')
-  })
-
   it('builds Electron main output before every computer-use e2e run', () => {
     const workflow = parse(
       readFileSync(join(projectDir, '.github/workflows/computer-e2e.yml'), 'utf8')
@@ -352,48 +110,4 @@ describe('computer-use e2e workflow', () => {
     expect(allRuns.join('\n')).toContain('test:e2e:computer')
     expect(allRuns.join('\n')).not.toContain('test:e2e:computer -- --reporter')
   })
-
-  it('runs Linux e2e on schedule without advertising hosted macOS TCC coverage', () => {
-    const workflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/computer-e2e.yml'), 'utf8')
-    )
-    const triggerPaths = workflow.on.pull_request.paths
-    const linuxRuns = workflow.jobs.linux.steps
-      .map((step) => step.run)
-      .filter((run) => typeof run === 'string')
-
-    expect(triggerPaths).toEqual(
-      expect.arrayContaining([
-        'tests/e2e/computer-linux.e2e.ts',
-        'tests/e2e/helpers/computer-cli-driver.ts',
-        'tests/e2e/helpers/computer-driver.ts'
-      ])
-    )
-    expect(triggerPaths).not.toContain('tests/e2e/computer-mac.e2e.ts')
-    expect(triggerPaths).not.toContain('tests/e2e/computer-mac-safari.e2e.ts')
-    expect(workflow.jobs.mac).toBeUndefined()
-    expect(linuxRuns).toContain(
-      'xvfb-run --auto-servernum dbus-run-session -- pnpm test:e2e:computer --reporter=verbose tests/e2e/computer-linux.e2e.ts'
-    )
-  })
-
-  it('runs every Windows computer-use e2e file in the scheduled Windows job', () => {
-    const workflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/computer-e2e.yml'), 'utf8')
-    )
-    const triggerPaths = workflow.on.pull_request.paths
-    const windowsRuns = workflow.jobs.windows.steps
-      .map((step) => step.run)
-      .filter((run) => typeof run === 'string')
-
-    expect(triggerPaths).toEqual(
-      expect.arrayContaining([
-        'tests/e2e/computer-windows.e2e.ts',
-        'tests/e2e/computer-windows-store.e2e.ts'
-      ])
-    )
-    expect(windowsRuns).toContain(
-      'pnpm test:e2e:computer --reporter=verbose tests/e2e/computer-windows.e2e.ts tests/e2e/computer-windows-store.e2e.ts'
-    )
-  })
 })
diff --git a/config/scripts/e2e-cli-artifact-capability.test.mjs b/config/scripts/e2e-cli-artifact-capability.test.mjs
new file mode 100644
index 000000000000..af39b8da7536
--- /dev/null
+++ b/config/scripts/e2e-cli-artifact-capability.test.mjs
@@ -0,0 +1,56 @@
+import { chmodSync, existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { delimiter, join } from 'node:path'
+import { parse } from 'yaml'
+import { describe, expect, it } from 'vitest'
+import { runProcessSync } from '../../src/shared/child-process/run-process'
+
+const workflow = parse(readFileSync('.github/workflows/e2e.yml', 'utf8'))
+const build = workflow.jobs.build.steps.find((step) => step.id === 'e2e-cli')
+const scripts = JSON.parse(readFileSync('package.json', 'utf8')).scripts
+
+describe('shared E2E CLI capability', () => {
+  it('uses the same preparation for locally compiled and downloaded CLI output', () => {
+    expect(scripts['build:cli']).toContain('&& pnpm run prepare:cli-output')
+    expect(scripts['prepare:cli-output']).toBe(
+      'node config/scripts/verify-cli-bin.mjs --fix-executable --fix-package-json && node config/scripts/install-dev-cli.mjs'
+    )
+  })
+
+  it.skipIf(process.platform === 'win32').each([
+    [false, 0, 0],
+    [true, 0, 0],
+    [true, 7, 7]
+  ])('supported=%s build status=%s exits=%s', (supported, buildStatus, exitStatus) => {
+    const directory = mkdtempSync(join(tmpdir(), 'orca-e2e-cli-capability-'))
+    const marker = join(directory, 'build-requested')
+    try {
+      writeFileSync(
+        join(directory, 'package.json'),
+        JSON.stringify({ scripts: supported ? { 'prepare:cli-output': 'available' } : {} })
+      )
+      const pnpm = join(directory, 'pnpm')
+      writeFileSync(pnpm, '#!/bin/sh\nprintf "%s" "$*" > "$BUILD_MARKER"\nexit "$BUILD_STATUS"\n')
+      chmodSync(pnpm, 0o755)
+      const result = runProcessSync({
+        program: 'bash',
+        args: ['-e', '-o', 'pipefail', '-c', build.run],
+        cwd: directory,
+        env: {
+          ...process.env,
+          PATH: `${directory}${delimiter}${process.env.PATH}`,
+          BUILD_MARKER: marker,
+          BUILD_STATUS: String(buildStatus)
+        },
+        timeoutMs: 10_000
+      })
+      expect(result.code, JSON.stringify(result)).toBe(exitStatus)
+      expect(existsSync(marker)).toBe(supported)
+      if (supported) {
+        expect(readFileSync(marker, 'utf8')).toBe('run build:cli')
+      }
+    } finally {
+      rmSync(directory, { recursive: true, force: true })
+    }
+  })
+})
diff --git a/config/scripts/electron-builder-config.test.mjs b/config/scripts/electron-builder-config.test.mjs
index c69ea817a499..0e07f00f181f 100644
--- a/config/scripts/electron-builder-config.test.mjs
+++ b/config/scripts/electron-builder-config.test.mjs
@@ -1,15 +1,15 @@
 import { existsSync } from 'node:fs'
-import { chmod, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
+import { chmod, lstat, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
 import { createRequire } from 'node:module'
 import { tmpdir } from 'node:os'
-import { join } from 'node:path'
+import { dirname, join } from 'node:path'
 import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { writeMobileWebBundleFixtureTree } from './mobile-web-bundle-fixture-tree.mjs'
 
 const REPO_ROOT = join(import.meta.dirname, '..', '..')
 const require = createRequire(import.meta.url)
 const electronBuilderConfig = require('../electron-builder.config.cjs')
-const { FileMatcher } = require('app-builder-lib/out/fileMatcher')
+const { copyFiles, FileMatcher } = require('app-builder-lib/out/fileMatcher')
 const FpmTarget = require('app-builder-lib/out/targets/FpmTarget').default
 const electronBuilderNativeRebuild = require('./electron-builder-native-rebuild.cjs')
 
@@ -35,6 +35,7 @@ describe('electron-builder config', () => {
         '!tests{,/**/*}',
         '!examples{,/**/*}',
         '!pr-evidence{,/**/*}',
+        '!notes{,/**/*}',
         '!{.claude,.grok,.agents,.codex}{,/**/*}',
         '!Casks{,/**/*}',
         '!{AGENTS.md,CLAUDE.md,DEVELOPING.md,bundle-size-progress.md,ORCHESTRATION_IMPLEMENTATION_CHECKLIST.md,ORCHESTRATION_STRUCTURED_OUTPUT_DESIGN.md}',
@@ -61,6 +62,62 @@ describe('electron-builder config', () => {
     expect(packs('out/main/index.js')).toBe(true)
   })
 
+  it.each(['file', 'directory'])('keeps a root notes %s out of app.asar', async (kind) => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-packaging-notes-'))
+    const source = join(root, 'app')
+    const destination = join(root, 'selected')
+    const runtimePaths = [
+      'package.json',
+      'out/main/index.js',
+      'out/renderer/index.html',
+      'out/cli/index.js',
+      'out/shared/index.js',
+      'out/main/notes/index.js',
+      'out/renderer/assets/notes/help.md',
+      'resources/notes/help.md',
+      'notes.txt'
+    ]
+    const notesPaths =
+      kind === 'file'
+        ? ['notes']
+        : [
+            'notes/build.log',
+            'notes/installed-orca-backup/Orca.exe',
+            'notes/installed-orca-backup/resources/app.asar',
+            'notes/orca-windows-setup.exe',
+            'notes/.recovery/state.json'
+          ]
+    try {
+      for (const fixturePath of [...runtimePaths, ...notesPaths]) {
+        const file = join(source, fixturePath)
+        await mkdir(dirname(file), { recursive: true })
+        await writeFile(file, 'synthetic fixture\n')
+      }
+      if (kind === 'directory') {
+        await mkdir(join(source, 'notes', 'empty'))
+      }
+      const matcher = new FileMatcher(
+        source,
+        destination,
+        (value) => value,
+        electronBuilderConfig.files
+      )
+      // copyFiles adds the default include and prunes excluded directories during traversal.
+      await copyFiles([matcher])
+      for (const runtimePath of runtimePaths) {
+        expect(await readFile(join(destination, runtimePath), 'utf8')).toBe('synthetic fixture\n')
+      }
+      const isPacked = matcher.createFilter()
+      for (const notesPath of new Set(['notes', ...notesPaths])) {
+        const file = join(source, notesPath)
+        expect(isPacked(file, await lstat(file)), notesPath).toBe(false)
+      }
+      expect(existsSync(join(destination, 'notes'))).toBe(false)
+    } finally {
+      await rm(root, { recursive: true, force: true })
+    }
+  })
+
   // Why: `files` is an all-negation list, so electron-builder's default `**/*` packs
   // anything without an explicit `!` entry — examples/ landed without one and shipped
   // hostile-panel, the adversarial containment fixture, into 1.4.160-rc.3's app.asar.
diff --git a/config/scripts/electron-runtime-floor.test.ts b/config/scripts/electron-runtime-floor.test.ts
index 77a1d4741e01..3506b736398e 100644
--- a/config/scripts/electron-runtime-floor.test.ts
+++ b/config/scripts/electron-runtime-floor.test.ts
@@ -7,10 +7,12 @@ import { describe, expect, it } from 'vitest'
  * around `gtk_init()` while FontConfig warmed up on a pool thread, and below
  * glibc 2.41 that frees `environ` under a concurrent `getenv()` — a launch-time
  * use-after-free on every Ubuntu we support (stablyai/orca#20081). 43.7.0 stops
- * freeing the published `environ`. A downgrade past it re-ships that crash, and
- * nothing else in the tree would notice.
+ * freeing the published `environ`. 43.7.0 itself threw `Invalid guestInstanceId` when a
+ * loaded `<webview>` left the DOM, which blanked browser tabs React re-inserted
+ * (electron/electron#53989); 43.7.4 fixes it. A downgrade past either re-ships the bug,
+ * and nothing else in the tree would notice.
  */
-const MINIMUM_ELECTRON_VERSION = '43.7.0'
+const MINIMUM_ELECTRON_VERSION = '43.7.4'
 
 function parseVersion(specifier: string): [number, number, number] {
   const match = /(\d+)\.(\d+)\.(\d+)/.exec(specifier)
@@ -35,15 +37,17 @@ describe('electron runtime floor', () => {
   it.each([
     ['42.9.0', false],
     ['43.6.0', false],
-    ['43.7.0', true],
-    ['43.7.1', true],
+    ['43.7.0', false],
+    ['43.7.3', false],
+    ['43.7.4', true],
+    ['43.7.5', true],
     ['43.8.0', true],
     ['44.0.0', true]
   ])('reads %s as meeting the floor: %s', (specifier, expected) => {
     expect(meetsRuntimeFloor(specifier)).toBe(expected)
   })
 
-  it('pins Electron at or above the glibc environ-race fix', () => {
+  it('pins Electron at or above the glibc environ-race and webview-detach fixes', () => {
     const packageJson = JSON.parse(
       readFileSync(join(__dirname, '../../package.json'), 'utf-8')
     ) as { devDependencies: Record<string, string> }
diff --git a/config/scripts/electron-vite-output-contract.test.ts b/config/scripts/electron-vite-output-contract.test.ts
index 958e461ffd94..da6d45c8a230 100644
--- a/config/scripts/electron-vite-output-contract.test.ts
+++ b/config/scripts/electron-vite-output-contract.test.ts
@@ -20,9 +20,6 @@ import { createRequire } from 'node:module'
 import { electronViteConfig } from '../../electron.vite.config'
 import { BOOTSTRAP_FATAL_EXIT_GUARD_KEY } from '../../src/main/startup/bootstrap-fatal-exit-guard'
 
-const targetConfig = readFileSync('config/electron-vite-target.config.cts', 'utf8')
-const devRunner = readFileSync('config/scripts/run-electron-vite-dev.mjs', 'utf8')
-
 type BootstrapProcessMock = EventEmitter & {
   env: Record<string, string>
   pid: number
@@ -253,11 +250,6 @@ describe('Electron Vite output contract', () => {
     )
   })
 
-  it('rejects prototype properties as build targets', () => {
-    // Own-property check only: an inherited key like `constructor` must not select a build target.
-    expect(targetConfig).toContain('Object.hasOwn(configByTarget, target)')
-  })
-
   it('gives the dev terminal daemon helper the TCC identity watched by Orca', () => {
     // Asserted on the values rather than the source text: the ids moved into
     // dev-electron-bundle-identity.mjs so every dev bundle signs to one cdhash.
@@ -265,7 +257,5 @@ describe('Electron Vite output contract', () => {
     expect(getDevHelperPlistPatches()).toEqual([
       { key: 'CFBundleIdentifier', value: DEV_HELPER_BUNDLE_ID }
     ])
-    expect(devRunner).toContain("'Electron Helper.app',")
-    expect(devRunner).toContain('setPlistValue(helperPlistPath, key, value)')
   })
 })
diff --git a/config/scripts/generate-monaco-associations.mjs b/config/scripts/generate-monaco-associations.mjs
new file mode 100644
index 000000000000..b5c2e99c00a6
--- /dev/null
+++ b/config/scripts/generate-monaco-associations.mjs
@@ -0,0 +1,79 @@
+import { readFileSync, writeFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { dirname, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import ts from 'typescript-api'
+
+const require = createRequire(import.meta.url)
+const editorEntry = require.resolve('monaco-editor/esm/vs/editor/editor.main.js')
+export const associationsPath = fileURLToPath(
+  new URL('../../src/renderer/src/lib/monaco-language-associations.json', import.meta.url)
+)
+
+// Read registration metadata without importing Monaco or executing its grammar loaders.
+export function readMonacoAssociations() {
+  const entry = ts.createSourceFile(
+    editorEntry,
+    readFileSync(editorEntry, 'utf8'),
+    ts.ScriptTarget.Latest
+  )
+  const files = entry.statements
+    .filter(ts.isImportDeclaration)
+    .map((node) => node.moduleSpecifier)
+    .filter(ts.isStringLiteral)
+    .map((node) => node.text)
+    .filter((path) => path.endsWith('.contribution.js'))
+  const registrations = []
+  for (const file of files) {
+    const path = resolve(dirname(editorEntry), file)
+    const source = ts.createSourceFile(path, readFileSync(path, 'utf8'), ts.ScriptTarget.Latest)
+    function visit(node) {
+      if (
+        ts.isCallExpression(node) &&
+        ['registerLanguage', 'languages.register'].includes(node.expression.getText(source))
+      ) {
+        const [argument] = node.arguments
+        if (!argument || !ts.isObjectLiteralExpression(argument)) {
+          throw new Error(`Unsupported Monaco registration in ${file}`)
+        }
+        const metadata = { id: '', extensions: [], filenames: [] }
+        for (const property of argument.properties) {
+          if (!ts.isPropertyAssignment(property)) {
+            continue
+          }
+          const key = property.name.getText(source)
+          if (!['id', 'extensions', 'filenames'].includes(key)) {
+            continue
+          }
+          const value = property.initializer
+          if (key === 'id' && ts.isStringLiteral(value)) {
+            metadata.id = value.text
+          } else if (key !== 'id' && ts.isArrayLiteralExpression(value)) {
+            metadata[key] = value.elements.map((element) => {
+              if (!ts.isStringLiteral(element)) {
+                throw new Error(`Nonliteral association in ${file}`)
+              }
+              return element.text
+            })
+          } else {
+            throw new Error(`Unsupported ${key} in ${file}`)
+          }
+        }
+        if (!metadata.id) {
+          throw new Error(`Missing language id in ${file}`)
+        }
+        registrations.push(metadata)
+      }
+      ts.forEachChild(node, visit)
+    }
+    visit(source)
+  }
+  if (registrations.length < 80) {
+    throw new Error('Monaco registration entry point changed')
+  }
+  return registrations
+}
+
+if (process.argv[1] && resolve(process.argv[1]) === import.meta.filename) {
+  writeFileSync(associationsPath, `${JSON.stringify(readMonacoAssociations(), null, 2)}\n`)
+}
diff --git a/config/scripts/generate-monaco-associations.test.mjs b/config/scripts/generate-monaco-associations.test.mjs
new file mode 100644
index 000000000000..0e7563cd49ad
--- /dev/null
+++ b/config/scripts/generate-monaco-associations.test.mjs
@@ -0,0 +1,12 @@
+import { readFileSync } from 'node:fs'
+import { describe, expect, it } from 'vitest'
+import { associationsPath, readMonacoAssociations } from './generate-monaco-associations.mjs'
+
+describe('Monaco filename associations', () => {
+  it('matches every registration shipped by the installed editor entry point', () => {
+    expect(
+      JSON.parse(readFileSync(associationsPath, 'utf8')),
+      'Run node config/scripts/generate-monaco-associations.mjs after upgrading Monaco'
+    ).toEqual(readMonacoAssociations())
+  })
+})
diff --git a/config/scripts/generate-runtime-required-english-catalog.mjs b/config/scripts/generate-runtime-required-english-catalog.mjs
index 67fb7cd4d449..93769b02bcc9 100644
--- a/config/scripts/generate-runtime-required-english-catalog.mjs
+++ b/config/scripts/generate-runtime-required-english-catalog.mjs
@@ -3,11 +3,7 @@ import path from 'node:path'
 import process from 'node:process'
 import { pathToFileURL } from 'node:url'
 
-import {
-  collectLocalizationKeyReferences,
-  collectSourceFiles,
-  LOCALIZATION_SOURCE_ROOTS
-} from './verify-localization-catalog.mjs'
+import { collectLocalizationReferences } from './verify-localization-catalog.mjs'
 
 export const EN_CATALOG_RELATIVE_PATH = path.join(
   'src',
@@ -103,19 +99,6 @@ export function buildRuntimeRequiredCatalog(catalogEntries, requiredKeys) {
   return catalog
 }
 
-async function collectReferences(root) {
-  const references = []
-  for (const sourceRoot of LOCALIZATION_SOURCE_ROOTS) {
-    const files = await collectSourceFiles(root, path.join(root, sourceRoot))
-    for (const filePath of files) {
-      references.push(
-        ...collectLocalizationKeyReferences(filePath, await fs.readFile(filePath, 'utf8'), root)
-      )
-    }
-  }
-  return references
-}
-
 /**
  * Why not a byte-for-byte comparison: the shipped subset only has to be *safe*,
  * and safety is "every required entry is present, and nothing it ships
@@ -144,12 +127,12 @@ function reportKeys(label, keys) {
   }
 }
 
-export async function main(root = process.cwd(), argv = process.argv.slice(2)) {
+export async function main(root = process.cwd(), argv = process.argv.slice(2), sharedReferences) {
   const fix = argv.includes('--fix')
   const catalogEntries = flattenCatalogEntries(
     JSON.parse(await fs.readFile(path.join(root, EN_CATALOG_RELATIVE_PATH), 'utf8'))
   )
-  const references = await collectReferences(root)
+  const references = sharedReferences ?? (await collectLocalizationReferences(root))
   const requiredKeys = collectRuntimeRequiredKeys(catalogEntries, references)
   const outputPath = path.join(root, RUNTIME_REQUIRED_RELATIVE_PATH)
 
diff --git a/config/scripts/git-pull-request-diff-base.mjs b/config/scripts/git-pull-request-diff-base.mjs
index 3e2021a1eb14..0dd5b825ef78 100644
--- a/config/scripts/git-pull-request-diff-base.mjs
+++ b/config/scripts/git-pull-request-diff-base.mjs
@@ -1,5 +1,6 @@
 import { execFileSync } from 'node:child_process'
 import process from 'node:process'
+import { pathToFileURL } from 'node:url'
 
 export function selectPullRequestDiffBase(requestedBase, headParents, eventName) {
   if (eventName === 'pull_request' && headParents.length >= 2) {
@@ -21,3 +22,15 @@ export function resolvePullRequestDiffBase(
     .split(/\s+/)
   return selectPullRequestDiffBase(requestedBase, headParents, eventName)
 }
+
+// Why a CLI: the workflow's inline gates used `git diff --merge-base "$BASE_SHA" "$HEAD_SHA"`,
+// which needs the payload base to be reachable and so forced a full-history checkout. Printing
+// the resolved base lets those steps diff against `HEAD^1` with the same logic the Node gates
+// already use, instead of each one open-coding it.
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  const resolved = resolvePullRequestDiffBase(process.cwd(), process.argv[2])
+  if (!resolved) {
+    throw new Error('No diff base: pass the pull request base SHA, or run on a merge ref.')
+  }
+  process.stdout.write(`${resolved}\n`)
+}
diff --git a/config/scripts/headless-serve-shutdown-matrix.test.mjs b/config/scripts/headless-serve-shutdown-matrix.test.mjs
index 32878b219f58..fa9a9c6943fe 100644
--- a/config/scripts/headless-serve-shutdown-matrix.test.mjs
+++ b/config/scripts/headless-serve-shutdown-matrix.test.mjs
@@ -135,6 +135,23 @@ describe('packaged shutdown matrix', () => {
     ).toBe(true)
   })
 
+  it('uses a restored image only as a build cache and still runs every oracle', async () => {
+    vi.stubEnv('ORCA_SHUTDOWN_FIXTURE_CACHE_IMAGE', 'sha256:restored-fixture')
+    try {
+      await run('--all-entrypoints')
+      const builds = commands().filter((args) => args[0] === 'build')
+      expect(builds).toHaveLength(1)
+      expect(builds[0]).toContain('--cache-from')
+      expect(builds[0]).toContain('sha256:restored-fixture')
+      expect(builds[0]).toContain('--platform')
+      expect(builds[0]).toContain('linux/amd64')
+      expect(signalRuns()).toHaveLength(6)
+      expect(commands().filter((args) => args[0] === 'run')).toHaveLength(8)
+    } finally {
+      vi.unstubAllEnvs()
+    }
+  })
+
   it('rejects ambiguous matrix overrides before invoking Docker', async () => {
     await expect(run('--all-entrypoints', '--entrypoint', 'launcher')).rejects.toThrow(
       'cannot be combined'
diff --git a/config/scripts/headless-serve-shutdown-workflow.test.mjs b/config/scripts/headless-serve-shutdown-workflow.test.mjs
index e9f70ffc6abe..d9de91f28da6 100644
--- a/config/scripts/headless-serve-shutdown-workflow.test.mjs
+++ b/config/scripts/headless-serve-shutdown-workflow.test.mjs
@@ -4,53 +4,8 @@ import { parse } from 'yaml'
 import { describe, expect, it } from 'vitest'
 
 const workflow = parse(readFileSync('.github/workflows/pr.yml', 'utf8'))
-const headlessLinuxGuide = readFileSync('docs/reference/headless-linux-server.md', 'utf8')
-const signalCase = readFileSync('config/docker/headless-serve-shutdown/run-signal-case.sh', 'utf8')
-const shutdownDockerRunner = readFileSync(
-  'config/scripts/run-headless-serve-shutdown-docker.mjs',
-  'utf8'
-)
-const shutdownDockerfile = readFileSync('config/docker/headless-serve-shutdown/Dockerfile', 'utf8')
-const desktopStartupOracle = readFileSync(
-  'config/docker/headless-serve-shutdown/run-appimage-desktop-startup-case.sh',
-  'utf8'
-)
-const headlessLinuxProse = headlessLinuxGuide.replace(/\s+/g, ' ')
-
-function readSystemdUnitBlocks(doc, unitName) {
-  const escapedUnitName = unitName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-  return [...doc.matchAll(new RegExp(`^# /etc/systemd/system/${escapedUnitName}$`, 'gm'))].map(
-    (match) => {
-      const start = match.index + match[0].length
-      const end = doc.indexOf('```', start)
-      const nextUnitHeaderOffset = doc.slice(start).search(/^# \/etc\/systemd\/system\/.+$/m)
-      const nextUnitHeader = nextUnitHeaderOffset === -1 ? -1 : start + nextUnitHeaderOffset
-      if (end === -1 || (nextUnitHeader !== -1 && end > nextUnitHeader)) {
-        throw new Error(`Missing closing code fence for ${unitName}`)
-      }
-      return doc.slice(start, end)
-    }
-  )
-}
 
 describe('headless serve shutdown PR gate', () => {
-  it('reads only exact, closed systemd unit blocks', () => {
-    expect(
-      readSystemdUnitBlocks('# /etc/systemd/system/orca-serveXservice\n```', 'orca-serve.service')
-    ).toEqual([])
-    expect(() =>
-      readSystemdUnitBlocks('# /etc/systemd/system/orca-serve.service\n', 'orca-serve.service')
-    ).toThrow('Missing closing code fence for orca-serve.service')
-    expect(() =>
-      readSystemdUnitBlocks(
-        '# /etc/systemd/system/orca-serve.service\n' +
-          'KillMode=mixed\n' +
-          '# /etc/systemd/system/other.service\n```',
-        'orca-serve.service'
-      )
-    ).toThrow('Missing closing code fence for orca-serve.service')
-  })
-
   it('packages Linux artifacts before running the Docker signal oracle', () => {
     const steps = workflow.jobs.package.steps
     const packageStep = steps.find((step) => step.name === 'Package unpacked app')
@@ -58,7 +13,8 @@ describe('headless serve shutdown PR gate', () => {
     const shutdownStep = steps.find((step) => step.name === 'Verify headless serve signal shutdown')
 
     expect(workflow.jobs.package['timeout-minutes']).toBe(90)
-    expect(packageStep.run).toContain('--linux AppImage deb rpm --x64 --publish never')
+    expect(packageStep.run).toContain('--linux dir --x64 --publish never')
+    expect(packageStep.run).toContain('node config/scripts/package-linux-formats.mjs')
     expect(markerStep.run).toContain('dpkg-deb --fsys-tarfile')
     expect(markerStep.run).toContain('rpm2cpio')
     expect(steps.indexOf(markerStep)).toBeGreaterThan(steps.indexOf(packageStep))
@@ -71,130 +27,4 @@ describe('headless serve shutdown PR gate', () => {
       steps.filter((step) => step.run?.includes('run-headless-serve-shutdown-docker.mjs'))
     ).toHaveLength(1)
   })
-
-  it('keeps readiness polling finite and leak-free', () => {
-    expect(signalCase).toContain('read_ready_line()')
-    expect(signalCase).toContain("sed -u -n 's/^[^{]*//p'")
-    expect(signalCase).toContain('startup_timeout_seconds=${ORCA_STARTUP_TIMEOUT_SECONDS:-180}')
-    expect(signalCase).toContain('startup_deadline=$((SECONDS + startup_timeout_seconds))')
-    expect(signalCase).toContain('while (( SECONDS < startup_deadline )); do')
-    expect(signalCase).toContain('kill -0 "$app_pid" 2>/dev/null || break')
-    expect(signalCase).toContain(
-      "jq's `inputs` waits for EOF even when wrapped in `first`, so a tail -F"
-    )
-    expect(signalCase).not.toContain('tail --pid=')
-  })
-
-  it('gives owned shutdown state a bounded cleanup grace', () => {
-    expect(signalCase).toContain('for shutdown_poll in {0..50}; do')
-    expect(signalCase).toContain('[[ -z "$listener_after" && -z "$owned_residue" ]]')
-    expect(signalCase).toContain('((${#survivors[@]} == 0))')
-    expect(signalCase).toContain('((shutdown_poll < 50)) && sleep 0.1')
-  })
-
-  it('checks that a serving-electron signal target owns the ready socket', () => {
-    const ssRecord =
-      'LISTEN 0 128 127.0.0.1:41235 0.0.0.0:* users:(("orca-ide",pid=23,fd=7),("orca-ide",pid=25,fd=8))'
-    expect([...ssRecord.matchAll(/pid=([0-9]+)/g)].map((match) => match[1])).toEqual(['23', '25'])
-    expect(signalCase).toContain(
-      'listener_before_pids=$(grep -oE \'pid=[0-9]+\' <<<"$listener_before" | cut -d= -f2 || true)'
-    )
-    expect(signalCase).toContain('signal_target_pid=$(head -n1 <<<"$listener_before_pids")')
-    expect(signalCase).toContain('outside the entrypoint process tree')
-  })
-
-  it('runs the original AppImage desktop startup oracle before extraction and signals', () => {
-    expect(shutdownDockerfile).toContain(
-      'COPY run-appimage-desktop-startup-case.sh /usr/local/bin/run-appimage-desktop-startup-case'
-    )
-    const startupCall = shutdownDockerRunner.indexOf(
-      'runDesktopStartupOracle({ image, appImage, platform })'
-    )
-    const extractionCall = shutdownDockerRunner.indexOf(
-      "'timeout --kill-after=10s 120s /input/orca.AppImage --appimage-extract"
-    )
-    const signalLoop = shutdownDockerRunner.indexOf("for (const signal of ['INT', 'TERM'])")
-    expect(startupCall).toBeGreaterThan(-1)
-    expect(extractionCall).toBeGreaterThan(startupCall)
-    expect(signalLoop).toBeGreaterThan(startupCall)
-    expect(shutdownDockerRunner).toContain("'/usr/local/bin/run-appimage-desktop-startup-case'")
-  })
-
-  it('preserves startup logs when the launcher exits before its marker', () => {
-    expect(desktopStartupOracle).toContain('signal_process_group TERM || true')
-    expect(desktopStartupOracle).toContain('signal_process_group KILL || true')
-    expect(desktopStartupOracle).toContain('cat "$stdout_log" >&2 2>/dev/null || true')
-    expect(desktopStartupOracle).toContain('cat "$stderr_log" >&2 2>/dev/null || true')
-    expect(desktopStartupOracle).toContain(
-      'FAIL: desktop launcher exited before ${reason} (status=${observed_status})'
-    )
-    expect(desktopStartupOracle).toContain('ORCA_STARTUP_STATE_DIR_CLEANUP=1')
-    expect(desktopStartupOracle).toContain(
-      '[[ "$state_dir" =~ ^/tmp/orca-appimage-startup\\.[^/]+$ ]] || return 0'
-    )
-  })
-
-  it('requires the bound AppImage to be executable before launch and extraction', () => {
-    expect(desktopStartupOracle).toContain(
-      '[[ -x "$appimage" ]] || { echo "FAIL: AppImage is not executable: $appimage" >&2; exit 1; }'
-    )
-    expect(shutdownDockerRunner).toContain(
-      '\'test -r /input/orca.AppImage && test -x /input/orca.AppImage || { echo "FAIL: AppImage bind must be readable and executable" >&2; exit 1; }\''
-    )
-  })
-
-  it('gives the original AppImage enough bounded extraction space', () => {
-    expect(shutdownDockerRunner).toContain("'/tmp:rw,nosuid,nodev,exec,size=1g'")
-  })
-
-  it('keeps owned Xvfb alive during the documented systemd graceful stop', () => {
-    const serveUnits = readSystemdUnitBlocks(headlessLinuxGuide, 'orca-serve.service')
-    const ownedXvfbUnits = serveUnits.filter((unit) => !/^Environment=DISPLAY=/m.test(unit))
-    const managedXvfbUnits = serveUnits.filter((unit) => /^Environment=DISPLAY=/m.test(unit))
-
-    expect(ownedXvfbUnits).toHaveLength(1)
-    expect(ownedXvfbUnits[0]).toMatch(/^ExecStart=.*orca-linux\.AppImage serve.*$/m)
-    expect(ownedXvfbUnits[0]).toMatch(/^KillMode=mixed$/m)
-    expect(managedXvfbUnits).toHaveLength(1)
-    expect(managedXvfbUnits[0]).toMatch(/^KillMode=mixed$/m)
-  })
-
-  it('distinguishes persisted state from live work during a service restart', () => {
-    expect(headlessLinuxProse).toContain(
-      'The detached terminal daemon is preserved by a different mechanism: it is launched through `systemd-run --user --scope`'
-    )
-    expect(headlessLinuxProse).toContain(
-      'These guarantees preserve live processes only when the daemon is in its own'
-    )
-    expect(headlessLinuxProse).toContain(
-      'The unscoped fallback remains destructive: a service restart kills every terminal'
-    )
-    expect(headlessLinuxProse).toContain(
-      'Treat a stop as destructive unless `health.terminalDaemon.cgroupUnit` names an `orca-daemon-*.scope` on that host'
-    )
-    expect(headlessLinuxProse).toContain(
-      'A separately paired runtime is outside that boundary; local execution and SSH hosts reached through this runtime are not. An affected or unknown omission, missing scope, failed request or lost connection is `unverifiable`'
-    )
-    expect(headlessLinuxGuide).toContain(
-      'sudo -Hu orca /home/orca/.local/bin/orca-ide terminal list --json'
-    )
-    expect(headlessLinuxGuide).not.toContain('sudo -Hu orca orca-ide terminal list --json')
-    expect(headlessLinuxGuide).not.toContain('Two facts make this safe and predictable')
-  })
-
-  it('uses the registered CLI name from ordinary Linux shells', () => {
-    const commandRule =
-      'The registered Linux CLI command is `orca-ide`, not `orca`, to avoid shadowing the GNOME Orca screen reader.'
-    const substitutionRule =
-      "From an ordinary shell outside that service user's managed environment, substitute `orca-ide` for `orca` in commands below."
-    const censusCommand = '`sudo -Hu orca /home/orca/.local/bin/orca-ide terminal list --json`'
-
-    expect(headlessLinuxProse).toContain(commandRule)
-    expect(headlessLinuxProse).toContain(substitutionRule)
-    expect(headlessLinuxProse).toContain(censusCommand)
-    expect(headlessLinuxGuide).toContain('best-effort dispatcher at `$HOME/.local/bin/orca`')
-    expect(headlessLinuxProse.indexOf(substitutionRule)).toBeLessThan(
-      headlessLinuxProse.indexOf(censusCommand)
-    )
-  })
 })
diff --git a/config/scripts/hourly-build-version.mjs b/config/scripts/hourly-build-version.mjs
index 9f6b9000844f..2af342065ba3 100644
--- a/config/scripts/hourly-build-version.mjs
+++ b/config/scripts/hourly-build-version.mjs
@@ -79,12 +79,16 @@ export function formatHourlyReleaseName(version, buildNumber, commit, date) {
 // base version, and the base is only known once the published tags have been
 // resolved just above. Computing it outside meant numbering against whatever
 // version the caller guessed.
-export function getHourlyBuildIdentity(now = new Date(), { publishedVersions, releaseNames } = {}) {
-  const packageJson = JSON.parse(readFileSync(resolve('package.json'), 'utf8'))
+export function getHourlyBuildIdentity(
+  now = new Date(),
+  { packageVersion, publishedVersions, releaseNames } = {}
+) {
+  const versionFromPackage =
+    packageVersion ?? JSON.parse(readFileSync(resolve('package.json'), 'utf8')).version
   const commit = execFileSync('git', ['rev-parse', '--short=12', 'HEAD'], {
     encoding: 'utf8'
   }).trim()
-  const base = resolveDevChannelBaseVersion(packageJson.version, publishedVersions ?? [])
+  const base = resolveDevChannelBaseVersion(versionFromPackage, publishedVersions ?? [])
   const version = createHourlyBuildVersion(base, now)
   const buildNumber = nextHourlyBuildNumber(base, releaseNames ?? [])
   return {
diff --git a/config/scripts/hourly-build-version.test.mjs b/config/scripts/hourly-build-version.test.mjs
index 126741eb1929..dfb88c373325 100644
--- a/config/scripts/hourly-build-version.test.mjs
+++ b/config/scripts/hourly-build-version.test.mjs
@@ -2,10 +2,10 @@ import { describe, expect, it } from 'vitest'
 import {
   createHourlyBuildVersion,
   formatHourlyReleaseName,
+  getHourlyBuildIdentity,
   nextHourlyBuildNumber
 } from './hourly-build-version.mjs'
 import { compareAppVersions } from '../../src/shared/app-version'
-import { resolveDevChannelBaseVersion } from './dev-channel-base-version.mjs'
 
 describe('createHourlyBuildVersion', () => {
   it('stamps the version with a zero-padded UTC timestamp', () => {
@@ -122,32 +122,36 @@ describe('nextHourlyBuildNumber', () => {
   })
 })
 
-describe('hourly base resolution', () => {
+describe('getHourlyBuildIdentity', () => {
   // 2026-09-14: v1.4.202's GitHub release was deleted for a bug after hourlies
   // had climbed to 1.4.203. Passing the leftover tag and the already-shipped
   // hourly keeps the next build on 1.4.203 so electron-updater will still
   // install it.
   it('stays on the already-shipped hourly base after a buggy main release is unpublished', () => {
-    // Why the base is resolved here instead of through getHourlyBuildIdentity: that
-    // entry point reads this repo's own package.json, so the case only holds while the
-    // tree sits at or below 1.4.203. Any release bump past it — upstream's own tag, or
-    // this fork's version line — moves the base and fails a case about published tags.
-    const publishedVersions = [
-      'v1.4.201',
-      'v1.4.202',
-      'v1.4.202-hourly.202609141912',
-      'v1.4.203-hourly.202609140417'
-    ]
-    const base = resolveDevChannelBaseVersion('1.4.203', publishedVersions)
-    expect(base).toBe('1.4.203')
-    expect(createHourlyBuildVersion(base, new Date('2026-09-14T20:00:00Z'))).toBe(
-      '1.4.203-hourly.202609142000'
-    )
-    expect(
-      nextHourlyBuildNumber(base, [
+    const identity = getHourlyBuildIdentity(new Date('2026-09-14T20:00:00Z'), {
+      packageVersion: '1.4.201',
+      publishedVersions: [
+        'v1.4.201',
+        'v1.4.202',
+        'v1.4.202-hourly.202609141912',
+        'v1.4.203-hourly.202609140417'
+      ],
+      releaseNames: [
         '1.4.202 • 14 • Sep 14, 12:12PM • 875b86d',
         '1.4.203 • 04 • Sep 13, 9:17PM • 2ce252f'
-      ])
-    ).toBe(5)
+      ]
+    })
+    expect(identity.version).toBe('1.4.203-hourly.202609142000')
+    expect(identity.buildNumber).toBe(5)
+  })
+
+  it('keeps a newer package version as the hourly base floor', () => {
+    const identity = getHourlyBuildIdentity(new Date('2026-09-14T20:00:00Z'), {
+      packageVersion: '1.4.214',
+      publishedVersions: ['v1.4.202', 'v1.4.203-hourly.202609140417'],
+      releaseNames: ['1.4.203 • 04 • Sep 13, 9:17PM • 2ce252f']
+    })
+    expect(identity.version).toBe('1.4.214-hourly.202609142000')
+    expect(identity.buildNumber).toBe(1)
   })
 })
diff --git a/config/scripts/linux-package-fixture-cache.test.mjs b/config/scripts/linux-package-fixture-cache.test.mjs
new file mode 100644
index 000000000000..1247d70bbca2
--- /dev/null
+++ b/config/scripts/linux-package-fixture-cache.test.mjs
@@ -0,0 +1,120 @@
+import { chmodSync, mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { delimiter, join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import { parse } from 'yaml'
+import { runProcessSync } from '../../src/shared/child-process/run-process'
+
+const action = parse(
+  readFileSync('.github/actions/prepare-linux-package-fixture/action.yml', 'utf8')
+)
+const load = action.runs.steps.find((step) => step.id === 'image')
+const workflow = (name) => parse(readFileSync(`.github/workflows/${name}.yml`, 'utf8'))
+let directory
+
+afterEach(() => {
+  if (directory) {
+    rmSync(directory, { recursive: true, force: true })
+  }
+})
+
+function exercise({ hit = false, save = false, loadFails = false, inspectFails = false } = {}) {
+  directory = mkdtempSync(join(tmpdir(), 'orca-package-cache-'))
+  const bin = join(directory, 'bin')
+  mkdirSync(bin)
+  const commandLog = join(directory, 'commands')
+  const output = join(directory, 'output')
+  writeFileSync(commandLog, '')
+  writeFileSync(output, '')
+  const docker = join(bin, 'docker')
+  writeFileSync(
+    docker,
+    '#!/bin/bash\n' +
+      'echo "$*" >> "$COMMAND_LOG"\n' +
+      'if [[ "$1" == load && "$LOAD_FAILS" == true ]]; then exit 1; fi\n' +
+      'if [[ "$1 $2" == "image inspect" ]]; then\n' +
+      '  if [[ "$INSPECT_FAILS" == true ]]; then exit 1; fi\n' +
+      '  echo sha256:fixture-image\n' +
+      'fi\n'
+  )
+  chmodSync(docker, 0o755)
+  const result = runProcessSync({
+    program: 'bash',
+    args: ['-c', load.run],
+    env: {
+      ...process.env,
+      ORCA_BACKGROUND_LAUNCH: '1',
+      PATH: `${bin}${delimiter}${process.env.PATH ?? ''}`,
+      RUNNER_TEMP: directory,
+      GITHUB_OUTPUT: output,
+      COMMAND_LOG: commandLog,
+      FIXTURE: 'cli-launch-contract',
+      CACHE_HIT: String(hit),
+      SAVE_CACHE: String(save),
+      LOAD_FAILS: String(loadFails),
+      INSPECT_FAILS: String(inspectFails)
+    },
+    timeoutMs: 10_000
+  })
+  expect(result.code, result.stderr).toBe(0)
+  return { commands: readFileSync(commandLog, 'utf8'), output: readFileSync(output, 'utf8') }
+}
+
+describe.runIf(process.platform !== 'win32')('fixture cache fallbacks', () => {
+  it('leaves a PR cache miss to the existing runner without building or exporting', () => {
+    expect(exercise()).toEqual({ commands: '', output: '' })
+  })
+
+  it.each([{ loadFails: true }, { inspectFails: true }])(
+    'discards an unusable restored cache: %j',
+    (failure) => {
+      const result = exercise({ hit: true, ...failure })
+      expect(result.output).toBe('')
+      expect(result.commands).toContain('load --input')
+      expect(result.commands).not.toMatch(/(?:build|save) /)
+    }
+  )
+
+  it('returns the local image tag after a successful load', () => {
+    const result = exercise({ hit: true })
+    expect(result.output).toBe('image=orca-package-fixture-cli-launch-contract:cache\n')
+    expect(result.commands).not.toMatch(/(?:build|save) /)
+  })
+
+  it('builds and exports inline cache only when the warmer has no usable image', () => {
+    const result = exercise({ save: true })
+    expect(result.commands).toContain(
+      'build --platform linux/amd64 --build-arg BUILDKIT_INLINE_CACHE=1'
+    )
+    expect(result.commands).toContain(
+      '--file config/docker/cli-launch-contract/Dockerfile config/docker/cli-launch-contract'
+    )
+    expect(result.commands).toContain('save --output')
+    expect(result.output).toBe('image=orca-package-fixture-cli-launch-contract:cache\nbuilt=true\n')
+  })
+})
+
+it('uses exact context/platform keys and the same restore-only action in package checks', () => {
+  const cache = action.runs.steps.find((step) => step.id === 'cache')
+  expect(cache.with.key).toContain('linux-amd64')
+  expect(cache.with.key).toContain("format('config/docker/{0}/**', inputs.fixture)")
+  expect(cache.with.key).toContain('.github/actions/prepare-linux-package-fixture/action.yml')
+  expect(cache.with['restore-keys']).toBeUndefined()
+  expect(action.inputs['save-cache'].default).toBe('false')
+  const prepared = workflow('pr').jobs.package.steps.filter((step) =>
+    step.uses?.endsWith('/prepare-linux-package-fixture')
+  )
+  expect(prepared.map((step) => step.with)).toEqual([
+    { fixture: 'headless-serve-shutdown' },
+    { fixture: 'cli-launch-contract' }
+  ])
+  const warm = workflow('ci-cache-warmup').jobs['warm-linux-package-fixtures']
+  expect(warm.steps.slice(1).map((step) => step.with.fixture)).toEqual(
+    prepared.map((step) => step.with.fixture)
+  )
+  expect(
+    warm.steps
+      .slice(1)
+      .every((step) => step.with['save-cache'] === "${{ github.event_name != 'pull_request' }}")
+  ).toBe(true)
+})
diff --git a/config/scripts/locale-translation-policy.mjs b/config/scripts/locale-translation-policy.mjs
index af88805b8c4b..75f50d15ff62 100644
--- a/config/scripts/locale-translation-policy.mjs
+++ b/config/scripts/locale-translation-policy.mjs
@@ -38,6 +38,7 @@ export const NEVER_TRANSLATE_VALUES = new Set([
   'Claude Agent Teams',
   'Cline',
   'Codebuff',
+  'Freebuff',
   'Codex',
   'Command Code',
   'Cursor',
diff --git a/config/scripts/localization-extraction-call-syntax.test.mjs b/config/scripts/localization-extraction-call-syntax.test.mjs
new file mode 100644
index 000000000000..125fe9c4fcb9
--- /dev/null
+++ b/config/scripts/localization-extraction-call-syntax.test.mjs
@@ -0,0 +1,56 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { findKeys } from 'i18next-cli'
+import { describe, expect, it } from 'vitest'
+
+const require = createRequire(import.meta.url)
+const commonJsFindKeys = require('i18next-cli').findKeys
+
+const calls = {
+  normal: "translate('probe.normal', 'Normal')",
+  block: "translate /* comment */ ('probe.block', 'Block')",
+  line: "translate\n// comment\n('probe.line', 'Line')",
+  member: "i18n./* member */t /* call */ ('probe.member', 'Member')",
+  optional: "translate?. /* optional */ ('probe.optional', 'Optional')",
+  generic: "translate /* generic */ <string>('probe.generic', 'Generic')",
+  dollar: "$api.t /* member */ ('probe.dollar', 'Dollar')",
+  unicode: "transl\\u0061te('probe.unicode', 'Unicode')"
+}
+
+describe.each([
+  ['ES module', findKeys],
+  ['CommonJS', commonJsFindKeys]
+])('localization extraction through %s', (_name, extractKeys) => {
+  it('keeps keys in calls containing comments or escaped identifiers', async () => {
+    const directory = mkdtempSync(join(tmpdir(), 'orca-extraction-syntax-'))
+    try {
+      for (const [name, source] of Object.entries(calls)) {
+        writeFileSync(join(directory, `${name}.ts`), source)
+      }
+      const errors = []
+      const result = await extractKeys(
+        {
+          locales: ['en'],
+          extract: {
+            input: [join(directory, '*.ts').replaceAll('\\', '/')],
+            defaultNS: false,
+            functions: ['t', '*.t', 'translate'],
+            disablePlurals: true
+          }
+        },
+        undefined,
+        errors
+      )
+      expect(errors).toEqual([])
+      expect([...result.allKeys.values()].map((entry) => entry.key).sort()).toEqual(
+        Object.keys(calls)
+          .map((name) => `probe.${name}`)
+          .sort()
+      )
+    } finally {
+      rmSync(directory, { recursive: true, force: true })
+    }
+  })
+})
diff --git a/config/scripts/localization-extraction-change-scope.mjs b/config/scripts/localization-extraction-change-scope.mjs
new file mode 100644
index 000000000000..21fccd98d9bd
--- /dev/null
+++ b/config/scripts/localization-extraction-change-scope.mjs
@@ -0,0 +1,32 @@
+import { readFileSync } from 'node:fs'
+import { pathToFileURL } from 'node:url'
+
+const TOOLCHAIN_FILES = new Set([
+  'package.json',
+  'pnpm-lock.yaml',
+  'pnpm-workspace.yaml',
+  'tsconfig.json',
+  '.npmrc',
+  '.pnpmfile.cjs',
+  '.github/workflows/pr.yml'
+])
+
+export function affectsLocalizationExtraction(paths) {
+  return paths.some(
+    (path) =>
+      TOOLCHAIN_FILES.has(path) ||
+      // Include all source paths so catalog moves and future extractor inputs stay covered.
+      path.startsWith('src/') ||
+      path.startsWith('config/i18next.') ||
+      path.startsWith('config/tsconfig') ||
+      path.startsWith('config/patches/') ||
+      path.startsWith('config/scripts/localization-') ||
+      path.startsWith('config/scripts/verify-localization-') ||
+      path.startsWith('.github/actions/install-node-dependencies/')
+  )
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  const changed = readFileSync(process.argv[2], 'utf8').split('\0').filter(Boolean)
+  process.stdout.write(`${affectsLocalizationExtraction(changed)}\n`)
+}
diff --git a/config/scripts/localization-extraction-change-scope.test.mjs b/config/scripts/localization-extraction-change-scope.test.mjs
new file mode 100644
index 000000000000..8852965ad301
--- /dev/null
+++ b/config/scripts/localization-extraction-change-scope.test.mjs
@@ -0,0 +1,59 @@
+import { readFileSync } from 'node:fs'
+import { expect, it } from 'vitest'
+import { parse } from 'yaml'
+import { affectsLocalizationExtraction } from './localization-extraction-change-scope.mjs'
+
+it.each([
+  'src/renderer/src/components/Example.tsx',
+  'src/main/notifications.ts',
+  'src/renderer/src/i18n/locales/en.json',
+  'config/i18next.config.ts',
+  'config/scripts/verify-localization-extraction.mjs',
+  'config/scripts/localization-extraction-change-scope.mjs',
+  'config/patches/i18next-cli.patch',
+  'package.json',
+  'pnpm-lock.yaml',
+  'pnpm-workspace.yaml',
+  'tsconfig.json',
+  'config/tsconfig.web.json',
+  '.npmrc',
+  '.pnpmfile.cjs',
+  '.github/workflows/pr.yml',
+  '.github/actions/install-node-dependencies/action.yml'
+])('retains extraction when an input changes: %s', (path) => {
+  expect(affectsLocalizationExtraction([path])).toBe(true)
+})
+
+it('avoids extraction for unrelated CI, documentation, and native changes', () => {
+  expect(
+    affectsLocalizationExtraction([
+      '.github/workflows/e2e.yml',
+      'config/scripts/run-ssh-docker-e2e.mjs',
+      'docs/reference/ci-runner-efficiency.md',
+      'native/windows-registry/src/addon.cc'
+    ])
+  ).toBe(false)
+})
+
+it('preserves deleted and renamed inputs and falls back to extraction on detection failure', () => {
+  const workflow = parse(
+    readFileSync(new URL('../../.github/workflows/pr.yml', import.meta.url), 'utf8')
+  )
+  const step = workflow.jobs.static_analysis.steps.find(
+    (candidate) => candidate.name === 'Verify localization extraction'
+  )
+  expect(step.env).toEqual({
+    BASE_SHA: '${{ github.event.pull_request.base.sha }}'
+  })
+  // The base side comes from the merge ref's first parent, so the gate needs no merge base and
+  // works on a shallow checkout. The payload head SHA is no longer read: HEAD is the merged tree
+  // the gate is actually deciding about.
+  expect(step.run).toContain('node config/scripts/git-pull-request-diff-base.mjs "$BASE_SHA"')
+  expect(step.run).toContain('git diff --name-only --no-renames -z "$DIFF_BASE" HEAD')
+  expect(step.run).not.toContain('--diff-filter')
+  expect(step.run).toContain('&& [ "$scope" = false ]; then')
+  expect(step.run).toMatch(/else\s+pnpm run verify:localization-extraction\s+fi/)
+  expect(
+    affectsLocalizationExtraction(['src/old-translations.ts', 'docs/moved-translations.ts'])
+  ).toBe(true)
+})
diff --git a/config/scripts/localization-package-contract.test.mjs b/config/scripts/localization-package-contract.test.mjs
index 9e744939bfcc..434bde944356 100644
--- a/config/scripts/localization-package-contract.test.mjs
+++ b/config/scripts/localization-package-contract.test.mjs
@@ -14,7 +14,10 @@ describe('localization package scripts', () => {
   it('keeps the runtime-required English subset generated and checked', () => {
     expect(scripts['verify:localization-runtime-catalog']).toBeDefined()
     expect(scripts['sync:localization-runtime-catalog']).toBeDefined()
-    expect(scripts.lint).toContain('verify:localization-runtime-catalog')
+    expect(scripts['verify:localization-catalogs']).toBe(
+      'pnpm run verify:localization-catalog && pnpm run verify:localization-runtime-catalog'
+    )
+    expect(scripts.lint).toContain('verify:localization-catalogs')
   })
 
   it('does not expose whole-catalog translation and repair commands', () => {
diff --git a/config/scripts/mobile-recording-pin-checkout.test.mjs b/config/scripts/mobile-recording-pin-checkout.test.mjs
deleted file mode 100644
index f45db12bdbeb..000000000000
--- a/config/scripts/mobile-recording-pin-checkout.test.mjs
+++ /dev/null
@@ -1,93 +0,0 @@
-import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { pathToFileURL } from 'node:url'
-import { expect, it } from 'vitest'
-import { parse } from 'yaml'
-import { runProcessSync } from './script-child-process.mjs'
-
-const workflow = parse(
-  readFileSync(new URL('../../.github/workflows/mobile.yml', import.meta.url), 'utf8')
-)
-
-it('keeps full ancestry and credentials for lazy pinned-tree reads', () => {
-  const job = workflow.jobs['recording-pin']
-  const checkout = job.steps.find((step) => step.uses?.startsWith('actions/checkout@'))
-  expect(checkout.with['fetch-depth']).toBe(0)
-  expect(checkout.with.filter).toBe('blob:none')
-  expect(checkout.with['persist-credentials']).not.toBe(false)
-  expect(job.if).toBeUndefined()
-  expect(workflow.on.push.branches).toEqual(['main'])
-  expect(workflow.concurrency.group).toContain('github.sha')
-  expect(job.steps.find((step) => step.name === 'Check the recording pin is reachable').run).toBe(
-    'pnpm exec tsx scripts/rpc-recording-pin-guard.mts ancestry'
-  )
-  const reproduce = job.steps.find(
-    (step) => step.name === 'Reproduce the corpus from the pinned tree'
-  )
-  expect(reproduce.run).toContain('reproduce --if-changed-since "$PIN_GUARD_BASE"')
-  expect(reproduce.run).toContain(
-    'else\n  pnpm exec tsx scripts/rpc-recording-pin-guard.mts reproduce\nfi'
-  )
-})
-
-it('retains ancestry while fetching a missing pinned blob for a detached worktree', () => {
-  const directory = mkdtempSync(join(tmpdir(), 'mobile-pin-checkout-'))
-  const source = join(directory, 'source')
-  const checkout = join(directory, 'checkout')
-  const pinnedTree = join(directory, 'pinned-tree')
-  const git = (cwd, ...args) => {
-    const result = runProcessSync({ program: 'git', args, cwd })
-    expect(result.code, result.stderr).toBe(0)
-    return result.stdout.trim()
-  }
-  try {
-    git(directory, 'init', '--quiet', source)
-    git(source, 'symbolic-ref', 'HEAD', 'refs/heads/main')
-    git(source, 'config', 'user.name', 'Pin checkout fixture')
-    git(source, 'config', 'user.email', 'pin-checkout@example.invalid')
-    git(source, 'config', 'uploadpack.allowFilter', 'true')
-    git(source, 'config', 'uploadpack.allowAnySHA1InWant', 'true')
-    const corpus = 'mobile/rpc-foundation/goldens/fixture.json'
-    mkdirSync(join(source, 'mobile/rpc-foundation/goldens'), { recursive: true })
-    const original = '{"baseline":"original historical recording"}\n'
-    const commit = () => {
-      git(source, 'add', '-A')
-      git(source, '-c', 'commit.gpgsign=false', 'commit', '--quiet', '-m', 'recording')
-      return git(source, 'rev-parse', 'HEAD')
-    }
-    writeFileSync(join(source, corpus), original)
-    const baseline = commit()
-    const oldBlob = git(source, 'rev-parse', `${baseline}:${corpus}`)
-    writeFileSync(join(source, corpus), '{"baseline":"current recording"}\n')
-    commit()
-    git(
-      directory,
-      'clone',
-      '--filter=blob:none',
-      '--no-checkout',
-      '--single-branch',
-      '--no-tags',
-      pathToFileURL(source).href,
-      checkout
-    )
-    git(checkout, 'checkout', '--quiet', '--force', 'main')
-
-    expect(git(checkout, 'rev-parse', '--is-shallow-repository')).toBe('false')
-    expect(git(checkout, 'rev-list', '--count', 'HEAD')).toBe('2')
-    git(checkout, 'merge-base', '--is-ancestor', baseline, 'HEAD')
-    expect(git(checkout, 'rev-list', '--objects', '--missing=print', 'HEAD')).toContain(
-      `?${oldBlob}`
-    )
-
-    git(checkout, 'worktree', 'add', '--detach', pinnedTree, baseline)
-
-    expect(readFileSync(join(pinnedTree, corpus), 'utf8')).toBe(original)
-    expect(git(checkout, 'rev-list', '--objects', '--missing=print', 'HEAD')).not.toContain(
-      `?${oldBlob}`
-    )
-    git(checkout, 'worktree', 'remove', '--force', pinnedTree)
-  } finally {
-    rmSync(directory, { recursive: true, force: true })
-  }
-})
diff --git a/config/scripts/mobile-release-check-scope.test.mjs b/config/scripts/mobile-release-check-scope.test.mjs
index faf90039feb3..eafa3194238e 100644
--- a/config/scripts/mobile-release-check-scope.test.mjs
+++ b/config/scripts/mobile-release-check-scope.test.mjs
@@ -66,13 +66,18 @@ it('runs Ruby checks when the changed-file evidence is empty', () => {
   expect(shouldRunMobileReleaseChecks([])).toBe(true)
 })
 
-it('gates only Ruby steps and keeps ordinary mobile validation unconditional', () => {
+it('gates Ruby independently and retains mobile static validation', () => {
   expect(steps[0].with['fetch-depth']).toBe(2)
   expect(detector['working-directory']).toBe('.')
   expect(steps.indexOf(detector)).toBeGreaterThan(
     steps.findIndex((step) => step.uses === './.github/actions/install-node-dependencies')
   )
-  const gated = steps.filter((step) => step.if !== undefined)
+  const gated = steps.filter(
+    (step) =>
+      step.if !== undefined &&
+      step.name !== 'Test' &&
+      step.name !== 'Summarize RPC recording changes'
+  )
   expect(gated.map((step) => step.name)).toEqual([
     'Setup Ruby and fastlane',
     'Test iOS release version resolution',
@@ -82,13 +87,7 @@ it('gates only Ruby steps and keeps ordinary mobile validation unconditional', (
   for (const step of gated) {
     expect(step.if).toBe("steps.ruby-scope.outputs.should_run != 'false'")
   }
-  for (const name of [
-    'Typecheck',
-    'Typecheck tests (ratchet)',
-    'Test',
-    'Lint',
-    'Check formatting'
-  ]) {
+  for (const name of ['Typecheck', 'Typecheck tests (ratchet)', 'Lint', 'Check formatting']) {
     expect(steps.find((step) => step.name === name)?.if).toBeUndefined()
     expect(steps.some((step) => step.name === name)).toBe(true)
   }
@@ -108,7 +107,7 @@ it('gates only Ruby steps and keeps ordinary mobile validation unconditional', (
   )
 })
 
-function fixture() {
+function fixture(detectorStep = detector) {
   const directory = mkdtempSync(join(tmpdir(), 'mobile-release-scope-'))
   directories.push(directory)
   const git = (...args) => {
@@ -130,7 +129,8 @@ function fixture() {
   for (const file of [
     'package.json',
     'config/scripts/pr-code-change-scope.mjs',
-    'config/scripts/mobile-release-check-scope.mjs'
+    'config/scripts/mobile-release-check-scope.mjs',
+    'config/scripts/mobile-test-change-scope.mjs'
   ]) {
     copyFileSync(join(root, file), join(directory, file))
   }
@@ -152,7 +152,7 @@ function fixture() {
     const output = join(directory, 'github-output')
     const result = runProcessSync({
       program: 'bash',
-      args: ['-e', '-c', detector.run],
+      args: ['-e', '-c', detectorStep.run],
       cwd: directory,
       env: { ...process.env, GITHUB_OUTPUT: output, RUNNER_TEMP: directory }
     })
@@ -189,3 +189,32 @@ describe.skipIf(process.platform === 'win32')('the Linux workflow detector comma
     expect(repo.detect()).toBe('should_run=true\n')
   })
 })
+
+describe.skipIf(process.platform === 'win32')('the mobile test detector command', () => {
+  const testDetector = steps.find((step) => step.id === 'test-scope')
+  it('skips release-only changes while retaining source changes', () => {
+    const repo = fixture(testDetector)
+    repo.write('mobile/fastlane/Fastfile', 'default_platform(:android)\n')
+    repo.commit()
+    expect(repo.detect()).toBe('should_run=false\n')
+    repo.write('mobile/src/view.tsx', 'export const view = 2\n')
+    repo.commit()
+    expect(repo.detect()).toBe('should_run=false\nshould_run=true\n')
+  })
+  it('retains tests after source moves into a documentation directory', () => {
+    const repo = fixture(testDetector)
+    repo.git('mv', 'mobile/src/view.tsx', 'mobile/README.md')
+    repo.commit()
+    expect(repo.detect()).toBe('should_run=true\n')
+  })
+  it('retains tests when the diff is unavailable', () => {
+    expect(fixture(testDetector).detect()).toBe('should_run=true\n')
+  })
+  it('retains tests when the classifier cannot execute', () => {
+    const repo = fixture(testDetector)
+    repo.write('mobile/fastlane/Fastfile', 'default_platform(:android)\n')
+    repo.commit()
+    rmSync(join(repo.directory, 'config/scripts/mobile-test-change-scope.mjs'))
+    expect(repo.detect()).toBe('should_run=true\n')
+  })
+})
diff --git a/config/scripts/mobile-release-shell-switch-workflow.test.mjs b/config/scripts/mobile-release-shell-switch-workflow.test.mjs
index 28b94945cc21..40cc20a95bab 100644
--- a/config/scripts/mobile-release-shell-switch-workflow.test.mjs
+++ b/config/scripts/mobile-release-shell-switch-workflow.test.mjs
@@ -120,6 +120,8 @@ const BUNDLER_CACHE_PATHS = ['metro-cache', '.expo', 'node_modules/.cache']
 const REVIEWED_COMPUTED_PATHS = [
   '${{ steps.electron-package-cache.outputs.cache-root }}',
   '${{ steps.pnpm-store.outputs.path }}',
+  // Only pnpm's lockfile-verified.jsonl record, never Metro transforms.
+  '${{ steps.verification-cache.outputs.path }}',
   "${{ github.event_name != 'pull_request' && 'pnpm' || '' }} store"
 ]
 
diff --git a/config/scripts/mobile-test-change-scope.mjs b/config/scripts/mobile-test-change-scope.mjs
new file mode 100644
index 000000000000..cdd04d6edf50
--- /dev/null
+++ b/config/scripts/mobile-test-change-scope.mjs
@@ -0,0 +1,34 @@
+import { appendFileSync, readFileSync } from 'node:fs'
+import { pathToFileURL } from 'node:url'
+import { isDocsOnlyPath } from './pr-code-change-scope.mjs'
+
+const NON_TEST_FILES = new Set([
+  'mobile/Gemfile',
+  'mobile/Gemfile.lock',
+  'mobile/README.md',
+  '.github/workflows/mobile-ios-release.yml',
+  'config/scripts/pr-code-change-scope.mjs',
+  'config/scripts/pr-code-change-scope.test.mjs',
+  'config/scripts/mobile-release-check-scope.mjs',
+  'config/scripts/mobile-release-check-scope.test.mjs'
+])
+
+export function shouldRunMobileTests(files) {
+  return (
+    files.length === 0 ||
+    files.some(
+      (file) =>
+        file.split('/').includes('..') ||
+        (!isDocsOnlyPath(file) &&
+          !NON_TEST_FILES.has(file) &&
+          !file.startsWith('mobile/docs/') &&
+          !file.startsWith('mobile/fastlane/'))
+    )
+  )
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  const input = readFileSync(process.argv[2], 'utf8')
+  const files = input.endsWith('\0') ? input.slice(0, -1).split('\0') : []
+  appendFileSync(process.env.GITHUB_OUTPUT, `should_run=${shouldRunMobileTests(files)}\n`)
+}
diff --git a/config/scripts/mobile-test-change-scope.test.mjs b/config/scripts/mobile-test-change-scope.test.mjs
new file mode 100644
index 000000000000..8859daca4486
--- /dev/null
+++ b/config/scripts/mobile-test-change-scope.test.mjs
@@ -0,0 +1,60 @@
+import { readFileSync } from 'node:fs'
+import { parse } from 'yaml'
+import { expect, it } from 'vitest'
+import { shouldRunMobileTests } from './mobile-test-change-scope.mjs'
+
+it.each([
+  'docs/ci.md',
+  'mobile/docs/release.md',
+  'mobile/README.md',
+  'mobile/Gemfile.lock',
+  'mobile/fastlane/Fastfile',
+  '.github/workflows/mobile-ios-release.yml',
+  'config/scripts/pr-code-change-scope.mjs',
+  'config/scripts/mobile-release-check-scope.test.mjs'
+])('skips only known non-test inputs: %s', (file) => {
+  expect(shouldRunMobileTests([file])).toBe(false)
+  expect(shouldRunMobileTests([file, 'mobile/src/changed.ts'])).toBe(true)
+})
+
+it.each([
+  'mobile/src/view.tsx',
+  'mobile/app/_layout.tsx',
+  'mobile/scripts/check.ts',
+  'mobile/rpc-foundation/goldens/recording.json',
+  'mobile/vitest.config.ts',
+  'mobile/vitest.setup.ts',
+  'mobile/pnpm-lock.yaml',
+  'pnpm-lock.yaml',
+  'src/main/runtime/runtime-rpc.ts',
+  'src/shared/protocol-version.ts',
+  '.github/workflows/mobile.yml',
+  '.github/actions/install-node-dependencies/action.yml',
+  'config/scripts/mobile-test-change-scope.mjs',
+  'unknown-input',
+  'mobile/docs/../../src/source.ts'
+])('retains source, fixtures, toolchain, selector and unknown changes: %s', (file) => {
+  expect(shouldRunMobileTests([file])).toBe(true)
+})
+
+it('retains tests on missing evidence and a move out of the source tree', () => {
+  expect(shouldRunMobileTests([])).toBe(true)
+  expect(shouldRunMobileTests(['mobile/src/deleted.ts', 'mobile/docs/moved.ts'])).toBe(true)
+})
+
+it('skips only tests, after successful detection, and retains all other mobile gates', () => {
+  const workflow = parse(
+    readFileSync(new URL('../../.github/workflows/mobile.yml', import.meta.url), 'utf8')
+  )
+  const steps = workflow.jobs.verify.steps
+  expect(workflow.on.pull_request.paths).toContain('config/scripts/mobile-test-change-scope*')
+  const detector = steps.find((step) => step.id === 'test-scope')
+  expect(detector.run).toContain('git diff --name-only --no-renames -z HEAD^1 HEAD')
+  expect(detector.run.match(/should_run=true/g)).toHaveLength(2)
+  expect(steps.find((step) => step.name === 'Test').if).toBe(
+    "steps.test-scope.outputs.should_run != 'false'"
+  )
+  for (const name of ['Typecheck', 'Typecheck tests (ratchet)', 'Lint', 'Check formatting']) {
+    expect(steps.find((step) => step.name === name).if).toBeUndefined()
+  }
+})
diff --git a/config/scripts/mobile-web-app-agent-history-render.test.mjs b/config/scripts/mobile-web-app-agent-history-render.test.mjs
index 08ce37ea6c97..b1c69a880623 100644
--- a/config/scripts/mobile-web-app-agent-history-render.test.mjs
+++ b/config/scripts/mobile-web-app-agent-history-render.test.mjs
@@ -9,6 +9,7 @@ import {
   createBundleServer,
   installShellDouble,
   readBridgeFaultGrant,
+  readBridgePagePainted,
   readBridgeProtocolVersion,
   readShellCsp
 } from './mobile-web-app-render-harness.mjs'
@@ -110,6 +111,7 @@ let routeChunks = {}
 let cspHeader = null
 let bridgeVersion = null
 let faultGrant = null
+let paintName = null
 
 beforeAll(async () => {
   if (!bundles) {
@@ -118,6 +120,7 @@ beforeAll(async () => {
   cspHeader = await readShellCsp()
   bridgeVersion = await readBridgeProtocolVersion()
   faultGrant = await readBridgeFaultGrant()
+  paintName = await readBridgePagePainted()
   scratch = await mkdtemp(join(tmpdir(), 'orca-mobile-web-app-agent-history-'))
   const built = await buildMobileWebAppBundle({ outDir: join(scratch, 'bundle') })
   routeChunks = built.routeChunks
@@ -227,9 +230,11 @@ async function openRoute(route, awaitText, options = {}) {
   return opened
 }
 
-/** Every grant-gated notify the page posted, whole and in order, as the shell received them. */
-function readNotifies(page) {
-  return page.evaluate(() => globalThis.__orcaRenderCheckNotifies ?? [])
+/** Every grant-gated notify the page posted, whole and in order, as the shell received them. The
+ *  paint report is not one: every page posts it once its route screen has a frame. */
+async function readNotifies(page) {
+  const notifies = await page.evaluate(() => globalThis.__orcaRenderCheckNotifies ?? [])
+  return notifies.filter((frame) => frame.name !== paintName)
 }
 
 describeRender('the agent-history route in a real browser', () => {
diff --git a/config/scripts/mobile-web-app-bundle-test-fixture.mjs b/config/scripts/mobile-web-app-bundle-test-fixture.mjs
new file mode 100644
index 000000000000..3846cc4a54e8
--- /dev/null
+++ b/config/scripts/mobile-web-app-bundle-test-fixture.mjs
@@ -0,0 +1,49 @@
+import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { dirname, join } from 'node:path'
+import { deserialize, serialize } from 'node:v8'
+import { bundleMobileWebApp, buildMobileWebAppBundle } from './build-mobile-web-app-bundle.mjs'
+
+export async function withScratch(run) {
+  const scratch = await mkdtemp(join(tmpdir(), 'orca-mobile-web-app-test-'))
+  try {
+    return await run(scratch)
+  } finally {
+    await rm(scratch, { recursive: true, force: true })
+  }
+}
+
+// Snapshots preserve Buffer methods and give each assertion its own mutable copy.
+let appBundleSnapshot
+let writtenBundleSnapshot
+
+export async function readAppBundle() {
+  appBundleSnapshot ??= bundleMobileWebApp().then(serialize)
+  // Deserialized Buffers alias their snapshot, so copy it before exposing them.
+  return deserialize(Buffer.from(await appBundleSnapshot))
+}
+
+export async function readWrittenBundle() {
+  writtenBundleSnapshot ??= withScratch(async (scratch) => {
+    const { outDir, ...result } = await buildMobileWebAppBundle({ outDir: join(scratch, 'bundle') })
+    const html = await readFile(join(outDir, 'index.html'), 'utf8')
+    const files = await Promise.all(
+      ['manifest.json', ...result.manifest.assets.map((asset) => asset.path)].map(async (file) => ({
+        file,
+        bytes: await readFile(join(outDir, file))
+      }))
+    )
+    return serialize({ ...result, html, files })
+  })
+  return deserialize(Buffer.from(await writtenBundleSnapshot))
+}
+
+export async function copyWrittenBundle(outDir) {
+  const snapshot = await readWrittenBundle()
+  for (const { file, bytes } of snapshot.files) {
+    const destination = join(outDir, file)
+    await mkdir(dirname(destination), { recursive: true })
+    await writeFile(destination, bytes)
+  }
+  return { ...snapshot, outDir }
+}
diff --git a/config/scripts/mobile-web-app-drawer-render.test.mjs b/config/scripts/mobile-web-app-drawer-render.test.mjs
index 051072815a48..22d3b14a1d5d 100644
--- a/config/scripts/mobile-web-app-drawer-render.test.mjs
+++ b/config/scripts/mobile-web-app-drawer-render.test.mjs
@@ -302,9 +302,6 @@ describeDrawer('the device Back key reaching a sheet on the page', () => {
         host: SHELL_HOST,
         storage: {},
         faultGrant,
-        // What a shell that knows the lane offers, and the frame it would send. Without the first
-        // the page posts no claim at all, which is the older-shell arm the unit suites pin.
-        accepts: [backNames.claim],
         backFrame: backNames.frame
       })
       await page.goto(`${origin}/`, { waitUntil: 'load' })
diff --git a/config/scripts/mobile-web-app-render-harness.mjs b/config/scripts/mobile-web-app-render-harness.mjs
index b7a43815a1e7..f07e0c130a1a 100644
--- a/config/scripts/mobile-web-app-render-harness.mjs
+++ b/config/scripts/mobile-web-app-render-harness.mjs
@@ -164,9 +164,9 @@ export async function readBrowserFrameQuality() {
 }
 
 /**
- * The page's client-identity placeholder and the `init.accepts` name that unlocks it, read from
- * the module that declares both. A rig carrying its own copy would go on passing after the real
- * pair moved, which is the whole reason every other constant here is read rather than retyped.
+ * The page's client-identity placeholder, read from the module that declares it. A rig carrying its
+ * own copy would go on passing after the real one moved, which is the whole reason every other
+ * constant here is read rather than retyped.
  */
 export async function readBridgePageClientIdentity() {
   const source = await readFile(
@@ -180,10 +180,7 @@ export async function readBridgePageClientIdentity() {
     }
     return match[1]
   }
-  return {
-    placeholder: read('BRIDGE_PAGE_CLIENT_ID'),
-    accept: read('BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT')
-  }
+  return { placeholder: read('BRIDGE_PAGE_CLIENT_ID') }
 }
 
 /** The grant the shell offers every page, read from the same source for the same reason. */
@@ -264,7 +261,6 @@ export function installShellDouble({
   grants,
   pageRoutes = null,
   pageRouteGrants = null,
-  accepts = null,
   backFrame = null,
   replies,
   streams = [],
@@ -323,9 +319,6 @@ export function installShellDouble({
     // Omitted when the caller names none, which is the older-shell case the page falls back
     // on: an absent field is not an empty one, and the page reads the difference.
     ...(pageRouteGrants === null ? {} : { pageRouteGrants }),
-    // Omitted when a check names none, which is the shell that performs no swap and the
-    // state every other rig in this directory runs in.
-    ...(accepts === null ? {} : { accepts }),
     // Omitted for a shell too old to name one, which is the case the page has a panel for.
     ...(route === null ? {} : { route }),
     ...(host === null ? {} : { host }),
diff --git a/config/scripts/mobile-web-app-render.test.mjs b/config/scripts/mobile-web-app-render.test.mjs
index 1cd797d26007..84d3164c7cb3 100644
--- a/config/scripts/mobile-web-app-render.test.mjs
+++ b/config/scripts/mobile-web-app-render.test.mjs
@@ -135,8 +135,7 @@ async function openPage({
   shellHost = SHELL_HOST,
   shellStorage = {},
   shellGrants,
-  shellPageRoutes = null,
-  shellAccepts = null
+  shellPageRoutes = null
 } = {}) {
   const page = await browser.newPage({ viewport: { width: 390, height: 844 } })
   if (shellRoute !== undefined) {
@@ -151,8 +150,7 @@ async function openPage({
       storage: shellStorage,
       faultGrant,
       grants: shellGrants ?? [faultGrant],
-      pageRoutes: shellPageRoutes,
-      accepts: shellAccepts
+      pageRoutes: shellPageRoutes
     })
   }
   const errors = []
@@ -587,11 +585,7 @@ describeRender('the Route A page in a real browser', () => {
       })
     )
     try {
-      // The one case that advertises the report, because it is the only one asserting on it.
-      const opened = await openPage({
-        shellRoute: { pathname: HOST_ROUTE },
-        shellAccepts: [paintName]
-      })
+      const opened = await openPage({ shellRoute: { pathname: HOST_ROUTE } })
       await opened.page.goto(`${origin}/`, { waitUntil: 'load' })
       await opened.page.waitForFunction(
         () => document.documentElement.dataset.orcaWebEntry === 'mounted',
@@ -639,7 +633,6 @@ describeRender('the Route A page in a real browser', () => {
       const route = `${HOST_ROUTE}/pr/render-check-tree`
       const opened = await openPage({
         shellRoute: { pathname: route },
-        shellAccepts: [paintName],
         shellPageRoutes: [HOST_ROUTE_PATTERN, '/h/[hostId]/pr/[worktreeId]']
       })
       await opened.page.goto(`${origin}/`, { waitUntil: 'load' })
diff --git a/config/scripts/mobile-web-app-route-manifest.test.mjs b/config/scripts/mobile-web-app-route-manifest.test.mjs
index b4c29d8d9d83..1cbf256bd7a3 100644
--- a/config/scripts/mobile-web-app-route-manifest.test.mjs
+++ b/config/scripts/mobile-web-app-route-manifest.test.mjs
@@ -1,4 +1,4 @@
-import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
@@ -250,23 +250,3 @@ describe('the synthesized RequireContext', () => {
     expect(() => context('constructor')).toThrow('no route module')
   })
 })
-
-describe('the web entry', () => {
-  it('leaves the suspense boundary to expo-router', async () => {
-    const entry = await readFile(join(projectDir, 'mobile', 'web-entry', 'index.tsx'), 'utf8')
-    // A second boundary around the whole tree catches nothing the router has not already caught,
-    // and would only make the fallback ambiguous about which layer suspended.
-    expect(entry).not.toContain('Suspense')
-  })
-
-  itBundling('because the router already wraps every screen in one', async () => {
-    // The premise of the test above, read off the copy that is bundled: getQualifiedRouteComponent
-    // wraps each screen itself, which is what makes the lazy route manifest safe without a
-    // boundary of our own.
-    const useScreens = await readFile(
-      join(projectDir, 'mobile', 'node_modules', 'expo-router', 'build', 'useScreens.js'),
-      'utf8'
-    )
-    expect(useScreens).toContain('<react_1.default.Suspense fallback=')
-  })
-})
diff --git a/config/scripts/mobile-web-app-route-snapshot.mjs b/config/scripts/mobile-web-app-route-snapshot.mjs
new file mode 100644
index 000000000000..248481ee0d40
--- /dev/null
+++ b/config/scripts/mobile-web-app-route-snapshot.mjs
@@ -0,0 +1,25 @@
+import { readFileSync } from 'node:fs'
+
+export function readRouteSnapshot(route, file = process.env.ORCA_MOBILE_WEB_ROUTE_SNAPSHOT) {
+  if (!file) {
+    return undefined
+  }
+  // The test runner creates this file for one immutable checkout and deletes it on exit.
+  const snapshot = JSON.parse(readFileSync(file, 'utf8'))
+  if (snapshot.version !== 1 || !Array.isArray(snapshot.routes)) {
+    throw new Error('Invalid mobile route snapshot')
+  }
+  const entry = snapshot.routes.find((item) => item.route === route)
+  if (!entry) {
+    return undefined
+  }
+  if (
+    !Array.isArray(entry.closure?.modules) ||
+    !Array.isArray(entry.closure?.local) ||
+    !entry.closure.modules.every((item) => typeof item === 'string') ||
+    !entry.closure.local.every((item) => typeof item === 'string')
+  ) {
+    throw new Error(`Invalid mobile route closure: ${route}`)
+  }
+  return entry.closure
+}
diff --git a/config/scripts/mobile-web-app-route-snapshot.test.mjs b/config/scripts/mobile-web-app-route-snapshot.test.mjs
new file mode 100644
index 000000000000..a4dc897271e0
--- /dev/null
+++ b/config/scripts/mobile-web-app-route-snapshot.test.mjs
@@ -0,0 +1,112 @@
+import { existsSync, writeFileSync } from 'node:fs'
+import { describe, expect, it } from 'vitest'
+import { readRouteSnapshot } from './mobile-web-app-route-snapshot.mjs'
+import {
+  prepareRouteSnapshot,
+  withPreparedRouteSnapshot,
+  withRouteSnapshot
+} from './run-mobile-web-app-checks.mjs'
+import { PAGE_ROUTE_MODULES } from './mobile-web-app-page-route-modules.mjs'
+
+const collect = async (entries) => ({
+  modules: [...entries, 'node_modules/react/index.js'],
+  local: entries
+})
+
+it('collects each real route once and shares isolated results for one invocation', async () => {
+  const collected = []
+  let snapshotFile
+  await withRouteSnapshot(
+    async (file) => {
+      snapshotFile = file
+      for (const route of PAGE_ROUTE_MODULES.values()) {
+        const expected = await collect(['app/_layout', 'app/h/_layout', route])
+        expect(readRouteSnapshot(route, file)).toEqual(expected)
+        readRouteSnapshot(route, file).local.length = 0
+        expect(readRouteSnapshot(route, file)).toEqual(expected)
+      }
+      expect(readRouteSnapshot('new-route', file)).toBeUndefined()
+    },
+    async (entries) => {
+      collected.push(entries[2])
+      return collect(entries)
+    }
+  )
+  expect(collected).toEqual([...new Set(PAGE_ROUTE_MODULES.values())])
+  expect(existsSync(snapshotFile)).toBe(false)
+})
+
+it('removes the snapshot after a failed suite and propagates the failure', async () => {
+  let snapshotFile
+  await expect(
+    withRouteSnapshot(async (file) => {
+      snapshotFile = file
+      throw new Error('failed assertion')
+    }, collect)
+  ).rejects.toThrow('failed assertion')
+  expect(existsSync(snapshotFile)).toBe(false)
+})
+
+it('never launches tests after dependency collection fails', async () => {
+  await expect(
+    withRouteSnapshot(
+      () => {
+        throw new Error('must not launch')
+      },
+      async () => {
+        throw new Error('unresolved import')
+      }
+    )
+  ).rejects.toThrow('unresolved import')
+})
+
+describe('snapshot validation', () => {
+  it('leaves ordinary builds and scratch routes uncached', () => {
+    expect(readRouteSnapshot('any', '')).toBeUndefined()
+  })
+  it.each(['{}', '{', '{"version":1,"routes":[{"route":"bad","closure":{}}]}'])(
+    'rejects damaged snapshots: %s',
+    async (bytes) => {
+      await withRouteSnapshot(async (file) => {
+        writeFileSync(file, bytes)
+        expect(() => readRouteSnapshot('bad', file)).toThrow()
+      }, collect)
+    }
+  )
+})
+
+it('consumes a separately prepared snapshot and removes it after success', async () => {
+  await withRouteSnapshot(async (file) => {
+    const result = await withPreparedRouteSnapshot(file, async (prepared) => {
+      expect(prepared).toBe(file)
+      return 'verified'
+    })
+    expect(result).toBe('verified')
+    expect(existsSync(file)).toBe(false)
+  }, collect)
+})
+
+it('rejects incomplete prepared snapshots before launching tests', async () => {
+  await withRouteSnapshot(async (file) => {
+    writeFileSync(file, JSON.stringify({ version: 1, routes: [] }))
+    let launched = false
+    await expect(
+      withPreparedRouteSnapshot(file, async () => {
+        launched = true
+      })
+    ).rejects.toThrow('missing')
+    expect(launched).toBe(false)
+    expect(existsSync(file)).toBe(false)
+  }, collect)
+})
+
+it('removes previous evidence before a failed preparation', async () => {
+  await withRouteSnapshot(async (file) => {
+    await expect(
+      prepareRouteSnapshot(file, async () => {
+        throw new Error('unresolved import')
+      })
+    ).rejects.toThrow('unresolved import')
+    expect(existsSync(file)).toBe(false)
+  }, collect)
+})
diff --git a/config/scripts/mobile-web-app-session-terminal-init.test.mjs b/config/scripts/mobile-web-app-session-terminal-init.test.mjs
index 199c0f15f799..2d46fdb15c81 100644
--- a/config/scripts/mobile-web-app-session-terminal-init.test.mjs
+++ b/config/scripts/mobile-web-app-session-terminal-init.test.mjs
@@ -148,8 +148,6 @@ async function openSessionWithTerminalTab() {
     faultGrant,
     grants: [faultGrant, ...sessionGrants()],
     pageRoutes: PAGE_ROUTE_PATTERNS,
-    // The page claims an identity only against a shell that says it swaps one in.
-    accepts: [pageClientIdentity.accept],
     streams: ['session.tabs.subscribe', 'terminal.subscribe'],
     replies: {
       'worktree.show': { worktree: { id: WORKTREE, name: WORKTREE, path: `/tmp/${WORKTREE}` } },
@@ -257,8 +255,17 @@ describeRender(
       // `.xterm-screen` does: it is created by `term.open()`, which only ever runs from the
       // document's `init`. The emulator run had the surface with zero children inside a correctly
       // sized container, which is this element missing.
+      // Then the grid readable: xterm sizes its one-cell helper textarea only on a cursor move or
+      // resize, so a read the moment the screen exists can land before the replay has drained.
       await page.waitForFunction(
-        () => document.querySelector('.xterm-screen') !== null,
+        () => {
+          const cell = document.querySelector('#terminal-surface .xterm-helper-textarea')
+          return (
+            document.querySelector('.xterm-screen') !== null &&
+            cell !== null &&
+            cell.getBoundingClientRect().width > 0
+          )
+        },
         undefined,
         {
           timeout: 60_000,
diff --git a/config/scripts/mobile-web-app-terminal-probe-route.mjs b/config/scripts/mobile-web-app-terminal-probe-route.mjs
index 0e943d8c113e..799969745455 100644
--- a/config/scripts/mobile-web-app-terminal-probe-route.mjs
+++ b/config/scripts/mobile-web-app-terminal-probe-route.mjs
@@ -57,6 +57,8 @@ import { TerminalWebView } from ${JSON.stringify(componentPath)}
 
 export default function TerminalProbeRoute() {
   const handleRef = useRef(null)
+  // The terminal frame as React Native laid it out, which is what the session fits.
+  const frameRef = useRef({ width: 0, height: 0 })
   const [mounted, setMounted] = useState(true)
   const onSelectionCopy = useCallback((text) => {
     globalThis.__orcaTerminalCopied = text
@@ -71,10 +73,11 @@ export default function TerminalProbeRoute() {
     globalThis.__orcaTerminalEngineErrors = globalThis.__orcaTerminalEngineErrors ?? []
     globalThis.__orcaTerminalBeforeInput = []
     globalThis.__orcaTerminalProbe = {
-      init: (cols, rows, data) => handleRef.current?.init(cols, rows, data, false, []),
+      init: (cols, rows, initialData) =>
+        handleRef.current?.init({ cols, rows, initialData, oscLinks: [], frame: frameRef.current }),
       write: (data) => handleRef.current?.write(data),
       selectAll: () => handleRef.current?.doSelectAll(),
-      measure: () => handleRef.current?.measureFitDimensions(),
+      fit: () => handleRef.current?.fitDimensions(frameRef.current),
       awaitReady: () => handleRef.current?.awaitReady(),
       setMounted: (next) => setMounted(next)
     }
@@ -90,14 +93,21 @@ export default function TerminalProbeRoute() {
   }, [])
   return (
     <View testID="terminal-probe" style={{ flex: 1 }}>
-      {mounted ? (
-        <TerminalWebView
-          ref={handleRef}
-          onWebReady={onWebReady}
-          onEngineError={onEngineError}
-          onSelectionCopy={onSelectionCopy}
-        />
-      ) : null}
+      <View
+        style={{ flex: 1 }}
+        onLayout={(event) => {
+          frameRef.current = event.nativeEvent.layout
+        }}
+      >
+        {mounted ? (
+          <TerminalWebView
+            ref={handleRef}
+            onWebReady={onWebReady}
+            onEngineError={onEngineError}
+            onSelectionCopy={onSelectionCopy}
+          />
+        ) : null}
+      </View>
       {/* The shape the terminal's live input takes on the page: xterm's own textarea is inert by
           the document's design, so this is where typed text arrives. */}
       <TextInput testID="terminal-live-input" style={{ fontSize: 16 }} />
diff --git a/config/scripts/mobile-web-app-terminal-render.test.mjs b/config/scripts/mobile-web-app-terminal-render.test.mjs
index 3b079bd9cb2a..4a08bcece531 100644
--- a/config/scripts/mobile-web-app-terminal-render.test.mjs
+++ b/config/scripts/mobile-web-app-terminal-render.test.mjs
@@ -480,6 +480,14 @@ describeRender(
           })
           await openProbeTerminal(page)
           expect(documentChunk, 'the document was served as its own chunk').not.toBe(null)
+          // Ready is notified with the replay's fit still a frame away. Left pending, that fit
+          // commits the resized box below, the resize refit then has nothing to do, and there is no
+          // frame to hold; so the document settles first. Since the terminal is built before
+          // ready, the fixture returns fast enough to land inside that frame.
+          await page.evaluate(
+            () =>
+              new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve)))
+          )
 
           await page.evaluate((chunk) => {
             const state = globalThis.__orcaScheduler
@@ -627,14 +635,14 @@ describeRender(
       await page.close()
     }, 300_000)
 
-    it('measures a fit through the handle and records what beforeinput reports', async () => {
+    it('fits through the handle from the ready box and records what beforeinput reports', async () => {
       const { page } = await openTerminal()
       await openProbeTerminal(page)
 
-      // The handle's own round trip: a measure is a command in and a notify back, and on the page
-      // both halves are direct calls rather than a bridge. Null would mean the document answered
-      // nothing, or answered a grid too small to fit.
-      const fit = await page.evaluate(() => globalThis.__orcaTerminalProbe.measure())
+      // The fit is the app's own, from the cell box the document put in web-ready, against the
+      // frame React Native laid out, as the session's is. Null would mean the ready carried no box,
+      // or a grid too small to fit.
+      const fit = await page.evaluate(() => globalThis.__orcaTerminalProbe.fit())
       expect(fit).not.toBeNull()
       expect(fit.cols).toBeGreaterThanOrEqual(20)
       expect(fit.rows).toBeGreaterThanOrEqual(8)
diff --git a/config/scripts/mobile-web-bundle-manifest.mjs b/config/scripts/mobile-web-bundle-manifest.mjs
index b7efce25ca0e..2e9888f69c79 100644
--- a/config/scripts/mobile-web-bundle-manifest.mjs
+++ b/config/scripts/mobile-web-bundle-manifest.mjs
@@ -68,12 +68,10 @@ export function hashedAsset(bytes, extension) {
   }
 }
 
-function readIntegerConstant(source, name) {
+function readIntegerConstant(source, name, file = 'src/shared/protocol-version.ts') {
   const match = new RegExp(`export const ${name} = (\\d+)`).exec(source)
   if (!match) {
-    throw new Error(
-      `[mobile-web-bundle-manifest] ${name} not found in src/shared/protocol-version.ts`
-    )
+    throw new Error(`[mobile-web-bundle-manifest] ${name} not found in ${file}`)
   }
   return Number.parseInt(match[1], 10)
 }
@@ -94,6 +92,13 @@ export async function readProtocolWindow() {
   }
 }
 
+/** The page's build number, parsed for the same reason the protocol window is. */
+export async function readPageVersion() {
+  const file = join('src', 'shared', 'mobile-web-bundle', 'manifest-contract.ts')
+  const source = await readFile(join(projectDir, file), 'utf8')
+  return readIntegerConstant(source, 'MOBILE_WEB_PAGE_VERSION', file)
+}
+
 export async function readDesktopVersion() {
   const packageJson = JSON.parse(await readFile(join(projectDir, 'package.json'), 'utf8'))
   if (typeof packageJson.version !== 'string' || packageJson.version.length === 0) {
@@ -124,6 +129,7 @@ export async function writeMobileWebBundleTree({
     desktopVersion,
     minCompatibleRuntimeProtocolVersion: protocolWindow.minCompatibleRuntimeProtocolVersion,
     runtimeProtocolVersion: protocolWindow.runtimeProtocolVersion,
+    pageVersion: await readPageVersion(),
     entrypoint: MOBILE_WEB_BUNDLE_ENTRYPOINT,
     totalBytes: assets.reduce((total, asset) => total + asset.byteLength, 0),
     assets,
diff --git a/config/scripts/mobile-web-bundle-manifest.test.mjs b/config/scripts/mobile-web-bundle-manifest.test.mjs
index 3c4d35fd8a7f..81c447878a8a 100644
--- a/config/scripts/mobile-web-bundle-manifest.test.mjs
+++ b/config/scripts/mobile-web-bundle-manifest.test.mjs
@@ -1,10 +1,16 @@
+import { mkdtemp, readFile, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import {
   computeMobileWebBundleBuildId,
   contentTypeForExtension,
   hashedAsset,
-  serializeMobileWebBundleAssets
+  serializeMobileWebBundleAssets,
+  sha256Hex,
+  writeMobileWebBundleTree
 } from './mobile-web-bundle-manifest.mjs'
+import { MobileWebBundleManifestSchema } from '../../src/shared/mobile-web-bundle/manifest-contract.js'
 
 describe('computeMobileWebBundleBuildId', () => {
   const assets = [
@@ -55,3 +61,30 @@ describe('hashedAsset', () => {
     expect(() => hashedAsset(Buffer.from('body'), 'wasm')).toThrow(/no content type registered/)
   })
 })
+
+describe('writeMobileWebBundleTree', () => {
+  it('stamps the page version the contract names, which the shell floors on', async () => {
+    const outDir = await mkdtemp(join(tmpdir(), 'mobile-web-bundle-manifest-'))
+    try {
+      const bytes = Buffer.from('<!doctype html>\n', 'utf8')
+      const entry = {
+        path: 'index.html',
+        bytes,
+        sha256: sha256Hex(bytes),
+        byteLength: bytes.byteLength,
+        contentType: contentTypeForExtension('html')
+      }
+      await writeMobileWebBundleTree({
+        outDir,
+        written: [entry],
+        desktopVersion: '1.0.0',
+        protocolWindow: { runtimeProtocolVersion: 3, minCompatibleRuntimeProtocolVersion: 3 }
+      })
+      const manifest = JSON.parse(await readFile(join(outDir, 'manifest.json'), 'utf8'))
+      expect(Number.isInteger(manifest.pageVersion)).toBe(true)
+      expect(MobileWebBundleManifestSchema.parse(manifest).pageVersion).toBe(manifest.pageVersion)
+    } finally {
+      await rm(outDir, { recursive: true, force: true })
+    }
+  })
+})
diff --git a/config/scripts/mobile-web-page-routes.test.mjs b/config/scripts/mobile-web-page-routes.test.mjs
index 88dc992d34f5..3cc77197c615 100644
--- a/config/scripts/mobile-web-page-routes.test.mjs
+++ b/config/scripts/mobile-web-page-routes.test.mjs
@@ -1,20 +1,7 @@
-import { mkdtemp, readFile, rm } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
 import { MobileWebBundleRouteSchema } from '../../src/shared/mobile-web-bundle/manifest-contract.ts'
-import {
-  buildMobileWebAppBundle,
-  resolveMobileWebPageRoutes
-} from './build-mobile-web-app-bundle.mjs'
-import { computeMobileWebBundleBuildId } from './mobile-web-bundle-manifest.mjs'
-import {
-  collectMobileWebAppRouteKeys,
-  routePathnameFromKey
-} from './mobile-web-app-route-manifest.mjs'
-import { mobileWebAppDependenciesPresent } from './mobile-web-app-bundle-dependencies.mjs'
-import { spelledCountsAgainstTables } from './spelled-count-census.mjs'
+import { resolveMobileWebPageRoutes } from './build-mobile-web-app-bundle.mjs'
+import { routePathnameFromKey } from './mobile-web-app-route-manifest.mjs'
 
 /**
  * Which screens this desktop declares as page routes, and whether the bundle can render each.
@@ -25,98 +12,6 @@ import { spelledCountsAgainstTables } from './spelled-count-census.mjs'
  * to register would have had to choose between a lint fence and a split it did not ask for.
  */
 
-const projectDir = fileURLToPath(new URL('../..', import.meta.url))
-const appDir = join(projectDir, 'mobile', 'app')
-
-// The sharded `test` job does not install mobile dependencies, so anything that runs esbuild over
-// the route tree is skipped there and run for real in pr.yml's mobile_web_app job.
-const itBundling = mobileWebAppDependenciesPresent() ? it : it.skip
-
-async function withScratch(run) {
-  const scratch = await mkdtemp(join(tmpdir(), 'orca-mobile-web-page-routes-test-'))
-  try {
-    return await run(scratch)
-  } finally {
-    await rm(scratch, { recursive: true, force: true })
-  }
-}
-
-/**
- * Every page route this bundle declares, written out rather than read from the source that
- * produces it: the point is to pin the list, and comparing the manifest to its own input would
- * pass whatever that input became. Shared by the assertions below, which read it two ways: what
- * the route tree resolves to, and what the built manifest actually carries.
- */
-const EXPECTED_PAGE_ROUTES = [
-  { pathname: '/h/[hostId]', grants: ['navigate', 'storage', 'externalLink', 'haptics'] },
-  {
-    pathname: '/h/[hostId]/agent-history/[worktreeId]',
-    grants: ['navigate', 'storage', 'externalLink', 'haptics']
-  },
-  {
-    pathname: '/h/[hostId]/tasks',
-    grants: ['navigate', 'storage', 'externalLink', 'haptics', 'native.clipboard.write']
-  },
-  {
-    pathname: '/h/[hostId]/files/[worktreeId]',
-    grants: ['navigate', 'storage', 'externalLink', 'haptics']
-  },
-  {
-    pathname: '/h/[hostId]/files/preview/[worktreeId]',
-    grants: ['navigate', 'storage', 'externalLink', 'haptics']
-  },
-  {
-    pathname: '/h/[hostId]/source-control/[worktreeId]',
-    grants: ['navigate', 'storage', 'externalLink', 'haptics', 'native.clipboard.write']
-  },
-  {
-    pathname: '/h/[hostId]/review/[worktreeId]',
-    grants: ['navigate', 'storage', 'externalLink', 'haptics', 'native.clipboard.write']
-  },
-  {
-    pathname: '/h/[hostId]/session/[worktreeId]',
-    grants: [
-      'navigate',
-      'storage',
-      'externalLink',
-      'haptics',
-      'screencastBinary',
-      'native.clipboard.write',
-      'native.clipboard.read',
-      'native.media.pick',
-      'native.media.read',
-      'native.media.release',
-      'native.audio.start',
-      'native.audio.read',
-      'native.audio.stop'
-    ],
-    // The one optional grant in the list (C8.1): the HTML preview's links, hidden rather than dead
-    // against a shell that cannot open one.
-    optionalGrants: ['externalNavigation']
-  }
-]
-
-const sessionGrants = EXPECTED_PAGE_ROUTES.filter(
-  (route) => route.pathname === '/h/[hostId]/session/[worktreeId]'
-).flatMap((route) => route.grants)
-
-const sessionOptionalGrants = EXPECTED_PAGE_ROUTES.filter(
-  (route) => route.pathname === '/h/[hostId]/session/[worktreeId]'
-).flatMap((route) => route.optionalGrants ?? [])
-
-const withPrefix = (prefix) => sessionGrants.filter((grant) => grant.startsWith(prefix))
-
-/** Every count this table's own comments spell out, beside the list each is a count of. */
-const SPELLED_COUNTS = [
-  { precedes: 'grants', counted: sessionGrants.length },
-  { precedes: 'audio verbs', counted: withPrefix('native.audio.').length },
-  { precedes: 'media verbs', counted: withPrefix('native.media.').length },
-  // "All three or none": the audio verbs again, as the rule that they are declared together.
-  { precedes: 'or none', counted: withPrefix('native.audio.').length },
-  // C8.1's, and the count the optional lane will grow first.
-  { precedes: 'optional grant', counted: sessionOptionalGrants.length }
-]
-
 describe('the page routes the manifest declares', () => {
   it('turns a route key into the URL pattern expo-router gives it', () => {
     expect(routePathnameFromKey('./h/[hostId]/index.tsx')).toBe('/h/[hostId]')
@@ -131,24 +26,6 @@ describe('the page routes the manifest declares', () => {
     expect(routePathnameFromKey('./h/[hostId]/_layout.tsx')).toBeNull()
   })
 
-  it("spells the session route's own counts off the table it comments", async () => {
-    const source = await readFile(
-      join(projectDir, 'config', 'scripts', 'mobile-web-page-routes.mjs'),
-      'utf8'
-    )
-    for (const { precedes, spelled, counts } of spelledCountsAgainstTables(
-      source,
-      SPELLED_COUNTS
-    )) {
-      expect(spelled, precedes).toEqual(counts)
-    }
-  })
-
-  it('declares only routes the bundle has a module for', async () => {
-    const keys = await collectMobileWebAppRouteKeys(appDir)
-    expect(resolveMobileWebPageRoutes(keys)).toEqual(EXPECTED_PAGE_ROUTES)
-  })
-
   /**
    * The optional lane through the builder, which drops what it does not name.
    *
@@ -200,18 +77,4 @@ describe('the page routes the manifest declares', () => {
       )
     ).toThrow('has no module in the bundle')
   })
-
-  itBundling(
-    'reaches the built manifest, where the build id does not move for it',
-    async () => {
-      await withScratch(async (scratch) => {
-        const { manifest } = await buildMobileWebAppBundle({ outDir: join(scratch, 'bundle') })
-        expect(manifest.routes).toEqual(EXPECTED_PAGE_ROUTES)
-        // The routes are derived from the same tree the script is built from, so the assets
-        // already decide them and the id has no reason to carry them as well.
-        expect(manifest.buildId).toBe(computeMobileWebBundleBuildId(manifest.assets))
-      })
-    },
-    240_000
-  )
 })
diff --git a/config/scripts/nsis-process-check.test.mjs b/config/scripts/nsis-process-check.test.mjs
new file mode 100644
index 000000000000..c469ffbc529b
--- /dev/null
+++ b/config/scripts/nsis-process-check.test.mjs
@@ -0,0 +1,124 @@
+import { readFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { dirname, join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { runProcessSync } from '../../src/shared/child-process/run-process'
+
+const hooks = readFileSync(new URL('../nsis/orca-installer-hooks.nsh', import.meta.url), 'utf8')
+const processCheck = readFileSync(
+  new URL('../nsis/orca-process-check.nsh', import.meta.url),
+  'utf8'
+)
+const require = createRequire(import.meta.url)
+const builderRequire = createRequire(require.resolve('electron-builder/package.json'))
+const upstreamChecks = readFileSync(
+  join(
+    dirname(builderRequire.resolve('app-builder-lib/package.json')),
+    'templates/nsis/include/allowOnlyOneInstallerInstance.nsh'
+  ),
+  'utf8'
+)
+
+function readPowerShellProbe(source = processCheck) {
+  const match = source.match(/nsExec::Exec `"\$PowerShellPath"(.*?) -(?:C|Command) "([^"\n]+)"`/)
+  if (!match) {
+    throw new Error('The NSIS PowerShell invocation was not found')
+  }
+  return { args: match[1].trim().split(/\s+/).filter(Boolean), command: match[2] }
+}
+
+describe('NSIS process-check integration', () => {
+  it('loads the capability hook through the installer and uninstaller include', () => {
+    expect(hooks).toContain('!include "${__FILEDIR__}\\orca-process-check.nsh"')
+    expect(processCheck).toMatch(/!macro customCheckAppRunning\b/)
+    expect(processCheck).toContain('!include "getProcessInfo.nsh"')
+    expect(processCheck).toMatch(/^Var pid$/m)
+    expect(processCheck).toMatch(/^Var \/GLOBAL IsPowerShellAvailable$/m)
+  })
+
+  it('keeps upstream process selection, retries, and installation-mode handling', () => {
+    expect(processCheck).toContain('!insertmacro _CHECK_APP_RUNNING')
+    expect(processCheck).not.toMatch(/!macro (?:FIND_PROCESS|KILL_PROCESS|_CHECK_APP_RUNNING)\b/)
+    expect(processCheck).not.toMatch(/\b(?:Stop-Process|taskkill|Set-ExecutionPolicy)\b/)
+    const findProcess = upstreamChecks.match(/!macro FIND_PROCESS\b[\s\S]*?!macroend/)?.[0]
+    if (!findProcess) {
+      throw new Error('The upstream process finder was not found')
+    }
+    expect(readPowerShellProbe().args).toEqual(readPowerShellProbe(findProcess).args)
+  })
+})
+
+describe.runIf(process.platform === 'win32')(
+  'NSIS capability probe under Restricted policy',
+  () => {
+    const policyReceipt = 'orca-nsis: restricted policy verified'
+    const queryFailureReceipt = 'orca-nsis: injected query failure'
+    const policyCheck = [
+      'function Test-OrcaRestrictedPolicy { param([string]$Scope)',
+      "try { $parameters = @{ ErrorAction = 'Stop' };",
+      'if ($Scope) { $parameters.Scope = $Scope };',
+      "return ((Get-ExecutionPolicy @parameters) -eq 'Restricted')",
+      '} catch { return $false } };',
+      // A failed getter must not fall through to the query's successful exit.
+      "if ((Test-OrcaRestrictedPolicy '__orca_invalid_scope__') -ne $false) { exit 11 };",
+      "if ((Test-OrcaRestrictedPolicy 'Process') -ne $true) { exit 10 };",
+      'if ((Test-OrcaRestrictedPolicy) -ne $true) { exit 10 };',
+      `[Console]::Out.WriteLine('${policyReceipt}');`
+    ].join(' ')
+
+    // A watchdog against a wedged probe, not a latency budget: Windows PowerShell 5.1
+    // cold start under the packaged-CI process load has reached the former 20s cap. Matches
+    // the synchronous-probe ceiling in tests/tools/win-update-e2e/powershell-runner.mjs.
+    const PROBE_TIMEOUT_MS = 60_000
+    // Vitest's 30s default would otherwise cap the blocking spawn ahead of PROBE_TIMEOUT_MS.
+    const PROBE_TEST_TIMEOUT_MS = PROBE_TIMEOUT_MS + 15_000
+
+    function runProbe(arch, prefix = '') {
+      const { args, command } = readPowerShellProbe()
+      if (!process.env.SystemRoot) {
+        throw new Error('SystemRoot is required on Windows')
+      }
+      // The pwsh runner's module path points Windows PowerShell at incompatible PS7 modules.
+      const env = Object.fromEntries(
+        Object.entries(process.env).filter(([key]) => key.toLowerCase() !== 'psmodulepath')
+      )
+      return runProcessSync({
+        program: join(process.env.SystemRoot, arch, 'WindowsPowerShell', 'v1.0', 'powershell.exe'),
+        args: [...args, '-Command', `${policyCheck} ${prefix}${command}`],
+        env: {
+          ...env,
+          ORCA_BACKGROUND_LAUNCH: '1',
+          PSExecutionPolicyPreference: 'Restricted'
+        },
+        timeoutMs: PROBE_TIMEOUT_MS
+      })
+    }
+
+    it.each(['SysWOW64', 'System32'])(
+      '%s permits the real inline process query',
+      { timeout: PROBE_TEST_TIMEOUT_MS },
+      (arch) => {
+        const result = runProbe(arch)
+        expect(result.code, JSON.stringify(result)).toBe(0)
+        expect(result.timedOut).toBe(false)
+        expect(result.stdout).toContain(policyReceipt)
+      }
+    )
+
+    it.each(['SysWOW64', 'System32'])(
+      '%s rejects a failed process query',
+      { timeout: PROBE_TEST_TIMEOUT_MS },
+      (arch) => {
+        const result = runProbe(
+          arch,
+          'function Get-CimInstance { [CmdletBinding()] param([string]$ClassName); ' +
+            `[Console]::Out.WriteLine('${queryFailureReceipt}'); Write-Error 'CIM unavailable' }; `
+        )
+        expect(result.code, JSON.stringify(result)).toBe(1)
+        expect(result.timedOut).toBe(false)
+        expect(result.stdout).toContain(policyReceipt)
+        expect(result.stdout).toContain(queryFailureReceipt)
+      }
+    )
+  }
+)
diff --git a/config/scripts/orcad-terminal-smoke-change-scope.mjs b/config/scripts/orcad-terminal-smoke-change-scope.mjs
new file mode 100644
index 000000000000..9dd58dab20ce
--- /dev/null
+++ b/config/scripts/orcad-terminal-smoke-change-scope.mjs
@@ -0,0 +1,54 @@
+import { readFileSync } from 'node:fs'
+import { pathToFileURL } from 'node:url'
+import { classifyBunProfileChanges, collectBunProfileInputs } from './bun-profile-change-scope.mjs'
+import { ORCAD_CHILD_ENTRY_POINTS, ORCAD_ENTRY_POINT } from './orcad-entry-build.mjs'
+
+const ENTRY_POINTS = [
+  ORCAD_ENTRY_POINT,
+  ...Object.values(ORCAD_CHILD_ENTRY_POINTS),
+  'src/cli/index.ts',
+  'config/scripts/build-orcad-bun.mjs',
+  'config/scripts/build-orcad.mjs',
+  'config/scripts/ensure-native-runtime.mjs',
+  'config/scripts/rebuild-native-deps.mjs',
+  'config/scripts/verify-cli-bin.mjs',
+  'config/scripts/install-dev-cli.mjs',
+  'config/scripts/orca-dev.mjs',
+  'config/scripts/runtime-serve-terminal-smoke.mjs',
+  'config/scripts/orcad-terminal-smoke-change-scope.mjs'
+]
+
+export function collectOrcadTerminalSmokeInputs() {
+  return collectBunProfileInputs({ entryPoints: ENTRY_POINTS })
+}
+
+export async function classifyOrcadTerminalSmokeChanges(
+  changedFiles,
+  collect = collectOrcadTerminalSmokeInputs
+) {
+  const forced = changedFiles.find(
+    (file) =>
+      ENTRY_POINTS.includes(file) ||
+      file === '.github/workflows/pr.yml' ||
+      file.startsWith('config/scripts/orcad-terminal-smoke-') ||
+      file.startsWith('config/scripts/runtime-serve-terminal-smoke') ||
+      // createRequire-loaded native probes are invisible to esbuild's import graph.
+      (file.startsWith('config/scripts/') && file.endsWith('.cjs')) ||
+      // CLI emit and runtime resources include files opened by path, outside the import graph.
+      file.startsWith('src/cli/') ||
+      file.startsWith('src/shared/') ||
+      file.startsWith('resources/')
+  )
+  if (forced) {
+    return { shouldRun: true, reason: `Smoke input changed: ${forced}` }
+  }
+  // Retain the Bun gate's native, worker, toolchain and failed-analysis safeguards.
+  return classifyBunProfileChanges(changedFiles, collect)
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  const changedFiles = readFileSync(process.argv[2], 'utf8').split('\0').filter(Boolean)
+  const result = await classifyOrcadTerminalSmokeChanges(changedFiles)
+  console.error(result.reason)
+  process.stdout.write(`${result.shouldRun}\n`)
+}
diff --git a/config/scripts/orcad-terminal-smoke-change-scope.test.mjs b/config/scripts/orcad-terminal-smoke-change-scope.test.mjs
new file mode 100644
index 000000000000..e0e978800fc7
--- /dev/null
+++ b/config/scripts/orcad-terminal-smoke-change-scope.test.mjs
@@ -0,0 +1,109 @@
+import { readFileSync } from 'node:fs'
+import { beforeAll, describe, expect, it } from 'vitest'
+import { parse } from 'yaml'
+import {
+  classifyOrcadTerminalSmokeChanges,
+  collectOrcadTerminalSmokeInputs
+} from './orcad-terminal-smoke-change-scope.mjs'
+import { ORCAD_CHILD_ENTRY_POINTS } from './orcad-entry-build.mjs'
+
+it.each([
+  'package.json',
+  'pnpm-lock.yaml',
+  'tsconfig.json',
+  'config/tsconfig.cli.json',
+  'config/patches/node-pty@1.1.0.patch',
+  'native/windows-registry/src/addon.cc',
+  'config/scripts/node-pty-job-ownership.cjs',
+  '.github/actions/install-node-dependencies/action.yml',
+  '.github/workflows/pr.yml',
+  'src/cli/deleted-command.ts',
+  'src/shared/deleted-contract.ts',
+  'src/main/persistence/profile-state/new-worker.ts',
+  'resources/licenses/ripgrep/COPYING',
+  'config/scripts/runtime-serve-terminal-smoke.test.mjs',
+  'config/scripts/orcad-terminal-smoke-change-scope.test.mjs'
+])('retains the smoke for build and dynamically opened input changes: %s', async (file) => {
+  expect((await classifyOrcadTerminalSmokeChanges([file], async () => new Set())).shouldRun).toBe(
+    true
+  )
+})
+
+it('retains smoke when changed-file evidence or dependency analysis is unavailable', async () => {
+  expect((await classifyOrcadTerminalSmokeChanges([])).shouldRun).toBe(true)
+  const result = await classifyOrcadTerminalSmokeChanges(['src/main/deleted.ts'], async () => {
+    throw new Error('Could not resolve deleted dependency')
+  })
+  expect(result.shouldRun).toBe(true)
+  expect(result.reason).toContain('Dependency graph unavailable')
+})
+
+describe('the actual terminal smoke dependency graph', () => {
+  let inputs
+  beforeAll(async () => {
+    inputs = await collectOrcadTerminalSmokeInputs()
+  }, 60_000)
+
+  it.each([
+    ...Object.values(ORCAD_CHILD_ENTRY_POINTS),
+    'src/main/runtime/orca-runtime.ts',
+    'src/main/windows/windows-process-table.ts',
+    'src/main/worker-thread-entry-path.ts',
+    'src/cli/index.ts',
+    'config/scripts/runtime-serve-terminal-smoke.mjs',
+    'config/scripts/build-orcad-bun.mjs',
+    'config/scripts/build-orcad.mjs',
+    'config/scripts/profile-state-worker-smoke.mjs',
+    'config/scripts/install-dev-cli.mjs',
+    'config/scripts/verify-cli-bin.mjs',
+    'config/scripts/bun-profile-change-scope.mjs'
+  ])('retains the runtime, CLI, build or smoke dependency: %s', async (file) => {
+    expect(inputs.has(file)).toBe(true)
+    expect((await classifyOrcadTerminalSmokeChanges([file], async () => inputs)).shouldRun).toBe(
+      true
+    )
+  })
+
+  it.each([
+    'src/renderer/src/components/Example.tsx',
+    'src/main/menu/register-app-menu.ts',
+    'config/scripts/ci-shard-timings.json',
+    '.github/workflows/e2e.yml',
+    'docs/reference/ci-runner-efficiency.md'
+  ])('skips unrelated inputs: %s', async (file) => {
+    expect((await classifyOrcadTerminalSmokeChanges([file], async () => inputs)).shouldRun).toBe(
+      false
+    )
+  })
+
+  it('retains a removed source path when a file is renamed outside the CLI tree', async () => {
+    expect(
+      (
+        await classifyOrcadTerminalSmokeChanges(
+          ['src/cli/deleted-command.ts', 'docs/moved-command.ts'],
+          async () => inputs
+        )
+      ).shouldRun
+    ).toBe(true)
+  })
+})
+
+it('only skips the unchanged smoke after a successful diff and dependency analysis', () => {
+  const workflow = parse(
+    readFileSync(new URL('../../.github/workflows/pr.yml', import.meta.url), 'utf8')
+  )
+  const step = workflow.jobs.static_analysis.steps.find(
+    (candidate) => candidate.name === 'Boot orcad and round-trip a terminal'
+  )
+  expect(step.env).toEqual({
+    BASE_SHA: '${{ github.event.pull_request.base.sha }}',
+    ORCA_BACKGROUND_LAUNCH: '1'
+  })
+  // See the localization gate: HEAD^1 removes the merge-base computation, so a shallow checkout
+  // is enough and the payload head SHA is unused.
+  expect(step.run).toContain('node config/scripts/git-pull-request-diff-base.mjs "$BASE_SHA"')
+  expect(step.run).toContain('git diff --name-only --no-renames -z "$DIFF_BASE" HEAD')
+  expect(step.run).not.toContain('--diff-filter')
+  expect(step.run).toContain('&& [ "$scope" = false ]; then')
+  expect(step.run).toMatch(/else\s+pnpm run smoke:orcad-terminal\s+fi/)
+})
diff --git a/config/scripts/orcad-windows-process-tree.test.mjs b/config/scripts/orcad-windows-process-tree.test.mjs
index 5e3db4ee3771..acc53f271941 100644
--- a/config/scripts/orcad-windows-process-tree.test.mjs
+++ b/config/scripts/orcad-windows-process-tree.test.mjs
@@ -62,9 +62,12 @@ it('keeps POSIX builds independent of Windows build tools', () => {
   expect(() => stageOrcadWindowsProcessTree('absent', 'absent', 'linux-x64-glibc')).not.toThrow()
 })
 
-it('reuses the checked native addon from an ordinary Windows host install', () => {
-  const { root, output, installed } = installedFixture()
-  stageOrcadWindowsProcessTree(root, output, 'win32-x64', windowsHost)
+it.each([
+  ['x64', 0x8664],
+  ['arm64', 0xaa64]
+])('reuses the checked native addon from a Windows %s host install', (arch, machine) => {
+  const { root, output, installed } = installedFixture(machine)
+  stageOrcadWindowsProcessTree(root, output, `win32-${arch}`, { platform: 'win32', arch })
   expect(readFileSync(join(output, 'windows-process-tree.node'))).toEqual(readFileSync(installed))
 })
 
diff --git a/config/scripts/package-electron-runtime-contract.test.mjs b/config/scripts/package-electron-runtime-contract.test.mjs
index 74f5fed972cf..b80df53cb22c 100644
--- a/config/scripts/package-electron-runtime-contract.test.mjs
+++ b/config/scripts/package-electron-runtime-contract.test.mjs
@@ -3,7 +3,6 @@ import { createRequire } from 'node:module'
 import { join, resolve } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { parse } from 'yaml'
-import { relayArtifactFilenames } from '../../src/shared/relay-artifacts.ts'
 
 const projectDir = resolve(import.meta.dirname, '../..')
 const require = createRequire(import.meta.url)
@@ -25,18 +24,10 @@ describe('Electron runtime package contract', () => {
   }
 
   it('keeps the native Windows registry addon optional and platform-gated', () => {
-    const rebuildScript = readProject('config/scripts/rebuild-native-deps.mjs')
-    const ensureScript = readProject('config/scripts/ensure-native-runtime.mjs')
     expect(packageJson.optionalDependencies['@orca/windows-registry']).toBe('workspace:*')
     // Why: allowBuilds stops pnpm running node-gyp at install time -- the root
     // Windows-only rebuild owns this addon so it is built against the right runtime ABI.
     expect(pnpmWorkspace.allowBuilds['@orca/windows-registry']).toBe(false)
-    // Why assert the guard and the member separately: the list now carries more
-    // than one addon, so pinning the whole literal only tested its formatting.
-    expect(rebuildScript).toContain("rebuildPlatform === 'win32'")
-    expect(rebuildScript).toContain("'@orca/windows-registry'")
-    expect(ensureScript).toContain("process.platform === 'win32'")
-    expect(ensureScript).toContain("'@orca/windows-registry'")
     if (windowsAddonsInstalled) {
       expect(packageTargets.win32).toEqual(
         expect.arrayContaining([
@@ -55,20 +46,10 @@ describe('Electron runtime package contract', () => {
   })
 
   it('keeps the native Windows process-table addon optional and platform-gated', () => {
-    const rebuildScript = readFileSync(
-      join(projectDir, 'config/scripts/rebuild-native-deps.mjs'),
-      'utf8'
-    )
-    const ensureScript = readFileSync(
-      join(projectDir, 'config/scripts/ensure-native-runtime.mjs'),
-      'utf8'
-    )
     expect(packageJson.optionalDependencies['@vscode/windows-process-tree']).toBe('0.8.0')
     // Why: same rule as the registry addon -- allowBuilds stops pnpm running node-gyp at
     // install time so the Windows-only rebuild owns it with the right runtime ABI.
     expect(pnpmWorkspace.allowBuilds['@vscode/windows-process-tree']).toBe(false)
-    expect(rebuildScript).toContain("'@vscode/windows-process-tree'")
-    expect(ensureScript).toContain("'@vscode/windows-process-tree'")
     // Why pin the patch: the upstream binding.gyp requires Spectre-mitigated
     // libraries our build agents do not carry, and the enumeration stops after
     // 1024 processes -- on a busy host that silently hides the very descendants
@@ -92,191 +73,6 @@ describe('Electron runtime package contract', () => {
     }
   })
 
-  it('guards package scripts that launch Electron tooling', () => {
-    const scripts = packageJson.scripts
-    const guardedScripts = [
-      'start',
-      'dev',
-      'dev-stable-name',
-      'build:unpack',
-      'build:win',
-      'build:mac',
-      'build:mac:release',
-      'build:linux',
-      'test:e2e',
-      'test:e2e:terminal-rendering-golden',
-      'test:e2e:posix-profile-index-golden',
-      'test:e2e:terminal-rendering-release-evidence',
-      'test:e2e:headful'
-    ]
-
-    for (const scriptName of guardedScripts) {
-      expect(scripts[scriptName], scriptName).toContain('pnpm run ensure:electron-runtime &&')
-    }
-  })
-
-  it('keeps Windows and Linux package builds off the macOS native helper build', () => {
-    const scripts = packageJson.scripts
-
-    expect(scripts['build:desktop']).not.toContain('build:computer-macos')
-    expect(scripts['build:win']).toContain('pnpm run build:desktop')
-    expect(scripts['build:win']).not.toContain('pnpm run build ')
-    expect(scripts['build:win']).not.toContain('build:computer-macos')
-    expect(scripts['build:linux']).toContain('pnpm run build:desktop')
-    expect(scripts['build:linux']).not.toContain('pnpm run build ')
-    expect(scripts['build:linux']).not.toContain('build:computer-macos')
-    expect(scripts['build:mac']).toContain('pnpm run build:computer-macos')
-    expect(scripts['build:release']).toContain('pnpm run build:native')
-    expect(scripts['build:release']).not.toContain('build:computer-macos')
-  })
-
-  it('runs the web build through the heap-sized Vite wrapper', () => {
-    expect(packageJson.scripts['build:web']).toContain('node config/scripts/run-vite-web-build.mjs')
-    expect(packageJson.scripts['build:web']).toContain('node config/scripts/verify-web-build.mjs')
-  })
-
-  it('guards release publishing before electron-builder runs', () => {
-    const releaseWorkflow = readFileSync(
-      join(projectDir, '.github/workflows/release-cut.yml'),
-      'utf8'
-    )
-    const parsedWorkflow = parse(releaseWorkflow)
-    const macWorkflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/release-mac-build.yml'), 'utf8')
-    )
-    const releaseCommands = new Map(
-      parsedWorkflow.jobs.build.strategy.matrix.include.map(({ platform, release_command }) => [
-        platform,
-        release_command
-      ])
-    )
-    const macReleaseCommand = macWorkflow.jobs['build-mac'].steps.find(
-      (step) => step.name === 'Publish release artifacts (macOS)'
-    ).with.command
-
-    expect([...releaseCommands.keys()].sort()).toEqual(['linux-arm64', 'linux-x64', 'win'])
-    for (const command of [...releaseCommands.values(), macReleaseCommand]) {
-      expect(command).toContain('node config/scripts/ensure-native-runtime.mjs --runtime=electron')
-      expect(command).toContain('electron-builder')
-      expect(command.indexOf('ensure-native-runtime')).toBeLessThan(
-        command.indexOf('electron-builder')
-      )
-    }
-    expect(macReleaseCommand).toContain(' && ORCA_MAC_RELEASE=1 ')
-    expect(releaseCommands.get('linux-x64')).toContain(' && pnpm exec electron-builder ')
-    expect(releaseCommands.get('linux-x64')).toContain('--linux AppImage deb rpm --x64')
-    expect(releaseCommands.get('linux-arm64')).toContain('ORCA_LINUX_ARM64_RELEASE=1')
-    expect(releaseCommands.get('linux-arm64')).toContain('--linux AppImage deb rpm --arm64')
-    expect(releaseCommands.get('win')).toContain(
-      '; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }; pnpm exec electron-builder '
-    )
-  })
-
-  it('blocks Linux and macOS release packaging on watcher process fault recovery', () => {
-    const releaseWorkflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/release-cut.yml'), 'utf8')
-    )
-    const macWorkflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/release-mac-build.yml'), 'utf8')
-    )
-    const assertFaultGate = (steps, publishStepName, expectedCondition) => {
-      const names = steps.map((step) => step.name)
-      const gate = steps.find((step) => step.name === 'Gate runtime file-watcher process isolation')
-
-      expect(gate.if).toBe(expectedCondition)
-      expect(gate['continue-on-error']).toBeUndefined()
-      expect(gate.run).toContain('node config/scripts/runtime-file-watcher-fault-harness.mjs')
-      expect(gate.run).toContain('ELECTRON_RUN_AS_NODE=1 pnpm exec electron')
-      expect(names.indexOf('Build app')).toBeLessThan(names.indexOf(gate.name))
-      expect(names.indexOf(gate.name)).toBeLessThan(names.indexOf(publishStepName))
-    }
-
-    assertFaultGate(
-      releaseWorkflow.jobs.build.steps,
-      'Publish release artifacts (Linux)',
-      "runner.os == 'Linux'"
-    )
-    assertFaultGate(
-      macWorkflow.jobs['build-mac'].steps,
-      'Publish release artifacts (macOS)',
-      undefined
-    )
-  })
-
-  it('packages and release-gates the SSH relay watcher child', () => {
-    const relayBuild = readFileSync(join(projectDir, 'config/scripts/build-relay.mjs'), 'utf8')
-    const builderConfig = readFileSync(
-      join(projectDir, 'config/electron-builder.config.cjs'),
-      'utf8'
-    )
-    const remoteCommands = readFileSync(
-      join(projectDir, 'src/main/ssh/ssh-remote-commands.ts'),
-      'utf8'
-    )
-    const releaseWorkflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/release-cut.yml'), 'utf8')
-    )
-    const macWorkflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/release-mac-build.yml'), 'utf8')
-    )
-
-    expect(relayBuild).toContain("'parcel-watcher-process-entry.ts'")
-    expect(relayBuild).toContain("outfile: join(outDir, 'relay-watcher.js')")
-    expect(relayBuild).toContain("outfile: join(outDir, 'relay-ai-vault-service.js')")
-    expect(builderConfig).toContain("from: 'out/relay'")
-
-    // Hashing and remote install probing are manifest-driven, so the contract
-    // is that both companions are declared once and that both sites read it.
-    expect(relayArtifactFilenames(true)).toContain('relay-watcher.js')
-    expect(relayArtifactFilenames(true)).toContain('relay-ai-vault-service.js')
-    expect(relayBuild).toContain('relayArtifactFilenames(')
-    expect(remoteCommands).toContain('relayArtifactFilenames(')
-
-    const assertRelayGate = (steps, publishStepName) => {
-      const names = steps.map((step) => step.name)
-      const gate = steps.find((step) => step.name === 'Gate SSH relay watcher process isolation')
-      expect(gate['continue-on-error']).toBeUndefined()
-      expect(gate.run).toContain('node config/scripts/relay-watcher-fault-harness.mjs')
-      expect(names.indexOf('Build app')).toBeLessThan(names.indexOf(gate.name))
-      expect(names.indexOf(gate.name)).toBeLessThan(names.indexOf(publishStepName))
-    }
-
-    assertRelayGate(releaseWorkflow.jobs.build.steps, 'Publish release artifacts (Linux)')
-    assertRelayGate(macWorkflow.jobs['build-mac'].steps, 'Publish release artifacts (macOS)')
-    const releaseNames = releaseWorkflow.jobs.build.steps.map((step) => step.name)
-    expect(releaseNames.indexOf('Gate SSH relay watcher process isolation')).toBeLessThan(
-      releaseNames.indexOf('Build Windows release artifacts')
-    )
-  })
-
-  it('packages and verifies the Windows SSH node-pty console-list fallback', () => {
-    const relayBuild = readFileSync(join(projectDir, 'config/scripts/build-relay.mjs'), 'utf8')
-    const relayDeploy = readFileSync(join(projectDir, 'src/main/ssh/ssh-relay-deploy.ts'), 'utf8')
-    const patchAsset = readFileSync(
-      join(projectDir, 'config/relay-assets/node-pty-1.1.0-console-list-agent-patch.cjs'),
-      'utf8'
-    )
-
-    expect(relayBuild).toContain('copyFileSync(')
-    expect(relayBuild).toContain('hash.update(readFileSync')
-    expect(relayBuild).toContain('node-pty-1.1.0-console-list-agent-patch.cjs')
-    expect(relayDeploy).toContain('assertPatchedNodePtyConsoleListAgent')
-    expect(relayDeploy.match(/\$\{windowsNodePtyPatchCommand\(nodePath\)\}/g)).toHaveLength(2)
-    expect(patchAsset).toContain('consoleProcessList = [shellPid];')
-    expect(patchAsset).toContain('packageJson.version !== EXPECTED_NODE_PTY_VERSION')
-  })
-
-  it('pins the Windows release builder to the VS 2022 runner image', () => {
-    const releaseWorkflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/release-cut.yml'), 'utf8')
-    )
-    const windowsReleaseEntry = releaseWorkflow.jobs.build.strategy.matrix.include.find(
-      ({ platform }) => platform === 'win'
-    )
-
-    expect(windowsReleaseEntry.os).toBe('windows-2022')
-  })
-
   it('keeps release-cut signing provenance on GitHub-hosted runners', () => {
     const releaseWorkflow = parse(
       readFileSync(join(projectDir, '.github/workflows/release-cut.yml'), 'utf8')
@@ -304,343 +100,4 @@ describe('Electron runtime package contract', () => {
     expect(releaseWorkflow.jobs['publish-release'].needs).not.toContain('build')
     expect(releaseWorkflow.jobs['publish-release'].needs).toContain('build-mac')
   })
-
-  it('runs the macOS release build in an isolated GitHub-hosted workflow', () => {
-    const releaseMacWorkflowText = readFileSync(
-      join(projectDir, '.github/workflows/release-mac-build.yml'),
-      'utf8'
-    )
-    const releaseMacWorkflow = parse(releaseMacWorkflowText)
-    const buildMacJob = releaseMacWorkflow.jobs['build-mac']
-    const checkoutStep = buildMacJob.steps.find((step) => step.name === 'Checkout')
-    const publishStep = buildMacJob.steps.find(
-      (step) => step.name === 'Publish release artifacts (macOS)'
-    )
-
-    expect(releaseMacWorkflow['run-name']).toBe(
-      'Mac release build ${{ inputs.tag }} (${{ inputs.release_run_id }})'
-    )
-    expect(releaseMacWorkflow.on.workflow_dispatch.inputs.tag.required).toBe(true)
-    expect(releaseMacWorkflow.on.workflow_dispatch.inputs.release_run_id.required).toBe(true)
-    expect(buildMacJob['runs-on']).toBe('macos-15')
-    expect(checkoutStep.with.ref).toBe('refs/tags/${{ inputs.tag }}')
-    expect(publishStep.with.command).toContain('ORCA_MAC_RELEASE=1')
-    expect(publishStep.with.command).toContain('electron-builder')
-    expect(publishStep.with.command).toContain('--mac --publish always')
-    expect(releaseMacWorkflowText).not.toContain('signpath/')
-    expect(releaseMacWorkflowText).not.toContain('SIGNPATH_')
-  })
-
-  it('publishes both Linux release matrix entries', () => {
-    const releaseWorkflow = readFileSync(
-      join(projectDir, '.github/workflows/release-cut.yml'),
-      'utf8'
-    )
-    const parsedWorkflow = parse(releaseWorkflow)
-    const publishLinuxStep = parsedWorkflow.jobs.build.steps.find(
-      (step) => step.name === 'Publish release artifacts (Linux)'
-    )
-
-    expect(publishLinuxStep.if).toContain("matrix.platform == 'linux-x64'")
-    expect(publishLinuxStep.if).toContain("matrix.platform == 'linux-arm64'")
-    expect(publishLinuxStep.with.command).toBe('${{ matrix.release_command }}')
-  })
-
-  it('keeps Linux postinstall repairing Chromium sandbox permissions', () => {
-    const afterInstallScript = readFileSync(
-      join(projectDir, 'resources/linux/packaging/after-install.sh'),
-      'utf8'
-    )
-
-    expect(afterInstallScript).toContain('chrome-sandbox')
-    expect(afterInstallScript).toContain('chmod 4755 "$sandbox"')
-    expect(afterInstallScript).not.toContain('chmod 0755 "$sandbox"')
-    expect(afterInstallScript).toContain('is_owned_link()')
-    expect(afterInstallScript).toContain('readlink -f -- "$link"')
-    expect(afterInstallScript).toContain('[ ! -e "$link" ] && [ ! -L "$link" ]')
-    expect(afterInstallScript).not.toContain('[ ! -e "$link" ] || [ -L "$link" ]')
-  })
-
-  it('advances only the skill release ledger in a taggable release-cut commit', () => {
-    const releaseWorkflow = readFileSync(
-      join(projectDir, '.github/workflows/release-cut.yml'),
-      'utf8'
-    )
-    const parsedWorkflow = parse(releaseWorkflow)
-    const checkoutStep = parsedWorkflow.jobs.cut.steps.find((step) => step.name === 'Checkout ref')
-    const bumpStep = parsedWorkflow.jobs.cut.steps.find(
-      (step) => step.name === 'Bump package.json and tag'
-    )
-
-    const bumpIndex = bumpStep.run.indexOf(
-      'npm version "$VERSION" --no-git-tag-version --allow-same-version'
-    )
-    const generateIndex = bumpStep.run.indexOf(
-      'node config/scripts/generate-skill-bundle-manifest.mjs --release "$VERSION"'
-    )
-    const commands = bumpStep.run.replace(/^\s*#.*$/gm, '')
-    // Unanchored: a `git add` chained after `&&` stages just as effectively.
-    const stagedPaths = [...commands.matchAll(/\bgit add (.+)$/gm)].flatMap((match) =>
-      match[1].trim().split(/\s+/)
-    )
-    // Quotes trimmed and deduped: the index guard names the row a second time.
-    const mentioned = new Set(commands.match(/resources[/\\]skills[^\s'"]*/g))
-    expect(checkoutStep.with['fetch-depth']).toBe(0)
-    expect(bumpIndex).toBeGreaterThanOrEqual(0)
-    // Why: the cut is the only point that advances the release ledger, so this
-    // tag's revision is never rebuilt later — it appends that row, nothing else.
-    expect(generateIndex).toBeGreaterThan(bumpIndex)
-    expect(bumpStep.run.indexOf('git add package.json')).toBeGreaterThan(generateIndex)
-    expect(stagedPaths).toEqual(['package.json', 'resources/skills/release-mapping.json'])
-    // Every distinct mention must be staged, so a copy, a redirect, or a path
-    // held in a variable cannot reach the content-addressed artifacts. Matched
-    // without a trailing slash so `dir="resources/skills"` still counts.
-    expect([...mentioned]).toEqual(stagedPaths.slice(1))
-    // Regeneration is banned job-wide by the generator suite. Here: `-a`, `-am`,
-    // and `--all` sweep unstaged artifacts in; `--allow-empty` below must not.
-    expect(commands).not.toMatch(/\bcommit\b[^\n]*(?:\s-[a-z]*a[a-z]*\b|\s--all\b)/)
-    expect(bumpStep.run).toContain('git diff --cached --quiet')
-    expect(bumpStep.run).toContain('git commit --allow-empty -m "$commit_message"')
-  })
-
-  it('keeps release-cut RC retries monotonic across stale attempts', () => {
-    const releaseWorkflow = readFileSync(
-      join(projectDir, '.github/workflows/release-cut.yml'),
-      'utf8'
-    )
-    const parsedWorkflow = parse(releaseWorkflow)
-    const versionStep = parsedWorkflow.jobs.cut.steps.find(
-      (step) => step.name === 'Compute next version'
-    )
-
-    expect(versionStep.run).toContain('node config/scripts/release-rc-history.mjs "$1"')
-    expect(versionStep.run).toContain('tag_matches_current_ref')
-    expect(versionStep.run).toContain('cutting the next version instead of reusing stale artifacts')
-    expect(versionStep.run).toContain('git rev-parse "$existing_rc_tag"')
-  })
-
-  it('bumps separate Homebrew casks for stable and RC desktop tags', () => {
-    const releaseWorkflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/release-cut.yml'), 'utf8')
-    )
-    const homebrewWorkflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/homebrew-bump.yml'), 'utf8')
-    )
-
-    expect(releaseWorkflow.jobs['homebrew-bump'].if).toContain(
-      "startsWith(needs.cut.outputs.tag, 'v')"
-    )
-    expect(releaseWorkflow.jobs['homebrew-bump'].if).not.toContain('-rc.')
-    expect(releaseWorkflow.jobs['homebrew-bump-published-rc-draft'].with.tag).toBe(
-      '${{ needs.cut.outputs.latest_published_rc_tag }}'
-    )
-
-    const resolveCaskStep = homebrewWorkflow.jobs['bump-cask'].steps.find(
-      (step) => step.name === 'Resolve cask target'
-    )
-    const renderStep = homebrewWorkflow.jobs['bump-cask'].steps.find(
-      (step) => step.name === 'Render updated cask file'
-    )
-    const copyStep = homebrewWorkflow.jobs['bump-cask'].steps.find(
-      (step) => step.name === 'Copy cask into tap and open PR'
-    )
-
-    expect(resolveCaskStep.run).toContain('token="orca@rc"')
-    expect(resolveCaskStep.run).toContain('token="orca"')
-    expect(renderStep.env.CASK_PATH).toBe('${{ steps.cask.outputs.path }}')
-    expect(copyStep.run).toContain('cp "$CASK_PATH" "tap/$CASK_PATH"')
-    expect(copyStep.run).toContain('git add "$CASK_PATH"')
-  })
-
-  it('installs the Electron package binary in the shared unit-test workflow', () => {
-    const unitTestWorkflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/unit-tests.yml'), 'utf8')
-    )
-    const installStep = unitTestWorkflow.jobs.test.steps.find(
-      (step) => step.name === 'Install Electron package binary for tests'
-    )
-
-    expect(installStep.run).toBe('node config/scripts/install-electron-package-binary.mjs')
-  })
-
-  it('smokes the packaged CLI from outside the checkout in PR checks', () => {
-    const prWorkflow = readFileSync(join(projectDir, '.github/workflows/pr.yml'), 'utf8')
-    const parsedWorkflow = parse(prWorkflow)
-    const smokeStep = parsedWorkflow.jobs.package.steps.find(
-      (step) => step.name === 'Smoke packaged CLI'
-    )
-
-    expect(smokeStep.run).toBe(
-      'node config/scripts/smoke-packaged-cli.mjs --app-dir=dist/linux-unpacked'
-    )
-  })
-
-  it('keeps terminal scale perf wired to the report budget gate', () => {
-    const packageScripts = packageJson.scripts
-    const terminalPerfWorkflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/terminal-perf.yml'), 'utf8')
-    )
-    const steps = terminalPerfWorkflow.jobs['terminal-perf'].steps
-    const runStep = steps.find((step) => step.name === 'Run terminal scale perf report gate')
-    const uploadStep = steps.find((step) => step.name === 'Upload terminal perf report')
-
-    expect(packageScripts['test:e2e:terminal-perf:scale:report']).toContain(
-      'run-terminal-scale-perf-report-gate.mjs'
-    )
-    expect(runStep.run).toContain('pnpm run test:e2e:terminal-perf:scale:report')
-    expect(runStep.run).toContain('xvfb-run --auto-servernum')
-    const manualProfileKnobs = [
-      ['ORCA_TERMINAL_PERF_FRAME_COUNT', 'frame_count', 'ORCA_E2E_OPENCODE_FRAME_COUNT'],
-      [
-        'ORCA_TERMINAL_PERF_FRAME_INTERVAL_MS',
-        'frame_interval_ms',
-        'ORCA_E2E_OPENCODE_FRAME_INTERVAL_MS'
-      ],
-      [
-        'ORCA_TERMINAL_PERF_PRESSURE_OUTPUT_CHARS',
-        'pressure_output_chars',
-        'ORCA_E2E_OPENCODE_PRESSURE_OUTPUT_CHARS'
-      ],
-      ['ORCA_TERMINAL_PERF_SCALE_PANES', 'scale_panes', 'ORCA_E2E_OPENCODE_SCALE_PANES'],
-      [
-        'ORCA_TERMINAL_PERF_SCALE_CROSS_WORKSPACE_PANES',
-        'scale_cross_workspace_panes',
-        'ORCA_E2E_OPENCODE_SCALE_CROSS_WORKSPACE_PANES'
-      ],
-      [
-        'ORCA_TERMINAL_PERF_SCALE_PRESSURE_PANES',
-        'scale_pressure_panes',
-        'ORCA_E2E_OPENCODE_SCALE_PRESSURE_PANES'
-      ],
-      [
-        'ORCA_TERMINAL_PERF_SCALE_HIDDEN_PRESSURE_PANES',
-        'scale_hidden_pressure_panes',
-        'ORCA_E2E_OPENCODE_SCALE_HIDDEN_PRESSURE_PANES'
-      ]
-    ]
-    for (const [workflowEnv, inputName, runnerEnv] of manualProfileKnobs) {
-      expect(runStep.env[workflowEnv]).toBe(`\${{ inputs.${inputName} }}`)
-      expect(runStep.run).toContain(runnerEnv)
-    }
-    expect(uploadStep.uses).toBe('actions/upload-artifact@v7')
-    expect(uploadStep.with.path).toBe('${{ env.ORCA_E2E_TERMINAL_PERF_REPORT_PATH }}')
-  })
-
-  it('keeps terminal rendering regressions in the manual golden E2E workflow', () => {
-    const packageScripts = packageJson.scripts
-    const goldenWorkflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/golden-e2e-experiment.yml'), 'utf8')
-    )
-    const releaseWorkflow = parse(
-      readFileSync(join(projectDir, '.github/workflows/release-cut.yml'), 'utf8')
-    )
-    const steps = goldenWorkflow.jobs['golden-e2e'].steps
-    const goldenPlatformLabels = new Map([
-      ['linux', 'Linux'],
-      ['mac', 'macOS'],
-      ['windows', 'Windows']
-    ])
-    const goldenPlatforms = goldenWorkflow.jobs['golden-e2e'].strategy.matrix.include
-      .map(({ platform }) => platform)
-      .sort()
-    const goldenRunSteps = new Map(
-      goldenPlatforms.map((platform) => {
-        const label = goldenPlatformLabels.get(platform)
-
-        expect(label, platform).toBeDefined()
-
-        return [platform, steps.find((step) => step.name === `Run golden E2E tests on ${label}`)]
-      })
-    )
-    const releaseGoldenJob = releaseWorkflow.jobs['terminal-rendering-golden']
-    const releaseEvidenceJob = releaseWorkflow.jobs['terminal-rendering-release-evidence']
-    const releaseBuildNeeds = releaseWorkflow.jobs.build.needs
-    const publishReleaseNeeds = releaseWorkflow.jobs['publish-release'].needs
-    // Why: Windows release evidence is temporarily paused for CI runner PTY readiness.
-    const releaseEvidencePlatforms = ['linux', 'mac']
-
-    expect(packageScripts['test:e2e:terminal-rendering-golden']).toContain(
-      '@terminal-rendering-golden'
-    )
-    expect(packageScripts['test:e2e:terminal-rendering-golden']).toContain(
-      'terminal-raw-emoji-table-scroll-restore.spec.ts'
-    )
-    expect(packageScripts['test:e2e:terminal-rendering-golden']).toContain(
-      'terminal-webgl-atlas-budget.spec.ts'
-    )
-    expect(packageScripts['test:e2e:terminal-rendering-golden']).not.toContain(
-      'terminal-long-table-scroll-restore.spec.ts'
-    )
-    const goldenCommand = packageScripts['test:e2e:terminal-rendering-golden']
-    expect(goldenCommand).toContain('--project electron-headless')
-    expect(goldenCommand).toContain('--project electron-headful')
-    expect(packageScripts['test:e2e:terminal-rendering-release-evidence']).toContain(
-      'terminal-opencode-emoji-table-rendering.spec.ts'
-    )
-    expect(packageScripts['test:e2e:terminal-rendering-release-evidence']).toContain(
-      'terminal-long-table-scroll-restore.spec.ts'
-    )
-    // Windows runs the fresh-startup golden only, so terminal rendering is asserted per POSIX platform rather than across the matrix.
-    expect(goldenRunSteps.get('linux')?.run).toContain(
-      'pnpm run test:e2e:terminal-rendering-golden'
-    )
-    expect(goldenRunSteps.get('linux')?.run).toContain(
-      'pnpm run --if-present test:e2e:posix-profile-index-golden'
-    )
-    expect(goldenRunSteps.get('mac')?.run).toContain('pnpm run test:e2e:terminal-rendering-golden')
-    expect(goldenRunSteps.get('mac')?.run).toContain(
-      'pnpm run --if-present test:e2e:posix-profile-index-golden'
-    )
-    expect(goldenRunSteps.get('windows')).toMatchObject({
-      if: "runner.os == 'Windows'",
-      shell: 'pwsh'
-    })
-    expect(goldenRunSteps.get('windows').run).toContain(
-      'pnpm run --if-present test:e2e:windows-fresh-startup-golden'
-    )
-    expect(goldenWorkflow.on.pull_request).toBeUndefined()
-    expect(goldenWorkflow.on.workflow_dispatch).toBeDefined()
-    expect(releaseBuildNeeds).not.toContain('terminal-rendering-golden')
-    expect(releaseBuildNeeds).not.toContain('terminal-rendering-release-evidence')
-    expect(publishReleaseNeeds).toContain('terminal-rendering-golden')
-    expect(publishReleaseNeeds).not.toContain('build')
-    expect(publishReleaseNeeds).not.toContain('terminal-rendering-release-evidence')
-    expect(releaseGoldenJob['continue-on-error']).toBeUndefined()
-    expect(releaseGoldenJob.strategy.matrix.include.map(({ platform }) => platform).sort()).toEqual(
-      goldenPlatforms
-    )
-    const releaseLinuxRunStep = releaseGoldenJob.steps.find(
-      (step) => step.name === 'Run terminal rendering golden on Linux'
-    )
-    expect(releaseLinuxRunStep.run).toContain('pnpm run test:e2e:terminal-rendering-golden')
-    expect(releaseLinuxRunStep.run).toContain(
-      'pnpm run --if-present test:e2e:posix-profile-index-golden'
-    )
-    const releaseMacRunStep = releaseGoldenJob.steps.find(
-      (step) => step.name === 'Run terminal rendering golden on macOS'
-    )
-    expect(releaseMacRunStep.run).toContain('pnpm run test:e2e:terminal-rendering-golden')
-    expect(releaseMacRunStep.run).toContain(
-      'pnpm run --if-present test:e2e:posix-profile-index-golden'
-    )
-    const releaseWindowsRunStep = releaseGoldenJob.steps.find(
-      (step) => step.name === 'Run fresh-startup golden on Windows'
-    )
-    expect(releaseWindowsRunStep).toMatchObject({
-      if: "runner.os == 'Windows'",
-      shell: 'pwsh'
-    })
-    expect(releaseWindowsRunStep.run).toContain(
-      'pnpm run --if-present test:e2e:windows-fresh-startup-golden'
-    )
-    expect(releaseWindowsRunStep.run).not.toContain('test:e2e:workspace-session-golden')
-    expect(releaseWindowsRunStep.run).not.toContain('test:e2e:source-control-golden')
-    expect(releaseEvidenceJob['continue-on-error']).toBe(true)
-    expect(
-      releaseEvidenceJob.strategy.matrix.include.map(({ platform }) => platform).sort()
-    ).toEqual(releaseEvidencePlatforms)
-    expect(releaseEvidenceJob.steps.map((step) => step.run ?? '')).toContain(
-      'xvfb-run --auto-servernum env SKIP_BUILD=1 ORCA_E2E_FORWARD_APP_LOGS=1 pnpm run test:e2e:terminal-rendering-release-evidence'
-    )
-  })
 })
diff --git a/config/scripts/package-linux-formats.mjs b/config/scripts/package-linux-formats.mjs
new file mode 100644
index 000000000000..56c5ed4562fd
--- /dev/null
+++ b/config/scripts/package-linux-formats.mjs
@@ -0,0 +1,139 @@
+#!/usr/bin/env node
+import { createRequire } from 'node:module'
+import {
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  readdirSync,
+  realpathSync,
+  renameSync,
+  rmSync,
+  statSync
+} from 'node:fs'
+import { join, resolve } from 'node:path'
+import { copyPrivateTree } from './space-sharing-copy.mjs'
+import { spawnProcess } from './script-child-process.mjs'
+
+const require = createRequire(import.meta.url)
+const formats = ['AppImage', 'deb', 'rpm']
+
+export function linuxFormatArguments({ format, appDirectory, outputDirectory }) {
+  if (!formats.includes(format)) {
+    throw new Error(`Unsupported Linux package format: ${format}`)
+  }
+  return [
+    '--config',
+    'config/electron-builder-pr-linux.config.cjs',
+    '--linux',
+    format,
+    '--x64',
+    '--publish',
+    'never',
+    '--prepackaged',
+    appDirectory,
+    '--config.directories.output',
+    outputDirectory,
+    '--config.deb.compression=gz',
+    '--config.rpm.compression=gzip'
+  ]
+}
+
+function runElectronBuilder(args) {
+  return new Promise((resolveBuild, reject) => {
+    const child = spawnProcess({
+      program: process.execPath,
+      args: [require.resolve('electron-builder/cli.js'), ...args],
+      env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' },
+      stdio: 'inherit'
+    })
+    child.once('error', reject)
+    child.once('close', (code, signal) => {
+      if (code === 0 && signal === null) {
+        resolveBuild()
+      } else {
+        reject(new Error(`electron-builder failed (code=${code}, signal=${signal})`))
+      }
+    })
+  })
+}
+
+export async function packageLinuxFormats({
+  preparedDirectory = resolve('dist/linux-unpacked'),
+  outputDirectory = resolve('dist'),
+  runBuilder = runElectronBuilder
+} = {}) {
+  const marker = join(preparedDirectory, 'resources/package-type')
+  if (readFileSync(marker, 'utf8') !== 'AppImage') {
+    throw new Error('Expected a fresh Linux directory build with its AppImage package marker')
+  }
+  const startedAt = performance.now()
+  mkdirSync(outputDirectory, { recursive: true })
+  const staging = mkdtempSync(join(outputDirectory, '.linux-package-formats-'))
+  try {
+    const results = await Promise.allSettled(
+      formats.map(async (format) => {
+        const startedFormatAt = performance.now()
+        const appDirectory = join(staging, format, 'app')
+        const formatOutput = join(staging, format, 'artifacts')
+        mkdirSync(join(staging, format))
+        // Preserve packaged modes; only the format metadata may be rewritten by electron-builder.
+        copyPrivateTree(preparedDirectory, appDirectory, { unprotect: () => {} })
+        console.log(
+          `[linux-package] ${format} copied in ${Math.round(performance.now() - startedFormatAt)}ms`
+        )
+        await runBuilder(
+          linuxFormatArguments({ format, appDirectory, outputDirectory: formatOutput })
+        )
+        const artifacts = readdirSync(formatOutput).filter((name) => name.endsWith(`.${format}`))
+        const artifactStats =
+          artifacts.length === 1 ? statSync(join(formatOutput, artifacts[0])) : null
+        if (!artifactStats?.isFile() || artifactStats.size === 0) {
+          throw new Error(`${format} did not produce exactly one nonempty package`)
+        }
+        console.log(
+          `[linux-package] ${format} finished in ${Math.round(performance.now() - startedFormatAt)}ms`
+        )
+        return { format, formatOutput, artifact: artifacts[0] }
+      })
+    )
+    const failures = results.flatMap((result, index) =>
+      result.status === 'rejected'
+        ? [new Error(`${formats[index]} packaging failed`, { cause: result.reason })]
+        : []
+    )
+    if (failures.length > 0) {
+      throw new AggregateError(failures, 'Linux package formats failed')
+    }
+    const completed = results.flatMap((result) =>
+      result.status === 'fulfilled' ? [result.value] : []
+    )
+    const metadataDirectory = join(outputDirectory, 'linux-package-formats')
+    for (const destination of [
+      metadataDirectory,
+      ...completed.map(({ artifact }) => join(outputDirectory, artifact))
+    ]) {
+      if (existsSync(destination)) {
+        throw new Error(`Refusing to replace existing package output: ${destination}`)
+      }
+    }
+    mkdirSync(metadataDirectory)
+    for (const { format, formatOutput, artifact } of completed) {
+      renameSync(join(formatOutput, artifact), join(outputDirectory, artifact))
+      // Update manifests and builder diagnostics have overlapping names across formats.
+      renameSync(formatOutput, join(metadataDirectory, format))
+    }
+    console.log(
+      `[linux-package] all formats finished in ${Math.round(performance.now() - startedAt)}ms`
+    )
+  } finally {
+    rmSync(staging, { recursive: true, force: true })
+  }
+}
+
+if (process.argv[1] && realpathSync(process.argv[1]) === realpathSync(import.meta.filename)) {
+  if (process.platform !== 'linux' || process.arch !== 'x64') {
+    throw new Error('PR Linux packaging requires a Linux x64 host')
+  }
+  await packageLinuxFormats()
+}
diff --git a/config/scripts/package-linux-formats.test.mjs b/config/scripts/package-linux-formats.test.mjs
new file mode 100644
index 000000000000..7d187af658d8
--- /dev/null
+++ b/config/scripts/package-linux-formats.test.mjs
@@ -0,0 +1,226 @@
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  readdirSync,
+  readlinkSync,
+  rmSync,
+  statSync,
+  symlinkSync,
+  writeFileSync
+} from 'node:fs'
+import { createRequire } from 'node:module'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { linuxFormatArguments, packageLinuxFormats } from './package-linux-formats.mjs'
+
+let root
+let preparedDirectory
+let outputDirectory
+const targets = ['AppImage', 'deb', 'rpm']
+const valueAfter = (args, flag) => args[args.indexOf(flag) + 1]
+
+beforeEach(() => {
+  root = mkdtempSync(join(tmpdir(), 'orca formats with spaces-'))
+  preparedDirectory = join(root, 'prepared app')
+  outputDirectory = join(root, 'output packages')
+  mkdirSync(join(preparedDirectory, 'resources'), { recursive: true })
+  mkdirSync(outputDirectory)
+  writeFileSync(join(preparedDirectory, 'resources/package-type'), 'AppImage')
+  writeFileSync(join(preparedDirectory, 'resources/app.asar'), 'verified application')
+  writeFileSync(join(preparedDirectory, 'orca-ide'), 'executable')
+  chmodSync(join(preparedDirectory, 'orca-ide'), 0o755)
+})
+
+afterEach(() => rmSync(root, { recursive: true, force: true }))
+
+function emitPackage(args) {
+  const format = valueAfter(args, '--linux')
+  const app = valueAfter(args, '--prepackaged')
+  const output = valueAfter(args, '--config.directories.output')
+  writeFileSync(join(app, 'resources/package-type'), format)
+  mkdirSync(output, { recursive: true })
+  writeFileSync(join(output, `orca.${format}`), format)
+  writeFileSync(join(output, 'latest-linux.yml'), format)
+  return { format, app, output }
+}
+
+it('preserves configured hooks, architecture, names, and PR compression with exact argv', () => {
+  const args = linuxFormatArguments({
+    format: 'deb',
+    appDirectory: '/app with spaces',
+    outputDirectory: '/out with spaces'
+  })
+  expect(args).toEqual([
+    '--config',
+    'config/electron-builder-pr-linux.config.cjs',
+    '--linux',
+    'deb',
+    '--x64',
+    '--publish',
+    'never',
+    '--prepackaged',
+    '/app with spaces',
+    '--config.directories.output',
+    '/out with spaces',
+    '--config.deb.compression=gz',
+    '--config.rpm.compression=gzip'
+  ])
+  expect(() => linuxFormatArguments({ format: 'zip' })).toThrow('Unsupported Linux package format')
+})
+
+describe('independent Linux package formats', () => {
+  it('starts all formats before awaiting completion and isolates metadata writes', async () => {
+    if (process.platform !== 'win32') {
+      symlinkSync('resources/package-type', join(preparedDirectory, 'marker-link'))
+    }
+    let release
+    const gate = new Promise((resolve) => {
+      release = resolve
+    })
+    const copies = []
+    await packageLinuxFormats({
+      preparedDirectory,
+      outputDirectory,
+      runBuilder: async (args) => {
+        const app = valueAfter(args, '--prepackaged')
+        const format = valueAfter(args, '--linux')
+        expect(readFileSync(join(app, 'resources/package-type'), 'utf8')).toBe('AppImage')
+        expect(readFileSync(join(app, 'resources/app.asar'), 'utf8')).toBe('verified application')
+        if (process.platform !== 'win32') {
+          expect(readlinkSync(join(app, 'marker-link'))).toBe('resources/package-type')
+          expect(statSync(join(app, 'orca-ide')).mode & 0o777).toBe(0o755)
+          expect(statSync(join(app, 'resources/package-type')).ino).not.toBe(
+            statSync(join(preparedDirectory, 'resources/package-type')).ino
+          )
+        }
+        copies.push(app)
+        if (copies.length === 3) {
+          release()
+        }
+        await gate
+        expect(readdirSync(outputDirectory)).toHaveLength(1)
+        emitPackage(args)
+        await Promise.resolve()
+        expect(readFileSync(join(app, 'resources/package-type'), 'utf8')).toBe(format)
+      }
+    })
+    expect(new Set(copies).size).toBe(3)
+    expect(readFileSync(join(preparedDirectory, 'resources/package-type'), 'utf8')).toBe('AppImage')
+    expect(readFileSync(join(preparedDirectory, 'resources/app.asar'), 'utf8')).toBe(
+      'verified application'
+    )
+    for (const format of targets) {
+      expect(readFileSync(join(outputDirectory, `orca.${format}`), 'utf8')).toBe(format)
+      expect(
+        readFileSync(
+          join(outputDirectory, 'linux-package-formats', format, 'latest-linux.yml'),
+          'utf8'
+        )
+      ).toBe(format)
+    }
+    expect(
+      readdirSync(outputDirectory).some((name) => name.startsWith('.linux-package-formats-'))
+    ).toBe(false)
+  })
+
+  it('settles every worker before cleanup and exposes no partial artifact on failure', async () => {
+    const finished = []
+    let release
+    const gate = new Promise((resolve) => {
+      release = resolve
+    })
+    await expect(
+      packageLinuxFormats({
+        preparedDirectory,
+        outputDirectory,
+        runBuilder: async (args) => {
+          const format = valueAfter(args, '--linux')
+          if (format === 'AppImage') {
+            throw new Error('compression failed')
+          }
+          if (format === 'rpm') {
+            release()
+          }
+          await gate
+          const { app } = emitPackage(args)
+          expect(existsSync(app)).toBe(true)
+          finished.push(format)
+        }
+      })
+    ).rejects.toMatchObject({
+      message: 'Linux package formats failed',
+      errors: [
+        expect.objectContaining({
+          message: 'AppImage packaging failed',
+          cause: expect.objectContaining({ message: 'compression failed' })
+        })
+      ]
+    })
+    expect(finished.sort()).toEqual(['deb', 'rpm'])
+    expect(readdirSync(outputDirectory)).toEqual([])
+    expect(readFileSync(join(preparedDirectory, 'resources/package-type'), 'utf8')).toBe('AppImage')
+  })
+
+  it('rejects missing artifacts even when the builder reports success', async () => {
+    await expect(
+      packageLinuxFormats({
+        preparedDirectory,
+        outputDirectory,
+        runBuilder: async (args) => {
+          const result = emitPackage(args)
+          if (result.format === 'rpm') {
+            writeFileSync(join(result.output, 'orca.rpm'), '')
+          }
+        }
+      })
+    ).rejects.toThrow('Linux package formats failed')
+    expect(readdirSync(outputDirectory)).toEqual([])
+  })
+
+  it('does not replace existing output packages', async () => {
+    writeFileSync(join(outputDirectory, 'orca.deb'), 'previous package')
+    await expect(
+      packageLinuxFormats({
+        preparedDirectory,
+        outputDirectory,
+        runBuilder: async (args) => {
+          emitPackage(args)
+        }
+      })
+    ).rejects.toThrow('Refusing to replace existing package output')
+    expect(readdirSync(outputDirectory)).toEqual(['orca.deb'])
+    expect(readFileSync(join(outputDirectory, 'orca.deb'), 'utf8')).toBe('previous package')
+  })
+
+  it('rejects a tree already mutated by a previous root-package build', async () => {
+    writeFileSync(join(preparedDirectory, 'resources/package-type'), 'rpm')
+    await expect(
+      packageLinuxFormats({
+        preparedDirectory,
+        outputDirectory,
+        runBuilder: async () => {
+          throw new Error('must not run')
+        }
+      })
+    ).rejects.toThrow('Expected a fresh Linux directory build')
+    expect(readdirSync(outputDirectory)).toEqual([])
+  })
+})
+
+it('changes only CI deb/rpm compression levels without mutating release settings or hooks', () => {
+  const require = createRequire(import.meta.url)
+  const release = require('../electron-builder.config.cjs')
+  const before = { deb: { ...release.deb }, rpm: { ...release.rpm } }
+  const ci = require('../electron-builder-pr-linux.config.cjs')
+  expect(release.deb).toEqual(before.deb)
+  expect(release.rpm).toEqual(before.rpm)
+  expect(ci).toEqual({
+    ...release,
+    deb: { ...release.deb, fpm: [...(release.deb.fpm ?? []), '--deb-compression-level=1'] },
+    rpm: { ...release.rpm, fpm: [...(release.rpm.fpm ?? []), '--rpm-compression-level=1'] }
+  })
+})
diff --git a/config/scripts/packaged-hang-watchdog-worker-contract.test.mjs b/config/scripts/packaged-hang-watchdog-worker-contract.test.mjs
deleted file mode 100644
index a4998760b67d..000000000000
--- a/config/scripts/packaged-hang-watchdog-worker-contract.test.mjs
+++ /dev/null
@@ -1,37 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { parse } from 'yaml'
-import { describe, expect, it } from 'vitest'
-
-describe('packaged hang watchdog worker contract', () => {
-  it('boots the worker from app.asar in PR checks', () => {
-    const workflow = parse(readFileSync('.github/workflows/pr.yml', 'utf8'))
-    const smokeSource = readFileSync(
-      'config/scripts/smoke-packaged-hang-watchdog-worker.mjs',
-      'utf8'
-    )
-    const smokeStep = workflow.jobs.package.steps.find(
-      (step) => step.name === 'Smoke packaged hang watchdog worker'
-    )
-
-    expect(smokeStep.run).toBe(
-      'xvfb-run --auto-servernum node config/scripts/smoke-packaged-hang-watchdog-worker.mjs --app-dir=dist/linux-unpacked'
-    )
-    expect(smokeSource).toContain(
-      "process.platform === 'linux' ? ['--no-sandbox', launcherDir] : [launcherDir]"
-    )
-    expect(smokeSource).toContain('const LAUNCH_TIMEOUT_MS = 30_000')
-    expect(smokeSource).toContain('timeout: LAUNCH_TIMEOUT_MS')
-  })
-
-  // Why: Electron ignores process.exitCode, so the gate needs app.exit plus a stdout assertion.
-  it('fails the smoke when the packaged worker never reports success', () => {
-    const smokeSource = readFileSync(
-      'config/scripts/smoke-packaged-hang-watchdog-worker.mjs',
-      'utf8'
-    )
-
-    expect(smokeSource).toContain('app.exit(1)')
-    expect(smokeSource).not.toContain('app.quit()')
-    expect(smokeSource).toContain('if (!result.stdout.includes(SUCCESS_LINE))')
-  })
-})
diff --git a/config/scripts/pdfjs-viewer-assets-stream.test.ts b/config/scripts/pdfjs-viewer-assets-stream.test.ts
new file mode 100644
index 000000000000..2e8f67efa8f4
--- /dev/null
+++ b/config/scripts/pdfjs-viewer-assets-stream.test.ts
@@ -0,0 +1,190 @@
+import { once } from 'node:events'
+import type * as fs from 'node:fs'
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync, type ReadStream } from 'node:fs'
+import type { IncomingMessage, ServerResponse } from 'node:http'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { PassThrough } from 'node:stream'
+import type { Connect, ViteDevServer } from 'vite'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { createPdfjsViewerAssetsPlugin } from '../build-plugins/pdfjs-viewer-assets'
+
+const observed = vi.hoisted(() => {
+  const streams: ReadStream[] = []
+  return { streams }
+})
+vi.mock('node:fs', async (importOriginal) => {
+  const original = await importOriginal<typeof fs>()
+  return {
+    ...original,
+    createReadStream: (...args: Parameters<typeof original.createReadStream>) => {
+      const stream = original.createReadStream(...args)
+      observed.streams.push(stream)
+      return stream
+    }
+  }
+})
+
+let root: string
+let middleware: Connect.NextHandleFunction
+
+beforeEach(() => {
+  root = mkdtempSync(join(tmpdir(), 'orca-pdfjs-stream-'))
+  mkdirSync(join(root, 'wasm'))
+  mkdirSync(join(root, 'cmaps'))
+  writeFileSync(join(root, 'wasm', 'fixture.wasm'), Buffer.alloc(1024 * 1024, 1))
+  writeFileSync(join(root, 'cmaps', 'fixture.bcmap'), 'map bytes')
+  const hook = createPdfjsViewerAssetsPlugin(root).configureServer
+  if (typeof hook !== 'function') {
+    throw new Error('Missing configureServer hook')
+  }
+  const server = {
+    middlewares: {
+      use(handler: Connect.NextHandleFunction) {
+        middleware = handler
+      }
+    }
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This hook only registers middleware through the supplied use method.
+  hook.call({} as never, server as ViteDevServer)
+})
+
+afterEach(async () => {
+  await Promise.all(
+    observed.streams.map(async (stream) => {
+      if (stream.closed) {
+        return
+      }
+      const closed = new Promise<void>((resolve) => stream.once('close', resolve))
+      stream.destroy()
+      await closed
+    })
+  )
+  observed.streams.length = 0
+  rmSync(root, { recursive: true, force: true })
+})
+
+function request(method = 'GET', url = '/wasm/fixture.wasm') {
+  const response = Object.assign(new PassThrough({ highWaterMark: 16 }), {
+    setHeader: vi.fn(),
+    statusCode: 0
+  })
+  const foreign = { close: vi.fn(), error: vi.fn() }
+  response.on('close', foreign.close)
+  response.on('error', foreign.error)
+  const next = vi.fn()
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The middleware reads only method/url and uses the implemented writable response and header fields.
+  middleware({ method, url } as IncomingMessage, response as unknown as ServerResponse, next)
+  return { response, next, source: observed.streams.at(-1), foreign }
+}
+
+it('releases file handles after repeated abandoned responses with backpressure', async () => {
+  const responses: ReturnType<typeof request>[] = []
+  for (let index = 0; index < 25; index += 1) {
+    const current = request()
+    const { response, source } = current
+    responses.push(current)
+    if (!source) {
+      throw new Error('Missing source')
+    }
+    await once(source, 'pause')
+    const closed = once(response, 'close')
+    response.destroy()
+    await closed
+  }
+  await expect.poll(() => observed.streams.filter((stream) => !stream.closed).length).toBe(0)
+  expect(observed.streams.every((stream) => stream.fd === null)).toBe(true)
+  for (const { response, foreign } of responses) {
+    expect(response.listeners('close')).toEqual([foreign.close])
+    expect(response.listeners('error')).toEqual([foreign.error])
+  }
+})
+
+it('preserves successful GET bytes and removes response cleanup listeners', async () => {
+  const { response, source, next, foreign } = request('GET', '/cmaps/fixture.bcmap')
+  const chunks: Buffer[] = []
+  response.on('data', (chunk: Buffer) => chunks.push(chunk))
+  await once(response, 'end')
+  await expect.poll(() => source?.closed).toBe(true)
+  expect(Buffer.concat(chunks).toString()).toBe('map bytes')
+  expect(response.statusCode).toBe(200)
+  expect(response.setHeader.mock.calls).toEqual([
+    ['Content-Length', 9],
+    ['Content-Type', 'application/octet-stream']
+  ])
+  expect(response.listeners('close')).toEqual([foreign.close])
+  expect(response.listeners('error')).toEqual([foreign.error])
+  expect(next).not.toHaveBeenCalled()
+})
+
+it('answers HEAD without opening a file stream', () => {
+  const { response, next } = request('HEAD')
+  expect(observed.streams).toHaveLength(0)
+  expect(response.writableEnded).toBe(true)
+  expect(response.setHeader.mock.calls).toEqual([
+    ['Content-Length', 1024 * 1024],
+    ['Content-Type', 'application/wasm']
+  ])
+  expect(next).not.toHaveBeenCalled()
+  response.destroy()
+})
+
+it('closes the response on source failure without leaving listeners', async () => {
+  const { response, source, foreign } = request()
+  if (!source) {
+    throw new Error('Missing source')
+  }
+  const closed = once(response, 'close')
+  source.destroy(new Error('fixture read failed'))
+  await closed
+  await expect.poll(() => source.closed).toBe(true)
+  expect(response.destroyed).toBe(true)
+  expect(response.listeners('close')).toEqual([foreign.close])
+  expect(response.listeners('error')).toEqual([foreign.error])
+})
+
+it('closes a source when the response fails', async () => {
+  const { response, source, foreign } = request()
+  if (!source) {
+    throw new Error('Missing source')
+  }
+  await once(source, 'pause')
+  response.destroy(new Error('fixture downstream failed'))
+  await expect.poll(() => source.closed).toBe(true)
+  expect(source.fd).toBe(null)
+  expect(response.listeners('close')).toEqual([foreign.close])
+  expect(response.listeners('error')).toEqual([foreign.error])
+})
+
+it.each([
+  ['POST', '/wasm/fixture.wasm'],
+  ['GET', '/wasm/missing.wasm'],
+  ['GET', '/other/fixture.wasm'],
+  ['GET', '/wasm/%00.wasm']
+])('passes through %s %s without a stream', (method, url) => {
+  const { response, next } = request(method, url)
+  expect(observed.streams).toHaveLength(0)
+  expect(next).toHaveBeenCalledOnce()
+  response.destroy()
+})
+
+it('does not open a stream when earlier middleware resumes after response close', async () => {
+  const response = Object.assign(new PassThrough(), {
+    setHeader: vi.fn(() => {
+      throw new Error('ERR_HTTP_HEADERS_SENT')
+    }),
+    statusCode: 0
+  })
+  const closed = once(response, 'close')
+  response.destroy()
+  await closed
+  middleware(
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The middleware reads only these method/url fields.
+    { method: 'GET', url: '/wasm/fixture.wasm' } as IncomingMessage,
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The fixture implements the writable response and header fields used by this middleware.
+    response as unknown as ServerResponse,
+    vi.fn()
+  )
+  expect(observed.streams).toHaveLength(0)
+  expect(response.setHeader).not.toHaveBeenCalled()
+})
diff --git a/config/scripts/pr-code-change-scope.mjs b/config/scripts/pr-code-change-scope.mjs
index ab3c95f2cad9..bbdd8ddf387e 100644
--- a/config/scripts/pr-code-change-scope.mjs
+++ b/config/scripts/pr-code-change-scope.mjs
@@ -53,8 +53,12 @@ const GIT_COMPAT_PREFIXES = [
 ]
 
 // Why narrow: the contract pins Codex's read-repair, so it runs when the heal that
-// depends on it, its app-server transport, or the contract itself changes.
+// depends on it, its app-server transport, or the contract itself changes. The same
+// job pins --no-daemon for Orca's codex shell wrapper.
 const CODEX_INDEX_HEAL_CONTRACT_PREFIXES = [
+  'src/main/pty/codex-no-daemon-binary-contract',
+  'src/main/pty/codex-shell-launch-preflight',
+  'src/shared/codex-shell-function',
   'src/main/codex/codex-index-heal-binary-contract',
   'src/main/codex/codex-session-index-heal',
   'src/main/codex/codex-app-server-session',
@@ -113,6 +117,9 @@ const ORCAD_BROWSER_PREFIXES = [
 // import, and the shell policy the render check runs the page under.
 const MOBILE_WEB_APP_PREFIXES = [
   'config/scripts/build-mobile-web-app',
+  'config/scripts/run-mobile-web-app-checks',
+  'config/scripts/script-child-process.mjs',
+  'src/shared/child-process/',
   'config/scripts/verify-mobile-web-app-bundle',
   'config/scripts/mobile-web-app-',
   'config/scripts/mobile-web-bundle-',
@@ -149,6 +156,8 @@ const CROSS_VERSION_WIRE_PREFIXES = [
   'src/main/native-chat/agent-session-journal/',
   'src/main/native-chat/agent-session-wire/',
   'src/main/runtime/agent-session-record-store',
+  'src/main/runtime/agent-session-recovery-capsule',
+  'src/shared/agent-session-resume-marker',
   'src/main/runtime/rpc/dispatcher',
   'src/main/runtime/rpc/methods/agent-launch',
   'src/main/runtime/rpc/methods/ai-vault.ts',
@@ -156,6 +165,9 @@ const CROSS_VERSION_WIRE_PREFIXES = [
   'src/main/runtime/rpc/methods/session-tabs.ts',
   'src/main/runtime/rpc/methods/structured-agent-session',
   'src/main/runtime/rpc/methods/terminal',
+  'src/main/runtime/runtime-worktree-agent-',
+  'src/main/runtime/runtime-worktree-pty-agent-sources',
+  'src/shared/runtime-worktree-contracts',
   'src/renderer/src/runtime/remote-runtime-terminal-multiplexer'
 ]
 
@@ -217,6 +229,10 @@ const SHARED_PACKAGE_PREFIXES = [
 
 const LINUX_PACKAGE_PREFIXES = [
   ...SHARED_PACKAGE_PREFIXES,
+  'config/scripts/package-linux-formats',
+  'config/scripts/script-child-process.mjs',
+  'config/scripts/space-sharing-copy.mjs',
+  '.github/actions/prepare-linux-package-fixture/',
   'config/docker/cli-launch-contract/',
   'config/docker/headless-pairing/',
   'config/docker/headless-serve-shutdown/',
@@ -253,6 +269,7 @@ const WINDOWS_PACKAGE_TESTS = [
   'config/scripts/rebuild-native-deps.test.mjs',
   'config/scripts/rebuild-native-deps-windows-process-tree.test.mjs',
   'config/scripts/rebuild-native-deps-node-pty.test.mjs',
+  'config/scripts/nsis-process-check.test.mjs',
   'config/scripts/ensure-native-runtime-job-ownership.test.mjs',
   'config/scripts/verify-packaged-node-pty-job-ownership.test.mjs',
   'config/scripts/windows-pe-machine.test.mjs',
diff --git a/config/scripts/pr-code-change-scope.test.mjs b/config/scripts/pr-code-change-scope.test.mjs
index 07e2587f6d53..8f930559209a 100644
--- a/config/scripts/pr-code-change-scope.test.mjs
+++ b/config/scripts/pr-code-change-scope.test.mjs
@@ -183,6 +183,10 @@ describe('per-job path classification', () => {
 
   it('runs Linux packaging when an artifact contract changes', () => {
     for (const file of [
+      'config/scripts/package-linux-formats.mjs',
+      'config/scripts/script-child-process.mjs',
+      'config/scripts/space-sharing-copy.mjs',
+      '.github/actions/prepare-linux-package-fixture/action.yml',
       'config/docker/cli-launch-contract/Dockerfile',
       'config/docker/cli-launch-contract/run-cli-case.sh',
       'config/docker/headless-pairing/Dockerfile',
@@ -192,7 +196,10 @@ describe('per-job path classification', () => {
       'config/scripts/run-headless-linux-pairing-docker.mjs',
       'config/scripts/static-appimage-package-contract.cjs'
     ]) {
-      expectClassification([file], { package: true })
+      expectClassification([file], {
+        package: true,
+        mobile_web_app: file === 'config/scripts/script-child-process.mjs'
+      })
     }
   })
 
@@ -204,7 +211,10 @@ describe('per-job path classification', () => {
       'config/docker/daemon-shutdown-descendants/run-case.sh',
       'config/scripts/run-daemon-shutdown-descendants-docker.mjs'
     ]) {
-      expectClassification([file], { package: true })
+      expectClassification([file], {
+        package: true,
+        mobile_web_app: file === 'config/scripts/script-child-process.mjs'
+      })
     }
     for (const file of [
       'src/main/daemon/terminal-host.ts',
@@ -269,6 +279,9 @@ describe('per-job path classification', () => {
   it('runs the mobile web app job for the builder, the page source and the shell policy', () => {
     for (const file of [
       'config/scripts/build-mobile-web-app-bundle.mjs',
+      'config/scripts/run-mobile-web-app-checks.mjs',
+      'config/scripts/script-child-process.mjs',
+      'src/shared/child-process/run-process.ts',
       'config/scripts/mobile-web-app-route-manifest.mjs',
       'mobile/web-entry/index.tsx',
       'mobile/app/h/[hostId]/index.tsx',
@@ -322,6 +335,9 @@ describe('per-job path classification', () => {
       'src/main/runtime/rpc/methods/structured-agent-session-hold.ts',
       'src/main/runtime/rpc/methods/structured-agent-session-schemas.ts',
       'src/main/runtime/rpc/methods/terminal.ts',
+      'src/main/runtime/runtime-worktree-agent-rows.ts',
+      'src/main/runtime/runtime-worktree-pty-agent-sources.ts',
+      'src/shared/runtime-worktree-contracts.ts',
       'src/renderer/src/runtime/remote-runtime-terminal-multiplexer.ts'
     ]) {
       expectClassification([file], {
diff --git a/config/scripts/pr-e2e-gate-contract.test.mjs b/config/scripts/pr-e2e-gate-contract.test.mjs
index 3ff5a391d451..38a707d59f1c 100644
--- a/config/scripts/pr-e2e-gate-contract.test.mjs
+++ b/config/scripts/pr-e2e-gate-contract.test.mjs
@@ -240,7 +240,7 @@ describe('PR E2E gate contract', () => {
   })
 
   it('scopes detection to the PR range so base drift cannot false-trigger', () => {
-    expect(filterStep.run).toContain('--merge-base "$BASE" "$HEAD"')
+    expect(filterStep.run).toMatch(/diff-base\.mjs "\$BASE"[\s\S]*"\$DIFF_BASE" HEAD/)
     expect(filterStep.run).toContain('set -euo pipefail')
   })
 
@@ -446,7 +446,7 @@ describe('PR E2E gate contract', () => {
   })
 
   it('scopes the VM rollback oracle to the PR range and recipe schema authorities', () => {
-    expect(rollbackStep.run).toContain('--merge-base "$BASE_SHA" "$HEAD_SHA"')
+    expect(rollbackStep.run).toMatch(/diff-base\.mjs "\$BASE_SHA"[\s\S]*"\$DIFF_BASE" HEAD --/)
     expect(rollbackStep.run).toContain('src/shared/ephemeral-vm-recipes.ts')
     expect(rollbackStep.run).toContain('src/shared/orca-yaml-hook-types.ts')
     expect(selectPrE2eSpecs(['src/shared/ephemeral-vm-recipes.ts'])).toEqual([
diff --git a/config/scripts/pr-e2e-source-routing.mjs b/config/scripts/pr-e2e-source-routing.mjs
index 9a8f678860f0..f8737ad6ea62 100644
--- a/config/scripts/pr-e2e-source-routing.mjs
+++ b/config/scripts/pr-e2e-source-routing.mjs
@@ -33,6 +33,17 @@ export const PR_E2E_SOURCE_ROUTES = [
           file
         ))
   },
+  {
+    // Why the host-connection phase: the route gate waits on it, so a phase change can strand the
+    // SSH-unavailable card without touching a browser file.
+    id: 'browser.local-ssh-workspace-route',
+    specs: ['tests/e2e/local-ssh-browser-routing.spec.ts'],
+    matches: (file) =>
+      isProductSource(file) &&
+      /^src\/(?:main\/browser\/local-ssh-browser-(?:route|partitions)\.ts|renderer\/src\/(?:components\/browser-pane\/(?:use-ssh-workspace-browser-route\.ts|assemble-chrome\/ssh-routed-browser-page-gate\.tsx)|lib\/worktree-host-connection-phase\.ts))$/.test(
+        file
+      )
+  },
   {
     id: 'terminal.windows-wsl-launch-and-paste',
     specs: [
diff --git a/config/scripts/pr-ready-check-reuse.mjs b/config/scripts/pr-ready-check-reuse.mjs
index 7c319f5554c0..57e00a740c23 100644
--- a/config/scripts/pr-ready-check-reuse.mjs
+++ b/config/scripts/pr-ready-check-reuse.mjs
@@ -1,8 +1,8 @@
 import { appendFileSync, readFileSync } from 'node:fs'
 import { pathToFileURL } from 'node:url'
 
-export function prCheckRunTitle({ number, sourceSha, workflowSha }) {
-  return `PR ${number} | source ${sourceSha} | workflow ${workflowSha}`
+export function prCheckRunTitle({ number, sourceSha, workflowSha, unitMode = 'full' }) {
+  return `PR ${number} | source ${sourceSha} | workflow ${workflowSha} | unit ${unitMode}`
 }
 
 export function reusablePrCheckRun(runs, identity) {
diff --git a/config/scripts/pr-ready-check-reuse.test.mjs b/config/scripts/pr-ready-check-reuse.test.mjs
index a218b953575e..e5ea5a02b861 100644
--- a/config/scripts/pr-ready-check-reuse.test.mjs
+++ b/config/scripts/pr-ready-check-reuse.test.mjs
@@ -46,6 +46,12 @@ describe('ready-for-review required check reuse', () => {
   it('reuses a completed success only for the identical PR, merge source and workflow', () => {
     expect(reusablePrCheckRun([passed], identity)).toBe(passed)
     expect(reusablePrCheckRun([], identity)).toBeUndefined()
+    expect(
+      reusablePrCheckRun(
+        [{ ...passed, display_title: prCheckRunTitle({ ...identity, unitMode: 'selected' }) }],
+        identity
+      )
+    ).toBeUndefined()
     for (const key of ['number', 'sourceSha', 'workflowSha', 'headSha', 'runId']) {
       const changed = key === 'number' ? 43 : key === 'runId' ? '123' : 'd'.repeat(40)
       expect(reusablePrCheckRun([passed], { ...identity, [key]: changed }), key).toBeUndefined()
@@ -122,7 +128,7 @@ describe('ready-for-review required check reuse', () => {
 
   it('keeps required skips conditional on proof and leaves advisory routing eligible', () => {
     expect(workflow['run-name']).toBe(
-      'PR ${{ github.event.pull_request.number }} | source ${{ github.sha }} | workflow ${{ github.workflow_sha }}'
+      "PR ${{ github.event.pull_request.number }} | source ${{ github.sha }} | workflow ${{ github.workflow_sha }} | unit ${{ github.event.pull_request.draft && vars.ORCA_UNIT_SELECTION_MODE == 'selected' && 'selected' || 'full' }}"
     )
     expect(workflow.on.pull_request.types).toContain('ready_for_review')
     const detector = workflow.jobs.code_paths
diff --git a/config/scripts/pr-workflow-lint-parity.test.mjs b/config/scripts/pr-workflow-lint-parity.test.mjs
deleted file mode 100644
index 648714f244c9..000000000000
--- a/config/scripts/pr-workflow-lint-parity.test.mjs
+++ /dev/null
@@ -1,86 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { parse } from 'yaml'
-import { describe, expect, it } from 'vitest'
-
-// Why: pr.yml re-lists the `lint` chain as individual steps so a single failure
-// does not mask the rest and oxlint keeps its `--format github` annotations.
-// Hand-maintained mirrors drift (#10601: three verifiers never ran on PRs), so
-// this gate fails the moment a `lint` step has no counterpart in pr.yml.
-
-// Flags that only change reporting, so they must not split two otherwise identical commands.
-const REPORTING_FLAGS_WITH_VALUE = new Set(['--format', '--reporter'])
-const REPORTING_FLAGS = new Set(['--quiet'])
-const PACKAGE_RUNNER_TOKENS = new Set(['pnpm', 'npm', 'yarn', 'npx', 'run', 'exec', 'node'])
-
-function splitCommandChain(command) {
-  return command
-    .split(/\n|&&|;/)
-    .map((part) => part.trim())
-    .filter(Boolean)
-}
-
-function canonicalize(command) {
-  const tokens = command.split(/\s+/)
-  const canonical = []
-
-  for (let index = 0; index < tokens.length; index += 1) {
-    const token = tokens[index]
-    if (canonical.length === 0 && PACKAGE_RUNNER_TOKENS.has(token)) {
-      continue
-    }
-    if (REPORTING_FLAGS.has(token)) {
-      continue
-    }
-    if (REPORTING_FLAGS_WITH_VALUE.has(token)) {
-      index += 1
-      continue
-    }
-    canonical.push(token)
-  }
-
-  return canonical.join(' ')
-}
-
-/** Expands `pnpm run x` indirection until every entry is a real binary invocation. */
-function resolveLeafCommands(command, scripts, seen = new Set()) {
-  const leaves = []
-
-  for (const part of splitCommandChain(command)) {
-    const scriptName = part.match(/^(?:pnpm|npm|yarn)(?:\s+run)?\s+([\w:-]+)$/)?.[1]
-    if (scriptName && scripts[scriptName] && !seen.has(scriptName)) {
-      leaves.push(
-        ...resolveLeafCommands(scripts[scriptName], scripts, new Set([...seen, scriptName]))
-      )
-      continue
-    }
-    leaves.push(canonicalize(part))
-  }
-
-  return leaves
-}
-
-describe('PR workflow lint parity', () => {
-  it('runs every `pnpm lint` step on pull requests', () => {
-    const { scripts } = JSON.parse(readFileSync('package.json', 'utf8'))
-    const workflow = parse(readFileSync('.github/workflows/pr.yml', 'utf8'))
-
-    // Scan every job: which one hosts the lint steps is an organizational
-    // detail that has already been renamed once (verify -> static_analysis).
-    const workflowCommands = new Set(
-      Object.values(workflow.jobs)
-        .flatMap((job) => job.steps ?? [])
-        .filter((step) => typeof step.run === 'string')
-        .flatMap((step) => resolveLeafCommands(step.run, scripts))
-    )
-
-    const missing = resolveLeafCommands(scripts.lint, scripts).filter(
-      (leaf) => !workflowCommands.has(leaf)
-    )
-
-    expect(
-      missing,
-      `.github/workflows/pr.yml is missing lint steps: ${missing.join(', ')}. ` +
-        'Add a step for each one so PR CI matches `pnpm lint`.'
-    ).toEqual([])
-  })
-})
diff --git a/config/scripts/pr-workflow-parallelism.test.mjs b/config/scripts/pr-workflow-parallelism.test.mjs
index 5a419c3871b6..a566c737c22c 100644
--- a/config/scripts/pr-workflow-parallelism.test.mjs
+++ b/config/scripts/pr-workflow-parallelism.test.mjs
@@ -1,6 +1,7 @@
 import { existsSync, globSync, readFileSync } from 'node:fs'
 import { parse } from 'yaml'
 import { describe, expect, it } from 'vitest'
+import { UNIT_EXCLUDE } from './ci-unit-files.mjs'
 import { MOBILE_WEB_APP_DEPENDENCIES_REQUIRED_ENV } from './mobile-web-app-bundle-dependencies.mjs'
 
 const workflow = parse(readFileSync('.github/workflows/pr.yml', 'utf8'))
@@ -25,6 +26,7 @@ const shellContractFiles = [
   'src/main/zsh-scoped-histfile.live-shell.test.ts',
   'src/main/zsh-startup-hook-user-config-equivalence.live-shell.test.ts',
   'src/main/zsh-wrapper-version-mismatch.live-shell.test.ts',
+  'src/main/runtime/structured-session-cli-login-shell.live-shell.test.ts',
   'src/shared/posix-command-path-lookup.test.ts'
 ]
 const patchedNodePtyContractFiles = [
@@ -43,7 +45,7 @@ const testFilePatterns = [
 // rather than calling spawnSync('zsh') themselves. Without this branch the rule
 // silently stops noticing the very tests that need the lane's zsh install.
 const realZshUsage =
-  /(?:spawnSync|execFileSync|spawn)\(\s*['"](?:\/(?:usr\/)?bin\/)?zsh['"]|spawnSync\(\s*['"]which['"]\s*,\s*\[\s*['"]zsh['"]|name:\s*['"]zsh['"]\s*,\s*path:\s*executablePath|from '[^']*zsh-startup-hook-pty-harness'/
+  /(?:spawnSync|execFileSync|spawn)\(\s*['"](?:\/(?:usr\/)?bin\/)?zsh['"]|program:\s*['"](?:\/(?:usr\/)?bin\/)?zsh['"]|spawnSync\(\s*['"]which['"]\s*,\s*\[\s*['"]zsh['"]|name:\s*['"]zsh['"]\s*,\s*path:\s*executablePath|from '[^']*zsh-startup-hook-pty-harness'/
 
 describe('PR workflow parallelism', () => {
   it('keeps lightweight orchestration jobs on the free slim runner', () => {
@@ -67,7 +69,7 @@ describe('PR workflow parallelism', () => {
     expect(workflow.permissions).toEqual({ contents: 'read' })
   })
 
-  it('runs Node 24 on PRs and the same eight-shard suite on Node 26 daily', () => {
+  it('runs all eight shards on ARM for PRs and both Node versions on x86 daily', () => {
     const sharedTest = unitTestWorkflow.jobs.test
     const testStep = sharedTest.steps.find((step) => step.name === 'Test shard')
     const installStep = sharedTest.steps.find(
@@ -83,26 +85,43 @@ describe('PR workflow parallelism', () => {
     expect(workflow.jobs.test.uses).toBe('./.github/workflows/unit-tests.yml')
     expect(JSON.parse(workflow.jobs.test.with.node_versions)).toEqual(['24'])
     expect(nodeNextWorkflow.jobs.test.uses).toBe('./.github/workflows/unit-tests.yml')
-    expect(JSON.parse(nodeNextWorkflow.jobs.test.with.node_versions)).toEqual(['26'])
+    expect(JSON.parse(nodeNextWorkflow.jobs.test.with.node_versions)).toEqual(['24', '26'])
+    expect(workflow.jobs.test.with.runner).toBe('ubuntu-24.04-arm')
+    expect(workflow.jobs.test_native_cache['runs-on']).toBe('ubuntu-24.04-arm')
+    expect(sharedTest['runs-on']).toBe('${{ inputs.runner }}')
+    expect(unitTestWorkflow.on.workflow_call.inputs.runner.default).toBe('ubuntu-latest')
+    expect(nodeNextWorkflow.jobs.test.with.runner).toBeUndefined()
+    expect(nodeNextWorkflow.jobs.test_native_cache['runs-on']).toBe('ubuntu-latest')
+    expect(nodeNextWorkflow.jobs.test_native_cache.strategy.matrix.node).toEqual(['24', '26'])
+    const relay = unitTestWorkflow.jobs.relay_integration
+    expect(relay.strategy.matrix.node).toBe('${{ fromJSON(inputs.node_versions) }}')
+    expect(relay['runs-on']).toBe('ubuntu-latest')
+    expect(
+      relay.steps.find((step) => step.uses === './.github/actions/install-node-dependencies').with[
+        'node-version'
+      ]
+    ).toBe('${{ matrix.node }}')
     expect(nodeNextWorkflow.on.schedule).toHaveLength(1)
     expect(nodeNextWorkflow.on.workflow_dispatch).toBeNull()
     expect(sharedTest.strategy.matrix.node).toBe('${{ fromJSON(inputs.node_versions) }}')
-    expect(sharedTest.strategy.matrix.shard).toEqual(
-      Array.from({ length: 8 }, (_, index) => index + 1)
-    )
-    expect(sharedTest.strategy.matrix.shard_total).toEqual([8])
+    expect(sharedTest.strategy.matrix.shard).toBe('${{ fromJSON(inputs.shards) }}')
+    // The shard matrix no longer needs an in-workflow plan job: planning moved to
+    // unit-plan.yml so it can run before the static-analysis gate clears.
+    expect(sharedTest.needs).toBeUndefined()
+    expect(unitTestWorkflow.jobs.plan).toBeUndefined()
+    expect(unitTestWorkflow.on.workflow_call.inputs.shards.required).toBe(true)
     expect(installStep.with['node-version']).toBe('${{ matrix.node }}')
     expect(installStep.with['cache-electron-package']).toBe('true')
-    expect(testStep.run).toContain('--shard=${{ matrix.shard }}/${{ matrix.shard_total }}')
+    expect(testStep.run).toContain('--shard=${{ matrix.shard.index }}/${{ matrix.shard.count }}')
     for (const testFile of nativeShellContractFiles) {
-      expect(testStep.run).toContain(`--exclude=${testFile}`)
+      expect(UNIT_EXCLUDE).toContain(testFile)
     }
     expect(primerInstall.with['native-runtime']).toBe('node')
     expect(primerInstall.with['node-version']).toBe('24')
     expect(workflow.jobs.test.needs).toContain('test_native_cache')
     expect(nodeNextPrimerInstall.with['native-runtime']).toBe('node')
-    expect(nodeNextPrimerInstall.with['node-version']).toBe('26')
-    expect(nodeNextWorkflow.jobs.test.needs).toEqual(['test_native_cache'])
+    expect(nodeNextPrimerInstall.with['node-version']).toBe('${{ matrix.node }}')
+    expect(nodeNextWorkflow.jobs.test.needs).toEqual(['test_native_cache', 'unit_plan'])
   })
 
   it('runs real-shell coverage once outside the general shards', () => {
@@ -321,9 +340,10 @@ describe('PR workflow parallelism', () => {
       (step) => step.uses === './.github/actions/install-node-dependencies'
     )
 
-    for (const jobName of ['typecheck', 'git_compatibility', 'xterm_patch_sync']) {
+    for (const jobName of ['typecheck', 'git_compatibility']) {
       expect(installFor(jobName).with, jobName).toBeUndefined()
     }
+    expect(installFor('xterm_patch_sync')).toBeUndefined()
     expect(installFor('static_analysis').with['native-runtime']).toBe('node')
     expect(installFor('shell_contracts').with['native-runtime']).toBe('node')
     expect(sharedTestInstall.with['native-runtime']).toBe('node')
@@ -431,7 +451,9 @@ describe('PR workflow parallelism', () => {
     expect(electronCacheResolution.if).toBe(
       "inputs.native-runtime == 'electron' || inputs.cache-electron-package == 'true'"
     )
-    expect(electronCache.if).toBe(electronCacheResolution.if)
+    expect(electronCache.if).toBe(
+      "(github.event_name != 'pull_request' || runner.os != 'Linux') && steps.electron-package-cache.outputs.version != ''"
+    )
     expect(electronCache.uses).toBe('actions/cache@v5')
     expect(electronCache.with.key).toContain('steps.electron-package-cache.outputs.version')
     expect(dependencyAction.inputs['cache-electron-package'].default).toBe('false')
@@ -469,6 +491,22 @@ describe('PR workflow parallelism', () => {
     }
   })
 
+  it('keeps advisory unit-selection evidence off the gate', () => {
+    // It is continue-on-error, so it can never fail a PR. Living inside unit-tests.yml made a
+    // caller's `needs: test` wait for it anyway, holding verify ~36s past the last shard. Pinned
+    // here so it cannot drift back onto the critical path.
+    const evidence = workflow.jobs.unit_selection_evidence
+    expect(evidence.uses).toBe('./.github/workflows/unit-selection-evidence.yml')
+    expect(evidence.needs).toEqual(['test'])
+    expect(workflow.jobs.verify.needs).not.toContain('unit_selection_evidence')
+    expect(unitTestWorkflow.jobs.selection_evidence).toBeUndefined()
+    const evidenceWorkflow = parse(
+      readFileSync('.github/workflows/unit-selection-evidence.yml', 'utf8')
+    )
+    const job = evidenceWorkflow.jobs.selection_evidence
+    expect(job['continue-on-error']).toBe(true)
+  })
+
   it('keeps verify as the aggregate required check', () => {
     const verifyStep = workflow.jobs.verify.steps.find(
       (step) => step.name === 'Require successful checks'
@@ -491,9 +529,11 @@ describe('PR workflow parallelism', () => {
     // The bundling tests skip themselves without mobile/node_modules, which is what keeps the
     // sharded `test` job green. Only this env var stops that skip from spreading to the one job
     // that installs them, so a typo here would leave the whole job passing vacuously.
-    const step = workflow.jobs.mobile_web_app.steps.find((entry) =>
-      entry.run?.includes('build-mobile-web-app-bundle.test.mjs')
+    const step = workflow.jobs.mobile_web_app.steps.find(
+      (entry) => entry.name === 'Builder, override census and render checks'
     )
+    expect(step.run).toContain('node config/scripts/run-mobile-web-app-checks.mjs')
+    expect(step.run).not.toContain('--prepare-route-snapshot')
     expect(step.env[MOBILE_WEB_APP_DEPENDENCIES_REQUIRED_ENV]).toBe('1')
   })
 })
diff --git a/config/scripts/pullfrog-review-scope.cjs b/config/scripts/pullfrog-review-scope.cjs
new file mode 100644
index 000000000000..5168d5bd7ef7
--- /dev/null
+++ b/config/scripts/pullfrog-review-scope.cjs
@@ -0,0 +1,64 @@
+function reviewNumber(inputs) {
+  if (/^[1-9]\d*$/.test(inputs.pull_request_number ?? '')) {
+    return Number(inputs.pull_request_number)
+  }
+  const match =
+    / \| PR ([1-9]\d*)$/.exec(inputs.name ?? '') ??
+    /^Review (?:new commits on )?#([1-9]\d*) \[[\w-]+\]$/.exec(inputs.name ?? '')
+  return match ? Number(match[1]) : null
+}
+
+function reviewRunOrder(runs, number, runId) {
+  const related = runs.filter((run) => reviewNumber({ name: run.display_title }) === number)
+  return {
+    superseded: related.some((run) => run.id > runId),
+    older: related
+      .filter(
+        (run) =>
+          run.id < runId &&
+          ['queued', 'in_progress', 'waiting', 'pending', 'requested'].includes(run.status)
+      )
+      .map((run) => run.id)
+  }
+}
+
+async function reviewScope({ github, context, core }) {
+  const inputs = context.payload.inputs ?? {}
+  const number = reviewNumber(inputs)
+  core.setOutput('current', 'true')
+  if (!number || !Number.isSafeInteger(number)) {
+    return
+  }
+  try {
+    const { data: pr } = await github.rest.pulls.get({ ...context.repo, pull_number: number })
+    if (pr.state !== 'open' || (inputs.head_sha && inputs.head_sha !== pr.head.sha)) {
+      core.setOutput('current', 'false')
+      return
+    }
+    core.setOutput('head', pr.head.sha)
+    core.setOutput('number', String(number))
+    const { data } = await github.rest.actions.listWorkflowRuns({
+      ...context.repo,
+      workflow_id: 'pullfrog.yml',
+      event: 'workflow_dispatch',
+      per_page: 100
+    })
+    const order = reviewRunOrder(data.workflow_runs, number, context.runId)
+    if (order.superseded) {
+      core.setOutput('current', 'false')
+      return
+    }
+    // Run IDs, unlike scope-job completion order, cannot let an older review cancel a newer one.
+    for (const runId of order.older) {
+      try {
+        await github.rest.actions.cancelWorkflowRun({ ...context.repo, run_id: runId })
+      } catch (error) {
+        core.warning(`Could not cancel older review ${runId}: ${error.message}`)
+      }
+    }
+  } catch (error) {
+    core.warning(`Review identity unavailable; leaving this task independent: ${error.message}`)
+  }
+}
+
+module.exports = { reviewNumber, reviewRunOrder, reviewScope }
diff --git a/config/scripts/pullfrog-review-scope.test.mjs b/config/scripts/pullfrog-review-scope.test.mjs
new file mode 100644
index 000000000000..2a3f902da879
--- /dev/null
+++ b/config/scripts/pullfrog-review-scope.test.mjs
@@ -0,0 +1,109 @@
+import { expect, it, vi } from 'vitest'
+import scope from './pullfrog-review-scope.cjs'
+
+it('groups a current review by PR while leaving other agent tasks independent', async () => {
+  const get = vi.fn(async () => ({ data: { state: 'open', head: { sha: 'current' } } }))
+  const core = { setOutput: vi.fn(), warning: vi.fn() }
+  const context = {
+    repo: { owner: 'stablyai', repo: 'orca' },
+    runId: 7,
+    payload: { inputs: { name: 'Review #42 [abc]' } }
+  }
+  const github = {
+    rest: {
+      pulls: { get },
+      actions: { listWorkflowRuns: async () => ({ data: { workflow_runs: [] } }) }
+    }
+  }
+  await scope.reviewScope({ core, context, github })
+  expect(get).toHaveBeenCalledWith({ owner: 'stablyai', repo: 'orca', pull_number: 42 })
+  expect(core.setOutput).toHaveBeenCalledWith('head', 'current')
+  get.mockClear()
+  await scope.reviewScope({
+    core,
+    github,
+    context: { ...context, payload: { inputs: { name: 'Investigate #42' } } }
+  })
+  expect(get).not.toHaveBeenCalled()
+  expect(core.setOutput).toHaveBeenLastCalledWith('current', 'true')
+})
+
+it('coalesces only explicit or recognized PR review identities', () => {
+  expect(scope.reviewNumber({ name: 'Review #23532 [85jpk]' })).toBe(23532)
+  expect(scope.reviewNumber({ name: 'Review new commits on #22727 [24lpq]' })).toBe(22727)
+  expect(scope.reviewNumber({ pull_request_number: '123' })).toBe(123)
+  for (const name of ['Fix #123', 'Review #12; echo test', 'Review #123', '', 'Review #0 [abc]']) {
+    expect(scope.reviewNumber({ name })).toBeNull()
+  }
+})
+
+it('skips closed or explicitly stale reviews and tolerates lookup failure', async () => {
+  for (const data of [
+    { state: 'closed', head: { sha: 'a' } },
+    { state: 'open', head: { sha: 'b' } }
+  ]) {
+    const core = { setOutput: vi.fn(), warning: vi.fn() }
+    await scope.reviewScope({
+      core,
+      context: {
+        repo: {},
+        runId: 1,
+        payload: { inputs: { pull_request_number: '1', head_sha: 'a' } }
+      },
+      github: { rest: { pulls: { get: async () => ({ data }) } } }
+    })
+    expect(core.setOutput).toHaveBeenCalledWith('current', 'false')
+  }
+  const core = { setOutput: vi.fn(), warning: vi.fn() }
+  await scope.reviewScope({
+    core,
+    context: { repo: {}, runId: 2, payload: { inputs: { pull_request_number: '1' } } },
+    github: {
+      rest: {
+        pulls: {
+          get: async () => {
+            throw new Error('offline')
+          }
+        }
+      }
+    }
+  })
+  expect(core.setOutput).toHaveBeenCalledWith('current', 'true')
+  expect(core.warning).toHaveBeenCalled()
+})
+
+it('a delayed older scope cannot cancel or replace a newer review', async () => {
+  const runs = [
+    { id: 6, display_title: 'Review #42 [a]', status: 'in_progress' },
+    { id: 8, display_title: 'Custom review | PR 42', status: 'queued' },
+    { id: 5, display_title: 'Investigate #42', status: 'in_progress' },
+    { id: 4, display_title: 'Review #43 [other]', status: 'in_progress' }
+  ]
+  for (const runId of [7, 9]) {
+    const cancelWorkflowRun = vi.fn(async () => ({}))
+    const core = { setOutput: vi.fn(), warning: vi.fn() }
+    await scope.reviewScope({
+      context: {
+        repo: { owner: 'stablyai', repo: 'orca' },
+        runId,
+        payload: { inputs: { name: 'Review #42 [current]' } }
+      },
+      core,
+      github: {
+        rest: {
+          pulls: { get: async () => ({ data: { state: 'open', head: { sha: 'head' } } }) },
+          actions: {
+            listWorkflowRuns: async () => ({ data: { workflow_runs: runs } }),
+            cancelWorkflowRun
+          }
+        }
+      }
+    })
+    if (runId === 7) {
+      expect(cancelWorkflowRun).not.toHaveBeenCalled()
+      expect(core.setOutput).toHaveBeenCalledWith('current', 'false')
+    } else {
+      expect(cancelWorkflowRun.mock.calls.map(([args]) => args.run_id)).toEqual([6, 8])
+    }
+  }
+})
diff --git a/config/scripts/regenerate-xterm-patches.mjs b/config/scripts/regenerate-xterm-patches.mjs
index 672be8bee61b..c67c6eb66221 100644
--- a/config/scripts/regenerate-xterm-patches.mjs
+++ b/config/scripts/regenerate-xterm-patches.mjs
@@ -236,6 +236,7 @@ function ensureDependencies(upstreamRoot, manifest) {
   const stamp = path.join(upstreamRoot, 'node_modules', '.orca-xterm-install-stamp')
   const want = `${manifest.upstream.commit}\n${statSync(lockfile).size}\n`
   if (existsSync(stamp) && readFileSync(stamp, 'utf8') === want) {
+    assertToolchain(upstreamRoot, manifest)
     return
   }
   run('npm', ['ci'], {
diff --git a/config/scripts/regenerate-xterm-patches.test.mjs b/config/scripts/regenerate-xterm-patches.test.mjs
index 5261d0c74cd2..0d1329043dee 100644
--- a/config/scripts/regenerate-xterm-patches.test.mjs
+++ b/config/scripts/regenerate-xterm-patches.test.mjs
@@ -98,26 +98,6 @@ const PATCHED = {
 }
 
 describe('pnpm diff format', () => {
-  it('keeps the exact git flags pnpm uses, so patches survive `pnpm patch-commit`', () => {
-    expect(PNPM_DIFF_FLAGS).toEqual([
-      '-c',
-      'core.safecrlf=false',
-      '-c',
-      'core.quotePath=false',
-      'diff',
-      '--src-prefix=a/',
-      '--dst-prefix=b/',
-      '--ignore-cr-at-eol',
-      '--irreversible-delete',
-      '--full-index',
-      '--no-index',
-      '--text',
-      '--no-ext-diff',
-      '--no-color',
-      '--'
-    ])
-  })
-
   it('matches pnpm git config isolation', () => {
     const environment = pnpmDiffEnvironment({ PATH: '/usr/bin', HOME: '/Users/someone' })
     expect(environment).toMatchObject({
diff --git a/config/scripts/relay-artifact-manifest.test.mjs b/config/scripts/relay-artifact-manifest.test.mjs
index 7177b9821f8f..5f66ee7136f8 100644
--- a/config/scripts/relay-artifact-manifest.test.mjs
+++ b/config/scripts/relay-artifact-manifest.test.mjs
@@ -5,7 +5,15 @@
 // and never forks.
 import { execFileSync } from 'node:child_process'
 import { createHash } from 'node:crypto'
-import { existsSync, mkdtempSync, readdirSync, readFileSync, rmSync } from 'node:fs'
+import {
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readdirSync,
+  readFileSync,
+  rmSync,
+  writeFileSync
+} from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join, resolve } from 'node:path'
 import { afterAll, beforeAll, describe, expect, it } from 'vitest'
@@ -23,6 +31,12 @@ const projectDir = resolve(import.meta.dirname, '../..')
 const relayOutDir = mkdtempSync(join(tmpdir(), 'orca-relay-contract-'))
 
 beforeAll(() => {
+  // A repeated build must not copy stale companions into the other platform bundles.
+  for (const platform of RELAY_BUILD_PLATFORMS) {
+    const outDir = join(relayOutDir, platform)
+    mkdirSync(outDir, { recursive: true })
+    writeFileSync(join(outDir, 'stale-companion.js'), 'throw new Error("stale")')
+  }
   execFileSync('node', [join(projectDir, 'config', 'scripts', 'build-relay.mjs')], {
     cwd: projectDir,
     stdio: 'pipe',
diff --git a/config/scripts/release-e2e-dispatch-contract.test.mjs b/config/scripts/release-e2e-dispatch-contract.test.mjs
index 4590e8bc1361..2277cd399a49 100644
--- a/config/scripts/release-e2e-dispatch-contract.test.mjs
+++ b/config/scripts/release-e2e-dispatch-contract.test.mjs
@@ -53,7 +53,6 @@ describe('release E2E dispatch contract', () => {
     expect(buildStep.run).toContain('pnpm run build:relay &')
     expect(buildStep.run).toContain('relay_pid=$!')
     expect(buildStep.run).toContain('wait "$relay_pid"')
-    expect(buildStep.run).toContain('pnpm run build:web-from-renderer')
   })
 
   it('primes the Electron native cache before every E2E consumer', () => {
@@ -72,12 +71,29 @@ describe('release E2E dispatch contract', () => {
   it('includes the paired-runtime web client in the shared E2E build artifact', () => {
     const buildStep = e2eWorkflow.jobs.build.steps.find((step) => step.name === 'Build E2E outputs')
 
-    expect(buildStep.run).toContain('electron-vite build --mode e2e')
+    expect(buildStep.run).toContain('pnpm run build:electron-vite:parallel --mode e2e')
     expect(buildStep.env.VITE_EXPOSE_STORE).toBe('true')
-    expect(buildStep.run).toContain('pnpm run build:web-from-renderer')
     expect(buildStep.run).toContain('pnpm run build:relay')
   })
 
+  it('joins the shared CLI and web builds before uploading complete E2E output', () => {
+    const steps = e2eWorkflow.jobs.build.steps
+    const electron = steps.findIndex((step) => step.name === 'Build E2E outputs')
+    const cli = steps.findIndex((step) => step.id === 'e2e-cli')
+    const web = steps.findIndex((step) => step.name === 'Project shared E2E web client')
+    const join = steps.findIndex((step) => step.wait === 'e2e-cli')
+    const upload = steps.findIndex((step) => step.name === 'Upload E2E build output')
+    expect(cli).toBeGreaterThan(electron)
+    expect(steps[cli].background).toBe(true)
+    expect(steps[cli].run).toContain('pnpm run build:cli')
+    expect(steps[cli].run).toContain('scripts["prepare:cli-output"]')
+    expect(web).toBeGreaterThan(cli)
+    expect(steps[web].run).toBe('pnpm run build:web-from-renderer')
+    expect(join).toBeGreaterThan(web)
+    expect(upload).toBeGreaterThan(join)
+    expect(steps[upload].with.path).toBe('out/')
+  })
+
   it('hands the built relay artifact to every E2E run command', () => {
     const uploadStep = e2eWorkflow.jobs.build.steps.find(
       (step) => step.name === 'Upload E2E build output'
diff --git a/config/scripts/release-policy.mjs b/config/scripts/release-policy.mjs
new file mode 100644
index 000000000000..4733e79f2b44
--- /dev/null
+++ b/config/scripts/release-policy.mjs
@@ -0,0 +1,138 @@
+// Enforced by .github/workflows/release-policy.yml on release events.
+
+const BOT_LOGIN = 'github-actions[bot]'
+const BOT_EMAIL = '41898282+github-actions[bot]@users.noreply.github.com'
+const NUMBER = '(?:0|[1-9][0-9]*)'
+const VERSION = `${NUMBER}\\.${NUMBER}\\.${NUMBER}`
+const STABLE_TAG = new RegExp(`^v${VERSION}$`)
+const RC_TAG = new RegExp(`^v${VERSION}-rc\\.${NUMBER}(?:\\.[0-9A-Za-z]+)?$`)
+const MOBILE_TAG = new RegExp(`^mobile(?:-android)?-v${VERSION}$`)
+
+export function isPrereleaseTag(tag) {
+  return RC_TAG.test(tag) || MOBILE_TAG.test(tag)
+}
+
+export function compareStableTags(left, right) {
+  const a = left.slice(1).split('.').map(Number)
+  const b = right.slice(1).split('.').map(Number)
+  return a.reduce((result, part, index) => result || part - b[index], 0)
+}
+
+function escapeRegExp(text) {
+  return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+}
+
+// Why: Cut Release creates the annotated tag and its `release: vX` commit, but the
+// release object keeps whoever created the draft first, which can be a person.
+export async function isCutByReleasePipeline(github, { owner, repo }, tag) {
+  if (!STABLE_TAG.test(tag) && !RC_TAG.test(tag)) {
+    return false
+  }
+  let ref
+  try {
+    ;({ data: ref } = await github.rest.git.getRef({ owner, repo, ref: `tags/${tag}` }))
+  } catch (error) {
+    if (error.status === 404) {
+      return false
+    }
+    throw error
+  }
+  if (ref.object.type !== 'tag') {
+    return false
+  }
+  const { data: tagObject } = await github.rest.git.getTag({
+    owner,
+    repo,
+    tag_sha: ref.object.sha
+  })
+  if (tagObject.tagger?.email !== BOT_EMAIL || tagObject.object.type !== 'commit') {
+    return false
+  }
+  const { data: commit } = await github.rest.git.getCommit({
+    owner,
+    repo,
+    commit_sha: tagObject.object.sha
+  })
+  const subject = commit.message.split('\n')[0]
+  return new RegExp(`^release: ${escapeRegExp(tag)}(?: \\[rc-slot:[^\\]]+\\])?$`).test(subject)
+}
+
+async function isAuthorizedRelease(github, repoRef, release) {
+  const tag = release.tag_name
+  if (!STABLE_TAG.test(tag) && !isPrereleaseTag(tag)) {
+    return false
+  }
+  return release.author?.login === BOT_LOGIN || isCutByReleasePipeline(github, repoRef, tag)
+}
+
+// Why: the highest authorized stable release must be Latest; GitHub's own pick
+// (and the old bot-author-only filter) can move it to an older version.
+export async function restoreLatestStable(github, repoRef) {
+  const releases = await github.paginate(github.rest.repos.listReleases, {
+    ...repoRef,
+    per_page: 100
+  })
+  const candidates = releases
+    .filter((release) => !release.draft && !release.prerelease && STABLE_TAG.test(release.tag_name))
+    .sort((left, right) => compareStableTags(right.tag_name, left.tag_name))
+  for (const release of candidates) {
+    if (!(await isAuthorizedRelease(github, repoRef, release))) {
+      continue
+    }
+    await github.rest.repos.updateRelease({
+      ...repoRef,
+      release_id: release.id,
+      make_latest: 'true'
+    })
+    return release.tag_name
+  }
+  return null
+}
+
+export async function enforceReleasePolicy({ github, context, core }) {
+  const { release, action } = context.payload
+  const tag = release.tag_name
+  const author = release.author?.login
+  const repoRef = context.repo
+  const expectedPrerelease = isPrereleaseTag(tag)
+
+  if (await isAuthorizedRelease(github, repoRef, release)) {
+    if (release.prerelease !== expectedPrerelease) {
+      await github.rest.repos.updateRelease({
+        ...repoRef,
+        release_id: release.id,
+        prerelease: expectedPrerelease,
+        make_latest: expectedPrerelease ? 'false' : 'legacy'
+      })
+    }
+    await restoreLatestStable(github, repoRef)
+    return
+  }
+
+  // Why: editing notes on a live release is not a publication; deleting on edit
+  // took down the v1.4.216 release and its tag.
+  if (action !== 'published') {
+    core.warning(
+      `Release ${tag} by ${author || 'unknown'} is outside release policy; left as-is on "${action}".`
+    )
+    return
+  }
+
+  await github.rest.repos.updateRelease({
+    ...repoRef,
+    release_id: release.id,
+    draft: true,
+    prerelease: true,
+    make_latest: 'false'
+  })
+  await restoreLatestStable(github, repoRef)
+  await github.rest.repos.deleteRelease({ ...repoRef, release_id: release.id })
+  try {
+    await github.rest.git.deleteRef({ ...repoRef, ref: `tags/${tag}` })
+  } catch (error) {
+    if (error.status !== 404) {
+      throw error
+    }
+  }
+  core.warning(`Deleted unauthorized release ${tag} created by ${author || 'unknown'}.`)
+}
diff --git a/config/scripts/release-policy.test.mjs b/config/scripts/release-policy.test.mjs
new file mode 100644
index 000000000000..6478f6bb0c49
--- /dev/null
+++ b/config/scripts/release-policy.test.mjs
@@ -0,0 +1,150 @@
+import { describe, expect, it, vi } from 'vitest'
+import { enforceReleasePolicy, restoreLatestStable } from './release-policy.mjs'
+
+const BOT_EMAIL = '41898282+github-actions[bot]@users.noreply.github.com'
+const repoRef = { owner: 'stablyai', repo: 'orca' }
+
+function notFound() {
+  return Object.assign(new Error('Not Found'), { status: 404 })
+}
+
+// tags: { [tag]: { tagger, subject } } for annotated tags; missing tags 404.
+function createGithub({ releases = [], tags = {} } = {}) {
+  const rest = {
+    repos: {
+      listReleases: vi.fn(),
+      updateRelease: vi.fn(async () => ({ data: {} })),
+      deleteRelease: vi.fn(async () => ({ data: {} }))
+    },
+    git: {
+      getRef: vi.fn(async ({ ref }) => {
+        const tag = ref.replace(/^tags\//, '')
+        if (!tags[tag]) {
+          throw notFound()
+        }
+        return { data: { object: { type: 'tag', sha: `tag-${tag}` } } }
+      }),
+      getTag: vi.fn(async ({ tag_sha }) => {
+        const tag = tag_sha.replace(/^tag-/, '')
+        return {
+          data: {
+            tagger: { email: tags[tag].tagger ?? BOT_EMAIL },
+            object: { type: 'commit', sha: `commit-${tag}` }
+          }
+        }
+      }),
+      getCommit: vi.fn(async ({ commit_sha }) => {
+        const tag = commit_sha.replace(/^commit-/, '')
+        return { data: { message: `${tags[tag].subject ?? `release: ${tag}`}\n` } }
+      }),
+      deleteRef: vi.fn(async () => ({ data: {} }))
+    }
+  }
+  return { rest, paginate: vi.fn(async () => releases) }
+}
+
+function release(tag, author, overrides = {}) {
+  return {
+    id: Number(tag.replace(/\D/g, '')),
+    tag_name: tag,
+    author: { login: author },
+    draft: false,
+    prerelease: false,
+    ...overrides
+  }
+}
+
+function run(github, payloadRelease, action) {
+  const core = { warning: vi.fn() }
+  const context = { payload: { release: payloadRelease, action }, repo: repoRef }
+  return enforceReleasePolicy({ github, context, core }).then(() => core)
+}
+
+describe('release policy', () => {
+  it('keeps a pipeline-cut release whose draft a person created', async () => {
+    const r216 = release('v1.4.216', 'Jinwoo-H')
+    const github = createGithub({
+      releases: [r216, release('v1.4.214', 'github-actions[bot]')],
+      tags: { 'v1.4.216': {}, 'v1.4.214': {} }
+    })
+
+    await run(github, r216, 'edited')
+
+    expect(github.rest.repos.deleteRelease).not.toHaveBeenCalled()
+    expect(github.rest.git.deleteRef).not.toHaveBeenCalled()
+    expect(github.rest.repos.updateRelease).toHaveBeenCalledWith({
+      ...repoRef,
+      release_id: r216.id,
+      make_latest: 'true'
+    })
+  })
+
+  it('never deletes an unauthorized release on edit', async () => {
+    const qa = release('v1.4.300', 'someone')
+    const github = createGithub({ releases: [qa] })
+
+    const core = await run(github, qa, 'edited')
+
+    expect(github.rest.repos.deleteRelease).not.toHaveBeenCalled()
+    expect(github.rest.git.deleteRef).not.toHaveBeenCalled()
+    expect(core.warning).toHaveBeenCalledWith(expect.stringContaining('left as-is'))
+  })
+
+  it('deletes a published release whose tag was not cut by the pipeline', async () => {
+    const qa = release('v1.4.300', 'someone')
+    const github = createGithub({
+      releases: [qa, release('v1.4.215', 'nwparker')],
+      tags: { 'v1.4.300': { tagger: 'someone@example.com' }, 'v1.4.215': {} }
+    })
+
+    await run(github, qa, 'published')
+
+    expect(github.rest.repos.deleteRelease).toHaveBeenCalledWith({ ...repoRef, release_id: qa.id })
+    expect(github.rest.git.deleteRef).toHaveBeenCalledWith({ ...repoRef, ref: 'tags/v1.4.300' })
+  })
+
+  it('rejects a bot-tagged tag whose commit is not a release commit', async () => {
+    const qa = release('v1.4.300', 'someone')
+    const github = createGithub({ tags: { 'v1.4.300': { subject: 'fix: something' } } })
+
+    await run(github, qa, 'published')
+
+    expect(github.rest.repos.deleteRelease).toHaveBeenCalled()
+  })
+
+  it('accepts scheduled RC release commits', async () => {
+    const rc = release('v1.4.217-rc.1', 'someone', { prerelease: true })
+    const github = createGithub({
+      tags: { 'v1.4.217-rc.1': { subject: 'release: v1.4.217-rc.1 [rc-slot:2026-09-28-15]' } }
+    })
+
+    await run(github, rc, 'published')
+
+    expect(github.rest.repos.deleteRelease).not.toHaveBeenCalled()
+  })
+
+  it('restores Latest to the highest pipeline-cut stable, not only bot-authored ones', async () => {
+    const github = createGithub({
+      releases: [
+        release('v1.4.214', 'github-actions[bot]'),
+        release('v1.4.215', 'nwparker'),
+        release('v1.4.216-rc.0', 'github-actions[bot]', { prerelease: true })
+      ],
+      tags: { 'v1.4.214': {}, 'v1.4.215': {} }
+    })
+
+    await expect(restoreLatestStable(github, repoRef)).resolves.toBe('v1.4.215')
+    expect(github.rest.repos.updateRelease).toHaveBeenCalledTimes(1)
+  })
+
+  it('compares versions numerically when picking Latest', async () => {
+    const github = createGithub({
+      releases: [
+        release('v1.4.99', 'github-actions[bot]'),
+        release('v1.4.100', 'github-actions[bot]')
+      ]
+    })
+
+    await expect(restoreLatestStable(github, repoRef)).resolves.toBe('v1.4.100')
+  })
+})
diff --git a/config/scripts/replace-cached-nsis-elevate.test.mjs b/config/scripts/replace-cached-nsis-elevate.test.mjs
index a88461703c36..ffdcc0b4b5b1 100644
--- a/config/scripts/replace-cached-nsis-elevate.test.mjs
+++ b/config/scripts/replace-cached-nsis-elevate.test.mjs
@@ -357,8 +357,7 @@ describe('release-cut.yml swaps the cached elevate.exe through the resolver', ()
     expect(step.run).toContain("$subject -notlike '*CN=SignPath Foundation*'")
   })
 
-  // The inner-signing chain stays fail-open: a loud red step, not an unbuildable release.
-  it('keeps the step unable to fail the release job', () => {
-    expect(swapStep()['continue-on-error']).toBe(true)
+  it('blocks the release when the cache swap fails', () => {
+    expect(swapStep()['continue-on-error']).toBeUndefined()
   })
 })
diff --git a/config/scripts/run-electron-vite-targets-in-parallel.mjs b/config/scripts/run-electron-vite-targets-in-parallel.mjs
index 2c0d00644247..149e35ca67e4 100644
--- a/config/scripts/run-electron-vite-targets-in-parallel.mjs
+++ b/config/scripts/run-electron-vite-targets-in-parallel.mjs
@@ -11,7 +11,7 @@ function buildTarget(target) {
   return new Promise((resolve, reject) => {
     const child = spawn(
       process.execPath,
-      [buildScript, '--config', targetConfig, '--ignoreConfigWarning'],
+      [buildScript, '--config', targetConfig, '--ignoreConfigWarning', ...process.argv.slice(2)],
       {
         stdio: 'inherit',
         env: {
diff --git a/config/scripts/run-headless-serve-shutdown-docker.mjs b/config/scripts/run-headless-serve-shutdown-docker.mjs
index 4c367b5f7c48..f5119961c83a 100755
--- a/config/scripts/run-headless-serve-shutdown-docker.mjs
+++ b/config/scripts/run-headless-serve-shutdown-docker.mjs
@@ -63,6 +63,9 @@ try {
     'build',
     '--platform',
     platform,
+    ...(process.env.ORCA_SHUTDOWN_FIXTURE_CACHE_IMAGE
+      ? ['--cache-from', process.env.ORCA_SHUTDOWN_FIXTURE_CACHE_IMAGE]
+      : []),
     '-f',
     shutdownDockerfile,
     '-t',
diff --git a/config/scripts/run-linux-cli-launch-contract-docker.mjs b/config/scripts/run-linux-cli-launch-contract-docker.mjs
index bd414947026b..5cf14009c1c2 100755
--- a/config/scripts/run-linux-cli-launch-contract-docker.mjs
+++ b/config/scripts/run-linux-cli-launch-contract-docker.mjs
@@ -14,7 +14,6 @@ const suffix = `${process.pid}-${Date.now()}`
 const artifactVolume = `orca-cli-contract-artifact-${suffix}`
 const tagArchitecture = platform?.split('/')[1] ?? process.arch
 const tag = `orca-cli-launch-contract:ubuntu-24.04-${tagArchitecture}-${suffix}`
-const base = 'ubuntu@sha256:4fbb8e6a8395de5a7550b33509421a2bafbc0aab6c06ba2cef9ebffbc7092d90'
 const containers = new Set()
 let artifactVolumeCreated = false
 const CASE_TIMEOUT_MS = 90_000
@@ -176,8 +175,9 @@ function buildImage() {
   const buildArgs = [
     'build',
     ...dockerPlatformArgs,
-    '--build-arg',
-    `BASE_IMAGE=${base}`,
+    ...(process.env.ORCA_CLI_FIXTURE_CACHE_IMAGE
+      ? ['--cache-from', process.env.ORCA_CLI_FIXTURE_CACHE_IMAGE]
+      : []),
     '-f',
     'config/docker/cli-launch-contract/Dockerfile',
     '-t',
diff --git a/config/scripts/run-mobile-web-app-checks.mjs b/config/scripts/run-mobile-web-app-checks.mjs
new file mode 100644
index 000000000000..666b7d6d68d5
--- /dev/null
+++ b/config/scripts/run-mobile-web-app-checks.mjs
@@ -0,0 +1,88 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { dirname, join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+import { createRequire } from 'node:module'
+import { mobileWebAppModuleClosure } from './build-mobile-web-app-bundle.mjs'
+import { readRouteSnapshot } from './mobile-web-app-route-snapshot.mjs'
+import { PAGE_ROUTE_MODULES } from './mobile-web-app-page-route-modules.mjs'
+import { spawnProcess } from './script-child-process.mjs'
+
+const require = createRequire(import.meta.url)
+const mobileWebCheckArgs = [
+  'run',
+  '--config',
+  'config/vitest.config.ts',
+  'config/scripts/mobile-web-app-',
+  'config/scripts/build-mobile-web-app-bundle.test.mjs'
+]
+
+export async function prepareRouteSnapshot(file, collect = mobileWebAppModuleClosure) {
+  rmSync(file, { force: true })
+  const routes = []
+  for (const route of new Set(PAGE_ROUTE_MODULES.values())) {
+    const closure = await collect(['app/_layout', 'app/h/_layout', route])
+    routes.push({ route, closure })
+  }
+  writeFileSync(file, JSON.stringify({ version: 1, routes }))
+}
+
+export async function withPreparedRouteSnapshot(file, run) {
+  try {
+    for (const route of new Set(PAGE_ROUTE_MODULES.values())) {
+      if (!readRouteSnapshot(route, file)) {
+        throw new Error(`Prepared mobile route snapshot is missing ${route}`)
+      }
+    }
+    return await run(file)
+  } finally {
+    rmSync(file, { force: true })
+  }
+}
+
+export async function withRouteSnapshot(run, collect = mobileWebAppModuleClosure) {
+  const directory = mkdtempSync(join(tmpdir(), 'orca-route-snapshot-'))
+  try {
+    const file = join(directory, 'routes.json')
+    await prepareRouteSnapshot(file, collect)
+    return await withPreparedRouteSnapshot(file, run)
+  } finally {
+    rmSync(directory, { recursive: true, force: true })
+  }
+}
+
+function runTests(file) {
+  return new Promise((resolve, reject) => {
+    const child = spawnProcess({
+      program: process.execPath,
+      args: [
+        join(dirname(require.resolve('vitest/package.json')), 'vitest.mjs'),
+        ...mobileWebCheckArgs,
+        ...process.argv.slice(2)
+      ],
+      env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1', ORCA_MOBILE_WEB_ROUTE_SNAPSHOT: file },
+      stdio: 'inherit'
+    })
+    child.once('error', reject)
+    child.once('close', (code, signal) => {
+      if (code === 0 && signal === null) {
+        resolve()
+      } else {
+        reject(new Error(`Mobile web checks failed (code=${code}, signal=${signal})`))
+      }
+    })
+  })
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  if (process.argv[2] === '--prepare-route-snapshot') {
+    if (process.argv.length !== 4) {
+      throw new Error('Expected --prepare-route-snapshot FILE')
+    }
+    await prepareRouteSnapshot(process.argv[3])
+  } else if (process.env.ORCA_MOBILE_WEB_PREPARED_ROUTE_SNAPSHOT) {
+    await withPreparedRouteSnapshot(process.env.ORCA_MOBILE_WEB_PREPARED_ROUTE_SNAPSHOT, runTests)
+  } else {
+    await withRouteSnapshot(runTests)
+  }
+}
diff --git a/config/scripts/run-sandboxed-test-shards.mjs b/config/scripts/run-sandboxed-test-shards.mjs
index 322ecc1d9d64..aad587a86280 100644
--- a/config/scripts/run-sandboxed-test-shards.mjs
+++ b/config/scripts/run-sandboxed-test-shards.mjs
@@ -65,6 +65,7 @@ const SHELL_CONTRACT_SPECS = [
   'src/main/providers/local-pty-shell-ready-zsh-launch-environment.test.ts',
   'src/main/providers/__tests__/shell-ready-framework-example.test.ts',
   'src/main/pty/codex-shell-launch-preflight.test.ts',
+  'src/main/pty/codex-shell-no-daemon.test.ts',
   'src/main/pty/omp-shell-wrapper-alias-safety.test.ts',
   'src/main/pty/omp-shell-wrapper.node-pty.test.ts',
   'src/main/shell-startup-feature-channel.test.ts',
@@ -72,6 +73,7 @@ const SHELL_CONTRACT_SPECS = [
   'src/main/zsh-scoped-histfile.live-shell.test.ts',
   'src/main/zsh-startup-hook-user-config-equivalence.live-shell.test.ts',
   'src/main/zsh-wrapper-version-mismatch.live-shell.test.ts',
+  'src/main/runtime/structured-session-cli-login-shell.live-shell.test.ts',
   'src/renderer/src/components/terminal-pane/fish-color-scheme-child-stdin.node-pty.test.ts',
   'src/shared/fish-query-reply-child-stdin.node-pty.test.ts',
   'src/shared/pty-reply-echo-shapes.node-pty.test.ts',
@@ -79,16 +81,8 @@ const SHELL_CONTRACT_SPECS = [
   'src/shared/posix-command-path-lookup.test.ts'
 ]
 
-/** The preflight suite also runs in CI's unit lane; every other shell contract is excluded there. */
-const UNIT_EXCLUDES = [
-  ...SHELL_CONTRACT_SPECS.filter(
-    (spec) => spec !== 'src/main/pty/codex-shell-launch-preflight.test.ts'
-  ),
-  'tests/e2e/cross-version-wire/**',
-  // Region pairing drives real relay endpoints, which the sandbox container cannot reach.
-  'tests/e2e/relay-region-compatibility.unit.test.ts',
-  'tests/e2e/relay-region-correction.unit.test.ts'
-]
+/** CI's unit shards set this so the vitest config applies UNIT_EXCLUDE (shell contracts, relay regions, cross-version). */
+const UNIT_SHARD_ENV = 'ORCA_BALANCE_UNIT_SHARDS=1'
 
 const LANES = new Set(['unit', 'shell', 'e2e'])
 
@@ -564,7 +558,10 @@ function runShard({ item, options, imageTag, sourceTarPath, dockerEnv }) {
   })
 }
 
-function laneEnvArgs(lane) {
+export function laneEnvArgs(lane) {
+  if (lane === 'unit') {
+    return ['--env', UNIT_SHARD_ENV]
+  }
   if (lane === 'shell') {
     // Otherwise the fish tests skip themselves and the lane reports green having run nothing.
     return ['--env', 'ORCA_REQUIRE_FISH=1']
@@ -616,7 +613,6 @@ export function laneCommand(options, shard) {
     'run',
     '--config',
     'config/vitest.config.ts',
-    ...UNIT_EXCLUDES.map((spec) => `--exclude=${spec}`),
     `--shard=${shard}/${options.shardTotal}`,
     ...options.extraArgs
   ]
@@ -634,8 +630,7 @@ function selectionLaneCommand(vitestSubcommand, tailArgs) {
     'vitest',
     vitestSubcommand,
     '--config',
-    'config/vitest.config.ts',
-    ...UNIT_EXCLUDES.map((spec) => `--exclude=${spec}`)
+    'config/vitest.config.ts'
   ]
   const head = headArgs.map(shellSingleQuote).join(' ')
   const tail = tailArgs.map(shellSingleQuote).join(' ')
diff --git a/config/scripts/run-sandboxed-test-shards.test.mjs b/config/scripts/run-sandboxed-test-shards.test.mjs
index 41c4304cee74..138ce1650094 100644
--- a/config/scripts/run-sandboxed-test-shards.test.mjs
+++ b/config/scripts/run-sandboxed-test-shards.test.mjs
@@ -8,6 +8,7 @@ import {
   RELATED_SINGLE_CONTAINER_MAX,
   buildSelectionTar,
   laneCommand,
+  laneEnvArgs,
   parseSelectMode,
   readSelectionList,
   resolveSelectionBuckets
@@ -20,12 +21,11 @@ const workflow = (name) =>
 const shellRun = workflow('pr').jobs.shell_contracts.steps.find(
   (step) => step.name === 'Test real shell contracts'
 ).run
-const unitRun = workflow('unit-tests').jobs.test.steps.find(
+const unitShardEnv = workflow('unit-tests').jobs.test.steps.find(
   (step) => step.name === 'Test shard'
-).run
+).env
 
 const shellSpecs = shellRun.match(/src\/\S+\.test\.ts/g)
-const unitExcludes = unitRun.match(/--exclude=\S+/g)
 
 describe('sandbox lane selection', () => {
   it('runs the CI shell contracts serially without stale spec paths', () => {
@@ -42,9 +42,9 @@ describe('sandbox lane selection', () => {
   it('keeps the same shell contracts out of parallel shards as CI', () => {
     const command = laneCommand({ lane: 'unit', shardTotal: 16, extraArgs: [] }, 3)
 
-    expect(command.filter((arg) => arg.startsWith('--exclude=')).sort()).toEqual(
-      unitExcludes.sort()
-    )
+    expect(unitShardEnv.ORCA_BALANCE_UNIT_SHARDS).toBe('1')
+    expect(laneEnvArgs('unit')).toEqual(['--env', 'ORCA_BALANCE_UNIT_SHARDS=1'])
+    expect(command.some((arg) => arg.startsWith('--exclude='))).toBe(false)
     expect(command).toContain('--shard=3/16')
   })
 
@@ -58,7 +58,6 @@ describe('sandbox lane selection', () => {
       '--config',
       'config/vitest.config.ts'
     ])
-    expect(unit.filter((arg) => arg.startsWith('--exclude=')).sort()).toEqual(unitExcludes.sort())
     expect(unit).toContain('--shard=5/16')
     expect(unit).toContain('--bail=1')
     expect(unit[0]).not.toBe('sh')
@@ -78,9 +77,7 @@ describe('related and files selection modes', () => {
     expect(command[2]).toContain('.orca-sandbox/selection.txt')
     expect(command[2]).toContain('--run')
     expect(command[2]).toContain('--bail=1')
-    for (const exclude of unitExcludes) {
-      expect(command[2]).toContain(exclude)
-    }
+    expect(command[2]).not.toContain('--exclude=')
   })
 
   it('builds a files-mode command with "run", no "--run" flag, still reading the selection file', () => {
diff --git a/config/scripts/run-ssh-docker-e2e.mjs b/config/scripts/run-ssh-docker-e2e.mjs
index 6a1fb69a7282..64709cdbb43d 100644
--- a/config/scripts/run-ssh-docker-e2e.mjs
+++ b/config/scripts/run-ssh-docker-e2e.mjs
@@ -40,9 +40,6 @@ if (runtime.status !== 0) {
 // grep-inverts away.
 //
 // Known gaps in SSH e2e coverage, recorded here because nothing else names them:
-//   - The job that runs this is still called `ssh-docker-watcher-isolation`, though watcher
-//     isolation is now one spec of many. Renaming it changes the GitHub check name and can
-//     break required-check config, so the name understates the job on purpose.
 //   - E2E does not gate merges: `verify.needs` in pr.yml omits `e2e` while the suite is red on
 //     main. Nothing in this lane blocks a PR yet. pr.yml's Require-successful-checks comment
 //     has the exact wiring to flip it, and the gate contract asserts the current state.
diff --git a/config/scripts/runtime-serve-terminal-smoke.mjs b/config/scripts/runtime-serve-terminal-smoke.mjs
index a03c85983d8a..c1d998717ffd 100644
--- a/config/scripts/runtime-serve-terminal-smoke.mjs
+++ b/config/scripts/runtime-serve-terminal-smoke.mjs
@@ -388,7 +388,9 @@ async function main() {
       child.kill('SIGTERM')
       const exited = await Promise.race([
         new Promise((r) => child.on('exit', () => r(true))),
-        new Promise((r) => setTimeout(() => r(false), SHUTDOWN_TIMEOUT_MS))
+        // unref'd: the loser of this race must not hold the event loop open after the
+        // winner already decided. The timer still bounds the wait.
+        new Promise((r) => setTimeout(() => r(false), SHUTDOWN_TIMEOUT_MS).unref())
       ])
       if (!exited) {
         child.kill('SIGKILL')
diff --git a/config/scripts/script-child-process.mjs b/config/scripts/script-child-process.mjs
index 08bd8b363064..fca512c33241 100644
--- a/config/scripts/script-child-process.mjs
+++ b/config/scripts/script-child-process.mjs
@@ -13,7 +13,7 @@ try {
   await build({
     stdin: {
       contents: [
-        `export { runProcessSync } from ${JSON.stringify(join(root, 'src/shared/child-process/run-process.ts'))}`
+        `export { runProcessSync, spawnProcess } from ${JSON.stringify(join(root, 'src/shared/child-process/run-process.ts'))}`
       ].join('\n'),
       resolveDir: root,
       sourcefile: 'script-child-process-entry.ts'
@@ -31,3 +31,5 @@ try {
 }
 
 export const runProcessSync = implementation.runProcessSync
+
+export const spawnProcess = implementation.spawnProcess
diff --git a/config/scripts/ssh-browser-e2e-routing.test.mjs b/config/scripts/ssh-browser-e2e-routing.test.mjs
index 0b46131cf141..a36df63dfd9d 100644
--- a/config/scripts/ssh-browser-e2e-routing.test.mjs
+++ b/config/scripts/ssh-browser-e2e-routing.test.mjs
@@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs'
 import { join, resolve } from 'node:path'
 import { parse } from 'yaml'
 import { expect, it } from 'vitest'
-import { selectPrE2eSpecs } from './pr-e2e-source-routing.mjs'
+import { selectPrE2eSpecs, shouldRunReusablePrE2e } from './pr-e2e-source-routing.mjs'
 
 const root = resolve(import.meta.dirname, '../..')
 const workflow = parse(readFileSync(join(root, '.github/workflows/e2e.yml'), 'utf8'))
@@ -62,3 +62,24 @@ it('executes both Docker network routes in a Node job with their opt-in enabled'
     spec
   )
 })
+
+it('runs the local SSH browser spec when its route source changes', () => {
+  const spec = 'tests/e2e/local-ssh-browser-routing.spec.ts'
+  for (const changed of [
+    'src/main/browser/local-ssh-browser-route.ts',
+    'src/main/browser/local-ssh-browser-partitions.ts',
+    'src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.ts',
+    'src/renderer/src/components/browser-pane/assemble-chrome/ssh-routed-browser-page-gate.tsx',
+    'src/renderer/src/lib/worktree-host-connection-phase.ts'
+  ]) {
+    expect(selectPrE2eSpecs([changed])).toContain(spec)
+    expect(shouldRunReusablePrE2e([changed])).toBe(true)
+  }
+  for (const unrelated of [
+    'src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.host-connection.test.tsx',
+    'src/main/browser/local-ssh-browser-route.test.ts',
+    'src/renderer/src/components/browser-pane/BrowserPane.tsx'
+  ]) {
+    expect(selectPrE2eSpecs([unrelated])).not.toContain(spec)
+  }
+})
diff --git a/config/scripts/ssh-docker-ci-sharding.test.mjs b/config/scripts/ssh-docker-ci-sharding.test.mjs
new file mode 100644
index 000000000000..403c059e92c3
--- /dev/null
+++ b/config/scripts/ssh-docker-ci-sharding.test.mjs
@@ -0,0 +1,97 @@
+import { readFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { dirname, join } from 'node:path'
+import { expect, it } from 'vitest'
+import { parse } from 'yaml'
+import { runProcess } from '../../src/shared/child-process/run-process'
+
+const require = createRequire(import.meta.url)
+const root = join(import.meta.dirname, '../..')
+const workflow = parse(readFileSync(join(root, '.github/workflows/e2e.yml'), 'utf8'))
+const job = workflow.jobs['ssh-docker-watcher-isolation']
+const readRunner = (name) => readFileSync(join(root, `config/scripts/${name}.mjs`), 'utf8')
+const runnerSpecs = (name) =>
+  [...readRunner(name).matchAll(/^    '(tests\/e2e\/[^']+\.spec\.ts)',/gm)].map((match) => match[1])
+const runners = [
+  'run-ssh-docker-e2e',
+  'run-ssh-docker-watcher-isolation-e2e',
+  'run-ssh-docker-terminal-parking-e2e'
+]
+
+it('gives every removed SSH spec a dedicated owner even for test-only edits', () => {
+  const changedRun = workflow.jobs['changed-e2e'].steps.find(
+    (step) => step.name === 'Run changed E2E specs'
+  ).run
+  const excluded = [...changedRun.matchAll(/\. != "([^"]+)"/g)].map((match) => match[1])
+  const owned = runners.flatMap(runnerSpecs)
+  expect(owned.length).toBeGreaterThan(25)
+  expect(new Set(owned).size).toBe(owned.length)
+  for (const spec of owned) {
+    expect(excluded, spec).toContain(spec)
+    expect(job.if, spec).toContain(`contains(inputs.test_files, '${spec}')`)
+  }
+  expect(excluded.filter((spec) => !owned.includes(spec)).sort()).toEqual([
+    'tests/e2e/ssh-browser-network-execution-route.docker.unit.test.ts',
+    'tests/e2e/ssh-localhost.spec.ts',
+    'tests/e2e/terminal-ibus-hangul-native.spec.ts'
+  ])
+})
+
+it('native Playwright shards preserve every SSH test and project exactly once', async () => {
+  const cli = join(dirname(require.resolve('playwright/package.json')), 'cli.js')
+  const env = {
+    ...process.env,
+    ORCA_BACKGROUND_LAUNCH: '1',
+    ORCA_E2E_SSH_DOCKER: '1',
+    ORCA_E2E_LOCAL_SSH_BROWSER: '1',
+    ORCA_E2E_SSH_CLIENT_HOSTED_BROWSER: '1',
+    ORCA_E2E_WEB_CLIENT: '1'
+  }
+  async function discover(extra = []) {
+    const result = await runProcess({
+      program: process.execPath,
+      cwd: root,
+      args: [
+        cli,
+        'test',
+        ...runnerSpecs(runners[0]),
+        '--config',
+        'tests/playwright.config.ts',
+        '--project=electron-headless',
+        '--project=electron-headful',
+        '--workers=1',
+        '--list',
+        '--reporter=json',
+        ...extra
+      ],
+      env,
+      timeoutMs: 30000
+    })
+    expect(result.code, result.stderr).toBe(0)
+    const report = JSON.parse(result.stdout)
+    expect(report.errors).toEqual([])
+    const ids = []
+    function visit(suite) {
+      for (const spec of suite.specs ?? []) {
+        for (const test of spec.tests) {
+          ids.push(`${spec.id}:${test.projectName}`)
+        }
+      }
+      for (const child of suite.suites ?? []) {
+        visit(child)
+      }
+    }
+    visit(report)
+    return ids
+  }
+  const full = await discover()
+  const sharded = []
+  for (const index of job.strategy.matrix.shard) {
+    const selected = await discover([`--shard=${index}/4`])
+    expect(selected.length).toBeGreaterThan(0)
+    sharded.push(...selected)
+  }
+  expect(full.length).toBeGreaterThanOrEqual(40)
+  expect(new Set(sharded).size).toBe(sharded.length)
+  expect(sharded.sort()).toEqual(full.sort())
+}, 90000)
diff --git a/config/scripts/telemetry-bundle-constant-patterns.mjs b/config/scripts/telemetry-bundle-constant-patterns.mjs
index 87c2ae43cf77..f0e9d53ed1c0 100644
--- a/config/scripts/telemetry-bundle-constant-patterns.mjs
+++ b/config/scripts/telemetry-bundle-constant-patterns.mjs
@@ -2,5 +2,6 @@
 // them, but the injected identity and key remain adjacent in the declaration.
 export const BUILD_IDENTITY_RE = /\b(?:const|let|var)\s+BUILD_IDENTITY\s*=\s*["`](rc|stable)["`]/
 export const WRITE_KEY_RE = /\b(?:const|let|var)\s+WRITE_KEY\s*=\s*["`](phc_[A-Za-z0-9_-]+)["`]/
+// Why the `,` alternative: the identity can be a later declarator in a shared `var` (`var a=!0,b=\`stable\``).
 export const MINIFIED_TELEMETRY_RE =
-  /\b(?:const|let|var)\s+[$\w]+\s*=\s*["'`](rc|stable)["'`][\s\S]{0,200}?[,$]\s*[$\w]+\s*=\s*["'`](phc_[A-Za-z0-9_-]+)["'`]/
+  /(?:\b(?:const|let|var)\s+|,\s*)[$\w]+\s*=\s*["'`](rc|stable)["'`][\s\S]{0,200}?[,$]\s*[$\w]+\s*=\s*["'`](phc_[A-Za-z0-9_-]+)["'`]/
diff --git a/config/scripts/telemetry-bundle-constant-patterns.test.mjs b/config/scripts/telemetry-bundle-constant-patterns.test.mjs
index ca87e3ee971b..57f8e0c72179 100644
--- a/config/scripts/telemetry-bundle-constant-patterns.test.mjs
+++ b/config/scripts/telemetry-bundle-constant-patterns.test.mjs
@@ -22,4 +22,16 @@ describe('telemetry bundle constant patterns', () => {
     const bundle = 'var dde=`stable`,fde=`phc_example-key_123`,pde=(dde===`stable`)'
     expect(bundle).toMatch(MINIFIED_TELEMETRY_RE)
   })
+
+  it('accepts the identity as a later declarator in a shared declaration', () => {
+    const bundle = 'var wpe=!0,Tpe=`stable`,Epe=`phc_example-key_123`,Dpe=(Tpe===`stable`)'
+    expect(MINIFIED_TELEMETRY_RE.exec(bundle)?.slice(1, 3)).toEqual([
+      'stable',
+      'phc_example-key_123'
+    ])
+  })
+
+  it('rejects a minified identity with no adjacent write key', () => {
+    expect('var a=!0,b=`stable`,c=null').not.toMatch(MINIFIED_TELEMETRY_RE)
+  })
 })
diff --git a/config/scripts/terminal-ime-e2e-workflow.test.mjs b/config/scripts/terminal-ime-e2e-workflow.test.mjs
index 162a6d08ace0..cb12839a2af0 100644
--- a/config/scripts/terminal-ime-e2e-workflow.test.mjs
+++ b/config/scripts/terminal-ime-e2e-workflow.test.mjs
@@ -45,29 +45,6 @@ describe('terminal IME e2e workflow', () => {
     expect(nativeIndex).toBeGreaterThan(deterministicIndex)
   })
 
-  it('keeps IBus lifecycle scoped to owned processes', () => {
-    const runner = readFileSync(
-      join(projectDir, 'config/scripts/run-terminal-ibus-hangul-e2e.mjs'),
-      'utf8'
-    )
-
-    expect(runner).toContain(
-      "['--xim', '--verbose', '--panel=disable', '--emoji-extension=disable']"
-    )
-    expect(runner).toContain("spawn('xfwm4', ['--compositor=off']")
-    expect(runner).toContain("['initial-input-mode', 'hangul']")
-    expect(runner).toContain("['hangul-keyboard', '2']")
-    expect(runner).toContain("process.kill(-processGroupId, 'SIGTERM')")
-    expect(runner).toContain("process.kill(-processGroupId, 'SIGKILL')")
-    expect(runner).toContain('const killDeadline = Date.now() + processKillTimeoutMs')
-    expect(runner).toMatch(
-      /'test:e2e:headful',\s*'--workers=1',\s*'tests\/e2e\/terminal-ibus-hangul-native\.spec\.ts'/
-    )
-    expect(runner).not.toContain("'--replace'")
-    expect(runner).not.toContain('killall')
-    expect(runner).not.toContain('pkill')
-  })
-
   it('runs native Wayland independently with CJK fonts and retained evidence', () => {
     const job = workflow.jobs['linux-wayland']
     expect(job.needs).toBeUndefined()
@@ -82,13 +59,4 @@ describe('terminal IME e2e workflow', () => {
     expect(upload.if).toBe('always()')
     expect(upload.with.name).toBe('terminal-wayland-ime-evidence')
   })
-
-  it('bounds blocking native input commands', () => {
-    const nativeSpec = readFileSync(
-      join(projectDir, 'tests/e2e/terminal-ibus-hangul-native.spec.ts'),
-      'utf8'
-    )
-
-    expect(nativeSpec.match(/timeout: NATIVE_COMMAND_TIMEOUT_MS/g)).toHaveLength(3)
-  })
 })
diff --git a/config/scripts/terminal-partial-escape-tail-benchmark.mjs b/config/scripts/terminal-partial-escape-tail-benchmark.mjs
index 0337daa4e9d7..0ba8e9741610 100644
--- a/config/scripts/terminal-partial-escape-tail-benchmark.mjs
+++ b/config/scripts/terminal-partial-escape-tail-benchmark.mjs
@@ -3,15 +3,16 @@
 // baseline with the pre-change shape (unconditional concat + per-code-unit walk). Equivalence is
 // proven over a corpus first, so the reported speedup cannot come from the gate changing the answer.
 import { performance } from 'node:perf_hooks'
-import {
-  advancePartialEscapeTail,
-  extractPartialEscapeTail,
-  MAX_PARTIAL_ESCAPE_TAIL_LENGTH
-} from '../../src/shared/terminal-partial-escape-tail.ts'
+import { createJiti } from 'jiti'
 
 const CHUNK_BYTES = 16 * 1024
 const CHUNKS = 640
 const ROUNDS = 7
+// jiti, not a bare `node` import: type-stripping cannot resolve the extensionless
+// relative imports inside the module graph under test.
+const jiti = createJiti(import.meta.url)
+const { advancePartialEscapeTail, extractPartialEscapeTail, MAX_PARTIAL_ESCAPE_TAIL_LENGTH } =
+  await jiti.import('../../src/shared/terminal-partial-escape-tail.ts')
 
 function baselineAdvance(pendingTail, chunk) {
   const tail = extractPartialEscapeTail(pendingTail + chunk)
diff --git a/config/scripts/terminal-reattach-payload-scan-benchmark.mjs b/config/scripts/terminal-reattach-payload-scan-benchmark.mjs
index fedfdc2c699f..3deb4d1fdbc4 100644
--- a/config/scripts/terminal-reattach-payload-scan-benchmark.mjs
+++ b/config/scripts/terminal-reattach-payload-scan-benchmark.mjs
@@ -5,7 +5,7 @@
 //     CSI strip against the shipped shape (256KB tail + shared CSI_SEQUENCE_PATTERN). Every
 //     variant is asserted to agree with the baseline before it is timed.
 //  2. TerminalKittyKeyboardModeTracker.scanReplay — measured to justify leaving it alone, and
-//     to record that porting the daemon mouse mirror's includes() pre-filter makes it slower.
+//     to record that an includes() introducer pre-filter makes it slower.
 //
 // Payloads are generated deterministically (LCG, no Math.random) so runs compare.
 //
@@ -214,7 +214,7 @@ const kittyScan = (data) => {
   tracker.scanReplay(data)
   return tracker.flags
 }
-// Mirrors src/main/daemon/terminal-mouse-mode-mirror.ts:41-47.
+// The includes() introducer pre-filter a daemon-side mode scan would use.
 const kittyGated = (data) => {
   if (!data.includes('\x1b[?') && !data.includes('\x1bc') && !data.includes('\x9b')) {
     return 0
diff --git a/config/scripts/verify-localization-catalog.mjs b/config/scripts/verify-localization-catalog.mjs
index a73e9d5e3cc1..a155e8741d3a 100644
--- a/config/scripts/verify-localization-catalog.mjs
+++ b/config/scripts/verify-localization-catalog.mjs
@@ -442,7 +442,27 @@ async function reportPluginCatalog(root, catalog, pluginCatalogPath) {
   return interpolationMismatches.length > 0 ? 1 : 0
 }
 
-export async function main(root = process.cwd(), options = parseArgs(process.argv.slice(2))) {
+export async function collectLocalizationReferences(root) {
+  const sourceRoots = LOCALIZATION_SOURCE_ROOTS.map((sourceRoot) => path.join(root, sourceRoot))
+  const references = []
+
+  for (const sourceRoot of sourceRoots) {
+    const files = await collectSourceFiles(root, sourceRoot)
+    for (const filePath of files) {
+      references.push(
+        ...collectLocalizationKeyReferences(filePath, await fs.readFile(filePath, 'utf8'), root)
+      )
+    }
+  }
+
+  return references
+}
+
+export async function main(
+  root = process.cwd(),
+  options = parseArgs(process.argv.slice(2)),
+  sharedReferences
+) {
   const localesDir = path.join(root, LOCALES_RELATIVE_DIR)
   const catalogPath = path.join(localesDir, 'en.json')
   const catalog = JSON.parse(await fs.readFile(catalogPath, 'utf8'))
@@ -461,17 +481,7 @@ export async function main(root = process.cwd(), options = parseArgs(process.arg
     return 0
   }
   let catalogKeys = new Set(flattenCatalogKeys(catalog))
-  const sourceRoots = LOCALIZATION_SOURCE_ROOTS.map((sourceRoot) => path.join(root, sourceRoot))
-  const references = []
-
-  for (const sourceRoot of sourceRoots) {
-    const files = await collectSourceFiles(root, sourceRoot)
-    for (const filePath of files) {
-      references.push(
-        ...collectLocalizationKeyReferences(filePath, await fs.readFile(filePath, 'utf8'), root)
-      )
-    }
-  }
+  const references = sharedReferences ?? (await collectLocalizationReferences(root))
 
   const missing = references.filter((reference) => !catalogKeys.has(reference.key))
   if (missing.length > 0) {
diff --git a/config/scripts/verify-localization-catalogs.mjs b/config/scripts/verify-localization-catalogs.mjs
new file mode 100644
index 000000000000..73eb9ab943ba
--- /dev/null
+++ b/config/scripts/verify-localization-catalogs.mjs
@@ -0,0 +1,30 @@
+import process from 'node:process'
+import { pathToFileURL } from 'node:url'
+import {
+  collectLocalizationReferences,
+  main as verifyCatalog
+} from './verify-localization-catalog.mjs'
+import { main as verifyRuntimeCatalog } from './generate-runtime-required-english-catalog.mjs'
+
+export async function main(root = process.cwd()) {
+  // Share only this invocation's scan, never cached evidence from another checkout.
+  const references = await collectLocalizationReferences(root)
+  const results = await Promise.allSettled([
+    verifyCatalog(root, {}, references),
+    verifyRuntimeCatalog(root, [], references)
+  ])
+  let exitCode = 0
+  for (const result of results) {
+    if (result.status === 'rejected') {
+      console.error(result.reason)
+      exitCode = 1
+    } else if (result.value !== 0) {
+      exitCode = 1
+    }
+  }
+  return exitCode
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  process.exit(await main())
+}
diff --git a/config/scripts/verify-localization-catalogs.test.mjs b/config/scripts/verify-localization-catalogs.test.mjs
new file mode 100644
index 000000000000..038bf34254e9
--- /dev/null
+++ b/config/scripts/verify-localization-catalogs.test.mjs
@@ -0,0 +1,80 @@
+import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import { main as verifyTogether } from './verify-localization-catalogs.mjs'
+import { main as verifyCatalog } from './verify-localization-catalog.mjs'
+import { main as verifyRuntimeCatalog } from './generate-runtime-required-english-catalog.mjs'
+
+const directories = []
+const renderer = 'src/renderer/src'
+const englishPath = `${renderer}/i18n/locales/en.json`
+const runtimePath = `${renderer}/i18n/en-runtime-required.json`
+
+async function fixture() {
+  const root = await mkdtemp(join(tmpdir(), 'orca-localization-checks-'))
+  directories.push(root)
+  await mkdir(join(root, renderer, 'i18n/locales'), { recursive: true })
+  await mkdir(join(root, 'src/main'), { recursive: true })
+  await writeFile(join(root, renderer, 'greeting.ts'), "translate('hello', 'Hello')\n")
+  await writeFile(join(root, 'src/main/ready.ts'), "translateMain('ready', 'Ready')\n")
+  await writeFile(
+    join(root, englishPath),
+    JSON.stringify({ hello: 'Hello', ready: 'Ready', dynamic: 'Required' })
+  )
+  await writeFile(join(root, runtimePath), JSON.stringify({ dynamic: 'Required' }))
+  return root
+}
+
+afterEach(async () => {
+  await Promise.all(directories.splice(0).map((root) => rm(root, { recursive: true, force: true })))
+})
+
+describe('combined localization verification', () => {
+  it.each([
+    ['valid catalogs', undefined, undefined, 0, 0],
+    ['missing reference', `${renderer}/greeting.ts`, "translate('missing', 'Missing')", 1, 1],
+    ['missing runtime entry', runtimePath, '{}', 0, 1],
+    ['contradictory runtime entry', runtimePath, '{"dynamic":"Wrong"}', 0, 1],
+    ['malformed runtime catalog', runtimePath, '{', 0, 1],
+    [
+      'inconsistent placeholders',
+      `${renderer}/greeting.ts`,
+      "translate('hello', 'Hello {{name}}'); translate('hello', 'Hello {{account}}')",
+      1,
+      1
+    ]
+  ])(
+    'preserves both standalone verdicts: %s',
+    async (_name, file, contents, catalogCode, combinedCode) => {
+      const root = await fixture()
+      if (file) {
+        await writeFile(join(root, file), contents)
+      }
+      const results = await Promise.allSettled([
+        verifyCatalog(root, {}),
+        verifyRuntimeCatalog(root, [])
+      ])
+      expect(results[0]).toMatchObject({ status: 'fulfilled', value: catalogCode })
+      const expected = results.some((result) => result.status === 'rejected' || result.value !== 0)
+        ? 1
+        : 0
+      expect(expected).toBe(combinedCode)
+      expect(await verifyTogether(root)).toBe(expected)
+    }
+  )
+
+  it('reads source edits, new files, removals, and separate roots on each invocation', async () => {
+    const root = await fixture()
+    expect(await verifyTogether(root)).toBe(0)
+    await writeFile(join(root, renderer, 'greeting.ts'), "translate('hello', 'New fallback')")
+    expect(await verifyTogether(root)).toBe(1)
+    await writeFile(join(root, renderer, 'greeting.ts'), "translate('hello', 'Hello')")
+    expect(await verifyTogether(root)).toBe(0)
+    await writeFile(join(root, 'src/main/added.ts'), "translateMain('absent', 'Absent')")
+    expect(await verifyTogether(root)).toBe(1)
+    await rm(join(root, 'src/main/added.ts'))
+    expect(await verifyTogether(root)).toBe(0)
+    expect(await verifyTogether(await fixture())).toBe(0)
+  })
+})
diff --git a/config/scripts/vitest-caller-identity-env-setup.ts b/config/scripts/vitest-caller-identity-env-setup.ts
new file mode 100644
index 000000000000..1d14998e46c6
--- /dev/null
+++ b/config/scripts/vitest-caller-identity-env-setup.ts
@@ -0,0 +1,8 @@
+/**
+ * Why: a structured chat exports its own orchestration caller identity to every child, including a
+ * test runner it launches. Inherited, it would decide which CLI identity branch a test exercises
+ * depending on who ran the suite; suites that need one set it themselves.
+ */
+for (const name of ['ORCA_AGENT_SESSION_ID', 'ORCA_STRUCTURED_SESSION']) {
+  delete process.env[name]
+}
diff --git a/config/scripts/win-crash-survival-e2e.test.mjs b/config/scripts/win-crash-survival-e2e.test.mjs
index 40a2e1bb483e..9c772eb01eb4 100644
--- a/config/scripts/win-crash-survival-e2e.test.mjs
+++ b/config/scripts/win-crash-survival-e2e.test.mjs
@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs'
 import { describe, expect, it, vi } from 'vitest'
 import { parseArgs } from '../../tests/tools/win-crash-survival-e2e/cli-args.mjs'
 import { buildCrashAssertions } from '../../tests/tools/win-crash-survival-e2e/crash-assertions.mjs'
@@ -13,26 +12,6 @@ import { closeApp, resolveElectronMainPid } from '../../tests/tools/win-update-e
 import { isPidAlive } from '../../tests/tools/win-update-e2e/daemon-processes.mjs'
 
 describe('win-crash-survival-e2e proof contracts', () => {
-  it('keeps the packaged proof manually dispatchable without a PR trigger', () => {
-    const workflow = readFileSync('.github/workflows/win-crash-survival-e2e.yml', 'utf8')
-    expect(workflow).not.toMatch(/^  pull_request:/m)
-    expect(workflow).toMatch(/^  workflow_dispatch:/m)
-    expect(workflow).not.toMatch(/^  push:/m)
-    expect(workflow).toContain('--expect "$env:EXPECT"')
-    expect(workflow).toContain('exit $LASTEXITCODE')
-    expect(workflow).toContain("'!config/**/*.test.*'")
-    expect(workflow).toContain("'!src/**/*.test.*'")
-    expect(workflow).toContain("'!src/**/*.bench.*'")
-    expect(workflow).toContain("'!config/reliability-gates.jsonc'")
-    expect(workflow).toContain("'resources/**'")
-    expect(workflow).toContain('cache: pnpm')
-    expect(workflow.indexOf('- name: Setup Node.js')).toBeGreaterThan(
-      workflow.indexOf('- name: Setup pnpm')
-    )
-    expect(workflow).toContain("if: steps.cache-installer.outputs.cache-hit != 'true'")
-    expect(workflow).toContain('crash-survival-electron-builder-')
-  })
-
   it('requires the full survival oracle, including daemon identity and reattach', () => {
     const base = {
       profile: 'survival',
@@ -58,15 +37,6 @@ describe('win-crash-survival-e2e proof contracts', () => {
     ).toBe(false)
   })
 
-  it('scans for FailFast only after the post-crash input probe', () => {
-    const harness = readFileSync('tests/tools/win-crash-survival-e2e/run.mjs', 'utf8')
-    const scanIndex = harness.indexOf('const { events: failFastEvents }')
-    const probeIndex = harness.indexOf('reattachProven = await proveReattachedShell')
-    expect(scanIndex).not.toBe(-1)
-    expect(probeIndex).not.toBe(-1)
-    expect(scanIndex).toBeGreaterThan(probeIndex)
-  })
-
   it('fails closed when the Windows event log query fails', () => {
     let command = ''
     expect(() =>
@@ -162,11 +132,7 @@ describe('win-crash-survival-e2e proof contracts', () => {
     expect(reattachSentinelMatches('1660|canary|extra', 'canary', 1660)).toBe(false)
   })
 
-  it('requires the real packaged main for the crash proof but permits fallback cleanup', async () => {
-    const harness = readFileSync('tests/tools/win-crash-survival-e2e/run.mjs', 'utf8')
-    expect(harness).toContain(
-      'resolveElectronMainPid(session.app, { allowLauncherFallback: false })'
-    )
+  it('resolves the real packaged main but permits fallback cleanup', async () => {
     expect(
       await resolveElectronMainPid({
         evaluate: async () => 222,
diff --git a/config/scripts/windows-process-tree-gyp-path.test.mjs b/config/scripts/windows-process-tree-gyp-path.test.mjs
index f1d3742e5833..0f8a651e12f3 100644
--- a/config/scripts/windows-process-tree-gyp-path.test.mjs
+++ b/config/scripts/windows-process-tree-gyp-path.test.mjs
@@ -1,43 +1,13 @@
 import { execFileSync } from 'node:child_process'
-import { existsSync, readFileSync } from 'node:fs'
+import { existsSync } from 'node:fs'
 import { isAbsolute, join, resolve } from 'node:path'
 import { describe, expect, it } from 'vitest'
 
 const projectDir = resolve(import.meta.dirname, '../..')
-const PATCH = readFileSync(
-  join(projectDir, 'config/patches/@vscode__windows-process-tree@0.8.0.patch'),
-  'utf8'
-)
 const PACKAGE_DIR = join(projectDir, 'node_modules', '@vscode', 'windows-process-tree')
 const RESOLVED_GYP = "require.resolve('node-addon-api/node_addon_api.gyp')"
 
 describe('windows-process-tree node-addon-api gyp path', () => {
-  it('stages headers without a pnpm-sensitive gyp dependency', () => {
-    expect(PATCH).not.toContain('+        "../../node-addon-api')
-    expect(PATCH).toContain('+          "include_dirs": ["deps/node-addon-api"],')
-    expect(PATCH).toContain('+          "defines": ["NAPI_CPP_EXCEPTIONS", "_HAS_EXCEPTIONS=1"],')
-    const buildScript = readFileSync(
-      join(projectDir, 'config/scripts/build-windows-process-tree-relay-addon.mjs'),
-      'utf8'
-    )
-    expect(buildScript).toContain('stageWindowsProcessTreeNodeAddonApiHeaders(PACKAGE_DIR)')
-    expect(buildScript).toContain('Repaired un-applied pnpm patch hunks before build.')
-    const rebuildHelper = readFileSync(
-      join(projectDir, 'config/scripts/windows-process-tree-gyp-rebuild.mjs'),
-      'utf8'
-    )
-    expect(rebuildHelper).toContain("createRequire(join(packageDir, 'package.json'))")
-    expect(rebuildHelper).toContain("resolve('node-addon-api/package.json')")
-    expect(rebuildHelper).toContain("'napi.h'")
-    expect(rebuildHelper).toContain("'napi-inl.h'")
-    expect(rebuildHelper).toContain("'napi-inl.deprecated.h'")
-    const rebuildScript = readFileSync(
-      join(projectDir, 'config/scripts/rebuild-native-deps.mjs'),
-      'utf8'
-    )
-    expect(rebuildScript).toContain('stageWindowsProcessTreeNodeAddonApiHeaders()')
-  })
-
   // The installed Windows dependency is exercised by the Windows CI lane.
   it.runIf(process.platform === 'win32')(
     'resolves node_addon_api.gyp to a real file from the package directory',
diff --git a/config/scripts/windows-pty-table-stress.cjs b/config/scripts/windows-pty-table-stress.cjs
new file mode 100644
index 000000000000..b703e18d19ce
--- /dev/null
+++ b/config/scripts/windows-pty-table-stress.cjs
@@ -0,0 +1,156 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+const { createHash } = require('node:crypto')
+const { readFileSync, writeSync } = require('node:fs')
+const { dirname, resolve } = require('node:path')
+
+function report(phase, details = {}) {
+  writeSync(1, `${JSON.stringify({ phase, hostPid: process.pid, ...details })}\n`)
+}
+
+async function exerciseTable() {
+  assert.equal(process.platform, 'win32', 'This probe requires real Windows ConPTY')
+  const rounds = Number(process.env.ORCA_PTY_TABLE_STRESS_ROUNDS ?? 8)
+  assert.ok(Number.isInteger(rounds) && rounds > 0 && rounds <= 2000)
+  const pty = require('node-pty')
+  const nativePath = require.resolve('node-pty/lib/utils')
+  const loaded = require(nativePath).loadNativeModule('conpty')
+  const native = loaded.module
+  const addonPath = resolve(dirname(nativePath), loaded.dir, 'conpty.node')
+  report('native', {
+    addonPath,
+    sha256: createHash('sha256').update(readFileSync(addonPath)).digest('hex'),
+    node: process.version,
+    rounds
+  })
+  // Unlike production's fallback, this crash probe requires a host that permits nested jobs.
+  const hostJobAssigned = native.assignCurrentProcessToJob()
+  report('host-job-precondition', { assigned: hostJobAssigned })
+  assert.equal(hostJobAssigned, true, 'Probe precondition: host must permit a crash-cleanup job')
+
+  const spawned = []
+  function spawn(round, slot) {
+    report('spawn', { round, slot })
+    const proc = pty.spawn(process.env.ComSpec || 'cmd.exe', ['/d', '/q'], {
+      cwd: process.cwd(),
+      cols: 80,
+      rows: 24,
+      useConptyDll: true
+    })
+    const record = { proc, output: '', exited: false, closed: false }
+    const marker = `ORCA_PTY_READY_${spawned.length}`
+    let resolveReady
+    record.ready = new Promise((resolve) => {
+      resolveReady = resolve
+    })
+    record.exit = new Promise((resolveExit) => {
+      proc.onExit((event) => {
+        record.exited = true
+        resolveReady(false)
+        resolveExit(event)
+      })
+    })
+    proc.onData((chunk) => {
+      record.output = (record.output + chunk).slice(-2048)
+      if (record.output.includes(marker)) {
+        resolveReady(true)
+      }
+    })
+    spawned.push(record)
+    // Escaping one letter keeps echoed input from satisfying the output marker.
+    proc.write(`echo ${marker.replace('READY', 'REA^DY')}\r`)
+    return record
+  }
+
+  async function waitForReady(records) {
+    let timer
+    try {
+      await Promise.race([
+        Promise.all(
+          records.map(async (record) => {
+            assert.equal(await record.ready, true, `Shell exited before ready: ${record.output}`)
+          })
+        ),
+        new Promise((_, reject) => {
+          timer = setTimeout(() => {
+            const transcripts = records.map(({ proc, output }) => ({ pid: proc.pid, output }))
+            reject(new Error(`PTY readiness timed out: ${JSON.stringify(transcripts)}`))
+          }, 15_000)
+        })
+      ])
+    } finally {
+      clearTimeout(timer)
+    }
+    for (const { proc } of records) {
+      const members = native.listJobProcessIds(proc._pty, proc.pid)
+      assert.ok(members?.includes(proc.pid), `Ready shell ${proc.pid} must retain its job`)
+    }
+    report('ready', { shellPids: records.map(({ proc }) => proc.pid) })
+  }
+
+  function close(record, round, slot) {
+    report('kill', { round, slot, shellPid: record.proc.pid })
+    record.proc.kill()
+    record.closed = true
+  }
+
+  let failure
+  try {
+    const survivor = spawn(-1, -1)
+    await waitForReady([survivor])
+    const slots = []
+    for (let round = 0; round < rounds; round += 1) {
+      for (let slot = 0; slot < 3; slot += 1) {
+        if (slots[slot]) {
+          close(slots[slot], round, slot)
+        }
+        // The next lookup/insertion overlaps the previous shell's native exit watcher.
+        slots[slot] = spawn(round, slot)
+        report('resize-clear-list', { round, slot, shellPid: survivor.proc.pid })
+        survivor.proc.resize(80 + (round % 2), 24)
+        survivor.proc.clear()
+        const members = native.listJobProcessIds(survivor.proc._pty, survivor.proc.pid)
+        assert.ok(members?.includes(survivor.proc.pid), 'A live survivor must retain its job')
+      }
+      // A ready terminal runs kill/resize/clear immediately instead of deferring them.
+      await waitForReady(slots)
+    }
+    assert.equal(survivor.exited, false, survivor.output)
+    report('overlap-complete', { terminals: spawned.length })
+  } catch (error) {
+    failure = { error }
+  } finally {
+    for (const record of spawned) {
+      if (!record.closed) {
+        close(record, -1, -1)
+      }
+    }
+    let timer
+    try {
+      await Promise.race([
+        Promise.all(spawned.map((record) => record.exit)),
+        new Promise((_, reject) => {
+          timer = setTimeout(() => reject(new Error('PTY exit callbacks did not drain')), 15_000)
+        })
+      ])
+    } catch (error) {
+      if (failure) {
+        report('drain-error', { message: error.stack })
+      } else {
+        failure = { error }
+      }
+    } finally {
+      clearTimeout(timer)
+    }
+  }
+  if (failure) {
+    throw failure.error
+  }
+  report('complete', { terminals: spawned.length })
+}
+
+exerciseTable().catch((error) => {
+  report('error', { message: error.stack })
+  process.exitCode = 1
+})
diff --git a/config/scripts/windows-signing-notification.test.mjs b/config/scripts/windows-signing-notification.test.mjs
new file mode 100644
index 000000000000..d5b6671e9d02
--- /dev/null
+++ b/config/scripts/windows-signing-notification.test.mjs
@@ -0,0 +1,37 @@
+import { readFileSync } from 'node:fs'
+import { describe, expect, it } from 'vitest'
+import { parse } from 'yaml'
+
+const releaseSteps = () =>
+  parse(readFileSync(new URL('../../.github/workflows/release-cut.yml', import.meta.url), 'utf8'))
+    .jobs.build.steps
+const stepNamed = (steps, name) => steps.find((step) => step.name === name)
+
+describe('Windows signing failure notification', () => {
+  it('alerts Slack after signing failures without masking the release failure', () => {
+    const steps = releaseSteps()
+    const notify = stepNamed(steps, 'Notify Slack when Windows signing fails')
+    const names = steps.map((step) => step.name)
+    expect(stepNamed(steps, 'Install SignPath PowerShell module').id).toBe('install-signpath')
+    expect(notify.if).toBe(
+      "failure() && matrix.platform == 'win' && github.run_attempt == 1 && steps.install-signpath.outcome != '' && steps.install-signpath.outcome != 'skipped'"
+    )
+    expect(notify['continue-on-error']).toBe(true)
+    expect(names.indexOf(notify.name)).toBeGreaterThan(
+      names.indexOf('Verify Windows inner binary signatures')
+    )
+    expect(names.indexOf(notify.name)).toBeLessThan(
+      names.indexOf('Publish signed Windows release artifacts')
+    )
+    expect(notify.env.SLACK_WEBHOOK_URL).toBe('${{ secrets.SLACK_WEBHOOK_URL }}')
+    expect(notify.env.INNER_REQUEST_ID).toContain(
+      'steps.submit-inner-signing.outputs.signing-request-id'
+    )
+    expect(notify.env.INSTALLER_REQUEST_ID).toContain(
+      'steps.submit-signing-request.outputs.signing-request-id'
+    )
+    expect(notify.run).toContain('Publication is blocked.')
+    expect(notify.run).toContain('Late SignPath approval does not resume this run')
+    expect(notify.run).toContain('Invoke-RestMethod -Method Post')
+  })
+})
diff --git a/config/scripts/windows-signing-workflow-contract.test.mjs b/config/scripts/windows-signing-workflow-contract.test.mjs
deleted file mode 100644
index c321db8cfd23..000000000000
--- a/config/scripts/windows-signing-workflow-contract.test.mjs
+++ /dev/null
@@ -1,458 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { createRequire } from 'node:module'
-import { join, resolve } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import { parse } from 'yaml'
-
-const projectDir = resolve(import.meta.dirname, '../..')
-
-const readWorkflow = (relativePath) => parse(readFileSync(join(projectDir, relativePath), 'utf8'))
-
-describe('Windows signing workflow contract', () => {
-  it('preflights SignPath module install before Windows signing side effects', () => {
-    const parsedWorkflow = readWorkflow('.github/workflows/release-cut.yml')
-    const steps = parsedWorkflow.jobs.build.steps
-    const stepNames = steps.map((step) => step.name)
-    const installStepIndexes = stepNames.flatMap((name, index) =>
-      name === 'Install SignPath PowerShell module' ? [index] : []
-    )
-    const buildIndex = stepNames.indexOf('Build Windows release artifacts')
-    const verifyNodePtyIndex = stepNames.indexOf('Verify Windows node-pty ConPTY runtime')
-    const uploadIndex = stepNames.indexOf('Upload unsigned Windows installer for SignPath')
-    const downloadIndex = stepNames.indexOf('Download signed Windows installer from SignPath')
-
-    expect(verifyNodePtyIndex).toBe(buildIndex + 1)
-    expect(installStepIndexes).toEqual([verifyNodePtyIndex + 1])
-    expect(installStepIndexes[0]).toBeLessThan(uploadIndex)
-
-    expect(steps[verifyNodePtyIndex].run).toContain(
-      'dist/win-unpacked/resources/node_modules/node-pty/build/Release'
-    )
-    expect(steps[verifyNodePtyIndex].run).toContain('conpty/conpty.dll')
-
-    const uploadThroughDownloadScript = steps
-      .slice(uploadIndex, downloadIndex + 1)
-      .map((step) => step.run ?? '')
-      .join('\n')
-
-    expect(uploadThroughDownloadScript).not.toContain('Install-Module -Name SignPath')
-
-    const installStep = steps[installStepIndexes[0]]
-
-    expect(installStep.if).toBe("matrix.platform == 'win' && github.run_attempt == 1")
-    expect(installStep.uses).toBe('./.github/actions/install-signpath-module')
-    expect(installStep.run).toBeUndefined()
-
-    const installAction = readWorkflow('.github/actions/install-signpath-module/action.yml')
-    const actionStep = installAction.runs.steps[0]
-    const installRun = actionStep.run
-    const sleepSeconds = [...installRun.matchAll(/Start-Sleep -Seconds (\d+)/g)].map(
-      ([, seconds]) => seconds
-    )
-
-    expect(installAction.runs.using).toBe('composite')
-    expect(actionStep.shell).toBe('pwsh')
-    expect(installRun).toContain(
-      'if ($null -eq (Get-PSRepository -Name PSGallery -ErrorAction SilentlyContinue))'
-    )
-    expect(installRun).toContain('Register-PSRepository -Default -InstallationPolicy Trusted')
-    expect(installRun).toContain('Set-PSRepository -Name PSGallery -InstallationPolicy Trusted')
-    expect(installRun).toMatch(/\$env:PSModulePath -split \[System\.IO\.Path\]::PathSeparator/)
-    expect(installRun).toContain(
-      "$signPathModulePath = Join-Path -Path $currentUserModuleRoot -ChildPath 'SignPath'"
-    )
-    expect(installRun).toMatch(/for \(\$attempt = 1; \$attempt -le 3; \$attempt\+\+\)/)
-    expect(sleepSeconds).toContain('15')
-    expect(sleepSeconds).toContain('30')
-    expect(installRun).toContain(
-      'Install-Module -Name SignPath -Repository PSGallery -MinimumVersion 4.0.0 -MaximumVersion 4.999.999 -Scope CurrentUser -Force -AllowClobber -ErrorAction Stop'
-    )
-    expect(installRun).toContain('Import-Module SignPath -ErrorAction Stop')
-    expect(installRun).toContain(
-      'Get-Command -Name Get-SignedArtifact -Module SignPath -ErrorAction Stop'
-    )
-    expect(installRun).toContain('Remove-Item -LiteralPath $signPathModulePath -Recurse -Force')
-    expect(installRun).not.toContain('SignPath*')
-    expect(installRun).not.toMatch(/throw\s+\$_/)
-  })
-
-  it('falls back to a hash-pinned SignPath nupkg when the gallery API is down', () => {
-    const installAction = readWorkflow('.github/actions/install-signpath-module/action.yml')
-    const installRun = installAction.runs.steps[0].run
-
-    // Why: the gallery API 403s during Azure Front Door incidents while its CDN
-    // stays up, so a pinned nupkg is the fallback. The hash pin is the only
-    // integrity check on that route — losing it would let any payload install.
-    const { 'fallback-version': version, 'fallback-sha256': sha256 } = installAction.inputs
-    expect(version.default).toMatch(/^4\.\d+\.\d+$/)
-    expect(sha256.default).toMatch(/^[0-9a-f]{64}$/)
-    expect(installRun).toContain('Get-FileHash -LiteralPath $nupkg -Algorithm SHA256')
-    expect(installRun).toContain('$actualHash -ne $expectedHash.ToUpperInvariant()')
-    expect(installRun).toContain('throw "SHA-256 mismatch for $source')
-    expect(installRun).toContain(
-      'https://cdn.powershellgallery.com/packages/signpath.$version.nupkg'
-    )
-
-    // The module only resolves by name when the folder matches its ModuleVersion.
-    expect(installRun).toContain(
-      '$versionRoot = Join-Path -Path $signPathModulePath -ChildPath $version'
-    )
-    // The fallback only runs after the gallery route is exhausted, and still
-    // fails the job when neither route produced a usable module.
-    expect(installRun.indexOf('$installed = $true')).toBeLessThan(
-      installRun.indexOf('if (-not $installed)')
-    )
-    expect(installRun).toContain('throw "Unable to install the SignPath PowerShell module')
-  })
-
-  it('still installs SignPath when the cut ref predates the composite action', () => {
-    const parsedWorkflow = readWorkflow('.github/workflows/release-cut.yml')
-    const steps = parsedWorkflow.jobs.build.steps
-    const stepNames = steps.map((step) => step.name)
-    const checkoutIndex = stepNames.indexOf('Checkout')
-    const restoreIndex = stepNames.indexOf('Restore composite actions from the workflow ref')
-    const installIndex = stepNames.indexOf('Install SignPath PowerShell module')
-
-    // Why: the build job checks out the cut tag, which for a hotfix cut from an
-    // older ref can predate `.github/actions/install-signpath-module`; without
-    // this restore the `uses: ./…` step dies on a missing action.yml.
-    expect(restoreIndex).toBeGreaterThan(checkoutIndex)
-    expect(restoreIndex).toBeLessThan(installIndex)
-
-    const restoreStep = steps[restoreIndex]
-    const restoreRun = restoreStep.run
-
-    expect(restoreStep.env.WORKFLOW_SHA).toBe('${{ github.workflow_sha }}')
-    expect(restoreRun).toContain('.github/actions/install-signpath-module/action.yml')
-    expect(restoreRun).toContain('git fetch --no-tags --depth=1 origin "$WORKFLOW_SHA"')
-    expect(restoreRun).toContain('git checkout "$WORKFLOW_SHA" -- .github/actions')
-
-    // Why: restoring the action must not turn signing into a soft dependency —
-    // a missing module still has to fail the Windows job, and the CDN fallback
-    // still has to reject an unexpected payload.
-    expect(steps[installIndex]['continue-on-error']).toBeUndefined()
-    expect(restoreStep['continue-on-error']).toBeUndefined()
-
-    const installRun = readWorkflow('.github/actions/install-signpath-module/action.yml').runs
-      .steps[0].run
-
-    expect(installRun).toContain('$actualHash -ne $expectedHash.ToUpperInvariant()')
-    expect(installRun).toContain('throw "SHA-256 mismatch for $source')
-  })
-
-  it('never recreates Windows signing requests on a workflow rerun', () => {
-    const parsedWorkflow = readWorkflow('.github/workflows/release-cut.yml')
-    const steps = parsedWorkflow.jobs.build.steps
-    const stepNames = steps.map((step) => step.name)
-    const skipStep = steps.find((step) => step.name === 'Skip Windows artifact rebuild on rerun')
-
-    expect(skipStep?.if).toBe("matrix.platform == 'win' && github.run_attempt != 1")
-    expect(skipStep?.run).toContain('Existing signed release assets must be reused')
-
-    const signingStepNames = [
-      'Build Windows release artifacts',
-      'Stage unsigned inner PE files for signing',
-      'Upload unsigned inner binaries for SignPath',
-      'Submit inner binaries signing request',
-      'Download signed inner binaries from SignPath',
-      'Upload unsigned Windows installer for SignPath',
-      'Submit Windows installer signing request',
-      'Download signed Windows installer from SignPath',
-      'Stage signed Windows release assets',
-      'Publish signed Windows release artifacts'
-    ]
-
-    for (const stepName of signingStepNames) {
-      const step = steps[stepNames.indexOf(stepName)]
-      expect(step?.if, stepName).toContain('github.run_attempt == 1')
-    }
-  })
-
-  it('shares one SignPath module install path between release and rehearsal', () => {
-    const rehearsalWorkflow = readWorkflow('.github/workflows/windows-signing-rehearsal.yml')
-    const stepNames = rehearsalWorkflow.jobs.rehearse.steps.map((step) => step.name)
-    const installIndex = stepNames.indexOf('Install SignPath PowerShell module')
-
-    // Why: the rehearsal exists to prove the real signing flow, so it must
-    // install the module exactly the way the release job does.
-    expect(rehearsalWorkflow.jobs.rehearse.steps[installIndex].uses).toBe(
-      './.github/actions/install-signpath-module'
-    )
-    expect(rehearsalWorkflow.jobs.rehearse.steps[installIndex].run).toBeUndefined()
-    expect(installIndex).toBeLessThan(
-      stepNames.indexOf('Download signed inner binaries from SignPath')
-    )
-  })
-
-  it('verifies Windows inner binary signatures fail-open before publishing', () => {
-    const parsedWorkflow = readWorkflow('.github/workflows/release-cut.yml')
-    const steps = parsedWorkflow.jobs.build.steps
-    const stepNames = steps.map((step) => step.name)
-    const outerVerifyIndex = stepNames.indexOf('Verify signed Windows installer')
-    const innerVerifyIndex = stepNames.indexOf('Verify Windows inner binary signatures')
-    const evidenceIndex = stepNames.indexOf('Upload Windows inner signing evidence')
-    const publishIndex = stepNames.indexOf('Publish signed Windows release artifacts')
-
-    expect(outerVerifyIndex).toBeGreaterThan(-1)
-    expect(innerVerifyIndex).toBe(outerVerifyIndex + 1)
-    expect(evidenceIndex).toBe(innerVerifyIndex + 1)
-    expect(publishIndex).toBe(evidenceIndex + 1)
-
-    // Why fail-open: unsigned inner binaries must warn, not block, until the
-    // flow is proven on a real release (issue #7785). Flip this to 'true'
-    // together with the workflow env to make the gate required.
-    expect(steps[innerVerifyIndex].env.ORCA_WINDOWS_INNER_SIGNATURE_REQUIRED).toBe('false')
-
-    // Why: every step in the inner-signing chain must be unable to fail the
-    // release — a SignPath outage or timeout falls through to today's
-    // unsigned-inner flow instead of blocking the cut.
-    const innerChainStepNames = [
-      'Stage unsigned inner PE files for signing',
-      'Upload unsigned inner binaries for SignPath',
-      'Submit inner binaries signing request',
-      'Notify Slack that inner-binary signing is waiting for approval',
-      'Download signed inner binaries from SignPath',
-      'Restore signed inner binaries into unpacked app',
-      'Restore signed uninstaller for the installer rebuild',
-      'Replace cached elevate.exe with the signed copy',
-      'Rebuild NSIS installer from signed unpacked app'
-    ]
-    for (const stepName of innerChainStepNames) {
-      const step = steps[stepNames.indexOf(stepName)]
-      expect(step, stepName).toBeDefined()
-      expect(step['continue-on-error'], stepName).toBe(true)
-    }
-  })
-})
-
-// Why these exist: the NSIS uninstaller is generated inside electron-builder's
-// uninstaller pass and deleted immediately after being embedded, so the only way
-// CI can sign it is the export/import relay through win.signtoolOptions.sign.
-// Every link is asserted here the way Orca.exe and conpty_console_list.node are.
-describe('Windows NSIS uninstaller signing', () => {
-  const releaseSteps = () => readWorkflow('.github/workflows/release-cut.yml').jobs.build.steps
-  const stepNamed = (steps, name) => steps.find((step) => step.name === name)
-
-  const EXPORT_ENV = 'ORCA_WIN_UNINSTALLER_EXPORT_PATH'
-  const SIGNED_ENV = 'ORCA_WIN_UNINSTALLER_SIGNED_PATH'
-
-  it('exports the uninstaller from the first Windows build', () => {
-    const build = stepNamed(releaseSteps(), 'Build Windows release artifacts')
-
-    expect(build.env[EXPORT_ENV]).toContain('uninstaller-signing')
-    expect(build.env[EXPORT_ENV]).toContain('orca-uninstaller.exe')
-  })
-
-  // Why this is a test and not a comment: `files` in the electron-builder config
-  // is all-negation, so app-builder packs whatever is left in the checkout root.
-  // These steps retry, and a retried attempt would pack an unsigned .exe into
-  // app.asar — the very defect this chain removes. Every relay path must live
-  // outside the checkout.
-  it('keeps every relay path out of the packed checkout', () => {
-    const relayEnvValues = [
-      ...releaseSteps(),
-      ...readWorkflow('.github/workflows/windows-signing-rehearsal.yml').jobs.rehearse.steps
-    ].flatMap((step) => [step.env?.[EXPORT_ENV], step.env?.[SIGNED_ENV]].filter(Boolean))
-
-    expect(relayEnvValues.length).toBe(4)
-    for (const value of relayEnvValues) {
-      expect(value).toContain('runner.temp')
-      expect(value).not.toContain('github.workspace')
-    }
-
-    const relayScripts = [
-      ...releaseSteps(),
-      ...readWorkflow('.github/workflows/windows-signing-rehearsal.yml').jobs.rehearse.steps
-    ]
-      .map((step) => step.run ?? '')
-      .filter((run) => run.includes('uninstaller-signing'))
-
-    expect(relayScripts.length).toBeGreaterThan(0)
-    for (const run of relayScripts) {
-      // Why count occurrences rather than assert `toContain` once: a step
-      // carrying two relay paths could root the first in RUNNER_TEMP and leave
-      // the second bare-relative — which resolves against the checkout, and is
-      // exactly the shape of the defect this test exists to catch.
-      const mentions = run.match(/uninstaller-signing/g) ?? []
-      const rooted = run.match(/Join-Path \$env:RUNNER_TEMP 'uninstaller-signing/g) ?? []
-
-      expect(rooted.length, run).toBe(mentions.length)
-      expect(run).not.toContain('$env:GITHUB_WORKSPACE')
-    }
-  })
-
-  it('stages the uninstaller into the same request as the inner binaries', () => {
-    const stage = stepNamed(releaseSteps(), 'Stage unsigned inner PE files for signing')
-
-    expect(stage.run).toContain('uninstaller-signing\\unsigned\\orca-uninstaller.exe')
-    expect(stage.run).toContain('uninstaller\\orca-uninstaller.exe')
-    // No third SignPath request: exactly two submissions, as budgeted for the
-    // 1h + 4h approval waits inside the 360-minute job cap.
-    const submissions = releaseSteps().filter(
-      (step) => step.uses === 'signpath/github-action-submit-signing-request@v2'
-    )
-    expect(submissions).toHaveLength(2)
-  })
-
-  // A staged-but-unreturned uninstaller must not fail the inner chain, or a
-  // SignPath artifact-configuration gap would cost the inner-binary signatures.
-  it('keeps the uninstaller out of the inner-binary copy-back list', () => {
-    const stage = stepNamed(releaseSteps(), 'Stage unsigned inner PE files for signing')
-    const restoreInner = stepNamed(
-      releaseSteps(),
-      'Restore signed inner binaries into unpacked app'
-    )
-
-    expect(stage.run).not.toMatch(/\$list\.Add\(['"]uninstaller/)
-    expect(restoreInner.run).not.toContain('orca-uninstaller.exe')
-  })
-
-  // This step's outcome gates the upload of every inner binary, so a filesystem
-  // error while staging the uninstaller must not escape — otherwise one
-  // uninstaller-specific failure costs every inner-binary signature, which is
-  // strictly worse than the behaviour before this chain existed.
-  it('cannot let an uninstaller staging failure cost the inner-binary signatures', () => {
-    const stage = stepNamed(releaseSteps(), 'Stage unsigned inner PE files for signing')
-    const uninstallerBlock = stage.run.slice(stage.run.indexOf('$exportedUninstaller'))
-
-    expect(stage.run).toMatch(/try \{[\s\S]*\$exportedUninstaller[\s\S]*\} catch \{/)
-    expect(uninstallerBlock).toContain('::warning::Could not stage the NSIS uninstaller')
-    expect(uninstallerBlock).not.toContain('throw')
-    // Explicit, so the catch does not silently depend on GitHub's
-    // $ErrorActionPreference='Stop' default for `shell: pwsh`.
-    expect(uninstallerBlock).toContain('New-Item -ItemType Directory -Force -Path (Split-Path')
-    expect(uninstallerBlock).toMatch(/New-Item[^\r\n]*-ErrorAction Stop/)
-    expect(uninstallerBlock).toMatch(/Copy-Item[^\r\n]*-ErrorAction Stop/)
-    // The upload it gates still keys off this step, so the catch is load-bearing.
-    expect(stepNamed(releaseSteps(), 'Upload unsigned inner binaries for SignPath').if).toContain(
-      "steps.stage-inner.outcome == 'success'"
-    )
-  })
-
-  it('re-injects the signed uninstaller into the rebuilt installer', () => {
-    const steps = releaseSteps()
-    const restore = stepNamed(steps, 'Restore signed uninstaller for the installer rebuild')
-    const rebuild = stepNamed(steps, 'Rebuild NSIS installer from signed unpacked app')
-    const names = steps.map((step) => step.name)
-
-    expect(restore.if).toContain('github.run_attempt == 1')
-    expect(restore.if).toContain("steps.restore-signed-inner.outcome == 'success'")
-    expect(restore.run).toContain('orca-uninstaller.exe')
-    expect(names.indexOf(restore.name)).toBeLessThan(names.indexOf(rebuild.name))
-    expect(rebuild.env[SIGNED_ENV]).toContain('uninstaller-signing')
-    // The rebuild must not depend on the uninstaller leg: a missing signed
-    // uninstaller ships today's installer, it does not skip the rebuild.
-    expect(rebuild.if).not.toContain('restore-signed-uninstaller')
-  })
-
-  // NSIS hides the uninstaller in a compressed data section the bundled 7za
-  // cannot read, so the gate proves it from the sign hook's digest receipt
-  // instead of extracting it — and only when the relay actually ran.
-  it('reports the embedded uninstaller in the inner-binary evidence gate', () => {
-    const gate = stepNamed(releaseSteps(), 'Verify Windows inner binary signatures')
-
-    expect(gate.env.UNINSTALLER_SIGNING_COMPLETED).toBe(
-      "${{ steps.restore-signed-uninstaller.outcome == 'success' }}"
-    )
-    expect(gate.run).toContain('.embedded-sha256')
-    expect(gate.run).toContain("$env:UNINSTALLER_SIGNING_COMPLETED -eq 'true'")
-    expect(gate.run).toContain('not signed by SignPath Foundation: Uninstall Orca.exe')
-    // The uninstaller must not join the 7z payload loop, which cannot see it.
-    expect(gate.run).not.toContain("$targets += 'Uninstall Orca.exe'")
-  })
-
-  it('rehearses the uninstaller leg end to end', () => {
-    const steps = readWorkflow('.github/workflows/windows-signing-rehearsal.yml').jobs.rehearse
-      .steps
-    const names = steps.map((step) => step.name)
-    const pack = stepNamed(steps, 'Package Windows app and export the NSIS uninstaller')
-    const rebuild = stepNamed(steps, 'Build NSIS installer from signed unpacked app')
-    const verify = stepNamed(steps, 'Verify signatures end to end')
-
-    // --dir never produces an uninstaller, so the rehearsal has to build the
-    // installer the way release-cut's first Windows pass does.
-    expect(pack.run).toContain('--win --publish never')
-    expect(pack.run).not.toContain('--dir')
-    expect(pack.env[EXPORT_ENV]).toContain('orca-uninstaller.exe')
-    expect(names).toContain('Restore signed uninstaller for the installer rebuild')
-    expect(rebuild.env[SIGNED_ENV]).toContain('orca-uninstaller.exe')
-    expect(verify.run).toContain('.embedded-sha256')
-    // The receipt only proves the import leg ran. The rehearsal is where the
-    // shipped uninstaller itself gets checked — the release job cannot install
-    // onto the runner it publishes from.
-    expect(verify.run).toContain('shipped: Uninstall Orca.exe')
-    expect(verify.run).toContain('-tnsis')
-    expect(verify.run).toContain("-ArgumentList '/S'")
-  })
-
-  // This workflow is the merge gate, so it must not be able to fail on its own
-  // artefact: 7-Zip's NSIS handler is unreliable enough that its output has to
-  // be corroborated before a signature verdict is drawn from it.
-  it('never lets an unreliable extract fail the rehearsal', () => {
-    const steps = readWorkflow('.github/workflows/windows-signing-rehearsal.yml').jobs.rehearse
-      .steps
-    const verify = stepNamed(steps, 'Verify signatures end to end')
-
-    // The 7-Zip route is only trusted when it reproduces the relayed bytes;
-    // otherwise it falls through to the install route rather than failing.
-    expect(verify.run).toContain(
-      'Write-Host "7-Zip\'s NSIS output did not match the relayed digest; falling back to a silent install."'
-    )
-    expect(verify.run).toMatch(/\$installedUninstaller = \$null\r?\n\s*\}/)
-
-    // The comparison that is not tautological: a file NSIS wrote out, against
-    // the digest the sign hook recorded.
-    expect(verify.run).toContain('$shippedDigest -ne $expectedDigest')
-    expect(verify.run).toContain('the uninstaller the installer ships is not the relayed one')
-
-    // An installer that prompts must not hang to the 360-minute job cap, and
-    // the app it launches must not outlive the step holding install-dir handles.
-    expect(verify.run).toContain('-PassThru')
-    expect(verify.run).toContain('$installerProcess.WaitForExit(300000)')
-    expect(verify.run).toContain('the silent install did not exit within 5 minutes')
-    expect(verify.run).toMatch(/for \(\$attempt = 0; \$attempt -lt 20; \$attempt\+\+\)/)
-    expect(verify.run).toContain("Get-Process -Name 'orca-terminal-daemon'")
-  })
-
-  // resources\elevate.exe is downgraded to advisory because app-builder-lib's
-  // CopyElevateHelper clobbers it on every nsis pack — a pre-existing defect
-  // that predates the uninstaller relay and is being tracked separately. The
-  // escape hatch it needed is the kind that quietly grows until the gate
-  // asserts nothing, so pin it to exactly that one file.
-  it('confines the advisory escape hatch to elevate.exe', () => {
-    const steps = readWorkflow('.github/workflows/windows-signing-rehearsal.yml').jobs.rehearse
-      .steps
-    const verify = stepNamed(steps, 'Verify signatures end to end')
-    const advisoryCalls = verify.run
-      .split('\n')
-      .filter((line) => line.includes('-Advisory') && line.includes('Test-Signature'))
-
-    expect(advisoryCalls).toHaveLength(1)
-    expect(advisoryCalls[0]).toContain('installed: $relative')
-    expect(verify.run).toContain("if ($relative -eq 'resources\\elevate.exe')")
-
-    // Both uninstaller verdicts stay fatal — the whole point of the gate.
-    for (const call of ['relayed: orca-uninstaller.exe', 'shipped: Uninstall Orca.exe']) {
-      const line = verify.run
-        .split('\n')
-        .find((it) => it.includes(`Test-Signature`) && it.includes(call))
-      expect(line, call).toBeDefined()
-      expect(line, call).not.toContain('-Advisory')
-    }
-
-    // An advisory must still reach the evidence artifact, or downgrading it
-    // becomes indistinguishable from deleting the check.
-    expect(verify.run).toContain('ADVISORY (known pre-existing')
-    expect(verify.run).toContain('$script:advisories.Add($problem)')
-  })
-
-  it('wires the electron-builder sign hook that the relay depends on', () => {
-    const require = createRequire(import.meta.url)
-    const configPath = resolve(projectDir, 'config/electron-builder.config.cjs')
-    delete require.cache[require.resolve(configPath)]
-    const config = require(configPath)
-
-    expect(typeof config.win.signtoolOptions.sign).toBe('function')
-    delete require.cache[require.resolve(configPath)]
-  })
-})
diff --git a/config/scripts/worktree-refresh-churn-benchmark.mjs b/config/scripts/worktree-refresh-churn-benchmark.mjs
index 5a165801ded1..9e7fdffcf3c8 100644
--- a/config/scripts/worktree-refresh-churn-benchmark.mjs
+++ b/config/scripts/worktree-refresh-churn-benchmark.mjs
@@ -1,7 +1,16 @@
 #!/usr/bin/env node
 import { performance } from 'node:perf_hooks'
-import { planWorktreeSortOrderUpdates } from '../../src/shared/worktree/sort-order-update.ts'
-import { reuseEqualCatalogRows } from '../../src/renderer/src/store/slices/worktree-catalog-reconciliation.ts'
+import { createJiti } from 'jiti'
+
+// jiti, not a bare `node` import: type-stripping cannot resolve the extensionless
+// relative imports inside the module graph under test.
+const jiti = createJiti(import.meta.url)
+const { planWorktreeSortOrderUpdates } = await jiti.import(
+  '../../src/shared/worktree/sort-order-update.ts'
+)
+const { reuseEqualCatalogRows } = await jiti.import(
+  '../../src/renderer/src/store/slices/worktree-catalog-reconciliation.ts'
+)
 
 const WORKTREE_COUNT = 655
 const TAB_COUNT = 1_895
diff --git a/config/scripts/xterm-dependency-cache.test.mjs b/config/scripts/xterm-dependency-cache.test.mjs
new file mode 100644
index 000000000000..4c4f69191ef3
--- /dev/null
+++ b/config/scripts/xterm-dependency-cache.test.mjs
@@ -0,0 +1,72 @@
+import { readFileSync } from 'node:fs'
+import { expect, it } from 'vitest'
+import { parse } from 'yaml'
+
+const readYaml = (path) => parse(readFileSync(new URL(path, import.meta.url), 'utf8'))
+const action = readYaml('../../.github/actions/prepare-xterm-dependencies/action.yml')
+const workflow = readYaml('../../.github/workflows/ci-xterm-cache.yml')
+const restore = action.runs.steps.find((step) => step.id === 'restore')
+
+it('separates toolchains and restores dependencies without a stale fallback or build results', () => {
+  for (const input of [
+    'runner.os',
+    'runtime.outputs.image',
+    'runner.arch',
+    'runtime.outputs.node',
+    'xterm-upstream.json',
+    'regenerate-xterm-patches.mjs',
+    'xterm-patch-text.mjs',
+    'prepare-xterm-dependencies/action.yml'
+  ]) {
+    expect(restore.with.key).toContain(input)
+  }
+  expect(restore.uses).toBe('actions/cache/restore@v5')
+  expect(restore.with['restore-keys']).toBeUndefined()
+  expect(restore.with.path.trim().split('\n')).toEqual([
+    '${{ runner.temp }}/xterm-patch-build/upstream/.git',
+    '${{ runner.temp }}/xterm-patch-build/upstream/node_modules'
+  ])
+})
+
+it('publishes only from main after a successful fresh verification, and skips work on hits', () => {
+  expect(workflow.on.pull_request).toBeUndefined()
+  expect(workflow.on.push.branches).toEqual(['main'])
+  expect(workflow.jobs.seed.if).toBe("github.ref == 'refs/heads/main'")
+  expect(workflow.permissions).toEqual({ contents: 'read' })
+  const steps = workflow.jobs.seed.steps
+  const verify = steps.find((step) => step.name === 'Verify and populate dependencies')
+  const save = steps.find((step) => step.uses === 'actions/cache/save@v5')
+  expect(verify.if).toBe("steps.cache.outputs.cache-hit != 'true'")
+  expect(save.if).toBe(verify.if)
+  expect(save.with.path).toBe(restore.with.path)
+  expect(save.with.key).toBe('${{ steps.cache.outputs.cache-key }}')
+  expect(steps.indexOf(save)).toBeGreaterThan(steps.indexOf(verify))
+  expect(verify.run).toContain('regenerate-xterm-patches.mjs --check')
+  const pr = readYaml('../../.github/workflows/pr.yml').jobs.xterm_patch_sync.steps
+  expect(workflow.jobs.seed['runs-on']).toBe(
+    readYaml('../../.github/workflows/pr.yml').jobs.xterm_patch_sync['runs-on']
+  )
+  expect(pr.some((step) => step.uses === './.github/actions/prepare-xterm-dependencies')).toBe(true)
+  expect(pr.some((step) => /cache(?:\/save)?@/.test(step.uses ?? ''))).toBe(false)
+  expect(pr.at(-1).run).toContain('regenerate-xterm-patches.mjs --check')
+})
+
+it('restores download fallback only on a miss and preserves its established key and paths', () => {
+  const fallback = action.runs.steps.at(-1)
+  const save = workflow.jobs.seed.steps.at(-1)
+  expect(fallback.if).toBe("steps.restore.outputs.cache-hit != 'true'")
+  expect(fallback.uses).toBe('actions/cache/restore@v5')
+  expect(fallback.with).toEqual(save.with)
+  expect(save.if).toBe("steps.cache.outputs.cache-hit != 'true'")
+})
+
+it('runs the standalone generator without installing unrelated Orca dependencies', () => {
+  const steps = readYaml('../../.github/workflows/pr.yml').jobs.xterm_patch_sync.steps
+  expect(steps.some((step) => step.uses === './.github/actions/install-node-dependencies')).toBe(
+    false
+  )
+  expect(steps.find((step) => step.uses === 'actions/setup-node@v6').with).toEqual({
+    'node-version-file': 'package.json',
+    'package-manager-cache': false
+  })
+})
diff --git a/config/scripts/xterm-image-wasm-budget-contract.test.mjs b/config/scripts/xterm-image-wasm-budget-contract.test.mjs
new file mode 100644
index 000000000000..9ec5f4fc7509
--- /dev/null
+++ b/config/scripts/xterm-image-wasm-budget-contract.test.mjs
@@ -0,0 +1,160 @@
+import { createRequire } from 'node:module'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+const require = createRequire(import.meta.url)
+const { Terminal } = require('@xterm/xterm')
+const { ImageAddon } = require('@xterm/addon-image')
+
+// V8 caps live wasm memories per renderer (~124 under Electron's sandbox), so
+// these contracts pin that idle terminals hold none and that exhaustion drops
+// an image instead of wedging the terminal's write queue.
+
+const SIXEL_RED_REGISTER_1 = '\x1bPq#1;2;100;0;0#1~\x1b\\'
+const SIXEL_USE_REGISTER_1 = '\x1bPq#1~\x1b\\'
+const PNG_1X1 =
+  'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=='
+const IIP_PNG = `\x1b]1337;File=inline=1;size=${Buffer.from(PNG_1X1, 'base64').length}:${PNG_1X1}\x07`
+
+class TrackedBitmap {
+  width = 1
+  height = 1
+  close = vi.fn()
+}
+
+function stubCanvasGlobals() {
+  const painted = []
+  vi.stubGlobal('ImageBitmap', TrackedBitmap)
+  vi.stubGlobal('window', { ImageBitmap: TrackedBitmap })
+  vi.stubGlobal('createImageBitmap', async () => new TrackedBitmap())
+  vi.stubGlobal(
+    'ImageData',
+    class {
+      constructor(data, width, height) {
+        Object.assign(this, { data: new Uint8ClampedArray(data), width, height })
+      }
+    }
+  )
+  vi.stubGlobal('document', {
+    createElement: () => ({
+      width: 0,
+      height: 0,
+      getContext: () => ({ putImageData: (image) => painted.push(image) })
+    })
+  })
+  return painted
+}
+
+function createTerminal(options = {}) {
+  const terminal = new Terminal({ allowProposedApi: true })
+  const addon = new ImageAddon({
+    enableSizeReports: false,
+    storageLimit: 32,
+    kittySizeLimit: 8 * 1024 * 1024,
+    ...options
+  })
+  terminal.loadAddon(addon)
+  return {
+    terminal,
+    addon,
+    sixel: addon._handlers.get('sixel'),
+    iip: addon._handlers.get('iip')
+  }
+}
+
+function write(terminal, data) {
+  return new Promise((resolve) => terminal.write(data, resolve))
+}
+
+// A throw out of a handler leaves xterm's write queue waiting forever.
+function writeOrWedge(terminal, data) {
+  return Promise.race([
+    write(terminal, data).then(() => 'parsed'),
+    new Promise((resolve) => setTimeout(() => resolve('wedged'), 2000))
+  ])
+}
+
+function firstPixel(image) {
+  return Array.from(image.data.subarray(0, 4))
+}
+
+afterEach(() => vi.unstubAllGlobals())
+
+describe('xterm image wasm budget', () => {
+  it('keeps idle terminals free of wasm decoders', async () => {
+    const panes = Array.from({ length: 300 }, () => createTerminal())
+    try {
+      // Let any asynchronous decoder instantiation settle.
+      await new Promise((resolve) => setTimeout(resolve, 100))
+      for (const { sixel, iip } of panes) {
+        expect(sixel._dec).toBeUndefined()
+        expect(iip._dec._inst).toBeNull()
+        expect(iip._qoiDec._inst).toBeFalsy()
+      }
+    } finally {
+      for (const { terminal } of panes) {
+        terminal.dispose()
+      }
+    }
+  })
+
+  it('returns decoders after each SIXEL and IIP image', async () => {
+    const painted = stubCanvasGlobals()
+    const { terminal, addon, sixel, iip } = createTerminal()
+    let added = 0
+    addon.onImageAdded(() => added++)
+    try {
+      await write(terminal, SIXEL_RED_REGISTER_1)
+      expect(painted).toHaveLength(1)
+      expect(sixel._dec).toBeUndefined()
+
+      await write(terminal, IIP_PNG)
+      await new Promise((resolve) => setTimeout(resolve, 0))
+      expect(iip._dec._inst).toBeNull()
+      expect(added).toBe(2)
+    } finally {
+      terminal.dispose()
+    }
+  })
+
+  it('keeps SIXEL color registers across images until a terminal reset', async () => {
+    const painted = stubCanvasGlobals()
+    const { terminal } = createTerminal()
+    try {
+      await write(terminal, SIXEL_RED_REGISTER_1)
+      await write(terminal, SIXEL_USE_REGISTER_1)
+      expect(firstPixel(painted[1])).toEqual([255, 0, 0, 255])
+
+      await write(terminal, '\x1bc')
+      await write(terminal, SIXEL_USE_REGISTER_1)
+      expect(firstPixel(painted[2])).not.toEqual([255, 0, 0, 255])
+    } finally {
+      terminal.dispose()
+    }
+  })
+
+  it('drops images without wedging the parser when wasm memory is exhausted', async () => {
+    stubCanvasGlobals()
+    // A pixelLimit no other test uses keeps the shared SIXEL pool empty for this key.
+    const { terminal, addon } = createTerminal({ pixelLimit: 1234567 })
+    const replies = []
+    terminal.onData((data) => replies.push(data))
+    function exhausted() {
+      throw new RangeError('WebAssembly.Memory(): could not allocate memory')
+    }
+    vi.stubGlobal('WebAssembly', { ...WebAssembly, Memory: exhausted, Instance: exhausted })
+    try {
+      expect(await writeOrWedge(terminal, '\x1b_Ga=T,f=32,s=1,v=1,i=7;AAAA/w==\x1b\\')).toBe(
+        'parsed'
+      )
+      expect(await writeOrWedge(terminal, IIP_PNG)).toBe('parsed')
+      expect(await writeOrWedge(terminal, SIXEL_USE_REGISTER_1)).toBe('parsed')
+      expect(await writeOrWedge(terminal, 'after')).toBe('parsed')
+
+      expect(addon._storage._images.size).toBe(0)
+      expect(replies.join('')).toContain('ENOMEM')
+      expect(terminal.buffer.active.getLine(0).translateToString(true)).toContain('after')
+    } finally {
+      terminal.dispose()
+    }
+  })
+})
diff --git a/config/tsconfig.cli.json b/config/tsconfig.cli.json
index bdf0038cf161..6f4df40e4e15 100644
--- a/config/tsconfig.cli.json
+++ b/config/tsconfig.cli.json
@@ -6,7 +6,10 @@
     "../src/main/agent-state-file-reader.ts",
     "../src/main/agent-hooks/grok-replay-guard.ts",
     "../src/main/claude/hook-script.ts",
-    "../src/main/claude/claude-session-end-hook-capability.ts",
+    "../src/main/claude/claude-hook-event-versions.ts",
+    "../src/main/claude/claude-managed-hook-events.ts",
+    "../src/main/qoder/hook-service.ts",
+    "../src/main/codebuddy/hook-service.ts",
     "../src/main/agent-hooks/hook-stdin-contract.ts",
     "../src/main/agent-hooks/hook-post-command.ts",
     "../src/main/agent-hooks/hook-config-write-path.ts",
@@ -18,6 +21,7 @@
     "../src/main/agent-hooks/managed-agent-hook-controls.ts",
     "../src/main/agent-hooks/managed-agent-hook-registry.ts",
     "../src/main/agent-hooks/managed-hook-script-refresh.ts",
+    "../src/main/agent-hooks/managed-hooks-json-events.ts",
     "../src/main/agent-hooks/posix-hook-command.ts",
     "../src/main/agent-hooks/runtime-home-hook-command.ts",
     "../src/main/orca-profiles/profile-storage-paths.ts",
@@ -199,6 +203,8 @@
     "../src/main/devin/hook-settings.ts",
     "../src/main/devin/hook-service.ts",
     "../src/main/devin/hook-config-json.ts",
+    "../src/main/hermes/hermes-config-document.ts",
+    "../src/main/hermes/hermes-config-source-edits.ts",
     "../src/main/hermes/hermes-config-yaml.ts",
     "../src/main/hermes/hermes-home-filesystem.ts",
     "../src/main/hermes/hermes-managed-plugin-source.ts",
@@ -207,6 +213,9 @@
     "../src/main/in-flight-run-dedupe.ts",
     "../src/main/kimi/hook-service.ts",
     "../src/main/kimi/kimi-hook-config-toml.ts",
+    "../src/main/dsh/dsh-home-patch.ts",
+    "../src/main/dsh/hook-service.ts",
+    "../src/main/dsh/hook-settings.ts",
     "../src/main/muse/hook-config-json.ts",
     "../src/main/muse/hook-service.ts",
     "../src/main/muse/hook-settings.ts",
diff --git a/config/tsconfig.node.json b/config/tsconfig.node.json
index c42b937a4671..0d3077d8f0e1 100644
--- a/config/tsconfig.node.json
+++ b/config/tsconfig.node.json
@@ -4,8 +4,11 @@
     "../electron.vite.config.*",
     "./build-plugins/**/*",
     "./scripts/vitest-host-ports-setup.ts",
+    "./scripts/vitest-caller-identity-env-setup.ts",
     "../src/main/**/*",
     "../src/renderer/src/lib/skill-freshness-display-status.ts",
+    "../src/renderer/src/components/native-chat/native-chat-resolution-receipt.ts",
+    "../src/renderer/src/components/native-chat/structured-agent-question-projection.ts",
     "../src/preload/**/*",
     "../src/shared/**/*",
     "../src/relay/**/*",
diff --git a/config/vitest.config.ts b/config/vitest.config.ts
index 5c85c3e69808..d2a586169340 100644
--- a/config/vitest.config.ts
+++ b/config/vitest.config.ts
@@ -1,5 +1,6 @@
 import { resolve } from 'node:path'
 import { defineConfig } from 'vitest/config'
+import { UNIT_INCLUDE, UNIT_EXCLUDE } from './scripts/ci-unit-files.mjs'
 import TimingSequencer from './scripts/ci-unit-sequencer.mjs'
 
 const windowsTestWorkerOptions = process.platform === 'win32' ? { maxWorkers: 4 } : {}
@@ -31,16 +32,11 @@ export default defineConfig({
     setupFiles: [
       resolve('config/scripts/happy-dom-offscreen-canvas.ts'),
       resolve('config/scripts/happy-dom-mutation-observer-retention.ts'),
-      resolve('config/scripts/vitest-host-ports-setup.ts')
-    ],
-    include: [
-      'src/**/*.test.ts',
-      'src/**/*.test.tsx',
-      'config/scripts/**/*.test.ts',
-      'config/scripts/**/*.test.mjs',
-      'tests/tools/**/*.test.mjs',
-      'tests/e2e/**/*.unit.test.ts'
+      resolve('config/scripts/vitest-host-ports-setup.ts'),
+      resolve('config/scripts/vitest-caller-identity-env-setup.ts')
     ],
+    include: UNIT_INCLUDE,
+    ...(process.env.ORCA_BALANCE_UNIT_SHARDS === '1' ? { exclude: UNIT_EXCLUDE } : {}),
     // Why: the full suite runs heavy TS transforms plus real git/http fixtures;
     // the Vitest 5s defaults are too tight for the slowest integration cases.
     hookTimeout: 60_000,
diff --git a/docs/assets/star-history.png b/docs/assets/star-history.png
index f069eb9059ca..2de5029eee2f 100644
Binary files a/docs/assets/star-history.png and b/docs/assets/star-history.png differ
diff --git a/docs/bug-reproductions/opencode2-form-created-kinds/README.md b/docs/bug-reproductions/opencode2-form-created-kinds/README.md
index 8ac1dbfe4493..f3a0b4713e22 100644
--- a/docs/bug-reproductions/opencode2-form-created-kinds/README.md
+++ b/docs/bug-reproductions/opencode2-form-created-kinds/README.md
@@ -13,8 +13,8 @@ against a real `opencode serve` instance and reading the server's `/api/event` S
 v2.0.12 bundle (still exactly five on `v2.0.15`, in `tool/plugin/question.ts`,
 `tool/plugin/websearch.ts` and `mcp/index.ts`):
 
-| `metadata.kind`      | Form title                                    | `sessionID` | Blocks the pane owner    |
-| -------------------- | --------------------------------------------- | ----------- | ------------------------ |
+| `metadata.kind`      | Form title                                    | `sessionID` | Blocks the pane owner     |
+| -------------------- | --------------------------------------------- | ----------- | ------------------------- |
 | `question`           | `Questions`                                   | the session | yes — the `question` tool |
 | `websearch.provider` | `Web Search` / `Choose a web search provider` | the session | yes — the turn is stalled |
 | `mcp-elicitation`    | `<server> is requesting input`                | `"global"`  | no — see below            |
diff --git a/docs/fork-upstreaming.md b/docs/fork-upstreaming.md
index 96baa5ed9040..53eb204d1253 100644
--- a/docs/fork-upstreaming.md
+++ b/docs/fork-upstreaming.md
@@ -45,28 +45,6 @@ recorded with `config/scripts/capture-agent-pty-transcript.mjs` against Claude C
 
 **Status:** pending-upstream. Not yet submitted.
 
-## Structured preamble waits for admitted settlement
-
-**What:** `sendStructuredWorkerPreamble` in
-`src/main/runtime/rpc/methods/orchestration-structured-worker-session.ts` waits on
-`host.waitForSendSettlement` when the preamble submission comes back `pending`, then judges the
-settled submission. A wait that times out or fails still reports `operation_unknown`.
-
-**Why upstream, not isolated:** since the settle-on-admission change (#19863), a Claude structured
-send returns `admitted` as soon as the frame is written, and the submission stays `pending` until
-the provider echo. The preamble check accepts only `accepted`, so every Claude structured worker
-start settles `outcome_unknown` although the worker is running, and Heimdall's owner turns, which
-use the same function, are never recorded as sent (ledger bug-194). The host already exposes the
-settlement wait for clients that predate admitted pending replies; the preamble sender is one of
-those clients. The defect is in upstream's shared function, so a fork copy would only move it.
-
-**Paths:**
-
-- `src/main/runtime/rpc/methods/orchestration-structured-worker-session.ts`
-- `src/main/runtime/rpc/methods/orchestration-structured-worker-session.test.ts`
-
-**Status:** pending-upstream. Not yet submitted.
-
 ## Folder workspace scheduler authority
 
 **What:** exposes the existing execution-host-to-scheduler-owner mapping independently of a
@@ -653,54 +631,28 @@ remain under the `agent-composer` feature.
 
 **Status:** pending-upstream. Not yet submitted.
 
-## Hourly base case is pinned to the repo's own package version
-
-**Defect:** `config/scripts/hourly-build-version.test.mjs`'s case *stays on the already-shipped
-hourly base after a buggy main release is unpublished* calls `getHourlyBuildIdentity`, which reads
-the repo's own `package.json`, and then asserts a hardcoded `1.4.203` base. The case therefore only
-holds while the tree sits at or below 1.4.203. It is not a fork problem: upstream's own v1.4.206 tag
-carries `"version": "1.4.206"` and fails the same assertion with `1.4.206-hourly.202609142000`.
-Upstream does not see it because its unit matrix runs on `main`, whose `package.json` is still
-`1.4.197` — the test and both implementation modules are byte-identical between `upstream/main` and
-the v1.4.206 tag.
-
-**Fork change:** resolve the base through `resolveDevChannelBaseVersion('1.4.203', publishedVersions)`
-and assert `createHourlyBuildVersion` and `nextHourlyBuildNumber` against it. Every assertion stays
-exact and the same three behaviours are covered; only the accidental dependency on whatever version
-the tree happens to carry is removed.
-
-**Why upstream, not isolated:** the case belongs to upstream's own suite and the fix is a one-scenario
-repair of its fixture. A fork copy would have to be replayed every sync for a file the fork has no
-stake in.
-
-**Paths:** `config/scripts/hourly-build-version.test.mjs`.
-
-**Status:** pending-upstream. Not yet submitted.
-
-## Focused Playwright file selection
+## Mobile workflow tests ahead of their release
 
-**Defect:** Playwright 1.63, which v1.4.215 adopted, reads the `--` that `pnpm run test:e2e --
-<spec>` forwards as the end of file selection. The real-IME workflow's deterministic step therefore
-runs all 841 e2e tests instead of `terminal-ime-exact-byte.spec.ts`, and the job times out at 25
-minutes. The golden-e2e workflow and the native IBus runner have the same shape.
+**Defect:** the v1.4.218 cut synced `.github/workflows/mobile.yml` from `main` (`4e93d96e4e`),
+which already carried #23732's workflow change, but left the release branch's tests at the older
+shape. The tag therefore fails its own suite: `mobile-recording-pin-checkout.test.mjs` reads a
+`recording-pin` job the synced workflow no longer has, and `mobile-release-check-scope.test.mjs`
+does not expect the newly gated `Summarize RPC recording changes` step.
 
-**Fork change:** none of its own. It is upstream's fix, #23270 (`dffb3498e2`), cherry-picked whole:
-drop the forwarded `--` from each focused command and add upstream's contract test for it.
+**Fork change:** none of its own. Mirrors `e594cb06af` (#23732) for the tests only: delete the
+recording-pin checkout test and exclude the summary step from the gated-step assertion. The
+workflow itself stays exactly as tagged.
 
-**Why upstream, not isolated:** it already is upstream, on `main`. Neither v1.4.215 nor v1.4.216
-carries it, and without an exception the next sync resets these files to a tag that still has the
-bug.
+**Why upstream, not isolated:** both are upstream's own contract tests for an upstream workflow;
+the fix already exists on `main`.
 
 **Paths:**
 
-- `.github/workflows/terminal-ime-e2e.yml`
-- `.github/workflows/golden-e2e-experiment.yml`
-- `config/scripts/run-terminal-ibus-hangul-e2e.mjs`
-- `config/scripts/terminal-ime-e2e-workflow.test.mjs`
-- `config/scripts/playwright-focused-workflow-selection.test.mjs`
+- `config/scripts/mobile-recording-pin-checkout.test.mjs` (deleted)
+- `config/scripts/mobile-release-check-scope.test.mjs`
 
-**Status:** merged upstream, awaiting a stable tag. Drop these exceptions at the first sync whose tag
-contains `dffb3498e2`.
+**Status:** merged upstream, awaiting a stable tag. Drop both exceptions at the first sync whose
+tag contains `e594cb06af`.
 
 ## Repeatable CLI flags are not globally exclusive
 
diff --git a/docs/readme/README.es.md b/docs/readme/README.es.md
index fdd067ef763a..17ec41e82949 100644
--- a/docs/readme/README.es.md
+++ b/docs/readme/README.es.md
@@ -179,6 +179,7 @@ Funciona con **cualquier agente CLI** — si corre en una terminal, corre en Orc
   <a href="https://cursor.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=cursor.com&sz=64" alt="Cursor logo" width="16" valign="middle" /> Cursor</kbd></a> &nbsp;
   <a href="https://docs.github.com/en/copilot/how-tos/set-up/install-copilot-cli"><kbd><img src="https://www.google.com/s2/favicons?domain=github.com&sz=64" alt="GitHub Copilot logo" width="16" valign="middle" /> GitHub Copilot</kbd></a> &nbsp;
   <a href="https://dev.meta.ai/docs/muse-code"><kbd><img src="../../src/shared/agent-icons/muse.png" alt="Muse logo" width="16" valign="middle" /> Muse</kbd></a> &nbsp;
+  <a href="https://deepseek-harness.github.io/deepseek-harness/"><kbd><img src="../../src/shared/agent-icons/dsh.png" alt="DeepSeek Harness logo" width="16" valign="middle" /> DeepSeek Harness</kbd></a> &nbsp;
   <a href="https://zcode.z.ai/en/docs"><kbd><img src="../../src/shared/agent-icons/zcode.png" alt="ZCode logo" width="16" valign="middle" /> ZCode</kbd></a> &nbsp;
   <a href="https://opencode.ai/docs/cli/"><kbd><img src="https://www.google.com/s2/favicons?domain=opencode.ai&sz=64" alt="OpenCode logo" width="16" valign="middle" /> OpenCode</kbd></a> &nbsp;
   <a href="https://ampcode.com/manual#install"><kbd><img src="https://www.google.com/s2/favicons?domain=ampcode.com&sz=64" alt="Amp logo" width="16" valign="middle" /> Amp</kbd></a> &nbsp;
@@ -193,6 +194,7 @@ Funciona con **cualquier agente CLI** — si corre en una terminal, corre en Orc
   <a href="https://github.com/charmbracelet/crush"><kbd><img src="https://www.google.com/s2/favicons?domain=charm.sh&sz=64" alt="Charm logo" width="16" valign="middle" /> Charm</kbd></a> &nbsp;
   <a href="https://docs.cline.bot/cline-cli/overview"><kbd><img src="https://www.google.com/s2/favicons?domain=cline.bot&sz=64" alt="Cline logo" width="16" valign="middle" /> Cline</kbd></a> &nbsp;
   <a href="https://www.codebuff.com/docs/help/quick-start"><kbd><img src="https://www.google.com/s2/favicons?domain=codebuff.com&sz=64" alt="Codebuff logo" width="16" valign="middle" /> Codebuff</kbd></a> &nbsp;
+  <a href="https://freebuff.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=freebuff.com&sz=64" alt="Freebuff logo" width="16" valign="middle" /> Freebuff</kbd></a> &nbsp;
   <a href="https://commandcode.ai/docs/quickstart"><kbd><img src="https://www.google.com/s2/favicons?domain=commandcode.ai&sz=64" alt="Command Code logo" width="16" valign="middle" /> Command Code</kbd></a> &nbsp;
   <a href="https://docs.continue.dev/guides/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=continue.dev&sz=64" alt="Continue logo" width="16" valign="middle" /> Continue</kbd></a> &nbsp;
   <a href="https://docs.factory.ai/cli/getting-started/quickstart"><kbd><img src="../assets/droid-logo.svg" alt="Droid logo" width="16" valign="middle" /> Droid</kbd></a> &nbsp;
diff --git a/docs/readme/README.fr.md b/docs/readme/README.fr.md
index 56cfc334fd75..d2757d919b2f 100644
--- a/docs/readme/README.fr.md
+++ b/docs/readme/README.fr.md
@@ -40,7 +40,7 @@
 
 Surveillez et pilotez vos agents depuis votre téléphone — soyez notifié quand un agent termine, et envoyez des instructions de suivi où que vous soyez.
 
-[App Store iOS](https://apps.apple.com/us/app/orca-ide/id6766130217) · [TestFlight](https://testflight.apple.com/join/YjeGMQBA) · [APK Android 0.0.50](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk) · [Docs →](https://www.onorca.dev/docs/mobile)
+[App Store iOS](https://apps.apple.com/us/app/orca-ide/id6766130217) · [APK Android 0.0.50](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk) · [Docs →](https://www.onorca.dev/docs/mobile)
 
 </td>
 <td width="50%">
@@ -183,6 +183,7 @@ Fonctionne avec **n'importe quel agent CLI** — s'il tourne dans un terminal, i
   <a href="https://cursor.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=cursor.com&sz=64" alt="Logo Cursor" width="16" valign="middle" /> Cursor</kbd></a> &nbsp;
   <a href="https://docs.github.com/en/copilot/how-tos/set-up/install-copilot-cli"><kbd><img src="https://www.google.com/s2/favicons?domain=github.com&sz=64" alt="Logo GitHub Copilot" width="16" valign="middle" /> GitHub Copilot</kbd></a> &nbsp;
   <a href="https://dev.meta.ai/docs/muse-code"><kbd><img src="../../src/shared/agent-icons/muse.png" alt="Logo Muse" width="16" valign="middle" /> Muse</kbd></a> &nbsp;
+  <a href="https://deepseek-harness.github.io/deepseek-harness/"><kbd><img src="../../src/shared/agent-icons/dsh.png" alt="DeepSeek Harness logo" width="16" valign="middle" /> DeepSeek Harness</kbd></a> &nbsp;
   <a href="https://zcode.z.ai/en/docs"><kbd><img src="../../src/shared/agent-icons/zcode.png" alt="Logo ZCode" width="16" valign="middle" /> ZCode</kbd></a> &nbsp;
   <a href="https://opencode.ai/docs/cli/"><kbd><img src="https://www.google.com/s2/favicons?domain=opencode.ai&sz=64" alt="Logo OpenCode" width="16" valign="middle" /> OpenCode</kbd></a> &nbsp;
   <a href="https://mimo.xiaomi.com/coder"><kbd><img src="https://www.google.com/s2/favicons?domain=mimo.xiaomi.com&sz=64" alt="Logo MiMo Code" width="16" valign="middle" /> MiMo Code</kbd></a> &nbsp;
@@ -199,6 +200,7 @@ Fonctionne avec **n'importe quel agent CLI** — s'il tourne dans un terminal, i
   <a href="https://github.com/charmbracelet/crush"><kbd><img src="https://www.google.com/s2/favicons?domain=charm.sh&sz=64" alt="Logo Charm" width="16" valign="middle" /> Charm</kbd></a> &nbsp;
   <a href="https://docs.cline.bot/cline-cli/overview"><kbd><img src="https://www.google.com/s2/favicons?domain=cline.bot&sz=64" alt="Logo Cline" width="16" valign="middle" /> Cline</kbd></a> &nbsp;
   <a href="https://www.codebuff.com/docs/help/quick-start"><kbd><img src="https://www.google.com/s2/favicons?domain=codebuff.com&sz=64" alt="Logo Codebuff" width="16" valign="middle" /> Codebuff</kbd></a> &nbsp;
+  <a href="https://freebuff.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=freebuff.com&sz=64" alt="Logo Freebuff" width="16" valign="middle" /> Freebuff</kbd></a> &nbsp;
   <a href="https://commandcode.ai/docs/quickstart"><kbd><img src="https://www.google.com/s2/favicons?domain=commandcode.ai&sz=64" alt="Logo Command Code" width="16" valign="middle" /> Command Code</kbd></a> &nbsp;
   <a href="https://docs.continue.dev/guides/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=continue.dev&sz=64" alt="Logo Continue" width="16" valign="middle" /> Continue</kbd></a> &nbsp;
   <a href="https://docs.factory.ai/cli/getting-started/quickstart"><kbd><img src="../assets/droid-logo.svg" alt="Logo Droid" width="16" valign="middle" /> Droid</kbd></a> &nbsp;
@@ -236,7 +238,7 @@ yay -S stably-orca-bin
 
 Associez-la à l'app de bureau pour surveiller et piloter vos agents depuis votre téléphone.
 
-- **iOS :** [Télécharger sur l'App Store](https://apps.apple.com/us/app/orca-ide/id6766130217) ou [rejoindre TestFlight](https://testflight.apple.com/join/YjeGMQBA)
+- **iOS :** [Télécharger sur l'App Store](https://apps.apple.com/us/app/orca-ide/id6766130217)
 - **Android :** [Télécharger l'APK 0.0.50](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk)
 
 ---
diff --git a/docs/readme/README.ja.md b/docs/readme/README.ja.md
index e5eee5781b0e..ed37efa595f1 100644
--- a/docs/readme/README.ja.md
+++ b/docs/readme/README.ja.md
@@ -179,6 +179,7 @@ PR、Issue、プロジェクトボードをアプリ内で閲覧 — 任意の
   <a href="https://cursor.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=cursor.com&sz=64" alt="Cursor logo" width="16" valign="middle" /> Cursor</kbd></a> &nbsp;
   <a href="https://docs.github.com/en/copilot/how-tos/set-up/install-copilot-cli"><kbd><img src="https://www.google.com/s2/favicons?domain=github.com&sz=64" alt="GitHub Copilot logo" width="16" valign="middle" /> GitHub Copilot</kbd></a> &nbsp;
   <a href="https://dev.meta.ai/docs/muse-code"><kbd><img src="../../src/shared/agent-icons/muse.png" alt="Muse logo" width="16" valign="middle" /> Muse</kbd></a> &nbsp;
+  <a href="https://deepseek-harness.github.io/deepseek-harness/"><kbd><img src="../../src/shared/agent-icons/dsh.png" alt="DeepSeek Harness logo" width="16" valign="middle" /> DeepSeek Harness</kbd></a> &nbsp;
   <a href="https://zcode.z.ai/en/docs"><kbd><img src="../../src/shared/agent-icons/zcode.png" alt="ZCode logo" width="16" valign="middle" /> ZCode</kbd></a> &nbsp;
   <a href="https://opencode.ai/docs/cli/"><kbd><img src="https://www.google.com/s2/favicons?domain=opencode.ai&sz=64" alt="OpenCode logo" width="16" valign="middle" /> OpenCode</kbd></a> &nbsp;
   <a href="https://ampcode.com/manual#install"><kbd><img src="https://www.google.com/s2/favicons?domain=ampcode.com&sz=64" alt="Amp logo" width="16" valign="middle" /> Amp</kbd></a> &nbsp;
@@ -193,6 +194,7 @@ PR、Issue、プロジェクトボードをアプリ内で閲覧 — 任意の
   <a href="https://github.com/charmbracelet/crush"><kbd><img src="https://www.google.com/s2/favicons?domain=charm.sh&sz=64" alt="Charm logo" width="16" valign="middle" /> Charm</kbd></a> &nbsp;
   <a href="https://docs.cline.bot/cline-cli/overview"><kbd><img src="https://www.google.com/s2/favicons?domain=cline.bot&sz=64" alt="Cline logo" width="16" valign="middle" /> Cline</kbd></a> &nbsp;
   <a href="https://www.codebuff.com/docs/help/quick-start"><kbd><img src="https://www.google.com/s2/favicons?domain=codebuff.com&sz=64" alt="Codebuff logo" width="16" valign="middle" /> Codebuff</kbd></a> &nbsp;
+  <a href="https://freebuff.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=freebuff.com&sz=64" alt="Freebuff logo" width="16" valign="middle" /> Freebuff</kbd></a> &nbsp;
   <a href="https://commandcode.ai/docs/quickstart"><kbd><img src="https://www.google.com/s2/favicons?domain=commandcode.ai&sz=64" alt="Command Code logo" width="16" valign="middle" /> Command Code</kbd></a> &nbsp;
   <a href="https://docs.continue.dev/guides/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=continue.dev&sz=64" alt="Continue logo" width="16" valign="middle" /> Continue</kbd></a> &nbsp;
   <a href="https://docs.factory.ai/cli/getting-started/quickstart"><kbd><img src="../assets/droid-logo.svg" alt="Droid logo" width="16" valign="middle" /> Droid</kbd></a> &nbsp;
diff --git a/docs/readme/README.ko.md b/docs/readme/README.ko.md
index 17528c25ee03..25e20764c37a 100644
--- a/docs/readme/README.ko.md
+++ b/docs/readme/README.ko.md
@@ -36,7 +36,7 @@
 
 휴대폰에서 에이전트를 모니터링하고 조종하세요 — 에이전트가 완료되면 알림을 받고 어디서든 후속 지시를 보낼 수 있습니다.
 
-[iOS App Store](https://apps.apple.com/us/app/orca-ide/id6766130217) · [TestFlight](https://testflight.apple.com/join/YjeGMQBA) · [Android APK 0.0.50](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk) · [문서 →](https://www.onorca.dev/docs/mobile)
+[iOS App Store](https://apps.apple.com/us/app/orca-ide/id6766130217) · [Android APK 0.0.50](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk) · [문서 →](https://www.onorca.dev/docs/mobile)
 
 </td>
 <td width="50%">
@@ -179,6 +179,7 @@ diff의 어느 줄에든 코멘트를 남기고 에이전트에게 바로 보내
   <a href="https://cursor.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=cursor.com&sz=64" alt="Cursor logo" width="16" valign="middle" /> Cursor</kbd></a> &nbsp;
   <a href="https://docs.github.com/en/copilot/how-tos/set-up/install-copilot-cli"><kbd><img src="https://www.google.com/s2/favicons?domain=github.com&sz=64" alt="GitHub Copilot logo" width="16" valign="middle" /> GitHub Copilot</kbd></a> &nbsp;
   <a href="https://dev.meta.ai/docs/muse-code"><kbd><img src="../../src/shared/agent-icons/muse.png" alt="Muse logo" width="16" valign="middle" /> Muse</kbd></a> &nbsp;
+  <a href="https://deepseek-harness.github.io/deepseek-harness/"><kbd><img src="../../src/shared/agent-icons/dsh.png" alt="DeepSeek Harness logo" width="16" valign="middle" /> DeepSeek Harness</kbd></a> &nbsp;
   <a href="https://zcode.z.ai/en/docs"><kbd><img src="../../src/shared/agent-icons/zcode.png" alt="ZCode logo" width="16" valign="middle" /> ZCode</kbd></a> &nbsp;
   <a href="https://opencode.ai/docs/cli/"><kbd><img src="https://www.google.com/s2/favicons?domain=opencode.ai&sz=64" alt="OpenCode logo" width="16" valign="middle" /> OpenCode</kbd></a> &nbsp;
   <a href="https://mimo.xiaomi.com/coder"><kbd><img src="https://www.google.com/s2/favicons?domain=mimo.xiaomi.com&sz=64" alt="MiMo Code logo" width="16" valign="middle" /> MiMo Code</kbd></a> &nbsp;
@@ -195,6 +196,7 @@ diff의 어느 줄에든 코멘트를 남기고 에이전트에게 바로 보내
   <a href="https://github.com/charmbracelet/crush"><kbd><img src="https://www.google.com/s2/favicons?domain=charm.sh&sz=64" alt="Charm logo" width="16" valign="middle" /> Charm</kbd></a> &nbsp;
   <a href="https://docs.cline.bot/cline-cli/overview"><kbd><img src="https://www.google.com/s2/favicons?domain=cline.bot&sz=64" alt="Cline logo" width="16" valign="middle" /> Cline</kbd></a> &nbsp;
   <a href="https://www.codebuff.com/docs/help/quick-start"><kbd><img src="https://www.google.com/s2/favicons?domain=codebuff.com&sz=64" alt="Codebuff logo" width="16" valign="middle" /> Codebuff</kbd></a> &nbsp;
+  <a href="https://freebuff.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=freebuff.com&sz=64" alt="Freebuff logo" width="16" valign="middle" /> Freebuff</kbd></a> &nbsp;
   <a href="https://commandcode.ai/docs/quickstart"><kbd><img src="https://www.google.com/s2/favicons?domain=commandcode.ai&sz=64" alt="Command Code logo" width="16" valign="middle" /> Command Code</kbd></a> &nbsp;
   <a href="https://docs.continue.dev/guides/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=continue.dev&sz=64" alt="Continue logo" width="16" valign="middle" /> Continue</kbd></a> &nbsp;
   <a href="https://docs.factory.ai/cli/getting-started/quickstart"><kbd><img src="../assets/droid-logo.svg" alt="Droid logo" width="16" valign="middle" /> Droid</kbd></a> &nbsp;
@@ -231,7 +233,7 @@ yay -S stably-orca-bin
 
 데스크톱 앱과 페어링해 휴대폰에서 에이전트를 모니터링하고 조종하세요.
 
-- **iOS:** [App Store에서 다운로드](https://apps.apple.com/us/app/orca-ide/id6766130217) 또는 [TestFlight 참여](https://testflight.apple.com/join/YjeGMQBA)
+- **iOS:** [App Store에서 다운로드](https://apps.apple.com/us/app/orca-ide/id6766130217)
 - **Android:** [APK 0.0.50 다운로드](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk) · [설치 가이드](https://www.onorca.dev/docs/android-apk)
 
 ---
diff --git a/docs/readme/README.pt.md b/docs/readme/README.pt.md
index 568a6d0de0d0..baa17f95955f 100644
--- a/docs/readme/README.pt.md
+++ b/docs/readme/README.pt.md
@@ -36,7 +36,7 @@
 
 Monitore e conduza seus agentes pelo celular — receba uma notificação quando um agente terminar e envie instruções de acompanhamento de qualquer lugar.
 
-[App Store para iOS](https://apps.apple.com/us/app/orca-ide/id6766130217) · [TestFlight](https://testflight.apple.com/join/YjeGMQBA) · [APK Android 0.0.50](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk) · [Docs →](https://www.onorca.dev/docs/mobile)
+[App Store para iOS](https://apps.apple.com/us/app/orca-ide/id6766130217) · [APK Android 0.0.50](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk) · [Docs →](https://www.onorca.dev/docs/mobile)
 
 </td>
 <td width="50%">
@@ -179,6 +179,7 @@ Funciona com **qualquer agente CLI** — se roda em um terminal, roda no Orca.
   <a href="https://cursor.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=cursor.com&sz=64" alt="Logotipo do Cursor" width="16" valign="middle" /> Cursor</kbd></a> &nbsp;
   <a href="https://docs.github.com/en/copilot/how-tos/set-up/install-copilot-cli"><kbd><img src="https://www.google.com/s2/favicons?domain=github.com&sz=64" alt="Logotipo do GitHub Copilot" width="16" valign="middle" /> GitHub Copilot</kbd></a> &nbsp;
   <a href="https://dev.meta.ai/docs/muse-code"><kbd><img src="../../src/shared/agent-icons/muse.png" alt="Logotipo do Muse" width="16" valign="middle" /> Muse</kbd></a> &nbsp;
+  <a href="https://deepseek-harness.github.io/deepseek-harness/"><kbd><img src="../../src/shared/agent-icons/dsh.png" alt="DeepSeek Harness logo" width="16" valign="middle" /> DeepSeek Harness</kbd></a> &nbsp;
   <a href="https://zcode.z.ai/en/docs"><kbd><img src="../../src/shared/agent-icons/zcode.png" alt="Logotipo do ZCode" width="16" valign="middle" /> ZCode</kbd></a> &nbsp;
   <a href="https://opencode.ai/docs/cli/"><kbd><img src="https://www.google.com/s2/favicons?domain=opencode.ai&sz=64" alt="Logotipo do OpenCode" width="16" valign="middle" /> OpenCode</kbd></a> &nbsp;
   <a href="https://mimo.xiaomi.com/coder"><kbd><img src="https://www.google.com/s2/favicons?domain=mimo.xiaomi.com&sz=64" alt="Logotipo do MiMo Code" width="16" valign="middle" /> MiMo Code</kbd></a> &nbsp;
@@ -195,6 +196,7 @@ Funciona com **qualquer agente CLI** — se roda em um terminal, roda no Orca.
   <a href="https://github.com/charmbracelet/crush"><kbd><img src="https://www.google.com/s2/favicons?domain=charm.sh&sz=64" alt="Logotipo do Charm" width="16" valign="middle" /> Charm</kbd></a> &nbsp;
   <a href="https://docs.cline.bot/cline-cli/overview"><kbd><img src="https://www.google.com/s2/favicons?domain=cline.bot&sz=64" alt="Logotipo do Cline" width="16" valign="middle" /> Cline</kbd></a> &nbsp;
   <a href="https://www.codebuff.com/docs/help/quick-start"><kbd><img src="https://www.google.com/s2/favicons?domain=codebuff.com&sz=64" alt="Logotipo do Codebuff" width="16" valign="middle" /> Codebuff</kbd></a> &nbsp;
+  <a href="https://freebuff.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=freebuff.com&sz=64" alt="Logotipo do Freebuff" width="16" valign="middle" /> Freebuff</kbd></a> &nbsp;
   <a href="https://commandcode.ai/docs/quickstart"><kbd><img src="https://www.google.com/s2/favicons?domain=commandcode.ai&sz=64" alt="Logotipo do Command Code" width="16" valign="middle" /> Command Code</kbd></a> &nbsp;
   <a href="https://docs.continue.dev/guides/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=continue.dev&sz=64" alt="Logotipo do Continue" width="16" valign="middle" /> Continue</kbd></a> &nbsp;
   <a href="https://docs.factory.ai/cli/getting-started/quickstart"><kbd><img src="../assets/droid-logo.svg" alt="Logotipo do Droid" width="16" valign="middle" /> Droid</kbd></a> &nbsp;
@@ -231,7 +233,7 @@ yay -S stably-orca-bin
 
 Conecte ao app desktop para monitorar e conduzir seus agentes pelo celular.
 
-- **iOS:** [Baixar na App Store](https://apps.apple.com/us/app/orca-ide/id6766130217) ou [entrar no TestFlight](https://testflight.apple.com/join/YjeGMQBA)
+- **iOS:** [Baixar na App Store](https://apps.apple.com/us/app/orca-ide/id6766130217)
 - **Android:** [Baixar APK 0.0.50](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk)
 
 ---
diff --git a/docs/readme/README.zh-CN.md b/docs/readme/README.zh-CN.md
index 7882935dfa41..54583f4777b7 100644
--- a/docs/readme/README.zh-CN.md
+++ b/docs/readme/README.zh-CN.md
@@ -179,6 +179,7 @@ VS Code 的编辑器，处处自动保存 — 把文件或图片直接拖入智
   <a href="https://cursor.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=cursor.com&sz=64" alt="Cursor logo" width="16" valign="middle" /> Cursor</kbd></a> &nbsp;
   <a href="https://docs.github.com/en/copilot/how-tos/set-up/install-copilot-cli"><kbd><img src="https://www.google.com/s2/favicons?domain=github.com&sz=64" alt="GitHub Copilot logo" width="16" valign="middle" /> GitHub Copilot</kbd></a> &nbsp;
   <a href="https://dev.meta.ai/docs/muse-code"><kbd><img src="../../src/shared/agent-icons/muse.png" alt="Muse logo" width="16" valign="middle" /> Muse</kbd></a> &nbsp;
+  <a href="https://deepseek-harness.github.io/deepseek-harness/"><kbd><img src="../../src/shared/agent-icons/dsh.png" alt="DeepSeek Harness logo" width="16" valign="middle" /> DeepSeek Harness</kbd></a> &nbsp;
   <a href="https://zcode.z.ai/en/docs"><kbd><img src="../../src/shared/agent-icons/zcode.png" alt="ZCode logo" width="16" valign="middle" /> ZCode</kbd></a> &nbsp;
   <a href="https://opencode.ai/docs/cli/"><kbd><img src="https://www.google.com/s2/favicons?domain=opencode.ai&sz=64" alt="OpenCode logo" width="16" valign="middle" /> OpenCode</kbd></a> &nbsp;
   <a href="https://ampcode.com/manual#install"><kbd><img src="https://www.google.com/s2/favicons?domain=ampcode.com&sz=64" alt="Amp logo" width="16" valign="middle" /> Amp</kbd></a> &nbsp;
@@ -193,6 +194,7 @@ VS Code 的编辑器，处处自动保存 — 把文件或图片直接拖入智
   <a href="https://github.com/charmbracelet/crush"><kbd><img src="https://www.google.com/s2/favicons?domain=charm.sh&sz=64" alt="Charm logo" width="16" valign="middle" /> Charm</kbd></a> &nbsp;
   <a href="https://docs.cline.bot/cline-cli/overview"><kbd><img src="https://www.google.com/s2/favicons?domain=cline.bot&sz=64" alt="Cline logo" width="16" valign="middle" /> Cline</kbd></a> &nbsp;
   <a href="https://www.codebuff.com/docs/help/quick-start"><kbd><img src="https://www.google.com/s2/favicons?domain=codebuff.com&sz=64" alt="Codebuff logo" width="16" valign="middle" /> Codebuff</kbd></a> &nbsp;
+  <a href="https://freebuff.com/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=freebuff.com&sz=64" alt="Freebuff logo" width="16" valign="middle" /> Freebuff</kbd></a> &nbsp;
   <a href="https://commandcode.ai/docs/quickstart"><kbd><img src="https://www.google.com/s2/favicons?domain=commandcode.ai&sz=64" alt="Command Code logo" width="16" valign="middle" /> Command Code</kbd></a> &nbsp;
   <a href="https://docs.continue.dev/guides/cli"><kbd><img src="https://www.google.com/s2/favicons?domain=continue.dev&sz=64" alt="Continue logo" width="16" valign="middle" /> Continue</kbd></a> &nbsp;
   <a href="https://docs.factory.ai/cli/getting-started/quickstart"><kbd><img src="../assets/droid-logo.svg" alt="Droid logo" width="16" valign="middle" /> Droid</kbd></a> &nbsp;
diff --git a/docs/reference/agent-status-store.md b/docs/reference/agent-status-store.md
index 4dff79d6666a..b7ce4fa16dde 100644
--- a/docs/reference/agent-status-store.md
+++ b/docs/reference/agent-status-store.md
@@ -105,8 +105,15 @@ ingests the summary into the hook server as a status row:
 | `structuredHost`                                    | `'owned'` while `summary.hostExecutionOwned` is set, otherwise `'held'`; `worktree ps` derives its row's `structuredHostOwned` from it                                        |
 | prompt, tool, last message, model, provider session | the summary's fields                                                                                                                                                          |
 
-Sessions with no persisted turn (`status === null`) produce no row, matching
-what the chat shows. When the host revokes live ownership the row is re-set
+Sessions with no request (`status === null`) produce no row. A request is a
+turn record, an assistant message, a user message the provider journaled itself
+(history, an older host), an accepted or unanswered send, or a send the agent or
+its start refused; a send that was withdrawn, or left undelivered by a
+restart or a close, fails nobody and makes nothing listable.
+`summary.turnOutcome` is the latest request's verdict: its turn's outcome, or
+`failure` for a send the agent or its start refused (a send that joined a running
+turn is answered by that turn). The row also publishes `interrupted` from
+`mainAgent.outcome`, exactly as the hook lanes do. When the host revokes live ownership the row is re-set
 without the flag; when the host closes or evicts the session the row is
 dropped. Both already exist as feed events (`revokeLive` and the roster
 filter in `liveSessionSummaries`); PR 1 turns them into store writes.
@@ -218,6 +225,32 @@ sends no hook at all on a cancel and no `is_interrupt` on Stop; that flag on a
 turn boundary remains a secondary source for builds that send it, and
 `StopFailure` maps to `failure`.
 
+Readers decode the verdict through one accessor, `agentMainAgentVerdict`, which
+reads the main agent's own state, not the combined row's: `mainAgent.outcome`
+while `mainAgent.state` is `done`, then the legacy `interrupted` flag as a
+cancellation, which alone needs the combined `done`. So a main agent that
+failed while its subagents still run has a verdict on a `working` row. Every
+copy of a row (state-history entries, sleep records, `worktree ps` rows) takes
+the verdict through `agentVerdictFields`, which carries `interrupted` and the
+whole `mainAgent` (state, outcome and its own clock) together, so a copy agrees
+with the row and can date a failure by `mainAgent.stateStartedAt`.
+
+Display reads the verdict through `agentVerdictDisplayMark`: a failure marks the
+agent failed whatever the combined state, because it is news the user must see
+even while subagents run; a stop marks it interrupted only on a `done` row, so
+a stopped or finished main agent with live child work still reads working.
+Each subagent keeps its own row and state. Container rollups (worktree card,
+terminal tab, Cmd+J) rank a pending question first, then a failure, then live
+work, then a stop, then done. On the worktree card, a failure retained after its
+agent's pane went away has no expiry, so it ranks below live work and above a
+stop. Lifecycle waiters keep reading the combined `state`.
+
+Policy splits the verdict two ways. Clean-finish policy (hibernation, pane
+ownership, the star-nag value moment) treats a failure like a cancellation
+(`agentTurnEndedUncleanly`). Attention (completion time, Smart Sort, sticky
+retention, Cmd+J Recent) demotes only a turn the user stopped
+(`agentTurnStoppedByUser`); a failure ranks like a completion.
+
 Admission is one function, `normalizeAgentStatusPayload`, on the relay wire,
 IPC and disk. A malformed `mainAgent` drops the field and keeps the row. Old hosts
 send none and readers fall back to `state`. Hook rows persist it inside the
diff --git a/docs/reference/antigravity-readiness-evidence.md b/docs/reference/antigravity-readiness-evidence.md
index 2700730fccfd..db505d2ff033 100644
--- a/docs/reference/antigravity-readiness-evidence.md
+++ b/docs/reference/antigravity-readiness-evidence.md
@@ -251,7 +251,7 @@ What the captures support and the shipped detector now does:
   API-key users.
 - **Veto an active model picker.** `Switch Model` followed by a labeled selection row means the
   bare caret belongs to the composer behind the picker; readiness resumes after `Exited /model
-  command`.
+command`.
 - **Do not anchor on `headerIndex`.** The banner is printed once and never reprinted.
 - **The blocked-signal path already works** for the trust dialog: `antigravity-dialog-trust-workspace.txt`
   is correctly refused today, by wording, not by structure.
diff --git a/docs/reference/ci-demand-rollout.md b/docs/reference/ci-demand-rollout.md
new file mode 100644
index 000000000000..081d276c4bfc
--- /dev/null
+++ b/docs/reference/ci-demand-rollout.md
@@ -0,0 +1,148 @@
+# CI demand rollout
+
+This implements the September 28 runner-demand analysis. The baseline inventory
+covered September 27 04:00–September 28 04:00 UTC: 4,028 workflow runs, with
+463 stratified job samples. Estimated occupancy was 1,081 runner-hours, dominated
+by PR unit shards (414 hours) and Bun qualification (262 hours). These are
+sampled sums of job durations across different runner pools, not billing totals
+or a guaranteed forecast of savings.
+
+## What runs now
+
+| Work                         | Ordinary draft update                                                          | Ready PR / final checks                       | Main reference                          |
+| ---------------------------- | ------------------------------------------------------------------------------ | --------------------------------------------- | --------------------------------------- |
+| Static analysis and types    | Immediately                                                                    | Immediately                                   | Existing workflows                      |
+| Unit suite                   | Full, with shadow selection evidence                                           | Full                                          | Existing daily Node 24/26 x86 suite     |
+| Packages                     | After successful static analysis and types                                     | Same                                          | Existing release workflows              |
+| Bun persistence              | Linux x64 for ordinary runtime changes; all six platforms for sensitive inputs | All six platforms when Bun inputs changed     | Full nightly qualification at 11:30 UTC |
+| Bun glibc/musl qualification | Sensitive inputs only, after persistence succeeds                              | Both architectures after persistence succeeds | Both architectures                      |
+| E2E                          | Existing targeted routing                                                      | Existing targeted routing                     | One complete run at 17:00 UTC           |
+
+Bun-sensitive inputs include root/toolchain files, configuration, native code,
+resources, platform-specific paths, persistence, SQLite, orcad, providers,
+daemon, SSH, relay, and child-process code. Dependency discovery failure, a
+missing event or an incomplete diff retains full qualification. An unrelated
+change still skips Bun through the existing dependency classifier. No native
+artifact is shared across platforms or ABIs. The routine draft reduction is an
+explicit coverage-placement change; it does not assert identical per-update
+coverage. Every non-draft synchronize event and the ready-for-review event
+restores full qualification.
+
+Expensive PR jobs wait for static/type success. This reduces fan-out for failed
+or rapidly superseded commits without sleeping on a runner. Successful isolated
+PRs pay the extra stage latency. Existing per-PR cancellation remains in place.
+Package assertions, native boundaries, SSH/folder coverage, cache warming and
+slow-test assertions are retained.
+
+## Unit selection rollout
+
+`ci-unit-plan.mjs` discovers the same include/exclude set as Vitest and follows
+static imports, re-exports, literal dynamic imports, CommonJS requires and the
+renderer aliases. Consumers of indirect filesystem/process inputs remain in the
+candidate set, as do script/tool tests. Global configuration changes, deletions,
+renames involving removed paths, unknown inputs and graph failures run the full
+suite. A shard verifies the plan's source SHA and complete discovery list before
+using it. Missing/stale artifacts fall back to full coverage, even if that means
+running the suite on fewer shards.
+
+The initial policy is **shadow**, with every shard retained. A full run spends
+`FULL_SHARD_COUNT` (five) concurrency slots: the account is charged a slot per job
+rather than per core, so eight 6.5-minute shards made this matrix 68% of daily slot
+demand while the arm pool queued 10.5 minutes at p95. The first
+local inventory matched Vitest exactly (9,950 files at validation); representative
+source changes retained roughly 88% of files because of indirect input readers.
+That is evidence for conservative coverage, not evidence of the analysis's
+hypothetical 50% unit-work reduction. Improvements to indirect dependency
+modeling should be demonstrated against full results before expanding selection.
+
+Every shard uploads `unit-selection.json`, `unit-timings.json` (including module
+outcomes), and its assignment. The evidence job combines these into
+`unit-selection-review-attempt-N/selection-review.json`, reporting:
+
+- Whether every discovered file appeared once across a complete reference run.
+- Failures outside the candidate set, including failures in otherwise red runs.
+- Measured worker time that selection would omit; worker times overlap and are
+  not runner occupancy or a prediction of wall-clock savings.
+
+Missing/duplicate shards, stale plans, interrupted runs and unhandled errors do
+not count as complete references. Diagnostic upload/report failures do not make
+tests pass and do not independently fail successful tests.
+
+After representative complete shadow runs show no missed failures, set repository
+variable `ORCA_UNIT_SELECTION_MODE=selected` to enable selection **only for draft
+PRs**. Keep full ready-PR checks and the daily compatibility suite. Inspect at
+least a week's evidence across renderer, main, shared, SSH and fixture changes
+before promotion, including red runs rather than only successful examples.
+Unknown variable values retain shadow mode. Unset the variable or set it to
+`shadow` to roll back immediately. Selected runs use one to eight timing-balanced
+shards based on retained work.
+
+Ready-for-review result reuse includes `unit full` in its source/workflow
+identity. A green selected draft cannot satisfy the final full check, even if
+the repository variable changes between runs. An already successful _full_
+identical-source check can still be reused.
+
+To inspect downloaded shard artifacts locally:
+
+```sh
+node config/scripts/ci-unit-selection-review.mjs ARTIFACT_DIRECTORY
+```
+
+## Review automation
+
+Pullfrog recognizes the existing `Review #N [id]` and
+`Review new commits on #N [id]` dispatch names. Explicit dispatchers may provide
+`pull_request_number` and `head_sha`. Explicit PR identities share concurrency at the workflow boundary. Legacy review
+names use a bounded lookup of the latest 100 dispatches and cancel only lower
+run IDs for the same PR; a delayed older scope cannot cancel a newer review.
+Unrecognized tasks are never grouped. The scope job alone has Actions write
+permission for ordered cancellation. Closed PRs and explicitly stale heads
+are skipped. A second head check prevents starting an agent after its queued
+head has changed. Unrecognized agent tasks remain independent; lookup failures
+also retain an independent task rather than cancelling unrelated work.
+
+This does not introduce a fixed debounce interval or remove final reviews.
+Dispatchers should supply `head_sha` for reliable stale-at-dispatch detection;
+legacy names identify a PR but do not prove which head the prompt describes.
+
+## E2E signal
+
+The daily reference still executes all shards and keeps original verdicts. Each
+shard uploads Playwright JSON and publishes expected, skipped, unexpected, flaky
+and startup-error counts with the failing test names/messages. Targeted PR and
+manual coverage remain available. This change does not fix the historically
+red tests or pretend they pass.
+
+`config/e2e-failure-tracking.json` can separate an evidenced repeated failure
+from new failures in the summary. Each entry must have exact `file`, full
+`title`, `project`, a nonempty stable `message` substring, an `@owner`, a linked
+repository `issue`, and an ISO `expires` review date. Expired/malformed entries
+are ignored and reported; changed error signatures appear as untracked. Entries
+never skip a test or change its exit status. The initial list is empty because
+the analysis established red workflows but did not establish owners and
+reproductions for individual failures. Do not blanket-baseline an entire red run.
+
+## Capacity measurements and acceptance
+
+`CI runner demand` runs daily at 04:23 UTC and can be dispatched manually. It
+reads the previous 24 complete hours in hourly pages, samples up to six runs per
+workflow/outcome stratum, and fetches job pages with bounded concurrency. An
+hour exceeding the API's 1,000-result search cap fails visibly. The report and
+raw evidence are retained for 30 days. No extra runner pool is provisioned.
+
+The report measures the full job durations of runs **created** in the window,
+not occupancy clipped to the window: earlier runs that overlap it are excluded,
+and completed sampled jobs may finish after it. This matches the baseline
+cohort method. Workflow IDs keep ref-qualified paths in one sampling stratum.
+
+The report shows weighted runner-hours and cancelled-run hours per workflow,
+runner-minutes per completed PR _run_, and weighted queue/provisioning p95 per
+runner label. It counts latest attempts only, excludes incomplete jobs, and
+retains zero-job observations. It does not measure other repositories competing
+for organization capacity. Compare equivalent traffic windows, not raw totals
+alone. The collector needs only `contents: read` and `actions: read`.
+
+After a week, compare runner-minutes per PR run, cancellation occupancy and
+queue p95 in each affected pool. Count newly added planning/reference overhead.
+A 25–35% overall reduction remains an experiment target, not an achieved result;
+selection, coalescing and matrix reductions overlap and cannot simply be added.
diff --git a/docs/reference/ci-runner-efficiency.md b/docs/reference/ci-runner-efficiency.md
index 21836ed6f947..5a59c75db5e1 100644
--- a/docs/reference/ci-runner-efficiency.md
+++ b/docs/reference/ci-runner-efficiency.md
@@ -1,5 +1,106 @@
 # CI efficiency and runner capacity
 
+The [September 28 demand rollout](ci-demand-rollout.md) documents staged checks,
+unit-selection evidence, Bun qualification, review cancellation and daily occupancy reports.
+
+## September 27 follow-up
+
+### Shared E2E CLI output
+
+E2E consumers previously compiled the CLI individually even though they downloaded
+shared Electron, web, and relay output. The producer now compiles the CLI once,
+in parallel with web projection after Electron has finished clearing `out/main`.
+Consumers repair executable permissions and install their own dev launcher with
+the same preparation script used by local CLI builds. Older refs without that
+script retain their original per-consumer compilation.
+
+An [eight-sample comparison](https://github.com/stablyai/orca/actions/runs/36307081200)
+measured producer time increasing from 26.3–27.9s to 38.8–41.0s, while consumer
+CLI compilation fell from 20.9–21.2s to 0.06–0.07s of direct preparation. All 5,519
+output files matched byte-for-byte, and every sample passed the CLI help smoke.
+A four-sample
+[final implementation comparison](https://github.com/stablyai/orca/actions/runs/36307382635)
+also passed parity and CLI smoke checks. Consumer compilation took 4.7 / 12.8s
+versus 0.08 / 0.06s of preparation; producer time increased by 0.2 / 7.1s in
+the paired trials. Across both runs this models roughly 1.1–4.7 aggregate runner
+minutes saved across 14 consumers, before artifact transfer overhead. Runner
+variation is substantial; this is not a measured workflow wall-time reduction.
+Test coverage and deadlines stay intact.
+
+
+[PR #23368](https://github.com/stablyai/orca/pull/23368) overlaps shell installation
+with dependency setup, starts localization extraction before the orcad smoke,
+and prepares mobile route snapshots while WebKit and the bundle are being built.
+Its 27 checks passed without retries; seven existing conditional checks skipped.
+
+Same-runner comparisons in both orders measured:
+
+| Work | Before | After | Evidence |
+| --- | --- | --- | --- |
+| Static block | 63.5 / 74.7s | 38.9 / 55.6s | [Full comparisons](https://github.com/stablyai/orca/actions/runs/36302208990) |
+| Shell job, downloads warmed equally | 76.8 / 70.3s | 64.4 / 64.0s | [Controlled shell runs](https://github.com/stablyai/orca/actions/runs/36302612626) |
+| Mobile preparation | 19.8–21.6s | 18.0–18.5s | [Eight measurements](https://github.com/stablyai/orca/actions/runs/36302877583) |
+| Web projection and mobile build | 17.2–17.3s | 11.7–12.1s | [Eight measurements](https://github.com/stablyai/orca/actions/runs/36302974324) |
+| Mobile verifier fixture suite | 25.47 / 25.35s | 20.04 / 19.92s | [Four full-suite runs](https://github.com/stablyai/orca/actions/runs/36302692823) |
+| E2E build outputs | 28.6–30.4s | 25.8–27.8s | [Eight measurements](https://github.com/stablyai/orca/actions/runs/36304001325) |
+
+Full mobile-job timings were dominated by first-run apt installation and browser
+test variation; the controlled preparation measurement is the scheduling evidence.
+All 1,248 web/mobile output files matched byte-for-byte in the build comparison.
+The fixture suite kept all 47 tests, isolated mutable copies, and the verifier's
+two fresh builds. No deadline, isolation, or worker-count changes were needed.
+
+E2E builds reuse the existing isolated main/preload/renderer build wrapper, now
+forwarding `--mode e2e` to each target. All 2,640 output files matched byte-for-byte
+in both execution orders, including the exposed test store and relay artifacts.
+This saves a few build seconds; it does not speed up the E2E tests themselves.
+
+The existing unit assignment was already balanced at about 919 historical
+worker-seconds per shard; fresh x86 elapsed times still ranged from 254 to 433s.
+Refreshing weights alone would encode runner variation rather than resolve it.
+An [identical-source architecture pilot](https://github.com/stablyai/orca/actions/runs/36302250920)
+ran shards 1 and 8 on both four-CPU hosted runners. Complete jobs improved from
+449 to 404s and 461 to 384s on ARM, including setup; test and skip counts matched.
+A [full ARM run](https://github.com/stablyai/orca/actions/runs/36302906752) then passed
+all eight shards in 329–373 test seconds (365–412 job seconds). Uploaded reports
+matched the same complete x86 assignment: 9,876 files, each exactly once, no
+unhandled errors. These are elapsed samples excluding queue time, not a guarantee
+that every ARM allocation is faster than every x86 allocation.
+
+PR unit shards and their cache primer now use ARM; a main-branch warmer seeds
+that architecture's existing native and pnpm cache keys. Native, package, and
+relay gates continue on x86. The daily workflow retains complete x86 coverage on
+both Node 24 and Node 26, including relay integration. Thus PR unit architecture
+changes, while x86 unit coverage remains scheduled; this is an explicit coverage
+placement tradeoff rather than a claim of identical per-PR host coverage.
+
+PR validation exposed a WebRTC probe timeout inside a hidden renderer. Isolated
+and four-concurrent probes passed on both architectures; the original cause is
+unproven. The probe now uses Electron main for the same three-second observation
+interval. A [fault-injection comparison](https://github.com/stablyai/orca/actions/runs/36304349257)
+passed with renderer timers unavailable on both architectures, while the original
+probe failed the negative control. Packet assertions and deadlines are unchanged.
+A subsequent Windows run timed out in the installer's real CIM process query
+after verifying restricted policy. Its unchanged probe now runs before the
+concurrent native suite, removing that source of contention without relaxing
+the twenty-second process deadline or dropping either PowerShell architecture.
+
+Replacing Vitest deep comparisons with Node assertions in the status-store
+oracle saved only about one local second in an initial trial. The change was
+not retained: that evidence did not justify changing assertion semantics.
+
+The combined root/mobile pnpm cache is now present on main and was restored in
+the September 27 static comparison, so another warmer for that key is unnecessary.
+
+A [fixture-warmer overlap trial](https://github.com/stablyai/orca/actions/runs/36303613587)
+ran faster after initialization but exposed a first-use action-download race:
+both background composites downloaded `actions/cache@v5` simultaneously, and
+one briefly could not find `restore/action.yml`. The existing cache fallback
+rebuilt the image and the job passed, but that recovery erased the speedup.
+Keep the dedicated warmer serial. PR package restores remain safe from this
+observed first-use race because their earlier top-level cache action is loaded
+before the composites start; the workflow contract now preserves that ordering.
+
 ## Four follow-up changes
 
 - Keep the readiness event, but reuse required checks only after an Actions API
@@ -90,13 +191,33 @@ analysis, so both fresh PRs saved another roughly 350 MiB store. Controlling tha
 cache duplication is a remaining opportunity; hourly warming alone cannot
 promise retention. Git's checksum-verified cold-build fallback remains required.
 
-The unit scheduling baseline now comes from every successful Node 24 shard in
-run 36221874572. All 9,683 measurements were checked against the eight saved
-assignments before import. Current discovery selects 9,732 files exactly once, using a 230ms
-median for 49 new files. With the same measurements applied to both assignments,
-the largest projected load falls 7.48%; total work is unchanged. See
+The unit scheduling baseline now comes from all eight successful Node 24 shards in
+[run 36294142683](https://github.com/stablyai/orca/actions/runs/36294142683).
+All 9,847 measurements match current discovery exactly once; the previous baseline
+had 165 unmeasured files and one deleted path. Applying the same measurements to
+both assignments reduces the largest projected load from 1,043.811 to 919.695
+worker-seconds (11.9%). This is a scheduling projection, not an elapsed-time claim;
+runner variation remains visible in the source run. See
 [provenance and reproduction](../../config/scripts/ci-shard-timings.md).
-This is a scheduling projection; hosted elapsed time must be measured separately.
+
+## Recording compilation reuse
+
+[Benchmark run 36295773765](https://github.com/stablyai/orca/actions/runs/36295773765)
+compared the complete mobile suite on two hosted runners in opposite orders.
+Compilation reuse reduced elapsed time from 439.002 to 138.308 seconds and from
+560.926 to 200.751 seconds (64–68%). Each run preserved all 9,629 original test
+verdicts and passed four additional cache regression tests. Compiled code is
+bounded to 512 entries; exports, dependencies, and scenario state remain fresh.
+
+Splitting family recordings across four files took 145.165 and 217.226 seconds,
+5–8% slower than compilation reuse alone, so the original suite structure stays.
+All 787 goldens were regenerated from the unchanged pinned product tree; only
+the recorder digest changed, with identical recording bodies and value pools.
+
+Desktop validation in [run 36295671576](https://github.com/stablyai/orca/actions/runs/36295671576)
+passed all eight shards. The longest test step was 419 seconds versus 429 in the
+source run; summed test time was 3,028 versus 3,031 seconds. Runner variation
+prevents attributing that small elapsed-time difference solely to the weights.
 
 ## September 25 follow-up
 
diff --git a/docs/reference/codebuddy-harness.md b/docs/reference/codebuddy-harness.md
new file mode 100644
index 000000000000..e59eaec855ed
--- /dev/null
+++ b/docs/reference/codebuddy-harness.md
@@ -0,0 +1,44 @@
+# CodeBuddy terminal harness
+
+CodeBuddy uses its own identity in the desktop and mobile agent catalogs, process
+detection, telemetry, hooks, resume records and AI Vault. `codebuddy` and `cbc`
+identify the interactive CLI; print, server, ACP and detached background modes do
+not identify an interactive pane. Model and effort selections use `--model` and
+`--effort`; the CLI resolves its stable model aliases for the current account.
+
+Managed hooks use the existing Claude-compatible installer and transport, with
+CodeBuddy's own `.codebuddy/settings.json` and hook source. Installation preserves
+user hooks and statusline configuration. Local and SSH installers share the same
+plan; Windows explicitly selects CodeBuddy's supported PowerShell hook shell.
+Status flows through the execution host's canonical hook store.
+
+## Observed lifecycle
+
+Verified with the authenticated CodeBuddy 2.159.0 CLI on macOS:
+
+- `UserPromptSubmit` starts work. `SessionStart` can arrive afterward and must not
+  settle that work.
+- An unanswered `AskUserQuestion` emits a `Notification` with
+  `notification_type: permission_prompt` and the message
+  `needs your permission to use AskUserQuestion`.
+- In this version, `PreToolUse(AskUserQuestion)` arrives **after** the user answers;
+  it resumes working, followed by `PostToolUse` and `Stop`.
+- `Stop` supplies the final assistant message and the provider session identity
+  supplies the resume command.
+
+The sanitized real event sequence is
+`src/shared/__fixtures__/codebuddy-question-hooks.jsonl`. The regression test
+replays it through the shared hook listener. Qoder keeps its existing lifecycle
+semantics while sharing the common event projection.
+
+AI Vault reads CodeBuddy's `type: message` JSONL records with top-level roles and
+`input_text` / `output_text` content blocks. Local, WSL and SSH discovery use the
+provider's `.codebuddy/projects` tree and the same incremental parser.
+
+## Validation scope
+
+Live macOS checks exercised launch through Orca's agent menu, model switching,
+question waiting, answer submission, working and completion indicators, history
+discovery and a resumed session recalling its earlier answer. Hidden-renderer CDP
+screenshots record the working, question and completed states. Windows, Linux,
+WSL and SSH runtime execution have not been exercised live on this machine.
diff --git a/docs/reference/monaco-language-associations.md b/docs/reference/monaco-language-associations.md
new file mode 100644
index 000000000000..a159477e1761
--- /dev/null
+++ b/docs/reference/monaco-language-associations.md
@@ -0,0 +1,30 @@
+# Monaco filename associations
+
+Orca imports Monaco's full `editor.main.js` entry point, which registers the built-in
+languages and loads their grammars on demand. Filename detection must not load the
+editor itself: it also runs during session restoration and before the editor mounts.
+
+`monaco-language-associations.json` contains the registration metadata from the
+installed package's entry point. Regenerate it after upgrading Monaco:
+
+```sh
+node config/scripts/generate-monaco-associations.mjs
+pnpm exec oxfmt --write src/renderer/src/lib/monaco-language-associations.json
+```
+
+The generator reads syntax trees without executing contributions or grammar loaders.
+Its test compares the checked-in metadata to the installed package. The original
+list was verified against a clone of `microsoft/monaco-editor`, tag `v0.55.1`, commit
+`516f350bdaf7a82f6731bd128a9ec86a6e5fa47d` (`src/basic-languages` and `src/language`).
+
+Existing Orca filename and extension choices take precedence. This preserves custom
+Vue, Svelte, Astro, Nim, Typst, JSONL, notebook and preview handling, as well as the
+Markdown mapping for MDX. The fallback matches exact filenames before the longest
+extension, case-insensitively, and resolves duplicate associations in upstream
+registration order (the last registration wins, so `.pp` selects Ruby over Pascal).
+
+Monaco 0.55.1 has 90 registrations, 81 with filenames or extensions. Registrations
+without either remain available in Monaco but cannot be inferred from a path. This
+does not add VS Code extensions or language servers, guess from file contents, or
+change mobile's separate lowlight grammar set. The renderer uses only the basename,
+so local, Windows, SSH and folder-workspace paths share the same detection.
diff --git a/docs/reference/qoder-integration.md b/docs/reference/qoder-integration.md
new file mode 100644
index 000000000000..3a3a90121cd7
--- /dev/null
+++ b/docs/reference/qoder-integration.md
@@ -0,0 +1,89 @@
+# Qoder CLI integration
+
+Orca registers `qodercli` as `qoder`: detection, picker/settings, desktop and mobile
+identity, prompt launch, permission flags, managed hooks, workspace trust, and
+session resume use the existing TUI-agent and hook-status paths.
+
+## Verified contract
+
+Verified on macOS with Qoder CLI 1.1.64, including its versioned executable
+`qodercli-1.1.64`:
+
+- `--prompt-interactive` starts an interactive prompt; `--resume <id>` resumes a
+  session; `--dangerously-skip-permissions` is the permission bypass flag.
+- Hooks use the Claude-shaped nested configuration in `~/.qoder/settings.json`.
+  Orca registers its own `/hook/qoder` source and preserves user hooks.
+- Real SessionStart, UserPromptSubmit, Notification and SessionEnd events are
+  captured in `src/shared/__fixtures__/qoder-no-account-hooks.jsonl`, including
+  `source: resume` with the original session ID.
+- Trust is `permissions.trustDirectories` in that settings file, using the
+  canonical workspace path. A workspace `.trusted` marker did not bypass the
+  trust dialog in this version. Remote trust uses the execution host filesystem.
+- Qoder emits its `◇ … | Ready` title while the trust menu owns input. Readiness
+  therefore requires the live composer text, not merely this title or silence.
+  Raw PTY fixtures under `src/main/runtime/__fixtures__/qoder-*` cover trust,
+  unauthenticated prompt handling and the ready composer.
+- A hidden Orca dev instance launched Qoder from New Tab in a folder workspace.
+  Its icon, label, terminal rendering and failed-turn indicator were inspected.
+  A harmless prompt reached Qoder, which reported its credit usage limit; the
+  canonical hook store recorded Qoder identity, session metadata and failure.
+
+## Compatibility and limits
+
+Windows hooks explicitly select Qoder's documented PowerShell shell, avoiding
+an assumption that Qoder uses Git Bash just because it is installed. They reuse
+the existing managed `.cmd` payload without adding an encoded PowerShell hop.
+The configuration shape and preservation are tested; Windows, Linux and SSH
+execution have not been exercised live here.
+
+Resume requests to remote hosts require `agent-session.qoder-resume.v1`, so an
+older host is not sent an agent enum it cannot accept. Remote hook installation
+and trust preservation have automated coverage.
+
+Successful model output, tool execution and live permission dialogs remain
+unverified because the available account has exhausted its credits. Hook event
+mapping for these paths follows the official documentation. The China executable
+`qoderclicn` is not registered; it was not available for verification.
+
+New Tab follows the existing manual-launch trust behavior: an untrusted folder
+can show Qoder's trust dialog. Automated workspace/draft launch paths run the
+trust preflight before prompt delivery.
+
+## Sources
+
+- [Official hooks documentation](https://docs.qoder.com/cli/hooks)
+- [#15291](https://github.com/stablyai/orca/pull/15291): registration and hook proposal
+- [#13311](https://github.com/stablyai/orca/pull/13311): icon asset (commit
+  `b56197025530adb1b82d97a364a8c3d4a02c0d42`) and agent integration
+- [#8611](https://github.com/stablyai/orca/pull/8611) and
+  [#12910](https://github.com/stablyai/orca/pull/12910): contributor implementations
+- [#16540](https://github.com/stablyai/orca/issues/16540): Qoder misidentified as Gemini
+
+Contributor patches informed the integration; they were not applied wholesale.
+In particular, the trust marker proposal was replaced using the installed CLI's
+observed settings write, and no renderer workaround was added because the live
+WebGL terminal rendered correctly.
+
+## Cross-review of open proposals
+
+Reviewed the current patches for all six open Qoder PRs on 2026-09-28:
+
+| PR | Incorporated or confirmed | Deliberate differences |
+| --- | --- | --- |
+| #7502 (vincent-lxc) | Agent registration, mobile parity, identity before Gemini | Use structural titles and the current public permission flag. |
+| #8611 (Eridanus117, building on #7502) | Qoder hook source, notification/permission mapping, session resume | 1.1.64 supports `--prompt-interactive`; preserve startup session identity and ignore compact restarts. |
+| #9655 (xingqingzzp-gif) | Cross-checked minimum registration coverage | Placeholder icon and detection-only scope are superseded by the fuller integration; no code copied. |
+| #12910 (jyang2004) | Reuse the Claude-compatible installer with an event subset, plus remote installation | Use observed `.qoder` path and `/hook/qoder`; Qwen and the China build remain separate work. |
+| #13311 (sorrycc) | Icon, structural title disambiguation, headless detection, display glyph cleanup | No DOM renderer override: 1.1.64 renders correctly in the live WebGL terminal. No unverified executable alias. |
+| #15291 (adlternative) | Versioned binary recognition, trust preflight wiring, skills mapping and resume | Trust comes from settings, not `.trusted`; include notifications, permission and failure events with Qoder-specific normalization. |
+
+The rendered left sidebar was checked in the hidden Electron app using a temporary
+folder workspace and real Qoder hooks. The workspace fixture needed a parent path
+on its project group to appear in the sidebar. No agent status was injected into
+the renderer. A real prompt updated the row text and returned a credit-limit error;
+the row and workspace card showed failure with the Qoder icon. A DOM observer
+recorded the prompt-row transition before failure. Permission/waiting and successful
+completion remain automated event-mapping tests, not live model/tool verification.
+
+Commit co-authors credit all six proposal authors for the implementation and
+registration groundwork, including xingqingzzp-gif’s minimal registration proposal.
diff --git a/docs/reference/ssh-execution-boundary.md b/docs/reference/ssh-execution-boundary.md
index a113a5e6f29c..12aeea897533 100644
--- a/docs/reference/ssh-execution-boundary.md
+++ b/docs/reference/ssh-execution-boundary.md
@@ -83,12 +83,12 @@ worth — is answered by `RuntimeHostContact` (`src/shared/runtime-host-contact.
 never be mapped onto one:
 
 - `refused` is the host answering and turning us away — unauthorized, a protocol mismatch, a status
-  method it does not implement. That is positive evidence about the *connection*, and it says
+  method it does not implement. That is positive evidence about the _connection_, and it says
   nothing whatever about whether the host's PTYs are running. They almost certainly still are.
 - `retired` is the pairing being ended by explicit user action. Same point: the client stops having
   a route, the remote work is unaffected.
 
-Both are reasons to stop *trusting a cached answer*, never reasons to report a process `exited`. A
+Both are reasons to stop _trusting a cached answer_, never reasons to report a process `exited`. A
 reader that needs a process verdict must still get it from the host that owns the process, by the
 tests above.
 
diff --git a/docs/reference/windows-daemon-host-relocation.md b/docs/reference/windows-daemon-host-relocation.md
index f560597e25e6..c5cb34e8ab54 100644
--- a/docs/reference/windows-daemon-host-relocation.md
+++ b/docs/reference/windows-daemon-host-relocation.md
@@ -11,7 +11,7 @@ Read this before changing the copy plan, the host exe name, the LOCALAPPDATA lay
 
 ## What the relocation actually escapes
 
-The killer is **electron-builder's process sweep, matched on image path** — not file deletion.
+The killer is **electron-builder's process sweep** — not file deletion.
 Windows will not delete a running image, so `RMDir /r "$INSTDIR"` cannot end the daemon on its own.
 
 In app-builder-lib's `allowOnlyOneInstallerInstance.nsh`, `FIND_PROCESS` / `KILL_PROCESS` have two
@@ -22,15 +22,22 @@ branches:
 | Primary  | `powershell.exe` runs, `Get-CimInstance` resolves, and `Get-ExecutionPolicy -Scope Process` is not `Restricted` | `Win32_Process` where `$_.Path.StartsWith('$INSTDIR', 'CurrentCultureIgnoreCase')` — **path-scoped**                                                                  |
 | Fallback | otherwise                                                                                                       | per-user: `taskkill /F /IM "<AppName>.exe" /FI "PID ne $pid" /FI "USERNAME eq %USERNAME%"`; per-machine: the same without the username filter — **image-name-scoped** |
 
-The probe reads the **process** scope, not the effective policy, and Group Policy writes
-`MachinePolicy`/`UserPolicy` — so a GPO-managed host whose effective policy is `Restricted` still
-exits 0 and takes the primary branch. The fallback is reached only when `powershell.exe` is absent,
-`Get-CimInstance` does not resolve, PowerShell is blocked outright (WDAC/AppLocker, Server Core), or
-an inherited `PSExecutionPolicyPreference=Restricted` is in the environment.
+The upstream policy check can select the image-name fallback even when the inline process query
+works. `Restricted` disallows script files, not inline commands. A packaged trace for #22872
+showed that fallback successfully killing the relocated `Orca.exe` during an update; the
+genuine-uninstall cleanup guard was not responsible.
 
-So on essentially every machine the sweep is path-scoped, and a daemon whose image lives under
-`%LOCALAPPDATA%` is out of range regardless of what the file is called. **Survival is a property of
-the path.** The name only matters on the fallback branch.
+Orca's `customCheckAppRunning` in `config/nsis/orca-process-check.nsh` tests the actual inline
+`Get-CimInstance Win32_Process` query with terminating errors. Success selects the path-scoped
+branch; any other result retains the upstream fallback. The hook reuses upstream process
+selection, retry, permission and installation-mode handling. It neither overrides execution
+policy nor assumes PowerShell is available.
+
+A daemon outside `$INSTDIR` survives the path-scoped sweep. A genuinely unavailable process query
+still permits an image-name sweep and cold restore. Updates also run the **old installed
+uninstaller**, whose old capability check cannot be repaired by the new installer: the first
+upgrade can still cold-restore on an affected host. Once both binaries contain the hook, later
+updates use the actual capability test on both sides.
 
 ## Why the exe is copied verbatim (and not renamed)
 
@@ -99,15 +106,22 @@ stop being scored.
   `orca-terminal-daemon.exe` name stays in the macro to reap hosts left by older builds.
 - `LOCAL_HOST_ROOT_NAME` in `daemon-host-relocation.ts` and the path in the uninstall macro are the
   same directory. Change both together.
+- Every native module the daemon bundle `require()`s must be in the copy plan
+  (`daemon-host-manifest.ts`). A missing one does not fail the fork: bare `require` walks up from the
+  relocated bundle, finds nothing, and the caller's fallback runs forever. That is how
+  `@vscode/windows-process-tree` went missing and every process-table read became a
+  `powershell.exe` CIM scan (#16905). A host missing the addon's runtime files counts as
+  unmaterialized, so hosts built before it was copied get rebuilt.
 
 ## Verifying a change
 
-Unit coverage lives in `src/main/daemon/daemon-host-relocation.test.ts` (copy plan, verbatim
+Unit coverage lives in `src/main/daemon/daemon-host-relocation.test.ts` (copy plan, native-addon mirror, verbatim
 naming, marker/atomic publish, fail-open, prune veto). Nothing in unit tests can prove survival, so
 any change to this file or to the NSIS macro needs the packaged harnesses:
 
 - `.github/workflows/win-update-survival-e2e.yml` — builds an installer from the branch and updates
-  it over itself with `--expect survival`. The primary proof.
+  it over itself with `--expect survival`. Verify normal and child-scoped `Restricted` policy;
+  also verify released-to-branch migration with the expected cold-restore limitation.
 - `.github/workflows/win-crash-survival-e2e.yml` — proves the daemon survives a main-process crash.
 - `.github/workflows/windows-terminal-restart-e2e.yml` — terminal restart behaviour.
 - `.github/workflows/win-update-e2e.yml` — release-tag-to-release-tag update, both `survival` and
diff --git a/docs/reference/xterm-patch-regeneration.md b/docs/reference/xterm-patch-regeneration.md
index d398f10a6bba..3197de33f20e 100644
--- a/docs/reference/xterm-patch-regeneration.md
+++ b/docs/reference/xterm-patch-regeneration.md
@@ -48,6 +48,15 @@ after reset, disable or disposal. `config/scripts/xterm-image-lifecycle-contract
 exercises those boundaries against the installed addon. Font zoom scales visible
 tiles without creating enlarged full-image canvases;
 `config/scripts/xterm-image-resize-contract.test.mjs` checks allocation and tile mapping.
+Every wasm memory reserves its guard region inside V8's sandbox, which caps a
+renderer at about 124 live memories no matter how much RAM is free. Upstream
+gave each terminal a SIXEL decoder at activation and kept IIP decoders after the
+first image, so a window with ~120+ terminals ran out. The patch borrows SIXEL
+decoders from a small shared pool only while a sequence is open, keeping color
+registers on the terminal, and drops IIP decoders after each image. A decoder
+that cannot be allocated drops that image; before the patch it threw out of the
+parser and left the terminal's write queue stuck.
+`config/scripts/xterm-image-wasm-budget-contract.test.mjs` covers both.
 
 ## Rules
 
diff --git a/docs/site/content/docs/agents/supported.mdx b/docs/site/content/docs/agents/supported.mdx
index 6532e04fb58c..ecc8cfd13057 100644
--- a/docs/site/content/docs/agents/supported.mdx
+++ b/docs/site/content/docs/agents/supported.mdx
@@ -45,9 +45,12 @@ To restore prompts for one agent only, edit that agent's default arguments or en
 | Auggie             | Auto-setup                                                                                                                 | [Augment](https://docs.augmentcode.com/cli/overview)                                              |
 | Autohand           | Auto-setup                                                                                                                 | [Autohand](https://github.com/autohandai/code-cli)                                                |
 | Cline              | Auto-setup                                                                                                                 | [Cline](https://docs.cline.bot/cline-cli/overview)                                                |
+| CodeBuddy          | `npm install -g @tencent-ai/codebuddy-code`                                                                                | [CodeBuddy](https://www.codebuddy.ai/cli)                                                         |
 | Codebuff           | Auto-setup                                                                                                                 | [Codebuff](https://www.codebuff.com/docs/help/quick-start)                                        |
+| Freebuff           | Auto-setup                                                                                                                 | [Freebuff](https://freebuff.com/cli)                                                              |
 | Command Code       | Auto-setup, status                                                                                                         | [Command Code](https://commandcode.ai/docs/quickstart)                                            |
 | Muse               | macOS/Linux; trusts the workspace at launch                                                                                | [Meta](https://dev.meta.ai/docs/muse-code)                                                        |
+| DeepSeek Harness   | Launched through its `dsh-tui` profile; hooks, status, questions, resume                                                   | [DeepSeek](https://deepseek-harness.github.io/deepseek-harness/)                                  |
 | ZCode              | Deep integration; needs a `zcode` CLI that ships the TUI (see note below)                                                  | [Z.ai](https://zcode.z.ai/en/docs)                                                                |
 | Continue           | Auto-setup                                                                                                                 | [Continue](https://docs.continue.dev/guides/cli)                                                  |
 | Cursor CLI         | Deep integration                                                                                                           | [Cursor](https://cursor.com/cli)                                                                  |
diff --git a/docs/site/content/docs/telemetry.mdx b/docs/site/content/docs/telemetry.mdx
index 604202e067e1..f7f8568cd959 100644
--- a/docs/site/content/docs/telemetry.mdx
+++ b/docs/site/content/docs/telemetry.mdx
@@ -21,12 +21,12 @@ The categories of behavior we observe:
 
 - **Lifecycle** — when the app opens. Used to estimate daily, weekly, and monthly active users.
 - **Repos and workspaces** — when you add a repo or create a workspace. We record _how_ you did it (e.g. folder picker vs. clone URL; command palette vs. drag-and-drop), never the repo name, URL, path, branch name, or any free-form text.
-- **Agents** — when you start an agent, which agent kind it was (from a fixed list like `claude-code`, `codex`, `gemini`, etc.), and where you launched it from. Never the prompt, model details, or agent output.
+- **Agents** — which agents you use and their token counts. Never prompts or agent output.
 - **Agent errors** — a coarse error category and which agent kind was involved. We never see raw error messages or stack traces; per-incident detail stays in a local diagnostic trace file on your machine and only reaches Orca if you explicitly share a diagnostic bundle.
 - **Settings** — when you toggle one of a small whitelisted set of feature-flag or UX preferences. We record which preference changed and whether it's a boolean or an enum, never the raw value of any free-form setting.
 - **Privacy controls** — when you opt in or out of telemetry, so we can tell from aggregate data whether our consent UI is working.
 
-Every field we transmit is either a fixed enum value, a version string, or the anonymous local ID. No free-form strings from any UI input ever leave your machine.
+Fields include fixed enum values, version strings, numeric counts and revisions, and random local IDs. Conversation IDs allow repeated token summaries for the same conversation to be associated; they are pseudonymous. No free-form strings from any UI input ever leave your machine.
 
 ## What we never send
 
diff --git a/mobile/app/_layout.tsx b/mobile/app/_layout.tsx
index c65008db7ce0..711ee41ffd30 100644
--- a/mobile/app/_layout.tsx
+++ b/mobile/app/_layout.tsx
@@ -24,6 +24,7 @@ import { ensureDesktopNotificationChannel } from '../src/notifications/desktop-n
 import { loadHostCatalog } from '../src/transport/host-store'
 import { extractPairingCodeFromUrl } from '../src/transport/pairing'
 import { recoverMobileRelayPairing } from '../src/transport/mobile-relay-pairing-recovery'
+import { appUpdateChecker } from '../src/app-update/app-update-runtime'
 
 // Why: keeps the native splash screen visible until the React tree is mounted
 // and ready to render. Without this the user sees a blank white/black frame
@@ -65,6 +66,8 @@ export default function RootLayout() {
   // Why: a rolled APNs/FCM token stops delivering silently, so every paired host
   // has to be re-registered with the new one as soon as the provider hands it over.
   useEffect(() => startPushTokenSync(), [])
+  // Cold start, then foreground and timer checks on the desktop updater's cadence.
+  useEffect(() => appUpdateChecker.start(), [])
   useEffect(() => startAndroidForegroundPushPresentation(), [])
 
   // Why: route `orca://pair?...` deep links to the confirm screen so
diff --git a/mobile/app/h/[hostId]/edit.tsx b/mobile/app/h/[hostId]/edit.tsx
index b27faaf9520c..90e9bc6c1671 100644
--- a/mobile/app/h/[hostId]/edit.tsx
+++ b/mobile/app/h/[hostId]/edit.tsx
@@ -19,6 +19,7 @@ import { displayHostEndpoint } from '../../../src/transport/host-endpoint'
 import { resolveHostEndpointEdit } from '../../../src/transport/host-endpoint-edit'
 import { usePrimeHosts, useRefreshHostClient } from '../../../src/transport/client-context'
 import type { HostProfile } from '../../../src/transport/types'
+import { hostOs } from '../../../src/platform/host-os'
 
 export default function EditHostScreen() {
   const router = useRouter()
@@ -179,7 +180,7 @@ export default function EditHostScreen() {
       ) : (
         <KeyboardAvoidingView
           style={styles.flex}
-          behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+          behavior={hostOs() === 'ios' ? 'padding' : undefined}
         >
           <ScrollView
             contentContainerStyle={[styles.form, { paddingBottom: insets.bottom + spacing.xl }]}
diff --git a/mobile/app/settings.tsx b/mobile/app/settings.tsx
index eb954a8e83d0..8b3267e2f86b 100644
--- a/mobile/app/settings.tsx
+++ b/mobile/app/settings.tsx
@@ -2,6 +2,7 @@ import { Linking } from 'react-native'
 import { useRouter } from 'expo-router'
 import SettingsMenuScreen from '../src/settings/settings-menu-screen'
 import { PendingCredentialCleanupCard } from '../src/settings/pending-credential-cleanup-card'
+import { SettingsAppUpdateSection } from '../src/settings/settings-app-update-section'
 
 export default function NativeSettingsRoute() {
   const router = useRouter()
@@ -10,6 +11,7 @@ export default function NativeSettingsRoute() {
       push={(route) => router.push(route)}
       openExternal={(url) => Linking.openURL(url)}
     >
+      <SettingsAppUpdateSection />
       <PendingCredentialCleanupCard />
     </SettingsMenuScreen>
   )
diff --git a/mobile/modules/orca-mobile-web-shell/ios/MobileWebShellKeyboardAccessory.swift b/mobile/modules/orca-mobile-web-shell/ios/MobileWebShellKeyboardAccessory.swift
new file mode 100644
index 000000000000..43de70947b0a
--- /dev/null
+++ b/mobile/modules/orca-mobile-web-shell/ios/MobileWebShellKeyboardAccessory.swift
@@ -0,0 +1,50 @@
+import ObjectiveC
+import UIKit
+import WebKit
+
+/// Removes WKWebView's form accessory bar (up, down, done). Native screens have none, and the
+/// keyboard event the shell publishes counts it, so the page lifted by the bar as well. WebKit
+/// exposes no switch, so the content view is moved onto a subclass whose `inputAccessoryView` is
+/// nil, the same technique react-native-webview's `hideKeyboardAccessoryView` uses.
+func hideKeyboardAccessoryBar(of webView: WKWebView) {
+  guard
+    let content = webView.scrollView.subviews.first(where: {
+      String(describing: type(of: $0)).hasPrefix("WKContent")
+    })
+  else {
+    return
+  }
+  let base: AnyClass = type(of: content)
+  let name = "\(NSStringFromClass(base))_OrcaNoAccessory"
+  let subclass: AnyClass
+  if let existing = NSClassFromString(name) {
+    subclass = existing
+  } else {
+    guard let created = objc_allocateClassPair(base, name, 0) else {
+      return
+    }
+    let noAccessory: @convention(block) (AnyObject) -> UIView? = { _ in nil }
+    let selector = #selector(getter: UIResponder.inputAccessoryView)
+    let typeEncoding = method_getTypeEncoding(class_getInstanceMethod(UIResponder.self, selector)!)
+    class_addMethod(created, selector, imp_implementationWithBlock(noAccessory), typeEncoding)
+    objc_registerClassPair(created)
+    subclass = created
+  }
+  object_setClass(content, subclass)
+}
+
+/// Stops WKWebView reacting to the keyboard itself. It listens for the keyboard's frame and scrolls
+/// the document to reveal the focused field, on top of the lift the page already applies from the
+/// height the shell sends, so the page moved twice. The shell's own listeners are unaffected.
+func ignoreKeyboardNotifications(in webView: WKWebView) {
+  for name in [
+    UIResponder.keyboardWillShowNotification,
+    UIResponder.keyboardDidShowNotification,
+    UIResponder.keyboardWillHideNotification,
+    UIResponder.keyboardDidHideNotification,
+    UIResponder.keyboardWillChangeFrameNotification,
+    UIResponder.keyboardDidChangeFrameNotification
+  ] {
+    NotificationCenter.default.removeObserver(webView, name: name, object: nil)
+  }
+}
diff --git a/mobile/modules/orca-mobile-web-shell/ios/MobileWebShellView.swift b/mobile/modules/orca-mobile-web-shell/ios/MobileWebShellView.swift
index 0a2122f8183a..abf9e7a70ede 100644
--- a/mobile/modules/orca-mobile-web-shell/ios/MobileWebShellView.swift
+++ b/mobile/modules/orca-mobile-web-shell/ios/MobileWebShellView.swift
@@ -221,6 +221,8 @@ final class OrcaMobileWebShellView: ExpoView, WKNavigationDelegate, WKUIDelegate
     webView.backgroundColor = .clear
     webView.scrollView.backgroundColor = .clear
     webView.scrollView.contentInsetAdjustmentBehavior = .never
+    hideKeyboardAccessoryBar(of: webView)
+    ignoreKeyboardNotifications(in: webView)
     webView.translatesAutoresizingMaskIntoConstraints = false
     addSubview(webView)
     NSLayoutConstraint.activate([
diff --git a/mobile/rpc-foundation/goldens/aivault-history-scan-fulfilled.json b/mobile/rpc-foundation/goldens/aivault-history-scan-fulfilled.json
index fbd70e2f6fc5..05d48255545f 100644
--- a/mobile/rpc-foundation/goldens/aivault-history-scan-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/aivault-history-scan-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "aiVault.history",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "ec16931c5431d3dbb05729d4670c381a434bff71648d334b7b5224db188fdccb",
   "scenarioSha256": "0431ac82cbb8c60b16f4432fd0da7cff665485d668e512b20fc1168ec63db3fe",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/aivault-history-scan-unsupported.json b/mobile/rpc-foundation/goldens/aivault-history-scan-unsupported.json
index 0466c40f2540..c49eaddae919 100644
--- a/mobile/rpc-foundation/goldens/aivault-history-scan-unsupported.json
+++ b/mobile/rpc-foundation/goldens/aivault-history-scan-unsupported.json
@@ -3,9 +3,9 @@
   "family": "aiVault.history",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "ec16931c5431d3dbb05729d4670c381a434bff71648d334b7b5224db188fdccb",
   "scenarioSha256": "e97c6db772a70ee1912419ac67835b6074aaf9a341d4360389a11465f08092c5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/aivault-history-scan-worktrees-late.json b/mobile/rpc-foundation/goldens/aivault-history-scan-worktrees-late.json
index 895e82589f70..b83d7aa6db86 100644
--- a/mobile/rpc-foundation/goldens/aivault-history-scan-worktrees-late.json
+++ b/mobile/rpc-foundation/goldens/aivault-history-scan-worktrees-late.json
@@ -3,9 +3,9 @@
   "family": "aiVault.history",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "ec16931c5431d3dbb05729d4670c381a434bff71648d334b7b5224db188fdccb",
   "scenarioSha256": "10011c7c75e74d9c2e880c5458c9156264ae07e91956a80946ede1d4e684952a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/aivault-history-screen-listed.json b/mobile/rpc-foundation/goldens/aivault-history-screen-listed.json
index e18c065767e0..05c1f3a3d2b5 100644
--- a/mobile/rpc-foundation/goldens/aivault-history-screen-listed.json
+++ b/mobile/rpc-foundation/goldens/aivault-history-screen-listed.json
@@ -3,9 +3,9 @@
   "family": "aiVault.history-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c78ab47eea594b7e1988403321ff9ba135ca60c513bb9d5848bdde26c0ffe3c3",
   "scenarioSha256": "d52d3c5858298a4a6a90bd9a8986b780004477de105fe93f6303d9c303ffea38",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/aivault-history-screen-worktrees.json b/mobile/rpc-foundation/goldens/aivault-history-screen-worktrees.json
index b68a6375fd45..5ede6eb120bc 100644
--- a/mobile/rpc-foundation/goldens/aivault-history-screen-worktrees.json
+++ b/mobile/rpc-foundation/goldens/aivault-history-screen-worktrees.json
@@ -3,9 +3,9 @@
   "family": "aiVault.history-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c78ab47eea594b7e1988403321ff9ba135ca60c513bb9d5848bdde26c0ffe3c3",
   "scenarioSha256": "f50f63c4e2a69793b3d322ed16089c4241ff6169d8f9549106480230fb8dd5e7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/aivault-resume-launch-create-refused.json b/mobile/rpc-foundation/goldens/aivault-resume-launch-create-refused.json
index 3f26fa1595ad..02164967d24c 100644
--- a/mobile/rpc-foundation/goldens/aivault-resume-launch-create-refused.json
+++ b/mobile/rpc-foundation/goldens/aivault-resume-launch-create-refused.json
@@ -3,9 +3,9 @@
   "family": "aiVault.resume-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "ebf1bbc01ad7704fe79eff0969fcc2d4af8ebfa7c2410d2ed9d3ae8c6976b434",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/aivault-resume-launch-invalid-tab.json b/mobile/rpc-foundation/goldens/aivault-resume-launch-invalid-tab.json
index c99d841d0d98..54b025004f95 100644
--- a/mobile/rpc-foundation/goldens/aivault-resume-launch-invalid-tab.json
+++ b/mobile/rpc-foundation/goldens/aivault-resume-launch-invalid-tab.json
@@ -3,9 +3,9 @@
   "family": "aiVault.resume-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "281ccf5a082f3788ae8bf19f742ea4baf35c20c78bc91d7d91873845583e1a91",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/aivault-resume-launch-locked.json b/mobile/rpc-foundation/goldens/aivault-resume-launch-locked.json
index 97cbccd99403..55d31ba3d5da 100644
--- a/mobile/rpc-foundation/goldens/aivault-resume-launch-locked.json
+++ b/mobile/rpc-foundation/goldens/aivault-resume-launch-locked.json
@@ -3,9 +3,9 @@
   "family": "aiVault.resume-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "941fcf202417c94ef546f5ee331983689d8b72397dac6f61dda944ca24abed9e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/aivault-resume-launch-sent.json b/mobile/rpc-foundation/goldens/aivault-resume-launch-sent.json
index 11b193eb5349..48db573bca73 100644
--- a/mobile/rpc-foundation/goldens/aivault-resume-launch-sent.json
+++ b/mobile/rpc-foundation/goldens/aivault-resume-launch-sent.json
@@ -3,9 +3,9 @@
   "family": "aiVault.resume-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "f0ac1c996e5b1b4043e0a081978476c6c2dd8a5d517d5752857721205a588fb0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/aivault-resume-prepare-refused.json b/mobile/rpc-foundation/goldens/aivault-resume-prepare-refused.json
index 1d89599b9ba2..091cbba96674 100644
--- a/mobile/rpc-foundation/goldens/aivault-resume-prepare-refused.json
+++ b/mobile/rpc-foundation/goldens/aivault-resume-prepare-refused.json
@@ -3,9 +3,9 @@
   "family": "aiVault.resume-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "dc9926f95475413627315e1f1c96740ececa697c6a0a5e3c42e18cfd4d58448a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/aivault-resume-prepare-repin.json b/mobile/rpc-foundation/goldens/aivault-resume-prepare-repin.json
index ed55fb8bd19d..722569f79e48 100644
--- a/mobile/rpc-foundation/goldens/aivault-resume-prepare-repin.json
+++ b/mobile/rpc-foundation/goldens/aivault-resume-prepare-repin.json
@@ -3,9 +3,9 @@
   "family": "aiVault.resume-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "6719aea706086a68709894546f9595264407db2df94fa56180cb3c68b08aaa69",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/aivault-resume-prepare-skipped.json b/mobile/rpc-foundation/goldens/aivault-resume-prepare-skipped.json
index 5f11b46280e8..ca728868ddd9 100644
--- a/mobile/rpc-foundation/goldens/aivault-resume-prepare-skipped.json
+++ b/mobile/rpc-foundation/goldens/aivault-resume-prepare-skipped.json
@@ -3,9 +3,9 @@
   "family": "aiVault.resume-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "3afaf2807506f5bde2159b367f34c6b777739d6aad564796d54ac0da05b5bd02",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/aivault-resume-prepare-unavailable.json b/mobile/rpc-foundation/goldens/aivault-resume-prepare-unavailable.json
index fc4ecdd80936..cbad473015a0 100644
--- a/mobile/rpc-foundation/goldens/aivault-resume-prepare-unavailable.json
+++ b/mobile/rpc-foundation/goldens/aivault-resume-prepare-unavailable.json
@@ -3,9 +3,9 @@
   "family": "aiVault.resume-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "a5eedea5f551e0ca0e143292f1d9aa8920dd7af62a02d8e8777666ab3779c019",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/b1.json b/mobile/rpc-foundation/goldens/b1.json
index 432e4063c5a4..fb50a2faf88d 100644
--- a/mobile/rpc-foundation/goldens/b1.json
+++ b/mobile/rpc-foundation/goldens/b1.json
@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "23ffc912a432dcd3ff70be1903a8d518cf85634f27a2be6d21585963e338e7e3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/b2.json b/mobile/rpc-foundation/goldens/b2.json
index 2c0893aae2c3..df8f39f589b8 100644
--- a/mobile/rpc-foundation/goldens/b2.json
+++ b/mobile/rpc-foundation/goldens/b2.json
@@ -3,9 +3,9 @@
   "family": "project-explicit-false",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d3b7f33d810e1fa420ac41a628cde9fe4a9e65fd57f89fbca0a40fc7d74951ab",
   "scenarioSha256": "b31992be2f91bd61fbe1b8a5400da3b7a56753564b0b0b2b38bc5d549812d693",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/b3.json b/mobile/rpc-foundation/goldens/b3.json
index d77019f469b2..19d44634a488 100644
--- a/mobile/rpc-foundation/goldens/b3.json
+++ b/mobile/rpc-foundation/goldens/b3.json
@@ -3,9 +3,9 @@
   "family": "linear-detail-barrier",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d3b7f33d810e1fa420ac41a628cde9fe4a9e65fd57f89fbca0a40fc7d74951ab",
   "scenarioSha256": "130e493fcd7765e037405f59e6cc78a0cc1793b1ae092cad933ff9d5a9df8b7a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/browser-dialog-accepted.json b/mobile/rpc-foundation/goldens/browser-dialog-accepted.json
index 3b085021e6ac..cabb31e6a66c 100644
--- a/mobile/rpc-foundation/goldens/browser-dialog-accepted.json
+++ b/mobile/rpc-foundation/goldens/browser-dialog-accepted.json
@@ -3,9 +3,9 @@
   "family": "browser.dialog",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "95f377bc4d8bf1248cafed26b2e9f425ad37e8d3c99e354bd6a8c67eb9bd9b1b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/browser-dialog-dismissed.json b/mobile/rpc-foundation/goldens/browser-dialog-dismissed.json
index 27a400e170c6..da8036a9aea6 100644
--- a/mobile/rpc-foundation/goldens/browser-dialog-dismissed.json
+++ b/mobile/rpc-foundation/goldens/browser-dialog-dismissed.json
@@ -3,9 +3,9 @@
   "family": "browser.dialog",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "5071188ee492a4ced5be793b2dab32baa9750ee6535128635f274fd79198e2f1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/browser-keyboard-input.json b/mobile/rpc-foundation/goldens/browser-keyboard-input.json
index 911864d9b288..11721f745063 100644
--- a/mobile/rpc-foundation/goldens/browser-keyboard-input.json
+++ b/mobile/rpc-foundation/goldens/browser-keyboard-input.json
@@ -3,9 +3,9 @@
   "family": "browser.keyboard",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "eb2294c30af70ebc2bac092dc5105249ae8cf1941f750406622f7ff6dd70cc1b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/browser-pointer-click-accepted.json b/mobile/rpc-foundation/goldens/browser-pointer-click-accepted.json
index 7ec3c85aa587..bd6c2112a323 100644
--- a/mobile/rpc-foundation/goldens/browser-pointer-click-accepted.json
+++ b/mobile/rpc-foundation/goldens/browser-pointer-click-accepted.json
@@ -3,9 +3,9 @@
   "family": "browser.pointer-click",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "73faa87b359a11959543542016295bb6b36a10934dd99ad5c1a77a4290a608cd",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/browser-pointer-click-fallback.json b/mobile/rpc-foundation/goldens/browser-pointer-click-fallback.json
index 0e166d8fd36a..83476c286725 100644
--- a/mobile/rpc-foundation/goldens/browser-pointer-click-fallback.json
+++ b/mobile/rpc-foundation/goldens/browser-pointer-click-fallback.json
@@ -3,9 +3,9 @@
   "family": "browser.pointer-click",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "34efd4d8568ac15d4e67d475e28194522d6413ad27dce1d6850718af15b3f874",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/browser-wheel-scrolled.json b/mobile/rpc-foundation/goldens/browser-wheel-scrolled.json
index e36ef5c3a9af..94ad174a33ee 100644
--- a/mobile/rpc-foundation/goldens/browser-wheel-scrolled.json
+++ b/mobile/rpc-foundation/goldens/browser-wheel-scrolled.json
@@ -3,9 +3,9 @@
   "family": "browser.wheel",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "e1bc21248ccff45ff217e385a51618b6f5724c037bfbefa03bb76a48dd4d793b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/clipboard-image-attachment-anonymous.json b/mobile/rpc-foundation/goldens/clipboard-image-attachment-anonymous.json
index 8000a20f4312..1f5f6ec7abe0 100644
--- a/mobile/rpc-foundation/goldens/clipboard-image-attachment-anonymous.json
+++ b/mobile/rpc-foundation/goldens/clipboard-image-attachment-anonymous.json
@@ -3,9 +3,9 @@
   "family": "clipboard.image-attachment",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "5411e29436e9faf18a1b81f369082f3ae087a9a96a2e1ea0f97e65e9391bfd0c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/clipboard-image-attachment-blocked-before-send.json b/mobile/rpc-foundation/goldens/clipboard-image-attachment-blocked-before-send.json
index e3c73eb77a9b..577c84ef759e 100644
--- a/mobile/rpc-foundation/goldens/clipboard-image-attachment-blocked-before-send.json
+++ b/mobile/rpc-foundation/goldens/clipboard-image-attachment-blocked-before-send.json
@@ -3,9 +3,9 @@
   "family": "clipboard.image-attachment",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "ea04d03c15d3cb94be7fe111a8a6219c4e0304095679bbae62af623f5b36c9f4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/clipboard-image-attachment-cancelled.json b/mobile/rpc-foundation/goldens/clipboard-image-attachment-cancelled.json
index f3f3de8dadc7..bb828ba1673e 100644
--- a/mobile/rpc-foundation/goldens/clipboard-image-attachment-cancelled.json
+++ b/mobile/rpc-foundation/goldens/clipboard-image-attachment-cancelled.json
@@ -3,9 +3,9 @@
   "family": "clipboard.image-attachment",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "e6be7d5dd6b4f5083627a3ba864b1b040d71bf72b60ad940b7d0d575964a7b80",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/clipboard-image-attachment-pasted.json b/mobile/rpc-foundation/goldens/clipboard-image-attachment-pasted.json
index 8a539481e8ca..b98b684f5eb2 100644
--- a/mobile/rpc-foundation/goldens/clipboard-image-attachment-pasted.json
+++ b/mobile/rpc-foundation/goldens/clipboard-image-attachment-pasted.json
@@ -3,9 +3,9 @@
   "family": "clipboard.image-attachment",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "d6db064741cd68d6ad8a3e490a774d8145adb4a5b7cca8218f5c972b1a31f93b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/clipboard-image-attachment-upload-refused.json b/mobile/rpc-foundation/goldens/clipboard-image-attachment-upload-refused.json
index abe8177ac965..2f800d92b7a3 100644
--- a/mobile/rpc-foundation/goldens/clipboard-image-attachment-upload-refused.json
+++ b/mobile/rpc-foundation/goldens/clipboard-image-attachment-upload-refused.json
@@ -3,9 +3,9 @@
   "family": "clipboard.image-attachment",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "e7f492523421873f045726e15ec95eac26d43f7e971a33fd89ec1a9749492987",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/clipboard-image-upload-aborts-on-chunk-failure.json b/mobile/rpc-foundation/goldens/clipboard-image-upload-aborts-on-chunk-failure.json
index 185592da718e..1a1d3056c2d1 100644
--- a/mobile/rpc-foundation/goldens/clipboard-image-upload-aborts-on-chunk-failure.json
+++ b/mobile/rpc-foundation/goldens/clipboard-image-upload-aborts-on-chunk-failure.json
@@ -3,9 +3,9 @@
   "family": "clipboard.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "195c2f15d81c70012ea88750ab3f84bfe512f7e422f7d2d09fb7919bd9cfd85a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/clipboard-image-upload-chunked.json b/mobile/rpc-foundation/goldens/clipboard-image-upload-chunked.json
index 50a83b43433c..6f0b9baf187e 100644
--- a/mobile/rpc-foundation/goldens/clipboard-image-upload-chunked.json
+++ b/mobile/rpc-foundation/goldens/clipboard-image-upload-chunked.json
@@ -3,9 +3,9 @@
   "family": "clipboard.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "160101326d39705c2036c12646ff6b13d997a1cf91bdc86e5e29279ba31867e4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/clipboard-image-upload-single-frame-fallback.json b/mobile/rpc-foundation/goldens/clipboard-image-upload-single-frame-fallback.json
index 406c82611430..dc1bad47e5c1 100644
--- a/mobile/rpc-foundation/goldens/clipboard-image-upload-single-frame-fallback.json
+++ b/mobile/rpc-foundation/goldens/clipboard-image-upload-single-frame-fallback.json
@@ -3,9 +3,9 @@
   "family": "clipboard.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "89ffa843d08ee27dd44b7bba507ce84661b0df73c35f7a8c273e004604710dc9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/clipboard-image-upload-start-refused.json b/mobile/rpc-foundation/goldens/clipboard-image-upload-start-refused.json
index 50773d4d1851..5f05ac6746a7 100644
--- a/mobile/rpc-foundation/goldens/clipboard-image-upload-start-refused.json
+++ b/mobile/rpc-foundation/goldens/clipboard-image-upload-start-refused.json
@@ -3,9 +3,9 @@
   "family": "clipboard.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "bf0227939c2d41d6a1ebc5b07a31196043e78f1580811bd32ec6fc5f447f5934",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/codex-reset-credit-consumed.json b/mobile/rpc-foundation/goldens/codex-reset-credit-consumed.json
index 2087d205c037..f117d764a10d 100644
--- a/mobile/rpc-foundation/goldens/codex-reset-credit-consumed.json
+++ b/mobile/rpc-foundation/goldens/codex-reset-credit-consumed.json
@@ -3,9 +3,9 @@
   "family": "components.codex-reset-credit",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "76b53dea504a688493843e23e8e7d052fc196f559bb1e2579d0fd38bf3156d0e",
   "scenarioSha256": "00260be9809576607ac91bfacd9fa6cc4f8a190c6b88804c977ea07d36d7162e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/codex-reset-credit-resumed.json b/mobile/rpc-foundation/goldens/codex-reset-credit-resumed.json
index 62e2604f5a10..ba7be42c2308 100644
--- a/mobile/rpc-foundation/goldens/codex-reset-credit-resumed.json
+++ b/mobile/rpc-foundation/goldens/codex-reset-credit-resumed.json
@@ -3,9 +3,9 @@
   "family": "components.codex-reset-credit",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "76b53dea504a688493843e23e8e7d052fc196f559bb1e2579d0fd38bf3156d0e",
   "scenarioSha256": "d85a4031b701e563941afcdd7375cf78a1ee1487a0dab722f8516c2bc8d3dcee",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/components-codex-capability.json b/mobile/rpc-foundation/goldens/components-codex-capability.json
index 6ed0cf0ce3ba..298a0a94eb5e 100644
--- a/mobile/rpc-foundation/goldens/components-codex-capability.json
+++ b/mobile/rpc-foundation/goldens/components-codex-capability.json
@@ -3,9 +3,9 @@
   "family": "components.codex-reset-capability",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "88570b9d2376863c7f88d7ed8c745a5fb771deddbc7409f8944fa861dd4bdce9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/components-setup-ask.json b/mobile/rpc-foundation/goldens/components-setup-ask.json
index 0dab47c35b34..583273d6181a 100644
--- a/mobile/rpc-foundation/goldens/components-setup-ask.json
+++ b/mobile/rpc-foundation/goldens/components-setup-ask.json
@@ -3,9 +3,9 @@
   "family": "components.setup-script",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "d4052f119c7ed68dc922c8beeb0074701f1532b10e48e284fb71aa165a17e437",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/components-target-local.json b/mobile/rpc-foundation/goldens/components-target-local.json
index a574bee7e017..cb200b89d4da 100644
--- a/mobile/rpc-foundation/goldens/components-target-local.json
+++ b/mobile/rpc-foundation/goldens/components-target-local.json
@@ -3,9 +3,9 @@
   "family": "components.execution-target-local",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "2e0d3021621698b63117e250dd5e9762b5bfb3dc1911e27c510e9539bd2ee6c9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/components-target-ssh.json b/mobile/rpc-foundation/goldens/components-target-ssh.json
index 41434d3a54e6..b76ff7756771 100644
--- a/mobile/rpc-foundation/goldens/components-target-ssh.json
+++ b/mobile/rpc-foundation/goldens/components-target-ssh.json
@@ -3,9 +3,9 @@
   "family": "components.execution-target",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "82b891c7a7a2f255e2d22a372ee6112c9cc1f650259244e87f2e8c1356e97e5f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/diff-review-branch-compare.json b/mobile/rpc-foundation/goldens/diff-review-branch-compare.json
index 33e8b9d253ef..82b54bda98ec 100644
--- a/mobile/rpc-foundation/goldens/diff-review-branch-compare.json
+++ b/mobile/rpc-foundation/goldens/diff-review-branch-compare.json
@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "b7579013e65f0f5fe503c10cf2294cb9d4ac1938108275de001db6e02cf2cc21",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/diff-review-branch-file-diff.json b/mobile/rpc-foundation/goldens/diff-review-branch-file-diff.json
index 9821aa8a0a29..fe7dd7a58b50 100644
--- a/mobile/rpc-foundation/goldens/diff-review-branch-file-diff.json
+++ b/mobile/rpc-foundation/goldens/diff-review-branch-file-diff.json
@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "6c71b0f217a464dffbc6f5736605b840edac74ebaf0664edc0ab85984bb64328",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/diff-review-notes-refused-before-compare.json b/mobile/rpc-foundation/goldens/diff-review-notes-refused-before-compare.json
index 548df57a3a9f..5bf8483bd592 100644
--- a/mobile/rpc-foundation/goldens/diff-review-notes-refused-before-compare.json
+++ b/mobile/rpc-foundation/goldens/diff-review-notes-refused-before-compare.json
@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "3e7fa054f77587b9ac24b6732a9926273b0f2ff35a266e633d0ccd1dada932cc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/diff-review-refused-file-diff.json b/mobile/rpc-foundation/goldens/diff-review-refused-file-diff.json
index 212069d49f0d..da678dc98e2b 100644
--- a/mobile/rpc-foundation/goldens/diff-review-refused-file-diff.json
+++ b/mobile/rpc-foundation/goldens/diff-review-refused-file-diff.json
@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "d1b04fe2945a2799ac8465d8fd9e45ab790ae29b401a0cf4fef68ebc5fa3cc76",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/diff-review-snapshot.json b/mobile/rpc-foundation/goldens/diff-review-snapshot.json
index 9d14ced994ce..ad6442801d5f 100644
--- a/mobile/rpc-foundation/goldens/diff-review-snapshot.json
+++ b/mobile/rpc-foundation/goldens/diff-review-snapshot.json
@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "fa0a81462196458fdded5b7c00aa4e73975c2111afdd8dac115871490a481da2",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/diff-review-status-unavailable.json b/mobile/rpc-foundation/goldens/diff-review-status-unavailable.json
index 42d57fbc5e22..7eca0de25a85 100644
--- a/mobile/rpc-foundation/goldens/diff-review-status-unavailable.json
+++ b/mobile/rpc-foundation/goldens/diff-review-status-unavailable.json
@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "182f37fbe6ae7c0694b50d603ecd4a03bc9a8c7c9738ebb775b47eb5f3b9660f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/diff-review-worktree-file-diff.json b/mobile/rpc-foundation/goldens/diff-review-worktree-file-diff.json
index a1e265ed43e2..5202ad864476 100644
--- a/mobile/rpc-foundation/goldens/diff-review-worktree-file-diff.json
+++ b/mobile/rpc-foundation/goldens/diff-review-worktree-file-diff.json
@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "538b68485a2268d311fcc7e13ff1a3e446ba4aa010bc18633af8e938a6688257",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/file-tap-open-refused.json b/mobile/rpc-foundation/goldens/file-tap-open-refused.json
index 3904f8e8cc5e..78516f75ee76 100644
--- a/mobile/rpc-foundation/goldens/file-tap-open-refused.json
+++ b/mobile/rpc-foundation/goldens/file-tap-open-refused.json
@@ -3,9 +3,9 @@
   "family": "files.terminal-path-tap",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e20a76ecd5e820dc4797fb25307810af68b5ced996dba2b9599464a21b5cbe1b",
   "scenarioSha256": "a927e85c3ae58cd3b017955fe28aeffec6a5471b51d782f116639a3aaf4af77d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/file-tap-opens-worktree-file.json b/mobile/rpc-foundation/goldens/file-tap-opens-worktree-file.json
index 7a92f652958c..a50d9ea8e1a5 100644
--- a/mobile/rpc-foundation/goldens/file-tap-opens-worktree-file.json
+++ b/mobile/rpc-foundation/goldens/file-tap-opens-worktree-file.json
@@ -3,9 +3,9 @@
   "family": "files.terminal-path-tap",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e20a76ecd5e820dc4797fb25307810af68b5ced996dba2b9599464a21b5cbe1b",
   "scenarioSha256": "297ea4075333e178ca20247eb0abf6600efb44fe2b33f5142d1c1cabffb5a2d3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/file-tap-previews-absolute-artifact.json b/mobile/rpc-foundation/goldens/file-tap-previews-absolute-artifact.json
index 87e8d693c10c..564f53ff194a 100644
--- a/mobile/rpc-foundation/goldens/file-tap-previews-absolute-artifact.json
+++ b/mobile/rpc-foundation/goldens/file-tap-previews-absolute-artifact.json
@@ -3,9 +3,9 @@
   "family": "files.terminal-path-tap",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e20a76ecd5e820dc4797fb25307810af68b5ced996dba2b9599464a21b5cbe1b",
   "scenarioSha256": "f1844c2608ce90250fddfc78c0b35bb1bf3647598a5ab2914eca0d8cb4403a38",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/file-tap-resolve-miss.json b/mobile/rpc-foundation/goldens/file-tap-resolve-miss.json
index b44c75809abf..012d31f7fc74 100644
--- a/mobile/rpc-foundation/goldens/file-tap-resolve-miss.json
+++ b/mobile/rpc-foundation/goldens/file-tap-resolve-miss.json
@@ -3,9 +3,9 @@
   "family": "files.terminal-path-tap",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e20a76ecd5e820dc4797fb25307810af68b5ced996dba2b9599464a21b5cbe1b",
   "scenarioSha256": "0f76b96408081737b3d630ee837dbb80bcce6670b6acc4f1f7c033a69bd40533",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/file-tap-resolve-refused.json b/mobile/rpc-foundation/goldens/file-tap-resolve-refused.json
index 066eca7441ec..8213f3e49611 100644
--- a/mobile/rpc-foundation/goldens/file-tap-resolve-refused.json
+++ b/mobile/rpc-foundation/goldens/file-tap-resolve-refused.json
@@ -3,9 +3,9 @@
   "family": "files.terminal-path-tap",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e20a76ecd5e820dc4797fb25307810af68b5ced996dba2b9599464a21b5cbe1b",
   "scenarioSha256": "1ada35966dfb65afbb9b3dc8139961b8f042e2d53241b9608a080d0e655a5987",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-explorer-legacy-fallback.json b/mobile/rpc-foundation/goldens/files-explorer-legacy-fallback.json
index 4a2636bec74f..b8c88b89a288 100644
--- a/mobile/rpc-foundation/goldens/files-explorer-legacy-fallback.json
+++ b/mobile/rpc-foundation/goldens/files-explorer-legacy-fallback.json
@@ -3,9 +3,9 @@
   "family": "files.explorer-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "7a42a348f4407b94cf75ac77a4b6b783b7d28103b1ae1d111d2708dab0dd4a0c",
   "scenarioSha256": "ec02d3f76085619fad35231e12654ec6e926e423c6799fd0df53708743000612",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-explorer-readdir.json b/mobile/rpc-foundation/goldens/files-explorer-readdir.json
index 907f3c129cf1..fb6bd93a03dd 100644
--- a/mobile/rpc-foundation/goldens/files-explorer-readdir.json
+++ b/mobile/rpc-foundation/goldens/files-explorer-readdir.json
@@ -3,9 +3,9 @@
   "family": "files.explorer-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "7a42a348f4407b94cf75ac77a4b6b783b7d28103b1ae1d111d2708dab0dd4a0c",
   "scenarioSha256": "0b87a230cf1c4219e415c840a088502c8bda7cd2fb525bde1a83a5903d6fd96b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-ownership-local.json b/mobile/rpc-foundation/goldens/files-ownership-local.json
index 0230f5ca9948..6da2e1bc8328 100644
--- a/mobile/rpc-foundation/goldens/files-ownership-local.json
+++ b/mobile/rpc-foundation/goldens/files-ownership-local.json
@@ -3,9 +3,9 @@
   "family": "files.mutation-ownership",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "8d24f52eb4194c3bc5d9f0dcabade6d7a09c066f79f911657647ed21dbecb3b1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-ownership-ssh.json b/mobile/rpc-foundation/goldens/files-ownership-ssh.json
index 8e064f13c2fd..94bd352a7642 100644
--- a/mobile/rpc-foundation/goldens/files-ownership-ssh.json
+++ b/mobile/rpc-foundation/goldens/files-ownership-ssh.json
@@ -3,9 +3,9 @@
   "family": "files.mutation-ownership",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "4cd0be3a1c338b4b68211c717fd10738653c553fdb3b072db6706ff8175a8bd1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-preview-artifact-direct.json b/mobile/rpc-foundation/goldens/files-preview-artifact-direct.json
index 8365b4dca5a2..ab8ac02d2a6d 100644
--- a/mobile/rpc-foundation/goldens/files-preview-artifact-direct.json
+++ b/mobile/rpc-foundation/goldens/files-preview-artifact-direct.json
@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "dd8b7a0916a84c7d763a163759c02210ae99f8fbccfccaa98796b8610c5da97c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-preview-artifact-image-read.json b/mobile/rpc-foundation/goldens/files-preview-artifact-image-read.json
index e6b9a2840293..4a232dcf21ec 100644
--- a/mobile/rpc-foundation/goldens/files-preview-artifact-image-read.json
+++ b/mobile/rpc-foundation/goldens/files-preview-artifact-image-read.json
@@ -3,9 +3,9 @@
   "family": "files.preview-artifact-image",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "39fe4bce80a2323dbc276235daab48e7fe55d1fdb9c1ea1eeac7c17bceb8df18",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-preview-artifact-image.json b/mobile/rpc-foundation/goldens/files-preview-artifact-image.json
index 9e7774c18cda..50f04a169e73 100644
--- a/mobile/rpc-foundation/goldens/files-preview-artifact-image.json
+++ b/mobile/rpc-foundation/goldens/files-preview-artifact-image.json
@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "d15c1f4e0f95b5c49a8f889d2d37458225293d7306c8439690d972d2df4c29c0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-preview-grant-refresh.json b/mobile/rpc-foundation/goldens/files-preview-grant-refresh.json
index 6d87ede4381a..501314f88088 100644
--- a/mobile/rpc-foundation/goldens/files-preview-grant-refresh.json
+++ b/mobile/rpc-foundation/goldens/files-preview-grant-refresh.json
@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "055f3b45442c1736f10ee98c493e2ece1885fdb68d925ee627e2ba20853537e0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-preview-worktree-image-read.json b/mobile/rpc-foundation/goldens/files-preview-worktree-image-read.json
index 88454ffd21ea..797e0f5c7bd5 100644
--- a/mobile/rpc-foundation/goldens/files-preview-worktree-image-read.json
+++ b/mobile/rpc-foundation/goldens/files-preview-worktree-image-read.json
@@ -3,9 +3,9 @@
   "family": "files.preview-worktree-image",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "767af05bb58756f4adc960b95ee6547cc28145c7f6c7c6a4b27582aed9741e37",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-preview-worktree-image.json b/mobile/rpc-foundation/goldens/files-preview-worktree-image.json
index b1ea27f78b30..3202b46f6d50 100644
--- a/mobile/rpc-foundation/goldens/files-preview-worktree-image.json
+++ b/mobile/rpc-foundation/goldens/files-preview-worktree-image.json
@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "0ffaffb472b663e08a42317d799a2a000211dda5b127fb21cc64f04f73800130",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-preview-worktree-text-read.json b/mobile/rpc-foundation/goldens/files-preview-worktree-text-read.json
index 9ecf6bf32a6b..b67eb6d59cca 100644
--- a/mobile/rpc-foundation/goldens/files-preview-worktree-text-read.json
+++ b/mobile/rpc-foundation/goldens/files-preview-worktree-text-read.json
@@ -3,9 +3,9 @@
   "family": "files.preview-worktree-text",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "21c3c61a18939873157f74c8d2d28bceae01abc702565af1ca897ab7304cb93c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-preview-worktree.json b/mobile/rpc-foundation/goldens/files-preview-worktree.json
index e3eba1df83e7..933942cfdb3f 100644
--- a/mobile/rpc-foundation/goldens/files-preview-worktree.json
+++ b/mobile/rpc-foundation/goldens/files-preview-worktree.json
@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "bcba4a7d9d929078c5ed80fc7e1acd45859d0b4c559767a919b0396dc6a70a3e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-save-blind.json b/mobile/rpc-foundation/goldens/files-save-blind.json
index 7fbaec502c98..7dc10c03d1bf 100644
--- a/mobile/rpc-foundation/goldens/files-save-blind.json
+++ b/mobile/rpc-foundation/goldens/files-save-blind.json
@@ -3,9 +3,9 @@
   "family": "files.preview-save",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "8b5c3e87d989966d7b252f19a537040cd5078ba9355a824e7e49af3424390a3e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-save-verified.json b/mobile/rpc-foundation/goldens/files-save-verified.json
index dabd9d051cea..12bb53d22b7d 100644
--- a/mobile/rpc-foundation/goldens/files-save-verified.json
+++ b/mobile/rpc-foundation/goldens/files-save-verified.json
@@ -3,9 +3,9 @@
   "family": "files.preview-save",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "6e124d16173074d851d58593b20b25889ed13a3d8021c08fbed53b85a7d3196e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/files-tab-doc-shapes.json b/mobile/rpc-foundation/goldens/files-tab-doc-shapes.json
index a7bd4e6fadf0..0658bd727128 100644
--- a/mobile/rpc-foundation/goldens/files-tab-doc-shapes.json
+++ b/mobile/rpc-foundation/goldens/files-tab-doc-shapes.json
@@ -3,9 +3,9 @@
   "family": "files.tab-doc",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "b636221f719dae19a3af6772b687b0bcb300c9910645d23e98c309578ec1c5c5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/home-host-accounts.json b/mobile/rpc-foundation/goldens/home-host-accounts.json
index 3e99ce4585f2..e702147addff 100644
--- a/mobile/rpc-foundation/goldens/home-host-accounts.json
+++ b/mobile/rpc-foundation/goldens/home-host-accounts.json
@@ -3,9 +3,9 @@
   "family": "home.host-accounts",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c632fdbc4b730777ecb09f08bec14cca0586042b01ed99d40d0228806c7def4a",
   "scenarioSha256": "366426641e25542fcc6fcd351ece6a1ee897c8b3974c08eb7557eadfa4d3b06f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/home-host-stats.json b/mobile/rpc-foundation/goldens/home-host-stats.json
index 9536ef313025..8cf4e0187da5 100644
--- a/mobile/rpc-foundation/goldens/home-host-stats.json
+++ b/mobile/rpc-foundation/goldens/home-host-stats.json
@@ -3,9 +3,9 @@
   "family": "home.host-stats",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a9e0780298a1443664e7ae02056168aa34d67556c9c056d51a82c7b4a73ad35b",
   "scenarioSha256": "bd5f4e5f24a29d96c4c98950691c6571918332f71ebb1f29ee97a9abc857ac29",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/host-view-settings-sync.json b/mobile/rpc-foundation/goldens/host-view-settings-sync.json
index ba33a04e3f03..adadbb818038 100644
--- a/mobile/rpc-foundation/goldens/host-view-settings-sync.json
+++ b/mobile/rpc-foundation/goldens/host-view-settings-sync.json
@@ -3,9 +3,9 @@
   "family": "host.view-settings",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a9e0780298a1443664e7ae02056168aa34d67556c9c056d51a82c7b4a73ad35b",
   "scenarioSha256": "1ee6031227fa3efd5b36841afa60f7b2264eacdd9c6126e5851d5acb39ffaadd",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/host-worktree-actions-pin-open-delete.json b/mobile/rpc-foundation/goldens/host-worktree-actions-pin-open-delete.json
index 52012746a348..f1de161f46ae 100644
--- a/mobile/rpc-foundation/goldens/host-worktree-actions-pin-open-delete.json
+++ b/mobile/rpc-foundation/goldens/host-worktree-actions-pin-open-delete.json
@@ -3,9 +3,9 @@
   "family": "host.worktree-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "92c29bd78ca0c0d5917e9386fc447bb9a1698b1d1ffaba0db7546eaac60da639",
   "scenarioSha256": "720add498c79425ca8efc9764fd5d8307fe33bc891842604cfc899f770b79811",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/host-worktree-delete-refused.json b/mobile/rpc-foundation/goldens/host-worktree-delete-refused.json
index 6a22a0024fdb..ca8bb14a5df9 100644
--- a/mobile/rpc-foundation/goldens/host-worktree-delete-refused.json
+++ b/mobile/rpc-foundation/goldens/host-worktree-delete-refused.json
@@ -3,9 +3,9 @@
   "family": "host.worktree-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "92c29bd78ca0c0d5917e9386fc447bb9a1698b1d1ffaba0db7546eaac60da639",
   "scenarioSha256": "5dd5e7eabaabba1e471b13958f59891c3b28f553087c96315598c83a14ded7e7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/host-worktree-refresh-stream.json b/mobile/rpc-foundation/goldens/host-worktree-refresh-stream.json
index 20aa2ac4f55d..b8ac4ff58b0a 100644
--- a/mobile/rpc-foundation/goldens/host-worktree-refresh-stream.json
+++ b/mobile/rpc-foundation/goldens/host-worktree-refresh-stream.json
@@ -3,9 +3,9 @@
   "family": "host-worktree-refresh",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "6ac11f1ab42fea3b718d9714e512a4e8a344aea66ae170fbe9ef2b5ae82dbe0a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/interruptions-inventory-lifecycle.json b/mobile/rpc-foundation/goldens/interruptions-inventory-lifecycle.json
index 800bcbba6bc4..dabe2fc5872d 100644
--- a/mobile/rpc-foundation/goldens/interruptions-inventory-lifecycle.json
+++ b/mobile/rpc-foundation/goldens/interruptions-inventory-lifecycle.json
@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "d6c57a5153d915f0a0c0fd9e305cac70b41b7eb8be226fc865227ebf1821e5d1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/interruptions-settings-bot-overrides-fulfilled.json b/mobile/rpc-foundation/goldens/interruptions-settings-bot-overrides-fulfilled.json
index c8df79bebe8f..100f21460dd7 100644
--- a/mobile/rpc-foundation/goldens/interruptions-settings-bot-overrides-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/interruptions-settings-bot-overrides-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.bot-overrides",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "2d5c6dea28aa1a7bb9e4aa14a4c8441527d9ad401ad30161f05ea1f8da836bb2",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/inventory-lifecycle.json b/mobile/rpc-foundation/goldens/inventory-lifecycle.json
index caf48e152f07..63331d4bc2cd 100644
--- a/mobile/rpc-foundation/goldens/inventory-lifecycle.json
+++ b/mobile/rpc-foundation/goldens/inventory-lifecycle.json
@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "3471f5bcd6923c7b8ba3a737bb45b5239689deb78c00e85a828f38a6d6d68a05",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/inventory-repeat-query.json b/mobile/rpc-foundation/goldens/inventory-repeat-query.json
index e5d957adf6fd..133dd37378ef 100644
--- a/mobile/rpc-foundation/goldens/inventory-repeat-query.json
+++ b/mobile/rpc-foundation/goldens/inventory-repeat-query.json
@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "73a468d5c7a51c2dbb7af2642f0050d05d861fce29295460c48d7c51f86bf57f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/lifecycle-b3.json b/mobile/rpc-foundation/goldens/lifecycle-b3.json
index 296af5ce16fe..7e2a3ff2dde2 100644
--- a/mobile/rpc-foundation/goldens/lifecycle-b3.json
+++ b/mobile/rpc-foundation/goldens/lifecycle-b3.json
@@ -3,9 +3,9 @@
   "family": "linear-detail-barrier",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d3b7f33d810e1fa420ac41a628cde9fe4a9e65fd57f89fbca0a40fc7d74951ab",
   "scenarioSha256": "8be12d116865d27e8dfd37921d2c723d63da101ec1197b1f5b2d9510838e1943",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/lifecycle-inventory-lifecycle.json b/mobile/rpc-foundation/goldens/lifecycle-inventory-lifecycle.json
index fb4421ba4a7a..28cd115186d5 100644
--- a/mobile/rpc-foundation/goldens/lifecycle-inventory-lifecycle.json
+++ b/mobile/rpc-foundation/goldens/lifecycle-inventory-lifecycle.json
@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "46bbafcc57fe2e3aee41a14bc26a0375b7b56e58030705fe4c28841a272b2560",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/lifecycle-settings-bot-overrides-fulfilled.json b/mobile/rpc-foundation/goldens/lifecycle-settings-bot-overrides-fulfilled.json
index 1da7dce7b47c..7ee44f37fc47 100644
--- a/mobile/rpc-foundation/goldens/lifecycle-settings-bot-overrides-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/lifecycle-settings-bot-overrides-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.bot-overrides",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "eb80283956c93849778f23cbabf1dbf83b72744197af4f6f50335b2fc1590d87",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/lifecycle-settings-task-hydration-fulfilled.json b/mobile/rpc-foundation/goldens/lifecycle-settings-task-hydration-fulfilled.json
index 8cf67cfabc14..9c5f08c680e0 100644
--- a/mobile/rpc-foundation/goldens/lifecycle-settings-task-hydration-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/lifecycle-settings-task-hydration-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.task-hydration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "3a8eab831602443d320ca0aa0f35dc269d8d511e76bdae8fd025c433561d068d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/lifecycle-settings-workspace-context-fulfilled.json b/mobile/rpc-foundation/goldens/lifecycle-settings-workspace-context-fulfilled.json
index 964e1076f9d7..c72a6b5d8243 100644
--- a/mobile/rpc-foundation/goldens/lifecycle-settings-workspace-context-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/lifecycle-settings-workspace-context-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-context",
   "namedDeltas": ["new-workspace-runtime-context-null-results-degrade-to-absent"],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "136fb1d8d5925ad12ba22f4dd6c72573a9ad03b6a6ec8308668f0d9cd71aa36d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/linear-select-workspace.json b/mobile/rpc-foundation/goldens/linear-select-workspace.json
index 349e0a147cd3..cfe5c67870f2 100644
--- a/mobile/rpc-foundation/goldens/linear-select-workspace.json
+++ b/mobile/rpc-foundation/goldens/linear-select-workspace.json
@@ -3,9 +3,9 @@
   "family": "linear.select-workspace-picker",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b65996c152b632d553a31e07e31ea5c76f998eada42cf0966923d730da21908f",
   "scenarioSha256": "b6eb40d9a91c89179483afec93fbc121b99ef679d3b2433575b26694d0c577d5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/live-worktree-name-stream.json b/mobile/rpc-foundation/goldens/live-worktree-name-stream.json
index 3c57220eb321..db71c42b7105 100644
--- a/mobile/rpc-foundation/goldens/live-worktree-name-stream.json
+++ b/mobile/rpc-foundation/goldens/live-worktree-name-stream.json
@@ -3,9 +3,9 @@
   "family": "live-worktree-name",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "056abf42b34537025fed30a4401bd465c93bc21558babb826f21b5c803b487eb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-agentsession.structured-create-agentsession.create-1.json b/mobile/rpc-foundation/goldens/matrix-agentsession.structured-create-agentsession.create-1.json
index f704c4b9a5ca..8d205778875d 100644
--- a/mobile/rpc-foundation/goldens/matrix-agentsession.structured-create-agentsession.create-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-agentsession.structured-create-agentsession.create-1.json
@@ -3,9 +3,9 @@
   "family": "agentSession.structured-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d340697a64a198066b1037a550afb9a0de7507246a545901d2fc0a23407f38d6",
   "scenarioSha256": "81ed7c1a4276cf1d891334c64c06362b88b5f9690b3ebae6d0988559b1faab0f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-agentsession.structured-create-agentsession.createsupport-1.json b/mobile/rpc-foundation/goldens/matrix-agentsession.structured-create-agentsession.createsupport-1.json
index 234c2446e746..791ede81d7d9 100644
--- a/mobile/rpc-foundation/goldens/matrix-agentsession.structured-create-agentsession.createsupport-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-agentsession.structured-create-agentsession.createsupport-1.json
@@ -3,9 +3,9 @@
   "family": "agentSession.structured-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d340697a64a198066b1037a550afb9a0de7507246a545901d2fc0a23407f38d6",
   "scenarioSha256": "eed54b1c4c77eec4b411d8daa197b20c8cfb4b86ac2d01f1d7ee2de23c27dff8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-agentsession.structured-launch-agentsession.createsupport-1.json b/mobile/rpc-foundation/goldens/matrix-agentsession.structured-launch-agentsession.createsupport-1.json
index e04d08c9c59e..fe99a2b28143 100644
--- a/mobile/rpc-foundation/goldens/matrix-agentsession.structured-launch-agentsession.createsupport-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-agentsession.structured-launch-agentsession.createsupport-1.json
@@ -3,9 +3,9 @@
   "family": "agentSession.structured-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d340697a64a198066b1037a550afb9a0de7507246a545901d2fc0a23407f38d6",
   "scenarioSha256": "211e3780edc0ff5fa0529c0de0e8bc2fd746a19c8a6b4e49900f6c4e56d53f7c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-aivault.history-aivault.listsessions-1.json b/mobile/rpc-foundation/goldens/matrix-aivault.history-aivault.listsessions-1.json
index 2223a62abe78..68b76baf7984 100644
--- a/mobile/rpc-foundation/goldens/matrix-aivault.history-aivault.listsessions-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-aivault.history-aivault.listsessions-1.json
@@ -3,9 +3,9 @@
   "family": "aiVault.history",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "ec16931c5431d3dbb05729d4670c381a434bff71648d334b7b5224db188fdccb",
   "scenarioSha256": "efb8d1cd2a2ff0ade4cdc48a1aacec565e33b405bbe95c100b86534cdde49740",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-aivault.history-screen-platform-status.json b/mobile/rpc-foundation/goldens/matrix-aivault.history-screen-platform-status.json
index a4c79a7d42ab..3d60a85ab045 100644
--- a/mobile/rpc-foundation/goldens/matrix-aivault.history-screen-platform-status.json
+++ b/mobile/rpc-foundation/goldens/matrix-aivault.history-screen-platform-status.json
@@ -3,9 +3,9 @@
   "family": "aiVault.history-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c78ab47eea594b7e1988403321ff9ba135ca60c513bb9d5848bdde26c0ffe3c3",
   "scenarioSha256": "30e00c0d94413aab61b164fb9a658e526448addc4c42fd8892b1c28335d30beb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-aivault.history-screen-status.get-2.json b/mobile/rpc-foundation/goldens/matrix-aivault.history-screen-status.get-2.json
index 07b4d69c4e72..2fc02ff18614 100644
--- a/mobile/rpc-foundation/goldens/matrix-aivault.history-screen-status.get-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-aivault.history-screen-status.get-2.json
@@ -3,9 +3,9 @@
   "family": "aiVault.history-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c78ab47eea594b7e1988403321ff9ba135ca60c513bb9d5848bdde26c0ffe3c3",
   "scenarioSha256": "b146be741484f2a6dca25e97f52b9ed10f8a2b28bd00e6b56acffbcd82136b2f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-aivault.history-screen-worktree.ps-1.json b/mobile/rpc-foundation/goldens/matrix-aivault.history-screen-worktree.ps-1.json
index ceed0f10e4cb..4f9bbfc16b7d 100644
--- a/mobile/rpc-foundation/goldens/matrix-aivault.history-screen-worktree.ps-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-aivault.history-screen-worktree.ps-1.json
@@ -3,9 +3,9 @@
   "family": "aiVault.history-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c78ab47eea594b7e1988403321ff9ba135ca60c513bb9d5848bdde26c0ffe3c3",
   "scenarioSha256": "5365449c24d789c6c01604b520b795502d0bec352032686efecd121fc4497f96",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-aivault.history-status.get-1.json b/mobile/rpc-foundation/goldens/matrix-aivault.history-status.get-1.json
index 798aa45a1e33..5530b93969e4 100644
--- a/mobile/rpc-foundation/goldens/matrix-aivault.history-status.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-aivault.history-status.get-1.json
@@ -3,9 +3,9 @@
   "family": "aiVault.history",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "ec16931c5431d3dbb05729d4670c381a434bff71648d334b7b5224db188fdccb",
   "scenarioSha256": "a5698ca720dad08561a509c9c18f7586611fc68c58bd86791f4fcefc7915ab1f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-aivault.resume-launch-session.tabs.createterminal-1.json b/mobile/rpc-foundation/goldens/matrix-aivault.resume-launch-session.tabs.createterminal-1.json
index 5636e0c39323..175556b1b0c3 100644
--- a/mobile/rpc-foundation/goldens/matrix-aivault.resume-launch-session.tabs.createterminal-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-aivault.resume-launch-session.tabs.createterminal-1.json
@@ -3,9 +3,9 @@
   "family": "aiVault.resume-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "f721ab4438c4183927ce5ebc5fd6f1f18414701a5fa3b2807c359785829962a3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-aivault.resume-launch-terminal.send-1.json b/mobile/rpc-foundation/goldens/matrix-aivault.resume-launch-terminal.send-1.json
index 3d013131d86d..241e0f99409e 100644
--- a/mobile/rpc-foundation/goldens/matrix-aivault.resume-launch-terminal.send-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-aivault.resume-launch-terminal.send-1.json
@@ -3,9 +3,9 @@
   "family": "aiVault.resume-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "aa812132ede83e4aced73a644e996df82a38bfc70ead70a5db2e9af8a8b1bfff",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-aivault.resume-preparation-aivault.preparesessionresume-1.json b/mobile/rpc-foundation/goldens/matrix-aivault.resume-preparation-aivault.preparesessionresume-1.json
index f363314cf987..74f84d2526f8 100644
--- a/mobile/rpc-foundation/goldens/matrix-aivault.resume-preparation-aivault.preparesessionresume-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-aivault.resume-preparation-aivault.preparesessionresume-1.json
@@ -3,9 +3,9 @@
   "family": "aiVault.resume-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "c3b400967b0b1c7bd3f82a278f4b10855ade72d384922ec4d34795c7bb20084d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-browser.dialog-browser.dialogaccept-1.json b/mobile/rpc-foundation/goldens/matrix-browser.dialog-browser.dialogaccept-1.json
index 0f33f4487eeb..6da9cceba8bb 100644
--- a/mobile/rpc-foundation/goldens/matrix-browser.dialog-browser.dialogaccept-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-browser.dialog-browser.dialogaccept-1.json
@@ -3,9 +3,9 @@
   "family": "browser.dialog",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "9cae732e4227d4c2fe874a5fb2e104552c16cbc91b59523de8fd46454660cde8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-browser.keyboard-browser.keyboardinserttext-1.json b/mobile/rpc-foundation/goldens/matrix-browser.keyboard-browser.keyboardinserttext-1.json
index 8ff5cda72257..d943a202d3f8 100644
--- a/mobile/rpc-foundation/goldens/matrix-browser.keyboard-browser.keyboardinserttext-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-browser.keyboard-browser.keyboardinserttext-1.json
@@ -3,9 +3,9 @@
   "family": "browser.keyboard",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "fc3411f3f4cb58b6a1338ea943f59446fda7819931814e9ab002e35e2de42462",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-browser.keyboard-browser.keypress-1.json b/mobile/rpc-foundation/goldens/matrix-browser.keyboard-browser.keypress-1.json
index 4e43e82fae6d..1311ac786595 100644
--- a/mobile/rpc-foundation/goldens/matrix-browser.keyboard-browser.keypress-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-browser.keyboard-browser.keypress-1.json
@@ -3,9 +3,9 @@
   "family": "browser.keyboard",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "c1df871e84d4399e9a447caaff244241933c0dfc7c3d5e114d022e54b0ed7ed4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mouseclick-1.json b/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mouseclick-1.json
index ed66f9e666de..2b425803af09 100644
--- a/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mouseclick-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mouseclick-1.json
@@ -3,9 +3,9 @@
   "family": "browser.pointer-click",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "91a1ef5e07178585f583dd1609543c3bfb0c71d13eb4ce1eedab3acc2635f0da",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mousedown-1.json b/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mousedown-1.json
index 6ef9b1ad0216..f4219c2aeb63 100644
--- a/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mousedown-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mousedown-1.json
@@ -3,9 +3,9 @@
   "family": "browser.pointer-click",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "a302565f0172a763bfb0865389849703d3ceb52d848e1bc40f2204ce7f97bbef",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mousemove-1.json b/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mousemove-1.json
index 73e49ca5130a..1e2c03760f25 100644
--- a/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mousemove-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mousemove-1.json
@@ -3,9 +3,9 @@
   "family": "browser.pointer-click",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "33cb8faa9c8b50945a2d8275140c65f483b8023c890a5a16165a759f0a59baad",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mouseup-1.json b/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mouseup-1.json
index 67b8b1544f06..43bed4caabf6 100644
--- a/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mouseup-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-browser.pointer-click-browser.mouseup-1.json
@@ -3,9 +3,9 @@
   "family": "browser.pointer-click",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "96c4862084d7ba2a8e07047abcee1716220ba35d9c754bcb97f7227020976c95",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-browser.wheel-browser.mousemove-1.json b/mobile/rpc-foundation/goldens/matrix-browser.wheel-browser.mousemove-1.json
index 7519d6ab85eb..ca312d82abb9 100644
--- a/mobile/rpc-foundation/goldens/matrix-browser.wheel-browser.mousemove-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-browser.wheel-browser.mousemove-1.json
@@ -3,9 +3,9 @@
   "family": "browser.wheel",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "c1283bbfb340e968bbd4c86ac63489995d6191290751316228d27779dc6a2c55",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-browser.wheel-browser.mousewheel-1.json b/mobile/rpc-foundation/goldens/matrix-browser.wheel-browser.mousewheel-1.json
index b591945f11ce..8ee48dd1fd30 100644
--- a/mobile/rpc-foundation/goldens/matrix-browser.wheel-browser.mousewheel-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-browser.wheel-browser.mousewheel-1.json
@@ -3,9 +3,9 @@
   "family": "browser.wheel",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "092777c9ce457dcae95eafbe083c70510580569ac74e31c0d4224ac94b9fad76",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-clipboard.image-attachment-clipboard.startimageupload-1.json b/mobile/rpc-foundation/goldens/matrix-clipboard.image-attachment-clipboard.startimageupload-1.json
index b1cbf36a8e51..99d3eb126993 100644
--- a/mobile/rpc-foundation/goldens/matrix-clipboard.image-attachment-clipboard.startimageupload-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-clipboard.image-attachment-clipboard.startimageupload-1.json
@@ -3,9 +3,9 @@
   "family": "clipboard.image-attachment",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "fc690a2ac59a6fbcdc08f9b91e769cd793f5a48d9034a50c2d587ce0d0fca3d9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-clipboard.image-upload-clipboard.saveimageastempfile-1.json b/mobile/rpc-foundation/goldens/matrix-clipboard.image-upload-clipboard.saveimageastempfile-1.json
index a0e05833af07..ddda539bc4c6 100644
--- a/mobile/rpc-foundation/goldens/matrix-clipboard.image-upload-clipboard.saveimageastempfile-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-clipboard.image-upload-clipboard.saveimageastempfile-1.json
@@ -3,9 +3,9 @@
   "family": "clipboard.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "fa69748b6d0e29abc37757b48bcb22dac07af1686554200ceaf18b4e3d62e4ac",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-clipboard.image-upload-clipboard.startimageupload-1.json b/mobile/rpc-foundation/goldens/matrix-clipboard.image-upload-clipboard.startimageupload-1.json
index c8a10d86c6bc..f464ff8ef8e6 100644
--- a/mobile/rpc-foundation/goldens/matrix-clipboard.image-upload-clipboard.startimageupload-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-clipboard.image-upload-clipboard.startimageupload-1.json
@@ -3,9 +3,9 @@
   "family": "clipboard.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "a4bea606723da4d4a86db6e04c46266801149a852a8861b15e637d5c0855c679",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-components.codex-reset-capability-status.get-1.json b/mobile/rpc-foundation/goldens/matrix-components.codex-reset-capability-status.get-1.json
index 06ca23187322..9879f9282a39 100644
--- a/mobile/rpc-foundation/goldens/matrix-components.codex-reset-capability-status.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-components.codex-reset-capability-status.get-1.json
@@ -3,9 +3,9 @@
   "family": "components.codex-reset-capability",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "06c2ad6d4b464f889a640be7a238f6d0ff7c54b0e93fb5ea22aaa856dadb0336",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-components.codex-reset-credit-accounts.consumecodexresetcredit-1.json b/mobile/rpc-foundation/goldens/matrix-components.codex-reset-credit-accounts.consumecodexresetcredit-1.json
index 433da45363d2..ea1cb61598f1 100644
--- a/mobile/rpc-foundation/goldens/matrix-components.codex-reset-credit-accounts.consumecodexresetcredit-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-components.codex-reset-credit-accounts.consumecodexresetcredit-1.json
@@ -3,9 +3,9 @@
   "family": "components.codex-reset-credit",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "76b53dea504a688493843e23e8e7d052fc196f559bb1e2579d0fd38bf3156d0e",
   "scenarioSha256": "cc6de73be00be072f9a3b7fd63459fd1a529c45d0916a67d5fe6d90dbee61e91",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-components.execution-target-local-preflight.detectagents-1.json b/mobile/rpc-foundation/goldens/matrix-components.execution-target-local-preflight.detectagents-1.json
index d921b1b4fca5..cb7bae2e7aa5 100644
--- a/mobile/rpc-foundation/goldens/matrix-components.execution-target-local-preflight.detectagents-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-components.execution-target-local-preflight.detectagents-1.json
@@ -3,9 +3,9 @@
   "family": "components.execution-target-local",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "f88ee2f5d19b19cc53dca5180a9b5936a13a00a82e8a4636a5e895262b669dec",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-components.execution-target-preflight.detectremoteagents-1.json b/mobile/rpc-foundation/goldens/matrix-components.execution-target-preflight.detectremoteagents-1.json
index e81314a362ed..5b35c3911fb5 100644
--- a/mobile/rpc-foundation/goldens/matrix-components.execution-target-preflight.detectremoteagents-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-components.execution-target-preflight.detectremoteagents-1.json
@@ -3,9 +3,9 @@
   "family": "components.execution-target",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "79a49cddf66935007afb9be8a30593b778f02237894e5fd4d2898b526fc125df",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-components.execution-target-ssh.connect-1.json b/mobile/rpc-foundation/goldens/matrix-components.execution-target-ssh.connect-1.json
index 5afbea76de30..288f5e269b57 100644
--- a/mobile/rpc-foundation/goldens/matrix-components.execution-target-ssh.connect-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-components.execution-target-ssh.connect-1.json
@@ -3,9 +3,9 @@
   "family": "components.execution-target",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "8b8f7fe7227d44330e216e0bf5d366c41b54d9bf76acfb24df2c1770984b9f27",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-components.execution-target-ssh.getstate-1.json b/mobile/rpc-foundation/goldens/matrix-components.execution-target-ssh.getstate-1.json
index 2a0f56af99ee..86add409131e 100644
--- a/mobile/rpc-foundation/goldens/matrix-components.execution-target-ssh.getstate-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-components.execution-target-ssh.getstate-1.json
@@ -3,9 +3,9 @@
   "family": "components.execution-target",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "6832d23c6500e4fcb20abe7c53bc4f5abe72180dc0ad747a4907b82d99bc75d0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-components.new-workspace-repositories-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-components.new-workspace-repositories-repo.list-1.json
index 093f251d812f..d1d9e1bd99e3 100644
--- a/mobile/rpc-foundation/goldens/matrix-components.new-workspace-repositories-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-components.new-workspace-repositories-repo.list-1.json
@@ -3,9 +3,9 @@
   "family": "components.new-workspace-repositories",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "64c1772f0f95a3c43fbb14398a8804b2b4784f7f18874e4fd79767ae634c7faa",
   "scenarioSha256": "95f7dbb11bca7203d29bd13230d4a286f49ff20596535163094e1bff73e7f3cb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-components.setup-script-repo.hooks-1.json b/mobile/rpc-foundation/goldens/matrix-components.setup-script-repo.hooks-1.json
index 5400b38dcd37..965623d61563 100644
--- a/mobile/rpc-foundation/goldens/matrix-components.setup-script-repo.hooks-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-components.setup-script-repo.hooks-1.json
@@ -3,9 +3,9 @@
   "family": "components.setup-script",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "a844134d7bad3c7c12107d60dbd298f5cfba778703fb9dd0f7ad454615d26b07",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.explorer-screen-files.list-1.json b/mobile/rpc-foundation/goldens/matrix-files.explorer-screen-files.list-1.json
index fa3d96343185..cc88c5ad7b9c 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.explorer-screen-files.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.explorer-screen-files.list-1.json
@@ -3,9 +3,9 @@
   "family": "files.explorer-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "7a42a348f4407b94cf75ac77a4b6b783b7d28103b1ae1d111d2708dab0dd4a0c",
   "scenarioSha256": "38b5590173c1f6791d1b35c0f036e2f844ed4b0e39c880e8e376c5f314adaade",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.explorer-screen-files.readdir-1.json b/mobile/rpc-foundation/goldens/matrix-files.explorer-screen-files.readdir-1.json
index ea7a8fd957ce..8e1d86de1b90 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.explorer-screen-files.readdir-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.explorer-screen-files.readdir-1.json
@@ -3,9 +3,9 @@
   "family": "files.explorer-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "7a42a348f4407b94cf75ac77a4b6b783b7d28103b1ae1d111d2708dab0dd4a0c",
   "scenarioSha256": "8c1fa604104c5551b8418af225c9420b1292f0c55b392f847985947c66749959",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.mutation-ownership-ssh.getstate-1.json b/mobile/rpc-foundation/goldens/matrix-files.mutation-ownership-ssh.getstate-1.json
index 7fe451469e83..2b192f3aa846 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.mutation-ownership-ssh.getstate-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.mutation-ownership-ssh.getstate-1.json
@@ -3,9 +3,9 @@
   "family": "files.mutation-ownership",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "5815450e8d07f463423ca0bd8237830791c220234201abffc6fa13e698913516",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.mutation-ownership-status.get-1.json b/mobile/rpc-foundation/goldens/matrix-files.mutation-ownership-status.get-1.json
index 763e01f1ba2a..7c1c3ac751c6 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.mutation-ownership-status.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.mutation-ownership-status.get-1.json
@@ -3,9 +3,9 @@
   "family": "files.mutation-ownership",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "b9cfb187224a4b42efe8ccfcd96145833730d135c4fffa345716f95991a4700f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.mutation-ownership-worktree.show-1.json b/mobile/rpc-foundation/goldens/matrix-files.mutation-ownership-worktree.show-1.json
index c91ac7cc9b27..5cb190a31eff 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.mutation-ownership-worktree.show-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.mutation-ownership-worktree.show-1.json
@@ -3,9 +3,9 @@
   "family": "files.mutation-ownership",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "0bf3b17048bceb0bc8592405facd99cb8086274509206d9e55cd589a05d7415f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.preview-artifact-image-files.readterminalartifactpreview-1.json b/mobile/rpc-foundation/goldens/matrix-files.preview-artifact-image-files.readterminalartifactpreview-1.json
index 351653114921..a3a8fe889513 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.preview-artifact-image-files.readterminalartifactpreview-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.preview-artifact-image-files.readterminalartifactpreview-1.json
@@ -3,9 +3,9 @@
   "family": "files.preview-artifact-image",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "83cad9595793b30d38115ba7118ae1400ecb2af21327853183e91289f4f33a04",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.preview-load-files.readterminalartifact-1.json b/mobile/rpc-foundation/goldens/matrix-files.preview-load-files.readterminalartifact-1.json
index 76c1a9b3f576..159404e1b4c6 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.preview-load-files.readterminalartifact-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.preview-load-files.readterminalartifact-1.json
@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "dbd20e271999641affbd4b52635c8864e25f08aa6db820a46d0773faa09770c6",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.preview-load-files.readterminalartifact-2.json b/mobile/rpc-foundation/goldens/matrix-files.preview-load-files.readterminalartifact-2.json
index 08ec2c14e258..e7b369f7a8fa 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.preview-load-files.readterminalartifact-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.preview-load-files.readterminalartifact-2.json
@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "c4a09003352ba4e97a17ec4109cc125298cf7123b317265cc5eca06e8dcc0615",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.preview-load-files.resolveterminalpath-1.json b/mobile/rpc-foundation/goldens/matrix-files.preview-load-files.resolveterminalpath-1.json
index f7dc939a68b9..377bcb8ef868 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.preview-load-files.resolveterminalpath-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.preview-load-files.resolveterminalpath-1.json
@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "ecdeff2713e454925158dde09782713d76f39455729bb25688a6ffcfff154f30",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.preview-save-files.readterminalartifact-1.json b/mobile/rpc-foundation/goldens/matrix-files.preview-save-files.readterminalartifact-1.json
index d4c1361675e7..32817b0fb41d 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.preview-save-files.readterminalartifact-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.preview-save-files.readterminalartifact-1.json
@@ -3,9 +3,9 @@
   "family": "files.preview-save",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "1a4f7dff351be244712bedb8f495c83a531cfbfc5b5923267d1ed46bf2d6d11b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.preview-save-files.writeterminalartifact-1.json b/mobile/rpc-foundation/goldens/matrix-files.preview-save-files.writeterminalartifact-1.json
index 9084a207eb78..78d0ee50808f 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.preview-save-files.writeterminalartifact-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.preview-save-files.writeterminalartifact-1.json
@@ -3,9 +3,9 @@
   "family": "files.preview-save",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "8d443bda91fe5a1fa74910d525bb2ec40f639109bc71afbd42bccd949b3d463f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.preview-worktree-image-files.readpreview-1.json b/mobile/rpc-foundation/goldens/matrix-files.preview-worktree-image-files.readpreview-1.json
index 6379581726eb..8173a17b650e 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.preview-worktree-image-files.readpreview-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.preview-worktree-image-files.readpreview-1.json
@@ -3,9 +3,9 @@
   "family": "files.preview-worktree-image",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "0962cb776492001a60db2ca89d715faec94c648962f140077fc9a85355784d81",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.preview-worktree-text-files.read-1.json b/mobile/rpc-foundation/goldens/matrix-files.preview-worktree-text-files.read-1.json
index 2e50c5c072c7..34e778508857 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.preview-worktree-text-files.read-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.preview-worktree-text-files.read-1.json
@@ -3,9 +3,9 @@
   "family": "files.preview-worktree-text",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "08d73805619f00748caa5726a7fb0d9b9c561f93ec1e6dd28b27065a4515d65d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.tab-doc-files.read-1.json b/mobile/rpc-foundation/goldens/matrix-files.tab-doc-files.read-1.json
index c1b2f674fd81..8312731b553d 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.tab-doc-files.read-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.tab-doc-files.read-1.json
@@ -3,9 +3,9 @@
   "family": "files.tab-doc",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "65895c028637185238baf4fd4f1297c11f528a289fe8173a41c48dc5a0b37c26",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.tab-doc-files.readpreview-1.json b/mobile/rpc-foundation/goldens/matrix-files.tab-doc-files.readpreview-1.json
index 49c178bea86f..738bb631480f 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.tab-doc-files.readpreview-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.tab-doc-files.readpreview-1.json
@@ -3,9 +3,9 @@
   "family": "files.tab-doc",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "2ceca0ecd901fd78838fcbdc789cbb6b96f04674b850a0994c7611f5db804915",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.tab-doc-git.diff-1.json b/mobile/rpc-foundation/goldens/matrix-files.tab-doc-git.diff-1.json
index 4d6407f044dd..a4c5d13082c1 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.tab-doc-git.diff-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.tab-doc-git.diff-1.json
@@ -3,9 +3,9 @@
   "family": "files.tab-doc",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "c4db2424b8a35fd97b3fea00b4dd91a3c8d50c6fb73795811ef5402e3d14f8df",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.terminal-path-tap-files.open-1.json b/mobile/rpc-foundation/goldens/matrix-files.terminal-path-tap-files.open-1.json
index 8ee3990f7f01..e340b90e7350 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.terminal-path-tap-files.open-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.terminal-path-tap-files.open-1.json
@@ -3,9 +3,9 @@
   "family": "files.terminal-path-tap",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e20a76ecd5e820dc4797fb25307810af68b5ced996dba2b9599464a21b5cbe1b",
   "scenarioSha256": "73dbbb8b96662af57240194be4af5726697d402b624a807d003ab56fea04dbd7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-files.terminal-path-tap-files.resolveterminalpath-1.json b/mobile/rpc-foundation/goldens/matrix-files.terminal-path-tap-files.resolveterminalpath-1.json
index 73deb452a556..e28a23102bb0 100644
--- a/mobile/rpc-foundation/goldens/matrix-files.terminal-path-tap-files.resolveterminalpath-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-files.terminal-path-tap-files.resolveterminalpath-1.json
@@ -3,9 +3,9 @@
   "family": "files.terminal-path-tap",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e20a76ecd5e820dc4797fb25307810af68b5ced996dba2b9599464a21b5cbe1b",
   "scenarioSha256": "ba8728e890e0e9c10ea163bd16f4f99fbc9727cd2f9c4ed69c56436d8bc29f89",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.base-ref-chain-repo.baserefdefault-1.json b/mobile/rpc-foundation/goldens/matrix-git.base-ref-chain-repo.baserefdefault-1.json
index 7f7c0f4bfb9f..ec13c65fb4af 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.base-ref-chain-repo.baserefdefault-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.base-ref-chain-repo.baserefdefault-1.json
@@ -3,9 +3,9 @@
   "family": "git.base-ref-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "5605a2984d7692aa80e5e38f804bdfed4b1ce8ac2102def5dc728b1a79dc1acf",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.base-ref-chain-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-git.base-ref-chain-repo.list-1.json
index 93f2325e51e6..25f00c15ba2f 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.base-ref-chain-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.base-ref-chain-repo.list-1.json
@@ -3,9 +3,9 @@
   "family": "git.base-ref-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "ed0e97ead1aad0b45bdfc48f5fe4e498810d0cfee88f07d3c6228db56fda1dd9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.base-ref-chain-worktree.show-1.json b/mobile/rpc-foundation/goldens/matrix-git.base-ref-chain-worktree.show-1.json
index e9ccb50838b9..cbdea59fbc95 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.base-ref-chain-worktree.show-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.base-ref-chain-worktree.show-1.json
@@ -3,9 +3,9 @@
   "family": "git.base-ref-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "1db6919b94df3b8548838ff4c206fafa3a09ea096b17c04483f78f9321ccb1ba",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.branch-diff-preview-git.branchdiff-1.json b/mobile/rpc-foundation/goldens/matrix-git.branch-diff-preview-git.branchdiff-1.json
index 41717ca9e9c7..8aec0ab46c97 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.branch-diff-preview-git.branchdiff-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.branch-diff-preview-git.branchdiff-1.json
@@ -3,9 +3,9 @@
   "family": "git.branch-diff-preview",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "48ccada93f208a24160483e98ee94a771ab6d63222f29ac4bbd6979157f98333",
   "scenarioSha256": "42879d7300691a80aa0d09a2aeb5f8cb9438fc72b0ac7f24b0bbae4309f3a2ca",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.branchcompare-1.json b/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.branchcompare-1.json
index 2cbe3ad68fad..bcf54ece9dd8 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.branchcompare-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.branchcompare-1.json
@@ -3,9 +3,9 @@
   "family": "git.changes-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "48ccada93f208a24160483e98ee94a771ab6d63222f29ac4bbd6979157f98333",
   "scenarioSha256": "afdfde4c58b6ff2047ea1b2f18b955074c0ae23850d4ac8783e69c0724096eab",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.status-1.json b/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.status-1.json
index 5c9ebe77087b..5afd179d85d2 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.status-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.status-1.json
@@ -3,9 +3,9 @@
   "family": "git.changes-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "48ccada93f208a24160483e98ee94a771ab6d63222f29ac4bbd6979157f98333",
   "scenarioSha256": "a428557212fd35e84506b671c2b254d7ce5cab486dada61fc9b5e5357f76df2c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.changes-load-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-git.changes-load-repo.list-1.json
index c5683a2989ea..b84b036551c9 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.changes-load-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.changes-load-repo.list-1.json
@@ -3,9 +3,9 @@
   "family": "git.changes-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "48ccada93f208a24160483e98ee94a771ab6d63222f29ac4bbd6979157f98333",
   "scenarioSha256": "901b8f44a090b5871b3edc20be72c4f407889b4830fcb00be0e99c8c96274cc5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.changes-load-worktree.show-1.json b/mobile/rpc-foundation/goldens/matrix-git.changes-load-worktree.show-1.json
index 72c98271778b..a3578fa67809 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.changes-load-worktree.show-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.changes-load-worktree.show-1.json
@@ -3,9 +3,9 @@
   "family": "git.changes-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "48ccada93f208a24160483e98ee94a771ab6d63222f29ac4bbd6979157f98333",
   "scenarioSha256": "d40c9235948cb1cd85bec5451ce0f4183074e0a12a35834d8c911c35e99a6599",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.commit-message-ai-git.generatecommitmessage-1.json b/mobile/rpc-foundation/goldens/matrix-git.commit-message-ai-git.generatecommitmessage-1.json
index 2a312060a5a7..ce4246cb49bd 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.commit-message-ai-git.generatecommitmessage-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.commit-message-ai-git.generatecommitmessage-1.json
@@ -3,9 +3,9 @@
   "family": "git.commit-message-ai",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "22ea5279155ecf749aaab521ffd570221ac3169b177fc1daf85ef93a49d38260",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.history-commit-files-git.commitcompare-1.json b/mobile/rpc-foundation/goldens/matrix-git.history-commit-files-git.commitcompare-1.json
index 9c16122968c4..32b2fd268db3 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.history-commit-files-git.commitcompare-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.history-commit-files-git.commitcompare-1.json
@@ -3,9 +3,9 @@
   "family": "git.history-commit-files",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "48ccada93f208a24160483e98ee94a771ab6d63222f29ac4bbd6979157f98333",
   "scenarioSha256": "fc12c33acd3f3a34cbdb5893204be009bb089e2383a715fea4151c912de11ab0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.history-commit-files-git.history-1.json b/mobile/rpc-foundation/goldens/matrix-git.history-commit-files-git.history-1.json
index 810ee0cc1377..675c778ab312 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.history-commit-files-git.history-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.history-commit-files-git.history-1.json
@@ -3,9 +3,9 @@
   "family": "git.history-commit-files",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "48ccada93f208a24160483e98ee94a771ab6d63222f29ac4bbd6979157f98333",
   "scenarioSha256": "52610bb18381d371e479a5bef4a160814547baa355104059949b1c35b87342bc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.history-read-git.history-1.json b/mobile/rpc-foundation/goldens/matrix-git.history-read-git.history-1.json
index 3e47daa50bd8..092dd3ae5355 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.history-read-git.history-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.history-read-git.history-1.json
@@ -3,9 +3,9 @@
   "family": "git.history-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "86254ed87ad3427d6ee4631d7348075039ba2d4d7496d59f27f03f78580f35a1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.remote-prerequisite-git.push-1.json b/mobile/rpc-foundation/goldens/matrix-git.remote-prerequisite-git.push-1.json
index aeb13811112b..c5b8fa1ccecf 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.remote-prerequisite-git.push-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.remote-prerequisite-git.push-1.json
@@ -3,9 +3,9 @@
   "family": "git.remote-prerequisite",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "5009c22df7e74a850bcea41fc110ea7d7eb4bdada623837279f32eaa5149a9b8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-git.review-preparation-git.status-1.json b/mobile/rpc-foundation/goldens/matrix-git.review-preparation-git.status-1.json
index 04c11b1f35cf..d69605a772cd 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.review-preparation-git.status-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.review-preparation-git.status-1.json
@@ -3,9 +3,9 @@
   "family": "git.review-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "485b2751006ee8fb4df28b228ea7adda85779feae83974eb0f7e795e31c500a1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.addissuecomment-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.addissuecomment-1.json
index f38297e50442..aa34ebfeea07 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.addissuecomment-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.addissuecomment-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-comment-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "0c8f09683408a919dd3ac2b7cd12197d8745882627134cde95ecee209575b027",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.addprreviewcommentreply-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.addprreviewcommentreply-1.json
index d0be637b0f54..e9d6280e3629 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.addprreviewcommentreply-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.addprreviewcommentreply-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-comment-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "4f2b61df5e59d2efe81d467214a78132654035cbcb4d929385410b53f735c9fe",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.project.deleteissuecommentbyslug-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.project.deleteissuecommentbyslug-1.json
index b1e211df7177..cecc525a4cae 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.project.deleteissuecommentbyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.project.deleteissuecommentbyslug-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-comment-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "04b2052cce6f24d9e208c992f204355639409ddc9793b3044b394c0e38d3c284",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.project.updateissuecommentbyslug-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.project.updateissuecommentbyslug-1.json
index e2be72e54e06..294c5a2695b7 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.project.updateissuecommentbyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.project.updateissuecommentbyslug-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-comment-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "8f849437158296753a84a75dfdbaf69852bcdb6cdc6e8205496961ec16e4be21",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.resolvereviewthread-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.resolvereviewthread-1.json
index 7efa0a96ade1..ce8130e211c4 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.resolvereviewthread-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-comment-mutation-github.resolvereviewthread-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-comment-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "77eba7deff3f15e64795cdcbefd009abfcf2379e7293eefb1f154ca1e99f4d5d",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.mergepr-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.mergepr-1.json
index b0410d9bdf2b..bc31d8f48546 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.mergepr-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.mergepr-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "2235d05e0d2c6f1a9518cfdd76870e303cccd35289d6a44334147b6a5b6b675e",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.removeprreviewers-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.removeprreviewers-1.json
index 6cd4bcefb7a4..2030a3897ea0 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.removeprreviewers-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.removeprreviewers-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "2cea87c339b35daf62c963092c01c6379db43f2ee4ca5cb2b5f817975b0caf65",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.requestprreviewers-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.requestprreviewers-1.json
index f4ac74fa7335..3fa4c425789a 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.requestprreviewers-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.requestprreviewers-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "78de11de556c91782590725819b22821732a12d3769f493d165c80bc7fcc1f53",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.rerunprchecks-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.rerunprchecks-1.json
index dfa05dc2326f..9bdbddba0a7a 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.rerunprchecks-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.rerunprchecks-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "ac7e91b4d35021eca63af8ce01f9a2c7959109e4cb824009881437cb94dbfe82",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.setprautomerge-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.setprautomerge-1.json
index d36e1c26dab7..f11f6dd43a5f 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.setprautomerge-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.setprautomerge-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "a85682e5009d634bf468b8dbe4f35a957988754ed9c2b07d57ad475c1590d1f6",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.updateprstate-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.updateprstate-1.json
index c0de95e1e91a..52377ce2bb47 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.updateprstate-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-mutation-github.updateprstate-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "30f321fcbfaf09505bc6e18e64c09ca49c0dcdb7c5e12c4e27c2429b3e1066ca",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.listassignableusers-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.listassignableusers-1.json
index 45ed408f76b3..e6031d2899bd 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.listassignableusers-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.listassignableusers-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "507743a5925a37be32156b3d8df83ddb8e08c262d2c2f44bbd117dee4672bbc5",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.prcheckdetails-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.prcheckdetails-1.json
index 26ad31f50be4..8a746b7d5083 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.prcheckdetails-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.prcheckdetails-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "6efca320cf31a1de988110004a9fb7b67fdad279a789e046ad6b5141b66e5bf1",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.prchecks-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.prchecks-1.json
index c26c0226ea91..aedb53ac1412 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.prchecks-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.prchecks-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "c77d7c7a05ecb9b27180ef28ca63a28e1c1ca42db2bb54a468699da77281ae35",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.prforbranch-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.prforbranch-1.json
index ce5be18b2a97..60936c24937f 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.prforbranch-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.prforbranch-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "3b3d3032b992fc7461b13de8a42512affa12fb018ad583898179a9934c13b414",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.reposlug-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.reposlug-1.json
index 71f61c2549a7..890ffd081004 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.reposlug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.reposlug-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "4ebe865f874b0b4a813860ec7356b8dc214ea02f0a9036cb003efe863d89b83e",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.workitemdetails-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.workitemdetails-1.json
index 70069f2ba08b..7c620ace6afb 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.workitemdetails-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-read-github.workitemdetails-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "bc3350efc030f824fc21046aea8c6dc9a46993b6c75613c66874fde59af9171a",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-read-hostedreview.forbranch-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-read-hostedreview.forbranch-1.json
index 6ad4e8de93b2..84e3d8d7ec44 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-read-hostedreview.forbranch-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-read-hostedreview.forbranch-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "9171e982babc4e56852fe35bafa7a9f3aeda2be5bd4648f29aaa04ca7119d5d2",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-github.pr-title-mutation-github.updateprtitle-1.json b/mobile/rpc-foundation/goldens/matrix-github.pr-title-mutation-github.updateprtitle-1.json
index 2a48fcb99c4d..7b869bba8695 100644
--- a/mobile/rpc-foundation/goldens/matrix-github.pr-title-mutation-github.updateprtitle-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-github.pr-title-mutation-github.updateprtitle-1.json
@@ -3,10 +3,10 @@
   "family": "github.pr-title-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "fe91d5518501a078dff3010e74c4b9d70122f88a629e384336cd1b6a84de36a8",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-home.host-accounts-accounts.list-1.json b/mobile/rpc-foundation/goldens/matrix-home.host-accounts-accounts.list-1.json
index 07ab3e23c2b6..5e3e117809b7 100644
--- a/mobile/rpc-foundation/goldens/matrix-home.host-accounts-accounts.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-home.host-accounts-accounts.list-1.json
@@ -3,9 +3,9 @@
   "family": "home.host-accounts",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c632fdbc4b730777ecb09f08bec14cca0586042b01ed99d40d0228806c7def4a",
   "scenarioSha256": "047e4c8fb2c4b374406658ec3954ac00fda96928bdd999a33ab9867284ffb4a4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-home.host-stats-stats.summary-1.json b/mobile/rpc-foundation/goldens/matrix-home.host-stats-stats.summary-1.json
index 37b950f5bf74..84817f85a318 100644
--- a/mobile/rpc-foundation/goldens/matrix-home.host-stats-stats.summary-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-home.host-stats-stats.summary-1.json
@@ -3,9 +3,9 @@
   "family": "home.host-stats",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a9e0780298a1443664e7ae02056168aa34d67556c9c056d51a82c7b4a73ad35b",
   "scenarioSha256": "5518e08c1b20f0ddd4cb6bc81ff9af032b1a38daf24f3d3497bac5df8b2d0ec5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-1.json b/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-1.json
index 5edfc2de04a1..8e35b0ac7e35 100644
--- a/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-1.json
@@ -3,9 +3,9 @@
   "family": "host-worktree-refresh",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "0604294e541a4b2c73e0501cfc393c84384342ffcae286211a657ca5bc5892b7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-2.json b/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-2.json
index 4e326aea0e7c..7cbe3edb79dd 100644
--- a/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-2.json
@@ -3,9 +3,9 @@
   "family": "host-worktree-refresh",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "6d03d17a5711db33473611858b225e2ac42fe33d2a982fbb0defdbd1dce037d6",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-3.json b/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-3.json
index 55df71b99dec..94c83f0f737d 100644
--- a/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-3.json
+++ b/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-3.json
@@ -3,9 +3,9 @@
   "family": "host-worktree-refresh",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "f36f11b3d69397bd98651fdad4614a4115098e23667e4dfc397c1d9ff2dc3186",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-2-1.json b/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-2-1.json
index 0b7b5cec658f..45f37cca989a 100644
--- a/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-2-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-host-worktree-refresh-runtime.clientevents.subscribe-2-1.json
@@ -3,9 +3,9 @@
   "family": "host-worktree-refresh",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "a70fa323de86b706f05818f321095349ed55b265804ec0ebb54419314a3ca612",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-host.view-settings-ui.get-1.json b/mobile/rpc-foundation/goldens/matrix-host.view-settings-ui.get-1.json
index f0d0c26e42b2..6d3c7f6f94ff 100644
--- a/mobile/rpc-foundation/goldens/matrix-host.view-settings-ui.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-host.view-settings-ui.get-1.json
@@ -3,9 +3,9 @@
   "family": "host.view-settings",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a9e0780298a1443664e7ae02056168aa34d67556c9c056d51a82c7b4a73ad35b",
   "scenarioSha256": "a9a3191e2e8c36870ce2769a7bb972813f435267fdc6ed9e42632a57a227bbd6",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-host.view-settings-ui.set-1.json b/mobile/rpc-foundation/goldens/matrix-host.view-settings-ui.set-1.json
index 570bc8427f4a..0e7def826285 100644
--- a/mobile/rpc-foundation/goldens/matrix-host.view-settings-ui.set-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-host.view-settings-ui.set-1.json
@@ -3,9 +3,9 @@
   "family": "host.view-settings",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a9e0780298a1443664e7ae02056168aa34d67556c9c056d51a82c7b4a73ad35b",
   "scenarioSha256": "30cbeff90a845ab5dd576e302156e859338357b608e87e9fadeddf18ae93d9ca",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-host.worktree-actions-worktree.activate-1.json b/mobile/rpc-foundation/goldens/matrix-host.worktree-actions-worktree.activate-1.json
index bea898d38465..404a2f89f268 100644
--- a/mobile/rpc-foundation/goldens/matrix-host.worktree-actions-worktree.activate-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-host.worktree-actions-worktree.activate-1.json
@@ -3,9 +3,9 @@
   "family": "host.worktree-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "92c29bd78ca0c0d5917e9386fc447bb9a1698b1d1ffaba0db7546eaac60da639",
   "scenarioSha256": "7e842584620018d5ec5560711d63a472302e8da80cfe65dfcd2952aebb509af2",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-host.worktree-actions-worktree.rm-1.json b/mobile/rpc-foundation/goldens/matrix-host.worktree-actions-worktree.rm-1.json
index 5695950385c4..04f692cca20b 100644
--- a/mobile/rpc-foundation/goldens/matrix-host.worktree-actions-worktree.rm-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-host.worktree-actions-worktree.rm-1.json
@@ -3,9 +3,9 @@
   "family": "host.worktree-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "92c29bd78ca0c0d5917e9386fc447bb9a1698b1d1ffaba0db7546eaac60da639",
   "scenarioSha256": "c47656a4ca21762e4b5a247ddf9a96efb746bec81e942ffa308a774bab1449e2",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-host.worktree-actions-worktree.set-1.json b/mobile/rpc-foundation/goldens/matrix-host.worktree-actions-worktree.set-1.json
index 9db098ce9400..5098386c4f57 100644
--- a/mobile/rpc-foundation/goldens/matrix-host.worktree-actions-worktree.set-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-host.worktree-actions-worktree.set-1.json
@@ -3,9 +3,9 @@
   "family": "host.worktree-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "92c29bd78ca0c0d5917e9386fc447bb9a1698b1d1ffaba0db7546eaac60da639",
   "scenarioSha256": "054f1b1380fc6cfd4b0f4a85d6f143822a12a0a732d550dd85eef64a6556b3ba",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-git.push-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-git.push-1.json
index e92c1dbade23..e1b7fa432b82 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-git.push-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-git.push-1.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "fcf5cdc7388457156dd81fe28a470f42fbabac7435ec5572cb19e209f410ca84",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-hostedreview.create-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-hostedreview.create-1.json
index 38369dad1e1f..2722a3dc1799 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-hostedreview.create-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-hostedreview.create-1.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "26e666a57805f354602a5b3906a691b10c8d6db66c77acc96c67153279c515a7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-worktree.set-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-worktree.set-1.json
index 0cf7bf4cb1fa..e57ec82457ad 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-worktree.set-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-worktree.set-1.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "08c25b6cb5bc12a7f67e858f229d15cf66b98b2ad4601b11f18c4c03f4a59669",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.bulkstage-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.bulkstage-1.json
index 7cb806849b0a..4a2305bcd49a 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.bulkstage-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.bulkstage-1.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "ff9d1bfd6337607f3d3e8162692b589ecea4a32ae01b5ebb3c602f8f0a55642c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.commit-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.commit-1.json
index 29c0d98933ac..f946583aa4fd 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.commit-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.commit-1.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "efeb9b248aeb98fac71c043d50afe0036cf804d3c11edfccd4e050fe8f3d8f9b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.generatecommitmessage-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.generatecommitmessage-1.json
index 82573facfd42..7463a1bc89b5 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.generatecommitmessage-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.generatecommitmessage-1.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "7b0d9ddcb8df83fc4e465aa6b0dcf05aa0d8f266cd4bb8651969cb8321bcf549",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.push-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.push-1.json
index 44a9294f2993..627f7488bde5 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.push-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.push-1.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "72c1f08739db1c0dfcd48adffaca582a3596116c1c377f95f7dab8b08b7e6cdc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-1.json
index eb0082b2176c..831261fe71ba 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-1.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "1f002f900c1a3c92e8f7c72261579ee5015ec1529c003a1b32bcf3eaf98b672d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-2.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-2.json
index 4357a06beef2..c9180917cc6d 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-2.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "3a6487a07457e0e5aa6fc3fccfa43687acfb06d94334e621081728de937e4e8d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-3.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-3.json
index e94eb7725497..b7a96e01c98e 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-3.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-3.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "7355c45a707fa8a31f0999c4805a5b1dace4c65b727e711231f784b2f92c05ff",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-4.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-4.json
index 0f8cd996ff9f..3e26f5eb9e91 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-4.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-git.status-4.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "45cda6757b76399d282d4b07992dab21bbb8236faadedba5e92eab8818e886bf",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.create-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.create-1.json
index 5d01f7040ed9..e701009162c2 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.create-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.create-1.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "0ca08d5e70e1780a6ee5c919491dcddb062a22623f803e9960a329825f274cbe",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-1.json
index 7e7b229892a0..85f852133770 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-1.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "658eb7bbf63b3a4b38eca0b1733e523962b6b6943644d65aab6f5c7e62534d6a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-2.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-2.json
index c08bbeaa5283..edbb82cccad3 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-2.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "75ba135731290bf734a5eef0b65f9ad8b7cac453c4e2006faac88a5da9dbe3a3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-worktree.set-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-worktree.set-1.json
index 0c5466bc891d..15bc63967aea 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-worktree.set-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-worktree.set-1.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "beb1161b98ffde8c5f1128e843766a1da3182d195f1f0a9012e12e5318ae01bc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.eligibility-hostedreview.getcreationeligibility-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.eligibility-hostedreview.getcreationeligibility-1.json
index 23fa7be32b7c..190bdc01828e 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.eligibility-hostedreview.getcreationeligibility-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.eligibility-hostedreview.getcreationeligibility-1.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.eligibility",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "6c4de90e2617d204e82ca5e65eb17fc397acbcbb9dc0ec18594d2a7739e3528b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-legacy-inventory-files.searchpaths-1.json b/mobile/rpc-foundation/goldens/matrix-legacy-inventory-files.searchpaths-1.json
index 3e27d9181ed9..b0453b1c0fc9 100644
--- a/mobile/rpc-foundation/goldens/matrix-legacy-inventory-files.searchpaths-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-legacy-inventory-files.searchpaths-1.json
@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "4f6472fb7add960be9bcc8596a748264d7cb0755a782ebe9e85753ab1d1d5710",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-legacy-inventory-files.searchpaths-2.json b/mobile/rpc-foundation/goldens/matrix-legacy-inventory-files.searchpaths-2.json
index b19049ee92d5..bc4f8e5dac82 100644
--- a/mobile/rpc-foundation/goldens/matrix-legacy-inventory-files.searchpaths-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-legacy-inventory-files.searchpaths-2.json
@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "048c3ec55ec67d09d9b02e17822f1154adca577e57ffe6d3059102d552d2f759",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-legacy-inventory-fresh-inventory.json b/mobile/rpc-foundation/goldens/matrix-legacy-inventory-fresh-inventory.json
index e089cbd85f90..d71ede674799 100644
--- a/mobile/rpc-foundation/goldens/matrix-legacy-inventory-fresh-inventory.json
+++ b/mobile/rpc-foundation/goldens/matrix-legacy-inventory-fresh-inventory.json
@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "ad458a3407e3f1303343b46a1308b43535abef2c9ed2f68db59157db5b91daa1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-legacy-inventory-old-inventory.json b/mobile/rpc-foundation/goldens/matrix-legacy-inventory-old-inventory.json
index aaa921007132..4c50612fc187 100644
--- a/mobile/rpc-foundation/goldens/matrix-legacy-inventory-old-inventory.json
+++ b/mobile/rpc-foundation/goldens/matrix-legacy-inventory-old-inventory.json
@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "52742d894d0ea53db89729101664a393b10794d9c2d2fe7b40b020643a13af81",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-linear-detail-barrier-linear.getissue-1.json b/mobile/rpc-foundation/goldens/matrix-linear-detail-barrier-linear.getissue-1.json
index da2dae1680f6..e6ff652f0141 100644
--- a/mobile/rpc-foundation/goldens/matrix-linear-detail-barrier-linear.getissue-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-linear-detail-barrier-linear.getissue-1.json
@@ -3,9 +3,9 @@
   "family": "linear-detail-barrier",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d3b7f33d810e1fa420ac41a628cde9fe4a9e65fd57f89fbca0a40fc7d74951ab",
   "scenarioSha256": "8e00afc85e5b82d75bedecea0c748a3c8658cfc8545650e755c03f51fdc932d6",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-linear-detail-barrier-linear.issuecomments-1.json b/mobile/rpc-foundation/goldens/matrix-linear-detail-barrier-linear.issuecomments-1.json
index 76bcd40a8713..1dcbcdbfe1be 100644
--- a/mobile/rpc-foundation/goldens/matrix-linear-detail-barrier-linear.issuecomments-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-linear-detail-barrier-linear.issuecomments-1.json
@@ -3,9 +3,9 @@
   "family": "linear-detail-barrier",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d3b7f33d810e1fa420ac41a628cde9fe4a9e65fd57f89fbca0a40fc7d74951ab",
   "scenarioSha256": "40289acce4a3542773f74681d255d67cfddadf6c42317928d6728f26a76f6cfb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-linear.select-workspace-picker-linear.selectworkspace-1.json b/mobile/rpc-foundation/goldens/matrix-linear.select-workspace-picker-linear.selectworkspace-1.json
index 1a0e6357e72a..7088f794abfe 100644
--- a/mobile/rpc-foundation/goldens/matrix-linear.select-workspace-picker-linear.selectworkspace-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-linear.select-workspace-picker-linear.selectworkspace-1.json
@@ -3,9 +3,9 @@
   "family": "linear.select-workspace-picker",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b65996c152b632d553a31e07e31ea5c76f998eada42cf0966923d730da21908f",
   "scenarioSha256": "c7de1f6fc0895d4ddf1b87a83859da46c583f098e058f14c8f85d48120c80c40",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-live-worktree-name-runtime.clientevents.subscribe-1-1.json b/mobile/rpc-foundation/goldens/matrix-live-worktree-name-runtime.clientevents.subscribe-1-1.json
index 6e7349d497d7..9da3e6beaf78 100644
--- a/mobile/rpc-foundation/goldens/matrix-live-worktree-name-runtime.clientevents.subscribe-1-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-live-worktree-name-runtime.clientevents.subscribe-1-1.json
@@ -3,9 +3,9 @@
   "family": "live-worktree-name",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "f3fa2738875e15b640f21e56d3a0628333cd5b271242314b9c328822eec01d34",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-live-worktree-name-runtime.clientevents.subscribe-1-2.json b/mobile/rpc-foundation/goldens/matrix-live-worktree-name-runtime.clientevents.subscribe-1-2.json
index 54bfb0f21050..04d990d591ce 100644
--- a/mobile/rpc-foundation/goldens/matrix-live-worktree-name-runtime.clientevents.subscribe-1-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-live-worktree-name-runtime.clientevents.subscribe-1-2.json
@@ -3,9 +3,9 @@
   "family": "live-worktree-name",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "24b9ef7c06386b8af8303cfb196d2f652e46759b40aadb7b6af5144c964ea179",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-live-worktree-name-runtime.clientevents.subscribe-2-1.json b/mobile/rpc-foundation/goldens/matrix-live-worktree-name-runtime.clientevents.subscribe-2-1.json
index 001435c2e85b..39f2a2e63863 100644
--- a/mobile/rpc-foundation/goldens/matrix-live-worktree-name-runtime.clientevents.subscribe-2-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-live-worktree-name-runtime.clientevents.subscribe-2-1.json
@@ -3,9 +3,9 @@
   "family": "live-worktree-name",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "e13633e6b76dce4aec343c391359adfd39430e91af1b183140fe4423316c81e1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-live-worktree-name-worktree.show-1.json b/mobile/rpc-foundation/goldens/matrix-live-worktree-name-worktree.show-1.json
index 2052a1ee512c..1bc86e918969 100644
--- a/mobile/rpc-foundation/goldens/matrix-live-worktree-name-worktree.show-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-live-worktree-name-worktree.show-1.json
@@ -3,9 +3,9 @@
   "family": "live-worktree-name",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "0bbbff1a914ba146777515d6d971144cc62f29f2d484a264513a1ce0f48be96a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-live-worktree-name-worktree.show-2.json b/mobile/rpc-foundation/goldens/matrix-live-worktree-name-worktree.show-2.json
index bd7203031840..151808d673b8 100644
--- a/mobile/rpc-foundation/goldens/matrix-live-worktree-name-worktree.show-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-live-worktree-name-worktree.show-2.json
@@ -3,9 +3,9 @@
   "family": "live-worktree-name",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "2ed321bfdc419635734c37b0a1cc4f85d6d92766846e25a37bd547dfa3af8f72",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-live-worktree-name-worktree.show-3.json b/mobile/rpc-foundation/goldens/matrix-live-worktree-name-worktree.show-3.json
index 04a8ff286d62..5126ef54e29c 100644
--- a/mobile/rpc-foundation/goldens/matrix-live-worktree-name-worktree.show-3.json
+++ b/mobile/rpc-foundation/goldens/matrix-live-worktree-name-worktree.show-3.json
@@ -3,9 +3,9 @@
   "family": "live-worktree-name",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "ab7efe1dc6ef2ddfffa69c88bcc936f43393968a2281bc0ebfc864be650e7af1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-app-js.json b/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-app-js.json
index ab82b2a6394e..7573ef7cec0b 100644
--- a/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-app-js.json
+++ b/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-app-js.json
@@ -3,9 +3,9 @@
   "family": "mobileWeb.bundle-fetch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "af339fef2c684d5709c6d3f279e5f0d9c33d17b6d4e5c89e501963400901b564",
   "scenarioSha256": "9de83f3ad2d85d1304a6ff00046b128a97318b3d859c78aa9acde73d9419aabe",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-index-head.json b/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-index-head.json
index d49e95763690..43a231817bdc 100644
--- a/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-index-head.json
+++ b/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-index-head.json
@@ -3,9 +3,9 @@
   "family": "mobileWeb.bundle-fetch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "af339fef2c684d5709c6d3f279e5f0d9c33d17b6d4e5c89e501963400901b564",
   "scenarioSha256": "b15dbbc7f1d9ecc6918c9b9aec395fca93108e39f6b02c82f559dc060383a03b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-index-tail.json b/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-index-tail.json
index 0f1c1a0c7370..29fba15b4dae 100644
--- a/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-index-tail.json
+++ b/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-index-tail.json
@@ -3,9 +3,9 @@
   "family": "mobileWeb.bundle-fetch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "af339fef2c684d5709c6d3f279e5f0d9c33d17b6d4e5c89e501963400901b564",
   "scenarioSha256": "89539ae4d46c4fd7d93f06e464da91ebfb6da6abad4eda03f67c3bf727c8731f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-mobileweb.bundle.manifest-1.json b/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-mobileweb.bundle.manifest-1.json
index 7e0463f03dbb..fe3ed6f7f9d8 100644
--- a/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-mobileweb.bundle.manifest-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-fetch-mobileweb.bundle.manifest-1.json
@@ -3,9 +3,9 @@
   "family": "mobileWeb.bundle-fetch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "af339fef2c684d5709c6d3f279e5f0d9c33d17b6d4e5c89e501963400901b564",
   "scenarioSha256": "f453e5e35d31bb2f1638ae68d97db16a0955375d3863e124e2aa57f7d1fa292c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-manifest-mobileweb.bundle.manifest-1.json b/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-manifest-mobileweb.bundle.manifest-1.json
index 6dcf9fa6ceb2..4abd8f4e3752 100644
--- a/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-manifest-mobileweb.bundle.manifest-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-mobileweb.bundle-manifest-mobileweb.bundle.manifest-1.json
@@ -3,9 +3,9 @@
   "family": "mobileWeb.bundle-manifest",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "af339fef2c684d5709c6d3f279e5f0d9c33d17b6d4e5c89e501963400901b564",
   "scenarioSha256": "8f5211fd3de1d77d3ea139f22bd6fc6119c72c08aa016f252a0df14bedf23ab3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-nativechat.image-paste-terminal.send-1.json b/mobile/rpc-foundation/goldens/matrix-nativechat.image-paste-terminal.send-1.json
index 33ebaeb8445d..70d9caacc866 100644
--- a/mobile/rpc-foundation/goldens/matrix-nativechat.image-paste-terminal.send-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-nativechat.image-paste-terminal.send-1.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.image-paste",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "165402f60bc723edb2a867f09573fdae11a7c2ee4ef2be891916cfeb8aab21a0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-nativechat.image-paste-terminal.send-2.json b/mobile/rpc-foundation/goldens/matrix-nativechat.image-paste-terminal.send-2.json
index 37f6a02054e4..bda0f2377a62 100644
--- a/mobile/rpc-foundation/goldens/matrix-nativechat.image-paste-terminal.send-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-nativechat.image-paste-terminal.send-2.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.image-paste",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "443fb50425d5cdbf0b289c6c051732090f165abba9b1ba4c39b712a459c612c9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-nativechat.image-upload-clipboard.startimageupload-1.json b/mobile/rpc-foundation/goldens/matrix-nativechat.image-upload-clipboard.startimageupload-1.json
index 375f6007ba8d..6ca1f29ca742 100644
--- a/mobile/rpc-foundation/goldens/matrix-nativechat.image-upload-clipboard.startimageupload-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-nativechat.image-upload-clipboard.startimageupload-1.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "0478b692709ef0fe3cd75bf0d47fc27fcbb50ebc779e231537ba36638a0125f8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-nativechat.session-option-pick-settings.mutatenativechatsessionoptions-1.json b/mobile/rpc-foundation/goldens/matrix-nativechat.session-option-pick-settings.mutatenativechatsessionoptions-1.json
index 9de4da6cef3e..de35c7e8e9db 100644
--- a/mobile/rpc-foundation/goldens/matrix-nativechat.session-option-pick-settings.mutatenativechatsessionoptions-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-nativechat.session-option-pick-settings.mutatenativechatsessionoptions-1.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.session-option-pick",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b98a3ca3818678b88cf629bc4635300a103637126a136f025a1600dc16f08008",
   "scenarioSha256": "1305f50c6e838d89d0a9e65d9011d2a532a2f75f7b3aea73f9e33330214f5724",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-nativechat.terminal-write-orchestration.workerterminaluserinput-1.json b/mobile/rpc-foundation/goldens/matrix-nativechat.terminal-write-orchestration.workerterminaluserinput-1.json
index 257c2a420622..4828a3c136a4 100644
--- a/mobile/rpc-foundation/goldens/matrix-nativechat.terminal-write-orchestration.workerterminaluserinput-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-nativechat.terminal-write-orchestration.workerterminaluserinput-1.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.terminal-write",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b98a3ca3818678b88cf629bc4635300a103637126a136f025a1600dc16f08008",
   "scenarioSha256": "860d3a80815ec68dc3fe2891a69888b80ec60fa205940e31f14643fb1097ead5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-nativechat.terminal-write-terminal.send-1.json b/mobile/rpc-foundation/goldens/matrix-nativechat.terminal-write-terminal.send-1.json
index 6ad3bf8c8e1c..e27b8dedce8b 100644
--- a/mobile/rpc-foundation/goldens/matrix-nativechat.terminal-write-terminal.send-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-nativechat.terminal-write-terminal.send-1.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.terminal-write",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b98a3ca3818678b88cf629bc4635300a103637126a136f025a1600dc16f08008",
   "scenarioSha256": "c4193d972250dbe72907dcd32b8300b22986edfa5eeb651268c3838835177c64",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.getmissedsince-1.json b/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.getmissedsince-1.json
index c97ea154bcc7..5c96345be12e 100644
--- a/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.getmissedsince-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.getmissedsince-1.json
@@ -3,9 +3,9 @@
   "family": "notifications.desktop-stream",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "eacf859143588ae6bee2804975d642b6c1088d57ae77ffe298620250d9a9f0e4",
   "scenarioSha256": "e13d3072f9a0ff4458ec4231013d29f7131144b52089914cd08914652a2e136b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.subscribe-1-1.json b/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.subscribe-1-1.json
index d6a8236605e5..6906e28b4be9 100644
--- a/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.subscribe-1-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.subscribe-1-1.json
@@ -3,9 +3,9 @@
   "family": "notifications.desktop-stream",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "eacf859143588ae6bee2804975d642b6c1088d57ae77ffe298620250d9a9f0e4",
   "scenarioSha256": "aca5a21c0928ca5e84aac346f543a6840691c92b124c845cd01e3f2de553ea3d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.subscribe-1-2.json b/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.subscribe-1-2.json
index df3582d5321c..2d604afd9c4a 100644
--- a/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.subscribe-1-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.subscribe-1-2.json
@@ -3,9 +3,9 @@
   "family": "notifications.desktop-stream",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "eacf859143588ae6bee2804975d642b6c1088d57ae77ffe298620250d9a9f0e4",
   "scenarioSha256": "53c8aa2ecfc045a50180dc707e353e22eef8511c0815ebacd3bda8cfb69d65c0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.unsubscribe-1.json b/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.unsubscribe-1.json
index 7b3a8d6e0434..2a43ab0c76ed 100644
--- a/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.unsubscribe-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-notifications.desktop-stream-notifications.unsubscribe-1.json
@@ -3,9 +3,9 @@
   "family": "notifications.desktop-stream",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "eacf859143588ae6bee2804975d642b6c1088d57ae77ffe298620250d9a9f0e4",
   "scenarioSha256": "afd3985ecdc07a1880aaee81739432633a1e87ec2de2c02166f43a6c78cb493b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-notifications.display-test-screen-notifications.testpush-1.json b/mobile/rpc-foundation/goldens/matrix-notifications.display-test-screen-notifications.testpush-1.json
index 10decde0730c..afae0c3d35a8 100644
--- a/mobile/rpc-foundation/goldens/matrix-notifications.display-test-screen-notifications.testpush-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-notifications.display-test-screen-notifications.testpush-1.json
@@ -3,9 +3,9 @@
   "family": "notifications.display-test-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "f55275c268e49679b37d72ce6cbe71186ce02c77fe3fd53f0f21e796502d62e8",
   "scenarioSha256": "b7a862c0de7dd4efcdf3f4db7c5aeda6b765ab58498f40f3b21232264758b16f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-notifications.push-dismissal-notifications.getmissedsince-1.json b/mobile/rpc-foundation/goldens/matrix-notifications.push-dismissal-notifications.getmissedsince-1.json
index bf9aeeedcc90..e06cd59edc4c 100644
--- a/mobile/rpc-foundation/goldens/matrix-notifications.push-dismissal-notifications.getmissedsince-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-notifications.push-dismissal-notifications.getmissedsince-1.json
@@ -3,9 +3,9 @@
   "family": "notifications.push-dismissal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "595a3eb2994d0596b9fcd0707b175b4e978625053dfbc5c541b0350c0cbfb524",
   "scenarioSha256": "9ab21cda2ac956c70ddd23fe589778bbb46333314508cf92770d668ba59d5a90",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-notifications.push-registration-notifications.registerpush-1.json b/mobile/rpc-foundation/goldens/matrix-notifications.push-registration-notifications.registerpush-1.json
index f54a44df6dcc..0792eb913917 100644
--- a/mobile/rpc-foundation/goldens/matrix-notifications.push-registration-notifications.registerpush-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-notifications.push-registration-notifications.registerpush-1.json
@@ -3,9 +3,9 @@
   "family": "notifications.push-registration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2e3d939dc162dbc5a38d8a7207111688204a825fd70348721917b3016e1c9470",
   "scenarioSha256": "c77a518d35203370669fea20f7669d7695a2ec851f22b220a8be417c546efeab",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-notifications.push-registration-notifications.unregisterpush-1.json b/mobile/rpc-foundation/goldens/matrix-notifications.push-registration-notifications.unregisterpush-1.json
index 488dcb079432..dcf41dad6a07 100644
--- a/mobile/rpc-foundation/goldens/matrix-notifications.push-registration-notifications.unregisterpush-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-notifications.push-registration-notifications.unregisterpush-1.json
@@ -3,9 +3,9 @@
   "family": "notifications.push-registration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2e3d939dc162dbc5a38d8a7207111688204a825fd70348721917b3016e1c9470",
   "scenarioSha256": "bb772b4b000644f18b48dcf78b05863b30906bcf588824d94eff086014fa69e8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-direct-status.json b/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-direct-status.json
index 92552ae7072e..51f9cab8a2d8 100644
--- a/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-direct-status.json
+++ b/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-direct-status.json
@@ -3,9 +3,9 @@
   "family": "pairing.pre-profile",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "57c8ad93d162ea69e4a0ecd5de7d8fae6806f8f7a51945c2c13661d81bae6497",
   "scenarioSha256": "a28912c9abb97a227904723ff0de8162de31fce66c056da1813e0c18f6e01ccf",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-pairing.getendpoints-1.json b/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-pairing.getendpoints-1.json
index 6d11a54a2b1e..eb571950293b 100644
--- a/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-pairing.getendpoints-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-pairing.getendpoints-1.json
@@ -3,9 +3,9 @@
   "family": "pairing.pre-profile",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "57c8ad93d162ea69e4a0ecd5de7d8fae6806f8f7a51945c2c13661d81bae6497",
   "scenarioSha256": "ccd2ef7c617d13bdf5987f5f89fed6917206205268633b9ef061b92c3580d672",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-pairing.provisionrelay-1.json b/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-pairing.provisionrelay-1.json
index 638428578390..99d22ea0bd3e 100644
--- a/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-pairing.provisionrelay-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-pairing.provisionrelay-1.json
@@ -3,9 +3,9 @@
   "family": "pairing.pre-profile",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "57c8ad93d162ea69e4a0ecd5de7d8fae6806f8f7a51945c2c13661d81bae6497",
   "scenarioSha256": "399fa8b85d9c2fc341ea2284a54aed278fd1a5b19a84cc9284c29d5a583bc519",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-relay-status.json b/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-relay-status.json
index c637941cdf6e..ea72c6502d22 100644
--- a/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-relay-status.json
+++ b/mobile/rpc-foundation/goldens/matrix-pairing.pre-profile-relay-status.json
@@ -3,9 +3,9 @@
   "family": "pairing.pre-profile",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "57c8ad93d162ea69e4a0ecd5de7d8fae6806f8f7a51945c2c13661d81bae6497",
   "scenarioSha256": "14931cc23cd0e6d850f596c880014c606834898acbeee4abff3dc83a94b0c6c0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-project-explicit-false-github.project.updateissuebyslug-1.json b/mobile/rpc-foundation/goldens/matrix-project-explicit-false-github.project.updateissuebyslug-1.json
index e7687eb51e9d..668b9c84bf94 100644
--- a/mobile/rpc-foundation/goldens/matrix-project-explicit-false-github.project.updateissuebyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-project-explicit-false-github.project.updateissuebyslug-1.json
@@ -3,9 +3,9 @@
   "family": "project-explicit-false",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d3b7f33d810e1fa420ac41a628cde9fe4a9e65fd57f89fbca0a40fc7d74951ab",
   "scenarioSha256": "926f0d8c37a33d465bf3a04f056600cfc9f1669b1eca7e968aa1a1f797a74c61",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-relay.credential-rotation-pairing.getendpoints-1.json b/mobile/rpc-foundation/goldens/matrix-relay.credential-rotation-pairing.getendpoints-1.json
index bfbaf6ea1d99..7c4b581d9c39 100644
--- a/mobile/rpc-foundation/goldens/matrix-relay.credential-rotation-pairing.getendpoints-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-relay.credential-rotation-pairing.getendpoints-1.json
@@ -3,9 +3,9 @@
   "family": "relay.credential-rotation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "374a16da4187ee44fcc6e07daf822ae96ecfc13ab47ee6c29d048b1c0bd0f291",
   "scenarioSha256": "042d0f9ef57e2a18bf661b79f2f8f92a12125dbc0fc65dd8605f8cd6f7059d10",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-relay.credential-rotation-pairing.getendpoints-2.json b/mobile/rpc-foundation/goldens/matrix-relay.credential-rotation-pairing.getendpoints-2.json
index b3bb2e94afca..9eb068188c7b 100644
--- a/mobile/rpc-foundation/goldens/matrix-relay.credential-rotation-pairing.getendpoints-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-relay.credential-rotation-pairing.getendpoints-2.json
@@ -3,9 +3,9 @@
   "family": "relay.credential-rotation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "374a16da4187ee44fcc6e07daf822ae96ecfc13ab47ee6c29d048b1c0bd0f291",
   "scenarioSha256": "530aa1f2ddc6fce10d485c8a160ae3e695250b2e80e1e7fc3e8dacb9f5117347",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-relay.credential-rotation-pairing.provisionrelay-1.json b/mobile/rpc-foundation/goldens/matrix-relay.credential-rotation-pairing.provisionrelay-1.json
index 0f15d8262133..fb690cf26934 100644
--- a/mobile/rpc-foundation/goldens/matrix-relay.credential-rotation-pairing.provisionrelay-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-relay.credential-rotation-pairing.provisionrelay-1.json
@@ -3,9 +3,9 @@
   "family": "relay.credential-rotation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "374a16da4187ee44fcc6e07daf822ae96ecfc13ab47ee6c29d048b1c0bd0f291",
   "scenarioSha256": "18b1855f354c23cd5bb7af0db698f0a23d28208c3c6b7347f667bf6cd3ed612f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-relay.direct-upgrade-pairing.getendpoints-1.json b/mobile/rpc-foundation/goldens/matrix-relay.direct-upgrade-pairing.getendpoints-1.json
index ecf5638d3ce1..ac4780fa50f1 100644
--- a/mobile/rpc-foundation/goldens/matrix-relay.direct-upgrade-pairing.getendpoints-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-relay.direct-upgrade-pairing.getendpoints-1.json
@@ -3,9 +3,9 @@
   "family": "relay.direct-upgrade",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "374a16da4187ee44fcc6e07daf822ae96ecfc13ab47ee6c29d048b1c0bd0f291",
   "scenarioSha256": "03355bc2696d02fed125d9f0e24c6c26c8df2f3709c1c5f4412aaf9317cd41d4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-relay.direct-upgrade-pairing.getendpoints-2.json b/mobile/rpc-foundation/goldens/matrix-relay.direct-upgrade-pairing.getendpoints-2.json
index a349f07a806a..6d0198b9b6ab 100644
--- a/mobile/rpc-foundation/goldens/matrix-relay.direct-upgrade-pairing.getendpoints-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-relay.direct-upgrade-pairing.getendpoints-2.json
@@ -3,9 +3,9 @@
   "family": "relay.direct-upgrade",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "374a16da4187ee44fcc6e07daf822ae96ecfc13ab47ee6c29d048b1c0bd0f291",
   "scenarioSha256": "d0c4dd34645308f30c0999ea74c16b53f20e9183832fdf016c3dc21434744b05",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-relay.direct-upgrade-pairing.provisionrelay-1.json b/mobile/rpc-foundation/goldens/matrix-relay.direct-upgrade-pairing.provisionrelay-1.json
index e2f094e3adae..2ea5793519b8 100644
--- a/mobile/rpc-foundation/goldens/matrix-relay.direct-upgrade-pairing.provisionrelay-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-relay.direct-upgrade-pairing.provisionrelay-1.json
@@ -3,9 +3,9 @@
   "family": "relay.direct-upgrade",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "374a16da4187ee44fcc6e07daf822ae96ecfc13ab47ee6c29d048b1c0bd0f291",
   "scenarioSha256": "0fe163f405373adbb1913dddd79d6d596bf88d69fc27c824ba5a2cd4c1406446",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-relay.pairing-recovery-pairing.getendpoints-1.json b/mobile/rpc-foundation/goldens/matrix-relay.pairing-recovery-pairing.getendpoints-1.json
index 6d01b7a55db8..88d32e67d1d5 100644
--- a/mobile/rpc-foundation/goldens/matrix-relay.pairing-recovery-pairing.getendpoints-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-relay.pairing-recovery-pairing.getendpoints-1.json
@@ -3,9 +3,9 @@
   "family": "relay.pairing-recovery",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "57c8ad93d162ea69e4a0ecd5de7d8fae6806f8f7a51945c2c13661d81bae6497",
   "scenarioSha256": "5aaa104a652d4f10cd48ab742112cf59fca22f52bbf85ee3716505a9642fbe37",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.browser-tab-create-browser.tabcreate-1.json b/mobile/rpc-foundation/goldens/matrix-session.browser-tab-create-browser.tabcreate-1.json
index fb753b9038d9..b5dec27ab14a 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.browser-tab-create-browser.tabcreate-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.browser-tab-create-browser.tabcreate-1.json
@@ -3,9 +3,9 @@
   "family": "session.browser-tab-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "6c606813584d6ac89251c725a556d717603acde405a8d45ef6d844e06f2da67a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.content-create-files.createfile-1.json b/mobile/rpc-foundation/goldens/matrix-session.content-create-files.createfile-1.json
index ac229534044f..f5f1a42c141b 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.content-create-files.createfile-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.content-create-files.createfile-1.json
@@ -3,9 +3,9 @@
   "family": "session.content-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "06bf92360e6985770c08a9e53be0f55b6e8ff120d4e6411dacc22e88d08cef32",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.content-create-files.open-1.json b/mobile/rpc-foundation/goldens/matrix-session.content-create-files.open-1.json
index 63313568f985..4fc2a9a6a70b 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.content-create-files.open-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.content-create-files.open-1.json
@@ -3,9 +3,9 @@
   "family": "session.content-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "17f87233352ff8e452f061f4558d58b44643efe49313162d4aad140343a1ead9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.content-create-status.get-1.json b/mobile/rpc-foundation/goldens/matrix-session.content-create-status.get-1.json
index bc7ea033087b..a2b045ea2741 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.content-create-status.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.content-create-status.get-1.json
@@ -3,9 +3,9 @@
   "family": "session.content-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "5100bd674509d1d83b1e2594eee036af21ea14b12226185b44070555d1d43060",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.content-create-worktree.show-1.json b/mobile/rpc-foundation/goldens/matrix-session.content-create-worktree.show-1.json
index 70c8b8434fec..3c93c5850f6d 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.content-create-worktree.show-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.content-create-worktree.show-1.json
@@ -3,9 +3,9 @@
   "family": "session.content-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "b9ca49e401df8710924f200f92a071bac2e120ed43df7be2cfb8a325ab1cd9cb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.create-terminal-session.tabs.createterminal-1.json b/mobile/rpc-foundation/goldens/matrix-session.create-terminal-session.tabs.createterminal-1.json
index f55b26584955..301aba46f387 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.create-terminal-session.tabs.createterminal-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.create-terminal-session.tabs.createterminal-1.json
@@ -3,9 +3,9 @@
   "family": "session.create-terminal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fa7d9fd6428e89282f08e04fefba4289000eb3aed1462489a2f11efed374382c",
   "scenarioSha256": "ae1572c1670073d0ac3d2d3abd0e7bee9910cbe4a0b09ecd941e887eeb1db165",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.create-terminal-terminal.send-1.json b/mobile/rpc-foundation/goldens/matrix-session.create-terminal-terminal.send-1.json
index 013b8d5caae4..a5b78204514e 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.create-terminal-terminal.send-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.create-terminal-terminal.send-1.json
@@ -3,9 +3,9 @@
   "family": "session.create-terminal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fa7d9fd6428e89282f08e04fefba4289000eb3aed1462489a2f11efed374382c",
   "scenarioSha256": "62930616f1017ffd4b74546c80b17f3aa3bcee52a6ad62ec144d95872fd31321",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.diff-notes-worktree.show-1.json b/mobile/rpc-foundation/goldens/matrix-session.diff-notes-worktree.show-1.json
index 56f541a44994..250a9e128c3c 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.diff-notes-worktree.show-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.diff-notes-worktree.show-1.json
@@ -3,9 +3,9 @@
   "family": "session.diff-notes",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "42334358b5e5966001639653b553f15033f6e201d785107871fe056536f0a5e2",
   "scenarioSha256": "e54684bad13aa8b8b4794e06351c709053b1c4c6d87776ecdbb1dd1b4406a694",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.diff-review-actions-worktree.set-1.json b/mobile/rpc-foundation/goldens/matrix-session.diff-review-actions-worktree.set-1.json
index 8afc31fa6ccc..e7b9015c59d8 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.diff-review-actions-worktree.set-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.diff-review-actions-worktree.set-1.json
@@ -3,10 +3,10 @@
   "family": "session.diff-review-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "c583058382c949e977b7a1287895ed9ccb8cb408b684aef186b629976ff1da4d",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-session.diff-review-base-ref-show.json b/mobile/rpc-foundation/goldens/matrix-session.diff-review-base-ref-show.json
index 60c48487d480..501976ecc146 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.diff-review-base-ref-show.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.diff-review-base-ref-show.json
@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "17e2b30594a2b37e82ff1976377722c2f1c3ae7f01857e50e010a2dd2e89da3a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.diff-review-git.branchcompare-1.json b/mobile/rpc-foundation/goldens/matrix-session.diff-review-git.branchcompare-1.json
index 73d50efbad12..8fc3fe1fd419 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.diff-review-git.branchcompare-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.diff-review-git.branchcompare-1.json
@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "b99f51a5527e42a32ea9203ad75b16f9dd3cdcdc2a3ed235f6467ac1c7e3a4f3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.diff-review-git.status-1.json b/mobile/rpc-foundation/goldens/matrix-session.diff-review-git.status-1.json
index ee8179fe7c07..fda5a92cfb41 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.diff-review-git.status-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.diff-review-git.status-1.json
@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "b4627f9ac9bc090a2b48fd35f32d5dc3d66fefe0fb65abab75597ef2c73510ec",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.diff-review-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-session.diff-review-repo.list-1.json
index 5a3e5126ffec..015d2cc0a139 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.diff-review-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.diff-review-repo.list-1.json
@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "c9f720134506b6db71b742c219abe736fca1f90070403d7c96df9396fd048b6f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.diff-review-review-show.json b/mobile/rpc-foundation/goldens/matrix-session.diff-review-review-show.json
index 343c24b8bcef..8b53cc35b211 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.diff-review-review-show.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.diff-review-review-show.json
@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "f17bb817f9a172e776f1814920d58abc7db122da9c49cfe3bbeaf217f82d70d7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.markdown-disk-fallback-files.read-1.json b/mobile/rpc-foundation/goldens/matrix-session.markdown-disk-fallback-files.read-1.json
index 6053f4c3f5fc..e04c8b3ee7e8 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.markdown-disk-fallback-files.read-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.markdown-disk-fallback-files.read-1.json
@@ -3,9 +3,9 @@
   "family": "session.markdown-disk-fallback",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "c4b6c9c21433876e2bb3822f289627e7c5607830559289d35cae066ff895fc23",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.markdown-disk-fallback-markdown.readtab-1.json b/mobile/rpc-foundation/goldens/matrix-session.markdown-disk-fallback-markdown.readtab-1.json
index 47aed7198779..e34993cefcf3 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.markdown-disk-fallback-markdown.readtab-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.markdown-disk-fallback-markdown.readtab-1.json
@@ -3,9 +3,9 @@
   "family": "session.markdown-disk-fallback",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "42ddfcc6c8cac61e5891b72fbac9d04763fa9c52d0cb4f44e1044714a8a1ee77",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.markdown-save-markdown.savetab-1.json b/mobile/rpc-foundation/goldens/matrix-session.markdown-save-markdown.savetab-1.json
index c4cff8415a25..f9d5c2d67787 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.markdown-save-markdown.savetab-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.markdown-save-markdown.savetab-1.json
@@ -3,9 +3,9 @@
   "family": "session.markdown-save",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "42334358b5e5966001639653b553f15033f6e201d785107871fe056536f0a5e2",
   "scenarioSha256": "389c6118f3137b78e88af6b901554b0331c652063a00d8ba3119e0883ce82f25",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.native-chat-page-nativechat.readsession-1.json b/mobile/rpc-foundation/goldens/matrix-session.native-chat-page-nativechat.readsession-1.json
index d94c2431222f..63577bc9c284 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.native-chat-page-nativechat.readsession-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.native-chat-page-nativechat.readsession-1.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-page",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "60ce67f66134d6385aa7fb47f2135436a7b3ce0221e3b2514bea65e06dba5518",
   "scenarioSha256": "8a6f6d37fd7dbc9e0da081565f24b270949306c47a874568874ec8ce2579076b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.native-chat-page-nativechat.subscribe-1-1.json b/mobile/rpc-foundation/goldens/matrix-session.native-chat-page-nativechat.subscribe-1-1.json
index 0e179cffe0ca..b4aa358c816e 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.native-chat-page-nativechat.subscribe-1-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.native-chat-page-nativechat.subscribe-1-1.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-page",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "60ce67f66134d6385aa7fb47f2135436a7b3ce0221e3b2514bea65e06dba5518",
   "scenarioSha256": "de804d4fa5287b07be9079d21e0a3cfc7f22d0e4b8649f13a3465a30683a77c8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.native-chat-page-nativechat.subscribe-2-1.json b/mobile/rpc-foundation/goldens/matrix-session.native-chat-page-nativechat.subscribe-2-1.json
index a8a17200f64c..9b429d1aec6d 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.native-chat-page-nativechat.subscribe-2-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.native-chat-page-nativechat.subscribe-2-1.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-page",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "60ce67f66134d6385aa7fb47f2135436a7b3ce0221e3b2514bea65e06dba5518",
   "scenarioSha256": "f7535862ae280e7e47916ad25701040e25d3318baceea52515c9d81b4144ae92",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.native-chat-readability-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-session.native-chat-readability-repo.list-1.json
index 4a503dec2672..88889306408e 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.native-chat-readability-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.native-chat-readability-repo.list-1.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-readability",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "d6a0472f274d55aab584b58b67018d042ee1ba6799f42072a8a5986f45554bfc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.native-chat-stop-orchestration.workerterminaluserinput-1.json b/mobile/rpc-foundation/goldens/matrix-session.native-chat-stop-orchestration.workerterminaluserinput-1.json
index 54ba64508c36..ec3e90d6492d 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.native-chat-stop-orchestration.workerterminaluserinput-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.native-chat-stop-orchestration.workerterminaluserinput-1.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-stop",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "a60de7b496f8149593a6e89cd2d29e20fdf75d26536592fec6b0100b43322d3b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.native-chat-stop-terminal.send-1.json b/mobile/rpc-foundation/goldens/matrix-session.native-chat-stop-terminal.send-1.json
index b12a342b4e53..7c71d3750a39 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.native-chat-stop-terminal.send-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.native-chat-stop-terminal.send-1.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-stop",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "96499f352af2ff884bfa94996659609fdbd228e1d071ad462400b978ab8e239b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.native-chat-stop-terminal.send-2.json b/mobile/rpc-foundation/goldens/matrix-session.native-chat-stop-terminal.send-2.json
index 3e7c78311e4b..efed2de7e0b9 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.native-chat-stop-terminal.send-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.native-chat-stop-terminal.send-2.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-stop",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "c28251d769ca9788952ed4fb29d8665c870fb85f2c5a4f32f8af33baf44498af",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-git.branchcompare-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-git.branchcompare-1.json
index 58b54cede01b..4578ecc3ad36 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-git.branchcompare-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-git.branchcompare-1.json
@@ -3,10 +3,10 @@
   "family": "session.pr-branch-context",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "af78542ad2c449b629f8705b940ec92fd16f879a9bcc81ff6ae3a192f804fa2c",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-git.status-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-git.status-1.json
index 8f0c1dbdfc6a..801140db7270 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-git.status-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-git.status-1.json
@@ -3,10 +3,10 @@
   "family": "session.pr-branch-context",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "1e7cad00f4dfcda65a3830b0b2468020816b940611af1b68600de33cd8c1d7c2",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-repo.list-1.json
index 0a94d21d697e..24a2b9b0d4c9 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-repo.list-1.json
@@ -3,10 +3,10 @@
   "family": "session.pr-branch-context",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "d456ec18056eb9663e99d4991784bd802422256d81ddd7509720814da06915f4",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-worktree.show-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-worktree.show-1.json
index c85b8d042f3a..7c9de5929c30 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-worktree.show-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.pr-branch-context-worktree.show-1.json
@@ -3,10 +3,10 @@
   "family": "session.pr-branch-context",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "039f26cc90d2239028d6ad1d9ecae9cc976d48f386f2d29fbfa425afc702657d",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prchecks-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prchecks-1.json
index 198e2c923db3..5537e82363f1 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prchecks-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prchecks-1.json
@@ -3,9 +3,9 @@
   "family": "session.pr-sidebar",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "87ffa2daea415d2682f1112025b5bd9d52404c6fc7c239180a3ad2120678ff1f",
   "scenarioSha256": "97a92fc3e9b496a6295fb01e490407c1154cd19c54777fdce67377e07af08729",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prforbranch-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prforbranch-1.json
index 8ac29dd97c9d..7102357f0fec 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prforbranch-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prforbranch-1.json
@@ -3,9 +3,9 @@
   "family": "session.pr-sidebar",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "87ffa2daea415d2682f1112025b5bd9d52404c6fc7c239180a3ad2120678ff1f",
   "scenarioSha256": "cb052d2107df7bbf24927199935dde7f30352ce875c7ddd7bbab7d8044da0add",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-hostedreview.forbranch-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-hostedreview.forbranch-1.json
index d85a5654017a..c05867fa10f6 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-hostedreview.forbranch-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-hostedreview.forbranch-1.json
@@ -3,9 +3,9 @@
   "family": "session.pr-sidebar",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "87ffa2daea415d2682f1112025b5bd9d52404c6fc7c239180a3ad2120678ff1f",
   "scenarioSha256": "461af8bf31bbf47e84f64a9177bae34c9b796a3f0158a16041ccb0a1a3ea62ec",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-worktree.show-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-worktree.show-1.json
index c6462f96ec8c..edb26846e0d4 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-worktree.show-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-worktree.show-1.json
@@ -3,9 +3,9 @@
   "family": "session.pr-sidebar",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "87ffa2daea415d2682f1112025b5bd9d52404c6fc7c239180a3ad2120678ff1f",
   "scenarioSha256": "1bde693e45b01d09c47a1542cb7e43b4b7798ae52755ba41c5812bc07a425914",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-triage-agent.launchreplay-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-triage-agent.launchreplay-1.json
new file mode 100644
index 000000000000..7cb300eb4112
--- /dev/null
+++ b/mobile/rpc-foundation/goldens/matrix-session.pr-triage-agent.launchreplay-1.json
@@ -0,0 +1,952 @@
+{
+  "operation": "session.pr-triage-launch",
+  "family": "session.pr-triage",
+  "namedDeltas": [],
+  "runnerVersion": 1,
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
+  "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
+  "scenarioSha256": "ce91b60bc94d61ac67714621cb88c1db62b51f1a6638325b985472eadfcca16b",
+  "platform": "darwin",
+  "scenarioVersion": 1,
+  "projectionVersion": 2,
+  "goldenFormatVersion": 5,
+  "values": {
+    "02188f091419": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "settings": {
+              "defaultTuiAgent": "codex",
+              "disabledTuiAgents": []
+            }
+          }
+        }
+      }
+    },
+    "1c2564f1daca": {
+      "name": "settings.get#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
+    "28339abecf78": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"agent.launchReplay\",\"params\":{\"agent\":\"codex\",\"operationId\":\"1767225600000-00000000000040008000000000000001\",\"target\":{\"kind\":\"existing\",\"worktree\":\"id:repo-9::/w\"},\"prompt\":{\"text\":\"Fix the failing checks\",\"delivery\":\"submit\"},\"launchSource\":\"task_page\"}}"
+    },
+    "331b3596787f": {
+      "launched": {
+        "kind": "not-started",
+        "message": "outer refused"
+      }
+    },
+    "35f85fe3b71c": {
+      "name": "repo.list#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "3b9fb3dfed63": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "transport failure",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "3e6a0417d2ee": {
+      "name": "repo.list#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "repos": [
+              {
+                "id": "repo-9"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "4a304acaf84f": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "refused",
+            "message": ""
+          },
+          "id": "frame-4",
+          "ok": false
+        }
+      }
+    },
+    "51d4cb56be85": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "5b817dac4c7d": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true,
+          "result": {
+            "error": "inner refused",
+            "ok": false
+          }
+        }
+      }
+    },
+    "675c01bc8b85": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "6d9b52e88b73": {
+      "launched": {
+        "kind": "not-started",
+        "message": "Couldn't start the agent."
+      }
+    },
+    "7cdbda15d605": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true,
+          "result": {
+            "error": {
+              "message": "inner refused"
+            },
+            "ok": false
+          }
+        }
+      }
+    },
+    "8638ab90602a": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true
+        }
+      }
+    },
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
+    },
+    "9c16efc31903": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": ["codex"]
+        }
+      }
+    },
+    "a4273b38df83": {
+      "launched": "unlaunched"
+    },
+    "a8f475e8a3a8": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "refused",
+            "message": "outer refused"
+          },
+          "id": "frame-4",
+          "ok": false
+        }
+      }
+    },
+    "ab12d545c466": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true,
+          "result": {
+            "error": "refused"
+          }
+        }
+      }
+    },
+    "b613a82cee3d": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "method_not_found",
+            "message": "Unknown method"
+          },
+          "id": "frame-4",
+          "ok": false
+        }
+      }
+    },
+    "b81eb9edc2b2": {
+      "name": "agent.launchReplay#2",
+      "ordinal": 9,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "ba3fac1eb199": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true,
+          "result": {
+            "outcome": {
+              "handle": "term-1",
+              "kind": "terminal"
+            },
+            "prompt": {
+              "delivery": "submit",
+              "outcome": "handed-to-terminal"
+            },
+            "receipt": {
+              "detail": "Started a terminal agent, the default for new agent tabs in your settings.",
+              "mode": "terminal",
+              "preferred": "terminal",
+              "reason": "user_default"
+            },
+            "worktreeId": "repo-9::/w"
+          }
+        }
+      }
+    },
+    "c2a44248892e": {
+      "launched": {
+        "kind": "not-started",
+        "message": "Update Orca on your computer to start an agent from your phone."
+      }
+    },
+    "c39600966772": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true,
+          "result": {
+            "$rpc": "null"
+          }
+        }
+      }
+    },
+    "dca101029f70": {
+      "name": "agent.launchReplay#2",
+      "ordinal": 10,
+      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"agent.launchReplay\",\"params\":{\"agent\":\"codex\",\"operationId\":\"1767225600000-00000000000040008000000000000001\",\"target\":{\"kind\":\"existing\",\"worktree\":\"id:repo-9::/w\"},\"prompt\":{\"text\":\"Fix the failing checks\",\"delivery\":\"submit\"},\"launchSource\":\"task_page\"}}"
+    },
+    "e0eef7c9fafe": {
+      "name": "repo.list#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
+    },
+    "eaa398d8c3aa": {
+      "launched": {
+        "kind": "unconfirmed",
+        "message": "Couldn't confirm the agent started. Check the workspace before trying again."
+      }
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "eb8d47f90956": {
+      "launched": {
+        "kind": "sent"
+      }
+    },
+    "f49d184679d1": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectAgents\"}"
+    }
+  },
+  "recording": {
+    "scenario": "matrix-session.pr-triage-agent.launchreplay-1",
+    "checkpoints": [
+      {
+        "id": "pr-triage-launch.prelude:pending",
+        "observation": {
+          "sender": ["35f85fe3b71c", "51d4cb56be85"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
+          "settlements": {
+            "launch": "9270aeb7d9c6"
+          },
+          "state": "a4273b38df83",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.normal:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "ba3fac1eb199"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "eb8d47f90956",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.result-absent:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "8638ab90602a"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "eaa398d8c3aa",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.result-null:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "c39600966772"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "eaa398d8c3aa",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.inner-ok-missing:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "ab12d545c466"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "eaa398d8c3aa",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.inner-false-string-error:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "5b817dac4c7d"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "eaa398d8c3aa",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.inner-false-object-error:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "7cdbda15d605"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "eaa398d8c3aa",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.outer-refused:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "a8f475e8a3a8"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "331b3596787f",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.outer-refused-no-message:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "4a304acaf84f"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "6d9b52e88b73",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.method-not-found:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "b613a82cee3d"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "c2a44248892e",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.transport-rejection:launched",
+        "observation": {
+          "sender": [
+            "3e6a0417d2ee",
+            "02188f091419",
+            "9c16efc31903",
+            "3b9fb3dfed63",
+            "b81eb9edc2b2"
+          ],
+          "payloads": [
+            "e0eef7c9fafe",
+            "1c2564f1daca",
+            "f49d184679d1",
+            "28339abecf78",
+            "dca101029f70"
+          ],
+          "settlements": {
+            "launch": "9270aeb7d9c6"
+          },
+          "state": "a4273b38df83",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.transport-rejection-no-message:launched",
+        "observation": {
+          "sender": [
+            "3e6a0417d2ee",
+            "02188f091419",
+            "9c16efc31903",
+            "675c01bc8b85",
+            "b81eb9edc2b2"
+          ],
+          "payloads": [
+            "e0eef7c9fafe",
+            "1c2564f1daca",
+            "f49d184679d1",
+            "28339abecf78",
+            "dca101029f70"
+          ],
+          "settlements": {
+            "launch": "9270aeb7d9c6"
+          },
+          "state": "a4273b38df83",
+          "effects": []
+        }
+      }
+    ]
+  }
+}
diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-triage-preflight.detectagents-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-triage-preflight.detectagents-1.json
new file mode 100644
index 000000000000..fcb3330b818f
--- /dev/null
+++ b/mobile/rpc-foundation/goldens/matrix-session.pr-triage-preflight.detectagents-1.json
@@ -0,0 +1,793 @@
+{
+  "operation": "session.pr-triage-launch",
+  "family": "session.pr-triage",
+  "namedDeltas": [],
+  "runnerVersion": 1,
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
+  "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
+  "scenarioSha256": "53a83cb160e90a8be808d9f0bb31826e355d43dd1e42fa6cccf7ca5398b8b579",
+  "platform": "darwin",
+  "scenarioVersion": 1,
+  "projectionVersion": 2,
+  "goldenFormatVersion": 5,
+  "values": {
+    "02188f091419": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "settings": {
+              "defaultTuiAgent": "codex",
+              "disabledTuiAgents": []
+            }
+          }
+        }
+      }
+    },
+    "0220267a7bca": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "method_not_found",
+            "message": "Unknown method"
+          },
+          "id": "frame-3",
+          "ok": false
+        }
+      }
+    },
+    "084fe2afb0ce": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "error": "refused"
+          }
+        }
+      }
+    },
+    "1963ee2edae9": {
+      "launched": {
+        "kind": "not-started",
+        "message": "Unknown method"
+      }
+    },
+    "1c2564f1daca": {
+      "name": "settings.get#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
+    "28339abecf78": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"agent.launchReplay\",\"params\":{\"agent\":\"codex\",\"operationId\":\"1767225600000-00000000000040008000000000000001\",\"target\":{\"kind\":\"existing\",\"worktree\":\"id:repo-9::/w\"},\"prompt\":{\"text\":\"Fix the failing checks\",\"delivery\":\"submit\"},\"launchSource\":\"task_page\"}}"
+    },
+    "331b3596787f": {
+      "launched": {
+        "kind": "not-started",
+        "message": "outer refused"
+      }
+    },
+    "35f85fe3b71c": {
+      "name": "repo.list#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "3e6a0417d2ee": {
+      "name": "repo.list#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "repos": [
+              {
+                "id": "repo-9"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "4dd9713de1b0": {
+      "launched": {
+        "kind": "not-started",
+        "message": "The host sent a reply this app could not read (preflight.detectAgents)"
+      }
+    },
+    "51d4cb56be85": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "570f5efcd445": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "refused",
+            "message": "outer refused"
+          },
+          "id": "frame-3",
+          "ok": false
+        }
+      }
+    },
+    "57f451cceda3": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "585dfba86809": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true
+        }
+      }
+    },
+    "6dd8724be3b1": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "$rpc": "null"
+          }
+        }
+      }
+    },
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
+    },
+    "9c16efc31903": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": ["codex"]
+        }
+      }
+    },
+    "a4273b38df83": {
+      "launched": "unlaunched"
+    },
+    "a9705081551e": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "error": {
+              "message": "inner refused"
+            },
+            "ok": false
+          }
+        }
+      }
+    },
+    "ac08a3ca5c67": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "error": "inner refused",
+            "ok": false
+          }
+        }
+      }
+    },
+    "b13ddf18a62e": {
+      "launched": {
+        "kind": "not-started",
+        "message": "Could not load the available agents."
+      }
+    },
+    "ba3fac1eb199": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true,
+          "result": {
+            "outcome": {
+              "handle": "term-1",
+              "kind": "terminal"
+            },
+            "prompt": {
+              "delivery": "submit",
+              "outcome": "handed-to-terminal"
+            },
+            "receipt": {
+              "detail": "Started a terminal agent, the default for new agent tabs in your settings.",
+              "mode": "terminal",
+              "preferred": "terminal",
+              "reason": "user_default"
+            },
+            "worktreeId": "repo-9::/w"
+          }
+        }
+      }
+    },
+    "e0eef7c9fafe": {
+      "name": "repo.list#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
+    },
+    "e1b544c0b6ec": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "transport failure",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "e35d7003f64c": {
+      "launched": {
+        "kind": "not-started",
+        "message": "transport failure"
+      }
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "eb8d47f90956": {
+      "launched": {
+        "kind": "sent"
+      }
+    },
+    "efd2ac432554": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "refused",
+            "message": ""
+          },
+          "id": "frame-3",
+          "ok": false
+        }
+      }
+    },
+    "f49d184679d1": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectAgents\"}"
+    }
+  },
+  "recording": {
+    "scenario": "matrix-session.pr-triage-preflight.detectagents-1",
+    "checkpoints": [
+      {
+        "id": "pr-triage-launch.prelude:pending",
+        "observation": {
+          "sender": ["35f85fe3b71c", "51d4cb56be85"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
+          "settlements": {
+            "launch": "9270aeb7d9c6"
+          },
+          "state": "a4273b38df83",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.normal:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "ba3fac1eb199"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "eb8d47f90956",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.result-absent:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "585dfba86809"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "4dd9713de1b0",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.result-null:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "6dd8724be3b1"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "4dd9713de1b0",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.inner-ok-missing:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "084fe2afb0ce"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "4dd9713de1b0",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.inner-false-string-error:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "ac08a3ca5c67"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "4dd9713de1b0",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.inner-false-object-error:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "a9705081551e"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "4dd9713de1b0",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.outer-refused:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "570f5efcd445"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "331b3596787f",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.outer-refused-no-message:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "efd2ac432554"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "b13ddf18a62e",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.method-not-found:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "0220267a7bca"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "1963ee2edae9",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.transport-rejection:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "e1b544c0b6ec"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "e35d7003f64c",
+          "effects": []
+        }
+      },
+      {
+        "id": "pr-triage-launch.transport-rejection-no-message:launched",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "57f451cceda3"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "b13ddf18a62e",
+          "effects": []
+        }
+      }
+    ]
+  }
+}
diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-triage-session.tabs.createterminal-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-triage-repo.list-1.json
similarity index 55%
rename from mobile/rpc-foundation/goldens/matrix-session.pr-triage-session.tabs.createterminal-1.json
rename to mobile/rpc-foundation/goldens/matrix-session.pr-triage-repo.list-1.json
index 3824d40d20cd..d3f6bbcbd6ab 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.pr-triage-session.tabs.createterminal-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.pr-triage-repo.list-1.json
@@ -3,56 +3,34 @@
   "family": "session.pr-triage",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
-  "scenarioSha256": "0d06d27000a8f6ad66480a16c7b84e8464f4b6e1d775326aeae005926e134cb4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
+  "scenarioSha256": "c9030f183de2c5e86c2ccdfd9d4527d6f2ed71855501ff061620cef2681c6b82",
   "platform": "darwin",
   "scenarioVersion": 1,
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "280ce0d6f832": {
-      "name": "terminal.send#1",
-      "ordinal": 4,
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"terminal.send\",\"params\":{\"terminal\":\"term-1\",\"text\":\"Fix the failing checks\",\"enter\":true}}"
-    },
-    "30ec57518c05": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "Failed to create terminal",
-        "isRpcDeliveryUnknown": false
+    "01fc75db313f": {
+      "launched": {
+        "kind": "not-started",
+        "message": "The host sent a reply this app could not read (repo.list)"
       }
     },
-    "32a7c0ae7918": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "outer refused",
-        "isRpcDeliveryUnknown": false
-      }
-    },
-    "3f739faafdd4": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 1,
+    "02188f091419": {
+      "name": "settings.get#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "settings.get"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -67,39 +45,29 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "id": "frame-1",
+          "id": "frame-2",
           "ok": true,
           "result": {
-            "$rpc": "null"
+            "settings": {
+              "defaultTuiAgent": "codex",
+              "disabledTuiAgents": []
+            }
           }
         }
       }
     },
-    "478ad4afe83e": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "The host sent a reply this app could not read (session.tabs.createTerminal)",
-        "isRpcDeliveryUnknown": false
-      }
-    },
-    "5093e98ba369": {
-      "name": "session.tabs.createTerminal#1",
+    "12e70439f294": {
+      "name": "repo.list#1",
       "ordinal": 1,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "repo.list"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -114,34 +82,65 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
+          "error": {
+            "code": "method_not_found",
+            "message": "Unknown method"
+          },
           "id": "frame-1",
-          "ok": true,
-          "result": {
-            "tab": {
-              "id": "tab-1",
-              "terminal": "term-1",
-              "title": "Agent",
-              "type": "terminal"
-            }
+          "ok": false
+        }
+      }
+    },
+    "1321b4c8c0b8": {
+      "name": "repo.list#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
           }
         }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "1963ee2edae9": {
+      "launched": {
+        "kind": "not-started",
+        "message": "Unknown method"
       }
     },
-    "5422be2c33b6": {
-      "name": "session.tabs.createTerminal#1",
+    "1b23dab83fcf": {
+      "name": "repo.list#1",
       "ordinal": 1,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "repo.list"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -159,27 +158,39 @@
           "id": "frame-1",
           "ok": true,
           "result": {
-            "error": "inner refused",
-            "ok": false
+            "error": "refused"
           }
         }
       }
     },
-    "6bf6a76b4bf4": {
-      "name": "session.tabs.createTerminal#1",
+    "1c2564f1daca": {
+      "name": "settings.get#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
+    "28339abecf78": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"agent.launchReplay\",\"params\":{\"agent\":\"codex\",\"operationId\":\"1767225600000-00000000000040008000000000000001\",\"target\":{\"kind\":\"existing\",\"worktree\":\"id:repo-9::/w\"},\"prompt\":{\"text\":\"Fix the failing checks\",\"delivery\":\"submit\"},\"launchSource\":\"task_page\"}}"
+    },
+    "331b3596787f": {
+      "launched": {
+        "kind": "not-started",
+        "message": "outer refused"
+      }
+    },
+    "35f85fe3b71c": {
+      "name": "repo.list#1",
       "ordinal": 1,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "repo.list"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -190,31 +201,22 @@
         }
       ],
       "settlement": {
-        "status": "rejected",
-        "startedAt": 0,
-        "settledAt": 0,
-        "error": {
-          "category": "Error",
-          "message": "",
-          "isRpcDeliveryUnknown": true
-        }
+        "status": "pending",
+        "startedAt": 0
       }
     },
-    "72295d1a7229": {
-      "name": "session.tabs.createTerminal#1",
+    "3e6a0417d2ee": {
+      "name": "repo.list#1",
       "ordinal": 1,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "repo.list"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -232,26 +234,27 @@
           "id": "frame-1",
           "ok": true,
           "result": {
-            "error": "refused"
+            "repos": [
+              {
+                "id": "repo-9"
+              }
+            ]
           }
         }
       }
     },
-    "76bc1a917546": {
-      "name": "session.tabs.createTerminal#1",
+    "48c68906a98a": {
+      "name": "repo.list#1",
       "ordinal": 1,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "repo.list"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -262,43 +265,56 @@
         }
       ],
       "settlement": {
-        "status": "rejected",
+        "status": "fulfilled",
         "startedAt": 0,
         "settledAt": 0,
-        "error": {
-          "category": "Error",
-          "message": "transport failure",
-          "isRpcDeliveryUnknown": true
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "$rpc": "null"
+          }
         }
       }
     },
-    "9270aeb7d9c6": {
-      "status": "pending",
-      "startedAt": 0
-    },
-    "94d38f1838f6": {
-      "name": "session.tabs.createTerminal#1",
+    "51d4cb56be85": {
+      "name": "settings.get#1",
       "ordinal": 2,
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}"
-    },
-    "a4273b38df83": {
-      "launched": "unlaunched"
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
     },
-    "a46a4a08b27d": {
-      "name": "session.tabs.createTerminal#1",
+    "624ec4e5082c": {
+      "name": "repo.list#1",
       "ordinal": 1,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "repo.list"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -314,39 +330,26 @@
         "settledAt": 0,
         "value": {
           "error": {
-            "code": "method_not_found",
-            "message": "Unknown method"
+            "code": "refused",
+            "message": "outer refused"
           },
           "id": "frame-1",
           "ok": false
         }
       }
     },
-    "a947768bc0ed": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "transport failure",
-        "isRpcDeliveryUnknown": true
-      }
-    },
-    "ae5875338dfe": {
-      "name": "session.tabs.createTerminal#1",
+    "747c556da67a": {
+      "name": "repo.list#1",
       "ordinal": 1,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "repo.list"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -361,50 +364,23 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "error": {
-            "code": "refused",
-            "message": ""
-          },
           "id": "frame-1",
-          "ok": false
+          "ok": true
         }
       }
     },
-    "b948e8307e81": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "Unknown method",
-        "isRpcDeliveryUnknown": false
-      }
-    },
-    "c7584e82c72f": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "",
-        "isRpcDeliveryUnknown": true
-      }
-    },
-    "dea9ae4cf53d": {
-      "name": "session.tabs.createTerminal#1",
+    "8a72d3d14d44": {
+      "name": "repo.list#1",
       "ordinal": 1,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "repo.list"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -419,30 +395,31 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "error": {
-            "code": "refused",
-            "message": "outer refused"
-          },
           "id": "frame-1",
-          "ok": false
+          "ok": true,
+          "result": {
+            "error": "inner refused",
+            "ok": false
+          }
         }
       }
     },
-    "e3995d24a794": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 1,
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
+    },
+    "9c16efc31903": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "preflight.detectAgents"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -457,63 +434,91 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "id": "frame-1",
-          "ok": true
+          "id": "frame-3",
+          "ok": true,
+          "result": ["codex"]
         }
       }
     },
-    "eb79a9b3682a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "$rpc": "undefined"
+    "a4273b38df83": {
+      "launched": "unlaunched"
+    },
+    "b13ddf18a62e": {
+      "launched": {
+        "kind": "not-started",
+        "message": "Could not load the available agents."
       }
     },
-    "f9b284ac2424": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 1,
+    "ba3fac1eb199": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "agent.launchReplay"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
           }
         },
         {
           "name": "options",
           "value": {
-            "$rpc": "absent"
+            "timeoutMs": 90000
           }
         }
       ],
       "settlement": {
-        "status": "pending",
-        "startedAt": 0
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true,
+          "result": {
+            "outcome": {
+              "handle": "term-1",
+              "kind": "terminal"
+            },
+            "prompt": {
+              "delivery": "submit",
+              "outcome": "handed-to-terminal"
+            },
+            "receipt": {
+              "detail": "Started a terminal agent, the default for new agent tabs in your settings.",
+              "mode": "terminal",
+              "preferred": "terminal",
+              "reason": "user_default"
+            },
+            "worktreeId": "repo-9::/w"
+          }
+        }
       }
     },
-    "fbddf84c2257": {
-      "name": "session.tabs.createTerminal#1",
+    "d68475063b62": {
+      "name": "repo.list#1",
       "ordinal": 1,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "repo.list"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -539,23 +544,74 @@
         }
       }
     },
-    "fe1fe746e77a": {
-      "launched": "sent"
+    "dae756300589": {
+      "name": "repo.list#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "transport failure",
+          "isRpcDeliveryUnknown": true
+        }
+      }
     },
-    "fe53d3bce307": {
-      "name": "terminal.send#1",
+    "e0eef7c9fafe": {
+      "name": "repo.list#1",
       "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
+    },
+    "e35d7003f64c": {
+      "launched": {
+        "kind": "not-started",
+        "message": "transport failure"
+      }
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "eb8d47f90956": {
+      "launched": {
+        "kind": "sent"
+      }
+    },
+    "f1d579dd459c": {
+      "name": "repo.list#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "repo.list"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "$rpc": "absent"
           }
         },
         {
@@ -570,25 +626,29 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "send": {
-              "accepted": true
-            }
-          }
+          "error": {
+            "code": "refused",
+            "message": ""
+          },
+          "id": "frame-1",
+          "ok": false
         }
       }
+    },
+    "f49d184679d1": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectAgents\"}"
     }
   },
   "recording": {
-    "scenario": "matrix-session.pr-triage-session.tabs.createterminal-1",
+    "scenario": "matrix-session.pr-triage-repo.list-1",
     "checkpoints": [
       {
         "id": "pr-triage-launch.prelude:pending",
         "observation": {
-          "sender": ["f9b284ac2424"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["35f85fe3b71c", "51d4cb56be85"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
             "launch": "9270aeb7d9c6"
           },
@@ -599,132 +659,132 @@
       {
         "id": "pr-triage-launch.normal:launched",
         "observation": {
-          "sender": ["5093e98ba369", "fe53d3bce307"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "ba3fac1eb199"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
           "settlements": {
             "launch": "eb79a9b3682a"
           },
-          "state": "fe1fe746e77a",
+          "state": "eb8d47f90956",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.result-absent:launched",
         "observation": {
-          "sender": ["e3995d24a794"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["747c556da67a", "02188f091419"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
-            "launch": "478ad4afe83e"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "01fc75db313f",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.result-null:launched",
         "observation": {
-          "sender": ["3f739faafdd4"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["48c68906a98a", "02188f091419"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
-            "launch": "478ad4afe83e"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "01fc75db313f",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.inner-ok-missing:launched",
         "observation": {
-          "sender": ["72295d1a7229"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["1b23dab83fcf", "02188f091419"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
-            "launch": "478ad4afe83e"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "01fc75db313f",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.inner-false-string-error:launched",
         "observation": {
-          "sender": ["5422be2c33b6"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["8a72d3d14d44", "02188f091419"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
-            "launch": "478ad4afe83e"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "01fc75db313f",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.inner-false-object-error:launched",
         "observation": {
-          "sender": ["fbddf84c2257"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["d68475063b62", "02188f091419"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
-            "launch": "478ad4afe83e"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "01fc75db313f",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.outer-refused:launched",
         "observation": {
-          "sender": ["dea9ae4cf53d"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["624ec4e5082c", "02188f091419"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
-            "launch": "32a7c0ae7918"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "331b3596787f",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.outer-refused-no-message:launched",
         "observation": {
-          "sender": ["ae5875338dfe"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["f1d579dd459c", "02188f091419"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
-            "launch": "30ec57518c05"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "b13ddf18a62e",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.method-not-found:launched",
         "observation": {
-          "sender": ["a46a4a08b27d"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["12e70439f294", "02188f091419"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
-            "launch": "b948e8307e81"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "1963ee2edae9",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.transport-rejection:launched",
         "observation": {
-          "sender": ["76bc1a917546"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["dae756300589", "02188f091419"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
-            "launch": "a947768bc0ed"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "e35d7003f64c",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.transport-rejection-no-message:launched",
         "observation": {
-          "sender": ["6bf6a76b4bf4"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["1321b4c8c0b8", "02188f091419"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
-            "launch": "c7584e82c72f"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "b13ddf18a62e",
           "effects": []
         }
       }
diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-triage-terminal.send-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-triage-settings.get-1.json
similarity index 52%
rename from mobile/rpc-foundation/goldens/matrix-session.pr-triage-terminal.send-1.json
rename to mobile/rpc-foundation/goldens/matrix-session.pr-triage-settings.get-1.json
index 04bb0a8e17b2..793cb1435cb1 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.pr-triage-terminal.send-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.pr-triage-settings.get-1.json
@@ -3,30 +3,65 @@
   "family": "session.pr-triage",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
-  "scenarioSha256": "a288e105a0af6dbbd9657b84f7c4860826184fb7f50dabc6e31b114a70d7ca44",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
+  "scenarioSha256": "39923c0faa941865cc9aead881fef91ce5db117120033fe73665356a61a2ecc6",
   "platform": "darwin",
   "scenarioVersion": 1,
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "0fddcb81d17c": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
+    "02188f091419": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "settings": {
+              "defaultTuiAgent": "codex",
+              "disabledTuiAgents": []
+            }
+          }
+        }
+      }
+    },
+    "0ba58e9fadf7": {
+      "name": "settings.get#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "settings.get"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "$rpc": "absent"
           }
         },
         {
@@ -42,54 +77,69 @@
         "settledAt": 0,
         "value": {
           "error": {
-            "code": "refused",
-            "message": "outer refused"
+            "code": "method_not_found",
+            "message": "Unknown method"
           },
           "id": "frame-2",
           "ok": false
         }
       }
     },
-    "1953443d1eef": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "The host sent a reply this app could not read (terminal.send)",
-        "isRpcDeliveryUnknown": false
+    "0ca529648be4": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "",
+          "isRpcDeliveryUnknown": true
+        }
       }
     },
-    "280ce0d6f832": {
-      "name": "terminal.send#1",
-      "ordinal": 4,
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"terminal.send\",\"params\":{\"terminal\":\"term-1\",\"text\":\"Fix the failing checks\",\"enter\":true}}"
-    },
-    "32a7c0ae7918": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "outer refused",
-        "isRpcDeliveryUnknown": false
+    "1963ee2edae9": {
+      "launched": {
+        "kind": "not-started",
+        "message": "Unknown method"
       }
     },
-    "5093e98ba369": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 1,
+    "1c2564f1daca": {
+      "name": "settings.get#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
+    "1c5359ea3f7d": {
+      "name": "settings.get#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "settings.get"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -104,33 +154,40 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "id": "frame-1",
+          "id": "frame-2",
           "ok": true,
           "result": {
-            "tab": {
-              "id": "tab-1",
-              "terminal": "term-1",
-              "title": "Agent",
-              "type": "terminal"
-            }
+            "error": {
+              "message": "inner refused"
+            },
+            "ok": false
           }
         }
       }
     },
-    "5101a111b6fc": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
+    "28339abecf78": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"agent.launchReplay\",\"params\":{\"agent\":\"codex\",\"operationId\":\"1767225600000-00000000000040008000000000000001\",\"target\":{\"kind\":\"existing\",\"worktree\":\"id:repo-9::/w\"},\"prompt\":{\"text\":\"Fix the failing checks\",\"delivery\":\"submit\"},\"launchSource\":\"task_page\"}}"
+    },
+    "331b3596787f": {
+      "launched": {
+        "kind": "not-started",
+        "message": "outer refused"
+      }
+    },
+    "34f3a5b8bd78": {
+      "name": "settings.get#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "settings.get"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "$rpc": "absent"
           }
         },
         {
@@ -145,25 +202,53 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
+          "error": {
+            "code": "refused",
+            "message": ""
+          },
           "id": "frame-2",
-          "ok": true
+          "ok": false
         }
       }
     },
-    "52f741886b88": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
+    "35f85fe3b71c": {
+      "name": "repo.list#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "3e6a0417d2ee": {
+      "name": "repo.list#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "repo.list"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "$rpc": "absent"
           }
         },
         {
@@ -178,28 +263,56 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "id": "frame-2",
+          "id": "frame-1",
           "ok": true,
           "result": {
-            "error": "refused"
+            "repos": [
+              {
+                "id": "repo-9"
+              }
+            ]
           }
         }
       }
     },
-    "6ccc8bb71fd9": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
+    "51d4cb56be85": {
+      "name": "settings.get#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "settings.get"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "566d8202b582": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
           }
         },
         {
@@ -220,20 +333,18 @@
         }
       }
     },
-    "75252c821440": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
+    "69518e60477b": {
+      "name": "settings.get#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "settings.get"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "$rpc": "absent"
           }
         },
         {
@@ -256,29 +367,24 @@
         }
       }
     },
-    "9270aeb7d9c6": {
-      "status": "pending",
-      "startedAt": 0
+    "753cc167886c": {
+      "launched": {
+        "kind": "not-started",
+        "message": "Cannot read properties of null (reading 'settings')"
+      }
     },
-    "94d38f1838f6": {
-      "name": "session.tabs.createTerminal#1",
+    "86798e4821d1": {
+      "name": "settings.get#1",
       "ordinal": 2,
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}"
-    },
-    "94fd7b6e1923": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "settings.get"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "$rpc": "absent"
           }
         },
         {
@@ -289,30 +395,35 @@
         }
       ],
       "settlement": {
-        "status": "rejected",
+        "status": "fulfilled",
         "startedAt": 0,
         "settledAt": 0,
-        "error": {
-          "category": "Error",
-          "message": "",
-          "isRpcDeliveryUnknown": true
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "error": "inner refused",
+            "ok": false
+          }
         }
       }
     },
-    "9d6948ff3085": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
+    },
+    "98bd3a5fda2b": {
+      "name": "settings.get#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "settings.get"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "$rpc": "absent"
           }
         },
         {
@@ -327,42 +438,29 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "error": {
-            "code": "method_not_found",
-            "message": "Unknown method"
-          },
           "id": "frame-2",
-          "ok": false
+          "ok": true
         }
       }
     },
-    "a21f478354cc": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "Failed to send prompt",
-        "isRpcDeliveryUnknown": false
+    "9b538e8b95f3": {
+      "launched": {
+        "kind": "not-started",
+        "message": "Cannot read properties of undefined (reading 'settings')"
       }
     },
-    "a4273b38df83": {
-      "launched": "unlaunched"
-    },
-    "a89e0dd4a790": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
+    "9c16efc31903": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "preflight.detectAgents"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "$rpc": "absent"
           }
         },
         {
@@ -377,55 +475,49 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "id": "frame-2",
+          "id": "frame-3",
           "ok": true,
-          "result": {
-            "error": "inner refused",
-            "ok": false
-          }
+          "result": ["codex"]
         }
       }
     },
-    "a947768bc0ed": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "transport failure",
-        "isRpcDeliveryUnknown": true
-      }
+    "a4273b38df83": {
+      "launched": "unlaunched"
     },
-    "b948e8307e81": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "Unknown method",
-        "isRpcDeliveryUnknown": false
+    "b13ddf18a62e": {
+      "launched": {
+        "kind": "not-started",
+        "message": "Could not load the available agents."
       }
     },
-    "bccc77511918": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
+    "ba3fac1eb199": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "agent.launchReplay"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
           }
         },
         {
           "name": "options",
           "value": {
-            "$rpc": "absent"
+            "timeoutMs": 90000
           }
         }
       ],
@@ -434,31 +526,40 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "id": "frame-2",
+          "id": "frame-4",
           "ok": true,
           "result": {
-            "error": {
-              "message": "inner refused"
+            "outcome": {
+              "handle": "term-1",
+              "kind": "terminal"
             },
-            "ok": false
+            "prompt": {
+              "delivery": "submit",
+              "outcome": "handed-to-terminal"
+            },
+            "receipt": {
+              "detail": "Started a terminal agent, the default for new agent tabs in your settings.",
+              "mode": "terminal",
+              "preferred": "terminal",
+              "reason": "user_default"
+            },
+            "worktreeId": "repo-9::/w"
           }
         }
       }
     },
-    "bf156998a035": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
+    "ceb5fe72c101": {
+      "name": "settings.get#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "settings.get"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "$rpc": "absent"
           }
         },
         {
@@ -475,21 +576,22 @@
         "value": {
           "error": {
             "code": "refused",
-            "message": ""
+            "message": "outer refused"
           },
           "id": "frame-2",
           "ok": false
         }
       }
     },
-    "c7584e82c72f": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "",
-        "isRpcDeliveryUnknown": true
+    "e0eef7c9fafe": {
+      "name": "repo.list#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
+    },
+    "e35d7003f64c": {
+      "launched": {
+        "kind": "not-started",
+        "message": "transport failure"
       }
     },
     "eb79a9b3682a": {
@@ -500,52 +602,28 @@
         "$rpc": "undefined"
       }
     },
-    "f9b284ac2424": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 1,
-      "args": [
-        {
-          "name": "method",
-          "value": "session.tabs.createTerminal"
-        },
-        {
-          "name": "params",
-          "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
+    "eb8d47f90956": {
+      "launched": {
+        "kind": "sent"
       }
     },
-    "fe1fe746e77a": {
-      "launched": "sent"
+    "f49d184679d1": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectAgents\"}"
     },
-    "fe53d3bce307": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
+    "fb9f08890f70": {
+      "name": "settings.get#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "settings.get"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "$rpc": "absent"
           }
         },
         {
@@ -563,22 +641,20 @@
           "id": "frame-2",
           "ok": true,
           "result": {
-            "send": {
-              "accepted": true
-            }
+            "error": "refused"
           }
         }
       }
     }
   },
   "recording": {
-    "scenario": "matrix-session.pr-triage-terminal.send-1",
+    "scenario": "matrix-session.pr-triage-settings.get-1",
     "checkpoints": [
       {
         "id": "pr-triage-launch.prelude:pending",
         "observation": {
-          "sender": ["f9b284ac2424"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["35f85fe3b71c", "51d4cb56be85"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
             "launch": "9270aeb7d9c6"
           },
@@ -589,132 +665,132 @@
       {
         "id": "pr-triage-launch.normal:launched",
         "observation": {
-          "sender": ["5093e98ba369", "fe53d3bce307"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "ba3fac1eb199"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
           "settlements": {
             "launch": "eb79a9b3682a"
           },
-          "state": "fe1fe746e77a",
+          "state": "eb8d47f90956",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.result-absent:launched",
         "observation": {
-          "sender": ["5093e98ba369", "5101a111b6fc"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "98bd3a5fda2b", "9c16efc31903"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
           "settlements": {
-            "launch": "1953443d1eef"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "9b538e8b95f3",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.result-null:launched",
         "observation": {
-          "sender": ["5093e98ba369", "75252c821440"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "69518e60477b", "9c16efc31903"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
           "settlements": {
-            "launch": "1953443d1eef"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "753cc167886c",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.inner-ok-missing:launched",
         "observation": {
-          "sender": ["5093e98ba369", "52f741886b88"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "fb9f08890f70", "9c16efc31903", "ba3fac1eb199"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
           "settlements": {
             "launch": "eb79a9b3682a"
           },
-          "state": "fe1fe746e77a",
+          "state": "eb8d47f90956",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.inner-false-string-error:launched",
         "observation": {
-          "sender": ["5093e98ba369", "a89e0dd4a790"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "86798e4821d1", "9c16efc31903", "ba3fac1eb199"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
           "settlements": {
             "launch": "eb79a9b3682a"
           },
-          "state": "fe1fe746e77a",
+          "state": "eb8d47f90956",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.inner-false-object-error:launched",
         "observation": {
-          "sender": ["5093e98ba369", "bccc77511918"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "1c5359ea3f7d", "9c16efc31903", "ba3fac1eb199"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
           "settlements": {
             "launch": "eb79a9b3682a"
           },
-          "state": "fe1fe746e77a",
+          "state": "eb8d47f90956",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.outer-refused:launched",
         "observation": {
-          "sender": ["5093e98ba369", "0fddcb81d17c"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "ceb5fe72c101", "9c16efc31903"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
           "settlements": {
-            "launch": "32a7c0ae7918"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "331b3596787f",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.outer-refused-no-message:launched",
         "observation": {
-          "sender": ["5093e98ba369", "bf156998a035"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "34f3a5b8bd78", "9c16efc31903"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
           "settlements": {
-            "launch": "a21f478354cc"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "b13ddf18a62e",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.method-not-found:launched",
         "observation": {
-          "sender": ["5093e98ba369", "9d6948ff3085"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "0ba58e9fadf7", "9c16efc31903"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
           "settlements": {
-            "launch": "b948e8307e81"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "1963ee2edae9",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.transport-rejection:launched",
         "observation": {
-          "sender": ["5093e98ba369", "6ccc8bb71fd9"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "566d8202b582", "9c16efc31903"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
           "settlements": {
-            "launch": "a947768bc0ed"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "e35d7003f64c",
           "effects": []
         }
       },
       {
         "id": "pr-triage-launch.transport-rejection-no-message:launched",
         "observation": {
-          "sender": ["5093e98ba369", "94fd7b6e1923"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "0ca529648be4", "9c16efc31903"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1"],
           "settlements": {
-            "launch": "c7584e82c72f"
+            "launch": "eb79a9b3682a"
           },
-          "state": "a4273b38df83",
+          "state": "b13ddf18a62e",
           "effects": []
         }
       }
diff --git a/mobile/rpc-foundation/goldens/matrix-session.review-branch-diff-git.branchdiff-1.json b/mobile/rpc-foundation/goldens/matrix-session.review-branch-diff-git.branchdiff-1.json
index c1e88f92c804..32770529f332 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.review-branch-diff-git.branchdiff-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.review-branch-diff-git.branchdiff-1.json
@@ -3,9 +3,9 @@
   "family": "session.review-branch-diff",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "05d42780508d46d5c88f0c987448dc693bb49208a4298e6cf2f0d5e3979066af",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.review-file-diff-git.diff-1.json b/mobile/rpc-foundation/goldens/matrix-session.review-file-diff-git.diff-1.json
index 6fa899a9e22f..79dcf7b791ff 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.review-file-diff-git.diff-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.review-file-diff-git.diff-1.json
@@ -3,9 +3,9 @@
   "family": "session.review-file-diff",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "9567f8594e0287954c1b236b2f0617ed06be04d2b97f82e527c8e3ce732e65c1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.review-file-diff-git.diff-2.json b/mobile/rpc-foundation/goldens/matrix-session.review-file-diff-git.diff-2.json
index 12565587163a..a15faee5c952 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.review-file-diff-git.diff-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.review-file-diff-git.diff-2.json
@@ -3,9 +3,9 @@
   "family": "session.review-file-diff",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "95c8c5451aabbbebab8422ccd867b70e000ac62aacf1d231ad0d181cbec3a2b0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.review-file-diff-git.diff-3.json b/mobile/rpc-foundation/goldens/matrix-session.review-file-diff-git.diff-3.json
index 3b2dcebd0b97..90b7d3421647 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.review-file-diff-git.diff-3.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.review-file-diff-git.diff-3.json
@@ -3,9 +3,9 @@
   "family": "session.review-file-diff",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "91558fbfdf10c17a363e38cc0489b1a59e8b1657c51f7444840b2e7d37646851",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.review-git-mutations-git.discard-1.json b/mobile/rpc-foundation/goldens/matrix-session.review-git-mutations-git.discard-1.json
index df79c2610d2e..add506aecc9c 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.review-git-mutations-git.discard-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.review-git-mutations-git.discard-1.json
@@ -3,10 +3,10 @@
   "family": "session.review-git-mutations",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "651cb070a4b4ba7deddeb37c08886094b83f006e7cbe2bef65d5433ce0430dff",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-session.review-git-mutations-git.stage-1.json b/mobile/rpc-foundation/goldens/matrix-session.review-git-mutations-git.stage-1.json
index 415f8233f182..d79b2df09c76 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.review-git-mutations-git.stage-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.review-git-mutations-git.stage-1.json
@@ -3,10 +3,10 @@
   "family": "session.review-git-mutations",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "e0ce643010302d304ba3611bd43932c6cdd0fa9290a3ecd4fffb4fc92c758b77",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-session.review-git-mutations-git.stage-2.json b/mobile/rpc-foundation/goldens/matrix-session.review-git-mutations-git.stage-2.json
index 43d9f9019323..affdd0974f51 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.review-git-mutations-git.stage-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.review-git-mutations-git.stage-2.json
@@ -3,10 +3,10 @@
   "family": "session.review-git-mutations",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "c6b3b4be6b55daf53ee1f5ff755e73a032c4da5379f90f4973736c032eb79414",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-session.review-send-sheet-session.tabs.list-1.json b/mobile/rpc-foundation/goldens/matrix-session.review-send-sheet-session.tabs.list-1.json
index 76e67b6b2453..8e429ea6b72f 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.review-send-sheet-session.tabs.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.review-send-sheet-session.tabs.list-1.json
@@ -3,10 +3,10 @@
   "family": "session.review-send-sheet",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "a71815661dee6129a1b133c398b37ea89a9e4939b45626dada16889acabb2afe",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-1.json b/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-1.json
index 5e916449d307..e6122841e480 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-1.json
@@ -3,9 +3,9 @@
   "family": "session.startup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "6b08c394e37fd572cf63a4c11934247d379008f11117aa5af33b2926fbd32d1e",
   "scenarioSha256": "f4d1e8eff8e1a3dc7b04fcf5dafb2befca2211922443f1958ba801c49f488152",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-2.json b/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-2.json
index dbcaef526281..4e2a55ecc117 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-2.json
@@ -3,9 +3,9 @@
   "family": "session.startup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "6b08c394e37fd572cf63a4c11934247d379008f11117aa5af33b2926fbd32d1e",
   "scenarioSha256": "7ba969778e57cc5591365c688ef13ce5b09c41db9fa3666d61bbbbfe4e3fd35c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.tab-activation-session.tabs.activate-1.json b/mobile/rpc-foundation/goldens/matrix-session.tab-activation-session.tabs.activate-1.json
index 9421f95d56f1..7c1275889513 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.tab-activation-session.tabs.activate-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.tab-activation-session.tabs.activate-1.json
@@ -3,9 +3,9 @@
   "family": "session.tab-activation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4a1e81ab3229c8fd10b3ad435568efec11a944e0f02a183f94e4b1f44a7e5de0",
   "scenarioSha256": "d25fc19d4e3e9b12f2a60a076ea10741e13fc45dcd9a76bd3a9d88432c3e6fbe",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.tab-activation-terminal.focus-1.json b/mobile/rpc-foundation/goldens/matrix-session.tab-activation-terminal.focus-1.json
index 1dbd4dc2beec..8c00e200a5bc 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.tab-activation-terminal.focus-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.tab-activation-terminal.focus-1.json
@@ -3,9 +3,9 @@
   "family": "session.tab-activation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4a1e81ab3229c8fd10b3ad435568efec11a944e0f02a183f94e4b1f44a7e5de0",
   "scenarioSha256": "5b050af6f02aa90f66340838cb5cc53c8fc0d5693d313b653c23881150384874",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.tab-close-session-session.tabs.close-1.json b/mobile/rpc-foundation/goldens/matrix-session.tab-close-session-session.tabs.close-1.json
index ad7ea2ce8546..6cfee9aa3e2e 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.tab-close-session-session.tabs.close-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.tab-close-session-session.tabs.close-1.json
@@ -3,9 +3,9 @@
   "family": "session.tab-close-session",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "64c12ae20aaf7202c2271134d57e4312127e8f909ad086ba69b4662bbd749bb0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.tab-close-terminal.close-1.json b/mobile/rpc-foundation/goldens/matrix-session.tab-close-terminal.close-1.json
index 7cc08a7ff3fe..77844549a7c6 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.tab-close-terminal.close-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.tab-close-terminal.close-1.json
@@ -3,9 +3,9 @@
   "family": "session.tab-close",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "89141e3e400feea78460ede72d5269bdc885f6d3de75388542b4b7d6dff2840d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.tab-documents-markdown.readtab-1.json b/mobile/rpc-foundation/goldens/matrix-session.tab-documents-markdown.readtab-1.json
index e590b65756ce..80c376c3ea6e 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.tab-documents-markdown.readtab-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.tab-documents-markdown.readtab-1.json
@@ -3,9 +3,9 @@
   "family": "session.tab-documents",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "c97d925b63253e87ada0777e95a24ccf4e4e1682eda048800b44e335767df648",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.tab-rename-terminal.rename-1.json b/mobile/rpc-foundation/goldens/matrix-session.tab-rename-terminal.rename-1.json
index ef242034f3a2..64a564d7fa5e 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.tab-rename-terminal.rename-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.tab-rename-terminal.rename-1.json
@@ -3,9 +3,9 @@
   "family": "session.tab-rename",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "55c461287c1d8fb6de3c4fe28f801d095678dcf52bfcce39c336c9d61e8be908",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.tab-reveal-session.tabs.activate-1.json b/mobile/rpc-foundation/goldens/matrix-session.tab-reveal-session.tabs.activate-1.json
index 25c351d48df6..c6bb3eca2ee7 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.tab-reveal-session.tabs.activate-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.tab-reveal-session.tabs.activate-1.json
@@ -3,9 +3,9 @@
   "family": "session.tab-reveal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "73366226aeaec1581aeeb47219fc703917143cfd7f6a2eb01d7bd703a7c7612d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.tab-reveal-session.tabs.list-1.json b/mobile/rpc-foundation/goldens/matrix-session.tab-reveal-session.tabs.list-1.json
index d81d75ab6c88..be97568a3b3c 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.tab-reveal-session.tabs.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.tab-reveal-session.tabs.list-1.json
@@ -3,9 +3,9 @@
   "family": "session.tab-reveal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "c38f2bc5c9faca0774dfe202137877bada9deba165c5e9c955cbe67eae0cbdd9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.tabs-stream-health-session.tabs.list-1.json b/mobile/rpc-foundation/goldens/matrix-session.tabs-stream-health-session.tabs.list-1.json
index 8d9910fc77d4..3d0e30b909e9 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.tabs-stream-health-session.tabs.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.tabs-stream-health-session.tabs.list-1.json
@@ -3,9 +3,9 @@
   "family": "session.tabs-stream-health",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4a1e81ab3229c8fd10b3ad435568efec11a944e0f02a183f94e4b1f44a7e5de0",
   "scenarioSha256": "fab12524a09049d976da752cbe1b837a0aee04ce6e1eef75cbf517c862cb0d4a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.terminal-display-mode-terminal.setdisplaymode-1.json b/mobile/rpc-foundation/goldens/matrix-session.terminal-display-mode-terminal.setdisplaymode-1.json
index 2d8e6bec1cb6..cf8cb3ea08bf 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.terminal-display-mode-terminal.setdisplaymode-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.terminal-display-mode-terminal.setdisplaymode-1.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-display-mode",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "9e90ad39a8d4257adf30166757a6364c4710dc3ae9f06365f80a3dd8f1c94d89",
   "scenarioSha256": "2ae1839ae5f4fb98c2ef250fb5e071508ec1376e737dab28ac589c08f1a42b0e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.terminal-gesture-input-orchestration.workerterminaluserinput-1.json b/mobile/rpc-foundation/goldens/matrix-session.terminal-gesture-input-orchestration.workerterminaluserinput-1.json
index 77f5b727e5cd..a91abecbfec7 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.terminal-gesture-input-orchestration.workerterminaluserinput-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.terminal-gesture-input-orchestration.workerterminaluserinput-1.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-gesture-input",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "9d119d5ec320e2538105d6ff673b9f4b8e3decbe46527947489dffbcf2ac0472",
   "scenarioSha256": "27e0d44ca22593ff2ecef93de075508863024f3f10f00161818962c07e7b59e1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.terminal-gesture-input-terminal.clearbuffer-1.json b/mobile/rpc-foundation/goldens/matrix-session.terminal-gesture-input-terminal.clearbuffer-1.json
index 1d6b0f0491b3..9a73b8cb753a 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.terminal-gesture-input-terminal.clearbuffer-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.terminal-gesture-input-terminal.clearbuffer-1.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-gesture-input",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "9d119d5ec320e2538105d6ff673b9f4b8e3decbe46527947489dffbcf2ac0472",
   "scenarioSha256": "53ffb52ef015193fdaaeb1ac5a1c88488a607e6cec2e39e87d1e4e3173321983",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.terminal-gesture-input-terminal.send-1.json b/mobile/rpc-foundation/goldens/matrix-session.terminal-gesture-input-terminal.send-1.json
index 7a68013f209f..5e7fe880f0c6 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.terminal-gesture-input-terminal.send-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.terminal-gesture-input-terminal.send-1.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-gesture-input",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "9d119d5ec320e2538105d6ff673b9f4b8e3decbe46527947489dffbcf2ac0472",
   "scenarioSha256": "d7bc4d7a3e7e54accd4b51eef7e83ae70cc0c794738a83af222503a0f12ba70f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.terminal-input-send-orchestration.workerterminaluserinput-1.json b/mobile/rpc-foundation/goldens/matrix-session.terminal-input-send-orchestration.workerterminaluserinput-1.json
index df3dcf3211dc..f50d92b65004 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.terminal-input-send-orchestration.workerterminaluserinput-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.terminal-input-send-orchestration.workerterminaluserinput-1.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-input-send",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "cde3cac5407ef731315d18fc855b2696b9bfd30b90cb43d4a2cc812059cdd987",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.terminal-input-send-terminal.send-1.json b/mobile/rpc-foundation/goldens/matrix-session.terminal-input-send-terminal.send-1.json
index b6176064baff..b1214f83f76f 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.terminal-input-send-terminal.send-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.terminal-input-send-terminal.send-1.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-input-send",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "6575a0f89894d9b66e50a73446dfe92293ceccc7048b556f1ff114fd3ce05b8e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.terminal-inventory-terminal.list-1.json b/mobile/rpc-foundation/goldens/matrix-session.terminal-inventory-terminal.list-1.json
index 824e17a88197..9d938aafb56f 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.terminal-inventory-terminal.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.terminal-inventory-terminal.list-1.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "12f1006d704e362552317a3afcb4db4366146da3a863a1c55b524c6fc1b9757a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.terminal-paste-orchestration.workerterminaluserinput-1.json b/mobile/rpc-foundation/goldens/matrix-session.terminal-paste-orchestration.workerterminaluserinput-1.json
index cb0c0a781a0c..7c10f98cf150 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.terminal-paste-orchestration.workerterminaluserinput-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.terminal-paste-orchestration.workerterminaluserinput-1.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-paste",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "27c4f13ae43042cf5e6b5ca95e9c1a37db2f1f0c08b31a1164bb56cf0967549a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.terminal-paste-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-session.terminal-paste-settings.get-1.json
index ae2d911f42a0..fd21bdcd9e39 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.terminal-paste-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.terminal-paste-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-paste",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "449f8c793a371dddf1bb9b3beb36b2dbd9b991918dae1f6290df75fe6d2aeace",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.terminal-paste-terminal.send-1.json b/mobile/rpc-foundation/goldens/matrix-session.terminal-paste-terminal.send-1.json
index c6bdffbf86d4..1f4bcaf11fa2 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.terminal-paste-terminal.send-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.terminal-paste-terminal.send-1.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-paste",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "5cc67ab6df80a81be814a16cb60dcc4c703b0fc17594e409697a9fdeb0edeb76",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.worktree-connection-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-session.worktree-connection-repo.list-1.json
index 0da09a38cac2..2b9f88e97673 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.worktree-connection-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.worktree-connection-repo.list-1.json
@@ -3,9 +3,9 @@
   "family": "session.worktree-connection",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "e7fb7a8083aac4c8c5edc7dd52465ca53bfcded00bf8b1ec18ae7604651bbe32",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-session.worktree-connection-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-session.worktree-connection-settings.get-1.json
index 8b2439c882a8..5fc76824eb16 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.worktree-connection-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.worktree-connection-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "session.worktree-connection",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "b1e1b221ab7bfe5356c89a09cf4252613c78aecab48b2212e84ac7de885ec569",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings-agent-read-preflight.detectremoteagents-1.json b/mobile/rpc-foundation/goldens/matrix-settings-agent-read-preflight.detectremoteagents-1.json
index abe11a477e7a..b1a05557a62c 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings-agent-read-preflight.detectremoteagents-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings-agent-read-preflight.detectremoteagents-1.json
@@ -3,9 +3,9 @@
   "family": "settings-agent-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "a0effc9a0be519ccd18c1b1abfc8b497cd3858b89ea8d345ac0f8bd6d195cf21",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings-agent-read-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-settings-agent-read-repo.list-1.json
index 4b4741ad295d..aed8cd2f466c 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings-agent-read-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings-agent-read-repo.list-1.json
@@ -3,9 +3,9 @@
   "family": "settings-agent-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "c21b2e0e97fab86664f634cc99d77dd587df4af4d02e6286c8380e09844096b2",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings-agent-read-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings-agent-read-settings.get-1.json
index 702267171739..58eaf3c62c8b 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings-agent-read-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings-agent-read-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings-agent-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "46c4e32a921612c736c8cf45ff72ed513431c917ed3dd03f289c0ba4c28d6adb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings-best-effort-settings.update-1.json b/mobile/rpc-foundation/goldens/matrix-settings-best-effort-settings.update-1.json
index a63de0e36854..019b7bf7860e 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings-best-effort-settings.update-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings-best-effort-settings.update-1.json
@@ -3,9 +3,9 @@
   "family": "settings-best-effort",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d3b7f33d810e1fa420ac41a628cde9fe4a9e65fd57f89fbca0a40fc7d74951ab",
   "scenarioSha256": "cf671da175d50a4c2e1336f4e8338c24c4752db111e1eafd226bee6ff3582b1d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.bot-overrides-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.bot-overrides-settings.get-1.json
index 5e568e34ffbe..b29402a60a39 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.bot-overrides-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.bot-overrides-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.bot-overrides",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "01408cebcc193f8e30119381c8acf494fa5e29850fe010809deb330c2f9bcb36",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.home-providers-linear.status-1.json b/mobile/rpc-foundation/goldens/matrix-settings.home-providers-linear.status-1.json
index 1bcc830471ca..b513a25ec2e0 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.home-providers-linear.status-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.home-providers-linear.status-1.json
@@ -3,9 +3,9 @@
   "family": "settings.home-providers",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "19b445b39da98d28bcbcdab6f70e47ce208ca68f165e7b62c5fe9762eee67c8d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.home-providers-preflight.check-1.json b/mobile/rpc-foundation/goldens/matrix-settings.home-providers-preflight.check-1.json
index 97ab26944e83..3357d1ad059d 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.home-providers-preflight.check-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.home-providers-preflight.check-1.json
@@ -3,9 +3,9 @@
   "family": "settings.home-providers",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "4953dd0de509ce620b9840d7f460e472dc74f54d53636694d12cba2e3bb51da8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.home-providers-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.home-providers-settings.get-1.json
index 8e2ae7d2bf98..697bd7a56dc9 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.home-providers-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.home-providers-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.home-providers",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "70f601caeaee957bd3b172fc0fc12e85d6e2d6bed7683c86869559c6c9f25834",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.new-tab-local-agents-preflight.detectagents-1.json b/mobile/rpc-foundation/goldens/matrix-settings.new-tab-local-agents-preflight.detectagents-1.json
index 4316732f1abb..5271ca6e7114 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.new-tab-local-agents-preflight.detectagents-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.new-tab-local-agents-preflight.detectagents-1.json
@@ -3,9 +3,9 @@
   "family": "settings.new-tab-local-agents",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "c5db2d14be8dc1b3b3b68c151507da49d1c96b44f94b080c5908a65a885f1763",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.new-tab-local-agents-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-settings.new-tab-local-agents-repo.list-1.json
index 3b55ac284ef3..1fa58694ab90 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.new-tab-local-agents-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.new-tab-local-agents-repo.list-1.json
@@ -3,9 +3,9 @@
   "family": "settings.new-tab-local-agents",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "c9b66eb3c676b1e18db588b8e35f267f5618c007ae0955adcc3292740fddfe23",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.new-tab-local-agents-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.new-tab-local-agents-settings.get-1.json
index 87579c68f89c..0413b5312f07 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.new-tab-local-agents-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.new-tab-local-agents-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.new-tab-local-agents",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "9eaad87e8f648fdbfa33f493f991f9c7943fbf81f93580067819c4bbb02b672f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.quick-commands-settings.getterminalquickcommands-1.json b/mobile/rpc-foundation/goldens/matrix-settings.quick-commands-settings.getterminalquickcommands-1.json
index a382ecf05778..781c4453fb3d 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.quick-commands-settings.getterminalquickcommands-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.quick-commands-settings.getterminalquickcommands-1.json
@@ -3,9 +3,9 @@
   "family": "settings.quick-commands",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "42334358b5e5966001639653b553f15033f6e201d785107871fe056536f0a5e2",
   "scenarioSha256": "c6d5040d0fd1e6b852625561aa67d11f555f5adb12303b6f8d0176183026a6b1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.quick-commands-settings.updateterminalquickcommands-1.json b/mobile/rpc-foundation/goldens/matrix-settings.quick-commands-settings.updateterminalquickcommands-1.json
index e0b566c5bf67..ed8b968d466c 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.quick-commands-settings.updateterminalquickcommands-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.quick-commands-settings.updateterminalquickcommands-1.json
@@ -3,9 +3,9 @@
   "family": "settings.quick-commands",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "42334358b5e5966001639653b553f15033f6e201d785107871fe056536f0a5e2",
   "scenarioSha256": "b9edb5c27852d4e1e968f85668f1ea7afde3ed1c6e5c6582d6607f9fa5643356",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-host.platform-1.json b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-host.platform-1.json
index af48e0f739b6..22f64f961aae 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-host.platform-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-host.platform-1.json
@@ -3,9 +3,9 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "687b109bd2bcc0c85b7c858d553e68e2fc4cb5b281d9f8b32836dbacc4bdc8f2",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-repo.list-1.json
index bfdf2a038a32..850aad0c45bf 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-repo.list-1.json
@@ -3,9 +3,9 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "3199c745e22973b432b0a36c34bb0bdda994334a4a0cd7ad2daf8b172625ce8d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-settings.get-1.json
index 25ebaff2e5ac..4cc0de8e3c1a 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "5e9c3ff57cf432b24a17ee046636b61b94116a687cfa506cd79dee464542b76b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-ssh.listtargetsummaries-1.json b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-ssh.listtargetsummaries-1.json
index d8d592224df0..210ae740e67f 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-ssh.listtargetsummaries-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-ssh.listtargetsummaries-1.json
@@ -3,9 +3,9 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "a88061d3d1f03074b0ed2b663b523f1602362bc317ba614106f1f646d037d6e3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-folderworkspace.list-1.json b/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-folderworkspace.list-1.json
index 3e07728f4972..18f97a13d2b5 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-folderworkspace.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-folderworkspace.list-1.json
@@ -3,9 +3,9 @@
   "family": "settings.resume-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "50ba7c7963cb494e4b3d484eb334977d21cc69018da57d75a7b6fd0c92860bd2",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-projectgroup.list-1.json b/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-projectgroup.list-1.json
index 37342b579852..58aa1c29348f 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-projectgroup.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-projectgroup.list-1.json
@@ -3,9 +3,9 @@
   "family": "settings.resume-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "8dfd4550b39f0cfcb9aaa72fab0631b11f9e776ed389b206b326359d7f4c2d6e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-repo.list-1.json
index 350613e19338..f105cd29f963 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-repo.list-1.json
@@ -3,9 +3,9 @@
   "family": "settings.resume-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "85dc526201f66409dd6a411c5e14615b82389791ec210efb9889078f5d580373",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-settings.get-1.json
index 96f3b42b20ad..4680068df631 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.resume-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "080e10ae774ef097082267da0c8b6d0ebacae582d57b04a189c123258d0e5131",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-worktree.ps-1.json b/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-worktree.ps-1.json
index ae6957266877..4e83e3a031b0 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-worktree.ps-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.resume-metadata-worktree.ps-1.json
@@ -3,9 +3,9 @@
   "family": "settings.resume-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "5988fa5ce0bf6b8585f7ec66918123ee086d5cdf1185a4eeff2e88904985064c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-linear.status-1.json b/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-linear.status-1.json
index daa33e07d037..4f1e509abb08 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-linear.status-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-linear.status-1.json
@@ -3,9 +3,9 @@
   "family": "settings.task-hydration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "f5033a7a3567cc9e016bf09ac8bcd8ff381c3054c041dbccc773f7011918bf1d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-preflight.check-1.json b/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-preflight.check-1.json
index 2d7fe5a7d677..c268b5e77fd0 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-preflight.check-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-preflight.check-1.json
@@ -3,9 +3,9 @@
   "family": "settings.task-hydration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "0931b3d35868e5452cb550962f2408b6ce7cd6c89e90a9cf2897425edbb4b42d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-settings.get-1.json
index 8b4c53762328..981d619a412c 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.task-hydration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "d0f8d9bfe0e1469af3b0dab8b5c9799d91cc2234e72f0e031d6872059654077d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-status.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-status.get-1.json
index 801d3d7b4862..627a85f4dd2c 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-status.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-status.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.task-hydration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "3f448feff463b59c3927dae020ecd8d4931bb4a6036df6d6af080de2ec5fcf2b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-ui.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-ui.get-1.json
index aecf70a8eb75..39f6361a0ea5 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-ui.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.task-hydration-ui.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.task-hydration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "4438f9fd62876333bb980157612aaf457c5a9b9115659c8c941c3b373ad071dd",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.task-workspace-create-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.task-workspace-create-settings.get-1.json
index 2e57c82599e3..2cf32bbcfd43 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.task-workspace-create-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.task-workspace-create-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.task-workspace-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c2eed306311a844cd6f2f84b6513c0a1182f86a5e3cace434385b8287c80d7c5",
   "scenarioSha256": "7e4c5bb29e0f630cda8a09233575b9295e485f3d3e315ebdc0458c69515fcfc7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.task-workspace-create-worktree.create-1.json b/mobile/rpc-foundation/goldens/matrix-settings.task-workspace-create-worktree.create-1.json
index 9f1f8c0b2ff3..9178ad4f5e64 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.task-workspace-create-worktree.create-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.task-workspace-create-worktree.create-1.json
@@ -3,9 +3,9 @@
   "family": "settings.task-workspace-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c2eed306311a844cd6f2f84b6513c0a1182f86a5e3cace434385b8287c80d7c5",
   "scenarioSha256": "1d7713cf4c23d053105c2abb02340d81d5eb689f4311a0984932d8ebd031b4ce",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.task-workspace-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.task-workspace-settings.get-1.json
index 85ff2950da72..f8027c550d19 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.task-workspace-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.task-workspace-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.task-workspace",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c2eed306311a844cd6f2f84b6513c0a1182f86a5e3cace434385b8287c80d7c5",
   "scenarioSha256": "994ea8b4ddb05774a8c2d5902bb68bf5e8f25399a787262b8f23f458f2790698",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-linear.status-1.json b/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-linear.status-1.json
index b695d4f0e4d2..aadc58bbff9c 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-linear.status-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-linear.status-1.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-context",
   "namedDeltas": ["new-workspace-runtime-context-null-results-degrade-to-absent"],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "30b3f8d79589e9fb3d7ef804233554fa231f68ab88e5130ddfa78e79221e3c78",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-preflight.check-1.json b/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-preflight.check-1.json
index d578487105ff..96657659b8eb 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-preflight.check-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-preflight.check-1.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-context",
   "namedDeltas": ["new-workspace-runtime-context-null-results-degrade-to-absent"],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "a5366cbd31d899feeb7e1901edd0c78191c2c8c8179ad5d5b24b7ca22bd538f8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-settings.get-1.json
index a6811237c680..0fd556516d54 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-context",
   "namedDeltas": ["new-workspace-runtime-context-null-results-degrade-to-absent"],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "797ea410af6536410335ebe93b8bc354cd633cf980eb95efbb10bc46f5516cb7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-ui.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-ui.get-1.json
index 6c050ddf6a8a..8f41fad96370 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-ui.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.workspace-context-ui.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-context",
   "namedDeltas": ["new-workspace-runtime-context-null-results-degrade-to-absent"],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "3cd29e7b6a1cdfd99796a58cf6ad6f9aa3dbac75dd6e989ea99ba6027c210028",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.workspace-submit-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.workspace-submit-settings.get-1.json
index 19c8133d2d91..d537ef9a2735 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.workspace-submit-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.workspace-submit-settings.get-1.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-submit",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c2eed306311a844cd6f2f84b6513c0a1182f86a5e3cace434385b8287c80d7c5",
   "scenarioSha256": "a89bdf93df71a958810aba72c80e42f663644781a29e934898e2ddf86c5dd5d5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-speech.dictation-chunk-speech.dictation.chunk-1.json b/mobile/rpc-foundation/goldens/matrix-speech.dictation-chunk-speech.dictation.chunk-1.json
index 7f00012554a1..abb97747284b 100644
--- a/mobile/rpc-foundation/goldens/matrix-speech.dictation-chunk-speech.dictation.chunk-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-speech.dictation-chunk-speech.dictation.chunk-1.json
@@ -3,9 +3,9 @@
   "family": "speech.dictation-chunk",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "cfc84498c2ed080ca2be50725c8ad4fac84eaf2e64ecad1445997949737da11d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-speech.dictation-session-speech.dictation.finish-1.json b/mobile/rpc-foundation/goldens/matrix-speech.dictation-session-speech.dictation.finish-1.json
index a1281ea3ff59..8e9554098bb0 100644
--- a/mobile/rpc-foundation/goldens/matrix-speech.dictation-session-speech.dictation.finish-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-speech.dictation-session-speech.dictation.finish-1.json
@@ -3,9 +3,9 @@
   "family": "speech.dictation-session",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "2cb8e1e5c1c4f9da7dcf68e3fcd51a3979966019b5872279b7347d5f09f381d5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-speech.dictation-session-speech.dictation.start-1.json b/mobile/rpc-foundation/goldens/matrix-speech.dictation-session-speech.dictation.start-1.json
index 38f6e9dc2572..1b59a18276f4 100644
--- a/mobile/rpc-foundation/goldens/matrix-speech.dictation-session-speech.dictation.start-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-speech.dictation-session-speech.dictation.start-1.json
@@ -3,9 +3,9 @@
   "family": "speech.dictation-session",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "c72f6ff7dad56e5dca200f2c9c71567f0d9811c7e39a9b9aee4543f0f9d9ca0a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-speech.dictation-start-speech.dictation.cancel-1.json b/mobile/rpc-foundation/goldens/matrix-speech.dictation-start-speech.dictation.cancel-1.json
index 9768badcdecb..8db821475d58 100644
--- a/mobile/rpc-foundation/goldens/matrix-speech.dictation-start-speech.dictation.cancel-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-speech.dictation-start-speech.dictation.cancel-1.json
@@ -3,9 +3,9 @@
   "family": "speech.dictation-start",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "ef890c668aded545c5423322aeaab0e0715ff80d5f76c6512d6579e277853f6c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-speech.dictation-start-speech.dictation.start-1.json b/mobile/rpc-foundation/goldens/matrix-speech.dictation-start-speech.dictation.start-1.json
index 9499a4abee68..8f8cdc5dd82b 100644
--- a/mobile/rpc-foundation/goldens/matrix-speech.dictation-start-speech.dictation.start-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-speech.dictation-start-speech.dictation.start-1.json
@@ -3,9 +3,9 @@
   "family": "speech.dictation-start",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "cd65f6b30f92d9542d19ad74cc9437ea33a1ec8fbdf4439ba13c14960f8a1994",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.dictation.setup-1.json b/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.dictation.setup-1.json
index e668cc458a8a..5fbae8a9192d 100644
--- a/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.dictation.setup-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.dictation.setup-1.json
@@ -3,9 +3,9 @@
   "family": "speech.setup-sheet",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "407a52b099cbf2fcb261010e4235dae2e5e16e11b386fb6bc99d5a2d237af541",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.models.delete-1.json b/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.models.delete-1.json
index 87709b930cbc..fb85e5e7d790 100644
--- a/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.models.delete-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.models.delete-1.json
@@ -3,9 +3,9 @@
   "family": "speech.setup-sheet",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "140ede79a9ee0c02bedbfe67551060ef85692b6cb71968a48a1c41fcb4863804",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.models.download-1.json b/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.models.download-1.json
index d0ae0814f42d..c1fd7934eade 100644
--- a/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.models.download-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.models.download-1.json
@@ -3,9 +3,9 @@
   "family": "speech.setup-sheet",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "6c0a9d2f2e28acd10c3a1f03888c23961e95bff02af10fe0e703d34fe6d60e8b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.models.list-1.json b/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.models.list-1.json
index 9a83422d890d..ef4e546b36fb 100644
--- a/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.models.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-speech.setup-sheet-speech.models.list-1.json
@@ -3,9 +3,9 @@
   "family": "speech.setup-sheet",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "d63062b89cc83321f6bcbd05c55dd21c71c6ff8c8026d026b5d94e44278ed3d8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.addprreviewcomment-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.addprreviewcomment-1.json
index 5e9aaf369444..5ac35183373a 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.addprreviewcomment-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.addprreviewcomment-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-checks-files",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8c4218bfb2af227da5386f29989cec438f2c6187f39ce1c06859e136ea920bfa",
   "scenarioSha256": "7bf61d34ba5217f7c00925612bb17542f3db17e1298294ca3ed647cd46278745",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.prfilecontents-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.prfilecontents-1.json
index 1308ab6b4158..f6ddc37e0f74 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.prfilecontents-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.prfilecontents-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-checks-files",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8c4218bfb2af227da5386f29989cec438f2c6187f39ce1c06859e136ea920bfa",
   "scenarioSha256": "0186ae4ee9b3653fd9e7050a5316608a8e68f8bb463e1391862cdb3cd312676b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.rerunprchecks-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.rerunprchecks-1.json
index 12e01cd9e56d..9a921f60ec5f 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.rerunprchecks-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.rerunprchecks-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-checks-files",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8c4218bfb2af227da5386f29989cec438f2c6187f39ce1c06859e136ea920bfa",
   "scenarioSha256": "8f5a47f74635937c88584eeac40d2d9bec960823e7bf8f242e48575355be0d4e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.resolvereviewthread-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.resolvereviewthread-1.json
index 89bcbbca0711..66661fdfe92a 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.resolvereviewthread-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.resolvereviewthread-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-checks-files",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8c4218bfb2af227da5386f29989cec438f2c6187f39ce1c06859e136ea920bfa",
   "scenarioSha256": "c91ad2604cacc2b02ccd727333ba66275a27f783f3adb1faf64699ea0ffa67c2",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.setprfileviewed-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.setprfileviewed-1.json
index 7e72c357c71d..fb73ddfdf912 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.setprfileviewed-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-checks-files-github.setprfileviewed-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-checks-files",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8c4218bfb2af227da5386f29989cec438f2c6187f39ce1c06859e136ea920bfa",
   "scenarioSha256": "984dd772f207f674d511d2711819855c7c6923d858ef87ea159842c337ed3ea0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-github-github.addissuecomment-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-github-github.addissuecomment-1.json
index 472b24cf7989..9d268655d891 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-github-github.addissuecomment-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-github-github.addissuecomment-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-comment-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "1cc7fdf3139e0c5a81cd83987ffedc4f59cd4866fc1b4018b61e35eacc74fc11",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-gitlab.addissuecomment-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-gitlab.addissuecomment-1.json
index 6a3171655ee6..e898469e7654 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-gitlab.addissuecomment-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-gitlab.addissuecomment-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-comment-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "154d91d00db23ea2718a6ee0b6c5cafc7233084532b3d561731b059d58e006f5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-mr-gitlab.addmrcomment-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-mr-gitlab.addmrcomment-1.json
index 0a5808cc9f23..a1967b96b5be 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-mr-gitlab.addmrcomment-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-mr-gitlab.addmrcomment-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-comment-gitlab-mr",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "ae07579881829263a2b5590249d4119f5d9f4ef3877149ac3b780ad985413f00",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-github-github.workitemdetails-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-github-github.workitemdetails-1.json
index 3007cc4b0a02..d0aa49fbb853 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-github-github.workitemdetails-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-github-github.workitemdetails-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-detail-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c0ef16b959002e4a3c5347114a0844b95670e274ef010d910b6671ac5f49e783",
   "scenarioSha256": "955729f9100dce7eeb103f7b4d08ff56ac66853b9ad0d33627c0838011287bca",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-gitlab-gitlab.workitemdetails-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-gitlab-gitlab.workitemdetails-1.json
index 7c5d5195b45b..b13a5344e8ce 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-gitlab-gitlab.workitemdetails-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-gitlab-gitlab.workitemdetails-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-detail-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c0ef16b959002e4a3c5347114a0844b95670e274ef010d910b6671ac5f49e783",
   "scenarioSha256": "d163c6125fa180da7575642ee29f4bb18e3678079b7c30a42934550896d5b3c1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-linear-linear.getissue-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-linear-linear.getissue-1.json
index b341bb773d6c..82147afb79a3 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-linear-linear.getissue-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-linear-linear.getissue-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-detail-linear",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c0ef16b959002e4a3c5347114a0844b95670e274ef010d910b6671ac5f49e783",
   "scenarioSha256": "83b30b2a160d162d16c66aa3bf6a633489e86dd4fd1c30828d2d244164b9c95e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-linear-linear.issuecomments-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-linear-linear.issuecomments-1.json
index 590b6238e0a1..837399280345 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-linear-linear.issuecomments-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-linear-linear.issuecomments-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-detail-linear",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c0ef16b959002e4a3c5347114a0844b95670e274ef010d910b6671ac5f49e783",
   "scenarioSha256": "06b06c84f4b8a1ee8e5159d8ada2656da4d7096729759c76601ad4e251310924",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-metadata-github.listassignableusers-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-metadata-github.listassignableusers-1.json
index 484c8e361983..0bf04e347361 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-metadata-github.listassignableusers-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-metadata-github.listassignableusers-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-detail-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "58ea1553e04017c993aea4753aace41ee664705a3fdb3b18569c5a9d7968cf06",
   "scenarioSha256": "3ef6ef046f60d2d11ef81adf69bd5216036405eb05e5fd30cf1c402120488ee5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-metadata-github.listlabels-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-metadata-github.listlabels-1.json
index fcd9b61e2b39..8a725b43c2b0 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-metadata-github.listlabels-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-detail-metadata-github.listlabels-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-detail-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "58ea1553e04017c993aea4753aace41ee664705a3fdb3b18569c5a9d7968cf06",
   "scenarioSha256": "a2ecf4ddc2c9870a8d73cbd920b46bb0663a958ac156dc6de092be3c9474ea2b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-merge-gitlab-gitlab.mergemr-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-merge-gitlab-gitlab.mergemr-1.json
index aed1514179f5..f078de637465 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-merge-gitlab-gitlab.mergemr-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-merge-gitlab-gitlab.mergemr-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-merge-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "f40d99c60523ad1a6a3a761935e86ab0739337486dd316e6ab3248980e575027",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-metadata-github-github.updatepr-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-metadata-github-github.updatepr-1.json
index 026cd54c13b1..07caea1146cb 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-metadata-github-github.updatepr-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-metadata-github-github.updatepr-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-metadata-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "97cfbcd82778ed6517ca2d10b2f3ad5a8d366e380d7846c1e89d5a5baf17e739",
   "scenarioSha256": "27587bfb5745051e3cb27b01dc49b90b6f3c8ddbeb38f20772502fae2f562d91",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-metadata-gitlab-gitlab.updateissue-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-metadata-gitlab-gitlab.updateissue-1.json
index fd29176f8ed0..ad5b2516e9ae 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-metadata-gitlab-gitlab.updateissue-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-metadata-gitlab-gitlab.updateissue-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-metadata-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "97cfbcd82778ed6517ca2d10b2f3ad5a8d366e380d7846c1e89d5a5baf17e739",
   "scenarioSha256": "01664112d8f24d0a08fa7ba4e2d7f389acb363ce493e083f359f90fa0b87911d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-metadata-gitlab-mr-gitlab.updatemr-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-metadata-gitlab-mr-gitlab.updatemr-1.json
index 048742ba25d3..93e2a9c01385 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-metadata-gitlab-mr-gitlab.updatemr-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-metadata-gitlab-mr-gitlab.updatemr-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-metadata-gitlab-mr",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "97cfbcd82778ed6517ca2d10b2f3ad5a8d366e380d7846c1e89d5a5baf17e739",
   "scenarioSha256": "186444ac8dc34dc63d1fbf304275e2265d96c6742e4c8f1e8e5568aa5504bf5d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-github.addissuecomment-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-github.addissuecomment-1.json
index 5378dd7289e1..a3190dbd8f3f 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-github.addissuecomment-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-github.addissuecomment-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-reply-merge",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "c6e5ae446b875afba3944a96d931fdca6006ed8e904374e5040088004eb9b044",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-github.addprreviewcommentreply-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-github.addprreviewcommentreply-1.json
index 25e4ad863278..59f6fc744dcf 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-github.addprreviewcommentreply-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-github.addprreviewcommentreply-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-reply-merge",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "2da11d5a9c7a223a59c56ec416ab33acd42d900b4080132bde27313e042808d9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-github.mergepr-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-github.mergepr-1.json
index a89fea1be21d..7e924dee5603 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-github.mergepr-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-github.mergepr-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-reply-merge",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "a5d8ba37f44421d3efd19617ef319f37fda3fe53004b6829ae2c320f85d5c98d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-linear.updateissue-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-linear.updateissue-1.json
index 1782f94cf27e..aa1f2f09e61e 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-linear.updateissue-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-reply-merge-linear.updateissue-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-reply-merge",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "abc4b882c92ba90a52d3635fe882b2c653bc91ab4d9927f240ebee4dd147b81d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.prchecks-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.prchecks-1.json
index a105db8e132b..8af1b976c2e3 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.prchecks-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.prchecks-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-review-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "77b0812842903075bb3d3ec1f7bcea94b1e1dac5993c3c8854bd4c3d2a567988",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.requestprreviewers-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.requestprreviewers-1.json
index 69774c6ab507..22163e9d2ebf 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.requestprreviewers-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.requestprreviewers-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-review-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "96a1813de0159396f6a5eb36a764fad4511de0a25eff6323571e1fade2a7f334",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-status-gitlab-github.updateissue-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-status-gitlab-github.updateissue-1.json
index 095bf5c9c317..3ddb6d68b538 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-status-gitlab-github.updateissue-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-status-gitlab-github.updateissue-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-status-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8c4218bfb2af227da5386f29989cec438f2c6187f39ce1c06859e136ea920bfa",
   "scenarioSha256": "57c41b51e34e451975a9f28a6461aa3b8e9dcf04cbebaea80ddf14afc4b78edf",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-status-gitlab-gitlab.updateissue-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-status-gitlab-gitlab.updateissue-1.json
index a59f3cd6d1e8..931029323417 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-status-gitlab-gitlab.updateissue-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-status-gitlab-gitlab.updateissue-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-status-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8c4218bfb2af227da5386f29989cec438f2c6187f39ce1c06859e136ea920bfa",
   "scenarioSha256": "64a7af1bfac25dfe673832ef0ef7776be8d1a628c995eafd938fa3ad11d7ba0f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-status-gitlab-mr-gitlab.updatemrstate-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-status-gitlab-mr-gitlab.updatemrstate-1.json
index dc6bf053fde5..ff43beb630c7 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.item-status-gitlab-mr-gitlab.updatemrstate-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-status-gitlab-mr-gitlab.updatemrstate-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-status-gitlab-mr",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8c4218bfb2af227da5386f29989cec438f2c6187f39ce1c06859e136ea920bfa",
   "scenarioSha256": "8443a59a1d432fbcfb9d158995cfa69bef364c33b66a97cbef0e70e197fcad4d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.linear-connect-linear.connect-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.linear-connect-linear.connect-1.json
index d3a64c77c214..58deb7a6c841 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.linear-connect-linear.connect-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.linear-connect-linear.connect-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.linear-connect",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "a60d7c0ce3d155116aecbb3d1ca015b4d9de310155f4e840b2fc391dc9d04860",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.addissuecomment-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.addissuecomment-1.json
index f9e94c43f590..79dc781dee0d 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.addissuecomment-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.addissuecomment-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.linear-item",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "97cfbcd82778ed6517ca2d10b2f3ad5a8d366e380d7846c1e89d5a5baf17e739",
   "scenarioSha256": "a2c0c5c200b36d2194815e67df2ea50422f6ecfd9df411132202e9660c87c41b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.createissue-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.createissue-1.json
index 6c3505603e57..e4e48b2582c2 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.createissue-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.createissue-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.linear-item",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "97cfbcd82778ed6517ca2d10b2f3ad5a8d366e380d7846c1e89d5a5baf17e739",
   "scenarioSha256": "8a5c5b210459d3938bc010bc88c69696a631072cd5a6b7e1a3eb3e1fd0da9c8a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.getissue-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.getissue-1.json
index 5d9de9fb8013..21bd3a72283a 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.getissue-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.getissue-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.linear-item",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "97cfbcd82778ed6517ca2d10b2f3ad5a8d366e380d7846c1e89d5a5baf17e739",
   "scenarioSha256": "ab0ac02611d487a9edd58319c6e4b9302148684f27711afc3b69feaa73fc4b07",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.listteams-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.listteams-1.json
index 9be0758f7e9e..5728d801bfdc 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.listteams-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.listteams-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.linear-team-context",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "58ea1553e04017c993aea4753aace41ee664705a3fdb3b18569c5a9d7968cf06",
   "scenarioSha256": "c4a5928ef7035ad8bed20945f235f4fa509238b3a167c91df50baefff8e8433f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.teamstates-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.teamstates-1.json
index 1ec2ecc669a5..b466b490213f 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.teamstates-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.teamstates-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.linear-team-context",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "58ea1553e04017c993aea4753aace41ee664705a3fdb3b18569c5a9d7968cf06",
   "scenarioSha256": "8ec517c98775f3af0d45776dc74bcaaf99dcc751e85343084e39c557b6ddede1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-github.reposlug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-github.reposlug-1.json
index b28fcf6ec33c..810768d84b26 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-github.reposlug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-github.reposlug-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.paste-lookup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "77b429e1066a877bb3c8513e89e42314bb974478385695ceb36dbaa7c57e654a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-github.workitem-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-github.workitem-1.json
index 454b058312a2..400112c00cb4 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-github.workitem-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-github.workitem-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.paste-lookup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "8d58d134262cd828348bc3416f7208b51259dff9ea952eeceaab6e6dcfcfd96a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-github.workitembyownerrepo-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-github.workitembyownerrepo-1.json
index 396c38e2301d..11d0eab7074e 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-github.workitembyownerrepo-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-github.workitembyownerrepo-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.paste-lookup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "4dc2c4cfc9c29ee998796980a7ae6ded99a39f17e143e3db588239bc224b2cc5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-gitlab.workitembypath-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-gitlab.workitembypath-1.json
index 825c74026cac..427f4b93c046 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-gitlab.workitembypath-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.paste-lookup-gitlab.workitembypath-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.paste-lookup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "d622fc252f4e2e1d2e244d8781b260ed6e42dee572b8d2fd39d6c3b49baae04a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.listaccessible-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.listaccessible-1.json
index 2860a714dcec..26c3fe0e2cfb 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.listaccessible-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.listaccessible-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-board-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c4272385ed3b0de4feab38de9e4f6363ecd6317fdd4de47f76a98eb18abaf371",
   "scenarioSha256": "7c16d49ffeace5c689309316da6e4638fa1b70d3ef52a78d27db934ae56cf64d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.listviews-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.listviews-1.json
index 74e1dffc6d15..9747f14435c9 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.listviews-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.listviews-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-board-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c4272385ed3b0de4feab38de9e4f6363ecd6317fdd4de47f76a98eb18abaf371",
   "scenarioSha256": "c5cc9a11a75a86780195be7d1055d1064c8aba78bb8e4e8bbdf033409c2b2aa5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.listviews-2.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.listviews-2.json
index 9547b543ba03..049aa7f2a329 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.listviews-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.listviews-2.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-board-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c4272385ed3b0de4feab38de9e4f6363ecd6317fdd4de47f76a98eb18abaf371",
   "scenarioSha256": "7f748bb55df907bba315ea6899c585837d97fa0ea9b312330cf35d95bda87bd1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.resolveref-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.resolveref-1.json
index b6b85694563f..6e56719868f7 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.resolveref-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.resolveref-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-board-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c4272385ed3b0de4feab38de9e4f6363ecd6317fdd4de47f76a98eb18abaf371",
   "scenarioSha256": "4ab4e4022cafd69cbc7af45ddf72d2dad3e8215df363511651d7faea014147d3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.viewtable-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.viewtable-1.json
index ad2237058497..75a2aab11dc9 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.viewtable-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-board-load-github.project.viewtable-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-board-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c4272385ed3b0de4feab38de9e4f6363ecd6317fdd4de47f76a98eb18abaf371",
   "scenarioSha256": "cf64dd43e708ff953ba2cbb2a70378aa8ab5d13ede157af7ba0967d913755b82",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-repo-slugs-github.reposlug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-repo-slugs-github.reposlug-1.json
index a15040b6800a..869b299858cd 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-repo-slugs-github.reposlug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-repo-slugs-github.reposlug-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-repo-slugs",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c4272385ed3b0de4feab38de9e4f6363ecd6317fdd4de47f76a98eb18abaf371",
   "scenarioSha256": "667a06cf9ff8129eee64327566012448abe1fe31f58c0d9b882b13e74db5a877",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-issue-github.project.addissuecommentbyslug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-issue-github.project.addissuecommentbyslug-1.json
index 1ac8d2d07cdc..2a8b844acb04 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-issue-github.project.addissuecommentbyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-issue-github.project.addissuecommentbyslug-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-comments-issue",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55058202df36c8b951510215936e496ea88d3d71a6690090a13c52deb13e34e1",
   "scenarioSha256": "9fd4756c2224f3ecbc9ffc82e1ee11615a9e057e600bc56ccaf5c5e2c0e411d8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-issue-github.project.updateissuebyslug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-issue-github.project.updateissuebyslug-1.json
index 4ddbad874cfc..64bff9f06bb0 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-issue-github.project.updateissuebyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-issue-github.project.updateissuebyslug-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-comments-issue",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55058202df36c8b951510215936e496ea88d3d71a6690090a13c52deb13e34e1",
   "scenarioSha256": "cfe0284f502001a57a9d18585222e5ae4b254d9bac32e0bb4080ee9363e8e019",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-issue-github.project.updateissuecommentbyslug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-issue-github.project.updateissuecommentbyslug-1.json
index abaa900455fb..eed0fd8f95e8 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-issue-github.project.updateissuecommentbyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-issue-github.project.updateissuecommentbyslug-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-comments-issue",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55058202df36c8b951510215936e496ea88d3d71a6690090a13c52deb13e34e1",
   "scenarioSha256": "b21a3b3f568bf6caecca62272f4b7882062027684c70878fd5f883622ff2a9ea",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-pr-github.project.updatepullrequestbyslug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-pr-github.project.updatepullrequestbyslug-1.json
index f153b5976241..2683eefce2c6 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-pr-github.project.updatepullrequestbyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-comments-pr-github.project.updatepullrequestbyslug-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-comments-pr",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55058202df36c8b951510215936e496ea88d3d71a6690090a13c52deb13e34e1",
   "scenarioSha256": "e286edb942c338fd844ce8437ac03c872838228515ce833cfd310332354da725",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-detail-github.project.workitemdetailsbyslug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-detail-github.project.workitemdetailsbyslug-1.json
index 047a5da13a77..82a9c9657192 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-detail-github.project.workitemdetailsbyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-detail-github.project.workitemdetailsbyslug-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-detail",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "f8f6e5d500f959b9b15c5498885a05422747880b6aef4ad795bc3064ebbacea6",
   "scenarioSha256": "52b2cc222d9819121ba99f8f603bc76abe420d731e5853116e802a4db59e2d3e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-fields-github.project.clearitemfield-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-fields-github.project.clearitemfield-1.json
index f5c27bfc6498..4720e2300ef4 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-fields-github.project.clearitemfield-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-fields-github.project.clearitemfield-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-fields",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "370aeaee59978071ccb821da13c9e6114936c168947b608539cdb80d40cc9889",
   "scenarioSha256": "0fe8c60631cf04d33b34371155f5f80c8426b07b1cbec2fabc5d6d619f2633b8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-fields-github.project.updateissuetypebyslug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-fields-github.project.updateissuetypebyslug-1.json
index fb7afaa772d3..d20f5e2f7ef2 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-fields-github.project.updateissuetypebyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-fields-github.project.updateissuetypebyslug-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-fields",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "370aeaee59978071ccb821da13c9e6114936c168947b608539cdb80d40cc9889",
   "scenarioSha256": "8ad021e101d8ef17ed47472a5fbfbeaebb2690a4040c89a0e9ee133e69e4fecd",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-fields-github.project.updateitemfield-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-fields-github.project.updateitemfield-1.json
index 1c396fea4830..f44b7d8524d8 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-fields-github.project.updateitemfield-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-fields-github.project.updateitemfield-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-fields",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "370aeaee59978071ccb821da13c9e6114936c168947b608539cdb80d40cc9889",
   "scenarioSha256": "4d33ce12f3f35bea8a98fec2c0378e73caf7fbfb93085545e890b082a392cd60",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.addprreviewcomment-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.addprreviewcomment-1.json
index 5f644abb53f9..1dca0b1ce704 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.addprreviewcomment-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.addprreviewcomment-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-files-merge",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b228732762828412ad3d9eec3ece00a897d866046e37044322c3911758d6e0a9",
   "scenarioSha256": "3ed626e9d776e009f008c85f5165c8199bc2b85afd279a435e2e0f800737b42f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.mergepr-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.mergepr-1.json
index 98f76cef6f14..a45018204e3d 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.mergepr-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.mergepr-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-files-merge",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b228732762828412ad3d9eec3ece00a897d866046e37044322c3911758d6e0a9",
   "scenarioSha256": "1e402d7984c7958ba23fb700464a450374ad72424be8f2669f769199a1a2899e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.prfilecontents-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.prfilecontents-1.json
index 62a6601b7a50..fcc8971a6a8f 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.prfilecontents-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.prfilecontents-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-files-merge",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b228732762828412ad3d9eec3ece00a897d866046e37044322c3911758d6e0a9",
   "scenarioSha256": "1b2ead3380b546c94c5da2ed61c9208cd158db9a56ca87e3e72e450668e1e507",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.updateissue-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.updateissue-1.json
index d62d6b509650..1d277c901f81 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.updateissue-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.updateissue-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-files-merge",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b228732762828412ad3d9eec3ece00a897d866046e37044322c3911758d6e0a9",
   "scenarioSha256": "947b1c1aa9688688a1e4cbdbacfde185fbf5d0b28b13e753ba87bdf7f999aa00",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.updateprstate-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.updateprstate-1.json
index 232667a47743..100f1dc72fff 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.updateprstate-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-files-merge-github.updateprstate-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-files-merge",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b228732762828412ad3d9eec3ece00a897d866046e37044322c3911758d6e0a9",
   "scenarioSha256": "cc450fcf20e403eea6ce1ee103c131feccb2906c0ae31c7cd3f3d3fa0b739d68",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-metadata-load-github.project.listassignableusersbyslug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-metadata-load-github.project.listassignableusersbyslug-1.json
index 5fa84c9593e8..dcec771e5a3b 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-metadata-load-github.project.listassignableusersbyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-metadata-load-github.project.listassignableusersbyslug-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-metadata-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "f8f6e5d500f959b9b15c5498885a05422747880b6aef4ad795bc3064ebbacea6",
   "scenarioSha256": "2303fc902e5a6cf6a43db58ef2938538a7b770d1509cc22a9811f4c83051aea1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-metadata-load-github.project.listissuetypesbyslug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-metadata-load-github.project.listissuetypesbyslug-1.json
index 6fb818a44ef1..2924a6e6c719 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-metadata-load-github.project.listissuetypesbyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-metadata-load-github.project.listissuetypesbyslug-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-metadata-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "f8f6e5d500f959b9b15c5498885a05422747880b6aef4ad795bc3064ebbacea6",
   "scenarioSha256": "8b75854487566ca6da98d391b6822c81c99e61011fc094458ae038905c1c9287",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-metadata-load-github.project.listlabelsbyslug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-metadata-load-github.project.listlabelsbyslug-1.json
index fea5dac99d82..6a14216104fa 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-metadata-load-github.project.listlabelsbyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-metadata-load-github.project.listlabelsbyslug-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-metadata-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "f8f6e5d500f959b9b15c5498885a05422747880b6aef4ad795bc3064ebbacea6",
   "scenarioSha256": "7c948e76afb331e4038298215181adc97cd533c4f79e205e183c08e8a2db20fc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.prchecks-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.prchecks-1.json
index ae5b96359014..1da8e7e377ba 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.prchecks-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.prchecks-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-review-checks",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "370aeaee59978071ccb821da13c9e6114936c168947b608539cdb80d40cc9889",
   "scenarioSha256": "20e9631df87e40e64d35cee0c0e06b922fe53bd93e3d9e4078633b85a5278b7e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.requestprreviewers-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.requestprreviewers-1.json
index 10556f5e7be5..0b8309956a09 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.requestprreviewers-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.requestprreviewers-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-review-checks",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "370aeaee59978071ccb821da13c9e6114936c168947b608539cdb80d40cc9889",
   "scenarioSha256": "2d947b63fb35dad9bbe201061cb51d0b3c5a5e6f3e8018eeda2ec1f962952809",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.rerunprchecks-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.rerunprchecks-1.json
index ed6121038c12..3f3b07d7f992 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.rerunprchecks-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.rerunprchecks-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-review-checks",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "370aeaee59978071ccb821da13c9e6114936c168947b608539cdb80d40cc9889",
   "scenarioSha256": "ca6b0d81b19811806ce332a776361a40e526a73bef90cfa3df05a764e2ee83b6",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.setprfileviewed-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.setprfileviewed-1.json
index c1f4f7127c1d..c81dbc72713a 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.setprfileviewed-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-review-checks-github.setprfileviewed-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-review-checks",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "370aeaee59978071ccb821da13c9e6114936c168947b608539cdb80d40cc9889",
   "scenarioSha256": "bd58d88e0534366e281869ee79eb75fe65b418d02523d815d8d0d58799edc31b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.addissuecomment-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.addissuecomment-1.json
index 6c025fd7a142..743274c20be9 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.addissuecomment-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.addissuecomment-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-threads",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55058202df36c8b951510215936e496ea88d3d71a6690090a13c52deb13e34e1",
   "scenarioSha256": "0f220b97bbb64ef8d347973690e6fab4b305eaaa54c9b7883340415c54e61206",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.addprreviewcommentreply-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.addprreviewcommentreply-1.json
index a2c9ba0ce878..244c36f18bef 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.addprreviewcommentreply-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.addprreviewcommentreply-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-threads",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55058202df36c8b951510215936e496ea88d3d71a6690090a13c52deb13e34e1",
   "scenarioSha256": "85160836c5a5c9bae76aff82c834ceb908f9262a90facd6e055c289362664eaa",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.project.deleteissuecommentbyslug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.project.deleteissuecommentbyslug-1.json
index 1c15fdbd02df..8ce3d502001e 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.project.deleteissuecommentbyslug-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.project.deleteissuecommentbyslug-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-threads",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55058202df36c8b951510215936e496ea88d3d71a6690090a13c52deb13e34e1",
   "scenarioSha256": "5bc59cfd0d951ae5193df5c49ce3618d9536be0bc8f8192a7b03000963c2001b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.resolvereviewthread-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.resolvereviewthread-1.json
index f2734d3a2d1e..dc1517e6e32b 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.resolvereviewthread-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-threads-github.resolvereviewthread-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-threads",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55058202df36c8b951510215936e496ea88d3d71a6690090a13c52deb13e34e1",
   "scenarioSha256": "0d8c240718b3911464a6fc486114d67cd6f60aa295cd0886ff755b77d5036014",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-github.countworkitems-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-github.countworkitems-1.json
index 81bda4094a6e..02beb58f0f67 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-github.countworkitems-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-github.countworkitems-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.provider-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "e9bdad78cf60e3dd931eab8810d011c6e0066f9a336a206f8f9ca62621b21fee",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-github.listworkitems-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-github.listworkitems-1.json
index d5b13c175590..8831bfb8fe82 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-github.listworkitems-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-github.listworkitems-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.provider-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "a5704c6849de9a45564c8738076ec8c0307754a5acc2c039880fe436771e68b3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-linear.listteams-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-linear.listteams-1.json
index 322aa4dc860e..307bc0427cb9 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-linear.listteams-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-linear.listteams-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.provider-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "e518040cbd40e3cc8c22e0b70b6de1087386936f75ed2f65f6e7b4fcdc344ba2",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-linear.status-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-linear.status-1.json
index 0bd080556c49..1e59f4bf4701 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-linear.status-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-linear.status-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.provider-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "f02acd2ed6319b8cb674c04b41a1e96c50e53123a8914790acc8af5410d63f98",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-settings.update-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-settings.update-1.json
index a1df1ba606c3..bc6016bb0f97 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-settings.update-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.provider-load-settings.update-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.provider-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "2b3006bfe1e7f3040b86ccc698e58ae19ae1aa11389aee2ec2a8f2dfdb0270f4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.route-repo-list-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.route-repo-list-repo.list-1.json
index 38a7d0eda2f5..1af1d818b40c 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.route-repo-list-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.route-repo-list-repo.list-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.route-repo-list",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "23f974df8b57c723069605de1db80c339ead286b18aae38e67fce03ea50c5180",
   "scenarioSha256": "6373b83783b1a9b061bede3bba7aa3b573c3a50b897102a094df93f926856fdc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-github.listworkitems-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-github.listworkitems-1.json
index bc1fedfa5070..8eed4e138244 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-github.listworkitems-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-github.listworkitems-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.smart-source-search",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "85c9e5107fe3e74f44d8b3e5c791b80ff0370cdc3ada69dc09fe38d8058fb263",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-gitlab.listworkitems-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-gitlab.listworkitems-1.json
index 75bdab932ff4..dbaf0bfb521b 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-gitlab.listworkitems-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-gitlab.listworkitems-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.smart-source-search",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "0db7a8e1e5e740c341167bf045a0ab858f61708e995777fa4cf2e88cff1ec727",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-linear.listissues-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-linear.listissues-1.json
index 5c2ba361494b..3b2700086f9d 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-linear.listissues-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-linear.listissues-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.smart-source-search",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "5d9211140d751c6cc844775d3e818f125483f1dac5b78960557ccfe73f41d08f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-linear.searchissues-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-linear.searchissues-1.json
index dc16b214da78..16af661d49cd 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-linear.searchissues-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-linear.searchissues-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.smart-source-search",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "1cfdbdeca951545a4fafd23649991e93a02feea72d174a7c469f18dc64decfc4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-repo.searchrefs-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-repo.searchrefs-1.json
index f7910b19a921..b73d10a73ced 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-repo.searchrefs-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.smart-source-search-repo.searchrefs-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.smart-source-search",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "9fc0825ec19c2c90cec44ee284e7c54399e1552bdb15c329727921a15ad62944",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.task-create-github-github.createissue-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.task-create-github-github.createissue-1.json
index 5f46ac251bab..a6d36c306f8e 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.task-create-github-github.createissue-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.task-create-github-github.createissue-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-create-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "014040846f649f3c6ca1175b610ed1b51bae3001e7de103549d7ee1a511a2506",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.task-create-github-repo.update-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.task-create-github-repo.update-1.json
index fdd0e08b0bff..ff972eb7449f 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.task-create-github-repo.update-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.task-create-github-repo.update-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-create-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "9efe74e5a1b0d92f674e6044edfd534693c15b0a153bcb2c0e283a6cd53fa61b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.task-create-gitlab-gitlab.createissue-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.task-create-gitlab-gitlab.createissue-1.json
index 2fd65f9ab5fa..35df73656d43 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.task-create-gitlab-gitlab.createissue-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.task-create-gitlab-gitlab.createissue-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-create-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "217a3da50a54c4cbe19a68835ecfa038eae5b350430f0b8fd0a616bb5bdfe32d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.task-create-linear-linear.createissue-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.task-create-linear-linear.createissue-1.json
index db5e02dba8dc..d50335aecc3f 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.task-create-linear-linear.createissue-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.task-create-linear-linear.createissue-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-create-linear",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "cb4c10cc6401e5b68340bd1fa09381c973348b6e0c7ffef563cde92080c57a15",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.task-list-gitlab-items-gitlab.listworkitems-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.task-list-gitlab-items-gitlab.listworkitems-1.json
index 1af491a042bc..cb10520c34b9 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.task-list-gitlab-items-gitlab.listworkitems-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.task-list-gitlab-items-gitlab.listworkitems-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-list-gitlab-items",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "038221907a57f5bb25338f9b07a744dbac3ea0a7ea2ba43281f171912f45a586",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.task-list-gitlab-todos-gitlab.todos-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.task-list-gitlab-todos-gitlab.todos-1.json
index 64f2b2d981d2..ca43c4fd653b 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.task-list-gitlab-todos-gitlab.todos-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.task-list-gitlab-todos-gitlab.todos-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-list-gitlab-todos",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "e36b90621e11880ec1e6c16e8e3c89cc14f5d68a4a9e06b8a3098fc0bd0104a2",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.task-list-linear-linear.listissues-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.task-list-linear-linear.listissues-1.json
index 41cc8236745c..af56926182d8 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.task-list-linear-linear.listissues-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.task-list-linear-linear.listissues-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-list-linear",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "39ef28af17e4d3774b42bba1555606770667bc9010692fb1a4492413a940c0a0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.task-list-linear-linear.searchissues-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.task-list-linear-linear.searchissues-1.json
index 192846b835e8..75aeb3a962cd 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.task-list-linear-linear.searchissues-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.task-list-linear-linear.searchissues-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-list-linear",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "c589700af145f58c37292dafb891b3b7d50302fd4ec044155c044ccd48f79c74",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-source-repo.searchrefs-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-source-repo.searchrefs-1.json
index dc58a5d54339..b4254656d45f 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-source-repo.searchrefs-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-source-repo.searchrefs-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-source",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "9e91d46870cd69279cc7d8ebfd317ab8b13136ccff9662876c7601a3a83ecafe",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-source-repo.sparsepresets-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-source-repo.sparsepresets-1.json
index 9653601a143e..361b70033cdc 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-source-repo.sparsepresets-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-source-repo.sparsepresets-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-source",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "2d4a681bffbc5ff9d3040ea0d6bb2603ee940c3c497269d0b63caca564fb25e1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-sparse-repo.savesparsepreset-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-sparse-repo.savesparsepreset-1.json
index 29fc3ea62cdc..53479f698f1e 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-sparse-repo.savesparsepreset-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-sparse-repo.savesparsepreset-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-sparse",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "3d4637406e2d658b72f73153f0a5e176cb8b143593b72bce0cdf979bc6e4cbdd",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-sparse-ssh.getstate-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-sparse-ssh.getstate-1.json
index 1cbe3c60db21..2b77965536d4 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-sparse-ssh.getstate-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-sparse-ssh.getstate-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-sparse",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "3453024581230908d1e0e9335f5310e7b4ae03faf50d93654b9ff28c464fb95f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-local-preflight.detectagents-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-local-preflight.detectagents-1.json
index dcb8086cfee4..9af3002abb79 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-local-preflight.detectagents-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-local-preflight.detectagents-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-ssh-local",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "28f7ba289c188bfc121ef7b969133711189e887fbfc7b37c8a5401ea7f30b56a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-preflight.detectremoteagents-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-preflight.detectremoteagents-1.json
index 5f40b016087c..cab57378ab5a 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-preflight.detectremoteagents-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-preflight.detectremoteagents-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-ssh",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "35771ab92d0d4ff44a1dd6e5f1e5d3137570a2e013bddea5ca77ecac7989ed53",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-repo.hooks-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-repo.hooks-1.json
index e6a65b6219dd..b05d49d4a861 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-repo.hooks-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-repo.hooks-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-ssh",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "39451d3c811068754f91ac243fe1208f4ce742df53261314345d8209ba761e94",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-ssh.connect-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-ssh.connect-1.json
index a1de76beea63..337f7141d896 100644
--- a/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-ssh.connect-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-tasks.workspace-ssh-ssh.connect-1.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-ssh",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "5cc1773d06d49d2616da72f2790753322edda6d67e12b5e41116971d34787391",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-terminal.query-reply-terminal.send-1.json b/mobile/rpc-foundation/goldens/matrix-terminal.query-reply-terminal.send-1.json
index b2917c32aefe..59e1a75e76e3 100644
--- a/mobile/rpc-foundation/goldens/matrix-terminal.query-reply-terminal.send-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-terminal.query-reply-terminal.send-1.json
@@ -3,10 +3,10 @@
   "family": "terminal.query-reply",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "15b5694a63d54aeb4f4d9a861729e7e3b42ce06b15af6784fcb1afab744ed18b",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-terminal.raw-input-orchestration.workerterminaluserinput-1.json b/mobile/rpc-foundation/goldens/matrix-terminal.raw-input-orchestration.workerterminaluserinput-1.json
index 5abd56016214..9a2cc35f7b32 100644
--- a/mobile/rpc-foundation/goldens/matrix-terminal.raw-input-orchestration.workerterminaluserinput-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-terminal.raw-input-orchestration.workerterminaluserinput-1.json
@@ -3,10 +3,10 @@
   "family": "terminal.raw-input",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "68c039f74da08523d67d8d5b0a178c1d12507ec88d25891cd1377cd3fb40205c",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-terminal.raw-input-terminal.send-1.json b/mobile/rpc-foundation/goldens/matrix-terminal.raw-input-terminal.send-1.json
index a35b5b8f1d96..160e170c6050 100644
--- a/mobile/rpc-foundation/goldens/matrix-terminal.raw-input-terminal.send-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-terminal.raw-input-terminal.send-1.json
@@ -3,10 +3,10 @@
   "family": "terminal.raw-input",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "19d55a77e9c2f64f062070c9985f756e0ba72f3ccc3c884a80843fe888f42a47",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-terminal.takeover-report-orchestration.workerterminaluserinput-1.json b/mobile/rpc-foundation/goldens/matrix-terminal.takeover-report-orchestration.workerterminaluserinput-1.json
index ebe985ab90a1..6754149bda73 100644
--- a/mobile/rpc-foundation/goldens/matrix-terminal.takeover-report-orchestration.workerterminaluserinput-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-terminal.takeover-report-orchestration.workerterminaluserinput-1.json
@@ -3,10 +3,10 @@
   "family": "terminal.takeover-report",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "6913de3f553b47a7e6663e21b0b93e97df26405c210db876f0b9593bd38936be",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-terminal.takeover-report-orchestration.workerterminaluserinput-2.json b/mobile/rpc-foundation/goldens/matrix-terminal.takeover-report-orchestration.workerterminaluserinput-2.json
index 22cdca290ca0..456a924c62d0 100644
--- a/mobile/rpc-foundation/goldens/matrix-terminal.takeover-report-orchestration.workerterminaluserinput-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-terminal.takeover-report-orchestration.workerterminaluserinput-2.json
@@ -3,10 +3,10 @@
   "family": "terminal.takeover-report",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "da13ec556c0f672371a8cd2aabd4dcc68001c0f9aa47015dfa4b5937355c4c2c",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-terminal.viewport-refit-terminal.updateviewport-1.json b/mobile/rpc-foundation/goldens/matrix-terminal.viewport-refit-terminal.updateviewport-1.json
index d1113cb84ddd..3cf51bfd2c97 100644
--- a/mobile/rpc-foundation/goldens/matrix-terminal.viewport-refit-terminal.updateviewport-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-terminal.viewport-refit-terminal.updateviewport-1.json
@@ -3,10 +3,10 @@
   "family": "terminal.viewport-refit",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "bde05ca916393d7f5ccd48686cf13a52fb2dfa599ea874b084c58bd59adb7e7f",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/matrix-transport.capability-probe-status.get-1.json b/mobile/rpc-foundation/goldens/matrix-transport.capability-probe-status.get-1.json
index 6bab4731f49d..d8477f733f80 100644
--- a/mobile/rpc-foundation/goldens/matrix-transport.capability-probe-status.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-transport.capability-probe-status.get-1.json
@@ -3,9 +3,9 @@
   "family": "transport.capability-probe",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "874b1a120443ee679e2f4b3974762fd84fc929e93a2117b20bbb0cf373316616",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-transport.host-status-gates-status.get-1.json b/mobile/rpc-foundation/goldens/matrix-transport.host-status-gates-status.get-1.json
index bc05e93b8827..f8477b7cd30a 100644
--- a/mobile/rpc-foundation/goldens/matrix-transport.host-status-gates-status.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-transport.host-status-gates-status.get-1.json
@@ -3,9 +3,9 @@
   "family": "transport.host-status-gates",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "d6be62e5eb2737d75634c053098d06a4bb175c64ff915cec6ead79922492a068",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-transport.pairing-race-direct-status.json b/mobile/rpc-foundation/goldens/matrix-transport.pairing-race-direct-status.json
index 34ddee98c564..cfcc4ff6da39 100644
--- a/mobile/rpc-foundation/goldens/matrix-transport.pairing-race-direct-status.json
+++ b/mobile/rpc-foundation/goldens/matrix-transport.pairing-race-direct-status.json
@@ -3,9 +3,9 @@
   "family": "transport.pairing-race",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "1d032c86e7cc12efa3d5044339cb990bd258d830119d0e7b61d1b995b4df29a3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-transport.pairing-race-relay-status.json b/mobile/rpc-foundation/goldens/matrix-transport.pairing-race-relay-status.json
index d5e2cbba818b..e7cc088517f2 100644
--- a/mobile/rpc-foundation/goldens/matrix-transport.pairing-race-relay-status.json
+++ b/mobile/rpc-foundation/goldens/matrix-transport.pairing-race-relay-status.json
@@ -3,9 +3,9 @@
   "family": "transport.pairing-race",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "048ee6d7848e0e4b8d6463ff9dc4124bfd478114ab87f6b52ff82a1dfd6ebc04",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-worktree.agent-launch-create-agent.launch-1.json b/mobile/rpc-foundation/goldens/matrix-worktree.agent-launch-create-agent.launch-1.json
index 943a41a07f10..9a804d66f48f 100644
--- a/mobile/rpc-foundation/goldens/matrix-worktree.agent-launch-create-agent.launch-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-worktree.agent-launch-create-agent.launch-1.json
@@ -3,11 +3,11 @@
   "family": "worktree.agent-launch-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
-  "scenarioSha256": "887b5d16b4bee027edf5e2f1122a79a34b223f6926322a99f6e3de83f40bf6ee",
+  "scenarioSha256": "b3d017cee84fc133ab0b0a8d588750f8af907d4688e6c2900a307de25fab8473",
   "platform": "darwin",
   "scenarioVersion": 1,
   "projectionVersion": 2,
diff --git a/mobile/rpc-foundation/goldens/matrix-worktree.catalog-snapshot-worktree.ps-1.json b/mobile/rpc-foundation/goldens/matrix-worktree.catalog-snapshot-worktree.ps-1.json
index f8f0b6cfe3da..4526333c8237 100644
--- a/mobile/rpc-foundation/goldens/matrix-worktree.catalog-snapshot-worktree.ps-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-worktree.catalog-snapshot-worktree.ps-1.json
@@ -3,9 +3,9 @@
   "family": "worktree.catalog-snapshot",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e942ddfbaa0ba6bfc2993969276987f6528ac53765d125e99a830e261f93a8e",
   "scenarioSha256": "95ca47f382997c412da974e564a46b1ae0c20d6e0f3ca14258d33c8d8b51a160",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-worktree.create-retry-worktree.create-1.json b/mobile/rpc-foundation/goldens/matrix-worktree.create-retry-worktree.create-1.json
index ef535a9fa6a3..286c7314ef15 100644
--- a/mobile/rpc-foundation/goldens/matrix-worktree.create-retry-worktree.create-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-worktree.create-retry-worktree.create-1.json
@@ -3,9 +3,9 @@
   "family": "worktree.create-retry",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "e93a36ef900de27e1a566cdb2389ba4f900a330eadbb476b9bfb1ef05707b352",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-worktree.home-catalog-worktree.ps-1.json b/mobile/rpc-foundation/goldens/matrix-worktree.home-catalog-worktree.ps-1.json
index f011e623297d..aae6c3f6d6f7 100644
--- a/mobile/rpc-foundation/goldens/matrix-worktree.home-catalog-worktree.ps-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-worktree.home-catalog-worktree.ps-1.json
@@ -3,9 +3,9 @@
   "family": "worktree.home-catalog",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e942ddfbaa0ba6bfc2993969276987f6528ac53765d125e99a830e261f93a8e",
   "scenarioSha256": "fa0e28a167a5fba6fe7ffebb9f4ad28dd413d601c07116a24a7781d156f54beb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-worktree.hosted-base-worktree.resolvemrbase-1.json b/mobile/rpc-foundation/goldens/matrix-worktree.hosted-base-worktree.resolvemrbase-1.json
index bdddf225e5cc..e2021615a4a3 100644
--- a/mobile/rpc-foundation/goldens/matrix-worktree.hosted-base-worktree.resolvemrbase-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-worktree.hosted-base-worktree.resolvemrbase-1.json
@@ -3,9 +3,9 @@
   "family": "worktree.hosted-base",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "a84f8a5acfd428eb77b5c02a3de0fa8b780c666db31bbe574ecf76cdf84adeb2",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-worktree.hosted-base-worktree.resolveprbase-1.json b/mobile/rpc-foundation/goldens/matrix-worktree.hosted-base-worktree.resolveprbase-1.json
index 6bfdbc583fff..2c454d91e5e5 100644
--- a/mobile/rpc-foundation/goldens/matrix-worktree.hosted-base-worktree.resolveprbase-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-worktree.hosted-base-worktree.resolveprbase-1.json
@@ -3,9 +3,9 @@
   "family": "worktree.hosted-base",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "45783a7cbb44b04dbbd6bfd6735799bb4c75e503f43f1821cf8640d11f7464ad",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-worktree.retired-names-worktree.listretirednames-1.json b/mobile/rpc-foundation/goldens/matrix-worktree.retired-names-worktree.listretirednames-1.json
index c0255bf91709..069ab19c7e44 100644
--- a/mobile/rpc-foundation/goldens/matrix-worktree.retired-names-worktree.listretirednames-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-worktree.retired-names-worktree.listretirednames-1.json
@@ -3,9 +3,9 @@
   "family": "worktree.retired-names",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e942ddfbaa0ba6bfc2993969276987f6528ac53765d125e99a830e261f93a8e",
   "scenarioSha256": "d321d6c17e67ae90f6ceefb775495ff765a86a35423ed33a212e71ec5e9e94aa",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-worktree.review-link-worktree.set-1.json b/mobile/rpc-foundation/goldens/matrix-worktree.review-link-worktree.set-1.json
index a5ca92320b22..a2038eb05848 100644
--- a/mobile/rpc-foundation/goldens/matrix-worktree.review-link-worktree.set-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-worktree.review-link-worktree.set-1.json
@@ -3,9 +3,9 @@
   "family": "worktree.review-link",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "2fc093ec505bfac04a4ff0adab991baeba985253486dbe9e3ec9884b8d5f0920",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-worktree.runtime-capabilities-status.get-1.json b/mobile/rpc-foundation/goldens/matrix-worktree.runtime-capabilities-status.get-1.json
index 7710b23ca583..ab22f058cd5f 100644
--- a/mobile/rpc-foundation/goldens/matrix-worktree.runtime-capabilities-status.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-worktree.runtime-capabilities-status.get-1.json
@@ -3,9 +3,9 @@
   "family": "worktree.runtime-capabilities",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "f70c6b1753377b5a502bf7d1e69dc95617f24c42137471320eb393567efbe735",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/matrix-worktree.setup-hook-trust-ui.set-1.json b/mobile/rpc-foundation/goldens/matrix-worktree.setup-hook-trust-ui.set-1.json
index 360ebfbf2cb1..fb04070a8f96 100644
--- a/mobile/rpc-foundation/goldens/matrix-worktree.setup-hook-trust-ui.set-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-worktree.setup-hook-trust-ui.set-1.json
@@ -3,9 +3,9 @@
   "family": "worktree.setup-hook-trust",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "8487fd14ed779708415b264e2b80b26b0d5094e379a04f4f32c2cd75ec469182",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/mobile-web-bundle-build-changed.json b/mobile/rpc-foundation/goldens/mobile-web-bundle-build-changed.json
index bb76405eda8c..019d9b15aad5 100644
--- a/mobile/rpc-foundation/goldens/mobile-web-bundle-build-changed.json
+++ b/mobile/rpc-foundation/goldens/mobile-web-bundle-build-changed.json
@@ -3,9 +3,9 @@
   "family": "mobileWeb.bundle-fetch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "af339fef2c684d5709c6d3f279e5f0d9c33d17b6d4e5c89e501963400901b564",
   "scenarioSha256": "9bab59797b04304d8e25573664b011949e9b15010270ccbfd0e3d2a4d772180c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/mobile-web-bundle-fetch-paged.json b/mobile/rpc-foundation/goldens/mobile-web-bundle-fetch-paged.json
index ba0f4e07c57b..c84cabb898bc 100644
--- a/mobile/rpc-foundation/goldens/mobile-web-bundle-fetch-paged.json
+++ b/mobile/rpc-foundation/goldens/mobile-web-bundle-fetch-paged.json
@@ -3,9 +3,9 @@
   "family": "mobileWeb.bundle-fetch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "af339fef2c684d5709c6d3f279e5f0d9c33d17b6d4e5c89e501963400901b564",
   "scenarioSha256": "e3044fe513a5fc1fb10c5c00422d965dd760eeea37cfcebc79b4597141f4baa1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/mobile-web-bundle-manifest-read.json b/mobile/rpc-foundation/goldens/mobile-web-bundle-manifest-read.json
index b5a0e3e2546c..53e2810822bb 100644
--- a/mobile/rpc-foundation/goldens/mobile-web-bundle-manifest-read.json
+++ b/mobile/rpc-foundation/goldens/mobile-web-bundle-manifest-read.json
@@ -3,9 +3,9 @@
   "family": "mobileWeb.bundle-manifest",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "af339fef2c684d5709c6d3f279e5f0d9c33d17b6d4e5c89e501963400901b564",
   "scenarioSha256": "5e9f4e6878be3f534288a90f7ccabc9cfe4e968aa29da372a98c3064d8e4d89e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/mobile-web-bundle-unavailable.json b/mobile/rpc-foundation/goldens/mobile-web-bundle-unavailable.json
index d4689a2d1a3c..ec443d062543 100644
--- a/mobile/rpc-foundation/goldens/mobile-web-bundle-unavailable.json
+++ b/mobile/rpc-foundation/goldens/mobile-web-bundle-unavailable.json
@@ -3,9 +3,9 @@
   "family": "mobileWeb.bundle-fetch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "af339fef2c684d5709c6d3f279e5f0d9c33d17b6d4e5c89e501963400901b564",
   "scenarioSha256": "7333b1c83120bcfd9bdac8888ec1528c1db9b36325509f1328a551676df219c5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-image-paste-single.json b/mobile/rpc-foundation/goldens/native-chat-image-paste-single.json
index dad5f2a4841c..5750aa66cf60 100644
--- a/mobile/rpc-foundation/goldens/native-chat-image-paste-single.json
+++ b/mobile/rpc-foundation/goldens/native-chat-image-paste-single.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.image-paste",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "8e88e44d077ce8f3f3e3214b80e9e8b1e770b9a73025bc284a8333d6a8be07f9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-image-paste-stops-on-rejection.json b/mobile/rpc-foundation/goldens/native-chat-image-paste-stops-on-rejection.json
index db4a5e8d2d8e..dc80fd6650e7 100644
--- a/mobile/rpc-foundation/goldens/native-chat-image-paste-stops-on-rejection.json
+++ b/mobile/rpc-foundation/goldens/native-chat-image-paste-stops-on-rejection.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.image-paste",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "1e2c7d2c238bb87a0fd1896a0151a6cecd670c9b1b2679ca47b39520355c6e05",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-image-paste-trailing-image.json b/mobile/rpc-foundation/goldens/native-chat-image-paste-trailing-image.json
index 28190769fe06..fc45d428da41 100644
--- a/mobile/rpc-foundation/goldens/native-chat-image-paste-trailing-image.json
+++ b/mobile/rpc-foundation/goldens/native-chat-image-paste-trailing-image.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.image-paste",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "43575aede8307947e027239b4e582df281f6424c9216135ae20d150234f247f6",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-image-paste-two-images.json b/mobile/rpc-foundation/goldens/native-chat-image-paste-two-images.json
index 9759e0c35f7b..044c0be53321 100644
--- a/mobile/rpc-foundation/goldens/native-chat-image-paste-two-images.json
+++ b/mobile/rpc-foundation/goldens/native-chat-image-paste-two-images.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.image-paste",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "4ff80434eea90f31c03522c9277983cc1c88d0292ba7c384fa9760fc1dcb03bf",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-image-upload-cancelled.json b/mobile/rpc-foundation/goldens/native-chat-image-upload-cancelled.json
index b5e2e0a997be..94da28329dad 100644
--- a/mobile/rpc-foundation/goldens/native-chat-image-upload-cancelled.json
+++ b/mobile/rpc-foundation/goldens/native-chat-image-upload-cancelled.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "1f513883eb62cdd1673eb58809817e2b2f5fd64b74f80ed6e3b9d8c2ef2d33e9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-image-upload-second-fails.json b/mobile/rpc-foundation/goldens/native-chat-image-upload-second-fails.json
index 6c2a5ce42bbf..9aa0b7cea3e2 100644
--- a/mobile/rpc-foundation/goldens/native-chat-image-upload-second-fails.json
+++ b/mobile/rpc-foundation/goldens/native-chat-image-upload-second-fails.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "181b02243b1ecf98364473ee0b3f4c82a6037b5f5bae33703ab4f611cc050db4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-image-upload-single.json b/mobile/rpc-foundation/goldens/native-chat-image-upload-single.json
index 87bc9ae442d3..1f339ad76fad 100644
--- a/mobile/rpc-foundation/goldens/native-chat-image-upload-single.json
+++ b/mobile/rpc-foundation/goldens/native-chat-image-upload-single.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "d7dca3742c4086f9ced0ba4b2f6c32ee9fa9272a5a955e8623fdc9cdb4c71528",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-image-upload-start-refused.json b/mobile/rpc-foundation/goldens/native-chat-image-upload-start-refused.json
index 8b37946aba4a..95586c30d054 100644
--- a/mobile/rpc-foundation/goldens/native-chat-image-upload-start-refused.json
+++ b/mobile/rpc-foundation/goldens/native-chat-image-upload-start-refused.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "09fd9bf97a4da7313e24f8c333b66c7c1af927bbea0a6d9fef9803856a608c78",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-image-upload-two.json b/mobile/rpc-foundation/goldens/native-chat-image-upload-two.json
index 35ab4d8e950a..bf8084aa951c 100644
--- a/mobile/rpc-foundation/goldens/native-chat-image-upload-two.json
+++ b/mobile/rpc-foundation/goldens/native-chat-image-upload-two.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "db0397f8f6ae28de0cc7afd91552ee9416d7f7054a76a42aac02f480c6f363d5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-page-earlier.json b/mobile/rpc-foundation/goldens/native-chat-page-earlier.json
index 847f321f052c..8eaf7296068a 100644
--- a/mobile/rpc-foundation/goldens/native-chat-page-earlier.json
+++ b/mobile/rpc-foundation/goldens/native-chat-page-earlier.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-page",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "60ce67f66134d6385aa7fb47f2135436a7b3ce0221e3b2514bea65e06dba5518",
   "scenarioSha256": "674cab85ed9896dae311bfc0acfb1d1d1a2a7f25b7546b4714edbb0a585e6178",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-readability-local-repo.json b/mobile/rpc-foundation/goldens/native-chat-readability-local-repo.json
index 5c66065baaa4..cd84dadae001 100644
--- a/mobile/rpc-foundation/goldens/native-chat-readability-local-repo.json
+++ b/mobile/rpc-foundation/goldens/native-chat-readability-local-repo.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-readability",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "46d80cfd496b06ce42ff1ed985e513bbf49b5188bc1128c6d01a74675741935a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-readability-refused.json b/mobile/rpc-foundation/goldens/native-chat-readability-refused.json
index ca5e994a2808..2b14e1cf7172 100644
--- a/mobile/rpc-foundation/goldens/native-chat-readability-refused.json
+++ b/mobile/rpc-foundation/goldens/native-chat-readability-refused.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-readability",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "08a9ab4f180f2d6bb44d2a23f87be0443e8dfdde15f966458270a1bb6f131e0b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-readability-remote-repo.json b/mobile/rpc-foundation/goldens/native-chat-readability-remote-repo.json
index f7c1bb3a18bd..697560982a89 100644
--- a/mobile/rpc-foundation/goldens/native-chat-readability-remote-repo.json
+++ b/mobile/rpc-foundation/goldens/native-chat-readability-remote-repo.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-readability",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "0c6afb12dce2c402dfd7ac24eb4a306e09fcacc78415ecb47b5320b2fe8102b5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-session-option-pick-empty.json b/mobile/rpc-foundation/goldens/native-chat-session-option-pick-empty.json
index 59c07c28d238..9df01ea45688 100644
--- a/mobile/rpc-foundation/goldens/native-chat-session-option-pick-empty.json
+++ b/mobile/rpc-foundation/goldens/native-chat-session-option-pick-empty.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.session-option-pick",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b98a3ca3818678b88cf629bc4635300a103637126a136f025a1600dc16f08008",
   "scenarioSha256": "55f675f7d3f380db10dd966ae6d011927dbc7eb8f3abd36e09edf5043ad1131c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-session-option-pick-refused.json b/mobile/rpc-foundation/goldens/native-chat-session-option-pick-refused.json
index 29eb3e5786a4..f295cb8c9a0b 100644
--- a/mobile/rpc-foundation/goldens/native-chat-session-option-pick-refused.json
+++ b/mobile/rpc-foundation/goldens/native-chat-session-option-pick-refused.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.session-option-pick",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b98a3ca3818678b88cf629bc4635300a103637126a136f025a1600dc16f08008",
   "scenarioSha256": "57b60064eca4526e5d533de5862e7e86ba69b6722cd04692228bdc768486cd76",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-session-option-pick-written.json b/mobile/rpc-foundation/goldens/native-chat-session-option-pick-written.json
index dea871bd7afc..4012a927f306 100644
--- a/mobile/rpc-foundation/goldens/native-chat-session-option-pick-written.json
+++ b/mobile/rpc-foundation/goldens/native-chat-session-option-pick-written.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.session-option-pick",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b98a3ca3818678b88cf629bc4635300a103637126a136f025a1600dc16f08008",
   "scenarioSha256": "a180b7ae1f84bc69d7819c7c17b1e2915cb380e8ea8543d68fe6777feb90d0bd",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-stop-accepted.json b/mobile/rpc-foundation/goldens/native-chat-stop-accepted.json
index 6b46e9a71b1a..6c2ef2da6238 100644
--- a/mobile/rpc-foundation/goldens/native-chat-stop-accepted.json
+++ b/mobile/rpc-foundation/goldens/native-chat-stop-accepted.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-stop",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "a72f08c12c244912912be34deb3ec12bada6b74f1bc29c0034b347dcba9ddb10",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-stop-both-rejected.json b/mobile/rpc-foundation/goldens/native-chat-stop-both-rejected.json
index 567a65f08d92..296d4d7b349c 100644
--- a/mobile/rpc-foundation/goldens/native-chat-stop-both-rejected.json
+++ b/mobile/rpc-foundation/goldens/native-chat-stop-both-rejected.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-stop",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "a7419d4b3e00d49ebdac7db4fa97ad9d3af9516201f9102beed0376b181e74a5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-stop-delivery-unknown.json b/mobile/rpc-foundation/goldens/native-chat-stop-delivery-unknown.json
index 12d41bf139ac..1366bae9a1be 100644
--- a/mobile/rpc-foundation/goldens/native-chat-stop-delivery-unknown.json
+++ b/mobile/rpc-foundation/goldens/native-chat-stop-delivery-unknown.json
@@ -3,9 +3,9 @@
   "family": "session.native-chat-stop",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "977ee5602e3a612d537686d17d15312f8b0e775df8800b27bb0d42b8642b4675",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-write-accepted.json b/mobile/rpc-foundation/goldens/native-chat-write-accepted.json
index 7d8331bb1db3..e2e98cfebd42 100644
--- a/mobile/rpc-foundation/goldens/native-chat-write-accepted.json
+++ b/mobile/rpc-foundation/goldens/native-chat-write-accepted.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.terminal-write",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b98a3ca3818678b88cf629bc4635300a103637126a136f025a1600dc16f08008",
   "scenarioSha256": "3e8804f21d32370bb0bc48c4ea3d182748d48dc19d73de1b50005f18368566ba",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-write-clear-line.json b/mobile/rpc-foundation/goldens/native-chat-write-clear-line.json
index 24edced3ac89..bb10f158648a 100644
--- a/mobile/rpc-foundation/goldens/native-chat-write-clear-line.json
+++ b/mobile/rpc-foundation/goldens/native-chat-write-clear-line.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.terminal-write",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b98a3ca3818678b88cf629bc4635300a103637126a136f025a1600dc16f08008",
   "scenarioSha256": "b8265928eefc167de59c64dc62ebe40635007a5f73c87ec8b6eb5e0f6dc0ce00",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-write-delivery-unknown.json b/mobile/rpc-foundation/goldens/native-chat-write-delivery-unknown.json
index c75722225709..8653789f0e54 100644
--- a/mobile/rpc-foundation/goldens/native-chat-write-delivery-unknown.json
+++ b/mobile/rpc-foundation/goldens/native-chat-write-delivery-unknown.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.terminal-write",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b98a3ca3818678b88cf629bc4635300a103637126a136f025a1600dc16f08008",
   "scenarioSha256": "22f7711ed82a4d56f1886a746838e3eb85c555c9069694ba3aa958e121cc1ee9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-write-rejected.json b/mobile/rpc-foundation/goldens/native-chat-write-rejected.json
index 62a567137f3c..8b9726edd6e8 100644
--- a/mobile/rpc-foundation/goldens/native-chat-write-rejected.json
+++ b/mobile/rpc-foundation/goldens/native-chat-write-rejected.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.terminal-write",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b98a3ca3818678b88cf629bc4635300a103637126a136f025a1600dc16f08008",
   "scenarioSha256": "7e05773966a18123aaae297aed9ac44bd841713de88c8a1fa30c31b324118f6f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/native-chat-write-typed-command.json b/mobile/rpc-foundation/goldens/native-chat-write-typed-command.json
index 53cae98b6be9..d5232fa46cf0 100644
--- a/mobile/rpc-foundation/goldens/native-chat-write-typed-command.json
+++ b/mobile/rpc-foundation/goldens/native-chat-write-typed-command.json
@@ -3,9 +3,9 @@
   "family": "nativeChat.terminal-write",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b98a3ca3818678b88cf629bc4635300a103637126a136f025a1600dc16f08008",
   "scenarioSha256": "a89ff803859c60e5645126de8b0f423807c435dcd856fe8825721f71f3b5bec5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/new-tab-local-agents.json b/mobile/rpc-foundation/goldens/new-tab-local-agents.json
index 8a12bba03532..a456b5350039 100644
--- a/mobile/rpc-foundation/goldens/new-tab-local-agents.json
+++ b/mobile/rpc-foundation/goldens/new-tab-local-agents.json
@@ -3,9 +3,9 @@
   "family": "settings.new-tab-local-agents",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "ef016c6b4b77ba0c40b6feba2f670398c641f8ce9f411896e3ae41f38d8be17d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/new-workspace-repositories-fulfilled.json b/mobile/rpc-foundation/goldens/new-workspace-repositories-fulfilled.json
index 63ce66521b7b..6c076c3555f5 100644
--- a/mobile/rpc-foundation/goldens/new-workspace-repositories-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/new-workspace-repositories-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "components.new-workspace-repositories",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "64c1772f0f95a3c43fbb14398a8804b2b4784f7f18874e4fd79767ae634c7faa",
   "scenarioSha256": "41ac47445191a24de5e48877478bdab6fd9c030f48024ea43e053de7b6b68bb5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/notifications-desktop-stream-closed.json b/mobile/rpc-foundation/goldens/notifications-desktop-stream-closed.json
index a5c8e8b6af1e..4cc144feba8a 100644
--- a/mobile/rpc-foundation/goldens/notifications-desktop-stream-closed.json
+++ b/mobile/rpc-foundation/goldens/notifications-desktop-stream-closed.json
@@ -3,9 +3,9 @@
   "family": "notifications.desktop-stream",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "eacf859143588ae6bee2804975d642b6c1088d57ae77ffe298620250d9a9f0e4",
   "scenarioSha256": "24f8c05639f82bc5e32abe3864c3d01a0589e295369028929fed2f0c684f1d0c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/notifications-desktop-stream-replayed.json b/mobile/rpc-foundation/goldens/notifications-desktop-stream-replayed.json
index ab10b7629799..ec67928b9837 100644
--- a/mobile/rpc-foundation/goldens/notifications-desktop-stream-replayed.json
+++ b/mobile/rpc-foundation/goldens/notifications-desktop-stream-replayed.json
@@ -3,9 +3,9 @@
   "family": "notifications.desktop-stream",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "eacf859143588ae6bee2804975d642b6c1088d57ae77ffe298620250d9a9f0e4",
   "scenarioSha256": "0495c25d6e5d8a84fe4192d7aa0e2901fe86ede19ac9c4d72dee27da6694878b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/notifications-desktop-stream.json b/mobile/rpc-foundation/goldens/notifications-desktop-stream.json
index e9fb31a7336e..5ae2f8256bde 100644
--- a/mobile/rpc-foundation/goldens/notifications-desktop-stream.json
+++ b/mobile/rpc-foundation/goldens/notifications-desktop-stream.json
@@ -3,9 +3,9 @@
   "family": "notifications.desktop-stream",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "eacf859143588ae6bee2804975d642b6c1088d57ae77ffe298620250d9a9f0e4",
   "scenarioSha256": "359add5203e68fcb85586f06babb694ee9d548e1dc58481e6d03871ab9f922cb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/notifications-display-test-accepted.json b/mobile/rpc-foundation/goldens/notifications-display-test-accepted.json
index a13d26a90f17..64e2c8c1cd94 100644
--- a/mobile/rpc-foundation/goldens/notifications-display-test-accepted.json
+++ b/mobile/rpc-foundation/goldens/notifications-display-test-accepted.json
@@ -3,9 +3,9 @@
   "family": "notifications.display-test-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "f55275c268e49679b37d72ce6cbe71186ce02c77fe3fd53f0f21e796502d62e8",
   "scenarioSha256": "e19c4ff95d568edbb5c0d6058eb17843be31bdfd528825985963f8ece8cbc652",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/notifications-display-test-not-registered.json b/mobile/rpc-foundation/goldens/notifications-display-test-not-registered.json
index f242b8d81681..e255279ddc79 100644
--- a/mobile/rpc-foundation/goldens/notifications-display-test-not-registered.json
+++ b/mobile/rpc-foundation/goldens/notifications-display-test-not-registered.json
@@ -3,9 +3,9 @@
   "family": "notifications.display-test-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "f55275c268e49679b37d72ce6cbe71186ce02c77fe3fd53f0f21e796502d62e8",
   "scenarioSha256": "3edeb5f744ed832104df750544b99fea1a1cd9d1b8d2f3f9a5e7c13b415edc3e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/notifications-display-test-rate-limited.json b/mobile/rpc-foundation/goldens/notifications-display-test-rate-limited.json
index 46566837ce54..6495277b7c71 100644
--- a/mobile/rpc-foundation/goldens/notifications-display-test-rate-limited.json
+++ b/mobile/rpc-foundation/goldens/notifications-display-test-rate-limited.json
@@ -3,9 +3,9 @@
   "family": "notifications.display-test-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "f55275c268e49679b37d72ce6cbe71186ce02c77fe3fd53f0f21e796502d62e8",
   "scenarioSha256": "53827d812956f05e86d72e44effd017270328eb36588ca90431cf9a8ae97b146",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/notifications-display-test-unknown-reason.json b/mobile/rpc-foundation/goldens/notifications-display-test-unknown-reason.json
index 9700e71028dc..16673d735330 100644
--- a/mobile/rpc-foundation/goldens/notifications-display-test-unknown-reason.json
+++ b/mobile/rpc-foundation/goldens/notifications-display-test-unknown-reason.json
@@ -3,9 +3,9 @@
   "family": "notifications.display-test-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "f55275c268e49679b37d72ce6cbe71186ce02c77fe3fd53f0f21e796502d62e8",
   "scenarioSha256": "37439be5aba4a84cf6c12c5f583a0334405792387edb72ceab388e7c64109eff",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/notifications-push-gateway-rejected.json b/mobile/rpc-foundation/goldens/notifications-push-gateway-rejected.json
index 927b052e0d21..4a85cc3448ff 100644
--- a/mobile/rpc-foundation/goldens/notifications-push-gateway-rejected.json
+++ b/mobile/rpc-foundation/goldens/notifications-push-gateway-rejected.json
@@ -3,9 +3,9 @@
   "family": "notifications.push-registration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2e3d939dc162dbc5a38d8a7207111688204a825fd70348721917b3016e1c9470",
   "scenarioSha256": "ac2b214ece34dc25aef2b73d020e04343f81cd48b3d243508be92cfdba01eb45",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/notifications-push-registered.json b/mobile/rpc-foundation/goldens/notifications-push-registered.json
index fd00a65b8313..85817d1e1752 100644
--- a/mobile/rpc-foundation/goldens/notifications-push-registered.json
+++ b/mobile/rpc-foundation/goldens/notifications-push-registered.json
@@ -3,9 +3,9 @@
   "family": "notifications.push-registration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "2e3d939dc162dbc5a38d8a7207111688204a825fd70348721917b3016e1c9470",
   "scenarioSha256": "90f49e430518bfc6e662da1d0c55b0084f30ab54dabdd15293b1f8ad9d2fa592",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/pairing-pre-profile-direct-wins-and-provisions.json b/mobile/rpc-foundation/goldens/pairing-pre-profile-direct-wins-and-provisions.json
index 1048b3e6c59a..92c3d0be569f 100644
--- a/mobile/rpc-foundation/goldens/pairing-pre-profile-direct-wins-and-provisions.json
+++ b/mobile/rpc-foundation/goldens/pairing-pre-profile-direct-wins-and-provisions.json
@@ -3,9 +3,9 @@
   "family": "pairing.pre-profile",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "57c8ad93d162ea69e4a0ecd5de7d8fae6806f8f7a51945c2c13661d81bae6497",
   "scenarioSha256": "e4fb7aa3b071c1207f206adcc0f31e92b6bb98a80f86a0772e48b5cebcab24ff",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/pairing-pre-profile-provision-unsupported-saves-direct-host.json b/mobile/rpc-foundation/goldens/pairing-pre-profile-provision-unsupported-saves-direct-host.json
index 6516d1ee3e8f..dbaade09b510 100644
--- a/mobile/rpc-foundation/goldens/pairing-pre-profile-provision-unsupported-saves-direct-host.json
+++ b/mobile/rpc-foundation/goldens/pairing-pre-profile-provision-unsupported-saves-direct-host.json
@@ -3,9 +3,9 @@
   "family": "pairing.pre-profile",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "57c8ad93d162ea69e4a0ecd5de7d8fae6806f8f7a51945c2c13661d81bae6497",
   "scenarioSha256": "5696ea2a62bb3f24902305f8bac0c4ae8f1e505f359db76fd69aabe353adae86",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/pairing-pre-profile-times-out.json b/mobile/rpc-foundation/goldens/pairing-pre-profile-times-out.json
index 3ebaeec062af..703f2d44b8a2 100644
--- a/mobile/rpc-foundation/goldens/pairing-pre-profile-times-out.json
+++ b/mobile/rpc-foundation/goldens/pairing-pre-profile-times-out.json
@@ -3,9 +3,9 @@
   "family": "pairing.pre-profile",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "57c8ad93d162ea69e4a0ecd5de7d8fae6806f8f7a51945c2c13661d81bae6497",
   "scenarioSha256": "9ab72231bf97fbe7eed232019c56568a9411433835eae424628af62c7c6a10c1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/pr-branch-identity.json b/mobile/rpc-foundation/goldens/pr-branch-identity.json
index d9d0c38fdee2..8b55717c760d 100644
--- a/mobile/rpc-foundation/goldens/pr-branch-identity.json
+++ b/mobile/rpc-foundation/goldens/pr-branch-identity.json
@@ -3,10 +3,10 @@
   "family": "session.pr-branch-context",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "d1b208a7bee947a603949fdc1f0d145e8c5576926f89f3e32330585f3a115290",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/pr-branch-repo-context.json b/mobile/rpc-foundation/goldens/pr-branch-repo-context.json
index 1e864ad75e88..fdffc14bf9ea 100644
--- a/mobile/rpc-foundation/goldens/pr-branch-repo-context.json
+++ b/mobile/rpc-foundation/goldens/pr-branch-repo-context.json
@@ -3,10 +3,10 @@
   "family": "session.pr-branch-context",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "bd715681a856254e0c374b504cece07e5df4c9a75fa2b97c35498df12210fbab",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/pr-comment-mutation.json b/mobile/rpc-foundation/goldens/pr-comment-mutation.json
index 50d7db741874..5135bf250680 100644
--- a/mobile/rpc-foundation/goldens/pr-comment-mutation.json
+++ b/mobile/rpc-foundation/goldens/pr-comment-mutation.json
@@ -3,10 +3,10 @@
   "family": "github.pr-comment-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "73cc5da2649b9687bb0d8247fa4ecf3c085746cf398515e8d2b40be2ed0da688",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/pr-comment-resolve-unconfirmed.json b/mobile/rpc-foundation/goldens/pr-comment-resolve-unconfirmed.json
index 404a0877ed6d..b51583c5b23d 100644
--- a/mobile/rpc-foundation/goldens/pr-comment-resolve-unconfirmed.json
+++ b/mobile/rpc-foundation/goldens/pr-comment-resolve-unconfirmed.json
@@ -3,10 +3,10 @@
   "family": "github.pr-comment-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "f425131d29fee8826c00a550fb537d0bd1a37bbaf3b33992984d5e04a990a512",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/pr-mutation-in-band-failure.json b/mobile/rpc-foundation/goldens/pr-mutation-in-band-failure.json
index 33f0e9263aca..bdd5c5f00b5b 100644
--- a/mobile/rpc-foundation/goldens/pr-mutation-in-band-failure.json
+++ b/mobile/rpc-foundation/goldens/pr-mutation-in-band-failure.json
@@ -3,10 +3,10 @@
   "family": "github.pr-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "70a94f45dbf7d58d9024c1cc4c94edd98fa48cd5ccffe8f2b7c53fa3e55d18d3",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/pr-mutation-status.json b/mobile/rpc-foundation/goldens/pr-mutation-status.json
index b970d64a9882..5b9696a333ca 100644
--- a/mobile/rpc-foundation/goldens/pr-mutation-status.json
+++ b/mobile/rpc-foundation/goldens/pr-mutation-status.json
@@ -3,10 +3,10 @@
   "family": "github.pr-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "e9291209234bacab12201f4c13bb592e06bd405215389e19f0754c23e79eb197",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/pr-read-fork-routing.json b/mobile/rpc-foundation/goldens/pr-read-fork-routing.json
index 412458417236..9c63ea6f1ace 100644
--- a/mobile/rpc-foundation/goldens/pr-read-fork-routing.json
+++ b/mobile/rpc-foundation/goldens/pr-read-fork-routing.json
@@ -3,10 +3,10 @@
   "family": "github.pr-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "ba21f7fc3966cb1e3c1e59d6e8a8b184fa0559bf3037365391ce23e364befd7f",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/pr-read-surface.json b/mobile/rpc-foundation/goldens/pr-read-surface.json
index f88ca141938b..000138b09f74 100644
--- a/mobile/rpc-foundation/goldens/pr-read-surface.json
+++ b/mobile/rpc-foundation/goldens/pr-read-surface.json
@@ -3,10 +3,10 @@
   "family": "github.pr-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "4246e7ffa62e85aac489c561171a6468f862b7f18eefac9926b65073616b6d35",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/pr-read-upstream-error.json b/mobile/rpc-foundation/goldens/pr-read-upstream-error.json
index 465631ac1df7..ac5d882d2d5b 100644
--- a/mobile/rpc-foundation/goldens/pr-read-upstream-error.json
+++ b/mobile/rpc-foundation/goldens/pr-read-upstream-error.json
@@ -3,10 +3,10 @@
   "family": "github.pr-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "b2445b299e18664b698d659c5041860b8a253314687666ae467aab441ab07235",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/pr-sidebar-checks-refused.json b/mobile/rpc-foundation/goldens/pr-sidebar-checks-refused.json
index f1faa733582b..0f676a3ec3c0 100644
--- a/mobile/rpc-foundation/goldens/pr-sidebar-checks-refused.json
+++ b/mobile/rpc-foundation/goldens/pr-sidebar-checks-refused.json
@@ -3,9 +3,9 @@
   "family": "session.pr-sidebar",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "87ffa2daea415d2682f1112025b5bd9d52404c6fc7c239180a3ad2120678ff1f",
   "scenarioSha256": "1b489d319f6517fe2ee33beaeedf4e0cb0f531c952dc7e9f833ca814366d60cb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/pr-sidebar-load.json b/mobile/rpc-foundation/goldens/pr-sidebar-load.json
index 7adce3fc9ca7..b620dbb5ff3a 100644
--- a/mobile/rpc-foundation/goldens/pr-sidebar-load.json
+++ b/mobile/rpc-foundation/goldens/pr-sidebar-load.json
@@ -3,9 +3,9 @@
   "family": "session.pr-sidebar",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "87ffa2daea415d2682f1112025b5bd9d52404c6fc7c239180a3ad2120678ff1f",
   "scenarioSha256": "d4da89a37325ac4e92d9eae8de33f9cc6d9414fcf89a4f44064a7b1e4254102a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/pr-title-mutation.json b/mobile/rpc-foundation/goldens/pr-title-mutation.json
index ecd60dbb2643..8b70312a91a3 100644
--- a/mobile/rpc-foundation/goldens/pr-title-mutation.json
+++ b/mobile/rpc-foundation/goldens/pr-title-mutation.json
@@ -3,10 +3,10 @@
   "family": "github.pr-title-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "071e745453795d18d683aaab63e810783e3cee4927b47425c20a3d915397d0dd",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/pr-title-unconfirmed.json b/mobile/rpc-foundation/goldens/pr-title-unconfirmed.json
index 27c9201b9b30..f3925091c1e1 100644
--- a/mobile/rpc-foundation/goldens/pr-title-unconfirmed.json
+++ b/mobile/rpc-foundation/goldens/pr-title-unconfirmed.json
@@ -3,10 +3,10 @@
   "family": "github.pr-title-mutation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
   "scenarioSha256": "669260c675021b37252dc5023a7a78e4e90536c2f35d9a5da3e53778e6a0cf52",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/pr-triage-invalid-terminal.json b/mobile/rpc-foundation/goldens/pr-triage-invalid-terminal.json
deleted file mode 100644
index d01873b1be25..000000000000
--- a/mobile/rpc-foundation/goldens/pr-triage-invalid-terminal.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "operation": "session.pr-triage-launch",
-  "family": "session.pr-triage",
-  "namedDeltas": [],
-  "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
-  "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
-  "scenarioSha256": "58ad4e4d5b0200c44f329236e10fd81918a1cc36b33b22cba24662c79dd61b4e",
-  "platform": "darwin",
-  "scenarioVersion": 1,
-  "projectionVersion": 2,
-  "goldenFormatVersion": 5,
-  "values": {
-    "2540affc8fa5": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 1,
-      "args": [
-        {
-          "name": "method",
-          "value": "session.tabs.createTerminal"
-        },
-        {
-          "name": "params",
-          "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "tab": {
-              "id": "tab-1"
-            }
-          }
-        }
-      }
-    },
-    "478ad4afe83e": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "The host sent a reply this app could not read (session.tabs.createTerminal)",
-        "isRpcDeliveryUnknown": false
-      }
-    },
-    "94d38f1838f6": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 2,
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}"
-    },
-    "a4273b38df83": {
-      "launched": "unlaunched"
-    }
-  },
-  "recording": {
-    "scenario": "pr-triage-invalid-terminal",
-    "checkpoints": [
-      {
-        "id": "invalid",
-        "observation": {
-          "sender": ["2540affc8fa5"],
-          "payloads": ["94d38f1838f6"],
-          "settlements": {
-            "launch": "478ad4afe83e"
-          },
-          "state": "a4273b38df83",
-          "effects": []
-        }
-      }
-    ]
-  }
-}
diff --git a/mobile/rpc-foundation/goldens/pr-triage-launch-unconfirmed.json b/mobile/rpc-foundation/goldens/pr-triage-launch-unconfirmed.json
new file mode 100644
index 000000000000..dd9dc7f99321
--- /dev/null
+++ b/mobile/rpc-foundation/goldens/pr-triage-launch-unconfirmed.json
@@ -0,0 +1,220 @@
+{
+  "operation": "session.pr-triage-launch",
+  "family": "session.pr-triage",
+  "namedDeltas": [],
+  "runnerVersion": 1,
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
+  "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
+  "scenarioSha256": "ca8e7ca631e72fbec9f3264a2ece10f171c258dc888922e4931ea481a70ecc62",
+  "platform": "darwin",
+  "scenarioVersion": 1,
+  "projectionVersion": 2,
+  "goldenFormatVersion": 5,
+  "values": {
+    "02188f091419": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "settings": {
+              "defaultTuiAgent": "codex",
+              "disabledTuiAgents": []
+            }
+          }
+        }
+      }
+    },
+    "1c2564f1daca": {
+      "name": "settings.get#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
+    "28339abecf78": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"agent.launchReplay\",\"params\":{\"agent\":\"codex\",\"operationId\":\"1767225600000-00000000000040008000000000000001\",\"target\":{\"kind\":\"existing\",\"worktree\":\"id:repo-9::/w\"},\"prompt\":{\"text\":\"Fix the failing checks\",\"delivery\":\"submit\"},\"launchSource\":\"task_page\"}}"
+    },
+    "3e6a0417d2ee": {
+      "name": "repo.list#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "repos": [
+              {
+                "id": "repo-9"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "9c16efc31903": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": ["codex"]
+        }
+      }
+    },
+    "c15f33d27bd2": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "agent_session_operation_unknown",
+            "message": "agent_session_operation_unknown"
+          },
+          "id": "frame-4",
+          "ok": false
+        }
+      }
+    },
+    "e0eef7c9fafe": {
+      "name": "repo.list#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
+    },
+    "eaa398d8c3aa": {
+      "launched": {
+        "kind": "unconfirmed",
+        "message": "Couldn't confirm the agent started. Check the workspace before trying again."
+      }
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "f49d184679d1": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectAgents\"}"
+    }
+  },
+  "recording": {
+    "scenario": "pr-triage-launch-unconfirmed",
+    "checkpoints": [
+      {
+        "id": "unconfirmed",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "c15f33d27bd2"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "eaa398d8c3aa",
+          "effects": []
+        }
+      }
+    ]
+  }
+}
diff --git a/mobile/rpc-foundation/goldens/pr-triage-launch.json b/mobile/rpc-foundation/goldens/pr-triage-launch.json
index e255f6757a47..6409255dde36 100644
--- a/mobile/rpc-foundation/goldens/pr-triage-launch.json
+++ b/mobile/rpc-foundation/goldens/pr-triage-launch.json
@@ -3,36 +3,28 @@
   "family": "session.pr-triage",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
-  "scenarioSha256": "8bb2ff4e899ee873289fed7c1ef12e7f9dba91949125b1f0e4336d378ceb071e",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
+  "scenarioSha256": "b7c9498eea67df2f670911e3b868a44ba77833813c17e7800dba52ebff530350",
   "platform": "darwin",
   "scenarioVersion": 1,
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "280ce0d6f832": {
-      "name": "terminal.send#1",
-      "ordinal": 4,
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"terminal.send\",\"params\":{\"terminal\":\"term-1\",\"text\":\"Fix the failing checks\",\"enter\":true}}"
-    },
-    "5093e98ba369": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 1,
+    "02188f091419": {
+      "name": "settings.get#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "settings.get"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
           }
         },
         {
@@ -47,54 +39,103 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "id": "frame-1",
+          "id": "frame-2",
           "ok": true,
           "result": {
-            "tab": {
-              "id": "tab-1",
-              "terminal": "term-1",
-              "title": "Agent",
-              "type": "terminal"
+            "settings": {
+              "defaultTuiAgent": "codex",
+              "disabledTuiAgents": []
             }
           }
         }
       }
     },
-    "9270aeb7d9c6": {
-      "status": "pending",
-      "startedAt": 0
-    },
-    "94d38f1838f6": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 2,
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}"
+    "1c2564f1daca": {
+      "name": "settings.get#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
     },
-    "a4273b38df83": {
-      "launched": "unlaunched"
+    "28339abecf78": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"agent.launchReplay\",\"params\":{\"agent\":\"codex\",\"operationId\":\"1767225600000-00000000000040008000000000000001\",\"target\":{\"kind\":\"existing\",\"worktree\":\"id:repo-9::/w\"},\"prompt\":{\"text\":\"Fix the failing checks\",\"delivery\":\"submit\"},\"launchSource\":\"task_page\"}}"
     },
-    "eb79a9b3682a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "$rpc": "undefined"
+    "35f85fe3b71c": {
+      "name": "repo.list#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
       }
     },
-    "f9b284ac2424": {
-      "name": "session.tabs.createTerminal#1",
+    "3e6a0417d2ee": {
+      "name": "repo.list#1",
       "ordinal": 1,
       "args": [
         {
           "name": "method",
-          "value": "session.tabs.createTerminal"
+          "value": "repo.list"
         },
         {
           "name": "params",
           "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "repos": [
+              {
+                "id": "repo-9"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "51d4cb56be85": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
           }
         },
         {
@@ -109,23 +150,22 @@
         "startedAt": 0
       }
     },
-    "fe1fe746e77a": {
-      "launched": "sent"
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
     },
-    "fe53d3bce307": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
+    "9c16efc31903": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
       "args": [
         {
           "name": "method",
-          "value": "terminal.send"
+          "value": "preflight.detectAgents"
         },
         {
           "name": "params",
           "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
+            "$rpc": "absent"
           }
         },
         {
@@ -140,15 +180,95 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "id": "frame-2",
+          "id": "frame-3",
           "ok": true,
-          "result": {
-            "send": {
-              "accepted": true
+          "result": ["codex"]
+        }
+      }
+    },
+    "a4273b38df83": {
+      "launched": "unlaunched"
+    },
+    "ba3fac1eb199": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
             }
           }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true,
+          "result": {
+            "outcome": {
+              "handle": "term-1",
+              "kind": "terminal"
+            },
+            "prompt": {
+              "delivery": "submit",
+              "outcome": "handed-to-terminal"
+            },
+            "receipt": {
+              "detail": "Started a terminal agent, the default for new agent tabs in your settings.",
+              "mode": "terminal",
+              "preferred": "terminal",
+              "reason": "user_default"
+            },
+            "worktreeId": "repo-9::/w"
+          }
         }
       }
+    },
+    "e0eef7c9fafe": {
+      "name": "repo.list#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "eb8d47f90956": {
+      "launched": {
+        "kind": "sent"
+      }
+    },
+    "f49d184679d1": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectAgents\"}"
     }
   },
   "recording": {
@@ -157,8 +277,8 @@
       {
         "id": "pending",
         "observation": {
-          "sender": ["f9b284ac2424"],
-          "payloads": ["94d38f1838f6"],
+          "sender": ["35f85fe3b71c", "51d4cb56be85"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca"],
           "settlements": {
             "launch": "9270aeb7d9c6"
           },
@@ -169,12 +289,12 @@
       {
         "id": "launched",
         "observation": {
-          "sender": ["5093e98ba369", "fe53d3bce307"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "ba3fac1eb199"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
           "settlements": {
             "launch": "eb79a9b3682a"
           },
-          "state": "fe1fe746e77a",
+          "state": "eb8d47f90956",
           "effects": []
         }
       }
diff --git a/mobile/rpc-foundation/goldens/pr-triage-prompt-not-delivered.json b/mobile/rpc-foundation/goldens/pr-triage-prompt-not-delivered.json
new file mode 100644
index 000000000000..a3a899069984
--- /dev/null
+++ b/mobile/rpc-foundation/goldens/pr-triage-prompt-not-delivered.json
@@ -0,0 +1,233 @@
+{
+  "operation": "session.pr-triage-launch",
+  "family": "session.pr-triage",
+  "namedDeltas": [],
+  "runnerVersion": 1,
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
+  "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
+  "scenarioSha256": "8307180e88773739a587bb3000327888da9ab609554ec66ea46d92b5a816221a",
+  "platform": "darwin",
+  "scenarioVersion": 1,
+  "projectionVersion": 2,
+  "goldenFormatVersion": 5,
+  "values": {
+    "02188f091419": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "settings": {
+              "defaultTuiAgent": "codex",
+              "disabledTuiAgents": []
+            }
+          }
+        }
+      }
+    },
+    "1c2564f1daca": {
+      "name": "settings.get#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
+    "28339abecf78": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"agent.launchReplay\",\"params\":{\"agent\":\"codex\",\"operationId\":\"1767225600000-00000000000040008000000000000001\",\"target\":{\"kind\":\"existing\",\"worktree\":\"id:repo-9::/w\"},\"prompt\":{\"text\":\"Fix the failing checks\",\"delivery\":\"submit\"},\"launchSource\":\"task_page\"}}"
+    },
+    "29436402d701": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "codex",
+            "launchSource": "task_page",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "Fix the failing checks"
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true,
+          "result": {
+            "outcome": {
+              "handle": "term-1",
+              "kind": "terminal"
+            },
+            "prompt": {
+              "delivery": "submit",
+              "outcome": "not-delivered"
+            },
+            "receipt": {
+              "detail": "Started a terminal agent, the default for new agent tabs in your settings.",
+              "mode": "terminal",
+              "preferred": "terminal",
+              "reason": "user_default"
+            },
+            "worktreeId": "repo-9::/w"
+          }
+        }
+      }
+    },
+    "3e6a0417d2ee": {
+      "name": "repo.list#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "repos": [
+              {
+                "id": "repo-9"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "3fde28ed6a57": {
+      "launched": {
+        "kind": "prompt-not-sent",
+        "prompt": "Fix the failing checks"
+      }
+    },
+    "9c16efc31903": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": ["codex"]
+        }
+      }
+    },
+    "e0eef7c9fafe": {
+      "name": "repo.list#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "f49d184679d1": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectAgents\"}"
+    }
+  },
+  "recording": {
+    "scenario": "pr-triage-prompt-not-delivered",
+    "checkpoints": [
+      {
+        "id": "prompt-not-sent",
+        "observation": {
+          "sender": ["3e6a0417d2ee", "02188f091419", "9c16efc31903", "29436402d701"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "28339abecf78"],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "3fde28ed6a57",
+          "effects": []
+        }
+      }
+    ]
+  }
+}
diff --git a/mobile/rpc-foundation/goldens/pr-triage-send-locked.json b/mobile/rpc-foundation/goldens/pr-triage-send-locked.json
deleted file mode 100644
index 4b778ae391b3..000000000000
--- a/mobile/rpc-foundation/goldens/pr-triage-send-locked.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "operation": "session.pr-triage-launch",
-  "family": "session.pr-triage",
-  "namedDeltas": [],
-  "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
-  "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "f560ff1582487c118756c527faa1fb1f65e37ce22ca9573491fd4b2dbcedf38d",
-  "scenarioSha256": "d80bc346e84bc35e6dce70643dcd3af3ea9e5a7f8a1f2b7a9e92c71c0c30d4c9",
-  "platform": "darwin",
-  "scenarioVersion": 1,
-  "projectionVersion": 2,
-  "goldenFormatVersion": 5,
-  "values": {
-    "0f026fafa7e1": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "Terminal input is locked",
-        "isRpcDeliveryUnknown": false
-      }
-    },
-    "280ce0d6f832": {
-      "name": "terminal.send#1",
-      "ordinal": 4,
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"terminal.send\",\"params\":{\"terminal\":\"term-1\",\"text\":\"Fix the failing checks\",\"enter\":true}}"
-    },
-    "438dbb654f4e": {
-      "name": "terminal.send#1",
-      "ordinal": 3,
-      "args": [
-        {
-          "name": "method",
-          "value": "terminal.send"
-        },
-        {
-          "name": "params",
-          "value": {
-            "enter": true,
-            "terminal": "term-1",
-            "text": "Fix the failing checks"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "send": {
-              "accepted": false
-            }
-          }
-        }
-      }
-    },
-    "5093e98ba369": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 1,
-      "args": [
-        {
-          "name": "method",
-          "value": "session.tabs.createTerminal"
-        },
-        {
-          "name": "params",
-          "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "tab": {
-              "id": "tab-1",
-              "terminal": "term-1",
-              "title": "Agent",
-              "type": "terminal"
-            }
-          }
-        }
-      }
-    },
-    "94d38f1838f6": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 2,
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}"
-    },
-    "a4273b38df83": {
-      "launched": "unlaunched"
-    }
-  },
-  "recording": {
-    "scenario": "pr-triage-send-locked",
-    "checkpoints": [
-      {
-        "id": "locked",
-        "observation": {
-          "sender": ["5093e98ba369", "438dbb654f4e"],
-          "payloads": ["94d38f1838f6", "280ce0d6f832"],
-          "settlements": {
-            "launch": "0f026fafa7e1"
-          },
-          "state": "a4273b38df83",
-          "effects": []
-        }
-      }
-    ]
-  }
-}
diff --git a/mobile/rpc-foundation/goldens/pr-triage-update-required.json b/mobile/rpc-foundation/goldens/pr-triage-update-required.json
new file mode 100644
index 000000000000..9c177b4f7d8a
--- /dev/null
+++ b/mobile/rpc-foundation/goldens/pr-triage-update-required.json
@@ -0,0 +1,48 @@
+{
+  "operation": "session.pr-triage-launch",
+  "family": "session.pr-triage",
+  "namedDeltas": [],
+  "runnerVersion": 1,
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
+  "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "5f65c5b318f4764b0f58a5e7b593333759a9cfa799db45b11190ac26f4083335",
+  "scenarioSha256": "7fc74743e625d338b27a32280692132b5b085cfbb43ecfd0a1ac7caaddbcd459",
+  "platform": "darwin",
+  "scenarioVersion": 1,
+  "projectionVersion": 2,
+  "goldenFormatVersion": 5,
+  "values": {
+    "c2a44248892e": {
+      "launched": {
+        "kind": "not-started",
+        "message": "Update Orca on your computer to start an agent from your phone."
+      }
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    }
+  },
+  "recording": {
+    "scenario": "pr-triage-update-required",
+    "checkpoints": [
+      {
+        "id": "update-required",
+        "observation": {
+          "sender": [],
+          "payloads": [],
+          "settlements": {
+            "launch": "eb79a9b3682a"
+          },
+          "state": "c2a44248892e",
+          "effects": []
+        }
+      }
+    ]
+  }
+}
diff --git a/mobile/rpc-foundation/goldens/probe-new-tab-both-refused.json b/mobile/rpc-foundation/goldens/probe-new-tab-both-refused.json
index df509ed0abc2..5fc9131610e4 100644
--- a/mobile/rpc-foundation/goldens/probe-new-tab-both-refused.json
+++ b/mobile/rpc-foundation/goldens/probe-new-tab-both-refused.json
@@ -3,9 +3,9 @@
   "family": "settings-agent-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "819fa73c7700b4d526da91c37558a6498008d745d1debcc26e6bb757550ebf99",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/probe-new-tab-null-sibling-refused.json b/mobile/rpc-foundation/goldens/probe-new-tab-null-sibling-refused.json
index 5dbbfd568438..7f025ba6705e 100644
--- a/mobile/rpc-foundation/goldens/probe-new-tab-null-sibling-refused.json
+++ b/mobile/rpc-foundation/goldens/probe-new-tab-null-sibling-refused.json
@@ -3,9 +3,9 @@
   "family": "settings-agent-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "500396d72abd2f73d11ef066bca3f88798c8cbdaef09fa7c1c8d1fbaf0b3b85a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/probe-new-tab-refused-sibling-rejects.json b/mobile/rpc-foundation/goldens/probe-new-tab-refused-sibling-rejects.json
index ac38c1a9198d..c35f9f15bb4a 100644
--- a/mobile/rpc-foundation/goldens/probe-new-tab-refused-sibling-rejects.json
+++ b/mobile/rpc-foundation/goldens/probe-new-tab-refused-sibling-rejects.json
@@ -3,9 +3,9 @@
   "family": "settings-agent-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "daf68df8840ea6872521d823cc17e1e5de3f3a74a8855465fcf40cc276e9c2ce",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/probe-new-tab-rejects-sibling-refused.json b/mobile/rpc-foundation/goldens/probe-new-tab-rejects-sibling-refused.json
index d68d23fb9eed..ead340e9da18 100644
--- a/mobile/rpc-foundation/goldens/probe-new-tab-rejects-sibling-refused.json
+++ b/mobile/rpc-foundation/goldens/probe-new-tab-rejects-sibling-refused.json
@@ -3,9 +3,9 @@
   "family": "settings-agent-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "61e36caf6b3bb01c3ad0db282b7f0fbc0f300d40184f9cf3d7e4e3a3194a4f2a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/push-dismissal-tray-reconciled.json b/mobile/rpc-foundation/goldens/push-dismissal-tray-reconciled.json
index 6a3ed036a3e6..efb5cb44258e 100644
--- a/mobile/rpc-foundation/goldens/push-dismissal-tray-reconciled.json
+++ b/mobile/rpc-foundation/goldens/push-dismissal-tray-reconciled.json
@@ -3,9 +3,9 @@
   "family": "notifications.push-dismissal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "595a3eb2994d0596b9fcd0707b175b4e978625053dfbc5c541b0350c0cbfb524",
   "scenarioSha256": "318fab8c1efb1786bbdaea7f13b769952c1ce463bc5504dca6a9f545e905b7c9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/quick-commands-load-refused.json b/mobile/rpc-foundation/goldens/quick-commands-load-refused.json
index 84dec11e9b9a..9b474b2fe945 100644
--- a/mobile/rpc-foundation/goldens/quick-commands-load-refused.json
+++ b/mobile/rpc-foundation/goldens/quick-commands-load-refused.json
@@ -3,9 +3,9 @@
   "family": "settings.quick-commands",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "42334358b5e5966001639653b553f15033f6e201d785107871fe056536f0a5e2",
   "scenarioSha256": "42573387533f75122f626ce6ec81c1e61fe54cde5df416154bb7cba132f53309",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/quick-commands-loaded-and-saved.json b/mobile/rpc-foundation/goldens/quick-commands-loaded-and-saved.json
index 0d9637ff3bdf..f0a3927eb9d5 100644
--- a/mobile/rpc-foundation/goldens/quick-commands-loaded-and-saved.json
+++ b/mobile/rpc-foundation/goldens/quick-commands-loaded-and-saved.json
@@ -3,9 +3,9 @@
   "family": "settings.quick-commands",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "42334358b5e5966001639653b553f15033f6e201d785107871fe056536f0a5e2",
   "scenarioSha256": "a621156bbb662c78a0baa356b60d0af41d10a7bd14e54f23be0581a59377cec3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/quick-commands-save-refused-rolls-back.json b/mobile/rpc-foundation/goldens/quick-commands-save-refused-rolls-back.json
index 20cd579d489c..f35f31ef0118 100644
--- a/mobile/rpc-foundation/goldens/quick-commands-save-refused-rolls-back.json
+++ b/mobile/rpc-foundation/goldens/quick-commands-save-refused-rolls-back.json
@@ -3,9 +3,9 @@
   "family": "settings.quick-commands",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "42334358b5e5966001639653b553f15033f6e201d785107871fe056536f0a5e2",
   "scenarioSha256": "72517336e451e1e078135103073c1821e8af27c0702f6dc83b9a686fe7ff8c04",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/relay-direct-upgrade-commits.json b/mobile/rpc-foundation/goldens/relay-direct-upgrade-commits.json
index 4a40e741c789..128b5683855a 100644
--- a/mobile/rpc-foundation/goldens/relay-direct-upgrade-commits.json
+++ b/mobile/rpc-foundation/goldens/relay-direct-upgrade-commits.json
@@ -3,9 +3,9 @@
   "family": "relay.direct-upgrade",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "374a16da4187ee44fcc6e07daf822ae96ecfc13ab47ee6c29d048b1c0bd0f291",
   "scenarioSha256": "a92bccd183127829b6dfd85add28e42370d54990f63214940b1c584f7fde56a9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/relay-direct-upgrade-unsupported-host-declines.json b/mobile/rpc-foundation/goldens/relay-direct-upgrade-unsupported-host-declines.json
index 1ed9400bf967..49bb0d6916b3 100644
--- a/mobile/rpc-foundation/goldens/relay-direct-upgrade-unsupported-host-declines.json
+++ b/mobile/rpc-foundation/goldens/relay-direct-upgrade-unsupported-host-declines.json
@@ -3,9 +3,9 @@
   "family": "relay.direct-upgrade",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "374a16da4187ee44fcc6e07daf822ae96ecfc13ab47ee6c29d048b1c0bd0f291",
   "scenarioSha256": "7d5cad367e76767b039fc5ebc15837930f02c5e1bed33ae7ca4695bae56287bd",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/relay-pairing-recovery-invite-authorizes.json b/mobile/rpc-foundation/goldens/relay-pairing-recovery-invite-authorizes.json
index 10205efd8c1f..93d35123826d 100644
--- a/mobile/rpc-foundation/goldens/relay-pairing-recovery-invite-authorizes.json
+++ b/mobile/rpc-foundation/goldens/relay-pairing-recovery-invite-authorizes.json
@@ -3,9 +3,9 @@
   "family": "relay.pairing-recovery",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "57c8ad93d162ea69e4a0ecd5de7d8fae6806f8f7a51945c2c13661d81bae6497",
   "scenarioSha256": "8dc3fd27c5720276608ca8743990e4f57d94eab84f620e9aa42702a4686fd5a9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/relay-pairing-recovery-resume-committed.json b/mobile/rpc-foundation/goldens/relay-pairing-recovery-resume-committed.json
index 9aaa077af88c..01ea2c1dd1ca 100644
--- a/mobile/rpc-foundation/goldens/relay-pairing-recovery-resume-committed.json
+++ b/mobile/rpc-foundation/goldens/relay-pairing-recovery-resume-committed.json
@@ -3,9 +3,9 @@
   "family": "relay.pairing-recovery",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "57c8ad93d162ea69e4a0ecd5de7d8fae6806f8f7a51945c2c13661d81bae6497",
   "scenarioSha256": "7e54c3af4b8b8e6eac007267fb96620283b735491883c505401c79656d920ca6",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/relay-rotation-installs-and-commits.json b/mobile/rpc-foundation/goldens/relay-rotation-installs-and-commits.json
index 008ccc1943a1..df749f8a8adf 100644
--- a/mobile/rpc-foundation/goldens/relay-rotation-installs-and-commits.json
+++ b/mobile/rpc-foundation/goldens/relay-rotation-installs-and-commits.json
@@ -3,9 +3,9 @@
   "family": "relay.credential-rotation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "374a16da4187ee44fcc6e07daf822ae96ecfc13ab47ee6c29d048b1c0bd0f291",
   "scenarioSha256": "c786fb19f9593ee60238e42813561edf6f5e976fcf217dff8de977a333fe8451",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/relay-rotation-resumes-committed-pending.json b/mobile/rpc-foundation/goldens/relay-rotation-resumes-committed-pending.json
index 0a241931b804..9b00ed66ae03 100644
--- a/mobile/rpc-foundation/goldens/relay-rotation-resumes-committed-pending.json
+++ b/mobile/rpc-foundation/goldens/relay-rotation-resumes-committed-pending.json
@@ -3,9 +3,9 @@
   "family": "relay.credential-rotation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "374a16da4187ee44fcc6e07daf822ae96ecfc13ab47ee6c29d048b1c0bd0f291",
   "scenarioSha256": "96df784c1d56de3bdd04afe20ab019339c7d9a616528ca2617e2fffe4f0157c8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/review-branch-diff-shapes.json b/mobile/rpc-foundation/goldens/review-branch-diff-shapes.json
index 2c0a2ed54346..111141a241d7 100644
--- a/mobile/rpc-foundation/goldens/review-branch-diff-shapes.json
+++ b/mobile/rpc-foundation/goldens/review-branch-diff-shapes.json
@@ -3,9 +3,9 @@
   "family": "session.review-branch-diff",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "36dbf57e82d87819b403839c22044209f0f399057f62efa7004bb8b899fdbe81",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/review-create-agent-refused.json b/mobile/rpc-foundation/goldens/review-create-agent-refused.json
new file mode 100644
index 000000000000..4b3e87f2df7b
--- /dev/null
+++ b/mobile/rpc-foundation/goldens/review-create-agent-refused.json
@@ -0,0 +1,249 @@
+{
+  "operation": "session.diff-review-actions",
+  "family": "session.diff-review-actions",
+  "namedDeltas": [],
+  "runnerVersion": 1,
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
+  "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
+  "scenarioSha256": "0816742351babdb260fcdba92d0020e0216c8ec0d106b560357f295671c83fe2",
+  "platform": "darwin",
+  "scenarioVersion": 1,
+  "projectionVersion": 2,
+  "goldenFormatVersion": 5,
+  "values": {
+    "1c2564f1daca": {
+      "name": "settings.get#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
+    "5ee9e7b49320": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"agent.launchReplay\",\"params\":{\"agent\":\"claude\",\"operationId\":\"1767225600000-00000000000040008000000000000001\",\"target\":{\"kind\":\"existing\",\"worktree\":\"id:workspace-1\"},\"prompt\":{\"text\":\"You are reviewing the current worktree. Address the following mobile review notes.\\n\\nFile: src/app.ts\\nLine: 4\\nUser comment: \\\"needs a test\\\"\\n\\nAfter applying fixes:\\n1. Summarize changed files.\\n2. Run relevant tests.\\n3. Tell me if anything remains risky.\",\"delivery\":\"submit\"},\"launchSource\":\"notes_send\"}}"
+    },
+    "9239a4f232b8": {
+      "name": "repo.list#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "repos": [
+              {
+                "id": "workspace-1"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "96a9a954e28f": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "settings": {
+              "defaultTuiAgent": {
+                "$rpc": "null"
+              },
+              "disabledTuiAgents": []
+            }
+          }
+        }
+      }
+    },
+    "bcb5111e6012": {
+      "name": "agent.launchReplay#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "agent.launchReplay"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "claude",
+            "launchSource": "notes_send",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "prompt": {
+              "delivery": "submit",
+              "text": "You are reviewing the current worktree. Address the following mobile review notes.\n\nFile: src/app.ts\nLine: 4\nUser comment: \"needs a test\"\n\nAfter applying fixes:\n1. Summarize changed files.\n2. Run relevant tests.\n3. Tell me if anything remains risky."
+            },
+            "target": {
+              "kind": "existing",
+              "worktree": "id:workspace-1"
+            }
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "selector_not_found",
+            "message": "Workspace not found"
+          },
+          "id": "frame-4",
+          "ok": false
+        }
+      }
+    },
+    "e0eef7c9fafe": {
+      "name": "repo.list#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "f49d184679d1": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectAgents\"}"
+    },
+    "fc1691a7deca": {
+      "actionError": "Workspace not found",
+      "busyAction": {
+        "$rpc": "null"
+      },
+      "screenState": {
+        "branchCompare": {
+          "$rpc": "null"
+        },
+        "comments": [
+          {
+            "body": "needs a test",
+            "createdAt": 0,
+            "filePath": "src/app.ts",
+            "id": "note-1",
+            "lineNumber": 4,
+            "side": "modified",
+            "worktreeId": "workspace-1"
+          }
+        ],
+        "kind": "ready",
+        "reviewState": {
+          "files": {},
+          "version": 1
+        },
+        "status": {
+          "entries": []
+        }
+      },
+      "sendSheet": {
+        "$rpc": "null"
+      }
+    },
+    "fc3974e714de": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": ["claude"]
+        }
+      }
+    }
+  },
+  "recording": {
+    "scenario": "review-create-agent-refused",
+    "checkpoints": [
+      {
+        "id": "refused",
+        "observation": {
+          "sender": ["9239a4f232b8", "96a9a954e28f", "fc3974e714de", "bcb5111e6012"],
+          "payloads": ["e0eef7c9fafe", "1c2564f1daca", "f49d184679d1", "5ee9e7b49320"],
+          "settlements": {
+            "create-and-send": "eb79a9b3682a"
+          },
+          "state": "fc1691a7deca",
+          "effects": []
+        }
+      }
+    ]
+  }
+}
diff --git a/mobile/rpc-foundation/goldens/review-create-terminal-refused.json b/mobile/rpc-foundation/goldens/review-create-terminal-refused.json
deleted file mode 100644
index 57b324b2d081..000000000000
--- a/mobile/rpc-foundation/goldens/review-create-terminal-refused.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-  "operation": "session.diff-review-actions",
-  "family": "session.diff-review-actions",
-  "namedDeltas": [],
-  "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
-  "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
-  "scenarioSha256": "af837de2e273c5f03130b51d6e1a9bff9ff99a4e8d1c9554a53134acb5924c72",
-  "platform": "darwin",
-  "scenarioVersion": 1,
-  "projectionVersion": 2,
-  "goldenFormatVersion": 5,
-  "values": {
-    "2fc890e4b748": {
-      "actionError": {
-        "$rpc": "null"
-      },
-      "busyAction": {
-        "$rpc": "null"
-      },
-      "screenState": {
-        "branchCompare": {
-          "$rpc": "null"
-        },
-        "comments": [
-          {
-            "body": "needs a test",
-            "createdAt": 0,
-            "filePath": "src/app.ts",
-            "id": "note-1",
-            "lineNumber": 4,
-            "side": "modified",
-            "worktreeId": "workspace-1"
-          }
-        ],
-        "kind": "ready",
-        "reviewState": {
-          "files": {},
-          "version": 1
-        },
-        "status": {
-          "entries": []
-        }
-      },
-      "sendSheet": {
-        "$rpc": "null"
-      }
-    },
-    "6e913cd7b306": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "Workspace is busy",
-        "isRpcDeliveryUnknown": false
-      }
-    },
-    "88cd0d2b1302": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 2,
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:workspace-1\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}"
-    },
-    "fff91a37bc65": {
-      "name": "session.tabs.createTerminal#1",
-      "ordinal": 1,
-      "args": [
-        {
-          "name": "method",
-          "value": "session.tabs.createTerminal"
-        },
-        {
-          "name": "params",
-          "value": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:workspace-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "error": {
-            "code": "worktree_busy",
-            "message": "Workspace is busy"
-          },
-          "id": "frame-1",
-          "ok": false
-        }
-      }
-    }
-  },
-  "recording": {
-    "scenario": "review-create-terminal-refused",
-    "checkpoints": [
-      {
-        "id": "refused",
-        "observation": {
-          "sender": ["fff91a37bc65"],
-          "payloads": ["88cd0d2b1302"],
-          "settlements": {
-            "create-and-send": "6e913cd7b306"
-          },
-          "state": "2fc890e4b748",
-          "effects": []
-        }
-      }
-    ]
-  }
-}
diff --git a/mobile/rpc-foundation/goldens/review-file-diff-shapes.json b/mobile/rpc-foundation/goldens/review-file-diff-shapes.json
index 49ee3d3a351d..468c34e78f7e 100644
--- a/mobile/rpc-foundation/goldens/review-file-diff-shapes.json
+++ b/mobile/rpc-foundation/goldens/review-file-diff-shapes.json
@@ -3,9 +3,9 @@
   "family": "session.review-file-diff",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "30f0d2ecb8ab5a51a85037196325d5bbac53eb48c5d59a5af62e3ab1fc9420e7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/review-git-mutations-run.json b/mobile/rpc-foundation/goldens/review-git-mutations-run.json
index 70e0452382c4..acd150c9b2ae 100644
--- a/mobile/rpc-foundation/goldens/review-git-mutations-run.json
+++ b/mobile/rpc-foundation/goldens/review-git-mutations-run.json
@@ -3,10 +3,10 @@
   "family": "session.review-git-mutations",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "7981ac87c4397b9703330835327c70828cb5a76633f1c4803ded1b66520d184d",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/review-mark-reviewed-persists.json b/mobile/rpc-foundation/goldens/review-mark-reviewed-persists.json
index 9b8fc12d50a7..b85c016c15ab 100644
--- a/mobile/rpc-foundation/goldens/review-mark-reviewed-persists.json
+++ b/mobile/rpc-foundation/goldens/review-mark-reviewed-persists.json
@@ -3,10 +3,10 @@
   "family": "session.diff-review-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "9f1c39e91a97266b0a550d2b2d061592ae050078401ef23177dd2e00db67bf04",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/review-mark-reviewed-rolls-back.json b/mobile/rpc-foundation/goldens/review-mark-reviewed-rolls-back.json
index 44d1105dbf40..e99516ff777c 100644
--- a/mobile/rpc-foundation/goldens/review-mark-reviewed-rolls-back.json
+++ b/mobile/rpc-foundation/goldens/review-mark-reviewed-rolls-back.json
@@ -3,10 +3,10 @@
   "family": "session.diff-review-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "c858cfca59148548146b4c0a775e9518d3ab826ef268ccc9af60b04e52cc9e3d",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/review-open-in-session.json b/mobile/rpc-foundation/goldens/review-open-in-session.json
index e398bb2428c9..569e83371df2 100644
--- a/mobile/rpc-foundation/goldens/review-open-in-session.json
+++ b/mobile/rpc-foundation/goldens/review-open-in-session.json
@@ -3,10 +3,10 @@
   "family": "session.diff-review-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "2f0a6aa8ce100edbce9ccf64c81efe64356fccbdcd2e16f561360e2b11b5700f",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/review-send-notes-heals-stale-input.json b/mobile/rpc-foundation/goldens/review-send-notes-heals-stale-input.json
index e47cc6533dfc..a05b6062e167 100644
--- a/mobile/rpc-foundation/goldens/review-send-notes-heals-stale-input.json
+++ b/mobile/rpc-foundation/goldens/review-send-notes-heals-stale-input.json
@@ -3,10 +3,10 @@
   "family": "session.diff-review-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "7099d7311b2046dde21a2750201718995c0869bc4f17fb7f3ce2b997ce0e6506",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/review-send-sheet-lists-terminals.json b/mobile/rpc-foundation/goldens/review-send-sheet-lists-terminals.json
index c7aed259a700..97ad2e2b3c6f 100644
--- a/mobile/rpc-foundation/goldens/review-send-sheet-lists-terminals.json
+++ b/mobile/rpc-foundation/goldens/review-send-sheet-lists-terminals.json
@@ -3,10 +3,10 @@
   "family": "session.review-send-sheet",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "8b4a06c1b2918d5ed5f40102c1c7cb411e02aba5e7601e98658d673634784bb0",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/review-stage-file.json b/mobile/rpc-foundation/goldens/review-stage-file.json
index 06272ab4917e..c26300ecae40 100644
--- a/mobile/rpc-foundation/goldens/review-stage-file.json
+++ b/mobile/rpc-foundation/goldens/review-stage-file.json
@@ -3,10 +3,10 @@
   "family": "session.diff-review-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "793e954960d371c6477d4cd3d70a5215c0bd90764684eafdb1e1a2e09790cc86",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/review-stage-refused.json b/mobile/rpc-foundation/goldens/review-stage-refused.json
index 77f63f0810cb..ba13c5d523f9 100644
--- a/mobile/rpc-foundation/goldens/review-stage-refused.json
+++ b/mobile/rpc-foundation/goldens/review-stage-refused.json
@@ -3,10 +3,10 @@
   "family": "session.diff-review-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "2d72b8e68a66a906394167beb8c78f1c0521ca1e731976fd26963ec3bfa9cca4",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "dc3a746274b4197b02b0b3060bbf8ab0f67eb54355c8b9888e1f061e37f777af",
   "scenarioSha256": "46b720fed417d29f79dbde4cc7941579f2d6a2f920bae24234537480079e7de5",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/sc-base-ref-default.json b/mobile/rpc-foundation/goldens/sc-base-ref-default.json
index 032384fb890b..5942b67df036 100644
--- a/mobile/rpc-foundation/goldens/sc-base-ref-default.json
+++ b/mobile/rpc-foundation/goldens/sc-base-ref-default.json
@@ -3,9 +3,9 @@
   "family": "git.base-ref-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "374129def6baa0e06b808c067831820966638d79d7a782e96c1f2f891cc9dc86",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-base-ref-repo-fallback.json b/mobile/rpc-foundation/goldens/sc-base-ref-repo-fallback.json
index 2142473acbb6..b8452d824103 100644
--- a/mobile/rpc-foundation/goldens/sc-base-ref-repo-fallback.json
+++ b/mobile/rpc-foundation/goldens/sc-base-ref-repo-fallback.json
@@ -3,9 +3,9 @@
   "family": "git.base-ref-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "97a8b8f5b9a7c7467745666becee07f5dfc57fb283d4e80dcbe7941509177598",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-base-ref-unavailable.json b/mobile/rpc-foundation/goldens/sc-base-ref-unavailable.json
index 7f19b46bd8f8..50df2e2ddabc 100644
--- a/mobile/rpc-foundation/goldens/sc-base-ref-unavailable.json
+++ b/mobile/rpc-foundation/goldens/sc-base-ref-unavailable.json
@@ -3,9 +3,9 @@
   "family": "git.base-ref-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "25a4762d735dfb4979e6ef31b9fdb380941a824a54b45b3d08ddb2cde25c2eb7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-base-ref-worktree-hit.json b/mobile/rpc-foundation/goldens/sc-base-ref-worktree-hit.json
index 81d6cb3f3547..ffee9e6aadd5 100644
--- a/mobile/rpc-foundation/goldens/sc-base-ref-worktree-hit.json
+++ b/mobile/rpc-foundation/goldens/sc-base-ref-worktree-hit.json
@@ -3,9 +3,9 @@
   "family": "git.base-ref-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "f3b193f93f6c9de41d11e706ecbd99648eb2ed41ccb7c66cdb80c934e780ed7c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-branch-diff-previewed.json b/mobile/rpc-foundation/goldens/sc-branch-diff-previewed.json
index c226cf13e7bb..7b1b824e2bcd 100644
--- a/mobile/rpc-foundation/goldens/sc-branch-diff-previewed.json
+++ b/mobile/rpc-foundation/goldens/sc-branch-diff-previewed.json
@@ -3,9 +3,9 @@
   "family": "git.branch-diff-preview",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "48ccada93f208a24160483e98ee94a771ab6d63222f29ac4bbd6979157f98333",
   "scenarioSha256": "819d010b9a8bb2741b09f104415f648e0e65d797882a2152ccfa4fb8a107cafc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-changes-loaded.json b/mobile/rpc-foundation/goldens/sc-changes-loaded.json
index 06d6496dab10..e958945db166 100644
--- a/mobile/rpc-foundation/goldens/sc-changes-loaded.json
+++ b/mobile/rpc-foundation/goldens/sc-changes-loaded.json
@@ -3,9 +3,9 @@
   "family": "git.changes-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "48ccada93f208a24160483e98ee94a771ab6d63222f29ac4bbd6979157f98333",
   "scenarioSha256": "f2c4d64b3761fcd036d9538155037edc4e35492e67ce5eb158372ddc76e55cc9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-commit-message-cancel-rejected.json b/mobile/rpc-foundation/goldens/sc-commit-message-cancel-rejected.json
index b8f0ed2eb683..2f9d956fb0cd 100644
--- a/mobile/rpc-foundation/goldens/sc-commit-message-cancel-rejected.json
+++ b/mobile/rpc-foundation/goldens/sc-commit-message-cancel-rejected.json
@@ -3,9 +3,9 @@
   "family": "git.commit-message-ai",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "013db25622b180a8333bb1ef27c22a5b1f8e04148201201e5cc3413a10640781",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-commit-message-canceled.json b/mobile/rpc-foundation/goldens/sc-commit-message-canceled.json
index ccf578aef82e..154bc9c8cc10 100644
--- a/mobile/rpc-foundation/goldens/sc-commit-message-canceled.json
+++ b/mobile/rpc-foundation/goldens/sc-commit-message-canceled.json
@@ -3,9 +3,9 @@
   "family": "git.commit-message-ai",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "15bf6c17f4b524dfbf5373b2eeed61ee2e659421cf8b6e3cff6c0378c7692cc1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-commit-message-generated.json b/mobile/rpc-foundation/goldens/sc-commit-message-generated.json
index 9cde34532411..8afa223e0f88 100644
--- a/mobile/rpc-foundation/goldens/sc-commit-message-generated.json
+++ b/mobile/rpc-foundation/goldens/sc-commit-message-generated.json
@@ -3,9 +3,9 @@
   "family": "git.commit-message-ai",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "540f05d84d1cbffd566af933c547838c75500bb5d708e8558c21fe8131d724e3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-create-existing-review.json b/mobile/rpc-foundation/goldens/sc-create-existing-review.json
index 79c1e6b39b0b..d2ba79261786 100644
--- a/mobile/rpc-foundation/goldens/sc-create-existing-review.json
+++ b/mobile/rpc-foundation/goldens/sc-create-existing-review.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "7d6099248aa6a2ef19f2e169ff917af794649d9d64d139aa9ffeea6a41355ddc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-create-intent-stage-commit-push-create.json b/mobile/rpc-foundation/goldens/sc-create-intent-stage-commit-push-create.json
index 1f1d782b10d1..c6b49807d940 100644
--- a/mobile/rpc-foundation/goldens/sc-create-intent-stage-commit-push-create.json
+++ b/mobile/rpc-foundation/goldens/sc-create-intent-stage-commit-push-create.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "447f9b3d697dbfe21cb7fb6e12d1bf5fa94b023b7e1697bdc2dc82ce7072183f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-create-intent-unlisted-provider.json b/mobile/rpc-foundation/goldens/sc-create-intent-unlisted-provider.json
index 34ba48300023..eea93b6b0634 100644
--- a/mobile/rpc-foundation/goldens/sc-create-intent-unlisted-provider.json
+++ b/mobile/rpc-foundation/goldens/sc-create-intent-unlisted-provider.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-intent",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "7a032109038c14b0a0f254097939b877eba62c10ba7b963070988bb4a1c06ef0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-create-link-failure-is-non-fatal.json b/mobile/rpc-foundation/goldens/sc-create-link-failure-is-non-fatal.json
index 49e08a728b2a..f5976e7eec6b 100644
--- a/mobile/rpc-foundation/goldens/sc-create-link-failure-is-non-fatal.json
+++ b/mobile/rpc-foundation/goldens/sc-create-link-failure-is-non-fatal.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "2deb0435ef63a3e0102e28f2f3f331039486d193d1e1ffdfb53ad86d3ff039f0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-create-pushes-then-creates.json b/mobile/rpc-foundation/goldens/sc-create-pushes-then-creates.json
index 770caf11fce6..d2a7744e237c 100644
--- a/mobile/rpc-foundation/goldens/sc-create-pushes-then-creates.json
+++ b/mobile/rpc-foundation/goldens/sc-create-pushes-then-creates.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "0f86b3e6059c48cd327c55df2452a9bc6ea85584ffbeacafad496f600c20e06f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-create-refused-empty-message.json b/mobile/rpc-foundation/goldens/sc-create-refused-empty-message.json
index 567136a32bc1..3500b4a605a1 100644
--- a/mobile/rpc-foundation/goldens/sc-create-refused-empty-message.json
+++ b/mobile/rpc-foundation/goldens/sc-create-refused-empty-message.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "5008e69a8e396b1deccd98712d92650a630f971cd76a02862a461afb8617b8a4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-create-rejected-empty-message.json b/mobile/rpc-foundation/goldens/sc-create-rejected-empty-message.json
index 9cd4ba3a360d..4246171faf02 100644
--- a/mobile/rpc-foundation/goldens/sc-create-rejected-empty-message.json
+++ b/mobile/rpc-foundation/goldens/sc-create-rejected-empty-message.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.create-chain",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "ea71081982a101d0f8624707b59c99de9981e9b1d1bafa25c66d575e3f876ff4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-eligibility-fetched.json b/mobile/rpc-foundation/goldens/sc-eligibility-fetched.json
index 1b477541deed..f9cea076c935 100644
--- a/mobile/rpc-foundation/goldens/sc-eligibility-fetched.json
+++ b/mobile/rpc-foundation/goldens/sc-eligibility-fetched.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.eligibility",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "f6a1595073abe11b33973e8865900a1d849f44221961da5c12ea13aa696f6490",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-history-commit-files.json b/mobile/rpc-foundation/goldens/sc-history-commit-files.json
index 6b4816c1d1ac..650632d4a9d7 100644
--- a/mobile/rpc-foundation/goldens/sc-history-commit-files.json
+++ b/mobile/rpc-foundation/goldens/sc-history-commit-files.json
@@ -3,9 +3,9 @@
   "family": "git.history-commit-files",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "48ccada93f208a24160483e98ee94a771ab6d63222f29ac4bbd6979157f98333",
   "scenarioSha256": "27e71d989da152adcbe40a02186df8b8a2e19a6a0e8bfe727e2133c4360f7639",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-history-loaded.json b/mobile/rpc-foundation/goldens/sc-history-loaded.json
index a37f4a04ee44..6ab05a8ff9ad 100644
--- a/mobile/rpc-foundation/goldens/sc-history-loaded.json
+++ b/mobile/rpc-foundation/goldens/sc-history-loaded.json
@@ -3,9 +3,9 @@
   "family": "git.history-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "83f61085a91458bad529905ecc6fe240c598cddfe44a56dd497b8aed9fb8a7e5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-pr-link-hosted-review.json b/mobile/rpc-foundation/goldens/sc-pr-link-hosted-review.json
index f2dba2a80df2..dc8de943cb45 100644
--- a/mobile/rpc-foundation/goldens/sc-pr-link-hosted-review.json
+++ b/mobile/rpc-foundation/goldens/sc-pr-link-hosted-review.json
@@ -3,9 +3,9 @@
   "family": "worktree.review-link",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "42b0304b2fdce08b7ff52ec979dd9f199f368e5e4ef0b5370acc417909b592b3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-pr-link-read.json b/mobile/rpc-foundation/goldens/sc-pr-link-read.json
index 2ac4dca7e78a..ebb5e7ec15b2 100644
--- a/mobile/rpc-foundation/goldens/sc-pr-link-read.json
+++ b/mobile/rpc-foundation/goldens/sc-pr-link-read.json
@@ -3,9 +3,9 @@
   "family": "worktree.review-link",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "4520bd54a55eabfe6ec64a4b2f824f095f98b2fffd1bf22fe4f9ec7f63cbfa3f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-pr-link-set.json b/mobile/rpc-foundation/goldens/sc-pr-link-set.json
index a8d73ee930e0..34f35559c0f1 100644
--- a/mobile/rpc-foundation/goldens/sc-pr-link-set.json
+++ b/mobile/rpc-foundation/goldens/sc-pr-link-set.json
@@ -3,9 +3,9 @@
   "family": "worktree.review-link",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "b65bad4f8c0ae0b686f6c3db93bd43ffa072ae426f978f1a86ad8008fb24fa24",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-prefill-unavailable-on-refusal.json b/mobile/rpc-foundation/goldens/sc-prefill-unavailable-on-refusal.json
index 5448e477fd88..31773808f1cb 100644
--- a/mobile/rpc-foundation/goldens/sc-prefill-unavailable-on-refusal.json
+++ b/mobile/rpc-foundation/goldens/sc-prefill-unavailable-on-refusal.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.eligibility",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "9de96287a4dfa6cf5c9a8b683cc696fdc2cd387f86f231e22ee3f100a2e778e3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-prefill-unavailable-on-rejection.json b/mobile/rpc-foundation/goldens/sc-prefill-unavailable-on-rejection.json
index c9769f17f4b6..d526b09470e6 100644
--- a/mobile/rpc-foundation/goldens/sc-prefill-unavailable-on-rejection.json
+++ b/mobile/rpc-foundation/goldens/sc-prefill-unavailable-on-rejection.json
@@ -3,9 +3,9 @@
   "family": "hostedReview.eligibility",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "adbdfcc3895cc04d830900de518e689c9e63f6f75569127e1fde24488658e8a0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-prerequisite-force-with-lease.json b/mobile/rpc-foundation/goldens/sc-prerequisite-force-with-lease.json
index cbf8f0bf7379..1dbb4649be94 100644
--- a/mobile/rpc-foundation/goldens/sc-prerequisite-force-with-lease.json
+++ b/mobile/rpc-foundation/goldens/sc-prerequisite-force-with-lease.json
@@ -3,9 +3,9 @@
   "family": "git.remote-prerequisite",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "ec2847b4af357d8564d8e0a9a1072713c1afd7ff86ba69e9c83c056a6841ee39",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-prerequisite-publish.json b/mobile/rpc-foundation/goldens/sc-prerequisite-publish.json
index 6650363f6a61..18a8b027d3be 100644
--- a/mobile/rpc-foundation/goldens/sc-prerequisite-publish.json
+++ b/mobile/rpc-foundation/goldens/sc-prerequisite-publish.json
@@ -3,9 +3,9 @@
   "family": "git.remote-prerequisite",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "6cf6ebd20adc4cc76a12d3424863ee9db2b24f36593664a1f4e0e05de9a53d39",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-prerequisite-push.json b/mobile/rpc-foundation/goldens/sc-prerequisite-push.json
index 2125f24865a3..319b4979fcfd 100644
--- a/mobile/rpc-foundation/goldens/sc-prerequisite-push.json
+++ b/mobile/rpc-foundation/goldens/sc-prerequisite-push.json
@@ -3,9 +3,9 @@
   "family": "git.remote-prerequisite",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "e6e8197a541cd73e5811a1f28b0dbfc414a4d34c1ae6929fc1bbae1213820674",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-prerequisite-skipped.json b/mobile/rpc-foundation/goldens/sc-prerequisite-skipped.json
index b21f4e6733d7..6d82311a78f5 100644
--- a/mobile/rpc-foundation/goldens/sc-prerequisite-skipped.json
+++ b/mobile/rpc-foundation/goldens/sc-prerequisite-skipped.json
@@ -3,9 +3,9 @@
   "family": "git.remote-prerequisite",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "523d1ee21e3871a4dffc32f48d2e28c31ecea48cbf3f842acffc8355be06b14b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-reveal-first-poll.json b/mobile/rpc-foundation/goldens/sc-reveal-first-poll.json
index a67edc032303..a8adca2c4b9c 100644
--- a/mobile/rpc-foundation/goldens/sc-reveal-first-poll.json
+++ b/mobile/rpc-foundation/goldens/sc-reveal-first-poll.json
@@ -3,9 +3,9 @@
   "family": "session.tab-reveal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "00b26cb279b0a934df98d93ba98a4a0c79e302c7690c582e778dc0156ab4f235",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-reveal-timeout.json b/mobile/rpc-foundation/goldens/sc-reveal-timeout.json
index ad1a061f6d32..ab99918545d8 100644
--- a/mobile/rpc-foundation/goldens/sc-reveal-timeout.json
+++ b/mobile/rpc-foundation/goldens/sc-reveal-timeout.json
@@ -3,9 +3,9 @@
   "family": "session.tab-reveal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5e47c7960b9352753f0751d4ccf5e3ff7fb7b74a63cc4e4df3c3ffdcc6c1e66b",
   "scenarioSha256": "fcd61f1ef46c42889827a87876239534b851c425f8ef7a9405ea95b8d07d2363",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-review-commit-inner-failure.json b/mobile/rpc-foundation/goldens/sc-review-commit-inner-failure.json
index 095d31230578..e6aa5a4faa6a 100644
--- a/mobile/rpc-foundation/goldens/sc-review-commit-inner-failure.json
+++ b/mobile/rpc-foundation/goldens/sc-review-commit-inner-failure.json
@@ -3,9 +3,9 @@
   "family": "git.review-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "db1fb2a584cd806028b9be861283a63aa4836c83f61558f3d518ddbb7a59498d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-review-commit-refused-empty-message.json b/mobile/rpc-foundation/goldens/sc-review-commit-refused-empty-message.json
index 1fda37d82cd1..27caff586148 100644
--- a/mobile/rpc-foundation/goldens/sc-review-commit-refused-empty-message.json
+++ b/mobile/rpc-foundation/goldens/sc-review-commit-refused-empty-message.json
@@ -3,9 +3,9 @@
   "family": "git.review-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "dba1676583dc832ef059285a6bd4c3eefe6be0230e42100cb9d7a125755d136b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-review-commit-rejected.json b/mobile/rpc-foundation/goldens/sc-review-commit-rejected.json
index 740ca301a50f..434e9f70cf7d 100644
--- a/mobile/rpc-foundation/goldens/sc-review-commit-rejected.json
+++ b/mobile/rpc-foundation/goldens/sc-review-commit-rejected.json
@@ -3,9 +3,9 @@
   "family": "git.review-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "de079de9cc21bfb40da6e1431273b10c3e2a5b5402b91b2b8a85c8d7ac41bc97",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-review-commit.json b/mobile/rpc-foundation/goldens/sc-review-commit.json
index 68cddae2d47f..da0aa2e6a9f5 100644
--- a/mobile/rpc-foundation/goldens/sc-review-commit.json
+++ b/mobile/rpc-foundation/goldens/sc-review-commit.json
@@ -3,9 +3,9 @@
   "family": "git.review-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "a29d518b2d075e8e4811404e0fcbf8948fbfe53a3aefbf0948cb2f2e622e8cbb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-review-status-entries-not-array.json b/mobile/rpc-foundation/goldens/sc-review-status-entries-not-array.json
index 6cc3c7bcb7b5..f63660a3cd9f 100644
--- a/mobile/rpc-foundation/goldens/sc-review-status-entries-not-array.json
+++ b/mobile/rpc-foundation/goldens/sc-review-status-entries-not-array.json
@@ -3,9 +3,9 @@
   "family": "git.review-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "37ba7780ca9525ab313c0a9c781ce5bb26344e63af9272c32ae889621f383b2b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/sc-review-status-normalized.json b/mobile/rpc-foundation/goldens/sc-review-status-normalized.json
index 51ccac16aeca..7b5a556643ba 100644
--- a/mobile/rpc-foundation/goldens/sc-review-status-normalized.json
+++ b/mobile/rpc-foundation/goldens/sc-review-status-normalized.json
@@ -3,9 +3,9 @@
   "family": "git.review-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c582ce355b0704b38d7e84cbce352630096c91231bf09aecd1f6dbb409fed17f",
   "scenarioSha256": "93193acd57d6f00abc8e6c22ec3a8f1ca6ce7c5808d906d0aa7c11e41dab4635",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/schedules-b3.json b/mobile/rpc-foundation/goldens/schedules-b3.json
index 96b8766c6a48..4f853b2b96f3 100644
--- a/mobile/rpc-foundation/goldens/schedules-b3.json
+++ b/mobile/rpc-foundation/goldens/schedules-b3.json
@@ -3,9 +3,9 @@
   "family": "linear-detail-barrier",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d3b7f33d810e1fa420ac41a628cde9fe4a9e65fd57f89fbca0a40fc7d74951ab",
   "scenarioSha256": "b59fb599dd3a5fbc79bb8602dcec4b1c51a392c662efab7efc8324fc718ce8de",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/schedules-settings-home-providers-fulfilled.json b/mobile/rpc-foundation/goldens/schedules-settings-home-providers-fulfilled.json
index 1361096f2404..bea3dafeabdc 100644
--- a/mobile/rpc-foundation/goldens/schedules-settings-home-providers-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/schedules-settings-home-providers-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.home-providers",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "fbd311a377672a9335521c30734880eea1b04bab0aff367854c1deebcf66b105",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/schedules-settings-new-tab-ssh.json b/mobile/rpc-foundation/goldens/schedules-settings-new-tab-ssh.json
index ece1bc29f11b..68d4feddea3b 100644
--- a/mobile/rpc-foundation/goldens/schedules-settings-new-tab-ssh.json
+++ b/mobile/rpc-foundation/goldens/schedules-settings-new-tab-ssh.json
@@ -3,9 +3,9 @@
   "family": "settings-agent-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "2726d71130f623e3ad02c168c13269979ca6f84703bf1c5aaf36bd4432dfb516",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/schedules-settings-repo-metadata-fulfilled.json b/mobile/rpc-foundation/goldens/schedules-settings-repo-metadata-fulfilled.json
index 44afd3ead19e..ddbc2f475c24 100644
--- a/mobile/rpc-foundation/goldens/schedules-settings-repo-metadata-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/schedules-settings-repo-metadata-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "664eba1468e229f9ac2dced262e7ad896ead01688dff4c570f397c3f8594efd7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/schedules-settings-resume-metadata-fulfilled.json b/mobile/rpc-foundation/goldens/schedules-settings-resume-metadata-fulfilled.json
index d25f716766ab..4eb88063ebf8 100644
--- a/mobile/rpc-foundation/goldens/schedules-settings-resume-metadata-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/schedules-settings-resume-metadata-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.resume-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "7bfba3fae1dc33acf40e8a955bbfccf28580b3daee3270dec6a15e6cefd45a84",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/schedules-settings-task-hydration-fulfilled.json b/mobile/rpc-foundation/goldens/schedules-settings-task-hydration-fulfilled.json
index 11cc1db550ed..b2d3830f925c 100644
--- a/mobile/rpc-foundation/goldens/schedules-settings-task-hydration-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/schedules-settings-task-hydration-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.task-hydration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "02e3ca10296704b5478185e9d3dc0136596a2ee57580d7f9268672568dab4cd4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/schedules-settings-workspace-context-fulfilled.json b/mobile/rpc-foundation/goldens/schedules-settings-workspace-context-fulfilled.json
index 4b7e79a9e232..66a95b727a5a 100644
--- a/mobile/rpc-foundation/goldens/schedules-settings-workspace-context-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/schedules-settings-workspace-context-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-context",
   "namedDeltas": ["new-workspace-runtime-context-null-results-degrade-to-absent"],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "eb980fc027ca0200212ba6ad3bf9a1ab3460936a7bb4b04353a9462eecd287a1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-browser-tab-created.json b/mobile/rpc-foundation/goldens/session-browser-tab-created.json
index 148042d56bba..b04cda067496 100644
--- a/mobile/rpc-foundation/goldens/session-browser-tab-created.json
+++ b/mobile/rpc-foundation/goldens/session-browser-tab-created.json
@@ -3,9 +3,9 @@
   "family": "session.browser-tab-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "b4b584b1da9569f18475211ff84d157de3e5d3f300719f6848ac51c01d011531",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-create-browser-refused.json b/mobile/rpc-foundation/goldens/session-create-browser-refused.json
index f80d07ad3899..1d77a1a3c6a1 100644
--- a/mobile/rpc-foundation/goldens/session-create-browser-refused.json
+++ b/mobile/rpc-foundation/goldens/session-create-browser-refused.json
@@ -3,9 +3,9 @@
   "family": "session.content-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "59b5f0aac2f8c1aab5fc3a457fb69e1a2f46cc88c617c25e638175acb7f7c0cb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-create-browser-tab.json b/mobile/rpc-foundation/goldens/session-create-browser-tab.json
index 30b7030cbd7e..9e18d6c81d84 100644
--- a/mobile/rpc-foundation/goldens/session-create-browser-tab.json
+++ b/mobile/rpc-foundation/goldens/session-create-browser-tab.json
@@ -3,9 +3,9 @@
   "family": "session.content-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "36dbd24dc3d24be8c14217ced1963d10ef8264438729dd146cbff79d9fbdf279",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-create-markdown-name-collision.json b/mobile/rpc-foundation/goldens/session-create-markdown-name-collision.json
index 3e8f89346289..5a53b692c8e2 100644
--- a/mobile/rpc-foundation/goldens/session-create-markdown-name-collision.json
+++ b/mobile/rpc-foundation/goldens/session-create-markdown-name-collision.json
@@ -3,9 +3,9 @@
   "family": "session.content-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "be8d4b4be07b0ee5988471b26813d7d0d2a97fbd789b52e7ce00dd09a2e9d75c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-create-markdown-note.json b/mobile/rpc-foundation/goldens/session-create-markdown-note.json
index ea2c09a26119..af1f1da0e637 100644
--- a/mobile/rpc-foundation/goldens/session-create-markdown-note.json
+++ b/mobile/rpc-foundation/goldens/session-create-markdown-note.json
@@ -3,9 +3,9 @@
   "family": "session.content-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "4118eea1175cba0f15174072f5715f9054ded09a4cb0c359fc4ee41ad00e9440",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-create-terminal-ignores-a-second-create-in-flight.json b/mobile/rpc-foundation/goldens/session-create-terminal-ignores-a-second-create-in-flight.json
index cd6fc9007a43..db66770d615f 100644
--- a/mobile/rpc-foundation/goldens/session-create-terminal-ignores-a-second-create-in-flight.json
+++ b/mobile/rpc-foundation/goldens/session-create-terminal-ignores-a-second-create-in-flight.json
@@ -3,9 +3,9 @@
   "family": "session.create-terminal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fa7d9fd6428e89282f08e04fefba4289000eb3aed1462489a2f11efed374382c",
   "scenarioSha256": "df99b9c0ebcffb3d8f173c87783862edb0a66befcc3cd73f1096871f45963913",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-create-terminal-launches-an-agent-quick-command.json b/mobile/rpc-foundation/goldens/session-create-terminal-launches-an-agent-quick-command.json
index c66688d71df5..f78621dd39be 100644
--- a/mobile/rpc-foundation/goldens/session-create-terminal-launches-an-agent-quick-command.json
+++ b/mobile/rpc-foundation/goldens/session-create-terminal-launches-an-agent-quick-command.json
@@ -3,9 +3,9 @@
   "family": "session.create-terminal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fa7d9fd6428e89282f08e04fefba4289000eb3aed1462489a2f11efed374382c",
   "scenarioSha256": "fb9828d5e13917ce394061b2d702890e5198df04ce803363b2ce9f939921d00e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-create-terminal-refused.json b/mobile/rpc-foundation/goldens/session-create-terminal-refused.json
index 0dc125b8ec06..8bc650492e4c 100644
--- a/mobile/rpc-foundation/goldens/session-create-terminal-refused.json
+++ b/mobile/rpc-foundation/goldens/session-create-terminal-refused.json
@@ -3,9 +3,9 @@
   "family": "session.create-terminal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fa7d9fd6428e89282f08e04fefba4289000eb3aed1462489a2f11efed374382c",
   "scenarioSha256": "e9c32bdf3357ca5d69ac07cb7bbc63fe279c1a23c44e5c79fa0b1db4fd1c55dd",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-create-terminal-replaces-active.json b/mobile/rpc-foundation/goldens/session-create-terminal-replaces-active.json
index fa35720fa7ba..d019905f0125 100644
--- a/mobile/rpc-foundation/goldens/session-create-terminal-replaces-active.json
+++ b/mobile/rpc-foundation/goldens/session-create-terminal-replaces-active.json
@@ -3,9 +3,9 @@
   "family": "session.create-terminal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fa7d9fd6428e89282f08e04fefba4289000eb3aed1462489a2f11efed374382c",
   "scenarioSha256": "726e19307f1e82f0c8ae9a555ec9c27c8eea7f8f40fa700dc0b71c54ecc9ca11",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-create-terminal-runs-a-quick-command.json b/mobile/rpc-foundation/goldens/session-create-terminal-runs-a-quick-command.json
index 78ca447b3733..5dec9e36ceff 100644
--- a/mobile/rpc-foundation/goldens/session-create-terminal-runs-a-quick-command.json
+++ b/mobile/rpc-foundation/goldens/session-create-terminal-runs-a-quick-command.json
@@ -3,9 +3,9 @@
   "family": "session.create-terminal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fa7d9fd6428e89282f08e04fefba4289000eb3aed1462489a2f11efed374382c",
   "scenarioSha256": "4dfbe31daae64a03fc588f2095235fdd9b37f26ecccefe596c35c8ef8f623651",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-create-terminal-with-prompt.json b/mobile/rpc-foundation/goldens/session-create-terminal-with-prompt.json
index 731571d1c9b1..a279744b04d7 100644
--- a/mobile/rpc-foundation/goldens/session-create-terminal-with-prompt.json
+++ b/mobile/rpc-foundation/goldens/session-create-terminal-with-prompt.json
@@ -3,9 +3,9 @@
   "family": "session.create-terminal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fa7d9fd6428e89282f08e04fefba4289000eb3aed1462489a2f11efed374382c",
   "scenarioSha256": "fd654a7e34ae8004543a34a7a301d51858989fdc2bffb02ddf6edb814071b22d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-create-terminal-without-active-tab.json b/mobile/rpc-foundation/goldens/session-create-terminal-without-active-tab.json
index 6021e78e9e3c..382ae3b66587 100644
--- a/mobile/rpc-foundation/goldens/session-create-terminal-without-active-tab.json
+++ b/mobile/rpc-foundation/goldens/session-create-terminal-without-active-tab.json
@@ -3,9 +3,9 @@
   "family": "session.create-terminal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fa7d9fd6428e89282f08e04fefba4289000eb3aed1462489a2f11efed374382c",
   "scenarioSha256": "da78ad25ea15e1c714f0147d34207529362743a56a519153f36b09345dee0ebc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-create-terminal-without-handle.json b/mobile/rpc-foundation/goldens/session-create-terminal-without-handle.json
index 1d44545800b4..44072a16f7bb 100644
--- a/mobile/rpc-foundation/goldens/session-create-terminal-without-handle.json
+++ b/mobile/rpc-foundation/goldens/session-create-terminal-without-handle.json
@@ -3,9 +3,9 @@
   "family": "session.create-terminal",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fa7d9fd6428e89282f08e04fefba4289000eb3aed1462489a2f11efed374382c",
   "scenarioSha256": "f1952a0e2c9108dadf2f5b85ac1f43ec9db09db0ce81a575bb4dd3a8d18d9c83",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-diff-notes-load-refused.json b/mobile/rpc-foundation/goldens/session-diff-notes-load-refused.json
index 6fdbfed3841c..486e22ee91fa 100644
--- a/mobile/rpc-foundation/goldens/session-diff-notes-load-refused.json
+++ b/mobile/rpc-foundation/goldens/session-diff-notes-load-refused.json
@@ -3,9 +3,9 @@
   "family": "session.diff-notes",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "42334358b5e5966001639653b553f15033f6e201d785107871fe056536f0a5e2",
   "scenarioSha256": "5ab16800f82813778078e84739e0ac72886c145d20789dedcea9428ee31b9182",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-diff-notes-loaded.json b/mobile/rpc-foundation/goldens/session-diff-notes-loaded.json
index 5415f24d530c..43ee9a7704ce 100644
--- a/mobile/rpc-foundation/goldens/session-diff-notes-loaded.json
+++ b/mobile/rpc-foundation/goldens/session-diff-notes-loaded.json
@@ -3,9 +3,9 @@
   "family": "session.diff-notes",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "42334358b5e5966001639653b553f15033f6e201d785107871fe056536f0a5e2",
   "scenarioSha256": "795286ff495a243059a3eb55ccbbc9b4adfdd2034258f91f9182e83c7492fa60",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-file-tab-read.json b/mobile/rpc-foundation/goldens/session-file-tab-read.json
index d627e17a782f..1464aee2675e 100644
--- a/mobile/rpc-foundation/goldens/session-file-tab-read.json
+++ b/mobile/rpc-foundation/goldens/session-file-tab-read.json
@@ -3,9 +3,9 @@
   "family": "session.tab-documents",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "82c1d8e87e0a87c1c1a6dba7bd4f61e08f77fe0ae1b3758d1b5543bd9719a53f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-markdown-disk-read.json b/mobile/rpc-foundation/goldens/session-markdown-disk-read.json
index 148904495a79..33906f960315 100644
--- a/mobile/rpc-foundation/goldens/session-markdown-disk-read.json
+++ b/mobile/rpc-foundation/goldens/session-markdown-disk-read.json
@@ -3,9 +3,9 @@
   "family": "session.markdown-disk-fallback",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "29565833b19968faa701f656d166050419f149d6bb76d1f63f4dd3af76b8e896",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-markdown-disk-served.json b/mobile/rpc-foundation/goldens/session-markdown-disk-served.json
index d3fa143e3828..aff129759520 100644
--- a/mobile/rpc-foundation/goldens/session-markdown-disk-served.json
+++ b/mobile/rpc-foundation/goldens/session-markdown-disk-served.json
@@ -3,9 +3,9 @@
   "family": "session.markdown-disk-fallback",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "8375df17afabf282a1d37ffaa3a334b1fa9105ba04e6618f16082f66bfe3f76d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-markdown-save-conflict.json b/mobile/rpc-foundation/goldens/session-markdown-save-conflict.json
index fb692c74d7ea..49b8f03cfcf3 100644
--- a/mobile/rpc-foundation/goldens/session-markdown-save-conflict.json
+++ b/mobile/rpc-foundation/goldens/session-markdown-save-conflict.json
@@ -3,9 +3,9 @@
   "family": "session.markdown-save",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "42334358b5e5966001639653b553f15033f6e201d785107871fe056536f0a5e2",
   "scenarioSha256": "76bccdabb78dc3f16b36987f6b7cefbe41e08167fe39612620e27ad476089f93",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-markdown-saved.json b/mobile/rpc-foundation/goldens/session-markdown-saved.json
index 68f583131b95..a55ed7cac7b6 100644
--- a/mobile/rpc-foundation/goldens/session-markdown-saved.json
+++ b/mobile/rpc-foundation/goldens/session-markdown-saved.json
@@ -3,9 +3,9 @@
   "family": "session.markdown-save",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "42334358b5e5966001639653b553f15033f6e201d785107871fe056536f0a5e2",
   "scenarioSha256": "a2b5b73b2455f9efc48361e4b96ab1d3ecc3d136459403c9c3678104604cd774",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-markdown-tab-disk-fallback.json b/mobile/rpc-foundation/goldens/session-markdown-tab-disk-fallback.json
index 8658f34abbd4..d4f03e527ca2 100644
--- a/mobile/rpc-foundation/goldens/session-markdown-tab-disk-fallback.json
+++ b/mobile/rpc-foundation/goldens/session-markdown-tab-disk-fallback.json
@@ -3,9 +3,9 @@
   "family": "session.tab-documents",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "f46cef9d1c6a5ed6d8b6f1d180cdf5c666f52e043b70feb07e5fccee885ceeda",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-markdown-tab-read.json b/mobile/rpc-foundation/goldens/session-markdown-tab-read.json
index 33e0040c63a1..b9426e53cb44 100644
--- a/mobile/rpc-foundation/goldens/session-markdown-tab-read.json
+++ b/mobile/rpc-foundation/goldens/session-markdown-tab-read.json
@@ -3,9 +3,9 @@
   "family": "session.tab-documents",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "f88c39d410655b229aa740b45ccdaa10186f41f7c6cbff9fed6eaee3f0a55844",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-markdown-tab-refused.json b/mobile/rpc-foundation/goldens/session-markdown-tab-refused.json
index 77a7fad760ee..db44a855f001 100644
--- a/mobile/rpc-foundation/goldens/session-markdown-tab-refused.json
+++ b/mobile/rpc-foundation/goldens/session-markdown-tab-refused.json
@@ -3,9 +3,9 @@
   "family": "session.tab-documents",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "63227f28110e90acac78058baa875b1bc7f8895b5033e47016a2ffa9f42f66ce",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-startup-both-activation-sites.json b/mobile/rpc-foundation/goldens/session-startup-both-activation-sites.json
index 962ead42810d..05e12d59cd54 100644
--- a/mobile/rpc-foundation/goldens/session-startup-both-activation-sites.json
+++ b/mobile/rpc-foundation/goldens/session-startup-both-activation-sites.json
@@ -3,9 +3,9 @@
   "family": "session.startup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "6b08c394e37fd572cf63a4c11934247d379008f11117aa5af33b2926fbd32d1e",
   "scenarioSha256": "efb7ff45ac09f1b7f0f3ad7f1b6f09d4d5c349e22de7d9c4d63ca93530552418",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-startup-floating-route-skips-activation.json b/mobile/rpc-foundation/goldens/session-startup-floating-route-skips-activation.json
index 29514b42006b..9b75f0a29eeb 100644
--- a/mobile/rpc-foundation/goldens/session-startup-floating-route-skips-activation.json
+++ b/mobile/rpc-foundation/goldens/session-startup-floating-route-skips-activation.json
@@ -3,9 +3,9 @@
   "family": "session.startup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "6b08c394e37fd572cf63a4c11934247d379008f11117aa5af33b2926fbd32d1e",
   "scenarioSha256": "82ff29efaa6ee0bf49ce41bfe7dff2083d0f942c10cc9d8bab48925354d17519",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-startup-keeps-terminals-visible-on-reconnect.json b/mobile/rpc-foundation/goldens/session-startup-keeps-terminals-visible-on-reconnect.json
index 207f3f115937..dc0af2b1c43c 100644
--- a/mobile/rpc-foundation/goldens/session-startup-keeps-terminals-visible-on-reconnect.json
+++ b/mobile/rpc-foundation/goldens/session-startup-keeps-terminals-visible-on-reconnect.json
@@ -3,9 +3,9 @@
   "family": "session.startup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "6b08c394e37fd572cf63a4c11934247d379008f11117aa5af33b2926fbd32d1e",
   "scenarioSha256": "f540e4a06380a6a5d82d670230c76b7afc2c60302bc27dda13156b620095c5cc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-startup-refused-tab-load-still-loads-terminals.json b/mobile/rpc-foundation/goldens/session-startup-refused-tab-load-still-loads-terminals.json
index bdb4cdcfc94d..9ba927b4a88e 100644
--- a/mobile/rpc-foundation/goldens/session-startup-refused-tab-load-still-loads-terminals.json
+++ b/mobile/rpc-foundation/goldens/session-startup-refused-tab-load-still-loads-terminals.json
@@ -3,9 +3,9 @@
   "family": "session.startup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "6b08c394e37fd572cf63a4c11934247d379008f11117aa5af33b2926fbd32d1e",
   "scenarioSha256": "18d0bbda11a394a13d0eaea12b8748dbeede1ae7212907b0ca70a9bafa037424",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tab-activation-focus-and-activate.json b/mobile/rpc-foundation/goldens/session-tab-activation-focus-and-activate.json
index 33ca026e92f2..90fc3c39d9ac 100644
--- a/mobile/rpc-foundation/goldens/session-tab-activation-focus-and-activate.json
+++ b/mobile/rpc-foundation/goldens/session-tab-activation-focus-and-activate.json
@@ -3,9 +3,9 @@
   "family": "session.tab-activation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4a1e81ab3229c8fd10b3ad435568efec11a944e0f02a183f94e4b1f44a7e5de0",
   "scenarioSha256": "72a972996461cc58bda2b1c11dbb4ecdbdecd5ff2f977c3d61e40d635f63c1b9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tab-activation-refused.json b/mobile/rpc-foundation/goldens/session-tab-activation-refused.json
index eaa14d423e2b..632862d82816 100644
--- a/mobile/rpc-foundation/goldens/session-tab-activation-refused.json
+++ b/mobile/rpc-foundation/goldens/session-tab-activation-refused.json
@@ -3,9 +3,9 @@
   "family": "session.tab-activation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4a1e81ab3229c8fd10b3ad435568efec11a944e0f02a183f94e4b1f44a7e5de0",
   "scenarioSha256": "e5049c9ee2aef93194adf1b9540c1eb4b085e6f975648c5ed605718d19fc6afa",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tab-activation-transport-error.json b/mobile/rpc-foundation/goldens/session-tab-activation-transport-error.json
index 9e43997554ec..54bac0ec3e2c 100644
--- a/mobile/rpc-foundation/goldens/session-tab-activation-transport-error.json
+++ b/mobile/rpc-foundation/goldens/session-tab-activation-transport-error.json
@@ -3,9 +3,9 @@
   "family": "session.tab-activation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4a1e81ab3229c8fd10b3ad435568efec11a944e0f02a183f94e4b1f44a7e5de0",
   "scenarioSha256": "44e25e8624c6d7f072c5f7aa3c706df29d0e751bb59b3fb58bec003233f7e5e3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tab-close-refused-keeps-tab.json b/mobile/rpc-foundation/goldens/session-tab-close-refused-keeps-tab.json
index b4b0ecd34cce..c567b3dff9a4 100644
--- a/mobile/rpc-foundation/goldens/session-tab-close-refused-keeps-tab.json
+++ b/mobile/rpc-foundation/goldens/session-tab-close-refused-keeps-tab.json
@@ -3,9 +3,9 @@
   "family": "session.tab-close",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "1b3da0207aef65f4b2348aed334284259170c640e767fb354b9e95f3c1369445",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tab-close-session-tab.json b/mobile/rpc-foundation/goldens/session-tab-close-session-tab.json
index d0e24e6bc374..f1ad9234d979 100644
--- a/mobile/rpc-foundation/goldens/session-tab-close-session-tab.json
+++ b/mobile/rpc-foundation/goldens/session-tab-close-session-tab.json
@@ -3,9 +3,9 @@
   "family": "session.tab-close",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "fe83a7d50d08f874d863eb8872bcb24d974c1dc46571a93d3f9184f8feba63a4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tab-close-terminal.json b/mobile/rpc-foundation/goldens/session-tab-close-terminal.json
index 52b82389042a..f513fa07b597 100644
--- a/mobile/rpc-foundation/goldens/session-tab-close-terminal.json
+++ b/mobile/rpc-foundation/goldens/session-tab-close-terminal.json
@@ -3,9 +3,9 @@
   "family": "session.tab-close",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "194b010d00fdeca85418870fd053ac500c38cae02e98c4bfc544b8fea78bbcb8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tab-closed.json b/mobile/rpc-foundation/goldens/session-tab-closed.json
index 124db799d9f2..d68d1c2fe1e0 100644
--- a/mobile/rpc-foundation/goldens/session-tab-closed.json
+++ b/mobile/rpc-foundation/goldens/session-tab-closed.json
@@ -3,9 +3,9 @@
   "family": "session.tab-close-session",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "334b50e135103db21b93e60acff31047823371049171b57388df050179a6dcbc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tab-rename.json b/mobile/rpc-foundation/goldens/session-tab-rename.json
index 0ec7caa51ab3..9c38aa6d43e6 100644
--- a/mobile/rpc-foundation/goldens/session-tab-rename.json
+++ b/mobile/rpc-foundation/goldens/session-tab-rename.json
@@ -3,9 +3,9 @@
   "family": "session.tab-close",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "9e877af8539e5425f65edd6b3ff8af73e719aae2033980411a8e8a3b508dcd9e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tab-renamed.json b/mobile/rpc-foundation/goldens/session-tab-renamed.json
index d827b458f633..ff8aab7dd9ec 100644
--- a/mobile/rpc-foundation/goldens/session-tab-renamed.json
+++ b/mobile/rpc-foundation/goldens/session-tab-renamed.json
@@ -3,9 +3,9 @@
   "family": "session.tab-rename",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "562c2f4ab669e774dd7045ecd9518e483845433fef6034688090f3b056df2815",
   "scenarioSha256": "927e7cda255922c2e6ac893f0068679774ce5de988376df1ff8b7d5072f7d127",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tabs-health-errored.json b/mobile/rpc-foundation/goldens/session-tabs-health-errored.json
index 6bd44d0ffa6e..592720b6ebff 100644
--- a/mobile/rpc-foundation/goldens/session-tabs-health-errored.json
+++ b/mobile/rpc-foundation/goldens/session-tabs-health-errored.json
@@ -3,9 +3,9 @@
   "family": "session.tabs-stream-health",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4a1e81ab3229c8fd10b3ad435568efec11a944e0f02a183f94e4b1f44a7e5de0",
   "scenarioSha256": "4f55a21a5c42ff8d96ccb1b16de235f91f9f7e38fe90de7191c36c8c16cc4e43",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tabs-health-reconciled.json b/mobile/rpc-foundation/goldens/session-tabs-health-reconciled.json
index 9862552ca6ac..43513fd5d5ff 100644
--- a/mobile/rpc-foundation/goldens/session-tabs-health-reconciled.json
+++ b/mobile/rpc-foundation/goldens/session-tabs-health-reconciled.json
@@ -3,9 +3,9 @@
   "family": "session.tabs-stream-health",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4a1e81ab3229c8fd10b3ad435568efec11a944e0f02a183f94e4b1f44a7e5de0",
   "scenarioSha256": "29bee268df8e92fb1e3fd59291262c8d2d04a1b7e9fe40f6ed8dd181b0df828a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tabs-health-refused.json b/mobile/rpc-foundation/goldens/session-tabs-health-refused.json
index 4a69e89c9ec6..646aeedd242c 100644
--- a/mobile/rpc-foundation/goldens/session-tabs-health-refused.json
+++ b/mobile/rpc-foundation/goldens/session-tabs-health-refused.json
@@ -3,9 +3,9 @@
   "family": "session.tabs-stream-health",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4a1e81ab3229c8fd10b3ad435568efec11a944e0f02a183f94e4b1f44a7e5de0",
   "scenarioSha256": "101e8ce865088891800680db0e3df787b5f15ceb05ace9840931c384d9732d1c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-tabs-health-stale-application-revision.json b/mobile/rpc-foundation/goldens/session-tabs-health-stale-application-revision.json
index 557cbc2f2cbc..1b38eea06ba2 100644
--- a/mobile/rpc-foundation/goldens/session-tabs-health-stale-application-revision.json
+++ b/mobile/rpc-foundation/goldens/session-tabs-health-stale-application-revision.json
@@ -3,9 +3,9 @@
   "family": "session.tabs-stream-health",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4a1e81ab3229c8fd10b3ad435568efec11a944e0f02a183f94e4b1f44a7e5de0",
   "scenarioSha256": "5381b6ade796596ac362d4ed64349266e65fe8fd2b4fc778a54315d4b6fda3da",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-terminal-display-mode-auto-take-floor.json b/mobile/rpc-foundation/goldens/session-terminal-display-mode-auto-take-floor.json
index bc043532fa5c..eb9415320606 100644
--- a/mobile/rpc-foundation/goldens/session-terminal-display-mode-auto-take-floor.json
+++ b/mobile/rpc-foundation/goldens/session-terminal-display-mode-auto-take-floor.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-display-mode",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "9e90ad39a8d4257adf30166757a6364c4710dc3ae9f06365f80a3dd8f1c94d89",
   "scenarioSha256": "a4ba13014a128c0e06a3d40b9e3fa3b0136b07f52a92c89a9afa3c73bc39d69f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-terminal-display-mode-auto-without-device-token.json b/mobile/rpc-foundation/goldens/session-terminal-display-mode-auto-without-device-token.json
index e30bb15439e7..22c345648ecc 100644
--- a/mobile/rpc-foundation/goldens/session-terminal-display-mode-auto-without-device-token.json
+++ b/mobile/rpc-foundation/goldens/session-terminal-display-mode-auto-without-device-token.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-display-mode",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "9e90ad39a8d4257adf30166757a6364c4710dc3ae9f06365f80a3dd8f1c94d89",
   "scenarioSha256": "10295c4779f010c5040a7a04264a8094c342752ea5d75d887ab99f1a57ba4b2e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-terminal-display-mode-auto-without-viewport.json b/mobile/rpc-foundation/goldens/session-terminal-display-mode-auto-without-viewport.json
index e0669b09c7eb..b2ed727567b2 100644
--- a/mobile/rpc-foundation/goldens/session-terminal-display-mode-auto-without-viewport.json
+++ b/mobile/rpc-foundation/goldens/session-terminal-display-mode-auto-without-viewport.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-display-mode",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "9e90ad39a8d4257adf30166757a6364c4710dc3ae9f06365f80a3dd8f1c94d89",
   "scenarioSha256": "bb278c4da53b82d84cf50b308901ce196cc1f07c1a84790ad491319ee6746541",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-terminal-display-mode-drops-second-toggle.json b/mobile/rpc-foundation/goldens/session-terminal-display-mode-drops-second-toggle.json
index 86d57c2119b4..9d8e0ca1fda8 100644
--- a/mobile/rpc-foundation/goldens/session-terminal-display-mode-drops-second-toggle.json
+++ b/mobile/rpc-foundation/goldens/session-terminal-display-mode-drops-second-toggle.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-display-mode",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "9e90ad39a8d4257adf30166757a6364c4710dc3ae9f06365f80a3dd8f1c94d89",
   "scenarioSha256": "16f645f758f2463bf6e16559d581afbc8794aa56069210f13a45952158d35a4c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-terminal-display-mode-to-desktop.json b/mobile/rpc-foundation/goldens/session-terminal-display-mode-to-desktop.json
index f5dd36f26207..3bec41d3d144 100644
--- a/mobile/rpc-foundation/goldens/session-terminal-display-mode-to-desktop.json
+++ b/mobile/rpc-foundation/goldens/session-terminal-display-mode-to-desktop.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-display-mode",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "9e90ad39a8d4257adf30166757a6364c4710dc3ae9f06365f80a3dd8f1c94d89",
   "scenarioSha256": "fc81b0ac28970f9db27276c90f486306d74387f1404d757216a09823fedf680c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-terminal-list-dedupes-handles.json b/mobile/rpc-foundation/goldens/session-terminal-list-dedupes-handles.json
index 8916e2f7b4f3..819c744595e6 100644
--- a/mobile/rpc-foundation/goldens/session-terminal-list-dedupes-handles.json
+++ b/mobile/rpc-foundation/goldens/session-terminal-list-dedupes-handles.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "d0f5ecc9c8fcb10193f481648215a54460ce5a54a8fbd2ded3921a9599fefc0a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-terminal-list-empty-guarded.json b/mobile/rpc-foundation/goldens/session-terminal-list-empty-guarded.json
index cb1403d6d9c8..68a8101eb704 100644
--- a/mobile/rpc-foundation/goldens/session-terminal-list-empty-guarded.json
+++ b/mobile/rpc-foundation/goldens/session-terminal-list-empty-guarded.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "5c2b3237a14f9df9357ab458b2e21f2df8e68ad6bf6dc5670c0ace7eeb567e80",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-terminal-list-merged.json b/mobile/rpc-foundation/goldens/session-terminal-list-merged.json
index 47cb9cd6e1f0..dd47dfd4a3f7 100644
--- a/mobile/rpc-foundation/goldens/session-terminal-list-merged.json
+++ b/mobile/rpc-foundation/goldens/session-terminal-list-merged.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "9f3fb6e58e8d9ef4f52b2b6c0a42b6e4285d5786060f966261795cf64d055f65",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/session-terminal-list-refused.json b/mobile/rpc-foundation/goldens/session-terminal-list-refused.json
index 35677b07ac91..702e90b09d94 100644
--- a/mobile/rpc-foundation/goldens/session-terminal-list-refused.json
+++ b/mobile/rpc-foundation/goldens/session-terminal-list-refused.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "a3daf9a05d05424959baf77feb45cb0c076d77d8c49e877941ed612cc1e5ce95",
   "scenarioSha256": "10a8ba5332f4fc2f90cff537ca69f2f1474339cbc4996f67a6feaea70669fb25",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-bot-overrides-fulfilled.json b/mobile/rpc-foundation/goldens/settings-bot-overrides-fulfilled.json
index 6de76d8aed4d..10aa9bf6fade 100644
--- a/mobile/rpc-foundation/goldens/settings-bot-overrides-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/settings-bot-overrides-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.bot-overrides",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "4b4b4a8d1acaaec1c8dde0233dc49a696ffe53466578477efcbcdb7263dbd617",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-bot-overrides-refresh-refused.json b/mobile/rpc-foundation/goldens/settings-bot-overrides-refresh-refused.json
index ce0ce379cc53..cbc26766aba6 100644
--- a/mobile/rpc-foundation/goldens/settings-bot-overrides-refresh-refused.json
+++ b/mobile/rpc-foundation/goldens/settings-bot-overrides-refresh-refused.json
@@ -3,9 +3,9 @@
   "family": "settings.bot-overrides",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "cac4980465661fba372e187699741123a4edeb9270125a0a1cad7bbb6a6adebd",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-bot-overrides-refused.json b/mobile/rpc-foundation/goldens/settings-bot-overrides-refused.json
index 0e22643db510..59f48eb7903f 100644
--- a/mobile/rpc-foundation/goldens/settings-bot-overrides-refused.json
+++ b/mobile/rpc-foundation/goldens/settings-bot-overrides-refused.json
@@ -3,9 +3,9 @@
   "family": "settings.bot-overrides",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "f8ebd2348373b2b39c167735e0c418dfe868511fb5306ecba90cb6f2a905b95e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-bot-overrides-transport-error.json b/mobile/rpc-foundation/goldens/settings-bot-overrides-transport-error.json
index 90cd03474f67..af9092a191a2 100644
--- a/mobile/rpc-foundation/goldens/settings-bot-overrides-transport-error.json
+++ b/mobile/rpc-foundation/goldens/settings-bot-overrides-transport-error.json
@@ -3,9 +3,9 @@
   "family": "settings.bot-overrides",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "f7e63144421a689f05cc50ad87ec901a9eaeb3163165656887be12a5f2753005",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-home-coalesced.json b/mobile/rpc-foundation/goldens/settings-home-coalesced.json
index 87fc8071005f..bfd248c1111c 100644
--- a/mobile/rpc-foundation/goldens/settings-home-coalesced.json
+++ b/mobile/rpc-foundation/goldens/settings-home-coalesced.json
@@ -3,9 +3,9 @@
   "family": "settings.home-providers",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "d8d6f738ee11d84d6e9e546624f4babcb42476432f6bddbc74e8519d9ca18370",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-home-providers-fulfilled.json b/mobile/rpc-foundation/goldens/settings-home-providers-fulfilled.json
index ee2ec55e9653..8559c33d6f8b 100644
--- a/mobile/rpc-foundation/goldens/settings-home-providers-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/settings-home-providers-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.home-providers",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "a32b2fc99e830c58460e6f7c857aed0048738a55501e508eb236604680b9c235",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-home-providers-refuse-after-data.json b/mobile/rpc-foundation/goldens/settings-home-providers-refuse-after-data.json
index 16b11039d349..2383aa119812 100644
--- a/mobile/rpc-foundation/goldens/settings-home-providers-refuse-after-data.json
+++ b/mobile/rpc-foundation/goldens/settings-home-providers-refuse-after-data.json
@@ -3,9 +3,9 @@
   "family": "settings.home-providers",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "78c48025c4af6cc0f1f136448c0ede9f76b7485d7b33b1356d11dec017bd9053",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-home-providers-refused.json b/mobile/rpc-foundation/goldens/settings-home-providers-refused.json
index 48628bf6b989..09641d9d31f3 100644
--- a/mobile/rpc-foundation/goldens/settings-home-providers-refused.json
+++ b/mobile/rpc-foundation/goldens/settings-home-providers-refused.json
@@ -3,9 +3,9 @@
   "family": "settings.home-providers",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "c22f33a0ed28622d4d53ae31e934056f87d2c10e8dc4475831ae1ee5fd3a9b8b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-home-providers-transport-error.json b/mobile/rpc-foundation/goldens/settings-home-providers-transport-error.json
index daa08130fa91..7e0cfa9e465c 100644
--- a/mobile/rpc-foundation/goldens/settings-home-providers-transport-error.json
+++ b/mobile/rpc-foundation/goldens/settings-home-providers-transport-error.json
@@ -3,9 +3,9 @@
   "family": "settings.home-providers",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "4f16b43dddfb9257828342b0297317868df24b03fd98a89c66f5cd1897829d73",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-new-tab-refused.json b/mobile/rpc-foundation/goldens/settings-new-tab-refused.json
index 005df31eb4e9..7678703497f3 100644
--- a/mobile/rpc-foundation/goldens/settings-new-tab-refused.json
+++ b/mobile/rpc-foundation/goldens/settings-new-tab-refused.json
@@ -3,9 +3,9 @@
   "family": "settings-agent-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "b6fb40be3bb92d7d9f1a79d99dee077cf95097077917679dc99702f912241fa4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-new-tab-ssh.json b/mobile/rpc-foundation/goldens/settings-new-tab-ssh.json
index 2bf8b6ce6f01..5a83681082c5 100644
--- a/mobile/rpc-foundation/goldens/settings-new-tab-ssh.json
+++ b/mobile/rpc-foundation/goldens/settings-new-tab-ssh.json
@@ -3,9 +3,9 @@
   "family": "settings-agent-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "31f8a348322551738b14207b3477bae492d48d45c5d51be4d97ffaca2fe2b6e1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-new-tab-transport-error.json b/mobile/rpc-foundation/goldens/settings-new-tab-transport-error.json
index f5923ca762d6..a14c158b06b7 100644
--- a/mobile/rpc-foundation/goldens/settings-new-tab-transport-error.json
+++ b/mobile/rpc-foundation/goldens/settings-new-tab-transport-error.json
@@ -3,9 +3,9 @@
   "family": "settings-agent-read",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "448cdbd12f4f6a14bb33947bfbbb1837aebeb28979db70c62f2ba2fbb4d89c8f",
   "scenarioSha256": "1347663aba0ada1eee8e88fac306757dc0d29fe21f0d062ac2d3968a30a2f214",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-repo-cache-expiry.json b/mobile/rpc-foundation/goldens/settings-repo-cache-expiry.json
index ef20ea6cea42..eb4fc941aca1 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-cache-expiry.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-cache-expiry.json
@@ -3,9 +3,9 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "adebd553e2648278d719a1d7299cb36683fce714682a1ab7b49d4c9027eea34e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-repo-metadata-fulfilled.json b/mobile/rpc-foundation/goldens/settings-repo-metadata-fulfilled.json
index 7f046994e54f..48d11dcd47b0 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-metadata-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-metadata-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "b45eba2007e8e2668f524cd7503b8a711eba67816c9c35af5c3725a1afe32d8d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-repo-metadata-icons.json b/mobile/rpc-foundation/goldens/settings-repo-metadata-icons.json
index b7e875213d8c..f2d0e0648ede 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-metadata-icons.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-metadata-icons.json
@@ -3,9 +3,9 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "e67b645d8c4fa42e93d4cf36f45311922f7b9d9d8cc597a12f55c664d840901b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-repo-metadata-refuse-after-data.json b/mobile/rpc-foundation/goldens/settings-repo-metadata-refuse-after-data.json
index 121cec5c29fa..534db6719a7d 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-metadata-refuse-after-data.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-metadata-refuse-after-data.json
@@ -3,9 +3,9 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "b1c0b957b828c32e7ec388ec6668273fe84bbe5d11d8286b9a246fa92395a26e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-repo-metadata-refused.json b/mobile/rpc-foundation/goldens/settings-repo-metadata-refused.json
index b9a5b38f5a48..826fa175c36c 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-metadata-refused.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-metadata-refused.json
@@ -3,9 +3,9 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "867b6905c8a533ddd1c7c8174bf4aadd5fd725cc72bdddbcb2ea8af26e219078",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-repo-metadata-single-host.json b/mobile/rpc-foundation/goldens/settings-repo-metadata-single-host.json
index e942c42300cc..3ff00bc00660 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-metadata-single-host.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-metadata-single-host.json
@@ -3,9 +3,9 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "d8a00a72849f1ed254c3b35ebcc330dd1bb15b189f006bd1517853a19e53de6c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-repo-metadata-transport-error.json b/mobile/rpc-foundation/goldens/settings-repo-metadata-transport-error.json
index 6115a206ec01..b096dc378efd 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-metadata-transport-error.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-metadata-transport-error.json
@@ -3,9 +3,9 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "741db13a84dbcec2e97e80605d742e69558954657c72f8450f3f8bc177dd01b6",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-resume-metadata-fulfilled.json b/mobile/rpc-foundation/goldens/settings-resume-metadata-fulfilled.json
index 0def47fd07fa..a3fde54d0e01 100644
--- a/mobile/rpc-foundation/goldens/settings-resume-metadata-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/settings-resume-metadata-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.resume-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "7a8d0a5305aafea56733c229989b6e825fe9b8a681f48f6cef405350304520b6",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-resume-metadata-refuse-after-data.json b/mobile/rpc-foundation/goldens/settings-resume-metadata-refuse-after-data.json
index f1e6921dbeb6..70edb4661de8 100644
--- a/mobile/rpc-foundation/goldens/settings-resume-metadata-refuse-after-data.json
+++ b/mobile/rpc-foundation/goldens/settings-resume-metadata-refuse-after-data.json
@@ -3,9 +3,9 @@
   "family": "settings.resume-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "a11756ecaf7c2d3955b9512aa7479ca55d810341f1492f472985abb538e140e8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-resume-metadata-refused.json b/mobile/rpc-foundation/goldens/settings-resume-metadata-refused.json
index baacbabaa92e..3daae99cf55b 100644
--- a/mobile/rpc-foundation/goldens/settings-resume-metadata-refused.json
+++ b/mobile/rpc-foundation/goldens/settings-resume-metadata-refused.json
@@ -3,9 +3,9 @@
   "family": "settings.resume-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "def0640be601a8013f9537f161b60d8c14ac9551931e5ee4d4cc2acd3c2baf2a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-resume-metadata-transport-error.json b/mobile/rpc-foundation/goldens/settings-resume-metadata-transport-error.json
index b8ebe3f59b53..995ad34d24b9 100644
--- a/mobile/rpc-foundation/goldens/settings-resume-metadata-transport-error.json
+++ b/mobile/rpc-foundation/goldens/settings-resume-metadata-transport-error.json
@@ -3,9 +3,9 @@
   "family": "settings.resume-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "17c31d0c2b7ae5322fd59bafcfa1d2779ae9eff841e12c0cf16b27e454b49f13",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-task-hydration-fulfilled.json b/mobile/rpc-foundation/goldens/settings-task-hydration-fulfilled.json
index 9794d1f9ceb9..9940a7b242ce 100644
--- a/mobile/rpc-foundation/goldens/settings-task-hydration-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/settings-task-hydration-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.task-hydration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "c08cce5d1f71761dbf504863b736e5546abb42b9ff4ab8ced65c7c42e3d66c0e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-task-hydration-refuse-after-data.json b/mobile/rpc-foundation/goldens/settings-task-hydration-refuse-after-data.json
index ff1372278eaf..a2353d9cd01d 100644
--- a/mobile/rpc-foundation/goldens/settings-task-hydration-refuse-after-data.json
+++ b/mobile/rpc-foundation/goldens/settings-task-hydration-refuse-after-data.json
@@ -3,9 +3,9 @@
   "family": "settings.task-hydration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "b23c3076081901c89e8a8fb8d20028e03f030db040c9cd793b6f2c7cd49d8f25",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-task-hydration-refused.json b/mobile/rpc-foundation/goldens/settings-task-hydration-refused.json
index c9ee45cb0be2..ef29c952cfca 100644
--- a/mobile/rpc-foundation/goldens/settings-task-hydration-refused.json
+++ b/mobile/rpc-foundation/goldens/settings-task-hydration-refused.json
@@ -3,9 +3,9 @@
   "family": "settings.task-hydration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "a510ff7505cddbd6dad3c7e5a2dcde206a5dab1940901511d72c97aca576a6f1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-task-hydration-transport-error.json b/mobile/rpc-foundation/goldens/settings-task-hydration-transport-error.json
index 7c4ae69272f9..b03484b95bcb 100644
--- a/mobile/rpc-foundation/goldens/settings-task-hydration-transport-error.json
+++ b/mobile/rpc-foundation/goldens/settings-task-hydration-transport-error.json
@@ -3,9 +3,9 @@
   "family": "settings.task-hydration",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "d4a2fef3aefb78bdb4aed94fda982124f24a3af3832227654d324735f44aaeeb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-task-workspace-create-linear.json b/mobile/rpc-foundation/goldens/settings-task-workspace-create-linear.json
index 98f433b5fa5d..9331d8c3eb47 100644
--- a/mobile/rpc-foundation/goldens/settings-task-workspace-create-linear.json
+++ b/mobile/rpc-foundation/goldens/settings-task-workspace-create-linear.json
@@ -3,9 +3,9 @@
   "family": "settings.task-workspace-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c2eed306311a844cd6f2f84b6513c0a1182f86a5e3cace434385b8287c80d7c5",
   "scenarioSha256": "662c3e04e31bce5757f09f91e3e3739fb9d57767b7443be4dc936705b64b1432",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-task-workspace-create-pr-start-point.json b/mobile/rpc-foundation/goldens/settings-task-workspace-create-pr-start-point.json
index 9b8726f44bd5..9088f5d3b1e5 100644
--- a/mobile/rpc-foundation/goldens/settings-task-workspace-create-pr-start-point.json
+++ b/mobile/rpc-foundation/goldens/settings-task-workspace-create-pr-start-point.json
@@ -3,9 +3,9 @@
   "family": "settings.task-workspace-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c2eed306311a844cd6f2f84b6513c0a1182f86a5e3cace434385b8287c80d7c5",
   "scenarioSha256": "8ae9e1dbb32d404eac9e01f71dacf1c37497030220a8e988c0093bb7ed2d159b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-task-workspace-fulfilled.json b/mobile/rpc-foundation/goldens/settings-task-workspace-fulfilled.json
index 64f78be62c9d..703829be6845 100644
--- a/mobile/rpc-foundation/goldens/settings-task-workspace-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/settings-task-workspace-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.task-workspace",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c2eed306311a844cd6f2f84b6513c0a1182f86a5e3cace434385b8287c80d7c5",
   "scenarioSha256": "5c4c890e4c71e80fa8847a5e29700fc9df3ac3bd634bad6289db37522fadd621",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-task-workspace-refused.json b/mobile/rpc-foundation/goldens/settings-task-workspace-refused.json
index a3af5656c504..5e433195d9ac 100644
--- a/mobile/rpc-foundation/goldens/settings-task-workspace-refused.json
+++ b/mobile/rpc-foundation/goldens/settings-task-workspace-refused.json
@@ -3,9 +3,9 @@
   "family": "settings.task-workspace",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c2eed306311a844cd6f2f84b6513c0a1182f86a5e3cace434385b8287c80d7c5",
   "scenarioSha256": "a699a0a5b128fa422dab0c7557b5aa18599b2d23fa6685cdcc02e17edf328af1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-task-workspace-transport-error.json b/mobile/rpc-foundation/goldens/settings-task-workspace-transport-error.json
index fcfcfade1e78..1575042ffffb 100644
--- a/mobile/rpc-foundation/goldens/settings-task-workspace-transport-error.json
+++ b/mobile/rpc-foundation/goldens/settings-task-workspace-transport-error.json
@@ -3,9 +3,9 @@
   "family": "settings.task-workspace",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c2eed306311a844cd6f2f84b6513c0a1182f86a5e3cace434385b8287c80d7c5",
   "scenarioSha256": "a5e812cd508826b3f01ec3798c621ab4303de6536a364113f01a4770dd197bb5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-task-write.json b/mobile/rpc-foundation/goldens/settings-task-write.json
index 1f69119775c2..c0aa3ba1b23e 100644
--- a/mobile/rpc-foundation/goldens/settings-task-write.json
+++ b/mobile/rpc-foundation/goldens/settings-task-write.json
@@ -3,9 +3,9 @@
   "family": "settings-best-effort",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d3b7f33d810e1fa420ac41a628cde9fe4a9e65fd57f89fbca0a40fc7d74951ab",
   "scenarioSha256": "bbcdefe16b07068a81f3c46ae60df01ccb0fbe5a7c1eade3f584f6f0130c23fe",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-workspace-context-fulfilled.json b/mobile/rpc-foundation/goldens/settings-workspace-context-fulfilled.json
index 7fe0cc3d848e..647269388f22 100644
--- a/mobile/rpc-foundation/goldens/settings-workspace-context-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/settings-workspace-context-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-context",
   "namedDeltas": ["new-workspace-runtime-context-null-results-degrade-to-absent"],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "287f94e469548f28c9d5591ff6ffb916fa22caa18776b091542b75704c9e1fee",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-workspace-context-refuse-after-data.json b/mobile/rpc-foundation/goldens/settings-workspace-context-refuse-after-data.json
index 004a849887c5..5dad315f94de 100644
--- a/mobile/rpc-foundation/goldens/settings-workspace-context-refuse-after-data.json
+++ b/mobile/rpc-foundation/goldens/settings-workspace-context-refuse-after-data.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-context",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "76793a56e7b9e596d8c42e9a5a1c47337db32d7437bec2e41d6e7253943f3fd8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-workspace-context-refused.json b/mobile/rpc-foundation/goldens/settings-workspace-context-refused.json
index 25078c7a37ce..5abf97f82062 100644
--- a/mobile/rpc-foundation/goldens/settings-workspace-context-refused.json
+++ b/mobile/rpc-foundation/goldens/settings-workspace-context-refused.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-context",
   "namedDeltas": ["new-workspace-runtime-context-null-results-degrade-to-absent"],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "ad19fc24973b49ee7d14bc31460a7e4af5d207db6a2375b52b5a0aa878e09205",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-workspace-context-transport-error.json b/mobile/rpc-foundation/goldens/settings-workspace-context-transport-error.json
index 07e001c39d6b..d7262a8d9335 100644
--- a/mobile/rpc-foundation/goldens/settings-workspace-context-transport-error.json
+++ b/mobile/rpc-foundation/goldens/settings-workspace-context-transport-error.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-context",
   "namedDeltas": ["new-workspace-runtime-context-null-results-degrade-to-absent"],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "a2c80c9cdbb631f3a8fa648dfbb9e691418467d6ead8fe769d72e7e1d8b552b4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-workspace-submit-fulfilled.json b/mobile/rpc-foundation/goldens/settings-workspace-submit-fulfilled.json
index c8733f487b4d..c14e5708c0ce 100644
--- a/mobile/rpc-foundation/goldens/settings-workspace-submit-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/settings-workspace-submit-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-submit",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c2eed306311a844cd6f2f84b6513c0a1182f86a5e3cace434385b8287c80d7c5",
   "scenarioSha256": "b10ff86086c134284cb0446e8857cd4b55f5ff2bd0507388ec659a95f25e2a19",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-workspace-submit-refused.json b/mobile/rpc-foundation/goldens/settings-workspace-submit-refused.json
index 786e8638399c..37a2b5ef9cbc 100644
--- a/mobile/rpc-foundation/goldens/settings-workspace-submit-refused.json
+++ b/mobile/rpc-foundation/goldens/settings-workspace-submit-refused.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-submit",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c2eed306311a844cd6f2f84b6513c0a1182f86a5e3cace434385b8287c80d7c5",
   "scenarioSha256": "373ea3743dac4e0845df01d5c8f75c909563b8c517f3858293a478234dc9ca5c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/settings-workspace-submit-transport-error.json b/mobile/rpc-foundation/goldens/settings-workspace-submit-transport-error.json
index 7eb5a0247a89..5d7cc485d6b2 100644
--- a/mobile/rpc-foundation/goldens/settings-workspace-submit-transport-error.json
+++ b/mobile/rpc-foundation/goldens/settings-workspace-submit-transport-error.json
@@ -3,9 +3,9 @@
   "family": "settings.workspace-submit",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c2eed306311a844cd6f2f84b6513c0a1182f86a5e3cace434385b8287c80d7c5",
   "scenarioSha256": "dfbacbd6392ae8e8199550952fe917e7c01182349df6c99a06eb0682cfd9175c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/speech-audio-chunk-acknowledged.json b/mobile/rpc-foundation/goldens/speech-audio-chunk-acknowledged.json
index 1c50939776e9..6a67d75a0f40 100644
--- a/mobile/rpc-foundation/goldens/speech-audio-chunk-acknowledged.json
+++ b/mobile/rpc-foundation/goldens/speech-audio-chunk-acknowledged.json
@@ -3,9 +3,9 @@
   "family": "speech.dictation-chunk",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "08b583790d858a4cb7cf7377126818b6d05766c02587343ec89a167f94094082",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/speech-desktop-start-fulfilled.json b/mobile/rpc-foundation/goldens/speech-desktop-start-fulfilled.json
index c3020d0b67d5..67ed20e3710f 100644
--- a/mobile/rpc-foundation/goldens/speech-desktop-start-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/speech-desktop-start-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "speech.dictation-start",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "35fadd03f2c98344e22d6aec2dc85ad15ca5ac8e092fc1c29a20366db5d46628",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/speech-desktop-start-recording-failed.json b/mobile/rpc-foundation/goldens/speech-desktop-start-recording-failed.json
index 8dcf3faeb8a1..834ee80e8e16 100644
--- a/mobile/rpc-foundation/goldens/speech-desktop-start-recording-failed.json
+++ b/mobile/rpc-foundation/goldens/speech-desktop-start-recording-failed.json
@@ -3,9 +3,9 @@
   "family": "speech.dictation-start",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "75b8d1b7ed98b2bf7420986958d0a36222b007c535f85c1308b534301241ec2d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/speech-desktop-start-superseded.json b/mobile/rpc-foundation/goldens/speech-desktop-start-superseded.json
index a03a8a7d89bc..b95b912f28e7 100644
--- a/mobile/rpc-foundation/goldens/speech-desktop-start-superseded.json
+++ b/mobile/rpc-foundation/goldens/speech-desktop-start-superseded.json
@@ -3,9 +3,9 @@
   "family": "speech.dictation-start",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "b1c4a6d6c94d54fb5f60eb2deb437562ededd724140dd3973d842d7c29bf1a60",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/speech-dictation-session-cancelled.json b/mobile/rpc-foundation/goldens/speech-dictation-session-cancelled.json
index b3e2a74772db..7f0ff48fca15 100644
--- a/mobile/rpc-foundation/goldens/speech-dictation-session-cancelled.json
+++ b/mobile/rpc-foundation/goldens/speech-dictation-session-cancelled.json
@@ -3,9 +3,9 @@
   "family": "speech.dictation-session",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "5fe007d384731f954e086c16886055722fab45bafac23f4c4d52f0bb1f47acc9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/speech-dictation-session-transcript.json b/mobile/rpc-foundation/goldens/speech-dictation-session-transcript.json
index bb199073141b..7f5f2e8ec5db 100644
--- a/mobile/rpc-foundation/goldens/speech-dictation-session-transcript.json
+++ b/mobile/rpc-foundation/goldens/speech-dictation-session-transcript.json
@@ -3,9 +3,9 @@
   "family": "speech.dictation-session",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "cd3be6291ce181c4acfd7bacc0a8380f296fa5db13a52c4c0fcd75cfff3ae7d6",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/speech-setup-sheet-denied-to-mobile.json b/mobile/rpc-foundation/goldens/speech-setup-sheet-denied-to-mobile.json
index da0a1ab7c2c2..76559248ae91 100644
--- a/mobile/rpc-foundation/goldens/speech-setup-sheet-denied-to-mobile.json
+++ b/mobile/rpc-foundation/goldens/speech-setup-sheet-denied-to-mobile.json
@@ -3,9 +3,9 @@
   "family": "speech.setup-sheet",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "69c1c20ea667a2b6a5b53aeb3d9af11b2b707e04086e15ee4ff9e954b1701851",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/speech-setup-sheet-fulfilled.json b/mobile/rpc-foundation/goldens/speech-setup-sheet-fulfilled.json
index c7911fd45d5f..2148cd207629 100644
--- a/mobile/rpc-foundation/goldens/speech-setup-sheet-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/speech-setup-sheet-fulfilled.json
@@ -3,9 +3,9 @@
   "family": "speech.setup-sheet",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "748e1bc0575fca6baab51b19cbbea5ac6185fca2a15dc4d8577212134355cd7e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/speech-setup-sheet-legacy-desktop.json b/mobile/rpc-foundation/goldens/speech-setup-sheet-legacy-desktop.json
index 51c6dd72fa4a..73973586c8b4 100644
--- a/mobile/rpc-foundation/goldens/speech-setup-sheet-legacy-desktop.json
+++ b/mobile/rpc-foundation/goldens/speech-setup-sheet-legacy-desktop.json
@@ -3,9 +3,9 @@
   "family": "speech.setup-sheet",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "0ba2d8283fe98206c7500b62732e30acdc5b8e55f50b7ea8cae96403b803d519",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/speech-setup-sheet-model-vocabulary.json b/mobile/rpc-foundation/goldens/speech-setup-sheet-model-vocabulary.json
index 32180edd0777..224c6e49d737 100644
--- a/mobile/rpc-foundation/goldens/speech-setup-sheet-model-vocabulary.json
+++ b/mobile/rpc-foundation/goldens/speech-setup-sheet-model-vocabulary.json
@@ -3,9 +3,9 @@
   "family": "speech.setup-sheet",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "5d978690e3626892b83bdba64537f9b1e1bb66c2060a00517ceead042a6d2334",
   "scenarioSha256": "88e563aa087955b9ef6447b7e73711f90d5befb7c082270da58695c3a7169e67",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/structured-agent-session-created.json b/mobile/rpc-foundation/goldens/structured-agent-session-created.json
index 3a50fa016e0e..dd1bf6e99a5a 100644
--- a/mobile/rpc-foundation/goldens/structured-agent-session-created.json
+++ b/mobile/rpc-foundation/goldens/structured-agent-session-created.json
@@ -3,9 +3,9 @@
   "family": "agentSession.structured-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d340697a64a198066b1037a550afb9a0de7507246a545901d2fc0a23407f38d6",
   "scenarioSha256": "6e2d1633645a3072241729328cc71ea2979533d28797c14de86c8b3457ac018a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/structured-launch-created.json b/mobile/rpc-foundation/goldens/structured-launch-created.json
index 8fdbf51fd890..bf2a2e0f42e5 100644
--- a/mobile/rpc-foundation/goldens/structured-launch-created.json
+++ b/mobile/rpc-foundation/goldens/structured-launch-created.json
@@ -3,9 +3,9 @@
   "family": "agentSession.structured-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d340697a64a198066b1037a550afb9a0de7507246a545901d2fc0a23407f38d6",
   "scenarioSha256": "0b5dd55868490e4d62d7d718821dec9634773b20d32fe9889523606a3f6b9168",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/structured-launch-definitive-refusal.json b/mobile/rpc-foundation/goldens/structured-launch-definitive-refusal.json
index e61a2d22f768..0d19d85ec3b4 100644
--- a/mobile/rpc-foundation/goldens/structured-launch-definitive-refusal.json
+++ b/mobile/rpc-foundation/goldens/structured-launch-definitive-refusal.json
@@ -3,9 +3,9 @@
   "family": "agentSession.structured-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d340697a64a198066b1037a550afb9a0de7507246a545901d2fc0a23407f38d6",
   "scenarioSha256": "64916f2d8ab51132b08c3e8c72f89c3a2698d83945def294f42edf22eb6d08ea",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/structured-launch-replays-dropped-create.json b/mobile/rpc-foundation/goldens/structured-launch-replays-dropped-create.json
index 16b143a9bd78..2902789d8c96 100644
--- a/mobile/rpc-foundation/goldens/structured-launch-replays-dropped-create.json
+++ b/mobile/rpc-foundation/goldens/structured-launch-replays-dropped-create.json
@@ -3,9 +3,9 @@
   "family": "agentSession.structured-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d340697a64a198066b1037a550afb9a0de7507246a545901d2fc0a23407f38d6",
   "scenarioSha256": "fb1ab1209f0a7c03ee1b3985401ce2df080d673532f045c4fca26e754d5e5a9f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/structured-launch-support-refused.json b/mobile/rpc-foundation/goldens/structured-launch-support-refused.json
index 2f0677e0056e..e73320d67e3c 100644
--- a/mobile/rpc-foundation/goldens/structured-launch-support-refused.json
+++ b/mobile/rpc-foundation/goldens/structured-launch-support-refused.json
@@ -3,9 +3,9 @@
   "family": "agentSession.structured-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d340697a64a198066b1037a550afb9a0de7507246a545901d2fc0a23407f38d6",
   "scenarioSha256": "d8928461e3295d265872e5f98fb8aad445b5edc55fc76f137e45c0cff0d8b961",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/structured-launch-unsupported.json b/mobile/rpc-foundation/goldens/structured-launch-unsupported.json
index 40b76d194d8e..1a87bc4c4ffd 100644
--- a/mobile/rpc-foundation/goldens/structured-launch-unsupported.json
+++ b/mobile/rpc-foundation/goldens/structured-launch-unsupported.json
@@ -3,9 +3,9 @@
   "family": "agentSession.structured-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d340697a64a198066b1037a550afb9a0de7507246a545901d2fc0a23407f38d6",
   "scenarioSha256": "c30e9cae49e134715c009a98f423f3e4a9d552c014be3e28b38e98c57999b6f5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tasks-route-repo-list.json b/mobile/rpc-foundation/goldens/tasks-route-repo-list.json
index d2efeb2bfa88..290bf8803853 100644
--- a/mobile/rpc-foundation/goldens/tasks-route-repo-list.json
+++ b/mobile/rpc-foundation/goldens/tasks-route-repo-list.json
@@ -3,9 +3,9 @@
   "family": "tasks.route-repo-list",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "23f974df8b57c723069605de1db80c339ead286b18aae38e67fce03ea50c5180",
   "scenarioSha256": "b62ca571d4defcc2e53960033c5b4eb3f7e406b57664664cbc6a173041a9f803",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/terminal-gesture-flush-and-clear.json b/mobile/rpc-foundation/goldens/terminal-gesture-flush-and-clear.json
index f65d0d4d2cc4..2029b150b96f 100644
--- a/mobile/rpc-foundation/goldens/terminal-gesture-flush-and-clear.json
+++ b/mobile/rpc-foundation/goldens/terminal-gesture-flush-and-clear.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-gesture-input",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "9d119d5ec320e2538105d6ff673b9f4b8e3decbe46527947489dffbcf2ac0472",
   "scenarioSha256": "97e6d63c6b4bc154e94be6cf3dcd25620b4656cacd2b62cdc872ff793b39ebd2",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/terminal-input-send-accepted.json b/mobile/rpc-foundation/goldens/terminal-input-send-accepted.json
index 84cb1993c005..90d2e5d7b699 100644
--- a/mobile/rpc-foundation/goldens/terminal-input-send-accepted.json
+++ b/mobile/rpc-foundation/goldens/terminal-input-send-accepted.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-input-send",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "7cdbf3308411ed6764cc1cdcc0f663a27ddc9390fcc329c49fad4b27cb5a7fd5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/terminal-input-send-refused.json b/mobile/rpc-foundation/goldens/terminal-input-send-refused.json
index eea9dc3d88a6..fc3cbf9ceb10 100644
--- a/mobile/rpc-foundation/goldens/terminal-input-send-refused.json
+++ b/mobile/rpc-foundation/goldens/terminal-input-send-refused.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-input-send",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "eb5e47e3accccc7ca280ca029f97405905b0cee8a05afb9ef15448314041d9d4",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/terminal-live-input-accepted.json b/mobile/rpc-foundation/goldens/terminal-live-input-accepted.json
index 932725e52981..e4cf7f753315 100644
--- a/mobile/rpc-foundation/goldens/terminal-live-input-accepted.json
+++ b/mobile/rpc-foundation/goldens/terminal-live-input-accepted.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-input-send",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "391a4f681443f099e6ea4417811d82d730242dfe07e21f74b0ad49a98bcd7c81",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/terminal-paste-accepted.json b/mobile/rpc-foundation/goldens/terminal-paste-accepted.json
index e69ecc9cf1fb..a11282a2378d 100644
--- a/mobile/rpc-foundation/goldens/terminal-paste-accepted.json
+++ b/mobile/rpc-foundation/goldens/terminal-paste-accepted.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-paste",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "48bb495de3b54f2b2edc0543f0f232ff4fd6068d5aca34d005766ebacbb078c9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/terminal-paste-refused.json b/mobile/rpc-foundation/goldens/terminal-paste-refused.json
index f1692019fa12..6ee741a85e65 100644
--- a/mobile/rpc-foundation/goldens/terminal-paste-refused.json
+++ b/mobile/rpc-foundation/goldens/terminal-paste-refused.json
@@ -3,9 +3,9 @@
   "family": "session.terminal-paste",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "78e62b9125252accc7f6d2ce772b93c84a917b01d2df308c1f9fb163d9127665",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/terminal-query-reply-accepted.json b/mobile/rpc-foundation/goldens/terminal-query-reply-accepted.json
index 4578972ceb9b..af4b89b745ed 100644
--- a/mobile/rpc-foundation/goldens/terminal-query-reply-accepted.json
+++ b/mobile/rpc-foundation/goldens/terminal-query-reply-accepted.json
@@ -3,10 +3,10 @@
   "family": "terminal.query-reply",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "bfa1d5f83b4112d3cce6a19e9dc27daf9281ed99745bc01bd19226dd7b268c71",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/terminal-query-reply-unsubscribed.json b/mobile/rpc-foundation/goldens/terminal-query-reply-unsubscribed.json
index 74394bc60497..2a4d6c75152c 100644
--- a/mobile/rpc-foundation/goldens/terminal-query-reply-unsubscribed.json
+++ b/mobile/rpc-foundation/goldens/terminal-query-reply-unsubscribed.json
@@ -3,10 +3,10 @@
   "family": "terminal.query-reply",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "ad03596f31eeccc5e9eb7e5061b1af705f9af249f76377c8f5ce1a9db257770f",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/terminal-raw-input-refused.json b/mobile/rpc-foundation/goldens/terminal-raw-input-refused.json
index a5caedf8ae29..c8ec6a1c4c13 100644
--- a/mobile/rpc-foundation/goldens/terminal-raw-input-refused.json
+++ b/mobile/rpc-foundation/goldens/terminal-raw-input-refused.json
@@ -3,10 +3,10 @@
   "family": "terminal.raw-input",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "76fc0c1499ec48a67428f35eba705f68147d2ff2c344b67aa0c9d60ed999f173",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/terminal-raw-input-reported.json b/mobile/rpc-foundation/goldens/terminal-raw-input-reported.json
index 382840b45d1d..daf232e08674 100644
--- a/mobile/rpc-foundation/goldens/terminal-raw-input-reported.json
+++ b/mobile/rpc-foundation/goldens/terminal-raw-input-reported.json
@@ -3,10 +3,10 @@
   "family": "terminal.raw-input",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "579077efd3a4652a6930af3f6690138c20536270cbcd7274246047d2e322199f",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/terminal-takeover-report-accepted.json b/mobile/rpc-foundation/goldens/terminal-takeover-report-accepted.json
index 80704511e806..cd7ab9ab2dff 100644
--- a/mobile/rpc-foundation/goldens/terminal-takeover-report-accepted.json
+++ b/mobile/rpc-foundation/goldens/terminal-takeover-report-accepted.json
@@ -3,10 +3,10 @@
   "family": "terminal.takeover-report",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "c2236257032fab72ebb007391313eec4e5f0a1bdb4fbcbd907117f9914ffafc6",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/terminal-takeover-report-retried.json b/mobile/rpc-foundation/goldens/terminal-takeover-report-retried.json
index 64d23e49961d..059ef635246d 100644
--- a/mobile/rpc-foundation/goldens/terminal-takeover-report-retried.json
+++ b/mobile/rpc-foundation/goldens/terminal-takeover-report-retried.json
@@ -3,10 +3,10 @@
   "family": "terminal.takeover-report",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "8ad436ca6c3de8b0b3148326337acce18a8a4cf3c514acad1a4530a001f28c75",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/terminal-viewport-refit-applied.json b/mobile/rpc-foundation/goldens/terminal-viewport-refit-applied.json
index 8e9d62199a6b..581b27eb0310 100644
--- a/mobile/rpc-foundation/goldens/terminal-viewport-refit-applied.json
+++ b/mobile/rpc-foundation/goldens/terminal-viewport-refit-applied.json
@@ -3,10 +3,10 @@
   "family": "terminal.viewport-refit",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "f966c2ef2e747a5231f423147ddaf38458cb08c719434b274016a5e4abc10771",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/terminal-viewport-refit-legacy-desktop.json b/mobile/rpc-foundation/goldens/terminal-viewport-refit-legacy-desktop.json
index 9b035e4029da..c60bedf21b24 100644
--- a/mobile/rpc-foundation/goldens/terminal-viewport-refit-legacy-desktop.json
+++ b/mobile/rpc-foundation/goldens/terminal-viewport-refit-legacy-desktop.json
@@ -3,10 +3,10 @@
   "family": "terminal.viewport-refit",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
-  "adapterSha256": "7588d30f33a8bb846c48f160aa9a4a8138176662bb2fb6be7bbdf352f553d05f",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
+  "adapterSha256": "42e1fe434b591ab5a945b6b366bbb20b567085d58bade63413f2251e8202b255",
   "scenarioSha256": "88961a369cb7a7fa92708bb83aa7f818e904018e8cfcedc2f50ef9a0058c8b9d",
   "platform": "darwin",
   "scenarioVersion": 1,
diff --git a/mobile/rpc-foundation/goldens/terminal-worktree-connection-resolved.json b/mobile/rpc-foundation/goldens/terminal-worktree-connection-resolved.json
index 21869fbd9575..73dda3c865be 100644
--- a/mobile/rpc-foundation/goldens/terminal-worktree-connection-resolved.json
+++ b/mobile/rpc-foundation/goldens/terminal-worktree-connection-resolved.json
@@ -3,9 +3,9 @@
   "family": "session.worktree-connection",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "e7e3718f685e3713cf1b8209d59d618741f892bd286853b79bb456c59cec8d86",
   "scenarioSha256": "f921c4a764cdf7a4c1df0a7ec618d7c3b1d8a05ee4baa42d66f3bc0d95b3f550",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-create-github.json b/mobile/rpc-foundation/goldens/tk-create-github.json
index e866d9858b8b..97b68c2b7862 100644
--- a/mobile/rpc-foundation/goldens/tk-create-github.json
+++ b/mobile/rpc-foundation/goldens/tk-create-github.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-create-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "260a84280f69c43ac582149d9befe6ae547b2ad2b5f56a181d8e3a1314a0a071",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-create-gitlab.json b/mobile/rpc-foundation/goldens/tk-create-gitlab.json
index 44f8294ec48c..9e8c31c0a144 100644
--- a/mobile/rpc-foundation/goldens/tk-create-gitlab.json
+++ b/mobile/rpc-foundation/goldens/tk-create-gitlab.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-create-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "a4d3d1f322d49593056bd20f4122bbf0309d2161123e404161950bcab65decd5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-create-linear.json b/mobile/rpc-foundation/goldens/tk-create-linear.json
index d4de6f59303f..cbe96ac449df 100644
--- a/mobile/rpc-foundation/goldens/tk-create-linear.json
+++ b/mobile/rpc-foundation/goldens/tk-create-linear.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-create-linear",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "f6c7eea985190d9edeead5b36f90c8aa98679f69d19dab7579fec88841645259",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-checks-files.json b/mobile/rpc-foundation/goldens/tk-item-checks-files.json
index 833d006207ba..4cdfd0c51aff 100644
--- a/mobile/rpc-foundation/goldens/tk-item-checks-files.json
+++ b/mobile/rpc-foundation/goldens/tk-item-checks-files.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-checks-files",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8c4218bfb2af227da5386f29989cec438f2c6187f39ce1c06859e136ea920bfa",
   "scenarioSha256": "644a27c1e3fa6bfa73c7822c2949e9534508e5e3a996b0e8e56be6326658d123",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-comment-github.json b/mobile/rpc-foundation/goldens/tk-item-comment-github.json
index 340628d8b10a..2e0bdd7a3569 100644
--- a/mobile/rpc-foundation/goldens/tk-item-comment-github.json
+++ b/mobile/rpc-foundation/goldens/tk-item-comment-github.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-comment-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "fb0cdff9e02bac37b0bd8e1c47922474823d46fa735f3069ed70cdad41800be6",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-comment-gitlab-mr.json b/mobile/rpc-foundation/goldens/tk-item-comment-gitlab-mr.json
index fa93a9c232f8..058313a23281 100644
--- a/mobile/rpc-foundation/goldens/tk-item-comment-gitlab-mr.json
+++ b/mobile/rpc-foundation/goldens/tk-item-comment-gitlab-mr.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-comment-gitlab-mr",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "cb696d402b8af2b9a54d4d6f9d85abfc12280e73b360196e55ec25530e610eee",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-comment-gitlab.json b/mobile/rpc-foundation/goldens/tk-item-comment-gitlab.json
index 1a5ed38fba36..3ebefe16c046 100644
--- a/mobile/rpc-foundation/goldens/tk-item-comment-gitlab.json
+++ b/mobile/rpc-foundation/goldens/tk-item-comment-gitlab.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-comment-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "d993b9f74cf8c5d7af8d31a73cf19d97141c54f6fcf009e98ca5b9106f3ba35b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-detail-github-reactions.json b/mobile/rpc-foundation/goldens/tk-item-detail-github-reactions.json
index cacb119145a1..3e5c3a69a395 100644
--- a/mobile/rpc-foundation/goldens/tk-item-detail-github-reactions.json
+++ b/mobile/rpc-foundation/goldens/tk-item-detail-github-reactions.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-detail-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c0ef16b959002e4a3c5347114a0844b95670e274ef010d910b6671ac5f49e783",
   "scenarioSha256": "885dafb68162f5777fc050af34dbe3443940d041a45bfb18c51dfcf433ed54f3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-detail-github.json b/mobile/rpc-foundation/goldens/tk-item-detail-github.json
index b76d7f939bbc..2cf15710591f 100644
--- a/mobile/rpc-foundation/goldens/tk-item-detail-github.json
+++ b/mobile/rpc-foundation/goldens/tk-item-detail-github.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-detail-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c0ef16b959002e4a3c5347114a0844b95670e274ef010d910b6671ac5f49e783",
   "scenarioSha256": "5fbff075d7da476f93c2a7da871c2afacc67822d1317acf6c23000195e2b2576",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-detail-gitlab-reactions.json b/mobile/rpc-foundation/goldens/tk-item-detail-gitlab-reactions.json
index 882f74d59a50..1e93f61396b9 100644
--- a/mobile/rpc-foundation/goldens/tk-item-detail-gitlab-reactions.json
+++ b/mobile/rpc-foundation/goldens/tk-item-detail-gitlab-reactions.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-detail-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c0ef16b959002e4a3c5347114a0844b95670e274ef010d910b6671ac5f49e783",
   "scenarioSha256": "c49d2df6c31f37c488ce9d29a801dd8ad0aa668ae380fc60b1f790ef508281d8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-detail-gitlab.json b/mobile/rpc-foundation/goldens/tk-item-detail-gitlab.json
index be7e2edb3b63..6ecbce878a2c 100644
--- a/mobile/rpc-foundation/goldens/tk-item-detail-gitlab.json
+++ b/mobile/rpc-foundation/goldens/tk-item-detail-gitlab.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-detail-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c0ef16b959002e4a3c5347114a0844b95670e274ef010d910b6671ac5f49e783",
   "scenarioSha256": "36bbd34ed8b8f67e516ce7cd230b01ab88f14369fda632037c46dbbd1a0d95a3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-detail-linear.json b/mobile/rpc-foundation/goldens/tk-item-detail-linear.json
index 380913445c81..95534639bb01 100644
--- a/mobile/rpc-foundation/goldens/tk-item-detail-linear.json
+++ b/mobile/rpc-foundation/goldens/tk-item-detail-linear.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-detail-linear",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c0ef16b959002e4a3c5347114a0844b95670e274ef010d910b6671ac5f49e783",
   "scenarioSha256": "f0407adc774b29553bdd177885e8ea9047127c4ebe8298de160a421fb4c1fe67",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-detail-metadata.json b/mobile/rpc-foundation/goldens/tk-item-detail-metadata.json
index ce9b3ae1bcff..448813184229 100644
--- a/mobile/rpc-foundation/goldens/tk-item-detail-metadata.json
+++ b/mobile/rpc-foundation/goldens/tk-item-detail-metadata.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-detail-metadata",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "58ea1553e04017c993aea4753aace41ee664705a3fdb3b18569c5a9d7968cf06",
   "scenarioSha256": "e6429c235d8c0b0376f71fea7b47c3b9ff22b850c92922b85ff993ae8b6cd6d0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-merge-gitlab.json b/mobile/rpc-foundation/goldens/tk-item-merge-gitlab.json
index d3baef6b3963..9f8de1556961 100644
--- a/mobile/rpc-foundation/goldens/tk-item-merge-gitlab.json
+++ b/mobile/rpc-foundation/goldens/tk-item-merge-gitlab.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-merge-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "28d8dfb15fec1ecaaa1c675c9c8c0cdc196e184a6884625c44dfe1f0f9fc8e7e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-metadata-github.json b/mobile/rpc-foundation/goldens/tk-item-metadata-github.json
index bbbd1651c602..b6da88a9d859 100644
--- a/mobile/rpc-foundation/goldens/tk-item-metadata-github.json
+++ b/mobile/rpc-foundation/goldens/tk-item-metadata-github.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-metadata-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "97cfbcd82778ed6517ca2d10b2f3ad5a8d366e380d7846c1e89d5a5baf17e739",
   "scenarioSha256": "010c65eaa056c5df0b867dd5b5851e206e8479e9fcce02515f1e326df4b8889c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-metadata-gitlab-mr.json b/mobile/rpc-foundation/goldens/tk-item-metadata-gitlab-mr.json
index 7f8ec31829ad..ea380eb5a059 100644
--- a/mobile/rpc-foundation/goldens/tk-item-metadata-gitlab-mr.json
+++ b/mobile/rpc-foundation/goldens/tk-item-metadata-gitlab-mr.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-metadata-gitlab-mr",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "97cfbcd82778ed6517ca2d10b2f3ad5a8d366e380d7846c1e89d5a5baf17e739",
   "scenarioSha256": "daa54da6cfb8d96c2a66c138beeaf70c764f96a60bdc84f2ff4cde80483cb365",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-metadata-gitlab.json b/mobile/rpc-foundation/goldens/tk-item-metadata-gitlab.json
index 58bc7c096be2..810e824ceec4 100644
--- a/mobile/rpc-foundation/goldens/tk-item-metadata-gitlab.json
+++ b/mobile/rpc-foundation/goldens/tk-item-metadata-gitlab.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-metadata-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "97cfbcd82778ed6517ca2d10b2f3ad5a8d366e380d7846c1e89d5a5baf17e739",
   "scenarioSha256": "4daf374f040e27836c154245d6a7fbad9ba3f6e6c0c9608218451286e4712d6b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-reply-merge.json b/mobile/rpc-foundation/goldens/tk-item-reply-merge.json
index 73bc7f81249c..c62f847e1126 100644
--- a/mobile/rpc-foundation/goldens/tk-item-reply-merge.json
+++ b/mobile/rpc-foundation/goldens/tk-item-reply-merge.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-reply-merge",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "b8e60092a29ea4944a891adc026444cc1da18c52221876f9e7c07b450b34cea8",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-review-github.json b/mobile/rpc-foundation/goldens/tk-item-review-github.json
index b1b262be655b..4deb1f092d16 100644
--- a/mobile/rpc-foundation/goldens/tk-item-review-github.json
+++ b/mobile/rpc-foundation/goldens/tk-item-review-github.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-review-github",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8f68885d57a9aa76d80ba0ee29a95bdbaa98cef29c79c68ce75d67202cde7bfe",
   "scenarioSha256": "3ba358ff7b6a95d9158257225483f77578dfa10c8643cdf89f8a81e0022997e9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-status-gitlab-mr.json b/mobile/rpc-foundation/goldens/tk-item-status-gitlab-mr.json
index 062ccc873ca4..b06650daa5af 100644
--- a/mobile/rpc-foundation/goldens/tk-item-status-gitlab-mr.json
+++ b/mobile/rpc-foundation/goldens/tk-item-status-gitlab-mr.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-status-gitlab-mr",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8c4218bfb2af227da5386f29989cec438f2c6187f39ce1c06859e136ea920bfa",
   "scenarioSha256": "5de4936aed0efd0d8bd5bc5ce893d561f6bc3d0fdf4a76c9e33e7cbefd6ec362",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-item-status-gitlab.json b/mobile/rpc-foundation/goldens/tk-item-status-gitlab.json
index fd64165dacc0..4b85268372e4 100644
--- a/mobile/rpc-foundation/goldens/tk-item-status-gitlab.json
+++ b/mobile/rpc-foundation/goldens/tk-item-status-gitlab.json
@@ -3,9 +3,9 @@
   "family": "tasks.item-status-gitlab",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "8c4218bfb2af227da5386f29989cec438f2c6187f39ce1c06859e136ea920bfa",
   "scenarioSha256": "85414544a9e8570567770b43e6bf5cfcc406c9b9b4ffed3a4ff0c8187beb7549",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-linear-connect.json b/mobile/rpc-foundation/goldens/tk-linear-connect.json
index 18f7e5a703c7..846d956b820e 100644
--- a/mobile/rpc-foundation/goldens/tk-linear-connect.json
+++ b/mobile/rpc-foundation/goldens/tk-linear-connect.json
@@ -3,9 +3,9 @@
   "family": "tasks.linear-connect",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "d1bd7ad9b647a50403953ba01d3a4bcccc5f4020c2aefa6146cca8c7688612c1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-linear-item.json b/mobile/rpc-foundation/goldens/tk-linear-item.json
index 94f30aad53d7..a53edae95990 100644
--- a/mobile/rpc-foundation/goldens/tk-linear-item.json
+++ b/mobile/rpc-foundation/goldens/tk-linear-item.json
@@ -3,9 +3,9 @@
   "family": "tasks.linear-item",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "97cfbcd82778ed6517ca2d10b2f3ad5a8d366e380d7846c1e89d5a5baf17e739",
   "scenarioSha256": "354eaff5243b3aae774c375aa303548d82c4db106a89ada39907d6654fa549b3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-linear-team-context.json b/mobile/rpc-foundation/goldens/tk-linear-team-context.json
index 3a9d12223974..3150b00e928f 100644
--- a/mobile/rpc-foundation/goldens/tk-linear-team-context.json
+++ b/mobile/rpc-foundation/goldens/tk-linear-team-context.json
@@ -3,9 +3,9 @@
   "family": "tasks.linear-team-context",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "58ea1553e04017c993aea4753aace41ee664705a3fdb3b18569c5a9d7968cf06",
   "scenarioSha256": "524c2421e61d663dd1344a47ab0552c3bb029ad09e0b6271eac91f1548e8265c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-list-gitlab-items.json b/mobile/rpc-foundation/goldens/tk-list-gitlab-items.json
index 2cb3ad010f47..9c91fd929cbe 100644
--- a/mobile/rpc-foundation/goldens/tk-list-gitlab-items.json
+++ b/mobile/rpc-foundation/goldens/tk-list-gitlab-items.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-list-gitlab-items",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "9b26b8f112021fe65c156b7d4067071551bcdab44a5858f8a933f7ace66e6f80",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-list-gitlab-todos.json b/mobile/rpc-foundation/goldens/tk-list-gitlab-todos.json
index c91195ed285b..579f12b4e0cc 100644
--- a/mobile/rpc-foundation/goldens/tk-list-gitlab-todos.json
+++ b/mobile/rpc-foundation/goldens/tk-list-gitlab-todos.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-list-gitlab-todos",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "ba91378284c5dc3dc470f0601e4ff0202622a8d1fb97f27ab45c096d65c0bb48",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-list-linear.json b/mobile/rpc-foundation/goldens/tk-list-linear.json
index e7c6cadf86f8..4d092d51f28c 100644
--- a/mobile/rpc-foundation/goldens/tk-list-linear.json
+++ b/mobile/rpc-foundation/goldens/tk-list-linear.json
@@ -3,9 +3,9 @@
   "family": "tasks.task-list-linear",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "216ddbf8cb71481d179563d8b033d7dc6cd71bface049e83073b977909776fc9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-project-board-load.json b/mobile/rpc-foundation/goldens/tk-project-board-load.json
index 95dda3e85e59..943dbd2171a6 100644
--- a/mobile/rpc-foundation/goldens/tk-project-board-load.json
+++ b/mobile/rpc-foundation/goldens/tk-project-board-load.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-board-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c4272385ed3b0de4feab38de9e4f6363ecd6317fdd4de47f76a98eb18abaf371",
   "scenarioSha256": "7840e811e81d3645f1c874b871158202a53432989f3b5c849df12550b082813b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-project-repo-slugs.json b/mobile/rpc-foundation/goldens/tk-project-repo-slugs.json
index f8a864be94fb..81ffe92128b1 100644
--- a/mobile/rpc-foundation/goldens/tk-project-repo-slugs.json
+++ b/mobile/rpc-foundation/goldens/tk-project-repo-slugs.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-repo-slugs",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "c4272385ed3b0de4feab38de9e4f6363ecd6317fdd4de47f76a98eb18abaf371",
   "scenarioSha256": "a83d5768892764af2dd6866f03d51c09aef63d1c5d3e0645bd5e1c16454b201f",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-project-row-comments-issue.json b/mobile/rpc-foundation/goldens/tk-project-row-comments-issue.json
index a97d889b08e0..949d1dbdbbc6 100644
--- a/mobile/rpc-foundation/goldens/tk-project-row-comments-issue.json
+++ b/mobile/rpc-foundation/goldens/tk-project-row-comments-issue.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-comments-issue",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55058202df36c8b951510215936e496ea88d3d71a6690090a13c52deb13e34e1",
   "scenarioSha256": "6f1bfb05a9df6482200bbab4400fd07a09955d47fcc468e1d2feda1ca9875aa1",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-project-row-comments-pr.json b/mobile/rpc-foundation/goldens/tk-project-row-comments-pr.json
index db2f313d3cb0..5c9d694994bb 100644
--- a/mobile/rpc-foundation/goldens/tk-project-row-comments-pr.json
+++ b/mobile/rpc-foundation/goldens/tk-project-row-comments-pr.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-comments-pr",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55058202df36c8b951510215936e496ea88d3d71a6690090a13c52deb13e34e1",
   "scenarioSha256": "e5ff558593fd32d66e6ba1722ebf54d50992c9c2b6db41ef2435b47972fbd0fd",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-project-row-detail.json b/mobile/rpc-foundation/goldens/tk-project-row-detail.json
index 9ad1bed21680..044028aef216 100644
--- a/mobile/rpc-foundation/goldens/tk-project-row-detail.json
+++ b/mobile/rpc-foundation/goldens/tk-project-row-detail.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-detail",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "f8f6e5d500f959b9b15c5498885a05422747880b6aef4ad795bc3064ebbacea6",
   "scenarioSha256": "f572b37cfd15f41f283e5f96b772a1055670f80e68064ac81477d9b768fc971a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-project-row-fields.json b/mobile/rpc-foundation/goldens/tk-project-row-fields.json
index e8e0c79551d9..55ad55163654 100644
--- a/mobile/rpc-foundation/goldens/tk-project-row-fields.json
+++ b/mobile/rpc-foundation/goldens/tk-project-row-fields.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-fields",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "370aeaee59978071ccb821da13c9e6114936c168947b608539cdb80d40cc9889",
   "scenarioSha256": "af54a351f4b79fff4a11948fc47a9f5194733065682ff96d6b46b9ae292e327e",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-project-row-files-merge.json b/mobile/rpc-foundation/goldens/tk-project-row-files-merge.json
index ff4723a8d9b6..67a69ea0393d 100644
--- a/mobile/rpc-foundation/goldens/tk-project-row-files-merge.json
+++ b/mobile/rpc-foundation/goldens/tk-project-row-files-merge.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-files-merge",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "b228732762828412ad3d9eec3ece00a897d866046e37044322c3911758d6e0a9",
   "scenarioSha256": "fef96700723edcf7d0a55ee05928a0293b8a28217b161cd3823437f3bc33b1ec",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-project-row-metadata-load.json b/mobile/rpc-foundation/goldens/tk-project-row-metadata-load.json
index 34ae983fc053..3904cef43117 100644
--- a/mobile/rpc-foundation/goldens/tk-project-row-metadata-load.json
+++ b/mobile/rpc-foundation/goldens/tk-project-row-metadata-load.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-metadata-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "f8f6e5d500f959b9b15c5498885a05422747880b6aef4ad795bc3064ebbacea6",
   "scenarioSha256": "60ea389fe16734fb53db01101f1feb4496653a99faa09e4309b3790a50d558d7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-project-row-review-checks.json b/mobile/rpc-foundation/goldens/tk-project-row-review-checks.json
index 4d2f7cedd476..da2395d92e52 100644
--- a/mobile/rpc-foundation/goldens/tk-project-row-review-checks.json
+++ b/mobile/rpc-foundation/goldens/tk-project-row-review-checks.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-review-checks",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "370aeaee59978071ccb821da13c9e6114936c168947b608539cdb80d40cc9889",
   "scenarioSha256": "08caec8e0ab5e674aabbf034ca88fc4a000c4b645ad6397afe6dc18db1f7c098",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-project-row-threads.json b/mobile/rpc-foundation/goldens/tk-project-row-threads.json
index f063728a2dc6..70ceddb80920 100644
--- a/mobile/rpc-foundation/goldens/tk-project-row-threads.json
+++ b/mobile/rpc-foundation/goldens/tk-project-row-threads.json
@@ -3,9 +3,9 @@
   "family": "tasks.project-row-threads",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "55058202df36c8b951510215936e496ea88d3d71a6690090a13c52deb13e34e1",
   "scenarioSha256": "815f55c0fb848fc9345a66bb7b71b1351f17e56129e005eb1776d6b47c831647",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tk-provider-load.json b/mobile/rpc-foundation/goldens/tk-provider-load.json
index 41c4151a95db..7d5ac795b308 100644
--- a/mobile/rpc-foundation/goldens/tk-provider-load.json
+++ b/mobile/rpc-foundation/goldens/tk-provider-load.json
@@ -3,9 +3,9 @@
   "family": "tasks.provider-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "07a15e900363faa25bc364f5bc1c330f96798abfeaed35210428c2ac558586b8",
   "scenarioSha256": "21b6272878cba5f2b41c89378c178933ffc9406fe69b9c693fc5021a265ef2c9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/transport-capability-probe-cutover-reasks-fast.json b/mobile/rpc-foundation/goldens/transport-capability-probe-cutover-reasks-fast.json
index 9efc1401dc5a..934a09b8de38 100644
--- a/mobile/rpc-foundation/goldens/transport-capability-probe-cutover-reasks-fast.json
+++ b/mobile/rpc-foundation/goldens/transport-capability-probe-cutover-reasks-fast.json
@@ -3,9 +3,9 @@
   "family": "transport.capability-probe",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "c5d28c2973881ae6cc94c7d8f6eef544046461f15e236634489afd272b5f1e6b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/transport-capability-probe-non-string-capabilities-drop.json b/mobile/rpc-foundation/goldens/transport-capability-probe-non-string-capabilities-drop.json
index 7c6278f2c1e9..f204e48c5006 100644
--- a/mobile/rpc-foundation/goldens/transport-capability-probe-non-string-capabilities-drop.json
+++ b/mobile/rpc-foundation/goldens/transport-capability-probe-non-string-capabilities-drop.json
@@ -3,9 +3,9 @@
   "family": "transport.capability-probe",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "95ef0a8b60bf92ef5c12a73f923dc143989b34374fb319f812fbaa58c79aa6a6",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/transport-capability-probe-publishes.json b/mobile/rpc-foundation/goldens/transport-capability-probe-publishes.json
index 7b95181477e4..6fe86b71a24a 100644
--- a/mobile/rpc-foundation/goldens/transport-capability-probe-publishes.json
+++ b/mobile/rpc-foundation/goldens/transport-capability-probe-publishes.json
@@ -3,9 +3,9 @@
   "family": "transport.capability-probe",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "6e0c3a784992e383a05ccfdf34e44e6f74ebd55ff17c4de0b05b2dfb4197c681",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/transport-capability-probe-refused-backs-off.json b/mobile/rpc-foundation/goldens/transport-capability-probe-refused-backs-off.json
index de9982d72418..7d1c70b77d9a 100644
--- a/mobile/rpc-foundation/goldens/transport-capability-probe-refused-backs-off.json
+++ b/mobile/rpc-foundation/goldens/transport-capability-probe-refused-backs-off.json
@@ -3,9 +3,9 @@
   "family": "transport.capability-probe",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "2ba1e1d70c98e2fd0d2d2dce6f68c11a186756f05207747e156375fc613940d7",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/transport-host-status-gates-drop-keeps-capabilities.json b/mobile/rpc-foundation/goldens/transport-host-status-gates-drop-keeps-capabilities.json
index 1089ca5ab44e..7e3d011ad973 100644
--- a/mobile/rpc-foundation/goldens/transport-host-status-gates-drop-keeps-capabilities.json
+++ b/mobile/rpc-foundation/goldens/transport-host-status-gates-drop-keeps-capabilities.json
@@ -3,9 +3,9 @@
   "family": "transport.host-status-gates",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "f25f444aca6cf768c602bf879e6b30235d1c4c0632636cfd245bd6e27959756b",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/transport-host-status-gates-ready.json b/mobile/rpc-foundation/goldens/transport-host-status-gates-ready.json
index 252865e32672..49826dee6bd7 100644
--- a/mobile/rpc-foundation/goldens/transport-host-status-gates-ready.json
+++ b/mobile/rpc-foundation/goldens/transport-host-status-gates-ready.json
@@ -3,9 +3,9 @@
   "family": "transport.host-status-gates",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "9c5095c24bdf5ab65d6387cc22b9984fee3aa7d5ce93d96bcb470944ac253f86",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/transport-host-status-gates-refused-degrades.json b/mobile/rpc-foundation/goldens/transport-host-status-gates-refused-degrades.json
index 441022fe73c5..a10131c2a39e 100644
--- a/mobile/rpc-foundation/goldens/transport-host-status-gates-refused-degrades.json
+++ b/mobile/rpc-foundation/goldens/transport-host-status-gates-refused-degrades.json
@@ -3,9 +3,9 @@
   "family": "transport.host-status-gates",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "a7871b5f1d37b0156970858d5a7fcab3105de7a8a6bfe827299a36f2b2ba5548",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/transport-pairing-race-both-refused.json b/mobile/rpc-foundation/goldens/transport-pairing-race-both-refused.json
index a34068407e8e..460002781fda 100644
--- a/mobile/rpc-foundation/goldens/transport-pairing-race-both-refused.json
+++ b/mobile/rpc-foundation/goldens/transport-pairing-race-both-refused.json
@@ -3,9 +3,9 @@
   "family": "transport.pairing-race",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "4f0ddbea3c08ea3e90f6e707215a4831f06aed408065b45d0771028d256d6b12",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/transport-pairing-race-direct-completes-first.json b/mobile/rpc-foundation/goldens/transport-pairing-race-direct-completes-first.json
index 0d8a414b2634..0413371cb08e 100644
--- a/mobile/rpc-foundation/goldens/transport-pairing-race-direct-completes-first.json
+++ b/mobile/rpc-foundation/goldens/transport-pairing-race-direct-completes-first.json
@@ -3,9 +3,9 @@
   "family": "transport.pairing-race",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "488173fa313295f97aa88fb4bf1944fdb655e37cfd2444e9d15515bd6ad82d95",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/transport-pairing-race-relay-completes-first.json b/mobile/rpc-foundation/goldens/transport-pairing-race-relay-completes-first.json
index a9b9b16d716c..f1bdfadf093d 100644
--- a/mobile/rpc-foundation/goldens/transport-pairing-race-relay-completes-first.json
+++ b/mobile/rpc-foundation/goldens/transport-pairing-race-relay-completes-first.json
@@ -3,9 +3,9 @@
   "family": "transport.pairing-race",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "dee9824e5ec32115fa7dfaaf223fc34c28d057a5526ac3dad42365543288a934",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/transport-pairing-race-relay-wins-when-direct-refused.json b/mobile/rpc-foundation/goldens/transport-pairing-race-relay-wins-when-direct-refused.json
index 3bcafbc64609..51c4c340c412 100644
--- a/mobile/rpc-foundation/goldens/transport-pairing-race-relay-wins-when-direct-refused.json
+++ b/mobile/rpc-foundation/goldens/transport-pairing-race-relay-wins-when-direct-refused.json
@@ -3,9 +3,9 @@
   "family": "transport.pairing-race",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "34b382b13fe75e8ef4002325287c95b3c4db62eeaaf3762af7fbaf6f836c2fa1",
   "scenarioSha256": "a34ffec446f9bbc465bd3f7d0a43166c9bc221a6ece8714e0b5717169625cf43",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-capabilities-advertised.json b/mobile/rpc-foundation/goldens/tw-capabilities-advertised.json
index b15d8ade815a..6cb44346bcd5 100644
--- a/mobile/rpc-foundation/goldens/tw-capabilities-advertised.json
+++ b/mobile/rpc-foundation/goldens/tw-capabilities-advertised.json
@@ -3,9 +3,9 @@
   "family": "worktree.runtime-capabilities",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "9d79bcfd6957d11d5ce8c3296f1038a3cfab81eedad7f990b44071104dfd0f91",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-capabilities-cutover-retried.json b/mobile/rpc-foundation/goldens/tw-capabilities-cutover-retried.json
index 208f268e6ed6..9c2c0ce90be7 100644
--- a/mobile/rpc-foundation/goldens/tw-capabilities-cutover-retried.json
+++ b/mobile/rpc-foundation/goldens/tw-capabilities-cutover-retried.json
@@ -3,9 +3,9 @@
   "family": "worktree.runtime-capabilities",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "fb9c0e4b7c34f9bd1bd355b606c6ba75a7583cff3788000b7ed013612f5574fe",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-capabilities-legacy-idempotency.json b/mobile/rpc-foundation/goldens/tw-capabilities-legacy-idempotency.json
index 28622ac30274..293d40543934 100644
--- a/mobile/rpc-foundation/goldens/tw-capabilities-legacy-idempotency.json
+++ b/mobile/rpc-foundation/goldens/tw-capabilities-legacy-idempotency.json
@@ -3,9 +3,9 @@
   "family": "worktree.runtime-capabilities",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "d73fed49e0a7e3e054d5c2fa75780f98bf78b6fa7e02f1ccb2fdc49465cf2fe5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-create-retry-agent-launched.json b/mobile/rpc-foundation/goldens/tw-create-retry-agent-launched.json
index 59b7d27d8b13..06897da697d2 100644
--- a/mobile/rpc-foundation/goldens/tw-create-retry-agent-launched.json
+++ b/mobile/rpc-foundation/goldens/tw-create-retry-agent-launched.json
@@ -3,11 +3,11 @@
   "family": "worktree.agent-launch-create",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
-  "scenarioSha256": "85595f5fdde16441d22bf07c14c65edda6cb90019d036aae2c5031d19664e66f",
+  "scenarioSha256": "d193972745f28b4a8da9b19176ba9825b7b6eb78f28802c6f6eea99e155fdfe6",
   "platform": "darwin",
   "scenarioVersion": 1,
   "projectionVersion": 2,
diff --git a/mobile/rpc-foundation/goldens/tw-create-retry-ambiguous-after-drop.json b/mobile/rpc-foundation/goldens/tw-create-retry-ambiguous-after-drop.json
index 9c76e077bb10..d0a290e02d5f 100644
--- a/mobile/rpc-foundation/goldens/tw-create-retry-ambiguous-after-drop.json
+++ b/mobile/rpc-foundation/goldens/tw-create-retry-ambiguous-after-drop.json
@@ -3,9 +3,9 @@
   "family": "worktree.create-retry",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "a99bb80a5826af1df8d74114fcc5654aa42c9208747b512cea9bd5ca65b64ccb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-create-retry-ambiguous-while-connected.json b/mobile/rpc-foundation/goldens/tw-create-retry-ambiguous-while-connected.json
index d00b0b880cba..705f673283ee 100644
--- a/mobile/rpc-foundation/goldens/tw-create-retry-ambiguous-while-connected.json
+++ b/mobile/rpc-foundation/goldens/tw-create-retry-ambiguous-while-connected.json
@@ -3,9 +3,9 @@
   "family": "worktree.create-retry",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "3cda09e4a4ad4092f5f9a48b7c9715a99a51eb3bc4bed00f7054537a9e21cea9",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-create-retry-ambiguous-without-idempotency.json b/mobile/rpc-foundation/goldens/tw-create-retry-ambiguous-without-idempotency.json
index adcbc451b5b9..a9ee18f5fd37 100644
--- a/mobile/rpc-foundation/goldens/tw-create-retry-ambiguous-without-idempotency.json
+++ b/mobile/rpc-foundation/goldens/tw-create-retry-ambiguous-without-idempotency.json
@@ -3,9 +3,9 @@
   "family": "worktree.create-retry",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "61097c13b262a4454510936fa9c9554a07865b610f18407f1b67bdd74476df08",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-create-retry-created.json b/mobile/rpc-foundation/goldens/tw-create-retry-created.json
index ee1d7dcb693f..3d401c51a144 100644
--- a/mobile/rpc-foundation/goldens/tw-create-retry-created.json
+++ b/mobile/rpc-foundation/goldens/tw-create-retry-created.json
@@ -3,9 +3,9 @@
   "family": "worktree.create-retry",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "0278216fee698c00118bb0e73a7fe755dc59c3b8e2b0459153edae64f155774c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-create-retry-name-collision.json b/mobile/rpc-foundation/goldens/tw-create-retry-name-collision.json
index b7d5495acf42..62b80b0b0f21 100644
--- a/mobile/rpc-foundation/goldens/tw-create-retry-name-collision.json
+++ b/mobile/rpc-foundation/goldens/tw-create-retry-name-collision.json
@@ -3,9 +3,9 @@
   "family": "worktree.create-retry",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "6cb658dadc9e146c4f36c6ce643451e72300b8cdda19cc684ffa9fb2b0822c0a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-create-retry-unretryable-refusal.json b/mobile/rpc-foundation/goldens/tw-create-retry-unretryable-refusal.json
index 274b8bda06be..7704fba5335d 100644
--- a/mobile/rpc-foundation/goldens/tw-create-retry-unretryable-refusal.json
+++ b/mobile/rpc-foundation/goldens/tw-create-retry-unretryable-refusal.json
@@ -3,9 +3,9 @@
   "family": "worktree.create-retry",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "16abe9e1a8d4cff17b3ea29d40277ae30a3d555a4a9efa08b2745c3a85b02740",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-create-retry-warning-kept.json b/mobile/rpc-foundation/goldens/tw-create-retry-warning-kept.json
index 9ad5aa3bf776..7e8f49a396ed 100644
--- a/mobile/rpc-foundation/goldens/tw-create-retry-warning-kept.json
+++ b/mobile/rpc-foundation/goldens/tw-create-retry-warning-kept.json
@@ -3,9 +3,9 @@
   "family": "worktree.create-retry",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "f469b2b7d61e7fc500fa97b5548f5a3732b0dbcdb405412a514a609f786dfbb5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-hosted-base-resolved.json b/mobile/rpc-foundation/goldens/tw-hosted-base-resolved.json
index 0e978694548e..ae16a8732858 100644
--- a/mobile/rpc-foundation/goldens/tw-hosted-base-resolved.json
+++ b/mobile/rpc-foundation/goldens/tw-hosted-base-resolved.json
@@ -3,9 +3,9 @@
   "family": "worktree.hosted-base",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "b3734c24f8a083d3efcdd995ea6a57e608d3d3ae3bbbd514db19dcf69448fa48",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-hosted-base-soft-error.json b/mobile/rpc-foundation/goldens/tw-hosted-base-soft-error.json
index 75a646647fb7..f0814a999a19 100644
--- a/mobile/rpc-foundation/goldens/tw-hosted-base-soft-error.json
+++ b/mobile/rpc-foundation/goldens/tw-hosted-base-soft-error.json
@@ -3,9 +3,9 @@
   "family": "worktree.hosted-base",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "451e74a430d2549976fa360a0e43e76a8d855b1470b8e313797019770ceca4cb",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-paste-lookup-resolved.json b/mobile/rpc-foundation/goldens/tw-paste-lookup-resolved.json
index c3f60a57aa06..9885cf5025e2 100644
--- a/mobile/rpc-foundation/goldens/tw-paste-lookup-resolved.json
+++ b/mobile/rpc-foundation/goldens/tw-paste-lookup-resolved.json
@@ -3,9 +3,9 @@
   "family": "tasks.paste-lookup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "81be14c5ec31045004465de4234d1f682f5946d6f8dac7a42263e285b1f24591",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-paste-lookup-slug-refused.json b/mobile/rpc-foundation/goldens/tw-paste-lookup-slug-refused.json
index aca8172e1097..ee51e1f7e208 100644
--- a/mobile/rpc-foundation/goldens/tw-paste-lookup-slug-refused.json
+++ b/mobile/rpc-foundation/goldens/tw-paste-lookup-slug-refused.json
@@ -3,9 +3,9 @@
   "family": "tasks.paste-lookup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "e9d85c576adf93063a8f56d49d28869c402cad38122732b46b8ec021d25db5e3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-paste-lookup-slug-unsupported.json b/mobile/rpc-foundation/goldens/tw-paste-lookup-slug-unsupported.json
index 74955710747a..be1437b65588 100644
--- a/mobile/rpc-foundation/goldens/tw-paste-lookup-slug-unsupported.json
+++ b/mobile/rpc-foundation/goldens/tw-paste-lookup-slug-unsupported.json
@@ -3,9 +3,9 @@
   "family": "tasks.paste-lookup",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "14509b4c1cc3beb00cc329b6bae46913f59b3938f76c0bd3bf3e374f34fb680d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-setup-hook-trust-always.json b/mobile/rpc-foundation/goldens/tw-setup-hook-trust-always.json
index 48be865c4bbc..1dc9de896728 100644
--- a/mobile/rpc-foundation/goldens/tw-setup-hook-trust-always.json
+++ b/mobile/rpc-foundation/goldens/tw-setup-hook-trust-always.json
@@ -3,9 +3,9 @@
   "family": "worktree.setup-hook-trust",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "0d2e3f48aadf45abbf6927b72ed5fef4caa8e3eb2efd1046339a3fbfab6f9f18",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-setup-hook-trust-approved.json b/mobile/rpc-foundation/goldens/tw-setup-hook-trust-approved.json
index 46eabfbdf676..29f6508a1023 100644
--- a/mobile/rpc-foundation/goldens/tw-setup-hook-trust-approved.json
+++ b/mobile/rpc-foundation/goldens/tw-setup-hook-trust-approved.json
@@ -3,9 +3,9 @@
   "family": "worktree.setup-hook-trust",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "f54f5c6dbbe7dbcf8e85e9bd36b27ca9bea7de65d5e35dabace49b3fc766a403",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-smart-search-all-providers.json b/mobile/rpc-foundation/goldens/tw-smart-search-all-providers.json
index f3b003ce3483..8efd95cbd83a 100644
--- a/mobile/rpc-foundation/goldens/tw-smart-search-all-providers.json
+++ b/mobile/rpc-foundation/goldens/tw-smart-search-all-providers.json
@@ -3,9 +3,9 @@
   "family": "tasks.smart-source-search",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "5d869d55848aea469954eb945ddc2b74f366387f8fc2853b7ae01de779208c4a",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-smart-search-gitlab-provider-error.json b/mobile/rpc-foundation/goldens/tw-smart-search-gitlab-provider-error.json
index 8e2e6cb67595..bc0034b9cf93 100644
--- a/mobile/rpc-foundation/goldens/tw-smart-search-gitlab-provider-error.json
+++ b/mobile/rpc-foundation/goldens/tw-smart-search-gitlab-provider-error.json
@@ -3,9 +3,9 @@
   "family": "tasks.smart-source-search",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "4537bf83f7a030521eec549adf4490da5be183471d5a9f9e58b71815b29481ff",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-smart-search-linear-listed.json b/mobile/rpc-foundation/goldens/tw-smart-search-linear-listed.json
index a25d83ee1836..732ba4a5fc75 100644
--- a/mobile/rpc-foundation/goldens/tw-smart-search-linear-listed.json
+++ b/mobile/rpc-foundation/goldens/tw-smart-search-linear-listed.json
@@ -3,9 +3,9 @@
   "family": "tasks.smart-source-search",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "52a76b7a830b32287bce14abbe1b9d9ac70e71eafe5b4c6801c2eb14a4150125",
   "scenarioSha256": "9681485eec93644a01dd6dff0d07f9629361a86989a900176c5aaff3d5805db3",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-task-preferences-resume-write.json b/mobile/rpc-foundation/goldens/tw-task-preferences-resume-write.json
index 82427615c204..ca77155f5df9 100644
--- a/mobile/rpc-foundation/goldens/tw-task-preferences-resume-write.json
+++ b/mobile/rpc-foundation/goldens/tw-task-preferences-resume-write.json
@@ -3,9 +3,9 @@
   "family": "settings-best-effort",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "d3b7f33d810e1fa420ac41a628cde9fe4a9e65fd57f89fbca0a40fc7d74951ab",
   "scenarioSha256": "31bfa49f888b0eb3f72873bf4a3af26129e78c23126e8fc8fe45b952caa60904",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-workspace-source-presets-refused.json b/mobile/rpc-foundation/goldens/tw-workspace-source-presets-refused.json
index 04e33feb424b..4b8acbb29730 100644
--- a/mobile/rpc-foundation/goldens/tw-workspace-source-presets-refused.json
+++ b/mobile/rpc-foundation/goldens/tw-workspace-source-presets-refused.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-source",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "2cd1e8972f226572744dad7da82afffbdf0452a121c1cd8c3334d5c3fde5d57c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-workspace-source-presets.json b/mobile/rpc-foundation/goldens/tw-workspace-source-presets.json
index 8e21063e68e8..d45a2618cd51 100644
--- a/mobile/rpc-foundation/goldens/tw-workspace-source-presets.json
+++ b/mobile/rpc-foundation/goldens/tw-workspace-source-presets.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-source",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "046dd3a125a3c9abcf5a0dd122818939b516adb91cbda2554b3409d4bb3a7980",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-workspace-sparse-missing-preset.json b/mobile/rpc-foundation/goldens/tw-workspace-sparse-missing-preset.json
index 5c1b3585a640..9a3a7e5b6b9c 100644
--- a/mobile/rpc-foundation/goldens/tw-workspace-sparse-missing-preset.json
+++ b/mobile/rpc-foundation/goldens/tw-workspace-sparse-missing-preset.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-sparse",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "865a659012dd882fd6073813585e2911a1d6252404fbf5a5e273f062b89fc91d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-workspace-sparse-saved.json b/mobile/rpc-foundation/goldens/tw-workspace-sparse-saved.json
index c67c5b1a1f0b..7dc69202c867 100644
--- a/mobile/rpc-foundation/goldens/tw-workspace-sparse-saved.json
+++ b/mobile/rpc-foundation/goldens/tw-workspace-sparse-saved.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-sparse",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "124f664e339bfd83a1d892e1cd953a78fdf0dc4b20c4272356d24079c72a3e04",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-workspace-ssh-connect-refused.json b/mobile/rpc-foundation/goldens/tw-workspace-ssh-connect-refused.json
index e3b6a3174681..58893ee59742 100644
--- a/mobile/rpc-foundation/goldens/tw-workspace-ssh-connect-refused.json
+++ b/mobile/rpc-foundation/goldens/tw-workspace-ssh-connect-refused.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-ssh",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "dd25391fdd3dc864ae493f72d013e789884a21e9c71522edc79323bc2b6c7f76",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-workspace-ssh-connected.json b/mobile/rpc-foundation/goldens/tw-workspace-ssh-connected.json
index f7500d9aa420..1683f8218d2b 100644
--- a/mobile/rpc-foundation/goldens/tw-workspace-ssh-connected.json
+++ b/mobile/rpc-foundation/goldens/tw-workspace-ssh-connected.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-ssh",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "495f51d9c2f7f3d71f53a53e88786b8d1f767a5bf66b8655c28222d2909a964c",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-workspace-ssh-local-agents.json b/mobile/rpc-foundation/goldens/tw-workspace-ssh-local-agents.json
index 7a39b9944316..16c4f4555c95 100644
--- a/mobile/rpc-foundation/goldens/tw-workspace-ssh-local-agents.json
+++ b/mobile/rpc-foundation/goldens/tw-workspace-ssh-local-agents.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-ssh-local",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "af0623c2d106d2ed18ef9149d4990539f9ed82146ae091a872a3e1d792efeffe",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/tw-workspace-ssh-not-ready.json b/mobile/rpc-foundation/goldens/tw-workspace-ssh-not-ready.json
index 08c4e096cc1f..7728d271c729 100644
--- a/mobile/rpc-foundation/goldens/tw-workspace-ssh-not-ready.json
+++ b/mobile/rpc-foundation/goldens/tw-workspace-ssh-not-ready.json
@@ -3,9 +3,9 @@
   "family": "tasks.workspace-ssh",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e567302ac8acffcfd602c9b323ecf8b5b7c0c4692bda1a4c881011a91d98979",
   "scenarioSha256": "3aa23f15da8fe9972e47c767db454b41750ca353ab10797082fde4514ffe9da0",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/worktree-catalog-snapshot-unreadable.json b/mobile/rpc-foundation/goldens/worktree-catalog-snapshot-unreadable.json
index 060217fcd79d..8ebe6cbfabbe 100644
--- a/mobile/rpc-foundation/goldens/worktree-catalog-snapshot-unreadable.json
+++ b/mobile/rpc-foundation/goldens/worktree-catalog-snapshot-unreadable.json
@@ -3,9 +3,9 @@
   "family": "worktree.catalog-snapshot",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e942ddfbaa0ba6bfc2993969276987f6528ac53765d125e99a830e261f93a8e",
   "scenarioSha256": "e28e66567389598edbc720c89f5af73b5beca836cd0357af235d8ddc3d29fbfc",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/worktree-catalog-snapshot.json b/mobile/rpc-foundation/goldens/worktree-catalog-snapshot.json
index ce2bf3643815..a4a8ae811e56 100644
--- a/mobile/rpc-foundation/goldens/worktree-catalog-snapshot.json
+++ b/mobile/rpc-foundation/goldens/worktree-catalog-snapshot.json
@@ -3,9 +3,9 @@
   "family": "worktree.catalog-snapshot",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e942ddfbaa0ba6bfc2993969276987f6528ac53765d125e99a830e261f93a8e",
   "scenarioSha256": "d2947158840576cbd0f0604ed3d37b0f446c63c6d439b4d1b7def7fe8524523d",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/worktree-home-catalog.json b/mobile/rpc-foundation/goldens/worktree-home-catalog.json
index d2c17d222171..3b2f9113feb3 100644
--- a/mobile/rpc-foundation/goldens/worktree-home-catalog.json
+++ b/mobile/rpc-foundation/goldens/worktree-home-catalog.json
@@ -3,9 +3,9 @@
   "family": "worktree.home-catalog",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e942ddfbaa0ba6bfc2993969276987f6528ac53765d125e99a830e261f93a8e",
   "scenarioSha256": "4749bb3b871275ba08f026f9b6bcfd383605f443e7bba70a7f89175b91db6fa5",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/goldens/worktree-retired-names.json b/mobile/rpc-foundation/goldens/worktree-retired-names.json
index 5910667bde27..2bbd621adcb3 100644
--- a/mobile/rpc-foundation/goldens/worktree-retired-names.json
+++ b/mobile/rpc-foundation/goldens/worktree-retired-names.json
@@ -3,9 +3,9 @@
   "family": "worktree.retired-names",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "lockfileSha256": "9317f3a98ab047f9f96fe26fd8531b8a632ac5954064b322f41a904148cbf6bb",
-  "recorderSha256": "f67c2f5b753d2a4f572599f6861fae8e6e917fe89ac75b58288f8e84be609d86",
+  "recorderSha256": "0317fe2aebe4743ce5e7ae194531aa91b4fe0a84df457640851fe6dfdb9362af",
   "adapterSha256": "4e942ddfbaa0ba6bfc2993969276987f6528ac53765d125e99a830e261f93a8e",
   "scenarioSha256": "2faa07ee5f12b3ed584117359d3b7aeb9c78a04e8fc49e753372f8c3927a3740",
   "platform": "darwin",
diff --git a/mobile/rpc-foundation/pilot-scenarios.json b/mobile/rpc-foundation/pilot-scenarios.json
index 839ed37616dd..647e4dcad018 100644
--- a/mobile/rpc-foundation/pilot-scenarios.json
+++ b/mobile/rpc-foundation/pilot-scenarios.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "baseline": "02a55944347346065453e179e071e64d9ae861dc",
+  "baseline": "ccdb324b63e4942891942edde1216586a51774bd",
   "scenarios": [
     {
       "id": "b1",
@@ -5939,7 +5939,7 @@
       "family": "worktree.agent-launch-create",
       "sites": [
         "mobile/src/tasks/worktree-create-retry.ts",
-        "mobile/src/tasks/agent-launch-worktree-create.ts"
+        "mobile/src/tasks/agent-launch-request.ts"
       ],
       "schedules": [],
       "steps": [
@@ -9382,37 +9382,78 @@
           "checkpoint": "pending"
         },
         {
-          "complete": "session.tabs.createTerminal#1",
+          "complete": "repo.list#1",
           "params": {
-            "worktree": "id:repo-9::/w",
-            "activate": false,
-            "select": true,
-            "navigation": "caller"
+            "$undefined": true
           },
           "reply": {
             "ok": true,
             "result": {
-              "tab": {
-                "id": "tab-1",
-                "type": "terminal",
-                "terminal": "term-1",
-                "title": "Agent"
+              "repos": [
+                {
+                  "id": "repo-9"
+                }
+              ]
+            }
+          }
+        },
+        {
+          "complete": "settings.get#1",
+          "params": {
+            "$undefined": true
+          },
+          "reply": {
+            "ok": true,
+            "result": {
+              "settings": {
+                "defaultTuiAgent": "codex",
+                "disabledTuiAgents": []
               }
             }
           }
         },
         {
-          "complete": "terminal.send#1",
+          "complete": "preflight.detectAgents#1",
           "params": {
-            "terminal": "term-1",
-            "text": "Fix the failing checks",
-            "enter": true
+            "$undefined": true
+          },
+          "reply": {
+            "ok": true,
+            "result": ["codex"]
+          }
+        },
+        {
+          "complete": "agent.launchReplay#1",
+          "params": {
+            "agent": "codex",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            },
+            "prompt": {
+              "text": "Fix the failing checks",
+              "delivery": "submit"
+            },
+            "launchSource": "task_page"
           },
           "reply": {
             "ok": true,
             "result": {
-              "send": {
-                "accepted": true
+              "outcome": {
+                "kind": "terminal",
+                "handle": "term-1"
+              },
+              "worktreeId": "repo-9::/w",
+              "receipt": {
+                "mode": "terminal",
+                "preferred": "terminal",
+                "reason": "user_default",
+                "detail": "Started a terminal agent, the default for new agent tabs in your settings."
+              },
+              "prompt": {
+                "delivery": "submit",
+                "outcome": "handed-to-terminal"
               }
             }
           }
@@ -9423,7 +9464,7 @@
       ]
     },
     {
-      "id": "pr-triage-send-locked",
+      "id": "pr-triage-prompt-not-delivered",
       "operation": "session.pr-triage-launch",
       "version": 1,
       "family": "session.pr-triage",
@@ -9435,48 +9476,89 @@
           "id": "launch"
         },
         {
-          "complete": "session.tabs.createTerminal#1",
+          "complete": "repo.list#1",
           "params": {
-            "worktree": "id:repo-9::/w",
-            "activate": false,
-            "select": true,
-            "navigation": "caller"
+            "$undefined": true
           },
           "reply": {
             "ok": true,
             "result": {
-              "tab": {
-                "id": "tab-1",
-                "type": "terminal",
-                "terminal": "term-1",
-                "title": "Agent"
+              "repos": [
+                {
+                  "id": "repo-9"
+                }
+              ]
+            }
+          }
+        },
+        {
+          "complete": "settings.get#1",
+          "params": {
+            "$undefined": true
+          },
+          "reply": {
+            "ok": true,
+            "result": {
+              "settings": {
+                "defaultTuiAgent": "codex",
+                "disabledTuiAgents": []
               }
             }
           }
         },
         {
-          "complete": "terminal.send#1",
+          "complete": "preflight.detectAgents#1",
           "params": {
-            "terminal": "term-1",
-            "text": "Fix the failing checks",
-            "enter": true
+            "$undefined": true
+          },
+          "reply": {
+            "ok": true,
+            "result": ["codex"]
+          }
+        },
+        {
+          "complete": "agent.launchReplay#1",
+          "params": {
+            "agent": "codex",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            },
+            "prompt": {
+              "text": "Fix the failing checks",
+              "delivery": "submit"
+            },
+            "launchSource": "task_page"
           },
           "reply": {
             "ok": true,
             "result": {
-              "send": {
-                "accepted": false
+              "outcome": {
+                "kind": "terminal",
+                "handle": "term-1"
+              },
+              "worktreeId": "repo-9::/w",
+              "receipt": {
+                "mode": "terminal",
+                "preferred": "terminal",
+                "reason": "user_default",
+                "detail": "Started a terminal agent, the default for new agent tabs in your settings."
+              },
+              "prompt": {
+                "delivery": "submit",
+                "outcome": "not-delivered"
               }
             }
           }
         },
         {
-          "checkpoint": "locked"
+          "checkpoint": "prompt-not-sent"
         }
       ]
     },
     {
-      "id": "pr-triage-invalid-terminal",
+      "id": "pr-triage-launch-unconfirmed",
       "operation": "session.pr-triage-launch",
       "version": 1,
       "family": "session.pr-triage",
@@ -9488,24 +9570,91 @@
           "id": "launch"
         },
         {
-          "complete": "session.tabs.createTerminal#1",
+          "complete": "repo.list#1",
           "params": {
-            "worktree": "id:repo-9::/w",
-            "activate": false,
-            "select": true,
-            "navigation": "caller"
+            "$undefined": true
           },
           "reply": {
             "ok": true,
             "result": {
-              "tab": {
-                "id": "tab-1"
+              "repos": [
+                {
+                  "id": "repo-9"
+                }
+              ]
+            }
+          }
+        },
+        {
+          "complete": "settings.get#1",
+          "params": {
+            "$undefined": true
+          },
+          "reply": {
+            "ok": true,
+            "result": {
+              "settings": {
+                "defaultTuiAgent": "codex",
+                "disabledTuiAgents": []
               }
             }
           }
         },
         {
-          "checkpoint": "invalid"
+          "complete": "preflight.detectAgents#1",
+          "params": {
+            "$undefined": true
+          },
+          "reply": {
+            "ok": true,
+            "result": ["codex"]
+          }
+        },
+        {
+          "complete": "agent.launchReplay#1",
+          "params": {
+            "agent": "codex",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "target": {
+              "kind": "existing",
+              "worktree": "id:repo-9::/w"
+            },
+            "prompt": {
+              "text": "Fix the failing checks",
+              "delivery": "submit"
+            },
+            "launchSource": "task_page"
+          },
+          "reply": {
+            "ok": false,
+            "error": {
+              "code": "agent_session_operation_unknown",
+              "message": "agent_session_operation_unknown"
+            }
+          }
+        },
+        {
+          "checkpoint": "unconfirmed"
+        }
+      ]
+    },
+    {
+      "id": "pr-triage-update-required",
+      "operation": "session.pr-triage-launch",
+      "version": 1,
+      "family": "session.pr-triage",
+      "sites": ["mobile/src/session/pr-ai-triage-launch.ts"],
+      "schedules": [],
+      "steps": [
+        {
+          "action": "launch",
+          "id": "launch",
+          "args": {
+            "legacyHost": true
+          }
+        },
+        {
+          "checkpoint": "update-required"
         }
       ]
     },
@@ -18657,7 +18806,7 @@
       ]
     },
     {
-      "id": "review-create-terminal-refused",
+      "id": "review-create-agent-refused",
       "operation": "session.diff-review-actions",
       "version": 1,
       "family": "session.diff-review-actions",
@@ -18675,18 +18824,66 @@
           "id": "create-and-send"
         },
         {
-          "complete": "session.tabs.createTerminal#1",
+          "complete": "repo.list#1",
           "params": {
-            "activate": false,
-            "navigation": "caller",
-            "select": true,
-            "worktree": "id:workspace-1"
+            "$undefined": true
+          },
+          "reply": {
+            "ok": true,
+            "result": {
+              "repos": [
+                {
+                  "id": "workspace-1"
+                }
+              ]
+            }
+          }
+        },
+        {
+          "complete": "settings.get#1",
+          "params": {
+            "$undefined": true
+          },
+          "reply": {
+            "ok": true,
+            "result": {
+              "settings": {
+                "defaultTuiAgent": null,
+                "disabledTuiAgents": []
+              }
+            }
+          }
+        },
+        {
+          "complete": "preflight.detectAgents#1",
+          "params": {
+            "$undefined": true
+          },
+          "reply": {
+            "ok": true,
+            "result": ["claude"]
+          }
+        },
+        {
+          "complete": "agent.launchReplay#1",
+          "params": {
+            "agent": "claude",
+            "operationId": "1767225600000-00000000000040008000000000000001",
+            "target": {
+              "kind": "existing",
+              "worktree": "id:workspace-1"
+            },
+            "prompt": {
+              "delivery": "submit",
+              "text": "You are reviewing the current worktree. Address the following mobile review notes.\n\nFile: src/app.ts\nLine: 4\nUser comment: \"needs a test\"\n\nAfter applying fixes:\n1. Summarize changed files.\n2. Run relevant tests.\n3. Tell me if anything remains risky."
+            },
+            "launchSource": "notes_send"
           },
           "reply": {
             "ok": false,
             "error": {
-              "code": "worktree_busy",
-              "message": "Workspace is busy"
+              "code": "selector_not_found",
+              "message": "Workspace not found"
             }
           }
         },
diff --git a/mobile/scripts/rpc-recording-pin-guard.mts b/mobile/scripts/rpc-recording-pin-guard.mts
index c7b11a484950..807893dcb285 100644
--- a/mobile/scripts/rpc-recording-pin-guard.mts
+++ b/mobile/scripts/rpc-recording-pin-guard.mts
@@ -1,10 +1,12 @@
 /**
  * Guards the two claims `mobile/rpc-foundation/goldens` makes about its pin.
  *
- * `ancestry`  — `baseline` names a commit in this history. A behaviour-change branch pins its own
- *               last fenced commit; that commit stops being reachable the moment the branch
- *               squash-merges, and nobody can run `--record` on main again until a hand-made repin
- *               lands. Ordinary product drift past a reachable pin is normal and is not a failure.
+ * `reachable` — `baseline` names a commit this repository keeps: one in this history, or one in
+ *               the head of a pull request GitHub associates with that commit. A behaviour-change
+ *               branch pins its own last fenced commit, which the squash leaves out of main's
+ *               history; `refs/pull/<n>/head` outlives the branch, so the pin stays checkable out.
+ *               GitHub only names the candidates; git's ancestry check decides. Ordinary product
+ *               drift past a kept pin is normal and is not a failure.
  * `reproduce` — the goldens on disk are what the recorder produces from the PINNED tree. The
  *               recording suites replay the corpus against the CURRENT tree on every run, which is
  *               the same claim only while the fenced tree still matches the pin.
@@ -17,6 +19,7 @@ import { join, resolve } from 'node:path'
 import { runProcess } from '../../src/shared/child-process/run-process.ts'
 import { RECORDING_DRIVERS } from '../src/test-support/rpc-recording/recording-drivers.ts'
 import { readScenarios } from '../src/test-support/rpc-recording/scenario-input.ts'
+import { checkPinReachable, PIN_MANIFEST } from './rpc-recording-pin-reachability.mts'
 
 /** The recorder is exempt from the fence, so a reproduction lays the candidate copy over the pin. */
 const RECORDER_OVERLAY = 'mobile/src/test-support/rpc-recording'
@@ -67,90 +70,11 @@ export function assertReproductionSuitesExist(root: string): void {
   }
 }
 
-export type PinAncestryFailure = 'shallow' | 'unreachable' | 'not-an-ancestor'
-export type PinAncestryVerdict =
-  | { ok: true; baseline: string; ref: string }
-  | { ok: false; baseline: string; ref: string; failure: PinAncestryFailure; message: string }
-
 async function git(cwd: string, args: readonly string[]) {
   return await runProcess({ program: 'git', args: [...args], cwd })
 }
 function readPinnedBaseline(root: string): string {
-  return readScenarios(resolve(root, 'mobile/rpc-foundation/pilot-scenarios.json')).baseline
-}
-export function repinInstruction(baseline: string, ref: string, cause: string): string {
-  return [
-    `The RPC recording corpus is pinned to a commit that ${cause}.`,
-    '',
-    `  baseline  ${baseline}   (mobile/rpc-foundation/pilot-scenarios.json)`,
-    `  head      ${ref}`,
-    '',
-    'Every golden under mobile/rpc-foundation/goldens claims it was recorded from that tree, and',
-    '`--record` refuses on any other tree, so the corpus cannot be refreshed until the pin names a',
-    'commit that is reachable from here. Repin and re-record, both in one commit:',
-    '',
-    `  git switch -c repin-rpc-recording ${ref}`,
-    `  # set "baseline" in mobile/rpc-foundation/pilot-scenarios.json to ${ref}`,
-    '  ORCA_BACKGROUND_LAUNCH=1 RPC_FOUNDATION_RECORD=1 \\',
-    '    pnpm --dir mobile exec tsx scripts/rpc-recording.mts --record',
-    '',
-    'Re-record everything: the repin rewrites the `baseline` header of every golden, so a partial',
-    'refresh leaves the corpus pinned to two different trees. See',
-    'mobile/src/test-support/rpc-recording/README.md, "Recording a behaviour change".'
-  ].join('\n')
-}
-const SHALLOW_MESSAGE = [
-  'Cannot judge the recording pin: this is a shallow clone.',
-  '',
-  '`git merge-base --is-ancestor` answers from grafted history, so it would report a verdict this',
-  'guard has no evidence for. Check out with `fetch-depth: 0`.'
-].join('\n')
-
-export async function checkPinAncestry(
-  root: string,
-  baseline: string,
-  ref: string
-): Promise<PinAncestryVerdict> {
-  const shallow = await git(root, ['rev-parse', '--is-shallow-repository'])
-  if (shallow.code !== 0) {
-    throw new Error(`Could not ask git whether the clone is shallow: ${shallow.stderr.trim()}`)
-  }
-  if (shallow.stdout.trim() !== 'false') {
-    return { ok: false, baseline, ref, failure: 'shallow', message: SHALLOW_MESSAGE }
-  }
-  const head = await git(root, ['rev-parse', '--verify', '--quiet', `${ref}^{commit}`])
-  if (head.code !== 0) {
-    throw new Error(`Cannot resolve ${ref} to a commit in this repository`)
-  }
-  // Resolved, because the instruction below is a command to paste: `HEAD` in it moves with whatever
-  // the reader has checked out by the time they read the log.
-  const resolved = head.stdout.trim()
-  const pinned = await git(root, ['rev-parse', '--verify', '--quiet', `${baseline}^{commit}`])
-  if (pinned.code !== 0) {
-    return {
-      ok: false,
-      baseline,
-      ref,
-      failure: 'unreachable',
-      message: repinInstruction(baseline, resolved, 'is not a commit in this repository at all')
-    }
-  }
-  const ancestor = await git(root, ['merge-base', '--is-ancestor', baseline, ref])
-  if (ancestor.code === 0) {
-    return { ok: true, baseline, ref }
-  }
-  // Why only 1: git reserves higher codes for real errors, and treating one as "not an ancestor"
-  // would turn a broken repository into a repin instruction nobody can act on.
-  if (ancestor.code !== 1) {
-    throw new Error(`git merge-base --is-ancestor failed: ${ancestor.stderr.trim()}`)
-  }
-  return {
-    ok: false,
-    baseline,
-    ref,
-    failure: 'not-an-ancestor',
-    message: repinInstruction(baseline, resolved, 'is not an ancestor of this commit')
-  }
+  return readScenarios(resolve(root, PIN_MANIFEST)).baseline
 }
 
 /** Whether anything a reproduction reads from the candidate tree moved since `since`. */
@@ -284,18 +208,22 @@ async function main(argv: readonly string[]): Promise<void> {
   const check = argv[0]
   const root = resolve(import.meta.dirname, '../..')
   const baseline = readPinnedBaseline(root)
-  if (check === 'ancestry') {
+  if (check === 'reachable') {
     const ref = argv.includes('--ref') ? argv[argv.indexOf('--ref') + 1] : 'HEAD'
     if (!ref) {
       throw new Error('--ref needs a commit')
     }
-    const verdict = await checkPinAncestry(root, baseline, ref)
+    const verdict = await checkPinReachable(root, baseline, ref)
     if (!verdict.ok) {
       process.stderr.write(`${verdict.message}\n`)
       process.exitCode = 1
       return
     }
-    process.stdout.write(`Recording pin ${baseline} is an ancestor of ${ref}.\n`)
+    process.stdout.write(
+      verdict.pullRequest === null
+        ? `Recording pin ${baseline} is an ancestor of ${ref}.\n`
+        : `Recording pin ${baseline} is kept by refs/pull/${verdict.pullRequest}/head.\n`
+    )
     return
   }
   if (check === 'reproduce') {
@@ -313,6 +241,13 @@ async function main(argv: readonly string[]): Promise<void> {
         return
       }
     }
+    // Also fetches a pin that only its pull request's head still holds, so the checkout can find it.
+    const verdict = await checkPinReachable(root, baseline, 'HEAD')
+    if (!verdict.ok) {
+      process.stderr.write(`${verdict.message}\n`)
+      process.exitCode = 1
+      return
+    }
     if (!(await reproduceFromPin(root, baseline))) {
       process.stderr.write(`\n${REPRODUCTION_FAILURE}\n`)
       process.exitCode = 1
@@ -322,7 +257,7 @@ async function main(argv: readonly string[]): Promise<void> {
     return
   }
   throw new Error(
-    'Usage: rpc-recording-pin-guard.mts ancestry [--ref <commit>]\n     | reproduce [--if-changed-since <commit>]'
+    'Usage: rpc-recording-pin-guard.mts reachable [--ref <commit>]\n     | reproduce [--if-changed-since <commit>]'
   )
 }
 
diff --git a/mobile/scripts/rpc-recording-pin-guard.test.ts b/mobile/scripts/rpc-recording-pin-guard.test.ts
index e6154d51c2c8..616034d72b12 100644
--- a/mobile/scripts/rpc-recording-pin-guard.test.ts
+++ b/mobile/scripts/rpc-recording-pin-guard.test.ts
@@ -1,16 +1,21 @@
 import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { dirname, join, resolve } from 'node:path'
-import { afterAll, describe, expect, it } from 'vitest'
+import { afterAll, afterEach, describe, expect, it, vi } from 'vitest'
 import { runProcess } from '../../src/shared/child-process/run-process'
 import {
   assertReproductionSuitesExist,
-  checkPinAncestry,
   corpusProvenanceChanged,
   removeScratchWorktree,
-  repinInstruction,
   REPRODUCTION_SUITES
 } from './rpc-recording-pin-guard.mts'
+import {
+  checkPinReachable,
+  gitHubRepositoryFromRemote,
+  PIN_MANIFEST,
+  pullRequestsWithCommit,
+  repinInstruction
+} from './rpc-recording-pin-reachability.mts'
 
 const scratch: string[] = []
 async function git(cwd: string, ...args: string[]): Promise<string> {
@@ -54,6 +59,50 @@ async function seedProvenance(repository: string): Promise<string> {
   return await commitAt(repository, RECORDER_FILE, 'recorder')
 }
 const MISSING_SHA = '0123456789abcdef0123456789abcdef01234567'
+function pinManifest(baseline: string): string {
+  return JSON.stringify({ baseline, scenarios: [] })
+}
+/**
+ * A behaviour-change branch that pinned its own commit, squash-merged onto main, with the host
+ * keeping the branch head at `refs/pull/7/head` the way GitHub does after the branch is gone.
+ */
+async function squashMergedPin(change: string, subject = `${change} (#7)`) {
+  const work = await throwawayRepository()
+  await commit(work, 'one')
+  await git(work, 'switch', '--quiet', '--create', 'behaviour-change')
+  const branchPin = await commit(work, change)
+  await commitAt(work, PIN_MANIFEST, pinManifest(branchPin))
+  await git(work, 'switch', '--quiet', 'main')
+  await git(work, 'merge', '--quiet', '--squash', 'behaviour-change')
+  await git(work, 'commit', '--quiet', '--no-verify', '--message', subject)
+  const remote = join(work, '..', 'remote.git')
+  await git(work, 'init', '--quiet', '--bare', remote)
+  await git(work, 'push', '--quiet', remote, 'main', 'behaviour-change:refs/pull/7/head')
+  await git(work, 'branch', '--quiet', '-D', 'behaviour-change')
+  return { work, remote, branchPin }
+}
+async function cloneMain(remote: string): Promise<string> {
+  const clone = join(remote, '..', `clone-${scratch.length}-${Date.now()}`)
+  await git(
+    join(remote, '..'),
+    'clone',
+    '--quiet',
+    '--single-branch',
+    '--branch',
+    'main',
+    remote,
+    clone
+  )
+  await git(clone, 'config', 'user.email', 'pin-guard@example.invalid')
+  await git(clone, 'config', 'user.name', 'Pin Guard')
+  return clone
+}
+// Stand-ins for GitHub's "pull requests associated with this commit" answer.
+const heldByPullRequest7 = async () => [7]
+const heldByNoPullRequest = async () => []
+const unasked = async (): Promise<number[]> => {
+  throw new Error('a pin in this history must not send the guard to GitHub')
+}
 
 // File scope, not per-suite: a suite-local hook fires before the later suites have made theirs.
 afterAll(async () => {
@@ -62,18 +111,18 @@ afterAll(async () => {
   }
 })
 
-describe('recording pin ancestry', () => {
+describe('recording pin reachability', () => {
   it('passes when the pin is the commit itself', async () => {
     const repository = await throwawayRepository()
     const first = await commit(repository, 'one')
-    expect(await checkPinAncestry(repository, first, first)).toMatchObject({ ok: true })
+    expect(await checkPinReachable(repository, first, first, unasked)).toMatchObject({ ok: true })
   })
 
   it('passes on ordinary drift: the tree has moved on, the pin is still reachable', async () => {
     const repository = await throwawayRepository()
     const pin = await commit(repository, 'one')
     const head = await commit(repository, 'two')
-    expect(await checkPinAncestry(repository, pin, head)).toMatchObject({ ok: true })
+    expect(await checkPinReachable(repository, pin, head, unasked)).toMatchObject({ ok: true })
   })
 
   it('passes on a branch that pinned its own commit, judged against that branch', async () => {
@@ -82,7 +131,9 @@ describe('recording pin ancestry', () => {
     await git(repository, 'switch', '--quiet', '--create', 'behaviour-change')
     const branchPin = await commit(repository, 'two')
     const branchHead = await commit(repository, 'three')
-    expect(await checkPinAncestry(repository, branchPin, branchHead)).toMatchObject({ ok: true })
+    expect(await checkPinReachable(repository, branchPin, branchHead, unasked)).toMatchObject({
+      ok: true
+    })
   })
 
   it('passes a branch cut before main repinned, judged against the merge preview', async () => {
@@ -98,29 +149,115 @@ describe('recording pin ancestry', () => {
     await git(repository, 'merge', '--quiet', '--no-edit', 'main')
     const preview = await git(repository, 'rev-parse', 'HEAD')
     // The preview is the tree CI checks out and reads the pin from, so it is the tree to judge.
-    expect(await checkPinAncestry(repository, mainPin, preview)).toMatchObject({ ok: true })
+    expect(await checkPinReachable(repository, mainPin, preview, unasked)).toMatchObject({
+      ok: true
+    })
     // The head sha would have failed this ordinary branch, and told the author to repin to it.
-    expect(await checkPinAncestry(repository, mainPin, branchHead)).toMatchObject({
+    expect(
+      await checkPinReachable(repository, mainPin, branchHead, heldByNoPullRequest)
+    ).toMatchObject({
       ok: false,
       failure: 'not-an-ancestor'
     })
   })
 
-  it('fails once that branch squash-merges and the pin leaves the history', async () => {
+  it('passes once that branch squash-merges, through the head its pull request keeps', async () => {
+    const { remote, branchPin } = await squashMergedPin('two')
+    // Only main: the branch is deleted, so the pin is nowhere in this clone until it is fetched.
+    const clone = await cloneMain(remote)
+    expect(await checkPinReachable(clone, branchPin, 'HEAD', heldByPullRequest7)).toMatchObject({
+      ok: true,
+      pullRequest: 7
+    })
+    const drifted = await commit(clone, 'later product change on main')
+    expect(await checkPinReachable(clone, branchPin, drifted, heldByPullRequest7)).toMatchObject({
+      ok: true,
+      pullRequest: 7
+    })
+    // The reproduction checks the pinned tree out next, which needs the fetched commit.
+    await git(clone, 'cat-file', '-e', `${branchPin}^{commit}`)
+  })
+
+  it('passes a branch opened after that squash, judged against its merge preview', async () => {
+    const { remote, branchPin } = await squashMergedPin('two')
+    const clone = await cloneMain(remote)
+    await git(clone, 'switch', '--quiet', '--create', 'later-branch')
+    await commitAt(clone, 'mobile/src/later.ts', 'later branch change')
+    await git(clone, 'switch', '--quiet', '--detach', 'main')
+    await commit(clone, 'main moved on')
+    await git(clone, 'merge', '--quiet', '--no-ff', '--no-edit', 'later-branch')
+    expect(await checkPinReachable(clone, branchPin, 'HEAD', heldByPullRequest7)).toMatchObject({
+      ok: true,
+      pullRequest: 7
+    })
+  })
+
+  it('passes a squash whose edited title lost its (#n), since GitHub names the pull request', async () => {
+    const { remote, branchPin } = await squashMergedPin('two', 'two, title edited at merge')
+    const clone = await cloneMain(remote)
+    expect(await checkPinReachable(clone, branchPin, 'HEAD', heldByPullRequest7)).toMatchObject({
+      ok: true,
+      pullRequest: 7
+    })
+  })
+
+  it('passes through the first associated pull request whose head holds the pin', async () => {
+    const { remote, branchPin, work } = await squashMergedPin('two')
+    await git(work, 'push', '--quiet', remote, 'main:refs/pull/9/head')
+    const clone = await cloneMain(remote)
+    expect(await checkPinReachable(clone, branchPin, 'HEAD', async () => [9, 7])).toMatchObject({
+      ok: true,
+      pullRequest: 7
+    })
+  })
+
+  it('fails the merge preview of a branch whose rebase dropped the commit it pinned', async () => {
+    const { remote } = await squashMergedPin('two')
+    const clone = await cloneMain(remote)
+    await git(clone, 'switch', '--quiet', '--create', 'rebased')
+    const droppedPin = await commit(clone, 'three')
+    await commitAt(clone, PIN_MANIFEST, pinManifest(droppedPin))
+    await git(clone, 'switch', '--quiet', 'main')
+    await commitAt(clone, 'mobile/src/moved.ts', 'main moved on')
+    // The rebase rewrites both commits; the manifest still names the one that is gone.
+    await git(clone, 'rebase', '--quiet', 'main', 'rebased')
+    await git(clone, 'switch', '--quiet', '--detach', 'main')
+    await git(clone, 'merge', '--quiet', '--no-ff', '--no-edit', 'rebased')
+    // Caught on the pull request: after the squash no head would hold the pin either.
+    const verdict = await checkPinReachable(clone, droppedPin, 'HEAD', heldByNoPullRequest)
+    expect(verdict).toMatchObject({ ok: false, failure: 'not-an-ancestor' })
+    expect(verdict.ok ? '' : verdict.message).toContain('GitHub associates no pull request')
+  })
+
+  it("fails when the pull request's head no longer holds the pin", async () => {
+    const { remote, branchPin, work } = await squashMergedPin('two')
+    // A force-push after pinning: the pin is left in no ref the host keeps.
+    await git(work, 'push', '--quiet', '--force', remote, 'main:refs/pull/7/head')
+    await git(work, 'push', '--quiet', remote, `${branchPin}:refs/heads/stray`)
+    const clone = await cloneMain(remote)
+    await git(clone, 'fetch', '--quiet', 'origin', 'stray')
+    const verdict = await checkPinReachable(clone, branchPin, 'HEAD', heldByPullRequest7)
+    expect(verdict).toMatchObject({ ok: false, failure: 'not-an-ancestor' })
+    expect(verdict.ok ? '' : verdict.message).toContain('refs/pull/7/head')
+  })
+
+  it('fails once that branch squash-merges if GitHub associates no pull request with it', async () => {
     const repository = await throwawayRepository()
     const base = await commit(repository, 'one')
     await git(repository, 'switch', '--quiet', '--create', 'behaviour-change')
     const branchPin = await commit(repository, 'two')
     await git(repository, 'switch', '--quiet', 'main')
     await git(repository, 'reset', '--quiet', '--hard', base)
+    await commitAt(repository, PIN_MANIFEST, pinManifest(branchPin))
     const squashed = await commit(repository, 'two, squashed')
-    const verdict = await checkPinAncestry(repository, branchPin, squashed)
+    const verdict = await checkPinReachable(repository, branchPin, squashed, heldByNoPullRequest)
     expect(verdict).toMatchObject({ ok: false, failure: 'not-an-ancestor' })
     expect(verdict.ok).toBe(false)
     if (verdict.ok) {
       return
     }
     expect(verdict.message).toContain(branchPin)
+    expect(verdict.message).toContain('GitHub associates no pull request')
     expect(verdict.message).toContain('scripts/rpc-recording.mts --record')
     expect(verdict.message).toContain('mobile/rpc-foundation/pilot-scenarios.json')
   })
@@ -128,11 +265,22 @@ describe('recording pin ancestry', () => {
   it('fails with the same instruction when the pin is no commit at all', async () => {
     const repository = await throwawayRepository()
     const head = await commit(repository, 'one')
-    const verdict = await checkPinAncestry(repository, MISSING_SHA, head)
+    const verdict = await checkPinReachable(repository, MISSING_SHA, head, heldByNoPullRequest)
     expect(verdict).toMatchObject({ ok: false, failure: 'unreachable' })
     expect(verdict.ok ? '' : verdict.message).toContain('scripts/rpc-recording.mts --record')
   })
 
+  it('lets a failed GitHub lookup propagate, never a pass or a repin instruction', async () => {
+    const { remote, branchPin } = await squashMergedPin('two')
+    const clone = await cloneMain(remote)
+    const broken = async (): Promise<number[]> => {
+      throw new Error('GitHub answered 502')
+    }
+    await expect(checkPinReachable(clone, branchPin, 'HEAD', broken)).rejects.toThrow(
+      'GitHub answered 502'
+    )
+  })
+
   it('refuses to answer on a shallow clone instead of trusting grafted history', async () => {
     const repository = await throwawayRepository()
     const pin = await commit(repository, 'one')
@@ -141,19 +289,74 @@ describe('recording pin ancestry', () => {
     const clone = join(repository, '..', 'shallow')
     await git(repository, 'clone', '--quiet', '--depth', '1', `file://${repository}`, clone)
     // The pin is real and reachable in the full repository; only the missing history hides it.
-    expect(await checkPinAncestry(repository, pin, head)).toMatchObject({ ok: true })
-    const verdict = await checkPinAncestry(clone, pin, 'HEAD')
+    expect(await checkPinReachable(repository, pin, head, unasked)).toMatchObject({ ok: true })
+    const verdict = await checkPinReachable(clone, pin, 'HEAD', unasked)
     expect(verdict).toMatchObject({ ok: false, failure: 'shallow' })
     expect(verdict.ok ? '' : verdict.message).toContain('fetch-depth: 0')
   })
 
   it('names the head and the pin in the instruction', () => {
     expect(
-      repinInstruction('a'.repeat(40), 'b'.repeat(40), 'is not an ancestor of this commit')
+      repinInstruction('a'.repeat(40), 'b'.repeat(40), 'is not a commit in this repository at all')
     ).toContain(`git switch -c repin-rpc-recording ${'b'.repeat(40)}`)
   })
 })
 
+describe("GitHub's pull requests for a pinned commit", () => {
+  const pin = 'a'.repeat(40)
+  const answer = (status: number, body: unknown) =>
+    vi.fn(async () => new Response(JSON.stringify(body), { status }))
+  afterEach(() => {
+    vi.unstubAllGlobals()
+    vi.unstubAllEnvs()
+  })
+
+  it('asks with the token when one is set and reads the pull request numbers', async () => {
+    vi.stubEnv('GITHUB_REPOSITORY', 'stablyai/orca')
+    vi.stubEnv('GITHUB_TOKEN', 'test-token')
+    const fetch = answer(200, [{ number: 22762 }, { number: 5 }])
+    vi.stubGlobal('fetch', fetch)
+    expect(await pullRequestsWithCommit('/unused', pin)).toEqual([22762, 5])
+    expect(fetch).toHaveBeenCalledWith(
+      `https://api.github.com/repos/stablyai/orca/commits/${pin}/pulls`,
+      expect.objectContaining({
+        headers: {
+          Accept: 'application/vnd.github+json',
+          Authorization: 'Bearer test-token'
+        }
+      })
+    )
+  })
+
+  it('reads no pull request for a commit GitHub has never seen', async () => {
+    vi.stubEnv('GITHUB_REPOSITORY', 'stablyai/orca')
+    vi.stubGlobal('fetch', answer(422, { message: `No commit found for SHA: ${pin}` }))
+    expect(await pullRequestsWithCommit('/unused', pin)).toEqual([])
+  })
+
+  it('names the rate limit when GitHub refuses a call made without a token', async () => {
+    vi.stubEnv('GITHUB_REPOSITORY', 'stablyai/orca')
+    vi.stubEnv('GITHUB_TOKEN', '')
+    vi.stubEnv('GH_TOKEN', '')
+    vi.stubGlobal('fetch', answer(403, { message: 'API rate limit exceeded' }))
+    await expect(pullRequestsWithCommit('/unused', pin)).rejects.toThrow(
+      /answered 403[\s\S]*API rate limit exceeded[\s\S]*set GITHUB_TOKEN or GH_TOKEN/
+    )
+  })
+
+  it('reads owner and repo from https and ssh remotes, and nothing from another host', () => {
+    expect(gitHubRepositoryFromRemote('https://github.com/stablyai/orca.git\n')).toBe(
+      'stablyai/orca'
+    )
+    expect(gitHubRepositoryFromRemote('https://github.com/stablyai/orca')).toBe('stablyai/orca')
+    expect(gitHubRepositoryFromRemote('git@github.com:stablyai/orca.git')).toBe('stablyai/orca')
+    expect(gitHubRepositoryFromRemote('ssh://git@github.com/stablyai/orca.git')).toBe(
+      'stablyai/orca'
+    )
+    expect(gitHubRepositoryFromRemote('/tmp/remote.git')).toBeNull()
+  })
+})
+
 describe('what a reproduction reads from the candidate tree', () => {
   it('skips the run when only product sources moved', async () => {
     const repository = await throwawayRepository()
diff --git a/mobile/scripts/rpc-recording-pin-reachability.mts b/mobile/scripts/rpc-recording-pin-reachability.mts
new file mode 100644
index 000000000000..c7ec31ccfb12
--- /dev/null
+++ b/mobile/scripts/rpc-recording-pin-reachability.mts
@@ -0,0 +1,204 @@
+/**
+ * Whether the RPC recording pin names a commit this repository keeps: one in this history, or one in
+ * the head of a pull request that GitHub associates with the pinned commit.
+ */
+import { runProcess } from '../../src/shared/child-process/run-process.ts'
+
+export const PIN_MANIFEST = 'mobile/rpc-foundation/pilot-scenarios.json'
+const PIN_REMOTE = 'origin'
+const PIN_FETCH_TIMEOUT_MS = 180_000
+const PULL_REQUEST_LOOKUP_TIMEOUT_MS = 30_000
+
+export type PinReachabilityFailure = 'shallow' | 'unreachable' | 'not-an-ancestor'
+export type PinReachabilityVerdict =
+  | { ok: true; baseline: string; ref: string; pullRequest: number | null }
+  | { ok: false; baseline: string; ref: string; failure: PinReachabilityFailure; message: string }
+/** Only nominates pull requests; git's ancestry check decides, so a wrong answer can only fail. */
+export type PullRequestLookup = (root: string, commit: string) => Promise<number[]>
+
+async function git(cwd: string, args: readonly string[], timeoutMs?: number) {
+  return await runProcess({ program: 'git', args: [...args], cwd, timeoutMs })
+}
+function failureDetail(result: { stderr: string; timedOut: boolean }, timeoutMs: number): string {
+  return result.timedOut ? `timed out after ${timeoutMs / 1000}s` : result.stderr.trim()
+}
+export function repinInstruction(baseline: string, ref: string, cause: string): string {
+  return [
+    `The RPC recording corpus is pinned to a commit that ${cause}.`,
+    '',
+    `  baseline  ${baseline}   (mobile/rpc-foundation/pilot-scenarios.json)`,
+    `  head      ${ref}`,
+    '',
+    'Every golden under mobile/rpc-foundation/goldens claims it was recorded from that tree, and',
+    '`--record` refuses on any other tree, so the corpus cannot be refreshed until the pin names a',
+    'commit that is reachable from here. Repin and re-record, both in one commit:',
+    '',
+    `  git switch -c repin-rpc-recording ${ref}`,
+    `  # set "baseline" in mobile/rpc-foundation/pilot-scenarios.json to ${ref}`,
+    '  ORCA_BACKGROUND_LAUNCH=1 RPC_FOUNDATION_RECORD=1 \\',
+    '    pnpm --dir mobile exec tsx scripts/rpc-recording.mts --record',
+    '',
+    'Re-record everything: the repin rewrites the `baseline` header of every golden, so a partial',
+    'refresh leaves the corpus pinned to two different trees. See',
+    'mobile/src/test-support/rpc-recording/README.md, "Recording a behaviour change".'
+  ].join('\n')
+}
+const SHALLOW_MESSAGE = [
+  'Cannot judge the recording pin: this is a shallow clone.',
+  '',
+  '`git merge-base --is-ancestor` answers from grafted history, so it would report a verdict this',
+  'guard has no evidence for. Check out with `fetch-depth: 0`.'
+].join('\n')
+
+async function isAncestor(root: string, commit: string, of: string): Promise<boolean> {
+  const ancestor = await git(root, ['merge-base', '--is-ancestor', commit, of])
+  // Why only 0 and 1: git reserves higher codes for real errors, and treating one as "not an
+  // ancestor" would turn a broken repository into a repin instruction nobody can act on.
+  if (ancestor.code !== 0 && ancestor.code !== 1) {
+    throw new Error(`git merge-base --is-ancestor failed: ${ancestor.stderr.trim()}`)
+  }
+  return ancestor.code === 0
+}
+
+/** `owner/repo` from a GitHub remote URL, https or ssh. */
+export function gitHubRepositoryFromRemote(url: string): string | null {
+  const match = /github\.com[:/]([^/\s]+)\/([^/\s]+?)(?:\.git)?\/?$/.exec(url.trim())
+  return match ? `${match[1]}/${match[2]}` : null
+}
+async function gitHubRepository(root: string): Promise<string> {
+  if (process.env.GITHUB_REPOSITORY) {
+    return process.env.GITHUB_REPOSITORY
+  }
+  const remote = await git(root, ['remote', 'get-url', PIN_REMOTE])
+  const repository = remote.code === 0 ? gitHubRepositoryFromRemote(remote.stdout) : null
+  if (!repository) {
+    throw new Error(
+      `Cannot tell which GitHub repository ${PIN_REMOTE} is ` +
+        `(${remote.stdout.trim() || remote.stderr.trim()}); set GITHUB_REPOSITORY=<owner>/<repo>`
+    )
+  }
+  return repository
+}
+
+/** The pull requests GitHub associates with `commit`, whatever the squash title says. */
+export async function pullRequestsWithCommit(root: string, commit: string): Promise<number[]> {
+  const url = `https://api.github.com/repos/${await gitHubRepository(root)}/commits/${commit}/pulls`
+  const token = process.env.GITHUB_TOKEN || process.env.GH_TOKEN
+  const response = await fetch(url, {
+    headers: {
+      Accept: 'application/vnd.github+json',
+      ...(token ? { Authorization: `Bearer ${token}` } : {})
+    },
+    signal: AbortSignal.timeout(PULL_REQUEST_LOOKUP_TIMEOUT_MS)
+  }).catch((error: unknown) => {
+    // Node's fetch hides the network reason (DNS, TLS, reset) in `cause`.
+    const cause = error instanceof Error && error.cause ? ` (${String(error.cause)})` : ''
+    throw new Error(
+      `Could not ask GitHub which pull requests hold ${commit} (${url}): ${String(error)}${cause}`
+    )
+  })
+  const body = await response.text()
+  // GitHub's answer for a commit it has never seen, which no pull request can hold.
+  if (response.status === 422 && body.includes('No commit found')) {
+    return []
+  }
+  if (!response.ok) {
+    const rateLimited = !token && (response.status === 403 || response.status === 429)
+    throw new Error(
+      `GitHub answered ${response.status} to ${url}: ${body.slice(0, 300)}` +
+        (rateLimited
+          ? '\nUnauthenticated GitHub API calls are rate-limited; set GITHUB_TOKEN or GH_TOKEN.'
+          : '')
+    )
+  }
+  const pulls: unknown = JSON.parse(body)
+  if (!Array.isArray(pulls)) {
+    throw new Error(
+      `GitHub answered ${url} with something other than a list: ${body.slice(0, 300)}`
+    )
+  }
+  return pulls.flatMap((pull) => (typeof pull?.number === 'number' ? [pull.number] : []))
+}
+
+/** Fetches a pull request's head into a ref of our own, so no other fetch can move it under us. */
+async function fetchPullRequestHead(root: string, pullRequest: number): Promise<string> {
+  const local = `refs/rpc-recording-pin/pull/${pullRequest}`
+  const fetched = await git(
+    root,
+    ['fetch', '--quiet', '--no-tags', PIN_REMOTE, `+refs/pull/${pullRequest}/head:${local}`],
+    PIN_FETCH_TIMEOUT_MS
+  )
+  if (fetched.code !== 0) {
+    const detail = failureDetail(fetched, PIN_FETCH_TIMEOUT_MS)
+    throw new Error(
+      `Could not fetch refs/pull/${pullRequest}/head from ${PIN_REMOTE}, the head of a pull ` +
+        `request GitHub associates with the recording pin: ${detail}`
+    )
+  }
+  return local
+}
+
+export async function checkPinReachable(
+  root: string,
+  baseline: string,
+  ref: string,
+  pullRequestsHolding: PullRequestLookup = pullRequestsWithCommit
+): Promise<PinReachabilityVerdict> {
+  const shallow = await git(root, ['rev-parse', '--is-shallow-repository'])
+  if (shallow.code !== 0) {
+    throw new Error(`Could not ask git whether the clone is shallow: ${shallow.stderr.trim()}`)
+  }
+  if (shallow.stdout.trim() !== 'false') {
+    return { ok: false, baseline, ref, failure: 'shallow', message: SHALLOW_MESSAGE }
+  }
+  const head = await git(root, ['rev-parse', '--verify', '--quiet', `${ref}^{commit}`])
+  if (head.code !== 0) {
+    throw new Error(`Cannot resolve ${ref} to a commit in this repository`)
+  }
+  // Resolved, because the instruction below is a command to paste: `HEAD` in it moves with whatever
+  // the reader has checked out by the time they read the log.
+  const resolved = head.stdout.trim()
+  const present = async () =>
+    (await git(root, ['rev-parse', '--verify', '--quiet', `${baseline}^{commit}`])).code === 0
+  if ((await present()) && (await isAncestor(root, baseline, ref))) {
+    return { ok: true, baseline, ref, pullRequest: null }
+  }
+  // A squash drops the branch commit the pin names, and the branch may already be deleted, but
+  // GitHub keeps the pull request's head ref for good.
+  const pullRequests = await pullRequestsHolding(root, baseline)
+  for (const pullRequest of pullRequests) {
+    const pullRequestHead = await fetchPullRequestHead(root, pullRequest)
+    if ((await present()) && (await isAncestor(root, baseline, pullRequestHead))) {
+      return { ok: true, baseline, ref, pullRequest }
+    }
+  }
+  const pullRequestCause =
+    pullRequests.length === 0
+      ? 'and GitHub associates no pull request with it'
+      : 'and no head of a pull request GitHub associates with it holds it ' +
+        `(${pullRequests.map((pullRequest) => `refs/pull/${pullRequest}/head`).join(', ')})`
+  if (!(await present())) {
+    return {
+      ok: false,
+      baseline,
+      ref,
+      failure: 'unreachable',
+      message: repinInstruction(
+        baseline,
+        resolved,
+        `is not a commit in this clone, ${pullRequestCause}`
+      )
+    }
+  }
+  return {
+    ok: false,
+    baseline,
+    ref,
+    failure: 'not-an-ancestor',
+    message: repinInstruction(
+      baseline,
+      resolved,
+      `is not an ancestor of this commit, ${pullRequestCause}`
+    )
+  }
+}
diff --git a/mobile/scripts/rpc-recording.mts b/mobile/scripts/rpc-recording.mts
index 7ada953da091..c6034a9246e2 100644
--- a/mobile/scripts/rpc-recording.mts
+++ b/mobile/scripts/rpc-recording.mts
@@ -24,7 +24,15 @@ const baseline = await runProcess({
   ],
   cwd: root
 })
-if (baseline.code !== 0) {
+// A pin a squash left only in its pull request's head is a missing object, not product drift.
+if (baseline.code !== 0 && baseline.code !== 1) {
+  throw new Error(
+    `Could not diff against the pinned baseline ${input.baseline}: ${baseline.stderr.trim()}\n` +
+      'If your clone lacks that commit, fetch it with\n' +
+      '  pnpm --dir mobile exec tsx scripts/rpc-recording-pin-guard.mts reachable'
+  )
+}
+if (baseline.code === 1) {
   throw new Error('Product sources or lockfile differ from the pinned main baseline')
 }
 // Why a second check: `git diff` only sees tracked paths, so an untracked module under the
diff --git a/mobile/src/accounts/mobile-accounts-route.test.ts b/mobile/src/accounts/mobile-accounts-route.test.ts
index 0b25d44d3f0c..2a77c8a2b3a2 100644
--- a/mobile/src/accounts/mobile-accounts-route.test.ts
+++ b/mobile/src/accounts/mobile-accounts-route.test.ts
@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs'
 import { describe, expect, it, vi } from 'vitest'
 import { mobileAccountsRouteTarget } from './mobile-accounts-route'
 import {
@@ -7,12 +6,6 @@ import {
   type HostStackNavigationState
 } from '../navigation/host-stack-navigation'
 
-const homeSource = readFileSync(new URL('../home/MobileHomeScreen.tsx', import.meta.url), 'utf8')
-const accountCardsSource = readFileSync(
-  new URL('../home/MobileHomeAccountUsageCards.tsx', import.meta.url),
-  'utf8'
-)
-
 function navigationHarness(initialState: HostStackNavigationState) {
   const stateListeners = new Set<() => void>()
   let state = initialState
@@ -85,10 +78,4 @@ describe('mobile accounts route', () => {
       payload: mobileAccountsRouteTarget('host/one')
     })
   })
-
-  it('opens the home account-usage card through the cold-navigator-safe transition', () => {
-    expect(homeSource).toContain('onOpenAccounts={openMobileAccounts}')
-    expect(accountCardsSource).toContain('props.onOpen(host.id)')
-    expect(accountCardsSource).not.toContain('/accounts`')
-  })
 })
diff --git a/mobile/src/app-update/app-store-update-source.ts b/mobile/src/app-update/app-store-update-source.ts
new file mode 100644
index 000000000000..cad70e0840d3
--- /dev/null
+++ b/mobile/src/app-update/app-store-update-source.ts
@@ -0,0 +1,37 @@
+import { z } from 'zod'
+import type { AppUpdateCheckResult, AppUpdateSource } from './app-update-source'
+import { isNewerReleaseVersion } from './app-update-source'
+
+const LOOKUP_URL = 'https://itunes.apple.com/lookup?bundleId=com.stably.orca.mobile'
+
+type Fetch = typeof fetch
+
+const lookupSchema = z.looseObject({ results: z.array(z.unknown()) })
+const listingSchema = z.looseObject({ version: z.string(), trackViewUrl: z.string() })
+
+/**
+ * The store listing's version and page. TestFlight installs have no receipt signal without a new
+ * dependency; they stay quiet because their build is at or ahead of the store's version.
+ */
+export function parseAppStoreLookup(reply: unknown): { version: string; url: string } | null {
+  const lookup = lookupSchema.safeParse(reply)
+  const listing = listingSchema.safeParse(lookup.success ? lookup.data.results[0] : null)
+  return listing.success ? { version: listing.data.version, url: listing.data.trackViewUrl } : null
+}
+
+export function createAppStoreUpdateSource(fetchImpl: Fetch): AppUpdateSource {
+  return {
+    async check(installedVersion, signal): Promise<AppUpdateCheckResult> {
+      const reply = await fetchImpl(LOOKUP_URL, { signal })
+      if (!reply.ok) {
+        throw new Error(`App Store lookup HTTP ${reply.status}`)
+      }
+      const listing = parseAppStoreLookup(await reply.json())
+      return listing && isNewerReleaseVersion(listing.version, installedVersion)
+        ? { kind: 'available', version: listing.version, url: listing.url }
+        : { kind: 'current' }
+    }
+  }
+}
+
+export const appStoreUpdateSource = createAppStoreUpdateSource((input, init) => fetch(input, init))
diff --git a/mobile/src/app-update/app-update-checker.test.ts b/mobile/src/app-update/app-update-checker.test.ts
new file mode 100644
index 000000000000..c76c7d1be76c
--- /dev/null
+++ b/mobile/src/app-update/app-update-checker.test.ts
@@ -0,0 +1,293 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AppUpdatePreferences } from '../storage/app-update-preferences'
+import {
+  APP_UPDATE_CHECK_INTERVAL_MS,
+  createAppUpdateChecker,
+  undismissedAppUpdate,
+  type AppUpdateCheckerDeps
+} from './app-update-checker'
+import type { AppUpdateCheckResult, AppUpdateSource } from './app-update-source'
+
+const HOUR = 60 * 60 * 1000
+const T0 = Date.UTC(2026, 8, 28, 12)
+const RELEASE_051 = { version: '0.0.51', url: 'https://example.test/0.0.51' }
+
+type Harness = ReturnType<typeof harness>
+
+function harness(opts: {
+  stored?: Partial<AppUpdatePreferences>
+  installedVersion?: string
+  replies?: (AppUpdateCheckResult | Error | 'hang' | Promise<AppUpdateCheckResult>)[]
+  load?: Promise<void>
+}) {
+  const replies = [...(opts.replies ?? [])]
+  let foreground: () => void = () => {}
+  const saves: unknown[] = []
+  const source: AppUpdateSource = {
+    check: vi.fn(async () => {
+      const reply = replies.shift() ?? { kind: 'current' }
+      if (reply instanceof Promise) {
+        return reply
+      }
+      if (reply === 'hang') {
+        return new Promise<never>(() => {})
+      }
+      if (reply instanceof Error) {
+        throw reply
+      }
+      return reply
+    })
+  }
+  const deps = {
+    source,
+    installedVersion: opts.installedVersion ?? '0.0.48',
+    now: () => Date.now(),
+    setTimer: (run: () => void, delayMs: number) => setTimeout(run, delayMs),
+    clearTimer: (handle: ReturnType<typeof setTimeout>) => clearTimeout(handle),
+    subscribeForeground: (listener: () => void) => {
+      foreground = listener
+      return () => {
+        foreground = () => {}
+      }
+    },
+    loadPreferences: vi.fn(async () => {
+      await opts.load
+      return {
+        lastCheckedAt: null,
+        latest: null,
+        dismissedVersion: null,
+        ...opts.stored
+      }
+    }),
+    saveCheck: async (checkedAt: number, latest: AppUpdatePreferences['latest']) => {
+      saves.push({ checkedAt, latest })
+    },
+    saveDismissedVersion: async (version: string) => {
+      saves.push({ dismissed: version })
+    }
+  } satisfies AppUpdateCheckerDeps
+  const checker = createAppUpdateChecker(deps)
+  return { checker, source, saves, deps, foreground: () => foreground() }
+}
+
+const checks = (h: Harness) => vi.mocked(h.source.check).mock.calls.length
+
+describe('app update checker', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+    vi.setSystemTime(T0)
+  })
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('checks on cold start when it has never succeeded, and records the result', async () => {
+    const h = harness({ replies: [{ kind: 'available', ...RELEASE_051 }] })
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(checks(h)).toBe(1)
+    expect(h.checker.getSnapshot()).toMatchObject({ lastCheckedAt: T0, available: RELEASE_051 })
+    expect(h.saves).toEqual([{ checkedAt: T0, latest: RELEASE_051 }])
+  })
+
+  it('skips the cold-start check inside 24 h, then runs it when the day is up', async () => {
+    const h = harness({ stored: { lastCheckedAt: T0 - 2 * HOUR, latest: RELEASE_051 } })
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(checks(h)).toBe(0)
+    expect(h.checker.getSnapshot().available).toEqual(RELEASE_051)
+    await vi.advanceTimersByTimeAsync(22 * HOUR - 1)
+    expect(checks(h)).toBe(0)
+    await vi.advanceTimersByTimeAsync(1)
+    expect(checks(h)).toBe(1)
+  })
+
+  it('checks on foreground only once the last success is 24 h old', async () => {
+    const h = harness({ stored: { lastCheckedAt: T0 - 23 * HOUR } })
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    h.foreground()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(checks(h)).toBe(0)
+    // Background suspends timers; the system clock still moves.
+    vi.setSystemTime(T0 + HOUR)
+    h.foreground()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(checks(h)).toBe(1)
+  })
+
+  it('retries a failed check after 1 h, not sooner, and keeps the last success time', async () => {
+    const h = harness({
+      stored: { lastCheckedAt: T0 - 30 * HOUR },
+      replies: [new Error('offline')]
+    })
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(checks(h)).toBe(1)
+    expect(h.checker.getSnapshot().lastCheckedAt).toBe(T0 - 30 * HOUR)
+    h.foreground()
+    await vi.advanceTimersByTimeAsync(HOUR - 1)
+    expect(checks(h)).toBe(1)
+    await vi.advanceTimersByTimeAsync(1)
+    expect(checks(h)).toBe(2)
+    expect(h.checker.getSnapshot().lastCheckedAt).toBe(T0 + HOUR)
+  })
+
+  it('bounds a check at 8 s and counts it as failed', async () => {
+    const h = harness({ stored: { lastCheckedAt: T0 }, replies: ['hang'] })
+    h.checker.start()
+    const outcome = h.checker.checkNow()
+    await vi.advanceTimersByTimeAsync(8000)
+    await expect(outcome).resolves.toBe('failed')
+    expect(h.checker.getSnapshot().checking).toBe(false)
+  })
+
+  it('joins a manual check to one already in flight', async () => {
+    const h = harness({ stored: { lastCheckedAt: T0 }, replies: [{ kind: 'current' }] })
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    const [first, second] = [h.checker.checkNow(), h.checker.checkNow()]
+    await expect(Promise.all([first, second])).resolves.toEqual(['up-to-date', 'up-to-date'])
+    expect(checks(h)).toBe(1)
+  })
+
+  it('manual check reschedules the next automatic check a full day out', async () => {
+    const h = harness({ stored: { lastCheckedAt: T0 - 23 * HOUR } })
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    await h.checker.checkNow()
+    await vi.advanceTimersByTimeAsync(24 * HOUR - 1)
+    expect(checks(h)).toBe(1)
+    await vi.advanceTimersByTimeAsync(1)
+    expect(checks(h)).toBe(2)
+  })
+
+  it('dismisses one version only; the next release offers again', async () => {
+    const h = harness({
+      stored: { lastCheckedAt: T0 - 25 * HOUR },
+      replies: [
+        { kind: 'available', ...RELEASE_051 },
+        { kind: 'available', version: '0.0.52', url: 'https://example.test/0.0.52' }
+      ]
+    })
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    h.checker.dismiss('0.0.51')
+    await vi.advanceTimersByTimeAsync(0)
+    expect(undismissedAppUpdate(h.checker.getSnapshot())).toBeNull()
+    expect(h.checker.getSnapshot().available).toEqual(RELEASE_051)
+    expect(h.saves).toContainEqual({ dismissed: '0.0.51' })
+    await h.checker.checkNow()
+    expect(undismissedAppUpdate(h.checker.getSnapshot())?.version).toBe('0.0.52')
+  })
+
+  it('keeps a stored dismissal across restarts', async () => {
+    const h = harness({
+      stored: { lastCheckedAt: T0, latest: RELEASE_051, dismissedVersion: '0.0.51' }
+    })
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(undismissedAppUpdate(h.checker.getSnapshot())).toBeNull()
+  })
+
+  it('stops offering a stored update once the binary has been updated to it', async () => {
+    const h = harness({
+      installedVersion: '0.0.51',
+      stored: { lastCheckedAt: T0, latest: RELEASE_051 }
+    })
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(h.checker.getSnapshot().available).toBeNull()
+  })
+
+  it('stops scheduling after stop()', async () => {
+    const h = harness({ stored: { lastCheckedAt: T0 - 2 * HOUR } })
+    const stop = h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    stop()
+    await vi.advanceTimersByTimeAsync(2 * APP_UPDATE_CHECK_INTERVAL_MS)
+    expect(checks(h)).toBe(0)
+  })
+
+  it('keeps the 1 h retry for a manual check that fails while the store is still loading', async () => {
+    let finishLoad: () => void = () => {}
+    const h = harness({
+      stored: { lastCheckedAt: T0 - 30 * HOUR },
+      replies: [new Error('offline')],
+      load: new Promise<void>((resolve) => {
+        finishLoad = resolve
+      })
+    })
+    h.checker.start()
+    const outcome = h.checker.checkNow()
+    finishLoad()
+    await expect(outcome).resolves.toBe('failed')
+    await vi.advanceTimersByTimeAsync(HOUR - 1)
+    expect(checks(h)).toBe(1)
+    await vi.advanceTimersByTimeAsync(1)
+    expect(checks(h)).toBe(2)
+  })
+
+  it('applies one load and runs one check across a StrictMode-style double start', async () => {
+    const h = harness({})
+    h.checker.start()()
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(h.deps.loadPreferences).toHaveBeenCalledTimes(1)
+    expect(checks(h)).toBe(1)
+  })
+
+  function deferredReply() {
+    let answer: (result: AppUpdateCheckResult) => void = () => {}
+    const reply = new Promise<AppUpdateCheckResult>((resolve) => {
+      answer = resolve
+    })
+    return { reply, answer: (result: AppUpdateCheckResult) => answer(result) }
+  }
+
+  it('arms no timer for a check that finishes after stop()', async () => {
+    const pending = deferredReply()
+    const h = harness({ stored: { lastCheckedAt: T0 }, replies: [pending.reply] })
+    const stop = h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    const outcome = h.checker.checkNow()
+    await vi.advanceTimersByTimeAsync(0)
+    stop()
+    pending.answer({ kind: 'current' })
+    await outcome
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('schedules the next check when a check in flight across stop and restart completes', async () => {
+    const pending = deferredReply()
+    const h = harness({ stored: { lastCheckedAt: T0 }, replies: [pending.reply] })
+    const stop = h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    const outcome = h.checker.checkNow()
+    await vi.advanceTimersByTimeAsync(0)
+    stop()
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    pending.answer({ kind: 'current' })
+    await outcome
+    expect(vi.getTimerCount()).toBe(1)
+    await vi.advanceTimersByTimeAsync(24 * HOUR)
+    expect(checks(h)).toBe(2)
+  })
+
+  it('runs the check when the armed timer fires even if the clock stepped back', async () => {
+    const h = harness({ stored: { lastCheckedAt: T0 - 2 * HOUR } })
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    vi.setSystemTime(Date.now() - 10 * 60 * 1000)
+    await vi.advanceTimersByTimeAsync(22 * HOUR)
+    expect(checks(h)).toBe(1)
+  })
+
+  it('treats a stored check time ahead of the clock as never checked', async () => {
+    const h = harness({ stored: { lastCheckedAt: T0 + 365 * 24 * HOUR } })
+    h.checker.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(checks(h)).toBe(1)
+  })
+})
diff --git a/mobile/src/app-update/app-update-checker.ts b/mobile/src/app-update/app-update-checker.ts
new file mode 100644
index 000000000000..7c2855d93734
--- /dev/null
+++ b/mobile/src/app-update/app-update-checker.ts
@@ -0,0 +1,202 @@
+import type { AppUpdatePreferences, KnownAppUpdate } from '../storage/app-update-preferences'
+import { EMPTY_APP_UPDATE_PREFERENCES } from '../storage/app-update-preferences'
+import type { AppUpdateSource } from './app-update-source'
+import { isNewerReleaseVersion } from './app-update-source'
+
+// Same cadence as the desktop updater (src/main/updater-events.ts).
+export const APP_UPDATE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000
+const APP_UPDATE_RETRY_INTERVAL_MS = 60 * 60 * 1000
+const APP_UPDATE_CHECK_TIMEOUT_MS = 8000
+
+type TimerHandle = ReturnType<typeof setTimeout>
+
+export type AppUpdateCheckOutcome = 'available' | 'up-to-date' | 'failed'
+
+export type AppUpdateState = {
+  readonly lastCheckedAt: number | null
+  /** Newer than the installed binary; recomputed from `latest`, so installing it clears this. */
+  readonly available: KnownAppUpdate | null
+  readonly dismissedVersion: string | null
+  readonly checking: boolean
+}
+
+/** The update home should offer: dismissal hides only the version that was dismissed. */
+export function undismissedAppUpdate(state: AppUpdateState): KnownAppUpdate | null {
+  return state.available && state.available.version !== state.dismissedVersion
+    ? state.available
+    : null
+}
+
+export type AppUpdateCheckerDeps = {
+  source: AppUpdateSource | null
+  installedVersion: string | null
+  now: () => number
+  setTimer: (run: () => void, delayMs: number) => TimerHandle
+  clearTimer: (handle: TimerHandle) => void
+  subscribeForeground: (onForeground: () => void) => () => void
+  loadPreferences: () => Promise<AppUpdatePreferences>
+  saveCheck: (checkedAt: number, latest: KnownAppUpdate | null) => Promise<void>
+  saveDismissedVersion: (version: string) => Promise<void>
+}
+
+export function createAppUpdateChecker(deps: AppUpdateCheckerDeps) {
+  let prefs = EMPTY_APP_UPDATE_PREFERENCES
+  let loaded: Promise<void> | null = null
+  let inFlight: Promise<AppUpdateCheckOutcome> | null = null
+  let nextDueAt = 0
+  let timer: TimerHandle | null = null
+  let activeStarts = 0
+  let snapshot = buildSnapshot()
+  const listeners = new Set<() => void>()
+
+  function buildSnapshot(): AppUpdateState {
+    const latest = prefs.latest
+    const available =
+      latest &&
+      deps.installedVersion &&
+      isNewerReleaseVersion(latest.version, deps.installedVersion)
+        ? latest
+        : null
+    return {
+      lastCheckedAt: prefs.lastCheckedAt,
+      available,
+      dismissedVersion: prefs.dismissedVersion,
+      checking: inFlight !== null
+    }
+  }
+
+  function publish(): void {
+    snapshot = buildSnapshot()
+    for (const listener of listeners) {
+      listener()
+    }
+  }
+
+  function clearScheduled(): void {
+    if (timer !== null) {
+      deps.clearTimer(timer)
+      timer = null
+    }
+  }
+
+  function schedule(dueAt: number): void {
+    nextDueAt = dueAt
+    clearScheduled()
+    if (activeStarts > 0) {
+      timer = deps.setTimer(
+        () => {
+          timer = null
+          // The timer is the due time; re-reading the wall clock would stall on a clock step back.
+          if (activeStarts > 0 && inFlight === null) {
+            void checkNow()
+          }
+        },
+        Math.max(0, dueAt - deps.now())
+      )
+    }
+  }
+
+  /** The stored state is read once; every check and dismissal waits for it, so none is overwritten. */
+  function ensureLoaded(): Promise<void> {
+    loaded ??= deps.loadPreferences().then((stored) => {
+      prefs = stored
+      // A stored check time ahead of the clock (clock since corrected) would defer the next check.
+      const checkedAt = stored.lastCheckedAt
+      nextDueAt =
+        checkedAt === null || checkedAt > deps.now() ? 0 : checkedAt + APP_UPDATE_CHECK_INTERVAL_MS
+      publish()
+    })
+    return loaded
+  }
+
+  function runIfDue(): void {
+    void ensureLoaded().then(() => {
+      if (activeStarts > 0 && inFlight === null && deps.now() >= nextDueAt) {
+        void checkNow()
+      }
+    })
+  }
+
+  async function runCheck(source: AppUpdateSource, installed: string) {
+    await ensureLoaded()
+    const controller = new AbortController()
+    // Why race: the bound holds even for a request that does not honour the signal.
+    const timedOut = new Promise<never>((_, reject) => {
+      controller.signal.addEventListener('abort', () => reject(new Error('update check timed out')))
+    })
+    const timeout = deps.setTimer(() => controller.abort(), APP_UPDATE_CHECK_TIMEOUT_MS)
+    try {
+      const result = await Promise.race([source.check(installed, controller.signal), timedOut])
+      const checkedAt = deps.now()
+      const latest =
+        result.kind === 'available' ? { version: result.version, url: result.url } : null
+      prefs = { ...prefs, lastCheckedAt: checkedAt, latest }
+      schedule(checkedAt + APP_UPDATE_CHECK_INTERVAL_MS)
+      await deps.saveCheck(checkedAt, latest).catch(() => {})
+      return latest ? 'available' : 'up-to-date'
+    } catch {
+      schedule(deps.now() + APP_UPDATE_RETRY_INTERVAL_MS)
+      return 'failed'
+    } finally {
+      deps.clearTimer(timeout)
+    }
+  }
+
+  /** Runs now whatever the cadence says; joins a check already in flight. */
+  function checkNow(): Promise<AppUpdateCheckOutcome> {
+    const { source, installedVersion } = deps
+    if (!source || !installedVersion) {
+      return Promise.resolve('failed')
+    }
+    if (inFlight === null) {
+      inFlight = runCheck(source, installedVersion).finally(() => {
+        inFlight = null
+        publish()
+      })
+      publish()
+    }
+    return inFlight
+  }
+
+  /** Cold start: reads what the last run saw, then checks only if the cadence says it is due. */
+  function start(): () => void {
+    let active = true
+    activeStarts += 1
+    const unsubscribe = deps.subscribeForeground(runIfDue)
+    void ensureLoaded().then(() => {
+      if (active && inFlight === null) {
+        schedule(nextDueAt)
+      }
+    })
+    return () => {
+      if (!active) {
+        return
+      }
+      active = false
+      activeStarts -= 1
+      unsubscribe()
+      if (activeStarts === 0) {
+        clearScheduled()
+      }
+    }
+  }
+
+  function dismiss(version: string): void {
+    void ensureLoaded().then(() => {
+      prefs = { ...prefs, dismissedVersion: version }
+      publish()
+      void deps.saveDismissedVersion(version).catch(() => {})
+    })
+  }
+
+  return {
+    start,
+    checkNow,
+    dismiss,
+    getSnapshot: (): AppUpdateState => snapshot,
+    subscribe(listener: () => void): () => void {
+      listeners.add(listener)
+      return () => listeners.delete(listener)
+    }
+  }
+}
diff --git a/mobile/src/app-update/app-update-runtime.ts b/mobile/src/app-update/app-update-runtime.ts
new file mode 100644
index 000000000000..aa2d72c76088
--- /dev/null
+++ b/mobile/src/app-update/app-update-runtime.ts
@@ -0,0 +1,59 @@
+import Constants from 'expo-constants'
+import * as Linking from 'expo-linking'
+import { useSyncExternalStore } from 'react'
+import { AppState, Platform } from 'react-native'
+import {
+  loadAppUpdatePreferences,
+  saveAppUpdateCheck,
+  saveDismissedAppUpdateVersion
+} from '../storage/app-update-preferences'
+import { appStoreUpdateSource } from './app-store-update-source'
+import { createAppUpdateChecker, type AppUpdateState } from './app-update-checker'
+import type { AppUpdateSource } from './app-update-source'
+import { githubReleaseUpdateSource } from './github-release-update-source'
+
+/**
+ * Invariant: this app does not use expo-updates, so `expoConfig` is the manifest embedded in the
+ * binary and its version is the binary's (app.json `version`, Android `versionName`). SDK 55
+ * removed `Constants.nativeAppVersion`; adopting expo-updates would make this the update's version.
+ */
+export const installedAppVersion: string | null = Constants.expoConfig?.version ?? null
+
+/** The channel that installed this binary. */
+function resolveAppUpdateSource(): AppUpdateSource | null {
+  if (Platform.OS === 'android') {
+    return githubReleaseUpdateSource
+  }
+  if (Platform.OS === 'ios') {
+    return appStoreUpdateSource
+  }
+  return null
+}
+
+export const appUpdateChecker = createAppUpdateChecker({
+  source: resolveAppUpdateSource(),
+  installedVersion: installedAppVersion,
+  now: () => Date.now(),
+  setTimer: (run, delayMs) => setTimeout(run, delayMs),
+  clearTimer: (handle) => clearTimeout(handle),
+  subscribeForeground: (onForeground) => {
+    const subscription = AppState.addEventListener('change', (state) => {
+      if (state === 'active') {
+        onForeground()
+      }
+    })
+    return () => subscription.remove()
+  },
+  loadPreferences: loadAppUpdatePreferences,
+  saveCheck: saveAppUpdateCheck,
+  saveDismissedVersion: saveDismissedAppUpdateVersion
+})
+
+export function useAppUpdateState(): AppUpdateState {
+  return useSyncExternalStore(appUpdateChecker.subscribe, appUpdateChecker.getSnapshot)
+}
+
+/** Opens the channel's page for the update: the GitHub release (Android) or App Store (iOS). */
+export function openAppUpdate(url: string): void {
+  void Linking.openURL(url).catch(() => {})
+}
diff --git a/mobile/src/app-update/app-update-source.ts b/mobile/src/app-update/app-update-source.ts
new file mode 100644
index 000000000000..3fe41b7a1ab5
--- /dev/null
+++ b/mobile/src/app-update/app-update-source.ts
@@ -0,0 +1,24 @@
+import {
+  compareAppVersions,
+  isPrereleaseAppVersion,
+  isValidAppVersion
+} from '../../../src/shared/app-version'
+
+export type AppUpdateCheckResult =
+  | { kind: 'available'; version: string; url: string }
+  | { kind: 'current' }
+
+/** One install channel. Rejects when the channel could not be asked; never retries itself. */
+export type AppUpdateSource = {
+  check(installedVersion: string, signal: AbortSignal): Promise<AppUpdateCheckResult>
+}
+
+/** True for a plain release version newer than the installed one; prerelease suffixes never qualify. */
+export function isNewerReleaseVersion(candidate: string, installed: string): boolean {
+  return (
+    isValidAppVersion(candidate) &&
+    isValidAppVersion(installed) &&
+    !isPrereleaseAppVersion(candidate) &&
+    compareAppVersions(candidate, installed) > 0
+  )
+}
diff --git a/mobile/src/app-update/app-update-sources.test.ts b/mobile/src/app-update/app-update-sources.test.ts
new file mode 100644
index 000000000000..22c04b641a76
--- /dev/null
+++ b/mobile/src/app-update/app-update-sources.test.ts
@@ -0,0 +1,196 @@
+import { readFileSync } from 'node:fs'
+import { describe, expect, it } from 'vitest'
+import { createAppStoreUpdateSource, parseAppStoreLookup } from './app-store-update-source'
+import { isNewerReleaseVersion } from './app-update-source'
+import {
+  createGithubReleaseUpdateSource,
+  installableReleaseUrl,
+  parseMobileAndroidTagVersions
+} from './github-release-update-source'
+
+// Recorded once from the live endpoints on 2026-09-28, unedited.
+function fixture(name: string): unknown {
+  return JSON.parse(readFileSync(new URL(`./fixtures/${name}`, import.meta.url), 'utf8'))
+}
+const tagRefs = fixture('github-mobile-android-tag-refs.json')
+const release050 = fixture('github-release-mobile-android-v0.0.50.json')
+const lookup = fixture('itunes-lookup-com.stably.orca.mobile.json')
+
+const REFS_URL =
+  'https://api.github.com/repos/stablyai/orca/git/matching-refs/tags/mobile-android-v'
+const releaseUrl = (version: string) =>
+  `https://api.github.com/repos/stablyai/orca/releases/tags/mobile-android-v${version}`
+
+function fakeFetch(routes: Record<string, { status: number; body?: unknown }>) {
+  const requested: string[] = []
+  const fetchImpl: typeof fetch = async (input) => {
+    const url = String(input)
+    requested.push(url)
+    const route = routes[url]
+    if (!route) {
+      throw new Error(`unexpected request ${url}`)
+    }
+    return new Response(JSON.stringify(route.body ?? {}), { status: route.status })
+  }
+  return { fetchImpl, requested }
+}
+
+const signal = new AbortController().signal
+
+describe('version compare', () => {
+  it('orders plain versions numerically and ignores prerelease or malformed candidates', () => {
+    expect(isNewerReleaseVersion('0.0.51', '0.0.48')).toBe(true)
+    expect(isNewerReleaseVersion('0.0.10', '0.0.9')).toBe(true)
+    expect(isNewerReleaseVersion('0.0.48', '0.0.48')).toBe(false)
+    expect(isNewerReleaseVersion('0.0.47', '0.0.48')).toBe(false)
+    expect(isNewerReleaseVersion('0.0.52-rc.1', '0.0.48')).toBe(false)
+    expect(isNewerReleaseVersion('latest', '0.0.48')).toBe(false)
+  })
+})
+
+describe('GitHub release source (Android sideload)', () => {
+  it('reads every mobile-android tag from the recorded refs', () => {
+    const versions = parseMobileAndroidTagVersions(tagRefs)
+    expect(versions).toHaveLength(24)
+    expect(versions).toContain('0.0.50')
+    expect(versions).not.toContain('0.0.49')
+  })
+
+  it('accepts the recorded release only because it is published with an APK', () => {
+    expect(installableReleaseUrl(release050)).toBe(
+      'https://github.com/stablyai/orca/releases/tag/mobile-android-v0.0.50'
+    )
+    expect(installableReleaseUrl({ ...Object(release050), draft: true })).toBeNull()
+    expect(installableReleaseUrl({ ...Object(release050), assets: [] })).toBeNull()
+  })
+
+  it('offers the newest tag above the installed version once its release is proven', async () => {
+    const { fetchImpl, requested } = fakeFetch({
+      [REFS_URL]: { status: 200, body: tagRefs },
+      [releaseUrl('0.0.50')]: { status: 200, body: release050 }
+    })
+    await expect(
+      createGithubReleaseUpdateSource(fetchImpl).check('0.0.47', signal)
+    ).resolves.toEqual({
+      kind: 'available',
+      version: '0.0.50',
+      url: 'https://github.com/stablyai/orca/releases/tag/mobile-android-v0.0.50'
+    })
+    expect(requested).toEqual([REFS_URL, releaseUrl('0.0.50')])
+  })
+
+  it('falls back past a tag whose build never published a release', async () => {
+    const release048 = { ...Object(release050), html_url: 'https://example.test/048' }
+    const { fetchImpl } = fakeFetch({
+      [REFS_URL]: { status: 200, body: tagRefs },
+      [releaseUrl('0.0.50')]: { status: 404 },
+      [releaseUrl('0.0.48')]: { status: 200, body: release048 }
+    })
+    await expect(
+      createGithubReleaseUpdateSource(fetchImpl).check('0.0.47', signal)
+    ).resolves.toEqual({
+      kind: 'available',
+      version: '0.0.48',
+      url: 'https://example.test/048'
+    })
+  })
+
+  it('probes at most three candidates and then reports current', async () => {
+    const { fetchImpl, requested } = fakeFetch({
+      [REFS_URL]: { status: 200, body: tagRefs },
+      [releaseUrl('0.0.50')]: { status: 404 },
+      [releaseUrl('0.0.48')]: { status: 404 },
+      [releaseUrl('0.0.47')]: { status: 404 }
+    })
+    await expect(
+      createGithubReleaseUpdateSource(fetchImpl).check('0.0.14', signal)
+    ).resolves.toEqual({
+      kind: 'current'
+    })
+    expect(requested).toHaveLength(4)
+  })
+
+  it('makes no release probe when nothing is newer', async () => {
+    const { fetchImpl, requested } = fakeFetch({ [REFS_URL]: { status: 200, body: tagRefs } })
+    await expect(
+      createGithubReleaseUpdateSource(fetchImpl).check('0.0.51', signal)
+    ).resolves.toEqual({
+      kind: 'current'
+    })
+    expect(requested).toEqual([REFS_URL])
+  })
+
+  it('opens the release page GitHub reports, not one built from the tag', async () => {
+    const renamed = {
+      ...Object(release050),
+      html_url: 'https://github.com/stablyai/orca/releases/tag/renamed-page'
+    }
+    const { fetchImpl } = fakeFetch({
+      [REFS_URL]: { status: 200, body: tagRefs },
+      [releaseUrl('0.0.50')]: { status: 200, body: renamed }
+    })
+    await expect(
+      createGithubReleaseUpdateSource(fetchImpl).check('0.0.48', signal)
+    ).resolves.toEqual({
+      kind: 'available',
+      version: '0.0.50',
+      url: 'https://github.com/stablyai/orca/releases/tag/renamed-page'
+    })
+  })
+
+  it('rejects on a release probe 5xx instead of moving to an older candidate', async () => {
+    const { fetchImpl, requested } = fakeFetch({
+      [REFS_URL]: { status: 200, body: tagRefs },
+      [releaseUrl('0.0.50')]: { status: 502 }
+    })
+    await expect(
+      createGithubReleaseUpdateSource(fetchImpl).check('0.0.47', signal)
+    ).rejects.toThrow('release HTTP 502')
+    expect(requested).toEqual([REFS_URL, releaseUrl('0.0.50')])
+  })
+
+  it('rejects when a release probe cannot reach GitHub', async () => {
+    const { fetchImpl } = fakeFetch({ [REFS_URL]: { status: 200, body: tagRefs } })
+    await expect(
+      createGithubReleaseUpdateSource(fetchImpl).check('0.0.47', signal)
+    ).rejects.toThrow('unexpected request')
+  })
+
+  it('rejects when GitHub refuses, so the check counts as failed rather than current', async () => {
+    const { fetchImpl } = fakeFetch({ [REFS_URL]: { status: 403 } })
+    await expect(
+      createGithubReleaseUpdateSource(fetchImpl).check('0.0.47', signal)
+    ).rejects.toThrow('tag refs HTTP 403')
+  })
+})
+
+describe('App Store source (iOS)', () => {
+  const LOOKUP = 'https://itunes.apple.com/lookup?bundleId=com.stably.orca.mobile'
+
+  it('reads the store version and App Store page from the recorded lookup', () => {
+    expect(parseAppStoreLookup(lookup)).toEqual({
+      version: '0.0.51',
+      url: 'https://apps.apple.com/us/app/orca-ide/id6766130217?uo=4'
+    })
+  })
+
+  it('offers the store version only when it is newer than the installed one', async () => {
+    const { fetchImpl } = fakeFetch({ [LOOKUP]: { status: 200, body: lookup } })
+    const source = createAppStoreUpdateSource(fetchImpl)
+    await expect(source.check('0.0.48', signal)).resolves.toEqual({
+      kind: 'available',
+      version: '0.0.51',
+      url: 'https://apps.apple.com/us/app/orca-ide/id6766130217?uo=4'
+    })
+    await expect(source.check('0.0.51', signal)).resolves.toEqual({ kind: 'current' })
+  })
+
+  it('stays quiet when the lookup has no listing for this bundle id', async () => {
+    const { fetchImpl } = fakeFetch({
+      [LOOKUP]: { status: 200, body: { resultCount: 0, results: [] } }
+    })
+    await expect(createAppStoreUpdateSource(fetchImpl).check('0.0.1', signal)).resolves.toEqual({
+      kind: 'current'
+    })
+  })
+})
diff --git a/mobile/src/app-update/fixtures/github-mobile-android-tag-refs.json b/mobile/src/app-update/fixtures/github-mobile-android-tag-refs.json
new file mode 100644
index 000000000000..8be30db967b7
--- /dev/null
+++ b/mobile/src/app-update/fixtures/github-mobile-android-tag-refs.json
@@ -0,0 +1,242 @@
+[
+  {
+    "ref": "refs/tags/mobile-android-v0.0.14",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjE0",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.14",
+    "object": {
+      "sha": "3247256da0e73409104e17ebf1c476a5cb60b3cf",
+      "type": "tag",
+      "url": "https://api.github.com/repos/stablyai/orca/git/tags/3247256da0e73409104e17ebf1c476a5cb60b3cf"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.15",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjE1",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.15",
+    "object": {
+      "sha": "7b8adaf5f943f1b07668a8e38662690fd8cbf0d0",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/7b8adaf5f943f1b07668a8e38662690fd8cbf0d0"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.16",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjE2",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.16",
+    "object": {
+      "sha": "20882d7a25c33a43b50ea19462a0e50f2deb11c4",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/20882d7a25c33a43b50ea19462a0e50f2deb11c4"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.17",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjE3",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.17",
+    "object": {
+      "sha": "c50391df84ee4034eca2cd5da49ca9ae4c5c4f7d",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/c50391df84ee4034eca2cd5da49ca9ae4c5c4f7d"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.18",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjE4",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.18",
+    "object": {
+      "sha": "9256bd39daaeda0fd86b67f1f50e70850e4f0005",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/9256bd39daaeda0fd86b67f1f50e70850e4f0005"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.19",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjE5",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.19",
+    "object": {
+      "sha": "d7322ec1f239db245c557f85370600ca67639137",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/d7322ec1f239db245c557f85370600ca67639137"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.21",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjIx",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.21",
+    "object": {
+      "sha": "ad13532ab1f8ea31fc434da4d503ba0c93260fb3",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/ad13532ab1f8ea31fc434da4d503ba0c93260fb3"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.22",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjIy",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.22",
+    "object": {
+      "sha": "748bced2e61d47444d6536eecadf8484394e4609",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/748bced2e61d47444d6536eecadf8484394e4609"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.24",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjI0",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.24",
+    "object": {
+      "sha": "3c963dd285783609ab0367cfd95a6b45de2b1603",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/3c963dd285783609ab0367cfd95a6b45de2b1603"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.25",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjI1",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.25",
+    "object": {
+      "sha": "d1cc78d5c5229478fb9f1675a3d3f506d332b367",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/d1cc78d5c5229478fb9f1675a3d3f506d332b367"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.26",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjI2",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.26",
+    "object": {
+      "sha": "cf04845f5b4d787292f041b05f839a8e151fa41b",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/cf04845f5b4d787292f041b05f839a8e151fa41b"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.27",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjI3",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.27",
+    "object": {
+      "sha": "20ebe858af628f3e2b5f73838310636dec6fe0ed",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/20ebe858af628f3e2b5f73838310636dec6fe0ed"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.30",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjMw",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.30",
+    "object": {
+      "sha": "ef87461bfe0346bcef163db971c990ea3adce495",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/ef87461bfe0346bcef163db971c990ea3adce495"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.31",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjMx",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.31",
+    "object": {
+      "sha": "1c275336eddf252a1d1378f9b55a6033278999e8",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/1c275336eddf252a1d1378f9b55a6033278999e8"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.32",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjMy",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.32",
+    "object": {
+      "sha": "c445f26541a0ecb465fc28a7e1a7b5ee5624a0dd",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/c445f26541a0ecb465fc28a7e1a7b5ee5624a0dd"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.36",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjM2",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.36",
+    "object": {
+      "sha": "4543bb68263a89ab520cea62ca69d7ac78330dd3",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/4543bb68263a89ab520cea62ca69d7ac78330dd3"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.37",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjM3",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.37",
+    "object": {
+      "sha": "5a2b329d8d7e96c974aecf4d3e12b707abd7d732",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/5a2b329d8d7e96c974aecf4d3e12b707abd7d732"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.42",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjQy",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.42",
+    "object": {
+      "sha": "20aeb0cb990a17f328b673f51717824d2f9c10ea",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/20aeb0cb990a17f328b673f51717824d2f9c10ea"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.43",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjQz",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.43",
+    "object": {
+      "sha": "cbca291aa7d7270fe8ed8cac5d08fc0b0910c309",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/cbca291aa7d7270fe8ed8cac5d08fc0b0910c309"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.44",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjQ0",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.44",
+    "object": {
+      "sha": "ecfc547ece7aa9483547df26661e90927d1983cc",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/ecfc547ece7aa9483547df26661e90927d1983cc"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.46",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjQ2",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.46",
+    "object": {
+      "sha": "47d462743c2b990b95942c75fb2c1c2493d7f478",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/47d462743c2b990b95942c75fb2c1c2493d7f478"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.47",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjQ3",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.47",
+    "object": {
+      "sha": "38c61379ffd19d3f573877ecfa1099e3616974dd",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/38c61379ffd19d3f573877ecfa1099e3616974dd"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.48",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjQ4",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.48",
+    "object": {
+      "sha": "7e3840a0683f83831502e15f583856fab8977685",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/7e3840a0683f83831502e15f583856fab8977685"
+    }
+  },
+  {
+    "ref": "refs/tags/mobile-android-v0.0.50",
+    "node_id": "REF_kwDORpCz1toAIHJlZnMvdGFncy9tb2JpbGUtYW5kcm9pZC12MC4wLjUw",
+    "url": "https://api.github.com/repos/stablyai/orca/git/refs/tags/mobile-android-v0.0.50",
+    "object": {
+      "sha": "b5ee803d6c45dda9cfd4bb49d58aac47a22ebdc3",
+      "type": "commit",
+      "url": "https://api.github.com/repos/stablyai/orca/git/commits/b5ee803d6c45dda9cfd4bb49d58aac47a22ebdc3"
+    }
+  }
+]
diff --git a/mobile/src/app-update/fixtures/github-release-mobile-android-v0.0.50.json b/mobile/src/app-update/fixtures/github-release-mobile-android-v0.0.50.json
new file mode 100644
index 000000000000..96976684578a
--- /dev/null
+++ b/mobile/src/app-update/fixtures/github-release-mobile-android-v0.0.50.json
@@ -0,0 +1,92 @@
+{
+  "url": "https://api.github.com/repos/stablyai/orca/releases/391254643",
+  "assets_url": "https://api.github.com/repos/stablyai/orca/releases/391254643/assets",
+  "upload_url": "https://uploads.github.com/repos/stablyai/orca/releases/391254643/assets{?name,label}",
+  "html_url": "https://github.com/stablyai/orca/releases/tag/mobile-android-v0.0.50",
+  "id": 391254643,
+  "author": {
+    "login": "github-actions[bot]",
+    "id": 41898282,
+    "node_id": "MDM6Qm90NDE4OTgyODI=",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+    "html_url": "https://github.com/apps/github-actions",
+    "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+    "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+    "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+    "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+    "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+    "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+    "type": "Bot",
+    "user_view_type": "public",
+    "site_admin": false
+  },
+  "node_id": "RE_kwDORpCz1s4XUhJz",
+  "tag_name": "mobile-android-v0.0.50",
+  "target_commitish": "main",
+  "name": "Orca Mobile Android mobile-android-v0.0.50",
+  "draft": false,
+  "immutable": false,
+  "prerelease": true,
+  "created_at": "2026-09-18T02:37:26Z",
+  "updated_at": "2026-09-18T06:19:48Z",
+  "published_at": "2026-09-18T06:19:48Z",
+  "assets": [
+    {
+      "url": "https://api.github.com/repos/stablyai/orca/releases/assets/571968911",
+      "id": 571968911,
+      "node_id": "RA_kwDORpCz1s4iF42P",
+      "name": "app-release.apk",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "user_view_type": "public",
+        "site_admin": false
+      },
+      "content_type": "application/vnd.android.package-archive",
+      "state": "uploaded",
+      "size": 133555371,
+      "digest": "sha256:79b285ca678e0fa00859f5d9348bfdd9d291eff7e1261cd12012c21e2234bad1",
+      "download_count": 10693,
+      "created_at": "2026-09-18T06:19:42Z",
+      "updated_at": "2026-09-18T06:19:46Z",
+      "browser_download_url": "https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.50/app-release.apk"
+    }
+  ],
+  "tarball_url": "https://api.github.com/repos/stablyai/orca/tarball/mobile-android-v0.0.50",
+  "zipball_url": "https://api.github.com/repos/stablyai/orca/zipball/mobile-android-v0.0.50",
+  "body": "## What's Changed\n* Keep the floating workspace above a working native chat pane by @brennanb2025 in https://github.com/stablyai/orca/pull/18692\n* feat(relay-infra): dynamic NAT ports and alerts for the 2026-09-04 stall signals by @Jinwoo-H in https://github.com/stablyai/orca/pull/18693\n* fix(orca-profiles): tell the renderer when a cloud session is revoked by @Jinwoo-H in https://github.com/stablyai/orca/pull/18694\n* feat(relay): tell the phone when its desktop is signed out by @Jinwoo-H in https://github.com/stablyai/orca/pull/18698\n* perf(orchestration): bound the worker terminal archive in linear time by @nwparker in https://github.com/stablyai/orca/pull/18622\n* fix(startup): apply the HTTP/1.1 compatibility toggle for migrated profiles, and stop parsing the settings file pre-ready by @nwparker in https://github.com/stablyai/orca/pull/18621\n* perf(git): overlap the three independent submodule status reads by @nwparker in https://github.com/stablyai/orca/pull/18623\n* test(renderer): pin the runtime-target selector identity stability that #18685 fixed by @nwparker in https://github.com/stablyai/orca/pull/18625\n* perf(terminal): stop copying every PTY chunk for two startup-error detectors by @nwparker in https://github.com/stablyai/orca/pull/18626\n* perf(terminal): gate the Command Code banner scan before building its scan windows by @nwparker in https://github.com/stablyai/orca/pull/18628\n* perf(editor): build the closing-fence pattern once per fence, not once per line by @nwparker in https://github.com/stablyai/orca/pull/18629\n* perf(right-sidebar): cache the active checks status instead of rebuilding its cache keys per store write by @nwparker in https://github.com/stablyai/orca/pull/18631\n* perf(renderer): stop two store selectors allocating on every write by @nwparker in https://github.com/stablyai/orca/pull/18632\n* perf(source-control): stop reconciling selection on every panel render by @nwparker in https://github.com/stablyai/orca/pull/18637\n* perf(sidebar): stop building host projections the row model throws away by @nwparker in https://github.com/stablyai/orca/pull/18638\n* perf(agent-hooks): find spool newlines with Buffer.indexOf, not a per-byte loop by @nwparker in https://github.com/stablyai/orca/pull/18639\n* perf(claude-usage): reject non-assistant transcript lines before parsing them by @nwparker in https://github.com/stablyai/orca/pull/18640\n* perf(orchestration): project task columns so task reads hit the statement cache by @nwparker in https://github.com/stablyai/orca/pull/18641\n* perf(agent-hooks): stop cloning the whole status roster on every hook event by @nwparker in https://github.com/stablyai/orca/pull/18642\n* perf(sidebar): share one natural-worktree-id scan and drop a redundant row-key join by @nwparker in https://github.com/stablyai/orca/pull/18647\n* perf(terminal): use real event-loop yields between chunked writes by @nwparker in https://github.com/stablyai/orca/pull/18627\n* perf(settings): commit free-text account settings on a debounce, not per keystroke by @nwparker in https://github.com/stablyai/orca/pull/18651\n* feat(relay-infra): cell crash-rate alert and incident dashboard by @Jinwoo-H in https://github.com/stablyai/orca/pull/18717\n* feat(relay): let cells dial Cloud SQL over private IP by @Jinwoo-H in https://github.com/stablyai/orca/pull/18720\n* fix(desktop): never replay a refresh token after a timeout; jitter relay lease renewal by @Jinwoo-H in https://github.com/stablyai/orca/pull/18719\n* perf(ports): serve unchanged macOS listeners from remembered metadata by @nwparker in https://github.com/stablyai/orca/pull/18650\n* refactor(agent-session-journal): move the session journal onto SQLite by @brennanb2025 in https://github.com/stablyai/orca/pull/18652\n* fix(relay-ops): a thrown health fetch is not a health reading; auth probe does not require /ready by @Jinwoo-H in https://github.com/stablyai/orca/pull/18723\n* fix(agents): detect agent CLIs installed outside a version manager by @nwparker in https://github.com/stablyai/orca/pull/18336\n* perf(relay): per-cell inventory locks, delta counters, and a pool statement timeout by @Jinwoo-H in https://github.com/stablyai/orca/pull/18722\n* fix(worktrees): stop a failed worktree scan from being recorded as an authoritative empty listing by @nwparker in https://github.com/stablyai/orca/pull/18456\n* fix(native-chat): clarify active progress by @brennanb2025 in https://github.com/stablyai/orca/pull/18705\n* fix(browser-pane): stop a dead client-hosted guest from killing the workbench by @nwparker in https://github.com/stablyai/orca/pull/18334\n* feat(claude): move structured native chat onto the Claude Agent SDK and enable it on macOS and Linux by @brennanb2025 in https://github.com/stablyai/orca/pull/18560\n* Fix Smart create retaining a task checkout hash with Create more by @nwparker in https://github.com/stablyai/orca/pull/18727\n* infra(relay): drop the unapplied region label from runtime log metrics by @Jinwoo-H in https://github.com/stablyai/orca/pull/18734\n* feat(native-chat): expose split and move-to-pane actions in Chat UI mode by @brennanb2025 in https://github.com/stablyai/orca/pull/18714\n* fix(ui): unmount project selector before Add Project handoff by @Jinwoo-H in https://github.com/stablyai/orca/pull/18730\n* fix: show agent commands once without startup polling by @nwparker in https://github.com/stablyai/orca/pull/18729\n* fix(crash-reporting): make the own-Chromium gate a real choke point, and stop a refusal leaking the root by @nwparker in https://github.com/stablyai/orca/pull/18459\n* chore: update in-app Android APK link to 0.0.47 by @AmethystLiang in https://github.com/stablyai/orca/pull/18745\n* Answer the structured-session support probe without installing the host by @brennanb2025 in https://github.com/stablyai/orca/pull/18695\n* fix(native-chat): render Claude structured chat through the same UI as Codex by @brennanb2025 in https://github.com/stablyai/orca/pull/18743\n* fix(orchestration): fence the dispatch CLI preamble so it stops rendering as headings by @brennanb2025 in https://github.com/stablyai/orca/pull/18718\n* fix(relay-ops): retry a failed MIG inventory read once before calling a cell's power state unknown by @Jinwoo-H in https://github.com/stablyai/orca/pull/18740\n* fix(relay-ops): accept monitor evidence from an ancestor commit with identical monitor code by @Jinwoo-H in https://github.com/stablyai/orca/pull/18754\n* fix(terminal): stop a hidden pane's unmeasured 80x24 from overwriting a live PTY's size on reattach by @Jinwoo-H in https://github.com/stablyai/orca/pull/18706\n* fix: use fallback shell readiness and assert fish startup timing by @nwparker in https://github.com/stablyai/orca/pull/18755\n* fix(relay-ops): retry transient admin-endpoint failures in same-cap verify and rehome jobs by @Jinwoo-H in https://github.com/stablyai/orca/pull/18769\n* fix(native-chat): make document paths and links clickable in chat by @brennanb2025 in https://github.com/stablyai/orca/pull/18712\n* fix(native-chat): tell old mobile builds why a structured chat is missing by @brennanb2025 in https://github.com/stablyai/orca/pull/18756\n* fix(relay-ops): retry freshness-only preflight failures on the first same-cap wave too by @Jinwoo-H in https://github.com/stablyai/orca/pull/18778\n* fix(browser): match loading surfaces to the Orca theme by @Jinwoo-H in https://github.com/stablyai/orca/pull/18738\n* fix(browser): present Electron's own user agent so Cloudflare Turnstile clears by @Jinwoo-H in https://github.com/stablyai/orca/pull/18749\n* fix(relay-ops): align the cloud-data freshness bar with Cloud Monitoring publish lag by @Jinwoo-H in https://github.com/stablyai/orca/pull/18798\n* ci(package): retry apt fetches and docker builds behind the Ubuntu mirror by @nwparker in https://github.com/stablyai/orca/pull/18797\n* docs(relay): correct why the ConPTY teardown asset diverges from the desktop patch by @nwparker in https://github.com/stablyai/orca/pull/18636\n* fix: recover from an alternate shell install, and close the relay duplicate-echo gap by @nwparker in https://github.com/stablyai/orca/pull/18796\n* feat(mobile): port the restructured native-chat turn status and live tool progress by @brennanb2025 in https://github.com/stablyai/orca/pull/18761\n* perf(persistence): stop the session write re-scanning and rebuilding unchanged state by @nwparker in https://github.com/stablyai/orca/pull/18739\n* feat(native-chat): render agent file edits as inline diff cards by @brennanb2025 in https://github.com/stablyai/orca/pull/18765\n* fix(recovery): fail a renderer recovery reload that never loads, instead of leaving a dead window by @nwparker in https://github.com/stablyai/orca/pull/18466\n* fix(ssh): compile node-pty from the host's own Node headers instead of nodejs.org (STA-6674) by @nwparker in https://github.com/stablyai/orca/pull/18774\n* Bump mobile app.json to 0.0.48 by @brennanb2025 in https://github.com/stablyai/orca/pull/18801\n* fix(sidebar): confirm filter reset before revealing active workspace by @nwparker in https://github.com/stablyai/orca/pull/18708\n* perf(terminals): let idle panes share one process-table capture instead of forking their own by @nwparker in https://github.com/stablyai/orca/pull/18742\n* perf(native-chat): stop rebuilding every transcript row on every stream frame by @nwparker in https://github.com/stablyai/orca/pull/18744\n* perf(terminal): skip the partial-escape-tail walk on ESC-free PTY chunks by @nwparker in https://github.com/stablyai/orca/pull/18748\n* perf(renderer): index four projections that rescanned their inputs per keystroke by @nwparker in https://github.com/stablyai/orca/pull/18747\n* Show Claude background task status in Native Chat by @brennanb2025 in https://github.com/stablyai/orca/pull/18757\n* fix(sidebar): stop ⌘⇧↓ worktree navigation jumping to the first row by @nwparker in https://github.com/stablyai/orca/pull/18804\n* perf(persistence): skip rewriting unchanged terminal scrollback snapshots by @nwparker in https://github.com/stablyai/orca/pull/18764\n* fix(agent-session): refuse a pre-commit structured create with an envelope by @brennanb2025 in https://github.com/stablyai/orca/pull/18697\n* perf(relay): bound the symlink directory probes a remote readDir fans out by @nwparker in https://github.com/stablyai/orca/pull/18752\n* perf(terminal): cheap-tier process inspection for anchored local agent panes by @nwparker in https://github.com/stablyai/orca/pull/18780\n* fix(ssh): let the host say whether it armed the shell-ready marker by @nwparker in https://github.com/stablyai/orca/pull/18802\n* fix(native-chat): say when a structured launch fell back to a terminal by @brennanb2025 in https://github.com/stablyai/orca/pull/18762\n* fix(test): stop detached git maintenance racing the divergence fixture teardown by @nwparker in https://github.com/stablyai/orca/pull/18810\n* fix(cloud): let the same-cap roll isolate Asia cells by @Jinwoo-H in https://github.com/stablyai/orca/pull/18811\n* fix(renderer): stop a Node-only process-table module blanking the app at boot by @nwparker in https://github.com/stablyai/orca/pull/18814\n* feat(i18n): localize onboarding flow to Japanese by @tb-soshiro in https://github.com/stablyai/orca/pull/18787\n* fix(cloud): validate protocol-0 same-cap cell plans without rehome trust lines by @Jinwoo-H in https://github.com/stablyai/orca/pull/18818\n* perf(worktree): skip remote probes with no possible result by @nwparker in https://github.com/stablyai/orca/pull/18821\n* fix(native-chat): stop a settling handoff throwing an unhandled rejection at teardown by @nwparker in https://github.com/stablyai/orca/pull/18824\n* fix(claude): make the recovery barrier cover an exit still climbing the close ladder by @nwparker in https://github.com/stablyai/orca/pull/18826\n* Reduce minimum tab width from 88px to 72px by @AmethystLiang in https://github.com/stablyai/orca/pull/18871\n* perf(automations): reuse collation setup when sorting names by @nwparker in https://github.com/stablyai/orca/pull/18823\n* fix(relay-ops): per-region cell latency bar and attributable preflight failures by @Jinwoo-H in https://github.com/stablyai/orca/pull/18877\n* test(e2e): follow current sidebar project and activity actions by @nwparker in https://github.com/stablyai/orca/pull/18878\n* fix(runtime): bound terminal-wait blocked-prompt rules to the live screen bottom by @Jinwoo-H in https://github.com/stablyai/orca/pull/18817\n* test(e2e): fence SSH recovery and release exited Electron pipes by @nwparker in https://github.com/stablyai/orca/pull/18880\n* feat(perf): lint repeated sort setup and schedule regression contracts by @nwparker in https://github.com/stablyai/orca/pull/18822\n* feat(native-chat): label Codex tool rows by what the command actually did by @brennanb2025 in https://github.com/stablyai/orca/pull/18760\n* test: preserve Docker context in isolated VM recipes by @nwparker in https://github.com/stablyai/orca/pull/18884\n* Fix favicon retention across same-origin navigations by @AmethystLiang in https://github.com/stablyai/orca/pull/18879\n* test: isolate native crash restoration and refresh stale fixtures by @nwparker in https://github.com/stablyai/orca/pull/18883\n* test: pin worker visibility fixture command and handle by @nwparker in https://github.com/stablyai/orca/pull/18897\n* feat(cli): report SSH host platforms by @nwparker in https://github.com/stablyai/orca/pull/18896\n* test: canonicalize setup fixture paths before worktree lookup by @nwparker in https://github.com/stablyai/orca/pull/18912\n* perf(worktree): remove redundant creation and terminal startup work by @nwparker in https://github.com/stablyai/orca/pull/18793\n* test: align desktop platform oracles with native behavior by @nwparker in https://github.com/stablyai/orca/pull/18915\n* test: follow sidebar reveal confirmation with a stable workspace target by @nwparker in https://github.com/stablyai/orca/pull/18921\n* feat(native-chat): model Codex MCP and web-search items instead of leaking opcodes by @brennanb2025 in https://github.com/stablyai/orca/pull/18763\n* fix(native-chat): publish structured session status from the host so the sidebar never goes stale by @brennanb2025 in https://github.com/stablyai/orca/pull/18776\n* feat(native-chat): stop monitored tasks individually by @brennanb2025 in https://github.com/stablyai/orca/pull/18807\n* fix(native-chat): tell a pre-SQLite chat how to carry on by @brennanb2025 in https://github.com/stablyai/orca/pull/18808\n* fix(agent-session): never open a sibling terminal on an unproven create by @brennanb2025 in https://github.com/stablyai/orca/pull/18735\n* refactor(agent-session): consolidate wire type imports below lint limit by @nwparker in https://github.com/stablyai/orca/pull/18930\n* test(e2e): stabilize terminal launch and rename menu fixtures by @nwparker in https://github.com/stablyai/orca/pull/18928\n* fix(automation): keep explicit background launches off screen by @nwparker in https://github.com/stablyai/orca/pull/18898\n* feat(automations): restore column sorting on the list by @nwparker in https://github.com/stablyai/orca/pull/18885\n* test: pin terminal Codex home to an explicit managed account by @nwparker in https://github.com/stablyai/orca/pull/18935\n* test: deliver real terminal input and preserve setup reports by @nwparker in https://github.com/stablyai/orca/pull/18939\n* test: isolate skill cloud fixture ports across workers by @nwparker in https://github.com/stablyai/orca/pull/18942\n* test: align Source Control AI generation fixtures by @nwparker in https://github.com/stablyai/orca/pull/18941\n* ci: reduce runner overhead and disposable package compression by @nwparker in https://github.com/stablyai/orca/pull/18948\n* test: keep artifact share fixtures unexpired across calendar dates by @nwparker in https://github.com/stablyai/orca/pull/18955\n* docs(relay): 2026-09 reconnect findings, checklist, roadmap, and Roll 2 plan by @Jinwoo-H in https://github.com/stablyai/orca/pull/18958\n* test: make SSH artifact regression fixtures reliable at narrow widths by @nwparker in https://github.com/stablyai/orca/pull/18947\n* test: order restart fixture readiness around daemon recovery by @nwparker in https://github.com/stablyai/orca/pull/18949\n* fix(orchestration): typed error codes for dispatch and worker-start refusals by @Jinwoo-H in https://github.com/stablyai/orca/pull/18902\n* ci: skip idle Mac allocations and redundant native compiler setup by @nwparker in https://github.com/stablyai/orca/pull/18954\n* test: isolate Source Control generation from shared repository remotes by @nwparker in https://github.com/stablyai/orca/pull/18962\n* fix(relay): abandon dead client accepts, jitter and lengthen the control lease, fail direct probes fast by @Jinwoo-H in https://github.com/stablyai/orca/pull/18959\n* fix(hooks): register the Claude hook script directly on Windows (#18875) by @OrcaWin in https://github.com/stablyai/orca/pull/18905\n* fix(ci): store vetted refs in a reftable so case-twin branches don't fail the fetch by @nwparker in https://github.com/stablyai/orca/pull/18970\n* test: drain project menu focus restoration before teardown by @nwparker in https://github.com/stablyai/orca/pull/18971\n* ci: reduce dependency, checkout, and test deadline overhead by @nwparker in https://github.com/stablyai/orca/pull/18968\n* ci: preserve case-twin release refs through checkout and verify trust by @nwparker in https://github.com/stablyai/orca/pull/18980\n* test: honor background mode in paired client window helpers by @nwparker in https://github.com/stablyai/orca/pull/18978\n* test: bound release checkout fixtures and gate delayed imports by @nwparker in https://github.com/stablyai/orca/pull/18981\n* fix(native-chat): repair a structured chat tab permanently fenced by an inherited publication epoch by @brennanb2025 in https://github.com/stablyai/orca/pull/18906\n* ci: expose existing E2E spec selection for manual dispatch by @nwparker in https://github.com/stablyai/orca/pull/18987\n* test: isolate window mocks from inherited launch flags by @nwparker in https://github.com/stablyai/orca/pull/18989\n* test: match explorer filenames independently of git badges by @nwparker in https://github.com/stablyai/orca/pull/18997\n* test: synchronize large repository recovery with Retry request by @nwparker in https://github.com/stablyai/orca/pull/18999\n* perf(relay): drain fragmented frame buffers in linear time by @nwparker in https://github.com/stablyai/orca/pull/18891\n* perf(repos): avoid quadratic icon source scans by @nwparker in https://github.com/stablyai/orca/pull/18892\n* perf(browser): assemble fragmented tunnel frames once by @nwparker in https://github.com/stablyai/orca/pull/18893\n* perf(editor): reuse Markdown source blocks while positioning review notes by @nwparker in https://github.com/stablyai/orca/pull/18895\n* perf(editor): reuse live Markdown search matches across unrelated renders by @nwparker in https://github.com/stablyai/orca/pull/18903\n* perf: decode fragmented CLI replies without repeated scans by @nwparker in https://github.com/stablyai/orca/pull/18909\n* perf: avoid file-to-file scans when selecting deletion roots by @nwparker in https://github.com/stablyai/orca/pull/18913\n* perf: find mobile Markdown placeholder prefixes in one scan by @nwparker in https://github.com/stablyai/orca/pull/18914\n* perf: avoid repeated Quick Open exclusion string allocations by @nwparker in https://github.com/stablyai/orca/pull/18916\n* perf: skip unrelated shared symlink probes during Git status by @nwparker in https://github.com/stablyai/orca/pull/18918\n* perf: avoid splitting every path during file autocomplete by @nwparker in https://github.com/stablyai/orca/pull/18919\n* perf: avoid rescanning emitted source in analysis guards by @nwparker in https://github.com/stablyai/orca/pull/18920\n* perf(cli): skip feature formatters during help and error startup by @nwparker in https://github.com/stablyai/orca/pull/18923\n* perf(explorer): remove redundant dotfile path filter allocation by @nwparker in https://github.com/stablyai/orca/pull/18929\n* perf(watcher): skip remaining filesystem checks after cancellation by @nwparker in https://github.com/stablyai/orca/pull/18931\n* perf(hooks): use native reverse search for transcript lines by @nwparker in https://github.com/stablyai/orca/pull/18936\n* perf(skills): skip symlink probes beyond discovery depth by @nwparker in https://github.com/stablyai/orca/pull/18937\n* perf(mobile): cancel direct probes when their owner stops by @nwparker in https://github.com/stablyai/orca/pull/18940\n* perf(jira): preserve replacement attachment download singleflight by @nwparker in https://github.com/stablyai/orca/pull/18944\n* perf(speech): reuse the model download idle timer by @nwparker in https://github.com/stablyai/orca/pull/18945\n* perf(ssh): reuse and release relay startup buffers by @nwparker in https://github.com/stablyai/orca/pull/18953\n* perf(ssh): reuse streamed response idle timers by @nwparker in https://github.com/stablyai/orca/pull/18956\n* perf(browser): reuse decoded single-chunk upload buffers by @nwparker in https://github.com/stablyai/orca/pull/18960\n* perf(tabs): index saved tab order during hydration repair by @nwparker in https://github.com/stablyai/orca/pull/18964\n* perf(palette): reuse allowed quality arrays during matching by @nwparker in https://github.com/stablyai/orca/pull/18966\n* perf: remember equivalent session tab source identities by @nwparker in https://github.com/stablyai/orca/pull/18976\n* perf(cli): skip impossible typo distance comparisons by @nwparker in https://github.com/stablyai/orca/pull/18977\n* fix(tests): stabilize divider viewport and pointer-capture event ordering by @nwparker in https://github.com/stablyai/orca/pull/19004\n* fix(mobile): stop host streams after relay subscription cancellation by @nwparker in https://github.com/stablyai/orca/pull/18926\n* fix(tests): provide a window manager for Linux Electron CI by @nwparker in https://github.com/stablyai/orca/pull/19007\n* fix(windows): copy the daemon host exe verbatim instead of renaming it (MDE T1036) by @OrcaWin in https://github.com/stablyai/orca/pull/17865\n* fix(computer-use): run the Windows runtime as one persistent helper by @OrcaWin in https://github.com/stablyai/orca/pull/17858\n* fix(windows): drop EDR-flagged -ExecutionPolicy Bypass from encoded PowerShell by @OrcaWin in https://github.com/stablyai/orca/pull/17880\n* fix(windows): read command lines from the kernel, not each process's PEB by @OrcaWin in https://github.com/stablyai/orca/pull/17886\n* fix(windows): scan ports natively instead of encoded PowerShell by @OrcaWin in https://github.com/stablyai/orca/pull/17861\n* fix(security): apply the Windows path-hardening ACL that never ran by @OrcaWin in https://github.com/stablyai/orca/pull/17884\n* perf: avoid repeated whitespace scans in diagnostic redaction by @nwparker in https://github.com/stablyai/orca/pull/18908\n* Improve notification view by @AmethystLiang in https://github.com/stablyai/orca/pull/18699\n* test(child-process): lower DIRECT_IMPORTER_PIN to the ground two PRs took by @OrcaWin in https://github.com/stablyai/orca/pull/19009\n* fix(windows): resolve npm/pnpm .cmd shims past cmd.exe by @OrcaWin in https://github.com/stablyai/orca/pull/17869\n* test: lower child-process import pin after ACL migration by @nwparker in https://github.com/stablyai/orca/pull/19012\n* Open open new link should not navigate away from current link by @AmethystLiang in https://github.com/stablyai/orca/pull/18873\n* perf(windows): split the process table into two flag sets by @OrcaWin in https://github.com/stablyai/orca/pull/17866\n* fix(release): stop shipping an unsigned elevate.exe on Windows by @OrcaWin in https://github.com/stablyai/orca/pull/18044\n* fix(windows): sign the NSIS uninstaller via SignPath by @OrcaWin in https://github.com/stablyai/orca/pull/17868\n* fix(tests): complete hidden SSH dialog exits during cleanup by @nwparker in https://github.com/stablyai/orca/pull/18993\n* Support updating existing draft releases when regenerating notes by @AmethystLiang in https://github.com/stablyai/orca/pull/19014\n* fix(windows): drop no-op -ExecutionPolicy Bypass from -Command spawns by @OrcaWin in https://github.com/stablyai/orca/pull/17873\n* perf(search): assemble fragmented subprocess lines incrementally by @nwparker in https://github.com/stablyai/orca/pull/18973\n* test: use a valid repo filter in workspace reveal coverage by @nwparker in https://github.com/stablyai/orca/pull/19017\n* test: cover native X11 Hangul-plus-digit PTY bytes in CI by @nwparker in https://github.com/stablyai/orca/pull/19013\n* Stop evicted and expired worktree preparations by @nwparker in https://github.com/stablyai/orca/pull/18951\n* Let worktree creation proceed during stale preparation reclamation by @nwparker in https://github.com/stablyai/orca/pull/18967\n* fix(release): revalidate draft state before patching generated notes by @AmethystLiang in https://github.com/stablyai/orca/pull/19019\n* perf(worktree): overlap base refresh with prepared checkout by @nwparker in https://github.com/stablyai/orca/pull/18998\n* test: await fresh inventory after headless terminal materialization by @nwparker in https://github.com/stablyai/orca/pull/19028\n* fix(sidebar): stop a missed pointerup from hiding a remote host section by @nwparker in https://github.com/stablyai/orca/pull/19032\n* test: wait for board pointer readiness before marquee selection by @nwparker in https://github.com/stablyai/orca/pull/19029\n* fix(build): pin config/relay-assets LF so one release is one relay hash by @OrcaWin in https://github.com/stablyai/orca/pull/19024\n* docs(relay): record Roll 2 phase 0/1 (code merge, image, director deploy) by @Jinwoo-H in https://github.com/stablyai/orca/pull/18979\n* feat(github-projects): render Roadmap project views as a timeline by @NaoyaTatetsu in https://github.com/stablyai/orca/pull/17795\n* fix(mobile): preserve iPad hardware keyboard focus by @ramarivera in https://github.com/stablyai/orca/pull/12772\n* test: await reattach replay before checking mouse reset by @nwparker in https://github.com/stablyai/orca/pull/19039\n* test: require recorded Git activity in polling regression by @nwparker in https://github.com/stablyai/orca/pull/19041\n* fix(native-chat): resume a structured chat from Agent Session History by @OrcaWin in https://github.com/stablyai/orca/pull/18933\n* fix(source-control): stack Retry below the too-many-changes message by @nwparker in https://github.com/stablyai/orca/pull/19037\n* test: preserve Windows golden command failures by @nwparker in https://github.com/stablyai/orca/pull/19047\n* test: canonicalize Windows fresh-profile fixture path by @nwparker in https://github.com/stablyai/orca/pull/19049\n* test: repair Windows paste setup and newline expectations by @nwparker in https://github.com/stablyai/orca/pull/19050\n* fix(source-control): stack the Create PR notice's settings link below its message by @nwparker in https://github.com/stablyai/orca/pull/19046\n* test: align Windows shell icons with project runtime ownership by @nwparker in https://github.com/stablyai/orca/pull/19053\n* test: exercise supported ConPTY keyboard protocol reset by @nwparker in https://github.com/stablyai/orca/pull/19054\n* fix(native-chat): honor structured routing with saved options by @brennanb2025 in https://github.com/stablyai/orca/pull/19040\n* fix(packaging): ship Claude agent SDK with desktop builds by @brennanb2025 in https://github.com/stablyai/orca/pull/19042\n* test: reject unsupported app-server in golden agent fixture by @nwparker in https://github.com/stablyai/orca/pull/19056\n* test: reject unsupported app-server in WSL golden stub by @nwparker in https://github.com/stablyai/orca/pull/19062\n* test: canonicalize native Windows paths during repository teardown by @nwparker in https://github.com/stablyai/orca/pull/19064\n* test: run real WSL terminal launch and paste in PR CI by @nwparker in https://github.com/stablyai/orca/pull/19072\n* test: restore SSH bulk-open freeze coverage in headed CI by @nwparker in https://github.com/stablyai/orca/pull/19081\n* test: enable direct and client-hosted SSH browser coverage by @nwparker in https://github.com/stablyai/orca/pull/19090\n* test: reconnect after replacing same-ID runtime pairing by @nwparker in https://github.com/stablyai/orca/pull/19094\n* test: enable Docker SSH browser network route coverage in CI by @nwparker in https://github.com/stablyai/orca/pull/19095\n* docs(relay): Roll 2 cell roll record and checklist ticks by @Jinwoo-H in https://github.com/stablyai/orca/pull/19096\n* test: repair nested SSH fixture after HUB restart by @nwparker in https://github.com/stablyai/orca/pull/19098\n* test: enable localhost SSH terminal and hook journey in CI by @nwparker in https://github.com/stablyai/orca/pull/19097\n* Bump mobile Android versionCode to 16 to match the 0.0.48 release by @brennanb2025 in https://github.com/stablyai/orca/pull/19101\n* test: reuse authoritative SSH connection readiness in localhost fixture by @nwparker in https://github.com/stablyai/orca/pull/19102\n* test: follow retained Activity sidebar during pane selection by @nwparker in https://github.com/stablyai/orca/pull/19107\n* test: isolate source-control generation repositories per scenario by @nwparker in https://github.com/stablyai/orca/pull/19105\n* test: cover SSH reattach replay and enable deterministic Codex CI by @nwparker in https://github.com/stablyai/orca/pull/19106\n* fix(chat): stop terminal focus recovery from stealing Cmd+C in the Chat UI by @brennanb2025 in https://github.com/stablyai/orca/pull/18751\n* Add persistent turn-scoped chat activity indicator by @brennanb2025 in https://github.com/stablyai/orca/pull/19044\n* feat(orchestration): make multi-agent workflows durable by @Jinwoo-H in https://github.com/stablyai/orca/pull/16904\n* fix(ssh-relay): daemon owns the endpoint credential; a losing start never rotates it by @Jinwoo-H in https://github.com/stablyai/orca/pull/19052\n* Recover branch compare on visibility change by @AmethystLiang in https://github.com/stablyai/orca/pull/19021\n* fix(codex): keep large app-server replies alive by @brennanb2025 in https://github.com/stablyai/orca/pull/18590\n* docs(orchestration): never pick a worker model the user did not name by @Jinwoo-H in https://github.com/stablyai/orca/pull/19109\n* feat(mobile): structured native Claude chat by @brennanb2025 in https://github.com/stablyai/orca/pull/18741\n* Seed Cmd-J filter from sidebar scope by @AmethystLiang in https://github.com/stablyai/orca/pull/19036\n* skills: rewrite and trim the seven non-orchestration guides (do not merge without Jinwoo) by @Jinwoo-H in https://github.com/stablyai/orca/pull/18724\n* fix(ci): stop Android release notes exceeding the GitHub body limit by @brennanb2025 in https://github.com/stablyai/orca/pull/19114\n* Update mobile 0.0.48 Android download links by @brennanb2025 in https://github.com/stablyai/orca/pull/19117\n* fix(orchestration): keep worker lineage across app restart (STA-6366) by @Jinwoo-H in https://github.com/stablyai/orca/pull/19121\n* fix(browser): select full URL on initial address bar click by @Jinwoo-H in https://github.com/stablyai/orca/pull/19118\n* fix(windows): unblock structured native chat by exposing process creation time by @brennanb2025 in https://github.com/stablyai/orca/pull/18986\n* Revert \"skills: rewrite the seven non-orchestration guides to one outcome-first standard (#18724)\" by @Jinwoo-H in https://github.com/stablyai/orca/pull/19126\n* perf(store): keep the repo list's identity through workspace hydration by @nwparker in https://github.com/stablyai/orca/pull/19057\n* perf(tabs): keep tab-model identity when reconciliation changed something else by @nwparker in https://github.com/stablyai/orca/pull/19063\n* perf(mobile): skip the agent-status projection join when nothing changed by @nwparker in https://github.com/stablyai/orca/pull/19115\n* perf(worktrees): stop worktree removal from replacing maps it never touched by @nwparker in https://github.com/stablyai/orca/pull/19058\n* perf(selectors): stop two always-mounted selectors allocating per store write by @nwparker in https://github.com/stablyai/orca/pull/19113\n* perf(terminals): stop closing a tab from replacing maps it never touched by @nwparker in https://github.com/stablyai/orca/pull/19060\n* perf(terminals): keep shutdown maps' identity when there is nothing to clear by @nwparker in https://github.com/stablyai/orca/pull/19112\n* perf(store): detect Zustand rerender churn the current audit cannot see by @nwparker in https://github.com/stablyai/orca/pull/19059\n* fix(native-chat): stop seeding a stray terminal beside a chat create by @brennanb2025 in https://github.com/stablyai/orca/pull/19123\n* Improve cmd j ranking by @AmethystLiang in https://github.com/stablyai/orca/pull/19005\n* feat(native-chat): offer the link-action popover for chat links by @brennanb2025 in https://github.com/stablyai/orca/pull/19130\n* fix(ui): keep source control headers readable in narrow sidebars by @nwparker in https://github.com/stablyai/orca/pull/19146\n* fix(gh): log when gh/glab is killed at its deadline by @nwparker in https://github.com/stablyai/orca/pull/18555\n* fix: restore the full sidebar agent row for structured native chat by @brennanb2025 in https://github.com/stablyai/orca/pull/19137\n* fix(native-chat): suppress provider user echoes in Claude and Codex by @brennanb2025 in https://github.com/stablyai/orca/pull/19136\n* fix(native-chat): settle a structured send the provider proves it received after the ack window by @brennanb2025 in https://github.com/stablyai/orca/pull/19140\n* Show provider activity in chat turn tails by @brennanb2025 in https://github.com/stablyai/orca/pull/19055\n* fix(ui): ignore the persistent workspace list when detecting overlays by @nwparker in https://github.com/stablyai/orca/pull/18881\n* fix(windows): reject stale parent PID links in shutdown snapshots by @brennanb2025 in https://github.com/stablyai/orca/pull/19149\n* fix(native-chat): auto-rename the workspace on a structured chat's first turn by @brennanb2025 in https://github.com/stablyai/orca/pull/19138\n* Fix native chat completion sorting and restored activity timestamps by @brennanb2025 in https://github.com/stablyai/orca/pull/19144\n* test: exercise packaged browser compatibility in scheduled CI by @nwparker in https://github.com/stablyai/orca/pull/19157\n* test: refresh palette identities and structured-session journal fixtures by @nwparker in https://github.com/stablyai/orca/pull/19165\n* fix(terminal): preserve ordinary foreground command names by @nwparker in https://github.com/stablyai/orca/pull/18882\n* fix(cmd-j): pass browser tab ownership into palette search by @nwparker in https://github.com/stablyai/orca/pull/18925\n* fix: keep macOS shell ownership proof within recovery budget by @nwparker in https://github.com/stablyai/orca/pull/18932\n* fix: open editor rename after context menu releases focus by @nwparker in https://github.com/stablyai/orca/pull/18934\n* fix: avoid starting browser helpers just to reset absent sessions by @nwparker in https://github.com/stablyai/orca/pull/18952\n* fix: prefer retained provider snapshots during hidden terminal recovery by @nwparker in https://github.com/stablyai/orca/pull/18972\n* fix: preserve overlay focus during terminal mounting and layout by @nwparker in https://github.com/stablyai/orca/pull/18982\n* fix: preserve terminal command probes across control frames by @nwparker in https://github.com/stablyai/orca/pull/19006\n* fix: preserve paired host sessions during startup residue cleanup by @nwparker in https://github.com/stablyai/orca/pull/18922\n* fix: preserve renderer browser publication during client-hosted page updates by @nwparker in https://github.com/stablyai/orca/pull/18961\n* fix: honor remote terminal insertion in the calling client by @nwparker in https://github.com/stablyai/orca/pull/18995\n* fix: keep paired tab updates live after runtime terminal fallback by @nwparker in https://github.com/stablyai/orca/pull/19022\n* fix: avoid credit deadlock during large SSH PTY recovery by @nwparker in https://github.com/stablyai/orca/pull/19026\n* fix: recognize working WSL1 without a WSL2 kernel by @nwparker in https://github.com/stablyai/orca/pull/19061\n* fix(ports): coalesce advertised URL refresh bursts by @nwparker in https://github.com/stablyai/orca/pull/19150\n* perf(agent-status): stop no-op retirements rebuilding the retired-pane-key map by @nwparker in https://github.com/stablyai/orca/pull/19142\n* perf(worktrees): stop worktree teardown replacing arrays and maps it never touched by @nwparker in https://github.com/stablyai/orca/pull/19145\n* fix(cmd-j): remove duplicate browser ownership inputs by @nwparker in https://github.com/stablyai/orca/pull/19172\n* fix: recognize the kimi-code process as the kimi agent by @Aladex in https://github.com/stablyai/orca/pull/18634\n* fix: release floating terminal WebGL contexts while closed by @nwparker in https://github.com/stablyai/orca/pull/19000\n* fix: fence browser recovery to attach inventory placements by @nwparker in https://github.com/stablyai/orca/pull/18910\n* test: refresh paired palette host-qualified row locators by @nwparker in https://github.com/stablyai/orca/pull/19175\n* test: cover native Wayland Hangul in isolated CI by @nwparker in https://github.com/stablyai/orca/pull/19174\n* test(e2e): scope paired preview link checks to confirmation by @nwparker in https://github.com/stablyai/orca/pull/18924\n* test: await rendered remote agent placement before checking mirrors by @nwparker in https://github.com/stablyai/orca/pull/18983\n* test: scope selected runtime project assertions to the sidebar by @nwparker in https://github.com/stablyai/orca/pull/19003\n* test: confirm running-command prompts when closing tabs by @nwparker in https://github.com/stablyai/orca/pull/18965\n* Fix MiniMax China usage routing and credential handling by @weekbin in https://github.com/stablyai/orca/pull/14929\n* fix(rate-limits): stop reporting Grok usage as 0% when the API omits the percent by @TimothyVang in https://github.com/stablyai/orca/pull/17936\n* test: enable software WebGL for Linux CI headful specs by @nwparker in https://github.com/stablyai/orca/pull/19001\n* test: restore snapshot path before draining hydration FIFO by @nwparker in https://github.com/stablyai/orca/pull/19186\n* test: return paired browser state from the successful poll by @nwparker in https://github.com/stablyai/orca/pull/19189\n* feat: real background push notifications for the mobile app (#8129) by @Jinwoo-H in https://github.com/stablyai/orca/pull/18554\n* test: align worker recovery fixture with ownership policy by @nwparker in https://github.com/stablyai/orca/pull/19190\n* feat(orchestration): orchestrate native-born structured chat sessions by @brennanb2025 in https://github.com/stablyai/orca/pull/18827\n* fix(native-chat): remember structured chat model and effort picks by @brennanb2025 in https://github.com/stablyai/orca/pull/19147\n* fix(native-chat): list the slash commands and skills a structured Claude session actually loaded by @brennanb2025 in https://github.com/stablyai/orca/pull/19127\n* skills: rewrite and trim the seven non-orchestration guides by @Jinwoo-H in https://github.com/stablyai/orca/pull/19128\n* feat(chat): support structured /clear and /compact commands by @brennanb2025 in https://github.com/stablyai/orca/pull/19164\n* revert: hold mobile push feature for user testing by @Jinwoo-H in https://github.com/stablyai/orca/pull/19203\n* fix(editor): support Shift+wheel scrolling in combined diffs by @brohoya in https://github.com/stablyai/orca/pull/11756\n* feat(native-chat): resume an Agent Session History row into a new structured chat by @brennanb2025 in https://github.com/stablyai/orca/pull/19176\n* fix(mobile): stop double-scaling commit timestamps in history rows by @blade035 in https://github.com/stablyai/orca/pull/17731\n* fix(runtime): apply the structured-chat setting to every RPC caller by @brennanb2025 in https://github.com/stablyai/orca/pull/18700\n* fix(native-chat): settle structured chat turns stranded by a restart by @brennanb2025 in https://github.com/stablyai/orca/pull/19122\n* fix: eliminate quadratic whitespace trimming during fullscreen scrolling by @nwparker in https://github.com/stablyai/orca/pull/19214\n* Restore independent push gateway deployment by @Jinwoo-H in https://github.com/stablyai/orca/pull/19225\n* Fix push deployment source archive path by @Jinwoo-H in https://github.com/stablyai/orca/pull/19231\n* Reorganize MiniMax modules and de-duplicate shared test state by @nwparker in https://github.com/stablyai/orca/pull/19197\n* fix: repaint hidden output overflow after answered restore deadline by @nwparker in https://github.com/stablyai/orca/pull/18904\n* fix: retain MSYS shell descendants in their terminal job by @nwparker in https://github.com/stablyai/orca/pull/19068\n* fix(test): unbreak main — admit the adoption-replay create fixture through the structured-chat gate by @nwparker in https://github.com/stablyai/orca/pull/19246\n* Fix MiniMax credential-expiry reporting, region sync, and refresh by @nwparker in https://github.com/stablyai/orca/pull/19250\n* fix(orchestration): recover Codex idle after completion title race by @Jinwoo-H in https://github.com/stablyai/orca/pull/19243\n* feat(relay): time successful client accepts and control round trips by @Jinwoo-H in https://github.com/stablyai/orca/pull/19232\n* fix(relay): rehome hosts to their preferred region in either direction by @Jinwoo-H in https://github.com/stablyai/orca/pull/19241\n* perf(mobile): cut the relay reconnect critical path and admit dead sockets faster by @Jinwoo-H in https://github.com/stablyai/orca/pull/19236\n* feat(mobile): draw the last known tab strip while a session reconnects by @Jinwoo-H in https://github.com/stablyai/orca/pull/19258\n* feat(relay): alert on far-cell placement and skewed region hints by @Jinwoo-H in https://github.com/stablyai/orca/pull/19253\n* fix(test): give federation tests a real read-after-write sync barrier by @Jinwoo-H in https://github.com/stablyai/orca/pull/19262\n* revert(mobile): hold the relay reconnect path and cache-first reconnect for a separate mobile pass by @Jinwoo-H in https://github.com/stablyai/orca/pull/19265\n* relay: give the asia-east2 cells the regional rehome identity by @Jinwoo-H in https://github.com/stablyai/orca/pull/19239\n* fix(relay): emit pending-conn details to hosts that advertise the capability (cell side) by @Jinwoo-H in https://github.com/stablyai/orca/pull/19266\n* fix(relay): bound control RTT samples per ping and per flush window by @Jinwoo-H in https://github.com/stablyai/orca/pull/19268\n* fix(relay-ops): let the rehome trust probe approve the asia-east2 cells by @Jinwoo-H in https://github.com/stablyai/orca/pull/19275\n* fix(codex): distinguish personal and enterprise accounts sharing an email by @nwparker in https://github.com/stablyai/orca/pull/19279\n* test(relay): prove the pending-conn capability header reaches acceptControl by @Jinwoo-H in https://github.com/stablyai/orca/pull/19274\n* feat(windows): enable structured Codex chat on native Windows by @brennanb2025 in https://github.com/stablyai/orca/pull/18519\n* test(ssh): isolate the MFA fixture from the developer's real ~/.ssh by @brennanb2025 in https://github.com/stablyai/orca/pull/19300\n* Add localization for activity view and sidebar by @OrcaWin in https://github.com/stablyai/orca/pull/18589\n* fix(native-chat): make structured chat tabs renameable by @brennanb2025 in https://github.com/stablyai/orca/pull/19153\n* feat(native-chat): show Codex subagent activity instead of opcode rows by @brennanb2025 in https://github.com/stablyai/orca/pull/18773\n* fix(agent-status): stop a stale self-authored agent title from faking a pending question by @brennanb2025 in https://github.com/stablyai/orca/pull/19237\n* fix(terminal): remount a pane left unbound by a spawn that returned no PTY id by @brennanb2025 in https://github.com/stablyai/orca/pull/19223\n* fix(relay): stop rejecting the near region on a cold first probe by @Jinwoo-H in https://github.com/stablyai/orca/pull/19233\n* perf(mobile): cut the relay reconnect critical path and admit dead sockets faster (mobile pass) by @Jinwoo-H in https://github.com/stablyai/orca/pull/19280\n* perf(mobile): open a session with parallel startup RPCs and a pre-warmed terminal engine by @Jinwoo-H in https://github.com/stablyai/orca/pull/19260\n* fix(relay): attach a phone whose accept straddles a control rebind (desktop side) by @Jinwoo-H in https://github.com/stablyai/orca/pull/19238\n* tools: add a phone-vantage relay connect benchmark by @Jinwoo-H in https://github.com/stablyai/orca/pull/19251\n* feat(mobile): draw the last known tab strip while a session reconnects (mobile pass) by @Jinwoo-H in https://github.com/stablyai/orca/pull/19281\n* feat(relay): log the region probe and name the assigned cell by @Jinwoo-H in https://github.com/stablyai/orca/pull/19307\n* perf(mobile): race the direct and relay dials from t=0 on every reconnect by @Jinwoo-H in https://github.com/stablyai/orca/pull/19308\n* feat(mobile): time relay dial stages so diagnostics say where a slow connect went by @Jinwoo-H in https://github.com/stablyai/orca/pull/19245\n* Persist agents sidebar search visibility as pairing-local preference by @AmethystLiang in https://github.com/stablyai/orca/pull/19313\n* feat(chat): add structured session rewind backend by @brennanb2025 in https://github.com/stablyai/orca/pull/19235\n* Defer inactive browser pages across worktree switches by @AmethystLiang in https://github.com/stablyai/orca/pull/19326\n* fix(native-chat): stop an unanswered host from reading as one that refuses structured chat by @brennanb2025 in https://github.com/stablyai/orca/pull/19321\n* fix(native-chat): scope composer file drops to the pane that received them by @brennanb2025 in https://github.com/stablyai/orca/pull/19328\n* revert(mobile): pull the relay connect-speed mobile pass pending a smaller, verified re-land by @Jinwoo-H in https://github.com/stablyai/orca/pull/19348\n* fix(relay): never cache a region hint from a one-region catalog by @Jinwoo-H in https://github.com/stablyai/orca/pull/19349\n* Show native chat message timestamps on hover by @brennanb2025 in https://github.com/stablyai/orca/pull/19218\n* feat(native-chat): add execution details and tool row identity by @brennanb2025 in https://github.com/stablyai/orca/pull/19226\n* chore(mobile): remove stale max-lines exceptions by @nwparker in https://github.com/stablyai/orca/pull/19366\n* fix(native-chat): render compaction notices, plan documents, and images by @brennanb2025 in https://github.com/stablyai/orca/pull/19228\n* fix(sidebar): reveal collapsed workspaces without clearing filters by @nwparker in https://github.com/stablyai/orca/pull/19398\n* fix(orchestration): avoid full message scans on working terminal titles by @brennanb2025 in https://github.com/stablyai/orca/pull/19390\n* fix(deps): update desktop parsers for security and bounded resource use by @OrcaWin in https://github.com/stablyai/orca/pull/19361\n* fix(deps): harden cloud HTTP, WebSocket and build dependencies by @OrcaWin in https://github.com/stablyai/orca/pull/19362\n* chore(mobile): patch XML parser security in plist tooling by @OrcaWin in https://github.com/stablyai/orca/pull/19380\n* chore(docs): patch brace expansion resource exhaustion fixes by @OrcaWin in https://github.com/stablyai/orca/pull/19382\n* fix(deps): update react-i18next for TypeScript 7 and translation parsing by @OrcaWin in https://github.com/stablyai/orca/pull/19378\n* fix(deps): update DOMPurify for sanitizer and document-context fixes by @OrcaWin in https://github.com/stablyai/orca/pull/19377\n* fix(ci): read the changed-path list past the first pipe buffer by @nwparker in https://github.com/stablyai/orca/pull/19409\n* fix(xterm): remove scrollback decorations by identity by @bbingz in https://github.com/stablyai/orca/pull/13178\n* feat(native-chat): read a tool batch as a group by @brennanb2025 in https://github.com/stablyai/orca/pull/19372\n* fix(deps): upgrade Electron to 43.6 for startup performance and crash fixes by @OrcaWin in https://github.com/stablyai/orca/pull/19369\n* fix: preserve user input during terminal scrollback replay by @nwparker in https://github.com/stablyai/orca/pull/19075\n* Unify sidebar create actions into single dropdown menu by @AmethystLiang in https://github.com/stablyai/orca/pull/19375\n* fix: preserve terminal retirement proof across renderer publications by @nwparker in https://github.com/stablyai/orca/pull/19002\n* perf(renderer): avoid per-second spinner animation events by @OrcaWin in https://github.com/stablyai/orca/pull/19407\n* fix(pi): show input modals as waiting instead of working by @mmarabel in https://github.com/stablyai/orca/pull/18836\n* Fix sidebar create menu E2E races by @AmethystLiang in https://github.com/stablyai/orca/pull/19448\n* test: cover input in five simultaneously flooding SSH panes by @nwparker in https://github.com/stablyai/orca/pull/19071\n* fix(runtime): stop a first status publication retiring in-flight worktree scans by @nwparker in https://github.com/stablyai/orca/pull/19357\n* fix(clipboard): route runtime-owned SSH image paste through the runtime by @nwparker in https://github.com/stablyai/orca/pull/19352\n* fix(sidebar): label pinned rows with their host on a multi-host sidebar by @nwparker in https://github.com/stablyai/orca/pull/19351\n* Log error details on session kill failure by @AmethystLiang in https://github.com/stablyai/orca/pull/19381\n* Stabilize scrollbar gutter to prevent message list layout shift by @AmethystLiang in https://github.com/stablyai/orca/pull/19332\n* Rank activity status groups by attention level by @AmethystLiang in https://github.com/stablyai/orca/pull/19329\n* perf: index selected team IDs and choose primary team in one pass by @OrcaWin in https://github.com/stablyai/orca/pull/19504\n* perf: skip Git-status indexing without eligible editors by @OrcaWin in https://github.com/stablyai/orca/pull/19437\n* perf: stop filesystem authorization at the first matching root by @OrcaWin in https://github.com/stablyai/orca/pull/19438\n* perf: index editor ownership and restored workspace projections by @OrcaWin in https://github.com/stablyai/orca/pull/19444\n* fix: avoid duplicate repository groups during catalog refresh by @kiendle in https://github.com/stablyai/orca/pull/19170\n* Fix native PTY I/O failures disabling session termination by @AmethystLiang in https://github.com/stablyai/orca/pull/19523\n* perf: index project table option and iteration order by @OrcaWin in https://github.com/stablyai/orca/pull/19476\n* perf: stop clone URL discovery at the first usable source by @OrcaWin in https://github.com/stablyai/orca/pull/19477\n* perf: clone only changed work-item pages by @OrcaWin in https://github.com/stablyai/orca/pull/19478\n* perf: use counted membership for worker transcript roster twins by @OrcaWin in https://github.com/stablyai/orca/pull/19484\n* perf: skip sorting when all final automation runs fit by @OrcaWin in https://github.com/stablyai/orca/pull/19485\n* perf: parse Git history headers without splitting commit bodies by @OrcaWin in https://github.com/stablyai/orca/pull/19486\n* perf: index forgotten Codex turns for bounded ordinal retention by @OrcaWin in https://github.com/stablyai/orca/pull/19488\n* perf: cache matched and unmatched Claude usage cwd attribution by @OrcaWin in https://github.com/stablyai/orca/pull/19489\n* perf: sum omitted workspace sizes without intermediate objects by @OrcaWin in https://github.com/stablyai/orca/pull/19491\n* fix(activity): show working agents under \"unread only\" by giving working turns a read receipt by @AmethystLiang in https://github.com/stablyai/orca/pull/19535\n* test: fix automation and browser reconciliation e2e tests by @AmethystLiang in https://github.com/stablyai/orca/pull/19530\n* perf: index VM feature restoration and precompute sorting identities by @OrcaWin in https://github.com/stablyai/orca/pull/19457\n* perf: reuse normalized path matchers for batch deletion by @OrcaWin in https://github.com/stablyai/orca/pull/19458\n* perf: normalize only retained browser history candidates by @OrcaWin in https://github.com/stablyai/orca/pull/19460\n* perf: index prior memberships during project identity succession by @OrcaWin in https://github.com/stablyai/orca/pull/19463\n* perf: precompute Jira priority and timestamp sorting keys by @OrcaWin in https://github.com/stablyai/orca/pull/19472\n* perf: parse external automation dates once per run by @OrcaWin in https://github.com/stablyai/orca/pull/19474\n* Verify failure causality in PR checks fix prompt before making changes by @AmethystLiang in https://github.com/stablyai/orca/pull/19435\n* fix(remote): keep terminal tabs syncing after orphan recovery by @shaharmor in https://github.com/stablyai/orca/pull/19065\n* perf(native-chat): bound journal reads during paged catch-up by @nwparker in https://github.com/stablyai/orca/pull/19360\n* perf(native-chat): preserve historical tool rows while streaming by @nwparker in https://github.com/stablyai/orca/pull/19364\n* perf: memoize ancestry when selecting foreground agents by @OrcaWin in https://github.com/stablyai/orca/pull/19502\n* fix(terminal): fold-safe CAN/SUB and double-ESC handling in partial-escape tail by @nwparker in https://github.com/stablyai/orca/pull/19521\n* perf: lazily index case-insensitive Windows environment keys by @OrcaWin in https://github.com/stablyai/orca/pull/19483\n* perf: select highest usage totals without full sorting by @OrcaWin in https://github.com/stablyai/orca/pull/19490\n* fix(agent-hooks): guard every Windows missing-target fallback before it reads stdin by @nwparker in https://github.com/stablyai/orca/pull/19415\n* perf: count GitLab diff line prefixes without splitting all lines by @OrcaWin in https://github.com/stablyai/orca/pull/19505\n* fix(terminal): remove host-retired ghost panes in paired remote splits (#17770) by @nwparker in https://github.com/stablyai/orca/pull/19365\n* feat(terminal): make the contrast floor user-configurable (#10754) by @nwparker in https://github.com/stablyai/orca/pull/18126\n* fix(orchestration): file federated worker mail under the coordinator Run by @Jinwoo-H in https://github.com/stablyai/orca/pull/19542\n* fix(orchestration): refuse Task re-open under a live worker; allow stop re-issue on a stranded row by @Jinwoo-H in https://github.com/stablyai/orca/pull/19551\n* fix(i18n): drop orphan TerminalPane.minimumContrast entries that broke main static analysis by @nwparker in https://github.com/stablyai/orca/pull/19566\n* Remove settled-worker automatic resume and hibernation fences by @Jinwoo-H in https://github.com/stablyai/orca/pull/19544\n* fix(pi): finish the dialog-wait signal on every surface by @nwparker in https://github.com/stablyai/orca/pull/19533\n* Organize activity menu into filter and view sections by @AmethystLiang in https://github.com/stablyai/orca/pull/19547\n* fix(orchestration): own a worker terminal from creation, not after the boot wait by @Jinwoo-H in https://github.com/stablyai/orca/pull/19608\n* fix(orchestration): fence worker release on mobile keystrokes by @Jinwoo-H in https://github.com/stablyai/orca/pull/19337\n* fix(native-chat): place effort to the right of model picker by @brennanb2025 in https://github.com/stablyai/orca/pull/19617\n* Show picker-selected native chat skills as pills by @brennanb2025 in https://github.com/stablyai/orca/pull/19616\n* fix(native-chat): reveal message chrome on keyboard focus, not any focus by @brennanb2025 in https://github.com/stablyai/orca/pull/19426\n* Unify native chat and workspace tab command dispatch by @brennanb2025 in https://github.com/stablyai/orca/pull/19621\n* fix(browser): load newly opened background tabs by @brennanb2025 in https://github.com/stablyai/orca/pull/19633\n* fix(renderer): align native chat pane layering by @brennanb2025 in https://github.com/stablyai/orca/pull/19626\n* Summarize turn file changes and preserve resolved prompt receipts by @brennanb2025 in https://github.com/stablyai/orca/pull/19229\n* perf: track pane alias singleton or ambiguity without copying buckets by @OrcaWin in https://github.com/stablyai/orca/pull/19479\n* perf: preserve store state on unchanged document titles by @OrcaWin in https://github.com/stablyai/orca/pull/19459\n* perf: index document history workspace and path identities by @OrcaWin in https://github.com/stablyai/orca/pull/19461\n* perf: index unified tabs for browser palette entries by @OrcaWin in https://github.com/stablyai/orca/pull/19464\n* perf: append to owned project source lists without repeated copying by @OrcaWin in https://github.com/stablyai/orca/pull/19465\n* perf: lazily index workspace tabs during terminal binding replay by @OrcaWin in https://github.com/stablyai/orca/pull/19466\n* perf: retire exhausted buckets from host-balanced listings by @OrcaWin in https://github.com/stablyai/orca/pull/19493\n* perf: replay pending chat asks with a FIFO cursor by @OrcaWin in https://github.com/stablyai/orca/pull/19496\n* perf: cache same-axis pane subtree weights during equalization by @OrcaWin in https://github.com/stablyai/orca/pull/19500\n* perf: group chat history sequences lazily within result windows by @OrcaWin in https://github.com/stablyai/orca/pull/19501\n* perf: measure sidebar row geometry once before sorting delete anchors by @OrcaWin in https://github.com/stablyai/orca/pull/19503\n* perf: concatenate only carried JSONL line prefixes by @OrcaWin in https://github.com/stablyai/orca/pull/19506\n* perf: index discovered skill IDs and names for batch selection by @OrcaWin in https://github.com/stablyai/orca/pull/19507\n* perf: skip fuzzy ranking when exact file matches fill the window by @OrcaWin in https://github.com/stablyai/orca/pull/19509\n* perf: index tab membership when rebasing authoritative sessions by @OrcaWin in https://github.com/stablyai/orca/pull/19510\n* perf: reuse collators when sorting discovered skills by @OrcaWin in https://github.com/stablyai/orca/pull/19440\n* perf: reuse collators when scanning Warp themes by @OrcaWin in https://github.com/stablyai/orca/pull/19441\n* perf: avoid repeated pending SOCKS payload copies by @OrcaWin in https://github.com/stablyai/orca/pull/19439\n* perf(terminal): avoid quadratic status-marker scans in output bursts by @nwparker in https://github.com/stablyai/orca/pull/19373\n* perf: index selected-host SSH leases by PTY by @OrcaWin in https://github.com/stablyai/orca/pull/19467\n* perf: index selected ancestor coverage during sidebar drag by @OrcaWin in https://github.com/stablyai/orca/pull/19443\n* perf: index Resource Manager labels and accumulated workspace rows by @OrcaWin in https://github.com/stablyai/orca/pull/19480\n* perf: drop oversized diagnostic records before retaining serialized text by @OrcaWin in https://github.com/stablyai/orca/pull/19445\n* perf: index selected skills when reporting bundle failures by @OrcaWin in https://github.com/stablyai/orca/pull/19481\n* perf: bound tool pairing and avoid unused attribution arrays by @OrcaWin in https://github.com/stablyai/orca/pull/19468\n* perf: scope activation inventory to the owning host and workspace by @OrcaWin in https://github.com/stablyai/orca/pull/19447\n* perf: index closed browser page IDs during focus cleanup by @OrcaWin in https://github.com/stablyai/orca/pull/19449\n* perf: prune metadata caches only when an entry can expire by @OrcaWin in https://github.com/stablyai/orca/pull/19450\n* perf: index observable skill installations by locked name by @OrcaWin in https://github.com/stablyai/orca/pull/19451\n* perf: skip folder-scope construction for separate repository imports by @OrcaWin in https://github.com/stablyai/orca/pull/19452\n* perf: validate terminal adoption MRU membership with group sets by @OrcaWin in https://github.com/stablyai/orca/pull/19482\n* perf: index terminal neighbor order and remaining membership by @OrcaWin in https://github.com/stablyai/orca/pull/19453\n* perf: index usage session breakdowns during aggregation and merge by @OrcaWin in https://github.com/stablyai/orca/pull/19487\n* perf: reuse AI-vault path matchers and query and sort keys by @OrcaWin in https://github.com/stablyai/orca/pull/19469\n* perf: cache AI-vault project attribution by host and cwd by @OrcaWin in https://github.com/stablyai/orca/pull/19470\n* perf: select checks-panel workspace attribution in one pass by @OrcaWin in https://github.com/stablyai/orca/pull/19471\n* perf: cache update timestamps for Linear and Jira result sorting by @OrcaWin in https://github.com/stablyai/orca/pull/19473\n* perf: reuse naturally ordered unique Codex trust ranges by @OrcaWin in https://github.com/stablyai/orca/pull/19492\n* perf: count command-line escapes without regex match arrays by @OrcaWin in https://github.com/stablyai/orca/pull/19499\n* perf: check backfill date cardinality before expanding ranges by @OrcaWin in https://github.com/stablyai/orca/pull/19456\n* perf: reuse normalized task-page repository selection by @OrcaWin in https://github.com/stablyai/orca/pull/19454\n* fix(native-chat): unify launch routing and support structured worker placement by @brennanb2025 in https://github.com/stablyai/orca/pull/19431\n* feat(native-chat): show Claude subagent activity on the shared carrier by @brennanb2025 in https://github.com/stablyai/orca/pull/18806\n* fix(orchestration): unify structured-session status across worktree ps and sidebar by @brennanb2025 in https://github.com/stablyai/orca/pull/19217\n* fix(native-chat): expand Claude slash commands sent with an attachment by @brennanb2025 in https://github.com/stablyai/orca/pull/19654\n* fix(native-chat): keep collapsible chevrons beside their header text by @brennanb2025 in https://github.com/stablyai/orca/pull/19656\n* fix(orchestration): worker-start settles readiness on observed turn start, not write acceptance by @brennanb2025 in https://github.com/stablyai/orca/pull/19423\n* test(orchestration): pin the Run-required contract for unbound direct mail by @brennanb2025 in https://github.com/stablyai/orca/pull/19684\n* fix(orchestration): accept a missing Run id from older federation coordinators by @brennanb2025 in https://github.com/stablyai/orca/pull/19689\n* Render task checklists with update diffs and a composer progress panel by @brennanb2025 in https://github.com/stablyai/orca/pull/19230\n* fix(lint): preserve deliberate collator benchmark baselines by @brennanb2025 in https://github.com/stablyai/orca/pull/19686\n* fix(native-chat): merge duplicate native-chat-types import by @Jinwoo-H in https://github.com/stablyai/orca/pull/19698\n* fix(orchestration): file mail from terminals in no Run under an unbound Run by @Jinwoo-H in https://github.com/stablyai/orca/pull/19696\n* feat(native-chat): report Codex background tasks in the chat strip by @brennanb2025 in https://github.com/stablyai/orca/pull/19346\n* Unify tab surface selection across workspace activation by @brennanb2025 in https://github.com/stablyai/orca/pull/19635\n* refactor(ai-vault): split the session scanner into a transcript reader and consumers by @Jinwoo-H in https://github.com/stablyai/orca/pull/19666\n* perf: stop queued metadata work after watcher cancellation by @OrcaWin in https://github.com/stablyai/orca/pull/19446\n* perf(runtime): skip hibernation inventories without completed agents by @nwparker in https://github.com/stablyai/orca/pull/19391\n* perf(workspaces): skip unchanged heartbeat subscriber work by @nwparker in https://github.com/stablyai/orca/pull/19392\n* perf: probe requested pane keys instead of enumerating records by @OrcaWin in https://github.com/stablyai/orca/pull/19494\n* perf: resolve current-workspace document addresses before catalog scans by @OrcaWin in https://github.com/stablyai/orca/pull/19495\n* perf: materialize only the requested recent plugin audit lines by @OrcaWin in https://github.com/stablyai/orca/pull/19498\n* test(ci): replace fixed teardown waits with bounded polls by @nwparker in https://github.com/stablyai/orca/pull/19720\n* perf: stop merging OS-opened files at the pending queue cap by @OrcaWin in https://github.com/stablyai/orca/pull/19508\n* perf(terminal): skip plain text between partial escape sequences by @nwparker in https://github.com/stablyai/orca/pull/19393\n* perf(terminal): release oversized backing strings behind pending controls by @nwparker in https://github.com/stablyai/orca/pull/19396\n* perf(terminal): skip ordinary output in preview control scans by @nwparker in https://github.com/stablyai/orca/pull/19400\n* perf(terminal): own retained tail rows so they stop pinning their chunks by @nwparker in https://github.com/stablyai/orca/pull/19528\n* perf: check tunnel queue capacity before copying frame payloads by @OrcaWin in https://github.com/stablyai/orca/pull/19497\n* Replace the sidebar create dropdown with two direct action buttons by @AmethystLiang in https://github.com/stablyai/orca/pull/19653\n* fix(native-chat): keep worktree active during chat creation by @Jinwoo-H in https://github.com/stablyai/orca/pull/19753\n* fix(push): isolate deployment and validate candidates before activation by @Jinwoo-H in https://github.com/stablyai/orca/pull/19771\n* fix(native-chat): show Claude working from the send, not the provider echo by @brennanb2025 in https://github.com/stablyai/orca/pull/19822\n* fix(mobile): enable patch-free iOS text selection in native chat by @brennanb2025 in https://github.com/stablyai/orca/pull/19769\n* perf(terminal): resume OSC terminator search past the carried frame by @nwparker in https://github.com/stablyai/orca/pull/19839\n* perf(native-chat): bound retained items on the structured session path by @nwparker in https://github.com/stablyai/orca/pull/19841\n* perf(terminal): share one ESC dispatch table between the two scanners by @nwparker in https://github.com/stablyai/orca/pull/19842\n* fix(native-chat): one `/` picker for every agent, anywhere in the prompt by @brennanb2025 in https://github.com/stablyai/orca/pull/19832\n* feat(native-chat): the background-tasks strip says what is running by @brennanb2025 in https://github.com/stablyai/orca/pull/19311\n* fix(i18n): drop the stale TerminalPane.minimumContrast entries from the runtime catalog (main red again) by @nwparker in https://github.com/stablyai/orca/pull/19575\n* fix(native-chat): keep an older page from punching a hole in the transcript by @nwparker in https://github.com/stablyai/orca/pull/19845\n* refactor(agent-status): publish structured sessions into the hook server store by @brennanb2025 in https://github.com/stablyai/orca/pull/19683\n* fix(orchestration): scope @ group addresses to the sender's Run by @Jinwoo-H in https://github.com/stablyai/orca/pull/19783\n* feat(native-chat): show live background work and name each row by kind by @brennanb2025 in https://github.com/stablyai/orca/pull/19705\n* feat(sidebar): show native-chat subagents as sidebar child rows, like CLI agents already do by @brennanb2025 in https://github.com/stablyai/orca/pull/19807\n* feat(native-chat): focus the message box when a chat appears by @brennanb2025 in https://github.com/stablyai/orca/pull/19868\n* fix(relay): keep failed rehome polls out of the durable failure budget by @Jinwoo-H in https://github.com/stablyai/orca/pull/19915\n* fix(orchestration): revalidate an attempted Enter instead of resending it by @brennanb2025 in https://github.com/stablyai/orca/pull/19911\n* test(native-chat): split structured question fixtures by @brennanb2025 in https://github.com/stablyai/orca/pull/19924\n* Make the structured turn lifecycle row durable so completed durations survive by @brennanb2025 in https://github.com/stablyai/orca/pull/19695\n* refactor(native-chat): unify agent session launch and open drafts in structured chat by @brennanb2025 in https://github.com/stablyai/orca/pull/19681\n* feat(cloud): native push gateway and dedicated infrastructure (1/3) by @Jinwoo-H in https://github.com/stablyai/orca/pull/19912\n* fix(browser): restore the Chrome-shaped browser identity (STA-7147) by @brennanb2025 in https://github.com/stablyai/orca/pull/19927\n* refactor(mobile): extract settings, diagnostics and editor-document screens from their routes by @Jinwoo-H in https://github.com/stablyai/orca/pull/19675\n* fix(native-chat): never adopt an unlisted model as the launch default by @brennanb2025 in https://github.com/stablyai/orca/pull/19854\n* fix(native-chat): settle a structured send on admission, not on the provider echo by @brennanb2025 in https://github.com/stablyai/orca/pull/19863\n* feat(desktop): native mobile push integration (2/3) by @Jinwoo-H in https://github.com/stablyai/orca/pull/19935\n* fix(sidebar): let an agent row show the provider's own session title by @brennanb2025 in https://github.com/stablyai/orca/pull/19936\n* fix(editor): make markdown images inline so a paragraph stays schema-valid by @OrcaWin in https://github.com/stablyai/orca/pull/19746\n* feat(native-chat): record the provider's name for an agent session by @brennanb2025 in https://github.com/stablyai/orca/pull/19908\n* fix(release): port three release-gate fixes to main so cuts stop re-inheriting them by @brennanb2025 in https://github.com/stablyai/orca/pull/19945\n* refactor(renderer): share path head elision by @AmethystLiang in https://github.com/stablyai/orca/pull/19938\n* feat(cmd-j): compact palette location layout by @AmethystLiang in https://github.com/stablyai/orca/pull/19939\n* refactor(mobile): name the RPC acceptance policies call sites hand-rolled by @Jinwoo-H in https://github.com/stablyai/orca/pull/19960\n* fix: prompt unexpectedly signed-out Cloud users once per version by @Jinwoo-H in https://github.com/stablyai/orca/pull/19966\n* feat(ai-vault-search): session search index as a transcript reader consumer by @Jinwoo-H in https://github.com/stablyai/orca/pull/19687\n* fix(native-chat): pass agent-implemented slash commands through to the agent by @brennanb2025 in https://github.com/stablyai/orca/pull/19929\n* perf(terminal): stop rebuilding per-workspace collections on a worktree switch by @nwparker in https://github.com/stablyai/orca/pull/19975\n* feat(rpc): generate a shared params catalog from the host registry, gated on parse parity by @Jinwoo-H in https://github.com/stablyai/orca/pull/19961\n* feat(native-chat): describe slash commands from the provider's own report by @brennanb2025 in https://github.com/stablyai/orca/pull/19928\n* perf(terminal): stop spending reveal-restore frames on panes that replay nothing by @nwparker in https://github.com/stablyai/orca/pull/19972\n* i18n: Make file reveal labels translatable by @OrcaWin in https://github.com/stablyai/orca/pull/20010\n* perf(native-chat): mount only the transcript rows near the viewport by @brennanb2025 in https://github.com/stablyai/orca/pull/19869\n* feat(mobile): receive native push notifications from paired desktops by @Jinwoo-H in https://github.com/stablyai/orca/pull/19951\n* fix(workspaces): seed shells only for blank selection by @brennanb2025 in https://github.com/stablyai/orca/pull/19940\n* Hide desktop theme imports from paired web clients by @OrcaWin in https://github.com/stablyai/orca/pull/20015\n* feat(ai-vault-search): session search query engine over the index by @Jinwoo-H in https://github.com/stablyai/orca/pull/19750\n* refactor(shared): derive WellKnownAgentType from TuiAgent by @AmethystLiang in https://github.com/stablyai/orca/pull/19645\n* Revert \"feat(ai-vault-search): session search query engine over the index (#19750)\" by @Jinwoo-H in https://github.com/stablyai/orca/pull/20023\n* feat(ai-vault-search): session search indexer library owning backfill, reconcile and retention by @Jinwoo-H in https://github.com/stablyai/orca/pull/19751\n* refactor(rpc): make defineMethod preserve the method name and handler result by @Jinwoo-H in https://github.com/stablyai/orca/pull/20016\n* fix(daemon): pin owner-only modes on persisted terminal history by @nwparker in https://github.com/stablyai/orca/pull/19954\n* Revert mobile push rollout pending delivery investigation by @Jinwoo-H in https://github.com/stablyai/orca/pull/20040\n* fix(pi): retire stale spinner and prompt timers across reloads by @nwparker in https://github.com/stablyai/orca/pull/20035\n* fix(terminal): stop the recovery budget erasing itself during a remount by @OrcaWin in https://github.com/stablyai/orca/pull/19745\n* fix(monaco): bound embedded-language recursion in svelte/astro/vue grammars by @OrcaWin in https://github.com/stablyai/orca/pull/19748\n* fix(runtime): agent-neutral wait-blocked reasons by @OrcaWin in https://github.com/stablyai/orca/pull/19749\n* fix(worktrees): close an idle structured chat on delete instead of refusing by @brennanb2025 in https://github.com/stablyai/orca/pull/19762\n* fix(runtime): let connections own host status recovery by @Jinwoo-H in https://github.com/stablyai/orca/pull/20003\n* fix(native-chat): show one live-turn indicator, and make Thinking mean reasoning by @brennanb2025 in https://github.com/stablyai/orca/pull/19977\n* perf(terminal): mount only the visible pane on a worktree switch by @nwparker in https://github.com/stablyai/orca/pull/20034\n* test(monaco): drive the real Monarch tokenizer instead of walking rule tables by @nwparker in https://github.com/stablyai/orca/pull/19981\n* test(runtime): capture real Antigravity transcripts — the detector is inverted on live output by @nwparker in https://github.com/stablyai/orca/pull/19983\n* fix(pi): claim the status pane when the inherited owner PID is dead (STA-5245) by @brennanb2025 in https://github.com/stablyai/orca/pull/16631\n* fix(pi): load extension providers for source control generation by @nwparker in https://github.com/stablyai/orca/pull/20070\n* fix(terminal): keep a deliberately slept workspace cold until it is woken by @nwparker in https://github.com/stablyai/orca/pull/20075\n* perf(daemon): stop scanning every cell for OSC links that cannot exist by @nwparker in https://github.com/stablyai/orca/pull/20077\n* fix(terminal): move the recovery ledger onto the tab row and gate it on observed outcome by @nwparker in https://github.com/stablyai/orca/pull/20025\n* fix(push): preserve distinct Android alerts while offline by @Jinwoo-H in https://github.com/stablyai/orca/pull/20066\n* feat(native-chat): show when a Codex goal is set, changed, or cleared by @brennanb2025 in https://github.com/stablyai/orca/pull/19923\n* Fix remote hosted review browser routing by @Jinwoo-H in https://github.com/stablyai/orca/pull/20030\n* fix(mobile): surface host create warnings and terminal-create errors by @brennanb2025 in https://github.com/stablyai/orca/pull/20125\n* feat(relay): correct regional placement only when the source is idle by @Jinwoo-H in https://github.com/stablyai/orca/pull/20105\n* test(relay): harden regional rehome race coverage by @Jinwoo-H in https://github.com/stablyai/orca/pull/20136\n* feat(desktop): measure relay regions and reconnect after idle cutover by @Jinwoo-H in https://github.com/stablyai/orca/pull/20106\n* refactor(agent-status): delete the runtime's retained row store (PR 1b) by @brennanb2025 in https://github.com/stablyai/orca/pull/19785\n* fix(deps): take Electron 43.7.0 for the glibc environ use-after-free (#20081) by @nwparker in https://github.com/stablyai/orca/pull/20089\n* fix(browser): decode Chromium SameSite storage values (135 cookies silently lost per profile) by @brennanb2025 in https://github.com/stablyai/orca/pull/20076\n* fix(terminal): re-run deferred tab admission when a plan installs mid-activation by @brennanb2025 in https://github.com/stablyai/orca/pull/20176\n* fix(workspaces): complete a worktree create when a post-create step throws by @brennanb2025 in https://github.com/stablyai/orca/pull/20175\n* feat(relay): support protocol 3 in cell rollout gates by @Jinwoo-H in https://github.com/stablyai/orca/pull/20174\n* fix(e2e): remove four real flake sources and one caret race by @brennanb2025 in https://github.com/stablyai/orca/pull/20169\n* fix(source-control): pass the Antigravity prompt to agy --print by @nwparker in https://github.com/stablyai/orca/pull/20147\n* fix(e2e): run worktree first-paint probe on a mapped window by @brennanb2025 in https://github.com/stablyai/orca/pull/20197\n* fix(relay): bound idle rehome polling and skip disabled scans by @Jinwoo-H in https://github.com/stablyai/orca/pull/20203\n* fix(hooks): stop orphaned managed markers from consuming user TOML by @nwparker in https://github.com/stablyai/orca/pull/20148\n* fix(codex): reconcile marketplace and plugin tables through the config mirror by @nwparker in https://github.com/stablyai/orca/pull/20150\n* fix(relay): reuse canary across completed rollout batches by @Jinwoo-H in https://github.com/stablyai/orca/pull/20214\n* Restore mobile push and fix cold-start dismissals by @Jinwoo-H in https://github.com/stablyai/orca/pull/20068\n* fix(cloud): tolerate sparse director errors in rollout monitor by @Jinwoo-H in https://github.com/stablyai/orca/pull/20238\n* feat(ai-vault-search): session search query engine over the index by @Jinwoo-H in https://github.com/stablyai/orca/pull/20029\n* feat(mobile): add typed RPC operations and fence raw requests by @Jinwoo-H in https://github.com/stablyai/orca/pull/20018\n* fix(native-chat): shrink skill pill text by @brennanb2025 in https://github.com/stablyai/orca/pull/20254\n* fix(claude): refuse a structured model the provider does not list by @brennanb2025 in https://github.com/stablyai/orca/pull/19946\n* perf: defer closed menus to speed up cold worktree switching by @nwparker in https://github.com/stablyai/orca/pull/20311\n* test: replace fixed UI waits with observable readiness by @nwparker in https://github.com/stablyai/orca/pull/20369\n* ci: reuse immutable package setup across shutdown checks by @nwparker in https://github.com/stablyai/orca/pull/20368\n* perf: index Hermes session correlation instead of rescanning history by @nwparker in https://github.com/stablyai/orca/pull/20275\n* fix: prevent infinite loops in mobile Markdown rendering by @nwparker in https://github.com/stablyai/orca/pull/20313\n* perf: eliminate mobile review table delimiter backtracking by @nwparker in https://github.com/stablyai/orca/pull/20317\n* perf: eliminate repeated mobile Markdown link suffix scans by @nwparker in https://github.com/stablyai/orca/pull/20322\n* ci: narrow pnpm cache keys and shallow development checkouts by @nwparker in https://github.com/stablyai/orca/pull/20370\n* perf(browser): fill plain fields in one stdin edit by @nwparker in https://github.com/stablyai/orca/pull/20364\n* Fix landing footer menu placement by @nwparker in https://github.com/stablyai/orca/pull/20360\n* ci: balance existing unit and E2E shards using recorded timings by @nwparker in https://github.com/stablyai/orca/pull/20367\n* fix(cloud): diagnose wrapped relay trust probe failures by @Jinwoo-H in https://github.com/stablyai/orca/pull/20403\n* refactor(renderer): improve IPC error handling with clamped and unclamped variants by @AmethystLiang in https://github.com/stablyai/orca/pull/20340\n* Make sidebar nesting easier while preserving animated reordering by @nwparker in https://github.com/stablyai/orca/pull/20412\n* refactor(preload): drop the unused raw electron IPC bridge by @nwparker in https://github.com/stablyai/orca/pull/20419\n* fix(browser): move cookie scoping off psl's stale suffix list by @nwparker in https://github.com/stablyai/orca/pull/20421\n* fix(claude-accounts): stop path resolution from creating the config directory by @makoto-developer in https://github.com/stablyai/orca/pull/12309\n* perf: normalize title evidence once per label search by @nwparker in https://github.com/stablyai/orca/pull/20331\n* fix(runtime): GC expired proven-absent leaf PTY verdicts by @innocarpe in https://github.com/stablyai/orca/pull/12810\n* fix(ai-vault): close OpenCode handles when query_only setup fails by @bbingz in https://github.com/stablyai/orca/pull/14134\n* perf(wsl): release environment probe deadline timers by @OrcaWin in https://github.com/stablyai/orca/pull/20207\n* perf(daemon): bound immediate flush queue scans by @OrcaWin in https://github.com/stablyai/orca/pull/20209\n* perf(mobile): normalize history scope paths once per candidate by @nwparker in https://github.com/stablyai/orca/pull/20210\n* perf(automations): skip sorting count-only Hermes history by @OrcaWin in https://github.com/stablyai/orca/pull/20213\n* perf(chat): reuse streamed delta byte lengths by @OrcaWin in https://github.com/stablyai/orca/pull/20215\n* perf(files): skip unused Quick Open byte accounting by @OrcaWin in https://github.com/stablyai/orca/pull/20216\n* perf(relay): reuse host data attachment owner without inventory copies by @nwparker in https://github.com/stablyai/orca/pull/20219\n* perf(mobile): avoid materializing input characters on backspace by @OrcaWin in https://github.com/stablyai/orca/pull/20220\n* perf(browser): skip unneeded inventory compaction planning by @OrcaWin in https://github.com/stablyai/orca/pull/20221\n* perf(usage): skip session scans for empty breakdowns by @OrcaWin in https://github.com/stablyai/orca/pull/20222\n* perf(session): reuse persisted tab membership set by @OrcaWin in https://github.com/stablyai/orca/pull/20223\n* perf(diff): skip unused extension extraction during search by @OrcaWin in https://github.com/stablyai/orca/pull/20225\n* perf(mobile): bound autocomplete substring retention by @OrcaWin in https://github.com/stablyai/orca/pull/20226\n* perf: index pending terminal reconnect tab lookups by @OrcaWin in https://github.com/stablyai/orca/pull/20229\n* perf: skip ordinary strings in JSON structure checks by @OrcaWin in https://github.com/stablyai/orca/pull/20232\n* perf: avoid rescanning partial browser sidecar responses by @OrcaWin in https://github.com/stablyai/orca/pull/20242\n* perf: count local RPC request bytes incrementally by @OrcaWin in https://github.com/stablyai/orca/pull/20243\n* perf(history): cache numeric transcript timeline bounds by @OrcaWin in https://github.com/stablyai/orca/pull/20244\n* perf: stop heading lookup at the requested occurrence by @OrcaWin in https://github.com/stablyai/orca/pull/20246\n* perf: defer browser search row formatting until matched by @OrcaWin in https://github.com/stablyai/orca/pull/20248\n* perf: stop preparing over-limit palette queries by @OrcaWin in https://github.com/stablyai/orca/pull/20250\n* perf: avoid duplicate repository directory probes by @OrcaWin in https://github.com/stablyai/orca/pull/20253\n* perf: compile nested repository ignore patterns once by @OrcaWin in https://github.com/stablyai/orca/pull/20256\n* perf: avoid repeated model pricing name normalization by @OrcaWin in https://github.com/stablyai/orca/pull/20257\n* perf(skills): index source ownership counts per discovery by @OrcaWin in https://github.com/stablyai/orca/pull/20259\n* perf(plugins): stop collection traversal at message size limit by @nwparker in https://github.com/stablyai/orca/pull/20260\n* perf(history): scan legacy alternate-screen markers linearly by @OrcaWin in https://github.com/stablyai/orca/pull/20267\n* perf: reuse skill file digest when normalized bytes match by @OrcaWin in https://github.com/stablyai/orca/pull/20268\n* perf(native): avoid sanitizing snapshot values twice by @nwparker in https://github.com/stablyai/orca/pull/20271\n* perf: encode skill Git tree sort keys once by @OrcaWin in https://github.com/stablyai/orca/pull/20272\n* perf: skip decoding discarded diagnostic error bodies by @OrcaWin in https://github.com/stablyai/orca/pull/20276\n* perf: avoid flattening tabs for smart-sort liveness check by @OrcaWin in https://github.com/stablyai/orca/pull/20279\n* perf: accept UTF-8 text that fits the worst-case byte bound by @OrcaWin in https://github.com/stablyai/orca/pull/20286\n* perf: bound rich Markdown comment detection and preservation scans by @nwparker in https://github.com/stablyai/orca/pull/20287\n* perf(ipc): bound SSH ACK batch selection scans by @nwparker in https://github.com/stablyai/orca/pull/20288\n* perf: avoid copying completed terminal source ranges by @OrcaWin in https://github.com/stablyai/orca/pull/20289\n* perf(ssh): skip terminal source spans awaiting ACK publication by @OrcaWin in https://github.com/stablyai/orca/pull/20290\n* perf: reuse diagnostic bundle byte count by @OrcaWin in https://github.com/stablyai/orca/pull/20292\n* perf: normalize manifest text files once by @OrcaWin in https://github.com/stablyai/orca/pull/20294\n* perf: reuse formatter within reset timestamp conversion by @OrcaWin in https://github.com/stablyai/orca/pull/20295\n* perf: defer scrollback pruning indexes until needed by @OrcaWin in https://github.com/stablyai/orca/pull/20297\n* perf(daemon): reuse encoded unsplit NDJSON frames by @nwparker in https://github.com/stablyai/orca/pull/20298\n* perf(browser): index iframe session refs for snapshot lookup by @nwparker in https://github.com/stablyai/orca/pull/20300\n* perf: reuse computed project identity in projection by @OrcaWin in https://github.com/stablyai/orca/pull/20303\n* perf: stop archive size scan once over budget by @OrcaWin in https://github.com/stablyai/orca/pull/20304\n* perf: avoid per-item arrays in journal projection by @OrcaWin in https://github.com/stablyai/orca/pull/20305\n* perf: reuse Windows PATH normalization within merges by @OrcaWin in https://github.com/stablyai/orca/pull/20309\n* perf: find path basename without splitting all segments by @OrcaWin in https://github.com/stablyai/orca/pull/20312\n* perf(ssh): copy cleanup tab map only once by @OrcaWin in https://github.com/stablyai/orca/pull/20315\n* perf: fast-path Windows arguments without escapes by @OrcaWin in https://github.com/stablyai/orca/pull/20318\n* perf(checks): bound log excerpt byte-limit checks by @OrcaWin in https://github.com/stablyai/orca/pull/20319\n* perf: use native newline search in rich Markdown code stripping by @nwparker in https://github.com/stablyai/orca/pull/20320\n* perf: stop building chat diff sections beyond preview limit by @OrcaWin in https://github.com/stablyai/orca/pull/20321\n* perf: count chat tool calls without a filtered array by @OrcaWin in https://github.com/stablyai/orca/pull/20328\n* perf: reject file-count labels before parsing edit patches by @OrcaWin in https://github.com/stablyai/orca/pull/20330\n* perf(terminal): reuse bounded native snapshot byte checks by @OrcaWin in https://github.com/stablyai/orca/pull/20333\n* perf: select matching model IDs without sorting by @OrcaWin in https://github.com/stablyai/orca/pull/20334\n* perf: remove duplicate empty-file filtering from search finalization by @OrcaWin in https://github.com/stablyai/orca/pull/20335\n* perf: avoid repeated history page byte serialization by @nwparker in https://github.com/stablyai/orca/pull/20337\n* perf: collect terminal snapshot replay without wrapper arrays by @OrcaWin in https://github.com/stablyai/orca/pull/20338\n* perf: reuse accepted project group IDs for parent validation by @OrcaWin in https://github.com/stablyai/orca/pull/20341\n* perf: compute check severity once per sort by @OrcaWin in https://github.com/stablyai/orca/pull/20342\n* perf: count bot comments without a filtered array by @OrcaWin in https://github.com/stablyai/orca/pull/20343\n* perf: index relay drain migration inventories once by @nwparker in https://github.com/stablyai/orca/pull/20344\n* perf: avoid typed-array iteration in shared SHA-256 blocks by @OrcaWin in https://github.com/stablyai/orca/pull/20346\n* perf: reuse shared SHA-256 for renderer fallback by @OrcaWin in https://github.com/stablyai/orca/pull/20347\n* perf(computer): avoid rescanning fragmented native provider replies by @OrcaWin in https://github.com/stablyai/orca/pull/20348\n* perf: skip nonmatching spans in Quick Open scoring by @nwparker in https://github.com/stablyai/orca/pull/20349\n* perf: skip dominated quick command search fields by @nwparker in https://github.com/stablyai/orca/pull/20352\n* perf: reuse normalized executable during agent recognition by @OrcaWin in https://github.com/stablyai/orca/pull/20353\n* perf(localization): prefilter absent brands before regex matching by @OrcaWin in https://github.com/stablyai/orca/pull/20354\n* perf: avoid copying single-chunk process output by @OrcaWin in https://github.com/stablyai/orca/pull/20355\n* perf: scan chat activity text from its last line by @nwparker in https://github.com/stablyai/orca/pull/20356\n* perf(mobile): reuse UTF-8 prefix truncation for diagnostics by @OrcaWin in https://github.com/stablyai/orca/pull/20358\n* perf(checks): bound earlier error context collection by @OrcaWin in https://github.com/stablyai/orca/pull/20211\n* perf(mobile): reuse numeric collators across source control sorts by @nwparker in https://github.com/stablyai/orca/pull/20224\n* perf(mobile): precompute task sort keys and reuse repository collation by @nwparker in https://github.com/stablyai/orca/pull/20233\n* perf(agents): avoid cloning lineage ancestor sets by @OrcaWin in https://github.com/stablyai/orca/pull/20236\n* perf(plugins): reconcile shortcut conflicts once per owner by @nwparker in https://github.com/stablyai/orca/pull/20237\n* perf: avoid rescanning partial transcript records by @OrcaWin in https://github.com/stablyai/orca/pull/20239\n* perf: use native newline search for Markdown review excerpts by @nwparker in https://github.com/stablyai/orca/pull/20245\n* perf(ai-vault): deduplicate session scan batches incrementally by @OrcaWin in https://github.com/stablyai/orca/pull/20255\n* perf: stop review acknowledgement summaries at the first readable line by @nwparker in https://github.com/stablyai/orca/pull/20263\n* perf(git): classify bulk discard paths once by @nwparker in https://github.com/stablyai/orca/pull/20274\n* perf: eliminate quadratic palette phrase placement scans by @nwparker in https://github.com/stablyai/orca/pull/20306\n* perf: avoid repeated unclosed-tag scans in mobile reviews by @nwparker in https://github.com/stablyai/orca/pull/20329\n* perf(plugins): index contributed keybindings by command by @nwparker in https://github.com/stablyai/orca/pull/20241\n* perf(mobile): precompute Linear issue sort keys by @nwparker in https://github.com/stablyai/orca/pull/20249\n* perf(chat): join transcript line fragments at record boundaries by @OrcaWin in https://github.com/stablyai/orca/pull/20278\n* perf(cmd-j): scan phrase word boundaries monotonically by @nwparker in https://github.com/stablyai/orca/pull/20282\n* perf(ai-vault): count recent sessions for scan cutoffs by @OrcaWin in https://github.com/stablyai/orca/pull/20301\n* perf: remove repeated sibling scans from cyclic agent lineage cleanup by @nwparker in https://github.com/stablyai/orca/pull/20302\n* perf: reuse pending filesystem watcher debounce timers by @OrcaWin in https://github.com/stablyai/orca/pull/20264\n* fix(editor): eliminate multi-second Markdown blank-run scans by @nwparker in https://github.com/stablyai/orca/pull/20231\n* perf: avoid rescanning partial Windows desktop responses by @OrcaWin in https://github.com/stablyai/orca/pull/20235\n* fix(chat): bound journal replay memory by live history by @nwparker in https://github.com/stablyai/orca/pull/20247\n* perf(android): queue fragmented scrcpy video packets by @OrcaWin in https://github.com/stablyai/orca/pull/20230\n* perf(mobile): skip successful duplicate connection log saves by @nwparker in https://github.com/stablyai/orca/pull/20252\n* perf: skip impossible inline HTML comment matches during encoding by @nwparker in https://github.com/stablyai/orca/pull/20293\n* chore: remove 20.7 MiB of duplicate and unused media by @nwparker in https://github.com/stablyai/orca/pull/20416\n* perf: bound whitespace normalization for tool previews by @nwparker in https://github.com/stablyai/orca/pull/20332\n* fix(tabs): cancel split drags when the window loses focus by @OrcaWin in https://github.com/stablyai/orca/pull/20323\n* fix(updater): open background check errors from the status bar by @OrcaWin in https://github.com/stablyai/orca/pull/20270\n* perf(relay): sort latency samples once per percentile pair by @nwparker in https://github.com/stablyai/orca/pull/20427\n* perf(skills): test agent ownership without building a deduped list by @nwparker in https://github.com/stablyai/orca/pull/20428\n* perf(git): reject non-HEAD refs before sorting remotes by @nwparker in https://github.com/stablyai/orca/pull/20429\n* perf(mobile): release consumed terminal write-queue slots by @nwparker in https://github.com/stablyai/orca/pull/20430\n* perf(git): normalize tracked discard paths once per operation by @nwparker in https://github.com/stablyai/orca/pull/20299\n* refactor(windows): vendor the registry addon as @orca/windows-registry by @nwparker in https://github.com/stablyai/orca/pull/20438\n* fix(resource-manager): show saved folder workspace names and groups by @OrcaWin in https://github.com/stablyai/orca/pull/20324\n* test(relay): differential coverage for the single-pass host-data owner lookup by @nwparker in https://github.com/stablyai/orca/pull/20426\n* perf(mobile): reuse Linear grouping between list and board by @nwparker in https://github.com/stablyai/orca/pull/20431\n* chore(deps): pin serve-sim to an exact version by @nwparker in https://github.com/stablyai/orca/pull/20446\n* Add code quality lint for type assertions by @AmethystLiang in https://github.com/stablyai/orca/pull/19462\n* fix(ci): cache the vendored addon where node-gyp actually writes it by @nwparker in https://github.com/stablyai/orca/pull/20445\n* perf: accelerate cancellable remote transcript line scanning by @OrcaWin in https://github.com/stablyai/orca/pull/20351\n* fix(ci): match the truncated windows-process-tree virtual store dir by @nwparker in https://github.com/stablyai/orca/pull/20447\n* build(macos): parallelize native helpers with complete cancellation by @espetro in https://github.com/stablyai/orca/pull/19651\n* perf: skip WSL discovery when filtering native-only paths by @OrcaWin in https://github.com/stablyai/orca/pull/20266\n* perf(mobile): reuse Linear ordering for list and board grouping by @nwparker in https://github.com/stablyai/orca/pull/20314\n* Reduce native dependency installs to the host platform by @nwparker in https://github.com/stablyai/orca/pull/20420\n* perf(ai-vault): bound per-row bookkeeping in unlimited session scans by @nwparker in https://github.com/stablyai/orca/pull/20291\n* perf(tooling): reuse directory entry types in source scans by @OrcaWin in https://github.com/stablyai/orca/pull/20212\n* fix(skills): evict removed runtime discovery cache by @bbingz in https://github.com/stablyai/orca/pull/11489\n* fix(automations): isolate the scheduler tick and refuse oversized cron steps by @nwparker in https://github.com/stablyai/orca/pull/20152\n* fix(runtime): stop a name-only agent title from satisfying tui-idle by @nwparker in https://github.com/stablyai/orca/pull/20155\n* fix(agent-hooks): stop navigation Escape from inferring completion by @nwparker in https://github.com/stablyai/orca/pull/20149\n* fix(mobile): reuse current workspace on notification taps by @Jinwoo-H in https://github.com/stablyai/orca/pull/20310\n* fix(ai-vault): re-read a transcript rewritten to its previous size by @Jinwoo-H in https://github.com/stablyai/orca/pull/20261\n* fix(sidebar): show agent activity before workspace activation by @Jinwoo-H in https://github.com/stablyai/orca/pull/20398\n* test(rpc): add a compile-time params catalog parity gate by @Jinwoo-H in https://github.com/stablyai/orca/pull/20281\n* test(scripts): widen the Windows shim ratchet to catch package bin spawns by @Jinwoo-H in https://github.com/stablyai/orca/pull/20285\n* refactor(native-chat): give each structured dispatch state exactly one meaning by @brennanb2025 in https://github.com/stablyai/orca/pull/20133\n* feat(native-chat): decide a restart-stranded send against provider history by @brennanb2025 in https://github.com/stablyai/orca/pull/20139\n* fix(native-chat): wait for the runtime capability probe before resolving the creation launch route by @brennanb2025 in https://github.com/stablyai/orca/pull/19819\n* fix(worktrees): retire the chat tab of a chat with no child when its workspace goes by @brennanb2025 in https://github.com/stablyai/orca/pull/19970\n* feat(ai-vault-search): public session search contract and transports by @Jinwoo-H in https://github.com/stablyai/orca/pull/20277\n* refactor(mobile): migrate settings reads to RpcOperation by @Jinwoo-H in https://github.com/stablyai/orca/pull/20499\n* fix(mobile): give native chat one tail-follow owner so streaming stops jumping by @brennanb2025 in https://github.com/stablyai/orca/pull/20493\n* fix(mobile): preserve delivery ambiguity across transport cutover by @Jinwoo-H in https://github.com/stablyai/orca/pull/20280\n* fix(runtime): reject malformed file Base64 padding by @Jinwoo-H in https://github.com/stablyai/orca/pull/20283\n* fix(tasks): preserve repository results under GitHub search quota by @OrcaWin in https://github.com/stablyai/orca/pull/20460\n* fix(ai-vault): stream oversized remote session transcripts by @OrcaWin in https://github.com/stablyai/orca/pull/20455\n* fix(grok): stop replayed Claude/Cursor hooks reporting Grok panes as Claude by @brennanb2025 in https://github.com/stablyai/orca/pull/20507\n* fix(browser): press keys through a US-layout CDP key table instead of a subprocess per keystroke by @atreidesend in https://github.com/stablyai/orca/pull/15310\n* fix(rpc): validate provider-specific fields in TaskProviderIdentity by @Jinwoo-H in https://github.com/stablyai/orca/pull/20284\n* perf(terminal): batch file-link checks on their owning host by @OrcaWin in https://github.com/stablyai/orca/pull/20463\n* feat(native-chat): support file drag and drop by @brennanb2025 in https://github.com/stablyai/orca/pull/20494\n\n## New Contributors\n* @tb-soshiro made their first contribution in https://github.com/stablyai/orca/pull/18787\n* @NaoyaTatetsu made their first contribution in https://github.com/stablyai/orca/pull/17795\n* @ramarivera made their first contribution in https://github.com/stablyai/orca/pull/12772\n* @Aladex made their first contribution in https://github.com/stablyai/orca/pull/18634\n* @weekbin made their first contribution in https://github.com/stablyai/orca/pull/14929\n* @TimothyVang made their first contribution in https://github.com/stablyai/orca/pull/17936\n* @brohoya made their first contribution in https://github.com/stablyai/orca/pull/11756\n* @blade035 made their first contribution in https://github.com/stablyai/orca/pull/17731\n* @kiendle made their first contribution in https://github.com/stablyai/orca/pull/19170\n* @espetro made their first contribution in https://github.com/stablyai/orca/pull/19651\n* @atreidesend made their first contribution in https://github.com/stablyai/orca/pull/15310\n\n**Full Changelog**: https://github.com/stablyai/orca/compare/mobile-android-v0.0.48...mobile-android-v0.0.50\n",
+  "reactions": {
+    "url": "https://api.github.com/repos/stablyai/orca/releases/391254643/reactions",
+    "total_count": 18,
+    "+1": 0,
+    "-1": 0,
+    "laugh": 0,
+    "hooray": 0,
+    "confused": 0,
+    "heart": 14,
+    "rocket": 4,
+    "eyes": 0
+  },
+  "mentions_count": 21
+}
diff --git a/mobile/src/app-update/fixtures/itunes-lookup-com.stably.orca.mobile.json b/mobile/src/app-update/fixtures/itunes-lookup-com.stably.orca.mobile.json
new file mode 100644
index 000000000000..f4de826ef720
--- /dev/null
+++ b/mobile/src/app-update/fixtures/itunes-lookup-com.stably.orca.mobile.json
@@ -0,0 +1,189 @@
+{
+  "resultCount": 1,
+  "results": [
+    {
+      "isGameCenterEnabled": false,
+      "features": ["iosUniversal"],
+      "supportedDevices": [
+        "iPhone5s-iPhone5s",
+        "iPadAir-iPadAir",
+        "iPadAirCellular-iPadAirCellular",
+        "iPadMiniRetina-iPadMiniRetina",
+        "iPadMiniRetinaCellular-iPadMiniRetinaCellular",
+        "iPhone6-iPhone6",
+        "iPhone6Plus-iPhone6Plus",
+        "iPadAir2-iPadAir2",
+        "iPadAir2Cellular-iPadAir2Cellular",
+        "iPadMini3-iPadMini3",
+        "iPadMini3Cellular-iPadMini3Cellular",
+        "iPodTouchSixthGen-iPodTouchSixthGen",
+        "iPhone6s-iPhone6s",
+        "iPhone6sPlus-iPhone6sPlus",
+        "iPadMini4-iPadMini4",
+        "iPadMini4Cellular-iPadMini4Cellular",
+        "iPadPro-iPadPro",
+        "iPadProCellular-iPadProCellular",
+        "iPadPro97-iPadPro97",
+        "iPadPro97Cellular-iPadPro97Cellular",
+        "iPhoneSE-iPhoneSE",
+        "iPhone7-iPhone7",
+        "iPhone7Plus-iPhone7Plus",
+        "iPad611-iPad611",
+        "iPad612-iPad612",
+        "iPad71-iPad71",
+        "iPad72-iPad72",
+        "iPad73-iPad73",
+        "iPad74-iPad74",
+        "iPhone8-iPhone8",
+        "iPhone8Plus-iPhone8Plus",
+        "iPhoneX-iPhoneX",
+        "iPad75-iPad75",
+        "iPad76-iPad76",
+        "iPhoneXS-iPhoneXS",
+        "iPhoneXSMax-iPhoneXSMax",
+        "iPhoneXR-iPhoneXR",
+        "iPad812-iPad812",
+        "iPad834-iPad834",
+        "iPad856-iPad856",
+        "iPad878-iPad878",
+        "iPadMini5-iPadMini5",
+        "iPadMini5Cellular-iPadMini5Cellular",
+        "iPadAir3-iPadAir3",
+        "iPadAir3Cellular-iPadAir3Cellular",
+        "iPodTouchSeventhGen-iPodTouchSeventhGen",
+        "iPhone11-iPhone11",
+        "iPhone11Pro-iPhone11Pro",
+        "iPadSeventhGen-iPadSeventhGen",
+        "iPadSeventhGenCellular-iPadSeventhGenCellular",
+        "iPhone11ProMax-iPhone11ProMax",
+        "iPhoneSESecondGen-iPhoneSESecondGen",
+        "iPadProSecondGen-iPadProSecondGen",
+        "iPadProSecondGenCellular-iPadProSecondGenCellular",
+        "iPadProFourthGen-iPadProFourthGen",
+        "iPadProFourthGenCellular-iPadProFourthGenCellular",
+        "iPhone12Mini-iPhone12Mini",
+        "iPhone12-iPhone12",
+        "iPhone12Pro-iPhone12Pro",
+        "iPhone12ProMax-iPhone12ProMax",
+        "iPadAir4-iPadAir4",
+        "iPadAir4Cellular-iPadAir4Cellular",
+        "iPadEighthGen-iPadEighthGen",
+        "iPadEighthGenCellular-iPadEighthGenCellular",
+        "iPadProThirdGen-iPadProThirdGen",
+        "iPadProThirdGenCellular-iPadProThirdGenCellular",
+        "iPadProFifthGen-iPadProFifthGen",
+        "iPadProFifthGenCellular-iPadProFifthGenCellular",
+        "iPhone13Pro-iPhone13Pro",
+        "iPhone13ProMax-iPhone13ProMax",
+        "iPhone13Mini-iPhone13Mini",
+        "iPhone13-iPhone13",
+        "iPadMiniSixthGen-iPadMiniSixthGen",
+        "iPadMiniSixthGenCellular-iPadMiniSixthGenCellular",
+        "iPadNinthGen-iPadNinthGen",
+        "iPadNinthGenCellular-iPadNinthGenCellular",
+        "iPhoneSEThirdGen-iPhoneSEThirdGen",
+        "iPadAirFifthGen-iPadAirFifthGen",
+        "iPadAirFifthGenCellular-iPadAirFifthGenCellular",
+        "iPhone14-iPhone14",
+        "iPhone14Plus-iPhone14Plus",
+        "iPhone14Pro-iPhone14Pro",
+        "iPhone14ProMax-iPhone14ProMax",
+        "iPadTenthGen-iPadTenthGen",
+        "iPadTenthGenCellular-iPadTenthGenCellular",
+        "iPadPro11FourthGen-iPadPro11FourthGen",
+        "iPadPro11FourthGenCellular-iPadPro11FourthGenCellular",
+        "iPadProSixthGen-iPadProSixthGen",
+        "iPadProSixthGenCellular-iPadProSixthGenCellular",
+        "iPhone15-iPhone15",
+        "iPhone15Plus-iPhone15Plus",
+        "iPhone15Pro-iPhone15Pro",
+        "iPhone15ProMax-iPhone15ProMax",
+        "iPadAir11M2-iPadAir11M2",
+        "iPadAir11M2Cellular-iPadAir11M2Cellular",
+        "iPadAir13M2-iPadAir13M2",
+        "iPadAir13M2Cellular-iPadAir13M2Cellular",
+        "iPadPro11M4-iPadPro11M4",
+        "iPadPro11M4Cellular-iPadPro11M4Cellular",
+        "iPadPro13M4-iPadPro13M4",
+        "iPadPro13M4Cellular-iPadPro13M4Cellular",
+        "iPhone16-iPhone16",
+        "iPhone16Plus-iPhone16Plus",
+        "iPhone16Pro-iPhone16Pro",
+        "iPhone16ProMax-iPhone16ProMax",
+        "iPadMiniA17Pro-iPadMiniA17Pro",
+        "iPadMiniA17ProCellular-iPadMiniA17ProCellular",
+        "iPhone16e-iPhone16e",
+        "iPadA16-iPadA16",
+        "iPadA16Cellular-iPadA16Cellular",
+        "iPadAir11M3-iPadAir11M3",
+        "iPadAir11M3Cellular-iPadAir11M3Cellular",
+        "iPadAir13M3-iPadAir13M3",
+        "iPadAir13M3Cellular-iPadAir13M3Cellular",
+        "iPhone17Pro-iPhone17Pro",
+        "iPhone17ProMax-iPhone17ProMax",
+        "iPhone17-iPhone17",
+        "iPhoneAir-iPhoneAir",
+        "iPadPro11M5-iPadPro11M5",
+        "iPadPro11M5Cellular-iPadPro11M5Cellular",
+        "iPadPro13M5-iPadPro13M5",
+        "iPadPro13M5Cellular-iPadPro13M5Cellular",
+        "iPhone17e-iPhone17e",
+        "iPadAir11M4-iPadAir11M4",
+        "iPadAir11M4Cellular-iPadAir11M4Cellular",
+        "iPadAir13M4-iPadAir13M4",
+        "iPadAir13M4Cellular-iPadAir13M4Cellular",
+        "iPhone18Pro-iPhone18Pro",
+        "iPhone18ProMax-iPhone18ProMax",
+        "iPhoneDuo-iPhoneDuo"
+      ],
+      "advisories": [],
+      "kind": "software",
+      "artistViewUrl": "https://apps.apple.com/us/developer/lovecast-llc/id1498017204?uo=4",
+      "artworkUrl60": "https://is1-ssl.mzstatic.com/image/thumb/Purple221/v4/89/b3/29/89b32922-c086-9d30-fd7c-ac48e1392aa6/AppIcon-0-0-1x_U007epad-0-1-85-220.png/60x60bb.jpg",
+      "artworkUrl100": "https://is1-ssl.mzstatic.com/image/thumb/Purple221/v4/89/b3/29/89b32922-c086-9d30-fd7c-ac48e1392aa6/AppIcon-0-0-1x_U007epad-0-1-85-220.png/100x100bb.jpg",
+      "appletvScreenshotUrls": [],
+      "artworkUrl512": "https://is1-ssl.mzstatic.com/image/thumb/Purple221/v4/89/b3/29/89b32922-c086-9d30-fd7c-ac48e1392aa6/AppIcon-0-0-1x_U007epad-0-1-85-220.png/512x512bb.jpg",
+      "screenshotUrls": [
+        "https://is1-ssl.mzstatic.com/image/thumb/PurpleSource211/v4/7d/c0/9e/7dc09e7d-e1df-c528-41c6-2eff0bac4b9b/01-terminal.png/320x480bb.jpg",
+        "https://is1-ssl.mzstatic.com/image/thumb/PurpleSource221/v4/93/6f/1f/936f1fe8-a0fc-cfaa-2ecb-89d7c71f02f3/03-homepage.png/320x480bb.jpg",
+        "https://is1-ssl.mzstatic.com/image/thumb/PurpleSource221/v4/d6/e2/9f/d6e29f00-bdd8-c29c-f533-97a4a217be03/02-workspace.png/320x480bb.jpg",
+        "https://is1-ssl.mzstatic.com/image/thumb/PurpleSource211/v4/3e/82/15/3e8215b7-80db-f4b3-3942-bc634899c394/04-create-wt.png/320x480bb.jpg"
+      ],
+      "ipadScreenshotUrls": [
+        "https://is1-ssl.mzstatic.com/image/thumb/PurpleSource221/v4/e5/01/a2/e501a2f6-8e2c-11a2-ad6a-c9b42f49e905/apple-ipadpro13-spacegrey-portrait-promo-opaque.png/360x480bb.jpg"
+      ],
+      "releaseNotes": "Clearer chat while agents work\n• A proposed plan now appears as a plan you can read, not a generic approval prompt.\n• Approval requests show what the agent actually asked for instead of raw tool data.\n• The working timer counts from the message that started the turn.\n\nSteadier workspace setup\n• Creating a workspace no longer risks starting two if the reply is lost on the way back.\n• A worktree that launches an agent on creation opens straight into its chat.\n• A newly created tab stays put when the host list refreshes.\n\nFixes\n• Pairing no longer reports a declined permission as a missing feature.\n• The notification opt-in screen is clearer about what you are turning on.\n• Sign-in now accepts enterprise-managed GitHub accounts.",
+      "bundleId": "com.stably.orca.mobile",
+      "genres": ["Developer Tools"],
+      "price": 0.0,
+      "artistId": 1498017204,
+      "artistName": "Lovecast LLC",
+      "primaryGenreName": "Developer Tools",
+      "primaryGenreId": 6026,
+      "releaseDate": "2026-05-07T07:00:00Z",
+      "isVppDeviceBasedLicensingEnabled": true,
+      "trackName": "Orca IDE",
+      "trackId": 6766130217,
+      "sellerName": "Lovecast LLC",
+      "genreIds": ["6026"],
+      "currentVersionReleaseDate": "2026-09-19T07:09:57Z",
+      "version": "0.0.51",
+      "wrapperType": "software",
+      "currency": "USD",
+      "description": "Orca Mobile is the companion app for Orca, the open-source agentic coding workspace for macOS, Linux, and Windows. Pair your iPhone to your desktop in seconds and pick up a terminal session from the couch, the kitchen, or across the office.\n\nWHAT IT DOES\n\n• Live mirror of your desktop terminal, including running AI agent sessions (Claude Code, Codex, custom CLIs).\n• Full keyboard input — type, tab-complete, Ctrl-C, scroll back, all from the phone.\n• Multi-worktree, multi-terminal: jump between projects with a tap.\n• Phone-fit zoom and a smart on-screen keyboard with quick Ctrl/Alt accessory keys and shortcuts.\n• Background long-running commands and get a notification when a TUI goes idle (e.g. when Claude finishes thinking).\n\nHOW IT WORKS\n\nOrca Mobile is a thin client. Nothing runs on your phone except the viewer. Your code, your shells, your AI agents — all of that stays on your desktop. The phone shows you what's happening and forwards your keystrokes back over an encrypted local-network connection.\n\nPairing is end-to-end encrypted. Your desktop generates a one-time keypair and shows a QR code; you scan it from the app. After that, all traffic between phone and desktop is sealed with that pair's keys.\n\nPRIVACY\n\n• No analytics SDK, no crash reporter, no third-party SDKs of any kind in the iOS app.\n• Pairing tokens and your preference list live in the app's own sandbox. The app's traffic to your desktop is end-to-end encrypted on your local network only.\n• The Orca desktop app collects anonymized usage metrics per the policy at https://www.onorca.dev/privacy. The mobile app itself does not.\n• Open source: every line is auditable at https://github.com/stablyai/orca.\n\nREQUIREMENTS\n\n• An iPhone (iOS 16+) on the same Wi-Fi as your desktop.\n• The Orca desktop app, free, from https://www.onorca.dev/ or https://github.com/stablyai/orca/releases.",
+      "trackCensoredName": "Orca IDE",
+      "trackViewUrl": "https://apps.apple.com/us/app/orca-ide/id6766130217?uo=4",
+      "contentAdvisoryRating": "4+",
+      "averageUserRating": 4.58621000000000034191316444776020944118499755859375,
+      "averageUserRatingForCurrentVersion": 4.58621000000000034191316444776020944118499755859375,
+      "languageCodesISO2A": ["EN"],
+      "fileSizeBytes": "41495552",
+      "formattedPrice": "Free",
+      "userRatingCountForCurrentVersion": 29,
+      "trackContentRating": "4+",
+      "sellerUrl": "https://www.onorca.dev/",
+      "minimumOsVersion": "15.1",
+      "userRatingCount": 29
+    }
+  ]
+}
diff --git a/mobile/src/app-update/github-release-update-source.ts b/mobile/src/app-update/github-release-update-source.ts
new file mode 100644
index 000000000000..c32c34751213
--- /dev/null
+++ b/mobile/src/app-update/github-release-update-source.ts
@@ -0,0 +1,77 @@
+import { z } from 'zod'
+import { compareAppVersions } from '../../../src/shared/app-version'
+import type { AppUpdateCheckResult, AppUpdateSource } from './app-update-source'
+import { isNewerReleaseVersion } from './app-update-source'
+
+const REPO_API = 'https://api.github.com/repos/stablyai/orca'
+// Why tag refs, not releases.atom or /releases?per_page=100: both are newest-first windows that a
+// run of desktop releases fills, pushing the newest mobile release out and reading as "current".
+// The release `prerelease` flag is not a filter: every mobile-android-v* release is published as one.
+const TAG_PREFIX = 'mobile-android-v'
+// Why: the release workflow pushes the tag before the APK build, so a failed build leaves a
+// tag with no release; probe a few older candidates, bounded like the desktop's manifest probe.
+const MAX_RELEASE_PROBES = 3
+
+type Fetch = typeof fetch
+
+const tagRefsSchema = z.array(z.looseObject({ ref: z.string() }))
+const installableReleaseSchema = z.looseObject({
+  draft: z.literal(false),
+  html_url: z.string(),
+  assets: z.array(z.looseObject({ name: z.string() }))
+})
+
+/** Versions named by the tag refs GitHub returns for the mobile-android prefix. */
+export function parseMobileAndroidTagVersions(refs: unknown): string[] {
+  const prefix = `refs/tags/${TAG_PREFIX}`
+  return tagRefsSchema
+    .parse(refs)
+    .filter(({ ref }) => ref.startsWith(prefix))
+    .map(({ ref }) => ref.slice(prefix.length))
+}
+
+/** The release page when the tag has a published release carrying an APK, else null. */
+export function installableReleaseUrl(release: unknown): string | null {
+  const parsed = installableReleaseSchema.safeParse(release)
+  return parsed.success && parsed.data.assets.some((asset) => asset.name.endsWith('.apk'))
+    ? parsed.data.html_url
+    : null
+}
+
+export function createGithubReleaseUpdateSource(fetchImpl: Fetch): AppUpdateSource {
+  return {
+    async check(installedVersion, signal): Promise<AppUpdateCheckResult> {
+      const refsReply = await fetchImpl(`${REPO_API}/git/matching-refs/tags/${TAG_PREFIX}`, {
+        signal
+      })
+      if (!refsReply.ok) {
+        throw new Error(`tag refs HTTP ${refsReply.status}`)
+      }
+      const candidates = parseMobileAndroidTagVersions(await refsReply.json())
+        .filter((version) => isNewerReleaseVersion(version, installedVersion))
+        .sort((left, right) => compareAppVersions(right, left))
+        .slice(0, MAX_RELEASE_PROBES)
+      for (const version of candidates) {
+        const releaseReply = await fetchImpl(
+          `${REPO_API}/releases/tags/${encodeURIComponent(`${TAG_PREFIX}${version}`)}`,
+          { signal }
+        )
+        if (releaseReply.status === 404) {
+          continue
+        }
+        if (!releaseReply.ok) {
+          throw new Error(`release HTTP ${releaseReply.status}`)
+        }
+        const url = installableReleaseUrl(await releaseReply.json())
+        if (url) {
+          return { kind: 'available', version, url }
+        }
+      }
+      return { kind: 'current' }
+    }
+  }
+}
+
+export const githubReleaseUpdateSource = createGithubReleaseUpdateSource((input, init) =>
+  fetch(input, init)
+)
diff --git a/mobile/src/browser/mobile-browser-pane-source.test.ts b/mobile/src/browser/mobile-browser-pane-source.test.ts
deleted file mode 100644
index 69cd5af5391e..000000000000
--- a/mobile/src/browser/mobile-browser-pane-source.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { describe, expect, it } from 'vitest'
-
-const source = readFileSync(new URL('./MobileBrowserPane.tsx', import.meta.url), 'utf8')
-
-function sliceBetween(startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('MobileBrowserPane source invariants', () => {
-  it('mirrors handler refs in a layout effect instead of during render', () => {
-    const mirrorBlock = sliceBetween(
-      'useLayoutEffect(() => {',
-      '  useEffect(() => {\n    lastZoomResetUrlRef.current'
-    )
-
-    expect(mirrorBlock).toContain('frameMetadataRef.current = frameMetadata')
-    expect(mirrorBlock).toContain('layoutRef.current = layout')
-    expect(mirrorBlock).toContain('dialogRef.current = dialog')
-    expect(mirrorBlock).toContain('zoomRef.current = zoom')
-    expect(mirrorBlock).toContain('}, [dialog, frameMetadata, layout, zoom])')
-  })
-})
diff --git a/mobile/src/components/AgentLaunchNotice.test.tsx b/mobile/src/components/AgentLaunchNotice.test.tsx
new file mode 100644
index 000000000000..e1b7b07efce3
--- /dev/null
+++ b/mobile/src/components/AgentLaunchNotice.test.tsx
@@ -0,0 +1,94 @@
+import { createElement, type ReactNode } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('react-native', async () => {
+  const React = await import('react')
+  return {
+    Pressable: ({ children, ...props }: { children?: ReactNode }) =>
+      React.createElement('Pressable', props, children),
+    Text: ({ children, ...props }: { children?: ReactNode }) =>
+      React.createElement('Text', props, children),
+    View: ({ children, ...props }: { children?: ReactNode }) =>
+      React.createElement('View', props, children),
+    StyleSheet: { create: (styles: unknown) => styles }
+  }
+})
+vi.mock('../platform/clipboard', () => ({
+  useClipboardWriter: () => ({ writeText: async () => {} })
+}))
+
+import { AgentLaunchNotice } from './AgentLaunchNotice'
+import { AGENT_LAUNCH_UPDATE_REQUIRED_MESSAGE } from '../session/mobile-existing-agent-launch'
+import type { MobileAgentLaunchAvailability } from '../session/mobile-agent-launch-availability'
+
+const ERROR_STYLE = { color: 'red' }
+
+describe('AgentLaunchNotice', () => {
+  let renderer: ReactTestRenderer | null = null
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+  })
+
+  function lines(props: {
+    availability?: MobileAgentLaunchAvailability
+    success?: string | null
+    error?: string | null
+    warning?: string | null
+  }): { text: string; isError: boolean }[] {
+    act(() => {
+      renderer = create(
+        createElement(AgentLaunchNotice, {
+          availability: props.availability ?? 'available',
+          success: props.success ?? null,
+          error: props.error ?? null,
+          warning: props.warning ?? null,
+          undeliveredPrompt: null,
+          errorStyle: ERROR_STYLE
+        })
+      )
+    })
+    return (renderer?.root.findAll((node) => String(node.type) === 'Text') ?? []).map((node) => ({
+      text: String(node.props.children),
+      isError: node.props.style === ERROR_STYLE
+    }))
+  }
+
+  it('shows the host warning on a launch that went ahead as secondary text, not an error', () => {
+    expect(lines({ warning: 'the requested arguments were ignored.' })).toEqual([
+      { text: 'the requested arguments were ignored.', isError: false }
+    ])
+  })
+
+  it('keeps a real failure in the error style beside a warning', () => {
+    expect(
+      lines({ error: "The agent started, but the prompt wasn't sent.", warning: 'w' })
+    ).toEqual([
+      { text: "The agent started, but the prompt wasn't sent.", isError: true },
+      { text: 'w', isError: false }
+    ])
+  })
+
+  it('drops a stale warning while the host cannot take a launch', () => {
+    expect(lines({ availability: 'update-required', warning: 'w' })).toEqual([
+      { text: AGENT_LAUNCH_UPDATE_REQUIRED_MESSAGE, isError: true }
+    ])
+  })
+
+  it('confirms a launch that went ahead, with any host note beneath it', () => {
+    expect(lines({ success: 'Agent started in feature-login', warning: 'w' })).toEqual([
+      { text: 'Agent started in feature-login', isError: false },
+      { text: 'w', isError: false }
+    ])
+  })
+
+  it('never confirms beside an error', () => {
+    expect(lines({ success: 'Agent started', error: 'e' })).toEqual([{ text: 'e', isError: true }])
+  })
+
+  it('renders nothing with nothing to say', () => {
+    expect(lines({})).toEqual([])
+  })
+})
diff --git a/mobile/src/components/AgentLaunchNotice.tsx b/mobile/src/components/AgentLaunchNotice.tsx
new file mode 100644
index 000000000000..00d309477efa
--- /dev/null
+++ b/mobile/src/components/AgentLaunchNotice.tsx
@@ -0,0 +1,89 @@
+import { useState } from 'react'
+import { Pressable, StyleSheet, Text, View, type StyleProp, type TextStyle } from 'react-native'
+import { useClipboardWriter } from '../platform/clipboard'
+import {
+  AGENT_LAUNCH_STATUS_UNREADABLE_MESSAGE,
+  AGENT_LAUNCH_UPDATE_REQUIRED_MESSAGE
+} from '../session/mobile-existing-agent-launch'
+import type { MobileAgentLaunchAvailability } from '../session/mobile-agent-launch-availability'
+import { colors, spacing, typography } from '../theme/mobile-theme'
+
+type Props = {
+  availability: MobileAgentLaunchAvailability
+  /** The confirmation that the agent started with its prompt. */
+  success: string | null
+  error: string | null
+  /** The host's note on a launch that went ahead; secondary text, not an error. */
+  warning: string | null
+  /** The prompt of an agent that started without it, offered for the user to paste in. */
+  undeliveredPrompt: string | null
+  errorStyle: StyleProp<TextStyle>
+}
+
+/** The status line under an AI button that starts an agent with a prompt. */
+export function AgentLaunchNotice({
+  availability,
+  success,
+  error,
+  warning,
+  undeliveredPrompt,
+  errorStyle
+}: Props) {
+  const clipboard = useClipboardWriter()
+  const [copyState, setCopyState] = useState<{ prompt: string; label: string } | null>(null)
+  const availabilityMessage =
+    availability === 'update-required'
+      ? AGENT_LAUNCH_UPDATE_REQUIRED_MESSAGE
+      : availability === 'unverified'
+        ? AGENT_LAUNCH_STATUS_UNREADABLE_MESSAGE
+        : null
+  const message = availabilityMessage ?? error
+  const note = availabilityMessage ? null : warning
+  const confirmation = message ? null : success
+  if (!message && !note && !confirmation) {
+    return null
+  }
+  const copyLabel =
+    copyState && copyState.prompt === undeliveredPrompt ? copyState.label : 'Copy prompt'
+  return (
+    <View style={styles.notice}>
+      {confirmation ? <Text style={styles.successText}>{confirmation}</Text> : null}
+      {message ? <Text style={errorStyle}>{message}</Text> : null}
+      {note ? <Text style={styles.warningText}>{note}</Text> : null}
+      {undeliveredPrompt ? (
+        <Pressable
+          onPress={() => {
+            clipboard.writeText(undeliveredPrompt).then(
+              () => setCopyState({ prompt: undeliveredPrompt, label: 'Copied' }),
+              () => setCopyState({ prompt: undeliveredPrompt, label: "Couldn't copy" })
+            )
+          }}
+          accessibilityRole="button"
+          accessibilityLabel="Copy prompt"
+          hitSlop={spacing.sm}
+        >
+          <Text style={styles.copyText}>{copyLabel}</Text>
+        </Pressable>
+      ) : null}
+    </View>
+  )
+}
+
+const styles = StyleSheet.create({
+  notice: {
+    gap: spacing.xs
+  },
+  successText: {
+    color: colors.statusGreen,
+    fontSize: typography.metaSize
+  },
+  warningText: {
+    color: colors.textSecondary,
+    fontSize: typography.metaSize
+  },
+  copyText: {
+    color: colors.accentBlue,
+    fontSize: typography.metaSize,
+    fontWeight: '600'
+  }
+})
diff --git a/mobile/src/components/AgentStateDot.tsx b/mobile/src/components/AgentStateDot.tsx
index 1637296d900f..80ef9d9d239e 100644
--- a/mobile/src/components/AgentStateDot.tsx
+++ b/mobile/src/components/AgentStateDot.tsx
@@ -5,7 +5,7 @@ import type { AgentDotState } from '../worktree/agent-row-display'
 
 // Per-agent state indicator, 1:1 with desktop AgentStateDot
 // (src/renderer/src/components/AgentStateDot.tsx): yellow spinner for 'working',
-// emerald for 'done', red for blocked/waiting/interrupted (attention), neutral
+// emerald for 'done', red for blocked/waiting/interrupted/failed (attention), neutral
 // for idle. Distinct from the worktree-level AgentSpinner, which collapses the
 // agent vocabulary into the 5-state rollup the sidebar dot uses.
 const DOT_COLORS: Record<Exclude<AgentDotState, 'working' | 'monitoring'>, string> = {
@@ -13,6 +13,7 @@ const DOT_COLORS: Record<Exclude<AgentDotState, 'working' | 'monitoring'>, strin
   blocked: '#ef4444',
   waiting: '#ef4444',
   interrupted: '#ef4444',
+  failed: '#ef4444',
   idle: 'rgba(115,115,115,0.4)'
 }
 const WORKING_COLOR = '#eab308'
diff --git a/mobile/src/components/BottomDrawer.tsx b/mobile/src/components/BottomDrawer.tsx
index 9d27c2c0c4e1..4b381511d763 100644
--- a/mobile/src/components/BottomDrawer.tsx
+++ b/mobile/src/components/BottomDrawer.tsx
@@ -1,6 +1,5 @@
-import { type ReactNode, useCallback, useEffect, useRef, useState } from 'react'
-import { resolveBottomDrawerMounted } from './bottom-drawer-mount-state'
-import { MountedBottomDrawer } from './mounted-bottom-drawer'
+import type { ReactNode } from 'react'
+import { KeyedBottomDrawer } from './keyed-bottom-drawer'
 
 type Props = {
   visible: boolean
@@ -19,75 +18,21 @@ type Props = {
   zIndex?: number
 }
 
-export function BottomDrawer({
-  visible,
-  onClose,
-  onAfterClose,
-  children,
-  dragContentToDismiss = true,
-  contentScrollable = true,
-  fillAvailable = false,
-  interactive = true,
-  zIndex
-}: Props) {
-  const [mounted, setMounted] = useState(visible)
-  const onAfterCloseRef = useRef(onAfterClose)
-  const hiddenHandledRef = useRef(false)
-  const afterClosePendingRef = useRef(false)
-
-  useEffect(() => {
-    onAfterCloseRef.current = onAfterClose
-  }, [onAfterClose])
-
-  useEffect(() => {
-    if (visible) {
-      hiddenHandledRef.current = false
-      afterClosePendingRef.current = false
-    }
-  }, [visible])
-
-  useEffect(() => {
-    if (mounted || !afterClosePendingRef.current) {
-      return
-    }
-    afterClosePendingRef.current = false
-    onAfterCloseRef.current?.()
-  }, [mounted])
-
-  const handleHidden = useCallback(() => {
-    if (hiddenHandledRef.current) {
-      return
-    }
-    hiddenHandledRef.current = true
-    afterClosePendingRef.current = true
-    setMounted(false)
-  }, [])
-  const resolvedMounted = resolveBottomDrawerMounted(visible, mounted)
-
-  // Why: opening drawers should mount before commit; waiting for a passive
-  // Effect adds a null render before every drawer can animate in.
-  if (resolvedMounted !== mounted) {
-    setMounted(resolvedMounted)
-  }
-
-  // Why: hidden drawers are rendered by parent screens even while closed; keep
-  // their Reanimated/Gesture setup out of hot paths like commit-message typing.
-  if (!resolvedMounted) {
-    return null
-  }
+const SHOWN = 'shown'
+const sheetKey = () => SHOWN
 
+export function BottomDrawer({ visible, onClose, onAfterClose, children, ...drawerProps }: Props) {
+  // Why: hidden drawers are rendered by parent screens even while closed; the keyed drawer
+  // renders nothing until shown, which keeps Reanimated/Gesture setup out of hot paths.
   return (
-    <MountedBottomDrawer
-      visible={visible}
+    <KeyedBottomDrawer
+      {...drawerProps}
+      sheet={visible ? SHOWN : null}
+      sheetKey={sheetKey}
       onClose={onClose}
-      onHidden={handleHidden}
-      dragContentToDismiss={dragContentToDismiss}
-      contentScrollable={contentScrollable}
-      fillAvailable={fillAvailable}
-      interactive={interactive}
-      zIndex={zIndex}
+      onAfterClose={onAfterClose}
     >
-      {children}
-    </MountedBottomDrawer>
+      {() => children}
+    </KeyedBottomDrawer>
   )
 }
diff --git a/mobile/src/components/ConfirmModal.tsx b/mobile/src/components/ConfirmModal.tsx
index a393593b5cf8..5d0f70e60812 100644
--- a/mobile/src/components/ConfirmModal.tsx
+++ b/mobile/src/components/ConfirmModal.tsx
@@ -2,8 +2,7 @@ import { View, Text, Pressable, StyleSheet } from 'react-native'
 import { colors, spacing, radii, typography } from '../theme/mobile-theme'
 import { BottomDrawer } from './BottomDrawer'
 
-type Props = {
-  visible: boolean
+type ContentProps = {
   title: string
   message?: string
   confirmLabel?: string
@@ -13,8 +12,17 @@ type Props = {
   onCancel: () => void
 }
 
-export function ConfirmModal({
-  visible,
+type Props = ContentProps & { visible: boolean }
+
+export function ConfirmModal({ visible, ...content }: Props) {
+  return (
+    <BottomDrawer visible={visible} onClose={content.onCancel}>
+      <ConfirmContent {...content} />
+    </BottomDrawer>
+  )
+}
+
+export function ConfirmContent({
   title,
   message,
   confirmLabel = 'Confirm',
@@ -22,9 +30,9 @@ export function ConfirmModal({
   destructive = false,
   onConfirm,
   onCancel
-}: Props) {
+}: ContentProps) {
   return (
-    <BottomDrawer visible={visible} onClose={onCancel}>
+    <>
       <View style={styles.content}>
         <Text style={styles.title}>{title}</Text>
         {message ? <Text style={styles.message}>{message}</Text> : null}
@@ -52,7 +60,7 @@ export function ConfirmModal({
           </Text>
         </Pressable>
       </View>
-    </BottomDrawer>
+    </>
   )
 }
 
diff --git a/mobile/src/components/MobileDiffReviewDrawers.tsx b/mobile/src/components/MobileDiffReviewDrawers.tsx
index 9f979761fe87..828a09beaec7 100644
--- a/mobile/src/components/MobileDiffReviewDrawers.tsx
+++ b/mobile/src/components/MobileDiffReviewDrawers.tsx
@@ -1,75 +1,104 @@
 import { useMemo } from 'react'
-import { KeyboardAvoidingView, Platform, Pressable, Text, TextInput, View } from 'react-native'
+import { KeyboardAvoidingView, Pressable, Text, TextInput, View } from 'react-native'
 import { Check, Copy, FileText, Plus, Send, Trash2, X } from 'lucide-react-native'
 import type { DiffComment } from '../../../src/shared/diff-comment-types'
-import { useKeyboardAvoidingPadding } from '../platform/keyboard-occlusion'
 import { colors } from '../theme/mobile-theme'
 import type { ActionSheetAction } from './ActionSheetModal'
-import { ActionSheetModal } from './ActionSheetModal'
-import { BottomDrawer } from './BottomDrawer'
-import { ConfirmModal } from './ConfirmModal'
-import { mobileReviewCountLabel } from '../session/mobile-diff-review-screen-model'
+import { ActionSheetContent } from './ActionSheetModal'
+import { ConfirmContent } from './ConfirmModal'
+import { KeyedBottomDrawer } from './keyed-bottom-drawer'
+import { AGENT_LAUNCH_STATUS_UNREADABLE_MESSAGE } from '../session/mobile-existing-agent-launch'
+import {
+  mobileReviewCountLabel,
+  type ComposerState,
+  type SendSheetState
+} from '../session/mobile-diff-review-screen-model'
+import { reviewSheetKey, type ReviewSheet } from '../session/mobile-diff-review-sheets'
 import type { useMobileDiffReviewController } from '../session/use-mobile-diff-review-controller'
 import { mobileDiffReviewStyles as styles } from './mobile-diff-review-screen-styles'
+import { hostOs } from '../platform/host-os'
 
 type Props = {
   controller: ReturnType<typeof useMobileDiffReviewController>
 }
 
 export function MobileDiffReviewDrawers({ controller }: Props) {
-  const sendActions = useSendActions(controller)
+  // One drawer for every review sheet: iOS cannot present a sheet while another is still closing.
+  return (
+    <KeyedBottomDrawer
+      sheet={controller.sheet}
+      sheetKey={reviewSheetKey}
+      onClose={(presented) => controller.closeSheet(presented.kind)}
+    >
+      {(presented) => <ReviewSheetContent controller={controller} sheet={presented} />}
+    </KeyedBottomDrawer>
+  )
+}
+
+function ReviewSheetContent({ controller, sheet }: Props & { sheet: ReviewSheet }) {
+  switch (sheet.kind) {
+    case 'actions':
+      return <ReviewActionsContent controller={controller} />
+    case 'send':
+      return <SendNotesContent controller={controller} load={sheet.load} />
+    case 'discard':
+      return (
+        <ConfirmContent
+          title="Discard File"
+          message={`Discard changes to "${sheet.target.filePath}"? This cannot be undone.`}
+          confirmLabel="Discard"
+          destructive
+          onConfirm={() => {
+            controller.closeSheet('discard')
+            void controller.runGitMutation('git.discard', sheet.target)
+          }}
+          onCancel={() => controller.closeSheet('discard')}
+        />
+      )
+    case 'composer':
+      return <NoteComposerContent controller={controller} composer={sheet.composer} />
+    case 'completion':
+      return <CompletionContent controller={controller} />
+  }
+}
+
+function ReviewActionsContent({ controller }: Props) {
   const overflowActions = useOverflowActions(controller)
   return (
-    <>
-      <ActionSheetModal
-        visible={controller.showOverflow}
-        title="Review Actions"
-        message={
-          controller.reviewedUnstagedCount > 0
-            ? `${controller.reviewedUnstagedCount} reviewed unstaged files can be staged`
-            : undefined
-        }
-        actions={overflowActions}
-        onClose={() => controller.setShowOverflow(false)}
-      />
-      <ActionSheetModal
-        visible={controller.sendSheet !== null}
-        title="Send Notes"
-        message={sendSheetMessage(controller)}
-        actions={sendActions}
-        onClose={() => controller.setSendSheet(null)}
-      />
-      <ConfirmModal
-        visible={controller.discardTarget !== null}
-        title="Discard File"
-        message={
-          controller.discardTarget
-            ? `Discard changes to "${controller.discardTarget.filePath}"? This cannot be undone.`
-            : undefined
-        }
-        confirmLabel="Discard"
-        destructive
-        onConfirm={() => {
-          const target = controller.discardTarget
-          controller.setDiscardTarget(null)
-          if (target) {
-            void controller.runGitMutation('git.discard', target)
-          }
-        }}
-        onCancel={() => controller.setDiscardTarget(null)}
-      />
-      <NoteComposerDrawer controller={controller} />
-      <CompletionDrawer controller={controller} />
-    </>
+    <ActionSheetContent
+      title="Review Actions"
+      message={
+        controller.reviewedUnstagedCount > 0
+          ? `${controller.reviewedUnstagedCount} reviewed unstaged files can be staged`
+          : undefined
+      }
+      actions={overflowActions}
+      onClose={() => controller.closeSheet('actions')}
+    />
   )
 }
 
-function useSendActions(controller: ReturnType<typeof useMobileDiffReviewController>) {
+function SendNotesContent({ controller, load }: Props & { load: SendSheetState }) {
+  const sendActions = useSendActions(controller, load)
+  return (
+    <ActionSheetContent
+      title="Send Notes"
+      message={sendSheetMessage(controller, load)}
+      actions={sendActions}
+      onClose={() => controller.closeSheet('send')}
+    />
+  )
+}
+
+function useSendActions(
+  controller: ReturnType<typeof useMobileDiffReviewController>,
+  load: SendSheetState
+) {
   return useMemo<ActionSheetAction[]>(() => {
     const comments = controller.unsentComments
     const terminalActions =
-      controller.sendSheet?.kind === 'ready' || controller.sendSheet?.kind === 'error'
-        ? controller.sendSheet.terminals.map((terminal) => ({
+      load.kind === 'ready' || load.kind === 'error'
+        ? load.terminals.map((terminal) => ({
             label: `${terminal.title || 'Terminal'} (${terminal.terminal.slice(0, 6)})`,
             icon: Send,
             disabled: comments.length === 0,
@@ -82,7 +111,12 @@ function useSendActions(controller: ReturnType<typeof useMobileDiffReviewControl
       {
         label: 'New Agent Session',
         icon: Plus,
-        disabled: comments.length === 0,
+        disabled: comments.length === 0 || controller.agentLaunchAvailability !== 'available',
+        ...(controller.agentLaunchAvailability === 'update-required'
+          ? { hint: 'Update Orca on your computer' }
+          : controller.agentLaunchAvailability === 'unverified'
+            ? { hint: AGENT_LAUNCH_STATUS_UNREADABLE_MESSAGE }
+            : {}),
         skipAutoClose: true,
         onPress: () => void controller.createTerminalAndSend(comments)
       },
@@ -94,7 +128,7 @@ function useSendActions(controller: ReturnType<typeof useMobileDiffReviewControl
         onPress: () => void controller.copyNotes()
       }
     ]
-  }, [controller])
+  }, [controller, load])
 }
 
 function useOverflowActions(controller: ReturnType<typeof useMobileDiffReviewController>) {
@@ -111,7 +145,6 @@ function useOverflowActions(controller: ReturnType<typeof useMobileDiffReviewCon
         label: 'Send Unsent Notes',
         icon: Send,
         disabled: controller.unsentComments.length === 0,
-        skipAutoClose: true,
         onPress: () => void controller.openSendSheet()
       },
       {
@@ -152,65 +185,54 @@ function useOverflowActions(controller: ReturnType<typeof useMobileDiffReviewCon
 }
 
 function sendSheetMessage(
-  controller: ReturnType<typeof useMobileDiffReviewController>
+  controller: ReturnType<typeof useMobileDiffReviewController>,
+  load: SendSheetState
 ): string | undefined {
-  return controller.sendSheet?.kind === 'loading'
+  return load.kind === 'loading'
     ? 'Loading agent sessions...'
-    : controller.sendSheet?.kind === 'error'
-      ? controller.sendSheet.message
+    : load.kind === 'error'
+      ? load.message
       : `${controller.unsentComments.length} unsent notes`
 }
 
-function NoteComposerDrawer({ controller }: Props) {
-  const composer = controller.composer
-  // Zero on a phone, where `KeyboardAvoidingView` above already moved this; the page's own
-  // keyboard measurement where it cannot, because that view is driven by events RN Web never
-  // sends. Padding rather than a second avoiding view: the drawer owns the position.
-  const keyboardPadding = useKeyboardAvoidingPadding()
+function NoteComposerContent({ controller, composer }: Props & { composer: ComposerState }) {
   return (
-    <BottomDrawer visible={composer !== null} onClose={controller.closeComposer}>
-      <KeyboardAvoidingView
-        behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-        style={keyboardPadding > 0 ? { paddingBottom: keyboardPadding } : undefined}
-      >
-        <View style={styles.composerHeader}>
-          <View>
-            <Text style={styles.drawerTitle}>
-              {composer?.mode === 'edit' ? 'Edit Note' : 'Add Note'}
-            </Text>
-            <Text style={styles.drawerSubtitle}>
-              {composer?.mode === 'create' && composer.lineNumber > 0
-                ? `Line ${composer.lineNumber}`
-                : 'File note'}
-            </Text>
-          </View>
-          <Pressable
-            style={({ pressed }) => [styles.iconButton, pressed && styles.iconButtonPressed]}
-            onPress={controller.closeComposer}
-            accessibilityRole="button"
-            accessibilityLabel="Cancel note"
-          >
-            <X size={18} color={colors.textPrimary} strokeWidth={2.2} />
-          </Pressable>
-        </View>
-        <TextInput
-          style={styles.composerInput}
-          value={controller.composerBody}
-          onChangeText={controller.setComposerBody}
-          multiline
-          autoFocus
-          placeholder="Review note"
-          placeholderTextColor={colors.textMuted}
-          accessibilityLabel={composerLabel(composer)}
-        />
-        <View style={styles.drawerButtonRow}>
-          {composer?.mode === 'edit' ? (
-            <DeleteNoteButton onPress={controller.deleteComment} />
-          ) : null}
-          <SaveNoteButton controller={controller} composer={composer} />
+    <KeyboardAvoidingView behavior={hostOs() === 'ios' ? 'padding' : undefined}>
+      <View style={styles.composerHeader}>
+        <View>
+          <Text style={styles.drawerTitle}>
+            {composer.mode === 'edit' ? 'Edit Note' : 'Add Note'}
+          </Text>
+          <Text style={styles.drawerSubtitle}>
+            {composer.mode === 'create' && composer.lineNumber > 0
+              ? `Line ${composer.lineNumber}`
+              : 'File note'}
+          </Text>
         </View>
-      </KeyboardAvoidingView>
-    </BottomDrawer>
+        <Pressable
+          style={({ pressed }) => [styles.iconButton, pressed && styles.iconButtonPressed]}
+          onPress={controller.closeComposer}
+          accessibilityRole="button"
+          accessibilityLabel="Cancel note"
+        >
+          <X size={18} color={colors.textPrimary} strokeWidth={2.2} />
+        </Pressable>
+      </View>
+      <TextInput
+        style={styles.composerInput}
+        value={controller.composerBody}
+        onChangeText={controller.setComposerBody}
+        multiline
+        autoFocus
+        placeholder="Review note"
+        placeholderTextColor={colors.textMuted}
+        accessibilityLabel={composerLabel(composer)}
+      />
+      <View style={styles.drawerButtonRow}>
+        {composer.mode === 'edit' ? <DeleteNoteButton onPress={controller.deleteComment} /> : null}
+        <SaveNoteButton controller={controller} composer={composer} />
+      </View>
+    </KeyboardAvoidingView>
   )
 }
 
@@ -262,14 +284,11 @@ function SaveNoteButton({
   )
 }
 
-function CompletionDrawer({ controller }: Props) {
+function CompletionContent({ controller }: Props) {
   const noteCount =
     controller.screenState.kind === 'ready' ? controller.screenState.comments.length : 0
   return (
-    <BottomDrawer
-      visible={controller.showCompletion}
-      onClose={() => controller.setShowCompletion(false)}
-    >
+    <>
       <Text style={styles.drawerTitle}>Review Complete</Text>
       <Text style={styles.drawerSubtitle}>
         {mobileReviewCountLabel(controller.queue.length, 'file', 'files')} reviewed,{' '}
@@ -297,6 +316,6 @@ function CompletionDrawer({ controller }: Props) {
           <Text style={styles.primaryButtonText}>Send Notes</Text>
         </Pressable>
       </View>
-    </BottomDrawer>
+    </>
   )
 }
diff --git a/mobile/src/components/MobileDiffReviewScreenView.tsx b/mobile/src/components/MobileDiffReviewScreenView.tsx
index 3e68dd7c8f79..06b24f3f5e76 100644
--- a/mobile/src/components/MobileDiffReviewScreenView.tsx
+++ b/mobile/src/components/MobileDiffReviewScreenView.tsx
@@ -61,7 +61,7 @@ export function MobileDiffReviewScreenView({ controller, onBack }: Props) {
         unsentCount={controller.unsentComments.length}
         worktreeLabel={controller.worktreeLabel}
         onBack={onBack}
-        onOpenActions={() => controller.setShowOverflow(true)}
+        onOpenActions={() => controller.openSheet({ kind: 'actions' })}
         onOpenPRSidebar={controller.openPRSidebar}
         onSelectFilter={controller.selectFilter}
       />
@@ -104,7 +104,7 @@ export function MobileDiffReviewScreenView({ controller, onBack }: Props) {
               busyAction={controller.busyAction}
               item={controller.currentItem}
               onAddFileNote={() => controller.openComposer(0)}
-              onDiscard={controller.setDiscardTarget}
+              onDiscard={(target) => controller.openSheet({ kind: 'discard', target })}
               onGitMutation={(method, item) => void controller.runGitMutation(method, item)}
               onMarkReviewed={() => void controller.markReviewed()}
               onMoveFile={controller.moveFile}
@@ -124,6 +124,7 @@ export function MobileDiffReviewScreenView({ controller, onBack }: Props) {
               gitStatus={gitStatus}
               headSha={controller.prSidebarHeadSha}
               bottomInset={insets.bottom}
+              workspaceLabel={controller.worktreeLabel}
             />
           </View>
         ) : null}
@@ -144,6 +145,7 @@ export function MobileDiffReviewScreenView({ controller, onBack }: Props) {
             gitBranch={controller.prSidebarBranch}
             gitStatus={gitStatus}
             headSha={controller.prSidebarHeadSha}
+            workspaceLabel={controller.worktreeLabel}
           />
         </RightDrawer>
       ) : null}
diff --git a/mobile/src/components/MobileHostCard.tsx b/mobile/src/components/MobileHostCard.tsx
index cadaf186fb24..19cf9d939938 100644
--- a/mobile/src/components/MobileHostCard.tsx
+++ b/mobile/src/components/MobileHostCard.tsx
@@ -178,7 +178,6 @@ const styles = StyleSheet.create({
   metaText: { flex: 1, fontSize: 12, color: colors.textSecondary },
   worktreeMetaText: {
     marginTop: 2,
-    marginLeft: spacing.xl,
     fontSize: 12,
     color: colors.textMuted
   },
diff --git a/mobile/src/components/MobilePRSidebar.tsx b/mobile/src/components/MobilePRSidebar.tsx
index 710adb685945..4f0aed5b28d9 100644
--- a/mobile/src/components/MobilePRSidebar.tsx
+++ b/mobile/src/components/MobilePRSidebar.tsx
@@ -14,6 +14,7 @@ import {
   type MobilePrTitleAction
 } from '../session/use-mobile-pr-title-action'
 import { useMobilePrAiTriage, type MobilePrAiTriage } from '../session/use-mobile-pr-ai-triage'
+import { useHostProtocolGates } from './HostProtocolGate'
 import { usePRBotAuthorOverrides } from '../session/use-pr-bot-author-overrides'
 import { buildFixChecksPrompt, buildResolveConflictsPrompt } from '../session/pr-ai-triage-prompt'
 import { prSidebarRenderBranch } from './mobile-pr-sidebar-presentation'
@@ -42,6 +43,8 @@ type Props = {
   bottomInset?: number
   // Hub chrome already shows open-on-web; hide the in-body icon there.
   showOpenOnWeb?: boolean
+  /** Named when an AI button's agent starts; the branch stands in when absent. */
+  workspaceLabel: string | null
 }
 
 // Mutation hooks run unconditionally here and gate internally until a PR is ready.
@@ -56,8 +59,10 @@ export function MobilePRSidebar({
   gitStatus,
   headSha,
   bottomInset = 0,
-  showOpenOnWeb = true
+  showOpenOnWeb = true,
+  workspaceLabel
 }: Props) {
+  const launchWorkspaceLabel = workspaceLabel || gitBranch
   const branch = prSidebarRenderBranch(state)
   // prNumber is 0 until ready; the hook gates on `ready` so it never fires early.
   const prNumber = state.kind === 'ready' ? state.data.pr.number : 0
@@ -89,7 +94,16 @@ export function MobilePRSidebar({
     prRepo,
     refetch
   })
-  const triage = useMobilePrAiTriage({ client, connState, worktreeId })
+  const { hostCapabilities, statusPending, statusReadable } = useHostProtocolGates()
+  const triage = useMobilePrAiTriage({
+    client,
+    connState,
+    worktreeId,
+    workspaceLabel: launchWorkspaceLabel,
+    hostCapabilities,
+    hostStatusPending: statusPending,
+    hostStatusReadable: statusReadable
+  })
   // Keyed on the PR payload identity so overrides re-fetch with each PR refetch
   // instead of staying a stale one-shot snapshot for the whole session.
   const botAuthorOverrides = usePRBotAuthorOverrides(
@@ -122,6 +136,7 @@ export function MobilePRSidebar({
         commentActions={commentActions}
         titleAction={titleAction}
         triage={triage}
+        workspaceLabel={launchWorkspaceLabel}
         botAuthorOverrides={botAuthorOverrides}
         showOpenOnWeb={showOpenOnWeb}
       />
@@ -143,6 +158,7 @@ function PrSidebarContent({
   commentActions,
   titleAction,
   triage,
+  workspaceLabel,
   showOpenOnWeb,
   botAuthorOverrides
 }: {
@@ -159,6 +175,7 @@ function PrSidebarContent({
   commentActions: MobilePrCommentActions
   titleAction: MobilePrTitleAction
   triage: MobilePrAiTriage
+  workspaceLabel: string | null
   showOpenOnWeb: boolean
   botAuthorOverrides: ReadonlySet<string>
 }) {
@@ -211,6 +228,7 @@ function PrSidebarContent({
         gitBranch={gitBranch}
         gitStatus={gitStatus}
         connState={connState}
+        workspaceLabel={workspaceLabel}
         onCreated={refetch}
       />
     )
@@ -271,7 +289,8 @@ function PrSidebarSections({
         })
       ),
     isBusy: triage.isBusy('fix-checks'),
-    error: triage.error
+    availability: triage.availability,
+    ...triage.noticeFor('fix-checks')
   }
   const conflictsTriage = {
     resolveConflicts: () =>
@@ -283,7 +302,8 @@ function PrSidebarSections({
         })
       ),
     isBusy: triage.isBusy('resolve-conflicts'),
-    error: triage.error
+    availability: triage.availability,
+    ...triage.noticeFor('resolve-conflicts')
   }
   // One card for identity + actions so the ready PR isn't a stack of thin
   // duplicate blocks (badge row, title, branches, then another action band).
diff --git a/mobile/src/components/ProtocolBlockScreen.test.ts b/mobile/src/components/ProtocolBlockScreen.test.ts
index a69b52566e3d..c0dd920293d1 100644
--- a/mobile/src/components/ProtocolBlockScreen.test.ts
+++ b/mobile/src/components/ProtocolBlockScreen.test.ts
@@ -151,6 +151,19 @@ describe('ProtocolBlockScreen', () => {
     expect(primaryActionUrl()).toBe(RELEASES_URL)
   })
 
+  it('sends a desktop whose page is older than this shell to the desktop update', () => {
+    const output = render({
+      kind: 'blocked',
+      reason: 'bundle-incompatible',
+      side: 'desktop',
+      pageVersion: 0,
+      requiredPageVersion: 1
+    })
+    expect(output).toContain('Update Orca on your computer')
+    expect(output).toContain('This paired desktop app is too old for your current Orca Mobile app')
+    expect(primaryActionUrl()).toBe(RELEASES_URL)
+  })
+
   it('routes an Android bundle wall to GitHub Releases, not a store that has no listing', () => {
     nativeTestState.platform.OS = 'android'
     const output = render({
diff --git a/mobile/src/components/StatusDot.tsx b/mobile/src/components/StatusDot.tsx
index f9514b4e0bf9..a1e974f1cd27 100644
--- a/mobile/src/components/StatusDot.tsx
+++ b/mobile/src/components/StatusDot.tsx
@@ -42,7 +42,6 @@ const styles = StyleSheet.create({
   dot: {
     width: 8,
     height: 8,
-    borderRadius: 4,
-    marginRight: 8
+    borderRadius: 4
   }
 })
diff --git a/mobile/src/components/WorktreeAgentRow.tsx b/mobile/src/components/WorktreeAgentRow.tsx
index 8740d12eaed6..cd8e10b3454e 100644
--- a/mobile/src/components/WorktreeAgentRow.tsx
+++ b/mobile/src/components/WorktreeAgentRow.tsx
@@ -2,7 +2,12 @@ import { memo } from 'react'
 import { StyleSheet, Text, View } from 'react-native'
 import type { RuntimeWorktreeAgentRow } from '../../../src/shared/runtime-types'
 import { colors, spacing } from '../theme/mobile-theme'
-import { agentDisplayLabel, agentDotState, formatTimeAgo } from '../worktree/agent-row-display'
+import {
+  agentDisplayLabel,
+  agentDotState,
+  agentRowTimeAt,
+  formatTimeAgo
+} from '../worktree/agent-row-display'
 import { AgentStateDot } from './AgentStateDot'
 import { MobileAgentIcon } from './MobileAgentIcon'
 
@@ -22,7 +27,7 @@ type Props = {
 function WorktreeAgentRowComponent({ agent, depth, now, unvisited }: Props) {
   const dotState = agentDotState(agent, now)
   const label = agentDisplayLabel(agent, now)
-  const ts = formatTimeAgo(agent.stateStartedAt, now)
+  const ts = formatTimeAgo(agentRowTimeAt(agent), now)
 
   return (
     <View style={[styles.row, { paddingLeft: depth * INDENT_PER_DEPTH }]}>
diff --git a/mobile/src/components/bottom-drawer-back-while-hiding.test.tsx b/mobile/src/components/bottom-drawer-back-while-hiding.test.tsx
new file mode 100644
index 000000000000..a038560b44f7
--- /dev/null
+++ b/mobile/src/components/bottom-drawer-back-while-hiding.test.tsx
@@ -0,0 +1,151 @@
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+type Timing = { to: number; callback?: (finished: boolean) => void }
+
+// Models Reanimated's contract: assigning a new animation cancels the running one,
+// whose callback then gets finished=false.
+const animations = vi.hoisted((): { running: Timing[] } => ({ running: [] }))
+
+vi.mock('../navigation/use-back-claim', () => ({ useBackClaim: () => {} }))
+vi.mock('../platform/keyboard-occlusion', () => ({
+  currentSoftKeyboardHeight: () => 0,
+  subscribeSoftKeyboard: () => () => {}
+}))
+vi.mock('react-native', () => ({
+  Keyboard: { dismiss: () => {} },
+  Modal: 'Modal',
+  Platform: { OS: 'android', select: (options: { android?: unknown }) => options.android },
+  Pressable: 'Pressable',
+  ScrollView: 'ScrollView',
+  StyleSheet: { create: <T,>(styles: T) => styles, absoluteFillObject: {} },
+  View: 'View',
+  useWindowDimensions: () => ({ width: 412, height: 900 })
+}))
+vi.mock('react-native-safe-area-context', () => ({
+  useSafeAreaInsets: () => ({ top: 24, bottom: 0, left: 0, right: 0 })
+}))
+vi.mock('react-native-gesture-handler', () => {
+  const chain: Record<string, unknown> = {}
+  for (const method of [
+    'activeOffsetY',
+    'simultaneousWithExternalGesture',
+    'onBegin',
+    'onUpdate',
+    'onEnd'
+  ]) {
+    chain[method] = () => chain
+  }
+  return {
+    Gesture: { Pan: () => chain, Native: () => chain },
+    GestureDetector: 'GestureDetector',
+    GestureHandlerRootView: 'GestureHandlerRootView'
+  }
+})
+vi.mock('react-native-reanimated', () => {
+  function isTiming(value: unknown): value is Timing {
+    return typeof value === 'object' && value !== null && 'to' in value
+  }
+  return {
+    default: { View: 'AnimatedView', ScrollView: 'AnimatedScrollView' },
+    useSharedValue: (initial: number) => {
+      let value = initial
+      let current: Timing | null = null
+      return {
+        get value() {
+          return value
+        },
+        set value(next: unknown) {
+          if (current) {
+            const cancelled = current
+            current = null
+            animations.running = animations.running.filter((entry) => entry !== cancelled)
+            cancelled.callback?.(false)
+          }
+          if (isTiming(next)) {
+            current = next
+            animations.running.push(next)
+            value = next.to
+          } else if (typeof next === 'number') {
+            value = next
+          }
+        }
+      }
+    },
+    useAnimatedStyle: () => ({}),
+    useAnimatedScrollHandler: () => () => {},
+    withSpring: (to: number) => to,
+    withTiming: (to: number, _config?: unknown, callback?: (finished: boolean) => void) => ({
+      to,
+      callback
+    }),
+    runOnJS: (fn: () => void) => fn,
+    interpolate: () => 0,
+    Extrapolation: { CLAMP: 'clamp' }
+  }
+})
+
+import { MountedBottomDrawer } from './mounted-bottom-drawer'
+
+function finishAnimations(): void {
+  const finishing = animations.running
+  animations.running = []
+  act(() => {
+    for (const animation of finishing) {
+      animation.callback?.(true)
+    }
+  })
+}
+
+function drawer(visible: boolean, onClose: () => void, onHidden: () => void) {
+  return (
+    <MountedBottomDrawer visible={visible} onClose={onClose} onHidden={onHidden}>
+      {null}
+    </MountedBottomDrawer>
+  )
+}
+
+function pressAndroidBack(renderer: ReactTestRenderer): void {
+  act(() => renderer.root.find((node) => String(node.type) === 'Modal').props.onRequestClose())
+}
+
+describe('bottom drawer close request while hiding', () => {
+  afterEach(() => {
+    animations.running = []
+  })
+
+  it('still closes an open drawer on Android Back', () => {
+    const onClose = vi.fn()
+    let renderer!: ReactTestRenderer
+    act(() => {
+      renderer = create(drawer(true, onClose, vi.fn()))
+    })
+    finishAnimations()
+
+    pressAndroidBack(renderer)
+    finishAnimations()
+
+    expect(onClose).toHaveBeenCalledTimes(1)
+    act(() => renderer.unmount())
+  })
+
+  // A Back press inside the hide animation used to restart it, so onHidden never fired
+  // and the drawer's invisible Modal stayed up, swallowing every tap on the screen.
+  it('lets the hide finish when Back is pressed mid-close', () => {
+    const onClose = vi.fn()
+    const onHidden = vi.fn()
+    let renderer!: ReactTestRenderer
+    act(() => {
+      renderer = create(drawer(true, onClose, onHidden))
+    })
+    finishAnimations()
+    act(() => renderer.update(drawer(false, onClose, onHidden)))
+
+    pressAndroidBack(renderer)
+    finishAnimations()
+
+    expect(onHidden).toHaveBeenCalledTimes(1)
+    expect(onClose).not.toHaveBeenCalled()
+    act(() => renderer.unmount())
+  })
+})
diff --git a/mobile/src/components/bottom-drawer-close-lifecycle.test.ts b/mobile/src/components/bottom-drawer-close-lifecycle.test.ts
index 94eb8a8495c9..2e993af225cd 100644
--- a/mobile/src/components/bottom-drawer-close-lifecycle.test.ts
+++ b/mobile/src/components/bottom-drawer-close-lifecycle.test.ts
@@ -98,4 +98,23 @@ describe('BottomDrawer close lifecycle', () => {
     expect(latestAfterClose).toHaveBeenCalledTimes(1)
     expect(renderer.toJSON()).toBeNull()
   })
+
+  // The hide finished and the drawer reopened before the scheduled JS callback ran; that late
+  // callback used to latch, so the next close never unmounted and its invisible Modal ate taps.
+  it('a hide that lands after a reopen does not swallow the next close', () => {
+    const onAfterClose = vi.fn()
+    const renderer = renderDrawer(true, vi.fn(), onAfterClose)
+    const lateOnHidden = mountedDrawer(renderer).props.onHidden
+    updateDrawer(renderer, false, vi.fn(), onAfterClose)
+    updateDrawer(renderer, true, vi.fn(), onAfterClose)
+
+    act(() => lateOnHidden())
+    expect(mountedDrawer(renderer).props.visible).toBe(true)
+    expect(onAfterClose).not.toHaveBeenCalled()
+
+    updateDrawer(renderer, false, vi.fn(), onAfterClose)
+    act(() => mountedDrawer(renderer).props.onHidden())
+    expect(renderer.toJSON()).toBeNull()
+    expect(onAfterClose).toHaveBeenCalledTimes(1)
+  })
 })
diff --git a/mobile/src/components/keyed-bottom-drawer.test.tsx b/mobile/src/components/keyed-bottom-drawer.test.tsx
new file mode 100644
index 000000000000..26d95521ce44
--- /dev/null
+++ b/mobile/src/components/keyed-bottom-drawer.test.tsx
@@ -0,0 +1,294 @@
+import { createElement, Profiler, useLayoutEffect, useState, type ReactElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
+
+// iOS cannot present a native Modal while another is still presented, even mid-close. Each mounted
+// MountedBottomDrawer is one native Modal; this mock records when each mounts and unmounts, in which
+// commit, and which sheets it ever showed, so the tests can check the drawer's lifecycle directly.
+
+type Drawer = {
+  id: number
+  keys: Set<string>
+  visible: boolean
+  onHidden: () => void
+  onClose: () => void
+}
+type Event = { type: 'mount' | 'unmount'; id: number; commit: number }
+
+type Modals = {
+  commit: number
+  nextId: number
+  all: Drawer[]
+  live: Map<number, Drawer>
+  events: Event[]
+}
+
+const modals = vi.hoisted((): Modals => ({
+  commit: 0,
+  nextId: 0,
+  all: [],
+  live: new Map(),
+  events: []
+}))
+
+vi.mock('./mounted-bottom-drawer', () => ({
+  MountedBottomDrawer: function MockMountedBottomDrawer(props: {
+    visible: boolean
+    onHidden: () => void
+    onClose: () => void
+    children: ReactElement<{ name: string }>
+  }) {
+    const [drawer] = useState((): Drawer => ({ id: modals.nextId++, keys: new Set(), ...props }))
+    useLayoutEffect(() => {
+      drawer.visible = props.visible
+      drawer.onHidden = props.onHidden
+      drawer.onClose = props.onClose
+      drawer.keys.add(props.children.props.name)
+    })
+    useLayoutEffect(() => {
+      modals.all.push(drawer)
+      modals.live.set(drawer.id, drawer)
+      modals.events.push({ type: 'mount', id: drawer.id, commit: modals.commit })
+      return () => {
+        modals.live.delete(drawer.id)
+        modals.events.push({ type: 'unmount', id: drawer.id, commit: modals.commit })
+      }
+    }, [])
+    return props.children
+  }
+}))
+
+const { KeyedBottomDrawer } = await import('./keyed-bottom-drawer')
+
+type Sheet = { name: string; version: number }
+
+let renderer: ReactTestRenderer | null = null
+let onAfterClose: Mock<(closed: Sheet) => void>
+
+function tree(sheet: Sheet | null, onClose: (presented: Sheet) => void = () => {}): ReactElement {
+  return (
+    <Profiler
+      id="drawer"
+      // Why: runs once per commit after its subtree's layout effects, so it numbers commits.
+      onRender={() => {
+        modals.commit++
+      }}
+    >
+      <KeyedBottomDrawer<Sheet>
+        sheet={sheet}
+        sheetKey={(s) => s.name}
+        onClose={onClose}
+        onAfterClose={onAfterClose}
+      >
+        {(presented) =>
+          createElement('SheetContent', { name: presented.name, version: presented.version })
+        }
+      </KeyedBottomDrawer>
+    </Profiler>
+  )
+}
+
+function request(sheet: Sheet | null): void {
+  act(() => {
+    if (renderer) {
+      renderer.update(tree(sheet))
+    } else {
+      renderer = create(tree(sheet))
+    }
+  })
+}
+
+function only(): Drawer | null {
+  expect(modals.live.size).toBeLessThanOrEqual(1)
+  return [...modals.live.values()][0] ?? null
+}
+
+function presented(): { name: string; version: number; visible: boolean } | null {
+  const drawer = only()
+  if (!drawer) {
+    return null
+  }
+  const content = renderer!.root.find((node) => String(node.type) === 'SheetContent')
+  return { name: content.props.name, version: content.props.version, visible: drawer.visible }
+}
+
+/** The native hide animation of the mounted drawer finished. */
+function finishHide(drawer = only()): void {
+  act(() => drawer?.onHidden())
+}
+
+function mounts(): Event[] {
+  return modals.events.filter((event) => event.type === 'mount')
+}
+
+const A = { name: 'a', version: 1 }
+const B = { name: 'b', version: 1 }
+const C = { name: 'c', version: 1 }
+
+beforeEach(() => {
+  modals.commit = 0
+  modals.nextId = 0
+  modals.all = []
+  modals.live.clear()
+  modals.events = []
+  onAfterClose = vi.fn()
+})
+
+afterEach(() => {
+  act(() => renderer?.unmount())
+  renderer = null
+})
+
+describe('KeyedBottomDrawer', () => {
+  it('presents a request at once when nothing is presented', () => {
+    request(null)
+    expect(presented()).toBeNull()
+    request(A)
+    expect(presented()).toEqual({ name: 'a', version: 1, visible: true })
+  })
+
+  it('hides the presented sheet and shows the next only after its Modal has unmounted', () => {
+    request(A)
+    request(B)
+    // A keeps its content through the close; B is not mounted yet.
+    expect(presented()).toEqual({ name: 'a', version: 1, visible: false })
+
+    finishHide()
+    expect(presented()).toEqual({ name: 'b', version: 1, visible: true })
+    expect(onAfterClose).toHaveBeenCalledExactlyOnceWith(A)
+
+    const unmountA = modals.events.find((event) => event.type === 'unmount')
+    const mountB = mounts()[1]!
+    // A commit with no Modal at all lands between A leaving and B arriving.
+    expect(mountB.commit).toBeGreaterThan(unmountA!.commit)
+  })
+
+  it('presents the latest request after a close, never one replaced before it was shown', () => {
+    request(A)
+    request(B)
+    request(C)
+    finishHide()
+    expect(presented()?.name).toBe('c')
+    expect(modals.all.map((drawer) => [...drawer.keys])).toEqual([['a'], ['c']])
+  })
+
+  it('a request cleared before the close finishes presents nothing afterwards', () => {
+    request(A)
+    request(B)
+    request(null)
+    finishHide()
+    expect(presented()).toBeNull()
+    expect(mounts()).toHaveLength(1)
+  })
+
+  it('reopening the same sheet mid-close re-shows the same Modal with the new content', () => {
+    request(A)
+    const drawer = only()
+    request(null)
+    expect(presented()?.visible).toBe(false)
+    request({ name: 'a', version: 2 })
+    expect(presented()).toEqual({ name: 'a', version: 2, visible: true })
+    expect(only()).toBe(drawer)
+    expect(mounts()).toHaveLength(1)
+  })
+
+  it('switching away and back to the presented sheet mid-close re-shows it', () => {
+    request(A)
+    request(B)
+    request(A)
+    expect(presented()).toEqual({ name: 'a', version: 1, visible: true })
+    finishHide()
+    expect(presented()?.visible).toBe(true)
+    expect(mounts()).toHaveLength(1)
+  })
+
+  // The hide animation finishes, the sheet reopens before the scheduled JS callback runs, and then
+  // the callback lands: it must not unmount the shown sheet or swallow the next close.
+  it('ignores a hide that lands after a reopen and still honours the next close', () => {
+    request(A)
+    const drawer = only()!
+    request(null)
+    request(A)
+    finishHide(drawer)
+    expect(presented()).toEqual({ name: 'a', version: 1, visible: true })
+    expect(onAfterClose).not.toHaveBeenCalled()
+
+    request(B)
+    finishHide()
+    expect(presented()).toEqual({ name: 'b', version: 1, visible: true })
+    expect(onAfterClose).toHaveBeenCalledExactlyOnceWith(A)
+  })
+
+  it('a hide from an earlier Modal cannot close a later one', () => {
+    request(A)
+    const first = only()!
+    request(null)
+    finishHide()
+    request(B)
+    request(null)
+    act(() => first.onHidden())
+    expect(presented()).toEqual({ name: 'b', version: 1, visible: false })
+    finishHide()
+    expect(presented()).toBeNull()
+  })
+
+  it('reports the close with the sheet that was presented', () => {
+    const onClose = vi.fn()
+    act(() => {
+      renderer = create(tree({ name: 'a', version: 3 }, onClose))
+    })
+    act(() => only()?.onClose())
+    expect(onClose).toHaveBeenCalledExactlyOnceWith({ name: 'a', version: 3 })
+  })
+
+  it('keeps one Modal, never swaps its sheet, and always settles on the latest request', () => {
+    const names = ['a', 'b', 'c']
+    let seed = 11
+    const random = (n: number) => {
+      seed = (seed * 48271) % 2147483647
+      return seed % n
+    }
+    let latestName: string | null = null
+    let version = 0
+    for (let step = 0; step < 600; step++) {
+      const move = random(5)
+      if (move === 2) {
+        finishHide()
+      } else if (move === 3) {
+        // A stale or early hide from whichever Modal is up.
+        act(() => only()?.onHidden())
+      } else {
+        // A new request, or the same sheet again with fresh content.
+        const pick = random(names.length + 1)
+        latestName = move === 4 ? latestName : (names[pick] ?? null)
+        request(latestName === null ? null : { name: latestName, version: ++version })
+      }
+      const shown = presented()
+      if (shown?.visible) {
+        expect(shown.name).toBe(latestName)
+      }
+    }
+    // Settle: finishing every pending hide lands on the latest request.
+    for (let i = 0; i < 3; i++) {
+      if (presented()?.visible === false) {
+        finishHide()
+      }
+    }
+    expect(presented()?.name ?? null).toBe(latestName)
+
+    expect(modals.all.length).toBeGreaterThan(20)
+    for (const drawer of modals.all) {
+      expect(drawer.keys.size).toBe(1)
+    }
+    // Each Modal mounted in a later commit than the one before it left.
+    const ordered = modals.events
+    for (let i = 1; i < ordered.length; i++) {
+      const event = ordered[i]!
+      if (event.type === 'mount') {
+        const previous = ordered[i - 1]!
+        expect(previous.type).toBe('unmount')
+        expect(event.commit).toBeGreaterThan(previous.commit)
+      }
+    }
+  })
+})
diff --git a/mobile/src/components/keyed-bottom-drawer.tsx b/mobile/src/components/keyed-bottom-drawer.tsx
new file mode 100644
index 000000000000..83265cc079b4
--- /dev/null
+++ b/mobile/src/components/keyed-bottom-drawer.tsx
@@ -0,0 +1,106 @@
+import { type ReactNode, useCallback, useEffect, useRef, useState } from 'react'
+import { MountedBottomDrawer, type MountedBottomDrawerProps } from './mounted-bottom-drawer'
+
+// iOS cannot present a native Modal while another is still presented, even mid-close, so one
+// drawer owns what is on screen and swaps sheets only after the previous Modal has unmounted.
+
+type Props<T> = Omit<MountedBottomDrawerProps, 'visible' | 'onClose' | 'onHidden' | 'children'> & {
+  /** The sheet the screen wants shown, or null for none. */
+  sheet: T | null
+  /** Sheets with the same key are one presentation: new content refreshes it in place. */
+  sheetKey: (sheet: T) => string
+  onClose: (presented: T) => void
+  /** Runs once a sheet's Modal has unmounted, in the commit after it left the tree. */
+  onAfterClose?: (closed: T) => void
+  children: (presented: T) => ReactNode
+}
+
+type Presentation<T> = {
+  presented: T | null
+  /** The presented sheet is animating closed. */
+  closing: boolean
+  /** Just unmounted; nothing may present until a commit without its Modal has landed. */
+  released: T | null
+  /** Identifies one mounted Modal so a hide from an earlier one cannot close a later one. */
+  epoch: number
+}
+
+export function KeyedBottomDrawer<T>({
+  sheet,
+  sheetKey,
+  onClose,
+  onAfterClose,
+  children,
+  ...drawerProps
+}: Props<T>) {
+  const [state, setState] = useState<Presentation<T>>(() => ({
+    presented: sheet,
+    closing: false,
+    released: null,
+    epoch: 0
+  }))
+  const onAfterCloseRef = useRef(onAfterClose)
+  useEffect(() => {
+    onAfterCloseRef.current = onAfterClose
+  }, [onAfterClose])
+
+  const next = followRequest(state, sheet, sheetKey)
+  // Why: present in the same render as the request so opening does not add a blank commit.
+  if (next !== state) {
+    setState(next)
+  }
+
+  const { epoch, released } = next
+  const handleHidden = useCallback(() => {
+    // Why: a hide that finished before a reopen re-showed this sheet must not unmount it.
+    setState((current) =>
+      current.epoch === epoch && current.closing
+        ? { presented: null, closing: false, released: current.presented, epoch: epoch + 1 }
+        : current
+    )
+  }, [epoch])
+
+  useEffect(() => {
+    if (released === null) {
+      return
+    }
+    onAfterCloseRef.current?.(released)
+    setState((current) =>
+      current.released === released ? { ...current, released: null } : current
+    )
+  }, [released])
+
+  const presented = next.presented
+  if (presented === null) {
+    return null
+  }
+  return (
+    <MountedBottomDrawer
+      {...drawerProps}
+      visible={!next.closing}
+      onClose={() => onClose(presented)}
+      onHidden={handleHidden}
+    >
+      {children(presented)}
+    </MountedBottomDrawer>
+  )
+}
+
+function followRequest<T>(
+  state: Presentation<T>,
+  sheet: T | null,
+  sheetKey: (sheet: T) => string
+): Presentation<T> {
+  const { presented } = state
+  if (presented === null) {
+    return sheet !== null && state.released === null
+      ? { ...state, presented: sheet, closing: false }
+      : state
+  }
+  if (sheet !== null && sheetKey(sheet) === sheetKey(presented)) {
+    return sheet !== presented || state.closing
+      ? { ...state, presented: sheet, closing: false }
+      : state
+  }
+  return state.closing ? state : { ...state, closing: true }
+}
diff --git a/mobile/src/components/mobile-agent-icon-assets.test.ts b/mobile/src/components/mobile-agent-icon-assets.test.ts
index f4f6325d806d..7020d4b4977a 100644
--- a/mobile/src/components/mobile-agent-icon-assets.test.ts
+++ b/mobile/src/components/mobile-agent-icon-assets.test.ts
@@ -1,4 +1,4 @@
-import { existsSync, readFileSync } from 'node:fs'
+import { existsSync } from 'node:fs'
 import path from 'node:path'
 import { describe, expect, it } from 'vitest'
 import type { TuiAgent } from '../../../src/shared/tui-agent'
@@ -17,7 +17,6 @@ const GLYPH_AGENT_IDS = new Set<TuiAgent>([
 
 const dirname = import.meta.dirname
 const assetsDir = path.resolve(dirname, '../../../src/shared/agent-icons')
-const assetsModuleSource = readFileSync(path.join(dirname, 'mobile-agent-icon-assets.ts'), 'utf8')
 
 // Why: these agents previously loaded from Google's favicon service, which is
 // unreachable in some regions/offline (#8451). Every one that lacks a glyph
@@ -34,12 +33,4 @@ describe('mobile bundled agent icons', () => {
       )
     }
   })
-
-  it('wires every favicon-path agent into the bundled asset map', () => {
-    for (const id of agentsNeedingBundledIcon) {
-      expect(assetsModuleSource, `${id} not mapped in mobile-agent-icon-assets.ts`).toContain(
-        `agent-icons/${id}.png`
-      )
-    }
-  })
 })
diff --git a/mobile/src/components/mobile-agent-icon-assets.ts b/mobile/src/components/mobile-agent-icon-assets.ts
index 473b557096e0..53745ead77e6 100644
--- a/mobile/src/components/mobile-agent-icon-assets.ts
+++ b/mobile/src/components/mobile-agent-icon-assets.ts
@@ -18,6 +18,8 @@ export const MOBILE_AGENT_ICON_ASSETS: Partial<Record<TuiAgent, ImageSourcePropT
   ante: require('../../../src/shared/agent-icons/ante.png'),
   trae: require('../../../src/shared/agent-icons/trae.png'),
   'prime-agent': require('../../../src/shared/agent-icons/prime-agent.png'),
+  codebuddy: require('../../../src/shared/agent-icons/codebuddy.png'),
+  qoder: require('../../../src/shared/agent-icons/qoder.png'),
   gemini: require('../../../src/shared/agent-icons/gemini.png'),
   antigravity: require('../../../src/shared/agent-icons/antigravity.png'),
   goose: require('../../../src/shared/agent-icons/goose.png'),
@@ -29,6 +31,7 @@ export const MOBILE_AGENT_ICON_ASSETS: Partial<Record<TuiAgent, ImageSourcePropT
   autohand: require('../../../src/shared/agent-icons/autohand.png'),
   cline: require('../../../src/shared/agent-icons/cline.png'),
   codebuff: require('../../../src/shared/agent-icons/codebuff.png'),
+  freebuff: require('../../../src/shared/agent-icons/freebuff.png'),
   'command-code': require('../../../src/shared/agent-icons/command-code.png'),
   continue: require('../../../src/shared/agent-icons/continue.png'),
   cursor: require('../../../src/shared/agent-icons/cursor.png'),
@@ -40,6 +43,7 @@ export const MOBILE_AGENT_ICON_ASSETS: Partial<Record<TuiAgent, ImageSourcePropT
   hermes: require('../../../src/shared/agent-icons/hermes.png'),
   devin: require('../../../src/shared/agent-icons/devin.png'),
   muse: require('../../../src/shared/agent-icons/muse.png'),
+  dsh: require('../../../src/shared/agent-icons/dsh.png'),
   zcode: require('../../../src/shared/agent-icons/zcode.png'),
   openclaw: require('../../../src/shared/agent-icons/openclaw.png')
 }
diff --git a/mobile/src/components/mobile-diff-review-send-sheet-stacking.test.ts b/mobile/src/components/mobile-diff-review-send-sheet-stacking.test.ts
new file mode 100644
index 000000000000..f0e865dd4d12
--- /dev/null
+++ b/mobile/src/components/mobile-diff-review-send-sheet-stacking.test.ts
@@ -0,0 +1,311 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestInstance, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { DiffComment } from '../../../src/shared/diff-comment-types'
+import type { RpcClient } from '../transport/rpc-client'
+import type { ReviewScreenState } from '../session/mobile-diff-review-screen-model'
+
+// iOS cannot present a review sheet while another is still on screen (even mid-close): the second
+// presentation silently fails and every later tap on the screen is swallowed. These drive the real
+// controller and keyed drawer; only the native drawer is mocked, and its finished hide animation is
+// played by calling its `onHidden`.
+
+vi.mock('react-native', () => ({
+  ActivityIndicator: 'ActivityIndicator',
+  KeyboardAvoidingView: 'KeyboardAvoidingView',
+  Platform: { OS: 'ios' },
+  Pressable: 'Pressable',
+  StyleSheet: { create: <T>(styles: T) => styles, hairlineWidth: 1 },
+  Text: 'Text',
+  TextInput: 'TextInput',
+  View: 'View'
+}))
+vi.mock('lucide-react-native', () => ({
+  Check: 'Check',
+  Copy: 'Copy',
+  Edit3: 'Edit3',
+  FileText: 'FileText',
+  Plus: 'Plus',
+  Send: 'Send',
+  Trash2: 'Trash2',
+  X: 'X'
+}))
+vi.mock('expo-haptics', () => ({
+  impactAsync: vi.fn(async () => {}),
+  notificationAsync: vi.fn(async () => {}),
+  selectionAsync: vi.fn(async () => {}),
+  performAndroidHapticsAsync: vi.fn(async () => {}),
+  AndroidHaptics: {},
+  ImpactFeedbackStyle: {},
+  NotificationFeedbackType: {}
+}))
+vi.mock('expo-clipboard', () => ({ setStringAsync: vi.fn() }))
+vi.mock('./mobile-diff-review-screen-styles', () => ({
+  mobileDiffReviewStyles: new Proxy({}, { get: () => ({}) })
+}))
+vi.mock('./mounted-bottom-drawer', () => ({ MountedBottomDrawer: 'MountedBottomDrawer' }))
+const loadSnapshot = vi.hoisted(() => vi.fn())
+vi.mock('../session/mobile-diff-review-loaders', () => ({
+  loadMobileDiffReviewSnapshot: loadSnapshot,
+  loadMobileDiffReviewDiff: vi.fn().mockResolvedValue({ kind: 'idle' })
+}))
+vi.mock('../session/use-mobile-pr-sidebar-controller', () => ({
+  useMobilePrSidebarController: () => ({})
+}))
+
+const { MobileDiffReviewDrawers } = await import('./MobileDiffReviewDrawers')
+const { useMobileDiffReviewController } =
+  await import('../session/use-mobile-diff-review-controller')
+
+type Controller = ReturnType<typeof useMobileDiffReviewController>
+type Deferred = { promise: Promise<unknown>; resolve: (value: unknown) => void }
+
+function deferred(): Deferred {
+  let resolve: (value: unknown) => void = () => {}
+  const promise = new Promise<unknown>((settle) => {
+    resolve = settle
+  })
+  return { promise, resolve }
+}
+
+const NOTE: DiffComment = {
+  id: 'note-1',
+  worktreeId: 'wt-1',
+  filePath: 'src/a.ts',
+  lineNumber: 3,
+  body: 'rename this',
+  createdAt: 1,
+  side: 'modified'
+}
+
+const SNAPSHOT: ReviewScreenState = {
+  kind: 'ready',
+  status: {
+    entries: [{ path: 'src/a.ts', status: 'modified', area: 'unstaged' }],
+    conflictOperation: undefined,
+    upstreamStatus: undefined,
+    branch: 'feature',
+    head: 'abc123'
+  },
+  branchCompare: null,
+  comments: [NOTE],
+  reviewState: { version: 1, files: {} }
+}
+
+const TABS_REPLY = {
+  id: 'tabs',
+  ok: true,
+  result: { tabs: [{ type: 'terminal', id: 'tab-1', terminal: 'terminal-1', title: 'codex' }] },
+  _meta: { runtimeId: 'runtime' }
+}
+const SAVE_REPLY = { id: 'save', ok: true, result: {}, _meta: { runtimeId: 'runtime' } }
+
+let renderer: ReactTestRenderer | null = null
+let controller: Controller
+let replies: Map<string, Deferred>
+
+function Screen({ client }: { client: RpcClient }) {
+  controller = useMobileDiffReviewController({
+    client,
+    connState: 'connected',
+    hostCapabilities: [],
+    hostStatusPending: false,
+    hostStatusReadable: true,
+    hostId: 'host-1',
+    worktreeId: 'wt-1',
+    name: 'review',
+    initialFilter: 'all',
+    initialTarget: null,
+    onOpenSession: () => {},
+    onReconnect: null
+  })
+  return createElement(MobileDiffReviewDrawers, { controller })
+}
+
+/** Every RPC waits until the test answers it, so each case controls when a load or save lands. */
+async function mountScreen(): Promise<void> {
+  replies = new Map()
+  const sendRequest = vi.fn((method: string) => {
+    const reply = deferred()
+    replies.set(method, reply)
+    return reply.promise
+  })
+  loadSnapshot.mockResolvedValue(SNAPSHOT)
+  await act(async () => {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the operations under test only call `sendRequest`.
+    renderer = create(createElement(Screen, { client: { sendRequest } as unknown as RpcClient }))
+    await Promise.resolve()
+  })
+  expect(controller.currentItem).not.toBeNull()
+}
+
+async function answer(method: string, reply: unknown): Promise<void> {
+  const pending = replies.get(method)
+  expect(pending, `${method} was never requested`).toBeDefined()
+  await act(async () => {
+    pending?.resolve(reply)
+    await new Promise((settle) => setTimeout(settle, 0))
+  })
+}
+
+function textOf(node: ReactTestInstance): string[] {
+  return node
+    .findAll((child) => String(child.type) === 'Text')
+    .flatMap((text) => text.children.filter((child) => typeof child === 'string'))
+}
+
+/** Every mounted native drawer: each is its own Modal, so there must never be two. */
+function mountedDrawers(): ReactTestInstance[] {
+  return renderer!.root.findAll((node) => String(node.type) === 'MountedBottomDrawer')
+}
+
+/** The mounted sheet, which must carry this title (the first text it renders). */
+function drawer(title: string): ReactTestInstance {
+  const [mounted, ...others] = mountedDrawers()
+  expect(others).toEqual([])
+  expect(mounted && textOf(mounted)[0]).toBe(title)
+  return mounted!
+}
+
+function shownSheets(): string[] {
+  const mounted = mountedDrawers()
+  expect(mounted.length).toBeLessThanOrEqual(1)
+  return mounted.filter((node) => node.props.visible === true).map((node) => textOf(node)[0]!)
+}
+
+function press(within: ReactTestInstance, label: string): void {
+  const target = within.find(
+    (node) =>
+      String(node.type) === 'Pressable' &&
+      (node.props.accessibilityLabel === label || textOf(node).includes(label))
+  )
+  act(() => target.props.onPress())
+}
+
+/** The drawer's native hide animation finished. */
+function finishClosing(title: string): void {
+  const closing = drawer(title)
+  expect(closing.props.visible).toBe(false)
+  act(() => closing.props.onHidden())
+}
+
+/** Marks the only file reviewed; the save stays in flight until `answer('worktree.set')`. */
+function startMarkReviewed(): Promise<void> {
+  let marking: Promise<void> = Promise.resolve()
+  act(() => {
+    marking = controller.markReviewed()
+  })
+  return marking
+}
+
+async function completeReview(): Promise<void> {
+  const marking = startMarkReviewed()
+  await answer('worktree.set', SAVE_REPLY)
+  await act(() => marking)
+}
+
+beforeEach(() => {
+  loadSnapshot.mockReset()
+})
+
+afterEach(() => {
+  act(() => renderer?.unmount())
+  renderer = null
+})
+
+describe('review screen sheets never stack', () => {
+  it('Send Unsent Notes shows Send Notes only after Review Actions has closed', async () => {
+    await mountScreen()
+    act(() => controller.openSheet({ kind: 'actions' }))
+    expect(shownSheets()).toEqual(['Review Actions'])
+
+    press(drawer('Review Actions'), 'Send Unsent Notes')
+    expect(shownSheets()).toEqual([])
+
+    await answer('session.tabs.list', TABS_REPLY)
+    expect(shownSheets()).toEqual([])
+
+    finishClosing('Review Actions')
+    expect(shownSheets()).toEqual(['Send Notes'])
+    expect(textOf(drawer('Send Notes'))).toContain('codex (termin)')
+  })
+
+  it('Review Complete → Send shows Send Notes only after Review Complete has closed', async () => {
+    await mountScreen()
+    await completeReview()
+    expect(shownSheets()).toEqual(['Review Complete'])
+
+    press(drawer('Review Complete'), 'Send notes to agent')
+    expect(shownSheets()).toEqual([])
+
+    finishClosing('Review Complete')
+    expect(shownSheets()).toEqual(['Send Notes'])
+  })
+
+  it('does not open Send Notes when Review Complete closes for another reason', async () => {
+    await mountScreen()
+    await completeReview()
+
+    act(() => drawer('Review Complete').props.onClose())
+    finishClosing('Review Complete')
+
+    expect(shownSheets()).toEqual([])
+  })
+
+  it('Review Complete arriving while another sheet is open waits for that sheet to close', async () => {
+    await mountScreen()
+    const marking = startMarkReviewed()
+    // The user opens Review Actions while the save is still in flight.
+    act(() => controller.openSheet({ kind: 'actions' }))
+    await answer('worktree.set', SAVE_REPLY)
+    await act(() => marking)
+    expect(shownSheets()).toEqual(['Review Actions'])
+
+    act(() => drawer('Review Actions').props.onClose())
+    expect(shownSheets()).toEqual([])
+
+    finishClosing('Review Actions')
+    expect(shownSheets()).toEqual(['Review Complete'])
+  })
+
+  it('a sheet replaced before it was ever shown is never mounted', async () => {
+    await mountScreen()
+    act(() => {
+      controller.openSheet({ kind: 'completion' })
+      controller.openSheet({ kind: 'actions' })
+    })
+    expect(shownSheets()).toEqual(['Review Actions'])
+
+    act(() => {
+      controller.openSheet({ kind: 'completion' })
+      controller.closeSheet('completion')
+    })
+    expect(shownSheets()).toEqual([])
+    finishClosing('Review Actions')
+    expect(mountedDrawers()).toEqual([])
+  })
+
+  it('a send list that lands after Send Notes was dismissed does not bring it back', async () => {
+    await mountScreen()
+    act(() => void controller.openSendSheet())
+    expect(shownSheets()).toEqual(['Send Notes'])
+
+    act(() => drawer('Send Notes').props.onClose())
+    await answer('session.tabs.list', TABS_REPLY)
+    finishClosing('Send Notes')
+    expect(mountedDrawers()).toEqual([])
+
+    act(() => controller.openSheet({ kind: 'actions' }))
+    expect(shownSheets()).toEqual(['Review Actions'])
+  })
+
+  it('Discard keeps its file through the close and discards the file it showed', async () => {
+    await mountScreen()
+    const target = controller.currentItem!
+    act(() => controller.openSheet({ kind: 'discard', target }))
+    press(drawer('Discard File'), 'Discard')
+    expect(shownSheets()).toEqual([])
+    expect(textOf(drawer('Discard File')).join(' ')).toContain(target.filePath)
+    expect(replies.has('git.discard')).toBe(true)
+  })
+})
diff --git a/mobile/src/components/mounted-bottom-drawer-page-keyboard.web.test.tsx b/mobile/src/components/mounted-bottom-drawer-page-keyboard.web.test.tsx
index a741f5c864da..d7d0c67a0cbb 100644
--- a/mobile/src/components/mounted-bottom-drawer-page-keyboard.web.test.tsx
+++ b/mobile/src/components/mounted-bottom-drawer-page-keyboard.web.test.tsx
@@ -69,6 +69,7 @@ vi.mock('react-native-reanimated', () => ({
 }))
 
 import { MountedBottomDrawer } from './mounted-bottom-drawer'
+import { publishShellKeyboardSource } from '../platform/keyboard-occlusion.web'
 
 const RESTING_HEIGHT = 900
 const IME_HEIGHT = 300
@@ -106,15 +107,36 @@ describe('a fill-mode sheet on the page', () => {
     act(() => renderer.unmount())
   })
 
-  it('does not lift over a keyboard the shell already shortened the WebView for', () => {
-    setWindowHeight(RESTING_HEIGHT)
-    const renderer = renderFillSheet()
-    act(() => setWindowHeight(RESTING_HEIGHT - IME_HEIGHT))
-    // The shortened window is the whole avoidance: the sheet's height follows it and nothing lifts.
-    expect(sheetStyle(renderer)).toMatchObject({
-      marginBottom: 0,
-      height: RESTING_HEIGHT - IME_HEIGHT - 24 - 16
+  it('sits on the keyboard the shell says covers the page, as it does natively', () => {
+    let height = 0
+    const listeners = new Set<(next: number) => void>()
+    publishShellKeyboardSource({
+      read: () => height,
+      subscribe: (listener) => {
+        listeners.add(listener)
+        return () => listeners.delete(listener)
+      }
     })
-    act(() => renderer.unmount())
+    try {
+      setWindowHeight(RESTING_HEIGHT)
+      const renderer = renderFillSheet()
+      act(() => {
+        height = IME_HEIGHT
+        listeners.forEach((listener) => listener(IME_HEIGHT))
+      })
+      expect(sheetStyle(renderer)).toMatchObject({
+        marginBottom: IME_HEIGHT,
+        height: RESTING_HEIGHT - IME_HEIGHT - 24 - 16
+      })
+      act(() => {
+        height = 0
+        listeners.forEach((listener) => listener(0))
+      })
+      expect(sheetStyle(renderer).marginBottom).toBe(0)
+      act(() => renderer.unmount())
+      expect(listeners.size).toBe(0)
+    } finally {
+      publishShellKeyboardSource(null)
+    }
   })
 })
diff --git a/mobile/src/components/mounted-bottom-drawer.tsx b/mobile/src/components/mounted-bottom-drawer.tsx
index ea85c3208610..764a3c5437e5 100644
--- a/mobile/src/components/mounted-bottom-drawer.tsx
+++ b/mobile/src/components/mounted-bottom-drawer.tsx
@@ -1,13 +1,5 @@
 import { type ReactNode, useCallback, useEffect, useRef, useState } from 'react'
-import {
-  View,
-  Pressable,
-  useWindowDimensions,
-  ScrollView,
-  Keyboard,
-  Modal,
-  Platform
-} from 'react-native'
+import { View, Pressable, useWindowDimensions, ScrollView, Keyboard, Modal } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { Gesture, GestureDetector, GestureHandlerRootView } from 'react-native-gesture-handler'
 import Animated, {
@@ -29,6 +21,7 @@ import { useInsideBottomDrawerModalHost } from './bottom-drawer-modal-host'
 import { useResponsiveLayout } from '../layout/responsive-layout'
 import { useBackClaim } from '../navigation/use-back-claim'
 import { currentSoftKeyboardHeight, subscribeSoftKeyboard } from '../platform/keyboard-occlusion'
+import { hostOs } from '../platform/host-os'
 
 const DISMISS_THRESHOLD = 80
 const SPRING_CONFIG = { damping: 28, stiffness: 400 }
@@ -131,8 +124,7 @@ export function MountedBottomDrawer({
   // Why: KeyboardAvoidingView and useAnimatedKeyboard are both unreliable
   // inside Modal (iOS ignores KAV; Android needs adjustNothing for
   // useAnimatedKeyboard). The keyboard seam's events work on both platforms
-  // and give the exact height; inside the shell's page none fire, because
-  // the shell shortens the WebView above the IME.
+  // and give the exact height; inside the shell's page they are the shell's.
   useEffect(() => {
     // Pinned-under sheets stay visible for size but must not ride the keyboard —
     // only the top interactive sheet owns inset/lift.
@@ -147,7 +139,7 @@ export function MountedBottomDrawer({
         keyboardHeight,
         bottomInset: insets.bottom,
         fillAvailable,
-        platform: Platform.OS
+        platform: hostOs()
       })
       setKeyboardInset(inset)
       if (duration > 0) {
@@ -185,13 +177,18 @@ export function MountedBottomDrawer({
   }, [visible, interactive, insets.bottom, fillAvailable])
 
   const dismiss = useCallback(() => {
+    // Why: restarting the hide animation cancels it, so onHidden never fires and the
+    // invisible Modal stays up swallowing taps (Android Back lands here mid-close).
+    if (!visible) {
+      return
+    }
     Keyboard.dismiss()
     progress.value = withTiming(0, { duration: BOTTOM_DRAWER_HIDE_DURATION_MS }, (finished) => {
       if (finished) {
         runOnJS(onClose)()
       }
     })
-  }, [onClose, progress])
+  }, [onClose, progress, visible])
 
   // One seam, both platforms: natively this is the hardware key, and inside the shell's page it is
   // a claim the shell hands one press over on. Every session sheet renders through this component,
diff --git a/mobile/src/components/pr-sidebar/MobilePrViewPanel.tsx b/mobile/src/components/pr-sidebar/MobilePrViewPanel.tsx
index f587074e12ee..4f76073e7cbe 100644
--- a/mobile/src/components/pr-sidebar/MobilePrViewPanel.tsx
+++ b/mobile/src/components/pr-sidebar/MobilePrViewPanel.tsx
@@ -17,6 +17,7 @@ type Props = {
   isGithubRepo?: boolean
   branchContextLoaded?: boolean
   controller: MobilePrSidebarController
+  workspaceLabel: string | null
 }
 
 // Chromeless PR sidebar body for the source-control hub's Pull Request segment.
@@ -31,7 +32,8 @@ export function MobilePrViewPanelBody({
   gitStatus,
   isGithubRepo = true,
   branchContextLoaded = true,
-  controller
+  controller,
+  workspaceLabel
 }: Props) {
   const insets = useSafeAreaInsets()
 
@@ -64,6 +66,7 @@ export function MobilePrViewPanelBody({
         bottomInset={insets.bottom}
         // Hub header already hosts open-on-web while this segment is active.
         showOpenOnWeb={false}
+        workspaceLabel={workspaceLabel}
       />
     </View>
   )
diff --git a/mobile/src/components/pr-sidebar/PRChecksSection.tsx b/mobile/src/components/pr-sidebar/PRChecksSection.tsx
index 881c3c60bde5..67c4a71ed878 100644
--- a/mobile/src/components/pr-sidebar/PRChecksSection.tsx
+++ b/mobile/src/components/pr-sidebar/PRChecksSection.tsx
@@ -22,12 +22,18 @@ import { PRSection } from './PRSection'
 import { PRCheckDetailView, type DetailEntry } from './PRCheckDetail'
 import { mobilePrSidebarStyles as styles } from './mobile-pr-sidebar-styles'
 import { prAiTriageStyles as triageStyles } from './pr-ai-triage-styles'
+import { AgentLaunchNotice } from '../AgentLaunchNotice'
+import type { MobileAgentLaunchAvailability } from '../../session/mobile-agent-launch-availability'
 
 // Launches the "Fix checks with AI" agent. Absent for display-only usages.
 export type PrChecksTriage = {
   fixChecks: () => void
   isBusy: boolean
+  availability: MobileAgentLaunchAvailability
+  success: string | null
   error: string | null
+  warning: string | null
+  undeliveredPrompt: string | null
 }
 
 type Props = {
@@ -190,7 +196,7 @@ export function PRChecksSection({
           <Pressable
             style={({ pressed }) => [triageStyles.triageStripButton, pressed && { opacity: 0.7 }]}
             onPress={triage.fixChecks}
-            disabled={triage.isBusy}
+            disabled={triage.isBusy || triage.availability !== 'available'}
             accessibilityRole="button"
             accessibilityLabel="Fix failing checks with AI"
           >
@@ -203,7 +209,16 @@ export function PRChecksSection({
           </Pressable>
         </View>
       ) : null}
-      {triage?.error ? <Text style={triageStyles.triageError}>{triage.error}</Text> : null}
+      {triage ? (
+        <AgentLaunchNotice
+          availability={summary.failed > 0 ? triage.availability : 'available'}
+          success={triage.success}
+          error={triage.error}
+          warning={triage.warning}
+          undeliveredPrompt={triage.undeliveredPrompt}
+          errorStyle={triageStyles.triageError}
+        />
+      ) : null}
       {checksError ? <Text style={triageStyles.triageError}>{checksError}</Text> : null}
       {sorted.map((check) => {
         const key = prCheckKey(check)
diff --git a/mobile/src/components/pr-sidebar/PRConflictingFilesSection.tsx b/mobile/src/components/pr-sidebar/PRConflictingFilesSection.tsx
index badb33a6fd07..99996fa1baf6 100644
--- a/mobile/src/components/pr-sidebar/PRConflictingFilesSection.tsx
+++ b/mobile/src/components/pr-sidebar/PRConflictingFilesSection.tsx
@@ -8,12 +8,18 @@ import { PRSection } from './PRSection'
 import { resolveConflictDisplay } from './pr-conflict-presentation'
 import { prConflictStyles as styles } from './pr-conflict-styles'
 import { prAiTriageStyles as triageStyles } from './pr-ai-triage-styles'
+import { AgentLaunchNotice } from '../AgentLaunchNotice'
+import type { MobileAgentLaunchAvailability } from '../../session/mobile-agent-launch-availability'
 
 // Launches the "Resolve conflicts with AI" agent. Absent for display-only usages.
 export type PrConflictsTriage = {
   resolveConflicts: () => void
   isBusy: boolean
+  availability: MobileAgentLaunchAvailability
+  success: string | null
   error: string | null
+  warning: string | null
+  undeliveredPrompt: string | null
 }
 
 type Props = {
@@ -157,7 +163,7 @@ export function PRConflictingFilesSection({ pr, isRefreshing = false, triage }:
               pressed && triageStyles.triageButtonPressed
             ]}
             onPress={triage.resolveConflicts}
-            disabled={triage.isBusy}
+            disabled={triage.isBusy || triage.availability !== 'available'}
             accessibilityRole="button"
             accessibilityLabel="Resolve conflicts with AI"
           >
@@ -168,7 +174,14 @@ export function PRConflictingFilesSection({ pr, isRefreshing = false, triage }:
             )}
             <Text style={triageStyles.triageButtonText}>Resolve conflicts with AI</Text>
           </Pressable>
-          {triage.error ? <Text style={triageStyles.triageError}>{triage.error}</Text> : null}
+          <AgentLaunchNotice
+            availability={triage.availability}
+            success={triage.success}
+            error={triage.error}
+            warning={triage.warning}
+            undeliveredPrompt={triage.undeliveredPrompt}
+            errorStyle={triageStyles.triageError}
+          />
         </View>
       ) : null}
     </PRSection>
diff --git a/mobile/src/components/pr-sidebar/PrSidebarCreateEmptyState.tsx b/mobile/src/components/pr-sidebar/PrSidebarCreateEmptyState.tsx
index cffde86ea5b3..ac07248f9259 100644
--- a/mobile/src/components/pr-sidebar/PrSidebarCreateEmptyState.tsx
+++ b/mobile/src/components/pr-sidebar/PrSidebarCreateEmptyState.tsx
@@ -28,6 +28,8 @@ type Props = {
   gitBranch: string | null
   gitStatus: MobileGitStatusResult | null
   connState: ConnectionState
+  /** Named when the commit-recovery agent starts. */
+  workspaceLabel: string | null
   // Refetches the sidebar after create or an explicit empty-state refresh.
   onCreated: () => void
 }
@@ -43,6 +45,7 @@ export function PrSidebarCreateEmptyState({
   gitBranch,
   gitStatus,
   connState,
+  workspaceLabel,
   onCreated
 }: Props) {
   const [mode, setMode] = useState<Mode>('choose')
@@ -57,6 +60,7 @@ export function PrSidebarCreateEmptyState({
     client,
     connState,
     worktreeId,
+    workspaceLabel,
     failure: commitFailureRecovery
   })
 
diff --git a/mobile/src/components/use-new-workspace-create-submit.ts b/mobile/src/components/use-new-workspace-create-submit.ts
index df47a69b65a0..5ea89f23efc0 100644
--- a/mobile/src/components/use-new-workspace-create-submit.ts
+++ b/mobile/src/components/use-new-workspace-create-submit.ts
@@ -14,7 +14,7 @@ import {
 import { createWorkspaceFromComposerSource } from '../tasks/source-workspace-create'
 import { normalizeWorkspaceAgent } from '../tasks/workspace-agent-selection'
 import type { WorkspaceCreateSetupDecision } from '../tasks/workspace-create-params'
-import type { AgentLaunchSupport } from '../tasks/agent-launch-worktree-create'
+import type { AgentLaunchSupport } from '../tasks/agent-launch-request'
 import type { WorkspaceSshGate } from '../tasks/workspace-ssh-gate'
 import type { useMobileComposerSource } from '../tasks/use-mobile-composer-source'
 import type { WorktreeCreateIdempotencySupport } from '../tasks/worktree-create-idempotency-policy'
diff --git a/mobile/src/diagnostics/use-mobile-web-bundle-probe.test.tsx b/mobile/src/diagnostics/use-mobile-web-bundle-probe.test.tsx
index c7878e65ea54..b72cb584d02e 100644
--- a/mobile/src/diagnostics/use-mobile-web-bundle-probe.test.tsx
+++ b/mobile/src/diagnostics/use-mobile-web-bundle-probe.test.tsx
@@ -23,6 +23,9 @@ vi.mock('../transport/runtime-status-probe', () => ({ startRuntimeStatusProbe: (
 vi.mock('../transport/connection-revival-triggers', () => ({
   subscribeConnectionRevivalTriggers: () => () => {}
 }))
+vi.mock('../transport/connection-log-background-flush', () => ({
+  subscribeConnectionLogBackgroundFlush: () => () => {}
+}))
 vi.mock('../transport/mobile-web-bundle-fetch', () => ({
   fetchMobileWebBundle: (...args: unknown[]) => fetchMock(...args)
 }))
diff --git a/mobile/src/files/files-router-seam-census.test.ts b/mobile/src/files/files-router-seam-census.test.ts
deleted file mode 100644
index 360b040b2df6..000000000000
--- a/mobile/src/files/files-router-seam-census.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  callsRouteHandoff,
-  importsExpoRouterValue,
-  parse,
-  productFiles
-} from '../navigation/router-seam-census.test-support'
-
-const FILES_ROOT = import.meta.dirname
-
-/**
- * Which modules here hold a router, so the census cannot pass by seeing nothing.
- *
- * The walk and the two rules are the seam's, shared with every other domain that runs them; what
- * stays here is this domain's own evidence: which of its modules are meant to hold a router.
- */
-const ROUTER_HOLDERS = ['MobileFilePreviewScreen.tsx', 'MobileFileExplorerPanel.tsx']
-
-describe('the files domain reaches the router through the handoff seam', () => {
-  const files = productFiles(FILES_ROOT)
-
-  it('walks the modules it is written against', () => {
-    expect(files).toEqual(expect.arrayContaining(ROUTER_HOLDERS))
-  })
-
-  it('imports no router from expo-router, which the page cannot hand a route back through', () => {
-    expect(files.filter((name) => importsExpoRouterValue(parse(FILES_ROOT, name)))).toEqual([])
-  })
-
-  it('takes the router from useRouteHandoff at every screen that holds one', () => {
-    expect(files.filter((name) => callsRouteHandoff(parse(FILES_ROOT, name))).sort()).toEqual(
-      [...ROUTER_HOLDERS].sort()
-    )
-  })
-})
diff --git a/mobile/src/home-host-edit-navigation-source.test.ts b/mobile/src/home-host-edit-navigation-source.test.ts
deleted file mode 100644
index 617dd030c8a2..000000000000
--- a/mobile/src/home-host-edit-navigation-source.test.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { describe, expect, it } from 'vitest'
-
-const homeSource = readFileSync(new URL('./home/MobileHomeScreen.tsx', import.meta.url), 'utf8')
-
-describe('Home host edit navigation wiring', () => {
-  it('uses the cold-navigator-safe edit transition', () => {
-    expect(homeSource).toMatch(/const openMobileHostEdit = useOpenMobileHostEdit\(\)/)
-    expect(homeSource).toMatch(/onEdit:\s*openMobileHostEdit/)
-  })
-})
diff --git a/mobile/src/home/AppUpdateCard.test.tsx b/mobile/src/home/AppUpdateCard.test.tsx
new file mode 100644
index 000000000000..7a98a91f91fa
--- /dev/null
+++ b/mobile/src/home/AppUpdateCard.test.tsx
@@ -0,0 +1,50 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { AppUpdateCard } from './AppUpdateCard'
+
+vi.mock('react-native', () => ({
+  Pressable: 'Pressable',
+  StyleSheet: { create: <T,>(styles: T) => styles },
+  Text: 'Text',
+  View: 'View'
+}))
+vi.mock('lucide-react-native', () => ({ ArrowUpFromLine: 'ArrowUpFromLine', X: 'X' }))
+
+describe('AppUpdateCard', () => {
+  let renderer: ReactTestRenderer | null = null
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+  })
+
+  function render() {
+    const onPress = vi.fn()
+    const onDismiss = vi.fn()
+    act(() => {
+      renderer = create(createElement(AppUpdateCard, { version: '0.0.51', onPress, onDismiss }))
+    })
+    const root = renderer!.root
+    const texts = root
+      .findAll((node) => String(node.type) === 'Text')
+      .flatMap((node) => node.children.filter((child) => typeof child === 'string'))
+    return { root, texts, onPress, onDismiss }
+  }
+
+  it('says which version is available and how to get it, with a monochrome glyph', () => {
+    const { root, texts } = render()
+    expect(texts).toEqual(['Orca 0.0.51 is available', 'Tap to update'])
+    expect(root.find((node) => String(node.type) === 'ArrowUpFromLine').props.color).toBe('#e0e0e0')
+  })
+
+  it('opens the update from the card body and dismisses from the X', () => {
+    const { root, onPress, onDismiss } = render()
+    const [body, dismiss] = root.findAll((node) => String(node.type) === 'Pressable')
+    expect(dismiss.props.accessibilityLabel).toBe('Dismiss Orca 0.0.51 update')
+    act(() => body.props.onPress())
+    expect(onPress).toHaveBeenCalledTimes(1)
+    expect(onDismiss).not.toHaveBeenCalled()
+    act(() => dismiss.props.onPress())
+    expect(onDismiss).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/mobile/src/home/AppUpdateCard.tsx b/mobile/src/home/AppUpdateCard.tsx
new file mode 100644
index 000000000000..6713bcbfd123
--- /dev/null
+++ b/mobile/src/home/AppUpdateCard.tsx
@@ -0,0 +1,86 @@
+import { ArrowUpFromLine, X } from 'lucide-react-native'
+import { Pressable, StyleSheet, Text, View } from 'react-native'
+import { colors, radii, spacing } from '../theme/mobile-theme'
+
+/** Home's update notice, drawn in the host card's frame so it reads as part of that list. */
+export function AppUpdateCard(props: {
+  version: string
+  onPress: () => void
+  onDismiss: () => void
+}) {
+  const title = `Orca ${props.version} is available`
+  return (
+    <View style={styles.card}>
+      <Pressable
+        accessibilityRole="button"
+        accessibilityLabel={`${title}, tap to update`}
+        style={({ pressed }) => [styles.cardMain, pressed && styles.cardPressed]}
+        onPress={props.onPress}
+      >
+        <View style={styles.icon}>
+          <ArrowUpFromLine size={20} strokeWidth={1.75} color={colors.textPrimary} />
+        </View>
+        <View style={styles.main}>
+          <Text style={styles.title} numberOfLines={1}>
+            {title}
+          </Text>
+          <Text style={styles.subtitle} numberOfLines={1}>
+            Tap to update
+          </Text>
+        </View>
+      </Pressable>
+      <Pressable
+        accessibilityRole="button"
+        accessibilityLabel={`Dismiss Orca ${props.version} update`}
+        hitSlop={8}
+        style={({ pressed }) => [styles.dismissButton, pressed && styles.dismissPressed]}
+        onPress={props.onDismiss}
+      >
+        <X size={16} color={colors.textSecondary} />
+      </Pressable>
+    </View>
+  )
+}
+
+// Same frame, icon well and spacing as MobileHostCard.
+const styles = StyleSheet.create({
+  card: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    borderRadius: radii.card,
+    backgroundColor: colors.bgPanel,
+    borderWidth: 1,
+    borderColor: colors.borderSubtle,
+    overflow: 'hidden'
+  },
+  cardMain: {
+    flex: 1,
+    minWidth: 0,
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingLeft: spacing.md,
+    paddingVertical: 12
+  },
+  cardPressed: { backgroundColor: colors.bgRaised },
+  icon: {
+    width: 46,
+    height: 46,
+    borderRadius: 13,
+    alignItems: 'center',
+    justifyContent: 'center',
+    backgroundColor: colors.bgRaised,
+    marginRight: 14
+  },
+  main: { flex: 1, minWidth: 0, marginRight: spacing.sm },
+  title: { color: colors.textPrimary, fontSize: 15, fontWeight: '600', lineHeight: 20 },
+  subtitle: { color: colors.textSecondary, fontSize: 12, lineHeight: 16 },
+  dismissButton: {
+    width: 40,
+    height: 40,
+    marginHorizontal: spacing.xs,
+    borderRadius: radii.row,
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  dismissPressed: { backgroundColor: colors.bgRaised }
+})
diff --git a/mobile/src/home/MobileHomeAppUpdateCard.tsx b/mobile/src/home/MobileHomeAppUpdateCard.tsx
new file mode 100644
index 000000000000..51bc41d86027
--- /dev/null
+++ b/mobile/src/home/MobileHomeAppUpdateCard.tsx
@@ -0,0 +1,27 @@
+import { StyleSheet, View } from 'react-native'
+import { undismissedAppUpdate } from '../app-update/app-update-checker'
+import {
+  appUpdateChecker,
+  openAppUpdate,
+  useAppUpdateState
+} from '../app-update/app-update-runtime'
+import { AppUpdateCard } from './AppUpdateCard'
+import { spacing } from '../theme/mobile-theme'
+
+export function MobileHomeAppUpdateCard() {
+  const available = undismissedAppUpdate(useAppUpdateState())
+  if (!available) {
+    return null
+  }
+  return (
+    <View style={styles.slot}>
+      <AppUpdateCard
+        version={available.version}
+        onPress={() => openAppUpdate(available.url)}
+        onDismiss={() => appUpdateChecker.dismiss(available.version)}
+      />
+    </View>
+  )
+}
+
+const styles = StyleSheet.create({ slot: { marginBottom: spacing.lg } })
diff --git a/mobile/src/home/MobileHomeListHeader.tsx b/mobile/src/home/MobileHomeListHeader.tsx
index 7e47c9ae9d62..f7da47c9733f 100644
--- a/mobile/src/home/MobileHomeListHeader.tsx
+++ b/mobile/src/home/MobileHomeListHeader.tsx
@@ -1,6 +1,7 @@
 import { StyleSheet, Text, View } from 'react-native'
 import type { HomeStatsSummary } from '../stats/home-stats-total'
 import { colors, spacing } from '../theme/mobile-theme'
+import { MobileHomeAppUpdateCard } from './MobileHomeAppUpdateCard'
 
 function formatDuration(ms: number): string {
   const totalMinutes = Math.floor(ms / 60_000)
@@ -36,6 +37,7 @@ export function MobileHomeListHeader({ stats }: { stats: HomeStatsSummary | null
           </View>
         </View>
       ) : null}
+      <MobileHomeAppUpdateCard />
       <Text style={styles.sectionHeading}>Desktops</Text>
     </View>
   )
diff --git a/mobile/src/hooks/use-mobile-dictation-source.test.ts b/mobile/src/hooks/use-mobile-dictation-source.test.ts
deleted file mode 100644
index aedc0543bcea..000000000000
--- a/mobile/src/hooks/use-mobile-dictation-source.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { describe, expect, it } from 'vitest'
-
-const source = readFileSync(new URL('./use-mobile-dictation.ts', import.meta.url), 'utf8')
-const nativeCaptureSource = readFileSync(
-  new URL('../platform/dictation-capture.ts', import.meta.url),
-  'utf8'
-)
-
-function sliceSource(sourceText: string, startPattern: string, endPattern: string): string {
-  const start = sourceText.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = sourceText.indexOf(endPattern, start)
-  expect(end).toBeGreaterThan(start)
-  return sourceText.slice(start, end)
-}
-
-function sliceBetween(startPattern: string, endPattern: string): string {
-  return sliceSource(source, startPattern, endPattern)
-}
-
-describe('useMobileDictation source invariants', () => {
-  it('publishes live option refs from committed renders before passive Effects flush', () => {
-    const refDeclarations = sliceBetween(
-      'const clientRef = useRef(client)',
-      'useLayoutEffect(() => {'
-    )
-    expect(refDeclarations).not.toContain('.current =')
-
-    const mirrorEffect = sliceBetween('useLayoutEffect(() => {', 'const reportError =')
-    expect(mirrorEffect).toContain('clientRef.current = client')
-    expect(mirrorEffect).toContain('enabledRef.current = enabled')
-    expect(mirrorEffect).toContain('onTranscriptRef.current = onTranscript')
-    expect(mirrorEffect).toContain('onErrorRef.current = onError')
-    expect(mirrorEffect).toContain('}, [client, enabled, onTranscript, onError])')
-  })
-
-  it('carries audio the capture dropped into the same refusal the budget raises', () => {
-    const chunkHandler = sliceBetween('const sub = capture.onChunk(', 'return () => sub.remove()')
-    expect(chunkHandler).toContain('if (chunk.droppedBytes > 0)')
-    expect(chunkHandler).toContain('MOBILE_DICTATION_CONNECTION_SLOW_ERROR_MESSAGE')
-    // Only the page can drop: the seam's native half is where the microphone is.
-    expect(nativeCaptureSource).toContain('droppedBytes: 0')
-  })
-
-  it('resets pending audio bytes whenever pending chunk tracking is cleared', () => {
-    const pendingChunkClears = source.match(/pendingChunksRef\.current\.clear\(\)/g) ?? []
-    const pendingAudioResets = source.match(/pendingAudioBudgetRef\.current\.reset\(\)/g) ?? []
-
-    expect(pendingAudioResets).toHaveLength(pendingChunkClears.length)
-  })
-
-  it('closes the capture on every path that ends a dictation', () => {
-    const closeAudio = sliceBetween(
-      'const closeDictationAudio = useCallback(',
-      'const failActiveDictation ='
-    )
-    expect(closeAudio).toContain('capture.end()')
-    const cleanupSlices = [
-      sliceBetween('const failActiveDictation = useCallback(', 'useEffect(() => {'),
-      sliceBetween('const abandonDictation = useCallback(', 'const cancel ='),
-      sliceBetween('return () => {\n      const dictationId = activeIdRef.current', '  return {')
-    ]
-    for (const cleanupSlice of cleanupSlices) {
-      expect(cleanupSlice).toContain('closeDictationAudio()')
-    }
-    // The capture hands over its tail before the pending sends are taken, or the finish overtakes
-    // the last chunk. `mobile-dictation-stop-tail.test.tsx` drives the order this pins.
-    const stopBody = sliceBetween(
-      'const stop = useCallback(async () => {',
-      'const abandonDictation ='
-    )
-    expect(stopBody.indexOf('capture.end()')).toBeLessThan(
-      stopBody.indexOf('await Promise.allSettled')
-    )
-  })
-
-  it('routes an audio interruption through cancel and a disable through the reporting abort', () => {
-    const interruptionEffect = sliceBetween('capture.onInterruption(', 'return () => sub.remove()')
-    const disabledEffect = sliceBetween(
-      'useEffect(() => {\n    if (!enabled) {',
-      '  }, [abandonDictation, enabled])'
-    )
-
-    expect(interruptionEffect).toContain('void cancel()')
-    // A disable is not the user's cancel, so it carries the reason the composer shows; the user's
-    // own cancel is the one end that passes none. `mobile-dictation-input-closed-mid-start.test.tsx`
-    // drives both halves.
-    expect(disabledEffect).toContain(
-      'void abandonDictation(MOBILE_DICTATION_INPUT_CLOSED_ERROR_MESSAGE)'
-    )
-    expect(source).toContain('const cancel = useCallback(() => abandonDictation(null)')
-    // Which interruptions end a capture is one predicate both seams read, so a page cannot cancel
-    // on a kind the device ignores. `dictation-capture.test.ts` drives the rule itself.
-    expect(nativeCaptureSource).toContain('bridgeAudioInterruptionEndsCapture(event.data)')
-  })
-})
diff --git a/mobile/src/host-screen/host-route-href-encoding.test.ts b/mobile/src/host-screen/host-route-href-encoding.test.ts
deleted file mode 100644
index c1ced2afe904..000000000000
--- a/mobile/src/host-screen/host-route-href-encoding.test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-/**
- * Every host-route target the host page builds, and whether its host id survives being one segment.
- *
- * `useLocalSearchParams` and the persisted host store both answer the decoded id, and the store
- * admits any non-empty string, so an id carrying `/`, `?`, `#` or whitespace stops being the single
- * segment `matchesRoutePattern` reads it as the moment it is interpolated raw. Inside the shell's
- * page that decides where a tap goes: the handoff matches the pathname against the shell's
- * `pageRoutes` before it chooses between this document and the native stack.
- *
- * A census rather than six assertions, because the failure is a habit and not a bug: each of these
- * sites was written by copying the one next to it, and the seventh will be too.
- */
-const MOBILE_ROOT = join(import.meta.dirname, '..', '..')
-
-/** The files that build a target from the host list and its row sheet. */
-const HOST_PAGE_SOURCES = [
-  'src/host-screen/host-screen-header.tsx',
-  'src/host-screen/host-screen-overlays.tsx',
-  'src/host-screen/use-host-worktree-actions.ts',
-  'src/agent-history/worktree-navigation-actions.ts'
-]
-
-/**
- * The two `/h/${...}` reads that are not targets.
- *
- * Both compare against a pathname the router answers rather than building a link, so encoding them
- * would change what a comparison matches instead of what a tap opens. They are listed by the text
- * that makes them comparisons, so a line that stopped being one stops being exempt.
- */
-const COMPARISONS = ['pathname === `/h/${hostId}`']
-
-const HOST_SEGMENT = /`\/h\/\$\{([^}]*)\}/g
-
-function hostInterpolations(source: string): string[] {
-  return [...source.matchAll(HOST_SEGMENT)].map((match) => match[1] ?? '')
-}
-
-describe('every host-route target the host page builds', () => {
-  it('reaches the census, so the assertion below cannot pass on an empty list', () => {
-    const found = HOST_PAGE_SOURCES.flatMap((path) =>
-      hostInterpolations(readFileSync(join(MOBILE_ROOT, path), 'utf8'))
-    )
-    expect(found.length).toBeGreaterThanOrEqual(6)
-  })
-
-  it('encodes the host id, at every site', () => {
-    const raw: string[] = []
-    for (const path of HOST_PAGE_SOURCES) {
-      const source = readFileSync(join(MOBILE_ROOT, path), 'utf8')
-      const exempt = COMPARISONS.filter((text) => source.includes(text)).length
-      const unencoded = hostInterpolations(source).filter(
-        (expression) => !expression.includes('encodeURIComponent')
-      )
-      // The comparisons are subtracted rather than matched away, so a file that lost its comparison
-      // and gained a raw target does not come out even.
-      if (unencoded.length > exempt) {
-        raw.push(`${path}: ${unencoded.length - exempt} raw`)
-      }
-    }
-    expect(raw).toEqual([])
-  })
-
-  it('keeps the pathname comparisons out of the count for a stated reason, not by accident', () => {
-    const source = readFileSync(
-      join(MOBILE_ROOT, 'src/host-screen/use-host-worktree-actions.ts'),
-      'utf8'
-    )
-    // Present, so the exemption above is answering something real; and a comparison, so the
-    // exemption is not quietly covering a target.
-    expect(source).toContain(COMPARISONS[0])
-  })
-})
diff --git a/mobile/src/host-screen/host-screen-primary-styles.ts b/mobile/src/host-screen/host-screen-primary-styles.ts
index 1f13dd17b160..e262af906b5e 100644
--- a/mobile/src/host-screen/host-screen-primary-styles.ts
+++ b/mobile/src/host-screen/host-screen-primary-styles.ts
@@ -39,7 +39,7 @@ export const hostScreenPrimaryStyles = StyleSheet.create({
     minWidth: 0,
     marginRight: spacing.md
   },
-  hostIdentityLine: { flexDirection: 'row', alignItems: 'center', minWidth: 0 },
+  hostIdentityLine: { flexDirection: 'row', alignItems: 'center', gap: spacing.sm, minWidth: 0 },
   hostPlatformText: {
     marginLeft: 16,
     color: colors.textSecondary,
diff --git a/mobile/src/mobile-web-shell/MobileWebShellScreen.test.tsx b/mobile/src/mobile-web-shell/MobileWebShellScreen.test.tsx
index b41c67a2d710..64220f80c110 100644
--- a/mobile/src/mobile-web-shell/MobileWebShellScreen.test.tsx
+++ b/mobile/src/mobile-web-shell/MobileWebShellScreen.test.tsx
@@ -28,7 +28,6 @@ import { act, create } from 'react-test-renderer'
 import { bridgeId, clientFrame, createFakeRpcClient } from './bridge-host-test-fakes'
 import {
   byName,
-  DEFAULT_ROUTE_GRANTS,
   trackRenderedScreen,
   NativeFallback,
   SCREEN_BUILD_ID as BUILD_ID,
@@ -39,14 +38,13 @@ import {
   textOf,
   updateScreen as reRenderScreen
 } from './mobile-web-shell-screen-test-harness'
-import { BRIDGE_BACK_CLAIM_NOTIFY, BRIDGE_BACK_FRAME } from './bridge/bridge-page-back'
+import { BRIDGE_BACK_CLAIM_NOTIFY } from './bridge/bridge-page-back'
 import { BRIDGE_PAGE_PAINTED } from './bridge/bridge-page-painted'
 import {
   BRIDGE_FAULT_GRANT,
   BRIDGE_NAVIGATE_BACK_NOTIFY,
   readBridgeHostMessage
 } from './bridge/bridge-envelope'
-import { BRIDGE_ROUTE_UPDATE_ACCEPT } from './bridge/bridge-route-update'
 import { MobileWebShellScreen } from './MobileWebShellScreen'
 import type { MobileWebShellSessionState } from './mobile-web-shell-session-contract'
 import type { ReactTestInstance, ReactTestRenderer } from 'react-test-renderer'
@@ -151,7 +149,6 @@ describe('the hybrid shell screen', () => {
     const tree = await renderScreen(readyState('session-one'))
     const view = byName(tree, 'ShellViewProbe')[0]
     expect(view.props.bridgeEnabled).toBe(true)
-    expect(typeof view.props.onBridgeMessage).toBe('function')
     // Delivered with no client behind it: there is no host to answer, and nothing throws.
     await act(async () => {
       view.props.onBridgeMessage({ nativeEvent: { json: '{"v":1,"type":"ready"}' } })
@@ -227,7 +224,7 @@ describe('the hybrid shell screen', () => {
     tree: ReactTestRenderer
     initRoutes: () => (Record<string, string> | undefined)[]
     move: (next: Record<string, string>) => Promise<void>
-    ready: (accepts?: readonly string[]) => Promise<void>
+    ready: () => Promise<void>
   }> {
     const element = (next: Record<string, string>) =>
       createElement(MobileWebShellScreen, {
@@ -259,10 +256,10 @@ describe('the hybrid shell screen', () => {
           tree.update(element(next))
         })
       },
-      ready: async (accepts = [BRIDGE_ROUTE_UPDATE_ACCEPT]) => {
+      ready: async () => {
         await act(async () => {
           byName(tree, 'ShellViewProbe')[0]?.props.onBridgeMessage({
-            nativeEvent: { json: clientFrame({ type: 'ready', accepts }) }
+            nativeEvent: { json: clientFrame({ type: 'ready' }) }
           })
         })
       }
@@ -302,18 +299,6 @@ describe('the hybrid shell screen', () => {
     warned.mockRestore()
   })
 
-  it('sends no second init to a page that never said it takes one', async () => {
-    dependencies.client = createFakeRpcClient()
-    const page = await renderForRoute({ paneKey: '' })
-    // A page built before route updates existed declares nothing, and reads a second `init` as a
-    // replacement: the route still moves, so its next `ready` is answered with the new one.
-    await page.ready([])
-    await page.move({ paneKey: 'pane-1' })
-    expect(page.initRoutes()).toEqual([{ paneKey: '' }])
-    await page.ready([])
-    expect(page.initRoutes()).toEqual([{ paneKey: '' }, { paneKey: 'pane-1' }])
-  })
-
   it('ends that wait on the page asking for a session', async () => {
     dependencies.client = createFakeRpcClient()
     const tree = await renderScreen(readyState('session-one'))
@@ -434,7 +419,7 @@ describe('the hybrid shell screen', () => {
     const tree = await renderScreen(readyState('session-one'))
     await act(async () => {
       byName(tree, 'ShellViewProbe')[0].props.onBridgeMessage({
-        nativeEvent: { json: clientFrame({ type: 'ready', accepts: [BRIDGE_BACK_FRAME] }) }
+        nativeEvent: { json: clientFrame({ type: 'ready' }) }
       })
       byName(tree, 'ShellViewProbe')[0].props.onBridgeMessage({
         nativeEvent: {
@@ -647,41 +632,6 @@ describe('a refused update is said beside the page, not in front of it', () => {
   })
 })
 
-/**
- * Last in the file on purpose: it is the case the block above would have poisoned.
- *
- * Those cases grant the screencast lane and install a client, and before the shared setup reset
- * them both, whatever ran next inherited a route granted a lane it never asked for. Deleting the
- * reset fails here and nowhere else, because nothing else runs after a case that mutates them.
- */
-describe('what one case mutates does not reach the next', () => {
-  it('starts from the shared route grants and no client', () => {
-    expect({ grants: dependencies.routeGrants, client: dependencies.client }).toEqual({
-      grants: DEFAULT_ROUTE_GRANTS,
-      client: null
-    })
-  })
-
-  it('keeps both bar strips off the view for a page that does not pad for them', async () => {
-    // A page served from an older desktop has no reader for the insets, so the shell reserves
-    // the strips itself. Edge-to-edge makes the manifest's `adjustResize` inert, so the keyboard
-    // strip comes off the view too: the page's `visualViewport` reads full height with the IME up.
-    const tree = await renderScreen(readyState('session-keyboard'))
-    const root = tree.root.find((node) => node.props.testID === 'mobile-web-shell-ready')
-    expect(root.props.style[1]).toEqual({ paddingTop: 44, paddingBottom: 8 })
-
-    await act(async () => {
-      dependencies.keyboardListeners.get('keyboardWillShow')?.({ endCoordinates: { height: 336 } })
-    })
-    expect(root.props.style[1]).toEqual({ paddingTop: 44, paddingBottom: 336 })
-
-    await act(async () => {
-      dependencies.keyboardListeners.get('keyboardWillHide')?.({ endCoordinates: { height: 0 } })
-    })
-    expect(root.props.style[1]).toEqual({ paddingTop: 44, paddingBottom: 8 })
-  })
-})
-
 /**
  * What is on screen between the generation being mounted and the page having a frame.
  *
@@ -718,17 +668,17 @@ describe('the frame under a page that has not painted', () => {
     expect(tree.root.findAll((node) => node.props.testID === 'mobile-web-shell-cover')).toEqual([])
   })
 
-  it('covers the same box the view gets, which is what the keyboard strip shortens', async () => {
+  it('covers the same box the view gets, which the keyboard does not shorten', async () => {
     // Both are children of the padded root: the view is `flex: 1` and the cover is an absolute
-    // fill, so Yoga lays each of them out against the same content box. The keyboard takes its
-    // strip off that box, so it takes it off both, and the cover cannot leave a gap the view fills.
+    // fill, so Yoga lays each of them out against the same content box, and the cover cannot leave
+    // a gap the view fills. The keyboard covers that box rather than taking a strip off it.
     dependencies.pageFrame = 'unpainted'
     const tree = await renderScreen(readyState('session-keyboard-cover'))
     const root = tree.root.find((node) => node.props.testID === 'mobile-web-shell-ready')
     await act(async () => {
       dependencies.keyboardListeners.get('keyboardWillShow')?.({ endCoordinates: { height: 336 } })
     })
-    expect(root.props.style[1]).toEqual({ paddingTop: 44, paddingBottom: 336 })
+    expect(root.props.style[1]).toEqual({ paddingTop: 0 })
     const cover = tree.root.find((node) => node.props.testID === 'mobile-web-shell-cover')
     expect(cover.props.style[0]).toMatchObject({
       position: 'absolute',
@@ -750,13 +700,10 @@ describe('the frame under a page that has not painted', () => {
     const probe = byName(tree, 'ShellViewProbe')[0]
     await act(async () => {
       probe.props.onBridgeMessage({
-        nativeEvent: { json: clientFrame({ type: 'ready', reports: [BRIDGE_PAGE_PAINTED] }) }
+        nativeEvent: { json: clientFrame({ type: 'ready' }) }
       })
     })
-    expect(dependencies.reportPageReady).toHaveBeenCalledWith({
-      reports: [BRIDGE_PAGE_PAINTED],
-      accepts: []
-    })
+    expect(dependencies.reportPageReady).toHaveBeenCalledTimes(1)
     await act(async () => {
       probe.props.onBridgeMessage({
         nativeEvent: { json: clientFrame({ type: 'notify', name: BRIDGE_PAGE_PAINTED }) }
diff --git a/mobile/src/mobile-web-shell/MobileWebShellScreen.tsx b/mobile/src/mobile-web-shell/MobileWebShellScreen.tsx
index 83d6d1724998..88cedd9fd6de 100644
--- a/mobile/src/mobile-web-shell/MobileWebShellScreen.tsx
+++ b/mobile/src/mobile-web-shell/MobileWebShellScreen.tsx
@@ -1,13 +1,5 @@
 import { useEffect, useState, type ReactNode } from 'react'
-import {
-  ActivityIndicator,
-  Linking,
-  Platform,
-  Pressable,
-  StyleSheet,
-  Text,
-  View
-} from 'react-native'
+import { ActivityIndicator, Linking, Pressable, StyleSheet, Text, View } from 'react-native'
 import { useNavigation, useRouter } from 'expo-router'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import {
@@ -34,7 +26,6 @@ import { playPageHaptic } from './page-haptics'
 import { useMobileWebShellBridge } from './use-mobile-web-shell-bridge'
 import type { MobileWebShellRuntime } from './mobile-web-shell-runtime'
 import { useKeyboardOcclusion } from '../platform/keyboard-occlusion'
-import { softwareKeyboardWindowInset } from '../platform/software-keyboard-window-inset'
 import { useNativeDeviceVerbs } from '../platform/use-native-device-verbs'
 import { useShellPageBack } from './use-shell-page-back'
 import { useShellStackPop } from './use-shell-stack-pop'
@@ -178,16 +169,6 @@ export function MobileWebShellScreen({
   runtime
 }: MobileWebShellScreenProps) {
   const insets = useSafeAreaInsets()
-  // The page cannot see the IME for itself: edge-to-edge makes the manifest's `adjustResize` inert,
-  // so the window never shrinks and `visualViewport` inside the WebView reads full height with the
-  // keyboard up — the session route lays its live input row out under the keys. The shell owns the
-  // window, so it takes the strip off the view and the page lays out in what is left.
-  const keyboardHeight = useKeyboardOcclusion()
-  const keyboardInset = softwareKeyboardWindowInset({
-    keyboardHeight,
-    bottomInset: insets.bottom,
-    platform: Platform.OS
-  })
   const router = useRouter()
   const navigation = useNavigation()
   const popShellStack = useShellStackPop()
@@ -207,19 +188,18 @@ export function MobileWebShellScreen({
     reportPageBackClaim,
     pageReady,
     pageFrame,
-    backClaimed,
-    pageOwnsSafeArea
+    backClaimed
   } = useMobileWebShellSession({ hostId, routePathname: route.pathname, runtime })
   // Which mount the notice was dismissed on, not whether it was: a later refusal opens its own
   // generation under a new session id, so it is not silenced by a tap on the one before it.
   const [noticeDismissedFor, setNoticeDismissedFor] = useState<string | null>(null)
   const noticeShown =
     updateNotice !== null && state.kind === 'ready' && noticeDismissedFor !== state.sessionId
-  const pageInsets = pageSafeAreaInsets({
-    insets,
-    keyboardInset,
-    topCovered: noticeShown
-  })
+  // The page cannot see the IME for itself: edge-to-edge makes `adjustResize` inert and the view's
+  // IME insets are zeroed, so `visualViewport` never shrinks. The keyboard covers the view like a
+  // native screen, and the page lifts by the height native screens read.
+  const keyboardInset = Math.max(0, useKeyboardOcclusion())
+  const pageInsets = pageSafeAreaInsets({ insets, topCovered: noticeShown })
   const { snapshot, unreadable, readStorage, refreshStorage, writeStorage } = usePageHostSnapshot(
     hostId,
     route.pathname
@@ -242,6 +222,7 @@ export function MobileWebShellScreen({
     hostId,
     route,
     safeAreaInsets: pageInsets,
+    keyboardInset,
     pageRoutes,
     pageRouteGrants,
     routeGrants,
@@ -264,12 +245,12 @@ export function MobileWebShellScreen({
     // the map as they are made. This re-seats that map on the store afterwards, for the key whose
     // write never persisted, and it runs on every ask because a document that reloads inside this
     // mount asks again.
-    onPageReady: (ready) => {
-      reportPageReady(ready)
+    onPageReady: () => {
+      reportPageReady()
       void refreshStorage()
     },
     // The one thing that says the page is something to look at. The cover below stays up until it
-    // lands, for a page that declared it would send one.
+    // lands.
     onPagePainted: reportPagePainted,
     // While this is true the key below belongs to the page, not to the stack this screen sits on.
     onPageBackClaim: reportPageBackClaim,
@@ -323,6 +304,11 @@ export function MobileWebShellScreen({
   }, [publishRoute, route])
 
   usePublishedSafeAreaInsets(bridge.publishSafeAreaInsets, pageInsets)
+  // Every keyboard event, a height change while open included, so the page never holds a stale one.
+  const publishKeyboardInset = bridge.publishKeyboardInset
+  useEffect(() => {
+    publishKeyboardInset(keyboardInset)
+  }, [publishKeyboardInset, keyboardInset])
 
   // The navigation object rather than the router: what this takes away is this screen's own place
   // on the stack, which is a screen option, and the router has no member that says it.
@@ -372,12 +358,9 @@ export function MobileWebShellScreen({
     <View
       style={[
         styles.shellRoot,
-        // Edge-to-edge like a native screen, for a page that pads for the bars itself; an older page
-        // keeps the strips. The keyboard strip stays off either way, since the page cannot see it,
-        // and the banner takes the status bar strip when it shows.
-        pageOwnsSafeArea
-          ? { paddingTop: noticeShown ? insets.top : 0, paddingBottom: keyboardInset }
-          : { paddingTop: insets.top, paddingBottom: Math.max(insets.bottom, keyboardInset) }
+        // Edge-to-edge like a native screen: the page pads for the bars itself from the insets
+        // `init` carries. The banner takes the status bar strip when it shows.
+        { paddingTop: noticeShown ? insets.top : 0 }
       ]}
       testID="mobile-web-shell-ready"
     >
diff --git a/mobile/src/mobile-web-shell/bridge-host-back.test.ts b/mobile/src/mobile-web-shell/bridge-host-back.test.ts
index 7010e85ea8b8..d368c74d524e 100644
--- a/mobile/src/mobile-web-shell/bridge-host-back.test.ts
+++ b/mobile/src/mobile-web-shell/bridge-host-back.test.ts
@@ -3,8 +3,8 @@ import { clientFrame } from './bridge-host-test-fakes'
 import { harness } from './bridge-host-test-harness'
 import { BRIDGE_BACK_CLAIM_NOTIFY, BRIDGE_BACK_FRAME } from './bridge/bridge-page-back'
 
-function ready(accepts?: readonly string[]): string {
-  return clientFrame(accepts === undefined ? { type: 'ready' } : { type: 'ready', accepts })
+function ready(): string {
+  return clientFrame({ type: 'ready' })
 }
 
 function claim(claimed: boolean): string {
@@ -21,7 +21,7 @@ function claim(claimed: boolean): string {
 describe('the claim a host holds on the device Back key', () => {
   it('carries the page taking the key and letting it go, and says neither twice', () => {
     const bridge = harness()
-    bridge.host.receive(ready([BRIDGE_BACK_FRAME]))
+    bridge.host.receive(ready())
     bridge.host.receive(claim(true))
     bridge.host.receive(claim(true))
     bridge.host.receive(claim(false))
@@ -30,15 +30,15 @@ describe('the claim a host holds on the device Back key', () => {
 
   it('drops it on the next document saying ready, which is the one that has to claim again', () => {
     const bridge = harness()
-    bridge.host.receive(ready([BRIDGE_BACK_FRAME]))
+    bridge.host.receive(ready())
     bridge.host.receive(claim(true))
-    bridge.host.receive(ready([BRIDGE_BACK_FRAME]))
+    bridge.host.receive(ready())
     expect(bridge.backClaims).toEqual([true, false])
   })
 
   it('drops it when the page closes, which is the document saying it is going', () => {
     const bridge = harness()
-    bridge.host.receive(ready([BRIDGE_BACK_FRAME]))
+    bridge.host.receive(ready())
     bridge.host.receive(claim(true))
     bridge.host.receive(clientFrame({ type: 'close' }))
     expect(bridge.backClaims).toEqual([true, false])
@@ -53,7 +53,7 @@ describe('the claim a host holds on the device Back key', () => {
    */
   it('reports nothing when the host itself ends: the claim belongs to the session', () => {
     const bridge = harness()
-    bridge.host.receive(ready([BRIDGE_BACK_FRAME]))
+    bridge.host.receive(ready())
     bridge.host.receive(claim(true))
     bridge.host.dispose()
     expect(bridge.backClaims).toEqual([true])
@@ -61,35 +61,35 @@ describe('the claim a host holds on the device Back key', () => {
 
   it('hands what the session established to the host that takes over from it', () => {
     const bridge = harness()
-    bridge.host.receive(ready([BRIDGE_BACK_FRAME]))
+    bridge.host.receive(ready())
     bridge.host.receive(claim(true))
     bridge.host.dispose()
-    expect(bridge.host.readSessionBack()).toEqual({ accepts: [BRIDGE_BACK_FRAME], claimed: true })
+    expect(bridge.host.readSessionBack()).toEqual({ claimed: true })
   })
 
   it('takes that seed without announcing a claim the screen never heard go', () => {
     const rebuilt = harness({
-      sessionBack: { accepts: [BRIDGE_BACK_FRAME], claimed: true },
+      sessionBack: { claimed: true },
       sessionEstablished: true
     })
     expect(rebuilt.backClaims).toEqual([])
-    // And it delivers on it: the page said it takes a press, over a session that is still open.
+    // And it delivers on it, over a session that is still open.
     expect(rebuilt.host.sendBack()).toBe(true)
     expect(rebuilt.last()).toEqual({ v: 1, type: BRIDGE_BACK_FRAME })
   })
 
   it('lets the next document reset a carried claim, so the seed is not a latch', () => {
     const rebuilt = harness({
-      sessionBack: { accepts: [BRIDGE_BACK_FRAME], claimed: true },
+      sessionBack: { claimed: true },
       sessionEstablished: true
     })
-    rebuilt.host.receive(ready([BRIDGE_BACK_FRAME]))
+    rebuilt.host.receive(ready())
     expect(rebuilt.backClaims).toEqual([false])
   })
 
   it('says nothing on a document that never claimed, so a drop is always a real one', () => {
     const bridge = harness()
-    bridge.host.receive(ready([BRIDGE_BACK_FRAME]))
+    bridge.host.receive(ready())
     bridge.host.receive(clientFrame({ type: 'close' }))
     bridge.host.dispose()
     expect(bridge.backClaims).toEqual([])
@@ -110,7 +110,7 @@ describe('the claim a host holds on the device Back key', () => {
 describe('handing one press to the page', () => {
   it('posts a back frame to a page that said it takes one', () => {
     const bridge = harness()
-    bridge.host.receive(ready([BRIDGE_BACK_FRAME]))
+    bridge.host.receive(ready())
     expect(bridge.host.sendBack()).toBe(true)
     expect(bridge.last()).toEqual({ v: 1, type: BRIDGE_BACK_FRAME })
   })
@@ -120,24 +120,16 @@ describe('handing one press to the page', () => {
    * one as `unrecognised-message` and drops the whole thing, so the shell must not send it. False
    * is what leaves the press to the navigator, which is what Back did before this lane.
    */
-  it('sends nothing to a page that never declared it, and says so to the caller', () => {
-    const bridge = harness()
-    bridge.host.receive(ready())
-    const before = bridge.posted.length
-    expect(bridge.host.sendBack()).toBe(false)
-    expect(bridge.posted).toHaveLength(before)
-  })
-
   it('sends nothing between documents, when the view belongs to no page', () => {
     const bridge = harness()
-    bridge.host.receive(ready([BRIDGE_BACK_FRAME]))
+    bridge.host.receive(ready())
     bridge.host.receive(clientFrame({ type: 'close' }))
     expect(bridge.host.sendBack()).toBe(false)
   })
 
   it('sends nothing once the host is disposed', () => {
     const bridge = harness()
-    bridge.host.receive(ready([BRIDGE_BACK_FRAME]))
+    bridge.host.receive(ready())
     bridge.host.dispose()
     expect(bridge.host.sendBack()).toBe(false)
   })
diff --git a/mobile/src/mobile-web-shell/bridge-host-back.ts b/mobile/src/mobile-web-shell/bridge-host-back.ts
index b9cbe108e553..a835be0e3549 100644
--- a/mobile/src/mobile-web-shell/bridge-host-back.ts
+++ b/mobile/src/mobile-web-shell/bridge-host-back.ts
@@ -2,8 +2,7 @@ import { BRIDGE_PROTOCOL_VERSION, type BridgeHostMessage } from './bridge/bridge
 import { BRIDGE_BACK_FRAME } from './bridge/bridge-page-back'
 
 /**
- * What one session has established about the device Back key: what its page declared it takes, and
- * whether it is holding the key right now.
+ * What one session has established about the device Back key: whether its page is holding it.
  *
  * Carried across a host rebuild rather than relearned, the way `sessionEstablished` already is. A
  * client swapped under a live page is not a new document — the WebView stays mounted and the page
@@ -11,8 +10,6 @@ import { BRIDGE_BACK_FRAME } from './bridge/bridge-page-back'
  * under an open sheet.
  */
 export type BridgeSessionBack = {
-  /** What the page's last `ready` said it takes. Empty for a page too old to name the frame. */
-  readonly accepts: readonly string[]
   readonly claimed: boolean
 }
 
@@ -29,14 +26,12 @@ export type BridgeSessionBack = {
  * whoever builds the replacement, and reports nothing, because the claim belongs to the session.
  */
 export type BridgeHostBack = {
-  /** A document has spoken: it takes what it named, and claims nothing until it says otherwise. */
-  readonly readReady: (accepts: readonly string[]) => void
+  /** A document has spoken: it claims nothing until it says otherwise. */
+  readonly readReady: () => void
   /** The page holding Back, or letting it go. */
   readonly readClaim: (claimed: boolean) => void
-  /**
-   * Posts one press. False when this page never said it takes one — every page older than the
-   * frame — and the caller then leaves Back to the navigator, which is what it did before this.
-   */
+  /** Posts one press. False when no document can take it, and the caller leaves Back to the
+   *  navigator. */
   readonly send: () => boolean
   /** The document is gone; whatever it claimed goes with it. */
   readonly drop: () => void
@@ -53,7 +48,6 @@ export function createBridgeHostBack(args: {
    *  a host opening a session of its own, which has established nothing yet. */
   established?: BridgeSessionBack
 }): BridgeHostBack {
-  let accepts: readonly string[] = args.established?.accepts ?? []
   // Seeded without a report: the screen never heard this claim go, because it did not.
   let claimed = args.established?.claimed ?? false
 
@@ -66,10 +60,7 @@ export function createBridgeHostBack(args: {
   }
 
   return {
-    readReady: (next) => {
-      accepts = next
-      drop()
-    },
+    readReady: drop,
     readClaim: (next) => {
       if (next === claimed) {
         return
@@ -78,13 +69,13 @@ export function createBridgeHostBack(args: {
       args.onClaim(next)
     },
     send: () => {
-      if (!accepts.includes(BRIDGE_BACK_FRAME) || !args.deliverable()) {
+      if (!args.deliverable()) {
         return false
       }
       args.send({ v: BRIDGE_PROTOCOL_VERSION, type: BRIDGE_BACK_FRAME })
       return true
     },
     drop,
-    read: () => ({ accepts, claimed })
+    read: () => ({ claimed })
   }
 }
diff --git a/mobile/src/mobile-web-shell/bridge-host-contract.ts b/mobile/src/mobile-web-shell/bridge-host-contract.ts
index f360fdc0d964..a9f9dfcb10b2 100644
--- a/mobile/src/mobile-web-shell/bridge-host-contract.ts
+++ b/mobile/src/mobile-web-shell/bridge-host-contract.ts
@@ -5,7 +5,6 @@ import type { BridgeRefusal } from './bridge/bridge-caps'
 import type { BridgeInitHost, BridgeInitRoute } from './bridge/bridge-envelope'
 import type { BridgeClearableRouteParam } from './bridge/bridge-route-update'
 import type { BridgeSafeAreaInsets } from './bridge/bridge-safe-area-insets'
-import type { PageReadyDeclaration } from './mobile-web-shell-session-contract'
 import type { BridgeHapticsKind } from './bridge/bridge-haptics-notify'
 import type { BridgeErrorCapture } from './bridge/bridge-error-capture'
 import type { BridgeNativeVerb } from './bridge/bridge-native-verbs'
@@ -133,6 +132,9 @@ export type BridgeHostOptions = {
   /** How much of the WebView sits under a system bar when it is drawn edge-to-edge. Zeros when
    *  absent; moved later with `publishSafeAreaInsets`. */
   safeAreaInsets?: BridgeSafeAreaInsets
+  /** The keyboard height native screens read on the shell's OS. 0 when absent; moved later with
+   *  `publishKeyboardInset`. */
+  keyboardInset?: number
   /**
    * This device's identity to that host, as the native screens already send it, swapped in for the
    * page's placeholder on the way out. Read at forward time rather than captured: the host outlives
@@ -202,12 +204,8 @@ export type BridgeHostOptions = {
    * the same reason as the fault: the shell bounds the wait for it, and a host built without this
    * would leave a document that never spoke looking exactly like one still starting up.
    */
-  onPageReady: (ready: PageReadyDeclaration) => void
-  /**
-   * The page has a frame on screen. Only pages whose `ready` listed `BRIDGE_PAGE_PAINTED` post it,
-   * which is why `onPageReady` carries that list: a caller covering the view until this arrives
-   * has to know whether it is coming, and a page served from an older desktop never sends one.
-   */
+  onPageReady: () => void
+  /** The page has a frame on screen, which a caller covering the view until then waits for. */
   onPagePainted: () => void
   /**
    * The page is holding the device Back key, or has let it go. Required, because the shell only
diff --git a/mobile/src/mobile-web-shell/bridge-host-init.test.ts b/mobile/src/mobile-web-shell/bridge-host-init.test.ts
index 6e2f86788f2d..0b0b52687fc1 100644
--- a/mobile/src/mobile-web-shell/bridge-host-init.test.ts
+++ b/mobile/src/mobile-web-shell/bridge-host-init.test.ts
@@ -7,10 +7,6 @@ import {
   BRIDGE_MAX_SUBSCRIPTIONS
 } from './bridge/bridge-caps'
 import { BRIDGE_FAULT_GRANT } from './bridge/bridge-envelope'
-import { BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT } from './bridge/bridge-page-client-identity'
-import { BRIDGE_BACK_CLAIM_NOTIFY } from './bridge/bridge-page-back'
-import { BRIDGE_PAGE_PAINTED } from './bridge/bridge-page-painted'
-import { BRIDGE_ROUTE_PARAM_CLEAR } from './bridge/bridge-route-update'
 import { routeViewOf } from './page-route-policy'
 
 describe('init and state', () => {
@@ -29,13 +25,6 @@ describe('init and state', () => {
       type: 'init',
       sessionId: 'session-a',
       buildId: 'build-a',
-      // What this shell takes from the page, which is the page's own check before it posts one.
-      accepts: [
-        BRIDGE_ROUTE_PARAM_CLEAR,
-        BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT,
-        BRIDGE_PAGE_PAINTED,
-        BRIDGE_BACK_CLAIM_NOTIFY
-      ],
       connection: {
         state: 'reconnecting',
         reconnectAttempt: 3,
@@ -265,7 +254,7 @@ describe('init and state', () => {
       route: { pathname: '/h/host-a/session/wt-1' },
       post: () => (view.gone ? Promise.reject(new Error('the view is gone')) : Promise.resolve())
     })
-    // A page that declares nothing is never sent a second `init`, so the tap can only be held.
+    // The second `init` the tap sends is refused with the view, so only the held route is left.
     bridge.host.receive(clientFrame({ type: 'ready' }))
     bridge.host.publishRoute({
       pathname: '/h/host-a/session/wt-1',
@@ -274,7 +263,7 @@ describe('init and state', () => {
     for (let turn = 0; turn < 4; turn += 1) {
       await Promise.resolve()
     }
-    expect(bridge.posted).toHaveLength(1)
+    expect(bridge.posted).toHaveLength(2)
     // The next document over the same host: a reload, or the view coming back.
     view.gone = false
     bridge.host.receive(clientFrame({ type: 'ready' }))
diff --git a/mobile/src/mobile-web-shell/bridge-host-notifications.test.ts b/mobile/src/mobile-web-shell/bridge-host-notifications.test.ts
index dc9436074e83..1e7b7904a101 100644
--- a/mobile/src/mobile-web-shell/bridge-host-notifications.test.ts
+++ b/mobile/src/mobile-web-shell/bridge-host-notifications.test.ts
@@ -6,8 +6,6 @@ import {
   BRIDGE_FAULT_GRANT,
   BRIDGE_NAVIGATE_BACK_NOTIFY
 } from './bridge/bridge-envelope'
-import { BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT } from './bridge/bridge-page-client-identity'
-import { BRIDGE_BACK_CLAIM_NOTIFY } from './bridge/bridge-page-back'
 import { BRIDGE_PAGE_PAINTED } from './bridge/bridge-page-painted'
 import { BRIDGE_ROUTE_PARAM_CLEAR } from './bridge/bridge-route-update'
 import {
@@ -462,20 +460,6 @@ describe('the page erasing a one-shot route param', () => {
     expect(bridge.routeParamClears()).toEqual([])
     expect(bridge.diagnostics).toEqual([{ kind: 'refused', refusal: 'unrecognised-message' }])
   })
-
-  it('tells the page it takes a clear, so a page built for an older shell does not post one', () => {
-    const bridge = harness({ route: { pathname: '/h/host-a/session/wt-1' } })
-    bridge.host.receive(clientFrame({ type: 'ready' }))
-    const init = bridge.last()
-    // Written out rather than compared against `BRIDGE_SHELL_ACCEPTS`: a list that pins itself
-    // pins nothing, and this is the frame an older page reads to decide what it may post.
-    expect(init.type === 'init' && init.accepts).toEqual([
-      BRIDGE_ROUTE_PARAM_CLEAR,
-      BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT,
-      BRIDGE_PAGE_PAINTED,
-      BRIDGE_BACK_CLAIM_NOTIFY
-    ])
-  })
 })
 
 /**
@@ -485,20 +469,13 @@ describe('the page erasing a one-shot route param', () => {
 describe('the page reporting its first frame', () => {
   it('hands the report to the session and asks the client for nothing', () => {
     const bridge = harness()
-    bridge.host.receive(clientFrame({ type: 'ready', reports: [BRIDGE_PAGE_PAINTED] }))
+    bridge.host.receive(clientFrame({ type: 'ready' }))
     bridge.host.receive(clientFrame({ type: 'notify', name: BRIDGE_PAGE_PAINTED }))
     expect(bridge.pagePaintCount()).toBe(1)
     expect(bridge.client.requests).toHaveLength(0)
     expect(bridge.client.foregroundCalls).toHaveLength(0)
   })
 
-  it('forwards what each ready declared, including a name this shell does not implement', () => {
-    const bridge = harness()
-    bridge.host.receive(clientFrame({ type: 'ready', reports: [BRIDGE_PAGE_PAINTED, 'weather'] }))
-    bridge.host.receive(clientFrame({ type: 'ready' }))
-    expect(bridge.pageReports()).toEqual([[BRIDGE_PAGE_PAINTED, 'weather'], []])
-  })
-
   it('refuses a report from a document nothing has answered', () => {
     const bridge = harness()
     bridge.host.receive(clientFrame({ type: 'notify', name: BRIDGE_PAGE_PAINTED }))
diff --git a/mobile/src/mobile-web-shell/bridge-host-route.ts b/mobile/src/mobile-web-shell/bridge-host-route.ts
index 055932a5ffeb..1306ea276a29 100644
--- a/mobile/src/mobile-web-shell/bridge-host-route.ts
+++ b/mobile/src/mobile-web-shell/bridge-host-route.ts
@@ -1,11 +1,6 @@
-import {
-  BridgeInitRouteSchema,
-  type BridgeClientMessage,
-  type BridgeInitRoute
-} from './bridge/bridge-envelope'
+import { BridgeInitRouteSchema, type BridgeInitRoute } from './bridge/bridge-envelope'
 import { readBridgeRouteUpdate } from './bridge/bridge-route-update'
 import {
-  BRIDGE_SAFE_AREA_ACCEPT,
   sameSafeAreaInsets,
   ZERO_SAFE_AREA_INSETS,
   type BridgeSafeAreaInsets
@@ -17,13 +12,10 @@ export type BridgeHostRoute = {
   readonly current: () => BridgeInitRoute | null
   /** Why the opened route was refused, for the line the host prints at construction. */
   readonly openIssue: () => string
-  /** What the page's latest `ready` said it can be sent. Reset by each document's `ready`. */
-  readonly readReady: (message: Extract<BridgeClientMessage, { type: 'ready' }>) => void
   /**
    * Hands the page a rewritten param for the screen it is already on, and sends one `init` when
    * that moved the route. The held route moves either way, so a page that reloads inside this
-   * mount is given the newest one on its next `ready` even when it is too old to be sent one in
-   * flight.
+   * mount is given the newest one on its next `ready`.
    *
    * Answers nothing, and nothing here learns anything from a post (ruling 34). It cannot: a frame
    * the page received and then failed to handle is caught by the page and reported there, so what
@@ -36,10 +28,14 @@ export type BridgeHostRoute = {
   /** The insets the next `init` carries. */
   readonly safeAreaInsets: () => BridgeSafeAreaInsets
   /**
-   * Moves the held insets, and sends one `init` when they moved and the page reads them. The same
-   * lane as a pane update: held either way, so the next `ready` carries them.
+   * Moves the held insets, and sends one `init` when they moved. The same lane as a pane update:
+   * held either way, so the next `ready` carries them.
    */
   readonly publishSafeAreaInsets: (next: BridgeSafeAreaInsets, deliverable: boolean) => void
+  /** The keyboard height the next `init` carries. */
+  readonly keyboardInset: () => number
+  /** Moves the held keyboard height on the same lane as the insets. */
+  readonly publishKeyboardInset: (next: number, deliverable: boolean) => void
 }
 
 /**
@@ -65,19 +61,17 @@ export function createBridgeHostRoute(args: {
   sendInit: () => void
   onRefused: (issue: string) => void
   safeAreaInsets?: BridgeSafeAreaInsets
+  keyboardInset?: number
 }): BridgeHostRoute {
   const parsed = BridgeInitRouteSchema.safeParse(args.opened)
   let route = parsed.success && !args.refused ? parsed.data : null
-  let accepts: readonly string[] = []
   let insets = args.safeAreaInsets ?? ZERO_SAFE_AREA_INSETS
+  let keyboard = args.keyboardInset ?? 0
   return {
     current: () => route,
     openIssue: () => (parsed.success ? 'unknown' : (parsed.error.issues[0]?.message ?? 'unknown')),
-    readReady: (message) => {
-      accepts = message.accepts ?? []
-    },
     publish: (next, deliverable) => {
-      const update = readBridgeRouteUpdate({ held: route, next, accepts, deliverable })
+      const update = readBridgeRouteUpdate({ held: route, next, deliverable })
       if (update.kind === 'refuse') {
         args.onRefused(update.issue)
         return
@@ -93,8 +87,17 @@ export function createBridgeHostRoute(args: {
         return
       }
       insets = next
-      // Only to a page that reads them: a re-init to one that does not is a wasted frame per move.
-      if (deliverable && accepts.includes(BRIDGE_SAFE_AREA_ACCEPT)) {
+      if (deliverable) {
+        args.sendInit()
+      }
+    },
+    keyboardInset: () => keyboard,
+    publishKeyboardInset: (next, deliverable) => {
+      if (keyboard === next) {
+        return
+      }
+      keyboard = next
+      if (deliverable) {
         args.sendInit()
       }
     }
diff --git a/mobile/src/mobile-web-shell/bridge-host-test-harness.ts b/mobile/src/mobile-web-shell/bridge-host-test-harness.ts
index 835698e24ac7..5c3d602a4ed5 100644
--- a/mobile/src/mobile-web-shell/bridge-host-test-harness.ts
+++ b/mobile/src/mobile-web-shell/bridge-host-test-harness.ts
@@ -50,7 +50,6 @@ export type Harness = {
   /** Every claim the host reported, in order, including the false it sends when a document ends. */
   backClaims: boolean[]
   /** What each answered `ready` declared it reports, in order. */
-  pageReports: () => readonly (readonly string[])[]
   /** One entry per `ready` answered, saying whether its `init` reached the page. Filled as each
    *  post settles, so a case reads it after awaiting the turn the post resolves on. */
   /** Every clear the page asked for, in order. */
@@ -120,7 +119,6 @@ export function harness(
   let pageReadies = 0
   let pagePaints = 0
   /** What each answered `ready` declared it reports, in order. */
-  const pageReports: (readonly string[])[] = []
   /** One entry per `ready` answered, saying whether an `init` actually went out for it. */
   const routeParamClears: { param: string; value: string }[] = []
   const routeRefusals: string[] = []
@@ -146,9 +144,8 @@ export function harness(
     readStorage:
       options.readStorage ?? (() => ({ storage: options.storage ?? {}, storageOversize: [] })),
     onStorageWrite: (key, value) => storageWrites.push({ key, value }),
-    onPageReady: ({ reports }) => {
+    onPageReady: () => {
       pageReadies += 1
-      pageReports.push(reports)
     },
     onPageBackClaim: (claimed) => backClaims.push(claimed),
     onPagePainted: () => {
@@ -212,7 +209,6 @@ export function harness(
     pageReadyCount: () => pageReadies,
     pagePaintCount: () => pagePaints,
     backClaims,
-    pageReports: () => pageReports,
     routeParamClears: () => routeParamClears,
     routeRefusals,
     pageFaults,
diff --git a/mobile/src/mobile-web-shell/bridge-host.ts b/mobile/src/mobile-web-shell/bridge-host.ts
index 28e25c2e452a..9431b4500db0 100644
--- a/mobile/src/mobile-web-shell/bridge-host.ts
+++ b/mobile/src/mobile-web-shell/bridge-host.ts
@@ -13,7 +13,7 @@ import {
   type BridgeInitRoute
 } from './bridge/bridge-envelope'
 import { BridgePageRouteGrantsSchema } from './bridge/bridge-page-route-grants'
-import { BRIDGE_SHELL_ACCEPTS, createBridgeInitFrame } from './bridge/bridge-init-frame'
+import { createBridgeInitFrame } from './bridge/bridge-init-frame'
 import { splitBridgeReply } from './bridge/bridge-reply-chunking'
 import { createBridgeHostFrames } from './bridge-host-frames'
 import { createBridgeHostBack, type BridgeSessionBack } from './bridge-host-back'
@@ -31,9 +31,8 @@ export type BridgeHost = {
    * Hands this session a rewritten route: same screen, different params (ruling 33.1).
    *
    * The held route moves either way, so a page that reloads inside this mount is told the newest
-   * one; the frame goes out only to a page that declared `BRIDGE_ROUTE_UPDATE_ACCEPT`, because a
-   * page too old to name it reads a second `init` as a replacement. A different pathname is a
-   * different screen and is refused here — that is a remount, which is what the shell already does.
+   * one. A different pathname is a different screen and is refused here — that is a remount,
+   * which is what the shell already does.
    *
    * Answers nothing, and nothing is tracked (ruling 34): a frame the view refused is repaired by
    * the next `init`, and the request it carried is spent by the page, which erases the param it
@@ -42,6 +41,8 @@ export type BridgeHost = {
   publishRoute: (next: BridgeInitRoute) => void
   /** Hands this session moved safe-area insets over the same re-sent `init` a route update takes. */
   publishSafeAreaInsets: (next: BridgeSafeAreaInsets) => void
+  /** Hands this session a moved keyboard height over the same re-sent `init`. */
+  publishKeyboardInset: (next: number) => void
   /**
    * Hands the page one Back press. False when this document never said it takes one, which is
    * every page older than the frame; the caller then leaves the key to the navigator.
@@ -87,7 +88,8 @@ export function createBridgeHost(options: BridgeHostOptions): BridgeHost {
       sendInit()
     },
     onRefused: (issue) => options.onDiagnostic?.({ kind: 'route-update-refused', issue }),
-    ...(options.safeAreaInsets === undefined ? {} : { safeAreaInsets: options.safeAreaInsets })
+    ...(options.safeAreaInsets === undefined ? {} : { safeAreaInsets: options.safeAreaInsets }),
+    ...(options.keyboardInset === undefined ? {} : { keyboardInset: options.keyboardInset })
   })
   let closed = false
   // One document's turn at the bridge. `close` ends it and the next `ready` begins the next one;
@@ -163,12 +165,12 @@ export function createBridgeHost(options: BridgeHostOptions): BridgeHost {
           connection: snapshot(),
           route,
           safeAreaInsets: routes.safeAreaInsets(),
+          keyboardInset: routes.keyboardInset(),
           pageRoutes,
           ...(parsedRouteGrants?.success === true
             ? { pageRouteGrants: parsedRouteGrants.data }
             : {}),
           granted,
-          accepts: BRIDGE_SHELL_ACCEPTS,
           host,
           ...options.readStorage()
         })
@@ -249,16 +251,12 @@ export function createBridgeHost(options: BridgeHostOptions): BridgeHost {
     // re-asked `ready` from the document already being served is answered the same way.
     if (message.type === 'ready') {
       serving = true
-      routes.readReady(message)
-      back.readReady(message.accepts ?? [])
+      back.readReady()
       // Every time it is asked, not once: the page re-asks on a backoff, and each ask is answered
       // with the route the shell holds now. That is the whole repair path for a frame that never
       // arrived (ruling 34) — nothing here waits on one, and nothing retries one.
       sendInit()
-      // Forwarded verbatim, including a name this shell has never implemented: what each report
-      // means is the caller's, and this host's job is that the list belongs to the document that
-      // just spoke rather than to the one before it.
-      options.onPageReady({ reports: message.reports ?? [], accepts: message.accepts ?? [] })
+      options.onPageReady()
       return
     }
     if (!serving) {
@@ -337,6 +335,9 @@ export function createBridgeHost(options: BridgeHostOptions): BridgeHost {
     publishSafeAreaInsets: (next) => {
       routes.publishSafeAreaInsets(next, deliverable())
     },
+    publishKeyboardInset: (next) => {
+      routes.publishKeyboardInset(next, deliverable())
+    },
     sendBack: back.send,
     readSessionBack: back.read,
     dispose
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-back-round-trip.test.ts b/mobile/src/mobile-web-shell/bridge/bridge-back-round-trip.test.ts
index 1ceb977eb71a..a4940d4d9d8b 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-back-round-trip.test.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-back-round-trip.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
 import { BRIDGE_PROTOCOL_VERSION } from './bridge-envelope'
-import { BRIDGE_BACK_CLAIM_NOTIFY, BRIDGE_BACK_FRAME } from './bridge-page-back'
+import { BRIDGE_BACK_CLAIM_NOTIFY } from './bridge-page-back'
 import { createFakeBridgePortPair, type BridgePortPair } from './bridge-port-pair-test-harness'
 import type { FakeRpcClient } from '../bridge-host-test-fakes'
 
@@ -58,9 +58,7 @@ describe('a Back press crossing from the shell to the page', () => {
     release()
     await pair.flush()
     // The shell still sends one, standing in for a claim that went stale in flight.
-    pair.host.receive(
-      JSON.stringify({ v: BRIDGE_PROTOCOL_VERSION, type: 'ready', accepts: [BRIDGE_BACK_FRAME] })
-    )
+    pair.host.receive(JSON.stringify({ v: BRIDGE_PROTOCOL_VERSION, type: 'ready' }))
     await pair.flush()
     expect(pair.host.sendBack()).toBe(true)
     await pair.flush()
@@ -83,18 +81,14 @@ describe('a Back press crossing from the shell to the page', () => {
     expect(pair.backClaims).toEqual([true])
     // The page re-asks, which is what a stale `state` frame makes it do; the host drops the claim
     // answering it, and the page's re-assert is what puts the two back in step.
-    pair.host.receive(
-      JSON.stringify({ v: BRIDGE_PROTOCOL_VERSION, type: 'ready', accepts: [BRIDGE_BACK_FRAME] })
-    )
+    pair.host.receive(JSON.stringify({ v: BRIDGE_PROTOCOL_VERSION, type: 'ready' }))
     await pair.flush()
     expect(pair.backClaims).toEqual([true, false, true])
   })
 
   it('says nothing again when this document is holding nothing', async () => {
     const pair = await opened()
-    pair.host.receive(
-      JSON.stringify({ v: BRIDGE_PROTOCOL_VERSION, type: 'ready', accepts: [BRIDGE_BACK_FRAME] })
-    )
+    pair.host.receive(JSON.stringify({ v: BRIDGE_PROTOCOL_VERSION, type: 'ready' }))
     await pair.flush()
     expect(notifies(pair)).toEqual([])
     expect(pair.backClaims).toEqual([])
@@ -111,66 +105,22 @@ describe('a Back press crossing from the shell to the page', () => {
   })
 })
 
-/**
- * Both halves of the mixed-version matrix. The page bundle is served by a desktop that updates
- * independently of the installed shell, so one side older than the other is the normal state and
- * each direction has to degrade to exactly what Back did before this lane: the navigator pops.
- */
-describe('a shell and a page built either side of the Back lane', () => {
-  it('old shell, new page: the page never posts a claim it was not offered', async () => {
-    // The `init.accepts` this shell sends, with the claim taken back out of it on the wire — which
-    // is exactly the frame a shell built before the name would have posted.
-    const pair = createFakeBridgePortPair({
-      rewriteToPage: (json) => {
-        const frame: Record<string, unknown> = JSON.parse(json)
-        const accepts = frame.accepts
-        if (frame.type !== 'init' || !Array.isArray(accepts)) {
-          return json
-        }
-        return JSON.stringify({
-          ...frame,
-          accepts: accepts.filter((name) => name !== BRIDGE_BACK_CLAIM_NOTIFY)
-        })
-      }
-    })
-    await pair.flush()
-    pair.client.claimBack(() => true)
-    await pair.flush()
-    expect(notifies(pair)).toEqual([])
-    expect(pair.backClaims).toEqual([])
-    // And the re-assert is held to the same declaration: a second `init` from a shell that never
-    // named the claim is still one the page says nothing back to.
-    pair.host.receive(JSON.stringify({ v: BRIDGE_PROTOCOL_VERSION, type: 'ready' }))
-    await pair.flush()
-    expect(notifies(pair)).toEqual([])
-  })
-
-  it('new shell, old page: the shell never sends a press the page would refuse', async () => {
+describe('the Back lane with no negotiation', () => {
+  it('hands a press to any page it serves, whose ready declares nothing', async () => {
     const pair = await opened()
-    // The same document reloaded as a build that declares nothing, which is what a released page is.
     pair.host.receive(JSON.stringify({ v: BRIDGE_PROTOCOL_VERSION, type: 'ready' }))
     await pair.flush()
     const before = pair.toPage.length
-    expect(pair.host.sendBack()).toBe(false)
+    expect(pair.host.sendBack()).toBe(true)
     await pair.flush()
-    expect(pair.toPage).toHaveLength(before)
+    expect(pair.toPage.length).toBe(before + 1)
   })
 
-  /** Why that gate has to exist: an older page's reader takes the whole frame down rather than
-   *  ignoring a type it has never heard of. */
-  it('a page too old to read the frame refuses it whole', async () => {
-    const pair = createFakeBridgePortPair({
-      rewriteToPage: (json) =>
-        JSON.parse(json).type === BRIDGE_BACK_FRAME ? '{"v":1,"type":"b4ck"}' : json
-    })
-    await pair.flush()
-    pair.host.receive(
-      JSON.stringify({ v: BRIDGE_PROTOCOL_VERSION, type: 'ready', accepts: [BRIDGE_BACK_FRAME] })
-    )
-    await pair.flush()
-    expect(pair.host.sendBack()).toBe(true)
+  it('posts the claim to the shell with nothing offered in init', async () => {
+    const pair = await opened()
+    pair.client.claimBack(() => true)
     await pair.flush()
-    expect(pair.diagnostics).toContainEqual({ kind: 'refused', refusal: 'unrecognised-message' })
-    expect(pair.backPops).toEqual([])
+    expect(notifies(pair)).toEqual([BRIDGE_BACK_CLAIM_NOTIFY])
+    expect(pair.backClaims).toEqual([true])
   })
 })
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-caps.ts b/mobile/src/mobile-web-shell/bridge/bridge-caps.ts
index de7056a9b70a..4e625884b840 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-caps.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-caps.ts
@@ -138,15 +138,6 @@ export function isBridgeExternalLinkUrl(url: string): boolean {
 }
 export const BRIDGE_MAX_PAGE_ROUTES = 64
 
-/**
- * What a page may say it can be sent, bounded the way every other list on the envelope is.
- *
- * A frame bound and not a vocabulary: the shell acts on the names it knows and ignores the rest,
- * which is what lets a newer page declare one an older shell has never heard of.
- */
-export const BRIDGE_MAX_PAGE_ACCEPTS = 16
-export const BRIDGE_MAX_PAGE_ACCEPT_CHARS = 64
-
 /** A host id, its name and its endpoint. Bounded because the page renders all three. */
 export const BRIDGE_MAX_HOST_FIELD_CHARS = 1024
 
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-client-frame-cap-boundary.test.ts b/mobile/src/mobile-web-shell/bridge/bridge-client-frame-cap-boundary.test.ts
index 1901b5f368c4..b29219f178eb 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-client-frame-cap-boundary.test.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-client-frame-cap-boundary.test.ts
@@ -1,6 +1,4 @@
 import { describe, expect, it } from 'vitest'
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { BRIDGE_MAX_MESSAGE_BYTES, parseBridgeMessage } from './bridge-caps'
 import { createFakeBridgePortPair } from './bridge-port-pair-test-harness'
 
@@ -95,18 +93,4 @@ describe('the page frame cap at its boundary', () => {
     expect(read.ok).toBe(false)
     expect(read.ok ? null : read.refusal).toBe('oversized')
   })
-
-  it('reaches the cap through the shared predicate and spells it nowhere else', () => {
-    // The census half. A copy of the bound inside the client is a second spelling that can only
-    // drift from the one the reader applies, and it would pass every case above on the day it was
-    // written. `isBridgeFrameWithinCap` is the one thing both sides call.
-    const client = readFileSync(join(import.meta.dirname, 'bridge-rpc-client.ts'), 'utf8')
-    expect(client).toContain('isBridgeFrameWithinCap(')
-    expect(client).not.toContain('BRIDGE_MAX_MESSAGE_BYTES')
-    // And the predicate is the reader's own, not a lookalike beside it: the module that parses
-    // inbound frames is the module that exports it.
-    const caps = readFileSync(join(import.meta.dirname, 'bridge-caps.ts'), 'utf8')
-    expect(caps).toContain('export function isBridgeFrameWithinCap')
-    expect(caps).toContain('if (!isBridgeFrameWithinCap(raw))')
-  })
 })
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-client-frame-cap-unit.test.ts b/mobile/src/mobile-web-shell/bridge/bridge-client-frame-cap-unit.test.ts
index f4ab3eb9bd32..351810c682a3 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-client-frame-cap-unit.test.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-client-frame-cap-unit.test.ts
@@ -1,6 +1,4 @@
 import { describe, expect, it } from 'vitest'
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { BRIDGE_MAX_MESSAGE_BYTES, parseBridgeMessage, utf8ByteLength } from './bridge-caps'
 import { createFakeBridgePortPair } from './bridge-port-pair-test-harness'
 
@@ -28,18 +26,6 @@ const WIDE_CHARACTER = '漢'
 const WIDE_CHARACTER_COUNT = 250_000
 
 describe('what the frame cap counts', () => {
-  it('is the unit both shells count, read from their own sources', () => {
-    const shell = join(import.meta.dirname, '..', '..', '..', 'modules', 'orca-mobile-web-shell')
-    const swift = readFileSync(join(shell, 'ios', 'MobileWebShellView.swift'), 'utf8')
-    const kotlin = readFileSync(
-      join(shell, 'android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellView.kt'),
-      'utf8'
-    )
-    // The inbound gate on each platform, by the expression it measures with.
-    expect(swift).toContain('bridgeGate.accepts(byteCount: json.utf8.count)')
-    expect(kotlin).toContain('bridgeGate.accepts(json.toByteArray(Charsets.UTF_8).size)')
-  })
-
   it('refuses a frame under the cap in code units and over it in bytes', async () => {
     const pad = WIDE_CHARACTER.repeat(WIDE_CHARACTER_COUNT)
     // The precondition, without which this is just another oversized frame: a sender reading
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-client-init-handshake.ts b/mobile/src/mobile-web-shell/bridge/bridge-client-init-handshake.ts
index 609016f033e4..24060668e24b 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-client-init-handshake.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-client-init-handshake.ts
@@ -1,8 +1,4 @@
 import { BRIDGE_PROTOCOL_VERSION, type BridgeClientMessage } from './bridge-envelope'
-import { BRIDGE_BACK_FRAME } from './bridge-page-back'
-import { BRIDGE_PAGE_PAINTED } from './bridge-page-painted'
-import { BRIDGE_ROUTE_UPDATE_ACCEPT } from './bridge-route-update'
-import { BRIDGE_SAFE_AREA_ACCEPT } from './bridge-safe-area-insets'
 
 /** The page asks again until the shell answers; a session has no other way to start. */
 export const BRIDGE_READY_RETRY_MIN_MS = 50
@@ -53,17 +49,8 @@ export function createBridgeInitHandshake(ask: () => void): BridgeInitHandshake
   }
 }
 
-/**
- * What the page says on every ask, because the shell reads it off whichever `ready` it answers.
- * `accepts` is what this page build can be sent: a second `init` for the session it holds, the
- * Back frame, and insets it pads for itself. `reports` runs the other way: what a shell may wait
- * for this page to post, and the shell holds a frame over the view until it arrives.
- */
+/** What the page says on every ask. It declares nothing: the shell serves no page older than its
+ *  floor, so every page it talks to takes everything the shell sends. */
 export function createPageReadyFrame(): Extract<BridgeClientMessage, { type: 'ready' }> {
-  return {
-    v: BRIDGE_PROTOCOL_VERSION,
-    type: 'ready',
-    accepts: [BRIDGE_ROUTE_UPDATE_ACCEPT, BRIDGE_BACK_FRAME, BRIDGE_SAFE_AREA_ACCEPT],
-    reports: [BRIDGE_PAGE_PAINTED]
-  }
+  return { v: BRIDGE_PROTOCOL_VERSION, type: 'ready' }
 }
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-client-notifications.ts b/mobile/src/mobile-web-shell/bridge/bridge-client-notifications.ts
index b900a0957254..993782d8818e 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-client-notifications.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-client-notifications.ts
@@ -43,8 +43,6 @@ export type BridgeClientNotificationDeps = {
   isClosed: () => boolean
   /** What `init.grants.native` named. A grant the shell did not give is a frame it would refuse. */
   hasGrant: (name: string) => boolean
-  /** What `init.accepts` named. The other half of the same read: a capability rather than a grant. */
-  shellAccepts: (name: string) => boolean
 }
 
 export type BridgeClientNotifications = {
@@ -140,25 +138,12 @@ export function createBridgeClientNotifications(
         error: captureBridgeError(error)
       })
     },
-    // Gated on the shell saying it takes one, not on a grant: `notify` is a closed union, so an
-    // older shell answers an unknown name with an error frame per mount. Answering nothing, because
-    // a page that has painted has nothing else to do about a shell that will not hear it.
+    // Not on a grant: every session takes it, and a page that has painted has nothing else to do.
     notifyPagePainted: () => {
-      if (deps.shellAccepts(BRIDGE_PAGE_PAINTED)) {
-        post({ v: BRIDGE_PROTOCOL_VERSION, type: 'notify', name: BRIDGE_PAGE_PAINTED })
-      }
+      post({ v: BRIDGE_PROTOCOL_VERSION, type: 'notify', name: BRIDGE_PAGE_PAINTED })
     },
-    // Gated the same way, for the same reason, and answering nothing: a shell that will not hear
-    // the claim keeps the key, which is what every shell did before this frame existed.
     notifyBackClaim: (claimed) => {
-      if (deps.shellAccepts(BRIDGE_BACK_CLAIM_NOTIFY)) {
-        post({
-          v: BRIDGE_PROTOCOL_VERSION,
-          type: 'notify',
-          name: BRIDGE_BACK_CLAIM_NOTIFY,
-          claimed
-        })
-      }
+      post({ v: BRIDGE_PROTOCOL_VERSION, type: 'notify', name: BRIDGE_BACK_CLAIM_NOTIFY, claimed })
     }
   }
 }
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-client-session.ts b/mobile/src/mobile-web-shell/bridge/bridge-client-session.ts
index 02d8a5348297..09085cb2ec6f 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-client-session.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-client-session.ts
@@ -27,6 +27,8 @@ export type BridgeShellSession = {
   /** How much of the WebView sits under a system bar. Zeros for a shell that reserves the bars
    *  outside the view, which is every shell before the field. */
   safeAreaInsets: BridgeSafeAreaInsets
+  /** The keyboard height native screens read on the shell's OS; 0 while it is closed. */
+  keyboardInset: number
   /** Null for a shell too old to name it; the page's own `loadHosts()` then answers with nothing. */
   host: BridgeInitHost | null
   /** The allowlisted keys as the app held them when this page opened. */
@@ -34,14 +36,6 @@ export type BridgeShellSession = {
   /** The allowlisted keys `storage` could not carry because the app's value is over the page's cap
    *  (ruling 33.6). Empty for a shell too old to name them, which is what it was before. */
   storageOversize: readonly string[]
-  /**
-   * What this shell takes from the page beyond the frames every shell has taken (ruling 34).
-   *
-   * Empty for a shell that named none, which is every shell before this field: a page that posts
-   * one of these to one of those has the whole frame refused as `unrecognised-message`, so the
-   * check is the page's and it is made from here.
-   */
-  accepts: readonly string[]
 }
 
 /**
@@ -61,9 +55,9 @@ export function readShellSession(
     pageRoutes: message.pageRoutes ?? [],
     pageRouteGrants: message.pageRouteGrants ?? null,
     safeAreaInsets: message.safeAreaInsets ?? ZERO_SAFE_AREA_INSETS,
+    keyboardInset: message.keyboardInset ?? 0,
     host: message.host ?? null,
     storage: message.storage ?? {},
-    storageOversize: message.storageOversize ?? [],
-    accepts: message.accepts ?? []
+    storageOversize: message.storageOversize ?? []
   }
 }
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-client-shell-session.ts b/mobile/src/mobile-web-shell/bridge/bridge-client-shell-session.ts
index db5614119e86..03181a4e03fd 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-client-shell-session.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-client-shell-session.ts
@@ -31,6 +31,8 @@ export type BridgeClientShellSession = {
   onRouteUpdate: (listener: (route: BridgeInitRoute | null) => void) => () => void
   /** Fires when an `init` moved the safe-area insets the page holds, including a replacement's. */
   onSafeAreaInsetsUpdate: (listener: (insets: BridgeSafeAreaInsets) => void) => () => void
+  /** Fires when an `init` moved the keyboard height the page holds, including a replacement's. */
+  onKeyboardInsetUpdate: (listener: (height: number) => void) => () => void
   /** Drops the session and every listener waiting on one, which `close` is the only caller of. */
   close: () => void
 }
@@ -45,6 +47,7 @@ export function createBridgeClientShellSession(args: {
   const readyListeners = new Set<() => void>()
   const routeUpdateListeners = new Set<(route: BridgeInitRoute | null) => void>()
   const insetsListeners = new Set<(insets: BridgeSafeAreaInsets) => void>()
+  const keyboardListeners = new Set<(height: number) => void>()
 
   return {
     current: () => session,
@@ -62,10 +65,12 @@ export function createBridgeClientShellSession(args: {
       // The held object when the values match, so a reader keyed on identity does not re-render
       // for a re-asked `ready`.
       const safeAreaInsets = held === null || movedInsets ? sent : held.safeAreaInsets
+      const keyboardInset = message.keyboardInset ?? 0
+      const movedKeyboard = held !== null && held.keyboardInset !== keyboardInset
       session =
         update === null
           ? { ...readShellSession(message), safeAreaInsets }
-          : { ...update, route: message.route ?? null, safeAreaInsets }
+          : { ...update, route: message.route ?? null, safeAreaInsets, keyboardInset }
       // Re-primed either way, because a second `init` is also how the page recovers a cache it has
       // refused a `state` frame into: the shell rebuilt under it publishes a generation the page's
       // own is newer than, and this frame is what puts the two back in step. A pane update carries
@@ -80,6 +85,11 @@ export function createBridgeClientShellSession(args: {
           listener(safeAreaInsets)
         }
       }
+      if (movedKeyboard) {
+        for (const listener of keyboardListeners) {
+          listener(keyboardInset)
+        }
+      }
       // Only a route that moved is an update. The shell answers every `ready` with the route it
       // holds, and the page re-asks after a refused `state` frame, so publishing each of those
       // would hand the pane hook the route it is already on.
@@ -114,6 +124,12 @@ export function createBridgeClientShellSession(args: {
         insetsListeners.delete(listener)
       }
     },
+    onKeyboardInsetUpdate: (listener) => {
+      keyboardListeners.add(listener)
+      return () => {
+        keyboardListeners.delete(listener)
+      }
+    },
     close: () => {
       session = null
       readyListeners.clear()
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-envelope.test.ts b/mobile/src/mobile-web-shell/bridge/bridge-envelope.test.ts
index 056dcf7bb180..a1abc7c2d3c3 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-envelope.test.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-envelope.test.ts
@@ -1,14 +1,9 @@
 import { describe, expect, it } from 'vitest'
 import {
   BrowserScreencastOpcode,
-  type BrowserScreencastFormat,
   type BrowserScreencastFrame
 } from '../../transport/browser-screencast-protocol'
 import { isRpcResponse } from '../../transport/rpc-response-shape'
-import type { ConnectionState, ForegroundNudgeReason, RpcResponse } from '../../transport/types'
-import type { SendRequestOptions } from '../../transport/unvalidated-rpc-request-port'
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
 import {
   BRIDGE_MAX_MESSAGE_BYTES,
   BRIDGE_MAX_METHOD_CHARS,
@@ -23,18 +18,14 @@ import {
 } from './bridge-caps'
 import { BRIDGE_HAPTICS_KINDS, BRIDGE_HAPTICS_NOTIFY } from './bridge-haptics-notify'
 import {
-  BRIDGE_BINARY_FORMATS,
-  BRIDGE_CONNECTION_STATES,
   BRIDGE_FAULT_GRANT,
-  BRIDGE_FOREGROUND_NUDGE_REASONS,
   BRIDGE_NAVIGATE_BACK_NOTIFY,
   BRIDGE_PROTOCOL_VERSION,
   readBridgeClientMessage,
   readBridgeHostMessage,
-  type BridgeHostMessage,
-  type BridgeReplyPayload
+  type BridgeHostMessage
 } from './bridge-envelope'
-import { BRIDGE_BACK_CLAIM_NOTIFY, BRIDGE_BACK_FRAME } from './bridge-page-back'
+import { BRIDGE_BACK_CLAIM_NOTIFY } from './bridge-page-back'
 import { BRIDGE_PAGE_PAINTED } from './bridge-page-painted'
 
 const ID = 'AAAAAAAAAAAAAAAAAAAAAA'
@@ -89,20 +80,12 @@ function client(fields: Record<string, unknown>): Record<string, unknown> {
 describe('client messages', () => {
   const accepted = [
     ['ready', { type: 'ready' }],
-    ['ready naming what it reports', { type: 'ready', reports: [BRIDGE_PAGE_PAINTED] }],
-    // A shell with no row for the name reads a report it will never wait on, which is what an
-    // additive field has to look like in the older direction.
-    [
-      'ready naming a report this shell does not implement',
-      { type: 'ready', reports: ['weather'] }
-    ],
     ['a page painted notify', { type: 'notify', name: BRIDGE_PAGE_PAINTED }],
     ['a back claim', { type: 'notify', name: BRIDGE_BACK_CLAIM_NOTIFY, claimed: true }],
     [
       'a back claim being let go',
       { type: 'notify', name: BRIDGE_BACK_CLAIM_NOTIFY, claimed: false }
     ],
-    ['ready naming what it takes', { type: 'ready', accepts: [BRIDGE_BACK_FRAME] }],
     ['request without params', { type: 'request', id: ID, method: 'status.get' }],
     ['request with params', { type: 'request', id: ID, method: 'status.get', params: { a: 1 } }],
     [
@@ -600,86 +583,7 @@ describe('the reply reader is the native acceptance predicate', () => {
   })
 })
 
-describe('type pins', () => {
-  it('pins the protocol version both sides send', () => {
-    expect(BRIDGE_PROTOCOL_VERSION).toBe(1)
-  })
-
-  it('closes the connection states over the transport union', () => {
-    const asTransport = (value: (typeof BRIDGE_CONNECTION_STATES)[number]): ConnectionState => value
-    const asBridge = (value: ConnectionState): (typeof BRIDGE_CONNECTION_STATES)[number] => value
-    expect(BRIDGE_CONNECTION_STATES.map(asTransport).map(asBridge)).toEqual([
-      ...BRIDGE_CONNECTION_STATES
-    ])
-  })
-
-  it('closes the foreground reasons over the transport union', () => {
-    const asTransport = (
-      value: (typeof BRIDGE_FOREGROUND_NUDGE_REASONS)[number]
-    ): ForegroundNudgeReason => value
-    const asBridge = (
-      value: ForegroundNudgeReason
-    ): (typeof BRIDGE_FOREGROUND_NUDGE_REASONS)[number] => value
-    expect(BRIDGE_FOREGROUND_NUDGE_REASONS.map(asTransport).map(asBridge)).toEqual([
-      ...BRIDGE_FOREGROUND_NUDGE_REASONS
-    ])
-  })
-
-  it('resolves a reply payload to the transport envelope the page hands its callers', () => {
-    const asRpcResponse = (value: BridgeReplyPayload): RpcResponse => value
-    const read = readHost(client({ type: 'reply', id: ID, payload: SUCCESS_PAYLOAD }))
-    const payload =
-      read.ok && read.message.type === 'reply' && 'payload' in read.message
-        ? asRpcResponse(read.message.payload)
-        : null
-    expect(payload).toEqual(SUCCESS_PAYLOAD)
-  })
-
-  it('accepts every option the raw sender declares', () => {
-    // Both directions: the literal has to satisfy the type, and the type has to have no key the
-    // literal is missing, so a new option fails to compile until the schema learns it.
-    const optionKeys: Record<keyof SendRequestOptions, true> = {
-      timeoutMs: true,
-      budgetSpansConnect: true,
-      failWhenDisconnected: true
-    }
-    const options: SendRequestOptions = {
-      timeoutMs: 1000,
-      budgetSpansConnect: true,
-      failWhenDisconnected: true
-    }
-    expect(Object.keys(optionKeys).toSorted()).toEqual(Object.keys(options).toSorted())
-    expect(readClient(client({ type: 'request', id: ID, method: 'm', options })).ok).toBe(true)
-  })
-
-  it('bounds the viewport exactly where the desktop terminal contract does', () => {
-    // A viewport the page sends is replayed on resubscribe by every stream naming that terminal,
-    // the native screens' included. One the desktop refuses there would kill a stream the page
-    // never opened, so the two bounds have to be the same number.
-    //
-    // Read rather than imported: mobile may not pull a contract *value* into its bundle, and the
-    // boundary test that enforces that scans this file too.
-    const contract = readFileSync(
-      fileURLToPath(
-        new URL('../../../../src/shared/rpc-contract/terminal-unary-params.ts', import.meta.url)
-      ),
-      'utf8'
-    )
-    const start = contract.indexOf('export const TerminalViewport')
-    expect(start).toBeGreaterThan(-1)
-    const declaration = contract.slice(start, contract.indexOf('})', start))
-    expect(declaration).toContain(`cols: z.number().int().min(1).max(${BRIDGE_MAX_VIEWPORT_COLS})`)
-    expect(declaration).toContain(`rows: z.number().int().min(1).max(${BRIDGE_MAX_VIEWPORT_ROWS})`)
-  })
-
-  it('closes the binary formats over the screencast protocol', () => {
-    const asProtocol = (value: (typeof BRIDGE_BINARY_FORMATS)[number]): BrowserScreencastFormat =>
-      value
-    const asBridge = (value: BrowserScreencastFormat): (typeof BRIDGE_BINARY_FORMATS)[number] =>
-      value
-    expect(BRIDGE_BINARY_FORMATS.map(asProtocol).map(asBridge)).toEqual([...BRIDGE_BINARY_FORMATS])
-  })
-
+describe('the screencast frame reader', () => {
   it('refuses a screencast metadata field that is not a finite number', () => {
     const keys = [
       'offsetTop',
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-envelope.ts b/mobile/src/mobile-web-shell/bridge/bridge-envelope.ts
index ae8729f96ce5..d24f1ab599c9 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-envelope.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-envelope.ts
@@ -7,6 +7,7 @@ import { BridgeErrorCaptureSchema } from './bridge-error-capture'
 import { BridgeInitRouteSchema, type BridgeInitRoute } from './bridge-init-route'
 import { BridgePageRouteGrantsSchema } from './bridge-page-route-grants'
 import { BridgeSafeAreaInsetsSchema } from './bridge-safe-area-insets'
+import { BridgeKeyboardInsetSchema } from './bridge-keyboard-inset'
 import { BridgeNotifySchema } from './bridge-notify-envelope'
 import { BRIDGE_BACK_FRAME } from './bridge-page-back'
 import { BRIDGE_ID_PATTERN, idSchema, methodSchema, versionSchema } from './bridge-frame-fields'
@@ -26,8 +27,6 @@ import {
   PAGE_STORAGE_MAX_VALUE_CHARS
 } from '../page-storage-keys'
 import {
-  BRIDGE_MAX_PAGE_ACCEPT_CHARS,
-  BRIDGE_MAX_PAGE_ACCEPTS,
   BRIDGE_MAX_PAGE_ROUTES,
   BRIDGE_MAX_REPLY_PARTS,
   BRIDGE_MAX_ROUTE_PATHNAME_CHARS,
@@ -170,37 +169,7 @@ const replyPartSchema = z.object({
 const BridgeClientMessageSchema = z.discriminatedUnion('type', [
   z.object({
     v: versionSchema,
-    type: z.literal('ready'),
-    /**
-     * What this page can be sent beyond its first `init`; the names and why live in
-     * `bridge-route-update.ts`, which is the only one there is.
-     *
-     * Optional, and safe in both directions without a version bump: a page that sends none is
-     * never sent a second `init`, and a shell that reads none never sends one. An unknown name is
-     * accepted by the schema and ignored by the shell, which is what a newer page declaring a
-     * capability this shell has never implemented has to look like.
-     */
-    accepts: z
-      .array(z.string().min(1).max(BRIDGE_MAX_PAGE_ACCEPT_CHARS))
-      .max(BRIDGE_MAX_PAGE_ACCEPTS)
-      .optional(),
-    /**
-     * What this page will post that the shell may have to wait for, which today is
-     * `BRIDGE_PAGE_PAINTED` and nothing else.
-     *
-     * `accepts` runs the other way and cannot stand in for this: it says what may be sent *to* the
-     * page. A shell waiting on a frame has to know the page will send one, because the generation
-     * is served by a desktop that updates independently of the installed shell — an undeclared
-     * wait would hide a working page built before the frame existed.
-     *
-     * Optional and additive in both directions, on the same bounds as `accepts`: a page that
-     * declares none is waited for by nothing, and an unknown name is a report this shell does not
-     * act on.
-     */
-    reports: z
-      .array(z.string().min(1).max(BRIDGE_MAX_PAGE_ACCEPT_CHARS))
-      .max(BRIDGE_MAX_PAGE_ACCEPTS)
-      .optional()
+    type: z.literal('ready')
   }),
   z.object({
     v: versionSchema,
@@ -282,8 +251,7 @@ const BridgeHostMessageSchema = z.union([
     connection: BridgeConnectionSnapshotSchema
   }),
   // One Back press, and nothing else: the shell pops what it pushed, so a frame naming where to go
-  // back to would be naming a screen the page cannot see. Sent only to a page whose `ready` listed
-  // `BRIDGE_BACK_FRAME`, because an older page's reader refuses the whole frame.
+  // back to would be naming a screen the page cannot see.
   z.object({ v: versionSchema, type: z.literal(BRIDGE_BACK_FRAME) }),
   z.object({
     v: versionSchema,
@@ -307,6 +275,8 @@ const BridgeHostMessageSchema = z.union([
     route: BridgeInitRouteSchema.optional(),
     /** How much of the WebView is under a system bar; absent reads as zeros. */
     safeAreaInsets: BridgeSafeAreaInsetsSchema.optional(),
+    /** The keyboard height native screens read on the shell's OS; absent reads as 0. */
+    keyboardInset: BridgeKeyboardInsetSchema.optional(),
     host: BridgeInitHostSchema.optional(),
     storage: BridgeInitStorageSchema.optional(),
     /**
@@ -343,19 +313,7 @@ const BridgeHostMessageSchema = z.union([
      * behaviour, an older page ignores it. The grant grammar is the manifest's own, so a name the
      * bundle could not have declared cannot arrive here either.
      */
-    pageRouteGrants: BridgePageRouteGrantsSchema.optional(),
-    /**
-     * What this shell accepts from the page beyond the frames every shell has always taken, which
-     * today is `BRIDGE_ROUTE_PARAM_CLEAR` and nothing else.
-     *
-     * The mirror of `ready.accepts`, and optional for the same reason: a shell that sends none is
-     * never posted a clear, and a page that reads none never posts one. An unknown name is a
-     * capability this page has never heard of and is ignored.
-     */
-    accepts: z
-      .array(z.string().min(1).max(BRIDGE_MAX_PAGE_ACCEPT_CHARS))
-      .max(BRIDGE_MAX_PAGE_ACCEPTS)
-      .optional()
+    pageRouteGrants: BridgePageRouteGrantsSchema.optional()
   })
 ])
 
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-init-frame.ts b/mobile/src/mobile-web-shell/bridge/bridge-init-frame.ts
index 582ed79548c1..c31244c23ac6 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-init-frame.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-init-frame.ts
@@ -8,10 +8,6 @@ import {
   type BridgeInitHost,
   type BridgeInitRoute
 } from './bridge-envelope'
-import { BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT } from './bridge-page-client-identity'
-import { BRIDGE_BACK_CLAIM_NOTIFY } from './bridge-page-back'
-import { BRIDGE_PAGE_PAINTED } from './bridge-page-painted'
-import { BRIDGE_ROUTE_PARAM_CLEAR } from './bridge-route-update'
 import {
   sameSafeAreaInsets,
   ZERO_SAFE_AREA_INSETS,
@@ -34,18 +30,6 @@ export const BRIDGE_NATIVE_GRANTS: readonly string[] = [
   ...MOBILE_WEB_SHELL_GRANTS
 ]
 
-/**
- * What this shell accepts from a page beyond the frames every shell has always taken. Additive
- * names on an optional list, so no version moves: a page that knows none posts none, one told
- * nothing claims no identity, and one told nothing reports no paint.
- */
-export const BRIDGE_SHELL_ACCEPTS: readonly string[] = [
-  BRIDGE_ROUTE_PARAM_CLEAR,
-  BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT,
-  BRIDGE_PAGE_PAINTED,
-  BRIDGE_BACK_CLAIM_NOTIFY
-]
-
 /** The one frame that starts a session, built in one place so its caps and its grants agree. */
 export function createBridgeInitFrame(args: {
   sessionId: string
@@ -57,13 +41,13 @@ export function createBridgeInitFrame(args: {
   pageRoutes: readonly string[]
   /** How much of the WebView sits under a system bar, for a page that pads for them itself. */
   safeAreaInsets?: BridgeSafeAreaInsets
+  /** The keyboard height native screens read on the shell's OS. */
+  keyboardInset?: number
   /** What each of those patterns declared, so the page can tell a hop it may keep from one it
    *  must hand back. Omitted by a shell that has none, which leaves the page on its old rule. */
   pageRouteGrants?: readonly { pathname: string; grants: readonly string[] }[]
   /** What this session may do: the protocol's own grant plus what its route declared. */
   granted: readonly string[]
-  /** What this shell takes from the page beyond the frames every shell has taken (ruling 34). */
-  accepts?: readonly string[]
   /** The host the page is showing, minus the credential the bridge already carries for it. */
   host: BridgeInitHost
   /** The allowlisted keys as the app holds them right now. */
@@ -94,12 +78,10 @@ export function createBridgeInitFrame(args: {
     sameSafeAreaInsets(args.safeAreaInsets, ZERO_SAFE_AREA_INSETS)
       ? {}
       : { safeAreaInsets: { ...args.safeAreaInsets } }),
-    pageRoutes: [...args.pageRoutes],
-    // Omitted when empty for the reason `storageOversize` is: a shell that declares nothing and
-    // one that declares an empty list are the same answer to the page's check.
-    ...(args.accepts === undefined || args.accepts.length === 0
+    ...(args.keyboardInset === undefined || args.keyboardInset === 0
       ? {}
-      : { accepts: [...args.accepts] }),
+      : { keyboardInset: args.keyboardInset }),
+    pageRoutes: [...args.pageRoutes],
     // Copied entry by entry for the reason the grants are: nothing the shell keeps may be
     // reachable through a frame it hands out.
     ...(args.pageRouteGrants === undefined
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-keyboard-inset.test.ts b/mobile/src/mobile-web-shell/bridge/bridge-keyboard-inset.test.ts
new file mode 100644
index 000000000000..9cdf24ae99b2
--- /dev/null
+++ b/mobile/src/mobile-web-shell/bridge/bridge-keyboard-inset.test.ts
@@ -0,0 +1,91 @@
+import { describe, expect, it } from 'vitest'
+import { createFakeBridgePortPair } from './bridge-port-pair-test-harness'
+import { readBridgeHostMessage } from './bridge-envelope'
+import { createBridgeInitFrame } from './bridge-init-frame'
+import { readShellSession } from './bridge-client-session'
+
+function initFrame(keyboardInset?: number) {
+  return createBridgeInitFrame({
+    sessionId: 'session-a',
+    buildId: 'build-a',
+    connection: {
+      state: 'connected',
+      reconnectAttempt: 0,
+      lastConnectedAt: null,
+      lastInboundAt: null,
+      generation: null
+    },
+    route: { pathname: '/h/host-a' },
+    pageRoutes: ['/h/[hostId]'],
+    granted: [],
+    host: { id: 'host-a', name: 'Host A', endpoint: 'ws://host-a', lastConnected: 0 },
+    storage: {},
+    ...(keyboardInset === undefined ? {} : { keyboardInset })
+  })
+}
+
+function readInit(json: string) {
+  const read = readBridgeHostMessage(json)
+  if (!read.ok || read.message.type !== 'init') {
+    throw new Error(
+      `not an init the page would read: ${read.ok ? read.message.type : read.refusal}`
+    )
+  }
+  return read.message
+}
+
+describe('keyboardInset on init', () => {
+  it('reads an init without the field as 0, which is every shell before it', () => {
+    const init = readInit(JSON.stringify(initFrame()))
+    expect('keyboardInset' in init).toBe(false)
+    expect(readShellSession(init).keyboardInset).toBe(0)
+  })
+
+  it('passes the keyboard height through to the session the page holds', () => {
+    expect(readShellSession(readInit(JSON.stringify(initFrame(312)))).keyboardInset).toBe(312)
+  })
+
+  it('omits 0, since absent and closed are the same answer', () => {
+    expect('keyboardInset' in initFrame(0)).toBe(false)
+  })
+
+  it('refuses an init whose keyboard no device produces', () => {
+    for (const bad of [-1, 1e9, Number.NaN, '312']) {
+      const frame = { ...initFrame(), keyboardInset: bad }
+      expect(readBridgeHostMessage(JSON.stringify(frame)).ok, String(bad)).toBe(false)
+    }
+  })
+})
+
+describe('a keyboard that moves under a live page', () => {
+  it('re-sends init on show, height change and hide, and the page reads each in place', async () => {
+    const pair = createFakeBridgePortPair()
+    await pair.flush()
+    const session = pair.client.getShellSession()
+    expect(session?.keyboardInset).toBe(0)
+    const seen: number[] = []
+    pair.client.onKeyboardInsetUpdate((height) => seen.push(height))
+
+    // Pixel_API_37: the IME opens at 312, the suggestion strip grows it by 34, then it closes.
+    for (const height of [312, 346, 0]) {
+      pair.host.publishKeyboardInset(height)
+      await pair.flush()
+      expect(pair.client.getShellSession()?.keyboardInset).toBe(height)
+    }
+    expect(seen).toEqual([312, 346, 0])
+    // Same session: a keyboard update is not a replacement.
+    expect(pair.client.getShellSession()?.sessionId).toBe(session?.sessionId)
+    expect(pair.client.getShellSession()?.route).toEqual(session?.route)
+  })
+
+  it('sends nothing for a height that did not move', async () => {
+    const pair = createFakeBridgePortPair({ keyboardInset: 312 })
+    await pair.flush()
+    const inits = () => pair.readToPage().filter((frame) => frame.type === 'init').length
+    const before = inits()
+    pair.host.publishKeyboardInset(312)
+    await pair.flush()
+    expect(inits()).toBe(before)
+    expect(pair.client.getShellSession()?.keyboardInset).toBe(312)
+  })
+})
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-keyboard-inset.ts b/mobile/src/mobile-web-shell/bridge/bridge-keyboard-inset.ts
new file mode 100644
index 000000000000..c11a642e8c24
--- /dev/null
+++ b/mobile/src/mobile-web-shell/bridge/bridge-keyboard-inset.ts
@@ -0,0 +1,9 @@
+import { z } from 'zod'
+import { BRIDGE_MAX_SAFE_AREA_INSET } from './bridge-safe-area-insets'
+
+/**
+ * The software keyboard's height as native screens read it on the shell's OS (iOS from the
+ * window's bottom, Android above the bars), in the page's px; 0 while it is closed. The shell
+ * overlays the IME on the view like a native screen, and the page cannot measure it.
+ */
+export const BridgeKeyboardInsetSchema = z.number().finite().min(0).max(BRIDGE_MAX_SAFE_AREA_INSET)
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-native-verbs.test.ts b/mobile/src/mobile-web-shell/bridge/bridge-native-verbs.test.ts
index b25016775f85..7acf280b63f4 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-native-verbs.test.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-native-verbs.test.ts
@@ -99,19 +99,6 @@ describe('reading a native verb call', () => {
 })
 
 describe('the media verbs on the same seam', () => {
-  it('serves all three, and each is a grant name of its own', () => {
-    expect([...BRIDGE_NATIVE_VERB_NAMES]).toEqual([
-      'native.clipboard.write',
-      'native.clipboard.read',
-      'native.media.pick',
-      'native.media.read',
-      'native.media.release',
-      'native.audio.start',
-      'native.audio.read',
-      'native.audio.stop'
-    ])
-  })
-
   it('answers each verb with the params it parsed', () => {
     expect(
       readBridgeNativeVerbCall({
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-notify-grants.ts b/mobile/src/mobile-web-shell/bridge/bridge-notify-grants.ts
index d363be3f5fd4..04683d787399 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-notify-grants.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-notify-grants.ts
@@ -37,11 +37,10 @@ const BRIDGE_NOTIFY_GRANTS: Readonly<Record<BridgeNotifyName, string | null>> =
   // The protocol's own as well: it spends a request this shell handed the page, on a param closed
   // to the one the shell hands over, so there is nothing here for a grant to gate.
   [BRIDGE_ROUTE_PARAM_CLEAR]: null,
-  // The page reporting on its own document. Nothing here reaches the host or the device, and the
-  // shell acts on it only for a page that declared it in `ready.reports`.
+  // The page reporting on its own document. Nothing here reaches the host or the device.
   [BRIDGE_PAGE_PAINTED]: null,
   // The page reporting on its own document as well. A claim is not a capability: the shell decides
-  // whether to hand the key over, and it acts on this only for a page that declared it takes one.
+  // whether to hand the key over.
   [BRIDGE_BACK_CLAIM_NOTIFY]: null,
   navigate: 'navigate',
   [BRIDGE_NAVIGATE_BACK_NOTIFY]: 'navigate',
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-page-back.ts b/mobile/src/mobile-web-shell/bridge/bridge-page-back.ts
index 87d08d46d6f6..e7c151f63e45 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-page-back.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-page-back.ts
@@ -1,12 +1,8 @@
-/**
- * The device Back key, in the two places it is named: the page's claim on it, and the frame that
- * hands one press over. Negotiated both ways, because each is a closed list on the other side — a
- * claim to a shell that never advertised it is an error frame per mount on every shell installed,
- * and a `back` to a page that never asked for one is a frame its reader drops.
- */
+/** The device Back key, in the two places it is named: the page's claim on it, and the frame that
+ *  hands one press over. */
 
-/** Page to shell, on `init.accepts`: this document is holding Back, or has let it go. */
+/** Page to shell, a notify: this document is holding Back, or has let it go. */
 export const BRIDGE_BACK_CLAIM_NOTIFY = 'back-claim'
 
-/** Shell to page, on `ready.accepts`: one Back press, handed to whoever claimed it. */
+/** Shell to page, a frame: one Back press, handed to whoever claimed it. */
 export const BRIDGE_BACK_FRAME = 'back'
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-page-client-identity.test.ts b/mobile/src/mobile-web-shell/bridge/bridge-page-client-identity.test.ts
index bda9737f02f0..b65a8faeee23 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-page-client-identity.test.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-page-client-identity.test.ts
@@ -1,7 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import {
   BRIDGE_PAGE_CLIENT_ID,
-  BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT,
   BridgePageClientIdentityUnavailableError,
   substituteBridgePageClientIdentity
 } from './bridge-page-client-identity'
@@ -39,7 +38,6 @@ describe('the placeholder a page claims', () => {
     // The composer's send journal refuses a retained operation whose caller changed, and it has no
     // expiry. A per-document identity would turn "send it again" into a permanent refusal.
     expect(BRIDGE_PAGE_CLIENT_ID).toBe('orca-page-client')
-    expect(BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT).toBe('page-client-identity')
   })
 
   it('becomes the device identity in both fields a page carries one in', () => {
@@ -184,12 +182,6 @@ describe('the shell substitutes on both doors to the client', () => {
       }
     })
   })
-
-  it('tells the page it performs the swap, on a list an older page ignores', () => {
-    const bridge = harness({ ready: true })
-    const init = bridge.frames().find((message) => message.type === 'init')
-    expect(init?.accepts).toContain(BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT)
-  })
 })
 
 describe('what the page hears when the shell has no identity', () => {
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-page-client-identity.ts b/mobile/src/mobile-web-shell/bridge/bridge-page-client-identity.ts
index a23a8b4c319e..44277fa0d244 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-page-client-identity.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-page-client-identity.ts
@@ -8,9 +8,6 @@
 /** What a page puts in `client.id`. Fixed, so a resent message fingerprints the same caller. */
 export const BRIDGE_PAGE_CLIENT_ID = 'orca-page-client'
 
-/** `init.accepts` name for a shell that swaps. A page told nothing claims no identity at all. */
-export const BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT = 'page-client-identity'
-
 /** The two fields a page carries an identity in. `mobileClient` is native chat's spelling. */
 const IDENTITY_FIELDS = ['client', 'mobileClient'] as const
 
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-page-painted.ts b/mobile/src/mobile-web-shell/bridge/bridge-page-painted.ts
index effa3c07a054..41266b01fe01 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-page-painted.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-page-painted.ts
@@ -1,6 +1,2 @@
-/**
- * The page's first frame, in all three places it is named: `ready.reports`, the notify, and
- * `init.accepts`. Negotiated both ways, because the notify union is closed — a report to a shell
- * that never advertised it is an error frame per mount on every shell already installed.
- */
+/** The notify a page posts when its first frame is on screen; the shell covers the view until it. */
 export const BRIDGE_PAGE_PAINTED = 'painted'
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-port-pair-test-harness.test.ts b/mobile/src/mobile-web-shell/bridge/bridge-port-pair-test-harness.test.ts
index 705360361db1..ac532410aa03 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-port-pair-test-harness.test.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-port-pair-test-harness.test.ts
@@ -2,10 +2,6 @@ import { describe, expect, it } from 'vitest'
 import type { RpcClient } from '../../transport/rpc-client'
 import type { RpcResponse } from '../../transport/types'
 import { createBridgePortPair, createFakeBridgePortPair } from './bridge-port-pair-test-harness'
-import { BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT } from './bridge-page-client-identity'
-import { BRIDGE_BACK_CLAIM_NOTIFY } from './bridge-page-back'
-import { BRIDGE_PAGE_PAINTED } from './bridge-page-painted'
-import { BRIDGE_ROUTE_PARAM_CLEAR } from './bridge-route-update'
 
 /** Every member of the contract, none of them a fake anything: the pair must carry a plain client. */
 function plainShellClient(record: string[]): RpcClient {
@@ -43,15 +39,10 @@ describe('the bridge port pair', () => {
       pageRoutes: expect.any(Array),
       pageRouteGrants: null,
       safeAreaInsets: { top: 0, right: 0, bottom: 0, left: 0 },
+      keyboardInset: 0,
       host: expect.objectContaining({ id: expect.any(String) }),
       storage: expect.any(Object),
-      storageOversize: [],
-      accepts: [
-        BRIDGE_ROUTE_PARAM_CLEAR,
-        BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT,
-        BRIDGE_PAGE_PAINTED,
-        BRIDGE_BACK_CLAIM_NOTIFY
-      ]
+      storageOversize: []
     })
   })
 
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-port-pair-test-harness.ts b/mobile/src/mobile-web-shell/bridge/bridge-port-pair-test-harness.ts
index bf9b611a540d..1b329207d539 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-port-pair-test-harness.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-port-pair-test-harness.ts
@@ -60,7 +60,6 @@ export type BridgePortPair<TRpc extends RpcClient = FakeRpcClient> = {
   /** Every claim on the device Back key the host reported, in order. */
   readonly backClaims: boolean[]
   /** What each answered `ready` declared it reports, in order. */
-  readonly pageReports: () => readonly (readonly string[])[]
   /** Every clear the page asked the shell for, in order. */
   readonly routeParamClears: () => readonly { param: string; value: string }[]
   /** Why the host refused to open a session at all, if it did. */
@@ -105,6 +104,7 @@ export type BridgePortPairOptions<TRpc extends RpcClient> = {
   /** Replaces the verb handler, for the arms where the shell refuses rather than answers. */
   serveNativeVerb?: (verb: BridgeNativeVerb, params: unknown) => Promise<unknown>
   safeAreaInsets?: BridgeSafeAreaInsets
+  keyboardInset?: number
 }
 
 type Lane = {
@@ -210,7 +210,6 @@ export function createBridgePortPair<TRpc extends RpcClient>(
   let pageReadies = 0
   let pagePaints = 0
   /** What each answered `ready` declared it reports, in order. */
-  const pageReports: (readonly string[])[] = []
   const routeParamClears: { param: string; value: string }[] = []
   const routeRefusals: string[] = []
   let receiveOnPage: ((json: string) => void) | null = null
@@ -229,6 +228,7 @@ export function createBridgePortPair<TRpc extends RpcClient>(
     sessionId: options.sessionId ?? 'session-a',
     route: options.route ?? { pathname: '/h/host-a' },
     ...(options.safeAreaInsets === undefined ? {} : { safeAreaInsets: options.safeAreaInsets }),
+    ...(options.keyboardInset === undefined ? {} : { keyboardInset: options.keyboardInset }),
     readClientIdentity: () =>
       options.clientIdentity === undefined ? PORT_PAIR_CLIENT_IDENTITY : options.clientIdentity,
     pageRoutes: options.pageRoutes ?? ['/h/[hostId]'],
@@ -254,9 +254,8 @@ export function createBridgePortPair<TRpc extends RpcClient>(
     }),
     onStorageWrite: (key, value) => storageWrites.push({ key, value }),
     onPageFault: (error) => pageFaults.push(error),
-    onPageReady: ({ reports }) => {
+    onPageReady: () => {
       pageReadies += 1
-      pageReports.push(reports)
     },
     onPagePainted: () => {
       pagePaints += 1
@@ -299,7 +298,6 @@ export function createBridgePortPair<TRpc extends RpcClient>(
     pageReadyCount: () => pageReadies,
     pagePaintCount: () => pagePaints,
     backClaims,
-    pageReports: () => pageReports,
     routeParamClears: () => routeParamClears,
     routeRefusals,
     async flush(): Promise<void> {
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-route-update.test.ts b/mobile/src/mobile-web-shell/bridge/bridge-route-update.test.ts
index aaef95a00ffc..ff3b1c0b3bb1 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-route-update.test.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-route-update.test.ts
@@ -1,7 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { createFakeBridgePortPair } from './bridge-port-pair-test-harness'
 import type { BridgeInitRoute } from './bridge-envelope'
-import { BRIDGE_ROUTE_UPDATE_ACCEPT } from './bridge-route-update'
 
 const SESSION = '/h/host-a/session/wt-1'
 
@@ -79,17 +78,13 @@ describe('a route update over a re-sent init', () => {
   it('publishes nothing for a re-asked ready that carries the route the page holds', async () => {
     const pair = await openedOnTheSession()
     const seen = recordRouteUpdates(pair)
-    pair.host.receive(
-      JSON.stringify({ v: 1, type: 'ready', accepts: [BRIDGE_ROUTE_UPDATE_ACCEPT] })
-    )
+    pair.host.receive(JSON.stringify({ v: 1, type: 'ready' }))
     await pair.flush()
     expect(seen).toEqual([])
     // And the same ask after a real update still leaves exactly the one delivery behind it.
     pair.host.publishRoute(sessionRoute('pane-1'))
     await pair.flush()
-    pair.host.receive(
-      JSON.stringify({ v: 1, type: 'ready', accepts: [BRIDGE_ROUTE_UPDATE_ACCEPT] })
-    )
+    pair.host.receive(JSON.stringify({ v: 1, type: 'ready' }))
     await pair.flush()
     expect(seen).toEqual(['pane-1'])
   })
@@ -114,32 +109,13 @@ describe('a route update over a re-sent init', () => {
     expect(pair.client.getShellSession()?.storage).toBe(before)
   })
 
-  /**
-   * Wire compatibility, the half a schema cannot state: an older page never declares `accepts`, so
-   * the shell must not post it a second `init`. That page would read one as a replacement and
-   * settle every request it held; the tap it degrades to losing is what it loses today.
-   */
-  it('sends no second init to a page that never declared it accepts one', async () => {
+  it('sends the second init to a page whose ready declares nothing', async () => {
     const pair = await openedOnTheSession()
-    expect(pair.readToShell().find((frame) => frame.type === 'ready')?.accepts).toContain(
-      BRIDGE_ROUTE_UPDATE_ACCEPT
-    )
-    // This page, then the same document reloaded as a build that declares nothing -- which is what
-    // a released page is. The host reads `accepts` off whichever `ready` it last answered.
     pair.host.receive(JSON.stringify({ v: 1, type: 'ready' }))
     await pair.flush()
     const framesBefore = pair.toPage.length
     pair.host.publishRoute(sessionRoute('pane-1'))
     await pair.flush()
-    expect(pair.toPage.length).toBe(framesBefore)
-    // And the contrast, so the case fails when the gate stops gating rather than when it starts.
-    pair.host.receive(
-      JSON.stringify({ v: 1, type: 'ready', accepts: [BRIDGE_ROUTE_UPDATE_ACCEPT] })
-    )
-    await pair.flush()
-    const framesAfterReady = pair.toPage.length
-    pair.host.publishRoute(sessionRoute('pane-2'))
-    await pair.flush()
-    expect(pair.toPage.length).toBe(framesAfterReady + 1)
+    expect(pair.toPage.length).toBe(framesBefore + 1)
   })
 })
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-route-update.ts b/mobile/src/mobile-web-shell/bridge/bridge-route-update.ts
index 93e42564424b..1f5d3c00e5ae 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-route-update.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-route-update.ts
@@ -2,23 +2,15 @@ import { BridgeInitRouteSchema, type BridgeInitRoute } from './bridge-init-route
 import { shellScreenRouteKey } from '../shell-screen-route'
 
 /**
- * The one thing a page can say it accepts, which is a second `init` for the session it already has.
- *
  * A notification tap for another pane of the session on screen rewrites one route param of a page
  * that is already mounted, and the shell has no push lane to deliver it on: `notify` runs
  * page-to-shell only, and a shell-to-page frame kind would need a capability of its own
  * (`bridge-audio-verbs.ts` refused one for raw PCM). `init` already carries `route`, is already
- * re-sent on every `ready` and is already re-read, so the pane request rides it.
- *
- * Declared by the page rather than assumed by the shell, in both directions. A page too old to
- * name it reads a second `init` as a replacement and settles every request it holds, so a shell
- * that sent one unasked would break it; a shell too old to re-send one leaves a newer page exactly
- * where it is today. Both degrade to the repeat tap doing nothing, which is what it does now.
+ * re-sent on every `ready` and is already re-read, so the pane request rides a second `init`.
  */
-export const BRIDGE_ROUTE_UPDATE_ACCEPT = 'route-update'
 
 /**
- * The one thing a shell can say it accepts, which is a page erasing a one-shot route param.
+ * The notify a page posts to erase a one-shot route param.
  *
  * The reader erases (ruling 34). A notification tap writes `paneKey` onto the native route, the
  * shell re-sends `init` for as long as it holds one, and the page — having applied the pane — asks
@@ -28,10 +20,6 @@ export const BRIDGE_ROUTE_UPDATE_ACCEPT = 'route-update'
  * Every one of those is followed by a fresh document's `ready`, answered with the route the shell
  * holds then. A clear naming a pane the tap has already moved past is refused by the comparison
  * rather than by a sequence number.
- *
- * Declared in `init` rather than assumed, in the direction `ready.accepts` runs the other way. No
- * shipped shell serves a page, so nothing needs negotiating today; the declaration is here so the
- * page's check exists from the first version that can post one.
  */
 export const BRIDGE_ROUTE_PARAM_CLEAR = 'route-param-clear'
 
@@ -67,8 +55,8 @@ export function bridgeRouteMoved(
  * What a host does with a rewritten route: hold it for the next `init`, send one now, or refuse.
  *
  * `hold` and `send` both move what the host will publish, because a page that reloads inside this
- * mount must be handed the newest route on its next `ready` even when it is too old to be sent one
- * in flight. Only `send` is a frame, and only a frame lets the caller clear the param it delivered.
+ * mount must be handed the newest route on its next `ready`. Only `send` is a frame, and only a
+ * frame lets the caller clear the param it delivered.
  */
 export type BridgeRouteUpdate =
   | { readonly kind: 'send'; readonly route: BridgeInitRoute }
@@ -86,8 +74,6 @@ export type BridgeRouteUpdate =
 export function readBridgeRouteUpdate(args: {
   held: BridgeInitRoute | null
   next: BridgeInitRoute
-  /** What the page's last `ready` declared. Empty for every page built before this existed. */
-  accepts: readonly string[]
   /** Whether this host has a served document that has already had an `init`. */
   deliverable: boolean
 }): BridgeRouteUpdate {
@@ -100,6 +86,5 @@ export function readBridgeRouteUpdate(args: {
     return { kind: 'refuse', issue: 'not-this-screen' }
   }
   const moved = bridgeRouteMoved(held, parsed.data)
-  const sendable = moved && args.deliverable && args.accepts.includes(BRIDGE_ROUTE_UPDATE_ACCEPT)
-  return { kind: sendable ? 'send' : 'hold', route: parsed.data }
+  return { kind: moved && args.deliverable ? 'send' : 'hold', route: parsed.data }
 }
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-rpc-client-frames.test.ts b/mobile/src/mobile-web-shell/bridge/bridge-rpc-client-frames.test.ts
index 55cff6ace69f..f651e23b080d 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-rpc-client-frames.test.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-rpc-client-frames.test.ts
@@ -12,10 +12,6 @@ import {
   BRIDGE_ACK_INTERVAL_FRAMES
 } from './bridge-client-subscriptions'
 import { BRIDGE_PROTOCOL_VERSION, type BridgeHostMessage } from './bridge-envelope'
-import { BRIDGE_BACK_FRAME } from './bridge-page-back'
-import { BRIDGE_PAGE_PAINTED } from './bridge-page-painted'
-import { BRIDGE_ROUTE_UPDATE_ACCEPT } from './bridge-route-update'
-import { BRIDGE_SAFE_AREA_ACCEPT } from './bridge-safe-area-insets'
 import {
   BRIDGE_READY_RETRY_MAX_MS,
   BRIDGE_READY_RETRY_MIN_MS
@@ -43,16 +39,9 @@ afterEach(() => {
 })
 
 describe('bridge client handshake', () => {
-  it('asks for a session as soon as it exists, naming what it can be sent and what it reports', () => {
+  it('asks for a session as soon as it exists, declaring nothing', () => {
     const page = createPageClient()
-    expect(page.frames()).toEqual([
-      {
-        v: BRIDGE_PROTOCOL_VERSION,
-        type: 'ready',
-        accepts: [BRIDGE_ROUTE_UPDATE_ACCEPT, BRIDGE_BACK_FRAME, BRIDGE_SAFE_AREA_ACCEPT],
-        reports: [BRIDGE_PAGE_PAINTED]
-      }
-    ])
+    expect(page.frames()).toEqual([{ v: BRIDGE_PROTOCOL_VERSION, type: 'ready' }])
   })
 
   it('keeps asking on a widening backoff until init answers', () => {
@@ -141,13 +130,11 @@ describe('bridge client handshake', () => {
       pageRouteGrants: null,
       // And no insets, which is the shell that reserves the bar strips outside the view.
       safeAreaInsets: { top: 0, right: 0, bottom: 0, left: 0 },
+      keyboardInset: 0,
       // And no host and no stored keys, which is what `host-store.web.ts` then answers with.
       host: null,
       storage: {},
-      storageOversize: [],
-      // And one that takes nothing from the page beyond the frames every shell has taken, which
-      // is what stops the page posting an erase it would refuse whole (ruling 34).
-      accepts: []
+      storageOversize: []
     })
   })
 
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-rpc-client.ts b/mobile/src/mobile-web-shell/bridge/bridge-rpc-client.ts
index 452bcceb57c3..687d26637f71 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-rpc-client.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-rpc-client.ts
@@ -77,6 +77,8 @@ export type BridgeRpcClient = RpcClient & {
   onRouteUpdate: (listener: (route: BridgeInitRoute | null) => void) => () => void
   /** Fires when an `init` moved the safe-area insets; the value itself is on `getShellSession`. */
   onSafeAreaInsetsUpdate: (listener: (insets: BridgeSafeAreaInsets) => void) => () => void
+  /** Fires when an `init` moved the keyboard height; the value itself is on `getShellSession`. */
+  onKeyboardInsetUpdate: (listener: (height: number) => void) => () => void
   getShellSession: () => BridgeShellSession | null
   /**
    * Asks the shell to open a screen this page does not render. False when the shell granted no
@@ -108,7 +110,6 @@ export type BridgeRpcClient = RpcClient & {
   /**
    * Tells the shell this document has a frame on screen, which is the only thing that does: the
    * shell sees a document commit and a page say `ready`, and neither of those is a painted tree.
-   * Declared in `ready.reports`, so a shell waiting for it is one this page will answer.
    */
   notifyPagePainted: () => void
   /**
@@ -141,9 +142,8 @@ export type BridgeRpcClient = RpcClient & {
    * (ruling 34). The reader erases: the shell tracks no delivery, so a request stays on the route
    * and keeps arriving until the page that applied it says so.
    *
-   * False when this shell never declared it takes one, which is every shell older than the field.
-   * Nothing is owed the caller either way — a clear that did not leave is repaired by the request
-   * arriving again, which is the same path a lost frame takes.
+   * False when the frame could not leave. Nothing is owed the caller — a clear that did not leave
+   * is repaired by the request arriving again, which is the same path a lost frame takes.
    */
   clearRouteParam: (param: BridgeClearableRouteParam, value: string) => boolean
 }
@@ -292,8 +292,7 @@ export function createBridgeRpcClient(options: BridgeRpcClientOptions): BridgeRp
     subscriptions,
     report,
     // Declared here rather than beside the others: the re-assert has to run after the session has
-    // taken this frame, so the claim's own gate reads this `init`'s `accepts` and a shell that
-    // never named it still hears nothing.
+    // taken this frame.
     acceptInit: (message) => {
       handshake.stop()
       shellSession.accept(message)
@@ -412,8 +411,7 @@ export function createBridgeRpcClient(options: BridgeRpcClientOptions): BridgeRp
     send: posted,
     requireSession,
     isClosed: () => closed,
-    hasGrant: (name) => shellSession.current()?.grants.native.includes(name) === true,
-    shellAccepts: (name) => shellSession.current()?.accepts.includes(name) === true
+    hasGrant: (name) => shellSession.current()?.grants.native.includes(name) === true
   })
 
   const unsubscribeFromMessages = options.onMessage(receive)
@@ -465,9 +463,9 @@ export function createBridgeRpcClient(options: BridgeRpcClientOptions): BridgeRp
     onReady: shellSession.onReady,
     onRouteUpdate: shellSession.onRouteUpdate,
     onSafeAreaInsetsUpdate: shellSession.onSafeAreaInsetsUpdate,
+    onKeyboardInsetUpdate: shellSession.onKeyboardInsetUpdate,
     getShellSession: shellSession.current,
     clearRouteParam: (param, value) =>
-      shellSession.current()?.accepts.includes(BRIDGE_ROUTE_PARAM_CLEAR) === true &&
       posted({
         v: BRIDGE_PROTOCOL_VERSION,
         type: 'notify',
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-safe-area-insets.ts b/mobile/src/mobile-web-shell/bridge/bridge-safe-area-insets.ts
index ada32878371d..67d42c774c4c 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-safe-area-insets.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-safe-area-insets.ts
@@ -41,10 +41,3 @@ export function sameSafeAreaInsets(
     left.left === right.left
   )
 }
-
-/**
- * What a page puts in `ready.accepts` to say it pads for the system bars itself. The shell draws
- * the WebView edge-to-edge only for such a page: an older page has no reader for the insets and
- * would lay its header under the status bar, so it keeps the strips the shell reserves.
- */
-export const BRIDGE_SAFE_AREA_ACCEPT = 'safe-area-insets'
diff --git a/mobile/src/mobile-web-shell/bridge/page-first-paint-through-the-bridge.test.ts b/mobile/src/mobile-web-shell/bridge/page-first-paint-through-the-bridge.test.ts
index 86d5189db5e1..46faf5f38c14 100644
--- a/mobile/src/mobile-web-shell/bridge/page-first-paint-through-the-bridge.test.ts
+++ b/mobile/src/mobile-web-shell/bridge/page-first-paint-through-the-bridge.test.ts
@@ -1,37 +1,16 @@
 /**
- * The paint report end to end, and the three pairings it has to survive: a shell that never
- * advertised it, a page that never declared it, and two halves that did both.
- *
- * Driven through the real port pair rather than a mocked host, because what is worth proving is
- * that each half reads the other's word off a real frame rather than assuming it.
+ * The paint report end to end, driven through the real port pair rather than a mocked host, because
+ * what is worth proving is that the page's post reaches the shell's cover over a real frame.
  */
 import { describe, expect, it } from 'vitest'
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { createFakeRpcClient } from '../bridge-host-test-fakes'
 import { createFakeBridgePortPair } from './bridge-port-pair-test-harness'
-import { BRIDGE_PAGE_PAINTED } from './bridge-page-painted'
 import { createRouteScreenPaintReporter } from './page-first-paint'
 
-/** One `init` frame with one name taken out of `accepts`, which is what an older shell sends. */
-function stripAccept(json: string, name: string): string {
-  const frame: unknown = JSON.parse(json)
-  if (typeof frame !== 'object' || frame === null || !('type' in frame)) {
-    return json
-  }
-  const record: Record<string, unknown> = { ...frame }
-  if (record.type !== 'init' || !Array.isArray(record.accepts)) {
-    return json
-  }
-  record.accepts = record.accepts.filter((entry) => entry !== name)
-  return JSON.stringify(record)
-}
-
 describe('the page telling the shell it has a frame', () => {
-  it('new shell, new page: declares on ready and posts after the first paint', async () => {
+  it('posts after the first paint, and not before', async () => {
     const pair = createFakeBridgePortPair({ rpc: createFakeRpcClient() })
     await pair.flush()
-    expect(pair.pageReports()).toEqual([[BRIDGE_PAGE_PAINTED]])
     expect(pair.pagePaintCount()).toBe(0)
 
     // The two frames the entry waits out, drained by hand so "after the paint" is a step.
@@ -52,48 +31,6 @@ describe('the page telling the shell it has a frame', () => {
     expect(pair.pagePaintCount()).toBe(1)
   })
 
-  it('old shell, new page: posts nothing, so no shell is left refusing a frame', async () => {
-    // Stands for every shell installed before this change: `notify` is a closed union there, so an
-    // unasked-for report is an error frame per mount rather than a dropped one.
-    const pair = createFakeBridgePortPair({
-      rpc: createFakeRpcClient(),
-      rewriteToPage: (json) => stripAccept(json, BRIDGE_PAGE_PAINTED)
-    })
-    await pair.flush()
-    expect(pair.client.getShellSession()?.accepts).not.toContain(BRIDGE_PAGE_PAINTED)
-    const framesToShell = pair.toShell.length
-    pair.client.notifyPagePainted()
-    await pair.flush()
-    expect(pair.toShell).toHaveLength(framesToShell)
-    expect(pair.pagePaintCount()).toBe(0)
-    expect(pair.hostDiagnostics).not.toContainEqual(
-      expect.objectContaining({ refusal: 'unrecognised-message' })
-    )
-  })
-
-  it('advertises the report in init, which is what the page reads before posting one', async () => {
-    const pair = createFakeBridgePortPair({ rpc: createFakeRpcClient() })
-    await pair.flush()
-    expect(pair.client.getShellSession()?.accepts).toContain(BRIDGE_PAGE_PAINTED)
-  })
-
-  it('is reported by the page entry, from the effect that runs after the tree commits', () => {
-    // The one call site, pinned: every test above drives the client directly, so a deleted line in
-    // the entry would leave a shell covering a page that has painted and will never say so.
-    const entry = readFileSync(
-      join(import.meta.dirname, '..', '..', '..', 'web-entry', 'index.tsx'),
-      'utf8'
-    )
-    expect(entry).toContain('createRouteScreenPaintReporter(')
-    expect(entry).toContain('client.notifyPagePainted()')
-    // Handed to the route screen rather than called from the wrapper's own effect, which commits
-    // while the route's chunk is still arriving and the body is empty.
-    expect(entry).toContain('RouteScreenPaintProvider')
-    expect(entry).not.toMatch(
-      /stampPageMountState\(target, 'mounted'\)\s*\n\s*reportRouteScreenPaint/
-    )
-  })
-
   it('costs the shell nothing to hear: no request, no subscription, no reply', async () => {
     const rpc = createFakeRpcClient()
     const pair = createFakeBridgePortPair({ rpc })
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-back-claim-state.test.ts b/mobile/src/mobile-web-shell/mobile-web-shell-back-claim-state.test.ts
index 29c0d802860a..b75cd2b54477 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-back-claim-state.test.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-back-claim-state.test.ts
@@ -13,7 +13,7 @@ describe('the page claiming the device Back key', () => {
   function claimed(): MobileWebShellStep {
     return run(
       readySession().session,
-      { type: 'page-ready', reports: [], accepts: [] },
+      { type: 'page-ready' },
       { type: 'page-back-claim', claimed: true }
     )
   }
@@ -38,7 +38,7 @@ describe('the page claiming the device Back key', () => {
   })
 
   it('drops it when the document asks for a session again, so the page has to claim again', () => {
-    const reasked = run(claimed().session, { type: 'page-ready', reports: [], accepts: [] })
+    const reasked = run(claimed().session, { type: 'page-ready' })
     expect(shellPageBackClaimed(reasked.session)).toBe(false)
   })
 
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-failed-update-fallback.test.ts b/mobile/src/mobile-web-shell/mobile-web-shell-failed-update-fallback.test.ts
index 7814b33c73fe..3ae35fc7a6e5 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-failed-update-fallback.test.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-failed-update-fallback.test.ts
@@ -122,6 +122,7 @@ function manifestOf(
     buildId: computeMobileWebBundleId(assets),
     minCompatibleRuntimeProtocolVersion: 2,
     runtimeProtocolVersion,
+    pageVersion: 1,
     entrypoint: 'index.html',
     totalBytes: TOTAL_BYTES,
     assets,
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-flag-census.test.ts b/mobile/src/mobile-web-shell/mobile-web-shell-flag-census.test.ts
deleted file mode 100644
index fd23a1333757..000000000000
--- a/mobile/src/mobile-web-shell/mobile-web-shell-flag-census.test.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join, relative } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import { censusSourceFiles } from '../test-support/census-source-files'
-
-/**
- * The hybrid shell flag is the whole of what keeps this feature dark in a native build, so who
- * touches it is a product invariant rather than a convention. A second reader is how a dark feature
- * stops being dark: a launch-time sweep, a prefetch or a menu item that consults the flag would run
- * in a native store build the moment anything flipped it, and none of those would fail a type
- * check.
- *
- * The build-kind fact is the same shape of invariant one level up. `EXPO_PUBLIC_MOBILE_SHELL` is
- * what a release workflow sets to build the OTA binary, and a second module spelling it would be a
- * second answer to "is this the page's build" that no type check would catch either.
- */
-const MOBILE_ROOT = join(import.meta.dirname, '..', '..')
-const FLAG_KEY = 'orca:mobileWebShellEnabled'
-/** The inlined form. Prose may name the variable; this is the spelling that reads it. */
-const BUILD_SWITCH_READ = 'process.env.EXPO_PUBLIC_'
-/** The other spelling Expo's plugin inlines, which is how the rule above would be evaded. */
-const BUILD_SWITCH_BRACKET_READ = "process.env['EXPO_PUBLIC_"
-const DEFINITION = 'src/storage/preferences.ts'
-/** The one product reader, which only the shared switch decision asks. */
-const FLAG_HOOK = 'src/mobile-web-shell/use-mobile-web-shell-enabled.ts'
-/** The one caller of that hook: every route asks this instead, so its list is the whole census. */
-const DECISION = 'src/mobile-web-shell/shell-switch-decision.ts'
-const ROUTE = 'app/h/[hostId]/web.tsx'
-const HOST_ROUTE = 'app/h/[hostId]/index.tsx'
-const AGENT_HISTORY_ROUTE = 'app/h/[hostId]/agent-history/[worktreeId].tsx'
-const TASKS_ROUTE = 'app/h/[hostId]/tasks.tsx'
-const FILES_ROUTE = 'app/h/[hostId]/files/[worktreeId].tsx'
-const FILES_PREVIEW_ROUTE = 'app/h/[hostId]/files/preview/[worktreeId].tsx'
-const SOURCE_CONTROL_ROUTE = 'app/h/[hostId]/source-control/[worktreeId].tsx'
-const REVIEW_ROUTE = 'app/h/[hostId]/review/[worktreeId].tsx'
-const SESSION_ROUTE = 'app/h/[hostId]/session/[worktreeId].tsx'
-/** The one switch with no native screen behind it; its route file only re-exports this body. */
-const CATCH_ALL_ROUTE = 'src/mobile-web-shell/catch-all-page-route.tsx'
-/** What a switch paints while the decision is `pending`, and the third thing every switch names. */
-const PENDING_SCREEN = 'src/mobile-web-shell/ShellSwitchPendingScreen.tsx'
-/** One entry per screen the flag can switch to the page, which is what a review reads. */
-const SWITCHED_ROUTES = [
-  HOST_ROUTE,
-  AGENT_HISTORY_ROUTE,
-  TASKS_ROUTE,
-  FILES_ROUTE,
-  FILES_PREVIEW_ROUTE,
-  SOURCE_CONTROL_ROUTE,
-  REVIEW_ROUTE,
-  SESSION_ROUTE,
-  CATCH_ALL_ROUTE
-]
-const DEVELOPER_ROW = 'src/diagnostics/mobile-web-shell-dev-row.tsx'
-/** The one screen that decides whether that row mounts, which is a build-kind question. */
-const TROUBLESHOOT_ROUTE = 'app/troubleshoot.tsx'
-/** Every tree that ships in the app bundle, with the floor each must clear. `modules` is two files,
- *  but it is where the native view lives and so the easiest place for a second reader to hide. */
-const TREES = { src: 200, app: 10, modules: 1 }
-const SHELL_VIEW = 'modules/orca-mobile-web-shell/src/index.ts'
-
-function sourceFiles(directory: string): string[] {
-  return censusSourceFiles(join(MOBILE_ROOT, directory))
-    .map((path) => relative(MOBILE_ROOT, path))
-    .filter((path) => /\.tsx?$/.test(path) && !path.includes('.test.'))
-}
-
-const SOURCES = Object.keys(TREES)
-  .flatMap((tree) => sourceFiles(tree))
-  .map((path) => ({
-    path: path.split('\\').join('/'),
-    text: readFileSync(join(MOBILE_ROOT, path), 'utf8')
-  }))
-
-function filesContaining(needle: string): string[] {
-  return SOURCES.filter((file) => file.text.includes(needle))
-    .map((file) => file.path)
-    .sort()
-}
-
-/**
- * The same matches with the line each was read off, as the failure message for the rules below.
- *
- * A census that answers only with paths tells a reader which file is wrong and nothing about what
- * in it is: the needles here are identifiers, and a file can name one in an import, a call or a
- * comment. The snippet is what turns "this list moved" into the edit that moved it.
- */
-function matchesOf(needle: string): string {
-  // Sorted by path then by line number, not as text: `:59:` sorts before `:4:` as a string, which
-  // reads as a file whose matches are out of order.
-  return [...SOURCES]
-    .sort((left, right) => left.path.localeCompare(right.path))
-    .flatMap((file) =>
-      file.text
-        .split('\n')
-        .flatMap((line, index) =>
-          line.includes(needle) ? [`${file.path}:${index + 1}: ${line.trim()}`] : []
-        )
-    )
-    .join('\n')
-}
-
-describe('who touches the hybrid shell flag', () => {
-  it('reaches every shipped tree, so the absence assertions below cannot pass vacuously', () => {
-    const paths = SOURCES.map((file) => file.path)
-    expect(paths).toContain(DEFINITION)
-    expect(paths).toContain(FLAG_HOOK)
-    expect(paths).toContain(DECISION)
-    expect(paths).toContain(PENDING_SCREEN)
-    expect(paths).toContain(ROUTE)
-    for (const route of SWITCHED_ROUTES) {
-      expect(paths).toContain(route)
-    }
-    expect(paths).toContain(DEVELOPER_ROW)
-    expect(paths).toContain(TROUBLESHOOT_ROUTE)
-    expect(paths).toContain(SHELL_VIEW)
-    const trees = Object.keys(TREES)
-    for (const [tree, floor] of Object.entries(TREES)) {
-      expect(paths.filter((path) => path.startsWith(`${tree}/`)).length).toBeGreaterThan(floor)
-    }
-    expect(paths.filter((path) => !trees.some((tree) => path.startsWith(`${tree}/`)))).toEqual([])
-  })
-
-  it('keeps the storage key itself in one module', () => {
-    expect(filesContaining(FLAG_KEY)).toEqual([DEFINITION])
-  })
-
-  it('reads the build-time switch in one module', () => {
-    // `babel-preset-expo` inlines an `EXPO_PUBLIC_*` variable only where it is spelled as a
-    // literal member expression of `process.env`, so a second read is a second literal to keep in
-    // step with the workflow input — and a value copied out into a binding is not rewritten at
-    // all, which reads `undefined` on a device and answers native in a build that is not.
-    //
-    // Prose is not a read: the docblocks that name the variable are how a reader finds this
-    // module, and pinning them would make every wording change a census failure.
-    expect(filesContaining(BUILD_SWITCH_READ), matchesOf(BUILD_SWITCH_READ)).toEqual([DEFINITION])
-    expect(
-      filesContaining(BUILD_SWITCH_BRACKET_READ),
-      matchesOf(BUILD_SWITCH_BRACKET_READ)
-    ).toEqual([])
-  })
-
-  it('answers the build kind through one named function, asked by the flag and the row label', () => {
-    expect(filesContaining('mobileShellBuildKind'), matchesOf('mobileShellBuildKind')).toEqual(
-      [DEFINITION, DEVELOPER_ROW].sort()
-    )
-  })
-
-  it('is read by one hook and by the developer row that writes it, and nowhere else', () => {
-    expect(filesContaining('loadMobileWebShellEnabled')).toEqual(
-      [DEFINITION, DEVELOPER_ROW, FLAG_HOOK].sort()
-    )
-  })
-
-  it('is read by the shared switch decision and by nothing else', () => {
-    // The narrowest this has ever been, and the reason the rule below is total: a route cannot
-    // hold a private opinion about the flag — including about the window where it is still `null`
-    // — without reading it, and this is the only place that reads it.
-    expect(
-      filesContaining('useMobileWebShellEnabled'),
-      matchesOf('useMobileWebShellEnabled')
-    ).toEqual([DECISION, FLAG_HOOK].sort())
-  })
-
-  it('reaches the switched routes through that decision and no others', () => {
-    // Each switched route is a screen the flag decides the renderer of, and one more is one more
-    // place a dark feature could turn itself on. The list grows once per domain series, in the PR
-    // that switches the route file to MobileWebShellScreen, and never as a side effect of anything
-    // else. A switched route is inert until MOBILE_WEB_PAGE_ROUTES lists it as well, so an entry
-    // here can land a PR ahead of that one.
-    expect(filesContaining('useShellSwitchDecision'), matchesOf('useShellSwitchDecision')).toEqual(
-      [DECISION, ROUTE, ...SWITCHED_ROUTES].sort()
-    )
-  })
-
-  it('gives every one of them the same neutral state to paint while the flag is unresolved', () => {
-    // The rule a sixth switch would otherwise regress past. Reading the flag through the decision
-    // is not on its own enough: a switch that ignored `pending` and fell through to its native
-    // screen would satisfy the rule above and still flash native in front of a flag-on user. This
-    // one says every switch names the neutral screen, which is existence rather than shape — where
-    // it names it is the route test's business, and `shell-switch-null-flag.test.tsx` drives all
-    // nine through the states themselves.
-    expect(
-      filesContaining('ShellSwitchPendingScreen'),
-      matchesOf('ShellSwitchPendingScreen')
-    ).toEqual([PENDING_SCREEN, ROUTE, ...SWITCHED_ROUTES].sort())
-  })
-
-  it('fences the build kind in one place, which the read, the hook and the row gate ask', () => {
-    // The test that makes a native store build unable to turn the flag on: `__DEV__`, or a binary
-    // built with the switch set to `ota`. The hook starts its state on it so a native release
-    // build never reaches the neutral state, which is the same answer `loadMobileWebShellEnabled`
-    // gives one render later — and two spellings of one build-kind test are two things to keep
-    // true, where this feature's darkness rests on exactly one.
-    //
-    // The Troubleshoot route asks the same question to decide whether to mount the toggle, which
-    // is the one place a user can switch an OTA build back to the native screens. Asking it rather
-    // than re-deriving it is why that row and the flag can never disagree about the build.
-    expect(
-      filesContaining('mobileWebShellFlagCanBeOn'),
-      matchesOf('mobileWebShellFlagCanBeOn')
-    ).toEqual([DEFINITION, FLAG_HOOK, TROUBLESHOOT_ROUTE].sort())
-  })
-
-  it('is written only by the developer row', () => {
-    expect(filesContaining('saveMobileWebShellEnabled')).toEqual([DEFINITION, DEVELOPER_ROW].sort())
-  })
-})
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-gates.ts b/mobile/src/mobile-web-shell/mobile-web-shell-gates.ts
index 9850161ff204..26e505743096 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-gates.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-gates.ts
@@ -65,8 +65,8 @@ export function gateVerdict(gates: MobileWebShellGates): MobileWebShellGateVerdi
   }
   // Never a wall on an unreadable status: the empty capability list it leaves behind is
   // indistinguishable from a desktop that ships no bundle, and that wall tells the wrong story. It
-  // is not a wait either — the gate settles once per host screen and does not probe again — so the
-  // one honest answer is to say the status could not be read and let a fresh gate reopen it.
+  // is not a wait either — the gate settles closed and only re-asks in the background — so the one
+  // honest answer is to say the status could not be read; a later readable status reopens it.
   if (!gates.statusReadable) {
     return { kind: 'status-unreadable' }
   }
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-keyboard-overlay-screen.test.tsx b/mobile/src/mobile-web-shell/mobile-web-shell-keyboard-overlay-screen.test.tsx
new file mode 100644
index 000000000000..bc0c93968c97
--- /dev/null
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-keyboard-overlay-screen.test.tsx
@@ -0,0 +1,108 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const harness = await vi.hoisted(async () => await import('./mobile-web-shell-screen-test-harness'))
+const dependencies = vi.hoisted(() => harness.createScreenDependencies())
+
+const { screenModuleMocks } = await vi.hoisted(
+  async () => await import('./mobile-web-shell-screen-test-mocks')
+)
+const mocks = vi.hoisted(() => screenModuleMocks(dependencies))
+vi.mock('react-native', mocks['react-native'])
+vi.mock('expo-clipboard', mocks['expo-clipboard'])
+vi.mock('expo-haptics', mocks['expo-haptics'])
+vi.mock('expo-document-picker', mocks['expo-document-picker'])
+vi.mock('@orca/expo-two-way-audio', mocks['@orca/expo-two-way-audio'])
+vi.mock('expo-keep-awake', mocks['expo-keep-awake'])
+vi.mock('expo-image-picker', mocks['expo-image-picker'])
+vi.mock('expo-file-system', mocks['expo-file-system'])
+vi.mock('lucide-react-native', mocks['lucide-react-native'])
+vi.mock('react-native-safe-area-context', mocks['react-native-safe-area-context'])
+vi.mock('expo-router', mocks['expo-router'])
+vi.mock('../../modules/orca-mobile-web-shell/src', mocks['../../modules/orca-mobile-web-shell/src'])
+vi.mock('../transport/client-context', mocks['../transport/client-context'])
+vi.mock('./use-page-host-snapshot', mocks['./use-page-host-snapshot'])
+vi.mock('./use-mobile-web-shell-session', mocks['./use-mobile-web-shell-session'])
+
+import { act } from 'react-test-renderer'
+import { clientFrame, createFakeRpcClient } from './bridge-host-test-fakes'
+import {
+  byName,
+  readyState,
+  renderScreen as mountScreen
+} from './mobile-web-shell-screen-test-harness'
+import { readBridgeHostMessage } from './bridge/bridge-envelope'
+import { MobileWebShellScreen } from './MobileWebShellScreen'
+import type { MobileWebShellSessionState } from './mobile-web-shell-session-contract'
+import type { ReactTestRenderer } from 'react-test-renderer'
+
+const renderScreen = (state: MobileWebShellSessionState): Promise<ReactTestRenderer> =>
+  mountScreen(MobileWebShellScreen, dependencies, state)
+
+afterEach(harness.unmountRenderedScreens)
+
+beforeEach(() => {
+  harness.resetScreenDependencies(dependencies)
+})
+
+const WINDOW = { top: 44, right: 0, bottom: 8, left: 0 }
+
+/**
+ * The page is covered by the keyboard like a native screen: the view keeps its size, and the page
+ * is told the height on every keyboard event.
+ */
+describe('a page the keyboard covers', () => {
+  async function openPage(sessionId: string) {
+    dependencies.client = createFakeRpcClient()
+    const tree = await renderScreen(readyState(sessionId))
+    await act(async () => {
+      byName(tree, 'ShellViewProbe')[0]?.props.onBridgeMessage({
+        nativeEvent: { json: clientFrame({ type: 'ready' }) }
+      })
+    })
+    const root = () => tree.root.find((node) => node.props.testID === 'mobile-web-shell-ready')
+    const inits = () =>
+      dependencies.posted.flatMap((json) => {
+        const read = readBridgeHostMessage(json)
+        return read.ok && read.message.type === 'init'
+          ? [{ keyboard: read.message.keyboardInset ?? 0, insets: read.message.safeAreaInsets }]
+          : []
+      })
+    const keyboard = async (height: number) => {
+      await act(async () => {
+        const ios = dependencies.platform === 'ios'
+        const name =
+          height > 0
+            ? ios
+              ? 'keyboardWillShow'
+              : 'keyboardDidShow'
+            : ios
+              ? 'keyboardWillHide'
+              : 'keyboardDidHide'
+        dependencies.keyboardListeners.get(name)?.({ endCoordinates: { height } })
+      })
+    }
+    return { root, inits, keyboard }
+  }
+
+  for (const platform of ['ios', 'android'] as const) {
+    it(`never shortens the view, and publishes show, a height change and hide (${platform})`, async () => {
+      dependencies.platform = platform
+      const page = await openPage(`session-overlay-${platform}`)
+      // Pixel_API_37: 312 up, 346 with the suggestion strip, then closed. The inset tracks each, so
+      // a keyboard that changes height while open leaves no gap above it.
+      for (const height of [312, 346, 0]) {
+        await page.keyboard(height)
+        expect(page.root().props.style[1]).toEqual({ paddingTop: 0 })
+      }
+      // The keyboard's own height as native screens read it on this OS, home indicator included on
+      // iOS; the page's arithmetic branches on the shell's OS, as native does. The bottom inset
+      // stays the window's.
+      expect(page.inits()).toEqual([
+        { keyboard: 0, insets: WINDOW },
+        { keyboard: 312, insets: WINDOW },
+        { keyboard: 346, insets: WINDOW },
+        { keyboard: 0, insets: WINDOW }
+      ])
+    })
+  }
+})
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-offline-grant-staleness.test.ts b/mobile/src/mobile-web-shell/mobile-web-shell-offline-grant-staleness.test.ts
index c39c55604645..1fb8acee474f 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-offline-grant-staleness.test.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-offline-grant-staleness.test.ts
@@ -110,6 +110,7 @@ function manifestGranting(
     buildId: BUILD_ID,
     minCompatibleRuntimeProtocolVersion: 2,
     runtimeProtocolVersion: 5,
+    pageVersion: 1,
     entrypoint: 'index.html',
     totalBytes: TOTAL_BYTES,
     assets: ASSETS,
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-router-seam-census.test.ts b/mobile/src/mobile-web-shell/mobile-web-shell-router-seam-census.test.ts
deleted file mode 100644
index e7d8b6c00d37..000000000000
--- a/mobile/src/mobile-web-shell/mobile-web-shell-router-seam-census.test.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  callsRouteHandoff,
-  expoRouterValueImports,
-  parse,
-  productFiles
-} from '../navigation/router-seam-census.test-support'
-
-const SHELL_ROOT = import.meta.dirname
-
-/**
- * The tree that is both halves of the handoff, which is why it needs its own census.
- *
- * Every other domain here is page code: a screen the shell may serve, where expo-router's own
- * router posts no `navigate` and a target outside the page paints Unmatched over it. This tree is
- * different — it holds the app end of the seam as well, so the rule cannot be "no router" and has
- * to name which modules are the app end.
- *
- * It is also the tree where the gap showed: `PageRouteUnavailableScreen` shipped with a bare
- * `useRouter` and nothing caught it, because the three landed censuses walk `src/session`,
- * `src/files` and `src/source-control` and this tree had none.
- */
-
-/**
- * The two modules that ARE the app end of the handoff, and so hold expo-router's own router.
- *
- * `MobileWebShellScreen` is what hosts the page; its `router.push` is the `onNavigate` the page's
- * `navigate` notify arrives at, so routing it through the seam would hand the page's target back to
- * the page. `useShellStackPop` is the same for `onNavigateBack`: it pops the native stack the shell
- * was pushed onto. Neither has a `.web.*` sibling and neither can run inside the page — the page has
- * no shell within it — so neither is a screen the seam exists for.
- */
-const SHELL_SIDE_ROUTER_HOLDERS = ['MobileWebShellScreen.tsx', 'use-shell-stack-pop.ts']
-
-/**
- * The screens here that render on the page and therefore must reach the router through the seam.
- *
- * One today. `PageRouteUnavailableScreen` is rendered by the catch-all on the device and by its
- * `.web.tsx` sibling inside the page, so a bare replace there navigates within the WebView to a
- * route the page does not carry instead of leaving it.
- */
-const ROUTER_HOLDERS = ['PageRouteUnavailableScreen.tsx']
-
-/**
- * The expo-router names this tree may import outside those two, and why none is a router.
- *
- * `useLocalSearchParams` reads the params of the route already mounted and `usePathname` reads
- * which route that is. Neither takes a target, so neither can put a screen in front of the page.
- *
- * A closed list rather than a ban on `useRouter`, for the reason the session census gives:
- * expo-router also exports a module-singleton `router` that navigates from a plain function, and a
- * rule written against the one spelling would read that as clean.
- */
-const NON_NAVIGATING_ROUTER_NAMES = ['useLocalSearchParams', 'usePathname']
-
-describe('the mobile-web-shell tree reaches the router through the handoff seam', () => {
-  const files = productFiles(SHELL_ROOT)
-
-  it('walks the modules it is written against, so the empty list below means something', () => {
-    expect(files).toEqual(expect.arrayContaining(SHELL_SIDE_ROUTER_HOLDERS))
-    expect(files).toEqual(expect.arrayContaining(ROUTER_HOLDERS))
-    // The whole tree, not the five files that touch a router: a walk that collapsed to those would
-    // report an empty finding list for a domain it never read.
-    expect(files.length).toBeGreaterThan(60)
-  })
-
-  it('imports nothing from expo-router that can navigate, outside the two that are the seam', () => {
-    const offenders = files
-      .filter((name) => !SHELL_SIDE_ROUTER_HOLDERS.includes(name))
-      .map((name) => ({
-        name,
-        imported: expoRouterValueImports(parse(SHELL_ROOT, name)).filter(
-          (imported) => !NON_NAVIGATING_ROUTER_NAMES.includes(imported)
-        )
-      }))
-      .filter((entry) => entry.imported.length > 0)
-      .map((entry) => `${entry.name} (${entry.imported.join(', ')})`)
-    expect(offenders).toEqual([])
-  })
-
-  it('takes the router from useRouteHandoff at every screen the page renders', () => {
-    expect(files.filter((name) => callsRouteHandoff(parse(SHELL_ROOT, name))).sort()).toEqual(
-      [...ROUTER_HOLDERS].sort()
-    )
-  })
-
-  it('still holds a real router at the app end, which is what the exemption is for', () => {
-    // The completeness half: the rule above also passes over a tree whose two seam modules stopped
-    // navigating at all, which is what it would read as if someone moved them and left this list.
-    for (const name of SHELL_SIDE_ROUTER_HOLDERS) {
-      expect(expoRouterValueImports(parse(SHELL_ROOT, name)), name).toContain('useRouter')
-    }
-  })
-})
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-safe-area-screen.test.tsx b/mobile/src/mobile-web-shell/mobile-web-shell-safe-area-screen.test.tsx
index e8fcf93aad76..446f57b5062c 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-safe-area-screen.test.tsx
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-safe-area-screen.test.tsx
@@ -31,8 +31,6 @@ import {
   renderScreen as mountScreen
 } from './mobile-web-shell-screen-test-harness'
 import { readBridgeHostMessage } from './bridge/bridge-envelope'
-import { BRIDGE_ROUTE_UPDATE_ACCEPT } from './bridge/bridge-route-update'
-import { BRIDGE_SAFE_AREA_ACCEPT } from './bridge/bridge-safe-area-insets'
 import { MobileWebShellScreen } from './MobileWebShellScreen'
 import type { MobileWebShellSessionState } from './mobile-web-shell-session-contract'
 import type { ReactTestRenderer } from 'react-test-renderer'
@@ -47,16 +45,16 @@ beforeEach(() => {
 })
 
 /**
- * A page that pads for the system bars itself gets the whole window, like a native screen: it
+ * Every page pads for the system bars itself and gets the whole window, like a native screen: it
  * paints under both bars and its SafeAreaViews pad by the insets `init` carries.
  */
 describe('a page that owns its safe area', () => {
-  async function openPage(sessionId: string, accepts: readonly string[]) {
+  async function openPage(sessionId: string) {
     dependencies.client = createFakeRpcClient()
     const tree = await renderScreen(readyState(sessionId))
     await act(async () => {
       byName(tree, 'ShellViewProbe')[0]?.props.onBridgeMessage({
-        nativeEvent: { json: clientFrame({ type: 'ready', accepts }) }
+        nativeEvent: { json: clientFrame({ type: 'ready' }) }
       })
     })
     const root = () => tree.root.find((node) => node.props.testID === 'mobile-web-shell-ready')
@@ -65,73 +63,31 @@ describe('a page that owns its safe area', () => {
         const read = readBridgeHostMessage(json)
         return read.ok && read.message.type === 'init' ? [read.message.safeAreaInsets ?? null] : []
       })
-    const keyboard = async (height: number) => {
-      await act(async () => {
-        const ios = dependencies.platform === 'ios'
-        const name =
-          height > 0
-            ? ios
-              ? 'keyboardWillShow'
-              : 'keyboardDidShow'
-            : ios
-              ? 'keyboardWillHide'
-              : 'keyboardDidHide'
-        dependencies.keyboardListeners.get(name)?.({ endCoordinates: { height } })
-      })
-    }
-    return { tree, root, initInsets, keyboard }
-  }
-  const ownedPage = (sessionId: string) => {
-    dependencies.pageOwnsSafeArea = true
-    return openPage(sessionId, [BRIDGE_ROUTE_UPDATE_ACCEPT, BRIDGE_SAFE_AREA_ACCEPT])
+    return { tree, root, initInsets }
   }
+  // A `ready` that declares nothing: every page the shell serves reads the insets.
+  const ownedPage = openPage
   const WINDOW = { top: 44, right: 0, bottom: 8, left: 0 }
 
   it('draws the view edge-to-edge and hands the page the insets it now sits under', async () => {
     const page = await ownedPage('session-owned')
-    expect(page.root().props.style[1]).toEqual({ paddingTop: 0, paddingBottom: 0 })
+    expect(page.root().props.style[1]).toEqual({ paddingTop: 0 })
     expect(page.initInsets()).toEqual([WINDOW])
   })
 
-  it('re-sends init with no bottom inset while the keyboard ends the view', async () => {
-    const page = await ownedPage('session-owned-keyboard')
-    await page.keyboard(336)
-    // The view ends at the keyboard's top, so nothing of it is under the gesture bar.
-    expect(page.root().props.style[1]).toEqual({ paddingTop: 0, paddingBottom: 336 })
-    await page.keyboard(0)
-    expect(page.root().props.style[1]).toEqual({ paddingTop: 0, paddingBottom: 0 })
-    expect(page.initInsets()).toEqual([WINDOW, { ...WINDOW, bottom: 0 }, WINDOW])
-  })
-
-  it('does the same on Android, where the IME strip is measured above the gesture bar', async () => {
-    dependencies.platform = 'android'
-    const page = await ownedPage('session-owned-android')
-    await page.keyboard(336)
-    expect(page.root().props.style[1]).toEqual({ paddingTop: 0, paddingBottom: 344 })
-    await page.keyboard(0)
-    expect(page.root().props.style[1]).toEqual({ paddingTop: 0, paddingBottom: 0 })
-    expect(page.initInsets()).toEqual([WINDOW, { ...WINDOW, bottom: 0 }, WINDOW])
-  })
-
   it('gives the status bar strip to the update banner while it shows', async () => {
     dependencies.updateNotice = 'update-failed'
     const page = await ownedPage('session-owned-banner')
-    expect(page.root().props.style[1]).toEqual({ paddingTop: 44, paddingBottom: 0 })
+    expect(page.root().props.style[1]).toEqual({ paddingTop: 44 })
     expect(page.initInsets()).toEqual([{ ...WINDOW, top: 0 }])
+    const dismiss = byName(page.tree, 'Pressable').find(
+      (node) => node.props.accessibilityLabel === 'Dismiss notice'
+    )
+    expect(dismiss).toBeDefined()
     await act(async () => {
-      byName(page.tree, 'Pressable')
-        .find((node) => node.props.accessibilityLabel === 'Dismiss notice')
-        ?.props.onPress()
+      dismiss?.props.onPress()
     })
-    expect(page.root().props.style[1]).toEqual({ paddingTop: 0, paddingBottom: 0 })
+    expect(page.root().props.style[1]).toEqual({ paddingTop: 0 })
     expect(page.initInsets()).toEqual([{ ...WINDOW, top: 0 }, WINDOW])
   })
-
-  it('sends no second init to an older page that takes route updates but not insets', async () => {
-    const page = await openPage('session-older', [BRIDGE_ROUTE_UPDATE_ACCEPT])
-    await page.keyboard(336)
-    await page.keyboard(0)
-    expect(page.root().props.style[1]).toEqual({ paddingTop: 44, paddingBottom: 8 })
-    expect(page.initInsets()).toHaveLength(1)
-  })
 })
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-safe-area-state.test.ts b/mobile/src/mobile-web-shell/mobile-web-shell-safe-area-state.test.ts
deleted file mode 100644
index 0ea58b85b0be..000000000000
--- a/mobile/src/mobile-web-shell/mobile-web-shell-safe-area-state.test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { readySession, run } from './mobile-web-shell-session-test-fixtures'
-import { BRIDGE_SAFE_AREA_ACCEPT } from './bridge/bridge-safe-area-insets'
-import { shellPageOwnsSafeArea } from './page-document-state'
-
-/** Whether the shell may draw the view edge-to-edge, which only the document on screen can say. */
-describe('the page declaring it pads for the system bars', () => {
-  const owned = () =>
-    run(readySession().session, {
-      type: 'page-ready',
-      reports: [],
-      accepts: [BRIDGE_SAFE_AREA_ACCEPT]
-    })
-
-  it('is read off the ready that declared it', () => {
-    expect(shellPageOwnsSafeArea(owned().session)).toBe(true)
-  })
-
-  it('is false for a page that did not declare it, which is every page before the name', () => {
-    const older = run(readySession().session, { type: 'page-ready', reports: [], accepts: [] })
-    expect(shellPageOwnsSafeArea(older.session)).toBe(false)
-  })
-
-  it('is dropped when a replacement document starts, so the next one has to say it again', () => {
-    expect(shellPageOwnsSafeArea(run(owned().session, { type: 'document-started' }).session)).toBe(
-      false
-    )
-  })
-
-  it('is not read once the generation is off screen', () => {
-    const failed = run(owned().session, { type: 'shell-failed', reason: 'document-load-failed' })
-    expect(shellPageOwnsSafeArea(failed.session)).toBe(false)
-  })
-})
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-screen-test-harness.tsx b/mobile/src/mobile-web-shell/mobile-web-shell-screen-test-harness.tsx
index 64135cef2485..a1b81f1bdc46 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-screen-test-harness.tsx
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-screen-test-harness.tsx
@@ -55,9 +55,7 @@ export type ScreenDependencies = {
   setScreenOptions: Mock
   /** Whether the session says the page is holding the device Back key. */
   backClaimed: boolean
-  /** Whether the session says the page pads for the system bars itself. */
-  pageOwnsSafeArea: boolean
-  /** What `Platform.OS` answers, which picks the keyboard events and the IME strip. */
+  /** What `Platform.OS` answers, which picks the keyboard events. */
   platform: 'ios' | 'android'
   reportPageBackClaim: Mock
   /** Whether the mounted host would take a press, which is a page that declared it takes one. */
@@ -70,7 +68,7 @@ export const SCREEN_SNAPSHOT = {
   host: { id: 'host-1', name: 'Host One', endpoint: 'ws://host-1', lastConnected: 3 }
 }
 
-export const DEFAULT_ROUTE_GRANTS: readonly string[] = [
+const DEFAULT_ROUTE_GRANTS: readonly string[] = [
   'navigate',
   'storage',
   'externalLink',
@@ -114,7 +112,6 @@ export function createScreenDependencies(): ScreenDependencies {
     backHandlers: new Map(),
     setScreenOptions: vi.fn(),
     backClaimed: false,
-    pageOwnsSafeArea: false,
     platform: 'ios',
     reportPageBackClaim: vi.fn(),
     sendBackDelivers: true,
@@ -154,7 +151,6 @@ export function resetScreenDependencies(dependencies: ScreenDependencies): void
   dependencies.setScreenOptions.mockReset()
   dependencies.reportPageBackClaim.mockReset()
   dependencies.backClaimed = false
-  dependencies.pageOwnsSafeArea = false
   dependencies.platform = 'ios'
   dependencies.sendBackDelivers = true
   dependencies.backSends = 0
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-screen-test-mocks.tsx b/mobile/src/mobile-web-shell/mobile-web-shell-screen-test-mocks.tsx
index c622c77f11d5..1976c3d700f7 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-screen-test-mocks.tsx
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-screen-test-mocks.tsx
@@ -180,8 +180,7 @@ export function screenModuleMocks(dependencies: ScreenDependencies) {
         reportPageBackClaim: dependencies.reportPageBackClaim,
         pageReady: dependencies.pageReady,
         pageFrame: dependencies.pageFrame,
-        backClaimed: dependencies.backClaimed,
-        pageOwnsSafeArea: dependencies.pageOwnsSafeArea
+        backClaimed: dependencies.backClaimed
       })
     })
   }
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-session-contract.ts b/mobile/src/mobile-web-shell/mobile-web-shell-session-contract.ts
index 98f0df8a9007..bfc8c5f385e9 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-session-contract.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-session-contract.ts
@@ -11,11 +11,6 @@ import type {
   MobileWebShellUpdateFailureFacts
 } from './mobile-web-shell-update-failure'
 
-/** What one `ready` declared: what the page will report, and what it can be sent. */
-export type PageReadyDeclaration = {
-  readonly reports: readonly string[]
-  readonly accepts: readonly string[]
-}
 /**
  * Whether the host can be asked anything right now.
  *
@@ -218,12 +213,9 @@ export type MobileWebShellSessionEvent =
   /** The native view finished a document. Unstamped, like the view's failure and for the same
    *  reason: the view exists only under the generation on screen. */
   | { readonly type: 'document-loaded' }
-  /**
-   * The page said `ready` over the bridge, which is the only proof its code ran at all, carrying
-   * what that `ready` declared it reports and accepts.
-   */
-  | ({ readonly type: 'page-ready' } & PageReadyDeclaration)
-  /** The page has a frame on screen. Only a page that declared it ever sends one. */
+  /** The page said `ready` over the bridge, which is the only proof its code ran at all. */
+  | { readonly type: 'page-ready' }
+  /** The page has a frame on screen. */
   | { readonly type: 'page-painted' }
   /** The page is holding the device Back key, or has let it go. The host sends false on its own
    *  for every way a document ends, so this never has to be inferred from silence. */
@@ -251,9 +243,6 @@ export type MobileWebShellSession = {
   /** Whether the document on screen has spoken over the bridge. Cleared by every new document,
    *  because each one has to prove itself: the last one's word says nothing about this one. */
   readonly pageReady: boolean
-  /** Whether this document said it would report its first paint. Cleared with `pageReady`, and
-   *  false for every page built before the report existed. */
-  readonly pageReportsPaint: boolean
   /** Whether this document has reported a frame on screen. Cleared with `pageReady`. */
   readonly pagePainted: boolean
   /**
@@ -264,9 +253,6 @@ export type MobileWebShellSession = {
    * with it, which is a key that does nothing at all.
    */
   readonly pageBackClaimed: boolean
-  /** Whether this document pads for the system bars itself, so the view may go edge-to-edge.
-   *  Cleared with `pageReady`, and false for every page built before the declaration existed. */
-  readonly pageOwnsSafeArea: boolean
   /** The gates the current step was taken on; null until the first one arrives. */
   readonly gates: MobileWebShellGates | null
   readonly cached: CachedGeneration | null
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.test.ts b/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.test.ts
index 24f3e9a01b8d..5777cb8173f2 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.test.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.test.ts
@@ -20,7 +20,7 @@ import { MobileWebBundleFetchError } from '../transport/mobile-web-bundle-fetch-
 import { markRpcDeliveryUnknown } from '../transport/rpc-delivery-ambiguity'
 import type { RpcClient } from '../transport/rpc-client'
 import type { GenerationStore } from './generation-store'
-import { download, readManifest } from './mobile-web-shell-session-effects'
+import { download, openCache, readManifest } from './mobile-web-shell-session-effects'
 
 // The mocked operations never touch the client; they only need one to exist.
 const CLIENT: RpcClient = {
@@ -128,6 +128,27 @@ describe('the manifest read', () => {
   })
 })
 
+describe('the page version the floor reads', () => {
+  it('is carried from the host manifest to the reducer', async () => {
+    doubles.manifest = () => Promise.resolve({ manifest: { ...MANIFEST, pageVersion: 4 } })
+    const { events, send } = collect()
+    await readManifest(CLIENT, 3, send)
+    expect(events).toMatchObject([{ type: 'manifest-read', manifest: { pageVersion: 4 } }])
+  })
+
+  it('is carried from the cached manifest to the generation judged against the host', async () => {
+    const store: GenerationStore = {
+      ...storeThat(null),
+      readActiveGeneration: async () => ({
+        buildId: MANIFEST.buildId,
+        directory: 'd',
+        manifest: { ...MANIFEST, pageVersion: 4, routes: [] }
+      })
+    }
+    expect((await openCache(store, 'k'))?.compat.pageVersion).toBe(4)
+  })
+})
+
 describe('the download', () => {
   beforeEach(() => {
     doubles.fetch = () =>
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.ts b/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.ts
index 989f56bb99bf..56f3ab554d03 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.ts
@@ -40,7 +40,9 @@ export async function openCache(
           compat: {
             schemaVersion: active.manifest.schemaVersion,
             runtimeProtocolVersion: active.manifest.runtimeProtocolVersion,
-            minCompatibleRuntimeProtocolVersion: active.manifest.minCompatibleRuntimeProtocolVersion
+            minCompatibleRuntimeProtocolVersion:
+              active.manifest.minCompatibleRuntimeProtocolVersion,
+            pageVersion: active.manifest.pageVersion
           }
         }
   } catch {
@@ -78,6 +80,7 @@ export async function readManifest(
         schemaVersion: manifest.schemaVersion,
         runtimeProtocolVersion: manifest.runtimeProtocolVersion,
         minCompatibleRuntimeProtocolVersion: manifest.minCompatibleRuntimeProtocolVersion,
+        pageVersion: manifest.pageVersion,
         totalBytes: manifest.totalBytes,
         totalAssets: manifest.assets.length,
         routes: manifest.routes,
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-session-test-fixtures.ts b/mobile/src/mobile-web-shell/mobile-web-shell-session-test-fixtures.ts
index 2151597353e1..17fb655dba62 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-session-test-fixtures.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-session-test-fixtures.ts
@@ -41,6 +41,7 @@ export const MANIFEST_WIRE: MobileWebBundleManifestRead = {
   buildId: 'b'.repeat(64),
   minCompatibleRuntimeProtocolVersion: 2,
   runtimeProtocolVersion: 5,
+  pageVersion: 1,
   entrypoint: 'index.html',
   totalBytes: 4096,
   assets: [
@@ -86,6 +87,7 @@ export function manifestFacts(wire: MobileWebBundleManifestRead): MobileWebShell
     schemaVersion: wire.schemaVersion,
     runtimeProtocolVersion: wire.runtimeProtocolVersion,
     minCompatibleRuntimeProtocolVersion: wire.minCompatibleRuntimeProtocolVersion,
+    pageVersion: wire.pageVersion,
     totalBytes: wire.totalBytes,
     totalAssets: wire.assets.length,
     routes: wire.routes,
@@ -103,7 +105,8 @@ export const CACHED: CachedGeneration = {
   compat: {
     schemaVersion: MANIFEST.schemaVersion,
     runtimeProtocolVersion: MANIFEST.runtimeProtocolVersion,
-    minCompatibleRuntimeProtocolVersion: MANIFEST.minCompatibleRuntimeProtocolVersion
+    minCompatibleRuntimeProtocolVersion: MANIFEST.minCompatibleRuntimeProtocolVersion,
+    pageVersion: MANIFEST.pageVersion
   }
 }
 
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-session.test.ts b/mobile/src/mobile-web-shell/mobile-web-shell-session.test.ts
index 1cf6c0914b07..a0cf5fd07742 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-session.test.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-session.test.ts
@@ -14,7 +14,6 @@ import {
   LINK_LOST,
   withoutRecord
 } from './mobile-web-shell-session-test-fixtures'
-import { BRIDGE_PAGE_PAINTED } from './bridge/bridge-page-painted'
 import { shellPageFrame } from './shell-page-frame'
 
 describe('the gates decide whether a step is taken at all', () => {
@@ -221,6 +220,25 @@ describe('the connected flow', () => {
     })
   })
 
+  it('walls a listed route whose page is older than this shell, as a desktop to update', () => {
+    for (const manifest of [
+      { ...MANIFEST, pageVersion: 0 },
+      { ...MANIFEST, pageVersion: undefined }
+    ]) {
+      const step = run(afterCacheRead(null).session, { type: 'manifest-read', manifest })
+      expect(step.session.state).toEqual({
+        kind: 'wall',
+        verdict: {
+          kind: 'blocked',
+          reason: 'bundle-incompatible',
+          side: 'desktop',
+          pageVersion: 0,
+          requiredPageVersion: 1
+        }
+      })
+    }
+  })
+
   it('tells the page which routes it may keep, so it hands the rest back', () => {
     const step = run(afterCacheRead(null).session, { type: 'manifest-read', manifest: MANIFEST })
     expect(step.session.pageRoutes).toEqual(['/h/[hostId]'])
@@ -690,11 +708,7 @@ describe('the page has to speak for the document that loaded', () => {
   })
 
   it('arms nothing when the page spoke first, because there is nothing left to wait for', () => {
-    const step = run(
-      readySession().session,
-      { type: 'page-ready', reports: [], accepts: [] },
-      { type: 'document-loaded' }
-    )
+    const step = run(readySession().session, { type: 'page-ready' }, { type: 'document-loaded' })
     expect(step.effects).toEqual([])
     expect(step.session.pageReady).toBe(true)
   })
@@ -718,7 +732,7 @@ describe('the page has to speak for the document that loaded', () => {
     const step = run(
       readySession().session,
       { type: 'document-loaded' },
-      { type: 'page-ready', reports: [], accepts: [] },
+      { type: 'page-ready' },
       { type: 'page-ready-deadline' }
     )
     expect(step.effects).toEqual([])
@@ -737,7 +751,7 @@ describe('the page has to speak for the document that loaded', () => {
   })
 
   it('makes the second document prove itself, rather than riding the first one word', () => {
-    const spoken = run(readySession().session, { type: 'page-ready', reports: [], accepts: [] })
+    const spoken = run(readySession().session, { type: 'page-ready' })
     const remounted = run(spoken.session, { type: 'remounted', sessionId: 'session-two' })
     expect(remounted.session.pageReady).toBe(false)
     expect(run(remounted.session, { type: 'document-loaded' }).effects).toEqual([
@@ -746,11 +760,7 @@ describe('the page has to speak for the document that loaded', () => {
   })
 
   it('leaves a remounted document its own wait when the first one expires late', () => {
-    const first = run(
-      readySession().session,
-      { type: 'document-loaded' },
-      { type: 'page-ready', reports: [], accepts: [] }
-    )
+    const first = run(readySession().session, { type: 'document-loaded' }, { type: 'page-ready' })
     const armed = first.session.flow
     const second = run(
       first.session,
@@ -766,7 +776,7 @@ describe('the page has to speak for the document that loaded', () => {
   })
 
   it('makes a freshly activated generation prove itself too', () => {
-    const spoken = run(readySession().session, { type: 'page-ready', reports: [], accepts: [] })
+    const spoken = run(readySession().session, { type: 'page-ready' })
     const reactivated = run(spoken.session, {
       type: 'activated',
       generationDirectory: CACHED.directory,
@@ -784,13 +794,8 @@ describe('the page has to speak for the document that loaded', () => {
  * thing that says the view is worth showing is the page saying so.
  */
 describe('the page reporting a frame on screen', () => {
-  it('records what the ready declared and keeps the frame covered until the report', () => {
-    const spoken = run(readySession().session, {
-      type: 'page-ready',
-      reports: [BRIDGE_PAGE_PAINTED],
-      accepts: []
-    })
-    expect(spoken.session.pageReportsPaint).toBe(true)
+  it('keeps the frame covered past ready until the report', () => {
+    const spoken = run(readySession().session, { type: 'page-ready' })
     expect(spoken.session.pagePainted).toBe(false)
     expect(shellPageFrame(spoken.session)).toBe('unpainted')
     const painted = run(spoken.session, { type: 'page-painted' })
@@ -798,42 +803,15 @@ describe('the page reporting a frame on screen', () => {
     expect(shellPageFrame(painted.session)).toBe('painted')
   })
 
-  it('new shell, old page: ignores an undeclared report and uncovers on ready', () => {
-    const spoken = run(readySession().session, { type: 'page-ready', reports: [], accepts: [] })
-    const step = run(spoken.session, { type: 'page-painted' })
-    expect(step.session.pagePainted).toBe(false)
-    // Uncovered anyway: `ready` is the newest word a page built before the report can say.
-    expect(shellPageFrame(step.session)).toBe('painted')
-  })
-
-  it('re-reads the declaration on every ask, because a reload asks again', () => {
-    const declared = run(readySession().session, {
-      type: 'page-ready',
-      reports: [BRIDGE_PAGE_PAINTED],
-      accepts: []
-    })
-    const reloaded = run(declared.session, { type: 'page-ready', reports: [], accepts: [] })
-    expect(reloaded.session.pageReportsPaint).toBe(false)
-  })
-
   it('makes a remounted document report its own frame', () => {
-    const painted = run(
-      readySession().session,
-      { type: 'page-ready', reports: [BRIDGE_PAGE_PAINTED], accepts: [] },
-      { type: 'page-painted' }
-    )
+    const painted = run(readySession().session, { type: 'page-ready' }, { type: 'page-painted' })
     const remounted = run(painted.session, { type: 'remounted', sessionId: 'session-two' })
     expect(remounted.session.pagePainted).toBe(false)
-    expect(remounted.session.pageReportsPaint).toBe(false)
     expect(shellPageFrame(remounted.session)).toBe('unpainted')
   })
 
   it('makes a freshly activated generation report its own frame', () => {
-    const painted = run(
-      readySession().session,
-      { type: 'page-ready', reports: [BRIDGE_PAGE_PAINTED], accepts: [] },
-      { type: 'page-painted' }
-    )
+    const painted = run(readySession().session, { type: 'page-ready' }, { type: 'page-painted' })
     const reactivated = run(painted.session, {
       type: 'activated',
       generationDirectory: CACHED.directory,
@@ -843,24 +821,15 @@ describe('the page reporting a frame on screen', () => {
       elapsedMs: 9
     })
     expect(reactivated.session.pagePainted).toBe(false)
-    expect(reactivated.session.pageReportsPaint).toBe(false)
   })
 
   it('makes the document that replaced a painted one inside this mount report its own frame', () => {
-    const painted = run(
-      readySession().session,
-      { type: 'page-ready', reports: [BRIDGE_PAGE_PAINTED], accepts: [] },
-      { type: 'page-painted' }
-    )
+    const painted = run(readySession().session, { type: 'page-ready' }, { type: 'page-painted' })
     expect(shellPageFrame(painted.session)).toBe('painted')
     // No new session and no new generation: the view reloaded under the one already on screen.
     const restarted = run(painted.session, { type: 'document-started' })
     expect(restarted.session.pagePainted).toBe(false)
-    const reasked = run(restarted.session, {
-      type: 'page-ready',
-      reports: [BRIDGE_PAGE_PAINTED],
-      accepts: []
-    })
+    const reasked = run(restarted.session, { type: 'page-ready' })
     expect(shellPageFrame(reasked.session)).toBe('unpainted')
     expect(shellPageFrame(run(reasked.session, { type: 'page-painted' }).session)).toBe('painted')
   })
@@ -869,11 +838,7 @@ describe('the page reporting a frame on screen', () => {
     const loaded = run(readySession().session, { type: 'document-loaded' })
     expect(loaded.effects).toEqual([{ kind: 'await-page-ready' }])
     const armed = loaded.session.flow
-    const spoken = run(loaded.session, {
-      type: 'page-ready',
-      reports: [BRIDGE_PAGE_PAINTED],
-      accepts: []
-    })
+    const spoken = run(loaded.session, { type: 'page-ready' })
     const restarted = run(spoken.session, { type: 'document-started' })
     // The replacement is still loading and has said nothing, which is exactly what the retired
     // document's deadline reads as a document that never loaded.
@@ -888,9 +853,9 @@ describe('the page reporting a frame on screen', () => {
   it('keeps the frame of a document that repeats its own handshake', () => {
     const painted = run(
       readySession().session,
-      { type: 'page-ready', reports: [BRIDGE_PAGE_PAINTED], accepts: [] },
+      { type: 'page-ready' },
       { type: 'page-painted' },
-      { type: 'page-ready', reports: [BRIDGE_PAGE_PAINTED], accepts: [] }
+      { type: 'page-ready' }
     )
     // The document never restarted, so its frame is still the one on screen.
     expect(painted.session.pagePainted).toBe(true)
@@ -900,8 +865,9 @@ describe('the page reporting a frame on screen', () => {
   it('records nothing from a page whose generation is no longer on screen', () => {
     const failed = run(readySession().session, {
       type: 'shell-failed',
-      reason: 'render-process-gone'
+      reason: 'document-load-failed'
     })
+    expect(failed.session.state.kind).not.toBe('ready')
     expect(run(failed.session, { type: 'page-painted' }).session.pagePainted).toBe(false)
   })
 })
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-session.ts b/mobile/src/mobile-web-shell/mobile-web-shell-session.ts
index 5a0a25b7db68..595e1d92dfdf 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-session.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-session.ts
@@ -39,10 +39,8 @@ export function createMobileWebShellSession(routePathname: string): MobileWebShe
     retriedOnce: false,
     remountedOnce: false,
     pageReady: false,
-    pageReportsPaint: false,
     pagePainted: false,
     pageBackClaimed: false,
-    pageOwnsSafeArea: false,
     gates: null,
     cached: null,
     updateNotice: null,
diff --git a/mobile/src/mobile-web-shell/page-document-state.ts b/mobile/src/mobile-web-shell/page-document-state.ts
index 935f201d346f..e2405f24591d 100644
--- a/mobile/src/mobile-web-shell/page-document-state.ts
+++ b/mobile/src/mobile-web-shell/page-document-state.ts
@@ -1,5 +1,3 @@
-import { BRIDGE_PAGE_PAINTED } from './bridge/bridge-page-painted'
-import { BRIDGE_SAFE_AREA_ACCEPT } from './bridge/bridge-safe-area-insets'
 import type {
   MobileWebShellSession,
   MobileWebShellSessionEvent
@@ -8,10 +6,8 @@ import type {
 /** Everything one document told the shell about itself, which the next one has to say again. */
 export const CLEAR_PAGE_DOCUMENT_STATE = {
   pageReady: false,
-  pageReportsPaint: false,
   pagePainted: false,
-  pageBackClaimed: false,
-  pageOwnsSafeArea: false
+  pageBackClaimed: false
 } as const
 
 /** The three things a document reports about itself, as the reducer receives them. */
@@ -25,7 +21,7 @@ export type PageDocumentEvent = Extract<
  * view exists only under the generation on screen.
  */
 export function pageDocumentStatePatch(
-  session: Pick<MobileWebShellSession, 'state' | 'pageReportsPaint'>,
+  session: Pick<MobileWebShellSession, 'state'>,
   event: PageDocumentEvent
 ): Partial<MobileWebShellSession> {
   if (session.state.kind !== 'ready') {
@@ -35,25 +31,8 @@ export function pageDocumentStatePatch(
     return { pageBackClaimed: event.claimed }
   }
   if (event.type === 'page-ready') {
-    // Re-read on every ask rather than latched: a document that reloads inside this mount asks
-    // again, and it is the newest ask that says whether a paint report is coming. The key goes with
-    // it: the host drops the claim on the same `ready`, so a page that still holds one re-claims.
-    return {
-      pageReady: true,
-      pageReportsPaint: event.reports.includes(BRIDGE_PAGE_PAINTED),
-      pageBackClaimed: false,
-      pageOwnsSafeArea: event.accepts.includes(BRIDGE_SAFE_AREA_ACCEPT)
-    }
+    // The host drops the claim on the same `ready`, so a page that still holds one re-claims.
+    return { pageReady: true, pageBackClaimed: false }
   }
-  // Kept off a page that never said it would report: acting on an unasked-for frame would make
-  // the wait depend on a name arriving instead of on a claim the page made.
-  return session.pageReportsPaint ? { pagePainted: true } : {}
-}
-
-/** Whether the shell may draw the view edge-to-edge: gated on `ready` like the Back claim, so a
- *  declaration never outlives the document on screen. */
-export function shellPageOwnsSafeArea(
-  session: Pick<MobileWebShellSession, 'state' | 'pageOwnsSafeArea'>
-): boolean {
-  return session.state.kind === 'ready' && session.pageOwnsSafeArea
+  return { pagePainted: true }
 }
diff --git a/mobile/src/mobile-web-shell/page-haptics.test.ts b/mobile/src/mobile-web-shell/page-haptics.test.ts
index 864aeb7f0073..a4abec869a30 100644
--- a/mobile/src/mobile-web-shell/page-haptics.test.ts
+++ b/mobile/src/mobile-web-shell/page-haptics.test.ts
@@ -7,7 +7,7 @@
  * `HapticFeedbackConstants` must not be written twice.
  */
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { BRIDGE_HAPTICS_KINDS, type BridgeHapticsKind } from './bridge/bridge-haptics-notify'
+import { BRIDGE_HAPTICS_KINDS } from './bridge/bridge-haptics-notify'
 
 /** Annotated rather than asserted: the platform is a two-value union and the log starts empty. */
 type MockDevice = { platform: { OS: 'ios' | 'android' }; calls: string[] }
@@ -108,10 +108,3 @@ describe('the kinds and the functions behind them', () => {
     expect(new Set(calls).size).toBe(BRIDGE_HAPTICS_KINDS.length)
   })
 })
-
-describe('the kind union', () => {
-  it('is the five the app has and nothing else', () => {
-    const kinds: readonly BridgeHapticsKind[] = BRIDGE_HAPTICS_KINDS
-    expect([...kinds]).toEqual(['mediumImpact', 'selection', 'success', 'error', 'edgeBump'])
-  })
-})
diff --git a/mobile/src/mobile-web-shell/page-safe-area-insets.test.ts b/mobile/src/mobile-web-shell/page-safe-area-insets.test.ts
index 76877567b31c..e0bd1305405b 100644
--- a/mobile/src/mobile-web-shell/page-safe-area-insets.test.ts
+++ b/mobile/src/mobile-web-shell/page-safe-area-insets.test.ts
@@ -5,22 +5,10 @@ const WINDOW = { top: 52, right: 12, bottom: 24, left: 12 }
 
 describe('the insets the page pads for', () => {
   it('is the window insets while nothing of the shell stands over the view', () => {
-    expect(pageSafeAreaInsets({ insets: WINDOW, keyboardInset: 0, topCovered: false })).toEqual(
-      WINDOW
-    )
-  })
-
-  it('has no bottom while the keyboard ends the view above the gesture bar', () => {
-    expect(pageSafeAreaInsets({ insets: WINDOW, keyboardInset: 360, topCovered: false })).toEqual({
-      ...WINDOW,
-      bottom: 0
-    })
+    expect(pageSafeAreaInsets({ insets: WINDOW, topCovered: false })).toEqual(WINDOW)
   })
 
   it('has no top while the shell banner takes the status bar strip', () => {
-    expect(pageSafeAreaInsets({ insets: WINDOW, keyboardInset: 0, topCovered: true })).toEqual({
-      ...WINDOW,
-      top: 0
-    })
+    expect(pageSafeAreaInsets({ insets: WINDOW, topCovered: true })).toEqual({ ...WINDOW, top: 0 })
   })
 })
diff --git a/mobile/src/mobile-web-shell/page-safe-area-insets.ts b/mobile/src/mobile-web-shell/page-safe-area-insets.ts
index 3b9666baca95..71da590370b1 100644
--- a/mobile/src/mobile-web-shell/page-safe-area-insets.ts
+++ b/mobile/src/mobile-web-shell/page-safe-area-insets.ts
@@ -4,26 +4,24 @@ import type { BridgeSafeAreaInsets } from './bridge/bridge-safe-area-insets'
 /**
  * The part of an edge-to-edge WebView that sits under a system bar, which is what the page pads for.
  *
- * Not the window's insets as they are: with the keyboard up the shell already ends the view at the
- * keyboard's top, so nothing of the page is under the gesture bar, and a banner the shell draws above
- * the view takes the status bar strip itself.
+ * The window's insets, as a native screen reads them with the keyboard covering it, except where
+ * the shell's banner stands above the view and takes the status bar strip itself.
  */
 export function pageSafeAreaInsets(input: {
   insets: BridgeSafeAreaInsets
-  keyboardInset: number
   topCovered: boolean
 }): BridgeSafeAreaInsets {
   const { insets } = input
   return {
     top: input.topCovered ? 0 : insets.top,
     right: insets.right,
-    bottom: input.keyboardInset > 0 ? 0 : insets.bottom,
+    bottom: insets.bottom,
     left: insets.left
   }
 }
 
-/** Hands moved insets to the page over the re-sent `init` a pane move takes: the keyboard, a
- *  rotation, or the shell's banner. Keyed on the four numbers, so a render moves nothing. */
+/** Hands moved insets to the page over the re-sent `init` a pane move takes: a rotation or the
+ *  shell's banner. Keyed on the four numbers, so a render moves nothing. */
 export function usePublishedSafeAreaInsets(
   publish: (insets: BridgeSafeAreaInsets) => void,
   insets: BridgeSafeAreaInsets
diff --git a/mobile/src/mobile-web-shell/shell-page-frame.test.ts b/mobile/src/mobile-web-shell/shell-page-frame.test.ts
index 243f5763d771..8c4d7b5b6d87 100644
--- a/mobile/src/mobile-web-shell/shell-page-frame.test.ts
+++ b/mobile/src/mobile-web-shell/shell-page-frame.test.ts
@@ -1,5 +1,4 @@
 import { describe, expect, it } from 'vitest'
-import { BRIDGE_PAGE_PAINTED } from './bridge/bridge-page-painted'
 import type { MobileWebShellSessionState } from './mobile-web-shell-session-contract'
 import { shellPageFrame } from './shell-page-frame'
 
@@ -12,18 +11,8 @@ const READY: MobileWebShellSessionState = {
   elapsedMs: 1
 }
 
-function frame(patch: {
-  state?: MobileWebShellSessionState
-  pageReady?: boolean
-  pageReportsPaint?: boolean
-  pagePainted?: boolean
-}) {
-  return shellPageFrame({
-    state: patch.state ?? READY,
-    pageReady: patch.pageReady ?? false,
-    pageReportsPaint: patch.pageReportsPaint ?? false,
-    pagePainted: patch.pagePainted ?? false
-  })
+function frame(patch: { state?: MobileWebShellSessionState; pagePainted?: boolean }) {
+  return shellPageFrame({ state: patch.state ?? READY, pagePainted: patch.pagePainted ?? false })
 }
 
 describe('how long the shell keeps its own frame up', () => {
@@ -38,33 +27,13 @@ describe('how long the shell keeps its own frame up', () => {
     }
   })
 
-  it('covers a mounted view that has said nothing, which is the whole of the page boot', () => {
+  it('covers a mounted view until the page reports a frame, handshake or not', () => {
+    // `ready` is posted before the tree is built, so the view is mounted, empty and showing the
+    // surface behind it for every frame between the two.
     expect(frame({})).toBe('unpainted')
   })
 
-  it('keeps covering a page that has handshaken and not yet painted', () => {
-    // The gap this exists for: `ready` is posted before the tree is built, so the view is mounted,
-    // empty and showing the surface behind it for every frame between the two.
-    expect(frame({ pageReady: true, pageReportsPaint: true })).toBe('unpainted')
-  })
-
-  it('new shell, new page: uncovers on the page reporting a frame', () => {
-    expect(frame({ pageReady: true, pageReportsPaint: true, pagePainted: true })).toBe('painted')
-  })
-
-  it('new shell, old page: uncovers on ready, the newest word that page will ever say', () => {
-    // A generation served by a desktop built before the report exists. Waiting on a frame it
-    // cannot send would hide a working workspace for the life of the document.
-    expect(frame({ pageReady: true, pageReportsPaint: false })).toBe('painted')
-  })
-
-  it('reads the declaration off the list the page sent, not off the shell', () => {
-    // The name is what the page puts in `ready.reports`, so the frame follows that list and not a
-    // flag the shell set: a list without it is a page whose newest word is `ready`.
-    const declared = [BRIDGE_PAGE_PAINTED].includes(BRIDGE_PAGE_PAINTED)
-    expect(frame({ pageReady: true, pageReportsPaint: declared })).toBe('unpainted')
-    expect(
-      frame({ pageReady: true, pageReportsPaint: ['other'].includes(BRIDGE_PAGE_PAINTED) })
-    ).toBe('painted')
+  it('uncovers on the page reporting a frame', () => {
+    expect(frame({ pagePainted: true })).toBe('painted')
   })
 })
diff --git a/mobile/src/mobile-web-shell/shell-page-frame.ts b/mobile/src/mobile-web-shell/shell-page-frame.ts
index 02d870a0f489..45094d9d0a0b 100644
--- a/mobile/src/mobile-web-shell/shell-page-frame.ts
+++ b/mobile/src/mobile-web-shell/shell-page-frame.ts
@@ -7,19 +7,12 @@ import type { MobileWebShellSession } from './mobile-web-shell-session-contract'
  */
 export type ShellPageFrame = 'pending' | 'unpainted' | 'painted'
 
-/**
- * Bounded by the page's declaration, never by a timer. A page that declared none is one served by
- * a desktop older than the report, and `ready` is the newest thing it will ever say: waiting on a
- * word it cannot speak would hide a working workspace for the life of the document.
- */
+/** Up until the page reports a frame of its own; every page the shell serves reports one. */
 export function shellPageFrame(
-  session: Pick<MobileWebShellSession, 'state' | 'pageReady' | 'pageReportsPaint' | 'pagePainted'>
+  session: Pick<MobileWebShellSession, 'state' | 'pagePainted'>
 ): ShellPageFrame {
   if (session.state.kind !== 'ready') {
     return 'pending'
   }
-  if (session.pagePainted) {
-    return 'painted'
-  }
-  return session.pageReportsPaint || !session.pageReady ? 'unpainted' : 'painted'
+  return session.pagePainted ? 'painted' : 'unpainted'
 }
diff --git a/mobile/src/mobile-web-shell/shell-screen-route-census.test.ts b/mobile/src/mobile-web-shell/shell-screen-route-census.test.ts
deleted file mode 100644
index 1626e3769663..000000000000
--- a/mobile/src/mobile-web-shell/shell-screen-route-census.test.ts
+++ /dev/null
@@ -1,278 +0,0 @@
-import { existsSync, readdirSync, readFileSync } from 'node:fs'
-import { dirname, join, resolve } from 'node:path'
-import ts from 'typescript-api'
-import { describe, expect, it } from 'vitest'
-
-const HOST_ROUTES = join(import.meta.dirname, '..', '..', 'app', 'h', '[hostId]')
-const PAGE_ROUTE_REGISTRY = join(
-  import.meta.dirname,
-  '..',
-  '..',
-  '..',
-  'config',
-  'scripts',
-  'mobile-web-page-routes.mjs'
-)
-
-/**
- * Every switch that hands a route to the shell asks whether the route is one the page can be
- * given, and asks it in one place.
- *
- * A route the schema refuses is dropped to `null` by `bridge-host.ts` and reaches the phone as an
- * `init` naming no screen, which the page answers with "Update Orca to open this workspace" — a
- * failure screen in place of the native screen sitting right behind the switch. Three routes had
- * each grown their own copy of the call and two had none at all, which is the state this census
- * ends: the predicate is `shellScreenRoute`, and a switch that spells it itself has a second
- * spelling of a rule that can only drift from the one the page reads.
- *
- * The walk is over the route tree rather than a list, so a route added later is held to this
- * without anyone remembering to add it here.
- */
-function hostRouteFiles(directory: string = HOST_ROUTES, prefix = ''): string[] {
-  return readdirSync(directory, { withFileTypes: true }).flatMap((entry) => {
-    const name = prefix === '' ? entry.name : `${prefix}/${entry.name}`
-    if (entry.isDirectory()) {
-      return hostRouteFiles(join(directory, entry.name), name)
-    }
-    return entry.name.endsWith('.tsx') && !entry.name.includes('.test.') ? [name] : []
-  })
-}
-
-/**
- * A route file's body: the file itself, or the module its default export comes from.
- *
- * `[...page].tsx` is the reason: expo-router 55 reads a file's platform from the first dot of its
- * stripped name, so a catch-all cannot carry a `.web.tsx` sibling under `app/` without registering
- * a second route, and its body lives under `src/` where the stem is plain. Following the export
- * keeps the walk derived from the tree rather than from a list beside it.
- *
- * Fails closed, which is the half that matters. A shape this cannot resolve is a file whose body
- * it never read, and an unread body is exactly where a switch that skips `shellScreenRoute` would
- * sit — so an unknown shape is named by the census rather than quietly treated as a non-switch.
- */
-type RouteBody =
-  | { readonly kind: 'source'; readonly text: string }
-  | { readonly kind: 'unresolved'; readonly why: string }
-
-/** The module specifier a file's default export comes from, or null when the body is local. */
-function defaultExportSource(parsed: ts.SourceFile): string | null | undefined {
-  const importedFrom = new Map<string, string>()
-  for (const statement of parsed.statements) {
-    if (ts.isImportDeclaration(statement) && ts.isStringLiteral(statement.moduleSpecifier)) {
-      const clause = statement.importClause
-      if (clause?.name !== undefined) {
-        importedFrom.set(clause.name.text, statement.moduleSpecifier.text)
-      }
-      const bindings = clause?.namedBindings
-      if (bindings !== undefined && ts.isNamedImports(bindings)) {
-        for (const element of bindings.elements) {
-          importedFrom.set(element.name.text, statement.moduleSpecifier.text)
-        }
-      }
-    }
-  }
-  for (const statement of parsed.statements) {
-    // `export { default } from 'x'`, and `export { Body as default } from 'x'`.
-    if (
-      ts.isExportDeclaration(statement) &&
-      statement.moduleSpecifier !== undefined &&
-      ts.isStringLiteral(statement.moduleSpecifier) &&
-      statement.exportClause !== undefined &&
-      ts.isNamedExports(statement.exportClause) &&
-      statement.exportClause.elements.some((element) => element.name.text === 'default')
-    ) {
-      return statement.moduleSpecifier.text
-    }
-    if (ts.isExportAssignment(statement) && statement.isExportEquals !== true) {
-      // `export default Body` where `Body` came from an import: the body is over there. Any other
-      // expression — a function, a class, a local — is this file's own.
-      return ts.isIdentifier(statement.expression)
-        ? (importedFrom.get(statement.expression.text) ?? null)
-        : null
-    }
-    // `export default function …` / `export default class …`: the body is here.
-    if (
-      (ts.isFunctionDeclaration(statement) || ts.isClassDeclaration(statement)) &&
-      statement.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.DefaultKeyword) ===
-        true
-    ) {
-      return null
-    }
-  }
-  return undefined
-}
-
-function bodyOf(name: string): RouteBody {
-  const routeFile = join(HOST_ROUTES, name)
-  const source = readFileSync(routeFile, 'utf8')
-  const specifier = defaultExportSource(parse(source))
-  if (specifier === undefined) {
-    return { kind: 'unresolved', why: 'no default export this census recognises' }
-  }
-  if (specifier === null) {
-    return { kind: 'source', text: source }
-  }
-  if (!specifier.startsWith('.')) {
-    return { kind: 'unresolved', why: `default export comes from the package "${specifier}"` }
-  }
-  const base = resolve(dirname(routeFile), specifier)
-  for (const extension of ['.tsx', '.ts']) {
-    if (existsSync(`${base}${extension}`)) {
-      return { kind: 'source', text: readFileSync(`${base}${extension}`, 'utf8') }
-    }
-  }
-  return { kind: 'unresolved', why: `no module at "${specifier}"` }
-}
-
-/** The body text, for the rules below; an unresolved shape is caught by its own case first. */
-function read(name: string): string {
-  const body = bodyOf(name)
-  return body.kind === 'source' ? body.text : ''
-}
-
-/**
- * The one switch that hands over a route the rule refuses, on purpose.
- *
- * `web.tsx` is `__DEV__`-only and its fallback is `Redirect href="/h/<hostId>"`, not a native
- * screen. Adopting the guard there sends a `..` deep link through that redirect to the host route,
- * which this PR keeps native, so the developer lands on the host list with nothing said about why
- * the page did not open. Handed over instead, the same id reaches the bridge and comes back as the
- * host's own failure screen, which is the better verdict for a route whose whole purpose is to
- * open the page deliberately; `mobile-web-shell-route.test.tsx` pins that by name.
- *
- * Exempted here rather than silently unwalked, so the exception is read when it changes.
- */
-const HANDS_OVER_UNJUDGED = ['web.tsx']
-
-const parse = (source: string): ts.SourceFile =>
-  ts.createSourceFile('route.tsx', source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX)
-
-function importsNames(parsed: ts.SourceFile, module: string): string[] {
-  return parsed.statements.flatMap((statement) => {
-    if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier)) {
-      return []
-    }
-    if (!statement.moduleSpecifier.text.endsWith(module)) {
-      return []
-    }
-    const bindings = statement.importClause?.namedBindings
-    return bindings !== undefined && ts.isNamedImports(bindings)
-      ? bindings.elements.map((element) => element.name.text)
-      : []
-  })
-}
-
-/**
- * A switch is a route file that imports the shell screen.
- *
- * The import rather than `<MobileWebShellScreen` in the text: a switch that renders it through an
- * alias, or across a line break the formatter chose, is still a switch, and a file that only
- * mentions the name in a comment is not one.
- */
-function mountsShell(parsed: ts.SourceFile): boolean {
-  return importsNames(parsed, 'MobileWebShellScreen').includes('MobileWebShellScreen')
-}
-
-/**
- * Whether the module calls the name it imported, not merely imports it.
- *
- * An import alone is what a switch has while the call sits behind a condition that never runs, or
- * after someone deletes the call and leaves the import for the formatter to trim later. The rule
- * is that every switch asks, so the census reads the asking.
- */
-function callsName(parsed: ts.SourceFile, name: string): boolean {
-  let called = false
-  const visit = (node: ts.Node): void => {
-    if (
-      ts.isCallExpression(node) &&
-      ts.isIdentifier(node.expression) &&
-      node.expression.text === name
-    ) {
-      called = true
-    }
-    ts.forEachChild(node, visit)
-  }
-  ts.forEachChild(parsed, visit)
-  return called
-}
-
-describe('the switches that hand a route to the shell', () => {
-  const switches = hostRouteFiles().filter((name) => mountsShell(parse(read(name))))
-
-  it('walks the directory every registered route lives under', () => {
-    // The root above is written out rather than derived, so this is what ties it to the manifest:
-    // a page route outside `/h/[hostId]` would be a switch this census never reads.
-    const pathnames = [
-      ...readFileSync(PAGE_ROUTE_REGISTRY, 'utf8').matchAll(/pathname: '([^']+)'/g)
-    ].map((match) => match[1])
-    expect(pathnames.length).toBeGreaterThan(0)
-    expect(pathnames.filter((pathname) => !pathname.startsWith('/h/[hostId]'))).toEqual([])
-  })
-
-  /**
-   * Every route file's body was read, so `switches` is a census and not a sample.
-   *
-   * A shape this cannot resolve is a body it never opened, and every rule below would read that
-   * file as "not a switch" — the one answer a census must never give by default.
-   */
-  it('resolves every route file to a body, naming any shape it cannot', () => {
-    expect(
-      hostRouteFiles()
-        .map((name) => ({ name, body: bodyOf(name) }))
-        .filter((entry) => entry.body.kind === 'unresolved')
-        .map((entry) => `${entry.name}: ${entry.body.kind === 'unresolved' ? entry.body.why : ''}`)
-    ).toEqual([])
-  })
-
-  it('walks the route tree and finds them, so the rules below cannot pass vacuously', () => {
-    expect(switches.sort()).toEqual([
-      '[...page].tsx',
-      'agent-history/[worktreeId].tsx',
-      'files/[worktreeId].tsx',
-      'files/preview/[worktreeId].tsx',
-      'index.tsx',
-      'review/[worktreeId].tsx',
-      'session/[worktreeId].tsx',
-      'source-control/[worktreeId].tsx',
-      'tasks.tsx',
-      'web.tsx'
-    ])
-  })
-
-  it('asks shellScreenRoute whether the route is one the page can be given', () => {
-    // Imports it *and* calls it: an import the call no longer reaches is a switch that stopped
-    // asking while still looking like one.
-    expect(
-      switches
-        .filter((name) => !HANDS_OVER_UNJUDGED.includes(name))
-        .filter((name) => {
-          const parsed = parse(read(name))
-          return (
-            !importsNames(parsed, 'shell-screen-route').includes('shellScreenRoute') ||
-            !callsName(parsed, 'shellScreenRoute')
-          )
-        })
-    ).toEqual([])
-  })
-
-  it('reads the call rather than the import, on a fixture that has only the import', () => {
-    // The rule the case above cannot show against the tree, every switch there calling what it
-    // imports: an import with no call is named.
-    const importOnly = parse(
-      "import { shellScreenRoute } from '../../../src/mobile-web-shell/shell-screen-route'\n" +
-        "import { MobileWebShellScreen } from '../../../src/mobile-web-shell/MobileWebShellScreen'\n" +
-        'export default function Route() {\n  return <MobileWebShellScreen />\n}\n'
-    )
-    expect(mountsShell(importOnly)).toBe(true)
-    expect(importsNames(importOnly, 'shell-screen-route')).toContain('shellScreenRoute')
-    expect(callsName(importOnly, 'shellScreenRoute')).toBe(false)
-  })
-
-  it('spells the rule nowhere else, so the page and the app cannot disagree about it', () => {
-    // The copies this census ends. `shellScreenRoute` is the one caller of the schema outside the
-    // bridge, and a switch that reaches for it again is writing the second spelling back.
-    expect(switches.filter((name) => read(name).includes('BridgeInitRouteSchema'))).toEqual([])
-    // And the exemption names a switch that exists, so it cannot outlive the file it excuses.
-    expect(switches).toEqual(expect.arrayContaining(HANDS_OVER_UNJUDGED))
-  })
-})
diff --git a/mobile/src/mobile-web-shell/shell-view-keyboard-accessory.test.ts b/mobile/src/mobile-web-shell/shell-view-keyboard-accessory.test.ts
new file mode 100644
index 000000000000..56e542fd40a0
--- /dev/null
+++ b/mobile/src/mobile-web-shell/shell-view-keyboard-accessory.test.ts
@@ -0,0 +1,31 @@
+import { describe, expect, it } from 'vitest'
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+/**
+ * The iOS shell's keyboard, read off the Swift view: a property of a live WKWebView, so what is
+ * checkable here is that the view installs the fix, and the simulator proof measures its effect.
+ *
+ * iPhone 17 simulator, measured: WKWebView's form accessory bar (up, down, done) rides on the
+ * keyboard, and the keyboard event's height counts it, so the page's terminal lifted 376 pt against
+ * native's 274 and its dock stood 52 pt above the bar.
+ */
+const SHELL = join(import.meta.dirname, '..', '..', 'modules', 'orca-mobile-web-shell', 'ios')
+
+describe("the iOS WebView's keyboard", () => {
+  it('carries no form accessory bar, so the keyboard is the height a native screen reads', () => {
+    const view = readFileSync(join(SHELL, 'MobileWebShellView.swift'), 'utf8')
+    expect(view).toContain('hideKeyboardAccessoryBar(of: webView)')
+    const accessory = readFileSync(join(SHELL, 'MobileWebShellKeyboardAccessory.swift'), 'utf8')
+    expect(accessory).toContain('inputAccessoryView')
+  })
+
+  it('does not scroll the page to reveal a focused field, which the page lifts itself', () => {
+    // iPhone 17 simulator: focusing the page's commit message scrolled the whole document up, the
+    // header off screen and the bar 384 pt above the keyboard (shot ios-43).
+    const view = readFileSync(join(SHELL, 'MobileWebShellView.swift'), 'utf8')
+    expect(view).toContain('ignoreKeyboardNotifications(in: webView)')
+    const accessory = readFileSync(join(SHELL, 'MobileWebShellKeyboardAccessory.swift'), 'utf8')
+    expect(accessory).toContain('keyboardWillChangeFrameNotification')
+  })
+})
diff --git a/mobile/src/mobile-web-shell/shell-view-surface.test.ts b/mobile/src/mobile-web-shell/shell-view-surface.test.ts
deleted file mode 100644
index 7d8817147ca0..000000000000
--- a/mobile/src/mobile-web-shell/shell-view-surface.test.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { colors } from '../theme/mobile-theme'
-
-/**
- * What the WebView paints before its document does, read off both shells.
- *
- * Neither can be proven from a JVM or a Swift unit test: it is a property of a live view. What is
- * checkable is that neither shell gives the view a surface of its own, which is what makes the
- * frame behind it — the screen's own, in the app's own colours — the thing on screen.
- *
- * The two defaults differ and both are wrong. Android's WebView paints nothing under a transparent
- * background, which is fine; a WKWebView is opaque by default and paints white, so a dark app
- * opening a page flashed white for the whole of the page's boot.
- */
-const SHELL = join(import.meta.dirname, '..', '..', 'modules', 'orca-mobile-web-shell')
-
-function source(relative: string): string {
-  return readFileSync(join(SHELL, relative), 'utf8')
-}
-
-describe('what a mounted view paints before the page does', () => {
-  it('gives the Android view no surface of its own', () => {
-    const kotlin = source(
-      'android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellView.kt'
-    )
-    expect(kotlin).toContain('view.setBackgroundColor(Color.TRANSPARENT)')
-  })
-
-  it('gives the iOS view none either, which is not its default', () => {
-    const swift = source('ios/MobileWebShellView.swift')
-    expect(swift).toContain('webView.isOpaque = false')
-    expect(swift).toContain('webView.backgroundColor = .clear')
-    expect(swift).toContain('webView.scrollView.backgroundColor = .clear')
-  })
-
-  it('leaves the app surface as the one colour behind a page, and it is not black', () => {
-    // What shows through both: the screen's own root, which is where the token is read.
-    const screen = readFileSync(join(import.meta.dirname, 'MobileWebShellScreen.tsx'), 'utf8')
-    expect(screen).toContain('backgroundColor: colors.bgBase')
-    expect(colors.bgBase).not.toBe('#000000')
-  })
-})
diff --git a/mobile/src/mobile-web-shell/use-mobile-web-shell-bridge.test.ts b/mobile/src/mobile-web-shell/use-mobile-web-shell-bridge.test.ts
index 82ed511a2234..67bc07fba2c5 100644
--- a/mobile/src/mobile-web-shell/use-mobile-web-shell-bridge.test.ts
+++ b/mobile/src/mobile-web-shell/use-mobile-web-shell-bridge.test.ts
@@ -151,6 +151,7 @@ function Harness(props: {
     // Built inline on every render, as a caller writes it: the host is not rebuilt for it.
     route: { pathname: '/h/host-1' },
     safeAreaInsets: { top: 0, right: 0, bottom: 0, left: 0 },
+    keyboardInset: 0,
     pageRoutes: ['/h/[hostId]'],
     pageRouteGrants: [{ pathname: '/h/[hostId]', grants: ['navigate', 'storage'] }],
     routeGrants: [
@@ -338,7 +339,7 @@ describe('the bridge channel', () => {
 
   it("hands the page's first paint to the caller that owns the cover over the view", async () => {
     const mounted = await mount(readyState('session-one'))
-    await mounted.deliver(clientFrame({ type: 'ready', reports: [BRIDGE_PAGE_PAINTED] }))
+    await mounted.deliver(clientFrame({ type: 'ready' }))
     expect(mounted.probe.paints).toBe(0)
     await mounted.deliver(clientFrame({ type: 'notify', name: BRIDGE_PAGE_PAINTED }))
     expect(mounted.probe.paints).toBe(1)
@@ -657,13 +658,13 @@ describe('client changes', () => {
    *
    * A client swapped under a live page is not a new document: the WebView stays mounted, the
    * session id does not move, and the page neither handshakes again nor hears that anything
-   * happened. What it declared and what it is holding therefore belong to the session, the way
+   * happened. What it is holding therefore belongs to the session, the way
    * `sessionEstablished` already does — a rebuilt host that started over would answer every press
    * with "I cannot deliver this" and pop the screen out from under an open sheet.
    */
   it('keeps delivering Back to an open sheet after the host is rebuilt under it', async () => {
     const mounted = await mount(readyState('session-one'))
-    await mounted.deliver(clientFrame({ type: 'ready', accepts: [BRIDGE_BACK_FRAME] }))
+    await mounted.deliver(clientFrame({ type: 'ready' }))
     await mounted.deliver(
       clientFrame({ type: 'notify', name: BRIDGE_BACK_CLAIM_NOTIFY, claimed: true })
     )
@@ -681,47 +682,17 @@ describe('client changes', () => {
     expect(mounted.frames('session-one').slice(before)).toEqual([{ v: 1, type: BRIDGE_BACK_FRAME }])
   })
 
-  /** The other half of the same seed: a page that never said it takes a press is still one the
-   *  rebuilt host will not send to. An empty declaration is a declaration. */
-  it('sends nothing after a rebuild to a page that never declared the frame', async () => {
-    const mounted = await mount(readyState('session-one'))
-    await mounted.deliver(clientFrame({ type: 'ready' }))
-    doubles.client = createFakeRpcClient()
-    await mounted.update(readyState('session-one'))
-    const before = mounted.frames('session-one').length
-    expect(mounted.probe.view?.sendBack()).toBe(false)
-    expect(mounted.frames('session-one')).toHaveLength(before)
-  })
-
-  /** The seed is the session's, not the hook's. A different session id is a different document,
-   *  which has declared nothing and is holding nothing until it says so itself. */
-  it('carries nothing into a host built for a different session', async () => {
-    // Both mounts stand for an established session, so the rebuilt host's own pre-handshake gate
-    // is already open and the declaration is the only thing left that can refuse the press.
-    const mounted = await mount(readyState('session-one'), true)
-    await mounted.deliver(clientFrame({ type: 'ready', accepts: [BRIDGE_BACK_FRAME] }))
-    await mounted.deliver(
-      clientFrame({ type: 'notify', name: BRIDGE_BACK_CLAIM_NOTIFY, claimed: true })
-    )
-    // The control: the same rebuild inside the session does keep delivering.
-    doubles.client = createFakeRpcClient()
-    await mounted.update(readyState('session-one'))
-    expect(mounted.probe.view?.sendBack()).toBe(true)
-    await mounted.update(readyState('session-two'))
-    expect(mounted.probe.view?.sendBack()).toBe(false)
-  })
-
   /** A new document inside the same session still starts over: its own `ready` is what the host
    *  reads, and the seed is not a latch. */
   it('drops the carried claim when the next document says ready', async () => {
     const mounted = await mount(readyState('session-one'))
-    await mounted.deliver(clientFrame({ type: 'ready', accepts: [BRIDGE_BACK_FRAME] }))
+    await mounted.deliver(clientFrame({ type: 'ready' }))
     await mounted.deliver(
       clientFrame({ type: 'notify', name: BRIDGE_BACK_CLAIM_NOTIFY, claimed: true })
     )
     doubles.client = createFakeRpcClient()
     await mounted.update(readyState('session-one'))
-    await mounted.deliver(clientFrame({ type: 'ready', accepts: [BRIDGE_BACK_FRAME] }))
+    await mounted.deliver(clientFrame({ type: 'ready' }))
     expect(mounted.probe.backClaims).toEqual([true, false])
   })
 
diff --git a/mobile/src/mobile-web-shell/use-mobile-web-shell-bridge.ts b/mobile/src/mobile-web-shell/use-mobile-web-shell-bridge.ts
index 2489e1ef564c..3a55096ac32b 100644
--- a/mobile/src/mobile-web-shell/use-mobile-web-shell-bridge.ts
+++ b/mobile/src/mobile-web-shell/use-mobile-web-shell-bridge.ts
@@ -14,10 +14,7 @@ import type { BridgeSessionBack } from './bridge-host-back'
 import type { BridgeNavigateBackOutcome } from './bridge-host-contract'
 import type { BridgeNativeVerb } from './bridge/bridge-native-verbs'
 import type { BridgeErrorCapture } from './bridge/bridge-error-capture'
-import type {
-  MobileWebShellSessionState,
-  PageReadyDeclaration
-} from './mobile-web-shell-session-contract'
+import type { MobileWebShellSessionState } from './mobile-web-shell-session-contract'
 import type { PageHostSnapshot } from './use-page-host-snapshot'
 import type { PageStorageForInit } from './page-storage-keys'
 
@@ -62,6 +59,8 @@ export type MobileWebShellBridgeView = {
   readonly publishRoute: (route: BridgeInitRoute) => void
   /** Hands the mounted host moved safe-area insets; dropped with no host, as a route is. */
   readonly publishSafeAreaInsets: (insets: BridgeSafeAreaInsets) => void
+  /** Hands the mounted host a moved keyboard height; dropped with no host, as the insets are. */
+  readonly publishKeyboardInset: (height: number) => void
   /**
    * Hands the mounted host one Back press. False when there is no host, or when the document it
    * serves never said it takes one — the caller then leaves the key to the navigator.
@@ -86,6 +85,8 @@ export type MobileWebShellBridgeArgs = {
   route: BridgeInitRoute
   /** What the first `init` of a new host carries; later moves go through `publishSafeAreaInsets`. */
   safeAreaInsets: BridgeSafeAreaInsets
+  /** What the first `init` of a new host carries; later moves go through `publishKeyboardInset`. */
+  keyboardInset: number
   /** The route patterns the page keeps for itself; everything else comes back as `navigate`. */
   pageRoutes: readonly string[]
   pageRouteGrants: readonly { pathname: string; grants: readonly string[] }[]
@@ -113,10 +114,9 @@ export type MobileWebShellBridgeArgs = {
   onStorageWrite: (key: string, value: string | null) => void
   /** The page could not render the generation on screen. Reported, never recovered from here. */
   onPageFault: (error: BridgeErrorCapture) => void
-  /** The page asked for a session, and what it declared it reports. Reported so the screen can
-   *  stop waiting for it, and so it knows whether a paint report is coming. */
-  onPageReady: (ready: PageReadyDeclaration) => void
-  /** The page has a frame on screen, from a page that said it would report one. */
+  /** The page asked for a session. Reported so the screen can stop waiting for it. */
+  onPageReady: () => void
+  /** The page has a frame on screen. */
   onPagePainted: () => void
   /** The page is holding the device Back key, or has let it go. False arrives on its own for
    *  every way a document ends, so no claim outlives the page that made it. */
@@ -195,6 +195,7 @@ export function useMobileWebShellBridge(args: MobileWebShellBridgeArgs): MobileW
       sessionId,
       route: latest.route,
       safeAreaInsets: latest.safeAreaInsets,
+      keyboardInset: latest.keyboardInset,
       pageRoutes: latest.pageRoutes,
       pageRouteGrants: latest.pageRouteGrants,
       routeGrants: latest.routeGrants,
@@ -222,7 +223,7 @@ export function useMobileWebShellBridge(args: MobileWebShellBridgeArgs): MobileW
       onRouteParamClear: (param, value) => argsRef.current.onRouteParamClear(param, value),
       onRouteRefused: (issue) => argsRef.current.onRouteRefused(issue),
       onBinaryFramesDropped: (total) => argsRef.current.onBinaryFramesDropped(total),
-      onPageReady: (ready) => argsRef.current.onPageReady(ready),
+      onPageReady: () => argsRef.current.onPageReady(),
       onPagePainted: () => argsRef.current.onPagePainted(),
       onPageBackClaim: (claimed) => argsRef.current.onPageBackClaim(claimed)
     })
@@ -283,6 +284,15 @@ export function useMobileWebShellBridge(args: MobileWebShellBridgeArgs): MobileW
       },
       [buildId, client, sessionId, snapshot]
     ),
+    publishKeyboardInset: useCallback(
+      (height: number) => {
+        const mounted = hostRef.current
+        if (mounted !== null && mounted.sessionId === sessionId) {
+          mounted.host.publishKeyboardInset(height)
+        }
+      },
+      [buildId, client, sessionId, snapshot]
+    ),
     // Fenced on the session the way inbound frames are, and answering false rather than throwing
     // when there is no host: the caller is a hardware key handler, and a press it cannot forward
     // is one the navigator has to be left to answer.
diff --git a/mobile/src/mobile-web-shell/use-mobile-web-shell-session.test.ts b/mobile/src/mobile-web-shell/use-mobile-web-shell-session.test.ts
index 0787874b441f..f9ab64437887 100644
--- a/mobile/src/mobile-web-shell/use-mobile-web-shell-session.test.ts
+++ b/mobile/src/mobile-web-shell/use-mobile-web-shell-session.test.ts
@@ -41,6 +41,7 @@ const doubles = vi.hoisted((): Doubles => {
     buildId: 'b'.repeat(64),
     minCompatibleRuntimeProtocolVersion: 2,
     runtimeProtocolVersion: 5,
+    pageVersion: 1,
     entrypoint: 'index.html',
     totalBytes: 2048,
     assets: [
@@ -210,7 +211,7 @@ type Mounted = {
   /** Whether the page had spoken, as every render of the hook reported it. */
   handshakes: () => readonly boolean[]
   documentLoaded: () => void
-  pageReady: (reports?: readonly string[]) => void
+  pageReady: () => void
   timers: ReturnType<typeof createTimerSeam>
 }
 
@@ -219,7 +220,7 @@ async function mount(store: GenerationStore): Promise<Mounted> {
   const handle: {
     retry: () => void
     documentLoaded: () => void
-    pageReady: (ready: { reports: readonly string[]; accepts: readonly string[] }) => void
+    pageReady: () => void
     states: MobileWebShellSessionState[]
     handshakes: boolean[]
   } = {
@@ -262,7 +263,7 @@ async function mount(store: GenerationStore): Promise<Mounted> {
     states: () => handle.states,
     handshakes: () => handle.handshakes,
     documentLoaded: () => handle.documentLoaded(),
-    pageReady: (reports: readonly string[] = []) => handle.pageReady({ reports, accepts: [] }),
+    pageReady: () => handle.pageReady(),
     timers
   }
 }
diff --git a/mobile/src/mobile-web-shell/use-mobile-web-shell-session.ts b/mobile/src/mobile-web-shell/use-mobile-web-shell-session.ts
index da22cd69a2e2..57eea752065e 100644
--- a/mobile/src/mobile-web-shell/use-mobile-web-shell-session.ts
+++ b/mobile/src/mobile-web-shell/use-mobile-web-shell-session.ts
@@ -21,10 +21,8 @@ import type {
   MobileWebShellSessionEffect,
   MobileWebShellSessionEvent,
   MobileWebShellSessionState,
-  MobileWebShellUpdateNotice,
-  PageReadyDeclaration
+  MobileWebShellUpdateNotice
 } from './mobile-web-shell-session-contract'
-import { shellPageOwnsSafeArea } from './page-document-state'
 
 export type MobileWebShellSessionView = {
   readonly state: MobileWebShellSessionState
@@ -42,10 +40,9 @@ export type MobileWebShellSessionView = {
   readonly reportDocumentStarted: () => void
   /** The native view finished a document; starts the wait for the page's first word. */
   readonly reportDocumentLoaded: () => void
-  /** The page spoke over the bridge; ends that wait, whichever of the two arrived first. Carries
-   *  what that `ready` declared it reports, which is what says whether a paint is coming. */
-  readonly reportPageReady: (ready: PageReadyDeclaration) => void
-  /** The page has a frame on screen. Ignored for a page that never said it would report one. */
+  /** The page spoke over the bridge; ends that wait, whichever of the two arrived first. */
+  readonly reportPageReady: () => void
+  /** The page has a frame on screen. */
   readonly reportPagePainted: () => void
   /** The page took the device Back key, or let it go. */
   readonly reportPageBackClaim: (claimed: boolean) => void
@@ -62,9 +59,6 @@ export type MobileWebShellSessionView = {
   /** Whether the shell should take Back off the navigator. Projected for the same reason as
    *  `pageReady`: a claim moves nothing else, so no other value would re-render to carry it. */
   readonly backClaimed: boolean
-  /** Whether the document on screen pads for the system bars itself. Projected for the same
-   *  reason as `backClaimed`. */
-  readonly pageOwnsSafeArea: boolean
 }
 
 /**
@@ -95,9 +89,6 @@ export function useMobileWebShellSession(args: {
   const [pageReady, setPageReady] = useState(sessionRef.current.pageReady)
   const [pageFrame, setPageFrame] = useState(() => shellPageFrame(sessionRef.current))
   const [backClaimed, setBackClaimed] = useState(() => shellPageBackClaimed(sessionRef.current))
-  const [pageOwnsSafeArea, setPageOwnsSafeArea] = useState(() =>
-    shellPageOwnsSafeArea(sessionRef.current)
-  )
   const hostKey = useMemo(() => deriveHostCacheKey(hostId), [hostId])
   const startedAtRef = useRef(runtime.now())
   // Bumped by anything that invalidates work in flight; every dispatch out of an effect checks it.
@@ -121,7 +112,6 @@ export function useMobileWebShellSession(args: {
     setPageReady(stepped.session.pageReady)
     setPageFrame(shellPageFrame(stepped.session))
     setBackClaimed(shellPageBackClaimed(stepped.session))
-    setPageOwnsSafeArea(shellPageOwnsSafeArea(stepped.session))
     for (const effect of stepped.effects) {
       // Every effect of a step belongs to the flow that step produced, and its result carries that
       // number back, so a flow the session has since restarted reports into nothing.
@@ -281,12 +271,9 @@ export function useMobileWebShellSession(args: {
     dispatch(epochRef.current, { type: 'document-loaded' })
   }, [dispatch])
 
-  const reportPageReady = useCallback(
-    (ready: PageReadyDeclaration) => {
-      dispatch(epochRef.current, { type: 'page-ready', ...ready })
-    },
-    [dispatch]
-  )
+  const reportPageReady = useCallback(() => {
+    dispatch(epochRef.current, { type: 'page-ready' })
+  }, [dispatch])
 
   const reportPagePainted = useCallback(() => {
     dispatch(epochRef.current, { type: 'page-painted' })
@@ -314,7 +301,6 @@ export function useMobileWebShellSession(args: {
     reportPageReady,
     reportPagePainted,
     reportPageBackClaim,
-    backClaimed,
-    pageOwnsSafeArea
+    backClaimed
   }
 }
diff --git a/mobile/src/mobile-web-shell/use-shell-page-back.ts b/mobile/src/mobile-web-shell/use-shell-page-back.ts
index dd1ac0ac7b1c..ecf8f145f208 100644
--- a/mobile/src/mobile-web-shell/use-shell-page-back.ts
+++ b/mobile/src/mobile-web-shell/use-shell-page-back.ts
@@ -9,7 +9,7 @@ import { BackHandler, Platform } from 'react-native'
  * and posted; iOS has none, so what is taken away is the stack's swipe-back gesture — a swipe while
  * a sheet is open would leave the screen with the sheet still on it.
  *
- * Nothing is registered without a live claim, so a page too old to make one, a shell whose page has
+ * Nothing is registered without a live claim, so a page holding nothing, a shell whose page has
  * faulted, and a session between documents all keep today's behaviour: the navigator pops.
  */
 export function useShellPageBack(args: {
diff --git a/mobile/src/notifications/desktop-notification-channel.test.ts b/mobile/src/notifications/desktop-notification-channel.test.ts
index 95ff41ebe351..283f3f668d4e 100644
--- a/mobile/src/notifications/desktop-notification-channel.test.ts
+++ b/mobile/src/notifications/desktop-notification-channel.test.ts
@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import * as Notifications from 'expo-notifications'
 import { Platform } from 'react-native'
@@ -48,15 +47,3 @@ describe('ensureDesktopNotificationChannel', () => {
     await expect(ensureDesktopNotificationChannel()).rejects.toThrow('no channels')
   })
 })
-
-describe('app boot', () => {
-  it('creates the channel at startup, not only once a socket subscribes', () => {
-    // A background push can be the first thing to target 'orca-desktop', and Android
-    // drops a notification whose channel does not exist. Asserted against the source
-    // because vitest only collects src/, so app/_layout.tsx has no runtime coverage.
-    const layout = readFileSync(new URL('../../app/_layout.tsx', import.meta.url), 'utf8')
-
-    expect(layout).toContain("from '../src/notifications/desktop-notification-channel'")
-    expect(layout).toMatch(/^void ensureDesktopNotificationChannel\(\)\.catch\(/m)
-  })
-})
diff --git a/mobile/src/notifications/notification-route-coordination.test.ts b/mobile/src/notifications/notification-route-coordination.test.ts
index 6f1b8a4aeeca..a55d3809f5ff 100644
--- a/mobile/src/notifications/notification-route-coordination.test.ts
+++ b/mobile/src/notifications/notification-route-coordination.test.ts
@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs'
 import { describe, expect, it, vi } from 'vitest'
 import { getNotificationNavigationTarget } from './notification-routing'
 import {
@@ -7,8 +6,6 @@ import {
   type HostStackNavigationState
 } from '../navigation/host-stack-navigation'
 
-const rootLayoutSource = readFileSync(new URL('../../app/_layout.tsx', import.meta.url), 'utf8')
-
 function navigationHarness(initialState: HostStackNavigationState | undefined) {
   const stateListeners = new Set<() => void>()
   let state = initialState
@@ -100,20 +97,6 @@ describe('notification route coordination', () => {
   it('leaves a host-only notification as a shallow push with nothing to coordinate', () => {
     expect(getNotificationNavigationTarget({ hostId: 'host-1' })?.sessionTarget).toBeNull()
   })
-
-  it('routes notification taps through the coordinated transition, not a bare push', () => {
-    const start = rootLayoutSource.indexOf('// ─── Notification tap routing ───')
-    const end = rootLayoutSource.indexOf('// ─── End notification tap routing ───', start)
-
-    // Assert the markers first: a renamed banner would otherwise slice garbage and report a
-    // missing call instead of the real cause.
-    expect(start).toBeGreaterThanOrEqual(0)
-    expect(end).toBeGreaterThan(start)
-
-    const notificationEffect = rootLayoutSource.slice(start, end)
-    expect(notificationEffect).toContain('openNotificationRoute(target)')
-    expect(notificationEffect).not.toContain('router.push(')
-  })
 })
 
 it('reuses the current workspace screen and targets the notification pane without pushing', () => {
diff --git a/mobile/src/platform/host-os.ts b/mobile/src/platform/host-os.ts
new file mode 100644
index 000000000000..da58fbe0d1ec
--- /dev/null
+++ b/mobile/src/platform/host-os.ts
@@ -0,0 +1,8 @@
+import { Platform } from 'react-native'
+
+/** The OS a screen's keyboard and inset arithmetic is for. Natively, the one it runs on. */
+export type HostOs = 'ios' | 'android' | 'windows' | 'macos' | 'web'
+
+export function hostOs(): HostOs {
+  return Platform.OS
+}
diff --git a/mobile/src/platform/host-os.web.test.ts b/mobile/src/platform/host-os.web.test.ts
new file mode 100644
index 000000000000..fcc3d446f36b
--- /dev/null
+++ b/mobile/src/platform/host-os.web.test.ts
@@ -0,0 +1,38 @@
+// @vitest-environment happy-dom
+import { afterEach, describe, expect, it } from 'vitest'
+import { hostOs } from './host-os.web'
+
+function agent(userAgent: string, platform = '', maxTouchPoints = 0) {
+  Object.defineProperty(navigator, 'userAgent', { value: userAgent, configurable: true })
+  Object.defineProperty(navigator, 'platform', { value: platform, configurable: true })
+  Object.defineProperty(navigator, 'maxTouchPoints', { value: maxTouchPoints, configurable: true })
+}
+
+afterEach(() => agent(''))
+
+describe("the page's host OS", () => {
+  it('reads the phone off the WebView user agent', () => {
+    agent(
+      'Mozilla/5.0 (iPhone; CPU iPhone OS 26_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148'
+    )
+    expect(hostOs()).toBe('ios')
+    agent(
+      'Mozilla/5.0 (Linux; Android 17; sdk_gphone64_arm64 Build/CP1A; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/144.0 Mobile Safari/537.36'
+    )
+    expect(hostOs()).toBe('android')
+  })
+
+  it('reads an iPad that still names itself in the user agent', () => {
+    agent(
+      'Mozilla/5.0 (iPad; CPU OS 18_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148'
+    )
+    expect(hostOs()).toBe('ios')
+  })
+
+  it('takes an iPad, which reports a Mac, by its touch points', () => {
+    agent('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15', 'MacIntel', 5)
+    expect(hostOs()).toBe('ios')
+    agent('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15', 'MacIntel', 0)
+    expect(hostOs()).toBe('web')
+  })
+})
diff --git a/mobile/src/platform/host-os.web.ts b/mobile/src/platform/host-os.web.ts
new file mode 100644
index 000000000000..755cf3a2ace1
--- /dev/null
+++ b/mobile/src/platform/host-os.web.ts
@@ -0,0 +1,19 @@
+import type { HostOs } from './host-os'
+
+export type { HostOs } from './host-os'
+
+/**
+ * Web sibling: `Platform.OS` is `web` inside the shell's page, but the keyboard it lifts over is the
+ * phone's, whose height the shell reports in that OS's own terms. So the page answers the phone's
+ * OS from the WebView's user agent. iPadOS reports a Mac, which only its touch points give away.
+ */
+export function hostOs(): HostOs {
+  const agent = globalThis.navigator?.userAgent ?? ''
+  if (/iP(ad|hone|od)/.test(agent)) {
+    return 'ios'
+  }
+  if (globalThis.navigator?.platform === 'MacIntel' && globalThis.navigator.maxTouchPoints > 1) {
+    return 'ios'
+  }
+  return agent.includes('Android') ? 'android' : 'web'
+}
diff --git a/mobile/src/platform/keyboard-geometry-owner-census.test.ts b/mobile/src/platform/keyboard-geometry-owner-census.test.ts
deleted file mode 100644
index 25c90d0d1eeb..000000000000
--- a/mobile/src/platform/keyboard-geometry-owner-census.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Who may ask React Native's `Keyboard` for geometry: the keyboard seam, and one named exception.
- *
- * react-native-web's `Keyboard` has no `metrics` and an `addListener` that never fires, so a page
- * screen that asks it directly either throws (a fill sheet crashed the page on `metrics()`) or waits
- * forever. The seam has a web sibling that answers from the window instead; everything else reads it.
- */
-import { readFileSync } from 'node:fs'
-import { relative } from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-import { censusSourceFiles } from '../test-support/census-source-files'
-
-const MOBILE_DIR = fileURLToPath(new URL('../../', import.meta.url))
-const SRC_DIR = fileURLToPath(new URL('../', import.meta.url))
-
-const SEAM = 'src/platform/keyboard-occlusion.ts'
-/** A one-shot "open after the keyboard hides" with a timer fallback; it subscribes only while the
- *  seam reports a keyboard, which on the page is never, so there it cannot wait forever. */
-const TAB_SHEET_AFTER_HIDE = 'src/session/use-mobile-session-terminal-send-actions.ts'
-
-const asksKeyboard = (line: string): boolean =>
-  line.includes('Keyboard.metrics(') || line.includes('Keyboard.addListener(')
-
-function callers(): string[] {
-  return censusSourceFiles(SRC_DIR)
-    .filter((file) => /\.tsx?$/.test(file) && !/\.test\.tsx?$/.test(file))
-    .filter((file) => readFileSync(file, 'utf8').split('\n').some(asksKeyboard))
-    .map((file) => relative(MOBILE_DIR, file))
-    .sort()
-}
-
-describe("React Native's Keyboard geometry", () => {
-  it('is read only by the keyboard seam and the tab sheet that waits for a hide', () => {
-    // Also the presence precondition: the seam itself must match, or the matcher is broken.
-    expect(callers()).toEqual([SEAM, TAB_SHEET_AFTER_HIDE].sort())
-  })
-})
diff --git a/mobile/src/platform/keyboard-occlusion.test.tsx b/mobile/src/platform/keyboard-occlusion.test.tsx
index 526da87f12dd..c388c775de2d 100644
--- a/mobile/src/platform/keyboard-occlusion.test.tsx
+++ b/mobile/src/platform/keyboard-occlusion.test.tsx
@@ -47,14 +47,12 @@ vi.mock('react-native', () => ({
 import {
   currentSoftKeyboardHeight,
   subscribeSoftKeyboard,
-  useKeyboardAvoidingPadding,
   useKeyboardOcclusion,
   useSoftKeyboard,
   type SoftKeyboardState
 } from './keyboard-occlusion'
 
 let lift = 0
-let padding = 0
 let keyboardState: SoftKeyboardState = { height: 0, visible: false }
 
 function Harness(): null {
@@ -62,12 +60,6 @@ function Harness(): null {
   return null
 }
 
-/** Separate, so the padding case measures the padding hook's own subscriptions and nothing else. */
-function PaddingHarness(): null {
-  padding = useKeyboardAvoidingPadding()
-  return null
-}
-
 function StateHarness(): null {
   keyboardState = useSoftKeyboard()
   return null
@@ -94,7 +86,6 @@ describe('the keyboard the phone reports', () => {
     keyboard.addListenerCalls = 0
     keyboard.metrics = undefined
     lift = 0
-    padding = 0
     keyboardState = { height: 0, visible: false }
   })
 
@@ -137,17 +128,6 @@ describe('the keyboard the phone reports', () => {
     expect(keyboard.removed.sort()).toEqual(['keyboardWillHide', 'keyboardWillShow'])
   })
 
-  it('asks a phone for no composer padding, because KeyboardAvoidingView already moved it', async () => {
-    // Rendered, not called: a hook read outside a component measures whatever the module does at
-    // the top of its body and nothing its effects do, which is where a subscription would live.
-    // And it subscribes to nothing doing it, so a composer that calls this renders as often as it
-    // does today — which is what makes adding the call to a shared component safe.
-    await mountComponent(PaddingHarness)
-    expect(padding).toBe(0)
-    expect(keyboard.addListenerCalls).toBe(0)
-    expect(keyboard.listeners.size).toBe(0)
-  })
-
   it('answers both facts from one subscription, so a screen wanting each pays for one', async () => {
     // The session screen reads the height to lift its dock and the flag to hold off the terminal
     // refit. Two hooks would mean two listener pairs and two renders per keyboard event.
diff --git a/mobile/src/platform/keyboard-occlusion.ts b/mobile/src/platform/keyboard-occlusion.ts
index 6b0fc0deb2b5..aa952871d984 100644
--- a/mobile/src/platform/keyboard-occlusion.ts
+++ b/mobile/src/platform/keyboard-occlusion.ts
@@ -1,5 +1,6 @@
 import { useEffect, useState } from 'react'
-import { Keyboard, Platform } from 'react-native'
+import { Keyboard } from 'react-native'
+import { hostOs } from './host-os'
 
 /** How much of the bottom of the layout viewport it covers, and whether it is open at all. */
 export type SoftKeyboardState = { readonly height: number; readonly visible: boolean }
@@ -44,8 +45,8 @@ export function subscribeSoftKeyboard(
   onShow: (height: number, duration: number) => void,
   onHide: (duration: number) => void
 ): () => void {
-  const showEvent = Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow'
-  const hideEvent = Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide'
+  const showEvent = hostOs() === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow'
+  const hideEvent = hostOs() === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide'
   const show = Keyboard.addListener(showEvent, (event) =>
     onShow(event.endCoordinates.height, event.duration)
   )
@@ -68,17 +69,3 @@ export function currentSoftKeyboardHeight(): number {
 export function useKeyboardOcclusion(): number {
   return useSoftKeyboard().height
 }
-
-/**
- * The bottom padding a composer needs to clear the keyboard, which natively is none.
- *
- * `KeyboardAvoidingView` already moves the composer on a phone, so adding padding there would move
- * it twice. It is inert on the web for the same reason the `Keyboard` stub is — it is driven by
- * those events — so there the padding is the whole of the avoidance.
- *
- * A second name rather than a `Platform.OS` branch at the call site: this one subscribes to nothing
- * on a phone, so a composer that asks for it renders exactly as many times as it does today.
- */
-export function useKeyboardAvoidingPadding(): number {
-  return 0
-}
diff --git a/mobile/src/platform/keyboard-occlusion.web.test.tsx b/mobile/src/platform/keyboard-occlusion.web.test.tsx
index 11e96afff8fa..b6bae0e85476 100644
--- a/mobile/src/platform/keyboard-occlusion.web.test.tsx
+++ b/mobile/src/platform/keyboard-occlusion.web.test.tsx
@@ -5,9 +5,9 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import {
   currentSoftKeyboardHeight,
   subscribeSoftKeyboard,
-  useKeyboardAvoidingPadding,
   useKeyboardOcclusion,
   useSoftKeyboard,
+  publishShellKeyboardSource,
   type SoftKeyboardState
 } from './keyboard-occlusion.web'
 
@@ -62,11 +62,9 @@ class FakeVisualViewport extends EventTarget {
 const LAYOUT_HEIGHT = 800
 let viewport: FakeVisualViewport | null = null
 let lift = 0
-let padding = 0
 
 function Harness(): null {
   lift = useKeyboardOcclusion()
-  padding = useKeyboardAvoidingPadding()
   return null
 }
 
@@ -83,7 +81,6 @@ async function mount(): Promise<ReturnType<typeof create>> {
 
 beforeEach(() => {
   lift = 0
-  padding = 0
   viewport = new FakeVisualViewport(LAYOUT_HEIGHT)
   Object.defineProperty(window, 'innerHeight', { value: LAYOUT_HEIGHT, configurable: true })
   Object.defineProperty(window, 'visualViewport', { value: viewport, configurable: true })
@@ -189,15 +186,9 @@ describe('the keyboard the browser reports', () => {
     expect(lift).toBe(0)
   })
 
-  it('is the whole of the avoidance here, where KeyboardAvoidingView is inert', async () => {
-    await mount()
-    await act(async () => viewport?.resizeTo(464))
-    expect(padding).toBe(336)
-  })
-
   it('removes both listeners on unmount', async () => {
     const tree = await mount()
-    expect(viewport?.counts).toEqual({ resize: 2, scroll: 2 })
+    expect(viewport?.counts).toEqual({ resize: 1, scroll: 1 })
     await act(async () => tree.unmount())
     expect(viewport?.counts).toEqual({ resize: 0, scroll: 0 })
   })
@@ -237,7 +228,7 @@ describe('the keyboard as events, for a sheet', () => {
     expect(lift).toBe(0)
   })
 
-  it('stays silent when nothing is covered, which is the shell shortening the WebView', () => {
+  it('stays silent while the visual viewport covers nothing', () => {
     const calls: string[] = []
     const unsubscribe = subscribeSoftKeyboard(
       () => calls.push('show'),
@@ -262,7 +253,6 @@ describe('the keyboard as events, for a sheet', () => {
   })
 })
 
-const LAYOUT_WIDTH = 400
 let keyboardState: SoftKeyboardState = { height: 0, visible: false }
 
 function StateHarness(): null {
@@ -270,16 +260,6 @@ function StateHarness(): null {
   return null
 }
 
-function resizeWindow(width: number, height: number): void {
-  Object.defineProperty(window, 'innerWidth', { value: width, configurable: true })
-  Object.defineProperty(window, 'innerHeight', { value: height, configurable: true })
-  window.dispatchEvent(new Event('resize'))
-}
-
-/** Tracked so a case that resizes the window is not also re-rendering an earlier case's harness,
- *  which shares this file's one `keyboardState`. */
-const mountedStateHarnesses: ReturnType<typeof create>[] = []
-
 async function mountState(): Promise<ReturnType<typeof create>> {
   let tree: ReturnType<typeof create> | null = null
   await act(async () => {
@@ -288,65 +268,102 @@ async function mountState(): Promise<ReturnType<typeof create>> {
   if (tree === null) {
     throw new Error('the harness did not mount')
   }
-  mountedStateHarnesses.push(tree)
   return tree
 }
 
-/**
- * The shell shortens the WebView to sit above the IME, so by the time the page measures itself
- * nothing is covered and `visualViewport` reads full height. The resize is what is left.
- */
-describe('the keyboard the page cannot see, because the shell already moved it', () => {
-  beforeEach(() => {
-    act(() => {
-      for (const tree of mountedStateHarnesses.splice(0)) {
-        tree.unmount()
+/** The shell's side of the bridge, as the entry publishes it: the height `init` last carried. */
+function createShellKeyboard(initial = 0) {
+  let height = initial
+  const listeners = new Set<(height: number) => void>()
+  return {
+    source: {
+      read: () => height,
+      subscribe: (listener: (height: number) => void) => {
+        listeners.add(listener)
+        return () => {
+          listeners.delete(listener)
+        }
       }
-    })
-    keyboardState = { height: 0, visible: false }
-    Object.defineProperty(window, 'innerWidth', { value: LAYOUT_WIDTH, configurable: true })
-    Object.defineProperty(window, 'innerHeight', { value: LAYOUT_HEIGHT, configurable: true })
-  })
+    },
+    move: (next: number) => {
+      height = next
+      for (const listener of listeners) {
+        listener(next)
+      }
+    },
+    listenerCount: () => listeners.size
+  }
+}
 
-  it('reads no keyboard while the window keeps the height it mounted at', async () => {
-    await mountState()
+describe('the state a native screen reads, from the browser outside the shell', () => {
+  it('is open exactly while something is covered', async () => {
+    const tree = await mountState()
     expect(keyboardState).toEqual({ height: 0, visible: false })
+    await act(async () => viewport?.resizeTo(464))
+    expect(keyboardState).toEqual({ height: 336, visible: true })
+    await act(async () => viewport?.resizeTo(LAYOUT_HEIGHT))
+    expect(keyboardState).toEqual({ height: 0, visible: false })
+    await act(async () => tree.unmount())
   })
+})
 
-  it('calls the window shortened at an unchanged width the keyboard, and covers nothing by it', async () => {
-    await mountState()
-    await act(async () => resizeWindow(LAYOUT_WIDTH, LAYOUT_HEIGHT - 336))
-    expect(keyboardState).toEqual({ height: 0, visible: true })
-  })
-
-  it('drops the flag when the window gets its height back', async () => {
-    await mountState()
-    await act(async () => resizeWindow(LAYOUT_WIDTH, LAYOUT_HEIGHT - 336))
-    await act(async () => resizeWindow(LAYOUT_WIDTH, LAYOUT_HEIGHT))
-    expect(keyboardState.visible).toBe(false)
-  })
-
-  it('reads a rotation as a new window rather than a keyboard, because the width moved too', async () => {
-    await mountState()
-    await act(async () => resizeWindow(LAYOUT_HEIGHT, LAYOUT_WIDTH))
-    expect(keyboardState.visible).toBe(false)
-    // And the shorter window is now the one the next keyboard is measured against.
-    await act(async () => resizeWindow(LAYOUT_HEIGHT, LAYOUT_WIDTH - 200))
-    expect(keyboardState.visible).toBe(true)
+/**
+ * Inside the shell the keyboard covers the page as it covers a native screen, but the page cannot
+ * measure it: the WebView's IME insets are zeroed, so `visualViewport` never moves. The shell says
+ * the height over the bridge, and every reader here answers from that.
+ */
+describe('the keyboard the shell says covers the page', () => {
+  afterEach(() => {
+    publishShellKeyboardSource(null)
   })
 
-  it('takes a window that grew as the new resting height, not as a keyboard closing twice', async () => {
-    await mountState()
-    await act(async () => resizeWindow(LAYOUT_WIDTH, LAYOUT_HEIGHT + 60))
-    expect(keyboardState.visible).toBe(false)
-    await act(async () => resizeWindow(LAYOUT_WIDTH, LAYOUT_HEIGHT))
-    expect(keyboardState.visible).toBe(true)
+  it('answers the height the shell sent, and ignores the visual viewport', async () => {
+    const shell = createShellKeyboard()
+    publishShellKeyboardSource(shell.source)
+    const tree = await mountState()
+    const lifted = await mount()
+    // Pixel_API_37: the IME opens at 312 and the suggestion strip grows it to 346.
+    for (const height of [312, 346]) {
+      await act(async () => shell.move(height))
+      expect(keyboardState).toEqual({ height, visible: true })
+      expect(lift).toBe(height)
+    }
+    await act(async () => viewport?.resizeTo(464))
+    expect(keyboardState.height).toBe(346)
+    await act(async () => shell.move(0))
+    expect(keyboardState).toEqual({ height: 0, visible: false })
+    expect(lift).toBe(0)
+    await act(async () => {
+      tree.unmount()
+      lifted.unmount()
+    })
+    expect(shell.listenerCount()).toBe(0)
   })
 
-  it('stops listening on unmount', async () => {
+  it('reads a keyboard already up at mount, which the shell sent in the first init', async () => {
+    publishShellKeyboardSource(createShellKeyboard(312).source)
+    expect(currentSoftKeyboardHeight()).toBe(312)
     const tree = await mountState()
+    expect(keyboardState).toEqual({ height: 312, visible: true })
     await act(async () => tree.unmount())
-    await act(async () => resizeWindow(LAYOUT_WIDTH, LAYOUT_HEIGHT - 336))
-    expect(keyboardState.visible).toBe(false)
+  })
+
+  it('hands a sheet each height as a show and the close as one hide', () => {
+    const shell = createShellKeyboard()
+    publishShellKeyboardSource(shell.source)
+    const calls: string[] = []
+    const unsubscribe = subscribeSoftKeyboard(
+      (height, duration) => calls.push(`show ${height} ${duration}`),
+      (duration) => calls.push(`hide ${duration}`)
+    )
+    viewport?.resizeTo(464)
+    shell.move(312)
+    shell.move(346)
+    shell.move(0)
+    shell.move(0)
+    expect(calls).toEqual(['show 312 0', 'show 346 0', 'hide 0'])
+    unsubscribe()
+    expect(shell.listenerCount()).toBe(0)
+    expect(viewport?.counts).toEqual({ resize: 0, scroll: 0 })
   })
 })
diff --git a/mobile/src/platform/keyboard-occlusion.web.ts b/mobile/src/platform/keyboard-occlusion.web.ts
index 05500f369ee0..c157f24cb4cd 100644
--- a/mobile/src/platform/keyboard-occlusion.web.ts
+++ b/mobile/src/platform/keyboard-occlusion.web.ts
@@ -1,7 +1,24 @@
 import { useEffect, useState } from 'react'
 
+/** The height the shell last said over the bridge, and a way to hear it move. */
+export type ShellKeyboardSource = {
+  read: () => number
+  subscribe: (listener: (height: number) => void) => () => void
+}
+
+let shellKeyboard: ShellKeyboardSource | null = null
+
+/**
+ * Called once by the page entry. Inside the shell the keyboard covers the page as it covers a
+ * native screen, but the WebView's IME insets are zeroed, so `visualViewport` never moves: the
+ * shell is the only thing that knows the height, and every reader below answers from it.
+ */
+export function publishShellKeyboardSource(source: ShellKeyboardSource | null): void {
+  shellKeyboard = source
+}
+
 /**
- * Web sibling: the keyboard's height as the browser reports it, which is not as an event.
+ * Outside the shell: the keyboard's height as the browser reports it, which is not as an event.
  *
  * react-native-web's `Keyboard` is a stub whose `addListener` returns a subscription that never
  * fires, so every screen waiting for `keyboardDidShow` inside the shell's page waits forever and
@@ -48,21 +65,15 @@ function visualViewport(): VisualViewport | undefined {
 }
 
 /**
- * The strip as events, with duration 0: the browser has already moved the viewport by the time it
- * says so. Inside the shell nothing fires, because the shell shortens the WebView above the IME and
- * the strip stays 0; in a plain mobile browser the keyboard overlays the page and this is the lift.
+ * The strip as events, with duration 0: the shell and the browser have both moved the keyboard by
+ * the time they say so.
  */
 export function subscribeSoftKeyboard(
   onShow: (height: number, duration: number) => void,
   onHide: (duration: number) => void
 ): () => void {
-  const viewport = visualViewport()
-  if (viewport === undefined) {
-    return () => {}
-  }
-  let open = occlusion(viewport) > 0
-  const read = (): void => {
-    const height = occlusion(viewport)
+  let open = currentSoftKeyboardHeight() > 0
+  const read = (height: number): void => {
     if (height > 0) {
       open = true
       onShow(height, 0)
@@ -71,17 +82,28 @@ export function subscribeSoftKeyboard(
       onHide(0)
     }
   }
-  viewport.addEventListener('resize', read)
-  viewport.addEventListener('scroll', read)
+  if (shellKeyboard !== null) {
+    return shellKeyboard.subscribe(read)
+  }
+  const viewport = visualViewport()
+  if (viewport === undefined) {
+    return () => {}
+  }
+  const measure = (): void => read(occlusion(viewport))
+  viewport.addEventListener('resize', measure)
+  viewport.addEventListener('scroll', measure)
 
   return () => {
-    viewport.removeEventListener('resize', read)
-    viewport.removeEventListener('scroll', read)
+    viewport.removeEventListener('resize', measure)
+    viewport.removeEventListener('scroll', measure)
   }
 }
 
 /** A keyboard already up when a composer opens gets no event at all. */
 export function currentSoftKeyboardHeight(): number {
+  if (shellKeyboard !== null) {
+    return shellKeyboard.read()
+  }
   const viewport = visualViewport()
   return viewport === undefined ? 0 : occlusion(viewport)
 }
@@ -100,50 +122,10 @@ export function useKeyboardOcclusion(): number {
   return keyboardLift
 }
 
-/**
- * On the web the padding is the whole of the avoidance: `KeyboardAvoidingView` is driven by the
- * `Keyboard` events this file exists because the page never receives.
- */
-export function useKeyboardAvoidingPadding(): number {
-  return useKeyboardOcclusion()
-}
-
-/** The sibling's shape; the two facts it answers together are measured separately here. */
+/** The sibling's shape. Open is a covered strip here: neither source reports a keyboard of 0. */
 export type SoftKeyboardState = { readonly height: number; readonly visible: boolean }
 
-/**
- * Whether a keyboard is open, which here is not what it covers: the shell shortens the WebView to
- * sit above the IME, so nothing covers the page and the occlusion above reads 0, correctly. The
- * resize is what is left of the keyboard — inside the shell's WebView the shell's own bottom
- * padding is the one thing that changes this window's height without changing its width too.
- */
-function useShortenedWindow(): boolean {
-  const [shortened, setShortened] = useState(false)
-
-  useEffect(() => {
-    // The tallest height seen at this width is the resting one; a width change is a rotation or a
-    // fold, which starts the comparison again. A page that mounts with the keyboard already up
-    // reads false until it closes once, which costs one terminal refit and no correctness.
-    let width = window.innerWidth
-    let tallest = window.innerHeight
-    const read = (): void => {
-      if (window.innerWidth !== width) {
-        width = window.innerWidth
-        tallest = window.innerHeight
-      } else if (window.innerHeight > tallest) {
-        tallest = window.innerHeight
-      }
-      setShortened(window.innerHeight < tallest)
-    }
-    read()
-    window.addEventListener('resize', read)
-
-    return () => window.removeEventListener('resize', read)
-  }, [])
-
-  return shortened
-}
-
 export function useSoftKeyboard(): SoftKeyboardState {
-  return { height: useKeyboardOcclusion(), visible: useShortenedWindow() }
+  const height = useKeyboardOcclusion()
+  return { height, visible: height > 0 }
 }
diff --git a/mobile/src/platform/keyboard-persisting-taps.ts b/mobile/src/platform/keyboard-persisting-taps.ts
new file mode 100644
index 000000000000..77185a5f2b33
--- /dev/null
+++ b/mobile/src/platform/keyboard-persisting-taps.ts
@@ -0,0 +1,6 @@
+export type KeyboardPersistingTaps = 'always' | 'handled'
+
+/** Natively a Pressable never takes focus; the ScrollView's `keyboardShouldPersistTaps` is the rule. */
+export function useKeyboardPersistingTaps(_mode: KeyboardPersistingTaps): undefined {
+  return undefined
+}
diff --git a/mobile/src/platform/keyboard-persisting-taps.web.test.ts b/mobile/src/platform/keyboard-persisting-taps.web.test.ts
new file mode 100644
index 000000000000..9bea438b4050
--- /dev/null
+++ b/mobile/src/platform/keyboard-persisting-taps.web.test.ts
@@ -0,0 +1,87 @@
+// @vitest-environment happy-dom
+/**
+ * The page's form of `keyboardShouldPersistTaps`, which react-native-web ignores.
+ *
+ * Measured on Pixel_API_37: a tap on a dock key or a session tab moves focus from the live input
+ * to the Pressable (tabindex 0) on mousedown, and the IME closes. Natively a Pressable never takes
+ * focus, so the same taps keep the keyboard up.
+ */
+import { afterEach, describe, expect, it } from 'vitest'
+import { keepTextFocusThroughTaps } from './keyboard-persisting-taps.web'
+
+function plant() {
+  const container = document.createElement('div')
+  const button = document.createElement('div')
+  button.tabIndex = 0
+  const label = document.createElement('span')
+  button.appendChild(label)
+  const gap = document.createElement('span')
+  const field = document.createElement('input')
+  container.append(button, gap, field)
+  const liveInput = document.createElement('input')
+  document.body.append(container, liveInput)
+  return { container, label, gap, field, liveInput }
+}
+
+/** Whether a mousedown on `target` was kept from moving focus. */
+function pressKeepsFocus(target: Element): boolean {
+  const event = new MouseEvent('mousedown', { bubbles: true, cancelable: true })
+  target.dispatchEvent(event)
+  return event.defaultPrevented
+}
+
+afterEach(() => {
+  document.body.innerHTML = ''
+})
+
+describe('keepTextFocusThroughTaps', () => {
+  it("keeps a text field's focus through a tap on a pressable, in both modes", () => {
+    for (const mode of ['always', 'handled'] as const) {
+      const { container, label, liveInput } = plant()
+      const release = keepTextFocusThroughTaps(container, mode)
+      liveInput.focus()
+      expect(pressKeepsFocus(label), mode).toBe(true)
+      release()
+      document.body.innerHTML = ''
+    }
+  })
+
+  it('lets a tap on nothing pressable dismiss only when taps are handled', () => {
+    const always = plant()
+    keepTextFocusThroughTaps(always.container, 'always')
+    always.liveInput.focus()
+    expect(pressKeepsFocus(always.gap)).toBe(true)
+    document.body.innerHTML = ''
+
+    const handled = plant()
+    keepTextFocusThroughTaps(handled.container, 'handled')
+    handled.liveInput.focus()
+    expect(pressKeepsFocus(handled.gap)).toBe(false)
+  })
+
+  it('leaves focus alone when no text field holds it, or when the tap is on a text field', () => {
+    const { container, label, field, liveInput } = plant()
+    keepTextFocusThroughTaps(container, 'always')
+    expect(pressKeepsFocus(label)).toBe(false)
+    liveInput.focus()
+    expect(pressKeepsFocus(field)).toBe(false)
+  })
+
+  it('does not count a focusable ancestor above the container as a pressable in the bar', () => {
+    const outer = document.createElement('div')
+    outer.tabIndex = 0
+    const { container, gap, liveInput } = plant()
+    outer.append(container)
+    document.body.prepend(outer)
+    keepTextFocusThroughTaps(container, 'handled')
+    liveInput.focus()
+    expect(pressKeepsFocus(gap)).toBe(false)
+  })
+
+  it('stops when released', () => {
+    const { container, label, liveInput } = plant()
+    keepTextFocusThroughTaps(container, 'always')()
+    liveInput.focus()
+    expect(pressKeepsFocus(label)).toBe(false)
+  })
+})
diff --git a/mobile/src/platform/keyboard-persisting-taps.web.ts b/mobile/src/platform/keyboard-persisting-taps.web.ts
new file mode 100644
index 000000000000..ae05cf0355f5
--- /dev/null
+++ b/mobile/src/platform/keyboard-persisting-taps.web.ts
@@ -0,0 +1,56 @@
+import { useCallback, useRef } from 'react'
+import type { KeyboardPersistingTaps } from './keyboard-persisting-taps'
+
+export type { KeyboardPersistingTaps } from './keyboard-persisting-taps'
+
+function isTextField(element: Element | null): boolean {
+  if (!(element instanceof HTMLElement)) {
+    return false
+  }
+  return (
+    element instanceof HTMLInputElement ||
+    element instanceof HTMLTextAreaElement ||
+    element.isContentEditable
+  )
+}
+
+/** A focusable element between the tap and the container; an ancestor above it is not in the bar. */
+function isPressableInside(container: HTMLElement, target: Element): boolean {
+  const pressable = target.closest('[tabindex]:not([tabindex="-1"])')
+  return pressable !== null && pressable !== container && container.contains(pressable)
+}
+
+/**
+ * `keyboardShouldPersistTaps` for the page: react-native-web ignores it, and a Pressable there is a
+ * focusable element that takes focus on mousedown, which blurs the text field and closes the IME.
+ * `handled` keeps focus only for a tap on something pressable; `always` for any tap.
+ */
+export function keepTextFocusThroughTaps(
+  container: HTMLElement,
+  mode: KeyboardPersistingTaps
+): () => void {
+  const onMouseDown = (event: MouseEvent) => {
+    const target = event.target instanceof Element ? event.target : null
+    if (!isTextField(document.activeElement) || !target || isTextField(target)) {
+      return
+    }
+    if (mode === 'handled' && !isPressableInside(container, target)) {
+      return
+    }
+    event.preventDefault()
+  }
+  container.addEventListener('mousedown', onMouseDown, true)
+  return () => container.removeEventListener('mousedown', onMouseDown, true)
+}
+
+/** A ref for the View that holds the taps; on the page that View is its DOM element. */
+export function useKeyboardPersistingTaps(mode: KeyboardPersistingTaps) {
+  const releaseRef = useRef<(() => void) | null>(null)
+  return useCallback(
+    (node: unknown) => {
+      releaseRef.current?.()
+      releaseRef.current = node instanceof HTMLElement ? keepTextFocusThroughTaps(node, mode) : null
+    },
+    [mode]
+  )
+}
diff --git a/mobile/src/platform/microphone-screen-lock-census.test.ts b/mobile/src/platform/microphone-screen-lock-census.test.ts
deleted file mode 100644
index 992918930e43..000000000000
--- a/mobile/src/platform/microphone-screen-lock-census.test.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Who may name the screen: one module, and nothing on the page.
- *
- * The screen a dictation holds awake is a property of the microphone, so the device module that
- * opens the mic takes it and gives it back. Everything above that — the composer's five states, the
- * pending-audio budget, where a transcript is routed — has no business naming it, and the page has
- * no way to: the verb it used to ask through is gone, along with the tag pools, the timeouts and
- * the foreground re-acquire that existed to keep the page's idea of the screen and the device's
- * agreeing.
- *
- * A census rather than a rule in a reviewer's head, because the seam grew back twice from exactly
- * the shape this forbids: a page that can ask for a wake tag acquires the bookkeeping to track what
- * it asked for. Existence, not shape — any import of the package, and any mention of the verb's
- * name at all, from any file but the one owner.
- */
-import { readFileSync, readdirSync } from 'node:fs'
-import { relative, join } from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-
-const MOBILE_DIR = fileURLToPath(new URL('../../', import.meta.url))
-
-/** The one module that may hold the screen: the device calls the microphone's capture makes. */
-const SCREEN_LOCK_OWNER = 'src/platform/native-audio-device.ts'
-
-/** This file names both things it forbids, so it reads every file but itself. */
-const CENSUS = 'src/platform/microphone-screen-lock-census.test.ts'
-
-const KEEP_AWAKE_PACKAGE = 'expo-keep-awake'
-
-/** Built rather than written, so the census does not contain the word it bans. */
-const RETIRED_VERB_WORD = `wake${'lock'}`
-
-function sourceFiles(): string[] {
-  const found: string[] = []
-  const walk = (dir: string): void => {
-    for (const entry of readdirSync(dir, { withFileTypes: true })) {
-      const full = join(dir, entry.name)
-      if (entry.isDirectory()) {
-        walk(full)
-        continue
-      }
-      if (entry.name.endsWith('.ts') || entry.name.endsWith('.tsx')) {
-        found.push(relative(MOBILE_DIR, full))
-      }
-    }
-  }
-  for (const root of ['src', 'app']) {
-    walk(join(MOBILE_DIR, root))
-  }
-  return found.sort()
-}
-
-/** The line, not just the file: a census that answers "somewhere in 1,400 files" is one a reader
- *  has to re-run by hand before they can act on it. */
-function hits(match: (line: string) => boolean, skip: readonly string[]): string[] {
-  const found: string[] = []
-  for (const file of sourceFiles()) {
-    if (skip.includes(file)) {
-      continue
-    }
-    const lines = readFileSync(join(MOBILE_DIR, file), 'utf8').split('\n')
-    for (const [index, line] of lines.entries()) {
-      if (match(line)) {
-        found.push(`${file}:${index + 1}: ${line.trim()}`)
-      }
-    }
-  }
-  return found
-}
-
-/** An import of the package, which is a module that can hold the screen. A test's `vi.mock` of it
- *  is not one: the mock exists because the graph reaches the owner, which is the rule holding. */
-const importsKeepAwake = (line: string): boolean =>
-  line.includes(`from '${KEEP_AWAKE_PACKAGE}'`) || line.includes(`require('${KEEP_AWAKE_PACKAGE}')`)
-
-const namesRetiredVerb = (line: string): boolean =>
-  line.toLowerCase().includes(RETIRED_VERB_WORD.toLowerCase())
-
-describe('the one module that may hold the screen awake', () => {
-  it('is the only one that imports the keep-awake package', () => {
-    expect(hits(importsKeepAwake, [SCREEN_LOCK_OWNER, CENSUS])).toEqual([])
-  })
-
-  it('does import it, so the absence above is the rule holding and not the match missing', () => {
-    // The presence precondition every absence needs: the matcher finds the one file that should
-    // match, so a typo in the package name fails here rather than passing everywhere.
-    expect(hits(importsKeepAwake, [CENSUS]).map((hit) => hit.split(':')[0])).toEqual([
-      SCREEN_LOCK_OWNER
-    ])
-  })
-
-  it('leaves no page-facing name for the screen anywhere in the app', () => {
-    // The retired verb, in any casing: a grant row, a schema, a server, a tag, a mock or a comment
-    // pointing at a seam that no longer exists.
-    expect(hits(namesRetiredVerb, [CENSUS])).toEqual([])
-  })
-
-  it('reads a tree big enough for those absences to mean something', () => {
-    // A walk that found nothing would pass all three rules above by having nothing to judge.
-    expect(sourceFiles().length).toBeGreaterThan(900)
-    expect(sourceFiles()).toContain(SCREEN_LOCK_OWNER)
-  })
-})
diff --git a/mobile/src/platform/software-keyboard-window-inset.test.ts b/mobile/src/platform/software-keyboard-window-inset.test.ts
deleted file mode 100644
index b458993d0eaa..000000000000
--- a/mobile/src/platform/software-keyboard-window-inset.test.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { softwareKeyboardWindowInset } from './software-keyboard-window-inset'
-
-describe('the strip of the window the software keyboard takes', () => {
-  it('is nothing while the keyboard is closed', () => {
-    expect(
-      softwareKeyboardWindowInset({ keyboardHeight: 0, bottomInset: 48, platform: 'android' })
-    ).toBe(0)
-  })
-
-  it('is the iOS frame height as reported, which already spans the home indicator', () => {
-    expect(
-      softwareKeyboardWindowInset({ keyboardHeight: 336, bottomInset: 34, platform: 'ios' })
-    ).toBe(336)
-  })
-
-  it('adds the navigation bar back on Android, whose IME height stops above it', () => {
-    // The session dock is the proof this split is real: it pads itself by the inset and then
-    // translates by the raw height, which lands on the keys only if Android's excludes the bar.
-    expect(
-      softwareKeyboardWindowInset({ keyboardHeight: 336, bottomInset: 48, platform: 'android' })
-    ).toBe(384)
-  })
-
-  it('takes the page host as a phone, since it is one: the shell runs no web build', () => {
-    expect(
-      softwareKeyboardWindowInset({ keyboardHeight: 300, bottomInset: 20, platform: 'web' })
-    ).toBe(320)
-  })
-
-  it('never reports a negative strip, whatever the event and the inset say', () => {
-    expect(
-      softwareKeyboardWindowInset({ keyboardHeight: -10, bottomInset: 48, platform: 'android' })
-    ).toBe(0)
-    expect(
-      softwareKeyboardWindowInset({ keyboardHeight: 336, bottomInset: -48, platform: 'android' })
-    ).toBe(336)
-  })
-})
diff --git a/mobile/src/platform/software-keyboard-window-inset.ts b/mobile/src/platform/software-keyboard-window-inset.ts
deleted file mode 100644
index 0c15bba7c2a4..000000000000
--- a/mobile/src/platform/software-keyboard-window-inset.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * The strip at the bottom of the window the software keyboard takes, for a view that owns the
- * window and has to shorten itself out of the way. The two platforms measure the IME from
- * different edges: iOS's frame height starts at the bottom of the window and already spans the
- * home indicator, Android's starts above the system bars, so only Android adds the bar back.
- */
-export function softwareKeyboardWindowInset(input: {
-  keyboardHeight: number
-  bottomInset: number
-  platform: 'ios' | 'android' | 'windows' | 'macos' | 'web'
-}): number {
-  const keyboardHeight = Math.max(0, input.keyboardHeight)
-  if (keyboardHeight === 0) {
-    return 0
-  }
-  return input.platform === 'ios' ? keyboardHeight : keyboardHeight + Math.max(0, input.bottomInset)
-}
diff --git a/mobile/src/session/MobileDiffReviewRouteScreen.tsx b/mobile/src/session/MobileDiffReviewRouteScreen.tsx
index f457bd4f64d0..58c19b19da6d 100644
--- a/mobile/src/session/MobileDiffReviewRouteScreen.tsx
+++ b/mobile/src/session/MobileDiffReviewRouteScreen.tsx
@@ -5,6 +5,7 @@ import { firstReviewParam, normalizeReviewFilterParam } from './mobile-diff-revi
 import { normalizeReviewAreaParam } from './mobile-diff-review-positioning'
 import { useMobileDiffReviewController } from './use-mobile-diff-review-controller'
 import { useForceReconnect, useHostClient } from '../transport/client-context'
+import { useHostProtocolGates } from '../components/HostProtocolGate'
 import { useRouteHandoff } from '../navigation/route-handoff'
 
 /**
@@ -51,9 +52,13 @@ export function MobileDiffReviewRouteScreen() {
     )
   }, [hostId, name, router, worktreeId])
 
+  const { hostCapabilities, statusPending, statusReadable } = useHostProtocolGates()
   const controller = useMobileDiffReviewController({
     client,
     connState,
+    hostCapabilities,
+    hostStatusPending: statusPending,
+    hostStatusReadable: statusReadable,
     hostId,
     worktreeId,
     name,
diff --git a/mobile/src/session/MobileNativeChatMessage.test.ts b/mobile/src/session/MobileNativeChatMessage.test.ts
index 67e901328667..935fe2ef0f31 100644
--- a/mobile/src/session/MobileNativeChatMessage.test.ts
+++ b/mobile/src/session/MobileNativeChatMessage.test.ts
@@ -285,3 +285,74 @@ describe('MobileNativeChatMessage', () => {
     })
   })
 })
+
+describe("MobileNativeChatMessage — a subagent's row speaks as that subagent", () => {
+  let renderer: ReactTestRenderer | null = null
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+  })
+
+  function renderAgentRow(agentId: string | undefined, subagentLabel?: string): ReactTestRenderer {
+    const message: NativeChatMessage = {
+      id: 'a1',
+      role: 'assistant',
+      blocks: [{ type: 'text', text: 'The PR is CLEAN.' }],
+      timestamp: null,
+      source: 'transcript',
+      ...(agentId === undefined ? {} : { agentId })
+    }
+    act(() => {
+      renderer = create(createElement(MobileNativeChatMessage, { message, subagentLabel }))
+    })
+    return renderer!
+  }
+
+  const captions = (tree: ReactTestRenderer): ReactTestInstance[] =>
+    tree.root
+      .findAllByType('Text' as never)
+      .filter((node) => typeof node.props.accessibilityLabel === 'string')
+
+  it('names the subagent that wrote the row', () => {
+    const [caption] = captions(renderAgentRow('task-1', 'review the PR'))
+    expect(caption?.props.accessibilityLabel).toBe('Written by subagent review the PR')
+    expect(caption?.children.join('')).toBe('review the PR')
+  })
+
+  it('still marks the row as a subagent when no loaded roster names it', () => {
+    const [caption] = captions(renderAgentRow('task-9'))
+    expect(caption?.children.join('')).toBe('Subagent')
+  })
+
+  it("adds nothing to the session's own row", () => {
+    expect(captions(renderAgentRow(undefined, 'review the PR'))).toEqual([])
+  })
+
+  it('names no one on a settled row whose only content is hidden, and names the live one', () => {
+    const toolOnly: NativeChatMessage = {
+      id: 'a2',
+      role: 'assistant',
+      blocks: [{ type: 'tool-call', name: 'Grep', input: {}, state: 'completed' }],
+      timestamp: null,
+      source: 'transcript',
+      agentId: 'task-1'
+    }
+    const renderToolOnly = (activeTurnIsWorking: boolean): ReactTestRenderer => {
+      act(() => {
+        renderer = create(
+          createElement(MobileNativeChatMessage, {
+            message: toolOnly,
+            subagentLabel: 'review the PR',
+            structuredActivityUi: true,
+            activeTurnIsWorking
+          })
+        )
+      })
+      return renderer!
+    }
+    expect(captions(renderToolOnly(false))).toEqual([])
+    act(() => renderer?.unmount())
+    expect(captions(renderToolOnly(true))).toHaveLength(1)
+  })
+})
diff --git a/mobile/src/session/MobileNativeChatMessage.tsx b/mobile/src/session/MobileNativeChatMessage.tsx
index 9b480fdd7d90..a2f14196e362 100644
--- a/mobile/src/session/MobileNativeChatMessage.tsx
+++ b/mobile/src/session/MobileNativeChatMessage.tsx
@@ -4,6 +4,8 @@ import { Image, Text as NativeText, View } from 'react-native'
 import { splitNativeChatBlocks } from '../../../src/shared/native-chat-tool-fold'
 import { selectActiveToolCall } from '../../../src/shared/native-chat-tool-activity'
 import { isImageRefBlock, isTextBlock } from '../../../src/shared/native-chat-types'
+import { agentJournalItemSubagentId } from '../../../src/shared/agent-session-journal-producer'
+import { NATIVE_CHAT_SUBAGENT_ATTRIBUTION_COPY } from '../../../src/shared/native-chat-subagent-attribution'
 import type { NativeChatBlock, NativeChatMessage } from '../../../src/shared/native-chat-types'
 import { MobileMarkdown } from '../components/MobileMarkdown'
 import { MobileNativeChatTurnStatus } from './MobileNativeChatTurnStatus'
@@ -71,19 +73,23 @@ function MobileNativeChatMessageImpl({
   fontScale = 1,
   onOpenFile,
   turnStatus,
+  turnStatusAbove = false,
   turnExpanded,
   turnKey,
   onToggleTurn,
   activeTurnIsWorking,
-  structuredActivityUi = false
+  structuredActivityUi = false,
+  subagentLabel
 }: {
   message: NativeChatMessage
   toolsExpanded?: boolean
   /** Multiplies all chat text sizes for pinch-to-zoom (1 = no change). */
   fontScale?: number
   onOpenFile?: (relativePath: string) => void
-  /** This settled turn's status row, rendered under its user message. */
+  /** This turn's status row, rendered under its opening user message. */
   turnStatus?: NativeChatTurnStatus | null
+  /** Render the status above the row: its turn has no user bubble of its own. */
+  turnStatusAbove?: boolean
   /** Whether the turn caret has disclosed this turn's activity. */
   turnExpanded?: boolean
   /** Set only when this row's turn has settled and can disclose its activity. */
@@ -94,6 +100,8 @@ function MobileNativeChatMessageImpl({
   activeTurnIsWorking?: boolean
   /** Structured lane only: live tool progress plus the turn-status disclosure. */
   structuredActivityUi?: boolean
+  /** The roster's name for the subagent that wrote this row, when one names it. */
+  subagentLabel?: string
 }): React.JSX.Element {
   const isUser = message.role === 'user'
   const isReasoning = message.role === 'reasoning'
@@ -115,13 +123,50 @@ function MobileNativeChatMessageImpl({
     !turnExpanded &&
     !toolsExpanded
   const showToolRun = tools.length > 0 && !settledToolsHidden
+  // A subagent's row sits where it happened but speaks as that subagent. A row
+  // whose only content is hidden behind its settled turn names no one.
+  const subagentName =
+    isUser || agentJournalItemSubagentId(message) === null || (prose.length === 0 && !showToolRun)
+      ? null
+      : (subagentLabel ?? NATIVE_CHAT_SUBAGENT_ATTRIBUTION_COPY.unnamed)
 
+  const statusRow = turnStatus ? (
+    <MobileNativeChatTurnStatus
+      startedAt={turnStatus.startedAt}
+      workedSeconds={turnStatus.workedSeconds}
+      expanded={turnExpanded ?? false}
+      onToggleExpanded={turnKey && onToggleTurn ? () => onToggleTurn(turnKey) : undefined}
+    />
+  ) : null
   return (
     <>
+      {/* A turn with no user bubble carries its bar above its first row. */}
+      {turnStatusAbove ? statusRow : null}
       <View style={[styles.row, isUser && styles.rowUser]}>
         <View
-          style={[styles.content, isUser && styles.userBubble, isReasoning && styles.reasoning]}
+          style={[
+            styles.content,
+            isUser && styles.userBubble,
+            isReasoning && styles.reasoning,
+            subagentName !== null && styles.subagent
+          ]}
         >
+          {subagentName !== null ? (
+            <NativeText
+              style={styles.subagentCaption}
+              accessibilityLabel={
+                subagentLabel === undefined
+                  ? subagentName
+                  : NATIVE_CHAT_SUBAGENT_ATTRIBUTION_COPY.writtenBy.replaceAll(
+                      '{{value0}}',
+                      subagentLabel
+                    )
+              }
+              numberOfLines={1}
+            >
+              {subagentName}
+            </NativeText>
+          ) : null}
           {prose.map((block, index) => (
             <Prose
               key={index}
@@ -145,15 +190,7 @@ function MobileNativeChatMessageImpl({
           ) : null}
         </View>
       </View>
-      {turnStatus ? (
-        <MobileNativeChatTurnStatus
-          startedAt={turnStatus.startedAt}
-          thinking={turnStatus.thinking}
-          workedSeconds={turnStatus.workedSeconds}
-          expanded={turnExpanded ?? false}
-          onToggleExpanded={turnKey && onToggleTurn ? () => onToggleTurn(turnKey) : undefined}
-        />
-      ) : null}
+      {turnStatusAbove ? null : statusRow}
     </>
   )
 }
diff --git a/mobile/src/session/MobileNativeChatOverlay.tsx b/mobile/src/session/MobileNativeChatOverlay.tsx
index 65f25e4ea240..00598e6a9678 100644
--- a/mobile/src/session/MobileNativeChatOverlay.tsx
+++ b/mobile/src/session/MobileNativeChatOverlay.tsx
@@ -76,6 +76,8 @@ export function MobileNativeChatOverlay({
         turnIndicator={controller.nativeChatTurnIndicator}
         workingStartedAt={controller.nativeChatWorkingStartedAt}
         settledTurns={controller.nativeChatSettledTurns}
+        activeTurnOpenedBy={controller.nativeChatActiveTurnOpenedBy}
+        turnKeysByItemId={controller.nativeChatTurnKeysByItemId}
         streaming={streaming}
         onStop={controller.handleNativeChatStop}
         ask={controller.nativeChatAsk}
diff --git a/mobile/src/session/MobileNativeChatTurnStatus.test.ts b/mobile/src/session/MobileNativeChatTurnStatus.test.ts
index 6b6a1d49e070..e99412b42bf1 100644
--- a/mobile/src/session/MobileNativeChatTurnStatus.test.ts
+++ b/mobile/src/session/MobileNativeChatTurnStatus.test.ts
@@ -19,27 +19,34 @@ vi.mock('react-native', async () => {
 })
 vi.mock('lucide-react-native', () => ({ ChevronRight: 'ChevronRight' }))
 
-import { MobileNativeChatTurnStatus } from './MobileNativeChatTurnStatus'
+import {
+  MobileNativeChatTurnActivity,
+  MobileNativeChatTurnStatus
+} from './MobileNativeChatTurnStatus'
 
-describe('MobileNativeChatTurnStatus', () => {
-  let renderer: ReactTestRenderer | null = null
+const labels = (node: ReactTestInstance): string[] =>
+  node.findAllByType('Text' as never).map((text) => String(text.children.join('')))
 
-  beforeEach(() => {
-    vi.useFakeTimers()
-    vi.setSystemTime(new Date('2026-09-04T00:00:00Z'))
-  })
+const spinners = (node: ReactTestInstance): ReactTestInstance[] =>
+  node.findAllByType('ActivityIndicator' as never)
 
-  afterEach(() => {
-    act(() => renderer?.unmount())
-    renderer = null
-    vi.useRealTimers()
-  })
+let renderer: ReactTestRenderer | null = null
 
+beforeEach(() => {
+  vi.useFakeTimers()
+  vi.setSystemTime(new Date('2026-09-04T00:00:00Z'))
+})
+
+afterEach(() => {
+  act(() => renderer?.unmount())
+  renderer = null
+  vi.useRealTimers()
+})
+
+describe('MobileNativeChatTurnStatus', () => {
   function render(props: {
     startedAt: number | null
-    thinking: boolean
     workedSeconds?: number | null
-    activityText?: string | null
     expanded?: boolean
     onToggleExpanded?: () => void
   }): ReactTestRenderer {
@@ -49,49 +56,19 @@ describe('MobileNativeChatTurnStatus', () => {
     return renderer!
   }
 
-  const labels = (node: ReactTestInstance): string[] =>
-    node.findAllByType('Text' as never).map((text) => String(text.children.join('')))
-
-  const spinners = (node: ReactTestInstance): ReactTestInstance[] =>
-    node.findAllByType('ActivityIndicator' as never)
-
-  it('reads "Thinking" beside one spinner while the turn reasons', () => {
-    const tree = render({ startedAt: Date.now(), thinking: true })
-    expect(labels(tree.root)).toEqual(['Thinking'])
-    expect(spinners(tree.root)).toHaveLength(1)
-  })
-
-  it('counts up on that same single row when the turn is not reasoning', () => {
-    const startedAt = Date.now()
-    const tree = render({ startedAt, thinking: false })
+  it('counts up from the first second while the turn runs, with no spinner', () => {
+    const tree = render({ startedAt: Date.now() })
     expect(labels(tree.root)).toEqual(['Working for 0s'])
     act(() => {
       vi.advanceTimersByTime(12_000)
     })
     expect(labels(tree.root)).toEqual(['Working for 12s'])
-    expect(spinners(tree.root)).toHaveLength(1)
-  })
-
-  it('lets provider activity text beat both fallbacks and hold the clock', () => {
-    const tree = render({
-      startedAt: Date.now(),
-      thinking: true,
-      activityText: 'Running pnpm test'
-    })
-    expect(labels(tree.root)).toEqual(['Running pnpm test'])
-    expect(spinners(tree.root)).toHaveLength(1)
-    // No label consumes the duration, so nothing schedules a tick for it.
-    expect(vi.getTimerCount()).toBe(0)
+    expect(spinners(tree.root)).toHaveLength(0)
   })
 
   it('settles to a tappable "Worked for" row that toggles the turn', () => {
     const onToggleExpanded = vi.fn()
-    const tree = render({
-      startedAt: Date.now(),
-      thinking: false,
-      workedSeconds: 184,
-      onToggleExpanded
-    })
+    const tree = render({ startedAt: Date.now(), workedSeconds: 184, onToggleExpanded })
     expect(labels(tree.root)).toEqual(['Worked for 3m 4s'])
     const button = tree.root.findByType('Pressable' as never)
     expect(button.props.accessibilityLabel).toBe('Toggle turn details')
@@ -101,19 +78,46 @@ describe('MobileNativeChatTurnStatus', () => {
   })
 
   it('stays a plain row when the settled turn has nothing to disclose', () => {
-    const tree = render({ startedAt: Date.now(), thinking: false, workedSeconds: 5 })
+    const tree = render({ startedAt: Date.now(), workedSeconds: 5 })
     expect(tree.root.findAllByType('Pressable' as never)).toHaveLength(0)
     expect(labels(tree.root)).toEqual(['Worked for 5s'])
   })
 
-  it('holds no interval, and no spinner, once the turn has settled', () => {
-    const tree = render({ startedAt: Date.now(), thinking: false, workedSeconds: 5 })
+  it('holds no interval once the turn has settled', () => {
+    render({ startedAt: Date.now(), workedSeconds: 5 })
     expect(vi.getTimerCount()).toBe(0)
-    expect(spinners(tree.root)).toHaveLength(0)
+  })
+})
+
+describe('MobileNativeChatTurnActivity', () => {
+  function render(props: { thinking: boolean; activityText?: string | null }): ReactTestRenderer {
+    act(() => {
+      renderer = create(createElement(MobileNativeChatTurnActivity, props))
+    })
+    return renderer!
+  }
+
+  it('reads "Thinking" beside one spinner while the turn reasons', () => {
+    const tree = render({ thinking: true })
+    expect(labels(tree.root)).toEqual(['Thinking'])
+    expect(spinners(tree.root)).toHaveLength(1)
+  })
+
+  // The bar owns the clock; the tail line never repeats it.
+  it('reads plain "Working…" when the turn is not reasoning, and holds no timer', () => {
+    const tree = render({ thinking: false })
+    expect(labels(tree.root)).toEqual(['Working…'])
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('lets provider activity text beat both fallbacks', () => {
+    const tree = render({ thinking: true, activityText: 'Running pnpm test' })
+    expect(labels(tree.root)).toEqual(['Running pnpm test'])
+    expect(spinners(tree.root)).toHaveLength(1)
   })
 
-  it('announces the live row to assistive tech', () => {
-    const tree = render({ startedAt: Date.now(), thinking: true })
+  it('announces the live line to assistive tech', () => {
+    const tree = render({ thinking: true })
     const row = tree.root.findByType('View' as never)
     expect(row.props.accessibilityLiveRegion).toBe('polite')
     expect(row.props.accessibilityLabel).toBe('Agent is responding')
diff --git a/mobile/src/session/MobileNativeChatTurnStatus.tsx b/mobile/src/session/MobileNativeChatTurnStatus.tsx
index acf922265f66..250036852409 100644
--- a/mobile/src/session/MobileNativeChatTurnStatus.tsx
+++ b/mobile/src/session/MobileNativeChatTurnStatus.tsx
@@ -26,38 +26,28 @@ function useElapsedSeconds(startedAt: number | null, counting: boolean): number
   return counting ? nativeChatElapsedSeconds(startedAt, mountedAt, now) : 0
 }
 
-/** The per-turn status row. While the turn runs it is the one live indicator — a
- *  spinner beside what the provider says it is doing, else "Thinking", else
- *  "Working for 12s". It settles to a tappable "Worked for 3m 4s" that discloses
- *  the turn's tool activity. Desktop parity: `NativeChatTurnActivityLine` for the
- *  live row, `NativeChatWorkingStatus` for the settled one. */
+/** The turn bar under the user's message: "Working for 12s" while the turn runs,
+ *  settling in place to a tappable "Worked for 3m 4s" that discloses the turn's
+ *  tool activity. Desktop parity: `NativeChatWorkingStatus`. */
 export function MobileNativeChatTurnStatus({
   startedAt,
-  thinking,
   workedSeconds,
-  activityText,
   expanded = false,
   onToggleExpanded
 }: {
   startedAt: number | null
-  thinking: boolean
   workedSeconds?: number | null
-  /** Provider activity copy for a live turn; outranks the other two labels. */
-  activityText?: string | null
   expanded?: boolean
   onToggleExpanded?: () => void
 }): React.JSX.Element {
   const settled = workedSeconds != null
-  const counting = !settled && !thinking && !activityText?.trim()
-  const elapsedSeconds = useElapsedSeconds(startedAt, counting)
-  const label = settled
-    ? formatNativeChatTurnStatusLabel({ thinking, workedSeconds, elapsedSeconds })
-    : formatNativeChatActiveTurnLabel({ activityText, thinking, elapsedSeconds })
+  const elapsedSeconds = useElapsedSeconds(startedAt, !settled)
+  const label = formatNativeChatTurnStatusLabel({ workedSeconds, elapsedSeconds })
 
   if (settled && onToggleExpanded) {
     return (
       <Pressable
-        style={({ pressed }) => [styles.row, styles.rowSettled, pressed && styles.pressed]}
+        style={({ pressed }) => [styles.row, styles.bar, pressed && styles.pressed]}
         onPress={onToggleExpanded}
         hitSlop={6}
         accessibilityRole="button"
@@ -72,15 +62,34 @@ export function MobileNativeChatTurnStatus({
     )
   }
 
+  return (
+    <View style={[styles.row, styles.bar]}>
+      <Text style={styles.label} numberOfLines={1}>
+        {label}
+      </Text>
+    </View>
+  )
+}
+
+/** The live turn's tail line: a spinner beside what the provider says it is doing,
+ *  else "Thinking", else "Working…". The clock stays in the turn bar. Desktop
+ *  parity: `NativeChatTurnActivityLine`. */
+export function MobileNativeChatTurnActivity({
+  thinking,
+  activityText
+}: {
+  thinking: boolean
+  activityText?: string | null
+}): React.JSX.Element {
   return (
     <View
-      style={[styles.row, settled ? styles.rowSettled : null]}
+      style={styles.row}
       accessibilityLiveRegion="polite"
       accessibilityLabel={NATIVE_CHAT_TURN_STATUS_COPY.responding}
     >
-      {settled ? null : <ActivityIndicator size="small" color={colors.textMuted} />}
+      <ActivityIndicator size="small" color={colors.textMuted} />
       <Text style={styles.label} numberOfLines={1}>
-        {label}
+        {formatNativeChatActiveTurnLabel({ activityText, thinking })}
       </Text>
     </View>
   )
@@ -94,7 +103,7 @@ const styles = StyleSheet.create({
     minHeight: 28,
     paddingHorizontal: spacing.md
   },
-  rowSettled: {
+  bar: {
     borderBottomWidth: StyleSheet.hairlineWidth,
     borderBottomColor: colors.borderSubtle
   },
diff --git a/mobile/src/session/MobileNativeChatView.test.ts b/mobile/src/session/MobileNativeChatView.test.ts
index 6b80c3500aed..fa29e13c8c87 100644
--- a/mobile/src/session/MobileNativeChatView.test.ts
+++ b/mobile/src/session/MobileNativeChatView.test.ts
@@ -703,14 +703,14 @@ describe('MobileNativeChatView', () => {
       return renderer!.root.findAll((node) => node.type === 'WorkingIndicator')
     }
 
-    it('puts the live status at the turn tail and drops the three-dot indicator', async () => {
+    it('puts the clock bar under the prompt, activity at the tail, and drops the three dots', async () => {
       const folded = [userTurn('u1', 'go'), assistantTurn('a1', 'still working')]
       await render({ messages: folded, folded, structuredActivityUi: true, agentWorking: true })
       const props = rowProps('u1')
       expect(props.structuredActivityUi).toBe(true)
-      expect(props.turnStatus).toBeNull()
-      // Nothing reports reasoning, so the one live footer counts instead of guessing.
-      expect(footerProps()).toMatchObject({ thinking: false, workedSeconds: null })
+      expect(props.turnStatus).toMatchObject({ workedSeconds: null })
+      // Nothing reports reasoning, so the tail line reads plain working instead of guessing.
+      expect(footerProps()).toEqual({ thinking: false, activityText: null })
       expect(listIds().at(-1)).toBe('a1')
       expect(props.activeTurnIsWorking).toBe(true)
       expect(workingIndicators()).toHaveLength(0)
@@ -778,7 +778,7 @@ describe('MobileNativeChatView', () => {
       expect(renderer!.root.findAll((node) => node.type === testCase.cardType)).toHaveLength(1)
 
       await update(working)
-      expect(footerProps()).toMatchObject({ thinking: false, workedSeconds: null })
+      expect(footerProps()).toMatchObject({ thinking: false })
       expect(rowProps('a1').activeTurnIsWorking).toBe(true)
     })
 
@@ -791,8 +791,8 @@ describe('MobileNativeChatView', () => {
         agentWorking: true,
         turnIndicator: { thinking: true, activityText: null }
       })
-      expect(rowProps('u1').turnStatus).toBeNull()
-      expect(footerProps()).toMatchObject({ thinking: true, workedSeconds: null })
+      expect(rowProps('u1').turnStatus).toMatchObject({ workedSeconds: null })
+      expect(footerProps()).toMatchObject({ thinking: true })
     })
 
     it('hands the live row the provider activity copy that outranks its fallbacks', async () => {
@@ -838,8 +838,8 @@ describe('MobileNativeChatView', () => {
     it('settles the finished turn to a tappable duration', async () => {
       const folded = [userTurn('u1', 'go'), assistantTurn('a1', 'done')]
       await render({ messages: folded, folded, structuredActivityUi: true, agentWorking: true })
-      expect(rowProps('u1').turnStatus).toBeNull()
-      expect(footerProps()).toMatchObject({ thinking: false, workedSeconds: null })
+      expect(rowProps('u1').turnStatus).toMatchObject({ workedSeconds: null })
+      expect(footerProps()).toMatchObject({ thinking: false })
       await update({ messages: folded, folded, structuredActivityUi: true, agentWorking: false })
       const settled = rowProps('u1')
       expect(settled.turnStatus).toMatchObject({ thinking: false })
@@ -857,7 +857,7 @@ describe('MobileNativeChatView', () => {
       expect(rowProps('a1').turnStatus).toBeNull()
       // The assistant row still belongs to the live turn, so its tool row stays visible.
       expect(rowProps('a1').activeTurnIsWorking).toBe(true)
-      expect(footerProps()).toMatchObject({ workedSeconds: null })
+      expect(footerProps()).toMatchObject({ thinking: false })
     })
 
     it('does not carry a running turn clock across chat surfaces', async () => {
@@ -872,7 +872,7 @@ describe('MobileNativeChatView', () => {
           agentWorking: true,
           sendSurfaceId: 'host\0worktree\0tab-a'
         })
-        expect(footerProps()).toMatchObject({ startedAt: 1_000 })
+        expect(rowProps('u1').turnStatus).toMatchObject({ startedAt: 1_000 })
 
         vi.setSystemTime(12_000)
         const secondTab = [userTurn('u2', 'second')]
@@ -884,7 +884,7 @@ describe('MobileNativeChatView', () => {
           sendSurfaceId: 'host\0worktree\0tab-b'
         })
 
-        expect(footerProps()).toMatchObject({ startedAt: 12_000 })
+        expect(rowProps('u2').turnStatus).toMatchObject({ startedAt: 12_000 })
       } finally {
         vi.useRealTimers()
       }
diff --git a/mobile/src/session/MobileNativeChatView.tsx b/mobile/src/session/MobileNativeChatView.tsx
index 6a51601d151a..d0a6c39cba63 100644
--- a/mobile/src/session/MobileNativeChatView.tsx
+++ b/mobile/src/session/MobileNativeChatView.tsx
@@ -13,6 +13,10 @@ import { GestureDetector, GestureHandlerRootView } from 'react-native-gesture-ha
 import { ArrowDown, ChevronsDownUp, ChevronsUpDown, Square } from 'lucide-react-native'
 import type { AskAnswerSelection, AskPrompt } from '../../../src/shared/native-chat-ask'
 import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
+import {
+  nativeChatSubagentLabel,
+  nativeChatSubagentLabels
+} from '../../../src/shared/native-chat-subagent-attribution'
 import type {
   NativeChatLiveTurnIndicator,
   NativeChatSettledTurns
@@ -28,7 +32,7 @@ import { useMobileNativeChatPinchGesture } from './use-mobile-native-chat-pinch-
 import { useMobileNativeChatTailFollow } from './use-mobile-native-chat-tail-follow'
 import { useMobileNativeChatTurnDisclosure } from './use-mobile-native-chat-turn-disclosure'
 import { useSettledMobileNativeChatInputLock } from './use-mobile-native-chat-input-lease'
-import { MobileNativeChatTurnStatus } from './MobileNativeChatTurnStatus'
+import { MobileNativeChatTurnActivity } from './MobileNativeChatTurnStatus'
 import { MobileAgentWorkingIndicator } from './MobileAgentWorkingIndicator'
 import type { PendingNativeChatImage } from './mobile-native-chat-image-attachment'
 import { MobileNativeChatComposer } from './MobileNativeChatComposer'
@@ -62,6 +66,10 @@ type Props = {
   /** Structured lane: host-recorded turn timing feeding the per-turn status rows. */
   workingStartedAt?: number | null
   settledTurns?: NativeChatSettledTurns | null
+  /** Structured lane: the key the host says anchors the running turn's bar. */
+  activeTurnOpenedBy?: string | null
+  /** Structured lane: host-attributed turn ownership per journal item id. */
+  turnKeysByItemId?: ReadonlyMap<string, string> | null
   /** Interrupt the agent mid-turn (shown as a Stop button on the working bar). */
   /** Interrupt a provider turn. */
   onStop?: () => void
@@ -147,6 +155,8 @@ export function MobileNativeChatView({
   turnIndicator = null,
   workingStartedAt,
   settledTurns,
+  activeTurnOpenedBy = null,
+  turnKeysByItemId = null,
   onStop,
   streaming,
   hasMore,
@@ -209,6 +219,7 @@ export function MobileNativeChatView({
       }),
     [messages, folded, streaming, pending, imagePreviewsByMessageId]
   )
+  const subagentLabels = useMemo(() => nativeChatSubagentLabels(messages), [messages])
   const {
     listRef,
     showJumpToTail,
@@ -265,6 +276,8 @@ export function MobileNativeChatView({
     isWorking: agentWorking === true,
     workingStartedAt,
     settledTurns,
+    activeTurnOpenedBy,
+    turnKeysByItemId,
     thinking: turnIndicator?.thinking === true,
     activityText: turnIndicator?.activityText ?? null,
     scopeKey: sendSurfaceId
@@ -281,10 +294,11 @@ export function MobileNativeChatView({
         onOpenFile={onOpenFile}
         structuredActivityUi={structuredActivityUi}
         onToggleTurn={turns.onToggleTurn}
+        subagentLabel={nativeChatSubagentLabel(subagentLabels, item)}
         {...turns.resolveRow(index, item)}
       />
     ),
-    [toolsExpanded, fontScale, onOpenFile, structuredActivityUi, turns]
+    [toolsExpanded, fontScale, onOpenFile, structuredActivityUi, subagentLabels, turns]
   )
 
   const emptyState = mobileNativeChatEmptyState(status, agent ?? null, error)
@@ -338,10 +352,8 @@ export function MobileNativeChatView({
                 agentWorking &&
                 !hasPendingStructuredInteraction &&
                 turns.active ? (
-                  <MobileNativeChatTurnStatus
-                    startedAt={turns.active.startedAt}
+                  <MobileNativeChatTurnActivity
                     thinking={turns.active.thinking}
-                    workedSeconds={turns.active.workedSeconds}
                     activityText={turns.activeActivityText}
                   />
                 ) : null
diff --git a/mobile/src/session/MobileSessionActiveContent.tsx b/mobile/src/session/MobileSessionActiveContent.tsx
index 83cabe1c372d..9c4f0eb313fe 100644
--- a/mobile/src/session/MobileSessionActiveContent.tsx
+++ b/mobile/src/session/MobileSessionActiveContent.tsx
@@ -32,8 +32,6 @@ export function MobileSessionActiveContent({
     setShowCreateTabDrawer,
     dictationMode,
     toastMessage,
-    terminalFrameHeightRef,
-    setTerminalFrameWidth,
     handleTerminalTap,
     browserScreencastSupported,
     showToast,
@@ -53,9 +51,10 @@ export function MobileSessionActiveContent({
     copyMarkdownLocalContent,
     discardMarkdownLocalContent,
     saveMarkdownTab,
-    notifyTerminalFrameHeight,
     setTerminalWebViewRef,
     handleTerminalWebReady,
+    notifyTerminalFrame,
+    notifyTerminalCellBoxChange,
     handleFileTap,
     handleNativeChatFileTap,
     handleTerminalOpenUrl,
@@ -81,7 +80,7 @@ export function MobileSessionActiveContent({
     toastAnimatedStyle,
     createTabBusy
   } = controller
-  return showLoadingState ? (
+  const content = showLoadingState ? (
     <View style={styles.emptyState}>
       <ActivityIndicator size="small" color={colors.textSecondary} />
     </View>
@@ -192,19 +191,7 @@ export function MobileSessionActiveContent({
       )}
     </View>
   ) : (
-    <View
-      // Why: react-native-web observes onLayout only on a View that mounts with it; unkeyed, this reuses the loading View and never reports.
-      key="terminal-frame"
-      style={styles.terminalFrame}
-      onLayout={(e) => {
-        terminalFrameHeightRef.current = e.nativeEvent.layout.height
-        // Why: notify height imperatively so dock settling re-fits the PTY without rerendering SessionScreen.
-        const nextWidth = Math.round(e.nativeEvent.layout.width)
-        const nextHeight = Math.round(e.nativeEvent.layout.height)
-        setTerminalFrameWidth((prev) => (prev === nextWidth ? prev : nextWidth))
-        notifyTerminalFrameHeight(nextHeight)
-      }}
-    >
+    <View style={styles.terminalFrame}>
       {terminals.map((terminal) => (
         <TerminalPaneView
           key={terminal.handle}
@@ -220,6 +207,7 @@ export function MobileSessionActiveContent({
           }}
           onRef={setTerminalWebViewRef}
           onWebReady={handleTerminalWebReady}
+          onCellBoxChange={notifyTerminalCellBoxChange}
           onSelectionMode={handleSelectionMode}
           onSelectionCopy={handleSelectionCopy}
           onSelectionEvicted={handleSelectionEvicted}
@@ -256,4 +244,16 @@ export function MobileSessionActiveContent({
       )}
     </View>
   )
+  return (
+    <View
+      // Why: one frame under every branch; react-native-web observes onLayout only on a View that mounts with it.
+      style={styles.contentFrame}
+      onLayout={(e) => {
+        const { width, height } = e.nativeEvent.layout
+        notifyTerminalFrame({ width, height })
+      }}
+    >
+      {content}
+    </View>
+  )
 }
diff --git a/mobile/src/session/MobileSessionCommandDock.tsx b/mobile/src/session/MobileSessionCommandDock.tsx
index ed12bb6e51a1..87b46246572f 100644
--- a/mobile/src/session/MobileSessionCommandDock.tsx
+++ b/mobile/src/session/MobileSessionCommandDock.tsx
@@ -1,4 +1,5 @@
-import { View, Text, ScrollView, TextInput, Pressable, Platform } from 'react-native'
+import { View, Text, ScrollView, TextInput, Pressable } from 'react-native'
+import { hostOs } from '../platform/host-os'
 import {
   ArrowUp,
   ChevronDown,
@@ -19,6 +20,7 @@ import { MobileTerminalInputActions } from './MobileTerminalInputActions'
 import { isTerminalPhoneDisplayMode } from './mobile-session-route-helpers'
 import { colors } from '../theme/mobile-theme'
 import { styles } from './mobile-session-styles'
+import { useKeyboardPersistingTaps } from '../platform/keyboard-persisting-taps'
 import type { MobileSessionController } from './use-mobile-session-controller'
 
 export function MobileSessionCommandDock({ controller }: { controller: MobileSessionController }) {
@@ -65,6 +67,7 @@ export function MobileSessionCommandDock({ controller }: { controller: MobileSes
     activeBrowserTab,
     keyboardLift
   } = controller
+  const accessoryBarKeepsKeyboard = useKeyboardPersistingTaps('always')
   return (
     !activeMarkdownTab &&
     !activeFileTab &&
@@ -77,7 +80,7 @@ export function MobileSessionCommandDock({ controller }: { controller: MobileSes
         ]}
       >
         {/* Accessory keys */}
-        <View style={styles.accessoryBar}>
+        <View ref={accessoryBarKeepsKeyboard} style={styles.accessoryBar}>
           {/* Why: fixed keyboard escape hatch; outside ScrollView + shortcut path so it can't scroll away or be hidden (#5106). */}
           {keyboardLift > 0 && (
             <Pressable
@@ -303,7 +306,7 @@ export function MobileSessionCommandDock({ controller }: { controller: MobileSes
               smartInsertDelete={false}
               // Why: iOS textContentType overrides autoComplete and can narrow the keyboard; keep IME switching available.
               autoComplete="off"
-              keyboardType={getTerminalLiveInputKeyboardType(Platform.OS)}
+              keyboardType={getTerminalLiveInputKeyboardType(hostOs())}
               returnKeyType="default"
               blurOnSubmit={false}
               editable={canSend}
@@ -316,7 +319,7 @@ export function MobileSessionCommandDock({ controller }: { controller: MobileSes
               ref={bindCommandField}
               // Why: Android caches IME inputType at mount, so toggling autocomplete must remount there; iOS updates in place.
               key={
-                Platform.OS === 'android'
+                hostOs() === 'android'
                   ? autocompleteEnabled
                     ? 'cmd-input-ac-on'
                     : 'cmd-input-ac-off'
@@ -334,7 +337,7 @@ export function MobileSessionCommandDock({ controller }: { controller: MobileSes
               smartInsertDelete={false}
               // Why: not autofill content, but keyboard must stay default so non-Latin IMEs remain selectable.
               autoComplete="off"
-              keyboardType={getTerminalCommandKeyboardType(Platform.OS, autocompleteEnabled)}
+              keyboardType={getTerminalCommandKeyboardType(hostOs(), autocompleteEnabled)}
               returnKeyType="send"
               blurOnSubmit={false}
               // Why: composing is local — an outage must not lock the field or discard typed text (#6713).
diff --git a/mobile/src/session/MobileSessionHeader.tsx b/mobile/src/session/MobileSessionHeader.tsx
index d8cd0644b3a9..b0d59a781580 100644
--- a/mobile/src/session/MobileSessionHeader.tsx
+++ b/mobile/src/session/MobileSessionHeader.tsx
@@ -21,6 +21,7 @@ import {
 import { colors } from '../theme/mobile-theme'
 import { QuickCommandsTabButton } from './QuickCommandsTabButton'
 import { styles } from './mobile-session-styles'
+import { useKeyboardPersistingTaps } from '../platform/keyboard-persisting-taps'
 import type { MobileSessionController } from './use-mobile-session-controller'
 
 export function MobileSessionHeader({ controller }: { controller: MobileSessionController }) {
@@ -58,6 +59,7 @@ export function MobileSessionHeader({ controller }: { controller: MobileSessionC
     handlePanelTap,
     showHeaderMoreButton
   } = controller
+  const tabBarKeepsKeyboard = useKeyboardPersistingTaps('handled')
   return (
     <SafeAreaView style={styles.sessionChrome} edges={['top']}>
       <View style={styles.sessionTopBar}>
@@ -119,7 +121,7 @@ export function MobileSessionHeader({ controller }: { controller: MobileSessionC
       </View>
 
       {visibleTabs.length > 0 && (
-        <View style={styles.tabBar}>
+        <View ref={tabBarKeepsKeyboard} style={styles.tabBar}>
           {/* Why: tab taps must register on first press with the keyboard open instead of being eaten by dismissal (#5106). */}
           <ScrollView
             ref={tabStripRef}
diff --git a/mobile/src/session/MobileSessionMarkdownReader.tsx b/mobile/src/session/MobileSessionMarkdownReader.tsx
index 4e1d380c9a36..134dc34b87a7 100644
--- a/mobile/src/session/MobileSessionMarkdownReader.tsx
+++ b/mobile/src/session/MobileSessionMarkdownReader.tsx
@@ -3,6 +3,7 @@ import { View, Text, Pressable, ActivityIndicator } from 'react-native'
 import { RefreshCw } from 'lucide-react-native'
 import { MobileRichMarkdownEditor } from '../components/MobileRichMarkdownEditor'
 import { resolveMarkdownFloatingActionsBottom } from './markdown-floating-actions-layout'
+import { markdownReaderStatusText } from './mobile-markdown-reader-status'
 import { colors, spacing } from '../theme/mobile-theme'
 import { styles } from './mobile-session-styles'
 import type { MarkdownDocState } from './mobile-session-route-types'
@@ -48,13 +49,7 @@ export function MarkdownReader({
     )
   }
 
-  const statusText = doc.saveError
-    ? doc.saveError
-    : doc.readOnlyReason
-      ? 'Read only'
-      : doc.stale
-        ? 'Changed on desktop'
-        : null
+  const statusText = markdownReaderStatusText(doc)
   const showRefresh = (doc.stale && !doc.isDirty) || !doc.editable
   const showCopy = doc.saveError || !doc.editable
   const showSave = doc.isDirty || doc.saving
diff --git a/mobile/src/session/TerminalPaneView.tsx b/mobile/src/session/TerminalPaneView.tsx
index 06174cd0378d..03631d114675 100644
--- a/mobile/src/session/TerminalPaneView.tsx
+++ b/mobile/src/session/TerminalPaneView.tsx
@@ -28,6 +28,7 @@ type TerminalPaneViewProps = {
   onFileTap: (handle: string, pathText: string, line: number | null, column: number | null) => void
   onOpenUrl: (handle: string, url: string) => void
   onTextScaleChange: (scale: number) => void
+  onCellBoxChange: (handle: string) => void
 }
 
 export function TerminalPaneView({
@@ -49,7 +50,8 @@ export function TerminalPaneView({
   onTerminalTap,
   onFileTap,
   onOpenUrl,
-  onTextScaleChange
+  onTextScaleChange,
+  onCellBoxChange
 }: TerminalPaneViewProps) {
   const setRef = useCallback(
     (ref: TerminalWebViewHandle | null) => {
@@ -74,6 +76,7 @@ export function TerminalPaneView({
         style={styles.terminalWebView}
         terminalTheme={terminalTheme}
         textScale={textScale}
+        shownAtMount={active}
         onWebReady={() => onWebReady(handle)}
         onSelectionMode={(a) => onSelectionMode(handle, a)}
         onSelectionCopy={(t) => onSelectionCopy(handle, t)}
@@ -87,6 +90,7 @@ export function TerminalPaneView({
         onFileTap={(pathText, line, column) => onFileTap(handle, pathText, line, column)}
         onOpenUrl={(url) => onOpenUrl(handle, url)}
         onTextScaleChange={onTextScaleChange}
+        onCellBoxChange={() => onCellBoxChange(handle)}
       />
     </View>
   )
diff --git a/mobile/src/session/agent-send-keyboard-dismissal-wiring.test.ts b/mobile/src/session/agent-send-keyboard-dismissal-wiring.test.ts
deleted file mode 100644
index 03b5398939d2..000000000000
--- a/mobile/src/session/agent-send-keyboard-dismissal-wiring.test.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { readMobileSessionRouteSource } from './mobile-session-route-source-family.test-support'
-
-const runtimeSource = readMobileSessionRouteSource('./use-mobile-session-terminal-runtime.ts')
-const nativeChatSource = readMobileSessionRouteSource(
-  './use-mobile-session-native-chat-dictation.ts'
-)
-const sendActionsSource = readMobileSessionRouteSource(
-  './use-mobile-session-terminal-send-actions.ts'
-)
-const commandDockSource = readMobileSessionRouteSource('./MobileSessionCommandDock.tsx')
-const tabApplicationSource = readMobileSessionRouteSource('./use-mobile-session-tab-application.ts')
-const terminalListSource = readMobileSessionRouteSource('./use-mobile-session-terminal-list.ts')
-const startupSource = readMobileSessionRouteSource('./use-mobile-session-startup.ts')
-const bufferedDraftHookSource = readMobileSessionRouteSource(
-  '../terminal/use-buffered-terminal-drafts.ts'
-)
-const keyboardDismissalHookSource = readMobileSessionRouteSource(
-  './use-agent-send-keyboard-dismissal.ts'
-)
-
-function sourceSlice(source: string, anchorStart: string, anchorEnd: string): string {
-  const start = source.indexOf(anchorStart)
-  expect(start).toBeGreaterThanOrEqual(0)
-  // Why: a duplicated start anchor would silently slice the wrong region.
-  expect(source.indexOf(anchorStart, start + 1)).toBe(-1)
-  const end = source.indexOf(anchorEnd, start)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end + anchorEnd.length)
-}
-
-describe('terminal send keyboard dismissal wiring', () => {
-  it('gates the dismissal on the agent-session predicate', () => {
-    const slice = sourceSlice(
-      sendActionsSource,
-      'const dismissKeyboardAfterAgentSend = useAgentSendKeyboardDismissal(',
-      'getSendCompletionGeneration\n  )'
-    )
-    expect(slice).toContain('dismissSoftwareKeyboard')
-    expect(keyboardDismissalHookSource).toContain(
-      'shouldDismissKeyboardAfterTerminalSend(origin.tab, accepted)'
-    )
-    expect(keyboardDismissalHookSource).toContain(
-      'origin.generation === getSendCompletionGeneration()'
-    )
-    expect(keyboardDismissalHookSource).toContain('dismissSoftwareKeyboard()')
-    expect(keyboardDismissalHookSource).toContain('return useCallback(')
-    expect(sendActionsSource).toContain(
-      "import { useAgentSendKeyboardDismissal } from './use-agent-send-keyboard-dismissal'"
-    )
-  })
-
-  it('invalidates pending terminal sends when the focused input surface changes', () => {
-    const slice = sourceSlice(
-      nativeChatSource,
-      'const getSendCompletionGeneration = useMobileSendCompletionGeneration({',
-      '})'
-    )
-    expect(nativeChatSource).toContain(
-      'const routeKey = nativeChatScopeKey ?? `${hostId}\\0${worktreeId}`'
-    )
-    expect(slice).toContain(
-      'surfaceKey: JSON.stringify([routeKey, activeHandle, showNativeChat, liveInputEnabled])'
-    )
-  })
-
-  it('dismisses after the live input submits, which is the only Enter path', () => {
-    // terminal-live-input.ts deliberately keeps Enter off the key map, so
-    // submitLiveInput is the single send seam for the live field.
-    const slice = sourceSlice(
-      sendActionsSource,
-      'const submitLiveInput = useCallback(() => {',
-      'useTerminalTextFieldSubmitBinding(liveInputRef, submitLiveInput)'
-    )
-    expect(slice).toContain('const submit = handleLiveInputSubmit()')
-    expect(slice).toContain('generation: getSendCompletionGeneration()')
-    expect(slice).toContain('interaction: getLiveInteractionGeneration()')
-    expect(slice).toContain('sendOrigin.interaction === getLiveInteractionGeneration()')
-    expect(slice).toContain('dismissKeyboardAfterAgentSend(')
-  })
-
-  it('gives the live field both Enter paths and neither blur', () => {
-    // The page reaches submitLiveInput through the ref binding, because react-native-web withholds
-    // onSubmitEditing under an open composition; native reaches it through the editor action.
-    const slice = sourceSlice(
-      commandDockSource,
-      'ref={bindLiveInputField}',
-      'importantForAutofill="no"'
-    )
-    expect(slice).toContain('onSubmitEditing={submitLiveInput}')
-    // Explicit dismissal replaces RN's blur, which stays off so a shell send
-    // does not drop focus.
-    expect(slice).toContain('blurOnSubmit={false}')
-  })
-
-  it('dismisses the buffered command send only once the write is accepted', () => {
-    const slice = sourceSlice(
-      sendActionsSource,
-      'async function handleSend() {',
-      'async function handleAccessoryKey('
-    )
-    const acceptedAt = slice.indexOf(
-      'const accepted = terminalInputSend.interpret(response) === true'
-    )
-    const restoreAt = slice.indexOf('restoreRejectedDraft()', acceptedAt)
-    const dismissAt = slice.indexOf('dismissKeyboardAfterAgentSend(')
-    const responseAt = slice.indexOf('const response = await terminalInputSend.request(')
-    const catchAt = slice.indexOf('} catch {')
-    expect(dismissAt).toBeGreaterThan(0)
-    expect(responseAt).toBeGreaterThan(0)
-    expect(acceptedAt).toBeGreaterThan(responseAt)
-    expect(restoreAt).toBeGreaterThan(acceptedAt)
-    expect(dismissAt).toBeGreaterThan(responseAt)
-    expect(slice).toContain(
-      'const draftUnchanged =\n        accepted && bufferedTerminalDraftState.settleBufferedTerminalDraftSend(bufferedDraftSend)'
-    )
-    expect(slice).toContain('dismissKeyboardAfterAgentSend(sendOrigin, accepted && draftUnchanged)')
-    expect(catchAt).toBeGreaterThan(0)
-    // Both resolved rejections and transport failures restore the raw draft.
-    expect(dismissAt).toBeLessThan(catchAt)
-    expect(slice.slice(catchAt)).not.toContain('dismissKeyboardAfterAgentSend(')
-    expect(slice.slice(catchAt)).toContain('restoreRejectedDraft()')
-  })
-
-  it('keeps buffered Return focused until accepted-agent dismissal runs', () => {
-    const slice = sourceSlice(
-      commandDockSource,
-      'ref={bindCommandField}',
-      'onSubmitEditing={() => void handleSend()}'
-    )
-    expect(slice).toContain('blurOnSubmit={false}')
-  })
-
-  it('restores a rejected buffered draft by origin without generation fencing', () => {
-    const sendSlice = sourceSlice(
-      sendActionsSource,
-      'async function handleSend() {',
-      'async function handleAccessoryKey('
-    )
-    const originAt = sendSlice.indexOf('handle: activeHandle')
-    const requestAt = sendSlice.indexOf('await terminalInputSend.request(')
-    const restoreSlice = sourceSlice(
-      sendActionsSource,
-      'const bufferedDraftSend = bufferedTerminalDraftState.beginBufferedTerminalDraftSend(',
-      'bufferedTerminalDraftState.restoreRejectedDraft(bufferedDraftSend)'
-    )
-    expect(originAt).toBeGreaterThan(0)
-    expect(originAt).toBeLessThan(requestAt)
-    expect(restoreSlice).toContain('activeHandle,\n      draft')
-    expect(bufferedDraftHookSource).not.toContain('getSendCompletionGeneration()')
-    expect(bufferedDraftHookSource).toContain(
-      'restoreRejectedBufferedTerminalDraft(current, send.token.handle, send.draft)'
-    )
-    expect(sendSlice.match(/restoreRejectedDraft\(\)/g)).toHaveLength(2)
-    expect(keyboardDismissalHookSource).toContain(
-      'origin.generation === getSendCompletionGeneration()'
-    )
-  })
-
-  it('keeps buffered draft callbacks scoped to terminal surfaces and prunes ended tabs', () => {
-    expect(bufferedDraftHookSource).toContain('const handle = activeHandleRef.current')
-    expect(bufferedDraftHookSource).toContain('invalidateBufferedTerminalDraftRestoration(')
-    expect(bufferedDraftHookSource).toContain(
-      'setDrafts((current) => updateBufferedTerminalDraft(current, handle, value))'
-    )
-    expect(bufferedDraftHookSource).toContain('pruneBufferedTerminalDraftRestorations(')
-    expect(runtimeSource).toContain('useRef(bufferedTerminalDraftState.reconcileTerminalTabs)')
-    expect(tabApplicationSource).toContain(
-      'reconcileBufferedDraftsRef.current(currentSessionTabs, nextTabs, {'
-    )
-    const routeResetSlice = sourceSlice(
-      startupSource,
-      '// Why: Expo reuses this screen across worktrees;',
-      'clearDelayedActionTimers()\n    }'
-    )
-    expect(routeResetSlice).toContain('bufferedTerminalDraftState.resetDrafts()')
-    expect(routeResetSlice).toContain('bufferedTerminalDraftState.clearPendingRestorations()')
-  })
-
-  it('bounds buffered drafts on the terminal.list sweep, against the retained set', () => {
-    // The drafts record and the pending-restoration map both live as long as the
-    // session screen does; this one call is the only thing that bounds either.
-    const slice = sourceSlice(
-      terminalListSource,
-      'const liveHandles = new Set(result.terminals.map((terminal) => terminal.handle))',
-      'setTerminalKeyboardMetrics((prev) => pruneTerminalKeyboardMetrics(prev, shouldPrune))'
-    )
-    expect(slice).toContain('const retainedHandles = resolveRetainedTerminalHandles(pruneContext)')
-    expect(slice).toContain('bufferedTerminalDraftState.pruneDrafts(retainedHandles)')
-    // Not the raw list: terminal.list omits a chat-covered handle while the desktop
-    // graph reloads, so sweeping drafts against it erases text the user still holds.
-    expect(slice).not.toContain('pruneDrafts(liveHandles)')
-    expect(slice.match(/pruneDrafts\(/g)).toHaveLength(1)
-    expect(bufferedDraftHookSource).toContain(
-      'setDrafts((current) => pruneBufferedTerminalDrafts(current, retainedMappedHandles))'
-    )
-    expect(bufferedDraftHookSource).toContain(
-      'pruneBufferedTerminalDraftRestorations(pendingRestorationsRef.current, retainedMappedHandles)'
-    )
-  })
-
-  it('leaves the accessory shortcut keys alone, Enter included', () => {
-    // Why: the accessory bar sits on top of the keyboard — dismissing would
-    // pull away the very row the user is tapping.
-    const slice = sourceSlice(
-      sendActionsSource,
-      'async function handleAccessoryKey(',
-      'const sendLiveTerminalInput = useCallback('
-    )
-    expect(slice).not.toContain('dismissKeyboardAfterAgentSend')
-  })
-})
diff --git a/mobile/src/session/mobile-agent-launch-availability.test.ts b/mobile/src/session/mobile-agent-launch-availability.test.ts
new file mode 100644
index 000000000000..b1775f13311f
--- /dev/null
+++ b/mobile/src/session/mobile-agent-launch-availability.test.ts
@@ -0,0 +1,46 @@
+import { describe, expect, it } from 'vitest'
+import { resolveMobileAgentLaunchAvailability } from './mobile-agent-launch-availability'
+
+const LAUNCH = ['agent.launch.v2', 'agent.launch.replay.v1', 'agent.launch.replay-required.v1']
+
+describe('resolveMobileAgentLaunchAvailability', () => {
+  it('is available when the host advertises the replay-required launch', () => {
+    expect(
+      resolveMobileAgentLaunchAvailability({
+        hostCapabilities: LAUNCH,
+        statusPending: false,
+        statusReadable: true
+      })
+    ).toBe('available')
+  })
+
+  it('asks for an update only when the host answered without the capability', () => {
+    expect(
+      resolveMobileAgentLaunchAvailability({
+        hostCapabilities: ['agent.launch.v2'],
+        statusPending: false,
+        statusReadable: true
+      })
+    ).toBe('update-required')
+  })
+
+  it('does not blame the host version when its status could not be read', () => {
+    expect(
+      resolveMobileAgentLaunchAvailability({
+        hostCapabilities: [],
+        statusPending: false,
+        statusReadable: false
+      })
+    ).toBe('unverified')
+  })
+
+  it('waits while the status is being read', () => {
+    expect(
+      resolveMobileAgentLaunchAvailability({
+        hostCapabilities: [],
+        statusPending: true,
+        statusReadable: false
+      })
+    ).toBe('checking')
+  })
+})
diff --git a/mobile/src/session/mobile-agent-launch-availability.ts b/mobile/src/session/mobile-agent-launch-availability.ts
new file mode 100644
index 000000000000..81871fb7ab9e
--- /dev/null
+++ b/mobile/src/session/mobile-agent-launch-availability.ts
@@ -0,0 +1,32 @@
+import { supportsMobileExistingAgentLaunch } from './mobile-existing-agent-launch'
+
+/**
+ * Whether an AI button that starts an agent with a prompt can be used on this host. There is no
+ * older-host fallback: the path before `agent.launch` typed the prompt into a bare shell.
+ * `unverified`: the host's status could not be read, so whether it is too old is unknown.
+ */
+export type MobileAgentLaunchAvailability =
+  | 'checking'
+  | 'available'
+  | 'update-required'
+  | 'unverified'
+
+/** The host status gates this reads (`useHostProtocolGates`). */
+export type MobileAgentLaunchHostStatus = {
+  hostCapabilities: readonly string[]
+  statusPending: boolean
+  statusReadable: boolean
+}
+
+export function resolveMobileAgentLaunchAvailability(
+  host: MobileAgentLaunchHostStatus
+): MobileAgentLaunchAvailability {
+  if (supportsMobileExistingAgentLaunch(host.hostCapabilities)) {
+    return 'available'
+  }
+  if (host.statusPending) {
+    return 'checking'
+  }
+  // Only a host that answered without the capability is too old to update.
+  return host.statusReadable ? 'update-required' : 'unverified'
+}
diff --git a/mobile/src/session/mobile-dictation-refused-start-routing.test.tsx b/mobile/src/session/mobile-dictation-refused-start-routing.test.tsx
index b073eda047d9..41dc8b5d11f5 100644
--- a/mobile/src/session/mobile-dictation-refused-start-routing.test.tsx
+++ b/mobile/src/session/mobile-dictation-refused-start-routing.test.tsx
@@ -92,7 +92,7 @@ function mount(client: FakeRpcClient): Mounted {
       worktreeId: 'w1',
       client,
       connState: 'connected',
-      agentSessionPromptCancelSupported: true,
+      agentSessionHostSupport: { promptCancel: true, questionAnswers: false },
       setInput: () => {},
       liveInputTerminalHandles: new Set<string>(),
       activeHandle: 't1',
diff --git a/mobile/src/session/mobile-diff-review-retry.test.tsx b/mobile/src/session/mobile-diff-review-retry.test.tsx
index 093a66b29a46..c7d8f3fb8680 100644
--- a/mobile/src/session/mobile-diff-review-retry.test.tsx
+++ b/mobile/src/session/mobile-diff-review-retry.test.tsx
@@ -55,6 +55,9 @@ function ReviewWhileUnreachable({
   const controller = useMobileDiffReviewController({
     client,
     connState,
+    hostCapabilities: [],
+    hostStatusPending: false,
+    hostStatusReadable: true,
     hostId: 'host-1',
     worktreeId: 'wt-1',
     name: 'review',
diff --git a/mobile/src/session/mobile-diff-review-sheets.test.ts b/mobile/src/session/mobile-diff-review-sheets.test.ts
new file mode 100644
index 000000000000..2a0f70c28df0
--- /dev/null
+++ b/mobile/src/session/mobile-diff-review-sheets.test.ts
@@ -0,0 +1,151 @@
+import { describe, expect, it } from 'vitest'
+import type { MobileDiffReviewQueueItem } from './mobile-diff-review-queue'
+import type { SendSheetState } from './mobile-diff-review-screen-model'
+import {
+  NO_REVIEW_SHEETS,
+  reduceReviewSheets,
+  reviewComposer,
+  type ReviewSheet,
+  type ReviewSheetsAction,
+  type ReviewSheetsState
+} from './mobile-diff-review-sheets'
+
+const ACTIONS: ReviewSheet = { kind: 'actions' }
+const COMPLETION: ReviewSheet = { kind: 'completion' }
+const SEND_LOADING: ReviewSheet = { kind: 'send', load: { kind: 'loading' } }
+const COMPOSER: ReviewSheet = { kind: 'composer', composer: { mode: 'create', lineNumber: 4 } }
+const READY: SendSheetState = { kind: 'ready', terminals: [] }
+const DISCARD_TARGET: MobileDiffReviewQueueItem = {
+  key: 'unstaged:src/a.ts',
+  scope: 'unstaged',
+  area: 'unstaged',
+  filePath: 'src/a.ts',
+  status: 'modified',
+  title: 'a.ts',
+  subtitle: 'src',
+  canStage: true,
+  canUnstage: false,
+  canDiscard: true,
+  isGeneratedOrLockFile: false,
+  diffIdentity: 'identity-1',
+  noteCount: 0,
+  unsentNoteCount: 0,
+  staleNoteCount: 0,
+  isReviewed: false,
+  changedSinceReview: false
+}
+
+function run(...actions: ReviewSheetsAction[]): ReviewSheetsState {
+  return actions.reduce(reduceReviewSheets, NO_REVIEW_SHEETS)
+}
+
+const open = (sheet: ReviewSheet): ReviewSheetsAction => ({ type: 'open', sheet })
+const openWhenIdle = (sheet: ReviewSheet): ReviewSheetsAction => ({ type: 'openWhenIdle', sheet })
+const close = (kind: ReviewSheet['kind']): ReviewSheetsAction => ({ type: 'close', kind })
+const updateSend = (load: SendSheetState): ReviewSheetsAction => ({ type: 'updateSend', load })
+const DISCARD: ReviewSheet = { kind: 'discard', target: DISCARD_TARGET }
+
+describe('review screen sheet requests', () => {
+  it('the newest request wins', () => {
+    expect(run(open(ACTIONS))).toEqual({ requested: ACTIONS, deferred: null })
+    expect(run(open(ACTIONS), open(SEND_LOADING), open(COMPOSER))).toEqual({
+      requested: COMPOSER,
+      deferred: null
+    })
+  })
+
+  it('closing a sheet clears the request only for that sheet', () => {
+    expect(run(open(DISCARD), close('discard'))).toEqual(NO_REVIEW_SHEETS)
+    const state = run(open(ACTIONS))
+    expect(reduceReviewSheets(state, close('send'))).toBe(state)
+  })
+
+  it('exposes the requested composer only', () => {
+    expect(reviewComposer(run(open(COMPOSER)))).toEqual({ mode: 'create', lineNumber: 4 })
+    expect(reviewComposer(run(open(COMPOSER), close('composer')))).toBeNull()
+  })
+
+  it('openWhenIdle opens at once when nothing is requested', () => {
+    expect(run(openWhenIdle(COMPLETION))).toEqual({ requested: COMPLETION, deferred: null })
+  })
+
+  it('openWhenIdle waits behind the user sheet and opens when it closes', () => {
+    const waiting = run(open(ACTIONS), openWhenIdle(COMPLETION))
+    expect(waiting).toEqual({ requested: ACTIONS, deferred: COMPLETION })
+    expect(reduceReviewSheets(waiting, close('actions'))).toEqual({
+      requested: COMPLETION,
+      deferred: null
+    })
+  })
+
+  // Review Complete → Send Notes, then a second Mark Reviewed save lands while Review Complete is
+  // still closing: Send Notes must stay the request.
+  it('a late Review Complete never displaces a sheet the user asked for', () => {
+    const state = run(open(COMPLETION), open(SEND_LOADING), openWhenIdle(COMPLETION))
+    expect(state.requested).toEqual(SEND_LOADING)
+    expect(run(open(ACTIONS), open(SEND_LOADING), openWhenIdle(COMPLETION)).requested).toEqual(
+      SEND_LOADING
+    )
+  })
+
+  it('openWhenIdle does not repeat a sheet that is already requested or waiting', () => {
+    const shown = run(openWhenIdle(COMPLETION))
+    expect(reduceReviewSheets(shown, openWhenIdle(COMPLETION))).toBe(shown)
+    const waiting = run(open(ACTIONS), openWhenIdle(COMPLETION))
+    expect(reduceReviewSheets(waiting, openWhenIdle(COMPLETION))).toBe(waiting)
+  })
+
+  it('moving to another sheet drops a waiting background sheet', () => {
+    expect(run(open(ACTIONS), openWhenIdle(COMPLETION), open(SEND_LOADING))).toEqual({
+      requested: SEND_LOADING,
+      deferred: null
+    })
+  })
+
+  it('refreshing the requested sheet keeps a waiting background sheet', () => {
+    const edit: ReviewSheet = { kind: 'composer', composer: { mode: 'create', lineNumber: 9 } }
+    expect(run(open(COMPOSER), openWhenIdle(COMPLETION), open(edit))).toEqual({
+      requested: edit,
+      deferred: COMPLETION
+    })
+  })
+
+  it('closing a waiting background sheet leaves the user sheet alone', () => {
+    expect(run(open(ACTIONS), openWhenIdle(COMPLETION), close('completion'))).toEqual({
+      requested: ACTIONS,
+      deferred: null
+    })
+  })
+
+  it('updateSend fills a requested Send Notes', () => {
+    expect(run(open(SEND_LOADING), updateSend(READY)).requested).toEqual({
+      kind: 'send',
+      load: READY
+    })
+  })
+
+  it('a send list that lands after Send Notes was dismissed does not bring it back', () => {
+    const dismissed = run(open(SEND_LOADING), close('send'))
+    expect(reduceReviewSheets(dismissed, updateSend(READY))).toBe(dismissed)
+    const moved = run(open(SEND_LOADING), open(ACTIONS))
+    expect(reduceReviewSheets(moved, updateSend(READY))).toBe(moved)
+  })
+
+  it('never waits a sheet behind nothing or behind its own kind', () => {
+    const sheets = [ACTIONS, COMPLETION, SEND_LOADING, COMPOSER, DISCARD]
+    const actions: ReviewSheetsAction[] = [updateSend(READY)]
+    for (const sheet of sheets) {
+      actions.push(open(sheet), openWhenIdle(sheet), close(sheet.kind))
+    }
+    let seed = 7
+    let state = NO_REVIEW_SHEETS
+    for (let step = 0; step < 2000; step++) {
+      seed = (seed * 48271) % 2147483647
+      state = reduceReviewSheets(state, actions[seed % actions.length]!)
+      if (state.deferred !== null) {
+        expect(state.requested).not.toBeNull()
+        expect(state.deferred.kind).not.toBe(state.requested?.kind)
+      }
+    }
+  })
+})
diff --git a/mobile/src/session/mobile-diff-review-sheets.ts b/mobile/src/session/mobile-diff-review-sheets.ts
new file mode 100644
index 000000000000..29a87f478c70
--- /dev/null
+++ b/mobile/src/session/mobile-diff-review-sheets.ts
@@ -0,0 +1,86 @@
+import type { MobileDiffReviewQueueItem } from './mobile-diff-review-queue'
+import type { ComposerState, SendSheetState } from './mobile-diff-review-screen-model'
+
+// Which review sheet the user wants; the screen's one keyed drawer decides when it can be shown.
+
+export type ReviewSheet =
+  | { kind: 'actions' }
+  | { kind: 'send'; load: SendSheetState }
+  | { kind: 'discard'; target: MobileDiffReviewQueueItem }
+  | { kind: 'composer'; composer: ComposerState }
+  | { kind: 'completion' }
+
+export type ReviewSheetKind = ReviewSheet['kind']
+
+export type ReviewSheetsState = {
+  requested: ReviewSheet | null
+  /** A background sheet waiting for `requested` to close; never of the same kind. */
+  deferred: ReviewSheet | null
+}
+
+export type ReviewSheetsAction =
+  | { type: 'open'; sheet: ReviewSheet }
+  | { type: 'openWhenIdle'; sheet: ReviewSheet }
+  | { type: 'close'; kind: ReviewSheetKind }
+  | { type: 'updateSend'; load: SendSheetState }
+
+export const NO_REVIEW_SHEETS: ReviewSheetsState = { requested: null, deferred: null }
+
+export function reduceReviewSheets(
+  state: ReviewSheetsState,
+  action: ReviewSheetsAction
+): ReviewSheetsState {
+  const { requested, deferred } = state
+  switch (action.type) {
+    case 'open':
+      // Why: the newest request wins; a background sheet only survives a refresh of the same sheet.
+      return {
+        requested: action.sheet,
+        deferred: requested?.kind === action.sheet.kind ? deferred : null
+      }
+    case 'openWhenIdle':
+      if (!requested) {
+        return { requested: action.sheet, deferred: null }
+      }
+      // Why: a background opener waits behind the user's sheet and never displaces it.
+      if (deferred || requested.kind === action.sheet.kind) {
+        return state
+      }
+      return { requested, deferred: action.sheet }
+    case 'close':
+      if (requested?.kind === action.kind) {
+        return { requested: deferred, deferred: null }
+      }
+      if (deferred?.kind === action.kind) {
+        return { requested, deferred: null }
+      }
+      return state
+    case 'updateSend':
+      // Why: a list that resolves after Send Notes was dismissed must not bring it back.
+      if (requested?.kind !== 'send') {
+        return state
+      }
+      return { requested: { kind: 'send', load: action.load }, deferred }
+  }
+}
+
+export function reviewComposer(state: ReviewSheetsState): ComposerState | null {
+  return state.requested?.kind === 'composer' ? state.requested.composer : null
+}
+
+/** The only ways callers change the review screen's sheets. */
+export function reviewSheetIntents(dispatch: (action: ReviewSheetsAction) => void) {
+  return {
+    openSheet: (sheet: ReviewSheet) => dispatch({ type: 'open', sheet }),
+    /** For async openers: waits for the user's sheet to close instead of closing it. */
+    openSheetWhenIdle: (sheet: ReviewSheet) => dispatch({ type: 'openWhenIdle', sheet }),
+    closeSheet: (kind: ReviewSheetKind) => dispatch({ type: 'close', kind }),
+    updateSendSheet: (load: SendSheetState) => dispatch({ type: 'updateSend', load })
+  }
+}
+
+export type ReviewSheetIntents = ReturnType<typeof reviewSheetIntents>
+
+export function reviewSheetKey(sheet: ReviewSheet): ReviewSheetKind {
+  return sheet.kind
+}
diff --git a/mobile/src/session/mobile-existing-agent-launch.test.ts b/mobile/src/session/mobile-existing-agent-launch.test.ts
new file mode 100644
index 000000000000..ce54670151b8
--- /dev/null
+++ b/mobile/src/session/mobile-existing-agent-launch.test.ts
@@ -0,0 +1,253 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { RpcClient } from '../transport/rpc-client'
+import { markRpcDeliveryUnknown } from '../transport/rpc-delivery-ambiguity'
+import type { RpcResponse } from '../transport/types'
+import {
+  AGENT_LAUNCH_UNCONFIRMED_MESSAGE,
+  PROMPTED_AGENT_LAUNCH_TIMEOUT_MS,
+  launchAgentInExistingWorkspace,
+  supportsMobileExistingAgentLaunch
+} from './mobile-existing-agent-launch'
+
+// A connected client whose only behaviour is the scripted `sendRequest`.
+function requestPortRpcClient(sendRequest: RpcClient['sendRequest']): RpcClient {
+  return {
+    sendRequest,
+    subscribe: () => () => {},
+    updateTerminalSubscriptionViewport: () => {},
+    getState: () => 'connected',
+    getReconnectAttempt: () => 0,
+    getLastConnectedAt: () => null,
+    onStateChange: () => () => {},
+    notifyForeground: () => {},
+    close: () => {}
+  }
+}
+
+function requestParam(params: unknown, key: string): unknown {
+  return params && typeof params === 'object' && key in params
+    ? Object.getOwnPropertyDescriptor(params, key)?.value
+    : undefined
+}
+
+const LAUNCH_CAPABILITIES = [
+  'agent.launch.v2',
+  'agent.launch.replay.v1',
+  'agent.launch.replay-required.v1'
+]
+const RECEIPT = {
+  mode: 'terminal',
+  preferred: 'terminal',
+  reason: 'user_default',
+  detail: 'Started a terminal agent.'
+}
+
+function launched(result: Record<string, unknown>): RpcResponse {
+  return {
+    id: '1',
+    ok: true,
+    result: {
+      outcome: { kind: 'terminal', handle: 'term-1' },
+      worktreeId: 'wt-1',
+      receipt: RECEIPT,
+      ...result
+    },
+    _meta: { runtimeId: 'r' }
+  }
+}
+
+function refused(code: string, message = code): RpcResponse {
+  return { id: '1', ok: false, error: { code, message }, _meta: { runtimeId: 'r' } }
+}
+
+function scriptedClient(...outcomes: Array<RpcResponse | { throws: unknown }>) {
+  let call = 0
+  const sendRequest = vi.fn(async (_method: string, _params?: unknown, _options?: unknown) => {
+    const outcome = outcomes[Math.min(call, outcomes.length - 1)]!
+    call += 1
+    if ('throws' in outcome) {
+      throw outcome.throws
+    }
+    return outcome
+  })
+  return { client: requestPortRpcClient(sendRequest), sendRequest }
+}
+
+function launch(
+  client: RpcClient,
+  extra: Partial<Parameters<typeof launchAgentInExistingWorkspace>[0]> = {}
+) {
+  return launchAgentInExistingWorkspace({
+    client,
+    hostCapabilities: LAUNCH_CAPABILITIES,
+    worktreeId: 'wt-1',
+    agent: 'claude',
+    mintOperationId: () => 'op-1',
+    ...extra
+  })
+}
+
+describe('supportsMobileExistingAgentLaunch', () => {
+  it('requires the replay ledger, not just agent.launch', () => {
+    expect(supportsMobileExistingAgentLaunch(LAUNCH_CAPABILITIES)).toBe(true)
+    expect(supportsMobileExistingAgentLaunch(['agent.launch.v2'])).toBe(false)
+    expect(supportsMobileExistingAgentLaunch([])).toBe(false)
+    expect(supportsMobileExistingAgentLaunch(undefined)).toBe(false)
+  })
+})
+
+describe('launchAgentInExistingWorkspace', () => {
+  it('sends nothing to a host without the launch capabilities', async () => {
+    const { client, sendRequest } = scriptedClient(launched({}))
+    await expect(launch(client, { hostCapabilities: ['agent.launch.v2'] })).resolves.toEqual({
+      kind: 'unsupported'
+    })
+    expect(sendRequest).not.toHaveBeenCalled()
+  })
+
+  it('launches through agent.launchReplay into the existing workspace with the prompt', async () => {
+    const { client, sendRequest } = scriptedClient(
+      launched({ prompt: { delivery: 'submit', outcome: 'handed-to-terminal' } })
+    )
+    const result = await launch(client, {
+      prompt: { text: 'Fix it', delivery: 'submit' },
+      launchSource: 'task_page'
+    })
+    expect(sendRequest).toHaveBeenCalledWith(
+      'agent.launchReplay',
+      {
+        agent: 'claude',
+        operationId: 'op-1',
+        target: { kind: 'existing', worktree: 'id:wt-1' },
+        prompt: { text: 'Fix it', delivery: 'submit' },
+        launchSource: 'task_page'
+      },
+      // The host may wait 60s for the agent before pasting; the default 30s would give up first.
+      { timeoutMs: PROMPTED_AGENT_LAUNCH_TIMEOUT_MS }
+    )
+    expect(result).toMatchObject({ kind: 'launched', promptDelivered: true })
+  })
+
+  it('keeps the default timeout for a launch with no prompt', async () => {
+    const { client, sendRequest } = scriptedClient(launched({}))
+    await expect(launch(client)).resolves.toMatchObject({
+      kind: 'launched',
+      promptDelivered: null
+    })
+    expect(sendRequest.mock.calls[0]![2]).toBeUndefined()
+  })
+
+  it('reports a journaled prompt as delivered', async () => {
+    const { client } = scriptedClient(
+      launched({
+        outcome: { kind: 'structured', sessionId: 'claude_s1', handle: 'h' },
+        prompt: { delivery: 'submit', outcome: 'journaled', messageId: 'm-1' }
+      })
+    )
+    await expect(
+      launch(client, { prompt: { text: 'Fix it', delivery: 'submit' } })
+    ).resolves.toMatchObject({ kind: 'launched', promptDelivered: true })
+  })
+
+  it('reports not-delivered so the caller keeps the prompt', async () => {
+    const { client } = scriptedClient(
+      launched({ prompt: { delivery: 'submit', outcome: 'not-delivered' } })
+    )
+    await expect(
+      launch(client, { prompt: { text: 'Fix it', delivery: 'submit' } })
+    ).resolves.toMatchObject({ kind: 'launched', promptDelivered: false })
+  })
+
+  it('under-claims a prompted launch whose receipt carries no prompt disposal', async () => {
+    const { client } = scriptedClient(launched({}))
+    await expect(
+      launch(client, { prompt: { text: 'Fix it', delivery: 'submit' } })
+    ).resolves.toMatchObject({ kind: 'launched', promptDelivered: false })
+  })
+
+  it('treats a refusal of the first send as an unsupported host', async () => {
+    const { client } = scriptedClient(refused('agent_launch_replay_unsupported'))
+    await expect(launch(client)).resolves.toEqual({ kind: 'unsupported' })
+  })
+
+  it('never reads a refusal after a replay as unsupported: the first attempt may have run', async () => {
+    const { client, sendRequest } = scriptedClient(
+      { throws: markRpcDeliveryUnknown(new Error('Connection interrupted')) },
+      refused('agent_launch_replay_unsupported')
+    )
+    await expect(launch(client)).resolves.toEqual({
+      kind: 'unknown',
+      message: AGENT_LAUNCH_UNCONFIRMED_MESSAGE
+    })
+    // The replay reuses the same operation id.
+    expect(sendRequest.mock.calls.map(([, params]) => requestParam(params, 'operationId'))).toEqual(
+      ['op-1', 'op-1']
+    )
+  })
+
+  it('maps an unknown outcome to readable copy instead of the raw code', async () => {
+    const { client } = scriptedClient(refused('agent_session_operation_unknown'))
+    await expect(launch(client)).resolves.toEqual({
+      kind: 'unknown',
+      message: AGENT_LAUNCH_UNCONFIRMED_MESSAGE
+    })
+  })
+
+  it('surfaces a refusal from before the launch with the host message', async () => {
+    const { client } = scriptedClient(refused('selector_not_found', 'Workspace not found'))
+    await expect(launch(client)).resolves.toEqual({
+      kind: 'failed',
+      message: 'Workspace not found'
+    })
+  })
+
+  it('reports unknown when no answer arrives at all', async () => {
+    const { client } = scriptedClient({ throws: new Error('Request timed out') })
+    await expect(launch(client)).resolves.toEqual({
+      kind: 'unknown',
+      message: AGENT_LAUNCH_UNCONFIRMED_MESSAGE
+    })
+  })
+
+  it('mints a new operation for every call so a later tap is a new launch', async () => {
+    const { client, sendRequest } = scriptedClient(launched({}))
+    const ids = ['op-a', 'op-b']
+    await launch(client, { mintOperationId: () => ids.shift()! })
+    await launch(client, { mintOperationId: () => ids.shift()! })
+    expect(sendRequest.mock.calls.map(([, params]) => requestParam(params, 'operationId'))).toEqual(
+      ['op-a', 'op-b']
+    )
+  })
+
+  it('works against a v1.4.206-shaped host', async () => {
+    // v1.4.206 (the first release with these capabilities) parses a plain object that knows only
+    // these keys and strips the rest; its terminal arm starts the agent without the prompt.
+    const v1_4_206Keys = new Set([
+      'agent',
+      'operationId',
+      'target',
+      'prompt',
+      'sessionOptions',
+      'reuseTerminal'
+    ])
+    let parsed: Record<string, unknown> | null = null
+    const client = requestPortRpcClient(async (_method, params) => {
+      parsed = Object.fromEntries(
+        Object.entries(params ?? {}).filter(([key]) => v1_4_206Keys.has(key))
+      )
+      return launched({ prompt: { delivery: 'submit', outcome: 'not-delivered' } })
+    })
+    const result = await launch(client, {
+      prompt: { text: 'Fix it', delivery: 'submit' },
+      launchSource: 'task_page'
+    })
+    // Only telemetry is lost; the launch itself carries nothing that host would drop.
+    expect(parsed).toEqual({
+      agent: 'claude',
+      operationId: 'op-1',
+      target: { kind: 'existing', worktree: 'id:wt-1' },
+      prompt: { text: 'Fix it', delivery: 'submit' }
+    })
+    expect(result).toMatchObject({ kind: 'launched', promptDelivered: false })
+  })
+})
diff --git a/mobile/src/session/mobile-existing-agent-launch.ts b/mobile/src/session/mobile-existing-agent-launch.ts
new file mode 100644
index 000000000000..2a7d23071ad4
--- /dev/null
+++ b/mobile/src/session/mobile-existing-agent-launch.ts
@@ -0,0 +1,126 @@
+/**
+ * Starting an agent in a workspace that already exists, through the host's `agent.launch`.
+ *
+ * The phone states intent (which agent, where, what to say) and the host decides whether it runs
+ * as a structured chat or a terminal agent, and how the prompt reaches it. Kept free of React so
+ * every outcome is unit-testable.
+ */
+
+import type { AgentLaunchPrompt, AgentLaunchResult } from '../../../src/shared/agent-launch-intent'
+import type { TuiAgent } from '../../../src/shared/tui-agent'
+import type { RpcClient } from '../transport/rpc-client'
+import { agentLaunchReplayRun } from '../tasks/mobile-workspace-create-operations'
+import {
+  agentLaunchExistingParams,
+  isAgentLaunchReplayUnsupportedRefusal,
+  readAgentLaunchSupport
+} from '../tasks/agent-launch-request'
+import { sendReplayingAmbiguousDelivery } from '../tasks/replay-on-ambiguous-delivery'
+import { structuredSessionOperationId } from './structured-session-operation-id'
+
+// Why: the host waits up to 60s for a terminal agent to become ready before pasting the prompt,
+// so a prompted launch must outlive that wait or the phone reports a launch that is still running.
+export const PROMPTED_AGENT_LAUNCH_TIMEOUT_MS = 90_000
+
+export const AGENT_LAUNCH_UPDATE_REQUIRED_MESSAGE =
+  'Update Orca on your computer to start an agent from your phone.'
+
+// host-status-gates keeps re-reading a failed status in the background, so the user need not act.
+export const AGENT_LAUNCH_STATUS_UNREADABLE_MESSAGE = "Could not read this host's status. Retrying…"
+
+export const AGENT_LAUNCH_UNCONFIRMED_MESSAGE =
+  "Couldn't confirm the agent started. Check the workspace before trying again."
+
+export type MobileExistingAgentLaunch =
+  /** The host answered. `promptDelivered` is null when no prompt was sent. */
+  | { kind: 'launched'; result: AgentLaunchResult; promptDelivered: boolean | null }
+  /** This host can't take the launch; nothing was started. */
+  | { kind: 'unsupported' }
+  /** The host refused before starting anything. */
+  | { kind: 'failed'; message: string }
+  /** The agent may or may not be running; the caller must not launch again on its own. */
+  | { kind: 'unknown'; message: string }
+
+export function supportsMobileExistingAgentLaunch(
+  hostCapabilities: readonly string[] | null | undefined
+): boolean {
+  const support = readAgentLaunchSupport(hostCapabilities)
+  return support !== false && support.replay
+}
+
+export async function launchAgentInExistingWorkspace(args: {
+  client: RpcClient
+  hostCapabilities: readonly string[] | null | undefined
+  worktreeId: string
+  agent: TuiAgent
+  prompt?: AgentLaunchPrompt
+  launchSource?: string
+  // Injected in tests; each call is one new operation, so a later tap never replays this one.
+  mintOperationId?: () => string
+}): Promise<MobileExistingAgentLaunch> {
+  if (!supportsMobileExistingAgentLaunch(args.hostCapabilities)) {
+    return { kind: 'unsupported' }
+  }
+  const params = agentLaunchExistingParams({
+    agent: args.agent,
+    worktreeId: args.worktreeId,
+    operationId: (args.mintOperationId ?? structuredSessionOperationId)(),
+    ...(args.prompt ? { prompt: args.prompt } : {}),
+    ...(args.launchSource ? { launchSource: args.launchSource } : {})
+  })
+  let sent
+  try {
+    sent = await sendReplayingAmbiguousDelivery(
+      args.client,
+      () =>
+        agentLaunchReplayRun.request(
+          args.client,
+          params,
+          args.prompt ? { timeoutMs: PROMPTED_AGENT_LAUNCH_TIMEOUT_MS } : undefined
+        ),
+      { kind: 'durable' }
+    )
+  } catch {
+    // The request reached the wire and no answer came back, even after replays.
+    return { kind: 'unknown', message: AGENT_LAUNCH_UNCONFIRMED_MESSAGE }
+  }
+  const { response, replayed } = sent
+  if (!response.ok) {
+    return classifyLaunchRefusal(response.error, replayed)
+  }
+  let result: AgentLaunchResult
+  try {
+    result = agentLaunchReplayRun.interpret(response)
+  } catch {
+    return { kind: 'unknown', message: AGENT_LAUNCH_UNCONFIRMED_MESSAGE }
+  }
+  return {
+    kind: 'launched',
+    result,
+    // A receipt missing from a prompted launch under-claims: the phone keeps the text.
+    promptDelivered: args.prompt
+      ? result.prompt !== undefined && result.prompt.outcome !== 'not-delivered'
+      : null
+  }
+}
+
+function classifyLaunchRefusal(
+  error: { code?: string; message?: string },
+  replayed: boolean
+): MobileExistingAgentLaunch {
+  if (isAgentLaunchReplayUnsupportedRefusal(error)) {
+    // Only a refusal of the first send proves nothing ran; after a replay it may be a replacement
+    // connection whose capability list hasn't landed, answering for an attempt that did start.
+    return replayed
+      ? { kind: 'unknown', message: AGENT_LAUNCH_UNCONFIRMED_MESSAGE }
+      : { kind: 'unsupported' }
+  }
+  if (
+    error.code === 'agent_session_operation_unknown' ||
+    error.code === 'agent_session_operation_expired'
+  ) {
+    return { kind: 'unknown', message: AGENT_LAUNCH_UNCONFIRMED_MESSAGE }
+  }
+  const message = error.message?.trim()
+  return { kind: 'failed', message: message || "Couldn't start the agent." }
+}
diff --git a/mobile/src/session/mobile-markdown-disk-fallback.test.ts b/mobile/src/session/mobile-markdown-disk-fallback.test.ts
index 04de6c7f14ff..fb172e1a4250 100644
--- a/mobile/src/session/mobile-markdown-disk-fallback.test.ts
+++ b/mobile/src/session/mobile-markdown-disk-fallback.test.ts
@@ -75,17 +75,20 @@ describe('buildMarkdownDiskFallbackDoc', () => {
     })
   })
 
-  it('warns when the disk read is truncated', () => {
+  it('marks a truncated disk read so the status line names it', () => {
     expect(
       buildMarkdownDiskFallbackDoc({
         content: '# Partial',
         truncated: true,
+        byteLength: 700_000,
         tabIsDirty: true
       })
     ).toMatchObject({
       editable: false,
       stale: true,
-      readOnlyReason: 'File too large for mobile preview'
+      readOnlyReason: 'Desktop has unsaved changes. Showing disk content.',
+      truncated: true,
+      byteLength: 700_000
     })
   })
 })
diff --git a/mobile/src/session/mobile-markdown-disk-fallback.ts b/mobile/src/session/mobile-markdown-disk-fallback.ts
index 910fb0725641..81fa55e14cd6 100644
--- a/mobile/src/session/mobile-markdown-disk-fallback.ts
+++ b/mobile/src/session/mobile-markdown-disk-fallback.ts
@@ -1,4 +1,5 @@
 import type { RpcFailure } from '../transport/types'
+import type { MarkdownDocState } from './mobile-session-route-types'
 
 const RENDERER_UNAVAILABLE = 'renderer_unavailable'
 
@@ -9,26 +10,24 @@ export function shouldReadMarkdownFromDiskAfterReadTabFailure(response: RpcFailu
   )
 }
 
-// `truncated` is optional because the preview reader salvages it: an absent flag reads as not
-// truncated here, which is the branch main took for a reply that omitted it.
 export function buildMarkdownDiskFallbackDoc(args: {
   content: string
-  truncated: boolean | undefined
+  truncated?: boolean
+  byteLength?: number
   tabIsDirty: boolean
-}) {
-  const readOnlyReason = args.truncated
-    ? 'File too large for mobile preview'
-    : args.tabIsDirty
-      ? 'Desktop has unsaved changes. Showing disk content.'
-      : 'Editing needs Orca desktop running.'
+}): Extract<MarkdownDocState, { status: 'ready' }> {
+  const readOnlyReason = args.tabIsDirty
+    ? 'Desktop has unsaved changes. Showing disk content.'
+    : 'Editing needs Orca desktop running.'
   return {
-    status: 'ready' as const,
+    status: 'ready',
     content: args.content,
     localContent: args.content,
     baseVersion: '',
     isDirty: false,
     editable: false,
     stale: args.tabIsDirty,
-    readOnlyReason
+    readOnlyReason,
+    ...(args.truncated ? { truncated: true, byteLength: args.byteLength } : {})
   }
 }
diff --git a/mobile/src/session/mobile-markdown-reader-status.test.ts b/mobile/src/session/mobile-markdown-reader-status.test.ts
new file mode 100644
index 000000000000..8bee01b44d63
--- /dev/null
+++ b/mobile/src/session/mobile-markdown-reader-status.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest'
+import { markdownReaderStatusText } from './mobile-markdown-reader-status'
+
+const readOnlyDoc = {
+  status: 'ready' as const,
+  content: '# head',
+  localContent: '# head',
+  baseVersion: 'v1',
+  isDirty: false,
+  editable: false,
+  readOnlyReason: 'file_too_large'
+}
+
+describe('markdownReaderStatusText', () => {
+  it('names a truncated preview and the full file size the way file tabs do', () => {
+    expect(
+      markdownReaderStatusText({ ...readOnlyDoc, truncated: true, byteLength: 3_000_000 })
+    ).toBe('Preview truncated. File size: 2.9 MB.')
+  })
+
+  it('keeps read-only, stale, and save-error states as before', () => {
+    expect(markdownReaderStatusText(readOnlyDoc)).toBe('Read only')
+    expect(
+      markdownReaderStatusText({ ...readOnlyDoc, readOnlyReason: undefined, stale: true })
+    ).toBe('Changed on desktop')
+    expect(markdownReaderStatusText({ ...readOnlyDoc, saveError: 'Save failed' })).toBe(
+      'Save failed'
+    )
+  })
+})
diff --git a/mobile/src/session/mobile-markdown-reader-status.ts b/mobile/src/session/mobile-markdown-reader-status.ts
new file mode 100644
index 000000000000..060b73beffb8
--- /dev/null
+++ b/mobile/src/session/mobile-markdown-reader-status.ts
@@ -0,0 +1,20 @@
+import { formatPreviewByteLength } from '../files/mobile-file-preview-response'
+import type { MarkdownDocState } from './mobile-session-route-types'
+
+/** The markdown floating bar's status line; a truncated preview reads like a file tab's note. */
+export function markdownReaderStatusText(
+  doc: Extract<MarkdownDocState, { status: 'ready' }>
+): string | null {
+  if (doc.saveError) {
+    return doc.saveError
+  }
+  if (doc.truncated) {
+    return doc.byteLength === undefined
+      ? 'Preview truncated.'
+      : `Preview truncated. File size: ${formatPreviewByteLength(doc.byteLength)}.`
+  }
+  if (doc.readOnlyReason) {
+    return 'Read only'
+  }
+  return doc.stale ? 'Changed on desktop' : null
+}
diff --git a/mobile/src/session/mobile-native-chat-controller-contract.ts b/mobile/src/session/mobile-native-chat-controller-contract.ts
index 78c5ebeb1cfa..30bf33d7d512 100644
--- a/mobile/src/session/mobile-native-chat-controller-contract.ts
+++ b/mobile/src/session/mobile-native-chat-controller-contract.ts
@@ -37,6 +37,10 @@ export type MobileNativeChatController = {
   /** Structured lane: host-recorded turn timing for the per-turn status rows. */
   nativeChatWorkingStartedAt: number | null
   nativeChatSettledTurns: NativeChatSettledTurns | null
+  /** Structured lane: the user message the host says opened the running turn. */
+  nativeChatActiveTurnOpenedBy: string | null
+  /** Structured lane: the turn that owns each journal item's row. */
+  nativeChatTurnKeysByItemId: ReadonlyMap<string, string> | null
   nativeChatCanStop: boolean
   nativeChatStreamingText?: string
   /** Agent mid-turn, regardless of whether chat is the visible view. */
diff --git a/mobile/src/session/mobile-native-chat-message-styles.ts b/mobile/src/session/mobile-native-chat-message-styles.ts
index 51ff9ab1f36c..88e97018521e 100644
--- a/mobile/src/session/mobile-native-chat-message-styles.ts
+++ b/mobile/src/session/mobile-native-chat-message-styles.ts
@@ -32,6 +32,17 @@ export const styles = StyleSheet.create({
   reasoning: {
     opacity: 0.7
   },
+  // A subagent's row is an aside to the conversation, set off the way desktop sets it off.
+  subagent: {
+    borderLeftWidth: 2,
+    borderLeftColor: colors.borderSubtle,
+    paddingLeft: spacing.md
+  },
+  subagentCaption: {
+    color: colors.textMuted,
+    fontFamily: typography.monoFamily,
+    fontSize: MONO_SIZE
+  },
   toolRun: {
     marginTop: spacing.xs
   },
diff --git a/mobile/src/session/mobile-native-chat-noise.test.ts b/mobile/src/session/mobile-native-chat-noise.test.ts
index 0369a609135d..dcda3f3dace1 100644
--- a/mobile/src/session/mobile-native-chat-noise.test.ts
+++ b/mobile/src/session/mobile-native-chat-noise.test.ts
@@ -44,6 +44,7 @@ describe('isNoiseMessage', () => {
 
   it('keeps assistant and tool turns', () => {
     expect(isNoiseMessage(msg('assistant', '<system-reminder> in prose'))).toBe(false)
+    expect(isNoiseMessage(msg('system', 'Conversation interrupted'))).toBe(false)
   })
 
   it('keeps a user turn that carries tool results', () => {
diff --git a/mobile/src/session/mobile-new-tab-agent-loader.ts b/mobile/src/session/mobile-new-tab-agent-loader.ts
index f22ebda59908..5cc02b544214 100644
--- a/mobile/src/session/mobile-new-tab-agent-loader.ts
+++ b/mobile/src/session/mobile-new-tab-agent-loader.ts
@@ -15,10 +15,18 @@ import {
   type MobileNewTabAgentSettings
 } from './mobile-new-tab-agent-options'
 
-export async function loadMobileNewTabAgentOptions(args: {
+/** What a launch in this workspace can choose from: the host's settings, the agents detected on
+ *  the workspace's execution host, and the workspace's repo (absent for the floating workspace). */
+export type MobileAgentLaunchContext = {
+  settings: unknown
+  detectedAgents: unknown[]
+  repo: MobileRuntimeRepoSummary | null
+}
+
+export async function loadMobileAgentLaunchContext(args: {
   client: RpcClient
   worktreeId: string
-}): Promise<MobileNewTabAgentOption[]> {
+}): Promise<MobileAgentLaunchContext> {
   const { client, worktreeId } = args
   // Started before the settings read, not inside the array: the detection request goes on the wire
   // first, and the recorded sender order is what says so.
@@ -31,10 +39,18 @@ export async function loadMobileNewTabAgentOptions(args: {
   // Interpreted after the group, not inside it: whichever peer failed first must not decide the
   // error the sheet shows, and main raised the detection refusal only once settings had settled.
   const detected = detectedAgents.interpret(detectedAgents.reply)
+  return { settings: readSettings(), detectedAgents: detected, repo: detectedAgents.repo }
+}
+
+export async function loadMobileNewTabAgentOptions(args: {
+  client: RpcClient
+  worktreeId: string
+}): Promise<MobileNewTabAgentOption[]> {
+  const context = await loadMobileAgentLaunchContext(args)
   return buildMobileNewTabAgentOptions(
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Preserve the established response shape at this boundary.
-    readSettings() as MobileNewTabAgentSettings | undefined,
-    detected
+    context.settings as MobileNewTabAgentSettings | undefined,
+    context.detectedAgents
   )
 }
 
@@ -42,6 +58,7 @@ export async function loadMobileNewTabAgentOptions(args: {
 type DetectedAgentsReply = {
   reply: RpcResponse
   interpret: (reply: RpcResponse) => unknown[]
+  repo: MobileRuntimeRepoSummary | null
 }
 
 async function loadDetectedAgents(
@@ -52,7 +69,8 @@ async function loadDetectedAgents(
   if (isFloatingWorkspaceWorktreeId(worktreeId)) {
     return {
       reply: await preflightDetectAgentsRead.request(client),
-      interpret: preflightDetectAgentsRead.interpret
+      interpret: preflightDetectAgentsRead.interpret,
+      repo: null
     }
   }
   const repoResponse = await newTabRepoListRead.request(client)
@@ -67,10 +85,12 @@ async function loadDetectedAgents(
   return connectionId
     ? {
         reply: await preflightDetectRemoteAgentsRead.request(client, { connectionId }),
-        interpret: preflightDetectRemoteAgentsRead.interpret
+        interpret: preflightDetectRemoteAgentsRead.interpret,
+        repo
       }
     : {
         reply: await preflightDetectAgentsRead.request(client),
-        interpret: preflightDetectAgentsRead.interpret
+        interpret: preflightDetectAgentsRead.interpret,
+        repo
       }
 }
diff --git a/mobile/src/session/mobile-session-connection-retry.test.tsx b/mobile/src/session/mobile-session-connection-retry.test.tsx
index 0102819b311f..410c6dea1966 100644
--- a/mobile/src/session/mobile-session-connection-retry.test.tsx
+++ b/mobile/src/session/mobile-session-connection-retry.test.tsx
@@ -30,7 +30,7 @@ function present(forceReconnectHost: ForceReconnect): Presentation {
     toastOpacityRef: { current: 1 },
     hostEndpoint: null,
     initialSessionAutoCreateRef: { current: null },
-    terminalFrameHeightRef: { current: 0 },
+    terminalFrameRef: { current: null },
     handleCreateTerminal: () => Promise.resolve(),
     visibleTabs: [],
     forceReconnectHost
diff --git a/mobile/src/session/mobile-session-frame-styles.ts b/mobile/src/session/mobile-session-frame-styles.ts
index a02c14be0149..22ac97d23c8d 100644
--- a/mobile/src/session/mobile-session-frame-styles.ts
+++ b/mobile/src/session/mobile-session-frame-styles.ts
@@ -70,6 +70,7 @@ export const mobileSessionFrameStyles = StyleSheet.create({
   sessionMetaRow: {
     flexDirection: 'row',
     alignItems: 'center',
+    gap: spacing.sm,
     marginTop: 2
   },
   sessionMetaText: {
@@ -142,6 +143,11 @@ export const mobileSessionFrameStyles = StyleSheet.create({
     height: 18,
     backgroundColor: colors.borderSubtle
   },
+  // The content slot every branch renders in, measured as the terminal's frame; clips nothing.
+  contentFrame: {
+    flex: 1,
+    minHeight: 0
+  },
   terminalFrame: {
     flex: 1,
     minHeight: 0,
diff --git a/mobile/src/session/mobile-session-last-tab-close.test.ts b/mobile/src/session/mobile-session-last-tab-close.test.ts
deleted file mode 100644
index a15a62b1535f..000000000000
--- a/mobile/src/session/mobile-session-last-tab-close.test.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { readMobileSessionRouteSourceFamily } from './mobile-session-route-source-family.test-support'
-
-const sessionRouteSource = readMobileSessionRouteSourceFamily()
-
-describe('mobile session last-tab close', () => {
-  it('preserves terminal identity while an empty snapshot may be transient', () => {
-    const start = sessionRouteSource.indexOf('const applySessionTabs = useCallback')
-    const end = sessionRouteSource.indexOf('const readMarkdownTab', start)
-    const block = sessionRouteSource.slice(start, end)
-
-    expect(block).toContain('} else if (active) {')
-    expect(block).toContain('retainMissingSurfaces: result.tabs.length === 0')
-  })
-
-  it('clears stale active identity when closing leaves no tabs', () => {
-    const start = sessionRouteSource.indexOf('async function handleCloseSessionTab')
-    const end = sessionRouteSource.indexOf('const bulkCloseActions', start)
-    const block = sessionRouteSource.slice(start, end)
-
-    expect(block).toContain(
-      'activeSessionTabIdRef.current === tab.id || remainingTabs.length === 0'
-    )
-    expect(block).toContain('activeSessionTabIdRef.current = null')
-    expect(block).toContain('activeHandleRef.current = null')
-    expect(block).toContain(
-      'reconcileBufferedDraftsRef.current(sessionTabsRef.current, remainingTabs)'
-    )
-  })
-
-  it('ignores a pending terminal handle when the host requests follow navigation', () => {
-    const start = sessionRouteSource.indexOf('const applySessionTabs = useCallback')
-    const end = sessionRouteSource.indexOf('const readMarkdownTab', start)
-    const block = sessionRouteSource.slice(start, end)
-
-    const followsHost = block.indexOf("const followsHost = result.navigationIntent === 'follow'")
-    const pendingHandle = block.indexOf('const pendingActiveTerminalHandle = followsHost')
-
-    expect(followsHost).toBeGreaterThanOrEqual(0)
-    expect(pendingHandle).toBeGreaterThan(followsHost)
-    expect(block.slice(pendingHandle, pendingHandle + 150)).toContain('? null')
-  })
-})
diff --git a/mobile/src/session/mobile-session-route-parity.test.ts b/mobile/src/session/mobile-session-route-parity.test.ts
deleted file mode 100644
index e2f8b478cc0d..000000000000
--- a/mobile/src/session/mobile-session-route-parity.test.ts
+++ /dev/null
@@ -1,624 +0,0 @@
-import { createHash } from 'node:crypto'
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
-import ts from 'typescript-api'
-import { describe, expect, it } from 'vitest'
-import { MOBILE_SESSION_ROUTE_SOURCE_FILES } from './mobile-session-route-source-family.test-support'
-
-const SESSION_FILES = MOBILE_SESSION_ROUTE_SOURCE_FILES
-/** The function the route mounts, which C7.7 moved out of the route file and into a component. */
-const ROOT_COMPONENT = 'MobileSessionRouteScreen'
-const LOGIC_EXPANSION_NAMES = new Set([
-  'useMobileSessionController',
-  'useMobileSessionFoundation',
-  'useMobileSessionScreenState',
-  'useMobileSessionTerminalRuntime',
-  'useMobileSessionFeedbackCapabilities',
-  'useMobileSessionNativeChatDictation',
-  'useMobileSessionTerminalSubscriptionFoundation',
-  'useMobileSessionTerminalSubscription',
-  'useMobileSessionTerminalStreamDisplay',
-  'useMobileSessionTerminalList',
-  'useMobileSessionTabApplication',
-  'useMobileSessionDocumentReaders',
-  'useMobileSessionDiffComments',
-  'useMobileSessionMarkdownActions',
-  'useMobileSessionTabReconciliation',
-  'useMobileSessionLifecycle',
-  'useMobileSessionKeyboardState',
-  'useMobileSessionStartup',
-  'useMobileSessionPreferenceFocus',
-  'useMobileSessionTabSwitching',
-  'useMobileSessionTerminalWebview',
-  'useMobileSessionTerminalSendActions',
-  'useMobileSessionFileActions',
-  'useMobileSessionTerminalInput',
-  'useMobileSessionAccessorySelection',
-  'useMobileSessionAttachments',
-  'useMobileSessionTerminalCreateActions',
-  'useMobileSessionContentCreateActions',
-  'useMobileSessionCloseActions',
-  'useMobileSessionBulkClose',
-  'useMobileSessionPresentation',
-  'useMobileSessionPanelRouteActions'
-])
-const SURFACE_EXPANSION_NAMES = new Set([
-  'MobileSessionSurface',
-  'MobileSessionHeader',
-  'MobileSessionContentRow',
-  'MobileSessionActiveContent',
-  'MobileSessionCommandDock',
-  'MobileSessionSheets'
-])
-const CONTENT_COMPONENT_NAMES = ['MarkdownReader', 'DiffLineRow', 'FileReader'] as const
-const HOST_COMPONENT_NAMES = new Set([
-  'ActivityIndicator',
-  'Animated.View',
-  'FlatList',
-  'Image',
-  'Pressable',
-  'SafeAreaView',
-  'ScrollView',
-  'Text',
-  'TextInput',
-  'View'
-])
-
-// Refreshed by C7.2: five clipboard hooks joined the expanded route, which is the whole of the +5 —
-// a writer in the diff-note, Markdown and selection actions, a reader in the selection actions and
-// the attachment probe. The screen's other four clipboard sites (the terminal's paste, the sheets,
-// the quick-command row, the diff-review send) sit outside the walk from `MobileSessionRouteScreen`
-// and so do not move this pin. The copy-path sheet also gained the failure toast the other two had.
-// Refreshed for `reportDictationFailure`, the whole of that +1: the composer's two dictation
-// failure handlers were one policy written twice, and only `onError`'s copy knew about the setup
-// sheet, so a refused start showed the desktop's own `voice_dictation_disabled` as a toast.
-//
-// Refreshed again for the page's keyboard: the screen's own `Keyboard.addListener` pair became the
-// `useSoftKeyboard` seam, because react-native-web never fires those events and the live input row
-// laid itself out under the IME. +2 hooks (the seam, and the one effect split into a visibility one
-// and a height one), +1 effect, -2 registrations and -2 removals for the listener pair, and -6
-// strings: the four event names and the two `'ios'` guards that chose between them. Re-recorded
-// against the merged tree, since neither side's hash covers the other's change.
-//
-// Refreshed for the terminal fields' submit seam: react-native-web withholds `onSubmitEditing`
-// when the Enter keydown reports an open composition, which is a soft keyboard's normal mid-word
-// state, so both of the dock's fields also bind the page's own line-break signal. +4 hooks and +2
-// callbacks in the send actions — `submitLiveInput` and `submitBufferedDraft`, each with a
-// `useTerminalTextFieldSubmitBinding` beside it — and both fields moved their ref, the live one
-// its submit handler too.
-// Moved once more, -1 hook and -1 callback: `submitBufferedDraft` stopped being a `useCallback`.
-// Memoizing it on `[]` froze the per-render `handleSend` it reads, whose guard needs a `client`
-// and an `activeHandle` the first render does not have, so the page's line-break submit could
-// never pass it. Found by pullfrog on #22300.
-// Moved, count unchanged, when the Markdown actions' Back `useEffect` became `useBackClaim`, the
-// seam that also claims the key on the page while a draft is dirty.
-const HEAD_MAIN_HOOK_SHA256 = 'f161e14a9c53d80c3dc75f51dd8ecb339b59b7239c9c3e067791b8612f51ede2'
-const HEAD_HOOK_BINDING_SHA256 = '7a9e256e2058635850253a74b9faa05bcafbbcaa1e5b0b3ef7f677dde85753a2'
-const HEAD_CALLBACK_IDENTITY_SHA256 =
-  '373dca17a060e63d8cb4e32416ca2889b8404cee78f7b47e632940a9980baf23'
-// Pins that no callback body in the route changed unnoticed. Body text, not behaviour: the sends
-// and repo reads inside them now name their `RpcOperation` instead of the raw `sendRequest` port.
-// Refreshed in step 6 for the gesture flush, whose `terminal.send` became `terminalInputSend` and
-// whose accepted-check became that operation's own verdict, then again when that check was spelled
-// `=== true` to match the other four sites reading the same verdict. Refreshed in step 7 for the
-// reply casts the checked readers made unnecessary — the markdown tab doc, the worktree record's
-// `diffComments` and the browser tab's page id are typed by their schemas now. Refreshed once more
-// on the merge, for the display-mode toggle whose send became `terminalDisplayModeSet`. Refreshed
-// for the files domain's step 7, which retired the markdown disk fallback's `{ content, truncated,
-// byteLength }` cast: the preview reader checks the content and salvages the flag, so `readMarkdownTab`
-// reads `fallback.value` directly. The dictation-mode refresh is main's own body again — it forwards
-// whatever mode the reply carried, so an absent one leaves the mic as inert as main left it.
-// Refreshed on the merge of C7.2 and C7.3, which moved this pin from both sides: the terminal
-// subscribe now carries the snapshot byte budget its transport imposes, nothing on a phone and the
-// frame cap inside the shell's page, and the Markdown copy action gained the failure branch that
-// answers a refused write. Re-recorded against the merged tree, since neither side's hash covers
-// the other's body. The hook and string counts are C7.2's and stand.
-// Refreshed once more for the two dictation failure handlers, which now both call
-// `reportDictationFailure` instead of each choosing between the setup sheet and a toast.
-const HEAD_CALLBACK_BODY_SHA256 = '2ccbfb5ee57e7dfeb07dafaee6fa592b95862b3bc898a5ac2995e7c69913bfc4'
-// Refreshed for the startup effect: both `worktree.activate` sends became `worktreeActivate`, and
-// the sleeping-agent check reads that operation's verdict instead of the reply envelope. Refreshed
-// again when the reporter took the reply and interpreted it itself, retiring the hand-built
-// refusal the timer site passed when it had no reply at all. Refreshed once more for the
-// last-visited-worktree effect, whose bare store write became the one writer of that key, so the
-// hybrid shell's page mirror sees it as it is written rather than one `init` later. Refreshed for
-// the diff-comments effect, which now catches the loader's rejection. Count unchanged.
-// Moved again by the keyboard seam above, which is the +1 effect.
-// -1 effect for the Markdown actions' Back registration, which is `useBackClaim`'s own now.
-const HEAD_EFFECT_SHA256 = '69096e20a44fa03a2c364e00a617eeabc437a79bb850b9135408d35fbd4d4a71'
-const HEAD_CONTENT_HOOK_SHA256 = '9c3b612fef3f370d66873aefdbe1d701f20cb64ded31fef5cc45fde6f8189581'
-// Same pin for the 12 bodies that sit in nested functions rather than callbacks, moved by the same
-// rewrite of those send and read expressions. Count unchanged. Refreshed again in step 6 for
-// `handleClearTerminal`, whose send became `terminalBufferClear`, in step 7 for the browser tab
-// create, whose `{ browserPageId?: string }` cast its schema now carries, and once more for
-// `handleCreateTerminal`, whose send became `sessionTabCreateTerminal` and whose `response.ok`
-// branch became that operation's own throw-the-host-message acceptance. Refreshed for negotiated
-// optimistic placement, which defers to legacy host snapshots when ownership paths disagree.
-const HEAD_NESTED_FUNCTION_SHA256 =
-  '923b5ea7fe3330cbd98213b72736bf1f653115ddb5492cb8eb8306d8ca4f28e8'
-// -1 registration and -1 removal: the Markdown actions' `BackHandler` pair is `useBackClaim`'s.
-const HEAD_NATIVE_REGISTRATION_SHA256 =
-  '87d4599f475575131d4d5daa20f0dac579ca6c829353cbb654206ea6965dadae'
-const HEAD_NATIVE_REMOVAL_SHA256 =
-  '089bebbc1e4f2e68c5dbaf189bb605d8d5bb247ef5ca52b9db08cc2661afc097'
-const HEAD_TIMER_CREATION_SHA256 =
-  '1a31b625e2174c3db77272249843196d2b6b06ab1e654a96d8f7858e3082e66b'
-const HEAD_TIMER_CLEANUP_SHA256 = 'c73f1d1c2cc89642f3d727d6f3b6b81860a9d6f34234541a2065ec3d1a8cd116'
-// Six method literals fewer than before step 6: `terminal.send` and `terminal.clearBuffer` went
-// first, then `worktree.activate` twice, `session.tabs.createTerminal` and
-// `terminal.setDisplayMode`. Each is now fixed at its operation's definition instead of being
-// spelled at the call site. Two literals more across C7.2, both of them the toast a refused write
-// now shows: "Couldn't copy path" when the sheets moved onto the clipboard seam, taking the count
-// from 532 to 533, and "Couldn't copy" when the Markdown copy action gained the failure branch the
-// other copy paths already had, taking it to 534.
-//
-// Two more across C7.7, 534 -> 536: `'web'`, the platform guard the Markdown actions'
-// `BackHandler` registration gained so it stops logging on the page, and `"button"`, the
-// accessibility role the header's Back control gained so the page serves it by name. Neither is a
-// behaviour change on a phone. The same `'web'` moves the effect hash, and `"button"` the host-JSX
-// hash. The effect hash moved a second time and back: the diff-notes loader's uncaught rejection
-// was caught and then reverted, because the fix moves `matrix-session.diff-notes-worktree.show-1`
-// and a golden is a review event — so this hash is the one the uncaught `void` call produces.
-//
-// 536 -> 530 for the keyboard seam above: the four event names and the two `'ios'` guards left
-// with the listener pair.
-//
-// The host-JSX hash moved for the header's reconnect tap, which now also checks the re-dial exists:
-// the page's provider hands out none. Nothing a phone renders or does changed.
-//
-// 530 -> 529: `'hardwareBackPress'` left with the Markdown actions' registration for `useBackClaim`.
-//
-// 529 -> 530, and the host-JSX hash: `key="terminal-frame"`, so the page's frame mounts with its
-// onLayout rather than reusing the loading View. Native measured 47 rows before and after: its
-// frame reported either way, and its window is its frame, so both measure paths agree there.
-const HEAD_RUNTIME_STRING_SHA256 =
-  '1be5398cdbdf96b6f7738b63a0e19f536496844140a947939a7f71824b08fe50'
-// Moved by both of the dock's fields: their refs, and the live one's submit handler, are the seam's now.
-const HEAD_HOST_JSX_SHA256 = 'ca4c8b46af86a05cb671de91c22111c9e4aaeefd4a04c7b8b09976ca01a31c9b'
-const HEAD_LEAF_JSX_SHA256 = 'c7e1a4b90197697f1eaa640c38da63281b4f7b84fb036ae2152f00c2f7d7cb77'
-const HEAD_STYLE_REFERENCE_SHA256 =
-  '295a3501c2c6d7bea7c8bbf38b3f3534f01344cd7e1b91bb8e07c040821d596a'
-const HEAD_IDENTITY_FIELD_SHA256 =
-  '91146853930a34dd1f3d80e5c97fbacd7cf19fb93dd26fe8fc6f29169622f9d6'
-const HEAD_NAVIGATION_SHA256 = '9d96f5dad7de555d6553eac39c0fab00efad507470fd562cb9beaa32db16f512'
-const HEAD_CAPABILITY_SHA256 = '67c3154b71b542bb63a4365d3ea75aef19ef133c02f509318619618221786fab'
-
-type Definition = { declaration: ts.FunctionDeclaration; sourceFile: ts.SourceFile }
-type HookFacts = {
-  bindings: string[]
-  callbackBodies: string[]
-  callbacks: string[]
-  effects: string[]
-  hooks: string[]
-}
-
-const printer = ts.createPrinter({ removeComments: true })
-const sourceFiles = new Map<string, ts.SourceFile>()
-
-function parse(relativePath: string): ts.SourceFile {
-  const cached = sourceFiles.get(relativePath)
-  if (cached) {
-    return cached
-  }
-  const filePath = fileURLToPath(new URL(relativePath, import.meta.url))
-  const sourceFile = ts.createSourceFile(
-    relativePath,
-    readFileSync(filePath, 'utf8'),
-    ts.ScriptTarget.Latest,
-    true,
-    relativePath.endsWith('.tsx') ? ts.ScriptKind.TSX : ts.ScriptKind.TS
-  )
-  sourceFiles.set(relativePath, sourceFile)
-  return sourceFile
-}
-
-function canonical(node: ts.Node, sourceFile: ts.SourceFile): string {
-  return printer.printNode(ts.EmitHint.Unspecified, node, sourceFile).replace(/\s+/g, '')
-}
-
-function hash(values: readonly string[]): string {
-  return createHash('sha256').update(values.join('\n')).digest('hex')
-}
-
-function readDefinitions(): Map<string, Definition> {
-  const definitions = new Map<string, Definition>()
-  for (const relativePath of SESSION_FILES) {
-    const sourceFile = parse(relativePath)
-    const visit = (node: ts.Node): void => {
-      if (ts.isFunctionDeclaration(node) && node.name) {
-        definitions.set(node.name.text, { declaration: node, sourceFile })
-      }
-      ts.forEachChild(node, visit)
-    }
-    visit(sourceFile)
-  }
-  return definitions
-}
-
-function visitLogicalFunction(
-  name: string,
-  definitions: ReadonlyMap<string, Definition>,
-  onNode: (node: ts.Node, sourceFile: ts.SourceFile) => void,
-  active = new Set<string>()
-): void {
-  const definition = definitions.get(name)
-  if (!definition?.declaration.body) {
-    throw new Error(`Missing session function: ${name}`)
-  }
-  if (active.has(name)) {
-    throw new Error(`Recursive session function: ${name}`)
-  }
-  const nextActive = new Set(active).add(name)
-  const visit = (node: ts.Node): void => {
-    if (
-      ts.isCallExpression(node) &&
-      ts.isIdentifier(node.expression) &&
-      LOGIC_EXPANSION_NAMES.has(node.expression.text)
-    ) {
-      visitLogicalFunction(node.expression.text, definitions, onNode, nextActive)
-      return
-    }
-    onNode(node, definition.sourceFile)
-    ts.forEachChild(node, visit)
-  }
-  visit(definition.declaration.body)
-}
-
-function readHookFacts(name: string, definitions: ReadonlyMap<string, Definition>): HookFacts {
-  const facts: HookFacts = {
-    bindings: [],
-    callbackBodies: [],
-    callbacks: [],
-    effects: [],
-    hooks: []
-  }
-  visitLogicalFunction(name, definitions, (node, sourceFile) => {
-    if (
-      !ts.isCallExpression(node) ||
-      !ts.isIdentifier(node.expression) ||
-      !/^use[A-Z]/.test(node.expression.text)
-    ) {
-      return
-    }
-    const hookName = node.expression.text
-    facts.hooks.push(hookName)
-    const owner = ts.isVariableDeclaration(node.parent)
-      ? node.parent.name.getText(sourceFile)
-      : ts.isExpressionStatement(node.parent)
-        ? '<statement>'
-        : ts.isCallExpression(node.parent) && ts.isIdentifier(node.parent.expression)
-          ? `<argument:${node.parent.expression.text}>`
-          : '<nested>'
-    const lastArgument = node.arguments.at(-1)
-    const dependencies =
-      lastArgument && ts.isArrayLiteralExpression(lastArgument)
-        ? canonical(lastArgument, sourceFile)
-        : '<none>'
-    facts.bindings.push(`${hookName}|${owner}|${dependencies}`)
-    if (hookName === 'useCallback') {
-      facts.callbacks.push(`${owner}|${dependencies}`)
-      facts.callbackBodies.push(
-        `${owner}|${canonical(node.arguments[0], sourceFile)}|${dependencies}`
-      )
-    }
-    if (hookName === 'useEffect') {
-      facts.effects.push(`${canonical(node.arguments[0], sourceFile)}|${dependencies}`)
-    }
-  })
-  return facts
-}
-
-function readNestedFunctions(definitions: ReadonlyMap<string, Definition>): string[] {
-  const functions: string[] = []
-  const visitDefinition = (name: string, active: ReadonlySet<string>): void => {
-    const definition = definitions.get(name)
-    if (!definition?.declaration.body || active.has(name)) {
-      throw new Error(`Invalid nested-function stage: ${name}`)
-    }
-    const nextActive = new Set(active).add(name)
-    const visit = (node: ts.Node): void => {
-      if (
-        ts.isCallExpression(node) &&
-        ts.isIdentifier(node.expression) &&
-        LOGIC_EXPANSION_NAMES.has(node.expression.text)
-      ) {
-        visitDefinition(node.expression.text, nextActive)
-        return
-      }
-      if (ts.isFunctionDeclaration(node) && node.name) {
-        functions.push(`${node.name.text}|${canonical(node, definition.sourceFile)}`)
-        return
-      }
-      ts.forEachChild(node, visit)
-    }
-    visit(definition.declaration.body)
-  }
-  visitDefinition(ROOT_COMPONENT, new Set())
-  return functions
-}
-
-function readNativeAndTimerFacts(definitions: ReadonlyMap<string, Definition>): {
-  cleanups: string[]
-  creations: string[]
-  registrations: string[]
-  removals: string[]
-} {
-  const registrations: string[] = []
-  const removals: string[] = []
-  const creations: string[] = []
-  const cleanups: string[] = []
-  const collect = (node: ts.Node, sourceFile: ts.SourceFile): void => {
-    if (!ts.isCallExpression(node)) {
-      return
-    }
-    if (ts.isPropertyAccessExpression(node.expression)) {
-      const receiver = node.expression.expression.getText(sourceFile)
-      const method = node.expression.name.text
-      if (
-        ['BackHandler', 'AppState', 'Keyboard'].includes(receiver) &&
-        ['addEventListener', 'addListener'].includes(method)
-      ) {
-        registrations.push(canonical(node, sourceFile))
-      }
-      if (method === 'remove') {
-        removals.push(canonical(node, sourceFile))
-      }
-    }
-    if (ts.isIdentifier(node.expression)) {
-      if (['setTimeout', 'setInterval', 'requestAnimationFrame'].includes(node.expression.text)) {
-        creations.push(canonical(node, sourceFile))
-      }
-      if (
-        ['clearTimeout', 'clearInterval', 'cancelAnimationFrame'].includes(node.expression.text)
-      ) {
-        cleanups.push(canonical(node, sourceFile))
-      }
-    }
-  }
-  visitLogicalFunction('FileReader', definitions, collect)
-  visitLogicalFunction(ROOT_COMPONENT, definitions, collect)
-  return { cleanups, creations, registrations, removals }
-}
-
-function isRuntimeNode(node: ts.Node): boolean {
-  for (let parent = node.parent; parent; parent = parent.parent) {
-    if (
-      ts.isImportDeclaration(parent) ||
-      ts.isExportDeclaration(parent) ||
-      ts.isImportTypeNode(parent) ||
-      ts.isTypeNode(parent)
-    ) {
-      return false
-    }
-  }
-  return true
-}
-
-function readRuntimeStrings(): string[] {
-  const values: string[] = []
-  for (const relativePath of SESSION_FILES) {
-    const visit = (node: ts.Node): void => {
-      if (isRuntimeNode(node)) {
-        if (
-          ts.isStringLiteral(node) ||
-          ts.isNoSubstitutionTemplateLiteral(node) ||
-          ts.isTemplateHead(node) ||
-          ts.isTemplateMiddle(node) ||
-          ts.isTemplateTail(node)
-        ) {
-          values.push(node.text)
-        }
-        if (ts.isJsxText(node) && node.text.trim()) {
-          values.push(node.text.replace(/\s+/g, ' ').trim())
-        }
-      }
-      ts.forEachChild(node, visit)
-    }
-    visit(parse(relativePath))
-  }
-  return values.sort()
-}
-
-function readJsxFacts(definitions: ReadonlyMap<string, Definition>): {
-  host: string[]
-  leaf: string[]
-  styleReferences: string[]
-} {
-  const host: string[] = []
-  const leaf: string[] = []
-  const active = new Set<string>()
-  const visitDefinition = (name: string): void => {
-    const definition = definitions.get(name)
-    if (!definition?.declaration.body || active.has(name)) {
-      throw new Error(`Invalid JSX stage: ${name}`)
-    }
-    active.add(name)
-    const visit = (node: ts.Node): void => {
-      if (
-        ts.isCallExpression(node) &&
-        ts.isIdentifier(node.expression) &&
-        LOGIC_EXPANSION_NAMES.has(node.expression.text)
-      ) {
-        visitDefinition(node.expression.text)
-        return
-      }
-      if (ts.isJsxElement(node) || ts.isJsxSelfClosingElement(node)) {
-        const opening = ts.isJsxElement(node) ? node.openingElement : node
-        const tagName = opening.tagName.getText(definition.sourceFile)
-        if (SURFACE_EXPANSION_NAMES.has(tagName)) {
-          visitDefinition(tagName)
-          return
-        }
-        const attributes = opening.attributes.properties
-          .map((attribute) => {
-            if (ts.isJsxSpreadAttribute(attribute)) {
-              return `...${canonical(attribute.expression, definition.sourceFile)}`
-            }
-            const attributeName = attribute.name.getText(definition.sourceFile)
-            if (!attribute.initializer) {
-              return attributeName
-            }
-            if (ts.isStringLiteral(attribute.initializer)) {
-              return `${attributeName}=${JSON.stringify(attribute.initializer.text)}`
-            }
-            return `${attributeName}=${
-              attribute.initializer.expression
-                ? canonical(attribute.initializer.expression, definition.sourceFile)
-                : ''
-            }`
-          })
-          .join(',')
-        ;(HOST_COMPONENT_NAMES.has(tagName) ? host : leaf).push(`${tagName}|${attributes}`)
-        for (const attribute of opening.attributes.properties) {
-          ts.forEachChild(attribute, visit)
-        }
-        if (ts.isJsxElement(node)) {
-          for (const child of node.children) {
-            visit(child)
-          }
-        }
-        return
-      }
-      if (ts.isJsxFragment(node)) {
-        for (const child of node.children) {
-          visit(child)
-        }
-        return
-      }
-      ts.forEachChild(node, visit)
-    }
-    visit(definition.declaration.body)
-    active.delete(name)
-  }
-  for (const name of CONTENT_COMPONENT_NAMES) {
-    visitDefinition(name)
-  }
-  visitDefinition(ROOT_COMPONENT)
-  const styleReferences: string[] = []
-  for (const record of [...host, ...leaf]) {
-    for (const match of record.matchAll(/styles\.([A-Za-z0-9_]+)/g)) {
-      styleReferences.push(match[1])
-    }
-  }
-  return { host, leaf, styleReferences }
-}
-
-function readCompatibilityFacts(definitions: ReadonlyMap<string, Definition>): {
-  capabilities: string[]
-  identityFields: string[]
-  navigation: string[]
-} {
-  const capabilities: string[] = []
-  const identityFields: string[] = []
-  const navigation: string[] = []
-  visitLogicalFunction(ROOT_COMPONENT, definitions, (node, sourceFile) => {
-    if (!isRuntimeNode(node)) {
-      return
-    }
-    if (ts.isPropertyAssignment(node)) {
-      const name = node.name.getText(sourceFile)
-      if (['notifyClients', 'deviceToken', 'clientId'].includes(name)) {
-        identityFields.push(`${name}|${canonical(node.initializer, sourceFile)}`)
-      }
-      if (
-        name === 'client' &&
-        ts.isObjectLiteralExpression(node.initializer) &&
-        node.initializer.properties.some(
-          (property) => property.name?.getText(sourceFile) === 'id'
-        ) &&
-        node.initializer.properties.some(
-          (property) => property.name?.getText(sourceFile) === 'type'
-        )
-      ) {
-        identityFields.push(`client|${canonical(node.initializer, sourceFile)}`)
-      }
-    }
-    if (!ts.isCallExpression(node)) {
-      return
-    }
-    if (
-      ts.isPropertyAccessExpression(node.expression) &&
-      node.expression.expression.getText(sourceFile) === 'router' &&
-      ['push', 'replace', 'back'].includes(node.expression.name.text)
-    ) {
-      navigation.push(canonical(node, sourceFile))
-    }
-    const callName = ts.isIdentifier(node.expression)
-      ? node.expression.text
-      : ts.isPropertyAccessExpression(node.expression)
-        ? node.expression.name.text
-        : ''
-    const callText = canonical(node, sourceFile)
-    if (
-      ['startRuntimeCapabilityProbe', 'supportsMobileQuickCommands'].includes(callName) ||
-      (callName === 'includes' && callText.includes('capabilities.includes'))
-    ) {
-      capabilities.push(callText)
-    }
-  })
-  return { capabilities, identityFields, navigation }
-}
-
-describe('mobile session route extraction parity', () => {
-  it('preserves hooks, callbacks, effects, and nested action bodies', () => {
-    const definitions = readDefinitions()
-    const main = readHookFacts(ROOT_COMPONENT, definitions)
-    const contentBindings = CONTENT_COMPONENT_NAMES.flatMap(
-      (name) => readHookFacts(name, definitions).bindings
-    )
-    expect(main.hooks).toHaveLength(282)
-    expect(hash(main.hooks)).toBe(HEAD_MAIN_HOOK_SHA256)
-    expect(hash(main.bindings)).toBe(HEAD_HOOK_BINDING_SHA256)
-    expect(main.callbacks).toHaveLength(79)
-    expect(hash(main.callbacks)).toBe(HEAD_CALLBACK_IDENTITY_SHA256)
-    expect(hash(main.callbackBodies)).toBe(HEAD_CALLBACK_BODY_SHA256)
-    expect(main.effects).toHaveLength(24)
-    expect(hash(main.effects)).toBe(HEAD_EFFECT_SHA256)
-    expect(contentBindings).toHaveLength(14)
-    expect(hash(contentBindings)).toBe(HEAD_CONTENT_HOOK_SHA256)
-    const nestedFunctions = readNestedFunctions(definitions)
-    expect(nestedFunctions).toHaveLength(12)
-    expect(hash(nestedFunctions)).toBe(HEAD_NESTED_FUNCTION_SHA256)
-  })
-
-  it('preserves native listeners, timers, identity payloads, and compatibility gates', () => {
-    const definitions = readDefinitions()
-    const native = readNativeAndTimerFacts(definitions)
-    expect(native.registrations).toHaveLength(4)
-    expect(hash(native.registrations)).toBe(HEAD_NATIVE_REGISTRATION_SHA256)
-    expect(native.removals).toHaveLength(6)
-    expect(hash(native.removals)).toBe(HEAD_NATIVE_REMOVAL_SHA256)
-    expect(native.creations.filter((fact) => fact.startsWith('setTimeout'))).toHaveLength(7)
-    expect(native.creations.filter((fact) => fact.startsWith('setInterval'))).toHaveLength(1)
-    expect(
-      native.creations.filter((fact) => fact.startsWith('requestAnimationFrame'))
-    ).toHaveLength(1)
-    expect(hash(native.creations)).toBe(HEAD_TIMER_CREATION_SHA256)
-    expect(native.cleanups.filter((fact) => fact.startsWith('clearTimeout'))).toHaveLength(11)
-    expect(native.cleanups.filter((fact) => fact.startsWith('clearInterval'))).toHaveLength(1)
-    expect(native.cleanups.filter((fact) => fact.startsWith('cancelAnimationFrame'))).toHaveLength(
-      1
-    )
-    expect(hash(native.cleanups)).toBe(HEAD_TIMER_CLEANUP_SHA256)
-    const compatibility = readCompatibilityFacts(definitions)
-    expect(compatibility.identityFields).toHaveLength(14)
-    expect(hash(compatibility.identityFields)).toBe(HEAD_IDENTITY_FIELD_SHA256)
-    expect(compatibility.navigation).toHaveLength(6)
-    expect(hash(compatibility.navigation)).toBe(HEAD_NAVIGATION_SHA256)
-    expect(compatibility.capabilities).toHaveLength(6)
-    expect(hash(compatibility.capabilities)).toBe(HEAD_CAPABILITY_SHA256)
-  })
-
-  it('preserves runtime strings, styles, and the expanded JSX tree', () => {
-    const strings = readRuntimeStrings()
-    expect(strings).toHaveLength(531)
-    expect(hash(strings)).toBe(HEAD_RUNTIME_STRING_SHA256)
-    const jsx = readJsxFacts(readDefinitions())
-    expect(jsx.host).toHaveLength(124)
-    expect(hash(jsx.host)).toBe(HEAD_HOST_JSX_SHA256)
-    expect(jsx.leaf).toHaveLength(61)
-    expect(hash(jsx.leaf)).toBe(HEAD_LEAF_JSX_SHA256)
-    expect(jsx.styleReferences).toHaveLength(172)
-    expect(hash(jsx.styleReferences)).toBe(HEAD_STYLE_REFERENCE_SHA256)
-  })
-})
diff --git a/mobile/src/session/mobile-session-route-source-family.test-support.ts b/mobile/src/session/mobile-session-route-source-family.test-support.ts
deleted file mode 100644
index 23ae6fb348e4..000000000000
--- a/mobile/src/session/mobile-session-route-source-family.test-support.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
-
-/**
- * The session screen as one source family, rooted at the component the route mounts.
- *
- * `MobileSessionRouteScreen.tsx` and not the route file: C7.7 made that file a flag switch, whose
- * business is which of the two screens to render and not what the session screen does. Walking it
- * would pin the switch's own params and literals into an extraction parity hash that is about the
- * screen, and the root function this family is read from is the one that calls the controller.
- */
-export const MOBILE_SESSION_ROUTE_SOURCE_FILES = [
-  './MobileSessionRouteScreen.tsx',
-  './use-mobile-session-controller.ts',
-  './use-mobile-session-foundation.ts',
-  './use-mobile-session-screen-state.ts',
-  './use-mobile-session-terminal-runtime.ts',
-  './use-mobile-session-feedback-capabilities.ts',
-  './use-mobile-session-native-chat-dictation.ts',
-  './use-mobile-session-terminal-subscription-foundation.ts',
-  './use-mobile-session-terminal-subscription.ts',
-  './use-mobile-session-terminal-stream-display.ts',
-  './use-mobile-session-terminal-list.ts',
-  './use-mobile-session-tab-application.ts',
-  './use-mobile-session-document-readers.ts',
-  './use-mobile-session-diff-comments.ts',
-  './use-mobile-session-markdown-actions.ts',
-  './use-mobile-session-tab-reconciliation.ts',
-  './use-mobile-session-lifecycle.ts',
-  './use-mobile-session-keyboard-state.ts',
-  './use-mobile-session-startup.ts',
-  './use-mobile-session-preference-focus.ts',
-  './use-mobile-session-tab-switching.ts',
-  './use-mobile-session-terminal-webview.ts',
-  './use-mobile-session-terminal-send-actions.ts',
-  './use-mobile-session-file-actions.ts',
-  './use-mobile-session-terminal-input.ts',
-  './use-mobile-session-accessory-selection.ts',
-  './use-mobile-session-attachments.ts',
-  './use-mobile-session-terminal-create-actions.ts',
-  './use-mobile-session-content-create-actions.ts',
-  './use-mobile-session-close-actions.ts',
-  './use-mobile-session-bulk-close.ts',
-  './use-mobile-session-presentation.ts',
-  './use-mobile-session-panel-route-actions.tsx',
-  './MobileSessionMarkdownReader.tsx',
-  './MobileSessionDiffLineRow.tsx',
-  './MobileSessionFileReader.tsx',
-  './MobileSessionSurface.tsx',
-  './MobileSessionHeader.tsx',
-  './MobileSessionContentRow.tsx',
-  './MobileSessionActiveContent.tsx',
-  './MobileSessionCommandDock.tsx',
-  './MobileSessionSheets.tsx'
-] as const
-
-export function readMobileSessionRouteSource(relativePath: string): string {
-  return readFileSync(fileURLToPath(new URL(relativePath, import.meta.url)), 'utf8')
-}
-
-export function readMobileSessionRouteSourceFamily(
-  relativePaths: readonly string[] = MOBILE_SESSION_ROUTE_SOURCE_FILES
-): string {
-  return relativePaths
-    .map(
-      (relativePath) => `// Source: ${relativePath}\n${readMobileSessionRouteSource(relativePath)}`
-    )
-    .join('\n')
-}
diff --git a/mobile/src/session/mobile-session-route-types.ts b/mobile/src/session/mobile-session-route-types.ts
index a584049360a0..b28583bd0378 100644
--- a/mobile/src/session/mobile-session-route-types.ts
+++ b/mobile/src/session/mobile-session-route-types.ts
@@ -91,6 +91,8 @@ export type MarkdownDocState =
       saving?: boolean
       saveError?: string
       readOnlyReason?: string
+      truncated?: true
+      byteLength?: number
     }
   | { status: 'error'; message: string }
 
diff --git a/mobile/src/session/mobile-session-route.test.ts b/mobile/src/session/mobile-session-route.test.ts
index 33872e0271f3..4cd040a061a1 100644
--- a/mobile/src/session/mobile-session-route.test.ts
+++ b/mobile/src/session/mobile-session-route.test.ts
@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs'
 import { describe, expect, it, vi } from 'vitest'
 import { mobileSessionRouteTarget } from './mobile-session-route'
 import {
@@ -7,8 +6,6 @@ import {
   type HostStackNavigationState
 } from '../navigation/host-stack-navigation'
 
-const homeSource = readFileSync(new URL('../home/MobileHomeScreen.tsx', import.meta.url), 'utf8')
-
 function navigationHarness(initialState: HostStackNavigationState) {
   const stateListeners = new Set<() => void>()
   let state = initialState
@@ -95,20 +92,4 @@ describe('mobile session route', () => {
       payload: target
     })
   })
-
-  it('routes the home Resume card through the cold-navigator-safe transition', () => {
-    expect(homeSource).toContain('onOpenResume={openResume}')
-
-    // The tap handler itself must go through the coordinated transition; its only
-    // direct push is the shallow noticed host-index route for a proven-missing target.
-    const handlerStart = homeSource.indexOf('const openResume = useCallback(')
-    const handlerEnd = homeSource.indexOf('[data.router, openMobileSession]', handlerStart)
-    expect(handlerStart).toBeGreaterThanOrEqual(0)
-    expect(handlerEnd).toBeGreaterThan(handlerStart)
-
-    const openResume = homeSource.slice(handlerStart, handlerEnd)
-    expect(openResume).toContain('openMobileSession({')
-    expect(openResume.match(/router\.push\(/g)).toHaveLength(1)
-    expect(openResume).toContain('data.router.push(hostRouteWithNotice(')
-  })
 })
diff --git a/mobile/src/session/mobile-session-startup-source.test.ts b/mobile/src/session/mobile-session-startup-source.test.ts
deleted file mode 100644
index b457164beed4..000000000000
--- a/mobile/src/session/mobile-session-startup-source.test.ts
+++ /dev/null
@@ -1,295 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  readMobileSessionRouteSource,
-  readMobileSessionRouteSourceFamily
-} from './mobile-session-route-source-family.test-support'
-
-const source = readMobileSessionRouteSourceFamily()
-const startupSource = readMobileSessionRouteSource('./use-mobile-session-startup.ts')
-const tabReconciliationSource = readMobileSessionRouteSource(
-  './use-mobile-session-tab-reconciliation.ts'
-)
-const bulkCloseSource = readMobileSessionRouteSource('./use-mobile-session-bulk-close.ts')
-const presentationSource = readMobileSessionRouteSource('./use-mobile-session-presentation.ts')
-const tabSwitchingSource = readMobileSessionRouteSource('./use-mobile-session-tab-switching.ts')
-const sheetsSource = readMobileSessionRouteSource('./MobileSessionSheets.tsx')
-const reconciliationHookSource = readMobileSessionRouteSource(
-  './use-mobile-session-tabs-reconciliation.ts'
-)
-const terminalInventoryRecoverySource = readMobileSessionRouteSource(
-  './use-mobile-terminal-inventory-recovery.ts'
-)
-const terminalSubscriptionSource = readMobileSessionRouteSource(
-  './use-mobile-session-terminal-subscription.ts'
-)
-const terminalListSource = readMobileSessionRouteSource('./use-mobile-session-terminal-list.ts')
-const tabReconciliationOwnerSource = readMobileSessionRouteSource(
-  './use-mobile-session-tab-reconciliation.ts'
-)
-const autoCreateHookSource = readMobileSessionRouteSource(
-  './use-initial-session-terminal-autocreate.ts'
-)
-const foundationSource = readMobileSessionRouteSource('./use-mobile-session-foundation.ts')
-const terminalRuntimeSource = readMobileSessionRouteSource(
-  './use-mobile-session-terminal-runtime.ts'
-)
-const terminalSubscriptionSourceForIdentity = readMobileSessionRouteSource(
-  './use-mobile-session-terminal-subscription.ts'
-)
-const lifecycleSource = readMobileSessionRouteSource('./use-mobile-session-lifecycle.ts')
-
-function sliceBetween(startPattern: string, endPattern: string, targetSource = source): string {
-  const start = targetSource.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = targetSource.indexOf(endPattern, start)
-  expect(end).toBeGreaterThan(start)
-  return targetSource.slice(start, end)
-}
-
-describe('mobile session startup', () => {
-  it('auto-creates one terminal for a newly created empty session', () => {
-    expect(source).toContain('useWorktreeSessionTabsLoaded(worktreeId)')
-    expect(source).toContain(
-      'initialSessionAutoCreateRef.current = createInitialSessionAutoCreateState()'
-    )
-
-    const autoCreateCall = sliceBetween(
-      'useInitialSessionTerminalAutoCreate({',
-      'const connectionVerdict =',
-      presentationSource
-    )
-    expect(autoCreateCall).toContain('stateRef: initialSessionAutoCreateRef')
-    expect(autoCreateCall).toContain(
-      'consumeCreationRoute: () => router.setParams({ created: undefined })'
-    )
-    expect(autoCreateCall).toContain("newlyCreatedWorkspace: created === '1'")
-    expect(autoCreateCall).toContain('visibleTabCount: visibleTabs.length')
-    expect(autoCreateCall).toContain('createTerminal: () => void handleCreateTerminal()')
-
-    expect(autoCreateHookSource).toContain('shouldAutoCreateInitialSessionTerminal({')
-    expect(autoCreateHookSource).toContain('stateRef.current.autoCreatedForWorktree === worktreeId')
-    expect(autoCreateHookSource).toContain('stateRef.current.autoCreatedForWorktree = worktreeId')
-    expect(autoCreateHookSource).toContain("connState === 'connected'")
-    expect(autoCreateHookSource).toContain('(visibleTabCount > 0 || activeHandle !== null)')
-    // Why: both callbacks are re-created every render, so the effect must reach them
-    // through useEffectEvent rather than deps or a render-time ref write.
-    expect(autoCreateHookSource).toContain('useEffectEvent(args.consumeCreationRoute)')
-    expect(autoCreateHookSource).toContain('useEffectEvent(args.createTerminal)')
-    expect(autoCreateHookSource).toContain('consumeCreationRoute()')
-    expect(autoCreateHookSource).toContain('createTerminal()')
-  })
-
-  it('arms the auto-create only until the route has published a tab (#9717)', () => {
-    // Emptiness after a populated list is a close, not a cold hydrate.
-    expect(source).toContain(
-      'initialSessionAutoCreateRef.current.sawSessionTabs ||= nextTabs.length > 0'
-    )
-
-    const autoCreateCall = sliceBetween(
-      'useInitialSessionTerminalAutoCreate({',
-      'const connectionVerdict =',
-      presentationSource
-    )
-    expect(autoCreateCall).toContain('stateRef: initialSessionAutoCreateRef')
-    expect(autoCreateHookSource).toContain('sawSessionTabs: stateRef.current.sawSessionTabs')
-  })
-
-  it('delegates stream ownership while retaining degraded polling and a certified sweep', () => {
-    expect(source).toContain('useMobileSessionTabsReconciliation<')
-    expect(source).toContain('const applicationRevision = ++appliedSessionTabsRevisionRef.current')
-    expect(source).toContain('getApplicationRevision: getSessionTabsApplicationRevision')
-    expect(source).not.toContain("client.subscribe(\n      'session.tabs.subscribe'")
-    expect(reconciliationHookSource).toContain("client.subscribe(\n      'session.tabs.subscribe'")
-    expect(reconciliationHookSource).toContain("if (AppState.currentState !== 'active')")
-    expect(reconciliationHookSource).toContain('suspendTerminalInventoryRecovery(true)')
-    expect(reconciliationHookSource).toContain('controller.poll()')
-    expect(reconciliationHookSource).toContain('tabsRequest !== null')
-    expect(reconciliationHookSource).toContain('void refreshTerminalInventory()')
-    expect(reconciliationHookSource).toContain("AppState.addEventListener('change'")
-    expect(reconciliationHookSource).toContain('const interval = setInterval(')
-    expect(reconciliationHookSource).toContain('RECONCILIATION_INTERVAL_MS = 2000')
-    expect(terminalInventoryRecoverySource).toContain('CERTIFIED_TERMINAL_SWEEP_MS = 60_000')
-    expect(reconciliationHookSource).toContain('controller.setReconciliationActive(false)')
-    expect(reconciliationHookSource).toContain('clearInterval(interval)')
-    expect(reconciliationHookSource).toContain('appStateSubscription.remove()')
-  })
-
-  it('binds terminal identity to the shared client before subscription effects run', () => {
-    expect(foundationSource).toContain('const { client, clientId, state: connState }')
-    expect(foundationSource).toContain('    clientId,')
-    expect(terminalRuntimeSource).toContain('useRef<string | null>(clientId)')
-    expect(terminalRuntimeSource).toContain('deviceTokenRef.current = clientId')
-    expect(terminalRuntimeSource).toContain('inputGate.canSend && clientId !== null')
-    expect(terminalSubscriptionSourceForIdentity).toContain('if (clientId === null)')
-    expect(terminalSubscriptionSourceForIdentity).toContain(
-      "client: { id: clientId, type: 'mobile' as const }"
-    )
-    expect(lifecycleSource).not.toContain('deviceTokenRef.current = host.deviceToken')
-  })
-
-  it('confirms terminal stream teardown with a committed inventory-recovery bridge', () => {
-    expect(terminalSubscriptionSource).toContain(
-      "if (data.type === 'end' || data.type === 'error')"
-    )
-    expect(terminalSubscriptionSource).toContain('signalTerminalInventoryRecovery()')
-    expect(terminalInventoryRecoverySource).toContain('actionRef.current = recoveryAction')
-    expect(terminalInventoryRecoverySource).toContain('pendingSignalScopeRef.current = scopeKey')
-    expect(terminalInventoryRecoverySource).toContain(
-      'committedScope !== null && committedScope !== scopeKey'
-    )
-    expect(terminalListSource).toContain('return terminalInventoryRequest.activate()')
-    expect(terminalListSource).toContain('if (!isCurrent() || !response.accepted)')
-    expect(terminalInventoryRecoverySource).toContain(
-      'TERMINAL_INVENTORY_CONFIRMATION_DELAY_MS = 750'
-    )
-    expect(terminalInventoryRecoverySource).toContain(
-      'refreshTerminalInventory({ allowEmptyLoaded: true })'
-    )
-  })
-
-  it('loads session tabs without waiting for desktop activation', () => {
-    const startupEffect = sliceBetween(
-      'void (async () => {',
-      'return () => {\n      disposed = true',
-      startupSource
-    )
-
-    // Both sends migrated to the typed `worktreeActivate` operation in step 6; what these pin is
-    // unchanged — the plain activation is fired and not awaited, and it goes out before the tab load.
-    expect(startupEffect).toContain('void worktreeActivate\n          .request(client, {')
-    expect(startupEffect).toContain("if (client && created !== '1' && !isFloatingWorkspaceRoute)")
-    expect(startupEffect).toContain("if (client && created === '1' && !isFloatingWorkspaceRoute)")
-    expect(startupEffect).toContain('notifyClients: false')
-    expect(startupEffect).toContain("navigation: 'caller'")
-    expect(startupEffect).not.toContain('await worktreeActivate\n          .request(client, {')
-    expect(startupEffect.indexOf('worktreeActivate\n          .request(client, {')).toBeLessThan(
-      startupEffect.indexOf('await ensureSessionTabs()')
-    )
-    expect(startupEffect).toContain('headlessActivationNeedsHostRenderer(activation.value)')
-    expect(startupEffect).toContain("showToast('Open Orca on the host to wake sleeping agents.'")
-  })
-
-  it('fails runtime capability gates closed before probing a replacement client', () => {
-    const capabilityEffect = sliceBetween(
-      'const hostQueryReplyInputSupportedRef = useRef(false)',
-      'return {\n    consumeAcceptedSessionTabs',
-      tabReconciliationSource
-    )
-    const probeStart = capabilityEffect.indexOf('startRuntimeCapabilityProbe(client,')
-
-    expect(probeStart).toBeGreaterThanOrEqual(0)
-    for (const reset of [
-      'setBrowserScreencastSupported(null)',
-      'setAgentSessionHistorySupported(null)',
-      'setQuickCommandsSupported(null)',
-      'setShowQuickCommands(false)',
-      'hostQueryReplyInputSupportedRef.current = false'
-    ]) {
-      const resetIndex = capabilityEffect.lastIndexOf(reset)
-      expect(resetIndex).toBeGreaterThanOrEqual(0)
-      expect(resetIndex).toBeLessThan(probeStart)
-    }
-  })
-
-  it('activates an already-selected pending terminal tab after hydration', () => {
-    expect(source).toContain(
-      'const pendingTerminalActivationAttemptRef = useRef<string | null>(null)'
-    )
-    expect(source).toContain('pendingTerminalActivationAttemptRef.current = null')
-
-    const pendingActivationEffect = sliceBetween(
-      "if (!client || connState !== 'connected' || !activePendingTerminalTab) {",
-      'return {\n    bulkCloseActions',
-      bulkCloseSource
-    )
-    expect(pendingActivationEffect).toContain(
-      'pendingTerminalActivationAttemptRef.current === activationKey'
-    )
-    expect(pendingActivationEffect).toContain('activateMobileSessionTab(client,')
-    expect(pendingActivationEffect).toContain('tabId: activePendingTerminalTab.id')
-    expect(pendingActivationEffect).toContain('leafId: activePendingTerminalTab.leafId')
-    expect(pendingActivationEffect).toContain('notifyClients: false')
-    expect(pendingActivationEffect).toContain("navigation: 'caller'")
-    expect(pendingActivationEffect).toContain(
-      'applySessionTabs((response as RpcSuccess).result as SessionTabsResult)'
-    )
-    expect(pendingActivationEffect).toContain('scheduleDelayedAction(() => void fetchSessionTabs()')
-  })
-
-  it('keeps ready terminal taps local while publishing caller selection', () => {
-    const readyTerminalSwitch = sliceBetween(
-      'const switchTab = useCallback(',
-      'const switchSessionTab = useCallback(',
-      tabSwitchingSource
-    )
-
-    expect(readyTerminalSwitch).not.toContain('focusMobileTerminal(client, handle)')
-    expect(readyTerminalSwitch).toContain('activateMobileSessionTab(client,')
-    expect(readyTerminalSwitch).toContain('notifyClients: false')
-    expect(readyTerminalSwitch).toContain("navigation: 'caller'")
-  })
-
-  it('keeps background and pending session-tab activation local to the phone', () => {
-    const activationRequests = source.split('activateMobileSessionTab(client,').slice(1)
-
-    expect(activationRequests).toHaveLength(4)
-    for (const request of activationRequests) {
-      expect(request.slice(0, request.indexOf('})'))).toContain('notifyClients: false')
-      expect(request.slice(0, request.indexOf('})'))).toContain("navigation: 'caller'")
-    }
-  })
-
-  it('keeps dynamic agent rows above fixed New Tab actions', () => {
-    const newTabActions = sliceBetween(
-      'title="New Tab"',
-      'onClose={() => setShowCreateTabDrawer',
-      sheetsSource
-    )
-
-    expect(newTabActions.indexOf('...createTabAgentActions')).toBeLessThan(
-      newTabActions.indexOf("label: 'Terminal'")
-    )
-    expect(newTabActions.indexOf("label: 'Terminal'")).toBeLessThan(
-      newTabActions.indexOf("label: 'Browser'")
-    )
-    expect(newTabActions.indexOf("label: 'Browser'")).toBeLessThan(
-      newTabActions.indexOf("label: 'Markdown Note'")
-    )
-  })
-
-  it('wires pending-handle recovery through its bounded context (STA-4256)', () => {
-    const applySessionTabs = sliceBetween(
-      'const applySessionTabs = useCallback(',
-      'const consumeAcceptedSessionTabs = useCallback('
-    )
-    const recoveryContext = sliceBetween(
-      'const pendingTerminalRecoveryContextCache = useMemo(',
-      'const sessionTabsFetchReporting',
-      tabReconciliationOwnerSource
-    )
-
-    const tabsRefWrite = 'sessionTabsRef.current = nextTabs'
-    const tabsStateWrite = 'setSessionTabs((prev)'
-    const activeRefWrite = 'activeSessionTabIdRef.current = active?.id ?? null'
-    const activeStateWrite = 'setActiveSessionTabId(active?.id ?? null)'
-    for (const write of [tabsRefWrite, tabsStateWrite, activeRefWrite, activeStateWrite]) {
-      expect(applySessionTabs).toContain(write)
-    }
-    expect(applySessionTabs.indexOf(tabsRefWrite)).toBeLessThan(
-      applySessionTabs.indexOf(tabsStateWrite)
-    )
-    expect(applySessionTabs.indexOf(activeRefWrite)).toBeLessThan(
-      applySessionTabs.indexOf(activeStateWrite)
-    )
-    expect(recoveryContext).toContain('() => new PendingTerminalHandleRecoveryContextCache()')
-    expect(recoveryContext).toContain('sessionTabsRef.current,')
-    expect(recoveryContext).toContain('activeSessionTabIdRef.current')
-    expect(recoveryContext).toContain(
-      'const pendingTerminalRecoveryContextKey = getPendingTerminalRecoveryContextKey()'
-    )
-    expect(source).toContain('hasRecoveryNeed: hasSessionTabsRecoveryNeed')
-    expect(source).toContain('getPendingTerminalRecoveryContextKey,')
-    expect(source).toContain('onPendingTerminalRecoveryParked: setParkedPendingTerminalContext')
-    expect(source).toContain('retryPendingTerminalRecovery()')
-  })
-})
diff --git a/mobile/src/session/mobile-session-terminal-frame-layout.test.tsx b/mobile/src/session/mobile-session-terminal-frame-layout.test.tsx
index 857a6ac561ac..1cec63717c73 100644
--- a/mobile/src/session/mobile-session-terminal-frame-layout.test.tsx
+++ b/mobile/src/session/mobile-session-terminal-frame-layout.test.tsx
@@ -45,17 +45,20 @@ import { MobileSessionActiveContent } from './MobileSessionActiveContent'
 
 type Controller = Parameters<typeof MobileSessionActiveContent>[0]['controller']
 
+type Branch = 'loading' | 'pending' | 'terminal'
+
 function controller(
-  showLoadingState: boolean,
-  notifyTerminalFrameHeight: (height: number) => void
+  branch: Branch | boolean,
+  notifyTerminalFrame: (frame: { width: number; height: number }) => void
 ): Controller {
+  const shown = branch === true ? 'loading' : branch === false ? 'terminal' : branch
   const scope = {
-    showLoadingState,
+    showLoadingState: shown === 'loading',
+    activePendingTerminalTab: shown === 'pending' ? { title: 'Loading terminal' } : null,
+    isPendingTerminalRecoveryParked: false,
     showEmptyState: false,
     terminals: [],
-    terminalFrameHeightRef: { current: 0 },
-    setTerminalFrameWidth: () => {},
-    notifyTerminalFrameHeight,
+    notifyTerminalFrame,
     dictation: { isRecording: false },
     nativeChatSendError: { message: null, clear: () => {} }
   }
@@ -66,8 +69,8 @@ function controller(
 describe('the terminal frame on the page', () => {
   it('reports its height when the session opens from the loading state', () => {
     const heights: number[] = []
-    const notify = (height: number): void => {
-      heights.push(height)
+    const notify = (frame: { height: number }): void => {
+      heights.push(frame.height)
     }
     let renderer: ReturnType<typeof create> | undefined
     act(() => {
@@ -82,4 +85,30 @@ describe('the terminal frame on the page', () => {
     })
     expect(heights).toEqual([FRAME.height])
   })
+
+  it('stays one mounted frame across loading, a pending terminal and the terminal', () => {
+    // A frame that remounts per branch reports again on every return; one that stays reports once.
+    const heights: number[] = []
+    const notify = (frame: { height: number }): void => {
+      heights.push(frame.height)
+    }
+    let renderer: ReturnType<typeof create> | undefined
+    const show = (branch: Branch) => {
+      const element = createElement(MobileSessionActiveContent, {
+        controller: controller(branch, notify)
+      })
+      act(() => {
+        if (renderer) {
+          renderer.update(element)
+        } else {
+          renderer = create(element)
+        }
+      })
+    }
+    show('loading')
+    show('terminal')
+    show('pending')
+    show('terminal')
+    expect(heights).toEqual([FRAME.height])
+  })
 })
diff --git a/mobile/src/session/mobile-source-control-launch-agent.ts b/mobile/src/session/mobile-source-control-launch-agent.ts
new file mode 100644
index 000000000000..e017c48410cb
--- /dev/null
+++ b/mobile/src/session/mobile-source-control-launch-agent.ts
@@ -0,0 +1,89 @@
+/**
+ * Which agent a source-control AI button starts from the phone: the desktop's own resolution
+ * (`pickSourceControlLaunchAgent`), fed the same saved recipe, default agent and detected agents.
+ */
+
+import type { GlobalSettings } from '../../../src/shared/global-settings-types'
+import type { Repo } from '../../../src/shared/repo-types'
+import type {
+  SourceControlActionRecipe,
+  SourceControlLaunchActionId
+} from '../../../src/shared/source-control-ai-actions'
+import { resolveSourceControlActionRecipe } from '../../../src/shared/source-control-ai'
+import {
+  pickSourceControlLaunchAgent,
+  readSourceControlLaunchRecipeAgentId
+} from '../../../src/shared/source-control-launch-agent-selection'
+import { filterEnabledTuiAgents } from '../../../src/shared/tui-agent-selection'
+import type { TuiAgent } from '../../../src/shared/tui-agent'
+import { isMobileTuiAgent } from '../tasks/mobile-tui-agents'
+import type { MobileAgentLaunchContext } from './mobile-new-tab-agent-loader'
+
+export type MobileSourceControlLaunchAgent =
+  /** `recipe`: the action's saved recipe, for its prompt template; null with no action. */
+  | { kind: 'agent'; agent: TuiAgent; recipe: SourceControlActionRecipe | null }
+  | { kind: 'unavailable'; message: string }
+
+type LaunchAgentSettings = Pick<
+  GlobalSettings,
+  'sourceControlAi' | 'commitMessageAi' | 'defaultTuiAgent' | 'disabledTuiAgents'
+>
+
+export function resolveMobileSourceControlLaunchAgent(
+  context: MobileAgentLaunchContext,
+  // Null for a launch with no saved recipe, such as sending review notes.
+  actionId: SourceControlLaunchActionId | null
+): MobileSourceControlLaunchAgent {
+  const settings = readLaunchAgentSettings(context.settings)
+  const detectedAgents = context.detectedAgents.filter(isMobileTuiAgent)
+  const recipe = actionId ? readSavedRecipe(settings, context.repo, actionId) : null
+  const savedAgent = readSourceControlLaunchRecipeAgentId(recipe)
+  // Why: the phone has no pre-launch dialog showing the pick, so a saved agent that can't run here
+  // is an error, as on the desktop's direct launch, rather than a silent swap to another agent.
+  if (
+    savedAgent &&
+    !filterEnabledTuiAgents(detectedAgents, settings?.disabledTuiAgents).includes(savedAgent)
+  ) {
+    return {
+      kind: 'unavailable',
+      message: 'The saved agent for this action is not available on this workspace host.'
+    }
+  }
+  const agent = pickSourceControlLaunchAgent({
+    savedAgent,
+    defaultAgent: settings?.defaultTuiAgent,
+    detectedAgents,
+    disabledAgents: settings?.disabledTuiAgents
+  })
+  return agent
+    ? { kind: 'agent', agent, recipe }
+    : { kind: 'unavailable', message: 'No enabled AI agent was detected on this workspace host.' }
+}
+
+function readLaunchAgentSettings(settings: unknown): LaunchAgentSettings | null {
+  if (!settings || typeof settings !== 'object') {
+    return null
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: settings.get answers with the host's GlobalSettings, and every member read here goes through a normalizer or an enabled-agent filter.
+  return settings as LaunchAgentSettings
+}
+
+function readSavedRecipe(
+  settings: LaunchAgentSettings | null,
+  repo: unknown,
+  actionId: SourceControlLaunchActionId
+): SourceControlActionRecipe | null {
+  try {
+    return resolveSourceControlActionRecipe({ settings, repo: readRepoOverrides(repo), actionId })
+  } catch {
+    // A recipe the phone cannot read must not block the button; the default agent still applies.
+    return null
+  }
+}
+
+function readRepoOverrides(repo: unknown): Pick<Repo, 'sourceControlAi'> | null {
+  return repo && typeof repo === 'object' && 'sourceControlAi' in repo
+    ? // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the recipe resolver normalizes this member from unknown (normalizeRepoSourceControlAiOverrides).
+      { sourceControlAi: repo.sourceControlAi as Repo['sourceControlAi'] }
+    : null
+}
diff --git a/mobile/src/session/mobile-structured-agent-prompts.ts b/mobile/src/session/mobile-structured-agent-prompts.ts
index d11a2fc0317b..649fc06b7741 100644
--- a/mobile/src/session/mobile-structured-agent-prompts.ts
+++ b/mobile/src/session/mobile-structured-agent-prompts.ts
@@ -1,4 +1,8 @@
 import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types'
+import {
+  agentSessionPromptQuestions,
+  type AgentSessionQuestionAnswer
+} from '../../../src/shared/agent-session-question-answer'
 import type { MobileChatPermission } from './mobile-native-chat-permission'
 import type { MobileChatQuestion } from './mobile-native-chat-question'
 import {
@@ -21,6 +25,12 @@ export type StructuredPromptResponseTarget = {
   optionId: string
 }
 
+export type StructuredQuestionResponseTarget = {
+  itemId: string
+  expectedRevision: number
+  answer: AgentSessionQuestionAnswer
+}
+
 type PromptTokenPayload =
   | {
       kind: 'approval'
@@ -32,6 +42,7 @@ type PromptTokenPayload =
       kind: 'question-option'
       itemId: string
       revision: number
+      questionId: string
       optionId: string
     }
   | {
@@ -55,10 +66,6 @@ export function pendingStructuredQuestion(
   return item.body.kind === 'question' && item.body.resolution.state === 'pending'
 }
 
-function encodeQuestionAnswer(questionId: string, answer: string): string {
-  return `${encodeURIComponent(questionId)}:${encodeURIComponent(answer)}`
-}
-
 function encodePromptToken(payload: PromptTokenPayload): string {
   return `${STRUCTURED_PROMPT_TOKEN_PREFIX}${encodeURIComponent(JSON.stringify(payload))}`
 }
@@ -86,11 +93,16 @@ function decodePromptToken(value: string): PromptTokenPayload | null {
         optionId: decoded.optionId
       }
     }
-    if (decoded.kind === 'question-option' && typeof decoded.optionId === 'string') {
+    if (
+      decoded.kind === 'question-option' &&
+      typeof decoded.questionId === 'string' &&
+      typeof decoded.optionId === 'string'
+    ) {
       return {
         kind: decoded.kind,
         itemId: decoded.itemId,
         revision: decoded.revision,
+        questionId: decoded.questionId,
         optionId: decoded.optionId
       }
     }
@@ -169,6 +181,10 @@ export function projectStructuredQuestion(
       { itemId: prompt.itemId, expectedRevision: prompt.revision }
     )
   }
+  const [question] = agentSessionPromptQuestions(prompt.body)
+  if (!question) {
+    return null
+  }
   const optionDescriptions = prompt.body.options.map((option) => option.description)
   return {
     question: prompt.body.question,
@@ -182,6 +198,7 @@ export function projectStructuredQuestion(
         kind: 'question-option',
         itemId: prompt.itemId,
         revision: prompt.revision,
+        questionId: question.id,
         optionId: option.id
       })
     ),
@@ -228,13 +245,13 @@ export function structuredApprovalResponseTarget(
 export function structuredQuestionResponseTarget(
   response: string,
   currentPrompt: StructuredQuestionItem | null
-): StructuredPromptResponseTarget | null {
+): StructuredQuestionResponseTarget | null {
   const token = decodePromptToken(response)
   if (token?.kind === 'question-option') {
     return {
       itemId: token.itemId,
       expectedRevision: token.revision,
-      optionId: token.optionId
+      answer: { questionId: token.questionId, optionIds: [token.optionId] }
     }
   }
   if (token) {
@@ -247,29 +264,30 @@ export function structuredQuestionResponseTarget(
       ? {
           itemId: freeText.payload.itemId,
           expectedRevision: freeText.payload.revision,
-          optionId: encodeQuestionAnswer(freeText.payload.questionId, answer)
+          answer: { questionId: freeText.payload.questionId, optionIds: [], other: answer }
         }
       : null
   }
   if (!currentPrompt) {
     return null
   }
+  const [question] = agentSessionPromptQuestions(currentPrompt.body)
   const trimmed = response.trim()
   const option = currentPrompt.body.options.find(
     (candidate) => candidate.id === response || candidate.label === trimmed
   )
-  if (option) {
+  if (question && option) {
     return {
       itemId: currentPrompt.itemId,
       expectedRevision: currentPrompt.revision,
-      optionId: option.id
+      answer: { questionId: question.id, optionIds: [option.id] }
     }
   }
-  return currentPrompt.body.freeTextQuestionId && trimmed
+  return question && currentPrompt.body.freeTextQuestionId && trimmed
     ? {
         itemId: currentPrompt.itemId,
         expectedRevision: currentPrompt.revision,
-        optionId: encodeQuestionAnswer(currentPrompt.body.freeTextQuestionId, trimmed)
+        answer: { questionId: question.id, optionIds: [], other: trimmed }
       }
     : null
 }
diff --git a/mobile/src/session/mobile-structured-agent-session-cancel.ts b/mobile/src/session/mobile-structured-agent-session-cancel.ts
index f144accc2e78..4666cad48175 100644
--- a/mobile/src/session/mobile-structured-agent-session-cancel.ts
+++ b/mobile/src/session/mobile-structured-agent-session-cancel.ts
@@ -75,7 +75,7 @@ export async function requestMobileStructuredAgentSessionCancel(args: {
   } else if (result.status === 'refused') {
     onSendError(result.message)
   } else if (result.status === 'failed') {
-    onSendError(result.message === 'Request not sent' ? 'Stop not sent' : result.message)
+    onSendError(result.message)
   }
   return false
 }
diff --git a/mobile/src/session/mobile-structured-agent-session-host-support.test.ts b/mobile/src/session/mobile-structured-agent-session-host-support.test.ts
new file mode 100644
index 000000000000..6857855c9b47
--- /dev/null
+++ b/mobile/src/session/mobile-structured-agent-session-host-support.test.ts
@@ -0,0 +1,21 @@
+import { describe, expect, it } from 'vitest'
+import {
+  AGENT_SESSION_PROMPT_CANCEL_RUNTIME_CAPABILITY,
+  AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY
+} from '../../../src/shared/protocol-version'
+import { structuredAgentSessionHostSupport } from './mobile-structured-agent-session-host-support'
+
+describe('structuredAgentSessionHostSupport', () => {
+  it('reads each structured-session feature from the host capability list', () => {
+    expect(structuredAgentSessionHostSupport([])).toEqual({
+      promptCancel: false,
+      questionAnswers: false
+    })
+    expect(
+      structuredAgentSessionHostSupport([AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY])
+    ).toEqual({ promptCancel: false, questionAnswers: true })
+    expect(
+      structuredAgentSessionHostSupport([AGENT_SESSION_PROMPT_CANCEL_RUNTIME_CAPABILITY])
+    ).toEqual({ promptCancel: true, questionAnswers: false })
+  })
+})
diff --git a/mobile/src/session/mobile-structured-agent-session-host-support.ts b/mobile/src/session/mobile-structured-agent-session-host-support.ts
new file mode 100644
index 000000000000..939f7d559f49
--- /dev/null
+++ b/mobile/src/session/mobile-structured-agent-session-host-support.ts
@@ -0,0 +1,19 @@
+import {
+  AGENT_SESSION_PROMPT_CANCEL_RUNTIME_CAPABILITY,
+  AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY
+} from '../../../src/shared/protocol-version'
+
+/** Structured-session features the connected host advertised; null until the status probe answers. */
+export type StructuredAgentSessionHostSupport = {
+  promptCancel: boolean
+  questionAnswers: boolean
+}
+
+export function structuredAgentSessionHostSupport(
+  capabilities: readonly string[]
+): StructuredAgentSessionHostSupport {
+  return {
+    promptCancel: capabilities.includes(AGENT_SESSION_PROMPT_CANCEL_RUNTIME_CAPABILITY),
+    questionAnswers: capabilities.includes(AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY)
+  }
+}
diff --git a/mobile/src/session/mobile-structured-agent-session-rpc.ts b/mobile/src/session/mobile-structured-agent-session-rpc.ts
index 27c50d85104e..bca14e293f75 100644
--- a/mobile/src/session/mobile-structured-agent-session-rpc.ts
+++ b/mobile/src/session/mobile-structured-agent-session-rpc.ts
@@ -8,6 +8,17 @@ import type {
   AgentSessionWireRefusalCode
 } from '../../../src/shared/agent-session-wire'
 import { structuredAgentSessionPayloadFingerprint } from '../../../src/shared/structured-agent-session-mutation'
+import {
+  agentSessionRefusalNotice,
+  agentSessionWriteFailureNotice,
+  agentSessionWriteNoticeEnglish,
+  agentSessionWriteNoticeParts
+} from '../../../src/shared/agent-session-refusal-notice'
+import {
+  agentSessionRpcErrorFailure,
+  agentSessionWriteKindForMethod,
+  type AgentSessionWriteKind
+} from '../../../src/shared/agent-session-write-failure'
 import { structuredSessionOperationId } from './structured-session-operation-id'
 import { isRpcDeliveryUnknown } from '../transport/rpc-delivery-ambiguity'
 import type { RpcClient } from '../transport/rpc-client'
@@ -46,13 +57,6 @@ class AgentSessionRpcResponseError extends Error {
   }
 }
 
-const PRE_HANDLER_RPC_REFUSALS = new Set([
-  'invalid_argument',
-  'method_not_found',
-  'method_not_supported',
-  'unauthorized'
-])
-
 export async function callAgentSession<TResult>(
   client: RpcClient,
   method: string,
@@ -115,6 +119,15 @@ export function timeoutForDeadline(deadline: number | undefined): number | null
   return timeoutMs >= MOBILE_NATIVE_CHAT_MIN_WRITE_TIMEOUT_MS ? timeoutMs : null
 }
 
+/** A refused phone send goes back into the composer; there is no Retry control. */
+function phoneWriteKind(
+  fingerprintMethod: string,
+  fields: Record<string, unknown>
+): AgentSessionWriteKind {
+  const write = agentSessionWriteKindForMethod(fingerprintMethod, fields)
+  return write === 'send' ? 'composer-send' : write
+}
+
 export async function requestStructuredAgentSessionMutation<TValue>(args: {
   client: RpcClient
   method: string
@@ -163,10 +176,25 @@ export async function requestStructuredAgentSessionMutation<TValue>(args: {
     }
     return result.ok
       ? { status: 'accepted', value: result.value }
-      : { status: 'refused', code: result.refusal.code, message: result.refusal.message }
+      : {
+          status: 'refused',
+          code: result.refusal.code,
+          message: agentSessionRefusalNotice(
+            result.refusal,
+            phoneWriteKind(fingerprintMethod, fields)
+          )
+        }
   } catch (error) {
-    if (error instanceof AgentSessionRpcResponseError && PRE_HANDLER_RPC_REFUSALS.has(error.code)) {
-      return { status: 'failed', message: error.message }
+    const answered =
+      error instanceof AgentSessionRpcResponseError ? agentSessionRpcErrorFailure(error.code) : null
+    if (answered && answered.kind !== 'unconfirmed') {
+      // The host turned the request away before running it; its text is written for a log.
+      return {
+        status: 'failed',
+        message: agentSessionWriteNoticeEnglish(
+          agentSessionWriteNoticeParts(answered, phoneWriteKind(fingerprintMethod, fields))
+        )
+      }
     }
     if (
       isRpcDeliveryUnknown(error) ||
@@ -177,7 +205,7 @@ export async function requestStructuredAgentSessionMutation<TValue>(args: {
     }
     return {
       status: 'failed',
-      message: error instanceof Error ? error.message : 'Request not sent'
+      message: agentSessionWriteFailureNotice(phoneWriteKind(fingerprintMethod, fields))
     }
   }
 }
diff --git a/mobile/src/session/mobile-structured-grouped-question.test.ts b/mobile/src/session/mobile-structured-grouped-question.test.ts
index 45a365864d9a..37a4dc125c27 100644
--- a/mobile/src/session/mobile-structured-grouped-question.test.ts
+++ b/mobile/src/session/mobile-structured-grouped-question.test.ts
@@ -1,6 +1,5 @@
 import { describe, expect, it } from 'vitest'
 import type { AgentJournalQuestion } from '../../../src/shared/agent-session-journal-types'
-import { decodeAgentSessionQuestionAnswers } from '../../../src/shared/agent-session-question-answer'
 import {
   formatQuestionAnswer,
   formatQuestionFreeTextAnswer,
@@ -85,7 +84,7 @@ describe('mobile structured grouped questions', () => {
     expect(second).toMatchObject({ question: 'Which regions? (2 of 2)', multiSelect: true })
   })
 
-  it('submits the whole group as one encoded answer on the last step', () => {
+  it('submits the whole group as one set of answers on the last step', () => {
     const questions = [question(), SECOND]
     const draft: GroupedQuestionDraft = {
       promptKey: PROMPT_KEY,
@@ -102,9 +101,7 @@ describe('mobile structured grouped questions', () => {
     })
 
     expect(result?.kind).toBe('submit')
-    expect(
-      decodeAgentSessionQuestionAnswers(result?.kind === 'submit' ? result.optionId : '')
-    ).toEqual([
+    expect(result?.kind === 'submit' ? result.answers : null).toEqual([
       { questionId: 'q1', optionIds: ['q1:choice-1'] },
       { questionId: 'q2', optionIds: ['q2:choice-1', 'q2:choice-2'] }
     ])
@@ -121,9 +118,9 @@ describe('mobile structured grouped questions', () => {
       promptKey: PROMPT_KEY
     })
 
-    expect(
-      decodeAgentSessionQuestionAnswers(result?.kind === 'submit' ? result.optionId : '')
-    ).toEqual([{ questionId: 'q1', optionIds: [], other: 'DuckDB' }])
+    expect(result?.kind === 'submit' ? result.answers : null).toEqual([
+      { questionId: 'q1', optionIds: [], other: 'DuckDB' }
+    ])
   })
 
   it('keeps selected options and other text for grouped multi-select answers', () => {
@@ -137,9 +134,9 @@ describe('mobile structured grouped questions', () => {
       promptKey: PROMPT_KEY
     })
 
-    expect(
-      decodeAgentSessionQuestionAnswers(result?.kind === 'submit' ? result.optionId : '')
-    ).toEqual([{ questionId: 'q2', optionIds: ['q2:choice-1'], other: 'ap-south' }])
+    expect(result?.kind === 'submit' ? result.answers : null).toEqual([
+      { questionId: 'q2', optionIds: ['q2:choice-1'], other: 'ap-south' }
+    ])
   })
 
   it('gives each step a distinct card key so a selection cannot carry into the next question', () => {
diff --git a/mobile/src/session/mobile-structured-grouped-question.ts b/mobile/src/session/mobile-structured-grouped-question.ts
index 031cdf3f10f3..d111b4de95aa 100644
--- a/mobile/src/session/mobile-structured-grouped-question.ts
+++ b/mobile/src/session/mobile-structured-grouped-question.ts
@@ -1,6 +1,5 @@
 import type { AgentJournalQuestion } from '../../../src/shared/agent-session-journal-types'
 import {
-  encodeAgentSessionQuestionAnswers,
   isValidAgentSessionQuestionAnswers,
   type AgentSessionQuestionAnswer
 } from '../../../src/shared/agent-session-question-answer'
@@ -11,7 +10,7 @@ import type { MobileChatQuestion } from './mobile-native-chat-question'
  * prompt. The host then leaves the flat `question.options` EMPTY and puts the real content in
  * `questions`, so a client that reads only the flat shape renders an unanswerable card and the turn
  * stalls. The phone has room for one question at a time, so the group is answered as steps and
- * submitted once — the host accepts the whole group as one encoded option id.
+ * submitted once as one set of answers.
  */
 export type GroupedQuestionDraft = {
   /** Identifies the exact prompt revision these answers belong to; a revised prompt discards them. */
@@ -21,7 +20,7 @@ export type GroupedQuestionDraft = {
 
 export type GroupedQuestionAdvance =
   | { kind: 'advance'; draft: GroupedQuestionDraft }
-  | { kind: 'submit'; optionId: string }
+  | { kind: 'submit'; answers: AgentSessionQuestionAnswer[] }
 
 const GROUPED_TOKEN_PREFIX = 'structured-grouped-question:'
 
@@ -195,7 +194,7 @@ function answerFromResponse(
 
 /**
  * Fold one answer into the draft. Returns `advance` while questions remain and `submit` with the
- * encoded group once the last one lands; null when the response does not answer this prompt step.
+ * whole group once the last one lands; null when the response does not answer this prompt step.
  */
 export function advanceGroupedQuestion(args: {
   response: string
@@ -218,6 +217,6 @@ export function advanceGroupedQuestion(args: {
   }
   // Never send a group the host would refuse — the user would see a silent failure with no way back.
   return isValidAgentSessionQuestionAnswers(args.questions, answers)
-    ? { kind: 'submit', optionId: encodeAgentSessionQuestionAnswers(answers) }
+    ? { kind: 'submit', answers }
     : null
 }
diff --git a/mobile/src/session/mobile-structured-operation-id-retirement.test.ts b/mobile/src/session/mobile-structured-operation-id-retirement.test.ts
index 6c8b50e33b86..82ccd1e19dc6 100644
--- a/mobile/src/session/mobile-structured-operation-id-retirement.test.ts
+++ b/mobile/src/session/mobile-structured-operation-id-retirement.test.ts
@@ -131,3 +131,102 @@ describe('structured Stop after an unknown outcome', () => {
     expect(operationIds.size).toBe(1)
   })
 })
+
+describe('what a structured refusal says on the phone', () => {
+  it("replaces the host's diagnostic with words a person can act on", async () => {
+    const result = await requestStructuredAgentSessionMutation({
+      client: fakeClient(async () => ({
+        ok: true,
+        result: {
+          ok: false,
+          refusal: {
+            code: 'agent_session_checkpoint_stale',
+            message: 'Expected runtime fence 1; the session is at 3.'
+          }
+        },
+        _meta: { runtimeId: 'runtime-1' }
+      })),
+      method: 'agentSession.send',
+      fingerprintMethod: 'agentSession.send',
+      sessionId: 'session-1',
+      expectedRuntimeFence: 1,
+      fields: { body: 'hello' },
+      clientOperationId: `1900000000000-${'c'.repeat(32)}`
+    })
+
+    expect(result).toEqual({
+      status: 'refused',
+      code: 'agent_session_checkpoint_stale',
+      message: 'Your message was not sent. Send it again.'
+    })
+  })
+
+  it('says what the host named as the reason, in the same words as desktop', async () => {
+    const result = await requestStructuredAgentSessionMutation({
+      client: fakeClient(async () => ({
+        ok: true,
+        result: {
+          ok: false,
+          refusal: {
+            code: 'agent_session_operation_invalid',
+            message: 'This conversation has been cleared. Use the current conversation.',
+            details: { reason: 'conversationCleared' }
+          }
+        },
+        _meta: { runtimeId: 'runtime-1' }
+      })),
+      method: 'agentSession.send',
+      fingerprintMethod: 'agentSession.send',
+      sessionId: 'session-1',
+      expectedRuntimeFence: 1,
+      fields: { body: 'hello' },
+      clientOperationId: `1900000000000-${'e'.repeat(32)}`
+    })
+
+    expect(result).toEqual({
+      status: 'refused',
+      code: 'agent_session_operation_invalid',
+      message:
+        'This conversation has been cleared. Your message was not sent. Open the current conversation to continue.'
+    })
+  })
+
+  const stop = {
+    method: 'agentSession.cancel',
+    fingerprintMethod: 'agentSession.cancel',
+    sessionId: 'session-1',
+    expectedRuntimeFence: 1,
+    fields: { turnId: 'turn-1' },
+    clientOperationId: `1900000000000-${'d'.repeat(32)}`
+  }
+
+  it("keeps a failed request's transport text off the screen", async () => {
+    const result = await requestStructuredAgentSessionMutation({
+      ...stop,
+      client: fakeClient(async () => {
+        throw new Error('ECONNRESET 10.0.0.2:443')
+      })
+    })
+
+    expect(result).toEqual({
+      status: 'failed',
+      message: "The agent wasn't stopped."
+    })
+  })
+
+  it("keeps the host's text off the screen when it turns the request away unrun", async () => {
+    const result = await requestStructuredAgentSessionMutation({
+      ...stop,
+      client: fakeClient(async () => ({
+        ok: false,
+        error: { code: 'method_not_found', message: 'Unknown method: agentSession.cancel' },
+        _meta: { runtimeId: 'runtime-1' }
+      }))
+    })
+
+    expect(result).toEqual({
+      status: 'failed',
+      message: "The Orca running this chat doesn't support this. Update Orca, then try again."
+    })
+  })
+})
diff --git a/mobile/src/session/mobile-structured-send-delivery.test.ts b/mobile/src/session/mobile-structured-send-delivery.test.ts
index 614cadac391e..dec553693443 100644
--- a/mobile/src/session/mobile-structured-send-delivery.test.ts
+++ b/mobile/src/session/mobile-structured-send-delivery.test.ts
@@ -58,7 +58,7 @@ describe('mobileStructuredSendDelivery', () => {
     ).toEqual({
       outcome: 'rejected',
       operationIdSpent: true,
-      error: "Couldn't reach the agent. Your message was not sent — Retry to send it again."
+      error: "Orca couldn't reach the agent. Your message was not sent. Send it again."
     })
   })
 
@@ -94,13 +94,16 @@ describe('mobileStructuredSendDelivery', () => {
         message: 'Outcome unknown'
       })
     ).toEqual({ outcome: 'unknown', operationIdSpent: false, error: null })
-    expect(mobileStructuredSendDelivery({ status: 'failed', message: 'Request not sent' })).toEqual(
-      {
-        outcome: 'rejected',
-        operationIdSpent: true,
-        error: 'Message not sent'
-      }
-    )
+    expect(
+      mobileStructuredSendDelivery({
+        status: 'failed',
+        message: 'Your message was not sent. Send it again.'
+      })
+    ).toEqual({
+      outcome: 'rejected',
+      operationIdSpent: true,
+      error: 'Your message was not sent. Send it again.'
+    })
   })
 
   it('never releases an ambiguous id on a later RPC refusal or failure', () => {
@@ -115,8 +118,15 @@ describe('mobileStructuredSendDelivery', () => {
       )
     ).toEqual({ outcome: 'rejected', operationIdSpent: false, error: 'Operation expired' })
     expect(
-      mobileStructuredSendDelivery({ status: 'failed', message: 'Request not sent' }, true)
-    ).toEqual({ outcome: 'rejected', operationIdSpent: false, error: 'Message not sent' })
+      mobileStructuredSendDelivery(
+        { status: 'failed', message: 'Your message was not sent. Send it again.' },
+        true
+      )
+    ).toEqual({
+      outcome: 'rejected',
+      operationIdSpent: false,
+      error: 'Your message was not sent. Send it again.'
+    })
   })
 
   it('fails closed when an invalid host response omits the required submission', () => {
diff --git a/mobile/src/session/mobile-structured-send-delivery.ts b/mobile/src/session/mobile-structured-send-delivery.ts
index 70f8a8f0d3d7..b8d0246f5e7a 100644
--- a/mobile/src/session/mobile-structured-send-delivery.ts
+++ b/mobile/src/session/mobile-structured-send-delivery.ts
@@ -57,7 +57,7 @@ export function mobileStructuredSendDelivery(
     return {
       outcome: 'rejected',
       operationIdSpent: !retained,
-      error: result.message === 'Request not sent' ? 'Message not sent' : result.message
+      error: result.message
     }
   }
   const submission = result.value.submission as AgentSessionSendResult['submission'] | undefined
@@ -68,7 +68,7 @@ export function mobileStructuredSendDelivery(
     return {
       outcome: 'rejected',
       operationIdSpent: true,
-      error: structuredAgentSessionRejectionNotice(submission.reason)
+      error: structuredAgentSessionRejectionNotice(submission.reason, 'composer-send')
     }
   }
   if (retained) {
diff --git a/mobile/src/session/mobile-terminal-first-subscribe-viewport.test.ts b/mobile/src/session/mobile-terminal-first-subscribe-viewport.test.ts
deleted file mode 100644
index e1da3e5d2f1d..000000000000
--- a/mobile/src/session/mobile-terminal-first-subscribe-viewport.test.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import {
-  deferFirstSubscribeUntilViewportMeasured,
-  measureTerminalViewportOnce,
-  type FirstSubscribeViewportGateArgs,
-  type TerminalViewportOnceArgs
-} from './mobile-terminal-first-subscribe-viewport'
-
-const PHONE = { cols: 55, rows: 47 }
-
-function onceArgs(overrides: Partial<TerminalViewportOnceArgs> = {}): TerminalViewportOnceArgs {
-  return {
-    handle: 'term-1',
-    ref: {
-      init: vi.fn(),
-      awaitReady: vi.fn(async () => {}),
-      measureFitDimensions: vi.fn(async () => PHONE)
-    },
-    documentHasTerminal: true,
-    viewportRef: { current: null },
-    viewportMeasuredRef: { current: false },
-    terminalFrameHeightRef: { current: 751 },
-    onMeasured: vi.fn(),
-    ...overrides
-  }
-}
-
-describe('measureTerminalViewportOnce', () => {
-  it('stores the measured dims against the frame height', async () => {
-    const args = onceArgs()
-    await measureTerminalViewportOnce(args)
-    expect(args.ref?.measureFitDimensions).toHaveBeenCalledWith(751)
-    expect(args.viewportRef.current).toEqual(PHONE)
-    expect(args.viewportMeasuredRef.current).toBe(true)
-    expect(args.onMeasured).toHaveBeenCalledWith('term-1', PHONE, 751)
-  })
-
-  it('does nothing once the route has a viewport', async () => {
-    const args = onceArgs({ viewportMeasuredRef: { current: true } })
-    await measureTerminalViewportOnce(args)
-    expect(args.ref?.measureFitDimensions).not.toHaveBeenCalled()
-  })
-
-  it('leaves the viewport unmeasured when the document cannot measure', async () => {
-    const args = onceArgs({
-      ref: {
-        init: vi.fn(),
-        awaitReady: vi.fn(async () => {}),
-        measureFitDimensions: vi.fn(async () => null)
-      }
-    })
-    await measureTerminalViewportOnce(args)
-    expect(args.viewportMeasuredRef.current).toBe(false)
-    expect(args.viewportRef.current).toBe(null)
-  })
-})
-
-describe('measureTerminalViewportOnce on a fresh document', () => {
-  it('opens an empty terminal and waits for it before measuring, so cell metrics exist', async () => {
-    const order: string[] = []
-    const args = onceArgs({
-      documentHasTerminal: false,
-      ref: {
-        init: vi.fn((cols: number, rows: number, data?: string) => {
-          order.push(`init ${cols}x${rows} ${JSON.stringify(data)}`)
-        }),
-        awaitReady: vi.fn(async () => {
-          order.push('awaitReady')
-        }),
-        measureFitDimensions: vi.fn(async () => {
-          order.push('measure')
-          return PHONE
-        })
-      }
-    })
-    await measureTerminalViewportOnce(args)
-    expect(order).toEqual(['init 80x24 ""', 'awaitReady', 'measure'])
-    expect(args.viewportRef.current).toEqual(PHONE)
-  })
-
-  it('never re-inits a document that already holds a terminal', async () => {
-    const args = onceArgs({ documentHasTerminal: true })
-    await measureTerminalViewportOnce(args)
-    expect(args.ref?.init).not.toHaveBeenCalled()
-    expect(args.viewportRef.current).toEqual(PHONE)
-  })
-})
-
-function gateArgs(
-  overrides: Partial<FirstSubscribeViewportGateArgs> = {}
-): FirstSubscribeViewportGateArgs {
-  return {
-    handle: 'term-1',
-    covered: false,
-    viewportMeasured: false,
-    subscribedDocuments: new Set(),
-    subscribingHandles: new Set(),
-    subscribeSeq: new Map([['term-1', 1]]),
-    measure: vi.fn(async () => {}),
-    subscribe: vi.fn(),
-    ...overrides
-  }
-}
-
-describe('deferFirstSubscribeUntilViewportMeasured', () => {
-  it('holds the first subscribe of a document until the measure lands, then subscribes once', async () => {
-    let finishMeasure = (): void => {}
-    const args = gateArgs({
-      measure: vi.fn(
-        () =>
-          new Promise<void>((resolve) => {
-            finishMeasure = resolve
-          })
-      )
-    })
-    expect(deferFirstSubscribeUntilViewportMeasured(args)).toBe(true)
-    expect(args.measure).toHaveBeenCalledWith('term-1')
-    // Other callers see a subscribe in flight and stay out.
-    expect(args.subscribingHandles.has('term-1')).toBe(true)
-    expect(args.subscribe).not.toHaveBeenCalled()
-    finishMeasure()
-    await vi.waitFor(() => expect(args.subscribe).toHaveBeenCalledTimes(1))
-    expect(args.subscribingHandles.has('term-1')).toBe(false)
-    // The resumed subscribe passes straight through.
-    expect(deferFirstSubscribeUntilViewportMeasured(args)).toBe(false)
-  })
-
-  it('still subscribes, without dims, when the measure fails', async () => {
-    const args = gateArgs({ measure: vi.fn(() => Promise.reject(new Error('gone'))) })
-    expect(deferFirstSubscribeUntilViewportMeasured(args)).toBe(true)
-    await vi.waitFor(() => expect(args.subscribe).toHaveBeenCalledTimes(1))
-  })
-
-  function heldSubscribe(subscribeSeq = new Map([['term-1', 1]])) {
-    let finishMeasure = (): void => {}
-    const args = gateArgs({
-      subscribeSeq,
-      measure: vi.fn(
-        () =>
-          new Promise<void>((resolve) => {
-            finishMeasure = resolve
-          })
-      )
-    })
-    deferFirstSubscribeUntilViewportMeasured(args)
-    return { args, finish: () => finishMeasure() }
-  }
-  const flush = async () => {
-    await Promise.resolve()
-    await Promise.resolve()
-  }
-
-  it('drops the held subscribe when a newer subscribe generation started during the measure', async () => {
-    const subscribeSeq = new Map([['term-1', 1]])
-    const { args, finish } = heldSubscribe(subscribeSeq)
-    subscribeSeq.set('term-1', 2)
-    finish()
-    await flush()
-    expect(args.subscribe).not.toHaveBeenCalled()
-  })
-
-  it('drops the held subscribe when its in-flight mark was cleared during the measure', async () => {
-    const { args, finish } = heldSubscribe()
-    args.subscribingHandles.delete('term-1')
-    finish()
-    await flush()
-    expect(args.subscribe).not.toHaveBeenCalled()
-  })
-
-  it('passes through when the viewport is known, but remembers the document', () => {
-    const args = gateArgs({ viewportMeasured: true })
-    expect(deferFirstSubscribeUntilViewportMeasured(args)).toBe(false)
-    expect(args.subscribedDocuments.has('term-1')).toBe(true)
-    // A later refit invalidation must not re-open a live terminal's document.
-    expect(deferFirstSubscribeUntilViewportMeasured({ ...args, viewportMeasured: false })).toBe(
-      false
-    )
-    expect(args.measure).not.toHaveBeenCalled()
-  })
-
-  it('passes through a native-chat-covered lease, which has no document', () => {
-    const args = gateArgs({ covered: true })
-    expect(deferFirstSubscribeUntilViewportMeasured(args)).toBe(false)
-    expect(args.subscribedDocuments.has('term-1')).toBe(false)
-    expect(args.measure).not.toHaveBeenCalled()
-  })
-})
diff --git a/mobile/src/session/mobile-terminal-first-subscribe-viewport.ts b/mobile/src/session/mobile-terminal-first-subscribe-viewport.ts
deleted file mode 100644
index e6c79f5c5f93..000000000000
--- a/mobile/src/session/mobile-terminal-first-subscribe-viewport.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import type { TerminalWebViewHandle } from '../terminal/terminal-webview-contract'
-import type { MutableRef, TerminalViewportDims } from './mobile-terminal-viewport-resubscribe'
-
-/** Any size opens xterm; cell metrics, not the grid, are what the measure needs. */
-const EMPTY_TERMINAL_COLS = 80
-const EMPTY_TERMINAL_ROWS = 24
-
-export type TerminalViewportMeasureTarget = Pick<
-  TerminalWebViewHandle,
-  'init' | 'awaitReady' | 'measureFitDimensions'
->
-
-export type TerminalViewportOnceArgs = {
-  handle: string
-  ref: TerminalViewportMeasureTarget | undefined
-  /** False until the document's first init; it has no xterm, so no cell metrics, before one. */
-  documentHasTerminal: boolean
-  viewportRef: MutableRef<TerminalViewportDims | null>
-  viewportMeasuredRef: MutableRef<boolean>
-  terminalFrameHeightRef: MutableRef<number>
-  onMeasured: (
-    handle: string,
-    dims: TerminalViewportDims | null | undefined,
-    frameHeight: number
-  ) => void
-}
-
-/** Measures the phone viewport once per route; the dims then ride every subscribe so the host fits the PTY itself. */
-export async function measureTerminalViewportOnce(args: TerminalViewportOnceArgs): Promise<void> {
-  if (args.viewportMeasuredRef.current) {
-    return
-  }
-  const ref = args.ref
-  if (ref && !args.documentHasTerminal) {
-    // Why: without this the first subscribe goes dimensionless, paints at the desktop's size, then resubscribes.
-    ref.init(EMPTY_TERMINAL_COLS, EMPTY_TERMINAL_ROWS, '')
-    await ref.awaitReady()
-  }
-  const dims = await ref?.measureFitDimensions(args.terminalFrameHeightRef.current || undefined)
-  args.onMeasured(args.handle, dims, args.terminalFrameHeightRef.current)
-  if (dims) {
-    args.viewportRef.current = dims
-    args.viewportMeasuredRef.current = true
-  }
-}
-
-export type FirstSubscribeViewportGateArgs = {
-  handle: string
-  covered: boolean
-  viewportMeasured: boolean
-  /** Handles whose current document has already been subscribed; cleared when that document goes away. */
-  subscribedDocuments: Set<string>
-  subscribingHandles: Set<string>
-  subscribeSeq: ReadonlyMap<string, number>
-  measure: (handle: string) => Promise<void>
-  subscribe: (handle: string) => void
-}
-
-/**
- * Holds a document's first subscribe until the route's viewport is measured, so the host
- * serializes the snapshot at the phone's size. Returns true when it took over the subscribe.
- */
-export function deferFirstSubscribeUntilViewportMeasured(
-  args: FirstSubscribeViewportGateArgs
-): boolean {
-  const { handle } = args
-  // A covered lease has no document to measure and asks for no viewport.
-  if (args.covered) {
-    return false
-  }
-  const firstForDocument = !args.subscribedDocuments.has(handle)
-  args.subscribedDocuments.add(handle)
-  if (!firstForDocument || args.viewportMeasured) {
-    return false
-  }
-  args.subscribingHandles.add(handle)
-  const seq = args.subscribeSeq.get(handle)
-  const resume = (): void => {
-    // Why: unsubscribeTerminal bumps the seq and clears the in-flight mark; a torn-down handle stays down.
-    if (args.subscribeSeq.get(handle) !== seq || !args.subscribingHandles.has(handle)) {
-      return
-    }
-    args.subscribingHandles.delete(handle)
-    args.subscribe(handle)
-  }
-  void args.measure(handle).then(resume, resume)
-  return true
-}
diff --git a/mobile/src/session/mobile-terminal-viewport-resubscribe.test.ts b/mobile/src/session/mobile-terminal-viewport-resubscribe.test.ts
index 14f11b15c40d..752d20169795 100644
--- a/mobile/src/session/mobile-terminal-viewport-resubscribe.test.ts
+++ b/mobile/src/session/mobile-terminal-viewport-resubscribe.test.ts
@@ -252,7 +252,7 @@ describe('runTerminalViewportFitPass', () => {
     const scheduled: { fn: () => void; ms: number }[] = []
     const webView = {
       awaitReady: () => Promise.resolve(),
-      measureFitDimensions: () => Promise.resolve(overrides.measured ?? PHONE)
+      fitDimensions: () => (overrides.measured === undefined ? PHONE : overrides.measured)
     }
     const unsubscribeTerminal = vi.fn((handle: string) => {
       terminalUnsubsRef.current.delete(handle)
@@ -275,7 +275,7 @@ describe('runTerminalViewportFitPass', () => {
       subscribeSeqRef: { current: new Map([[HANDLE, 1]]) },
       initializedHandlesRef: { current: new Set([HANDLE]) },
       terminalUnsubsRef,
-      terminalFrameHeightRef: { current: 0 },
+      terminalFrameRef: { current: { width: 390, height: 600 } },
       getTerminalRef: () => webView,
       unsubscribeTerminal,
       subscribeToTerminal,
diff --git a/mobile/src/session/mobile-terminal-viewport-resubscribe.ts b/mobile/src/session/mobile-terminal-viewport-resubscribe.ts
index 9113e84f1f44..f0fc70a13334 100644
--- a/mobile/src/session/mobile-terminal-viewport-resubscribe.ts
+++ b/mobile/src/session/mobile-terminal-viewport-resubscribe.ts
@@ -2,6 +2,7 @@
  *  frame dims can never equal the phone viewport must not re-arm the stream
  *  forever — it broke gesture recognition and drained battery at ~25 cycles/s. */
 
+import type { TerminalFrame } from '../terminal/terminal-webview-messages'
 import type { MobileTerminalDiagnostics } from './mobile-terminal-diagnostics'
 
 export const MAX_TERMINAL_VIEWPORT_RESUBSCRIBE_ATTEMPTS = 3
@@ -177,7 +178,7 @@ export type MutableRef<T> = { current: T }
 
 type TerminalFitWebView = {
   awaitReady: () => Promise<unknown>
-  measureFitDimensions: (frameHeight?: number) => Promise<TerminalViewportDims | null | undefined>
+  fitDimensions: (frame: { width: number; height: number }) => TerminalViewportDims | null
 }
 
 export type TerminalViewportFitPassArgs = {
@@ -197,7 +198,7 @@ export type TerminalViewportFitPassArgs = {
   subscribeSeqRef: MutableRef<Map<string, number>>
   initializedHandlesRef: MutableRef<Set<string>>
   terminalUnsubsRef: MutableRef<Map<string, () => void>>
-  terminalFrameHeightRef: MutableRef<number>
+  terminalFrameRef: MutableRef<TerminalFrame | null>
   getTerminalRef: (handle: string | null) => TerminalFitWebView | undefined
   unsubscribeTerminal: (handle: string) => void
   subscribeToTerminal: (handle: string) => void
@@ -235,7 +236,7 @@ export function runTerminalViewportFitPass(args: TerminalViewportFitPassArgs): v
   // Why: a subscribe that carried a viewport already told the host one; a fresh measure that matches it needs no round trip.
   const viewportWasMeasured = args.viewportMeasuredRef.current || args.sentViewport != null
   void (async () => {
-    // Why: wait for init()'s rAF chain before measuring, else the measure races ahead and returns null (log dump 2026-05-06).
+    // Why: wait for init()'s rAF chain, which reports the box the fit reads (log dump 2026-05-06).
     await args.getTerminalRef(handle)?.awaitReady()
     if (
       args.subscribeSeqRef.current.get(handle) !== seq ||
@@ -243,17 +244,9 @@ export function runTerminalViewportFitPass(args: TerminalViewportFitPassArgs): v
     ) {
       return
     }
-    const dims = await args
-      .getTerminalRef(handle)
-      ?.measureFitDimensions(args.terminalFrameHeightRef.current || undefined)
-    // Why: re-check seq — the awaits may have let a newer subscribe cycle arm; tearing it down would resubscribe a stale generation.
-    if (
-      args.subscribeSeqRef.current.get(handle) !== seq ||
-      !budget.isRetryGenerationCurrent(handle, retryGeneration)
-    ) {
-      return
-    }
-    if (!args.getTerminalRef(handle) || !dims) {
+    const frame = args.terminalFrameRef.current
+    const dims = frame ? args.getTerminalRef(handle)?.fitDimensions(frame) : null
+    if (!dims) {
       return
     }
     args.viewportRef.current = dims
diff --git a/mobile/src/session/mobile-worker-takeover-send-sites.test.ts b/mobile/src/session/mobile-worker-takeover-send-sites.test.ts
index 1c13100e1c87..17175a5e139e 100644
--- a/mobile/src/session/mobile-worker-takeover-send-sites.test.ts
+++ b/mobile/src/session/mobile-worker-takeover-send-sites.test.ts
@@ -13,7 +13,6 @@ import {
   clearMobileNativeChatInput
 } from './mobile-native-chat-send'
 import { sendMobileTerminalQueryReply } from '../terminal/mobile-terminal-query-reply'
-import { createTerminalAndSendPrompt } from './pr-ai-triage-launch'
 import { useMobileDiffReviewSendActions } from './use-mobile-diff-review-send-actions'
 import { pasteMobileNativeChatImagePaths } from './mobile-native-chat-image-send'
 
@@ -110,13 +109,14 @@ function mountSendSites(client: ReturnType<typeof clientFixture>, handle = 'term
       onSuccess: vi.fn(),
       refreshCanPaste: vi.fn()
     } as never)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: untyped vi.fn() stubs stand in for callbacks whose returns the send path never reads.
     diff = useMobileDiffReviewSendActions({
       client: client as unknown as RpcClient,
       connState: 'connected',
       worktreeId: 'workspace',
       screenState: { kind: 'loading' },
       setActionError: vi.fn(),
-      setSendSheet: vi.fn(),
+      sheets: { openSheet: vi.fn(), closeSheet: vi.fn(), updateSendSheet: vi.fn() },
       saveCommentsAndReviewState: vi.fn()
     } as never)
     return null
@@ -178,7 +178,6 @@ function mountSendSites(client: ReturnType<typeof clientFixture>, handle = 'term
         imagePaths: ['/tmp/picture.png'],
         followedByText: true
       }),
-    'PR triage': () => createTerminalAndSendPrompt(client, 'workspace', 'fix checks'),
     'diff review': () => diff.sendPromptToTerminal(handle, []),
     programmatic: () => client.sendRequest('terminal.send')
   }
@@ -239,23 +238,19 @@ it.each(realSites)('%s reports on its send target once per handle per 30 seconds
   expect(reports()[2][1]).toEqual({ terminal: 'term-2' })
 })
 
-it.each([
-  'query reply',
-  'image heal',
-  'image attachment',
-  'PR triage',
-  'diff review',
-  'programmatic'
-] as const)('%s never reports takeover', async (site) => {
-  const client = clientFixture()
-  const sites = mountSendSites(client)
-  await act(async () => {
-    await sites[site]()
-    await sites[site]()
-  })
-  expect(client.sendRequest.mock.calls.some(([method]) => method === 'terminal.send')).toBe(true)
-  expect(client.sendRequest.mock.calls.filter(([method]) => method === REPORT)).toHaveLength(0)
-})
+it.each(['query reply', 'image heal', 'image attachment', 'diff review', 'programmatic'] as const)(
+  '%s never reports takeover',
+  async (site) => {
+    const client = clientFixture()
+    const sites = mountSendSites(client)
+    await act(async () => {
+      await sites[site]()
+      await sites[site]()
+    })
+    expect(client.sendRequest.mock.calls.some(([method]) => method === 'terminal.send')).toBe(true)
+    expect(client.sendRequest.mock.calls.filter(([method]) => method === REPORT)).toHaveLength(0)
+  }
+)
 
 it.each(realSites)('%s does not report a rejected send', async (site) => {
   const client = clientFixture()
diff --git a/mobile/src/session/pr-ai-triage-launch.test.ts b/mobile/src/session/pr-ai-triage-launch.test.ts
index 5641bbe37d4c..16c8132836f3 100644
--- a/mobile/src/session/pr-ai-triage-launch.test.ts
+++ b/mobile/src/session/pr-ai-triage-launch.test.ts
@@ -1,64 +1,319 @@
 import { describe, expect, it, vi } from 'vitest'
+import type { RpcClient } from '../transport/rpc-client'
 import type { RpcResponse } from '../transport/types'
-import { createTerminalAndSendPrompt } from './pr-ai-triage-launch'
+import { AGENT_LAUNCH_UPDATE_REQUIRED_MESSAGE } from './mobile-existing-agent-launch'
+import {
+  AGENT_PROMPT_NOT_SENT_MESSAGE,
+  agentStartedMessage,
+  launchAgentWithPrompt,
+  promptedLaunchNotice
+} from './pr-ai-triage-launch'
 
-function success(result: unknown): RpcResponse {
+// A connected client whose only behaviour is the scripted `sendRequest`.
+function requestPortRpcClient(sendRequest: RpcClient['sendRequest']): RpcClient {
+  return {
+    sendRequest,
+    subscribe: () => () => {},
+    updateTerminalSubscriptionViewport: () => {},
+    getState: () => 'connected',
+    getReconnectAttempt: () => 0,
+    getLastConnectedAt: () => null,
+    onStateChange: () => () => {},
+    notifyForeground: () => {},
+    close: () => {}
+  }
+}
+
+const LAUNCH_CAPABILITIES = [
+  'agent.launch.v2',
+  'agent.launch.replay.v1',
+  'agent.launch.replay-required.v1'
+]
+const RECEIPT = {
+  mode: 'terminal',
+  preferred: 'terminal',
+  reason: 'user_default',
+  detail: 'Started a terminal agent.'
+}
+
+function ok(result: unknown): RpcResponse {
   return { id: 'x', ok: true, result, _meta: { runtimeId: 'r' } }
 }
 
-function failure(message: string): RpcResponse {
-  return { id: 'x', ok: false, error: { code: 'E', message }, _meta: { runtimeId: 'r' } }
+// Answers by method so the order of the agent loader's reads doesn't matter.
+function hostClient(replies: { settings?: unknown; detected?: unknown[]; launch?: RpcResponse }) {
+  const sendRequest = vi.fn(async (method: string, _params?: unknown) => {
+    if (method === 'repo.list') {
+      return ok({ repos: [{ id: 'repo-1' }] })
+    }
+    if (method === 'settings.get') {
+      return ok({ settings: replies.settings ?? {} })
+    }
+    if (method === 'preflight.detectAgents') {
+      return ok(replies.detected ?? ['claude', 'codex'])
+    }
+    if (method === 'agent.launchReplay') {
+      return replies.launch ?? ok({})
+    }
+    throw new Error(`unexpected ${method}`)
+  })
+  return { client: requestPortRpcClient(sendRequest), sendRequest }
 }
 
-const createdTerminal = success({ tab: { type: 'terminal', id: 't1', terminal: 'term-1' } })
-const sendAccepted = success({ send: { accepted: true } })
+function launchedWith(prompt: unknown, warning?: string): RpcResponse {
+  return ok({
+    outcome: { kind: 'terminal', handle: 'term-1' },
+    worktreeId: 'repo-1::/w',
+    receipt: RECEIPT,
+    ...(prompt ? { prompt } : {}),
+    ...(warning ? { warning } : {})
+  })
+}
 
-function clientReturning(...responses: RpcResponse[]) {
-  const sendRequest = vi.fn(async () => responses[sendRequest.mock.calls.length - 1])
-  return { sendRequest }
+function run(client: RpcClient, hostCapabilities: readonly string[] = LAUNCH_CAPABILITIES) {
+  return launchAgentWithPrompt({
+    client,
+    hostCapabilities,
+    worktreeId: 'repo-1::/w',
+    actionId: 'fixChecks',
+    prompt: 'Fix the failing checks',
+    launchSource: 'task_page'
+  })
 }
 
-describe('createTerminalAndSendPrompt', () => {
-  it('creates a terminal then sends the prompt with enter', async () => {
-    const client = clientReturning(createdTerminal, sendAccepted)
-    await createTerminalAndSendPrompt(client, 'wt-1', 'do the thing')
+function launchParams(sendRequest: ReturnType<typeof hostClient>['sendRequest']) {
+  return sendRequest.mock.calls.find(([method]) => method === 'agent.launchReplay')?.[1]
+}
+
+describe('launchAgentWithPrompt', () => {
+  it('never creates a bare shell: an older host gets update copy and no request', async () => {
+    const { client, sendRequest } = hostClient({})
+    await expect(run(client, [])).resolves.toEqual({
+      kind: 'not-started',
+      message: AGENT_LAUNCH_UPDATE_REQUIRED_MESSAGE
+    })
+    expect(sendRequest).not.toHaveBeenCalled()
+  })
 
-    expect(client.sendRequest).toHaveBeenNthCalledWith(1, 'session.tabs.createTerminal', {
-      worktree: 'id:wt-1',
-      activate: false,
-      select: true,
-      navigation: 'caller'
+  it('starts the default agent with the prompt through the host', async () => {
+    const { client, sendRequest } = hostClient({
+      settings: { defaultTuiAgent: 'codex' },
+      launch: launchedWith({ delivery: 'submit', outcome: 'handed-to-terminal' })
     })
-    expect(client.sendRequest).toHaveBeenNthCalledWith(2, 'terminal.send', {
-      terminal: 'term-1',
-      text: 'do the thing',
-      enter: true
+    await expect(run(client)).resolves.toEqual({ kind: 'sent' })
+    expect(launchParams(sendRequest)).toMatchObject({
+      agent: 'codex',
+      target: { kind: 'existing', worktree: 'id:repo-1::/w' },
+      prompt: { text: 'Fix the failing checks', delivery: 'submit' },
+      launchSource: 'task_page'
     })
+    // No saved arguments: the host applies the user's configured defaults.
+    expect(launchParams(sendRequest)).not.toHaveProperty('agentArgs')
+    expect(sendRequest.mock.calls.some(([method]) => method === 'terminal.send')).toBe(false)
+    expect(
+      sendRequest.mock.calls.some(([method]) => method === 'session.tabs.createTerminal')
+    ).toBe(false)
   })
 
-  it('throws and skips terminal.send when createTerminal fails', async () => {
-    const client = clientReturning(failure('boom'))
-    await expect(createTerminalAndSendPrompt(client, 'wt-1', 'p')).rejects.toThrow('boom')
-    expect(client.sendRequest).toHaveBeenCalledTimes(1)
+  it("honours the action's saved agent over the default", async () => {
+    const { client, sendRequest } = hostClient({
+      settings: {
+        defaultTuiAgent: 'codex',
+        sourceControlAi: { actions: { fixChecks: { agentId: 'claude' } } }
+      },
+      launch: launchedWith({ delivery: 'submit', outcome: 'handed-to-terminal' })
+    })
+    await run(client)
+    expect(launchParams(sendRequest)).toMatchObject({ agent: 'claude' })
   })
 
-  it('throws when the created-terminal response is malformed', async () => {
-    const client = clientReturning(success({ tab: { type: 'terminal' } }))
-    await expect(createTerminalAndSendPrompt(client, 'wt-1', 'p')).rejects.toThrow(
-      'The host sent a reply this app could not read (session.tabs.createTerminal)'
-    )
-    expect(client.sendRequest).toHaveBeenCalledTimes(1)
+  it("wraps the prompt in the action's saved template, as the desktop does", async () => {
+    const { client, sendRequest } = hostClient({
+      settings: {
+        defaultTuiAgent: 'claude',
+        sourceControlAi: {
+          actions: { fixChecks: { commandInputTemplate: '/review first\n\n{basePrompt}' } }
+        }
+      },
+      launch: launchedWith({ delivery: 'submit', outcome: 'handed-to-terminal' })
+    })
+    await run(client)
+    expect(launchParams(sendRequest)).toMatchObject({
+      prompt: { text: '/review first\n\nFix the failing checks', delivery: 'submit' }
+    })
+  })
+
+  it('refuses to launch with an empty saved template rather than send no prompt', async () => {
+    const { client, sendRequest } = hostClient({
+      settings: {
+        defaultTuiAgent: 'claude',
+        sourceControlAi: { actions: { fixChecks: { commandInputTemplate: '   ' } } }
+      }
+    })
+    await expect(run(client)).resolves.toMatchObject({ kind: 'not-started' })
+    expect(launchParams(sendRequest)).toBeUndefined()
   })
 
-  it('throws when terminal.send returns a failure', async () => {
-    const client = clientReturning(createdTerminal, failure('send failed'))
-    await expect(createTerminalAndSendPrompt(client, 'wt-1', 'p')).rejects.toThrow('send failed')
+  it('falls back to the default agent on an older host that publishes no recipes', async () => {
+    const { client, sendRequest } = hostClient({
+      // A host before the recipe projection: settings.get carries no sourceControlAi at all.
+      settings: { defaultTuiAgent: 'codex', disabledTuiAgents: [] },
+      launch: launchedWith({ delivery: 'submit', outcome: 'handed-to-terminal' })
+    })
+    await expect(run(client)).resolves.toEqual({ kind: 'sent' })
+    expect(launchParams(sendRequest)).toMatchObject({
+      agent: 'codex',
+      prompt: { text: 'Fix the failing checks' }
+    })
   })
 
-  it('throws when terminal input is locked', async () => {
-    const client = clientReturning(createdTerminal, success({ send: { accepted: false } }))
-    await expect(createTerminalAndSendPrompt(client, 'wt-1', 'p')).rejects.toThrow(
-      'Terminal input is locked'
+  it("never sends the action's saved agent arguments; the agent's defaults apply", async () => {
+    const { client, sendRequest } = hostClient({
+      settings: {
+        defaultTuiAgent: 'claude',
+        sourceControlAi: { actions: { fixChecks: { agentArgs: '--model opus' } } }
+      },
+      launch: launchedWith({ delivery: 'submit', outcome: 'handed-to-terminal' })
+    })
+    await run(client)
+    expect(launchParams(sendRequest)).toMatchObject({ agent: 'claude' })
+    expect(launchParams(sendRequest)).not.toHaveProperty('agentArgs')
+  })
+
+  it('refuses rather than swaps when the saved agent is not on this host', async () => {
+    const { client, sendRequest } = hostClient({
+      settings: { sourceControlAi: { actions: { fixChecks: { agentId: 'gemini' } } } },
+      detected: ['claude']
+    })
+    await expect(run(client)).resolves.toEqual({
+      kind: 'not-started',
+      message: 'The saved agent for this action is not available on this workspace host.'
+    })
+    expect(launchParams(sendRequest)).toBeUndefined()
+  })
+
+  it('still launches an agent when the default is a blank terminal', async () => {
+    const { client, sendRequest } = hostClient({
+      settings: { defaultTuiAgent: 'blank' },
+      detected: ['codex', 'claude'],
+      launch: launchedWith({ delivery: 'submit', outcome: 'handed-to-terminal' })
+    })
+    await run(client)
+    // Catalog order, as the desktop resolves it.
+    expect(launchParams(sendRequest)).toMatchObject({ agent: 'claude' })
+  })
+
+  it('reports no agent when none is detected and enabled', async () => {
+    const { client } = hostClient({
+      settings: { disabledTuiAgents: ['claude'] },
+      detected: ['claude']
+    })
+    await expect(run(client)).resolves.toEqual({
+      kind: 'not-started',
+      message: 'No enabled AI agent was detected on this workspace host.'
+    })
+  })
+
+  it('reports prompt-not-sent when the agent started without its prompt (v1.4.206-207 hosts)', async () => {
+    // Those hosts start a terminal agent with no prompt and say so.
+    const { client } = hostClient({
+      launch: launchedWith({ delivery: 'submit', outcome: 'not-delivered' })
+    })
+    await expect(run(client)).resolves.toEqual({
+      kind: 'prompt-not-sent',
+      prompt: 'Fix the failing checks'
+    })
+  })
+
+  it('passes the host warning through', async () => {
+    const { client } = hostClient({
+      launch: launchedWith(
+        { delivery: 'submit', outcome: 'journaled', messageId: 'm' },
+        '  launch arguments were ignored  '
+      )
+    })
+    await expect(run(client)).resolves.toEqual({
+      kind: 'sent',
+      warning: 'launch arguments were ignored'
+    })
+  })
+
+  it('reports an unknown outcome as unconfirmed', async () => {
+    const { client } = hostClient({
+      launch: {
+        id: 'x',
+        ok: false,
+        error: {
+          code: 'agent_session_operation_unknown',
+          message: 'agent_session_operation_unknown'
+        },
+        _meta: { runtimeId: 'r' }
+      }
+    })
+    await expect(run(client)).resolves.toMatchObject({ kind: 'unconfirmed' })
+  })
+})
+
+describe('promptedLaunchNotice', () => {
+  it('keeps the prompt only when the agent started without it', () => {
+    expect(promptedLaunchNotice({ kind: 'prompt-not-sent', prompt: 'p' })).toEqual({
+      succeeded: false,
+      success: null,
+      error: AGENT_PROMPT_NOT_SENT_MESSAGE,
+      warning: null,
+      undeliveredPrompt: 'p'
+    })
+    expect(promptedLaunchNotice({ kind: 'sent' })).toEqual({
+      succeeded: true,
+      success: 'Agent started',
+      error: null,
+      warning: null,
+      undeliveredPrompt: null
+    })
+    expect(promptedLaunchNotice({ kind: 'unconfirmed', message: 'm' })).toEqual({
+      succeeded: false,
+      success: null,
+      error: 'm',
+      warning: null,
+      undeliveredPrompt: null
+    })
+  })
+
+  // The host can attach a warning to a launch it still carried out.
+  it('never reports the host warning on a launch that went ahead as an error', () => {
+    expect(promptedLaunchNotice({ kind: 'sent', warning: 'arguments were ignored' })).toEqual({
+      succeeded: true,
+      success: 'Agent started',
+      error: null,
+      warning: 'arguments were ignored',
+      undeliveredPrompt: null
+    })
+    expect(
+      promptedLaunchNotice({
+        kind: 'prompt-not-sent',
+        prompt: 'p',
+        warning: 'arguments were ignored'
+      })
+    ).toEqual({
+      succeeded: false,
+      success: null,
+      error: AGENT_PROMPT_NOT_SENT_MESSAGE,
+      warning: 'arguments were ignored',
+      undeliveredPrompt: 'p'
+    })
+  })
+})
+
+describe('agentStartedMessage', () => {
+  // Issue #20543: a launch from the phone must say it happened, and where.
+  it('names the workspace the agent started in', () => {
+    expect(promptedLaunchNotice({ kind: 'sent' }, 'feature-login').success).toBe(
+      'Agent started in feature-login'
     )
   })
+
+  it('still confirms the launch when the screen knows no workspace name', () => {
+    expect(agentStartedMessage(null)).toBe('Agent started')
+    expect(agentStartedMessage('   ')).toBe('Agent started')
+  })
 })
diff --git a/mobile/src/session/pr-ai-triage-launch.ts b/mobile/src/session/pr-ai-triage-launch.ts
index 2e02b2998132..61c160b224ec 100644
--- a/mobile/src/session/pr-ai-triage-launch.ts
+++ b/mobile/src/session/pr-ai-triage-launch.ts
@@ -1,43 +1,139 @@
-import { refusedRpcMessageOrFallback } from '../transport/rpc-refusal-message'
-import { reviewTerminalCreateRun, reviewTerminalSendRun } from './mobile-review-terminal-operations'
-import type { RpcOperationSender } from '../transport/rpc-operation-sender'
+import type { SourceControlLaunchActionId } from '../../../src/shared/source-control-ai-actions'
+import { buildSourceControlRecoveryAgentCommandInput } from '../../../src/shared/source-control-recovery-agent-command'
+import type { RpcClient } from '../transport/rpc-client'
+import {
+  AGENT_LAUNCH_UPDATE_REQUIRED_MESSAGE,
+  launchAgentInExistingWorkspace,
+  supportsMobileExistingAgentLaunch
+} from './mobile-existing-agent-launch'
+import { loadMobileAgentLaunchContext } from './mobile-new-tab-agent-loader'
+import { resolveMobileSourceControlLaunchAgent } from './mobile-source-control-launch-agent'
 
-// Pure launch path for the PR triage actions ("Fix checks with AI" / "Resolve
-// conflicts with AI"). Reuses the same two RPCs the diff-review send flow uses —
-// session.tabs.createTerminal then terminal.send — so the prompt is dropped into a
-// fresh agent terminal in the worktree. Kept free of react-native imports so it
-// stays unit-testable in the node test environment.
-export async function createTerminalAndSendPrompt(
-  client: RpcOperationSender,
-  worktreeId: string,
+// Launch path for the phone's AI buttons ("Fix checks with AI", "Resolve conflicts with AI", commit
+// recovery, review notes). The host starts the agent and delivers the prompt; the phone never
+// types a prompt into a shell. Kept free of react-native imports so it unit-tests under node.
+
+export type MobilePromptedAgentLaunch =
+  | { kind: 'sent'; warning?: string }
+  /** The agent started but `prompt`, the text as sent, did not reach it; the caller offers it. */
+  | { kind: 'prompt-not-sent'; prompt: string; warning?: string }
+  /** Nothing started; `message` says why. */
+  | { kind: 'not-started'; message: string }
+  /** The agent may be running; do not launch again until the user has looked. */
+  | { kind: 'unconfirmed'; message: string }
+
+export const AGENT_PROMPT_NOT_SENT_MESSAGE = "The agent started, but the prompt wasn't sent."
+
+export async function launchAgentWithPrompt(args: {
+  client: RpcClient
+  hostCapabilities: readonly string[] | null | undefined
+  worktreeId: string
+  actionId: SourceControlLaunchActionId | null
   prompt: string
-): Promise<void> {
-  // Each request is awaited outside its catch so a transport drop propagates as the original
-  // error object; only a refusal is rewritten into the step's own copy.
-  const createdReply = await reviewTerminalCreateRun.request(client, {
-    worktree: `id:${worktreeId}`,
-    activate: false,
-    select: true,
-    navigation: 'caller'
-  })
-  let terminalTab
+  launchSource: string
+}): Promise<MobilePromptedAgentLaunch> {
+  if (!supportsMobileExistingAgentLaunch(args.hostCapabilities)) {
+    return { kind: 'not-started', message: AGENT_LAUNCH_UPDATE_REQUIRED_MESSAGE }
+  }
+  let resolved
   try {
-    terminalTab = reviewTerminalCreateRun.interpret(createdReply)
+    resolved = resolveMobileSourceControlLaunchAgent(
+      await loadMobileAgentLaunchContext({ client: args.client, worktreeId: args.worktreeId }),
+      args.actionId
+    )
   } catch (error) {
-    throw new Error(refusedRpcMessageOrFallback(error, 'Failed to create terminal'))
+    const message = error instanceof Error ? error.message.trim() : ''
+    return { kind: 'not-started', message: message || 'Could not load the available agents.' }
+  }
+  if (resolved.kind === 'unavailable') {
+    return { kind: 'not-started', message: resolved.message }
+  }
+  const { recipe } = resolved
+  // The desktop wraps each action's prompt in the user's saved template the same way.
+  const text = args.actionId
+    ? buildSourceControlRecoveryAgentCommandInput({
+        actionId: args.actionId,
+        commandInputTemplate: recipe?.commandInputTemplate,
+        basePrompt: args.prompt
+      })
+    : args.prompt
+  if (!text) {
+    return {
+      kind: 'not-started',
+      message:
+        "This action's saved prompt is empty. Update Source Control AI settings on your computer."
+    }
   }
-  const sentReply = await reviewTerminalSendRun.request(client, {
-    terminal: terminalTab.terminal,
-    text: prompt,
-    enter: true
+  const launched = await launchAgentInExistingWorkspace({
+    client: args.client,
+    hostCapabilities: args.hostCapabilities,
+    worktreeId: args.worktreeId,
+    agent: resolved.agent,
+    // Why no saved agent arguments: whether they apply depends on the route and shell the host picks
+    // after this request, so the phone leaves them out and the agent's default arguments apply.
+    prompt: { text, delivery: 'submit' },
+    launchSource: args.launchSource
   })
-  let accepted
-  try {
-    accepted = reviewTerminalSendRun.interpret(sentReply)
-  } catch (error) {
-    throw new Error(refusedRpcMessageOrFallback(error, 'Failed to send prompt'))
+  switch (launched.kind) {
+    case 'launched': {
+      const warning = launched.result.warning?.trim()
+      const extra = warning ? { warning } : {}
+      return launched.promptDelivered
+        ? { kind: 'sent', ...extra }
+        : { kind: 'prompt-not-sent', prompt: text, ...extra }
+    }
+    case 'unsupported':
+      return { kind: 'not-started', message: AGENT_LAUNCH_UPDATE_REQUIRED_MESSAGE }
+    case 'failed':
+      return { kind: 'not-started', message: launched.message }
+    case 'unknown':
+      return { kind: 'unconfirmed', message: launched.message }
   }
-  if (!accepted) {
-    throw new Error('Terminal input is locked')
+}
+
+/** The confirmation under an AI button, naming the workspace when the screen knows it. */
+export function agentStartedMessage(workspaceLabel: string | null | undefined): string {
+  const label = workspaceLabel?.trim()
+  return label ? `Agent started in ${label}` : 'Agent started'
+}
+
+/** What the button shows after a launch; one mapping so every AI button reads the same.
+ *  `warning` is the host's note on a launch that went ahead, so it is never shown as a failure. */
+export function promptedLaunchNotice(
+  result: MobilePromptedAgentLaunch,
+  workspaceLabel?: string | null
+): {
+  succeeded: boolean
+  success: string | null
+  error: string | null
+  warning: string | null
+  undeliveredPrompt: string | null
+} {
+  switch (result.kind) {
+    case 'sent':
+      return {
+        succeeded: true,
+        success: agentStartedMessage(workspaceLabel),
+        error: null,
+        warning: result.warning ?? null,
+        undeliveredPrompt: null
+      }
+    case 'prompt-not-sent':
+      return {
+        succeeded: false,
+        success: null,
+        error: AGENT_PROMPT_NOT_SENT_MESSAGE,
+        warning: result.warning ?? null,
+        undeliveredPrompt: result.prompt
+      }
+    case 'not-started':
+    case 'unconfirmed':
+      return {
+        succeeded: false,
+        success: null,
+        error: result.message,
+        warning: null,
+        undeliveredPrompt: null
+      }
   }
 }
diff --git a/mobile/src/session/quick-commands-tab-stability-source.test.ts b/mobile/src/session/quick-commands-tab-stability-source.test.ts
deleted file mode 100644
index 9c744a5f982f..000000000000
--- a/mobile/src/session/quick-commands-tab-stability-source.test.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import ts from 'typescript'
-import { describe, expect, it } from 'vitest'
-import { readMobileSessionRouteSource } from './mobile-session-route-source-family.test-support'
-
-const sourcePath = './MobileSessionHeader.tsx'
-const source = readMobileSessionRouteSource(sourcePath)
-const sheetsSource = readMobileSessionRouteSource('./MobileSessionSheets.tsx')
-const sourceFile = ts.createSourceFile(
-  sourcePath,
-  source,
-  ts.ScriptTarget.Latest,
-  true,
-  ts.ScriptKind.TSX
-)
-
-function findQuickCommandsTabButtons(): ts.JsxSelfClosingElement[] {
-  const matches: ts.JsxSelfClosingElement[] = []
-
-  function visit(node: ts.Node): void {
-    if (
-      ts.isJsxSelfClosingElement(node) &&
-      node.tagName.getText(sourceFile) === 'QuickCommandsTabButton'
-    ) {
-      matches.push(node)
-    }
-    ts.forEachChild(node, visit)
-  }
-
-  visit(sourceFile)
-  return matches
-}
-
-function getQuickCommandsTabSource(): string {
-  const start = source.indexOf('accessibilityLabel="New tab"')
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf('</SafeAreaView>', start)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('quick-commands tab stability', () => {
-  it('keeps the button mounted while preserving the capability gate', () => {
-    const tabSource = getQuickCommandsTabSource()
-    const buttons = findQuickCommandsTabButtons()
-
-    expect(buttons).toHaveLength(1)
-    const tabBar = buttons[0].parent
-    expect(ts.isJsxElement(tabBar)).toBe(true)
-    if (!ts.isJsxElement(tabBar)) {
-      return
-    }
-    expect(tabBar.openingElement.tagName.getText(sourceFile)).toBe('View')
-    const style = tabBar.openingElement.attributes.properties.find(
-      (attribute): attribute is ts.JsxAttribute =>
-        ts.isJsxAttribute(attribute) && attribute.name.getText(sourceFile) === 'style'
-    )
-    expect(style?.initializer?.getText(sourceFile)).toBe('{styles.tabBar}')
-    expect(tabSource).toContain('if (quickCommandsSupported === true)')
-    expect(tabSource).toContain('setShowQuickCommands(true)')
-    expect(tabSource).toContain('Desktop update required for quick commands')
-    expect(tabSource).toContain('Checking desktop capabilities — try again in a moment')
-  })
-
-  it('only presents the sheet after support is confirmed', () => {
-    expect(sheetsSource).toContain('visible={showQuickCommands && quickCommandsSupported === true}')
-  })
-})
diff --git a/mobile/src/session/session-read-reply-schema.ts b/mobile/src/session/session-read-reply-schema.ts
index 2a2417c66731..14d163360a0e 100644
--- a/mobile/src/session/session-read-reply-schema.ts
+++ b/mobile/src/session/session-read-reply-schema.ts
@@ -106,17 +106,20 @@ export const sessionWorktreeRecordSchema = z
 /**
  * A markdown tab's document, read the same way on load and on save.
  *
- * `content`, `version` and `isDirty` are required: use-mobile-session-document-readers.ts:38-45
- * publishes all three into the tab's ready state with no guard, so a reply missing one rendered
- * `undefined` in the editor and saved against an undefined base version.
- * `editable` and `readOnlyReason` are guarded on the same lines and stay optional.
+ * `content`, `version` and `isDirty` are required: `readMarkdownTab` in
+ * `useMobileSessionDocumentReaders` publishes all three into the tab's ready state with no guard,
+ * so a reply missing one rendered `undefined` in the editor and saved against an undefined base
+ * version. `editable` and `readOnlyReason` are guarded there and stay optional, as are
+ * `truncated` and `byteLength`, which only a host that truncates oversize documents sends.
  */
 export const markdownTabDocumentSchema = z.looseObject({
   content: z.string(),
   version: z.string(),
   isDirty: z.boolean(),
   editable: salvagedOptional('editable', z.boolean()),
-  readOnlyReason: salvagedOptional('readOnlyReason', z.string())
+  readOnlyReason: salvagedOptional('readOnlyReason', z.string()),
+  truncated: salvagedOptional('truncated', z.boolean()),
+  byteLength: salvagedOptional('byteLength', z.number())
 })
 
 /**
diff --git a/mobile/src/session/session-router-seam-census.test.ts b/mobile/src/session/session-router-seam-census.test.ts
deleted file mode 100644
index 9f73a5434ca2..000000000000
--- a/mobile/src/session/session-router-seam-census.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  callsRouteHandoff,
-  expoRouterValueImports,
-  parse,
-  productFiles
-} from '../navigation/router-seam-census.test-support'
-
-const SESSION_ROOT = import.meta.dirname
-
-/**
- * Which modules here hold a router, so the census cannot pass by seeing nothing.
- *
- * Four, and each for a different target. The foundation hook bounces a deleted workspace back to
- * its host; the file-tap handlers push a preview route from a terminal link or a chat path; the
- * notification hook consumes a pane tap by rewriting this route's own params; the review route
- * body replaces to the session screen and pops the stack behind it. Only the first two and the
- * last can leave the page, which is the whole reason the third is in the list anyway — a
- * `setParams` on expo-router's router and a `setParams` on the handoff's are the same call, and
- * listing it here is what stops someone later giving it back its own `useRouter` because "it never
- * navigates".
- */
-const ROUTER_HOLDERS = [
-  'MobileDiffReviewRouteScreen.tsx',
-  'use-mobile-file-tap-handlers.ts',
-  'use-mobile-session-foundation.ts',
-  'use-notification-pane-navigation.ts'
-]
-
-/**
- * The expo-router names this domain may still import, and why each one is not a router.
- *
- * `useFocusEffect` reads whether this screen is the focused one in the document's own stack and
- * `useLocalSearchParams` reads the params of the route already mounted. Neither takes a target, so
- * neither can put a screen in front of the page; both are the page's own router answering about the
- * page's own route, which is exactly what it is for.
- *
- * A closed list rather than a ban on `useRouter`: the hazard is anything that navigates, and
- * expo-router exports a module-singleton `router` that does it from a plain function. A rule written
- * against the one spelling would have read that as clean.
- */
-const NON_NAVIGATING_ROUTER_NAMES = ['useFocusEffect', 'useLocalSearchParams']
-
-describe('the session domain reaches the router through the handoff seam', () => {
-  const files = productFiles(SESSION_ROOT)
-
-  it('walks the modules it is written against', () => {
-    expect(files).toEqual(expect.arrayContaining(ROUTER_HOLDERS))
-    expect(files.length).toBeGreaterThan(200)
-  })
-
-  it('imports nothing from expo-router that can navigate', () => {
-    const offenders = files
-      .map((name) => ({
-        name,
-        imported: expoRouterValueImports(parse(SESSION_ROOT, name)).filter(
-          (imported) => !NON_NAVIGATING_ROUTER_NAMES.includes(imported)
-        )
-      }))
-      .filter((entry) => entry.imported.length > 0)
-      .map((entry) => `${entry.name} (${entry.imported.join(', ')})`)
-    expect(offenders).toEqual([])
-  })
-
-  it('takes the router from useRouteHandoff at every screen that holds one', () => {
-    expect(files.filter((name) => callsRouteHandoff(parse(SESSION_ROOT, name))).sort()).toEqual(
-      [...ROUTER_HOLDERS].sort()
-    )
-  })
-
-  it('still reaches expo-router for the two names that answer about its own route', () => {
-    // The completeness half: the rule above also passes over a domain that imports nothing at all,
-    // which is what it would read as if someone moved these hooks and left the list behind.
-    const imported = new Set(
-      files.flatMap((name) => expoRouterValueImports(parse(SESSION_ROOT, name)))
-    )
-    expect([...imported].sort()).toEqual([...NON_NAVIGATING_ROUTER_NAMES].sort())
-  })
-})
diff --git a/mobile/src/session/terminal-field-submit-binding-wiring.test.ts b/mobile/src/session/terminal-field-submit-binding-wiring.test.ts
deleted file mode 100644
index 25a4761af85b..000000000000
--- a/mobile/src/session/terminal-field-submit-binding-wiring.test.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { readMobileSessionRouteSource } from './mobile-session-route-source-family.test-support'
-
-const sendActionsSource = readMobileSessionRouteSource(
-  './use-mobile-session-terminal-send-actions.ts'
-)
-
-const BINDING_CALL = 'useTerminalTextFieldSubmitBinding('
-
-/** The handler each field hands its submit binding, in source order. */
-function readBoundSubmitNames(source: string): string[] {
-  const names: string[] = []
-  let at = source.indexOf(BINDING_CALL)
-  while (at >= 0) {
-    const args = source.slice(at + BINDING_CALL.length, source.indexOf(')', at))
-    const handler = args.split(',')[1]?.trim()
-    if (handler) {
-      names.push(handler)
-    }
-    at = source.indexOf(BINDING_CALL, at + 1)
-  }
-  return names
-}
-
-/**
- * The rule: a handler bound through `useTerminalTextFieldSubmitBinding` must not be frozen on an
- * empty dependency list.
- *
- * `handleSend` is a per-render function whose guard reads `client`, `activeHandle` and `canSend`,
- * all absent on the first render, so a submit memoized on `[]` is one closure for the life of the
- * component and the field's line-break submit can never pass that guard. The field's own
- * `onSubmitEditing` prop keeps working, which is what hid it.
- *
- * Why a source rule and not a render: every check that mounts its own submit writes the identity
- * under test itself, so the render rig's probe route could catch neither the defect nor the fix.
- * `terminal-field-submit-binding-send.test.tsx` reads the behaviour instead and catches spellings
- * this cannot; this one is the cheap guard beside it.
- */
-describe('the submit handlers the terminal fields bind', () => {
-  it('names one handler per bound field', () => {
-    expect(readBoundSubmitNames(sendActionsSource)).toEqual([
-      'submitLiveInput',
-      'submitBufferedDraft'
-    ])
-  })
-
-  it('freezes none of them on an empty dependency list', () => {
-    for (const name of readBoundSubmitNames(sendActionsSource)) {
-      const declaredAt = sendActionsSource.indexOf(`const ${name} = `)
-      expect(declaredAt).toBeGreaterThanOrEqual(0)
-      const boundAt = sendActionsSource.indexOf(`${BINDING_CALL}`, declaredAt)
-      expect(boundAt).toBeGreaterThan(declaredAt)
-      expect(sendActionsSource.slice(declaredAt, boundAt)).not.toContain('}, [])')
-    }
-  })
-
-  // The other half of the rule: a handler that is memoized must name what it reads, so the closure
-  // moves when the send guard's inputs do.
-  it('gives the live input submit the dependencies its closure reads', () => {
-    const declaredAt = sendActionsSource.indexOf('const submitLiveInput = ')
-    const boundAt = sendActionsSource.indexOf(BINDING_CALL, declaredAt)
-    const slice = sendActionsSource.slice(declaredAt, boundAt)
-    expect(slice).toContain('handleLiveInputSubmit')
-    expect(slice).toContain('activeSessionTab')
-  })
-})
diff --git a/mobile/src/session/use-mobile-diff-review-comment-actions.ts b/mobile/src/session/use-mobile-diff-review-comment-actions.ts
index d49350f1519f..b5e2df91e169 100644
--- a/mobile/src/session/use-mobile-diff-review-comment-actions.ts
+++ b/mobile/src/session/use-mobile-diff-review-comment-actions.ts
@@ -21,6 +21,7 @@ import {
   nextReviewIndexAfterMarkReviewed,
   reviewDescriptorFromItem
 } from './mobile-diff-review-screen-model'
+import type { ReviewSheetIntents } from './mobile-diff-review-sheets'
 
 type CommentActionsInput = {
   client: RpcClient | null
@@ -36,10 +37,9 @@ type CommentActionsInput = {
   composerBody: string
   setScreenState: Dispatch<SetStateAction<ReviewScreenState>>
   setCurrentIndex: Dispatch<SetStateAction<number>>
-  setComposer: Dispatch<SetStateAction<ComposerState | null>>
   setComposerBody: Dispatch<SetStateAction<string>>
   setActionError: Dispatch<SetStateAction<string | null>>
-  setShowCompletion: Dispatch<SetStateAction<boolean>>
+  sheets: Pick<ReviewSheetIntents, 'openSheet' | 'openSheetWhenIdle' | 'closeSheet'>
 }
 
 export function useMobileDiffReviewCommentActions(input: CommentActionsInput) {
@@ -57,11 +57,11 @@ export function useMobileDiffReviewCommentActions(input: CommentActionsInput) {
     composerBody,
     setScreenState,
     setCurrentIndex,
-    setComposer,
     setComposerBody,
     setActionError,
-    setShowCompletion
+    sheets
   } = input
+  const { openSheet, openSheetWhenIdle, closeSheet } = sheets
 
   const persistMetadata = useCallback(
     async (comments: readonly DiffComment[], reviewState: MobileDiffReviewState) => {
@@ -109,24 +109,24 @@ export function useMobileDiffReviewCommentActions(input: CommentActionsInput) {
 
   const openComposer = useCallback(
     (lineNumber: number) => {
-      setComposer({ mode: 'create', lineNumber })
+      openSheet({ kind: 'composer', composer: { mode: 'create', lineNumber } })
       setComposerBody('')
     },
-    [setComposer, setComposerBody]
+    [openSheet, setComposerBody]
   )
 
   const openEditComposer = useCallback(
     (comment: DiffComment) => {
-      setComposer({ mode: 'edit', comment })
+      openSheet({ kind: 'composer', composer: { mode: 'edit', comment } })
       setComposerBody(comment.body)
     },
-    [setComposer, setComposerBody]
+    [openSheet, setComposerBody]
   )
 
   const closeComposer = useCallback(() => {
-    setComposer(null)
+    closeSheet('composer')
     setComposerBody('')
-  }, [setComposer, setComposerBody])
+  }, [closeSheet, setComposerBody])
 
   const saveComposer = useCallback(async () => {
     if (!composer || !currentItem || screenState.kind !== 'ready') {
@@ -201,18 +201,19 @@ export function useMobileDiffReviewCommentActions(input: CommentActionsInput) {
     if (nextIndex !== null) {
       setCurrentIndex(nextIndex)
     } else {
-      setShowCompletion(true)
+      // Why: the save can outlast a sheet the user opened meanwhile; never stack on or close it.
+      openSheetWhenIdle({ kind: 'completion' })
     }
   }, [
     currentIndex,
     currentItem,
     filter,
     filteredQueue,
+    openSheetWhenIdle,
     queue,
     saveCommentsAndReviewState,
     screenState,
-    setCurrentIndex,
-    setShowCompletion
+    setCurrentIndex
   ])
 
   const markUnreviewed = useCallback(async () => {
diff --git a/mobile/src/session/use-mobile-diff-review-controller.test.ts b/mobile/src/session/use-mobile-diff-review-controller.test.ts
index 5056b3cb546f..31db5abf9115 100644
--- a/mobile/src/session/use-mobile-diff-review-controller.test.ts
+++ b/mobile/src/session/use-mobile-diff-review-controller.test.ts
@@ -43,6 +43,9 @@ describe('useMobileDiffReviewController', () => {
     const controller = useMobileDiffReviewController({
       client,
       connState,
+      hostCapabilities: [],
+      hostStatusPending: false,
+      hostStatusReadable: true,
       hostId: 'host-1',
       worktreeId: 'wt-1',
       name: 'review',
diff --git a/mobile/src/session/use-mobile-diff-review-controller.ts b/mobile/src/session/use-mobile-diff-review-controller.ts
index 1efab1fe4ee7..ae5648f60539 100644
--- a/mobile/src/session/use-mobile-diff-review-controller.ts
+++ b/mobile/src/session/use-mobile-diff-review-controller.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react'
 import type { FlatList } from 'react-native'
 import type { DiffComment } from '../../../src/shared/diff-comment-types'
 import type { ConnectionState } from '../transport/types'
@@ -10,8 +10,7 @@ import {
   filterMobileDiffReviewQueue,
   mobileDiffReviewCommentMatchesItem,
   summarizeMobileDiffReviewQueue,
-  type MobileDiffReviewQueueFilter,
-  type MobileDiffReviewQueueItem
+  type MobileDiffReviewQueueFilter
 } from './mobile-diff-review-queue'
 import {
   findMobileDiffReviewInitialIndex,
@@ -20,18 +19,23 @@ import {
 import { loadMobileDiffReviewSnapshot } from './mobile-diff-review-loaders'
 import { useMobileDiffReviewDiffLoading } from './use-mobile-diff-review-diff-loading'
 import { canOpenMobileBranchCompareDiff } from '../source-control/mobile-branch-compare'
-import type {
-  ComposerState,
-  ReviewDiffLine,
-  ReviewScreenState,
-  SendSheetState
-} from './mobile-diff-review-screen-model'
+import type { ReviewDiffLine, ReviewScreenState } from './mobile-diff-review-screen-model'
+import {
+  NO_REVIEW_SHEETS,
+  reduceReviewSheets,
+  reviewComposer,
+  reviewSheetIntents
+} from './mobile-diff-review-sheets'
 import { useMobileDiffReviewInteractions } from './use-mobile-diff-review-interactions'
+import { resolveMobileAgentLaunchAvailability } from './mobile-agent-launch-availability'
 import { useMobilePrSidebarController } from './use-mobile-pr-sidebar-controller'
 
 type ControllerInput = {
   client: RpcClient | null
   connState: ConnectionState
+  hostCapabilities: readonly string[]
+  hostStatusPending: boolean
+  hostStatusReadable: boolean
   hostId: string
   worktreeId: string
   name: string
@@ -46,6 +50,9 @@ export function useMobileDiffReviewController(input: ControllerInput) {
   const {
     client,
     connState,
+    hostCapabilities,
+    hostStatusPending,
+    hostStatusReadable,
     hostId,
     worktreeId,
     name,
@@ -62,14 +69,12 @@ export function useMobileDiffReviewController(input: ControllerInput) {
   const [filter, setFilter] = useState<MobileDiffReviewQueueFilter>(initialFilter)
   const [currentIndex, setCurrentIndex] = useState(0)
   const [activeHunkIndex, setActiveHunkIndex] = useState<number | null>(null)
-  const [composer, setComposer] = useState<ComposerState | null>(null)
+  const [sheets, dispatchSheets] = useReducer(reduceReviewSheets, NO_REVIEW_SHEETS)
+  const sheetIntents = useMemo(() => reviewSheetIntents(dispatchSheets), [])
+  const composer = reviewComposer(sheets)
   const [composerBody, setComposerBody] = useState('')
   const [actionError, setActionError] = useState<string | null>(null)
   const [busyAction, setBusyAction] = useState<string | null>(null)
-  const [discardTarget, setDiscardTarget] = useState<MobileDiffReviewQueueItem | null>(null)
-  const [showOverflow, setShowOverflow] = useState(false)
-  const [sendSheet, setSendSheet] = useState<SendSheetState | null>(null)
-  const [showCompletion, setShowCompletion] = useState(false)
   const worktreeLabel = getWorktreeLabel(name, worktreeId)
 
   const loadReviewData = useCallback(async () => {
@@ -227,6 +232,7 @@ export function useMobileDiffReviewController(input: ControllerInput) {
   const interactions = useMobileDiffReviewInteractions({
     client,
     connState,
+    hostCapabilities,
     hostId,
     worktreeId,
     screenState,
@@ -244,12 +250,10 @@ export function useMobileDiffReviewController(input: ControllerInput) {
     setFilter,
     setCurrentIndex,
     setActiveHunkIndex,
-    setComposer,
     setComposerBody,
     setActionError,
     setBusyAction,
-    setSendSheet,
-    setShowCompletion,
+    sheets: sheetIntents,
     loadReviewData,
     onOpenSession,
     onReconnect
@@ -258,6 +262,12 @@ export function useMobileDiffReviewController(input: ControllerInput) {
   return {
     ...interactions,
     ...prSidebar,
+    ...sheetIntents,
+    agentLaunchAvailability: resolveMobileAgentLaunchAvailability({
+      hostCapabilities,
+      statusPending: hostStatusPending,
+      statusReadable: hostStatusReadable
+    }),
     // Exposed so the screen can thread the RPC client + worktree into the PR
     // sidebar's lazy check-detail fetches (U5) and mutation actions (U6).
     client,
@@ -274,7 +284,6 @@ export function useMobileDiffReviewController(input: ControllerInput) {
     currentIndex,
     currentItem,
     diffState,
-    discardTarget,
     fileNotes: commentsByLine.get(0) ?? [],
     filter,
     filteredQueue,
@@ -283,14 +292,8 @@ export function useMobileDiffReviewController(input: ControllerInput) {
     reviewedCount,
     reviewedUnstagedCount,
     screenState,
-    sendSheet,
     setComposerBody,
-    setDiscardTarget,
-    setSendSheet,
-    setShowCompletion,
-    setShowOverflow,
-    showCompletion,
-    showOverflow,
+    sheet: sheets.requested,
     staleCommentIds,
     unsentComments,
     worktreeLabel
diff --git a/mobile/src/session/use-mobile-diff-review-interactions.ts b/mobile/src/session/use-mobile-diff-review-interactions.ts
index 53dc69fadad2..f3a5d855eaa7 100644
--- a/mobile/src/session/use-mobile-diff-review-interactions.ts
+++ b/mobile/src/session/use-mobile-diff-review-interactions.ts
@@ -12,9 +12,9 @@ import type {
   ComposerState,
   ReviewDiffLine,
   ReviewDiffState,
-  ReviewScreenState,
-  SendSheetState
+  ReviewScreenState
 } from './mobile-diff-review-screen-model'
+import type { ReviewSheetIntents } from './mobile-diff-review-sheets'
 import { sourceFileDiffOpenRun } from '../source-control/mobile-source-file-open-operations'
 import { refusedRpcMessageOrFallback } from '../transport/rpc-refusal-message'
 import { useMobileDiffReviewCommentActions } from './use-mobile-diff-review-comment-actions'
@@ -25,6 +25,7 @@ import { connectionRetryAction } from '../transport/connection-retry-action'
 type InteractionInput = {
   client: RpcClient | null
   connState: ConnectionState
+  hostCapabilities: readonly string[]
   hostId: string
   worktreeId: string
   screenState: ReviewScreenState
@@ -42,12 +43,10 @@ type InteractionInput = {
   setFilter: Dispatch<SetStateAction<MobileDiffReviewQueueFilter>>
   setCurrentIndex: Dispatch<SetStateAction<number>>
   setActiveHunkIndex: Dispatch<SetStateAction<number | null>>
-  setComposer: Dispatch<SetStateAction<ComposerState | null>>
   setComposerBody: Dispatch<SetStateAction<string>>
   setActionError: Dispatch<SetStateAction<string | null>>
   setBusyAction: Dispatch<SetStateAction<string | null>>
-  setSendSheet: Dispatch<SetStateAction<SendSheetState | null>>
-  setShowCompletion: Dispatch<SetStateAction<boolean>>
+  sheets: ReviewSheetIntents
   loadReviewData: () => Promise<void>
   onOpenSession: () => void
   onReconnect: ((hostId: string) => void | Promise<void>) | null
@@ -57,6 +56,7 @@ export function useMobileDiffReviewInteractions(input: InteractionInput) {
   const {
     client,
     connState,
+    hostCapabilities,
     hostId,
     worktreeId,
     screenState,
@@ -74,12 +74,10 @@ export function useMobileDiffReviewInteractions(input: InteractionInput) {
     setFilter,
     setCurrentIndex,
     setActiveHunkIndex,
-    setComposer,
     setComposerBody,
     setActionError,
     setBusyAction,
-    setSendSheet,
-    setShowCompletion,
+    sheets,
     loadReviewData,
     onOpenSession,
     onReconnect
@@ -108,10 +106,9 @@ export function useMobileDiffReviewInteractions(input: InteractionInput) {
     composerBody,
     setScreenState,
     setCurrentIndex,
-    setComposer,
     setComposerBody,
     setActionError,
-    setShowCompletion
+    sheets
   })
 
   const { runGitMutation, stageReviewedFiles } = useMobileDiffReviewGitActions({
@@ -128,10 +125,11 @@ export function useMobileDiffReviewInteractions(input: InteractionInput) {
     useMobileDiffReviewSendActions({
       client,
       connState,
+      hostCapabilities,
       worktreeId,
       screenState,
       setActionError,
-      setSendSheet,
+      sheets,
       saveCommentsAndReviewState
     })
 
diff --git a/mobile/src/session/use-mobile-diff-review-send-actions.test.ts b/mobile/src/session/use-mobile-diff-review-send-actions.test.ts
index f763a8f30789..125e2e583504 100644
--- a/mobile/src/session/use-mobile-diff-review-send-actions.test.ts
+++ b/mobile/src/session/use-mobile-diff-review-send-actions.test.ts
@@ -1,9 +1,11 @@
 import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
 import type { DiffComment } from '../../../src/shared/diff-comment-types'
 import type { RpcClient } from '../transport/rpc-client'
+import type { RpcResponse } from '../transport/types'
 import type { ReviewScreenState } from './mobile-diff-review-screen-model'
+import type { ReviewSheetIntents } from './mobile-diff-review-sheets'
 import {
   isMobileNativeChatInputStale,
   markMobileNativeChatInputStale,
@@ -11,6 +13,21 @@ import {
 } from './mobile-native-chat-stale-input'
 import { useMobileDiffReviewSendActions } from './use-mobile-diff-review-send-actions'
 
+// A connected client whose only behaviour is the scripted `sendRequest`.
+function requestPortRpcClient(sendRequest: RpcClient['sendRequest']): RpcClient {
+  return {
+    sendRequest,
+    subscribe: () => () => {},
+    updateTerminalSubscriptionViewport: () => {},
+    getState: () => 'connected',
+    getReconnectAttempt: () => 0,
+    getLastConnectedAt: () => null,
+    onStateChange: () => () => {},
+    notifyForeground: () => {},
+    close: () => {}
+  }
+}
+
 type SendActions = ReturnType<typeof useMobileDiffReviewSendActions>
 
 vi.mock('../platform/haptics', () => ({ triggerSuccess: vi.fn() }))
@@ -38,6 +55,46 @@ const COMMENT: DiffComment = {
   side: 'modified'
 }
 
+const LAUNCH_CAPABILITIES = [
+  'agent.launch.v2',
+  'agent.launch.replay.v1',
+  'agent.launch.replay-required.v1'
+]
+
+function rpcReply(result: unknown) {
+  return { id: 'rpc', ok: true as const, result, _meta: { runtimeId: 'r' } }
+}
+
+function launchedReply(promptOutcome: 'handed-to-terminal' | 'not-delivered', warning?: string) {
+  return rpcReply({
+    outcome: { kind: 'terminal', handle: 'term-1' },
+    worktreeId: 'wt-1',
+    receipt: { mode: 'terminal', preferred: 'terminal', reason: 'user_default', detail: 'd' },
+    prompt: { delivery: 'submit', outcome: promptOutcome },
+    ...(warning ? { warning } : {})
+  })
+}
+
+// Answers the agent loader's reads and the launch, by method.
+function launchClient(
+  promptOutcome: 'handed-to-terminal' | 'not-delivered',
+  launchReply: () => Promise<RpcResponse> = async () => launchedReply(promptOutcome)
+) {
+  const sendRequest = vi.fn(async (method: string, _params?: unknown): Promise<RpcResponse> => {
+    if (method === 'repo.list') {
+      return rpcReply({ repos: [{ id: 'wt-1' }] })
+    }
+    if (method === 'settings.get') {
+      return rpcReply({ settings: { defaultTuiAgent: 'codex' } })
+    }
+    if (method === 'preflight.detectAgents') {
+      return rpcReply(['codex'])
+    }
+    return launchReply()
+  })
+  return { client: requestPortRpcClient(sendRequest), sendRequest }
+}
+
 const READY: ReviewScreenState = {
   kind: 'ready',
   status: { entries: [], conflictOperation: 'none' },
@@ -51,14 +108,20 @@ describe('useMobileDiffReviewSendActions', () => {
   let actions: SendActions | null = null
   let mountedClient: RpcClient | null = null
   let setActionError: ReturnType<typeof vi.fn>
-  let setSendSheet: ReturnType<typeof vi.fn>
+  let sheets: {
+    openSheet: Mock<ReviewSheetIntents['openSheet']>
+    closeSheet: Mock<ReviewSheetIntents['closeSheet']>
+    updateSendSheet: Mock<ReviewSheetIntents['updateSendSheet']>
+  }
   let saveCommentsAndReviewState: ReturnType<typeof vi.fn>
+  let screenState: ReviewScreenState = READY
 
   beforeEach(() => {
+    screenState = READY
     clipboardMock.setStringAsync.mockReset().mockResolvedValue(true)
     resetMobileNativeChatStaleInputForTests()
     setActionError = vi.fn()
-    setSendSheet = vi.fn()
+    sheets = { openSheet: vi.fn(), closeSheet: vi.fn(), updateSendSheet: vi.fn() }
     saveCommentsAndReviewState = vi.fn().mockResolvedValue(undefined)
   })
 
@@ -73,10 +136,11 @@ describe('useMobileDiffReviewSendActions', () => {
     actions = useMobileDiffReviewSendActions({
       client: mountedClient,
       connState: 'connected',
+      hostCapabilities: LAUNCH_CAPABILITIES,
       worktreeId: 'wt-1',
-      screenState: READY,
+      screenState,
       setActionError,
-      setSendSheet,
+      sheets,
       saveCommentsAndReviewState
     })
     return null
@@ -158,7 +222,7 @@ describe('useMobileDiffReviewSendActions', () => {
     expect(sendRequest.mock.calls[0]?.[1]).toMatchObject({ text: '\x15', enter: false })
     expect(saveCommentsAndReviewState).not.toHaveBeenCalled()
     expect(setActionError).not.toHaveBeenCalled()
-    expect(setSendSheet).not.toHaveBeenCalled()
+    expect(sheets.closeSheet).not.toHaveBeenCalled()
     // Marker survives for the next attempt.
     expect(isMobileNativeChatInputStale('terminal-1')).toBe(true)
   })
@@ -192,7 +256,7 @@ describe('useMobileDiffReviewSendActions', () => {
     expect(sendRequest.mock.calls[0]?.[1]).toMatchObject({ terminal: 'terminal-1', enter: true })
     expect(saveCommentsAndReviewState).toHaveBeenCalledTimes(1)
     expect(setActionError).toHaveBeenCalledWith('Review notes sent')
-    expect(setSendSheet).toHaveBeenCalledWith(null)
+    expect(sheets.closeSheet).toHaveBeenCalledWith('send')
   })
 
   it('only heals the terminal that was marked', async () => {
@@ -239,4 +303,141 @@ describe('useMobileDiffReviewSendActions', () => {
     expect((error as Error).message).toBe('pane gone')
     expect(saveCommentsAndReviewState).not.toHaveBeenCalled()
   })
+
+  it('starts a new agent with the notes through the host and marks them sent', async () => {
+    const { client, sendRequest } = launchClient('handed-to-terminal')
+    await mount(client)
+    await act(async () => {
+      await actions?.createTerminalAndSend([COMMENT])
+    })
+    const launch = sendRequest.mock.calls.find(([method]) => method === 'agent.launchReplay')
+    expect(launch?.[1]).toMatchObject({
+      agent: 'codex',
+      target: { kind: 'existing', worktree: 'id:wt-1' },
+      prompt: { delivery: 'submit' },
+      launchSource: 'notes_send'
+    })
+    expect(sendRequest.mock.calls.some(([method]) => method === 'terminal.send')).toBe(false)
+    expect(saveCommentsAndReviewState).toHaveBeenCalledOnce()
+    expect(setActionError).toHaveBeenLastCalledWith('Review notes sent')
+  })
+
+  it('keeps saying the notes were sent when the host adds a warning', async () => {
+    await mount(
+      launchClient('handed-to-terminal', async () =>
+        launchedReply('handed-to-terminal', 'the requested arguments were ignored.')
+      ).client
+    )
+    await act(async () => {
+      await actions?.createTerminalAndSend([COMMENT])
+    })
+    expect(saveCommentsAndReviewState).toHaveBeenCalledOnce()
+    expect(setActionError).toHaveBeenLastCalledWith(
+      'Review notes sent. the requested arguments were ignored.'
+    )
+  })
+
+  it('says it is waiting for the desktop instead of rejecting when there is no connection', async () => {
+    await mountWithoutClient()
+    await act(async () => {
+      await expect(actions?.createTerminalAndSend([COMMENT])).resolves.toBeUndefined()
+    })
+    expect(sheets.closeSheet).toHaveBeenCalledWith('send')
+    expect(setActionError).toHaveBeenLastCalledWith('Waiting for desktop...')
+  })
+
+  it('keeps the notes unsent when the agent started without them', async () => {
+    await mount(launchClient('not-delivered').client)
+    await act(async () => {
+      await actions?.createTerminalAndSend([COMMENT])
+    })
+    expect(saveCommentsAndReviewState).not.toHaveBeenCalled()
+    expect(setActionError).toHaveBeenLastCalledWith(
+      "The agent started, but the notes weren't sent. Use Copy Notes to paste them."
+    )
+  })
+
+  it('shows a launch that did not start on the review screen instead of rejecting', async () => {
+    await mount(
+      launchClient('handed-to-terminal', async () => ({
+        id: 'rpc',
+        ok: false,
+        error: { code: 'selector_not_found', message: 'Workspace not found' },
+        _meta: { runtimeId: 'r' }
+      })).client
+    )
+    await act(async () => {
+      await actions?.createTerminalAndSend([COMMENT])
+    })
+    expect(sheets.closeSheet).toHaveBeenCalledWith('send')
+    expect(setActionError).toHaveBeenLastCalledWith('Workspace not found')
+    expect(saveCommentsAndReviewState).not.toHaveBeenCalled()
+  })
+
+  it('starts one agent for a double tap and keeps notes written while it starts', async () => {
+    let answerLaunch: (reply: RpcResponse) => void = () => {}
+    const { client, sendRequest } = launchClient(
+      'handed-to-terminal',
+      () =>
+        new Promise<RpcResponse>((resolve) => {
+          answerLaunch = resolve
+        })
+    )
+    await mount(client)
+    let first: Promise<void> | undefined
+    await act(async () => {
+      first = actions?.createTerminalAndSend([COMMENT])
+      await actions?.createTerminalAndSend([COMMENT])
+    })
+    expect(setActionError).toHaveBeenLastCalledWith('Starting an agent...')
+    const written: DiffComment = { ...COMMENT, id: 'comment-2', body: 'written meanwhile' }
+    screenState = { ...READY, comments: [COMMENT, written] }
+    await act(async () => {
+      renderer?.update(createElement(Harness))
+    })
+    await act(async () => {
+      answerLaunch(launchedReply('handed-to-terminal'))
+      await first
+    })
+    expect(
+      sendRequest.mock.calls.filter(([method]) => method === 'agent.launchReplay')
+    ).toHaveLength(1)
+    expect(saveCommentsAndReviewState).toHaveBeenCalledWith(
+      [
+        expect.objectContaining({ id: 'comment-1', sentAt: expect.any(Number) }),
+        expect.not.objectContaining({ sentAt: expect.anything() })
+      ],
+      READY.reviewState
+    )
+    expect(saveCommentsAndReviewState.mock.calls[0]?.[0]?.[1]?.id).toBe('comment-2')
+    expect(setActionError).toHaveBeenLastCalledWith('Review notes sent')
+  })
+
+  // The save rolls back to the screen it was created with, so a stale one would drop newer notes.
+  it('marks the notes sent through the save of the latest render, not the one from the tap', async () => {
+    let answerLaunch: (reply: RpcResponse) => void = () => {}
+    const { client } = launchClient(
+      'handed-to-terminal',
+      () =>
+        new Promise<RpcResponse>((resolve) => {
+          answerLaunch = resolve
+        })
+    )
+    await mount(client)
+    let first: Promise<void> | undefined
+    await act(async () => {
+      first = actions?.createTerminalAndSend([COMMENT])
+    })
+    const tapTimeSave = saveCommentsAndReviewState
+    saveCommentsAndReviewState = vi.fn().mockResolvedValue(undefined)
+    await act(async () => {
+      renderer?.update(createElement(Harness))
+    })
+    await act(async () => {
+      answerLaunch(launchedReply('handed-to-terminal'))
+      await first
+    })
+    expect(tapTimeSave).not.toHaveBeenCalled()
+    expect(saveCommentsAndReviewState).toHaveBeenCalledOnce()
+  })
 })
diff --git a/mobile/src/session/use-mobile-diff-review-send-actions.ts b/mobile/src/session/use-mobile-diff-review-send-actions.ts
index 8413cf61c36f..bea344cd3874 100644
--- a/mobile/src/session/use-mobile-diff-review-send-actions.ts
+++ b/mobile/src/session/use-mobile-diff-review-send-actions.ts
@@ -1,4 +1,4 @@
-import { useCallback, type Dispatch, type SetStateAction } from 'react'
+import { useCallback, useEffect, useRef, type Dispatch, type SetStateAction } from 'react'
 import type { DiffComment, MobileDiffReviewState } from '../../../src/shared/diff-comment-types'
 import type { ConnectionState } from '../transport/types'
 import type { RpcClient } from '../transport/rpc-client'
@@ -6,22 +6,21 @@ import { useClipboardWriter } from '../platform/clipboard'
 import { triggerSuccess } from '../platform/haptics'
 import { formatDiffComments, formatMobileDiffReviewPrompt } from './mobile-diff-comments'
 import { clearSentMobileDiffComments, markMobileDiffCommentsSent } from './mobile-diff-comment-edit'
-import {
-  reviewTerminalCreateRun,
-  reviewTerminalListRead,
-  reviewTerminalSendRun
-} from './mobile-review-terminal-operations'
+import { reviewTerminalListRead, reviewTerminalSendRun } from './mobile-review-terminal-operations'
+import { launchAgentWithPrompt } from './pr-ai-triage-launch'
 import { interpretOrThrowRefusalMessage } from '../transport/rpc-refusal-message'
 import { healMobileNativeChatStaleInput } from './mobile-native-chat-stale-input'
-import type { ReviewScreenState, SendSheetState } from './mobile-diff-review-screen-model'
+import type { ReviewScreenState } from './mobile-diff-review-screen-model'
+import type { ReviewSheetIntents } from './mobile-diff-review-sheets'
 
 type SendActionsInput = {
   client: RpcClient | null
   connState: ConnectionState
+  hostCapabilities: readonly string[]
   worktreeId: string
   screenState: ReviewScreenState
   setActionError: Dispatch<SetStateAction<string | null>>
-  setSendSheet: Dispatch<SetStateAction<SendSheetState | null>>
+  sheets: Pick<ReviewSheetIntents, 'openSheet' | 'closeSheet' | 'updateSendSheet'>
   saveCommentsAndReviewState: (
     comments: DiffComment[],
     reviewState: MobileDiffReviewState
@@ -35,12 +34,14 @@ export function useMobileDiffReviewSendActions(input: SendActionsInput) {
   const {
     client,
     connState,
+    hostCapabilities,
     worktreeId,
     screenState,
     setActionError,
-    setSendSheet,
+    sheets,
     saveCommentsAndReviewState
   } = input
+  const { openSheet, closeSheet, updateSendSheet } = sheets
 
   const copyNotes = useCallback(async () => {
     if (screenState.kind !== 'ready' || screenState.comments.length === 0) {
@@ -66,20 +67,27 @@ export function useMobileDiffReviewSendActions(input: SendActionsInput) {
     await saveCommentsAndReviewState(nextComments, screenState.reviewState)
   }, [saveCommentsAndReviewState, screenState])
 
-  const markNotesSent = useCallback(
-    async (comments: readonly DiffComment[]) => {
-      if (screenState.kind !== 'ready') {
-        return
-      }
-      const next = markMobileDiffCommentsSent(
-        screenState.comments,
-        new Set(comments.map((comment) => comment.id)),
-        Date.now()
-      )
-      await saveCommentsAndReviewState(next, screenState.reviewState)
-    },
-    [saveCommentsAndReviewState, screenState]
-  )
+  // Read when a send settles, not when it was tapped: an agent launch can take a minute, and notes
+  // written meanwhile must survive the whole-list save below, and its rollback if that save fails.
+  const latestRef = useRef({ screenState, save: saveCommentsAndReviewState })
+  useEffect(() => {
+    latestRef.current = { screenState, save: saveCommentsAndReviewState }
+  }, [saveCommentsAndReviewState, screenState])
+  // One launch at a time: each tap is a new operation, so a second tap would start a second agent.
+  const agentLaunchInFlightRef = useRef(false)
+
+  const markNotesSent = useCallback(async (comments: readonly DiffComment[]) => {
+    const { screenState: current, save } = latestRef.current
+    if (current.kind !== 'ready') {
+      return
+    }
+    const next = markMobileDiffCommentsSent(
+      current.comments,
+      new Set(comments.map((comment) => comment.id)),
+      Date.now()
+    )
+    await save(next, current.reviewState)
+  }, [])
 
   const sendPromptToTerminal = useCallback(
     async (terminal: string, comments: readonly DiffComment[]) => {
@@ -107,30 +115,58 @@ export function useMobileDiffReviewSendActions(input: SendActionsInput) {
       await markNotesSent(comments)
       triggerSuccess()
       setActionError('Review notes sent')
-      setSendSheet(null)
+      closeSheet('send')
     },
-    [client, connState, markNotesSent, setActionError, setSendSheet]
+    [client, connState, closeSheet, markNotesSent, setActionError]
   )
 
   const createTerminalAndSend = useCallback(
     async (comments: readonly DiffComment[]) => {
+      // Reported, not thrown: the sheet's caller drops the promise, so a throw would show nothing.
       if (!client || connState !== 'connected') {
-        throw new Error('Waiting for desktop...')
+        closeSheet('send')
+        setActionError('Waiting for desktop...')
+        return
       }
-      const response = await reviewTerminalCreateRun.request(client, {
-        worktree: `id:${worktreeId}`,
-        activate: false,
-        select: true,
-        navigation: 'caller'
-      })
-      let created
-      created = interpretOrThrowRefusalMessage(
-        () => reviewTerminalCreateRun.interpret(response),
-        'Failed to create terminal'
-      )
-      await sendPromptToTerminal(created.terminal, comments)
+      if (agentLaunchInFlightRef.current) {
+        return
+      }
+      agentLaunchInFlightRef.current = true
+      // Closed up front so the wait (up to a minute for a terminal agent) shows its progress here.
+      closeSheet('send')
+      setActionError('Starting an agent...')
+      let result
+      try {
+        // The desktop asks which agent to use; the review screen has no picker, so this takes the
+        // desktop's own default resolution with no saved recipe.
+        result = await launchAgentWithPrompt({
+          client,
+          hostCapabilities,
+          worktreeId,
+          prompt: formatMobileDiffReviewPrompt(comments),
+          actionId: null,
+          launchSource: 'notes_send'
+        })
+      } finally {
+        agentLaunchInFlightRef.current = false
+      }
+      if (result.kind === 'not-started' || result.kind === 'unconfirmed') {
+        setActionError(result.message)
+        return
+      }
+      if (result.kind === 'prompt-not-sent') {
+        // Notes stay unsent so Copy Notes and a later send still carry them.
+        setActionError(
+          "The agent started, but the notes weren't sent. Use Copy Notes to paste them."
+        )
+        return
+      }
+      await markNotesSent(comments)
+      triggerSuccess()
+      // The warning is a note on a launch that went ahead, so it follows the success, not replaces it.
+      setActionError(result.warning ? `Review notes sent. ${result.warning}` : 'Review notes sent')
     },
-    [client, connState, sendPromptToTerminal, worktreeId]
+    [client, closeSheet, connState, hostCapabilities, markNotesSent, setActionError, worktreeId]
   )
 
   const openSendSheet = useCallback(async () => {
@@ -138,7 +174,7 @@ export function useMobileDiffReviewSendActions(input: SendActionsInput) {
       setActionError('Waiting for desktop...')
       return
     }
-    setSendSheet({ kind: 'loading' })
+    openSheet({ kind: 'send', load: { kind: 'loading' } })
     try {
       const response = await reviewTerminalListRead.request(client, {
         worktree: `id:${worktreeId}`
@@ -148,15 +184,15 @@ export function useMobileDiffReviewSendActions(input: SendActionsInput) {
         () => reviewTerminalListRead.interpret(response),
         'Unable to load agent sessions'
       )
-      setSendSheet({ kind: 'ready', terminals })
+      updateSendSheet({ kind: 'ready', terminals })
     } catch (err) {
-      setSendSheet({
+      updateSendSheet({
         kind: 'error',
         message: err instanceof Error ? err.message : 'Unable to load agent sessions',
         terminals: []
       })
     }
-  }, [client, connState, setActionError, setSendSheet, worktreeId])
+  }, [client, connState, openSheet, setActionError, updateSendSheet, worktreeId])
 
   return {
     clearSentNotes,
diff --git a/mobile/src/session/use-mobile-native-chat-controller.ts b/mobile/src/session/use-mobile-native-chat-controller.ts
index a3a49e53552a..c14c3e1251c0 100644
--- a/mobile/src/session/use-mobile-native-chat-controller.ts
+++ b/mobile/src/session/use-mobile-native-chat-controller.ts
@@ -2,6 +2,7 @@ import { useLayoutEffect, useRef, type MutableRefObject } from 'react'
 import type { RpcClient } from '../transport/rpc-client'
 import type { ConnectionState } from '../transport/types'
 import type { MobileNativeChatTab } from './mobile-native-chat-eligibility'
+import type { StructuredAgentSessionHostSupport } from './mobile-structured-agent-session-host-support'
 import { useMobileNativeChatAskDismiss } from './use-mobile-native-chat-ask-dismiss'
 import { useMobileNativeChatDrafts } from './use-mobile-native-chat-drafts'
 import { useMobileNativeChatFileSearch } from './use-mobile-native-chat-file-search'
@@ -36,7 +37,7 @@ export function useMobileNativeChatController(args: {
   /** Live socket state; the lease collapses on disconnect but one render later. */
   connState: ConnectionState
   /** Host capability fact from the shared runtime status probe. */
-  agentSessionPromptCancelSupported?: boolean | null
+  agentSessionHostSupport?: StructuredAgentSessionHostSupport | null
   onSendError: (message: string) => void
   /** Retires a held failure banner. Any accepted chat write clears it — a delivered
    *  answer or permission reply must not sit under a stale "not sent". */
@@ -53,7 +54,7 @@ export function useMobileNativeChatController(args: {
     nativeChatTranscriptIsLocalReadable,
     nativeChatInputLeaseReady,
     connState,
-    agentSessionPromptCancelSupported = null,
+    agentSessionHostSupport = null,
     onSendError,
     onSendResolved
   } = args
@@ -93,7 +94,7 @@ export function useMobileNativeChatController(args: {
       callerIdentity: deviceTokenRef.current ?? '',
       enabled: showNativeChat,
       connState,
-      promptCancelSupported: agentSessionPromptCancelSupported,
+      hostSupport: agentSessionHostSupport,
       onSendError
     })
   const {
@@ -287,6 +288,10 @@ export function useMobileNativeChatController(args: {
     nativeChatTurnIndicator: activeChatStructured ? structuredNativeChat.turnIndicator : null,
     nativeChatWorkingStartedAt: activeChatStructured ? structuredNativeChat.workingStartedAt : null,
     nativeChatSettledTurns: activeChatStructured ? structuredNativeChat.settledTurns : null,
+    nativeChatActiveTurnOpenedBy: activeChatStructured
+      ? structuredNativeChat.activeTurnOpenedBy
+      : null,
+    nativeChatTurnKeysByItemId: activeChatStructured ? structuredNativeChat.turnKeysByItemId : null,
     nativeChatCanStop: activeChatStructured
       ? structuredNativeChat.turnId !== null
       : nativeChatAgentWorking,
diff --git a/mobile/src/session/use-mobile-native-chat-session-lane.ts b/mobile/src/session/use-mobile-native-chat-session-lane.ts
index bfeb1b069453..147cf017ac0e 100644
--- a/mobile/src/session/use-mobile-native-chat-session-lane.ts
+++ b/mobile/src/session/use-mobile-native-chat-session-lane.ts
@@ -1,5 +1,6 @@
 import type { RpcClient } from '../transport/rpc-client'
 import type { ConnectionState } from '../transport/types'
+import type { StructuredAgentSessionHostSupport } from './mobile-structured-agent-session-host-support'
 import { useMobileNativeChatSession } from './use-mobile-native-chat-session'
 import { useMobileStructuredAgentSession } from './use-mobile-structured-agent-session'
 
@@ -15,7 +16,7 @@ export function useMobileNativeChatSessionLane({
   sessionId,
   sourceIdentity,
   callerIdentity,
-  promptCancelSupported,
+  hostSupport,
   enabled,
   connState,
   onSendError
@@ -30,7 +31,7 @@ export function useMobileNativeChatSessionLane({
   sessionId: string | null
   sourceIdentity: Parameters<typeof useMobileNativeChatSession>[0]['sourceIdentity']
   callerIdentity: string
-  promptCancelSupported?: boolean | null
+  hostSupport: StructuredAgentSessionHostSupport | null
   enabled: boolean
   connState: ConnectionState
   onSendError: (message: string) => void
@@ -50,7 +51,7 @@ export function useMobileNativeChatSessionLane({
     sessionId: structured ? sessionId : null,
     sourceIdentity,
     callerIdentity,
-    promptCancelSupported,
+    hostSupport,
     enabled,
     // Holds are connection-scoped; dropping this on transport loss lets the hook
     // reacquire the provider without clearing the cached transcript.
diff --git a/mobile/src/session/use-mobile-native-chat-turn-disclosure.test.tsx b/mobile/src/session/use-mobile-native-chat-turn-disclosure.test.tsx
index 33e99bfb6033..ed0b22dfc1fc 100644
--- a/mobile/src/session/use-mobile-native-chat-turn-disclosure.test.tsx
+++ b/mobile/src/session/use-mobile-native-chat-turn-disclosure.test.tsx
@@ -20,12 +20,18 @@ function Harness({
   enabled,
   isWorking = true,
   settledTurns,
+  workingStartedAt,
+  activeTurnOpenedBy,
+  turnKeysByItemId,
   scopeKey = 'host\0worktree\0tab-a'
 }: {
   messages: readonly NativeChatMessage[]
   enabled: boolean
   isWorking?: boolean
   settledTurns?: NativeChatSettledTurns
+  workingStartedAt?: number | null
+  activeTurnOpenedBy?: string | null
+  turnKeysByItemId?: ReadonlyMap<string, string> | null
   scopeKey?: string
 }): React.JSX.Element {
   const disclosure = useMobileNativeChatTurnDisclosure({
@@ -33,6 +39,9 @@ function Harness({
     enabled,
     isWorking,
     settledTurns,
+    workingStartedAt,
+    activeTurnOpenedBy,
+    turnKeysByItemId,
     scopeKey
   })
   return createElement('result', { disclosure })
@@ -144,6 +153,38 @@ describe('useMobileNativeChatTurnDisclosure', () => {
     }
   })
 
+  it('keeps the live bar on every render until it settles in place', () => {
+    vi.useFakeTimers()
+    try {
+      vi.setSystemTime(1_000)
+      const messages = [userMessage('u1')]
+      const seen: unknown[] = []
+      function Recorder({ isWorking }: { isWorking: boolean }): React.JSX.Element {
+        const disclosure = useMobileNativeChatTurnDisclosure({
+          messages,
+          enabled: true,
+          isWorking,
+          scopeKey: 'host\0worktree\0tab-a'
+        })
+        seen.push(disclosure.resolveRow(0, messages[0]).turnStatus)
+        return createElement('result', { disclosure })
+      }
+      act(() => {
+        renderer = create(createElement(Recorder, { isWorking: true }))
+      })
+      vi.setSystemTime(6_000)
+      seen.length = 0
+      // No host duration for this turn: the settle is stamped locally, one pass later.
+      act(() => {
+        renderer?.update(createElement(Recorder, { isWorking: false }))
+      })
+      expect(seen).not.toContain(null)
+      expect(seen.at(-1)).toEqual({ startedAt: 1_000, thinking: false, workedSeconds: 5 })
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
   it('suppresses local duration when the host explicitly cannot verify the end', () => {
     vi.useFakeTimers()
     try {
@@ -170,6 +211,200 @@ describe('useMobileNativeChatTurnDisclosure', () => {
     }
   })
 
+  it('keeps the live bar under the prompt that opened the running turn, not a mid-turn send', () => {
+    vi.useFakeTimers()
+    try {
+      vi.setSystemTime(10_000)
+      const tool: NativeChatMessage = {
+        id: 'tool-a',
+        role: 'assistant',
+        blocks: [
+          { type: 'tool-call', name: 'Bash', input: { command: 'sleep 15' }, state: 'running' }
+        ],
+        timestamp: null,
+        source: 'transcript'
+      }
+      const messages = [userMessage('A'), tool, userMessage('B')]
+      const rows = () => {
+        const disclosure = renderer!.root.findByType('result').props.disclosure
+        return messages.map((message, index) => disclosure.resolveRow(index, message))
+      }
+      // B was sent while A's turn runs; the host still names A as the running turn's opener.
+      act(() => {
+        renderer = create(
+          createElement(Harness, {
+            messages,
+            enabled: true,
+            workingStartedAt: 5_000,
+            activeTurnOpenedBy: 'A'
+          })
+        )
+      })
+      let [rowA, rowTool, rowB] = rows()
+      expect(rowA.turnStatus).toEqual({ startedAt: 5_000, thinking: false, workedSeconds: null })
+      expect(rowB.turnStatus).toBeNull()
+      // Liveness follows the owning turn: A's tool row stays live while B waits.
+      expect(rowTool.activeTurnIsWorking).toBe(true)
+      expect(rowB.activeTurnIsWorking).toBe(false)
+
+      // B's own turn opens: A takes the host's settled duration, B counts from A's end.
+      act(() => {
+        renderer?.update(
+          createElement(Harness, {
+            messages,
+            enabled: true,
+            workingStartedAt: 22_000,
+            settledTurns: new Map([['A', { startedAt: 5_000, workedSeconds: 17 }]]),
+            activeTurnOpenedBy: 'B'
+          })
+        )
+      })
+      ;[rowA, , rowB] = rows()
+      expect(rowA.turnStatus).toEqual({ startedAt: 5_000, thinking: false, workedSeconds: 17 })
+      expect(rowB.turnStatus).toEqual({ startedAt: 22_000, thinking: false, workedSeconds: null })
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it("keeps a running turn's rows live across a mid-turn send the host folded in", () => {
+    vi.useFakeTimers()
+    try {
+      vi.setSystemTime(10_000)
+      const tool = (id: string): NativeChatMessage => ({
+        id,
+        role: 'assistant',
+        blocks: [
+          { type: 'tool-call', name: 'Bash', input: { command: 'sleep 15' }, state: 'running' }
+        ],
+        timestamp: null,
+        source: 'transcript'
+      })
+      // The #23621 shape: B lands mid-turn and the tool rows after it are still A's.
+      const messages = [userMessage('A'), tool('t1'), userMessage('B'), tool('t2')]
+      const owned = new Map([
+        ['A', 'A'],
+        ['t1', 'A'],
+        ['B', 'A'],
+        ['t2', 'A']
+      ])
+      act(() => {
+        renderer = create(
+          createElement(Harness, {
+            messages,
+            enabled: true,
+            workingStartedAt: 5_000,
+            activeTurnOpenedBy: 'A',
+            turnKeysByItemId: owned
+          })
+        )
+      })
+      const disclosure = renderer!.root.findByType('result').props.disclosure
+      const [rowA, rowT1, rowB, rowT2] = messages.map((message, index) =>
+        disclosure.resolveRow(index, message)
+      )
+      expect(rowA.turnStatus).toEqual({ startedAt: 5_000, thinking: false, workedSeconds: null })
+      // The steered bubble shares A's turn but never carries a bar of its own.
+      expect(rowB.turnStatus).toBeNull()
+      expect(rowT1.activeTurnIsWorking).toBe(true)
+      expect(rowT2.activeTurnIsWorking).toBe(true)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it("anchors a provider-opened turn's bar above its first row", () => {
+    vi.useFakeTimers()
+    try {
+      vi.setSystemTime(10_000)
+      const woke: NativeChatMessage = {
+        id: 'woke',
+        role: 'assistant',
+        blocks: [{ type: 'text', text: 'Woke up.' }],
+        timestamp: null,
+        source: 'transcript'
+      }
+      const messages = [userMessage('u1'), woke]
+      act(() => {
+        renderer = create(
+          createElement(Harness, {
+            messages,
+            enabled: true,
+            isWorking: false,
+            settledTurns: new Map([['wake', { startedAt: 5_000, workedSeconds: 9 }]]),
+            turnKeysByItemId: new Map([
+              ['u1', 'u1'],
+              ['woke', 'wake']
+            ])
+          })
+        )
+      })
+      const disclosure = renderer!.root.findByType('result').props.disclosure
+      const [rowU1, rowWoke] = messages.map((message, index) =>
+        disclosure.resolveRow(index, message)
+      )
+      expect(rowU1.turnStatus).toBeNull()
+      expect(rowWoke.turnStatus).toEqual({ startedAt: 5_000, thinking: false, workedSeconds: 9 })
+      expect(rowWoke.turnStatusAbove).toBe(true)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it("never hands a provider-opened turn's clock to a message sent during it", () => {
+    vi.useFakeTimers()
+    try {
+      vi.setSystemTime(10_000)
+      const row = (id: string): NativeChatMessage => ({
+        id,
+        role: 'assistant',
+        blocks: [{ type: 'text', text: id }],
+        timestamp: null,
+        source: 'transcript'
+      })
+      // A wake turn runs; B is sent during it and folded in, so B opened nothing.
+      const messages = [row('w1'), userMessage('B'), row('w2')]
+      const owned = new Map([
+        ['w1', 'wake'],
+        ['B', 'wake'],
+        ['w2', 'wake']
+      ])
+      act(() => {
+        renderer = create(
+          createElement(Harness, {
+            messages,
+            enabled: true,
+            workingStartedAt: 5_000,
+            activeTurnOpenedBy: 'wake',
+            turnKeysByItemId: owned,
+            settledTurns: new Map([['wake', null]])
+          })
+        )
+      })
+      // The wake turn settles: the host no longer names a running turn.
+      vi.setSystemTime(20_000)
+      act(() => {
+        renderer!.update(
+          createElement(Harness, {
+            messages,
+            enabled: true,
+            isWorking: false,
+            workingStartedAt: null,
+            activeTurnOpenedBy: null,
+            turnKeysByItemId: owned,
+            settledTurns: new Map([['wake', { startedAt: 5_000, workedSeconds: 15 }]])
+          })
+        )
+      })
+      const disclosure = renderer!.root.findByType('result').props.disclosure
+      const [rowW1, rowB] = messages.map((message, index) => disclosure.resolveRow(index, message))
+      expect(rowW1.turnStatus).toEqual({ startedAt: 5_000, thinking: false, workedSeconds: 15 })
+      expect(rowB.turnStatus).toBeNull()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
   it('keeps at most the latest 128 turns expanded', () => {
     vi.useFakeTimers()
     try {
diff --git a/mobile/src/session/use-mobile-native-chat-turn-disclosure.ts b/mobile/src/session/use-mobile-native-chat-turn-disclosure.ts
index a67a6a886638..cc61ba63d89e 100644
--- a/mobile/src/session/use-mobile-native-chat-turn-disclosure.ts
+++ b/mobile/src/session/use-mobile-native-chat-turn-disclosure.ts
@@ -1,18 +1,25 @@
 import { useCallback, useMemo, useState } from 'react'
 import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
+import { NATIVE_CHAT_UNANCHORED_TURN_KEY } from '../../../src/shared/native-chat-turn-status'
 import type { NativeChatSettledTurns } from '../../../src/shared/native-chat-turn-status'
 import {
-  MOBILE_UNANCHORED_TURN_KEY,
+  nativeChatRowTurnKeys,
+  nativeChatSelfAnchoredTurnRows
+} from '../../../src/shared/native-chat-turn-grouping'
+import {
   useMobileNativeChatTurnStatus,
   type NativeChatTurnStatus
 } from './use-mobile-native-chat-turn-status'
 
 const EMPTY_TURN_IDS: ReadonlySet<string> = new Set()
 const EMPTY_TURN_KEYS: readonly undefined[] = []
+const EMPTY_TURN_ANCHORS: ReadonlyMap<string, number> = new Map()
 const MAX_EXPANDED_TURNS = 128
 
 export type MobileNativeChatTurnRow = {
   turnStatus: NativeChatTurnStatus | null
+  /** The bar renders above the row: its turn has no user bubble of its own. */
+  turnStatusAbove?: boolean
   turnExpanded: boolean
   /** Set only on a settled turn — the one row that has activity to disclose. */
   turnKey?: string
@@ -28,6 +35,8 @@ export function useMobileNativeChatTurnDisclosure({
   isWorking,
   workingStartedAt,
   settledTurns,
+  activeTurnOpenedBy = null,
+  turnKeysByItemId = null,
   thinking = false,
   activityText = null,
   scopeKey
@@ -38,6 +47,11 @@ export function useMobileNativeChatTurnDisclosure({
   workingStartedAt?: number | null
   /** Host-recorded durations; they outrank whatever this client observed. */
   settledTurns?: NativeChatSettledTurns | null
+  /** The key the host says anchors the running turn's bar; absent, the latest user message. */
+  activeTurnOpenedBy?: string | null
+  /** Host-attributed turn ownership per journal item id; unnamed rows keep
+   *  positional preceding-user grouping. */
+  turnKeysByItemId?: ReadonlyMap<string, string> | null
   /** Whether the turn is reasoning right now, derived from its journal content. */
   thinking?: boolean
   /** What the provider says the live turn is doing; outranks the other labels. */
@@ -57,6 +71,8 @@ export function useMobileNativeChatTurnDisclosure({
     isWorking,
     workingStartedAt,
     settledTurns,
+    activeTurnOpenedBy,
+    turnKeysByItemId,
     thinking,
     scopeKey
   })
@@ -84,49 +100,66 @@ export function useMobileNativeChatTurnDisclosure({
     },
     [scopeKey]
   )
-  // Resolve each row's turn boundary once — a findLast per row is quadratic on a
+  // Resolve each row's owning turn once — a findLast per row is quadratic on a
   // long transcript.
-  const turnKeys = useMemo(() => {
-    if (!enabled) {
-      return EMPTY_TURN_KEYS
-    }
-    let turnKey: string | undefined
-    return messages.map((message) => {
-      if (message.role === 'user') {
-        turnKey = message.id
-      }
-      return turnKey
-    })
-  }, [enabled, messages])
+  const turnKeys = useMemo(
+    () => (enabled ? nativeChatRowTurnKeys(messages, turnKeysByItemId) : EMPTY_TURN_KEYS),
+    [enabled, messages, turnKeysByItemId]
+  )
+  // A turn with no user bubble (provider-opened) anchors its bar at its first row.
+  const selfAnchors = useMemo(
+    () => (enabled ? nativeChatSelfAnchoredTurnRows(messages, turnKeys) : EMPTY_TURN_ANCHORS),
+    [enabled, messages, turnKeys]
+  )
 
   const { active, activeTurnKey, completedByTurn } = turnStatuses
   const activeActivityText = enabled && isWorking ? (activityText ?? null) : null
   const resolveRow = useCallback(
     (index: number, message: NativeChatMessage): MobileNativeChatTurnRow => {
       const turnKey = turnKeys[index]
-      const turnStatus =
-        !enabled || message.role !== 'user'
-          ? null
-          : turnKey
+      const anchorsTurnHere = turnKey !== undefined && selfAnchors.get(turnKey) === index
+      // The live turn's bar carries its running clock; it settles in place. Only
+      // the bubble that opened a turn carries its bar: a message the provider
+      // folded into a running turn shares the turn's key but not its bar.
+      const turnStatus = !enabled
+        ? null
+        : message.role === 'user' && message.id === activeTurnKey
+          ? active
+          : message.role === 'user' && turnKey === message.id
             ? (completedByTurn[turnKey] ?? null)
-            : null
+            : anchorsTurnHere
+              ? turnKey === activeTurnKey
+                ? (active ?? completedByTurn[turnKey] ?? null)
+                : (completedByTurn[turnKey] ?? null)
+              : null
       return {
         turnStatus,
+        ...(anchorsTurnHere && turnStatus !== null ? { turnStatusAbove: true } : {}),
         turnExpanded: turnKey ? expandedTurnIds.has(turnKey) : false,
         // Why: the key travels and the row calls one stable handler with it. A
         // closure per row would be a new identity every render of a streaming
         // transcript, defeating the row's memo; caching one per turn would mean
         // writing a ref during render, which react-freeze can discard.
         turnKey: turnKey && turnStatus?.workedSeconds != null ? turnKey : undefined,
-        // With no user boundary at all, the session's working state stays authoritative.
+        // Liveness is the owning turn's, not the newest prompt's: a running turn's
+        // rows stay live while a newer message waits behind it.
         activeTurnIsWorking:
           enabled &&
           isWorking &&
           (turnKey === activeTurnKey ||
-            (turnKey === undefined && activeTurnKey === MOBILE_UNANCHORED_TURN_KEY))
+            (turnKey === undefined && activeTurnKey === NATIVE_CHAT_UNANCHORED_TURN_KEY))
       }
     },
-    [turnKeys, enabled, activeTurnKey, completedByTurn, expandedTurnIds, isWorking]
+    [
+      turnKeys,
+      selfAnchors,
+      enabled,
+      activeTurnKey,
+      active,
+      completedByTurn,
+      expandedTurnIds,
+      isWorking
+    ]
   )
 
   return {
diff --git a/mobile/src/session/use-mobile-native-chat-turn-status.ts b/mobile/src/session/use-mobile-native-chat-turn-status.ts
index f7cbb2dd8874..62f6ada8d5e0 100644
--- a/mobile/src/session/use-mobile-native-chat-turn-status.ts
+++ b/mobile/src/session/use-mobile-native-chat-turn-status.ts
@@ -1,7 +1,9 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
 import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
 import {
+  NATIVE_CHAT_UNANCHORED_TURN_KEY,
   reduceNativeChatTurnTiming,
+  selectNativeChatActiveTurnKey,
   selectNativeChatTurnStatuses,
   type NativeChatSettledTurns,
   type NativeChatTurnStatus,
@@ -10,7 +12,6 @@ import {
 
 export type { NativeChatTurnStatus }
 
-export const MOBILE_UNANCHORED_TURN_KEY = '__unanchored__'
 const EMPTY_TURN_TIMING_BY_TURN: NativeChatTurnTimingByTurn = Object.freeze({})
 
 type ScopedTurnTiming = {
@@ -26,6 +27,8 @@ export function useMobileNativeChatTurnStatus({
   isWorking,
   workingStartedAt,
   settledTurns,
+  activeTurnOpenedBy = null,
+  turnKeysByItemId = null,
   thinking = false,
   scopeKey
 }: {
@@ -35,6 +38,11 @@ export function useMobileNativeChatTurnStatus({
   workingStartedAt?: number | null
   /** Host-recorded durations; they outrank whatever this client observed. */
   settledTurns?: NativeChatSettledTurns | null
+  /** The user message the host says opened the running turn; absent, the latest one. */
+  activeTurnOpenedBy?: string | null
+  /** Host-attributed turn ownership; a turn keyed to its own record is still in
+   *  the transcript, so its clock is not an echo to hand to the next prompt. */
+  turnKeysByItemId?: ReadonlyMap<string, string> | null
   /** Whether the turn is reasoning right now, derived from its journal content. */
   thinking?: boolean
   /** Host/worktree/tab identity. Timings never carry across chat surfaces. */
@@ -44,11 +52,9 @@ export function useMobileNativeChatTurnStatus({
   completedByTurn: Readonly<Record<string, NativeChatTurnStatus>>
   activeTurnKey: string
 } {
-  const latestUserIndex = enabled
-    ? messages.findLastIndex((message) => message.role === 'user')
-    : -1
-  const latestUserId = latestUserIndex !== -1 ? (messages[latestUserIndex]?.id ?? null) : null
-  const activeTurnKey = latestUserId ?? MOBILE_UNANCHORED_TURN_KEY
+  const activeTurnKey = enabled
+    ? selectNativeChatActiveTurnKey(messages, activeTurnOpenedBy)
+    : NATIVE_CHAT_UNANCHORED_TURN_KEY
   const [scopedTiming, setScopedTiming] = useState<ScopedTurnTiming>(() => ({
     scopeKey,
     timingByTurn: {}
@@ -70,6 +76,9 @@ export function useMobileNativeChatTurnStatus({
     const validTurnKeys = new Set(
       messages.filter((message) => message.role === 'user').map((message) => message.id)
     )
+    for (const turnKey of turnKeysByItemId?.values() ?? []) {
+      validTurnKeys.add(turnKey)
+    }
     const previousActiveTurnKey =
       previousActiveTurn.current?.scopeKey === scopeKey
         ? previousActiveTurn.current.turnKey
@@ -90,7 +99,7 @@ export function useMobileNativeChatTurnStatus({
         ? current
         : { scopeKey, timingByTurn: nextTiming }
     })
-  }, [activeTurnKey, enabled, isWorking, messages, scopeKey, workingStartedAt])
+  }, [activeTurnKey, enabled, isWorking, messages, scopeKey, turnKeysByItemId, workingStartedAt])
 
   // Why: the selection rebuilds its status objects on every call, and a streaming
   // turn re-renders ~20x/s. Without this, every settled turn's row gets fresh
diff --git a/mobile/src/session/use-mobile-pr-ai-triage.test.ts b/mobile/src/session/use-mobile-pr-ai-triage.test.ts
new file mode 100644
index 000000000000..d3e284fe882f
--- /dev/null
+++ b/mobile/src/session/use-mobile-pr-ai-triage.test.ts
@@ -0,0 +1,120 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { RpcClient } from '../transport/rpc-client'
+import type { ConnectionState, RpcResponse } from '../transport/types'
+
+vi.mock('../platform/haptics', () => ({ triggerError: vi.fn(), triggerSuccess: vi.fn() }))
+
+import { useMobilePrAiTriage, type MobilePrAiTriage } from './use-mobile-pr-ai-triage'
+
+const LAUNCH_CAPABILITIES = [
+  'agent.launch.v2',
+  'agent.launch.replay.v1',
+  'agent.launch.replay-required.v1'
+]
+
+function rpcReply(result: unknown): RpcResponse {
+  return { id: 'rpc', ok: true, result, _meta: { runtimeId: 'r' } }
+}
+
+const LAUNCHED_WITH_PROMPT = rpcReply({
+  outcome: { kind: 'terminal', handle: 'term-1' },
+  worktreeId: 'wt-1',
+  receipt: { mode: 'terminal', preferred: 'terminal', reason: 'user_default', detail: 'd' },
+  prompt: { delivery: 'submit', outcome: 'handed-to-terminal' }
+})
+
+const LAUNCHED_WITHOUT_PROMPT = rpcReply({
+  outcome: { kind: 'terminal', handle: 'term-1' },
+  worktreeId: 'wt-1',
+  receipt: { mode: 'terminal', preferred: 'terminal', reason: 'user_default', detail: 'd' },
+  prompt: { delivery: 'submit', outcome: 'not-delivered' }
+})
+
+function hostClient(launchReply: RpcResponse = LAUNCHED_WITHOUT_PROMPT): RpcClient {
+  const sendRequest = vi.fn(async (method: string): Promise<RpcResponse> => {
+    if (method === 'repo.list') {
+      return rpcReply({ repos: [{ id: 'wt-1' }] })
+    }
+    if (method === 'settings.get') {
+      return rpcReply({ settings: { defaultTuiAgent: 'codex' } })
+    }
+    if (method === 'preflight.detectAgents') {
+      return rpcReply(['codex'])
+    }
+    return launchReply
+  })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the hook reaches the client only through sendRequest.
+  return { sendRequest } as unknown as RpcClient
+}
+
+describe('useMobilePrAiTriage', () => {
+  let renderer: ReactTestRenderer | null = null
+  let triage: MobilePrAiTriage | null = null
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+    triage = null
+  })
+
+  function mount(client: RpcClient | null, connState: ConnectionState = 'connected') {
+    function Harness(): null {
+      triage = useMobilePrAiTriage({
+        client,
+        connState,
+        worktreeId: 'wt-1',
+        workspaceLabel: 'feature-login',
+        hostCapabilities: LAUNCH_CAPABILITIES,
+        hostStatusPending: false,
+        hostStatusReadable: true
+      })
+      return null
+    }
+    act(() => {
+      renderer = create(createElement(Harness))
+    })
+  }
+
+  it('shows an undelivered prompt only under the button that launched it', async () => {
+    mount(hostClient())
+    await act(async () => {
+      await triage?.launch('fix-checks', () => 'fix the failing checks')
+    })
+    expect(triage?.noticeFor('fix-checks')).toMatchObject({
+      error: "The agent started, but the prompt wasn't sent."
+    })
+    expect(triage?.noticeFor('fix-checks').undeliveredPrompt).toContain('fix the failing checks')
+    expect(triage?.noticeFor('fix-checks').success).toBeNull()
+    expect(triage?.noticeFor('resolve-conflicts')).toEqual({
+      success: null,
+      error: null,
+      warning: null,
+      undeliveredPrompt: null
+    })
+  })
+
+  it('confirms a launch that delivered its prompt under the tapped button, naming the workspace', async () => {
+    mount(hostClient(LAUNCHED_WITH_PROMPT))
+    await act(async () => {
+      await triage?.launch('resolve-conflicts', () => 'resolve the conflicts')
+    })
+    expect(triage?.noticeFor('resolve-conflicts')).toEqual({
+      success: 'Agent started in feature-login',
+      error: null,
+      warning: null,
+      undeliveredPrompt: null
+    })
+    expect(triage?.noticeFor('fix-checks').success).toBeNull()
+  })
+
+  it('shows a refusal before launch only under the tapped button', async () => {
+    mount(null, 'disconnected')
+    await act(async () => {
+      await triage?.launch('resolve-conflicts', () => 'resolve')
+    })
+    expect(triage?.noticeFor('resolve-conflicts').error).toBe('Waiting for desktop…')
+    expect(triage?.noticeFor('fix-checks').error).toBeNull()
+  })
+})
diff --git a/mobile/src/session/use-mobile-pr-ai-triage.ts b/mobile/src/session/use-mobile-pr-ai-triage.ts
index d3186f36ab11..70215d9bbf02 100644
--- a/mobile/src/session/use-mobile-pr-ai-triage.ts
+++ b/mobile/src/session/use-mobile-pr-ai-triage.ts
@@ -2,61 +2,131 @@ import { useCallback, useRef, useState } from 'react'
 import type { ConnectionState } from '../transport/types'
 import type { RpcClient } from '../transport/rpc-client'
 import { triggerError, triggerSuccess } from '../platform/haptics'
-import { createTerminalAndSendPrompt } from './pr-ai-triage-launch'
+import { launchAgentWithPrompt, promptedLaunchNotice } from './pr-ai-triage-launch'
+import {
+  resolveMobileAgentLaunchAvailability,
+  type MobileAgentLaunchAvailability
+} from './mobile-agent-launch-availability'
 
 // Launches an agent for the PR triage actions ("Fix checks with AI" / "Resolve
-// conflicts with AI") via createTerminalAndSendPrompt; see pr-ai-triage-launch.ts.
+// conflicts with AI") via launchAgentWithPrompt; see pr-ai-triage-launch.ts.
 
 export type PrAiTriageKey = 'fix-checks' | 'resolve-conflicts'
 
+// The desktop's saved-recipe ids and telemetry sources for the same two buttons.
+const TRIAGE_LAUNCH = {
+  'fix-checks': { actionId: 'fixChecks', launchSource: 'task_page' },
+  'resolve-conflicts': { actionId: 'resolveConflicts', launchSource: 'conflict_resolution' }
+} as const
+
+/** What the last launch from one button left to show under that button. */
+export type PrAiTriageLaunchNotice = {
+  success: string | null
+  error: string | null
+  warning: string | null
+  /** The agent started without its prompt; kept so the user can paste it in themselves. */
+  undeliveredPrompt: string | null
+}
+
+const NO_LAUNCH_NOTICE: PrAiTriageLaunchNotice = {
+  success: null,
+  error: null,
+  warning: null,
+  undeliveredPrompt: null
+}
+
 type Input = {
   client: RpcClient | null
   connState: ConnectionState
   worktreeId: string
+  /** Named in the confirmation; the screen's workspace label, else its branch. */
+  workspaceLabel: string | null
+  hostCapabilities: readonly string[]
+  hostStatusPending: boolean
+  hostStatusReadable: boolean
 }
 
 export function useMobilePrAiTriage(input: Input) {
-  const { client, connState, worktreeId } = input
+  const {
+    client,
+    connState,
+    worktreeId,
+    workspaceLabel,
+    hostCapabilities,
+    hostStatusPending,
+    hostStatusReadable
+  } = input
   const [busyKey, setBusyKey] = useState<PrAiTriageKey | null>(null)
-  const [error, setError] = useState<string | null>(null)
+  // Keyed by button, so one button's launch never shows (or offers to copy) under the other.
+  const [notices, setNotices] = useState<Partial<Record<PrAiTriageKey, PrAiTriageLaunchNotice>>>({})
   // Synchronous lock: setBusyKey commits async, so a fast double-tap could pass the
   // busyKey check twice before either render. The ref flips immediately and dedupes.
   const inFlightRef = useRef(false)
+  const availability: MobileAgentLaunchAvailability = resolveMobileAgentLaunchAvailability({
+    hostCapabilities,
+    statusPending: hostStatusPending,
+    statusReadable: hostStatusReadable
+  })
+
+  const setNotice = useCallback((key: PrAiTriageKey, notice: PrAiTriageLaunchNotice) => {
+    setNotices((current) => ({ ...current, [key]: notice }))
+  }, [])
 
   const launch = useCallback(
     async (key: PrAiTriageKey, buildPrompt: () => string): Promise<boolean> => {
       // Guard re-entry: one triage launch at a time keeps us from opening a pile
-      // of terminals on a fast double-tap.
+      // of agents on a fast double-tap.
       if (inFlightRef.current || busyKey !== null) {
         return false
       }
       if (!client || connState !== 'connected') {
-        setError('Waiting for desktop…')
+        setNotice(key, { ...NO_LAUNCH_NOTICE, error: 'Waiting for desktop…' })
         triggerError()
         return false
       }
       inFlightRef.current = true
       setBusyKey(key)
-      setError(null)
+      setNotice(key, NO_LAUNCH_NOTICE)
       try {
-        await createTerminalAndSendPrompt(client, worktreeId, buildPrompt())
-        triggerSuccess()
-        return true
+        const prompt = buildPrompt()
+        const result = await launchAgentWithPrompt({
+          client,
+          hostCapabilities,
+          worktreeId,
+          prompt,
+          ...TRIAGE_LAUNCH[key]
+        })
+        const notice = promptedLaunchNotice(result, workspaceLabel)
+        if (notice.succeeded) {
+          triggerSuccess()
+        } else {
+          triggerError()
+        }
+        setNotice(key, {
+          success: notice.success,
+          error: notice.error,
+          warning: notice.warning,
+          undeliveredPrompt: notice.undeliveredPrompt
+        })
+        return notice.succeeded
       } catch (err) {
         triggerError()
-        setError(err instanceof Error ? err.message : 'Failed to launch agent')
+        setNotice(key, {
+          ...NO_LAUNCH_NOTICE,
+          error: err instanceof Error ? err.message : 'Failed to launch agent'
+        })
         return false
       } finally {
         inFlightRef.current = false
         setBusyKey(null)
       }
     },
-    [busyKey, client, connState, worktreeId]
+    [busyKey, client, connState, hostCapabilities, setNotice, workspaceLabel, worktreeId]
   )
 
   return {
-    error,
-    clearError: useCallback(() => setError(null), []),
+    availability,
+    noticeFor: (key: PrAiTriageKey): PrAiTriageLaunchNotice => notices[key] ?? NO_LAUNCH_NOTICE,
     isBusy: useCallback((key: PrAiTriageKey) => busyKey === key, [busyKey]),
     launch
   }
diff --git a/mobile/src/session/use-mobile-session-accessory-selection.ts b/mobile/src/session/use-mobile-session-accessory-selection.ts
index 7e3cfcfa76cd..a9795d82b1fc 100644
--- a/mobile/src/session/use-mobile-session-accessory-selection.ts
+++ b/mobile/src/session/use-mobile-session-accessory-selection.ts
@@ -8,9 +8,10 @@ import {
   triggerError,
   triggerEdgeBump
 } from '../platform/haptics'
-import type {
-  TerminalKeyboardAvoidanceMetrics,
-  TerminalModes
+import {
+  sameTerminalKeyboardAvoidanceMetrics,
+  type TerminalKeyboardAvoidanceMetrics,
+  type TerminalModes
 } from '../terminal/terminal-webview-contract'
 import type { createTerminalLiveAccessoryInput } from '../terminal/terminal-live-accessory-input'
 import { clearTerminalLiveInputFocusTimer } from '../terminal/terminal-live-input'
@@ -165,13 +166,7 @@ export function useMobileSessionAccessorySelection(scope: MobileSessionTerminalI
     (handle: string, metrics: TerminalKeyboardAvoidanceMetrics) => {
       setTerminalKeyboardMetrics((prev) => {
         const current = prev.get(handle)
-        if (
-          current &&
-          current.cursorY === metrics.cursorY &&
-          current.contentBottomRow === metrics.contentBottomRow &&
-          current.rows === metrics.rows &&
-          current.altScreen === metrics.altScreen
-        ) {
+        if (current && sameTerminalKeyboardAvoidanceMetrics(current, metrics)) {
           return prev
         }
         return new Map(prev).set(handle, metrics)
diff --git a/mobile/src/session/use-mobile-session-document-readers.test.ts b/mobile/src/session/use-mobile-session-document-readers.test.ts
new file mode 100644
index 000000000000..70de6de02a3d
--- /dev/null
+++ b/mobile/src/session/use-mobile-session-document-readers.test.ts
@@ -0,0 +1,95 @@
+import { describe, expect, it, vi } from 'vitest'
+import { hookMount, performHookAction } from '../test-support/rpc-recording/hook-mount'
+import { mountFixture } from '../test-support/rpc-recording/recorder-fixture-shape'
+import type { RpcResponse } from '../transport/types'
+import type { MarkdownDocState } from './mobile-session-route-types'
+import { useMobileSessionDocumentReaders } from './use-mobile-session-document-readers'
+
+const META = { runtimeId: 'runtime-1' }
+
+async function readMarkdown(reply: RpcResponse): Promise<MarkdownDocState | undefined> {
+  let docs = new Map<string, MarkdownDocState>()
+  let readers: ReturnType<typeof useMobileSessionDocumentReaders> | undefined
+  const hook = hookMount(() => {
+    readers = useMobileSessionDocumentReaders(
+      mountFixture<Parameters<typeof useMobileSessionDocumentReaders>[0]>({
+        worktreeId: 'wt-1',
+        client: { sendRequest: vi.fn(async (): Promise<RpcResponse> => reply) },
+        setMarkdownDocs: (update) => {
+          docs = typeof update === 'function' ? update(docs) : update
+        },
+        setFileDocs: () => {}
+      })
+    )
+  })
+  hook.mount()
+  await performHookAction(() =>
+    readers?.readMarkdownTab(
+      mountFixture<Parameters<typeof readers.readMarkdownTab>[0]>({
+        type: 'markdown',
+        id: 'tab-md',
+        relativePath: 'README.md',
+        isDirty: false
+      })
+    )
+  )
+  hook.unmount()
+  return docs.get('tab-md')
+}
+
+function readTabResult(extra: Record<string, unknown> = {}): RpcResponse {
+  return {
+    id: 'frame-1',
+    ok: true,
+    result: {
+      tabId: 'tab-md',
+      content: '# head',
+      version: 'content:6:0',
+      isDirty: false,
+      editable: false,
+      readOnlyReason: 'file_too_large',
+      ...extra
+    },
+    _meta: META
+  }
+}
+
+describe('useMobileSessionDocumentReaders markdown reads', () => {
+  it('shows an older desktop refusing an oversize file as too large', async () => {
+    const doc = await readMarkdown({
+      id: 'frame-1',
+      ok: false,
+      error: { code: 'runtime_error', message: 'file_too_large' },
+      _meta: META
+    })
+    expect(doc).toEqual({ status: 'error', message: 'File too large for mobile preview' })
+  })
+
+  it('keeps the generic message for an unknown refusal', async () => {
+    const doc = await readMarkdown({
+      id: 'frame-1',
+      ok: false,
+      error: { code: 'tab_not_found', message: 'No such tab' },
+      _meta: META
+    })
+    expect(doc).toEqual({ status: 'error', message: "Couldn't load markdown" })
+  })
+
+  it('carries a truncated prefix and the full size into the document', async () => {
+    const doc = await readMarkdown(readTabResult({ truncated: true, byteLength: 3_000_000 }))
+    expect(doc).toMatchObject({
+      status: 'ready',
+      content: '# head',
+      editable: false,
+      truncated: true,
+      byteLength: 3_000_000
+    })
+  })
+
+  it('adds no truncation fields for a whole document', async () => {
+    const doc = await readMarkdown(readTabResult())
+    expect(doc).toMatchObject({ status: 'ready', content: '# head' })
+    expect(doc).not.toHaveProperty('truncated')
+    expect(doc).not.toHaveProperty('byteLength')
+  })
+})
diff --git a/mobile/src/session/use-mobile-session-document-readers.ts b/mobile/src/session/use-mobile-session-document-readers.ts
index 857d19815700..bc2e3d69e8e0 100644
--- a/mobile/src/session/use-mobile-session-document-readers.ts
+++ b/mobile/src/session/use-mobile-session-document-readers.ts
@@ -34,7 +34,10 @@ export function useMobileSessionDocumentReaders(scope: MobileSessionTabApplicati
               isDirty: false,
               editable: result.editable === true,
               stale: result.isDirty,
-              readOnlyReason: result.readOnlyReason
+              readOnlyReason: result.readOnlyReason,
+              ...(result.truncated === true
+                ? { truncated: true, byteLength: result.byteLength }
+                : {})
             })
           )
           return
@@ -59,15 +62,16 @@ export function useMobileSessionDocumentReaders(scope: MobileSessionTabApplicati
             buildMarkdownDiskFallbackDoc({
               content: fileResult.content,
               truncated: fileResult.truncated,
+              byteLength: fileResult.byteLength,
               tabIsDirty: tab.isDirty
             })
           )
         )
-      } catch {
+      } catch (err) {
         setMarkdownDocs((prev) =>
           new Map(prev).set(tab.id, {
             status: 'error',
-            message: "Couldn't load markdown"
+            message: documentReadErrorMessage(err, "Couldn't load markdown")
           })
         )
       }
@@ -89,15 +93,12 @@ export function useMobileSessionDocumentReaders(scope: MobileSessionTabApplicati
         })
         setFileDocs((prev) => new Map(prev).set(tab.id, doc))
       } catch (err) {
-        const message = err instanceof Error ? err.message : ''
-        const previewMessage =
-          message === 'binary_file'
-            ? 'Binary preview unavailable'
-            : message === 'file_too_large'
-              ? 'File too large for mobile preview'
-              : tab.diffSource === 'staged' || tab.diffSource === 'unstaged'
-                ? "Couldn't load diff preview"
-                : "Couldn't load file preview"
+        const previewMessage = documentReadErrorMessage(
+          err,
+          tab.diffSource === 'staged' || tab.diffSource === 'unstaged'
+            ? "Couldn't load diff preview"
+            : "Couldn't load file preview"
+        )
         setFileDocs((prev) =>
           new Map(prev).set(tab.id, {
             status: 'error',
@@ -114,5 +115,17 @@ export function useMobileSessionDocumentReaders(scope: MobileSessionTabApplicati
   }
 }
 
+// Why: older desktops refuse oversize markdown as a bare runtime_error whose message is the code.
+function documentReadErrorMessage(err: unknown, fallback: string): string {
+  const message = err instanceof Error ? err.message : ''
+  if (message === 'binary_file') {
+    return 'Binary preview unavailable'
+  }
+  if (message === 'file_too_large') {
+    return 'File too large for mobile preview'
+  }
+  return fallback
+}
+
 export type MobileSessionDocumentReadersModel = MobileSessionTabApplicationModel &
   ReturnType<typeof useMobileSessionDocumentReaders>
diff --git a/mobile/src/session/use-mobile-session-feedback-capabilities.ts b/mobile/src/session/use-mobile-session-feedback-capabilities.ts
index f02311893096..ea8d6438bf49 100644
--- a/mobile/src/session/use-mobile-session-feedback-capabilities.ts
+++ b/mobile/src/session/use-mobile-session-feedback-capabilities.ts
@@ -2,6 +2,7 @@ import { useState, useRef, useCallback } from 'react'
 import { Animated } from 'react-native'
 import { reconcileMobileSessionCreateWarningState } from './mobile-session-create-warning-state'
 import type { MobileSessionTerminalRuntimeModel } from './use-mobile-session-terminal-runtime'
+import type { StructuredAgentSessionHostSupport } from './mobile-structured-agent-session-host-support'
 
 export function useMobileSessionFeedbackCapabilities(scope: MobileSessionTerminalRuntimeModel) {
   const {
@@ -32,11 +33,10 @@ export function useMobileSessionFeedbackCapabilities(scope: MobileSessionTermina
     null
   )
   const [quickCommandsSupported, setQuickCommandsSupported] = useState<boolean | null>(null)
-  // Prompt cancellation is negotiated with the same host capability probe as
+  // Structured-session features are negotiated with the same host capability probe as
   // the other session surfaces; consumers never maintain a second status cache.
-  const [agentSessionPromptCancelSupported, setAgentSessionPromptCancelSupported] = useState<
-    boolean | null
-  >(null)
+  const [agentSessionHostSupport, setAgentSessionHostSupport] =
+    useState<StructuredAgentSessionHostSupport | null>(null)
   // Why: stable callbacks (handleFileTap) read the live value via this ref, since
   // the capability probe resolves after the callbacks are created.
   const browserScreencastSupportedRef = useRef(browserScreencastSupported)
@@ -120,8 +120,8 @@ export function useMobileSessionFeedbackCapabilities(scope: MobileSessionTermina
     setAgentSessionHistorySupported,
     quickCommandsSupported,
     setQuickCommandsSupported,
-    agentSessionPromptCancelSupported,
-    setAgentSessionPromptCancelSupported,
+    agentSessionHostSupport,
+    setAgentSessionHostSupport,
     browserScreencastSupportedRef,
     reconciledCreateWarningState,
     createWarning,
diff --git a/mobile/src/session/use-mobile-session-keyboard-state.test.tsx b/mobile/src/session/use-mobile-session-keyboard-state.test.tsx
index e1f12b7414d0..96ab0a8d4ab9 100644
--- a/mobile/src/session/use-mobile-session-keyboard-state.test.tsx
+++ b/mobile/src/session/use-mobile-session-keyboard-state.test.tsx
@@ -73,8 +73,7 @@ function Harness(): null {
     initializedHandlesRef: { current: new Set() },
     showNativeChatRef: { current: false },
     subscribeToTerminal: () => {},
-    terminalFrameHeightRef: { current: 0 },
-    terminalFrameWidth: 0,
+    terminalFrameRef: { current: null },
     terminalRefs: { current: new Map() },
     unsubscribeTerminal: () => {},
     viewportMeasuredRef: { current: false },
@@ -121,10 +120,10 @@ describe('what the session screen hears about the keyboard', () => {
     expect(harness.notifyKeyboardVisibility).toHaveBeenLastCalledWith(false)
   })
 
-  it('holds the refit off on the page, where the keyboard is open and covers nothing', async () => {
-    // Inside the shell the WebView is already shortened, so the seam reports no occlusion: the
-    // dock needs no lift. Refitting on that height change would reflow the desktop PTY on every
-    // keyboard open, which is the reflow the visibility flag exists to defer.
+  it('holds the refit off for a keyboard that is open and covers nothing', async () => {
+    // A floating keyboard reports no occlusion, so the dock needs no lift. Refitting on that height
+    // change would reflow the desktop PTY on every keyboard open, which is the reflow the
+    // visibility flag exists to defer.
     const tree = await mount()
     harness.keyboard = { height: 0, visible: true }
     await rerender(tree)
diff --git a/mobile/src/session/use-mobile-session-keyboard-state.ts b/mobile/src/session/use-mobile-session-keyboard-state.ts
index 6d9ec467a35e..cfc5f9af0119 100644
--- a/mobile/src/session/use-mobile-session-keyboard-state.ts
+++ b/mobile/src/session/use-mobile-session-keyboard-state.ts
@@ -31,8 +31,7 @@ export type MobileSessionKeyboardScope = Pick<
   | 'tabStripOffsetRef'
   | 'tabStripRef'
   | 'tabStripViewportWidthRef'
-  | 'terminalFrameHeightRef'
-  | 'terminalFrameWidth'
+  | 'terminalFrameRef'
   | 'terminalRefs'
   | 'terminals'
   | 'terminalTextScale'
@@ -67,17 +66,21 @@ export function useMobileSessionKeyboardState(scope: MobileSessionKeyboardScope)
     terminalRefs,
     initializedHandlesRef,
     activeHandleRef,
-    terminalFrameHeightRef,
-    terminalFrameWidth,
+    terminalFrameRef,
     showNativeChatRef,
     unsubscribeTerminal,
     subscribeToTerminal
   } = scope
   // Why: non-subscribe layout refits (tab strip, fold, rotation) live in a dedicated hook — see terminal-viewport-refit.ts.
-  const { notifyTerminalFrameHeight, notifyKeyboardVisibility } = useTerminalViewportRefit({
+  const {
+    notifyTerminalFrameHeight,
+    notifyTerminalFrameWidth,
+    notifyKeyboardVisibility,
+    notifyTerminalCellBoxChange
+  } = useTerminalViewportRefit({
     activeHandleRef,
     terminalRefs,
-    terminalFrameHeightRef,
+    terminalFrameRef,
     viewportRef,
     viewportMeasuredRef,
     nativeChatCoveredRef: showNativeChatRef,
@@ -87,7 +90,6 @@ export function useMobileSessionKeyboardState(scope: MobileSessionKeyboardScope)
     connState,
     tabStripVisible: terminals.length > 1,
     textScale: terminalTextScale,
-    terminalFrameWidth,
     unsubscribeTerminal,
     subscribeToTerminal
   })
@@ -151,7 +153,9 @@ export function useMobileSessionKeyboardState(scope: MobileSessionKeyboardScope)
   }, [router])
   return {
     notifyTerminalFrameHeight,
+    notifyTerminalFrameWidth,
     notifyKeyboardVisibility,
+    notifyTerminalCellBoxChange,
     scrollActiveTabIntoView,
     handleDeleteCustomKey,
     handleManageShortcuts
diff --git a/mobile/src/session/use-mobile-session-native-chat-dictation.ts b/mobile/src/session/use-mobile-session-native-chat-dictation.ts
index 8ea9de2b9f0a..4dc1743e2219 100644
--- a/mobile/src/session/use-mobile-session-native-chat-dictation.ts
+++ b/mobile/src/session/use-mobile-session-native-chat-dictation.ts
@@ -27,7 +27,7 @@ export function useMobileSessionNativeChatDictation(
     worktreeId,
     client,
     connState,
-    agentSessionPromptCancelSupported,
+    agentSessionHostSupport,
     setInput,
     liveInputTerminalHandles,
     activeHandle,
@@ -73,7 +73,7 @@ export function useMobileSessionNativeChatDictation(
     nativeChatTranscriptIsLocalReadable,
     nativeChatInputLeaseReady,
     connState,
-    agentSessionPromptCancelSupported,
+    agentSessionHostSupport,
     onSendError: nativeChatSendError.show,
     onSendResolved: nativeChatSendError.clear
   })
diff --git a/mobile/src/session/use-mobile-session-presentation.ts b/mobile/src/session/use-mobile-session-presentation.ts
index 2bea9158db08..dca323343b07 100644
--- a/mobile/src/session/use-mobile-session-presentation.ts
+++ b/mobile/src/session/use-mobile-session-presentation.ts
@@ -1,9 +1,9 @@
-import { Platform } from 'react-native'
 import { classifyConnection, verdictDisplayLabel } from '../transport/connection-health'
 import { computeActiveTerminalKeyboardLift } from '../terminal/terminal-keyboard-avoidance-lift'
 import { useInitialSessionTerminalAutoCreate } from './use-initial-session-terminal-autocreate'
 import { MOBILE_SESSION_STATUS_LABELS } from './mobile-session-route-helpers'
 import type { MobileSessionBulkCloseModel } from './use-mobile-session-bulk-close'
+import { hostOs } from '../platform/host-os'
 
 export function useMobileSessionPresentation(scope: MobileSessionBulkCloseModel) {
   const {
@@ -25,7 +25,7 @@ export function useMobileSessionPresentation(scope: MobileSessionBulkCloseModel)
     toastOpacityRef,
     hostEndpoint,
     initialSessionAutoCreateRef,
-    terminalFrameHeightRef,
+    terminalFrameRef,
     handleCreateTerminal,
     visibleTabs,
     forceReconnectHost
@@ -77,14 +77,14 @@ export function useMobileSessionPresentation(scope: MobileSessionBulkCloseModel)
   // Why: iOS keyboard height includes the home-indicator inset; Android IME height does not.
   const keyboardLift =
     keyboardHeight > 0
-      ? Platform.OS === 'ios'
+      ? hostOs() === 'ios'
         ? Math.max(0, keyboardHeight - insets.bottom)
         : keyboardHeight
       : 0
   const activeTerminalKeyboardLift = computeActiveTerminalKeyboardLift({
     keyboardLift,
     metrics: activeHandle ? terminalKeyboardMetrics.get(activeHandle) : undefined,
-    terminalFrameHeight: terminalFrameHeightRef.current
+    terminalFrameHeight: terminalFrameRef.current?.height ?? 0
   })
   const toastAnimatedStyle = {
     opacity: toastOpacityRef.current,
diff --git a/mobile/src/session/use-mobile-session-tab-reconciliation.ts b/mobile/src/session/use-mobile-session-tab-reconciliation.ts
index da7a48e035ca..9f9af59833d1 100644
--- a/mobile/src/session/use-mobile-session-tab-reconciliation.ts
+++ b/mobile/src/session/use-mobile-session-tab-reconciliation.ts
@@ -2,10 +2,8 @@ import { useEffect, useRef, useCallback, useMemo, useState } from 'react'
 import { startRuntimeCapabilityProbe } from '../transport/runtime-capability-probe'
 import { supportsMobileQuickCommands } from '../terminal/quick-commands'
 import { MOBILE_AI_VAULT_CAPABILITY } from '../agent-history/agent-history-capability'
-import {
-  AGENT_SESSION_PROMPT_CANCEL_RUNTIME_CAPABILITY,
-  TERMINAL_QUERY_REPLY_INPUT_RUNTIME_CAPABILITY
-} from '../../../src/shared/protocol-version'
+import { TERMINAL_QUERY_REPLY_INPUT_RUNTIME_CAPABILITY } from '../../../src/shared/protocol-version'
+import { structuredAgentSessionHostSupport } from './mobile-structured-agent-session-host-support'
 import { runAcceptedMobileSessionTabsEffects } from './mobile-session-tabs-accepted-effects'
 import type { SessionTabsStreamSource } from './mobile-session-tabs-stream-health'
 import { useMobileSessionTabsFetchReporting } from './use-mobile-session-tabs-fetch-reporting'
@@ -34,7 +32,7 @@ export function useMobileSessionTabReconciliation(scope: MobileSessionMarkdownAc
     switchSessionTabRef,
     setBrowserScreencastSupported,
     setAgentSessionHistorySupported,
-    setAgentSessionPromptCancelSupported,
+    setAgentSessionHostSupport,
     setQuickCommandsSupported,
     nativeChatStream,
     fetchTerminals,
@@ -152,7 +150,7 @@ export function useMobileSessionTabReconciliation(scope: MobileSessionMarkdownAc
     if (!client || connState !== 'connected') {
       setBrowserScreencastSupported(null)
       setAgentSessionHistorySupported(null)
-      setAgentSessionPromptCancelSupported(null)
+      setAgentSessionHostSupport(null)
       setQuickCommandsSupported(null)
       setShowQuickCommands(false)
       hostQueryReplyInputSupportedRef.current = false
@@ -162,7 +160,7 @@ export function useMobileSessionTabReconciliation(scope: MobileSessionMarkdownAc
     // host; clear the prior capability before exposing host-specific actions.
     setBrowserScreencastSupported(null)
     setAgentSessionHistorySupported(null)
-    setAgentSessionPromptCancelSupported(null)
+    setAgentSessionHostSupport(null)
     setQuickCommandsSupported(null)
     setShowQuickCommands(false)
     hostQueryReplyInputSupportedRef.current = false
@@ -171,9 +169,7 @@ export function useMobileSessionTabReconciliation(scope: MobileSessionMarkdownAc
     return startRuntimeCapabilityProbe(client, (capabilities) => {
       setBrowserScreencastSupported(capabilities.includes('browser.screencast.v1'))
       setAgentSessionHistorySupported(capabilities.includes(MOBILE_AI_VAULT_CAPABILITY))
-      setAgentSessionPromptCancelSupported(
-        capabilities.includes(AGENT_SESSION_PROMPT_CANCEL_RUNTIME_CAPABILITY)
-      )
+      setAgentSessionHostSupport(structuredAgentSessionHostSupport(capabilities))
       setQuickCommandsSupported(supportsMobileQuickCommands(capabilities))
       // Why: hosts without this capability strip inputKind from terminal.send,
       // so a forwarded xterm reply would become floor-stealing shell input.
diff --git a/mobile/src/session/use-mobile-session-terminal-runtime.ts b/mobile/src/session/use-mobile-session-terminal-runtime.ts
index 5e4196e15007..b19213f53564 100644
--- a/mobile/src/session/use-mobile-session-terminal-runtime.ts
+++ b/mobile/src/session/use-mobile-session-terminal-runtime.ts
@@ -1,10 +1,12 @@
 import { useState, useRef, useCallback } from 'react'
-import { Platform, type Keyboard, type TextInput } from 'react-native'
+import type { TerminalFrame } from '../terminal/terminal-webview-messages'
+import type { Keyboard, TextInput } from 'react-native'
 import { useFocusEffect } from 'expo-router'
 import type { RpcClient } from '../transport/rpc-client'
 import type { ConnectionState } from '../transport/types'
 import type { TerminalModes, TerminalWebViewHandle } from '../terminal/terminal-webview-contract'
 import { useTerminalLiveInputFocus } from '../terminal/use-terminal-live-input-focus'
+import { reopensFocusedInputWhenKeyboardHidden } from '../terminal/terminal-live-input-keyboard-reopen'
 import type { TerminalLiveInputSender } from '../terminal/terminal-live-input-sender'
 import { useTerminalLiveInputCommit } from '../terminal/use-terminal-live-input-commit'
 import { resolveMobileTerminalInputGate } from '../terminal/terminal-input-connection-gate'
@@ -76,8 +78,6 @@ export function useMobileSessionTerminalRuntime(scope: MobileSessionScreenStateM
   const viewportResubscribeBudgetRef = useRef(new TerminalViewportResubscribeBudget())
   // Why: don't subscribe until the WebView fires web-ready — iOS may defer JS in hidden WebViews and init() messages would queue unrendered.
   const webReadyHandlesRef = useRef<Set<string>>(new Set())
-  // Why: a document's first subscribe waits for the viewport measure (see mobile-terminal-first-subscribe-viewport.ts).
-  const subscribedDocumentsRef = useRef<Set<string>>(new Set())
   const activeHandleRef = useRef<string | null>(null)
   const bufferedTerminalDraftState = useBufferedTerminalDrafts({ activeHandle, activeHandleRef })
   const reconcileBufferedDraftsRef = useRef(bufferedTerminalDraftState.reconcileTerminalTabs)
@@ -103,10 +103,9 @@ export function useMobileSessionTerminalRuntime(scope: MobileSessionScreenStateM
   // Why: highest applyLayout seq seen per handle; drop older scrollback/resized as stale, but a >20 gap resets (fresh subscription/server restart).
   const layoutSeqRef = useRef<Map<string, number>>(new Map())
   const sendingRef = useRef(false)
-  // Why: exact terminal-frame height for measureFitDimensions; window.innerHeight can overstate the visible area.
-  const terminalFrameHeightRef = useRef<number>(0)
-  // Why: sidebar resizes change the terminal frame width without a window-dim change; track it so the refit hook re-fits (see terminal-viewport-refit.ts).
-  const [terminalFrameWidth, setTerminalFrameWidth] = useState(0)
+  // Why: the terminal frame React Native laid out, unrounded, for every fit; window.innerHeight can
+  // overstate the visible area. Null until the frame's first layout.
+  const terminalFrameRef = useRef<TerminalFrame | null>(null)
   const activeSessionTab = sessionTabs.find((tab) => tab.id === activeSessionTabId) ?? null
   const {
     clearPendingLiveInputCommit,
@@ -144,7 +143,7 @@ export function useMobileSessionTerminalRuntime(scope: MobileSessionScreenStateM
     lifecycleIdentity: client,
     lifecycleKey: JSON.stringify([hostId, worktreeId, connState]),
     liveInputEnabled,
-    reopenFocusedInputWhenKeyboardHidden: Platform.OS === 'android',
+    reopenFocusedInputWhenKeyboardHidden: reopensFocusedInputWhenKeyboardHidden(),
     timerRef: liveInputFocusTimerRef
   })
   useFocusEffect(
@@ -182,7 +181,6 @@ export function useMobileSessionTerminalRuntime(scope: MobileSessionScreenStateM
     terminalDiagnosticsRef,
     viewportResubscribeBudgetRef,
     webReadyHandlesRef,
-    subscribedDocumentsRef,
     activeHandleRef,
     activeSessionTabTypeRef,
     pendingActiveSessionTabIdRef,
@@ -198,9 +196,7 @@ export function useMobileSessionTerminalRuntime(scope: MobileSessionScreenStateM
     delayedActionTimersRef,
     layoutSeqRef,
     sendingRef,
-    terminalFrameHeightRef,
-    terminalFrameWidth,
-    setTerminalFrameWidth,
+    terminalFrameRef,
     activeSessionTab,
     clearPendingLiveInputCommit,
     flushPendingLiveInputBeforeExternalSend,
diff --git a/mobile/src/session/use-mobile-session-terminal-subscription-foundation.ts b/mobile/src/session/use-mobile-session-terminal-subscription-foundation.ts
index efb482c8c8f9..306adec9b332 100644
--- a/mobile/src/session/use-mobile-session-terminal-subscription-foundation.ts
+++ b/mobile/src/session/use-mobile-session-terminal-subscription-foundation.ts
@@ -1,5 +1,4 @@
 import { useRef, useCallback } from 'react'
-import { measureTerminalViewportOnce } from './mobile-terminal-first-subscribe-viewport'
 import type { MobileSessionNativeChatDictationModel } from './use-mobile-session-native-chat-dictation'
 
 export function useMobileSessionTerminalSubscriptionFoundation(
@@ -9,8 +8,6 @@ export function useMobileSessionTerminalSubscriptionFoundation(
     setCoveredStreamRevision,
     setTerminalKeyboardMetrics,
     terminalCwdRef,
-    viewportRef,
-    viewportMeasuredRef,
     terminalRefs,
     terminalUnsubsRef,
     subscribingHandlesRef,
@@ -19,11 +16,9 @@ export function useMobileSessionTerminalSubscriptionFoundation(
     terminalDiagnosticsRef,
     viewportResubscribeBudgetRef,
     webReadyHandlesRef,
-    subscribedDocumentsRef,
     activeHandleRef,
     subscribeSeqRef,
     layoutSeqRef,
-    terminalFrameHeightRef,
     nativeChatInputLeaseReadyRef,
     clearNativeChatInputLease,
     showNativeChatRef
@@ -77,7 +72,6 @@ export function useMobileSessionTerminalSubscriptionFoundation(
     terminalDiagnosticsRef.current.clearTerminalCache()
     viewportResubscribeBudgetRef.current.clear()
     webReadyHandlesRef.current.clear()
-    subscribedDocumentsRef.current.clear()
     subscribeSeqRef.current.clear()
     layoutSeqRef.current.clear()
     terminalCwdRef.current.clear()
@@ -86,27 +80,11 @@ export function useMobileSessionTerminalSubscriptionFoundation(
       term.clear()
     }
   }, [clearNativeChatInputLease])
-
-  const measureViewportOnce = useCallback(
-    (handle: string) =>
-      measureTerminalViewportOnce({
-        handle,
-        ref: getTerminalRef(handle),
-        documentHasTerminal: initializedHandlesRef.current.has(handle),
-        viewportRef,
-        viewportMeasuredRef,
-        terminalFrameHeightRef,
-        onMeasured: (measuredHandle, dims, frameHeight) =>
-          terminalDiagnosticsRef.current.viewportMeasured(measuredHandle, dims, frameHeight)
-      }),
-    [getTerminalRef]
-  )
   return {
     getTerminalRef,
     unsubscribeTerminal,
     unsubscribeTerminalRef,
-    clearTerminalCache,
-    measureViewportOnce
+    clearTerminalCache
   }
 }
 
diff --git a/mobile/src/session/use-mobile-session-terminal-subscription.test.tsx b/mobile/src/session/use-mobile-session-terminal-subscription.test.tsx
new file mode 100644
index 000000000000..ef2954e183b4
--- /dev/null
+++ b/mobile/src/session/use-mobile-session-terminal-subscription.test.tsx
@@ -0,0 +1,230 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { TerminalWebViewHandle } from '../terminal/terminal-webview-contract'
+import { MobileTerminalDiagnostics } from './mobile-terminal-diagnostics'
+import { TerminalViewportResubscribeBudget } from './mobile-terminal-viewport-resubscribe'
+import type { MobileSessionTerminalSubscriptionFoundationModel } from './use-mobile-session-terminal-subscription-foundation'
+import { useMobileSessionTerminalSubscription } from './use-mobile-session-terminal-subscription'
+import type { MobileSessionTabSwitchingModel } from './use-mobile-session-tab-switching'
+import { useMobileSessionTerminalWebview } from './use-mobile-session-terminal-webview'
+
+const HANDLE = 'term-1'
+const PHONE = { cols: 55, rows: 44 }
+
+type StreamHandler = (result: unknown) => void
+
+/** The route's subscribe, driven end to end against a recording client and terminal. */
+function subscriptionHarness(opts: {
+  fit: typeof PHONE | null
+  webReady: boolean
+  frameWidth?: number
+  viewport?: typeof PHONE
+}) {
+  let fit = opts.fit
+  const order: string[] = []
+  const handlers: StreamHandler[] = []
+  const terminal: TerminalWebViewHandle = {
+    prepareForForegroundRecovery: vi.fn(),
+    write: vi.fn(),
+    init: vi.fn(({ cols, rows }: { cols: number; rows: number }) => {
+      order.push(`init ${cols}x${rows}`)
+      // An init's document reports its laid-out box before its ready.
+      fit = fit ?? PHONE
+    }),
+    resize: vi.fn(),
+    reflow: vi.fn(),
+    clear: vi.fn(),
+    fitDimensions: vi.fn(() => fit),
+    resetZoom: vi.fn(),
+    cancelSelect: vi.fn(),
+    doSelectAll: vi.fn(),
+    awaitReady: vi.fn(async () => {})
+  }
+  const terminalUnsubsRef = { current: new Map<string, () => void>() }
+  const subscribeSeqRef = { current: new Map<string, number>() }
+  const subscribingHandlesRef = { current: new Set<string>() }
+  const initializedHandlesRef = { current: new Set<string>() }
+  const webReadyHandlesRef = { current: new Set<string>(opts.webReady ? [HANDLE] : []) }
+  const terminalFrameRef: { current: { width: number; height: number } | null } = {
+    current: opts.frameWidth === 0 ? null : { width: opts.frameWidth ?? 427, height: 751 }
+  }
+  const fields = {
+    client: {
+      subscribe: vi.fn(
+        (_method: string, params: Record<string, unknown>, onData: StreamHandler) => {
+          order.push(`subscribe ${JSON.stringify(params.viewport ?? null)}`)
+          handlers.push(onData)
+          return () => {}
+        }
+      )
+    },
+    clientId: 'client-1',
+    setTerminalModes: vi.fn(),
+    terminalCwdRef: { current: new Map() },
+    viewportRef: { current: opts.viewport ?? null },
+    viewportMeasuredRef: { current: opts.viewport !== undefined },
+    terminalUnsubsRef,
+    subscribingHandlesRef,
+    leaseOnlyHandlesRef: { current: new Set<string>() },
+    initializedHandlesRef,
+    terminalDiagnosticsRef: { current: new MobileTerminalDiagnostics() },
+    viewportResubscribeBudgetRef: { current: new TerminalViewportResubscribeBudget() },
+    webReadyHandlesRef,
+    activeHandleRef: { current: HANDLE },
+    subscribeSeqRef,
+    layoutSeqRef: { current: new Map() },
+    terminalFrameRef,
+    scheduleDelayedAction: vi.fn(),
+    showToast: vi.fn(),
+    markNativeChatInputLeaseReady: vi.fn(),
+    showNativeChatRef: { current: false },
+    getTerminalRef: (handle: string | null) => (handle === HANDLE ? terminal : undefined),
+    unsubscribeTerminal: (handle: string) => {
+      terminalUnsubsRef.current.delete(handle)
+      subscribingHandlesRef.current.delete(handle)
+      subscribeSeqRef.current.set(handle, (subscribeSeqRef.current.get(handle) ?? 0) + 1)
+    },
+    unsubscribeTerminalRef: { current: vi.fn() },
+    signalTerminalInventoryRecovery: vi.fn(),
+    terminalRefs: { current: new Map([[HANDLE, terminal]]) },
+    pendingActiveTerminalHandleRef: { current: null },
+    nativeChatStream: { notifyWebReady: vi.fn() },
+    terminalGestureInputBucketsRef: { current: new Map() },
+    terminalGestureInputQueuesRef: { current: new Map() },
+    terminalGestureInputInFlightRef: { current: new Set() },
+    activeSessionTab: null,
+    markdownDocs: new Map(),
+    fileDocs: new Map(),
+    readMarkdownTab: vi.fn(),
+    readFileTab: vi.fn(),
+    notifyTerminalFrameHeight: vi.fn(),
+    notifyTerminalFrameWidth: vi.fn()
+  }
+  let subscribe: ((handle: string) => void) | undefined
+  let webReady: ((handle: string) => void) | undefined
+  let notifyFrame: ((frame: { width: number; height: number }) => void) | undefined
+  function Probe() {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the hook destructures only the fields built above.
+    const scope = fields as unknown as MobileSessionTerminalSubscriptionFoundationModel
+    subscribe = useMobileSessionTerminalSubscription(scope).subscribeToTerminal
+    const withSubscribe = { ...fields, subscribeToTerminal: subscribe }
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the web-ready handler reads only the fields built above.
+    const webviewScope = withSubscribe as unknown as MobileSessionTabSwitchingModel
+    const webview = useMobileSessionTerminalWebview(webviewScope)
+    webReady = webview.handleTerminalWebReady
+    notifyFrame = webview.notifyTerminalFrame
+    return null
+  }
+  act(() => {
+    renderer = create(createElement(Probe))
+  })
+  const scrollback = (index: number, cols: number, rows: number) =>
+    act(() => {
+      handlers[index]({ type: 'scrollback', seq: 1, cols, rows, serialized: 'x' })
+    })
+  return {
+    order,
+    subscribe: () => act(() => subscribe!(HANDLE)),
+    scrollback,
+    terminal,
+    // The document's web-ready, carrying the box xterm laid out.
+    documentReady: () => {
+      act(() => webReady!(HANDLE))
+    },
+    fields,
+    terminalFrameRef,
+    // The frame's onLayout.
+    layOutFrame: (width: number, height = 751) => act(() => notifyFrame!({ width, height }))
+  }
+}
+
+let renderer: ReactTestRenderer | undefined
+afterEach(() => {
+  act(() => renderer?.unmount())
+  renderer = undefined
+})
+
+describe('a terminal first subscribe', () => {
+  it('does not subscribe before its document is ready, then subscribes once from its box', async () => {
+    const harness = subscriptionHarness({ fit: PHONE, webReady: false })
+    harness.subscribe()
+    expect(harness.order).toEqual([])
+    harness.documentReady()
+    expect(harness.order).toEqual(['subscribe {"cols":55,"rows":44}'])
+    harness.scrollback(0, PHONE.cols, PHONE.rows)
+    await act(async () => {})
+    expect(harness.order).toEqual(['subscribe {"cols":55,"rows":44}', 'init 55x44'])
+  })
+
+  it('resubscribes a document reloaded after its first ready, which lost its terminal', async () => {
+    const harness = subscriptionHarness({ fit: PHONE, webReady: false })
+    harness.documentReady()
+    harness.scrollback(0, PHONE.cols, PHONE.rows)
+    await act(async () => {})
+    harness.documentReady()
+    harness.scrollback(1, PHONE.cols, PHONE.rows)
+    await act(async () => {})
+    expect(harness.order.filter((step) => step.startsWith('init'))).toEqual([
+      'init 55x44',
+      'init 55x44'
+    ])
+  })
+
+  it('sizes from the reported box against the laid-out frame', () => {
+    const harness = subscriptionHarness({ fit: PHONE, webReady: true, frameWidth: 427.5 })
+    harness.subscribe()
+    expect(harness.terminal.fitDimensions).toHaveBeenCalledWith({ width: 427.5, height: 751 })
+    expect(harness.order).toEqual(['subscribe {"cols":55,"rows":44}'])
+  })
+
+  it('keeps a measured viewport rather than fitting again', () => {
+    const measured = { cols: 60, rows: 40 }
+    const harness = subscriptionHarness({ fit: PHONE, webReady: true, viewport: measured })
+    harness.subscribe()
+    expect(harness.terminal.fitDimensions).not.toHaveBeenCalled()
+    expect(harness.order).toEqual(['subscribe {"cols":60,"rows":40}'])
+  })
+
+  it('holds a ready document without a box until its frame is laid out', () => {
+    const harness = subscriptionHarness({ fit: null, webReady: true, frameWidth: 0 })
+    harness.subscribe()
+    expect(harness.order).toEqual([])
+    // The frame's first layout subscribes the document held back for it.
+    harness.layOutFrame(427)
+    expect(harness.order).toEqual(['subscribe null'])
+  })
+
+  it('keeps one frame, notifies a new width, and subscribes on the first layout only', () => {
+    const harness = subscriptionHarness({ fit: null, webReady: true, frameWidth: 0 })
+    const { notifyTerminalFrameHeight, notifyTerminalFrameWidth } = harness.fields
+    harness.layOutFrame(0, 0)
+    expect(harness.terminalFrameRef.current).toBeNull()
+    harness.layOutFrame(427, 751)
+    harness.layOutFrame(427, 700)
+    expect(harness.order).toEqual(['subscribe null'])
+    expect(notifyTerminalFrameWidth).not.toHaveBeenCalled()
+    // A hidden 0x0 layout keeps the box it was laid out at.
+    harness.layOutFrame(0, 0)
+    expect(harness.terminalFrameRef.current).toEqual({ width: 427, height: 700 })
+    harness.layOutFrame(360.5, 700)
+    expect(harness.terminalFrameRef.current).toEqual({ width: 360.5, height: 700 })
+    expect(notifyTerminalFrameWidth).toHaveBeenCalledTimes(1)
+    expect(notifyTerminalFrameHeight.mock.calls.map(([height]) => height)).toEqual([
+      0, 751, 700, 0, 700
+    ])
+  })
+
+  it('goes without dims when no cell box was reported, and the fit pass resubscribes once', async () => {
+    const harness = subscriptionHarness({ fit: null, webReady: true })
+    harness.subscribe()
+    expect(harness.order).toEqual(['subscribe null'])
+    harness.scrollback(0, 120, 40)
+    await vi.waitFor(() => expect(harness.order).toHaveLength(3))
+    expect(harness.order).toEqual([
+      'subscribe null',
+      'init 120x40',
+      'subscribe {"cols":55,"rows":44}'
+    ])
+  })
+})
diff --git a/mobile/src/session/use-mobile-session-terminal-subscription.ts b/mobile/src/session/use-mobile-session-terminal-subscription.ts
index a440c22e319b..73af79a959df 100644
--- a/mobile/src/session/use-mobile-session-terminal-subscription.ts
+++ b/mobile/src/session/use-mobile-session-terminal-subscription.ts
@@ -1,7 +1,6 @@
 import { useCallback } from 'react'
 import { isTerminalOscLinkRanges } from '../../../src/shared/terminal-osc-link-ranges'
 import * as nativeChatTerminalStream from './mobile-native-chat-terminal-stream'
-import { deferFirstSubscribeUntilViewportMeasured } from './mobile-terminal-first-subscribe-viewport'
 import { subscribeMobileTerminalSafely } from './mobile-terminal-stream-subscribe'
 import { mobileTerminalSnapshotByteBudget } from './terminal-snapshot-byte-budget'
 import {
@@ -32,11 +31,10 @@ export function useMobileSessionTerminalSubscription(
     terminalDiagnosticsRef,
     viewportResubscribeBudgetRef,
     webReadyHandlesRef,
-    subscribedDocumentsRef,
     activeHandleRef,
     subscribeSeqRef,
     layoutSeqRef,
-    terminalFrameHeightRef,
+    terminalFrameRef,
     scheduleDelayedAction,
     showToast,
     markNativeChatInputLeaseReady,
@@ -44,7 +42,6 @@ export function useMobileSessionTerminalSubscription(
     getTerminalRef,
     unsubscribeTerminal,
     unsubscribeTerminalRef,
-    measureViewportOnce,
     signalTerminalInventoryRecovery
   } = scope
   const subscribeToTerminal = useCallback(
@@ -75,7 +72,8 @@ export function useMobileSessionTerminalSubscription(
       )
       // Why: a native-chat-covered terminal has no mounted webview, so only gate on the webview when not covered.
       if (!covered) {
-        if (!getTerminalRef(handle)) {
+        const ref = getTerminalRef(handle)
+        if (!ref) {
           logSkippedGate('no-webview-ref')
           return
         }
@@ -83,22 +81,21 @@ export function useMobileSessionTerminalSubscription(
           logSkippedGate('webview-not-ready')
           return
         }
-      }
-
-      if (
-        deferFirstSubscribeUntilViewportMeasured({
-          handle,
-          covered,
-          viewportMeasured: viewportMeasuredRef.current,
-          subscribedDocuments: subscribedDocumentsRef.current,
-          subscribingHandles: subscribingHandlesRef.current,
-          subscribeSeq: subscribeSeqRef.current,
-          measure: measureViewportOnce,
-          subscribe: subscribeToTerminal
-        })
-      ) {
-        logSkippedGate('measuring-viewport')
-        return
+        const frame = terminalFrameRef.current
+        if (!viewportMeasuredRef.current) {
+          // Why: the frame's first layout subscribes it; going now would miss the dims (page web-ready precedes it).
+          if (!frame) {
+            logSkippedGate('frame-not-laid-out')
+            return
+          }
+          // Why: sized from the box the ready document reported, the host serializes the snapshot at the phone's size.
+          const dims = ref.fitDimensions(frame)
+          diagnostics.viewportMeasured(handle, dims, frame.height)
+          if (dims) {
+            viewportRef.current = dims
+            viewportMeasuredRef.current = true
+          }
+        }
       }
 
       subscribingHandlesRef.current.add(handle)
@@ -198,7 +195,7 @@ export function useMobileSessionTerminalSubscription(
               })
               return
             }
-            ref.init(cols, rows, initialData, false, oscLinks)
+            ref.init({ cols, rows, initialData, oscLinks, frame: terminalFrameRef.current })
             initializedHandlesRef.current.add(handle)
             if (data.displayMode) {
               const displayMode = data.displayMode as MobileDisplayMode
@@ -209,8 +206,8 @@ export function useMobileSessionTerminalSubscription(
             }
             // Why: cold-start refit — init()'s fit can run against a transient scrollWidth, so re-fire against a settled DOM.
             scheduleDelayedAction(() => getTerminalRef(handle)?.resetZoom(), 200)
-            // Why: first subscribe has no viewport (xterm not loaded yet), so measure after init
-            // and resubscribe so the server can phone-fit — bounded per handle so a
+            // Why: a subscribe without a viewport (no reported cell box) measures after init and
+            // resubscribes so the server can phone-fit — bounded per handle so a
             // non-converging host degrades visibly instead of hot-looping (STA-3337).
             runTerminalViewportFitPass({
               handle,
@@ -225,7 +222,7 @@ export function useMobileSessionTerminalSubscription(
               subscribeSeqRef,
               initializedHandlesRef,
               terminalUnsubsRef,
-              terminalFrameHeightRef,
+              terminalFrameRef,
               getTerminalRef,
               unsubscribeTerminal,
               subscribeToTerminal,
@@ -266,9 +263,16 @@ export function useMobileSessionTerminalSubscription(
             diagnostics.streamResized(handle, seq, eventSeq, data, getTerminalRef(handle) != null)
             const oscLinks = isTerminalOscLinkRanges(data.oscLinks) ? data.oscLinks : undefined
             if (serialized != null) {
-              getTerminalRef(handle)?.init(cols, rows, serialized, true, oscLinks)
+              getTerminalRef(handle)?.init({
+                cols,
+                rows,
+                initialData: serialized,
+                preserveScroll: true,
+                oscLinks,
+                frame: terminalFrameRef.current
+              })
             } else {
-              getTerminalRef(handle)?.resize(cols, rows)
+              getTerminalRef(handle)?.resize(cols, rows, terminalFrameRef.current)
             }
             if (data.displayMode) {
               const displayMode = data.displayMode as MobileDisplayMode
@@ -298,7 +302,6 @@ export function useMobileSessionTerminalSubscription(
       clientId,
       getTerminalRef,
       markNativeChatInputLeaseReady,
-      measureViewportOnce,
       scheduleDelayedAction,
       showToast,
       signalTerminalInventoryRecovery
diff --git a/mobile/src/session/use-mobile-session-terminal-webview.test.tsx b/mobile/src/session/use-mobile-session-terminal-webview.test.tsx
deleted file mode 100644
index 5dfede07429f..000000000000
--- a/mobile/src/session/use-mobile-session-terminal-webview.test.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import { createElement } from 'react'
-import { act, create, type ReactTestRenderer } from 'react-test-renderer'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { TerminalWebViewHandle } from '../terminal/terminal-webview-contract'
-import { deferFirstSubscribeUntilViewportMeasured } from './mobile-terminal-first-subscribe-viewport'
-import { MobileTerminalDiagnostics } from './mobile-terminal-diagnostics'
-import type { MobileSessionTabSwitchingModel } from './use-mobile-session-tab-switching'
-import { useMobileSessionTerminalWebview } from './use-mobile-session-terminal-webview'
-
-const HANDLE = 'term-1'
-
-function terminalHandle(): TerminalWebViewHandle {
-  return {
-    prepareForForegroundRecovery: vi.fn(),
-    write: vi.fn(),
-    init: vi.fn(),
-    resize: vi.fn(),
-    reflow: vi.fn(),
-    clear: vi.fn(),
-    measureFitDimensions: vi.fn(async () => null),
-    resetZoom: vi.fn(),
-    cancelSelect: vi.fn(),
-    doSelectAll: vi.fn(),
-    awaitReady: vi.fn(async () => {})
-  }
-}
-
-function makeScope() {
-  const fields = {
-    markdownDocs: new Map(),
-    fileDocs: new Map(),
-    terminalGestureInputBucketsRef: { current: new Map() },
-    terminalGestureInputQueuesRef: { current: new Map() },
-    terminalGestureInputInFlightRef: { current: new Set() },
-    terminalRefs: { current: new Map<string, TerminalWebViewHandle>() },
-    terminalUnsubsRef: { current: new Map<string, () => void>() },
-    initializedHandlesRef: { current: new Set<string>() },
-    terminalDiagnosticsRef: { current: new MobileTerminalDiagnostics() },
-    webReadyHandlesRef: { current: new Set<string>() },
-    subscribedDocumentsRef: { current: new Set<string>() },
-    activeHandleRef: { current: HANDLE },
-    pendingActiveTerminalHandleRef: { current: null },
-    activeSessionTab: null,
-    unsubscribeTerminal: vi.fn(),
-    subscribeToTerminal: vi.fn(),
-    nativeChatStream: { notifyWebReady: vi.fn() },
-    readMarkdownTab: vi.fn(),
-    readFileTab: vi.fn()
-  }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the hook destructures only the fields built above.
-  return { fields, scope: fields as unknown as MobileSessionTabSwitchingModel }
-}
-
-let renderer: ReactTestRenderer | undefined
-afterEach(() => {
-  act(() => renderer?.unmount())
-  renderer = undefined
-})
-
-function renderWebviewHook(scope: MobileSessionTabSwitchingModel) {
-  let model: ReturnType<typeof useMobileSessionTerminalWebview> | undefined
-  function Probe() {
-    model = useMobileSessionTerminalWebview(scope)
-    return null
-  }
-  act(() => {
-    renderer = create(createElement(Probe))
-  })
-  if (!model) {
-    throw new Error('hook did not render')
-  }
-  return model
-}
-
-// The gate as subscribeToTerminal calls it once a refit has cleared the measured flag.
-function gateWouldReopen(fields: ReturnType<typeof makeScope>['fields']) {
-  return deferFirstSubscribeUntilViewportMeasured({
-    handle: HANDLE,
-    covered: false,
-    viewportMeasured: false,
-    subscribedDocuments: fields.subscribedDocumentsRef.current,
-    subscribingHandles: new Set(),
-    subscribeSeq: new Map([[HANDLE, 1]]),
-    measure: vi.fn(async () => {}),
-    subscribe: vi.fn()
-  })
-}
-
-describe('terminal document lifetime for the first-subscribe gate', () => {
-  it('keeps a live document marked when its handle re-attaches for a theme or text-size change', () => {
-    const { fields, scope } = makeScope()
-    const model = renderWebviewHook(scope)
-    model.setTerminalWebViewRef(HANDLE, terminalHandle())
-    model.handleTerminalWebReady(HANDLE)
-    fields.subscribedDocumentsRef.current.add(HANDLE)
-    // The controller's handle memo changes with theme and text scale: null, then the new handle.
-    model.setTerminalWebViewRef(HANDLE, null)
-    model.setTerminalWebViewRef(HANDLE, terminalHandle())
-    expect(gateWouldReopen(fields)).toBe(false)
-  })
-
-  it('forgets the mark when a new document announces itself', () => {
-    const { fields, scope } = makeScope()
-    const model = renderWebviewHook(scope)
-    model.setTerminalWebViewRef(HANDLE, terminalHandle())
-    fields.subscribedDocumentsRef.current.add(HANDLE)
-    model.handleTerminalWebReady(HANDLE)
-    expect(fields.subscribedDocumentsRef.current.has(HANDLE)).toBe(false)
-  })
-})
diff --git a/mobile/src/session/use-mobile-session-terminal-webview.ts b/mobile/src/session/use-mobile-session-terminal-webview.ts
index 59ffcccbca65..484930f1218e 100644
--- a/mobile/src/session/use-mobile-session-terminal-webview.ts
+++ b/mobile/src/session/use-mobile-session-terminal-webview.ts
@@ -1,5 +1,6 @@
 import { useEffect, useCallback } from 'react'
 import type { TerminalWebViewHandle } from '../terminal/terminal-webview-contract'
+import type { TerminalFrame } from '../terminal/terminal-webview-messages'
 import type { MobileSessionTabSwitchingModel } from './use-mobile-session-tab-switching'
 
 export function useMobileSessionTerminalWebview(scope: MobileSessionTabSwitchingModel) {
@@ -14,7 +15,6 @@ export function useMobileSessionTerminalWebview(scope: MobileSessionTabSwitching
     initializedHandlesRef,
     terminalDiagnosticsRef,
     webReadyHandlesRef,
-    subscribedDocumentsRef,
     activeHandleRef,
     pendingActiveTerminalHandleRef,
     activeSessionTab,
@@ -22,7 +22,10 @@ export function useMobileSessionTerminalWebview(scope: MobileSessionTabSwitching
     subscribeToTerminal,
     nativeChatStream,
     readMarkdownTab,
-    readFileTab
+    readFileTab,
+    terminalFrameRef,
+    notifyTerminalFrameHeight,
+    notifyTerminalFrameWidth
   } = scope
   // Why: only store the ref; subscribe on web-ready to avoid the blank-terminal race (init queued before xterm.js loaded).
   const setTerminalWebViewRef = useCallback((handle: string, ref: TerminalWebViewHandle | null) => {
@@ -44,8 +47,6 @@ export function useMobileSessionTerminalWebview(scope: MobileSessionTabSwitching
   const handleTerminalWebReady = useCallback(
     (handle: string) => {
       const wasAlreadyReady = webReadyHandlesRef.current.has(handle)
-      // Why: web-ready announces a new document; the handle also re-attaches on theme or text-size changes, which keep the document.
-      subscribedDocumentsRef.current.delete(handle)
       webReadyHandlesRef.current.add(handle)
       nativeChatStream.notifyWebReady(handle, wasAlreadyReady)
       terminalDiagnosticsRef.current.webViewReady(
@@ -65,7 +66,7 @@ export function useMobileSessionTerminalWebview(scope: MobileSessionTabSwitching
       // Why: a just-created tab can lose activeHandleRef to a lagging snapshot; honor the pending marker so its web-ready subscribe still fires.
       const isIntendedActive =
         handle === activeHandleRef.current || handle === pendingActiveTerminalHandleRef.current
-      // Why: subscribeToTerminal measures the viewport first for a fresh document, so the dims ride this subscribe.
+      // Why: web-ready carried the cell box xterm laid out, so subscribeToTerminal sizes this subscribe.
       if (isIntendedActive && !terminalUnsubsRef.current.has(handle)) {
         subscribeToTerminal(handle)
       }
@@ -73,6 +74,39 @@ export function useMobileSessionTerminalWebview(scope: MobileSessionTabSwitching
     [nativeChatStream, subscribeToTerminal, unsubscribeTerminal]
   )
 
+  const subscribeIntendedActiveTerminal = useCallback(() => {
+    const handle = pendingActiveTerminalHandleRef.current ?? activeHandleRef.current
+    if (handle && !terminalUnsubsRef.current.has(handle)) {
+      subscribeToTerminal(handle)
+    }
+  }, [activeHandleRef, pendingActiveTerminalHandleRef, subscribeToTerminal, terminalUnsubsRef])
+
+  /** The terminal frame React Native laid out: kept in the one frame ref, then what it changed. */
+  const notifyTerminalFrame = useCallback(
+    (frame: TerminalFrame) => {
+      // Why: notify height imperatively so dock settling re-fits the PTY without rerendering SessionScreen.
+      notifyTerminalFrameHeight(Math.round(frame.height))
+      // Why: the page reports a hidden frame as 0x0; it keeps the box it was laid out at.
+      if (frame.width <= 0) {
+        return
+      }
+      const previous = terminalFrameRef.current
+      terminalFrameRef.current = frame
+      if (!previous) {
+        // Why: a ready document held back for its frame subscribes on the first layout.
+        subscribeIntendedActiveTerminal()
+      } else if (frame.width !== previous.width) {
+        notifyTerminalFrameWidth()
+      }
+    },
+    [
+      notifyTerminalFrameHeight,
+      notifyTerminalFrameWidth,
+      subscribeIntendedActiveTerminal,
+      terminalFrameRef
+    ]
+  )
+
   useEffect(() => {
     if (activeSessionTab?.type !== 'markdown') {
       return
@@ -94,7 +128,8 @@ export function useMobileSessionTerminalWebview(scope: MobileSessionTabSwitching
   }, [activeSessionTab, fileDocs, readFileTab])
   return {
     setTerminalWebViewRef,
-    handleTerminalWebReady
+    handleTerminalWebReady,
+    notifyTerminalFrame
   }
 }
 
diff --git a/mobile/src/session/use-mobile-structured-agent-session-hold-refused.test.tsx b/mobile/src/session/use-mobile-structured-agent-session-hold-refused.test.tsx
new file mode 100644
index 000000000000..cba5ec91ba84
--- /dev/null
+++ b/mobile/src/session/use-mobile-structured-agent-session-hold-refused.test.tsx
@@ -0,0 +1,103 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type { AgentSessionSubscribeEvent } from '../../../src/shared/agent-session-wire'
+import type { RpcClient } from '../transport/rpc-client'
+import { useMobileStructuredAgentSession } from './use-mobile-structured-agent-session'
+
+const asyncStorage = vi.hoisted(() => ({
+  getItem: vi.fn(async () => null),
+  setItem: vi.fn(async () => undefined),
+  removeItem: vi.fn(async () => undefined)
+}))
+
+vi.mock('@react-native-async-storage/async-storage', () => ({ default: asyncStorage }))
+
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a literal snapshot frame; the hook reads its type, page and fence.
+const SNAPSHOT: AgentSessionSubscribeEvent = {
+  type: 'snapshot',
+  sessionId: 'session-1',
+  fence: 3,
+  page: {
+    sessionId: 'session-1',
+    epoch: 'epoch-1',
+    direction: 'tail',
+    items: [
+      {
+        itemId: 'msg-1',
+        revision: 1,
+        sequence: 1,
+        observedAt: 10,
+        body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'still here' }] }
+      }
+    ],
+    removedItemIds: [],
+    submissions: [],
+    window: {
+      oldest: { epoch: 'epoch-1', sequence: 1 },
+      newest: { epoch: 'epoch-1', sequence: 1 },
+      nextCursor: { epoch: 'epoch-1', sequence: 2 }
+    },
+    liveCursor: { epoch: 'epoch-1', sequence: 1 },
+    hasOlder: false,
+    hasNewer: false
+  }
+} as AgentSessionSubscribeEvent
+
+let renderer: ReactTestRenderer | null = null
+let hook: ReturnType<typeof useMobileStructuredAgentSession> | null = null
+
+afterEach(() => {
+  act(() => renderer?.unmount())
+  renderer = null
+  hook = null
+})
+
+beforeEach(() => {
+  vi.clearAllMocks()
+})
+
+it('subscribes when an older host refuses the hold, and shows the transcript (P2-24)', async () => {
+  const sendRequest = vi.fn(async (method: string) =>
+    method === 'agentSession.hold'
+      ? {
+          ok: false,
+          error: { code: 'agent_session_owner_restart_failed', message: 'Codex could not start.' },
+          _meta: { runtimeId: 'runtime-1' }
+        }
+      : { ok: true, result: {}, _meta: { runtimeId: 'runtime-1' } }
+  )
+  const subscribe = vi.fn((_method: string, _params: unknown, onData: (value: unknown) => void) => {
+    onData(SNAPSHOT)
+    return () => undefined
+  })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: an RPC client stub with the two members the hook calls.
+  const client = { sendRequest, subscribe } as unknown as RpcClient
+  function Harness(): null {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the hook's options, of which this test supplies the ones it reads.
+    hook = useMobileStructuredAgentSession({
+      client,
+      sessionId: 'session-1',
+      sourceIdentity: 'host-a\0workspace-a',
+      enabled: true,
+      connected: true,
+      agent: 'codex',
+      onSendError: () => undefined
+    } as never)
+    return null
+  }
+
+  act(() => {
+    renderer = create(createElement(Harness))
+  })
+
+  await vi.waitFor(() =>
+    expect(subscribe).toHaveBeenCalledWith(
+      'agentSession.subscribe',
+      { sessionId: 'session-1' },
+      expect.any(Function)
+    )
+  )
+  await vi.waitFor(() => expect(hook?.session.messages.length).toBeGreaterThan(0))
+  expect(hook?.session.status).not.toBe('error')
+})
diff --git a/mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx b/mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx
index 2ce48ff908da..2e18bce750c3 100644
--- a/mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx
+++ b/mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx
@@ -5,7 +5,14 @@ import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-j
 import type { StructuredAgentSessionState } from '../../../src/shared/structured-agent-session-reducer'
 import type { RpcClient } from '../transport/rpc-client'
 
-const mocks = vi.hoisted(() => ({ sendRequest: vi.fn() }))
+const mocks = vi.hoisted(() => ({
+  sendRequest: vi.fn(),
+  promptResponses: vi.fn(() => ({
+    groupedDraft: null,
+    respondPermission: vi.fn(),
+    respondQuestion: vi.fn()
+  }))
+}))
 vi.mock('./use-mobile-structured-agent-state', () => ({
   useMobileStructuredAgentState: () => ({
     state,
@@ -25,11 +32,7 @@ vi.mock('./use-mobile-structured-agent-options', () => ({
   })
 }))
 vi.mock('./use-mobile-structured-prompt-responses', () => ({
-  useMobileStructuredPromptResponses: () => ({
-    groupedDraft: null,
-    respondPermission: vi.fn(),
-    respondQuestion: vi.fn()
-  })
+  useMobileStructuredPromptResponses: mocks.promptResponses
 }))
 vi.mock('./use-mobile-structured-send-operation-reconciliation', () => ({
   useMobileStructuredSendOperationReconciliation: vi.fn()
@@ -104,7 +107,13 @@ const client: RpcClient = {
   close: () => {}
 }
 
-function Harness({ promptCancelSupported }: { promptCancelSupported: boolean }): null {
+function Harness({
+  promptCancelSupported,
+  questionAnswersSupported = false
+}: {
+  promptCancelSupported: boolean
+  questionAnswersSupported?: boolean
+}): null {
   hook = useMobileStructuredAgentSession({
     client,
     sessionId: 'session-1',
@@ -112,7 +121,7 @@ function Harness({ promptCancelSupported }: { promptCancelSupported: boolean }):
     enabled: true,
     connected: true,
     agent: 'codex',
-    promptCancelSupported,
+    hostSupport: { promptCancel: promptCancelSupported, questionAnswers: questionAnswersSupported },
     onSendError: vi.fn()
   })
   return null
@@ -151,6 +160,17 @@ describe('mobile structured prompt cancellation', () => {
     renderer = null
   })
 
+  it('hands question answering the host answers capability', () => {
+    act(() => {
+      renderer = create(
+        createElement(Harness, { promptCancelSupported: false, questionAnswersSupported: true })
+      )
+    })
+    expect(mocks.promptResponses).toHaveBeenLastCalledWith(
+      expect.objectContaining({ questionAnswersSupported: true })
+    )
+  })
+
   it('sends the clicked prompt identity on capable hosts', async () => {
     act(() => {
       renderer = create(createElement(Harness, { promptCancelSupported: true }))
diff --git a/mobile/src/session/use-mobile-structured-agent-session.ts b/mobile/src/session/use-mobile-structured-agent-session.ts
index 2a24d38a38e7..2fa5c2b2a96b 100644
--- a/mobile/src/session/use-mobile-structured-agent-session.ts
+++ b/mobile/src/session/use-mobile-structured-agent-session.ts
@@ -7,7 +7,7 @@ import {
 import { encodeNativeChatTranscriptIdentity } from '../../../src/shared/native-chat-transcript-retention'
 import type { MobileNativeChatSendOutcome } from './mobile-native-chat-send'
 import { projectStructuredAgentSessionMessages } from '../../../src/shared/structured-agent-session-message-projection'
-import { hasUnansweredStructuredAgentSessionDispatch } from '../../../src/shared/structured-agent-session-projection'
+import { isStructuredAgentSessionMainAgentWorking } from '../../../src/shared/structured-agent-session-main-agent-working'
 import {
   activeStructuredAgentSessionTurnId,
   isStructuredAgentSessionThinking
@@ -32,6 +32,7 @@ import type { MobileNativeChatSession } from './use-mobile-native-chat-session'
 import type { NativeChatLiveTurnIndicator } from '../../../src/shared/native-chat-turn-status'
 import { useMobileStructuredAgentState } from './use-mobile-structured-agent-state'
 import { useMobileStructuredPromptResponses } from './use-mobile-structured-prompt-responses'
+import type { StructuredAgentSessionHostSupport } from './mobile-structured-agent-session-host-support'
 import { useMobileStructuredAgentOptions } from './use-mobile-structured-agent-options'
 import { useMobileStructuredAgentTurnTiming } from './use-mobile-structured-agent-turn-timing'
 import { sendMobileStructuredAgentSessionMessage } from './mobile-structured-agent-session-send'
@@ -77,8 +78,8 @@ export function useMobileStructuredAgentSession(args: {
   enabled: boolean
   /** Live transport only; gates the connection-scoped hold, nothing else. */
   connected: boolean
-  /** Capability fact from the shared runtime status probe; null follows legacy cancellation. */
-  promptCancelSupported?: boolean | null
+  /** Capability facts from the shared runtime status probe; null follows the legacy wire. */
+  hostSupport: StructuredAgentSessionHostSupport | null
   agent: string | null
   onSendError: (message: string) => void
 }): StructuredMobileSession {
@@ -91,8 +92,9 @@ export function useMobileStructuredAgentSession(args: {
     sourceIdentity = '',
     enabled,
     onSendError,
-    promptCancelSupported = null
+    hostSupport
   } = args
+  const promptCancelSupported = hostSupport?.promptCancel ?? null
   const sessionKey = encodeNativeChatTranscriptIdentity([sourceIdentity, agent, sessionId])
   const operationIdsRef = useRef(new Map<string, string>())
   const commandPendingRef = useRef(false)
@@ -240,6 +242,7 @@ export function useMobileStructuredAgentSession(args: {
     stateRef,
     sessionKey,
     mutate,
+    questionAnswersSupported: hostSupport?.questionAnswers ?? null,
     onSendError
   })
 
@@ -289,9 +292,7 @@ export function useMobileStructuredAgentSession(args: {
       loadingEarlier: loadingOlder,
       loadEarlier
     },
-    isWorking:
-      turnId !== null ||
-      hasUnansweredStructuredAgentSessionDispatch(state.submissions, state.fence),
+    isWorking: isStructuredAgentSessionMainAgentWorking(turnId, state.submissions, state.fence),
     turnId,
     turnIndicator,
     ...turnTiming,
diff --git a/mobile/src/session/use-mobile-structured-agent-state.ts b/mobile/src/session/use-mobile-structured-agent-state.ts
index 494260049689..d2b6d1a50629 100644
--- a/mobile/src/session/use-mobile-structured-agent-state.ts
+++ b/mobile/src/session/use-mobile-structured-agent-state.ts
@@ -19,6 +19,33 @@ const MAX_RETAINED_SESSION_STATES = 32
 /** Bounded so a busy stream cannot turn one Load-earlier tap into an endless read chain. */
 const OLDER_PAGE_ANCHOR_ATTEMPTS = 3
 
+/**
+ * Opens the transcript stream once the hold settles, either way: a refused hold is an older host
+ * saying it could not start the agent — which the next send does — never a reason to hide the
+ * transcript. Returns what ends the stream, opened or not yet. Outside the effect so its cleanup
+ * rule can see the stream is owned.
+ */
+function openTranscriptAfterHold(
+  client: RpcClient,
+  sessionId: string,
+  held: Promise<unknown>,
+  onFrame: (raw: unknown) => void
+): () => void {
+  let ended = false
+  let close = (): void => {}
+  void held
+    .catch(() => undefined)
+    .then(() => {
+      if (!ended) {
+        close = client.subscribe('agentSession.subscribe', { sessionId }, onFrame)
+      }
+    })
+  return () => {
+    ended = true
+    close()
+  }
+}
+
 function isSubscribeEvent(value: unknown): value is AgentSessionSubscribeEvent {
   if (typeof value !== 'object' || value === null) {
     return false
@@ -101,39 +128,21 @@ export function useMobileStructuredAgentState(args: {
     }
     apply({ type: 'loading' })
     const holderId = structuredAgentSessionHolderId('mobile-chat')
-    let cancelled = false
-    let unsubscribe = (): void => {}
     const held = callAgentSession(client, 'agentSession.hold', {
       sessionId,
       holderId
     })
-    void held
-      .then(() => {
-        if (cancelled) {
-          return
-        }
-        unsubscribe = client.subscribe('agentSession.subscribe', { sessionId }, (raw) => {
-          if (
-            typeof raw === 'object' &&
-            raw !== null &&
-            (raw as { type?: unknown }).type === 'error'
-          ) {
-            apply({ type: 'error', message: String((raw as { message?: unknown }).message ?? '') })
-            return
-          }
-          if (isSubscribeEvent(raw)) {
-            apply({ type: 'event', event: raw })
-          }
-        })
-      })
-      .catch((error: unknown) => {
-        if (!cancelled) {
-          apply({ type: 'error', message: error instanceof Error ? error.message : String(error) })
-        }
-      })
+    const endStream = openTranscriptAfterHold(client, sessionId, held, (raw) => {
+      if (typeof raw === 'object' && raw !== null && 'type' in raw && raw.type === 'error') {
+        apply({ type: 'error', message: 'message' in raw ? String(raw.message ?? '') : '' })
+        return
+      }
+      if (isSubscribeEvent(raw)) {
+        apply({ type: 'event', event: raw })
+      }
+    })
     return () => {
-      cancelled = true
-      unsubscribe()
+      endStream()
       void held
         .then(() =>
           callAgentSession(
diff --git a/mobile/src/session/use-mobile-structured-agent-turn-timing.ts b/mobile/src/session/use-mobile-structured-agent-turn-timing.ts
index 811320510a29..9181856cc0dd 100644
--- a/mobile/src/session/use-mobile-structured-agent-turn-timing.ts
+++ b/mobile/src/session/use-mobile-structured-agent-turn-timing.ts
@@ -5,18 +5,17 @@ import type {
 } from '../../../src/shared/agent-session-journal-types'
 import type { NativeChatSettledTurns } from '../../../src/shared/native-chat-turn-status'
 import type { StructuredAgentHostClock } from '../../../src/shared/structured-agent-session-reducer'
-import {
-  selectStructuredAgentRunningTurnTiming,
-  selectStructuredAgentSettledTurns
-} from '../../../src/shared/structured-agent-session-turn-timing'
+import { selectStructuredAgentTurnBars } from '../../../src/shared/structured-agent-session-turn-timing'
 import {
   stepStructuredAgentTurnClock,
   type StructuredAgentTurnClockLatch
 } from '../../../src/shared/structured-agent-turn-clock-anchor'
 
 /** Host-recorded turn timing for the structured lane: settled durations straight
- *  off the journal, and a skew-free start for the live counter whose host-to-local
- *  conversion is latched once per turn. */
+ *  off the journal, the transcript key that owns the running turn's bar, each
+ *  row's owning turn, and a
+ *  skew-free start for the live counter whose host-to-local conversion is latched
+ *  once per turn. */
 export function useMobileStructuredAgentTurnTiming(
   {
     items,
@@ -28,16 +27,17 @@ export function useMobileStructuredAgentTurnTiming(
     hostClock?: StructuredAgentHostClock | null
   },
   turnId: string | null
-): { settledTurns: NativeChatSettledTurns; workingStartedAt: number | null } {
-  const settledTurns = useMemo(
-    () => selectStructuredAgentSettledTurns(items, submissions),
-    [items, submissions]
+): {
+  settledTurns: NativeChatSettledTurns
+  workingStartedAt: number | null
+  activeTurnOpenedBy: string | null
+  turnKeysByItemId: ReadonlyMap<string, string>
+} {
+  const { settledTurns, runningTiming, activeTurnOpenedBy, turnKeysByItemId } = useMemo(
+    () => selectStructuredAgentTurnBars(items, submissions, turnId),
+    [items, submissions, turnId]
   )
   const [latch, setLatch] = useState<StructuredAgentTurnClockLatch | null>(null)
-  const runningTiming = useMemo(
-    () => (turnId === null ? null : selectStructuredAgentRunningTurnTiming(items, turnId)),
-    [items, turnId]
-  )
   // Stamp during render (React's derive-from-props pattern) so the first paint of
   // a new turn already counts from the right instant.
   const step = stepStructuredAgentTurnClock({
@@ -50,5 +50,10 @@ export function useMobileStructuredAgentTurnTiming(
   if (step.latch !== latch) {
     setLatch(step.latch)
   }
-  return { settledTurns, workingStartedAt: step.workingStartedAt }
+  return {
+    settledTurns,
+    workingStartedAt: step.workingStartedAt,
+    activeTurnOpenedBy,
+    turnKeysByItemId
+  }
 }
diff --git a/mobile/src/session/use-mobile-structured-prompt-responses.test.tsx b/mobile/src/session/use-mobile-structured-prompt-responses.test.tsx
index 05a2b7fc380c..67e15635aa56 100644
--- a/mobile/src/session/use-mobile-structured-prompt-responses.test.tsx
+++ b/mobile/src/session/use-mobile-structured-prompt-responses.test.tsx
@@ -7,7 +7,12 @@ import {
   EMPTY_STRUCTURED_AGENT_SESSION,
   type StructuredAgentSessionState
 } from '../../../src/shared/structured-agent-session-reducer'
-import { projectStructuredQuestion } from './mobile-structured-agent-prompts'
+import { encodeAgentSessionQuestionAnswers } from '../../../src/shared/agent-session-question-answer'
+import { formatQuestionFreeTextAnswer } from './mobile-native-chat-question'
+import {
+  projectStructuredQuestion,
+  type StructuredQuestionItem
+} from './mobile-structured-agent-prompts'
 import type {
   StructuredAgentSessionMutate,
   StructuredAgentSessionMutationResult
@@ -72,6 +77,8 @@ function Probe(props: {
   sessionKey: string
   state: StructuredAgentSessionState
   mutate: StructuredAgentSessionMutate
+  questionAnswersSupported?: boolean | null
+  onSendError?: (message: string) => void
 }) {
   const stateRef = useRef(props.state)
   stateRef.current = props.state
@@ -79,7 +86,8 @@ function Probe(props: {
     stateRef,
     sessionKey: props.sessionKey,
     mutate: props.mutate,
-    onSendError: vi.fn()
+    questionAnswersSupported: props.questionAnswersSupported ?? null,
+    onSendError: props.onSendError ?? vi.fn()
   })
   return null
 }
@@ -172,4 +180,298 @@ describe('useMobileStructuredPromptResponses', () => {
       expect(hook().groupedDraft?.answers).toHaveLength(1)
     }
   )
+
+  describe('answer wire', () => {
+    const LONG_ANSWER = 'Proceed with the replacement, but wait for the capture. '.repeat(30).trim()
+
+    function singlePrompt(): StructuredQuestionItem {
+      return {
+        itemId: 'item-s',
+        revision: 3,
+        sequence: 1,
+        observedAt: 1,
+        body: {
+          kind: 'question',
+          question: 'Anything else?',
+          options: [
+            { id: 'yes', label: 'Yes' },
+            { id: 'no', label: 'No' }
+          ],
+          freeTextQuestionId: 'notes',
+          resolution: {
+            state: 'pending',
+            selectedOptionId: null,
+            resolvedBy: null,
+            resolvedAt: null
+          }
+        }
+      }
+    }
+
+    // Records what was sent; the verdict is irrelevant to the wire shape under test.
+    function recordingMutate() {
+      const sent: { method: string; fields: Record<string, unknown> }[] = []
+      const mutate: StructuredAgentSessionMutate = async (method, _fingerprint, fields) => {
+        sent.push({ method, fields })
+        return { status: 'rejected' }
+      }
+      return { mutate, sent }
+    }
+
+    function mount(
+      prompt: AgentJournalRenderItem,
+      mutate: StructuredAgentSessionMutate,
+      questionAnswersSupported: boolean | null,
+      onSendError?: (message: string) => void
+    ): void {
+      act(() => {
+        renderer = create(
+          createElement(Probe, {
+            sessionKey: 'session-a',
+            state: sessionState(prompt),
+            mutate,
+            questionAnswersSupported,
+            onSendError
+          })
+        )
+      })
+    }
+
+    function sentFields(sent: ReturnType<typeof recordingMutate>['sent']): Record<string, unknown> {
+      expect(sent).toHaveLength(1)
+      expect(sent[0]!.method).toBe('agentSession.respondToQuestion')
+      return sent[0]!.fields
+    }
+
+    it('sends a long typed answer as structured answers to a capable host', async () => {
+      const prompt = singlePrompt()
+      const { mutate, sent } = recordingMutate()
+      mount(prompt, mutate, true)
+      const card = projectStructuredQuestion(prompt)!
+
+      await act(async () => {
+        await hook().respondQuestion(formatQuestionFreeTextAnswer(card, LONG_ANSWER))
+      })
+
+      expect(sentFields(sent)).toEqual({
+        itemId: 'item-s',
+        expectedRevision: 3,
+        answers: [{ questionId: 'notes', optionIds: [], other: LONG_ANSWER }]
+      })
+    })
+
+    it('packs a typed answer into the option id for a host that predates answers', async () => {
+      const prompt = singlePrompt()
+      const { mutate, sent } = recordingMutate()
+      mount(prompt, mutate, null)
+      const card = projectStructuredQuestion(prompt)!
+
+      await act(async () => {
+        await hook().respondQuestion(formatQuestionFreeTextAnswer(card, '  DuckDB  '))
+      })
+
+      expect(sentFields(sent)).toEqual({
+        itemId: 'item-s',
+        expectedRevision: 3,
+        optionId: 'notes:DuckDB'
+      })
+    })
+
+    it('tries structured answers for an answer too long to pack while support is unknown', async () => {
+      const prompt = singlePrompt()
+      const { mutate, sent } = recordingMutate()
+      mount(prompt, mutate, null)
+
+      await act(async () => {
+        await hook().respondQuestion(
+          formatQuestionFreeTextAnswer(projectStructuredQuestion(prompt)!, LONG_ANSWER)
+        )
+      })
+
+      expect(sentFields(sent)).toEqual({
+        itemId: 'item-s',
+        expectedRevision: 3,
+        answers: [{ questionId: 'notes', optionIds: [], other: LONG_ANSWER }]
+      })
+    })
+
+    it('tells the user to update an older host instead of sending an answer it must refuse', async () => {
+      const prompt = singlePrompt()
+      const { mutate, sent } = recordingMutate()
+      const onSendError = vi.fn()
+      mount(prompt, mutate, false, onSendError)
+
+      let accepted = true
+      await act(async () => {
+        accepted = await hook().respondQuestion(
+          formatQuestionFreeTextAnswer(projectStructuredQuestion(prompt)!, LONG_ANSWER)
+        )
+      })
+
+      expect(accepted).toBe(false)
+      expect(sent).toEqual([])
+      expect(onSendError).toHaveBeenCalledWith(
+        'Update Orca on your computer to send answers this long'
+      )
+    })
+
+    it.each([
+      [true, { answers: [{ questionId: 'notes', optionIds: ['no'] }] }],
+      [false, { optionId: 'no' }]
+    ])(
+      'answers an option tap for the question it was shown on (answers: %s)',
+      async (supported, wire) => {
+        const prompt = singlePrompt()
+        const { mutate, sent } = recordingMutate()
+        mount(prompt, mutate, supported)
+
+        await act(async () => {
+          await hook().respondQuestion(projectStructuredQuestion(prompt)!.optionTokens[1]!)
+        })
+
+        expect(sentFields(sent)).toEqual({ itemId: 'item-s', expectedRevision: 3, ...wire })
+      }
+    )
+
+    it.each([true, false])('submits a grouped question once (answers: %s)', async (supported) => {
+      const prompt = groupedPrompt('item-g', 1)
+      const { mutate, sent } = recordingMutate()
+      mount(prompt, mutate, supported)
+
+      await act(async () => {
+        await hook().respondQuestion(projectedResponse(prompt, null))
+      })
+      await act(async () => {
+        await hook().respondQuestion(projectedResponse(prompt, hook().groupedDraft))
+      })
+
+      const answers = [
+        { questionId: 'q1', optionIds: ['q1:choice-1'] },
+        { questionId: 'q2', optionIds: ['q2:choice-1'] }
+      ]
+      expect(sentFields(sent)).toEqual({
+        itemId: 'item-g',
+        expectedRevision: 1,
+        ...(supported ? { answers } : { optionId: encodeAgentSessionQuestionAnswers(answers) })
+      })
+    })
+
+    // Claude always sends a question list, so this is the path a long typed Claude answer takes.
+    it.each([
+      [true, true],
+      [null, true],
+      [false, false]
+    ])('submits a grouped long typed answer (answers: %s)', async (supported, expectSent) => {
+      const base = groupedPrompt('item-g', 1)
+      if (base.body.kind !== 'question' || !base.body.questions) {
+        throw new Error('expected a grouped question')
+      }
+      const [first, second] = base.body.questions
+      const prompt: AgentJournalRenderItem = {
+        ...base,
+        body: { ...base.body, questions: [first!, { ...second!, freeTextQuestionId: 'q2' }] }
+      }
+      const { mutate, sent } = recordingMutate()
+      const onSendError = vi.fn()
+      mount(prompt, mutate, supported, onSendError)
+
+      await act(async () => {
+        await hook().respondQuestion(projectedResponse(prompt, null))
+      })
+      const step = projectStructuredQuestion(prompt, hook().groupedDraft)!
+      await act(async () => {
+        await hook().respondQuestion(formatQuestionFreeTextAnswer(step, LONG_ANSWER))
+      })
+
+      if (!expectSent) {
+        expect(sent).toEqual([])
+        expect(onSendError).toHaveBeenCalledWith(
+          'Update Orca on your computer to send answers this long'
+        )
+        return
+      }
+      expect(sentFields(sent)).toEqual({
+        itemId: 'item-g',
+        expectedRevision: 1,
+        answers: [
+          { questionId: 'q1', optionIds: ['q1:choice-1'] },
+          { questionId: 'q2', optionIds: [], other: LONG_ANSWER }
+        ]
+      })
+    })
+
+    it('keeps a grouped draft an older host cannot take so it sends after an update', async () => {
+      const base = groupedPrompt('item-g', 1)
+      if (base.body.kind !== 'question' || !base.body.questions) {
+        throw new Error('expected a grouped question')
+      }
+      const [first, second] = base.body.questions
+      const prompt: AgentJournalRenderItem = {
+        ...base,
+        body: { ...base.body, questions: [{ ...first!, freeTextQuestionId: 'q1' }, second!] }
+      }
+      const { mutate, sent } = recordingMutate()
+      const onSendError = vi.fn()
+      mount(prompt, mutate, false, onSendError)
+
+      let advanced = false
+      await act(async () => {
+        advanced = await hook().respondQuestion(
+          formatQuestionFreeTextAnswer(projectStructuredQuestion(prompt, null)!, LONG_ANSWER)
+        )
+      })
+      expect(advanced).toBe(true)
+      await act(async () => {
+        await hook().respondQuestion(projectedResponse(prompt, hook().groupedDraft))
+      })
+
+      expect(sent).toEqual([])
+      expect(onSendError).toHaveBeenCalledWith(
+        'Update Orca on your computer to send answers this long'
+      )
+      expect(hook().groupedDraft).not.toBeNull()
+
+      act(() => {
+        renderer?.update(
+          createElement(Probe, {
+            sessionKey: 'session-a',
+            state: sessionState(prompt),
+            mutate,
+            questionAnswersSupported: true,
+            onSendError
+          })
+        )
+      })
+      await act(async () => {
+        await hook().respondQuestion(projectedResponse(prompt, hook().groupedDraft))
+      })
+
+      expect(sentFields(sent)).toEqual({
+        itemId: 'item-g',
+        expectedRevision: 1,
+        answers: [
+          { questionId: 'q1', optionIds: [], other: LONG_ANSWER },
+          { questionId: 'q2', optionIds: ['q2:choice-1'] }
+        ]
+      })
+    })
+
+    it('names the single question an option tap answers when the prompt has no typed field', async () => {
+      const base = singlePrompt()
+      const { freeTextQuestionId: _omitted, ...body } = base.body
+      const prompt: StructuredQuestionItem = { ...base, body }
+      const { mutate, sent } = recordingMutate()
+      mount(prompt, mutate, true)
+
+      await act(async () => {
+        await hook().respondQuestion(projectStructuredQuestion(prompt)!.optionTokens[0]!)
+      })
+
+      expect(sentFields(sent)).toEqual({
+        itemId: 'item-s',
+        expectedRevision: 3,
+        answers: [{ questionId: 'q1', optionIds: ['yes'] }]
+      })
+    })
+  })
 })
diff --git a/mobile/src/session/use-mobile-structured-prompt-responses.ts b/mobile/src/session/use-mobile-structured-prompt-responses.ts
index 8340b7edee87..093029b2be52 100644
--- a/mobile/src/session/use-mobile-structured-prompt-responses.ts
+++ b/mobile/src/session/use-mobile-structured-prompt-responses.ts
@@ -1,5 +1,11 @@
 import { useCallback, useState } from 'react'
 import type { AgentSessionPromptResult } from '../../../src/shared/agent-session-wire'
+import type { AgentJournalQuestionItem } from '../../../src/shared/agent-session-journal-types'
+import {
+  AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH,
+  legacyAgentSessionSelectedOptionId,
+  type AgentSessionQuestionAnswer
+} from '../../../src/shared/agent-session-question-answer'
 import type { StructuredAgentSessionState } from '../../../src/shared/structured-agent-session-reducer'
 import {
   pendingStructuredApproval,
@@ -7,7 +13,10 @@ import {
   structuredApprovalResponseTarget,
   structuredQuestionResponseTarget
 } from './mobile-structured-agent-prompts'
-import type { StructuredAgentSessionMutate } from './mobile-structured-agent-session-rpc'
+import type {
+  StructuredAgentSessionMutate,
+  StructuredAgentSessionMutationResult
+} from './mobile-structured-agent-session-rpc'
 import {
   advanceGroupedQuestion,
   groupedQuestionPromptKey,
@@ -23,13 +32,15 @@ export function useMobileStructuredPromptResponses(args: {
   stateRef: { readonly current: StructuredAgentSessionState }
   sessionKey: string
   mutate: StructuredAgentSessionMutate
+  /** Host takes structured `answers`; otherwise the answer is packed into `optionId`. */
+  questionAnswersSupported: boolean | null
   onSendError: (message: string) => void
 }): {
   groupedDraft: GroupedQuestionDraft | null
   respondPermission: (optionId: string) => Promise<boolean>
   respondQuestion: (answer: string) => Promise<boolean>
 } {
-  const { mutate, onSendError, sessionKey, stateRef } = args
+  const { mutate, onSendError, questionAnswersSupported, sessionKey, stateRef } = args
   // Partially answered grouped question, held only until its last step is submitted. The session it
   // was collected in is stored with it and checked on read, so switching sessions drops the draft
   // without an effect that would render the stale one for a frame first.
@@ -62,6 +73,38 @@ export function useMobileStructuredPromptResponses(args: {
     [mutate, onSendError, stateRef]
   )
 
+  const sendAnswers = useCallback(
+    (
+      target: { itemId: string; expectedRevision: number },
+      body: Pick<AgentJournalQuestionItem, 'questions'>,
+      answers: AgentSessionQuestionAnswer[]
+    ): Promise<StructuredAgentSessionMutationResult<AgentSessionPromptResult> | null> => {
+      const send = (fields: Record<string, unknown>) =>
+        mutate<AgentSessionPromptResult>(
+          'agentSession.respondToQuestion',
+          'agentSession.respondTo:question',
+          { ...target, ...fields }
+        )
+      if (questionAnswersSupported === true) {
+        return send({ answers })
+      }
+      const optionId = legacyAgentSessionSelectedOptionId(body, answers)
+      if (optionId === null) {
+        return Promise.resolve(null)
+      }
+      if (optionId.length > AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH) {
+        // Too long to pack for any host: while support is unknown, `answers` is the only form that can land.
+        if (questionAnswersSupported === null) {
+          return send({ answers })
+        }
+        onSendError('Update Orca on your computer to send answers this long')
+        return Promise.resolve(null)
+      }
+      return send({ optionId })
+    },
+    [mutate, onSendError, questionAnswersSupported]
+  )
+
   const respondQuestion = useCallback(
     async (answer: string): Promise<boolean> => {
       const prompt = stateRef.current.items.find(pendingStructuredQuestion) ?? null
@@ -80,11 +123,14 @@ export function useMobileStructuredPromptResponses(args: {
           setCollected({ sessionKey, draft: grouped.draft })
           return true
         }
-        const result = await mutate<AgentSessionPromptResult>(
-          'agentSession.respondToQuestion',
-          'agentSession.respondTo:question',
-          { itemId: prompt.itemId, expectedRevision: prompt.revision, optionId: grouped.optionId }
+        const result = await sendAnswers(
+          { itemId: prompt.itemId, expectedRevision: prompt.revision },
+          prompt.body,
+          grouped.answers
         )
+        if (!result) {
+          return false
+        }
         if (result.status !== 'rejected') {
           // The group left the phone; a retry must start from the first question, not a stale tail.
           setCollected((current) =>
@@ -103,18 +149,22 @@ export function useMobileStructuredPromptResponses(args: {
       if (!target) {
         return false
       }
-      const result = await mutate<AgentSessionPromptResult>(
-        'agentSession.respondToQuestion',
-        'agentSession.respondTo:question',
-        target
+      const result = await sendAnswers(
+        { itemId: target.itemId, expectedRevision: target.expectedRevision },
+        // Grouped questions returned above, so this is a single question.
+        {},
+        [target.answer]
       )
+      if (!result) {
+        return false
+      }
       if (result.status === 'unknown') {
         onSendError('Answer unconfirmed — check chat before retrying')
         return false
       }
       return result.status === 'accepted'
     },
-    [groupedDraft, mutate, onSendError, sessionKey, stateRef]
+    [groupedDraft, onSendError, sendAnswers, sessionKey, stateRef]
   )
 
   return { groupedDraft, respondPermission, respondQuestion }
diff --git a/mobile/src/settings/app-update-settings-rows.test.tsx b/mobile/src/settings/app-update-settings-rows.test.tsx
new file mode 100644
index 000000000000..77177bf7d638
--- /dev/null
+++ b/mobile/src/settings/app-update-settings-rows.test.tsx
@@ -0,0 +1,90 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { AppUpdateSettingsRows, type AppUpdateCheckRowStatus } from './app-update-settings-rows'
+
+vi.mock('react-native', () => ({
+  Pressable: 'Pressable',
+  StyleSheet: { create: <T,>(styles: T) => styles, hairlineWidth: 1 },
+  Text: 'Text',
+  View: 'View'
+}))
+
+const NOW = Date.UTC(2026, 8, 28, 12)
+const HOUR = 60 * 60 * 1000
+
+describe('AppUpdateSettingsRows', () => {
+  let renderer: ReactTestRenderer | null = null
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+  })
+
+  function render(opts: {
+    available?: { version: string; url: string } | null
+    lastCheckedAt?: number | null
+    checkStatus?: AppUpdateCheckRowStatus
+  }) {
+    const onUpdate = vi.fn()
+    const onCheck = vi.fn()
+    act(() => {
+      renderer = create(
+        createElement(AppUpdateSettingsRows, {
+          installedVersion: '0.0.48',
+          available: opts.available ?? null,
+          lastCheckedAt: opts.lastCheckedAt ?? null,
+          now: NOW,
+          checkStatus: opts.checkStatus ?? 'idle',
+          onUpdate,
+          onCheck
+        })
+      )
+    })
+    const root = renderer!.root
+    const texts = root
+      .findAll((node) => String(node.type) === 'Text')
+      .map((node) => node.children.filter((child) => typeof child === 'string').join(''))
+    return {
+      root,
+      texts,
+      onUpdate,
+      onCheck,
+      pressables: root.findAll((node) => String(node.type) === 'Pressable')
+    }
+  }
+
+  it('offers the known update as a tappable row with an Update action', () => {
+    const { texts, pressables, onUpdate } = render({
+      available: { version: '0.0.51', url: 'https://example.test' },
+      lastCheckedAt: NOW - 2 * HOUR
+    })
+    expect(texts).toEqual([
+      'Update to Orca 0.0.51',
+      'Update',
+      'Check for updates',
+      'Last checked 2h ago'
+    ])
+    act(() => pressables[0].props.onPress())
+    expect(onUpdate).toHaveBeenCalledTimes(1)
+  })
+
+  it('shows a plain, untappable version row when current, and Never before a first success', () => {
+    const { texts, pressables } = render({})
+    expect(texts).toEqual(['Version 0.0.48', 'Check for updates', 'Never'])
+    expect(pressables).toHaveLength(1)
+    expect(pressables[0].props.accessibilityLabel).toBe('Check for updates, Never')
+  })
+
+  it('runs the check from its row and shows the transient outcome in place', () => {
+    const idle = render({ lastCheckedAt: NOW - 30_000 })
+    expect(idle.texts.at(-1)).toBe('Last checked just now')
+    act(() => idle.pressables[0].props.onPress())
+    expect(idle.onCheck).toHaveBeenCalledTimes(1)
+    act(() => renderer?.unmount())
+    expect(render({ checkStatus: 'checking' }).pressables[0].props.disabled).toBe(true)
+    act(() => renderer?.unmount())
+    expect(render({ checkStatus: 'up-to-date' }).texts.at(-1)).toBe('Up to date')
+    act(() => renderer?.unmount())
+    expect(render({ checkStatus: 'failed' }).texts.at(-1)).toBe("Couldn't check")
+  })
+})
diff --git a/mobile/src/settings/app-update-settings-rows.tsx b/mobile/src/settings/app-update-settings-rows.tsx
new file mode 100644
index 000000000000..b605a89105b2
--- /dev/null
+++ b/mobile/src/settings/app-update-settings-rows.tsx
@@ -0,0 +1,100 @@
+import { Pressable, StyleSheet, Text, View } from 'react-native'
+import type { KnownAppUpdate } from '../storage/app-update-preferences'
+import { colors, spacing, typography } from '../theme/mobile-theme'
+import { formatTimeAgo } from '../worktree/agent-row-display'
+
+export type AppUpdateCheckRowStatus = 'idle' | 'checking' | 'up-to-date' | 'failed'
+
+function checkRowValue(status: AppUpdateCheckRowStatus, lastCheckedAt: number | null, now: number) {
+  if (status === 'checking') {
+    return 'Checking…'
+  }
+  if (status === 'up-to-date') {
+    return 'Up to date'
+  }
+  if (status === 'failed') {
+    return "Couldn't check"
+  }
+  if (lastCheckedAt === null) {
+    return 'Never'
+  }
+  const ago = formatTimeAgo(lastCheckedAt, now)
+  return `Last checked ${ago === 'just now' ? ago : `${ago} ago`}`
+}
+
+/** Settings' version row and manual check; the update row stays after the home card is dismissed. */
+export function AppUpdateSettingsRows(props: {
+  installedVersion: string | null
+  available: KnownAppUpdate | null
+  lastCheckedAt: number | null
+  now: number
+  checkStatus: AppUpdateCheckRowStatus
+  onUpdate: (url: string) => void
+  onCheck: () => void
+}) {
+  const checkValue = checkRowValue(props.checkStatus, props.lastCheckedAt, props.now)
+  const { available, installedVersion, onUpdate } = props
+  const versionRow = available ? (
+    <Pressable
+      accessibilityRole="button"
+      accessibilityLabel={`Update to Orca ${available.version}`}
+      style={({ pressed }) => [styles.row, pressed && styles.rowPressed]}
+      onPress={() => onUpdate(available.url)}
+    >
+      <Text style={styles.rowLabel}>Update to Orca {available.version}</Text>
+      <Text style={styles.actionValue}>Update</Text>
+    </Pressable>
+  ) : installedVersion ? (
+    <View style={styles.row}>
+      <Text style={styles.rowLabel}>Version {installedVersion}</Text>
+    </View>
+  ) : null
+  return (
+    <View style={styles.section}>
+      {versionRow}
+      {versionRow && <View style={styles.separator} />}
+      <Pressable
+        accessibilityRole="button"
+        accessibilityLabel={`Check for updates, ${checkValue}`}
+        accessibilityState={{ busy: props.checkStatus === 'checking' }}
+        disabled={props.checkStatus === 'checking'}
+        style={({ pressed }) => [styles.row, pressed && styles.rowPressed]}
+        onPress={props.onCheck}
+      >
+        <Text style={styles.rowLabel}>Check for updates</Text>
+        <Text style={styles.rowValue}>{checkValue}</Text>
+      </Pressable>
+    </View>
+  )
+}
+
+// Same panel, rows and separator as MobileSettingsSection.
+const styles = StyleSheet.create({
+  section: {
+    backgroundColor: colors.bgPanel,
+    borderRadius: 12,
+    overflow: 'hidden',
+    marginTop: spacing.md
+  },
+  row: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.sm + 2,
+    paddingVertical: spacing.md,
+    paddingHorizontal: spacing.md + 2
+  },
+  rowPressed: { backgroundColor: colors.bgRaised },
+  rowLabel: {
+    flex: 1,
+    fontSize: typography.bodySize,
+    fontWeight: '500',
+    color: colors.textPrimary
+  },
+  rowValue: { fontSize: typography.metaSize, color: colors.textSecondary },
+  actionValue: { fontSize: typography.bodySize, fontWeight: '600', color: colors.textPrimary },
+  separator: {
+    height: StyleSheet.hairlineWidth,
+    backgroundColor: colors.borderSubtle,
+    marginHorizontal: spacing.md
+  }
+})
diff --git a/mobile/src/settings/settings-app-update-section.tsx b/mobile/src/settings/settings-app-update-section.tsx
new file mode 100644
index 000000000000..4edc93d95a90
--- /dev/null
+++ b/mobile/src/settings/settings-app-update-section.tsx
@@ -0,0 +1,52 @@
+import { useEffect, useState } from 'react'
+import {
+  appUpdateChecker,
+  installedAppVersion,
+  openAppUpdate,
+  useAppUpdateState
+} from '../app-update/app-update-runtime'
+import { AppUpdateSettingsRows, type AppUpdateCheckRowStatus } from './app-update-settings-rows'
+
+const CHECK_RESULT_VISIBLE_MS = 3000
+const RELATIVE_TIME_TICK_MS = 60_000
+
+export function SettingsAppUpdateSection() {
+  const state = useAppUpdateState()
+  const [result, setResult] = useState<'up-to-date' | 'failed' | null>(null)
+  // A check newer than this reads as "just now", so the tick only has to age the label.
+  const [now, setNow] = useState(() => Date.now())
+
+  useEffect(() => {
+    const tick = setInterval(() => setNow(Date.now()), RELATIVE_TIME_TICK_MS)
+    return () => clearInterval(tick)
+  }, [])
+
+  useEffect(() => {
+    if (result === null) {
+      return
+    }
+    const hide = setTimeout(() => setResult(null), CHECK_RESULT_VISIBLE_MS)
+    return () => clearTimeout(hide)
+  }, [result])
+
+  const runCheck = () => {
+    setResult(null)
+    void appUpdateChecker.checkNow().then((outcome) => {
+      // An available update shows in the row above, so only the other outcomes need words here.
+      setResult(outcome === 'available' ? null : outcome)
+    })
+  }
+
+  const checkStatus: AppUpdateCheckRowStatus = state.checking ? 'checking' : (result ?? 'idle')
+  return (
+    <AppUpdateSettingsRows
+      installedVersion={installedAppVersion}
+      available={state.available}
+      lastCheckedAt={state.lastCheckedAt}
+      now={now}
+      checkStatus={checkStatus}
+      onUpdate={openAppUpdate}
+      onCheck={runCheck}
+    />
+  )
+}
diff --git a/mobile/src/source-control/MobileCommitFailurePanel.tsx b/mobile/src/source-control/MobileCommitFailurePanel.tsx
index 451d61db9e54..26fa6b964ba4 100644
--- a/mobile/src/source-control/MobileCommitFailurePanel.tsx
+++ b/mobile/src/source-control/MobileCommitFailurePanel.tsx
@@ -2,6 +2,7 @@ import { useState } from 'react'
 import { ActivityIndicator, Pressable, Text, View } from 'react-native'
 import { ChevronDown, ChevronRight, Sparkles } from 'lucide-react-native'
 import { colors } from '../theme/mobile-theme'
+import { AgentLaunchNotice } from '../components/AgentLaunchNotice'
 import type { MobileCommitFailureRecovery } from './mobile-commit-failure-recovery'
 import type { MobileCommitFailureRecoveryAction } from './use-mobile-commit-failure-recovery'
 import { styles } from './mobile-source-control-styles'
@@ -28,11 +29,12 @@ export function MobileCommitFailurePanel({ failure, action }: Props) {
         <Pressable
           style={({ pressed }) => [
             styles.commitFailureFixButton,
-            action.launching && styles.commitFailureFixButtonDisabled,
+            (action.launching || action.availability !== 'available') &&
+              styles.commitFailureFixButtonDisabled,
             pressed && styles.commitFailureFixButtonPressed
           ]}
           onPress={() => void action.launch()}
-          disabled={action.launching}
+          disabled={action.launching || action.availability !== 'available'}
           accessibilityRole="button"
           accessibilityLabel="Fix commit failure with AI"
         >
@@ -65,9 +67,14 @@ export function MobileCommitFailurePanel({ failure, action }: Props) {
           {expanded ? <Text style={styles.commitFailureDetailsText}>{detailsText}</Text> : null}
         </>
       ) : null}
-      {action.launchError ? (
-        <Text style={styles.commitFailureLaunchError}>{action.launchError}</Text>
-      ) : null}
+      <AgentLaunchNotice
+        availability={action.availability}
+        success={action.launchSuccess}
+        error={action.launchError}
+        warning={action.launchWarning}
+        undeliveredPrompt={action.undeliveredPrompt}
+        errorStyle={styles.commitFailureLaunchError}
+      />
     </View>
   )
 }
diff --git a/mobile/src/source-control/MobileSourceControlPanel.tsx b/mobile/src/source-control/MobileSourceControlPanel.tsx
index c223510184e4..f63885ac7c59 100644
--- a/mobile/src/source-control/MobileSourceControlPanel.tsx
+++ b/mobile/src/source-control/MobileSourceControlPanel.tsx
@@ -328,6 +328,7 @@ export function MobileSourceControlPanel({
             // Gate on the probe too: isGithubRepo=false mid-probe must render loading, not flash "unavailable".
             branchContextLoaded={ready && prController.prSidebarRepoProbeLoaded}
             controller={prController}
+            workspaceLabel={worktreeLabel}
           />
         </View>
       ) : activeTab === 'pr' ? (
diff --git a/mobile/src/source-control/mobile-pr-create.test.ts b/mobile/src/source-control/mobile-pr-create.test.ts
index d52f4861fd40..4935d514f366 100644
--- a/mobile/src/source-control/mobile-pr-create.test.ts
+++ b/mobile/src/source-control/mobile-pr-create.test.ts
@@ -158,32 +158,6 @@ describe('mobile create form gating parity', () => {
     )
   })
 
-  it('desktop gate hard-blocks on positive unresolved review evidence', () => {
-    // Mobile lacks review-lookup signals, so it fails closed on ambiguity: the
-    // shared desktop gate must return false even when eligibility looks ready.
-    expect(
-      shouldOpenChecksPanelCreateComposer({
-        activeReview: null,
-        isFolder: false,
-        branch: 'feature/x',
-        hostedReviewCreation: eligibility({ canCreate: true }),
-        reviewLookup: 'positive_unresolved'
-      })
-    ).toBe(false)
-  })
-
-  it('desktop gate hard-blocks during a hard refresh error', () => {
-    expect(
-      shouldOpenChecksPanelCreateComposer({
-        activeReview: null,
-        isFolder: false,
-        branch: 'feature/x',
-        hostedReviewCreation: eligibility({ canCreate: true }),
-        hasHardRefreshError: true
-      })
-    ).toBe(false)
-  })
-
   it('fails closed on an unavailable review lookup even when eligibility looks ready', () => {
     // The existing-review lookup could not prove there is no PR; mobile has no
     // review-lookup signal of its own, so create must be blocked.
diff --git a/mobile/src/source-control/source-control-router-seam-census.test.ts b/mobile/src/source-control/source-control-router-seam-census.test.ts
deleted file mode 100644
index e34d4ad93d87..000000000000
--- a/mobile/src/source-control/source-control-router-seam-census.test.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  callsRouteHandoff,
-  importsExpoRouterValue,
-  parse,
-  productFiles
-} from '../navigation/router-seam-census.test-support'
-
-const SOURCE_CONTROL_ROOT = import.meta.dirname
-
-/**
- * Which modules here hold a router, so the census cannot pass by seeing nothing.
- *
- * One holder, not one per screen: the hub's router is taken once in the openers hook and passed
- * down through the state hook to the runners and the panel. So this domain's whole reach into the
- * router is that single call, and the rules below say so rather than counting screens.
- *
- * `use-mobile-source-control-runners.ts` is the case a value/type rule is written for: it named
- * expo-router only to write `ReturnType<typeof useRouter>`, which is a value import in a type
- * position and keeps the module in the graph. `RouteHandoff` is the seam's own name for that type.
- */
-const ROUTER_HOLDERS = ['use-mobile-source-control-openers.ts']
-
-describe('the source-control domain reaches the router through the handoff seam', () => {
-  const files = productFiles(SOURCE_CONTROL_ROOT)
-
-  it('walks the modules it is written against', () => {
-    expect(files).toEqual(expect.arrayContaining(ROUTER_HOLDERS))
-    expect(files).toContain('use-mobile-source-control-runners.ts')
-    expect(files).toContain('MobileSourceControlPanel.tsx')
-  })
-
-  it('imports no router from expo-router, which the page cannot hand a route back through', () => {
-    expect(
-      files.filter((name) => importsExpoRouterValue(parse(SOURCE_CONTROL_ROOT, name)))
-    ).toEqual([])
-  })
-
-  it('takes the router from useRouteHandoff at every screen that holds one', () => {
-    expect(
-      files.filter((name) => callsRouteHandoff(parse(SOURCE_CONTROL_ROOT, name))).sort()
-    ).toEqual([...ROUTER_HOLDERS].sort())
-  })
-})
diff --git a/mobile/src/source-control/use-mobile-commit-failure-recovery.test.ts b/mobile/src/source-control/use-mobile-commit-failure-recovery.test.ts
new file mode 100644
index 000000000000..157a87b7448d
--- /dev/null
+++ b/mobile/src/source-control/use-mobile-commit-failure-recovery.test.ts
@@ -0,0 +1,124 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { RpcClient } from '../transport/rpc-client'
+import type { RpcResponse } from '../transport/types'
+import type { MobileCommitFailureRecovery } from './mobile-commit-failure-recovery'
+
+vi.mock('../platform/haptics', () => ({ triggerError: vi.fn(), triggerSuccess: vi.fn() }))
+vi.mock('../components/HostProtocolGate', () => ({
+  useHostProtocolGates: () => ({
+    hostCapabilities: [
+      'agent.launch.v2',
+      'agent.launch.replay.v1',
+      'agent.launch.replay-required.v1'
+    ],
+    statusPending: false,
+    statusReadable: true
+  })
+}))
+
+import { useMobileCommitFailureRecovery } from './use-mobile-commit-failure-recovery'
+
+type Recovery = ReturnType<typeof useMobileCommitFailureRecovery>
+
+function rpcReply(result: unknown): RpcResponse {
+  return { id: 'rpc', ok: true, result, _meta: { runtimeId: 'r' } }
+}
+
+const LAUNCHED_WITH_WARNING = rpcReply({
+  outcome: { kind: 'terminal', handle: 'term-1' },
+  worktreeId: 'wt-1',
+  receipt: { mode: 'terminal', preferred: 'terminal', reason: 'user_default', detail: 'd' },
+  prompt: { delivery: 'submit', outcome: 'handed-to-terminal' },
+  warning: 'the requested arguments were ignored.'
+})
+
+function hostClient(launchReply: () => Promise<RpcResponse>) {
+  const sendRequest = vi.fn(async (method: string): Promise<RpcResponse> => {
+    if (method === 'repo.list') {
+      return rpcReply({ repos: [{ id: 'wt-1' }] })
+    }
+    if (method === 'settings.get') {
+      return rpcReply({ settings: { defaultTuiAgent: 'codex' } })
+    }
+    if (method === 'preflight.detectAgents') {
+      return rpcReply(['codex'])
+    }
+    return launchReply()
+  })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the hook reaches the client only through sendRequest.
+  return { client: { sendRequest } as unknown as RpcClient, sendRequest }
+}
+
+const FAILURE: MobileCommitFailureRecovery = {
+  error: 'pre-commit hook failed',
+  commitMessage: 'wip',
+  stagedEntries: []
+}
+
+describe('useMobileCommitFailureRecovery', () => {
+  let renderer: ReactTestRenderer | null = null
+  let recovery: Recovery | null = null
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+    recovery = null
+  })
+
+  function mount(client: RpcClient, failure: MobileCommitFailureRecovery | null = FAILURE) {
+    function Harness(props: { failure: MobileCommitFailureRecovery | null }): null {
+      recovery = useMobileCommitFailureRecovery({
+        client,
+        connState: 'connected',
+        worktreeId: 'wt-1',
+        workspaceLabel: 'feature-login',
+        failure: props.failure
+      })
+      return null
+    }
+    act(() => {
+      renderer = create(createElement(Harness, { failure }))
+    })
+    return (next: MobileCommitFailureRecovery | null) =>
+      act(() => renderer?.update(createElement(Harness, { failure: next })))
+  }
+
+  it('reports the host warning on a launch that went ahead as a warning, not an error', async () => {
+    const rerender = mount(hostClient(async () => LAUNCHED_WITH_WARNING).client)
+    let succeeded: boolean | undefined
+    await act(async () => {
+      succeeded = await recovery?.launch()
+    })
+    expect(succeeded).toBe(true)
+    expect(recovery?.launchError).toBeNull()
+    expect(recovery?.launchWarning).toBe('the requested arguments were ignored.')
+    expect(recovery?.launchSuccess).toBe('Agent started in feature-login')
+    // A new failure is a new launch; the old one's note does not carry over.
+    rerender({ ...FAILURE, error: 'another hook failed' })
+    expect(recovery?.launchWarning).toBeNull()
+    expect(recovery?.launchSuccess).toBeNull()
+  })
+
+  it('starts one agent for two taps before the first one re-renders', async () => {
+    let release: () => void = () => {}
+    const answered = new Promise<void>((resolve) => (release = resolve))
+    const { client, sendRequest } = hostClient(async () => {
+      await answered
+      return LAUNCHED_WITH_WARNING
+    })
+    mount(client)
+    const launch = recovery?.launch
+    let taps: boolean[] = []
+    await act(async () => {
+      const both = Promise.all([launch?.(), launch?.()])
+      release()
+      taps = (await both).map(Boolean)
+    })
+    expect(taps).toEqual([true, false])
+    expect(
+      sendRequest.mock.calls.filter(([method]) => method === 'agent.launchReplay')
+    ).toHaveLength(1)
+  })
+})
diff --git a/mobile/src/source-control/use-mobile-commit-failure-recovery.ts b/mobile/src/source-control/use-mobile-commit-failure-recovery.ts
index a2332fbca514..fb19f7495ee2 100644
--- a/mobile/src/source-control/use-mobile-commit-failure-recovery.ts
+++ b/mobile/src/source-control/use-mobile-commit-failure-recovery.ts
@@ -1,8 +1,10 @@
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import type { ConnectionState } from '../transport/types'
 import type { RpcClient } from '../transport/rpc-client'
 import { triggerError, triggerSuccess } from '../platform/haptics'
-import { createTerminalAndSendPrompt } from '../session/pr-ai-triage-launch'
+import { useHostProtocolGates } from '../components/HostProtocolGate'
+import { launchAgentWithPrompt, promptedLaunchNotice } from '../session/pr-ai-triage-launch'
+import { resolveMobileAgentLaunchAvailability } from '../session/mobile-agent-launch-availability'
 import {
   buildFixCommitFailurePrompt,
   type MobileCommitFailureRecovery,
@@ -14,13 +16,45 @@ type Params = {
   client: RpcClient | null
   connState: ConnectionState
   worktreeId: string
+  /** Named in the confirmation; the screen's workspace label, else its branch. */
+  workspaceLabel: string | null
   failure: MobileCommitFailureRecovery | null
 }
 
-export function useMobileCommitFailureRecovery({ client, connState, worktreeId, failure }: Params) {
+export function useMobileCommitFailureRecovery({
+  client,
+  connState,
+  worktreeId,
+  workspaceLabel,
+  failure
+}: Params) {
+  const hostStatus = useHostProtocolGates()
+  const { hostCapabilities } = hostStatus
   const [launching, setLaunching] = useState(false)
+  // `launching` commits on the next render; each tap is a new operation, so a second one in that gap
+  // would start a second agent.
+  const inFlightRef = useRef(false)
   const [launchError, setLaunchError] = useState<string | null>(null)
+  // The agent started without its prompt; kept so the user can paste it in themselves. Keyed by the
+  // failure it was built for, so a new failure never shows the previous one's prompt.
+  const [undelivered, setUndelivered] = useState<{
+    failure: MobileCommitFailureRecovery
+    prompt: string
+  } | null>(null)
+  const undeliveredPrompt = undelivered?.failure === failure ? undelivered.prompt : null
+  // The host's note on a launch that went ahead, keyed the same way.
+  const [warning, setWarning] = useState<{
+    failure: MobileCommitFailureRecovery
+    text: string
+  } | null>(null)
+  const launchWarning = warning?.failure === failure ? warning.text : null
+  const [success, setSuccess] = useState<{
+    failure: MobileCommitFailureRecovery
+    text: string
+  } | null>(null)
+  const launchSuccess = success?.failure === failure ? success.text : null
   const summary = useMemo(() => (failure ? summarizeCommitFailure(failure.error) : null), [failure])
+  const availability = resolveMobileAgentLaunchAvailability(hostStatus)
 
   useEffect(() => {
     setLaunchError(null)
@@ -45,7 +79,7 @@ export function useMobileCommitFailureRecovery({ client, connState, worktreeId,
   )
 
   const launch = useCallback(async (): Promise<boolean> => {
-    if (launching || !prompt) {
+    if (inFlightRef.current || launching || !prompt) {
       return false
     }
     if (!client || connState !== 'connected') {
@@ -53,26 +87,53 @@ export function useMobileCommitFailureRecovery({ client, connState, worktreeId,
       triggerError()
       return false
     }
+    inFlightRef.current = true
     setLaunching(true)
     setLaunchError(null)
+    setWarning(null)
+    setSuccess(null)
+    setUndelivered(null)
     try {
-      await createTerminalAndSendPrompt(client, worktreeId, prompt)
-      triggerSuccess()
-      return true
+      const result = await launchAgentWithPrompt({
+        client,
+        hostCapabilities,
+        worktreeId,
+        prompt,
+        actionId: 'fixCommitFailure',
+        launchSource: 'source_control_recovery'
+      })
+      const notice = promptedLaunchNotice(result, workspaceLabel)
+      if (notice.succeeded) {
+        triggerSuccess()
+      } else {
+        triggerError()
+      }
+      setLaunchError(notice.error)
+      setWarning(failure && notice.warning ? { failure, text: notice.warning } : null)
+      setSuccess(failure && notice.success ? { failure, text: notice.success } : null)
+      setUndelivered(
+        failure && notice.undeliveredPrompt ? { failure, prompt: notice.undeliveredPrompt } : null
+      )
+      return notice.succeeded
     } catch (err) {
       triggerError()
       setLaunchError(err instanceof Error ? err.message : 'Failed to launch agent')
       return false
     } finally {
+      inFlightRef.current = false
       setLaunching(false)
     }
-  }, [client, connState, launching, prompt, worktreeId])
+  }, [client, connState, failure, hostCapabilities, launching, prompt, workspaceLabel, worktreeId])
 
   return {
     summary,
     hasDetails,
     launching,
+    availability,
     launchError,
+    launchWarning,
+    launchSuccess,
+    undeliveredPrompt,
     launch
   }
 }
diff --git a/mobile/src/source-control/use-mobile-source-control-commit-failure.ts b/mobile/src/source-control/use-mobile-source-control-commit-failure.ts
index 32b92f248546..bde245667cf3 100644
--- a/mobile/src/source-control/use-mobile-source-control-commit-failure.ts
+++ b/mobile/src/source-control/use-mobile-source-control-commit-failure.ts
@@ -11,9 +11,15 @@ type Params = {
   client: RpcClient | null
   connState: ConnectionState
   worktreeId: string
+  worktreeLabel: string | null
 }
 
-export function useMobileSourceControlCommitFailure({ client, connState, worktreeId }: Params): {
+export function useMobileSourceControlCommitFailure({
+  client,
+  connState,
+  worktreeId,
+  worktreeLabel
+}: Params): {
   commitFailureRecovery: MobileCommitFailureRecovery | null
   commitFailureRecoveryAction: ReturnType<typeof useMobileCommitFailureRecovery>
   recordCommitFailure: RecordMobileCommitFailure
@@ -25,6 +31,7 @@ export function useMobileSourceControlCommitFailure({ client, connState, worktre
     client,
     connState,
     worktreeId,
+    workspaceLabel: worktreeLabel,
     failure: commitFailureRecovery
   })
   return { commitFailureRecovery, commitFailureRecoveryAction, recordCommitFailure }
diff --git a/mobile/src/source-control/use-mobile-source-control-state.ts b/mobile/src/source-control/use-mobile-source-control-state.ts
index 1f541739d9a4..1e55dfe79efd 100644
--- a/mobile/src/source-control/use-mobile-source-control-state.ts
+++ b/mobile/src/source-control/use-mobile-source-control-state.ts
@@ -78,7 +78,7 @@ export function useMobileSourceControlState(params: MobileSourceControlStatePara
   const worktreeLabel = getWorktreeLabel(name, worktreeId)
   const statusIdentityKey = `${hostId}\0${worktreeId}`
   const { commitFailureRecovery, commitFailureRecoveryAction, recordCommitFailure } =
-    useMobileSourceControlCommitFailure({ client, connState, worktreeId })
+    useMobileSourceControlCommitFailure({ client, connState, worktreeId, worktreeLabel })
   const clearCommitFailureRecovery = useCallback(() => {
     recordCommitFailure(null)
   }, [recordCommitFailure])
diff --git a/mobile/src/storage/app-update-preferences.test.ts b/mobile/src/storage/app-update-preferences.test.ts
new file mode 100644
index 000000000000..dbd7ba4215d7
--- /dev/null
+++ b/mobile/src/storage/app-update-preferences.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, it, vi } from 'vitest'
+import { loadAppUpdatePreferences } from './app-update-preferences'
+
+const stored = new Map<string, string>()
+vi.mock('@react-native-async-storage/async-storage', () => ({
+  default: {
+    multiGet: async (keys: string[]) => keys.map((key) => [key, stored.get(key) ?? null])
+  }
+}))
+
+describe('loadAppUpdatePreferences', () => {
+  it('drops only a corrupt update record, keeping the check time and dismissal beside it', async () => {
+    stored.set('orca:appUpdate:lastCheckedAt', '1700000000000')
+    stored.set('orca:appUpdate:latest', '{not json')
+    stored.set('orca:appUpdate:dismissedVersion', '0.0.51')
+    await expect(loadAppUpdatePreferences()).resolves.toEqual({
+      lastCheckedAt: 1700000000000,
+      latest: null,
+      dismissedVersion: '0.0.51'
+    })
+  })
+
+  it('reads a well-formed update record', async () => {
+    stored.set(
+      'orca:appUpdate:latest',
+      JSON.stringify({ version: '0.0.52', url: 'https://x.test' })
+    )
+    await expect(loadAppUpdatePreferences()).resolves.toMatchObject({
+      latest: { version: '0.0.52', url: 'https://x.test' }
+    })
+  })
+})
diff --git a/mobile/src/storage/app-update-preferences.ts b/mobile/src/storage/app-update-preferences.ts
new file mode 100644
index 000000000000..51e199a68b1e
--- /dev/null
+++ b/mobile/src/storage/app-update-preferences.ts
@@ -0,0 +1,64 @@
+import AsyncStorage from '@react-native-async-storage/async-storage'
+import { z } from 'zod'
+
+const LAST_CHECKED_AT_KEY = 'orca:appUpdate:lastCheckedAt'
+const LATEST_KEY = 'orca:appUpdate:latest'
+const DISMISSED_VERSION_KEY = 'orca:appUpdate:dismissedVersion'
+
+export type KnownAppUpdate = { readonly version: string; readonly url: string }
+
+export type AppUpdatePreferences = {
+  /** Last successful check; failures never move it. */
+  readonly lastCheckedAt: number | null
+  /** Newest installable release that check saw, or null when it saw none. */
+  readonly latest: KnownAppUpdate | null
+  readonly dismissedVersion: string | null
+}
+
+export const EMPTY_APP_UPDATE_PREFERENCES: AppUpdatePreferences = {
+  lastCheckedAt: null,
+  latest: null,
+  dismissedVersion: null
+}
+
+const knownAppUpdateSchema = z.object({ version: z.string(), url: z.string() })
+
+// A corrupt record loses only itself, never the check time or the dismissal stored beside it.
+function parseLatest(raw: string | null): KnownAppUpdate | null {
+  try {
+    const parsed = raw ? knownAppUpdateSchema.safeParse(JSON.parse(raw)) : null
+    return parsed?.success ? parsed.data : null
+  } catch {
+    return null
+  }
+}
+
+export async function loadAppUpdatePreferences(): Promise<AppUpdatePreferences> {
+  try {
+    const [[, checkedAt], [, latest], [, dismissed]] = await AsyncStorage.multiGet([
+      LAST_CHECKED_AT_KEY,
+      LATEST_KEY,
+      DISMISSED_VERSION_KEY
+    ])
+    const lastCheckedAt = checkedAt === null ? null : Number(checkedAt)
+    return {
+      lastCheckedAt:
+        lastCheckedAt !== null && Number.isFinite(lastCheckedAt) ? lastCheckedAt : null,
+      latest: parseLatest(latest),
+      dismissedVersion: dismissed
+    }
+  } catch {
+    return EMPTY_APP_UPDATE_PREFERENCES
+  }
+}
+
+export async function saveAppUpdateCheck(checkedAt: number, latest: KnownAppUpdate | null) {
+  await AsyncStorage.multiSet([
+    [LAST_CHECKED_AT_KEY, String(checkedAt)],
+    [LATEST_KEY, latest ? JSON.stringify(latest) : '']
+  ])
+}
+
+export async function saveDismissedAppUpdateVersion(version: string): Promise<void> {
+  await AsyncStorage.setItem(DISMISSED_VERSION_KEY, version)
+}
diff --git a/mobile/src/tasks/agent-launch-worktree-create.test.ts b/mobile/src/tasks/agent-launch-request.test.ts
similarity index 98%
rename from mobile/src/tasks/agent-launch-worktree-create.test.ts
rename to mobile/src/tasks/agent-launch-request.test.ts
index ada5becd4cae..b9b25f17757e 100644
--- a/mobile/src/tasks/agent-launch-worktree-create.test.ts
+++ b/mobile/src/tasks/agent-launch-request.test.ts
@@ -3,7 +3,7 @@ import {
   agentLaunchCreateParams,
   isAgentLaunchUnsupportedRefusal,
   readAgentLaunchCreateOutcome
-} from './agent-launch-worktree-create'
+} from './agent-launch-request'
 
 describe('agentLaunchCreateParams', () => {
   it('carries the create payload verbatim minus the reserved agent fields', () => {
diff --git a/mobile/src/tasks/agent-launch-worktree-create.ts b/mobile/src/tasks/agent-launch-request.ts
similarity index 68%
rename from mobile/src/tasks/agent-launch-worktree-create.ts
rename to mobile/src/tasks/agent-launch-request.ts
index 3348d471ce13..ddd0d85383e0 100644
--- a/mobile/src/tasks/agent-launch-worktree-create.ts
+++ b/mobile/src/tasks/agent-launch-request.ts
@@ -1,5 +1,9 @@
 /**
- * Issuing a mobile workspace create through `agent.launch` rather than `worktree.create`.
+ * Building mobile's `agent.launch` requests and reading their answers: a workspace create, and a
+ * launch into a workspace that already exists.
+ *
+ * The create half issues a mobile workspace create through `agent.launch` rather than
+ * `worktree.create`.
  *
  * `worktree.create` + `startupAgent` means "create the worktree agent-first": its startup terminal
  * IS the agent, so the structured branch below it is unreachable. That is why picking an agent on
@@ -14,8 +18,13 @@
 
 import {
   withoutReservedAgentCreateFields,
+  type AgentLaunchPrompt,
   type AgentLaunchResult
 } from '../../../src/shared/agent-launch-intent'
+import {
+  AGENT_LAUNCH_REPLAY_REQUIRED_RUNTIME_CAPABILITY,
+  AGENT_LAUNCH_RUNTIME_CAPABILITY
+} from '../../../src/shared/protocol-version'
 import type { TuiAgent } from '../../../src/shared/tui-agent'
 import type { RpcSendParams } from '../transport/rpc-params-contract'
 import type { WorkspaceCreateParams } from './workspace-create-params'
@@ -27,6 +36,16 @@ export type AgentLaunchSupport = {
   replay: boolean
 }
 
+/** Reads the host's advertised capabilities; unsupported stays plain `false`. */
+export function readAgentLaunchSupport(
+  capabilities: readonly string[] | null | undefined
+): AgentLaunchSupport | false {
+  if (!capabilities?.includes(AGENT_LAUNCH_RUNTIME_CAPABILITY)) {
+    return false
+  }
+  return { replay: capabilities.includes(AGENT_LAUNCH_REPLAY_REQUIRED_RUNTIME_CAPABILITY) }
+}
+
 export type WorktreeCreateAgentLaunch = {
   agent: TuiAgent
   /** Resolved before the first create: an older host has no `agent.launch` at all. */
@@ -52,6 +71,27 @@ export function agentLaunchCreateParams(
   }
 }
 
+/**
+ * A launch into a workspace that already exists. Always sent as `agent.launchReplay`: a host that
+ * predates `operationId` would strip it and run the launch unprotected, while the separate method
+ * makes such a host refuse instead.
+ */
+export function agentLaunchExistingParams(args: {
+  agent: TuiAgent
+  worktreeId: string
+  operationId: string
+  prompt?: AgentLaunchPrompt
+  launchSource?: string
+}): RpcSendParams<'agent.launchReplay'> {
+  return {
+    agent: args.agent,
+    operationId: args.operationId,
+    target: { kind: 'existing', worktree: `id:${args.worktreeId}` },
+    ...(args.prompt ? { prompt: args.prompt } : {}),
+    ...(args.launchSource ? { launchSource: args.launchSource } : {})
+  }
+}
+
 /**
  * Reads the launch receipt.
  *
@@ -97,3 +137,12 @@ export function isAgentLaunchUnsupportedRefusal(error: {
   }
   return (error.message ?? '').includes('agent_launch_unsupported')
 }
+
+/** The `agent.launchReplay` twin: an older host rejects the method rather than a field. */
+export function isAgentLaunchReplayUnsupportedRefusal(error: { code?: string }): boolean {
+  return (
+    error.code === 'method_not_found' ||
+    error.code === 'forbidden' ||
+    error.code === 'agent_launch_replay_unsupported'
+  )
+}
diff --git a/mobile/src/tasks/blank-workspace-create.ts b/mobile/src/tasks/blank-workspace-create.ts
index af59df31822d..0bdd056533ea 100644
--- a/mobile/src/tasks/blank-workspace-create.ts
+++ b/mobile/src/tasks/blank-workspace-create.ts
@@ -1,7 +1,7 @@
 import type { TuiAgent } from '../../../src/shared/tui-agent'
 import type { RpcClient } from '../transport/rpc-client'
 import { createWorktreeWithNameRetry, type WorktreeCreateResult } from './worktree-create-retry'
-import type { WorktreeCreateAgentLaunch } from './agent-launch-worktree-create'
+import type { WorktreeCreateAgentLaunch } from './agent-launch-request'
 import type { WorktreeCreateIdempotencyProbe } from './worktree-create-idempotency-policy'
 import {
   startupAgentCreateFields,
diff --git a/mobile/src/tasks/mobile-tasks-chrome-styles.ts b/mobile/src/tasks/mobile-tasks-chrome-styles.ts
index 76601c4f7257..3b0c3f2d6e2c 100644
--- a/mobile/src/tasks/mobile-tasks-chrome-styles.ts
+++ b/mobile/src/tasks/mobile-tasks-chrome-styles.ts
@@ -28,6 +28,7 @@ export const mobileTasksChromeStyles = StyleSheet.create({
     flex: 1,
     flexDirection: 'row',
     alignItems: 'center',
+    gap: spacing.sm,
     minWidth: 0
   },
   title: {
diff --git a/mobile/src/tasks/mobile-tasks-refactor-parity.test.ts b/mobile/src/tasks/mobile-tasks-refactor-parity.test.ts
deleted file mode 100644
index 3ba14c571d65..000000000000
--- a/mobile/src/tasks/mobile-tasks-refactor-parity.test.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-import { createHash } from 'node:crypto'
-import { describe, expect, it } from 'vitest'
-import {
-  readFlattenedMobileTasksHookSignatures,
-  readMobileTasksSemanticSource,
-  readMobileTasksStyleSource
-} from './mobile-tasks-source-family.test-support'
-import { readFlattenedMobileTasksRenderTokens } from './mobile-tasks-render-parity.test-support'
-import {
-  readFlattenedMobileTasksCoreStatements,
-  readMobileTasksDeclarationSignatures
-} from './mobile-tasks-execution-parity.test-support'
-
-const hash = (parts: string[] | string): string =>
-  createHash('sha256')
-    .update(Array.isArray(parts) ? parts.join('\n') : parts)
-    .digest('hex')
-
-// Bound requests change source signatures the same way bound provider, workspace-creation and
-// settings requests did: the method string and the envelope read leave the screen and an operation
-// name arrives. The behaviour they used to pin is pinned by the recordings in
-// mobile/rpc-foundation/goldens instead, which did not move.
-//
-// The screen-holdout migration takes the last two sends out of this family — the filter sheet's
-// linear.selectWorkspace and the screen-root hook's repo.list. Hook, statement, declaration, render
-// and style counts are all unchanged, and `semantics` is a pure deletion of four lines, none in:
-// two `rpc:` call signatures and the two method literals they carried. The render-token hash moves
-// because the picker's handler now names an operation instead of the client.
-//
-// Step 7's first half moves four of the six again, and moves nothing else. Checked readers on the
-// item and list operations delete the reply casts these consumers carried, plus the three shape
-// tests the reader now answers for: both `Array.isArray(payload)` guards on the checks read and the
-// `typeof count === 'number'` fallback on the item count. Hook, statement, declaration and render
-// counts are unchanged, and the render-token hash does not move at all — nothing this family sees
-// changed inside a JSX tree. `semantics` is a pure deletion of ten lines.
-//
-// Round-1 review moves four, and names what each one is. The reaction reader stops matching
-// `content` against an arm set mobile invented and forwards it, so `DetailComment` loses the eight
-// phantom arms and `COMMENT_REACTION_EMOJI` stops being keyed by them: that is ten string literals
-// gone and the `?? ''` fallback's one added, the whole of `semantics`' 3,290 -> 3,281. The eight
-// alias-only bindings the deleted casts left behind (`const result = created` and its seven
-// siblings) are inlined, which moves the hook and statement hashes without moving their counts.
-// Only those eight: the Linear arm of task creation keeps its own `result`, which is a declaration
-// with a name rather than an alias for one.
-// No `rpc:` signature and no `jsx:` signature moves, the render-token hash does not move, and
-// counts stay at 350 hooks, 417 statements and 194 declarations.
-//
-// The `gitlab.todos` fixture correction moves the same three hashes once more and no others: the
-// to-do row is checked now, so the reader's cast is gone from the list-loading hook and the row
-// type it forwarded is declared by what the reader proves. Counts are unchanged again, and
-// `semantics` does not move, because no RPC call, runtime string or JSX host signature does.
-//
-// Round 2 moves two, and only because one member widens. `GitHubDetailFile.viewerViewedState` is
-// `string` rather than the host's three arms, because the reader forwards it now: that is the
-// declaration hash and the three arm literals, `semantics` 3,281 -> 3,278. `status` keeps its arms
-// and moves nothing, because its only consumer sends it back as a param the host validates against
-// the same set. Hook, statement and render hashes do not move; nothing executable changed.
-//
-// Step 7's tasks-2 half moves the hook, statement, declaration and semantic hashes once more, for
-// the board, runtime, search, workspace-source and workspace-create operations, and moves no count:
-// hooks stay at 350, statements at 417, declarations at 194. `semantics` is a pure deletion of four
-// lines, 3,278 -> 3,274, and all four are the literals inside the one inline cast type this half
-// deletes in use-mobile-tasks-project-detail-loading.tsx — `'DISMISSED'`, `'VIEWED'`, `'UNVIEWED'`
-// and the `['status']` index into GitHubDetailFile. No method literal and no `rpc:` call signature
-// moves.
-//
-// The hook and statement hashes also move for comment text alone: `normalized` reads a statement's
-// full span, so a comment nested inside one is hashed with it. They move once more when the two
-// halves are deduplicated: the project pane's five collection casts and the assignee list's are
-// deleted where the entity schemas from the item half now type those rows.
-//
-// Round 2 of tasks-2 moves the hook and statement hashes a last time, and only those two. One
-// statement changes: the Linear list cast (`found as LinearIssue[]`) becomes `found`, because the
-// nine members linearIssueRowSchema requires make the value assignable to the mobile alias without
-// it. The rest is comment text nested inside statements — three `SAFETY:` lines rewritten to argue
-// from the schemas that landed instead of the fixtures round 1 deleted. Counts are unchanged at 350
-// hooks and 417 statements; the declaration, semantic, render and style hashes do not move, which
-// is the evidence that deleting the cast changed no type and no call.
-//
-// The pullfrog pass on the same round moved both once more, again by comment text alone: the
-// GitHub search `SAFETY:` line now separates the two members the schema requires (`items`,
-// `labels`) from the eight it only types. No statement, type or call changed; counts hold.
-// C2.1 swaps the workspace-creation push onto `hostNewWorktreeSessionRoute`, which already built
-// this href with both segments encoded. Three of the family move and nothing else does: the hook
-// list, because the handler's statements changed shape; the statement hash, for the same reason;
-// and `semantics`, which is a pure deletion of two lines — the `URLSearchParams` construction and
-// the raw `/h/${hostId}/session/...` template it fed. No RPC call, method literal or JSX host
-// signature changed, and the render and style hashes did not move.
-
-// C2.1 swaps the two clipboard writes onto the platform seam, so the comment-review hook gains one
-// hook call and one statement. Two of the family move: the hook list and the statement hash, each
-// by one entry. `semantics` does not — no RPC call, method literal or JSX host signature changed —
-// and the render and style hashes hold.
-
-// C2.8 names the status bar's Back control for the shell, which has no native chrome behind it to
-// announce one. `accessibilityRole="button"` and `accessibilityLabel="Back"` on that one Pressable
-// move the two hashes a JSX prop must move, and only those two. `semantics` 3,272 -> 3,274: the
-// element's host signature widens (`jsx:Pressable:style,onPress` -> the same plus the two props)
-// and the two new runtime strings `"button"` and `"Back"` arrive. The render-token stream gains
-// the eight tokens those two attributes are, 35,195 -> 35,203. No RPC call signature and no method
-// literal moves, and the hook, statement, declaration and style hashes do not move at all, which
-// is the evidence that nothing executable changed.
-//
-// The same commit gives that control the `hitSlop={8}` its four siblings carry, so its touch
-// target is no longer the glyph alone. One more line of `semantics` changes and no line is added
-// or removed — the host signature gains `hitSlop` — so the count holds at 3,274 and only the hash
-// moves. The render-token stream gains the four tokens that one attribute is, 35,203 -> 35,207.
-// Nothing else in the family moves.
-
-const SCREEN_RPC_SCREEN_HOOKS = '0f66df2141117dfec2f8a0adb3f598312e6fda8e80833a365a645796f5ab48c3'
-const PRE_REFACTOR_DIFF_HOOKS = '93c7189b32bed8456cc51814fffa8ce80cf62011ef968a9d53ddec2b9686f58f'
-const SCREEN_RPC_STATEMENTS = 'dd8f33cb3cf96f5c39abac397cb77e35f59079291033a1866ead462b041ab979'
-// Saved Linear selections now accept unknown persisted values; reconciliation tests cover them.
-const MAIN_REBASED_DECLARATIONS = 'ec77d34712c7c4ab19ac6a4d57878f32d22aba790d2420cc14c2c0f000d120e9'
-const SCREEN_RPC_SEMANTICS = 'e07a63387d57106483ee703ec6c19dea593e0eca5c651758f42bcb36254850b7'
-const PRE_REFACTOR_STYLES = '1db6af69c791d9963928541ad5310942fcbda6d984b422c90b6eb92b6816579a'
-const SCREEN_RPC_RENDER_TREE = '086742f95f1e87fb89d8c67ffd9f7a229799ae05115f9f4bcc1a925e56dcc8bb'
-
-describe('Mobile Tasks refactor parity', () => {
-  it('preserves recursively flattened hook and dependency order', () => {
-    const screenHooks = readFlattenedMobileTasksHookSignatures('MobileTasksScreen')
-    expect(screenHooks).toHaveLength(351)
-    expect(hash(screenHooks)).toBe(SCREEN_RPC_SCREEN_HOOKS)
-
-    const diffHooks = readFlattenedMobileTasksHookSignatures('GitHubPrFileDiff')
-    expect(diffHooks).toHaveLength(3)
-    expect(hash(diffHooks)).toBe(PRE_REFACTOR_DIFF_HOOKS)
-  })
-
-  it('preserves every screen statement in execution order', () => {
-    const statements = readFlattenedMobileTasksCoreStatements()
-    expect(statements).toHaveLength(418)
-    expect(hash(statements)).toBe(SCREEN_RPC_STATEMENTS)
-  })
-
-  it('preserves every moved top-level declaration', () => {
-    const declarations = readMobileTasksDeclarationSignatures()
-    expect(declarations).toHaveLength(194)
-    expect(hash(declarations)).toBe(MAIN_REBASED_DECLARATIONS)
-  })
-
-  it('preserves RPC calls, runtime strings, and JSX host signatures', () => {
-    const semantics = readMobileTasksSemanticSource()
-    expect(semantics.split('\n')).toHaveLength(3_274)
-    expect(hash(semantics)).toBe(SCREEN_RPC_SEMANTICS)
-  })
-
-  it('preserves render expressions and event handlers in tree order', () => {
-    const tokens = readFlattenedMobileTasksRenderTokens()
-    expect(tokens).toHaveLength(35_207)
-    expect(hash(tokens)).toBe(SCREEN_RPC_RENDER_TREE)
-  })
-
-  it('preserves every StyleSheet property and value', () => {
-    expect(hash(readMobileTasksStyleSource())).toBe(PRE_REFACTOR_STYLES)
-  })
-})
diff --git a/mobile/src/tasks/mobile-tui-agents.ts b/mobile/src/tasks/mobile-tui-agents.ts
index 46d8dd00886e..3b601ec2f682 100644
--- a/mobile/src/tasks/mobile-tui-agents.ts
+++ b/mobile/src/tasks/mobile-tui-agents.ts
@@ -15,6 +15,7 @@ export const MOBILE_TUI_AGENT_LABELS: Record<TuiAgent, string> = TUI_AGENT_DISPL
 
 export const MOBILE_TUI_AGENT_FAVICON_DOMAINS: Partial<Record<TuiAgent, string>> = {
   openclaude: 'openclaude.gitlawb.com',
+  codebuddy: 'codebuddy.ai',
   grok: 'x.ai',
   copilot: 'github.com',
   opencode: 'opencode.ai',
@@ -22,9 +23,11 @@ export const MOBILE_TUI_AGENT_FAVICON_DOMAINS: Partial<Record<TuiAgent, string>>
   ante: 'antigma.ai',
   trae: 'www.trae.cn',
   muse: 'dev.meta.ai',
+  dsh: 'deepseek.com',
   zcode: 'zcode.z.ai',
   omp: 'omp.sh',
   'prime-agent': 'primeintellect.ai',
+  qoder: 'qoder.com',
   gemini: 'gemini.google.com',
   antigravity: 'antigravity.google',
   goose: 'goose-docs.ai',
@@ -36,6 +39,7 @@ export const MOBILE_TUI_AGENT_FAVICON_DOMAINS: Partial<Record<TuiAgent, string>>
   autohand: 'autohand.ai',
   cline: 'cline.bot',
   codebuff: 'codebuff.com',
+  freebuff: 'freebuff.com',
   'command-code': 'commandcode.ai',
   continue: 'continue.dev',
   cursor: 'cursor.com',
diff --git a/mobile/src/tasks/replay-on-ambiguous-delivery.ts b/mobile/src/tasks/replay-on-ambiguous-delivery.ts
new file mode 100644
index 000000000000..5179bdcb4920
--- /dev/null
+++ b/mobile/src/tasks/replay-on-ambiguous-delivery.ts
@@ -0,0 +1,115 @@
+import type { RpcClient } from '../transport/rpc-client'
+import type { RpcResponse } from '../transport/types'
+import { isRpcDeliveryUnknown } from '../transport/rpc-delivery-ambiguity'
+import { waitForRpcClientReconnected } from '../transport/rpc-client-reconnect-wait'
+import { isLogicalClientCutoverError } from '../transport/stable-logical-rpc-client'
+import {
+  getWorktreeCreateReplayWindowMs,
+  type WorktreeCreateIdempotencySupport
+} from './worktree-create-idempotency-policy'
+
+// Why: a request in flight when the mobile transport migrates (relay/direct hand-off on shoddy
+// cellular, relay lease rotation) rejects with a cutover error even though the host may have
+// completed it. The caller's replay identity makes a resend safe, so re-issue on the fresh session a
+// bounded number of times instead of surfacing "RPC interrupted by connection migration".
+const CUTOVER_MAX_RETRIES = 5
+
+// Why: a plain socket close (cellular flap, relay drop, the phone backgrounding) also rejects the
+// in-flight frame as delivery-unknown with no generation bump. The host may well have acted, so
+// replay on the same identity instead of reporting a failure.
+const AMBIGUOUS_MAX_RETRIES = 2
+
+// Bounded so a spinner doesn't sit for the whole window; the deadline still caps it.
+export const AMBIGUOUS_RECONNECT_WAIT_MS = 20_000
+
+/**
+ * What makes resending the SAME request safe after an ambiguous delivery.
+ *
+ * `durable`: the host keeps a ledger row for the caller's operation id and answers a replay from it
+ * (or refuses an unknown outcome), so a resend is safe at any time. `window`: the host only caches a
+ * result in memory for a bounded time, so a resend is safe only while that record is guaranteed.
+ */
+export type AmbiguousDeliveryReplay =
+  | { kind: 'durable' }
+  | { kind: 'window'; support: WorktreeCreateIdempotencySupport }
+
+/**
+ * Sends, re-issuing the identical request whenever it went delivery-ambiguous. `send` must resend
+ * the same identity every call: a new one would be a new operation and defeat the replay.
+ *
+ * A definite answer (a success or a refusal) is returned untouched; `replayed` says whether it came
+ * from a resend, because a refusal on a replacement connection says nothing about what the first
+ * attempt did. With no replay policy the first transport error is rethrown.
+ */
+export async function sendReplayingAmbiguousDelivery(
+  client: RpcClient,
+  send: () => Promise<RpcResponse>,
+  replay: AmbiguousDeliveryReplay | null
+): Promise<{ response: RpcResponse; replayed: boolean }> {
+  let migrationRetry = 0
+  let ambiguousRetry = 0
+  const firstSentAt = Date.now()
+  let replayDeadlineAt: number | null = null
+  for (;;) {
+    try {
+      // `send` must hand back the transport promise itself, so a delivery-unknown rejection reaches
+      // the catch below as the object the transport marked — the WeakSet cannot see through a wrapper.
+      const response = await send()
+      return { response, replayed: migrationRetry > 0 || ambiguousRetry > 0 }
+    } catch (error) {
+      if (!replay) {
+        throw error
+      }
+      if (isLogicalClientCutoverError(error)) {
+        if (migrationRetry >= CUTOVER_MAX_RETRIES) {
+          throw error
+        }
+        migrationRetry += 1
+        // Why: LogicalClientCutoverError is raised only after migrateTo installs an
+        // authenticated replacement, so retry immediately instead of adding UI lag.
+        continue
+      }
+      if (!isRpcDeliveryUnknown(error) || ambiguousRetry >= AMBIGUOUS_MAX_RETRIES) {
+        throw error
+      }
+      // A legacy cache may expire before a request timeout; durable receipts refuse unsafe replay.
+      if (replay.kind === 'window' && client.getState() === 'connected') {
+        throw error
+      }
+      // Keep the legacy deadline fixed; the host itself refuses expired durable operation IDs.
+      replayDeadlineAt ??=
+        replay.kind === 'durable'
+          ? Infinity
+          : resolveReplayDeadline(client, firstSentAt, replay.support)
+      const remainingWindowMs = replayDeadlineAt - Date.now()
+      if (remainingWindowMs <= 0) {
+        throw error
+      }
+      ambiguousRetry += 1
+      // Disconnected transports must reconnect before resend; bound the wait even for durable IDs.
+      if (
+        !(await waitForRpcClientReconnected(
+          client,
+          Math.min(AMBIGUOUS_RECONNECT_WAIT_MS, remainingWindowMs)
+        ))
+      ) {
+        throw error
+      }
+    }
+  }
+}
+
+// Latest instant the host's dedupe record is still guaranteed to exist, from the earliest
+// point the request could have resolved. lastInboundAt stamps a frame that really arrived,
+// so it stays honest across a suspension in a way a timer budget cannot; the send is the
+// fallback, and a sound floor either way, because the host cannot resolve a request it has
+// not yet received.
+function resolveReplayDeadline(
+  client: RpcClient,
+  firstSentAt: number,
+  support: WorktreeCreateIdempotencySupport
+): number {
+  const lastInboundAt = client.getLastInboundAt?.() ?? null
+  const anchor = lastInboundAt !== null && lastInboundAt > firstSentAt ? lastInboundAt : firstSentAt
+  return anchor + getWorktreeCreateReplayWindowMs(support)
+}
diff --git a/mobile/src/tasks/source-workspace-create.ts b/mobile/src/tasks/source-workspace-create.ts
index fb86701707af..143f2dde752a 100644
--- a/mobile/src/tasks/source-workspace-create.ts
+++ b/mobile/src/tasks/source-workspace-create.ts
@@ -15,7 +15,7 @@ import {
   type WorkspaceCreateTaskItem
 } from './workspace-create-params'
 import { createWorktreeWithNameRetry, type WorktreeCreateResult } from './worktree-create-retry'
-import type { WorktreeCreateAgentLaunch } from './agent-launch-worktree-create'
+import type { WorktreeCreateAgentLaunch } from './agent-launch-request'
 import type { WorktreeCreateIdempotencyProbe } from './worktree-create-idempotency-policy'
 
 // The agent bundle the modal resolved: `choice` drives launch resolution — the
diff --git a/mobile/src/tasks/workspace-create-reply-schema.ts b/mobile/src/tasks/workspace-create-reply-schema.ts
index c632bfee0832..647ae3572b68 100644
--- a/mobile/src/tasks/workspace-create-reply-schema.ts
+++ b/mobile/src/tasks/workspace-create-reply-schema.ts
@@ -34,7 +34,7 @@ export const worktreeCreateReceiptSchema = z.looseObject({
  *
  * Nothing under the container is required, because readAgentLaunchCreateOutcome already guards
  * every member it reads — `'worktreeId' in result` and a `typeof`/`trim` pair
- * (agent-launch-worktree-create.ts:55-:64) — and answers `null` when either fails, which
+ * (agent-launch-request.ts, readAgentLaunchCreateOutcome) — and answers `null` when either fails, which
  * worktree-create-retry.ts:123 turns into "Failed to create workspace". That arm is preserved.
  *
  * What the container adds is the reply main could not name: a string, a number or `null` receipt
diff --git a/mobile/src/tasks/worktree-create-capability.ts b/mobile/src/tasks/worktree-create-capability.ts
index 636cb9a4832b..ed354522b307 100644
--- a/mobile/src/tasks/worktree-create-capability.ts
+++ b/mobile/src/tasks/worktree-create-capability.ts
@@ -1,9 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
-import {
-  AGENT_LAUNCH_REPLAY_REQUIRED_RUNTIME_CAPABILITY,
-  AGENT_LAUNCH_RUNTIME_CAPABILITY
-} from '../../../src/shared/protocol-version'
-import type { AgentLaunchSupport } from './agent-launch-worktree-create'
+import { readAgentLaunchSupport, type AgentLaunchSupport } from './agent-launch-request'
 import type { RpcClient } from '../transport/rpc-client'
 import { isLogicalClientCutoverError } from '../transport/stable-logical-rpc-client'
 import { readMobileRuntimeHostPlatform } from '../transport/mobile-runtime-host-platform'
@@ -59,10 +55,7 @@ export async function readNewWorktreeRuntimeCapabilities(
       const advertisedIdempotency = result.worktreeCreateIdempotency
       return {
         tasksSupported: capabilities.includes(MOBILE_TASKS_CAPABILITY),
-        // Unsupported stays plain `false`, the same shape `worktreeCreateIdempotency` uses.
-        agentLaunch: capabilities.includes(AGENT_LAUNCH_RUNTIME_CAPABILITY)
-          ? { replay: capabilities.includes(AGENT_LAUNCH_REPLAY_REQUIRED_RUNTIME_CAPABILITY) }
-          : false,
+        agentLaunch: readAgentLaunchSupport(capabilities),
         worktreeCreateIdempotency: supportsIdempotency
           ? advertisedIdempotency === undefined
             ? { dedupeTtlMs: WORKTREE_CREATE_DEDUPE_TTL_LEGACY_HOST_MS }
diff --git a/mobile/src/tasks/worktree-create-retry.test.ts b/mobile/src/tasks/worktree-create-retry.test.ts
index b61ab20c30e8..a42a0b1e84b4 100644
--- a/mobile/src/tasks/worktree-create-retry.test.ts
+++ b/mobile/src/tasks/worktree-create-retry.test.ts
@@ -8,10 +8,8 @@ import {
   WORKTREE_CREATE_DEDUPE_TTL_LEGACY_HOST_MS,
   type WorktreeCreateIdempotencySupport
 } from './worktree-create-idempotency-policy'
-import {
-  createWorktreeWithNameRetry,
-  WORKTREE_CREATE_AMBIGUOUS_RECONNECT_WAIT_MS
-} from './worktree-create-retry'
+import { createWorktreeWithNameRetry } from './worktree-create-retry'
+import { AMBIGUOUS_RECONNECT_WAIT_MS } from './replay-on-ambiguous-delivery'
 import { WORKTREE_CREATE_TIMEOUT_MS } from './workspace-create-timeout'
 
 type Attempt = { method: string; params: Record<string, unknown> }
@@ -840,6 +838,6 @@ describe('createWorktreeWithNameRetry', () => {
     expect(LEGACY_HOST_REPLAY_WINDOW_MS).toBeLessThan(WORKTREE_CREATE_DEDUPE_TTL_LEGACY_HOST_MS)
     // A reconnect wait is clamped when a short advertisement leaves less time.
     const shortReplayWindowMs = getWorktreeCreateReplayWindowMs({ dedupeTtlMs: 20_000 })
-    expect(Math.min(WORKTREE_CREATE_AMBIGUOUS_RECONNECT_WAIT_MS, shortReplayWindowMs)).toBe(10_000)
+    expect(Math.min(AMBIGUOUS_RECONNECT_WAIT_MS, shortReplayWindowMs)).toBe(10_000)
   })
 })
diff --git a/mobile/src/tasks/worktree-create-retry.ts b/mobile/src/tasks/worktree-create-retry.ts
index 19c2b79ead0b..7ba680ba6356 100644
--- a/mobile/src/tasks/worktree-create-retry.ts
+++ b/mobile/src/tasks/worktree-create-retry.ts
@@ -1,14 +1,11 @@
 import type { TuiAgent } from '../../../src/shared/tui-agent'
 import type { RpcClient } from '../transport/rpc-client'
 import type { RpcResponse } from '../transport/types'
-import { isRpcDeliveryUnknown } from '../transport/rpc-delivery-ambiguity'
 import {
   agentLaunchRun,
   agentLaunchReplayRun,
   worktreeCreateRun
 } from './mobile-workspace-create-operations'
-import { waitForRpcClientReconnected } from '../transport/rpc-client-reconnect-wait'
-import { isLogicalClientCutoverError } from '../transport/stable-logical-rpc-client'
 import {
   CLIENT_WORKTREE_CREATE_MAX_ATTEMPTS,
   getClientWorktreeCreateCandidate,
@@ -17,18 +14,22 @@ import {
 } from '../../../src/shared/new-workspace/worktree-create-retry-policy'
 import {
   agentLaunchCreateParams,
+  isAgentLaunchReplayUnsupportedRefusal,
   isAgentLaunchUnsupportedRefusal,
   readAgentLaunchCreateOutcome,
   type WorktreeCreateAgentLaunch
-} from './agent-launch-worktree-create'
+} from './agent-launch-request'
 import { structuredSessionOperationId } from '../session/structured-session-operation-id'
 import { WORKTREE_CREATE_TIMEOUT_MS } from './workspace-create-timeout'
 import type { WorkspaceCreateParams } from './workspace-create-params'
-import {
-  getWorktreeCreateReplayWindowMs,
-  type WorktreeCreateIdempotencyProbe,
-  type WorktreeCreateIdempotencySupport
+import type {
+  WorktreeCreateIdempotencyProbe,
+  WorktreeCreateIdempotencySupport
 } from './worktree-create-idempotency-policy'
+import {
+  sendReplayingAmbiguousDelivery,
+  type AmbiguousDeliveryReplay
+} from './replay-on-ambiguous-delivery'
 
 // Why: server-side collision checks (branch already exists locally / on a remote
 // / already has PR #N) can fire even after a pre-flight basename dedupe —
@@ -39,26 +40,6 @@ export type WorktreeCreateResult =
   | { worktreeId: string; name: string; warning?: string }
   | { error: string }
 
-// Why: a create in flight when the mobile transport migrates (relay/direct
-// hand-off on shoddy cellular, relay lease rotation) rejects with a cutover error
-// even though the host may have completed it. The shared clientMutationId makes a
-// retry idempotent, so re-issue on the fresh session a bounded number of times
-// instead of surfacing "RPC interrupted by connection migration" with the
-// worktree silently created.
-const WORKTREE_CREATE_CUTOVER_MAX_RETRIES = 5
-
-// Why: a connection migration is not the only way a create goes delivery-ambiguous.
-// A plain socket close (cellular flap, relay drop, the phone backgrounding and the
-// supervisor suspending a billed relay splice) rejects the in-flight frame as
-// delivery-unknown with no generation bump, and create holds the longest budget of
-// any mobile RPC — 10 minutes of clone/fetch/setup — so it is the likeliest request
-// to be caught by one. Surfacing that as a failure is wrong: the host may well have
-// finished the worktree. Replay on the same clientMutationId instead.
-const WORKTREE_CREATE_AMBIGUOUS_MAX_RETRIES = 2
-
-// Bounded so the Create spinner doesn't sit for the whole window; the deadline still caps it.
-export const WORKTREE_CREATE_AMBIGUOUS_RECONNECT_WAIT_MS = 20_000
-
 export type CreateWorktreeWithNameRetryArgs = {
   client: RpcClient
   baseName: string
@@ -120,9 +101,7 @@ export async function createWorktreeWithNameRetry(
       !sent.replayed &&
       launch &&
       (launchOperationId
-        ? response.error.code === 'method_not_found' ||
-          response.error.code === 'forbidden' ||
-          response.error.code === 'agent_launch_replay_unsupported'
+        ? isAgentLaunchReplayUnsupportedRefusal(response.error)
         : isAgentLaunchUnsupportedRefusal(response.error))
     ) {
       // The probe said the host knows `agent.launch` but it refused the call — most likely this
@@ -196,10 +175,9 @@ function readCreateResult(
   }
 }
 
-// Sends the create, re-issuing whenever the request went delivery-ambiguous —
-// the frame reached the wire but no response came back, so the host may already have
-// built the worktree. Every arm below re-sends the SAME two names: a new one would be a new
-// operation and would defeat both mechanisms.
+// Sends the create, re-issuing whenever the request went delivery-ambiguous — the frame reached the
+// wire but no response came back, so the host may already have built the worktree. Every resend
+// carries the SAME two names: a new one would be a new operation and would defeat both mechanisms.
 //
 // On the `worktree.create` route the shared clientMutationId keeps the retry idempotent host-side.
 // On the launch route it does NOT reach the ledger: `agent.launch` caches the whole launch — the
@@ -207,7 +185,7 @@ function readCreateResult(
 // and outside it adds both. `launchOperationId` is what makes the replay durably safe, and it is
 // only sent when the host advertised the ledger.
 // A definite failure (never sent, or a server error response) is returned to the caller untouched.
-async function sendWorktreeCreateResilient(
+function sendWorktreeCreateResilient(
   client: RpcClient,
   launchAgent: TuiAgent | null,
   launchOperationId: string | null,
@@ -215,16 +193,17 @@ async function sendWorktreeCreateResilient(
   worktreeCreateIdempotency: WorktreeCreateIdempotencySupport | false
 ): Promise<{ response: RpcResponse; replayed: boolean }> {
   // Only the selected method's receipt can authorize replay after an ambiguous delivery.
-  const replaySupport = launchAgent ? launchOperationId : worktreeCreateIdempotency
-  let migrationRetry = 0
-  let ambiguousRetry = 0
-  const firstSentAt = Date.now()
-  let replayDeadlineAt: number | null = null
-  for (;;) {
-    try {
-      // `request` is the transport promise itself, so a delivery-unknown rejection reaches the
-      // catch below as the object the transport marked — the WeakSet cannot see through a wrapper.
-      const response = await (launchAgent
+  const replay: AmbiguousDeliveryReplay | null = launchAgent
+    ? launchOperationId
+      ? { kind: 'durable' }
+      : null
+    : worktreeCreateIdempotency
+      ? { kind: 'window', support: worktreeCreateIdempotency }
+      : null
+  return sendReplayingAmbiguousDelivery(
+    client,
+    () =>
+      launchAgent
         ? launchOperationId
           ? agentLaunchReplayRun.request(
               client,
@@ -241,65 +220,9 @@ async function sendWorktreeCreateResilient(
             )
         : worktreeCreateRun.request(client, params, {
             timeoutMs: WORKTREE_CREATE_TIMEOUT_MS
-          }))
-      // A refusal on the replacement connection says nothing about what the first call created.
-      return { response, replayed: migrationRetry > 0 || ambiguousRetry > 0 }
-    } catch (error) {
-      if (!replaySupport) {
-        throw error
-      }
-      if (isLogicalClientCutoverError(error)) {
-        if (migrationRetry >= WORKTREE_CREATE_CUTOVER_MAX_RETRIES) {
-          throw error
-        }
-        migrationRetry += 1
-        // Why: LogicalClientCutoverError is raised only after migrateTo installs an
-        // authenticated replacement, so retry immediately instead of adding UI lag.
-        continue
-      }
-      if (!isRpcDeliveryUnknown(error) || ambiguousRetry >= WORKTREE_CREATE_AMBIGUOUS_MAX_RETRIES) {
-        throw error
-      }
-      // A legacy cache may expire before a request timeout; durable receipts refuse unsafe replay.
-      if (typeof replaySupport !== 'string' && client.getState() === 'connected') {
-        throw error
-      }
-      // Keep the legacy deadline fixed; the host itself refuses expired durable operation IDs.
-      replayDeadlineAt ??=
-        typeof replaySupport === 'string'
-          ? Infinity
-          : resolveReplayDeadline(client, firstSentAt, replaySupport)
-      const remainingWindowMs = replayDeadlineAt - Date.now()
-      if (remainingWindowMs <= 0) {
-        throw error
-      }
-      ambiguousRetry += 1
-      // Disconnected transports must reconnect before resend; bound the wait even for durable IDs.
-      if (
-        !(await waitForRpcClientReconnected(
-          client,
-          Math.min(WORKTREE_CREATE_AMBIGUOUS_RECONNECT_WAIT_MS, remainingWindowMs)
-        ))
-      ) {
-        throw error
-      }
-    }
-  }
-}
-
-// Latest instant the host's dedupe record is still guaranteed to exist, from the earliest
-// point the create could have resolved. lastInboundAt stamps a frame that really arrived,
-// so it stays honest across a suspension in a way a timer budget cannot; the send is the
-// fallback, and a sound floor either way, because the host cannot resolve a create it has
-// not yet received.
-function resolveReplayDeadline(
-  client: RpcClient,
-  firstSentAt: number,
-  support: WorktreeCreateIdempotencySupport
-): number {
-  const lastInboundAt = client.getLastInboundAt?.() ?? null
-  const anchor = lastInboundAt !== null && lastInboundAt > firstSentAt ? lastInboundAt : firstSentAt
-  return anchor + getWorktreeCreateReplayWindowMs(support)
+          }),
+    replay
+  )
 }
 
 function defaultWorktreeCreateMutationId(): string {
diff --git a/mobile/src/terminal/TerminalWebView.tsx b/mobile/src/terminal/TerminalWebView.tsx
index 88d9da6106a4..8c474fcd1869 100644
--- a/mobile/src/terminal/TerminalWebView.tsx
+++ b/mobile/src/terminal/TerminalWebView.tsx
@@ -1,10 +1,10 @@
-import { useRef, useCallback, forwardRef, useImperativeHandle } from 'react'
+import { useRef, useCallback, useState, forwardRef, useImperativeHandle } from 'react'
 import { Platform, View } from 'react-native'
 import { WebView, type WebViewMessageEvent } from 'react-native-webview'
 import type { TerminalWebViewHandle, TerminalWebViewProps } from './terminal-webview-contract'
 import { TerminalWebViewEngineErrorOverlay } from './terminal-webview-engine-error-state'
 import { TERMINAL_WEBVIEW_FRAME_STYLES } from './terminal-webview-frame-styles'
-import { XTERM_WEBVIEW_SOURCE } from './terminal-webview-html'
+import { xtermWebViewSource } from './terminal-webview-html'
 import type { TerminalWebViewCommand } from './terminal-webview-messages'
 import { useTerminalWebViewController } from './use-terminal-webview-controller'
 
@@ -34,6 +34,13 @@ export const TerminalWebView = forwardRef<TerminalWebViewHandle, Props>(
     })
 
     useImperativeHandle(ref, () => handle, [handle])
+    // Why: the document builds its terminal before ready, so it needs the text scale before any
+    // message can reach it; later changes arrive as set-font-scale.
+    // Why: in the page source rather than injected: Android can run an injected script after the
+    // document's own, which then starts without them.
+    const [source] = useState(() =>
+      xtermWebViewSource({ textScale: props.textScale ?? 1, shown: props.shownAtMount ?? true })
+    )
 
     const handleMessage = useCallback(
       (event: WebViewMessageEvent) => {
@@ -65,7 +72,7 @@ export const TerminalWebView = forwardRef<TerminalWebViewHandle, Props>(
       <View style={[TERMINAL_WEBVIEW_FRAME_STYLES.container, props.style]}>
         <WebView
           ref={webViewRef}
-          source={XTERM_WEBVIEW_SOURCE}
+          source={source}
           style={TERMINAL_WEBVIEW_FRAME_STYLES.webview}
           originWhitelist={['*']}
           javaScriptEnabled
diff --git a/mobile/src/terminal/TerminalWebView.web.tsx b/mobile/src/terminal/TerminalWebView.web.tsx
index c810dbc86d82..38de971d5878 100644
--- a/mobile/src/terminal/TerminalWebView.web.tsx
+++ b/mobile/src/terminal/TerminalWebView.web.tsx
@@ -54,6 +54,12 @@ export const TerminalWebView = forwardRef<TerminalWebViewHandle, Props>(
     // The page's answer to the WebView's reload: drop the document and build another one. The host
     // element is keyed on it so React replaces the div rather than handing back one xterm left in.
     const [generation, setGeneration] = useState(0)
+    // Why: every document this view builds starts as the view mounted — its scale, and whether it
+    // was shown — as the native WebView's pre-content script does; later scales arrive with init.
+    const [atMount] = useState(() => ({
+      textScale: props.textScale ?? 1,
+      shown: props.shownAtMount ?? true
+    }))
 
     useImperativeHandle(ref, () => handle, [handle])
     // In an effect, not during render: React may replay or discard render work, and the document
@@ -62,7 +68,6 @@ export const TerminalWebView = forwardRef<TerminalWebViewHandle, Props>(
     useEffect(() => {
       receiveRef.current = receive
     }, [receive])
-
     useEffect(() => {
       // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: react-native-web renders View as a div and forwards the ref to it; this module only ever runs in that build.
       const host = hostRef.current as unknown as HTMLElement | null
@@ -71,7 +76,7 @@ export const TerminalWebView = forwardRef<TerminalWebViewHandle, Props>(
       }
       let live
       try {
-        live = mountTerminalWebDocument(host, (message) => receiveRef.current?.(message))
+        live = mountTerminalWebDocument(host, (message) => receiveRef.current?.(message), atMount)
       } catch (error) {
         // A start that throws is the document's own failure and the factory has already unwound
         // it, so there is no handle and no engine ran: no `error` notify is coming. It goes down
@@ -101,7 +106,11 @@ export const TerminalWebView = forwardRef<TerminalWebViewHandle, Props>(
       }
       // Mounted once per generation: re-running this would throw away a live terminal and its
       // scrollback, and the controller's identity changes with every callback prop.
-    }, [generation])
+    }, [atMount, generation])
+
+    const handleHostLayout = useCallback(() => {
+      documentRef.current?.notifyViewport()
+    }, [])
 
     const handleReload = useCallback(() => {
       clearEngineError()
@@ -112,7 +121,13 @@ export const TerminalWebView = forwardRef<TerminalWebViewHandle, Props>(
 
     return (
       <View style={[TERMINAL_WEBVIEW_FRAME_STYLES.container, props.style]}>
-        <View key={generation} ref={hostRef} style={TERMINAL_WEBVIEW_FRAME_STYLES.webview} />
+        {/* Why: mounted with onLayout, so react-native-web observes it; the document sizes to this box. */}
+        <View
+          key={generation}
+          ref={hostRef}
+          style={TERMINAL_WEBVIEW_FRAME_STYLES.webview}
+          onLayout={handleHostLayout}
+        />
         {engineError ? (
           <TerminalWebViewEngineErrorOverlay message={engineError} onReload={handleReload} />
         ) : null}
diff --git a/mobile/src/terminal/document/document-host-root.test.ts b/mobile/src/terminal/document/document-host-root.test.ts
index e9b3ed5f1e2c..8a3e066bbe96 100644
--- a/mobile/src/terminal/document/document-host-root.test.ts
+++ b/mobile/src/terminal/document/document-host-root.test.ts
@@ -224,3 +224,137 @@ describe('two terminal documents on one page', () => {
     two.started.stop()
   })
 })
+
+/** A started document over a measured grid whose cells scale with the font, as xterm's do. */
+function startMeasuredDocument() {
+  document.body.innerHTML = ''
+  const host = plantHost('pinch-host')
+  const engine = terminalDocumentDouble()
+  const parsedWrites: Array<() => void> = []
+  const grid = Object.assign(engine.terminal, {
+    cols: 80,
+    rows: 24,
+    _core: {
+      _renderService: {
+        get dimensions() {
+          const k = grid.options.fontSize / 13
+          return { css: { cell: { width: 7.5 * k, height: 15 * k } } }
+        }
+      }
+    }
+  })
+  grid.resize = (cols: number, rows: number) => {
+    grid.cols = cols
+    grid.rows = rows
+  }
+  grid.onWriteParsed = (listener: () => void) => {
+    parsedWrites.push(listener)
+    return { dispose() {} }
+  }
+  const posted: Array<Record<string, unknown>> = []
+  const started = createTerminalDocument({
+    root: host,
+    postToHost: (message) => {
+      posted.push(message)
+    },
+    hasEngine: () => true,
+    installHostTransport: () => () => {},
+    installErrorReporter: () => () => {},
+    paintDocumentBackground: () => {},
+    viewportRect: () => ({ left: 0, top: 0, width: 412, height: 600 }),
+    createTerminal: () => grid,
+    createUnicode11Addon: () => null,
+    createWebglAddon: () => null
+  })
+  // The app's init carries the frame it laid out.
+  started.send({
+    type: 'init',
+    cols: 80,
+    rows: 24,
+    initialData: '',
+    preserveScroll: false,
+    frame: { width: 412, height: 600 }
+  })
+  const write = () => parsedWrites.forEach((listener) => listener())
+  return { started, posted, surface: surfaceOf(host), write }
+}
+
+const nextFrame = () => new Promise<void>((resolve) => requestAnimationFrame(() => resolve()))
+async function settle() {
+  for (let frame = 0; frame < 10; frame++) {
+    await nextFrame()
+  }
+}
+
+const metricsOf = (posted: Array<Record<string, unknown>>) =>
+  posted.filter((message) => message.type === 'keyboard-avoidance-metrics')
+
+/** A touch on the surface itself, where the pinch listeners are; `fireTouch` reaches only `document`. */
+function fireSurfaceTouch(type: string, surface: HTMLElement, xs: number[]) {
+  const event = new Event(type, { bubbles: true, cancelable: true })
+  Object.defineProperty(event, 'touches', {
+    value: xs.map((x, identifier) => ({ identifier, clientX: x, clientY: 10, target: surface }))
+  })
+  surface.dispatchEvent(event)
+}
+
+/** Two fingers 20px apart, spread to `spread`px, a parsed write mid-gesture, then both lift. */
+function pinchTo(doc: ReturnType<typeof startMeasuredDocument>, spread: number, write = true) {
+  fireSurfaceTouch('touchstart', doc.surface, [10, 30])
+  fireSurfaceTouch('touchmove', doc.surface, [10, 10 + spread])
+  if (write) {
+    doc.write()
+  }
+  fireSurfaceTouch('touchend', doc.surface, [])
+}
+
+/**
+ * The lift's row pitch is read off the scale as drawn, and a pinch moves that scale with no fit
+ * to report it. A write mid-gesture emits the transient pitch; the release must replace it.
+ */
+describe('keyboard-avoidance metrics across a pinch', () => {
+  it('reports the at-rest pitch after a pinch that releases onto the same preset', async () => {
+    const doc = startMeasuredDocument()
+    await settle()
+    const atRest = metricsOf(doc.posted).at(-1)?.rowPitch
+    expect(atRest).toBeGreaterThan(0)
+
+    pinchTo(doc, 21)
+    await settle()
+
+    const metrics = metricsOf(doc.posted)
+    expect(metrics.at(-1)?.rowPitch).toBe(atRest)
+    doc.started.stop()
+  })
+
+  it('reports a release that changes the preset once, through the refit', async () => {
+    const doc = startMeasuredDocument()
+    await settle()
+    const before = metricsOf(doc.posted).length
+
+    pinchTo(doc, 30)
+    const afterWrite = metricsOf(doc.posted).length
+    await settle()
+
+    expect(afterWrite).toBe(before + 1)
+    expect(metricsOf(doc.posted).length).toBe(afterWrite + 1)
+    doc.started.stop()
+  })
+
+  it('never reports the pre-refit pitch when a release lands while a refit is pending', async () => {
+    const doc = startMeasuredDocument()
+    await settle()
+    const before = metricsOf(doc.posted).length
+
+    // The settings change sets the new font now and refits a frame later; the pinch releases
+    // onto that same preset in between.
+    doc.started.send({ type: 'set-font-scale', fontScale: 1.5 })
+    pinchTo(doc, 20, false)
+    await settle()
+
+    const reported = metricsOf(doc.posted).slice(before)
+    expect(reported.map((message) => message.rowPitch)).toEqual([reported.at(-1)?.rowPitch])
+    expect(reported.at(-1)?.rowPitch).toBeGreaterThan(20)
+    doc.started.stop()
+  })
+})
diff --git a/mobile/src/terminal/document/document-host-seams.ts b/mobile/src/terminal/document/document-host-seams.ts
index ec10e313d435..1afaac6c1a15 100644
--- a/mobile/src/terminal/document/document-host-seams.ts
+++ b/mobile/src/terminal/document/document-host-seams.ts
@@ -26,8 +26,13 @@ export type TerminalDocumentViewportRect = {
   top: number
   width: number
   height: number
+  /** The host is `display:none` and the size is the last one it had; a fit waits for it to show. */
+  hidden?: boolean
 }
 
+/** What the host reports: a new box, or the same box back from being hidden. */
+export type TerminalViewportChange = 'resized' | 'shown'
+
 /** The document's runtime error reporter, taking the window error handler's own arguments. */
 export type TerminalDocumentErrorReporter = (
   message: string | (Event & { message?: unknown }),
@@ -40,6 +45,9 @@ export type TerminalDocumentErrorReporter = (
 /** A frame from the host, as its transport delivers it: JSON text from a bridge, or the object. */
 export type TerminalDocumentHostFrame = string | Record<string, unknown> | undefined
 
+/** How a document starts, as its view mounted. */
+export type TerminalDocumentStart = { textScale: number; shown: boolean }
+
 /**
  * The ten host seams, kept apart from the state because the host sets them once when it builds
  * the scope, before the start sequence runs, and no module writes them afterwards.
@@ -63,10 +71,16 @@ export type TerminalDocumentHostSeams = {
   installHostTransport: (receive: (frame: TerminalDocumentHostFrame) => void) => () => void
   /** `message-bridge`: whether the engine is here, which is what readiness is reported on. */
   hasEngine: () => boolean
+  /**
+   * How the document starts, as its view mounted: the app's text scale, which the terminal built
+   * before ready lays out at, and whether it was shown. Only a shown document builds before ready;
+   * every terminal is a WebGL context, and a page or app holds about sixteen.
+   */
+  start: () => TerminalDocumentStart
   /** Every fit, pan, scroll and overlay bound, and every client point mapped into the grid. */
   viewportRect: () => TerminalDocumentViewportRect
-  /** `fit-scale`: calls back when that box changes size, handing back its removal. */
-  observeViewport: (onChange: () => void) => () => void
+  /** `fit-scale`: calls back when that box changes size or is shown again, handing back its removal. */
+  observeViewport: (onChange: (change: TerminalViewportChange) => void) => () => void
   /**
    * Where this document's elements are: the node its markup was planted in, or null for the page
    * the document is running in.
@@ -120,6 +134,12 @@ declare global {
      * quotes it. The document reaches it through a seam, so a page's mount holds its own instead.
      */
     __engineErrors?: string[]
+    /**
+     * The WebView page writes these ahead of the document script: the text scale its view mounted
+     * at, and whether that view was shown then.
+     */
+    __orcaTerminalTextScale?: unknown
+    __orcaTerminalShown?: unknown
   }
   const Terminal: new (options: Record<string, unknown>) => TerminalDocumentTerminal
 }
@@ -213,6 +233,14 @@ export function windowHasEngine() {
   return window.Terminal !== undefined
 }
 
+export function windowStart(): TerminalDocumentStart {
+  const scale = window.__orcaTerminalTextScale
+  return {
+    textScale: typeof scale === 'number' && scale > 0 ? scale : 1,
+    shown: window.__orcaTerminalShown !== false
+  }
+}
+
 /**
  * The WebView's viewport: there the window is the terminal frame. On the page the window is the
  * whole page, taller than the frame by the header and dock, so the page answers with its host.
@@ -222,10 +250,11 @@ export function windowViewportRect(): TerminalDocumentViewportRect {
 }
 
 /** The WebView's frame changes size exactly when its window does. */
-export function observeWindowViewport(onChange: () => void) {
-  window.addEventListener('resize', onChange)
+export function observeWindowViewport(onChange: (change: TerminalViewportChange) => void) {
+  const listener = () => onChange('resized')
+  window.addEventListener('resize', listener)
   return function () {
-    window.removeEventListener('resize', onChange)
+    window.removeEventListener('resize', listener)
   }
 }
 
diff --git a/mobile/src/terminal/document/document-parse-time-effects.test.ts b/mobile/src/terminal/document/document-parse-time-effects.test.ts
index 0acddfb78b3c..86b8433ed148 100644
--- a/mobile/src/terminal/document/document-parse-time-effects.test.ts
+++ b/mobile/src/terminal/document/document-parse-time-effects.test.ts
@@ -1,13 +1,9 @@
-import { readFileSync } from 'node:fs'
 import { describe, expect, it } from 'vitest'
 import {
-  DECLARATION_KINDS,
   documentModuleNames,
   documentModuleSource,
   exportedLifecycleFunctions,
-  parseModule,
   parseTimeEffects,
-  readsTheDocument,
   sequenceCalls,
   topLevelDeclarationsReachAnElement
 } from '../../test-support/webview-document-census'
@@ -71,43 +67,6 @@ describe('the document modules at parse time', () => {
     }
   })
 
-  it('would report a planted element read, which the statement filter cannot see', () => {
-    // The second reader has its own precondition. A `const` initialised from the document is a
-    // declaration by shape and a parse-time element read by effect — the exact form that survived
-    // a remount holding the first mount's node — and the statement-kind filter waves it through.
-    const planted =
-      "import { scope } from './document-scope'\n" +
-      "const indicator = document.getElementById('scroll-indicator')\n" +
-      'export function n() {\n  return indicator ?? scope.term\n}\n'
-    expect(parseTimeEffects('planted', planted)).toEqual([
-      "planted: indicator = document.getElementById('scroll-indicator')"
-    ])
-    // And the element reader the case above spends on every module: the same plant, seen by it.
-    expect(topLevelDeclarationsReachAnElement('planted', planted)).toBe(true)
-    // And the other direction, because a reader that flagged every initialiser would agree with
-    // the empty list above only by refusing everything: a plain literal is not work.
-    const inert =
-      "import { scope } from './document-scope'\n" +
-      'const options = { capture: true, passive: false }\n' +
-      'export function n() {\n  return options.capture && scope.term !== null\n}\n'
-    expect(parseTimeEffects('inert', inert)).toEqual([])
-  })
-
-  it('would report one, so the empty list above is a measurement', () => {
-    // The precondition. A walk that matched nothing would agree with an empty expectation just as
-    // happily, so the same reader is aimed at a module that does have a top-level effect: this
-    // test file itself, whose `describe` call is exactly the shape the rule refuses.
-    const source = readFileSync(
-      new URL('./document-parse-time-effects.test.ts', import.meta.url),
-      'utf8'
-    )
-    const running = parseModule('probe', source).body.filter(
-      (statement) => !DECLARATION_KINDS.has(statement.type)
-    )
-    expect(running.length).toBeGreaterThan(0)
-    expect(readsTheDocument({ type: 'Identifier', name: 'document' })).toBe(true)
-  })
-
   it('start and stop: the sequence calls every one there is, and undoes them in reverse', () => {
     // Moving an effect out is only correct if something calls it, and a count cannot say that: a
     // module could export a start nobody runs and the count would agree as soon as the literal
@@ -120,9 +79,6 @@ describe('the document modules at parse time', () => {
       MODULES.filter((name) => name !== THE_SEQUENCE).flatMap((name) =>
         exportedLifecycleFunctions(moduleSource(name), keyword, 'TerminalDocumentScope')
       )
-    expect(moduleSource('selection-overlay')).toContain(
-      'export function stopSelectionOverlay(scope: TerminalDocumentScope) {\n  stopEdgeScroll(scope)'
-    )
 
     const started = sequenceCallsTo('startTerminalDocument')
     // `cancelDocumentFrames` is the frame registry's undo rather than a module's stop, and it is
@@ -145,12 +101,4 @@ describe('the document modules at parse time', () => {
     )
     expect(sequenceCallsTo('stopTerminalDocument').at(-1)).toBe('cancelDocumentFrames')
   })
-
-  it('would name a start the sequence forgot, which is what the comparison above is for', () => {
-    // The precondition, planted rather than argued: a module that exports a start nobody calls is
-    // the failure the set comparison exists to catch, and the reader has to say its name.
-    const planted = sequenceCallsTo('startTerminalDocument')
-    expect(planted).not.toContain('startReflow')
-    expect([...planted, 'startReflow'].sort()).not.toEqual(planted.slice().sort())
-  })
 })
diff --git a/mobile/src/terminal/document/document-scope.ts b/mobile/src/terminal/document/document-scope.ts
index 9be374b2b274..0095a3275cee 100644
--- a/mobile/src/terminal/document/document-scope.ts
+++ b/mobile/src/terminal/document/document-scope.ts
@@ -1,3 +1,4 @@
+import type { TerminalLaidOutCellBox } from '../terminal-cell-box'
 import { DEFAULT_TERMINAL_THEME } from '../terminal-webview-html/theme'
 import {
   createEngineTerminal,
@@ -9,6 +10,7 @@ import {
   postToReactNativeWebView,
   windowCapturedEngineErrors,
   windowHasEngine,
+  windowStart,
   observeWindowViewport,
   windowViewportRect,
   type TerminalDocumentHost,
@@ -94,6 +96,8 @@ export type TerminalDocumentState = {
   terminalFontFamily: string
   /** `terminal-init`: whether the first live chunk since init is still pending. */
   firstDataPending: boolean
+  /** `laid-out-cell-box`: the box last reported or at ready, with the grid it was laid out at. */
+  reportedCellBox: TerminalLaidOutCellBox | null
   /** `terminal-init`: whether the replayed snapshot was an alternate screen. */
   activeAltScreenSnapshot: boolean
   /** `fit-scale`: the fit scale the document committed. */
@@ -156,6 +160,8 @@ export type TerminalDocumentState = {
   pendingTerm: TerminalDocumentTerminal | null
   /** `surface-swap`: the terminal the committed surface is showing. */
   committedTerm: TerminalDocumentTerminal | null
+  /** `terminal-init`: the terminal built before ready, until the first init reuses it. */
+  provisionalTerm: TerminalDocumentTerminal | null
   /** `surface-swap`: the surface the committed terminal is mounted on. */
   committedSurface: HTMLElement | null
   /** `surface-swap`: the hidden replacement surface, until it commits. */
@@ -181,8 +187,10 @@ export type TerminalDocumentState = {
   removeWebglRecovery: (() => void) | null
   /** `fit-scale`: the generation of the retry loop; a bump abandons the one in flight. */
   fitRetryToken: number
-  /** `fit-scale`: the viewport box the last fit was committed for, or null before one. */
-  fittedBox: { width: number; height: number } | null
+  /** `host-message-router`: the terminal frame the app last sent with a grid, or null before one. */
+  hostFrame: { width: number; height: number } | null
+  /** `fit-scale`: the reason of a fit held while the host is hidden, or null when none is owed. */
+  fitPending: string | null
   /** `mouse-click-drag`: the mouse gesture in progress, or null. */
   mouseGesture: TerminalMouseGesture | null
   /** `tap-dispatch`: what the document-level dispatcher has latched onto. */
@@ -263,6 +271,7 @@ function createTerminalDocumentState(): TerminalDocumentState {
     currentTextScale: 1,
     terminalFontFamily: '',
     firstDataPending: false,
+    reportedCellBox: null,
     activeAltScreenSnapshot: false,
     currentScale: 1,
     userScale: 1,
@@ -295,6 +304,7 @@ function createTerminalDocumentState(): TerminalDocumentState {
     surface: null,
     pendingTerm: null,
     committedTerm: null,
+    provisionalTerm: null,
     committedSurface: null,
     pendingSurface: null,
     scrollIndicator: null,
@@ -308,7 +318,8 @@ function createTerminalDocumentState(): TerminalDocumentState {
     removeTapDispatch: null,
     removeWebglRecovery: null,
     fitRetryToken: 0,
-    fittedBox: null,
+    hostFrame: null,
+    fitPending: null,
     mouseGesture: null,
     touchDispatch: {
       mode: 'idle',
@@ -346,6 +357,7 @@ function createTerminalDocumentHostSeams(): TerminalDocumentHostSeams {
     paintDocumentBackground: paintWindowDocumentBackground,
     installHostTransport: installWindowHostTransport,
     hasEngine: windowHasEngine,
+    start: windowStart,
     viewportRect: windowViewportRect,
     observeViewport: observeWindowViewport,
     root: null
diff --git a/mobile/src/terminal/document/document-terminal-shape.ts b/mobile/src/terminal/document/document-terminal-shape.ts
index 15cccfda35b3..b5807efdf7fa 100644
--- a/mobile/src/terminal/document/document-terminal-shape.ts
+++ b/mobile/src/terminal/document/document-terminal-shape.ts
@@ -102,6 +102,7 @@ export type TerminalDocumentTerminal = {
   onLineFeed?: (listener: () => void) => TerminalDocumentDisposable
   onScroll?: (listener: () => void) => TerminalDocumentDisposable
   onWriteParsed?: (listener: () => void) => TerminalDocumentDisposable
+  onRender?: (listener: () => void) => TerminalDocumentDisposable
   resize: (cols: number, rows: number) => void
   refresh: (start: number, end: number) => void
   dispose: () => void
diff --git a/mobile/src/terminal/document/fit-scale.ts b/mobile/src/terminal/document/fit-scale.ts
index 20aa1c1ee49e..8047b9f630c1 100644
--- a/mobile/src/terminal/document/fit-scale.ts
+++ b/mobile/src/terminal/document/fit-scale.ts
@@ -3,24 +3,17 @@ import {
   computeFitScale,
   flog,
   getCellWidth,
+  getMeasuredCellHeight,
   getTotalScale,
   updateTransform
 } from './viewport-transform'
 import type { TerminalDocumentScope } from './document-scope'
+import type { TerminalViewportChange } from './document-host-seams'
 import { scheduleDocumentFrame } from './document-frame-registry'
-
-/** The narrowest grid a fit or a text-scale change will fit to. */
-export const MIN_FIT_COLS = 20
+import { emitKeyboardAvoidanceMetrics } from './keyboard-avoidance-metrics'
 
 export function getCellHeight(scope: TerminalDocumentScope) {
-  if (!scope.term || !scope.term._core) {
-    return 15
-  }
-  const core = scope.term._core
-  if (core._renderService && core._renderService.dimensions) {
-    return core._renderService.dimensions.css.cell.height || 15
-  }
-  return 15
+  return getMeasuredCellHeight(scope) || 15
 }
 
 // Why: clamp pan so the terminal content always covers the viewport
@@ -65,23 +58,15 @@ export function adjustRowsForViewport() {}
 // so a backgrounded WebView never spins forever.
 const FIT_RETRY_MAX_FRAMES = 60
 
-function isFittedBox(scope: TerminalDocumentScope) {
-  const { width, height } = scope.viewportRect()
-  const fitted = scope.fittedBox
-  return fitted !== null && fitted.width === width && fitted.height === height
-}
-
-function hasViewportWidth(scope: TerminalDocumentScope) {
-  const width = scope.viewportRect().width
-  return Number.isFinite(width) && width > 0
+function isViewportShown(scope: TerminalDocumentScope) {
+  const { width, hidden } = scope.viewportRect()
+  return hidden !== true && Number.isFinite(width) && width > 0
 }
 
 export function applyFitScale(scope: TerminalDocumentScope, reason: string) {
   if (!scope.term || !scope.term.element) {
     return
   }
-  // Why: a fit asked for while hidden is dropped until a box arrives, and that box may be the old one.
-  scope.fittedBox = null
   const token = ++scope.fitRetryToken
   let attempts = 0
   let lastScrollWidth = -1
@@ -92,8 +77,9 @@ export function applyFitScale(scope: TerminalDocumentScope, reason: string) {
     if (!scope.term || !scope.term.element) {
       return
     }
-    // Why: a display:none host measures 0 wide; the fit stays pending until observeViewport reports a box.
-    if (!hasViewportWidth(scope)) {
+    // Why: a hidden grid may not measure its cells, so the fit is held until the host is shown.
+    if (!isViewportShown(scope)) {
+      scope.fitPending = reason
       return
     }
     attempts++
@@ -134,8 +120,7 @@ export function commitFitScale(
     return
   }
   const preSnapScale = computeFitScale(scope)
-  const { width, height } = scope.viewportRect()
-  scope.fittedBox = { width, height }
+  scope.fitPending = null
   scope.currentScale = preSnapScale
   // Why: when scale is very close to 1 (e.g. 0.97 from xterm scrollbar
   // sub-pixels) snap to 1 to avoid imperceptible shrinkage that prevents
@@ -170,6 +155,8 @@ export function commitFitScale(
     })
   }
   repositionOverlay(scope)
+  // The host's lift reads the drawn row pitch, which a new scale changes with no new output.
+  emitKeyboardAvoidanceMetrics(scope)
 }
 
 /**
@@ -181,10 +168,12 @@ export function commitFitScale(
  * had to copy the five calls into its mount to get it at all (ruling 24).
  */
 export function startFitScale(scope: TerminalDocumentScope) {
-  const refit = () => {
-    // Why: a hidden screen reports 0x0 and then its old box again; native never refits on that, so
-    // only a box other than the one last fitted refits, and the user's pan and zoom survive.
-    if (!hasViewportWidth(scope) || isFittedBox(scope)) {
+  const refit = (change: TerminalViewportChange) => {
+    // Why: showing the same box again is not a resize; only a fit held while hidden runs, so pan and zoom survive.
+    if (change === 'shown') {
+      if (scope.fitPending !== null) {
+        applyFitScale(scope, scope.fitPending)
+      }
       return
     }
     applyFitScale(scope, 'window-resize')
diff --git a/mobile/src/terminal/document/host-message-router.ts b/mobile/src/terminal/document/host-message-router.ts
index 8c63c715b179..0b155e1b70cd 100644
--- a/mobile/src/terminal/document/host-message-router.ts
+++ b/mobile/src/terminal/document/host-message-router.ts
@@ -1,6 +1,5 @@
 import type { TerminalDocumentScope } from './document-scope'
-import { scheduleDocumentFrame } from './document-frame-registry'
-import { applyFitScale, MIN_FIT_COLS } from './fit-scale'
+import { applyFitScale } from './fit-scale'
 import { notify } from './host-notify'
 import { emitKeyboardAvoidanceMetrics } from './keyboard-avoidance-metrics'
 import { emitModesIfChanged } from './mode-mirroring'
@@ -12,7 +11,6 @@ import { resetEvictionCounter } from './selection-state-and-eviction'
 import { applyTerminalTheme } from './terminal-theme'
 import { init, resize, write } from './terminal-init'
 import { applyTextScale } from './text-scaling'
-import { flog } from './viewport-transform'
 import { resetWriteQueue } from './write-queue'
 
 /** One message from the host. Every field is optional because the router reads them by type. */
@@ -27,83 +25,20 @@ export type TerminalHostMessage = {
   preserveScroll?: boolean
   oscLinks?: unknown
   data?: string
-  containerHeight?: number
+  frame?: { width: number; height: number } | null
 }
 
-export function measureFitDimensions(
-  scope: TerminalDocumentScope,
-  containerHeightPx: unknown,
-  retriesLeft?: number
-) {
-  if (typeof retriesLeft !== 'number') {
-    retriesLeft = 30
-  }
-  // Why: init and measure are posted back-to-back from React, but
-  // init has an async rAF chain. A measure that runs synchronously
-  // after init can find term null, disposed, lacking element, or
-  // with cells size 0. Retry the whole gate for ~500ms.
-  const notReady = !scope.term || !scope.term.element
-  let cellWidth = 0
-  let cellHeight = 0
-  if (!notReady) {
-    const core = scope.term!._core
-    if (core && core._renderService && core._renderService.dimensions) {
-      cellWidth = core._renderService.dimensions.css.cell.width
-      cellHeight = core._renderService.dimensions.css.cell.height
-    }
-  }
-  if (notReady || cellWidth <= 0 || cellHeight <= 0) {
-    if (retriesLeft > 0) {
-      // Ruling 21: a retry that outlives its mount would answer the next mount's measure.
-      const gen = scope.terminalGeneration
-      scheduleDocumentFrame(scope, function () {
-        if (gen !== scope.terminalGeneration) {
-          return
-        }
-        measureFitDimensions(scope, containerHeightPx, retriesLeft - 1)
-      })
-      return
-    }
-    flog(scope, 'measure-fail', {
-      notReady: notReady,
-      cellWidth: cellWidth,
-      cellHeight: cellHeight,
-      retriesLeft: retriesLeft
-    })
-    notify(scope, { type: 'measure-result', cols: null, rows: null })
-    return
-  }
-  const viewport = scope.viewportRect()
-  const vpWidth = viewport.width
-  // Why: prefer the container height passed from React Native over the
-  // viewport's. The RN layout system knows the exact pixel height of the
-  // terminal frame after the accessory/input bars are subtracted, whereas
-  // the viewport can overstate the visible area due to layout timing or
-  // safe-area insets.
-  const vpHeight =
-    typeof containerHeightPx === 'number' && containerHeightPx > 0
-      ? containerHeightPx
-      : viewport.height
-  const cols = Math.floor(vpWidth / cellWidth)
-  if (cols < MIN_FIT_COLS) {
-    flog(scope, 'measure-skip-small-width', {
-      vpWidth: vpWidth,
-      cellWidth: cellWidth,
-      cols: cols
-    })
-    notify(scope, { type: 'measure-result', cols: null, rows: null })
-    return
-  }
-  // Why: the rows we report become the PTY's actual row count after the
-  // server fits to viewport, and xterm renders exactly that many lines
-  // anchored top-left of the WebView. Subtracting rows here would leave
-  // dead xterm-background space at the bottom of the container and make
-  // the last PTY rows visually appear above an "invisible line." Any
-  // safety margin between the prompt and the accessory bar must come
-  // from RN layout (terminalFrame's flex bounds), not from undersizing
-  // the PTY.
-  const rows = Math.max(8, Math.floor(vpHeight / cellHeight))
-  notify(scope, { type: 'measure-result', cols: cols, rows: rows })
+/** The frame React Native laid out, sent with every grid; null when absent or without a size. */
+function hostFrameOf(msg: TerminalHostMessage) {
+  const frame = msg.frame
+  return frame && frame.width > 0 && frame.height > 0
+    ? { width: frame.width, height: frame.height }
+    : null
+}
+
+/** Keeps the frame a grid was fitted to, for a later text-scale change to fit. */
+function holdHostFrame(scope: TerminalDocumentScope, msg: TerminalHostMessage) {
+  scope.hostFrame = hostFrameOf(msg) ?? scope.hostFrame
 }
 
 export function handleMsg(scope: TerminalDocumentScope, msg: TerminalHostMessage) {
@@ -120,6 +55,7 @@ export function handleMsg(scope: TerminalDocumentScope, msg: TerminalHostMessage
   if (msg.type === 'ping') {
     notify(scope, { type: 'pong', pingId: msg.id })
   } else if (msg.type === 'init') {
+    holdHostFrame(scope, msg)
     init(
       scope,
       msg.cols!,
@@ -144,8 +80,10 @@ export function handleMsg(scope: TerminalDocumentScope, msg: TerminalHostMessage
       applyTextScale(scope, msg.fontScale)
     }
   } else if (msg.type === 'resize') {
+    holdHostFrame(scope, msg)
     resize(scope, msg.cols!, msg.rows!)
   } else if (msg.type === 'reflow') {
+    holdHostFrame(scope, msg)
     reflow(scope, msg.cols!, msg.rows!)
   } else if (msg.type === 'write') {
     write(scope, msg.data!)
@@ -174,8 +112,6 @@ export function handleMsg(scope: TerminalDocumentScope, msg: TerminalHostMessage
       notify(scope, { type: 'selection-evicted' })
       cancelSelect(scope)
     }
-  } else if (msg.type === 'measure') {
-    measureFitDimensions(scope, msg.containerHeight)
   } else if (msg.type === 'reset-zoom') {
     applyFitScale(scope, 'reset-zoom-msg')
   } else if (msg.type === 'set-theme') {
diff --git a/mobile/src/terminal/document/host-seams.test.ts b/mobile/src/terminal/document/host-seams.test.ts
index 0991f4bb9b14..c000062acf0a 100644
--- a/mobile/src/terminal/document/host-seams.test.ts
+++ b/mobile/src/terminal/document/host-seams.test.ts
@@ -6,8 +6,7 @@ import { handleMsg } from './host-message-router'
 import { notify } from './host-notify'
 import { flog } from './viewport-transform'
 import { attachWebglAddon } from './webgl-recovery'
-import type { TerminalDocumentHost } from './document-host-seams'
-import { documentSourceText } from './document-module-source.test-support'
+import type { TerminalDocumentHost, TerminalViewportChange } from './document-host-seams'
 
 /**
  * The host seams the page sets, and the window reads and writes they default to.
@@ -205,24 +204,22 @@ describe('the document host seams, by default', () => {
 })
 
 describe('the document host seams, once the page sets them', () => {
-  it('fits a measure with no container height to the host rather than the window', () => {
-    // The page's host is one element on a page that is taller and wider than it; the window is
-    // happy-dom's 1024x768, so a fit read off the window would answer 136x51.
-    const cell = { width: 7.5, height: 15 }
-    const terminal = Object.assign(terminalDouble(), {
-      _core: { _renderService: { dimensions: { css: { cell } } } }
-    })
-    const posted: Record<string, unknown>[] = []
+  it('keeps the frame React Native laid out from each grid, not the viewport CSS rounded', () => {
+    // 1080 device px at a 2.75 pixel ratio: React Native lays the frame out at 392.73 and the
+    // document's viewport reads 393. A grid without a whole frame leaves the last one in place.
+    const frame = { width: 1080 / 2.75, height: 600 }
     const scope = startedScope({
-      createTerminal: () => terminal,
-      postToHost: (message) => posted.push(message),
-      viewportRect: () => ({ left: 0, top: 82, width: 390, height: 600 })
+      createTerminal: () => terminalDouble(),
+      viewportRect: () => ({ left: 0, top: 0, width: 393, height: 600 })
     })
     handleMsg(scope, { type: 'init', cols: 80, rows: 24, initialData: '', preserveScroll: false })
-    handleMsg(scope, { type: 'measure' })
-    expect(posted.filter((message) => message.type === 'measure-result')).toEqual([
-      { type: 'measure-result', cols: 52, rows: 40 }
-    ])
+    expect(scope.hostFrame).toBeNull()
+    handleMsg(scope, { type: 'resize', cols: 50, rows: 40, frame: { width: 390, height: 0 } })
+    expect(scope.hostFrame).toBeNull()
+    handleMsg(scope, { type: 'resize', cols: 50, rows: 40, frame })
+    expect(scope.hostFrame).toEqual(frame)
+    handleMsg(scope, { type: 'reflow', cols: 50, rows: 40 })
+    expect(scope.hostFrame).toEqual(frame)
   })
 
   it('routes every notify to the field and nothing to the bridge', () => {
@@ -232,7 +229,7 @@ describe('the document host seams, once the page sets them', () => {
     const scope = startedScope({ postToHost: (message) => posted.push(message) })
     // The sequence's own `web-ready` is the document reporting itself started; what this case reads
     // is what the two notify paths send afterwards.
-    expect(posted).toEqual([{ type: 'web-ready' }])
+    expect(posted).toEqual([expect.objectContaining({ type: 'web-ready' })])
     posted.length = 0
     notify(scope, { type: 'pong', pingId: 7 })
     flog(scope, 'probe', { n: 1 })
@@ -299,7 +296,7 @@ describe('the document host seams, once the page sets them', () => {
 
 describe("the document's viewport", () => {
   it('refits when the host says its box changed, and not on a window resize it does not own', () => {
-    const changes: (() => void)[] = []
+    const changes: ((change: TerminalViewportChange) => void)[] = []
     const scope = startedScope({
       createTerminal: () => terminalDouble(),
       observeViewport: (onChange) => {
@@ -312,7 +309,10 @@ describe("the document's viewport", () => {
     window.dispatchEvent(new Event('resize'))
     expect(scope.panX).toBe(50)
     expect(changes).toHaveLength(1)
-    changes[0]!()
+    // The same box shown again with no fit held is not a resize: the pan stays.
+    changes[0]!('shown')
+    expect(scope.panX).toBe(50)
+    changes[0]!('resized')
     expect(scope.panX).toBe(0)
   })
 
@@ -323,38 +323,4 @@ describe("the document's viewport", () => {
     window.dispatchEvent(new Event('resize'))
     expect(scope.panX).toBe(0)
   })
-
-  it('is read through the seam everywhere, never off the window directly', () => {
-    // The default in `document-host-seams.ts` is the one window read, so the census runs over
-    // every other module; a raw read elsewhere sizes a page terminal to the whole page.
-    const raw = documentSourceText()
-      .split('\n')
-      .filter((line) => /window\.inner(Height|Width)|\binner(Height|Width)\b/.test(line))
-    expect(raw).toEqual([
-      '  return { left: 0, top: 0, width: window.innerWidth, height: window.innerHeight }'
-    ])
-  })
-
-  it('maps a client point into the grid only through viewportPoint', () => {
-    // On the page the host's origin is not the window's, so a client coordinate used against
-    // anything but another client coordinate lands rows low. Differences of two need no origin.
-    const arithmetic = documentSourceText()
-      .split('\n')
-      .filter((line) => !/^\s*(\*|\/\/)/.test(line))
-      .filter((line) => /client[XY]\s*[-+*/<>]|[-+*/<>]=?\s*[\w.[\]]*client[XY]\b/.test(line))
-      .map((line) => line.trim())
-      .sort()
-    expect(arithmetic).toEqual([
-      'const dx = Math.abs(e.clientX - gesture.startX)',
-      'const dx = Math.abs(mt.clientX - scope.tapCandidate.x)',
-      'const dx = Math.abs(t.clientX - scope.longPressOrigin.x)',
-      'const dx = a.clientX - b.clientX,',
-      'const dy = Math.abs(e.clientY - gesture.startY)',
-      'const dy = Math.abs(mt.clientY - scope.tapCandidate.y)',
-      'const dy = Math.abs(t.clientY - scope.longPressOrigin.y)',
-      'dy = a.clientY - b.clientY',
-      'return viewportPoint(scope, (a.clientX + b.clientX) / 2, (a.clientY + b.clientY) / 2)',
-      'return { x: clientX - frame.left, y: clientY - frame.top }'
-    ])
-  })
 })
diff --git a/mobile/src/terminal/document/keyboard-avoidance-metrics.ts b/mobile/src/terminal/document/keyboard-avoidance-metrics.ts
index 516dfdb1b2a6..a0f28d801c16 100644
--- a/mobile/src/terminal/document/keyboard-avoidance-metrics.ts
+++ b/mobile/src/terminal/document/keyboard-avoidance-metrics.ts
@@ -1,3 +1,4 @@
+import { getMeasuredCellHeight, getTotalScale } from './viewport-transform'
 import { notify } from './host-notify'
 import type {
   TerminalDocumentCell,
@@ -70,6 +71,8 @@ export function emitKeyboardAvoidanceMetrics(scope: TerminalDocumentScope) {
     cursorY: scope.term.buffer && scope.term.buffer.active ? scope.term.buffer.active.cursorY : 0,
     contentBottomRow: alt ? 0 : computeContentBottomRow(scope),
     rows: scope.term.rows || 0,
-    altScreen: alt
+    altScreen: alt,
+    // As drawn: desktop display mode scales the desktop's rows down to the phone's width.
+    rowPitch: getMeasuredCellHeight(scope) * getTotalScale(scope)
   })
 }
diff --git a/mobile/src/terminal/document/laid-out-cell-box.test.ts b/mobile/src/terminal/document/laid-out-cell-box.test.ts
new file mode 100644
index 000000000000..5a8ed7453a0d
--- /dev/null
+++ b/mobile/src/terminal/document/laid-out-cell-box.test.ts
@@ -0,0 +1,343 @@
+// @vitest-environment happy-dom
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { laidOutCellBox, reportLaidOutCellBox } from './laid-out-cell-box'
+import { createTerminalDocumentScope, type TerminalDocumentScope } from './document-scope'
+import { startTerminalDocument, stopTerminalDocument } from './create-terminal-document'
+import type { TerminalDocumentHost } from './document-host-seams'
+import { fontPxForScale } from './text-scaling'
+import { terminalDocumentDouble } from './document-terminal-double.test-support'
+import { handleMsg } from './host-message-router'
+import { TERMINAL_DOCUMENT_MARKUP } from '../terminal-webview-html/document-markup'
+
+afterEach(() => {
+  vi.unstubAllGlobals()
+  document.body.innerHTML = ''
+})
+
+describe('laidOutCellBox', () => {
+  function scopeWithCell(
+    cell: { width: number; height: number },
+    fontSize: number,
+    posted: Record<string, unknown>[] = []
+  ) {
+    const scope = createTerminalDocumentScope({ postToHost: (message) => posted.push(message) })
+    scope.currentTextScale = 1.25
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the reader touches only cols, rows, options.fontSize and _core's render dimensions.
+    scope.term = {
+      cols: 55,
+      rows: 47,
+      options: { fontSize },
+      _core: { _renderService: { dimensions: { css: { cell } } } }
+    } as unknown as typeof scope.term
+    return scope
+  }
+
+  it('reads the box xterm laid out at the current text scale, with its grid', () => {
+    const scope = scopeWithCell({ width: 29 / 3, height: 21 }, fontPxForScale(1.25))
+    expect(laidOutCellBox(scope)).toEqual({
+      cellBox: { fontScale: 1.25, cellWidth: 29 / 3, cellHeight: 21 },
+      cols: 55,
+      rows: 47
+    })
+  })
+
+  it('tells the host each new box once, and refits only a box that changed at a kept grid', () => {
+    const posted: Record<string, unknown>[] = []
+    const cell = { width: 29 / 3, height: 21 }
+    const scope = scopeWithCell(cell, fontPxForScale(1.25), posted)
+    reportLaidOutCellBox(scope)
+    reportLaidOutCellBox(scope)
+    // A new grid with the same box tells the host nothing; the document holds that grid.
+    Object.assign(scope.term!, { cols: 50 })
+    reportLaidOutCellBox(scope)
+    cell.width = 9.75
+    reportLaidOutCellBox(scope)
+    expect(posted).toEqual([
+      {
+        type: 'cell-box',
+        cellBox: { fontScale: 1.25, cellWidth: 29 / 3, cellHeight: 21 },
+        refit: false
+      },
+      {
+        type: 'cell-box',
+        cellBox: { fontScale: 1.25, cellWidth: 9.75, cellHeight: 21 },
+        refit: true
+      }
+    ])
+  })
+})
+
+describe('a started document', () => {
+  /** A document whose engine builds grids with a cell that follows the font, and every notify. */
+  function started(host: TerminalDocumentHost = {}) {
+    document.body.innerHTML = TERMINAL_DOCUMENT_MARKUP
+    const cell = { width: 23 / 3, height: 15 }
+    const renderListeners: (() => void)[] = []
+    const built: { options: Record<string, unknown> }[] = []
+    const createTerminal = (options: Record<string, unknown>) => {
+      const terminal = terminalDocumentDouble().terminal
+      const grid = Object.assign(terminal, {
+        cols: Number(options.cols),
+        rows: Number(options.rows),
+        options: { ...terminal.options, fontSize: Number(options.fontSize) },
+        _core: {
+          _renderService: {
+            get dimensions() {
+              const k = grid.options.fontSize / 13
+              return { css: { cell: { width: cell.width * k, height: cell.height * k } } }
+            }
+          }
+        },
+        onRender: (listener: () => void) => {
+          renderListeners.push(listener)
+          return { dispose() {} }
+        }
+      })
+      grid.resize = (cols: number, rows: number) => {
+        grid.cols = cols
+        grid.rows = rows
+      }
+      built.push({ options })
+      return grid
+    }
+    const posted: Record<string, unknown>[] = []
+    const scope = createTerminalDocumentScope({
+      installHostTransport: () => () => {},
+      hasEngine: () => true,
+      createTerminal,
+      postToHost: (message) => posted.push(message),
+      ...host
+    })
+    startTerminalDocument(scope)
+    const render = () => renderListeners.forEach((listener) => listener())
+    const init = () =>
+      handleMsg(scope, { type: 'init', cols: 55, rows: 47, initialData: '', preserveScroll: false })
+    return { scope, cell, posted, render, built, init }
+  }
+
+  const nextFrame = () => new Promise<void>((resolve) => requestAnimationFrame(() => resolve()))
+  async function untilReady(posted: Record<string, unknown>[]) {
+    for (let frame = 0; frame < 30 && !posted.some((m) => m.type === 'ready'); frame++) {
+      await nextFrame()
+    }
+  }
+  const boxes = (posted: Record<string, unknown>[]) =>
+    posted.filter((m) => m.type === 'cell-box').map((m) => m.cellBox)
+  const refits = (posted: Record<string, unknown>[]) =>
+    posted.filter((m) => m.type === 'cell-box').map((m) => m.refit)
+  const reflowTo = (scope: TerminalDocumentScope, cols: number) =>
+    handleMsg(scope, { type: 'reflow', cols, rows: 47 })
+
+  it('takes the frame the app laid out from init, resize and reflow', () => {
+    const { scope } = started()
+    try {
+      handleMsg(scope, {
+        type: 'init',
+        cols: 55,
+        rows: 47,
+        initialData: '',
+        preserveScroll: false,
+        frame: { width: 427.5, height: 710 }
+      })
+      expect(scope.hostFrame).toEqual({ width: 427.5, height: 710 })
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+
+  it('reports ready with the box its own terminal laid out, at the app text scale', () => {
+    const { scope, posted, built } = started({ start: () => ({ textScale: 1.25, shown: true }) })
+    try {
+      expect(built).toHaveLength(1)
+      expect(built[0].options.fontSize).toBe(fontPxForScale(1.25))
+      expect(posted[0]).toEqual({
+        type: 'web-ready',
+        cellBox: { fontScale: 1.25, cellWidth: (23 / 3) * (16 / 13), cellHeight: 15 * (16 / 13) }
+      })
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+
+  it('leaves no live terminal when opening the one it builds before ready throws', () => {
+    const double = terminalDocumentDouble()
+    double.terminal.open = () => {
+      throw new Error('no surface')
+    }
+    const { scope, posted } = started({ createTerminal: () => double.terminal })
+    try {
+      expect(scope.term).toBeNull()
+      expect(double.disposals()).toBe(1)
+      expect(posted[0]).toEqual({ type: 'web-ready', cellBox: null })
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+
+  it('builds nothing before ready for a view hidden when it mounted, and reports no box', () => {
+    const { scope, posted, built } = started({ start: () => ({ textScale: 1, shown: false }) })
+    try {
+      expect(built).toHaveLength(0)
+      expect(posted[0]).toEqual({ type: 'web-ready', cellBox: null })
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+
+  it('reuses that terminal for the first init, so an open builds one xterm', async () => {
+    const { scope, posted, built, init } = started()
+    try {
+      const prepared = scope.term
+      init()
+      await untilReady(posted)
+      expect(built).toHaveLength(1)
+      expect(scope.term).toBe(prepared)
+      expect(scope.term?.cols).toBe(55)
+      expect(scope.term?.rows).toBe(47)
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+
+  it('keeps the terminal built before ready out of sight until the first init has replayed', async () => {
+    const { scope, posted, init } = started()
+    try {
+      // Hidden, not removed from layout: the box is measured and reported while it is out of sight.
+      expect(scope.surface?.style.visibility).toBe('hidden')
+      expect(scope.surface?.style.display).toBe('')
+      expect(posted[0]).toEqual({
+        type: 'web-ready',
+        cellBox: { fontScale: 1, cellWidth: 23 / 3, cellHeight: 15 }
+      })
+      init()
+      expect(scope.surface?.style.visibility).toBe('hidden')
+      await untilReady(posted)
+      expect(scope.surface?.style.visibility).toBe('')
+      // The box is the ready's own at the init's grid, which the app already holds.
+      expect(posted.filter((message) => message.type === 'cell-box')).toEqual([])
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+
+  it('reports a paused renderer at ready, before ready itself', async () => {
+    const { scope, cell, posted, init } = started()
+    try {
+      // The DOM renderer's box at the init's grid, which the paused renderer has not drawn yet.
+      cell.width = 7.8
+      init()
+      await untilReady(posted)
+      const types = posted.map((m) => m.type)
+      expect(types.indexOf('cell-box')).toBeGreaterThan(-1)
+      expect(types.indexOf('cell-box')).toBeLessThan(types.indexOf('ready'))
+      expect(boxes(posted)).toEqual([{ fontScale: 1, cellWidth: 7.8, cellHeight: 15 }])
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+
+  it('reports a text-size change on the render after it, not when the font is set', async () => {
+    // xterm updates the render service's cell box synchronously when fontSize is set
+    // (CharSizeService.measure → RenderService.handleCharSizeChanged), and onRender fires after the
+    // rows it redrew, so the next render reads the new box at the new scale.
+    const { scope, posted, render, init } = started()
+    try {
+      init()
+      await untilReady(posted)
+      const reported = boxes(posted).length
+      handleMsg(scope, { type: 'set-font-scale', fontScale: 1.25 })
+      expect(boxes(posted)).toHaveLength(reported)
+      render()
+      expect(boxes(posted).at(-1)).toEqual({
+        fontScale: 1.25,
+        cellWidth: (23 / 3) * (16 / 13),
+        cellHeight: 15 * (16 / 13)
+      })
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+
+  it('reports a renderer swap after context loss on the next render', async () => {
+    const { scope, cell, posted, render, init } = started()
+    try {
+      init()
+      await untilReady(posted)
+      cell.width = 7.8
+      render()
+      expect(boxes(posted).at(-1)).toEqual({ fontScale: 1, cellWidth: 7.8, cellHeight: 15 })
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+
+  it("refits a DOM first init once, and not again on the refit's own report", async () => {
+    const { scope, cell, posted, render, init } = started()
+    try {
+      // The terminal built before ready laid its box out at 80x24; the DOM renderer's box follows cols.
+      cell.width = 7.8
+      init()
+      await untilReady(posted)
+      expect(refits(posted)).toEqual([true])
+      cell.width = 7.9
+      reflowTo(scope, 54)
+      render()
+      expect(refits(posted)).toEqual([true, false])
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+
+  it('never refits a box that came with a new grid, so the DOM renderer cannot loop', async () => {
+    const { scope, cell, posted, render, init } = started()
+    try {
+      init()
+      await untilReady(posted)
+      for (const [cols, width] of [
+        [50, 7.9],
+        [55, 7.8],
+        [54, 8]
+      ]) {
+        cell.width = width
+        reflowTo(scope, cols)
+        render()
+      }
+      expect(refits(posted)).toEqual([false, false, false])
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+
+  it('refits a renderer swap at a grid applied in place', async () => {
+    const { scope, cell, posted, render, init } = started()
+    try {
+      init()
+      await untilReady(posted)
+      // A width change applied in place: the WebGL box is unchanged, so nothing is told.
+      reflowTo(scope, 50)
+      render()
+      expect(refits(posted)).toEqual([])
+      // WebGL context lost: the DOM fallback lays out a new box at the same grid.
+      cell.width = 7.8
+      render()
+      expect(refits(posted)).toEqual([true])
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+
+  it('refits a re-init at the same grid with a different renderer', async () => {
+    const { scope, cell, posted, init } = started()
+    try {
+      init()
+      await untilReady(posted)
+      posted.length = 0
+      cell.width = 7.8
+      init()
+      await untilReady(posted)
+      expect(refits(posted)).toEqual([true])
+    } finally {
+      stopTerminalDocument(scope)
+    }
+  })
+})
diff --git a/mobile/src/terminal/document/laid-out-cell-box.ts b/mobile/src/terminal/document/laid-out-cell-box.ts
new file mode 100644
index 000000000000..3c6c45fa723f
--- /dev/null
+++ b/mobile/src/terminal/document/laid-out-cell-box.ts
@@ -0,0 +1,38 @@
+import { sameCellBox, type TerminalLaidOutCellBox } from '../terminal-cell-box'
+import type { TerminalDocumentScope } from './document-scope'
+import { notify } from './host-notify'
+
+/** The box xterm laid out at the current text scale, with its grid; null before one. */
+export function laidOutCellBox(scope: TerminalDocumentScope): TerminalLaidOutCellBox | null {
+  const term = scope.term
+  const dimensions = term && term._core && term._core._renderService?.dimensions
+  if (!term || !dimensions) {
+    return null
+  }
+  const { width, height } = dimensions.css.cell
+  if (!(width > 0 && height > 0)) {
+    return null
+  }
+  const cellBox = { fontScale: scope.currentTextScale, cellWidth: width, cellHeight: height }
+  return { cellBox, cols: term.cols, rows: term.rows }
+}
+
+/**
+ * Tells the host each box xterm lays out that differs from the last: after init, a renderer swap
+ * on context loss, a text-size or DPR change, or a resize (the DOM renderer's width follows cols).
+ * `refit` is a box that changed while the grid did not, which only a renderer or pixel-ratio
+ * change does; one that arrives with a new grid is that grid's own, so refitting it would loop.
+ */
+export function reportLaidOutCellBox(scope: TerminalDocumentScope) {
+  const laidOut = laidOutCellBox(scope)
+  if (!laidOut) {
+    return
+  }
+  const last = scope.reportedCellBox
+  scope.reportedCellBox = laidOut
+  if (last && sameCellBox(last.cellBox, laidOut.cellBox)) {
+    return
+  }
+  const refit = last !== null && last.cols === laidOut.cols && last.rows === laidOut.rows
+  notify(scope, { type: 'cell-box', cellBox: laidOut.cellBox, refit })
+}
diff --git a/mobile/src/terminal/document/message-bridge.ts b/mobile/src/terminal/document/message-bridge.ts
index b4e21da07b7b..f86bec8b743d 100644
--- a/mobile/src/terminal/document/message-bridge.ts
+++ b/mobile/src/terminal/document/message-bridge.ts
@@ -1,5 +1,7 @@
 import { handleMsg, type TerminalHostMessage } from './host-message-router'
 import { notify, reportEngineError, type TerminalEngineError } from './host-notify'
+import { laidOutCellBox } from './laid-out-cell-box'
+import { prepareTerminal } from './terminal-init'
 import type { TerminalDocumentScope } from './document-scope'
 import type { TerminalDocumentHostFrame } from './document-host-seams'
 
@@ -45,7 +47,13 @@ export function startMessageBridge(scope: TerminalDocumentScope) {
     handleIncomingMessage(scope, frame)
   )
   if (scope.hasEngine()) {
-    notify(scope, { type: 'web-ready' })
+    // Why: ready carries the cell box xterm itself laid out, so the host sizes the first subscribe.
+    if (scope.start().shown) {
+      prepareTerminal(scope)
+    }
+    // Why: the first init's report is checked against the box the terminal built before ready laid out.
+    scope.reportedCellBox = laidOutCellBox(scope)
+    notify(scope, { type: 'web-ready', cellBox: scope.reportedCellBox?.cellBox ?? null })
   } else {
     reportEngineError(scope, 'terminal engine missing', 'xterm failed to load', true)
   }
diff --git a/mobile/src/terminal/document/native-document-bundle.test.ts b/mobile/src/terminal/document/native-document-bundle.test.ts
index 15eb000ee1f5..4389c3bb1058 100644
--- a/mobile/src/terminal/document/native-document-bundle.test.ts
+++ b/mobile/src/terminal/document/native-document-bundle.test.ts
@@ -311,7 +311,10 @@ describe('the bundled native document', () => {
     // that ships rather than about a bundle this case built for itself.
     const { script, inputs } = await terminalDocumentBundle()
     expect(inputs.filter((input) => input.includes('node_modules'))).toEqual([])
-    expect(inputs).toHaveLength(47)
+    // 50: `laid-out-cell-box` reads the cell box xterm laid out, for web-ready and each render;
+    // `terminal-grid-fit` is the one fit of that box and `terminal-cell-box` its one comparison,
+    // both shared with the app.
+    expect(inputs).toHaveLength(50)
     expect(script).not.toContain('__commonJS')
     // `__esm` wrappers are esbuild's answer to a cycle, and a cycle would make a module's top level
     // run at first import rather than where the bundle places it.
diff --git a/mobile/src/terminal/document/term-observers.ts b/mobile/src/terminal/document/term-observers.ts
index 80f3ec597afb..e35a85acc4fa 100644
--- a/mobile/src/terminal/document/term-observers.ts
+++ b/mobile/src/terminal/document/term-observers.ts
@@ -4,6 +4,7 @@ import type { TerminalDocumentScope } from './document-scope'
 import { logFeedAndEvict } from './selection-state-and-eviction'
 import { emitKeyboardAvoidanceMetrics } from './keyboard-avoidance-metrics'
 import { emitModesIfChanged } from './mode-mirroring'
+import { reportLaidOutCellBox } from './laid-out-cell-box'
 
 export function attachTermObservers(scope: TerminalDocumentScope) {
   if (!scope.term) {
@@ -36,6 +37,16 @@ export function attachTermObservers(scope: TerminalDocumentScope) {
       )
     }
   } catch {}
+  // Why: onDimensionsChange skips a renderer swap and a DPR change; every one of them re-renders.
+  try {
+    if (scope.term.onRender) {
+      scope.termObserverDisposables.push(
+        scope.term.onRender(function () {
+          reportLaidOutCellBox(scope)
+        })
+      )
+    }
+  } catch {}
   // Initial emit once buffer settles.
   afterWritesDrained(scope, function () {
     emitModesIfChanged(scope)
diff --git a/mobile/src/terminal/document/terminal-init.ts b/mobile/src/terminal/document/terminal-init.ts
index f63e2b5f508e..04e90b4578e1 100644
--- a/mobile/src/terminal/document/terminal-init.ts
+++ b/mobile/src/terminal/document/terminal-init.ts
@@ -2,8 +2,9 @@ import { emitKeyboardAvoidanceMetrics } from './keyboard-avoidance-metrics'
 import { MOBILE_TERMINAL_CARET_OPTIONS } from '../terminal-webview-html/theme'
 import { ESC } from './escape-introducers'
 import { notify } from './host-notify'
+import { reportLaidOutCellBox } from './laid-out-cell-box'
 import { fontPxForScale } from './text-scaling'
-import type { TerminalDocumentScope } from './document-scope'
+import type { TerminalDocumentScope, TerminalDocumentTerminal } from './document-scope'
 import { scheduleDocumentFrame } from './document-frame-registry'
 import { applyFitScale } from './fit-scale'
 import {
@@ -21,6 +22,63 @@ import { applyTerminalTheme } from './terminal-theme'
 import { attachWebglAddon, cancelWebglContextRecovery } from './webgl-recovery'
 import { afterWritesDrained, enqueueWrite, pumpWrites, resetWriteQueue } from './write-queue'
 
+/** Builds and opens a terminal on the current surface, with the renderer and addons attached. */
+function openTerminal(scope: TerminalDocumentScope, cols: number, rows: number) {
+  const term = scope.createTerminal({
+    cols: cols,
+    rows: rows,
+    theme: scope.terminalTheme,
+    minimumContrastRatio: scope.terminalMinimumContrastRatio,
+    fontFamily: scope.terminalFontFamily,
+    fontSize: fontPxForScale(scope.currentTextScale),
+    fontWeight: '300',
+    fontWeightBold: '500',
+    scrollback: 5000,
+    // Why: xterm suppresses parser-generated query replies when disableStdin
+    // is true. Native accepts only validated reply grammars from onData.
+    disableStdin: false,
+    cursorBlink: MOBILE_TERMINAL_CARET_OPTIONS.cursorBlink,
+    cursorStyle: MOBILE_TERMINAL_CARET_OPTIONS.cursorStyle,
+    // Native TextInput owns focus; initialize xterm's otherwise-gated main-buffer caret.
+    showCursorImmediately: MOBILE_TERMINAL_CARET_OPTIONS.showCursorImmediately,
+    // A full inactive cell remains visible under the terminal's phone-fit scale.
+    cursorInactiveStyle: MOBILE_TERMINAL_CARET_OPTIONS.cursorInactiveStyle,
+    convertEol: false,
+    allowProposedApi: true
+  })
+  scope.term = term
+  term.open(scope.surface!)
+  attachWebglAddon(scope, true)
+  try {
+    const unicodeAddon = scope.createUnicode11Addon()
+    if (unicodeAddon) {
+      term.loadAddon(unicodeAddon)
+      term.unicode.activeVersion = '11'
+    }
+  } catch {}
+  return term
+}
+
+/**
+ * The document's terminal, built before it reports ready so ready can carry the cell box xterm
+ * lays out at the app's text scale. Any size will do: the first init resizes and reuses it.
+ */
+export function prepareTerminal(scope: TerminalDocumentScope) {
+  // Why: laid out for the measure, but not shown — an empty 80x24 grid and caret until init.
+  scope.surface!.style.visibility = 'hidden'
+  try {
+    scope.committedTerm = openTerminal(scope, 80, 24)
+    scope.provisionalTerm = scope.committedTerm
+  } catch {
+    // Why: init builds again and reports the failure through the path every init failure takes.
+    scope.surface!.style.visibility = ''
+    try {
+      scope.term?.dispose()
+    } catch {}
+    scope.term = null
+  }
+}
+
 export function init(
   scope: TerminalDocumentScope,
   cols: number,
@@ -44,11 +102,15 @@ export function init(
   const scrollAnchorRows = prevB ? Math.max(0, (prevB.baseY || 0) - (prevB.viewportY || 0)) : -1
   scope.terminalGeneration++
   const gen = scope.terminalGeneration
+  const reused = scope.provisionalTerm
+  scope.provisionalTerm = null
   // Why: snapshot replay can contain old queries whose replies must never
   // re-enter the live PTY. Each replacement terminal earns authority anew.
   resetTerminalDataReplyAuthority(scope)
-  cancelWebglContextRecovery(scope)
-  scope.webglAddon = null
+  if (!reused) {
+    cancelWebglContextRecovery(scope)
+    scope.webglAddon = null
+  }
   scope.ready = false
   resetWriteQueue(scope)
   scope.statusDotPendingSelector = false
@@ -77,44 +139,27 @@ export function init(
   scope.initialOscLinks = Array.isArray(nextOscLinks) ? nextOscLinks : []
   scope.initialOscLinkRowOffset = 0
   scope.initialOscLinkEvictionReady = false
-  const surfaceSwap = beginTerminalSurfaceSwap(scope)
-  // oxlint-disable-next-line no-unused-vars -- the document declares it here; removing it is a different program
-  const nextSurface = surfaceSwap.nextSurface
+  // Why: the terminal built before ready is on the committed surface already; only a
+  // replacement needs a hidden surface to replay into.
+  const surfaceSwap = reused ? null : beginTerminalSurfaceSwap(scope)
 
   applyTerminalTheme(scope, nextTheme)
-  scope.term = scope.createTerminal({
-    cols: cols || 80,
-    rows: rows || 24,
-    theme: scope.terminalTheme,
-    minimumContrastRatio: scope.terminalMinimumContrastRatio,
-    fontFamily: scope.terminalFontFamily,
-    fontSize: fontPxForScale(scope.currentTextScale),
-    fontWeight: '300',
-    fontWeightBold: '500',
-    scrollback: 5000,
-    // Why: xterm suppresses parser-generated query replies when disableStdin
-    // is true. Native accepts only validated reply grammars from onData.
-    disableStdin: false,
-    cursorBlink: MOBILE_TERMINAL_CARET_OPTIONS.cursorBlink,
-    cursorStyle: MOBILE_TERMINAL_CARET_OPTIONS.cursorStyle,
-    // Native TextInput owns focus; initialize xterm's otherwise-gated main-buffer caret.
-    showCursorImmediately: MOBILE_TERMINAL_CARET_OPTIONS.showCursorImmediately,
-    // A full inactive cell remains visible under the terminal's phone-fit scale.
-    cursorInactiveStyle: MOBILE_TERMINAL_CARET_OPTIONS.cursorInactiveStyle,
-    convertEol: false,
-    allowProposedApi: true
-  })
-  const nextTerm = scope.term
-  scope.pendingTerm = nextTerm
-  scope.term.open(scope.surface!)
-  attachWebglAddon(scope, true)
-  try {
-    const unicodeAddon = scope.createUnicode11Addon()
-    if (unicodeAddon) {
-      scope.term.loadAddon(unicodeAddon)
-      scope.term.unicode.activeVersion = '11'
+  let nextTerm: TerminalDocumentTerminal
+  if (reused) {
+    nextTerm = reused
+    scope.term = reused
+    reused.reset()
+    reused.options.fontSize = fontPxForScale(scope.currentTextScale)
+    reused.resize(cols || 80, rows || 24)
+    // Why: its box was laid out at 80x24; the first report at this grid must read as the box
+    // changing at a kept grid, which the DOM renderer's cols-dependent box then refits once.
+    if (scope.reportedCellBox) {
+      scope.reportedCellBox = { ...scope.reportedCellBox, cols: reused.cols, rows: reused.rows }
     }
-  } catch {}
+  } else {
+    nextTerm = openTerminal(scope, cols || 80, rows || 24)
+    scope.pendingTerm = nextTerm
+  }
   if (typeof replayData === 'string' && replayData.length > 0) {
     // Why no trailing reset: the snapshot pen belongs to the live host TUI receiving later output.
     enqueueWrite(scope, ESC + '[0m' + replayData)
@@ -124,7 +169,7 @@ export function init(
   resetEvictionCounter(scope)
   cancelSelect(scope)
   attachTermObservers(scope)
-  attachTerminalQueryReplyBridge(scope, scope.term, gen)
+  attachTerminalQueryReplyBridge(scope, nextTerm, gen)
 
   scheduleDocumentFrame(scope, function () {
     if (gen !== scope.terminalGeneration) {
@@ -136,7 +181,12 @@ export function init(
       if (gen !== scope.terminalGeneration) {
         return
       }
-      commitTerminalSurfaceSwap(scope, surfaceSwap, nextTerm)
+      if (surfaceSwap) {
+        commitTerminalSurfaceSwap(scope, surfaceSwap, nextTerm)
+      } else {
+        // The terminal built before ready, shown now that it holds the replay.
+        scope.surface!.style.visibility = ''
+      }
       // Why: restore the reader's place after the rewrapped buffer replays.
       // Replay lands at bottom, so only act when they were scrolled up (rows>0).
       if (scrollAnchorRows > 0 && scope.term && scope.term.buffer && scope.term.buffer.active) {
@@ -150,6 +200,8 @@ export function init(
       scope.initialOscLinkRowOffset = 0
       scope.initialOscLinkEvictionReady = true
       applyFitScale(scope, 'init-replay')
+      // Why: a paused (hidden) render service has not rendered yet, so ready reports it too.
+      reportLaidOutCellBox(scope)
       notify(scope, { type: 'ready', cols: cols, rows: rows })
     })
   })
@@ -207,4 +259,5 @@ export function stopTerminalInit(scope: TerminalDocumentScope) {
   }
   scope.term = null
   scope.committedTerm = null
+  scope.provisionalTerm = null
 }
diff --git a/mobile/src/terminal/document/text-scaling.ts b/mobile/src/terminal/document/text-scaling.ts
index 9fd4cd0dbf3d..88d7b5dd7620 100644
--- a/mobile/src/terminal/document/text-scaling.ts
+++ b/mobile/src/terminal/document/text-scaling.ts
@@ -2,9 +2,9 @@ import { elementInRoot } from './document-host-seams'
 import { TERMINAL_TEXT_SCALES } from '../terminal-text-scales'
 import type { TerminalDocumentScope } from './document-scope'
 import { scheduleDocumentFrame } from './document-frame-registry'
-import { applyFitScale, getCellHeight, MIN_FIT_COLS } from './fit-scale'
+import { applyFitScale, getCellHeight } from './fit-scale'
+import { fitDimensionsFromCell } from '../terminal-grid-fit'
 import { getCellWidth } from './viewport-transform'
-import { emitKeyboardAvoidanceMetrics } from './keyboard-avoidance-metrics'
 
 // Why: init() flips ready false on every re-init (live width reflow included)
 // while the old surface stays visible; a document-scoped latch drives the
@@ -64,6 +64,8 @@ export function applyTextScale(scope: TerminalDocumentScope, scale: number) {
   }
   const px = fontPxForScale(scale)
   if (scope.term.options.fontSize === px) {
+    // Why: a pinch moved the drawn pitch; the fit commit is the one site that reports it.
+    applyFitScale(scope, 'text-scale')
     return
   }
   scope.term.options.fontSize = px
@@ -76,22 +78,31 @@ export function applyTextScale(scope: TerminalDocumentScope, scale: number) {
     }
     const cellW = getCellWidth(scope)
     const cellH = getCellHeight(scope)
+    // Why: fit the frame React Native laid out, by the same formula; init and measure give it. Before
+    // either, the pre-ready terminal stays hidden until the first init, which applies the font and resizes.
+    const frame = scope.hostFrame
+    if (!frame) {
+      return
+    }
     if (cellW > 0 && cellH > 0) {
-      const cols = Math.floor(scope.viewportRect().width / cellW)
-      if (cols < MIN_FIT_COLS) {
-        // Why: hidden (0 wide) or too narrow; the next box must refit at the new cell size.
-        scope.fittedBox = null
+      const fit = fitDimensionsFromCell(
+        { cellWidth: cellW, cellHeight: cellH },
+        frame.width,
+        frame.height
+      )
+      if (!fit) {
+        // Why: too narrow to resize the grid, but the fit still tracks the new cell size; hidden hosts hold it.
+        applyFitScale(scope, 'text-scale')
         return
       }
-      const rows = Math.max(8, Math.floor(scope.viewportRect().height / cellH))
-      scope.term.resize(cols, rows)
-      emitKeyboardAvoidanceMetrics(scope)
+      scope.term.resize(fit.cols, fit.rows)
     }
     applyFitScale(scope, 'text-scale')
   })
 }
 
 export function startTextScaling(scope: TerminalDocumentScope) {
+  scope.currentTextScale = scope.start().textScale
   scope.scrollIndicator = elementInRoot(scope.root, 'scroll-indicator')
   scope.scrollThumb = elementInRoot(scope.root, 'scroll-thumb')
   scope.terminalFontFamily =
diff --git a/mobile/src/terminal/document/viewport-frame.test.ts b/mobile/src/terminal/document/viewport-frame.test.ts
index 8dee5807bc11..063cf964c6fd 100644
--- a/mobile/src/terminal/document/viewport-frame.test.ts
+++ b/mobile/src/terminal/document/viewport-frame.test.ts
@@ -2,7 +2,7 @@
 import { afterEach, describe, expect, it } from 'vitest'
 import { startTerminalDocument, stopTerminalDocument } from './create-terminal-document'
 import { createTerminalDocumentScope, type TerminalDocumentScope } from './document-scope'
-import type { TerminalDocumentHost } from './document-host-seams'
+import type { TerminalDocumentHost, TerminalViewportChange } from './document-host-seams'
 import { terminalDocumentDouble } from './document-terminal-double.test-support'
 import { handleMsg } from './host-message-router'
 import { viewportToMouseReportCell } from './mouse-report-cell'
@@ -110,10 +110,12 @@ describe("the document's frame on the page", () => {
     expect(computeFitScale(scope)).toBe(1)
   })
 
-  it('commits no fit while the host is hidden, and one once it has a box', async () => {
+  it('commits no fit before the host has a box, and one once it has', async () => {
+    // A page host mounted under a hidden screen has no box until RN lays it out; hide and show after
+    // that are the mount's to absorb (terminal-web-document-mount.test.ts).
     let box = { left: 0, top: 0, width: 0, height: 0 }
     const widthsRead: number[] = []
-    const changes: (() => void)[] = []
+    const changes: ((change: TerminalViewportChange) => void)[] = []
     const scope = startedWithGrid({
       viewportRect: () => {
         widthsRead.push(box.width)
@@ -135,7 +137,7 @@ describe("the document's frame on the page", () => {
     await nextFrame()
     expect(scales).toEqual([])
     box = { left: 0, top: 0, width: 390, height: 600 }
-    changes.forEach((onChange) => onChange())
+    changes.forEach((onChange) => onChange('resized'))
     await framesUntil(() => scales.length === 2)
     // The refit repaints at the scale it has, then the fit commits once: 390 / (7.5 x 55).
     expect(scales).toEqual(['1', String(FIT_390)])
@@ -157,92 +159,4 @@ describe("the document's frame on the page", () => {
     expect(edge(400)).toBe(0)
     expect(edge(120)).toBe(-1)
   })
-
-  it('keeps pan and zoom across hide and show, and refits when the box really changes', async () => {
-    // react-native-screens hides the session when another screen covers it and shows it again at
-    // the same size; native never refits on navigation, so the pan the user left must survive.
-    let box = { left: 0, top: 0, width: 390, height: 600 }
-    const changes: (() => void)[] = []
-    const scope = startedWithGrid({
-      viewportRect: () => box,
-      observeViewport: (onChange) => {
-        changes.push(onChange)
-        return () => {}
-      }
-    })
-    const resize = async (width: number, height: number) => {
-      box = { left: 0, top: 0, width, height }
-      changes.forEach((onChange) => onChange())
-      await nextFrame()
-      await nextFrame()
-    }
-    await framesUntil(() => scope.currentScale === FIT_390)
-    scope.panX = -40
-    scope.panY = -30
-    scope.userScale = 1.5
-    const kept = { panX: -40, panY: -30, userScale: 1.5, currentScale: scope.currentScale }
-    const view = () => {
-      const { panX, panY, userScale, currentScale } = scope
-      return { panX, panY, userScale, currentScale }
-    }
-
-    await resize(0, 0)
-    expect(view()).toEqual(kept)
-    await resize(390, 600)
-    expect(view()).toEqual(kept)
-
-    box = { left: 0, top: 0, width: 300, height: 600 }
-    changes.forEach((onChange) => onChange())
-    await framesUntil(() => scope.currentScale === 300 / (7.5 * 55))
-    expect(view()).toEqual({ panX: 0, panY: 0, userScale: 1, currentScale: 300 / (7.5 * 55) })
-  })
-
-  it('refits on show when a fit was asked for while hidden, even at the same box', async () => {
-    let box = { left: 0, top: 0, width: 390, height: 600 }
-    const changes: (() => void)[] = []
-    const scope = startedWithGrid({
-      viewportRect: () => box,
-      observeViewport: (onChange) => {
-        changes.push(onChange)
-        return () => {}
-      }
-    })
-    const show = (width: number, height: number) => {
-      box = { left: 0, top: 0, width, height }
-      changes.forEach((onChange) => onChange())
-    }
-    await framesUntil(() => scope.currentScale === FIT_390)
-    show(0, 0)
-    handleMsg(scope, { type: 'resize', cols: 80, rows: 40 })
-    await nextFrame()
-    show(390, 600)
-    await framesUntil(() => scope.currentScale !== FIT_390, { required: false })
-    expect(scope.currentScale).toBe(390 / (7.5 * 80))
-  })
-
-  it('refits on show after a text-scale change while hidden', async () => {
-    let box = { left: 0, top: 0, width: 390, height: 600 }
-    const changes: (() => void)[] = []
-    const scope = startedWithGrid({
-      viewportRect: () => box,
-      observeViewport: (onChange) => {
-        changes.push(onChange)
-        return () => {}
-      }
-    })
-    const show = (width: number, height: number) => {
-      box = { left: 0, top: 0, width, height }
-      changes.forEach((onChange) => onChange())
-    }
-    await framesUntil(() => scope.currentScale === FIT_390)
-    show(0, 0)
-    handleMsg(scope, { type: 'set-font-scale', fontScale: 0.8 })
-    await nextFrame()
-    await nextFrame()
-    show(390, 600)
-    // The smaller font's cells: 55 columns at fontPxForScale(0.8) = 10 px, 7.5 x 10/13 each.
-    const fitted = 390 / (7.5 * (10 / 13) * 55)
-    await framesUntil(() => scope.currentScale !== FIT_390, { required: false })
-    expect(scope.currentScale).toBe(Math.min(1, fitted) >= 0.95 ? 1 : fitted)
-  })
 })
diff --git a/mobile/src/terminal/document/viewport-transform.ts b/mobile/src/terminal/document/viewport-transform.ts
index 4f60fc9eca1a..61190307db4e 100644
--- a/mobile/src/terminal/document/viewport-transform.ts
+++ b/mobile/src/terminal/document/viewport-transform.ts
@@ -19,6 +19,15 @@ export function flog(scope: TerminalDocumentScope, tag: string, payload: Record<
   } catch {}
 }
 
+/** 0 until the renderer has measured a cell. */
+export function getMeasuredCellHeight(scope: TerminalDocumentScope) {
+  const core = scope.term?._core
+  if (core && core._renderService && core._renderService.dimensions) {
+    return core._renderService.dimensions.css.cell.height || 0
+  }
+  return 0
+}
+
 export function getCellWidth(scope: TerminalDocumentScope) {
   if (!scope.term || !scope.term._core) {
     return 0
@@ -51,7 +60,7 @@ export function computeFitScale(scope: TerminalDocumentScope) {
     return 1
   }
   const vpWidth = scope.viewportRect().width
-  // Why: a host hidden with display:none measures 0; a 0 scale would blank it when shown again.
+  // Why: a viewport with no width yet (a page host never laid out) would give scale 0 and blank the grid.
   if (vpWidth <= 0) {
     return 1
   }
diff --git a/mobile/src/terminal/terminal-cell-box-refit.test.tsx b/mobile/src/terminal/terminal-cell-box-refit.test.tsx
new file mode 100644
index 000000000000..0bf8e774bc94
--- /dev/null
+++ b/mobile/src/terminal/terminal-cell-box-refit.test.tsx
@@ -0,0 +1,128 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { TerminalWebViewHandle } from './terminal-webview-contract'
+import { useTerminalViewportRefit, type TerminalViewportDims } from './terminal-viewport-refit'
+
+vi.mock('react-native', () => ({
+  AppState: { currentState: 'active', addEventListener: () => ({ remove() {} }) },
+  Platform: { OS: 'android' },
+  useWindowDimensions: () => ({ width: 427, height: 900 })
+}))
+
+const HANDLE = 'term-1'
+
+/** The session's refit over one open terminal whose document reported a `cellWidth` box. */
+function refitHarness(cellWidth: number) {
+  const terminal: TerminalWebViewHandle = {
+    prepareForForegroundRecovery: vi.fn(),
+    write: vi.fn(),
+    init: vi.fn(),
+    resize: vi.fn(),
+    reflow: vi.fn(),
+    clear: vi.fn(),
+    // The reported box, 47 rows high in the 710 px frame.
+    fitDimensions: vi.fn((frame: { width: number }) => ({
+      cols: Math.floor(frame.width / cellWidth),
+      rows: 47
+    })),
+    resetZoom: vi.fn(),
+    cancelSelect: vi.fn(),
+    doSelectAll: vi.fn(),
+    awaitReady: vi.fn(async () => {})
+  }
+  const viewportRef: { current: TerminalViewportDims | null } = { current: { cols: 55, rows: 47 } }
+  const subscribeToTerminal = vi.fn()
+  const unsubscribeTerminal = vi.fn()
+  const terminalFrameRef: { current: { width: number; height: number } | null } = {
+    current: { width: 427, height: 710 }
+  }
+  let refit: ReturnType<typeof useTerminalViewportRefit> | undefined
+  function Probe() {
+    refit = useTerminalViewportRefit({
+      activeHandleRef: { current: HANDLE },
+      terminalRefs: { current: new Map([[HANDLE, terminal]]) },
+      terminalFrameRef,
+      viewportRef,
+      viewportMeasuredRef: { current: true },
+      nativeChatCoveredRef: { current: false },
+      clientRef: { current: null },
+      deviceTokenRef: { current: null },
+      initializedHandlesRef: { current: new Set([HANDLE]) },
+      connState: 'connected',
+      tabStripVisible: false,
+      textScale: 1,
+      unsubscribeTerminal,
+      subscribeToTerminal
+    })
+    return null
+  }
+  act(() => {
+    renderer = create(createElement(Probe))
+  })
+  return {
+    terminal,
+    viewportRef,
+    subscribeToTerminal,
+    report: (handle: string) => act(() => refit!.notifyTerminalCellBoxChange(handle)),
+    // The session's onLayout: the one frame store, then the width notify.
+    layOut: (width: number) =>
+      act(() => {
+        terminalFrameRef.current = { width, height: 710 }
+        refit!.notifyTerminalFrameWidth()
+      })
+  }
+}
+
+let renderer: ReactTestRenderer | undefined
+beforeEach(() => {
+  vi.useFakeTimers()
+})
+afterEach(() => {
+  act(() => renderer?.unmount())
+  renderer = undefined
+  vi.useRealTimers()
+})
+
+describe('a new cell box for the open terminal', () => {
+  it('refits the PTY to the grid the new box fits, as after a renderer swap', async () => {
+    const harness = refitHarness(7.8)
+    harness.report(HANDLE)
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(150)
+    })
+    expect(harness.terminal.fitDimensions).toHaveBeenLastCalledWith({ width: 427, height: 710 })
+    expect(harness.viewportRef.current).toEqual({ cols: 54, rows: 47 })
+    expect(harness.subscribeToTerminal).toHaveBeenCalledWith(HANDLE)
+  })
+
+  it('leaves a terminal that is not on screen alone', async () => {
+    const harness = refitHarness(7.8)
+    harness.report('term-2')
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(150)
+    })
+    expect(harness.subscribeToTerminal).not.toHaveBeenCalled()
+    expect(harness.viewportRef.current).toEqual({ cols: 55, rows: 47 })
+  })
+
+  it('leaves the PTY alone when a new frame width holds the same grid, as sub-pixel jitter does', async () => {
+    const harness = refitHarness(23 / 3)
+    harness.layOut(427.3)
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(150)
+    })
+    expect(harness.subscribeToTerminal).not.toHaveBeenCalled()
+    expect(harness.viewportRef.current).toEqual({ cols: 55, rows: 47 })
+  })
+
+  it('refits when a new frame width holds a different grid', async () => {
+    const harness = refitHarness(23 / 3)
+    harness.layOut(420)
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(150)
+    })
+    expect(harness.terminal.fitDimensions).toHaveBeenLastCalledWith({ width: 420, height: 710 })
+    expect(harness.viewportRef.current).toEqual({ cols: 54, rows: 47 })
+  })
+})
diff --git a/mobile/src/terminal/terminal-cell-box.test.ts b/mobile/src/terminal/terminal-cell-box.test.ts
new file mode 100644
index 000000000000..9ddec3bcc073
--- /dev/null
+++ b/mobile/src/terminal/terminal-cell-box.test.ts
@@ -0,0 +1,17 @@
+import { describe, expect, it } from 'vitest'
+import { readTerminalCellBox } from './terminal-cell-box'
+
+// 23 device px at DPR 3: the WebGL renderer's 13px cell on the emulator.
+const CELL_1X = { fontScale: 1, cellWidth: 23 / 3, cellHeight: 15 }
+
+describe('readTerminalCellBox', () => {
+  it('reads nothing from a notify without a cell box', () => {
+    expect(readTerminalCellBox({ type: 'web-ready' })).toBeNull()
+  })
+
+  it('reads a well-formed box and rejects a malformed one', () => {
+    expect(readTerminalCellBox({ cellBox: CELL_1X })).toEqual(CELL_1X)
+    expect(readTerminalCellBox({ cellBox: { ...CELL_1X, cellWidth: 0 } })).toBeNull()
+    expect(readTerminalCellBox({ cellBox: [CELL_1X] })).toBeNull()
+  })
+})
diff --git a/mobile/src/terminal/terminal-cell-box.ts b/mobile/src/terminal/terminal-cell-box.ts
new file mode 100644
index 000000000000..843150499913
--- /dev/null
+++ b/mobile/src/terminal/terminal-cell-box.ts
@@ -0,0 +1,36 @@
+/**
+ * The cell box xterm laid out in one document, so the first subscribe after ready carries the phone's dims.
+ *
+ * The document builds its terminal before it reports ready, puts that box in `web-ready`, and
+ * reports it again whenever xterm lays out a different one.
+ */
+export type TerminalCellBox = { fontScale: number; cellWidth: number; cellHeight: number }
+
+/** A box xterm laid out, with the grid it was laid out at: the document's own record. */
+export type TerminalLaidOutCellBox = { cellBox: TerminalCellBox; cols: number; rows: number }
+
+function positive(value: unknown): number | null {
+  return typeof value === 'number' && Number.isFinite(value) && value > 0 ? value : null
+}
+
+/** The notify's `cellBox` when well formed; null when absent or malformed. */
+export function readTerminalCellBox(msg: Record<string, unknown>): TerminalCellBox | null {
+  const box = msg.cellBox
+  if (
+    typeof box !== 'object' ||
+    box === null ||
+    !('fontScale' in box && 'cellWidth' in box && 'cellHeight' in box)
+  ) {
+    return null
+  }
+  const fontScale = positive(box.fontScale)
+  const cellWidth = positive(box.cellWidth)
+  const cellHeight = positive(box.cellHeight)
+  return fontScale !== null && cellWidth !== null && cellHeight !== null
+    ? { fontScale, cellWidth, cellHeight }
+    : null
+}
+
+export function sameCellBox(a: TerminalCellBox, b: TerminalCellBox): boolean {
+  return a.fontScale === b.fontScale && a.cellWidth === b.cellWidth && a.cellHeight === b.cellHeight
+}
diff --git a/mobile/src/terminal/terminal-foreground-recovery.test.ts b/mobile/src/terminal/terminal-foreground-recovery.test.ts
index abf1bd01045f..50fcda6ec52d 100644
--- a/mobile/src/terminal/terminal-foreground-recovery.test.ts
+++ b/mobile/src/terminal/terminal-foreground-recovery.test.ts
@@ -2,23 +2,12 @@ import type { RefObject } from 'react'
 import { describe, expect, it, vi } from 'vitest'
 import type { ConnectionState } from '../transport/types'
 import type { TerminalWebViewHandle } from './TerminalWebView'
-import { readMobileSessionRouteSource } from '../session/mobile-session-route-source-family.test-support'
 import {
   TERMINAL_FOREGROUND_RECOVERY_DELAY_MS,
   recoverActiveTerminalAfterForeground,
   shouldRecoverTerminalOnAppStateChange
 } from './terminal-foreground-recovery'
 
-const lifecycleSource = readMobileSessionRouteSource('../session/use-mobile-session-lifecycle.ts')
-
-function sliceSessionSource(startPattern: string, endPattern: string): string {
-  const start = lifecycleSource.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = lifecycleSource.indexOf(endPattern, start)
-  expect(end).toBeGreaterThan(start)
-  return lifecycleSource.slice(start, end)
-}
-
 type RecoveryHarness = {
   activeHandleRef: RefObject<string | null>
   terminalRefs: RefObject<Map<string, TerminalWebViewHandle>>
@@ -139,37 +128,4 @@ describe('terminal foreground recovery', () => {
 
     expect(harness.subscribeToTerminal).not.toHaveBeenCalled()
   })
-
-  it('is wired to AppState foregrounding in the session screen', () => {
-    const foregroundPredicate = sliceSessionSource(
-      'const shouldRecover = shouldRecoverTerminalOnAppStateChange(',
-      'previousAppState = nextAppState'
-    )
-
-    expect(lifecycleSource).toContain('shouldRecoverTerminalOnAppStateChange')
-    expect(foregroundPredicate).toContain('Platform.OS')
-    expect(lifecycleSource).toContain('recoverActiveTerminalAfterForeground({')
-    expect(lifecycleSource).toContain("AppState.addEventListener('change'")
-    const readinessInvalidation = lifecycleSource.indexOf(
-      'terminalRef.prepareForForegroundRecovery()'
-    )
-    const replay = lifecycleSource.indexOf('recoverActiveTerminalAfterForeground({')
-    expect(readinessInvalidation).toBeGreaterThanOrEqual(0)
-    expect(replay).toBeGreaterThan(readinessInvalidation)
-  })
-
-  it('re-runs a deferred recovery once the session screen reconnects', () => {
-    // Why: resume usually lands mid-reconnect; the session screen must retry
-    // recovery on the connState→connected transition or blanked panes stay
-    // stale until a manual tab switch.
-    expect(lifecycleSource).toContain(
-      "pendingForegroundRecoveryRef.current = outcome === 'deferred'"
-    )
-    const reconnectRetry = sliceSessionSource(
-      "if (connState !== 'connected' || !pendingForegroundRecoveryRef.current)",
-      'recoverActiveTerminalAfterForeground({'
-    )
-    expect(reconnectRetry).toContain('pendingForegroundRecoveryRef.current = false')
-    expect(reconnectRetry).toContain("AppState.currentState !== 'active'")
-  })
 })
diff --git a/mobile/src/terminal/terminal-grid-fit.test.ts b/mobile/src/terminal/terminal-grid-fit.test.ts
new file mode 100644
index 000000000000..77c0be8cdcbe
--- /dev/null
+++ b/mobile/src/terminal/terminal-grid-fit.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, it } from 'vitest'
+import { fitDimensionsFromCell } from './terminal-grid-fit'
+
+// 23 device px at DPR 3: the WebGL renderer's 13px cell on the emulator.
+const CELL_1X = { cellWidth: 23 / 3, cellHeight: 15 }
+
+describe('fitDimensionsFromCell', () => {
+  it('fits the frame React Native laid out', () => {
+    // floor(427 / 7.667) = 55, floor(710 / 15) = 47
+    expect(fitDimensionsFromCell(CELL_1X, 427, 710)).toEqual({ cols: 55, rows: 47 })
+  })
+
+  it('answers null for a frame too narrow to fit', () => {
+    expect(fitDimensionsFromCell(CELL_1X, 100, 710)).toBeNull()
+  })
+
+  it('keeps an exact fit at a fractional pixel ratio whole', () => {
+    // 900 device px of frame over 18 px cells at 2.75 is 50 columns; the two quotients divide
+    // to 49.999… in floating point.
+    const cell = { cellWidth: 18 / 2.75, cellHeight: 40 / 2.75 }
+    expect(fitDimensionsFromCell(cell, 900 / 2.75, 1320 / 2.75)).toEqual({ cols: 50, rows: 33 })
+  })
+
+  it('still falls short of a column the frame does not hold', () => {
+    const cell = { cellWidth: 393 / 51, cellHeight: 15 }
+    expect(fitDimensionsFromCell(cell, 1080 / 2.75, 600)?.cols).toBe(50)
+  })
+})
diff --git a/mobile/src/terminal/terminal-grid-fit.ts b/mobile/src/terminal/terminal-grid-fit.ts
new file mode 100644
index 000000000000..3f8daf8c6821
--- /dev/null
+++ b/mobile/src/terminal/terminal-grid-fit.ts
@@ -0,0 +1,28 @@
+/**
+ * The one fit of a cell box to the terminal frame, shared by the app and the document so a first
+ * subscribe and every later refit reach the same grid from the same frame width.
+ */
+
+export type TerminalFitDimensions = { cols: number; rows: number }
+
+/** Below these the fit is not a terminal anyone can read, and the caller disables fit-to-phone. */
+export const MIN_FIT_COLS = 20
+export const MIN_FIT_ROWS = 8
+
+// Why: frame and cell are each device pixels over the pixel ratio, so an exact fit can divide to
+// 49.999…; a real shortfall is at least 1/cell-device-px (> 0.02) below the next integer.
+const EXACT_FIT_TOLERANCE = 1e-6
+
+/** The grid the frame (as React Native laid it out) holds at this cell box; null when too narrow. */
+export function fitDimensionsFromCell(
+  cell: { cellWidth: number; cellHeight: number },
+  width: number,
+  height: number
+): TerminalFitDimensions | null {
+  const cols = Math.floor(width / cell.cellWidth + EXACT_FIT_TOLERANCE)
+  if (!(cols >= MIN_FIT_COLS)) {
+    return null
+  }
+  const rows = Math.floor(height / cell.cellHeight + EXACT_FIT_TOLERANCE)
+  return { cols, rows: Math.max(MIN_FIT_ROWS, rows) }
+}
diff --git a/mobile/src/terminal/terminal-input-connection-gate.test.ts b/mobile/src/terminal/terminal-input-connection-gate.test.ts
index 4d55c31bcf4d..747f0eaab4c7 100644
--- a/mobile/src/terminal/terminal-input-connection-gate.test.ts
+++ b/mobile/src/terminal/terminal-input-connection-gate.test.ts
@@ -1,28 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { resolveMobileTerminalInputGate } from './terminal-input-connection-gate'
 import { buildTerminalSendParams, TERMINAL_INPUT_SEND_OPTIONS } from './terminal-send-request'
-import { readMobileSessionRouteSource } from '../session/mobile-session-route-source-family.test-support'
-
-const runtimeSource = readMobileSessionRouteSource(
-  '../session/use-mobile-session-terminal-runtime.ts'
-)
-const sendActionsSource = readMobileSessionRouteSource(
-  '../session/use-mobile-session-terminal-send-actions.ts'
-)
-const terminalInputSource = readMobileSessionRouteSource(
-  '../session/use-mobile-session-terminal-input.ts'
-)
-const commandDockSource = readMobileSessionRouteSource('../session/MobileSessionCommandDock.tsx')
-
-function sourceSlice(source: string, anchorStart: string, anchorEnd: string): string {
-  const start = source.indexOf(anchorStart)
-  expect(start).toBeGreaterThanOrEqual(0)
-  // Why: a duplicated start anchor would silently slice the wrong region.
-  expect(source.indexOf(anchorStart, start + 1)).toBe(-1)
-  const end = source.indexOf(anchorEnd, start)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end + anchorEnd.length)
-}
 
 describe('terminal input connection gate', () => {
   it('Given a live connection on a terminal tab Then composing and sending are both allowed', () => {
@@ -83,74 +61,9 @@ describe('terminal input connection gate', () => {
   })
 })
 
-describe('session route offline-compose wiring', () => {
-  it('derives both gates from the shared resolver', () => {
-    expect(runtimeSource).toContain('resolveMobileTerminalInputGate({')
-  })
-
-  it('keeps the buffered command box editable offline while the live capture stays send-gated', () => {
-    const bufferedInput = sourceSlice(
-      commandDockSource,
-      'ref={bindCommandField}',
-      'onSubmitEditing={() => void handleSend()}'
-    )
-    expect(bufferedInput).toContain('editable={canCompose}')
-
-    const liveCapture = sourceSlice(
-      commandDockSource,
-      'ref={bindLiveInputField}',
-      'importantForAutofill="no"'
-    )
-    expect(liveCapture).toContain('editable={canSend}')
-  })
-
-  it('keeps the send button connection-gated so held text cannot fire into a dead link', () => {
-    const sendButton = sourceSlice(
-      commandDockSource,
-      'styles.sendButton,',
-      'accessibilityLabel="Send command"'
-    )
-    expect(sendButton).toContain('disabled={!canSend}')
-  })
-
-  it('holds composed text when the return key submits offline', () => {
-    const handleSend = sourceSlice(
-      sendActionsSource,
-      'async function handleSend()',
-      'sendingRef.current = true'
-    )
-    expect(handleSend).toContain('!canSend')
-  })
-
-  it('keeps the live/buffered mode toggle reachable offline', () => {
-    const modeToggle = sourceSlice(
-      commandDockSource,
-      'liveInputEnabled && styles.accessoryKeyActive',
-      'onPress={toggleLiveInput}'
-    )
-    expect(modeToggle).toContain('disabled={!canCompose}')
-  })
-
-  it('tells the live-input commit hook about connection loss so stale mirror state resets', () => {
-    const hookCall = sourceSlice(
-      runtimeSource,
-      'useTerminalLiveInputCommit({',
-      'setLiveInputCapture'
-    )
-    expect(hookCall).toContain("connected: connState === 'connected'")
-  })
-
+describe('terminal send request shape', () => {
   it('keeps every keystroke-grade terminal send now-or-never so nothing replays after reconnect', () => {
-    // Live mirror, buffered send, and gesture arrows must all opt out of the
-    // connect wait — a parked send replays stale bytes into the PTY. Accessory
-    // keys get the same option inside terminal-live-accessory-raw-send.ts.
-    expect(sendActionsSource).toContain('TERMINAL_INPUT_SEND_OPTIONS')
-    expect(terminalInputSource).toContain('TERMINAL_INPUT_SEND_OPTIONS')
-    const optionUses = [sendActionsSource, terminalInputSource].flatMap(
-      (source) => source.match(/TERMINAL_INPUT_SEND_OPTIONS/g) ?? []
-    ).length
-    // Two owner imports plus one buffered, one live, and one gesture send.
-    expect(optionUses).toBe(5)
+    // A parked send replays stale bytes into the PTY once the socket comes back.
     expect(TERMINAL_INPUT_SEND_OPTIONS).toEqual({ failWhenDisconnected: true })
   })
 
diff --git a/mobile/src/terminal/terminal-ios-dictation-write-back.test.ts b/mobile/src/terminal/terminal-ios-dictation-write-back.test.ts
deleted file mode 100644
index 9929f09c37dd..000000000000
--- a/mobile/src/terminal/terminal-ios-dictation-write-back.test.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { readMobileSessionRouteSource } from '../session/mobile-session-route-source-family.test-support'
-
-const commandDockSource = readMobileSessionRouteSource('../session/MobileSessionCommandDock.tsx')
-const sendActionsSource = readMobileSessionRouteSource(
-  '../session/use-mobile-session-terminal-send-actions.ts'
-)
-
-// Why: iOS terminates an active keyboard-dictation (and IME) session whenever
-// JS writes a value into the focused field that differs from the native text
-// (RN applies it via setTextAndSelection / _setAttributedString). Terminal
-// inputs therefore must echo the raw field text in their controlled value and
-// apply dash normalization only on the send/mirror path. See stablyai/orca#7925.
-describe('terminal iOS dictation write-back', () => {
-  it('does not write normalized text back into the buffered command input value', () => {
-    expect(commandDockSource).toContain('onChangeText={bufferedTerminalDraftState.setInput}')
-    expect(commandDockSource).not.toContain('setInput((previousText) => normalizeTerminalTextInput')
-  })
-
-  it('still normalizes the buffered command text at send time', () => {
-    expect(sendActionsSource).toContain('normalizeTerminalTextInput(draft)')
-  })
-})
diff --git a/mobile/src/terminal/terminal-ios-ime-keyboard.test.ts b/mobile/src/terminal/terminal-ios-ime-keyboard.test.ts
deleted file mode 100644
index 573dcf04bbf5..000000000000
--- a/mobile/src/terminal/terminal-ios-ime-keyboard.test.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { readMobileSessionRouteSource } from '../session/mobile-session-route-source-family.test-support'
-
-const commandDockSource = readMobileSessionRouteSource('../session/MobileSessionCommandDock.tsx')
-
-describe('terminal iOS IME keyboard', () => {
-  it('does not force terminal inputs onto the ASCII-only iOS keyboard', () => {
-    expect(commandDockSource).not.toContain("'ascii-capable'")
-    expect(commandDockSource).not.toContain('"ascii-capable"')
-  })
-
-  it('subscribes live capture to onChange so the marked-text report survives', () => {
-    // onChangeText hands over only a string, discarding the preedit report that
-    // decides whether the text may reach the PTY at all.
-    expect(commandDockSource).toContain('onChange={handleLiveInputChange}')
-    expect(commandDockSource).not.toContain('onChangeText={handleLiveInputChange}')
-  })
-
-  it('does not put terminal keyboard capture behind iOS textContentType semantics', () => {
-    expect(commandDockSource).not.toContain('textContentType="none"')
-    expect(commandDockSource).toContain('autoComplete="off"')
-  })
-})
diff --git a/mobile/src/terminal/terminal-keyboard-avoidance-lift.test.ts b/mobile/src/terminal/terminal-keyboard-avoidance-lift.test.ts
index 4c11320db2e3..d98ba59566e6 100644
--- a/mobile/src/terminal/terminal-keyboard-avoidance-lift.test.ts
+++ b/mobile/src/terminal/terminal-keyboard-avoidance-lift.test.ts
@@ -103,6 +103,13 @@ describe('computeActiveTerminalKeyboardLift', () => {
       terminalFrameHeight: FRAME_HEIGHT
     })
     expect(lift).toBeLessThanOrEqual(KEYBOARD_LIFT)
+    // With the drawn row pitch too, and a grid drawn taller than the frame it is lifted in.
+    const taller = computeActiveTerminalKeyboardLift({
+      keyboardLift: KEYBOARD_LIFT,
+      metrics: metrics({ rows: 60, rowPitch: 18, cursorY: 59, contentBottomRow: 59 }),
+      terminalFrameHeight: FRAME_HEIGHT
+    })
+    expect(taller).toBe(KEYBOARD_LIFT)
   })
 
   it('uses the platform-adjusted lift proportionally on iOS and Android', () => {
@@ -119,4 +126,90 @@ describe('computeActiveTerminalKeyboardLift', () => {
     })
     expect({ android, ios }).toEqual({ android: 220, ios: 186 })
   })
+
+  /** Base's arithmetic, kept here as the oracle a covered frame must match to the pixel. */
+  function baseLift(keyboardLift: number, m: TerminalKeyboardAvoidanceMetrics, frame: number) {
+    if (keyboardLift <= 0) {
+      return 0
+    }
+    if (m.rows <= 0 || frame <= 0 || m.altScreen) {
+      return keyboardLift
+    }
+    const rowHeight = frame / m.rows
+    const anchorBottom = (Math.max(m.cursorY, m.contentBottomRow) + 1) * rowHeight
+    return Math.min(keyboardLift, Math.max(0, anchorBottom + rowHeight - (frame - keyboardLift)))
+  }
+
+  describe('a keyboard that covers the frame', () => {
+    const lift = (keyboardLift: number, m: TerminalKeyboardAvoidanceMetrics, frame = 713.7) =>
+      computeActiveTerminalKeyboardLift({
+        keyboardLift,
+        metrics: m,
+        terminalFrameHeight: frame
+      })
+
+    it('keeps base in phone mode, where the fit fills the frame to within a row', () => {
+      // Pixel_API_37: 47 rows of 15 px in a 713.7 px frame under a 312 px keyboard.
+      const phone = metrics({ rows: 47, rowPitch: 15, cursorY: 46, contentBottomRow: 46 })
+      expect(lift(312, phone)).toBe(312)
+      expect(lift(312, phone)).toBe(baseLift(312, phone, 713.7))
+    })
+
+    it('lifts a desktop-mode grid only by what the keyboard hides of it', () => {
+      // Pixel_API_37, measured blank: 40 desktop rows drawn 270 px tall, lifted 312 under the header.
+      const drawn270 = metrics({ rows: 40, rowPitch: 6.75, cursorY: 39, contentBottomRow: 39 })
+      expect(lift(312, drawn270)).toBe(0)
+      expect(lift(312, { ...drawn270, altScreen: true })).toBe(0)
+      // 425 px drawn, the dock at 401.7: the caret row's bottom lands on the dock.
+      const drawn425 = metrics({ rows: 50, rowPitch: 8.5, cursorY: 49, contentBottomRow: 49 })
+      expect(lift(312, drawn425)).toBeCloseTo(23.3, 5)
+      expect(lift(312, { ...drawn425, altScreen: true })).toBeCloseTo(23.3, 5)
+      // A caret mid-grid lifts only enough to clear its row plus one: 47 x 8.5 + 8.5 - 401.7.
+      expect(lift(312, { ...drawn425, cursorY: 46, contentBottomRow: 46 })).toBeCloseTo(6.3, 5)
+      expect(lift(312, { ...drawn425, cursorY: 45, contentBottomRow: 45 })).toBe(0)
+    })
+
+    it('lifts nothing for a keyboard that is open and covers nothing', () => {
+      expect(lift(0, metrics({ rows: 50, rowPitch: 17, cursorY: 49, contentBottomRow: 49 }))).toBe(
+        0
+      )
+    })
+
+    it('stays under the strip while stale rows outlast a rotation or a text-size change', () => {
+      const rotated = metrics({ rows: 47, rowPitch: 15, cursorY: 46, contentBottomRow: 46 })
+      expect(lift(150, rotated, 300)).toBe(150)
+      const resized = metrics({ rows: 47, rowPitch: 18, cursorY: 46, contentBottomRow: 46 })
+      expect(lift(312, resized)).toBe(312)
+    })
+
+    it('matches base wherever the drawn grid fills the frame, and never lifts past it elsewhere', () => {
+      let matched = 0
+      let drawnShort = 0
+      for (const rows of [8, 26, 47, 50, 80]) {
+        for (const rowPitch of [undefined, 5.1, 8.5, 15, 18, 25]) {
+          for (const frame of [300, 401.7, 710.33, 713.7]) {
+            for (const keyboard of [0.5, 150, 312, 336]) {
+              for (const anchor of [0, Math.floor(rows / 2), rows - 1]) {
+                const m = metrics({ rows, rowPitch, cursorY: anchor, contentBottomRow: anchor })
+                const got = lift(keyboard, m, frame)
+                const drawn = rowPitch === undefined ? frame : rows * rowPitch
+                // The fit floors rows, so a grid that fills the frame leaves less than a row.
+                if (drawn >= frame - (rowPitch ?? 0)) {
+                  expect(got).toBe(baseLift(keyboard, m, frame))
+                  matched++
+                  continue
+                }
+                expect(got).toBeLessThanOrEqual(keyboard)
+                expect(got).toBeLessThanOrEqual(Math.max(0, drawn - (frame - keyboard)) + 1e-9)
+                drawnShort++
+              }
+            }
+          }
+        }
+      }
+      // Presence: both halves of the sweep ran.
+      expect(matched).toBeGreaterThan(500)
+      expect(drawnShort).toBeGreaterThan(500)
+    })
+  })
 })
diff --git a/mobile/src/terminal/terminal-keyboard-avoidance-lift.ts b/mobile/src/terminal/terminal-keyboard-avoidance-lift.ts
index 6ada640430d9..003b42b50c40 100644
--- a/mobile/src/terminal/terminal-keyboard-avoidance-lift.ts
+++ b/mobile/src/terminal/terminal-keyboard-avoidance-lift.ts
@@ -1,11 +1,16 @@
 import type { TerminalKeyboardAvoidanceMetrics } from './terminal-webview-contract'
 
 type ActiveTerminalKeyboardLiftParams = {
+  // What the keyboard covers of the frame.
   keyboardLift: number
   metrics: TerminalKeyboardAvoidanceMetrics | undefined
   terminalFrameHeight: number
 }
 
+/**
+ * How far to lift the active pane so its anchor row clears the keyboard. Never more than the strip
+ * the keyboard covers, nor more than it hides of the grid as drawn.
+ */
 export function computeActiveTerminalKeyboardLift(
   params: ActiveTerminalKeyboardLiftParams
 ): number {
@@ -16,14 +21,33 @@ export function computeActiveTerminalKeyboardLift(
   if (!metrics || metrics.rows <= 0 || terminalFrameHeight <= 0) {
     return keyboardLift
   }
+  const dockTop = terminalFrameHeight - keyboardLift
+  const pitch = metrics.rowPitch
+  // Desktop display mode draws the desktop's rows scaled down, well short of the frame; lifting
+  // by the strip there moved the whole grid under the header. The fit floors rows, so a gap under
+  // one row is a grid that fills the frame, and keeps the arithmetic below.
+  if (pitch && metrics.rows * pitch < terminalFrameHeight - pitch) {
+    const drawnHidden = metrics.rows * pitch - dockTop
+    if (drawnHidden <= 0) {
+      return 0
+    }
+    const hidden = Math.min(keyboardLift, drawnHidden)
+    return metrics.altScreen ? hidden : Math.min(hidden, anchorOverflow(metrics, pitch, dockTop))
+  }
   if (metrics.altScreen) {
     return keyboardLift
   }
   const rowHeight = terminalFrameHeight / metrics.rows
+  return Math.min(keyboardLift, anchorOverflow(metrics, rowHeight, dockTop))
+}
+
+/** How far the anchor row, plus one row of margin, reaches below `visibleBottom`. */
+function anchorOverflow(
+  metrics: TerminalKeyboardAvoidanceMetrics,
+  rowHeight: number,
+  visibleBottom: number
+): number {
   // Main-buffer TUI footer rows can sit below the caret.
   const anchorRow = Math.max(metrics.cursorY, metrics.contentBottomRow)
-  const anchorBottom = (anchorRow + 1) * rowHeight
-  const dockTop = terminalFrameHeight - keyboardLift
-  const margin = rowHeight
-  return Math.min(keyboardLift, Math.max(0, anchorBottom + margin - dockTop))
+  return Math.max(0, (anchorRow + 1) * rowHeight + rowHeight - visibleBottom)
 }
diff --git a/mobile/src/terminal/terminal-keyboard-avoidance-webview.test.ts b/mobile/src/terminal/terminal-keyboard-avoidance-webview.test.ts
index f47395be0490..40a03d145924 100644
--- a/mobile/src/terminal/terminal-keyboard-avoidance-webview.test.ts
+++ b/mobile/src/terminal/terminal-keyboard-avoidance-webview.test.ts
@@ -1,8 +1,9 @@
+// @vitest-environment happy-dom
 import { Terminal } from '@xterm/xterm'
 import { describe, expect, it, vi } from 'vitest'
 import { createTerminalDocumentScope } from './document/document-scope'
-import { documentModuleSource } from './document/document-module-source.test-support'
 import { emitKeyboardAvoidanceMetrics } from './document/keyboard-avoidance-metrics'
+import { commitFitScale } from './document/fit-scale'
 import { parseTerminalKeyboardAvoidanceMetrics } from './terminal-webview-contract'
 
 // The scope object plus the metrics block, exactly as the document carries them.
@@ -13,11 +14,12 @@ import { parseTerminalKeyboardAvoidanceMetrics } from './terminal-webview-contra
  * it is handed, so a case builds one with its own terminal double and reads the notifications back
  * out of the seam it passed in.
  */
-function runMetricsOver(term: unknown): Record<string, unknown>[] {
+function runMetricsOver(term: unknown, fitScale = 1): Record<string, unknown>[] {
   const notifications: Record<string, unknown>[] = []
   const scope = createTerminalDocumentScope({
     postToHost: (message) => notifications.push(message)
   })
+  scope.currentScale = fitScale
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: each case's double implements the buffer members the scan reads, which is what the assertions check.
   scope.term = term as typeof scope.term
   emitKeyboardAvoidanceMetrics(scope)
@@ -190,28 +192,44 @@ describe('terminal keyboard-avoidance WebView metrics', () => {
     })
   })
 
-  it('refreshes metrics after every buffer geometry reset', () => {
-    // Four places change the buffer's geometry, and each owes a fresh emit after it: a stale
-    // content-bottom row is what lifts the keyboard over the wrong line. Read from each module's
-    // own source, so a fifth site added in a new module is not silently uncovered.
-    const blocks = [
-      ['terminal-init', 'export function resize('],
-      ['reflow', 'export function reflow('],
-      ['host-message-router', "} else if (msg.type === 'clear') {"],
-      ['text-scaling', 'export function applyTextScale(']
-    ] as const
-
-    for (const [module, opener] of blocks) {
-      const source = documentModuleSource(module)
-      const start = source.indexOf(opener)
-      expect(start, `${module} no longer carries ${opener}`).toBeGreaterThanOrEqual(0)
-      const block = source.slice(start, source.indexOf('\n}', start))
-      const emitAt = block.indexOf('emitKeyboardAvoidanceMetrics(scope)')
-      const geometryAt = block.includes('.resize(')
-        ? block.indexOf('.resize(')
-        : block.indexOf('.reset(')
-      expect(emitAt, `${module} does not emit metrics`).toBeGreaterThanOrEqual(0)
-      expect(emitAt, `${module} emits before it resizes`).toBeGreaterThan(geometryAt)
+  it('reports the row pitch as drawn, fit scale included, and none before a cell is measured', () => {
+    // Desktop display mode keeps the desktop's rows and the fit shrinks the grid by width.
+    const buffer = { cursorY: 0, viewportY: 0, type: 'normal', getLine: () => undefined }
+    const measuredTerm = {
+      buffer: { active: buffer },
+      cols: 10,
+      rows: 47,
+      _core: { _renderService: { dimensions: { css: { cell: { width: 8, height: 15 } } } } }
     }
+    const phone = runMetricsOver(measuredTerm)[0]
+    const desktop = runMetricsOver(measuredTerm, 0.5)[0]
+    const unmeasured = runMetricsOver({ buffer: { active: buffer }, cols: 10, rows: 47 })[0]
+    expect({
+      phone: phone?.rowPitch,
+      desktop: desktop?.rowPitch,
+      unmeasured: unmeasured?.rowPitch
+    }).toEqual({ phone: 15, desktop: 7.5, unmeasured: 0 })
+  })
+
+  it('reports again when a fit commits a new scale, carrying the new pitch', () => {
+    const notifications: Record<string, unknown>[] = []
+    const scope = createTerminalDocumentScope({
+      postToHost: (message) => notifications.push(message),
+      // Half the width 80 columns of 8 px need, so the fit commits a scale of 0.5.
+      viewportRect: () => ({ left: 0, top: 0, width: 320, height: 700 })
+    })
+    const buffer = { cursorY: 0, viewportY: 0, type: 'normal', getLine: () => undefined }
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the double implements every member the fit and the metrics read, which the assertion checks.
+    scope.term = {
+      buffer: { active: buffer },
+      cols: 80,
+      rows: 40,
+      element: { scrollWidth: 640 },
+      _core: { _renderService: { dimensions: { css: { cell: { width: 8, height: 15 } } } } }
+    } as unknown as typeof scope.term
+    scope.surface = document.createElement('div')
+    commitFitScale(scope, 'test', 0, 'test')
+    const metrics = notifications.filter((message) => message.type === 'keyboard-avoidance-metrics')
+    expect(metrics.at(-1)?.rowPitch).toBe(7.5)
   })
 })
diff --git a/mobile/src/terminal/terminal-live-input-affordance.test.ts b/mobile/src/terminal/terminal-live-input-affordance.test.ts
deleted file mode 100644
index 565b355d7716..000000000000
--- a/mobile/src/terminal/terminal-live-input-affordance.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { readFileSync } from 'node:fs'
-import { readMobileSessionRouteSource } from '../session/mobile-session-route-source-family.test-support'
-
-const commandDockSource = readMobileSessionRouteSource('../session/MobileSessionCommandDock.tsx')
-const terminalRuntimeSource = readMobileSessionRouteSource(
-  '../session/use-mobile-session-terminal-runtime.ts'
-)
-const nativeChatSource = readMobileSessionRouteSource(
-  '../session/use-mobile-session-native-chat-dictation.ts'
-)
-const liveInputStatusSource = readFileSync(
-  new URL('../session/MobileTerminalLiveInputStatus.tsx', import.meta.url),
-  'utf8'
-)
-const commandInputStylesSource = readFileSync(
-  new URL('../session/mobile-session-command-input-styles.ts', import.meta.url),
-  'utf8'
-)
-const liveInputFocusSource = readFileSync(
-  new URL('./use-terminal-live-input-focus.ts', import.meta.url),
-  'utf8'
-)
-const sendCompletionGenerationSource = readFileSync(
-  new URL('../session/use-mobile-send-completion-generation.ts', import.meta.url),
-  'utf8'
-)
-
-function liveInputBarBlock(): string {
-  const start = commandDockSource.indexOf('{liveInputEnabled ? (')
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = commandDockSource.indexOf(') : (', start)
-  expect(end).toBeGreaterThan(start)
-  return commandDockSource.slice(start, end)
-}
-
-describe('terminal live input affordance', () => {
-  it('keeps the live status row wired as the keyboard focus control', () => {
-    const block = liveInputBarBlock()
-
-    expect(block).toContain('onPress={focusLiveInput}')
-    expect(block).toContain('accessibilityRole="button"')
-    expect(block).toContain('accessibilityLabel="Show keyboard for live terminal input"')
-    expect(block).toContain(
-      'accessibilityHint="Typed text is sent directly to the active terminal"'
-    )
-    expect(block).toContain('pressed && styles.liveInputFocusTargetPressed')
-    expect(block).toContain('!canSend && styles.liveInputFocusTargetDisabled')
-    expect(block).toContain('showSoftInputOnFocus')
-    expect(block).toContain('liveInputText={liveInputCapture}')
-    expect(terminalRuntimeSource).toContain('useTerminalLiveInputFocus({')
-    expect(nativeChatSource).toContain('useMobileSendCompletionGeneration({')
-    expect(nativeChatSource).toContain('onBlur: resetLiveInputFocus')
-    expect(sendCompletionGenerationSource).toContain('return () => {')
-    expect(sendCompletionGenerationSource).toContain('onBlur()')
-    expect(liveInputFocusSource).toContain('focusTerminalLiveInputTarget(inputRef.current')
-    expect(liveInputFocusSource).toContain('lifecycleIdentity,')
-    expect(liveInputFocusSource).toContain('resetLiveInputFocus')
-    expect(liveInputFocusSource).toContain('keyboardHeight: context.keyboardHeight')
-    expect(liveInputFocusSource).toContain(
-      'scheduleTerminalLiveInputFocus(timerRef, focusLiveInput)'
-    )
-  })
-
-  it('makes the live keyboard target visible instead of status-only chrome', () => {
-    expect(liveInputStatusSource).toContain("'Tap to show keyboard'")
-    expect(liveInputStatusSource).toContain("liveInputText || 'Tap to show keyboard'")
-    expect(liveInputStatusSource).toContain('ellipsizeMode="head"')
-    expect(commandInputStylesSource).toContain('backgroundColor: colors.bgRaised')
-    expect(commandInputStylesSource).toContain('borderWidth: 1')
-    expect(commandInputStylesSource).toContain('liveInputFocusTargetPressed')
-  })
-})
diff --git a/mobile/src/terminal/terminal-live-input-keyboard-reopen.test.ts b/mobile/src/terminal/terminal-live-input-keyboard-reopen.test.ts
new file mode 100644
index 000000000000..c70880c1642d
--- /dev/null
+++ b/mobile/src/terminal/terminal-live-input-keyboard-reopen.test.ts
@@ -0,0 +1,17 @@
+import { describe, expect, it, vi } from 'vitest'
+
+const host = vi.hoisted(() => ({ os: 'android' }))
+vi.mock('react-native', () => ({ Platform: { OS: 'web' } }))
+vi.mock('../platform/host-os', () => ({ hostOs: () => host.os }))
+
+const { reopensFocusedInputWhenKeyboardHidden } =
+  await import('./terminal-live-input-keyboard-reopen')
+
+describe('reopening a focused live input whose keyboard is hidden', () => {
+  it("follows the phone's OS on the page, which runs as web", () => {
+    host.os = 'android'
+    expect(reopensFocusedInputWhenKeyboardHidden()).toBe(true)
+    host.os = 'ios'
+    expect(reopensFocusedInputWhenKeyboardHidden()).toBe(false)
+  })
+})
diff --git a/mobile/src/terminal/terminal-live-input-keyboard-reopen.ts b/mobile/src/terminal/terminal-live-input-keyboard-reopen.ts
new file mode 100644
index 000000000000..4fc6cf57e1ac
--- /dev/null
+++ b/mobile/src/terminal/terminal-live-input-keyboard-reopen.ts
@@ -0,0 +1,6 @@
+import { hostOs } from '../platform/host-os'
+
+/** Android keeps a hidden TextInput focused after Back closes the IME, so focus must blur first. */
+export function reopensFocusedInputWhenKeyboardHidden(): boolean {
+  return hostOs() === 'android'
+}
diff --git a/mobile/src/terminal/terminal-viewport-refit.test.ts b/mobile/src/terminal/terminal-viewport-refit.test.ts
index 7a54c70c8683..51a349175be3 100644
--- a/mobile/src/terminal/terminal-viewport-refit.test.ts
+++ b/mobile/src/terminal/terminal-viewport-refit.test.ts
@@ -1,58 +1,15 @@
-import { readFileSync } from 'node:fs'
 import { describe, expect, it } from 'vitest'
 import type { RpcResponse } from '../transport/types'
-import { readMobileSessionRouteSource } from '../session/mobile-session-route-source-family.test-support'
 import { terminalViewportUpdate } from './mobile-terminal-operations'
 import {
   isTerminalViewportRefitTargetCurrent,
   reduceTerminalFrameHeightRefit,
   resolveTerminalUpdateViewportCapability,
   type TerminalFrameHeightRefitEvent,
-  type TerminalFrameHeightRefitState,
-  type TerminalUpdateViewportCapability
+  type TerminalFrameHeightRefitState
 } from './terminal-viewport-refit-state'
 
-const hookSource = readFileSync(new URL('./terminal-viewport-refit.ts', import.meta.url), 'utf8')
-const sessionSource = [
-  readMobileSessionRouteSource('../session/use-mobile-session-keyboard-state.ts'),
-  readMobileSessionRouteSource('../session/MobileSessionActiveContent.tsx')
-].join('\n')
-
 describe('terminal viewport refit', () => {
-  it('refits when the window dimensions change (fold/unfold, rotation)', () => {
-    // Why: a PTY fitted on the folded cover screen must be re-measured when
-    // the window grows, or the terminal renders in a fraction of the display.
-    expect(hookSource).toContain('useWindowDimensions()')
-    const start = hookSource.indexOf('const { width: windowWidth, height: windowHeight }')
-    expect(start).toBeGreaterThanOrEqual(0)
-    const resizeEffect = hookSource.slice(start)
-    expect(resizeEffect).toContain('viewportMeasuredRef.current = false')
-    expect(resizeEffect).toContain('scheduleViewportRefit()')
-    expect(resizeEffect).toContain(
-      '[windowWidth, windowHeight, viewportMeasuredRef, scheduleViewportRefit]'
-    )
-  })
-
-  it('still refits when the tab strip toggles visibility', () => {
-    const start = hookSource.indexOf('const prevTabStripVisibleRef')
-    expect(start).toBeGreaterThanOrEqual(0)
-    const tabEffect = hookSource.slice(start, hookSource.indexOf('useWindowDimensions()'))
-    expect(tabEffect).toContain('viewportMeasuredRef.current = false')
-    expect(tabEffect).toContain('scheduleViewportRefit()')
-  })
-
-  it('refits the PTY when terminal text scale changes', () => {
-    // Why: mobile text size must change the real PTY grid, not just scale pixels
-    // in the WebView, or wrapped CLI output diverges from what the shell sees.
-    const start = hookSource.indexOf('const prevTextScaleRef = useRef(textScale)')
-    expect(start).toBeGreaterThanOrEqual(0)
-    const textScaleEffect = hookSource.slice(start, start + 600)
-    expect(textScaleEffect).toContain('prevTextScaleRef.current === textScale')
-    expect(textScaleEffect).toContain('viewportMeasuredRef.current = false')
-    expect(textScaleEffect).toContain('scheduleViewportRefit()')
-    expect(textScaleEffect).toContain('[textScale, viewportMeasuredRef, scheduleViewportRefit]')
-  })
-
   it('coalesces keyboard-visible frame-height churn into one refit after close', () => {
     let state: TerminalFrameHeightRefitState = {
       frameHeight: 600,
@@ -83,17 +40,6 @@ describe('terminal viewport refit', () => {
     expect(refitCount).toBe(2)
   })
 
-  it('routes imperative height notifications through the keyboard-aware reducer', () => {
-    const start = hookSource.indexOf('const notifyFrameHeightRefitEvent = useCallback(')
-    expect(start).toBeGreaterThanOrEqual(0)
-    const notifier = hookSource.slice(start, start + 1_300)
-    expect(notifier).toContain('reduceTerminalFrameHeightRefit(')
-    expect(notifier).toContain("{ type: 'frame-height', height }")
-    expect(notifier).toContain("{ type: 'keyboard-visibility', visible }")
-    expect(notifier).toContain('viewportMeasuredRef.current = false')
-    expect(notifier).toContain('scheduleViewportRefit({ heightOriginated: true })')
-  })
-
   it('re-defers a height refit if the keyboard reopens before the debounce fires', () => {
     // Settle while the keyboard is up -> deferred (pending), no refit.
     let r = reduceTerminalFrameHeightRefit(
@@ -125,93 +71,6 @@ describe('terminal viewport refit', () => {
     expect(ran.state.pending).toBe(false)
   })
 
-  it('re-checks the keyboard at fire time only for height-originated refits', () => {
-    const start = hookSource.indexOf('refitTimerRef.current = setTimeout(')
-    expect(start).toBeGreaterThanOrEqual(0)
-    const timerBody = hookSource.slice(start, start + 900)
-    // The height flag scopes the guard; forced/width refits stay unguarded.
-    expect(timerBody).toContain('if (heightOriginatedRefitRef.current)')
-    expect(timerBody).toContain("type: 'refit-committed'")
-    expect(timerBody).toContain('if (!decision.shouldRefit)')
-  })
-
-  it('suppresses refits while native chat covers the active terminal', () => {
-    // Why: native chat renders the transcript, not the grid — a refit there would
-    // reflow the desktop PTY to phone dims the user never sees.
-    const timerStart = hookSource.indexOf('refitTimerRef.current = setTimeout(')
-    const coveredCheck = hookSource.indexOf('if (nativeChatCoveredRef.current)', timerStart)
-    const measureIndex = hookSource.indexOf('measureFitDimensions', timerStart)
-    expect(timerStart).toBeGreaterThanOrEqual(0)
-    expect(coveredCheck).toBeGreaterThan(timerStart)
-    expect(measureIndex).toBeGreaterThan(coveredCheck)
-    expect(sessionSource).toContain('nativeChatCoveredRef: showNativeChatRef')
-  })
-
-  it('is wired into the session screen', () => {
-    expect(sessionSource).toContain('useTerminalViewportRefit({')
-    expect(sessionSource).toContain('tabStripVisible: terminals.length > 1')
-    expect(sessionSource).toContain('textScale: terminalTextScale')
-    expect(sessionSource).toContain('connState,')
-    expect(sessionSource).toContain('notifyTerminalFrameHeight(nextHeight)')
-    // One seam for both facts: on the page they come apart, because the shell shortens the WebView
-    // and the keyboard covers nothing the screen has to lift for.
-    expect(sessionSource).toContain('const softKeyboard = useSoftKeyboard()')
-    expect(sessionSource).toContain('notifyKeyboardVisibility(softKeyboard.visible)')
-    expect(sessionSource).toContain('setKeyboardHeight(softKeyboard.height)')
-  })
-
-  it('does not rerender SessionScreen for frame-height-only layout changes', () => {
-    // The imperative notifier keeps a dock-settling burst off React's render path.
-    expect(sessionSource).not.toContain('setTerminalFrameHeight')
-    expect(sessionSource).not.toContain('const [terminalFrameHeight,')
-  })
-
-  it('defers height-only window resizes while the keyboard is visible', () => {
-    const start = hookSource.indexOf('const prevWindowDimsRef')
-    const windowEffect = hookSource.slice(start, start + 1_100)
-    expect(windowEffect).toContain(
-      'prev.width === windowWidth && frameHeightRefitStateRef.current.keyboardVisible'
-    )
-  })
-
-  it('forces a refit on iOS foreground and connection recovery', () => {
-    const foregroundEffect = hookSource.slice(
-      hookSource.indexOf("if (Platform.OS !== 'ios')"),
-      hookSource.indexOf('const previousConnStateRef')
-    )
-    const reconnectEffect = hookSource.slice(
-      hookSource.indexOf('const previousConnStateRef'),
-      hookSource.indexOf('disposedRef.current = false')
-    )
-
-    expect(foregroundEffect).toContain("AppState.addEventListener('change'")
-    expect(foregroundEffect).toContain('viewportMeasuredRef.current = false')
-    expect(foregroundEffect).toContain('scheduleForcedViewportRefit()')
-    expect(reconnectEffect).toContain("connState !== 'connected'")
-    expect(reconnectEffect).toContain('viewportMeasuredRef.current = false')
-    expect(reconnectEffect).toContain('scheduleForcedViewportRefit()')
-  })
-
-  it('bypasses the equal-dimensions guard for resume and reconnect refits', () => {
-    expect(hookSource).toContain('const forceRefit = forceNextRefitRef.current')
-    expect(hookSource).toContain(
-      'if (!forceRefit && prev && prev.cols === dims.cols && prev.rows === dims.rows)'
-    )
-    const forceRead = hookSource.indexOf('const forceRefit = forceNextRefitRef.current')
-    const updateViewport = hookSource.indexOf('terminalViewportUpdate.request(rpc,')
-    expect(forceRead).toBeGreaterThanOrEqual(0)
-    expect(updateViewport).toBeGreaterThan(forceRead)
-  })
-
-  it('prefers the in-place updateViewport RPC over resubscribe', () => {
-    const rpcIndex = hookSource.indexOf('terminalViewportUpdate.request(rpc,')
-    const cacheUpdateIndex = hookSource.indexOf('updateTerminalSubscriptionViewport(handle, dims)')
-    const resubscribeIndex = hookSource.indexOf('subscribeToTerminal(handle)')
-    expect(rpcIndex).toBeGreaterThanOrEqual(0)
-    expect(cacheUpdateIndex).toBeGreaterThan(rpcIndex)
-    expect(resubscribeIndex).toBeGreaterThan(rpcIndex)
-  })
-
   it('falls back to legacy resubscribe when an older desktop lacks updateViewport', () => {
     const unsupported = {
       id: 'old-host',
@@ -226,52 +85,8 @@ describe('terminal viewport refit', () => {
         error: { code: 'temporary_failure', message: 'retryable' }
       })
     ).toBe('unknown')
-
-    let capability: TerminalUpdateViewportCapability = 'unknown'
-    let probeCount = 0
-    for (let refit = 0; refit < 10; refit += 1) {
-      if (capability === 'unsupported') {
-        continue
-      }
-      probeCount += 1
-      capability = resolveTerminalUpdateViewportCapability(unsupported)
-    }
-    expect(probeCount).toBe(1)
-
-    const responseCheckIndex = hookSource.indexOf('if (outcome?.updated)')
-    const unsubscribeIndex = hookSource.indexOf('unsubscribeTerminal(handle)', responseCheckIndex)
-    const subscribeIndex = hookSource.indexOf('subscribeToTerminal(handle)', unsubscribeIndex)
-    expect(responseCheckIndex).toBeGreaterThanOrEqual(0)
-    expect(unsubscribeIndex).toBeGreaterThan(responseCheckIndex)
-    expect(subscribeIndex).toBeGreaterThan(unsubscribeIndex)
-    expect(hookSource).toContain("updateViewportCapabilityRef.current !== 'unsupported'")
-    expect(hookSource).toContain("updateViewportCapabilityRef.current = 'unknown'")
-  })
-
-  it('reflows the local xterm scrollback after a successful updateViewport', () => {
-    // Why: updateViewport may only record an informational mobile viewport in
-    // desktop mode. Reflow local scrollback only after the server says it
-    // actually applied phone-fit to the PTY.
-    const appliedIndex = hookSource.indexOf('if (outcome.applied)')
-    const reflowIndex = hookSource.indexOf('ref.reflow(dims.cols, dims.rows)')
-    const cacheUpdateIndex = hookSource.indexOf('updateTerminalSubscriptionViewport(handle, dims)')
-    // Assert each anchor exists before ordering: a missing marker yields -1 and would
-    // let the ordering comparisons pass vacuously.
-    expect(appliedIndex).toBeGreaterThanOrEqual(0)
-    expect(cacheUpdateIndex).toBeGreaterThanOrEqual(0)
-    expect(reflowIndex).toBeGreaterThanOrEqual(0)
-    expect(reflowIndex).toBeGreaterThan(appliedIndex)
-    expect(reflowIndex).toBeGreaterThan(cacheUpdateIndex)
-  })
-
-  it('checks refit freshness after updateViewport resolves before side effects', () => {
-    // Why: rapid dock/sidebar resizing can complete RPCs out of order; a stale
-    // response must not update the viewport cache or locally reflow the old dims.
-    const responseIndex = hookSource.indexOf('terminalViewportUpdate.request(rpc,')
-    const postRpcCurrentIndex = hookSource.indexOf('if (!isCurrentTarget())', responseIndex)
-    const cacheUpdateIndex = hookSource.indexOf('updateTerminalSubscriptionViewport(handle, dims)')
-    expect(postRpcCurrentIndex).toBeGreaterThan(responseIndex)
-    expect(postRpcCurrentIndex).toBeLessThan(cacheUpdateIndex)
+    // A method_not_found refusal latches the capability, so a refit stops re-probing.
+    expect(resolveTerminalUpdateViewportCapability(unsupported)).toBe('unsupported')
   })
 
   it('only treats updateViewport as applied when the runtime updated the subscriber', () => {
diff --git a/mobile/src/terminal/terminal-viewport-refit.ts b/mobile/src/terminal/terminal-viewport-refit.ts
index 50388ee2d7fe..533b5f8d51fb 100644
--- a/mobile/src/terminal/terminal-viewport-refit.ts
+++ b/mobile/src/terminal/terminal-viewport-refit.ts
@@ -3,6 +3,7 @@ import { AppState, Platform, useWindowDimensions, type AppStateStatus } from 're
 import type { RpcClient } from '../transport/rpc-client'
 import type { ConnectionState } from '../transport/types'
 import type { TerminalWebViewHandle } from './TerminalWebView'
+import type { TerminalFrame } from './terminal-webview-messages'
 import { shouldRecoverTerminalOnAppStateChange } from './terminal-foreground-recovery'
 import { terminalViewportUpdate } from './mobile-terminal-operations'
 import {
@@ -19,7 +20,8 @@ export type TerminalViewportDims = { cols: number; rows: number }
 type TerminalViewportRefitOptions = {
   activeHandleRef: RefObject<string | null>
   terminalRefs: RefObject<Map<string, TerminalWebViewHandle>>
-  terminalFrameHeightRef: RefObject<number>
+  // The terminal frame React Native laid out, unrounded; null until its first layout.
+  terminalFrameRef: RefObject<TerminalFrame | null>
   viewportRef: RefObject<TerminalViewportDims | null>
   viewportMeasuredRef: RefObject<boolean>
   // Why: while native chat covers the active terminal, a refit would push phone dims into a PTY nobody on this device is viewing.
@@ -31,25 +33,16 @@ type TerminalViewportRefitOptions = {
   tabStripVisible: boolean
   // Why: text size (font scale); changing it changes cell size, so the PTY must be re-fitted to a new column count.
   textScale: number
-  // Why: measured frame width; panel dock/undock or sidebar resize changes it with no window/tab change, so it re-fits the PTY.
-  terminalFrameWidth: number
   unsubscribeTerminal: (handle: string) => void
   subscribeToTerminal: (handle: string) => void
 }
 
-type TerminalViewportRefitNotifications = {
-  notifyTerminalFrameHeight: (height: number) => void
-  notifyKeyboardVisibility: (visible: boolean) => void
-}
-
 // Why: re-measure on layout changes outside the subscribe path (tab strip, fold/rotate/resize), or a PTY renders "cut in half" (#4579).
-export function useTerminalViewportRefit(
-  options: TerminalViewportRefitOptions
-): TerminalViewportRefitNotifications {
+export function useTerminalViewportRefit(options: TerminalViewportRefitOptions) {
   const {
     activeHandleRef,
     terminalRefs,
-    terminalFrameHeightRef,
+    terminalFrameRef,
     viewportRef,
     viewportMeasuredRef,
     nativeChatCoveredRef,
@@ -59,7 +52,6 @@ export function useTerminalViewportRefit(
     connState,
     tabStripVisible,
     textScale,
-    terminalFrameWidth,
     unsubscribeTerminal,
     subscribeToTerminal
   } = options
@@ -121,10 +113,12 @@ export function useTerminalViewportRefit(
             currentRunSeq: refitRunSeqRef.current
           })
         void (async () => {
-          const dims = await ref.measureFitDimensions(terminalFrameHeightRef.current || undefined)
+          await ref.awaitReady()
           if (!isCurrentTarget()) {
             return
           }
+          const frame = terminalFrameRef.current
+          const dims = frame ? ref.fitDimensions(frame) : null
           if (!dims) {
             return
           }
@@ -155,7 +149,7 @@ export function useTerminalViewportRefit(
                 rpc.updateTerminalSubscriptionViewport(handle, dims)
                 if (outcome.applied) {
                   // Why: updateViewport re-streams only the visible screen, so local scrollback stays wrapped at the old width — reflow it locally.
-                  ref.reflow(dims.cols, dims.rows)
+                  ref.reflow(dims.cols, dims.rows, frame)
                 }
                 return
               }
@@ -175,7 +169,7 @@ export function useTerminalViewportRefit(
     [
       activeHandleRef,
       terminalRefs,
-      terminalFrameHeightRef,
+      terminalFrameRef,
       viewportRef,
       viewportMeasuredRef,
       nativeChatCoveredRef,
@@ -230,16 +224,26 @@ export function useTerminalViewportRefit(
     scheduleViewportRefit()
   }, [textScale, viewportMeasuredRef, scheduleViewportRefit])
 
-  // Why: panel dock/undock or sidebar resize changes frame width with no window/tab change, so the cached viewport goes stale.
-  const prevFrameWidthRef = useRef(terminalFrameWidth)
-  useEffect(() => {
-    if (prevFrameWidthRef.current === terminalFrameWidth) {
+  // Why: panel dock/undock or a sidebar resize changes the width with no window or tab change; a
+  // width that still fits the PTY's grid (sub-pixel layout jitter) needs no refit.
+  const notifyTerminalFrameWidth = useCallback(() => {
+    const handle = activeHandleRef.current
+    const frame = terminalFrameRef.current
+    const fit = handle && frame ? terminalRefs.current.get(handle)?.fitDimensions(frame) : null
+    const grid = viewportRef.current
+    if (fit && grid && fit.cols === grid.cols && fit.rows === grid.rows) {
       return
     }
-    prevFrameWidthRef.current = terminalFrameWidth
     viewportMeasuredRef.current = false
     scheduleViewportRefit()
-  }, [terminalFrameWidth, viewportMeasuredRef, scheduleViewportRefit])
+  }, [
+    activeHandleRef,
+    terminalFrameRef,
+    terminalRefs,
+    viewportRef,
+    viewportMeasuredRef,
+    scheduleViewportRefit
+  ])
 
   const notifyFrameHeightRefitEvent = useCallback(
     (event: TerminalFrameHeightRefitEvent) => {
@@ -263,6 +267,18 @@ export function useTerminalViewportRefit(
     [notifyFrameHeightRefitEvent]
   )
 
+  // Why: a renderer swap or pixel-ratio change gives the same grid a different cell box.
+  const notifyTerminalCellBoxChange = useCallback(
+    (handle: string) => {
+      if (handle !== activeHandleRef.current) {
+        return
+      }
+      viewportMeasuredRef.current = false
+      scheduleViewportRefit()
+    },
+    [activeHandleRef, viewportMeasuredRef, scheduleViewportRefit]
+  )
+
   useEffect(() => {
     if (Platform.OS !== 'ios') {
       return
@@ -310,5 +326,10 @@ export function useTerminalViewportRefit(
     }
   }, [])
 
-  return { notifyTerminalFrameHeight, notifyKeyboardVisibility }
+  return {
+    notifyTerminalFrameHeight,
+    notifyTerminalFrameWidth,
+    notifyKeyboardVisibility,
+    notifyTerminalCellBoxChange
+  }
 }
diff --git a/mobile/src/terminal/terminal-web-document-mount.test.ts b/mobile/src/terminal/terminal-web-document-mount.test.ts
index 1ce4aa3d40b1..3849a02a9e7e 100644
--- a/mobile/src/terminal/terminal-web-document-mount.test.ts
+++ b/mobile/src/terminal/terminal-web-document-mount.test.ts
@@ -3,6 +3,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { terminalDocumentDouble } from './document/document-terminal-double.test-support'
+import type { TerminalDocumentTerminal } from './document/document-terminal-shape'
+import type { TerminalWebViewCommand } from './terminal-webview-messages'
 import { TERMINAL_DOCUMENT_MARKUP } from './terminal-webview-html'
 
 /**
@@ -18,16 +20,25 @@ import { TERMINAL_DOCUMENT_MARKUP } from './terminal-webview-html'
  */
 /** Set for the length of one case; the factory throws it instead of building a document. */
 let startThrows: Error | null = null
+/** The text scale each document the factory built was started at, in order. */
+const startedScales: number[] = []
+/** Whether each of those documents was told to build its terminal before ready. */
+const startedBuilds: boolean[] = []
+/** Set for the length of one case; the document builds its terminals here instead of xterm. */
+let gridTerminal: (() => TerminalDocumentTerminal) | null = null
 
 vi.mock('./document/create-terminal-document', async (importOriginal) => {
   const actual = await importOriginal<typeof import('./document/create-terminal-document')>()
   return {
     ...actual,
     createTerminalDocument: (host: Parameters<typeof actual.createTerminalDocument>[0]) => {
+      startedScales.push(host?.start?.().textScale ?? 1)
+      startedBuilds.push(host?.start?.().shown ?? true)
       if (startThrows) {
         throw startThrows
       }
-      return actual.createTerminalDocument(host)
+      const grid = gridTerminal
+      return actual.createTerminalDocument(grid ? { ...host, createTerminal: grid } : host)
     }
   }
 })
@@ -61,9 +72,13 @@ const settle = () => new Promise((resolve) => setTimeout(resolve, 50))
 const INIT = { type: 'init', cols: 80, rows: 24, initialData: '', preserveScroll: false } as const
 
 let renderer: ReactTestRenderer | null = null
+let restoreTransform: (() => void) | null = null
 
 beforeEach(() => {
   startThrows = null
+  startedScales.length = 0
+  startedBuilds.length = 0
+  gridTerminal = null
   document.body.innerHTML = ''
   document.head.innerHTML = ''
 })
@@ -71,6 +86,8 @@ beforeEach(() => {
 afterEach(() => {
   act(() => renderer?.unmount())
   renderer = null
+  restoreTransform?.()
+  restoreTransform = null
 })
 
 describe('a stopped document takes its engines with it', () => {
@@ -244,3 +261,269 @@ describe('the component names the cause of a start that threw', () => {
     expect(engineErrors).toEqual([])
   })
 })
+
+describe('the text scale a document is built at', () => {
+  it('is the one the view mounted with, for a reloaded document too, as on native', () => {
+    const host = plantHost()
+    startThrows = new Error('engine missing')
+    act(() => {
+      renderer = create(createElement(TerminalWebView, { textScale: 1.25 }), {
+        createNodeMock: () => host
+      })
+    })
+    act(() => renderer?.update(createElement(TerminalWebView, { textScale: 1.5 })))
+    startThrows = null
+    act(() => {
+      renderer?.root.find((node) => node.props.accessibilityRole === 'button').props.onPress()
+    })
+    expect(startedScales).toEqual([1.25, 1.25])
+  })
+
+  it('builds nothing before ready on the page for a view hidden when it mounted', () => {
+    const host = plantHost()
+    act(() => {
+      renderer = create(createElement(TerminalWebView, { shownAtMount: false }), {
+        createNodeMock: () => host
+      })
+    })
+    expect(startedBuilds).toEqual([false])
+  })
+})
+
+const CELL = { width: 7.5, height: 15 }
+const FIT_390 = 390 / (7.5 * 55)
+
+/**
+ * A laid-out 55x40 grid whose cells scale with the font, as xterm's do, or read 0 while `cells`
+ * says they cannot be measured: xterm's DOM measure on a `display:none` host, where no
+ * OffscreenCanvas is available.
+ */
+function gridDouble(cells: { measurable: boolean }): TerminalDocumentTerminal {
+  const terminal = terminalDocumentDouble().terminal
+  const cell = () => {
+    const k = cells.measurable ? terminal.options.fontSize / 13 : 0
+    return { width: CELL.width * k, height: CELL.height * k }
+  }
+  const grid = Object.assign(terminal, {
+    cols: 55,
+    rows: 40,
+    _core: {
+      _renderService: {
+        get dimensions() {
+          return { css: { cell: cell() } }
+        }
+      }
+    }
+  })
+  grid.resize = (cols: number, rows: number) => {
+    grid.cols = cols
+    grid.rows = rows
+  }
+  return grid
+}
+
+/**
+ * A mounted page document over a grid, whose host box the case sets and pushes as RN layout does:
+ * react-native-web's `onLayout` reports a `display:none` screen as 0x0 and its return as the old box.
+ */
+async function mountedOverGrid({ laidOutFirst = true } = {}) {
+  const cells = { measurable: true }
+  const grids: TerminalDocumentTerminal[] = []
+  gridTerminal = () => {
+    const grid = gridDouble(cells)
+    grids.push(grid)
+    return grid
+  }
+  const host = plantHost()
+  let box = { width: 390, height: 600 }
+  host.getBoundingClientRect = () => new DOMRect(0, 134, box.width, box.height)
+  const mounted = mountTerminalWebDocument(host, () => {})
+  // Every surface transform the document writes; a refit writes one even when nothing moved. Read
+  // off the style prototype because an init swaps the surface element for a fresh one.
+  const scales: number[] = []
+  const proto: object = Object.getPrototypeOf(host.style)
+  const own = Object.getOwnPropertyDescriptor(proto, 'transform')!
+  const write = own.set!
+  Object.defineProperty(proto, 'transform', {
+    ...own,
+    set(this: CSSStyleDeclaration, value: string) {
+      const scale = /scale\(([^)]*)\)/.exec(String(value))
+      if (scale) {
+        scales.push(Number(scale[1]))
+      }
+      write.call(this, value)
+    }
+  })
+  restoreTransform = () => Object.defineProperty(proto, 'transform', own)
+  let id = 0
+  const send = (command: TerminalWebViewCommand) => mounted.send({ ...command, id: ++id })
+  const layOut = (width: number, height: number) => {
+    box = { width, height }
+    mounted.notifyViewport()
+  }
+  if (laidOutFirst) {
+    layOut(390, 600)
+  }
+  // The app's init carries the frame it laid out.
+  send({
+    type: 'init',
+    cols: 55,
+    rows: 40,
+    initialData: '',
+    preserveScroll: false,
+    frame: { width: 390, height: 600 }
+  })
+  await framesUntil(() => scales.at(-1) === FIT_390)
+  return { mounted, scales, send, layOut, cells, grid: () => grids.at(-1)! }
+}
+
+const nextFrame = () => new Promise<void>((resolve) => requestAnimationFrame(() => resolve()))
+
+async function framesUntil(done: () => boolean, frames = 30) {
+  for (let frame = 0; frame < frames && !done(); frame++) {
+    await nextFrame()
+  }
+  expect(done()).toBe(true)
+}
+
+describe("the page pushes its terminal frame's box into the document", () => {
+  it('refits on a box RN laid out, through the host View, with no ResizeObserver of its own', () => {
+    let observers = 0
+    vi.stubGlobal(
+      'ResizeObserver',
+      class {
+        constructor() {
+          observers += 1
+        }
+        observe() {}
+        disconnect() {}
+      }
+    )
+    try {
+      const host = plantHost()
+      let height = 600
+      host.getBoundingClientRect = () => new DOMRect(0, 134, 390, height)
+      act(() => {
+        renderer = create(createElement(TerminalWebView, {}), { createNodeMock: () => host })
+      })
+      const surface = host.querySelector<HTMLElement>('#terminal-surface')!
+      expect(surface.style.transform).toBe('')
+      const laidOut = renderer!.root.findAll((node) => typeof node.props.onLayout === 'function')
+      expect(laidOut).toHaveLength(1)
+      height = 560
+      act(() => {
+        laidOut[0]!.props.onLayout({ nativeEvent: { layout: { width: 390, height: 560 } } })
+      })
+      expect(surface.style.transform).toContain('scale(1)')
+      expect(observers).toBe(0)
+    } finally {
+      vi.unstubAllGlobals()
+    }
+  })
+
+  it('keeps pan and zoom across hide and show, and refits when the box really changes', async () => {
+    // Native never refits on navigation: its WebView keeps its size while another screen covers it.
+    const { mounted, scales, layOut } = await mountedOverGrid()
+    const fitted = scales.length
+    layOut(0, 0)
+    layOut(390, 600)
+    await nextFrame()
+    await nextFrame()
+    expect(scales).toHaveLength(fitted)
+
+    layOut(300, 600)
+    await framesUntil(() => scales.at(-1) === 300 / (7.5 * 55))
+    mounted.dispose()
+  })
+
+  it('keeps pan and zoom when RN laid the host out before the mount existed', async () => {
+    // The first layout can land before the document does; the box it reported is still the box.
+    const { mounted, scales, layOut } = await mountedOverGrid({ laidOutFirst: false })
+    const fitted = scales.length
+    layOut(0, 0)
+    layOut(390, 600)
+    await nextFrame()
+    await nextFrame()
+    expect(scales).toHaveLength(fitted)
+    mounted.dispose()
+  })
+
+  it('holds a fit asked for while hidden and lands it on show', async () => {
+    const { mounted, scales, send, layOut } = await mountedOverGrid()
+    layOut(0, 0)
+    send({ type: 'resize', cols: 80, rows: 40, frame: null })
+    await nextFrame()
+    await nextFrame()
+    expect(scales.at(-1)).toBe(FIT_390)
+    layOut(390, 600)
+    await framesUntil(() => scales.at(-1) === 390 / (7.5 * 80))
+    // The held fit is spent: a second hide and show must not run it again over the user's pan.
+    const landed = scales.length
+    layOut(0, 0)
+    layOut(390, 600)
+    await nextFrame()
+    await nextFrame()
+    expect(scales).toHaveLength(landed)
+    mounted.dispose()
+  })
+
+  it('never commits a blind fit when the grid cannot be measured while hidden', async () => {
+    // A reconnect re-inits under a covering screen, where xterm's DOM measure reads every cell as 0.
+    const { mounted, scales, send, layOut, cells } = await mountedOverGrid()
+    layOut(0, 0)
+    const shown = scales.length
+    cells.measurable = false
+    send({ type: 'init', cols: 55, rows: 40, initialData: '', preserveScroll: false, frame: null })
+    // Past the retry loop's 60-frame cap, where a fit that did not wait commits scale 1.
+    for (let frame = 0; frame < 75; frame++) {
+      await nextFrame()
+    }
+    expect(scales.slice(shown)).not.toContain(1)
+    cells.measurable = true
+    layOut(390, 600)
+    await framesUntil(() => scales.at(-1) === FIT_390)
+    mounted.dispose()
+  })
+
+  it('fits a text scale too large to resize the grid while visible', async () => {
+    const { mounted, scales, send, layOut, grid } = await mountedOverGrid()
+    layOut(280, 600)
+    // The app's refit for the new width sends its grid with the frame.
+    send({ type: 'resize', cols: 55, rows: 40, frame: { width: 280, height: 600 } })
+    await framesUntil(() => scales.at(-1) === 280 / (7.5 * 55))
+    // fontPxForScale(2) = 26 px: 280 / (7.5 x 2) = 18 columns, under MIN_FIT_COLS, so no resize.
+    send({ type: 'set-font-scale', fontScale: 2 })
+    await framesUntil(() => scales.at(-1) === 280 / (15 * 55))
+    expect(grid().cols).toBe(55)
+    mounted.dispose()
+  })
+
+  it('refits on show after a text scale too large to resize the grid while hidden', async () => {
+    const { mounted, scales, send, layOut } = await mountedOverGrid()
+    layOut(280, 600)
+    // The app's refit for the new width sends its grid with the frame.
+    send({ type: 'resize', cols: 55, rows: 40, frame: { width: 280, height: 600 } })
+    await framesUntil(() => scales.at(-1) === 280 / (7.5 * 55))
+    layOut(0, 0)
+    // fontPxForScale(2) = 26 px: 280 / (7.5 x 2) = 18 columns, under MIN_FIT_COLS, so no resize.
+    send({ type: 'set-font-scale', fontScale: 2 })
+    await nextFrame()
+    await nextFrame()
+    layOut(280, 600)
+    await framesUntil(() => scales.at(-1) === 280 / (15 * 55))
+    mounted.dispose()
+  })
+
+  it('resizes the grid to a text scale changed while hidden, and fits it on show', async () => {
+    const { mounted, scales, send, layOut, grid } = await mountedOverGrid()
+    layOut(0, 0)
+    send({ type: 'set-font-scale', fontScale: 0.8 })
+    // fontPxForScale(0.8) = 10 px: 390 / (7.5 x 10/13) = 67 columns, where stale cells give 52.
+    await framesUntil(() => grid().cols === 67)
+    const hidden = scales.length
+    layOut(390, 600)
+    await framesUntil(() => scales.length > hidden)
+    expect(scales.at(-1)).toBe(1)
+    mounted.dispose()
+  })
+})
diff --git a/mobile/src/terminal/terminal-web-document-mount.ts b/mobile/src/terminal/terminal-web-document-mount.ts
index c1b13e386573..b16afa800959 100644
--- a/mobile/src/terminal/terminal-web-document-mount.ts
+++ b/mobile/src/terminal/terminal-web-document-mount.ts
@@ -2,6 +2,7 @@ import { Terminal } from '@xterm/xterm'
 import { Unicode11Addon } from '@xterm/addon-unicode11'
 import { WebglAddon } from '@xterm/addon-webgl'
 import type { TerminalDocumentTerminal } from './document/document-terminal-shape'
+import type { TerminalDocumentStart, TerminalViewportChange } from './document/document-host-seams'
 import { TERMINAL_DOCUMENT_ELEMENT_STYLE, TERMINAL_DOCUMENT_MARKUP } from './terminal-webview-html'
 import { scopeStyleToHost } from '../style-scoping/document-style-scoping'
 import { XTERM_ENGINE_CSS } from './terminal-webview-engine-css.generated'
@@ -25,6 +26,8 @@ import type { TerminalWebViewCommand } from './terminal-webview-messages'
 export type TerminalWebDocument = {
   /** Hands one host command to the document, as a bridge frame does inside the WebView. */
   send: (command: TerminalWebViewCommand & { id: number }) => void
+  /** RN laid the host out again: the page's counterpart of the WebView's window resize. */
+  notifyViewport: () => void
   dispose: () => void
 }
 
@@ -95,19 +98,23 @@ function createPageWebglAddon(onFallback: (reason: string) => void) {
  * Synchronous, because the factory is a static import and building a document is a function call.
  * A caller's cleanup can therefore never arrive before there is something to clean up.
  */
+/** What the view fixed when it mounted, for every document it builds. */
 export function mountTerminalWebDocument(
   host: HTMLElement,
-  receive: (message: Record<string, unknown>) => void
+  receive: (message: Record<string, unknown>) => void,
+  start: TerminalDocumentStart = { textScale: 1, shown: true }
 ): TerminalWebDocument {
   ensureDocumentStyle()
   host.classList.add(HOST_CLASS)
   host.innerHTML = TERMINAL_DOCUMENT_MARKUP
-  const started = startDocumentOrGiveTheHostBack(host, receive)
+  const viewport = pageViewport(host)
+  const started = startDocumentOrGiveTheHostBack(host, receive, start, viewport)
 
   return {
     send: (command) => {
       started.send(command)
     },
+    notifyViewport: viewport.notify,
     dispose: () => {
       started.stop()
       host.innerHTML = ''
@@ -128,10 +135,12 @@ export function mountTerminalWebDocument(
  */
 function startDocumentOrGiveTheHostBack(
   host: HTMLElement,
-  receive: (message: Record<string, unknown>) => void
+  receive: (message: Record<string, unknown>) => void,
+  start: TerminalDocumentStart,
+  viewport: PageViewport
 ) {
   try {
-    return startPageDocument(host, receive)
+    return startPageDocument(host, receive, start, viewport)
   } catch (error) {
     host.innerHTML = ''
     host.classList.remove(HOST_CLASS)
@@ -139,8 +148,53 @@ function startDocumentOrGiveTheHostBack(
   }
 }
 
+type PageViewport = ReturnType<typeof pageViewport>
+
+/**
+ * The host's box, pushed by RN layout. RN web lays a `display:none` host out as 0x0 and its return
+ * as the same box: the size stays the last real one, as a covered WebView's does, and the return is
+ * a show rather than a resize. Sizes are the client rect's; RN web's are whole-pixel `offsetWidth`s.
+ */
+function pageViewport(host: HTMLElement) {
+  // Seeded from the host, since RN's first layout can land before this mount exists.
+  const seed = host.getBoundingClientRect()
+  let laidOut = { width: seed.width, height: seed.height }
+  let onChange: ((change: TerminalViewportChange) => void) | null = null
+  return {
+    rect: () => {
+      const box = host.getBoundingClientRect()
+      const hidden = box.width <= 0
+      const size = hidden ? laidOut : box
+      return { left: box.left, top: box.top, width: size.width, height: size.height, hidden }
+    },
+    observe: (change: (change: TerminalViewportChange) => void) => {
+      onChange = change
+      return () => {
+        onChange = null
+      }
+    },
+    notify: () => {
+      const { width, height } = host.getBoundingClientRect()
+      if (width <= 0) {
+        return
+      }
+      if (width === laidOut.width && height === laidOut.height) {
+        onChange?.('shown')
+        return
+      }
+      laidOut = { width, height }
+      onChange?.('resized')
+    }
+  }
+}
+
 /** The eleven seams, as the page answers them. */
-function startPageDocument(host: HTMLElement, receive: (message: Record<string, unknown>) => void) {
+function startPageDocument(
+  host: HTMLElement,
+  receive: (message: Record<string, unknown>) => void,
+  start: TerminalDocumentStart,
+  viewport: PageViewport
+) {
   // Written by this document's own reporter: `startHostNotify` installs it through the seam below,
   // which here is a `window` error listener, and every error it forwards is appended before the
   // report that quotes it. What the page cannot have is the WebView head's half — a buffer open
@@ -186,18 +240,13 @@ function startPageDocument(host: HTMLElement, receive: (message: Record<string,
     // fail. Here the engine is the import above, so it is here or this module did not load.
     hasEngine: () => true,
 
+    start: () => start,
+
     // The window here is the whole page, header and dock included; the grid is shown in the host.
-    viewportRect: () => {
-      const box = host.getBoundingClientRect()
-      return { left: box.left, top: box.top, width: box.width, height: box.height }
-    },
+    viewportRect: viewport.rect,
 
-    // The host resizes without the window: a dock growing, a panel docking beside it.
-    observeViewport: (onChange) => {
-      const observer = new ResizeObserver(onChange)
-      observer.observe(host)
-      return () => observer.disconnect()
-    },
+    // The host resizes without the window, and RN layout is what says so: the component pushes it.
+    observeViewport: viewport.observe,
 
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the shape is xterm's own, except that `getCell` takes back the cell xterm allocated and the document declares only the members it reads on one.
     createTerminal: (options) => new Terminal(options) as unknown as TerminalDocumentTerminal,
diff --git a/mobile/src/terminal/terminal-webview-cell-box.test.ts b/mobile/src/terminal/terminal-webview-cell-box.test.ts
new file mode 100644
index 000000000000..602bddd0f373
--- /dev/null
+++ b/mobile/src/terminal/terminal-webview-cell-box.test.ts
@@ -0,0 +1,200 @@
+import { createElement, createRef } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { TerminalWebView } from './TerminalWebView'
+import type { TerminalWebViewHandle } from './terminal-webview-contract'
+
+const nativeWebViewMethods = vi.hoisted(() => ({
+  postMessage: vi.fn<(message: string) => void>(),
+  reload: vi.fn<() => void>()
+}))
+
+vi.mock('react-native', () => ({
+  AppState: { currentState: 'active' },
+  Platform: { OS: 'android' },
+  Pressable: 'Pressable',
+  StyleSheet: {
+    absoluteFillObject: { bottom: 0, left: 0, position: 'absolute', right: 0, top: 0 },
+    create: (styles: unknown) => styles
+  },
+  Text: 'Text',
+  View: 'View'
+}))
+
+vi.mock('react-native-webview', async () => {
+  const React = await import('react')
+  const WebView = React.forwardRef((props: Record<string, unknown>, ref) => {
+    React.useImperativeHandle(ref, () => nativeWebViewMethods)
+    return React.createElement('WebView', props)
+  })
+  return { WebView, default: WebView }
+})
+
+vi.mock('lucide-react-native', () => ({ RefreshCw: 'RefreshCw' }))
+
+const FRAME = { width: 427, height: 710 }
+const scale = 1
+const cellAt = (fontScale: number, cellWidth = 23 / 3) => ({ fontScale, cellWidth, cellHeight: 15 })
+
+const renderers: ReactTestRenderer[] = []
+afterEach(() => {
+  act(() => renderers.splice(0).forEach((renderer) => renderer.unmount()))
+  nativeWebViewMethods.postMessage.mockClear()
+  nativeWebViewMethods.reload.mockClear()
+  vi.useRealTimers()
+})
+
+function mount(textScale = scale) {
+  const ref = createRef<TerminalWebViewHandle>()
+  const onCellBoxChange = vi.fn()
+  const onWebReady = vi.fn<() => void>()
+  let renderer: ReactTestRenderer | undefined
+  act(() => {
+    renderer = create(
+      createElement(TerminalWebView, { ref, textScale, onCellBoxChange, onWebReady })
+    )
+  })
+  renderers.push(renderer!)
+  const handle = () => {
+    if (!ref.current) {
+      throw new Error('no handle')
+    }
+    return ref.current
+  }
+  const webView = () => renderer!.root.find((node) => typeof node.props.onMessage === 'function')
+  const notify = (payload: Record<string, unknown>) => {
+    act(() => {
+      webView().props.onMessage({ nativeEvent: { data: JSON.stringify(payload) } })
+    })
+  }
+  return { handle, notify, onCellBoxChange, onWebReady, webView }
+}
+
+function postedTypes(): unknown[] {
+  return nativeWebViewMethods.postMessage.mock.calls.map(([message]) => JSON.parse(message).type)
+}
+
+const cellBoxNotify = (cellWidth: number, refit: boolean) => ({
+  type: 'cell-box',
+  cellBox: cellAt(scale, cellWidth),
+  refit
+})
+
+describe('the cell box xterm laid out', () => {
+  it('sizes a fit from web-ready, which the document sends once its terminal is built', () => {
+    const { handle, notify } = mount()
+    expect(handle().fitDimensions(FRAME)).toBeNull()
+    notify({ type: 'web-ready', cellBox: cellAt(scale) })
+    expect(handle().fitDimensions(FRAME)).toEqual({ cols: 55, rows: 47 })
+    expect(postedTypes()).not.toContain('measure')
+  })
+
+  it('fits each box the document reports, and refits only when the document says so', () => {
+    // The document holds the grid and decides; its tests pin the one-refit bound.
+    const { handle, notify, onCellBoxChange } = mount()
+    notify({ type: 'web-ready', cellBox: cellAt(scale) })
+    notify(cellBoxNotify(7.9, false))
+    expect(onCellBoxChange).not.toHaveBeenCalled()
+    expect(handle().fitDimensions(FRAME)).toEqual({ cols: 54, rows: 47 })
+    notify(cellBoxNotify(7.8, true))
+    expect(onCellBoxChange).toHaveBeenCalledTimes(1)
+    expect(handle().fitDimensions(FRAME)).toEqual({ cols: 54, rows: 47 })
+  })
+
+  it('fits from the box the current document reported, not one an earlier document did', () => {
+    const { handle, notify, webView } = mount()
+    notify({ type: 'web-ready', cellBox: cellAt(scale) })
+    act(() => webView().props.onLoadStart())
+    notify({ type: 'web-ready', cellBox: null })
+    expect(handle().fitDimensions(FRAME)).toBeNull()
+  })
+
+  it("fits only from a ready box at the app's text scale", () => {
+    const { handle, notify, webView } = mount(1.5)
+    // A document built at mount keeps that scale; a reload after a text-size change reports it.
+    notify({ type: 'web-ready', cellBox: cellAt(1) })
+    expect(handle().fitDimensions(FRAME)).toBeNull()
+    act(() => webView().props.onLoadStart())
+    notify({ type: 'web-ready', cellBox: cellAt(1.5) })
+    expect(handle().fitDimensions(FRAME)).toEqual({ cols: 55, rows: 47 })
+  })
+
+  it('fits in the app from the reported box, and sends the frame with every grid', () => {
+    const { handle, notify } = mount()
+    notify({ type: 'web-ready', cellBox: cellAt(scale) })
+    expect(handle().fitDimensions({ width: 427.5, height: 0 })).toBeNull()
+    expect(handle().fitDimensions({ width: 427.5, height: 710 })).toEqual({ cols: 55, rows: 47 })
+    const frame = { width: 427.5, height: 710 }
+    handle().init({ cols: 55, rows: 47, initialData: '', frame })
+    handle().resize(55, 47, frame)
+    handle().reflow(55, 47, frame)
+    const grids = nativeWebViewMethods.postMessage.mock.calls
+      .map(([message]) => JSON.parse(message))
+      .filter((message) => ['init', 'resize', 'reflow'].includes(message.type))
+    expect(grids.map((message) => message.frame)).toEqual([frame, frame, frame])
+    expect(postedTypes()).not.toContain('measure')
+  })
+
+  it('sends nothing before a ready: a load start drops what was queued', () => {
+    const { handle, notify, webView } = mount()
+    handle().init({ cols: 55, rows: 47, initialData: 'snapshot', frame: null })
+    expect(postedTypes()).toEqual([])
+    act(() => webView().props.onLoadStart())
+    notify({ type: 'web-ready', cellBox: cellAt(scale) })
+    expect(postedTypes()).not.toContain('init')
+  })
+
+  it('reloads the same view when its content process ends', () => {
+    const { webView } = mount()
+    const view = webView()
+    act(() => view.props.onContentProcessDidTerminate({ nativeEvent: {} }))
+    expect(nativeWebViewMethods.reload).toHaveBeenCalledTimes(1)
+    expect(webView()).toBe(view)
+  })
+
+  it('drops queued and coalesced commands on a reload or a lost content process', () => {
+    vi.useFakeTimers()
+    const { handle, notify, webView } = mount()
+    act(() => webView().props.onLoadStart())
+    handle().write('for the reloaded document')
+    act(() => webView().props.onLoadStart())
+    handle().write('for the lost content process')
+    act(() => webView().props.onContentProcessDidTerminate({ nativeEvent: {} }))
+    notify({ type: 'web-ready', cellBox: cellAt(scale) })
+    act(() => {
+      vi.runAllTimers()
+    })
+    expect(postedTypes()).not.toContain('write')
+    handle().write('for the current document')
+    act(() => {
+      vi.runAllTimers()
+    })
+    expect(postedTypes()).toContain('write')
+  })
+
+  it('tells the document the app text scale before it builds its terminal', () => {
+    const { webView } = mount(1.25)
+    const html: string = webView().props.source.html
+    const start = html.indexOf('window.__orcaTerminalTextScale = 1.25;')
+    expect(start).toBeGreaterThan(-1)
+    // Ahead of the document script, in the page itself, so no platform can run it late.
+    expect(start).toBeLessThan(html.indexOf('startTerminalDocument'))
+  })
+
+  it('keeps the source it mounted with across renders, so a new text scale does not reload', () => {
+    const { webView } = mount(1)
+    const source = webView().props.source
+    act(() => renderers[0]!.update(createElement(TerminalWebView, { textScale: 1.5 })))
+    expect(webView().props.source).toBe(source)
+  })
+
+  it('tells a document whose view was hidden at mount not to build before ready', () => {
+    let renderer: ReactTestRenderer | undefined
+    act(() => {
+      renderer = create(createElement(TerminalWebView, { shownAtMount: false }))
+    })
+    renderers.push(renderer!)
+    const webView = renderer!.root.find((node) => typeof node.props.onMessage === 'function')
+    expect(webView.props.source.html).toContain('window.__orcaTerminalShown = false;')
+  })
+})
diff --git a/mobile/src/terminal/terminal-webview-consumer-census.test.ts b/mobile/src/terminal/terminal-webview-consumer-census.test.ts
deleted file mode 100644
index cb57e4a47558..000000000000
--- a/mobile/src/terminal/terminal-webview-consumer-census.test.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { readFileSync, readdirSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-/**
- * Nothing above the terminal component knows which of the two it has.
- *
- * The page's `TerminalWebView.web.tsx` is resolved by the bundler, not chosen by a caller, so the
- * whole substitution rests on every consumer holding only `terminal-webview-contract` — the props
- * and the handle — and on the one that renders the component naming it without an extension. A
- * consumer that reached into `TerminalWebView.tsx` for a type, or imported `terminal-webview-html`
- * for the document string, would work natively and break on the page in a way no native test sees.
- *
- * Scanned rather than listed, so a new consumer joins the rule by existing.
- */
-
-const terminalDir = import.meta.dirname
-const sessionDir = join(terminalDir, '..', 'session')
-
-/** The modules that may reach into the component's own file or the document's HTML. */
-const ALLOWED_INSIDE_TERMINAL = new Set([
-  'TerminalWebView.tsx',
-  'TerminalWebView.web.tsx',
-  'terminal-web-document-mount.ts',
-  'terminal-webview-html.ts',
-  'terminal-webview-html.web.ts',
-  // Test scaffolding that drives the document's own modules; it is not shipped in either build.
-  'terminal-webview-mouse-test-harness.ts'
-])
-
-const FORBIDDEN_ABOVE_THE_CONTRACT = [
-  /from '(\.\.\/terminal|\.)\/TerminalWebView\.(web\.)?tsx?'/,
-  /from '(\.\.\/terminal|\.)\/terminal-webview-html'/,
-  /from '(\.\.\/terminal|\.)\/terminal-webview-engine(-css)?\.generated'/,
-  /from '(\.\.\/terminal|\.)\/document\//
-]
-
-function productModules(directory: string): string[] {
-  return readdirSync(directory)
-    .filter((name) => /\.tsx?$/.test(name))
-    .filter((name) => !name.includes('.test') && !name.includes('.test-support'))
-    .sort()
-}
-
-function offenders(directory: string, skip: (name: string) => boolean): string[] {
-  const found: string[] = []
-  for (const name of productModules(directory)) {
-    if (skip(name)) {
-      continue
-    }
-    const source = readFileSync(join(directory, name), 'utf8')
-    for (const pattern of FORBIDDEN_ABOVE_THE_CONTRACT) {
-      if (pattern.test(source)) {
-        found.push(`${name}: ${pattern.source}`)
-      }
-    }
-  }
-  return found
-}
-
-describe('the terminal component contract', () => {
-  it('is all that src/session imports of the terminal', () => {
-    expect(offenders(sessionDir, () => false)).toEqual([])
-    // The precondition: a scan that read no session module would report nothing either.
-    const rendering = readFileSync(join(sessionDir, 'TerminalPaneView.tsx'), 'utf8')
-    expect(rendering).toContain("from '../terminal/TerminalWebView'")
-    expect(rendering).toContain("from '../terminal/terminal-webview-contract'")
-  })
-
-  it('is all that the terminal directory itself imports, outside the component and its document', () => {
-    expect(offenders(terminalDir, (name) => ALLOWED_INSIDE_TERMINAL.has(name))).toEqual([])
-    expect(productModules(terminalDir).length).toBeGreaterThan(40)
-  })
-
-  it('would report a consumer that named the component file', () => {
-    // The scan tested on the text it is meant to refuse, so an empty offender list above is a
-    // measurement rather than a regex that matches nothing.
-    const planted = "import { TerminalWebView } from '../terminal/TerminalWebView.tsx'\n"
-    expect(FORBIDDEN_ABOVE_THE_CONTRACT.some((pattern) => pattern.test(planted))).toBe(true)
-    const html = "import { XTERM_HTML } from '../terminal/terminal-webview-html'\n"
-    expect(FORBIDDEN_ABOVE_THE_CONTRACT.some((pattern) => pattern.test(html))).toBe(true)
-    const extensionless = "import { TerminalWebView } from '../terminal/TerminalWebView'\n"
-    expect(FORBIDDEN_ABOVE_THE_CONTRACT.some((pattern) => pattern.test(extensionless))).toBe(false)
-  })
-})
diff --git a/mobile/src/terminal/terminal-webview-contract.test.ts b/mobile/src/terminal/terminal-webview-contract.test.ts
index 0a3527111e3e..aca7f9533d83 100644
--- a/mobile/src/terminal/terminal-webview-contract.test.ts
+++ b/mobile/src/terminal/terminal-webview-contract.test.ts
@@ -1,6 +1,10 @@
 import { describe, expect, it } from 'vitest'
 
-import { parseTerminalKeyboardAvoidanceMetrics } from './terminal-webview-contract'
+import {
+  parseTerminalKeyboardAvoidanceMetrics,
+  sameTerminalKeyboardAvoidanceMetrics,
+  type TerminalKeyboardAvoidanceMetrics
+} from './terminal-webview-contract'
 
 describe('parseTerminalKeyboardAvoidanceMetrics', () => {
   it('parses a full payload', () => {
@@ -49,4 +53,44 @@ describe('parseTerminalKeyboardAvoidanceMetrics', () => {
       })
     ).toEqual({ cursorY: 0, contentBottomRow: 0, rows: 0, altScreen: false })
   })
+
+  it('carries the drawn row pitch when the document reports one, and omits it otherwise', () => {
+    expect(parseTerminalKeyboardAvoidanceMetrics({ cursorY: 46, rows: 47, rowPitch: 7.5 })).toEqual(
+      { cursorY: 46, contentBottomRow: 46, rows: 47, altScreen: false, rowPitch: 7.5 }
+    )
+    for (const rowPitch of [undefined, 0, -3, Number.NaN, Number.POSITIVE_INFINITY, '15']) {
+      expect(
+        'rowPitch' in parseTerminalKeyboardAvoidanceMetrics({ cursorY: 1, rows: 4, rowPitch })
+      ).toBe(false)
+    }
+  })
+})
+
+describe('sameTerminalKeyboardAvoidanceMetrics', () => {
+  const metrics: Required<TerminalKeyboardAvoidanceMetrics> = {
+    cursorY: 38,
+    contentBottomRow: 38,
+    rows: 40,
+    altScreen: false,
+    rowPitch: 15
+  }
+  // One variant per field, each differing from `metrics` in that field alone.
+  const variants: [keyof typeof metrics, TerminalKeyboardAvoidanceMetrics][] = [
+    ['cursorY', { ...metrics, cursorY: 39 }],
+    ['contentBottomRow', { ...metrics, contentBottomRow: 39 }],
+    ['rows', { ...metrics, rows: 41 }],
+    ['altScreen', { ...metrics, altScreen: true }],
+    // Desktop display mode, measured on the page: same rows, the fit scale moved to 0.46.
+    ['rowPitch', { ...metrics, rowPitch: 6.96 }]
+  ]
+
+  it('tells apart metrics that differ in any one field', () => {
+    expect(sameTerminalKeyboardAvoidanceMetrics(metrics, { ...metrics })).toBe(true)
+    expect(variants.map(([key]) => key).sort()).toEqual(Object.keys(metrics).sort())
+    for (const [key, variant] of variants) {
+      expect(sameTerminalKeyboardAvoidanceMetrics(metrics, variant), key).toBe(false)
+    }
+    const { rowPitch: _rowPitch, ...older } = metrics
+    expect(sameTerminalKeyboardAvoidanceMetrics(metrics, older)).toBe(false)
+  })
 })
diff --git a/mobile/src/terminal/terminal-webview-contract.ts b/mobile/src/terminal/terminal-webview-contract.ts
index 45b9a38c05a5..1c9960ab1ecd 100644
--- a/mobile/src/terminal/terminal-webview-contract.ts
+++ b/mobile/src/terminal/terminal-webview-contract.ts
@@ -1,6 +1,8 @@
 import type { RuntimeMobileTerminalTheme } from '../../../src/shared/runtime-types'
 import type { TerminalOscLinkRange } from '../../../src/shared/terminal-osc-link-ranges'
 import type { StyleProp, ViewStyle } from 'react-native'
+import type { TerminalFitDimensions } from './terminal-grid-fit'
+import type { TerminalFrame } from './terminal-webview-messages'
 
 type TerminalMouseTrackingMode = 'none' | 'x10' | 'vt200' | 'drag' | 'any'
 
@@ -18,6 +20,23 @@ export type TerminalKeyboardAvoidanceMetrics = {
   contentBottomRow: number
   rows: number
   altScreen: boolean
+  // CSS px between drawn rows, fit scale included; absent from older documents and before the
+  // renderer has measured.
+  rowPitch?: number
+}
+
+/** Every field: a fit-scale change moves only the row pitch, and the lift must hear it. */
+export function sameTerminalKeyboardAvoidanceMetrics(
+  a: TerminalKeyboardAvoidanceMetrics,
+  b: TerminalKeyboardAvoidanceMetrics
+): boolean {
+  return (
+    a.cursorY === b.cursorY &&
+    a.contentBottomRow === b.contentBottomRow &&
+    a.rows === b.rows &&
+    a.altScreen === b.altScreen &&
+    a.rowPitch === b.rowPitch
+  )
 }
 
 export function parseTerminalKeyboardAvoidanceMetrics(
@@ -30,12 +49,11 @@ export function parseTerminalKeyboardAvoidanceMetrics(
     msg.contentBottomRow === undefined
       ? cursorY
       : Math.min(toNonNegativeInteger(msg.contentBottomRow), maxRow)
-  return {
-    cursorY,
-    contentBottomRow,
-    rows,
-    altScreen: msg.altScreen === true
-  }
+  const metrics = { cursorY, contentBottomRow, rows, altScreen: msg.altScreen === true }
+  const rowPitch = msg.rowPitch
+  return typeof rowPitch === 'number' && Number.isFinite(rowPitch) && rowPitch > 0
+    ? { ...metrics, rowPitch }
+    : metrics
 }
 
 function toNonNegativeInteger(value: unknown): number {
@@ -61,6 +79,8 @@ export type TerminalSelectionEvents = {
   // Why: pinch-to-zoom in the terminal snaps to a text-size preset and reports it
   // here so the app persists it and keeps Settings + other panes in sync.
   onTextScaleChange?: (scale: number) => void
+  // xterm laid out a different cell box at the same grid (renderer swap, pixel-ratio change).
+  onCellBoxChange?: () => void
 }
 
 export type TerminalWebViewProps = {
@@ -69,35 +89,42 @@ export type TerminalWebViewProps = {
   // Why: baseline zoom multiplier applied on top of fit-to-width scale; raw
   // xterm fontSize alone cannot drive apparent size because fitting cancels it.
   textScale?: number
+  // Why: only a view shown when it mounts builds its terminal before ready (one WebGL context each).
+  shownAtMount?: boolean
   onWebReady?: () => void
   onEngineError?: (message: string) => void
 } & TerminalSelectionEvents
 
+/** One init: the grid, the snapshot it replays, and the frame the grid was fitted to. */
+export type TerminalInit = {
+  cols: number
+  rows: number
+  initialData?: string
+  preserveScroll?: boolean
+  oscLinks?: TerminalOscLinkRange[]
+  frame: TerminalFrame | null
+}
+
 export type TerminalWebViewHandle = {
   // Why: iOS can preserve the native view while discarding its JS/backing-store
   // state; foreground recovery must wait for the document to answer before replay.
   prepareForForegroundRecovery: () => void
   write: (data: string) => void
-  init: (
-    cols: number,
-    rows: number,
-    initialData?: string,
-    preserveScroll?: boolean,
-    oscLinks?: TerminalOscLinkRange[]
-  ) => void
-  resize: (cols: number, rows: number) => void
+  init: (init: TerminalInit) => void
+  resize: (cols: number, rows: number, frame: TerminalFrame | null) => void
   // Why: reflow the local xterm buffer (scrollback included) to a new width
   // after a server-side PTY reflow, so older wrapped lines rewrap to match the
   // latest output. No-op on the alternate screen.
-  reflow: (cols: number, rows: number) => void
+  reflow: (cols: number, rows: number, frame: TerminalFrame | null) => void
   clear: () => void
-  measureFitDimensions: (containerHeight?: number) => Promise<{ cols: number; rows: number } | null>
+  /** The grid this frame holds at the cell box the document reported; null without one at this text size. */
+  fitDimensions: (frame: TerminalFrame) => TerminalFitDimensions | null
   resetZoom: () => void
   cancelSelect: () => void
   doSelectAll: () => void
   // Why: lets callers await the WebView-side `init` rAF chain (term.open
-  // → renderService population → first paint) so a follow-up measure
-  // doesn't race ahead and find term=null or cellWidth=0. Resolves on
-  // the next 'ready' notify after the most recent init.
+  // → renderService population → first paint → the init's cell box) so a
+  // follow-up fit reads that box. Resolves on the next 'ready' notify after
+  // the most recent init.
   awaitReady: () => Promise<void>
 }
diff --git a/mobile/src/terminal/terminal-webview-engine.test.ts b/mobile/src/terminal/terminal-webview-engine.test.ts
index 3f3aab326fec..96a4327f0908 100644
--- a/mobile/src/terminal/terminal-webview-engine.test.ts
+++ b/mobile/src/terminal/terminal-webview-engine.test.ts
@@ -1,6 +1,4 @@
 // @vitest-environment happy-dom
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { Script } from 'node:vm'
 import { parse } from 'acorn'
 import { describe, expect, it, vi } from 'vitest'
@@ -8,15 +6,8 @@ import { XTERM_ENGINE_CSS } from './terminal-webview-engine-css.generated'
 import { XTERM_ENGINE_JS } from './terminal-webview-engine.generated'
 import { createTerminalDocumentScope } from './document/document-scope'
 import { attachWebglAddon, startWebglRecovery } from './document/webgl-recovery'
-import {
-  documentModuleSource,
-  documentSourceText
-} from './document/document-module-source.test-support'
 import { XTERM_HTML } from './terminal-webview-html'
 
-// The document's own source, so a rule about what the document does is read where it is written.
-const terminalHtmlSource = documentSourceText()
-
 function createWebglRecoveryHarness(failSecondAttach = false) {
   const timers: Array<() => void> = []
   const addons: Array<{
@@ -151,58 +142,6 @@ describe('terminal WebView bundled engine', () => {
     expect(XTERM_ENGINE_CSS).not.toMatch(/<\/style/i)
   })
 
-  it('reports WebView message handler failures instead of swallowing them', () => {
-    const start = terminalHtmlSource.indexOf('function handleIncomingMessage')
-    // Bounded by the next declaration in the same module: ruling 24 took the resize listener out
-    // of the bridge, so the handler is followed by the start that installs the transport.
-    const end = terminalHtmlSource.indexOf('function startMessageBridge', start)
-    expect(start).toBeGreaterThanOrEqual(0)
-    expect(end).toBeGreaterThan(start)
-    const handlerSource = terminalHtmlSource.slice(start, end)
-
-    expect(handlerSource).toContain('reportEngineError(')
-    expect(handlerSource).toContain("'terminal init failed'")
-    expect(handlerSource).toContain("'terminal message failed'")
-    expect(handlerSource).not.toContain('catch(ex) {}')
-  })
-
-  it('classifies runtime errors by a document-scoped ever-ready latch', () => {
-    // Why: init() flips `ready` false on every re-init (live width reflow keeps the
-    // old surface visible meanwhile), so the fatal default and the init-catch must
-    // key off `everReady` — otherwise a transient reflow error blanks a live
-    // terminal behind the fatal overlay. The latch stays set for the document.
-    // Ruling 21: the latch's initial value is in the scope factory, not in a parse-time write.
-    expect(terminalHtmlSource).toContain('everReady: false,')
-    expect(terminalHtmlSource).toContain('scope.everReady = true')
-    expect(terminalHtmlSource).toContain('fatal === undefined ? !scope.everReady : !!fatal')
-    expect(terminalHtmlSource).toContain("msg && msg.type === 'init' && !scope.everReady")
-    expect(terminalHtmlSource).not.toMatch(/fatal === void 0 \? !scope\.ready\b/)
-  })
-
-  it('bounds error capture and non-fatal reporting on a degraded engine', () => {
-    // Why: a constructed-but-broken engine can throw per render frame; both
-    // onerror capture sites must cap the buffer and non-fatal notifies must
-    // stop flooding RN while fatal reports always emit.
-    // Both sites: the document's own reporter, and the shell's inline handler that catches what
-    // fails before the document has run at all.
-    // `dirname`, not the module URL: a DOM-environment case has no `file:` URL to convert.
-    const shell = readFileSync(
-      join(import.meta.dirname, 'terminal-webview-html', 'document-shell.ts'),
-      'utf8'
-    )
-    // The shell's buffer is a global because it is older than any document; the document appends to
-    // it through the seam, so the two sites now spell the same cap over the same list differently.
-    expect(shell).toContain('window.__engineErrors.length < 20')
-    expect(terminalHtmlSource).toContain('const captured = scope.capturedEngineErrors()')
-    expect(terminalHtmlSource).toContain('if (captured.length < 20) {')
-    // The global is read in one place, the seam's own default, and the reporter no longer names it.
-    expect(documentModuleSource('host-notify')).not.toContain('window.__engineErrors')
-    expect(documentModuleSource('document-host-seams')).toContain(
-      'window.__engineErrors = window.__engineErrors ?? []'
-    )
-    expect(terminalHtmlSource).toContain('nonFatalErrorNotifies > 5')
-  })
-
   it('recreates WebGL once after context loss, then stays on the DOM renderer', () => {
     const { addons, logged, term, timers } = createWebglRecoveryHarness()
 
diff --git a/mobile/src/terminal/terminal-webview-html.ts b/mobile/src/terminal/terminal-webview-html.ts
index 01d0e577a864..65bbff60d352 100644
--- a/mobile/src/terminal/terminal-webview-html.ts
+++ b/mobile/src/terminal/terminal-webview-html.ts
@@ -21,4 +21,20 @@ export const XTERM_HTML = [
   TERMINAL_HTML_DOCUMENT_CLOSE
 ].join('')
 
-export const XTERM_WEBVIEW_SOURCE = { html: XTERM_HTML }
+/**
+ * The WebView's document, starting as its view mounted: at this text scale, and whether it was
+ * shown. Written into the page ahead of the document script, which reads them as it starts.
+ */
+export function xtermWebViewSource(start: { textScale: number; shown: boolean }) {
+  const startValues =
+    `window.__orcaTerminalTextScale = ${JSON.stringify(start.textScale)};\n` +
+    `window.__orcaTerminalShown = ${JSON.stringify(start.shown)};\n`
+  return {
+    html: [
+      TERMINAL_HTML_DOCUMENT_SHELL,
+      startValues,
+      TERMINAL_DOCUMENT_SCRIPT,
+      TERMINAL_HTML_DOCUMENT_CLOSE
+    ].join('')
+  }
+}
diff --git a/mobile/src/terminal/terminal-webview-messages.ts b/mobile/src/terminal/terminal-webview-messages.ts
index 35c6e991b68d..ca82f1739178 100644
--- a/mobile/src/terminal/terminal-webview-messages.ts
+++ b/mobile/src/terminal/terminal-webview-messages.ts
@@ -1,6 +1,9 @@
 import type { RuntimeMobileTerminalTheme } from '../../../src/shared/runtime-types'
 import type { TerminalOscLinkRange } from '../../../src/shared/terminal-osc-link-ranges'
 
+/** The frame React Native laid out, sent with each grid so the document fits a text-size change to it. */
+export type TerminalFrame = { width: number; height: number }
+
 export type TerminalWebViewCommand =
   | { type: 'ping'; id?: number }
   | { type: 'write'; id?: number; data: string }
@@ -16,12 +19,12 @@ export type TerminalWebViewCommand =
       // Why: width-reflow re-streams replay the same content rewrapped at new
       // cols; preserve the reader's scroll position instead of jumping to bottom.
       preserveScroll?: boolean
+      frame: TerminalFrame | null
     }
   | { type: 'set-font-scale'; id?: number; fontScale: number }
-  | { type: 'resize'; id?: number; cols: number; rows: number }
-  | { type: 'reflow'; id?: number; cols: number; rows: number }
+  | { type: 'resize'; id?: number; cols: number; rows: number; frame: TerminalFrame | null }
+  | { type: 'reflow'; id?: number; cols: number; rows: number; frame: TerminalFrame | null }
   | { type: 'clear'; id?: number }
-  | { type: 'measure'; id?: number; containerHeight?: number }
   | { type: 'reset-zoom'; id?: number }
   | { type: 'cancel-select'; id?: number }
   | { type: 'do-select-all'; id?: number }
diff --git a/mobile/src/terminal/terminal-webview-query-reply.test.ts b/mobile/src/terminal/terminal-webview-query-reply.test.ts
index 49b8fb635391..fe090b1436e9 100644
--- a/mobile/src/terminal/terminal-webview-query-reply.test.ts
+++ b/mobile/src/terminal/terminal-webview-query-reply.test.ts
@@ -6,7 +6,6 @@ import {
   resetTerminalDataReplyAuthority,
   resumeTerminalDataReplyAuthority
 } from './document/query-reply'
-import { documentModuleSource } from './document/document-module-source.test-support'
 
 type QueryReplyGate = {
   forward: (data: string) => void
@@ -50,32 +49,6 @@ function createQueryReplyGate(notify: (message: unknown) => void): {
 }
 
 describe('mobile terminal query replies', () => {
-  it('forwards xterm-generated data only after initial replay drains', () => {
-    const bridge = documentModuleSource('query-reply')
-    const init = documentModuleSource('terminal-init')
-    // The listener is armed by the bridge, and what it forwards is the gate's own call.
-    expect(bridge).toContain('term.onData(')
-    expect(bridge).toContain('forwardTerminalDataReply(scope, data)')
-    // The terminal takes keystrokes from the host, never from its own textarea: stdin is enabled so
-    // xterm generates replies, and the textarea is read-only so the phone's keyboard cannot type.
-    expect(init).toContain('disableStdin: false')
-    // Both are the bridge's own doing, where the listener it arms is: it takes the key handler and
-    // the textarea in the same breath.
-    expect(bridge).toContain('term.attachCustomKeyEventHandler(')
-    expect(bridge).toContain('term.textarea.readOnly = true')
-  })
-
-  it('mutes a replacement terminal until its own replay drains', () => {
-    const init = documentModuleSource('terminal-init')
-    const initIndex = init.indexOf('export function init(')
-    const disableIndex = init.indexOf('resetTerminalDataReplyAuthority(scope)', initIndex)
-    const enableIndex = init.indexOf('attachTerminalQueryReplyBridge(scope,', disableIndex)
-
-    expect(initIndex).toBeGreaterThanOrEqual(0)
-    expect(disableIndex).toBeGreaterThan(initIndex)
-    expect(enableIndex).toBeGreaterThan(disableIndex)
-  })
-
   it('suppresses replay, then forwards live queries queued behind its boundary', () => {
     const messages: unknown[] = []
     const { gate, queuedBoundaries } = createQueryReplyGate((message) => messages.push(message))
@@ -117,10 +90,5 @@ describe('mobile terminal query replies', () => {
     gate.forward('\x1b[3;4R')
 
     expect(messages).toEqual([{ type: 'terminal-data', bytes: '\x1b[3;4R' }])
-    const router = documentModuleSource('host-message-router')
-    const clearStart = router.indexOf("} else if (msg.type === 'clear') {")
-    const clearEnd = router.indexOf("} else if (msg.type === 'measure')", clearStart)
-    expect(clearStart).toBeGreaterThanOrEqual(0)
-    expect(router.slice(clearStart, clearEnd)).toContain('resumeTerminalDataReplyAuthority(scope)')
   })
 })
diff --git a/mobile/src/terminal/terminal-webview-ready-promises.ts b/mobile/src/terminal/terminal-webview-ready-promises.ts
index fde27fe28460..0eab14849dc8 100644
--- a/mobile/src/terminal/terminal-webview-ready-promises.ts
+++ b/mobile/src/terminal/terminal-webview-ready-promises.ts
@@ -1,35 +1,24 @@
 import { useMemo } from 'react'
-import type { TerminalWebViewCommand } from './terminal-webview-messages'
 
 /**
- * The two promises the terminal handle hands out, and the notifies that settle them.
+ * The ready promise the terminal handle hands out, and the notify that settles it.
  *
  * `awaitReady` waits for the document's `init` rAF chain — `term.open`, renderService population,
- * first paint — because a measure that runs synchronously after init finds `term` null or cells
- * of size zero. `measureFitDimensions` waits for the document's answer. Both are promises held
- * across a message round trip, both have a timeout for the case where the document never answers,
- * and both are the same on either host, so they live here rather than in the controller that owns
- * the readiness handshake.
+ * first paint, and the cell box that init reports — so a fit after it reads the init's own box. It
+ * has a timeout for a document that never answers, and is the same on either host.
  */
 
 const READY_TIMEOUT_MS = 3000
-const MEASURE_TIMEOUT_MS = 2000
-/** Below these the fit is not a terminal anyone can read, and the caller disables fit-to-phone. */
-const MIN_FIT_COLS = 20
-const MIN_FIT_ROWS = 8
-
-export type TerminalFitDimensions = { cols: number; rows: number }
 
 export function createTerminalWebViewReadyPromises() {
   let readyPromise: Promise<void> | null = null
   let readyResolve: (() => void) | null = null
-  let measureResolve: ((result: TerminalFitDimensions | null) => void) | null = null
 
   /**
    * Arms a fresh ready promise, resolving any prior one first.
    *
    * Why: an awaiter from the previous generation would otherwise sit on the timeout below — each
-   * leaked timer and closure pinned an awaiting measure caller for the full 3s under rapid
+   * leaked timer and closure pinned an awaiting fit caller for the full 3s under rapid
    * re-init (orientation change, multiple resubscribes), delaying cold-start fit chains.
    */
   function armReady() {
@@ -70,47 +59,7 @@ export function createTerminalWebViewReadyPromises() {
     })
   }
 
-  function measure(
-    send: (command: TerminalWebViewCommand) => void,
-    containerHeight?: number
-  ): Promise<TerminalFitDimensions | null> {
-    return new Promise((resolve) => {
-      measureResolve?.(null)
-      let timeout: ReturnType<typeof setTimeout> | null = null
-      const finish = (result: TerminalFitDimensions | null) => {
-        if (timeout) {
-          clearTimeout(timeout)
-          timeout = null
-        }
-        if (measureResolve === finish) {
-          measureResolve = null
-        }
-        resolve(result)
-      }
-      measureResolve = finish
-      send({ type: 'measure', containerHeight })
-      // Why: if the document doesn't respond (e.g., xterm failed to load), resolve null so the
-      // caller can disable Fit to Phone rather than hanging indefinitely.
-      timeout = setTimeout(() => {
-        if (measureResolve === finish) {
-          finish(null)
-        }
-      }, MEASURE_TIMEOUT_MS)
-    })
-  }
-
-  function resolveMeasure(msg: Record<string, unknown>) {
-    const resolve = measureResolve
-    measureResolve = null
-    if (!resolve) {
-      return
-    }
-    const cols = typeof msg.cols === 'number' ? msg.cols : null
-    const rows = typeof msg.rows === 'number' ? msg.rows : null
-    resolve(cols && rows && cols >= MIN_FIT_COLS && rows >= MIN_FIT_ROWS ? { cols, rows } : null)
-  }
-
-  return { armReady, awaitReady, measure, resolveMeasure, resolveReady }
+  return { armReady, awaitReady, resolveReady }
 }
 
 export function useTerminalWebViewReadyPromises() {
diff --git a/mobile/src/terminal/terminal-webview-reflow.test.ts b/mobile/src/terminal/terminal-webview-reflow.test.ts
deleted file mode 100644
index 5e29cb06c8e6..000000000000
--- a/mobile/src/terminal/terminal-webview-reflow.test.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { describe, expect, it } from 'vitest'
-import {
-  documentModuleSource,
-  documentSourceText
-} from './document/document-module-source.test-support'
-
-const DOCUMENT_SOURCE = documentSourceText()
-
-// The reflow logic is the document's; the message dispatch and the handle wiring are the
-// component's. Both are read as source, because the document is source now.
-const reflowSource = documentModuleSource('reflow')
-// The handle is built by the controller both components share, which is where the wiring is read.
-const handleSource = readFileSync(
-  new URL('./use-terminal-webview-controller.ts', import.meta.url),
-  'utf8'
-)
-
-function reflowFnBody(): string {
-  const start = reflowSource.indexOf('export function reflow(scope: TerminalDocumentScope')
-  expect(start).toBeGreaterThanOrEqual(0)
-  return reflowSource.slice(start)
-}
-
-describe('terminal WebView reflow', () => {
-  it('skips the alternate screen so TUI snapshots are not mutated', () => {
-    // Why: alt-screen snapshots are repainted by the PTY; a local resize there
-    // can drop SGR attributes (white text). Reflow must early-return.
-    expect(reflowFnBody()).toContain('if (!scope.term || isAlternateBufferActive(scope)) {')
-  })
-
-  it('rewraps the local buffer via term.resize to the new cols', () => {
-    expect(reflowFnBody()).toContain('scope.term.resize(nextCols, nextRows)')
-  })
-
-  it('preserves the user scroll position across the rewrap', () => {
-    const body = reflowFnBody()
-    // At the live bottom -> stay pinned; scrolled up -> hold distance-from-bottom.
-    expect(body).toContain('const wasAtBottom = buffer.viewportY >= buffer.baseY')
-    expect(body).toContain('scope.term.scrollToBottom()')
-    expect(body).toContain('rewrapped.baseY - distanceFromBottom - rewrapped.viewportY')
-  })
-
-  it('is no-op when the dimensions are unchanged', () => {
-    expect(reflowFnBody()).toContain(
-      'if (nextCols === scope.term.cols && nextRows === scope.term.rows) {'
-    )
-  })
-
-  it('is dispatched by the reflow WebView message and exposed on the handle', () => {
-    expect(DOCUMENT_SOURCE).toContain("} else if (msg.type === 'reflow') {")
-    expect(DOCUMENT_SOURCE).toContain('reflow(scope, msg.cols!, msg.rows!)')
-    expect(handleSource).toContain("postMessage({ type: 'reflow', cols, rows })")
-  })
-
-  it('does not locally resize hidden WebViews to a one-column grid', () => {
-    // The floor is a constant of the module that fits the grid, and both readers import it.
-    expect(DOCUMENT_SOURCE).toContain('export const MIN_FIT_COLS = 20')
-    expect(DOCUMENT_SOURCE).toContain('if (cols < MIN_FIT_COLS) {')
-    expect(DOCUMENT_SOURCE).toContain("flog(scope, 'measure-skip-small-width'")
-    expect(DOCUMENT_SOURCE).toContain(
-      "notify(scope, { type: 'measure-result', cols: null, rows: null })"
-    )
-  })
-})
diff --git a/mobile/src/terminal/terminal-webview-scroll-routing.test.ts b/mobile/src/terminal/terminal-webview-scroll-routing.test.ts
deleted file mode 100644
index f62bfdf1ee25..000000000000
--- a/mobile/src/terminal/terminal-webview-scroll-routing.test.ts
+++ /dev/null
@@ -1,262 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { describe, expect, it } from 'vitest'
-import { webviewPageSource } from './document/document-module-source.test-support'
-
-const DOCUMENT_SOURCE = webviewPageSource()
-
-// The RN wrapper and the pending-message queue are TypeScript; everything the WebView runs is the
-// generated document. Concatenated so assertions resolve regardless of file.
-const source =
-  readFileSync(new URL('./TerminalWebView.tsx', import.meta.url), 'utf8') +
-  readFileSync(new URL('./use-terminal-webview-controller.ts', import.meta.url), 'utf8') +
-  readFileSync(new URL('./terminal-webview-ready-promises.ts', import.meta.url), 'utf8') +
-  readFileSync(new URL('./terminal-webview-pending-messages.ts', import.meta.url), 'utf8') +
-  readFileSync(new URL('./terminal-webview-html/document-markup.ts', import.meta.url), 'utf8') +
-  readFileSync(new URL('./terminal-webview-html/document-style.ts', import.meta.url), 'utf8') +
-  DOCUMENT_SOURCE
-const sessionSource = readFileSync(
-  new URL('../session/use-mobile-session-terminal-input.ts', import.meta.url),
-  'utf8'
-)
-const sessionHelperSource = readFileSync(
-  new URL('../session/mobile-session-route-helpers.ts', import.meta.url),
-  'utf8'
-)
-
-function sliceBetween(startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('TerminalWebView scroll routing', () => {
-  it('keeps Android touch drags inside the terminal WebView', () => {
-    expect(source).toContain('nestedScrollEnabled')
-  })
-
-  it('maps a downward pull at the bottom to older scrollback rows', () => {
-    expect(source).toContain('const deltaY = scope.touchGesture.lastY - y')
-    expect(source).toContain('scope.smoothScrollOffsetY -= deltaY')
-    expect(source).toContain(
-      'const lines = Math.trunc(-scope.smoothScrollOffsetY / effectiveCellH)'
-    )
-
-    const nextViewportY = simulateNormalBufferPull({
-      baseY: 120,
-      viewportY: 120,
-      startY: 300,
-      endY: 340,
-      cellHeight: 20
-    })
-
-    expect(nextViewportY).toBe(118)
-  })
-
-  it('routes alternate-screen and mouse-aware scroll before smooth normal scroll', () => {
-    expect(source).toContain(
-      'return isWheelMouseTrackingMode(getMouseTrackingMode(scope)) || isAlternateBufferActive(scope)'
-    )
-
-    const touchMoveBlock = sliceBetween(
-      "targetSurface.addEventListener(\n    'touchmove'",
-      '{ capture: true, passive: false }'
-    )
-    expect(touchMoveBlock.indexOf('if (shouldRouteScrollToTerminalInput(scope))')).toBeLessThan(
-      touchMoveBlock.indexOf('if (enqueueNormalBufferScrollDelta(scope, deltaY))')
-    )
-    expect(touchMoveBlock).toContain('routeScrollLines(scope, lines, x, y)')
-
-    const momentumBlock = sliceBetween(
-      'function momentumStep(frameTime: number) {',
-      'if (Math.abs(vel) > MIN_VEL)'
-    )
-    expect(momentumBlock.indexOf('if (shouldRouteScrollToTerminalInput(scope))')).toBeLessThan(
-      momentumBlock.indexOf('if (!applyNormalBufferScrollDelta(scope, delta))')
-    )
-    expect(momentumBlock).toContain(
-      'routeScrollLines(scope, lines, scope.touchGesture.lastX, scope.touchGesture.lastY)'
-    )
-  })
-
-  it('does not rubber-band normal scroll at scrollback edges', () => {
-    expect(source).toContain('export function canScrollNormalBufferDelta(')
-    const smoothScrollBlock = sliceBetween(
-      'export function applyNormalBufferScrollDelta(',
-      'export function enqueueNormalBufferScrollDelta('
-    )
-    expect(smoothScrollBlock).toContain('if (!canScrollNormalBufferDelta(scope, deltaY))')
-    expect(smoothScrollBlock).toContain('resetSmoothScrollOffset(scope)')
-    expect(smoothScrollBlock).toContain('return false')
-    expect(smoothScrollBlock).toContain('return true')
-
-    const touchMoveBlock = sliceBetween(
-      "targetSurface.addEventListener(\n    'touchmove'",
-      '{ capture: true, passive: false }'
-    )
-    expect(touchMoveBlock).toContain('if (enqueueNormalBufferScrollDelta(scope, deltaY))')
-    expect(touchMoveBlock).toContain('scope.touchGesture.velY = 0')
-
-    const momentumBlock = sliceBetween(
-      'function momentumStep(frameTime: number) {',
-      'if (Math.abs(vel) > MIN_VEL)'
-    )
-    expect(momentumBlock).toContain('if (!applyNormalBufferScrollDelta(scope, delta))')
-    expect(momentumBlock).toContain('scope.touchGesture.momentumId = null')
-  })
-
-  it('coalesces normal touch scroll row commits onto animation frames', () => {
-    const enqueueBlock = sliceBetween(
-      'export function enqueueNormalBufferScrollDelta(',
-      'export function resetSmoothScrollOffset('
-    )
-    expect(enqueueBlock).toContain('scope.pendingNormalScrollDeltaY += deltaY')
-    expect(enqueueBlock).toContain('if (scope.normalScrollFrameId !== null) {')
-    // Ruling 21: every document frame goes through the scope's registry so dispose can take it
-    // back; the id is still held here, which is what the reset below cancels.
-    expect(enqueueBlock).toContain(
-      'scope.normalScrollFrameId = scheduleDocumentFrame(scope, function () {'
-    )
-    expect(enqueueBlock).toContain('applyNormalBufferScrollDelta(scope, delta)')
-
-    const resetBlock = sliceBetween(
-      'export function resetSmoothScrollOffset(',
-      'export function stopNormalBufferSmoothScroll('
-    )
-    expect(resetBlock).toContain('scope.pendingNormalScrollDeltaY = 0')
-    expect(resetBlock).toContain('cancelAnimationFrame(scope.normalScrollFrameId)')
-  })
-
-  it('bounds native-side pending WebView writes while preserving control messages', () => {
-    expect(source).toContain('const MAX_PENDING_WEB_WRITE_BYTES = 1_000_000')
-    expect(source).toContain('const MAX_PENDING_WEB_WRITE_MESSAGES = 4096')
-    expect(source).toContain('let pendingWriteBytes = 0')
-    expect(source).toContain('let pendingWriteCount = 0')
-    expect(source).toContain('const queue = (msg: TerminalWebViewCommand)')
-    expect(source).toContain('pendingWriteCount > MAX_PENDING_WEB_WRITE_MESSAGES')
-    expect(source).toContain("candidate.type === 'write'")
-    expect(source).toContain('pendingMessages.queue(msg)')
-    expect(source).toContain('pendingMessages.clear()')
-  })
-
-  it('clears WebView await timers when the real response wins', () => {
-    // C7.5 moved both promises into `terminal-webview-ready-promises.ts`, which both components
-    // reach through the controller; the two blocks are the same code in their new home.
-    const measureBlock = sliceBetween('function measure(', 'function resolveMeasure')
-    expect(measureBlock).toContain('clearTimeout(timeout)')
-    expect(measureBlock).toContain('measureResolve === finish')
-
-    const readyBlock = sliceBetween('async function awaitReady()', 'function measure(')
-    expect(readyBlock).toContain('clearTimeout(timeout)')
-    expect(readyBlock).toContain('void pending.finally')
-  })
-
-  it('hides xterm scrollbars and drives the mobile scroll indicator from committed rows', () => {
-    expect(source).toContain('<div id="scroll-indicator"><div id="scroll-thumb"></div></div>')
-    expect(source).toContain('.xterm .xterm-viewport::-webkit-scrollbar')
-    expect(source).toContain('.xterm .xterm-scrollable-element > .xterm-scrollbar')
-    expect(source).toContain('overflow-y: hidden !important')
-    expect(source).toContain('display: none !important')
-    expect(source).toContain('export function updateScrollIndicator(')
-    expect(source).toContain('buffer.viewportY / maxViewportY')
-    expect(source).not.toContain('fractionalRows')
-    expect(source).toContain('scrollThumb.style.transform =')
-    expect(source).toContain('updateScrollIndicator(scope, true)')
-  })
-
-  it('does not apply fractional smooth scroll transforms to terminal content', () => {
-    const updateTransformBlock = sliceBetween(
-      'export function updateTransform(',
-      'export function updateScrollIndicator('
-    )
-    expect(updateTransformBlock).toContain(
-      "'translate(' + scope.panX + 'px,' + scope.panY + 'px) scale(' + getTotalScale(scope) + ')'"
-    )
-    expect(source).not.toContain("querySelector('.xterm-screen')")
-    expect(source).not.toContain('updateTerminalScreenTransform')
-    expect(updateTransformBlock).not.toContain('getVisualPanY() + "px) scale("')
-    expect(updateTransformBlock).not.toContain('smoothScrollOffsetY')
-  })
-
-  it('smooths velocity samples and uses lower friction for mobile momentum', () => {
-    expect(source).toContain('export function updateTouchVelocity(')
-    expect(source).toContain('scope.touchGesture.velY * 0.55 + instantVelocity * 0.45')
-    expect(source).toContain('const FRICTION = 0.972')
-    expect(source).toContain('const MIN_VEL = 0.012')
-    // #21687: the decay is per elapsed millisecond, so a 120 Hz screen coasts the same distance.
-    expect(source).toContain('let lastMomentumTime = performance.now()')
-    expect(source).toContain(
-      'const elapsed = Math.max(1, Math.min(50, frameTime - lastMomentumTime))'
-    )
-    expect(source).toContain('vel *= FRICTION ** (elapsed / 16)')
-    expect(source).toContain('const delta = vel * elapsed')
-  })
-
-  it('keeps selection edge autoscroll active and extends the dragged endpoint', () => {
-    const startBlock = sliceBetween(
-      'export function startEdgeScroll(',
-      'export function stopEdgeScroll('
-    )
-    expect(startBlock.indexOf('stopEdgeScroll(scope)')).toBeLessThan(
-      startBlock.indexOf('scope.edgeScrollDir = dir')
-    )
-    expect(startBlock.indexOf('scope.term.scrollLines(scope.edgeScrollDir)')).toBeLessThan(
-      startBlock.indexOf('syncEdgeScrollSelectionEndpoint(scope)')
-    )
-
-    const dragMoveBlock = sliceBetween(
-      'export function handleDragMove(',
-      'function attachSurfaceEventHandlers('
-    )
-    expect(dragMoveBlock).toContain('scope.edgeScrollClientX = clientX')
-    expect(dragMoveBlock).toContain('scope.edgeScrollClientY = clientY')
-    expect(dragMoveBlock).toContain(
-      'syncSelectionHandleToViewportPoint(scope, handle, clientX, clientY)'
-    )
-  })
-
-  it('allows x10 mouse gesture reports through the mobile session gate', () => {
-    expect(sessionHelperSource).toContain('function isGestureMouseTrackingMode')
-    expect(sessionHelperSource).toContain(
-      "return mode === 'x10' || mode === 'vt200' || mode === 'drag' || mode === 'any'"
-    )
-
-    const inputBlockStart = sessionSource.indexOf('const handleTerminalInput = useCallback')
-    expect(inputBlockStart).toBeGreaterThanOrEqual(0)
-    const inputBlockEnd = sessionSource.indexOf(
-      'async function handleClearTerminal',
-      inputBlockStart
-    )
-    expect(inputBlockEnd).toBeGreaterThan(inputBlockStart)
-    const inputBlock = sessionSource.slice(inputBlockStart, inputBlockEnd)
-    expect(inputBlock).toContain('!isGestureMouseTrackingMode(modes?.mouseTrackingMode)')
-    expect(inputBlock).toContain('const sequenceCount = countTerminalGestureInputSequences(bytes)')
-    expect(inputBlock.indexOf('countTerminalGestureInputSequences')).toBeLessThan(
-      inputBlock.indexOf('enqueueTerminalGestureInput')
-    )
-  })
-})
-
-function simulateNormalBufferPull({
-  baseY,
-  viewportY,
-  startY,
-  endY,
-  cellHeight
-}: {
-  baseY: number
-  viewportY: number
-  startY: number
-  endY: number
-  cellHeight: number
-}): number {
-  const deltaY = startY - endY
-  if (deltaY > 0 ? viewportY >= baseY : viewportY <= 0) {
-    return viewportY
-  }
-  const smoothScrollOffsetY = -deltaY
-  const lines = Math.trunc(-smoothScrollOffsetY / cellHeight)
-  const applied = Math.max(lines, -viewportY)
-  return viewportY + applied
-}
diff --git a/mobile/src/terminal/terminal-webview-text-zoom.test.ts b/mobile/src/terminal/terminal-webview-text-zoom.test.ts
index 9d2403098ca2..29ba4bfcd138 100644
--- a/mobile/src/terminal/terminal-webview-text-zoom.test.ts
+++ b/mobile/src/terminal/terminal-webview-text-zoom.test.ts
@@ -1,23 +1,8 @@
 // @vitest-environment happy-dom
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { describe, expect, it, vi } from 'vitest'
 import { createTerminalDocumentScope } from './document/document-scope'
 import { normalizeStatusDotPresentation } from './document/write-queue'
 import { startTextScaling } from './document/text-scaling'
-import { webviewPageSource } from './document/document-module-source.test-support'
-
-const terminalWebViewSource = readFileSync(join(import.meta.dirname, 'TerminalWebView.tsx'), 'utf8')
-const terminalHtmlModuleSource = readFileSync(
-  join(import.meta.dirname, 'terminal-webview-html.ts'),
-  'utf8'
-)
-const terminalHtmlDocumentShellSource = readFileSync(
-  join(import.meta.dirname, 'terminal-webview-html', 'document-shell.ts'),
-  'utf8'
-)
-// The document's own source, which is what the WebView runs once bundled.
-const terminalHtmlSource = webviewPageSource()
 
 function normalizeStatusDotChunks(chunks: string[]) {
   const scope = createTerminalDocumentScope()
@@ -50,47 +35,6 @@ function resolveTerminalFontFamily(navigatorValue: {
 }
 
 describe('TerminalWebView text zoom', () => {
-  it('pins textZoom to 100 so Android system font scale cannot inflate glyphs past xterm cell metrics', () => {
-    const start = terminalWebViewSource.indexOf('<WebView')
-    expect(start).toBeGreaterThanOrEqual(0)
-    const end = terminalWebViewSource.indexOf('/>', start)
-    expect(end).toBeGreaterThan(start)
-    const webViewProps = terminalWebViewSource.slice(start, end)
-    expect(webViewProps).toContain('textZoom={100}')
-  })
-
-  it('keeps the HTML source object stable so parent renders do not reload xterm', () => {
-    const start = terminalWebViewSource.indexOf('<WebView')
-    expect(start).toBeGreaterThanOrEqual(0)
-    const end = terminalWebViewSource.indexOf('/>', start)
-    expect(end).toBeGreaterThan(start)
-    const webViewProps = terminalWebViewSource.slice(start, end)
-    expect(terminalHtmlModuleSource).toContain(
-      'export const XTERM_WEBVIEW_SOURCE = { html: XTERM_HTML }'
-    )
-    expect(webViewProps).toContain('source={XTERM_WEBVIEW_SOURCE}')
-    expect(webViewProps).not.toContain('source={{ html: XTERM_HTML }}')
-  })
-
-  it('forces the Claude status dot to text presentation before xterm writes', () => {
-    expect(terminalHtmlSource).toContain('font-variant-emoji: text')
-    // The dot and its two selectors are the write queue's own constants, and the pattern is a
-    // literal because a construction at a module's top level would be parse-time work (ruling 20).
-    expect(terminalHtmlSource).toContain("const CLAUDE_STATUS_DOT = '\\u23fa'")
-    expect(terminalHtmlSource).toContain("const TEXT_PRESENTATION_SELECTOR = '\\ufe0e'")
-    expect(terminalHtmlSource).toContain("const EMOJI_PRESENTATION_SELECTOR = '\\ufe0f'")
-    expect(terminalHtmlSource).toContain(
-      'const CLAUDE_STATUS_DOT_PATTERN = /\\u23fa[\\ufe0e\\ufe0f]*/g'
-    )
-    expect(terminalHtmlSource).toContain('export function normalizeStatusDotPresentation(')
-    expect(terminalHtmlSource).toContain(
-      'CLAUDE_STATUS_DOT_PATTERN,\n    CLAUDE_STATUS_DOT + TEXT_PRESENTATION_SELECTOR'
-    )
-    expect(terminalHtmlSource).toContain(
-      'scope.writeQueue.push(normalizeStatusDotPresentation(scope, data))'
-    )
-  })
-
   it('normalizes Claude status dots idempotently across write chunks', () => {
     const dot = String.fromCharCode(0x23fa)
     const textSelector = String.fromCharCode(0xfe0e)
@@ -117,36 +61,6 @@ describe('TerminalWebView text zoom', () => {
     )
   })
 
-  it('resets pending Claude status dot selector state when the terminal lifecycle resets', () => {
-    const initStart = terminalHtmlSource.indexOf('export function init(')
-    const initReplay = terminalHtmlSource.indexOf(
-      'const replayData = normalizeInitialData(initialData)'
-    )
-    const clearStart = terminalHtmlSource.indexOf("} else if (msg.type === 'clear') {")
-    const clearEnd = terminalHtmlSource.indexOf("} else if (msg.type === 'measure')", clearStart)
-    expect(initStart).toBeGreaterThanOrEqual(0)
-    expect(initReplay).toBeGreaterThan(initStart)
-    expect(clearStart).toBeGreaterThanOrEqual(0)
-    expect(clearEnd).toBeGreaterThan(clearStart)
-    expect(terminalHtmlSource.slice(initStart, initReplay)).toContain(
-      'scope.statusDotPendingSelector = false'
-    )
-    expect(terminalHtmlSource.slice(clearStart, clearEnd)).toContain(
-      'scope.statusDotPendingSelector = false'
-    )
-  })
-
-  it('loads Unicode 11 before replaying mobile terminal bytes', () => {
-    expect(terminalHtmlDocumentShellSource).toContain('XTERM_ENGINE_JS')
-    expect(terminalHtmlSource).toContain('window.Unicode11Addon.Unicode11Addon')
-    const open = terminalHtmlSource.indexOf('scope.term.open(scope.surface!)')
-    const unicode = terminalHtmlSource.indexOf("scope.term.unicode.activeVersion = '11'")
-    const replay = terminalHtmlSource.indexOf("enqueueWrite(scope, ESC + '[0m' + replayData)")
-    expect(open).toBeGreaterThanOrEqual(0)
-    expect(unicode).toBeGreaterThan(open)
-    expect(replay).toBeGreaterThan(unicode)
-  })
-
   const IOS_IPHONE_NAVIGATOR = {
     userAgent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 19_0 like Mac OS X) AppleWebKit/605.1.15',
     platform: 'iPhone',
diff --git a/mobile/src/terminal/terminal-write-coalescer-boundaries.test.ts b/mobile/src/terminal/terminal-write-coalescer-boundaries.test.ts
index 22e76581a0e5..3dd290fa1ff0 100644
--- a/mobile/src/terminal/terminal-write-coalescer-boundaries.test.ts
+++ b/mobile/src/terminal/terminal-write-coalescer-boundaries.test.ts
@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { TerminalWebViewCommand } from './terminal-webview-messages'
 import { createTerminalWebViewPendingMessages } from './terminal-webview-pending-messages'
@@ -7,15 +6,6 @@ import {
   TERMINAL_WRITE_FLUSH_WINDOW_MS
 } from './terminal-write-coalescer'
 
-const webViewSource = readFileSync(new URL('./TerminalWebView.tsx', import.meta.url), 'utf8')
-// C7.5 moved everything that is not `react-native-webview` into the controller both components
-// share, so the coalescer's boundaries are read there; the component is still read for the two
-// WebView lifecycle events that reach it.
-const controllerSource = readFileSync(
-  new URL('./use-terminal-webview-controller.ts', import.meta.url),
-  'utf8'
-)
-
 // Simulates TerminalWebView's postMessage: ready → deliver, not ready → queue.
 // There is no React render harness in the node environment, so the boundary
 // invariants are gated here against the same pending-queue module the component uses.
@@ -50,12 +40,12 @@ describe('terminal write coalescer boundaries', () => {
     view.coalescer.write('stale-pre-snapshot')
     // init() boundary as wired in TerminalWebView: clear the coalescer, then post init.
     view.coalescer.clear()
-    view.postMessage({ type: 'init', cols: 80, rows: 24, initialData: 'snapshot' })
+    view.postMessage({ type: 'init', cols: 80, rows: 24, initialData: 'snapshot', frame: null })
     vi.runOnlyPendingTimers()
 
     expect(view.delivered).toEqual([
       { type: 'write', data: 'a' },
-      { type: 'init', cols: 80, rows: 24, initialData: 'snapshot' }
+      { type: 'init', cols: 80, rows: 24, initialData: 'snapshot', frame: null }
     ])
     const initIndex = view.delivered.findIndex((msg) => msg.type === 'init')
     expect(initIndex).toBeGreaterThanOrEqual(0)
@@ -75,7 +65,7 @@ describe('terminal write coalescer boundaries', () => {
     // Recovery re-init: coalescer.clear() cancels any pending timer synchronously,
     // so nothing can flush after this point; the queued init supersedes the flush.
     view.coalescer.clear()
-    view.postMessage({ type: 'init', cols: 80, rows: 24, initialData: 'snapshot' })
+    view.postMessage({ type: 'init', cols: 80, rows: 24, initialData: 'snapshot', frame: null })
 
     view.readiness.webReady = true
     view.pendingMessages.flush(view.send)
@@ -84,7 +74,7 @@ describe('terminal write coalescer boundaries', () => {
     expect(view.delivered).toEqual([
       { type: 'write', data: 'live' },
       { type: 'write', data: 'buffered-mid-recovery' },
-      { type: 'init', cols: 80, rows: 24, initialData: 'snapshot' }
+      { type: 'init', cols: 80, rows: 24, initialData: 'snapshot', frame: null }
     ])
     // Invariant: no write reaches the document after the recovery init.
     const initIndex = view.delivered.findIndex((msg) => msg.type === 'init')
@@ -110,69 +100,4 @@ describe('terminal write coalescer boundaries', () => {
       { type: 'write', data: 'still-current-document' }
     ])
   })
-
-  it('routes handle.write through the coalescer whose delivery posts the write command', () => {
-    expect(controllerSource).toContain(
-      "createTerminalWriteCoalescer((data) => postMessage({ type: 'write', data }))"
-    )
-    const writeStart = controllerSource.indexOf('write(data: string) {')
-    expect(writeStart).toBeGreaterThanOrEqual(0)
-    const writeBody = controllerSource.slice(writeStart, writeStart + 120)
-    expect(writeBody).toContain('writeCoalescer.write(data)')
-    expect(writeBody).not.toContain('postMessage')
-  })
-
-  it('clears the coalescer before posting init and clear (snapshot supersession)', () => {
-    // Anchor on the init() signature (unique) — 'init(' alone also matches comments.
-    const initStart = controllerSource.indexOf('initialData?: string,')
-    const initClear = controllerSource.indexOf('writeCoalescer.clear()', initStart)
-    const initPost = controllerSource.indexOf("type: 'init'", initStart)
-    expect(initStart).toBeGreaterThanOrEqual(0)
-    expect(initClear).toBeGreaterThan(initStart)
-    expect(initClear).toBeLessThan(initPost)
-
-    const clearStart = controllerSource.indexOf('clear() {', initPost)
-    const clearBody = controllerSource.slice(clearStart, clearStart + 160)
-    expect(clearStart).toBeGreaterThanOrEqual(0)
-    expect(clearBody.indexOf('writeCoalescer.clear()')).toBeGreaterThanOrEqual(0)
-    expect(clearBody.indexOf('writeCoalescer.clear()')).toBeLessThan(
-      clearBody.indexOf("postMessage({ type: 'clear' })")
-    )
-  })
-
-  it('flushes pending writes before resize and reflow so boundaries observe prior bytes', () => {
-    for (const method of ['resize', 'reflow'] as const) {
-      const start = controllerSource.indexOf(`${method}(cols: number, rows: number) {`)
-      expect(start).toBeGreaterThanOrEqual(0)
-      const body = controllerSource.slice(start, start + 300)
-      const flushIndex = body.indexOf('writeCoalescer.flushNow()')
-      const postIndex = body.indexOf(`postMessage({ type: '${method}'`)
-      expect(flushIndex).toBeGreaterThanOrEqual(0)
-      expect(postIndex).toBeGreaterThan(flushIndex)
-    }
-  })
-
-  it('clears the coalescer in both document-lifecycle hooks alongside pendingMessages', () => {
-    // Both hooks now reach one function, so the clearing is asserted once where it lives and the
-    // two WebView events are asserted to be the callers. Reading only the component would pass on
-    // a `resetReadiness` that had quietly stopped clearing either one.
-    const start = controllerSource.indexOf('const resetReadiness = useCallback')
-    expect(start).toBeGreaterThanOrEqual(0)
-    const body = controllerSource.slice(start, controllerSource.indexOf('}, [', start))
-    expect(body).toContain('pendingMessages.clear()')
-    expect(body).toContain('writeCoalescer.clear()')
-    expect(webViewSource).toContain('onLoadStart={resetReadiness}')
-    const terminated = webViewSource.indexOf('const handleContentProcessDidTerminate')
-    expect(terminated).toBeGreaterThanOrEqual(0)
-    expect(webViewSource.slice(terminated, webViewSource.indexOf('}, [', terminated))).toContain(
-      'resetReadiness()'
-    )
-  })
-
-  it('clears the coalescer on unmount so no timer leaks', () => {
-    const cleanupStart = controllerSource.indexOf('useEffect(() => {\n    return () => {')
-    expect(cleanupStart).toBeGreaterThanOrEqual(0)
-    const cleanupBody = controllerSource.slice(cleanupStart, cleanupStart + 160)
-    expect(cleanupBody).toContain('writeCoalescer.clear()')
-  })
 })
diff --git a/mobile/src/terminal/use-terminal-webview-controller.ts b/mobile/src/terminal/use-terminal-webview-controller.ts
index c2c0575f548d..8ca48f55a65a 100644
--- a/mobile/src/terminal/use-terminal-webview-controller.ts
+++ b/mobile/src/terminal/use-terminal-webview-controller.ts
@@ -1,9 +1,14 @@
 import { useCallback, useEffect, useMemo, useRef } from 'react'
-import type { TerminalOscLinkRange } from '../../../src/shared/terminal-osc-link-ranges'
-import type { TerminalWebViewHandle, TerminalWebViewProps } from './terminal-webview-contract'
+import { readTerminalCellBox, type TerminalCellBox } from './terminal-cell-box'
+import { fitDimensionsFromCell } from './terminal-grid-fit'
+import type {
+  TerminalInit,
+  TerminalWebViewHandle,
+  TerminalWebViewProps
+} from './terminal-webview-contract'
 import { useTerminalWebViewEngineErrorState } from './terminal-webview-engine-error-state'
 import { useTerminalWebReadyWatchdog } from './terminal-webview-ready-watchdog'
-import type { TerminalWebViewCommand } from './terminal-webview-messages'
+import type { TerminalFrame, TerminalWebViewCommand } from './terminal-webview-messages'
 import { createTerminalWebViewPendingMessages } from './terminal-webview-pending-messages'
 import { dispatchTerminalWebViewNotification } from './terminal-webview-notification-dispatch'
 import { routeTerminalQueryReply } from './terminal-webview-query-reply-routing'
@@ -15,7 +20,7 @@ import { createTerminalWriteCoalescer } from './terminal-write-coalescer'
  *
  * The document is the same program on both platforms — inside the WebView it is the generated
  * script, on the page it is the modules that script is generated from — so the readiness
- * handshake, the pending queue, the write coalescer, the ready and measure promises and the whole
+ * handshake, the pending queue, the write coalescer, the ready promise and the whole
  * imperative handle are the same too. What differs is only how a command reaches the document and
  * how a notify comes back: a `postMessage` across the WebView bridge, or a direct call.
  *
@@ -61,7 +66,8 @@ export function useTerminalWebViewController(
     onTerminalTap,
     onFileTap,
     onOpenUrl,
-    onTextScaleChange
+    onTextScaleChange,
+    onCellBoxChange
   } = props
   const { pingsOnForegroundRecovery, post } = transport
   const isWebReadyRef = useRef(false)
@@ -70,9 +76,11 @@ export function useTerminalWebViewController(
   const pendingPingIdRef = useRef<number | null>(null)
   const terminalThemeKey = useMemo(() => JSON.stringify(terminalTheme ?? null), [terminalTheme])
   // Why: each init() call posts 'init' to the document and arms a fresh ready promise. The
-  // document's init() rAF chain ends with a 'ready' notify that resolves it. measureFitDimensions
-  // awaits this so it doesn't race ahead of term.open() / renderService population.
+  // document's init() rAF chain ends with a 'ready' notify that resolves it. A fit awaits this so
+  // it reads the box the init reported.
   const promises = useTerminalWebViewReadyPromises()
+  // The box the current document last reported; its re-reports cover a text-size change.
+  const cellBoxRef = useRef<TerminalCellBox | null>(null)
   const { clearEngineError, engineError, reportEngineError, reportNativeEngineError } =
     useTerminalWebViewEngineErrorState(onEngineError)
   const { armWebReadyWatchdog, clearWebReadyWatchdog } = useTerminalWebReadyWatchdog(
@@ -148,6 +156,8 @@ export function useTerminalWebViewController(
       routeTerminalQueryReply(msg, onTerminalQueryReply)
 
       if (msg.type === 'web-ready') {
+        // Why: nothing subscribes before ready, so a ready's box only sizes the subscribe after it.
+        cellBoxRef.current = readTerminalCellBox(msg)
         confirmWebReady(true)
       } else if (
         msg.type === 'pong' &&
@@ -157,11 +167,14 @@ export function useTerminalWebViewController(
         confirmWebReady(false)
       } else if (msg.type === 'ready') {
         // Why: the document's init() rAF chain has run — term is open, renderService is
-        // populated, first paint has happened. Resolve any pending awaitReady() so a queued
-        // measure can now safely read cell dims.
+        // populated, first paint has happened, and its box was reported. Resolve any pending
+        // awaitReady() so a queued fit reads that box.
         promises.resolveReady()
-      } else if (msg.type === 'measure-result') {
-        promises.resolveMeasure(msg)
+      } else if (msg.type === 'cell-box') {
+        cellBoxRef.current = readTerminalCellBox(msg)
+        if (msg.refit === true) {
+          onCellBoxChange?.()
+        }
       } else {
         dispatchTerminalWebViewNotification(msg, {
           reportEngineError,
@@ -194,7 +207,8 @@ export function useTerminalWebViewController(
       onTerminalTap,
       onFileTap,
       onOpenUrl,
-      onTextScaleChange
+      onTextScaleChange,
+      onCellBoxChange
     ]
   )
 
@@ -209,6 +223,7 @@ export function useTerminalWebViewController(
     pendingPingIdRef.current = null
     pendingMessages.clear()
     writeCoalescer.clear()
+    cellBoxRef.current = null
     armWebReadyWatchdog()
   }, [armWebReadyWatchdog, pendingMessages, writeCoalescer])
 
@@ -222,6 +237,17 @@ export function useTerminalWebViewController(
     postMessage({ type: 'set-font-scale', fontScale: textScale })
   }, [postMessage, textScale])
 
+  const fitDimensions = useCallback(
+    (frame: TerminalFrame) => {
+      const cell = cellBoxRef.current
+      // Why: a box at another scale (a reload keeps the mount's) fits nothing; the route stays unmeasured.
+      return cell && cell.fontScale === textScale && frame.width > 0 && frame.height > 0
+        ? fitDimensionsFromCell(cell, frame.width, frame.height)
+        : null
+    },
+    [textScale]
+  )
+
   const handle = useMemo<TerminalWebViewHandle>(
     () => ({
       prepareForForegroundRecovery() {
@@ -237,13 +263,7 @@ export function useTerminalWebViewController(
       write(data: string) {
         writeCoalescer.write(data)
       },
-      init(
-        cols: number,
-        rows: number,
-        initialData?: string,
-        preserveScroll?: boolean,
-        oscLinks?: TerminalOscLinkRange[]
-      ) {
+      init({ cols, rows, initialData, preserveScroll, oscLinks, frame }: TerminalInit) {
         // Why: arm a fresh ready promise BEFORE posting init. The document resolves it via the
         // 'ready' notify at the end of its rAF chain.
         promises.armReady()
@@ -258,28 +278,24 @@ export function useTerminalWebViewController(
           oscLinks,
           terminalTheme,
           fontScale: textScale,
-          preserveScroll
+          preserveScroll,
+          frame
         })
       },
-      resize(cols: number, rows: number) {
+      resize(cols: number, rows: number, frame: TerminalFrame | null) {
         // Why: resize/reflow must observe all prior writes or bytes reorder.
         writeCoalescer.flushNow()
-        postMessage({ type: 'resize', cols, rows })
+        postMessage({ type: 'resize', cols, rows, frame })
       },
-      reflow(cols: number, rows: number) {
+      reflow(cols: number, rows: number, frame: TerminalFrame | null) {
         writeCoalescer.flushNow()
-        postMessage({ type: 'reflow', cols, rows })
+        postMessage({ type: 'reflow', cols, rows, frame })
       },
       clear() {
         writeCoalescer.clear()
         postMessage({ type: 'clear' })
       },
-      measureFitDimensions(containerHeight?: number) {
-        if (!isWebReadyRef.current) {
-          return Promise.resolve(null)
-        }
-        return promises.measure(sendToDocument, containerHeight)
-      },
+      fitDimensions,
       resetZoom() {
         postMessage({ type: 'reset-zoom' })
       },
@@ -295,6 +311,7 @@ export function useTerminalWebViewController(
     }),
     [
       armWebReadyWatchdog,
+      fitDimensions,
       pingsOnForegroundRecovery,
       postMessage,
       promises,
diff --git a/mobile/src/test-support/bridged-parity/c2-page-closure.test.ts b/mobile/src/test-support/bridged-parity/c2-page-closure.test.ts
deleted file mode 100644
index ca797265cfe3..000000000000
--- a/mobile/src/test-support/bridged-parity/c2-page-closure.test.ts
+++ /dev/null
@@ -1,235 +0,0 @@
-import { readdirSync } from 'node:fs'
-import { resolve } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import { C1_PAGE_CLOSURE } from './c1-page-closure'
-import { C2_PAGE_CLOSURE } from './c2-page-closure'
-import { C2_TASK_SOURCE_CLOSURE_FAMILIES } from './c2-task-source-closure-families'
-import { C2_WORK_ITEM_CLOSURE_FAMILIES } from './c2-work-item-closure-families'
-import { C5_PAGE_CLOSURE } from './c5-page-closure'
-import { pinsFromSource } from './page-closure-pin-source'
-import { BRIDGED_PARITY_EXCLUSIONS } from './divergence-classes'
-import {
-  pageClosureDrift,
-  pageClosureExclusions,
-  pageClosureRunTotals,
-  pageClosureTotals,
-  type PageClosureObservation
-} from './page-closure'
-import { readGolden } from '../rpc-recording/golden-recording'
-
-const GOLDENS = resolve(import.meta.dirname, '../../../rpc-foundation/goldens')
-const C1_SOURCE = resolve(import.meta.dirname, 'c1-page-closure.ts')
-
-/** The run a corpus that diverged exactly as the pin says would hand the rule. */
-function asPinned(): Map<string, PageClosureObservation> {
-  const run = new Map<string, PageClosureObservation>()
-  for (const [family, goldens] of Object.entries(C2_PAGE_CLOSURE)) {
-    for (const [id, verdict] of Object.entries(goldens)) {
-      run.set(id, { family, verdict })
-    }
-  }
-  return run
-}
-
-describe('the C2 page closure', () => {
-  /**
-   * The census reads the committed table, and does not re-derive the closure.
-   *
-   * Nothing here or in the gate runs esbuild or maps a scenario's `sites` back to the module graph,
-   * so this fixes how many families the table may hold, not which families belong in it. A golden
-   * arriving in a family already pinned is caught, by `pageClosureDrift` and by this count. A new
-   * *family* entering the closure — a scenario recorded at a site the route newly imports — is
-   * invisible until someone re-derives the closure by hand, as C1's and C5's pins are too.
-   */
-  it('is the census the design named: 68 families, 257 goldens', () => {
-    const goldens = Object.values(C2_PAGE_CLOSURE).flatMap((family) => Object.keys(family))
-    expect({ families: Object.keys(C2_PAGE_CLOSURE).length, goldens: goldens.length }).toEqual({
-      families: 68,
-      goldens: 257
-    })
-    expect(new Set(goldens).size).toBe(goldens.length)
-  })
-
-  /**
-   * The totals, asserted beside the per-id pins rather than instead of them.
-   *
-   * A walk that compares each id to its own verdict cannot see a table built wrong in a way that is
-   * self-consistent — C5 derived exactly that file once, with an empty mismatch list and three
-   * goldens in the wrong class. These counts are what showed it, and the gate re-asserts them
-   * against the run rather than against the table.
-   */
-  it('pins how many goldens land in each class, which a per-id walk cannot see move', () => {
-    expect(pageClosureTotals(C2_PAGE_CLOSURE)).toEqual({
-      identical: 108,
-      'result-absent-settlement': 115,
-      'params-undefined': 29,
-      'result-absent-stream-release': 3,
-      'write-ordinal': 2
-    })
-  })
-
-  it("inherits C1's families whole, with the verdicts C1's file commits", () => {
-    // Against the file's text rather than the imported object, because today the composition
-    // spreads that object and a comparison to it agrees with itself. This holds the shape of the
-    // inheritance: that C2's table carries C1's families at C1's verdicts and overrides none of
-    // them, and it keeps holding if the spread is ever replaced by inlined entries.
-    //
-    // What it cannot hold: a verdict changed inside `c1-page-closure.ts`. C2 inherits whatever C1
-    // commits, so both sides of this comparison move together. Measured, that edit is red in the
-    // bridged-parity gate, which compares the pin to a run rather than to a file, and here in the
-    // class totals and the exclusion count, which pin absolute numbers. It is green in
-    // `c1-page-closure.test.ts`, whose exclusion check is `toBeGreaterThan(0)` and which pins no
-    // class totals at all.
-    //
-    // C2's own rule does not reproduce these pins — measured, it disagrees on 13 of the 103, being
-    // `tasks.smart-source-search` 7, `host-worktree-refresh` 5 and `worktree-catalog-snapshot` 1 —
-    // so inheritance is the derivation rather than a re-derivation that looked close.
-    const committed = pinsFromSource(C1_SOURCE)
-    // The reader found a table rather than nothing, which every assertion below depends on.
-    expect({
-      families: Object.keys(committed).length,
-      pins: Object.values(committed).flatMap(Object.keys).length
-    }).toEqual({ families: 20, pins: 94 })
-    for (const [family, pinned] of Object.entries(committed)) {
-      expect(C2_PAGE_CLOSURE[family], family).toEqual(pinned)
-    }
-    expect(Object.keys(C1_PAGE_CLOSURE)).toEqual(Object.keys(committed))
-  })
-
-  it('agrees with C5 object for object on every family both domains pin', () => {
-    // Two page closures that share a family share the goldens in it. Were one to be re-derived and
-    // the other inherited, this is the assertion that would not hold.
-    const shared = Object.keys(C5_PAGE_CLOSURE).filter((family) => family in C2_PAGE_CLOSURE)
-    expect(shared.length).toBe(20)
-    for (const family of shared) {
-      expect(C2_PAGE_CLOSURE[family], family).toEqual(C5_PAGE_CLOSURE[family])
-    }
-  })
-
-  it('adds 48 families, split across the two halves without overlap', () => {
-    // The composed table is a spread, so a family named in both halves would be taken from the last
-    // one silently. Disjointness is what makes the two files data rather than a precedence rule.
-    const work = Object.keys(C2_WORK_ITEM_CLOSURE_FAMILIES)
-    const source = Object.keys(C2_TASK_SOURCE_CLOSURE_FAMILIES)
-    expect(work.filter((family) => source.includes(family))).toEqual([])
-    expect(work.filter((family) => family in C1_PAGE_CLOSURE)).toEqual([])
-    expect(source.filter((family) => family in C1_PAGE_CLOSURE)).toEqual([])
-    expect({ work: work.length, source: source.length }).toEqual({ work: 26, source: 22 })
-    const added = Object.keys(C2_PAGE_CLOSURE).filter((family) => !(family in C1_PAGE_CLOSURE))
-    expect(added.sort()).toEqual([...work, ...source].sort())
-  })
-
-  it('names the families where a pin proves only that the divergence kept its name', () => {
-    // "266 certified" would read as 266 proofs of byte-identity. Six families have no byte-identical
-    // golden at all, so their 27 say only that the class did not change, and the PR body says so.
-    const wholly = Object.entries(C2_PAGE_CLOSURE)
-      .filter(([, pins]) => !Object.values(pins).includes('identical'))
-      .map(([family, pins]) => [family, Object.keys(pins).length] as const)
-    expect(wholly).toEqual([
-      ['host-worktree-refresh', 5],
-      ['tasks.item-checks-files', 6],
-      ['tasks.item-metadata-gitlab-mr', 2],
-      ['tasks.project-row-files-merge', 6],
-      ['tasks.provider-load', 6],
-      ['tasks.task-list-gitlab-items', 2]
-    ])
-  })
-
-  it('pins goldens that exist, in the family the corpus records them under', () => {
-    for (const [family, goldens] of Object.entries(C2_PAGE_CLOSURE)) {
-      for (const id of Object.keys(goldens)) {
-        // Through the corpus's own reader, which checks the format version and the value pool and
-        // throws a named diagnostic otherwise.
-        const recorded = readGolden(GOLDENS, id)
-        expect({ id, family: recorded.family }).toEqual({ id, family })
-      }
-    }
-  })
-
-  it('claims no golden the corpus does not have', () => {
-    const corpus = new Set(
-      readdirSync(GOLDENS)
-        .filter((name) => name.endsWith('.json'))
-        .map((name) => name.replace(/\.json$/, ''))
-    )
-    const missing = Object.values(C2_PAGE_CLOSURE)
-      .flatMap((family) => Object.keys(family))
-      .filter((id) => !corpus.has(id))
-    expect(missing).toEqual([])
-  })
-
-  it('excludes a closure golden only into a class that has a reason', () => {
-    const exclusions = pageClosureExclusions(C2_PAGE_CLOSURE)
-    expect(exclusions.length).toBe(149)
-    expect(exclusions.filter(([, name]) => BRIDGED_PARITY_EXCLUSIONS[name] === undefined)).toEqual(
-      []
-    )
-  })
-})
-
-describe('reading a run against the C2 pin', () => {
-  it('says nothing when the run is the pin', () => {
-    expect(pageClosureDrift(C2_PAGE_CLOSURE, asPinned())).toEqual([])
-    expect(pageClosureRunTotals(C2_PAGE_CLOSURE, asPinned())).toEqual(
-      pageClosureTotals(C2_PAGE_CLOSURE)
-    )
-  })
-
-  it('names a closure golden that changed verdict', () => {
-    const run = asPinned()
-    const found = [...run].find(([, seen]) => seen.verdict !== 'params-undefined')
-    if (found === undefined) {
-      throw new Error('the pin is empty')
-    }
-    const [id, observation] = found
-    run.set(id, { ...observation, verdict: 'params-undefined' })
-    const drift = pageClosureDrift(C2_PAGE_CLOSURE, run)
-    expect(drift.length).toBe(1)
-    expect(drift[0]).toContain(id)
-    expect(drift[0]).toContain(`pinned ${observation.verdict}, ran params-undefined`)
-    // And in the counts, which is the check that holds when a second golden moves the other way.
-    expect(pageClosureRunTotals(C2_PAGE_CLOSURE, run)).not.toEqual(
-      pageClosureTotals(C2_PAGE_CLOSURE)
-    )
-  })
-
-  it('names a golden newly derived into a closure family, which no id list would', () => {
-    const run = asPinned()
-    const [family] = Object.keys(C2_PAGE_CLOSURE)
-    if (family === undefined) {
-      throw new Error('the pin is empty')
-    }
-    run.set('matrix-arrived-1', { family, verdict: 'identical' })
-    expect(pageClosureDrift(C2_PAGE_CLOSURE, run)).toEqual([
-      `${family}: arrived matrix-arrived-1; left (none)`
-    ])
-  })
-
-  it('names a closure golden the run stopped producing, three ways', () => {
-    const run = asPinned()
-    const [family, goldens] = Object.entries(C2_PAGE_CLOSURE)[0] ?? []
-    const [id] = Object.keys(goldens ?? {})
-    if (family === undefined || id === undefined) {
-      throw new Error('the pin is empty')
-    }
-    run.delete(id)
-    expect(pageClosureDrift(C2_PAGE_CLOSURE, run)).toEqual([
-      `${family}: arrived (none); left ${id}`
-    ])
-    // Drift is one of three. The run's totals fall short of the pin's, and the census above fixes
-    // the number of goldens the table may hold, so a drop cannot be absorbed by deleting the pin.
-    expect(pageClosureRunTotals(C2_PAGE_CLOSURE, run)).not.toEqual(
-      pageClosureTotals(C2_PAGE_CLOSURE)
-    )
-    expect([...run].filter(([, seen]) => seen.family in C2_PAGE_CLOSURE).length).toBe(256)
-  })
-
-  it('ignores every golden outside the closure, which is most of the corpus', () => {
-    const run = asPinned()
-    run.set('session-diff-review-elsewhere', {
-      family: 'session.diff-review',
-      verdict: 'result-absent-settlement'
-    })
-    expect(pageClosureDrift(C2_PAGE_CLOSURE, run)).toEqual([])
-  })
-})
diff --git a/mobile/src/test-support/bridged-parity/c3-page-closure.test.ts b/mobile/src/test-support/bridged-parity/c3-page-closure.test.ts
deleted file mode 100644
index afc1c8975640..000000000000
--- a/mobile/src/test-support/bridged-parity/c3-page-closure.test.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-import { readdirSync } from 'node:fs'
-import { resolve } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import { C1_PAGE_CLOSURE } from './c1-page-closure'
-import { C2_PAGE_CLOSURE } from './c2-page-closure'
-import { C3_PAGE_CLOSURE } from './c3-page-closure'
-import { C3_EXPLORER_CLOSURE_FAMILIES } from './c3-explorer-closure-families'
-import { C3_PREVIEW_CLOSURE_FAMILIES } from './c3-preview-closure-families'
-import { C5_PAGE_CLOSURE } from './c5-page-closure'
-import { pinsFromSource } from './page-closure-pin-source'
-import { BRIDGED_PARITY_EXCLUSIONS } from './divergence-classes'
-import {
-  pageClosureDrift,
-  pageClosureExclusions,
-  pageClosureRunTotals,
-  pageClosureTotals,
-  type PageClosureObservation
-} from './page-closure'
-import { readGolden } from '../rpc-recording/golden-recording'
-
-const GOLDENS = resolve(import.meta.dirname, '../../../rpc-foundation/goldens')
-const C1_SOURCE = resolve(import.meta.dirname, 'c1-page-closure.ts')
-
-/** The run a corpus that diverged exactly as the pin says would hand the rule. */
-function asPinned(): Map<string, PageClosureObservation> {
-  const run = new Map<string, PageClosureObservation>()
-  for (const [family, goldens] of Object.entries(C3_PAGE_CLOSURE)) {
-    for (const [id, verdict] of Object.entries(goldens)) {
-      run.set(id, { family, verdict })
-    }
-  }
-  return run
-}
-
-describe('the C3 page closure', () => {
-  /**
-   * The census reads the committed table, and does not re-derive the closure.
-   *
-   * Nothing here or in the gate runs esbuild or maps a scenario's `sites` back to the module graph,
-   * so this fixes how many families the table may hold, not which families belong in it. A golden
-   * arriving in a family already pinned is caught, by `pageClosureDrift` and by this count. A new
-   * *family* entering the closure is invisible until someone re-derives it by hand — which
-   * `config/scripts/mobile-web-app-page-closure-families.test.mjs` now does for both files routes.
-   */
-  it('is the census the design named: 26 families, 116 goldens', () => {
-    const goldens = Object.values(C3_PAGE_CLOSURE).flatMap((family) => Object.keys(family))
-    expect({ families: Object.keys(C3_PAGE_CLOSURE).length, goldens: goldens.length }).toEqual({
-      families: 26,
-      goldens: 116
-    })
-    expect(new Set(goldens).size).toBe(goldens.length)
-  })
-
-  /**
-   * The totals, asserted beside the per-id pins rather than instead of them.
-   *
-   * A walk that compares each id to its own verdict cannot see a table built wrong in a way that is
-   * self-consistent — C5 derived exactly that file once, with an empty mismatch list and three
-   * goldens in the wrong class. These counts are what showed it, and the gate re-asserts them
-   * against the run rather than against the table.
-   */
-  it('pins how many goldens land in each class, which a per-id walk cannot see move', () => {
-    expect(pageClosureTotals(C3_PAGE_CLOSURE)).toEqual({
-      identical: 60,
-      'result-absent-settlement': 44,
-      'params-undefined': 7,
-      'result-absent-stream-release': 3,
-      'write-ordinal': 2
-    })
-  })
-
-  it("inherits C1's families whole, with the verdicts C1's file commits", () => {
-    // Against the file's text rather than the imported object: the composition spreads that object,
-    // so a hand-edited inherited entry would be read back as C1's and agree with itself.
-    //
-    // What this cannot see is an edit to `c1-page-closure.ts` itself, because both sides of the
-    // comparison then move together. What it does see is a C3 half redeclaring an inherited family,
-    // which the spread would otherwise take silently from the last table. Both measured: flipping
-    // `settings-repo-metadata-icons` in C1's file leaves this case green and reds seven others —
-    // the class totals and the exclusion counts in C2's suite and this one, both cross-series
-    // agreements, and C5's own inheritance case, which compares against an independent literal
-    // rather than a spread.
-    //
-    // Redeclaring `settings.repo-metadata` in the preview half always reds this case; how many
-    // others go with it depends on the shape of the redeclaration, so the number is not the claim.
-    // Measured: one golden under the family's name reds seven, because it also shrinks the census
-    // and leaves that family with no byte-identical golden. The family copied verbatim with a
-    // single verdict flipped reds five, the census unmoved. Both keep the load-bearing half — the
-    // spread takes the last table's entry, and this case is what sees it.
-    //
-    // C2's rule does not reproduce these pins — measured here, it disagrees on 13 of the 94,
-    // being `tasks.smart-source-search` 7, `host-worktree-refresh` 5 and
-    // `worktree-catalog-snapshot` 1 — so inheritance is the derivation rather than a
-    // re-derivation that looked close.
-    const committed = pinsFromSource(C1_SOURCE)
-    expect({
-      families: Object.keys(committed).length,
-      pins: Object.values(committed).flatMap(Object.keys).length
-    }).toEqual({ families: 20, pins: 94 })
-    for (const [family, pinned] of Object.entries(committed)) {
-      expect(C3_PAGE_CLOSURE[family], family).toEqual(pinned)
-    }
-  })
-
-  it('agrees with C2 and C5 object for object on every family they share', () => {
-    // Three page closures that share a family share the goldens in it. Were one re-derived and the
-    // others inherited, this is the assertion that would not hold.
-    for (const [name, other] of [
-      ['C2', C2_PAGE_CLOSURE],
-      ['C5', C5_PAGE_CLOSURE]
-    ] as const) {
-      const shared = Object.keys(other).filter((family) => family in C3_PAGE_CLOSURE)
-      expect(shared.length, name).toBe(20)
-      for (const family of shared) {
-        expect(C3_PAGE_CLOSURE[family], `${name}/${family}`).toEqual(other[family])
-      }
-    }
-  })
-
-  it('adds 6 families, split across the two routes without overlap', () => {
-    // The composed table is a spread, so a family named in both halves would be taken from the last
-    // one silently. Disjointness is what makes the two files data rather than a precedence rule.
-    const explorer = Object.keys(C3_EXPLORER_CLOSURE_FAMILIES)
-    const preview = Object.keys(C3_PREVIEW_CLOSURE_FAMILIES)
-    expect(explorer.filter((family) => preview.includes(family))).toEqual([])
-    expect(explorer.filter((family) => family in C1_PAGE_CLOSURE)).toEqual([])
-    expect(preview.filter((family) => family in C1_PAGE_CLOSURE)).toEqual([])
-    expect({ explorer: explorer.length, preview: preview.length }).toEqual({
-      explorer: 1,
-      preview: 5
-    })
-    const added = Object.keys(C3_PAGE_CLOSURE).filter((family) => !(family in C1_PAGE_CLOSURE))
-    expect(added.sort()).toEqual([...explorer, ...preview].sort())
-  })
-
-  it('names the families where a pin proves only that the divergence kept its name', () => {
-    // "125 certified" would read as 125 proofs of byte-identity. One family has no byte-identical
-    // golden at all, so its 5 say only that the class did not change, and the PR body says so.
-    const wholly = Object.entries(C3_PAGE_CLOSURE)
-      .filter(([, pins]) => !Object.values(pins).includes('identical'))
-      .map(([family, pins]) => [family, Object.keys(pins).length] as const)
-    expect(wholly).toEqual([['host-worktree-refresh', 5]])
-  })
-
-  it('pins goldens that exist, in the family the corpus records them under', () => {
-    for (const [family, goldens] of Object.entries(C3_PAGE_CLOSURE)) {
-      for (const id of Object.keys(goldens)) {
-        const recorded = readGolden(GOLDENS, id)
-        expect({ id, family: recorded.family }).toEqual({ id, family })
-      }
-    }
-  })
-
-  it('claims no golden the corpus does not have', () => {
-    const corpus = new Set(
-      readdirSync(GOLDENS)
-        .filter((name) => name.endsWith('.json'))
-        .map((name) => name.replace(/\.json$/, ''))
-    )
-    const missing = Object.values(C3_PAGE_CLOSURE)
-      .flatMap((family) => Object.keys(family))
-      .filter((id) => !corpus.has(id))
-    expect(missing).toEqual([])
-  })
-
-  it('excludes a closure golden only into a class that has a reason', () => {
-    const exclusions = pageClosureExclusions(C3_PAGE_CLOSURE)
-    expect(exclusions.length).toBe(56)
-    expect(exclusions.filter(([, name]) => BRIDGED_PARITY_EXCLUSIONS[name] === undefined)).toEqual(
-      []
-    )
-  })
-})
-
-describe('reading a run against the C3 pin', () => {
-  it('says nothing when the run is the pin', () => {
-    expect(pageClosureDrift(C3_PAGE_CLOSURE, asPinned())).toEqual([])
-    expect(pageClosureRunTotals(C3_PAGE_CLOSURE, asPinned())).toEqual(
-      pageClosureTotals(C3_PAGE_CLOSURE)
-    )
-  })
-
-  it('names a closure golden that changed verdict', () => {
-    const run = asPinned()
-    const found = [...run].find(([, seen]) => seen.verdict !== 'params-undefined')
-    if (found === undefined) {
-      throw new Error('the pin is empty')
-    }
-    const [id, observation] = found
-    run.set(id, { ...observation, verdict: 'params-undefined' })
-    const drift = pageClosureDrift(C3_PAGE_CLOSURE, run)
-    expect(drift.length).toBe(1)
-    expect(drift[0]).toContain(id)
-    expect(drift[0]).toContain(`pinned ${observation.verdict}, ran params-undefined`)
-  })
-
-  it('names a golden the run stopped producing, and moves the totals with it', () => {
-    const run = asPinned()
-    const [family, goldens] = Object.entries(C3_PAGE_CLOSURE)[0] ?? []
-    const [id] = Object.keys(goldens ?? {})
-    if (family === undefined || id === undefined) {
-      throw new Error('the pin is empty')
-    }
-    run.delete(id)
-    expect(pageClosureDrift(C3_PAGE_CLOSURE, run)).toEqual([
-      `${family}: arrived (none); left ${id}`
-    ])
-    // The totals move too, which is the half a per-id walk over what remains cannot see.
-    expect(pageClosureRunTotals(C3_PAGE_CLOSURE, run)).not.toEqual(
-      pageClosureTotals(C3_PAGE_CLOSURE)
-    )
-  })
-
-  it('ignores every golden outside the closure, which is most of the corpus', () => {
-    const run = asPinned()
-    run.set('a-golden-from-another-domain', {
-      family: 'session.diff-review',
-      verdict: 'result-absent-settlement'
-    })
-    expect(pageClosureDrift(C3_PAGE_CLOSURE, run)).toEqual([])
-  })
-})
diff --git a/mobile/src/test-support/bridged-parity/divergence-classes.test.ts b/mobile/src/test-support/bridged-parity/divergence-classes.test.ts
index 58d3e12efc58..ac5fd17cb707 100644
--- a/mobile/src/test-support/bridged-parity/divergence-classes.test.ts
+++ b/mobile/src/test-support/bridged-parity/divergence-classes.test.ts
@@ -236,7 +236,7 @@ describe('what the pin still admits', () => {
   it('goes red on a golden that stopped diverging, which every other check lets through', () => {
     // The direction the rest of the suite cannot see. One `result-absent-settlement` golden
     // reported `identical` instead: nothing is unclassified, every diverging golden is still in an
-    // excluded class, and the corpus is still 787. Only these two numbers moved.
+    // excluded class, and the corpus is still 790. Only these two numbers moved.
     const tally = asCounted()
     const moved: BridgedParityTally = {
       identical: tally.identical + 1,
@@ -250,7 +250,7 @@ describe('what the pin still admits', () => {
     expect(drift.join('\n')).toContain(
       `identical: pinned ${tally.identical}, ran ${moved.identical}`
     )
-    expect(drift.join('\n')).toContain('result-absent-settlement: pinned 341, ran 340')
+    expect(drift.join('\n')).toContain('result-absent-settlement: pinned 343, ran 342')
   })
 
   it('goes red on a class that grew and on the corpus losing a golden', () => {
diff --git a/mobile/src/test-support/bridged-parity/divergence-classes.ts b/mobile/src/test-support/bridged-parity/divergence-classes.ts
index 5d16e7a09e93..bd450d52b163 100644
--- a/mobile/src/test-support/bridged-parity/divergence-classes.ts
+++ b/mobile/src/test-support/bridged-parity/divergence-classes.ts
@@ -165,7 +165,7 @@ export const BRIDGED_PARITY_EXCLUSIONS: Readonly<Partial<Record<BridgedParityCla
 }
 
 /**
- * What this tree measures, per class, over all 787 goldens.
+ * What this tree measures, per class, over all 790 goldens.
  *
  * A pin, not a description: `bridgedParityTallyDrift` holds every number below to itself exactly,
  * in both directions, and this module's test pins their sum to the size of the corpus. A class that
@@ -179,14 +179,14 @@ export const BRIDGED_PARITY_EXCLUSIONS: Readonly<Partial<Record<BridgedParityCla
  * same story — both numbers move, and both moves are edits here rather than a quiet pass.
  */
 export const BRIDGED_PARITY_BASELINE: Readonly<Record<BridgedParityClass | 'identical', number>> = {
-  identical: 396,
+  identical: 397,
   // Closed by the `_meta` widening: the page's reader is `isRpcResponse` itself.
   'reply-meta-required': 0,
   // Settling a refused reply moved three goldens here out of `write-ordinal`: a rejection that
   // now arrives differs before the ordinal that also moved does. Nothing stopped replaying
   // identically, and the corpus is a fixed size, so a shuffle between two excluded classes cannot
   // hide one.
-  'result-absent-settlement': 341,
+  'result-absent-settlement': 343,
   // Four left here and two left `write-ordinal` for the class below, which is the `cancel` a
   // refused stream frame now posts: the run stops at a renamed occurrence before it reaches the
   // checkpoint or the ordinal that used to be what differed first.
diff --git a/mobile/src/test-support/census-source-files.test.ts b/mobile/src/test-support/census-source-files.test.ts
index 446a4097f66d..c5639bfdf1cd 100644
--- a/mobile/src/test-support/census-source-files.test.ts
+++ b/mobile/src/test-support/census-source-files.test.ts
@@ -1,4 +1,4 @@
-import { mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs'
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join, relative } from 'node:path'
 import { fileURLToPath } from 'node:url'
@@ -74,36 +74,4 @@ describe('the source files a census reads', () => {
       expect(isGeneratedSource(entry), entry).toBe(true)
     }
   })
-
-  it('is the only walk of its kind left in the tree', () => {
-    // The line every census used to hold a copy of. One spelling, so a tenth census cannot quietly
-    // reintroduce the cost by pasting the walk rather than importing it.
-    const copies: string[] = []
-    const walk = (directory: string): void => {
-      for (const entry of readdirSync(directory, { withFileTypes: true })) {
-        const path = join(directory, entry.name)
-        if (entry.isDirectory()) {
-          if (entry.name !== 'node_modules') {
-            walk(path)
-          }
-          continue
-        }
-        if (!/\.tsx?$/.test(entry.name) || isGeneratedSource(entry.name)) {
-          continue
-        }
-        if (readFileSync(path, 'utf8').includes("entry.name === 'node_modules' ? []")) {
-          copies.push(relative(mobileRoot, path))
-        }
-      }
-    }
-    walk(join(mobileRoot, 'src'))
-    walk(join(mobileRoot, 'app'))
-    // This file is in the list because it carries the line as the text it greps for; the module
-    // beside it is the walk itself. Named rather than filtered out, so a third entry is a failure
-    // that reads as one.
-    expect(copies.sort()).toEqual([
-      'src/test-support/census-source-files.test.ts',
-      'src/test-support/census-source-files.ts'
-    ])
-  })
 })
diff --git a/mobile/src/test-support/rpc-recording/README.md b/mobile/src/test-support/rpc-recording/README.md
index 8f8bbc89fc6c..cabe1cbe3735 100644
--- a/mobile/src/test-support/rpc-recording/README.md
+++ b/mobile/src/test-support/rpc-recording/README.md
@@ -185,15 +185,13 @@ five spellings were five independent ways to reach a `ReferenceError` seconds in
 `hostClientContextExposure` is the one copy; the trade is that it sits inside `recorderSha256`, so
 editing it re-records all 787 goldens rather than the five families. A rename of the local is still
 invisible to `tsc` — nothing short of editing the product module makes a private local checkable —
-so `adapter-seam.test.ts` asserts the declaration it names exists exactly once, and refuses a sixth
-inline copy.
+so a rename lands as a `ReferenceError` in every recording that mounts through it.
 
-The adapter seam is the directory, not a filename convention, because a convention is a rule nobody
-enforces. `adapter-seam.test.ts` enforces this one: every file under `adapters/` is a registered
-module, every registered module is declared in the file it is registered under, no adapter module
-imports a sibling (which would leave a golden pinned to one module and driven by two), and
-`pilotMountAdapters` mounts nothing of its own — an adapter defined in an engine file would be
-pinned by `recorderSha256` on all 153 goldens instead of by `adapterSha256` on its own.
+The adapter seam is the directory, not a filename convention: every file under `adapters/` is a
+registered module, every registered module is declared in the file it is registered under, no
+adapter module imports a sibling (which would leave a golden pinned to one module and driven by
+two), and `pilotMountAdapters` mounts nothing of its own — an adapter defined in an engine file
+would be pinned by `recorderSha256` on all 153 goldens instead of by `adapterSha256` on its own.
 
 `scenarioSha256` covers the scenario input _that golden_ was recorded from — one manifest scenario
 for a pilot golden, the generated variants and any hoisted prelude for a matrix or schedule golden,
@@ -529,9 +527,15 @@ a tree that does not produce them, which is the one claim this header exists to
    derived scenarios rather than the manifest, so a repin alone never moves it.
 5. Commit the repin and the refresh together, and state the cause.
 
-After a squash-merge the pinned sha is unreachable from main, so the next recording on main repins
-to main's tip in a follow-up — the same two-step #20563 and #20895 used. A reviewer checking an
-in-flight branch resolves the pin against the branch, where it is a real commit.
+A squash-merge leaves the pinned sha out of main's history, and no follow-up repin is needed: the
+pin guard asks GitHub which pull requests contain the pinned commit
+(`GET /repos/{owner}/{repo}/commits/{sha}/pulls`), fetches each one's `refs/pull/<n>/head`, which
+GitHub keeps after the branch is deleted, and passes only when git finds the pin in one of those
+heads. The squash title plays no part, so editing it at merge time is safe. Run `pnpm --dir mobile
+exec tsx scripts/rpc-recording-pin-guard.mts reachable` to fetch a pin your clone does not have
+before checking it out. It works without a token, and sends `GITHUB_TOKEN` or `GH_TOKEN` when one
+is set, which lifts GitHub's unauthenticated rate limit. A reviewer checking an in-flight branch
+resolves the pin against the branch, where it is a real commit.
 
 Editing the recorder engine on a migration branch is the awkward case: `recorderSha256` moves, so
 every golden needs rewriting, but the product tree no longer matches `baseline`, and bumping
diff --git a/mobile/src/test-support/rpc-recording/adapters/diff-review-action-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/diff-review-action-mount-adapters.ts
index cc8c69061d2f..681caa946f91 100644
--- a/mobile/src/test-support/rpc-recording/adapters/diff-review-action-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/diff-review-action-mount-adapters.ts
@@ -31,6 +31,9 @@ export function diffReviewActionMountAdapters(
       const useInteractions = modules.load<
         typeof import('../../../session/use-mobile-diff-review-interactions')
       >('mobile/src/session/use-mobile-diff-review-interactions.ts').useMobileDiffReviewInteractions
+      const reviewSheets = modules.load<
+        typeof import('../../../session/mobile-diff-review-sheets')
+      >('mobile/src/session/mobile-diff-review-sheets.ts')
       const staleInput = modules.load<
         typeof import('../../../session/mobile-native-chat-stale-input')
       >('mobile/src/session/mobile-native-chat-stale-input.ts')
@@ -75,13 +78,23 @@ export function diffReviewActionMountAdapters(
       }
       let actionError: string | null = null
       let busyAction: string | null = null
-      let sendSheet: SendSheetState | null = null
+      let sheets = reviewSheets.NO_REVIEW_SHEETS
+      const sheetIntents = reviewSheets.reviewSheetIntents((action) => {
+        sheets = reviewSheets.reduceReviewSheets(sheets, action)
+      })
+      const sendSheet = (): SendSheetState | null =>
+        sheets.requested?.kind === 'send' ? sheets.requested.load : null
       let interactions: ReturnType<typeof useInteractions>
       const hook = hookMount(() => {
         interactions = useInteractions(
           mountFixture<Parameters<typeof useInteractions>[0]>({
             client,
             connState: 'connected',
+            hostCapabilities: [
+              'agent.launch.v2',
+              'agent.launch.replay.v1',
+              'agent.launch.replay-required.v1'
+            ],
             hostId: HOST,
             worktreeId: WORKSPACE,
             screenState,
@@ -101,7 +114,6 @@ export function diffReviewActionMountAdapters(
             setFilter: () => {},
             setCurrentIndex: () => {},
             setActiveHunkIndex: () => {},
-            setComposer: () => {},
             setComposerBody: () => {},
             setActionError: (update) => {
               actionError = typeof update === 'function' ? update(actionError) : update
@@ -109,10 +121,7 @@ export function diffReviewActionMountAdapters(
             setBusyAction: (update) => {
               busyAction = typeof update === 'function' ? update(busyAction) : update
             },
-            setSendSheet: (update) => {
-              sendSheet = typeof update === 'function' ? update(sendSheet) : update
-            },
-            setShowCompletion: () => {},
+            sheets: sheetIntents,
             loadReviewData: () => {
               effect('load-review-data', {})
               return Promise.resolve()
@@ -163,7 +172,7 @@ export function diffReviewActionMountAdapters(
             throw new Error(`Unknown review action: ${name}${String(args.unused ?? '')}`)
           })
         },
-        state: () => ({ screenState, actionError, busyAction, sendSheet }),
+        state: () => ({ screenState, actionError, busyAction, sendSheet: sendSheet() }),
         dispose: () => {
           staleInput.resetMobileNativeChatStaleInputForTests()
           hook.unmount()
diff --git a/mobile/src/test-support/rpc-recording/adapters/github-pr-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/github-pr-mount-adapters.ts
index f61d9b6eb6c4..94e604d90e1a 100644
--- a/mobile/src/test-support/rpc-recording/adapters/github-pr-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/github-pr-mount-adapters.ts
@@ -171,12 +171,23 @@ export function githubPrMountAdapters(
     'session.pr-triage-launch': ({ client }) => {
       const launch = modules.load<typeof import('../../../session/pr-ai-triage-launch')>(
         'mobile/src/session/pr-ai-triage-launch.ts'
-      ).createTerminalAndSendPrompt
+      ).launchAgentWithPrompt
       let launched: unknown = 'unlaunched'
       return {
         action: (_name, args) =>
-          launch(client, WORKTREE, String(args.prompt ?? 'Fix the failing checks')).then(() => {
-            launched = 'sent'
+          launch({
+            client,
+            // A host older than the launch capabilities advertises neither.
+            hostCapabilities:
+              args.legacyHost === true
+                ? []
+                : ['agent.launch.v2', 'agent.launch.replay.v1', 'agent.launch.replay-required.v1'],
+            worktreeId: WORKTREE,
+            actionId: 'fixChecks',
+            prompt: String(args.prompt ?? 'Fix the failing checks'),
+            launchSource: 'task_page'
+          }).then((result) => {
+            launched = result
           }),
         state: () => ({ launched }),
         dispose: () => {}
diff --git a/mobile/src/test-support/rpc-recording/adapters/terminal-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/terminal-mount-adapters.ts
index 0cb0d559cbcb..8af181a469b0 100644
--- a/mobile/src/test-support/rpc-recording/adapters/terminal-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/terminal-mount-adapters.ts
@@ -12,9 +12,10 @@ function terminalWebViewHandle(
   dims: { cols: number; rows: number }
 ) {
   return {
-    measureFitDimensions: (frameHeight?: number) => {
-      effect('measure-fit', { frameHeight: frameHeight ?? null })
-      return Promise.resolve(dims)
+    awaitReady: () => Promise.resolve(),
+    fitDimensions: (frame: { height: number }) => {
+      effect('measure-fit', { frameHeight: frame.height })
+      return dims
     },
     reflow: (cols: number, rows: number) => effect('reflow', { cols, rows })
   }
@@ -106,7 +107,7 @@ export function terminalMountAdapters(
         notifications = useRefit({
           activeHandleRef: { current: HANDLE },
           terminalRefs,
-          terminalFrameHeightRef: { current: 600 },
+          terminalFrameRef: { current: { width: 390, height: 600 } },
           viewportRef,
           viewportMeasuredRef,
           nativeChatCoveredRef: { current: false },
@@ -116,7 +117,6 @@ export function terminalMountAdapters(
           connState,
           tabStripVisible: true,
           textScale: 1,
-          terminalFrameWidth: 390,
           unsubscribeTerminal: (handle: string) => effect('unsubscribe-terminal', { handle }),
           subscribeToTerminal: (handle: string) => effect('subscribe-terminal', { handle })
         } as unknown as Parameters<typeof useRefit>[0])
diff --git a/mobile/src/test-support/rpc-recording/compiled-operation-module.test.ts b/mobile/src/test-support/rpc-recording/compiled-operation-module.test.ts
new file mode 100644
index 000000000000..c79a7141d5c5
--- /dev/null
+++ b/mobile/src/test-support/rpc-recording/compiled-operation-module.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest'
+import { compiledOperationModule } from './compiled-operation-module'
+
+describe('compiled operation code', () => {
+  it('reuses identical code but separates source, exposure and diagnostic filename', () => {
+    const source = 'const value: number = 1; export const read = () => value'
+    const original = compiledOperationModule('original.ts', source, '')
+    expect(compiledOperationModule('original.ts', source, '')).toBe(original)
+    expect(compiledOperationModule('original.ts', source.replace('= 1', '= 2'), '')).not.toBe(
+      original
+    )
+    expect(compiledOperationModule('original.ts', source, '\nexports.extra = value')).not.toBe(
+      original
+    )
+    expect(compiledOperationModule('different.ts', source, '')).not.toBe(original)
+  })
+
+  it('bounds retained code and still evaluates an evicted module correctly', () => {
+    const source = 'export const value = 42'
+    const original = compiledOperationModule('evicted.ts', source, '')
+    for (let index = 0; index < 512; index++) {
+      compiledOperationModule(`bounded-${index}.ts`, 'export {}', '')
+    }
+    const recompiled = compiledOperationModule('evicted.ts', source, '')
+    expect(recompiled).not.toBe(original)
+    const exports = {}
+    recompiled(() => undefined, exports)
+    expect(exports).toEqual({ value: 42 })
+  })
+})
diff --git a/mobile/src/test-support/rpc-recording/compiled-operation-module.ts b/mobile/src/test-support/rpc-recording/compiled-operation-module.ts
new file mode 100644
index 000000000000..ca9f14a6ed97
--- /dev/null
+++ b/mobile/src/test-support/rpc-recording/compiled-operation-module.ts
@@ -0,0 +1,31 @@
+import { compileFunction } from 'node:vm'
+import ts from 'typescript'
+
+const compiled = new Map<string, ReturnType<typeof compileFunction>>()
+const MAX_COMPILED_MODULES = 512
+
+/** Only code is shared: each invocation receives a fresh require closure and exports object. */
+export function compiledOperationModule(file: string, source: string, exposure: string) {
+  const key = JSON.stringify([file, source, exposure])
+  const cached = compiled.get(key)
+  if (cached) {
+    return cached
+  }
+  const output = ts.transpileModule(source, {
+    compilerOptions: {
+      module: ts.ModuleKind.CommonJS,
+      target: ts.ScriptTarget.ES2022,
+      // Product JSX uses the automatic runtime without importing React.
+      jsx: ts.JsxEmit.ReactJSX
+    }
+  }).outputText
+  const evaluate = compileFunction(output + exposure, ['require', 'exports'], { filename: file })
+  if (compiled.size >= MAX_COMPILED_MODULES) {
+    const oldest = compiled.keys().next().value
+    if (oldest !== undefined) {
+      compiled.delete(oldest)
+    }
+  }
+  compiled.set(key, evaluate)
+  return evaluate
+}
diff --git a/mobile/src/test-support/rpc-recording/native-mounting-substitutes.test.ts b/mobile/src/test-support/rpc-recording/native-mounting-substitutes.test.ts
index 01422c4dda4f..4cc4afbb4682 100644
--- a/mobile/src/test-support/rpc-recording/native-mounting-substitutes.test.ts
+++ b/mobile/src/test-support/rpc-recording/native-mounting-substitutes.test.ts
@@ -21,7 +21,6 @@ describe('nativeMountingSubstitutes', () => {
     const store = importDefault(substitute('@react-native-async-storage/async-storage')).default
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the member is a function by construction; the test asserts what calling it throws.
     const getItem = (store as { getItem: () => unknown }).getItem
-    expect(typeof getItem).toBe('function')
     expect(() => getItem()).toThrow(
       'Native store reached during recording: @react-native-async-storage/async-storage.getItem'
     )
diff --git a/mobile/src/test-support/rpc-recording/operation-module-loader.test.ts b/mobile/src/test-support/rpc-recording/operation-module-loader.test.ts
index bf8d411cff76..d4aea1cf8bd8 100644
--- a/mobile/src/test-support/rpc-recording/operation-module-loader.test.ts
+++ b/mobile/src/test-support/rpc-recording/operation-module-loader.test.ts
@@ -1,4 +1,4 @@
-import { mkdtempSync, mkdirSync, writeFileSync } from 'node:fs'
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { createElement } from 'react'
@@ -11,21 +11,84 @@ import { operationModuleLoader } from './operation-module-loader'
  * loader does rather than by what one screen happens to import today.
  */
 const roots: string[] = []
-function loaderOver(files: Record<string, string>): ReturnType<typeof operationModuleLoader> {
+function sourceTree(files: Record<string, string>): string {
   const root = mkdtempSync(join(tmpdir(), 'rpc-loader-'))
   roots.push(root)
   for (const [name, source] of Object.entries(files)) {
     mkdirSync(join(root, 'mobile/src'), { recursive: true })
     writeFileSync(join(root, 'mobile/src', name), source)
   }
-  return operationModuleLoader(root)
+  return root
+}
+function loaderOver(files: Record<string, string>): ReturnType<typeof operationModuleLoader> {
+  return operationModuleLoader(sourceTree(files))
 }
 
 afterAll(() => {
+  for (const root of roots) {
+    rmSync(root, { recursive: true, force: true })
+  }
   roots.length = 0
 })
 
 describe('the mounted module loader', () => {
+  it('reuses code without sharing exports, module state, mounting dependencies or effects', () => {
+    const root = sourceTree({
+      'state.ts': `
+        import { mounted, initial } from 'scenario-device'
+        mounted()
+        let count = initial
+        export const next = () => ++count
+      `,
+      'operation.ts': `export { next } from './state'`
+    })
+    let mounts = 0
+    function scenario(initial: number) {
+      return operationModuleLoader(
+        root,
+        undefined,
+        [],
+        new Map([['scenario-device', { initial, mounted: () => mounts++ }]])
+      )
+    }
+    const firstLoader = scenario(0)
+    const first = firstLoader.load<{ next: () => number }>('mobile/src/operation.ts')
+    expect(first.next()).toBe(1)
+    expect(first.next()).toBe(2)
+    expect(firstLoader.load('mobile/src/operation.ts')).toBe(first)
+    const second = scenario(10).load<{ next: () => number }>('mobile/src/operation.ts')
+    expect(second).not.toBe(first)
+    expect(second.next()).toBe(11)
+    expect(first.next()).toBe(3)
+    expect(mounts).toBe(2)
+  })
+
+  it('keeps mutations, exposure code and later source edits distinct on a warm cache', () => {
+    const source = 'const value: number = 1; export const read = () => value'
+    const root = sourceTree({ 'value.ts': source })
+    const path = 'mobile/src/value.ts'
+    const baseline = operationModuleLoader(root).load<{ read: () => number }>(path)
+    const mutation = { name: 'value', file: 'value.ts', before: '= 1', after: '= 2' }
+    for (let index = 0; index < 2; index++) {
+      const mutated = operationModuleLoader(root, mutation, [
+        ['value.ts', '\nexports.exposed = () => value + 10']
+      ])
+      const result = mutated.load<{ read: () => number; exposed: () => number }>(path)
+      expect(result.read()).toBe(2)
+      expect(result.exposed()).toBe(12)
+      expect(mutated.mutationsApplied()).toBe(1)
+    }
+    expect(baseline.read()).toBe(1)
+    const fresh = operationModuleLoader(root).load<{ read: () => number; exposed?: unknown }>(path)
+    expect(fresh.read()).toBe(1)
+    expect(fresh.exposed).toBeUndefined()
+    writeFileSync(join(root, path), source.replace('= 1', '= 3'))
+    expect(operationModuleLoader(root).load<{ read: () => number }>(path).read()).toBe(3)
+    expect(() => operationModuleLoader(root, mutation).load(path)).toThrow(
+      'Mutant anchor matched 0 sites'
+    )
+  })
+
   /**
    * Product sources compile with the automatic runtime and never import React, so a classic
    * `React.createElement` emit throws `React is not defined` on the first render of every screen.
@@ -66,7 +129,6 @@ describe('the mounted module loader', () => {
       `
     })
     const { read } = modules.load<{ read: () => unknown }>('mobile/src/uses-default.ts')
-    expect(typeof read).toBe('function')
     expect(() => read()).toThrow(
       'Unspecified native mounting dependency: react-native-not-substituted.default'
     )
@@ -97,7 +159,6 @@ describe('the mounted module loader', () => {
       `
     })
     const { read } = modules.load<{ read: () => unknown }>('mobile/src/uses-namespace.ts')
-    expect(typeof read).toBe('function')
     expect(() => read()).toThrow(
       'Unspecified native mounting dependency: expo-not-substituted.selectionAsync'
     )
diff --git a/mobile/src/test-support/rpc-recording/operation-module-loader.ts b/mobile/src/test-support/rpc-recording/operation-module-loader.ts
index 2f337c94964a..b2f75a4cb4ff 100644
--- a/mobile/src/test-support/rpc-recording/operation-module-loader.ts
+++ b/mobile/src/test-support/rpc-recording/operation-module-loader.ts
@@ -1,10 +1,10 @@
-import { compileFunction } from 'node:vm'
 import { existsSync, readFileSync } from 'node:fs'
 import { dirname, resolve } from 'node:path'
 import ts from 'typescript'
 import { nativeMountingSubstitutes } from './native-mounting-substitutes'
 import { observeSalvagedReads } from './salvage-observation'
 import * as deliveryAmbiguity from '../../transport/rpc-delivery-ambiguity'
+import { compiledOperationModule } from './compiled-operation-module'
 
 export type OperationModule = Record<string, (...args: any[]) => unknown>
 /** One anchored in-memory source edit, resolved by the caller so the loader needs no mutant table. */
@@ -139,17 +139,8 @@ export function operationModuleLoader(
     }
     const exports: OperationModule = {}
     cache.set(file, exports)
-    const output = ts.transpileModule(source, {
-      compilerOptions: {
-        module: ts.ModuleKind.CommonJS,
-        target: ts.ScriptTarget.ES2022,
-        // Product sources use the automatic runtime and never import React, so a classic
-        // `React.createElement` emit throws `React is not defined` on the first screen render.
-        jsx: ts.JsxEmit.ReactJSX
-      }
-    }).outputText
     const exposure = exposures.find(([suffix]) => file.endsWith(suffix))?.[1] ?? ''
-    const evaluate = compileFunction(output + exposure, ['require', 'exports'], { filename: file })
+    const evaluate = compiledOperationModule(file, source, exposure)
     evaluate((name: string) => imported(file, name), exports)
     observeSalvagedReads(file, exports)
     return exports
diff --git a/mobile/src/test-support/rpc-recording/rpc-recording-through-bridge.test.ts b/mobile/src/test-support/rpc-recording/rpc-recording-through-bridge.test.ts
index 0ae92040e68f..502925a900b8 100644
--- a/mobile/src/test-support/rpc-recording/rpc-recording-through-bridge.test.ts
+++ b/mobile/src/test-support/rpc-recording/rpc-recording-through-bridge.test.ts
@@ -74,12 +74,12 @@ import { vitestRecordingScheduler } from './vitest-recording-scheduler'
  * `BRIDGED_PARITY_MEMBERS` pins which goldens are in it — a count alone cannot see one golden
  * leaving a class as another arrives.
  *
- * 396 of the 787 replay byte for byte. The other 391 fall in five classes, 341 / 3 / 6 / 33 / 8,
+ * 397 of the 790 replay byte for byte. The other 393 fall in five classes, 343 / 3 / 6 / 33 / 8,
  * and none of them is a reason to re-record anything. `c1-page-closure.ts` then pins, golden by
- * golden, the 103 recorded at a call site the C1 page owns, because a count over 787 cannot tell a
+ * golden, the 103 recorded at a call site the C1 page owns, because a count over 790 cannot tell a
  * domain's regression from another domain's improvement.
  *
- * 1. **result-absent-settlement, 341** and **2. result-absent-observation, 3.**
+ * 1. **result-absent-settlement, 343** and **2. result-absent-observation, 3.**
  *    `{ ok: true }` with no `result` key is refused by the page's reader and by `isRpcResponse`
  *    alike, so this one is not a bridge defect: the recorder injects that partition at the scripted
  *    sender port, below the frame validation both sides do, which is what the README means by not
diff --git a/mobile/src/test-support/webview-document-census.ts b/mobile/src/test-support/webview-document-census.ts
index eb050fce3e14..73b9ff71e894 100644
--- a/mobile/src/test-support/webview-document-census.ts
+++ b/mobile/src/test-support/webview-document-census.ts
@@ -17,7 +17,7 @@ import { parseSync } from 'oxc-parser'
  */
 
 /** Statement kinds that only declare. Anything else at a module's top level is work. */
-export const DECLARATION_KINDS = new Set([
+const DECLARATION_KINDS = new Set([
   'ImportDeclaration',
   'ExportNamedDeclaration',
   'ExportDefaultDeclaration',
@@ -83,7 +83,7 @@ function initialiserRuns(node: unknown): boolean {
 }
 
 /** Whether anything at a module's top level reaches an element, at any depth. */
-export function readsTheDocument(node: unknown): boolean {
+function readsTheDocument(node: unknown): boolean {
   if (Array.isArray(node)) {
     return node.some(readsTheDocument)
   }
@@ -93,7 +93,7 @@ export function readsTheDocument(node: unknown): boolean {
   return fieldsOf(node).some(([key, value]) => key !== 'type' && readsTheDocument(value))
 }
 
-export function parseModule(name: string, source: string) {
+function parseModule(name: string, source: string) {
   const { program, errors } = parseSync(`${name}.ts`, source, { lang: 'ts' })
   if (errors.length > 0) {
     throw new Error(`[webview-document-census] ${name}.ts did not parse: ${errors[0]?.message}`)
diff --git a/mobile/src/transport/client-context.test.ts b/mobile/src/transport/client-context.test.ts
index 36e336008370..99a8e31fa4f6 100644
--- a/mobile/src/transport/client-context.test.ts
+++ b/mobile/src/transport/client-context.test.ts
@@ -40,6 +40,9 @@ vi.mock('./host-store', () => ({
 vi.mock('./connection-revival-triggers', () => ({
   subscribeConnectionRevivalTriggers: () => () => {}
 }))
+vi.mock('./connection-log-background-flush', () => ({
+  subscribeConnectionLogBackgroundFlush: () => () => {}
+}))
 
 import {
   RpcClientProvider,
diff --git a/mobile/src/transport/client-context.tsx b/mobile/src/transport/client-context.tsx
index 76d26c1bab52..0348c22105d8 100644
--- a/mobile/src/transport/client-context.tsx
+++ b/mobile/src/transport/client-context.tsx
@@ -12,6 +12,7 @@ import {
 import type { RpcClient } from './rpc-client'
 import type { StableLogicalRpcClient } from './stable-logical-rpc-client'
 import { subscribeConnectionRevivalTriggers } from './connection-revival-triggers'
+import { subscribeConnectionLogBackgroundFlush } from './connection-log-background-flush'
 import { HostClientOpenRegistry } from './host-client-open-registry'
 import {
   HostClientAcquisitionRegistry,
@@ -20,7 +21,7 @@ import {
 import { HostOpenRetryScheduler } from './host-open-retry-scheduler'
 import { openHostClientEntry, type HostClientStoreEntry } from './host-entry-opener'
 import { shouldPreserveActiveRelay } from './relay-reconnect-preservation'
-import { recordConnectionRevival } from './persisted-connection-log-store'
+import { connectionLogStore, recordConnectionRevival } from './persisted-connection-log-store'
 import {
   createHostClientSelectors,
   listHostClients,
@@ -329,6 +330,14 @@ export function RpcClientProvider({ children }: { children: ReactNode }) {
     })
   }, [])
 
+  // Why: a connection-log write that failed is only retried by the next append, so
+  // flush before the OS can kill a backgrounded app (see connection-log-background-flush).
+  useEffect(() => {
+    return subscribeConnectionLogBackgroundFlush(() => {
+      void connectionLogStore.flush()
+    })
+  }, [])
+
   const value = useMemo<RpcClientContextValue>(
     () => ({
       acquire,
diff --git a/mobile/src/transport/client-context.web.test.tsx b/mobile/src/transport/client-context.web.test.tsx
index c322d07ab7ed..1efc5771dd97 100644
--- a/mobile/src/transport/client-context.web.test.tsx
+++ b/mobile/src/transport/client-context.web.test.tsx
@@ -2,10 +2,7 @@ import type { ReactElement } from 'react'
 import { act, create } from 'react-test-renderer'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { BRIDGE_PROTOCOL_VERSION } from '../mobile-web-shell/bridge/bridge-envelope'
-import {
-  BRIDGE_PAGE_CLIENT_ID,
-  BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT
-} from '../mobile-web-shell/bridge/bridge-page-client-identity'
+import { BRIDGE_PAGE_CLIENT_ID } from '../mobile-web-shell/bridge/bridge-page-client-identity'
 import { createShellPageClient } from '../mobile-web-shell/bridge/page-bootstrap'
 import type { BridgeRpcClient } from '../mobile-web-shell/bridge/bridge-rpc-client'
 import type { RpcClientContextValue } from './rpc-client-context-contract'
@@ -35,8 +32,7 @@ const INIT = {
     lastInboundAt: 1800,
     generation: 5
   },
-  grants: { rpc: { maxPendingRequests: 64, maxSubscriptions: 32 }, native: [] },
-  accepts: [BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT]
+  grants: { rpc: { maxPendingRequests: 64, maxSubscriptions: 32 }, native: [] }
 }
 
 /** What the page mounted, and what it holds — the two things the provider decides. */
@@ -172,25 +168,6 @@ describe('the page provider', () => {
     expect(first).toBe(BRIDGE_PAGE_CLIENT_ID)
   })
 
-  it('claims nothing at all when the shell never said it performs the swap', () => {
-    const channel = installChannel()
-    const client = createShellPageClient()
-    if (client === null) {
-      throw new Error('no channel installed')
-    }
-    // An `init` that landed, naming no swap — not a client with no session at all, which would
-    // answer null for a reason that has nothing to do with the capability.
-    channel.deliver({ ...INIT, accepts: [] })
-    act(() => {
-      create(render(client))
-    })
-    expect(readContext().getState('host-a')).toBe('connected')
-
-    // An older shell forwards what the page sent, so a placeholder would reach the host and be
-    // refused as a spoof. Nothing claimed is the honest answer, and it is what shipped before.
-    expect(readContext().getClientId('host-a')).toBe(null)
-  })
-
   it('carries a state change from the shell to the screens watching it', () => {
     const channel = installChannel()
     const client = createReadyClient(channel.deliver)
diff --git a/mobile/src/transport/client-context.web.tsx b/mobile/src/transport/client-context.web.tsx
index 463aff873b21..a1606ba98534 100644
--- a/mobile/src/transport/client-context.web.tsx
+++ b/mobile/src/transport/client-context.web.tsx
@@ -3,10 +3,7 @@
 // side of the bridge already did, and this provider only carries what it holds across the boundary.
 import { createContext, useContext, useMemo, useRef, type ReactNode } from 'react'
 import type { BridgeRpcClient } from '../mobile-web-shell/bridge/bridge-rpc-client'
-import {
-  BRIDGE_PAGE_CLIENT_ID,
-  BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT
-} from '../mobile-web-shell/bridge/bridge-page-client-identity'
+import { BRIDGE_PAGE_CLIENT_ID } from '../mobile-web-shell/bridge/bridge-page-client-identity'
 import type { ConnectionState, HostProfile } from './types'
 import type { RpcClientContextValue } from './rpc-client-context-contract'
 
@@ -61,17 +58,8 @@ export function RpcClientProvider({
       getState: () => client.getState(),
       // Nothing mounts before `init`, so the page's state is never the unknown this answers null for.
       getKnownState: () => client.getState(),
-      /**
-       * A placeholder the shell swaps for this device's real identity, never the credential itself.
-       *
-       * Only when the shell said it performs the swap; a shell that did not leaves this null, which
-       * is no terminal and no live input, because the session route refuses to subscribe or send
-       * without one — but a placeholder the host read itself would be refused as a spoof.
-       */
-      getClientId: () =>
-        client.getShellSession()?.accepts.includes(BRIDGE_PAGE_CLIENT_IDENTITY_ACCEPT) === true
-          ? BRIDGE_PAGE_CLIENT_ID
-          : null,
+      /** A placeholder the shell swaps for this device's real identity, never the credential. */
+      getClientId: () => BRIDGE_PAGE_CLIENT_ID,
       getReconnectAttempt: () => client.getReconnectAttempt(),
       getLastConnectedAt: () => client.getLastConnectedAt(),
       // The page reaches its host through the shell bridge, which rides whatever path the RN
diff --git a/mobile/src/transport/connection-log-background-flush.test.ts b/mobile/src/transport/connection-log-background-flush.test.ts
new file mode 100644
index 000000000000..e5563a9fccdf
--- /dev/null
+++ b/mobile/src/transport/connection-log-background-flush.test.ts
@@ -0,0 +1,45 @@
+import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest'
+import { subscribeConnectionLogBackgroundFlush } from './connection-log-background-flush'
+
+type AppStateListener = (next: string) => void
+
+let appStateListener: AppStateListener | null = null
+const appStateRemove = vi.fn()
+
+vi.mock('react-native', () => ({
+  AppState: {
+    addEventListener: (_event: string, listener: AppStateListener) => {
+      appStateListener = listener
+      return { remove: appStateRemove }
+    }
+  }
+}))
+
+describe('subscribeConnectionLogBackgroundFlush', () => {
+  let flush: Mock<() => void>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    appStateListener = null
+    flush = vi.fn<() => void>()
+  })
+
+  it('flushes when the app goes to the background', () => {
+    subscribeConnectionLogBackgroundFlush(flush)
+    appStateListener?.('background')
+    expect(flush).toHaveBeenCalledTimes(1)
+  })
+
+  it('does not flush on foreground or transient inactive states', () => {
+    subscribeConnectionLogBackgroundFlush(flush)
+    appStateListener?.('active')
+    appStateListener?.('inactive')
+    expect(flush).not.toHaveBeenCalled()
+  })
+
+  it('removes the listener on unsubscribe', () => {
+    const unsubscribe = subscribeConnectionLogBackgroundFlush(flush)
+    unsubscribe()
+    expect(appStateRemove).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/mobile/src/transport/connection-log-background-flush.ts b/mobile/src/transport/connection-log-background-flush.ts
new file mode 100644
index 000000000000..860b7e43ca66
--- /dev/null
+++ b/mobile/src/transport/connection-log-background-flush.ts
@@ -0,0 +1,14 @@
+import { AppState } from 'react-native'
+
+// Why: connection-log persistence is best-effort — a failed write is only retried
+// by the next append, so when a disconnect is the last thing that happens the
+// entries explaining it never reach storage. Background is the last point the OS
+// still runs JS before it can kill the process, so flush the newest snapshot there.
+export function subscribeConnectionLogBackgroundFlush(flush: () => void): () => void {
+  const subscription = AppState.addEventListener('change', (next) => {
+    if (next === 'background') {
+      flush()
+    }
+  })
+  return () => subscription.remove()
+}
diff --git a/mobile/src/transport/connection-log-buffer.ts b/mobile/src/transport/connection-log-buffer.ts
index 5af67051cf87..149e8dc4ee8a 100644
--- a/mobile/src/transport/connection-log-buffer.ts
+++ b/mobile/src/transport/connection-log-buffer.ts
@@ -9,9 +9,13 @@ import { redactConnectionLogEntry } from '../diagnostics/connection-log-redactio
 // swaps (forceReconnect) and provider remounts (hot reload); bounded so an
 // all-night reconnect loop can't grow memory unbounded.
 const MAX_ENTRIES_PER_HOST = 200
+// Why: a store that just rejected almost always rejects again on the same tick, so
+// the one retry a snapshot gets waits instead of firing back-to-back.
+const PERSISTENCE_RETRY_DELAY_MS = 200
 
 export type ConnectionLogStore = {
   append: (hostId: string, entry: ConnectionLogEntry) => void
+  flush: () => Promise<void>
   get: (hostId: string) => readonly ConnectionLogEntry[]
   hydrate: (hostId: string) => Promise<void>
   subscribe: (hostId: string, listener: () => void) => () => void
@@ -31,10 +35,11 @@ export function createConnectionLogStore(
   const hydratedHosts = new Set<string>()
   const hydrationFailedHosts = new Set<string>()
   const hydrationByHost = new Map<string, Promise<void>>()
-  const saveByHost = new Map<string, Promise<void>>()
+  const activeSaveByHost = new Map<string, Promise<void>>()
+  const dirtyHosts = new Set<string>()
   const persistenceRevisionByHost = new Map<
     string,
-    { snapshot: readonly ConnectionLogEntry[]; saved: boolean }
+    { snapshot: readonly ConnectionLogEntry[]; retried: boolean; saved: boolean }
   >()
   // Why: useSyncExternalStore compares snapshots by reference — getSnapshot
   // must return the SAME array until the data actually changes, or React
@@ -59,36 +64,74 @@ export function createConnectionLogStore(
     }
   }
 
+  // Why: one in-flight save per host, re-reading the revision after each write, so
+  // slow storage retains the in-flight snapshot and the newest pending one instead
+  // of one superseded MAX_ENTRIES_PER_HOST copy per queued append.
+  const runSaveLoop = async (hostId: string, storage: ConnectionLogPersistence): Promise<void> => {
+    try {
+      // Yield once so a synchronous append burst collapses into a single write.
+      await Promise.resolve()
+      while (dirtyHosts.delete(hostId)) {
+        const revision = persistenceRevisionByHost.get(hostId)
+        if (!revision || revision.saved) {
+          return
+        }
+        try {
+          await storage.save(hostId, revision.snapshot)
+          revision.saved = true
+        } catch {
+          // At most one delayed retry per snapshot, and none at all once a newer
+          // snapshot is queued — that snapshot already carries these entries, so
+          // re-attempting this one is pure write amplification.
+          if (!revision.retried && !dirtyHosts.has(hostId)) {
+            revision.retried = true
+            setTimeout(() => persist(hostId), PERSISTENCE_RETRY_DELAY_MS)
+          }
+        }
+      }
+    } finally {
+      activeSaveByHost.delete(hostId)
+    }
+  }
+
   const persist = (hostId: string): void => {
     if (!persistence || !hydratedHosts.has(hostId)) {
       return
     }
     let revision = persistenceRevisionByHost.get(hostId)
     if (!revision) {
-      revision = { snapshot: [...(entriesByHost.get(hostId) ?? [])], saved: false }
+      revision = {
+        snapshot: [...(entriesByHost.get(hostId) ?? [])],
+        retried: false,
+        saved: false
+      }
       persistenceRevisionByHost.set(hostId, revision)
     }
-    const currentRevision = revision
-    if (currentRevision.saved) {
+    if (revision.saved) {
       return
     }
-    const previous = saveByHost.get(hostId) ?? Promise.resolve()
-    const pending = previous
-      .catch(() => {})
-      .then(async () => {
-        // Duplicate requests retain retry opportunities until this revision is durable.
-        if (currentRevision.saved) {
-          return
-        }
-        try {
-          await persistence.save(hostId, currentRevision.snapshot)
-        } catch {
-          await persistence.save(hostId, currentRevision.snapshot)
-        }
-        currentRevision.saved = true
-      })
-      .catch(() => {})
-    saveByHost.set(hostId, pending)
+    dirtyHosts.add(hostId)
+    if (activeSaveByHost.has(hostId)) {
+      return
+    }
+    activeSaveByHost.set(hostId, runSaveLoop(hostId, persistence))
+  }
+
+  // Why: a failed write is otherwise only retried by the next append, so the final
+  // entries explaining a disconnect are lost when the log goes quiet and the OS
+  // kills the app. Two passes: drain whatever is running, then one retry.
+  const flushHost = async (hostId: string): Promise<void> => {
+    for (let pass = 0; pass < 2; pass++) {
+      persist(hostId)
+      const active = activeSaveByHost.get(hostId)
+      if (!active) {
+        return
+      }
+      await active
+      if (persistenceRevisionByHost.get(hostId)?.saved === true) {
+        return
+      }
+    }
   }
 
   const hydrateHost = async (hostId: string, retryAfterFailure: boolean): Promise<void> => {
@@ -148,6 +191,10 @@ export function createConnectionLogStore(
         .catch(() => {})
     },
 
+    flush: async () => {
+      await Promise.all([...entriesByHost.keys()].map((hostId) => flushHost(hostId)))
+    },
+
     get(hostId) {
       const cached = snapshotByHost.get(hostId)
       if (cached) {
diff --git a/mobile/src/transport/connection-log-persistence-backpressure.test.ts b/mobile/src/transport/connection-log-persistence-backpressure.test.ts
new file mode 100644
index 000000000000..0819fc87ee30
--- /dev/null
+++ b/mobile/src/transport/connection-log-persistence-backpressure.test.ts
@@ -0,0 +1,266 @@
+import { describe, expect, it, vi } from 'vitest'
+import { createConnectionLogStore } from './connection-log-buffer'
+import type { ConnectionLogEntry } from './types'
+
+const entry = (id: number): ConnectionLogEntry => ({
+  id: String(id),
+  ts: id,
+  level: 'info',
+  message: `event ${id}`
+})
+
+async function drainMicrotasks(): Promise<void> {
+  for (let i = 0; i < 12; i++) {
+    await Promise.resolve()
+  }
+}
+
+describe('connection log persistence backpressure', () => {
+  it('writes only the latest pending snapshot when storage falls behind', async () => {
+    const saved: string[][] = []
+    let release: () => void = () => {}
+    let delay = false
+    const store = createConnectionLogStore(200, {
+      load: async () => [],
+      save: async (_host, entries) => {
+        saved.push(entries.map((item) => item.id))
+        if (delay) {
+          delay = false
+          await new Promise<void>((resolve) => {
+            release = resolve
+          })
+        }
+      }
+    })
+    await store.hydrate('a')
+    await drainMicrotasks()
+    saved.length = 0
+    delay = true
+    store.append('a', entry(0))
+    await drainMicrotasks()
+    for (let i = 1; i <= 1000; i++) {
+      store.append('a', entry(i))
+      await drainMicrotasks()
+    }
+    expect(saved).toEqual([['0']])
+    release()
+    for (let i = 0; i < 1000; i++) {
+      await drainMicrotasks()
+    }
+    expect(saved).toHaveLength(2)
+    expect(saved[1]).toEqual(store.get('a').map((item) => item.id))
+  })
+
+  it('persists a different host while one host has a stalled save', async () => {
+    const saved: [string, string[]][] = []
+    let release: () => void = () => {}
+    let delay = false
+    const store = createConnectionLogStore(200, {
+      load: async () => [],
+      save: async (host, entries) => {
+        saved.push([host, entries.map((item) => item.id)])
+        if (delay && host === 'a') {
+          delay = false
+          await new Promise<void>((resolve) => {
+            release = resolve
+          })
+        }
+      }
+    })
+    await Promise.all(['a', 'b'].map((host) => store.hydrate(host)))
+    await drainMicrotasks()
+    saved.length = 0
+    delay = true
+    store.append('a', entry(1))
+    await drainMicrotasks()
+    store.append('a', entry(2))
+    store.append('b', entry(3))
+    await drainMicrotasks()
+    expect(saved).toEqual([
+      ['a', ['1']],
+      ['b', ['3']]
+    ])
+    release()
+    await drainMicrotasks()
+    expect(saved.at(-1)).toEqual(['a', ['1', '2']])
+  })
+
+  it('saves the latest snapshot after an older in-flight revision fails', async () => {
+    let rejectSave: (error: Error) => void = () => {}
+    let failing = false
+    let persisted: readonly ConnectionLogEntry[] = []
+    const saved: string[][] = []
+    const persistence = {
+      load: async () => persisted,
+      save: async (_host: string, entries: readonly ConnectionLogEntry[]) => {
+        saved.push(entries.map((item) => item.id))
+        if (failing && entries.length === 1) {
+          if (saved.length === 1) {
+            await new Promise<void>((_resolve, reject) => {
+              rejectSave = reject
+            })
+          }
+          throw new Error('storage unavailable')
+        }
+        persisted = entries
+      }
+    }
+    const store = createConnectionLogStore(2, persistence)
+    await store.hydrate('a')
+    await drainMicrotasks()
+    saved.length = 0
+    failing = true
+    store.append('a', entry(1))
+    await drainMicrotasks()
+    store.append('a', entry(2))
+    await drainMicrotasks()
+    store.append('a', entry(3))
+    await drainMicrotasks()
+    rejectSave(new Error('storage unavailable'))
+    await drainMicrotasks()
+    expect(saved).toEqual([['1'], ['2', '3']])
+    const reloaded = createConnectionLogStore(2, persistence)
+    await reloaded.hydrate('a')
+    expect(reloaded.get('a')).toEqual(store.get('a'))
+  })
+
+  it.each([false, true])(
+    'includes an append during save settlement (deferred=%s)',
+    async (deferred) => {
+      let afterSave = () => {}
+      const saved: string[][] = []
+      const store = createConnectionLogStore(200, {
+        load: async () => [],
+        save: async (_host, entries) => {
+          saved.push(entries.map((item) => item.id))
+          afterSave()
+        }
+      })
+      await store.hydrate('a')
+      await drainMicrotasks()
+      saved.length = 0
+      afterSave = () => {
+        afterSave = () => {}
+        if (deferred) {
+          queueMicrotask(() => store.append('a', entry(2)))
+        } else {
+          store.append('a', entry(2))
+        }
+      }
+      store.append('a', entry(1))
+      await drainMicrotasks()
+      expect(saved).toEqual([['1'], ['1', '2']])
+    }
+  )
+
+  it('attempts the newest snapshot instead of replaying superseded ones', async () => {
+    let release: () => void = () => {}
+    let hold = false
+    let failing = false
+    const attempted: string[][] = []
+    const store = createConnectionLogStore(2, {
+      load: async () => [],
+      save: async (_host, entries) => {
+        attempted.push(entries.map((item) => item.id))
+        if (hold) {
+          hold = false
+          await new Promise<void>((resolve) => {
+            release = resolve
+          })
+        }
+        if (failing) {
+          throw new Error('storage temporarily unavailable')
+        }
+      }
+    })
+    await store.hydrate('a')
+    await drainMicrotasks()
+    attempted.length = 0
+    hold = true
+    failing = true
+    for (let i = 1; i <= 3; i++) {
+      store.append('a', entry(i))
+      await drainMicrotasks()
+    }
+    expect(attempted).toEqual([['1']])
+    release()
+    await drainMicrotasks()
+    // The superseded ['1'] snapshot is never replayed; only the newest one is attempted.
+    expect(attempted).toEqual([['1'], ['2', '3']])
+  })
+
+  it('bounds writes when a long stall unblocks against failing storage', async () => {
+    vi.useFakeTimers()
+    try {
+      let release: () => void = () => {}
+      let hold = false
+      let failing = false
+      let writes = 0
+      const store = createConnectionLogStore(200, {
+        load: async () => [],
+        save: async () => {
+          writes += 1
+          if (hold) {
+            hold = false
+            await new Promise<void>((resolve) => {
+              release = resolve
+            })
+          }
+          if (failing) {
+            throw new Error('storage unavailable')
+          }
+        }
+      })
+      await store.hydrate('a')
+      await drainMicrotasks()
+      writes = 0
+      hold = true
+      failing = true
+      for (let i = 0; i < 500; i++) {
+        store.append('a', entry(i))
+        await drainMicrotasks()
+      }
+      expect(writes).toBe(1)
+      release()
+      for (let i = 0; i < 20; i++) {
+        await drainMicrotasks()
+      }
+      // 500 stalled appends cost the held write plus one attempt at the newest snapshot.
+      expect(writes).toBe(2)
+      await vi.advanceTimersByTimeAsync(5_000)
+      // Draining the backoff adds that snapshot's single retry and nothing more.
+      expect(writes).toBe(3)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('flush persists the newest snapshot after a failed save and a quiet log', async () => {
+    let failing = true
+    let durableIds: string[] = []
+    let writes = 0
+    const store = createConnectionLogStore(200, {
+      load: async () => [],
+      save: async (_host, entries) => {
+        writes += 1
+        if (failing) {
+          throw new Error('storage unavailable')
+        }
+        durableIds = entries.map((item) => item.id)
+      }
+    })
+    await store.hydrate('a')
+    await drainMicrotasks()
+    store.append('a', entry(1))
+    store.append('a', entry(2))
+    await drainMicrotasks()
+    expect(durableIds).toEqual([])
+    failing = false
+    writes = 0
+    await store.flush()
+    expect(durableIds).toEqual(['1', '2'])
+    expect(writes).toBe(1)
+    await store.flush()
+    expect(writes).toBe(1)
+  })
+})
diff --git a/mobile/src/transport/connection-log-persistence-revisions.test.ts b/mobile/src/transport/connection-log-persistence-revisions.test.ts
index e85567d9eafc..abe40775911f 100644
--- a/mobile/src/transport/connection-log-persistence-revisions.test.ts
+++ b/mobile/src/transport/connection-log-persistence-revisions.test.ts
@@ -50,7 +50,7 @@ describe('connection log persistence revisions', () => {
     )
   })
 
-  it('preserves distinct queued revisions while a save is delayed', async () => {
+  it('replaces obsolete queued revisions while a save is delayed', async () => {
     const saved: string[][] = []
     let release!: () => void
     let delay = false
@@ -79,27 +79,29 @@ describe('connection log persistence revisions', () => {
     expect(saved).toEqual([['1']])
     release()
     await drain()
-    expect(saved).toEqual([['1'], ['1', '2'], ['2', '3']])
+    expect(saved).toEqual([['1'], ['2', '3']])
   })
 
-  it('retains retries and later attempts when both initial save attempts fail', async () => {
+  it('attempts a failed snapshot once and carries the entries into the next write', async () => {
     const save = vi.fn<ConnectionLogPersistence['save']>(async () => {})
     const store = createConnectionLogStore(200, { load: async () => [], save })
     await store.hydrate('a')
     await drain()
     save.mockClear()
-    save.mockRejectedValueOnce(new Error('first')).mockRejectedValueOnce(new Error('retry'))
+    save.mockRejectedValueOnce(new Error('first'))
     store.append('a', entry(1))
     store.append('a', entry(2))
     store.append('a', entry(3))
     await drain()
-    expect(save).toHaveBeenCalledTimes(3)
-    expect(save.mock.calls[2]?.[1]).toBe(save.mock.calls[0]?.[1])
-    for (const [, snapshot] of save.mock.calls) {
-      expect(snapshot).toEqual([entry(1), entry(2), entry(3)])
-    }
+    expect(save).toHaveBeenCalledTimes(1)
+    expect(save.mock.calls[0]?.[1]).toEqual([entry(1), entry(2), entry(3)])
+    store.append('a', entry(4))
+    await drain()
+    expect(save).toHaveBeenCalledTimes(2)
+    expect(save).toHaveBeenLastCalledWith('a', store.get('a'))
   })
-  it('keeps every queued retry opportunity during a sustained failure', async () => {
+
+  it('writes once per snapshot during a sustained failure', async () => {
     const save = vi.fn<ConnectionLogPersistence['save']>(async () => {})
     const store = createConnectionLogStore(200, { load: async () => [], save })
     await store.hydrate('a')
@@ -109,7 +111,7 @@ describe('connection log persistence revisions', () => {
       store.append('a', entry(i))
     }
     await drain()
-    expect(save).toHaveBeenCalledTimes(6)
+    expect(save).toHaveBeenCalledTimes(1)
     save.mockClear().mockResolvedValue(undefined)
     store.append('a', entry(3))
     await drain()
diff --git a/mobile/src/transport/force-reconnect-page-seam.test.tsx b/mobile/src/transport/force-reconnect-page-seam.test.tsx
index 8aa8aee556e8..38d07b0d44b3 100644
--- a/mobile/src/transport/force-reconnect-page-seam.test.tsx
+++ b/mobile/src/transport/force-reconnect-page-seam.test.tsx
@@ -27,8 +27,7 @@ const INIT = {
     lastInboundAt: 1800,
     generation: 5
   },
-  grants: { rpc: { maxPendingRequests: 64, maxSubscriptions: 32 }, native: [] },
-  accepts: []
+  grants: { rpc: { maxPendingRequests: 64, maxSubscriptions: 32 }, native: [] }
 }
 
 afterEach(() => {
diff --git a/mobile/src/transport/host-open-recovery.test.tsx b/mobile/src/transport/host-open-recovery.test.tsx
index 972a30dce1cb..d4bf4fe669ab 100644
--- a/mobile/src/transport/host-open-recovery.test.tsx
+++ b/mobile/src/transport/host-open-recovery.test.tsx
@@ -31,6 +31,9 @@ vi.mock('./connection-revival-triggers', () => ({
     }
   }
 }))
+vi.mock('./connection-log-background-flush', () => ({
+  subscribeConnectionLogBackgroundFlush: () => () => {}
+}))
 
 import {
   useDisconnectHostClient,
diff --git a/mobile/src/transport/host-status-capability-ignorability.test.ts b/mobile/src/transport/host-status-capability-ignorability.test.ts
index 03477a3a918d..35762e8699cc 100644
--- a/mobile/src/transport/host-status-capability-ignorability.test.ts
+++ b/mobile/src/transport/host-status-capability-ignorability.test.ts
@@ -11,8 +11,8 @@ import { supportsMobileQuickCommands } from '../terminal/quick-commands'
 import { useHostStatusGates, type HostStatusGates } from './host-status-gates'
 import {
   hostAnsweredStatusProbe,
-  readHostStatusGates,
-  readProbedHostCapabilities
+  readProbedHostCapabilities,
+  readProbedHostStatus
 } from './host-status-probe-operations'
 import type { HostStatusReply } from './host-status-reply-schema'
 import type { RpcClient } from './rpc-client'
@@ -107,7 +107,7 @@ async function readEverything(capabilities: readonly string[]): Promise<ClientVi
   const gates = await renderGates(client)
   return {
     gates,
-    gateStatus: readHostStatusGates(reply),
+    gateStatus: readProbedHostStatus(reply)?.status ?? null,
     probedCapabilities: readProbedHostCapabilities(reply),
     answeredProbe: hostAnsweredStatusProbe(reply),
     quickCommandsSupported: supportsMobileQuickCommands(gates.hostCapabilities),
diff --git a/mobile/src/transport/host-status-gates.test.ts b/mobile/src/transport/host-status-gates.test.ts
index 0711d3dfa0ea..04de1f0e4fe8 100644
--- a/mobile/src/transport/host-status-gates.test.ts
+++ b/mobile/src/transport/host-status-gates.test.ts
@@ -226,4 +226,152 @@ describe('useHostStatusGates', () => {
       renderer?.unmount()
     }
   })
+
+  it('re-reads a status that failed while the connection stayed up', async () => {
+    vi.useFakeTimers()
+    const sendRequest = vi
+      .fn()
+      .mockRejectedValueOnce(new Error('request timed out'))
+      .mockResolvedValueOnce({
+        ok: true,
+        result: {
+          capabilities: ['browser.screencast.v1'],
+          floatingWorkspaceEnabled: true,
+          machineName: 'studio'
+        }
+      })
+    const client = { sendRequest } as unknown as RpcClient
+    let gates: HostStatusGates | null = null
+    let renderer: ReactTestRenderer | null = null
+
+    function Probe(): null {
+      gates = useHostStatusGates({ hostId: 'host-1', client, connState: 'connected' })
+      return null
+    }
+
+    try {
+      await act(async () => {
+        renderer = create(createElement(Probe))
+        await Promise.resolve()
+      })
+      // Settled closed rather than pending, so a failed read never traps the host screen.
+      expect(gates).toMatchObject({
+        hostCapabilities: [],
+        statusPending: false,
+        statusReadable: false
+      })
+      expect(recordDescriptorFromStatusMock).not.toHaveBeenCalled()
+
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(1_000)
+      })
+      expect(sendRequest).toHaveBeenCalledTimes(2)
+      expect(gates).toMatchObject({
+        hostCapabilities: ['browser.screencast.v1'],
+        statusPending: false,
+        statusReadable: true
+      })
+      expect(recordDescriptorFromStatusMock).toHaveBeenCalledWith(
+        'host-1',
+        expect.objectContaining({ machineName: 'studio' })
+      )
+    } finally {
+      renderer?.unmount()
+      vi.useRealTimers()
+    }
+  })
+
+  it('settles closed on a refusal and re-reads until the host answers', async () => {
+    vi.useFakeTimers()
+    const sendRequest = vi
+      .fn()
+      .mockResolvedValueOnce({ ok: false, error: { code: 'unavailable', message: 'busy' } })
+      .mockResolvedValueOnce({ ok: true, result: { capabilities: ['browser.screencast.v1'] } })
+    const client = { sendRequest } as unknown as RpcClient
+    let gates: HostStatusGates | null = null
+    let renderer: ReactTestRenderer | null = null
+
+    function Probe(): null {
+      gates = useHostStatusGates({ hostId: 'host-1', client, connState: 'connected' })
+      return null
+    }
+
+    try {
+      await act(async () => {
+        renderer = create(createElement(Probe))
+        await Promise.resolve()
+      })
+      expect(gates).toMatchObject({ statusPending: false, statusReadable: false })
+
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(1_000)
+      })
+      expect(sendRequest).toHaveBeenCalledTimes(2)
+      expect(gates).toMatchObject({
+        hostCapabilities: ['browser.screencast.v1'],
+        statusReadable: true
+      })
+    } finally {
+      renderer?.unmount()
+      vi.useRealTimers()
+    }
+  })
+
+  it('settles closed and stops on a status this app cannot decode', async () => {
+    vi.useFakeTimers()
+    const sendRequest = vi.fn().mockResolvedValue({ ok: true, result: 'not a status' })
+    const client = { sendRequest } as unknown as RpcClient
+    let gates: HostStatusGates | null = null
+    let renderer: ReactTestRenderer | null = null
+
+    function Probe(): null {
+      gates = useHostStatusGates({ hostId: 'host-1', client, connState: 'connected' })
+      return null
+    }
+
+    try {
+      await act(async () => {
+        renderer = create(createElement(Probe))
+        await Promise.resolve()
+      })
+      expect(gates).toMatchObject({ statusPending: false, statusReadable: false })
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(60_000)
+      })
+      expect(sendRequest).toHaveBeenCalledOnce()
+    } finally {
+      renderer?.unmount()
+      vi.useRealTimers()
+    }
+  })
+
+  it('stops re-reading once the host screen unmounts', async () => {
+    vi.useFakeTimers()
+    const sendRequest = vi.fn().mockRejectedValue(new Error('request timed out'))
+    const client = { sendRequest } as unknown as RpcClient
+    let renderer: ReactTestRenderer | null = null
+
+    function Probe(): null {
+      useHostStatusGates({ hostId: 'host-1', client, connState: 'connected' })
+      return null
+    }
+
+    try {
+      await act(async () => {
+        renderer = create(createElement(Probe))
+        await Promise.resolve()
+      })
+      await act(async () => {
+        renderer?.unmount()
+        renderer = null
+      })
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(60_000)
+      })
+      expect(sendRequest).toHaveBeenCalledOnce()
+    } finally {
+      renderer?.unmount()
+      vi.useRealTimers()
+    }
+  })
 })
diff --git a/mobile/src/transport/host-status-gates.ts b/mobile/src/transport/host-status-gates.ts
index 21407d809123..7051f7c7018f 100644
--- a/mobile/src/transport/host-status-gates.ts
+++ b/mobile/src/transport/host-status-gates.ts
@@ -1,12 +1,12 @@
 import { useEffect, useState } from 'react'
 import type { RpcClient } from './rpc-client'
 import type { ConnectionState } from './types'
-import { hostStatusProbe, readHostStatusGates } from './host-status-probe-operations'
 import { evaluateCompat, type CompatVerdict } from './protocol-compat'
 import type { HostStatusReply } from './host-status-reply-schema'
 import { normalizeHostAppVersion } from './host-app-version'
 import { recordHostAppVersion } from './host-app-version-store'
 import { recordHostDescriptorFromStatus } from './host-descriptor-recorder'
+import { startRuntimeStatusProbe } from './runtime-status-probe'
 
 export type HostStatusGates = {
   hostCapabilities: string[]
@@ -46,6 +46,15 @@ const EMPTY_HOST_PROTOCOL_WINDOW: HostProtocolWindow = {
   minCompatibleMobileVersion: undefined
 }
 
+const UNREADABLE_STATUS_GATES: Omit<HostStatusGates, 'statusPending'> = {
+  hostCapabilities: EMPTY_HOST_CAPABILITIES,
+  floatingWorkspaceEnabled: false,
+  desktopAppVersion: null,
+  compatVerdict: { kind: 'ok' },
+  hostProtocolWindow: EMPTY_HOST_PROTOCOL_WINDOW,
+  statusReadable: false
+}
+
 // Reads status.get on connect for capabilities, protocol-compat verdict, and the
 // floating-workspace flag. Compat constants are wide-open today so this never blocks yet.
 export function useHostStatusGates(args: {
@@ -64,80 +73,10 @@ export function useHostStatusGates(args: {
       setUnverified(true)
       return
     }
-    let cancelled = false
-    const requestClient = client
-    const settle = (gates: Omit<HostStatusGates, 'statusPending'>) => {
-      setLoaded({ hostId, client: requestClient, ...gates })
+    return startHostStatusRead(client, hostId, (gates) => {
+      setLoaded({ hostId, client, ...gates })
       setUnverified(false)
-    }
-    void (async () => {
-      try {
-        const reply = await hostStatusProbe.request(requestClient)
-        if (cancelled) {
-          return
-        }
-        const status = readHostStatusGates(reply)
-        if (!status) {
-          settle({
-            hostCapabilities: [],
-            floatingWorkspaceEnabled: false,
-            desktopAppVersion: null,
-            compatVerdict: { kind: 'ok' },
-            hostProtocolWindow: EMPTY_HOST_PROTOCOL_WINDOW,
-            statusReadable: false
-          })
-          return
-        }
-        const verdict = evaluateCompat({
-          desktopProtocolVersion: status.protocolVersion,
-          desktopMinCompatibleMobileVersion: status.minCompatibleMobileVersion
-        })
-        const desktopAppVersion = normalizeHostAppVersion(status.appVersion)
-        if (hostId && desktopAppVersion) {
-          void recordHostAppVersion(hostId, desktopAppVersion)
-        }
-        if (hostId) {
-          // Why also here: the web page never runs the connection layer's probe, and the host
-          // screen should not wait for it; the recorder is idempotent across the two feeds.
-          recordHostDescriptorFromStatus(hostId, status)
-        }
-        settle({
-          hostCapabilities: status.capabilities ?? [],
-          floatingWorkspaceEnabled: status.floatingWorkspaceEnabled === true,
-          desktopAppVersion,
-          compatVerdict: verdict,
-          hostProtocolWindow: {
-            protocolVersion: status.protocolVersion,
-            minCompatibleMobileVersion: status.minCompatibleMobileVersion
-          },
-          statusReadable: true
-        })
-        if (verdict.kind === 'blocked') {
-          // Why: support breadcrumb to confirm a block fired vs a render bug; no PII, just version ints.
-          console.warn('[protocol-compat] blocked', {
-            reason: verdict.reason,
-            desktopVersion: verdict.desktopVersion,
-            requiredMobileVersion: verdict.requiredMobileVersion,
-            requiredDesktopVersion: verdict.requiredDesktopVersion
-          })
-        }
-      } catch {
-        // Why: a transient status failure must not trap navigation; conservative feature gates remain disabled.
-        if (!cancelled) {
-          settle({
-            hostCapabilities: [],
-            floatingWorkspaceEnabled: false,
-            desktopAppVersion: null,
-            compatVerdict: { kind: 'ok' },
-            hostProtocolWindow: EMPTY_HOST_PROTOCOL_WINDOW,
-            statusReadable: false
-          })
-        }
-      }
-    })()
-    return () => {
-      cancelled = true
-    }
+    })
   }, [client, connState, hostId])
 
   // Why: effects run after render, so key loaded gates by host and client to fail closed during route reuse.
@@ -165,3 +104,67 @@ export function useHostStatusGates(args: {
     statusPending: connState === 'connected' && unverified
   }
 }
+
+/**
+ * Reads status.get until it lands, settling closed on the first failure. Returns the stop function
+ * the effect hands back, so the probe's retry timer is owned outside React.
+ */
+function startHostStatusRead(
+  client: RpcClient,
+  hostId: string | undefined,
+  settle: (gates: Omit<HostStatusGates, 'statusPending'>) => void
+): () => void {
+  let settledClosed = false
+  // Why: a transient status failure must not trap navigation; conservative feature gates remain
+  // disabled. Later failures keep the first one's answer rather than re-render the same closed gates.
+  const settleClosed = () => {
+    if (!settledClosed) {
+      settledClosed = true
+      settle(UNREADABLE_STATUS_GATES)
+    }
+  }
+  return startRuntimeStatusProbe(
+    client,
+    (status) => {
+      // A status this app cannot decode reads the same on every retry, so the probe stops on it.
+      if (!status) {
+        settleClosed()
+        return
+      }
+      const verdict = evaluateCompat({
+        desktopProtocolVersion: status.protocolVersion,
+        desktopMinCompatibleMobileVersion: status.minCompatibleMobileVersion
+      })
+      const desktopAppVersion = normalizeHostAppVersion(status.appVersion)
+      if (hostId && desktopAppVersion) {
+        void recordHostAppVersion(hostId, desktopAppVersion)
+      }
+      if (hostId) {
+        // Why also here: the web page never runs the connection layer's probe, and the host
+        // screen should not wait for it; the recorder is idempotent across the two feeds.
+        recordHostDescriptorFromStatus(hostId, status)
+      }
+      settle({
+        hostCapabilities: status.capabilities ?? [],
+        floatingWorkspaceEnabled: status.floatingWorkspaceEnabled === true,
+        desktopAppVersion,
+        compatVerdict: verdict,
+        hostProtocolWindow: {
+          protocolVersion: status.protocolVersion,
+          minCompatibleMobileVersion: status.minCompatibleMobileVersion
+        },
+        statusReadable: true
+      })
+      if (verdict.kind === 'blocked') {
+        // Why: support breadcrumb to confirm a block fired vs a render bug; no PII, just version ints.
+        console.warn('[protocol-compat] blocked', {
+          reason: verdict.reason,
+          desktopVersion: verdict.desktopVersion,
+          requiredMobileVersion: verdict.requiredMobileVersion,
+          requiredDesktopVersion: verdict.requiredDesktopVersion
+        })
+      }
+    },
+    settleClosed
+  )
+}
diff --git a/mobile/src/transport/host-status-probe-operations.ts b/mobile/src/transport/host-status-probe-operations.ts
index ec9d1ac0e587..0fd13f2c95aa 100644
--- a/mobile/src/transport/host-status-probe-operations.ts
+++ b/mobile/src/transport/host-status-probe-operations.ts
@@ -14,12 +14,11 @@ import type { RpcResponse } from './types'
  * surfaces the host's message, `status.create-capabilities-or-skip` is the create drawer's) because
  * an operation name is what a decode failure reports, and because transport must not import tasks.
  *
- * One reader, but three different meanings for an unreadable status, which is why the three
- * readers below exist rather than each caller calling `interpret` directly. The gate wants the
- * failure (its own `catch` degrades to closed gates), and the probe and the race must not have it:
- * both call `interpret` inside a `.then` fulfilment handler, where a throw becomes a detached
- * rejection instead of reaching their rejection handler — the probe would latch capability-gated UI
- * hidden with no retry, and the race would never count the candidate at all.
+ * The readers below exist rather than each caller calling `interpret` directly because neither the
+ * probe (which the gate also runs on) nor the race may have an unreadable status thrown at it: both
+ * call `interpret` inside a `.then` fulfilment handler, where a throw becomes a detached rejection
+ * instead of reaching their rejection handler — the probe would latch capability-gated UI hidden
+ * with no retry, and the race would never count the candidate at all.
  */
 export const hostStatusProbe = bindDeferredRpcOperation(
   defineRpcOperation({
@@ -31,16 +30,6 @@ export const hostStatusProbe = bindDeferredRpcOperation(
   })
 )
 
-/**
- * The gate's read. An unreadable status raises `RpcIncompatibleReplyError` naming `status.get`,
- * which host-status-gates.ts already catches into the same closed gates a property read on a null
- * status used to throw its way to.
- */
-export function readHostStatusGates(reply: RpcResponse): HostStatusReply | null {
-  const accepted = hostStatusProbe.interpret(reply)
-  return accepted.accepted ? accepted.value : null
-}
-
 /**
  * The status the retrying probe delivers, or `null` for a refusal it should back off from.
  *
diff --git a/mobile/src/transport/host-status-reply-schema.ts b/mobile/src/transport/host-status-reply-schema.ts
index 041cbf6a6b9e..7f8d834e6451 100644
--- a/mobile/src/transport/host-status-reply-schema.ts
+++ b/mobile/src/transport/host-status-reply-schema.ts
@@ -20,7 +20,7 @@ import { NODE_PLATFORM_NAMES } from './mobile-runtime-host-platform'
  * `transport-capability-probe-non-string-capabilities-drop` golden records as `published: [[]]`.
  *
  * The object itself is required, and the three callers each keep the guard that decides what an
- * unreadable status means to them: see `readHostStatusGates`, `readProbedHostCapabilities` and
+ * unreadable status means to them: see `readProbedHostStatus`, `readProbedHostCapabilities` and
  * `hostAnsweredStatusProbe` in host-status-probe-operations.ts.
  */
 export const hostStatusSchema = z.looseObject({
diff --git a/mobile/src/transport/mobile-relay-rpc-stream-cancellation.test.ts b/mobile/src/transport/mobile-relay-rpc-stream-cancellation.test.ts
index 0a7a25dfbd7d..d58ebd229e40 100644
--- a/mobile/src/transport/mobile-relay-rpc-stream-cancellation.test.ts
+++ b/mobile/src/transport/mobile-relay-rpc-stream-cancellation.test.ts
@@ -101,7 +101,7 @@ describe('mobile relay subscription cancellation', () => {
       'terminal.subscribe',
       { terminal: 'term', client: { id: 'phone' } },
       'terminal.unsubscribe',
-      { subscriptionId: 'term:phone', client: { id: 'phone' } }
+      { subscriptionId: 'term:phone', client: { id: 'phone' }, requestId: 'request-1' }
     ],
     [
       'session.tabs.subscribe',
@@ -218,6 +218,25 @@ describe('mobile relay subscription cancellation', () => {
     }
   )
 
+  it('keeps skipping for a live newer terminal sibling though each unsubscribe names its request', async () => {
+    const { streams, sendFrame } = createStreams()
+    const params = { terminal: 'term', client: { id: 'phone' } }
+    const cancelOlder = streams.subscribe('terminal.subscribe', params, vi.fn())
+    const cancelNewer = streams.subscribe('terminal.subscribe', { ...params }, vi.fn())
+    await Promise.resolve()
+
+    // A host without request addressing ends the slot, which the newer stream now owns.
+    cancelOlder()
+    expect(sendFrame).toHaveBeenCalledTimes(2)
+
+    cancelNewer()
+    expect(sendFrame).toHaveBeenLastCalledWith({
+      id: 'request-3',
+      method: 'terminal.unsubscribe',
+      params: { subscriptionId: 'term:phone', client: { id: 'phone' }, requestId: 'request-2' }
+    })
+  })
+
   it('still unsubscribes a shared-token nativeChat stream when the sibling is unsent', async () => {
     const wait = Promise.withResolvers<void>()
     let connected = false
diff --git a/mobile/src/transport/mobile-relay-rpc-streams.ts b/mobile/src/transport/mobile-relay-rpc-streams.ts
index 3af5b2b3f5e5..ad996b3811f8 100644
--- a/mobile/src/transport/mobile-relay-rpc-streams.ts
+++ b/mobile/src/transport/mobile-relay-rpc-streams.ts
@@ -29,7 +29,7 @@ type StreamRecord = {
   receivedSnapshot?: boolean
 }
 
-type StreamUnsubscribe = { method: string; params: unknown }
+type StreamUnsubscribe = { method: string; params: Record<string, unknown> }
 
 /** Unsubscribe derived from the subscribe params alone (no server-assigned id). */
 function buildParamsUnsubscribe(
@@ -194,7 +194,7 @@ export class MobileRelayRpcStreams {
       const byParams = buildParamsUnsubscribe(stream.method, stream.params, id)
       if (stream.method === 'terminal.subscribe') {
         if (byParams) {
-          this.sendUnsubscribe(byParams)
+          this.sendUnsubscribe(byParams, id)
         }
       } else {
         const unsubscribe = stream.subscriptionId
@@ -224,11 +224,15 @@ export class MobileRelayRpcStreams {
 
   /** Skip the unsubscribe when a live sibling shares the host cleanup token (e.g. nativeChat's
    *  deterministic `agent:sessionId`), since the host would evict the sibling's registration. */
-  private sendUnsubscribe(unsubscribe: StreamUnsubscribe): void {
+  private sendUnsubscribe(unsubscribe: StreamUnsubscribe, terminalRequestId?: string): void {
     if (this.hasLiveOwner(unsubscribe)) {
       return
     }
-    this.options.sendFrame({ id: this.options.nextId(), ...unsubscribe })
+    // Why: added after the sibling check; an old host strips it and would evict the live sibling.
+    const params = terminalRequestId
+      ? { ...unsubscribe.params, requestId: terminalRequestId }
+      : unsubscribe.params
+    this.options.sendFrame({ id: this.options.nextId(), method: unsubscribe.method, params })
   }
 
   private hasLiveOwner(unsubscribe: StreamUnsubscribe): boolean {
diff --git a/mobile/src/transport/mobile-web-bundle-compat.test.ts b/mobile/src/transport/mobile-web-bundle-compat.test.ts
index 639d41ef7db1..4fea3dab1767 100644
--- a/mobile/src/transport/mobile-web-bundle-compat.test.ts
+++ b/mobile/src/transport/mobile-web-bundle-compat.test.ts
@@ -25,6 +25,7 @@ function manifest(
     schemaVersion: 1,
     runtimeProtocolVersion: 3,
     minCompatibleRuntimeProtocolVersion: 2,
+    pageVersion: 1,
     ...overrides
   }
 }
@@ -189,3 +190,40 @@ describe('evaluateMobileWebBundleCompat', () => {
     expect(SUPPORTED_MOBILE_WEB_BUNDLE_SCHEMA_VERSIONS).toContain(MOBILE_WEB_BUNDLE_SCHEMA_VERSION)
   })
 })
+
+/** The shell requires a page at least as new as itself; an older desktop is walled, never served. */
+describe('the page floor', () => {
+  const tooOld = (pageVersion: number) => ({
+    kind: 'blocked',
+    reason: 'bundle-incompatible',
+    side: 'desktop',
+    pageVersion,
+    requiredPageVersion: 1
+  })
+
+  it('walls a desktop whose page is older than this shell, as a desktop to update', () => {
+    expect(evaluate({ manifest: manifest({ pageVersion: 0 }) })).toEqual(tooOld(0))
+  })
+
+  it('reads a manifest with no page version as older than the floor', () => {
+    const { schemaVersion, runtimeProtocolVersion, minCompatibleRuntimeProtocolVersion } =
+      manifest()
+    const unversioned = {
+      schemaVersion,
+      runtimeProtocolVersion,
+      minCompatibleRuntimeProtocolVersion
+    }
+    expect(evaluate({ manifest: unversioned })).toEqual(tooOld(0))
+  })
+
+  it('opens a page at the floor and one above it', () => {
+    expect(evaluate({ manifest: manifest({ pageVersion: 1 }) })).toEqual({
+      kind: 'ok',
+      manifestChecked: true
+    })
+    expect(evaluate({ manifest: manifest({ pageVersion: 7 }) })).toEqual({
+      kind: 'ok',
+      manifestChecked: true
+    })
+  })
+})
diff --git a/mobile/src/transport/mobile-web-bundle-compat.ts b/mobile/src/transport/mobile-web-bundle-compat.ts
index b331540df669..d039816be14b 100644
--- a/mobile/src/transport/mobile-web-bundle-compat.ts
+++ b/mobile/src/transport/mobile-web-bundle-compat.ts
@@ -1,6 +1,10 @@
 import { MOBILE_WEB_BUNDLE_CAPABILITY } from '../../../src/shared/mobile-web-bundle/mobile-web-bundle-capability'
 import type { HostStatusReply } from './host-status-reply-schema'
 
+/** The oldest page this shell serves: the `MOBILE_WEB_PAGE_VERSION` of the page built beside it. An
+ *  older desktop is walled rather than served, so the shell keeps no path for an older page. */
+export const MOBILE_WEB_PAGE_VERSION_FLOOR = 1
+
 /** The manifest schemas this app shell can mount. Widening it is a shell release, so the list is
  *  stated here rather than read off the contract's current version: the contract names the schema
  *  the desktop writes, which is exactly the number this shell may not recognise. */
@@ -24,6 +28,8 @@ export type MobileWebBundleCompatManifest = {
   schemaVersion: number
   runtimeProtocolVersion: number
   minCompatibleRuntimeProtocolVersion: number
+  /** Absent from a desktop older than the field, which reads as 0: below every floor. */
+  pageVersion?: number
 }
 
 export type MobileWebBundleCompatVerdict =
@@ -42,6 +48,14 @@ export type MobileWebBundleCompatVerdict =
       hostProtocolVersion: number
       requiredHostProtocolVersion: number
     }
+  /** The host serves a page older than this shell's floor. */
+  | {
+      kind: 'blocked'
+      reason: 'bundle-incompatible'
+      side: 'desktop'
+      pageVersion: number
+      requiredPageVersion: number
+    }
   /** The bundle is older than the host expects; the caller refetches. */
   | {
       kind: 'blocked'
@@ -90,6 +104,16 @@ export function evaluateMobileWebBundleCompat(input: {
       schemaVersion: manifest.schemaVersion
     }
   }
+  const pageVersion = manifest.pageVersion ?? 0
+  if (pageVersion < MOBILE_WEB_PAGE_VERSION_FLOOR) {
+    return {
+      kind: 'blocked',
+      reason: 'bundle-incompatible',
+      side: 'desktop',
+      pageVersion,
+      requiredPageVersion: MOBILE_WEB_PAGE_VERSION_FLOOR
+    }
+  }
   const hostProtocolVersion = input.hostStatus.protocolVersion ?? 0
   if (hostProtocolVersion < manifest.minCompatibleRuntimeProtocolVersion) {
     return {
diff --git a/mobile/src/transport/mobile-web-bundle-reply-schemas.test.ts b/mobile/src/transport/mobile-web-bundle-reply-schemas.test.ts
index ca00eca79515..57f5618763ab 100644
--- a/mobile/src/transport/mobile-web-bundle-reply-schemas.test.ts
+++ b/mobile/src/transport/mobile-web-bundle-reply-schemas.test.ts
@@ -55,6 +55,7 @@ function manifestReply(overrides: Record<string, unknown> = {}) {
     desktopVersion: '1.4.200',
     minCompatibleRuntimeProtocolVersion: 2,
     runtimeProtocolVersion: 2,
+    pageVersion: 1,
     entrypoint: 'index.html',
     totalBytes: 12,
     assets: [asset()],
@@ -234,6 +235,16 @@ describe('mobile web bundle manifest reply reader', () => {
     expect(verdict).toEqual({ kind: 'ok', manifestChecked: true })
   })
 
+  it('reads the page version the floor compares, and one a desktop older than it never wrote', () => {
+    expect(MobileWebBundleManifestReplySchema.parse(manifestReply()).manifest.pageVersion).toBe(1)
+    expect(readManifest(manifestReply({ pageVersion: undefined })).compatible).toBe(true)
+    for (const pageVersion of [-1, 1.5, 'one', null]) {
+      expect(readManifest(manifestReply({ pageVersion })).compatible, String(pageVersion)).toBe(
+        false
+      )
+    }
+  })
+
   it('refuses a manifest with no protocol window, which only a host without the capability sends', () => {
     expect(readManifest(manifestReply({ runtimeProtocolVersion: undefined })).compatible).toBe(
       false
diff --git a/mobile/src/transport/mobile-web-bundle-reply-schemas.ts b/mobile/src/transport/mobile-web-bundle-reply-schemas.ts
index ea68e7dbd142..be9b7bf40add 100644
--- a/mobile/src/transport/mobile-web-bundle-reply-schemas.ts
+++ b/mobile/src/transport/mobile-web-bundle-reply-schemas.ts
@@ -72,6 +72,7 @@ export const MobileWebBundleManifestReadSchema = z
     buildId: z.string().regex(SHA256_PATTERN),
     minCompatibleRuntimeProtocolVersion: z.number().int().nonnegative(),
     runtimeProtocolVersion: z.number().int().nonnegative(),
+    pageVersion: z.number().int().nonnegative().optional(),
     entrypoint: MobileWebBundleAssetPathSchema,
     totalBytes: z.number().int().nonnegative().max(MOBILE_WEB_BUNDLE_MAX_TOTAL_BYTES),
     assets: z.array(assetSchema).min(1).max(MOBILE_WEB_BUNDLE_MAX_ASSETS),
diff --git a/mobile/src/transport/mobile-web-page-version-floor.test.ts b/mobile/src/transport/mobile-web-page-version-floor.test.ts
new file mode 100644
index 000000000000..284e136e7cc8
--- /dev/null
+++ b/mobile/src/transport/mobile-web-page-version-floor.test.ts
@@ -0,0 +1,9 @@
+import { describe, expect, it } from 'vitest'
+import { MOBILE_WEB_PAGE_VERSION } from '../../../src/shared/mobile-web-bundle/manifest-contract'
+import { MOBILE_WEB_PAGE_VERSION_FLOOR } from './mobile-web-bundle-compat'
+
+describe("the shell's page floor", () => {
+  it('never requires a page newer than the one built beside this shell', () => {
+    expect(MOBILE_WEB_PAGE_VERSION_FLOOR).toBeLessThanOrEqual(MOBILE_WEB_PAGE_VERSION)
+  })
+})
diff --git a/mobile/src/transport/paired-host-writer-census.test.ts b/mobile/src/transport/paired-host-writer-census.test.ts
deleted file mode 100644
index aa7ac0c4f564..000000000000
--- a/mobile/src/transport/paired-host-writer-census.test.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Who may write a whole host profile: pairing, which creates or re-pairs it.
- *
- * A relay learner (supervisor, credential rotation, direct upgrade) holds a snapshot taken when its
- * connection opened, so a full-profile save from it reverts any Edit Host made since. Those write
- * through `setRelayRouting`, which takes no profile.
- */
-import { readFileSync } from 'node:fs'
-import { join, relative } from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-import { censusSourceFiles } from '../test-support/census-source-files'
-
-const MOBILE_DIR = fileURLToPath(new URL('../../', import.meta.url))
-
-const PAIRING_WRITERS = [
-  'src/transport/mobile-relay-pairing-recovery.ts',
-  'src/transport/pre-profile-pairing-coordinator.ts'
-]
-
-// A value import of `savePairedHost` from the host store, at any relative depth.
-const IMPORTS_PAIRED_HOST_WRITER =
-  /import\s*\{[^}]*\bsavePairedHost\b[^}]*\}\s*from\s*['"](?:\.{1,2}\/)+(?:[\w-]+\/)*host-store['"]/
-
-function importingFiles(): string[] {
-  return ['src', 'app']
-    .flatMap((directory) => censusSourceFiles(join(MOBILE_DIR, directory)))
-    .filter((file) => /\.tsx?$/.test(file) && !/\.test\.tsx?$/.test(file))
-    .filter((file) => IMPORTS_PAIRED_HOST_WRITER.test(readFileSync(file, 'utf8')))
-    .map((file) => relative(MOBILE_DIR, file))
-    .sort()
-}
-
-describe('full host profile writes', () => {
-  it('are reachable only from pairing', () => {
-    // Also the presence precondition: both creators must match, or the matcher is broken.
-    expect(importingFiles()).toEqual(PAIRING_WRITERS)
-  })
-})
diff --git a/mobile/src/transport/rpc-client-runtime-events.test.ts b/mobile/src/transport/rpc-client-runtime-events.test.ts
index 04b2a90039eb..ce035f63b0bc 100644
--- a/mobile/src/transport/rpc-client-runtime-events.test.ts
+++ b/mobile/src/transport/rpc-client-runtime-events.test.ts
@@ -136,4 +136,30 @@ describe('runtime client-event stream disposal', () => {
     ])
     client.close()
   })
+
+  it('releases the replayed registration on the new socket when disposed before its ready', async () => {
+    const { client, socket: first } = connectReadyClient()
+    const unsubscribe = client.subscribe('runtime.clientEvents.subscribe', null, () => {})
+    const request = sentRequests(first, 'runtime.clientEvents.subscribe')[0]!
+    emitReady(first, request.id, 'runtime-events:first-socket')
+
+    first.close()
+    await vi.advanceTimersByTimeAsync(500)
+    const second = sockets.at(-1)!
+    expect(second).not.toBe(first)
+    second.open()
+    second.receive(JSON.stringify({ type: 'e2ee_ready' }))
+    second.receive('encrypted:{"type":"e2ee_authenticated"}')
+    expect(sentRequests(second, 'runtime.clientEvents.subscribe')).toEqual([
+      expect.objectContaining({ id: request.id })
+    ])
+
+    unsubscribe()
+    emitReady(second, request.id, 'runtime-events:second-socket')
+
+    expect(sentRequests(second, 'runtime.clientEvents.unsubscribe')).toEqual([
+      expect.objectContaining({ params: { subscriptionId: 'runtime-events:second-socket' } })
+    ])
+    client.close()
+  })
 })
diff --git a/mobile/src/transport/rpc-client-session-tabs-stream.ts b/mobile/src/transport/rpc-client-session-tabs-stream.ts
new file mode 100644
index 000000000000..f98a7586921d
--- /dev/null
+++ b/mobile/src/transport/rpc-client-session-tabs-stream.ts
@@ -0,0 +1,34 @@
+import { isSnapshotResult } from './rpc-subscription-result-shapes'
+
+type SessionTabsStreamState = {
+  method: string
+  sent?: boolean
+  receivedSnapshot?: boolean
+  cancelled?: boolean
+}
+
+/** Older hosts register a tabs stream only as they emit the first snapshot, so an earlier unsubscribe
+ *  finds nothing there. Newer hosts register on arrival and still send that snapshot, so the hold only delays. */
+function awaitsRegistration(stream: SessionTabsStreamState): boolean {
+  return (
+    stream.method === 'session.tabs.subscribe' && stream.sent === true && !stream.receivedSnapshot
+  )
+}
+
+/** Cancels a stream still awaiting its first snapshot; that snapshot then triggers the unsubscribe. */
+export function holdUnsubscribe(stream: SessionTabsStreamState): boolean {
+  if (!awaitsRegistration(stream)) {
+    return false
+  }
+  stream.cancelled = true
+  return true
+}
+
+/** Returns true when `result` is the tabs stream's snapshot, i.e. the host has registered it. */
+export function recordSnapshot(stream: SessionTabsStreamState, result: unknown): boolean {
+  if (stream.method !== 'session.tabs.subscribe' || !isSnapshotResult(result)) {
+    return false
+  }
+  stream.receivedSnapshot = true
+  return true
+}
diff --git a/mobile/src/transport/rpc-client-stream-registry.test.ts b/mobile/src/transport/rpc-client-stream-registry.test.ts
index 0e7d561be6e3..ce2103336189 100644
--- a/mobile/src/transport/rpc-client-stream-registry.test.ts
+++ b/mobile/src/transport/rpc-client-stream-registry.test.ts
@@ -79,6 +79,139 @@ describe('RpcClientStreamRegistry', () => {
     ])
   })
 
+  it('unsubscribes a session tabs stream by its own request id', () => {
+    const { registry, sent } = createRegistry()
+    const disposeOlder = registry.subscribe(
+      'session.tabs.subscribe',
+      { worktree: 'wt-1' },
+      () => {}
+    )
+    registry.subscribe('session.tabs.subscribe', { worktree: 'wt-1' }, () => {})
+    const [older, newer] = sent
+    registry.handleResponse(streamingResponse(older!.id, { type: 'snapshot', tabs: [] }))
+
+    disposeOlder()
+
+    // Without the request id the host sweeps every stream for the worktree, including the newer one.
+    expect(sent[2]).toMatchObject({
+      method: 'session.tabs.unsubscribe',
+      params: { worktree: 'wt-1', subscriptionId: older!.id }
+    })
+    expect(newer!.id).not.toBe(older!.id)
+    expect(sent).toHaveLength(3)
+  })
+
+  it('holds a session tabs unsubscribe until the host registers the stream', () => {
+    const { registry, sent } = createRegistry()
+    const events: unknown[] = []
+    const dispose = registry.subscribe('session.tabs.subscribe', { worktree: 'wt-1' }, (event) =>
+      events.push(event)
+    )
+    const subscribe = sent[0]!
+
+    dispose()
+    // Older hosts register only as they emit the first snapshot, so an earlier unsubscribe finds nothing.
+    expect(sent).toHaveLength(1)
+
+    registry.handleResponse(streamingResponse(subscribe.id, { type: 'snapshot', tabs: [] }))
+
+    expect(sent[1]).toMatchObject({
+      method: 'session.tabs.unsubscribe',
+      params: { worktree: 'wt-1', subscriptionId: subscribe.id }
+    })
+    // A host that registered on arrival ends the stream; that end must not unsubscribe again.
+    registry.handleResponse(streamingResponse(subscribe.id, { type: 'end' }))
+    expect(sent).toHaveLength(2)
+    expect(events).toEqual([])
+    expect(registry.size()).toBe(0)
+  })
+
+  it('holds a session tabs unsubscribe again after a reconnect replays the stream', () => {
+    const { registry, sent } = createRegistry()
+    const dispose = registry.subscribe('session.tabs.subscribe', { worktree: 'wt-1' }, () => {})
+    const subscribe = sent[0]!
+    registry.handleResponse(streamingResponse(subscribe.id, { type: 'snapshot', tabs: [] }))
+
+    registry.markForReplay()
+    registry.replayAfterAuthentication()
+    dispose()
+
+    expect(sent.map((request) => request.method)).toEqual([
+      'session.tabs.subscribe',
+      'session.tabs.subscribe'
+    ])
+    registry.handleResponse(streamingResponse(subscribe.id, { type: 'snapshot', tabs: [] }))
+    expect(sent[2]).toMatchObject({
+      method: 'session.tabs.unsubscribe',
+      params: { worktree: 'wt-1', subscriptionId: subscribe.id }
+    })
+  })
+
+  it('drops a held session tabs unsubscribe when the subscribe fails or reconnects first', () => {
+    const { registry, sent } = createRegistry()
+    const events: unknown[] = []
+    const disposeFailed = registry.subscribe(
+      'session.tabs.subscribe',
+      { worktree: 'wt-1' },
+      (event) => events.push(event)
+    )
+    const disposeReplayed = registry.subscribe(
+      'session.tabs.subscribe',
+      { worktree: 'wt-2' },
+      () => {}
+    )
+    const failed = sent[0]!
+    disposeFailed()
+    disposeReplayed()
+
+    registry.handleResponse({
+      id: failed.id,
+      ok: false,
+      error: { code: 'worktree_not_found', message: 'Worktree not found' }
+    })
+    registry.markForReplay()
+    registry.replayAfterAuthentication()
+
+    expect(sent).toHaveLength(2)
+    expect(events).toEqual([])
+    expect(registry.size()).toBe(0)
+  })
+
+  it('ends one transcript stream on dispose and leaves a sibling on the same socket (U-03)', () => {
+    const { registry, sent } = createRegistry()
+    const disposeFirst = registry.subscribe('agentSession.subscribe', { sessionId: 's1' }, () => {})
+    registry.subscribe('agentSession.subscribe', { sessionId: 's2' }, () => {})
+    const [first] = sent
+
+    disposeFirst()
+    expect(sent.at(-1)).toMatchObject({
+      method: 'agentSession.unsubscribe',
+      params: { sessionId: 's1', subscriptionId: first!.id }
+    })
+    expect(sent.filter((request) => request.method === 'agentSession.unsubscribe')).toHaveLength(1)
+  })
+
+  it('names the terminal request it sent when unsubscribing, and keeps the slot for older hosts', () => {
+    const { registry, sent } = createRegistry()
+    const dispose = registry.subscribe(
+      'terminal.subscribe',
+      { terminal: 'term-1', client: { id: 'phone-1', type: 'mobile' } },
+      () => {}
+    )
+    const subscribe = sent[0]!
+
+    dispose()
+
+    expect(sent[1]).toMatchObject({
+      method: 'terminal.unsubscribe',
+      params: {
+        subscriptionId: 'term-1:phone-1',
+        client: { id: 'phone-1' },
+        requestId: subscribe.id
+      }
+    })
+  })
+
   it('keeps a disposed browser tombstone until ready can be unsubscribed', () => {
     const { registry, sent } = createRegistry()
     const dispose = registry.subscribe('browser.screencast', { page: 'page-1' }, () => {})
@@ -98,4 +231,105 @@ describe('RpcClientStreamRegistry', () => {
       params: { subscriptionId: 'browser-screencast:page-1:test' }
     })
   })
+
+  it('releases a replayed browser stream replaced by a new one before its ready', () => {
+    const { registry, sent } = createRegistry()
+    registry.subscribe('browser.screencast', { page: 'page-1' }, () => {})
+    const replayedId = sent[0]!.id
+    registry.handleResponse(
+      streamingResponse(replayedId, { type: 'ready', subscriptionId: 'page-1-old-connection' })
+    )
+
+    registry.markForReplay()
+    registry.replayAfterAuthentication()
+    registry.subscribe('browser.screencast', { page: 'page-2' }, () => {})
+    const replacementId = sent.at(-1)!.id
+    registry.handleResponse(
+      streamingResponse(replayedId, { type: 'ready', subscriptionId: 'page-1-new-connection' })
+    )
+    registry.handleResponse(
+      streamingResponse(replacementId, { type: 'ready', subscriptionId: 'page-2' })
+    )
+
+    expect(
+      sent
+        .filter((request) => request.method === 'browser.screencast.unsubscribe')
+        .map((request) => request.params)
+    ).toEqual([{ subscriptionId: 'page-1-new-connection' }])
+    expect(registry.size()).toBe(1)
+  })
+
+  describe.each([
+    ['runtime.clientEvents.subscribe', 'runtime.clientEvents.unsubscribe', null],
+    ['browser.screencast', 'browser.screencast.unsubscribe', { page: 'page-1' }]
+  ])('%s ready id across a replay', (method, unsubscribeMethod, params) => {
+    function unsubscribes(sent: SentRequest[]): unknown[] {
+      return sent.filter((request) => request.method === unsubscribeMethod).map((r) => r.params)
+    }
+
+    function subscribeReady() {
+      const harness = createRegistry()
+      const dispose = harness.registry.subscribe(method, params, () => {})
+      const requestId = harness.sent[0]!.id
+      harness.registry.handleResponse(
+        streamingResponse(requestId, { type: 'ready', subscriptionId: 'old-connection-id' })
+      )
+      return { ...harness, dispose, requestId }
+    }
+
+    it('releases the replayed registration when disposed before its new ready', () => {
+      const { registry, sent, dispose, requestId } = subscribeReady()
+
+      registry.markForReplay()
+      registry.replayAfterAuthentication()
+      dispose()
+      registry.handleResponse(
+        streamingResponse(requestId, { type: 'ready', subscriptionId: 'new-connection-id' })
+      )
+
+      expect(unsubscribes(sent)).toEqual([{ subscriptionId: 'new-connection-id' }])
+    })
+
+    it('forgets the previous connection id when marked for replay', () => {
+      const { registry, sent, dispose } = subscribeReady()
+
+      registry.markForReplay()
+      dispose()
+
+      // A disposal while disconnected has nothing to name on the next connection.
+      expect(unsubscribes(sent)).toEqual([])
+      expect(registry.size()).toBe(0)
+    })
+
+    it('still releases a stream cancelled before its first ready', () => {
+      const { registry, sent } = createRegistry()
+      const dispose = registry.subscribe(method, params, () => {})
+      const requestId = sent[0]!.id
+
+      dispose()
+      expect(unsubscribes(sent)).toEqual([])
+      registry.handleResponse(
+        streamingResponse(requestId, { type: 'ready', subscriptionId: 'first-id' })
+      )
+
+      expect(unsubscribes(sent)).toEqual([{ subscriptionId: 'first-id' }])
+      expect(registry.size()).toBe(0)
+    })
+
+    it('sends one unsubscribe however often the stream is disposed', () => {
+      const { registry, sent, dispose, requestId } = subscribeReady()
+
+      registry.markForReplay()
+      registry.replayAfterAuthentication()
+      dispose()
+      dispose()
+      registry.handleResponse(
+        streamingResponse(requestId, { type: 'ready', subscriptionId: 'new-connection-id' })
+      )
+      dispose()
+
+      expect(unsubscribes(sent)).toEqual([{ subscriptionId: 'new-connection-id' }])
+      expect(registry.size()).toBe(0)
+    })
+  })
 })
diff --git a/mobile/src/transport/rpc-client-stream-registry.ts b/mobile/src/transport/rpc-client-stream-registry.ts
index 68e50a6e6ddf..4062e80b49b5 100644
--- a/mobile/src/transport/rpc-client-stream-registry.ts
+++ b/mobile/src/transport/rpc-client-stream-registry.ts
@@ -14,6 +14,7 @@ import {
   isTerminalSubscribedResult
 } from './rpc-subscription-result-shapes'
 import { RpcClientTerminalStreamRouter } from './rpc-client-terminal-stream-router'
+import * as sessionTabsStream from './rpc-client-session-tabs-stream'
 import type { ConnectionState, RpcResponse, RpcSuccess } from './types'
 
 export type RpcStreamingListener = (result: unknown) => void
@@ -30,6 +31,7 @@ type StreamRequest = {
   subscriptionId?: string
   cancelled?: boolean
   sent?: boolean
+  receivedSnapshot?: boolean
 }
 
 type StreamRegistryOptions = {
@@ -108,6 +110,9 @@ export class RpcClientStreamRegistry {
     this.pendingBrowserRequestId = null
     for (const [id, stream] of this.streams) {
       stream.sent = false
+      stream.receivedSnapshot = false
+      // The id named a registration on the closed socket; the replay's ready brings the new one.
+      stream.subscriptionId = undefined
       this.resetTerminalRouting(id)
     }
   }
@@ -167,6 +172,10 @@ export class RpcClientStreamRegistry {
       return
     }
     const result = response.result
+    if (sessionTabsStream.recordSnapshot(stream, result) && stream.cancelled) {
+      this.dispose(response.id)
+      return
+    }
     if (isStreamingSubscriptionReadyResult(result)) {
       stream.subscriptionId = result.subscriptionId
       if (stream.cancelled) {
@@ -210,10 +219,13 @@ export class RpcClientStreamRegistry {
     if (stream?.method === 'terminal.subscribe') {
       const params = buildTerminalUnsubscribeParams(stream.params)
       if (params) {
-        this.sendRpc('terminal.unsubscribe', params)
+        // Why: `requestId` names this exact request; hosts that predate it strip it and use the slot.
+        this.sendRpc('terminal.unsubscribe', { ...params, requestId: id })
       }
+    } else if (stream && sessionTabsStream.holdUnsubscribe(stream)) {
+      return
     } else {
-      const unsubscribe = buildStreamUnsubscribe(stream?.method, stream?.params)
+      const unsubscribe = buildStreamUnsubscribe(stream?.method, stream?.params, id)
       if (unsubscribe) {
         this.sendRpc(unsubscribe.method, unsubscribe.params)
       }
diff --git a/mobile/src/transport/rpc-client-terminal-subscription.ts b/mobile/src/transport/rpc-client-terminal-subscription.ts
index 405f7f1d9e00..2bed2ab0458f 100644
--- a/mobile/src/transport/rpc-client-terminal-subscription.ts
+++ b/mobile/src/transport/rpc-client-terminal-subscription.ts
@@ -53,6 +53,14 @@ export function buildStreamUnsubscribe(
         }
       : null
   }
+  if (method === 'agentSession.subscribe') {
+    const sessionId = (params as { sessionId?: unknown }).sessionId
+    // The host keys each transcript stream by its frame id; without it every stream of the
+    // session on this socket would end.
+    return typeof sessionId === 'string' && requestId
+      ? { method: 'agentSession.unsubscribe', params: { sessionId, subscriptionId: requestId } }
+      : null
+  }
   if (method === 'nativeChat.subscribe') {
     const subscriptionId = (params as { subscriptionId?: unknown }).subscriptionId
     if (typeof subscriptionId === 'string') {
diff --git a/mobile/src/transport/rpc-client.test.ts b/mobile/src/transport/rpc-client.test.ts
index e88e6c220e6c..ff290f72b84c 100644
--- a/mobile/src/transport/rpc-client.test.ts
+++ b/mobile/src/transport/rpc-client.test.ts
@@ -196,12 +196,21 @@ describe('mobile rpc-client connection timeout', () => {
       { worktree: 'id:wt-1' },
       () => {}
     )
+    const request = sentRequest(socket, 'session.tabs.subscribe')
+    socket.receive(
+      `encrypted:${JSON.stringify({
+        id: request.id,
+        ok: true,
+        streaming: true,
+        result: { type: 'snapshot', worktree: 'id:wt-1', tabs: [] },
+        _meta: { runtimeId: 'r1' }
+      })}`
+    )
     unsubscribe()
 
-    expect(
-      socket.sent.some((payload) => payload.includes('"method":"session.tabs.unsubscribe"'))
-    ).toBe(true)
-    expect(socket.sent.some((payload) => payload.includes('"worktree":"id:wt-1"'))).toBe(true)
+    expect(sentRequests(socket, 'session.tabs.unsubscribe')).toEqual([
+      expect.objectContaining({ params: { worktree: 'id:wt-1', subscriptionId: request.id } })
+    ])
 
     client.close()
   })
diff --git a/mobile/src/transport/rpc-subscription-result-shapes.ts b/mobile/src/transport/rpc-subscription-result-shapes.ts
index cf09acdb6ca6..4c624658126a 100644
--- a/mobile/src/transport/rpc-subscription-result-shapes.ts
+++ b/mobile/src/transport/rpc-subscription-result-shapes.ts
@@ -19,3 +19,7 @@ export function isStreamingSubscriptionReadyResult(
     typeof (value as { subscriptionId?: unknown }).subscriptionId === 'string'
   )
 }
+
+export function isSnapshotResult(value: unknown): value is { type: 'snapshot' } {
+  return typeof value === 'object' && value !== null && 'type' in value && value.type === 'snapshot'
+}
diff --git a/mobile/src/transport/runtime-status-probe.test.ts b/mobile/src/transport/runtime-status-probe.test.ts
index 93b36d6dc2f0..697a0e7d85f1 100644
--- a/mobile/src/transport/runtime-status-probe.test.ts
+++ b/mobile/src/transport/runtime-status-probe.test.ts
@@ -92,4 +92,31 @@ describe('startRuntimeStatusProbe', () => {
     expect(calls()).toBe(3)
     cancel()
   })
+
+  it('reports each failed attempt once its retry is scheduled, and never an answer', async () => {
+    const { client } = makeClient([
+      new Error('request timed out'),
+      new LogicalClientCutoverError(),
+      ok(null)
+    ])
+    const seen: (HostStatusReply | null)[] = []
+    let failed = 0
+    const cancel = startRuntimeStatusProbe(
+      client,
+      (status) => seen.push(status),
+      () => {
+        failed += 1
+      }
+    )
+    await flushMicrotasks()
+    expect(failed).toBe(1)
+    await vi.advanceTimersByTimeAsync(1_000)
+    await flushMicrotasks()
+    expect(failed).toBe(2)
+    await vi.advanceTimersByTimeAsync(250)
+    await flushMicrotasks()
+    expect(seen).toEqual([null])
+    expect(failed).toBe(2)
+    cancel()
+  })
 })
diff --git a/mobile/src/transport/runtime-status-probe.ts b/mobile/src/transport/runtime-status-probe.ts
index 1d748e1e6852..08e0943e1b0b 100644
--- a/mobile/src/transport/runtime-status-probe.ts
+++ b/mobile/src/transport/runtime-status-probe.ts
@@ -15,12 +15,16 @@ const FAILURE_RETRY_MAX_DELAY_MS = 15_000
  * answered something this build cannot decode — an answer, not a failure, so it is delivered
  * rather than retried. A refusal or transport rejection schedules a retry instead.
  *
+ * `onAttemptFailed` runs on each refusal or rejection, once its retry is scheduled, for a caller
+ * that must show something while the probe keeps asking.
+ *
  * The parameter names the raw port rather than RpcClient because one of the capability callers
  * holds only the sender; the request itself goes through hostStatusProbe.
  */
 export function startRuntimeStatusProbe(
   client: UnvalidatedRpcRequestPort,
-  onStatus: (status: HostStatusReply | null) => void
+  onStatus: (status: HostStatusReply | null) => void,
+  onAttemptFailed?: () => void
 ): () => void {
   let cancelled = false
   let retryTimer: ReturnType<typeof setTimeout> | null = null
@@ -55,6 +59,7 @@ export function startRuntimeStatusProbe(
       ? CUTOVER_RETRY_DELAY_MS
       : Math.min(FAILURE_RETRY_BASE_DELAY_MS * 2 ** failureRetries++, FAILURE_RETRY_MAX_DELAY_MS)
     retryTimer = setTimeout(attempt, delay)
+    onAttemptFailed?.()
   }
 
   attempt()
diff --git a/mobile/src/transport/settings-host-client-lifecycle.test.ts b/mobile/src/transport/settings-host-client-lifecycle.test.ts
index e6c55117e0d9..44a9a94f86ae 100644
--- a/mobile/src/transport/settings-host-client-lifecycle.test.ts
+++ b/mobile/src/transport/settings-host-client-lifecycle.test.ts
@@ -44,6 +44,9 @@ vi.mock('./host-store', () => ({
 vi.mock('./connection-revival-triggers', () => ({
   subscribeConnectionRevivalTriggers: () => () => {}
 }))
+vi.mock('./connection-log-background-flush', () => ({
+  subscribeConnectionLogBackgroundFlush: () => () => {}
+}))
 
 type FakeClient = RpcClient & {
   closeMock: ReturnType<typeof vi.fn>
diff --git a/mobile/src/transport/timer-receiver-census.test.ts b/mobile/src/transport/timer-receiver-census.test.ts
deleted file mode 100644
index d6cc23bee2fe..000000000000
--- a/mobile/src/transport/timer-receiver-census.test.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { relative } from 'node:path'
-import { fileURLToPath } from 'node:url'
-import ts from 'typescript-api'
-import { describe, expect, it } from 'vitest'
-import { censusSourceFiles } from '../test-support/census-source-files'
-
-const SOURCE_ROOT = fileURLToPath(new URL('..', import.meta.url))
-const TIMER_GLOBALS = new Set(['setTimeout', 'clearTimeout', 'setInterval', 'clearInterval'])
-const GLOBAL_RECEIVERS = new Set(['global', 'globalThis', 'window'])
-const SHARED_DEFAULTS = new Set(['defaultScheduleTimer', 'defaultCancelTimer'])
-
-// Sites that take their default from timer-scheduler; the census is meaningless if it
-// cannot see them, so an empty or misdirected walk fails instead of passing vacuously.
-const SHARED_DEFAULT_SITES = [
-  'files/mobile-file-preview-navigation.ts',
-  'transport/host-open-retry-scheduler.ts',
-  'transport/mobile-endpoint-lifecycle.ts',
-  'transport/mobile-endpoint-supervisor-test-fakes.ts',
-  'transport/rpc-session-liveness-watchdog.ts'
-]
-
-const PARKING_OPERATORS = new Set([
-  ts.SyntaxKind.QuestionQuestionToken,
-  ts.SyntaxKind.QuestionQuestionEqualsToken,
-  ts.SyntaxKind.BarBarToken,
-  ts.SyntaxKind.BarBarEqualsToken
-])
-
-type Census = { parked: string[]; shared: string[] }
-
-function productFiles(): string[] {
-  return censusSourceFiles(SOURCE_ROOT)
-    .map((path) => relative(SOURCE_ROOT, path).replaceAll('\\', '/'))
-    .filter((entry) => /\.tsx?$/.test(entry) && !/\.test\.tsx?$/.test(entry))
-}
-
-function timerName(node: ts.Node): string | null {
-  if (ts.isIdentifier(node) && TIMER_GLOBALS.has(node.text)) {
-    return node.text
-  }
-  if (
-    ts.isPropertyAccessExpression(node) &&
-    TIMER_GLOBALS.has(node.name.text) &&
-    ts.isIdentifier(node.expression) &&
-    GLOBAL_RECEIVERS.has(node.expression.text)
-  ) {
-    return node.name.text
-  }
-  return null
-}
-
-// The receiver is only lost once the function is parked somewhere a later call reaches
-// through: a nullish/logical default, an object literal member, or an assignment onto a
-// property. A plain local capture stays legal: calling it bare leaves the receiver undefined.
-function parkedTimer(node: ts.Node): ts.Node | null {
-  if (ts.isBinaryExpression(node)) {
-    const operator = node.operatorToken.kind
-    const parks =
-      PARKING_OPERATORS.has(operator) ||
-      (operator === ts.SyntaxKind.EqualsToken && ts.isPropertyAccessExpression(node.left))
-    return parks ? node.right : null
-  }
-  if (ts.isPropertyAssignment(node)) {
-    return node.initializer
-  }
-  if (ts.isShorthandPropertyAssignment(node)) {
-    return node.name
-  }
-  return null
-}
-
-function scanSource(relativePath: string, text: string, census: Census): void {
-  const sourceFile = ts.createSourceFile(relativePath, text, ts.ScriptTarget.Latest, true)
-  const visit = (node: ts.Node): void => {
-    const candidate = parkedTimer(node)
-    const name = candidate === null ? null : timerName(candidate)
-    if (candidate !== null && name !== null) {
-      const line = sourceFile.getLineAndCharacterOfPosition(candidate.getStart(sourceFile)).line + 1
-      census.parked.push(`${relativePath}:${line} ${name}`)
-    }
-    if (ts.isIdentifier(node) && SHARED_DEFAULTS.has(node.text)) {
-      census.shared.push(relativePath)
-    }
-    ts.forEachChild(node, visit)
-  }
-  visit(sourceFile)
-}
-
-function parkedIn(source: string): string[] {
-  const census: Census = { parked: [], shared: [] }
-  scanSource('fixture.ts', source, census)
-  return census.parked
-}
-
-describe('global timer receiver census', () => {
-  const census: Census = { parked: [], shared: [] }
-  for (const relativePath of productFiles()) {
-    scanSource(relativePath, readFileSync(`${SOURCE_ROOT}${relativePath}`, 'utf8'), census)
-  }
-
-  it('sees the shared receiver-free defaults, so an empty or misdirected walk cannot pass', () => {
-    expect(census.shared).toEqual(expect.arrayContaining(SHARED_DEFAULT_SITES))
-  })
-
-  it('parks no bare global timer where a later call would supply a non-global receiver', () => {
-    expect(census.parked).toEqual([])
-  })
-
-  it.each([
-    ['a nullish default', 'const schedule = injected ?? setTimeout'],
-    ['a logical default', 'const schedule = injected || setTimeout'],
-    ['a nullish assignment default', 'schedule ??= setTimeout'],
-    ['a logical assignment default', 'schedule ||= setTimeout'],
-    ['an object literal member', 'const deps = { setTimer: setTimeout }'],
-    ['a shorthand object member', 'const deps = { setTimeout }'],
-    ['an assignment onto a property', 'this.setTimer = setTimeout'],
-    ['a qualified global read', 'const deps = { setTimer: globalThis.setTimeout }']
-  ])('flags a global timer parked by %s', (_form, source) => {
-    expect(parkedIn(source)).toEqual(['fixture.ts:1 setTimeout'])
-  })
-
-  it('leaves a plain local capture alone, which a bare call invokes receiver-free', () => {
-    expect(parkedIn('const schedule = globalThis.setTimeout')).toEqual([])
-  })
-})
diff --git a/mobile/src/transport/unchecked-rpc-reader-boundary.test.ts b/mobile/src/transport/unchecked-rpc-reader-boundary.test.ts
index f452a7bd564b..463ba943cb5e 100644
--- a/mobile/src/transport/unchecked-rpc-reader-boundary.test.ts
+++ b/mobile/src/transport/unchecked-rpc-reader-boundary.test.ts
@@ -128,11 +128,6 @@ describe('unchecked RPC reader boundary', () => {
     expect(observed.size).toBe(inventory.length)
   })
 
-  it('lists each file once', () => {
-    const seen = inventory.map((entry) => entry.file)
-    expect(seen.filter((file, index) => seen.indexOf(file) !== index)).toEqual([])
-  })
-
   it('has no unlisted file holding an unchecked reader', () => {
     const listed = new Set(inventory.map((entry) => entry.file))
     const unlisted = [...observed.keys()].filter((file) => !listed.has(file))
diff --git a/mobile/src/worktree/agent-row-display.test.ts b/mobile/src/worktree/agent-row-display.test.ts
index ee872e40f266..47898017ff8e 100644
--- a/mobile/src/worktree/agent-row-display.test.ts
+++ b/mobile/src/worktree/agent-row-display.test.ts
@@ -1,13 +1,26 @@
 import { describe, expect, it } from 'vitest'
 import type { RuntimeWorktreeAgentRow } from '../../../src/shared/runtime-types'
+import {
+  agentMainAgentVerdict,
+  agentVerdictDisplayMark
+} from '../../../src/shared/agent-main-agent-verdict'
+import { AGENT_JOURNAL_TURN_OUTCOMES } from '../../../src/shared/agent-turn-outcome'
 import {
   AGENT_STATUS_STALE_AFTER_MS,
   agentDisplayLabel,
   agentDotState,
   agentIdentityLabel,
+  agentRowTimeAt,
+  agentRowVerdict,
+  agentRowVerdictMark,
   formatTimeAgo
 } from './agent-row-display'
 
+type Outcome = (typeof AGENT_JOURNAL_TURN_OUTCOMES)[number]
+const mainAgentDone = (outcome: Outcome, stateStartedAt = 0) => ({
+  mainAgent: { state: 'done' as const, outcome, stateStartedAt }
+})
+
 function row(overrides: Partial<RuntimeWorktreeAgentRow> = {}): RuntimeWorktreeAgentRow {
   return {
     paneKey: 'p',
@@ -37,8 +50,54 @@ describe('agentDotState', () => {
     expect(agentDotState(row({ state: 'unknown-state' as never }), 0)).toBe('idle')
   })
 
-  it('reports interrupted regardless of state', () => {
+  it('reports the verdict of a done row: failed, interrupted, or an old host legacy flag', () => {
     expect(agentDotState(row({ state: 'done', interrupted: true }), 0)).toBe('interrupted')
+    expect(agentDotState(row({ state: 'done', ...mainAgentDone('failure') }), 0)).toBe('failed')
+    expect(
+      agentDotState(row({ state: 'done', ...mainAgentDone('cancellation'), interrupted: true }), 0)
+    ).toBe('interrupted')
+    expect(agentDotState(row({ state: 'done', ...mainAgentDone('success') }), 0)).toBe('done')
+  })
+
+  it('shows a main agent that failed while its subagents still run as failed', () => {
+    expect(agentDotState(row({ state: 'working', ...mainAgentDone('failure') }), 0)).toBe('failed')
+    expect(agentDotState(row({ state: 'waiting', ...mainAgentDone('failure') }), 0)).toBe('failed')
+    // Only a failure outranks live work; a success or a stop with live subagents reads working.
+    expect(agentDotState(row({ state: 'working', ...mainAgentDone('success') }), 0)).toBe('working')
+    expect(
+      agentDotState(
+        row({ state: 'working', ...mainAgentDone('cancellation'), interrupted: true }),
+        0
+      )
+    ).toBe('working')
+  })
+
+  // The shared accessor cannot be imported by app code here, so this mirror must not drift from it.
+  it('agrees with the desktop verdict accessor on every row', () => {
+    const states = ['working', 'blocked', 'waiting', 'done'] as const
+    const mainAgents = [
+      undefined,
+      ...states.flatMap((state) =>
+        [undefined, ...AGENT_JOURNAL_TURN_OUTCOMES].map((outcome) => ({
+          state,
+          ...(outcome ? { outcome } : {}),
+          stateStartedAt: 0
+        }))
+      )
+    ]
+    for (const state of states) {
+      for (const mainAgent of mainAgents) {
+        for (const interrupted of [false, true]) {
+          const agentRow = { state, interrupted, ...(mainAgent ? { mainAgent } : {}) }
+          expect(agentRowVerdict(agentRow), JSON.stringify(agentRow)).toBe(
+            agentMainAgentVerdict(agentRow)
+          )
+          expect(agentRowVerdictMark(agentRow), JSON.stringify(agentRow)).toBe(
+            agentVerdictDisplayMark(agentRow)
+          )
+        }
+      }
+    }
   })
 
   it('decays a stale active state to idle, matching desktop', () => {
@@ -51,14 +110,36 @@ describe('agentDotState', () => {
     expect(
       agentDotState(row({ state: 'working', updatedAt: 0 }), AGENT_STATUS_STALE_AFTER_MS)
     ).toBe('working')
-    // 'done' never decays; interrupted still wins.
+    // 'done' never decays, and neither does its verdict.
     expect(agentDotState(row({ state: 'done', updatedAt: 0 }), stale)).toBe('done')
-    expect(agentDotState(row({ state: 'working', updatedAt: 0, interrupted: true }), stale)).toBe(
+    expect(agentDotState(row({ state: 'done', updatedAt: 0, interrupted: true }), stale)).toBe(
       'interrupted'
     )
   })
 })
 
+describe('agentRowTimeAt', () => {
+  it('dates a main agent that failed while its subagents run by its own failure', () => {
+    expect(
+      agentRowTimeAt(
+        row({ state: 'working', stateStartedAt: 100, ...mainAgentDone('failure', 900) })
+      )
+    ).toBe(900)
+  })
+
+  it('dates every other row by when its state began', () => {
+    expect(
+      agentRowTimeAt(
+        row({ state: 'working', stateStartedAt: 100, ...mainAgentDone('success', 900) })
+      )
+    ).toBe(100)
+    expect(
+      agentRowTimeAt(row({ state: 'done', stateStartedAt: 100, ...mainAgentDone('failure', 900) }))
+    ).toBe(100)
+    expect(agentRowTimeAt(row({ state: 'working', stateStartedAt: 100 }))).toBe(100)
+  })
+})
+
 describe('agentDisplayLabel', () => {
   it('prefers last message, then prompt, then state label', () => {
     expect(agentDisplayLabel(row({ lastAssistantMessage: 'hello there' }), 0)).toBe('hello there')
diff --git a/mobile/src/worktree/agent-row-display.ts b/mobile/src/worktree/agent-row-display.ts
index c678b522a152..da93aa392207 100644
--- a/mobile/src/worktree/agent-row-display.ts
+++ b/mobile/src/worktree/agent-row-display.ts
@@ -1,4 +1,5 @@
 import type { RuntimeWorktreeAgentRow } from '../../../src/shared/runtime-types'
+import type { AgentJournalTurnOutcome } from '../../../src/shared/agent-turn-outcome'
 
 // Mirrors the desktop AGENT_STATUS_STALE_AFTER_MS (src/shared/agent-status-types.ts:
 // 30 min). Defined locally rather than imported because a runtime-value import
@@ -17,13 +18,39 @@ export type AgentDotState =
   | 'done'
   | 'idle'
   | 'interrupted'
+  | 'failed'
+
+type AgentRowVerdictSource = Pick<RuntimeWorktreeAgentRow, 'state' | 'interrupted' | 'mainAgent'>
+
+// Mirrors desktop agentMainAgentVerdict and agentVerdictDisplayMark
+// (src/shared/agent-main-agent-verdict.ts); a parity test runs both over one table. `mainAgent` is
+// the main agent's own status, sent also while subagents hold the row working; an old host sends none.
+export function agentRowVerdict(row: AgentRowVerdictSource): AgentJournalTurnOutcome | null {
+  if (row.mainAgent && row.mainAgent.state !== 'done') {
+    return null
+  }
+  return row.mainAgent?.outcome ?? (row.state === 'done' && row.interrupted ? 'cancellation' : null)
+}
+
+// A failure outranks every state; a stop marks only a row that is itself done.
+export function agentRowVerdictMark(row: AgentRowVerdictSource): 'failed' | 'interrupted' | null {
+  const verdict = agentRowVerdict(row)
+  if (verdict === 'failure') {
+    return 'failed'
+  }
+  return verdict === 'cancellation' && row.state === 'done' ? 'interrupted' : null
+}
 
 export function agentDotState(
-  row: Pick<RuntimeWorktreeAgentRow, 'state' | 'workingMode' | 'interrupted' | 'updatedAt'>,
+  row: Pick<
+    RuntimeWorktreeAgentRow,
+    'state' | 'workingMode' | 'interrupted' | 'mainAgent' | 'updatedAt'
+  >,
   now: number
 ): AgentDotState {
-  if (row.interrupted) {
-    return 'interrupted'
+  const mark = agentRowVerdictMark(row)
+  if (mark) {
+    return mark
   }
   switch (row.state) {
     case 'blocked':
@@ -56,6 +83,8 @@ export function agentStateLabel(state: AgentDotState): string {
       return 'Waiting for input'
     case 'interrupted':
       return 'Interrupted'
+    case 'failed':
+      return 'Failed'
     case 'done':
       return 'Done'
     case 'idle':
@@ -99,6 +128,17 @@ export function agentIdentityLabel(agentType: string | null): string {
   return known[normalized] ?? normalized.slice(0, 2).toUpperCase()
 }
 
+// When the row's state began, except that a main agent that failed while its subagents run is
+// dated by its own failure. Mirrors desktop lastEnteredDoneAt (agent-finished-timestamp.ts).
+export function agentRowTimeAt(
+  row: Pick<RuntimeWorktreeAgentRow, 'state' | 'interrupted' | 'mainAgent' | 'stateStartedAt'>
+): number {
+  if (row.state !== 'done' && row.mainAgent && agentRowVerdictMark(row) === 'failed') {
+    return row.mainAgent.stateStartedAt
+  }
+  return row.stateStartedAt
+}
+
 // Relative time, matching desktop formatTimeAgo thresholds (just now / Xm / Xh / Xd).
 export function formatTimeAgo(ts: number, now: number): string {
   const delta = now - ts
diff --git a/mobile/src/worktree/home-resume-card.test.ts b/mobile/src/worktree/home-resume-card.test.ts
index 85c6cbab8ee6..04a02a7331cb 100644
--- a/mobile/src/worktree/home-resume-card.test.ts
+++ b/mobile/src/worktree/home-resume-card.test.ts
@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs'
 import { describe, expect, it } from 'vitest'
 import {
   isResumeTargetConfirmedMissing,
@@ -7,11 +6,6 @@ import {
 } from './home-resume-card'
 import type { HomeWorktreeSummary, HostWorktreeInfo } from './home-worktree-info'
 
-const resumeCardSource = readFileSync(
-  new URL('../home/MobileHomeResumeCard.tsx', import.meta.url),
-  'utf8'
-)
-
 function worktree(worktreeId: string): HomeWorktreeSummary {
   return {
     worktreeId,
@@ -121,11 +115,6 @@ describe('home resume card', () => {
       actionable: true
     })
   })
-
-  it('renders the home Resume card inert until its host connects', () => {
-    expect(resumeCardSource).toContain('disabled={!props.card.actionable}')
-    expect(resumeCardSource).toContain('!props.card.actionable && styles.cardDisabled')
-  })
 })
 
 // Why (F7): the card is drawn from a snapshot that can name a workspace the desktop deleted
diff --git a/mobile/src/worktree/workspace-list-picker-options.test.ts b/mobile/src/worktree/workspace-list-picker-options.test.ts
deleted file mode 100644
index b9964fc38502..000000000000
--- a/mobile/src/worktree/workspace-list-picker-options.test.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { WORKSPACE_SORT_OPTIONS } from './workspace-list-picker-options'
-
-describe('WORKSPACE_SORT_OPTIONS', () => {
-  it('keeps the persisted sort values stable for desktop compatibility', () => {
-    expect(WORKSPACE_SORT_OPTIONS.map((option) => option.value)).toEqual([
-      'smart',
-      'name',
-      'recent',
-      'repo',
-      'manual'
-    ])
-  })
-
-  it('keeps the smart sort value while showing the agent activity label', () => {
-    expect(WORKSPACE_SORT_OPTIONS.find((option) => option.value === 'smart')).toEqual({
-      value: 'smart',
-      label: 'Agent activity',
-      subtitle: 'Agents that need attention, then recent activity'
-    })
-  })
-})
diff --git a/mobile/src/worktree/worktree-list-snapshot.test.ts b/mobile/src/worktree/worktree-list-snapshot.test.ts
index c7c5756160ff..25c9ecbe852b 100644
--- a/mobile/src/worktree/worktree-list-snapshot.test.ts
+++ b/mobile/src/worktree/worktree-list-snapshot.test.ts
@@ -21,6 +21,13 @@ function agent(overrides: Partial<RuntimeWorktreeAgentRow> = {}): RuntimeWorktre
   }
 }
 
+function done(
+  outcome: 'success' | 'failure',
+  stateStartedAt = 1
+): NonNullable<RuntimeWorktreeAgentRow['mainAgent']> {
+  return { state: 'done', outcome, stateStartedAt }
+}
+
 function worktree(overrides: Partial<Worktree> = {}): Worktree {
   const worktreePath = join('/tmp', 'orca', 'worktrees', 'manta')
   return {
@@ -160,6 +167,31 @@ describe('areWorktreeListsEqual', () => {
     expect(areWorktreeListsEqual(first, second)).toBe(false)
   })
 
+  it('detects a verdict change that leaves the interrupted flag as it was', () => {
+    const first = [worktree({ agents: [agent({ state: 'done', mainAgent: done('success') })] })]
+    const second = [worktree({ agents: [agent({ state: 'done', mainAgent: done('failure') })] })]
+
+    expect(areWorktreeListsEqual(first, second)).toBe(false)
+  })
+
+  it('detects a main agent failing while its subagents keep the row working', () => {
+    const first = [worktree({ agents: [agent({ state: 'working' })] })]
+    const second = [worktree({ agents: [agent({ state: 'working', mainAgent: done('failure') })] })]
+
+    expect(areWorktreeListsEqual(first, second)).toBe(false)
+  })
+
+  it('detects the main agent clock moving, which dates a failure', () => {
+    const at = (stateStartedAt: number) => [
+      worktree({
+        agents: [agent({ state: 'working', mainAgent: done('failure', stateStartedAt) })]
+      })
+    ]
+
+    expect(areWorktreeListsEqual(at(1), at(2))).toBe(false)
+    expect(areWorktreeListsEqual(at(1), at(1))).toBe(true)
+  })
+
   it('detects monitoring mode changes within working', () => {
     const first = [worktree({ agents: [agent({ state: 'working' })] })]
     const second = [worktree({ agents: [agent({ state: 'working', workingMode: 'monitoring' })] })]
diff --git a/mobile/src/worktree/worktree-list-snapshot.ts b/mobile/src/worktree/worktree-list-snapshot.ts
index 8fa27c2a1979..250c871493fb 100644
--- a/mobile/src/worktree/worktree-list-snapshot.ts
+++ b/mobile/src/worktree/worktree-list-snapshot.ts
@@ -110,6 +110,7 @@ function areAgentRowsEqual(
       a.toolName !== b.toolName ||
       a.toolInput !== b.toolInput ||
       a.interrupted !== b.interrupted ||
+      !areMainAgentsEqual(a.mainAgent, b.mainAgent) ||
       a.stateStartedAt !== b.stateStartedAt ||
       a.updatedAt !== b.updatedAt
     ) {
@@ -118,3 +119,20 @@ function areAgentRowsEqual(
   }
   return true
 }
+
+function areMainAgentsEqual(
+  left: RuntimeWorktreeAgentRow['mainAgent'],
+  right: RuntimeWorktreeAgentRow['mainAgent']
+): boolean {
+  if (left === right) {
+    return true
+  }
+  if (!left || !right) {
+    return false
+  }
+  return (
+    left.state === right.state &&
+    left.outcome === right.outcome &&
+    left.stateStartedAt === right.stateStartedAt
+  )
+}
diff --git a/mobile/tests-typecheck-baseline.txt b/mobile/tests-typecheck-baseline.txt
index 34dd8f7cf661..ab63d955f7ad 100644
--- a/mobile/tests-typecheck-baseline.txt
+++ b/mobile/tests-typecheck-baseline.txt
@@ -53,7 +53,6 @@ src/session/QuickCommandsSheet.test.ts
 src/session/ai-vault-resume-launch.test.ts
 src/session/mobile-file-tap-open.test.ts
 src/session/mobile-native-chat-open-file.test.ts
-src/session/mobile-session-route-parity.test.ts
 src/session/mobile-session-tab-activation.test.ts
 src/session/mobile-worker-takeover-send-sites.test.ts
 src/session/pending-terminal-handle-recovery-poll.test.ts
diff --git a/mobile/web-entry/index.tsx b/mobile/web-entry/index.tsx
index 2c346e0dbf2c..57936f042529 100644
--- a/mobile/web-entry/index.tsx
+++ b/mobile/web-entry/index.tsx
@@ -20,6 +20,7 @@ import { PageFaultBoundary } from '../src/mobile-web-shell/bridge/page-fault-bou
 import { publishPageHostProfile } from '../src/mobile-web-shell/bridge/page-host-profile'
 import { publishExternalLinkOpener } from '../src/platform/external-link.web'
 import { publishHapticsNotifier } from '../src/platform/haptics.web'
+import { publishShellKeyboardSource } from '../src/platform/keyboard-occlusion.web'
 // Named with its extension: this entry is the web build's and the provider it needs is the web
 // sibling's, which takes the page's client. The screens below still import `./client-context`
 // and reach the same module, because the builder resolves both specifiers to the same file.
@@ -111,6 +112,11 @@ bootstrapShellPage({
     // The same shape again, and for the same reason: every haptic on this page is played from a
     // plain function inside a row's press handler, which no provider wraps.
     publishHapticsNotifier((kind) => client.notifyHaptics(kind))
+    // The shell's keyboard height, read by plain functions as well as hooks; 0 while it is closed.
+    publishShellKeyboardSource({
+      read: () => client.getShellSession()?.keyboardInset ?? 0,
+      subscribe: client.onKeyboardInsetUpdate
+    })
     // Scoped to the host `init` named: with none, no key is writable, which is the right answer
     // for a shell too old to say whose list this is.
     publishPageStorage(
diff --git a/mobile/web-entry/web-overrides.json b/mobile/web-entry/web-overrides.json
index afcc3c564d67..3dc3e661f6fb 100644
--- a/mobile/web-entry/web-overrides.json
+++ b/mobile/web-entry/web-overrides.json
@@ -29,6 +29,10 @@
       "file": "src/transport/host-device-token-store.web.ts",
       "reason": "expo-secure-store resolves to {} on web, and the bridge carries the RPC, so the page holds no device token."
     },
+    {
+      "file": "src/platform/host-os.web.ts",
+      "reason": "Platform.OS is web inside the shell's page, but the keyboard the page lifts over is the phone's, reported in that OS's own terms: iOS counts the home indicator. Keyboard and inset arithmetic branches on the host OS, so this answers the phone's OS from the WebView's user agent, and the page computes what the native screen computes."
+    },
     {
       "file": "app/_layout.web.tsx",
       "reason": "The page's route tree starts at app/h, so without a root layout expo-router mounts DefaultNavigator, an all-edges SafeAreaView that would pad every screen a second time. The native root owns pairing and push and cannot reach the page. This one adds no padding and feeds the insets the shell sent in init to react-native-safe-area-context, whose web provider reads env(safe-area-inset-*) as 0 in both WebViews."
@@ -69,6 +73,10 @@
       "file": "src/platform/keyboard-occlusion.web.ts",
       "reason": "react-native-web's Keyboard is a stub: addListener returns a subscription that never fires and isVisible() is always false, so a screen waiting for keyboardDidShow inside the page waits forever and the software keyboard covers whatever sits at the bottom of the document \u2014 the source-control commit bar, and the review note composer whose KeyboardAvoidingView is driven by those same events. The browser publishes the geometry a different way: the layout viewport keeps its size and visualViewport shrinks, so the occluded strip is innerHeight minus the visual viewport's height and offsetTop, tracked on its resize and scroll. A document with no visualViewport answers 0 rather than guessing."
     },
+    {
+      "file": "src/platform/keyboard-persisting-taps.web.ts",
+      "reason": "react-native-web ignores keyboardShouldPersistTaps, and its Pressable is a focusable element that takes focus on mousedown. On Pixel_API_37 a tap on a session tab or a dock key moved focus off the live input and the IME closed, while natively a Pressable never takes focus and those two ScrollViews persist taps. This sibling gives the tab bar ('handled') and the accessory bar ('always') the same rule by keeping a focused text field's focus through the mousedown; the native module returns no ref."
+    },
     {
       "file": "src/platform/live-input-composing-range.web.ts",
       "reason": "The terminal's Live input reads the change event's isComposing as the text system's marked-text range, and on the page that event is the DOM's. An Android WebView marks the keyboard's composing region, which Samsung and other Latin keyboards keep over every word, so the preedit mirror held each word unsent until the next keystroke or Enter. Native Android reports no range at all; this sibling answers the same in an Android WebView and passes the DOM's range through in any other browser. The native file passes the event's own through."
diff --git a/native/computer-use-linux/runtime.py b/native/computer-use-linux/runtime.py
index ac53f6cf65f8..464235b206ae 100644
--- a/native/computer-use-linux/runtime.py
+++ b/native/computer-use-linux/runtime.py
@@ -406,8 +406,10 @@ def walk(node, depth, path):
                 truncation["maxDepthReached"] = True
             return
         item = record(node, len(records), path, window_rect)
-        child_items = list(children(node))
         role_key = (item["controlType"] or "").lower()
+        title = item["name"] or item["automationId"] or ""
+        suppressed = suppress_children(role_key, title, item["value"], None)
+        child_items = [] if suppressed else list(children(node))
         generic_summary = None
         if role_key in {"panel", "filler", "unknown", "section"} and not item["name"] and not item["value"]:
             summary_values = text_snippets(node, limit=8, max_depth=4)
@@ -418,7 +420,6 @@ def walk(node, depth, path):
                 walk(child, depth, path + [child_index])
             return
         records.append(item)
-        title = item["name"] or item["automationId"] or ""
         role_label = item["localizedControlType"] or item["controlType"]
         line = f'{item["index"]} {role_label} {sanitize_text(title)}'.rstrip()
         line += formatted_value(role_key, title, item["value"])
@@ -432,7 +433,7 @@ def walk(node, depth, path):
         if filtered_actions:
             line += ", Secondary Actions: " + ", ".join(display_action(action) for action in filtered_actions)
         lines.append(("\t" * depth) + line)
-        if generic_summary or suppress_children(role_key, title, item["value"], generic_summary):
+        if generic_summary or suppressed:
             return
         child_line_start = len(lines)
         for child_index, child in child_items:
diff --git a/native/computer-use-linux/runtime_render_test.py b/native/computer-use-linux/runtime_render_test.py
index 83a600c7d2d2..d3672912ca60 100644
--- a/native/computer-use-linux/runtime_render_test.py
+++ b/native/computer-use-linux/runtime_render_test.py
@@ -98,6 +98,7 @@ def get_value_iface(self):
 
 class FailingChildrenAccessible(FakeAccessible):
     def get_child_count(self):
+        self.counter["child_reads"] += 1
         raise RuntimeError("defunct node")
 
 
@@ -113,9 +114,63 @@ def test_named_non_generic_node_skips_unused_summary_walk(self):
 
         self.assertEqual([record["name"] for record in records], ["Save"])
         self.assertEqual(lines, ["0 button Save"])
+        self.assertEqual(root.counter["child_reads"], 0)
+        self.assertFalse(truncation["truncated"])
+
+    def test_wide_labeled_controls_never_enumerate_suppressed_children(self):
+        roles = (
+            "button", "check box", "checkbox", "combo box", "heading", "link",
+            "menu item", "page tab", "push button", "radio button",
+        )
+        for role in roles:
+            with self.subTest(role=role):
+                root = FakeAccessible(
+                    role, "Save", children=[FakeAccessible("text", str(i)) for i in range(10000)]
+                )
+
+                records, lines, truncation = render(root)
+
+                self.assertEqual([item["runtimeId"] for item in records], [[0]])
+                self.assertEqual(lines, [f"0 {role} Save"])
+                self.assertEqual(root.counter["child_reads"], 0)
+                self.assertFalse(truncation["truncated"])
+
+    def test_control_value_or_identifier_keeps_suppression(self):
+        value_node = FakeAccessible("combo box", value="Choice", children=[FakeAccessible("text", "Child")])
+        identifier_node = FakeAccessible("button", children=[FakeAccessible("text", "Child")])
+        identifier_node.get_accessible_id = lambda: "save-button"
+        for root, expected in (
+            (value_node, "0 combo box, Value: Choice"),
+            (identifier_node, "0 button save-button"),
+        ):
+            with self.subTest(expected=expected):
+                records, lines, truncation = render(root)
+
+                self.assertEqual(len(records), 1)
+                self.assertEqual(lines, [expected])
+                self.assertEqual(root.counter["child_reads"], 0)
+                self.assertFalse(truncation["truncated"])
+
+    def test_unlabeled_controls_keep_child_indices_and_depth(self):
+        root = FakeAccessible("button", children=[FakeAccessible("button", "Nested")])
+
+        records, lines, truncation = render(root)
+
+        self.assertEqual([item["runtimeId"] for item in records], [[0], [0, 0]])
+        self.assertEqual(lines, ["0 button", "\t1 button Nested"])
         self.assertEqual(root.counter["child_reads"], 2)
         self.assertFalse(truncation["truncated"])
 
+    def test_suppressed_child_failure_keeps_control_output(self):
+        root = FailingChildrenAccessible("button", "Save")
+
+        records, lines, truncation = render(root)
+
+        self.assertEqual([item["name"] for item in records], ["Save"])
+        self.assertEqual(lines, ["0 button Save"])
+        self.assertFalse(truncation["truncated"])
+        self.assertEqual(root.counter["child_reads"], 0)
+
     def test_named_generic_node_skips_unused_summary_walk(self):
         root = FakeAccessible("section", "Details", children=[FakeAccessible("text", "body")])
 
diff --git a/native/windows-cli-launcher/OrcaCliLauncher.cs b/native/windows-cli-launcher/OrcaCliLauncher.cs
index 6261775859b1..3357c7b15963 100644
--- a/native/windows-cli-launcher/OrcaCliLauncher.cs
+++ b/native/windows-cli-launcher/OrcaCliLauncher.cs
@@ -2,6 +2,15 @@
 using System.Diagnostics;
 using System.IO;
 using System.Text;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Orca CLI Launcher")]
+[assembly: AssemblyDescription("Command-line launcher for Orca")]
+[assembly: AssemblyCompany("Stably AI")]
+[assembly: AssemblyProduct("Orca")]
+[assembly: AssemblyCopyright("Copyright © Stably AI")]
+[assembly: ComVisible(false)]
 
 internal static class OrcaCliLauncher
 {
diff --git a/native/windows-cli-launcher/app.manifest b/native/windows-cli-launcher/app.manifest
new file mode 100644
index 000000000000..34f0426701c3
--- /dev/null
+++ b/native/windows-cli-launcher/app.manifest
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="StablyAI.Orca.CliLauncher" type="win32"/>
+  <description>Orca CLI Launcher</description>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 and Windows 11 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+</assembly>
diff --git a/package.json b/package.json
index 6b3bd4821d08..f8ef5619ecd9 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "audit:perf": "oxlint --config config/oxlint-performance-audit.json --format json src",
     "test:perf:contracts": "vitest run --config config/vitest.performance.config.ts",
     "format": "oxfmt --write .",
-    "lint": "oxlint && pnpm run audit:anti-slop && pnpm run audit:code-quality:native && pnpm run audit:code-quality:type-aware && pnpm run check:reliability-gates && pnpm run check:dead-classes && pnpm run check:max-lines-ratchet && pnpm run check:ts-nocheck-ratchet && pnpm run check:runtime-electron-ratchet && pnpm run check:readme-local-links && pnpm run verify:rpc-params-catalog && pnpm run verify:bundled-skill-guides && pnpm run verify:skill-bundle-manifest && pnpm run verify:localization-catalog && pnpm run verify:localization-runtime-catalog && pnpm run verify:localization-extraction && pnpm run verify:localization-coverage",
+    "lint": "oxlint && pnpm run audit:anti-slop && pnpm run audit:code-quality:native && pnpm run audit:code-quality:type-aware && pnpm run check:reliability-gates && pnpm run check:dead-classes && pnpm run check:max-lines-ratchet && pnpm run check:ts-nocheck-ratchet && pnpm run check:runtime-electron-ratchet && pnpm run check:readme-local-links && pnpm run verify:rpc-params-catalog && pnpm run verify:bundled-skill-guides && pnpm run verify:skill-bundle-manifest && pnpm run verify:localization-catalogs && pnpm run verify:localization-extraction && pnpm run verify:localization-coverage",
     "audit:code-quality": "pnpm run audit:code-quality:native && pnpm run audit:code-quality:type-aware && pnpm run audit:react-doctor",
     "audit:code-quality:native": "oxlint --config config/oxlint-code-quality-native-plugins.json src config tests mobile --deny-warnings",
     "audit:code-quality:type-aware": "oxlint --type-aware --config config/oxlint-code-quality-type-aware.json src config tests --deny-warnings",
@@ -82,6 +82,7 @@
     "verify:cli-bin": "node config/scripts/verify-cli-bin.mjs",
     "verify:built-skills-cli": "node config/scripts/verify-skills-cli-runtime.cjs out",
     "verify:renderer-boot-graph": "node config/scripts/verify-renderer-boot-graph.mjs",
+    "verify:localization-catalogs": "pnpm run verify:localization-catalog && pnpm run verify:localization-runtime-catalog",
     "verify:localization-catalog": "node config/scripts/fork-localization-catalog-check.mjs",
     "sync:localization-catalog": "node config/scripts/fork-localization-catalog-check.mjs --fix",
     "verify:localization-runtime-catalog": "node config/scripts/generate-runtime-required-english-catalog.mjs",
@@ -89,7 +90,8 @@
     "verify:localization-extraction": "node config/scripts/fork-localization-catalog-check.mjs --verify-extraction",
     "verify:localization-coverage": "node config/scripts/audit-localization-coverage.mjs --check",
     "audit:localization": "node config/scripts/audit-localization-coverage.mjs",
-    "build:cli": "tsc -p config/tsconfig.cli.json --outDir out --composite false --incremental false && node config/scripts/verify-cli-bin.mjs --fix-executable --fix-package-json && node config/scripts/install-dev-cli.mjs",
+    "build:cli": "tsc -p config/tsconfig.cli.json --outDir out --composite false --incremental false && pnpm run prepare:cli-output",
+    "prepare:cli-output": "node config/scripts/verify-cli-bin.mjs --fix-executable --fix-package-json && node config/scripts/install-dev-cli.mjs",
     "test:linux-cli-contract": "node config/scripts/run-linux-cli-launch-contract-docker.mjs --appimage dist/orca-linux.AppImage",
     "test:repro:skills-cli-runtime": "pnpm run build:cli && pnpm run build:electron-vite && pnpm run verify:built-skills-cli",
     "build:electron-vite": "node config/scripts/run-electron-vite-build.mjs",
@@ -254,7 +256,7 @@
     "cmdk": "^1.1.1",
     "diff": "8.0.4",
     "dompurify": "3.4.15",
-    "electron": "43.7.0",
+    "electron": "43.7.5",
     "electron-builder": "^26.15.3",
     "electron-builder-squirrel-windows": "^26.15.3",
     "electron-vite": "^5.0.0",
@@ -264,7 +266,7 @@
     "happy-dom": "^20.11.8",
     "html-to-image": "^1.11.13",
     "husky": "^9.1.7",
-    "i18next-cli": "1.65.0",
+    "i18next-cli": "1.74.2",
     "katex": "^0.16.45",
     "lint-staged": "^16.4.0",
     "lowlight": "^3.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 732e257d3824..553328fabbac 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -166,15 +166,16 @@ overrides:
   monaco-editor>dompurify: 3.4.15
 
 patchedDependencies:
+  i18next-cli@1.74.2: 7955b89d3aa229f477408608d331f78c85148a85a85913729f89fac65ad8b207
   '@vscode/windows-process-tree@0.8.0': b4be93859cefb159949d9cf05f97fa91a221dff0f793a6f03d02d78ae5b32035
-  '@xterm/addon-image@0.10.0-beta.300': 5fc280019957573eefe8daa2969534d6090ddb29c6b5842b8f22e99dc1ce3146
+  '@xterm/addon-image@0.10.0-beta.300': e5254a46d6f57bef4a8a19683bfa685afa0ca0127545aea53b54a48104ca3562
   '@xterm/addon-ligatures@0.11.0-beta.300': 47405b9994b5acf1b4e90b49250358c1ca03649854d59560e7732b72fe336920
   '@xterm/addon-search@0.17.0-beta.300': eee5338dd2621ece46e79c61ec06766cd7fadaf79ffdb24e2a8ab68e97ef31f0
   '@xterm/addon-serialize@0.15.0-beta.300': b35533fe252e7e45433150170348889f4e08a6c17f7017ac34ea694d831fec7f
   '@xterm/addon-webgl@0.20.0-beta.299': 94687e89a0115e6e6aa102837f986debdc029c091527ee5eb4a4e17ceaf9473e
   '@xterm/xterm@6.1.0-beta.303': dd0ccc59cd1ccf99f4d76e5aa2456da165fa0804dce19a833d7638bd07ffa393
   lint-staged@16.4.0: 7333b3837f80a7fbd045964db6d76ba4fc118e49134bdbabb00585b6b7b60673
-  node-pty@1.1.0: 346cb29d33dd6eeb14910ff411c7584b0b2ff9a4b271c4b6d23c3b48e6548f74
+  node-pty@1.1.0: 92c95cffab383d86b3b13a460c75a08074468ebf1f3911db8e874e083201f192
 
 importers:
 
@@ -185,7 +186,7 @@ importers:
         version: 0.3.251(@anthropic-ai/sdk@0.122.0(zod@4.6.5))(@modelcontextprotocol/sdk@1.30.0(supports-color@7.2.0)(zod@4.6.5))(zod@4.6.5)
       '@electron-toolkit/utils':
         specifier: ^4.0.0
-        version: 4.0.0(electron@43.7.0(supports-color@7.2.0))
+        version: 4.0.0(electron@43.7.5(supports-color@7.2.0))
       '@floating-ui/dom':
         specifier: 1.8.0
         version: 1.8.0
@@ -218,7 +219,7 @@ importers:
         version: 3.3.1
       node-pty:
         specifier: ^1.1.0
-        version: 1.1.0(patch_hash=346cb29d33dd6eeb14910ff411c7584b0b2ff9a4b271c4b6d23c3b48e6548f74)
+        version: 1.1.0(patch_hash=92c95cffab383d86b3b13a460c75a08074468ebf1f3911db8e874e083201f192)
       posthog-node:
         specifier: ^5.52.5
         version: 5.52.5
@@ -387,7 +388,7 @@ importers:
         version: 0.12.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=dd0ccc59cd1ccf99f4d76e5aa2456da165fa0804dce19a833d7638bd07ffa393))
       '@xterm/addon-image':
         specifier: 0.10.0-beta.300
-        version: 0.10.0-beta.300(patch_hash=5fc280019957573eefe8daa2969534d6090ddb29c6b5842b8f22e99dc1ce3146)(@xterm/xterm@6.1.0-beta.303(patch_hash=dd0ccc59cd1ccf99f4d76e5aa2456da165fa0804dce19a833d7638bd07ffa393))
+        version: 0.10.0-beta.300(patch_hash=e5254a46d6f57bef4a8a19683bfa685afa0ca0127545aea53b54a48104ca3562)(@xterm/xterm@6.1.0-beta.303(patch_hash=dd0ccc59cd1ccf99f4d76e5aa2456da165fa0804dce19a833d7638bd07ffa393))
       '@xterm/addon-ligatures':
         specifier: 0.11.0-beta.300
         version: 0.11.0-beta.300(patch_hash=47405b9994b5acf1b4e90b49250358c1ca03649854d59560e7732b72fe336920)(@xterm/xterm@6.1.0-beta.303(patch_hash=dd0ccc59cd1ccf99f4d76e5aa2456da165fa0804dce19a833d7638bd07ffa393))
@@ -422,8 +423,8 @@ importers:
         specifier: 3.4.15
         version: 3.4.15
       electron:
-        specifier: 43.7.0
-        version: 43.7.0(supports-color@7.2.0)
+        specifier: 43.7.5
+        version: 43.7.5(supports-color@7.2.0)
       electron-builder:
         specifier: ^26.15.3
         version: 26.15.3(electron-builder-squirrel-windows@26.15.3)
@@ -452,8 +453,8 @@ importers:
         specifier: ^9.1.7
         version: 9.1.7
       i18next-cli:
-        specifier: 1.65.0
-        version: 1.65.0(@types/node@25.9.5)(react-dom@19.2.8(react@19.2.8))(typescript@7.0.2)
+        specifier: 1.74.2
+        version: 1.74.2(patch_hash=7955b89d3aa229f477408608d331f78c85148a85a85913729f89fac65ad8b207)(@types/node@25.9.5)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2)
       katex:
         specifier: ^0.16.45
         version: 0.16.45
@@ -1156,8 +1157,12 @@ packages:
     resolution: {integrity: sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
 
-  '@inquirer/checkbox@5.2.1':
-    resolution: {integrity: sha512-b6xmA/VlTe0ZgDQHDui+Nav470u7u49nRd8/iuhOcQPO9Ch7lGuogydhi2VOmNlZ+zXcM8IcPuNSwQcdJaF/kw==}
+  '@inquirer/ansi@2.0.8':
+    resolution: {integrity: sha512-WpQM+Ti6Z40EFwwt+uL2p4UabT+W179zHp6HhLVOzfbwnVn05IPO/eXIZXGNqcT1jbQ15SujNLzQ39k4QPPxBQ==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+
+  '@inquirer/checkbox@5.2.5':
+    resolution: {integrity: sha512-bRt8J8m+Fot9CXv+zNQGXUq2ET0MggR1fPz7v6edN6MFYmsbfGnMmkmWZJEegMKqrAC8ej/o1sqisHZXZJMAfQ==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
@@ -1174,6 +1179,15 @@ packages:
       '@types/node':
         optional: true
 
+  '@inquirer/confirm@6.3.2':
+    resolution: {integrity: sha512-Xvr/0HggjddPtGppuqVmxhTw+Hr8PvsZ/k0HmOEaAqQEt80OITNkFWnsdNmyT0/eM4Ab+iJLx2R8rctlEyfSVg==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
   '@inquirer/core@11.2.1':
     resolution: {integrity: sha512-Qd6GJT1yVyrZZCfN8W2qKF5ApmqryXRhRKCuip8h01x2w/esJQ2XIYc6f9abMIHgKQdBfFTSOdbHRLAhuM09UA==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
@@ -1183,8 +1197,17 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/editor@5.2.2':
-    resolution: {integrity: sha512-ZRVd/oD+sYsUd5zVm0NflqEzlqfYCyHNsqkHl2oWXEUHs12tCbcSFi+wVFEvD8+LGRaMUsVrE7qeo6lSG/S1Vg==}
+  '@inquirer/core@12.0.3':
+    resolution: {integrity: sha512-wsSy0sznmXwkty+2PzZwx00Cazc/E0r0B7mAzdGROz2Ct+DFZXaK7WDjGZvgjRldxH5ZhFVfF2lgkYrqgOw2KA==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/editor@5.3.3':
+    resolution: {integrity: sha512-YsKkS2q63IiLtaDK/9nqzdComN97SDQrmKiyNggN+ceP4ty+Z6VwyTz3FpjeUWeW1Efss2xHFKCC9sx7hnrsxg==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
@@ -1192,8 +1215,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/expand@5.1.1':
-    resolution: {integrity: sha512-YmQpenjbFSHAK3sOd44puHh3V1KXXr+JiNpUztoSQ4drLh2rTVzTap/YtlAVu/5xavifIlBfNEzJ/neZJ1a/1g==}
+  '@inquirer/expand@5.1.5':
+    resolution: {integrity: sha512-uHuXLmXW+TtIfT/9vSBotypAkqn1n34Ul+CLGPos/xANyO4Ff5xZzkYhbKR4NEcfVK4a9mHQOpwVZzluSHFRGw==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
@@ -1201,8 +1224,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/external-editor@3.0.3':
-    resolution: {integrity: sha512-6thf5I8q7lZwzGLAxPaaGEREEkZ3nyePPDQ1oyobblxmEE8mqTLguScP7pDjUTAibiyb4hfXl+qjUEJ+di/aNA==}
+  '@inquirer/external-editor@3.0.5':
+    resolution: {integrity: sha512-f3QQJRIX5ZEneBHNUIuPjmbdzHnmRFJA8r2dkcb8q+OM5Uv5KtnuAttQumnrjcBVBM3mcTX1CkmtAkU58VRZxg==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
@@ -1214,8 +1237,12 @@ packages:
     resolution: {integrity: sha512-aJ8TBPOGB6f/2qziPfElISTCEd5XOYTFckA2SGjhNmiKzfK/u4ot3v0DUzGVdUnKjN10EqnnEPck36BkyfLnJw==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
 
-  '@inquirer/input@5.1.2':
-    resolution: {integrity: sha512-9K/DDBSQpOyZSkt6sOVP9Vo0TR7atX2kuILsUu0x3wVcVbe97lJwIJKMLdMw25tDYuXl/qp6erT0Xs1rfmcfZg==}
+  '@inquirer/figures@2.0.9':
+    resolution: {integrity: sha512-EAWgUTGQ/Umgga51dE3B2PUHbufuXarDfg86uVgoSgNHNNQnyFKcOrQLWVqYMghuSyHh8+2HUH0Js9cTC1WAdg==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+
+  '@inquirer/input@5.1.6':
+    resolution: {integrity: sha512-HtcJhB2QFVXbLuJ5S3syhNbTUVxYvwqV4VRBDkQceBloC9bmTViUoRFP5PbSaDZb3HzfPmpuU/gG4ybVBz4FHA==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
@@ -1223,8 +1250,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/number@4.1.1':
-    resolution: {integrity: sha512-XF4IXAbPnGPgw0wsbC/i2tPcyfdZgDpUlhsqU0SfT4IRIGWha6Xm9VRgN5yYxJq+jnyXlfXI/nQ3ulfk0iEICA==}
+  '@inquirer/number@4.2.3':
+    resolution: {integrity: sha512-6Yuwh1NGSbu1Lo4N1EWjXs1jKRntLg/ZCwhmeorEHde90v1XxAozdbd4Iu30eOQLW+6h1hp2O9ujNfLSbTPJnA==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
@@ -1232,8 +1259,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/password@5.1.1':
-    resolution: {integrity: sha512-3XBfF7DAsp5qeDsvN5Rd1HmbNokVvEQoUM0QLrRcybC9nX96w3Pbmu7qUsb3IT3J3jBvs2+mTXaKHOUsgHMLzg==}
+  '@inquirer/password@5.2.2':
+    resolution: {integrity: sha512-W9zYdyzogK+6110mqwaSJWCBu2yA5Q/OfnGSjjZB1bNpHlmUozXxTl0+QOZBNeVd6Qo81/qT75gW05gLAtITxw==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
@@ -1241,8 +1268,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/prompts@8.5.2':
-    resolution: {integrity: sha512-IYR/3C/paEVVQYQvdDlFZVjRCJVYHHON0XXMH91KO9GSxs0TdKYWlUdvfQl2EfAHDxUaN3IBffkE/BDTh5nJ6g==}
+  '@inquirer/prompts@8.7.2':
+    resolution: {integrity: sha512-QoRB4wFIjgH5iOhSjoIKMkTvSHDuV+O3OITlIqAYO0oK5x364GJILXiMBvlPiE+klg7Xx9tq5XVqQHcGUDYYPA==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
@@ -1250,8 +1277,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/rawlist@5.3.1':
-    resolution: {integrity: sha512-QqdTqQddL3qPX/PPrjobpsO25NZ4dWXgTLenrR445L2ptLEYE6Z+PD5c5CNDJNx4ugRgELAIpSIJxZaO2jJ2Og==}
+  '@inquirer/rawlist@5.3.5':
+    resolution: {integrity: sha512-1oHky1ONfCOwNrnkQGDE1oaSij/3fI6HFMSf2H/WsGO2lEyDX9My82iggITSy9ddSZ8yk8j9v41OI0fVoSIoaA==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
@@ -1259,8 +1286,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/search@4.2.1':
-    resolution: {integrity: sha512-xJj8QWKRSrfKoBIITLZK61dD3zwo0Rz11fgDImku30/Oe81zMdIdGgrLY2h6RkJ+KZ/GhNYIRMKnH/62qBTA5g==}
+  '@inquirer/search@4.3.3':
+    resolution: {integrity: sha512-fyuIU1Nbpvwlikjg3gXwJFDI11+EFjqQ7P+iByfmivIKQ1vmaykNrD/vy5unHuUqUpsOsnvJ25//tPF7E/RBRA==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
@@ -1268,8 +1295,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/select@5.2.1':
-    resolution: {integrity: sha512-FlDndEUww8m7BfukO2nJa25vhD+H5jxxCv4oGioKqzyWz3nPHhhw4LKdYRSlXuAx7DsdWia7iyaBPKKS95Evfw==}
+  '@inquirer/select@5.2.5':
+    resolution: {integrity: sha512-9kc15hr8r/kI+3DO/xLog5nOzTz1jqsHXa6JBFzmQKhkoJ8Slda1I1L/uD8ZSZ9tF1yp79wwXe7mclvX1rqR2Q==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
@@ -1286,6 +1313,15 @@ packages:
       '@types/node':
         optional: true
 
+  '@inquirer/type@4.1.1':
+    resolution: {integrity: sha512-yJoHYrMnxIsJZCY+0Vb66Dy3he3kL3e2wOBKhoSwWWAzZAY82emlxwgprCtp6yRixvNRNq9ztfRWQYPNr3Go7A==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
   '@isaacs/fs-minipass@4.0.1':
     resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
     engines: {node: '>=18.0.0'}
@@ -1303,6 +1339,9 @@ packages:
   '@jridgewell/sourcemap-codec@1.5.5':
     resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
 
+  '@jridgewell/sourcemap-codec@1.6.0':
+    resolution: {integrity: sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==}
+
   '@jridgewell/trace-mapping@0.3.31':
     resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
@@ -2980,18 +3019,36 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@swc/core-darwin-arm64@1.16.2':
+    resolution: {integrity: sha512-i/j0HNbnn79qnTVPicvay92Nark8fW8NQqn1e2mGERjUXNpBV0+SwQxlRpk2zBhn6laJ8PDI6Kn1nHZhnz3LCA==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@swc/core-darwin-x64@1.15.46':
     resolution: {integrity: sha512-4Tj4ppVIPCmUMpmGFiGtyEriwLyJ+yi/US4WfBrP/ok8COGddDZXLEzQETnKyK46mjvr1v0jevrS23zjoff7vA==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
 
+  '@swc/core-darwin-x64@1.16.2':
+    resolution: {integrity: sha512-HrwqHyEyHVXO3qTk8EkNK7/b6sOZSEoNh+pot6RdE5x0LbNqfo8LtJUvi3UTXr+5ja/o5HbJdW80eCXo+NjbiA==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [darwin]
+
   '@swc/core-linux-arm-gnueabihf@1.15.46':
     resolution: {integrity: sha512-i8tUGnNjyOgMmfmgFSg4aeJLQoFyfpIHK5FjpQAwpRyQIqEUB2w1e8zIDQzY1WhOxx8NoS1S5iUL813Un4Sf5A==}
     engines: {node: '>=10'}
     cpu: [arm]
     os: [linux]
 
+  '@swc/core-linux-arm-gnueabihf@1.16.2':
+    resolution: {integrity: sha512-MdXi83Z/gGp1LIrg+h7HKxiul/z/Bty/ZJSvYAFqDl9zteC1XLSAZdScquKtXPp50rdyXqritTDCqQBhwVfZKA==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux]
+
   '@swc/core-linux-arm64-gnu@1.15.46':
     resolution: {integrity: sha512-c0OnhqzdhfOvv6qhNCcByepB+sNYOGZyhtr2Qa6ZCHvAWTYhSRw4j/u92Stue9PbZ/6q74b9nHzi76+kVzqQHQ==}
     engines: {node: '>=10'}
@@ -2999,6 +3056,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@swc/core-linux-arm64-gnu@1.16.2':
+    resolution: {integrity: sha512-/jcTmK6Ktz3owM3YtiKvjofV6p3VpHnYzTIrOGwDIOsDigRAAVuZ8east33wYO/7UTdKYFlyHNnJNT0WJqOA3Q==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
   '@swc/core-linux-arm64-musl@1.15.46':
     resolution: {integrity: sha512-imyRpNEcUzFQFV2LE4jL68ErvmKEuZCbvZru77iQREunJ+bR4i658cupTgtG1mLYM3F1Tzy3Sb9xYb02KghWTg==}
     engines: {node: '>=10'}
@@ -3006,6 +3070,13 @@ packages:
     os: [linux]
     libc: [musl]
 
+  '@swc/core-linux-arm64-musl@1.16.2':
+    resolution: {integrity: sha512-4gFarKaFnlJTSlJYKmMhV4u+3YE4uYfiydpBoYjmgQhCf9lAieOq+WilZaK9vVSHeqLuQpTEiGULZqAdsRX5Dw==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
   '@swc/core-linux-ppc64-gnu@1.15.46':
     resolution: {integrity: sha512-ctEfcl/HcUeomK33cbySiHZm98GEDIxTm1EkpBsYCiHxElYBzvTXVeuQT2YwbUXn9XCrjiw4ipyUNk33k26qRg==}
     engines: {node: '>=10'}
@@ -3013,6 +3084,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@swc/core-linux-ppc64-gnu@1.16.2':
+    resolution: {integrity: sha512-syqSLGd6KlZ1PciNzs6bIUlhOuFztZufebOHaERjc4N4SqNZxyqYd4I+jj/EfOYnpe0kNjccn9HJLN1p5dz3+w==}
+    engines: {node: '>=10'}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
   '@swc/core-linux-s390x-gnu@1.15.46':
     resolution: {integrity: sha512-DxlMdnt84TtRVTv7WL/thWyz9+QU8QZNNoAP9rrk0P68LziuhfePp8MjQ44zIprpTHTsEwyziIuGUUN5iSC1bQ==}
     engines: {node: '>=10'}
@@ -3020,6 +3098,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@swc/core-linux-s390x-gnu@1.16.2':
+    resolution: {integrity: sha512-ZBBLK+ewGyXLzWeMS7wbKtWBdnif6etn7xvPY/iOfbdsjX/+bgkp1pQt2lWF2wlu2hXYZuhJ/tHZE/QR8/apzg==}
+    engines: {node: '>=10'}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
   '@swc/core-linux-x64-gnu@1.15.46':
     resolution: {integrity: sha512-SKxI7J6t90XPl8hRUqtJi9NfGdunN/E/vZMc7Bc0figeRdOPDBT+Tm8g7cx9xM0T0mewh2l+8dewa3Am27/P+A==}
     engines: {node: '>=10'}
@@ -3027,6 +3112,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@swc/core-linux-x64-gnu@1.16.2':
+    resolution: {integrity: sha512-LyHJgxCA4Tje0ysBMbEb0tt/ie8kgUKoFE3JAKFhpevmTmhYEoC0H9s47WuDsqiFckF1ITUguZIXJG6K5e0dvg==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
   '@swc/core-linux-x64-musl@1.15.46':
     resolution: {integrity: sha512-qj9T6B7bosI0VEsrWOVXZN1OXxS8Tp63ywyrLxNdOycnUtLdkgYcoBsN5y8ImnDDsnwrEWZOy1e+J4xSe7mA3Q==}
     engines: {node: '>=10'}
@@ -3034,24 +3126,49 @@ packages:
     os: [linux]
     libc: [musl]
 
+  '@swc/core-linux-x64-musl@1.16.2':
+    resolution: {integrity: sha512-PghXJlVM1cgtLfNUR1vxFo1z+PDRAe8cWAJlZZ7spmeiN7BospGXg/MHUg7oNSgwSX7Zo//YKv9P5yD9apsFJQ==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
   '@swc/core-win32-arm64-msvc@1.15.46':
     resolution: {integrity: sha512-8p7l4c3LU+eA5g9Et1JPhNeMC1oQwXTGU+uah8DPIBX7YXzqswvaBtyKVmXefVGi/DJU1x3YJsc3mbAp9aWzSQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
 
+  '@swc/core-win32-arm64-msvc@1.16.2':
+    resolution: {integrity: sha512-StTOSefYBxemvNYYUI3UmO1a8y+hSPjjfHogC2TEHL+Z1PlEBim/XtLas5rS04jAzT9RrNmbtX911SZ42H9jSQ==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [win32]
+
   '@swc/core-win32-ia32-msvc@1.15.46':
     resolution: {integrity: sha512-tUEnfr3Bn9u6FOjUb3PN9p+09qZC2j+wNDLKHzXXZn22rqGcUqR/ohCRSS+nG9B9+X+U+3FewNEHJkTmdIvMjQ==}
     engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
 
+  '@swc/core-win32-ia32-msvc@1.16.2':
+    resolution: {integrity: sha512-fycER209DYIzsibpTMC+chND05OfOjgztWL9U8OE6/uUlsOUZH3eh98isBLEnOymYUhlJLEt5++W1+KL/FOh5Q==}
+    engines: {node: '>=10'}
+    cpu: [ia32]
+    os: [win32]
+
   '@swc/core-win32-x64-msvc@1.15.46':
     resolution: {integrity: sha512-Vux7UDzBJYQggSuPfcl2w9iu+IJpgpRCxHzgCaVkELnAXAE4XZMOTX9HNcaNiwfeIDqdu2rkr69RuDm6wY8neA==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
 
+  '@swc/core-win32-x64-msvc@1.16.2':
+    resolution: {integrity: sha512-cSd1z6ivSrJPVr+moVwOHWjeKy6TpO4/Shwcv5KCrKYXCccxwh4pRy1C3fDioNx2PF1jPZWHKZjtXt+Be9VbaQ==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+
   '@swc/core@1.15.46':
     resolution: {integrity: sha512-Ri3em2mBpq3h2zSPliCYl63otDGqek8PPEfv2nWgRQEbZ/VBCNyypVTVQ6cEbTCXBhy+WE2T3fQb08moIyuYaw==}
     engines: {node: '>=10'}
@@ -3061,12 +3178,24 @@ packages:
       '@swc/helpers':
         optional: true
 
+  '@swc/core@1.16.2':
+    resolution: {integrity: sha512-95I4kiSMeveI/Mhi+tE4fiWcWLUMfzfKrk0jtr8LRMqHgOgq+xHS+zExkDqoO4b5OeeuXHMWVdD5MeP3X6sULw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@swc/helpers': '>=0.5.17'
+    peerDependenciesMeta:
+      '@swc/helpers':
+        optional: true
+
   '@swc/counter@0.1.3':
     resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
 
   '@swc/types@0.1.27':
     resolution: {integrity: sha512-K6h3iUlqeM946U4sXFYeahefR1YBbXJvko+hv8WS8/0BNJ4OHiHRywMnQUJCqkR7Y9+hqQ1TvEpiKqUhz7NEFg==}
 
+  '@swc/types@0.1.28':
+    resolution: {integrity: sha512-V6Mnml8v09QALx6K0elJ7o9K/MkVDtW3t6L+7Ou/JcWtb3xwId2AH4FeOceySd2JaO87IMw4+6vSZxLm34LPbw==}
+
   '@szmarczak/http-timer@4.0.6':
     resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==}
     engines: {node: '>=10'}
@@ -4267,6 +4396,10 @@ packages:
     resolution: {integrity: sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==}
     engines: {node: '>=20'}
 
+  commander@15.0.0:
+    resolution: {integrity: sha512-z67u4ZhzCL/Tydu1lJARtEZYWbWaN7oYLHbsuzocr6y4N6WZAagG3RQ4FW61V1/0+jImpj293XfrcYnd1qxtPg==}
+    engines: {node: '>=22.12.0'}
+
   commander@5.1.0:
     resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
     engines: {node: '>= 6'}
@@ -4695,8 +4828,8 @@ packages:
     resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
     engines: {node: '>=8.0.0'}
 
-  electron@43.7.0:
-    resolution: {integrity: sha512-m98FUehwnoo6q2D9Mr+n602Natb2CRFeKD81GhTdJlKh/Iyud0R1X8hChjpaMBLSsIX9r2ZEFnz0sdIALiO9ZQ==}
+  electron@43.7.5:
+    resolution: {integrity: sha512-AR+OLH/8QAwx6Lz6mhaDQhesbjC/Xh2WOiFSI/CDFU6FKX/qJdBg65bEUn+MLvbvIi/LlaRQeLljnUcKb1KS0A==}
     engines: {node: '>= 22.12.0'}
     hasBin: true
 
@@ -4871,6 +5004,10 @@ packages:
     resolution: {integrity: sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==}
     engines: {node: '>=18.0.0'}
 
+  execa@10.0.1:
+    resolution: {integrity: sha512-ge98qjkRK4IB7tL7Ju/6qmm5LHoH1eEMt5FNZrz3f4UIYhF28lggX20z3FaX1sgc67msLEn0N0BscOs29iuwyw==}
+    engines: {node: '>=22'}
+
   execa@5.1.1:
     resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
     engines: {node: '>=10'}
@@ -5260,13 +5397,13 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  i18next-cli@1.65.0:
-    resolution: {integrity: sha512-sak+2Ry4P7wtl7xMAZg2sWG2vup1lRHFBKA7h5IeEqFUog51QEgeYUhHxd2x85+MvS4BhVOZZs833clnd1WgYA==}
+  i18next-cli@1.74.2:
+    resolution: {integrity: sha512-y32hOiVNLs85f+TKCl4XqERjD0dFy274IOEXe7/Zyp+WMaQC9VhF33JLO0hQZZKK4PUmYwbRDXaSObeE3PbsmA==}
     engines: {node: '>=22'}
     hasBin: true
 
-  i18next-resources-for-ts@2.1.0:
-    resolution: {integrity: sha512-n5UexwEVt0OoIAhG2MWpSnAVJW1U8mQrQTmXyxc5DMAx+NLhcLZhSMJo/FnUsA5JQ3obTYqTgB7YIuZKWpDgow==}
+  i18next-resources-for-ts@2.1.1:
+    resolution: {integrity: sha512-Xhz8S8dtNIPawzeWdmssnsII1JYsbvPWOLmstJakNcgKSFLCneA+xN7qajj/zlk5nf9sx1KGDTx8RNZ73h68tw==}
     hasBin: true
 
   i18next@26.3.1:
@@ -5277,6 +5414,14 @@ packages:
       typescript:
         optional: true
 
+  i18next@26.4.2:
+    resolution: {integrity: sha512-RX+R0VLg13IbvRuJSxnqykUFS9vQZTl8wYpWPCIUDWVrSGjsQywB5Y+pjzrkboxGAuYfJZVH1InFTdgBdxq6ug==}
+    peerDependencies:
+      typescript: ^5 || ^6 || ^7
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
   iconv-lite@0.6.3:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
     engines: {node: '>=0.10.0'}
@@ -5315,8 +5460,8 @@ packages:
   inline-style-parser@0.2.7:
     resolution: {integrity: sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==}
 
-  inquirer@14.0.2:
-    resolution: {integrity: sha512-VsSx1JneSNp3ld1veMTLe+UDcUD8Tw2/jjOthhkX3/IX2q+xHhVELifeb/hsb1fBw31pabEPNUf/xUOyb+KZjA==}
+  inquirer@14.2.2:
+    resolution: {integrity: sha512-WGerZIIb7mTtaFFskkD/P0europ8xBWf1OXACMiugzKPSmVzoqhcPSuSUzbzMch/t3rf1ncBT3v/0WU73cLqJQ==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
@@ -5717,6 +5862,9 @@ packages:
   magic-string@0.30.21:
     resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
 
+  magic-string@1.4.2:
+    resolution: {integrity: sha512-vG+rjFRj1PqdIBozIxAGMjPlOhaVe+GXpbttY/iSK7rGcJRMlwNJO7dcUwmUqkymsFLJiNGI06t4D7Fr7yRC9g==}
+
   markdown-table@3.0.4:
     resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}
 
@@ -5982,6 +6130,10 @@ packages:
     resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==}
     engines: {node: 18 || 20 || >=22}
 
+  minimatch@10.2.6:
+    resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==}
+    engines: {node: 18 || 20 || >=22}
+
   minimatch@3.1.5:
     resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==}
 
@@ -6150,6 +6302,10 @@ packages:
     resolution: {integrity: sha512-84cglkRILFxdtA8hAvLNdMrtBpPNBTrQ9/ulg0FA7xLMnD6mifv+enAIeRmvtv+WgdCE+LPGOfQmtJRrVaIVhQ==}
     engines: {node: '>=20'}
 
+  ora@9.4.1:
+    resolution: {integrity: sha512-6VlU9MLXbjVQD04AZCMX28hVtA5bUoadvUqO76MUCVA0ilwJbMiHsITRPfyVm6p/BC0Av/BXMujx39WCe1LEqw==}
+    engines: {node: '>=20'}
+
   orderedmap@2.1.1:
     resolution: {integrity: sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==}
 
@@ -7396,6 +7552,11 @@ packages:
     resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
     engines: {node: '>=12'}
 
+  which-command@0.1.0:
+    resolution: {integrity: sha512-XZyoF5/5hZtXitIwzrU4NKK+Wtbb9aB9CezUEw2Q0wlYK8NUYQxC1rRXgNueYLtBAJwXIb+/tFVk4dozciNJMA==}
+    engines: {node: '>=22'}
+    hasBin: true
+
   which-module@2.0.1:
     resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
 
@@ -7862,9 +8023,9 @@ snapshots:
     dependencies:
       '@types/node': 25.9.5
 
-  '@electron-toolkit/utils@4.0.0(electron@43.7.0(supports-color@7.2.0))':
+  '@electron-toolkit/utils@4.0.0(electron@43.7.5(supports-color@7.2.0))':
     dependencies:
-      electron: 43.7.0(supports-color@7.2.0)
+      electron: 43.7.5(supports-color@7.2.0)
 
   '@electron/asar@3.4.1':
     dependencies:
@@ -8135,14 +8296,17 @@ snapshots:
       '@iconify/types': 2.0.0
       mlly: 1.8.2
 
-  '@inquirer/ansi@2.0.7': {}
+  '@inquirer/ansi@2.0.7':
+    optional: true
 
-  '@inquirer/checkbox@5.2.1(@types/node@25.9.5)':
+  '@inquirer/ansi@2.0.8': {}
+
+  '@inquirer/checkbox@5.2.5(@types/node@25.9.5)':
     dependencies:
-      '@inquirer/ansi': 2.0.7
-      '@inquirer/core': 11.2.1(@types/node@25.9.5)
-      '@inquirer/figures': 2.0.7
-      '@inquirer/type': 4.0.7(@types/node@25.9.5)
+      '@inquirer/ansi': 2.0.8
+      '@inquirer/core': 12.0.3(@types/node@25.9.5)
+      '@inquirer/figures': 2.0.9
+      '@inquirer/type': 4.1.1(@types/node@25.9.5)
     optionalDependencies:
       '@types/node': 25.9.5
 
@@ -8152,6 +8316,14 @@ snapshots:
       '@inquirer/type': 4.0.7(@types/node@25.9.5)
     optionalDependencies:
       '@types/node': 25.9.5
+    optional: true
+
+  '@inquirer/confirm@6.3.2(@types/node@25.9.5)':
+    dependencies:
+      '@inquirer/core': 12.0.3(@types/node@25.9.5)
+      '@inquirer/type': 4.1.1(@types/node@25.9.5)
+    optionalDependencies:
+      '@types/node': 25.9.5
 
   '@inquirer/core@11.2.1(@types/node@25.9.5)':
     dependencies:
@@ -8164,95 +8336,116 @@ snapshots:
       signal-exit: 4.1.0
     optionalDependencies:
       '@types/node': 25.9.5
+    optional: true
 
-  '@inquirer/editor@5.2.2(@types/node@25.9.5)':
+  '@inquirer/core@12.0.3(@types/node@25.9.5)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@25.9.5)
-      '@inquirer/external-editor': 3.0.3(@types/node@25.9.5)
-      '@inquirer/type': 4.0.7(@types/node@25.9.5)
+      '@inquirer/ansi': 2.0.8
+      '@inquirer/figures': 2.0.9
+      '@inquirer/type': 4.1.1(@types/node@25.9.5)
+      cli-width: 4.1.0
+      fast-wrap-ansi: 0.2.2
+      mute-stream: 3.0.0
+      signal-exit: 4.1.0
     optionalDependencies:
       '@types/node': 25.9.5
 
-  '@inquirer/expand@5.1.1(@types/node@25.9.5)':
+  '@inquirer/editor@5.3.3(@types/node@25.9.5)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@25.9.5)
-      '@inquirer/type': 4.0.7(@types/node@25.9.5)
+      '@inquirer/core': 12.0.3(@types/node@25.9.5)
+      '@inquirer/external-editor': 3.0.5(@types/node@25.9.5)
+      '@inquirer/type': 4.1.1(@types/node@25.9.5)
+    optionalDependencies:
+      '@types/node': 25.9.5
+
+  '@inquirer/expand@5.1.5(@types/node@25.9.5)':
+    dependencies:
+      '@inquirer/core': 12.0.3(@types/node@25.9.5)
+      '@inquirer/type': 4.1.1(@types/node@25.9.5)
     optionalDependencies:
       '@types/node': 25.9.5
 
-  '@inquirer/external-editor@3.0.3(@types/node@25.9.5)':
+  '@inquirer/external-editor@3.0.5(@types/node@25.9.5)':
     dependencies:
       chardet: 2.2.0
       iconv-lite: 0.7.2
     optionalDependencies:
       '@types/node': 25.9.5
 
-  '@inquirer/figures@2.0.7': {}
+  '@inquirer/figures@2.0.7':
+    optional: true
+
+  '@inquirer/figures@2.0.9': {}
 
-  '@inquirer/input@5.1.2(@types/node@25.9.5)':
+  '@inquirer/input@5.1.6(@types/node@25.9.5)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@25.9.5)
-      '@inquirer/type': 4.0.7(@types/node@25.9.5)
+      '@inquirer/core': 12.0.3(@types/node@25.9.5)
+      '@inquirer/type': 4.1.1(@types/node@25.9.5)
     optionalDependencies:
       '@types/node': 25.9.5
 
-  '@inquirer/number@4.1.1(@types/node@25.9.5)':
+  '@inquirer/number@4.2.3(@types/node@25.9.5)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@25.9.5)
-      '@inquirer/type': 4.0.7(@types/node@25.9.5)
+      '@inquirer/core': 12.0.3(@types/node@25.9.5)
+      '@inquirer/type': 4.1.1(@types/node@25.9.5)
     optionalDependencies:
       '@types/node': 25.9.5
 
-  '@inquirer/password@5.1.1(@types/node@25.9.5)':
+  '@inquirer/password@5.2.2(@types/node@25.9.5)':
     dependencies:
-      '@inquirer/ansi': 2.0.7
-      '@inquirer/core': 11.2.1(@types/node@25.9.5)
-      '@inquirer/type': 4.0.7(@types/node@25.9.5)
+      '@inquirer/ansi': 2.0.8
+      '@inquirer/core': 12.0.3(@types/node@25.9.5)
+      '@inquirer/type': 4.1.1(@types/node@25.9.5)
     optionalDependencies:
       '@types/node': 25.9.5
 
-  '@inquirer/prompts@8.5.2(@types/node@25.9.5)':
-    dependencies:
-      '@inquirer/checkbox': 5.2.1(@types/node@25.9.5)
-      '@inquirer/confirm': 6.1.1(@types/node@25.9.5)
-      '@inquirer/editor': 5.2.2(@types/node@25.9.5)
-      '@inquirer/expand': 5.1.1(@types/node@25.9.5)
-      '@inquirer/input': 5.1.2(@types/node@25.9.5)
-      '@inquirer/number': 4.1.1(@types/node@25.9.5)
-      '@inquirer/password': 5.1.1(@types/node@25.9.5)
-      '@inquirer/rawlist': 5.3.1(@types/node@25.9.5)
-      '@inquirer/search': 4.2.1(@types/node@25.9.5)
-      '@inquirer/select': 5.2.1(@types/node@25.9.5)
+  '@inquirer/prompts@8.7.2(@types/node@25.9.5)':
+    dependencies:
+      '@inquirer/checkbox': 5.2.5(@types/node@25.9.5)
+      '@inquirer/confirm': 6.3.2(@types/node@25.9.5)
+      '@inquirer/editor': 5.3.3(@types/node@25.9.5)
+      '@inquirer/expand': 5.1.5(@types/node@25.9.5)
+      '@inquirer/input': 5.1.6(@types/node@25.9.5)
+      '@inquirer/number': 4.2.3(@types/node@25.9.5)
+      '@inquirer/password': 5.2.2(@types/node@25.9.5)
+      '@inquirer/rawlist': 5.3.5(@types/node@25.9.5)
+      '@inquirer/search': 4.3.3(@types/node@25.9.5)
+      '@inquirer/select': 5.2.5(@types/node@25.9.5)
     optionalDependencies:
       '@types/node': 25.9.5
 
-  '@inquirer/rawlist@5.3.1(@types/node@25.9.5)':
+  '@inquirer/rawlist@5.3.5(@types/node@25.9.5)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@25.9.5)
-      '@inquirer/type': 4.0.7(@types/node@25.9.5)
+      '@inquirer/core': 12.0.3(@types/node@25.9.5)
+      '@inquirer/type': 4.1.1(@types/node@25.9.5)
     optionalDependencies:
       '@types/node': 25.9.5
 
-  '@inquirer/search@4.2.1(@types/node@25.9.5)':
+  '@inquirer/search@4.3.3(@types/node@25.9.5)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@25.9.5)
-      '@inquirer/figures': 2.0.7
-      '@inquirer/type': 4.0.7(@types/node@25.9.5)
+      '@inquirer/core': 12.0.3(@types/node@25.9.5)
+      '@inquirer/figures': 2.0.9
+      '@inquirer/type': 4.1.1(@types/node@25.9.5)
     optionalDependencies:
       '@types/node': 25.9.5
 
-  '@inquirer/select@5.2.1(@types/node@25.9.5)':
+  '@inquirer/select@5.2.5(@types/node@25.9.5)':
     dependencies:
-      '@inquirer/ansi': 2.0.7
-      '@inquirer/core': 11.2.1(@types/node@25.9.5)
-      '@inquirer/figures': 2.0.7
-      '@inquirer/type': 4.0.7(@types/node@25.9.5)
+      '@inquirer/ansi': 2.0.8
+      '@inquirer/core': 12.0.3(@types/node@25.9.5)
+      '@inquirer/figures': 2.0.9
+      '@inquirer/type': 4.1.1(@types/node@25.9.5)
     optionalDependencies:
       '@types/node': 25.9.5
 
   '@inquirer/type@4.0.7(@types/node@25.9.5)':
     optionalDependencies:
       '@types/node': 25.9.5
+    optional: true
+
+  '@inquirer/type@4.1.1(@types/node@25.9.5)':
+    optionalDependencies:
+      '@types/node': 25.9.5
 
   '@isaacs/fs-minipass@4.0.1':
     dependencies:
@@ -8272,6 +8465,8 @@ snapshots:
 
   '@jridgewell/sourcemap-codec@1.5.5': {}
 
+  '@jridgewell/sourcemap-codec@1.6.0': {}
+
   '@jridgewell/trace-mapping@0.3.31':
     dependencies:
       '@jridgewell/resolve-uri': 3.1.2
@@ -9687,39 +9882,75 @@ snapshots:
   '@swc/core-darwin-arm64@1.15.46':
     optional: true
 
+  '@swc/core-darwin-arm64@1.16.2':
+    optional: true
+
   '@swc/core-darwin-x64@1.15.46':
     optional: true
 
+  '@swc/core-darwin-x64@1.16.2':
+    optional: true
+
   '@swc/core-linux-arm-gnueabihf@1.15.46':
     optional: true
 
+  '@swc/core-linux-arm-gnueabihf@1.16.2':
+    optional: true
+
   '@swc/core-linux-arm64-gnu@1.15.46':
     optional: true
 
+  '@swc/core-linux-arm64-gnu@1.16.2':
+    optional: true
+
   '@swc/core-linux-arm64-musl@1.15.46':
     optional: true
 
+  '@swc/core-linux-arm64-musl@1.16.2':
+    optional: true
+
   '@swc/core-linux-ppc64-gnu@1.15.46':
     optional: true
 
+  '@swc/core-linux-ppc64-gnu@1.16.2':
+    optional: true
+
   '@swc/core-linux-s390x-gnu@1.15.46':
     optional: true
 
+  '@swc/core-linux-s390x-gnu@1.16.2':
+    optional: true
+
   '@swc/core-linux-x64-gnu@1.15.46':
     optional: true
 
+  '@swc/core-linux-x64-gnu@1.16.2':
+    optional: true
+
   '@swc/core-linux-x64-musl@1.15.46':
     optional: true
 
+  '@swc/core-linux-x64-musl@1.16.2':
+    optional: true
+
   '@swc/core-win32-arm64-msvc@1.15.46':
     optional: true
 
+  '@swc/core-win32-arm64-msvc@1.16.2':
+    optional: true
+
   '@swc/core-win32-ia32-msvc@1.15.46':
     optional: true
 
+  '@swc/core-win32-ia32-msvc@1.16.2':
+    optional: true
+
   '@swc/core-win32-x64-msvc@1.15.46':
     optional: true
 
+  '@swc/core-win32-x64-msvc@1.16.2':
+    optional: true
+
   '@swc/core@1.15.46':
     dependencies:
       '@swc/counter': 0.1.3
@@ -9738,12 +9969,34 @@ snapshots:
       '@swc/core-win32-ia32-msvc': 1.15.46
       '@swc/core-win32-x64-msvc': 1.15.46
 
+  '@swc/core@1.16.2':
+    dependencies:
+      '@swc/counter': 0.1.3
+      '@swc/types': 0.1.28
+    optionalDependencies:
+      '@swc/core-darwin-arm64': 1.16.2
+      '@swc/core-darwin-x64': 1.16.2
+      '@swc/core-linux-arm-gnueabihf': 1.16.2
+      '@swc/core-linux-arm64-gnu': 1.16.2
+      '@swc/core-linux-arm64-musl': 1.16.2
+      '@swc/core-linux-ppc64-gnu': 1.16.2
+      '@swc/core-linux-s390x-gnu': 1.16.2
+      '@swc/core-linux-x64-gnu': 1.16.2
+      '@swc/core-linux-x64-musl': 1.16.2
+      '@swc/core-win32-arm64-msvc': 1.16.2
+      '@swc/core-win32-ia32-msvc': 1.16.2
+      '@swc/core-win32-x64-msvc': 1.16.2
+
   '@swc/counter@0.1.3': {}
 
   '@swc/types@0.1.27':
     dependencies:
       '@swc/counter': 0.1.3
 
+  '@swc/types@0.1.28':
+    dependencies:
+      '@swc/counter': 0.1.3
+
   '@szmarczak/http-timer@4.0.6':
     dependencies:
       defer-to-connect: 2.0.1
@@ -10548,7 +10801,7 @@ snapshots:
     dependencies:
       '@xterm/xterm': 6.1.0-beta.303(patch_hash=dd0ccc59cd1ccf99f4d76e5aa2456da165fa0804dce19a833d7638bd07ffa393)
 
-  '@xterm/addon-image@0.10.0-beta.300(patch_hash=5fc280019957573eefe8daa2969534d6090ddb29c6b5842b8f22e99dc1ce3146)(@xterm/xterm@6.1.0-beta.303(patch_hash=dd0ccc59cd1ccf99f4d76e5aa2456da165fa0804dce19a833d7638bd07ffa393))':
+  '@xterm/addon-image@0.10.0-beta.300(patch_hash=e5254a46d6f57bef4a8a19683bfa685afa0ca0127545aea53b54a48104ca3562)(@xterm/xterm@6.1.0-beta.303(patch_hash=dd0ccc59cd1ccf99f4d76e5aa2456da165fa0804dce19a833d7638bd07ffa393))':
     dependencies:
       '@xterm/xterm': 6.1.0-beta.303(patch_hash=dd0ccc59cd1ccf99f4d76e5aa2456da165fa0804dce19a833d7638bd07ffa393)
 
@@ -10964,6 +11217,8 @@ snapshots:
 
   commander@14.0.3: {}
 
+  commander@15.0.0: {}
+
   commander@5.1.0: {}
 
   commander@7.2.0: {}
@@ -11431,7 +11686,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  electron@43.7.0(supports-color@7.2.0):
+  electron@43.7.5(supports-color@7.2.0):
     dependencies:
       '@electron-internal/extract-zip': 1.0.4
       '@electron/get': 5.0.0(supports-color@7.2.0)
@@ -11624,6 +11879,21 @@ snapshots:
     dependencies:
       eventsource-parser: 3.0.8
 
+  execa@10.0.1:
+    dependencies:
+      '@sindresorhus/merge-streams': 4.0.0
+      figures: 6.1.0
+      get-stream: 9.0.1
+      human-signals: 8.0.1
+      is-plain-obj: 4.1.0
+      is-stream: 4.0.1
+      npm-run-path: 6.0.0
+      pretty-ms: 9.3.0
+      signal-exit: 4.1.0
+      strip-final-newline: 4.0.0
+      which-command: 0.1.0
+      yoctocolors: 2.1.2
+
   execa@5.1.1:
     dependencies:
       cross-spawn: 7.0.6
@@ -12165,36 +12435,36 @@ snapshots:
 
   husky@9.1.7: {}
 
-  i18next-cli@1.65.0(@types/node@25.9.5)(react-dom@19.2.8(react@19.2.8))(typescript@7.0.2):
+  i18next-cli@1.74.2(patch_hash=7955b89d3aa229f477408608d331f78c85148a85a85913729f89fac65ad8b207)(@types/node@25.9.5)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2):
     dependencies:
       '@croct/json5-parser': 0.2.2
-      '@swc/core': 1.15.46
+      '@swc/core': 1.16.2
       chokidar: 5.0.0
-      commander: 14.0.3
-      execa: 9.6.1
+      commander: 15.0.0
+      execa: 10.0.1
       glob: 13.0.6
-      i18next: 26.3.1(typescript@7.0.2)
-      i18next-resources-for-ts: 2.1.0
-      inquirer: 14.0.2(@types/node@25.9.5)
+      i18next: 26.4.2(typescript@7.0.2)
+      i18next-resources-for-ts: 2.1.1
+      inquirer: 14.2.2(@types/node@25.9.5)
       jiti: 2.7.0
       jsonc-parser: 3.3.1
-      magic-string: 0.30.21
-      minimatch: 10.2.5
-      ora: 9.4.0
-      react: 19.2.8
-      react-i18next: 17.0.15(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2)
+      magic-string: 1.4.2
+      minimatch: 10.2.6
+      ora: 9.4.1
+      react-i18next: 17.0.15(i18next@26.4.2(typescript@7.0.2))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2)
       yaml: 2.9.1
     transitivePeerDependencies:
       - '@swc/helpers'
       - '@types/node'
+      - react
       - react-dom
       - react-native
       - typescript
 
-  i18next-resources-for-ts@2.1.0:
+  i18next-resources-for-ts@2.1.1:
     dependencies:
       '@babel/runtime': 7.29.7
-      '@swc/core': 1.15.46
+      '@swc/core': 1.16.2
       chokidar: 5.0.0
       yaml: 2.9.1
     transitivePeerDependencies:
@@ -12204,6 +12474,10 @@ snapshots:
     optionalDependencies:
       typescript: 7.0.2
 
+  i18next@26.4.2(typescript@7.0.2):
+    optionalDependencies:
+      typescript: 7.0.2
+
   iconv-lite@0.6.3:
     dependencies:
       safer-buffer: 2.1.2
@@ -12234,12 +12508,12 @@ snapshots:
 
   inline-style-parser@0.2.7: {}
 
-  inquirer@14.0.2(@types/node@25.9.5):
+  inquirer@14.2.2(@types/node@25.9.5):
     dependencies:
-      '@inquirer/ansi': 2.0.7
-      '@inquirer/core': 11.2.1(@types/node@25.9.5)
-      '@inquirer/prompts': 8.5.2(@types/node@25.9.5)
-      '@inquirer/type': 4.0.7(@types/node@25.9.5)
+      '@inquirer/ansi': 2.0.8
+      '@inquirer/core': 12.0.3(@types/node@25.9.5)
+      '@inquirer/prompts': 8.7.2(@types/node@25.9.5)
+      '@inquirer/type': 4.1.1(@types/node@25.9.5)
       mute-stream: 3.0.0
       run-async: 4.0.6
     optionalDependencies:
@@ -12551,6 +12825,10 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
 
+  magic-string@1.4.2:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.6.0
+
   markdown-table@3.0.4: {}
 
   marked@14.0.0: {}
@@ -13050,6 +13328,10 @@ snapshots:
     dependencies:
       brace-expansion: 5.0.9
 
+  minimatch@10.2.6:
+    dependencies:
+      brace-expansion: 5.0.9
+
   minimatch@3.1.5:
     dependencies:
       brace-expansion: 1.1.18
@@ -13155,7 +13437,7 @@ snapshots:
 
   node-int64@0.4.0: {}
 
-  node-pty@1.1.0(patch_hash=346cb29d33dd6eeb14910ff411c7584b0b2ff9a4b271c4b6d23c3b48e6548f74):
+  node-pty@1.1.0(patch_hash=92c95cffab383d86b3b13a460c75a08074468ebf1f3911db8e874e083201f192):
     dependencies:
       node-addon-api: 7.1.1
 
@@ -13246,6 +13528,17 @@ snapshots:
       stdin-discarder: 0.3.2
       string-width: 8.2.1
 
+  ora@9.4.1:
+    dependencies:
+      chalk: 5.6.2
+      cli-cursor: 5.0.0
+      cli-spinners: 3.4.0
+      is-interactive: 2.0.0
+      is-unicode-supported: 2.1.0
+      log-symbols: 7.0.1
+      stdin-discarder: 0.3.2
+      string-width: 8.2.1
+
   orderedmap@2.1.1: {}
 
   outvariant@1.4.3:
@@ -13769,6 +14062,17 @@ snapshots:
       react-dom: 19.2.8(react@19.2.8)
       typescript: 7.0.2
 
+  react-i18next@17.0.15(i18next@26.4.2(typescript@7.0.2))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2):
+    dependencies:
+      '@babel/runtime': 7.29.7
+      html-parse-stringify: 4.0.1
+      i18next: 26.4.2(typescript@7.0.2)
+      react: 19.2.8
+      use-sync-external-store: 1.6.0(react@19.2.8)
+    optionalDependencies:
+      react-dom: 19.2.8(react@19.2.8)
+      typescript: 7.0.2
+
   react-is@17.0.2: {}
 
   react-markdown@10.1.0(@types/react@19.2.17)(react@19.2.8):
@@ -14705,6 +15009,8 @@ snapshots:
 
   whatwg-mimetype@3.0.0: {}
 
+  which-command@0.1.0: {}
+
   which-module@2.0.1: {}
 
   which@2.0.2:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 1cf678294784..cbb3e10ad4c1 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -16,8 +16,8 @@ minimumReleaseAge: 4320
 minimumReleaseAgeExclude:
   - pdfjs-dist@6.3.289
   - zod@4.5.4
-  - electron@43.7.0
   - '@shadcn/lint@0.1.0'
+  - i18next-cli@1.74.2
 shamefullyHoist: true
 
 # Orca always launches the user's own resolved Claude CLI via
@@ -69,3 +69,4 @@ patchedDependencies:
   '@xterm/xterm@6.1.0-beta.303': config/patches/@xterm__xterm@6.1.0-beta.303.patch
   lint-staged@16.4.0: config/patches/lint-staged@16.4.0.patch
   '@vscode/windows-process-tree@0.8.0': config/patches/@vscode__windows-process-tree@0.8.0.patch
+  i18next-cli@1.74.2: config/patches/i18next-cli@1.74.2.patch
diff --git a/src/cli/cli-command-name-parity.test.ts b/src/cli/cli-command-name-parity.test.ts
deleted file mode 100644
index 32bbcc06add1..000000000000
--- a/src/cli/cli-command-name-parity.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { CLI_COMMAND_NAMES } from '../main/startup/cli-command-names'
-import { COMMAND_SPECS } from './specs'
-
-const specCommandNames = [...new Set(COMMAND_SPECS.map((spec) => spec.path[0]))].sort()
-
-describe('CLI command-name parity between COMMAND_SPECS and the launch redirect', () => {
-  it('has commands to compare', () => {
-    expect(specCommandNames.length).toBeGreaterThan(0)
-  })
-
-  it('redirects every top-level CLI command', () => {
-    const redirected = new Set<string>(CLI_COMMAND_NAMES)
-    expect(specCommandNames.filter((name) => !redirected.has(name))).toEqual([])
-  })
-
-  it('lists no command that COMMAND_SPECS does not define', () => {
-    const specNames = new Set(specCommandNames)
-    expect([...CLI_COMMAND_NAMES].filter((name) => !specNames.has(name))).toEqual([])
-  })
-
-  it('stays sorted and free of duplicates so additions are easy to review', () => {
-    expect([...CLI_COMMAND_NAMES]).toEqual([...new Set(CLI_COMMAND_NAMES)].sort())
-  })
-})
diff --git a/src/cli/codex-command-classification.test.ts b/src/cli/codex-command-classification.test.ts
index ce92d15ee65c..ec178efa55e0 100644
--- a/src/cli/codex-command-classification.test.ts
+++ b/src/cli/codex-command-classification.test.ts
@@ -38,6 +38,11 @@ describe('shouldUseRendererBackedCodexTerminal', () => {
     expect(shouldUseRendererBackedCodexTerminal('codex --help')).toBe(false)
   })
 
+  it('reads --no-daemon as a flag, not the subcommand', () => {
+    expect(shouldUseRendererBackedCodexTerminal('codex --no-daemon resume --last')).toBe(true)
+    expect(shouldUseRendererBackedCodexTerminal('codex --no-daemon exec summarize')).toBe(false)
+  })
+
   it('ignores non-Codex commands', () => {
     expect(shouldUseRendererBackedCodexTerminal(undefined)).toBe(false)
     expect(shouldUseRendererBackedCodexTerminal('claude')).toBe(false)
diff --git a/src/cli/codex-command-classification.ts b/src/cli/codex-command-classification.ts
index 941b02c24f62..b68efdcb60d6 100644
--- a/src/cli/codex-command-classification.ts
+++ b/src/cli/codex-command-classification.ts
@@ -62,6 +62,7 @@ const CODEX_GLOBAL_BOOLEAN_FLAGS = new Set([
   '--dangerously-bypass-approvals-and-sandbox',
   '--search',
   '--no-alt-screen',
+  '--no-daemon',
   '--help',
   '-h',
   '--version',
diff --git a/src/cli/command-spec.ts b/src/cli/command-spec.ts
index 1922888a2925..dbb28a66d71c 100644
--- a/src/cli/command-spec.ts
+++ b/src/cli/command-spec.ts
@@ -15,8 +15,13 @@ export type CommandSpec = {
   positionalArgs?: string[]
   examples?: string[]
   notes?: string[]
+  // Why: `--from`/`--terminal` names either the acting caller or a target, and only the spec can
+  // say which. An agent session refuses a caller flag naming anyone else before dispatch.
+  identityFlagRoles?: Partial<Record<IdentityFlag, 'caller' | 'target'>>
 }
 
+export type IdentityFlag = 'from' | 'terminal'
+
 export function specPaths(spec: CommandSpec): string[][] {
   return spec.aliases ? [spec.path, ...spec.aliases] : [spec.path]
 }
diff --git a/src/cli/dispatch.ts b/src/cli/dispatch.ts
index d74de65119e3..7ad882b1e116 100644
--- a/src/cli/dispatch.ts
+++ b/src/cli/dispatch.ts
@@ -32,8 +32,7 @@ function buildRoutes(groups: readonly HandlerGroup[]): Map<string, HandlerGroup>
 
 const ROUTES = buildRoutes(HANDLER_GROUPS)
 
-// Why: exposes only the canonical command keys (not the handler internals) so the
-// registry-parity guard can check specs↔handlers without rebuilding the table.
+// Why: exposes only the canonical command keys, not the handler internals.
 export const HANDLER_COMMAND_KEYS: ReadonlySet<string> = new Set(ROUTES.keys())
 
 export async function dispatch(commandPath: string[], ctx: HandlerContext): Promise<void> {
diff --git a/src/cli/handler-group-manifest.test.ts b/src/cli/handler-group-manifest.test.ts
index 3849f39a7c9b..147305d72a5f 100644
--- a/src/cli/handler-group-manifest.test.ts
+++ b/src/cli/handler-group-manifest.test.ts
@@ -36,27 +36,6 @@ function isHandlerRecord(value: unknown): value is Record<string, unknown> {
 }
 
 describe('handler group manifest', () => {
-  it('lists a loadable group for every entry', async () => {
-    for (const group of HANDLER_GROUPS) {
-      const loaded = await group.load()
-      expect(loaded, `${group.name} resolved to a non-record`).toBeTypeOf('object')
-    }
-  })
-
-  it('matches each group export key-for-key', async () => {
-    const drift: string[] = []
-    for (const group of HANDLER_GROUPS) {
-      const actual = Object.keys(await group.load()).sort()
-      const declared = [...group.keys].sort()
-      if (JSON.stringify(actual) !== JSON.stringify(declared)) {
-        drift.push(
-          `${group.name}: manifest ${JSON.stringify(declared)} !== export ${JSON.stringify(actual)}`
-        )
-      }
-    }
-    expect(drift).toEqual([])
-  })
-
   it('exposes every declared key as a callable handler', async () => {
     const notCallable: string[] = []
     for (const group of HANDLER_GROUPS) {
@@ -70,15 +49,6 @@ describe('handler group manifest', () => {
     expect(notCallable).toEqual([])
   })
 
-  it('reaches every group through dispatch routing', () => {
-    const routes = buildHandlerRoutes(HANDLER_GROUPS)
-    const reached = new Set([...routes.values()].map((group) => group.name))
-    const unreachable = HANDLER_GROUPS.filter((group) => !reached.has(group.name)).map(
-      (group) => group.name
-    )
-    expect(unreachable).toEqual([])
-  })
-
   // Why: dropping a group from the manifest silently unregisters its commands —
   // walk the tree so a new or forgotten handler file fails here, not in prod.
   // Nested modules are spread into a parent group rather than registered under
diff --git a/src/cli/handlers/agent-hooks.ts b/src/cli/handlers/agent-hooks.ts
index 74b4596accb4..91fd5ecde06c 100644
--- a/src/cli/handlers/agent-hooks.ts
+++ b/src/cli/handlers/agent-hooks.ts
@@ -13,6 +13,7 @@ import { DEFAULT_LOCAL_ORCA_PROFILE_ID } from '../../shared/orca-profiles'
 import { normalizeDisabledTuiAgents } from '../../shared/tui-agent-selection'
 import type { GlobalSettings } from '../../shared/global-settings-types'
 import { prepareManagedCodexHomeBeforeShellLaunch } from '../../main/codex/managed-home-shell-preflight'
+import { isAgentStatusHooksEnabledForAgent } from '../../shared/agent-status-hooks-setting'
 import type { ProfileStateOfflineLocation } from '../../main/persistence/profile-state/profile-state-offline-settings'
 
 type AgentHookCommandResult = {
@@ -214,11 +215,9 @@ export const AGENT_HOOK_HANDLERS: Record<string, CommandHandler> = {
       }
       return
     }
-    const settings = await readHookSettings(client)
     await prepareManagedCodexHomeBeforeShellLaunch({
       userDataPath: getDefaultUserDataPath(),
-      hooksEnabled:
-        settings.agentStatusHooksEnabled && !settings.disabledTuiAgents.includes('codex')
+      hooksEnabled: isAgentStatusHooksEnabledForAgent(await readHookSettings(client), 'codex')
     })
   },
   'agent hooks status': async ({ json, flags }) => {
diff --git a/src/cli/handlers/orchestration-timeout-cli.test.ts b/src/cli/handlers/orchestration-timeout-cli.test.ts
deleted file mode 100644
index 9f60548a8097..000000000000
--- a/src/cli/handlers/orchestration-timeout-cli.test.ts
+++ /dev/null
@@ -1,288 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const callMock = vi.fn()
-const originalExitCode = process.exitCode
-const originalCliCommand = process.env.ORCA_CLI_COMMAND
-
-vi.mock('../format', () => ({ printResult: vi.fn() }))
-vi.mock('../selectors', () => ({ getTerminalHandle: vi.fn() }))
-
-import { printResult } from '../format'
-import { ORCHESTRATION_HANDLERS } from './orchestration'
-
-describe('orchestration timeout flag validation', () => {
-  const invalidTimeoutValues: [string, string | boolean][] = [
-    ['missing', true],
-    ['empty', ''],
-    ['non-numeric', 'not-a-number'],
-    ['zero', '0'],
-    ['negative', '-1']
-  ]
-
-  beforeEach(() => {
-    callMock.mockReset()
-    delete process.env.ORCA_TERMINAL_HANDLE
-    delete process.env.ORCA_PANE_KEY
-    process.exitCode = undefined
-  })
-
-  afterEach(() => {
-    process.exitCode = originalExitCode
-    if (originalCliCommand === undefined) {
-      delete process.env.ORCA_CLI_COMMAND
-    } else {
-      process.env.ORCA_CLI_COMMAND = originalCliCommand
-    }
-    vi.restoreAllMocks()
-  })
-
-  const invokeCheck = (flags: Map<string, string | boolean>) =>
-    ORCHESTRATION_HANDLERS['orchestration check']({
-      flags,
-      client: { call: callMock },
-      cwd: '/tmp/repo',
-      json: true
-    } as never)
-
-  const invokeAsk = (flags: Map<string, string | boolean>) =>
-    ORCHESTRATION_HANDLERS['orchestration ask']({
-      flags,
-      client: { call: callMock },
-      cwd: '/tmp/repo',
-      json: true
-    } as never)
-
-  const invokePlainAsk = (flags: Map<string, string | boolean>) =>
-    ORCHESTRATION_HANDLERS['orchestration ask']({
-      flags,
-      client: { call: callMock },
-      cwd: '/tmp/repo',
-      json: false
-    } as never)
-
-  it.each(invalidTimeoutValues)('rejects invalid check --timeout-ms: %s', async (_label, value) => {
-    await expect(
-      invokeCheck(
-        new Map<string, string | boolean>([
-          ['wait', true],
-          ['timeout-ms', value]
-        ])
-      )
-    ).rejects.toThrow(/--timeout-ms/)
-    expect(callMock).not.toHaveBeenCalled()
-  })
-
-  it('passes a parsed check timeout and peek mode into the RPC payload', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    callMock.mockResolvedValue({ result: { messages: [], count: 0 } })
-    await invokeCheck(
-      new Map<string, string | boolean>([
-        ['wait', true],
-        ['peek', true],
-        ['timeout-ms', '250']
-      ])
-    )
-    // Why: unread:false makes pre-peek runtimes fall back to non-consuming all mode.
-    expect(callMock).toHaveBeenCalledWith('orchestration.check', {
-      terminal: 'term_worker',
-      terminalPaneKey: undefined,
-      unread: false,
-      peek: true,
-      all: undefined,
-      types: undefined,
-      format: undefined,
-      compatibilityCliCommand: expect.stringMatching(/^orca(?:-ide)?$/),
-      run: undefined,
-      ack: undefined,
-      wait: true,
-      timeoutMs: 250
-    })
-  })
-
-  it('filters already-read rows from a peek response for pre-peek runtimes', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    callMock.mockResolvedValue({
-      result: {
-        messages: [
-          { id: 'msg_old', from_handle: 'a', subject: 'seen', read: 1 },
-          { id: 'msg_new', from_handle: 'a', subject: 'fresh', read: 0 }
-        ],
-        count: 2,
-        formatted: 'banners built from all rows'
-      }
-    })
-    vi.mocked(printResult).mockClear()
-    await invokeCheck(new Map<string, string | boolean>([['peek', true]]))
-    const response = vi.mocked(printResult).mock.calls[0]?.[0] as {
-      result: { messages: { id: string }[]; count: number; formatted?: string }
-    }
-    expect(response.result.messages.map((message) => message.id)).toEqual(['msg_new'])
-    expect(response.result.count).toBe(1)
-    expect(response.result.formatted).toBeUndefined()
-  })
-
-  it('rejects combined read modes before calling the runtime', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    await expect(
-      invokeCheck(
-        new Map<string, string | boolean>([
-          ['unread', true],
-          ['peek', true]
-        ])
-      )
-    ).rejects.toMatchObject({
-      code: 'invalid_argument',
-      message: expect.stringContaining('read mode')
-    })
-    expect(callMock).not.toHaveBeenCalled()
-  })
-
-  it('warns when a pre-peek runtime returned a full 100-row page', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    const rows = Array.from({ length: 100 }, (_, index) => ({
-      id: `msg_${index}`,
-      from_handle: 'a',
-      subject: `s${index}`,
-      read: index === 0 ? 0 : 1
-    }))
-    callMock.mockResolvedValue({ result: { messages: rows, count: 100 } })
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-    await invokeCheck(new Map<string, string | boolean>([['peek', true]]))
-    expect(errorSpy).toHaveBeenCalledWith(expect.stringContaining('newest 100 messages'))
-    errorSpy.mockRestore()
-  })
-
-  it('fails --peek --wait against a runtime that returned only read rows', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    callMock.mockResolvedValue({
-      result: {
-        messages: [{ id: 'msg_old', from_handle: 'a', subject: 'seen', read: 1 }],
-        count: 1
-      }
-    })
-    await expect(
-      invokeCheck(
-        new Map<string, string | boolean>([
-          ['peek', true],
-          ['wait', true]
-        ])
-      )
-    ).rejects.toMatchObject({ code: 'peek_wait_unsupported' })
-  })
-
-  it.each(invalidTimeoutValues)('rejects invalid ask --timeout-ms: %s', async (_label, value) => {
-    await expect(
-      invokeAsk(
-        new Map<string, string | boolean>([
-          ['to', 'term_coord'],
-          ['question', 'Proceed?'],
-          ['timeout-ms', value]
-        ])
-      )
-    ).rejects.toThrow(/--timeout-ms/)
-    expect(callMock).not.toHaveBeenCalled()
-  })
-
-  it('uses the parsed ask timeout for both runtime wait and client timeout', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    callMock.mockResolvedValue({
-      result: { answer: 'yes', messageId: 'msg_1', threadId: 'thread_1', timedOut: false }
-    })
-    vi.spyOn(console, 'log').mockImplementation(() => {})
-    await invokeAsk(
-      new Map<string, string | boolean>([
-        ['to', 'term_coord'],
-        ['question', 'Proceed?'],
-        ['timeout-ms', '123']
-      ])
-    )
-    expect(callMock).toHaveBeenCalledWith(
-      'orchestration.ask',
-      {
-        to: 'term_coord',
-        run: undefined,
-        question: 'Proceed?',
-        resume: undefined,
-        options: undefined,
-        timeoutMs: 123,
-        from: 'term_worker',
-        compatibilityCliCommand: expect.stringMatching(/^orca(?:-ide)?$/),
-        compatibilityWindowsCommand: undefined
-      },
-      { timeoutMs: 5_123, orchestrationCapability: undefined }
-    )
-  })
-
-  it('passes an ask resume without creating a new question payload', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    callMock.mockResolvedValue({
-      result: {
-        answer: 'yes',
-        messageId: 'msg_question',
-        threadId: 'msg_question',
-        timedOut: false
-      }
-    })
-    vi.spyOn(console, 'log').mockImplementation(() => {})
-    await invokeAsk(new Map<string, string | boolean>([['resume', 'msg_question']]))
-    expect(callMock).toHaveBeenCalledWith(
-      'orchestration.ask',
-      {
-        to: undefined,
-        run: undefined,
-        question: undefined,
-        resume: 'msg_question',
-        options: undefined,
-        timeoutMs: undefined,
-        from: 'term_worker',
-        compatibilityCliCommand: expect.stringMatching(/^orca(?:-ide)?$/),
-        compatibilityWindowsCommand: undefined
-      },
-      { timeoutMs: 605_000, orchestrationCapability: undefined }
-    )
-  })
-
-  it('prints the pending message ID and exact capability-bound resume command on timeout', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    process.env.ORCA_CLI_COMMAND = 'orca-dev'
-    callMock.mockResolvedValue({
-      result: {
-        answer: null,
-        messageId: 'msg_question',
-        threadId: 'thread_question',
-        timedOut: true,
-        timeoutMs: 30_000
-      }
-    })
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-
-    await invokePlainAsk(
-      new Map<string, string | boolean>([
-        ['question', 'Proceed?'],
-        ['dispatch-capability', 'dcap_secret'],
-        ['timeout-ms', '30000']
-      ])
-    )
-
-    expect(errorSpy).toHaveBeenCalledWith(
-      'ask timeout after 30000ms; question is still pending (messageId: msg_question). ' +
-        'Resume waiting; do not ask again:\n' +
-        'orca-dev orchestration ask --from term_worker --dispatch-capability dcap_secret ' +
-        '--resume msg_question --timeout-ms 30000'
-    )
-    expect(process.exitCode).toBe(1)
-  })
-
-  it('rejects ambiguous ask create/resume input before RPC', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    await expect(
-      invokeAsk(
-        new Map<string, string | boolean>([
-          ['question', 'new'],
-          ['resume', 'msg_old']
-        ])
-      )
-    ).rejects.toMatchObject({ code: 'invalid_argument' })
-    expect(callMock).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/cli/handlers/orchestration-timeout.test.ts b/src/cli/handlers/orchestration-timeout.test.ts
deleted file mode 100644
index 51f0d75098ea..000000000000
--- a/src/cli/handlers/orchestration-timeout.test.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const callMock = vi.fn()
-const getTerminalHandleMock = vi.hoisted(() => vi.fn())
-const originalTerminalHandle = process.env.ORCA_TERMINAL_HANDLE
-const originalPaneKey = process.env.ORCA_PANE_KEY
-
-vi.mock('../format', () => ({ printResult: vi.fn() }))
-vi.mock('../selectors', () => ({ getTerminalHandle: getTerminalHandleMock }))
-
-import { printResult } from '../format'
-import { ORCHESTRATION_HANDLERS } from './orchestration'
-
-const invalidTimeoutValues: [string, string | boolean][] = [
-  ['missing', true],
-  ['empty', ''],
-  ['non-numeric', 'not-a-number'],
-  ['zero', '0'],
-  ['negative', '-1'],
-  ['fractional', '1.5'],
-  ['rounded fractional', '9007199254740991.1'],
-  ['unsafe integer', String(Number.MAX_SAFE_INTEGER + 1)]
-]
-
-const invokeCheck = (flags: Map<string, string | boolean>) =>
-  ORCHESTRATION_HANDLERS['orchestration check']({
-    flags,
-    client: { call: callMock },
-    cwd: '/tmp/repo',
-    json: true
-  } as never)
-
-const invokeAsk = (flags: Map<string, string | boolean>) =>
-  ORCHESTRATION_HANDLERS['orchestration ask']({
-    flags,
-    client: { call: callMock },
-    cwd: '/tmp/repo',
-    json: true
-  } as never)
-
-beforeEach(() => {
-  callMock.mockReset()
-  getTerminalHandleMock.mockReset()
-  vi.mocked(printResult).mockReset()
-  delete process.env.ORCA_TERMINAL_HANDLE
-  delete process.env.ORCA_PANE_KEY
-})
-
-afterEach(() => {
-  if (originalTerminalHandle === undefined) {
-    delete process.env.ORCA_TERMINAL_HANDLE
-  } else {
-    process.env.ORCA_TERMINAL_HANDLE = originalTerminalHandle
-  }
-  if (originalPaneKey === undefined) {
-    delete process.env.ORCA_PANE_KEY
-  } else {
-    process.env.ORCA_PANE_KEY = originalPaneKey
-  }
-  vi.restoreAllMocks()
-})
-
-describe('orchestration timeout flag validation', () => {
-  it.each(invalidTimeoutValues)('rejects invalid check --timeout-ms: %s', async (_label, value) => {
-    const flags = new Map<string, string | boolean>([
-      ['wait', true],
-      ['timeout-ms', value]
-    ])
-
-    await expect(invokeCheck(flags)).rejects.toThrow(/--timeout-ms/)
-    expect(callMock).not.toHaveBeenCalled()
-    expect(getTerminalHandleMock).not.toHaveBeenCalled()
-  })
-
-  it('passes a parsed check timeout and peek mode into the RPC payload', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    callMock.mockResolvedValue({ result: { messages: [], count: 0 } })
-
-    await invokeCheck(
-      new Map<string, string | boolean>([
-        ['wait', true],
-        ['peek', true],
-        ['timeout-ms', '250']
-      ])
-    )
-
-    expect(callMock).toHaveBeenCalledWith('orchestration.check', {
-      terminal: 'term_worker',
-      terminalPaneKey: undefined,
-      unread: false,
-      peek: true,
-      all: undefined,
-      types: undefined,
-      format: undefined,
-      compatibilityCliCommand: expect.stringMatching(/^orca(?:-ide)?$/),
-      run: undefined,
-      ack: undefined,
-      wait: true,
-      timeoutMs: 250
-    })
-  })
-
-  it('filters already-read rows from a peek response for pre-peek runtimes', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    callMock.mockResolvedValue({
-      result: {
-        messages: [
-          { id: 'msg_old', from_handle: 'a', subject: 'seen', read: 1 },
-          { id: 'msg_new', from_handle: 'a', subject: 'fresh', read: 0 }
-        ],
-        count: 2,
-        formatted: 'banners built from all rows'
-      }
-    })
-
-    await invokeCheck(new Map<string, string | boolean>([['peek', true]]))
-
-    const response = vi.mocked(printResult).mock.calls[0]?.[0] as {
-      result: { messages: { id: string }[]; count: number; formatted?: string }
-    }
-    expect(response.result.messages.map((message) => message.id)).toEqual(['msg_new'])
-    expect(response.result.count).toBe(1)
-    expect(response.result.formatted).toBeUndefined()
-  })
-
-  it('rejects combined read modes before calling the runtime', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-
-    await expect(
-      invokeCheck(
-        new Map<string, string | boolean>([
-          ['unread', true],
-          ['peek', true]
-        ])
-      )
-    ).rejects.toMatchObject({
-      code: 'invalid_argument',
-      message: expect.stringContaining('read mode')
-    })
-    expect(callMock).not.toHaveBeenCalled()
-  })
-
-  it('warns when a pre-peek runtime returned a full 100-row page', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    const rows = Array.from({ length: 100 }, (_, index) => ({
-      id: `msg_${index}`,
-      from_handle: 'a',
-      subject: `s${index}`,
-      read: index === 0 ? 0 : 1
-    }))
-    callMock.mockResolvedValue({ result: { messages: rows, count: 100 } })
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-
-    await invokeCheck(new Map<string, string | boolean>([['peek', true]]))
-
-    expect(errorSpy).toHaveBeenCalledWith(expect.stringContaining('newest 100 messages'))
-  })
-
-  it('fails --peek --wait against a runtime that returned only read rows', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    callMock.mockResolvedValue({
-      result: {
-        messages: [{ id: 'msg_old', from_handle: 'a', subject: 'seen', read: 1 }],
-        count: 1
-      }
-    })
-
-    await expect(
-      invokeCheck(
-        new Map<string, string | boolean>([
-          ['peek', true],
-          ['wait', true]
-        ])
-      )
-    ).rejects.toMatchObject({ code: 'peek_wait_unsupported' })
-  })
-
-  it.each(invalidTimeoutValues)('rejects invalid ask --timeout-ms: %s', async (_label, value) => {
-    const flags = new Map<string, string | boolean>([
-      ['to', 'term_coord'],
-      ['question', 'Proceed?'],
-      ['timeout-ms', value]
-    ])
-
-    await expect(invokeAsk(flags)).rejects.toThrow(/--timeout-ms/)
-    expect(callMock).not.toHaveBeenCalled()
-    expect(getTerminalHandleMock).not.toHaveBeenCalled()
-  })
-
-  it.each([String(2_147_483_647), String(Number.MAX_SAFE_INTEGER)])(
-    'clamps a safe ask timeout %s before adding transport headroom',
-    async (rawTimeout) => {
-      process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-      callMock.mockResolvedValue({
-        result: { answer: 'yes', messageId: 'msg_1', threadId: 'thread_1', timedOut: false }
-      })
-      vi.spyOn(console, 'log').mockImplementation(() => {})
-
-      await invokeAsk(
-        new Map<string, string | boolean>([
-          ['to', 'term_coord'],
-          ['question', 'Proceed?'],
-          ['timeout-ms', rawTimeout]
-        ])
-      )
-
-      expect(callMock).toHaveBeenCalledWith(
-        'orchestration.ask',
-        expect.objectContaining({ timeoutMs: 1_800_000 }),
-        { timeoutMs: 1_805_000 }
-      )
-    }
-  )
-
-  it.each(['+1000', '1000.0', '1e3', '0x3e8'])(
-    'preserves CLI-compatible exact integer timeout syntax %s',
-    async (rawTimeout) => {
-      process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-      callMock.mockResolvedValue({
-        result: { answer: 'yes', messageId: 'msg_1', threadId: 'thread_1', timedOut: false }
-      })
-      vi.spyOn(console, 'log').mockImplementation(() => {})
-
-      await invokeAsk(
-        new Map<string, string | boolean>([
-          ['to', 'term_coord'],
-          ['question', 'Proceed?'],
-          ['timeout-ms', rawTimeout]
-        ])
-      )
-
-      expect(callMock).toHaveBeenCalledWith(
-        'orchestration.ask',
-        expect.objectContaining({ timeoutMs: 1_000 }),
-        { timeoutMs: 6_000 }
-      )
-    }
-  )
-
-  it('keeps an omitted ask timeout out of the payload while using default headroom', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    callMock.mockResolvedValue({
-      result: { answer: 'yes', messageId: 'msg_1', threadId: 'thread_1', timedOut: false }
-    })
-    vi.spyOn(console, 'log').mockImplementation(() => {})
-
-    await invokeAsk(
-      new Map<string, string | boolean>([
-        ['to', 'term_coord'],
-        ['question', 'Proceed?']
-      ])
-    )
-
-    expect(callMock).toHaveBeenCalledWith(
-      'orchestration.ask',
-      expect.objectContaining({ timeoutMs: undefined }),
-      { timeoutMs: 605_000 }
-    )
-  })
-
-  it('uses the parsed ask timeout for both runtime wait and client timeout', async () => {
-    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
-    callMock.mockResolvedValue({
-      result: { answer: 'yes', messageId: 'msg_1', threadId: 'thread_1', timedOut: false }
-    })
-    vi.spyOn(console, 'log').mockImplementation(() => {})
-
-    await invokeAsk(
-      new Map<string, string | boolean>([
-        ['to', 'term_coord'],
-        ['question', 'Proceed?'],
-        ['timeout-ms', '123']
-      ])
-    )
-
-    expect(callMock).toHaveBeenCalledWith(
-      'orchestration.ask',
-      {
-        to: 'term_coord',
-        run: undefined,
-        question: 'Proceed?',
-        resume: undefined,
-        options: undefined,
-        timeoutMs: 123,
-        from: 'term_worker',
-        compatibilityCliCommand: expect.stringMatching(/^orca(?:-ide)?$/),
-        compatibilityWindowsCommand: undefined
-      },
-      { timeoutMs: 5_123, orchestrationCapability: undefined }
-    )
-  })
-})
diff --git a/src/cli/handlers/orchestration.test.ts b/src/cli/handlers/orchestration.test.ts
index e0a20541f916..05134045be11 100644
--- a/src/cli/handlers/orchestration.test.ts
+++ b/src/cli/handlers/orchestration.test.ts
@@ -7,6 +7,8 @@ const originalPaneKey = process.env.ORCA_PANE_KEY
 // Why: a structured-session marker inherited from the runner diverts these cases to the
 // structured refusal, so which branch they exercise would depend on who ran them.
 const originalStructuredSession = process.env.ORCA_STRUCTURED_SESSION
+const originalCliCommand = process.env.ORCA_CLI_COMMAND
+const originalExitCode = process.exitCode
 function lifecycleGroupRecipientError(type: 'worker_done' | 'heartbeat'): string {
   return `${type} messages belong to one exact Dispatch and cannot target a group address.`
 }
@@ -36,6 +38,13 @@ afterEach(() => {
   } else {
     process.env.ORCA_STRUCTURED_SESSION = originalStructuredSession
   }
+  if (originalCliCommand === undefined) {
+    delete process.env.ORCA_CLI_COMMAND
+  } else {
+    process.env.ORCA_CLI_COMMAND = originalCliCommand
+  }
+  process.exitCode = originalExitCode
+  vi.restoreAllMocks()
 })
 
 describe('orchestration send structured payload flags', () => {
@@ -352,7 +361,10 @@ describe('orchestration timeout flag validation', () => {
     ['empty', ''],
     ['non-numeric', 'not-a-number'],
     ['zero', '0'],
-    ['negative', '-1']
+    ['negative', '-1'],
+    ['fractional', '1.5'],
+    ['rounded fractional', '9007199254740991.1'],
+    ['unsafe integer', String(Number.MAX_SAFE_INTEGER + 1)]
   ]
 
   beforeEach(() => {
@@ -360,6 +372,7 @@ describe('orchestration timeout flag validation', () => {
     delete process.env.ORCA_TERMINAL_HANDLE
     delete process.env.ORCA_PANE_KEY
     delete process.env.ORCA_STRUCTURED_SESSION
+    process.exitCode = undefined
   })
 
   const invokeCheck = (flags: Map<string, string | boolean>) =>
@@ -378,6 +391,14 @@ describe('orchestration timeout flag validation', () => {
       json: true
     } as never)
 
+  const invokePlainAsk = (flags: Map<string, string | boolean>) =>
+    ORCHESTRATION_HANDLERS['orchestration ask']({
+      flags,
+      client: { call: callMock },
+      cwd: '/tmp/repo',
+      json: false
+    } as never)
+
   it.each(invalidTimeoutValues)('rejects invalid check --timeout-ms: %s', async (_label, value) => {
     const flags = new Map<string, string | boolean>([
       ['wait', true],
@@ -386,6 +407,7 @@ describe('orchestration timeout flag validation', () => {
 
     await expect(invokeCheck(flags)).rejects.toThrow(/--timeout-ms/)
     expect(callMock).not.toHaveBeenCalled()
+    expect(getTerminalHandleMock).not.toHaveBeenCalled()
   })
 
   it('passes a parsed check timeout and peek mode into the RPC payload', async () => {
@@ -507,6 +529,109 @@ describe('orchestration timeout flag validation', () => {
 
     await expect(invokeAsk(flags)).rejects.toThrow(/--timeout-ms/)
     expect(callMock).not.toHaveBeenCalled()
+    expect(getTerminalHandleMock).not.toHaveBeenCalled()
+  })
+
+  it.each([String(2_147_483_647), String(Number.MAX_SAFE_INTEGER)])(
+    'clamps a safe ask timeout %s before adding transport headroom',
+    async (rawTimeout) => {
+      process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
+      callMock.mockResolvedValue({
+        result: { answer: 'yes', messageId: 'msg_1', threadId: 'thread_1', timedOut: false }
+      })
+      vi.spyOn(console, 'log').mockImplementation(() => {})
+
+      await invokeAsk(
+        new Map<string, string | boolean>([
+          ['to', 'term_coord'],
+          ['question', 'Proceed?'],
+          ['timeout-ms', rawTimeout]
+        ])
+      )
+
+      expect(callMock).toHaveBeenCalledWith(
+        'orchestration.ask',
+        expect.objectContaining({ timeoutMs: 1_800_000 }),
+        { timeoutMs: 1_805_000 }
+      )
+    }
+  )
+
+  it.each(['+1000', '1000.0', '1e3', '0x3e8'])(
+    'preserves CLI-compatible exact integer timeout syntax %s',
+    async (rawTimeout) => {
+      process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
+      callMock.mockResolvedValue({
+        result: { answer: 'yes', messageId: 'msg_1', threadId: 'thread_1', timedOut: false }
+      })
+      vi.spyOn(console, 'log').mockImplementation(() => {})
+
+      await invokeAsk(
+        new Map<string, string | boolean>([
+          ['to', 'term_coord'],
+          ['question', 'Proceed?'],
+          ['timeout-ms', rawTimeout]
+        ])
+      )
+
+      expect(callMock).toHaveBeenCalledWith(
+        'orchestration.ask',
+        expect.objectContaining({ timeoutMs: 1_000 }),
+        { timeoutMs: 6_000 }
+      )
+    }
+  )
+
+  it('keeps an omitted ask timeout out of the payload while using default headroom', async () => {
+    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
+    callMock.mockResolvedValue({
+      result: { answer: 'yes', messageId: 'msg_1', threadId: 'thread_1', timedOut: false }
+    })
+    vi.spyOn(console, 'log').mockImplementation(() => {})
+
+    await invokeAsk(
+      new Map<string, string | boolean>([
+        ['to', 'term_coord'],
+        ['question', 'Proceed?']
+      ])
+    )
+
+    expect(callMock).toHaveBeenCalledWith(
+      'orchestration.ask',
+      expect.objectContaining({ timeoutMs: undefined }),
+      { timeoutMs: 605_000 }
+    )
+  })
+
+  it('prints the pending message ID and exact capability-bound resume command on timeout', async () => {
+    process.env.ORCA_TERMINAL_HANDLE = 'term_worker'
+    process.env.ORCA_CLI_COMMAND = 'orca-dev'
+    callMock.mockResolvedValue({
+      result: {
+        answer: null,
+        messageId: 'msg_question',
+        threadId: 'thread_question',
+        timedOut: true,
+        timeoutMs: 30_000
+      }
+    })
+    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+
+    await invokePlainAsk(
+      new Map<string, string | boolean>([
+        ['question', 'Proceed?'],
+        ['dispatch-capability', 'dcap_secret'],
+        ['timeout-ms', '30000']
+      ])
+    )
+
+    expect(errorSpy).toHaveBeenCalledWith(
+      'ask timeout after 30000ms; question is still pending (messageId: msg_question). ' +
+        'Resume waiting; do not ask again:\n' +
+        'orca-dev orchestration ask --from term_worker --dispatch-capability dcap_secret ' +
+        '--resume msg_question --timeout-ms 30000'
+    )
+    expect(process.exitCode).toBe(1)
   })
 
   it('uses the parsed ask timeout for both runtime wait and client timeout', async () => {
diff --git a/src/cli/handlers/orchestration/dispatch-handlers.ts b/src/cli/handlers/orchestration/dispatch-handlers.ts
index afe79ab8e2f3..c8ade53e907a 100644
--- a/src/cli/handlers/orchestration/dispatch-handlers.ts
+++ b/src/cli/handlers/orchestration/dispatch-handlers.ts
@@ -6,6 +6,7 @@ import { orchestrationMigrationData } from '../../../shared/orchestration-rpc-co
 import { callOrchestrationMutation } from './mutation-request'
 import { isDevCliInvocation } from './runtime-compatibility'
 import { resolveCoordinatorTerminalHandle } from './terminal-identity'
+import { injectedSessionAddress } from '../../../shared/agent-session-caller-env'
 
 export const ORCHESTRATION_DISPATCH_HANDLER: Record<string, CommandHandler> = {
   'orchestration dispatch': async ({ flags, client, cwd, json }) => {
@@ -42,9 +43,12 @@ export const ORCHESTRATION_DISPATCH_HANDLER: Record<string, CommandHandler> = {
 export const ORCHESTRATION_DISPATCH_INSPECTION_HANDLERS: Record<string, CommandHandler> = {
   'orchestration dispatch-show': async ({ flags, client, cwd, json }) => {
     const showPreamble = flags.has('preamble') ? true : undefined
-    // Why: a preview must embed the same real coordinator handle as an actual dispatch.
+    // Why: a preview must embed the same real coordinator handle as an actual dispatch. Its --from
+    // only fills preview text and names no caller, so it passes through unfenced.
     const from = showPreamble
-      ? await resolveCoordinatorTerminalHandle(flags, cwd, client)
+      ? (getOptionalStringFlag(flags, 'from') ??
+        injectedSessionAddress() ??
+        (await resolveCoordinatorTerminalHandle(flags, cwd, client)))
       : undefined
     const result = await client.call<{
       dispatch: { id: string; task_id: string; status: string } | null
diff --git a/src/cli/handlers/orchestration/gate-handlers.ts b/src/cli/handlers/orchestration/gate-handlers.ts
index f9ec4c6583fb..44c8f96d8186 100644
--- a/src/cli/handlers/orchestration/gate-handlers.ts
+++ b/src/cli/handlers/orchestration/gate-handlers.ts
@@ -2,7 +2,7 @@ import type { CommandHandler } from '../../dispatch'
 import { printResult } from '../../format'
 import { getOptionalJsonFlag, getOptionalStringFlag, getRequiredStringFlag } from '../../flags'
 import { callOrchestrationMutation } from './mutation-request'
-import { resolveCoordinatorTerminalHandle } from './terminal-identity'
+import { resolveCoordinatorTerminalHandle, runScopedSessionCaller } from './terminal-identity'
 
 export const ORCHESTRATION_GATE_HANDLERS: Record<string, CommandHandler> = {
   'orchestration gate-create': async ({ flags, client, cwd, json }) => {
@@ -37,7 +37,9 @@ export const ORCHESTRATION_GATE_HANDLERS: Record<string, CommandHandler> = {
   'orchestration gate-list': async ({ flags, client, cwd, json }) => {
     const run = getOptionalStringFlag(flags, 'run')
     // Why: named runs remain inspectable without a pane; only implicit runs resolve identity.
-    const from = run ? undefined : await resolveCoordinatorTerminalHandle(flags, cwd, client)
+    const from = run
+      ? runScopedSessionCaller(flags)
+      : await resolveCoordinatorTerminalHandle(flags, cwd, client)
     const result = await client.call<{
       gates: { id: string; task_id: string; question: string; status: string }[]
       count: number
diff --git a/src/cli/handlers/orchestration/message-check-handler.ts b/src/cli/handlers/orchestration/message-check-handler.ts
index f2af827ee048..6ace43eac31a 100644
--- a/src/cli/handlers/orchestration/message-check-handler.ts
+++ b/src/cli/handlers/orchestration/message-check-handler.ts
@@ -13,7 +13,7 @@ import { startCheckKeepalive } from './check-keepalive'
 import { callOrchestrationMutation } from './mutation-request'
 import { getOptionalPositiveIntegerValueFlag } from './numeric-flags'
 import { flushOrchestrationStdout, resolveCompatibilityCliCommand } from './runtime-compatibility'
-import { resolveOrchestrationTerminalHandle } from './terminal-identity'
+import { orchestrationCallerLabel, resolveOrchestrationTerminalHandle } from './terminal-identity'
 
 type CheckResult = {
   messages: MessageSummary[]
@@ -41,12 +41,16 @@ export const ORCHESTRATION_CHECK_HANDLER: Record<string, CommandHandler> = {
     const timeoutMs = getOptionalPositiveIntegerValueFlag(flags, 'timeout-ms')
     const explicitTerminal = getOptionalStringFlag(flags, 'terminal')
     const terminal = await resolveOrchestrationTerminalHandle(flags, cwd, client, 'terminal')
+    // Why: a session names itself by its id alone; a pane key it inherited is not its identity.
+    const paneKey =
+      explicitTerminal || terminal === undefined ? undefined : process.env.ORCA_PANE_KEY
+    const callerLabel = orchestrationCallerLabel(terminal)
     const stopKeepalive = wait ? startCheckKeepalive(timeoutMs) : null
     let result: Awaited<ReturnType<typeof client.call<CheckResult>>>
     try {
       result = await callOrchestrationMutation<CheckResult>(client, flags, 'orchestration.check', {
         terminal,
-        terminalPaneKey: explicitTerminal ? undefined : process.env.ORCA_PANE_KEY || undefined,
+        terminalPaneKey: paneKey || undefined,
         // Why: old runtimes degrade peek to non-consuming all mode instead of destructive mark-read.
         unread: flags.has('unread') ? true : peek ? false : undefined,
         peek: peek ? true : undefined,
@@ -68,9 +72,9 @@ export const ORCHESTRATION_CHECK_HANDLER: Record<string, CommandHandler> = {
     }
     result = {
       ...result,
-      result: prepareOrchestrationCheckOutput(result.result, terminal, flags.has('format'))
+      result: prepareOrchestrationCheckOutput(result.result, callerLabel, flags.has('format'))
     }
-    printResult(result, json, (value) => formatOrchestrationCheckText(value, terminal))
+    printResult(result, json, (value) => formatOrchestrationCheckText(value, callerLabel))
     const compatibilityAck = result.result.legacyCompatibility?.ackMessageIds
     if (compatibilityAck && compatibilityAck.length > 0) {
       await flushOrchestrationStdout()
diff --git a/src/cli/handlers/orchestration/message-send-handler.ts b/src/cli/handlers/orchestration/message-send-handler.ts
index 088d1361e69e..aa9bbaff47eb 100644
--- a/src/cli/handlers/orchestration/message-send-handler.ts
+++ b/src/cli/handlers/orchestration/message-send-handler.ts
@@ -2,6 +2,7 @@ import type { CommandHandler } from '../../dispatch'
 import { printResult } from '../../format'
 import { getOptionalStringFlag, getRequiredStringFlag } from '../../flags'
 import { RuntimeClientError } from '../../runtime-client'
+import { readInjectedAgentSessionId } from '../../../shared/agent-session-caller-env'
 import { requireWorkerDoneSettlement } from '../orchestration-worker-settlement'
 import { getOptionalStructuredMessagePayload } from './message-payload'
 import { callOrchestrationMutation } from './mutation-request'
@@ -75,7 +76,8 @@ export const ORCHESTRATION_SEND_HANDLER: Record<string, CommandHandler> = {
     if (
       (type === 'worker_done' || type === 'heartbeat') &&
       !getOptionalStringFlag(flags, 'from') &&
-      !process.env.ORCA_TERMINAL_HANDLE
+      !process.env.ORCA_TERMINAL_HANDLE &&
+      !readInjectedAgentSessionId()
     ) {
       // Why: focus isn't lifecycle authority — an identity-less subprocess must fail closed rather than guess the worker.
       throwNoActiveSenderTerminal()
@@ -94,7 +96,11 @@ export const ORCHESTRATION_SEND_HANDLER: Record<string, CommandHandler> = {
       threadId: getOptionalStringFlag(flags, 'thread-id'),
       payload: getOptionalStructuredMessagePayload(flags),
       // Why: pane key is the remint-stable sender identity the runtime verifies lifecycle ownership against; older runtimes strip it.
-      senderPaneKey: process.env.ORCA_PANE_KEY || undefined,
+      // A session names itself by its id alone.
+      senderPaneKey:
+        from === undefined || readInjectedAgentSessionId()
+          ? undefined
+          : process.env.ORCA_PANE_KEY || undefined,
       waitForLifecycleSettlement: type === 'worker_done' ? true : undefined,
       devMode: isDevCliInvocation()
     }
diff --git a/src/cli/handlers/orchestration/question-handler.ts b/src/cli/handlers/orchestration/question-handler.ts
index bd9e239b6d59..67aaeb16e4d8 100644
--- a/src/cli/handlers/orchestration/question-handler.ts
+++ b/src/cli/handlers/orchestration/question-handler.ts
@@ -103,8 +103,8 @@ export const ORCHESTRATION_QUESTION_HANDLER: Record<string, CommandHandler> = {
                 resolveOrchestrationCliExecutable(),
                 'orchestration',
                 'ask',
-                '--from',
-                from,
+                // A session's resume is flagless: its injected id names it again.
+                ...(from ? ['--from', from] : []),
                 ...(dispatchCapability ? ['--dispatch-capability', dispatchCapability] : []),
                 '--resume',
                 messageId,
diff --git a/src/cli/handlers/orchestration/run-handlers.ts b/src/cli/handlers/orchestration/run-handlers.ts
index 7c77913df158..d8abe3533c2c 100644
--- a/src/cli/handlers/orchestration/run-handlers.ts
+++ b/src/cli/handlers/orchestration/run-handlers.ts
@@ -39,7 +39,9 @@ export const ORCHESTRATION_RUN_HANDLERS: Record<string, CommandHandler> = {
       run: { id: string; objective: string } | null
     }>('orchestration.runCurrent', { from })
     printResult(result, json, (r) =>
-      r.run ? `${r.run.id} ${r.run.objective}` : 'No Run is bound to this terminal.'
+      r.run
+        ? `${r.run.id} ${r.run.objective}`
+        : `No Run is bound to this ${from === undefined ? 'session' : 'terminal'}.`
     )
   },
 
diff --git a/src/cli/handlers/orchestration/task-handlers.ts b/src/cli/handlers/orchestration/task-handlers.ts
index c4c943261e8c..d6201087792c 100644
--- a/src/cli/handlers/orchestration/task-handlers.ts
+++ b/src/cli/handlers/orchestration/task-handlers.ts
@@ -4,7 +4,7 @@ import { getOptionalStringFlag, getRequiredStringFlag } from '../../flags'
 import { RuntimeClientError } from '../../runtime-client'
 import { abbreviateOrchestrationTasks } from '../../../shared/orchestration-task-summary'
 import { callOrchestrationMutation } from './mutation-request'
-import { resolveCoordinatorTerminalHandle } from './terminal-identity'
+import { resolveCoordinatorTerminalHandle, runScopedSessionCaller } from './terminal-identity'
 
 const TASK_STATUS_VALUES = [
   'pending',
@@ -39,7 +39,7 @@ export const ORCHESTRATION_TASK_HANDLERS: Record<string, CommandHandler> = {
     const brief = flags.has('brief')
     const run = getOptionalStringFlag(flags, 'run')
     const callerTerminalHandle = run
-      ? undefined
+      ? runScopedSessionCaller(flags)
       : await resolveCoordinatorTerminalHandle(flags, cwd, client)
     const result = await client.call<{
       tasks: {
diff --git a/src/cli/handlers/orchestration/terminal-identity.ts b/src/cli/handlers/orchestration/terminal-identity.ts
index e693d99079df..8cc4f3357e03 100644
--- a/src/cli/handlers/orchestration/terminal-identity.ts
+++ b/src/cli/handlers/orchestration/terminal-identity.ts
@@ -2,16 +2,31 @@ import type { RuntimeClient } from '../../runtime-client'
 import { getOptionalStringFlag } from '../../flags'
 import { RuntimeClientError } from '../../runtime-client'
 import { getTerminalHandle } from '../../selectors'
-import { isStructuredSessionWithoutIdentity } from '../../../shared/structured-session-marker'
+import { hasStructuredSessionMarker } from '../../../shared/structured-session-marker'
+import {
+  injectedSessionAddress,
+  readInjectedAgentSessionId
+} from '../../../shared/agent-session-caller-env'
+import { sessionAddressForHost } from '../../session-caller-flags'
 
+/**
+ * The caller's terminal handle, or `undefined` when an injected agent session id names the caller:
+ * the orchestration envelope carries that id and the host binds the caller param to it, so nothing
+ * is resolved or guessed here, except a session address only the host can place.
+ */
 export async function resolveOrchestrationTerminalHandle(
   flags: Map<string, string | boolean>,
   cwd: string,
   client: RuntimeClient,
   flagName: 'from' | 'terminal',
   options: { validateEnvHandle?: boolean } = {}
-): Promise<string> {
+): Promise<string | undefined> {
+  // A caller flag naming anyone else was already refused at the CLI entry, from the command's spec.
   const explicit = getOptionalStringFlag(flags, flagName)
+  const sessionId = readInjectedAgentSessionId()
+  if (sessionId) {
+    return explicit ? sessionAddressForHost(explicit, sessionId) : undefined
+  }
   if (explicit) {
     return explicit
   }
@@ -35,7 +50,7 @@ export async function resolveOrchestrationTerminalHandle(
   // default, so that guess consumed another pane's oldest unread batch and marked it read, and the
   // rightful worker never saw its mail. Refusing is the only honest answer: this child genuinely
   // cannot infer its own identity.
-  if (isStructuredSessionWithoutIdentity()) {
+  if (hasStructuredSessionMarker()) {
     throw structuredSessionRefusal(flagName)
   }
   if (flagName === 'from') {
@@ -157,11 +172,26 @@ function getClientErrorMessage(err: unknown): string | undefined {
   return typeof message === 'string' ? message : undefined
 }
 
+/** How check output names its caller: the handle, or the session's address. */
+export function orchestrationCallerLabel(handle: string | undefined): string {
+  return handle ?? injectedSessionAddress() ?? 'unknown'
+}
+
+/**
+ * The caller for a read that `--run` scopes: no terminal is resolved, but a session's declared
+ * address still goes to the host, which places a `/clear` root and refuses anyone else.
+ */
+export function runScopedSessionCaller(flags: Map<string, string | boolean>): string | undefined {
+  const declared = getOptionalStringFlag(flags, 'from')
+  const sessionId = readInjectedAgentSessionId()
+  return declared && sessionId ? sessionAddressForHost(declared, sessionId) : undefined
+}
+
 export async function resolveCoordinatorTerminalHandle(
   flags: Map<string, string | boolean>,
   cwd: string,
   client: RuntimeClient
-): Promise<string> {
+): Promise<string | undefined> {
   return await resolveOrchestrationTerminalHandle(flags, cwd, client, 'from', {
     validateEnvHandle: true
   })
@@ -204,7 +234,7 @@ export function throwNoActiveSenderTerminal(): never {
   // place left that would tell an identity-less session to pass a handle it does not have. A stale
   // ORCA_TERMINAL_HANDLE is a different case — that caller HAS an identity, so it keeps the advice
   // to re-run under a live one.
-  if (isStructuredSessionWithoutIdentity() && !process.env.ORCA_TERMINAL_HANDLE) {
+  if (hasStructuredSessionMarker() && !process.env.ORCA_TERMINAL_HANDLE) {
     throw structuredSessionRefusal('from')
   }
   throw new RuntimeClientError(
diff --git a/src/cli/handlers/orchestration/worker-output.ts b/src/cli/handlers/orchestration/worker-output.ts
index 9d6d1949911e..d9b5b9a46fac 100644
--- a/src/cli/handlers/orchestration/worker-output.ts
+++ b/src/cli/handlers/orchestration/worker-output.ts
@@ -1,6 +1,6 @@
 import type { RuntimeTerminalRead } from '../../../shared/runtime-types'
 import type { OrchestrationWorkerReadResult } from '../../../shared/orchestration-worker-output'
-import { formatWorkerTranscriptMessage } from '../../../shared/worker-transcript-text'
+import { formatWorkerTranscriptMessages } from '../../../shared/worker-transcript-text'
 
 export type LegacyWorkerReadResult = {
   dispatchId: string
@@ -57,7 +57,7 @@ export function formatWorkerRead(
   const output =
     value.source === 'terminal'
       ? value.terminal.tail.join('\n')
-      : value.transcript.messages.map(formatWorkerTranscriptMessage).join('\n\n')
+      : formatWorkerTranscriptMessages(value.transcript.messages).join('\n\n')
   if (output) {
     return `${details}\n\n${output}`
   }
diff --git a/src/cli/handlers/terminal-close.ts b/src/cli/handlers/terminal-close.ts
index 5ba8a25b64a1..9e65b2f5f473 100644
--- a/src/cli/handlers/terminal-close.ts
+++ b/src/cli/handlers/terminal-close.ts
@@ -6,6 +6,7 @@ import type { CommandHandler } from '../dispatch'
 import { formatTerminalClose, reportCliError, printResult } from '../format'
 import { RuntimeClientError } from '../runtime-client'
 import { getRequiredWorktreeSelector, getTerminalHandle } from '../selectors'
+import { describeUnconfirmedCloseStop } from '../../shared/pty-liveness-verdict'
 
 /** A false stop receipt is an error only when the host supplied a liveness verdict. */
 function terminalCloseFailure(close: RuntimeTerminalClose): RuntimeClientError | null {
@@ -13,14 +14,17 @@ function terminalCloseFailure(close: RuntimeTerminalClose): RuntimeClientError |
     return null
   }
 
-  const verdict = close.ptyStopVerdict
-  const detail =
-    verdict === 'live'
-      ? 'The PTY is live.'
-      : `The PTY was not confirmed stopped: ${close.ptyStopReason ?? 'its host could not be reached'}.`
+  if (close.ptyStopVerdict === 'live') {
+    return new RuntimeClientError(
+      'terminal_stop_live',
+      `Terminal ${close.handle} close failed to confirm the PTY stopped (live). The PTY is live.`,
+      { close }
+    )
+  }
+  // Why: the close itself committed; only the process stop is unproven, so say which.
   return new RuntimeClientError(
-    verdict === 'live' ? 'terminal_stop_live' : 'terminal_stop_unverifiable',
-    `Terminal ${close.handle} close failed to confirm the PTY stopped (${verdict}). ${detail}`,
+    'terminal_stop_unverifiable',
+    `Closed terminal ${close.handle}. ${describeUnconfirmedCloseStop(close)}`,
     { close }
   )
 }
diff --git a/src/cli/handlers/terminal.test.ts b/src/cli/handlers/terminal.test.ts
index 06df95f55a94..c0d9e8acda54 100644
--- a/src/cli/handlers/terminal.test.ts
+++ b/src/cli/handlers/terminal.test.ts
@@ -42,40 +42,57 @@ describe('terminal close CLI', () => {
     expect(process.exitCode).toBeUndefined()
   })
 
-  it('reports an unverifiable PTY stop as a failing JSON outcome', async () => {
-    process.exitCode = undefined
-    const close = {
-      handle: 'term-remote',
-      tabId: 'tab-1',
-      ptyKilled: false,
-      ptyStopVerdict: 'unverifiable' as const,
-      ptyStopReason: 'its SSH provider is no longer registered'
-    }
-    const call = vi.fn().mockResolvedValue({
-      id: 'req-close',
-      ok: true,
-      result: { close },
-      _meta: { runtimeId: 'runtime-1' }
-    })
-    const log = vi.spyOn(console, 'log').mockImplementation(() => {})
+  it.each([
+    [
+      'its SSH provider is no longer registered',
+      false,
+      'Closed terminal term-remote. The PTY was not confirmed stopped: its SSH provider is no longer registered.'
+    ],
+    [
+      'Request "pty.shutdown" timed out after 14250ms',
+      true,
+      'Closed terminal term-remote. The PTY was not confirmed stopped: Request "pty.shutdown" timed out after 14250ms. The kill retries when the host reconnects.'
+    ],
+    // An older host never reports a recorded kill, so the same reason promises nothing.
+    [
+      'Request "pty.shutdown" timed out after 14250ms',
+      false,
+      'Closed terminal term-remote. The PTY was not confirmed stopped: Request "pty.shutdown" timed out after 14250ms.'
+    ]
+  ])(
+    'reports an unverifiable stop (%s, kill recorded: %s) as a committed close with exit code 1',
+    async (ptyStopReason, pendingKillRecorded, message) => {
+      process.exitCode = undefined
+      const close = {
+        handle: 'term-remote',
+        tabId: 'tab-1',
+        ptyKilled: false,
+        ptyStopVerdict: 'unverifiable' as const,
+        ptyStopReason,
+        ...(pendingKillRecorded ? { pendingKillRecorded: true as const } : {})
+      }
+      const call = vi.fn().mockResolvedValue({
+        id: 'req-close',
+        ok: true,
+        result: { close },
+        _meta: { runtimeId: 'runtime-1' }
+      })
+      const log = vi.spyOn(console, 'log').mockImplementation(() => {})
 
-    await TERMINAL_HANDLERS['terminal close']({
-      flags: new Map([['terminal', close.handle]]),
-      client: { call } as unknown as RuntimeClient,
-      cwd: '/tmp/worktree',
-      json: true
-    })
+      await TERMINAL_HANDLERS['terminal close']({
+        flags: new Map([['terminal', close.handle]]),
+        client: { call } as unknown as RuntimeClient,
+        cwd: '/tmp/worktree',
+        json: true
+      })
 
-    expect(JSON.parse(String(log.mock.calls[0]?.[0]))).toMatchObject({
-      ok: false,
-      error: {
-        code: 'terminal_stop_unverifiable',
-        message: expect.stringContaining('unverifiable'),
-        data: { close }
-      }
-    })
-    expect(process.exitCode).toBe(1)
-  })
+      expect(JSON.parse(String(log.mock.calls[0]?.[0]))).toMatchObject({
+        ok: false,
+        error: { code: 'terminal_stop_unverifiable', message, data: { close } }
+      })
+      expect(process.exitCode).toBe(1)
+    }
+  )
 
   it('reports a live PTY stop as a failing human outcome', async () => {
     process.exitCode = undefined
diff --git a/src/cli/handlers/worktree.ts b/src/cli/handlers/worktree.ts
index 62ddd27155a0..3541beef20b5 100644
--- a/src/cli/handlers/worktree.ts
+++ b/src/cli/handlers/worktree.ts
@@ -245,7 +245,8 @@ export const WORKTREE_HANDLERS: Record<string, CommandHandler> = {
       ...(startupAgent
         ? {
             startupAgent,
-            startupPrompt: getPresentStringFlag(flags, 'prompt', { allowEmpty: true }) ?? ''
+            startupPrompt: getPresentStringFlag(flags, 'prompt', { allowEmpty: true }) ?? '',
+            launchSource: 'cli'
           }
         : {})
     })
diff --git a/src/cli/index-orchestration.test.ts b/src/cli/index-orchestration.test.ts
index c4e4438f2e9e..bc7366f5b11c 100644
--- a/src/cli/index-orchestration.test.ts
+++ b/src/cli/index-orchestration.test.ts
@@ -85,6 +85,25 @@ describe('orca cli worktree awareness', () => {
     expect(logSpy).toHaveBeenCalledWith('Sent 2 messages to 2 recipients')
   })
 
+  it("refuses an agent session's caller flag naming another caller before any request", async () => {
+    // One chokepoint for every verb: the spec says which flag names the caller.
+    process.env.ORCA_AGENT_SESSION_ID = 'f7a1c0de-1111-4222-8333-444455556666'
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {})
+    try {
+      await main(['orchestration', 'check', '--terminal', 'term_sibling', '--json'], '/tmp/repo')
+    } finally {
+      delete process.env.ORCA_AGENT_SESSION_ID
+    }
+
+    expect(callMock).not.toHaveBeenCalled()
+    expect(process.exitCode).toBe(1)
+    expect(JSON.parse(String(logSpy.mock.calls[0]?.[0]))).toMatchObject({
+      ok: false,
+      error: { code: 'consumer_fenced' }
+    })
+    process.exitCode = undefined
+  })
+
   it('rejects no-flag orchestration reset before calling the runtime', async () => {
     await main(['orchestration', 'reset'], '/tmp/repo')
 
diff --git a/src/cli/index-vm-recipe-doctor.test.ts b/src/cli/index-vm-recipe-doctor.test.ts
index c707c5cdc88a..1e8bd99e15f4 100644
--- a/src/cli/index-vm-recipe-doctor.test.ts
+++ b/src/cli/index-vm-recipe-doctor.test.ts
@@ -198,11 +198,13 @@ describe('orca cli worktree awareness', () => {
           process.nextTick(() => {
             startChild.stdout.emit(
               'data',
-              JSON.stringify({
-                schemaVersion: 1,
-                pairingCode,
-                projectRoot: '/workspace/repo'
-              })
+              Buffer.from(
+                JSON.stringify({
+                  schemaVersion: 1,
+                  pairingCode,
+                  projectRoot: '/workspace/repo'
+                })
+              )
             )
             startChild.emit('exit', 0, null)
             startChild.emit('close', 0, null)
@@ -289,8 +291,8 @@ describe('orca cli worktree awareness', () => {
       // create emits a non-JSON line to stdout + a real diagnostic to stderr, then exits 0
       spawnMock.mockImplementationOnce(() => {
         process.nextTick(() => {
-          startChild.stdout.emit('data', 'Provisioning sandbox...\n')
-          startChild.stderr.emit('data', 'vercel: error: missing scope\n')
+          startChild.stdout.emit('data', Buffer.from('Provisioning sandbox...\n'))
+          startChild.stderr.emit('data', Buffer.from('vercel: error: missing scope\n'))
           startChild.emit('exit', 0, null)
           startChild.emit('close', 0, null)
         })
diff --git a/src/cli/index-worktree-create-agent.test.ts b/src/cli/index-worktree-create-agent.test.ts
index f1d79ef21df2..6ae1266b91c6 100644
--- a/src/cli/index-worktree-create-agent.test.ts
+++ b/src/cli/index-worktree-create-agent.test.ts
@@ -138,7 +138,8 @@ describe('orca cli worktree awareness', () => {
       callerTerminalHandle: undefined,
       cliProvenanceRequest: {},
       startupAgent: 'codex',
-      startupPrompt: 'hi'
+      startupPrompt: 'hi',
+      launchSource: 'cli'
     })
   })
 
@@ -187,7 +188,8 @@ describe('orca cli worktree awareness', () => {
       callerTerminalHandle: undefined,
       cliProvenanceRequest: {},
       startupAgent: 'codex',
-      startupPrompt: 'hi'
+      startupPrompt: 'hi',
+      launchSource: 'cli'
     })
   })
 
diff --git a/src/cli/index-worktree-create-freebuff.test.ts b/src/cli/index-worktree-create-freebuff.test.ts
new file mode 100644
index 000000000000..aab4b17c36e0
--- /dev/null
+++ b/src/cli/index-worktree-create-freebuff.test.ts
@@ -0,0 +1,94 @@
+import { describe, expect, it, vi } from 'vitest'
+
+const {
+  callMock,
+  runtimeClientConstructorMock,
+  serveOrcaAppMock,
+  getDefaultUserDataPathMock,
+  addEnvironmentFromPairingCodeMock,
+  listEnvironmentsMock,
+  spawnMock
+} = vi.hoisted(() => ({
+  callMock: vi.fn(),
+  runtimeClientConstructorMock: vi.fn(),
+  serveOrcaAppMock: vi.fn(),
+  getDefaultUserDataPathMock: vi.fn(() => '/tmp/orca-user-data'),
+  addEnvironmentFromPairingCodeMock: vi.fn(),
+  listEnvironmentsMock: vi.fn(),
+  spawnMock: vi.fn()
+}))
+
+vi.mock('./runtime-client', async () => {
+  const { createRuntimeClientModuleMock } = await import('./index-test-harness.js')
+  return createRuntimeClientModuleMock({
+    callMock,
+    runtimeClientConstructorMock,
+    serveOrcaAppMock,
+    getDefaultUserDataPathMock
+  })
+})
+
+vi.mock('./runtime/environments', () => ({
+  addEnvironmentFromPairingCode: addEnvironmentFromPairingCodeMock,
+  listEnvironments: listEnvironmentsMock,
+  removeEnvironment: vi.fn(),
+  resolveEnvironment: vi.fn()
+}))
+
+vi.mock('child_process', async () => {
+  const { createChildProcessModuleMock } = await import('./index-test-harness.js')
+  return createChildProcessModuleMock(spawnMock)
+})
+
+import { main } from './index'
+import { buildWorktree, okFixture, queueFixtures, worktreeListFixture } from './test-fixtures'
+import { useWorktreeAwarenessEnvironment } from './index-test-harness'
+
+describe('Freebuff worktree creation', () => {
+  useWorktreeAwarenessEnvironment({
+    callMock,
+    serveOrcaAppMock,
+    getDefaultUserDataPathMock,
+    addEnvironmentFromPairingCodeMock,
+    listEnvironmentsMock,
+    spawnMock
+  })
+
+  it('passes Freebuff and its prompt to the runtime without activating the worktree', async () => {
+    queueFixtures(
+      callMock,
+      worktreeListFixture([buildWorktree('/tmp/repo', 'main', 'abc', 'repo-1')]),
+      okFixture('req_create', {
+        worktree: buildWorktree('/tmp/repo/freebuff-task', 'freebuff-task', 'abc', 'repo-1')
+      })
+    )
+    vi.spyOn(console, 'log').mockImplementation(() => {})
+
+    await main(
+      [
+        'worktree',
+        'create',
+        '--repo',
+        'id:repo-1',
+        '--name',
+        'freebuff-task',
+        '--agent',
+        'freebuff',
+        '--prompt',
+        'Review this workspace',
+        '--json'
+      ],
+      '/tmp/repo'
+    )
+
+    expect(callMock).toHaveBeenNthCalledWith(
+      2,
+      'worktree.create',
+      expect.objectContaining({
+        startupAgent: 'freebuff',
+        startupPrompt: 'Review this workspace',
+        activate: false
+      })
+    )
+  })
+})
diff --git a/src/cli/index.ts b/src/cli/index.ts
index b2e01c04e56f..be5277278766 100644
--- a/src/cli/index.ts
+++ b/src/cli/index.ts
@@ -20,6 +20,7 @@ import { printHelp } from './help'
 import type { RuntimeClient } from './runtime-client'
 import { COMMAND_SPECS } from './specs'
 import { resolveOrchestrationCliExecutable } from './runtime/orchestration-recovery-command'
+import { refuseConflictingSessionCallerFlags } from './session-caller-flags'
 
 export { COMMAND_SPECS } from './specs'
 export { buildCurrentWorktreeSelector, normalizeWorktreeSelector } from './selectors'
@@ -111,6 +112,10 @@ export async function main(
     // lookup so users do not get misleading "Orca is not running" failures for
     // simple command typos or unsupported flags.
     validateCommandAndFlags(COMMAND_SPECS, parsed)
+    refuseConflictingSessionCallerFlags(
+      findCommandSpec(COMMAND_SPECS, parsed.commandPath),
+      parsed.flags
+    )
     const RuntimeClientClass = await loadRuntimeClientClass()
     const ignoreRemoteSelection = shouldIgnoreRemoteSelection(parsed.commandPath)
     const pairingCode = ignoreRemoteSelection ? null : parsed.flags.get('pairing-code')
diff --git a/src/cli/orchestration-session-caller-cli.test.ts b/src/cli/orchestration-session-caller-cli.test.ts
new file mode 100644
index 000000000000..402b9d689e80
--- /dev/null
+++ b/src/cli/orchestration-session-caller-cli.test.ts
@@ -0,0 +1,668 @@
+/**
+ * A command that runs inside a structured agent session is that session: the injected
+ * `ORCA_AGENT_SESSION_ID` names the caller, and nothing resolves or guesses a terminal for it.
+ *
+ * One rule for every verb that names a caller: a caller flag may restate the session, but a flag
+ * naming anyone else is refused — never silently dropped, never allowed to win. A session address
+ * the CLI cannot place is left to the host, whose `/clear` lineage decides.
+ * The #21097 accident was a chat that named a sibling's terminal and consumed that sibling's mail.
+ *
+ * The session env here is the hardest case, a chat that inherited a pane's `ORCA_TERMINAL_HANDLE`
+ * and `ORCA_PANE_KEY` (an Orca launched from an Orca terminal), and the implicit-terminal guess has
+ * a sibling to find.
+ */
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const callMock = vi.hoisted(() => vi.fn())
+const getTerminalHandleMock = vi.hoisted(() => vi.fn())
+
+vi.mock('./format', () => ({ printResult: vi.fn() }))
+vi.mock('./selectors', () => ({ getTerminalHandle: getTerminalHandleMock }))
+
+import { ORCHESTRATION_HANDLERS } from './handlers/orchestration'
+import { findCommandSpec } from './args'
+import { COMMAND_SPECS } from './specs'
+import { refuseConflictingSessionCallerFlags } from './session-caller-flags'
+import { createOrchestrationCompatibilityEnvelope } from './runtime/orchestration-compatibility-envelope'
+import { getDefaultUserDataPath } from './runtime/metadata'
+import { formatCliError, reportCliError } from './cli-error'
+import { RuntimeRpcFailureError } from './runtime/types'
+
+const SESSION = 'f7a1c0de-1111-4222-8333-444455556666'
+/** The session a `/clear` continued as SESSION: the chat's orchestration address stays this one's. */
+const ROOT = '0b5e2d7c-9a41-4c3e-8f62-7d1a3e5b9c08'
+const IDENTITY_ENV = [
+  'ORCA_AGENT_SESSION_ID',
+  'ORCA_TERMINAL_HANDLE',
+  'ORCA_PANE_KEY',
+  'ORCA_STRUCTURED_SESSION'
+] as const
+const originalEnv = Object.fromEntries(IDENTITY_ENV.map((name) => [name, process.env[name]]))
+
+/** Enough of every receipt shape that each handler finishes after its RPC. */
+const RESULT = {
+  result: {
+    run: { id: 'run_1', objective: 'o', consumer_generation: 1 },
+    runs: [],
+    nextCursor: null,
+    messages: [],
+    count: 0,
+    message: { id: 'msg_1' },
+    lifecycle: { action: 'completed' },
+    dispatch: { id: 'dispatch_1', task_id: 'task_1', status: 'dispatched' },
+    gate: { id: 'gate_1', task_id: 'task_1', status: 'pending', resolution: 'r' },
+    gates: [],
+    task: { id: 'task_1', status: 'pending' },
+    tasks: [],
+    answer: 'yes',
+    messageId: 'msg_1',
+    threadId: 'thread_1',
+    timedOut: false,
+    state: 'ready',
+    runId: 'run_1',
+    taskId: 'task_1',
+    dispatchId: 'dispatch_1',
+    effects: [],
+    residualResources: [],
+    workers: [],
+    counts: {}
+  }
+}
+
+type Verb = {
+  command: string
+  flags: Record<string, string | true>
+  /** The flag that names the caller, when the verb has one. */
+  callerFlag?: 'from' | 'terminal'
+  method: string
+  callerParam: 'from' | 'terminal' | 'callerTerminalHandle'
+}
+
+/** Every verb whose request names its caller: the host's caller-param map, from the CLI side.
+ *  `dispatch-show` is not one: its --from only fills preview text, so it is pinned on its own. */
+const CALLER_VERBS: Verb[] = [
+  {
+    command: 'run-create',
+    flags: { objective: 'o' },
+    callerFlag: 'from',
+    method: 'runCreate',
+    callerParam: 'from'
+  },
+  {
+    command: 'run-use',
+    flags: { id: 'run_1' },
+    callerFlag: 'from',
+    method: 'runUse',
+    callerParam: 'from'
+  },
+  {
+    command: 'run-current',
+    flags: {},
+    callerFlag: 'from',
+    method: 'runCurrent',
+    callerParam: 'from'
+  },
+  { command: 'check', flags: {}, callerFlag: 'terminal', method: 'check', callerParam: 'terminal' },
+  {
+    command: 'send',
+    flags: { to: 'term_worker', subject: 's', body: 'b' },
+    callerFlag: 'from',
+    method: 'send',
+    callerParam: 'from'
+  },
+  {
+    command: 'reply',
+    flags: { id: 'msg_1', body: 'b' },
+    callerFlag: 'from',
+    method: 'reply',
+    callerParam: 'from'
+  },
+  {
+    command: 'ask',
+    flags: { to: 'term_worker', question: 'q' },
+    callerFlag: 'from',
+    method: 'ask',
+    callerParam: 'from'
+  },
+  {
+    command: 'dispatch',
+    flags: { task: 'task_1', to: 'term_worker' },
+    callerFlag: 'from',
+    method: 'dispatch',
+    callerParam: 'from'
+  },
+  {
+    command: 'gate-create',
+    flags: { task: 'task_1', question: 'q' },
+    callerFlag: 'from',
+    method: 'gateCreate',
+    callerParam: 'from'
+  },
+  {
+    command: 'gate-resolve',
+    flags: { id: 'gate_1', resolution: 'r' },
+    callerFlag: 'from',
+    method: 'gateResolve',
+    callerParam: 'from'
+  },
+  { command: 'gate-list', flags: {}, callerFlag: 'from', method: 'gateList', callerParam: 'from' },
+  {
+    command: 'task-create',
+    flags: { spec: 's' },
+    callerFlag: 'from',
+    method: 'taskCreate',
+    callerParam: 'callerTerminalHandle'
+  },
+  {
+    command: 'task-list',
+    flags: {},
+    callerFlag: 'from',
+    method: 'taskList',
+    callerParam: 'callerTerminalHandle'
+  },
+  {
+    command: 'task-update',
+    flags: { id: 'task_1', status: 'completed' },
+    callerFlag: 'from',
+    method: 'taskUpdate',
+    callerParam: 'callerTerminalHandle'
+  },
+  {
+    command: 'worker-start',
+    flags: { spec: 's' },
+    callerFlag: 'from',
+    method: 'workerStart',
+    callerParam: 'from'
+  },
+  // No caller flag: its spec takes none. It asks runCurrent for the caller's Run.
+  { command: 'worker-list', flags: {}, method: 'runCurrent', callerParam: 'from' }
+]
+
+/** Enough flags for any verb to get past its own validation to identity resolution. */
+const EVERY_REQUIRED_FLAG = {
+  objective: 'o',
+  id: 'id_1',
+  task: 'task_1',
+  spec: 's',
+  question: 'q',
+  resolution: 'r',
+  subject: 's',
+  body: 'b',
+  to: 'term_worker',
+  status: 'completed',
+  preamble: true,
+  request: 'req_1'
+} as const
+
+function flagMap(flags: Record<string, string | true>): Map<string, string | boolean> {
+  return new Map(Object.entries(flags))
+}
+
+/** What `main()` does between parsing and dispatch: the spec-driven caller check, then the handler. */
+async function invoke(
+  command: string,
+  flags: Map<string, string | boolean>,
+  json = true
+): Promise<void> {
+  const handler = ORCHESTRATION_HANDLERS[`orchestration ${command}`]
+  if (!handler) {
+    throw new Error(`no handler for ${command}`)
+  }
+  refuseConflictingSessionCallerFlags(
+    findCommandSpec(COMMAND_SPECS, ['orchestration', command]),
+    flags
+  )
+  await handler({
+    flags,
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: these handlers read only `call`; RuntimeClient is a class, so a structural double cannot satisfy it without the cast.
+    client: { call: callMock } as never,
+    cwd: '/tmp/repo',
+    json
+  })
+}
+
+function isParams(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function callsTo(method: string): Record<string, unknown>[] {
+  return callMock.mock.calls
+    .filter(([name]) => name === `orchestration.${method}`)
+    .map(([, params]) => (isParams(params) ? params : {}))
+}
+
+function setEnv(env: Partial<Record<(typeof IDENTITY_ENV)[number], string>>): void {
+  for (const name of IDENTITY_ENV) {
+    const value = env[name]
+    if (value === undefined) {
+      delete process.env[name]
+    } else {
+      process.env[name] = value
+    }
+  }
+}
+
+/** A chat with its id, plus a pane identity it inherited from the Orca that launched it. */
+function asSessionWithInheritedPane(): void {
+  setEnv({
+    ORCA_AGENT_SESSION_ID: SESSION,
+    ORCA_TERMINAL_HANDLE: 'term_inherited_pane',
+    ORCA_PANE_KEY: 'tab_inherited:11111111-1111-4111-8111-111111111111'
+  })
+}
+
+beforeEach(() => {
+  callMock.mockReset().mockResolvedValue(RESULT)
+  getTerminalHandleMock.mockReset().mockResolvedValue('term_sibling')
+  vi.spyOn(console, 'log').mockImplementation(() => {})
+  vi.spyOn(console, 'error').mockImplementation(() => {})
+})
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  setEnv(originalEnv)
+  process.exitCode = undefined
+})
+
+describe.each(CALLER_VERBS)('orchestration $command run as an agent session', (verb) => {
+  beforeEach(asSessionWithInheritedPane)
+
+  it('acts as the session: no terminal is resolved, guessed or sent', async () => {
+    await invoke(verb.command, flagMap(verb.flags))
+
+    const [params] = callsTo(verb.method)
+    expect(params, 'the verb reached its method').toBeDefined()
+    expect(params?.[verb.callerParam]).toBeUndefined()
+    // An inherited pane is not the session's identity.
+    expect(params?.terminalPaneKey).toBeUndefined()
+    expect(params?.senderPaneKey).toBeUndefined()
+    expect(getTerminalHandleMock).not.toHaveBeenCalled()
+    expect(callMock.mock.calls.map(([name]) => name)).not.toEqual(
+      expect.arrayContaining([expect.stringMatching(/^terminal\./)])
+    )
+  })
+
+  it.runIf(verb.callerFlag !== undefined)(
+    'refuses a caller flag naming another caller, before any request',
+    async () => {
+      const flags = flagMap({ ...verb.flags, [verb.callerFlag ?? 'from']: 'term_sibling' })
+
+      await expect(invoke(verb.command, flags)).rejects.toMatchObject({
+        code: 'consumer_fenced',
+        message: expect.stringContaining(`agent session ${SESSION}`)
+      })
+      expect(callMock).not.toHaveBeenCalled()
+      expect(getTerminalHandleMock).not.toHaveBeenCalled()
+    }
+  )
+
+  it.runIf(verb.callerFlag !== undefined)(
+    'refuses an inherited pane handle too: the session, not the pane, is the caller',
+    async () => {
+      const flags = flagMap({ ...verb.flags, [verb.callerFlag ?? 'from']: 'term_inherited_pane' })
+
+      await expect(invoke(verb.command, flags)).rejects.toMatchObject({ code: 'consumer_fenced' })
+      expect(callMock).not.toHaveBeenCalled()
+    }
+  )
+
+  it.runIf(verb.callerFlag !== undefined).each([`session:${SESSION}`, SESSION])(
+    'accepts a caller flag that restates the session (%s)',
+    async (restated) => {
+      await invoke(verb.command, flagMap({ ...verb.flags, [verb.callerFlag ?? 'from']: restated }))
+
+      const [params] = callsTo(verb.method)
+      expect(params, 'the verb reached its method').toBeDefined()
+      expect(params?.[verb.callerParam]).toBeUndefined()
+    }
+  )
+})
+
+describe.each(CALLER_VERBS.filter((verb) => verb.callerFlag !== undefined))(
+  'orchestration $command run by a /clear-ed chat',
+  (verb) => {
+    beforeEach(asSessionWithInheritedPane)
+
+    it('sends the address it had before the clear for the host to place, instead of refusing it', async () => {
+      // The chat's address is its lineage root's, which only the host's session records know.
+      const flags = flagMap({ ...verb.flags, [verb.callerFlag ?? 'from']: `session:${ROOT}` })
+      await invoke(verb.command, flags)
+
+      const [params] = callsTo(verb.method)
+      expect(params?.[verb.callerParam]).toBe(`session:${ROOT}`)
+      expect(params?.terminalPaneKey).toBeUndefined()
+      expect(params?.senderPaneKey).toBeUndefined()
+      expect(getTerminalHandleMock).not.toHaveBeenCalled()
+    })
+  }
+)
+
+describe.each([
+  { command: 'gate-list', method: 'gateList', callerParam: 'from' },
+  { command: 'task-list', method: 'taskList', callerParam: 'callerTerminalHandle' }
+])('orchestration $command --run run as an agent session', ({ command, method, callerParam }) => {
+  beforeEach(asSessionWithInheritedPane)
+
+  it('needs no caller, but refuses a --from naming another caller, before any request', async () => {
+    await invoke(command, flagMap({ run: 'run_1' }))
+    expect(callsTo(method)[0]).toMatchObject({ run: 'run_1' })
+    expect(callsTo(method)[0]?.[callerParam]).toBeUndefined()
+
+    callMock.mockClear()
+    await expect(
+      invoke(command, flagMap({ run: 'run_1', from: 'term_sibling' }))
+    ).rejects.toMatchObject({ code: 'consumer_fenced' })
+    expect(callMock).not.toHaveBeenCalled()
+  })
+
+  it('accepts a --from that restates the session', async () => {
+    await invoke(command, flagMap({ run: 'run_1', from: `session:${SESSION}` }))
+    expect(callsTo(method)[0]?.[callerParam]).toBeUndefined()
+  })
+
+  it.each([`session:${ROOT}`, 'session:9d4c1b2a-3e5f-4a6b-8c7d-0e1f2a3b4c5d'])(
+    'sends a session address it cannot place (%s) for the host to check, never dropping it',
+    async (declared) => {
+      // A /clear-ed chat's root is accepted by the host; anyone else is refused there, before any
+      // effect. Dropped here, a conflicting caller would pass unchecked.
+      await invoke(command, flagMap({ run: 'run_1', from: declared }))
+      expect(callsTo(method)[0]).toMatchObject({ run: 'run_1', [callerParam]: declared })
+    }
+  )
+})
+
+describe('the identity a session presents', () => {
+  it("lets a structured worker restate its own minted handle, and nobody else's", async () => {
+    setEnv({ ORCA_AGENT_SESSION_ID: SESSION, ORCA_TERMINAL_HANDLE: 'structworker_self' })
+
+    await invoke('send', flagMap({ from: 'structworker_self', to: 'run:run_1', subject: 's' }))
+    expect(callsTo('send')[0]?.from).toBeUndefined()
+
+    callMock.mockClear()
+    await expect(
+      invoke('send', flagMap({ from: 'structworker_other', to: 'run:run_1', subject: 's' }))
+    ).rejects.toMatchObject({ code: 'consumer_fenced' })
+    expect(callMock).not.toHaveBeenCalled()
+  })
+
+  it("sends a structured worker's lifecycle report as the session, not refused as identity-less", async () => {
+    setEnv({ ORCA_AGENT_SESSION_ID: SESSION })
+
+    await invoke(
+      'send',
+      flagMap({ to: 'run:run_1', subject: 'done', type: 'worker_done', outcome: 'succeeded' })
+    )
+
+    expect(callsTo('send')[0]).toMatchObject({ type: 'worker_done' })
+    expect(callsTo('send')[0]?.from).toBeUndefined()
+  })
+
+  it('never treats a session that has an id as identity-less, even beside the old marker', async () => {
+    setEnv({ ORCA_AGENT_SESSION_ID: SESSION, ORCA_STRUCTURED_SESSION: '1' })
+
+    await invoke('check', flagMap({}))
+
+    expect(callsTo('check')).toHaveLength(1)
+    expect(getTerminalHandleMock).not.toHaveBeenCalled()
+  })
+
+  it('keeps the identity-less refusal, without --from advice, for a child that has no id', async () => {
+    setEnv({ ORCA_STRUCTURED_SESSION: '1' })
+
+    await expect(invoke('reply', flagMap({ id: 'msg_1', body: 'b' }))).rejects.toMatchObject({
+      code: 'no_active_sender_terminal',
+      message: expect.not.stringContaining('Pass --from')
+    })
+    expect(getTerminalHandleMock).not.toHaveBeenCalled()
+    expect(callMock).not.toHaveBeenCalled()
+  })
+
+  it('leaves a terminal agent exactly as it was: its own handle is the caller', async () => {
+    setEnv({ ORCA_TERMINAL_HANDLE: 'term_pty', ORCA_PANE_KEY: 'tab_pty:1:2' })
+    callMock.mockImplementation(async (name: string) =>
+      name === 'terminal.resolveIdentity' ? { result: { identity: { live: true } } } : RESULT
+    )
+
+    await invoke('run-create', flagMap({ objective: 'o' }))
+    await invoke('check', flagMap({}))
+
+    expect(callsTo('runCreate')[0]?.from).toBe('term_pty')
+    expect(callsTo('check')[0]).toMatchObject({
+      terminal: 'term_pty',
+      terminalPaneKey: 'tab_pty:1:2'
+    })
+  })
+
+  it('previews a dispatch with the coordinator address the real dispatch would write', async () => {
+    const preview = async (flags: Record<string, string | true>) => {
+      callMock.mockClear()
+      await invoke('dispatch-show', flagMap({ task: 'task_1', preamble: true, ...flags }))
+      return callsTo('dispatchShow')[0]?.from
+    }
+    asSessionWithInheritedPane()
+    expect(await preview({})).toBe(`session:${SESSION}`)
+    // Not a caller flag: it names the text to preview, so it is never fenced.
+    expect(await preview({ from: 'term_sibling' })).toBe('term_sibling')
+    setEnv({ ORCA_AGENT_SESSION_ID: SESSION, ORCA_TERMINAL_HANDLE: 'structworker_self' })
+    expect(await preview({})).toBe('structworker_self')
+    expect(getTerminalHandleMock).not.toHaveBeenCalled()
+  })
+
+  it('resumes a timed-out ask as the session, without naming a terminal', async () => {
+    asSessionWithInheritedPane()
+    callMock.mockResolvedValue({ result: { ...RESULT.result, answer: null, timedOut: true } })
+    const errors = vi.mocked(console.error)
+
+    await invoke('ask', flagMap({ to: 'term_worker', question: 'q' }), false)
+
+    const advice = errors.mock.calls.map(([line]) => String(line)).join('\n')
+    expect(advice).toContain('--resume msg_1')
+    expect(advice).not.toContain('--from')
+  })
+})
+
+describe('a host refusal of the session', () => {
+  const WORKER_GONE = new RuntimeRpcFailureError({
+    id: 'rpc_1',
+    ok: false,
+    error: {
+      code: 'session_caller_not_live',
+      message: `Agent session ${SESSION} is a structured worker whose worker identity this host no longer has, so it cannot act in orchestration. No effects were applied.`,
+      data: { effectsApplied: false }
+    },
+    _meta: { runtimeId: 'runtime_1' }
+  })
+
+  it.each(['check', 'run-current', 'worker-list'])(
+    'surfaces from %s verbatim, never widened, retried or turned into a terminal guess',
+    async (command) => {
+      asSessionWithInheritedPane()
+      callMock.mockRejectedValue(WORKER_GONE)
+
+      await expect(invoke(command, flagMap({}))).rejects.toBe(WORKER_GONE)
+      expect(getTerminalHandleMock).not.toHaveBeenCalled()
+      expect(formatCliError(WORKER_GONE)).toBe(WORKER_GONE.message)
+    }
+  )
+
+  it('keeps the Orca id a provider-id refusal names, for a JSON reader to branch on', () => {
+    const providerId = new RuntimeRpcFailureError({
+      id: 'rpc_1',
+      ok: false,
+      error: {
+        code: 'session_caller_provider_id',
+        message: 'provider id',
+        data: { effectsApplied: false, orcaSessionId: SESSION }
+      },
+      _meta: { runtimeId: 'runtime_1' }
+    })
+    const printed: string[] = []
+    vi.mocked(console.log).mockImplementation((line: string) => {
+      printed.push(line)
+    })
+
+    reportCliError(providerId, true)
+
+    expect(JSON.parse(printed.join('\n'))).toMatchObject({
+      ok: false,
+      error: { code: 'session_caller_provider_id', data: { orcaSessionId: SESSION } }
+    })
+  })
+})
+
+describe('the orchestration envelope', () => {
+  it('carries the injected id beside whatever terminal evidence the process also has', () => {
+    const envelope = createOrchestrationCompatibilityEnvelope({
+      ORCA_AGENT_SESSION_ID: ` ${SESSION} `,
+      ORCA_TERMINAL_HANDLE: 'term_inherited_pane'
+    })
+
+    expect(envelope.orchestrationCompatibilityEvidence).toEqual({
+      terminalHandle: 'term_inherited_pane',
+      agentSessionId: SESSION
+    })
+  })
+
+  it('binds whichever current Orca CLI the agent reached, not only the one the session names', () => {
+    // A login shell can put another install's `orca` first, and the packaged Windows launcher
+    // rewrites ORCA_CLI_COMMAND in its own process. Neither matters: the id rides the envelope
+    // and the pinned instance is the one dialed.
+    vi.stubEnv('ORCA_USER_DATA_PATH', '/data/session-orca')
+    try {
+      const envelope = createOrchestrationCompatibilityEnvelope({
+        ORCA_AGENT_SESSION_ID: SESSION,
+        ORCA_CLI_COMMAND: 'orca',
+        ORCA_WINDOWS_PACKAGED_CLI_LAUNCHER: '1',
+        ORCA_USER_DATA_PATH: '/data/session-orca'
+      })
+
+      expect(envelope.orchestrationCompatibilityEvidence).toEqual({ agentSessionId: SESSION })
+      expect(getDefaultUserDataPath('linux', '/home/u')).toBe('/data/session-orca')
+    } finally {
+      vi.unstubAllEnvs()
+    }
+  })
+
+  it('claims no session without an injected id', () => {
+    expect(
+      createOrchestrationCompatibilityEnvelope({ ORCA_AGENT_SESSION_ID: '  ' })
+        .orchestrationCompatibilityEvidence
+    ).toBeUndefined()
+  })
+
+  it('keeps a WSL stamp beside the id, so the host can refuse the cross-host claim', () => {
+    const envelope = createOrchestrationCompatibilityEnvelope({
+      ORCA_AGENT_SESSION_ID: SESSION,
+      ORCA_ORCHESTRATION_COMPATIBILITY_HOST_KIND: 'wsl',
+      ORCA_ORCHESTRATION_COMPATIBILITY_HOST_ID: 'local',
+      ORCA_ORCHESTRATION_COMPATIBILITY_HOST_INCARNATION: 'Ubuntu'
+    })
+
+    expect(envelope.orchestrationCompatibilityEvidence).toEqual({
+      agentSessionId: SESSION,
+      host: { kind: 'wsl', hostId: 'local', distro: 'Ubuntu' }
+    })
+  })
+})
+
+describe('which flag names the caller, declared on every spec', () => {
+  const ORCHESTRATION_SPECS = COMMAND_SPECS.filter((spec) => spec.path[0] === 'orchestration')
+
+  it('classifies every --from and --terminal an orchestration verb accepts', () => {
+    // A new verb cannot take either flag without saying whether it names the caller, so the entry
+    // check covers it by construction instead of each handler remembering to refuse.
+    const unclassified = ORCHESTRATION_SPECS.flatMap((spec) =>
+      (['from', 'terminal'] as const)
+        .filter((flag) => spec.allowedFlags.includes(flag) && !spec.identityFlagRoles?.[flag])
+        .map((flag) => `${spec.path.join(' ')} --${flag}`)
+    )
+    expect(unclassified).toEqual([])
+  })
+
+  const callerFlagVerbs = ORCHESTRATION_SPECS.flatMap((spec) =>
+    (['from', 'terminal'] as const)
+      .filter((flag) => spec.identityFlagRoles?.[flag] === 'caller')
+      .map((flag) => ({ command: spec.path[1] ?? '', flag }))
+  )
+
+  it('covers the verbs whose requests name a caller', () => {
+    expect(callerFlagVerbs.length).toBeGreaterThanOrEqual(CALLER_VERBS.length)
+  })
+
+  it.each(callerFlagVerbs)(
+    '$command refuses --$flag naming another caller, before any request',
+    async ({ command, flag }) => {
+      asSessionWithInheritedPane()
+      await expect(
+        invoke(command, flagMap({ ...EVERY_REQUIRED_FLAG, [flag]: 'term_sibling' }))
+      ).rejects.toMatchObject({ code: 'consumer_fenced' })
+      expect(callMock).not.toHaveBeenCalled()
+      expect(getTerminalHandleMock).not.toHaveBeenCalled()
+    }
+  )
+
+  it.each(
+    ORCHESTRATION_SPECS.flatMap((spec) =>
+      (['from', 'terminal'] as const)
+        .filter((flag) => spec.identityFlagRoles?.[flag] === 'target')
+        .map((flag) => ({ command: spec.path[1] ?? '', flag }))
+    )
+  )('$command passes a --$flag target through unfenced', async ({ command, flag }) => {
+    asSessionWithInheritedPane()
+    await invoke(command, flagMap({ ...EVERY_REQUIRED_FLAG, [flag]: 'term_sibling' })).catch(
+      (error: unknown) => {
+        expect(error).not.toMatchObject({ code: 'consumer_fenced' })
+      }
+    )
+    expect(callMock.mock.calls.flatMap(([, params]) => Object.values(params ?? {}))).toContain(
+      'term_sibling'
+    )
+  })
+})
+
+describe('every orchestration verb, enumerated', () => {
+  /** Runs every verb once; returns the ones that guessed an implicit terminal. */
+  async function verbsThatGuess(): Promise<string[]> {
+    const guessed: string[] = []
+    for (const command of Object.keys(ORCHESTRATION_HANDLERS)) {
+      const verb = command.replace('orchestration ', '')
+      getTerminalHandleMock.mockClear()
+      callMock.mockClear()
+      await invoke(verb, flagMap(EVERY_REQUIRED_FLAG)).catch(() => undefined)
+      if (getTerminalHandleMock.mock.calls.length > 0) {
+        guessed.push(verb)
+      }
+    }
+    return guessed.sort()
+  }
+
+  it('guesses a terminal for no verb when the session id is present', async () => {
+    // Positive control first: with no identity at all the same harness sees the guess, so an empty
+    // result below is about the id, not a harness that cannot observe a guess.
+    setEnv({})
+    const population = await verbsThatGuess()
+    expect(population).toEqual([
+      'ask',
+      'check',
+      'dispatch',
+      'dispatch-show',
+      'gate-create',
+      'gate-list',
+      'gate-resolve',
+      'reply',
+      'run-create',
+      'run-current',
+      'run-use',
+      'send',
+      'task-create',
+      'task-list',
+      'task-update',
+      'worker-list',
+      'worker-start'
+    ])
+
+    asSessionWithInheritedPane()
+    expect(await verbsThatGuess()).toEqual([])
+  })
+})
diff --git a/src/cli/registry-parity.test.ts b/src/cli/registry-parity.test.ts
deleted file mode 100644
index 588a4e14d087..000000000000
--- a/src/cli/registry-parity.test.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import type { CommandSpec } from './args'
-import { HANDLER_COMMAND_KEYS } from './dispatch'
-import { findRegistryParityGaps } from './registry-parity'
-import { COMMAND_SPECS } from './specs'
-
-describe('registry parity (live tree)', () => {
-  const handlerKeys = [...HANDLER_COMMAND_KEYS]
-
-  it('has a handler for every canonical spec path', () => {
-    const { specsWithoutHandler } = findRegistryParityGaps(COMMAND_SPECS, handlerKeys)
-    expect(specsWithoutHandler).toEqual([])
-  })
-
-  it('has a spec for every handler key', () => {
-    const { handlersWithoutSpec } = findRegistryParityGaps(COMMAND_SPECS, handlerKeys)
-    expect(handlersWithoutSpec).toEqual([])
-  })
-})
-
-describe('findRegistryParityGaps (fixtures)', () => {
-  const spec = (path: string[], aliases?: string[][]): CommandSpec => ({
-    path,
-    aliases,
-    summary: 's',
-    usage: 'u',
-    allowedFlags: []
-  })
-
-  it('flags a spec with no handler', () => {
-    const gaps = findRegistryParityGaps([spec(['foo', 'bar'])], [])
-    expect(gaps.specsWithoutHandler).toEqual(['foo bar'])
-  })
-
-  it('flags a handler with no spec', () => {
-    const gaps = findRegistryParityGaps([spec(['foo', 'bar'])], ['foo bar', 'ghost cmd'])
-    expect(gaps.handlersWithoutSpec).toEqual(['ghost cmd'])
-  })
-
-  it('does not require a handler for an alias path', () => {
-    const gaps = findRegistryParityGaps([spec(['foo', 'rm'], [['foo', 'remove']])], ['foo rm'])
-    expect(gaps.specsWithoutHandler).toEqual([])
-    expect(gaps.handlersWithoutSpec).toEqual([])
-  })
-})
diff --git a/src/cli/registry-parity.ts b/src/cli/registry-parity.ts
deleted file mode 100644
index 27c0130b555c..000000000000
--- a/src/cli/registry-parity.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { CommandSpec } from './args'
-
-// Why: validation/help and dispatch use parallel registries that must not drift.
-
-export type RegistryParityGaps = {
-  handlersWithoutSpec: string[]
-  specsWithoutHandler: string[]
-}
-
-export function findRegistryParityGaps(
-  specs: CommandSpec[],
-  handlerKeys: Iterable<string>
-): RegistryParityGaps {
-  // Why: aliases resolve before dispatch and deliberately have no handler key.
-  const canonical = new Set(specs.map((spec) => spec.path.join(' ')))
-  const handlers = new Set(handlerKeys)
-  return {
-    handlersWithoutSpec: [...handlers].filter((key) => !canonical.has(key)),
-    specsWithoutHandler: [...canonical].filter((key) => !handlers.has(key))
-  }
-}
diff --git a/src/cli/runtime-client-deferral.test.ts b/src/cli/runtime-client-deferral.test.ts
index 1487e2364f73..7dc29179065d 100644
--- a/src/cli/runtime-client-deferral.test.ts
+++ b/src/cli/runtime-client-deferral.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { mkdtempSync, readFileSync, rmSync } from 'node:fs'
+import { mkdtempSync, rmSync } from 'node:fs'
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
 
@@ -60,8 +60,6 @@ vi.mock('./runtime-client', () => {
 import { main } from './index'
 import * as dispatchModule from './dispatch'
 
-const CLI_DIR = __dirname
-
 describe('RuntimeClient module-graph deferral', () => {
   let logSpy: ReturnType<typeof vi.spyOn>
   let errorSpy: ReturnType<typeof vi.spyOn>
@@ -84,39 +82,6 @@ describe('RuntimeClient module-graph deferral', () => {
     process.exitCode = 0
   })
 
-  // Why: the whole point of the change. These modules load on EVERY
-  // invocation, so a value-import of the barrel from any of them drags the
-  // RuntimeClient graph (zod, ws, tweetnacl) back onto the --help path.
-  it.each([
-    'args.ts',
-    'flags.ts',
-    'dispatch.ts',
-    'format.ts',
-    'cli-error.ts',
-    'selectors.ts',
-    'execution-host-flag.ts'
-  ])('%s imports error classes from ./runtime/types, not the barrel', (file) => {
-    const source = readFileSync(join(CLI_DIR, file), 'utf8')
-    const valueImports = source
-      .split('\n')
-      .filter((line) => line.startsWith('import ') && line.includes("'./runtime-client'"))
-    for (const line of valueImports) {
-      expect(line, `${file}: "${line}" must be type-only`).toMatch(/^import type /)
-    }
-    // Why: format.ts re-exports its error formatters; the guarded import lives in cli-error.ts.
-    if (file !== 'format.ts') {
-      expect(source).toContain("} from './runtime/types'")
-    }
-  })
-
-  it('index.ts has no eager value-import of the runtime client', () => {
-    const source = readFileSync(join(CLI_DIR, 'index.ts'), 'utf8')
-    expect(source).toContain("import type { RuntimeClient } from './runtime-client'")
-    expect(source).not.toMatch(/^import \{[^}]*RuntimeClient[^}]*\} from '\.\/runtime-client'/m)
-    expect(source).toContain("await import('./runtime-client.js')")
-    expect(source).toContain("import { reportCliError } from './cli-error'")
-  })
-
   it('constructs no client for --help', async () => {
     await main(['--help'], '/tmp/repo')
     expect(constructorArgsMock).not.toHaveBeenCalled()
diff --git a/src/cli/runtime/orchestration-compatibility-envelope.ts b/src/cli/runtime/orchestration-compatibility-envelope.ts
index 8172e556dc1e..7d6c0dfda80b 100644
--- a/src/cli/runtime/orchestration-compatibility-envelope.ts
+++ b/src/cli/runtime/orchestration-compatibility-envelope.ts
@@ -1,12 +1,17 @@
 import { randomUUID } from 'node:crypto'
+import { readInjectedAgentSessionId } from '../../shared/agent-session-caller-env'
 import { readOrchestrationCompatibilityEvidence } from '../../shared/orchestration-compatibility-evidence'
 import type { RuntimeOrchestrationEnvelope } from '../../shared/runtime-rpc-envelope'
 
 export function createOrchestrationCompatibilityEnvelope(
   env: NodeJS.ProcessEnv
 ): RuntimeOrchestrationEnvelope {
+  const evidence = readOrchestrationCompatibilityEvidence(env)
+  // Read here, from this CLI's own environment only: the SSH paths build evidence from a remote
+  // shell's environment, where a session id could never name a session on this host.
+  const agentSessionId = readInjectedAgentSessionId(env)
   return {
     compatibilityInvocationId: randomUUID(),
-    orchestrationCompatibilityEvidence: readOrchestrationCompatibilityEvidence(env)
+    orchestrationCompatibilityEvidence: agentSessionId ? { ...evidence, agentSessionId } : evidence
   }
 }
diff --git a/src/cli/runtime/transport-framing.test.ts b/src/cli/runtime/transport-framing.test.ts
index cf3150f60c99..0f2c27b6a1bc 100644
--- a/src/cli/runtime/transport-framing.test.ts
+++ b/src/cli/runtime/transport-framing.test.ts
@@ -66,14 +66,16 @@ describe('CLI runtime response framing', () => {
     const pending = sendRequest(metadata, 'terminal.read', {}, 30000)
     const originalIndexOf = String.prototype.indexOf
     let searchedCharacters = 0
-    const search = vi
-      .spyOn(String.prototype, 'indexOf')
-      .mockImplementation(function (this: string, value, position) {
-        if (value === '\n') {
-          searchedCharacters += this.length - (position ?? 0)
-        }
-        return originalIndexOf.call(this, value, position)
-      })
+    const search = vi.spyOn(String.prototype, 'indexOf').mockImplementation(function (
+      this: string,
+      value,
+      position
+    ) {
+      if (value === '\n') {
+        searchedCharacters += this.length - (position ?? 0)
+      }
+      return originalIndexOf.call(this, value, position)
+    })
     try {
       for (let offset = 0; offset < encoded.length; offset += 256) {
         socket.emit('data', encoded.slice(offset, offset + 256))
diff --git a/src/cli/search-command-arguments.test.ts b/src/cli/search-command-arguments.test.ts
index be9195a1fab7..27b06286f529 100644
--- a/src/cli/search-command-arguments.test.ts
+++ b/src/cli/search-command-arguments.test.ts
@@ -126,7 +126,7 @@ describe('orca search argument parsing', () => {
 
   it('rejects an unknown --agent and names the known ones', () => {
     expect(() => parseSearch(['search', 'q', '--agent', 'claude', '--agent', 'bogus'])).toThrow(
-      /Unknown --agent "bogus"\. Known agents: claude, codex, /
+      /Unknown --agent "bogus"\. Known agents: claude, codebuddy, codex, /
     )
   })
 
diff --git a/src/cli/serve-electron-flag-parity.test.ts b/src/cli/serve-electron-flag-parity.test.ts
index a4964e1a8243..ef0c040524bc 100644
--- a/src/cli/serve-electron-flag-parity.test.ts
+++ b/src/cli/serve-electron-flag-parity.test.ts
@@ -1,8 +1,6 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { normalizeServeModeArgv } from '../main/startup/serve-mode-argv'
-import { BOOLEAN_FLAGS, GLOBAL_FLAGS } from './args'
+import { BOOLEAN_FLAGS } from './args'
 import { SERVE_COMMAND_SPECS } from './specs/serve'
 
 // Why this test lives under src/cli: the Electron rewrite duplicates the CLI's serve flag list because
@@ -51,31 +49,4 @@ describe('serve flag parity between the CLI spec and the Electron argv rewrite',
     // Idempotent: `orca serve` spawns the app already in this shape, and the rewrite runs over it too.
     expect(normalizeServeModeArgv(expected)).toEqual(expected)
   })
-
-  it('emits the same --serve-* names the CLI spawns with and the main process reads', () => {
-    // Why source text: serveOrcaApp spawns a real process; keeping both names visible here makes
-    // the rewrite/parser contract fail loudly if either side drifts.
-    const launchSource = readFileSync(join(process.cwd(), 'src/cli/runtime/launch.ts'), 'utf8')
-    const serveOptionsSource = readFileSync(
-      join(process.cwd(), 'src/main/startup/serve-options.ts'),
-      'utf8'
-    )
-    const start = serveOptionsSource.indexOf('export function getServeOptions(')
-    // Why bound the anchor: an unresolved indexOf slices to EOF and passes vacuously.
-    expect(start).toBeGreaterThanOrEqual(0)
-    const end = serveOptionsSource.indexOf('\n}', start)
-    expect(end).toBeGreaterThan(start)
-    const getServeOptionsBody = serveOptionsSource.slice(start, end)
-
-    for (const flag of translatedFlags) {
-      expect(launchSource).toContain(`'--serve-${flag}'`)
-      expect(getServeOptionsBody).toContain(`'--serve-${flag}'`)
-    }
-  })
-
-  it('keeps the untranslated allowlist tied to real global flags', () => {
-    for (const flag of UNTRANSLATED_GLOBAL_FLAGS) {
-      expect(GLOBAL_FLAGS).toContain(flag)
-    }
-  })
 })
diff --git a/src/cli/session-caller-flags.ts b/src/cli/session-caller-flags.ts
new file mode 100644
index 000000000000..80078ffda7b4
--- /dev/null
+++ b/src/cli/session-caller-flags.ts
@@ -0,0 +1,73 @@
+/**
+ * An agent session is its own orchestration caller. A flag that names the caller may restate that
+ * session, but one naming anyone else is refused before any effect — never dropped, never allowed
+ * to win. Against a host that predates session callers this is the only guard: such a host
+ * would honor the flag as the caller, which is how a chat consumed a sibling's mail (#21097).
+ *
+ * Whether `--from`/`--terminal` names the caller or a target is declared on the command's spec
+ * (`identityFlagRoles`) and checked once, here, at the CLI entry, so a handler cannot forget it.
+ *
+ * A `/clear`ed chat keeps its lineage root's address, which only the host's records can place, so
+ * a session address that is not this session's own spelling goes to the host's canonical-id check.
+ */
+
+import type { CommandSpec, IdentityFlag } from './command-spec'
+import { RuntimeClientError } from './runtime/types'
+import {
+  injectedSessionAddress,
+  readInjectedAgentSessionId
+} from '../shared/agent-session-caller-env'
+import { ORCA_SESSION_ADDRESS_PREFIX } from '../shared/orca-session-address-prefix'
+
+export function refuseConflictingSessionCallerFlags(
+  spec: CommandSpec | undefined,
+  flags: ReadonlyMap<string, string | boolean>,
+  env: NodeJS.ProcessEnv = process.env
+): void {
+  const sessionId = readInjectedAgentSessionId(env)
+  if (!sessionId || !spec?.identityFlagRoles) {
+    return
+  }
+  for (const flagName of IDENTITY_FLAGS) {
+    const declared = flags.get(flagName)
+    if (
+      spec.identityFlagRoles[flagName] === 'caller' &&
+      typeof declared === 'string' &&
+      !namesInjectedSession(declared, sessionId, env) &&
+      !sessionAddressForHost(declared, sessionId, env)
+    ) {
+      throw new RuntimeClientError(
+        'consumer_fenced',
+        `This command runs as agent session ${sessionId}, so --${flagName} ${declared} would act as a ` +
+          `different caller. Drop --${flagName}: this session's orchestration commands already act ` +
+          `as this session. No request was sent.`
+      )
+    }
+  }
+}
+
+const IDENTITY_FLAGS: readonly IdentityFlag[] = ['from', 'terminal']
+
+/**
+ * The session's own spellings, plus the handle a structured worker session was minted. Plain
+ * strings: this runs at the CLI entry for every command, before the address codec's module graph.
+ */
+function namesInjectedSession(value: string, sessionId: string, env: NodeJS.ProcessEnv): boolean {
+  return (
+    value === sessionId ||
+    value === `${ORCA_SESSION_ADDRESS_PREFIX}${sessionId}` ||
+    value === injectedSessionAddress(env)
+  )
+}
+
+/** A session address only the host can place: this session's `/clear` root, or someone else. */
+export function sessionAddressForHost(
+  value: string,
+  sessionId: string,
+  env: NodeJS.ProcessEnv = process.env
+): string | undefined {
+  return value.startsWith(ORCA_SESSION_ADDRESS_PREFIX) &&
+    !namesInjectedSession(value, sessionId, env)
+    ? value
+    : undefined
+}
diff --git a/src/cli/specs/orchestration-worker-specs.ts b/src/cli/specs/orchestration-worker-specs.ts
index 1448667e54ae..04423ffc6fb0 100644
--- a/src/cli/specs/orchestration-worker-specs.ts
+++ b/src/cli/specs/orchestration-worker-specs.ts
@@ -31,6 +31,7 @@ export const ORCHESTRATION_WORKER_COMMAND_SPECS: CommandSpec[] = [
       'from',
       'retry-request'
     ],
+    identityFlagRoles: { from: 'caller', terminal: 'target' },
     notes: [
       'Current and existing worktrees never rerun setup; a fresh agent terminal is created unless --terminal is explicit.',
       'When reusing --terminal, pass --worktree for that terminal; current means the coordinator worktree.',
diff --git a/src/cli/specs/orchestration.ts b/src/cli/specs/orchestration.ts
index 458afa2e5257..8c4418f38ba5 100644
--- a/src/cli/specs/orchestration.ts
+++ b/src/cli/specs/orchestration.ts
@@ -9,6 +9,7 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
     usage:
       'orca orchestration run-create --objective <text> [--from <handle>] [--retry-request <id>] [--json]',
     allowedFlags: [...GLOBAL_FLAGS, 'objective', 'from', 'retry-request'],
+    identityFlagRoles: { from: 'caller' },
     notes: [
       'A Run is a namespace and home inbox. It never schedules or places workers.',
       '--retry-request is only for exact recovery after an unknown mutation result.'
@@ -20,6 +21,7 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
     usage:
       'orca orchestration run-use --id <run_id> [--from <handle>] [--takeover-legacy] [--retry-request <id>] [--json]',
     allowedFlags: [...GLOBAL_FLAGS, 'id', 'from', 'takeover-legacy', 'retry-request'],
+    identityFlagRoles: { from: 'caller' },
     notes: [
       '--takeover-legacy must run in the live coordinator agent terminal it binds; it preserves existing worker assignments.'
     ]
@@ -28,7 +30,8 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
     path: ['orchestration', 'run-current'],
     summary: 'Show the Run bound to this coordinator terminal',
     usage: 'orca orchestration run-current [--from <handle>] [--json]',
-    allowedFlags: [...GLOBAL_FLAGS, 'from']
+    allowedFlags: [...GLOBAL_FLAGS, 'from'],
+    identityFlagRoles: { from: 'caller' }
   },
   {
     path: ['orchestration', 'run-list'],
@@ -67,6 +70,7 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
       'report-path',
       'phase'
     ],
+    identityFlagRoles: { from: 'caller' },
     notes: [
       'Valid --type values: status, dispatch, worker_done, merge_ready, escalation, handoff, decision_gate, question, heartbeat.',
       'To answer a worker question, use orchestration reply --id <msg_id> --body <text> with the same Orca CLI executable.',
@@ -109,6 +113,7 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
       'timeout-ms',
       'retry-request'
     ],
+    identityFlagRoles: { terminal: 'caller' },
     notes: [
       'On Windows PowerShell, quote comma-separated type filters, e.g. --types "worker_done,escalation".',
       '--types is the wake condition for --wait; a returned Delivery is always the whole FIFO batch, so it is never filtered by type. Without --wait it has no effect on consuming checks. Only --peek and --all filter their rows.',
@@ -121,13 +126,15 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
     summary: 'Reply to a message',
     usage:
       'orca orchestration reply --id <msg_id> --body <text> [--run <run_id>] [--from <handle>] [--retry-request <id>] [--json]',
-    allowedFlags: [...GLOBAL_FLAGS, 'id', 'body', 'run', 'from', 'retry-request']
+    allowedFlags: [...GLOBAL_FLAGS, 'id', 'body', 'run', 'from', 'retry-request'],
+    identityFlagRoles: { from: 'caller' }
   },
   {
     path: ['orchestration', 'inbox'],
     summary: 'Show messages across (or for) recipients',
     usage: 'orca orchestration inbox [--limit <n>] [--terminal <handle>] [--full] [--json]',
-    allowedFlags: [...GLOBAL_FLAGS, 'limit', 'terminal', 'full']
+    allowedFlags: [...GLOBAL_FLAGS, 'limit', 'terminal', 'full'],
+    identityFlagRoles: { terminal: 'target' }
   },
   {
     path: ['orchestration', 'task-create'],
@@ -144,7 +151,8 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
       'run',
       'from',
       'retry-request'
-    ]
+    ],
+    identityFlagRoles: { from: 'caller' }
   },
   {
     path: ['orchestration', 'task-list'],
@@ -152,6 +160,7 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
     usage:
       'orca orchestration task-list [--status <status>] [--ready] [--brief] [--run <run_id>] [--from <handle>] [--json]',
     allowedFlags: [...GLOBAL_FLAGS, 'status', 'ready', 'brief', 'run', 'from'],
+    identityFlagRoles: { from: 'caller' },
     notes: ['--brief collapses whitespace and caps each spec at 160 characters.']
   },
   {
@@ -160,6 +169,7 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
     usage:
       'orca orchestration task-update --id <task_id> --status <status> [--result <json>] [--run <run_id>] [--from <handle>] [--retry-request <id>] [--json]',
     allowedFlags: [...GLOBAL_FLAGS, 'id', 'status', 'result', 'run', 'from', 'retry-request'],
+    identityFlagRoles: { from: 'caller' },
     notes: ['Valid --status values: pending, ready, dispatched, completed, failed, blocked.']
   },
   ...ORCHESTRATION_WORKER_COMMAND_SPECS,
@@ -178,7 +188,8 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
       'dry-run',
       'return-preamble',
       'retry-request'
-    ]
+    ],
+    identityFlagRoles: { from: 'caller' }
   },
   {
     path: ['orchestration', 'request-show'],
@@ -196,7 +207,8 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
     summary: 'Show dispatch context for a task',
     usage:
       'orca orchestration dispatch-show --task <task_id> [--preamble] [--from <handle>] [--json]',
-    allowedFlags: [...GLOBAL_FLAGS, 'task', 'preamble', 'from']
+    allowedFlags: [...GLOBAL_FLAGS, 'task', 'preamble', 'from'],
+    identityFlagRoles: { from: 'target' }
   },
   {
     path: ['orchestration', 'ask'],
@@ -215,6 +227,7 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
       'from',
       'retry-request'
     ],
+    identityFlagRoles: { from: 'caller' },
     notes: [
       'From an active Dispatch, a new question defaults to its owning Run mailbox.',
       'Timeout leaves the question pending; resume with the original message ID.'
@@ -234,6 +247,7 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
       'max-concurrent',
       'worktree'
     ],
+    identityFlagRoles: { from: 'caller' },
     notes: [
       'This command performs no effects and returns the exact `skills get orchestration --full` recovery action.',
       'Use the lightweight Run, Task, and worker-start primitives described by the current skill.'
@@ -254,14 +268,16 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
     summary: 'Create a decision gate blocking a task',
     usage:
       'orca orchestration gate-create --task <task_id> --question <text> [--options <json_array>] [--from <handle>] [--retry-request <id>] [--json]',
-    allowedFlags: [...GLOBAL_FLAGS, 'task', 'question', 'options', 'from', 'retry-request']
+    allowedFlags: [...GLOBAL_FLAGS, 'task', 'question', 'options', 'from', 'retry-request'],
+    identityFlagRoles: { from: 'caller' }
   },
   {
     path: ['orchestration', 'gate-resolve'],
     summary: 'Resolve a pending decision gate',
     usage:
       'orca orchestration gate-resolve --id <gate_id> --resolution <text> [--from <handle>] [--retry-request <id>] [--json]',
-    allowedFlags: [...GLOBAL_FLAGS, 'id', 'resolution', 'from', 'retry-request']
+    allowedFlags: [...GLOBAL_FLAGS, 'id', 'resolution', 'from', 'retry-request'],
+    identityFlagRoles: { from: 'caller' }
   },
   {
     path: ['orchestration', 'gate-list'],
@@ -269,6 +285,7 @@ export const ORCHESTRATION_COMMAND_SPECS: CommandSpec[] = [
     usage:
       'orca orchestration gate-list [--task <task_id>] [--status <status>] [--run <run_id>] [--from <handle>] [--json]',
     allowedFlags: [...GLOBAL_FLAGS, 'task', 'status', 'run', 'from'],
+    identityFlagRoles: { from: 'caller' },
     notes: ['--run inspects a named Run without binding; otherwise gates are scoped to the caller.']
   },
   {
diff --git a/src/cli/terminal-format.test.ts b/src/cli/terminal-format.test.ts
index 294fbc09ceeb..ee0a985441ea 100644
--- a/src/cli/terminal-format.test.ts
+++ b/src/cli/terminal-format.test.ts
@@ -57,6 +57,22 @@ describe('formatTerminalClose', () => {
     )
   })
 
+  it('promises the reconnect replay only when the host recorded the kill for it', () => {
+    const close = {
+      handle: 'term_remote',
+      tabId: 'tab-1',
+      ptyKilled: false,
+      ptyStopVerdict: 'unverifiable' as const,
+      ptyStopReason: 'SSH connection lost, reconnecting...'
+    }
+    expect(formatTerminalClose({ close: { ...close, pendingKillRecorded: true } })).toBe(
+      'Closed terminal term_remote. The PTY was not confirmed stopped: SSH connection lost, reconnecting... The kill retries when the host reconnects.'
+    )
+    expect(formatTerminalClose({ close })).toBe(
+      'Closed terminal term_remote. The PTY was not confirmed stopped: SSH connection lost, reconnecting...'
+    )
+  })
+
   it('names a PTY known to be live', () => {
     expect(
       formatTerminalClose({
diff --git a/src/cli/terminal-format.ts b/src/cli/terminal-format.ts
index 97e117b2229e..5a67a6413aae 100644
--- a/src/cli/terminal-format.ts
+++ b/src/cli/terminal-format.ts
@@ -1,4 +1,4 @@
-import { PTY_LIVE_NOTE, describeUnconfirmedStop } from '../shared/pty-liveness-verdict'
+import { PTY_LIVE_NOTE, describeUnconfirmedCloseStop } from '../shared/pty-liveness-verdict'
 import { describeTerminalWaitBlockedReason } from '../shared/terminal-wait-blocked-reason-legacy-alias'
 import { formatListingHostScope, type WithAnnotatedHostScope } from './omitted-host-scope-selectors'
 import type {
@@ -254,7 +254,7 @@ function describePtyStop(close: RuntimeTerminalClose): string {
     return ` ${PTY_LIVE_NOTE}`
   }
   if (close.ptyStopVerdict === 'unverifiable') {
-    return ` ${describeUnconfirmedStop(close.ptyStopReason ?? 'its host could not be reached')}`
+    return ` ${describeUnconfirmedCloseStop(close)}`
   }
   return ''
 }
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-bash-rcfile.txt b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-bash-rcfile.txt
index 536831230b43..bfbd9b420e26 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-bash-rcfile.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-bash-rcfile.txt
@@ -104,11 +104,22 @@ fi
 # Why || : twice — zsh alone aborts inside the substitution, but every shell's
 # assignment adopts its exit status, so an absent codex trips set -e in bash too.
 __orca_codex_binary="$(unalias codex 2>/dev/null || :; command -v codex 2>/dev/null || :)"
-if [[ -n "${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "${ORCA_CODEX_LAUNCH_PREFLIGHT}" && -n "${__orca_codex_binary:-}" && -x "${__orca_codex_binary}" ]]; then
+if [[ -n "${__orca_codex_binary:-}" && -x "${__orca_codex_binary}" ]]; then
   # Why the function reserved word: it suppresses alias expansion of the name,
   # which otherwise rewrites this header at parse time and aborts the whole file.
   function codex {
-    "${ORCA_CODEX_LAUNCH_PREFLIGHT}" agent hooks prepare-codex >/dev/null 2>&1 || :
+    # Why local: zsh's warn_create_global warns for each global a function creates.
+    local __orca_codex_arg __orca_codex_isolate="${ORCA_CODEX_ISOLATE:-1}"
+    if [[ -n "${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "${ORCA_CODEX_LAUNCH_PREFLIGHT}" ]]; then
+      "${ORCA_CODEX_LAUNCH_PREFLIGHT}" agent hooks prepare-codex >/dev/null 2>&1 || :
+    fi
+    for __orca_codex_arg in "$@"; do
+      case "$__orca_codex_arg" in agents|queue|--no-daemon|--remote|--remote=*) __orca_codex_isolate=0 ;; esac
+    done
+    # Why probe every launch: a cached answer goes stale across an upgrade, and 0.155 and older exit 2 on the flag.
+    if [[ "$__orca_codex_isolate" != 0 ]]; then
+      case "$(command codex --help 2>/dev/null </dev/null)" in *--no-daemon*) set -- --no-daemon "$@" ;; esac
+    fi
     command codex "$@"
   }
 fi
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-fish-init.txt b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-fish-init.txt
index df2d2c3cc0e1..ff24125e2c00 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-fish-init.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-fish-init.txt
@@ -6,9 +6,14 @@ end
 # absent, leaving "test = file" — fish then errors instead of failing closed.
 # Quoting in place is not the fix; fish never substitutes inside double quotes.
 set -l __orca_codex_type (type -t codex 2>/dev/null)
-if test -x "$ORCA_CODEX_LAUNCH_PREFLIGHT"; and test "$__orca_codex_type" = file
+if test "$__orca_codex_type" = file
   function codex
-    command "$ORCA_CODEX_LAUNCH_PREFLIGHT" agent hooks prepare-codex >/dev/null 2>&1; or true
+    if test -x "$ORCA_CODEX_LAUNCH_PREFLIGHT"
+      command "$ORCA_CODEX_LAUNCH_PREFLIGHT" agent hooks prepare-codex >/dev/null 2>&1; or true
+    end
+    if test "$ORCA_CODEX_ISOLATE" != 0; and not string match -qr -- '^(agents|queue|--no-daemon|--remote|--remote=.*)$' $argv; and command codex --help 2>/dev/null </dev/null | string match -q -- '*--no-daemon*'
+      set argv --no-daemon $argv
+    end
     command codex $argv
   end
 end
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-zsh-zshenv.txt b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-zsh-zshenv.txt
index f86bd5693815..12d37e0f724b 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-zsh-zshenv.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-zsh-zshenv.txt
@@ -136,22 +136,33 @@ __orca_deferred_init() {
 
     # Why: Codex must keep using Orca's runtime CODEX_HOME after rc files.
     [[ -n "${ORCA_CODEX_HOME:-}" ]] && export CODEX_HOME="${ORCA_CODEX_HOME}"
-    # Why: a typed alias expands inside the shell, after pane launch prep.
-    # Why unalias inside the substitution: an alias named codex makes command -v
-    # report the alias text, and the subshell leaves the user's own alias intact.
-    # Why || : twice — zsh alone aborts inside the substitution, but every shell's
-    # assignment adopts its exit status, so an absent codex trips set -e in bash too.
-    __orca_codex_binary="$(unalias codex 2>/dev/null || :; command -v codex 2>/dev/null || :)"
-    if [[ -n "${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "${ORCA_CODEX_LAUNCH_PREFLIGHT}" && -n "${__orca_codex_binary:-}" && -x "${__orca_codex_binary}" ]]; then
-      # Why the function reserved word: it suppresses alias expansion of the name,
-      # which otherwise rewrites this header at parse time and aborts the whole file.
-      function codex {
+  fi
+  # Why: a typed alias expands inside the shell, after pane launch prep.
+  # Why unalias inside the substitution: an alias named codex makes command -v
+  # report the alias text, and the subshell leaves the user's own alias intact.
+  # Why || : twice — zsh alone aborts inside the substitution, but every shell's
+  # assignment adopts its exit status, so an absent codex trips set -e in bash too.
+  __orca_codex_binary="$(unalias codex 2>/dev/null || :; command -v codex 2>/dev/null || :)"
+  if [[ -n "${__orca_codex_binary:-}" && -x "${__orca_codex_binary}" ]]; then
+    # Why the function reserved word: it suppresses alias expansion of the name,
+    # which otherwise rewrites this header at parse time and aborts the whole file.
+    function codex {
+      # Why local: zsh's warn_create_global warns for each global a function creates.
+      local __orca_codex_arg __orca_codex_isolate="${ORCA_CODEX_ISOLATE:-1}"
+      if [[ -n "${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "${ORCA_CODEX_LAUNCH_PREFLIGHT}" ]]; then
         "${ORCA_CODEX_LAUNCH_PREFLIGHT}" agent hooks prepare-codex >/dev/null 2>&1 || :
-        command codex "$@"
-      }
-    fi
-    unset __orca_codex_binary
+      fi
+      for __orca_codex_arg in "$@"; do
+        case "$__orca_codex_arg" in agents|queue|--no-daemon|--remote|--remote=*) __orca_codex_isolate=0 ;; esac
+      done
+      # Why probe every launch: a cached answer goes stale across an upgrade, and 0.155 and older exit 2 on the flag.
+      if [[ "$__orca_codex_isolate" != 0 ]]; then
+        case "$(command codex --help 2>/dev/null </dev/null)" in *--no-daemon*) set -- --no-daemon "$@" ;; esac
+      fi
+      command codex "$@"
+    }
   fi
+  unset __orca_codex_binary
   if [[ -n "${_orca_histfile:-}" ]]; then
     HISTFILE="$_orca_histfile"
   fi
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/local-bash-rcfile.txt b/src/main/__fixtures__/shell-wrapper-snapshots/local-bash-rcfile.txt
index a541bb9769b4..d947f956e481 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/local-bash-rcfile.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/local-bash-rcfile.txt
@@ -114,11 +114,22 @@ fi
 # Why || : twice — zsh alone aborts inside the substitution, but every shell's
 # assignment adopts its exit status, so an absent codex trips set -e in bash too.
 __orca_codex_binary="$(unalias codex 2>/dev/null || :; command -v codex 2>/dev/null || :)"
-if [[ -n "${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "${ORCA_CODEX_LAUNCH_PREFLIGHT}" && -n "${__orca_codex_binary:-}" && -x "${__orca_codex_binary}" ]]; then
+if [[ -n "${__orca_codex_binary:-}" && -x "${__orca_codex_binary}" ]]; then
   # Why the function reserved word: it suppresses alias expansion of the name,
   # which otherwise rewrites this header at parse time and aborts the whole file.
   function codex {
-    "${ORCA_CODEX_LAUNCH_PREFLIGHT}" agent hooks prepare-codex >/dev/null 2>&1 || :
+    # Why local: zsh's warn_create_global warns for each global a function creates.
+    local __orca_codex_arg __orca_codex_isolate="${ORCA_CODEX_ISOLATE:-1}"
+    if [[ -n "${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "${ORCA_CODEX_LAUNCH_PREFLIGHT}" ]]; then
+      "${ORCA_CODEX_LAUNCH_PREFLIGHT}" agent hooks prepare-codex >/dev/null 2>&1 || :
+    fi
+    for __orca_codex_arg in "$@"; do
+      case "$__orca_codex_arg" in agents|queue|--no-daemon|--remote|--remote=*) __orca_codex_isolate=0 ;; esac
+    done
+    # Why probe every launch: a cached answer goes stale across an upgrade, and 0.155 and older exit 2 on the flag.
+    if [[ "$__orca_codex_isolate" != 0 ]]; then
+      case "$(command codex --help 2>/dev/null </dev/null)" in *--no-daemon*) set -- --no-daemon "$@" ;; esac
+    fi
     command codex "$@"
   }
 fi
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/local-fish-init.txt b/src/main/__fixtures__/shell-wrapper-snapshots/local-fish-init.txt
index df2d2c3cc0e1..ff24125e2c00 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/local-fish-init.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/local-fish-init.txt
@@ -6,9 +6,14 @@ end
 # absent, leaving "test = file" — fish then errors instead of failing closed.
 # Quoting in place is not the fix; fish never substitutes inside double quotes.
 set -l __orca_codex_type (type -t codex 2>/dev/null)
-if test -x "$ORCA_CODEX_LAUNCH_PREFLIGHT"; and test "$__orca_codex_type" = file
+if test "$__orca_codex_type" = file
   function codex
-    command "$ORCA_CODEX_LAUNCH_PREFLIGHT" agent hooks prepare-codex >/dev/null 2>&1; or true
+    if test -x "$ORCA_CODEX_LAUNCH_PREFLIGHT"
+      command "$ORCA_CODEX_LAUNCH_PREFLIGHT" agent hooks prepare-codex >/dev/null 2>&1; or true
+    end
+    if test "$ORCA_CODEX_ISOLATE" != 0; and not string match -qr -- '^(agents|queue|--no-daemon|--remote|--remote=.*)$' $argv; and command codex --help 2>/dev/null </dev/null | string match -q -- '*--no-daemon*'
+      set argv --no-daemon $argv
+    end
     command codex $argv
   end
 end
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/local-zsh-zshenv.txt b/src/main/__fixtures__/shell-wrapper-snapshots/local-zsh-zshenv.txt
index 674ac3a9e375..93fb79a907a9 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/local-zsh-zshenv.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/local-zsh-zshenv.txt
@@ -143,22 +143,33 @@ __orca_deferred_init() {
 
     # Why: Codex must keep using Orca's runtime CODEX_HOME after rc files.
     [[ -n "${ORCA_CODEX_HOME:-}" ]] && export CODEX_HOME="${ORCA_CODEX_HOME}"
-    # Why: a typed alias expands inside the shell, after pane launch prep.
-    # Why unalias inside the substitution: an alias named codex makes command -v
-    # report the alias text, and the subshell leaves the user's own alias intact.
-    # Why || : twice — zsh alone aborts inside the substitution, but every shell's
-    # assignment adopts its exit status, so an absent codex trips set -e in bash too.
-    __orca_codex_binary="$(unalias codex 2>/dev/null || :; command -v codex 2>/dev/null || :)"
-    if [[ -n "${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "${ORCA_CODEX_LAUNCH_PREFLIGHT}" && -n "${__orca_codex_binary:-}" && -x "${__orca_codex_binary}" ]]; then
-      # Why the function reserved word: it suppresses alias expansion of the name,
-      # which otherwise rewrites this header at parse time and aborts the whole file.
-      function codex {
+  fi
+  # Why: a typed alias expands inside the shell, after pane launch prep.
+  # Why unalias inside the substitution: an alias named codex makes command -v
+  # report the alias text, and the subshell leaves the user's own alias intact.
+  # Why || : twice — zsh alone aborts inside the substitution, but every shell's
+  # assignment adopts its exit status, so an absent codex trips set -e in bash too.
+  __orca_codex_binary="$(unalias codex 2>/dev/null || :; command -v codex 2>/dev/null || :)"
+  if [[ -n "${__orca_codex_binary:-}" && -x "${__orca_codex_binary}" ]]; then
+    # Why the function reserved word: it suppresses alias expansion of the name,
+    # which otherwise rewrites this header at parse time and aborts the whole file.
+    function codex {
+      # Why local: zsh's warn_create_global warns for each global a function creates.
+      local __orca_codex_arg __orca_codex_isolate="${ORCA_CODEX_ISOLATE:-1}"
+      if [[ -n "${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "${ORCA_CODEX_LAUNCH_PREFLIGHT}" ]]; then
         "${ORCA_CODEX_LAUNCH_PREFLIGHT}" agent hooks prepare-codex >/dev/null 2>&1 || :
-        command codex "$@"
-      }
-    fi
-    unset __orca_codex_binary
+      fi
+      for __orca_codex_arg in "$@"; do
+        case "$__orca_codex_arg" in agents|queue|--no-daemon|--remote|--remote=*) __orca_codex_isolate=0 ;; esac
+      done
+      # Why probe every launch: a cached answer goes stale across an upgrade, and 0.155 and older exit 2 on the flag.
+      if [[ "$__orca_codex_isolate" != 0 ]]; then
+        case "$(command codex --help 2>/dev/null </dev/null)" in *--no-daemon*) set -- --no-daemon "$@" ;; esac
+      fi
+      command codex "$@"
+    }
   fi
+  unset __orca_codex_binary
   if [[ -n "${_orca_histfile:-}" ]]; then
     HISTFILE="$_orca_histfile"
   fi
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/relay-bash-rcfile.txt b/src/main/__fixtures__/shell-wrapper-snapshots/relay-bash-rcfile.txt
index 61bdd01dd506..3042bb11df44 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/relay-bash-rcfile.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/relay-bash-rcfile.txt
@@ -88,6 +88,32 @@ if [[ -n "${ORCA_OMP_STATUS_EXTENSION:-}" ]]; then
   function omp { __orca_omp "$@"; }
 fi
 
+# Why: a typed alias expands inside the shell, after pane launch prep.
+# Why unalias inside the substitution: an alias named codex makes command -v
+# report the alias text, and the subshell leaves the user's own alias intact.
+# Why || : twice — zsh alone aborts inside the substitution, but every shell's
+# assignment adopts its exit status, so an absent codex trips set -e in bash too.
+__orca_codex_binary="$(unalias codex 2>/dev/null || :; command -v codex 2>/dev/null || :)"
+if [[ -n "${__orca_codex_binary:-}" && -x "${__orca_codex_binary}" ]]; then
+  # Why the function reserved word: it suppresses alias expansion of the name,
+  # which otherwise rewrites this header at parse time and aborts the whole file.
+  function codex {
+    # Why local: zsh's warn_create_global warns for each global a function creates.
+    local __orca_codex_arg __orca_codex_isolate="${ORCA_CODEX_ISOLATE:-1}"
+    if [[ -n "${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "${ORCA_CODEX_LAUNCH_PREFLIGHT}" ]]; then
+      "${ORCA_CODEX_LAUNCH_PREFLIGHT}" agent hooks prepare-codex >/dev/null 2>&1 || :
+    fi
+    for __orca_codex_arg in "$@"; do
+      case "$__orca_codex_arg" in agents|queue|--no-daemon|--remote|--remote=*) __orca_codex_isolate=0 ;; esac
+    done
+    # Why probe every launch: a cached answer goes stale across an upgrade, and 0.155 and older exit 2 on the flag.
+    if [[ "$__orca_codex_isolate" != 0 ]]; then
+      case "$(command codex --help 2>/dev/null </dev/null)" in *--no-daemon*) set -- --no-daemon "$@" ;; esac
+    fi
+    command codex "$@"
+  }
+fi
+unset __orca_codex_binary
 if [[ -n "${ORCA_HISTFILE:-}" ]]; then
   HISTFILE="$ORCA_HISTFILE"
   builtin unset ORCA_HISTFILE
diff --git a/src/main/__fixtures__/shell-wrapper-snapshots/relay-zsh-zshenv.txt b/src/main/__fixtures__/shell-wrapper-snapshots/relay-zsh-zshenv.txt
index ff90115d30d5..4299ebb42b50 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/relay-zsh-zshenv.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/relay-zsh-zshenv.txt
@@ -108,6 +108,32 @@ __orca_deferred_init() {
       function omp { __orca_omp "$@"; }
     fi
   fi
+  # Why: a typed alias expands inside the shell, after pane launch prep.
+  # Why unalias inside the substitution: an alias named codex makes command -v
+  # report the alias text, and the subshell leaves the user's own alias intact.
+  # Why || : twice — zsh alone aborts inside the substitution, but every shell's
+  # assignment adopts its exit status, so an absent codex trips set -e in bash too.
+  __orca_codex_binary="$(unalias codex 2>/dev/null || :; command -v codex 2>/dev/null || :)"
+  if [[ -n "${__orca_codex_binary:-}" && -x "${__orca_codex_binary}" ]]; then
+    # Why the function reserved word: it suppresses alias expansion of the name,
+    # which otherwise rewrites this header at parse time and aborts the whole file.
+    function codex {
+      # Why local: zsh's warn_create_global warns for each global a function creates.
+      local __orca_codex_arg __orca_codex_isolate="${ORCA_CODEX_ISOLATE:-1}"
+      if [[ -n "${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "${ORCA_CODEX_LAUNCH_PREFLIGHT}" ]]; then
+        "${ORCA_CODEX_LAUNCH_PREFLIGHT}" agent hooks prepare-codex >/dev/null 2>&1 || :
+      fi
+      for __orca_codex_arg in "$@"; do
+        case "$__orca_codex_arg" in agents|queue|--no-daemon|--remote|--remote=*) __orca_codex_isolate=0 ;; esac
+      done
+      # Why probe every launch: a cached answer goes stale across an upgrade, and 0.155 and older exit 2 on the flag.
+      if [[ "$__orca_codex_isolate" != 0 ]]; then
+        case "$(command codex --help 2>/dev/null </dev/null)" in *--no-daemon*) set -- --no-daemon "$@" ;; esac
+      fi
+      command codex "$@"
+    }
+  fi
+  unset __orca_codex_binary
   if [[ -n "${_orca_histfile:-}" ]]; then
     HISTFILE="$_orca_histfile"
   fi
diff --git a/src/main/agent-hooks/installer-utils.ts b/src/main/agent-hooks/installer-utils.ts
index e6519fdb6f2e..9eb23e44316e 100644
--- a/src/main/agent-hooks/installer-utils.ts
+++ b/src/main/agent-hooks/installer-utils.ts
@@ -320,7 +320,7 @@ export function writeHooksJson(
   config: Record<string, unknown>,
   // Why: `serialized` lets a JSONC config (Devin) supply text edited in place, so the
   // atomic write + rolling backup below stay shared instead of being reimplemented.
-  options?: { preserveMode?: boolean; serialized?: string }
+  options?: { preserveMode?: boolean; defaultMode?: number; serialized?: string }
 ): void {
   const writePath = resolveHooksJsonWritePath(configPath)
   const dir = dirname(writePath)
@@ -331,7 +331,9 @@ export function writeHooksJson(
   const tmpPath = join(dir, `.${Date.now()}-${randomUUID()}.tmp`)
   const serialized = options?.serialized ?? `${JSON.stringify(config, null, 2)}\n`
   const existingMode =
-    options?.preserveMode === true && existsSync(writePath) ? statSync(writePath).mode : undefined
+    options?.preserveMode === true && existsSync(writePath)
+      ? statSync(writePath).mode & 0o777
+      : options?.defaultMode
 
   // Why: skip the write (and therefore the .bak rotation) when the on-disk
   // content is already identical. Without this, every install() rewrites the
@@ -348,7 +350,11 @@ export function writeHooksJson(
   }
 
   try {
-    writeFileSync(tmpPath, serialized, { encoding: 'utf-8', mode: existingMode })
+    writeFileSync(tmpPath, serialized, { encoding: 'utf-8', mode: existingMode, flag: 'wx' })
+    if (existingMode !== undefined && process.platform !== 'win32') {
+      // Preserve requested permissions even with a stricter process umask.
+      chmodSync(tmpPath, existingMode)
+    }
     // Why: single rolling backup — one file, no accumulation in ~/.claude.
     // Protects against a merge-logic bug producing bad JSON; the original is
     // always recoverable from <configPath>.bak until the next write.
diff --git a/src/main/agent-hooks/managed-agent-hook-controls.test.ts b/src/main/agent-hooks/managed-agent-hook-controls.test.ts
index 625cc06f5052..ee38da3a7fe7 100644
--- a/src/main/agent-hooks/managed-agent-hook-controls.test.ts
+++ b/src/main/agent-hooks/managed-agent-hook-controls.test.ts
@@ -19,7 +19,7 @@ vi.mock('./local-agent-cli-presence', () => ({
   detectLocalManagedAgentCliPresence: mocks.detect
 }))
 
-vi.mock('../claude/claude-session-end-hook-capability', () => ({
+vi.mock('../claude/claude-hook-event-versions', () => ({
   probeClaudeCliVersion: mocks.probeClaudeVersion
 }))
 
diff --git a/src/main/agent-hooks/managed-agent-hook-controls.ts b/src/main/agent-hooks/managed-agent-hook-controls.ts
index 7edfd94c7c83..a667e056669c 100644
--- a/src/main/agent-hooks/managed-agent-hook-controls.ts
+++ b/src/main/agent-hooks/managed-agent-hook-controls.ts
@@ -5,7 +5,11 @@ import {
 } from '../../shared/managed-agent-hook-targets'
 import { normalizeDisabledTuiAgents } from '../../shared/tui-agent-selection'
 import type { GlobalSettings } from '../../shared/global-settings-types'
-import { probeClaudeCliVersion } from '../claude/claude-session-end-hook-capability'
+import {
+  isAgentStatusHooksEnabled,
+  isAgentStatusHooksEnabledForAgent
+} from '../../shared/agent-status-hooks-setting'
+import { probeClaudeCliVersion } from '../claude/claude-hook-event-versions'
 import { detectLocalManagedAgentCliPresence } from './local-agent-cli-presence'
 import {
   MANAGED_AGENT_HOOK_ASYNC_REMOVERS,
@@ -19,6 +23,10 @@ import {
 
 export { MANAGED_AGENT_HOOK_INSTALLERS } from './managed-agent-hook-registry'
 export { prepareManagedCodexHomeBeforeShellLaunch } from '../codex/managed-home-shell-preflight'
+export {
+  isAgentStatusHooksEnabled,
+  isAgentStatusHooksEnabledForAgent
+} from '../../shared/agent-status-hooks-setting'
 
 type ManagedHookSettings = Partial<
   Pick<GlobalSettings, 'agentCmdOverrides' | 'agentStatusHooksEnabled' | 'disabledTuiAgents'>
@@ -37,12 +45,6 @@ type RemoveOptions = {
   agents?: readonly AgentHookTarget[]
 }
 
-export function isAgentStatusHooksEnabled(
-  settings: Partial<Pick<GlobalSettings, 'agentStatusHooksEnabled'>> | null | undefined
-): boolean {
-  return settings?.agentStatusHooksEnabled !== false
-}
-
 export type StartupManagedHookAction = 'install' | 'skip'
 
 // Why never 'remove': this reads THIS instance's settings, but the managed hook files are
@@ -60,10 +62,7 @@ export function shouldInstallStartupManagedAgentHook(
   settings: ManagedHookSettings,
   agent: AgentHookTarget
 ): boolean {
-  return (
-    resolveStartupManagedHookAction(settings) === 'install' &&
-    !normalizeDisabledTuiAgents(settings?.disabledTuiAgents).includes(agent)
-  )
+  return isAgentStatusHooksEnabledForAgent(settings, agent)
 }
 
 export function shouldContinueManagedHookStartup(
@@ -71,11 +70,7 @@ export function shouldContinueManagedHookStartup(
   settings: ManagedHookSettings,
   agent: AgentHookTarget
 ): boolean {
-  return (
-    !isQuitting &&
-    isAgentStatusHooksEnabled(settings) &&
-    !normalizeDisabledTuiAgents(settings?.disabledTuiAgents).includes(agent)
-  )
+  return !isQuitting && isAgentStatusHooksEnabledForAgent(settings, agent)
 }
 
 function errorStatus(agent: AgentHookTarget, error: unknown): AgentHookInstallStatus {
diff --git a/src/main/agent-hooks/managed-agent-hook-registry.ts b/src/main/agent-hooks/managed-agent-hook-registry.ts
index 560233e8363a..11b642ee0900 100644
--- a/src/main/agent-hooks/managed-agent-hook-registry.ts
+++ b/src/main/agent-hooks/managed-agent-hook-registry.ts
@@ -1,3 +1,5 @@
+import { codebuddyHookService } from '../codebuddy/hook-service'
+import { qoderHookService } from '../qoder/hook-service'
 import type { AgentHookInstallStatus } from '../../shared/agent-hook-types'
 import type { HookInstallAgent } from '../../shared/telemetry-events'
 import { ampHookService } from '../amp/hook-service'
@@ -8,6 +10,7 @@ import { commandCodeHookService } from '../command-code/hook-service'
 import { copilotHookService } from '../copilot/hook-service'
 import { cursorHookService } from '../cursor/hook-service'
 import { devinHookService } from '../devin/hook-service'
+import { dshHookService } from '../dsh/hook-service'
 import { droidHookService } from '../droid/hook-service'
 import { geminiHookService } from '../gemini/hook-service'
 import { grokHookService } from '../grok/hook-service'
@@ -43,6 +46,8 @@ export const MANAGED_AGENT_HOOK_INSTALLERS: readonly ManagedAgentHookInstaller[]
   ['openclaude', () => openClaudeHookService.install()],
   ['codex', () => codexHookService.install()],
   ['gemini', () => geminiHookService.install()],
+  ['qoder', () => qoderHookService.install()],
+  ['codebuddy', () => codebuddyHookService.install()],
   ['antigravity', () => antigravityHookService.install()],
   ['amp', () => ampHookService.install()],
   ['cursor', () => cursorHookService.install()],
@@ -54,7 +59,8 @@ export const MANAGED_AGENT_HOOK_INSTALLERS: readonly ManagedAgentHookInstaller[]
   ['devin', () => devinHookService.install()],
   ['kimi', () => kimiHookService.install()],
   ['muse', () => museHookService.install()],
-  ['zcode', () => zcodeHookService.install()]
+  ['zcode', () => zcodeHookService.install()],
+  ['dsh', () => dshHookService.install()]
 ]
 
 // Why: covers the shared launcher/statusline scripts under ~/.orca/agent-hooks — the files a
@@ -68,6 +74,8 @@ export const MANAGED_AGENT_HOOK_SCRIPT_REFRESHERS: readonly ManagedAgentHookScri
   ['openclaude', () => openClaudeHookService.refreshManagedScripts()],
   ['codex', () => codexHookService.refreshManagedScripts()],
   ['gemini', () => geminiHookService.refreshManagedScripts()],
+  ['qoder', () => qoderHookService.refreshManagedScripts()],
+  ['codebuddy', () => codebuddyHookService.refreshManagedScripts()],
   ['antigravity', () => antigravityHookService.refreshManagedScripts()],
   ['cursor', () => cursorHookService.refreshManagedScripts()],
   ['droid', () => droidHookService.refreshManagedScripts()],
@@ -77,7 +85,8 @@ export const MANAGED_AGENT_HOOK_SCRIPT_REFRESHERS: readonly ManagedAgentHookScri
   ['devin', () => devinHookService.refreshManagedScripts()],
   ['kimi', () => kimiHookService.refreshManagedScripts()],
   ['muse', () => museHookService.refreshManagedScripts()],
-  ['zcode', () => zcodeHookService.refreshManagedScripts()]
+  ['zcode', () => zcodeHookService.refreshManagedScripts()],
+  ['dsh', () => dshHookService.refreshManagedScripts()]
 ]
 
 export const MANAGED_AGENT_HOOK_REMOVERS: readonly ManagedAgentHookRemover[] = [
@@ -85,6 +94,8 @@ export const MANAGED_AGENT_HOOK_REMOVERS: readonly ManagedAgentHookRemover[] = [
   ['openclaude', () => openClaudeHookService.remove()],
   ['codex', () => codexHookService.remove()],
   ['gemini', () => geminiHookService.remove()],
+  ['qoder', () => qoderHookService.remove()],
+  ['codebuddy', () => codebuddyHookService.remove()],
   ['antigravity', () => antigravityHookService.remove()],
   ['amp', () => ampHookService.remove()],
   ['cursor', () => cursorHookService.remove()],
@@ -96,7 +107,8 @@ export const MANAGED_AGENT_HOOK_REMOVERS: readonly ManagedAgentHookRemover[] = [
   ['devin', () => devinHookService.remove()],
   ['kimi', () => kimiHookService.remove()],
   ['muse', () => museHookService.remove()],
-  ['zcode', () => zcodeHookService.remove()]
+  ['zcode', () => zcodeHookService.remove()],
+  ['dsh', () => dshHookService.remove()]
 ]
 
 export const MANAGED_AGENT_HOOK_ASYNC_REMOVERS: readonly ManagedAgentHookAsyncRemover[] = [
@@ -108,6 +120,8 @@ export const MANAGED_AGENT_HOOK_STATUS_READERS: readonly ManagedAgentHookStatusR
   ['openclaude', () => openClaudeHookService.getStatus()],
   ['codex', () => codexHookService.getStatus()],
   ['gemini', () => geminiHookService.getStatus()],
+  ['qoder', () => qoderHookService.getStatus()],
+  ['codebuddy', () => codebuddyHookService.getStatus()],
   ['antigravity', () => antigravityHookService.getStatus()],
   ['amp', () => ampHookService.getStatus()],
   ['cursor', () => cursorHookService.getStatus()],
@@ -119,5 +133,6 @@ export const MANAGED_AGENT_HOOK_STATUS_READERS: readonly ManagedAgentHookStatusR
   ['devin', () => devinHookService.getStatus()],
   ['kimi', () => kimiHookService.getStatus()],
   ['muse', () => museHookService.getStatus()],
-  ['zcode', () => zcodeHookService.getStatus()]
+  ['zcode', () => zcodeHookService.getStatus()],
+  ['dsh', () => dshHookService.getStatus()]
 ]
diff --git a/src/main/agent-hooks/managed-hook-command-contract.test.ts b/src/main/agent-hooks/managed-hook-command-contract.test.ts
index 774e9396c251..ebb1412ec580 100644
--- a/src/main/agent-hooks/managed-hook-command-contract.test.ts
+++ b/src/main/agent-hooks/managed-hook-command-contract.test.ts
@@ -22,6 +22,7 @@ import {
 import { getDevinManagedCommand, getDevinRemoteManagedCommand } from '../devin/hook-settings'
 import { getGrokManagedCommand } from '../grok/grok-hook-script'
 import { getMuseManagedCommand, getMuseRemoteManagedCommand } from '../muse/hook-settings'
+import { getDshManagedCommand, getDshRemoteManagedCommand } from '../dsh/hook-settings'
 import { getZCodeManagedCommand, getZCodeRemoteManagedCommand } from '../zcode/hook-settings'
 import {
   wrapPosixHookCommand,
@@ -81,6 +82,34 @@ const buildersByAgent = new Map<string, CommandBuilders>([
       remote: (path) => [getClaudeRemoteCommand(path)]
     }
   ],
+  [
+    'qoder',
+    {
+      local: (path) => [
+        getManagedLifecycleHook(path, {
+          configDirName: '.qoder',
+          scriptBaseName: 'qoder-hook',
+          usesWindowsCompatLauncher: true,
+          windowsHookShell: 'powershell'
+        }).command
+      ],
+      remote: (path) => [getClaudeRemoteCommand(path)]
+    }
+  ],
+  [
+    'codebuddy',
+    {
+      local: (path) => [
+        getManagedLifecycleHook(path, {
+          configDirName: '.codebuddy',
+          scriptBaseName: 'codebuddy-hook',
+          usesWindowsCompatLauncher: true,
+          windowsHookShell: 'powershell'
+        }).command
+      ],
+      remote: (path) => [getClaudeRemoteCommand(path)]
+    }
+  ],
   [
     'codex',
     {
@@ -151,6 +180,13 @@ const buildersByAgent = new Map<string, CommandBuilders>([
       remote: (path) => [getMuseRemoteManagedCommand(path)]
     }
   ],
+  [
+    'dsh',
+    {
+      local: (path) => [getDshManagedCommand(path)],
+      remote: (path) => [getDshRemoteManagedCommand(path)]
+    }
+  ],
   [
     'zcode',
     {
@@ -198,10 +234,16 @@ describe('managed hook command contract', () => {
       expect(commands.length).toBeGreaterThan(0)
       for (const command of commands) {
         expect(command.length).toBeGreaterThan(0)
-        // Native Windows Codex evaluates PowerShell variables without Grok's dollar-byte scanner.
+        // Native PowerShell hooks evaluate these variables without Grok's dollar-byte scanner.
         const scannedCommand =
-          agent === 'codex' && platform === 'win32' && command.startsWith('if (Test-Path')
-            ? command.replaceAll('$LASTEXITCODE', '').replaceAll('$env:', '')
+          platform === 'win32' &&
+          ((agent === 'codex' && command.startsWith('if (Test-Path')) ||
+            ((agent === 'qoder' || agent === 'codebuddy') &&
+              command.startsWith('$scriptPath = Join-Path')))
+            ? command
+                .replaceAll('$LASTEXITCODE', '')
+                .replaceAll('$env:', '')
+                .replaceAll('$scriptPath', '')
             : command
         expect(findBareHookCommandVariables(scannedCommand), command).toEqual([])
       }
diff --git a/src/main/agent-hooks/managed-hook-detection-commands.ts b/src/main/agent-hooks/managed-hook-detection-commands.ts
index f9507160e276..0d3ee8280d59 100644
--- a/src/main/agent-hooks/managed-hook-detection-commands.ts
+++ b/src/main/agent-hooks/managed-hook-detection-commands.ts
@@ -7,7 +7,7 @@ import { MANAGED_AGENT_HOOK_TARGETS } from '../../shared/managed-agent-hook-targ
 import { normalizeDisabledTuiAgents } from '../../shared/tui-agent-selection'
 import type { GlobalSettings } from '../../shared/global-settings-types'
 import type { TuiAgentDetectionCommand } from '../ipc/tui-agent-detection-commands'
-import { parseClaudeCliVersion } from '../claude/claude-session-end-hook-capability'
+import { parseClaudeCliVersion } from '../claude/claude-hook-event-versions'
 
 export type ManagedHookDetectionSettings = Partial<
   Pick<GlobalSettings, 'agentCmdOverrides' | 'disabledTuiAgents' | 'agentStatusHooksEnabled'>
diff --git a/src/main/agent-hooks/managed-hooks-json-events.ts b/src/main/agent-hooks/managed-hooks-json-events.ts
new file mode 100644
index 000000000000..bff2bbf69429
--- /dev/null
+++ b/src/main/agent-hooks/managed-hooks-json-events.ts
@@ -0,0 +1,38 @@
+import { isPlainObject } from './installer-utils'
+
+/**
+ * Which of `events` an Orca-owned `{ hooks: { <event>: [{ hooks: [{ command }] }] } }` file
+ * still registers under a managed command.
+ *
+ * Shared by every agent whose managed hooks file Orca generates wholesale (Muse, DSH), so
+ * "installed", "partial" and "not_installed" cannot drift between them.
+ *
+ * Why every lookup is guarded: the file is on disk and hand-editable, so any node can be
+ * null, a scalar, or the wrong container. A malformed node reads as "event absent" — status
+ * calculation must report a broken install, never throw on it.
+ */
+export function readManagedHookEventsFromJson(
+  parsed: unknown,
+  events: readonly string[],
+  isManagedCommand: (command: string | undefined) => boolean
+): Set<string> {
+  const hooks = isPlainObject(parsed) && isPlainObject(parsed.hooks) ? parsed.hooks : {}
+  return new Set(
+    events.filter((event) =>
+      asArray(hooks[event]).some((definition) =>
+        asArray(isPlainObject(definition) ? definition.hooks : null).some((hook) =>
+          isManagedCommand(readCommand(hook))
+        )
+      )
+    )
+  )
+}
+
+function asArray(value: unknown): readonly unknown[] {
+  return Array.isArray(value) ? value : []
+}
+
+function readCommand(hook: unknown): string | undefined {
+  const command = isPlainObject(hook) ? hook.command : undefined
+  return typeof command === 'string' ? command : undefined
+}
diff --git a/src/main/agent-hooks/opencode-plugin-settings.ts b/src/main/agent-hooks/opencode-plugin-settings.ts
new file mode 100644
index 000000000000..e05f488c6a16
--- /dev/null
+++ b/src/main/agent-hooks/opencode-plugin-settings.ts
@@ -0,0 +1,23 @@
+import type { PluginSources } from '../../relay/plugin-overlay'
+import { isAgentStatusHooksEnabledForAgent } from '../../shared/agent-status-hooks-setting'
+import type { ManagedHookDetectionSettings } from './managed-hook-detection-commands'
+
+function enabled(settings: ManagedHookDetectionSettings, agent: 'opencode' | 'opencode2'): boolean {
+  return isAgentStatusHooksEnabledForAgent(settings, agent)
+}
+
+export function openCodePluginSettingsKey(settings: ManagedHookDetectionSettings): string {
+  return `${enabled(settings, 'opencode')}:${enabled(settings, 'opencode2')}`
+}
+
+export function selectOpenCodePluginSources(
+  sources: PluginSources,
+  settings: ManagedHookDetectionSettings
+): PluginSources {
+  // Older relays retain omitted sources; an empty string replaces the cache and cannot write a plugin.
+  return {
+    ...sources,
+    opencodePluginSource: enabled(settings, 'opencode') ? sources.opencodePluginSource : '',
+    opencode2PluginSource: enabled(settings, 'opencode2') ? sources.opencode2PluginSource : ''
+  }
+}
diff --git a/src/main/agent-hooks/remote-hook-service-installers.test.ts b/src/main/agent-hooks/remote-hook-service-installers.test.ts
index 148d5f719d75..f3cc23937b4d 100644
--- a/src/main/agent-hooks/remote-hook-service-installers.test.ts
+++ b/src/main/agent-hooks/remote-hook-service-installers.test.ts
@@ -1,3 +1,4 @@
+import { qoderHookService } from '../qoder/hook-service'
 import { describe, expect, it, vi } from 'vitest'
 import { parse as parseJsonc } from 'jsonc-parser'
 import type { SFTPWrapper } from 'ssh2'
@@ -685,6 +686,18 @@ describe('remote hook service installers', () => {
     expect(fs.modes.get('/home/dev/.orca/agent-hooks/copilot-hook.sh')).toBe(0o755)
   })
 
+  it('installs Qoder on the execution host with its own event endpoint', async () => {
+    const { sftp, fs } = createFakeSftp()
+    const result = await qoderHookService.installRemote(sftp, '/home/dev/')
+    expect(result.state).toBe('installed')
+    expect(result.configPath).toBe('/home/dev/.qoder/settings.json')
+    const settings = JSON.parse(fs.files.get(result.configPath) ?? '{}')
+    expect(settings.hooks.SessionEnd).toHaveLength(1)
+    expect(settings.hooks.Notification).toHaveLength(1)
+    expect(settings.hooks.TeammateIdle).toBeUndefined()
+    expect(fs.files.get('/home/dev/.orca/agent-hooks/qoder-hook.sh')).toContain('/hook/qoder')
+  })
+
   it('installs Droid and Copilot when running the aggregate remote installer (issue #7253)', async () => {
     const { sftp } = createFakeSftp()
     const results = await installRemoteManagedAgentHooks(sftp, '/home/dev', {
diff --git a/src/main/agent-hooks/remote-hook-service-registry-coverage.test.ts b/src/main/agent-hooks/remote-hook-service-registry-coverage.test.ts
index f145ebc9be8e..dea6c4a46634 100644
--- a/src/main/agent-hooks/remote-hook-service-registry-coverage.test.ts
+++ b/src/main/agent-hooks/remote-hook-service-registry-coverage.test.ts
@@ -1,3 +1,4 @@
+import { codebuddyHookService } from '../codebuddy/hook-service'
 import { describe, expect, it, vi } from 'vitest'
 
 vi.mock('electron', () => ({
@@ -19,8 +20,10 @@ import { geminiHookService } from '../gemini/hook-service'
 import { grokHookService } from '../grok/hook-service'
 import { hermesHookService } from '../hermes/hook-service'
 import { kimiHookService } from '../kimi/hook-service'
+import { dshHookService } from '../dsh/hook-service'
 import { museHookService } from '../muse/hook-service'
 import { openClaudeHookService } from '../openclaude/hook-service'
+import { qoderHookService } from '../qoder/hook-service'
 import { zcodeHookService } from '../zcode/hook-service'
 import { MANAGED_AGENT_HOOK_INSTALLERS } from './managed-agent-hook-controls'
 import { REMOTE_MANAGED_HOOK_INSTALLER_AGENTS } from './remote-managed-hook-installers'
@@ -50,7 +53,10 @@ describe('remote hook service registry coverage', () => {
       ['devin', devinHookService],
       ['kimi', kimiHookService],
       ['muse', museHookService],
-      ['zcode', zcodeHookService]
+      ['qoder', qoderHookService],
+      ['codebuddy', codebuddyHookService],
+      ['zcode', zcodeHookService],
+      ['dsh', dshHookService]
     ])
 
     // Guard against a service silently missing from the map above as new agents land.
diff --git a/src/main/agent-hooks/remote-managed-hook-installers.ts b/src/main/agent-hooks/remote-managed-hook-installers.ts
index 1f42bdd68a6b..b012af91ff35 100644
--- a/src/main/agent-hooks/remote-managed-hook-installers.ts
+++ b/src/main/agent-hooks/remote-managed-hook-installers.ts
@@ -1,3 +1,5 @@
+import { codebuddyHookService } from '../codebuddy/hook-service'
+import { qoderHookService } from '../qoder/hook-service'
 import type { SFTPWrapper } from 'ssh2'
 import type { AgentHookInstallStatus, AgentHookTarget } from '../../shared/agent-hook-types'
 import { ampHookService } from '../amp/hook-service'
@@ -13,6 +15,7 @@ import { droidHookService } from '../droid/hook-service'
 import { grokHookService } from '../grok/hook-service'
 import { hermesHookService } from '../hermes/hook-service'
 import { kimiHookService } from '../kimi/hook-service'
+import { dshHookService } from '../dsh/hook-service'
 import { museHookService } from '../muse/hook-service'
 import { zcodeHookService } from '../zcode/hook-service'
 import { openClaudeHookService } from '../openclaude/hook-service'
@@ -61,6 +64,8 @@ const REMOTE_MANAGED_HOOK_INSTALLERS: readonly RemoteManagedHookInstaller[] = [
       })
   ],
   ['gemini', (sftp, remoteHome) => geminiHookService.installRemote(sftp, remoteHome)],
+  ['qoder', (sftp, remoteHome) => qoderHookService.installRemote(sftp, remoteHome)],
+  ['codebuddy', (sftp, remoteHome) => codebuddyHookService.installRemote(sftp, remoteHome)],
   ['antigravity', (sftp, remoteHome) => antigravityHookService.installRemote(sftp, remoteHome)],
   ['amp', (sftp, remoteHome) => ampHookService.installRemote(sftp, remoteHome)],
   ['cursor', (sftp, remoteHome) => cursorHookService.installRemote(sftp, remoteHome)],
@@ -76,7 +81,8 @@ const REMOTE_MANAGED_HOOK_INSTALLERS: readonly RemoteManagedHookInstaller[] = [
   ['devin', (sftp, remoteHome) => devinHookService.installRemote(sftp, remoteHome)],
   ['kimi', (sftp, remoteHome) => kimiHookService.installRemote(sftp, remoteHome)],
   ['muse', (sftp, remoteHome) => museHookService.installRemote(sftp, remoteHome)],
-  ['zcode', (sftp, remoteHome) => zcodeHookService.installRemote(sftp, remoteHome)]
+  ['zcode', (sftp, remoteHome) => zcodeHookService.installRemote(sftp, remoteHome)],
+  ['dsh', (sftp, remoteHome) => dshHookService.installRemote(sftp, remoteHome)]
 ]
 
 /** Agents wired into the remote (SSH) hook installer. Exported so an invariant
diff --git a/src/main/agent-hooks/server-opencode-binder.test.ts b/src/main/agent-hooks/server-opencode-binder.test.ts
index 59d1c9142feb..328dc98c04c6 100644
--- a/src/main/agent-hooks/server-opencode-binder.test.ts
+++ b/src/main/agent-hooks/server-opencode-binder.test.ts
@@ -70,7 +70,13 @@ describe('opencode binder loop', () => {
         { paneKey: PANE_A, directory: DIR, worktreeId: `repo::${DIR}`, shellPid: 111 }
       ],
       sweep: async () => [
-        { pid: 112, ppid: 111, startedAtMs: Date.now() - 120_000, executable: 'opencode', argv: ['opencode'] }
+        {
+          pid: 112,
+          ppid: 111,
+          startedAtMs: Date.now() - 120_000,
+          executable: 'opencode',
+          argv: ['opencode']
+        }
       ]
     })
   })
diff --git a/src/main/agent-hooks/server-retired-pane-new-turn.test.ts b/src/main/agent-hooks/server-retired-pane-new-turn.test.ts
index d38f6c836c71..23dbb56c6956 100644
--- a/src/main/agent-hooks/server-retired-pane-new-turn.test.ts
+++ b/src/main/agent-hooks/server-retired-pane-new-turn.test.ts
@@ -22,8 +22,10 @@ afterEach(() => vi.restoreAllMocks())
  *  classifier names no boundary for that source. That is not the same as "can never revive":
  *  mimo-code's boundary is an explicit-prompt MessagePart, which the gate handles separately. */
 const NEW_TURN_EVENT: Record<AgentHookSource, string | null> = {
+  qoder: 'SessionStart',
   claude: 'SessionStart',
   kimi: 'UserPromptSubmit',
+  codebuddy: 'UserPromptSubmit',
   codex: 'SessionStart',
   gemini: 'BeforeAgent',
   antigravity: 'PreInvocation',
@@ -42,7 +44,8 @@ const NEW_TURN_EVENT: Record<AgentHookSource, string | null> = {
   'mimo-code': null,
   'command-code': null,
   muse: 'UserPromptSubmit',
-  zcode: 'SessionStart'
+  zcode: 'SessionStart',
+  dsh: 'SessionStart'
 }
 
 function reviveRetiredPane(source: unknown, hookEventName: string): boolean {
diff --git a/src/main/agent-hooks/server-turn-started-at.test.ts b/src/main/agent-hooks/server-turn-started-at.test.ts
new file mode 100644
index 000000000000..63ebd136be60
--- /dev/null
+++ b/src/main/agent-hooks/server-turn-started-at.test.ts
@@ -0,0 +1,185 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { mkdtempSync, readFileSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { AgentHookServer, _internals } from './server'
+import { buildBody, postHookEvent, PANE } from './server.test-fixtures'
+
+const { getCohortAtEmitMock, trackMock } = vi.hoisted(() => ({
+  getCohortAtEmitMock: vi.fn(),
+  trackMock: vi.fn()
+}))
+
+vi.mock('../telemetry/client', () => ({ track: trackMock }))
+vi.mock('../telemetry/cohort-classifier', () => ({ getCohortAtEmit: getCohortAtEmitMock }))
+
+beforeEach(() => {
+  _internals.resetCachesForTests()
+  getCohortAtEmitMock.mockReturnValue({})
+})
+
+afterEach(() => {
+  vi.restoreAllMocks()
+})
+
+// Distinct host stamps: each event lands on a later millisecond than the one before it.
+async function nextMillisecond(): Promise<void> {
+  await new Promise((resolve) => setTimeout(resolve, 5))
+}
+
+// The execution host stamps when the main agent's turn began, so every reader (and a reload, which
+// starts the renderer with no state history) gets the turn start rather than rebuilding it.
+describe('the host-stamped turn start', () => {
+  const servers: AgentHookServer[] = []
+  let userDataPath: string
+
+  beforeEach(() => {
+    userDataPath = mkdtempSync(join(tmpdir(), 'orca-turn-started-at-'))
+  })
+
+  afterEach(() => {
+    for (const server of servers) {
+      server.stop()
+    }
+    servers.length = 0
+    rmSync(userDataPath, { recursive: true, force: true })
+  })
+
+  async function startServer(): Promise<AgentHookServer> {
+    const server = new AgentHookServer()
+    servers.push(server)
+    await server.start({ env: 'production', userDataPath })
+    return server
+  }
+
+  async function post(server: AgentHookServer, payload: Record<string, unknown>): Promise<void> {
+    const response = await postHookEvent(server, buildBody(payload))
+    expect(response.status).toBe(204)
+    await nextMillisecond()
+  }
+
+  function turnStartedAt(server: AgentHookServer): number | undefined {
+    return server.getStatusSnapshot()[0]?.turnStartedAt
+  }
+
+  it('stamps a new main-agent turn and carries it across tools, a wait and its answer', async () => {
+    const server = await startServer()
+    await post(server, { hook_event_name: 'UserPromptSubmit', prompt: 'Rename the module' })
+    const started = turnStartedAt(server)
+    expect(started).toBe(server.getStatusSnapshot()[0]?.stateStartedAt)
+
+    const bash = { tool_name: 'Bash', tool_input: { command: 'pnpm build' }, tool_use_id: 'tu-1' }
+    await post(server, { hook_event_name: 'PreToolUse', ...bash })
+    await post(server, { hook_event_name: 'PermissionRequest', ...bash })
+    expect(server.getStatusSnapshot()[0]).toMatchObject({ state: 'waiting' })
+    await post(server, { hook_event_name: 'PostToolUse', ...bash })
+    // The answer restarted the state clock, not the turn's.
+    expect(server.getStatusSnapshot()[0]).toMatchObject({ state: 'working' })
+    expect(server.getStatusSnapshot()[0]?.stateStartedAt).toBeGreaterThan(started!)
+    expect(turnStartedAt(server)).toBe(started)
+
+    await post(server, { hook_event_name: 'Stop' })
+    // Kept on the finished turn, so a reader can time it from the host's own facts.
+    expect(server.getStatusSnapshot()[0]).toMatchObject({ state: 'done', turnStartedAt: started })
+  })
+
+  it('is not stamped by a child agent, and the same prompt sent again is a new turn', async () => {
+    const server = await startServer()
+    await post(server, { hook_event_name: 'UserPromptSubmit', prompt: 'Rename the module' })
+    const started = turnStartedAt(server)
+
+    await post(server, {
+      hook_event_name: 'UserPromptSubmit',
+      prompt: 'child task',
+      agent_id: 'child-1'
+    })
+    expect(turnStartedAt(server)).toBe(started)
+
+    // Esc at a permission prompt fires no hook, so the resend follows the stale wait directly.
+    await post(server, { hook_event_name: 'PermissionRequest', tool_name: 'Bash', tool_input: {} })
+    await post(server, { hook_event_name: 'UserPromptSubmit', prompt: 'Rename the module' })
+    expect(turnStartedAt(server)).toBeGreaterThan(started!)
+  })
+
+  it('is not stamped by a relayed replay', async () => {
+    const server = await startServer()
+    const envelope = {
+      paneKey: PANE,
+      tabId: 'tab-1',
+      source: 'claude' as const,
+      hookEventName: 'UserPromptSubmit',
+      payload: { state: 'working' as const, prompt: 'relayed', agentType: 'claude' as const }
+    }
+    server.ingestRemote(envelope, 'ssh-turn')
+    const started = turnStartedAt(server)
+    expect(started).toEqual(expect.any(Number))
+    await nextMillisecond()
+
+    server.ingestRemote({ ...envelope, isReplay: true }, 'ssh-turn')
+    expect(turnStartedAt(server)).toBe(started)
+  })
+
+  // A session start lands an idle boundary row: no turn is open until the next prompt.
+  it('clears on a session boundary', async () => {
+    const server = await startServer()
+    await post(server, { hook_event_name: 'UserPromptSubmit', prompt: 'Rename the module' })
+    expect(turnStartedAt(server)).toEqual(expect.any(Number))
+
+    await post(server, { hook_event_name: 'SessionStart', source: 'clear' })
+    expect(server.getStatusSnapshot()[0]).toMatchObject({ state: 'done', sessionBoundary: true })
+    expect(server.getStatusSnapshot()[0]).not.toHaveProperty('turnStartedAt')
+  })
+
+  // An OSC repaint can land before the prompt hook; it must not count from the finished turn.
+  it('drops the stamp when a finished main agent runs again with no turn-opening event', async () => {
+    const server = await startServer()
+    await post(server, { hook_event_name: 'UserPromptSubmit', prompt: 'Rename the module' })
+    await post(server, { hook_event_name: 'Stop' })
+    expect(turnStartedAt(server)).toEqual(expect.any(Number))
+
+    server.ingestTerminalStatus({
+      paneKey: PANE,
+      tabId: 'tab-1',
+      worktreeId: 'wt-1',
+      payload: { state: 'working', prompt: 'Rename the module', agentType: 'claude' }
+    })
+    expect(server.getStatusSnapshot()[0]).toMatchObject({ state: 'working' })
+    expect(server.getStatusSnapshot()[0]).not.toHaveProperty('turnStartedAt')
+  })
+
+  it('cannot be declared by a producer', async () => {
+    const server = await startServer()
+    await post(server, {
+      hook_event_name: 'UserPromptSubmit',
+      prompt: 'Rename the module',
+      turnStartedAt: 1
+    })
+    await post(server, { hook_event_name: 'PreToolUse', tool_name: 'Bash', turnStartedAt: 1 })
+    expect(turnStartedAt(server)).toBeGreaterThan(1)
+  })
+
+  it('reaches the live push and survives a restart through the status file', async () => {
+    const server = await startServer()
+    const pushed: (number | undefined)[] = []
+    server.setListener((status) => pushed.push(status.turnStartedAt))
+    await post(server, { hook_event_name: 'UserPromptSubmit', prompt: 'Rename the module' })
+    await post(server, { hook_event_name: 'PreToolUse', tool_name: 'Bash', tool_input: {} })
+    const started = turnStartedAt(server)
+    expect(pushed.at(-1)).toBe(started)
+    server.flushStatusPersistSync()
+    server.stop()
+    const file = JSON.parse(
+      readFileSync(join(userDataPath, 'agent-hooks', 'last-status.json'), 'utf8')
+    )
+    expect(file.entries[PANE].turnStartedAt).toBe(started)
+
+    const restarted = await startServer()
+    expect(restarted.getStatusSnapshot()[0]).toMatchObject({
+      restoredUnconfirmed: true,
+      turnStartedAt: started
+    })
+    // The turn goes on after the restart: the next event carries the restored stamp.
+    await post(restarted, { hook_event_name: 'PostToolUse', tool_name: 'Bash', tool_input: {} })
+    expect(turnStartedAt(restarted)).toBe(started)
+  })
+})
diff --git a/src/main/agent-hooks/server/server-ingest-structured.ts b/src/main/agent-hooks/server/server-ingest-structured.ts
index 5a5e2ce5ecfd..19ee70e88af3 100644
--- a/src/main/agent-hooks/server/server-ingest-structured.ts
+++ b/src/main/agent-hooks/server/server-ingest-structured.ts
@@ -11,7 +11,8 @@ import {
 } from '../../../shared/structured-agent-session-projection'
 import {
   continueMainAgentStatus,
-  isAgentStatusHeldOpenByChildWork
+  isAgentStatusHeldOpenByChildWork,
+  mainAgentTurnInterrupted
 } from '../../../shared/agent-lead-status-fold'
 import { structuredAgentSessionAgentStatus } from '../../../shared/structured-agent-session-agent-status'
 import {
@@ -73,6 +74,8 @@ export abstract class AgentHookServerIngestStructured extends AgentHookServerIng
       state,
       ...(workingMode ? { workingMode } : {}),
       mainAgent,
+      // Readers that predate `mainAgent` read a cancellation off this flag, as the hook lanes publish it.
+      interrupted: mainAgentTurnInterrupted(mainAgent),
       prompt: summary.latestPrompt,
       agentType: summary.agent,
       ...(summary.model ? { model: summary.model } : {}),
diff --git a/src/main/agent-hooks/server/server-persistence-validation.ts b/src/main/agent-hooks/server/server-persistence-validation.ts
index f88766217c11..7203f174a0ee 100644
--- a/src/main/agent-hooks/server/server-persistence-validation.ts
+++ b/src/main/agent-hooks/server/server-persistence-validation.ts
@@ -149,6 +149,7 @@ export function sanitizeHydratedEntry(
     source === 'claude' && (record.compactTrigger === 'manual' || record.compactTrigger === 'auto')
       ? record.compactTrigger
       : undefined
+  const turnStartedAt = record.turnStartedAt
   return {
     paneKey,
     source,
@@ -170,7 +171,10 @@ export function sanitizeHydratedEntry(
     retainedForLiveness: retainedForLiveness ? true : undefined,
     payload,
     receivedAt,
-    stateStartedAt
+    stateStartedAt,
+    ...(typeof turnStartedAt === 'number' && Number.isFinite(turnStartedAt) && turnStartedAt > 0
+      ? { turnStartedAt }
+      : {})
   }
 }
 
diff --git a/src/main/agent-hooks/server/server-row-ownership.test.ts b/src/main/agent-hooks/server/server-row-ownership.test.ts
new file mode 100644
index 000000000000..e466ef879d23
--- /dev/null
+++ b/src/main/agent-hooks/server/server-row-ownership.test.ts
@@ -0,0 +1,142 @@
+import { describe, expect, it } from 'vitest'
+import { AgentHookServer } from '../server'
+import type { AgentHookStatusRowMutation, EnrichedAgentHookEventPayload } from './server-types'
+
+const PANE_KEY = 'tab-row:55555555-5555-4555-8555-555555555555'
+
+class RowMutationProbe extends AgentHookServer {
+  readonly mutations: AgentHookStatusRowMutation[] = []
+
+  constructor() {
+    super()
+    this.subscribeStatusRowMutations((mutation) => this.mutations.push(mutation))
+  }
+
+  commit(
+    before: EnrichedAgentHookEventPayload | null | undefined,
+    after: EnrichedAgentHookEventPayload | null | undefined
+  ): boolean {
+    return this.commitStatusRowMutation(before, after)
+  }
+}
+
+function row(
+  overrides: Partial<EnrichedAgentHookEventPayload> = {}
+): EnrichedAgentHookEventPayload {
+  return {
+    paneKey: PANE_KEY,
+    tabId: 'tab-row',
+    worktreeId: 'worktree',
+    connectionId: null,
+    receivedAt: 1_000,
+    stateStartedAt: 900,
+    terminalHandle: 'term_row',
+    ...overrides,
+    payload: {
+      state: 'working',
+      prompt: 'ship it',
+      agentType: 'opencode',
+      lastAssistantMessage: 'x'.repeat(8_000),
+      subagents: [{ id: 'child-1', state: 'working', agentType: 'claude', startedAt: 800 }],
+      ...overrides.payload
+    }
+  }
+}
+
+describe('status-row change detection', () => {
+  it('treats the same row object on both sides as unchanged', () => {
+    const probe = new RowMutationProbe()
+    const same = row()
+    expect(probe.commit(same, same)).toBe(false)
+    expect(probe.commit(null, undefined)).toBe(false)
+    expect(probe.mutations).toEqual([])
+  })
+
+  it('ignores a rebuilt row whose published content is identical', () => {
+    const probe = new RowMutationProbe()
+    const before = row()
+    const rebuilt = row({
+      receivedAt: 2_000,
+      evidenceObservedAt: 1_500,
+      launchToken: 'launch-2',
+      promptInteractionKey: 'turn-2',
+      observation: {
+        origin: 'hook',
+        authorityId: 'authority',
+        incarnation: 1,
+        revision: 7,
+        observedAt: 2_000
+      },
+      payload: { ...before.payload, subagents: before.payload.subagents?.map((s) => ({ ...s })) }
+    })
+    expect(probe.commit(before, rebuilt)).toBe(false)
+    expect(probe.mutations).toEqual([])
+  })
+
+  it('ignores key order, which a producer is free to change', () => {
+    const probe = new RowMutationProbe()
+    const before = row()
+    const reordered: EnrichedAgentHookEventPayload = {
+      payload: {
+        subagents: before.payload.subagents?.map((s) => ({ ...s })),
+        lastAssistantMessage: before.payload.lastAssistantMessage,
+        agentType: before.payload.agentType,
+        prompt: before.payload.prompt,
+        state: before.payload.state
+      },
+      terminalHandle: before.terminalHandle,
+      stateStartedAt: before.stateStartedAt,
+      receivedAt: before.receivedAt,
+      connectionId: before.connectionId,
+      worktreeId: before.worktreeId,
+      tabId: before.tabId,
+      paneKey: before.paneKey
+    }
+    expect(probe.commit(before, reordered)).toBe(false)
+  })
+
+  // Why: paired clients read the whole payload off session.tabs, so no field may be skipped.
+  it.each<[string, Partial<EnrichedAgentHookEventPayload>]>([
+    ['state', { payload: { state: 'done', prompt: 'ship it' } }],
+    [
+      'lastAssistantMessage',
+      { payload: { state: 'working', prompt: 'ship it', lastAssistantMessage: 'y' } }
+    ],
+    [
+      'subagents',
+      {
+        payload: {
+          state: 'working',
+          prompt: 'ship it',
+          subagents: [{ id: 'child-1', state: 'idle', agentType: 'claude', startedAt: 800 }]
+        }
+      }
+    ],
+    [
+      'a newly present payload field',
+      { payload: { state: 'working', prompt: 'ship it', model: 'm' } }
+    ],
+    ['stateStartedAt', { stateStartedAt: 950 }],
+    ['connectionId', { connectionId: 'ssh-a' }],
+    ['terminalHandle', { terminalHandle: 'term_other' }],
+    ['providerSession', { providerSession: { key: 'session_id', id: 's-1' } }],
+    ['structuredHost', { structuredHost: 'owned' }]
+  ])('publishes a change to %s', (_field, overrides) => {
+    const probe = new RowMutationProbe()
+    const before = row()
+    expect(probe.commit(before, row(overrides))).toBe(true)
+    expect(probe.mutations).toEqual([
+      {
+        before: { paneKey: PANE_KEY, worktreeId: 'worktree', terminalHandle: 'term_row' },
+        after: expect.objectContaining({ paneKey: PANE_KEY })
+      }
+    ])
+  })
+
+  it('publishes a row appearing or disappearing', () => {
+    const probe = new RowMutationProbe()
+    expect(probe.commit(null, row())).toBe(true)
+    expect(probe.commit(row(), undefined)).toBe(true)
+    expect(probe.mutations).toHaveLength(2)
+  })
+})
diff --git a/src/main/agent-hooks/server/server-row-ownership.ts b/src/main/agent-hooks/server/server-row-ownership.ts
index 2895eb463e45..cde178e335dd 100644
--- a/src/main/agent-hooks/server/server-row-ownership.ts
+++ b/src/main/agent-hooks/server/server-row-ownership.ts
@@ -4,6 +4,7 @@ import {
 } from '../../../shared/wsl-hook-relay-contract'
 import { splitWorktreeIdForFilesystem, worktreeIdsEqual } from '../../../shared/worktree/id'
 import { parseWslUncPath } from '../../../shared/wsl-paths'
+import { structuralValuesEqualIgnoringUndefined } from '../../../shared/structural-value-equality'
 import type { AgentHookEventPayload } from '../../../shared/agent-hook-listener/listener-event'
 import type {
   AgentHookStatusRowIdentity,
@@ -27,10 +28,7 @@ function toMutationIdentity(
   }
 }
 
-function semanticRowJson(row: EnrichedAgentHookEventPayload | null | undefined): string | null {
-  if (!row) {
-    return null
-  }
+function semanticRow(row: EnrichedAgentHookEventPayload): Record<string, unknown> {
   const {
     receivedAt: _receivedAt,
     evidenceObservedAt: _evidenceObservedAt,
@@ -39,7 +37,22 @@ function semanticRowJson(row: EnrichedAgentHookEventPayload | null | undefined):
     promptInteractionKey: _promptInteractionKey,
     ...semantic
   } = toAgentStatusIpcPayload(row)
-  return JSON.stringify(semantic)
+  return semantic
+}
+
+// Why: runs on every status write; a structural walk exits on the first difference and skips
+// shared leaves (e.g. an unchanged 8 KB lastAssistantMessage) instead of serializing both rows.
+function semanticRowsEqual(
+  before: EnrichedAgentHookEventPayload | null | undefined,
+  after: EnrichedAgentHookEventPayload | null | undefined
+): boolean {
+  if (before === after || (!before && !after)) {
+    return true
+  }
+  if (!before || !after) {
+    return false
+  }
+  return structuralValuesEqualIgnoringUndefined(semanticRow(before), semanticRow(after))
 }
 
 function wslDistroForWorktree(worktreeId: string | undefined): string | null {
@@ -113,7 +126,7 @@ export abstract class AgentHookServerRowOwnership extends AgentHookServerListene
     if (after?.terminalHandle) {
       this.paneKeyByTerminalHandle.set(after.terminalHandle, after.paneKey)
     }
-    if (!emit || semanticRowJson(before) === semanticRowJson(after)) {
+    if (!emit || semanticRowsEqual(before, after)) {
       return false
     }
     const mutation: AgentHookStatusRowMutation = {
diff --git a/src/main/agent-hooks/server/server-status-application.ts b/src/main/agent-hooks/server/server-status-application.ts
index 8863dc178b96..674fa8a0760a 100644
--- a/src/main/agent-hooks/server/server-status-application.ts
+++ b/src/main/agent-hooks/server/server-status-application.ts
@@ -10,6 +10,7 @@ import type {
   AgentStatusObservationOrigin
 } from '../../../shared/agent-status-observation'
 import { AGENT_STATUS_2A_CURRENT_PRODUCER_MODE } from '../../../shared/agent-status-legacy-adapter'
+import type { AgentStatusState, ParsedAgentStatusPayload } from '../../../shared/agent-status-types'
 import { admitLegacyAgentStatus } from '../../../shared/agent-hook-listener/listener-state'
 import type { EnrichedAgentHookEventPayload } from './server-types'
 import { agentTypeToPromptSentAgentKind } from './server-status-identity'
@@ -18,6 +19,41 @@ import { AgentHookServerStatusDisposition } from './server-status-disposition'
 /** Bounds the retained observation clock; eviction only degrades a replay to `now`. */
 const MAX_REMEMBERED_EVIDENCE_OBSERVATIONS = 1024
 
+function mainAgentState(payload: ParsedAgentStatusPayload): AgentStatusState {
+  return payload.mainAgent?.state ?? payload.state
+}
+
+/**
+ * When the main agent's current turn began. Its own turn-opening event stamps it (the same
+ * classifier the observation boundary uses), except a session boundary, which lands idle with no
+ * turn open. Replays, child events and identity-only rows restate a turn rather than open one.
+ */
+function resolveTurnStartedAt(
+  previous: EnrichedAgentHookEventPayload | undefined,
+  payload: AgentHookEventPayload,
+  at: number
+): number | undefined {
+  if (
+    payload.source !== undefined &&
+    payload.toolAgentId === undefined &&
+    payload.isReplay !== true &&
+    payload.providerSessionOnly !== true &&
+    isNewTurnEvent(payload.source, payload.hookEventName)
+  ) {
+    return payload.payload.sessionBoundary === true ? undefined : at
+  }
+  // Why: a settled main agent running again with no opening event (an OSC repaint racing the
+  // prompt hook) is a turn edge nothing dated; carrying the old stamp would count from that turn.
+  if (
+    previous &&
+    mainAgentState(previous.payload) === 'done' &&
+    mainAgentState(payload.payload) !== 'done'
+  ) {
+    return undefined
+  }
+  return previous?.turnStartedAt
+}
+
 export abstract class AgentHookServerStatusApplication extends AgentHookServerStatusDisposition {
   protected refreshTerminalStatusEvidence(
     previous: EnrichedAgentHookEventPayload,
@@ -113,12 +149,15 @@ export abstract class AgentHookServerStatusApplication extends AgentHookServerSt
       previous && previous.payload.state === payload.payload.state && !commandCodeNewTurn
         ? previous.stateStartedAt
         : (observedAt ?? now)
+    const turnStartedAt = resolveTurnStartedAt(previous, payload, observedAt ?? now)
     // Why: `stateStartedAt` tracks the current state, while `receivedAt` tracks every arrival.
     return {
       ...payload,
       receivedAt: now,
       evidenceObservedAt: observedAt ?? this.resolveEvidenceObservedAt(payload, previous, now),
-      stateStartedAt
+      stateStartedAt,
+      // Always written here, so a producer can never declare it.
+      turnStartedAt
     }
   }
 
diff --git a/src/main/agent-hooks/server/server-status-identity.ts b/src/main/agent-hooks/server/server-status-identity.ts
index 1694c4b1b676..4400b43efeeb 100644
--- a/src/main/agent-hooks/server/server-status-identity.ts
+++ b/src/main/agent-hooks/server/server-status-identity.ts
@@ -63,6 +63,7 @@ export function toAgentStatusIpcPayload(
       ? { evidenceObservedAt: entry.evidenceObservedAt }
       : {}),
     stateStartedAt: entry.stateStartedAt,
+    ...(entry.turnStartedAt !== undefined ? { turnStartedAt: entry.turnStartedAt } : {}),
     ...(entry.providerSession ? { providerSession: entry.providerSession } : {}),
     ...(entry.providerSessionOnly ? { providerSessionOnly: true } : {}),
     ...(entry.promptInteractionKey ? { promptInteractionKey: entry.promptInteractionKey } : {}),
diff --git a/src/main/agent-hooks/server/server-types.ts b/src/main/agent-hooks/server/server-types.ts
index d14667977986..79b4e569cdd6 100644
--- a/src/main/agent-hooks/server/server-types.ts
+++ b/src/main/agent-hooks/server/server-types.ts
@@ -19,6 +19,9 @@ export type EnrichedAgentHookEventPayload = AgentHookEventPayload & {
    *  main restart; absent means "never separately observed" and consumers use `receivedAt`. */
   evidenceObservedAt?: number
   stateStartedAt: number
+  /** When the main agent's current turn began, on this server's clock. Stamped only here, from the
+   *  main agent's own turn-opening event; absent when no such event was seen. */
+  turnStartedAt?: number
   /** Provenance/ordering stamped by this server as the pane authority (STA-4293). Read by nothing yet. */
   observation?: AgentStatusObservation
   /** Stamped at hydrate for nonterminal states; never persisted (hydrate re-stamps) and cleared by any accepted live event replacing the entry. */
diff --git a/src/main/agent-hooks/wsl-guest-plugin-install.ts b/src/main/agent-hooks/wsl-guest-plugin-install.ts
index 80b98bed6f4c..40bf43ce0247 100644
--- a/src/main/agent-hooks/wsl-guest-plugin-install.ts
+++ b/src/main/agent-hooks/wsl-guest-plugin-install.ts
@@ -4,11 +4,14 @@
 // Mirrors the SSH relay's installPluginsOnRelay swallow list.
 import type { SshChannelMultiplexer } from '../ssh/ssh-channel-multiplexer'
 import { AGENT_HOOK_INSTALL_PLUGINS_METHOD } from '../../shared/agent-hook-relay'
+import { selectOpenCodePluginSources } from './opencode-plugin-settings'
+import type { ManagedHookDetectionSettings } from './managed-hook-detection-commands'
 import type { PluginSources } from '../../relay/plugin-overlay'
 
 /** Structural, not the deps type itself, so this stays free of the deps module. */
 type GuestPluginInstallDeps = {
   pluginSources: () => PluginSources
+  managedHookSettings?: () => ManagedHookDetectionSettings
   warn: (message: string) => void
 }
 
@@ -29,7 +32,7 @@ export async function requestGuestOpenCodeOverlayDir(
   try {
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Runtime validation or the local test fixture establishes the asserted shape.
     const res = (await mux.request(AGENT_HOOK_INSTALL_PLUGINS_METHOD, {
-      ...deps.pluginSources(),
+      ...selectOpenCodePluginSources(deps.pluginSources(), deps.managedHookSettings?.() ?? null),
       ...(launchKind ? { launchKind } : {})
     })) as {
       overlayDirs?: { opencode?: unknown; opencode2?: unknown; pi?: unknown; omp?: unknown }
diff --git a/src/main/agent-hooks/wsl-hook-relay-guest-install.ts b/src/main/agent-hooks/wsl-hook-relay-guest-install.ts
index 103a5e9909b5..87e29f2d414d 100644
--- a/src/main/agent-hooks/wsl-hook-relay-guest-install.ts
+++ b/src/main/agent-hooks/wsl-hook-relay-guest-install.ts
@@ -8,6 +8,7 @@ import { requestGuestOpenCodeOverlayDir } from './wsl-guest-plugin-install'
 import { installWslGuestHooks } from './wsl-hook-fs-adapter'
 import { REINSTALL_MIN_INTERVAL_MS, type WslHookRelayManagerDeps } from './wsl-hook-relay-deps'
 import type { SshChannelMultiplexer } from '../ssh/ssh-channel-multiplexer'
+import { openCodePluginSettingsKey } from './opencode-plugin-settings'
 import type { PluginSources } from '../../relay/plugin-overlay'
 
 /** Structural slice of WslHookRelayManagerDeps — only what an install pass uses. */
@@ -30,6 +31,10 @@ type GuestInstallState = {
   piAgentDir?: string
   ompStatusExtension?: string
   lastInstallAt?: number
+  lastOpenCodeSettings?: string
+  // Failed attempts throttle retries without claiming the guest accepted those settings.
+  lastAttemptOpenCodeSettings?: string
+  lastInstallMux?: SshChannelMultiplexer
   launchKinds?: Set<'pi' | 'omp'>
   installation?: Promise<void>
 }
@@ -52,11 +57,17 @@ export async function runWslRelayGuestInstall(
   if (state.installation) {
     return state.installation
   }
-  state.installation = installGuestHooksAndPlugins(deps, state, mux, guestHome)
+  // Publish ownership before an installer can re-enter the ensure path.
+  const installation = Promise.resolve().then(() =>
+    installGuestHooksAndPlugins(deps, state, mux, guestHome)
+  )
+  state.installation = installation
   try {
-    await state.installation
+    await installation
   } finally {
-    state.installation = undefined
+    if (state.installation === installation) {
+      state.installation = undefined
+    }
   }
 }
 
@@ -66,7 +77,15 @@ async function installGuestHooksAndPlugins(
   mux: SshChannelMultiplexer,
   guestHome: string
 ): Promise<void> {
+  if (state.mux !== mux || mux.isDisposed()) {
+    return
+  }
+  if (state.lastInstallMux !== mux) {
+    state.lastOpenCodeSettings = undefined
+  }
+  state.lastInstallMux = mux
   state.lastInstallAt = Date.now()
+  state.lastAttemptOpenCodeSettings = openCodePluginSettingsKey(deps.managedHookSettings())
   await installWslGuestHooks({
     mux,
     guestHome,
@@ -81,11 +100,27 @@ async function installGuestHooksAndPlugins(
   // PTY env points OPENCODE_CONFIG_DIR at; identity-guarded against teardown.
   const kinds = requestedKinds(state)
   for (const kind of kinds) {
-    const overlay = await requestGuestOpenCodeOverlayDir(mux, deps, state.distro, kind)
-    if (state.mux !== mux) {
+    if (state.mux !== mux || mux.isDisposed()) {
+      return
+    }
+    const currentSettings = deps.managedHookSettings()
+    const settings = currentSettings && {
+      ...currentSettings,
+      disabledTuiAgents: currentSettings.disabledTuiAgents?.slice()
+    }
+    const settingsKey = openCodePluginSettingsKey(settings)
+    state.lastAttemptOpenCodeSettings = settingsKey
+    const overlay = await requestGuestOpenCodeOverlayDir(
+      mux,
+      { ...deps, managedHookSettings: () => settings },
+      state.distro,
+      kind
+    )
+    if (state.mux !== mux || mux.isDisposed()) {
       return
     }
     if (overlay.kind !== 'unavailable') {
+      state.lastOpenCodeSettings = settingsKey
       state.opencodeOverlayDir = overlay.kind === 'dir' ? overlay.dir : undefined
       state.opencode2OverlayDir = overlay.kind === 'dir' ? overlay.dir2 : undefined
       if (kind === 'pi') {
@@ -102,25 +137,34 @@ export async function maybeRerunWslRelayGuestInstall(
   deps: GuestInstallDeps,
   state: GuestInstallState
 ): Promise<void> {
-  if (state.installation) {
-    await state.installation
-    return
-  }
-  const mux = state.mux
-  const guestHome = state.guestHome
-  if (
-    !mux ||
-    !guestHome ||
-    mux.isDisposed() ||
-    Date.now() - (state.lastInstallAt ?? 0) < REINSTALL_MIN_INTERVAL_MS
-  ) {
-    return
-  }
-  try {
-    // Why: the pass also re-ships the plugin source, so a mid-session Orca upgrade refreshes it.
-    await runWslRelayGuestInstall(deps, state, mux, guestHome)
-  } catch (err) {
-    const detail = err instanceof Error ? err.message : String(err)
-    deps.warn(`[agent-hooks] WSL hook reinstall for '${state.distro}' failed: ${detail}`)
+  let waited = false
+  // Every settled pass can expose newer settings or another waiter's task.
+  for (;;) {
+    try {
+      if (state.installation) {
+        waited = true
+        await state.installation
+        continue
+      }
+      const mux = state.mux
+      const guestHome = state.guestHome
+      const settingsKey = openCodePluginSettingsKey(deps.managedHookSettings())
+      if (
+        !mux ||
+        !guestHome ||
+        mux.isDisposed() ||
+        (state.lastInstallMux === mux &&
+          (waited || Date.now() - (state.lastInstallAt ?? 0) < REINSTALL_MIN_INTERVAL_MS) &&
+          (state.lastOpenCodeSettings === settingsKey ||
+            state.lastAttemptOpenCodeSettings === settingsKey))
+      ) {
+        return
+      }
+      waited = true
+      await runWslRelayGuestInstall(deps, state, mux, guestHome)
+    } catch (err) {
+      const detail = err instanceof Error ? err.message : String(err)
+      deps.warn(`[agent-hooks] WSL hook reinstall for '${state.distro}' failed: ${detail}`)
+    }
   }
 }
diff --git a/src/main/agent-hooks/wsl-hook-relay-sentinel.test.ts b/src/main/agent-hooks/wsl-hook-relay-sentinel.test.ts
index d8f504beca32..d23d59288b45 100644
--- a/src/main/agent-hooks/wsl-hook-relay-sentinel.test.ts
+++ b/src/main/agent-hooks/wsl-hook-relay-sentinel.test.ts
@@ -81,8 +81,6 @@ describe('waitForWslRelaySentinel', () => {
     emitStdout(child, sentinel.subarray(0, mid))
     emitStdout(child, sentinel.subarray(mid))
     const transport = await promise
-    expect(typeof transport.write).toBe('function')
-    expect(typeof transport.onData).toBe('function')
     transport.pauseReads?.()
     transport.resumeReads?.()
     expect(child.stdout.pause).toHaveBeenCalledOnce()
diff --git a/src/main/agent-hooks/wsl-hook-relay-state.ts b/src/main/agent-hooks/wsl-hook-relay-state.ts
index 509231b97d9d..2648280adddd 100644
--- a/src/main/agent-hooks/wsl-hook-relay-state.ts
+++ b/src/main/agent-hooks/wsl-hook-relay-state.ts
@@ -21,4 +21,7 @@ export type WslRelayDistroState = {
   restartTimer?: ReturnType<typeof setTimeout>
   reinstallTimer?: ReturnType<typeof setTimeout>
   lastInstallAt?: number
+  lastOpenCodeSettings?: string
+  lastAttemptOpenCodeSettings?: string
+  lastInstallMux?: SshChannelMultiplexer
 }
diff --git a/src/main/agent-hooks/wsl-opencode-install-race.test.ts b/src/main/agent-hooks/wsl-opencode-install-race.test.ts
new file mode 100644
index 000000000000..ccb8e79a445d
--- /dev/null
+++ b/src/main/agent-hooks/wsl-opencode-install-race.test.ts
@@ -0,0 +1,326 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { mkdirSync, mkdtempSync, readFileSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import type { TuiAgent } from '../../shared/tui-agent'
+import { RelayDispatcher } from '../../relay/dispatcher'
+import { PluginOverlayManager } from '../../relay/plugin-overlay'
+import { createInstallPluginsHandler } from '../../relay/wsl-install-plugins-handler'
+import { SshChannelMultiplexer } from '../ssh/ssh-channel-multiplexer'
+import { AGENT_HOOK_INSTALL_PLUGINS_METHOD } from '../../shared/agent-hook-relay'
+import {
+  maybeRerunWslRelayGuestInstall,
+  runWslRelayGuestInstall
+} from './wsl-hook-relay-guest-install'
+import type { WslRelayDistroState } from './wsl-hook-relay-state'
+import { REINSTALL_MIN_INTERVAL_MS } from './wsl-hook-relay-deps'
+
+function heldRequest() {
+  const reached = Promise.withResolvers<void>()
+  const release = Promise.withResolvers<void>()
+  return {
+    reached: reached.promise,
+    release: release.resolve,
+    wait: async () => {
+      reached.resolve()
+      await release.promise
+    }
+  }
+}
+
+let root: string
+let state: WslRelayDistroState
+let settings: { disabledTuiAgents: TuiAgent[] }
+let guests: { mux: SshChannelMultiplexer; dispatcher: RelayDispatcher }[]
+const sources = { opencodePluginSource: '// v1', opencode2PluginSource: '// v2' }
+const deps = {
+  pluginSources: () => sources,
+  managedHookSettings: () => settings,
+  installHooks: vi.fn(async () => []),
+  installCodex: async () => null,
+  warn: vi.fn<(message: string) => void>()
+}
+
+function createGuest(name: string, beforeInstall?: (index: number) => Promise<void>) {
+  const home = join(root, name)
+  mkdirSync(join(home, '.config', 'opencode'), { recursive: true })
+  const callbacks: ((data: Buffer) => void)[] = []
+  const dispatcher = new RelayDispatcher((data) => callbacks.forEach((callback) => callback(data)))
+  const mux = new SshChannelMultiplexer({
+    write: (data) => dispatcher.feed(data),
+    onData: (callback) => {
+      callbacks.push(callback)
+    },
+    onClose: () => {}
+  })
+  const install = createInstallPluginsHandler(new PluginOverlayManager({ homeDir: home }), {
+    HOME: home,
+    XDG_CONFIG_HOME: join(home, '.config'),
+    ORCA_WSL_HOOK_INSTANCE: name
+  })
+  const requests: Record<string, unknown>[] = []
+  dispatcher.onRequest('preflight.detectAgents', async () => ({ agents: [] }))
+  dispatcher.onRequest(AGENT_HOOK_INSTALL_PLUGINS_METHOD, async (params) => {
+    requests.push(params)
+    await beforeInstall?.(requests.length)
+    return install(params)
+  })
+  const guest = { home, mux, dispatcher, requests }
+  guests.push(guest)
+  return guest
+}
+
+function connect(guest: ReturnType<typeof createGuest>) {
+  state.mux = guest.mux
+  state.guestHome = guest.home
+}
+
+beforeEach(() => {
+  root = mkdtempSync(join(tmpdir(), 'orca-wsl-install-race-'))
+  guests = []
+  settings = { disabledTuiAgents: [] }
+  deps.installHooks.mockReset().mockResolvedValue([])
+  deps.warn.mockReset()
+  state = {
+    distro: 'fixture',
+    phase: 'running',
+    launchKinds: new Set(),
+    failures: 0,
+    cooldownUntil: 0
+  }
+})
+afterEach(() => {
+  vi.restoreAllMocks()
+  for (const guest of guests) {
+    guest.mux.dispose()
+    guest.dispatcher.dispose()
+  }
+  rmSync(root, { recursive: true, force: true })
+})
+
+it.each([true, false])('coalesces waiters through a held %s enablement toggle', async (enabled) => {
+  const first = heldRequest()
+  const second = heldRequest()
+  const guest = createGuest('guest', (index) => (index === 1 ? first.wait() : second.wait()))
+  connect(guest)
+  settings.disabledTuiAgents = enabled ? [] : ['opencode', 'opencode2']
+  const initial = runWslRelayGuestInstall(deps, state, guest.mux, guest.home)
+  await first.reached
+  settings.disabledTuiAgents = enabled ? ['opencode', 'opencode2'] : []
+  let settled = 0
+  const waiters = Array.from({ length: 4 }, () =>
+    maybeRerunWslRelayGuestInstall(deps, state).then(() => {
+      settled++
+    })
+  )
+  first.release()
+  await vi.waitFor(() => expect(guest.requests).toHaveLength(2), { timeout: 1000 })
+  await second.reached
+  expect(settled).toBe(0)
+  expect(guest.requests).toHaveLength(2)
+  second.release()
+  await Promise.all([initial, ...waiters])
+  expect(guest.requests).toHaveLength(2)
+  expect(guest.requests[1]).toMatchObject(
+    enabled ? { opencodePluginSource: '', opencode2PluginSource: '' } : sources
+  )
+  if (enabled) {
+    expect(state.opencodeOverlayDir).toBeUndefined()
+    expect(state.opencode2OverlayDir).toBeUndefined()
+  } else {
+    expect(
+      readFileSync(join(state.opencodeOverlayDir!, 'plugins', 'orca-opencode-status.js'), 'utf8')
+    ).toBe('// v1')
+    expect(
+      readFileSync(join(state.opencode2OverlayDir!, 'plugins', 'orca-opencode2-status.js'), 'utf8')
+    ).toBe('// v2')
+  }
+  await maybeRerunWslRelayGuestInstall(deps, state)
+  expect(guest.requests).toHaveLength(2)
+  expect(state.installation).toBeUndefined()
+})
+
+it('drains reentrant toggles during successive requests without duplicate passes', async () => {
+  const waiters: Promise<void>[] = []
+  const guest = createGuest('guest', async (index) => {
+    if (index <= 2) {
+      settings.disabledTuiAgents = index === 1 ? ['opencode'] : ['opencode', 'opencode2']
+      waiters.push(maybeRerunWslRelayGuestInstall(deps, state))
+    }
+  })
+  connect(guest)
+  await maybeRerunWslRelayGuestInstall(deps, state)
+  await Promise.all(waiters)
+  expect(
+    guest.requests.map((params) => [params.opencodePluginSource, params.opencode2PluginSource])
+  ).toEqual([
+    ['// v1', '// v2'],
+    ['', '// v2'],
+    ['', '']
+  ])
+  expect(state.opencodeOverlayDir).toBeUndefined()
+  expect(state.opencode2OverlayDir).toBeUndefined()
+})
+
+it('does not reinstall for rapid toggles that return to the in-flight settings', async () => {
+  const held = heldRequest()
+  const guest = createGuest('guest', () => held.wait())
+  connect(guest)
+  const initial = runWslRelayGuestInstall(deps, state, guest.mux, guest.home)
+  await held.reached
+  settings.disabledTuiAgents = ['opencode', 'opencode2']
+  const disabled = maybeRerunWslRelayGuestInstall(deps, state)
+  settings.disabledTuiAgents = []
+  const enabled = maybeRerunWslRelayGuestInstall(deps, state)
+  held.release()
+  await Promise.all([initial, disabled, enabled])
+  expect(guest.requests).toHaveLength(1)
+  expect(state.opencodeOverlayDir).toBeTruthy()
+  expect(state.opencode2OverlayDir).toBeTruthy()
+})
+
+it('coalesces an ensure re-entering before the first asynchronous hook operation', async () => {
+  const guest = createGuest('guest')
+  connect(guest)
+  const waiters: Promise<void>[] = []
+  vi.spyOn(deps, 'managedHookSettings').mockImplementationOnce(() => {
+    waiters.push(maybeRerunWslRelayGuestInstall(deps, state))
+    return settings
+  })
+  await runWslRelayGuestInstall(deps, state, guest.mux, guest.home)
+  await Promise.all(waiters)
+  expect(guest.requests).toHaveLength(1)
+  expect(state.opencodeOverlayDir).toBeTruthy()
+})
+
+it('finishes a slow pass once, leaving time-based refresh to a later ensure', async () => {
+  let now = Date.now()
+  vi.spyOn(Date, 'now').mockImplementation(() => now)
+  const held = heldRequest()
+  const guest = createGuest('guest', async (index) => {
+    if (index === 1) {
+      await held.wait()
+    }
+  })
+  connect(guest)
+  const initial = maybeRerunWslRelayGuestInstall(deps, state)
+  await held.reached
+  now += REINSTALL_MIN_INTERVAL_MS + 1
+  held.release()
+  await initial
+  expect(guest.requests).toHaveLength(1)
+  await maybeRerunWslRelayGuestInstall(deps, state)
+  expect(guest.requests).toHaveLength(2)
+})
+
+it.each([true, false])(
+  'handles a rejected joined task with changed settings %s',
+  async (changed) => {
+    const reached = Promise.withResolvers<void>()
+    const rejected = Promise.withResolvers<void>()
+    const guest = createGuest('guest')
+    connect(guest)
+    guest.dispatcher.onRequest('preflight.detectAgents', async () => ({ agents: ['claude'] }))
+    deps.installHooks.mockImplementationOnce(async () => {
+      reached.resolve()
+      await rejected.promise
+      return []
+    })
+    const initial = runWslRelayGuestInstall(deps, state, guest.mux, guest.home).catch(
+      (error) => error
+    )
+    await reached.promise
+    if (changed) {
+      settings.disabledTuiAgents = ['opencode', 'opencode2']
+    }
+    const waiter = maybeRerunWslRelayGuestInstall(deps, state)
+    rejected.reject(new Error('fixture installation failed'))
+    expect(await initial).toMatchObject({ message: 'fixture installation failed' })
+    await waiter
+    expect(deps.warn).toHaveBeenCalledWith(expect.stringContaining('fixture installation failed'))
+    expect(guest.requests).toHaveLength(changed ? 1 : 0)
+    if (changed) {
+      expect(guest.requests[0]).toMatchObject({
+        opencodePluginSource: '',
+        opencode2PluginSource: ''
+      })
+    }
+    expect(state.installation).toBeUndefined()
+    expect(state.opencodeOverlayDir).toBeUndefined()
+  }
+)
+
+it('does not publish a held response or reinstall after ownership is removed', async () => {
+  const held = heldRequest()
+  const guest = createGuest('retired', () => held.wait())
+  connect(guest)
+  const initial = runWslRelayGuestInstall(deps, state, guest.mux, guest.home)
+  await held.reached
+  settings.disabledTuiAgents = ['opencode', 'opencode2']
+  const waiter = maybeRerunWslRelayGuestInstall(deps, state)
+  state.mux = undefined
+  held.release()
+  await Promise.all([initial, waiter])
+  expect(guest.requests).toHaveLength(1)
+  expect(state.opencodeOverlayDir).toBeUndefined()
+  expect(state.opencode2OverlayDir).toBeUndefined()
+})
+
+it('leaves the replacement task and its paths owned by the new mux', async () => {
+  const oldHeld = heldRequest()
+  const nextHeld = heldRequest()
+  const old = createGuest('old', () => oldHeld.wait())
+  connect(old)
+  const initial = runWslRelayGuestInstall(deps, state, old.mux, old.home)
+  await oldHeld.reached
+  const waiter = maybeRerunWslRelayGuestInstall(deps, state)
+  const next = createGuest('next', () => nextHeld.wait())
+  connect(next)
+  state.installation = undefined
+  const replacement = runWslRelayGuestInstall(deps, state, next.mux, next.home)
+  await nextHeld.reached
+  const ownedTask = state.installation
+  oldHeld.release()
+  await initial
+  expect(state.installation).toBe(ownedTask)
+  expect(state.opencodeOverlayDir).toBeUndefined()
+  expect(state.opencode2OverlayDir).toBeUndefined()
+  nextHeld.release()
+  await Promise.all([waiter, replacement])
+  expect(state.opencodeOverlayDir).toContain(next.home)
+  expect(state.opencode2OverlayDir).toContain(next.home)
+  expect(old.requests).toHaveLength(1)
+  expect(next.requests).toHaveLength(1)
+})
+
+it('does not dispatch plugins after teardown during hook detection', async () => {
+  const held = heldRequest()
+  const guest = createGuest('retired')
+  connect(guest)
+  guest.dispatcher.onRequest('preflight.detectAgents', async () => {
+    await held.wait()
+    return { agents: [] }
+  })
+  const initial = runWslRelayGuestInstall(deps, state, guest.mux, guest.home)
+  await held.reached
+  state.mux = undefined
+  held.release()
+  await initial
+  expect(guest.requests).toHaveLength(0)
+  expect(state.opencodeOverlayDir).toBeUndefined()
+})
+
+it('does not dispatch a recheck on a disposed mux', async () => {
+  const held = heldRequest()
+  const guest = createGuest('disposed', () => held.wait())
+  connect(guest)
+  const initial = runWslRelayGuestInstall(deps, state, guest.mux, guest.home)
+  await held.reached
+  settings.disabledTuiAgents = ['opencode', 'opencode2']
+  const waiter = maybeRerunWslRelayGuestInstall(deps, state)
+  guest.mux.dispose()
+  held.release()
+  await Promise.all([initial, waiter])
+  expect(guest.requests).toHaveLength(1)
+  expect(state.opencodeOverlayDir).toBeUndefined()
+})
diff --git a/src/main/agent-hooks/wsl-opencode-settings-lifetime.test.ts b/src/main/agent-hooks/wsl-opencode-settings-lifetime.test.ts
new file mode 100644
index 000000000000..29cf139ace5e
--- /dev/null
+++ b/src/main/agent-hooks/wsl-opencode-settings-lifetime.test.ts
@@ -0,0 +1,353 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { EventEmitter } from 'node:events'
+import type { ChildProcessWithoutNullStreams } from 'node:child_process'
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { RelayDispatcher } from '../../relay/dispatcher'
+import { PluginOverlayManager } from '../../relay/plugin-overlay'
+import { createInstallPluginsHandler } from '../../relay/wsl-install-plugins-handler'
+import { WslHookRelayManager } from './wsl-hook-relay-manager'
+import { REINSTALL_MIN_INTERVAL_MS } from './wsl-hook-relay-deps'
+import type { MultiplexerTransport } from '../ssh/ssh-channel-multiplexer'
+import type { TuiAgent } from '../../shared/tui-agent'
+import {
+  AGENT_HOOK_INSTALL_PLUGINS_METHOD,
+  AGENT_HOOK_REQUEST_REPLAY_METHOD
+} from '../../shared/agent-hook-relay'
+import { WSL_HOOK_FS_METHODS } from '../../shared/wsl-hook-relay-contract'
+
+function gate() {
+  const reached = Promise.withResolvers<void>()
+  const release = Promise.withResolvers<void>()
+  return {
+    reached: reached.promise,
+    release: release.resolve,
+    wait: async () => {
+      reached.resolve()
+      await release.promise
+    }
+  }
+}
+
+function fakeChild(): ChildProcessWithoutNullStreams {
+  const child = Object.assign(new EventEmitter(), {
+    stdout: new EventEmitter(),
+    stderr: new EventEmitter(),
+    stdin: { write: () => true, end: () => {}, on: () => {} },
+    kill: () => true
+  })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The injected launcher and link only use these emitter, stream, and kill members; no process is spawned.
+  return child as unknown as ChildProcessWithoutNullStreams
+}
+
+// Guest materialization uses POSIX home semantics; native Windows needs the WSL rig.
+describe.skipIf(process.platform === 'win32')('WSL public-manager settings lifetime', () => {
+  let root: string
+  let manager: WslHookRelayManager
+  let guests: ReturnType<typeof createGuest>[]
+  let activeGuest: ReturnType<typeof createGuest>
+  let settings: { disabledTuiAgents: TuiAgent[] }
+  let requests: Record<string, unknown>[]
+  let now: number
+  let detectionCount: number
+  let hookCount: number
+  let pause: 'detect' | 'hooks' | 'plugin'
+  let rejectRequest: boolean
+  let rejectHooks: boolean
+  let onPluginRequest: ((index: number) => Promise<void>) | undefined
+  let beforeSources: ReturnType<typeof gate>
+  let pendingRequest: ReturnType<typeof gate>
+  const sources = {
+    opencodePluginSource: '// independent v1',
+    opencode2PluginSource: '// independent v2',
+    piExtensionSource: '// pi',
+    ompExtensionSource: '// omp'
+  }
+
+  function createGuest(name: string): {
+    home: string
+    transport: MultiplexerTransport
+    dispatcher: RelayDispatcher
+  } {
+    const home = join(root, name)
+    mkdirSync(join(home, '.config', 'opencode'), { recursive: true })
+    writeFileSync(join(home, '.config', 'opencode', 'opencode.json'), '{"model":"fixture"}')
+    const callbacks: ((data: Buffer) => void)[] = []
+    const transport: MultiplexerTransport = {
+      write: (data) => dispatcher.feed(data),
+      onData: (callback) => {
+        callbacks.push(callback)
+      },
+      onClose: () => {}
+    }
+    const dispatcher = new RelayDispatcher((data) =>
+      callbacks.forEach((callback) => callback(data))
+    )
+    dispatcher.onRequest(WSL_HOOK_FS_METHODS.home, async () => ({ ok: true, home }))
+    dispatcher.onRequest(AGENT_HOOK_REQUEST_REPLAY_METHOD, async () => ({ replayed: 0 }))
+    dispatcher.onRequest('preflight.detectAgents', async () => {
+      if (++detectionCount === 2 && pause === 'detect') {
+        await beforeSources.wait()
+      }
+      return { agents: ['claude'] }
+    })
+    const install = createInstallPluginsHandler(new PluginOverlayManager({ homeDir: home }), {
+      HOME: home,
+      XDG_CONFIG_HOME: join(home, '.config'),
+      ORCA_WSL_HOOK_INSTANCE: 'independent-manager'
+    })
+    dispatcher.onRequest(AGENT_HOOK_INSTALL_PLUGINS_METHOD, async (params) => {
+      requests.push(params)
+      if (onPluginRequest) {
+        await onPluginRequest(requests.length)
+      } else if (requests.length === 2) {
+        await pendingRequest.wait()
+        if (rejectRequest) {
+          throw new Error('fixture plugin request rejected')
+        }
+      }
+      return install(params)
+    })
+    const guest = { home, transport, dispatcher }
+    guests.push(guest)
+    return guest
+  }
+
+  beforeEach(() => {
+    root = mkdtempSync(join(tmpdir(), 'orca-wsl-manager-boundary-'))
+    settings = { disabledTuiAgents: [] }
+    requests = []
+    now = Date.now()
+    vi.spyOn(Date, 'now').mockImplementation(() => now)
+    rejectRequest = false
+    rejectHooks = false
+    onPluginRequest = undefined
+    detectionCount = 0
+    hookCount = 0
+    beforeSources = gate()
+    pendingRequest = gate()
+    guests = []
+    activeGuest = createGuest('first')
+    manager = new WslHookRelayManager({
+      platform: () => 'win32',
+      remoteHooksEnabled: () => true,
+      hookCoordsEnv: () => ({ ORCA_AGENT_HOOK_PORT: '43117', ORCA_AGENT_HOOK_TOKEN: 'fixture' }),
+      instanceKey: () => 'independent',
+      resolveBundle: () => ({ jsPath: join(root, 'relay.js'), version: 'fixture' }),
+      readBundle: () => Buffer.from('// fixture'),
+      listDistros: async () => ['fixture'],
+      isDistroRunning: async () => true,
+      spawnRelay: () => fakeChild(),
+      runInstall: async () => ({ code: 0, stderr: '' }),
+      waitForSentinel: async () => activeGuest.transport,
+      ingest: () => {},
+      installHooks: async () => {
+        if (++hookCount === 2 && pause === 'hooks') {
+          await beforeSources.wait()
+        }
+        if (rejectHooks) {
+          throw new Error('fixture hook failure')
+        }
+        return []
+      },
+      installCodex: async () => null,
+      managedHookSettings: () => settings,
+      pluginSources: () => sources,
+      warn: vi.fn(),
+      transientRetryDelayMs: 1
+    })
+  })
+  afterEach(() => {
+    manager.disposeAll()
+    for (const guest of guests) {
+      guest.dispatcher.dispose()
+    }
+    vi.restoreAllMocks()
+    rmSync(root, { recursive: true, force: true })
+  })
+
+  const cases = (['detect', 'hooks', 'plugin'] as const).flatMap((stage) =>
+    [true, false].flatMap((initialEnabled) =>
+      [true, false].map((toggleBack) => ({ stage, initialEnabled, toggleBack }))
+    )
+  )
+
+  it.each(cases)(
+    'manager settings across $stage: initially enabled $initialEnabled, toggle back $toggleBack',
+    async ({ stage, initialEnabled, toggleBack }) => {
+      pause = stage
+      const setEnabled = (enabled: boolean) => {
+        settings = { disabledTuiAgents: enabled ? [] : ['opencode', 'opencode2'] }
+      }
+      setEnabled(initialEnabled)
+      await manager.ensureForDistro('fixture')
+      expect(requests).toHaveLength(1)
+      now += REINSTALL_MIN_INTERVAL_MS + 1
+      const refresh = manager.ensureForDistro('fixture')
+      const waiters: Promise<void>[] = [refresh]
+      if (stage !== 'plugin') {
+        await beforeSources.reached
+        setEnabled(!initialEnabled)
+        waiters.push(manager.ensureForDistro('fixture'))
+        beforeSources.release()
+      }
+      await pendingRequest.reached
+      const sentEnabled = stage === 'plugin' ? initialEnabled : !initialEnabled
+      expect(requests[1]).toMatchObject(
+        sentEnabled
+          ? sources
+          : {
+              opencodePluginSource: '',
+              opencode2PluginSource: ''
+            }
+      )
+      if (stage === 'plugin') {
+        setEnabled(!initialEnabled)
+        waiters.push(manager.ensureForDistro('fixture'))
+      }
+      const finalEnabled = toggleBack ? initialEnabled : !initialEnabled
+      setEnabled(finalEnabled)
+      waiters.push(...Array.from({ length: 4 }, () => manager.ensureForDistro('fixture')))
+      pendingRequest.release()
+      await Promise.all(waiters)
+      expect(requests).toHaveLength(sentEnabled === finalEnabled ? 2 : 3)
+      expect(requests.at(-1)).toMatchObject(
+        finalEnabled
+          ? sources
+          : {
+              opencodePluginSource: '',
+              opencode2PluginSource: ''
+            }
+      )
+      for (const agent of ['opencode', 'opencode2'] as const) {
+        const dir = manager.getOpenCodeOverlayDir('fixture', agent)
+        if (finalEnabled) {
+          expect(dir).toBeTruthy()
+          if (!dir) {
+            throw new Error('missing enabled overlay')
+          }
+          expect(readFileSync(join(dir, 'plugins', `orca-${agent}-status.js`), 'utf8')).toBe(
+            agent === 'opencode' ? sources.opencodePluginSource : sources.opencode2PluginSource
+          )
+        } else {
+          expect(dir).toBeNull()
+        }
+      }
+      const settledCount = requests.length
+      await manager.ensureForDistro('fixture')
+      expect(requests).toHaveLength(settledCount)
+    }
+  )
+
+  it('preserves known pointers after plugin rejection without treating it as revocation', async () => {
+    pause = 'detect'
+    await manager.ensureForDistro('fixture')
+    const oldV1 = manager.getOpenCodeOverlayDir('fixture')
+    const oldV2 = manager.getOpenCodeOverlayDir('fixture', 'opencode2')
+    now += REINSTALL_MIN_INTERVAL_MS + 1
+    const refresh = manager.ensureForDistro('fixture')
+    await beforeSources.reached
+    settings = { disabledTuiAgents: ['opencode', 'opencode2'] }
+    const disabled = manager.ensureForDistro('fixture')
+    beforeSources.release()
+    await pendingRequest.reached
+    rejectRequest = true
+    settings = { disabledTuiAgents: [] }
+    const restored = manager.ensureForDistro('fixture')
+    pendingRequest.release()
+    await Promise.all([refresh, disabled, restored])
+    expect(requests).toHaveLength(2)
+    expect(manager.getOpenCodeOverlayDir('fixture')).toBe(oldV1)
+    expect(manager.getOpenCodeOverlayDir('fixture', 'opencode2')).toBe(oldV2)
+    await manager.ensureForDistro('fixture')
+    expect(requests).toHaveLength(2)
+  })
+
+  it('tracks the settings sent by successive Pi and OMP requests', async () => {
+    pause = 'plugin'
+    await manager.ensureForDistro('fixture', undefined, 'pi')
+    const secondKind = gate()
+    onPluginRequest = async (index) => {
+      if (index === 2) {
+        await pendingRequest.wait()
+      }
+      if (index === 3) {
+        await secondKind.wait()
+      }
+    }
+    const refresh = manager.ensureForDistro('fixture', undefined, 'omp')
+    await pendingRequest.reached
+    settings.disabledTuiAgents = ['opencode', 'opencode2']
+    const disabled = manager.ensureForDistro('fixture')
+    pendingRequest.release()
+    await secondKind.reached
+    expect(requests[2]).toMatchObject({
+      launchKind: 'omp',
+      opencodePluginSource: '',
+      opencode2PluginSource: ''
+    })
+    settings.disabledTuiAgents = []
+    const restored = manager.ensureForDistro('fixture')
+    secondKind.release()
+    await Promise.all([refresh, disabled, restored])
+    expect(requests.map((request) => request.launchKind)).toEqual(['pi', 'pi', 'omp', 'pi', 'omp'])
+    expect(requests.at(-1)).toMatchObject(sources)
+    expect(manager.getOpenCodeOverlayDir('fixture')).toBeTruthy()
+    expect(manager.getOpenCodeOverlayDir('fixture', 'opencode2')).toBeTruthy()
+    const pi = manager.getGuestAgentPath('fixture', 'pi')
+    const omp = manager.getGuestAgentPath('fixture', 'omp')
+    if (!pi || !omp) {
+      throw new Error('missing guest agent paths')
+    }
+    expect(readFileSync(join(pi, 'extensions', 'orca-agent-status.ts'), 'utf8')).toContain('// pi')
+    expect(readFileSync(omp, 'utf8')).toContain('// omp')
+    await manager.ensureForDistro('fixture')
+    expect(requests).toHaveLength(5)
+  })
+
+  it('bounds repeated pre-plugin failures and retries after the cooldown', async () => {
+    pause = 'hooks'
+    await manager.ensureForDistro('fixture')
+    const previous = manager.getOpenCodeOverlayDir('fixture')
+    now += REINSTALL_MIN_INTERVAL_MS + 1
+    const refresh = manager.ensureForDistro('fixture')
+    await beforeSources.reached
+    settings.disabledTuiAgents = ['opencode', 'opencode2']
+    rejectHooks = true
+    const waiters = Array.from({ length: 4 }, () => manager.ensureForDistro('fixture'))
+    beforeSources.release()
+    await Promise.all([refresh, ...waiters])
+    expect(hookCount).toBe(3)
+    expect(requests).toHaveLength(1)
+    expect(manager.getOpenCodeOverlayDir('fixture')).toBe(previous)
+    await manager.ensureForDistro('fixture')
+    expect(hookCount).toBe(3)
+    now += REINSTALL_MIN_INTERVAL_MS + 1
+    rejectHooks = false
+    pendingRequest.release()
+    await manager.ensureForDistro('fixture')
+    expect(hookCount).toBe(4)
+    expect(requests.at(-1)).toMatchObject({ opencodePluginSource: '', opencode2PluginSource: '' })
+    expect(manager.getOpenCodeOverlayDir('fixture')).toBeNull()
+  })
+
+  it('keeps a disposed generation from publishing into a reconnected manager', async () => {
+    pause = 'plugin'
+    await manager.ensureForDistro('fixture')
+    now += REINSTALL_MIN_INTERVAL_MS + 1
+    const refresh = manager.ensureForDistro('fixture')
+    await pendingRequest.reached
+    const waiters = Array.from({ length: 4 }, () => manager.ensureForDistro('fixture'))
+    manager.disposeAll({ permanent: false })
+    activeGuest = createGuest('replacement')
+    await manager.ensureForDistro('fixture')
+    const current = manager.getOpenCodeOverlayDir('fixture')
+    expect(current).toContain(activeGuest.home)
+    pendingRequest.release()
+    await Promise.all([refresh, ...waiters])
+    expect(requests).toHaveLength(3)
+    expect(manager.getOpenCodeOverlayDir('fixture')).toBe(current)
+    expect(manager.getOpenCodeOverlayDir('fixture', 'opencode2')).toContain(activeGuest.home)
+  })
+})
diff --git a/src/main/agent-hooks/wsl-opencode-settings.test.ts b/src/main/agent-hooks/wsl-opencode-settings.test.ts
new file mode 100644
index 000000000000..0e868635ea2d
--- /dev/null
+++ b/src/main/agent-hooks/wsl-opencode-settings.test.ts
@@ -0,0 +1,136 @@
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import type { TuiAgent } from '../../shared/tui-agent'
+import { RelayDispatcher } from '../../relay/dispatcher'
+import { PluginOverlayManager } from '../../relay/plugin-overlay'
+import { createInstallPluginsHandler } from '../../relay/wsl-install-plugins-handler'
+import { SshChannelMultiplexer } from '../ssh/ssh-channel-multiplexer'
+import { AGENT_HOOK_INSTALL_PLUGINS_METHOD } from '../../shared/agent-hook-relay'
+import { requestGuestOpenCodeOverlayDir } from './wsl-guest-plugin-install'
+import {
+  maybeRerunWslRelayGuestInstall,
+  runWslRelayGuestInstall
+} from './wsl-hook-relay-guest-install'
+import type { WslRelayDistroState } from './wsl-hook-relay-state'
+
+let home: string
+let dispatcher: RelayDispatcher
+let mux: SshChannelMultiplexer
+let state: WslRelayDistroState
+let settings: { disabledTuiAgents: TuiAgent[] }
+let params: Record<string, unknown>[]
+const sources = {
+  opencodePluginSource: '// v1',
+  opencode2PluginSource: '// v2',
+  piExtensionSource: '// pi'
+}
+const deps = {
+  pluginSources: () => sources,
+  managedHookSettings: () => settings,
+  installHooks: async () => [],
+  installCodex: async () => null,
+  warn: (message: string) => {
+    throw new Error(message)
+  }
+}
+beforeEach(() => {
+  home = mkdtempSync(join(tmpdir(), 'orca-wsl-opencode-settings-'))
+  const xdg = join(home, 'xdg')
+  mkdirSync(join(xdg, 'opencode'), { recursive: true })
+  writeFileSync(join(xdg, 'opencode', 'opencode.json'), '{"model":"guest-fixture"}')
+  settings = { disabledTuiAgents: [] }
+  params = []
+  const callbacks: ((data: Buffer) => void)[] = []
+  dispatcher = new RelayDispatcher((data) => {
+    for (const callback of callbacks) {
+      callback(data)
+    }
+  })
+  mux = new SshChannelMultiplexer({
+    write: (data) => {
+      dispatcher.feed(data)
+    },
+    onData: (callback) => {
+      callbacks.push(callback)
+    },
+    onClose: () => {}
+  })
+  const install = createInstallPluginsHandler(new PluginOverlayManager({ homeDir: home }), {
+    HOME: home,
+    XDG_CONFIG_HOME: xdg,
+    ORCA_WSL_HOOK_INSTANCE: 'settings-fixture'
+  })
+  dispatcher.onRequest('preflight.detectAgents', async () => ({ agents: [] }))
+  dispatcher.onRequest(AGENT_HOOK_INSTALL_PLUGINS_METHOD, async (request) => {
+    params.push(request)
+    return install(request)
+  })
+  state = {
+    distro: 'fixture',
+    phase: 'running',
+    mux,
+    guestHome: home,
+    launchKinds: new Set(),
+    failures: 0,
+    cooldownUntil: 0
+  }
+})
+afterEach(() => {
+  mux.dispose()
+  dispatcher.dispose()
+  rmSync(home, { recursive: true, force: true })
+})
+
+describe('WSL settings over the existing plugin RPC into real fixture overlays', () => {
+  const cases: TuiAgent[][] = [[], ['opencode'], ['opencode2'], ['opencode', 'opencode2']]
+  it.each(cases.map((disabled) => ({ disabled })))(
+    'honors disabled $disabled',
+    async ({ disabled }) => {
+      settings.disabledTuiAgents = disabled
+      const result = await requestGuestOpenCodeOverlayDir(mux, deps, 'fixture')
+      for (const agent of ['opencode', 'opencode2'] as const) {
+        const key = agent === 'opencode' ? 'opencodePluginSource' : 'opencode2PluginSource'
+        expect(params[0][key]).toBe(disabled.includes(agent) ? '' : sources[key])
+      }
+      if (result.kind === 'dir') {
+        expect(Boolean(result.dir)).toBe(!disabled.includes('opencode'))
+        expect(Boolean(result.dir2)).toBe(!disabled.includes('opencode2'))
+        const dir = result.dir ?? result.dir2
+        if (!dir) {
+          throw new Error('missing overlay')
+        }
+        expect(readFileSync(join(dir, 'opencode.json'), 'utf8')).toBe('{"model":"guest-fixture"}')
+      } else {
+        expect(disabled).toEqual(['opencode', 'opencode2'])
+      }
+      expect(params[0].piExtensionSource).toBe('// pi')
+    }
+  )
+
+  it('revokes cached sources before the reinstall interval and re-enables the same service', async () => {
+    await runWslRelayGuestInstall(deps, state, mux, home)
+    const dir = state.opencodeOverlayDir
+    if (!dir) {
+      throw new Error('missing original overlay')
+    }
+    const path = join(dir, 'plugins', 'orca-opencode-status.js')
+    writeFileSync(path, '// installed sentinel')
+    settings.disabledTuiAgents = ['opencode']
+    await maybeRerunWslRelayGuestInstall(deps, state)
+    expect(state.opencodeOverlayDir).toBeUndefined()
+    expect(state.opencode2OverlayDir).toBeTruthy()
+    expect(readFileSync(path, 'utf8')).toBe('// installed sentinel')
+    const omitted = await requestGuestOpenCodeOverlayDir(
+      mux,
+      { ...deps, pluginSources: () => ({}) },
+      'fixture'
+    )
+    expect(omitted.kind === 'dir' ? omitted.dir : undefined).toBeUndefined()
+    settings.disabledTuiAgents = []
+    await maybeRerunWslRelayGuestInstall(deps, state)
+    expect(state.opencodeOverlayDir).toBe(dir)
+    expect(existsSync(path)).toBe(true)
+  })
+})
diff --git a/src/main/agent-launch/__fixtures__/host-agent-startup-call-sites.txt b/src/main/agent-launch/__fixtures__/host-agent-startup-call-sites.txt
new file mode 100644
index 000000000000..de078fd731e9
--- /dev/null
+++ b/src/main/agent-launch/__fixtures__/host-agent-startup-call-sites.txt
@@ -0,0 +1,10 @@
+# Host-side calls to the agent startup-plan builders, per file: <path> <calls> <decision>.
+#   attributes      a fresh agent the host builds; carries agentStartedTelemetry
+#   resume          continues an existing agent session; not a new start
+#   mobile-followup the phone's session-tab launch; attribution is a separate follow-up
+# The resolve-worktree-removal-target call also serves a bare typed command, which stays unattributed.
+src/main/runtime/orca-runtime-create-agent-session.ts 2 attributes
+src/main/runtime/orca-runtime-resolve-worktree-removal-target.ts 1 attributes
+src/main/runtime/runtime-worktree-agent-startup.ts 3 attributes
+src/main/runtime/orca-runtime-get-agent-session-execution-namespace.ts 1 resume
+src/main/runtime/orca-runtime-resolve-mobile-session-terminal-command.ts 1 mobile-followup
diff --git a/src/main/agent-launch/agent-launch-executor.ts b/src/main/agent-launch/agent-launch-executor.ts
index 090a65f7650f..1d9bae4f45d3 100644
--- a/src/main/agent-launch/agent-launch-executor.ts
+++ b/src/main/agent-launch/agent-launch-executor.ts
@@ -21,8 +21,8 @@
  * for a workspace it can resolve. That is why the decision is in two halves rather than one.
  *
  * What genuinely differs per surface is only how a surface is *built* — an orchestration worker's
- * session takes a dispatch hold and a mailbox that a plain launch must not take — so that is
- * injected as a factory instead of branched on here.
+ * session takes a redrive subscription and a mailbox that a plain launch must not take — so that
+ * is injected as a factory instead of branched on here.
  */
 
 import { parsePaneKey } from '../../shared/stable-pane-id'
diff --git a/src/main/agent-launch/agent-launch-not-started.ts b/src/main/agent-launch/agent-launch-not-started.ts
new file mode 100644
index 000000000000..ca40f53378f2
--- /dev/null
+++ b/src/main/agent-launch/agent-launch-not-started.ts
@@ -0,0 +1,37 @@
+/**
+ * A launch whose terminal failed before its spawn was requested: nothing was created, so the
+ * launch can settle as failed with its real cause instead of an unknown outcome.
+ *
+ * The original error is remembered rather than wrapped, so the caller still receives the host's own
+ * code and message. After the request leaves this process a failure proves nothing — an SSH or
+ * daemon spawn whose reply was lost may still have started — so only this earlier point counts.
+ *
+ * The verdict belongs to the launch, not to the error object: a failed pane spawn rejects the same
+ * error into the spawner (after its request left) and into a concurrent create waiting on that pane
+ * (before its own request left), so a mark on the error itself would clear both.
+ */
+export type TerminalSpawnDispatch = {
+  onPtySpawnDispatched: () => void
+  /** Rethrows the create's failure, remembering it when the spawn request had not yet left. */
+  rethrow: (error: unknown) => never
+  /** True only for the error this launch's create threw before its spawn request left. */
+  failedBeforeDispatch: (error: unknown) => boolean
+}
+
+export function trackTerminalSpawnDispatch(): TerminalSpawnDispatch {
+  let dispatched = false
+  let notStarted: { error: unknown } | undefined
+  return {
+    onPtySpawnDispatched: () => {
+      dispatched = true
+    },
+    rethrow: (error) => {
+      if (!dispatched) {
+        notStarted = { error }
+      }
+      throw error
+    },
+    failedBeforeDispatch: (error) =>
+      !dispatched && notStarted !== undefined && notStarted.error === error
+  }
+}
diff --git a/src/main/agent-launch/agent-launch-surface-factories.ts b/src/main/agent-launch/agent-launch-surface-factories.ts
index 14d2d4b2797d..867eac40ab61 100644
--- a/src/main/agent-launch/agent-launch-surface-factories.ts
+++ b/src/main/agent-launch/agent-launch-surface-factories.ts
@@ -8,8 +8,8 @@ import type { AgentLaunchPrompt } from '../../shared/agent-launch-intent'
 import type { TuiAgent } from '../../shared/tui-agent'
 
 /** How a surface is built once the executor has decided which one. Injected because an
- *  orchestration worker's session carries a dispatch hold and a mailbox a plain launch must not
- *  take, while the decision and ordering above it are identical. */
+ *  orchestration worker's session carries a redrive subscription and a mailbox a plain launch
+ *  must not take, while the decision and ordering above it are identical. */
 export type AgentLaunchSurfaceFactory = {
   createStructuredSession(args: {
     worktreeId: string
diff --git a/src/main/agent-launch/agent-started-telemetry.ts b/src/main/agent-launch/agent-started-telemetry.ts
new file mode 100644
index 000000000000..2d1ff76179dc
--- /dev/null
+++ b/src/main/agent-launch/agent-started-telemetry.ts
@@ -0,0 +1,30 @@
+/**
+ * The `agent_started` triple for an agent launch the host builds, of which only `launch_source`
+ * comes from the caller.
+ *
+ * `agent_kind` and `request_kind` are derived rather than accepted — the host already knows both,
+ * and a value it derives is a value a caller cannot misreport. `request_kind` is always `new`
+ * because a host-built launch is always a fresh agent.
+ *
+ * Every launch is attributed: a caller that names no surface, or one this build has never heard of
+ * (a newer client), is recorded as `unknown` rather than dropped. The wire keeps the arm set open so
+ * an older host cannot refuse a newer client's launch over a label, and resolving it here, leniently,
+ * keeps that label from gating the launch at the point it is actually used.
+ */
+
+import { tuiAgentToAgentKind } from '../../shared/agent-kind'
+import { launchSourceSchema } from '../../shared/telemetry-property-schemas'
+import type { TuiAgent } from '../../shared/tui-agent'
+import type { WorktreeStartupLaunch } from '../../shared/worktree/launch-types'
+
+export function agentStartedTelemetry(
+  agent: TuiAgent,
+  launchSource: string | undefined
+): NonNullable<WorktreeStartupLaunch['telemetry']> {
+  const parsed = launchSourceSchema.safeParse(launchSource)
+  return {
+    agent_kind: tuiAgentToAgentKind(agent),
+    launch_source: parsed.success ? parsed.data : 'unknown',
+    request_kind: 'new'
+  }
+}
diff --git a/src/main/agent-launch/host-agent-startup-attribution.test.ts b/src/main/agent-launch/host-agent-startup-attribution.test.ts
new file mode 100644
index 000000000000..612caab80017
--- /dev/null
+++ b/src/main/agent-launch/host-agent-startup-attribution.test.ts
@@ -0,0 +1,99 @@
+import { readFileSync, readdirSync, statSync } from 'node:fs'
+import { join, relative, resolve } from 'node:path'
+import { describe, expect, it } from 'vitest'
+
+/**
+ * Every host-side call that builds an agent's startup command has made an attribution decision.
+ *
+ * `agent_started` is recorded per call site, and twice a new host builder shipped without one, so
+ * that agent's launches were silently uncounted. A new call, or another call in a listed file,
+ * fails here until its author decides and records whether that launch is a fresh start.
+ */
+const DECISIONS = ['attributes', 'resume', 'mobile-followup'] as const
+
+const LISTED: ReadonlyMap<string, { calls: number; decision: string }> = new Map(
+  readFileSync(join(__dirname, '__fixtures__', 'host-agent-startup-call-sites.txt'), 'utf8')
+    .split('\n')
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0 && !line.startsWith('#'))
+    .map((line) => {
+      const [path, calls, decision] = line.split(/\s+/)
+      return [path, { calls: Number(calls), decision }] as const
+    })
+)
+
+const BUILDER_CALL =
+  /\b(?:buildAgentStartupPlan|buildAgentDraftLaunchPlan|buildAgentResumeStartupPlan)\s*\(/g
+
+const DECIDE =
+  'Decide attribution: a fresh agent the host builds must carry ' +
+  '`agentStartedTelemetry(agent, launchSource)` (src/main/agent-launch/agent-started-telemetry.ts) ' +
+  'on its startup; a resume or a bare typed command must not. Then record the file, its call ' +
+  'count and the decision in __fixtures__/host-agent-startup-call-sites.txt.'
+
+function isTestFile(path: string): boolean {
+  return /\.(?:test|spec)\.tsx?$/.test(path) || path.includes('/__tests__/')
+}
+
+function collectSourceFiles(root: string): string[] {
+  return readdirSync(root).flatMap((entry) => {
+    const full = join(root, entry)
+    if (statSync(full).isDirectory()) {
+      return entry === '__fixtures__' ? [] : collectSourceFiles(full)
+    }
+    return /\.tsx?$/.test(entry) ? [full] : []
+  })
+}
+
+/** Drop comment-only lines so prose naming a builder is not a call. */
+function codeText(contents: string): string {
+  return contents
+    .split('\n')
+    .filter((line) => !/^\s*(?:\/\/|\/\*|\*)/.test(line))
+    .join('\n')
+}
+
+describe('host agent startup attribution', () => {
+  const repoRoot = resolve(__dirname, '..', '..', '..')
+  const files = collectSourceFiles(join(repoRoot, 'src', 'main'))
+  const found = new Map<string, number>()
+  for (const file of files) {
+    const path = relative(repoRoot, file).split('\\').join('/')
+    const calls = isTestFile(path)
+      ? 0
+      : (codeText(readFileSync(file, 'utf8')).match(BUILDER_CALL)?.length ?? 0)
+    if (calls > 0) {
+      found.set(path, calls)
+    }
+  }
+
+  it('scans a plausible number of files', () => {
+    // A broken root would make the guard silently vacuous.
+    expect(files.length).toBeGreaterThan(500)
+  })
+
+  it('has an attribution decision for every builder call', () => {
+    const undecided = [...found]
+      .filter(([path, calls]) => calls > (LISTED.get(path)?.calls ?? 0))
+      .map(([path, calls]) => `${path}: ${calls} calls, ${LISTED.get(path)?.calls ?? 0} decided`)
+    expect(undecided, `New host-built agent startup. ${DECIDE}`).toEqual([])
+  })
+
+  it('has no stale entry', () => {
+    // A count left above reality lets the next call in that file land without a decision.
+    const stale = [...LISTED]
+      .filter(([path, entry]) => entry.calls > (found.get(path) ?? 0))
+      .map(([path, entry]) => `${path}: ${found.get(path) ?? 0} calls, ${entry.calls} listed`)
+    expect(stale, 'Lower or delete the entry to match the calls that remain.').toEqual([])
+  })
+
+  it('uses the known decision vocabulary', () => {
+    const unknown = [...LISTED].filter(
+      ([, entry]) => !DECISIONS.some((decision) => decision === entry.decision)
+    )
+    expect(
+      unknown.map(([path]) => path),
+      `Use one of: ${DECISIONS.join(', ')}.`
+    ).toEqual([])
+  })
+})
diff --git a/src/main/agent-trust-presets.ts b/src/main/agent-trust-presets.ts
index 30e2ba487f31..d84fc68a4680 100644
--- a/src/main/agent-trust-presets.ts
+++ b/src/main/agent-trust-presets.ts
@@ -6,7 +6,7 @@ import { getOrcaManagedCodexHomePath } from './codex/codex-home-paths'
 import { upsertProjectTrustLevel } from './codex/config-toml-trust'
 import { runExclusivelyForCodexTrustConfig } from './codex/codex-trust-config-mutation-queue'
 
-export type AgentTrustPreset = 'cursor' | 'copilot' | 'codex' | 'antigravity'
+export type AgentTrustPreset = 'cursor' | 'copilot' | 'codex' | 'antigravity' | 'qoder'
 
 /**
  * Pre-mark a workspace as trusted for cursor-agent, GitHub Copilot CLI, or
diff --git a/src/main/agent-trust-write-deadline.ts b/src/main/agent-trust-write-deadline.ts
new file mode 100644
index 000000000000..0effa8f69bc0
--- /dev/null
+++ b/src/main/agent-trust-write-deadline.ts
@@ -0,0 +1,47 @@
+import type { AgentTrustPreset } from './agent-trust-presets'
+
+/**
+ * Why: callers hold launch admission on a trust write, but the write is not
+ * self-bounding. The local Codex writer queues on the per-`config.toml` lane
+ * shared with hook installs and app-server trust grants (up to 10s native /
+ * 30s WSL each, with no cap on how many are already queued), and the SSH
+ * writer chains a `session.resolveHome` round trip plus unbounded SFTP
+ * read/write calls over a link that may be half-open. Without a cap the user
+ * clicks "start agent" and nothing happens, with no error.
+ *
+ * 20s covers a native grant session holding the lane with headroom. Past that
+ * we stop waiting and let the launch proceed *untrusted*: the write is never
+ * cancelled and still lands, and the agent meanwhile raises its own "Do you
+ * trust this folder?" prompt. Giving up therefore fails closed — it can only
+ * lose the ordering optimisation, never grant trust that was not written.
+ */
+export const AGENT_TRUST_WRITE_DEADLINE_MS = 20_000
+
+/**
+ * Awaits a trust write but never longer than the deadline. Rejections
+ * propagate to the caller's best-effort catch; a deadline miss is reported as
+ * a named warning rather than an exception, because every caller treats a
+ * failed trust write as "let the agent ask the user".
+ */
+export async function awaitAgentTrustWriteWithinDeadline(
+  write: Promise<void>,
+  context: { preset: AgentTrustPreset; workspacePath: string; deadlineMs?: number }
+): Promise<void> {
+  const deadlineMs = context.deadlineMs ?? AGENT_TRUST_WRITE_DEADLINE_MS
+  let timer: ReturnType<typeof setTimeout> | undefined
+  const expiry = new Promise<'expired'>((resolve) => {
+    timer = setTimeout(() => resolve('expired'), deadlineMs)
+  })
+  try {
+    // Why race adopts `write`: it attaches handlers, so a rejection arriving
+    // after the deadline is consumed here instead of surfacing unhandled.
+    const outcome = await Promise.race([write.then(() => 'written' as const), expiry])
+    if (outcome === 'expired') {
+      console.warn(
+        `[agent-trust] ${context.preset} trust write for ${context.workspacePath} did not settle within ${deadlineMs}ms; continuing untrusted so the agent can prompt`
+      )
+    }
+  } finally {
+    clearTimeout(timer)
+  }
+}
diff --git a/src/main/ai-vault-search/session-search-deleted-sources.test.ts b/src/main/ai-vault-search/session-search-deleted-sources.test.ts
index 5fd4e5cd6303..39fbda9bb140 100644
--- a/src/main/ai-vault-search/session-search-deleted-sources.test.ts
+++ b/src/main/ai-vault-search/session-search-deleted-sources.test.ts
@@ -264,6 +264,31 @@ it('keeps a synthetic row when this pass did not enumerate its container', async
   ).resolves.toMatchObject({ retired: [], unverifiable: [row] })
 })
 
+it('keeps a ZCode SQLite row when its database read failed during discovery', async () => {
+  const db = join(harness.root, 'db.sqlite')
+  await writeFile(db, '')
+  const row = `${db}#zcode-session`
+
+  const result = await retire([row], { roots: [] })
+  expect(result.retired).toEqual([])
+  expect(result.unverifiable).toEqual([row])
+  expect(removed).toEqual([])
+})
+
+it('retires a ZCode SQLite row only after a successful full database enumeration', async () => {
+  const db = join(harness.root, 'db.sqlite')
+  await writeFile(db, '')
+  const kept = `${db}#session-1`
+  const deleted = `${db}#session-2`
+
+  const result = await retire([kept, deleted], {
+    roots: [],
+    enumeratedContainers: new Map([[db, new Set(['session-1'])]])
+  })
+  expect(result.retired).toEqual([deleted])
+  expect(result.unverifiable).toEqual([])
+})
+
 it('retires a synthetic row when the container it came from is gone', async () => {
   const db = join(harness.root, 'opencode.db')
   await writeFile(db, '')
diff --git a/src/main/ai-vault-search/session-search-host-registration.test.ts b/src/main/ai-vault-search/session-search-host-registration.test.ts
index e2a31ec4f218..5a535d3e5541 100644
--- a/src/main/ai-vault-search/session-search-host-registration.test.ts
+++ b/src/main/ai-vault-search/session-search-host-registration.test.ts
@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { resetSessionParseCacheForTests } from '../ai-vault/session-scanner-parse-cache'
@@ -33,8 +32,6 @@ vi.mock('../ai-vault/cached-session-list', async (importOriginal) => ({
   localAiVaultScanRoots
 }))
 
-const ROOT = join(import.meta.dirname, '..', '..', '..')
-
 let harness: SessionSearchIndexerHarness
 let installed: { apply?(settings: AiVaultSearchSettings): void; dispose(): void } | null
 
@@ -141,26 +138,6 @@ it('registers an in-process service for a host with no scanner child', async ()
   })
 })
 
-// The behavioural tests above prove the installers register; these prove each
-// host's boot path reaches one, which no unit of either module can show.
-it.each([
-  [
-    'desktop and headless serve',
-    'src/main/startup/main-process-runtime-service.ts',
-    'installChildSessionSearchService'
-  ],
-  ['orcad', 'src/main/orcad/orcad-session-search.ts', 'installInProcessSessionSearchService'],
-  [
-    'the relay daemon',
-    'src/relay/relay-runtime-services.ts',
-    'installInProcessSessionSearchService'
-  ]
-])('boots %s with a registered session search service', (_host, file, installer) => {
-  const source = readFileSync(join(ROOT, file), 'utf8')
-  expect(source).toContain(installer)
-  expect(source).toMatch(new RegExp(`${installer}\\(\\{`))
-})
-
 it('disables immediately without root discovery', async () => {
   const { installChildSessionSearchService, applySessionSearchSettingsChange } =
     await import('./session-search-enablement')
@@ -231,11 +208,3 @@ it('re-applies consent on an in-process host without reinstalling the service',
     reason: 'disabled'
   })
 })
-
-// orcad reaches the index through the deps hook the runtime RPC calls; the wiring is
-// what no unit of either module can show.
-it('wires orcad consent from the runtime hook to the installed service', () => {
-  const source = readFileSync(join(ROOT, 'src/main/orcad/orcad-entry.ts'), 'utf8')
-  expect(source).toContain('applySessionSearchSettings:')
-  expect(source).toContain('sessionSearch?.apply(next)')
-})
diff --git a/src/main/ai-vault-search/session-search-synthetic-sources.ts b/src/main/ai-vault-search/session-search-synthetic-sources.ts
index 86222b9c5fe4..59541e7924f4 100644
--- a/src/main/ai-vault-search/session-search-synthetic-sources.ts
+++ b/src/main/ai-vault-search/session-search-synthetic-sources.ts
@@ -4,15 +4,14 @@ import type { SessionFileCandidate } from '../ai-vault/session-scanner-types'
 
 /**
  * A row whose path names a container and an entry inside it rather than a file
- * of its own. OpenCode's SQLite sessions are the one shape today
- * (`<opencode.db>#<sessionId>`), which is why this reads through that source's
- * own splitter rather than reinventing the encoding.
+ * of its own. OpenCode and ZCode SQLite sessions share the same encoding,
+ * with distinct database names validated by the source splitter.
  */
 export type SessionSearchSyntheticSource = { container: string; id: string }
 
 export function splitSyntheticSessionSource(path: string): SessionSearchSyntheticSource | null {
-  const openCode = splitOpenCodeSqliteCandidate(path)
-  return openCode ? { container: openCode.dbPath, id: openCode.sessionId } : null
+  const sqlite = splitOpenCodeSqliteCandidate(path) ?? splitOpenCodeSqliteCandidate(path, 'zcode')
+  return sqlite ? { container: sqlite.dbPath, id: sqlite.sessionId } : null
 }
 
 /**
diff --git a/src/main/ai-vault/remote-session-scanner-sources.ts b/src/main/ai-vault/remote-session-scanner-sources.ts
index ed34e8b52a58..dfd012415d54 100644
--- a/src/main/ai-vault/remote-session-scanner-sources.ts
+++ b/src/main/ai-vault/remote-session-scanner-sources.ts
@@ -8,6 +8,7 @@ import { isAntigravityTranscriptPath } from './session-scanner-antigravity-paths
 import { parseCodexSessionContent } from './session-scanner-codex-parser'
 import { parseDroidSessionContent } from './session-scanner-droid-parser'
 import { parseClaudeSessionContent } from './session-scanner-primary-parsers'
+import { parseCodebuddySessionContent } from './session-scanner-codebuddy-parser'
 import { parseGeminiSessionContent } from './session-scanner-gemini-parsers'
 import { parseCopilotSessionContent } from './session-scanner-copilot-parser'
 import { parseCursorSessionContent } from './session-scanner-cursor-parser'
@@ -65,6 +66,17 @@ export function remoteSessionSources(
       // top-level sessions carrying the parent's sessionId.
       partitionSubagentTranscripts: partitionSubagentTranscriptPaths
     },
+    {
+      // The execution host owns CodeBuddy's transcripts, including subagent pruning.
+      ...jsonlSource(
+        'codebuddy',
+        remoteHome,
+        hostPlatform,
+        ['.codebuddy', 'projects'],
+        parseCodebuddySessionContent
+      ),
+      partitionSubagentTranscripts: partitionSubagentTranscriptPaths
+    },
     remoteAntigravitySource(remoteHome, hostPlatform),
     source(
       'gemini',
diff --git a/src/main/ai-vault/session-cwd-bucket-layouts.test.ts b/src/main/ai-vault/session-cwd-bucket-layouts.test.ts
index 38c2f0b68e20..7cbbbfbcc6d5 100644
--- a/src/main/ai-vault/session-cwd-bucket-layouts.test.ts
+++ b/src/main/ai-vault/session-cwd-bucket-layouts.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { PI_CWD_BUCKET_LAYOUT } from './session-cwd-bucket-layouts'
+import { PI_CWD_BUCKET_LAYOUT, CODEBUDDY_CWD_BUCKET_LAYOUT } from './session-cwd-bucket-layouts'
 
 function piDirInScope(dirName: string, scopePath: string): boolean {
   return PI_CWD_BUCKET_LAYOUT.isDirInScope(
@@ -31,3 +31,19 @@ describe('PI_CWD_BUCKET_LAYOUT', () => {
     expect(piDirInScope('--C--Users-ada-repo--', 'C:\\Users\\ada\\repo')).toBe(true)
   })
 })
+
+describe('CODEBUDDY_CWD_BUCKET_LAYOUT', () => {
+  it.each([
+    ['C:\\Users\\ada\\repo', 'C-Users-ada-repo-src'],
+    ['/home/ada/repo', 'home-ada-repo-src'],
+    ['/', 'home-ada-repo'],
+    [`/${'界'.repeat(100)}`, `${'界'.repeat(60)}-hash`]
+  ])('keeps candidate buckets for %s', (scope, bucket) => {
+    expect(
+      CODEBUDDY_CWD_BUCKET_LAYOUT.isDirInScope(
+        bucket,
+        new Set(CODEBUDDY_CWD_BUCKET_LAYOUT.encodeScopePrefixes(scope))
+      )
+    ).toBe(true)
+  })
+})
diff --git a/src/main/ai-vault/session-cwd-bucket-layouts.ts b/src/main/ai-vault/session-cwd-bucket-layouts.ts
index d8b4a565949c..3f0195cdcd4f 100644
--- a/src/main/ai-vault/session-cwd-bucket-layouts.ts
+++ b/src/main/ai-vault/session-cwd-bucket-layouts.ts
@@ -3,7 +3,7 @@ import { encodeClaudeProjectPaths, isClaudeProjectDirInScope } from './claude-pr
 
 /** An agent that keeps one directory per cwd, named by a lossy encoding of that cwd. */
 export type CwdBucketLayout = {
-  agent: Extract<AiVaultAgent, 'claude' | 'pi'>
+  agent: Extract<AiVaultAgent, 'claude' | 'pi' | 'codebuddy'>
   encodeScopePrefixes: (scopePath: string) => string[]
   isDirInScope: (dirName: string, prefixes: ReadonlySet<string>) => boolean
 }
@@ -41,3 +41,28 @@ export const PI_CWD_BUCKET_LAYOUT: CwdBucketLayout = {
     return false
   }
 }
+
+// CodeBuddy 2.159.0 collapses separators and retains 180 UTF-8 bytes before long-path hashes.
+function codebuddyScopePrefix(path: string): string {
+  const encoded = path
+    .replace(/[/\\:]+/g, '-')
+    .replace(/-+/g, '-')
+    .replace(/^-|-$/g, '')
+  let prefix = ''
+  for (const character of encoded) {
+    if (Buffer.byteLength(prefix + character, 'utf8') > 180) {
+      break
+    }
+    prefix += character
+  }
+  return prefix
+}
+
+export const CODEBUDDY_CWD_BUCKET_LAYOUT: CwdBucketLayout = {
+  agent: 'codebuddy',
+  encodeScopePrefixes: (path) => [
+    ...new Set([path, path.normalize('NFC')].map(codebuddyScopePrefix))
+  ],
+  // This is only a prefilter: each transcript's cwd decides membership, including lossy collisions.
+  isDirInScope: (name, prefixes) => [...prefixes].some((prefix) => name.startsWith(prefix))
+}
diff --git a/src/main/ai-vault/session-first-user-prompt-read.ts b/src/main/ai-vault/session-first-user-prompt-read.ts
index cf1a5bb2bede..c0aa1b8a2197 100644
--- a/src/main/ai-vault/session-first-user-prompt-read.ts
+++ b/src/main/ai-vault/session-first-user-prompt-read.ts
@@ -9,7 +9,8 @@ import { parseAgentSessionFile } from './session-scanner-agent-parser'
 import { withFullFirstUserPromptCapture } from './session-scanner-first-user-prompt-capture'
 import {
   parseOpenCodeSqliteSessionViaWorker,
-  parseOpenCode2SqliteSessionViaWorker
+  parseOpenCode2SqliteSessionViaWorker,
+  parseZcodeSqliteSessionViaWorker
 } from './session-scanner-opencode-sqlite-worker-spawn'
 import { splitOpenCodeSqliteCandidate } from './session-scanner-opencode-sqlite-paths'
 import type { FileWithMtime } from './session-scanner-types'
@@ -76,12 +77,14 @@ async function parseSessionForFullFirstUserPrompt(args: {
   codexHome: string | null
 }): Promise<AiVaultSession | null> {
   // Full capture belongs inside the reader, including the guest reader for WSL.
-  if (args.agent === 'opencode' || args.agent === 'opencode2') {
+  if (args.agent === 'opencode' || args.agent === 'opencode2' || args.agent === 'zcode') {
     const parse =
       args.agent === 'opencode2'
         ? parseOpenCode2SqliteSessionViaWorker
-        : parseOpenCodeSqliteSessionViaWorker
-    const fromSynthetic = splitOpenCodeSqliteCandidate(args.filePath)
+        : args.agent === 'zcode'
+          ? parseZcodeSqliteSessionViaWorker
+          : parseOpenCodeSqliteSessionViaWorker
+    const fromSynthetic = splitOpenCodeSqliteCandidate(args.filePath, args.agent)
     if (fromSynthetic) {
       return parse({
         fullFirstUserPrompt: true,
diff --git a/src/main/ai-vault/session-scanner-agent-parser.ts b/src/main/ai-vault/session-scanner-agent-parser.ts
index c95dd8d7eac8..95910d208b73 100644
--- a/src/main/ai-vault/session-scanner-agent-parser.ts
+++ b/src/main/ai-vault/session-scanner-agent-parser.ts
@@ -1,3 +1,4 @@
+import { parseCodebuddySessionFile } from './session-scanner-codebuddy-parser'
 import type { AiVaultSession } from '../../shared/ai-vault-types'
 import { throwIfSignalAborted } from '../../shared/abort-signal-reason'
 import { parseDevinSessionFile } from './session-scanner-devin-parser'
@@ -12,8 +13,10 @@ import { splitOpenCodeSqliteCandidate } from './session-scanner-opencode-sqlite-
 import {
   captureOpenCodeSqliteSessionViaWorker,
   captureOpenCode2SqliteSessionViaWorker,
+  captureZcodeSqliteSessionViaWorker,
   parseOpenCode2SqliteSessionViaWorker,
-  parseOpenCodeSqliteSessionViaWorker
+  parseOpenCodeSqliteSessionViaWorker,
+  parseZcodeSqliteSessionViaWorker
 } from './session-scanner-opencode-sqlite-worker-spawn'
 import { parseClaudeSessionFile } from './session-scanner-primary-parsers'
 import { parseGeminiSessionFile } from './session-scanner-gemini-parsers'
@@ -38,7 +41,7 @@ async function readOpenCodeSqliteCandidate(
   platform: NodeJS.Platform,
   messages?: TranscriptMessageSink,
   signal?: AbortSignal,
-  agent?: 'opencode2'
+  agent?: 'opencode2' | 'zcode'
 ): Promise<AiVaultSession | null> {
   throwIfSignalAborted(signal)
   const request = { ...sqliteCandidate, platform, signal }
@@ -46,7 +49,9 @@ async function readOpenCodeSqliteCandidate(
     const parse =
       agent === 'opencode2'
         ? parseOpenCode2SqliteSessionViaWorker
-        : parseOpenCodeSqliteSessionViaWorker
+        : agent === 'zcode'
+          ? parseZcodeSqliteSessionViaWorker
+          : parseOpenCodeSqliteSessionViaWorker
     const session = await parse(request)
     throwIfSignalAborted(signal)
     return session
@@ -54,7 +59,9 @@ async function readOpenCodeSqliteCandidate(
   const capture =
     agent === 'opencode2'
       ? captureOpenCode2SqliteSessionViaWorker
-      : captureOpenCodeSqliteSessionViaWorker
+      : agent === 'zcode'
+        ? captureZcodeSqliteSessionViaWorker
+        : captureOpenCodeSqliteSessionViaWorker
   const result = await capture(request)
   for (const message of result.messages) {
     throwIfSignalAborted(signal)
@@ -81,6 +88,8 @@ export async function parseAgentSessionFile(
   signal?: AbortSignal
 ): Promise<AiVaultSession | null> {
   switch (candidate.agent) {
+    case 'codebuddy':
+      return parseCodebuddySessionFile(candidate.file, platform, messages)
     case 'claude':
       return parseClaudeSessionFile(candidate.file, platform, messages)
     case 'codex':
@@ -119,6 +128,12 @@ export async function parseAgentSessionFile(
       }
       return null
     }
+    case 'zcode': {
+      const sqliteCandidate = splitOpenCodeSqliteCandidate(candidate.file.path, 'zcode')
+      return sqliteCandidate
+        ? readOpenCodeSqliteCandidate(sqliteCandidate, platform, messages, signal, 'zcode')
+        : null
+    }
     case 'grok':
       return parseGrokSessionFile(candidate.file, platform, messages)
     case 'hermes':
diff --git a/src/main/ai-vault/session-scanner-agent-sources.ts b/src/main/ai-vault/session-scanner-agent-sources.ts
index ee10422031b0..66d069b68cc2 100644
--- a/src/main/ai-vault/session-scanner-agent-sources.ts
+++ b/src/main/ai-vault/session-scanner-agent-sources.ts
@@ -34,6 +34,7 @@ const COPILOT_SESSIONS_DIR = join(
   'session-state'
 )
 const CURSOR_PROJECTS_DIR = join(homedir(), '.cursor', 'projects')
+const CODEBUDDY_PROJECTS_DIR = join(homedir(), '.codebuddy', 'projects')
 const HERMES_SESSIONS_DIR = join(homedir(), '.hermes', 'sessions')
 const ROVO_SESSIONS_DIR = join(homedir(), '.rovodev', 'sessions')
 const OPENCLAW_STATE_DIR = resolveAbsoluteDirOverride(
@@ -114,6 +115,15 @@ export const AI_VAULT_AGENT_SOURCES: AiVaultAgentSourceTable = {
     // their parent instead.
     directoryPredicate: (name) => name !== SUBAGENT_DIR_NAME
   },
+  codebuddy: {
+    rootDirs: (options, wslHomeDirs) => [
+      options.codebuddyProjectsDir ?? CODEBUDDY_PROJECTS_DIR,
+      ...wslHomeDirs.map((homeDir) => join(homeDir, '.codebuddy', 'projects'))
+    ],
+    extensions: ['.jsonl'],
+    // Nested subagent transcripts are not independent top-level conversations.
+    directoryPredicate: (name) => name !== SUBAGENT_DIR_NAME
+  },
   codex: {
     rootDirs: (options, wslHomeDirs) =>
       uniqueCodexSessionsDirs([
diff --git a/src/main/ai-vault/session-scanner-codebuddy-parser.ts b/src/main/ai-vault/session-scanner-codebuddy-parser.ts
new file mode 100644
index 000000000000..94fc52d1eabb
--- /dev/null
+++ b/src/main/ai-vault/session-scanner-codebuddy-parser.ts
@@ -0,0 +1,230 @@
+import { createInterface } from 'node:readline'
+import {
+  remoteSessionContentLines,
+  type RemoteSessionContent
+} from './remote-session-content-lines'
+import { openTranscriptReadStream } from '../native-chat/wsl-transcript-fs-access'
+import type { AiVaultSession } from '../../shared/ai-vault-types'
+import type { ExecutionHostId } from '../../shared/execution-host'
+import { isKnownHarnessInjectedUserTurnText } from '../../shared/harness-injected-user-turns'
+import type { FileWithMtime, ResumableSessionParseState } from './session-scanner-types'
+import type { TranscriptMessageSink } from './session-transcript-consumers'
+import {
+  addPreviewMessage,
+  accumulatorSessionIdentity,
+  createAccumulator,
+  finalizeSession,
+  sessionIdFromFileName,
+  updateLatestLocation,
+  updateTimeline
+} from './session-scanner-accumulator'
+import {
+  asRecord,
+  extractString,
+  normalizeTitleText,
+  parseJsonObject
+} from './session-scanner-values'
+
+type ParserSessionOptions = {
+  executionHostId?: ExecutionHostId
+  executionHostPlatform?: NodeJS.Platform | null
+}
+
+// CodeBuddy stores top-level message roles and input_text/output_text blocks, not Claude records.
+export type CodebuddySessionParseState = {
+  accumulator: ReturnType<typeof createAccumulator>
+  aiTitle: string | null
+  firstUserTitle: string | null
+}
+
+export function createCodebuddySessionParseState(
+  file: FileWithMtime,
+  messages?: TranscriptMessageSink
+): CodebuddySessionParseState {
+  return {
+    accumulator: createAccumulator({
+      agent: 'codebuddy',
+      file,
+      sessionId: sessionIdFromFileName(file.path),
+      messages
+    }),
+    aiTitle: null,
+    firstUserTitle: null
+  }
+}
+
+export function cloneCodebuddySessionParseState(
+  state: CodebuddySessionParseState
+): CodebuddySessionParseState {
+  return {
+    accumulator: {
+      ...state.accumulator,
+      previewMessages: [...state.accumulator.previewMessages]
+    },
+    aiTitle: state.aiTitle,
+    firstUserTitle: state.firstUserTitle
+  }
+}
+
+// CodeBuddy conversation content is an array of typed text blocks; join the
+// text ones. Non-text blocks (tool calls, diffs) carry no preview copy.
+function codebuddyContentText(content: unknown): string | null {
+  if (typeof content === 'string') {
+    return content
+  }
+  if (!Array.isArray(content)) {
+    return null
+  }
+  const parts = content
+    .map((block) => {
+      const record = asRecord(block)
+      const type = extractString(record?.type)
+      return type === 'input_text' || type === 'output_text' || type === 'text'
+        ? extractString(record?.text)
+        : null
+    })
+    .filter((text): text is string => typeof text === 'string' && text.length > 0)
+  return parts.length > 0 ? parts.join('\n\n') : null
+}
+
+export function consumeCodebuddySessionLine(state: CodebuddySessionParseState, line: string): void {
+  const { accumulator } = state
+  const record = parseJsonObject(line)
+  if (!record) {
+    return
+  }
+
+  if (typeof record.sessionId === 'string' && record.sessionId.trim()) {
+    accumulator.sessionId = record.sessionId.trim()
+  }
+  updateTimeline(accumulator, record.timestamp)
+  updateLatestLocation(accumulator, record)
+
+  // The CLI's own session title; later summaries revise it, like Claude's
+  // custom-title.
+  if (record.type === 'summary') {
+    const summary = normalizeTitleText(extractString(record.summary) ?? '')
+    if (summary) {
+      accumulator.title = summary
+    }
+    return
+  }
+
+  if (record.type === 'ai-title') {
+    const title = normalizeTitleText(extractString(record.aiTitle) ?? '')
+    if (title) {
+      // CodeBuddy can revise generated names; AI Vault mirrors the current one.
+      state.aiTitle = title
+    }
+    return
+  }
+
+  if (record.type !== 'message') {
+    return
+  }
+
+  const role = extractString(record.role)
+  const text = codebuddyContentText(record.content)
+  accumulator.messageCount++
+  if (role === 'user') {
+    // Meta prompts (injected context) only seed the last-resort title.
+    // `providerData.skipRun` marks machinery-injected turns that never reached
+    // the model as a user prompt.
+    const isMetaUserTurn =
+      asRecord(record.providerData)?.skipRun === true ||
+      (text != null && isKnownHarnessInjectedUserTurnText(text))
+    addPreviewMessage(accumulator, {
+      role: 'user',
+      text,
+      timestamp: record.timestamp,
+      seedFirstUserPrompt: !isMetaUserTurn
+    })
+    if (text && !isMetaUserTurn) {
+      state.firstUserTitle ??= text
+    }
+    return
+  }
+  if (role === 'assistant') {
+    addPreviewMessage(accumulator, { role: 'assistant', text, timestamp: record.timestamp })
+    const model = extractString(asRecord(record.providerData)?.model)
+    if (model) {
+      accumulator.model = model
+    }
+  }
+}
+
+export function finalizeCodebuddySessionParseState(
+  state: CodebuddySessionParseState,
+  platform: NodeJS.Platform,
+  options: ParserSessionOptions = {}
+): AiVaultSession | null {
+  // Finalize a snapshot: the live state (and its preview array) may keep
+  // accumulating appended lines after this session object is handed out.
+  const snapshot = cloneCodebuddySessionParseState(state)
+  // Why: the CLI's summary title wins via accumulator.title; the generated
+  // ai-title should outrank the raw first prompt when present.
+  snapshot.accumulator.fallbackTitle = snapshot.aiTitle ?? snapshot.firstUserTitle
+  return finalizeSession(snapshot.accumulator, platform, options)
+}
+
+function codebuddyResumeStateFromParseState(
+  state: CodebuddySessionParseState
+): ResumableSessionParseState {
+  return {
+    consumeLine: (line) => consumeCodebuddySessionLine(state, line),
+    identity: () => accumulatorSessionIdentity(state.accumulator),
+    clone: () => codebuddyResumeStateFromParseState(cloneCodebuddySessionParseState(state)),
+    touchFile: (file) => {
+      state.accumulator.modifiedAt = file.modifiedAt
+    },
+    finalize: (platform, options) => finalizeCodebuddySessionParseState(state, platform, options)
+  }
+}
+
+export function createCodebuddySessionResumeState(
+  file: FileWithMtime,
+  messages?: TranscriptMessageSink
+): ResumableSessionParseState {
+  return codebuddyResumeStateFromParseState(createCodebuddySessionParseState(file, messages))
+}
+
+export async function parseCodebuddySessionFile(
+  file: FileWithMtime,
+  platform: NodeJS.Platform = process.platform,
+  messages?: TranscriptMessageSink
+): Promise<AiVaultSession | null> {
+  const lines = createInterface({
+    input: openTranscriptReadStream(file.path, { encoding: 'utf-8' }, 'scan'),
+    crlfDelay: Infinity
+  })
+  return parseCodebuddySessionLines({ file, lines, platform, messages })
+}
+
+export async function parseCodebuddySessionContent(
+  file: FileWithMtime,
+  content: RemoteSessionContent,
+  platform: NodeJS.Platform = process.platform,
+  options: ParserSessionOptions = {},
+  signal?: AbortSignal
+): Promise<AiVaultSession | null> {
+  return parseCodebuddySessionLines({
+    file,
+    lines: remoteSessionContentLines(content, signal),
+    platform,
+    options
+  })
+}
+
+async function parseCodebuddySessionLines(args: {
+  file: FileWithMtime
+  lines: AsyncIterable<string> | Iterable<string>
+  platform: NodeJS.Platform
+  options?: ParserSessionOptions
+  messages?: TranscriptMessageSink
+}): Promise<AiVaultSession | null> {
+  const state = createCodebuddySessionParseState(args.file, args.messages)
+  for await (const line of args.lines) {
+    consumeCodebuddySessionLine(state, line)
+  }
+  return finalizeCodebuddySessionParseState(state, args.platform, args.options)
+}
diff --git a/src/main/ai-vault/session-scanner-codebuddy-scope.test.ts b/src/main/ai-vault/session-scanner-codebuddy-scope.test.ts
new file mode 100644
index 000000000000..9086ab1e8118
--- /dev/null
+++ b/src/main/ai-vault/session-scanner-codebuddy-scope.test.ts
@@ -0,0 +1,135 @@
+import { mkdtemp, mkdir, rm, utimes, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import { scanAiVaultSessions } from './session-scanner'
+import { resetProjectDirCwdCacheForTests } from './session-scanner-scope-discovery'
+import { isolatedScanRoots, jsonLines } from './session-scanner-test-fixtures'
+
+let tempRoots: string[] = []
+
+afterEach(async () => {
+  await Promise.all(tempRoots.map((root) => rm(root, { recursive: true, force: true })))
+  tempRoots = []
+  resetProjectDirCwdCacheForTests()
+})
+
+function codebuddySessionDirName(cwd: string): string {
+  return cwd
+    .replace(/[/\\:]+/g, '-')
+    .replace(/-+/g, '-')
+    .replace(/^-|-$/g, '')
+}
+
+async function writeCodeBuddySession(args: {
+  sessionsDir: string
+  cwd: string
+  id: string
+  timestamp: string
+}): Promise<void> {
+  const dir = join(args.sessionsDir, codebuddySessionDirName(args.cwd))
+  await mkdir(dir, { recursive: true })
+  const file = join(dir, `${args.id}.jsonl`)
+  await writeFile(
+    file,
+    jsonLines([
+      {
+        type: 'message',
+        timestamp: args.timestamp,
+        sessionId: args.id,
+        cwd: args.cwd,
+        role: 'user',
+        content: [{ type: 'input_text', text: `prompt ${args.id}` }]
+      }
+    ])
+  )
+  const time = new Date(args.timestamp)
+  await utimes(file, time, time)
+}
+
+describe('scanAiVaultSessions — CodeBuddy scope discovery', () => {
+  it('lists an older in-scope CodeBuddy session the recency cap would drop', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-ai-vault-codebuddy-scope-'))
+    tempRoots.push(root)
+    const roots = isolatedScanRoots(root)
+    const workspace = '/home/ada/orca/workspaces/orca/feature'
+
+    await writeCodeBuddySession({
+      sessionsDir: roots.codebuddyProjectsDir,
+      cwd: `${workspace}/packages/app`,
+      id: 'old-in-scope',
+      timestamp: '2026-05-01T10:00:00.000Z'
+    })
+    // Newer, out of scope, and a sibling whose encoding shares the workspace prefix.
+    await writeCodeBuddySession({
+      sessionsDir: roots.codebuddyProjectsDir,
+      cwd: '/home/ada/other',
+      id: 'recent-elsewhere',
+      timestamp: '2026-06-01T10:00:00.000Z'
+    })
+    await writeCodeBuddySession({
+      sessionsDir: roots.codebuddyProjectsDir,
+      cwd: `${workspace}-sibling`,
+      id: 'sibling',
+      timestamp: '2026-04-01T10:00:00.000Z'
+    })
+
+    const result = await scanAiVaultSessions({
+      ...roots,
+      platform: 'linux',
+      limit: 1,
+      scopePaths: [workspace]
+    })
+    const ids = result.sessions.map((session) => session.sessionId)
+
+    expect(ids).toContain('old-in-scope')
+    expect(ids).toContain('recent-elsewhere')
+    expect(ids).not.toContain('sibling')
+    expect(result.sessions.find((session) => session.sessionId === 'old-in-scope')?.agent).toBe(
+      'codebuddy'
+    )
+  })
+
+  it('finds an older session when another cwd shares its encoded bucket', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-codebuddy-collision-'))
+    tempRoots.push(root)
+    const roots = isolatedScanRoots(root)
+    for (const [cwd, id, timestamp] of [
+      ['/home/ada/repo/app', 'in-scope', '2026-04-01T10:00:00.000Z'],
+      ['/home/ada/repo-app', 'collision', '2026-05-01T10:00:00.000Z'],
+      ['/home/ada/elsewhere', 'recent', '2026-06-01T10:00:00.000Z']
+    ]) {
+      await writeCodeBuddySession({ sessionsDir: roots.codebuddyProjectsDir, cwd, id, timestamp })
+    }
+    const result = await scanAiVaultSessions({
+      ...roots,
+      platform: 'linux',
+      limit: 1,
+      scopePaths: ['/home/ada/repo/app']
+    })
+    expect(result.sessions.map((session) => session.sessionId)).toContain('in-scope')
+    expect(result.sessions.map((session) => session.sessionId)).not.toContain('collision')
+  })
+
+  it('adds nothing when no scope is requested', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-ai-vault-codebuddy-noscope-'))
+    tempRoots.push(root)
+    const roots = isolatedScanRoots(root)
+    await writeCodeBuddySession({
+      sessionsDir: roots.codebuddyProjectsDir,
+      cwd: '/home/ada/old',
+      id: 'old',
+      timestamp: '2026-05-01T10:00:00.000Z'
+    })
+    await writeCodeBuddySession({
+      sessionsDir: roots.codebuddyProjectsDir,
+      cwd: '/home/ada/new',
+      id: 'new',
+      timestamp: '2026-06-01T10:00:00.000Z'
+    })
+
+    const result = await scanAiVaultSessions({ ...roots, platform: 'linux', limit: 1 })
+
+    expect(result.sessions.map((session) => session.sessionId)).toEqual(['new'])
+  })
+})
diff --git a/src/main/ai-vault/session-scanner-codebuddy-source.test.ts b/src/main/ai-vault/session-scanner-codebuddy-source.test.ts
new file mode 100644
index 000000000000..a171ac6d6716
--- /dev/null
+++ b/src/main/ai-vault/session-scanner-codebuddy-source.test.ts
@@ -0,0 +1,80 @@
+import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import { scanAiVaultSessions } from './session-scanner'
+import { isolatedScanRoots, jsonLines } from './session-scanner-test-fixtures'
+
+let tempRoots: string[] = []
+
+afterEach(async () => {
+  await Promise.all(tempRoots.map((root) => rm(root, { recursive: true, force: true })))
+  tempRoots = []
+})
+
+describe('scanAiVaultSessions — CodeBuddy transcripts', () => {
+  it('discovers ~/.codebuddy/projects transcripts and attributes them to codebuddy', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-ai-vault-codebuddy-'))
+    tempRoots.push(root)
+    const roots = isolatedScanRoots(root)
+    await mkdir(join(roots.codebuddyProjectsDir, 'project'), { recursive: true })
+
+    await writeFile(
+      join(roots.codebuddyProjectsDir, 'project', 'codebuddy-session.jsonl'),
+      jsonLines([
+        {
+          id: 'cb-msg-1',
+          timestamp: 1_777_634_400_000,
+          type: 'message',
+          role: 'user',
+          content: [{ type: 'input_text', text: 'fix the flaky test' }],
+          sessionId: 'codebuddy-session',
+          cwd: '/repo/app'
+        },
+        {
+          id: 'cb-msg-2',
+          timestamp: 1_777_634_405_000,
+          type: 'message',
+          role: 'assistant',
+          status: 'completed',
+          content: [{ type: 'output_text', text: 'On it' }],
+          providerData: { model: 'glm-5.3-flash' },
+          sessionId: 'codebuddy-session',
+          cwd: '/repo/app'
+        },
+        {
+          id: 'cb-title-1',
+          timestamp: 1_777_634_406_000,
+          type: 'ai-title',
+          aiTitle: 'Fixing the flaky test',
+          sessionId: 'codebuddy-session',
+          cwd: '/repo/app'
+        },
+        {
+          id: 'cb-summary-1',
+          timestamp: 1_777_634_407_000,
+          type: 'summary',
+          summary: 'Fix the flaky test',
+          providerData: { source: 'initial-user-message' }
+        }
+      ])
+    )
+
+    const result = await scanAiVaultSessions({ ...roots, platform: 'darwin' })
+
+    const codebuddy = result.sessions.find((session) => session.agent === 'codebuddy')
+    expect(codebuddy).toMatchObject({
+      sessionId: 'codebuddy-session',
+      cwd: '/repo/app',
+      title: 'Fix the flaky test',
+      model: 'glm-5.3-flash',
+      resumeCommand: "cd '/repo/app' && codebuddy --resume 'codebuddy-session'",
+      filePath: join(roots.codebuddyProjectsDir, 'project', 'codebuddy-session.jsonl')
+    })
+    expect(codebuddy?.messageCount).toBe(2)
+    expect(codebuddy?.previewMessages.map((message) => message.text)).toEqual([
+      'fix the flaky test',
+      'On it'
+    ])
+  })
+})
diff --git a/src/main/ai-vault/session-scanner-codex-workers.test.ts b/src/main/ai-vault/session-scanner-codex-workers.test.ts
index 79271cbf39eb..4d001d00422c 100644
--- a/src/main/ai-vault/session-scanner-codex-workers.test.ts
+++ b/src/main/ai-vault/session-scanner-codex-workers.test.ts
@@ -219,6 +219,7 @@ describe('scanAiVaultSessions Codex worker sessions', () => {
       droidProjectsDir: join(root, 'droid-projects'),
       kimiSessionsDir: join(root, 'kimi-sessions'),
       museSessionsDir: join(root, 'muse-sessions'),
+      zcodeDbPath: join(root, 'zcode-db.sqlite'),
       platform: 'darwin'
     })
 
diff --git a/src/main/ai-vault/session-scanner-every-agent-fixture.ts b/src/main/ai-vault/session-scanner-every-agent-fixture.ts
index 5ae04c11b570..23caa8e348d5 100644
--- a/src/main/ai-vault/session-scanner-every-agent-fixture.ts
+++ b/src/main/ai-vault/session-scanner-every-agent-fixture.ts
@@ -5,6 +5,7 @@ import {
 } from './session-scanner-test-fixtures'
 import { writeDocumentAgentFixtures } from './session-scanner-document-agent-fixtures'
 import { writeLogAgentFixtures } from './session-scanner-log-agent-fixtures'
+import { writeOpenCodeSqliteDatabase } from './session-scanner-opencode-sqlite-fixture'
 
 // Why this is shared rather than inline in one test: it is the only place that
 // writes one transcript in every supported agent's own format. A scan test and
@@ -34,5 +35,13 @@ export async function writeEveryAgentVault(root: string): Promise<EveryAgentVaul
   await writeDocumentAgentFixtures(root, roots, antigravitySessionId)
   await writeMuseScannerFixture(roots.museSessionsDir)
   roots.opencodeDbPaths = [await writeOpenCode2SqliteFixture(root)]
+  writeOpenCodeSqliteDatabase(roots.zcodeDbPath, [
+    {
+      id: 'zcode-session',
+      directory: '/tmp/zcode',
+      title: 'ZCode title',
+      turns: [{ role: 'user', parts: ['ZCode session prompt'] }]
+    }
+  ])
   return { roots, antigravitySessionId, ompSessionFile, primeAgentSessionFile }
 }
diff --git a/src/main/ai-vault/session-scanner-log-agent-fixtures.ts b/src/main/ai-vault/session-scanner-log-agent-fixtures.ts
index ed2cf8d2eee7..be080271269c 100644
--- a/src/main/ai-vault/session-scanner-log-agent-fixtures.ts
+++ b/src/main/ai-vault/session-scanner-log-agent-fixtures.ts
@@ -32,6 +32,23 @@ export async function writeLogAgentFixtures(
     ])
   )
 
+  // CodeBuddy writes its own message-record shape under its own root.
+  await mkdir(join(roots.codebuddyProjectsDir, 'project'), { recursive: true })
+  await writeFile(
+    join(roots.codebuddyProjectsDir, 'project', 'codebuddy-session.jsonl'),
+    jsonlBody([
+      {
+        id: 'codebuddy-msg-1',
+        timestamp: 1_777_634_430_000,
+        type: 'message',
+        role: 'user',
+        content: [{ type: 'input_text', text: 'CodeBuddy title' }],
+        sessionId: 'codebuddy-session',
+        cwd: '/tmp/codebuddy'
+      }
+    ])
+  )
+
   await mkdir(join(roots.codexSessionsDir, '2026', '05', '01'), { recursive: true })
   await writeFile(
     join(roots.codexSessionsDir, '2026', '05', '01', 'rollout-2026-codex-session.jsonl'),
diff --git a/src/main/ai-vault/session-scanner-opencode-sqlite-capture.ts b/src/main/ai-vault/session-scanner-opencode-sqlite-capture.ts
index f4622118956e..ef15b368ef34 100644
--- a/src/main/ai-vault/session-scanner-opencode-sqlite-capture.ts
+++ b/src/main/ai-vault/session-scanner-opencode-sqlite-capture.ts
@@ -10,6 +10,7 @@ import { readOpenCodeDatabase } from './session-scanner-opencode-sqlite-open'
 import { canReadOpenCodeMessageParts } from './session-scanner-opencode-sqlite-schema'
 import type { TranscriptMessage, TranscriptMessageRole } from './session-transcript-consumers'
 import { boundedText, toolCallText } from './session-transcript-message-content'
+import { zcodeVisibleMessageFilter } from './session-scanner-zcode-visibility'
 import type SyncDatabase from '../sqlite/sync-database'
 
 // Why: the session list needs the newest few messages, and the search index
@@ -119,7 +120,7 @@ function captureRole(role: string | null): TranscriptMessageRole | null {
   return role === 'user' || role === 'assistant' ? role : null
 }
 
-function buildCaptureQuery(): string {
+function buildCaptureQuery(agent: 'opencode' | 'zcode'): string {
   // Message order, then part order within a message: the same key the preview
   // read uses, run forwards and without the newest-N window.
   return `SELECT m.id AS message_id,
@@ -130,6 +131,7 @@ function buildCaptureQuery(): string {
           FROM message m
           JOIN part p ON p.message_id = m.id
           WHERE m.session_id = ?
+            ${zcodeVisibleMessageFilter(agent)}
             AND json_extract(m.data, '$.role') IN ('user','assistant')
             AND json_extract(p.data, '$.type') IN ${OPENCODE_CAPTURE_PART_TYPES}
           ORDER BY m.time_created ASC, m.id ASC, p.time_created ASC, p.rowid ASC
@@ -149,20 +151,24 @@ function buildCaptureQuery(): string {
  */
 export function readOpenCodeSessionMessages(
   db: SyncDatabase,
-  sessionId: string
+  sessionId: string,
+  agent: 'opencode' | 'zcode' = 'opencode'
 ): TranscriptMessage[] {
+  const agentName = agent === 'zcode' ? 'ZCode' : 'OpenCode'
   if (!canReadOpenCodeMessageParts(db)) {
     // Thrown for the same reason the part limit below throws: an empty capture
     // returned here is committed under a complete-read cursor, so the session
     // stays out of search with nothing on its row to say why and no retry.
     throw new Error(
-      `OpenCode session ${sessionId} uses an unreadable message-part schema; its transcript was not read.`
+      `${agentName} session ${sessionId} uses an unreadable message-part schema; its transcript was not read.`
     )
   }
-  const rows = db.prepare(buildCaptureQuery()).all(sessionId, OPENCODE_CAPTURE_RECORD_LIMIT + 1)
+  const rows = db
+    .prepare(buildCaptureQuery(agent))
+    .all(sessionId, OPENCODE_CAPTURE_RECORD_LIMIT + 1)
   if (rows.length > OPENCODE_CAPTURE_RECORD_LIMIT) {
     throw new Error(
-      `OpenCode session ${sessionId} holds more than ${OPENCODE_CAPTURE_RECORD_LIMIT} text parts; its transcript was not read.`
+      `${agentName} session ${sessionId} holds more than ${OPENCODE_CAPTURE_RECORD_LIMIT} text parts; its transcript was not read.`
     )
   }
 
@@ -178,7 +184,7 @@ export function readOpenCodeSessionMessages(
     captured += message.text.length
     if (captured > OPENCODE_CAPTURE_TEXT_LIMIT) {
       throw new Error(
-        `OpenCode session ${sessionId} decodes to more than ${OPENCODE_CAPTURE_TEXT_LIMIT} characters; its transcript was not read.`
+        `${agentName} session ${sessionId} decodes to more than ${OPENCODE_CAPTURE_TEXT_LIMIT} characters; its transcript was not read.`
       )
     }
     messages.push(message)
@@ -237,13 +243,17 @@ export async function captureOpenCodeSqliteSession(args: {
   dbPath: string
   sessionId: string
   platform: NodeJS.Platform
+  agent?: 'opencode' | 'zcode'
 }): Promise<OpenCodeSqliteCapture> {
   return readOpenCodeDatabase({
     dbPath: args.dbPath,
     read: (db) => {
       const session = readOpenCodeSqliteSession({ db, ...args })
       // No session row is no transcript: the id names nothing in this database.
-      return { session, messages: session ? readOpenCodeSessionMessages(db, args.sessionId) : [] }
+      return {
+        session,
+        messages: session ? readOpenCodeSessionMessages(db, args.sessionId, args.agent) : []
+      }
     }
   })
 }
diff --git a/src/main/ai-vault/session-scanner-opencode-sqlite-coexistence.test.ts b/src/main/ai-vault/session-scanner-opencode-sqlite-coexistence.test.ts
index ff51677d27f0..e2fbcb225129 100644
--- a/src/main/ai-vault/session-scanner-opencode-sqlite-coexistence.test.ts
+++ b/src/main/ai-vault/session-scanner-opencode-sqlite-coexistence.test.ts
@@ -17,6 +17,9 @@ vi.mock('./session-scanner-opencode-sqlite-worker-spawn', async () => {
   return {
     listOpenCode2SqliteSessionsViaWorker: listOpenCode2SqliteSessions,
     listOpenCodeSqliteSessionsViaWorker: listOpenCodeSqliteSessions,
+    // ZCode reuses the OpenCode SQLite lister; the worker only varies the agent it stamps.
+    listZcodeSqliteSessionsViaWorker: (args: Parameters<typeof listOpenCodeSqliteSessions>[0]) =>
+      listOpenCodeSqliteSessions({ ...args, agent: 'zcode' }),
     parseOpenCodeSqliteSessionViaWorker: parseOpenCodeSqliteSession
   }
 })
@@ -54,6 +57,7 @@ function isolatedScanRoots(root: string) {
     droidProjectsDir: join(root, 'droid-projects'),
     kimiSessionsDir: join(root, 'kimi-sessions'),
     museSessionsDir: join(root, 'muse-sessions'),
+    zcodeDbPath: join(root, 'zcode-db.sqlite'),
     ompSessionsDir: join(root, 'omp-sessions'),
     primeAgentSessionsDir: join(root, 'prime-agent-sessions')
   }
diff --git a/src/main/ai-vault/session-scanner-opencode-sqlite-dispatch.ts b/src/main/ai-vault/session-scanner-opencode-sqlite-dispatch.ts
index 7632aa070c04..e483f9482e11 100644
--- a/src/main/ai-vault/session-scanner-opencode-sqlite-dispatch.ts
+++ b/src/main/ai-vault/session-scanner-opencode-sqlite-dispatch.ts
@@ -30,7 +30,8 @@ export async function handleOpenCodeSqliteRequest(
           : await listOpenCodeSqliteSessions({
               dbPaths: request.dbPaths,
               limit: request.limit ?? Infinity,
-              issues
+              issues,
+              agent: request.agent === 'zcode' ? 'zcode' : 'opencode'
             })
       return { id: request.id, ok: true, value: { candidates, issues } }
     }
@@ -38,7 +39,10 @@ export async function handleOpenCodeSqliteRequest(
       const capture =
         request.agent === 'opencode2'
           ? await captureOpenCode2SqliteSession(request)
-          : await captureOpenCodeSqliteSession(request)
+          : await captureOpenCodeSqliteSession({
+              ...request,
+              agent: request.agent === 'zcode' ? 'zcode' : 'opencode'
+            })
       return { id: request.id, ok: true, value: capture }
     }
     const parse = async () =>
@@ -51,7 +55,8 @@ export async function handleOpenCodeSqliteRequest(
         : await parseOpenCodeSqliteSession({
             dbPath: request.dbPath,
             sessionId: request.sessionId,
-            platform: request.platform
+            platform: request.platform,
+            agent: request.agent === 'zcode' ? 'zcode' : 'opencode'
           })
     const session = request.fullFirstUserPrompt
       ? await withFullFirstUserPromptCapture(parse)
diff --git a/src/main/ai-vault/session-scanner-opencode-sqlite-list.ts b/src/main/ai-vault/session-scanner-opencode-sqlite-list.ts
index 93f9daab98cf..7e739ba22381 100644
--- a/src/main/ai-vault/session-scanner-opencode-sqlite-list.ts
+++ b/src/main/ai-vault/session-scanner-opencode-sqlite-list.ts
@@ -1,4 +1,4 @@
-import type { AiVaultAgent, AiVaultScanIssue } from '../../shared/ai-vault-types'
+import type { AiVaultScanIssue } from '../../shared/ai-vault-types'
 import {
   buildOpenCodeSqliteCandidatePath,
   splitOpenCodeSqliteCandidate
@@ -54,13 +54,17 @@ function readSessionRows(db: SyncDatabase, limit: number): SessionRow[] {
   return (limited ? statement.all(limit) : statement.all()) as SessionRow[]
 }
 
-function rowToCandidate(row: SessionRow, dbPath: string): SessionFileCandidate {
+function rowToCandidate(
+  row: SessionRow,
+  dbPath: string,
+  agent: 'opencode' | 'zcode'
+): SessionFileCandidate {
   const mtimeMs =
     typeof row.time_updated === 'number' && row.time_updated > 0
       ? row.time_updated
       : row.time_created
   return {
-    agent: 'opencode' as AiVaultAgent,
+    agent,
     file: {
       path: buildOpenCodeSqliteCandidatePath(dbPath, row.id),
       mtimeMs,
@@ -70,10 +74,13 @@ function rowToCandidate(row: SessionRow, dbPath: string): SessionFileCandidate {
   }
 }
 
-function dedupeAndSortSqliteCandidates(candidates: SessionFileCandidate[]): SessionFileCandidate[] {
+function dedupeAndSortSqliteCandidates(
+  candidates: SessionFileCandidate[],
+  agent: 'opencode' | 'zcode'
+): SessionFileCandidate[] {
   const candidatesBySessionId = new Map<string, SessionFileCandidate>()
   for (const candidate of candidates) {
-    const parsed = splitOpenCodeSqliteCandidate(candidate.file.path)
+    const parsed = splitOpenCodeSqliteCandidate(candidate.file.path, agent)
     if (!parsed) {
       continue
     }
@@ -102,8 +109,10 @@ export async function listOpenCodeSqliteSessions(args: {
   dbPaths: readonly string[]
   limit: number
   issues: AiVaultScanIssue[]
+  agent?: 'opencode' | 'zcode'
 }): Promise<SessionFileCandidate[]> {
   const candidates: SessionFileCandidate[] = []
+  const agent = args.agent ?? 'opencode'
   for (const dbPath of args.dbPaths) {
     try {
       const rows = readOpenCodeDatabase({
@@ -111,12 +120,12 @@ export async function listOpenCodeSqliteSessions(args: {
         read: (db) => readSessionRows(db, args.limit)
       })
       for (const row of rows) {
-        candidates.push(rowToCandidate(row, dbPath))
+        candidates.push(rowToCandidate(row, dbPath, agent))
       }
     } catch (err) {
       // A whole DB failed, not one transcript: kinded so the panel says so.
-      args.issues.push(openCodeDatabaseScanIssue(dbPath, err))
+      args.issues.push(openCodeDatabaseScanIssue(dbPath, err, agent))
     }
   }
-  return dedupeAndSortSqliteCandidates(candidates)
+  return dedupeAndSortSqliteCandidates(candidates, agent)
 }
diff --git a/src/main/ai-vault/session-scanner-opencode-sqlite-open.ts b/src/main/ai-vault/session-scanner-opencode-sqlite-open.ts
index 43e32da2ff5e..32f807cb1d9f 100644
--- a/src/main/ai-vault/session-scanner-opencode-sqlite-open.ts
+++ b/src/main/ai-vault/session-scanner-opencode-sqlite-open.ts
@@ -82,8 +82,13 @@ export function readOpenCodeDatabase<T>(args: {
  * @param error - The thrown value from the read.
  * @returns A kinded scan issue with actionable copy.
  */
-export function openCodeDatabaseScanIssue(dbPath: string, error: unknown): AiVaultScanIssue {
+export function openCodeDatabaseScanIssue(
+  dbPath: string,
+  error: unknown,
+  agent: 'opencode' | 'zcode' = 'opencode'
+): AiVaultScanIssue {
   const name = basename(dbPath)
+  const label = agent === 'zcode' ? 'ZCode' : 'OpenCode'
   // `fileMustExist` already proved the database file is there before SQLite ran,
   // so this needs no fs probe of its own — an extra sync stat on a 9p share is
   // exactly the hang the WSL transcript gate exists to prevent.
@@ -96,18 +101,18 @@ export function openCodeDatabaseScanIssue(dbPath: string, error: unknown): AiVau
   const overWslShare = isWslUncPath(dbPath)
   const detail =
     kind === 'contended' && !overWslShare
-      ? `OpenCode is writing to ${name} right now, so its history was skipped. It is read again on the next refresh.`
+      ? `${label} is writing to ${name} right now, so its history was skipped. It is read again on the next refresh.`
       : kind === 'unreadable'
-        ? `OpenCode history in ${name} could not be read: ${errorMessage(error)}`
-        : unreadableShareDetail(dbPath, name)
-  return { agent: 'opencode', kind: 'scope', path: dbPath, message: detail }
+        ? `${label} history in ${name} could not be read: ${errorMessage(error)}`
+        : unreadableShareDetail(dbPath, name, label)
+  return { agent, kind: 'scope', path: dbPath, message: detail }
 }
 
-function unreadableShareDetail(dbPath: string, name: string): string {
+function unreadableShareDetail(dbPath: string, name: string, label: string): string {
   // A known limitation, not a failure the user can act on: nothing they do on
   // the Windows side makes the share hand out SQLite's locks. Deliberately not
   // "flush the write-ahead log" either — checkpointing changes nothing here.
   return isWslUncPath(dbPath)
-    ? "OpenCode sessions inside WSL can't be searched from Windows yet."
-    : `OpenCode history in ${name} could not be read. Its write-ahead log cannot be opened read-only on this filesystem. Exit OpenCode cleanly to flush the log.`
+    ? `${label} sessions inside WSL can't be searched from Windows yet.`
+    : `${label} history in ${name} could not be read. Its write-ahead log cannot be opened read-only on this filesystem. Exit ${label} cleanly to flush the log.`
 }
diff --git a/src/main/ai-vault/session-scanner-opencode-sqlite-paths.ts b/src/main/ai-vault/session-scanner-opencode-sqlite-paths.ts
index 7f0a61a674a5..77c0e464154b 100644
--- a/src/main/ai-vault/session-scanner-opencode-sqlite-paths.ts
+++ b/src/main/ai-vault/session-scanner-opencode-sqlite-paths.ts
@@ -26,7 +26,8 @@ export function buildOpenCodeSqliteCandidatePath(dbPath: string, sessionId: stri
  * @returns `{ dbPath, sessionId }` if the path is a valid synthetic candidate, `null` otherwise.
  */
 export function splitOpenCodeSqliteCandidate(
-  candidatePath: string
+  candidatePath: string,
+  agent: 'opencode' | 'opencode2' | 'zcode' = 'opencode'
 ): { dbPath: string; sessionId: string } | null {
   const separatorIndex = candidatePath.lastIndexOf(OPENCODE_SQLITE_PATH_SEPARATOR)
   if (separatorIndex <= 0 || separatorIndex === candidatePath.length - 1) {
@@ -39,7 +40,11 @@ export function splitOpenCodeSqliteCandidate(
   }
   // Why: OpenCode DB files are named opencode*.db; reject anything else so we
   // never misroute a real filesystem path that happens to contain '#'.
-  if (!/^opencode(?:-[A-Za-z0-9_.-]+)?\.db$/i.test(basename(dbPath))) {
+  const validName =
+    agent === 'zcode'
+      ? basename(dbPath).toLowerCase() === 'db.sqlite'
+      : /^opencode(?:-[A-Za-z0-9_.-]+)?\.db$/i.test(basename(dbPath))
+  if (!validName) {
     return null
   }
   return { dbPath, sessionId }
diff --git a/src/main/ai-vault/session-scanner-opencode-sqlite-process-entry.ts b/src/main/ai-vault/session-scanner-opencode-sqlite-process-entry.ts
index 9c197b1ecea7..e53d89eeeaba 100644
--- a/src/main/ai-vault/session-scanner-opencode-sqlite-process-entry.ts
+++ b/src/main/ai-vault/session-scanner-opencode-sqlite-process-entry.ts
@@ -16,7 +16,7 @@ function validRequest(value: unknown): value is OpenCodeSqliteWorkerRequest {
     !('id' in value) ||
     !Number.isSafeInteger(value.id) ||
     !('kind' in value) ||
-    ('agent' in value && value.agent !== 'opencode2') ||
+    ('agent' in value && value.agent !== 'opencode2' && value.agent !== 'zcode') ||
     ('timeoutMs' in value &&
       (typeof value.timeoutMs !== 'number' ||
         !Number.isFinite(value.timeoutMs) ||
diff --git a/src/main/ai-vault/session-scanner-opencode-sqlite-rows.ts b/src/main/ai-vault/session-scanner-opencode-sqlite-rows.ts
new file mode 100644
index 000000000000..6d72cc4f64e1
--- /dev/null
+++ b/src/main/ai-vault/session-scanner-opencode-sqlite-rows.ts
@@ -0,0 +1,48 @@
+import type { SqliteRow } from '../sqlite/sqlite-statement'
+import type { SQLOutputValue } from 'node:sqlite'
+
+type SessionRow = {
+  id: string
+  title: string | null
+  directory: string | null
+  time_created: number
+  time_updated: number
+  model_json: string | null
+  agent: string | null
+  tokens_input: number
+  tokens_output: number
+  tokens_reasoning: number
+  tokens_cache_read: number
+  cost: number
+  message_count: number
+}
+
+// Why guards and not casts: `SqliteStatement` hands back `Record<string, SQLOutputValue>`,
+// so the column types are only a claim about the query until something checks them. A row
+// from a schema that drifted, or from a database another tool wrote, reaches here too.
+export function readPartDataRow(row: SqliteRow): { part_data: string } | null {
+  return typeof row.part_data === 'string' ? { part_data: row.part_data } : null
+}
+
+export function readSessionRow(row: SqliteRow | undefined): SessionRow | null {
+  if (!row || typeof row.id !== 'string') {
+    return null
+  }
+  const text = (value: SQLOutputValue): string | null => (typeof value === 'string' ? value : null)
+  const count = (value: SQLOutputValue): number => (typeof value === 'number' ? value : 0)
+  return {
+    id: row.id,
+    title: text(row.title),
+    directory: text(row.directory),
+    time_created: count(row.time_created),
+    time_updated: count(row.time_updated),
+    model_json: text(row.model_json),
+    agent: text(row.agent),
+    tokens_input: count(row.tokens_input),
+    tokens_output: count(row.tokens_output),
+    tokens_reasoning: count(row.tokens_reasoning),
+    tokens_cache_read: count(row.tokens_cache_read),
+    cost: count(row.cost),
+    message_count: count(row.message_count)
+  }
+}
diff --git a/src/main/ai-vault/session-scanner-opencode-sqlite-worker-client.ts b/src/main/ai-vault/session-scanner-opencode-sqlite-worker-client.ts
index 498bb9a65f5e..c5f96c030e3b 100644
--- a/src/main/ai-vault/session-scanner-opencode-sqlite-worker-client.ts
+++ b/src/main/ai-vault/session-scanner-opencode-sqlite-worker-client.ts
@@ -98,7 +98,7 @@ export class OpenCodeSqliteWorkerClient {
     dbPaths: readonly string[]
     limit: number
     issues: AiVaultScanIssue[]
-    agent?: 'opencode2'
+    agent?: 'opencode2' | 'zcode'
     signal?: AbortSignal
   }): Promise<SessionFileCandidate[]> {
     if (args.dbPaths.length === 0) {
@@ -161,7 +161,7 @@ export class OpenCodeSqliteWorkerClient {
     dbPath: string
     sessionId: string
     platform: NodeJS.Platform
-    agent?: 'opencode2'
+    agent?: 'opencode2' | 'zcode'
     signal?: AbortSignal
   }): Promise<AiVaultSession | null> {
     try {
@@ -201,7 +201,7 @@ export class OpenCodeSqliteWorkerClient {
     dbPath: string
     sessionId: string
     platform: NodeJS.Platform
-    agent?: 'opencode2'
+    agent?: 'opencode2' | 'zcode'
     signal?: AbortSignal
   }): Promise<OpenCodeSqliteCaptureValue> {
     try {
diff --git a/src/main/ai-vault/session-scanner-opencode-sqlite-worker-protocol.ts b/src/main/ai-vault/session-scanner-opencode-sqlite-worker-protocol.ts
index d44bd62c11ab..9c8e42a5c7f4 100644
--- a/src/main/ai-vault/session-scanner-opencode-sqlite-worker-protocol.ts
+++ b/src/main/ai-vault/session-scanner-opencode-sqlite-worker-protocol.ts
@@ -12,7 +12,7 @@ export type OpenCodeSqliteListRequest = {
   dbPaths: readonly string[]
   limit: number | null
   /** When 'opencode2', lists from the v2 channel-scoped DB schema (session_v2). */
-  agent?: 'opencode2'
+  agent?: 'opencode2' | 'zcode'
 }
 
 export type OpenCodeSqliteParseRequest = {
@@ -23,7 +23,7 @@ export type OpenCodeSqliteParseRequest = {
   sessionId: string
   platform: NodeJS.Platform
   /** When 'opencode2', parses from the v2 channel-scoped DB schema (session_v2). */
-  agent?: 'opencode2'
+  agent?: 'opencode2' | 'zcode'
 }
 
 // Same arguments as `parse`, different answer: the session plus every message
@@ -36,7 +36,7 @@ export type OpenCodeSqliteCaptureRequest = {
   sessionId: string
   platform: NodeJS.Platform
   /** When 'opencode2', captures from the v2 channel-scoped schema. */
-  agent?: 'opencode2'
+  agent?: 'opencode2' | 'zcode'
 }
 
 export type OpenCodeSqliteWorkerRequest = (
diff --git a/src/main/ai-vault/session-scanner-opencode-sqlite-worker-spawn.ts b/src/main/ai-vault/session-scanner-opencode-sqlite-worker-spawn.ts
index 1b3b1faf7ce7..68b1bacf6981 100644
--- a/src/main/ai-vault/session-scanner-opencode-sqlite-worker-spawn.ts
+++ b/src/main/ai-vault/session-scanner-opencode-sqlite-worker-spawn.ts
@@ -81,6 +81,15 @@ export function listOpenCode2SqliteSessionsViaWorker(args: {
   return listForHost({ ...args, agent: 'opencode2' })
 }
 
+export function listZcodeSqliteSessionsViaWorker(args: {
+  dbPaths: readonly string[]
+  limit: number
+  issues: AiVaultScanIssue[]
+  signal?: AbortSignal
+}): Promise<SessionFileCandidate[]> {
+  return listForHost({ ...args, agent: 'zcode' })
+}
+
 /**
  * Parse one OpenCode SQLite session through the shared worker client.
  * @param args.dbPath - Absolute path to the opencode.db file.
@@ -108,6 +117,16 @@ export function parseOpenCode2SqliteSessionViaWorker(args: {
   return parseForHost({ ...args, agent: 'opencode2' })
 }
 
+export function parseZcodeSqliteSessionViaWorker(args: {
+  fullFirstUserPrompt?: boolean
+  dbPath: string
+  sessionId: string
+  platform: NodeJS.Platform
+  signal?: AbortSignal
+}): Promise<AiVaultSession | null> {
+  return parseForHost({ ...args, agent: 'zcode' })
+}
+
 /**
  * Read one OpenCode SQLite session and its whole transcript through the shared
  * worker client.
@@ -134,6 +153,15 @@ export function captureOpenCode2SqliteSessionViaWorker(args: {
   return captureForHost({ ...args, agent: 'opencode2' })
 }
 
+export function captureZcodeSqliteSessionViaWorker(args: {
+  dbPath: string
+  sessionId: string
+  platform: NodeJS.Platform
+  signal?: AbortSignal
+}): Promise<OpenCodeSqliteCaptureValue> {
+  return captureForHost({ ...args, agent: 'zcode' })
+}
+
 async function listForHost(
   args: Parameters<OpenCodeSqliteWorkerClient['list']>[0]
 ): Promise<SessionFileCandidate[]> {
@@ -160,7 +188,7 @@ async function listForHost(
         const client = await openCodeWslClient(distro, first, args.signal)
         const result = await client.list({ ...args, dbPaths: [...paths.keys()], issues })
         return result.flatMap((candidate) => {
-          const parsed = splitOpenCodeSqliteCandidate(candidate.file.path)
+          const parsed = splitOpenCodeSqliteCandidate(candidate.file.path, args.agent)
           const original = parsed && paths.get(parsed.dbPath)
           return parsed && original
             ? [
diff --git a/src/main/ai-vault/session-scanner-opencode-sqlite.ts b/src/main/ai-vault/session-scanner-opencode-sqlite.ts
index 291a4ce0e884..4e3d8bc74b83 100644
--- a/src/main/ai-vault/session-scanner-opencode-sqlite.ts
+++ b/src/main/ai-vault/session-scanner-opencode-sqlite.ts
@@ -10,11 +10,13 @@ import {
   shouldCaptureFullFirstUserPrompt
 } from './session-scanner-first-user-prompt'
 import { readOpenCodeDatabase } from './session-scanner-opencode-sqlite-open'
+import { readPartDataRow, readSessionRow } from './session-scanner-opencode-sqlite-rows'
 import {
   canCountOpenCodeMessages,
   canReadOpenCodeMessageParts
 } from './session-scanner-opencode-sqlite-schema'
 import { normalizeTitleText } from './session-scanner-values'
+import { zcodeVisibleMessageFilter } from './session-scanner-zcode-visibility'
 import type SyncDatabase from '../sqlite/sync-database'
 import { columnExists, tableExists } from '../opencode-usage/schema-helpers'
 
@@ -34,22 +36,6 @@ const OPENCODE_SQLITE_PREVIEW_MESSAGE_WINDOW = 100
 // Bounds a pathological single message; a real typed prompt is a handful of parts.
 const FIRST_USER_PROMPT_PART_LIMIT = 512
 
-type SessionRow = {
-  id: string
-  title: string | null
-  directory: string | null
-  time_created: number
-  time_updated: number
-  model_json: string | null
-  agent: string | null
-  tokens_input: number
-  tokens_output: number
-  tokens_reasoning: number
-  tokens_cache_read: number
-  cost: number
-  message_count: number
-}
-
 type PreviewRow = {
   role: string | null
   part_data: string
@@ -74,10 +60,11 @@ function sessionNumberColumnSelect(db: SyncDatabase, columnName: string): string
   return columnExists(db, 'session', columnName) ? `s.${columnName}` : '0'
 }
 
-function buildSessionQuery(db: SyncDatabase): string {
+function buildSessionQuery(db: SyncDatabase, agent: 'opencode' | 'zcode'): string {
   const messageCountSubquery = canCountOpenCodeMessages(db)
     ? `(SELECT COUNT(*) FROM message m
         WHERE m.session_id = s.id
+          ${zcodeVisibleMessageFilter(agent)}
           AND json_extract(m.data, '$.role') IN ('user','assistant'))`
     : '0'
   return `SELECT s.id,
@@ -150,7 +137,11 @@ export function extractPartText(partData: string): string | null {
   }
 }
 
-function readFirstUserPromptFromOpenCodeDb(db: SyncDatabase, sessionId: string): string | null {
+function readFirstUserPromptFromOpenCodeDb(
+  db: SyncDatabase,
+  sessionId: string,
+  agent: 'opencode' | 'zcode'
+): string | null {
   if (!canReadOpenCodeMessageParts(db)) {
     return null
   }
@@ -168,6 +159,7 @@ function readFirstUserPromptFromOpenCodeDb(db: SyncDatabase, sessionId: string):
                  FROM message m
                  JOIN part fp ON fp.message_id = m.id
                  WHERE m.session_id = ?
+                   ${zcodeVisibleMessageFilter(agent)}
                    AND json_extract(m.data, '$.role') = 'user'
                    AND json_extract(fp.data, '$.type') = 'text'
                  ORDER BY m.time_created ASC, m.id ASC
@@ -177,7 +169,9 @@ function readFirstUserPromptFromOpenCodeDb(db: SyncDatabase, sessionId: string):
          ORDER BY p.time_created ASC, p.rowid ASC
          LIMIT ${FIRST_USER_PROMPT_PART_LIMIT}`
       )
-      .all(sessionId) as { part_data: string }[]
+      .all(sessionId)
+      .map(readPartDataRow)
+      .filter((row): row is { part_data: string } => row !== null)
 
     const parts: string[] = []
     for (const row of rows) {
@@ -195,7 +189,7 @@ function readFirstUserPromptFromOpenCodeDb(db: SyncDatabase, sessionId: string):
   }
 }
 
-function buildPreviewQuery(db: SyncDatabase): string | null {
+function buildPreviewQuery(db: SyncDatabase, agent: 'opencode' | 'zcode'): string | null {
   if (!canReadOpenCodeMessageParts(db)) {
     return null
   }
@@ -206,6 +200,7 @@ function buildPreviewQuery(db: SyncDatabase): string | null {
                  json_extract(m.data, '$.summary.body') AS summary_body
           FROM (SELECT id, data FROM message
                 WHERE session_id = ?
+                ${zcodeVisibleMessageFilter(agent, 'data')}
                 ORDER BY time_created DESC, id DESC
                 LIMIT ${OPENCODE_SQLITE_PREVIEW_MESSAGE_WINDOW}) m
           JOIN part p ON p.message_id = m.id
@@ -231,6 +226,7 @@ export async function parseOpenCodeSqliteSession(args: {
   dbPath: string
   sessionId: string
   platform: NodeJS.Platform
+  agent?: 'opencode' | 'zcode'
 }): Promise<AiVaultSession | null> {
   return readOpenCodeDatabase({
     dbPath: args.dbPath,
@@ -245,12 +241,14 @@ export function readOpenCodeSqliteSession(args: {
   dbPath: string
   sessionId: string
   platform: NodeJS.Platform
+  agent?: 'opencode' | 'zcode'
 }): AiVaultSession | null {
   const { db, dbPath, sessionId, platform } = args
   if (!canReadOpenCodeSessions(db)) {
     return null
   }
-  const row = db.prepare(buildSessionQuery(db)).get(sessionId) as SessionRow | undefined
+  const agent = args.agent ?? 'opencode'
+  const row = readSessionRow(db.prepare(buildSessionQuery(db, agent)).get(sessionId))
   if (!row || row.id !== sessionId) {
     return null
   }
@@ -262,7 +260,7 @@ export function readOpenCodeSqliteSession(args: {
   // Why: discovery uses a synthetic db#session path only for parser routing.
   // The UI's log open/reveal actions need a real filesystem path.
   const accumulator = createAccumulator({
-    agent: 'opencode',
+    agent: args.agent ?? 'opencode',
     file: {
       path: dbPath,
       mtimeMs,
@@ -279,7 +277,7 @@ export function readOpenCodeSqliteSession(args: {
   updateTimeline(accumulator, row.time_created)
   updateTimeline(accumulator, row.time_updated)
 
-  const previewSql = buildPreviewQuery(db)
+  const previewSql = buildPreviewQuery(db, agent)
   if (previewSql) {
     // Why: SQL already dropped anything older than the newest-N window, so the
     // accumulator never shifts and cannot detect the truncation itself. Ask for
@@ -322,7 +320,7 @@ export function readOpenCodeSqliteSession(args: {
   // Why: list preview only joins the newest messages. On-demand copy needs the
   // session's earliest real user text part, not a later turn still in the window.
   if (shouldCaptureFullFirstUserPrompt()) {
-    accumulator.firstUserPrompt = readFirstUserPromptFromOpenCodeDb(db, sessionId)
+    accumulator.firstUserPrompt = readFirstUserPromptFromOpenCodeDb(db, sessionId, agent)
   }
 
   return finalizeSession(accumulator, platform)
diff --git a/src/main/ai-vault/session-scanner-parse-cache.ts b/src/main/ai-vault/session-scanner-parse-cache.ts
index a9dff0039485..a00f4edd2cfe 100644
--- a/src/main/ai-vault/session-scanner-parse-cache.ts
+++ b/src/main/ai-vault/session-scanner-parse-cache.ts
@@ -5,6 +5,7 @@ import { createCodexSessionResumeState } from './session-scanner-codex-parser'
 import { createDroidSessionResumeState } from './session-scanner-droid-parser'
 import { createMessageGraphSessionResumeState } from './session-scanner-graph-parsers'
 import { createClaudeSessionResumeState } from './session-scanner-primary-parsers'
+import { createCodebuddySessionResumeState } from './session-scanner-codebuddy-parser'
 import { createGeminiJsonlSessionResumeState } from './session-scanner-gemini-parsers'
 import { createCopilotSessionResumeState } from './session-scanner-copilot-parser'
 import { createCursorSessionResumeState } from './session-scanner-cursor-parser'
@@ -51,6 +52,8 @@ function resumableStateFactoryFor(
   switch (candidate.agent) {
     case 'claude':
       return (messages) => createClaudeSessionResumeState(candidate.file, messages)
+    case 'codebuddy':
+      return (messages) => createCodebuddySessionResumeState(candidate.file, messages)
     case 'codex':
       return (messages) =>
         createCodexSessionResumeState(candidate.file, candidate.codexHome, messages)
@@ -81,6 +84,7 @@ function resumableStateFactoryFor(
     case 'muse':
     case 'opencode':
     case 'opencode2':
+    case 'zcode':
     case 'rovo':
       return null
   }
diff --git a/src/main/ai-vault/session-scanner-scope-discovery.ts b/src/main/ai-vault/session-scanner-scope-discovery.ts
index d9ef112f7727..52795830e667 100644
--- a/src/main/ai-vault/session-scanner-scope-discovery.ts
+++ b/src/main/ai-vault/session-scanner-scope-discovery.ts
@@ -20,7 +20,7 @@ const REPRESENTATIVE_CWD_LINE_LIMIT = 200
 const REPRESENTATIVE_FILE_LIMIT = 3
 const TRANSCRIPT_EXTENSIONS = new Set(['.jsonl'])
 
-// Both encodings are lossy; retain Claude’s existing cache and verify each Pi transcript.
+// Bucket encodings are lossy; retain Claude’s cache and verify other transcripts individually.
 const PROJECT_DIR_CWD_CACHE_MAX = 2048
 const projectDirCwdCache = new Map<string, string>()
 
@@ -75,7 +75,7 @@ type InScopeDiscoveryArgs = {
 }
 
 /**
- * Fully include the transcripts of cwd-bucket directories (Claude, Pi) whose cwd
+ * Fully include the transcripts of cwd-bucket directories (Claude, Pi, CodeBuddy) whose cwd
  * falls inside the active workspace/project paths.
  *
  * Why: these agents keep one directory per cwd, e.g. `~/.claude/projects/<cwd-encoded>/`.
@@ -108,7 +108,7 @@ export async function discoverInScopeCwdBucketFiles(
       }
       await collectBucketFiles({
         agent: layout.agent,
-        scopePaths: layout.agent === 'pi' ? args.scopePaths : undefined,
+        scopePaths: layout.agent !== 'claude' ? args.scopePaths : undefined,
         projectDir,
         issues: args.issues,
         collected,
diff --git a/src/main/ai-vault/session-scanner-source-discovery.ts b/src/main/ai-vault/session-scanner-source-discovery.ts
index 5bb53a605ba2..62b2e0562a8d 100644
--- a/src/main/ai-vault/session-scanner-source-discovery.ts
+++ b/src/main/ai-vault/session-scanner-source-discovery.ts
@@ -2,6 +2,7 @@ import { delimiter } from 'node:path'
 import type { AiVaultAgent, AiVaultScanIssue } from '../../shared/ai-vault-types'
 import { discoverFiles } from './session-scanner-discovery'
 import { opencodeDiscoveries } from './session-scanner-opencode-sources'
+import { zcodeDiscoveries } from './session-scanner-zcode-sources'
 import { antigravityDiscoveries } from './session-scanner-antigravity-sources'
 import { AI_VAULT_AGENT_SOURCES, type AiVaultAgentSource } from './session-scanner-agent-sources'
 import { normalizedWslHomeDirs } from './session-scanner-roots'
@@ -28,6 +29,7 @@ export async function discoverAiVaultSessionSources(args: {
     // SQLite DB. discoverOpenCodeSessions runs both the file scanner (legacy)
     // and the SQLite scanner (1.17.x); dedup by sessionId happens inside.
     ...opencodeDiscoveries(options, wslHomeDirs, limitPerAgent, issues),
+    ...zcodeDiscoveries(options, wslHomeDirs, limitPerAgent, issues),
     ...antigravityDiscoveries(options, wslHomeDirs, limitPerAgent, issues),
     ...Object.entries(AI_VAULT_AGENT_SOURCES).flatMap(([agent, source]) =>
       source
diff --git a/src/main/ai-vault/session-scanner-test-fixtures.ts b/src/main/ai-vault/session-scanner-test-fixtures.ts
index 7146d237bf78..0d9b8cef5aba 100644
--- a/src/main/ai-vault/session-scanner-test-fixtures.ts
+++ b/src/main/ai-vault/session-scanner-test-fixtures.ts
@@ -54,6 +54,7 @@ export async function writeOpenCode2SqliteFixture(root: string): Promise<string>
 export function isolatedScanRoots(root: string) {
   return {
     claudeProjectsDir: join(root, 'claude-projects'),
+    codebuddyProjectsDir: join(root, 'codebuddy-projects'),
     codexSessionsDir: join(root, 'codex-sessions'),
     geminiSessionsDir: join(root, 'gemini-sessions'),
     antigravityBrainDir: join(root, 'antigravity-brain'),
@@ -63,6 +64,7 @@ export function isolatedScanRoots(root: string) {
     // Why: prevent the SQLite scanner from picking up the real
     // ~/.local/share/opencode/opencode.db during tests.
     opencodeDbPaths: [] as readonly string[],
+    zcodeDbPath: join(root, 'zcode', 'db.sqlite'),
     grokSessionsDir: join(root, 'grok-sessions'),
     devinTranscriptsDir: join(root, 'devin-transcripts'),
     hermesSessionsDir: join(root, 'hermes-sessions'),
diff --git a/src/main/ai-vault/session-scanner-types.ts b/src/main/ai-vault/session-scanner-types.ts
index 75a102835624..be97a4b3187b 100644
--- a/src/main/ai-vault/session-scanner-types.ts
+++ b/src/main/ai-vault/session-scanner-types.ts
@@ -14,6 +14,7 @@ import type { OpenCodeWslRuntime } from './session-scanner-opencode-wsl-runtime'
 
 export type AiVaultScanOptions = {
   claudeProjectsDir?: string
+  codebuddyProjectsDir?: string
   codexSessionsDir?: string
   additionalCodexSessionsDirs?: readonly string[]
   // Why: tests inject a sandbox "real ~/.codex" so real-home attribution
@@ -29,6 +30,8 @@ export type AiVaultScanOptions = {
   // Why: OpenCode 1.17.x stores sessions in SQLite; tests inject a temp DB
   // here so they don't depend on the real ~/.local/share/opencode.
   opencodeDbPaths?: readonly string[]
+  /** Test override for the ZCode CLI's OpenCode-shaped SQLite database. */
+  zcodeDbPath?: string
   grokSessionsDir?: string
   devinTranscriptsDir?: string
   hermesSessionsDir?: string
diff --git a/src/main/ai-vault/session-scanner-zcode-sources.test.ts b/src/main/ai-vault/session-scanner-zcode-sources.test.ts
new file mode 100644
index 000000000000..4ed6667342fe
--- /dev/null
+++ b/src/main/ai-vault/session-scanner-zcode-sources.test.ts
@@ -0,0 +1,41 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import type { AiVaultScanIssue } from '../../shared/ai-vault-types'
+import { wslGatedAccess } from '../native-chat/wsl-transcript-fs-access'
+import { zcodeDiscoveries } from './session-scanner-zcode-sources'
+
+vi.mock('../native-chat/wsl-transcript-fs-access', () => ({ wslGatedAccess: vi.fn() }))
+
+const access = vi.mocked(wslGatedAccess)
+
+afterEach(() => access.mockReset())
+
+it.each(['EACCES', 'EPERM', 'EIO'])(
+  'reports a ZCode database %s error instead of treating it as absent',
+  async (code) => {
+    access.mockRejectedValueOnce(
+      Object.assign(new Error(`Cannot read database: ${code}`), { code })
+    )
+    const issues: AiVaultScanIssue[] = []
+
+    const [discovery] = await Promise.all(
+      zcodeDiscoveries({ zcodeDbPath: '/example/db.sqlite' }, [], 10, issues)
+    )
+
+    expect(discovery?.files).toEqual([])
+    expect(issues).toEqual([
+      { agent: 'zcode', path: '/example/db.sqlite', message: `Cannot read database: ${code}` }
+    ])
+  }
+)
+
+it('silently skips a ZCode database that does not exist', async () => {
+  access.mockRejectedValueOnce(Object.assign(new Error('No such file'), { code: 'ENOENT' }))
+  const issues: AiVaultScanIssue[] = []
+
+  const [discovery] = await Promise.all(
+    zcodeDiscoveries({ zcodeDbPath: '/example/db.sqlite' }, [], 10, issues)
+  )
+
+  expect(discovery?.files).toEqual([])
+  expect(issues).toEqual([])
+})
diff --git a/src/main/ai-vault/session-scanner-zcode-sources.ts b/src/main/ai-vault/session-scanner-zcode-sources.ts
new file mode 100644
index 000000000000..68b013712e9d
--- /dev/null
+++ b/src/main/ai-vault/session-scanner-zcode-sources.ts
@@ -0,0 +1,55 @@
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+import type { AiVaultScanIssue } from '../../shared/ai-vault-types'
+import { throwIfSignalAborted } from '../../shared/abort-signal-reason'
+import { wslGatedAccess } from '../native-chat/wsl-transcript-fs-access'
+import { listZcodeSqliteSessionsViaWorker } from './session-scanner-opencode-sqlite-worker-spawn'
+import type { AiVaultScanOptions, SessionFileDiscovery } from './session-scanner-types'
+
+// ZCode's CLI stores its OpenCode-shaped history in a separate database.
+// Keep discovery separate so an OpenCode install cannot absorb ZCode rows.
+export function zcodeDiscoveries(
+  options: AiVaultScanOptions,
+  wslHomeDirs: readonly string[],
+  limit: number,
+  issues: AiVaultScanIssue[]
+): Promise<SessionFileDiscovery>[] {
+  const paths = options.zcodeDbPath
+    ? [options.zcodeDbPath]
+    : [homedir(), ...wslHomeDirs].map((home) => join(home, '.zcode', 'cli', 'db', 'db.sqlite'))
+  return paths.map(async (dbPath) => ({
+    agent: 'zcode' as const,
+    rootDir: dbPath,
+    files: (await zcodeDatabaseExists(dbPath, issues, options.signal))
+      ? (
+          await listZcodeSqliteSessionsViaWorker({
+            dbPaths: [dbPath],
+            limit,
+            issues,
+            signal: options.signal
+          })
+        ).map((candidate) => candidate.file)
+      : []
+  }))
+}
+
+async function zcodeDatabaseExists(
+  dbPath: string,
+  issues: AiVaultScanIssue[],
+  signal?: AbortSignal
+): Promise<boolean> {
+  try {
+    return await wslGatedAccess(dbPath, 'scan', signal)
+  } catch (error) {
+    throwIfSignalAborted(signal)
+    if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+      return false
+    }
+    issues.push({
+      agent: 'zcode',
+      path: dbPath,
+      message: error instanceof Error ? error.message : String(error)
+    })
+    return false
+  }
+}
diff --git a/src/main/ai-vault/session-scanner-zcode-visibility.ts b/src/main/ai-vault/session-scanner-zcode-visibility.ts
new file mode 100644
index 000000000000..06c0446b0e09
--- /dev/null
+++ b/src/main/ai-vault/session-scanner-zcode-visibility.ts
@@ -0,0 +1,9 @@
+/** Keep ZCode's hidden transcript messages out of every AI Vault read path. */
+export function zcodeVisibleMessageFilter(
+  agent: 'opencode' | 'zcode',
+  column: 'm.data' | 'data' = 'm.data'
+): string {
+  return agent === 'zcode'
+    ? `AND COALESCE(json_extract(${column}, '$.semantics.transcriptVisibility'), 'visible') != 'hidden'`
+    : ''
+}
diff --git a/src/main/ai-vault/session-scanner-zcode.test.ts b/src/main/ai-vault/session-scanner-zcode.test.ts
new file mode 100644
index 000000000000..4783b2134506
--- /dev/null
+++ b/src/main/ai-vault/session-scanner-zcode.test.ts
@@ -0,0 +1,188 @@
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import { handleOpenCodeSqliteRequest } from './session-scanner-opencode-sqlite-dispatch'
+import { splitOpenCodeSqliteCandidate } from './session-scanner-opencode-sqlite-paths'
+import { writeOpenCodeSqliteDatabase } from './session-scanner-opencode-sqlite-fixture'
+import SyncDatabase from '../sqlite/sync-database'
+
+// Why readers and not casts: the worker dispatch returns `value: unknown` on purpose — it
+// crosses a process boundary. Narrowing here keeps the repo's no-assertions rule and fails
+// the test with a readable message if the payload shape ever changes.
+function readCandidates(value: unknown): { agent: string; path: string }[] {
+  if (typeof value !== 'object' || value === null || !('candidates' in value)) {
+    throw new Error('expected a listing payload with candidates')
+  }
+  const { candidates } = value
+  if (!Array.isArray(candidates)) {
+    throw new Error('expected candidates to be an array')
+  }
+  return candidates.map((candidate) => {
+    const agent = readStringField(candidate, 'agent')
+    const file = isRecord(candidate) ? candidate['file'] : null
+    return { agent, path: readStringField(file, 'path') }
+  })
+}
+
+function readMessageTexts(value: unknown): { text: string }[] {
+  if (typeof value !== 'object' || value === null || !('messages' in value)) {
+    throw new Error('expected a capture payload with messages')
+  }
+  const { messages } = value
+  if (!Array.isArray(messages)) {
+    throw new Error('expected messages to be an array')
+  }
+  return messages.map((message) => ({ text: readStringField(message, 'text') }))
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null
+}
+
+function readStringField(value: unknown, field: string): string {
+  const read = isRecord(value) ? value[field] : null
+  if (typeof read !== 'string') {
+    throw new Error(`expected a string \`${field}\``)
+  }
+  return read
+}
+
+const directories: string[] = []
+afterEach(() => {
+  for (const directory of directories) {
+    rmSync(directory, { recursive: true, force: true })
+  }
+  directories.length = 0
+})
+
+describe('ZCode AI Vault SQLite worker', () => {
+  it('lists, parses, and captures ZCode sessions without labelling them OpenCode', async () => {
+    const directory = mkdtempSync(join(tmpdir(), 'orca-zcode-ai-vault-'))
+    directories.push(directory)
+    const dbPath = join(directory, 'db.sqlite')
+    writeOpenCodeSqliteDatabase(dbPath, [
+      {
+        id: 'zcode-session',
+        directory: '/repo',
+        title: 'ZCode task',
+        turns: [
+          { role: 'user', parts: ['Fix the import'] },
+          { role: 'assistant', parts: ['Import fixed'] }
+        ]
+      }
+    ])
+
+    const listed = await handleOpenCodeSqliteRequest({
+      id: 1,
+      kind: 'list',
+      agent: 'zcode',
+      dbPaths: [dbPath],
+      limit: 10
+    })
+    expect(listed.ok).toBe(true)
+    if (!listed.ok) {
+      return
+    }
+    const candidates = readCandidates(listed.value)
+    expect(candidates).toHaveLength(1)
+    expect(candidates[0]?.agent).toBe('zcode')
+    expect(splitOpenCodeSqliteCandidate(candidates[0]!.path, 'zcode')).toEqual({
+      dbPath,
+      sessionId: 'zcode-session'
+    })
+    expect(splitOpenCodeSqliteCandidate(candidates[0]!.path)).toBeNull()
+
+    const parsed = await handleOpenCodeSqliteRequest({
+      id: 2,
+      kind: 'parse',
+      agent: 'zcode',
+      dbPath,
+      sessionId: 'zcode-session',
+      platform: 'darwin'
+    })
+    expect(parsed).toMatchObject({
+      ok: true,
+      value: {
+        agent: 'zcode',
+        title: 'ZCode task',
+        resumeCommand: "cd '/repo' && zcode --resume 'zcode-session'"
+      }
+    })
+
+    const captured = await handleOpenCodeSqliteRequest({
+      id: 3,
+      kind: 'capture',
+      agent: 'zcode',
+      dbPath,
+      sessionId: 'zcode-session',
+      platform: 'darwin'
+    })
+    expect(captured).toMatchObject({ ok: true, value: { session: { agent: 'zcode' } } })
+    if (!captured.ok) {
+      return
+    }
+    expect(readMessageTexts(captured.value)).toEqual(
+      expect.arrayContaining([expect.objectContaining({ text: 'Fix the import' })])
+    )
+  })
+
+  it('excludes ZCode hidden transcript messages from preview and search', async () => {
+    const directory = mkdtempSync(join(tmpdir(), 'orca-zcode-ai-vault-'))
+    directories.push(directory)
+    const dbPath = join(directory, 'db.sqlite')
+    writeOpenCodeSqliteDatabase(dbPath, [
+      {
+        id: 'visible-session',
+        turns: [
+          { role: 'user', parts: ['internal reminder'] },
+          { role: 'user', parts: ['visible request'] },
+          { role: 'assistant', parts: ['visible response'] }
+        ]
+      }
+    ])
+    const db = new SyncDatabase(dbPath)
+    try {
+      db.prepare(
+        "UPDATE message SET data = json_set(data, '$.semantics.transcriptVisibility', 'hidden') WHERE id LIKE '%-msg-0-%'"
+      ).run()
+    } finally {
+      db.close()
+    }
+
+    const parsed = await handleOpenCodeSqliteRequest({
+      id: 4,
+      kind: 'parse',
+      agent: 'zcode',
+      dbPath,
+      sessionId: 'visible-session',
+      platform: 'darwin',
+      fullFirstUserPrompt: true
+    })
+    expect(parsed).toMatchObject({
+      ok: true,
+      value: {
+        messageCount: 2,
+        firstUserPrompt: 'visible request'
+      }
+    })
+    if (!parsed.ok) {
+      return
+    }
+    expect(JSON.stringify(parsed.value)).not.toContain('internal reminder')
+
+    const captured = await handleOpenCodeSqliteRequest({
+      id: 5,
+      kind: 'capture',
+      agent: 'zcode',
+      dbPath,
+      sessionId: 'visible-session',
+      platform: 'darwin'
+    })
+    expect(captured.ok).toBe(true)
+    if (!captured.ok) {
+      return
+    }
+    expect(JSON.stringify(captured.value)).not.toContain('internal reminder')
+  })
+})
diff --git a/src/main/ai-vault/session-scanner.test.ts b/src/main/ai-vault/session-scanner.test.ts
index b8963ce80b8b..5bbe8d097513 100644
--- a/src/main/ai-vault/session-scanner.test.ts
+++ b/src/main/ai-vault/session-scanner.test.ts
@@ -23,9 +23,15 @@ vi.mock('./session-scanner-opencode-sqlite-worker-spawn', async () => {
     listOpenCodeSqliteSessionsViaWorker: (
       args: Parameters<typeof v1List.listOpenCodeSqliteSessions>[0]
     ) => v1List.listOpenCodeSqliteSessions(args),
+    listZcodeSqliteSessionsViaWorker: (
+      args: Parameters<typeof v1List.listOpenCodeSqliteSessions>[0]
+    ) => v1List.listOpenCodeSqliteSessions({ ...args, agent: 'zcode' }),
     parseOpenCodeSqliteSessionViaWorker: (
       args: Parameters<typeof v1Parse.parseOpenCodeSqliteSession>[0]
     ) => v1Parse.parseOpenCodeSqliteSession(args),
+    parseZcodeSqliteSessionViaWorker: (
+      args: Parameters<typeof v1Parse.parseOpenCodeSqliteSession>[0]
+    ) => v1Parse.parseOpenCodeSqliteSession({ ...args, agent: 'zcode' }),
     listOpenCode2SqliteSessionsViaWorker: (
       args: Parameters<typeof v2List.listOpenCode2SqliteSessions>[0]
     ) => v2List.listOpenCode2SqliteSessions(args),
@@ -400,7 +406,7 @@ describe('scanAiVaultSessions', () => {
       await writeEveryAgentVault(root)
     await writeMuseScannerFixture(roots.museSessionsDir)
 
-    const result = await scanAiVaultSessions({ ...roots, platform: 'darwin', limit: 20 })
+    const result = await scanAiVaultSessions({ ...roots, platform: 'darwin', limit: 25 })
 
     expect(result.issues).toEqual([])
     expect(new Set(result.sessions.map((session) => session.agent))).toEqual(
@@ -428,6 +434,7 @@ describe('scanAiVaultSessions', () => {
     expect(commandByAgent.get('opencode2')).toBe(
       "cd '/tmp/opencode2' && opencode2 --standalone --session 'opencode2-session'"
     )
+    expect(commandByAgent.get('zcode')).toBe("cd '/tmp/zcode' && zcode --resume 'zcode-session'")
     expect(commandByAgent.get('grok')).toBe("cd '/tmp/grok' && grok --resume 'grok-session'")
     expect(commandByAgent.get('hermes')).toBe(
       "cd '/tmp/hermes' && hermes --resume 'hermes-session'"
diff --git a/src/main/ai-vault/session-scanner.ts b/src/main/ai-vault/session-scanner.ts
index 2f5629f94c3e..f56f17af7961 100644
--- a/src/main/ai-vault/session-scanner.ts
+++ b/src/main/ai-vault/session-scanner.ts
@@ -27,7 +27,11 @@ import { getSessionParseCacheEntry } from './session-parse-cache-store'
 import { describeSkippedTranscriptRecords } from './session-transcript-record-budget'
 import { canStopParsingSessions } from './session-scan-cutoff'
 import { discoverInScopeCwdBucketFiles } from './session-scanner-scope-discovery'
-import { CLAUDE_CWD_BUCKET_LAYOUT, PI_CWD_BUCKET_LAYOUT } from './session-cwd-bucket-layouts'
+import {
+  CLAUDE_CWD_BUCKET_LAYOUT,
+  PI_CWD_BUCKET_LAYOUT,
+  CODEBUDDY_CWD_BUCKET_LAYOUT
+} from './session-cwd-bucket-layouts'
 import { discoverAiVaultSessionSources } from './session-scanner-source-discovery'
 import { cursorChatMetaRefusals, withCursorChatMetaScan } from './session-scanner-cursor-chat-meta'
 import type {
@@ -166,7 +170,11 @@ function mergeSessions(
 
 // Agents whose on-disk layout names a directory per cwd, so a scope's older
 // sessions can be found without reading every transcript's header.
-const CWD_BUCKET_LAYOUTS = [CLAUDE_CWD_BUCKET_LAYOUT, PI_CWD_BUCKET_LAYOUT]
+const CWD_BUCKET_LAYOUTS = [
+  CLAUDE_CWD_BUCKET_LAYOUT,
+  PI_CWD_BUCKET_LAYOUT,
+  CODEBUDDY_CWD_BUCKET_LAYOUT
+]
 
 async function scanInScopeSessions(args: {
   discoveries: SessionFileDiscovery[]
diff --git a/src/main/ai-vault/session-transcript-every-agent-capture.test.ts b/src/main/ai-vault/session-transcript-every-agent-capture.test.ts
index 0d135cdb7e84..20b28fdb49be 100644
--- a/src/main/ai-vault/session-transcript-every-agent-capture.test.ts
+++ b/src/main/ai-vault/session-transcript-every-agent-capture.test.ts
@@ -20,18 +20,27 @@ vi.mock('./session-scanner-opencode-sqlite-worker-spawn', async () => {
     listOpenCode2SqliteSessionsViaWorker: (
       args: Parameters<typeof list2.listOpenCode2SqliteSessions>[0]
     ) => list2.listOpenCode2SqliteSessions(args),
+    listZcodeSqliteSessionsViaWorker: (
+      args: Parameters<typeof list.listOpenCodeSqliteSessions>[0]
+    ) => list.listOpenCodeSqliteSessions({ ...args, agent: 'zcode' }),
     parseOpenCodeSqliteSessionViaWorker: (
       args: Parameters<typeof parse.parseOpenCodeSqliteSession>[0]
     ) => parse.parseOpenCodeSqliteSession(args),
     parseOpenCode2SqliteSessionViaWorker: (
       args: Parameters<typeof parse2.parseOpenCode2SqliteSession>[0]
     ) => parse2.parseOpenCode2SqliteSession(args),
+    parseZcodeSqliteSessionViaWorker: (
+      args: Parameters<typeof parse.parseOpenCodeSqliteSession>[0]
+    ) => parse.parseOpenCodeSqliteSession({ ...args, agent: 'zcode' }),
     captureOpenCodeSqliteSessionViaWorker: (
       args: Parameters<typeof capture.captureOpenCodeSqliteSession>[0]
     ) => capture.captureOpenCodeSqliteSession(args),
     captureOpenCode2SqliteSessionViaWorker: (
       args: Parameters<typeof capture2.captureOpenCode2SqliteSession>[0]
-    ) => capture2.captureOpenCode2SqliteSession(args)
+    ) => capture2.captureOpenCode2SqliteSession(args),
+    captureZcodeSqliteSessionViaWorker: (
+      args: Parameters<typeof capture.captureOpenCodeSqliteSession>[0]
+    ) => capture.captureOpenCodeSqliteSession({ ...args, agent: 'zcode' })
   }
 })
 import { AI_VAULT_AGENTS, type AiVaultAgent } from '../../shared/ai-vault-types'
diff --git a/src/main/browser/agent-browser-bridge-state-commands.ts b/src/main/browser/agent-browser-bridge-state-commands.ts
index 4e03055da571..779c6930887c 100644
--- a/src/main/browser/agent-browser-bridge-state-commands.ts
+++ b/src/main/browser/agent-browser-bridge-state-commands.ts
@@ -15,6 +15,7 @@ import type {
 import { BrowserError } from './cdp-bridge'
 import { parseShellArgs, stripAgentBrowserTargetArgs } from './agent-browser-bridge-process'
 import { AgentBrowserBridgeInteractionCommands } from './agent-browser-bridge-interaction-commands'
+import { sendGuestCdpCommand } from './guest-cdp-command'
 
 export abstract class AgentBrowserBridgeStateCommands extends AgentBrowserBridgeInteractionCommands {
   // ── Cookie commands ──
@@ -101,16 +102,14 @@ export abstract class AgentBrowserBridgeStateCommands extends AgentBrowserBridge
       }
 
       // Why: agent-browser's `set viewport` has no `mobile` flag, so apply the emulation directly via CDP to honor Orca's --mobile.
-      await dbg.sendCommand('Emulation.setDeviceMetricsOverride', {
+      await sendGuestCdpCommand(wc, 'Emulation.setDeviceMetricsOverride', {
         width,
         height,
         deviceScaleFactor: scale,
         mobile
       })
       // Why: BrowserView's compositor can keep the old host size after a metrics-only resize, cropping remote screencast clients.
-      await Promise.resolve(dbg.sendCommand('Emulation.setVisibleSize', { width, height })).catch(
-        () => {}
-      )
+      await sendGuestCdpCommand(wc, 'Emulation.setVisibleSize', { width, height }).catch(() => {})
 
       return {
         width,
diff --git a/src/main/browser/agent-browser-bridge-test-harness.ts b/src/main/browser/agent-browser-bridge-test-harness.ts
index c4c28006e826..34e381838b2a 100644
--- a/src/main/browser/agent-browser-bridge-test-harness.ts
+++ b/src/main/browser/agent-browser-bridge-test-harness.ts
@@ -56,6 +56,7 @@ export type MockWebContents = {
   on: Mock<(event: string, listener: MockEmitterListener) => void>
   removeListener: Mock<(event: string, listener: MockEmitterListener) => void>
   isDestroyed: () => boolean
+  isCrashed: () => boolean
   invalidate: Mock<() => void>
   focus: Mock<() => void>
   debugger: MockWebContentsDebugger
@@ -78,6 +79,7 @@ export function mockWebContents(
     on: vi.fn(),
     removeListener: vi.fn(),
     isDestroyed: () => false,
+    isCrashed: () => false,
     invalidate: vi.fn(),
     focus: vi.fn(),
     debugger: {
diff --git a/src/main/browser/browser-manager-auth-user-agent.test.ts b/src/main/browser/browser-manager-auth-user-agent.test.ts
index d85a785a8871..1a24369f58cd 100644
--- a/src/main/browser/browser-manager-auth-user-agent.test.ts
+++ b/src/main/browser/browser-manager-auth-user-agent.test.ts
@@ -137,10 +137,22 @@ describe('browserManager', () => {
       { userAgent: guestBaseUserAgent }
     ])
 
-    // A navigation that doesn't change the required UA must not thrash setUserAgent.
+    // The next direct navigation is the first safe moment to rewrite the WebContents UA, so it
+    // restores the process identity there and drops the CDP override that stood in for it.
     setUserAgent.mockClear()
+    sendCommand.mockClear()
     didStartNavigation(null, 'https://example.com/', false, true)
+    expect(setUserAgent).toHaveBeenCalledOnce()
+    expect(setUserAgent).toHaveBeenLastCalledWith(guestBaseUserAgent)
+    expect(sendCommand).toHaveBeenCalledWith('Emulation.setUserAgentOverride', { userAgent: '' })
+    await expect(sendCommand.mock.results.at(-1)?.value).resolves.toBeUndefined()
+
+    // A navigation that doesn't change the required UA must not thrash either layer.
+    setUserAgent.mockClear()
+    sendCommand.mockClear()
+    didStartNavigation(null, 'https://example.org/', false, true)
     expect(setUserAgent).not.toHaveBeenCalled()
+    expect(sendCommand).not.toHaveBeenCalled()
   })
 
   it('leaves the UA untouched on Google auth hosts in native process mode', () => {
@@ -270,7 +282,8 @@ describe('browserManager', () => {
 
     // Why: the CDP override outranks the WebContents UA, so getUserAgent() still reports the base
     // identity. Leaving the auth host must read the override, not that stale value, or the guest
-    // keeps presenting Firefox on every later host.
+    // keeps presenting Firefox on every later host. The WebContents UA already presents the process
+    // identity, so leaving clears the override rather than restating the UA without client hints.
     sendCommand.mockClear()
     const didStartNavigation = guestOnMock.mock.calls.find(
       ([event]) => event === 'did-start-navigation'
@@ -282,8 +295,8 @@ describe('browserManager', () => {
 
     expect(guest.setUserAgent).not.toHaveBeenCalled()
     expect(sendCommand.mock.calls).toEqual([
-      ['Emulation.setUserAgentOverride', { userAgent: guestBaseUserAgent }],
-      ['Emulation.setUserAgentOverride', { userAgent: guestBaseUserAgent }]
+      ['Emulation.setUserAgentOverride', { userAgent: '' }],
+      ['Emulation.setUserAgentOverride', { userAgent: '' }]
     ])
 
     // A newer confirmed write outranks an older write that remains in flight.
@@ -330,9 +343,7 @@ describe('browserManager', () => {
 
     sendCommand.mockClear()
     didStartNavigation(null, 'https://example.com/', false, true)
-    expect(sendCommand).toHaveBeenCalledWith('Emulation.setUserAgentOverride', {
-      userAgent: guestBaseUserAgent
-    })
+    expect(sendCommand).toHaveBeenCalledWith('Emulation.setUserAgentOverride', { userAgent: '' })
     browserManager.unregisterGuest('browser-redirect-ua')
   })
 
@@ -420,14 +431,14 @@ describe('browserManager', () => {
     )
   })
 
-  // Why: the direct-navigation branch still writes the Firefox UA through WebContents.setUserAgent,
-  // and nothing ever restores it once the guest switches to the CDP override. A viewport preset that
-  // read getUserAgent() back as its base identity would therefore republish Firefox on every ordinary
-  // host — the wire UA saying Firefox while sec-ch-ua still says Chrome, the exact cross-layer tell
-  // this scope exists to remove.
-  it('keeps a viewport preset on the session identity after an auth-host visit', async () => {
+  // Why: a direct navigation onto the auth host writes Firefox into the WebContents UA, and a redirect
+  // off it cannot rewrite that layer without cancelling the navigation. Clearing the CDP override
+  // there would expose that stale Firefox UA on an ordinary host, so the override must carry the
+  // process identity until the next direct navigation can restore the WebContents UA and clear it.
+  it('never clears the override onto a stale Firefox WebContents UA and heals it on the next navigation', async () => {
     browserMocks.processUserAgent = GUEST_CLEAN_UA
-    const { guest, debuggerSendCommand } = makeViewportGuest(9001)
+    const { guest, debuggerSendCommand, presentedUserAgent, standingUserAgentOverride } =
+      makeViewportGuest(9001)
     webContentsFromIdMock.mockReturnValue(guest)
     browserManager.attachGuestPolicies(guest as never)
     browserManager.registerGuest({
@@ -452,22 +463,23 @@ describe('browserManager', () => {
 
     didStartNavigation(null, 'https://accounts.google.com/v3/signin/identifier', false, true)
     await flushViewportOps()
-    // The direct branch pins the WebContents UA to Firefox and never restores it.
     expect((guest.getUserAgent as () => string)()).toBe(googleAuthUserAgent())
 
+    debuggerSendCommand.mockClear()
     willRedirect({ preventDefault: vi.fn() }, 'https://myaccount.google.com/', false, true)
     await flushViewportOps()
+    expect(debuggerSendCommand).toHaveBeenLastCalledWith('Emulation.setUserAgentOverride', {
+      userAgent: GUEST_CLEAN_UA
+    })
+    expect(presentedUserAgent()).toBe(GUEST_CLEAN_UA)
 
     debuggerSendCommand.mockClear()
     didStartNavigation(null, 'https://github.com/', false, true)
     await flushViewportOps()
-
-    const uaWrites = debuggerSendCommand.mock.calls.filter(
-      ([method]) => method === 'Emulation.setUserAgentOverride'
-    )
-    expect(uaWrites.length).toBeGreaterThan(0)
-    for (const [, params] of uaWrites) {
-      expect((params as { userAgent: string }).userAgent).toBe(GUEST_CLEAN_UA)
-    }
+    expect(debuggerSendCommand).toHaveBeenLastCalledWith('Emulation.setUserAgentOverride', {
+      userAgent: ''
+    })
+    expect(standingUserAgentOverride()).toBeNull()
+    expect(presentedUserAgent()).toBe(GUEST_CLEAN_UA)
   })
 })
diff --git a/src/main/browser/browser-manager-bindings.ts b/src/main/browser/browser-manager-bindings.ts
index 931c5c6bc3b4..a87c7e73e084 100644
--- a/src/main/browser/browser-manager-bindings.ts
+++ b/src/main/browser/browser-manager-bindings.ts
@@ -77,8 +77,8 @@ export abstract class BrowserManagerBindings extends BrowserManagerGrab {
         resolveRenderer: (tabId) =>
           resolveRendererWebContents(this.rendererWebContentsIdByTabId, tabId),
         isViewportPresetActive: () => {
-          const state = this.viewportPresetActiveByTabId.get(browserTabId)
-          return state?.guestWebContentsId === guest.id && state.active
+          const state = this.viewportPresetByTabId.get(browserTabId)
+          return state?.guestWebContentsId === guest.id && state.override !== null
         },
         canViewportScroll: (mouse) => this.canViewportScroll(browserTabId, mouse),
         onViewportWheelConsumed: (deltaX, deltaY) =>
diff --git a/src/main/browser/browser-manager-guest-cleanup.ts b/src/main/browser/browser-manager-guest-cleanup.ts
index a815e95e431b..67ded30cecc7 100644
--- a/src/main/browser/browser-manager-guest-cleanup.ts
+++ b/src/main/browser/browser-manager-guest-cleanup.ts
@@ -23,7 +23,7 @@ export abstract class BrowserManagerGuestCleanup extends BrowserManagerGuestNavi
     this.offscreenGuestIds.delete(guestWebContentsId)
     this.popupOwnerContextByGuestId.delete(guestWebContentsId)
     this.pageInitiatedTabBudgetByRootGuestId.delete(guestWebContentsId)
-    this.authUserAgentOverrideStateByGuestId.delete(guestWebContentsId)
+    this.cdpUserAgentOverrideStateByGuestId.delete(guestWebContentsId)
     this.pendingNavigationByGuestId.delete(guestWebContentsId)
     // Why: a popup must stop inheriting authorization the moment its owner retires, before Chromium destroys the child.
     if (isPrimaryGuest) {
diff --git a/src/main/browser/browser-manager-guest-navigation-policy.ts b/src/main/browser/browser-manager-guest-navigation-policy.ts
index a2b8bf0b329d..9e8a301476fb 100644
--- a/src/main/browser/browser-manager-guest-navigation-policy.ts
+++ b/src/main/browser/browser-manager-guest-navigation-policy.ts
@@ -35,7 +35,7 @@ export abstract class BrowserManagerGuestNavigationPolicy extends BrowserManager
         return
       }
       this.updatePendingNavigationForRedirect(guest.id, url)
-      this.applyGoogleAuthUserAgent(guest, url, { duringRedirect: true })
+      void this.retargetTabIdentity(guest, url)
     }
 
     const didFailLoadHandler = (
@@ -51,8 +51,8 @@ export abstract class BrowserManagerGuestNavigationPolicy extends BrowserManager
       // Why: a nav that never committed must not leave its target standing as the tab's host.
       const failedNavigationWasCurrent = this.failPendingNavigation(guest.id, validatedURL)
       if (failedNavigationWasCurrent) {
-        // The attempted host never committed, so restore every UA layer to the document that remains.
-        this.applyGoogleAuthUserAgent(guest, guest.getURL())
+        // Restore the identity of the document that remains (usually the failed URL's error page).
+        void this.retargetTabIdentity(guest, guest.getURL())
       }
       const browserPageId = this.tabIdByWebContentsId.get(guest.id)
       const certificateFailure = browserPageId
@@ -91,7 +91,7 @@ export abstract class BrowserManagerGuestNavigationPolicy extends BrowserManager
     const didStartNavigationHandler = (
       _event: Electron.Event,
       url: string,
-      _isInPlace: boolean,
+      isInPlace: boolean,
       isMainFrame: boolean
     ): void => {
       if (!isMainFrame || isChromiumInternalErrorUrl(url)) {
@@ -100,7 +100,7 @@ export abstract class BrowserManagerGuestNavigationPolicy extends BrowserManager
       // Why: getURL() still reports the previous committed URL until this navigation commits, so
       // every UA writer must read the in-flight target or they disagree about the tab's host.
       this.startPendingNavigation(guest.id, url)
-      this.applyGoogleAuthUserAgent(guest, url)
+      void this.presentTabIdentityAtNavigationStart(guest, url, isInPlace)
       this.certificateTrustController?.onMainFrameNavigationStarted(guest.id)
       // Why: a pre-registration failure belongs only to its own nav; a replacement nav must not replay it.
       this.pendingLoadFailuresByGuestId.delete(guest.id)
diff --git a/src/main/browser/browser-manager-guest-policy.ts b/src/main/browser/browser-manager-guest-policy.ts
index dd418d71af78..9c99175096ff 100644
--- a/src/main/browser/browser-manager-guest-policy.ts
+++ b/src/main/browser/browser-manager-guest-policy.ts
@@ -26,7 +26,7 @@ export abstract class BrowserManagerGuestPolicy extends BrowserManagerGuestClean
     if (inheritedOwnerContext) {
       this.popupOwnerContextByGuestId.set(guest.id, inheritedOwnerContext)
     }
-    const disposeAuthDetachTracking = this.trackDebuggerDetachForAuthUserAgent(guest)
+    const disposeDetachTracking = this.trackDebuggerDetachForUserAgentOverride(guest)
     // Why: disable throttling so background screenshots still get frames; else the compositor stalls and capture returns empty.
     guest.setBackgroundThrottling(false)
     const disposePopupPolicy = this.installGuestPopupPolicy(guest, !inheritedOwnerContext)
@@ -34,7 +34,7 @@ export abstract class BrowserManagerGuestPolicy extends BrowserManagerGuestClean
 
     // Why: store cleanup so unregisterGuest can drop these listeners on teardown and let the WebContents wrapper GC.
     this.policyCleanupByGuestId.set(guest.id, () => {
-      disposeAuthDetachTracking()
+      disposeDetachTracking()
       disposePopupPolicy()
       disposeNavigationPolicy()
     })
diff --git a/src/main/browser/browser-manager-navigation.ts b/src/main/browser/browser-manager-navigation.ts
index a7dcf5cd4fce..d96d41e79be8 100644
--- a/src/main/browser/browser-manager-navigation.ts
+++ b/src/main/browser/browser-manager-navigation.ts
@@ -1,145 +1,152 @@
 import { openPopupWithOriginBar, type PopupChildWindowOptions } from './popup-origin-bar-window'
 import { getBrowserProcessUserAgentIdentity } from './browser-process-user-agent'
 import type { BrowserSessionRequestUserAgentResolver } from './browser-session-ua'
-import { googleAuthUserAgent, isGoogleAuthUrl } from './browser-google-auth-ua'
+import { isGoogleAuthUrl } from './browser-google-auth-ua'
 import {
-  buildViewportUserAgentOverride,
-  type ViewportUserAgentOverride
-} from './browser-viewport-user-agent'
+  googleAuthTabIdentity,
+  resolveBrowserTabIdentity,
+  type BrowserTabIdentity
+} from './browser-tab-identity'
 import {
   safeOrigin,
-  type AuthUserAgentOverrideOperation,
-  type AuthUserAgentOverrideState
+  type CdpUserAgentOverride,
+  type CdpUserAgentOverrideOperation,
+  type CdpUserAgentOverrideState
 } from './browser-manager-types'
 import { BrowserManagerVisibility } from './browser-manager-visibility'
 
 export abstract class BrowserManagerNavigation extends BrowserManagerVisibility {
   resolveBrowserGuestRequestUserAgent(
     request: Parameters<BrowserSessionRequestUserAgentResolver>[0]
-  ): ViewportUserAgentOverride {
-    const identity = getBrowserProcessUserAgentIdentity()
-    const firefoxUa = googleAuthUserAgent()
+  ): BrowserTabIdentity {
+    const processIdentity = getBrowserProcessUserAgentIdentity()
+    const googleAuth = googleAuthTabIdentity()
     const pendingNavigation =
       request.webContentsId === undefined
         ? undefined
         : this.pendingNavigationByGuestId.get(request.webContentsId)
     // Firefox is delivered per-target and cannot reach workers; keep it clean-only to preserve one
     // coherent identity per mode instead of pairing a Firefox document with native workers.
-    const googleAuthEnabled = identity.mode === 'clean'
+    const googleAuthEnabled = processIdentity.mode === 'clean'
     if (
       googleAuthEnabled &&
-      request.currentUserAgent === firefoxUa &&
+      request.currentUserAgent === googleAuth.userAgent &&
       (!pendingNavigation || isGoogleAuthUrl(pendingNavigation.currentUrl))
     ) {
-      return { userAgent: firefoxUa }
+      return googleAuth
     }
-    const overrideState =
+    const standingOverride =
       request.webContentsId === undefined
         ? undefined
-        : this.authUserAgentOverrideStateByGuestId.get(request.webContentsId)
-    const latestPendingOverride = overrideState?.pending.at(-1)
-    const currentOverride =
-      latestPendingOverride &&
-      latestPendingOverride.sequence > (overrideState?.confirmed?.sequence ?? -1)
-        ? latestPendingOverride
-        : overrideState?.confirmed
+        : this.standingCdpUserAgentOverride(request.webContentsId)
     if (
       googleAuthEnabled &&
-      !currentOverride &&
-      request.effectiveUserAgent === firefoxUa &&
+      !standingOverride &&
+      request.effectiveUserAgent === googleAuth.userAgent &&
       (!pendingNavigation || isGoogleAuthUrl(pendingNavigation.currentUrl))
     ) {
-      return { userAgent: firefoxUa }
+      return googleAuth
     }
-    if (googleAuthEnabled && currentOverride?.userAgent === firefoxUa) {
-      return { userAgent: firefoxUa }
+    if (googleAuthEnabled && standingOverride?.userAgent === googleAuth.userAgent) {
+      return googleAuth
     }
-    const browserPageId =
-      request.webContentsId === undefined
-        ? undefined
-        : this.tabIdByWebContentsId.get(request.webContentsId)
     // Shared and service worker requests carry no webContentsId, and resolving a session-wide mobile
     // intent for one put the mobile UA on the wire for a context whose own navigator.userAgent is
     // desktop-clean — and for every tab sharing the session. One context, one identity: those workers
     // stay on the session identity, while emulation reaches documents and the emulated tab's dedicated
-    // workers, which carry the owning webContentsId and so resolve through browserPageId.
-    const mobile = browserPageId
-      ? (this.viewportUaOverrideMobileByTabId.get(browserPageId) ?? false)
-      : false
-    return buildViewportUserAgentOverride({
+    // workers, which carry the owning webContentsId.
+    // Why the standing override and not the requested preset: the wire must match what the document
+    // presents, and a preset whose CDP write never landed (no debugger, a failed write) presents none.
+    return resolveBrowserTabIdentity({
       url: request.url,
-      mobile,
-      baseUserAgent: identity.userAgent,
-      googleAuthEnabled
+      mobile: standingOverride?.userAgentMetadata?.mobile === true,
+      processIdentity
     })
   }
 
-  // Why: navigator.userAgent (read by Google's auth JS) reflects the WebContents UA,
-  // not the request header, so the Firefox switch in the session request hook
-  // must be matched here per navigation or the two layers disagree — itself a bot tell.
-  protected applyGoogleAuthUserAgent(
+  // Why: gate on the DIRECT page id, not ownerTabId — a popup has no device-metrics override of its
+  // own, so inheriting the owner tab's preset would pair a mobile UA with a desktop viewport.
+  protected hasMobileViewportPreset(guestWebContentsId: number): boolean {
+    const browserPageId = this.tabIdByWebContentsId.get(guestWebContentsId)
+    const preset = browserPageId ? this.viewportPresetByTabId.get(browserPageId) : undefined
+    return preset?.guestWebContentsId === guestWebContentsId && preset.override?.mobile === true
+  }
+
+  /**
+   * The only writer of the WebContents UA. Chromium cancels a redirect, and reloads a loading
+   * document, when that UA changes at any other moment; a cross-document did-start-navigation is
+   * the one point where it lands on the new document alone. Call it synchronously from that event.
+   */
+  protected presentTabIdentityAtNavigationStart(
     guest: Electron.WebContents,
     url: string,
-    options: { duringRedirect?: boolean } = {}
-  ): void {
-    const browserPageId = this.tabIdByWebContentsId.get(guest.id)
-    const identity = getBrowserProcessUserAgentIdentity()
-    if (identity.mode === 'native') {
-      if (browserPageId) {
-        this.reapplyViewportUserAgentOverride(guest, browserPageId, url)
-      }
-      return
-    }
-    const firefoxUa = googleAuthUserAgent()
-    const overrideState = this.authUserAgentOverrideStateByGuestId.get(guest.id)
-    const latestPendingOverride = overrideState?.pending.at(-1)
-    const confirmedOverride = overrideState?.confirmed
-    const currentOverride =
-      latestPendingOverride && latestPendingOverride.sequence > (confirmedOverride?.sequence ?? -1)
-        ? latestPendingOverride
-        : confirmedOverride
-    const currentUa = currentOverride?.userAgent ?? guest.getUserAgent()
-    const nextUa = isGoogleAuthUrl(url)
-      ? firefoxUa
-      : // Only restore when the auth-host override is actually in place, so normal
-        // navigation never touches the session UA.
-        currentUa === firefoxUa
+    sameDocument: boolean
+  ): Promise<boolean> {
+    const identity = this.resolveGuestTabIdentity(guest, url)
+    // The WebContents UA carries no mobile identity: that needs metadata only CDP can send.
+    const webContentsUserAgent =
+      identity.kind === 'google-auth'
         ? identity.userAgent
-        : null
-    let authOverrideIssuedOverCdp = false
-    if (nextUa !== null && nextUa !== currentUa) {
-      // Why: WebContents.setUserAgent() during a redirect makes Chromium cancel the in-flight
-      // navigation (ERR_ABORTED) and replay the original request, which a POST-started OAuth chain
-      // cannot survive — the sign-in lands on a blank tab. CDP retargets navigator.userAgent without
-      // touching the navigation, and it outranks the WebContents UA from then on, so a guest that
-      // switches to it stays on it. The wire UA never depended on this write:
-      // The session request hook rewrites User-Agent for auth-host URLs on its own.
-      if (options.duringRedirect === true || overrideState !== undefined) {
-        if (this.canOverrideUserAgentOverCdp(guest)) {
-          authOverrideIssuedOverCdp = true
-          // Why: go through the viewport builder rather than writing nextUa raw, so both CDP writers
-          // resolve one identity for this URL — Firefox on auth hosts, the profile's clean base off
-          // them, any mobile preset preserved. Writing the session UA directly would put the
-          // unlaundered Electron token back on the wire.
-          void this.applyAuthUserAgentOverrideOverCdp(
-            guest,
-            (browserPageId ? this.viewportUaOverrideMobileByTabId.get(browserPageId) : undefined) ??
-              false,
-            url,
-            nextUa
-          )
-        }
-        // Why: with no debugger there is no way to retarget the identity without cancelling the
-        // redirect. A stale navigator.userAgent is recoverable; a dead navigation is not.
-      } else {
-        guest.setUserAgent(nextUa)
-      }
+        : getBrowserProcessUserAgentIdentity().userAgent
+    let presentedByWebContents = guest.getUserAgent()
+    if (!sameDocument && presentedByWebContents !== webContentsUserAgent) {
+      guest.setUserAgent(webContentsUserAgent)
+      presentedByWebContents = webContentsUserAgent
     }
-    // Why: gate on the DIRECT page id, not ownerTabId — a popup has no device-metrics override of
-    // its own, so inheriting the owner tab's preset UA would pair a mobile UA with a desktop viewport.
-    if (browserPageId && !authOverrideIssuedOverCdp) {
-      this.reapplyViewportUserAgentOverride(guest, browserPageId, url)
+    return this.writeTabIdentityOverride(guest, identity, presentedByWebContents)
+  }
+
+  /** Every other identity change (redirects, failed loads, preset changes) goes over CDP only. */
+  protected retargetTabIdentity(guest: Electron.WebContents, url: string): Promise<boolean> {
+    return this.writeTabIdentityOverride(
+      guest,
+      this.resolveGuestTabIdentity(guest, url),
+      guest.getUserAgent()
+    )
+  }
+
+  private resolveGuestTabIdentity(guest: Electron.WebContents, url: string): BrowserTabIdentity {
+    return resolveBrowserTabIdentity({
+      url,
+      mobile: this.hasMobileViewportPreset(guest.id),
+      processIdentity: getBrowserProcessUserAgentIdentity()
+    })
+  }
+
+  // Why clear rather than restate: any override without userAgentMetadata makes Chromium drop
+  // navigator.userAgentData and every sec-ch-ua header, so it stands only when the WebContents UA
+  // cannot present the identity itself.
+  private writeTabIdentityOverride(
+    guest: Electron.WebContents,
+    identity: BrowserTabIdentity,
+    presentedByWebContents: string
+  ): Promise<boolean> {
+    const override: CdpUserAgentOverride =
+      identity.kind === 'mobile'
+        ? { userAgent: identity.userAgent, userAgentMetadata: identity.userAgentMetadata }
+        : presentedByWebContents === identity.userAgent
+          ? { userAgent: '' }
+          : // Only reachable before a navigation start can rewrite the WebContents UA (a redirect
+            // off the auth host, a failed load); the next cross-document navigation clears it.
+            { userAgent: identity.userAgent }
+    if (override.userAgent === '' && !this.standingCdpUserAgentOverride(guest.id)) {
+      return Promise.resolve(true)
     }
+    // Why: with no debugger there is no way to retarget the identity without cancelling a redirect.
+    // A stale navigator.userAgent is recoverable; a dead navigation is not. The wire UA never
+    // depended on this write: the session request hook rewrites User-Agent on its own.
+    return this.writeCdpUserAgentOverride(guest, override)
+  }
+
+  /** The override Chromium holds or is about to hold; undefined when none stands. */
+  protected standingCdpUserAgentOverride(guestId: number): CdpUserAgentOverride | undefined {
+    const state = this.cdpUserAgentOverrideStateByGuestId.get(guestId)
+    const latestPending = state?.pending.at(-1)
+    const current =
+      latestPending && latestPending.sequence > (state?.confirmed?.sequence ?? -1)
+        ? latestPending
+        : state?.confirmed
+    return current && current.override.userAgent !== '' ? current.override : undefined
   }
 
   protected canOverrideUserAgentOverCdp(guest: Electron.WebContents): boolean {
@@ -150,39 +157,43 @@ export abstract class BrowserManagerNavigation extends BrowserManagerVisibility
     }
   }
 
-  protected applyAuthUserAgentOverrideOverCdp(
+  // Why no queue: debugger.sendCommand dispatches in call order over one channel, so the later-issued
+  // write wins. The sequence only keeps a failed or superseded write from being recorded as standing.
+  protected writeCdpUserAgentOverride(
     guest: Electron.WebContents,
-    mobile: boolean,
-    url: string,
-    userAgent: string
+    override: CdpUserAgentOverride
   ): Promise<boolean> {
     if (!this.canOverrideUserAgentOverCdp(guest)) {
       return Promise.resolve(false)
     }
-    const state = this.authUserAgentOverrideStateByGuestId.get(guest.id) ?? {
+    const state = this.cdpUserAgentOverrideStateByGuestId.get(guest.id) ?? {
       confirmed: null,
       nextSequence: 0,
       pending: []
     }
-    const operation = { sequence: ++state.nextSequence, userAgent }
+    const operation = { sequence: ++state.nextSequence, override }
     state.pending.push(operation)
-    this.authUserAgentOverrideStateByGuestId.set(guest.id, state)
-    return this.sendViewportUserAgentOverride(guest, mobile, url, userAgent).then(
-      () => this.settleAuthUserAgentOverride(guest.id, state, operation, true),
-      () => {
-        this.settleAuthUserAgentOverride(guest.id, state, operation, false)
+    this.cdpUserAgentOverrideStateByGuestId.set(guest.id, state)
+    return guest.debugger.sendCommand('Emulation.setUserAgentOverride', override).then(
+      () => this.settleCdpUserAgentOverride(guest.id, state, operation, true),
+      (error: unknown) => {
+        this.settleCdpUserAgentOverride(guest.id, state, operation, false)
+        console.warn('[browser-manager] failed to write the tab user agent override', {
+          guestWebContentsId: guest.id,
+          error: error instanceof Error ? error.message : String(error)
+        })
         return false
       }
     )
   }
 
-  protected settleAuthUserAgentOverride(
+  protected settleCdpUserAgentOverride(
     guestId: number,
-    state: AuthUserAgentOverrideState,
-    operation: AuthUserAgentOverrideOperation,
+    state: CdpUserAgentOverrideState,
+    operation: CdpUserAgentOverrideOperation,
     succeeded: boolean
   ): boolean {
-    if (this.authUserAgentOverrideStateByGuestId.get(guestId) !== state) {
+    if (this.cdpUserAgentOverrideStateByGuestId.get(guestId) !== state) {
       return false
     }
     if (succeeded && (state.confirmed?.sequence ?? -1) < operation.sequence) {
@@ -192,10 +203,13 @@ export abstract class BrowserManagerNavigation extends BrowserManagerVisibility
     if (pendingIndex !== -1) {
       state.pending.splice(pendingIndex, 1)
     }
-    if (state.confirmed === null && state.pending.length === 0) {
-      this.authUserAgentOverrideStateByGuestId.delete(guestId)
+    if (
+      (state.confirmed === null || state.confirmed.override.userAgent === '') &&
+      state.pending.length === 0
+    ) {
+      this.cdpUserAgentOverrideStateByGuestId.delete(guestId)
     }
-    return true
+    return succeeded
   }
 
   protected startPendingNavigation(guestId: number, url: string): void {
@@ -242,48 +256,6 @@ export abstract class BrowserManagerNavigation extends BrowserManagerVisibility
     return this.pendingNavigationByGuestId.get(guest.id)?.currentUrl ?? guest.getURL()
   }
 
-  // Why: Emulation.setUserAgentOverride is set once and stands across every later navigation,
-  // outranking setUserAgent for navigator.userAgent. A viewport preset applied before reaching an
-  // auth host would otherwise pin navigator.userAgent to the Chrome-shaped preset UA while the
-  // request header says Firefox — the two-layer disagreement this scope exists to remove.
-  protected reapplyViewportUserAgentOverride(
-    guest: Electron.WebContents,
-    browserTabId: string,
-    url: string
-  ): void {
-    const mobile = this.viewportUaOverrideMobileByTabId.get(browserTabId)
-    if (mobile === undefined) {
-      return
-    }
-    // Why: no queue needed — debugger.sendCommand dispatches in call order over one channel, so the
-    // later-issued write wins. What matters is that both writers resolve the SAME host, which they
-    // now do via the navigation target rather than the stale committed URL.
-    void this.sendViewportUserAgentOverride(guest, mobile, url).catch(() => {})
-  }
-
-  protected async sendViewportUserAgentOverride(
-    guest: Electron.WebContents,
-    mobile: boolean,
-    url?: string,
-    baseUserAgent?: string
-  ): Promise<void> {
-    if (guest.isDestroyed() || !guest.debugger.isAttached()) {
-      return
-    }
-    await guest.debugger.sendCommand(
-      'Emulation.setUserAgentOverride',
-      buildViewportUserAgentOverride({
-        url: url ?? this.resolveTabNavigationUrl(guest),
-        mobile,
-        // Why: the session UA is the profile's stable base identity. guest.getUserAgent() is not:
-        // applyGoogleAuthUserAgent leaves it pinned to the Firefox auth UA once a guest switches to
-        // the CDP override, so reading it back here would republish that identity on ordinary hosts.
-        baseUserAgent: baseUserAgent ?? getBrowserProcessUserAgentIdentity().userAgent,
-        googleAuthEnabled: getBrowserProcessUserAgentIdentity().mode === 'clean'
-      })
-    )
-  }
-
   /** Route guests own their own popup handler, so their denials arrive here instead. */
   reportRouteGuestPopupBlocked(input: { openerWebContentsId: number; url: string }): void {
     this.forwardOrQueuePopupEvent(input.openerWebContentsId, {
diff --git a/src/main/browser/browser-manager-registration.ts b/src/main/browser/browser-manager-registration.ts
index 816c0d61cb24..f6f7b41bbb9b 100644
--- a/src/main/browser/browser-manager-registration.ts
+++ b/src/main/browser/browser-manager-registration.ts
@@ -46,7 +46,7 @@ export abstract class BrowserManagerRegistration extends BrowserManagerGuestPoli
     const previousWebContentsId = this.webContentsIdByTabId.get(browserTabId)
     if (previousWebContentsId !== undefined && previousWebContentsId !== webContentsId) {
       this.retireStaleGuestWebContents(previousWebContentsId)
-      this.viewportPresetActiveByTabId.delete(browserTabId)
+      this.viewportPresetByTabId.delete(browserTabId)
       this.viewportScrollStateByTabId.delete(browserTabId)
     }
     this.webContentsIdByTabId.set(browserTabId, webContentsId)
@@ -135,8 +135,7 @@ export abstract class BrowserManagerRegistration extends BrowserManagerGuestPoli
     this.worktreeIdByTabId.delete(browserTabId)
     // Why: drop the viewport-op chain so the Map doesn't retain a promise keyed to a destroyed guest.
     this.viewportOpsByTabId.delete(browserTabId)
-    this.viewportUaOverrideMobileByTabId.delete(browserTabId)
-    this.viewportPresetActiveByTabId.delete(browserTabId)
+    this.viewportPresetByTabId.delete(browserTabId)
     this.viewportScrollStateByTabId.delete(browserTabId)
     if (wcId !== undefined) {
       this.pendingNavigationByGuestId.delete(wcId)
@@ -171,7 +170,7 @@ export abstract class BrowserManagerRegistration extends BrowserManagerGuestPoli
     const previousWebContentsId = this.webContentsIdByTabId.get(browserPageId)
     if (previousWebContentsId !== undefined && previousWebContentsId !== webContentsId) {
       this.retireStaleGuestWebContents(previousWebContentsId)
-      this.viewportPresetActiveByTabId.delete(browserPageId)
+      this.viewportPresetByTabId.delete(browserPageId)
       this.viewportScrollStateByTabId.delete(browserPageId)
     }
     this.webContentsIdByTabId.set(browserPageId, webContentsId)
@@ -206,10 +205,9 @@ export abstract class BrowserManagerRegistration extends BrowserManagerGuestPoli
     this.pageInitiatedTabBudgetByRootGuestId.clear()
     this.worktreeIdByTabId.clear()
     this.sessionProfileIdByPageId.clear()
-    this.viewportUaOverrideMobileByTabId.clear()
-    this.viewportPresetActiveByTabId.clear()
+    this.viewportPresetByTabId.clear()
     this.viewportScrollStateByTabId.clear()
-    this.authUserAgentOverrideStateByGuestId.clear()
+    this.cdpUserAgentOverrideStateByGuestId.clear()
     this.pendingNavigationByGuestId.clear()
     this.pendingLoadFailuresByGuestId.clear()
     this.loadErrorsByGuestId.clear()
diff --git a/src/main/browser/browser-manager-state.ts b/src/main/browser/browser-manager-state.ts
index da7fa256b4e0..da56552d6c41 100644
--- a/src/main/browser/browser-manager-state.ts
+++ b/src/main/browser/browser-manager-state.ts
@@ -9,7 +9,7 @@ import type { BrowserLoadError } from '../../shared/browser-workspace-types'
 import { resolveBrowserRouteGuestPopupOpener } from './browser-route-guest-popup-ownership'
 import type {
   ActiveDownload,
-  AuthUserAgentOverrideState,
+  CdpUserAgentOverrideState,
   PendingMainFrameNavigation,
   PendingPermissionEvent,
   PendingPopupEvent,
@@ -125,14 +125,11 @@ export abstract class BrowserManagerState extends BrowserManagerViewportScrollSt
   protected readonly sessionProfileIdByPageId = new Map<string, string | null>()
   // Why: serialize per-tab setViewportOverride so rapid toggles don't interleave CDP commands and leave emulation in a wrong state.
   protected readonly viewportOpsByTabId = new Map<string, Promise<unknown>>()
-  // Why: presence means the preset requires a CDP UA override (installed or in flight), so navigation
-  // can re-issue it against the target URL's identity.
-  protected readonly viewportUaOverrideMobileByTabId = new Map<string, boolean>()
   // Why: the confirmed CDP identity outranks getUserAgent; pending intent keeps rapid navigations
   // ordered without claiming a failed write was installed.
-  protected readonly authUserAgentOverrideStateByGuestId = new Map<
+  protected readonly cdpUserAgentOverrideStateByGuestId = new Map<
     number,
-    AuthUserAgentOverrideState
+    CdpUserAgentOverrideState
   >()
   // Why: the in-flight main-frame navigation target, held only until commit or failure — getURL()
   // still reports the outgoing page until then. See resolveTabNavigationUrl.
@@ -191,12 +188,11 @@ export abstract class BrowserManagerState extends BrowserManagerViewportScrollSt
     this.settingsResolver = resolver
   }
 
-  // Why: a debugger detach clears every CDP override Chromium holds, including the Google auth-host
-  // UA override, so the confirmed-override record must be dropped or the next auth navigation
-  // believes the identity is still installed and skips the write.
-  protected trackDebuggerDetachForAuthUserAgent(guest: Electron.WebContents): () => void {
+  // Why: a debugger detach clears every CDP override Chromium holds, including the UA override, so
+  // the confirmed-override record must be dropped or navigation believes an override still stands.
+  protected trackDebuggerDetachForUserAgentOverride(guest: Electron.WebContents): () => void {
     const onDetach = (): void => {
-      this.authUserAgentOverrideStateByGuestId.delete(guest.id)
+      this.cdpUserAgentOverrideStateByGuestId.delete(guest.id)
     }
     try {
       guest.debugger.on('detach', onDetach)
diff --git a/src/main/browser/browser-manager-tab-identity.test.ts b/src/main/browser/browser-manager-tab-identity.test.ts
new file mode 100644
index 000000000000..d8678a6e2cd0
--- /dev/null
+++ b/src/main/browser/browser-manager-tab-identity.test.ts
@@ -0,0 +1,385 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({
+  appGetPathMock: vi.fn(() => '/downloads'),
+  shellOpenExternalMock: vi.fn(),
+  browserWindowFromWebContentsMock: vi.fn(),
+  menuBuildFromTemplateMock: vi.fn(),
+  guestOffMock: vi.fn(),
+  guestOnMock: vi.fn(),
+  guestSetBackgroundThrottlingMock: vi.fn(),
+  guestSetWindowOpenHandlerMock: vi.fn(),
+  guestOpenDevToolsMock: vi.fn(),
+  webContentsFromIdMock: vi.fn(),
+  screenGetCursorScreenPointMock: vi.fn(() => ({ x: 0, y: 0 })),
+  openPopupWithOriginBarMock: vi.fn(),
+  processUserAgentMode: 'clean',
+  processUserAgent: ''
+}))
+
+vi.mock('electron', () => ({
+  app: { getPath: mocks.appGetPathMock },
+  BrowserWindow: { fromWebContents: mocks.browserWindowFromWebContentsMock },
+  clipboard: { writeText: vi.fn() },
+  shell: { openExternal: mocks.shellOpenExternalMock },
+  Menu: { buildFromTemplate: mocks.menuBuildFromTemplateMock },
+  screen: { getCursorScreenPoint: mocks.screenGetCursorScreenPointMock },
+  webContents: { fromId: mocks.webContentsFromIdMock }
+}))
+vi.mock('./popup-origin-bar-window', () => ({
+  openPopupWithOriginBar: mocks.openPopupWithOriginBarMock
+}))
+vi.mock('./browser-process-user-agent', () => ({
+  getBrowserProcessUserAgentIdentity: () => ({
+    mode: mocks.processUserAgentMode,
+    userAgent: mocks.processUserAgent
+  })
+}))
+
+import { browserManager } from './browser-manager'
+import { googleAuthUserAgent } from './browser-google-auth-ua'
+import { resetBrowserManagerMocks, resetBrowserManagerState } from './browser-manager-test-harness'
+import {
+  createViewportGuestFactory,
+  flushViewportOps,
+  GUEST_CLEAN_UA,
+  GUEST_ELECTRON_UA,
+  type ViewportGuestHandle
+} from './browser-manager-viewport-test-fixtures'
+
+const makeGuest = createViewportGuestFactory(mocks)
+const guests = new Map<number, Record<string, unknown>>()
+const PRESETS = {
+  none: null,
+  desktop: { width: 1440, height: 900, deviceScaleFactor: 1, mobile: false },
+  mobile: { width: 375, height: 667, deviceScaleFactor: 2, mobile: true }
+} as const
+type Preset = keyof typeof PRESETS
+const MODES = [
+  ['clean', GUEST_CLEAN_UA],
+  ['native', GUEST_ELECTRON_UA]
+] as const
+const ORDINARY_URL = 'https://example.com/'
+const AUTH_URL = 'https://accounts.google.com/v3/signin/identifier'
+const APP_TOKENS = /Electron\/|orca\//i
+let nextGuestId = 7000
+
+type Observed = {
+  presented: string
+  standingOverride: Record<string, unknown> | null
+  requestIdentity: ReturnType<typeof browserManager.resolveBrowserGuestRequestUserAgent>
+}
+
+/** Opens a tab on `url` the way a real load does: did-start-navigation runs before any preset. */
+function openTab(url: string): { tab: string; id: number; handle: ViewportGuestHandle } {
+  const id = nextGuestId++
+  const tab = `tab-${id}`
+  const handle = makeGuest(id, url)
+  guests.set(id, handle.guest)
+  expect(browserManager.registerOffscreenGuest({ browserPageId: tab, webContentsId: id })).toBe(
+    true
+  )
+  navigate(url)
+  return { tab, id, handle }
+}
+
+function navigate(url: string, { inPlace = false } = {}): void {
+  const didStartNavigation = mocks.guestOnMock.mock.calls.findLast(
+    ([event]) => event === 'did-start-navigation'
+  )?.[1]
+  expect(didStartNavigation).toBeTypeOf('function')
+  didStartNavigation(null, url, inPlace, true)
+}
+
+function redirectTo(url: string): void {
+  const willRedirect = mocks.guestOnMock.mock.calls.findLast(
+    ([event]) => event === 'will-redirect'
+  )?.[1]
+  willRedirect({ preventDefault: vi.fn() }, url, false, true)
+}
+
+// A redirect target that fails: the one failed-load path whose restore could otherwise write the UA.
+function failLoad(url: string): void {
+  redirectTo(url)
+  const didFailLoad = mocks.guestOnMock.mock.calls.findLast(
+    ([event]) => event === 'did-fail-load'
+  )?.[1]
+  didFailLoad(null, -102, 'ERR_CONNECTION_REFUSED', url, true)
+}
+
+async function observe(
+  { id, handle }: { id: number; handle: ViewportGuestHandle },
+  url: string
+): Promise<Observed> {
+  await flushViewportOps()
+  return {
+    presented: handle.presentedUserAgent(),
+    standingOverride: handle.standingUserAgentOverride(),
+    requestIdentity: browserManager.resolveBrowserGuestRequestUserAgent({
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the resolver reads no Session member.
+      session: handle.guest.session as Electron.Session,
+      url,
+      webContentsId: id
+    })
+  }
+}
+
+async function presentWith(url: string, preset: Preset): Promise<Observed> {
+  const opened = openTab(url)
+  const override = PRESETS[preset]
+  if (override) {
+    await browserManager.setViewportOverride(opened.tab, override)
+  }
+  return observe(opened, url)
+}
+
+// Why: Chromium drops navigator.userAgentData and every sec-ch-ua header for a UA override that
+// carries no userAgentMetadata, so only Firefox (which sends no hints) may stand without it.
+function expectClientHintsKept(observed: Observed): void {
+  const override = observed.standingOverride
+  if (override && override.userAgent !== googleAuthUserAgent()) {
+    expect(override.userAgentMetadata).toBeDefined()
+  }
+}
+
+describe('tab identity ownership', () => {
+  beforeEach(() => {
+    expect(process.env.ORCA_BACKGROUND_LAUNCH).toBe('1')
+    resetBrowserManagerMocks(mocks)
+    resetBrowserManagerState()
+    guests.clear()
+    mocks.webContentsFromIdMock.mockImplementation((id) => guests.get(id))
+  })
+  afterEach(() => {
+    browserManager.unregisterAll()
+    vi.restoreAllMocks()
+  })
+
+  describe.each(MODES)('in %s mode', (mode, processUserAgent) => {
+    beforeEach(() => {
+      mocks.processUserAgentMode = mode
+      mocks.processUserAgent = processUserAgent
+    })
+
+    it.each([ORDINARY_URL, AUTH_URL])(
+      'presents the same identity with a desktop preset as with none on %s',
+      async (url) => {
+        const none = await presentWith(url, 'none')
+        const desktop = await presentWith(url, 'desktop')
+        expect(desktop).toEqual(none)
+        expectClientHintsKept(desktop)
+        const expected =
+          mode === 'clean' && url === AUTH_URL ? googleAuthUserAgent() : processUserAgent
+        expect(desktop.presented).toBe(expected)
+        expect(desktop.requestIdentity.userAgent).toBe(expected)
+        expect(desktop.requestIdentity.kind).toBe(
+          expected === processUserAgent ? 'process' : 'google-auth'
+        )
+      }
+    )
+
+    it('presents the mobile identity with matching client hints on an ordinary host', async () => {
+      const observed = await presentWith(ORDINARY_URL, 'mobile')
+      expect(observed.presented).toContain('iPhone')
+      expect(observed.standingOverride).toMatchObject({
+        userAgentMetadata: expect.objectContaining({ mobile: true, platform: 'iOS' })
+      })
+      expect(observed.requestIdentity.kind).toBe('mobile')
+      expect(observed.requestIdentity.userAgent).toBe(observed.presented)
+    })
+
+    it('keeps the Google sign-in identity ahead of a mobile preset only in clean mode', async () => {
+      const observed = await presentWith(AUTH_URL, 'mobile')
+      expectClientHintsKept(observed)
+      if (mode === 'clean') {
+        expect(observed.presented).toBe(googleAuthUserAgent())
+        expect(observed.requestIdentity.kind).toBe('google-auth')
+      } else {
+        expect(observed.presented).toContain('iPhone')
+        expect(observed.requestIdentity.kind).toBe('mobile')
+      }
+    })
+
+    it.each(['desktop', 'none'] as const)(
+      'restores the process identity when switching from mobile to %s',
+      async (next) => {
+        const opened = openTab(ORDINARY_URL)
+        await browserManager.setViewportOverride(opened.tab, PRESETS.mobile)
+        expect(opened.handle.presentedUserAgent()).toContain('iPhone')
+
+        await browserManager.setViewportOverride(opened.tab, PRESETS[next])
+        const observed = await observe(opened, ORDINARY_URL)
+        expect(observed.presented).toBe(processUserAgent)
+        expect(observed.standingOverride).toBeNull()
+        expect(observed.requestIdentity).toEqual({ kind: 'process', userAgent: processUserAgent })
+      }
+    )
+  })
+
+  it('never puts the Electron or app tokens on a clean-mode tab under any preset', async () => {
+    mocks.processUserAgentMode = 'clean'
+    mocks.processUserAgent = GUEST_CLEAN_UA
+    for (const url of [ORDINARY_URL, AUTH_URL]) {
+      for (const preset of ['none', 'desktop', 'mobile'] as const) {
+        const observed = await presentWith(url, preset)
+        expect(observed.presented).not.toMatch(APP_TOKENS)
+        expect(observed.requestIdentity.userAgent).not.toMatch(APP_TOKENS)
+      }
+    }
+  })
+
+  // Why: Chromium rejects touch emulation with maxTouchPoints 0, so every step after it used to be
+  // skipped and the mobile UA outlived its preset. Identity is no longer a step after touch.
+  it('restores the process identity and reports the failure when touch emulation is rejected', async () => {
+    mocks.processUserAgentMode = 'clean'
+    mocks.processUserAgent = GUEST_CLEAN_UA
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const opened = openTab(ORDINARY_URL)
+    await browserManager.setViewportOverride(opened.tab, PRESETS.mobile)
+    // Rejects whatever the payload, so the test outlives a fix to the payload itself.
+    opened.handle.debuggerSendCommand.mockImplementation((method: string) =>
+      method === 'Emulation.setTouchEmulationEnabled'
+        ? Promise.reject(new Error('Touch points must be between 1 and 16'))
+        : Promise.resolve(undefined)
+    )
+
+    await expect(browserManager.setViewportOverride(opened.tab, PRESETS.desktop)).resolves.toBe(
+      false
+    )
+    const observed = await observe(opened, ORDINARY_URL)
+    expect(observed.presented).toBe(GUEST_CLEAN_UA)
+    expect(observed.standingOverride).toBeNull()
+    expect(warn).toHaveBeenCalledWith(
+      '[browser-manager] setViewportOverride: touch emulation failed',
+      expect.objectContaining({ error: 'Touch points must be between 1 and 16' })
+    )
+  })
+
+  it('still presents the requested mobile identity when device metrics fail', async () => {
+    mocks.processUserAgentMode = 'clean'
+    mocks.processUserAgent = GUEST_CLEAN_UA
+    vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const opened = openTab(ORDINARY_URL)
+    opened.handle.debuggerSendCommand.mockImplementation((method: string) =>
+      method === 'Emulation.setDeviceMetricsOverride'
+        ? Promise.reject(new Error('metrics failed'))
+        : Promise.resolve(undefined)
+    )
+
+    await expect(browserManager.setViewportOverride(opened.tab, PRESETS.mobile)).resolves.toBe(
+      false
+    )
+    expect((await observe(opened, ORDINARY_URL)).presented).toContain('iPhone')
+  })
+
+  it('heals a mid-redirect process override on the next navigation', async () => {
+    mocks.processUserAgentMode = 'clean'
+    mocks.processUserAgent = GUEST_CLEAN_UA
+    const opened = openTab(AUTH_URL)
+    await browserManager.setViewportOverride(opened.tab, PRESETS.desktop)
+    const willRedirect = mocks.guestOnMock.mock.calls.findLast(
+      ([event]) => event === 'will-redirect'
+    )?.[1]
+    willRedirect({ preventDefault: vi.fn() }, ORDINARY_URL, false, true)
+    // The WebContents UA still says Firefox, so clearing here would expose it on an ordinary host.
+    expect((await observe(opened, ORDINARY_URL)).presented).toBe(GUEST_CLEAN_UA)
+
+    navigate('https://example.org/')
+    const healed = await observe(opened, 'https://example.org/')
+    expect(healed.presented).toBe(GUEST_CLEAN_UA)
+    expect(healed.standingOverride).toBeNull()
+  })
+
+  // Why a table over every entry point: Chromium cancels a redirect, and reloads a loading document,
+  // when the WebContents UA changes anywhere but a cross-document navigation start.
+  it.each([
+    ['a redirect', () => redirectTo(ORDINARY_URL)],
+    ['a failed load', () => failLoad(ORDINARY_URL)],
+    ['a desktop preset', (tab: string) => browserManager.setViewportOverride(tab, PRESETS.desktop)],
+    ['a mobile preset', (tab: string) => browserManager.setViewportOverride(tab, PRESETS.mobile)],
+    ['clearing a preset', (tab: string) => browserManager.setViewportOverride(tab, null)],
+    ['a same-document navigation', () => navigate(`${AUTH_URL}#step`, { inPlace: true })]
+  ])(
+    'writes the WebContents UA only at a cross-document navigation start, not on %s',
+    async (_label, act) => {
+      mocks.processUserAgentMode = 'clean'
+      mocks.processUserAgent = GUEST_CLEAN_UA
+      const opened = openTab(AUTH_URL)
+      expect(opened.handle.guest.setUserAgent).toHaveBeenCalledOnce()
+
+      await act(opened.tab)
+      await flushViewportOps()
+      expect(opened.handle.guest.setUserAgent).toHaveBeenCalledOnce()
+
+      navigate('https://example.org/')
+      // Synchronous: the write must land inside did-start-navigation, before any await.
+      expect(opened.handle.guest.setUserAgent).toHaveBeenCalledTimes(2)
+      expect(opened.handle.webContentsUserAgent()).toBe(GUEST_CLEAN_UA)
+    }
+  )
+
+  // Why: setUserAgent() while a document loads makes Chromium reload it, and an OAuth callback that
+  // strips its code with replaceState would be requested twice — the one-time code replayed.
+  it('leaves the WebContents UA alone on a same-document navigation', async () => {
+    mocks.processUserAgentMode = 'clean'
+    mocks.processUserAgent = GUEST_CLEAN_UA
+    const opened = openTab(AUTH_URL)
+    const willRedirect = mocks.guestOnMock.mock.calls.findLast(
+      ([event]) => event === 'will-redirect'
+    )?.[1]
+    willRedirect({ preventDefault: vi.fn() }, `${ORDINARY_URL}callback?code=1`, false, true)
+    await flushViewportOps()
+
+    navigate(`${ORDINARY_URL}callback`, { inPlace: true })
+    expect(opened.handle.webContentsUserAgent()).toBe(googleAuthUserAgent())
+    expect((await observe(opened, ORDINARY_URL)).presented).toBe(GUEST_CLEAN_UA)
+
+    navigate('https://example.org/')
+    expect(opened.handle.webContentsUserAgent()).toBe(GUEST_CLEAN_UA)
+  })
+
+  // Why: a failed navigation commits an error page that is still loading at did-fail-load, and
+  // setUserAgent() then makes Chromium reload it — the failed request replayed.
+  it('leaves the WebContents UA alone when a redirected navigation fails', async () => {
+    mocks.processUserAgentMode = 'clean'
+    mocks.processUserAgent = GUEST_CLEAN_UA
+    const opened = openTab(ORDINARY_URL)
+    navigate(`${ORDINARY_URL}start`)
+    const willRedirect = mocks.guestOnMock.mock.calls.findLast(
+      ([event]) => event === 'will-redirect'
+    )?.[1]
+    willRedirect({ preventDefault: vi.fn() }, AUTH_URL, false, true)
+    await flushViewportOps()
+
+    opened.handle.commitNavigationTo(AUTH_URL)
+    const didFailLoad = mocks.guestOnMock.mock.calls.findLast(
+      ([event]) => event === 'did-fail-load'
+    )?.[1]
+    didFailLoad(null, -102, 'ERR_CONNECTION_REFUSED', AUTH_URL, true)
+    expect(opened.handle.webContentsUserAgent()).toBe(GUEST_CLEAN_UA)
+    const observed = await observe(opened, AUTH_URL)
+    expect(observed.presented).toBe(googleAuthUserAgent())
+    expect(observed.requestIdentity.kind).toBe('google-auth')
+  })
+
+  // Why: a debugger that cannot attach (DevTools open on the guest) installs no mobile identity, so
+  // requests claiming one would disagree with the document's own navigator.userAgent.
+  it('keeps requests on the presented identity when a mobile preset cannot attach', async () => {
+    mocks.processUserAgentMode = 'clean'
+    mocks.processUserAgent = GUEST_CLEAN_UA
+    vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const opened = openTab(ORDINARY_URL)
+    opened.handle.debuggerIsAttached.mockReturnValue(false)
+    opened.handle.debuggerAttach.mockImplementation(() => {
+      throw new Error('Another debugger is already attached')
+    })
+
+    await expect(browserManager.setViewportOverride(opened.tab, PRESETS.mobile)).resolves.toBe(
+      false
+    )
+    navigate('https://example.org/')
+    const observed = await observe(opened, 'https://example.org/')
+    expect(observed.presented).toBe(GUEST_CLEAN_UA)
+    expect(observed.requestIdentity).toEqual({ kind: 'process', userAgent: GUEST_CLEAN_UA })
+  })
+})
diff --git a/src/main/browser/browser-manager-types.ts b/src/main/browser/browser-manager-types.ts
index 3d3825d6ebe5..302cf6468ed7 100644
--- a/src/main/browser/browser-manager-types.ts
+++ b/src/main/browser/browser-manager-types.ts
@@ -1,4 +1,5 @@
 import { normalizeExternalBrowserUrl } from '../../shared/browser-url'
+import type { UserAgentMetadata } from './browser-tab-identity'
 import type {
   BrowserDownloadFinishedEvent,
   BrowserDownloadProgressEvent,
@@ -60,15 +61,21 @@ export type PendingMainFrameNavigation = {
   supersededUrls: string[]
 }
 
-export type AuthUserAgentOverrideOperation = {
-  sequence: number
+/** An Emulation.setUserAgentOverride payload; an empty userAgent clears the override. */
+export type CdpUserAgentOverride = {
   userAgent: string
+  userAgentMetadata?: UserAgentMetadata
+}
+
+export type CdpUserAgentOverrideOperation = {
+  sequence: number
+  override: CdpUserAgentOverride
 }
 
-export type AuthUserAgentOverrideState = {
-  confirmed: AuthUserAgentOverrideOperation | null
+export type CdpUserAgentOverrideState = {
+  confirmed: CdpUserAgentOverrideOperation | null
   nextSequence: number
-  pending: AuthUserAgentOverrideOperation[]
+  pending: CdpUserAgentOverrideOperation[]
 }
 
 export const SAFE_POPUP_WINDOW_OPTIONS = {
diff --git a/src/main/browser/browser-manager-viewport-crashed-guest.test.ts b/src/main/browser/browser-manager-viewport-crashed-guest.test.ts
new file mode 100644
index 000000000000..696be1a474ba
--- /dev/null
+++ b/src/main/browser/browser-manager-viewport-crashed-guest.test.ts
@@ -0,0 +1,80 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({
+  appGetPathMock: vi.fn(() => '/downloads'),
+  shellOpenExternalMock: vi.fn(),
+  browserWindowFromWebContentsMock: vi.fn(),
+  menuBuildFromTemplateMock: vi.fn(),
+  guestOffMock: vi.fn(),
+  guestOnMock: vi.fn(),
+  guestSetBackgroundThrottlingMock: vi.fn(),
+  guestSetWindowOpenHandlerMock: vi.fn(),
+  guestOpenDevToolsMock: vi.fn(),
+  webContentsFromIdMock: vi.fn(),
+  screenGetCursorScreenPointMock: vi.fn(() => ({ x: 0, y: 0 })),
+  openPopupWithOriginBarMock: vi.fn(),
+  processUserAgent:
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36'
+}))
+
+vi.mock('electron', () => ({
+  app: { getPath: mocks.appGetPathMock },
+  BrowserWindow: { fromWebContents: mocks.browserWindowFromWebContentsMock },
+  clipboard: { writeText: vi.fn() },
+  shell: { openExternal: mocks.shellOpenExternalMock },
+  Menu: { buildFromTemplate: mocks.menuBuildFromTemplateMock },
+  screen: { getCursorScreenPoint: mocks.screenGetCursorScreenPointMock },
+  webContents: { fromId: mocks.webContentsFromIdMock }
+}))
+vi.mock('./popup-origin-bar-window', () => ({
+  openPopupWithOriginBar: mocks.openPopupWithOriginBarMock
+}))
+vi.mock('./browser-process-user-agent', () => ({
+  getBrowserProcessUserAgentIdentity: () => ({ mode: 'clean', userAgent: mocks.processUserAgent })
+}))
+
+import { browserManager } from './browser-manager'
+import {
+  rendererWebContentsId,
+  resetBrowserManagerMocks,
+  resetBrowserManagerState
+} from './browser-manager-test-harness'
+import { createViewportGuestFactory } from './browser-manager-viewport-test-fixtures'
+
+const makeGuest = createViewportGuestFactory(mocks)
+const PHONE = { width: 375, height: 667, deviceScaleFactor: 2, mobile: true } as const
+
+const metricsWrites = (sendCommand: ReturnType<typeof vi.fn>): unknown[][] =>
+  sendCommand.mock.calls.filter(([method]) => method === 'Emulation.setDeviceMetricsOverride')
+
+describe('browserManager viewport on a guest whose renderer crashed', () => {
+  beforeEach(() => {
+    resetBrowserManagerMocks(mocks)
+    resetBrowserManagerState()
+    vi.spyOn(console, 'warn').mockImplementation(() => {})
+  })
+
+  it('never resizes the dead guest, and applies the preset once the page reloads', async () => {
+    const { guest, debuggerSendCommand, setRendererCrashed } = makeGuest(42501)
+    mocks.webContentsFromIdMock.mockReturnValue(guest)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the viewport fixture implements every WebContents member these paths touch.
+    browserManager.attachGuestPolicies(guest as never)
+    browserManager.registerGuest({
+      browserPageId: 'tab-crashed',
+      webContentsId: 42501,
+      rendererWebContentsId
+    })
+
+    // Chromium would segfault the main process on this write (its view is gone with the renderer).
+    setRendererCrashed(true)
+    await expect(browserManager.setViewportOverride('tab-crashed', PHONE)).resolves.toBe(false)
+    expect(metricsWrites(debuggerSendCommand)).toEqual([])
+
+    // The reloaded page's dom-ready reapplies the store's preset.
+    setRendererCrashed(false)
+    await expect(browserManager.setViewportOverride('tab-crashed', PHONE)).resolves.toBe(true)
+    expect(metricsWrites(debuggerSendCommand)).toEqual([
+      ['Emulation.setDeviceMetricsOverride', PHONE]
+    ])
+  })
+})
diff --git a/src/main/browser/browser-manager-viewport-override.test.ts b/src/main/browser/browser-manager-viewport-override.test.ts
index 41835a6cd3ea..03dd699aa0c0 100644
--- a/src/main/browser/browser-manager-viewport-override.test.ts
+++ b/src/main/browser/browser-manager-viewport-override.test.ts
@@ -156,7 +156,8 @@ describe('browserManager', () => {
         if (mobile) {
           expect(userAgentOverride).toMatchObject({ userAgent: expect.stringContaining('iPhone') })
         } else {
-          expect(userAgentOverride).toEqual({ userAgent: GUEST_ELECTRON_UA })
+          // A desktop preset presents the process identity itself, so there is nothing to override.
+          expect(userAgentOverride).toBeUndefined()
         }
       }
     )
@@ -193,8 +194,8 @@ describe('browserManager', () => {
       }
     )
 
-    it('re-issues the standing UA override when navigating onto and back off an auth host', async () => {
-      const { guest, debuggerSendCommand } = makeGuest(4247)
+    it('keeps a desktop-preset tab on the right identity onto and back off an auth host', async () => {
+      const { guest, debuggerSendCommand, presentedUserAgent } = makeGuest(4247)
       webContentsFromIdMock.mockReturnValue(guest)
       browserManager.attachGuestPolicies(guest as never)
       browserManager.registerGuest({
@@ -214,30 +215,25 @@ describe('browserManager', () => {
         isMainFrame: boolean
       ) => void
 
-      // Case A: the desktop preset lands first, while the tab is still off the auth host.
+      // The desktop preset lands first, while the tab is still off the auth host.
       await browserManager.setViewportOverride('tab-auth-nav', {
         width: 1024,
         height: 768,
         deviceScaleFactor: 1,
         mobile: false
       })
-      expect(debuggerSendCommand).toHaveBeenLastCalledWith('Emulation.setUserAgentOverride', {
-        userAgent: GUEST_CLEAN_UA
-      })
+      expect(lastUserAgentOverride(debuggerSendCommand)).toBeUndefined()
+      expect(presentedUserAgent()).toBe(GUEST_CLEAN_UA)
 
-      // Navigating to the auth host must move the standing override to the Firefox identity.
-      debuggerSendCommand.mockClear()
       didStartNavigation(null, 'https://accounts.google.com/v3/signin/identifier', false, true)
       await flushViewportOps()
-      expect(debuggerSendCommand).toHaveBeenCalledWith('Emulation.setUserAgentOverride', {
-        userAgent: googleAuthUserAgent()
-      })
+      expect(presentedUserAgent()).toBe(googleAuthUserAgent())
 
-      // Leaving the auth host restores the clean Chrome-shaped preset UA.
-      debuggerSendCommand.mockClear()
+      // A redirect cannot rewrite the Firefox WebContents UA, so the override carries the process UA.
       willRedirect({ preventDefault: vi.fn() }, 'https://example.com/', false, true)
       await flushViewportOps()
-      expect(lastUserAgentOverride(debuggerSendCommand)).toEqual({ userAgent: GUEST_CLEAN_UA })
+      expect(guest.setUserAgent).toHaveBeenCalledTimes(1)
+      expect(presentedUserAgent()).toBe(GUEST_CLEAN_UA)
     })
 
     // Why: not an ordering race — debugger.sendCommand dispatches in call order over one channel, so
@@ -255,12 +251,13 @@ describe('browserManager', () => {
       return calls.at(-1)?.[1] as Record<string, unknown> | undefined
     }
 
-    // Why mobile: on the desktop branch the break is masked by coincidence — applyGoogleAuthUserAgent
-    // has already switched the WebContents UA to Firefox, and cleanElectronUserAgent passes a Firefox
-    // UA through untouched, so the stale-URL desktop path happens to emit Firefox anyway. The mobile
-    // branch derives a Chrome-shaped iPhone UA from that same base and exposes the real defect.
+    // Why mobile: a desktop preset installs no override at all, so only the mobile write can leave a
+    // Chrome-shaped UA standing on the auth host.
     it('does not leave the Chrome preset UA standing when a mobile preset lands mid-navigation onto an auth host', async () => {
-      const { guest, debuggerSendCommand } = makeGuest(4251, 'https://example.com/')
+      const { guest, debuggerSendCommand, presentedUserAgent } = makeGuest(
+        4251,
+        'https://example.com/'
+      )
       // Hold the preset's first CDP command open so the navigation lands inside its await window.
       let releaseMetrics = (): void => {}
       const metricsGate = new Promise<void>((resolve) => {
@@ -294,13 +291,18 @@ describe('browserManager', () => {
 
       // Without a shared chain + shared URL source, the preset resumes, reads getURL() as the
       // pre-navigation host, and pins the tab to the Chrome-shaped UA while it is on the auth host.
-      expect(lastUserAgentOverride(debuggerSendCommand)).toEqual({
-        userAgent: googleAuthUserAgent()
-      })
+      expect(presentedUserAgent()).toBe(googleAuthUserAgent())
+      expect(debuggerSendCommand).not.toHaveBeenCalledWith(
+        'Emulation.setUserAgentOverride',
+        expect.objectContaining({ userAgent: expect.stringContaining('iPhone') })
+      )
     })
 
     it('does not leave the Firefox UA standing when a preset lands mid-navigation off an auth host', async () => {
-      const { guest, debuggerSendCommand } = makeGuest(4252, 'https://accounts.google.com/')
+      const { guest, debuggerSendCommand, presentedUserAgent } = makeGuest(
+        4252,
+        'https://accounts.google.com/'
+      )
       webContentsFromIdMock.mockReturnValue(guest)
       browserManager.attachGuestPolicies(guest as never)
       browserManager.registerGuest({
@@ -347,11 +349,12 @@ describe('browserManager', () => {
 
       // Without the fix the resuming preset re-reads getURL() as the auth host and clobbers the
       // navigation's correct write, stranding the Firefox UA on a non-auth page.
-      expect(lastUserAgentOverride(debuggerSendCommand)).toEqual({ userAgent: GUEST_CLEAN_UA })
+      expect(presentedUserAgent()).toBe(GUEST_CLEAN_UA)
+      expect(lastUserAgentOverride(debuggerSendCommand)).toEqual({ userAgent: '' })
     })
 
     it('falls back to the committed URL once a navigation commits or fails', async () => {
-      const { guest, debuggerSendCommand, commitNavigationTo } = makeGuest(
+      const { guest, debuggerSendCommand, commitNavigationTo, presentedUserAgent } = makeGuest(
         4253,
         'https://example.com/'
       )
@@ -392,8 +395,9 @@ describe('browserManager', () => {
       didFailLoad(null, -3, 'Aborted', 'https://accounts.google.com/', true)
       await flushViewportOps()
 
-      expect(guest.setUserAgent).toHaveBeenLastCalledWith(GUEST_CLEAN_UA)
-      expect(lastUserAgentOverride(debuggerSendCommand)).toEqual({ userAgent: GUEST_CLEAN_UA })
+      // The restore goes over CDP: only did-start-navigation wrote the WebContents UA.
+      expect(guest.setUserAgent).toHaveBeenCalledOnce()
+      expect(presentedUserAgent()).toBe(GUEST_CLEAN_UA)
 
       // A later preset must also resolve the committed, non-auth URL.
       debuggerSendCommand.mockClear()
@@ -407,7 +411,6 @@ describe('browserManager', () => {
       didNavigate(null, 'https://accounts.google.com/signin')
       await flushViewportOps()
 
-      debuggerSendCommand.mockClear()
       await browserManager.setViewportOverride('tab-pending-cleared', {
         width: 1024,
         height: 768,
@@ -415,13 +418,14 @@ describe('browserManager', () => {
         mobile: false
       })
       await flushViewportOps()
-      expect(lastUserAgentOverride(debuggerSendCommand)).toEqual({
-        userAgent: googleAuthUserAgent()
-      })
+      expect(presentedUserAgent()).toBe(googleAuthUserAgent())
     })
 
     it('does not let a superseded navigation failure revert a newer target', async () => {
-      const { guest, debuggerSendCommand } = makeGuest(4255, 'https://example.com/')
+      const { guest, debuggerSendCommand, presentedUserAgent } = makeGuest(
+        4255,
+        'https://example.com/'
+      )
       webContentsFromIdMock.mockReturnValue(guest)
       browserManager.attachGuestPolicies(guest as never)
       browserManager.registerGuest({
@@ -460,20 +464,19 @@ describe('browserManager', () => {
       willRedirect({ preventDefault: vi.fn() }, 'https://accounts.google.com/same', false, true)
       didStartNavigation(null, 'https://accounts.google.com/same', false, true)
       await flushViewportOps()
-      expect(lastUserAgentOverride(debuggerSendCommand)).toEqual({
-        userAgent: googleAuthUserAgent()
-      })
+      expect(presentedUserAgent()).toBe(googleAuthUserAgent())
 
       debuggerSendCommand.mockClear()
       didFailLoad(null, -3, 'Aborted', 'https://accounts.google.com/same', true)
       await flushViewportOps()
 
-      // Why: the redirect path never writes the WebContents UA — that write cancels the navigation.
-      expect(guest.setUserAgent).not.toHaveBeenCalled()
+      // Only the direct navigation onto the auth host wrote the WebContents UA.
+      expect(guest.setUserAgent).toHaveBeenCalledOnce()
       expect(debuggerSendCommand).not.toHaveBeenCalledWith(
         'Emulation.setUserAgentOverride',
-        expect.objectContaining({ userAgent: GUEST_CLEAN_UA })
+        expect.anything()
       )
+      expect(presentedUserAgent()).toBe(googleAuthUserAgent())
     })
 
     it('switches identity for a server redirect and restores it if the redirect fails', async () => {
@@ -529,10 +532,11 @@ describe('browserManager', () => {
         userAgent: googleAuthUserAgent()
       })
 
+      // The WebContents UA never left the process identity, so restoring it clears the override.
       didFailLoad(null, -3, 'Aborted', 'https://accounts.google.com/redirected', true)
       await flushViewportOps()
       expect(guest.setUserAgent).not.toHaveBeenCalled()
-      expect(lastUserAgentOverride(debuggerSendCommand)).toEqual({ userAgent: GUEST_CLEAN_UA })
+      expect(lastUserAgentOverride(debuggerSendCommand)).toEqual({ userAgent: '' })
     })
 
     it('preserves the auth identity when a viewport preset is cleared after a redirect', async () => {
@@ -584,7 +588,11 @@ describe('browserManager', () => {
       })
       await browserManager.setViewportOverride('tab-mobile-popup-owner', MOBILE_VIEWPORT_OVERRIDE)
 
-      const { guest: popupGuest, debuggerSendCommand } = makeGuest(4264, 'https://mail.google.com/')
+      const {
+        guest: popupGuest,
+        debuggerSendCommand,
+        presentedUserAgent
+      } = makeGuest(4264, 'https://mail.google.com/')
       const popupOn = vi.fn()
       popupGuest.on = popupOn
       browserManager.attachGuestPolicies(popupGuest as never, {
@@ -607,11 +615,18 @@ describe('browserManager', () => {
       didStartNavigation(null, 'https://example.com/', false, true)
       await flushViewportOps()
 
-      expect(lastUserAgentOverride(debuggerSendCommand)).toEqual({ userAgent: GUEST_CLEAN_UA })
+      expect(presentedUserAgent()).toBe(GUEST_CLEAN_UA)
+      expect(debuggerSendCommand).not.toHaveBeenCalledWith(
+        'Emulation.setUserAgentOverride',
+        expect.objectContaining({ userAgent: expect.stringContaining('iPhone') })
+      )
     })
 
     it('reapplies a preset when navigation starts during its final UA write', async () => {
-      const { guest, debuggerSendCommand } = makeGuest(4257, 'https://example.com/')
+      const { guest, debuggerSendCommand, presentedUserAgent } = makeGuest(
+        4257,
+        'https://example.com/'
+      )
       let releaseFirstUa = (): void => {}
       const firstUaGate = new Promise<void>((resolve) => {
         releaseFirstUa = resolve
@@ -634,25 +649,26 @@ describe('browserManager', () => {
         ([event]) => event === 'did-start-navigation'
       )?.[1] as (event: unknown, url: string, isInPlace: boolean, isMainFrame: boolean) => void
 
-      const presetDone = browserManager.setViewportOverride('tab-final-apply-race', {
-        width: 1024,
-        height: 768,
-        deviceScaleFactor: 1,
-        mobile: false
-      })
+      const presetDone = browserManager.setViewportOverride(
+        'tab-final-apply-race',
+        MOBILE_VIEWPORT_OVERRIDE
+      )
       await flushViewportOps()
       didStartNavigation(null, 'https://accounts.google.com/', false, true)
       await flushViewportOps()
 
-      expect(lastUserAgentOverride(debuggerSendCommand)).toEqual({
-        userAgent: googleAuthUserAgent()
-      })
+      // The navigation's write is issued after the held mobile write, so it wins however they settle.
       releaseFirstUa()
       await presetDone
+      await flushViewportOps()
+      expect(presentedUserAgent()).toBe(googleAuthUserAgent())
     })
 
     it('does not reinstall a preset while its final UA clear is in flight', async () => {
-      const { guest, debuggerSendCommand } = makeGuest(4258, 'https://example.com/')
+      const { guest, debuggerSendCommand, presentedUserAgent } = makeGuest(
+        4258,
+        'https://example.com/'
+      )
       webContentsFromIdMock.mockReturnValue(guest)
       browserManager.attachGuestPolicies(guest as never)
       browserManager.registerGuest({
@@ -664,12 +680,7 @@ describe('browserManager', () => {
         ([event]) => event === 'did-start-navigation'
       )?.[1] as (event: unknown, url: string, isInPlace: boolean, isMainFrame: boolean) => void
 
-      await browserManager.setViewportOverride('tab-final-clear-race', {
-        width: 1024,
-        height: 768,
-        deviceScaleFactor: 1,
-        mobile: false
-      })
+      await browserManager.setViewportOverride('tab-final-clear-race', MOBILE_VIEWPORT_OVERRIDE)
       let releaseClearUa = (): void => {}
       const clearUaGate = new Promise<void>((resolve) => {
         releaseClearUa = resolve
@@ -686,19 +697,25 @@ describe('browserManager', () => {
       debuggerSendCommand.mockClear()
       didStartNavigation(null, 'https://accounts.google.com/', false, true)
       await flushViewportOps()
-      expect(debuggerSendCommand).not.toHaveBeenCalledWith('Emulation.setUserAgentOverride', {
-        userAgent: googleAuthUserAgent()
-      })
+      expect(debuggerSendCommand).not.toHaveBeenCalledWith(
+        'Emulation.setUserAgentOverride',
+        expect.objectContaining({ userAgent: expect.stringContaining('iPhone') })
+      )
 
       releaseClearUa()
       await clearDone
+      await flushViewportOps()
+      expect(presentedUserAgent()).toBe(googleAuthUserAgent())
     })
 
     // Why: a failed clear leaves the CDP override standing on the target. Dropping the tracking entry
     // first makes it untracked, so the navigation path can never correct it again and the tab carries
     // a Chrome-shaped navigator.userAgent onto the auth hosts — the exact failure this PR prevents.
     it('keeps tracking the standing override when the CDP clear fails', async () => {
-      const { guest, debuggerSendCommand } = makeGuest(4254, 'https://example.com/')
+      const { guest, debuggerSendCommand, presentedUserAgent } = makeGuest(
+        4254,
+        'https://example.com/'
+      )
       webContentsFromIdMock.mockReturnValue(guest)
       browserManager.attachGuestPolicies(guest as never)
       browserManager.registerGuest({
@@ -710,15 +727,10 @@ describe('browserManager', () => {
         ([event]) => event === 'did-start-navigation'
       )?.[1] as (event: unknown, url: string, isInPlace: boolean, isMainFrame: boolean) => void
 
-      await browserManager.setViewportOverride('tab-failed-clear', {
-        width: 1024,
-        height: 768,
-        deviceScaleFactor: 1,
-        mobile: false
-      })
+      await browserManager.setViewportOverride('tab-failed-clear', MOBILE_VIEWPORT_OVERRIDE)
       await flushViewportOps()
 
-      // The final UA clear fails after tracking was optimistically removed.
+      // The final UA clear fails, leaving the mobile override standing.
       debuggerSendCommand.mockImplementation(
         (method: string, params: { userAgent?: string } | undefined) =>
           method === 'Emulation.setUserAgentOverride' && params?.userAgent === ''
@@ -736,8 +748,9 @@ describe('browserManager', () => {
       didStartNavigation(null, 'https://accounts.google.com/v3/signin/identifier', false, true)
       await flushViewportOps()
       expect(debuggerSendCommand).toHaveBeenCalledWith('Emulation.setUserAgentOverride', {
-        userAgent: googleAuthUserAgent()
+        userAgent: ''
       })
+      expect(presentedUserAgent()).toBe(googleAuthUserAgent())
     })
 
     it('does not touch the UA override on navigation when no preset is standing', async () => {
@@ -774,12 +787,7 @@ describe('browserManager', () => {
         ([event]) => event === 'did-start-navigation'
       )?.[1] as (event: unknown, url: string, isInPlace: boolean, isMainFrame: boolean) => void
 
-      await browserManager.setViewportOverride('tab-cleared-preset', {
-        width: 1024,
-        height: 768,
-        deviceScaleFactor: 1,
-        mobile: false
-      })
+      await browserManager.setViewportOverride('tab-cleared-preset', MOBILE_VIEWPORT_OVERRIDE)
       await browserManager.setViewportOverride('tab-cleared-preset', null)
 
       debuggerSendCommand.mockClear()
@@ -791,7 +799,7 @@ describe('browserManager', () => {
       )
     })
 
-    it('reapplies the native process identity instead of the Google exception', async () => {
+    it('keeps a native-mode mobile preset off the Google exception on navigation', async () => {
       browserMocks.processUserAgentMode = 'native'
       browserMocks.processUserAgent = GUEST_ELECTRON_UA
       const { guest, debuggerSendCommand } = makeGuest(4250)
@@ -807,17 +815,13 @@ describe('browserManager', () => {
         ([event]) => event === 'did-start-navigation'
       )?.[1] as (event: unknown, url: string, isInPlace: boolean, isMainFrame: boolean) => void
 
-      await browserManager.setViewportOverride('tab-native-nav', {
-        width: 1024,
-        height: 768,
-        deviceScaleFactor: 1,
-        mobile: false
-      })
+      await browserManager.setViewportOverride('tab-native-nav', MOBILE_VIEWPORT_OVERRIDE)
       debuggerSendCommand.mockClear()
       didStartNavigation(null, 'https://accounts.google.com/', false, true)
       await flushViewportOps()
-      expect(debuggerSendCommand).toHaveBeenCalledWith('Emulation.setUserAgentOverride', {
-        userAgent: GUEST_ELECTRON_UA
+      expect(guest.setUserAgent).not.toHaveBeenCalled()
+      expect(lastUserAgentOverride(debuggerSendCommand)).toMatchObject({
+        userAgent: expect.stringContaining('iPhone')
       })
     })
 
@@ -836,12 +840,28 @@ describe('browserManager', () => {
 
       expect(debuggerSendCommand).toHaveBeenCalledWith('Emulation.clearDeviceMetricsOverride', {})
       expect(debuggerSendCommand).toHaveBeenCalledWith('Emulation.setTouchEmulationEnabled', {
-        enabled: false,
-        maxTouchPoints: 0
+        enabled: false
       })
-      expect(debuggerSendCommand).toHaveBeenCalledWith('Emulation.setUserAgentOverride', {
-        userAgent: ''
+      // Nothing overrode the identity, so there is nothing to clear.
+      expect(lastUserAgentOverride(debuggerSendCommand)).toBeUndefined()
+    })
+
+    it('clears the mobile identity for override=null', async () => {
+      const { guest, debuggerSendCommand, presentedUserAgent } = makeGuest(4344)
+      webContentsFromIdMock.mockReturnValue(guest)
+      browserManager.attachGuestPolicies(guest as never)
+      browserManager.registerGuest({
+        browserPageId: 'tab-clear-mobile',
+        webContentsId: guest.id as number,
+        rendererWebContentsId
       })
+
+      await browserManager.setViewportOverride('tab-clear-mobile', MOBILE_VIEWPORT_OVERRIDE)
+      await expect(browserManager.setViewportOverride('tab-clear-mobile', null)).resolves.toBe(true)
+      await flushViewportOps()
+
+      expect(lastUserAgentOverride(debuggerSendCommand)).toEqual({ userAgent: '' })
+      expect(presentedUserAgent()).toBe(GUEST_CLEAN_UA)
     })
 
     it('attaches the debugger if not already attached and does not detach after', async () => {
diff --git a/src/main/browser/browser-manager-viewport-ownership.test.ts b/src/main/browser/browser-manager-viewport-ownership.test.ts
index 8b4492f36fd5..db2d0b9a38f4 100644
--- a/src/main/browser/browser-manager-viewport-ownership.test.ts
+++ b/src/main/browser/browser-manager-viewport-ownership.test.ts
@@ -50,16 +50,16 @@ const mobile = { width: 375, height: 667, deviceScaleFactor: 2, mobile: true }
 const desktop = { width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }
 const guests = new Map<number, Record<string, unknown>>()
 const registeredGuests = readViewportStateMap('webContentsIdByTabId')
-const uaIntents = readViewportStateMap('viewportUaOverrideMobileByTabId')
-const presetIntents = readViewportStateMap('viewportPresetActiveByTabId')
+const presetIntents = readViewportStateMap('viewportPresetByTabId')
 const pendingOperations = readViewportStateMap('viewportOpsByTabId')
+const cdpUserAgentOverrides = readViewportStateMap('cdpUserAgentOverrideStateByGuestId')
 
 function readViewportStateMap(
   name:
     | 'webContentsIdByTabId'
-    | 'viewportUaOverrideMobileByTabId'
-    | 'viewportPresetActiveByTabId'
+    | 'viewportPresetByTabId'
     | 'viewportOpsByTabId'
+    | 'cdpUserAgentOverrideStateByGuestId'
 ): Map<unknown, unknown> {
   const value: unknown = browserManager[name]
   if (!(value instanceof Map)) {
@@ -116,7 +116,7 @@ describe('browser viewport operation ownership', () => {
     const result = browserManager.setViewportOverride('closed', mobile)
     await gate.entered
     browserManager.unregisterGuest('closed')
-    expect(uaIntents.size).toBe(0)
+    expect(presetIntents.size).toBe(0)
     const isDestroyed = handle.guest.isDestroyed
     expect(vi.isMockFunction(isDestroyed)).toBe(true)
     if (vi.isMockFunction(isDestroyed)) {
@@ -126,7 +126,7 @@ describe('browser viewport operation ownership', () => {
     await expect(result).resolves.toBe(false)
     expect(registeredGuests.size).toBe(0)
     expect(presetIntents.size).toBe(0)
-    expect(uaIntents.get('closed')).toBeUndefined()
+    expect(cdpUserAgentOverrides.size).toBe(0)
   })
 
   it('does not restore closed-tab UA intent after a failed clear', async () => {
@@ -143,7 +143,8 @@ describe('browser viewport operation ownership', () => {
     }
     gate.reject(new Error('Target closed'))
     await expect(result).resolves.toBe(false)
-    expect(uaIntents.get('clear-close')).toBeUndefined()
+    expect(presetIntents.get('clear-close')).toBeUndefined()
+    expect(cdpUserAgentOverrides.size).toBe(0)
   })
 
   it('preserves replacement desktop intent after an old clear fails', async () => {
@@ -155,14 +156,12 @@ describe('browser viewport operation ownership', () => {
     browserManager.unregisterGuest('replacement')
     register('replacement', 103)
     await expect(browserManager.setViewportOverride('replacement', desktop)).resolves.toBe(true)
-    expect(uaIntents.get('replacement')).toBe(false)
     gate.reject(new Error('Old target closed'))
     await expect(result).resolves.toBe(false)
     expect(registeredGuests.get('replacement')).toBe(103)
-    expect(uaIntents.get('replacement')).toBe(false)
     expect(presetIntents.get('replacement')).toEqual({
       guestWebContentsId: 103,
-      active: true
+      override: desktop
     })
   })
 
@@ -177,11 +176,13 @@ describe('browser viewport operation ownership', () => {
     await browserManager.setViewportOverride('late-delete', mobile)
     gate.resolve()
     await expect(result).resolves.toBe(false)
-    expect(uaIntents.has('late-delete')).toBe(true)
+    expect(presetIntents.get('late-delete')).toEqual({ guestWebContentsId: 105, override: mobile })
     expect(registeredGuests.get('late-delete')).toBe(105)
   })
 
-  it('same-owner clear failure still restores the legitimate earlier intent', async () => {
+  // The request is still "no preset"; what survives the failure is the record that the mobile
+  // override stands, which is what lets the next navigation clear it.
+  it('same-owner clear failure keeps the standing mobile override tracked', async () => {
     const handle = register('same-owner', 106)
     await browserManager.setViewportOverride('same-owner', mobile)
     const gate = pause(handle, 'Emulation.setUserAgentOverride')
@@ -189,7 +190,9 @@ describe('browser viewport operation ownership', () => {
     await gate.entered
     gate.reject(new Error('Protocol error'))
     await expect(result).resolves.toBe(false)
-    expect(uaIntents.get('same-owner')).toBe(true)
+    expect(presetIntents.get('same-owner')).toEqual({ guestWebContentsId: 106, override: null })
+    expect(handle.presentedUserAgent()).toContain('iPhone')
+    expect(cdpUserAgentOverrides.has(106)).toBe(true)
   })
 
   it('old apply cannot overwrite a replacement guest desktop intent', async () => {
@@ -202,7 +205,11 @@ describe('browser viewport operation ownership', () => {
     await browserManager.setViewportOverride('late-apply', desktop)
     gate.resolve()
     await expect(pending).resolves.toBe(false)
-    expect(uaIntents.get('late-apply')).toBe(false)
+    expect(presetIntents.get('late-apply')).toEqual({ guestWebContentsId: 111, override: desktop })
+    expect(old.debuggerSendCommand).not.toHaveBeenCalledWith(
+      'Emulation.setUserAgentOverride',
+      expect.anything()
+    )
   })
 
   it('an old guest cannot write UA intent after replacement in native process mode', async () => {
@@ -216,7 +223,11 @@ describe('browser viewport operation ownership', () => {
     register('native-replacement', 113)
     gate.resolve()
     await expect(pending).resolves.toBe(false)
-    expect(uaIntents.get('native-replacement')).toBeUndefined()
+    expect(presetIntents.get('native-replacement')).toBeUndefined()
+    expect(old.debuggerSendCommand).not.toHaveBeenCalledWith(
+      'Emulation.setUserAgentOverride',
+      expect.anything()
+    )
   })
 
   it('old queued operations cannot remove or join a replacement promise tail', async () => {
@@ -240,7 +251,11 @@ describe('browser viewport operation ownership', () => {
     await expect(replacementFirst).resolves.toBe(true)
     await expect(replacementSecond).resolves.toBe(true)
     expect(pendingOperations.size).toBe(0)
-    expect(uaIntents.get('queued-replacement')).toBe(true)
+    expect(presetIntents.get('queued-replacement')).toEqual({
+      guestWebContentsId: 115,
+      override: mobile
+    })
+    expect(replacement.presentedUserAgent()).toContain('iPhone')
   })
 
   it('normal same-owner toggles preserve last-requested order and remove the promise tail', async () => {
@@ -252,19 +267,18 @@ describe('browser viewport operation ownership', () => {
     const third = browserManager.setViewportOverride('serialized', null)
     gate.resolve()
     expect(await Promise.all([first, second, third])).toEqual([true, true, true])
+    // Identity follows the last request, which was "no preset" before any identity write ran, so the
+    // mobile UA is never installed at all.
     expect(handle.debuggerSendCommand.mock.calls.map(([method]) => method)).toEqual([
       'Emulation.setDeviceMetricsOverride',
       'Emulation.setTouchEmulationEnabled',
-      'Emulation.setUserAgentOverride',
       'Emulation.setDeviceMetricsOverride',
       'Emulation.setTouchEmulationEnabled',
-      'Emulation.setUserAgentOverride',
       'Emulation.clearDeviceMetricsOverride',
-      'Emulation.setTouchEmulationEnabled',
-      'Emulation.setUserAgentOverride'
+      'Emulation.setTouchEmulationEnabled'
     ])
     expect(pendingOperations.size).toBe(0)
-    expect(uaIntents.size).toBe(0)
+    expect(presetIntents.get('serialized')).toEqual({ guestWebContentsId: 116, override: null })
   })
 
   it.each([false, true])(
@@ -276,13 +290,20 @@ describe('browser viewport operation ownership', () => {
       await expect(
         browserManager.setViewportOverride('native', mobileMode ? mobile : desktop)
       ).resolves.toBe(true)
-      expect(handle.debuggerSendCommand).toHaveBeenCalledWith(
-        'Emulation.setUserAgentOverride',
-        mobileMode
-          ? expect.objectContaining({ userAgent: expect.stringContaining('iPhone') })
-          : { userAgent: GUEST_ELECTRON_UA }
+      if (mobileMode) {
+        expect(handle.debuggerSendCommand).toHaveBeenCalledWith(
+          'Emulation.setUserAgentOverride',
+          expect.objectContaining({ userAgent: expect.stringContaining('iPhone') })
+        )
+      } else {
+        expect(handle.debuggerSendCommand).not.toHaveBeenCalledWith(
+          'Emulation.setUserAgentOverride',
+          expect.anything()
+        )
+      }
+      expect(handle.presentedUserAgent()).toEqual(
+        mobileMode ? expect.stringContaining('iPhone') : GUEST_ELECTRON_UA
       )
-      expect(uaIntents.get('native')).toBe(mobileMode)
     }
   )
 
@@ -304,7 +325,7 @@ describe('browser viewport operation ownership', () => {
     expect(await Promise.all(operations.map(({ pending }) => pending))).toEqual(
       Array(16).fill(false)
     )
-    expect(uaIntents.size).toBe(0)
+    expect(cdpUserAgentOverrides.size).toBe(0)
     expect(registeredGuests.size).toBe(0)
     expect(pendingOperations.size).toBe(0)
     expect(presetIntents.size).toBe(0)
diff --git a/src/main/browser/browser-manager-viewport-scroll-state.ts b/src/main/browser/browser-manager-viewport-scroll-state.ts
index 1f83534c856a..04063fb3c302 100644
--- a/src/main/browser/browser-manager-viewport-scroll-state.ts
+++ b/src/main/browser/browser-manager-viewport-scroll-state.ts
@@ -1,5 +1,8 @@
 import { webContents } from 'electron'
-import type { BrowserViewportScrollState } from '../../shared/browser-workspace-types'
+import type {
+  BrowserViewportOverride,
+  BrowserViewportScrollState
+} from '../../shared/browser-workspace-types'
 
 /**
  * Renderer routing plus the host-side viewport-preset geometry the wheel path needs to decide
@@ -7,11 +10,11 @@ import type { BrowserViewportScrollState } from '../../shared/browser-workspace-
  */
 export abstract class BrowserManagerViewportScrollState {
   protected readonly rendererWebContentsIdByTabId = new Map<string, number>()
-  // Why: host-side wheel panning follows the requested local viewport on the owning guest;
-  // replacement guests must not inherit a retired guest's state.
-  protected readonly viewportPresetActiveByTabId = new Map<
+  // Why: the requested preset, not the applied one — host-side wheel panning and the tab's identity
+  // both follow what was asked for; replacement guests must not inherit a retired guest's preset.
+  protected readonly viewportPresetByTabId = new Map<
     string,
-    { guestWebContentsId: number; active: boolean }
+    { guestWebContentsId: number; override: BrowserViewportOverride | null }
   >()
   protected readonly viewportScrollStateByTabId = new Map<string, BrowserViewportScrollState>()
 
diff --git a/src/main/browser/browser-manager-viewport-test-fixtures.ts b/src/main/browser/browser-manager-viewport-test-fixtures.ts
index b440a768b71c..805988e77027 100644
--- a/src/main/browser/browser-manager-viewport-test-fixtures.ts
+++ b/src/main/browser/browser-manager-viewport-test-fixtures.ts
@@ -14,29 +14,77 @@ export async function flushViewportOps(): Promise<void> {
   }
 }
 
+// Why: mirrors Chromium, which rejects an out-of-range maxTouchPoints even when disabling touch.
+async function rejectInvalidTouchPoints(
+  method: string,
+  params?: { maxTouchPoints?: number }
+): Promise<undefined> {
+  const points = params?.maxTouchPoints
+  if (
+    method === 'Emulation.setTouchEmulationEnabled' &&
+    points !== undefined &&
+    (points < 1 || points > 16)
+  ) {
+    throw new Error('Touch points must be between 1 and 16')
+  }
+  return undefined
+}
+
 export type ViewportGuestHandle = {
   guest: Record<string, unknown>
   debuggerSendCommand: ReturnType<typeof vi.fn>
   debuggerIsAttached: ReturnType<typeof vi.fn>
   debuggerAttach: ReturnType<typeof vi.fn>
+  /** Flips what isCrashed() reports, as a renderer death and its reload do. */
+  setRendererCrashed: (crashed: boolean) => void
   setGuestUserAgent: (ua: string) => void
   commitNavigationTo: (nextUrl: string) => void
+  webContentsUserAgent: () => string
+  /** What navigator.userAgent reports: the latest applied CDP override, else the WebContents UA. */
+  presentedUserAgent: () => string
+  /** The CDP UA override Chromium holds, or null when none stands. */
+  standingUserAgentOverride: () => Record<string, unknown> | null
 }
 
 // Why: the guest wires the file's own hoisted mocks, which cannot be imported here.
+// Why the process identity: the session UA and app.userAgentFallback both carry it, so that is what a
+// real guest's getUserAgent() reports until something writes the WebContents UA.
 export function createViewportGuestFactory(
-  mocks: BrowserManagerMocks
+  mocks: BrowserManagerMocks & { processUserAgent?: string }
 ): (id: number, url?: string) => ViewportGuestHandle {
   return function makeGuest(id: number, url = 'https://example.com/'): ViewportGuestHandle {
-    const debuggerSendCommand = vi.fn().mockResolvedValue(undefined)
+    const debuggerSendCommand = vi.fn(rejectInvalidTouchPoints)
     const debuggerIsAttached = vi.fn(() => true)
     const debuggerAttach = vi.fn()
-    let currentUa = GUEST_ELECTRON_UA
+    let currentUa = mocks.processUserAgent ?? GUEST_ELECTRON_UA
+    let rendererCrashed = false
     // Why: getURL() reports the last COMMITTED url — it does not move at did-start-navigation.
     let committedUrl = url
+    // Chromium applies CDP commands in issue order, so a later-issued write wins however they settle,
+    // and a rejected write changes nothing. An empty userAgent clears the override.
+    let issuedUserAgentWrites = 0
+    let appliedUserAgentWrite = 0
+    let cdpOverride: Record<string, unknown> | null = null
+    const sendCommand = (method: string, params?: Record<string, unknown>): unknown => {
+      const result: unknown = debuggerSendCommand(method, params)
+      if (method === 'Emulation.setUserAgentOverride') {
+        const ordinal = ++issuedUserAgentWrites
+        void Promise.resolve(result).then(
+          () => {
+            if (ordinal > appliedUserAgentWrite) {
+              appliedUserAgentWrite = ordinal
+              cdpOverride = params?.userAgent ? params : null
+            }
+          },
+          () => {}
+        )
+      }
+      return result
+    }
     const guest = {
       id,
       isDestroyed: vi.fn(() => false),
+      isCrashed: vi.fn(() => rendererCrashed),
       getType: vi.fn(() => 'webview'),
       getURL: vi.fn(() => committedUrl),
       getUserAgent: vi.fn(() => currentUa),
@@ -53,7 +101,7 @@ export function createViewportGuestFactory(
       debugger: {
         isAttached: debuggerIsAttached,
         attach: debuggerAttach,
-        sendCommand: debuggerSendCommand,
+        sendCommand,
         on: vi.fn(),
         off: vi.fn()
       }
@@ -63,12 +111,19 @@ export function createViewportGuestFactory(
       debuggerSendCommand,
       debuggerIsAttached,
       debuggerAttach,
+      setRendererCrashed: (crashed: boolean) => {
+        rendererCrashed = crashed
+      },
       setGuestUserAgent: (ua: string) => {
         currentUa = ua
       },
       commitNavigationTo: (nextUrl: string) => {
         committedUrl = nextUrl
-      }
+      },
+      webContentsUserAgent: () => currentUa,
+      presentedUserAgent: () =>
+        typeof cdpOverride?.userAgent === 'string' ? cdpOverride.userAgent : currentUa,
+      standingUserAgentOverride: () => cdpOverride
     }
   }
 }
diff --git a/src/main/browser/browser-manager-viewport-touch-reset.test.ts b/src/main/browser/browser-manager-viewport-touch-reset.test.ts
new file mode 100644
index 000000000000..ebebd7dad7dd
--- /dev/null
+++ b/src/main/browser/browser-manager-viewport-touch-reset.test.ts
@@ -0,0 +1,109 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({
+  appGetPathMock: vi.fn(() => '/downloads'),
+  shellOpenExternalMock: vi.fn(),
+  browserWindowFromWebContentsMock: vi.fn(),
+  menuBuildFromTemplateMock: vi.fn(),
+  guestOffMock: vi.fn(),
+  guestOnMock: vi.fn(),
+  guestSetBackgroundThrottlingMock: vi.fn(),
+  guestSetWindowOpenHandlerMock: vi.fn(),
+  guestOpenDevToolsMock: vi.fn(),
+  webContentsFromIdMock: vi.fn(),
+  screenGetCursorScreenPointMock: vi.fn(() => ({ x: 0, y: 0 })),
+  openPopupWithOriginBarMock: vi.fn()
+}))
+
+vi.mock('electron', () => ({
+  app: { getPath: mocks.appGetPathMock },
+  BrowserWindow: { fromWebContents: mocks.browserWindowFromWebContentsMock },
+  clipboard: { writeText: vi.fn() },
+  shell: { openExternal: mocks.shellOpenExternalMock },
+  Menu: { buildFromTemplate: mocks.menuBuildFromTemplateMock },
+  screen: { getCursorScreenPoint: mocks.screenGetCursorScreenPointMock },
+  webContents: { fromId: mocks.webContentsFromIdMock }
+}))
+vi.mock('./popup-origin-bar-window', () => ({
+  openPopupWithOriginBar: mocks.openPopupWithOriginBarMock
+}))
+vi.mock('./browser-process-user-agent', () => ({
+  getBrowserProcessUserAgentIdentity: () => ({ mode: 'clean', userAgent: GUEST_CLEAN_UA })
+}))
+
+import { browserManager } from './browser-manager'
+import {
+  rendererWebContentsId,
+  resetBrowserManagerMocks,
+  resetBrowserManagerState
+} from './browser-manager-test-harness'
+import {
+  createViewportGuestFactory,
+  flushViewportOps,
+  GUEST_CLEAN_UA,
+  type ViewportGuestHandle
+} from './browser-manager-viewport-test-fixtures'
+
+const makeGuest = createViewportGuestFactory(mocks)
+const MOBILE = { width: 375, height: 667, deviceScaleFactor: 2, mobile: true } as const
+const LAPTOP = { width: 1024, height: 768, deviceScaleFactor: 1, mobile: false } as const
+
+function registerGuest(id: number, browserPageId: string): ViewportGuestHandle {
+  const handle = makeGuest(id)
+  mocks.webContentsFromIdMock.mockReturnValue(handle.guest)
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the viewport fixture implements every WebContents member these paths touch.
+  browserManager.attachGuestPolicies(handle.guest as never)
+  browserManager.registerGuest({ browserPageId, webContentsId: id, rendererWebContentsId })
+  return handle
+}
+
+function userAgentWrites(
+  debuggerSendCommand: ViewportGuestHandle['debuggerSendCommand']
+): string[] {
+  return debuggerSendCommand.mock.calls.flatMap(([method, params]) =>
+    method === 'Emulation.setUserAgentOverride' && typeof params?.userAgent === 'string'
+      ? [params.userAgent]
+      : []
+  )
+}
+
+function startNavigation(url: string): void {
+  const didStartNavigation = mocks.guestOnMock.mock.calls.findLast(
+    ([event]) => event === 'did-start-navigation'
+  )?.[1]
+  expect(didStartNavigation).toBeTypeOf('function')
+  didStartNavigation(null, url, false, true)
+}
+
+// Regression for #22749: leaving a mobile preset must actually turn touch emulation off, or the
+// guest keeps (hover: none) / coarse pointer and loses every hover style.
+describe('browserManager viewport touch reset', () => {
+  beforeEach(() => {
+    resetBrowserManagerMocks(mocks)
+    resetBrowserManagerState()
+  })
+
+  it.each([
+    ['a desktop preset', LAPTOP],
+    ['no preset', null]
+  ])('disables touch emulation when switching from mobile to %s', async (_label, next) => {
+    const { debuggerSendCommand } = registerGuest(52001, 'tab-touch-reset')
+    await expect(browserManager.setViewportOverride('tab-touch-reset', MOBILE)).resolves.toBe(true)
+    debuggerSendCommand.mockClear()
+
+    await expect(browserManager.setViewportOverride('tab-touch-reset', next)).resolves.toBe(true)
+
+    expect(debuggerSendCommand).toHaveBeenCalledWith('Emulation.setTouchEmulationEnabled', {
+      enabled: false
+    })
+    const writes = userAgentWrites(debuggerSendCommand)
+    expect(writes.length).toBeGreaterThan(0)
+    expect(writes.at(-1)).not.toContain('iPhone')
+
+    // A later navigation must not re-install the mobile UA behind the switch.
+    debuggerSendCommand.mockClear()
+    startNavigation('https://example.com/next')
+    await flushViewportOps()
+    expect(userAgentWrites(debuggerSendCommand).some((ua) => ua.includes('iPhone'))).toBe(false)
+  })
+})
diff --git a/src/main/browser/browser-manager-viewport.ts b/src/main/browser/browser-manager-viewport.ts
index a4e263dcceda..6a9257a225ee 100644
--- a/src/main/browser/browser-manager-viewport.ts
+++ b/src/main/browser/browser-manager-viewport.ts
@@ -5,9 +5,12 @@ import {
   type BrowserAnnotationViewportBridgeOptions
 } from '../../shared/browser-annotation-viewport-bridge'
 import type { BrowserViewportOverride } from '../../shared/browser-workspace-types'
-import { googleAuthUserAgent, isGoogleAuthUrl } from './browser-google-auth-ua'
 import { BrowserManagerDownloadLifecycle } from './browser-manager-download-lifecycle'
-import { getBrowserProcessUserAgentIdentity } from './browser-process-user-agent'
+import { sendGuestCdpCommand } from './guest-cdp-command'
+
+// Why no maxTouchPoints: Chromium rejects values outside 1..16 even when disabling, which left
+// touch emulation (and no-hover media features) on after leaving a mobile preset (#22749).
+const TOUCH_EMULATION_DISABLED = { enabled: false } as const
 
 export abstract class BrowserManagerViewport extends BrowserManagerDownloadLifecycle {
   // Why: guests are isolated from Orca's preload bridge, so main owns the devtools escape hatch after a tab→guest lookup.
@@ -39,11 +42,11 @@ export abstract class BrowserManagerViewport extends BrowserManagerDownloadLifec
     // Why: chain per-tab so rapid toggles don't interleave CDP commands and the last-requested override wins.
     const expectedWebContentsId = this.webContentsIdByTabId.get(browserTabId)
     if (expectedWebContentsId !== undefined) {
-      // Keep host panning available while CDP applies the requested dimensions. The guest id fence
-      // prevents this intent from leaking to a replacement guest; clearing the preset removes it.
-      this.viewportPresetActiveByTabId.set(browserTabId, {
+      // Record the request before CDP runs: host panning and the tab's identity both follow it, so a
+      // navigation mid-apply already sees it. The guest id fence keeps it off a replacement guest.
+      this.viewportPresetByTabId.set(browserTabId, {
         guestWebContentsId: expectedWebContentsId,
-        active: override !== null
+        override
       })
     }
     // The renderer resizes the host before CDP completes; discard the old geometry until it
@@ -146,84 +149,54 @@ export abstract class BrowserManagerViewport extends BrowserManagerDownloadLifec
     }
 
     const dbg = guest.debugger
+    const metricsApplied = await this.runViewportEmulationStep(
+      browserTabId,
+      'device metrics',
+      () =>
+        override
+          ? sendGuestCdpCommand(guest, 'Emulation.setDeviceMetricsOverride', {
+              width: override.width,
+              height: override.height,
+              deviceScaleFactor: override.deviceScaleFactor,
+              mobile: override.mobile
+            })
+          : dbg.sendCommand('Emulation.clearDeviceMetricsOverride', {})
+    )
+    const touchApplied = await this.runViewportEmulationStep(browserTabId, 'touch emulation', () =>
+      dbg.sendCommand(
+        'Emulation.setTouchEmulationEnabled',
+        override?.mobile ? { enabled: true, maxTouchPoints: 5 } : TOUCH_EMULATION_DISABLED
+      )
+    )
+    if (this.webContentsIdByTabId.get(browserTabId) !== webContentsId) {
+      return false
+    }
+    // Why: identity is not an emulation step. It follows the requested preset whatever the steps
+    // above did, so a failed metrics or touch write can never strand a mobile identity on the tab.
+    const identityApplied = await this.runViewportEmulationStep(browserTabId, 'identity', () =>
+      this.retargetTabIdentity(guest, this.resolveTabNavigationUrl(guest))
+    )
+    return (
+      metricsApplied &&
+      touchApplied &&
+      identityApplied &&
+      this.webContentsIdByTabId.get(browserTabId) === webContentsId
+    )
+  }
+
+  private async runViewportEmulationStep(
+    browserTabId: string,
+    step: string,
+    send: () => Promise<unknown>
+  ): Promise<boolean> {
     try {
-      if (override) {
-        await dbg.sendCommand('Emulation.setDeviceMetricsOverride', {
-          width: override.width,
-          height: override.height,
-          deviceScaleFactor: override.deviceScaleFactor,
-          mobile: override.mobile
-        })
-        if (this.webContentsIdByTabId.get(browserTabId) === webContentsId) {
-          this.viewportPresetActiveByTabId.set(browserTabId, {
-            guestWebContentsId: webContentsId,
-            active: true
-          })
-        }
-        await dbg.sendCommand('Emulation.setTouchEmulationEnabled', {
-          enabled: override.mobile,
-          maxTouchPoints: override.mobile ? 5 : 0
-        })
-        if (this.webContentsIdByTabId.get(browserTabId) !== webContentsId) {
-          return false
-        }
-        // Navigation must see the preset while the final CDP write is in flight.
-        this.viewportUaOverrideMobileByTabId.set(browserTabId, override.mobile)
-        await this.sendViewportUserAgentOverride(guest, override.mobile)
-      } else {
-        await dbg.sendCommand('Emulation.clearDeviceMetricsOverride', {})
-        if (this.webContentsIdByTabId.get(browserTabId) === webContentsId) {
-          this.viewportPresetActiveByTabId.set(browserTabId, {
-            guestWebContentsId: webContentsId,
-            active: false
-          })
-        }
-        await dbg.sendCommand('Emulation.setTouchEmulationEnabled', {
-          enabled: false,
-          maxTouchPoints: 0
-        })
-        if (this.webContentsIdByTabId.get(browserTabId) !== webContentsId) {
-          return false
-        }
-        const trackedMobile = this.viewportUaOverrideMobileByTabId.get(browserTabId)
-        // A navigation after this point must not re-install the override behind the clear.
-        this.viewportUaOverrideMobileByTabId.delete(browserTabId)
-        try {
-          if (this.authUserAgentOverrideStateByGuestId.has(guest.id)) {
-            const url = this.resolveTabNavigationUrl(guest)
-            const identity = getBrowserProcessUserAgentIdentity()
-            // Firefox is delivered per-target and cannot reach workers; keep it clean-only to preserve
-            // one coherent identity per mode instead of pairing a Firefox document with native workers.
-            const restored = await this.applyAuthUserAgentOverrideOverCdp(
-              guest,
-              false,
-              url,
-              identity.mode === 'clean' && isGoogleAuthUrl(url)
-                ? googleAuthUserAgent()
-                : identity.userAgent
-            )
-            if (!restored) {
-              throw new Error('Failed to preserve auth user agent')
-            }
-          } else {
-            // Why: passing an empty string restores the session default UA.
-            await dbg.sendCommand('Emulation.setUserAgentOverride', { userAgent: '' })
-          }
-        } catch (error) {
-          if (
-            trackedMobile !== undefined &&
-            this.webContentsIdByTabId.get(browserTabId) === webContentsId
-          ) {
-            this.viewportUaOverrideMobileByTabId.set(browserTabId, trackedMobile)
-          }
-          throw error
-        }
-      }
-      if (this.webContentsIdByTabId.get(browserTabId) !== webContentsId) {
-        return false
-      }
-      return true
-    } catch {
+      // A step that reports its own failure resolves false rather than throwing.
+      return (await send()) !== false
+    } catch (error) {
+      console.warn(`[browser-manager] setViewportOverride: ${step} failed`, {
+        browserTabId,
+        error: error instanceof Error ? error.message : String(error)
+      })
       return false
     }
   }
diff --git a/src/main/browser/browser-route-webrtc-egress.electron.test.ts b/src/main/browser/browser-route-webrtc-egress.electron.test.ts
index 013a852e810a..23463f2f84aa 100644
--- a/src/main/browser/browser-route-webrtc-egress.electron.test.ts
+++ b/src/main/browser/browser-route-webrtc-egress.electron.test.ts
@@ -36,6 +36,12 @@ const dgram = require('node:dgram')
 const net = require('node:net')
 const os = require('node:os')
 const { writeFileSync } = require('node:fs')
+let phase = 'app-ready'
+
+function enterPhase(next) {
+  phase = next
+  console.error('[webrtc-egress] ' + phase)
+}
 
 function bind(socket, host) {
   return new Promise((resolve, reject) => {
@@ -71,19 +77,24 @@ async function probe() {
   const tcp = net.createServer((socket) => socket.destroy())
   const packets = []
   udp.on('message', (message) => packets.push(message.length))
+  enterPhase('bind-listeners')
   const [udpAddress, tcpAddress] = await Promise.all([
     bind(udp, '0.0.0.0'),
     listen(tcp, '127.0.0.1')
   ])
   const partition = 'persist:webrtc-egress-${protectedGuest}-' + Date.now()
   const routeSession = session.fromPartition(partition, { cache: false })
+  enterPhase('configure-proxy')
   await routeSession.setProxy({
     mode: 'fixed_servers',
     proxyRules: 'socks5://127.0.0.1:' + tcpAddress.port,
     proxyBypassRules: '<-loopback>'
   })
+  enterPhase('close-connections')
   await routeSession.closeAllConnections()
+  enterPhase('resolve-proxy')
   const resolvedProxy = await routeSession.resolveProxy('https://example.invalid/')
+  enterPhase('create-window')
   const window = new BrowserWindow({
     show: false,
     webPreferences: { partition, sandbox: true, nodeIntegration: false, contextIsolation: true }
@@ -92,6 +103,7 @@ async function probe() {
     window.webContents.setWebRTCIPHandlingPolicy('disable_non_proxied_udp')
   }
   const policy = window.webContents.getWebRTCIPHandlingPolicy()
+  enterPhase('load-page')
   await window.loadURL('data:text/html,<title>WebRTC egress probe</title>')
   const target = viewerAddress()
   const script = \`
@@ -100,15 +112,22 @@ async function probe() {
         iceServers: [{ urls: 'stun:\${target}:\${udpAddress.port}' }],
         iceCandidatePoolSize: 1
       })
+      globalThis.__webrtcEgressPeer = peer
       peer.createDataChannel('probe')
       const offer = await peer.createOffer()
       await peer.setLocalDescription(offer)
-      await new Promise(resolve => setTimeout(resolve, 3000))
-      peer.close()
     })()
   \`
+  enterPhase('renderer-webrtc')
   await window.webContents.executeJavaScript(script)
+  // Hidden renderer timers may be throttled; the packet observation clock belongs to the host.
+  enterPhase('observe-packets')
+  await new Promise((resolve) => setTimeout(resolve, 3000))
+  enterPhase('close-peer')
+  await window.webContents.executeJavaScript('globalThis.__webrtcEgressPeer.close()')
+  enterPhase('drain-packets')
   await new Promise((resolve) => setTimeout(resolve, 500))
+  enterPhase('cleanup')
   window.destroy()
   udp.close()
   tcp.close()
@@ -116,16 +135,22 @@ async function probe() {
 }
 
 async function run() {
-  const timeout = setTimeout(() => app.exit(2), 20000)
+  const timeout = setTimeout(() => {
+    writeFileSync(${JSON.stringify(resultPath)}, JSON.stringify({
+      error: 'WebRTC egress probe timed out', phase, protectedGuest: ${protectedGuest}
+    }))
+    app.exit(2)
+  }, 20000)
   await app.whenReady()
   const result = await probe()
+  enterPhase('write-result')
   writeFileSync(${JSON.stringify(resultPath)}, JSON.stringify(result))
   clearTimeout(timeout)
   app.quit()
 }
 
 run().catch((error) => {
-  writeFileSync(${JSON.stringify(resultPath)}, JSON.stringify({ error: String(error?.stack || error) }))
+  writeFileSync(${JSON.stringify(resultPath)}, JSON.stringify({ error: String(error?.stack || error), phase, protectedGuest: ${protectedGuest} }))
   app.exit(1)
 })
 `
diff --git a/src/main/browser/browser-screencast-debugger-command.ts b/src/main/browser/browser-screencast-debugger-command.ts
index 3a607e416eca..b32eef8d3088 100644
--- a/src/main/browser/browser-screencast-debugger-command.ts
+++ b/src/main/browser/browser-screencast-debugger-command.ts
@@ -2,15 +2,22 @@ import type { WebContents } from 'electron'
 
 const DEBUGGER_COMMAND_TIMEOUT_MS = 8_000
 
-export async function sendDebuggerCommand(
+export function sendDebuggerCommand(
   dbg: WebContents['debugger'],
   method: string,
   params: Record<string, unknown> = {}
+): Promise<unknown> {
+  return runDebuggerCommandWithTimeout(method, () => dbg.sendCommand(method, params))
+}
+
+export async function runDebuggerCommandWithTimeout(
+  method: string,
+  send: () => Promise<unknown>
 ): Promise<unknown> {
   let timeout: ReturnType<typeof setTimeout> | null = null
   try {
     return await Promise.race([
-      Promise.resolve().then(() => dbg.sendCommand(method, params)),
+      Promise.resolve().then(send),
       new Promise<never>((_, reject) => {
         timeout = setTimeout(() => {
           reject(new Error(`Timed out while running ${method}.`))
diff --git a/src/main/browser/browser-screencast-device-metrics.ts b/src/main/browser/browser-screencast-device-metrics.ts
index ff805d146041..96037bd53ae6 100644
--- a/src/main/browser/browser-screencast-device-metrics.ts
+++ b/src/main/browser/browser-screencast-device-metrics.ts
@@ -1,5 +1,9 @@
 import type { Debugger, WebContents } from 'electron'
-import { sendDebuggerCommand } from './browser-screencast-debugger-command'
+import {
+  runDebuggerCommandWithTimeout,
+  sendDebuggerCommand
+} from './browser-screencast-debugger-command'
+import { sendGuestCdpCommand } from './guest-cdp-command'
 import type { BrowserScreencastOptions } from './browser-screencast-stream-types'
 import { positiveInteger, positiveNumber } from './browser-screencast-viewport-fit'
 
@@ -15,6 +19,8 @@ export function createBrowserScreencastDeviceMetrics(
   options: BrowserScreencastOptions
 ): BrowserScreencastDeviceMetrics {
   let deviceMetricsOverridden = false
+  const sendViewportCommand = (method: string, params: Record<string, unknown>): Promise<unknown> =>
+    runDebuggerCommandWithTimeout(method, () => sendGuestCdpCommand(webContents, method, params))
 
   const clearDeviceMetricsOverride = async (): Promise<void> => {
     if (webContents.isDestroyed() || !dbg.isAttached()) {
@@ -38,13 +44,13 @@ export function createBrowserScreencastDeviceMetrics(
     // Why: Back/Forward and cross-process navigations can drop emulation while
     // the screencast remains attached. Reapply before fallback captures so the
     // page lays out at the client pane size, not the host BrowserView size.
-    await sendDebuggerCommand(dbg, 'Emulation.setDeviceMetricsOverride', {
+    await sendViewportCommand('Emulation.setDeviceMetricsOverride', {
       width: viewportWidth,
       height: viewportHeight,
       deviceScaleFactor,
       mobile: options.mobile === true
     })
-    await sendDebuggerCommand(dbg, 'Emulation.setVisibleSize', {
+    await sendViewportCommand('Emulation.setVisibleSize', {
       width: viewportWidth,
       height: viewportHeight
     }).catch(() => {})
diff --git a/src/main/browser/browser-screencast-lifecycle.test.ts b/src/main/browser/browser-screencast-lifecycle.test.ts
index 251b53fd4696..fdf586b0ef85 100644
--- a/src/main/browser/browser-screencast-lifecycle.test.ts
+++ b/src/main/browser/browser-screencast-lifecycle.test.ts
@@ -21,7 +21,7 @@ function createWebContents() {
     attached = false
   })
   debuggerApi.sendCommand = vi.fn(async () => ({}))
-  return { isDestroyed: vi.fn(() => false), debugger: debuggerApi }
+  return { isDestroyed: vi.fn(() => false), isCrashed: vi.fn(() => false), debugger: debuggerApi }
 }
 
 describe('browser screencast lifecycle', () => {
diff --git a/src/main/browser/browser-screencast-snapshot-scaling.test.ts b/src/main/browser/browser-screencast-snapshot-scaling.test.ts
index 4358d618376a..1398214f2dc8 100644
--- a/src/main/browser/browser-screencast-snapshot-scaling.test.ts
+++ b/src/main/browser/browser-screencast-snapshot-scaling.test.ts
@@ -20,7 +20,12 @@ function createMockWebContents(capturePage: () => Promise<unknown>) {
     attached = false
   })
   dbg.sendCommand = vi.fn(async () => ({}))
-  return { isDestroyed: vi.fn(() => false), debugger: dbg, capturePage: vi.fn(capturePage) }
+  return {
+    isDestroyed: vi.fn(() => false),
+    isCrashed: vi.fn(() => false),
+    debugger: dbg,
+    capturePage: vi.fn(capturePage)
+  }
 }
 
 function createCapturedImage(width: number, height: number) {
diff --git a/src/main/browser/browser-screencast-web-contents-test-double.ts b/src/main/browser/browser-screencast-web-contents-test-double.ts
index 13811850c68d..030eec637837 100644
--- a/src/main/browser/browser-screencast-web-contents-test-double.ts
+++ b/src/main/browser/browser-screencast-web-contents-test-double.ts
@@ -10,6 +10,7 @@ export type MockScreencastDebugger = EventEmitter & {
 
 export type MockScreencastWebContents = {
   isDestroyed: ReturnType<typeof vi.fn>
+  isCrashed: ReturnType<typeof vi.fn>
   debugger: MockScreencastDebugger
 }
 
@@ -29,6 +30,7 @@ export function createMockScreencastWebContents(): MockScreencastWebContents {
 
   return {
     isDestroyed: vi.fn(() => false),
+    isCrashed: vi.fn(() => false),
     debugger: dbg
   }
 }
diff --git a/src/main/browser/browser-session-registry-import-boundary.test.ts b/src/main/browser/browser-session-registry-import-boundary.test.ts
deleted file mode 100644
index 96950797c4a0..000000000000
--- a/src/main/browser/browser-session-registry-import-boundary.test.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { expect, it } from 'vitest'
-
-it('keeps the cookie fixture registry outside the persistence barrel graph', () => {
-  const source = readFileSync(join(__dirname, 'browser-session-registry.ts'), 'utf8')
-
-  expect(source).toMatch(
-    /import\s*\{\s*getCanonicalUserDataPath\s*\}\s*from\s*['"]\.\.\/persistence\/loading-store\/user-data-path['"]/
-  )
-  expect(source).not.toMatch(/from\s*['"]\.\.\/persistence['"]/)
-})
diff --git a/src/main/browser/browser-session-registry.test.ts b/src/main/browser/browser-session-registry.test.ts
index 27965a56433b..a3e84b290f09 100644
--- a/src/main/browser/browser-session-registry.test.ts
+++ b/src/main/browser/browser-session-registry.test.ts
@@ -556,7 +556,7 @@ describe('BrowserSessionRegistry', () => {
         { webRequest: { onBeforeSendHeaders } } as never,
         (request) =>
           request.currentUserAgent === googleAuthUserAgent()
-            ? { userAgent: googleAuthUserAgent() }
+            ? { kind: 'google-auth', userAgent: googleAuthUserAgent() }
             : undefined
       )
       expect(onBeforeSendHeaders).toHaveBeenCalledWith(
diff --git a/src/main/browser/browser-session-ua-cloudflare-live.electron.test.ts b/src/main/browser/browser-session-ua-cloudflare-live.electron.test.ts
index 05331ab5c65b..c6cba96c6d7d 100644
--- a/src/main/browser/browser-session-ua-cloudflare-live.electron.test.ts
+++ b/src/main/browser/browser-session-ua-cloudflare-live.electron.test.ts
@@ -252,10 +252,10 @@ async function run() {
   if (arm === 'branch') {
     installBrowserSessionUserAgentPolicy(sess, request => {
       if (request.resourceType !== 'mainFrame' && (request.currentUserAgent === firefoxUserAgent || request.effectiveUserAgent === firefoxUserAgent)) {
-        return { userAgent: firefoxUserAgent }
+        return { kind: 'google-auth', userAgent: firefoxUserAgent }
       }
       if (request.resourceType === 'mainFrame' && request.currentUserAgent === firefoxUserAgent) {
-        return { userAgent: cleanUserAgent }
+        return { kind: 'process', userAgent: cleanUserAgent }
       }
       return undefined
     })
diff --git a/src/main/browser/browser-session-ua-wire-probe-server.ts b/src/main/browser/browser-session-ua-wire-probe-server.ts
index d00117ad86b8..6062ed3df917 100644
--- a/src/main/browser/browser-session-ua-wire-probe-server.ts
+++ b/src/main/browser/browser-session-ua-wire-probe-server.ts
@@ -156,7 +156,7 @@ function probePage(
   const dedicatedWorkerScriptText = crossContext
     ? `const dedicatedDone = message('dedicated-worker'); const dedicated = new Worker(${JSON.stringify(httpOrigin)} + '/dedicated-worker.js'); dedicated.onmessage = event => postMessage(event.data, '*')`
     : ''
-  return `<!doctype html><title>UA wire probe</title><script>
+  return `<!doctype html><title>UA wire probe</title><body><script>
   const identity = () => ({ userAgent: navigator.userAgent, userAgentData: navigator.userAgentData ? { brands: navigator.userAgentData.brands, mobile: navigator.userAgentData.mobile, platform: navigator.userAgentData.platform } : null })
   const report = context => fetch(${JSON.stringify(httpOrigin)} + '/report/' + context, { method: 'POST', body: JSON.stringify(identity()) })
   const fetchRoute = path => fetch(${JSON.stringify(httpOrigin)} + path).then(response => response.text())
@@ -181,7 +181,7 @@ function probePage(
     ])
     return true
   })()
-  </script>`
+  </script></body>`
 }
 function childPage(
   context: string,
diff --git a/src/main/browser/browser-session-ua.ts b/src/main/browser/browser-session-ua.ts
index 5b4d4735dcd6..fc05fe357cc4 100644
--- a/src/main/browser/browser-session-ua.ts
+++ b/src/main/browser/browser-session-ua.ts
@@ -1,5 +1,5 @@
 import type { Session } from 'electron'
-import type { ViewportUserAgentOverride } from './browser-viewport-user-agent'
+import type { BrowserTabIdentity, UserAgentMetadata } from './browser-tab-identity'
 export { cleanElectronUserAgent } from './browser-process-user-agent'
 import { getBrowserProcessUserAgentIdentity } from './browser-process-user-agent'
 
@@ -19,7 +19,7 @@ export type BrowserSessionRequestUserAgentResolver = (args: {
   webContentsId?: number
   currentUserAgent?: string
   effectiveUserAgent?: string
-}) => ViewportUserAgentOverride | undefined
+}) => BrowserTabIdentity | undefined
 
 function quoteClientHint(value: string): string {
   return `"${value.replace(/["\\]/g, '\\$&')}"`
@@ -33,7 +33,7 @@ function formatClientHintBrands(brands: { brand: string; version: string }[]): s
 
 function applyUserAgentMetadataHeaders(
   headers: Record<string, string>,
-  metadata: NonNullable<ViewportUserAgentOverride['userAgentMetadata']>
+  metadata: UserAgentMetadata
 ): void {
   const values: Record<string, string> = {
     'sec-ch-ua': formatClientHintBrands(metadata.brands),
@@ -101,15 +101,10 @@ export function installBrowserSessionUserAgentPolicy(
         callback({ requestHeaders: headers })
         return
       }
-      if (identity.userAgent) {
-        setUserAgentHeader(headers, identity.userAgent)
-      }
-      if (identity.userAgent === firefoxUa) {
+      setUserAgentHeader(headers, identity.userAgent)
+      if (identity.kind === 'google-auth') {
         stripClientHints(headers)
-        callback({ requestHeaders: headers })
-        return
-      }
-      if (identity.userAgentMetadata) {
+      } else if (identity.kind === 'mobile') {
         applyUserAgentMetadataHeaders(headers, identity.userAgentMetadata)
       }
       callback({ requestHeaders: headers })
diff --git a/src/main/browser/browser-tab-identity.test.ts b/src/main/browser/browser-tab-identity.test.ts
new file mode 100644
index 000000000000..520eae508196
--- /dev/null
+++ b/src/main/browser/browser-tab-identity.test.ts
@@ -0,0 +1,78 @@
+import { describe, expect, it } from 'vitest'
+
+import { googleAuthUserAgent } from './browser-google-auth-ua'
+import { resolveBrowserTabIdentity } from './browser-tab-identity'
+
+const CHROME_UA =
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36'
+const NATIVE_UA =
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Orca/1.0.0 Chrome/134.0.0.0 Electron/43.0.0 Safari/537.36'
+const clean = { mode: 'clean', userAgent: CHROME_UA } as const
+const native = { mode: 'native', userAgent: NATIVE_UA } as const
+const AUTH_URL = 'https://accounts.google.com/v3/signin/identifier'
+
+describe('resolveBrowserTabIdentity', () => {
+  it('presents Firefox on Google auth hosts in clean mode regardless of the preset', () => {
+    for (const mobile of [false, true]) {
+      expect(resolveBrowserTabIdentity({ url: AUTH_URL, mobile, processIdentity: clean })).toEqual({
+        kind: 'google-auth',
+        userAgent: googleAuthUserAgent()
+      })
+    }
+  })
+
+  it('leaves Google auth hosts on the native identity in native mode', () => {
+    expect(
+      resolveBrowserTabIdentity({ url: AUTH_URL, mobile: false, processIdentity: native })
+    ).toEqual({ kind: 'process', userAgent: NATIVE_UA })
+    expect(
+      resolveBrowserTabIdentity({ url: AUTH_URL, mobile: true, processIdentity: native }).kind
+    ).toBe('mobile')
+  })
+
+  it('presents the process identity itself off the auth hosts without a mobile preset', () => {
+    for (const processIdentity of [clean, native]) {
+      expect(
+        resolveBrowserTabIdentity({
+          url: 'https://myaccount.google.com/',
+          mobile: false,
+          processIdentity
+        })
+      ).toEqual({ kind: 'process', userAgent: processIdentity.userAgent })
+    }
+  })
+
+  it('splices the real Chrome major into the mobile UA and its client hints', () => {
+    const identity = resolveBrowserTabIdentity({
+      url: 'https://example.com/',
+      mobile: true,
+      processIdentity: clean
+    })
+    expect(identity.kind).toBe('mobile')
+    expect(identity.userAgent).toContain('iPhone')
+    expect(identity.userAgent).toContain('CriOS/134.0.0.0')
+    if (identity.kind === 'mobile') {
+      expect(identity.userAgentMetadata.mobile).toBe(true)
+      expect(identity.userAgentMetadata.platform).toBe('iOS')
+      expect(identity.userAgentMetadata.brands).toContainEqual({
+        brand: 'Google Chrome',
+        version: '134'
+      })
+    }
+  })
+
+  it('falls back to a known Chrome major when the process UA carries none', () => {
+    const identity = resolveBrowserTabIdentity({
+      url: 'https://example.com/',
+      mobile: true,
+      processIdentity: { mode: 'clean', userAgent: googleAuthUserAgent() }
+    })
+    expect(identity.userAgent).toContain('CriOS/134.0.0.0')
+  })
+
+  it('treats an unparseable URL as a non-auth host', () => {
+    expect(
+      resolveBrowserTabIdentity({ url: 'not a url', mobile: false, processIdentity: clean })
+    ).toEqual({ kind: 'process', userAgent: CHROME_UA })
+  })
+})
diff --git a/src/main/browser/browser-tab-identity.ts b/src/main/browser/browser-tab-identity.ts
new file mode 100644
index 000000000000..713b0310a4ae
--- /dev/null
+++ b/src/main/browser/browser-tab-identity.ts
@@ -0,0 +1,90 @@
+// Why one owner: a tab's identity is read by the session request hook and written to the guest over
+// two layers (the WebContents UA and a CDP override that outranks it). When each layer derived it on
+// its own, a desktop viewport preset installed a CDP override with no userAgentMetadata, and Chromium
+// then drops navigator.userAgentData and every sec-ch-ua header for that tab — a Chrome UA with no
+// client hints, which bot checks read as a spoof. Every layer now asks this module instead.
+
+import type { BrowserProcessUserAgentIdentity } from './browser-process-user-agent'
+import { googleAuthUserAgent, isGoogleAuthUrl } from './browser-google-auth-ua'
+
+type UserAgentBrand = { brand: string; version: string }
+
+export type UserAgentMetadata = {
+  brands: UserAgentBrand[]
+  fullVersionList: UserAgentBrand[]
+  fullVersion: string
+  platform: string
+  platformVersion: string
+  architecture: string
+  model: string
+  mobile: boolean
+}
+
+export type BrowserTabIdentity =
+  /** The process identity, with its client hints left to Chromium. */
+  | { kind: 'process'; userAgent: string }
+  /** Firefox on Google's auth hosts; real Firefox sends no client hints. */
+  | { kind: 'google-auth'; userAgent: string }
+  | { kind: 'mobile'; userAgent: string; userAgentMetadata: UserAgentMetadata }
+
+export function googleAuthTabIdentity(): BrowserTabIdentity {
+  return { kind: 'google-auth', userAgent: googleAuthUserAgent() }
+}
+
+/**
+ * The identity a tab presents at `url`. Desktop presets and "no preset" are deliberately the same
+ * input: only a mobile preset changes who the tab claims to be.
+ */
+export function resolveBrowserTabIdentity(args: {
+  url: string
+  mobile: boolean
+  processIdentity: BrowserProcessUserAgentIdentity
+}): BrowserTabIdentity {
+  // Firefox is delivered per-target and cannot reach workers; keep it clean-only to preserve one
+  // coherent identity per mode instead of pairing a Firefox document with native workers.
+  if (args.processIdentity.mode === 'clean' && isGoogleAuthUrl(args.url)) {
+    return googleAuthTabIdentity()
+  }
+  if (args.mobile) {
+    return buildMobileTabIdentity(args.processIdentity.userAgent)
+  }
+  return { kind: 'process', userAgent: args.processIdentity.userAgent }
+}
+
+// Why: responsive sites UA-sniff; this is Chrome DevTools' default iPhone UA template with the real
+// Chrome major spliced in so the userAgentMetadata brands below agree with it.
+function buildMobileUserAgent(chromeMajor: string): string {
+  return `Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/${chromeMajor}.0.0.0 Mobile/15E148 Safari/604.1`
+}
+
+function extractChromeMajor(ua: string): string {
+  const match = ua.match(/Chrome\/(\d+)/)
+  return match ? match[1] : '134'
+}
+
+function buildMobileTabIdentity(processUserAgent: string): BrowserTabIdentity {
+  const chromeMajor = extractChromeMajor(processUserAgent)
+  // Why: userAgentMetadata must accompany the mobile UA so client hints match, or bot-detection flags the desktop-hint leak.
+  return {
+    kind: 'mobile',
+    userAgent: buildMobileUserAgent(chromeMajor),
+    userAgentMetadata: {
+      brands: [
+        { brand: 'Google Chrome', version: chromeMajor },
+        { brand: 'Chromium', version: chromeMajor },
+        { brand: 'Not/A)Brand', version: '24' }
+      ],
+      fullVersionList: [
+        { brand: 'Google Chrome', version: `${chromeMajor}.0.0.0` },
+        { brand: 'Chromium', version: `${chromeMajor}.0.0.0` },
+        { brand: 'Not/A)Brand', version: '24.0.0.0' }
+      ],
+      fullVersion: `${chromeMajor}.0.0.0`,
+      platform: 'iOS',
+      platformVersion: '17.0',
+      architecture: '',
+      model: 'iPhone',
+      mobile: true
+    }
+  }
+}
diff --git a/src/main/browser/browser-viewport-user-agent.test.ts b/src/main/browser/browser-viewport-user-agent.test.ts
deleted file mode 100644
index 1d069a209ada..000000000000
--- a/src/main/browser/browser-viewport-user-agent.test.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { googleAuthUserAgent } from './browser-google-auth-ua'
-import { buildViewportUserAgentOverride } from './browser-viewport-user-agent'
-
-const CHROME_UA =
-  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36'
-
-describe('buildViewportUserAgentOverride', () => {
-  it('presents the Firefox UA on Google auth hosts regardless of the preset', () => {
-    for (const mobile of [false, true]) {
-      const override = buildViewportUserAgentOverride({
-        url: 'https://accounts.google.com/v3/signin/identifier',
-        mobile,
-        baseUserAgent: CHROME_UA
-      })
-      expect(override.userAgent).toBe(googleAuthUserAgent())
-      // Real Firefox emits no client hints, so Chrome brands would contradict the stripped headers.
-      expect(override.userAgentMetadata).toBeUndefined()
-    }
-  })
-
-  it('keeps the clean desktop UA off the auth hosts', () => {
-    const override = buildViewportUserAgentOverride({
-      url: 'https://myaccount.google.com/',
-      mobile: false,
-      baseUserAgent: CHROME_UA
-    })
-    expect(override.userAgent).toBe(CHROME_UA)
-    expect(override.userAgentMetadata).toBeUndefined()
-  })
-
-  it('splices the real Chrome major into the mobile UA and its client hints', () => {
-    const override = buildViewportUserAgentOverride({
-      url: 'https://example.com/',
-      mobile: true,
-      baseUserAgent: CHROME_UA
-    })
-    expect(override.userAgent).toContain('iPhone')
-    expect(override.userAgent).toContain('CriOS/134.0.0.0')
-    expect(override.userAgentMetadata?.mobile).toBe(true)
-    expect(override.userAgentMetadata?.platform).toBe('iOS')
-    expect(override.userAgentMetadata?.brands).toContainEqual({
-      brand: 'Google Chrome',
-      version: '134'
-    })
-  })
-
-  it('falls back to a known Chrome major when the base UA carries none', () => {
-    const override = buildViewportUserAgentOverride({
-      url: 'https://example.com/',
-      mobile: true,
-      baseUserAgent: googleAuthUserAgent()
-    })
-    expect(override.userAgent).toContain('CriOS/134.0.0.0')
-  })
-
-  it('treats an unparseable URL as a non-auth host', () => {
-    const override = buildViewportUserAgentOverride({
-      url: 'not a url',
-      mobile: false,
-      baseUserAgent: CHROME_UA
-    })
-    expect(override.userAgent).toBe(CHROME_UA)
-  })
-})
diff --git a/src/main/browser/browser-viewport-user-agent.ts b/src/main/browser/browser-viewport-user-agent.ts
deleted file mode 100644
index 31c06307b463..000000000000
--- a/src/main/browser/browser-viewport-user-agent.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// Why: a CDP Emulation.setUserAgentOverride outranks WebContents.setUserAgent for both
-// navigator.userAgent and the outgoing request header, and it stands across every later
-// navigation until explicitly cleared. So the viewport preset's UA is a third identity layer
-// that must agree with the auth-host Firefox switch, or applying a preset silently reintroduces
-// the exact UA mismatch this scope exists to remove.
-
-import { googleAuthUserAgent, isGoogleAuthUrl } from './browser-google-auth-ua'
-
-type UserAgentBrand = { brand: string; version: string }
-
-export type ViewportUserAgentOverride = {
-  userAgent: string
-  userAgentMetadata?: {
-    brands: UserAgentBrand[]
-    fullVersionList: UserAgentBrand[]
-    fullVersion: string
-    platform: string
-    platformVersion: string
-    architecture: string
-    model: string
-    mobile: boolean
-  }
-}
-
-// Why: responsive sites UA-sniff; this is Chrome DevTools' default iPhone UA template with the real
-// Chrome major spliced in so the userAgentMetadata brands below agree with it.
-function buildMobileUserAgent(chromeMajor: string): string {
-  return `Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/${chromeMajor}.0.0.0 Mobile/15E148 Safari/604.1`
-}
-
-function extractChromeMajor(ua: string): string {
-  const match = ua.match(/Chrome\/(\d+)/)
-  return match ? match[1] : '134'
-}
-
-export function buildViewportUserAgentOverride(args: {
-  url: string
-  mobile: boolean
-  baseUserAgent: string
-  googleAuthEnabled?: boolean
-}): ViewportUserAgentOverride {
-  if (args.googleAuthEnabled !== false && isGoogleAuthUrl(args.url)) {
-    // Why: match the header-level Firefox switch exactly, and send no userAgentMetadata — real
-    // Firefox emits no client hints, so Chrome brands here would contradict the stripped headers.
-    return { userAgent: googleAuthUserAgent() }
-  }
-  if (!args.mobile) {
-    // Why: desktop presets republish the session's clean identity, or a preset would put the
-    // Electron/app tokens back on the wire and a transplanted session gets revoked (STA-7147).
-    return { userAgent: args.baseUserAgent }
-  }
-  const chromeMajor = extractChromeMajor(args.baseUserAgent)
-  // Why: userAgentMetadata must accompany the mobile UA so client hints match, or bot-detection flags the desktop-hint leak.
-  return {
-    userAgent: buildMobileUserAgent(chromeMajor),
-    userAgentMetadata: {
-      brands: [
-        { brand: 'Google Chrome', version: chromeMajor },
-        { brand: 'Chromium', version: chromeMajor },
-        { brand: 'Not/A)Brand', version: '24' }
-      ],
-      fullVersionList: [
-        { brand: 'Google Chrome', version: `${chromeMajor}.0.0.0` },
-        { brand: 'Chromium', version: `${chromeMajor}.0.0.0` },
-        { brand: 'Not/A)Brand', version: '24.0.0.0' }
-      ],
-      fullVersion: `${chromeMajor}.0.0.0`,
-      platform: 'iOS',
-      platformVersion: '17.0',
-      architecture: '',
-      model: 'iPhone',
-      mobile: true
-    }
-  }
-}
diff --git a/src/main/browser/cdp-debugger-channel.ts b/src/main/browser/cdp-debugger-channel.ts
index f1cddbe20f1d..b0c790138e84 100644
--- a/src/main/browser/cdp-debugger-channel.ts
+++ b/src/main/browser/cdp-debugger-channel.ts
@@ -3,6 +3,7 @@ import type { WebContents } from 'electron'
 import { acquireElectronDebugger, type ElectronDebuggerLease } from './electron-debugger-lease'
 import type { CdpClientResponseWriter } from './cdp-client-response-writer'
 import type { CdpSyntheticSessionRegistry } from './cdp-synthetic-session-registry'
+import { sendGuestCdpCommand } from './guest-cdp-command'
 
 /**
  * The IO boundary with webContents.debugger: lease-based attach, event fan-out to
@@ -86,10 +87,9 @@ export class CdpDebuggerChannel {
     params: Record<string, unknown>,
     sessionId?: string
   ): Promise<unknown> {
-    const command = sessionId
-      ? this.webContents.debugger.sendCommand(method, params, sessionId)
-      : this.webContents.debugger.sendCommand(method, params)
-    return Promise.resolve(command)
+    return sessionId
+      ? sendGuestCdpCommand(this.webContents, method, params, sessionId)
+      : sendGuestCdpCommand(this.webContents, method, params)
   }
 
   forwardCommand(
diff --git a/src/main/browser/cdp-debugger-lifecycle.ts b/src/main/browser/cdp-debugger-lifecycle.ts
index 225eb689dba7..0880f9926a47 100644
--- a/src/main/browser/cdp-debugger-lifecycle.ts
+++ b/src/main/browser/cdp-debugger-lifecycle.ts
@@ -4,6 +4,7 @@ import type { CdpTabState } from './cdp-auxiliary-commands'
 import type { CdpCommandSender } from './snapshot-engine'
 import type { CdpBridgeState } from './cdp-bridge-state'
 import { createCdpDebuggerMessageListener } from './cdp-debugger-events'
+import { sendGuestCdpCommand } from './guest-cdp-command'
 
 export class CdpDebuggerLifecycle {
   constructor(private readonly bridgeState: CdpBridgeState) {}
@@ -83,7 +84,7 @@ export class CdpDebuggerLifecycle {
 
   makeCdpSender(guest: WebContents, sessionId?: string): CdpCommandSender {
     return (method: string, params?: Record<string, unknown>) => {
-      const command = guest.debugger.sendCommand(method, params, sessionId) as Promise<unknown>
+      const command = sendGuestCdpCommand(guest, method, params, sessionId)
       // Why: Electron's CDP sendCommand can hang on a stale debugger session, so a 10s timeout bounds the RPC.
       let timer: ReturnType<typeof setTimeout>
       return Promise.race([
diff --git a/src/main/browser/cdp-ws-proxy-test-harness.ts b/src/main/browser/cdp-ws-proxy-test-harness.ts
index c66a3cbf6b1b..3f5765c18abd 100644
--- a/src/main/browser/cdp-ws-proxy-test-harness.ts
+++ b/src/main/browser/cdp-ws-proxy-test-harness.ts
@@ -25,6 +25,7 @@ export type MockWebContents = {
   webContents: {
     debugger: MockDebugger
     isDestroyed: () => boolean
+    isCrashed: () => boolean
     focus: Mock<() => void>
     printToPDF: Mock<() => Promise<Buffer>>
     reload: Mock<() => void>
@@ -72,6 +73,7 @@ export function createMockWebContents(): MockWebContents {
     webContents: {
       debugger: debuggerObj,
       isDestroyed: () => destroyed,
+      isCrashed: () => false,
       focus: vi.fn(),
       printToPDF: vi.fn(async () => Buffer.from('%PDF-test')),
       reload: vi.fn(),
diff --git a/src/main/browser/cdp-ws-proxy.test.ts b/src/main/browser/cdp-ws-proxy.test.ts
index f744998ab24d..db8eb82a1f82 100644
--- a/src/main/browser/cdp-ws-proxy.test.ts
+++ b/src/main/browser/cdp-ws-proxy.test.ts
@@ -803,23 +803,4 @@ describe('CdpWsProxy', () => {
     expect(removedEvents).toEqual(expect.arrayContaining(['message', 'close']))
     offSpy.mockRestore()
   })
-
-  it('rejects inflight requests on stop', async () => {
-    let resolveCommand: (v: unknown) => void
-    mock.webContents.debugger.sendCommand.mockImplementation(
-      () =>
-        new Promise((r) => {
-          resolveCommand = r as (v: unknown) => void
-        })
-    )
-
-    const client = await connect(endpoint)
-    client.send(JSON.stringify({ id: 1, method: 'Page.enable', params: {} }))
-
-    await new Promise((r) => setTimeout(r, 10))
-    await proxy.stop()
-
-    resolveCommand!({})
-    client.close()
-  })
 })
diff --git a/src/main/browser/guest-cdp-command.test.ts b/src/main/browser/guest-cdp-command.test.ts
new file mode 100644
index 000000000000..3ad719596817
--- /dev/null
+++ b/src/main/browser/guest-cdp-command.test.ts
@@ -0,0 +1,57 @@
+import { describe, expect, it, vi } from 'vitest'
+import { BrowserError } from './browser-error'
+import { sendGuestCdpCommand } from './guest-cdp-command'
+
+function makeGuest(state: { crashed?: boolean; destroyed?: boolean } = {}) {
+  const sendCommand = vi.fn(async () => ({ ok: true }))
+  const guest = {
+    isDestroyed: vi.fn(() => state.destroyed ?? false),
+    isCrashed: vi.fn(() => {
+      if (state.destroyed) {
+        throw new Error('Object has been destroyed')
+      }
+      return state.crashed ?? false
+    }),
+    debugger: { sendCommand }
+  }
+  return { guest, sendCommand }
+}
+
+describe('sendGuestCdpCommand', () => {
+  it.each(['Emulation.setDeviceMetricsOverride', 'Emulation.setVisibleSize'])(
+    'refuses %s while the renderer is gone instead of letting Chromium crash the app',
+    async (method) => {
+      const { guest, sendCommand } = makeGuest({ crashed: true })
+      const sent = sendGuestCdpCommand(guest, method, { width: 375, height: 667 })
+      await expect(sent).rejects.toBeInstanceOf(BrowserError)
+      await expect(sent).rejects.toMatchObject({ code: 'browser_cdp_error' })
+      expect(sendCommand).not.toHaveBeenCalled()
+    }
+  )
+
+  it('refuses a resize on a destroyed guest without asking it whether it crashed', async () => {
+    const { guest, sendCommand } = makeGuest({ destroyed: true })
+    await expect(
+      sendGuestCdpCommand(guest, 'Emulation.setDeviceMetricsOverride', { width: 1, height: 1 })
+    ).rejects.toBeInstanceOf(BrowserError)
+    expect(sendCommand).not.toHaveBeenCalled()
+  })
+
+  it('still sends commands that do not resize the view to a crashed guest', async () => {
+    const { guest, sendCommand } = makeGuest({ crashed: true })
+    await expect(
+      sendGuestCdpCommand(guest, 'Emulation.setUserAgentOverride', { userAgent: 'x' })
+    ).resolves.toEqual({ ok: true })
+    expect(sendCommand).toHaveBeenCalledWith('Emulation.setUserAgentOverride', { userAgent: 'x' })
+  })
+
+  it('sends a resize to a live guest, and passes a session id only when one is given', async () => {
+    const { guest, sendCommand } = makeGuest()
+    await sendGuestCdpCommand(guest, 'Emulation.setVisibleSize', { width: 2, height: 3 })
+    await sendGuestCdpCommand(guest, 'DOM.enable', {}, 'iframe-session')
+    expect(sendCommand.mock.calls).toEqual([
+      ['Emulation.setVisibleSize', { width: 2, height: 3 }],
+      ['DOM.enable', {}, 'iframe-session']
+    ])
+  })
+})
diff --git a/src/main/browser/guest-cdp-command.ts b/src/main/browser/guest-cdp-command.ts
new file mode 100644
index 000000000000..ed7735df2d87
--- /dev/null
+++ b/src/main/browser/guest-cdp-command.ts
@@ -0,0 +1,42 @@
+import type { WebContents } from 'electron'
+import { BrowserError } from './browser-error'
+
+// Why: Chromium resizes the page's view for these without checking the view still exists
+// (WebContentsImpl::SetDeviceEmulationSize). A crashed renderer takes its view with it until the
+// reload builds a new one, so one of these sent in that gap segfaults Orca's main process.
+const VIEW_RESIZING_CDP_METHODS: ReadonlySet<string> = new Set([
+  'Emulation.setDeviceMetricsOverride',
+  'Emulation.setVisibleSize'
+])
+
+type GuestCdpTarget = Pick<WebContents, 'isDestroyed' | 'isCrashed'> & {
+  debugger: Pick<WebContents['debugger'], 'sendCommand'>
+}
+
+/**
+ * The gate for guest CDP commands: every viewport writer and every sender that forwards a caller's
+ * method (agent bridge, CDP proxy) goes through here, so none can hand Chromium a command that
+ * crashes the app while the guest's renderer is dead.
+ */
+export function sendGuestCdpCommand(
+  guest: GuestCdpTarget,
+  method: string,
+  params?: Record<string, unknown>,
+  sessionId?: string
+): Promise<unknown> {
+  // Why same task as the send: isCrashed() flips in the same Chromium task that drops the view,
+  // so checking right before sendCommand leaves no gap for the renderer to die in between.
+  if (VIEW_RESIZING_CDP_METHODS.has(method) && (guest.isDestroyed() || guest.isCrashed())) {
+    return Promise.reject(
+      new BrowserError(
+        'browser_cdp_error',
+        'The page crashed; its viewport can be changed again once it reloads.'
+      )
+    )
+  }
+  return Promise.resolve(
+    sessionId === undefined
+      ? guest.debugger.sendCommand(method, params)
+      : guest.debugger.sendCommand(method, params, sessionId)
+  )
+}
diff --git a/src/main/browser/offscreen-browser-backend-lifecycle.test.ts b/src/main/browser/offscreen-browser-backend-lifecycle.test.ts
index a3758d70516c..381489963a33 100644
--- a/src/main/browser/offscreen-browser-backend-lifecycle.test.ts
+++ b/src/main/browser/offscreen-browser-backend-lifecycle.test.ts
@@ -90,18 +90,16 @@ describe('OffscreenBrowserBackend lifecycle', () => {
   beforeEach(() => {
     mocks.windows.length = 0
     mocks.finishLoads = true
-    mocks.BrowserWindow.mockImplementation(
-      function BrowserWindowMock(this: {
-        webContents: MockWebContents
-        isDestroyed: () => boolean
-        destroy: () => void
-      }) {
-        const window = new MockBrowserWindow()
-        this.webContents = window.webContents
-        this.isDestroyed = window.isDestroyed.bind(window)
-        this.destroy = window.destroy.bind(window)
-      }
-    )
+    mocks.BrowserWindow.mockImplementation(function BrowserWindowMock(this: {
+      webContents: MockWebContents
+      isDestroyed: () => boolean
+      destroy: () => void
+    }) {
+      const window = new MockBrowserWindow()
+      this.webContents = window.webContents
+      this.isDestroyed = window.isDestroyed.bind(window)
+      this.destroy = window.destroy.bind(window)
+    })
   })
 
   it('settles a pending load and removes its waiters when the page is destroyed', async () => {
diff --git a/src/main/claude-accounts/claude-account-service-api-parity.test.ts b/src/main/claude-accounts/claude-account-service-api-parity.test.ts
index 206ccbd82af4..09ec7813ffe8 100644
--- a/src/main/claude-accounts/claude-account-service-api-parity.test.ts
+++ b/src/main/claude-accounts/claude-account-service-api-parity.test.ts
@@ -1,28 +1,10 @@
 import { describe, expect, it, vi } from 'vitest'
 import type { ClaudeRateLimitAccountsState } from '../../shared/managed-account-types'
 import { ClaudeAccountService } from './service'
-import type { ClaudeAccountAddTarget, ClaudeAccountImportOptions } from './service'
+import type { ClaudeAccountAddTarget } from './service'
 
 vi.mock('electron', () => ({ app: { getPath: () => '/tmp/orca-claude-api-parity' } }))
 
-type PublicClaudeAccountService = {
-  listAccounts(): ClaudeRateLimitAccountsState
-  addAccount(target?: ClaudeAccountAddTarget): Promise<ClaudeRateLimitAccountsState>
-  addAccountFromConfigDir(
-    configDir: string,
-    options?: ClaudeAccountImportOptions
-  ): Promise<ClaudeRateLimitAccountsState>
-  reauthenticateAccount(accountId: string): Promise<ClaudeRateLimitAccountsState>
-  removeAccount(accountId: string): Promise<ClaudeRateLimitAccountsState>
-  selectAccount(accountId: string | null): Promise<ClaudeRateLimitAccountsState>
-  selectAccountForTarget(
-    accountId: string | null,
-    target?: { runtime?: 'host' | 'wsl'; wslDistro?: string | null }
-  ): Promise<ClaudeRateLimitAccountsState>
-  cancelPendingLogin(): boolean
-  getRuntimeConfigDir(target?: { runtime?: 'host' | 'wsl'; wslDistro?: string | null }): string
-}
-
 function createService(): ClaudeAccountService {
   const settings = {
     claudeManagedAccounts: [],
@@ -41,16 +23,7 @@ function deferred(): { promise: Promise<void>; resolve: () => void } {
   return { promise: new Promise<void>((done) => (resolve = done)), resolve }
 }
 
-describe('ClaudeAccountService API parity', () => {
-  it('keeps the exact runtime export and assignable public surface', async () => {
-    const runtimeExports = await import('./service')
-    const service: PublicClaudeAccountService = createService()
-
-    expect(Object.keys(runtimeExports)).toEqual(['ClaudeAccountService'])
-    expect(service.cancelPendingLogin()).toBe(false)
-    expect(service.getRuntimeConfigDir()).toBe('/tmp/claude')
-  })
-
+describe('ClaudeAccountService mutation serialization', () => {
   it('serializes mutations within one service', async () => {
     const service = createService()
     const first = deferred()
diff --git a/src/main/claude-usage/store.ts b/src/main/claude-usage/store.ts
index f5fd8ca3ce35..686b32ab827e 100644
--- a/src/main/claude-usage/store.ts
+++ b/src/main/claude-usage/store.ts
@@ -1,3 +1,4 @@
+import { claudeTokenSessions } from '../usage/agent-token-usage'
 import { app } from 'electron'
 import { join } from 'node:path'
 import type {
@@ -79,6 +80,10 @@ export class ClaudeUsageStore extends UsageProviderStoreLifecycle<
 > {
   constructor(store: Pick<Store, 'getRepos' | 'getAllWorktreeMeta'>) {
     super(store, {
+      tokenUsage: {
+        provider: 'claude',
+        selectSessions: (state) => claudeTokenSessions(state.sessions)
+      },
       logTag: '[claude-usage]',
       resolveCacheFile: getClaudeUsageFile,
       createDefaultState: getDefaultState,
diff --git a/src/main/claude/__fixtures__/claude-adapter-capture-early-steer.jsonl b/src/main/claude/__fixtures__/claude-adapter-capture-early-steer.jsonl
new file mode 100644
index 000000000000..bff60192d740
--- /dev/null
+++ b/src/main/claude/__fixtures__/claude-adapter-capture-early-steer.jsonl
@@ -0,0 +1,68 @@
+{"at": 0, "kind": "meta", "scenario": "early-steer", "providerSessionId": "00000000-0000-4000-8000-00000000c1a0", "note": "Recorded through Orca adapter vs Claude CLI 2.1.280; scrubbed: session id, home/tmp paths."}
+{"at": 219, "kind": "frame", "frame": {"type": "system", "subtype": "hook_started", "hook_id": "e13780eb-2f2b-45e5-a9fd-e7868ef6d9e2", "hook_name": "SessionStart:startup", "hook_event": "SessionStart", "uuid": "308e42c2-3222-452b-bb5f-f8e41cf485a4", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 229, "kind": "frame", "frame": {"type": "system", "subtype": "hook_response", "hook_id": "e13780eb-2f2b-45e5-a9fd-e7868ef6d9e2", "hook_name": "SessionStart:startup", "hook_event": "SessionStart", "output": "\n", "stdout": "\n", "stderr": "", "exit_code": 0, "outcome": "success", "uuid": "8c37d862-0ba3-4e14-a746-68a29d137384", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 242, "kind": "dispatch", "clientMessageId": "client-A", "sentUuid": "c64cdf14-1349-4be1-b0a4-5613890d57bd", "text": "Use the Bash tool to run `sleep 8` two separate times, one call at a time, waiting for each. Then reply exactly: FIRST DONE", "outcome": {"state": "admitted"}}
+{"at": 244, "kind": "frame", "frame": {"type": "system", "subtype": "session_state_changed", "state": "running", "uuid": "052ca984-de90-4289-ac97-587d361f35dc", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 244, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "c64cdf14-1349-4be1-b0a4-5613890d57bd", "state": "queued", "uuid": "e32cf6db-6c39-49ad-87a6-ad8f392e00b1", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 244, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "c64cdf14-1349-4be1-b0a4-5613890d57bd", "state": "started", "uuid": "0c7a74e6-8f5e-43c4-9cf0-af6e3fac6e0f", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 259, "kind": "frame", "frame": {"type": "system", "subtype": "init", "cwd": "/tmp/scrubbed-cwd", "session_id": "00000000-0000-4000-8000-00000000c1a0", "tools": ["Task", "AskUserQuestion", "Bash", "CronCreate", "CronDelete", "CronList", "DesignSync", "Edit", "EnterPlanMode", "EnterWorktree", "ExitPlanMode", "ExitWorktree", "ListAgents", "NotebookEdit", "Read", "ReportFindings", "ScheduleWakeup", "SendMessage", "Skill", "TaskCreate", "TaskGet", "TaskList", "TaskStop", "TaskUpdate", "ToolSearch", "WebFetch", "WebSearch", "Workflow", "Write"], "mcp_servers": [], "model": "claude-opus-5-5[1m]", "permissionMode": "default", "slash_commands": ["deep-research", "design", "design-sync", "dataviz", "update-config", "verify", "debug", "code-review", "simplify", "batch", "fewer-permission-prompts", "doctor", "loop", "claude-api", "workflow-authoring", "run", "run-skill-generator", "agents", "auto-mode-setup", "autocompact", "clear", "color", "compact", "config", "output-style", "context", "effort", "fast", "heapdump", "init", "mcp", "model", "__remote-workflow", "workflow-launch-exec", "reload-plugins", "reload-skills", "rename", "security-review", "usage", "insights", "recap", "goal", "design-consent", "design-revoke", "list-agents", "team-onboarding"], "terminal_slash_commands": ["doctor", "color", "reload-plugins"], "apiKeySource": "none", "claude_code_version": "2.1.280", "output_style": "default", "agents": ["claude", "Explore", "general-purpose", "Plan", "statusline-setup"], "skills": ["deep-research", "design", "design-sync", "dataviz", "update-config", "verify", "debug", "code-review", "simplify", "batch", "fewer-permission-prompts", "doctor", "loop", "claude-api", "workflow-authoring", "run", "run-skill-generator"], "plugins": [{"name": "telemetry", "path": "builtin", "source": "telemetry@builtin"}], "capabilities": ["interrupt_receipt_v1", "interrupt_cancel_queued_v1", "msg_lifecycle_v1", "mcp_read_resource_v1", "mcp_tool_ui_meta_v1"], "analytics_disabled": false, "product_feedback_disabled": false, "uuid": "ff6bb8ec-afcb-4bb8-88a8-d75625377ab9", "memory_paths": {"auto": "/Users/user/scrubbed"}, "messaging_socket_path": "/tmp/scrubbed.sock", "fast_mode_state": "off", "fast_mode_disabled_reason": "sdk_opt_in_required"}}
+{"at": 261, "kind": "frame", "frame": {"type": "system", "subtype": "status", "status": "requesting", "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "9900a74e-78ff-48a6-b005-8b748a8f7a1d"}}
+{"at": 492, "kind": "dispatch", "clientMessageId": "client-B", "sentUuid": "3a4cf7ae-5121-45d4-8c99-76625c847c4e", "text": "Also say the word banana at the end of your reply.", "outcome": {"state": "admitted"}}
+{"at": 493, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "3a4cf7ae-5121-45d4-8c99-76625c847c4e", "state": "queued", "uuid": "2244a4b7-a832-418a-b6e9-be4657618f60", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 1342, "kind": "frame", "frame": {"type": "user", "message": {"role": "user", "content": [{"type": "text", "text": "Use the Bash tool to run `sleep 8` two separate times, one call at a time, waiting for each. Then reply exactly: FIRST DONE"}]}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "c64cdf14-1349-4be1-b0a4-5613890d57bd", "timestamp": "2026-09-28T12:50:50.211Z", "isReplay": true}}
+{"at": 1342, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_start", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsEi9RgiS61CeGuiyaP", "type": "message", "role": "assistant", "content": [], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 5242, "cache_read_input_tokens": 11514, "cache_creation": {"ephemeral_5m_input_tokens": 5242, "ephemeral_1h_input_tokens": 0}, "output_tokens": 16, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "25b0f48f-8de3-4e58-a53f-76cedc10c4e8", "ttft_ms": 1075, "user_message_uuid": "c64cdf14-1349-4be1-b0a4-5613890d57bd", "user_message_uuids": ["c64cdf14-1349-4be1-b0a4-5613890d57bd"]}}
+{"at": 1342, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_start", "index": 0, "content_block": {"type": "tool_use", "id": "toolu_01RL5fbYfvXaRva9PBe2C7Qn", "name": "Bash", "input": {}, "caller": {"type": "direct"}}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "54809bd1-bb5a-4fe7-9a04-1dc60e5a7163"}}
+{"at": 1342, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": ""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "02a681bb-01c9-4dd3-b890-040e17bf4132"}}
+{"at": 2307, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "{\"com"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "0a1147d0-c168-405a-a4e4-79ad5266d3c2"}}
+{"at": 2307, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "mand\": \"s"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "1eabfcb6-b0c4-403a-9804-c55b013391ae"}}
+{"at": 2307, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "lee"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "20f34e40-6392-4e4a-9991-ad35ad6b1aaa"}}
+{"at": 2309, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "p 8\""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "ec8ed822-0e8f-46c1-b7a0-c8ab4467baa9"}}
+{"at": 2330, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": ", \"descri"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "87881476-c659-4e82-945d-be15eaa45501"}}
+{"at": 2332, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ption\": \""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "e2502f3a-3cca-4741-9df5-dade6f4e4abb"}}
+{"at": 2332, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "Sl"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "dc28f0f9-22f5-47fc-a374-1369c6fda079"}}
+{"at": 2335, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "eep f"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "85345f83-b80d-4142-aa66-66b8640dca3b"}}
+{"at": 2340, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "or 8 "}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "5ce61d4a-abd9-47bd-9c7b-e01a6d566387"}}
+{"at": 2341, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "seconds\"}"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "21de6d37-199b-44d7-bfaa-4af1471a7235"}}
+{"at": 2343, "kind": "frame", "frame": {"type": "assistant", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsEi9RgiS61CeGuiyaP", "type": "message", "role": "assistant", "content": [{"type": "tool_use", "id": "toolu_01RL5fbYfvXaRva9PBe2C7Qn", "name": "Bash", "input": {"command": "sleep 8", "description": "Sleep for 8 seconds"}, "caller": {"type": "direct"}}], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 5242, "cache_read_input_tokens": 11514, "cache_creation": {"ephemeral_5m_input_tokens": 5242, "ephemeral_1h_input_tokens": 0}, "output_tokens": 16, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "3f3c0fff-9ca6-49f9-8b73-36e569af5a38", "timestamp": "2026-09-28T12:50:52.296Z", "request_id": "req_011CfVsEhBPEiAFbbAE18svX", "user_message_uuid": "c64cdf14-1349-4be1-b0a4-5613890d57bd", "user_message_uuids": ["c64cdf14-1349-4be1-b0a4-5613890d57bd"]}}
+{"at": 2347, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_stop", "index": 0}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "fa196eb6-011b-4fa7-831d-4ffe2582a3c7"}}
+{"at": 2375, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_delta", "delta": {"stop_reason": "tool_use", "stop_sequence": null, "stop_details": null, "container": null}, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 5242, "cache_read_input_tokens": 11514, "output_tokens": 82, "output_tokens_details": {"thinking_tokens": 0}}, "context_management": {"applied_edits": []}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "7b300bd2-eaa1-4cb7-a557-6908cbb6f2a6"}}
+{"at": 2380, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_stop"}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "c1573618-e6fb-4f22-8939-e7959440f18a"}}
+{"at": 5482, "kind": "frame", "frame": {"type": "system", "subtype": "task_started", "task_id": "bys65yjga", "tool_use_id": "toolu_01RL5fbYfvXaRva9PBe2C7Qn", "description": "Sleep for 8 seconds", "is_backgrounded": false, "task_type": "local_bash", "uuid": "6b741fb3-6edc-4c9e-a69a-81fc87ef1502", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 10493, "kind": "frame", "frame": {"type": "system", "subtype": "task_notification", "task_id": "bys65yjga", "tool_use_id": "toolu_01RL5fbYfvXaRva9PBe2C7Qn", "status": "completed", "output_file": "", "summary": "Sleep for 8 seconds", "uuid": "9b0edc57-cd0c-4f60-a72c-e359e1a7fabc", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 10496, "kind": "frame", "frame": {"type": "user", "message": {"role": "user", "content": [{"tool_use_id": "toolu_01RL5fbYfvXaRva9PBe2C7Qn", "type": "tool_result", "content": "(Bash completed with no output)", "is_error": false}]}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "2f7a468f-55f1-4434-8f68-70a077f74f6e", "timestamp": "2026-09-28T12:51:00.450Z", "tool_use_result": {"stdout": "", "stderr": "", "interrupted": false, "isImage": false, "noOutputExpected": false}}}
+{"at": 10499, "kind": "frame", "frame": {"type": "user", "message": {"role": "user", "content": [{"type": "text", "text": "Also say the word banana at the end of your reply."}]}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "3a4cf7ae-5121-45d4-8c99-76625c847c4e", "timestamp": "2026-09-28T12:50:50.448Z", "isReplay": true}}
+{"at": 10499, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "3a4cf7ae-5121-45d4-8c99-76625c847c4e", "state": "started", "uuid": "aca666d1-c3b3-451e-81d7-5aadfa246b42", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 10499, "kind": "frame", "frame": {"type": "system", "subtype": "status", "status": "requesting", "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "ee6f2da9-2514-4086-8bc4-1a5c01e5207b"}}
+{"at": 11452, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_start", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsFTNDFHDiwBZc8cKWk", "type": "message", "role": "assistant", "content": [], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 217, "cache_read_input_tokens": 16756, "cache_creation": {"ephemeral_5m_input_tokens": 217, "ephemeral_1h_input_tokens": 0}, "output_tokens": 16, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "571285ce-eda5-44b5-818c-db549ee9aef9", "ttft_ms": 949}}
+{"at": 11452, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_start", "index": 0, "content_block": {"type": "tool_use", "id": "toolu_01HG7iwC2HgvoxndbuytmJCM", "name": "Bash", "input": {}, "caller": {"type": "direct"}}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "6d6d5ecd-0889-4592-b514-d72c0a964cc9"}}
+{"at": 11453, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": ""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "58339280-14b3-4f61-bd2b-726418d4b324"}}
+{"at": 11853, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "{\"comma"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "37c5f88b-3ef0-471c-89b1-a8dc6f3f61ad"}}
+{"at": 11866, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "nd\": \"s"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "f31aa8f4-903d-4a7d-aeff-41c16f4b487d"}}
+{"at": 11866, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "leep 8\""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "b1b59a9c-cec2-4398-9e8e-e49f16ad712d"}}
+{"at": 11882, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": ", \"desc"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "25d130db-a0f9-43d2-b639-6a9064f1e00d"}}
+{"at": 11883, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ription"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "e0b776a6-7cb3-4512-bacc-07fc84a1737e"}}
+{"at": 11883, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "\": \"Sle"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "54ec71a5-84ad-4f45-849f-cdbeae44d781"}}
+{"at": 11883, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ep for "}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "667d1090-ceca-4c88-9864-447d6c95784e"}}
+{"at": 11883, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "8 secon"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "2047e8e3-feb9-484d-8a1a-c19f0afebd59"}}
+{"at": 11883, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ds\"}"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "7d4f9da1-d974-4acf-84a5-d1f22068beec"}}
+{"at": 11884, "kind": "frame", "frame": {"type": "assistant", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsFTNDFHDiwBZc8cKWk", "type": "message", "role": "assistant", "content": [{"type": "tool_use", "id": "toolu_01HG7iwC2HgvoxndbuytmJCM", "name": "Bash", "input": {"command": "sleep 8", "description": "Sleep for 8 seconds"}, "caller": {"type": "direct"}}], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 217, "cache_read_input_tokens": 16756, "cache_creation": {"ephemeral_5m_input_tokens": 217, "ephemeral_1h_input_tokens": 0}, "output_tokens": 16, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "6c4c5b57-e219-4c0d-a90f-26cbae8a33df", "timestamp": "2026-09-28T12:51:01.838Z", "request_id": "req_011CfVsFSwuBKQ87EU42vew5"}}
+{"at": 11885, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_stop", "index": 0}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "df9289e5-af2a-4b85-8dc8-47df67725383"}}
+{"at": 11885, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_delta", "delta": {"stop_reason": "tool_use", "stop_sequence": null, "stop_details": null, "container": null}, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 217, "cache_read_input_tokens": 16756, "output_tokens": 82, "output_tokens_details": {"thinking_tokens": 0}}, "context_management": {"applied_edits": []}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "7ac75599-4149-466f-ab0b-4d4ef74a9c86"}}
+{"at": 11885, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_stop"}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "ea092344-1e27-4b3f-9145-e388a268a4a1"}}
+{"at": 14890, "kind": "frame", "frame": {"type": "system", "subtype": "task_started", "task_id": "bu917pf4q", "tool_use_id": "toolu_01HG7iwC2HgvoxndbuytmJCM", "description": "Sleep for 8 seconds", "is_backgrounded": false, "task_type": "local_bash", "uuid": "408f8301-dbd6-43cb-8f09-7f7d5f4325da", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 19903, "kind": "frame", "frame": {"type": "system", "subtype": "task_notification", "task_id": "bu917pf4q", "tool_use_id": "toolu_01HG7iwC2HgvoxndbuytmJCM", "status": "completed", "output_file": "", "summary": "Sleep for 8 seconds", "uuid": "55ee40ae-c83e-40de-ae7c-fb0659950b39", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 19906, "kind": "frame", "frame": {"type": "user", "message": {"role": "user", "content": [{"tool_use_id": "toolu_01HG7iwC2HgvoxndbuytmJCM", "type": "tool_result", "content": "(Bash completed with no output)", "is_error": false}]}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "ee783948-1a20-4797-b0ef-b191babd6a68", "timestamp": "2026-09-28T12:51:09.859Z", "tool_use_result": {"stdout": "", "stderr": "", "interrupted": false, "isImage": false, "noOutputExpected": false}}}
+{"at": 19908, "kind": "frame", "frame": {"type": "system", "subtype": "status", "status": "requesting", "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "dec2fc2c-f27f-44c2-bbda-01b112f803d6"}}
+{"at": 21540, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_start", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsGBuJTPMNVKzDFTw9k", "type": "message", "role": "assistant", "content": [], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 121, "cache_read_input_tokens": 16973, "cache_creation": {"ephemeral_5m_input_tokens": 121, "ephemeral_1h_input_tokens": 0}, "output_tokens": 11, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "14cb8df8-de6e-43e8-a0be-46c883c88501", "ttft_ms": 1627}}
+{"at": 21540, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_start", "index": 0, "content_block": {"type": "text", "text": ""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "f346ec9e-fe33-4c2e-a611-b2da26f43f53"}}
+{"at": 21540, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": "FIRST DONE ban"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "6440a3c0-de10-4e9e-a898-7ef0ec79673c"}}
+{"at": 21540, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": "ana"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "7096cb35-c640-4698-b755-8aad289d6cef"}}
+{"at": 21556, "kind": "frame", "frame": {"type": "assistant", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsGBuJTPMNVKzDFTw9k", "type": "message", "role": "assistant", "content": [{"type": "text", "text": "FIRST DONE banana"}], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 121, "cache_read_input_tokens": 16973, "cache_creation": {"ephemeral_5m_input_tokens": 121, "ephemeral_1h_input_tokens": 0}, "output_tokens": 11, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "5c9408ee-fcd2-46e8-aca0-1e2e8563420c", "timestamp": "2026-09-28T12:51:11.495Z", "request_id": "req_011CfVsG9F4VXdbez6Yd6wis"}}
+{"at": 21556, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_stop", "index": 0}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "12aa2a40-1da6-45bc-bd9e-a1f999c144d2"}}
+{"at": 21556, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_delta", "delta": {"stop_reason": "end_turn", "stop_sequence": null, "stop_details": null, "container": null}, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 121, "cache_read_input_tokens": 16973, "output_tokens": 11, "output_tokens_details": {"thinking_tokens": 0}}, "context_management": {"applied_edits": []}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "fee3cade-9b96-4f0e-8657-b23a6c6f83ca"}}
+{"at": 21557, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_stop"}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "b39aedff-1723-46d2-8fbf-d62b2fe8f2ac"}}
+{"at": 21559, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "3a4cf7ae-5121-45d4-8c99-76625c847c4e", "state": "completed", "uuid": "5b6a0e7a-361d-42ae-983a-5ecc00d6ff8c", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 21562, "kind": "frame", "frame": {"duration_api_ms": 6682, "stop_reason": "end_turn", "session_id": "00000000-0000-4000-8000-00000000c1a0", "total_cost_usd": 0.045744599999999996, "usage": {"input_tokens": 6, "cache_creation_input_tokens": 5580, "cache_read_input_tokens": 45243, "output_tokens": 175, "output_tokens_details": {"thinking_tokens": 0}, "server_tool_use": {"web_search_requests": 0, "web_fetch_requests": 0}, "service_tier": "standard", "cache_creation": {"ephemeral_1h_input_tokens": 0, "ephemeral_5m_input_tokens": 5580}, "inference_geo": "not_available", "iterations": [], "speed": "standard"}, "modelUsage": {"claude-opus-5-5[1m]": {"inputTokens": 1219, "outputTokens": 196, "cacheReadInputTokens": 45243, "cacheCreationInputTokens": 5580, "webSearchRequests": 0, "costUSD": 0.045744599999999996, "contextWindow": 1000000, "maxOutputTokens": 128000, "thinkingTokens": 0, "canonicalModel": "claude-opus-5-5", "provider": "firstParty", "costBasis": "list"}}, "permission_denials": [], "terminal_reason": "completed", "fast_mode_state": "off", "fast_mode_disabled_reason": "sdk_opt_in_required", "subagent_stats": {"spawned": 0, "requested": {"background": 0, "foreground": 0, "unset": 0}, "started_in_background": 0, "max_depth": 0, "spawned_by_subagents": 0, "completed": 0, "failed": 0, "killed": {"parent": 0, "user": 0, "system": 0}, "refused": {"depth_limit": 0, "concurrency_limit": 0, "budget": 0}, "by_type": {}}, "is_error": false, "num_turns": 3, "subtype": "success", "api_error_status": null, "result": "FIRST DONE banana", "ttft_ms": 2096, "type": "result", "duration_ms": 21314, "uuid": "02543cfd-4942-47f9-82d7-0bd79a2ed93d", "ttft_stream_ms": 1096, "time_to_request_ms": 21, "first_content_frame_ms": 1096, "user_message_uuid": "c64cdf14-1349-4be1-b0a4-5613890d57bd", "user_message_uuids": ["c64cdf14-1349-4be1-b0a4-5613890d57bd", "3a4cf7ae-5121-45d4-8c99-76625c847c4e"], "request_sent_wall_ms": 1790599850221, "queued_turn_count": 0, "result_index": 0}}
+{"at": 21563, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "c64cdf14-1349-4be1-b0a4-5613890d57bd", "state": "completed", "uuid": "ef4b1bcb-e9cf-42f0-a0f9-b25a59a56efe", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 21563, "kind": "frame", "frame": {"type": "system", "subtype": "session_state_changed", "state": "idle", "uuid": "fce05c2c-6c43-4c7d-a347-ec3e378e3afc", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 24574, "kind": "end", "results": 1}
diff --git a/src/main/claude/__fixtures__/claude-adapter-capture-fold.jsonl b/src/main/claude/__fixtures__/claude-adapter-capture-fold.jsonl
new file mode 100644
index 000000000000..5bf4b2f863c8
--- /dev/null
+++ b/src/main/claude/__fixtures__/claude-adapter-capture-fold.jsonl
@@ -0,0 +1,65 @@
+{"at": 1, "kind": "meta", "scenario": "fold", "providerSessionId": "00000000-0000-4000-8000-00000000c1a0", "note": "Recorded through Orca adapter vs Claude CLI 2.1.280; scrubbed: session id, home/tmp paths."}
+{"at": 242, "kind": "frame", "frame": {"type": "system", "subtype": "hook_started", "hook_id": "e8d2b9c8-d0d0-442f-9b86-580619257967", "hook_name": "SessionStart:startup", "hook_event": "SessionStart", "uuid": "fedf8819-07f0-41f5-bc48-24a71fa9940d", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 254, "kind": "frame", "frame": {"type": "system", "subtype": "hook_response", "hook_id": "e8d2b9c8-d0d0-442f-9b86-580619257967", "hook_name": "SessionStart:startup", "hook_event": "SessionStart", "output": "\n", "stdout": "\n", "stderr": "", "exit_code": 0, "outcome": "success", "uuid": "fed65947-fa85-4c2d-9bd6-1c01159922b4", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 269, "kind": "dispatch", "clientMessageId": "client-A", "sentUuid": "c1a5941b-1bd4-4729-8289-5a25b22ff5b2", "text": "Use the Bash tool to run `sleep 8` two separate times, one call at a time, waiting for each. Then reply exactly: FIRST DONE", "outcome": {"state": "admitted"}}
+{"at": 272, "kind": "frame", "frame": {"type": "system", "subtype": "session_state_changed", "state": "running", "uuid": "c36c2f2e-5c24-426d-819b-ea5f89862dae", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 272, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "c1a5941b-1bd4-4729-8289-5a25b22ff5b2", "state": "queued", "uuid": "65530cf1-9a29-4668-9a9f-91616c315809", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 272, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "c1a5941b-1bd4-4729-8289-5a25b22ff5b2", "state": "started", "uuid": "69d4df37-8379-4fce-bbf7-2a3a6854fbf2", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 287, "kind": "frame", "frame": {"type": "system", "subtype": "init", "cwd": "/tmp/scrubbed-cwd", "session_id": "00000000-0000-4000-8000-00000000c1a0", "tools": ["Task", "AskUserQuestion", "Bash", "CronCreate", "CronDelete", "CronList", "DesignSync", "Edit", "EnterPlanMode", "EnterWorktree", "ExitPlanMode", "ExitWorktree", "ListAgents", "NotebookEdit", "Read", "ReportFindings", "ScheduleWakeup", "SendMessage", "Skill", "TaskCreate", "TaskGet", "TaskList", "TaskStop", "TaskUpdate", "ToolSearch", "WebFetch", "WebSearch", "Workflow", "Write"], "mcp_servers": [], "model": "claude-opus-5-5[1m]", "permissionMode": "default", "slash_commands": ["deep-research", "design", "design-sync", "dataviz", "update-config", "verify", "debug", "code-review", "simplify", "batch", "fewer-permission-prompts", "doctor", "loop", "claude-api", "workflow-authoring", "run", "run-skill-generator", "agents", "auto-mode-setup", "autocompact", "clear", "color", "compact", "config", "output-style", "context", "effort", "fast", "heapdump", "init", "mcp", "model", "__remote-workflow", "workflow-launch-exec", "reload-plugins", "reload-skills", "rename", "security-review", "usage", "insights", "recap", "goal", "design-consent", "design-revoke", "list-agents", "team-onboarding"], "terminal_slash_commands": ["doctor", "color", "reload-plugins"], "apiKeySource": "none", "claude_code_version": "2.1.280", "output_style": "default", "agents": ["claude", "Explore", "general-purpose", "Plan", "statusline-setup"], "skills": ["deep-research", "design", "design-sync", "dataviz", "update-config", "verify", "debug", "code-review", "simplify", "batch", "fewer-permission-prompts", "doctor", "loop", "claude-api", "workflow-authoring", "run", "run-skill-generator"], "plugins": [{"name": "telemetry", "path": "builtin", "source": "telemetry@builtin"}], "capabilities": ["interrupt_receipt_v1", "interrupt_cancel_queued_v1", "msg_lifecycle_v1", "mcp_read_resource_v1", "mcp_tool_ui_meta_v1"], "analytics_disabled": false, "product_feedback_disabled": false, "uuid": "facd6d73-8d9e-4886-a6ab-f0873938128e", "memory_paths": {"auto": "/Users/user/scrubbed"}, "messaging_socket_path": "/tmp/scrubbed.sock", "fast_mode_state": "off", "fast_mode_disabled_reason": "sdk_opt_in_required"}}
+{"at": 289, "kind": "frame", "frame": {"type": "system", "subtype": "status", "status": "requesting", "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "d34f89ba-f2ef-4cbf-99a5-7d4d85c8d02a"}}
+{"at": 1527, "kind": "frame", "frame": {"type": "user", "message": {"role": "user", "content": [{"type": "text", "text": "Use the Bash tool to run `sleep 8` two separate times, one call at a time, waiting for each. Then reply exactly: FIRST DONE"}]}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "c1a5941b-1bd4-4729-8289-5a25b22ff5b2", "timestamp": "2026-09-28T12:50:24.512Z", "isReplay": true}}
+{"at": 1528, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_start", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsCqF1QKvUNMHjZNCWW", "type": "message", "role": "assistant", "content": [], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 16754, "cache_read_input_tokens": 0, "cache_creation": {"ephemeral_5m_input_tokens": 16754, "ephemeral_1h_input_tokens": 0}, "output_tokens": 16, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "ac67ce6c-da49-4c1d-bf6a-70e2474ab35f", "ttft_ms": 1230, "user_message_uuid": "c1a5941b-1bd4-4729-8289-5a25b22ff5b2", "user_message_uuids": ["c1a5941b-1bd4-4729-8289-5a25b22ff5b2"]}}
+{"at": 1528, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_start", "index": 0, "content_block": {"type": "tool_use", "id": "toolu_01GoyahVsaJSkqYZzb3ci9KQ", "name": "Bash", "input": {}, "caller": {"type": "direct"}}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "9e8e16c5-d002-4034-b955-3a8a00523ba4"}}
+{"at": 1528, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": ""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "b21cf048-3dbe-4d71-9bb0-9c139be8fb12"}}
+{"at": 2612, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "{\"comma"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "2aa7968c-7244-47f1-8e0c-e660514037ee"}}
+{"at": 2613, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "nd\": \"s"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "588330dc-afca-4aa7-b90c-73df15fee7c0"}}
+{"at": 2613, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "leep 8\""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "75c0ecc9-4a50-4d6f-9731-3fed7e81d265"}}
+{"at": 2613, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": ", \"desc"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "a773fa58-791c-414f-94f1-a4a04534bdd7"}}
+{"at": 2613, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ription"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "9de26ee7-6320-467a-b226-83ec143378d7"}}
+{"at": 2613, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "\": \"Sle"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "e3871642-e9b2-4e35-890e-d8d3a7a81e1e"}}
+{"at": 2613, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ep 8 se"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "7c1891c7-d7b2-48df-a26e-a7265389c8c7"}}
+{"at": 2613, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "conds\"}"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "9d9be75c-c078-4bda-8a3f-dea3967d5a06"}}
+{"at": 2615, "kind": "frame", "frame": {"type": "assistant", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsCqF1QKvUNMHjZNCWW", "type": "message", "role": "assistant", "content": [{"type": "tool_use", "id": "toolu_01GoyahVsaJSkqYZzb3ci9KQ", "name": "Bash", "input": {"command": "sleep 8", "description": "Sleep 8 seconds"}, "caller": {"type": "direct"}}], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 16754, "cache_read_input_tokens": 0, "cache_creation": {"ephemeral_5m_input_tokens": 16754, "ephemeral_1h_input_tokens": 0}, "output_tokens": 16, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "0788da30-2441-4b32-803e-9ff172725739", "timestamp": "2026-09-28T12:50:26.842Z", "request_id": "req_011CfVsCppDCm7ZivTRsAYEu", "user_message_uuid": "c1a5941b-1bd4-4729-8289-5a25b22ff5b2", "user_message_uuids": ["c1a5941b-1bd4-4729-8289-5a25b22ff5b2"]}}
+{"at": 2619, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_stop", "index": 0}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "40dac8c9-408f-4079-8d63-57e0f3b43ca1"}}
+{"at": 2620, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_delta", "delta": {"stop_reason": "tool_use", "stop_sequence": null, "stop_details": null, "container": null}, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 16754, "cache_read_input_tokens": 0, "output_tokens": 81, "output_tokens_details": {"thinking_tokens": 0}}, "context_management": {"applied_edits": []}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "6d1c0ce1-f7ad-463a-ab3d-f7745bce63f9"}}
+{"at": 2621, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_stop"}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "b79333a8-7abc-4a32-a31f-249b5fea5f10"}}
+{"at": 3640, "kind": "dispatch", "clientMessageId": "client-B", "sentUuid": "7ee6ab25-eafb-4869-85fd-97d058045906", "text": "Also say the word banana at the end of your reply.", "outcome": {"state": "admitted"}}
+{"at": 3640, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "7ee6ab25-eafb-4869-85fd-97d058045906", "state": "queued", "uuid": "6395adb0-b318-4284-a298-7b3d89d6b7d7", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 5732, "kind": "frame", "frame": {"type": "system", "subtype": "task_started", "task_id": "beu0xkswp", "tool_use_id": "toolu_01GoyahVsaJSkqYZzb3ci9KQ", "description": "Sleep 8 seconds", "is_backgrounded": false, "task_type": "local_bash", "uuid": "a35b1b34-5810-47dd-bc2c-a38d19077a74", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 10740, "kind": "frame", "frame": {"type": "system", "subtype": "task_notification", "task_id": "beu0xkswp", "tool_use_id": "toolu_01GoyahVsaJSkqYZzb3ci9KQ", "status": "completed", "output_file": "", "summary": "Sleep 8 seconds", "uuid": "3f757c35-2f6c-4b21-bdf4-f8b523809abb", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 10743, "kind": "frame", "frame": {"type": "user", "message": {"role": "user", "content": [{"tool_use_id": "toolu_01GoyahVsaJSkqYZzb3ci9KQ", "type": "tool_result", "content": "(Bash completed with no output)", "is_error": false}]}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "abbb0dbf-e102-4c66-ba3c-7808d634f675", "timestamp": "2026-09-28T12:50:34.971Z", "tool_use_result": {"stdout": "", "stderr": "", "interrupted": false, "isImage": false, "noOutputExpected": false}}}
+{"at": 10744, "kind": "frame", "frame": {"type": "user", "message": {"role": "user", "content": [{"type": "text", "text": "Also say the word banana at the end of your reply."}]}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "7ee6ab25-eafb-4869-85fd-97d058045906", "timestamp": "2026-09-28T12:50:27.869Z", "isReplay": true}}
+{"at": 10745, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "7ee6ab25-eafb-4869-85fd-97d058045906", "state": "started", "uuid": "30f94896-494d-4002-a1ce-680620e03d54", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 10745, "kind": "frame", "frame": {"type": "system", "subtype": "status", "status": "requesting", "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "bf42e496-1f7f-4095-8d94-19390bd59e50"}}
+{"at": 11584, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_start", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsDaaVReUJ6r3tdEQhr", "type": "message", "role": "assistant", "content": [], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 216, "cache_read_input_tokens": 16754, "cache_creation": {"ephemeral_5m_input_tokens": 216, "ephemeral_1h_input_tokens": 0}, "output_tokens": 16, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "79159e21-d876-467f-abac-86bfe7bf2457", "ttft_ms": 836}}
+{"at": 11584, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_start", "index": 0, "content_block": {"type": "tool_use", "id": "toolu_01MxJ1cYsSb1chARZ735hbRk", "name": "Bash", "input": {}, "caller": {"type": "direct"}}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "469a075b-ff35-42c8-b20e-fe4fd3ccf250"}}
+{"at": 11585, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": ""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "1a0aeaf4-6b9e-441e-86ac-eac3c32204c4"}}
+{"at": 12071, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "{\"comma"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "6bb65599-1e9a-40d6-a769-e2b119fee09a"}}
+{"at": 12072, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "nd\": \"s"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "04387767-2ce4-42ec-b869-11406432effc"}}
+{"at": 12072, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "leep 8\""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "ccc9d7c3-19a3-4691-a104-ae6b9c1b4dfa"}}
+{"at": 12072, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": ", \"desc"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "90f5078e-ff14-45a6-9377-257c4545bb5f"}}
+{"at": 12072, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ription"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "8f04f554-0875-450a-bc0b-89cb339c864b"}}
+{"at": 12072, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "\": \"Sle"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "6610a44a-019f-4136-a214-e0fc8e06d67f"}}
+{"at": 12073, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ep 8 se"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "5caedf82-9c9e-4e13-ac26-d869ce84e863"}}
+{"at": 12073, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "conds\"}"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "8151a90d-7bae-4805-b709-124001edee1d"}}
+{"at": 12073, "kind": "frame", "frame": {"type": "assistant", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsDaaVReUJ6r3tdEQhr", "type": "message", "role": "assistant", "content": [{"type": "tool_use", "id": "toolu_01MxJ1cYsSb1chARZ735hbRk", "name": "Bash", "input": {"command": "sleep 8", "description": "Sleep 8 seconds"}, "caller": {"type": "direct"}}], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 216, "cache_read_input_tokens": 16754, "cache_creation": {"ephemeral_5m_input_tokens": 216, "ephemeral_1h_input_tokens": 0}, "output_tokens": 16, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "6aaa7086-2892-4c73-a6b6-caef6cf1a2f5", "timestamp": "2026-09-28T12:50:36.299Z", "request_id": "req_011CfVsDa8gykAqKH3jsZE4P"}}
+{"at": 12074, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_stop", "index": 0}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "3a4aa6b1-647e-4228-94c5-decf6d567a2f"}}
+{"at": 12074, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_delta", "delta": {"stop_reason": "tool_use", "stop_sequence": null, "stop_details": null, "container": null}, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 216, "cache_read_input_tokens": 16754, "output_tokens": 81, "output_tokens_details": {"thinking_tokens": 0}}, "context_management": {"applied_edits": []}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "a09a8560-21b5-410c-9337-1abfb30caff1"}}
+{"at": 12074, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_stop"}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "90522211-133a-4a50-8ae9-21bdef5590d1"}}
+{"at": 15093, "kind": "frame", "frame": {"type": "system", "subtype": "task_started", "task_id": "btowzyjp1", "tool_use_id": "toolu_01MxJ1cYsSb1chARZ735hbRk", "description": "Sleep 8 seconds", "is_backgrounded": false, "task_type": "local_bash", "uuid": "c5aa424b-840a-43a2-9586-94feff2f1b97", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 20107, "kind": "frame", "frame": {"type": "system", "subtype": "task_notification", "task_id": "btowzyjp1", "tool_use_id": "toolu_01MxJ1cYsSb1chARZ735hbRk", "status": "completed", "output_file": "", "summary": "Sleep 8 seconds", "uuid": "9ad2b377-9339-4fe9-a2aa-ee9acdb41d08", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 20109, "kind": "frame", "frame": {"type": "user", "message": {"role": "user", "content": [{"tool_use_id": "toolu_01MxJ1cYsSb1chARZ735hbRk", "type": "tool_result", "content": "(Bash completed with no output)", "is_error": false}]}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "e3b1fa1e-6a3d-4156-a1fe-2146aeff2b1e", "timestamp": "2026-09-28T12:50:44.337Z", "tool_use_result": {"stdout": "", "stderr": "", "interrupted": false, "isImage": false, "noOutputExpected": false}}}
+{"at": 20110, "kind": "frame", "frame": {"type": "system", "subtype": "status", "status": "requesting", "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "990bcabe-2776-4b87-9ba9-788d3fff81cf"}}
+{"at": 21105, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_start", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsEGxMrQeN7Y4miT6gp", "type": "message", "role": "assistant", "content": [], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 120, "cache_read_input_tokens": 16970, "cache_creation": {"ephemeral_5m_input_tokens": 120, "ephemeral_1h_input_tokens": 0}, "output_tokens": 11, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "2d867ea9-894a-4dfa-a589-7a689402c6b2", "ttft_ms": 992}}
+{"at": 21105, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_start", "index": 0, "content_block": {"type": "text", "text": ""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "ed2beb08-68a1-4159-953c-7a0b85729f4d"}}
+{"at": 21106, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": "FIRST DONE ban"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "581dc001-4ef8-4f1b-a741-0534f316d810"}}
+{"at": 21106, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": "ana"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "99a38535-8448-4953-b98e-f0740fc8e13a"}}
+{"at": 21117, "kind": "frame", "frame": {"type": "assistant", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsEGxMrQeN7Y4miT6gp", "type": "message", "role": "assistant", "content": [{"type": "text", "text": "FIRST DONE banana"}], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 120, "cache_read_input_tokens": 16970, "cache_creation": {"ephemeral_5m_input_tokens": 120, "ephemeral_1h_input_tokens": 0}, "output_tokens": 11, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "64e7945b-f3a9-409b-a58d-923a9c4a1f6a", "timestamp": "2026-09-28T12:50:45.334Z", "request_id": "req_011CfVsEGYJNniXhLXGpV5vr"}}
+{"at": 21117, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_stop", "index": 0}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "68da798f-ddd8-4af5-b012-ce4a10811bda"}}
+{"at": 21117, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_delta", "delta": {"stop_reason": "end_turn", "stop_sequence": null, "stop_details": null, "container": null}, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 120, "cache_read_input_tokens": 16970, "output_tokens": 11, "output_tokens_details": {"thinking_tokens": 0}}, "context_management": {"applied_edits": []}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "29e16ff5-ab3b-4406-843f-049ee48650cd"}}
+{"at": 21117, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_stop"}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "5b7d6bae-6827-48c9-8fab-e43e55949198"}}
+{"at": 21119, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "7ee6ab25-eafb-4869-85fd-97d058045906", "state": "completed", "uuid": "0e958675-6553-46b7-9d98-5b667248666d", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 21120, "kind": "frame", "frame": {"duration_api_ms": 6661, "stop_reason": "end_turn", "session_id": "00000000-0000-4000-8000-00000000c1a0", "total_cost_usd": 0.10095080000000002, "usage": {"input_tokens": 6, "cache_creation_input_tokens": 17090, "cache_read_input_tokens": 33724, "output_tokens": 173, "output_tokens_details": {"thinking_tokens": 0}, "server_tool_use": {"web_search_requests": 0, "web_fetch_requests": 0}, "service_tier": "standard", "cache_creation": {"ephemeral_1h_input_tokens": 0, "ephemeral_5m_input_tokens": 17090}, "inference_geo": "not_available", "iterations": [], "speed": "standard"}, "modelUsage": {"claude-opus-5-5[1m]": {"inputTokens": 1219, "outputTokens": 194, "cacheReadInputTokens": 33724, "cacheCreationInputTokens": 17090, "webSearchRequests": 0, "costUSD": 0.10095080000000002, "contextWindow": 1000000, "maxOutputTokens": 128000, "thinkingTokens": 0, "canonicalModel": "claude-opus-5-5", "provider": "firstParty", "costBasis": "list"}}, "permission_denials": [], "terminal_reason": "completed", "fast_mode_state": "off", "fast_mode_disabled_reason": "sdk_opt_in_required", "subagent_stats": {"spawned": 0, "requested": {"background": 0, "foreground": 0, "unset": 0}, "started_in_background": 0, "max_depth": 0, "spawned_by_subagents": 0, "completed": 0, "failed": 0, "killed": {"parent": 0, "user": 0, "system": 0}, "refused": {"depth_limit": 0, "concurrency_limit": 0, "budget": 0}, "by_type": {}}, "is_error": false, "num_turns": 3, "subtype": "success", "api_error_status": null, "result": "FIRST DONE banana", "ttft_ms": 2340, "type": "result", "duration_ms": 20846, "uuid": "408f97b8-b880-47f8-b778-f94e4e15cd92", "ttft_stream_ms": 1253, "time_to_request_ms": 24, "first_content_frame_ms": 1253, "user_message_uuid": "c1a5941b-1bd4-4729-8289-5a25b22ff5b2", "user_message_uuids": ["c1a5941b-1bd4-4729-8289-5a25b22ff5b2", "7ee6ab25-eafb-4869-85fd-97d058045906"], "request_sent_wall_ms": 1790599824526, "queued_turn_count": 0, "result_index": 0}}
+{"at": 21121, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "c1a5941b-1bd4-4729-8289-5a25b22ff5b2", "state": "completed", "uuid": "3b91d2ee-409f-45f5-a7be-aa7a45fb6ac5", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 21121, "kind": "frame", "frame": {"type": "system", "subtype": "session_state_changed", "state": "idle", "uuid": "4de40f8a-4b6c-4333-b1e6-ff528d249af9", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 24243, "kind": "end", "results": 1}
diff --git a/src/main/claude/__fixtures__/claude-adapter-capture-miss.jsonl b/src/main/claude/__fixtures__/claude-adapter-capture-miss.jsonl
new file mode 100644
index 000000000000..211f6e0eb8dd
--- /dev/null
+++ b/src/main/claude/__fixtures__/claude-adapter-capture-miss.jsonl
@@ -0,0 +1,85 @@
+{"at": 1, "kind": "meta", "scenario": "miss", "providerSessionId": "00000000-0000-4000-8000-00000000c1a0", "note": "Recorded through Orca adapter vs Claude CLI 2.1.280; scrubbed: session id, home/tmp paths."}
+{"at": 228, "kind": "frame", "frame": {"type": "system", "subtype": "hook_started", "hook_id": "06af4bab-bef3-426b-96b7-733316a3b251", "hook_name": "SessionStart:startup", "hook_event": "SessionStart", "uuid": "9eb2ab97-dce5-430e-9db3-e7d9aa0e7f8d", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 239, "kind": "frame", "frame": {"type": "system", "subtype": "hook_response", "hook_id": "06af4bab-bef3-426b-96b7-733316a3b251", "hook_name": "SessionStart:startup", "hook_event": "SessionStart", "output": "\n", "stdout": "\n", "stderr": "", "exit_code": 0, "outcome": "success", "uuid": "e2266c8c-8e91-4893-9806-1286769a12fd", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 255, "kind": "dispatch", "clientMessageId": "client-A", "sentUuid": "712482eb-4c05-4f67-8888-a11843c2729f", "text": "Use the Bash tool to run `sleep 8` two separate times, one call at a time, waiting for each. Then reply exactly: FIRST DONE", "outcome": {"state": "admitted"}}
+{"at": 257, "kind": "frame", "frame": {"type": "system", "subtype": "session_state_changed", "state": "running", "uuid": "a6e277fb-d7fc-418a-88f2-2d893feea0d0", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 257, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "712482eb-4c05-4f67-8888-a11843c2729f", "state": "queued", "uuid": "57d845c0-8945-4528-82a5-8fbe83381714", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 258, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "712482eb-4c05-4f67-8888-a11843c2729f", "state": "started", "uuid": "a2a8821a-7b4a-4332-95da-765eb95c2745", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 273, "kind": "frame", "frame": {"type": "system", "subtype": "init", "cwd": "/tmp/scrubbed-cwd", "session_id": "00000000-0000-4000-8000-00000000c1a0", "tools": ["Task", "AskUserQuestion", "Bash", "CronCreate", "CronDelete", "CronList", "DesignSync", "Edit", "EnterPlanMode", "EnterWorktree", "ExitPlanMode", "ExitWorktree", "ListAgents", "NotebookEdit", "Read", "ReportFindings", "ScheduleWakeup", "SendMessage", "Skill", "TaskCreate", "TaskGet", "TaskList", "TaskStop", "TaskUpdate", "ToolSearch", "WebFetch", "WebSearch", "Workflow", "Write"], "mcp_servers": [], "model": "claude-opus-5-5[1m]", "permissionMode": "default", "slash_commands": ["deep-research", "design", "design-sync", "dataviz", "update-config", "verify", "debug", "code-review", "simplify", "batch", "fewer-permission-prompts", "doctor", "loop", "claude-api", "workflow-authoring", "run", "run-skill-generator", "agents", "auto-mode-setup", "autocompact", "clear", "color", "compact", "config", "output-style", "context", "effort", "fast", "heapdump", "init", "mcp", "model", "__remote-workflow", "workflow-launch-exec", "reload-plugins", "reload-skills", "rename", "security-review", "usage", "insights", "recap", "goal", "design-consent", "design-revoke", "list-agents", "team-onboarding"], "terminal_slash_commands": ["doctor", "color", "reload-plugins"], "apiKeySource": "none", "claude_code_version": "2.1.280", "output_style": "default", "agents": ["claude", "Explore", "general-purpose", "Plan", "statusline-setup"], "skills": ["deep-research", "design", "design-sync", "dataviz", "update-config", "verify", "debug", "code-review", "simplify", "batch", "fewer-permission-prompts", "doctor", "loop", "claude-api", "workflow-authoring", "run", "run-skill-generator"], "plugins": [{"name": "telemetry", "path": "builtin", "source": "telemetry@builtin"}], "capabilities": ["interrupt_receipt_v1", "interrupt_cancel_queued_v1", "msg_lifecycle_v1", "mcp_read_resource_v1", "mcp_tool_ui_meta_v1"], "analytics_disabled": false, "product_feedback_disabled": false, "uuid": "ea0c12f1-7e48-4001-a577-5e4abb2e9c5f", "memory_paths": {"auto": "/Users/user/scrubbed"}, "messaging_socket_path": "/tmp/scrubbed.sock", "fast_mode_state": "off", "fast_mode_disabled_reason": "sdk_opt_in_required"}}
+{"at": 275, "kind": "frame", "frame": {"type": "system", "subtype": "status", "status": "requesting", "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "85ed497a-5e78-4ac6-aa9c-2ebe37063403"}}
+{"at": 1303, "kind": "frame", "frame": {"type": "user", "message": {"role": "user", "content": [{"type": "text", "text": "Use the Bash tool to run `sleep 8` two separate times, one call at a time, waiting for each. Then reply exactly: FIRST DONE"}]}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "712482eb-4c05-4f67-8888-a11843c2729f", "timestamp": "2026-09-28T12:51:16.373Z", "isReplay": true}}
+{"at": 1303, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_start", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsGeUUTEuaYMdT2HtPQ", "type": "message", "role": "assistant", "content": [], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 5244, "cache_read_input_tokens": 11514, "cache_creation": {"ephemeral_5m_input_tokens": 5244, "ephemeral_1h_input_tokens": 0}, "output_tokens": 16, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "61853b4b-5722-4b7b-94d8-15304f575d2c", "ttft_ms": 1022, "user_message_uuid": "712482eb-4c05-4f67-8888-a11843c2729f", "user_message_uuids": ["712482eb-4c05-4f67-8888-a11843c2729f"]}}
+{"at": 1304, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_start", "index": 0, "content_block": {"type": "tool_use", "id": "toolu_016sNyp5R1LwYkaBUj9UKWYs", "name": "Bash", "input": {}, "caller": {"type": "direct"}}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "df0f12a2-35bb-424c-8f28-40e6fcc07960"}}
+{"at": 1304, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": ""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "5bcd51ce-460b-4891-8978-332c44f66114"}}
+{"at": 2559, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "{\"comma"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "9744edc1-59cc-4c22-959a-8bfba7abc2ef"}}
+{"at": 2559, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "nd\": \"s"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "4b7645f6-f050-4271-91f0-544df1ff0931"}}
+{"at": 2559, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "leep 8\""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "11acbd0f-fc8e-4642-8897-8815951dd4ee"}}
+{"at": 2637, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": ", \"desc"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "4d140c8b-47f3-44e4-aade-212f63e2b40a"}}
+{"at": 2637, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ription"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "a51d0b53-c118-4de5-a848-aa4bdf7d86c7"}}
+{"at": 2649, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "\": \"Sle"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "a128c776-0a6a-4923-952f-3633f4b91239"}}
+{"at": 2649, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ep for "}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "ddce72e4-cbcc-45f1-966d-dd873f59d687"}}
+{"at": 2650, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "8 secon"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "44392f6b-e3ac-4caa-8abe-ee1b99ba6783"}}
+{"at": 2650, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ds\"}"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "a5bc170f-84ba-4ac7-b104-b36d95c69049"}}
+{"at": 2652, "kind": "frame", "frame": {"type": "assistant", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsGeUUTEuaYMdT2HtPQ", "type": "message", "role": "assistant", "content": [{"type": "tool_use", "id": "toolu_016sNyp5R1LwYkaBUj9UKWYs", "name": "Bash", "input": {"command": "sleep 8", "description": "Sleep for 8 seconds"}, "caller": {"type": "direct"}}], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 5244, "cache_read_input_tokens": 11514, "cache_creation": {"ephemeral_5m_input_tokens": 5244, "ephemeral_1h_input_tokens": 0}, "output_tokens": 16, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "4a86f704-4cdc-4561-840d-dee6e913ebf9", "timestamp": "2026-09-28T12:51:18.753Z", "request_id": "req_011CfVsGe1gx1SqtHypyjG4P", "user_message_uuid": "712482eb-4c05-4f67-8888-a11843c2729f", "user_message_uuids": ["712482eb-4c05-4f67-8888-a11843c2729f"]}}
+{"at": 2655, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_stop", "index": 0}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "f79e14ed-a3e2-4ebf-88bb-a45ed5ee6a78"}}
+{"at": 2657, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_delta", "delta": {"stop_reason": "tool_use", "stop_sequence": null, "stop_details": null, "container": null}, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 5244, "cache_read_input_tokens": 11514, "output_tokens": 82, "output_tokens_details": {"thinking_tokens": 0}}, "context_management": {"applied_edits": []}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "6b586bec-0544-4cdb-9fc5-fadae3c7d6ed"}}
+{"at": 2657, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_stop"}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "3c602652-b8a2-4b38-b54d-ecb1f99b1201"}}
+{"at": 5768, "kind": "frame", "frame": {"type": "system", "subtype": "task_started", "task_id": "bnnik2zr1", "tool_use_id": "toolu_016sNyp5R1LwYkaBUj9UKWYs", "description": "Sleep for 8 seconds", "is_backgrounded": false, "task_type": "local_bash", "uuid": "5213fad9-0ff9-4f01-b934-7f7155ba396b", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 10782, "kind": "frame", "frame": {"type": "system", "subtype": "task_notification", "task_id": "bnnik2zr1", "tool_use_id": "toolu_016sNyp5R1LwYkaBUj9UKWYs", "status": "completed", "output_file": "", "summary": "Sleep for 8 seconds", "uuid": "f37669e5-c402-43ac-823f-1a7f9005a834", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 10785, "kind": "frame", "frame": {"type": "user", "message": {"role": "user", "content": [{"tool_use_id": "toolu_016sNyp5R1LwYkaBUj9UKWYs", "type": "tool_result", "content": "(Bash completed with no output)", "is_error": false}]}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "12161028-12c4-470e-a82d-1f6f4ee64aba", "timestamp": "2026-09-28T12:51:26.887Z", "tool_use_result": {"stdout": "", "stderr": "", "interrupted": false, "isImage": false, "noOutputExpected": false}}}
+{"at": 10787, "kind": "frame", "frame": {"type": "system", "subtype": "status", "status": "requesting", "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "e0454575-2f1d-47c0-b9f3-4ecadbaaa122"}}
+{"at": 11596, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_start", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsHQJiVw1uJvCEPhMGa", "type": "message", "role": "assistant", "content": [], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 121, "cache_read_input_tokens": 16758, "cache_creation": {"ephemeral_5m_input_tokens": 121, "ephemeral_1h_input_tokens": 0}, "output_tokens": 16, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "834585ab-8f03-423d-ae43-825a12b9f45e", "ttft_ms": 805}}
+{"at": 11597, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_start", "index": 0, "content_block": {"type": "tool_use", "id": "toolu_01BiKvSfSEAwNM1DwshGhsT6", "name": "Bash", "input": {}, "caller": {"type": "direct"}}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "273975d6-06bf-4eff-87aa-dca1a6d39b5c"}}
+{"at": 11597, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": ""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "2c9121cf-a472-476e-9626-05d4577ff349"}}
+{"at": 11950, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "{\"comma"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "c2cb4769-ee86-4eda-9af7-f75a89493101"}}
+{"at": 11950, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "nd\": \"s"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "8e70eae8-653c-40ad-8a12-f37068234009"}}
+{"at": 11950, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "leep 8\""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "0135507b-0b6e-41fe-bd1c-17becb10430f"}}
+{"at": 12026, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": ", \"desc"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "94802121-d71b-4781-856c-f40f78498ebe"}}
+{"at": 12026, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ription"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "ec03999d-3810-405e-b36a-58d8d0f4e4ac"}}
+{"at": 12026, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "\": \"Sle"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "2183a548-e1b7-48c5-a4d8-58ab6ae4acc9"}}
+{"at": 12026, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ep for "}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "d8ffd37e-3d9d-46a4-b6e1-d52cb96a334d"}}
+{"at": 12026, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "8 secon"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "2c51be8c-ef09-42eb-a07b-c9083d3e349c"}}
+{"at": 12026, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": "ds\"}"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "e4957303-3d3f-47b4-aaed-0ec6210e1e81"}}
+{"at": 12027, "kind": "frame", "frame": {"type": "assistant", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsHQJiVw1uJvCEPhMGa", "type": "message", "role": "assistant", "content": [{"type": "tool_use", "id": "toolu_01BiKvSfSEAwNM1DwshGhsT6", "name": "Bash", "input": {"command": "sleep 8", "description": "Sleep for 8 seconds"}, "caller": {"type": "direct"}}], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 121, "cache_read_input_tokens": 16758, "cache_creation": {"ephemeral_5m_input_tokens": 121, "ephemeral_1h_input_tokens": 0}, "output_tokens": 16, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "03e0a7fa-a83c-4688-9504-8b7fa5c9f6ff", "timestamp": "2026-09-28T12:51:28.129Z", "request_id": "req_011CfVsHPsQjwKL4424e8EfN"}}
+{"at": 12028, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_stop", "index": 0}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "56ad793f-dcd0-4f9d-9dcc-49c2054d18c7"}}
+{"at": 12036, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_delta", "delta": {"stop_reason": "tool_use", "stop_sequence": null, "stop_details": null, "container": null}, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 121, "cache_read_input_tokens": 16758, "output_tokens": 82, "output_tokens_details": {"thinking_tokens": 0}}, "context_management": {"applied_edits": []}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "98e98f29-79a1-4db9-9cd4-c4fe810eca7e"}}
+{"at": 12036, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_stop"}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "3629fbc7-6420-45ae-88be-cd9b779e721a"}}
+{"at": 15034, "kind": "frame", "frame": {"type": "system", "subtype": "task_started", "task_id": "buewgpxis", "tool_use_id": "toolu_01BiKvSfSEAwNM1DwshGhsT6", "description": "Sleep for 8 seconds", "is_backgrounded": false, "task_type": "local_bash", "uuid": "fa9ac561-8bf7-4035-9aa8-221e4cd91dfb", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 20045, "kind": "frame", "frame": {"type": "system", "subtype": "task_notification", "task_id": "buewgpxis", "tool_use_id": "toolu_01BiKvSfSEAwNM1DwshGhsT6", "status": "completed", "output_file": "", "summary": "Sleep for 8 seconds", "uuid": "230550ea-a7f7-4171-9080-901cfdd0d571", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 20047, "kind": "frame", "frame": {"type": "user", "message": {"role": "user", "content": [{"tool_use_id": "toolu_01BiKvSfSEAwNM1DwshGhsT6", "type": "tool_result", "content": "(Bash completed with no output)", "is_error": false}]}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "68545b22-4c1b-44df-a0ec-5876d2c19aee", "timestamp": "2026-09-28T12:51:36.149Z", "tool_use_result": {"stdout": "", "stderr": "", "interrupted": false, "isImage": false, "noOutputExpected": false}}}
+{"at": 20048, "kind": "frame", "frame": {"type": "system", "subtype": "status", "status": "requesting", "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "e14bc8d3-a5bf-4d52-b841-9b5632247863"}}
+{"at": 20123, "kind": "dispatch", "clientMessageId": "client-B", "sentUuid": "6f0204a5-a21a-47a4-9517-034cc4467b52", "text": "Also say the word banana at the end of your reply.", "outcome": {"state": "admitted"}}
+{"at": 20124, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "6f0204a5-a21a-47a4-9517-034cc4467b52", "state": "queued", "uuid": "87c94a31-75e5-400a-9551-ca24c36b9be5", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 21070, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_start", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsJ6bNbeN2V5Wbst25o", "type": "message", "role": "assistant", "content": [], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 17000, "cache_read_input_tokens": 0, "cache_creation": {"ephemeral_5m_input_tokens": 17000, "ephemeral_1h_input_tokens": 0}, "output_tokens": 9, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "02c04bc0-68be-4721-a24d-27e7fa4a93db", "ttft_ms": 1019}}
+{"at": 21071, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_start", "index": 0, "content_block": {"type": "text", "text": ""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "c90f97b4-2cd4-482d-af20-cd921f5915ef"}}
+{"at": 21071, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": "FIRST DONE"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "059a395d-c0a0-4a06-b483-240c3aece7ff"}}
+{"at": 21082, "kind": "frame", "frame": {"type": "assistant", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsJ6bNbeN2V5Wbst25o", "type": "message", "role": "assistant", "content": [{"type": "text", "text": "FIRST DONE"}], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 17000, "cache_read_input_tokens": 0, "cache_creation": {"ephemeral_5m_input_tokens": 17000, "ephemeral_1h_input_tokens": 0}, "output_tokens": 9, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "fc532a8b-2d4d-4cb9-92a5-ea1c509a8019", "timestamp": "2026-09-28T12:51:37.173Z", "request_id": "req_011CfVsJ5eaEpxJgCRB1U4zr"}}
+{"at": 21082, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_stop", "index": 0}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "81e56773-385a-4016-a0ec-ce01d277b9d1"}}
+{"at": 21082, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_delta", "delta": {"stop_reason": "end_turn", "stop_sequence": null, "stop_details": null, "container": null}, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 17000, "cache_read_input_tokens": 0, "output_tokens": 9, "output_tokens_details": {"thinking_tokens": 0}}, "context_management": {"applied_edits": []}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "ea179db4-6487-4447-927e-ae75d31097a2"}}
+{"at": 21082, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_stop"}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "6de38f87-568d-4573-960c-a6143bc8ecda"}}
+{"at": 21085, "kind": "frame", "frame": {"duration_api_ms": 6803, "stop_reason": "end_turn", "session_id": "00000000-0000-4000-8000-00000000c1a0", "total_cost_usd": 0.1262354, "usage": {"input_tokens": 6, "cache_creation_input_tokens": 22365, "cache_read_input_tokens": 28272, "output_tokens": 173, "output_tokens_details": {"thinking_tokens": 0}, "server_tool_use": {"web_search_requests": 0, "web_fetch_requests": 0}, "service_tier": "standard", "cache_creation": {"ephemeral_1h_input_tokens": 0, "ephemeral_5m_input_tokens": 22365}, "inference_geo": "not_available", "iterations": [], "speed": "standard"}, "modelUsage": {"claude-opus-5-5[1m]": {"inputTokens": 1219, "outputTokens": 194, "cacheReadInputTokens": 28272, "cacheCreationInputTokens": 22365, "webSearchRequests": 0, "costUSD": 0.1262354, "contextWindow": 1000000, "maxOutputTokens": 128000, "thinkingTokens": 0, "canonicalModel": "claude-opus-5-5", "provider": "firstParty", "costBasis": "list"}}, "permission_denials": [], "terminal_reason": "completed", "fast_mode_state": "off", "fast_mode_disabled_reason": "sdk_opt_in_required", "subagent_stats": {"spawned": 0, "requested": {"background": 0, "foreground": 0, "unset": 0}, "started_in_background": 0, "max_depth": 0, "spawned_by_subagents": 0, "completed": 0, "failed": 0, "killed": {"parent": 0, "user": 0, "system": 0}, "refused": {"depth_limit": 0, "concurrency_limit": 0, "budget": 0}, "by_type": {}}, "is_error": false, "num_turns": 3, "subtype": "success", "api_error_status": null, "result": "FIRST DONE", "ttft_ms": 2391, "type": "result", "duration_ms": 20825, "uuid": "b82a7983-d7ea-496d-9cb7-735f1ffb3cda", "ttft_stream_ms": 1043, "time_to_request_ms": 22, "first_content_frame_ms": 1044, "user_message_uuid": "712482eb-4c05-4f67-8888-a11843c2729f", "user_message_uuids": ["712482eb-4c05-4f67-8888-a11843c2729f"], "request_sent_wall_ms": 1790599876383, "queued_turn_count": 0, "result_index": 0}}
+{"at": 21085, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "712482eb-4c05-4f67-8888-a11843c2729f", "state": "completed", "uuid": "acb703de-6b64-4496-b552-74ddb042d768", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 21085, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "6f0204a5-a21a-47a4-9517-034cc4467b52", "state": "started", "uuid": "77edaf35-52e5-42f1-a84a-f86dc68c96a4", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 21088, "kind": "frame", "frame": {"type": "system", "subtype": "init", "cwd": "/tmp/scrubbed-cwd", "session_id": "00000000-0000-4000-8000-00000000c1a0", "tools": ["Task", "AskUserQuestion", "Bash", "CronCreate", "CronDelete", "CronList", "DesignSync", "Edit", "EnterPlanMode", "EnterWorktree", "ExitPlanMode", "ExitWorktree", "ListAgents", "NotebookEdit", "Read", "ReportFindings", "ScheduleWakeup", "SendMessage", "Skill", "TaskCreate", "TaskGet", "TaskList", "TaskStop", "TaskUpdate", "ToolSearch", "WebFetch", "WebSearch", "Workflow", "Write"], "mcp_servers": [], "model": "claude-opus-5-5[1m]", "permissionMode": "default", "slash_commands": ["deep-research", "design", "design-sync", "dataviz", "update-config", "verify", "debug", "code-review", "simplify", "batch", "fewer-permission-prompts", "doctor", "loop", "claude-api", "workflow-authoring", "run", "run-skill-generator", "agents", "auto-mode-setup", "autocompact", "clear", "color", "compact", "config", "output-style", "context", "effort", "fast", "heapdump", "init", "mcp", "model", "__remote-workflow", "workflow-launch-exec", "reload-plugins", "reload-skills", "rename", "security-review", "usage", "insights", "recap", "goal", "design-consent", "design-revoke", "list-agents", "team-onboarding"], "terminal_slash_commands": ["doctor", "color", "reload-plugins"], "apiKeySource": "none", "claude_code_version": "2.1.280", "output_style": "default", "agents": ["claude", "Explore", "general-purpose", "Plan", "statusline-setup"], "skills": ["deep-research", "design", "design-sync", "dataviz", "update-config", "verify", "debug", "code-review", "simplify", "batch", "fewer-permission-prompts", "doctor", "loop", "claude-api", "workflow-authoring", "run", "run-skill-generator"], "plugins": [{"name": "telemetry", "path": "builtin", "source": "telemetry@builtin"}], "capabilities": ["interrupt_receipt_v1", "interrupt_cancel_queued_v1", "msg_lifecycle_v1", "mcp_read_resource_v1", "mcp_tool_ui_meta_v1"], "analytics_disabled": false, "product_feedback_disabled": false, "uuid": "f6af6108-710e-4208-8c3c-79b2a9fc14e4", "memory_paths": {"auto": "/Users/user/scrubbed"}, "messaging_socket_path": "/tmp/scrubbed.sock", "fast_mode_state": "off", "fast_mode_disabled_reason": "sdk_opt_in_required"}}
+{"at": 21088, "kind": "frame", "frame": {"type": "system", "subtype": "status", "status": "requesting", "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "7ff5bb60-79be-49cb-bd26-950fa9584ffe"}}
+{"at": 22022, "kind": "frame", "frame": {"type": "user", "message": {"role": "user", "content": [{"type": "text", "text": "Also say the word banana at the end of your reply."}]}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "6f0204a5-a21a-47a4-9517-034cc4467b52", "timestamp": "2026-09-28T12:51:37.189Z", "isReplay": true}}
+{"at": 22022, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_start", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsJAVHoszB7NSfdEtk4", "type": "message", "role": "assistant", "content": [], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 51, "cache_read_input_tokens": 17000, "cache_creation": {"ephemeral_5m_input_tokens": 51, "ephemeral_1h_input_tokens": 0}, "output_tokens": 7, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "30e634ea-7725-4e57-bba9-5b6ae1f44c1b", "ttft_ms": 927, "user_message_uuid": "6f0204a5-a21a-47a4-9517-034cc4467b52", "user_message_uuids": ["6f0204a5-a21a-47a4-9517-034cc4467b52"]}}
+{"at": 22023, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_start", "index": 0, "content_block": {"type": "thinking", "thinking": "", "signature": ""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "8c52275c-f862-4c49-a1b5-4cb5dde934c8"}}
+{"at": 22469, "kind": "frame", "frame": {"type": "system", "subtype": "thinking_tokens", "estimated_tokens": 50, "estimated_tokens_delta": 50, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "91410a95-652d-4e88-8661-19ef21e01a22", "user_message_uuid": "6f0204a5-a21a-47a4-9517-034cc4467b52"}}
+{"at": 22469, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "thinking_delta", "thinking": "", "estimated_tokens": 50}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "ea150b67-dad7-4436-84c5-82d73a3ee3ac"}}
+{"at": 23097, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "thinking_delta", "thinking": "", "estimated_tokens": null}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "dcf3a66c-0505-4b70-985f-d5d431de68c5"}}
+{"at": 23097, "kind": "frame", "frame": {"type": "system", "subtype": "thinking_tokens", "estimated_tokens": 192, "estimated_tokens_delta": 142, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "411efdb6-1b14-40d5-b126-6251292c2898", "user_message_uuid": "6f0204a5-a21a-47a4-9517-034cc4467b52"}}
+{"at": 23097, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 0, "delta": {"type": "signature_delta", "signature": "CAQS9wUKEAgSGAI4AUIIdGhpbmtpbmcSDB/yUaKTcw1uKvgE2xoM//KByDA4fixole7KIjDLAtdDHZ4gV5AjYQGHGc1vQ+EwvB7yHUpWkhn/fsoZ0XTaERvUz6ZoVYhDH7TV/3EqlAW89rxYwkeD/V2vxPnz1iDOQvnSOBk08h5h6cd7CUNMyyM5UU/VtJ84BJDllyBTZLw8RCS/tuodap4P8NmO7I6wK6ZQ8d0hTfpyHsr7J4UfnD9RXhy2x5YdTX11OI8sQ7hxj9HkzhEJpJwRSytLRpclM3ATKwIv/ApihNhfYtbKApQSeIOlFArXz17Xm3RYMs3WjRzL8NMPmV0d5sirOCJ1xtAf3vLSi7awlvG45tpmkW3xaEZsVczOBSNhLPdzwEuHQrAZqx+5WE/b5cC9A2jfW3HgOSdmlmp1z0vYhdbvfu+ALKLUFmAz49QY8YINKNXLbZMUxY5IEDHrRUNjQIY2tJvJWi1SMNNaAvRh1dVBwRDdCXRkWt1Yt8U3iQ2g0dZnfeEGCrIETtzGnRZ5nY0ekGcVrU8QQCCiibceC0dSOmbpNOnDGjxpu3PdoBBoxjZB/Ys1I2td+KDsGwWi0KygWOH7xoa11fsLHvoBu+d0RaTCH64uX6s3bLkajeeCpX0nEt0PR0GT69Jst6J4JwiDTDjjK4LF87Sxm4tSnTzymEYXhk2M5EtdkOUmD5yeI4Qf0liMutVlLWISHzDsAj/t1i7dQtr76wHzrq0/1qdf4OJlFH0qLEM98ekpLOsESLLGryp0UIRIrMaJtpk8e/o9+uHgCP2IwxxEFaWb6PUvNvuI00K/C3dxTD9JQQrNZRdadsnj74/TR2qePDAXzb8vhDSm2b8umySGmHCPrTjBdC0O6riijl1pKqdjRS9yzFVInnZ00zUHpmT9ojVT3dKennDIfdN4ShxGTh5be81hF1pfm9GDC7HJGpG+Eth3qS8JTRQhDx43J4DKNA4XQYQ7CHIxOLET/s8e+qGLnlGCJl6K0h4YAQ=="}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "3b70c219-37e8-485d-a00c-48e3680cc14e"}}
+{"at": 23097, "kind": "frame", "frame": {"type": "assistant", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsJAVHoszB7NSfdEtk4", "type": "message", "role": "assistant", "content": [{"type": "thinking", "thinking": "", "signature": "CAQS9wUKEAgSGAI4AUIIdGhpbmtpbmcSDB/yUaKTcw1uKvgE2xoM//KByDA4fixole7KIjDLAtdDHZ4gV5AjYQGHGc1vQ+EwvB7yHUpWkhn/fsoZ0XTaERvUz6ZoVYhDH7TV/3EqlAW89rxYwkeD/V2vxPnz1iDOQvnSOBk08h5h6cd7CUNMyyM5UU/VtJ84BJDllyBTZLw8RCS/tuodap4P8NmO7I6wK6ZQ8d0hTfpyHsr7J4UfnD9RXhy2x5YdTX11OI8sQ7hxj9HkzhEJpJwRSytLRpclM3ATKwIv/ApihNhfYtbKApQSeIOlFArXz17Xm3RYMs3WjRzL8NMPmV0d5sirOCJ1xtAf3vLSi7awlvG45tpmkW3xaEZsVczOBSNhLPdzwEuHQrAZqx+5WE/b5cC9A2jfW3HgOSdmlmp1z0vYhdbvfu+ALKLUFmAz49QY8YINKNXLbZMUxY5IEDHrRUNjQIY2tJvJWi1SMNNaAvRh1dVBwRDdCXRkWt1Yt8U3iQ2g0dZnfeEGCrIETtzGnRZ5nY0ekGcVrU8QQCCiibceC0dSOmbpNOnDGjxpu3PdoBBoxjZB/Ys1I2td+KDsGwWi0KygWOH7xoa11fsLHvoBu+d0RaTCH64uX6s3bLkajeeCpX0nEt0PR0GT69Jst6J4JwiDTDjjK4LF87Sxm4tSnTzymEYXhk2M5EtdkOUmD5yeI4Qf0liMutVlLWISHzDsAj/t1i7dQtr76wHzrq0/1qdf4OJlFH0qLEM98ekpLOsESLLGryp0UIRIrMaJtpk8e/o9+uHgCP2IwxxEFaWb6PUvNvuI00K/C3dxTD9JQQrNZRdadsnj74/TR2qePDAXzb8vhDSm2b8umySGmHCPrTjBdC0O6riijl1pKqdjRS9yzFVInnZ00zUHpmT9ojVT3dKennDIfdN4ShxGTh5be81hF1pfm9GDC7HJGpG+Eth3qS8JTRQhDx43J4DKNA4XQYQ7CHIxOLET/s8e+qGLnlGCJl6K0h4YAQ=="}], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 51, "cache_read_input_tokens": 17000, "cache_creation": {"ephemeral_5m_input_tokens": 51, "ephemeral_1h_input_tokens": 0}, "output_tokens": 7, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "f59a0f60-bc42-4d2f-be93-2d89991bf482", "timestamp": "2026-09-28T12:51:39.200Z", "request_id": "req_011CfVsJA4Uy2C2Rx8uyY7H1", "user_message_uuid": "6f0204a5-a21a-47a4-9517-034cc4467b52", "user_message_uuids": ["6f0204a5-a21a-47a4-9517-034cc4467b52"]}}
+{"at": 23097, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_stop", "index": 0}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "0d8eff25-307b-4247-81e1-9a4575c7e07d"}}
+{"at": 23097, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_start", "index": 1, "content_block": {"type": "text", "text": ""}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "7328034f-41e4-4823-9bde-8df483de1ce5"}}
+{"at": 23098, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 1, "delta": {"type": "text_delta", "text": "FIRST DONE ban"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "e8f3de55-f311-4eac-baab-9db3fe5ec197"}}
+{"at": 23098, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_delta", "index": 1, "delta": {"type": "text_delta", "text": "ana"}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "b293546a-d0c5-4cdd-9884-5b155b845e96"}}
+{"at": 23098, "kind": "frame", "frame": {"type": "assistant", "message": {"model": "claude-opus-5-5", "id": "msg_011CfVsJAVHoszB7NSfdEtk4", "type": "message", "role": "assistant", "content": [{"type": "text", "text": "FIRST DONE banana"}], "container": null, "stop_reason": null, "stop_sequence": null, "stop_details": null, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 51, "cache_read_input_tokens": 17000, "cache_creation": {"ephemeral_5m_input_tokens": 51, "ephemeral_1h_input_tokens": 0}, "output_tokens": 7, "service_tier": "standard", "inference_geo": "not_available"}, "diagnostics": null, "context_management": null}, "parent_tool_use_id": null, "session_id": "00000000-0000-4000-8000-00000000c1a0", "uuid": "31583f02-16b9-418d-89b3-269afb1dc2c0", "timestamp": "2026-09-28T12:51:39.201Z", "request_id": "req_011CfVsJA4Uy2C2Rx8uyY7H1"}}
+{"at": 23098, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "content_block_stop", "index": 1}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "f8047b07-9ca2-436f-a8e2-f05a17f14970"}}
+{"at": 23105, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_delta", "delta": {"stop_reason": "end_turn", "stop_sequence": null, "stop_details": null, "container": null}, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 51, "cache_read_input_tokens": 17000, "output_tokens": 65, "output_tokens_details": {"thinking_tokens": 54}}, "context_management": {"applied_edits": []}}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "372ebe0e-8f36-4567-8563-4aff3e059a3f"}}
+{"at": 23105, "kind": "frame", "frame": {"type": "stream_event", "event": {"type": "message_stop"}, "session_id": "00000000-0000-4000-8000-00000000c1a0", "parent_tool_use_id": null, "uuid": "b11714ab-fe3d-44fb-991d-c62ae8a60507"}}
+{"at": 23107, "kind": "frame", "frame": {"duration_api_ms": 8819, "stop_reason": "end_turn", "session_id": "00000000-0000-4000-8000-00000000c1a0", "total_cost_usd": 0.1311984, "usage": {"input_tokens": 2, "cache_creation_input_tokens": 51, "cache_read_input_tokens": 17000, "output_tokens": 65, "output_tokens_details": {"thinking_tokens": 54}, "server_tool_use": {"web_search_requests": 0, "web_fetch_requests": 0}, "service_tier": "standard", "cache_creation": {"ephemeral_1h_input_tokens": 0, "ephemeral_5m_input_tokens": 51}, "inference_geo": "not_available", "iterations": [], "speed": "standard"}, "modelUsage": {"claude-opus-5-5[1m]": {"inputTokens": 1221, "outputTokens": 259, "cacheReadInputTokens": 45272, "cacheCreationInputTokens": 22416, "webSearchRequests": 0, "costUSD": 0.1311984, "contextWindow": 1000000, "maxOutputTokens": 128000, "thinkingTokens": 54, "canonicalModel": "claude-opus-5-5", "provider": "firstParty", "costBasis": "list"}}, "permission_denials": [], "terminal_reason": "completed", "fast_mode_state": "off", "fast_mode_disabled_reason": "sdk_opt_in_required", "subagent_stats": {"spawned": 0, "requested": {"background": 0, "foreground": 0, "unset": 0}, "started_in_background": 0, "max_depth": 0, "spawned_by_subagents": 0, "completed": 0, "failed": 0, "killed": {"parent": 0, "user": 0, "system": 0}, "refused": {"depth_limit": 0, "concurrency_limit": 0, "budget": 0}, "by_type": {}}, "is_error": false, "num_turns": 1, "subtype": "success", "api_error_status": null, "result": "FIRST DONE banana", "ttft_ms": 2012, "type": "result", "duration_ms": 2021, "uuid": "572df995-0b87-436c-9966-5f3740c22820", "ttft_stream_ms": 937, "time_to_request_ms": 10, "first_content_frame_ms": 937, "user_message_uuid": "6f0204a5-a21a-47a4-9517-034cc4467b52", "user_message_uuids": ["6f0204a5-a21a-47a4-9517-034cc4467b52"], "request_sent_wall_ms": 1790599897198, "queued_turn_count": 0, "result_index": 1}}
+{"at": 23107, "kind": "frame", "frame": {"type": "command_lifecycle", "command_uuid": "6f0204a5-a21a-47a4-9517-034cc4467b52", "state": "completed", "uuid": "bd6b5dbd-002f-4d5e-8311-7d747745ea00", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 23108, "kind": "frame", "frame": {"type": "system", "subtype": "session_state_changed", "state": "idle", "uuid": "c7642956-8764-404f-8b89-8eac3a91cb1e", "session_id": "00000000-0000-4000-8000-00000000c1a0"}}
+{"at": 26162, "kind": "end", "results": 2}
diff --git a/src/main/claude/__fixtures__/claude-hook-event-enums.json b/src/main/claude/__fixtures__/claude-hook-event-enums.json
new file mode 100644
index 000000000000..f4bedfc31df2
--- /dev/null
+++ b/src/main/claude/__fixtures__/claude-hook-event-enums.json
@@ -0,0 +1,960 @@
+{
+  "source": "Read from cli.js of each @anthropic-ai/claude-code npm release. enums: the hook event enum; hooks keys outside it make 1.0.23-2.1.100 discard the whole user settings file. topLevelSettings: the settings schema's top-level keys, and whether it is strict, i.e. discards the whole file over any other key.",
+  "previousPublishedVersion": {
+    "1.0.23": "1.0.22",
+    "1.0.31": "1.0.30",
+    "1.0.41": "1.0.40",
+    "1.0.53": "1.0.52",
+    "1.0.62": "1.0.61",
+    "1.0.64": "1.0.63",
+    "1.0.85": "1.0.84",
+    "2.0.43": "2.0.42",
+    "2.0.45": "2.0.44",
+    "2.0.56": "2.0.55",
+    "2.1.33": "2.1.32",
+    "2.1.76": "2.1.75",
+    "2.1.78": "2.1.77"
+  },
+  "topLevelSettings": {
+    "1.0.48": {
+      "strict": false,
+      "keys": [
+        "apiKeyHelper",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod"
+      ]
+    },
+    "1.0.49": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod"
+      ]
+    },
+    "1.0.50": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod"
+      ]
+    },
+    "1.0.51": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod"
+      ]
+    },
+    "1.0.52": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod"
+      ]
+    },
+    "1.0.53": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "awsCredentialExport",
+        "awsAuthRefresh",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod",
+        "otelHeadersHelper"
+      ]
+    },
+    "1.0.54": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "awsCredentialExport",
+        "awsAuthRefresh",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod",
+        "otelHeadersHelper"
+      ]
+    },
+    "1.0.58": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "awsCredentialExport",
+        "awsAuthRefresh",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod",
+        "otelHeadersHelper"
+      ]
+    },
+    "1.0.59": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "awsCredentialExport",
+        "awsAuthRefresh",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod",
+        "otelHeadersHelper"
+      ]
+    },
+    "1.0.60": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "awsCredentialExport",
+        "awsAuthRefresh",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod",
+        "otelHeadersHelper"
+      ]
+    },
+    "1.0.61": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "awsCredentialExport",
+        "awsAuthRefresh",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod",
+        "otelHeadersHelper"
+      ]
+    },
+    "1.0.62": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "awsCredentialExport",
+        "awsAuthRefresh",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod",
+        "otelHeadersHelper"
+      ]
+    },
+    "1.0.63": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "awsCredentialExport",
+        "awsAuthRefresh",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "learnMode",
+        "forceLoginMethod",
+        "otelHeadersHelper",
+        "outputMode"
+      ]
+    },
+    "1.0.64": {
+      "strict": true,
+      "keys": [
+        "apiKeyHelper",
+        "awsCredentialExport",
+        "awsAuthRefresh",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "statusLine",
+        "learnMode",
+        "forceLoginMethod",
+        "otelHeadersHelper",
+        "outputMode",
+        "feedbackSurveyState"
+      ]
+    },
+    "1.0.65": {
+      "strict": true,
+      "keys": [
+        "$schema",
+        "apiKeyHelper",
+        "awsCredentialExport",
+        "awsAuthRefresh",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "statusLine",
+        "learnMode",
+        "forceLoginMethod",
+        "otelHeadersHelper",
+        "outputMode",
+        "feedbackSurveyState"
+      ]
+    },
+    "1.0.66": {
+      "strict": true,
+      "keys": [
+        "$schema",
+        "apiKeyHelper",
+        "awsCredentialExport",
+        "awsAuthRefresh",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "statusLine",
+        "learnMode",
+        "forceLoginMethod",
+        "otelHeadersHelper",
+        "outputMode"
+      ]
+    },
+    "1.0.67": {
+      "strict": false,
+      "keys": [
+        "$schema",
+        "apiKeyHelper",
+        "awsCredentialExport",
+        "awsAuthRefresh",
+        "cleanupPeriodDays",
+        "env",
+        "includeCoAuthoredBy",
+        "permissions",
+        "model",
+        "enableAllProjectMcpServers",
+        "enabledMcpjsonServers",
+        "disabledMcpjsonServers",
+        "hooks",
+        "statusLine",
+        "learnMode",
+        "forceLoginMethod",
+        "otelHeadersHelper",
+        "outputMode"
+      ]
+    }
+  },
+  "enums": {
+    "1.0.22": [
+      "PreTask",
+      "PreBash",
+      "PreGlob",
+      "PreGrep",
+      "PreRead",
+      "PreEdit",
+      "PreMultiEdit",
+      "PreWrite",
+      "PreNotebookRead",
+      "PreNotebookEdit",
+      "PreWebFetch",
+      "PreWebSearch"
+    ],
+    "1.0.23": ["PreToolUse", "PostToolUse", "Notification"],
+    "1.0.30": ["PreToolUse", "PostToolUse", "Notification"],
+    "1.0.31": ["PreToolUse", "PostToolUse", "Notification", "Stop"],
+    "1.0.40": ["PreToolUse", "PostToolUse", "Notification", "Stop"],
+    "1.0.41": ["PreToolUse", "PostToolUse", "Notification", "Stop", "SubagentStop"],
+    "1.0.48": ["PreToolUse", "PostToolUse", "Notification", "Stop", "SubagentStop", "PreCompact"],
+    "1.0.49": ["PreToolUse", "PostToolUse", "Notification", "Stop", "SubagentStop", "PreCompact"],
+    "1.0.50": ["PreToolUse", "PostToolUse", "Notification", "Stop", "SubagentStop", "PreCompact"],
+    "1.0.51": ["PreToolUse", "PostToolUse", "Notification", "Stop", "SubagentStop", "PreCompact"],
+    "1.0.52": ["PreToolUse", "PostToolUse", "Notification", "Stop", "SubagentStop", "PreCompact"],
+    "1.0.53": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.54": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.58": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.59": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.60": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.61": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.62": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.63": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.64": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.65": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.66": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.67": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.81": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.84": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "1.0.85": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "2.0.42": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "2.0.43": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "2.0.44": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact"
+    ],
+    "2.0.45": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PermissionRequest"
+    ],
+    "2.0.52": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PermissionRequest"
+    ],
+    "2.0.54": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PermissionRequest"
+    ],
+    "2.0.55": [
+      "PreToolUse",
+      "PostToolUse",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PermissionRequest"
+    ],
+    "2.0.56": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PermissionRequest"
+    ],
+    "2.0.60": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PermissionRequest"
+    ],
+    "2.0.76": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PermissionRequest"
+    ],
+    "2.1.32": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PermissionRequest",
+      "Setup"
+    ],
+    "2.1.33": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PermissionRequest",
+      "Setup",
+      "TeammateIdle",
+      "TaskCompleted"
+    ],
+    "2.1.75": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PermissionRequest",
+      "Setup",
+      "TeammateIdle",
+      "TaskCompleted",
+      "Elicitation",
+      "ElicitationResult",
+      "ConfigChange",
+      "WorktreeCreate",
+      "WorktreeRemove",
+      "InstructionsLoaded"
+    ],
+    "2.1.76": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PostCompact",
+      "PermissionRequest",
+      "Setup",
+      "TeammateIdle",
+      "TaskCompleted",
+      "Elicitation",
+      "ElicitationResult",
+      "ConfigChange",
+      "WorktreeCreate",
+      "WorktreeRemove",
+      "InstructionsLoaded"
+    ],
+    "2.1.77": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PostCompact",
+      "PermissionRequest",
+      "Setup",
+      "TeammateIdle",
+      "TaskCompleted",
+      "Elicitation",
+      "ElicitationResult",
+      "ConfigChange",
+      "WorktreeCreate",
+      "WorktreeRemove",
+      "InstructionsLoaded"
+    ],
+    "2.1.78": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "StopFailure",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PostCompact",
+      "PermissionRequest",
+      "Setup",
+      "TeammateIdle",
+      "TaskCompleted",
+      "Elicitation",
+      "ElicitationResult",
+      "ConfigChange",
+      "WorktreeCreate",
+      "WorktreeRemove",
+      "InstructionsLoaded"
+    ],
+    "2.1.84": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "StopFailure",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PostCompact",
+      "PermissionRequest",
+      "Setup",
+      "TeammateIdle",
+      "TaskCreated",
+      "TaskCompleted",
+      "Elicitation",
+      "ElicitationResult",
+      "ConfigChange",
+      "WorktreeCreate",
+      "WorktreeRemove",
+      "InstructionsLoaded",
+      "CwdChanged",
+      "FileChanged"
+    ],
+    "2.1.90": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "StopFailure",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PostCompact",
+      "PermissionRequest",
+      "PermissionDenied",
+      "Setup",
+      "TeammateIdle",
+      "TaskCreated",
+      "TaskCompleted",
+      "Elicitation",
+      "ElicitationResult",
+      "ConfigChange",
+      "WorktreeCreate",
+      "WorktreeRemove",
+      "InstructionsLoaded",
+      "CwdChanged",
+      "FileChanged"
+    ],
+    "2.1.97": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "StopFailure",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PostCompact",
+      "PermissionRequest",
+      "PermissionDenied",
+      "Setup",
+      "TeammateIdle",
+      "TaskCreated",
+      "TaskCompleted",
+      "Elicitation",
+      "ElicitationResult",
+      "ConfigChange",
+      "WorktreeCreate",
+      "WorktreeRemove",
+      "InstructionsLoaded",
+      "CwdChanged",
+      "FileChanged"
+    ],
+    "2.1.100": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "StopFailure",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PostCompact",
+      "PermissionRequest",
+      "PermissionDenied",
+      "Setup",
+      "TeammateIdle",
+      "TaskCreated",
+      "TaskCompleted",
+      "Elicitation",
+      "ElicitationResult",
+      "ConfigChange",
+      "WorktreeCreate",
+      "WorktreeRemove",
+      "InstructionsLoaded",
+      "CwdChanged",
+      "FileChanged"
+    ],
+    "2.1.101": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "StopFailure",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PostCompact",
+      "PermissionRequest",
+      "PermissionDenied",
+      "Setup",
+      "TeammateIdle",
+      "TaskCreated",
+      "TaskCompleted",
+      "Elicitation",
+      "ElicitationResult",
+      "ConfigChange",
+      "WorktreeCreate",
+      "WorktreeRemove",
+      "InstructionsLoaded",
+      "CwdChanged",
+      "FileChanged"
+    ],
+    "2.1.110": [
+      "PreToolUse",
+      "PostToolUse",
+      "PostToolUseFailure",
+      "Notification",
+      "UserPromptSubmit",
+      "SessionStart",
+      "SessionEnd",
+      "Stop",
+      "StopFailure",
+      "SubagentStart",
+      "SubagentStop",
+      "PreCompact",
+      "PostCompact",
+      "PermissionRequest",
+      "PermissionDenied",
+      "Setup",
+      "TeammateIdle",
+      "TaskCreated",
+      "TaskCompleted",
+      "Elicitation",
+      "ElicitationResult",
+      "ConfigChange",
+      "WorktreeCreate",
+      "WorktreeRemove",
+      "InstructionsLoaded",
+      "CwdChanged",
+      "FileChanged"
+    ]
+  }
+}
diff --git a/src/main/claude/claude-adapter-capture-replay.test.ts b/src/main/claude/claude-adapter-capture-replay.test.ts
new file mode 100644
index 000000000000..8e877a135a83
--- /dev/null
+++ b/src/main/claude/claude-adapter-capture-replay.test.ts
@@ -0,0 +1,233 @@
+// Verbatim replay of FULL captures recorded through Orca's own adapter against
+// the real CLI (`__fixtures__/claude-adapter-capture-*.jsonl`): every frame the
+// adapter saw — hook proof, per-cycle init, command_lifecycle, session-state,
+// stream events — in the recorded order, with the recorded dispatch points.
+// The oracle is the provider's own membership fact: each result's
+// `user_message_uuids` must equal the sends that settled into the turn that
+// result closed. Nothing here asserts design internals, so a rule change or a
+// CLI drift that breaks membership fails these tests whatever the mechanism.
+
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { describe, expect, it, vi, type Mock } from 'vitest'
+import type {
+  AgentJournalItemBody,
+  AgentJournalMessageItem
+} from '../../shared/agent-session-journal-types'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
+import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter'
+import type {
+  ClaudeLateDispatchOutcome,
+  ClaudeStructuredSessionAdapterDeps
+} from './claude-structured-session-state'
+import {
+  fakeClaude,
+  identityFor,
+  PROVIDER_SESSION_ID
+} from './claude-structured-session-test-support'
+
+type CapturedEvent =
+  | { at: number; kind: 'meta'; providerSessionId: string }
+  | { at: number; kind: 'frame'; frame: Record<string, unknown> }
+  | { at: number; kind: 'dispatch'; clientMessageId: string; sentUuid: string; text: string }
+  | { at: number; kind: 'end' }
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function decodeCapturedEvent(value: unknown): CapturedEvent {
+  if (!isRecord(value) || typeof value.at !== 'number' || typeof value.kind !== 'string') {
+    throw new Error('capture line is not a recorded event')
+  }
+  if (value.kind === 'meta' && typeof value.providerSessionId === 'string') {
+    return { at: value.at, kind: 'meta', providerSessionId: value.providerSessionId }
+  }
+  if (value.kind === 'frame' && isRecord(value.frame)) {
+    return { at: value.at, kind: 'frame', frame: value.frame }
+  }
+  if (
+    value.kind === 'dispatch' &&
+    typeof value.clientMessageId === 'string' &&
+    typeof value.sentUuid === 'string' &&
+    typeof value.text === 'string'
+  ) {
+    return {
+      at: value.at,
+      kind: 'dispatch',
+      clientMessageId: value.clientMessageId,
+      sentUuid: value.sentUuid,
+      text: value.text
+    }
+  }
+  if (value.kind === 'end') {
+    return { at: value.at, kind: 'end' }
+  }
+  throw new Error(`capture line has unknown kind: ${String(value.kind)}`)
+}
+
+function loadCapture(name: string): CapturedEvent[] {
+  const path = join(__dirname, '__fixtures__', `claude-adapter-capture-${name}.jsonl`)
+  return readFileSync(path, 'utf8')
+    .trim()
+    .split('\n')
+    .map((line) => decodeCapturedEvent(JSON.parse(line)))
+}
+
+type Replay = {
+  settled: Mock
+  /** Final revision per turn id, in first-open order. */
+  finalTurns: Map<string, NonNullable<ReturnType<typeof readAgentJournalTurn>>>
+  everInterrupted: boolean
+  /** Each result frame's `user_message_uuids`, mapped to live dispatch uuids. */
+  resultMemberships: string[][]
+  /** clientMessageId -> provider uuid its delivery settled under. */
+  settledUuids: Map<string, string>
+  /** Live dispatch uuid -> turn id its send landed in (turn open at settlement). */
+  liveUuidByClient: Map<string, string>
+}
+
+async function replayCapture(name: string): Promise<Replay> {
+  const capture = loadCapture(name)
+  let nowMs = 1_700_000_200_000
+  const finalTurns = new Map<string, NonNullable<ReturnType<typeof readAgentJournalTurn>>>()
+  let everInterrupted = false
+  const sink: StructuredAgentSessionEventSink = {
+    appendItem: (_identity, body: AgentJournalItemBody) => {
+      const turn = readAgentJournalTurn(body)
+      if (turn) {
+        finalTurns.set(turn.turnId, turn)
+        everInterrupted ||= turn.state === 'interrupted'
+      }
+    },
+    appendTombstone: () => {},
+    publish: () => {}
+  }
+  const settled = vi.fn<(input: { sessionId: string } & ClaudeLateDispatchOutcome) => void>()
+  // The capture supplies every frame, startup proof included.
+  const claude = fakeClaude({ initProof: 'none', replayUuid: null })
+  const deps: ClaudeStructuredSessionAdapterDeps = {
+    resolveLaunch: async () => ({
+      pathToClaudeCodeExecutable: 'claude',
+      options: {},
+      cwd: '/work/repo',
+      claudeConfigDir: '/accounts/claude',
+      providerSessionId: PROVIDER_SESSION_ID,
+      resumeLeafUuid: null,
+      resumesTranscript: false,
+      continuesChain: false
+    }),
+    openConnection: claude.openConnection,
+    readProcessStartTime: async () => 1,
+    now: () => nowMs,
+    persistHandle: async () => {},
+    onDispatchSettledLate: settled
+  }
+  const adapter = new ClaudeStructuredSessionAdapter(deps)
+  await adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9', events: sink })
+
+  // Captured uuids -> the uuids the live dispatches mint during this replay.
+  const uuidMap = new Map<string, string>()
+  const capturedSessionId = capture.flatMap((event) =>
+    event.kind === 'meta' ? [event.providerSessionId] : []
+  )[0]
+  const mapFrame = (frame: Record<string, unknown>): Record<string, unknown> => {
+    let text = JSON.stringify(frame)
+    for (const [captured, live] of uuidMap) {
+      text = text.replaceAll(captured, live)
+    }
+    if (capturedSessionId) {
+      text = text.replaceAll(capturedSessionId, PROVIDER_SESSION_ID)
+    }
+    const mapped: unknown = JSON.parse(text)
+    if (!isRecord(mapped)) {
+      throw new Error('mapped frame is not a record')
+    }
+    return mapped
+  }
+  const resultMemberships: string[][] = []
+  let startedAwaited = false
+  for (const event of capture) {
+    nowMs = 1_700_000_200_000 + event.at
+    if (event.kind === 'dispatch') {
+      if (!startedAwaited) {
+        // The proof frames have been delivered by now; startup can settle.
+        await adapter.awaitStarted('session-1')
+        startedAwaited = true
+      }
+      const body: AgentJournalMessageItem = {
+        kind: 'message',
+        role: 'user',
+        blocks: [{ type: 'text', text: event.text }]
+      }
+      const before = new Set(uuidMap.values())
+      const outcome = await adapter.dispatch({
+        sessionId: 'session-1',
+        clientMessageId: event.clientMessageId,
+        body,
+        requestedAt: nowMs,
+        fence: 7
+      })
+      expect(outcome).toEqual({ state: 'admitted' })
+      const sent = claude.connections[0]!.sent.at(-1)?.uuid
+      if (typeof sent !== 'string' || before.has(sent)) {
+        throw new Error('replay could not read the dispatched uuid')
+      }
+      uuidMap.set(event.sentUuid, sent)
+    } else if (event.kind === 'frame') {
+      const frame = mapFrame(event.frame)
+      if (frame.type === 'result') {
+        const members = Array.isArray(frame.user_message_uuids) ? frame.user_message_uuids : []
+        resultMemberships.push(members.filter((m): m is string => typeof m === 'string'))
+      }
+      claude.connections[0]!.handlers.onMessage?.(frame)
+    }
+  }
+  const settledUuids = new Map<string, string>()
+  for (const [outcome] of settled.mock.calls) {
+    if ('providerIdentity' in outcome && outcome.providerIdentity.provider === 'claude') {
+      settledUuids.set(outcome.clientMessageId, outcome.providerIdentity.uuid)
+    }
+  }
+  const liveUuidByClient = new Map<string, string>()
+  for (const event of capture) {
+    if (event.kind === 'dispatch') {
+      liveUuidByClient.set(event.clientMessageId, uuidMap.get(event.sentUuid)!)
+    }
+  }
+  return { settled, finalTurns, everInterrupted, resultMemberships, settledUuids, liveUuidByClient }
+}
+
+describe.each(['fold', 'early-steer', 'miss'])('adapter capture replay: %s', (name) => {
+  it('keeps turn membership equal to each result’s user_message_uuids', async () => {
+    const replay = await replayCapture(name)
+
+    // One turn per result, each opened by that result's first member, and no
+    // turn ever marked interrupted (no capture interrupts one).
+    expect([...replay.finalTurns.keys()]).toEqual(
+      replay.resultMemberships.map((members) => members[0])
+    )
+    expect(replay.everInterrupted).toBe(false)
+    for (const turn of replay.finalTurns.values()) {
+      expect(turn.state).toBe('completed')
+    }
+
+    // Every send settled accepted under a provider uuid named by exactly the
+    // result whose turn it belongs to — the provider's membership fact.
+    const allMembers = new Set(replay.resultMemberships.flat())
+    for (const [clientMessageId, liveUuid] of replay.liveUuidByClient) {
+      expect(replay.settledUuids.get(clientMessageId)).toBe(liveUuid)
+      expect(allMembers.has(liveUuid)).toBe(true)
+    }
+    for (const [index, members] of replay.resultMemberships.entries()) {
+      for (const member of members) {
+        // A member of result i must not have opened any OTHER turn.
+        const owner = [...replay.finalTurns.keys()].indexOf(member)
+        if (owner !== -1) {
+          expect(owner).toBe(index)
+        }
+      }
+    }
+  })
+})
diff --git a/src/main/claude/claude-agent-sdk-control-requests.test.ts b/src/main/claude/claude-agent-sdk-control-requests.test.ts
index f76650d81515..01e822063e2a 100644
--- a/src/main/claude/claude-agent-sdk-control-requests.test.ts
+++ b/src/main/claude/claude-agent-sdk-control-requests.test.ts
@@ -24,3 +24,29 @@ describe('createClaudeControlSurface stopTask', () => {
     expect(stopTask).toHaveBeenCalledTimes(2)
   })
 })
+
+/** A query exposing only the cancel method, as the surface reads nothing else for it. */
+function queryWithCancel(cancelAsyncMessage?: (uuid: string) => Promise<unknown>): Query {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: cancelAsyncMessage reads only this member.
+  return (cancelAsyncMessage ? { cancelAsyncMessage } : {}) as unknown as Query
+}
+
+describe('createClaudeControlSurface cancelAsyncMessage', () => {
+  it('reports a withdrawal only when the CLI answers cancelled: true', async () => {
+    // An older CLI answers with an empty success, which carries no `cancelled`.
+    const cancelAsyncMessage = vi
+      .fn<(uuid: string) => Promise<unknown>>()
+      .mockResolvedValueOnce(true)
+      .mockResolvedValueOnce(false)
+      .mockResolvedValueOnce(undefined)
+    const controls = createClaudeControlSurface(queryWithCancel(cancelAsyncMessage))
+
+    await expect(controls.cancelAsyncMessage('queued-1')).resolves.toBe(true)
+    await expect(controls.cancelAsyncMessage('queued-2')).resolves.toBe(false)
+    await expect(controls.cancelAsyncMessage('queued-3')).resolves.toBe(false)
+    expect(cancelAsyncMessage.mock.calls).toEqual([['queued-1'], ['queued-2'], ['queued-3']])
+    await expect(
+      createClaudeControlSurface(queryWithCancel()).cancelAsyncMessage('queued-4')
+    ).resolves.toBe(false)
+  })
+})
diff --git a/src/main/claude/claude-agent-sdk-control-requests.ts b/src/main/claude/claude-agent-sdk-control-requests.ts
index f165822c9379..d33131471021 100644
--- a/src/main/claude/claude-agent-sdk-control-requests.ts
+++ b/src/main/claude/claude-agent-sdk-control-requests.ts
@@ -94,7 +94,8 @@ export type ClaudeControlSurface = {
   interrupt: (
     options?: ClaudeControlOptions & { cancelQueued?: boolean }
   ) => Promise<SDKControlInterruptResponse | undefined>
-  cancelAsyncMessage: (uuid: string, options?: ClaudeControlOptions) => Promise<void>
+  /** True only when the CLI confirms it withdrew that message before it ran. */
+  cancelAsyncMessage: (uuid: string, options?: ClaudeControlOptions) => Promise<boolean>
   setModel: (model: string | undefined, options?: ClaudeControlOptions) => Promise<void>
   setPermissionMode: (mode: PermissionMode, options?: ClaudeControlOptions) => Promise<void>
   applyFlagSettings: (
@@ -131,9 +132,9 @@ export function createClaudeControlSurface(query: Query): ClaudeControlSurface {
       const cancel = claudeQueryAsyncCanceller(query)
       return cancel
         ? runClaudeControl('cancel_async_message', () => cancel(uuid), options?.timeoutMs).then(
-            () => {}
+            (cancelled) => cancelled === true
           )
-        : Promise.resolve()
+        : Promise.resolve(false)
     },
     setModel: (model, options) =>
       runClaudeControl('set_model', () => query.setModel(model), options?.timeoutMs).then(() => {}),
diff --git a/src/main/claude/claude-agent-sdk-import-boundary.test.ts b/src/main/claude/claude-agent-sdk-import-boundary.test.ts
index f1a38466d41d..421e4a9c7191 100644
--- a/src/main/claude/claude-agent-sdk-import-boundary.test.ts
+++ b/src/main/claude/claude-agent-sdk-import-boundary.test.ts
@@ -1,5 +1,4 @@
-import { existsSync, readFileSync, statSync } from 'node:fs'
-import { dirname, join, relative, resolve } from 'node:path'
+import { resolve } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { spawnProcess } from '../../shared/child-process/run-process'
 
@@ -9,115 +8,14 @@ import { spawnProcess } from '../../shared/child-process/run-process'
  * A user who never leaves the terminal/TUI Claude path must not pay for the SDK:
  * importing it evaluates a package that rewrites
  * `process.env.NoDefaultCurrentDirectoryInExePath`, changing how Windows resolves
- * executables for every later subprocess, and a missing or incompatible install
- * would take normal runtime startup down with it. The ordinary
- * `OrcaRuntimeService` graph reaches the Claude transport module, so only a
- * deferred import keeps that boundary — and only a walk of the real import graph
- * keeps the next static import from quietly restoring it.
+ * executables for every later subprocess. Loading the structured runtime must not
+ * trip that rewrite, which is only true while the SDK stays behind a deferred
+ * import inside the session path.
  */
 const SDK_PACKAGE = '@anthropic-ai/claude-agent-sdk'
 const REPO_ROOT = resolve(__dirname, '..', '..', '..')
 
-/** The Electron main entry: everything the app loads before any session exists. */
-const ROOT = 'src/main/index.ts'
-/** Proof the walk goes all the way into the Claude transport rather than stopping short. */
-const TRANSPORT_MODULE = 'src/main/claude/claude-stream-json-connection.ts'
-
-/**
- * Static, value-carrying specifiers only, read statement by statement so a
- * multi-line `import { ... } from '...'` counts. `import type` is erased before
- * the module ever loads and a bare `import(...)` is the deferral this guards, so
- * neither is an edge the runtime traverses at load time.
- */
-const STATEMENT_START = /^\s*(?:import|export)\b/
-const TYPE_ONLY = /^\s*(?:import|export)\s+type\b/
-const FROM_SPECIFIER = /(?:^|\s)from\s*['"]([^'"]+)['"]/
-const SIDE_EFFECT_IMPORT = /^\s*import\s*['"]([^'"]+)['"]/
-/** An import statement never spans more lines than its longest specifier list. */
-const MAX_STATEMENT_LINES = 60
-
-function readSpecifiers(source: string): string[] {
-  const lines = source.split('\n')
-  const found: string[] = []
-  for (let index = 0; index < lines.length; index += 1) {
-    const first = lines[index] as string
-    if (!STATEMENT_START.test(first) || TYPE_ONLY.test(first)) {
-      continue
-    }
-    const sideEffect = SIDE_EFFECT_IMPORT.exec(first)
-    if (sideEffect) {
-      found.push(sideEffect[1] as string)
-      continue
-    }
-    for (let scan = index; scan < Math.min(lines.length, index + MAX_STATEMENT_LINES); scan += 1) {
-      if (scan > index && STATEMENT_START.test(lines[scan] as string)) {
-        break
-      }
-      const specifier = FROM_SPECIFIER.exec(lines[scan] as string)
-      if (specifier) {
-        found.push(specifier[1] as string)
-        break
-      }
-    }
-  }
-  return found
-}
-
-/** Resolve a relative specifier the way the bundler does; unresolvable means not a module. */
-function resolveRelative(fromFile: string, specifier: string): string | null {
-  const base = join(dirname(fromFile), specifier)
-  for (const candidate of [base, `${base}.ts`, `${base}.tsx`, join(base, 'index.ts')]) {
-    if (existsSync(candidate) && statSync(candidate).isFile()) {
-      return candidate
-    }
-  }
-  return null
-}
-
-function walkStaticImports(rootFile: string): { visited: Set<string>; sdkImporters: string[] } {
-  const visited = new Set<string>()
-  const sdkImporters: string[] = []
-  const queue = [resolve(REPO_ROOT, rootFile)]
-  while (queue.length > 0) {
-    const file = queue.pop() as string
-    const key = relative(REPO_ROOT, file).split('\\').join('/')
-    if (visited.has(key)) {
-      continue
-    }
-    visited.add(key)
-    for (const specifier of readSpecifiers(readFileSync(file, 'utf8'))) {
-      if (specifier === SDK_PACKAGE || specifier.startsWith(`${SDK_PACKAGE}/`)) {
-        sdkImporters.push(key)
-        continue
-      }
-      if (!specifier.startsWith('.')) {
-        continue
-      }
-      const target = resolveRelative(file, specifier)
-      if (target) {
-        queue.push(target)
-      }
-    }
-  }
-  return { visited, sdkImporters }
-}
-
 describe('claude agent SDK import boundary', () => {
-  const walk = walkStaticImports(ROOT)
-
-  it('walks a graph deep enough to reach the Claude transport', () => {
-    // Without this the guard passes for the wrong reason the moment the walk breaks.
-    expect(walk.visited.size).toBeGreaterThan(500)
-    expect([...walk.visited]).toContain(TRANSPORT_MODULE)
-  })
-
-  it('never reaches the SDK through a static import from the main entry', () => {
-    expect(
-      walk.sdkImporters,
-      `${SDK_PACKAGE} must stay behind the structured-Claude boundary. Load it with a deferred import inside the session path instead.`
-    ).toEqual([])
-  })
-
   it('leaves the Windows executable-search environment alone when the runtime loads', async () => {
     // A vitest file runs in its own fork, so this is a clean process; the ambient
     // value is cleared first because the developer's own shell may carry one.
diff --git a/src/main/claude/claude-agent-sdk-process-spawn.test.ts b/src/main/claude/claude-agent-sdk-process-spawn.test.ts
index cd3520cf6d53..1b6c192d433a 100644
--- a/src/main/claude/claude-agent-sdk-process-spawn.test.ts
+++ b/src/main/claude/claude-agent-sdk-process-spawn.test.ts
@@ -4,14 +4,22 @@ import { describe, expect, it, vi } from 'vitest'
 import type { SpawnOptions as SdkSpawnOptions } from '@anthropic-ai/claude-agent-sdk'
 import { resolveSpawn, type spawnProcess } from '../../shared/child-process/run-process'
 import type { ProcessSpec } from '../../shared/child-process/process-spec'
+import type * as ProviderSupervisor from '../codex/codex-app-server-posix-supervisor'
+import { createProviderSpawnSpec } from '../codex/codex-app-server-posix-supervisor'
 import { createClaudeCodeProcessSpawn } from './claude-agent-sdk-process-spawn'
+import { proveClaudeChildExitWithReaper } from './claude-child-exit-proof-ladder'
+
+vi.mock('../codex/codex-app-server-posix-supervisor', async (importOriginal) => {
+  const actual = await importOriginal<typeof ProviderSupervisor>()
+  return { ...actual, createProviderSpawnSpec: vi.fn(actual.createProviderSpawnSpec) }
+})
 
 type FakeChild = EventEmitter & {
   pid: number
   stdin: PassThrough
   stdout: PassThrough
   stderr: PassThrough
-  kill: ReturnType<typeof vi.fn>
+  kill: ReturnType<typeof vi.fn<(signal?: NodeJS.Signals | number) => boolean>>
 }
 
 function fakeSpawn() {
@@ -20,7 +28,7 @@ function fakeSpawn() {
   child.stdin = new PassThrough()
   child.stdout = new PassThrough()
   child.stderr = new PassThrough()
-  child.kill = vi.fn(() => true)
+  child.kill = vi.fn((_signal?: NodeJS.Signals | number) => true)
   const specs: ProcessSpec[] = []
   const spawnImpl = ((spec: ProcessSpec) => {
     specs.push(spec)
@@ -43,7 +51,7 @@ function sdkOptions(overrides: Partial<SdkSpawnOptions> = {}): SdkSpawnOptions {
 describe('claude agent SDK process spawn', () => {
   it('routes the SDK spawn through Orca and retains the pid the lease adjudicates on', () => {
     const process = fakeSpawn()
-    const spawn = createClaudeCodeProcessSpawn(process.spawnImpl)
+    const spawn = createClaudeCodeProcessSpawn(process.spawnImpl, 'win32')
 
     expect(spawn.pid).toBeUndefined()
     expect(spawn.child).toBeNull()
@@ -52,15 +60,103 @@ describe('claude agent SDK process spawn', () => {
     expect(child).toBe(process.child)
     expect(spawn.child).toBe(process.child)
     expect(spawn.pid).toBe(4321)
+    // Windows has no supervisor: Claude itself is the child.
+    expect(spawn.supervised).toBe(false)
     expect(process.specs[0]).toEqual({
       program: '/usr/local/bin/claude',
       args: ['--output-format', 'stream-json'],
       cwd: '/work/repo',
       env: { PATH: '/usr/bin', CLAUDE_CONFIG_DIR: '/accounts/one' },
+      detached: false,
       stdio: ['pipe', 'pipe', 'pipe']
     })
   })
 
+  it.each(['darwin', 'linux'] as const)(
+    'starts Claude under the provider supervisor on %s, which is then the pid the lease records',
+    (platform) => {
+      const process = fakeSpawn()
+      const spawn = createClaudeCodeProcessSpawn(process.spawnImpl, platform)
+      spawn.spawn(sdkOptions())
+
+      const [spec] = process.specs
+      if (!spec) {
+        throw new Error('the spawner never built a spec')
+      }
+      expect(spawn.supervised).toBe(true)
+      expect(spawn.pid).toBe(4321)
+      expect(spec.program).toBe(globalThis.process.execPath)
+      expect(spec.args?.[0]).toBe('-e')
+      expect(spec.detached).toBe(true)
+      expect(spec.cwd).toBe('/work/repo')
+      const supervisorSpec = JSON.parse(
+        Buffer.from(String(spec.env?.ORCA_PROVIDER_SUPERVISOR_SPEC), 'base64').toString()
+      )
+      expect(supervisorSpec).toMatchObject({
+        command: '/usr/local/bin/claude',
+        args: ['--output-format', 'stream-json'],
+        cwd: '/work/repo',
+        ownerPid: globalThis.process.pid
+      })
+      // The supervisor passes its env to Claude minus its own two keys.
+      expect(spec.env).toMatchObject({ PATH: '/usr/bin', CLAUDE_CONFIG_DIR: '/accounts/one' })
+    }
+  )
+
+  it.each([
+    { platform: 'darwin', specSupervised: false },
+    { platform: 'win32', specSupervised: true }
+  ] as const)(
+    'stops Claude by the spawn spec\u2019s supervision on $platform, never the platform',
+    async ({ platform, specSupervised }) => {
+      const actual = await vi.importActual<typeof ProviderSupervisor>(
+        '../codex/codex-app-server-posix-supervisor'
+      )
+      vi.mocked(createProviderSpawnSpec).mockImplementationOnce((...args) => ({
+        ...actual.createProviderSpawnSpec(...args),
+        supervised: specSupervised
+      }))
+      const process = fakeSpawn()
+      const spawn = createClaudeCodeProcessSpawn(process.spawnImpl, platform)
+      spawn.spawn(sdkOptions())
+      expect(spawn.supervised).toBe(specSupervised)
+
+      let exited = false
+      let settle = (): void => {}
+      const exitPromise = new Promise<void>((resolve) => {
+        settle = resolve
+      })
+      // Claude leaves shortly after stdin ends, so the ladder never needs its forced rung.
+      process.child.stdin.on('finish', () =>
+        setTimeout(() => {
+          exited = true
+          settle()
+        }, 10)
+      )
+      const tree = {
+        capture: vi.fn(async () => {}),
+        reap: vi.fn(async () => 'exited' as const),
+        treeVerdict: 'exited' as const
+      }
+      await proveClaudeChildExitWithReaper(
+        {
+          child: process.child,
+          exitPromise,
+          exited: () => exited,
+          tree,
+          supervised: spawn.supervised
+        },
+        () => tree
+      )
+      // SIGTERM to an unsupervised Claude on Windows is TerminateProcess; a skipped one leaves it running.
+      if (specSupervised) {
+        expect(process.child.kill).toHaveBeenCalledWith('SIGTERM')
+      } else {
+        expect(process.child.kill).not.toHaveBeenCalled()
+      }
+    }
+  )
+
   it('keeps the child out of the SDK abort path so exit proof stays Orca-owned', () => {
     const process = fakeSpawn()
     const controller = new AbortController()
@@ -86,7 +182,7 @@ describe('claude agent SDK process spawn', () => {
 
   it('hands a Windows .cmd shim to Orca\u2019s argument encoder', () => {
     const process = fakeSpawn()
-    createClaudeCodeProcessSpawn(process.spawnImpl).spawn(
+    createClaudeCodeProcessSpawn(process.spawnImpl, 'win32').spawn(
       sdkOptions({
         command: 'C:\\Users\\dev\\AppData\\npm\\claude.cmd',
         args: ['--setting-sources=user,project,local', '--session-id', 'a b&c']
diff --git a/src/main/claude/claude-agent-sdk-process-spawn.ts b/src/main/claude/claude-agent-sdk-process-spawn.ts
index a2b1ad7f1585..bbb4b295aade 100644
--- a/src/main/claude/claude-agent-sdk-process-spawn.ts
+++ b/src/main/claude/claude-agent-sdk-process-spawn.ts
@@ -1,5 +1,6 @@
 import type { SpawnOptions as ClaudeAgentSdkSpawnOptions } from '@anthropic-ai/claude-agent-sdk'
 import { spawnProcess } from '../../shared/child-process/run-process'
+import { createProviderSpawnSpec } from '../codex/codex-app-server-posix-supervisor'
 
 /** Derived rather than imported: only src/shared/child-process may name node:child_process. */
 type ClaudeCodeChild = ReturnType<typeof spawnProcess>
@@ -11,8 +12,13 @@ export type ClaudeCodeProcessSpawn = {
   spawn: (options: ClaudeAgentSdkSpawnOptions) => ClaudeCodeChild
   /** The retained child, so Orca keeps its own tree-kill and exit-proof ladder. Null until the SDK spawns. */
   readonly child: ClaudeCodeChild | null
-  /** Ownership proof: the durable lease adjudicates on this pid plus start time plus the spawn token. */
+  /**
+   * Ownership proof: the durable lease adjudicates on this pid plus start time plus the spawn
+   * token. On POSIX it is the provider supervisor's, which outlives Claude by construction.
+   */
   readonly pid: number | undefined
+  /** The spawn spec's verdict, so the close ladder never re-decides it. False until the SDK spawns. */
+  readonly supervised: boolean
   readonly stderrTail: string
 }
 
@@ -31,24 +37,41 @@ function definedEnv(env: Record<string, string | undefined>): Record<string, str
  *
  * Two independent reasons: the SDK's `SpawnedProcess` has no pid, and Orca's
  * spawner is the only path that encodes `.cmd` arguments safely on Windows.
+ *
+ * On POSIX Claude runs under the provider supervisor, so an Orca that dies stops
+ * it instead of leaving it to finish its turn, tools and edits included, with
+ * nobody watching. Windows has no supervisor and spawns Claude directly.
  */
 export function createClaudeCodeProcessSpawn(
-  spawnImpl: typeof spawnProcess = spawnProcess
+  spawnImpl: typeof spawnProcess = spawnProcess,
+  platform: NodeJS.Platform = process.platform
 ): ClaudeCodeProcessSpawn {
   let child: ClaudeCodeChild | null = null
   let stderrTail = ''
+  let supervised = false
   return {
     spawn: (options) => {
+      const spec = createProviderSpawnSpec(
+        {
+          command: options.command,
+          args: [...options.args],
+          ...(options.cwd === undefined ? {} : { cwd: options.cwd })
+        },
+        definedEnv(options.env),
+        platform
+      )
       // Why `options.signal` is dropped: it would let the SDK kill the child outside
       // Orca's ladder, and close() may never report an exit it did not observe.
       const spawned = spawnImpl({
-        program: options.command,
-        args: [...options.args],
-        ...(options.cwd === undefined ? {} : { cwd: options.cwd }),
-        env: definedEnv(options.env),
+        program: spec.program,
+        args: spec.args,
+        cwd: spec.cwd,
+        env: spec.env,
+        detached: spec.detached,
         stdio: ['pipe', 'pipe', 'pipe']
       })
       child = spawned
+      supervised = spec.supervised
       // The SDK drains stderr only for its own local spawn, so a custom spawner must:
       // otherwise the child blocks on a full pipe and exit errors lose their tail.
       spawned.stderr.setEncoding('utf8').on('data', (chunk: string) => {
@@ -62,6 +85,9 @@ export function createClaudeCodeProcessSpawn(
     get pid() {
       return child?.pid
     },
+    get supervised() {
+      return supervised
+    },
     get stderrTail() {
       return stderrTail
     }
diff --git a/src/main/claude/claude-api-retry-idle-sweep.test.ts b/src/main/claude/claude-api-retry-idle-sweep.test.ts
new file mode 100644
index 000000000000..fc5d234ec877
--- /dev/null
+++ b/src/main/claude/claude-api-retry-idle-sweep.test.ts
@@ -0,0 +1,132 @@
+// A Claude that keeps retrying a refused request is working, so the idle sweep must not stop it.
+// Every retry frame's publish is the activity the sweep reads, even though a run writes one row.
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
+import { AgentSessionRecordStore } from '../runtime/agent-session-record-store'
+import type { StructuredAgentSessionAdapter } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
+import { STRUCTURED_AGENT_SESSION_IDLE_MS } from '../native-chat/agent-session-wire/structured-agent-session-idle-sweep'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
+  resetHostTestOperationIds
+} from '../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { createClaudeJournalTranslator } from './claude-structured-journal-translation'
+
+const SWEEP_MS = 5
+const RETRY_GAP_MS = 10 * 60_000
+
+let root: string
+let host: StructuredAgentSessionHost
+let sink: StructuredAgentSessionEventSink | null
+let closeSession: Mock<NonNullable<StructuredAgentSessionAdapter['closeSession']>>
+let clock: number
+
+function apiRetry(attempt: number): Record<string, unknown> {
+  return {
+    type: 'system',
+    subtype: 'api_retry',
+    attempt,
+    max_retries: 10,
+    retry_delay_ms: 600_000,
+    error_status: 429,
+    error: 'rate_limit',
+    session_id: 'provider-1',
+    uuid: `9b2f6a1e-0c4d-4e7a-8f3b-00000000000${attempt}`
+  }
+}
+
+/** Long enough for many sweep ticks, so "still open" means the sweep declined. */
+function waitOutSeveralSweeps(): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, SWEEP_MS * 20))
+}
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-claude-retry-sweep-'))
+  resetHostTestOperationIds()
+  sink = null
+  clock = NOW
+  closeSession = vi.fn(async () => true)
+  const store = await AgentSessionRecordStore.open({
+    directory: join(root, 'store'),
+    hostId: 'local'
+  })
+  const adapter: StructuredAgentSessionAdapter = {
+    acquire: async ({ fence, spawnToken, events }) => {
+      sink = events ?? null
+      return {
+        process: { hostId: 'local', pid: 4242, processStartTimeMs: NOW - 1_000, spawnToken },
+        acquisitionGeneration: 'generation-1',
+        link: {
+          linkId: `link-${fence}`,
+          handle: { provider: 'codex', threadId: THREAD },
+          origin: 'created',
+          mintedAtFence: fence,
+          observedAt: NOW
+        }
+      }
+    },
+    closeSession,
+    releaseAcquisition: async () => true,
+    dispatch: async () => ({ state: 'admitted' }),
+    cancelTurn: async () => ({ cancelled: false }),
+    answerPrompt: async () => undefined,
+    setOption: async () => undefined
+  }
+  host = new StructuredAgentSessionHost({
+    store,
+    adapter,
+    journalRoot: root,
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => 'spawn-1',
+    idleSweep: { intervalMs: SWEEP_MS, idleMs: STRUCTURED_AGENT_SESSION_IDLE_MS },
+    now: () => clock
+  })
+})
+
+afterEach(async () => {
+  await host.flushAllStreamedEvents()
+  await rm(root, { recursive: true, force: true })
+})
+
+describe('a Claude retrying a refused request', () => {
+  it('keeps the conversation open past the idle window while retry frames arrive', async () => {
+    expect(await host.attach({ callerKey: 'client-1' }, hostTestAttachParams(null))).toMatchObject({
+      ok: true
+    })
+    if (!sink) {
+      throw new Error('the host never handed the provider its event sink')
+    }
+    const translator = createClaudeJournalTranslator({ sink, fallbackIdPrefix: '1' })
+
+    // Five frames ten minutes apart: fifty minutes, well past the thirty-minute idle window.
+    for (let attempt = 1; attempt <= 5; attempt += 1) {
+      clock += RETRY_GAP_MS
+      translator.handle({ type: 'message', sessionId: SESSION, message: apiRetry(attempt) })
+      await waitOutSeveralSweeps()
+      expect(closeSession).not.toHaveBeenCalled()
+      expect(host.hasSession(SESSION)).toBe(true)
+    }
+
+    const items = host['sessions'].get(SESSION)?.journal.snapshot().items ?? []
+    const retryRows = items.filter(
+      (item) => item.body.kind === 'status' && item.body.failure?.kind === 'providerRetrying'
+    )
+    expect(retryRows).toHaveLength(1)
+    expect(retryRows[0]?.body).toMatchObject({
+      failure: { detail: { text: expect.stringContaining('"attempt":5') } }
+    })
+
+    // Once the frames stop, the same clock does let the sweep close it.
+    clock += STRUCTURED_AGENT_SESSION_IDLE_MS
+    await vi.waitFor(() => {
+      expect(closeSession).toHaveBeenCalledWith(SESSION)
+      expect(host.hasSession(SESSION)).toBe(false)
+    })
+  })
+})
diff --git a/src/main/claude/claude-api-retry-row.test.ts b/src/main/claude/claude-api-retry-row.test.ts
new file mode 100644
index 000000000000..becadff90d3c
--- /dev/null
+++ b/src/main/claude/claude-api-retry-row.test.ts
@@ -0,0 +1,133 @@
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type {
+  AgentJournalItemBody,
+  AgentSessionJournalIdentity
+} from '../../shared/agent-session-journal-types'
+import { MAX_PROVIDER_DIAGNOSTIC_CHARS } from '../../shared/agent-session-failure'
+import { openAgentSessionJournal } from '../native-chat/agent-session-journal/journal-store-factory'
+import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { unhandledProviderFrameJournalItem } from '../native-chat/agent-session-wire/unhandled-provider-frame'
+import { createClaudeJournalTranslator } from './claude-structured-journal-translation'
+
+const IDENTITY: AgentSessionJournalIdentity = {
+  sessionId: 'session-1',
+  workspaceId: 'workspace-1',
+  hostId: 'host-1',
+  agent: 'claude',
+  providerHandle: { kind: 'claude', sessionId: 'provider-1', leafUuid: 'leaf-1' }
+}
+
+/** A frame as Claude Code sends it while it retries a refused request. */
+function apiRetry(attempt: number, fields: Record<string, unknown> = {}): Record<string, unknown> {
+  return {
+    type: 'system',
+    subtype: 'api_retry',
+    attempt,
+    max_retries: 10,
+    retry_delay_ms: 622,
+    error_status: 429,
+    error: 'rate_limit',
+    session_id: 'provider-1',
+    uuid: `9b2f6a1e-0c4d-4e7a-8f3b-00000000000${attempt}`,
+    ...fields
+  }
+}
+
+let root = ''
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-claude-api-retry-'))
+})
+
+afterEach(async () => {
+  await rm(root, { recursive: true, force: true })
+})
+
+async function statusRowsFor(frames: Record<string, unknown>[]) {
+  const journal = await openAgentSessionJournal({
+    identity: IDENTITY,
+    journalDir: root,
+    now: () => 1_700_000_000_000,
+    mintEpoch: () => 'epoch-1'
+  })
+  const deferred = createDeferredStructuredAgentSessionEventSink()
+  deferred.bind({ journal, fence: 1, publish: vi.fn() })
+  const translator = createClaudeJournalTranslator({ sink: deferred.sink, fallbackIdPrefix: '1' })
+  for (const frame of frames) {
+    translator.handle({ type: 'message', sessionId: 'orca-session', message: frame })
+    await deferred.drained()
+  }
+  return journal
+    .snapshot()
+    .items.flatMap((item): Extract<AgentJournalItemBody, { kind: 'status' }>[] =>
+      item.body.kind === 'status' ? [item.body] : []
+    )
+}
+
+describe('a Claude api_retry frame', () => {
+  it('writes one sentence row per retry run, revised by each attempt, not the frame', async () => {
+    const rows = await statusRowsFor([apiRetry(1), apiRetry(2), apiRetry(3)])
+
+    expect(rows).toHaveLength(1)
+    const [row] = rows
+    expect(row).toMatchObject({
+      text: 'Claude is rate-limited and retrying.',
+      tone: 'warning',
+      failure: {
+        kind: 'providerRetrying',
+        retry: { error: 'rate_limit', status: 429 },
+        detail: { audience: 'log' }
+      }
+    })
+    expect(row).not.toHaveProperty('providerFrame')
+    // The latest attempt's frame, as the log detail.
+    expect(row.failure?.detail?.text).toContain('"attempt":3')
+  })
+
+  it('starts a new row when a later run starts over', async () => {
+    const rows = await statusRowsFor([apiRetry(1), apiRetry(2), apiRetry(1)])
+    expect(rows.map((row) => row.text)).toEqual([
+      'Claude is rate-limited and retrying.',
+      'Claude is rate-limited and retrying.'
+    ])
+  })
+
+  it('does not call a retry a rate limit unless the frame says so', async () => {
+    const rows = await statusRowsFor([
+      apiRetry(1, { error: 'overloaded', error_status: 529 }),
+      apiRetry(1, { error: 'server_error', error_status: 500 }),
+      apiRetry(1, { error: undefined, error_status: undefined }),
+      apiRetry(1, { error: 'something_new', error_status: 429 })
+    ])
+    expect(rows.map((row) => row.text)).toEqual([
+      'Claude hit a temporary problem and is retrying.',
+      'Claude hit a temporary problem and is retrying.',
+      'Claude hit a temporary problem and is retrying.',
+      'Claude is rate-limited and retrying.'
+    ])
+    expect(rows[0]?.failure).toMatchObject({ retry: { error: 'overloaded', status: 529 } })
+  })
+
+  it('caps the frame it keeps as the detail', async () => {
+    const [row] = await statusRowsFor([apiRetry(1, { padding: 'x'.repeat(5_000) })])
+    expect(row?.failure?.detail?.text.length).toBe(MAX_PROVIDER_DIAGNOSTIC_CHARS)
+  })
+
+  it('leaves a frame kind no one catalogued to the provider fallback, as before', async () => {
+    const unknown = {
+      type: 'system',
+      subtype: 'future_notice',
+      error: 'rate_limit',
+      session_id: 'provider-1',
+      uuid: 'future-1'
+    }
+    const rows = await statusRowsFor([unknown])
+    expect(rows).toEqual([
+      unhandledProviderFrameJournalItem('claude', 'message:system:future_notice', unknown)?.body
+    ])
+    expect(rows[0]).toMatchObject({ text: 'rate_limit', tone: 'error' })
+  })
+})
diff --git a/src/main/claude/claude-api-retry-row.ts b/src/main/claude/claude-api-retry-row.ts
new file mode 100644
index 000000000000..195e30461a74
--- /dev/null
+++ b/src/main/claude/claude-api-retry-row.ts
@@ -0,0 +1,39 @@
+// The one row a Claude `system/api_retry` frame writes: a sentence and a `providerRetrying` fact,
+// revised in place for every attempt of the same retry run.
+
+import {
+  agentSessionFailureFact,
+  providerDiagnostic,
+  readProviderRetry
+} from '../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../shared/agent-session-failure-words'
+import type { AgentJournalStatusItem } from '../../shared/agent-session-journal-types'
+import { TUI_AGENT_DISPLAY_NAMES } from '../../shared/tui-agent-display-names'
+
+export const CLAUDE_API_RETRY_FRAME_KIND = 'message:system:api_retry'
+
+export function claudeApiRetryRowBody(message: Record<string, unknown>): AgentJournalStatusItem {
+  const retry = readProviderRetry({ error: message.error, status: message.error_status })
+  const words = agentSessionFailureWords(
+    agentSessionFailureFact('providerRetrying', {
+      detail: providerDiagnostic(JSON.stringify(message), 'log'),
+      ...(retry ? { retry } : {})
+    }),
+    { surface: 'row', agentName: TUI_AGENT_DISPLAY_NAMES.claude }
+  )
+  return { kind: 'status', tone: 'warning', ...words }
+}
+
+/** Numbers retry runs: a frame whose attempt does not follow the last one starts a new run. */
+export function createClaudeApiRetryRuns(): (message: Record<string, unknown>) => number {
+  let run = 0
+  let lastAttempt: number | null = null
+  return (message) => {
+    const attempt = typeof message.attempt === 'number' ? message.attempt : null
+    if (attempt === null || lastAttempt === null || attempt <= lastAttempt) {
+      run += 1
+    }
+    lastAttempt = attempt
+    return run
+  }
+}
diff --git a/src/main/claude/claude-can-use-tool-test-support.ts b/src/main/claude/claude-can-use-tool-test-support.ts
new file mode 100644
index 000000000000..cbf064a0933a
--- /dev/null
+++ b/src/main/claude/claude-can-use-tool-test-support.ts
@@ -0,0 +1,30 @@
+// Invoking the fake connection's canUseTool permission callback, as the CLI would.
+
+import type { ClaudeStreamJsonConnectionHandlers } from './claude-stream-json-connection'
+import type { FakeConnection } from './claude-structured-session-test-support'
+
+export function invokeCanUseTool(
+  connection: FakeConnection,
+  toolName: string,
+  requestId: string,
+  toolUseID: string,
+  extra: {
+    input?: Record<string, unknown>
+    suggestions?: unknown[]
+    signal?: AbortSignal
+  } = {}
+): { promise: Promise<unknown>; settled: () => boolean } {
+  const options = {
+    requestId,
+    toolUseID,
+    signal: extra.signal ?? new AbortController().signal,
+    ...(extra.suggestions ? { suggestions: extra.suggestions } : {})
+  } as unknown as Parameters<NonNullable<ClaudeStreamJsonConnectionHandlers['canUseTool']>>[2]
+  let done = false
+  const promise = Promise.resolve(
+    connection.handlers.canUseTool?.(toolName, extra.input ?? {}, options)
+  ).finally(() => {
+    done = true
+  })
+  return { promise, settled: () => done }
+}
diff --git a/src/main/claude/claude-captured-fold-steer-frames.test-fixture.ts b/src/main/claude/claude-captured-fold-steer-frames.test-fixture.ts
new file mode 100644
index 000000000000..8213b4bfa455
--- /dev/null
+++ b/src/main/claude/claude-captured-fold-steer-frames.test-fixture.ts
@@ -0,0 +1,275 @@
+// Claude CLI 2.1.280 stream-json captures of sends made while a turn is running
+// (`--replay-user-messages`), cut to the frames and fields the dispatch/turn path
+// reads. Ids, paths and prompts are replaced; the frame order and the relative
+// clock (`at`, ms after the first send) are the captured ones.
+//
+// The captured shape under test: a mid-turn send the CLI folds into the running
+// turn is replayed as a root user frame (`isReplay: true`, the client uuid) while
+// that turn is still open, and the turn's ONE result names every folded send in
+// `user_message_uuids`. A send the CLI runs later (miss) is replayed only when its
+// own turn starts, after the first result. A cancelled mid-turn send is never
+// replayed at all.
+
+import {
+  assistant,
+  assistantText,
+  assistantToolUse,
+  initFrame,
+  resultFrame,
+  sessionIdle,
+  taskFrame,
+  toolResult,
+  userReplay,
+  type CapturedFoldFrame,
+  type FoldCaptureIds
+} from './claude-fold-steer-frame-builders.test-fixture'
+
+export type { CapturedFoldFrame, FoldCaptureIds }
+
+export const FIRST_PROMPT = 'Run the sleep command three times, then reply: FIRST DONE'
+export const STEER_PROMPT = 'Also say the word banana at the end of your reply.'
+export const SECOND_STEER_PROMPT = 'And also say the word mango at the very end.'
+
+/** p2-fold-fresh: first send at 12, steer at 3878; one result names both sends. */
+export const FOLD_FRESH_SEND_AT = { first: 12, steer: 3_878 }
+export function foldFreshCapture({ sessionId, first, steer }: FoldCaptureIds): CapturedFoldFrame[] {
+  return [
+    initFrame(222, sessionId),
+    userReplay(2_094, sessionId, first, FIRST_PROMPT),
+    assistantToolUse(2_676, sessionId, 'reply-tool-1', 'toolu_sleep_1', [first]),
+    toolResult(7_890, sessionId, 'tool-result-1', 'toolu_sleep_1'),
+    userReplay(7_892, sessionId, steer, STEER_PROMPT),
+    assistantToolUse(9_725, sessionId, 'reply-tool-2', 'toolu_sleep_2'),
+    toolResult(14_740, sessionId, 'tool-result-2', 'toolu_sleep_2'),
+    assistantText(23_039, sessionId, 'reply-text-1', 'FIRST DONE banana'),
+    resultFrame(23_048, sessionId, 'result-1', {
+      userMessageUuids: [first, steer],
+      durationMs: 22_845,
+      numTurns: 4
+    }),
+    sessionIdle(23_049, sessionId)
+  ]
+}
+
+/** p2-fold-resumed: the same fold on a `--resume` session; steer at 4458. */
+export const FOLD_RESUMED_SEND_AT = { first: 12, steer: 4_458 }
+export function foldResumedCapture({
+  sessionId,
+  first,
+  steer
+}: FoldCaptureIds): CapturedFoldFrame[] {
+  return [
+    initFrame(218, sessionId),
+    userReplay(2_057, sessionId, first, FIRST_PROMPT),
+    assistant(
+      3_229,
+      sessionId,
+      'reply-thinking-1',
+      [{ type: 'thinking', thinking: 'plan' }],
+      [first]
+    ),
+    assistantToolUse(3_258, sessionId, 'reply-tool-1', 'toolu_sleep_1'),
+    toolResult(8_464, sessionId, 'tool-result-1', 'toolu_sleep_1'),
+    userReplay(8_467, sessionId, steer, STEER_PROMPT),
+    assistantToolUse(10_318, sessionId, 'reply-tool-2', 'toolu_sleep_2'),
+    toolResult(15_373, sessionId, 'tool-result-2', 'toolu_sleep_2'),
+    assistantText(23_587, sessionId, 'reply-text-1', 'FIRST DONE banana'),
+    resultFrame(23_628, sessionId, 'result-1', {
+      userMessageUuids: [first, steer],
+      durationMs: 23_367,
+      numTurns: 4
+    }),
+    sessionIdle(23_640, sessionId)
+  ]
+}
+
+/** p2-two-steers: steers at 3630 and 5031, both replayed back to back mid-turn. */
+export const TWO_STEERS_SEND_AT = { first: 31, steer: 3_630, secondSteer: 5_031 }
+export function twoSteersCapture({
+  sessionId,
+  first,
+  steer,
+  secondSteer
+}: Required<FoldCaptureIds>): CapturedFoldFrame[] {
+  return [
+    initFrame(351, sessionId),
+    userReplay(1_169, sessionId, first, FIRST_PROMPT),
+    assistantToolUse(2_412, sessionId, 'reply-tool-1', 'toolu_sleep_1', [first]),
+    toolResult(7_949, sessionId, 'tool-result-1', 'toolu_sleep_1'),
+    userReplay(7_963, sessionId, steer, STEER_PROMPT),
+    userReplay(7_967, sessionId, secondSteer, SECOND_STEER_PROMPT),
+    assistantToolUse(9_806, sessionId, 'reply-tool-2', 'toolu_sleep_2'),
+    toolResult(14_835, sessionId, 'tool-result-2', 'toolu_sleep_2'),
+    assistantText(22_210, sessionId, 'reply-text-1', 'FIRST DONE banana mango'),
+    resultFrame(22_317, sessionId, 'result-1', {
+      userMessageUuids: [first, steer, secondSteer],
+      durationMs: 21_859,
+      numTurns: 4
+    }),
+    sessionIdle(22_341, sessionId)
+  ]
+}
+
+/** p2-miss: the steer lands too late to fold — its replay trails the first
+ *  result, and it runs as its own turn with its own result. */
+export const MISS_SEND_AT = { first: 30, steer: 23_384 }
+export function missCapture({ sessionId, first, steer }: FoldCaptureIds): {
+  beforeSteerSend: CapturedFoldFrame[]
+  afterSteerSend: CapturedFoldFrame[]
+} {
+  return {
+    beforeSteerSend: [
+      initFrame(333, sessionId),
+      userReplay(2_118, sessionId, first, FIRST_PROMPT),
+      assistantToolUse(2_793, sessionId, 'reply-tool-1', 'toolu_sleep_1', [first]),
+      toolResult(8_258, sessionId, 'tool-result-1', 'toolu_sleep_1'),
+      assistantToolUse(11_019, sessionId, 'reply-tool-2', 'toolu_sleep_2'),
+      toolResult(15_961, sessionId, 'tool-result-2', 'toolu_sleep_2'),
+      assistantToolUse(18_362, sessionId, 'reply-tool-3', 'toolu_sleep_3'),
+      toolResult(23_375, sessionId, 'tool-result-3', 'toolu_sleep_3')
+    ],
+    afterSteerSend: [
+      assistantText(25_550, sessionId, 'reply-text-1', 'FIRST DONE'),
+      resultFrame(25_556, sessionId, 'result-1', {
+        userMessageUuids: [first],
+        durationMs: 25_241,
+        numTurns: 4
+      }),
+      initFrame(25_584, sessionId),
+      userReplay(28_703, sessionId, steer, STEER_PROMPT),
+      assistantText(29_239, sessionId, 'reply-text-2', 'banana'),
+      resultFrame(29_275, sessionId, 'result-2', {
+        userMessageUuids: [steer],
+        durationMs: 3_711,
+        numTurns: 1
+      }),
+      sessionIdle(29_306, sessionId)
+    ]
+  }
+}
+
+/** p2-cancel: the steer is cancelled while queued — no replay ever arrives, the
+ *  interrupt injects a synthetic user text with NO `isReplay`, and the error
+ *  result names only the first send. */
+export const CANCEL_SEND_AT = { first: 18, steer: 3_578 }
+export function cancelCapture({ sessionId, first, steer: _steer }: FoldCaptureIds): {
+  beforeSteerSend: CapturedFoldFrame[]
+  afterInterrupt: CapturedFoldFrame[]
+} {
+  return {
+    beforeSteerSend: [
+      initFrame(354, sessionId),
+      userReplay(1_329, sessionId, first, FIRST_PROMPT),
+      assistantToolUse(2_366, sessionId, 'reply-tool-1', 'toolu_sleep_1', [first])
+    ],
+    afterInterrupt: [
+      toolResult(
+        3_889,
+        sessionId,
+        'tool-result-1',
+        'toolu_sleep_1',
+        "The user doesn't want to proceed with this tool use.",
+        true
+      ),
+      {
+        at: 3_900,
+        frame: {
+          type: 'user',
+          session_id: sessionId,
+          parent_tool_use_id: null,
+          uuid: 'interrupt-notice-1',
+          message: {
+            role: 'user',
+            content: [{ type: 'text', text: '[Request interrupted by user for tool use]' }]
+          }
+        }
+      },
+      resultFrame(3_926, sessionId, 'result-1', {
+        userMessageUuids: [first],
+        durationMs: 3_573,
+        numTurns: 3,
+        subtype: 'error_during_execution',
+        isError: true,
+        terminalReason: 'aborted_tools'
+      }),
+      sessionIdle(3_941, sessionId)
+    ]
+  }
+}
+
+/** p3-early-steer: the steer is written BEFORE the first send's replay arrives
+ *  (send at 312, first replay at 1208) and the CLI still folds it — one init,
+ *  one turn, one result naming both sends. */
+export const EARLY_STEER_SEND_AT = { first: 11, steer: 312 }
+export function earlySteerCapture({
+  sessionId,
+  first,
+  steer
+}: FoldCaptureIds): CapturedFoldFrame[] {
+  return [
+    initFrame(205, sessionId),
+    userReplay(1_208, sessionId, first, FIRST_PROMPT),
+    assistantToolUse(2_190, sessionId, 'reply-tool-1', 'toolu_sleep_1', [first]),
+    toolResult(6_316, sessionId, 'tool-result-1', 'toolu_sleep_1'),
+    userReplay(6_318, sessionId, steer, STEER_PROMPT),
+    assistantText(7_336, sessionId, 'reply-text-1', 'FIRST DONE banana'),
+    resultFrame(7_340, sessionId, 'result-1', {
+      userMessageUuids: [first, steer],
+      durationMs: 7_155,
+      numTurns: 2
+    }),
+    sessionIdle(7_341, sessionId)
+  ]
+}
+
+/** p3-background-wake: after the turn's result, the finished background task
+ *  wakes the CLI — a NEW cycle: its own init, output with no user replay, and a
+ *  result that names no send at all (`user_message_uuids` absent). The task's
+ *  completion frames arrive BEFORE the wake's init. */
+export function backgroundWakeCapture({ sessionId, first }: FoldCaptureIds): {
+  firstTurn: CapturedFoldFrame[]
+  wake: CapturedFoldFrame[]
+} {
+  return {
+    firstTurn: [
+      initFrame(252, sessionId),
+      userReplay(1_193, sessionId, first, FIRST_PROMPT),
+      assistantToolUse(2_372, sessionId, 'reply-tool-1', 'toolu_bg_1', [first]),
+      taskFrame(2_530, sessionId, 'task_started', {
+        task_id: 'task_bg_1',
+        tool_use_id: 'toolu_bg_1',
+        description: 'Sleep then print marker',
+        is_backgrounded: true,
+        task_type: 'local_bash'
+      }),
+      toolResult(2_532, sessionId, 'tool-result-1', 'toolu_bg_1'),
+      assistantText(3_403, sessionId, 'reply-text-1', 'STARTED'),
+      resultFrame(3_406, sessionId, 'result-1', {
+        userMessageUuids: [first],
+        durationMs: 3_177,
+        numTurns: 2
+      }),
+      sessionIdle(3_407, sessionId)
+    ],
+    wake: [
+      taskFrame(17_547, sessionId, 'task_updated', {
+        task_id: 'task_bg_1',
+        patch: { status: 'completed' }
+      }),
+      taskFrame(17_547, sessionId, 'task_notification', {
+        task_id: 'task_bg_1',
+        tool_use_id: 'toolu_bg_1',
+        status: 'completed',
+        summary: 'Background command completed (exit code 0)'
+      }),
+      initFrame(17_626, sessionId),
+      assistantText(19_721, sessionId, 'wake-text-1', 'The background command finished.'),
+      resultFrame(19_729, sessionId, 'result-2', {
+        userMessageUuids: [],
+        durationMs: 2_105,
+        numTurns: 1
+      }),
+      sessionIdle(19_730, sessionId)
+    ]
+  }
+}
diff --git a/src/main/claude/claude-child-exit-proof-ladder.test.ts b/src/main/claude/claude-child-exit-proof-ladder.test.ts
new file mode 100644
index 000000000000..2d8da7f629dc
--- /dev/null
+++ b/src/main/claude/claude-child-exit-proof-ladder.test.ts
@@ -0,0 +1,72 @@
+import { describe, expect, it, vi } from 'vitest'
+import { PROVIDER_SUPERVISOR_MAX_STOP_MS } from '../codex/codex-app-server-posix-supervisor'
+import type { ClaudeChildTreeReaper } from './claude-agent-sdk-exit-proof'
+import { proveClaudeChildExitWithReaper } from './claude-child-exit-proof-ladder'
+
+function fakeTree(): ClaudeChildTreeReaper & { reap: ReturnType<typeof vi.fn> } {
+  return {
+    capture: vi.fn(async () => {}),
+    refresh: vi.fn(async () => {}),
+    reap: vi.fn(async () => 'exited' as const),
+    treeVerdict: 'exited'
+  }
+}
+
+/** A root that leaves only once a SIGTERM has had `stopMs` to act, the way a supervisor does. */
+function rootStoppedBySigterm(stopMs: number) {
+  let exited = false
+  let settle = (): void => {}
+  const exitPromise = new Promise<void>((resolve) => {
+    settle = resolve
+  })
+  const kill = vi.fn((signal?: NodeJS.Signals | number) => {
+    if (signal === 'SIGTERM') {
+      setTimeout(() => {
+        exited = true
+        settle()
+      }, stopMs)
+    }
+    return true
+  })
+  const stdin = { end: vi.fn() }
+  return {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The ladder reads only pid, kill and stdin.end from its child.
+    child: { pid: 4321, kill, stdin } as unknown as Parameters<
+      typeof proveClaudeChildExitWithReaper
+    >[0]['child'],
+    kill,
+    stdin,
+    exitPromise,
+    exited: () => exited
+  }
+}
+
+describe('Claude child exit proof ladder', () => {
+  it('stops a supervised child with SIGTERM and waits out the supervisor stop before forcing', async () => {
+    // Slower than the unsupervised 1.5 s grace, still inside the supervisor's own bound.
+    const root = rootStoppedBySigterm(PROVIDER_SUPERVISOR_MAX_STOP_MS - 500)
+    const tree = fakeTree()
+
+    await expect(
+      proveClaudeChildExitWithReaper({ ...root, supervised: true, tree }, () => tree)
+    ).resolves.toBe(true)
+
+    expect(root.stdin.end).toHaveBeenCalled()
+    expect(root.kill).toHaveBeenCalledWith('SIGTERM')
+    // Forcing here would SIGKILL the supervisor mid-stop and orphan Claude in its own group.
+    expect(root.kill).not.toHaveBeenCalledWith('SIGKILL')
+    expect(tree.reap).not.toHaveBeenCalled()
+  }, 10_000)
+
+  it('never signals an unsupervised child for the graceful stop', async () => {
+    const root = rootStoppedBySigterm(0)
+    const tree = fakeTree()
+
+    await proveClaudeChildExitWithReaper({ ...root, tree }, () => tree)
+
+    // On Windows a direct SIGTERM is TerminateProcess: stdin end stays the only graceful rung.
+    expect(root.stdin.end).toHaveBeenCalled()
+    expect(root.kill).not.toHaveBeenCalledWith('SIGTERM')
+    expect(tree.reap).toHaveBeenCalled()
+  }, 10_000)
+})
diff --git a/src/main/claude/claude-child-exit-proof-ladder.ts b/src/main/claude/claude-child-exit-proof-ladder.ts
index 85ed629f1b92..37d4e47508d7 100644
--- a/src/main/claude/claude-child-exit-proof-ladder.ts
+++ b/src/main/claude/claude-child-exit-proof-ladder.ts
@@ -1,8 +1,11 @@
 import type { SpawnedProcess } from '../../shared/child-process/run-process'
 import { waitForProcessExitUntil } from '../codex/codex-process-exit-deadline'
+import { PROVIDER_SUPERVISOR_MAX_STOP_MS } from '../codex/codex-app-server-posix-supervisor'
 import type { ClaudeChildTreeReaper } from './claude-agent-sdk-exit-proof'
 
-const GRACEFUL_EXIT_MS = 1_500
+export const GRACEFUL_EXIT_MS = 1_500
+// A signalled supervisor escalates on its own; forcing it sooner kills it and orphans Claude.
+export const SUPERVISED_GRACEFUL_EXIT_MS = PROVIDER_SUPERVISOR_MAX_STOP_MS + 500
 const FORCED_EXIT_MS = 1_000
 
 export type ClaudeChildExitProofInput = {
@@ -10,6 +13,8 @@ export type ClaudeChildExitProofInput = {
   exitPromise: Promise<void>
   exited: () => boolean
   tree?: ClaudeChildTreeReaper
+  /** The child is the POSIX provider supervisor: SIGTERM stops Claude, which reaps its tools. */
+  supervised?: boolean
 }
 
 export async function proveClaudeChildExitWithReaper(
@@ -17,16 +22,24 @@ export async function proveClaudeChildExitWithReaper(
   createTree: () => ClaudeChildTreeReaper
 ): Promise<boolean> {
   const tree = input.tree ?? createTree()
-  // Arm before stdin closes: only a live root can identify its descendants.
+  // Arm before the stop: only a live root can identify its descendants.
   await tree.capture()
   try {
     input.child.stdin?.end()
   } catch {
     // The reap below still owns the process.
   }
+  // Stdin end alone lets Claude finish its turn, tools and edits included; a close is a stop.
+  // Windows has no supervisor, and a direct SIGTERM there is TerminateProcess.
+  if (input.supervised && !input.exited()) {
+    input.child.kill('SIGTERM')
+  }
   let reaped = false
   if (!input.exited()) {
-    await waitForProcessExitUntil(input.exitPromise, GRACEFUL_EXIT_MS)
+    await waitForProcessExitUntil(
+      input.exitPromise,
+      input.supervised ? SUPERVISED_GRACEFUL_EXIT_MS : GRACEFUL_EXIT_MS
+    )
     if (!input.exited()) {
       reaped = true
       await tree.refresh?.()
diff --git a/src/main/claude/claude-child-root-termination.ts b/src/main/claude/claude-child-root-termination.ts
index bed422532e19..bba299195789 100644
--- a/src/main/claude/claude-child-root-termination.ts
+++ b/src/main/claude/claude-child-root-termination.ts
@@ -19,6 +19,9 @@ type RootTerminationInput = {
  * nothing. A probe here could only let an unreadable process table cost the tree
  * the one fallback that still works once every table read has failed.
  *
+ * On POSIX the root is the provider supervisor, killed only after its own stop had
+ * its whole bound; Claude, in its own group, is reached by the descendant kill.
+ *
  * False means no signal was sent, because the root had already left.
  */
 export function terminateClaudeRoot(input: RootTerminationInput): boolean {
diff --git a/src/main/claude/claude-context-usage-unloaded-turn.test.ts b/src/main/claude/claude-context-usage-unloaded-turn.test.ts
index 83d9248f6489..b562c839efdb 100644
--- a/src/main/claude/claude-context-usage-unloaded-turn.test.ts
+++ b/src/main/claude/claude-context-usage-unloaded-turn.test.ts
@@ -18,10 +18,8 @@ import { createTrackedJournalOpener } from '../native-chat/agent-session-journal
 import { readAgentSessionHistory } from '../native-chat/agent-session-wire/agent-session-history-page'
 import type { StructuredAgentSessionAdapter } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
 import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
-import {
-  readStructuredAgentSessionOptions,
-  type StructuredAgentSessionMutationContext
-} from '../native-chat/agent-session-wire/structured-agent-session-host-mutations'
+import type { StructuredAgentSessionMutationContext } from '../native-chat/agent-session-wire/structured-agent-session-host-mutations'
+import { readStructuredAgentSessionOptions } from '../native-chat/agent-session-wire/structured-agent-session-options-read'
 import {
   assistantFrame,
   initFrame,
@@ -85,6 +83,11 @@ function readOptions(
   journal: AgentSessionJournal,
   adapter: Partial<StructuredAgentSessionAdapter>
 ) {
+  const running = {
+    journal,
+    child: { fence: 1, generation: 'generation-1' },
+    params: { provider: 'claude' }
+  }
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the options read touches only these members.
   const context = {
     deps: {
@@ -95,7 +98,8 @@ function readOptions(
       store: { getRecord: () => undefined }
     },
     serialize: (_sessionId: string, task: () => Promise<unknown>) => task(),
-    requireSession: () => ({ journal, fence: 1 })
+    openConversation: async () => running,
+    conversation: async () => running
   } as unknown as StructuredAgentSessionMutationContext
   return readStructuredAgentSessionOptions(context, SESSION)
 }
diff --git a/src/main/claude/claude-fold-steer-frame-builders.test-fixture.ts b/src/main/claude/claude-fold-steer-frame-builders.test-fixture.ts
new file mode 100644
index 000000000000..efb5781bad81
--- /dev/null
+++ b/src/main/claude/claude-fold-steer-frame-builders.test-fixture.ts
@@ -0,0 +1,184 @@
+// The frame shapes the fold-steer captures are rebuilt from, keeping only the
+// fields the dispatch/turn path reads.
+
+export type CapturedFoldFrame = { at: number; frame: Record<string, unknown> }
+
+export type FoldCaptureIds = {
+  /** The provider session every frame names. */
+  sessionId: string
+  /** Client uuid of the turn-opening send; the CLI adopts it on the replay. */
+  first: string
+  /** Client uuid of the mid-turn send. */
+  steer: string
+  /** Client uuid of the second mid-turn send (two-steers only). */
+  secondSteer?: string
+}
+
+export function userReplay(
+  at: number,
+  sessionId: string,
+  uuid: string,
+  text: string
+): CapturedFoldFrame {
+  return {
+    at,
+    frame: {
+      type: 'user',
+      session_id: sessionId,
+      parent_tool_use_id: null,
+      uuid,
+      isReplay: true,
+      message: { role: 'user', content: [{ type: 'text', text }] }
+    }
+  }
+}
+
+export function assistant(
+  at: number,
+  sessionId: string,
+  uuid: string,
+  content: unknown[],
+  userMessageUuids?: string[]
+): CapturedFoldFrame {
+  return {
+    at,
+    frame: {
+      type: 'assistant',
+      session_id: sessionId,
+      parent_tool_use_id: null,
+      uuid,
+      message: { id: `msg-${uuid}`, role: 'assistant', content },
+      // Only the reply that directly answers a send carries the correlation.
+      ...(userMessageUuids && userMessageUuids.length > 0
+        ? { user_message_uuid: userMessageUuids[0], user_message_uuids: userMessageUuids }
+        : {})
+    }
+  }
+}
+
+export function assistantToolUse(
+  at: number,
+  sessionId: string,
+  uuid: string,
+  toolUseId: string,
+  userMessageUuids?: string[]
+): CapturedFoldFrame {
+  return assistant(
+    at,
+    sessionId,
+    uuid,
+    [{ type: 'tool_use', id: toolUseId, name: 'Bash', input: { command: 'sleep 5' } }],
+    userMessageUuids
+  )
+}
+
+export function assistantText(
+  at: number,
+  sessionId: string,
+  uuid: string,
+  text: string,
+  userMessageUuids?: string[]
+): CapturedFoldFrame {
+  return assistant(at, sessionId, uuid, [{ type: 'text', text }], userMessageUuids)
+}
+
+export function toolResult(
+  at: number,
+  sessionId: string,
+  uuid: string,
+  toolUseId: string,
+  content = '(Bash completed with no output)',
+  isError = false
+): CapturedFoldFrame {
+  return {
+    at,
+    frame: {
+      type: 'user',
+      session_id: sessionId,
+      parent_tool_use_id: null,
+      uuid,
+      message: {
+        role: 'user',
+        content: [{ type: 'tool_result', tool_use_id: toolUseId, content, is_error: isError }]
+      }
+    }
+  }
+}
+
+export function resultFrame(
+  at: number,
+  sessionId: string,
+  uuid: string,
+  fields: {
+    userMessageUuids: string[]
+    durationMs: number
+    numTurns: number
+    subtype?: string
+    isError?: boolean
+    terminalReason?: string
+  }
+): CapturedFoldFrame {
+  return {
+    at,
+    frame: {
+      type: 'result',
+      subtype: fields.subtype ?? 'success',
+      session_id: sessionId,
+      uuid,
+      is_error: fields.isError ?? false,
+      terminal_reason: fields.terminalReason ?? 'completed',
+      duration_ms: fields.durationMs,
+      num_turns: fields.numTurns,
+      result: 'FIRST DONE',
+      ...(fields.userMessageUuids.length > 0
+        ? {
+            user_message_uuid: fields.userMessageUuids[0],
+            user_message_uuids: fields.userMessageUuids
+          }
+        : {})
+    }
+  }
+}
+
+export function sessionIdle(at: number, sessionId: string): CapturedFoldFrame {
+  return {
+    at,
+    frame: {
+      type: 'system',
+      subtype: 'session_state_changed',
+      state: 'idle',
+      session_id: sessionId,
+      uuid: `ssc-idle-${at}`
+    }
+  }
+}
+
+/** Root `system/init`: the CLI starting a request cycle. Emitted at startup and
+ *  again for every later cycle — sequential turn, queued turn, background wake,
+ *  /compact (p3 captures). */
+export function initFrame(at: number, sessionId: string): CapturedFoldFrame {
+  return {
+    at,
+    frame: {
+      type: 'system',
+      subtype: 'init',
+      session_id: sessionId,
+      uuid: `init-${at}`,
+      model: 'claude-sonnet-5',
+      apiKeySource: 'none'
+    }
+  }
+}
+
+/** A root background-task system frame (`task_started`, `task_updated`, ...). */
+export function taskFrame(
+  at: number,
+  sessionId: string,
+  subtype: string,
+  fields: Record<string, unknown>
+): CapturedFoldFrame {
+  return {
+    at,
+    frame: { type: 'system', subtype, session_id: sessionId, uuid: `${subtype}-${at}`, ...fields }
+  }
+}
diff --git a/src/main/claude/claude-fold-steer-receipt.test.ts b/src/main/claude/claude-fold-steer-receipt.test.ts
new file mode 100644
index 000000000000..4726dc55d823
--- /dev/null
+++ b/src/main/claude/claude-fold-steer-receipt.test.ts
@@ -0,0 +1,622 @@
+// A send the CLI folds into the running request cycle: its adopted replay is a
+// delivery receipt, never a new turn boundary. The provider's own cycle state
+// decides — a root init announces each new cycle, and a result's
+// `user_message_uuids` names every send the cycle ran. The measured miss, a
+// lost result followed by a new cycle, and fresh replay uuids all keep the
+// replay-driven opener path. Captured orders
+// from Claude CLI 2.1.280 (`claude-captured-fold-steer-frames.test-fixture.ts`).
+
+import { describe, expect, it, vi, type Mock } from 'vitest'
+import type {
+  AgentJournalItemBody,
+  AgentJournalItemIdentity,
+  AgentJournalMessageItem
+} from '../../shared/agent-session-journal-types'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
+import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter'
+import type {
+  ClaudeStructuredSessionAdapterDeps,
+  ClaudeStructuredSessionEvent
+} from './claude-structured-session-state'
+import type { ClaudeStructuredLaunch } from './claude-structured-launch-resolution'
+import {
+  fakeClaude,
+  identityFor,
+  PROVIDER_SESSION_ID
+} from './claude-structured-session-test-support'
+import {
+  assistantText,
+  initFrame,
+  resultFrame,
+  userReplay,
+  type CapturedFoldFrame
+} from './claude-fold-steer-frame-builders.test-fixture'
+import {
+  backgroundWakeCapture,
+  cancelCapture,
+  CANCEL_SEND_AT,
+  earlySteerCapture,
+  EARLY_STEER_SEND_AT,
+  FIRST_PROMPT,
+  foldFreshCapture,
+  FOLD_FRESH_SEND_AT,
+  foldResumedCapture,
+  FOLD_RESUMED_SEND_AT,
+  missCapture,
+  MISS_SEND_AT,
+  SECOND_STEER_PROMPT,
+  STEER_PROMPT,
+  twoSteersCapture,
+  TWO_STEERS_SEND_AT
+} from './claude-captured-fold-steer-frames.test-fixture'
+
+const T0 = 1_700_000_100_000
+
+type Rig = {
+  adapter: ClaudeStructuredSessionAdapter
+  claude: ReturnType<typeof fakeClaude>
+  events: ClaudeStructuredSessionEvent[]
+  settled: Mock
+  /** Every revision of every turn lifecycle row, in append order. */
+  turns: () => NonNullable<ReturnType<typeof readAgentJournalTurn>>[]
+  deliver: (captured: CapturedFoldFrame) => void
+  /** Dispatches at the captured send offset and returns the client uuid the CLI adopts. */
+  dispatchAt: (at: number, clientMessageId: string, text: string) => Promise<string>
+}
+
+async function riggedAdapter(
+  launch: Partial<ClaudeStructuredLaunch> = {},
+  claudeOptions: Parameters<typeof fakeClaude>[0] = {}
+): Promise<Rig> {
+  let nowMs = T0
+  const appended: { identity: AgentJournalItemIdentity; body: AgentJournalItemBody }[] = []
+  const sink: StructuredAgentSessionEventSink = {
+    appendItem: (identity, body) => appended.push({ identity, body }),
+    appendTombstone: () => {},
+    publish: () => {}
+  }
+  const events: ClaudeStructuredSessionEvent[] = []
+  const settled = vi.fn()
+  const claude = fakeClaude({ replayUuid: null, ...claudeOptions })
+  const deps: ClaudeStructuredSessionAdapterDeps = {
+    resolveLaunch: async () => ({
+      pathToClaudeCodeExecutable: 'claude',
+      options: {},
+      cwd: '/work/repo',
+      claudeConfigDir: '/accounts/claude',
+      providerSessionId: PROVIDER_SESSION_ID,
+      resumeLeafUuid: null,
+      resumesTranscript: false,
+      continuesChain: false,
+      ...launch
+    }),
+    onEvent: (event) => events.push(event),
+    openConnection: claude.openConnection,
+    readProcessStartTime: async () => T0 - 1_000,
+    now: () => nowMs,
+    persistHandle: async () => {},
+    onDispatchSettledLate: settled
+  }
+  const adapter = new ClaudeStructuredSessionAdapter(deps)
+  await adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9', events: sink })
+  await adapter.awaitStarted('session-1')
+  return {
+    adapter,
+    claude,
+    events,
+    settled,
+    turns: () =>
+      appended.flatMap((item) => {
+        const turn = readAgentJournalTurn(item.body)
+        return turn ? [turn] : []
+      }),
+    deliver: (captured) => {
+      nowMs = T0 + captured.at
+      claude.connections[0]!.handlers.onMessage?.(captured.frame)
+    },
+    dispatchAt: async (at, clientMessageId, text) => {
+      nowMs = T0 + at
+      const body: AgentJournalMessageItem = {
+        kind: 'message',
+        role: 'user',
+        blocks: [{ type: 'text', text }]
+      }
+      const outcome = await adapter.dispatch({
+        sessionId: 'session-1',
+        clientMessageId,
+        body,
+        requestedAt: nowMs,
+        fence: 7
+      })
+      expect(outcome).toEqual({ state: 'admitted' })
+      const sentUuid = claude.connections[0]!.sent.at(-1)?.uuid
+      if (typeof sentUuid !== 'string') {
+        throw new Error('the fake connection recorded no sent uuid')
+      }
+      return sentUuid
+    }
+  }
+}
+
+function replayEventFor(events: ClaudeStructuredSessionEvent[], uuid: string) {
+  return events.find(
+    (event) =>
+      event.type === 'message' && event.message.type === 'user' && event.message.uuid === uuid
+  )
+}
+
+describe('Claude fold receipt for a mid-turn send (captured orders)', () => {
+  it('fold-fresh: the folded steer settles as a receipt inside the one turn it was sent during', async () => {
+    const rig = await riggedAdapter()
+    const first = await rig.dispatchAt(FOLD_FRESH_SEND_AT.first, 'client-first', FIRST_PROMPT)
+    const framesFor = (steerUuid: string) =>
+      foldFreshCapture({ sessionId: PROVIDER_SESSION_ID, first, steer: steerUuid })
+    for (const captured of framesFor('pending')) {
+      if (captured.at < FOLD_FRESH_SEND_AT.steer) {
+        rig.deliver(captured)
+      }
+    }
+    const steer = await rig.dispatchAt(FOLD_FRESH_SEND_AT.steer, 'client-steer', STEER_PROMPT)
+    for (const captured of framesFor(steer)) {
+      if (captured.at > FOLD_FRESH_SEND_AT.steer) {
+        rig.deliver(captured)
+      }
+    }
+
+    // ONE turn record for the whole run, never marked interrupted.
+    const turnIds = [...new Set(rig.turns().map((turn) => turn.turnId))]
+    expect(turnIds).toEqual([first])
+    expect(rig.turns().every((turn) => turn.state !== 'interrupted')).toBe(true)
+    // The settled duration is the single turn's, spanning both sends' work.
+    expect(rig.turns().at(-1)).toMatchObject({
+      turnId: first,
+      state: 'completed',
+      outcome: 'success',
+      startedAt: T0 + 2_094,
+      completedAt: T0 + 23_048,
+      durationMs: 22_845
+    })
+    // The steer's replay is a receipt: delivery settles under the steer's own
+    // provider identity, which is what attributes the user item inside the turn.
+    expect(rig.settled).toHaveBeenCalledWith({
+      sessionId: 'session-1',
+      clientMessageId: 'client-steer',
+      providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: steer }
+    })
+    // And it opens no boundary: the replay event carries no startsTurn.
+    expect(replayEventFor(rig.events, steer)).not.toHaveProperty('startsTurn')
+    expect(replayEventFor(rig.events, first)).toMatchObject({ startsTurn: true })
+  })
+
+  it('session-start proof: a hook-frame startup proof with init only at the first cycle still folds', async () => {
+    // Live sessions prove the session from a SessionStart hook frame BEFORE
+    // system/init arrives (measured against the real CLI); nothing about the
+    // fold may depend on fields of the startup proof frame.
+    const rig = await riggedAdapter({}, { initProof: 'session-start' })
+    const first = await rig.dispatchAt(FOLD_FRESH_SEND_AT.first, 'client-first', FIRST_PROMPT)
+    const framesFor = (steerUuid: string) =>
+      foldFreshCapture({ sessionId: PROVIDER_SESSION_ID, first, steer: steerUuid })
+    for (const captured of framesFor('pending')) {
+      if (captured.at < FOLD_FRESH_SEND_AT.steer) {
+        rig.deliver(captured)
+      }
+    }
+    const steer = await rig.dispatchAt(FOLD_FRESH_SEND_AT.steer, 'client-steer', STEER_PROMPT)
+    for (const captured of framesFor(steer)) {
+      if (captured.at > FOLD_FRESH_SEND_AT.steer) {
+        rig.deliver(captured)
+      }
+    }
+
+    expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([first])
+    expect(rig.turns().every((turn) => turn.state !== 'interrupted')).toBe(true)
+    expect(replayEventFor(rig.events, steer)).not.toHaveProperty('startsTurn')
+  })
+
+  it('fold-resumed: the receipt holds on a resumed provider session', async () => {
+    const rig = await riggedAdapter({
+      resumeLeafUuid: 'leaf-1',
+      resumesTranscript: true,
+      continuesChain: true
+    })
+    const first = await rig.dispatchAt(FOLD_RESUMED_SEND_AT.first, 'client-first', FIRST_PROMPT)
+    const framesFor = (steerUuid: string) =>
+      foldResumedCapture({ sessionId: PROVIDER_SESSION_ID, first, steer: steerUuid })
+    for (const captured of framesFor('pending')) {
+      if (captured.at < FOLD_RESUMED_SEND_AT.steer) {
+        rig.deliver(captured)
+      }
+    }
+    const steer = await rig.dispatchAt(FOLD_RESUMED_SEND_AT.steer, 'client-steer', STEER_PROMPT)
+    for (const captured of framesFor(steer)) {
+      if (captured.at > FOLD_RESUMED_SEND_AT.steer) {
+        rig.deliver(captured)
+      }
+    }
+    expect(rig.settled).toHaveBeenCalledWith({
+      sessionId: 'session-1',
+      clientMessageId: 'client-steer',
+      providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: steer }
+    })
+
+    expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([first])
+    expect(rig.turns().every((turn) => turn.state !== 'interrupted')).toBe(true)
+    expect(rig.turns().at(-1)).toMatchObject({
+      turnId: first,
+      state: 'completed',
+      durationMs: 23_367
+    })
+  })
+
+  it('two-steers: both folded sends settle individually inside the one turn', async () => {
+    const rig = await riggedAdapter()
+    const first = await rig.dispatchAt(TWO_STEERS_SEND_AT.first, 'client-first', FIRST_PROMPT)
+    const framesFor = (steerUuid: string, secondSteerUuid: string) =>
+      twoSteersCapture({
+        sessionId: PROVIDER_SESSION_ID,
+        first,
+        steer: steerUuid,
+        secondSteer: secondSteerUuid
+      })
+    for (const captured of framesFor('pending', 'pending-2')) {
+      if (captured.at < TWO_STEERS_SEND_AT.steer) {
+        rig.deliver(captured)
+      }
+    }
+    // Both steers go out mid-turn, before the next captured frame at 7949.
+    const steer = await rig.dispatchAt(TWO_STEERS_SEND_AT.steer, 'client-steer', STEER_PROMPT)
+    const secondSteer = await rig.dispatchAt(
+      TWO_STEERS_SEND_AT.secondSteer,
+      'client-steer-2',
+      SECOND_STEER_PROMPT
+    )
+    for (const captured of framesFor(steer, secondSteer)) {
+      if (captured.at > TWO_STEERS_SEND_AT.secondSteer) {
+        rig.deliver(captured)
+      }
+    }
+
+    expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([first])
+    expect(rig.turns().every((turn) => turn.state !== 'interrupted')).toBe(true)
+    expect(rig.settled).toHaveBeenCalledWith({
+      sessionId: 'session-1',
+      clientMessageId: 'client-steer',
+      providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: steer }
+    })
+    expect(rig.settled).toHaveBeenCalledWith({
+      sessionId: 'session-1',
+      clientMessageId: 'client-steer-2',
+      providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: secondSteer }
+    })
+  })
+
+  it('early-steer: a steer written before the first replay arrives still folds into the one turn', async () => {
+    const rig = await riggedAdapter()
+    const first = await rig.dispatchAt(EARLY_STEER_SEND_AT.first, 'client-first', FIRST_PROMPT)
+    const framesFor = (steerUuid: string) =>
+      earlySteerCapture({ sessionId: PROVIDER_SESSION_ID, first, steer: steerUuid })
+    for (const captured of framesFor('pending')) {
+      if (captured.at < EARLY_STEER_SEND_AT.steer) {
+        rig.deliver(captured)
+      }
+    }
+    const steer = await rig.dispatchAt(EARLY_STEER_SEND_AT.steer, 'client-steer', STEER_PROMPT)
+    for (const captured of framesFor(steer)) {
+      if (captured.at > EARLY_STEER_SEND_AT.steer) {
+        rig.deliver(captured)
+      }
+    }
+
+    // No turn was open when the steer was written, and it still folded.
+    expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([first])
+    expect(rig.turns().every((turn) => turn.state !== 'interrupted')).toBe(true)
+    expect(rig.turns().at(-1)).toMatchObject({
+      turnId: first,
+      state: 'completed',
+      durationMs: 7_155
+    })
+    expect(replayEventFor(rig.events, steer)).not.toHaveProperty('startsTurn')
+    expect(rig.settled).toHaveBeenCalledWith({
+      sessionId: 'session-1',
+      clientMessageId: 'client-steer',
+      providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: steer }
+    })
+  })
+
+  it('background-wake: the wake cycle opens from its output and its result settles no waiter', async () => {
+    const rig = await riggedAdapter()
+    const first = await rig.dispatchAt(13, 'client-first', FIRST_PROMPT)
+    const { firstTurn, wake } = backgroundWakeCapture({
+      sessionId: PROVIDER_SESSION_ID,
+      first,
+      steer: 'unused'
+    })
+    for (const captured of [...firstTurn, ...wake]) {
+      rig.deliver(captured)
+    }
+
+    // The task's completion revises a live row ahead of the wake's init, and
+    // that provider output is what opens the wake turn.
+    const finalByTurn = new Map(rig.turns().map((turn) => [turn.turnId, turn]))
+    expect([...finalByTurn.keys()]).toEqual([first, 'task_updated-17547'])
+    expect(finalByTurn.get('task_updated-17547')).toMatchObject({ state: 'completed' })
+    // The wake result names no send; only the first send ever settled.
+    expect(rig.settled).toHaveBeenCalledTimes(1)
+  })
+
+  it('background-wake: a steer replayed after the wake cycle began work folds into the wake turn', async () => {
+    const rig = await riggedAdapter()
+    const first = await rig.dispatchAt(13, 'client-first', FIRST_PROMPT)
+    const { firstTurn, wake } = backgroundWakeCapture({
+      sessionId: PROVIDER_SESSION_ID,
+      first,
+      steer: 'pending'
+    })
+    const wakeResult = wake.findIndex((captured) => captured.frame.type === 'result')
+    for (const captured of [...firstTurn, ...wake.slice(0, wakeResult)]) {
+      rig.deliver(captured)
+    }
+    // Captured order up to the wake's output; the steer's replay is placed
+    // mid-cycle, where the CLI replays a send it folded (p3-early-steer).
+    const steer = await rig.dispatchAt(19_725, 'client-steer', STEER_PROMPT)
+    rig.deliver(userReplay(19_726, PROVIDER_SESSION_ID, steer, STEER_PROMPT))
+    for (const captured of wake.slice(wakeResult)) {
+      rig.deliver(captured)
+    }
+
+    expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([
+      first,
+      'task_updated-17547'
+    ])
+    expect(rig.turns().every((turn) => turn.state !== 'interrupted')).toBe(true)
+    expect(replayEventFor(rig.events, steer)).not.toHaveProperty('startsTurn')
+    expect(rig.settled).toHaveBeenCalledWith({
+      sessionId: 'session-1',
+      clientMessageId: 'client-steer',
+      providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: steer }
+    })
+  })
+
+  it('mid-turn auto-compaction emits no root init, so a steer after the boundary still folds', async () => {
+    // Measured (p4-autocompact, CLAUDE_CODE_AUTO_COMPACT_WINDOW forced): the
+    // boundary is `status compacting` + `compact_boundary` + a synthetic
+    // continuation user frame — and NO root init, so cycle work survives it.
+    const rig = await riggedAdapter()
+    const first = await rig.dispatchAt(14, 'client-first', FIRST_PROMPT)
+    rig.deliver(initFrame(234, PROVIDER_SESSION_ID))
+    rig.deliver(userReplay(2_437, PROVIDER_SESSION_ID, first, FIRST_PROMPT))
+    rig.deliver(assistantText(2_864, PROVIDER_SESSION_ID, 'reply-1', 'reading files'))
+    rig.deliver({
+      at: 11_518,
+      frame: {
+        type: 'system',
+        subtype: 'status',
+        status: 'compacting',
+        session_id: PROVIDER_SESSION_ID,
+        uuid: 'status-compacting-1'
+      }
+    })
+    rig.deliver({
+      at: 26_584,
+      frame: {
+        type: 'system',
+        subtype: 'compact_boundary',
+        session_id: PROVIDER_SESSION_ID,
+        uuid: 'compact-boundary-1',
+        compact_metadata: { trigger: 'auto', pre_tokens: 69_960, post_tokens: 9_311 }
+      }
+    })
+    rig.deliver({
+      at: 26_585,
+      frame: {
+        type: 'user',
+        session_id: PROVIDER_SESSION_ID,
+        parent_tool_use_id: null,
+        uuid: 'continuation-1',
+        isSynthetic: true,
+        message: {
+          role: 'user',
+          content: [{ type: 'text', text: 'This session is being continued.' }]
+        }
+      }
+    })
+    const steer = await rig.dispatchAt(26_987, 'client-steer', STEER_PROMPT)
+    rig.deliver(userReplay(34_601, PROVIDER_SESSION_ID, steer, STEER_PROMPT))
+    rig.deliver(assistantText(37_824, PROVIDER_SESSION_ID, 'reply-2', 'FIRST DONE banana'))
+    rig.deliver(
+      resultFrame(37_828, PROVIDER_SESSION_ID, 'result-1', {
+        userMessageUuids: [first, steer],
+        durationMs: 37_616,
+        numTurns: 6
+      })
+    )
+
+    expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([first])
+    expect(rig.turns().every((turn) => turn.state !== 'interrupted')).toBe(true)
+    expect(replayEventFor(rig.events, steer)).not.toHaveProperty('startsTurn')
+    expect(rig.settled).toHaveBeenCalledWith({
+      sessionId: 'session-1',
+      clientMessageId: 'client-steer',
+      providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: steer }
+    })
+  })
+
+  it('miss: a steer whose replay trails the result keeps the opener path and its own turn', async () => {
+    const rig = await riggedAdapter()
+    const first = await rig.dispatchAt(MISS_SEND_AT.first, 'client-first', FIRST_PROMPT)
+    const { beforeSteerSend } = missCapture({
+      sessionId: PROVIDER_SESSION_ID,
+      first,
+      steer: 'pending'
+    })
+    for (const captured of beforeSteerSend) {
+      rig.deliver(captured)
+    }
+    const steer = await rig.dispatchAt(MISS_SEND_AT.steer, 'client-steer', STEER_PROMPT)
+    for (const captured of missCapture({ sessionId: PROVIDER_SESSION_ID, first, steer })
+      .afterSteerSend) {
+      rig.deliver(captured)
+    }
+
+    // Two real turns: the first completed by its result — not interrupted —
+    // and the late steer's own turn opened by its replay.
+    expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([first, steer])
+    expect(rig.turns().every((turn) => turn.state !== 'interrupted')).toBe(true)
+    const finalByTurn = new Map(rig.turns().map((turn) => [turn.turnId, turn]))
+    expect(finalByTurn.get(first)).toMatchObject({
+      state: 'completed',
+      completedAt: T0 + 25_556,
+      durationMs: 25_241
+    })
+    expect(finalByTurn.get(steer)).toMatchObject({
+      state: 'completed',
+      startedAt: T0 + 28_703,
+      completedAt: T0 + 29_275,
+      durationMs: 3_711
+    })
+    expect(replayEventFor(rig.events, steer)).toMatchObject({ startsTurn: true })
+  })
+
+  it('cancel: a cancelled steer settles nothing and the receipt path changes none of it', async () => {
+    const rig = await riggedAdapter()
+    const first = await rig.dispatchAt(CANCEL_SEND_AT.first, 'client-first', FIRST_PROMPT)
+    const { beforeSteerSend, afterInterrupt } = cancelCapture({
+      sessionId: PROVIDER_SESSION_ID,
+      first,
+      steer: 'never-replayed'
+    })
+    for (const captured of beforeSteerSend) {
+      rig.deliver(captured)
+    }
+    await rig.dispatchAt(CANCEL_SEND_AT.steer, 'client-steer', STEER_PROMPT)
+    for (const captured of afterInterrupt) {
+      rig.deliver(captured)
+    }
+
+    // One turn, ended by the interrupt's error result exactly as before.
+    expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([first])
+    expect(rig.turns().at(-1)).toMatchObject({
+      turnId: first,
+      state: 'interrupted',
+      outcome: 'cancellation'
+    })
+    // The steer was never replayed and its result never named it: no settlement.
+    expect(rig.settled).not.toHaveBeenCalledWith(
+      expect.objectContaining({ clientMessageId: 'client-steer' })
+    )
+    // The interrupt's synthetic user text opens no turn either.
+    expect(replayEventFor(rig.events, 'interrupt-notice-1')).not.toHaveProperty('startsTurn')
+  })
+})
+
+describe('Claude fold receipt boundaries (synthetic orders)', () => {
+  it('lost result: a root init starts a cycle with no work yet, so the next adopted replay is a boundary', async () => {
+    const rig = await riggedAdapter()
+    const uuidA = await rig.dispatchAt(10, 'client-a', 'first prompt')
+    rig.deliver(userReplay(1_000, PROVIDER_SESSION_ID, uuidA, 'first prompt'))
+    const uuidB = await rig.dispatchAt(1_500, 'client-b', STEER_PROMPT)
+    // A's result never arrives, but the CLI announces its next request cycle:
+    // the open turn stops folding, so B's replay opens its own turn.
+    rig.deliver(initFrame(2_000, PROVIDER_SESSION_ID))
+    rig.deliver(userReplay(3_000, PROVIDER_SESSION_ID, uuidB, STEER_PROMPT))
+
+    expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([uuidA, uuidB])
+    expect(replayEventFor(rig.events, uuidB)).toMatchObject({ startsTurn: true })
+  })
+
+  it('provider wake: an adopted replay during the live wake cycle folds into the wake turn', async () => {
+    // Cycle semantics: a wake is its own init-led cycle (p3-background-wake) and
+    // a replay the CLI emits mid-cycle was folded into that cycle (p3-early-steer).
+    const rig = await riggedAdapter()
+    const uuidA = await rig.dispatchAt(10, 'client-a', 'first prompt')
+    rig.deliver(userReplay(1_000, PROVIDER_SESSION_ID, uuidA, 'first prompt'))
+    rig.deliver(
+      resultFrame(2_000, PROVIDER_SESSION_ID, 'result-1', {
+        userMessageUuids: [uuidA],
+        durationMs: 1_990,
+        numTurns: 1
+      })
+    )
+    const uuidB = await rig.dispatchAt(2_500, 'client-b', STEER_PROMPT)
+    rig.deliver(initFrame(3_000, PROVIDER_SESSION_ID))
+    rig.deliver(assistantText(3_500, PROVIDER_SESSION_ID, 'provider-resumed-1', 'background done'))
+    rig.deliver(userReplay(4_000, PROVIDER_SESSION_ID, uuidB, STEER_PROMPT))
+
+    expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([
+      uuidA,
+      'provider-resumed-1'
+    ])
+    expect(replayEventFor(rig.events, uuidB)).not.toHaveProperty('startsTurn')
+    expect(rig.settled).toHaveBeenCalledWith({
+      sessionId: 'session-1',
+      clientMessageId: 'client-b',
+      providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: uuidB }
+    })
+  })
+
+  it('a fresh replay uuid with user_message_uuid correlation keeps the opener path, not a fold receipt', async () => {
+    const rig = await riggedAdapter()
+    const uuidA = await rig.dispatchAt(10, 'client-a', 'first prompt')
+    rig.deliver(userReplay(1_000, PROVIDER_SESSION_ID, uuidA, 'first prompt'))
+    const uuidB = await rig.dispatchAt(1_500, 'client-b', STEER_PROMPT)
+    // A replay that did not adopt the client uuid is not the measured fold
+    // shape, so it keeps the opener path it had before the receipt existed.
+    const fresh = userReplay(2_000, PROVIDER_SESSION_ID, 'fresh-turn-2', STEER_PROMPT)
+    rig.deliver({ ...fresh, frame: { ...fresh.frame, user_message_uuid: uuidB } })
+
+    expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([uuidA, 'fresh-turn-2'])
+    expect(replayEventFor(rig.events, 'fresh-turn-2')).toMatchObject({ startsTurn: true })
+    expect(rig.settled).toHaveBeenCalledWith({
+      sessionId: 'session-1',
+      clientMessageId: 'client-b',
+      providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: 'fresh-turn-2' }
+    })
+  })
+
+  it('plural result uuids: an unsettled folded waiter settles under its own uuid, never a shared result alias', async () => {
+    const rig = await riggedAdapter()
+    const uuidA = await rig.dispatchAt(10, 'client-a', 'first prompt')
+    rig.deliver(userReplay(1_000, PROVIDER_SESSION_ID, uuidA, 'first prompt'))
+    const uuidB = await rig.dispatchAt(1_500, 'client-b', STEER_PROMPT)
+    // B's replay never arrives; the folded turn's one result still names it.
+    rig.deliver(
+      resultFrame(5_000, PROVIDER_SESSION_ID, 'result-1', {
+        userMessageUuids: [uuidA, uuidB],
+        durationMs: 4_990,
+        numTurns: 2
+      })
+    )
+
+    expect(rig.settled).toHaveBeenCalledWith({
+      sessionId: 'session-1',
+      clientMessageId: 'client-b',
+      providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: uuidB }
+    })
+    expect(rig.settled).not.toHaveBeenCalledWith(
+      expect.objectContaining({ providerIdentity: expect.objectContaining({ uuid: 'result-1' }) })
+    )
+    // The correlated result opened nothing and the one turn completed normally.
+    expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([uuidA])
+    expect(rig.turns().at(-1)).toMatchObject({ turnId: uuidA, state: 'completed' })
+  })
+
+  it('plural result uuids: a result naming only settled sends does not claim an unnamed live waiter by queue order', async () => {
+    const rig = await riggedAdapter()
+    const uuidA = await rig.dispatchAt(10, 'client-a', 'first prompt')
+    rig.deliver(userReplay(1_000, PROVIDER_SESSION_ID, uuidA, 'first prompt'))
+    await rig.dispatchAt(1_500, 'client-b', STEER_PROMPT)
+    // A result that names only sends already settled must not fall back to
+    // queue order and claim B, the still-live waiter it did not name.
+    rig.deliver(
+      resultFrame(5_000, PROVIDER_SESSION_ID, 'result-1', {
+        userMessageUuids: [uuidA],
+        durationMs: 4_990,
+        numTurns: 1
+      })
+    )
+    expect(rig.settled).not.toHaveBeenCalledWith(
+      expect.objectContaining({ clientMessageId: 'client-b' })
+    )
+  })
+})
diff --git a/src/main/claude/claude-hook-event-install.test.ts b/src/main/claude/claude-hook-event-install.test.ts
new file mode 100644
index 000000000000..99af9a3fa536
--- /dev/null
+++ b/src/main/claude/claude-hook-event-install.test.ts
@@ -0,0 +1,187 @@
+import { describe, expect, it } from 'vitest'
+import type { HooksConfig } from '../agent-hooks/installer-utils'
+import fixture from './__fixtures__/claude-hook-event-enums.json'
+import { CLAUDE_HOOK_EVENT_FIRST_VERSIONS } from './claude-hook-event-versions'
+import { getClaudeManagedHookPlan } from './claude-managed-hook-events'
+import { applyManagedHooks } from './hook-settings'
+
+const SCRIPT_FILE_NAME = 'claude-hook.sh'
+const MANAGED_COMMAND = '/home/dev/.orca/agent-hooks/claude-hook.sh'
+const managedHook = { type: 'command' as const, command: MANAGED_COMMAND }
+const enums: Record<string, string[]> = fixture.enums
+const topLevelSettings: Record<string, { keys: string[] }> = fixture.topLevelSettings
+
+function install(config: HooksConfig, claudeVersion: string | undefined): HooksConfig {
+  return applyManagedHooks(
+    config,
+    managedHook,
+    SCRIPT_FILE_NAME,
+    getClaudeManagedHookPlan(claudeVersion)
+  )
+}
+
+function managedEvents(config: HooksConfig): string[] {
+  return Object.entries(config.hooks ?? {})
+    .filter(([, definitions]) =>
+      (definitions ?? []).some((definition) =>
+        (definition.hooks ?? []).some((hook) => hook.command === MANAGED_COMMAND)
+      )
+    )
+    .map(([event]) => event)
+    .sort()
+}
+
+const userHook = (event: string) => ({
+  hooks: [{ type: 'command' as const, command: `echo user-${event}` }]
+})
+
+// Why: the user owns every event, managed or not, plus the keys an invalid file would discard.
+function userOwnedSettings(): HooksConfig {
+  const events = [...Object.keys(CLAUDE_HOOK_EVENT_FIRST_VERSIONS), 'Notification']
+  return {
+    env: { CLAUDE_CODE_USE_BEDROCK: '1' },
+    permissions: { allow: ['Bash(git status)'] },
+    hooks: Object.fromEntries(events.map((event) => [event, [userHook(event)]]))
+  }
+}
+
+function expectUserSettingsKept(config: HooksConfig): void {
+  expect(config.env).toEqual({ CLAUDE_CODE_USE_BEDROCK: '1' })
+  expect(config.permissions).toEqual({ allow: ['Bash(git status)'] })
+  for (const [event, definitions] of Object.entries(userOwnedSettings().hooks ?? {})) {
+    expect(config.hooks?.[event], event).toContainEqual(definitions?.[0])
+  }
+}
+
+describe('Claude managed hook events by resolved version', () => {
+  it.each(Object.keys(enums))('writes only events Claude %s knows', (version) => {
+    const written = install({ hooks: {} }, version)
+    const unknown = Object.keys(written.hooks ?? {}).filter(
+      (event) => !enums[version].includes(event)
+    )
+    expect(unknown).toEqual([])
+  })
+
+  it.each(Object.keys(topLevelSettings))(
+    'writes statusLine only if Claude %s knows it',
+    (version) => {
+      const plan = getClaudeManagedHookPlan(version)
+      expect(plan.statusLine === 'install').toBe(
+        topLevelSettings[version].keys.includes('statusLine')
+      )
+    }
+  )
+
+  it('omits every event newer than an old Claude', () => {
+    expect(managedEvents(install({ hooks: {} }, '2.1.32 (Claude Code)'))).toEqual(
+      [
+        'PermissionRequest',
+        'PostToolUse',
+        'PostToolUseFailure',
+        'PreToolUse',
+        'SessionStart',
+        'Stop',
+        'SubagentStart',
+        'SubagentStop',
+        'UserPromptSubmit'
+      ].sort()
+    )
+  })
+
+  it.each([undefined, 'unknown'])(
+    'writes only the core lifecycle events when the version is %s',
+    (version) => {
+      expect(managedEvents(install({ hooks: {} }, version))).toEqual(
+        [
+          'PostToolUse',
+          'PreToolUse',
+          'SessionStart',
+          'Stop',
+          'SubagentStop',
+          'UserPromptSubmit'
+        ].sort()
+      )
+    }
+  )
+
+  it.each([undefined, 'unknown'])(
+    'leaves Orca entries a version-aware install wrote untouched when the version is %s',
+    (version) => {
+      const current = install(userOwnedSettings(), '2.1.261')
+      expect(JSON.stringify(install(current, version))).toBe(JSON.stringify(current))
+
+      // Why: even an entry from an older hook command stays byte-identical; only a known version may rewrite it.
+      const staleHook = {
+        type: 'command' as const,
+        command: '/old/.orca/agent-hooks/claude-hook.sh'
+      }
+      const stale = { hooks: { StopFailure: [{ hooks: [staleHook] }] } }
+      const written = install(stale, version)
+      expect(JSON.stringify(written.hooks?.StopFailure)).toBe(
+        JSON.stringify(stale.hooks.StopFailure)
+      )
+      expect(managedEvents(written)).toEqual(
+        [
+          'PostToolUse',
+          'PreToolUse',
+          'SessionStart',
+          'Stop',
+          'SubagentStop',
+          'UserPromptSubmit'
+        ].sort()
+      )
+    }
+  )
+
+  it('adds the newer events once the resolved Claude is upgraded', () => {
+    const old = install({ hooks: {} }, '2.1.77')
+    expect(old.hooks?.StopFailure).toBeUndefined()
+
+    const upgraded = install(old, '2.1.78')
+
+    expect(managedEvents(upgraded)).toContain('StopFailure')
+    expect(managedEvents(upgraded)).toContain('PostCompact')
+    expect(upgraded.hooks?.StopFailure).toEqual([{ hooks: [managedHook] }])
+  })
+
+  it('removes only Orca entries for events a downgraded Claude does not know', () => {
+    const current = install({ hooks: {} }, '2.1.261')
+    expect(managedEvents(current)).toContain('SessionEnd')
+
+    const downgraded = install(current, '2.1.32')
+
+    for (const event of ['StopFailure', 'PostCompact', 'TeammateIdle', 'SessionEnd']) {
+      expect(downgraded.hooks?.[event], event).toBeUndefined()
+    }
+  })
+
+  it('gates a known Claude older than the unresolved-version set by its own enum', () => {
+    expect(managedEvents(install({ hooks: {} }, '1.0.52'))).toEqual(
+      ['PostToolUse', 'PreToolUse', 'Stop', 'SubagentStop'].sort()
+    )
+    const downgraded = install(install({ hooks: {} }, '2.1.261'), '1.0.22')
+    expect(managedEvents(downgraded)).toEqual([])
+  })
+
+  it.each(['1.0.22', '1.0.52', '1.0.81', '2.1.32', '2.1.77', '2.1.78', '2.1.261', undefined])(
+    'keeps every user-written entry and setting when installing for %s',
+    (version) => {
+      const fresh = install(userOwnedSettings(), version)
+      expectUserSettingsKept(fresh)
+      // Why: a downgrade from the newest set is the path that removes Orca entries.
+      expectUserSettingsKept(install(install(userOwnedSettings(), '2.1.261'), version))
+    }
+  )
+
+  it('leaves a user value it cannot parse under an unknown event untouched', () => {
+    const settings: HooksConfig = JSON.parse('{"hooks":{"StopFailure":[],"PostCompact":"mine"}}')
+    const written = install(settings, '2.1.32')
+    expect(written.hooks?.StopFailure).toEqual([])
+    expect(written.hooks?.PostCompact).toBe('mine')
+  })
+
+  it('keeps SessionEnd behind its measured 2.1.261 floor', () => {
+    expect(install({ hooks: {} }, '2.1.260').hooks?.SessionEnd).toBeUndefined()
+    expect(install({ hooks: {} }, '2.1.261').hooks?.SessionEnd).toEqual([{ hooks: [managedHook] }])
+  })
+})
diff --git a/src/main/claude/claude-hook-event-versions.test.ts b/src/main/claude/claude-hook-event-versions.test.ts
new file mode 100644
index 000000000000..d27705a5f54b
--- /dev/null
+++ b/src/main/claude/claude-hook-event-versions.test.ts
@@ -0,0 +1,111 @@
+import { describe, expect, it } from 'vitest'
+import { compareAppVersions } from '../../shared/app-version'
+import fixture from './__fixtures__/claude-hook-event-enums.json'
+import {
+  CLAUDE_HOOK_EVENT_FIRST_VERSIONS,
+  CLAUDE_STATUS_LINE_FIRST_VERSION,
+  claudeKnowsHookEvent,
+  claudeKnowsStatusLine,
+  parseClaudeCliVersion,
+  UNRESOLVED_CLAUDE_VERSION,
+  type ClaudeHookEventName
+} from './claude-hook-event-versions'
+
+const enums: Record<string, string[]> = fixture.enums
+const previousPublished: Record<string, string> = fixture.previousPublishedVersion
+const topLevelSettings: Record<string, { strict: boolean; keys: string[] }> =
+  fixture.topLevelSettings
+const versions = Object.keys(enums).sort(compareAppVersions)
+const isTableEvent = (name: string): name is ClaudeHookEventName =>
+  name in CLAUDE_HOOK_EVENT_FIRST_VERSIONS
+const tableEntries = Object.keys(CLAUDE_HOOK_EVENT_FIRST_VERSIONS)
+  .filter(isTableEvent)
+  .map((event): [ClaudeHookEventName, string] => [event, CLAUDE_HOOK_EVENT_FIRST_VERSIONS[event]])
+
+describe('Claude hook event version table', () => {
+  it.each(tableEntries)('pins %s to the first release whose enum knows it', (event, first) => {
+    expect(versions.find((version) => enums[version].includes(event))).toBe(first)
+    for (const version of versions) {
+      expect(enums[version].includes(event), `${event} in ${version}`).toBe(
+        compareAppVersions(version, first) >= 0
+      )
+    }
+    // Why: the release published just before `first` lacks the event, so the table is exact, not just safe.
+    const before = previousPublished[first]
+    expect(enums[before], `enum for ${before}`).toBeDefined()
+    expect(enums[before]).not.toContain(event)
+  })
+})
+
+describe('Claude statusLine version floor', () => {
+  it('pins statusLine to the first release whose settings schema knows it', () => {
+    for (const [version, schema] of Object.entries(topLevelSettings)) {
+      expect(schema.keys.includes('statusLine'), version).toBe(
+        compareAppVersions(version, CLAUDE_STATUS_LINE_FIRST_VERSION) >= 0
+      )
+    }
+    // Why: the release just before rejects the unknown key, so the floor is exact, not just safe.
+    const before = previousPublished[CLAUDE_STATUS_LINE_FIRST_VERSION]
+    expect(topLevelSettings[before].strict).toBe(true)
+    expect(topLevelSettings[before].keys).not.toContain('statusLine')
+  })
+
+  it.each([
+    ['1.0.63', false],
+    ['1.0.64 (Claude Code)', true],
+    [undefined, true]
+  ] as const)('%s knows statusLine: %s', (version, expected) => {
+    expect(claudeKnowsStatusLine(version)).toBe(expected)
+  })
+})
+
+describe('claudeKnowsHookEvent', () => {
+  it.each([
+    ['2.1.77', 'StopFailure', false],
+    ['2.1.78 (Claude Code)', 'StopFailure', true],
+    ['2.1.75', 'PostCompact', false],
+    ['2.1.76', 'PostCompact', true],
+    ['2.1.32', 'TeammateIdle', false],
+    ['2.0.55', 'PostToolUseFailure', false],
+    ['2.0.44', 'PermissionRequest', false],
+    ['2.0.42', 'SubagentStart', false],
+    ['1.0.84', 'SessionEnd', false],
+    ['1.0.61', 'SessionStart', false],
+    ['1.0.62', 'SessionStart', true],
+    ['1.0.52', 'UserPromptSubmit', false],
+    ['1.0.40', 'SubagentStop', false],
+    ['1.0.30', 'Stop', false],
+    ['1.0.22', 'PreToolUse', false]
+  ] as const)('%s knows %s: %s', (version, event, expected) => {
+    expect(claudeKnowsHookEvent(version, event)).toBe(expected)
+  })
+
+  it.each([undefined, null, 'unknown'])(
+    'grants an unresolved version (%s) only the events its assumed release knows',
+    (version) => {
+      const known = tableEntries
+        .filter(([event]) => claudeKnowsHookEvent(version, event))
+        .map(([event]) => event)
+      expect(known.sort()).toEqual(
+        [
+          'PostToolUse',
+          'PreToolUse',
+          'SessionStart',
+          'Stop',
+          'SubagentStop',
+          'UserPromptSubmit'
+        ].sort()
+      )
+      for (const event of known) {
+        expect(enums[UNRESOLVED_CLAUDE_VERSION]).toContain(event)
+      }
+    }
+  )
+})
+
+describe('parseClaudeCliVersion', () => {
+  it('extracts Claude Code version output', () => {
+    expect(parseClaudeCliVersion('2.1.261 (Claude Code)')).toBe('2.1.261')
+    expect(parseClaudeCliVersion('unknown')).toBeNull()
+  })
+})
diff --git a/src/main/claude/claude-hook-event-versions.ts b/src/main/claude/claude-hook-event-versions.ts
new file mode 100644
index 000000000000..5c9c28de66c5
--- /dev/null
+++ b/src/main/claude/claude-hook-event-versions.ts
@@ -0,0 +1,86 @@
+import { hasReachedAppVersion, isValidAppVersion } from '../../shared/app-version'
+import { runProcess } from '../../shared/child-process/run-process'
+import path from 'node:path'
+
+// Why: Claude 1.0.23 through 2.1.100 validate `hooks` against a closed event enum and discard the
+// WHOLE settings.json (env, permissions, every user hook) on one unknown name, so an event may only
+// be written for a Claude that knows it. Values come from each release's packed enum, pinned by
+// __fixtures__/claude-hook-event-enums.json.
+export const CLAUDE_HOOK_EVENT_FIRST_VERSIONS = {
+  PreToolUse: '1.0.23',
+  PostToolUse: '1.0.23',
+  Stop: '1.0.31',
+  SubagentStop: '1.0.41',
+  UserPromptSubmit: '1.0.53',
+  SessionStart: '1.0.62',
+  SessionEnd: '1.0.85',
+  SubagentStart: '2.0.43',
+  PermissionRequest: '2.0.45',
+  PostToolUseFailure: '2.0.56',
+  TeammateIdle: '2.1.33',
+  PostCompact: '2.1.76',
+  StopFailure: '2.1.78'
+} as const
+
+// Why: 1.0.49 through 1.0.66 also discard the whole file over an unknown top-level key, and
+// `statusLine` joined their schema only in 1.0.64. Pinned by the same fixture's topLevelSettings.
+export const CLAUDE_STATUS_LINE_FIRST_VERSION = '1.0.64'
+
+// Why: an unresolved version gets what the first release accepting Orca's core lifecycle events and
+// statusLine knows, and nothing newer; a Claude older than that is gated only once its version resolves.
+export const UNRESOLVED_CLAUDE_VERSION = CLAUDE_STATUS_LINE_FIRST_VERSION
+
+export type ClaudeHookEventName = keyof typeof CLAUDE_HOOK_EVENT_FIRST_VERSIONS
+
+export function parseClaudeCliVersion(output: string | null | undefined): string | null {
+  const version = output?.match(/\b\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?\b/)?.[0]
+  return version && isValidAppVersion(version) ? version : null
+}
+
+export function claudeVersionReaches(version: string | null | undefined, floor: string): boolean {
+  const parsed = parseClaudeCliVersion(version)
+  return parsed !== null && hasReachedAppVersion(parsed, floor)
+}
+
+function claudeKnowsSince(version: string | null | undefined, firstVersion: string): boolean {
+  return hasReachedAppVersion(
+    parseClaudeCliVersion(version) ?? UNRESOLVED_CLAUDE_VERSION,
+    firstVersion
+  )
+}
+
+export function claudeKnowsHookEvent(
+  version: string | null | undefined,
+  eventName: ClaudeHookEventName
+): boolean {
+  return claudeKnowsSince(version, CLAUDE_HOOK_EVENT_FIRST_VERSIONS[eventName])
+}
+
+export function claudeKnowsStatusLine(version: string | null | undefined): boolean {
+  return claudeKnowsSince(version, CLAUDE_STATUS_LINE_FIRST_VERSION)
+}
+
+export async function probeClaudeCliVersion(executablePath: string): Promise<string | null> {
+  try {
+    const pathKey = process.platform === 'win32' && process.env.Path !== undefined ? 'Path' : 'PATH'
+    const executableDir = path.dirname(executablePath)
+    const inheritedPath = process.env[pathKey]
+    const result = await runProcess({
+      program: executablePath,
+      args: ['--version'],
+      // Why: version-manager launchers often use `#!/usr/bin/env node`; the resolved CLI's sibling
+      // runtime must remain reachable even when Electron started with a thinner PATH.
+      env: {
+        ...process.env,
+        [pathKey]: inheritedPath
+          ? `${executableDir}${path.delimiter}${inheritedPath}`
+          : executableDir
+      },
+      timeoutMs: 5_000,
+      maxOutputBytes: 4_096
+    })
+    return result.code === 0 ? parseClaudeCliVersion(`${result.stdout}\n${result.stderr}`) : null
+  } catch {
+    return null
+  }
+}
diff --git a/src/main/claude/claude-journal-translator-contract.ts b/src/main/claude/claude-journal-translator-contract.ts
index 7a7fc4291c7c..1ccf24e13939 100644
--- a/src/main/claude/claude-journal-translator-contract.ts
+++ b/src/main/claude/claude-journal-translator-contract.ts
@@ -13,6 +13,10 @@ export type ClaudeJournalTranslator = {
   /** The open turn's provider id — the same id its journal row carries, and the one
    *  a client's Stop names. Sole owner: no reader keeps a copy to disagree with. */
   readonly currentTurnId: string | null
+  /** True while a turn is open and the provider's current request cycle has
+   *  done root work since its init — the state in which the CLI folds an
+   *  arriving send into the turn. */
+  readonly openTurnInLiveProviderCycle: boolean
   flush: () => void
   childToolOwner?: ClaudeChildToolQueries['childToolOwner']
   childActivity?: ClaudeChildToolQueries['childActivity']
diff --git a/src/main/claude/claude-managed-hook-events.ts b/src/main/claude/claude-managed-hook-events.ts
new file mode 100644
index 000000000000..dbbb8ae15a21
--- /dev/null
+++ b/src/main/claude/claude-managed-hook-events.ts
@@ -0,0 +1,124 @@
+import type { HookDefinition } from '../agent-hooks/installer-utils'
+import {
+  claudeKnowsHookEvent,
+  claudeKnowsStatusLine,
+  claudeVersionReaches,
+  parseClaudeCliVersion
+} from './claude-hook-event-versions'
+
+export const CLAUDE_EVENTS = [
+  // Why: SessionStart is the only event a resumed/idle session emits before the
+  // first prompt; without it the sidebar row can't exist until the user types (STA-3386).
+  {
+    eventName: 'SessionStart',
+    definition: { hooks: [{ type: 'command', command: '' }] }
+  },
+  {
+    eventName: 'UserPromptSubmit',
+    definition: { hooks: [{ type: 'command', command: '' }] }
+  },
+  {
+    eventName: 'Stop',
+    definition: { hooks: [{ type: 'command', command: '' }] }
+  },
+  // Why: OpenClaude skips normal Stop hooks after API/model errors and emits
+  // StopFailure instead; without this hook Orca leaves the turn spinning.
+  {
+    eventName: 'StopFailure',
+    definition: { hooks: [{ type: 'command', command: '' }] }
+  },
+  // Why: subagent/teammate lifecycle feeds the sidebar's child rows and keeps
+  // a pane 'working' while background children outlive the lead's turn.
+  // TeammateIdle parks turn-based teammates without trusting their permanently
+  // "running" background_tasks entry to gate the pane.
+  {
+    eventName: 'SubagentStart',
+    definition: { hooks: [{ type: 'command', command: '' }] }
+  },
+  {
+    eventName: 'SubagentStop',
+    definition: { hooks: [{ type: 'command', command: '' }] }
+  },
+  {
+    eventName: 'TeammateIdle',
+    definition: { hooks: [{ type: 'command', command: '' }] }
+  },
+  // Why: PreToolUse gives the dashboard a live readout of the in-flight tool
+  // (name + input preview) before it completes.
+  {
+    eventName: 'PreToolUse',
+    definition: { matcher: '*', hooks: [{ type: 'command', command: '' }] }
+  },
+  {
+    eventName: 'PostToolUse',
+    definition: { matcher: '*', hooks: [{ type: 'command', command: '' }] }
+  },
+  {
+    eventName: 'PostToolUseFailure',
+    definition: { matcher: '*', hooks: [{ type: 'command', command: '' }] }
+  },
+  {
+    eventName: 'PermissionRequest',
+    definition: { matcher: '*', hooks: [{ type: 'command', command: '' }] }
+  },
+  // Why: a manual /compact ends at an idle prompt without emitting Stop, so PostCompact is the only
+  // signal that can clear the pane (STA-2915). PreCompact is deliberately NOT registered: it fires
+  // before the compact is validated, and an aborted compact emits it alone — mapping it to 'working'
+  // would strand the pane exactly as this registration is meant to prevent (STA-4613).
+  {
+    eventName: 'PostCompact',
+    definition: { hooks: [{ type: 'command', command: '' }] }
+  }
+] as const
+
+const CLAUDE_SESSION_END_EVENT = {
+  eventName: 'SessionEnd',
+  // Why: Claude knows SessionEnd from 1.0.85, but 2.1.261 is the only version its delivery was measured on.
+  installFrom: '2.1.261',
+  definition: { hooks: [{ type: 'command', command: '' }] }
+} as const
+
+export const CLAUDE_MANAGED_EVENTS = [...CLAUDE_EVENTS, CLAUDE_SESSION_END_EVENT] as const
+
+export type ManagedHookEvent = {
+  eventName: string
+  definition: Omit<HookDefinition, 'hooks'>
+}
+
+export type ClaudeManagedHookPlan = {
+  install: readonly ManagedHookEvent[]
+  /** Events whose Orca entry must go; user entries under them always stay. */
+  retire: readonly ManagedHookEvent[]
+  /** Orca's statusLine usage feed; `retire` removes only Orca's own, `leave` never touches the slot. */
+  statusLine: 'install' | 'retire' | 'leave'
+}
+
+/** What to write for a Claude of this version; see claude-hook-event-versions.ts. */
+export function getClaudeManagedHookPlan(
+  claudeVersion: string | null | undefined
+): ClaudeManagedHookPlan {
+  const install = CLAUDE_MANAGED_EVENTS.filter(
+    (event) =>
+      claudeKnowsHookEvent(claudeVersion, event.eventName) &&
+      (!('installFrom' in event) || claudeVersionReaches(claudeVersion, event.installFrom))
+  )
+  // Why: an unresolved version (e.g. a probe timeout) is no evidence of an old Claude, so it must
+  // not strip entries an install that knew the version wrote; only a known version retires events.
+  const retire =
+    parseClaudeCliVersion(claudeVersion) === null
+      ? []
+      : CLAUDE_MANAGED_EVENTS.filter((event) => !install.includes(event))
+  return {
+    install,
+    retire,
+    statusLine: claudeKnowsStatusLine(claudeVersion) ? 'install' : 'retire'
+  }
+}
+
+// Why: OpenClaude reads its own settings file and accepts every event Orca writes. The statusline
+// usage feed is Claude-only — OpenClaude data would be misattributed to the Claude provider.
+export const OPENCLAUDE_MANAGED_HOOK_PLAN: ClaudeManagedHookPlan = {
+  install: CLAUDE_EVENTS,
+  retire: [CLAUDE_SESSION_END_EVENT],
+  statusLine: 'leave'
+}
diff --git a/src/main/claude/claude-model-catalog-probe.ts b/src/main/claude/claude-model-catalog-probe.ts
index 882f716c3c92..f3a2646107cf 100644
--- a/src/main/claude/claude-model-catalog-probe.ts
+++ b/src/main/claude/claude-model-catalog-probe.ts
@@ -60,7 +60,7 @@ export function createClaudeModelCatalogProbe(
         ...(model.description ? { description: model.description } : {}),
         isDefault: model.isDefault === true,
         // No defaultEffort: the listing's thinking default is the commit-message generator's
-        // choice, not the effort Claude runs, and a live session's listing never names one.
+        // choice, not the effort Claude runs; the store keeps the one a live child reported.
         efforts: (model.thinkingLevels ?? []).map((level) => ({
           value: level.id,
           label: level.label
diff --git a/src/main/claude/claude-open-turn.ts b/src/main/claude/claude-open-turn.ts
index 08a7916a97b5..8a9dc30cd5a0 100644
--- a/src/main/claude/claude-open-turn.ts
+++ b/src/main/claude/claude-open-turn.ts
@@ -30,6 +30,11 @@ export class ClaudeOpenTurn {
    *  failed: nothing would ever close the turn it opened, and the row would read
    *  working for the life of the session. Only an accepted send lifts it. */
   private reopenSuppressed = false
+  /** Whether the provider's current request cycle has done root work — a send
+   *  echo or model output — since its init. Output can open a turn ahead of its
+   *  cycle's init (a background task finishing), so membership is read from the
+   *  cycle's work, not from when the turn opened. */
+  private cycleWorkObserved = false
   private readonly opener: (
     frame: Record<string, unknown>,
     source: ClaudeTurnSource | null,
@@ -63,6 +68,23 @@ export class ClaudeOpenTurn {
     return this.current !== null
   }
 
+  /** Whether a turn is open inside a provider request cycle that has already
+   *  done work — the state in which the CLI folds an arriving send into it. A
+   *  cycle's first send is its opener, never a fold. */
+  get openedInLiveProviderCycle(): boolean {
+    return this.current !== null && this.cycleWorkObserved
+  }
+
+  /** A root init frame: the CLI is starting a new request cycle. */
+  observeProviderCycleStart(): void {
+    this.cycleWorkObserved = false
+  }
+
+  /** A root send echo or model output inside the current request cycle. */
+  observeProviderCycleWork(): void {
+    this.cycleWorkObserved = true
+  }
+
   /** Open a turn, ending whichever one was still open. A new turn starting is the
    *  only end the previous one gets when its result never arrives; settling it
    *  later would sweep THIS turn. */
@@ -91,6 +113,8 @@ export class ClaudeOpenTurn {
   /** End the open turn, if one is open, and clear the live activity line. The
    *  context facts the end brings ride the same revision. */
   settle(end: ClaudeTurnEnd, contextUsage?: AgentSessionContextUsage): void {
+    // Every settle is a provider cycle ending (result, idle, child exit).
+    this.cycleWorkObserved = false
     if (this.current) {
       this.publish(this.current, end, contextUsage)
       this.current = null
diff --git a/src/main/claude/claude-real-cli-availability-test-support.ts b/src/main/claude/claude-real-cli-availability-test-support.ts
new file mode 100644
index 000000000000..faa322c456b1
--- /dev/null
+++ b/src/main/claude/claude-real-cli-availability-test-support.ts
@@ -0,0 +1,64 @@
+// Whether a real, signed-in Claude CLI is present — the gate every real-CLI
+// suite skips on. Probed once per test process.
+
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+import { runProcessSync, type ProcessResult } from '../../shared/child-process/run-process'
+import { withCliRuntimeOnPath } from '../../shared/node-cli-command-resolution'
+import { CLAUDE_AUTH_ENV_VARS } from '../claude-accounts/environment'
+import { resolveClaudeCommand } from '../codex-cli/command'
+
+export const realClaudeCommand = resolveClaudeCommand()
+
+// Why paired: the probe must run the CLI under the same node the structured launch gives it.
+function probeRealClaude(args: string[]): ProcessResult | null {
+  try {
+    return runProcessSync({
+      program: realClaudeCommand,
+      args,
+      env: withCliRuntimeOnPath(realClaudeCommand, process.env),
+      stdio: ['ignore', 'pipe', 'pipe'],
+      timeoutMs: 5_000
+    })
+  } catch {
+    return null
+  }
+}
+
+export const realClaudeAvailable = probeRealClaude(['--version'])?.code === 0
+
+/** The CLI's own account report — the only source of truth for where it writes that
+ *  is not derived from Orca's own path expressions. */
+export const realClaudeAuthStatus = (() => {
+  if (!realClaudeAvailable) {
+    return null
+  }
+  const result = probeRealClaude(['auth', 'status', '--json'])
+  if (!result || result.code !== 0) {
+    return null
+  }
+  try {
+    return JSON.parse(result.stdout) as { loggedIn?: boolean; projectsDirectory?: string }
+  } catch {
+    return null
+  }
+})()
+
+export const realClaudeAuthenticated = realClaudeAuthStatus?.loggedIn === true
+
+/** The config dir and env auth the availability probe above saw, for a real-CLI launch.
+ *  The connection strips an inherited CLAUDE_CONFIG_DIR and inherited auth vars, so
+ *  without these the child silently runs against ~/.claude whatever the probe checked. */
+export function realClaudeLaunchHome(): { claudeConfigDir: string; env: Record<string, string> } {
+  const env: Record<string, string> = {}
+  for (const key of CLAUDE_AUTH_ENV_VARS) {
+    const value = process.env[key]
+    if (value) {
+      env[key] = value
+    }
+  }
+  return {
+    claudeConfigDir: process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude'),
+    env
+  }
+}
diff --git a/src/main/claude/claude-replay-turn-resolution.ts b/src/main/claude/claude-replay-turn-resolution.ts
new file mode 100644
index 000000000000..d34d0efc206c
--- /dev/null
+++ b/src/main/claude/claude-replay-turn-resolution.ts
@@ -0,0 +1,221 @@
+// Which dispatch a provider frame settles, and whether it opens a turn.
+//
+// A replay or result is joined to its waiter by the client uuid Claude echoes.
+// A send Claude FOLDS into the running request cycle is replayed mid-cycle with
+// the client uuid adopted: once that cycle has done work, that replay is a
+// delivery receipt and opens no boundary.
+
+import { forgetRetiredWaiter } from './claude-structured-dispatch-waiters'
+import {
+  claudeHasReplayContent,
+  readClaudeMessageEnvelope
+} from './claude-structured-item-translation'
+import type {
+  ClaudeDispatchWaiter,
+  ClaudeLateDispatchOutcome,
+  ClaudeSession
+} from './claude-structured-session-state'
+import { readClaudeFrameString } from './claude-structured-init-proof'
+import { claudeDispatchContentKey } from './claude-structured-dispatch-content'
+
+/** Settles a provider-proven late outcome; replay rows independently reconcile acceptance. */
+export type ClaudeLateDispatchSettlement = (input: ClaudeLateDispatchOutcome) => void
+
+export type ClaudeReplayTurnOrigin = { requestedAt: number | null }
+
+export function resolveClaudeReplayTurn(
+  session: ClaudeSession,
+  message: Record<string, unknown>,
+  onSettledLate?: ClaudeLateDispatchSettlement
+): ClaudeReplayTurnOrigin | null {
+  const envelope = readClaudeMessageEnvelope(message)
+  const isUserReplay =
+    envelope?.role === 'user' &&
+    message.parent_tool_use_id === null &&
+    claudeHasReplayContent(envelope)
+  const isCompletedCommand = message.type === 'result'
+  if (
+    (!isUserReplay && !isCompletedCommand) ||
+    readClaudeFrameString(message, 'session_id') !== session.providerSessionId
+  ) {
+    return null
+  }
+  const uuid = readClaudeFrameString(message, 'uuid')
+  if (!uuid) {
+    return null
+  }
+
+  // Newer SDK frames carry the client uuid that caused a turn. A correlation
+  // value is authoritative: never fall back to queue order or content, since
+  // identical prompts may be in flight across a timeout boundary.
+  const userMessageUuid = readClaudeFrameString(message, 'user_message_uuid')
+  // A folded turn's result names every send it ran under `user_message_uuids`.
+  // Each member settles its own waiter under its own uuid — the result frame's
+  // uuid is never adopted as a shared alias for multiple submissions.
+  const resultUserMessageUuids = isCompletedCommand ? claudeResultUserMessageUuids(message) : []
+  for (const member of resultUserMessageUuids) {
+    if (member === userMessageUuid) {
+      continue
+    }
+    const live = session.dispatchWaiters.find((candidate) => candidate.sentUuid === member)
+    if (live) {
+      settleWaiter(session, live, member, onSettledLate)
+      continue
+    }
+    const late = session.retiredDispatchWaiters.find((candidate) => candidate.sentUuid === member)
+    if (late) {
+      forgetRetiredWaiter(session, late)
+      recoverLateIdentity(session, late, member, false, onSettledLate)
+    }
+  }
+  if (userMessageUuid) {
+    const exact = session.dispatchWaiters.find(
+      (candidate) => candidate.sentUuid === userMessageUuid
+    )
+    if (exact) {
+      const foldReceipt = isUserReplay && claudeReplayIsFoldReceipt(session, exact, uuid)
+      settleWaiter(session, exact, uuid, onSettledLate)
+      return isUserReplay && !foldReceipt ? { requestedAt: exact.requestedAt } : null
+    }
+    const retired = session.retiredDispatchWaiters.find(
+      (candidate) => candidate.sentUuid === userMessageUuid
+    )
+    if (retired) {
+      forgetRetiredWaiter(session, retired)
+      recoverLateIdentity(session, retired, uuid, isUserReplay, onSettledLate)
+      return null
+    }
+    return null
+  }
+  if (resultUserMessageUuids.length > 0) {
+    // The plural list is this result's complete correlation; queue order must
+    // not join anyone it did not name.
+    return null
+  }
+
+  const exact = session.dispatchWaiters.find((candidate) => candidate.sentUuid === uuid)
+  if (exact) {
+    const foldReceipt = isUserReplay && claudeReplayIsFoldReceipt(session, exact, uuid)
+    settleWaiter(session, exact, uuid, onSettledLate)
+    return isUserReplay && !foldReceipt ? { requestedAt: exact.requestedAt } : null
+  }
+  const retired = session.retiredDispatchWaiters.find((candidate) => candidate.sentUuid === uuid)
+  if (retired) {
+    forgetRetiredWaiter(session, retired)
+    recoverLateIdentity(session, retired, uuid, isUserReplay, onSettledLate)
+    return null
+  }
+
+  if (isUserReplay) {
+    // Compatibility CLIs may mint a new replay uuid instead of echoing the
+    // client uuid. Content is an acceptable join only when it is the sole
+    // candidate on one side of the timeout boundary; with active and retired
+    // candidates present, identical prompts are intentionally left unknown.
+    const replayContentKey = claudeDispatchContentKey(envelope.content)
+    if (!session.replayContentFallbackBlocked && session.retiredDispatchWaiters.length === 0) {
+      const compatible = session.dispatchWaiters.filter(
+        (candidate) => candidate.replayContentKey === replayContentKey
+      )
+      if (compatible.length === 1) {
+        const [candidate] = compatible
+        settleWaiter(session, candidate!, uuid, onSettledLate)
+        return { requestedAt: candidate!.requestedAt }
+      }
+    } else if (!session.replayContentFallbackBlocked && session.dispatchWaiters.length === 0) {
+      const lateCompatible = session.retiredDispatchWaiters.filter(
+        (candidate) => candidate.replayContentKey === replayContentKey
+      )
+      if (lateCompatible.length === 1) {
+        const [candidate] = lateCompatible
+        forgetRetiredWaiter(session, candidate!)
+        recoverLateIdentity(session, candidate!, uuid, true, onSettledLate)
+        return null
+      }
+    }
+    return null
+  }
+  const current = session.dispatchWaiters[0]
+  if (isCompletedCommand && !current?.acceptsResult) {
+    return null
+  }
+  // A legacy result has no dispatch correlation. Any retired waiter makes queue order ambiguous,
+  // even when the retired dispatch was an ordinary turn rather than a slash command.
+  if (isCompletedCommand && session.retiredDispatchWaiters.length > 0) {
+    return null
+  }
+  // Once an eviction occurred, a fresh result uuid cannot be joined to a waiter by queue order.
+  if (isCompletedCommand && session.replayContentFallbackBlocked) {
+    return null
+  }
+  const waiter = uuid ? session.dispatchWaiters.shift() : undefined
+  if (waiter && uuid) {
+    settleWaiter(session, waiter, uuid, onSettledLate)
+    return isUserReplay ? { requestedAt: waiter.requestedAt } : null
+  }
+  return null
+}
+
+/** The provider's own cycle state decides a fold: the CLI folds a send into the
+ *  request cycle that is running when the send arrives, and it replays a folded
+ *  send mid-cycle with the client uuid ADOPTED (measured: fold-fresh/-resumed,
+ *  two-steers, early-steer). So an adopted replay after the running cycle has
+ *  done work is a delivery receipt, not a turn boundary; a cycle's first send is
+ *  its opener. Adoption is the capability check, read off the frame itself: a
+ *  CLI that mints fresh replay uuids never qualifies. A new cycle announces
+ *  itself with a root init (per-turn, measured), so a lost result cannot leave a
+ *  stale turn swallowing the next turn's replay. */
+function claudeReplayIsFoldReceipt(
+  session: ClaudeSession,
+  waiter: ClaudeDispatchWaiter,
+  replayUuid: string
+): boolean {
+  return replayUuid === waiter.sentUuid && session.translator?.openTurnInLiveProviderCycle === true
+}
+
+function claudeResultUserMessageUuids(message: Record<string, unknown>): string[] {
+  const uuids = message.user_message_uuids
+  return Array.isArray(uuids)
+    ? uuids.filter((member): member is string => typeof member === 'string' && member.length > 0)
+    : []
+}
+
+function settleWaiter(
+  session: ClaudeSession,
+  waiter: ClaudeDispatchWaiter,
+  uuid: string,
+  onSettledLate?: ClaudeLateDispatchSettlement
+): void {
+  const index = session.dispatchWaiters.indexOf(waiter)
+  if (index !== -1) {
+    session.dispatchWaiters.splice(index, 1)
+  }
+  waiter.settledUuid = uuid
+  waiter.resolve(uuid)
+  // Dispatch returned on admission, so the replay is what settles delivery.
+  if (waiter.clientMessageId) {
+    onSettledLate?.({
+      clientMessageId: waiter.clientMessageId,
+      providerIdentity: { provider: 'claude', sessionId: session.providerSessionId, uuid }
+    })
+  }
+}
+
+function recoverLateIdentity(
+  session: ClaudeSession,
+  waiter: ClaudeDispatchWaiter,
+  uuid: string,
+  isUserReplay: boolean,
+  onSettledLate?: ClaudeLateDispatchSettlement
+): void {
+  if (!isUserReplay && !waiter.acceptsResult) {
+    return
+  }
+  // The provider acted on this dispatch, so the send it came from is delivered.
+  // A retired replay settles delivery only; it cannot reopen a turn.
+  if (waiter.clientMessageId) {
+    onSettledLate?.({
+      clientMessageId: waiter.clientMessageId,
+      providerIdentity: { provider: 'claude', sessionId: session.providerSessionId, uuid }
+    })
+  }
+}
diff --git a/src/main/claude/claude-session-end-hook-capability.test.ts b/src/main/claude/claude-session-end-hook-capability.test.ts
deleted file mode 100644
index 755cdcbe4987..000000000000
--- a/src/main/claude/claude-session-end-hook-capability.test.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  CLAUDE_SESSION_END_CAPABILITY_FLOOR,
-  claudeVersionSupportsSessionEnd,
-  parseClaudeCliVersion
-} from './claude-session-end-hook-capability'
-
-describe('Claude SessionEnd hook version capability', () => {
-  it('records 2.1.261 as the measured floor', () => {
-    expect(CLAUDE_SESSION_END_CAPABILITY_FLOOR).toBe('2.1.261')
-  })
-
-  it('extracts Claude Code version output', () => {
-    expect(parseClaudeCliVersion('2.1.261 (Claude Code)')).toBe('2.1.261')
-  })
-
-  it.each([
-    ['2.1.260', false],
-    ['2.1.261', true],
-    ['2.2.0', true],
-    ['unknown', false],
-    [undefined, false]
-  ])('classifies %s as SessionEnd-capable: %s', (version, expected) => {
-    expect(claudeVersionSupportsSessionEnd(version)).toBe(expected)
-  })
-})
diff --git a/src/main/claude/claude-session-end-hook-capability.ts b/src/main/claude/claude-session-end-hook-capability.ts
deleted file mode 100644
index 1587c154e7bd..000000000000
--- a/src/main/claude/claude-session-end-hook-capability.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { hasReachedAppVersion, isValidAppVersion } from '../../shared/app-version'
-import { runProcess } from '../../shared/child-process/run-process'
-import path from 'node:path'
-
-// 2.1.261 is the only version measured, not an established minimum.
-export const CLAUDE_SESSION_END_CAPABILITY_FLOOR = '2.1.261'
-
-export function parseClaudeCliVersion(output: string | null | undefined): string | null {
-  const version = output?.match(/\b\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?\b/)?.[0]
-  return version && isValidAppVersion(version) ? version : null
-}
-
-export function claudeVersionSupportsSessionEnd(version: string | null | undefined): boolean {
-  const parsed = parseClaudeCliVersion(version)
-  return parsed !== null && hasReachedAppVersion(parsed, CLAUDE_SESSION_END_CAPABILITY_FLOOR)
-}
-
-export async function probeClaudeCliVersion(executablePath: string): Promise<string | null> {
-  try {
-    const pathKey = process.platform === 'win32' && process.env.Path !== undefined ? 'Path' : 'PATH'
-    const executableDir = path.dirname(executablePath)
-    const inheritedPath = process.env[pathKey]
-    const result = await runProcess({
-      program: executablePath,
-      args: ['--version'],
-      // Why: version-manager launchers often use `#!/usr/bin/env node`; the resolved CLI's sibling
-      // runtime must remain reachable even when Electron started with a thinner PATH.
-      env: {
-        ...process.env,
-        [pathKey]: inheritedPath
-          ? `${executableDir}${path.delimiter}${inheritedPath}`
-          : executableDir
-      },
-      timeoutMs: 5_000,
-      maxOutputBytes: 4_096
-    })
-    return result.code === 0 ? parseClaudeCliVersion(`${result.stdout}\n${result.stderr}`) : null
-  } catch {
-    return null
-  }
-}
diff --git a/src/main/claude/claude-session-end-install.test.ts b/src/main/claude/claude-session-end-install.test.ts
deleted file mode 100644
index 46f374ca7aef..000000000000
--- a/src/main/claude/claude-session-end-install.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { applyManagedHooks } from './hook-settings'
-
-const SCRIPT_FILE_NAME = 'claude-hook.sh'
-const MANAGED_COMMAND = '/home/dev/.orca/agent-hooks/claude-hook.sh'
-const managedHook = { type: 'command' as const, command: MANAGED_COMMAND }
-
-describe('Claude SessionEnd managed hook capability', () => {
-  it('installs SessionEnd beside SessionStart for the measured capable version', () => {
-    const written = applyManagedHooks({ hooks: {} }, managedHook, SCRIPT_FILE_NAME, {
-      claudeVersion: '2.1.261 (Claude Code)'
-    })
-
-    expect(written.hooks?.SessionEnd?.[0]?.hooks?.[0]?.command).toBe(MANAGED_COMMAND)
-    expect(written.hooks?.SessionStart?.[0]?.hooks?.[0]?.command).toBe(MANAGED_COMMAND)
-  })
-
-  it.each(['2.1.260', 'unknown', undefined])(
-    'retains the legacy event set for an incapable or unverified host (%s)',
-    (claudeVersion) => {
-      const written = applyManagedHooks({ hooks: {} }, managedHook, SCRIPT_FILE_NAME, {
-        claudeVersion
-      })
-
-      expect(written.hooks?.SessionEnd).toBeUndefined()
-      expect(written.hooks?.SessionStart).toBeDefined()
-    }
-  )
-
-  it('removes only Orca SessionEnd during a capability downgrade', () => {
-    const capable = applyManagedHooks(
-      {
-        hooks: {
-          SessionEnd: [{ hooks: [{ type: 'command', command: 'echo user-session-end' }] }]
-        }
-      },
-      managedHook,
-      SCRIPT_FILE_NAME,
-      { claudeVersion: '2.1.261' }
-    )
-    const downgraded = applyManagedHooks(capable, managedHook, SCRIPT_FILE_NAME, {
-      claudeVersion: '2.1.260'
-    })
-
-    expect(downgraded.hooks?.SessionEnd).toEqual([
-      { hooks: [{ type: 'command', command: 'echo user-session-end' }] }
-    ])
-  })
-})
diff --git a/src/main/claude/claude-settings-schema-install.test.ts b/src/main/claude/claude-settings-schema-install.test.ts
new file mode 100644
index 000000000000..577e455b6a34
--- /dev/null
+++ b/src/main/claude/claude-settings-schema-install.test.ts
@@ -0,0 +1,59 @@
+import { mkdtempSync, readFileSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import fixture from './__fixtures__/claude-hook-event-enums.json'
+
+vi.mock('electron', () => ({
+  app: {
+    getPath: () => '/tmp/userData'
+  }
+}))
+
+import { ClaudeHookService } from './hook-service'
+
+const enums: Record<string, string[]> = fixture.enums
+const topLevelSettings: Record<string, { strict: boolean; keys: string[] }> =
+  fixture.topLevelSettings
+const strictReleases = Object.keys(topLevelSettings).filter(
+  (version) => topLevelSettings[version].strict
+)
+
+// Why: checks the whole written file, so any new key Orca writes must pass each strict schema.
+describe('Claude settings written for a strict settings schema', () => {
+  let tmpHome: string
+  let settingsPath: string
+
+  beforeEach(() => {
+    tmpHome = mkdtempSync(join(tmpdir(), 'orca-claude-settings-schema-'))
+    settingsPath = join(tmpHome, '.claude', 'settings.json')
+    vi.stubEnv('HOME', tmpHome)
+    vi.stubEnv('USERPROFILE', tmpHome)
+  })
+
+  afterEach(() => {
+    vi.unstubAllEnvs()
+    rmSync(tmpHome, { recursive: true, force: true })
+  })
+
+  function expectAcceptedBy(version: string): void {
+    const written = JSON.parse(readFileSync(settingsPath, 'utf-8'))
+    const { keys } = topLevelSettings[version]
+    expect(Object.keys(written).filter((key) => !keys.includes(key))).toEqual([])
+    expect(
+      Object.keys(written.hooks ?? {}).filter((event) => !enums[version].includes(event))
+    ).toEqual([])
+  }
+
+  it.each(strictReleases)('a fresh install writes only what Claude %s accepts', (version) => {
+    new ClaudeHookService().install({ claudeVersion: version })
+    expectAcceptedBy(version)
+  })
+
+  it.each(strictReleases)('a downgrade to Claude %s leaves only what it accepts', (version) => {
+    const service = new ClaudeHookService()
+    service.install({ claudeVersion: '2.1.261' })
+    service.install({ claudeVersion: version })
+    expectAcceptedBy(version)
+  })
+})
diff --git a/src/main/claude/claude-status-line-install.test.ts b/src/main/claude/claude-status-line-install.test.ts
new file mode 100644
index 000000000000..3c7c9c6f83c7
--- /dev/null
+++ b/src/main/claude/claude-status-line-install.test.ts
@@ -0,0 +1,75 @@
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('electron', () => ({
+  app: {
+    getPath: () => '/tmp/userData'
+  }
+}))
+
+import { ClaudeHookService } from './hook-service'
+
+const USER_STATUS_LINE = { type: 'command', command: '/usr/local/bin/my-statusline' }
+
+describe('Claude statusLine by resolved version', () => {
+  let tmpHome: string
+  let settingsPath: string
+
+  beforeEach(() => {
+    tmpHome = mkdtempSync(join(tmpdir(), 'orca-claude-statusline-version-'))
+    settingsPath = join(tmpHome, '.claude', 'settings.json')
+    vi.stubEnv('HOME', tmpHome)
+    vi.stubEnv('USERPROFILE', tmpHome)
+  })
+
+  afterEach(() => {
+    vi.unstubAllEnvs()
+    rmSync(tmpHome, { recursive: true, force: true })
+  })
+
+  const readSettings = () => JSON.parse(readFileSync(settingsPath, 'utf-8'))
+
+  it('writes no statusLine for a Claude whose settings schema rejects it', () => {
+    new ClaudeHookService().install({ claudeVersion: '1.0.63' })
+    expect(readSettings().statusLine).toBeUndefined()
+    expect(readSettings().hooks.SessionStart).toBeDefined()
+  })
+
+  it('removes Orca statusLine on a downgrade and re-adds it after the upgrade', () => {
+    const service = new ClaudeHookService()
+    service.install({ claudeVersion: '2.1.261' })
+    expect(readSettings().statusLine?.command).toContain('claude-statusline')
+
+    service.install({ claudeVersion: '1.0.63' })
+    expect(readSettings().statusLine).toBeUndefined()
+
+    // Why: Orca's own removal must not read as the user's opt-out on the next capable install.
+    service.install({ claudeVersion: '1.0.64' })
+    expect(readSettings().statusLine?.command).toContain('claude-statusline')
+  })
+
+  it('keeps the user opt-out across a downgrade and upgrade', () => {
+    const service = new ClaudeHookService()
+    service.install({ claudeVersion: '2.1.261' })
+    const { statusLine: _optedOut, ...rest } = readSettings()
+    writeFileSync(settingsPath, JSON.stringify(rest))
+
+    service.install({ claudeVersion: '1.0.63' })
+    service.install({ claudeVersion: '2.1.261' })
+    expect(readSettings().statusLine).toBeUndefined()
+  })
+
+  it('never removes a user statusLine for an old Claude', () => {
+    mkdirSync(join(tmpHome, '.claude'), { recursive: true })
+    writeFileSync(settingsPath, JSON.stringify({ statusLine: USER_STATUS_LINE }))
+    new ClaudeHookService().install({ claudeVersion: '1.0.63' })
+    expect(readSettings().statusLine).toEqual(USER_STATUS_LINE)
+  })
+
+  it('keeps installing the statusLine when the version is unresolved', () => {
+    new ClaudeHookService().install()
+    expect(readSettings().statusLine?.command).toContain('claude-statusline')
+  })
+})
diff --git a/src/main/claude/claude-stream-json-connection.test.ts b/src/main/claude/claude-stream-json-connection.test.ts
index 51ffa085163d..e3682f033064 100644
--- a/src/main/claude/claude-stream-json-connection.test.ts
+++ b/src/main/claude/claude-stream-json-connection.test.ts
@@ -2,6 +2,7 @@ import { execFileSync } from 'node:child_process'
 import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { providerDiagnosticOf } from '../../shared/agent-session-failure'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { spawnProcess, type SpawnedProcess } from '../../shared/child-process/run-process'
 import { hasLiveClaudePtys } from '../claude-accounts/live-pty-gate'
@@ -106,6 +107,18 @@ async function open(
   return connection
 }
 
+function launchedArgv(spec: ProcessSpec | undefined): string[] {
+  const supervised = spec?.env?.ORCA_PROVIDER_SUPERVISOR_SPEC
+  if (!supervised) {
+    return [spec?.program ?? '', ...(spec?.args ?? [])]
+  }
+  const launch: unknown = JSON.parse(Buffer.from(supervised, 'base64').toString())
+  if (!launch || typeof launch !== 'object' || !('command' in launch) || !('args' in launch)) {
+    return []
+  }
+  return [String(launch.command), ...(Array.isArray(launch.args) ? launch.args.map(String) : [])]
+}
+
 function childEnv(): Record<string, string | undefined> {
   return (spawned.at(-1)?.env ?? {}) as Record<string, string | undefined>
 }
@@ -163,9 +176,12 @@ describe('Claude stream-json connection', () => {
     // An inherited value wins over the SDK's default, so clear it to pin the default.
     vi.stubEnv('CLAUDE_CODE_ENTRYPOINT', undefined)
     vi.stubEnv('ORCA_CONNECTION_MARKER', 'inherited')
+    // An Orca launched inside another structured session inherits that session's id.
+    vi.stubEnv('ORCA_AGENT_SESSION_ID', 'a0b1c2d3-0000-4000-8000-00000000abcd')
     const scenario = scriptScenario([HOLD_OPEN])
     const connection = await open(
       launchFor(scenario, {
+        ORCA_AGENT_SESSION_ID: 'f7a1c0de-1111-4222-8333-444455556666',
         CLAUDE_CONFIG_DIR: '/accounts/managed/home',
         ANTHROPIC_AUTH_TOKEN: 'configured-token',
         ORCA_AGENT_SESSION_SPAWN_TOKEN: 'spawn-9',
@@ -184,6 +200,8 @@ describe('Claude stream-json connection', () => {
     expect(env.ANTHROPIC_AUTH_TOKEN).toBe('configured-token')
     expect(env.ORCA_AGENT_SESSION_SPAWN_TOKEN).toBe('spawn-9')
     expect(env.ORCA_CONNECTION_MARKER).toBe('inherited')
+    // The session's own id reaches the spawned child over the inherited one.
+    expect(env.ORCA_AGENT_SESSION_ID).toBe('f7a1c0de-1111-4222-8333-444455556666')
     expect(env.ANTHROPIC_API_KEY).toBeUndefined()
     expect(env.CLAUDE_CODE_CHILD_SESSION).toBeUndefined()
     expect(env.CLAUDE_CODE_SESSION_ID).toBeUndefined()
@@ -195,8 +213,9 @@ describe('Claude stream-json connection', () => {
     const report = await until(() => readReportSafely(scenario), 'the scripted CLI report')
     expect(report.argv[0]).toBe(FAKE_CLI)
     // The .mjs fixture makes the SDK run it under node; a real CLI path is the program
-    // itself. Either way the resolved path is what Orca's spawner is asked to execute.
-    expect([spawned.at(-1)?.program, ...(spawned.at(-1)?.args ?? [])]).toContain(FAKE_CLI)
+    // itself. Either way the resolved path is what Orca's spawner is asked to execute,
+    // through the POSIX supervisor's spec where there is one.
+    expect(launchedArgv(spawned.at(-1))).toContain(FAKE_CLI)
     expect(report.argv).toContain('--replay-user-messages')
     expect(report.argv).toContain(`--session-id=${SESSION_ID}`)
   })
@@ -592,6 +611,11 @@ describe('Claude stream-json connection', () => {
     await until(() => exit, 'the exit error')
     // The status and stderr are the only diagnostic a refused start leaves behind.
     expect((exit as unknown as Error).message).toMatch(/exited \(code 1\): claude: not signed in/)
+    // Kept apart from Orca's wording where it is composed, and marked as log text.
+    expect(providerDiagnosticOf(exit)).toEqual({
+      text: expect.stringMatching(/^\(code 1\)\n.*claude: not signed in/s),
+      audience: 'log'
+    })
     expect(connection.closed).toBe(true)
     // Stderr-triggered capture can win or lose the race with this real child's exit.
     const closed = await connection.close()
@@ -636,37 +660,63 @@ describe('Claude stream-json connection', () => {
     20_000
   )
 
-  it('settles a spawn error followed by close as processless and closes idempotently', async () => {
-    const scenario = scriptScenario([HOLD_OPEN])
-    const missingCli = join(scenario.cwd, 'claude-that-does-not-exist')
-    let fault: Error | null = null
-    let exit: Error | null = null
-    const connection = await open(
-      { ...launchFor(scenario), pathToClaudeCodeExecutable: missingCli },
-      {
-        onFault: (error) => {
-          fault = error
-        },
-        onExit: (error) => {
-          exit = error
+  it.skipIf(process.platform === 'win32')(
+    'reports a missing CLI under the supervisor as a root exit that names the spawn error',
+    async () => {
+      const scenario = scriptScenario([HOLD_OPEN])
+      const missingCli = join(scenario.cwd, 'claude-that-does-not-exist')
+      let exit: Error | null = null
+      const connection = await open(
+        { ...launchFor(scenario), pathToClaudeCodeExecutable: missingCli },
+        {
+          onExit: (error) => {
+            exit = error
+          }
         }
-      }
-    )
+      )
 
-    await until(
-      () => (connection.exitVerdict.root === 'processless' ? connection.exitVerdict : null),
-      'the processless spawn settlement'
-    )
-    expect(connection.pid).toBeUndefined()
-    expect(fault).toBeInstanceOf(Error)
-    expect(exit).toBeNull()
-    await expect(Promise.all([connection.close(), connection.close()])).resolves.toEqual([
-      true,
-      true
-    ])
-    await expect(connection.close()).resolves.toBe(true)
-    expect(connection.exitVerdict).toEqual({ root: 'processless', tree: 'exited' })
-  })
+      const reported = await until(() => exit, 'the supervised spawn failure')
+      // The supervisor spawned, so this is its exit; only its stderr can say why.
+      expect(reported.message).toMatch(/\(code 127\).*ENOENT/s)
+      // A first-hand root exit, which releases the lease like a processless start did.
+      expect(connection.exitVerdict.root).toBe('exited')
+    }
+  )
+
+  it.skipIf(process.platform !== 'win32')(
+    'settles a spawn error followed by close as processless and closes idempotently',
+    async () => {
+      const scenario = scriptScenario([HOLD_OPEN])
+      const missingCli = join(scenario.cwd, 'claude-that-does-not-exist')
+      let fault: Error | null = null
+      let exit: Error | null = null
+      const connection = await open(
+        { ...launchFor(scenario), pathToClaudeCodeExecutable: missingCli },
+        {
+          onFault: (error) => {
+            fault = error
+          },
+          onExit: (error) => {
+            exit = error
+          }
+        }
+      )
+
+      await until(
+        () => (connection.exitVerdict.root === 'processless' ? connection.exitVerdict : null),
+        'the processless spawn settlement'
+      )
+      expect(connection.pid).toBeUndefined()
+      expect(fault).toBeInstanceOf(Error)
+      expect(exit).toBeNull()
+      await expect(Promise.all([connection.close(), connection.close()])).resolves.toEqual([
+        true,
+        true
+      ])
+      await expect(connection.close()).resolves.toBe(true)
+      expect(connection.exitVerdict).toEqual({ root: 'processless', tree: 'exited' })
+    }
+  )
 
   it('does not treat a child error event as first-hand root exit proof', async () => {
     const scenario = scriptScenario([HOLD_OPEN])
diff --git a/src/main/claude/claude-stream-json-connection.ts b/src/main/claude/claude-stream-json-connection.ts
index c6da4419f79d..6f67e04b36ea 100644
--- a/src/main/claude/claude-stream-json-connection.ts
+++ b/src/main/claude/claude-stream-json-connection.ts
@@ -1,4 +1,5 @@
 import { randomUUID } from 'node:crypto'
+import { providerDiagnostic, withProviderDiagnostic } from '../../shared/agent-session-failure'
 import type * as ClaudeAgentSdk from '@anthropic-ai/claude-agent-sdk'
 import type { CanUseTool, OnUserDialog, SDKUserMessage } from '@anthropic-ai/claude-agent-sdk'
 import { spawnProcess } from '../../shared/child-process/run-process'
@@ -103,7 +104,12 @@ function exitError(stderrTail: string, status: ExitStatus | null, cause?: Error)
         ? ` (code ${status.code})`
         : ''
   const message = `claude stream-json exited${how}${detail ? `: ${detail}` : ''}`
-  return cause ? new Error(message, { cause }) : new Error(message)
+  // Written for a log, not a person: the chat keeps it behind Details.
+  const diagnostic = providerDiagnostic([how.trim(), detail].filter(Boolean).join('\n'), 'log')
+  return withProviderDiagnostic(
+    cause ? new Error(message, { cause }) : new Error(message),
+    diagnostic
+  )
 }
 
 export async function openClaudeStreamJsonConnection(
@@ -303,15 +309,16 @@ export async function openClaudeStreamJsonConnection(
     closePromise ??= (async () => {
       closing = true
       resumeReading()
-      // Arm the descendant proof before ending stdin. The SDK may exit the root
-      // immediately; a post-exit walk cannot recover descendants that reparented.
+      // Arm the descendant proof before the stop. The root may exit immediately;
+      // a post-exit walk cannot recover descendants that reparented.
       await (tree.refresh?.() ?? tree.capture())
       inbox.end()
       const proven = await proveClaudeChildExit({
         child,
         exitPromise,
         exited: rootSettled,
-        tree
+        tree,
+        supervised: spawner.supervised
       })
       inbox.fail(new Error('claude stream-json connection closed'))
       if (!proven) {
diff --git a/src/main/claude/claude-structured-auth-parity.test.ts b/src/main/claude/claude-structured-auth-parity.test.ts
index ddc69366aadb..002240e4dd77 100644
--- a/src/main/claude/claude-structured-auth-parity.test.ts
+++ b/src/main/claude/claude-structured-auth-parity.test.ts
@@ -105,7 +105,10 @@ describe('claude structured auth parity with the terminal preflight', () => {
       resolverFor({ stripAuthEnv: true, overlay: { ANTHROPIC_API_KEY: 'sk-ant-CONFIGURED' } })({
         identity: IDENTITY
       })
-    ).rejects.toThrow(CLAUDE_AUTH_ENV_CONFLICT_MESSAGE)
+    ).rejects.toMatchObject({
+      message: CLAUDE_AUTH_ENV_CONFLICT_MESSAGE,
+      reason: 'managedAccountEnvOverride'
+    })
   })
 
   it('refuses an auth-like ANTHROPIC_CUSTOM_HEADERS override while a managed account is pinned', async () => {
@@ -114,7 +117,10 @@ describe('claude structured auth parity with the terminal preflight', () => {
         stripAuthEnv: true,
         overlay: { ANTHROPIC_CUSTOM_HEADERS: 'Authorization: Bearer sk-ant-CONFIGURED' }
       })({ identity: IDENTITY })
-    ).rejects.toThrow(CLAUDE_AUTH_ENV_CONFLICT_MESSAGE)
+    ).rejects.toMatchObject({
+      message: CLAUDE_AUTH_ENV_CONFLICT_MESSAGE,
+      reason: 'managedAccountEnvOverride'
+    })
   })
 
   it('still admits a non-auth env overlay under a managed account', async () => {
@@ -161,7 +167,10 @@ describe('claude structured auth parity with the terminal preflight', () => {
 
     await expect(
       resolverFor({ stripAuthEnv: true, authSwitchSettleTimeoutMs: 20 })({ identity: IDENTITY })
-    ).rejects.toThrow(CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE)
+    ).rejects.toMatchObject({
+      message: CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE,
+      reason: 'accountSwitchInProgress'
+    })
   })
 
   it('waits a settling account switch out rather than refusing a resolved launch', async () => {
@@ -183,7 +192,10 @@ describe('claude structured auth parity with the terminal preflight', () => {
 
     await expect(
       adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9' })
-    ).rejects.toThrow(CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE)
+    ).rejects.toMatchObject({
+      message: CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE,
+      reason: 'accountSwitchInProgress'
+    })
     // Nothing was spawned, so the refusal must not have opened a connection.
     expect(claude.connections).toHaveLength(0)
   })
@@ -227,7 +239,10 @@ describe('claude structured auth parity with the terminal preflight', () => {
 
     await expect(
       adapter.acquire({ identity: identityFor(), fence: 8, spawnToken: 'spawn-10' })
-    ).rejects.toThrow(CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE)
+    ).rejects.toMatchObject({
+      message: CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE,
+      reason: 'accountSwitchInProgress'
+    })
     // No replacement child was opened, so nothing is left running unowned.
     expect(claude.connections).toHaveLength(1)
     await adapter.closeAll()
diff --git a/src/main/claude/claude-structured-compaction.test.ts b/src/main/claude/claude-structured-compaction.test.ts
index 5255ce37ea14..70aabc5ae506 100644
--- a/src/main/claude/claude-structured-compaction.test.ts
+++ b/src/main/claude/claude-structured-compaction.test.ts
@@ -22,7 +22,7 @@ describe('Claude compaction transcript content', () => {
       }
     }
     expect(isClaudeCompactionContent(tracker, event)).toBe(false)
-    const completion = tracker.run('orca-session', 'provider', async () => ({}))
+    const completion = tracker.run('orca-session', 'provider', async () => undefined)
     expect(isClaudeCompactionContent(tracker, event)).toBe(true)
     expect(isClaudeCompactionContent(tracker, { ...event, sessionId: 'other' })).toBe(false)
     expect(isClaudeCompactionContent(tracker, { ...event, message: { type: 'result' } })).toBe(
@@ -46,7 +46,7 @@ describe('Claude compaction transcript content', () => {
 
     await vi.advanceTimersByTimeAsync(1)
 
-    await expect(pending).resolves.toEqual({ error: 'provider_write_failed: input closed' })
+    await expect(pending).resolves.toEqual({ outcome: 'failed' })
   })
 
   it('keeps waiting when the command write outcome is ambiguous', async () => {
diff --git a/src/main/claude/claude-structured-compaction.ts b/src/main/claude/claude-structured-compaction.ts
index 6c3155739c2f..5b1f67e2e118 100644
--- a/src/main/claude/claude-structured-compaction.ts
+++ b/src/main/claude/claude-structured-compaction.ts
@@ -1,5 +1,8 @@
 import type { ClaudeSession, ClaudeStructuredSessionEvent } from './claude-structured-session-state'
-import type { StructuredSessionCompaction } from '../native-chat/agent-session-wire/structured-session-compaction'
+import type {
+  StructuredSessionCompaction,
+  StructuredSessionCompactionResult
+} from '../native-chat/agent-session-wire/structured-session-compaction'
 import { dispatchClaudeTurn } from './claude-structured-dispatch'
 import type { StructuredAgentSessionAdapter } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
 /** Compaction needs no ack deadline of its own: `compactions.run` keeps its own
@@ -9,7 +12,7 @@ export function compactClaudeSession(
   session: ClaudeSession,
   compactions: StructuredSessionCompaction,
   input: Parameters<NonNullable<StructuredAgentSessionAdapter['compact']>>[0]
-): Promise<{ error?: string }> {
+): Promise<StructuredSessionCompactionResult> {
   return compactions.run(
     input.sessionId,
     session.providerSessionId,
@@ -18,7 +21,7 @@ export function compactClaudeSession(
         body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: '/compact' }] }
       })
       if (result.state === 'rejected') {
-        return { error: result.reason }
+        return { outcome: 'failed' as const }
       }
       return undefined
     },
diff --git a/src/main/claude/claude-structured-control-actions.test.ts b/src/main/claude/claude-structured-control-actions.test.ts
index a04273ac1261..7f197788b680 100644
--- a/src/main/claude/claude-structured-control-actions.test.ts
+++ b/src/main/claude/claude-structured-control-actions.test.ts
@@ -16,7 +16,7 @@ type InterruptResult = Awaited<ReturnType<ClaudeSession['connection']['interrupt
 function sessionWith(input: {
   capabilities?: string[]
   interrupt: (options?: { cancelQueued?: boolean; timeoutMs?: number }) => Promise<InterruptResult>
-  cancelAsyncMessage?: (uuid: string) => Promise<void>
+  cancelAsyncMessage?: (uuid: string) => Promise<boolean>
   prompts?: ClaudePromptRegistry
 }): {
   session: ClaudeSession
@@ -24,7 +24,7 @@ function sessionWith(input: {
   cancelAsyncMessage: ReturnType<typeof vi.fn>
 } {
   const interrupt = vi.fn(input.interrupt)
-  const cancelAsyncMessage = vi.fn(input.cancelAsyncMessage ?? (async () => {}))
+  const cancelAsyncMessage = vi.fn(input.cancelAsyncMessage ?? (async () => false))
   const session = sessionFor()
   session.capabilities = input.capabilities ?? []
   session.prompts = input.prompts ?? new ClaudePromptRegistry()
@@ -56,6 +56,53 @@ describe('cancelClaudeTurn', () => {
     expect(cancelAsyncMessage.mock.calls.map((call) => call[0])).toEqual(['queued-1', 'queued-2'])
   })
 
+  it('settles each still-queued send the CLI confirms it withdrew, and only those', async () => {
+    const { session, cancelAsyncMessage } = sessionWith({
+      capabilities: ['interrupt_receipt_v1'],
+      interrupt: async () => ({ still_queued: ['queued-1', 'queued-2', 'queued-3'] }),
+      // queued-2 already ran; queued-3's answer never arrived.
+      cancelAsyncMessage: async (uuid) => {
+        if (uuid === 'queued-3') {
+          throw new ClaudeControlRequestError('cancel_async_message', 'timed out')
+        }
+        return uuid === 'queued-1'
+      }
+    })
+    const resolutions = [vi.fn(), vi.fn(), vi.fn()]
+    session.dispatchWaiters = ['queued-1', 'queued-2', 'queued-3'].map(
+      (sentUuid, index): ClaudeDispatchWaiter => ({
+        acceptsResult: false,
+        clientMessageId: `client-${index + 1}`,
+        sentUuid,
+        dispatchSequence: index + 1,
+        requestedAt: null,
+        replayContentKey: `content-${index}`,
+        resolve: resolutions[index]!
+      })
+    )
+    const settled = vi.fn()
+
+    await expect(cancelClaudeTurn(session, 5_000, () => true, settled)).resolves.toEqual({
+      cancelled: true
+    })
+    expect(cancelAsyncMessage).toHaveBeenCalledTimes(3)
+    expect(settled.mock.calls).toEqual([
+      [
+        {
+          clientMessageId: 'client-1',
+          state: 'rejected',
+          reason: 'provider_cancelled_before_start',
+          rejection: { kind: 'cancelled' }
+        }
+      ]
+    ])
+    expect(resolutions[0]).toHaveBeenCalledWith(null)
+    expect(session.dispatchWaiters.map((waiter) => waiter.sentUuid)).toEqual([
+      'queued-2',
+      'queued-3'
+    ])
+  })
+
   it('settles every cancelled queued waiter when the CLI advertises the capability', async () => {
     const cancelled = Array.from({ length: 64 }, (_, index) => `queued-${index}`)
     const { session, interrupt, cancelAsyncMessage } = sessionWith({
@@ -85,7 +132,8 @@ describe('cancelClaudeTurn', () => {
     expect(settled).toHaveBeenNthCalledWith(1, {
       clientMessageId: 'client-0',
       state: 'rejected',
-      reason: 'provider_cancelled_before_start'
+      reason: 'provider_cancelled_before_start',
+      rejection: { kind: 'cancelled' }
     })
   })
 
@@ -118,7 +166,8 @@ describe('cancelClaudeTurn', () => {
     expect(settled).toHaveBeenCalledWith({
       clientMessageId: 'client-ambiguous',
       state: 'rejected',
-      reason: 'provider_cancelled_before_start'
+      reason: 'provider_cancelled_before_start',
+      rejection: { kind: 'cancelled' }
     })
   })
 
@@ -194,6 +243,7 @@ describe('answerClaudePrompt', () => {
     const resolvePrompt = vi.fn()
     session.translator = {
       handle: vi.fn(),
+      openTurnInLiveProviderCycle: false,
       journalPrompts: {
         cancel: vi.fn(() => ({ accepted: true as const })),
         resolve: resolvePrompt
diff --git a/src/main/claude/claude-structured-control-actions.ts b/src/main/claude/claude-structured-control-actions.ts
index 5e5906c4216c..8ec1aa2e9c41 100644
--- a/src/main/claude/claude-structured-control-actions.ts
+++ b/src/main/claude/claude-structured-control-actions.ts
@@ -1,10 +1,8 @@
 import type { PermissionResult } from '@anthropic-ai/claude-agent-sdk'
 import type { ClaudePromptClaim } from './claude-structured-prompt-replies'
 import { ClaudeControlRequestError } from './claude-stream-json-connection'
-import {
-  settleCancelledClaudeDispatchWaiters,
-  type ClaudeLateDispatchSettlement
-} from './claude-structured-dispatch'
+import { settleCancelledClaudeDispatchWaiters } from './claude-structured-dispatch'
+import type { ClaudeLateDispatchSettlement } from './claude-replay-turn-resolution'
 import type { ClaudeSession } from './claude-structured-session-state'
 
 const INTERRUPT_CANCEL_QUEUED_CAPABILITY = 'interrupt_cancel_queued_v1'
@@ -19,8 +17,9 @@ export type ClaudeTurnCancellationGuard = () => boolean
  * Interrupt the running turn, then make sure no queued async user message survives to spawn a
  * later unexpected turn. On a CLI advertising `interrupt_cancel_queued_v1` one round trip
  * cancels the queue alongside the abort; otherwise the interrupt receipt lists `still_queued`
- * uuids, and each is withdrawn best-effort with `cancel_async_message`. Older CLIs resolve no
- * receipt, so there is nothing to sweep.
+ * uuids, and each is withdrawn best-effort with `cancel_async_message`. Either way, every send
+ * the CLI confirms it withdrew settles as cancelled. Older CLIs resolve no receipt, so there is
+ * nothing to sweep.
  */
 export async function cancelClaudeTurn(
   session: ClaudeSession,
@@ -42,9 +41,13 @@ export async function cancelClaudeTurn(
     if (cancelQueued) {
       settleCancelledClaudeDispatchWaiters(session, receipt?.cancelled ?? [], onDispatchSettledLate)
     } else {
+      const withdrawn: string[] = []
       for (const uuid of receipt?.still_queued ?? []) {
-        await session.connection.cancelAsyncMessage(uuid, { timeoutMs }).catch(() => {})
+        if (await session.connection.cancelAsyncMessage(uuid, { timeoutMs }).catch(() => false)) {
+          withdrawn.push(uuid)
+        }
       }
+      settleCancelledClaudeDispatchWaiters(session, withdrawn, onDispatchSettledLate)
     }
     return { cancelled: true }
   } catch (error) {
diff --git a/src/main/claude/claude-structured-conversation-stop.test.ts b/src/main/claude/claude-structured-conversation-stop.test.ts
new file mode 100644
index 000000000000..840125853ba1
--- /dev/null
+++ b/src/main/claude/claude-structured-conversation-stop.test.ts
@@ -0,0 +1,101 @@
+// A Stop that names no turn, against the Claude adapter: the gap between writing a message and
+// Claude echoing it back is exactly where no turn id exists yet, and the interrupt must still land.
+
+import { describe, expect, it } from 'vitest'
+import { acquired, fakeClaude, USER_MESSAGE } from './claude-structured-session-test-support'
+
+function interrupts(claude: ReturnType<typeof fakeClaude>): number {
+  return claude.connections[0]!.calls.filter((call) => call.subtype === 'interrupt').length
+}
+
+async function written(claude: ReturnType<typeof fakeClaude>) {
+  const adapter = await acquired(claude)
+  // No replay: the message is written and Claude has not opened its turn.
+  await expect(
+    adapter.dispatch({
+      sessionId: 'session-1',
+      clientMessageId: 'client-1',
+      body: USER_MESSAGE,
+      fence: 7
+    })
+  ).resolves.toEqual({ state: 'admitted' })
+  return adapter
+}
+
+describe('Claude Stop that names no turn', () => {
+  it('interrupts a written message before its turn opens', async () => {
+    const claude = fakeClaude({ replayUuid: null })
+    const adapter = await written(claude)
+
+    await expect(adapter.cancelTurn({ sessionId: 'session-1', fence: 7 })).resolves.toEqual({
+      cancelled: true
+    })
+    expect(interrupts(claude)).toBe(1)
+  })
+
+  it('still refuses the placeholder a client used to name for that gap', async () => {
+    const claude = fakeClaude({ replayUuid: null })
+    const adapter = await written(claude)
+
+    await expect(
+      adapter.cancelTurn({ sessionId: 'session-1', turnId: 'turn-none', fence: 7 })
+    ).resolves.toEqual({ cancelled: false })
+    expect(interrupts(claude)).toBe(0)
+  })
+
+  it('interrupts a turn Claude opened on its own echo', async () => {
+    const claude = fakeClaude({ replayUuid: 'turn-T' })
+    const adapter = await written(claude)
+
+    await expect(adapter.cancelTurn({ sessionId: 'session-1', fence: 7 })).resolves.toEqual({
+      cancelled: true
+    })
+    expect(interrupts(claude)).toBe(1)
+  })
+
+  it('does nothing for another fence, or with nothing in flight', async () => {
+    const claude = fakeClaude({ replayUuid: null })
+    const adapter = await acquired(claude)
+
+    await expect(adapter.cancelTurn({ sessionId: 'session-1', fence: 7 })).resolves.toEqual({
+      cancelled: false
+    })
+    await adapter.dispatch({
+      sessionId: 'session-1',
+      clientMessageId: 'client-1',
+      body: USER_MESSAGE,
+      fence: 7
+    })
+    await expect(adapter.cancelTurn({ sessionId: 'session-1', fence: 6 })).resolves.toEqual({
+      cancelled: false
+    })
+    expect(interrupts(claude)).toBe(0)
+  })
+
+  it('ends a turn that opens while the interrupt is on its way once, and the next send lands', async () => {
+    const claude = fakeClaude({ replayUuid: null })
+    const adapter = await written(claude)
+    const connection = claude.connections[0]!
+    // The echo that opens the turn arrives after Orca wrote the interrupt, before Claude answers it.
+    claude.routes.interrupt = () => {
+      connection.handlers.onMessage?.({ ...connection.sent[0]!, uuid: 'turn-late' })
+      return undefined
+    }
+
+    await expect(adapter.cancelTurn({ sessionId: 'session-1', fence: 7 })).resolves.toEqual({
+      cancelled: true
+    })
+    expect(interrupts(claude)).toBe(1)
+
+    delete claude.routes.interrupt
+    await expect(
+      adapter.dispatch({
+        sessionId: 'session-1',
+        clientMessageId: 'client-2',
+        body: USER_MESSAGE,
+        fence: 7
+      })
+    ).resolves.toEqual({ state: 'admitted' })
+    expect(connection.sent).toHaveLength(2)
+  })
+})
diff --git a/src/main/claude/claude-structured-dispatch-admission.test.ts b/src/main/claude/claude-structured-dispatch-admission.test.ts
index 9a4d60a824cf..c4578ca38d8d 100644
--- a/src/main/claude/claude-structured-dispatch-admission.test.ts
+++ b/src/main/claude/claude-structured-dispatch-admission.test.ts
@@ -2,7 +2,8 @@
 // completes, and nothing about elapsed time ever puts a message in doubt.
 
 import { describe, expect, it, vi } from 'vitest'
-import { dispatchClaudeTurn, resolveClaudeReplayTurn } from './claude-structured-dispatch'
+import { dispatchClaudeTurn } from './claude-structured-dispatch'
+import { resolveClaudeReplayTurn } from './claude-replay-turn-resolution'
 import {
   childExited,
   sessionFor,
@@ -61,8 +62,9 @@ describe('Claude structured dispatch admission', () => {
         true
       )
 
-      // Queued while turn one is still running: Claude cannot echo it until that
-      // turn ends, so nothing about the wait is evidence of a delivery problem.
+      // Queued while turn one is still running: a fold is echoed mid-turn, a
+      // queued send only when its own turn starts — either way elapsed time is
+      // not evidence of a delivery problem.
       const queued = await dispatchClaudeTurn(session, {
         clientMessageId: 'client-2',
         body: userMessage([{ type: 'text', text: 'two' }])
@@ -139,7 +141,11 @@ describe('Claude structured dispatch admission', () => {
         clientMessageId: 'client-over-capacity',
         body: userMessage([{ type: 'text', text: 'one too many' }])
       })
-    ).resolves.toEqual({ state: 'rejected', reason: 'claude structured dispatch queue is full' })
+    ).resolves.toEqual({
+      state: 'rejected',
+      reason: 'claude structured dispatch queue is full',
+      rejection: { kind: 'queueFull' }
+    })
     expect(session.dispatchWaiters).toHaveLength(64)
     expect(session.connection.send).toHaveBeenCalledTimes(64)
   })
diff --git a/src/main/claude/claude-structured-dispatch-attachment-rejection.test.ts b/src/main/claude/claude-structured-dispatch-attachment-rejection.test.ts
new file mode 100644
index 000000000000..a23767c09681
--- /dev/null
+++ b/src/main/claude/claude-structured-dispatch-attachment-rejection.test.ts
@@ -0,0 +1,177 @@
+// What a person reads when Orca refuses a message's content before sending it.
+
+import { mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { describe, expect, it, vi } from 'vitest'
+import { dispatchClaudeTurn } from './claude-structured-dispatch'
+import { sessionFor, userMessage } from './claude-structured-dispatch-test-support'
+
+describe('Claude structured dispatch attachment rejections', () => {
+  it('rejects more than twenty URL images before sending', async () => {
+    const session = sessionFor()
+    const body = userMessage(
+      Array.from({ length: 21 }, (_, index) => ({
+        type: 'image-ref' as const,
+        url: `https://example.test/${index}.png`
+      }))
+    )
+
+    await expect(
+      dispatchClaudeTurn(session, { clientMessageId: 'client-1', body })
+    ).resolves.toEqual({
+      state: 'rejected',
+      reason: 'Claude accepts at most 20 images in one message, so this message was not sent.',
+      rejection: { kind: 'attachmentInvalid', attachment: { reason: 'tooMany', limit: 20 } }
+    })
+    expect(session.connection.send).not.toHaveBeenCalled()
+  })
+
+  it('rejects local images whose aggregate size exceeds twenty MiB', async () => {
+    const directory = await mkdtemp(join(tmpdir(), 'orca-claude-images-'))
+    try {
+      const paths = await Promise.all(
+        Array.from({ length: 5 }, async (_, index) => {
+          const path = join(directory, `${index}.png`)
+          await writeFile(path, Buffer.alloc(5 * 1024 * 1024))
+          return path
+        })
+      )
+      const session = sessionFor()
+      const body = userMessage(paths.map((path) => ({ type: 'image-ref' as const, path })))
+
+      await expect(
+        dispatchClaudeTurn(session, { clientMessageId: 'client-1', body })
+      ).resolves.toEqual({
+        state: 'rejected',
+        reason:
+          'The images on this message add up to more than 20 MB, so the message was not sent.',
+        rejection: {
+          kind: 'attachmentInvalid',
+          attachment: { reason: 'totalTooLarge', limit: 20 * 1024 * 1024 }
+        }
+      })
+      expect(session.connection.send).not.toHaveBeenCalled()
+    } finally {
+      await rm(directory, { recursive: true, force: true })
+    }
+  })
+
+  it('rejects a local image by actual bytes read beyond the per-image cap', async () => {
+    const directory = await mkdtemp(join(tmpdir(), 'orca-claude-image-'))
+    try {
+      const path = join(directory, 'oversized.png')
+      await writeFile(path, Buffer.alloc(5 * 1024 * 1024 + 1))
+      const session = sessionFor()
+      const body = userMessage([{ type: 'image-ref', path }])
+
+      await expect(
+        dispatchClaudeTurn(session, { clientMessageId: 'client-1', body })
+      ).resolves.toEqual({
+        state: 'rejected',
+        reason: 'An image on this message is larger than 5 MB, so the message was not sent.',
+        rejection: {
+          kind: 'attachmentInvalid',
+          attachment: { reason: 'tooLarge', limit: 5 * 1024 * 1024 }
+        }
+      })
+      expect(session.connection.send).not.toHaveBeenCalled()
+    } finally {
+      await rm(directory, { recursive: true, force: true })
+    }
+  })
+
+  it('names an empty image as empty, not as too large', async () => {
+    const directory = await mkdtemp(join(tmpdir(), 'orca-claude-image-'))
+    try {
+      const path = join(directory, 'empty.png')
+      await writeFile(path, Buffer.alloc(0))
+      const session = sessionFor()
+
+      await expect(
+        dispatchClaudeTurn(session, {
+          clientMessageId: 'client-1',
+          body: userMessage([{ type: 'image-ref', path }])
+        })
+      ).resolves.toEqual({
+        state: 'rejected',
+        reason: 'An image on this message is empty, so the message was not sent.',
+        rejection: { kind: 'attachmentInvalid', attachment: { reason: 'empty' } }
+      })
+    } finally {
+      await rm(directory, { recursive: true, force: true })
+    }
+  })
+
+  it('names an unsupported image type in words a person can act on', async () => {
+    const directory = await mkdtemp(join(tmpdir(), 'orca-claude-image-'))
+    try {
+      const path = join(directory, 'picture.bmp')
+      await writeFile(path, Buffer.alloc(64))
+      const session = sessionFor()
+
+      await expect(
+        dispatchClaudeTurn(session, {
+          clientMessageId: 'client-1',
+          body: userMessage([{ type: 'image-ref', path }])
+        })
+      ).resolves.toEqual({
+        state: 'rejected',
+        reason:
+          'Claude accepts only PNG, JPEG, GIF, and WebP images, so this message was not sent.',
+        rejection: { kind: 'attachmentInvalid', attachment: { reason: 'unsupportedType' } }
+      })
+    } finally {
+      await rm(directory, { recursive: true, force: true })
+    }
+  })
+
+  it('does not blame an attachment for a message no Orca client sends', async () => {
+    const session = sessionFor()
+    await expect(
+      dispatchClaudeTurn(session, {
+        clientMessageId: 'client-1',
+        body: userMessage([{ type: 'text', text: '' }])
+      })
+    ).resolves.toEqual({
+      state: 'rejected',
+      reason: 'This message is empty, so it was not sent.',
+      rejection: { kind: 'emptyMessage' }
+    })
+    await expect(
+      dispatchClaudeTurn(session, {
+        clientMessageId: 'client-2',
+        body: { ...userMessage([{ type: 'text', text: 'hi' }]), role: 'assistant' }
+      })
+    ).resolves.toEqual({
+      state: 'rejected',
+      reason: "Orca ran into a problem, so this didn't go through. Try again.",
+      rejection: { kind: 'hostFault' }
+    })
+    expect(session.connection.send).not.toHaveBeenCalled()
+  })
+
+  it('rejects an attachment it cannot read with the generic sentence and no path', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const session = sessionFor()
+    const path = join(tmpdir(), 'orca-claude-image-missing', 'gone.png')
+
+    await expect(
+      dispatchClaudeTurn(session, {
+        clientMessageId: 'client-1',
+        body: userMessage([{ type: 'image-ref', path }])
+      })
+    ).resolves.toEqual({
+      state: 'rejected',
+      reason: "An attachment on this message couldn't be read, so the message was not sent.",
+      rejection: { kind: 'attachmentUnreadable' }
+    })
+    expect(session.connection.send).not.toHaveBeenCalled()
+    // The row drops the error, so the log is the only place left to find why.
+    expect(warn).toHaveBeenCalledWith(
+      '[claude-dispatch] attachment could not be read:',
+      expect.objectContaining({ code: 'ENOENT' })
+    )
+    warn.mockRestore()
+  })
+})
diff --git a/src/main/claude/claude-structured-dispatch-content.ts b/src/main/claude/claude-structured-dispatch-content.ts
index 7df84091b7cc..035b0a594926 100644
--- a/src/main/claude/claude-structured-dispatch-content.ts
+++ b/src/main/claude/claude-structured-dispatch-content.ts
@@ -3,11 +3,63 @@ import { open } from 'node:fs/promises'
 import { extname } from 'node:path'
 import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
 import type { NativeChatBlock } from '../../shared/native-chat-types'
+import {
+  agentSessionFailureFact,
+  type AgentSessionAttachmentProblem,
+  type SubmissionRejectionFact
+} from '../../shared/agent-session-failure'
+import {
+  agentSessionFailureWords,
+  type AgentJournalDispatchRejection
+} from '../../shared/agent-session-failure-words'
+import { TUI_AGENT_DISPLAY_NAMES } from '../../shared/tui-agent-display-names'
 import { claudeRecord } from './claude-structured-item-translation'
 
-const MAX_IMAGE_BYTES = 5 * 1024 * 1024
+/** Orca refused the message's content, as opposed to failing to read an attachment. */
+export class ClaudeDispatchContentError extends Error {
+  /** What was wrong, typed where the check saw it; `message` stays for logs. */
+  readonly failure: SubmissionRejectionFact
+
+  constructor(message: string, failure: SubmissionRejectionFact) {
+    super(message)
+    this.name = 'ClaudeDispatchContentError'
+    this.failure = failure
+  }
+}
+
+function attachmentError(message: string, attachment: AgentSessionAttachmentProblem): Error {
+  return new ClaudeDispatchContentError(
+    message,
+    agentSessionFailureFact('attachmentInvalid', { attachment })
+  )
+}
+
+/** A message Claude rejected, in the words that name Claude and its legacy markers. */
+export function claudeDispatchRejection(
+  failure: SubmissionRejectionFact
+): AgentJournalDispatchRejection {
+  return agentSessionFailureWords(failure, {
+    surface: 'rejection',
+    agentName: TUI_AGENT_DISPLAY_NAMES.claude,
+    provider: 'claude'
+  })
+}
+
+/** Why a message whose content could not be built was not sent: Orca's own refusal of it, or an
+ *  attachment it could not read. Never the provider. */
+export function claudeDispatchContentRejection(error: unknown): AgentJournalDispatchRejection {
+  if (error instanceof ClaudeDispatchContentError) {
+    return claudeDispatchRejection(error.failure)
+  }
+  // The row says only that it could not be read; why belongs in the log.
+  console.warn('[claude-dispatch] attachment could not be read:', error)
+  return claudeDispatchRejection(agentSessionFailureFact('attachmentUnreadable'))
+}
+
+const BYTES_PER_MB = 1024 * 1024
+const MAX_IMAGE_BYTES = 5 * BYTES_PER_MB
 const MAX_IMAGE_COUNT = 20
-const MAX_TOTAL_IMAGE_BYTES = 20 * 1024 * 1024
+const MAX_TOTAL_IMAGE_BYTES = 20 * BYTES_PER_MB
 const MAX_REPLAY_CONTENT_KEY_BYTES = 256
 
 type ImageBudget = {
@@ -18,14 +70,17 @@ type ImageBudget = {
 export async function readClaudeImage(path: string, openImpl: typeof open = open): Promise<Buffer> {
   const file = await openImpl(path, 'r')
   try {
-    const invalidImage = (): Error =>
-      new Error(`Claude image must be a non-empty file no larger than ${MAX_IMAGE_BYTES} bytes`)
+    const tooLarge = (): Error =>
+      attachmentError(`Claude image must be no larger than ${MAX_IMAGE_BYTES} bytes`, {
+        reason: 'tooLarge',
+        limit: MAX_IMAGE_BYTES
+      })
     const info = await file.stat()
     if (!info.isFile()) {
-      throw new Error('Claude image must be a file')
+      throw attachmentError('Claude image must be a file', { reason: 'notAFile' })
     }
     if (info.size > MAX_IMAGE_BYTES) {
-      throw invalidImage()
+      throw tooLarge()
     }
     const buffer = Buffer.allocUnsafe(info.size + 1)
     let bytesRead = 0
@@ -39,8 +94,15 @@ export async function readClaudeImage(path: string, openImpl: typeof open = open
     // A file can grow after the initial stat and after the final read returns
     // zero. Prove the descriptor's size matches what was copied before sending.
     const finalInfo = await file.stat()
-    if (bytesRead === 0 || bytesRead > MAX_IMAGE_BYTES || finalInfo.size !== bytesRead) {
-      throw invalidImage()
+    if (bytesRead > MAX_IMAGE_BYTES) {
+      throw tooLarge()
+    }
+    if (finalInfo.size !== bytesRead) {
+      // Not the image's fault: it changed while Orca read it, so it reads as unreadable.
+      throw new Error('Claude image changed while it was read')
+    }
+    if (bytesRead === 0) {
+      throw attachmentError('Claude image must be a non-empty file', { reason: 'empty' })
     }
     return buffer.subarray(0, bytesRead)
   } finally {
@@ -62,22 +124,30 @@ async function imageContent(
 ): Promise<unknown> {
   budget.count += 1
   if (budget.count > MAX_IMAGE_COUNT) {
-    throw new Error(`Claude messages support at most ${MAX_IMAGE_COUNT} images`)
+    throw attachmentError(`Claude messages support at most ${MAX_IMAGE_COUNT} images`, {
+      reason: 'tooMany',
+      limit: MAX_IMAGE_COUNT
+    })
   }
   if (block.url) {
     return { type: 'image', source: { type: 'url', url: block.url } }
   }
   if (!block.path) {
-    throw new Error('image reference has neither a path nor a URL')
+    throw attachmentError('image reference has neither a path nor a URL', { reason: 'noSource' })
   }
   const data = await readClaudeImage(block.path)
   budget.localBytes += data.byteLength
   if (budget.localBytes > MAX_TOTAL_IMAGE_BYTES) {
-    throw new Error(`Claude images must total no more than ${MAX_TOTAL_IMAGE_BYTES} bytes`)
+    throw attachmentError(`Claude images must total no more than ${MAX_TOTAL_IMAGE_BYTES} bytes`, {
+      reason: 'totalTooLarge',
+      limit: MAX_TOTAL_IMAGE_BYTES
+    })
   }
   const mediaType = IMAGE_MIME_BY_EXTENSION[extname(block.path).toLowerCase()]
   if (!mediaType) {
-    throw new Error(`Claude does not support the image type ${extname(block.path)}`)
+    throw attachmentError(`Claude does not support the image type ${extname(block.path)}`, {
+      reason: 'unsupportedType'
+    })
   }
   return {
     type: 'image',
@@ -99,7 +169,11 @@ export async function claudeDispatchMessageContent(
   body: AgentJournalMessageItem
 ): Promise<unknown[]> {
   if (body.role !== 'user') {
-    throw new Error('Claude dispatch accepts only user messages')
+    // No Orca client sends one, so the fault is Orca's.
+    throw new ClaudeDispatchContentError(
+      'Claude dispatch accepts only user messages',
+      agentSessionFailureFact('hostFault')
+    )
   }
   const images: unknown[] = []
   const texts: string[] = []
@@ -115,7 +189,10 @@ export async function claudeDispatchMessageContent(
   // text blocks would silently discard every one but the last.
   const content = texts.length > 0 ? [...images, { type: 'text', text: texts.join('\n') }] : images
   if (content.length === 0) {
-    throw new Error('Claude dispatch requires text or an image')
+    throw new ClaudeDispatchContentError(
+      'Claude dispatch requires text or an image',
+      agentSessionFailureFact('emptyMessage')
+    )
   }
   return content
 }
diff --git a/src/main/claude/claude-structured-dispatch-test-support.ts b/src/main/claude/claude-structured-dispatch-test-support.ts
index a309bd9d0b98..5af0f17243b5 100644
--- a/src/main/claude/claude-structured-dispatch-test-support.ts
+++ b/src/main/claude/claude-structured-dispatch-test-support.ts
@@ -5,7 +5,7 @@ import type { ClaudeSession } from './claude-structured-session-state'
 import { ClaudeBackgroundTaskTracker } from './claude-background-task-tracker'
 import { ClaudeChildWorkDecoder } from './claude-child-work-decoder'
 import { ClaudeSlashCommandCatalog } from './claude-slash-command-catalog'
-import { createClaudeSessionStartupGate } from './claude-structured-session-startup-gate'
+import { createClaudeSessionStartup } from './claude-structured-session-startup-state'
 
 export function sessionFor(send: Mock = vi.fn().mockResolvedValue(undefined)): ClaudeSession {
   return {
@@ -32,7 +32,7 @@ export function sessionFor(send: Mock = vi.fn().mockResolvedValue(undefined)): C
     capabilities: [],
     events: undefined,
     translator: null,
-    startup: { ...createClaudeSessionStartupGate(), state: 'proven' }
+    startup: { ...createClaudeSessionStartup(), state: 'proven' }
   }
 }
 
diff --git a/src/main/claude/claude-structured-dispatch-waiters.ts b/src/main/claude/claude-structured-dispatch-waiters.ts
index f3a3501ec8a6..92b6a5048b2f 100644
--- a/src/main/claude/claude-structured-dispatch-waiters.ts
+++ b/src/main/claude/claude-structured-dispatch-waiters.ts
@@ -10,11 +10,11 @@ export function forgetRetiredWaiter(session: ClaudeSession, waiter: ClaudeDispat
 }
 
 /**
- * A waiter with no deadline. The echo Claude sends is emitted when the provider
- * STARTS the turn, so a message queued behind a running turn cannot be echoed
- * until that turn ends — an interval bounded only by the previous turn. Elapsed
- * time is therefore not evidence about delivery, and nothing here expires.
- * Waiters are retired by process facts instead: a failed write, or child exit.
+ * A waiter with no deadline. A mid-turn send Claude folds into the running turn
+ * is replayed mid-turn; one it runs later is replayed only when its own turn
+ * starts — an interval bounded only by the previous turn. Elapsed time is
+ * therefore not evidence about delivery, and nothing here expires. Waiters are
+ * retired by process facts instead: a failed write, or child exit.
  */
 export function waitForReplay(
   session: ClaudeSession,
diff --git a/src/main/claude/claude-structured-dispatch.test.ts b/src/main/claude/claude-structured-dispatch.test.ts
index 1945ac3531d1..92ae0253711a 100644
--- a/src/main/claude/claude-structured-dispatch.test.ts
+++ b/src/main/claude/claude-structured-dispatch.test.ts
@@ -2,8 +2,9 @@ import { mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { describe, expect, it, vi } from 'vitest'
-import { dispatchClaudeTurn, resolveClaudeReplayTurn } from './claude-structured-dispatch'
-import { readClaudeImage } from './claude-structured-dispatch-content'
+import { dispatchClaudeTurn } from './claude-structured-dispatch'
+import { resolveClaudeReplayTurn } from './claude-replay-turn-resolution'
+import { ClaudeDispatchContentError, readClaudeImage } from './claude-structured-dispatch-content'
 import { claudeUnwrittenUserMessageError } from './claude-agent-sdk-user-message-queue'
 import type { ClaudeSession } from './claude-structured-session-state'
 import {
@@ -379,7 +380,11 @@ describe('Claude structured dispatch image limits', () => {
         clientMessageId: 'client-2',
         body: userMessage([{ type: 'text', text: 'two' }])
       })
-    ).resolves.toEqual({ state: 'rejected', reason: 'provider_write_failed: broken pipe' })
+    ).resolves.toEqual({
+      state: 'rejected',
+      reason: 'provider_write_failed',
+      rejection: { kind: 'writeFailed' }
+    })
     expect(session.dispatchWaiters).toEqual([firstWaiter])
 
     const firstUuid = (firstWaiter as { sentUuid?: string }).sentUuid
@@ -392,6 +397,7 @@ describe('Claude structured dispatch image limits', () => {
   })
 
   it('does not let a provably unwritten attempt block retry correlation', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
     const send = vi
       .fn()
       .mockRejectedValueOnce(claudeUnwrittenUserMessageError(new Error('broken pipe')))
@@ -401,7 +407,17 @@ describe('Claude structured dispatch image limits', () => {
 
     await expect(
       dispatchClaudeTurn(session, { clientMessageId: 'client-1', body })
-    ).resolves.toEqual({ state: 'rejected', reason: 'provider_write_failed: broken pipe' })
+    ).resolves.toEqual({
+      state: 'rejected',
+      reason: 'provider_write_failed',
+      rejection: { kind: 'writeFailed' }
+    })
+    // The row keeps only the marker; why the write failed goes to the log.
+    expect(warn).toHaveBeenCalledWith(
+      '[claude-dispatch] message could not be handed to Claude:',
+      expect.objectContaining({ message: expect.stringContaining('broken pipe') })
+    )
+    warn.mockRestore()
     expect(session.dispatchWaiters).toHaveLength(0)
     expect(session.retiredDispatchWaiters).toHaveLength(0)
 
@@ -684,66 +700,6 @@ describe('Claude structured dispatch image limits', () => {
     })
   })
 
-  it('rejects more than twenty URL images before sending', async () => {
-    const session = sessionFor()
-    const body = userMessage(
-      Array.from({ length: 21 }, (_, index) => ({
-        type: 'image-ref' as const,
-        url: `https://example.test/${index}.png`
-      }))
-    )
-
-    await expect(
-      dispatchClaudeTurn(session, { clientMessageId: 'client-1', body })
-    ).resolves.toEqual({ state: 'rejected', reason: 'Claude messages support at most 20 images' })
-    expect(session.connection.send).not.toHaveBeenCalled()
-  })
-
-  it('rejects local images whose aggregate size exceeds twenty MiB', async () => {
-    const directory = await mkdtemp(join(tmpdir(), 'orca-claude-images-'))
-    try {
-      const paths = await Promise.all(
-        Array.from({ length: 5 }, async (_, index) => {
-          const path = join(directory, `${index}.png`)
-          await writeFile(path, Buffer.alloc(5 * 1024 * 1024))
-          return path
-        })
-      )
-      const session = sessionFor()
-      const body = userMessage(paths.map((path) => ({ type: 'image-ref' as const, path })))
-
-      await expect(
-        dispatchClaudeTurn(session, { clientMessageId: 'client-1', body })
-      ).resolves.toEqual({
-        state: 'rejected',
-        reason: `Claude images must total no more than ${20 * 1024 * 1024} bytes`
-      })
-      expect(session.connection.send).not.toHaveBeenCalled()
-    } finally {
-      await rm(directory, { recursive: true, force: true })
-    }
-  })
-
-  it('rejects a local image by actual bytes read beyond the per-image cap', async () => {
-    const directory = await mkdtemp(join(tmpdir(), 'orca-claude-image-'))
-    try {
-      const path = join(directory, 'oversized.png')
-      await writeFile(path, Buffer.alloc(5 * 1024 * 1024 + 1))
-      const session = sessionFor()
-      const body = userMessage([{ type: 'image-ref', path }])
-
-      await expect(
-        dispatchClaudeTurn(session, { clientMessageId: 'client-1', body })
-      ).resolves.toEqual({
-        state: 'rejected',
-        reason: `Claude image must be a non-empty file no larger than ${5 * 1024 * 1024} bytes`
-      })
-      expect(session.connection.send).not.toHaveBeenCalled()
-    } finally {
-      await rm(directory, { recursive: true, force: true })
-    }
-  })
-
   it('allocates local image reads from the file size, not the maximum cap', async () => {
     const directory = await mkdtemp(join(tmpdir(), 'orca-claude-image-'))
     const allocUnsafe = vi.spyOn(Buffer, 'allocUnsafe')
@@ -821,8 +777,11 @@ describe('Claude structured dispatch image limits', () => {
       read,
       close: vi.fn().mockResolvedValue(undefined)
     } as never)
-    await expect(readClaudeImage('/controlled/growing.png', open)).rejects.toThrow(
-      `Claude image must be a non-empty file no larger than ${5 * 1024 * 1024} bytes`
+    // It changed while Orca read it: unreadable, never a limit the image did not break.
+    const rejected = await readClaudeImage('/controlled/growing.png', open).catch(
+      (error: unknown) => error
     )
+    expect(rejected).not.toBeInstanceOf(ClaudeDispatchContentError)
+    expect(rejected).toMatchObject({ message: 'Claude image changed while it was read' })
   })
 })
diff --git a/src/main/claude/claude-structured-dispatch.ts b/src/main/claude/claude-structured-dispatch.ts
index d93a8ecab0a3..612f6391ced5 100644
--- a/src/main/claude/claude-structured-dispatch.ts
+++ b/src/main/claude/claude-structured-dispatch.ts
@@ -7,193 +7,31 @@ import {
 } from './claude-structured-dispatch-waiters'
 import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
 import type { AgentSessionDispatchOutcome } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
-import {
-  claudeHasReplayContent,
-  readClaudeMessageEnvelope
-} from './claude-structured-item-translation'
-import type {
-  ClaudeDispatchWaiter,
-  ClaudeLateDispatchOutcome,
-  ClaudeSession
-} from './claude-structured-session-state'
-import { readClaudeFrameString } from './claude-structured-init-proof'
+import type { ClaudeSession } from './claude-structured-session-state'
+import type { ClaudeLateDispatchSettlement } from './claude-replay-turn-resolution'
 import {
   claudeDispatchContentKey,
+  claudeDispatchContentRejection,
   claudeDispatchInvokesSlashCommand,
-  claudeDispatchMessageContent
+  claudeDispatchMessageContent,
+  claudeDispatchRejection
 } from './claude-structured-dispatch-content'
 import { dispatchWriteOutcomeUnknownReason } from '../native-chat/agent-session-journal/journal-dispatch-doubt-reasons'
-import {
-  DISPATCH_REJECTED_CANCELLED,
-  DISPATCH_REJECTED_QUEUE_FULL,
-  dispatchWriteFailureReason
-} from '../../shared/structured-agent-session-dispatch-rejection'
+import { DISPATCH_REJECTED_QUEUE_FULL } from '../../shared/structured-agent-session-dispatch-rejection'
+import { agentSessionFailureFact } from '../../shared/agent-session-failure'
+import type { AgentJournalDispatchRejection } from '../../shared/agent-session-failure-words'
 import {
   claudeUnwrittenUserMessageError,
   claudeUserMessageWasProvablyUnwritten
 } from './claude-agent-sdk-user-message-queue'
 import { AgentSessionPreDispatchError } from '../native-chat/agent-session-wire/structured-agent-session-operation-settlement'
 import {
-  claudeStartupFailureReason,
-  claudeStartupHoldsWrites,
-  failClaudeStartupGate,
-  holdClaudeStartupWrite
-} from './claude-structured-session-startup-gate'
+  claudeStartupFailureFact,
+  failClaudeStartup
+} from './claude-structured-session-startup-state'
 
 const MAX_ACTIVE_DISPATCH_WAITERS = 64
 
-/** Settles a provider-proven late outcome; replay rows independently reconcile acceptance. */
-export type ClaudeLateDispatchSettlement = (input: ClaudeLateDispatchOutcome) => void
-
-export type ClaudeReplayTurnOrigin = { requestedAt: number | null }
-
-export function resolveClaudeReplayTurn(
-  session: ClaudeSession,
-  message: Record<string, unknown>,
-  onSettledLate?: ClaudeLateDispatchSettlement
-): ClaudeReplayTurnOrigin | null {
-  const envelope = readClaudeMessageEnvelope(message)
-  const isUserReplay =
-    envelope?.role === 'user' &&
-    message.parent_tool_use_id === null &&
-    claudeHasReplayContent(envelope)
-  const isCompletedCommand = message.type === 'result'
-  if (
-    (!isUserReplay && !isCompletedCommand) ||
-    readClaudeFrameString(message, 'session_id') !== session.providerSessionId
-  ) {
-    return null
-  }
-  const uuid = readClaudeFrameString(message, 'uuid')
-  if (!uuid) {
-    return null
-  }
-
-  // Newer SDK frames carry the client uuid that caused a turn. A correlation
-  // value is authoritative: never fall back to queue order or content, since
-  // identical prompts may be in flight across a timeout boundary.
-  const userMessageUuid = readClaudeFrameString(message, 'user_message_uuid')
-  if (userMessageUuid) {
-    const exact = session.dispatchWaiters.find(
-      (candidate) => candidate.sentUuid === userMessageUuid
-    )
-    if (exact) {
-      settleWaiter(session, exact, uuid, onSettledLate)
-      return isUserReplay ? { requestedAt: exact.requestedAt } : null
-    }
-    const retired = session.retiredDispatchWaiters.find(
-      (candidate) => candidate.sentUuid === userMessageUuid
-    )
-    if (retired) {
-      forgetRetiredWaiter(session, retired)
-      recoverLateIdentity(session, retired, uuid, isUserReplay, onSettledLate)
-      return null
-    }
-    return null
-  }
-
-  const exact = session.dispatchWaiters.find((candidate) => candidate.sentUuid === uuid)
-  if (exact) {
-    settleWaiter(session, exact, uuid, onSettledLate)
-    return isUserReplay ? { requestedAt: exact.requestedAt } : null
-  }
-  const retired = session.retiredDispatchWaiters.find((candidate) => candidate.sentUuid === uuid)
-  if (retired) {
-    forgetRetiredWaiter(session, retired)
-    recoverLateIdentity(session, retired, uuid, isUserReplay, onSettledLate)
-    return null
-  }
-
-  if (isUserReplay) {
-    // Compatibility CLIs may mint a new replay uuid instead of echoing the
-    // client uuid. Content is an acceptable join only when it is the sole
-    // candidate on one side of the timeout boundary; with active and retired
-    // candidates present, identical prompts are intentionally left unknown.
-    const replayContentKey = claudeDispatchContentKey(envelope.content)
-    if (!session.replayContentFallbackBlocked && session.retiredDispatchWaiters.length === 0) {
-      const compatible = session.dispatchWaiters.filter(
-        (candidate) => candidate.replayContentKey === replayContentKey
-      )
-      if (compatible.length === 1) {
-        const [candidate] = compatible
-        settleWaiter(session, candidate!, uuid, onSettledLate)
-        return { requestedAt: candidate!.requestedAt }
-      }
-    } else if (!session.replayContentFallbackBlocked && session.dispatchWaiters.length === 0) {
-      const lateCompatible = session.retiredDispatchWaiters.filter(
-        (candidate) => candidate.replayContentKey === replayContentKey
-      )
-      if (lateCompatible.length === 1) {
-        const [candidate] = lateCompatible
-        forgetRetiredWaiter(session, candidate!)
-        recoverLateIdentity(session, candidate!, uuid, true, onSettledLate)
-        return null
-      }
-    }
-    return null
-  }
-  const current = session.dispatchWaiters[0]
-  if (isCompletedCommand && !current?.acceptsResult) {
-    return null
-  }
-  // A legacy result has no dispatch correlation. Any retired waiter makes queue order ambiguous,
-  // even when the retired dispatch was an ordinary turn rather than a slash command.
-  if (isCompletedCommand && session.retiredDispatchWaiters.length > 0) {
-    return null
-  }
-  // Once an eviction occurred, a fresh result uuid cannot be joined to a waiter by queue order.
-  if (isCompletedCommand && session.replayContentFallbackBlocked) {
-    return null
-  }
-  const waiter = uuid ? session.dispatchWaiters.shift() : undefined
-  if (waiter && uuid) {
-    settleWaiter(session, waiter, uuid, onSettledLate)
-    return isUserReplay ? { requestedAt: waiter.requestedAt } : null
-  }
-  return null
-}
-
-function settleWaiter(
-  session: ClaudeSession,
-  waiter: ClaudeDispatchWaiter,
-  uuid: string,
-  onSettledLate?: ClaudeLateDispatchSettlement
-): void {
-  const index = session.dispatchWaiters.indexOf(waiter)
-  if (index !== -1) {
-    session.dispatchWaiters.splice(index, 1)
-  }
-  waiter.settledUuid = uuid
-  waiter.resolve(uuid)
-  // Dispatch returned on admission, so the replay is what settles delivery.
-  if (waiter.clientMessageId) {
-    onSettledLate?.({
-      clientMessageId: waiter.clientMessageId,
-      providerIdentity: { provider: 'claude', sessionId: session.providerSessionId, uuid }
-    })
-  }
-}
-
-function recoverLateIdentity(
-  session: ClaudeSession,
-  waiter: ClaudeDispatchWaiter,
-  uuid: string,
-  isUserReplay: boolean,
-  onSettledLate?: ClaudeLateDispatchSettlement
-): void {
-  if (!isUserReplay && !waiter.acceptsResult) {
-    return
-  }
-  // The provider acted on this dispatch, so the send it came from is delivered.
-  // A retired replay settles delivery only; it cannot reopen a turn.
-  if (waiter.clientMessageId) {
-    onSettledLate?.({
-      clientMessageId: waiter.clientMessageId,
-      providerIdentity: { provider: 'claude', sessionId: session.providerSessionId, uuid }
-    })
-  }
-}
-
 export function settleCancelledClaudeDispatchWaiters(
   session: ClaudeSession,
   cancelledUuids: readonly string[],
@@ -216,7 +54,7 @@ export function settleCancelledClaudeDispatchWaiters(
       onSettledLate?.({
         clientMessageId: waiter.clientMessageId,
         state: 'rejected',
-        reason: DISPATCH_REJECTED_CANCELLED
+        ...claudeDispatchRejection(agentSessionFailureFact('cancelled'))
       })
     }
   }
@@ -226,31 +64,36 @@ export function settleCancelledClaudeDispatchWaiters(
  *  Retired rather than dropped: their identities stay joinable, bounded by
  *  `MAX_RETIRED_DISPATCH_WAITERS`. */
 export function retireClaudeDispatchWaiters(session: ClaudeSession): void {
-  failClaudeStartupGate(session, new Error('claude stream-json ended before startup completed'))
+  failClaudeStartup(session, new Error('claude stream-json ended before startup completed'))
   for (const waiter of session.dispatchWaiters.splice(0)) {
     retireWaiter(session, waiter)
     waiter.resolve(null)
   }
 }
 
+/** The row keeps only the marker released clients hide; why the write failed belongs in the log. */
+function claudeWriteFailureRejection(error: unknown): AgentJournalDispatchRejection {
+  console.warn('[claude-dispatch] message could not be handed to Claude:', error)
+  return claudeDispatchRejection(agentSessionFailureFact('writeFailed'))
+}
+
 export async function dispatchClaudeTurn(
   session: ClaudeSession,
   input: { clientMessageId?: string; body: AgentJournalMessageItem; requestedAt?: number },
-  beforeDispatch?: () => Promise<void>,
-  onSettledLate?: ClaudeLateDispatchSettlement
+  beforeDispatch?: () => Promise<void>
 ): Promise<AgentSessionDispatchOutcome> {
   let content: unknown[]
   try {
     content = await claudeDispatchMessageContent(input.body)
   } catch (error) {
-    return { state: 'rejected', reason: (error as Error).message }
+    return { state: 'rejected', ...claudeDispatchContentRejection(error) }
   }
   if (session.dispatchWaiters.length >= MAX_ACTIVE_DISPATCH_WAITERS) {
-    return { state: 'rejected', reason: DISPATCH_REJECTED_QUEUE_FULL }
+    return { state: 'rejected', ...claudeDispatchRejection(agentSessionFailureFact('queueFull')) }
   }
-  const startupFailure = claudeStartupFailureReason(session)
+  const startupFailure = claudeStartupFailureFact(session)
   if (startupFailure) {
-    return { state: 'rejected', reason: startupFailure }
+    return { state: 'rejected', ...claudeDispatchRejection(startupFailure) }
   }
   // Read the sent content, not the journal blocks: only the mapped trailing prompt decides
   // whether Claude runs a command, so the two cannot disagree about which frame settles this.
@@ -276,14 +119,6 @@ export async function dispatchClaudeTurn(
     parent_tool_use_id: null,
     session_id: session.providerSessionId
   }
-  if (claudeStartupHoldsWrites(session)) {
-    return holdClaudeStartupWrite(session, {
-      message,
-      arm,
-      ...(beforeDispatch ? { beforeDispatch } : {}),
-      ...(onSettledLate ? { settleLate: onSettledLate } : {})
-    })
-  }
   const pending = { replay: beforeDispatch ? undefined : arm() }
   const authorize = beforeDispatch
     ? async () => {
@@ -304,7 +139,7 @@ export async function dispatchClaudeTurn(
       if (error instanceof AgentSessionPreDispatchError) {
         throw error
       }
-      return { state: 'rejected', reason: dispatchWriteFailureReason(error) }
+      return { state: 'rejected', ...claudeWriteFailureRejection(error) }
     }
     const waiter = replay.waiter
     if (waiter.settledUuid) {
@@ -322,7 +157,7 @@ export async function dispatchClaudeTurn(
       waiter.resolve(null)
       // The frame was never handed to the SDK's input pump, so this is not doubt:
       // the message provably did not happen, which is what `rejected` means.
-      return { state: 'rejected', reason: dispatchWriteFailureReason(error) }
+      return { state: 'rejected', ...claudeWriteFailureRejection(error) }
     }
     if (!waiter.retired) {
       retireWaiter(session, waiter)
@@ -332,6 +167,7 @@ export async function dispatchClaudeTurn(
   }
   // The write is the admission signal. Awaiting the echo here would block on the
   // turn already running, which is why the deadline this replaces kept declaring
-  // doubt about messages that were delivered. `settleWaiter` finishes the job.
+  // doubt about messages that were delivered. The replay resolution
+  // (`claude-replay-turn-resolution.ts`) finishes the job.
   return { state: 'admitted' }
 }
diff --git a/src/main/claude/claude-structured-effort-default-at-rest.test.ts b/src/main/claude/claude-structured-effort-default-at-rest.test.ts
new file mode 100644
index 000000000000..2175ef49e435
--- /dev/null
+++ b/src/main/claude/claude-structured-effort-default-at-rest.test.ts
@@ -0,0 +1,256 @@
+// A Claude chat at rest shows the effort its next start will run: a live child teaches the host
+// catalog what the CLI runs for each model when no effort is sent, and the resting read answers it.
+
+import { describe, expect, it } from 'vitest'
+import type { AgentSessionRecord } from '../../shared/agent-session-record'
+import { getAgentSessionOptionCatalog } from '../../shared/agent-session-option-catalog'
+import {
+  applyStructuredAgentSessionOptions,
+  createStructuredAgentSessionOptionState,
+  structuredAgentSessionOptionSnapshot
+} from '../../shared/structured-agent-session-options'
+import { createAgentModelCatalogService } from '../native-chat/agent-model-catalog/agent-model-catalog-service'
+import { agentModelCatalogFingerprintForRecord } from '../native-chat/agent-model-catalog/agent-model-catalog-fingerprint'
+import { AgentModelCatalogStore } from '../native-chat/agent-model-catalog/agent-model-catalog-store'
+import type { StructuredAgentSessionMutationContext } from '../native-chat/agent-session-wire/structured-agent-session-host-mutations'
+import { readStructuredAgentSessionOptions } from '../native-chat/agent-session-wire/structured-agent-session-options-read'
+import { nativeSessionOptionsFromReport } from '../native-chat/agent-session-wire/structured-agent-session-option-restoration'
+import {
+  ClaudeStructuredSessionAdapter,
+  type ClaudeStructuredSessionEvent
+} from './claude-structured-session-adapter'
+import {
+  PROVIDER_SESSION_ID,
+  fakeClaude,
+  identityFor,
+  recordingJournalSink
+} from './claude-structured-session-test-support'
+
+const SESSION = 'session-1'
+const ACCOUNT_HOME = '/accounts/claude'
+const EFFORTS = ['low', 'medium', 'high', 'xhigh', 'max']
+
+/** Claude Code 2.1.280's list_models rows: `default` resolves to the opus row. */
+const CATALOG = [
+  {
+    value: 'default',
+    resolvedModel: 'claude-opus-5-5[1m]',
+    displayName: 'Default (recommended)',
+    supportsEffort: true,
+    supportedEffortLevels: EFFORTS
+  },
+  {
+    value: 'opus[1m]',
+    resolvedModel: 'claude-opus-5-5[1m]',
+    displayName: 'Opus (1M context)',
+    supportsEffort: true,
+    supportedEffortLevels: EFFORTS
+  },
+  {
+    value: 'sonnet',
+    resolvedModel: 'claude-sonnet-5',
+    displayName: 'Sonnet',
+    supportsEffort: true,
+    supportedEffortLevels: EFFORTS
+  }
+]
+
+/** get_settings with nothing overriding the CLI's own default; an effort write moves both views. */
+function settingsWithNoOverride() {
+  const effective: { effortLevel?: string } = {}
+  const settings = {
+    effective,
+    sources: [],
+    applied: { model: 'claude-opus-5-5[1m]', effort: 'medium', advisor: null, ultracode: false }
+  }
+  const claude = fakeClaude({
+    initProof: 'session-start',
+    initModels: CATALOG,
+    settings,
+    routes: {
+      list_models: () => CATALOG,
+      apply_flag_settings: (params) => {
+        const written = params?.settings
+        const effort =
+          typeof written === 'object' && written !== null && 'effortLevel' in written
+            ? written.effortLevel
+            : undefined
+        if (typeof effort === 'string') {
+          effective.effortLevel = effort
+          settings.applied.effort = effort
+        }
+      }
+    }
+  })
+  return claude
+}
+
+async function startChild(
+  store: AgentModelCatalogStore,
+  options?: Record<string, string>,
+  events: ClaudeStructuredSessionEvent[] = []
+): Promise<ClaudeStructuredSessionAdapter> {
+  const adapter = new ClaudeStructuredSessionAdapter({
+    resolveLaunch: async () => ({
+      pathToClaudeCodeExecutable: 'claude',
+      options: {},
+      cwd: '/work/repo',
+      claudeConfigDir: ACCOUNT_HOME,
+      providerSessionId: PROVIDER_SESSION_ID,
+      resumeLeafUuid: null,
+      resumesTranscript: false,
+      continuesChain: false
+    }),
+    onEvent: (event) => events.push(event),
+    openConnection: settingsWithNoOverride().openConnection,
+    readProcessStartTime: async () => 1_700_000_000_000,
+    now: () => 1_700_000_000_500,
+    persistHandle: async () => {},
+    modelCatalog: store
+  })
+  await adapter.acquire({
+    identity: identityFor(SESSION),
+    fence: 7,
+    spawnToken: 'spawn-9',
+    events: recordingJournalSink(),
+    ...(options ? { options } : {})
+  })
+  await adapter.awaitStarted(SESSION)
+  return adapter
+}
+
+function restingRecord(options: Record<string, string>): AgentSessionRecord {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the resting read and the catalog key touch only these fields.
+  return {
+    provider: 'claude',
+    accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: ACCOUNT_HOME },
+    location: { wslDistro: null },
+    options
+  } as unknown as AgentSessionRecord
+}
+
+function catalogDefault(store: AgentModelCatalogStore, model: string): string | undefined {
+  const entry = store.get(agentModelCatalogFingerprintForRecord(restingRecord({})))
+  return entry?.models.find((row) => row.id === model)?.defaultEffort
+}
+
+/** The options a client reads for the chat once its child is gone. */
+function readAtRest(store: AgentModelCatalogStore, record: AgentSessionRecord) {
+  const modelCatalog = createAgentModelCatalogService({
+    store,
+    getRecord: () => record,
+    resolveAccountHome: async () => ({ variable: 'CLAUDE_CONFIG_DIR', path: ACCOUNT_HOME })
+  })
+  const resting = { child: null, params: { provider: 'claude' } }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the resting read touches only these members.
+  const context = {
+    deps: { adapter: {}, store: { getRecord: () => record }, modelCatalog },
+    serialize: (_sessionId: string, task: () => Promise<unknown>) => task(),
+    openConversation: async () => resting,
+    conversation: async () => resting
+  } as unknown as StructuredAgentSessionMutationContext
+  return readStructuredAgentSessionOptions(context, SESSION)
+}
+
+function pickerEffort(result: Awaited<ReturnType<typeof readAtRest>>) {
+  const seed = getAgentSessionOptionCatalog('claude')!
+  const state = applyStructuredAgentSessionOptions(
+    createStructuredAgentSessionOptionState('claude', seed),
+    seed,
+    result
+  )
+  const effort = structuredAgentSessionOptionSnapshot(state).find((row) => row.id === 'effort')
+  return effort?.kind.type === 'select' ? effort.kind.currentValue : undefined
+}
+
+describe('Claude effort default at rest', () => {
+  it("learns the model's default from a live child's applied effort", async () => {
+    const store = new AgentModelCatalogStore()
+    await startChild(store)
+
+    // Both rows run claude-opus-5-5[1m]; sonnet was not applied, so nothing is known of it.
+    expect(catalogDefault(store, 'opus[1m]')).toBe('medium')
+    expect(catalogDefault(store, 'sonnet')).toBeUndefined()
+  })
+
+  it('shows that default in the picker of a chat at rest', async () => {
+    const store = new AgentModelCatalogStore()
+    await startChild(store)
+
+    const result = await readAtRest(store, restingRecord({ model: 'opus[1m]' }))
+
+    expect(result.current).toMatchObject({ model: 'opus[1m]', effort: 'medium' })
+    expect(pickerEffort(result)).toBe('medium')
+  })
+
+  it("shows the user's pick at rest over the default", async () => {
+    const store = new AgentModelCatalogStore()
+    await startChild(store)
+
+    const result = await readAtRest(store, restingRecord({ model: 'opus[1m]', effort: 'max' }))
+
+    expect(result.current.effort).toBe('max')
+    expect(pickerEffort(result)).toBe('max')
+  })
+
+  it("never learns a user's pick as the default", async () => {
+    const store = new AgentModelCatalogStore()
+    const restored = await startChild(store, { model: 'opus[1m]', effort: 'high' })
+    await restored.readOptions({ sessionId: SESSION, fence: 7 })
+    expect(catalogDefault(store, 'opus[1m]')).toBeUndefined()
+
+    const other = new AgentModelCatalogStore()
+    const live = await startChild(other)
+    await live.setOption({ sessionId: SESSION, fence: 7, key: 'effort', value: 'xhigh' })
+    expect((await live.readOptions({ sessionId: SESSION, fence: 7 })).current.effort).toBe('xhigh')
+    expect(catalogDefault(other, 'opus[1m]')).toBe('medium')
+  })
+
+  it("leaves a Codex chat's unsaved effort blank at rest, as its live child does", async () => {
+    const store = new AgentModelCatalogStore()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the resting read and the catalog key touch only these fields.
+    const record = {
+      provider: 'codex',
+      accountHome: { variable: 'CODEX_HOME', path: '/accounts/codex' },
+      location: { wslDistro: null },
+      options: { model: 'gpt-5.5' }
+    } as unknown as AgentSessionRecord
+    store.recordSuccess(agentModelCatalogFingerprintForRecord(record), 'codex', {
+      models: [
+        {
+          id: 'gpt-5.5',
+          label: 'GPT-5.5',
+          isDefault: true,
+          defaultEffort: 'medium',
+          efforts: [
+            { value: 'medium', label: 'Medium' },
+            { value: 'high', label: 'High' }
+          ]
+        }
+      ],
+      fastModeTierByModel: new Map(),
+      origin: 'live-session'
+    })
+
+    const result = await readAtRest(store, record)
+
+    expect(result.current).toEqual({ model: 'gpt-5.5' })
+  })
+
+  it("never saves the applied effort as the chat's pick, yet shows it at rest", async () => {
+    const store = new AgentModelCatalogStore()
+    const events: ClaudeStructuredSessionEvent[] = []
+    await startChild(store, undefined, events)
+
+    const started = events.find((event) => event.type === 'started')
+    const reported = started?.type === 'started' ? started.reportedOptions : null
+    expect(reported).not.toHaveProperty('effort')
+    // The record the start persists names the listed row the catalog learned under.
+    const record = restingRecord(
+      nativeSessionOptionsFromReport({ reported: reported!, restoreSkipped: [] })
+    )
+    expect(record.options).toEqual({ model: 'opus[1m]' })
+    expect((await readAtRest(store, record)).current.effort).toBe('medium')
+    expect(record.options).toEqual({ model: 'opus[1m]' })
+  })
+})
diff --git a/src/main/claude/claude-structured-effort-reporting.test.ts b/src/main/claude/claude-structured-effort-reporting.test.ts
index 7cf59ee555bc..2c319c86ee72 100644
--- a/src/main/claude/claude-structured-effort-reporting.test.ts
+++ b/src/main/claude/claude-structured-effort-reporting.test.ts
@@ -7,7 +7,7 @@ import {
 import { readClaudeSettingsEffort } from './claude-structured-session-options'
 import type { ClaudeSession } from './claude-structured-session-state'
 import type { ClaudeStructuredSessionEvent } from './claude-structured-session-adapter'
-import { acquired, fakeClaude } from './claude-structured-session-test-support'
+import { USER_MESSAGE, acquired, fakeClaude } from './claude-structured-session-test-support'
 
 /** Verbatim from Claude Code 2.1.258's get_settings response. */
 const REAL_SETTINGS = {
@@ -93,7 +93,14 @@ describe('Claude effort reporting', () => {
 
   it('keeps the init fixture free of an effort the real frame never sends', async () => {
     const events: ClaudeStructuredSessionEvent[] = []
-    await acquired(fakeClaude(), {}, events)
+    const adapter = await acquired(fakeClaude(), {}, events)
+    // Live: init arrives when the first command starts a cycle, not at startup.
+    await adapter.dispatch({
+      sessionId: 'session-1',
+      clientMessageId: 'seed-cycle',
+      body: USER_MESSAGE,
+      fence: 7
+    })
     const init = events.flatMap((event) =>
       event.type === 'message' && event.message.subtype === 'init' ? [event.message] : []
     )
diff --git a/src/main/claude/claude-structured-inbound-control.test.ts b/src/main/claude/claude-structured-inbound-control.test.ts
index 20d0b9dd06a5..43c96ee8bea3 100644
--- a/src/main/claude/claude-structured-inbound-control.test.ts
+++ b/src/main/claude/claude-structured-inbound-control.test.ts
@@ -41,10 +41,12 @@ function callbacksFor() {
 describe('Claude permission callbacks', () => {
   it('registers a decodable can_use_tool as a durable prompt and settles it from the registry', async () => {
     const control = callbacksFor()
+    const controller = new AbortController()
+    const removeListener = vi.spyOn(controller.signal, 'removeEventListener')
     const answered = control.canUseTool(
       'Bash',
       { command: 'git status' },
-      permissionOptions('perm-1', 'tool-1', new AbortController().signal, [
+      permissionOptions('perm-1', 'tool-1', controller.signal, [
         { type: 'addRules', rules: [], behavior: 'allow', destination: 'session' }
       ])
     )
@@ -63,6 +65,7 @@ describe('Claude permission callbacks', () => {
     // The prompt's settle is the SDK callback's own resolve — answering resolves this promise.
     found?.prompt.settle({ behavior: 'allow', toolUseID: 'tool-1' })
     await expect(answered).resolves.toEqual({ behavior: 'allow', toolUseID: 'tool-1' })
+    expect(removeListener).toHaveBeenCalledTimes(1)
   })
 
   it('keeps the SDK permission presentation and strips terminal escapes', async () => {
diff --git a/src/main/claude/claude-structured-inbound-control.ts b/src/main/claude/claude-structured-inbound-control.ts
index 9e07f5ee92ea..945272b55b42 100644
--- a/src/main/claude/claude-structured-inbound-control.ts
+++ b/src/main/claude/claude-structured-inbound-control.ts
@@ -57,6 +57,11 @@ export function buildClaudePermissionCallbacks(deps: ClaudePermissionCallbackDep
 } {
   const canUseTool: CanUseTool = (toolName, input, options) =>
     new Promise<PermissionResult | null>((resolve) => {
+      let cancel = (): void => {}
+      const settle = (response: PermissionResult | null): void => {
+        options.signal.removeEventListener('abort', cancel)
+        resolve(response)
+      }
       // Classify first so later permission-mode policy cannot swallow a plan proposal.
       const subject = claudePermissionSubject(toolName, input)
       const prompt = deps.prompts.register({
@@ -67,14 +72,14 @@ export function buildClaudePermissionCallbacks(deps: ClaudePermissionCallbackDep
         toolUseId: options.toolUseID,
         input,
         suggestions: options.suggestions ?? [],
-        settle: resolve,
+        settle,
         turnId: deps.currentTurnId?.() ?? null
       })
       if (!prompt) {
-        resolve(denySafeResult(options.toolUseID))
+        settle(denySafeResult(options.toolUseID))
         return
       }
-      const cancel = (): void => {
+      cancel = (): void => {
         if (deps.prompts.forgetIfPending(prompt)) {
           deps.emit({
             type: 'prompt-cancelled',
@@ -83,7 +88,7 @@ export function buildClaudePermissionCallbacks(deps: ClaudePermissionCallbackDep
           })
           // Null is the SDK's "no response written" sentinel: a cancelled request must not
           // be answered, only forgotten.
-          resolve(null)
+          settle(null)
         }
       }
       if (options.signal.aborted) {
diff --git a/src/main/claude/claude-structured-init-proof.ts b/src/main/claude/claude-structured-init-proof.ts
index c29cb2d4715b..ae2ee5896a8b 100644
--- a/src/main/claude/claude-structured-init-proof.ts
+++ b/src/main/claude/claude-structured-init-proof.ts
@@ -46,15 +46,25 @@ export function readClaudeModels(initialization: unknown): unknown[] {
     : []
 }
 
-/** CLI capabilities advertised on the initialize result or the yielded system/init frame. */
+/**
+ * The capabilities this CLI advertises: the first report given that names any, else `observed`.
+ * A SessionStart proof and the 2.1.280 initialize result name none, so only a turn's system/init
+ * may say what the binary supports, and a report naming none never retracts that.
+ */
 export function readClaudeCapabilities(
-  init: ClaudeInitObservation,
-  initialization: unknown
-): string[] {
-  const fromResult = isRecord(initialization) ? initialization.capabilities : undefined
-  const fromFrame = init.message.capabilities
-  const source = Array.isArray(fromResult) ? fromResult : Array.isArray(fromFrame) ? fromFrame : []
-  return source.filter((value): value is string => typeof value === 'string')
+  observed: readonly string[],
+  ...reports: unknown[]
+): readonly string[] {
+  for (const report of reports) {
+    const advertised = isRecord(report) ? report.capabilities : undefined
+    const capabilities = Array.isArray(advertised)
+      ? advertised.filter((value): value is string => typeof value === 'string')
+      : []
+    if (capabilities.length > 0) {
+      return capabilities
+    }
+  }
+  return observed
 }
 
 export function claudeInitializationAuthError(
@@ -64,7 +74,8 @@ export function claudeInitializationAuthError(
     isRecord(initialization) && isRecord(initialization.account) ? initialization.account : null
   return readClaudeFrameString(account ?? {}, 'tokenSource') === 'none'
     ? new AgentSessionAcquisitionRefusal(
-        'Claude is not signed in for the selected account. Sign in with the Claude CLI for this CLAUDE_CONFIG_DIR, then retry.'
+        'Claude is not signed in for the selected account. Sign in with the Claude CLI for this CLAUDE_CONFIG_DIR, then retry.',
+        'notSignedIn'
       )
     : null
 }
diff --git a/src/main/claude/claude-structured-journal-translation.ts b/src/main/claude/claude-structured-journal-translation.ts
index 16c054945a16..082b0024061f 100644
--- a/src/main/claude/claude-structured-journal-translation.ts
+++ b/src/main/claude/claude-structured-journal-translation.ts
@@ -184,6 +184,21 @@ export function createClaudeJournalTranslator(
       }
       if (event.type === 'message') {
         context.observe(event.message, event.observedAt ?? Date.now())
+        // A root init is the CLI starting a new request cycle (measured per turn,
+        // per queued turn, per background wake, per /compact); a send replayed
+        // after that cycle's first root work was folded into it. Task frames are
+        // not cycle work: they arrive between cycles too.
+        if (isRootClaudeFrame(event.message)) {
+          if (event.message.type === 'system' && event.message.subtype === 'init') {
+            turn.observeProviderCycleStart()
+          } else if (
+            event.startsTurn === true ||
+            event.message.type === 'assistant' ||
+            event.message.type === 'stream_event'
+          ) {
+            turn.observeProviderCycleWork()
+          }
+        }
       }
       if (event.type === 'message' && handleStream(event.message, event.observedAt ?? Date.now())) {
         return
@@ -281,6 +296,9 @@ export function createClaudeJournalTranslator(
     get currentTurnId() {
       return turn.id
     },
+    get openTurnInLiveProviderCycle() {
+      return turn.openedInLiveProviderCycle
+    },
     flush: streamedText.flush,
     childToolOwner: childQueries.childToolOwner,
     childActivity: childQueries.childActivity,
diff --git a/src/main/claude/claude-structured-launch-resolution.test.ts b/src/main/claude/claude-structured-launch-resolution.test.ts
index c54d1a5179f3..66fed64c3230 100644
--- a/src/main/claude/claude-structured-launch-resolution.test.ts
+++ b/src/main/claude/claude-structured-launch-resolution.test.ts
@@ -161,6 +161,19 @@ describe('claude structured launch resolution', () => {
     expect(launch.options.sessionId).toBeUndefined()
   })
 
+  it('names the child by the Orca session id, over any id the configured overlay carries', async () => {
+    // The Orca-minted id, never the provider's: the provider id rotates on /clear.
+    const launch = await resolverFor(record(), () => ({
+      ORCA_AGENT_SESSION_ID: 'a0b1c2d3-0000-4000-8000-00000000abcd'
+    }))({ identity: IDENTITY })
+
+    expect(launch.env).toMatchObject({
+      ORCA_AGENT_SESSION_ID: SESSION_ID,
+      ORCA_CLI_COMMAND: expect.stringMatching(/^[^:;]*[\\/]cli[\\/]bin[\\/]orca-dev$/)
+    })
+    expect(launch.env?.ORCA_AGENT_SESSION_ID).not.toBe(launch.providerSessionId)
+  })
+
   it('forces session-state events on when the inherited overlay disables them', async () => {
     const launch = await resolverFor(record(), () => ({
       [CLAUDE_SESSION_STATE_EVENTS_ENV]: '0'
@@ -492,16 +505,17 @@ describe('claude structured launch resolution', () => {
 
       gate = WSL_ONLY_NORMALIZED
 
-      // Reacquire after the account state changed: refused before anything spawns.
-      await expect(resolve({ identity: identityAt('leaf-current') })).rejects.toBeInstanceOf(
-        AgentSessionPreSpawnError
-      )
+      // Reacquire after the account state changed: refused before anything spawns, naming the
+      // account shape a person can change.
+      const refused = resolve({ identity: identityAt('leaf-current') })
+      await expect(refused).rejects.toBeInstanceOf(AgentSessionPreSpawnError)
+      await expect(refused).rejects.toMatchObject({ reason: 'managedAccountUnsupported' })
     })
 
-    it('fails closed when the account state cannot be read', async () => {
-      await expect(
-        resolverWithGate(() => null)({ identity: identityAt('leaf-current') })
-      ).rejects.toBeInstanceOf(AgentSessionPreSpawnError)
+    it('fails closed when the account state cannot be read, naming no situation', async () => {
+      const refused = resolverWithGate(() => null)({ identity: identityAt('leaf-current') })
+      await expect(refused).rejects.toBeInstanceOf(AgentSessionPreSpawnError)
+      await expect(refused).rejects.toMatchObject({ reason: undefined })
     })
 
     it('keeps resolving when no gate is wired, so other embedders are unaffected', async () => {
diff --git a/src/main/claude/claude-structured-launch-resolution.ts b/src/main/claude/claude-structured-launch-resolution.ts
index a2b3d41bbfd1..29703dfd8eb7 100644
--- a/src/main/claude/claude-structured-launch-resolution.ts
+++ b/src/main/claude/claude-structured-launch-resolution.ts
@@ -8,7 +8,7 @@ import type { AgentSessionJournalIdentity } from '../../shared/agent-session-jou
 import { agentSessionProviderHandleChainHead } from '../../shared/agent-session-provider-handle'
 import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
 import { withCliRuntimeOnPath } from '../../shared/node-cli-command-resolution'
-import { structuredWorkerChildIdentityEnv } from '../runtime/structured-worker-child-identity-env'
+import { structuredSessionChildIdentityEnv } from '../runtime/structured-session-child-identity-env'
 import {
   CLAUDE_AUTH_ENV_CONFLICT_MESSAGE,
   CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE,
@@ -22,6 +22,7 @@ import {
 } from '../claude-accounts/live-pty-gate'
 import { AgentSessionPreSpawnError } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
 import {
+  hasWslBoundClaudeAccount,
   structuredClaudeMatchesActiveManagedAccount,
   type ClaudeManagedAccountGateSettings
 } from '../native-chat/claude-structured-managed-account-support'
@@ -172,7 +173,9 @@ export async function resolveClaudeStructuredInvocation(
   // Under a managed account the pinned credential is the only auth this launch may
   // use, so an explicit override is refused rather than silently beating the pin.
   if (auth.stripAuthEnv && hasClaudeAuthEnvConflict(overlay)) {
-    throw new Error(CLAUDE_AUTH_ENV_CONFLICT_MESSAGE)
+    throw new AgentSessionPreSpawnError(new Error(CLAUDE_AUTH_ENV_CONFLICT_MESSAGE), {
+      reason: 'managedAccountEnvOverride'
+    })
   }
   // Why the overlay merges onto the inherited env rather than replacing it: the child
   // still needs PATH and the rest of the shell environment, and withCliRuntimeOnPath
@@ -209,7 +212,9 @@ export async function assertClaudeAuthSwitchSettled(
   timeoutMs = CLAUDE_AUTH_SWITCH_SETTLE_TIMEOUT_MS
 ): Promise<void> {
   if (!(await whenClaudeAuthSwitchSettles(timeoutMs))) {
-    throw new Error(CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE)
+    throw new AgentSessionPreSpawnError(new Error(CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE), {
+      reason: 'accountSwitchInProgress'
+    })
   }
 }
 
@@ -247,12 +252,12 @@ export function createClaudeStructuredLaunchResolver(
     // Every acquisition, not just the first: the account state can change under a live session, and
     // a reacquire after an unexpected exit would otherwise spawn under whatever it has become.
     // Codex has no gate here — it resolves its account on a different path.
-    if (
-      deps.readManagedAccountGate &&
-      !structuredClaudeMatchesActiveManagedAccount(deps.readManagedAccountGate())
-    ) {
+    const gate = deps.readManagedAccountGate?.()
+    if (gate !== undefined && !structuredClaudeMatchesActiveManagedAccount(gate)) {
+      // Unreadable account state names no situation a person can act on, so only the log reads it.
       throw new AgentSessionPreSpawnError(
-        'structured Claude is not offered under the active managed Claude account'
+        'structured Claude is not offered under the active managed Claude account',
+        gate && hasWslBoundClaudeAccount(gate) ? { reason: 'managedAccountUnsupported' } : {}
       )
     }
     const head = agentSessionProviderHandleChainHead(record.providerHandleChain)
@@ -283,9 +288,8 @@ export function createClaudeStructuredLaunchResolver(
       (await deps.resolvePermissionMode?.()) ?? 'default'
     )
     const { command, env } = await resolveClaudeStructuredInvocation(deps, (base) =>
-      // Only a dispatched structured worker gets the orchestration identity and the Orca CLI on
-      // PATH; an ordinary chat session's env passes through untouched.
-      structuredWorkerChildIdentityEnv(record.sessionId, {
+      // Every structured session speaks orchestration as itself: its injected id and the Orca CLI.
+      structuredSessionChildIdentityEnv(record.sessionId, {
         ...base,
         // The turn translator relies on Claude's authoritative idle frame when no result arrives.
         [CLAUDE_SESSION_STATE_EVENTS_ENV]: '1'
diff --git a/src/main/claude/claude-structured-model-confirmation.test.ts b/src/main/claude/claude-structured-model-confirmation.test.ts
index 96d7e9daa391..f4034400cbfc 100644
--- a/src/main/claude/claude-structured-model-confirmation.test.ts
+++ b/src/main/claude/claude-structured-model-confirmation.test.ts
@@ -1,7 +1,12 @@
 import { describe, expect, it } from 'vitest'
 import { setClaudeStructuredOption } from './claude-structured-options'
 import type { ClaudeSession } from './claude-structured-session-state'
-import { PROVIDER_SESSION_ID, acquired, fakeClaude } from './claude-structured-session-test-support'
+import {
+  PROVIDER_SESSION_ID,
+  USER_MESSAGE,
+  acquired,
+  fakeClaude
+} from './claude-structured-session-test-support'
 
 /** Verbatim rows from Claude Code 2.1.258's list_models response. */
 const CATALOG = [
@@ -147,6 +152,13 @@ describe('Claude model confirmation', () => {
       routes: { list_models: () => CATALOG }
     })
     const adapter = await acquired(claude)
+    // The model is confirmed by a cycle's init frame, so start one.
+    await adapter.dispatch({
+      sessionId: 'session-1',
+      clientMessageId: 'seed-cycle',
+      body: USER_MESSAGE,
+      fence: 7
+    })
 
     await adapter.setOption({ sessionId: 'session-1', key: 'effort', value: 'high', fence: 7 })
     await expect(adapter.readOptions({ sessionId: 'session-1', fence: 7 })).resolves.toMatchObject({
diff --git a/src/main/claude/claude-structured-options.test.ts b/src/main/claude/claude-structured-options.test.ts
index e02647f36253..a92149a2cddf 100644
--- a/src/main/claude/claude-structured-options.test.ts
+++ b/src/main/claude/claude-structured-options.test.ts
@@ -11,7 +11,7 @@ import {
 import { ClaudeBackgroundTaskTracker } from './claude-background-task-tracker'
 import { ClaudeChildWorkDecoder } from './claude-child-work-decoder'
 import { ClaudeSlashCommandCatalog } from './claude-slash-command-catalog'
-import { createClaudeSessionStartupGate } from './claude-structured-session-startup-gate'
+import { createClaudeSessionStartup } from './claude-structured-session-startup-state'
 import {
   claudeStructuredSessionOptionsFrom,
   observeClaudeFastModeFacts,
@@ -48,7 +48,7 @@ function sessionFor(setModel: ClaudeSession['connection']['setModel']): ClaudeSe
     capabilities: [],
     events: undefined,
     translator: null,
-    startup: { ...createClaudeSessionStartupGate(), state: 'proven' }
+    startup: { ...createClaudeSessionStartup(), state: 'proven' }
   }
 }
 
diff --git a/src/main/claude/claude-structured-options.ts b/src/main/claude/claude-structured-options.ts
index 0090cd2f039f..2f0b7ac4b707 100644
--- a/src/main/claude/claude-structured-options.ts
+++ b/src/main/claude/claude-structured-options.ts
@@ -41,6 +41,13 @@ export function restoredClaudeStructuredSessionOptions(
   )
 }
 
+/** The keys `setClaudeStructuredOption` writes; a pick made at rest is checked against these. */
+const CLAUDE_STRUCTURED_OPTION_KEYS = new Set(['model', 'permissionMode', 'effort', 'fastMode'])
+
+export function isClaudeStructuredOptionKey(key: string): boolean {
+  return CLAUDE_STRUCTURED_OPTION_KEYS.has(key)
+}
+
 /** A client's write; the startup restore writes through `setClaudeStructuredOption` directly. */
 export function setClaudeStructuredSessionOption(
   session: ClaudeSession,
@@ -51,7 +58,8 @@ export function setClaudeStructuredSessionOption(
   if (session.startup.state !== 'proven') {
     return Promise.reject(
       new AgentSessionOptionRejectedError(
-        'Claude is still starting; options can be changed once it is ready.'
+        'Claude is still starting; options can be changed once it is ready.',
+        'providerStarting'
       )
     )
   }
diff --git a/src/main/claude/claude-structured-prompt-ownership.test.ts b/src/main/claude/claude-structured-prompt-ownership.test.ts
index 678c6a4f1e2a..53d6f63623d9 100644
--- a/src/main/claude/claude-structured-prompt-ownership.test.ts
+++ b/src/main/claude/claude-structured-prompt-ownership.test.ts
@@ -17,9 +17,9 @@ import {
   acquired,
   adapterFor,
   fakeClaude,
-  identityFor,
-  invokeCanUseTool
+  identityFor
 } from './claude-structured-session-test-support'
+import { invokeCanUseTool } from './claude-can-use-tool-test-support'
 
 function deferred(): { promise: Promise<void>; resolve: () => void } {
   let resolve = (): void => {}
@@ -269,7 +269,8 @@ describe('Claude live prompt ownership', () => {
       sessionId: 'session-1',
       clientMessageId: 'queued-message',
       state: 'rejected',
-      reason: 'provider_cancelled_before_start'
+      reason: 'provider_cancelled_before_start',
+      rejection: { kind: 'cancelled' }
     })
   })
 
diff --git a/src/main/claude/claude-structured-prompt-ownership.ts b/src/main/claude/claude-structured-prompt-ownership.ts
index 885ea2dfa74c..01af8ec9fc0b 100644
--- a/src/main/claude/claude-structured-prompt-ownership.ts
+++ b/src/main/claude/claude-structured-prompt-ownership.ts
@@ -10,16 +10,11 @@ import {
   cancelClaudeTurn,
   supportsClaudeQueuedInterruptCancellation
 } from './claude-structured-control-actions'
-import type { ClaudeLateDispatchSettlement } from './claude-structured-dispatch'
+import type { ClaudeLateDispatchSettlement } from './claude-replay-turn-resolution'
 import { buildClaudePromptReply } from './claude-structured-prompt-replies'
 import type { ClaudeSession } from './claude-structured-session-state'
 import type { ClaudePendingPrompt } from './claude-prompt-registry'
 import type { PermissionResult } from '@anthropic-ai/claude-agent-sdk'
-import {
-  claudeStartupHoldsWrites,
-  rejectClaudeStartupWrites
-} from './claude-structured-session-startup-gate'
-import { DISPATCH_REJECTED_CANCELLED } from '../../shared/structured-agent-session-dispatch-rejection'
 
 /** Conservative user-facing window: below the 30s control deadline, trading
  * residual slow-pump risk for ensuring delivery bookkeeping cannot block Stop indefinitely. */
@@ -95,6 +90,29 @@ function waitForClaudeDispatchAdmission(
   })
 }
 
+/**
+ * A Stop that names no turn: the conversation asked to stop whatever this child has in flight.
+ * Claude's interrupt is session-scoped, so there is no turn identity to check — only that this is
+ * still the child the host judged, and that it has a turn open or a written message whose turn has
+ * not opened yet (the gap before its echo, which no client can name).
+ */
+function cancelClaudeConversation(
+  session: ClaudeSession,
+  sessions: Map<string, ClaudeSession>,
+  request: CancelInput,
+  timeoutMs: number | undefined,
+  onDispatchSettledLate: ClaudeLateDispatchSettlement | undefined
+): Promise<{ cancelled: boolean }> {
+  const acquisitionGeneration = session.acquisitionGeneration
+  const isCurrent = (): boolean =>
+    sessions.get(request.sessionId) === session &&
+    session.fence === request.fence &&
+    session.acquisitionGeneration === acquisitionGeneration &&
+    ((request.resolveLiveTurnId?.() ?? session.translator?.currentTurnId ?? null) !== null ||
+      session.dispatchWaiters.length > 0)
+  return cancelClaudeTurn(session, timeoutMs, isCurrent, onDispatchSettledLate)
+}
+
 export async function cancelClaudeStructuredTurn(input: {
   request: CancelInput
   sessions: Map<string, ClaudeSession>
@@ -107,19 +125,20 @@ export async function cancelClaudeStructuredTurn(input: {
   const session = requireSession(sessions, request.sessionId)
   const acquisitionGeneration = session.acquisitionGeneration
   const prompt = request.prompt
-  // A held prompt was never written, so Stop withdraws it; the drain only writes what it still
-  // holds. Before startup lands nothing was written, so there is nothing to interrupt either.
-  let withdrewHeld = false
-  if (!prompt && claudeStartupHoldsWrites(session) && session.fence === request.fence) {
-    withdrewHeld = rejectClaudeStartupWrites(session, DISPATCH_REJECTED_CANCELLED)
-    if (session.startup.state === 'pending') {
-      return { cancelled: withdrewHeld }
-    }
+  // Before startup lands nothing was written, so there is nothing to interrupt.
+  if (!prompt && session.startup.state === 'pending') {
+    return { cancelled: false }
+  }
+  const requestedTurnId = request.turnId
+  if (requestedTurnId === undefined) {
+    return prompt
+      ? { cancelled: false }
+      : cancelClaudeConversation(session, sessions, request, timeoutMs, input.onDispatchSettledLate)
   }
   if (prompt && session.fence !== request.fence) {
     return { cancelled: false }
   }
-  const claim = prompt ? session.prompts.claimBound(prompt.itemId, request.turnId) : null
+  const claim = prompt ? session.prompts.claimBound(prompt.itemId, requestedTurnId) : null
   if (prompt && !claim) {
     return { cancelled: false }
   }
@@ -135,7 +154,7 @@ export async function cancelClaudeStructuredTurn(input: {
   // means nothing has published an identity this request can contradict.
   const ownsRequestedTurn = (): boolean => {
     const liveTurnId = request.resolveLiveTurnId?.() ?? session.translator?.currentTurnId ?? null
-    return liveTurnId === null ? session.dispatchSequence === 0 : liveTurnId === request.turnId
+    return liveTurnId === null ? session.dispatchSequence === 0 : liveTurnId === requestedTurnId
   }
   // The host supplies the durable latest submission; direct adapter callers fall back to
   // the current in-memory waiter so an unknown dispatch remains fenced without a latch.
@@ -153,7 +172,7 @@ export async function cancelClaudeStructuredTurn(input: {
   const dispatchAdmissionAllowsCancellation = (): boolean =>
     dispatchAdmissionIsCurrent() ||
     (Boolean(prompt) && supportsClaudeQueuedInterruptCancellation(session))
-  const compactionOwnsTurn = (): boolean => compactions.ownsTurn(request.sessionId, request.turnId)
+  const compactionOwnsTurn = (): boolean => compactions.ownsTurn(request.sessionId, requestedTurnId)
   const currentDispatchHasRetiredWaiter = (): boolean =>
     session.retiredDispatchWaiters.some(
       (waiter) => waiter.dispatchSequence === session.dispatchSequence
@@ -175,7 +194,7 @@ export async function cancelClaudeStructuredTurn(input: {
     session.acquisitionGeneration === acquisitionGeneration &&
     (claim && prompt
       ? ownsRequestedTurn() &&
-        session.prompts.ownsBoundClaim(claim, prompt.itemId, request.turnId) &&
+        session.prompts.ownsBoundClaim(claim, prompt.itemId, requestedTurnId) &&
         (dispatchAdmissionAllowsCancellation() || dispatchAdmissionExpired)
       : compactionOwnsTurn() ||
         (ownsRequestedTurn() &&
@@ -197,7 +216,7 @@ export async function cancelClaudeStructuredTurn(input: {
     } else if (claim) {
       session.prompts.releaseClaim(claim)
     }
-    return withdrewHeld ? { ...result, cancelled: true } : result
+    return result
   } catch (error) {
     if (claim && !interruptConfirmed) {
       session.prompts.releaseClaim(claim)
diff --git a/src/main/claude/claude-structured-provider-fallback.ts b/src/main/claude/claude-structured-provider-fallback.ts
index baa6cb83a52a..e107633173c3 100644
--- a/src/main/claude/claude-structured-provider-fallback.ts
+++ b/src/main/claude/claude-structured-provider-fallback.ts
@@ -16,6 +16,11 @@ import {
 } from './claude-structured-item-translation'
 import { claudeResultOutcome } from './claude-result-outcome'
 import { rootClaudeRowStamp, type ClaudeRowStamp } from './claude-provisional-row-corrections'
+import {
+  CLAUDE_API_RETRY_FRAME_KIND,
+  claudeApiRetryRowBody,
+  createClaudeApiRetryRuns
+} from './claude-api-retry-row'
 
 export function claudeProviderFrameKind(message: Record<string, unknown>): string {
   const type = claudeText(message.type) ?? 'unknown'
@@ -121,9 +126,23 @@ export function createClaudeProviderFrameFallback(
   ) => boolean
 } {
   let sequence = 0
+  const retryRun = createClaudeApiRetryRuns()
   return {
     append: (kind, payload, displayText, beforeAppend, options, stamp) => {
       sequence += 1
+      const retrying = kind === CLAUDE_API_RETRY_FRAME_KIND ? claudeRecord(payload) : null
+      if (retrying) {
+        beforeAppend?.()
+        // One row per retry run, revised by each attempt, never the frame as a row.
+        const identity = {
+          provider: 'orca',
+          clientMessageId: `provider-retry:claude:${acquisitionId}:${retryRun(retrying)}`
+        } as const
+        const body = claudeApiRetryRowBody(retrying)
+        sink.appendItem(identity, body, (stamp ?? rootClaudeRowStamp)(identity, body))
+        sink.publish()
+        return true
+      }
       const translated = unhandledProviderFrameJournalItem(
         'claude',
         kind,
diff --git a/src/main/claude/claude-structured-queued-stop.test.ts b/src/main/claude/claude-structured-queued-stop.test.ts
new file mode 100644
index 000000000000..2dbc99bb82be
--- /dev/null
+++ b/src/main/claude/claude-structured-queued-stop.test.ts
@@ -0,0 +1,205 @@
+// A send Claude queued behind the running turn is dropped by Stop, so it must settle as withdrawn.
+// Orca's SessionStart hook proves most starts before the turn's system/init, which is the only
+// frame that says whether the CLI can cancel its queue.
+
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types'
+import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key'
+import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
+import { DISPATCH_REJECTED_CANCELLED } from '../../shared/structured-agent-session-dispatch-rejection'
+import type { ClaudeStructuredSessionAdapterDeps } from './claude-structured-session-state'
+import { CLAUDE_DISPATCH_ADMISSION_TIMEOUT_MS } from './claude-structured-prompt-ownership'
+import {
+  PROVIDER_SESSION_ID,
+  USER_MESSAGE,
+  adapterFor,
+  fakeClaude,
+  identityFor,
+  type FakeConnection
+} from './claude-structured-session-test-support'
+
+// As Claude Code 2.1.280 advertises them on a turn's system/init frame.
+const CAPABILITIES = ['interrupt_receipt_v1', 'interrupt_cancel_queued_v1', 'msg_lifecycle_v1']
+
+type Settlement = Parameters<
+  NonNullable<ClaudeStructuredSessionAdapterDeps['onDispatchSettledLate']>
+>[0]
+
+/** Answers the way the real CLI does: cancel_queued cancels the queue, a plain interrupt keeps it. */
+function claudeCli(options: Parameters<typeof fakeClaude>[0] = {}) {
+  let queued: string[] = []
+  const claude = fakeClaude({
+    replayUuid: null,
+    ...options,
+    routes: {
+      interrupt: (params) =>
+        params?.cancelQueued
+          ? { still_queued: [], cancelled: queued.splice(0) }
+          : { still_queued: [...queued] },
+      cancel_async_message: (params) => {
+        const before = queued.length
+        queued = queued.filter((uuid) => uuid !== params?.uuid)
+        return queued.length < before
+      }
+    }
+  })
+  return { claude, queue: (uuid: string) => queued.push(uuid) }
+}
+
+function turnInit(capabilities?: string[]): Record<string, unknown> {
+  return {
+    type: 'system',
+    subtype: 'init',
+    session_id: PROVIDER_SESSION_ID,
+    uuid: 'turn-init',
+    model: 'claude-sonnet-5',
+    ...(capabilities ? { capabilities } : {})
+  }
+}
+
+async function acquired(
+  claude: ReturnType<typeof fakeClaude>,
+  settlements: Settlement[] = []
+): Promise<{
+  adapter: ReturnType<typeof adapterFor>
+  bodies: Map<string, AgentJournalItemBody>
+  connection: FakeConnection
+}> {
+  const bodies = new Map<string, AgentJournalItemBody>()
+  const adapter = adapterFor(claude, {}, [], [], undefined, undefined, undefined, (settlement) =>
+    settlements.push(settlement)
+  )
+  await adapter.acquire({
+    identity: identityFor(),
+    fence: 7,
+    spawnToken: 'spawn-9',
+    events: {
+      appendItem: (identity, body) => bodies.set(agentJournalItemKey(identity), body),
+      appendTombstone: (identity) => bodies.delete(agentJournalItemKey(identity)),
+      publish: vi.fn()
+    }
+  })
+  return { adapter, bodies, connection: claude.connections[0]! }
+}
+
+function runningTurnId(bodies: Map<string, AgentJournalItemBody>): string {
+  for (const body of bodies.values()) {
+    const turn = readAgentJournalTurn(body)
+    if (turn?.state === 'running') {
+      return turn.turnId
+    }
+  }
+  throw new Error('expected a running turn')
+}
+
+/** Sends A and opens its turn, queues B behind it, then Stops A as the host does. */
+async function stopWithQueuedFollowUp(
+  cli: ReturnType<typeof claudeCli>,
+  openTurn: (connection: FakeConnection) => void
+): Promise<{ interrupt: unknown; settlements: Settlement[] }> {
+  const settlements: Settlement[] = []
+  const { adapter, bodies, connection } = await acquired(cli.claude, settlements)
+  const send = (clientMessageId: string) =>
+    adapter.dispatch({ sessionId: 'session-1', clientMessageId, body: USER_MESSAGE, fence: 7 })
+  await send('client-a')
+  openTurn(connection)
+  // Claude adopts the client uuid for the echo that opens the turn.
+  connection.handlers.onMessage?.({
+    ...connection.sent.at(-1)!,
+    uuid: connection.sent.at(-1)!.uuid
+  })
+  await send('client-b')
+  cli.queue(String(connection.sent.at(-1)!.uuid))
+
+  vi.useFakeTimers()
+  try {
+    const stopped = adapter.cancelTurn({
+      sessionId: 'session-1',
+      turnId: runningTurnId(bodies),
+      fence: 7,
+      // The host reads B's handover from the journal, and it is still pending.
+      dispatchStatus: { state: 'pending', recovered: false }
+    })
+    await vi.advanceTimersByTimeAsync(CLAUDE_DISPATCH_ADMISSION_TIMEOUT_MS)
+    await expect(stopped).resolves.toEqual({ cancelled: true })
+  } finally {
+    vi.useRealTimers()
+  }
+  return {
+    interrupt: connection.calls.find((call) => call.subtype === 'interrupt')?.params,
+    settlements: settlements.filter((settlement) => settlement.clientMessageId === 'client-b')
+  }
+}
+
+const WITHDRAWN = [
+  {
+    sessionId: 'session-1',
+    clientMessageId: 'client-b',
+    state: 'rejected',
+    reason: DISPATCH_REJECTED_CANCELLED,
+    rejection: { kind: 'cancelled' }
+  }
+]
+
+describe('Stop with a follow-up Claude queued behind the running turn', () => {
+  it('withdraws it the same way whether system/init or a SessionStart hook proved the start', async () => {
+    const byInit = await stopWithQueuedFollowUp(
+      claudeCli({ initProof: 'init', capabilities: CAPABILITIES }),
+      () => {}
+    )
+    const bySessionStart = await stopWithQueuedFollowUp(
+      claudeCli({ initProof: 'session-start' }),
+      (connection) => connection.handlers.onMessage?.(turnInit(CAPABILITIES))
+    )
+
+    expect(byInit).toEqual({ interrupt: { cancelQueued: true }, settlements: WITHDRAWN })
+    expect(bySessionStart).toEqual(byInit)
+  })
+
+  it('keeps what a turn advertised when a later frame names nothing', async () => {
+    const result = await stopWithQueuedFollowUp(
+      claudeCli({ initProof: 'session-start' }),
+      (connection) => {
+        connection.handlers.onMessage?.(turnInit(CAPABILITIES))
+        connection.handlers.onMessage?.(turnInit())
+        connection.handlers.onMessage?.({
+          type: 'system',
+          subtype: 'hook_response',
+          hook_name: 'SessionStart:resume',
+          session_id: PROVIDER_SESSION_ID
+        })
+      }
+    )
+
+    expect(result).toEqual({ interrupt: { cancelQueued: true }, settlements: WITHDRAWN })
+  })
+
+  it('keeps what a turn advertised when the start is read after it', async () => {
+    const cli = claudeCli({ initProof: 'session-start' })
+    const open = cli.claude.openConnection
+    // The turn's init lands while startup still waits on get_settings, as a send that starts the
+    // agent allows.
+    cli.claude.openConnection = async (launch, handlers) => {
+      const connection = await open(launch, handlers)
+      const getSettings = connection.getSettings
+      connection.getSettings = async (options) => {
+        handlers?.onMessage?.(turnInit(CAPABILITIES))
+        return getSettings(options)
+      }
+      return connection
+    }
+
+    const result = await stopWithQueuedFollowUp(cli, () => {})
+
+    expect(result).toEqual({ interrupt: { cancelQueued: true }, settlements: WITHDRAWN })
+  })
+
+  it('settles a follow-up withdrawn one at a time on a CLI without cancel_queued', async () => {
+    const result = await stopWithQueuedFollowUp(
+      claudeCli({ initProof: 'init', capabilities: ['interrupt_receipt_v1'] }),
+      () => {}
+    )
+
+    expect(result).toEqual({ interrupt: {}, settlements: WITHDRAWN })
+  })
+})
diff --git a/src/main/claude/claude-structured-rate-limit-retry.test.ts b/src/main/claude/claude-structured-rate-limit-retry.test.ts
new file mode 100644
index 000000000000..d7b0d5277fcd
--- /dev/null
+++ b/src/main/claude/claude-structured-rate-limit-retry.test.ts
@@ -0,0 +1,50 @@
+// Claude retrying a rate-limited request: the frames below follow Claude Code 2.1.280 against an
+// HTTP 429 stub, captured with `--replay-user-messages --include-partial-messages`. The CLI writes
+// only `api_retry` frames, and echoes the message only once a request gets through or is
+// interrupted, so no turn opens: the send itself is all that says the session is working.
+
+import { describe, expect, it, vi } from 'vitest'
+import type {
+  AgentJournalItemBody,
+  AgentJournalItemIdentity
+} from '../../shared/agent-session-journal-types'
+import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { createClaudeJournalTranslator } from './claude-structured-journal-translation'
+
+function apiRetry(attempt: number, observedAt: number) {
+  return {
+    type: 'message' as const,
+    sessionId: 'orca-session',
+    observedAt,
+    message: {
+      type: 'system',
+      subtype: 'api_retry',
+      attempt,
+      max_retries: 10,
+      retry_delay_ms: 1_000 * 2 ** (attempt - 1),
+      error_status: 429,
+      error: 'rate_limit',
+      uuid: `retry-${attempt}`,
+      session_id: 'claude-session'
+    }
+  }
+}
+
+describe('Claude retrying a rate-limited request', () => {
+  it('opens no turn while it retries', () => {
+    const appended: { identity: AgentJournalItemIdentity; body: AgentJournalItemBody }[] = []
+    const sink: StructuredAgentSessionEventSink = {
+      appendItem: (identity, body) => appended.push({ identity, body }),
+      appendTombstone: vi.fn(),
+      publish: vi.fn()
+    }
+    const translator = createClaudeJournalTranslator({ sink })
+
+    for (let attempt = 1; attempt <= 6; attempt += 1) {
+      translator.handle(apiRetry(attempt, 1_000 * attempt))
+    }
+
+    expect(appended.filter(({ body }) => readAgentJournalTurn(body) !== null)).toEqual([])
+  })
+})
diff --git a/src/main/claude/claude-structured-real-cli-fold.test.ts b/src/main/claude/claude-structured-real-cli-fold.test.ts
new file mode 100644
index 000000000000..5ce21d83f170
--- /dev/null
+++ b/src/main/claude/claude-structured-real-cli-fold.test.ts
@@ -0,0 +1,194 @@
+// The fold receipt against the real CLI: a message sent while a turn runs is
+// folded by the CLI into the running turn, and Orca must keep ONE turn row —
+// no interrupted marking, no second bar. Runs only where a signed-in Claude CLI
+// exists, like the rest of the real-CLI suite. Live sessions prove the session
+// from a SessionStart hook frame BEFORE system/init arrives, which is exactly
+// the path the fixture harness cannot fake end to end.
+
+import { randomUUID } from 'node:crypto'
+import { mkdtemp } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { describe, expect, it, vi } from 'vitest'
+import type {
+  AgentJournalItemBody,
+  AgentSessionJournalIdentity
+} from '../../shared/agent-session-journal-types'
+import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { CLAUDE_STRUCTURED_BASE_OPTIONS } from './claude-structured-launch-resolution'
+import {
+  ClaudeStructuredSessionAdapter,
+  type ClaudeStructuredSessionEvent
+} from './claude-structured-session-adapter'
+import {
+  realClaudeAuthenticated,
+  realClaudeAvailable,
+  realClaudeCommand,
+  realClaudeLaunchHome
+} from './claude-real-cli-availability-test-support'
+
+const SESSION_ID = 'real-cli-fold'
+// Pins the live proof order (SessionStart hook frame before system/init) and lets the
+// Bash steps run unprompted, whatever the config dir under test configures.
+const FOLD_SESSION_SETTINGS = JSON.stringify({
+  hooks: { SessionStart: [{ hooks: [{ type: 'command', command: 'echo' }] }] },
+  permissions: { allow: ['Bash(sleep:*)'] }
+})
+
+function identity(providerSessionId: string): AgentSessionJournalIdentity {
+  return {
+    sessionId: SESSION_ID,
+    workspaceId: 'real-cli-fold-workspace',
+    hostId: 'local',
+    agent: 'claude',
+    providerHandle: { kind: 'claude', sessionId: providerSessionId, leafUuid: null }
+  }
+}
+
+async function until(check: () => boolean, timeoutMs: number): Promise<boolean> {
+  const deadline = Date.now() + timeoutMs
+  while (Date.now() < deadline) {
+    if (check()) {
+      return true
+    }
+    await new Promise((resolve) => setTimeout(resolve, 200))
+  }
+  return check()
+}
+
+describe.skipIf(!realClaudeAvailable)('Claude structured real CLI fold', () => {
+  it.skipIf(!realClaudeAuthenticated)(
+    'keeps one turn row when the CLI folds a mid-turn send',
+    async () => {
+      const providerSessionId = randomUUID()
+      const { claudeConfigDir, env } = realClaudeLaunchHome()
+      const cwd = await mkdtemp(join(tmpdir(), 'orca-real-fold-'))
+      const events: ClaudeStructuredSessionEvent[] = []
+      const turnRows: NonNullable<ReturnType<typeof readAgentJournalTurn>>[] = []
+      const sink: StructuredAgentSessionEventSink = {
+        appendItem: (_identity, body: AgentJournalItemBody) => {
+          const turn = readAgentJournalTurn(body)
+          if (turn) {
+            turnRows.push(turn)
+          }
+        },
+        appendTombstone: () => {},
+        publish: () => {}
+      }
+      const settled = vi.fn()
+      const adapter = new ClaudeStructuredSessionAdapter({
+        resolveLaunch: async () => ({
+          pathToClaudeCodeExecutable: realClaudeCommand,
+          options: {
+            ...CLAUDE_STRUCTURED_BASE_OPTIONS,
+            extraArgs: {
+              ...CLAUDE_STRUCTURED_BASE_OPTIONS.extraArgs,
+              settings: FOLD_SESSION_SETTINGS
+            },
+            sessionId: providerSessionId
+          },
+          cwd,
+          env,
+          claudeConfigDir,
+          providerSessionId,
+          resumeLeafUuid: null,
+          resumesTranscript: false,
+          continuesChain: false
+        }),
+        onEvent: (event) => events.push(event),
+        onDispatchSettledLate: settled,
+        readProcessStartTime: async () => 1
+      })
+      try {
+        await adapter.acquire({
+          identity: identity(providerSessionId),
+          fence: 1,
+          spawnToken: 'real-cli-fold',
+          events: sink
+        })
+        await adapter.awaitStarted(SESSION_ID)
+        // Startup proved from the SessionStart hook frame, with no init yet.
+        expect(
+          events.some(
+            (event) =>
+              event.type === 'message' &&
+              event.message.type === 'system' &&
+              event.message.subtype === 'init'
+          )
+        ).toBe(false)
+
+        await expect(
+          adapter.dispatch({
+            sessionId: SESSION_ID,
+            clientMessageId: 'client-A',
+            body: {
+              kind: 'message',
+              role: 'user',
+              blocks: [
+                {
+                  type: 'text',
+                  text: 'Use the Bash tool to run `sleep 8` two separate times, one call at a time, waiting for each. Then reply exactly: FIRST DONE'
+                }
+              ]
+            },
+            requestedAt: Date.now(),
+            fence: 1
+          })
+        ).resolves.toEqual({ state: 'admitted' })
+
+        // Wait for A's replay to open the turn, then send B mid-turn: the first
+        // `sleep 8` guarantees the CLI is still inside A's request cycle.
+        expect(
+          await until(
+            () => events.some((event) => event.type === 'message' && event.startsTurn === true),
+            30_000
+          )
+        ).toBe(true)
+        await new Promise((resolve) => setTimeout(resolve, 2_000))
+        await expect(
+          adapter.dispatch({
+            sessionId: SESSION_ID,
+            clientMessageId: 'client-B',
+            body: {
+              kind: 'message',
+              role: 'user',
+              blocks: [{ type: 'text', text: 'Also say the word banana at the end of your reply.' }]
+            },
+            requestedAt: Date.now(),
+            fence: 1
+          })
+        ).resolves.toEqual({ state: 'admitted' })
+
+        const results = () =>
+          events.flatMap((event) =>
+            event.type === 'message' && event.message.type === 'result' ? [event.message] : []
+          )
+        expect(await until(() => results().length > 0, 90_000)).toBe(true)
+
+        // The CLI folded: one result names both sends. (If this ever reports a
+        // lone send, the steer raced past the fold window — a miss, not a fold.)
+        const named = results().flatMap((message) =>
+          Array.isArray(message.user_message_uuids) ? [message.user_message_uuids] : []
+        )
+        expect(named[0]).toHaveLength(2)
+
+        // ONE turn for the whole run: never interrupted, and B settled accepted
+        // into it under its own adopted uuid.
+        expect(turnRows.every((turn) => turn.state !== 'interrupted')).toBe(true)
+        expect([...new Set(turnRows.map((turn) => turn.turnId))]).toHaveLength(1)
+        expect(turnRows.at(-1)).toMatchObject({ state: 'completed' })
+        expect(settled).toHaveBeenCalledWith(
+          expect.objectContaining({
+            sessionId: SESSION_ID,
+            clientMessageId: 'client-B',
+            providerIdentity: expect.objectContaining({ provider: 'claude' })
+          })
+        )
+      } finally {
+        await adapter.closeAll()
+      }
+    },
+    150_000
+  )
+})
diff --git a/src/main/claude/claude-structured-real-cli.test.ts b/src/main/claude/claude-structured-real-cli.test.ts
index 4181dab43c7a..73bec7986c84 100644
--- a/src/main/claude/claude-structured-real-cli.test.ts
+++ b/src/main/claude/claude-structured-real-cli.test.ts
@@ -1,55 +1,31 @@
-import { spawnSync } from 'node:child_process'
 import { randomUUID } from 'node:crypto'
 import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { homedir, tmpdir } from 'node:os'
 import { basename, join, relative } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types'
-import { resolveClaudeCommand } from '../codex-cli/command'
 import { resolveSessionFilePath } from '../native-chat/session-file-resolver'
-import { getSpawnArgsForWindows } from '../win32-utils'
 import { CLAUDE_STRUCTURED_BASE_OPTIONS } from './claude-structured-launch-resolution'
+import {
+  realClaudeAuthenticated,
+  realClaudeAuthStatus,
+  realClaudeAvailable,
+  realClaudeCommand
+} from './claude-real-cli-availability-test-support'
 import {
   ClaudeStructuredSessionAdapter,
   type ClaudeStructuredSessionEvent
 } from './claude-structured-session-adapter'
+import type { ClaudeStructuredSessionAdapterDeps } from './claude-structured-session-state'
 
-const command = resolveClaudeCommand()
-const versionLaunch = getSpawnArgsForWindows(command, ['--version'])
-const realClaudeAvailable =
-  spawnSync(versionLaunch.spawnCmd, versionLaunch.spawnArgs, {
-    stdio: 'ignore',
-    windowsHide: true,
-    timeout: 5_000
-  }).status === 0
-const authStatusLaunch = getSpawnArgsForWindows(command, ['auth', 'status', '--json'])
-/** The CLI's own account report — the only source of truth for where it writes that
- *  is not derived from Orca's own path expressions. */
-const realClaudeAuthStatus = (() => {
-  if (!realClaudeAvailable) {
-    return null
-  }
-  const result = spawnSync(authStatusLaunch.spawnCmd, authStatusLaunch.spawnArgs, {
-    encoding: 'utf8',
-    windowsHide: true,
-    timeout: 5_000
-  })
-  if (result.status !== 0) {
-    return null
-  }
-  try {
-    return JSON.parse(result.stdout) as { loggedIn?: boolean; projectsDirectory?: string }
-  } catch {
-    return null
-  }
-})()
-const realClaudeAuthenticated = realClaudeAuthStatus?.loggedIn === true
+const command = realClaudeCommand
 
 function realAdapter(
   providerSessionId: string,
   claudeConfigDir: string,
   events: ClaudeStructuredSessionEvent[] = [],
-  cwd = process.cwd()
+  cwd = process.cwd(),
+  onDispatchSettledLate?: ClaudeStructuredSessionAdapterDeps['onDispatchSettledLate']
 ): ClaudeStructuredSessionAdapter {
   const adapter = new ClaudeStructuredSessionAdapter({
     resolveLaunch: async () => ({
@@ -63,6 +39,7 @@ function realAdapter(
       continuesChain: false
     }),
     onEvent: (event) => events.push(event),
+    ...(onDispatchSettledLate ? { onDispatchSettledLate } : {}),
     readProcessStartTime: async () => 1,
     now: () => 2
   })
@@ -70,7 +47,7 @@ function realAdapter(
   const acquire = adapter.acquire
   adapter.acquire = async (input) => {
     const acquisition = await acquire(input)
-    await adapter.drainStartup(input.identity.sessionId)
+    await adapter.awaitStarted(input.identity.sessionId)
     return acquisition
   }
   return adapter
@@ -302,6 +279,161 @@ describe.skipIf(!realClaudeAvailable)('Claude structured real CLI handshake', ()
     90_000
   )
 
+  // The window a Stop naming no turn exists for: Orca has written the message, and Claude has not
+  // started its reply, so no turn id exists. Only the live binary can say the interrupt lands there.
+  it.skipIf(!realClaudeAuthenticated)(
+    'stops a message interrupted before its reply starts, and takes the next one',
+    async () => {
+      const providerSessionId = randomUUID()
+      const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude')
+      const events: ClaudeStructuredSessionEvent[] = []
+      const adapter = realAdapter(providerSessionId, claudeConfigDir, events)
+      const frames = (from: number) =>
+        events.slice(from).flatMap((event) => (event.type === 'message' ? [event.message] : []))
+      const replyStarted = (from: number) =>
+        frames(from).some(
+          (frame) =>
+            frame.type === 'stream_event' &&
+            typeof frame.event === 'object' &&
+            frame.event !== null &&
+            'type' in frame.event &&
+            frame.event.type === 'message_start'
+        )
+      const result = async (from: number) => {
+        const deadline = Date.now() + 60_000
+        for (;;) {
+          const found = frames(from).find((frame) => frame.type === 'result')
+          if (found || Date.now() >= deadline) {
+            return found
+          }
+          await new Promise((resolve) => setTimeout(resolve, 100))
+        }
+      }
+      const send = (clientMessageId: string, text: string) =>
+        adapter.dispatch({
+          sessionId: 'real-cli-handshake',
+          clientMessageId,
+          body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] },
+          fence: 1
+        })
+
+      try {
+        await adapter.acquire({
+          identity: identity(providerSessionId),
+          fence: 1,
+          spawnToken: 'real-cli-stop'
+        })
+        const first = events.length
+        await expect(
+          send('real-cli-stop-1', 'Count from 1 to 300, one number per line, and nothing else.')
+        ).resolves.toEqual({ state: 'admitted' })
+        const startedBeforeStop = replyStarted(first)
+
+        await expect(
+          adapter.cancelTurn({ sessionId: 'real-cli-handshake', fence: 1 })
+        ).resolves.toEqual({
+          cancelled: true
+        })
+        const stopped = await result(first)
+
+        expect(startedBeforeStop).toBe(false)
+        // Claude 2.1.280 echoes the message, then ends that turn as interrupted without replying.
+        expect(stopped).toMatchObject({ subtype: 'error_during_execution' })
+        expect(replyStarted(first)).toBe(false)
+
+        const second = events.length
+        await expect(send('real-cli-stop-2', 'Reply with the single word ok.')).resolves.toEqual({
+          state: 'admitted'
+        })
+        await expect(result(second)).resolves.toMatchObject({ subtype: 'success' })
+      } finally {
+        await adapter.closeAll()
+      }
+    },
+    150_000
+  )
+
+  // Orca installs a SessionStart hook, so its frame proves most real starts before the turn's
+  // system/init, the only frame that says this CLI can cancel what it queued.
+  it.skipIf(!realClaudeAuthenticated)(
+    'withdraws a follow-up queued behind a turn that is stopped, behind a SessionStart hook',
+    async () => {
+      const providerSessionId = randomUUID()
+      const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude')
+      const cwd = await mkdtemp(join(tmpdir(), 'orca-queued-stop-'))
+      await mkdir(join(cwd, '.claude'), { recursive: true })
+      await writeFile(
+        join(cwd, '.claude', 'settings.json'),
+        JSON.stringify({
+          hooks: { SessionStart: [{ hooks: [{ type: 'command', command: 'true' }] }] }
+        })
+      )
+      const events: ClaudeStructuredSessionEvent[] = []
+      const settlements: unknown[] = []
+      const adapter = realAdapter(providerSessionId, claudeConfigDir, events, cwd, (settlement) =>
+        settlements.push(settlement)
+      )
+      const send = (clientMessageId: string, text: string) =>
+        adapter.dispatch({
+          sessionId: 'real-cli-handshake',
+          clientMessageId,
+          body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] },
+          fence: 1
+        })
+      const waitFor = async (found: () => boolean): Promise<boolean> => {
+        const deadline = Date.now() + 60_000
+        while (!found() && Date.now() < deadline) {
+          await new Promise((resolve) => setTimeout(resolve, 100))
+        }
+        return found()
+      }
+
+      try {
+        await adapter.acquire({
+          identity: identity(providerSessionId),
+          fence: 1,
+          spawnToken: 'real-cli-queued-stop'
+        })
+        await send('real-cli-queued-stop-a', 'Count from 1 to 400, one number per line.')
+        // A's reply is streaming, so the next send queues behind its turn.
+        await expect(
+          waitFor(() =>
+            events.some(
+              (event) =>
+                event.type === 'message' &&
+                event.message.type === 'stream_event' &&
+                JSON.stringify(event.message).includes('text_delta')
+            )
+          )
+        ).resolves.toBe(true)
+        await send('real-cli-queued-stop-b', 'Say the word banana.')
+
+        await expect(
+          adapter.cancelTurn({
+            sessionId: 'real-cli-handshake',
+            turnId: 'turn-a',
+            fence: 1,
+            resolveLiveTurnId: () => 'turn-a',
+            // What the host reads for B: handed over, not yet answered.
+            dispatchStatus: { state: 'pending', recovered: false }
+          })
+        ).resolves.toEqual({ cancelled: true })
+
+        expect(settlements).toContainEqual({
+          sessionId: 'real-cli-handshake',
+          clientMessageId: 'real-cli-queued-stop-b',
+          state: 'rejected',
+          reason: 'provider_cancelled_before_start',
+          rejection: { kind: 'cancelled' }
+        })
+      } finally {
+        await adapter.closeAll()
+        await rm(cwd, { recursive: true, force: true })
+      }
+    },
+    150_000
+  )
+
   it('turns a real silent unauthenticated startup into sign-in guidance', async () => {
     const claudeConfigDir = await mkdtemp(join(tmpdir(), 'orca-claude-no-auth-'))
     const providerSessionId = randomUUID()
diff --git a/src/main/claude/claude-structured-requested-stop.test.ts b/src/main/claude/claude-structured-requested-stop.test.ts
new file mode 100644
index 000000000000..993109f4a378
--- /dev/null
+++ b/src/main/claude/claude-structured-requested-stop.test.ts
@@ -0,0 +1,90 @@
+import { describe, expect, it } from 'vitest'
+import type {
+  AgentJournalItemBody,
+  AgentJournalItemIdentity
+} from '../../shared/agent-session-journal-types'
+import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import type { ClaudeStructuredSessionEvent } from './claude-structured-session-state'
+import {
+  PROVIDER_SESSION_ID,
+  USER_MESSAGE,
+  adapterFor,
+  fakeClaude,
+  identityFor
+} from './claude-structured-session-test-support'
+
+function journalSink() {
+  const items: { identity: AgentJournalItemIdentity; body: AgentJournalItemBody }[] = []
+  const sink: StructuredAgentSessionEventSink = {
+    appendItem: (identity, body) => items.push({ identity, body }),
+    appendTombstone: () => {},
+    publish: () => {}
+  }
+  return { sink, items }
+}
+
+function frame(type: 'assistant' | 'user', uuid: string, content: unknown[]) {
+  return {
+    type,
+    uuid,
+    session_id: PROVIDER_SESSION_ID,
+    parent_tool_use_id: null,
+    message: { role: type, content }
+  }
+}
+
+describe('a requested stop of a structured Claude chat', () => {
+  it('reads interrupted, not failed or crashed, through the frames the stop makes Claude emit', async () => {
+    const claude = fakeClaude({ replayUuid: 'turn-1' })
+    const events: ClaudeStructuredSessionEvent[] = []
+    const adapter = adapterFor(claude, {}, events)
+    const journal = journalSink()
+    await adapter.acquire({
+      identity: identityFor(),
+      fence: 7,
+      spawnToken: 'spawn-9',
+      events: journal.sink
+    })
+    await adapter.dispatch({
+      sessionId: 'session-1',
+      clientMessageId: 'client-1',
+      body: USER_MESSAGE,
+      fence: 7
+    })
+    const connection = claude.connections[0]!
+    connection.handlers.onMessage?.(
+      frame('assistant', 'assistant-1', [
+        { type: 'tool_use', id: 'tool-1', name: 'Bash', input: { command: 'sleep 120' } }
+      ])
+    )
+    // What Claude 2.1.283 emitted within 35 ms of the supervised SIGTERM mid-tool, recorded
+    // against the real CLI: the killed tool's result, a status frame, and no `result` frame.
+    connection.close = async () => {
+      connection.handlers.onMessage?.(
+        frame('user', 'user-2', [
+          { type: 'tool_result', tool_use_id: 'tool-1', is_error: true, content: 'Exit code 137' }
+        ])
+      )
+      connection.handlers.onMessage?.({
+        type: 'system',
+        subtype: 'status',
+        uuid: 'status-1',
+        session_id: PROVIDER_SESSION_ID
+      })
+      connection.closed = true
+      return true
+    }
+
+    await expect(adapter.closeSession('session-1')).resolves.toBe(true)
+
+    const turns = journal.items.flatMap((item) => {
+      const turn = readAgentJournalTurn(item.body)
+      return turn ? [turn] : []
+    })
+    expect(turns.at(-1)).toMatchObject({ turnId: 'turn-1', state: 'interrupted' })
+    const ended = events.filter((event) => event.type === 'ended')
+    expect(ended).toEqual([expect.objectContaining({ reason: 'claude session closed' })])
+    expect(ended[0]).not.toHaveProperty('cause')
+  })
+})
diff --git a/src/main/claude/claude-structured-session-acquisition-processless.test.ts b/src/main/claude/claude-structured-session-acquisition-processless.test.ts
index 85de77bbbd89..eb4babdb9aca 100644
--- a/src/main/claude/claude-structured-session-acquisition-processless.test.ts
+++ b/src/main/claude/claude-structured-session-acquisition-processless.test.ts
@@ -37,7 +37,7 @@ describe('Claude structured processless acquisition', () => {
         getContextUsage: async () => ({}),
         supportedModels: async () => [],
         interrupt: async () => undefined,
-        cancelAsyncMessage: async () => {},
+        cancelAsyncMessage: async () => false,
         setModel: async () => {},
         setPermissionMode: async () => {},
         applyFlagSettings: async () => {},
diff --git a/src/main/claude/claude-structured-session-acquisition.ts b/src/main/claude/claude-structured-session-acquisition.ts
index b2efed691ee9..cd8836e4b826 100644
--- a/src/main/claude/claude-structured-session-acquisition.ts
+++ b/src/main/claude/claude-structured-session-acquisition.ts
@@ -7,8 +7,12 @@ import { CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE } from '../claude-accounts/envir
 import { isClaudeAuthSwitchInProgress } from '../claude-accounts/live-pty-gate'
 import { openClaudeStreamJsonConnection } from './claude-stream-json-connection'
 import { buildClaudePermissionCallbacks } from './claude-structured-inbound-control'
-import { resolveClaudeReplayTurn } from './claude-structured-dispatch'
-import { readClaudeFrameString, readClaudeInit } from './claude-structured-init-proof'
+import { resolveClaudeReplayTurn } from './claude-replay-turn-resolution'
+import {
+  readClaudeCapabilities,
+  readClaudeFrameString,
+  readClaudeInit
+} from './claude-structured-init-proof'
 import { claudeConfigDirEnvPatch } from './claude-config-dir-pin'
 import { CLAUDE_SPAWN_TOKEN_ENV, claudeProcessIdentity } from './claude-structured-owner-identity'
 import { ClaudePromptRegistry } from './claude-structured-prompt-replies'
@@ -30,6 +34,7 @@ import {
   type ClaudeAcquireCallbacks
 } from './claude-structured-session-state'
 import { resolveClaudeAcquisitionError } from './claude-structured-session-close'
+import { withObservedProviderExit } from '../native-chat/agent-session-wire/structured-agent-session-failure-text'
 import { readClaudeTranscriptEntryUuid } from './claude-transcript-entry-uuid'
 import { persistClaudeTurnResumePoint } from './claude-structured-resume-point'
 import { withAgentSessionCreatePhase } from '../observability/agent-session-instrumentation'
@@ -58,7 +63,9 @@ export async function acquireClaudeSession({
   // A managed-account switch is mid-swap of the pinned credential home; refuse here,
   // before this acquisition cancels the previous attempt and closes the live session.
   if (isClaudeAuthSwitchInProgress()) {
-    throw new AgentSessionPreSpawnError(new Error(CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE))
+    throw new AgentSessionPreSpawnError(new Error(CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE), {
+      reason: 'accountSwitchInProgress'
+    })
   }
   const sessionId = input.identity.sessionId
   const prompts = new ClaudePromptRegistry()
@@ -98,6 +105,9 @@ export async function acquireClaudeSession({
         liveSession.reportedOptions.model = init.model
         liveSession.reportedModelMutation = liveSession.optionMutationSequence
       }
+      if (liveSession) {
+        liveSession.capabilities = readClaudeCapabilities(liveSession.capabilities, init.message)
+      }
     }
     observedLeafUuid = readClaudeTranscriptEntryUuid(message) ?? observedLeafUuid
     if (liveSession) {
@@ -108,9 +118,12 @@ export async function acquireClaudeSession({
         persistClaudeTurnResumePoint(sessionId, liveSession, deps)
       }
     }
+    // Settled after the turn this echo opens is emitted: a send read as answered before its turn
+    // lands reads as nothing running, and Stop and Working blink off in between.
+    const settlements: (() => void)[] = []
     const turnOrigin = liveSession
       ? resolveClaudeReplayTurn(liveSession, message, (settlement) =>
-          deps.onDispatchSettledLate?.({ sessionId, ...settlement })
+          settlements.push(() => deps.onDispatchSettledLate?.({ sessionId, ...settlement }))
         )
       : null
     const startsTurn = turnOrigin !== null
@@ -128,6 +141,9 @@ export async function acquireClaudeSession({
         ...observedAt
       })
     )
+    for (const settle of settlements) {
+      settle()
+    }
   }
   const { canUseTool, onUserDialog } = buildClaudePermissionCallbacks({
     sessionId,
@@ -178,6 +194,8 @@ export async function acquireClaudeSession({
             initProof.reject(error)
           },
           onExit: (error) => {
+            // The child exited on its own; marked in place, as the fault report may hold this error.
+            withObservedProviderExit(error)
             childEnded ??= error
             initProof.reject(error)
             callbacks.handleExit(sessionId, attempt, error)
@@ -248,30 +266,34 @@ export async function acquireClaudeSession({
         event()
       }
     })
-    session.startup.settled = settleClaudeSessionStartup({
-      session,
-      facts: readClaudeStartupFacts({
-        connection,
-        initProof,
-        sessionId,
-        providerSessionId: launch.providerSessionId,
-        resumesTranscript: launch.resumesTranscript,
-        inputOptions: input.options,
-        requestTimeoutMs: deps.requestTimeoutMs,
-        emit
-      }),
-      isCurrent: () => sessions.get(sessionId) === session,
-      requestTimeoutMs: deps.requestTimeoutMs,
-      fault: (error) => callbacks.handleExit(sessionId, attempt, error),
-      onStarted: (options) =>
-        emit({
-          type: 'started',
+    // Whichever comes first: the start landing or faulting, or the child being ended.
+    session.startup.settled = Promise.race([
+      session.startup.settled,
+      settleClaudeSessionStartup({
+        session,
+        facts: readClaudeStartupFacts({
+          connection,
+          initProof,
           sessionId,
-          fence: input.fence,
-          acquisitionGeneration: session.acquisitionGeneration,
-          ...options
-        })
-    })
+          providerSessionId: launch.providerSessionId,
+          resumesTranscript: launch.resumesTranscript,
+          inputOptions: input.options,
+          requestTimeoutMs: deps.requestTimeoutMs,
+          emit
+        }),
+        isCurrent: () => sessions.get(sessionId) === session,
+        requestTimeoutMs: deps.requestTimeoutMs,
+        fault: (error) => callbacks.handleExit(sessionId, attempt, error),
+        onStarted: (options) =>
+          emit({
+            type: 'started',
+            sessionId,
+            fence: input.fence,
+            acquisitionGeneration: session.acquisitionGeneration,
+            ...options
+          })
+      })
+    ])
     // A child whose exit already reached `handleExit` is not handed over as live: the create
     // fails with the CLI's own diagnostic, as one that died before publish does.
     if (sessions.get(sessionId) !== session) {
diff --git a/src/main/claude/claude-structured-session-adapter-turns.test.ts b/src/main/claude/claude-structured-session-adapter-turns.test.ts
index caafee6a94b9..d410861464a9 100644
--- a/src/main/claude/claude-structured-session-adapter-turns.test.ts
+++ b/src/main/claude/claude-structured-session-adapter-turns.test.ts
@@ -68,7 +68,11 @@ describe('ClaudeStructuredSessionAdapter turns and controls', () => {
         body: USER_MESSAGE,
         fence: 7
       })
-    ).resolves.toEqual({ state: 'rejected', reason: 'provider_write_failed: broken pipe' })
+    ).resolves.toEqual({
+      state: 'rejected',
+      reason: 'provider_write_failed',
+      rejection: { kind: 'writeFailed' }
+    })
   })
 
   it('requires an acknowledged interrupt and supports controlled options', async () => {
@@ -219,6 +223,13 @@ describe('ClaudeStructuredSessionAdapter turns and controls', () => {
       }
     })
     const adapter = await acquired(claude)
+    // The model is reported by a cycle's init frame, so start one.
+    await adapter.dispatch({
+      sessionId: 'session-1',
+      clientMessageId: 'seed-cycle',
+      body: USER_MESSAGE,
+      fence: 7
+    })
 
     await expect(adapter.readOptions({ sessionId: 'session-1', fence: 7 })).resolves.toEqual({
       models: [
@@ -247,6 +258,13 @@ describe('ClaudeStructuredSessionAdapter turns and controls', () => {
       }
     })
     const adapter = await acquired(claude)
+    // The custom model only reports on the first cycle's init frame.
+    await adapter.dispatch({
+      sessionId: 'session-1',
+      clientMessageId: 'seed-cycle',
+      body: USER_MESSAGE,
+      fence: 7
+    })
     const result = await adapter.readOptions({ sessionId: 'session-1', fence: 7 })
 
     expect(result.models.map((model) => model.id)).toEqual([
diff --git a/src/main/claude/claude-structured-session-adapter.test.ts b/src/main/claude/claude-structured-session-adapter.test.ts
index 376cac9d52f1..ee14b6b525a8 100644
--- a/src/main/claude/claude-structured-session-adapter.test.ts
+++ b/src/main/claude/claude-structured-session-adapter.test.ts
@@ -18,12 +18,12 @@ import {
   adapterFor,
   fakeClaude,
   identityFor,
-  invokeCanUseTool,
   PROVIDER_SESSION_ID,
   tick,
   USER_MESSAGE,
   type FakeConnection
 } from './claude-structured-session-test-support'
+import { invokeCanUseTool } from './claude-can-use-tool-test-support'
 
 describe('ClaudeStructuredSessionAdapter.acquire', () => {
   it('pins the account and proves init without treating the system-frame uuid as a chain leaf', async () => {
@@ -62,7 +62,8 @@ describe('ClaudeStructuredSessionAdapter.acquire', () => {
       mintedAtFence: 7,
       observedAt: 1_700_000_000_500
     })
-    expect(events[0]).toMatchObject({ type: 'message', message: { subtype: 'init' } })
+    // Live proof order: the SessionStart hook frame arrives before any init.
+    expect(events[0]).toMatchObject({ type: 'message', message: { subtype: 'hook_started' } })
   })
 
   it('restores persisted model and effort before publishing a reacquired session', async () => {
@@ -344,7 +345,10 @@ describe('ClaudeStructuredSessionAdapter.acquire', () => {
       session_id: 'foreign-provider-session'
     })
     await Promise.resolve()
-    expect(events.filter((event) => event.type === 'message')).toHaveLength(1)
+    // Startup hook proof + the first cycle's init are admitted; nothing foreign is.
+    expect(
+      events.flatMap((event) => (event.type === 'message' ? [event.message.subtype] : []))
+    ).toEqual(['hook_started', 'hook_response', 'init'])
     expect(settled).not.toHaveBeenCalled()
 
     connection.handlers.onMessage?.({
diff --git a/src/main/claude/claude-structured-session-adapter.ts b/src/main/claude/claude-structured-session-adapter.ts
index b8cc5c1dec58..29b51e730ae9 100644
--- a/src/main/claude/claude-structured-session-adapter.ts
+++ b/src/main/claude/claude-structured-session-adapter.ts
@@ -1,3 +1,4 @@
+import type { SubmissionRejectionFact } from '../../shared/agent-session-failure'
 import { compactClaudeSession, observeClaudeCompaction } from './claude-structured-compaction'
 import type {
   AgentSessionAcquisition,
@@ -12,7 +13,10 @@ import { acquireClaudeSession } from './claude-structured-session-acquisition'
 import { supportsClaudeStructuredLocation } from './claude-structured-location-support'
 import { setClaudeStructuredSessionOption } from './claude-structured-options'
 import { readClaudeStructuredSessionOptions } from './claude-structured-session-options'
-import { claudeStartupSettledWithin } from './claude-structured-session-startup-gate'
+import {
+  claudeStartupFailureFact,
+  claudeStartupSettledWithin
+} from './claude-structured-session-startup-state'
 import { CLAUDE_DEFAULT_REQUEST_TIMEOUT_MS } from './claude-agent-sdk-control-requests'
 import {
   ClaudeAcquisitionRegistry,
@@ -115,9 +119,16 @@ export class ClaudeStructuredSessionAdapter implements StructuredAgentSessionAda
    *  apart without guessing at wall-clock. */
   drainObservedExits = (): Promise<void> => drainClaudeObservedExits(this.exits)
 
-  /** Resolves once a published session's startup has landed or faulted it. */
-  drainStartup = (sessionId: string): Promise<void> =>
-    this.sessions.get(sessionId)?.startup.settled ?? Promise.resolve()
+  /** Resolves once a published session's startup has landed, faulted, or been ended by a close;
+   *  with the reason when it did not land. */
+  awaitStarted = async (sessionId: string): Promise<void | SubmissionRejectionFact> => {
+    const session = this.sessions.get(sessionId)
+    if (!session) {
+      return
+    }
+    await session.startup.settled
+    return claudeStartupFailureFact(session) ?? undefined
+  }
 
   /** Restart reconciliation reads the transcript a resume replays; these maps track liveness. */
   providerHistoryWindow: NonNullable<StructuredAgentSessionAdapter['providerHistoryWindow']> = (
@@ -179,9 +190,7 @@ export class ClaudeStructuredSessionAdapter implements StructuredAgentSessionAda
   }
 
   dispatch: StructuredAgentSessionAdapter['dispatch'] = (input) =>
-    dispatchClaudeTurn(this.session(input.sessionId), input, input.beforeDispatch, (settlement) =>
-      this.deps.onDispatchSettledLate?.({ sessionId: input.sessionId, ...settlement })
-    )
+    dispatchClaudeTurn(this.session(input.sessionId), input, input.beforeDispatch)
 
   compact: NonNullable<StructuredAgentSessionAdapter['compact']> = (input) =>
     compactClaudeSession(this.session(input.sessionId), this.compactions, input)
@@ -236,7 +245,8 @@ export class ClaudeStructuredSessionAdapter implements StructuredAgentSessionAda
     )
   readOptions = (input: { sessionId: string; fence: number }) =>
     readClaudeStructuredSessionOptions(this.session(input.sessionId), this.deps.requestTimeoutMs)
-  recordsContextUsage = (sessionId: string): boolean => this.sessions.has(sessionId)
+  // Provider-level: a session at rest still reports the usage its journal recorded.
+  recordsContextUsage = (): boolean => true
 
   readOptionRestoreFailures = (sessionId: string): readonly string[] => [
     ...(this.sessions.get(sessionId)?.restoreSkippedOptions ?? [])
diff --git a/src/main/claude/claude-structured-session-exit-blame.test.ts b/src/main/claude/claude-structured-session-exit-blame.test.ts
new file mode 100644
index 000000000000..79430131e15c
--- /dev/null
+++ b/src/main/claude/claude-structured-session-exit-blame.test.ts
@@ -0,0 +1,66 @@
+// After a Claude start lands, only the child's own exit says Claude stopped; a fault on Orca's
+// side that makes Orca close the child is Orca's.
+
+import { describe, expect, it, vi } from 'vitest'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import type { ClaudeStructuredSessionEvent } from './claude-structured-session-adapter'
+import {
+  adapterFor,
+  fakeClaude,
+  identityFor,
+  PROVIDER_SESSION_ID
+} from './claude-structured-session-test-support'
+
+async function startedClaude(sink: StructuredAgentSessionEventSink) {
+  const claude = fakeClaude()
+  const events: ClaudeStructuredSessionEvent[] = []
+  const adapter = adapterFor(claude, {}, events)
+  await adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9', events: sink })
+  const ended = async () => {
+    await vi.waitFor(() => expect(events.some((event) => event.type === 'ended')).toBe(true))
+    return events.find((event) => event.type === 'ended')
+  }
+  return { connection: claude.connections[0], ended }
+}
+
+describe('what a started Claude session says ended it', () => {
+  it('says Claude stopped when the child exits on its own', async () => {
+    const { connection, ended } = await startedClaude({
+      appendItem: () => {},
+      appendTombstone: () => {},
+      publish: () => {}
+    })
+
+    connection.handlers.onExit?.(new Error('claude stream-json exited (code 1): killed'))
+
+    expect(await ended()).toMatchObject({
+      cause: 'unexpected-exit',
+      failure: { kind: 'providerExited' }
+    })
+  })
+
+  it('blames Orca when a journal fault makes Orca close the child', async () => {
+    const { connection, ended } = await startedClaude({
+      appendItem: () => {},
+      appendTombstone: () => {},
+      publish: () => {},
+      tryAppendResolvedItemAndPublish: () => ({ accepted: false, reason: 'failed' })
+    })
+
+    connection.handlers.onMessage?.({
+      type: 'system',
+      subtype: 'task_notification',
+      session_id: PROVIDER_SESSION_ID,
+      task_id: 'task-1',
+      status: 'failed',
+      summary: 'failed'
+    })
+
+    expect(await ended()).toMatchObject({
+      reason: 'claude background task journal sink failed',
+      cause: 'unexpected-exit',
+      failure: { kind: 'hostFault' }
+    })
+    expect(connection.closeCount).toBeGreaterThanOrEqual(1)
+  })
+})
diff --git a/src/main/claude/claude-structured-session-exit-lifecycle.ts b/src/main/claude/claude-structured-session-exit-lifecycle.ts
index 4f39a8dc4679..854646490a8c 100644
--- a/src/main/claude/claude-structured-session-exit-lifecycle.ts
+++ b/src/main/claude/claude-structured-session-exit-lifecycle.ts
@@ -1,9 +1,14 @@
+import { agentSessionFailureFact, providerDiagnosticOf } from '../../shared/agent-session-failure'
+import {
+  providerExitObserved,
+  providerStartupFailureFact
+} from '../native-chat/agent-session-wire/structured-agent-session-failure-text'
 import { settledClaudeTurnEndLeaf } from './claude-structured-resume-point'
 import {
   claudeRootExitObserved,
   settleClaudeExitedSession
 } from './claude-structured-session-close'
-import { failClaudeStartupGate } from './claude-structured-session-startup-gate'
+import { failClaudeStartup } from './claude-structured-session-startup-state'
 import type {
   ClaudeAcquisitionAttempt,
   ClaudeSession,
@@ -32,7 +37,9 @@ export function observeClaudeSessionExit(
     return
   }
   lifecycle.sessions.delete(sessionId)
-  failClaudeStartupGate(session, error)
+  // Not marked here: startup and journal faults end the session this way too. The child's own
+  // exit arrives already marked by the connection's exit callback.
+  failClaudeStartup(session, error)
   // Re-enter the provider's close ladder before publishing lifecycle recovery.
   // An exit callback is root evidence only; the retained tree proof must run
   // before the host releases and reacquires this exact child.
@@ -85,6 +92,16 @@ export function settleClaudeUnexpectedExit(
       type: 'ended',
       sessionId,
       reason: exit.error.message,
+      // A start that never landed says why it failed. After it landed, only the child's own exit
+      // blames the provider; an Orca fault that closed it is Orca's.
+      failure:
+        exit.session.startup.state !== 'proven'
+          ? providerStartupFailureFact(exit.session.startup.failure ?? exit.error)
+          : providerExitObserved(exit.error)
+            ? agentSessionFailureFact('providerExited', {
+                detail: providerDiagnosticOf(exit.error)
+              })
+            : agentSessionFailureFact('hostFault'),
       cause: 'unexpected-exit',
       fence: exit.session.fence,
       acquisitionGeneration: exit.session.acquisitionGeneration,
diff --git a/src/main/claude/claude-structured-session-options.ts b/src/main/claude/claude-structured-session-options.ts
index f50923162e5a..f4c59148241b 100644
--- a/src/main/claude/claude-structured-session-options.ts
+++ b/src/main/claude/claude-structured-session-options.ts
@@ -223,15 +223,37 @@ export function claudeCatalogAdmitsModel(models: readonly ListedModel[], modelId
   )
 }
 
-function wireClaudeModels(models: readonly ListedModel[]): AgentSessionOptionsResult['models'] {
-  return models.map((entry) => ({
+type WireClaudeModel = AgentSessionOptionsResult['models'][number]
+
+function wireClaudeModel(entry: ListedModel): WireClaudeModel {
+  return {
     id: entry.id,
     label: entry.label,
     ...(entry.description ? { description: entry.description } : {}),
     isDefault: entry.isDefault,
     efforts: entry.efforts,
     ...(entry.supportsFastMode !== undefined ? { supportsFastMode: entry.supportsFastMode } : {})
-  }))
+  }
+}
+
+function wireClaudeModels(models: readonly ListedModel[]): WireClaudeModel[] {
+  return models.map(wireClaudeModel)
+}
+
+/** The listing, with what the CLI runs when no effort is sent on each model the child applies —
+ *  a default only a running child knows, and only while this session has no effort pick. */
+function catalogClaudeModels(session: ClaudeSession, discovered: ListedModel[]): WireClaudeModel[] {
+  const applied = session.options.has('effort') ? undefined : session.appliedOptions
+  return discovered.map((listed) => {
+    const model = wireClaudeModel(listed)
+    const effort = applied?.effort
+    const runsApplied =
+      applied?.model !== undefined &&
+      (listed.id === applied.model || listed.resolvedModel === applied.model)
+    return effort && runsApplied && model.efforts.some((choice) => choice.value === effort)
+      ? { ...model, defaultEffort: effort }
+      : model
+  })
 }
 
 /** Write a provider-listed catalog through to the host store. Account-level
@@ -243,7 +265,7 @@ function writeClaudeCatalogThrough(session: ClaudeSession, discovered: ListedMod
   }
   const support = claudeFastModeSupport(discovered, undefined)
   session.catalogAccess.store.recordSuccess(session.catalogAccess.fingerprint, 'claude', {
-    models: wireClaudeModels(discovered),
+    models: catalogClaudeModels(session, discovered),
     ...(support ? { fastModeSupport: support } : {}),
     fastModeTierByModel: new Map(),
     origin: 'live-session'
diff --git a/src/main/claude/claude-structured-session-publication.ts b/src/main/claude/claude-structured-session-publication.ts
index d64273f9b8b7..f20bc0c79077 100644
--- a/src/main/claude/claude-structured-session-publication.ts
+++ b/src/main/claude/claude-structured-session-publication.ts
@@ -6,7 +6,7 @@ import type { ClaudeSession } from './claude-structured-session-state'
 import { ClaudeBackgroundTaskTracker } from './claude-background-task-tracker'
 import { ClaudeChildWorkDecoder } from './claude-child-work-decoder'
 import { ClaudeSlashCommandCatalog } from './claude-slash-command-catalog'
-import { createClaudeSessionStartupGate } from './claude-structured-session-startup-gate'
+import { createClaudeSessionStartup } from './claude-structured-session-startup-state'
 
 /** The session as published at spawn: nothing the CLI reports at init is assumed yet. */
 export function createClaudeSessionPublication(input: {
@@ -67,7 +67,7 @@ export function createClaudeSessionPublication(input: {
       translator: input.translator,
       events: input.events,
       ...(input.unbindReadingControl ? { unbindReadingControl: input.unbindReadingControl } : {}),
-      startup: createClaudeSessionStartupGate()
+      startup: createClaudeSessionStartup()
     }
   }
 }
diff --git a/src/main/claude/claude-structured-session-recovery.test.ts b/src/main/claude/claude-structured-session-recovery.test.ts
index ef8e0c654695..71a7ac9ce319 100644
--- a/src/main/claude/claude-structured-session-recovery.test.ts
+++ b/src/main/claude/claude-structured-session-recovery.test.ts
@@ -9,10 +9,10 @@ import {
   adapterFor,
   fakeClaude,
   identityFor,
-  invokeCanUseTool,
   PROVIDER_SESSION_ID,
   tick
 } from './claude-structured-session-test-support'
+import { invokeCanUseTool } from './claude-can-use-tool-test-support'
 
 describe('ClaudeStructuredSessionAdapter close and exit recovery', () => {
   it('shares concurrent close finalization and emits lifecycle once', async () => {
@@ -338,7 +338,7 @@ describe('ClaudeStructuredSessionAdapter close and exit recovery', () => {
       spawnToken: 'spawn-9',
       events: journalSink
     })
-    await adapter.drainStartup('session-1')
+    await adapter.awaitStarted('session-1')
     const first = claude.connections[0]
     const oldPrompt = invokeCanUseTool(first, 'Bash', 'permission-retained', 'tool-retained')
     const oldSession = (
@@ -417,6 +417,7 @@ describe('ClaudeStructuredSessionAdapter close and exit recovery', () => {
         type: 'ended',
         sessionId: 'session-1',
         reason: 'crashed before replacement',
+        failure: { kind: 'providerExited' },
         cause: 'unexpected-exit',
         fence: 7,
         acquisitionGeneration: firstAcquisition.acquisitionGeneration,
diff --git a/src/main/claude/claude-structured-session-startup-gate.ts b/src/main/claude/claude-structured-session-startup-gate.ts
deleted file mode 100644
index 0df789361915..000000000000
--- a/src/main/claude/claude-structured-session-startup-gate.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-// A Claude session is published once its child is spawned, before the CLI has answered
-// initialize. Prompts sent in that window are held here and written, in order, once startup
-// lands (init facts read and saved options restored), so a first turn never runs under
-// defaults the restore was about to replace. A held prompt was never written, so a startup
-// that fails rejects it rather than leaving its delivery in doubt.
-
-import type { AgentSessionDispatchOutcome } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
-import { AgentSessionPreDispatchError } from '../native-chat/agent-session-wire/structured-agent-session-operation-settlement'
-import { dispatchWriteFailureReason } from '../../shared/structured-agent-session-dispatch-rejection'
-import { providerStartupFailureRejection } from '../native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement'
-import { claudeUserMessageWasProvablyUnwritten } from './claude-agent-sdk-user-message-queue'
-import {
-  forgetRetiredWaiter,
-  forgetWaiter,
-  retireWaiter
-} from './claude-structured-dispatch-waiters'
-import type {
-  ClaudeDispatchWaiter,
-  ClaudeLateDispatchOutcome,
-  ClaudeSession
-} from './claude-structured-session-state'
-
-type ClaudeStartupHeldWrite = {
-  waiter: ClaudeDispatchWaiter
-  message: Record<string, unknown>
-  settleLate?: (outcome: ClaudeLateDispatchOutcome) => void
-}
-
-export type ClaudeSessionStartupGate = {
-  state: 'pending' | 'proven' | 'failed'
-  held: ClaudeStartupHeldWrite[]
-  /** Held prompts are still being written; later prompts must queue behind them. */
-  draining: boolean
-  failure: Error | null
-  /** Resolves once startup has landed or faulted the session; never rejects. */
-  settled: Promise<void>
-}
-
-export function createClaudeSessionStartupGate(): ClaudeSessionStartupGate {
-  return { state: 'pending', held: [], draining: false, failure: null, settled: Promise.resolve() }
-}
-
-export function claudeStartupFailureReason(session: ClaudeSession): string | null {
-  return session.startup.state === 'failed'
-    ? providerStartupFailureRejection(session.startup.failure ?? undefined)
-    : null
-}
-
-/** Resolves when startup lands or `timeoutMs` passes; a stuck start then refuses the write as before. */
-export function claudeStartupSettledWithin(
-  session: ClaudeSession | undefined,
-  timeoutMs: number
-): Promise<void> {
-  if (session?.startup.state !== 'pending') {
-    return Promise.resolve()
-  }
-  let timer: ReturnType<typeof setTimeout> | undefined
-  return Promise.race([
-    session.startup.settled,
-    new Promise<void>((resolve) => {
-      timer = setTimeout(resolve, timeoutMs)
-    })
-  ]).finally(() => clearTimeout(timer))
-}
-
-export function claudeStartupHoldsWrites(session: ClaudeSession): boolean {
-  return session.startup.state === 'pending' || session.startup.draining
-}
-
-/** Admits a prompt while startup is pending; it is written when `openClaudeStartupGate` runs. */
-export async function holdClaudeStartupWrite(
-  session: ClaudeSession,
-  input: {
-    message: Record<string, unknown>
-    arm: () => { waiter: ClaudeDispatchWaiter }
-    beforeDispatch?: () => Promise<void>
-    settleLate?: (outcome: ClaudeLateDispatchOutcome) => void
-  }
-): Promise<AgentSessionDispatchOutcome> {
-  if (input.beforeDispatch) {
-    try {
-      await input.beforeDispatch()
-    } catch (error) {
-      if (error instanceof AgentSessionPreDispatchError) {
-        throw error
-      }
-      return { state: 'rejected', reason: dispatchWriteFailureReason(error) }
-    }
-  }
-  // Startup may have failed while the admission barrier ran.
-  const failed = claudeStartupFailureReason(session)
-  if (failed) {
-    return { state: 'rejected', reason: failed }
-  }
-  const { waiter } = input.arm()
-  session.startup.held.push({
-    waiter,
-    message: input.message,
-    ...(input.settleLate ? { settleLate: input.settleLate } : {})
-  })
-  // Startup finished writing what it held while the barrier ran; nothing else would drain this.
-  if (!claudeStartupHoldsWrites(session)) {
-    void drainClaudeStartupWrites(session)
-  }
-  return { state: 'admitted' }
-}
-
-export async function openClaudeStartupGate(session: ClaudeSession): Promise<void> {
-  const gate = session.startup
-  if (gate.state !== 'pending') {
-    return
-  }
-  gate.state = 'proven'
-  await drainClaudeStartupWrites(session)
-}
-
-async function drainClaudeStartupWrites(session: ClaudeSession): Promise<void> {
-  const gate = session.startup
-  gate.draining = true
-  try {
-    for (let held = gate.held.shift(); held; held = gate.held.shift()) {
-      await writeHeld(session, held)
-    }
-  } finally {
-    gate.draining = false
-  }
-}
-
-async function writeHeld(session: ClaudeSession, held: ClaudeStartupHeldWrite): Promise<void> {
-  try {
-    await session.connection.send(held.message)
-  } catch (error) {
-    if (held.waiter.settledUuid) {
-      return
-    }
-    if (claudeUserMessageWasProvablyUnwritten(error)) {
-      rejectHeld(session, held, dispatchWriteFailureReason(error))
-      return
-    }
-    // Possibly written: only a replay or the child's exit can settle it now.
-    retireWaiter(session, held.waiter)
-    held.waiter.resolve(null)
-  }
-}
-
-function rejectHeld(session: ClaudeSession, held: ClaudeStartupHeldWrite, reason: string): void {
-  forgetWaiter(session, held.waiter)
-  forgetRetiredWaiter(session, held.waiter)
-  held.waiter.resolve(null)
-  if (held.waiter.clientMessageId) {
-    held.settleLate?.({ clientMessageId: held.waiter.clientMessageId, state: 'rejected', reason })
-  }
-}
-
-/** Rejects every held prompt with `reason`; true when any was held. */
-export function rejectClaudeStartupWrites(session: ClaudeSession, reason: string): boolean {
-  const held = session.startup.held.splice(0)
-  for (const entry of held) {
-    rejectHeld(session, entry, reason)
-  }
-  return held.length > 0
-}
-
-/** Startup cannot land any more; nothing held was written, so all of it is rejected. */
-export function failClaudeStartupGate(session: ClaudeSession, error: Error): void {
-  const gate = session.startup
-  if (gate.state === 'pending') {
-    gate.state = 'failed'
-    gate.failure = error
-  }
-  rejectClaudeStartupWrites(session, providerStartupFailureRejection(error))
-}
diff --git a/src/main/claude/claude-structured-session-startup-state.ts b/src/main/claude/claude-structured-session-startup-state.ts
new file mode 100644
index 000000000000..cf44bd984abd
--- /dev/null
+++ b/src/main/claude/claude-structured-session-startup-state.ts
@@ -0,0 +1,59 @@
+// Where a Claude start stands. A session is published once its child is spawned, before the CLI
+// has answered initialize. Nothing is written to it until startup lands (init facts read and saved
+// options restored): the host's delivery loop waits on `settled` before it hands a message over,
+// so a first turn never runs under defaults the restore was about to replace.
+
+import type { SubmissionRejectionFact } from '../../shared/agent-session-failure'
+import { providerStartupFailureFact } from '../native-chat/agent-session-wire/structured-agent-session-failure-text'
+import type { ClaudeSession } from './claude-structured-session-state'
+
+export type ClaudeSessionStartup = {
+  state: 'pending' | 'proven' | 'failed'
+  failure: Error | null
+  /** Resolves once startup has landed or faulted, or the child exited or was closed; never
+   *  rejects. A close must end it: the delivery loop waits here, and a start Stop cut short
+   *  would otherwise hold that loop forever. */
+  settled: Promise<void>
+  end: () => void
+}
+
+export function createClaudeSessionStartup(): ClaudeSessionStartup {
+  let end: () => void = () => undefined
+  const ended = new Promise<void>((resolve) => {
+    end = resolve
+  })
+  return { state: 'pending', failure: null, settled: ended, end }
+}
+
+export function claudeStartupFailureFact(session: ClaudeSession): SubmissionRejectionFact | null {
+  return session.startup.state === 'failed'
+    ? providerStartupFailureFact(session.startup.failure ?? undefined)
+    : null
+}
+
+/** Resolves when startup lands or `timeoutMs` passes; a stuck start then refuses the write as before. */
+export function claudeStartupSettledWithin(
+  session: ClaudeSession | undefined,
+  timeoutMs: number
+): Promise<void> {
+  if (session?.startup.state !== 'pending') {
+    return Promise.resolve()
+  }
+  let timer: ReturnType<typeof setTimeout> | undefined
+  return Promise.race([
+    session.startup.settled,
+    new Promise<void>((resolve) => {
+      timer = setTimeout(resolve, timeoutMs)
+    })
+  ]).finally(() => clearTimeout(timer))
+}
+
+/** Startup cannot land any more: the child exited, was closed, or its start faulted. */
+export function failClaudeStartup(session: ClaudeSession, error: Error): void {
+  const startup = session.startup
+  if (startup.state === 'pending') {
+    startup.state = 'failed'
+    startup.failure = error
+  }
+  startup.end()
+}
diff --git a/src/main/claude/claude-structured-session-startup.test.ts b/src/main/claude/claude-structured-session-startup.test.ts
index 362f4d691d02..ceb9e9cdf6d6 100644
--- a/src/main/claude/claude-structured-session-startup.test.ts
+++ b/src/main/claude/claude-structured-session-startup.test.ts
@@ -55,7 +55,7 @@ describe('Claude structured session publishes before the CLI answers initialize'
     expect(adapter.readCommands('session-1')).toBeUndefined()
 
     await vi.advanceTimersByTimeAsync(SLOW_INIT_MS)
-    await adapter.drainStartup('session-1')
+    await adapter.awaitStarted('session-1')
 
     expect(events.find((event) => event.type === 'options')).toMatchObject({
       models: [{ value: 'claude-sonnet' }]
@@ -65,7 +65,7 @@ describe('Claude structured session publishes before the CLI answers initialize'
     await adapter.closeAll()
   })
 
-  it('reports `started` once saved options are restored, before any held prompt is written', async () => {
+  it('reports `started` once saved options are restored, having written no prompt of its own', async () => {
     const claude = fakeClaude({ initDelayMs: SLOW_INIT_MS, initModel: 'claude-opus-9' })
     const { adapter, events } = startingAdapter(claude)
     const order: string[] = []
@@ -74,11 +74,10 @@ describe('Claude structured session publishes before the CLI answers initialize'
       return undefined
     }
     await adapter.acquire({ ...ACQUIRE, options: { model: 'opus' } })
-    await adapter.dispatch(PROMPT)
     expect(events.some((event) => event.type === 'started')).toBe(false)
 
     await vi.advanceTimersByTimeAsync(SLOW_INIT_MS)
-    await adapter.drainStartup('session-1')
+    await adapter.awaitStarted('session-1')
 
     const startedAt = events.findIndex((event) => event.type === 'started')
     expect(events[startedAt]).toEqual({
@@ -90,9 +89,9 @@ describe('Claude structured session publishes before the CLI answers initialize'
       reportedOptions: expect.objectContaining({ model: 'opus' }),
       restoreSkippedOptions: []
     })
-    // The restore wrote the saved model before `started`, and the held prompt only after it.
+    // The restore wrote the saved model before `started`; no message waits inside the adapter.
     expect(order).toEqual(['set_model'])
-    expect(claude.connections[0].sent).toHaveLength(1)
+    expect(claude.connections[0].sent).toEqual([])
     expect(events.slice(0, startedAt).some((event) => event.type === 'options')).toBe(true)
     await adapter.closeAll()
   })
@@ -133,52 +132,37 @@ describe('Claude structured session publishes before the CLI answers initialize'
     await adapter.closeAll()
   })
 
-  it('holds a prompt sent before init and writes it once startup lands', async () => {
+  // The host's delivery loop waits here before it hands a message over, so the adapter no longer
+  // holds prompts of its own: nothing is written until startup lands because nothing is sent.
+  it('resolves awaitStarted only once startup lands', async () => {
     const claude = fakeClaude({ initDelayMs: SLOW_INIT_MS })
     const { adapter } = startingAdapter(claude)
     await adapter.acquire(ACQUIRE)
-
-    await expect(adapter.dispatch(PROMPT)).resolves.toEqual({ state: 'admitted' })
-    expect(claude.connections[0].sent).toEqual([])
-
-    await vi.advanceTimersByTimeAsync(SLOW_INIT_MS)
-    await adapter.drainStartup('session-1')
-
-    expect(claude.connections[0].sent).toHaveLength(1)
-    expect(claude.connections[0].sent[0]).toMatchObject({ type: 'user' })
-    await adapter.closeAll()
-  })
-
-  it('writes a prompt whose admission barrier was still running when startup landed', async () => {
-    const claude = fakeClaude({ initDelayMs: SLOW_INIT_MS })
-    const { adapter } = startingAdapter(claude)
-    await adapter.acquire(ACQUIRE)
-    let passBarrier = (): void => {}
-    const barrier = new Promise<void>((resolve) => {
-      passBarrier = resolve
+    let started = false
+    const waited = adapter.awaitStarted('session-1').then(() => {
+      started = true
     })
 
-    const dispatched = adapter.dispatch({ ...PROMPT, beforeDispatch: () => barrier })
-    await vi.advanceTimersByTimeAsync(SLOW_INIT_MS)
-    await adapter.drainStartup('session-1')
-    passBarrier()
+    await vi.advanceTimersByTimeAsync(SLOW_INIT_MS - 1)
+    expect(started).toBe(false)
+    await vi.advanceTimersByTimeAsync(1)
+    await waited
 
-    await expect(dispatched).resolves.toEqual({ state: 'admitted' })
-    expect(claude.connections[0].sent.filter((message) => message.type === 'user')).toHaveLength(1)
+    await expect(adapter.dispatch(PROMPT)).resolves.toEqual({ state: 'admitted' })
+    expect(claude.connections[0].sent).toEqual([expect.objectContaining({ type: 'user' })])
     await adapter.closeAll()
   })
 
-  it('ends the session with the exit reason when the CLI dies before init, and rejects held prompts', async () => {
+  it('ends the session with the exit reason when the CLI dies before init', async () => {
     const claude = fakeClaude({
       initDelayMs: SLOW_INIT_MS,
       exitBeforeInit: 'claude stream-json exited (code 1): stderr says no'
     })
-    const { adapter, events, late } = startingAdapter(claude)
+    const { adapter, events } = startingAdapter(claude)
     await adapter.acquire(ACQUIRE)
-    await adapter.dispatch(PROMPT)
 
     await vi.advanceTimersByTimeAsync(SLOW_INIT_MS)
-    await adapter.drainStartup('session-1')
+    await adapter.awaitStarted('session-1')
     await adapter.drainObservedExits()
 
     expect(events.find((event) => event.type === 'ended')).toMatchObject({
@@ -186,9 +170,6 @@ describe('Claude structured session publishes before the CLI answers initialize'
       cause: 'unexpected-exit',
       startupUnproven: true
     })
-    expect(late).toEqual([
-      expect.objectContaining({ clientMessageId: 'client-1', state: 'rejected' })
-    ])
     expect(claude.connections[0].sent).toEqual([])
     expect(claude.connections[0].closeCount).toBe(1)
   })
@@ -203,7 +184,7 @@ describe('Claude structured session publishes before the CLI answers initialize'
     await adapter.acquire(ACQUIRE)
 
     await vi.advanceTimersByTimeAsync(SLOW_INIT_MS)
-    await adapter.drainStartup('session-1')
+    await adapter.awaitStarted('session-1')
     await adapter.drainObservedExits()
 
     // A failed start is released on the same evidence a failed create is.
@@ -217,7 +198,7 @@ describe('Claude structured session publishes before the CLI answers initialize'
     const claude = fakeClaude({ initAccount: { apiProvider: 'firstParty', tokenSource: 'none' } })
     const { adapter, events } = startingAdapter(claude)
     await adapter.acquire(ACQUIRE)
-    await adapter.drainStartup('session-1')
+    await adapter.awaitStarted('session-1')
     await adapter.drainObservedExits()
 
     expect(events.find((event) => event.type === 'ended')).toMatchObject({
@@ -226,82 +207,41 @@ describe('Claude structured session publishes before the CLI answers initialize'
     })
   })
 
-  it('closes a session stopped before init without faulting it or writing held prompts', async () => {
-    const claude = fakeClaude({ initDelayMs: SLOW_INIT_MS })
-    const { adapter, events, late } = startingAdapter(claude)
+  // A Stop that closes a child still starting must end the wait the host's delivery loop is in,
+  // though initialize never answers; otherwise every later send joins a loop that never moves.
+  it('ends the wait on a start closed before init, without faulting it', async () => {
+    const claude = fakeClaude({ initDelayMs: 10 * SLOW_INIT_MS })
+    const { adapter, events } = startingAdapter(claude)
     await adapter.acquire(ACQUIRE)
-    await adapter.dispatch(PROMPT)
+    let ended = false
+    const waited = adapter.awaitStarted('session-1').then(() => {
+      ended = true
+    })
 
     await expect(adapter.closeSession('session-1')).resolves.toBe(true)
-    await vi.advanceTimersByTimeAsync(SLOW_INIT_MS)
-    await adapter.drainStartup('session-1')
+    await vi.advanceTimersByTimeAsync(0)
+    await waited
 
+    expect(ended).toBe(true)
     const connection = claude.connections[0]
     expect(connection.closeCount).toBe(1)
     expect(connection.sent).toEqual([])
     expect(connection.calls.map(({ subtype }) => subtype)).not.toContain('get_settings')
-    expect(late).toEqual([
-      expect.objectContaining({ clientMessageId: 'client-1', state: 'rejected' })
-    ])
     expect(events.some((event) => event.type === 'ended' && event.startupUnproven)).toBe(false)
     expect(events.some((event) => event.type === 'started')).toBe(false)
   })
 
-  it('withdraws a held prompt when the turn is cancelled before init', async () => {
+  it('interrupts nothing when Stop lands before init: nothing was written', async () => {
     const claude = fakeClaude({ initDelayMs: SLOW_INIT_MS })
-    const { adapter, late } = startingAdapter(claude)
+    const { adapter } = startingAdapter(claude)
     await adapter.acquire(ACQUIRE)
-    await adapter.dispatch(PROMPT)
 
     await expect(
       adapter.cancelTurn({ sessionId: 'session-1', turnId: 'turn-1', fence: 7 })
-    ).resolves.toEqual({ cancelled: true })
-    await vi.advanceTimersByTimeAsync(SLOW_INIT_MS)
-    await adapter.drainStartup('session-1')
+    ).resolves.toEqual({ cancelled: false })
 
+    expect(claude.connections[0].calls.map(({ subtype }) => subtype)).not.toContain('interrupt')
     expect(claude.connections[0].sent).toEqual([])
-    expect(late).toEqual([
-      expect.objectContaining({ clientMessageId: 'client-1', state: 'rejected' })
-    ])
-    await adapter.closeAll()
-  })
-
-  it('withdraws the prompts still held when Stop lands while startup is writing them', async () => {
-    const claude = fakeClaude({ initDelayMs: SLOW_INIT_MS })
-    const { adapter, late } = startingAdapter(claude)
-    await adapter.acquire(ACQUIRE)
-    const connection = claude.connections[0]
-    const send = connection.send
-    let landFirstWrite = (): void => {}
-    const firstWrite = new Promise<void>((resolve) => {
-      landFirstWrite = resolve
-    })
-    let writes = 0
-    connection.send = async (message, beforeDispatch) => {
-      writes += 1
-      if (writes === 1) {
-        await firstWrite
-      }
-      return send(message, beforeDispatch)
-    }
-    await adapter.dispatch(PROMPT)
-    await adapter.dispatch({ ...PROMPT, clientMessageId: 'client-2' })
-
-    await vi.advanceTimersByTimeAsync(SLOW_INIT_MS)
-    // Startup has landed and is writing the first held prompt.
-    expect(writes).toBe(1)
-    const cancelled = adapter.cancelTurn({ sessionId: 'session-1', turnId: 'turn-1', fence: 7 })
-    await vi.advanceTimersByTimeAsync(0)
-    landFirstWrite()
-    await vi.advanceTimersByTimeAsync(5_000)
-    await adapter.drainStartup('session-1')
-
-    expect(connection.sent.filter((message) => message.type === 'user')).toHaveLength(1)
-    expect(late).toContainEqual(
-      expect.objectContaining({ clientMessageId: 'client-2', state: 'rejected' })
-    )
-    // Stop withdrew something, so it answers as a cancel whatever the interrupt made of the turn.
-    await expect(cancelled).resolves.toEqual({ cancelled: true })
     await adapter.closeAll()
   })
 })
diff --git a/src/main/claude/claude-structured-session-startup.ts b/src/main/claude/claude-structured-session-startup.ts
index aa1f9a02eccd..ce14a64dd2cf 100644
--- a/src/main/claude/claude-structured-session-startup.ts
+++ b/src/main/claude/claude-structured-session-startup.ts
@@ -26,10 +26,7 @@ import {
   observeClaudeSettingsApplied,
   readClaudeSettingsEffort
 } from './claude-structured-session-options'
-import {
-  failClaudeStartupGate,
-  openClaudeStartupGate
-} from './claude-structured-session-startup-gate'
+import { failClaudeStartup } from './claude-structured-session-startup-state'
 import type { ClaudeSession, ClaudeStructuredSessionEvent } from './claude-structured-session-state'
 
 export type ClaudeInitProof = {
@@ -141,7 +138,7 @@ function applyClaudeStartupFacts(session: ClaudeSession, facts: ClaudeStartupFac
   session.fastModeState ??= published.fastModeState
   session.fastModeDisabledReason ??= published.fastModeDisabledReason
   session.options = prepared.options
-  session.capabilities = readClaudeCapabilities(init, initialization)
+  session.capabilities = readClaudeCapabilities(session.capabilities, initialization, init.message)
   // A catalog frame that streamed in after publish is newer than the initialize answer.
   if (session.commands.commands === undefined) {
     session.commands = new ClaudeSlashCommandCatalog(init.message, initialization)
@@ -163,8 +160,8 @@ function claudeStartedReportedOptions(
   return persisted
 }
 
-/** Applies startup facts to the published session, restores saved options, then releases
- *  held prompts. Any failure faults the session so the user sees why it never started. */
+/** Applies startup facts to the published session and restores saved options; only then does the
+ *  session take input. Any failure faults the session so the user sees why it never started. */
 export async function settleClaudeSessionStartup(input: {
   session: ClaudeSession
   facts: Promise<ClaudeStartupFacts>
@@ -179,7 +176,7 @@ export async function settleClaudeSessionStartup(input: {
     if (input.isCurrent()) {
       return false
     }
-    failClaudeStartupGate(session, new Error('claude session closed before startup completed'))
+    failClaudeStartup(session, new Error('claude session closed before startup completed'))
     return true
   }
   try {
@@ -198,13 +195,15 @@ export async function settleClaudeSessionStartup(input: {
         ),
         restoreSkippedOptions: [...session.restoreSkippedOptions]
       })
-      await openClaudeStartupGate(session)
+      if (session.startup.state === 'pending') {
+        session.startup.state = 'proven'
+      }
     }
   } catch (caught) {
     const error = caught instanceof Error ? caught : new Error(String(caught))
     // A close or exit that already ended startup owns how the session ends.
     const endedElsewhere = session.startup.state !== 'pending'
-    failClaudeStartupGate(session, error)
+    failClaudeStartup(session, error)
     if (!endedElsewhere && input.isCurrent()) {
       input.fault(error)
     }
diff --git a/src/main/claude/claude-structured-session-state.ts b/src/main/claude/claude-structured-session-state.ts
index 60055874b37c..6848d9a19437 100644
--- a/src/main/claude/claude-structured-session-state.ts
+++ b/src/main/claude/claude-structured-session-state.ts
@@ -1,3 +1,5 @@
+import type { AgentJournalDispatchRejection } from '../../shared/agent-session-failure-words'
+import type { SubmissionRejectionFact } from '../../shared/agent-session-failure'
 import type {
   AgentJournalItemIdentity,
   AgentSessionJournalIdentity
@@ -25,7 +27,7 @@ import type { AgentChildWorkEvidence } from '../../shared/agent-status-child-wor
 import type { ClaudeBackgroundTaskTracker } from './claude-background-task-tracker'
 import type { ClaudeChildWorkDecoder } from './claude-child-work-decoder'
 import type { ClaudeSlashCommandCatalog } from './claude-slash-command-catalog'
-import type { ClaudeSessionStartupGate } from './claude-structured-session-startup-gate'
+import type { ClaudeSessionStartup } from './claude-structured-session-startup-state'
 
 export type ClaudeAuthDiagnostic = {
   apiKeySourceConfigured: boolean
@@ -40,7 +42,9 @@ export type ClaudeStructuredSessionEvent =
       type: 'message'
       sessionId: string
       message: Record<string, unknown>
-      /** Present only when this replay acknowledged Orca's in-flight dispatch. */
+      /** Present only when this replay acknowledged Orca's in-flight dispatch
+       *  AND opens a turn; a replay folded into the running turn settles
+       *  delivery without one. */
       startsTurn?: true
       /** Submission instant of the dispatch this replay acknowledged; the origin
        *  of the turn it opens. Absent when the host cannot name a send. */
@@ -66,6 +70,7 @@ export type ClaudeStructuredSessionEvent =
       type: 'ended'
       sessionId: string
       reason: string
+      failure?: SubmissionRejectionFact
       /** Present for first-hand child exits so the host can fence recovery. */
       cause?: 'unexpected-exit' | 'requested-close'
       fence?: number
@@ -81,7 +86,7 @@ export type ClaudeLateDispatchOutcome =
       clientMessageId: string
       providerIdentity: AgentJournalItemIdentity
     }
-  | { clientMessageId: string; state: 'rejected'; reason: string }
+  | ({ clientMessageId: string; state: 'rejected' } & AgentJournalDispatchRejection)
 
 export type ClaudeStructuredSessionAdapterDeps = {
   resolveLaunch: (input: {
@@ -195,7 +200,7 @@ export type ClaudeSession = {
   events: StructuredAgentSessionEventSink | undefined
   unbindReadingControl?: () => void
   /** Published at spawn; init facts, option restore and queued prompts land when startup does. */
-  startup: ClaudeSessionStartupGate
+  startup: ClaudeSessionStartup
 }
 
 export function mintClaudeAcquisitionGeneration(deps: ClaudeStructuredSessionAdapterDeps): string {
diff --git a/src/main/claude/claude-structured-session-test-support.ts b/src/main/claude/claude-structured-session-test-support.ts
index 023e0ba46b70..0380d5ac12fc 100644
--- a/src/main/claude/claude-structured-session-test-support.ts
+++ b/src/main/claude/claude-structured-session-test-support.ts
@@ -51,6 +51,9 @@ export function fakeClaude(
     initSessionId?: string
     initUuid?: string
     initModel?: string
+    /** 'session-start' (default) mirrors live: a SessionStart hook frame proves the
+     *  session and system/init arrives only when the first command starts a cycle.
+     *  'init' emits init at startup — an UNMEASURED shape, opt-in only. */
     initProof?: 'init' | 'session-start' | 'none'
     initAccount?: unknown
     initCommands?: unknown
@@ -81,6 +84,22 @@ export function fakeClaude(
     return route ? route(params) : undefined
   }
   const openConnection: typeof openClaudeStreamJsonConnection = async (launch, handlers = {}) => {
+    let cycleInitEmitted = false
+    // Keys mirror the real system/init frame, which carries `model` but no
+    // effort of any kind: the current effort only comes back from get_settings.
+    // Never add a field the CLI does not send.
+    const emitCycleInit = (): void => {
+      cycleInitEmitted = true
+      handlers.onMessage?.({
+        type: 'system',
+        subtype: 'init',
+        session_id: options.initSessionId ?? PROVIDER_SESSION_ID,
+        uuid: options.initUuid ?? 'init-uuid',
+        model: options.initModel ?? 'claude-sonnet-5',
+        apiKeySource: 'none',
+        ...(options.capabilities ? { capabilities: options.capabilities } : {})
+      })
+    }
     const connection: FakeConnection = {
       launch,
       handlers,
@@ -102,7 +121,13 @@ export function fakeClaude(
           // The SDK rejects pending control requests once the transport ends.
           throw new Error('Query closed before response received')
         }
-        if (options.initProof === 'session-start') {
+        if (options.initProof === 'init') {
+          // UNMEASURED startup shape, kept only as an explicit opt-in: live
+          // sessions prove startup with a SessionStart hook frame instead.
+          emitCycleInit()
+        } else if (options.initProof !== 'none') {
+          // The live proof order (measured through Orca's adapter): SessionStart
+          // hook frames arrive first; system/init only when a cycle starts.
           handlers.onMessage?.({
             type: 'system',
             subtype: 'hook_started',
@@ -110,22 +135,19 @@ export function fakeClaude(
             session_id: options.initSessionId ?? PROVIDER_SESSION_ID,
             uuid: options.initUuid ?? 'init-uuid'
           })
-        } else if (options.initProof !== 'none') {
-          // Keys mirror the real system/init frame, which carries `model` but no
-          // effort of any kind: the current effort only comes back from
-          // get_settings. Never add a field the CLI does not send.
           handlers.onMessage?.({
             type: 'system',
-            subtype: 'init',
+            subtype: 'hook_response',
+            hook_name: 'SessionStart:startup',
             session_id: options.initSessionId ?? PROVIDER_SESSION_ID,
-            uuid: options.initUuid ?? 'init-uuid',
-            model: options.initModel ?? 'claude-sonnet-5',
-            apiKeySource: 'none',
-            ...(options.capabilities ? { capabilities: options.capabilities } : {})
+            uuid: 'hook-response-uuid'
           })
         }
         return {
           models: options.initModels ?? [{ value: 'claude-sonnet', displayName: 'Sonnet' }],
+          // Capabilities ride the initialize result, where startup facts read
+          // them regardless of when the first init frame arrives.
+          ...(options.capabilities ? { capabilities: options.capabilities } : {}),
           ...(options.initCommands === undefined ? {} : { commands: options.initCommands }),
           ...(options.initAccount === undefined ? {} : { account: options.initAccount })
         }
@@ -173,7 +195,7 @@ export function fakeClaude(
       },
       cancelAsyncMessage: async (uuid) => {
         connection.calls.push({ subtype: 'cancel_async_message', params: { uuid } })
-        routed('cancel_async_message', { uuid })
+        return routed('cancel_async_message', { uuid }) === true
       },
       stopTask: async (taskId) => {
         connection.calls.push({ subtype: 'stop_task', params: { taskId } })
@@ -184,6 +206,11 @@ export function fakeClaude(
           await beforeDispatch()
         }
         connection.sent.push(message)
+        // Live: the first command starts a request cycle, whose init precedes
+        // the replay. Later cycles are the test's own frames.
+        if (message.type === 'user' && !cycleInitEmitted && options.initProof !== 'none') {
+          emitCycleInit()
+        }
         if (message.type === 'user' && options.replayUuid !== null) {
           const configuredReplayUuid = options.replayUuids
             ? options.replayUuids[replayIndex++]
@@ -220,7 +247,7 @@ export function adapterFor(
   const acquire = adapter.acquire
   adapter.acquire = async (input) => {
     const acquisition = await acquire(input)
-    await adapter.drainStartup(input.identity.sessionId)
+    await adapter.awaitStarted(input.identity.sessionId)
     return acquisition
   }
   return adapter
@@ -297,29 +324,3 @@ export function recordingJournalSink(): StructuredAgentSessionEventSink {
 export function tick(): Promise<void> {
   return new Promise((resolve) => setImmediate(resolve))
 }
-
-export function invokeCanUseTool(
-  connection: FakeConnection,
-  toolName: string,
-  requestId: string,
-  toolUseID: string,
-  extra: {
-    input?: Record<string, unknown>
-    suggestions?: unknown[]
-    signal?: AbortSignal
-  } = {}
-): { promise: Promise<unknown>; settled: () => boolean } {
-  const options = {
-    requestId,
-    toolUseID,
-    signal: extra.signal ?? new AbortController().signal,
-    ...(extra.suggestions ? { suggestions: extra.suggestions } : {})
-  } as unknown as Parameters<NonNullable<ClaudeStreamJsonConnectionHandlers['canUseTool']>>[2]
-  let done = false
-  const promise = Promise.resolve(
-    connection.handlers.canUseTool?.(toolName, extra.input ?? {}, options)
-  ).finally(() => {
-    done = true
-  })
-  return { promise, settled: () => done }
-}
diff --git a/src/main/claude/claude-supervised-stop-real-cli.test.ts b/src/main/claude/claude-supervised-stop-real-cli.test.ts
new file mode 100644
index 000000000000..82432e3fd6e6
--- /dev/null
+++ b/src/main/claude/claude-supervised-stop-real-cli.test.ts
@@ -0,0 +1,244 @@
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { homedir, tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { randomUUID } from 'node:crypto'
+import { afterEach, describe, expect, it } from 'vitest'
+import { runProcess } from '../../shared/child-process/run-process'
+import { resolveSessionFilePath } from '../native-chat/session-file-resolver'
+import { SUPERVISED_GRACEFUL_EXIT_MS } from './claude-child-exit-proof-ladder'
+import {
+  openClaudeStreamJsonConnection,
+  type ClaudeStreamJsonConnection
+} from './claude-stream-json-connection'
+import {
+  CLAUDE_STRUCTURED_BASE_OPTIONS,
+  claudeStructuredPermissionOptions
+} from './claude-structured-launch-resolution'
+
+// Opt-in only: spends a real (haiku) turn per case. Run it in an isolated HOME with
+// ORCA_REAL_CLAUDE_BIN set, and ORCA_REAL_CLAUDE_SETTINGS when auth lives in a settings file.
+const CLAUDE_BIN = process.env.ORCA_REAL_CLAUDE_BIN ?? ''
+const enabled =
+  process.env.ORCA_REAL_CLAUDE_SUPERVISED_STOP === '1' &&
+  process.platform !== 'win32' &&
+  CLAUDE_BIN.length > 0
+const FRAMES_OUT = process.env.ORCA_REAL_CLAUDE_FRAMES_OUT
+const TOOL_MARKER = 'orca_supervised_stop_probe'
+const TOOL_PROMPT = `Use the Bash tool to run exactly this command, with no timeout argument, and nothing else: python3 -c "import time; time.sleep(120)  # ${TOOL_MARKER}"`
+
+type Frame = { at: number; message: Record<string, unknown> }
+type Row = { pid: number; ppid: number; command: string }
+
+const recordedPids = new Set<number>()
+const tempDirs: string[] = []
+const connections: ClaudeStreamJsonConnection[] = []
+
+function alive(pid: number): boolean {
+  try {
+    process.kill(pid, 0)
+    return true
+  } catch (error) {
+    return !(error instanceof Error && 'code' in error && error.code === 'ESRCH')
+  }
+}
+
+async function processTable(): Promise<Row[]> {
+  const result = await runProcess({ program: 'ps', args: ['-axo', 'pid=,ppid=,command='] })
+  return result.stdout.split('\n').flatMap((line) => {
+    const match = /^\s*(\d+)\s+(\d+)\s+(.*)$/.exec(line)
+    return match ? [{ pid: Number(match[1]), ppid: Number(match[2]), command: match[3] }] : []
+  })
+}
+
+async function descendantsOf(rootPid: number): Promise<Row[]> {
+  const rows = await processTable()
+  const found: Row[] = []
+  const frontier = [rootPid]
+  while (frontier.length > 0) {
+    const parent = frontier.pop()
+    for (const row of rows.filter((candidate) => candidate.ppid === parent)) {
+      found.push(row)
+      frontier.push(row.pid)
+    }
+  }
+  return found
+}
+
+async function until<T>(read: () => Promise<T | null> | T | null, what: string, ms = 90_000) {
+  const deadline = Date.now() + ms
+  for (;;) {
+    const value = await read()
+    if (value !== null) {
+      return value
+    }
+    if (Date.now() >= deadline) {
+      throw new Error(`timed out waiting for ${what}`)
+    }
+    await new Promise((resolve) => setTimeout(resolve, 250))
+  }
+}
+
+async function open(sessionId: string, cwd: string, resume: boolean, frames: Frame[]) {
+  const settings = process.env.ORCA_REAL_CLAUDE_SETTINGS
+  const permission = claudeStructuredPermissionOptions('bypassPermissions')
+  const connection = await openClaudeStreamJsonConnection(
+    {
+      pathToClaudeCodeExecutable: CLAUDE_BIN,
+      options: {
+        ...CLAUDE_STRUCTURED_BASE_OPTIONS,
+        model: 'haiku',
+        extraArgs: {
+          ...CLAUDE_STRUCTURED_BASE_OPTIONS.extraArgs,
+          ...permission.extraArgs,
+          ...(settings ? { settings } : {})
+        },
+        ...(resume ? { resume: sessionId } : { sessionId })
+      },
+      cwd
+    },
+    { onMessage: (message) => frames.push({ at: Date.now(), message }) }
+  )
+  connections.push(connection)
+  recordedPids.add(connection.pid!)
+  return connection
+}
+
+function userMessage(text: string): Record<string, unknown> {
+  return {
+    type: 'user',
+    message: { role: 'user', content: [{ type: 'text', text }] },
+    parent_tool_use_id: null,
+    session_id: ''
+  }
+}
+
+async function transcriptLines(sessionId: string): Promise<string> {
+  const configDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude')
+  const path = await until(
+    () =>
+      resolveSessionFilePath('claude', sessionId, {
+        claudeProjectsDir: join(configDir, 'projects')
+      }),
+    'the transcript',
+    15_000
+  )
+  return readFileSync(path, 'utf8')
+}
+
+function expectLineAtomic(contents: string): void {
+  expect(contents.length).toBeGreaterThan(0)
+  expect(contents.endsWith('\n')).toBe(true)
+  for (const line of contents.split('\n').filter((entry) => entry.trim())) {
+    expect(() => JSON.parse(line)).not.toThrow()
+  }
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null
+}
+
+function summarize(frames: Frame[], since: number): string[] {
+  return frames
+    .filter((frame) => frame.at >= since)
+    .map(({ at, message }) => {
+      const inner = isRecord(message.message) ? message.message.content : undefined
+      const blocks = (Array.isArray(inner) ? inner : [])
+        .filter(isRecord)
+        .map((block) =>
+          block.type === 'tool_result'
+            ? `tool_result(is_error=${String(block.is_error)}:${JSON.stringify(block.content).slice(0, 80)})`
+            : String(block.type)
+        )
+      return `+${at - since}ms ${String(message.type)}/${String(message.subtype ?? '')}${
+        message.type === 'result' ? `(is_error=${String(message.is_error)})` : ''
+      } ${blocks.join(',')}`.trim()
+    })
+}
+
+async function resumeAndAsk(sessionId: string, cwd: string): Promise<void> {
+  const frames: Frame[] = []
+  const resumed = await open(sessionId, cwd, true, frames)
+  await resumed.send(userMessage('In one short line: what command did I ask you to run?'))
+  const result = await until(
+    () => frames.find((frame) => frame.message.type === 'result')?.message ?? null,
+    'the resumed turn result'
+  )
+  expect(result.subtype).toBe('success')
+  await expect(resumed.close()).resolves.toBe(true)
+}
+
+type StopCase = 'close mid-tool' | 'SIGTERM to the supervisor mid-tool' | 'close while idle'
+
+afterEach(async () => {
+  for (const pid of recordedPids) {
+    if (alive(pid)) {
+      process.kill(pid, 'SIGKILL')
+    }
+  }
+  recordedPids.clear()
+  connections.splice(0)
+  for (const dir of tempDirs.splice(0)) {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+describe.runIf(enabled)('real Claude stopped through the POSIX supervisor', () => {
+  it.each<StopCase>(['close mid-tool', 'SIGTERM to the supervisor mid-tool', 'close while idle'])(
+    '%s: stops Claude and its tool, keeps the transcript line-atomic, and resumes',
+    async (stopCase) => {
+      const cwd = mkdtempSync(join(tmpdir(), 'orca-real-claude-stop-'))
+      tempDirs.push(cwd)
+      const sessionId = randomUUID()
+      const frames: Frame[] = []
+      const connection = await open(sessionId, cwd, false, frames)
+      const supervisor = connection.pid!
+      const midTool = stopCase !== 'close while idle'
+      await connection.send(userMessage(midTool ? TOOL_PROMPT : 'Reply with the single word: ok'))
+      const descendants = midTool
+        ? await until(async () => {
+            const rows = await descendantsOf(supervisor)
+            return rows.some((row) => row.command.includes(TOOL_MARKER)) ? rows : null
+          }, 'the Bash tool').catch((error: unknown) => {
+            console.log('[no tool] frames so far:', summarize(frames, 0))
+            throw error
+          })
+        : await until(
+            async () =>
+              frames.some((frame) => frame.message.type === 'result')
+                ? await descendantsOf(supervisor)
+                : null,
+            'the idle turn'
+          )
+      for (const row of descendants) {
+        recordedPids.add(row.pid)
+      }
+
+      const signalledAt = Date.now()
+      if (stopCase === 'SIGTERM to the supervisor mid-tool') {
+        process.kill(supervisor, 'SIGTERM')
+      } else {
+        await expect(connection.close()).resolves.toBe(true)
+      }
+      const gone = await until(
+        () => ([supervisor, ...descendants.map((row) => row.pid)].some(alive) ? null : true),
+        'the supervisor, Claude and its tools to exit',
+        SUPERVISED_GRACEFUL_EXIT_MS + 2_000
+      )
+      const stoppedMs = Date.now() - signalledAt
+      const after = summarize(frames, signalledAt)
+      console.log(`[${stopCase}] stopped in ${stoppedMs} ms; frames after the stop:`, after)
+      if (FRAMES_OUT) {
+        writeFileSync(
+          `${FRAMES_OUT}.${stopCase.replaceAll(' ', '-')}.json`,
+          JSON.stringify({ stoppedMs, after }, null, 2)
+        )
+      }
+      expect(gone).toBe(true)
+
+      expectLineAtomic(await transcriptLines(sessionId))
+      await resumeAndAsk(sessionId, cwd)
+      expectLineAtomic(await transcriptLines(sessionId))
+    },
+    180_000
+  )
+})
diff --git a/src/main/claude/claude-supervised-stop.integration.test.ts b/src/main/claude/claude-supervised-stop.integration.test.ts
new file mode 100644
index 000000000000..d0a5f9ea0cc4
--- /dev/null
+++ b/src/main/claude/claude-supervised-stop.integration.test.ts
@@ -0,0 +1,225 @@
+import { spawn, type ChildProcess } from 'node:child_process'
+import { existsSync, mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import type { SpawnOptions as SdkSpawnOptions } from '@anthropic-ai/claude-agent-sdk'
+import { spawnProcess } from '../../shared/child-process/run-process'
+import type { ProcessSpec } from '../../shared/child-process/process-spec'
+import {
+  PROVIDER_SIGTERM_GRACE_MS,
+  PROVIDER_STDIN_END_GRACE_MS,
+  PROVIDER_SUPERVISOR_MAX_STOP_MS
+} from '../codex/codex-app-server-posix-supervisor'
+import { proveClaudeChildExit } from './claude-agent-sdk-exit-proof'
+import { createClaudeCodeProcessSpawn } from './claude-agent-sdk-process-spawn'
+
+// Stands in for Claude mid-turn: stdin end does not stop it, the way EOF lets the real CLI finish
+// its turn. Its tool leads its own group, as the CLI's Bash tool shells do, and only Claude's own
+// SIGTERM handler reaps it. The daemon double-forks out of the tree before anything looks.
+const FAKE_CLAUDE = String.raw`
+  const { spawn } = require('node:child_process')
+  const { writeFileSync } = require('node:fs')
+  process.stdin.resume()
+  process.stdout.on('error', () => {})
+  const tool = spawn(process.execPath, ['-e', 'setInterval(() => {}, 60000)'], {
+    detached: true,
+    stdio: 'ignore'
+  })
+  const forker = spawn(
+    process.execPath,
+    ['-e', "const d = require('node:child_process').spawn(process.execPath, ['-e', 'setInterval(() => {}, 60000)'], { detached: true, stdio: 'ignore' }); d.unref(); process.stdout.write(String(d.pid))"],
+    { stdio: ['ignore', 'pipe', 'ignore'] }
+  )
+  let daemon = ''
+  forker.stdout.on('data', (chunk) => { daemon += chunk })
+  forker.once('exit', () => {
+    process.stdout.write(JSON.stringify({ claude: process.pid, tool: tool.pid, daemon: Number(daemon) }) + '\n')
+  })
+  process.on('SIGTERM', () => {
+    if (process.env.ORCA_TEST_CLAUDE_IGNORES_SIGTERM) return
+    try { process.kill(-tool.pid, 'SIGKILL') } catch {}
+    writeFileSync(process.env.ORCA_TEST_SIGTERM_MARKER, 'reaped')
+    process.exit(143)
+  })
+  setInterval(() => {}, 60000)
+`
+
+// Stands in for Orca's main: starts exactly the spec Claude's spawner built, then can be SIGKILLed.
+const OWNER = String.raw`
+  const { spawn } = require('node:child_process')
+  const spec = JSON.parse(process.env.ORCA_TEST_SPAWN_SPEC)
+  const env = { ...spec.env }
+  if (env.ORCA_PROVIDER_SUPERVISOR_SPEC) {
+    const supervisor = JSON.parse(Buffer.from(env.ORCA_PROVIDER_SUPERVISOR_SPEC, 'base64').toString())
+    supervisor.ownerPid = process.pid
+    env.ORCA_PROVIDER_SUPERVISOR_SPEC = Buffer.from(JSON.stringify(supervisor)).toString('base64')
+  }
+  const child = spawn(spec.program, spec.args, {
+    cwd: spec.cwd,
+    env,
+    detached: spec.detached,
+    stdio: ['pipe', 'pipe', 'ignore']
+  })
+  process.stdout.write(JSON.stringify({ root: child.pid }) + '\n')
+  child.stdout.pipe(process.stdout)
+  setInterval(() => {}, 60000)
+`
+
+const recordedPids = new Set<number>()
+const tempDirs: string[] = []
+
+function alive(pid: number): boolean {
+  try {
+    process.kill(pid, 0)
+    return true
+  } catch (error) {
+    return !(error instanceof Error && 'code' in error && error.code === 'ESRCH')
+  }
+}
+
+async function waitFor(predicate: () => boolean, timeoutMs: number): Promise<boolean> {
+  const deadline = Date.now() + timeoutMs
+  while (!predicate()) {
+    if (Date.now() >= deadline) {
+      return false
+    }
+    await new Promise((resolve) => setTimeout(resolve, 25))
+  }
+  return true
+}
+
+function readPids(child: ChildProcess, keys: readonly string[]): Promise<Record<string, number>> {
+  return new Promise((resolve, reject) => {
+    const pids: Record<string, number> = {}
+    let buffered = ''
+    const timeout = setTimeout(() => reject(new Error(`no ${keys.join('/')} pids`)), 10_000)
+    const onData = (chunk: Buffer): void => {
+      buffered += chunk.toString()
+      const lines = buffered.split('\n')
+      buffered = lines.pop() ?? ''
+      for (const line of lines) {
+        const parsed: unknown = JSON.parse(line)
+        for (const [key, pid] of Object.entries(parsed ?? {})) {
+          if (typeof pid === 'number' && pid > 0) {
+            pids[key] = pid
+            recordedPids.add(pid)
+          }
+        }
+      }
+      if (keys.every((key) => key in pids)) {
+        clearTimeout(timeout)
+        child.stdout!.off('data', onData)
+        child.stdout!.resume()
+        resolve(pids)
+      }
+    }
+    child.stdout!.on('data', onData)
+  })
+}
+
+function sdkOptions(env: Record<string, string>): SdkSpawnOptions {
+  const dir = mkdtempSync(join(tmpdir(), 'orca-claude-supervised-'))
+  tempDirs.push(dir)
+  return {
+    command: process.execPath,
+    args: ['-e', FAKE_CLAUDE],
+    cwd: dir,
+    env: {
+      ...process.env,
+      ORCA_TEST_SIGTERM_MARKER: join(dir, 'sigterm-reap'),
+      ...env
+    },
+    signal: new AbortController().signal
+  }
+}
+
+/** Claude spawned through Orca's own spawner and stopped by Orca's own close ladder. */
+async function spawnClaude(env: Record<string, string> = {}) {
+  const spawner = createClaudeCodeProcessSpawn(spawnProcess)
+  const options = sdkOptions(env)
+  const child = spawner.spawn(options)
+  recordedPids.add(child.pid!)
+  let exited = false
+  const exit = new Promise<{ code: number | null; signal: NodeJS.Signals | null }>((resolve) =>
+    child.once('exit', (code, signal) => {
+      exited = true
+      resolve({ code, signal })
+    })
+  )
+  const pids = await readPids(child, ['claude', 'tool', 'daemon'])
+  const close = (): Promise<boolean> =>
+    proveClaudeChildExit({
+      child,
+      exitPromise: exit.then(() => undefined),
+      exited: () => exited,
+      supervised: spawner.supervised
+    })
+  return { child, exit, pids, close, marker: String(options.env.ORCA_TEST_SIGTERM_MARKER) }
+}
+
+afterEach(() => {
+  for (const pid of recordedPids) {
+    if (alive(pid)) {
+      process.kill(pid, 'SIGKILL')
+    }
+  }
+  recordedPids.clear()
+  for (const dir of tempDirs.splice(0)) {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+describe.runIf(process.platform !== 'win32')('Claude under the POSIX provider supervisor', () => {
+  it('stops a mid-turn Claude on close instead of letting stdin end finish its turn', async () => {
+    const { child, exit, pids, close, marker } = await spawnClaude()
+    expect(child.pid).not.toBe(pids.claude)
+
+    const startedAt = Date.now()
+    await expect(close()).resolves.toBe(true)
+
+    // Claude's own SIGTERM reap ran at once, not after the supervisor's stdin-end grace.
+    expect(Date.now() - startedAt).toBeLessThan(PROVIDER_STDIN_END_GRACE_MS)
+    expect(existsSync(marker)).toBe(true)
+    await expect(exit).resolves.toEqual({ code: null, signal: 'SIGTERM' })
+    expect(alive(pids.claude)).toBe(false)
+    expect(alive(pids.tool)).toBe(false)
+  })
+
+  it('lets the supervisor escalate a Claude that ignores SIGTERM, and exits only after it', async () => {
+    const { exit, pids, close } = await spawnClaude({ ORCA_TEST_CLAUDE_IGNORES_SIGTERM: '1' })
+
+    const startedAt = Date.now()
+    await expect(close()).resolves.toBe(true)
+
+    const elapsed = Date.now() - startedAt
+    expect(elapsed).toBeGreaterThanOrEqual(PROVIDER_SIGTERM_GRACE_MS)
+    expect(elapsed).toBeLessThan(PROVIDER_SUPERVISOR_MAX_STOP_MS + 1_000)
+    // The supervisor's own SIGTERM stop finished the job; nothing forced the supervisor itself.
+    await expect(exit).resolves.toEqual({ code: null, signal: 'SIGTERM' })
+    expect(alive(pids.claude)).toBe(false)
+  })
+
+  it("stops Claude and its tool when Orca's main dies, and leaves a daemon that left its tree alone", async () => {
+    const specs: ProcessSpec[] = []
+    createClaudeCodeProcessSpawn((spec) => {
+      specs.push(spec)
+      return spawnProcess({ program: 'true' })
+    }).spawn(sdkOptions({}))
+    const owner = spawn(process.execPath, ['-e', OWNER], {
+      env: { ...process.env, ORCA_TEST_SPAWN_SPEC: JSON.stringify(specs[0]) },
+      stdio: ['ignore', 'pipe', 'ignore']
+    })
+    recordedPids.add(owner.pid!)
+    const pids = await readPids(owner, ['root', 'claude', 'tool', 'daemon'])
+
+    owner.kill('SIGKILL')
+
+    expect(await waitFor(() => !alive(pids.claude), PROVIDER_SUPERVISOR_MAX_STOP_MS)).toBe(true)
+    expect(await waitFor(() => !alive(pids.root), PROVIDER_SUPERVISOR_MAX_STOP_MS)).toBe(true)
+    // In its own group, so only Claude's SIGTERM handler could have reaped it.
+    expect(alive(pids.tool)).toBe(false)
+    // Not the conversation's writer: nothing proves it orphaned, so the stop never reaches it.
+    expect(alive(pids.daemon)).toBe(true)
+  })
+})
diff --git a/src/main/claude/claude-turn-ownership.test.ts b/src/main/claude/claude-turn-ownership.test.ts
index 338a6937716d..81a84989aa44 100644
--- a/src/main/claude/claude-turn-ownership.test.ts
+++ b/src/main/claude/claude-turn-ownership.test.ts
@@ -96,6 +96,7 @@ function sessionHoldingTurn(turnId: string | null): ReturnType<typeof sessionFor
   session.dispatchSequence = 1
   session.translator = {
     handle: vi.fn(),
+    openTurnInLiveProviderCycle: false,
     journalPrompts: { cancel: vi.fn(), resolve: vi.fn() },
     currentTurnId: turnId,
     flush: vi.fn(),
@@ -277,6 +278,7 @@ describe('Claude turn ownership', () => {
       session.dispatchSequence = 1
       session.translator = {
         handle: vi.fn(),
+        openTurnInLiveProviderCycle: false,
         journalPrompts: { cancel: vi.fn(), resolve: vi.fn() },
         currentTurnId: 'turn-1',
         flush: vi.fn(),
diff --git a/src/main/claude/compact-status-registration.test.ts b/src/main/claude/compact-status-registration.test.ts
index 2c54cc8db622..225a52423c3a 100644
--- a/src/main/claude/compact-status-registration.test.ts
+++ b/src/main/claude/compact-status-registration.test.ts
@@ -12,7 +12,9 @@ import {
 import { seedClaudeSubagentRosterFromSnapshots } from '../../shared/agent-hook-listener/providers/claude-roster-state'
 import type { AgentHookEventPayload } from '../../shared/agent-hook-listener/listener-event'
 import { makePaneKey } from '../../shared/stable-pane-id'
-import { applyManagedHooks, CLAUDE_EVENTS } from './hook-settings'
+import { CLAUDE_HOOK_EVENT_FIRST_VERSIONS } from './claude-hook-event-versions'
+import { CLAUDE_EVENTS, getClaudeManagedHookPlan } from './claude-managed-hook-events'
+import { applyManagedHooks } from './hook-settings'
 
 const PANE_KEY = makePaneKey('compact-registration', '11111111-1111-4111-8111-111111111111')
 const TURN_PROMPT_ID = '22222222-2222-4222-8222-222222222222'
@@ -108,7 +110,8 @@ describe('Claude compact hook registration', () => {
     const written = applyManagedHooks(
       { hooks: {} },
       { type: 'command', command: 'orca-claude-hook' },
-      'claude-hook.sh'
+      'claude-hook.sh',
+      getClaudeManagedHookPlan(CLAUDE_HOOK_EVENT_FIRST_VERSIONS.PostCompact)
     )
     const postCompact = written.hooks?.PostCompact ?? []
     expect(
diff --git a/src/main/claude/hook-script.ts b/src/main/claude/hook-script.ts
index efbe71fc9e36..e02fe3747016 100644
--- a/src/main/claude/hook-script.ts
+++ b/src/main/claude/hook-script.ts
@@ -1,6 +1,7 @@
 /** The managed Claude-compatible hook script, built for local, POSIX-remote and Windows targets.
  *  Split from hook-service.ts so the service owns install/status and this owns script text,
  *  mirroring the same split under src/main/cursor/. */
+import type { AgentHookSource } from '../../shared/agent-hook-relay'
 import { buildWindowsAgentHookCurlPostCommand } from '../agent-hooks/installer-utils'
 import { buildPosixAgentHookPostCommand } from '../agent-hooks/hook-post-command'
 import {
@@ -18,10 +19,12 @@ import {
 export function getManagedScript(
   target: 'local' | 'posix' = 'local',
   options: {
+    source?: AgentHookSource
     skipWhenDevinImportsClaude?: boolean
     skipWhenGrokImportsClaude?: boolean
   } = {}
 ): string {
+  const source = options.source ?? 'claude'
   if (target === 'local' && process.platform === 'win32') {
     return [
       '@echo off',
@@ -46,7 +49,7 @@ export function getManagedScript(
           ]
         : []),
       // Why: use curl.exe to avoid an extra PowerShell startup per hook.
-      buildWindowsAgentHookCurlPostCommand('claude'),
+      buildWindowsAgentHookCurlPostCommand(source),
       'exit /b 0',
       ...buildWindowsHookStdinDrainEpilogue(),
       ''
@@ -59,7 +62,7 @@ export function getManagedScript(
     'printf "{}\\n"',
     ...buildPosixHookPayloadCapture(),
     ...(options.skipWhenGrokImportsClaude ? buildPosixGrokReplayGuardLines() : []),
-    ...buildPosixHookSpoolLines('claude'),
+    ...buildPosixHookSpoolLines(source),
     ...(options.skipWhenDevinImportsClaude
       ? [
           // Why: Devin imports .claude hooks by default; skip Orca's managed hook there so status posts stay attributed to Devin.
@@ -84,7 +87,7 @@ export function getManagedScript(
     '  exit 0',
     'fi',
     // Why: keep full hook JSON off the command line and avoid IDS-friendly URL-encoded paths.
-    ...buildPosixAgentHookPostCommand('claude').map((line, index, lines) =>
+    ...buildPosixAgentHookPostCommand(source).map((line, index, lines) =>
       index === lines.length - 1 ? `${line} >/dev/null 2>&1 || spool_hook_event` : line
     ),
     'exit 0',
diff --git a/src/main/claude/hook-service.test.ts b/src/main/claude/hook-service.test.ts
index 2a07aff4c8ae..c9191d42dbd1 100644
--- a/src/main/claude/hook-service.test.ts
+++ b/src/main/claude/hook-service.test.ts
@@ -27,11 +27,8 @@ import type { SFTPWrapper } from 'ssh2'
 import { createManagedCommandMatcher, WINDOWS_CMD_SAFE_PATH } from '../agent-hooks/installer-utils'
 import { WINDOWS_HOOK_STDIN_DRAIN_LABEL } from '../agent-hooks/hook-stdin-contract'
 import { ClaudeHookService } from './hook-service'
-import {
-  CLAUDE_EVENTS,
-  getWindowsManagedLifecycleHook,
-  OPENCLAUDE_HOOK_SETTINGS
-} from './hook-settings'
+import { CLAUDE_EVENTS } from './claude-managed-hook-events'
+import { getWindowsManagedLifecycleHook, OPENCLAUDE_HOOK_SETTINGS } from './hook-settings'
 
 const CLAUDE_SCRIPT_FILE_NAME = process.platform === 'win32' ? 'claude-hook.cmd' : 'claude-hook.sh'
 const STATUSLINE_SCRIPT_FILE_NAME =
@@ -43,6 +40,9 @@ const isOpenClaudeManagedCommand = createManagedCommandMatcher(OPENCLAUDE_SCRIPT
 
 type TestHook = { command: string; args?: string[] }
 
+// Why: the managed event set follows the resolved Claude; this one knows every event Orca writes.
+const CURRENT_CLAUDE = { claudeVersion: '2.1.261 (Claude Code)' }
+
 function hasManagedCommand(hook: TestHook, matcher: (command: string | undefined) => boolean) {
   return matcher(hook.command) || hook.args?.some(matcher) === true
 }
@@ -217,7 +217,7 @@ describe('ClaudeHookService.install', () => {
         })
       )
 
-      const status = new ClaudeHookService().install()
+      const status = new ClaudeHookService().install(CURRENT_CLAUDE)
       expect(status.state).toBe('installed')
 
       const legacy = JSON.parse(readFileSync(legacyPath, 'utf-8'))
@@ -275,6 +275,48 @@ describe('ClaudeHookService.install', () => {
     }
   })
 
+  it('writes only the events an old resolved Claude knows and reports that as installed', () => {
+    const tmpHome = mkdtempSync(join(tmpdir(), 'orca-claude-old-version-'))
+    vi.stubEnv('HOME', tmpHome)
+    vi.stubEnv('USERPROFILE', tmpHome)
+    try {
+      const service = new ClaudeHookService()
+      expect(service.install({ claudeVersion: '2.1.32' }).state).toBe('installed')
+
+      const settings = JSON.parse(readFileSync(join(tmpHome, '.claude', 'settings.json'), 'utf-8'))
+      for (const event of ['StopFailure', 'PostCompact', 'TeammateIdle', 'SessionEnd']) {
+        expect(settings.hooks[event], event).toBeUndefined()
+      }
+      expect(settings.hooks.SubagentStart).toBeDefined()
+      // Why: a reader without the version still sees a complete install of the universal set.
+      expect(service.getStatus().state).toBe('installed')
+    } finally {
+      vi.unstubAllEnvs()
+      rmSync(tmpHome, { recursive: true, force: true })
+    }
+  })
+
+  it('keeps newer Orca events and reports installed when a later probe cannot resolve the version', () => {
+    const tmpHome = mkdtempSync(join(tmpdir(), 'orca-claude-unknown-version-'))
+    vi.stubEnv('HOME', tmpHome)
+    vi.stubEnv('USERPROFILE', tmpHome)
+    try {
+      const service = new ClaudeHookService()
+      const settingsPath = join(tmpHome, '.claude', 'settings.json')
+      expect(service.install(CURRENT_CLAUDE).state).toBe('installed')
+      const known = JSON.parse(readFileSync(settingsPath, 'utf-8'))
+
+      expect(service.install().state).toBe('installed')
+
+      const unknown = JSON.parse(readFileSync(settingsPath, 'utf-8'))
+      expect(unknown.hooks).toEqual(known.hooks)
+      expect(service.getStatus().state).toBe('installed')
+    } finally {
+      vi.unstubAllEnvs()
+      rmSync(tmpHome, { recursive: true, force: true })
+    }
+  })
+
   it('installs the managed statusLine command and forwards rate_limits posts', () => {
     const tmpHome = mkdtempSync(join(tmpdir(), 'orca-claude-statusline-'))
     vi.stubEnv('HOME', tmpHome)
@@ -458,7 +500,7 @@ describe('ClaudeHookService.install', () => {
         return
       }
       try {
-        expect(new ClaudeHookService().install().state).toBe('installed')
+        expect(new ClaudeHookService().install(CURRENT_CLAUDE).state).toBe('installed')
 
         const settings = JSON.parse(
           readFileSync(join(tmpHome, '.claude', 'settings.json'), 'utf-8')
@@ -472,7 +514,7 @@ describe('ClaudeHookService.install', () => {
         }
         // Why: the whole point of #18875 — no interpreter is started to reach the script.
         expect(JSON.stringify(settings.hooks)).not.toMatch(/powershell|EncodedCommand/i)
-        expect(new ClaudeHookService().getStatus().state).toBe('installed')
+        expect(new ClaudeHookService().getStatus(CURRENT_CLAUDE).state).toBe('installed')
       } finally {
         vi.unstubAllEnvs()
         rmSync(tmpHome, { recursive: true, force: true })
@@ -681,7 +723,7 @@ describe('ClaudeHookService.installRemote', () => {
   it('writes Claude settings + managed script under the remote $HOME', async () => {
     const svc = new ClaudeHookService()
     const { sftp, fs } = createFakeSftp()
-    const status = await svc.installRemote(sftp, '/home/dev')
+    const status = await svc.installRemote(sftp, '/home/dev', CURRENT_CLAUDE)
     expect(status.state).toBe('installed')
     expect(status.configPath).toBe('/home/dev/.claude/settings.json')
     const settings = fs.files.get('/home/dev/.claude/settings.json')
@@ -732,6 +774,25 @@ describe('ClaudeHookService.installRemote', () => {
     expect(fs.files.get('/home/dev/.orca/agent-hooks/claude-statusline.sh')).toBeUndefined()
   })
 
+  it('writes only the events the remote Claude knows, adding newer ones once it upgrades', async () => {
+    const svc = new ClaudeHookService()
+    const { sftp, fs } = createFakeSftp()
+    const settingsPath = '/home/dev/.claude/settings.json'
+    const userStop = { hooks: [{ type: 'command', command: '/usr/local/bin/my-user-hook' }] }
+    fs.files.set(settingsPath, JSON.stringify({ env: { A: '1' }, hooks: { Stop: [userStop] } }))
+
+    await svc.installRemote(sftp, '/home/dev', { claudeVersion: '2.1.77' })
+    const old = JSON.parse(fs.files.get(settingsPath)!)
+    expect(old.hooks.StopFailure).toBeUndefined()
+    expect(old.hooks.PostCompact).toBeDefined()
+
+    await svc.installRemote(sftp, '/home/dev', { claudeVersion: '2.1.78' })
+    const upgraded = JSON.parse(fs.files.get(settingsPath)!)
+    expect(upgraded.hooks.StopFailure[0].hooks[0].command).toContain('claude-hook.sh')
+    expect(upgraded.hooks.Stop[0]).toEqual(userStop)
+    expect(upgraded.env).toEqual({ A: '1' })
+  })
+
   it('reports parse error when remote settings.json cannot be parsed', async () => {
     const svc = new ClaudeHookService()
     const { sftp, fs } = createFakeSftp()
diff --git a/src/main/claude/hook-service.ts b/src/main/claude/hook-service.ts
index de6dd89f7caa..4b66aa91e7e9 100644
--- a/src/main/claude/hook-service.ts
+++ b/src/main/claude/hook-service.ts
@@ -1,4 +1,5 @@
 import { existsSync, rmSync, writeFileSync } from 'node:fs'
+import type { AgentHookSource } from '../../shared/agent-hook-relay'
 import type { SFTPWrapper } from 'ssh2'
 import type { AgentHookInstallState, AgentHookInstallStatus } from '../../shared/agent-hook-types'
 import {
@@ -25,7 +26,6 @@ import {
 import {
   applyManagedHooks,
   applyManagedStatusLine,
-  CLAUDE_EVENTS,
   CLAUDE_HOOK_SETTINGS,
   getManagedScriptFileName,
   getConfigPath,
@@ -43,11 +43,19 @@ import {
   removeManagedHooks,
   type ClaudeCompatibleHookSettings
 } from './hook-settings'
+import {
+  getClaudeManagedHookPlan,
+  OPENCLAUDE_MANAGED_HOOK_PLAN,
+  type ClaudeManagedHookPlan
+} from './claude-managed-hook-events'
 
 type ClaudeHookServiceOptions = {
   agent: AgentHookInstallStatus['agent']
   displayName: string
   settings: ClaudeCompatibleHookSettings
+  source?: AgentHookSource
+  /** A Claude-compatible CLI with its own settings file writes a fixed plan, not Claude's version table. */
+  hookPlan?: ClaudeManagedHookPlan
 }
 
 type ClaudeHookInstallOptions = {
@@ -67,7 +75,15 @@ export class ClaudeHookService {
     this.options = options
   }
 
-  getStatus(): AgentHookInstallStatus {
+  // Why: Claude's settings loader rejects events newer than the running CLI, so its plan follows the
+  // resolved version; OpenClaude and Qoder read their own settings files.
+  private managedHookPlan(options: ClaudeHookInstallOptions): ClaudeManagedHookPlan {
+    return this.options.agent === 'claude'
+      ? getClaudeManagedHookPlan(options.claudeVersion)
+      : (this.options.hookPlan ?? OPENCLAUDE_MANAGED_HOOK_PLAN)
+  }
+
+  getStatus(options: ClaudeHookInstallOptions = {}): AgentHookInstallStatus {
     const configPath = getConfigPath(this.options.settings)
     const scriptPath = getManagedScriptPath(this.options.settings)
     const config = readHooksJson(configPath)
@@ -85,7 +101,7 @@ export class ClaudeHookService {
     const expectedHook = getManagedLifecycleHook(scriptPath, this.options.settings)
     const missing: string[] = []
     let presentCount = 0
-    for (const event of CLAUDE_EVENTS) {
+    for (const event of this.managedHookPlan(options).install) {
       const definitions = Array.isArray(config.hooks?.[event.eventName])
         ? config.hooks![event.eventName]!
         : []
@@ -118,6 +134,7 @@ export class ClaudeHookService {
     await refreshManagedScriptIfPresent(
       getManagedScriptPath(this.options.settings),
       getManagedScript('local', {
+        source: this.options.source,
         skipWhenDevinImportsClaude: this.options.agent === 'claude',
         skipWhenGrokImportsClaude: this.options.agent === 'claude'
       })
@@ -144,25 +161,28 @@ export class ClaudeHookService {
     }
 
     const hook = getManagedLifecycleHook(scriptPath, this.options.settings)
+    const plan = this.managedHookPlan(options)
     let nextConfig = applyManagedHooks(
       config,
       hook,
       getManagedScriptFileName(this.options.settings),
-      this.options.agent === 'claude' ? options : undefined
+      plan
     )
     writeManagedScript(
       scriptPath,
       getManagedScript('local', {
+        source: this.options.source,
         skipWhenDevinImportsClaude: this.options.agent === 'claude',
         skipWhenGrokImportsClaude: this.options.agent === 'claude'
       })
     )
-    // Why: the statusline usage feed is Claude-only — OpenClaude data would be misattributed to the Claude provider.
-    if (this.options.agent === 'claude') {
+    if (plan.statusLine === 'install') {
       nextConfig = this.installManagedStatusLine(nextConfig)
+    } else if (plan.statusLine === 'retire') {
+      nextConfig = this.retireManagedStatusLine(nextConfig)
     }
     writeHooksJson(configPath, nextConfig)
-    return this.getStatus()
+    return this.getStatus(options)
   }
 
   // Why: the statusline feed is opportunistic (usage display, not agent status); a user who deleted the
@@ -189,6 +209,23 @@ export class ClaudeHookService {
     return next
   }
 
+  // Why: a Claude that predates statusLine discards the whole settings file over Orca's; dropping the
+  // marker with it keeps an upgrade from reading the removal as the user's opt-out.
+  private retireManagedStatusLine(config: HooksConfig): HooksConfig {
+    const { config: next, changed } = removeManagedStatusLine(
+      config,
+      getStatusLineScriptFileName(this.options.settings)
+    )
+    if (changed) {
+      try {
+        rmSync(getStatusLineInstallMarkerPath(this.options.settings), { force: true })
+      } catch {
+        // Best-effort: a stale marker only means one upgrade skips re-adding the statusline.
+      }
+    }
+    return next
+  }
+
   // Why: install the Claude hook on the remote box (via SFTP); POSIX-only by design (Windows-remote deferred).
   async installRemote(
     sftp: SFTPWrapper,
@@ -218,7 +255,7 @@ export class ClaudeHookService {
         config,
         hook,
         remoteScriptFileName,
-        this.options.agent === 'claude' ? options : undefined
+        this.managedHookPlan(options)
       )
 
       // Why: write scripts before settings to avoid settings pointing to missing scripts.
@@ -227,6 +264,7 @@ export class ClaudeHookService {
         sftp,
         remoteScriptPath,
         getManagedScript('posix', {
+          source: this.options.source,
           skipWhenDevinImportsClaude: this.options.agent === 'claude',
           skipWhenGrokImportsClaude: this.options.agent === 'claude'
         })
diff --git a/src/main/claude/hook-settings.ts b/src/main/claude/hook-settings.ts
index 42a986cad204..381e4d26b6f0 100644
--- a/src/main/claude/hook-settings.ts
+++ b/src/main/claude/hook-settings.ts
@@ -16,12 +16,13 @@ import { quotePowerShellLiteral } from '../../shared/powershell-native-argument'
 import { wrapRuntimeHomeHookCommand } from '../agent-hooks/runtime-home-hook-command'
 import { wrapWindowsDirectCmdHookCommand } from '../agent-hooks/windows-direct-cmd-hook-command'
 import { isGitBashAvailable } from '../git-bash'
-import { claudeVersionSupportsSessionEnd } from './claude-session-end-hook-capability'
+import type { ClaudeManagedHookPlan } from './claude-managed-hook-events'
 
 export type ClaudeCompatibleHookSettings = {
-  configDirName: '.claude' | '.openclaude'
-  scriptBaseName: 'claude-hook' | 'openclaude-hook'
+  configDirName: '.claude' | '.openclaude' | '.qoder' | '.codebuddy'
+  scriptBaseName: 'claude-hook' | 'openclaude-hook' | 'qoder-hook' | 'codebuddy-hook'
   usesWindowsCompatLauncher: boolean
+  windowsHookShell?: 'powershell'
 }
 
 export const CLAUDE_HOOK_SETTINGS: ClaudeCompatibleHookSettings = {
@@ -36,81 +37,6 @@ export const OPENCLAUDE_HOOK_SETTINGS: ClaudeCompatibleHookSettings = {
   usesWindowsCompatLauncher: false
 }
 
-export const CLAUDE_EVENTS = [
-  // Why: SessionStart is the only event a resumed/idle session emits before the
-  // first prompt; without it the sidebar row can't exist until the user types (STA-3386).
-  {
-    eventName: 'SessionStart',
-    definition: { hooks: [{ type: 'command', command: '' }] }
-  },
-  {
-    eventName: 'UserPromptSubmit',
-    definition: { hooks: [{ type: 'command', command: '' }] }
-  },
-  {
-    eventName: 'Stop',
-    definition: { hooks: [{ type: 'command', command: '' }] }
-  },
-  // Why: OpenClaude skips normal Stop hooks after API/model errors and emits
-  // StopFailure instead; without this hook Orca leaves the turn spinning.
-  {
-    eventName: 'StopFailure',
-    definition: { hooks: [{ type: 'command', command: '' }] }
-  },
-  // Why: subagent/teammate lifecycle feeds the sidebar's child rows and keeps
-  // a pane 'working' while background children outlive the lead's turn.
-  // TeammateIdle parks turn-based teammates without trusting their permanently
-  // "running" background_tasks entry to gate the pane.
-  // Older Claude builds ignore unregistered event names (StopFailure precedent).
-  {
-    eventName: 'SubagentStart',
-    definition: { hooks: [{ type: 'command', command: '' }] }
-  },
-  {
-    eventName: 'SubagentStop',
-    definition: { hooks: [{ type: 'command', command: '' }] }
-  },
-  {
-    eventName: 'TeammateIdle',
-    definition: { hooks: [{ type: 'command', command: '' }] }
-  },
-  // Why: PreToolUse gives the dashboard a live readout of the in-flight tool
-  // (name + input preview) before it completes.
-  {
-    eventName: 'PreToolUse',
-    definition: { matcher: '*', hooks: [{ type: 'command', command: '' }] }
-  },
-  {
-    eventName: 'PostToolUse',
-    definition: { matcher: '*', hooks: [{ type: 'command', command: '' }] }
-  },
-  {
-    eventName: 'PostToolUseFailure',
-    definition: { matcher: '*', hooks: [{ type: 'command', command: '' }] }
-  },
-  {
-    eventName: 'PermissionRequest',
-    definition: { matcher: '*', hooks: [{ type: 'command', command: '' }] }
-  },
-  // Why: a manual /compact ends at an idle prompt without emitting Stop, so PostCompact is the only
-  // signal that can clear the pane (STA-2915). PreCompact is deliberately NOT registered: it fires
-  // before the compact is validated, and an aborted compact emits it alone — mapping it to 'working'
-  // would strand the pane exactly as this registration is meant to prevent (STA-4613).
-  {
-    eventName: 'PostCompact',
-    definition: { hooks: [{ type: 'command', command: '' }] }
-  }
-] as const
-
-const CLAUDE_SESSION_END_EVENT = {
-  eventName: 'SessionEnd',
-  definition: { hooks: [{ type: 'command', command: '' }] }
-} as const
-
-export type ApplyManagedClaudeHooksOptions = {
-  claudeVersion?: string
-}
-
 export function getConfigPath(settings = CLAUDE_HOOK_SETTINGS): string {
   return join(homedir(), settings.configDirName, 'settings.json')
 }
@@ -171,6 +97,14 @@ export function getManagedLifecycleHook(
   if (process.platform !== 'win32' || !settings.usesWindowsCompatLauncher) {
     return buildManagedCommandHook(getManagedCommand(scriptPath, { neutralJsonWhenMissing: true }))
   }
+  if (settings.windowsHookShell === 'powershell') {
+    return {
+      type: 'command',
+      command: getWindowsPowerShellLifecycleCommand(scriptPath),
+      shell: 'powershell',
+      timeout: MANAGED_HOOK_TIMEOUT_SECONDS
+    }
+  }
   return getWindowsManagedLifecycleHook(scriptPath, options)
 }
 
@@ -190,19 +124,21 @@ export function getWindowsManagedLifecycleHook(
   if (directCommand) {
     return { type: 'command', command: directCommand, timeout: MANAGED_HOOK_TIMEOUT_SECONDS }
   }
+  return {
+    type: 'command',
+    command: wrapWindowsPowerShellEncodedCommand(getWindowsPowerShellLifecycleCommand(scriptPath)),
+    timeout: MANAGED_HOOK_TIMEOUT_SECONDS
+  }
+}
+
+function getWindowsPowerShellLifecycleCommand(scriptPath: string): string {
   const scriptFileName = win32.basename(scriptPath)
-  // Why: runtime profile resolution keeps the managed entry portable across users (STA-3348).
   const quotedRelativePath = quotePowerShellLiteral(`.orca\\agent-hooks\\${scriptFileName}`)
-  // Why: compat consumers require neutral JSON even when the managed script is missing (#14818).
-  const innerCommand =
+  return (
     `$scriptPath = Join-Path $env:USERPROFILE ${quotedRelativePath}; ` +
     'if (Test-Path -LiteralPath $scriptPath -PathType Leaf) { & $scriptPath; exit $LASTEXITCODE }; ' +
     "[Console]::In.ReadToEnd() | Out-Null; Write-Output '{}'; exit 0"
-  return {
-    type: 'command',
-    command: wrapWindowsPowerShellEncodedCommand(innerCommand),
-    timeout: MANAGED_HOOK_TIMEOUT_SECONDS
-  }
+  )
 }
 
 export function hasSameManagedHookInvocation(
@@ -211,6 +147,7 @@ export function hasSameManagedHookInvocation(
 ): boolean {
   return (
     actual.command === expected.command &&
+    actual.shell === expected.shell &&
     JSON.stringify(actual.args ?? []) === JSON.stringify(expected.args ?? [])
   )
 }
@@ -222,31 +159,29 @@ export function getRemoteManagedCommand(scriptPath: string): string {
 export function applyManagedHooks(
   config: HooksConfig,
   hook: HookCommandConfig,
-  scriptFileName = getManagedScriptFileName(),
-  options: ApplyManagedClaudeHooksOptions = {}
+  scriptFileName: string,
+  plan: ClaudeManagedHookPlan
 ): HooksConfig {
   const nextHooks = { ...config.hooks }
   const isManagedCommand = createManagedCommandMatcher(scriptFileName)
-  const sessionEndCapable = claudeVersionSupportsSessionEnd(options.claudeVersion)
-  const events = sessionEndCapable ? [...CLAUDE_EVENTS, CLAUDE_SESSION_END_EVENT] : CLAUDE_EVENTS
 
-  for (const event of events) {
-    const current = Array.isArray(nextHooks[event.eventName]) ? nextHooks[event.eventName] : []
-    const cleaned = removeManagedCommands(current, isManagedCommand)
-    const definition: HookDefinition = {
-      ...event.definition,
-      hooks: [hook]
-    }
+  for (const event of plan.install) {
+    const current = nextHooks[event.eventName]
+    const cleaned = Array.isArray(current) ? removeManagedCommands(current, isManagedCommand) : []
+    const definition: HookDefinition = { ...event.definition, hooks: [hook] }
     nextHooks[event.eventName] = [...cleaned, definition]
   }
 
-  if (!sessionEndCapable) {
-    const current = Array.isArray(nextHooks.SessionEnd) ? nextHooks.SessionEnd : []
+  for (const event of plan.retire) {
+    const current = nextHooks[event.eventName]
+    if (!Array.isArray(current) || current.length === 0) {
+      continue
+    }
     const cleaned = removeManagedCommands(current, isManagedCommand)
     if (cleaned.length === 0) {
-      delete nextHooks.SessionEnd
+      delete nextHooks[event.eventName]
     } else {
-      nextHooks.SessionEnd = cleaned
+      nextHooks[event.eventName] = cleaned
     }
   }
 
diff --git a/src/main/cli/orca-cli-child-path.ts b/src/main/cli/orca-cli-child-path.ts
index f053e54c3d53..2a8136c367fc 100644
--- a/src/main/cli/orca-cli-child-path.ts
+++ b/src/main/cli/orca-cli-child-path.ts
@@ -17,6 +17,8 @@ import { delimiter, join } from 'node:path'
 import { readInheritedPath } from '../ipc/pty/host-env/path'
 import { resolvePathEnvKey } from '../pty/windows-environment-path'
 import { ensureLinuxTerminalOrcaCliShimDir } from './linux-terminal-orca-cli-shim'
+import { getBundledLauncherPath } from './bundled-cli-launcher-path'
+import { DEV_COMMAND_NAME } from './cli-install-constants'
 
 export type OrcaCliChildPathOptions = {
   isPackaged: boolean
@@ -26,11 +28,16 @@ export type OrcaCliChildPathOptions = {
   platform?: NodeJS.Platform
 }
 
-/** Mutates `env` in place, prepending the directory that makes bare `orca` this app's CLI. */
+/**
+ * Mutates `env` in place, prepending the directory that makes bare `orca` this app's CLI. Returns
+ * the absolute launcher in that directory, or null when none was prepended: a child whose shell
+ * rebuilds PATH (a login shell reordering it behind a global install) can still name this app's
+ * CLI by path.
+ */
 export function prependOrcaCliDirToChildPath(
   env: Record<string, string>,
   opts: OrcaCliChildPathOptions
-): void {
+): string | null {
   const platform = opts.platform ?? process.platform
   // Why: matches node:path's `delimiter` for the running platform, but stays correct when a test
   // drives a foreign platform through the seam.
@@ -43,6 +50,7 @@ export function prependOrcaCliDirToChildPath(
     env[resolvePathEnvKey(env, platform)] = inheritedPath
       ? `${devCliBin}${pathDelimiter}${inheritedPath}`
       : devCliBin
+    return join(devCliBin, platform === 'win32' ? `${DEV_COMMAND_NAME}.cmd` : DEV_COMMAND_NAME)
   } else if (platform === 'linux') {
     // Why: bare-`orca` shim scoped to Orca PTYs — Linux CLI installs as `orca-ide` to avoid shadowing GNOME's /usr/bin/orca screen reader (stablyai/orca#7904).
     const shimDir = ensureLinuxTerminalOrcaCliShimDir({ userDataPath: opts.userDataPath })
@@ -51,6 +59,7 @@ export function prependOrcaCliDirToChildPath(
         .split(pathDelimiter)
         .filter((entry) => entry.length > 0 && entry !== shimDir)
       env.PATH = [shimDir, ...inheritedEntries].join(pathDelimiter)
+      return join(shimDir, 'orca')
     }
   } else if (opts.resourcesPath && (platform === 'darwin' || platform === 'win32')) {
     // Why: global CLI registration is optional, but agents in Orca-managed PTYs must always reach this app's bundled CLI.
@@ -59,5 +68,8 @@ export function prependOrcaCliDirToChildPath(
     env[resolvePathEnvKey(env, platform)] = inheritedPath
       ? `${bundledCliBin}${pathDelimiter}${inheritedPath}`
       : bundledCliBin
+    // Why the native launcher on Windows: `orca.cmd` refuses message bodies cmd.exe would mangle.
+    return getBundledLauncherPath(platform, opts.resourcesPath)
   }
+  return null
 }
diff --git a/src/main/codebuddy/hook-service.test.ts b/src/main/codebuddy/hook-service.test.ts
new file mode 100644
index 000000000000..e20ae46e39c2
--- /dev/null
+++ b/src/main/codebuddy/hook-service.test.ts
@@ -0,0 +1,47 @@
+import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import type * as OsModule from 'node:os'
+import { join } from 'node:path'
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
+const sandbox = vi.hoisted(() => ({ home: '' }))
+vi.mock('node:os', async (importOriginal) => ({
+  ...(await importOriginal<typeof OsModule>()),
+  homedir: () => sandbox.home
+}))
+vi.mock('electron', () => ({ app: { getPath: () => sandbox.home } }))
+import { codebuddyHookService, CODEBUDDY_HOOK_EVENTS } from './hook-service'
+
+beforeAll(() => {
+  sandbox.home = mkdtempSync(join(tmpdir(), 'orca-codebuddy-test-'))
+  mkdirSync(join(sandbox.home, '.codebuddy'))
+})
+afterAll(() => rmSync(sandbox.home, { recursive: true, force: true }))
+
+describe('CodeBuddy managed hooks', () => {
+  it('preserves user configuration through repeated install and removal', () => {
+    const path = join(sandbox.home, '.codebuddy', 'settings.json')
+    const userHook = { hooks: [{ type: 'command', command: 'echo user-hook' }] }
+    const settings = {
+      model: 'custom',
+      hooks: { Stop: [userHook] },
+      statusLine: { command: 'user-status' }
+    }
+    writeFileSync(path, JSON.stringify(settings))
+    expect(codebuddyHookService.install().state).toBe('installed')
+    expect(codebuddyHookService.install().state).toBe('installed')
+    const installed = JSON.parse(readFileSync(path, 'utf8'))
+    for (const event of CODEBUDDY_HOOK_EVENTS) {
+      expect(installed.hooks[event]).toHaveLength(event === 'Stop' ? 2 : 1)
+    }
+    expect(installed.statusLine).toEqual(settings.statusLine)
+    expect(codebuddyHookService.remove().state).toBe('not_installed')
+    expect(JSON.parse(readFileSync(path, 'utf8'))).toMatchObject(settings)
+  })
+
+  it('leaves malformed user settings untouched', () => {
+    const path = join(sandbox.home, '.codebuddy', 'settings.json')
+    writeFileSync(path, '{broken')
+    expect(codebuddyHookService.install().state).toBe('error')
+    expect(readFileSync(path, 'utf8')).toBe('{broken')
+  })
+})
diff --git a/src/main/codebuddy/hook-service.ts b/src/main/codebuddy/hook-service.ts
new file mode 100644
index 000000000000..1a7c9619a344
--- /dev/null
+++ b/src/main/codebuddy/hook-service.ts
@@ -0,0 +1,34 @@
+import type { ClaudeManagedHookPlan } from '../claude/claude-managed-hook-events'
+import { ClaudeHookService } from '../claude/hook-service'
+
+export const CODEBUDDY_HOOK_EVENTS = [
+  'SessionStart',
+  'SessionEnd',
+  'UserPromptSubmit',
+  'PreToolUse',
+  'PostToolUse',
+  'PostToolUseFailure',
+  'PermissionRequest',
+  'Stop',
+  'StopFailure',
+  'Notification'
+] as const
+
+export const CODEBUDDY_MANAGED_HOOK_PLAN: ClaudeManagedHookPlan = {
+  install: CODEBUDDY_HOOK_EVENTS.map((eventName) => ({ eventName, definition: {} })),
+  retire: [],
+  statusLine: 'leave'
+}
+
+export const codebuddyHookService = new ClaudeHookService({
+  agent: 'codebuddy',
+  source: 'codebuddy',
+  displayName: 'CodeBuddy',
+  settings: {
+    configDirName: '.codebuddy',
+    scriptBaseName: 'codebuddy-hook',
+    usesWindowsCompatLauncher: true,
+    windowsHookShell: 'powershell'
+  },
+  hookPlan: CODEBUDDY_MANAGED_HOOK_PLAN
+})
diff --git a/src/main/codex-accounts/managed-codex-auth-readiness.test.ts b/src/main/codex-accounts/managed-codex-auth-readiness.test.ts
index e63548263663..0fbf93adadb3 100644
--- a/src/main/codex-accounts/managed-codex-auth-readiness.test.ts
+++ b/src/main/codex-accounts/managed-codex-auth-readiness.test.ts
@@ -220,22 +220,6 @@ describe('waitForManagedCodexAuthReady', () => {
     chmodSync(join(fixture.home, 'auth.json'), 0o000)
     expect(readStoredCodexCredentialState(join(fixture.home, 'auth.json'))).toBe('unreadable')
   })
-
-  it('does not gate system, WSL, or unmanaged custom homes', async () => {
-    const fixture = createFixture()
-    await waitForManagedCodexAuthReady({
-      ...fixture.args,
-      codexHomePath: join(fixture.root, 'custom-home')
-    })
-    await waitForManagedCodexAuthReady({
-      ...fixture.args,
-      target: { runtime: 'wsl', wslDistro: 'Ubuntu' }
-    })
-    await waitForManagedCodexAuthReady({
-      ...fixture.args,
-      codexHomePath: null
-    })
-  })
 })
 
 function createFixture(): {
diff --git a/src/main/codex-accounts/runtime-home-service-per-account-migration.test.ts b/src/main/codex-accounts/runtime-home-service-per-account-migration.test.ts
index 53736a11bebe..4a7ad01e1b55 100644
--- a/src/main/codex-accounts/runtime-home-service-per-account-migration.test.ts
+++ b/src/main/codex-accounts/runtime-home-service-per-account-migration.test.ts
@@ -6,6 +6,7 @@ import type { GlobalSettings } from '../../shared/global-settings-types'
 import type { CodexManagedAccount } from '../../shared/managed-account-types'
 import type * as NodeOs from 'node:os'
 import { readHookTrustEntries } from '../codex/config-toml-trust'
+import { writeCodexStateDbBackfillStatus } from '../codex/codex-state-db-test-fixture'
 
 const testState = { userData: '', home: '' }
 const previousEnv: Record<string, string | undefined> = {}
@@ -15,6 +16,17 @@ vi.mock('node:os', async () => {
   const actual = await vi.importActual<typeof NodeOs>('node:os')
   return { ...actual, homedir: () => testState.home }
 })
+// Why: selecting an account starts the history bridge, which would otherwise
+// spawn the real `codex app-server` on these fixture homes.
+vi.mock('../codex/codex-account-session-index-heal', () => ({
+  createCodexAccountStateDb: async () => false,
+  healCodexAccountSessionIndex: async () => ({
+    outcome: 'up-to-date',
+    healedThreads: 0,
+    missingThreads: 0,
+    failedThreads: 0
+  })
+}))
 
 beforeEach(() => {
   vi.resetModules()
@@ -212,6 +224,8 @@ describe('CodexRuntimeHomeService per-account takeover composition', () => {
     const siblingRollout = join('2026', '07', '21', 'rollout-2026-07-21T10-00-00-bbbb.jsonl')
     writeRollout(systemHome(), systemRollout, '{"session":"real-home"}\n')
     writeRollout(accountOne.managedHomePath, siblingRollout, '{"session":"account-one"}\n')
+    // Why: history is linked only once Codex has indexed the new home (#20669).
+    writeCodexStateDbBackfillStatus(accountTwo.managedHomePath, 'complete')
     const { settings, store } = createStore([accountOne, accountTwo], accountOne.id)
     const { CodexRuntimeHomeService } = await import('./runtime-home-service')
     const bridge = await import('../codex/codex-account-session-bridge')
diff --git a/src/main/codex-usage/store.ts b/src/main/codex-usage/store.ts
index f11121f5d0db..7e91fb3945aa 100644
--- a/src/main/codex-usage/store.ts
+++ b/src/main/codex-usage/store.ts
@@ -1,3 +1,4 @@
+import { codexOpenCodeTokenSessions } from '../usage/agent-token-usage'
 import { app } from 'electron'
 import { join } from 'node:path'
 import type {
@@ -84,6 +85,10 @@ export class CodexUsageStore extends UsageProviderStoreLifecycle<
 > {
   constructor(store: Pick<Store, 'getRepos' | 'getAllWorktreeMeta'>) {
     super(store, {
+      tokenUsage: {
+        provider: 'codex',
+        selectSessions: (state) => codexOpenCodeTokenSessions(state.sessions)
+      },
       logTag: '[codex-usage]',
       resolveCacheFile: getCodexUsageFile,
       createDefaultState: getDefaultState,
diff --git a/src/main/codex/__fixtures__/codex-app-server-turn-endings.jsonl b/src/main/codex/__fixtures__/codex-app-server-turn-endings.jsonl
new file mode 100644
index 000000000000..7889b24d1130
--- /dev/null
+++ b/src/main/codex/__fixtures__/codex-app-server-turn-endings.jsonl
@@ -0,0 +1,172 @@
+{"case":"0.141.0-bad-model","t":371,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000001","status":{"type":"active"}}}
+{"case":"0.141.0-bad-model","t":371,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000001","turn":{"id":"00000000-0000-7000-8000-000000000002","status":"inProgress"}}}
+{"case":"0.141.0-bad-model","t":1745,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000001","turnId":"00000000-0000-7000-8000-000000000002","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000003","clientId":null,"content":[]}}}
+{"case":"0.141.0-bad-model","t":1745,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000001","turnId":"00000000-0000-7000-8000-000000000002","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000003","clientId":null,"content":[]}}}
+{"case":"0.141.0-bad-model","t":2831,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000001","status":{"type":"systemError"}}}
+{"case":"0.141.0-bad-model","t":2831,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000001","turnId":"00000000-0000-7000-8000-000000000002","willRetry":false,"error":{"message":"{\"type\":\"error\",\"status\":400,\"error\":{\"type\":\"invalid_request_error\",\"message\":\"The 'gpt-qa-nonexistent' model is not supported when using Codex with a ChatGPT account.\"}}","codexErrorInfo":"other"}}}
+{"case":"0.141.0-bad-model","t":2831,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000001","turn":{"id":"00000000-0000-7000-8000-000000000002","status":"failed","error":{"message":"{\"type\":\"error\",\"status\":400,\"error\":{\"type\":\"invalid_request_error\",\"message\":\"The 'gpt-qa-nonexistent' model is not supported when using Codex with a ChatGPT account.\"}}","codexErrorInfo":"other"},"durationMs":2488}}}
+{"case":"0.141.0-bad-turn-cwd","t":1458,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000004","status":{"type":"active"}}}
+{"case":"0.141.0-bad-turn-cwd","t":1458,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000004","turn":{"id":"00000000-0000-7000-8000-000000000005","status":"inProgress"}}}
+{"case":"0.141.0-bad-turn-cwd","t":5792,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000004","turnId":"00000000-0000-7000-8000-000000000005","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000006","clientId":null,"content":[]}}}
+{"case":"0.141.0-bad-turn-cwd","t":5792,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000004","turnId":"00000000-0000-7000-8000-000000000005","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000006","clientId":null,"content":[]}}}
+{"case":"0.141.0-bad-turn-cwd","t":7645,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000004","turnId":"00000000-0000-7000-8000-000000000005","item":{"type":"agentMessage","id":"msg_1","text":""}}}
+{"case":"0.141.0-bad-turn-cwd","t":7938,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000004","turnId":"00000000-0000-7000-8000-000000000005","item":{"type":"agentMessage","id":"msg_1","text":"pong"}}}
+{"case":"0.141.0-bad-turn-cwd","t":7959,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000004","status":{"type":"idle"}}}
+{"case":"0.141.0-bad-turn-cwd","t":7959,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000004","turn":{"id":"00000000-0000-7000-8000-000000000005","status":"completed","durationMs":6532}}}
+{"case":"0.141.0-compact-overloaded","t":582,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000007","status":{"type":"active"}}}
+{"case":"0.141.0-compact-overloaded","t":582,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000007","turn":{"id":"00000000-0000-7000-8000-000000000008","status":"inProgress"}}}
+{"case":"0.141.0-compact-overloaded","t":2940,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000007","turnId":"00000000-0000-7000-8000-000000000008","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000009","clientId":null,"content":[]}}}
+{"case":"0.141.0-compact-overloaded","t":2940,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000007","turnId":"00000000-0000-7000-8000-000000000008","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000009","clientId":null,"content":[]}}}
+{"case":"0.141.0-compact-overloaded","t":3011,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000007","turnId":"00000000-0000-7000-8000-000000000008","item":{"type":"agentMessage","id":"msg_ok","text":"pong"}}}
+{"case":"0.141.0-compact-overloaded","t":3011,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000007","turnId":"00000000-0000-7000-8000-000000000008","item":{"type":"agentMessage","id":"msg_ok","text":"pong"}}}
+{"case":"0.141.0-compact-overloaded","t":3017,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000007","status":{"type":"idle"}}}
+{"case":"0.141.0-compact-overloaded","t":3017,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000007","turn":{"id":"00000000-0000-7000-8000-000000000008","status":"completed","durationMs":2474}}}
+{"case":"0.141.0-compact-overloaded","t":3076,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000007","status":{"type":"active"}}}
+{"case":"0.141.0-compact-overloaded","t":3076,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000007","turn":{"id":"00000000-0000-7000-8000-000000000010","status":"inProgress"}}}
+{"case":"0.141.0-compact-overloaded","t":3081,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000007","turnId":"00000000-0000-7000-8000-000000000010","item":{"type":"contextCompaction","id":"00000000-0000-7000-8000-000000000011"}}}
+{"case":"0.141.0-compact-overloaded","t":3684,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000007","turnId":"00000000-0000-7000-8000-000000000010","willRetry":true,"error":{"message":"Reconnecting... 1/2","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"Selected model is at capacity. Please try a different model."}}}
+{"case":"0.141.0-compact-overloaded","t":4508,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000007","turnId":"00000000-0000-7000-8000-000000000010","willRetry":true,"error":{"message":"Reconnecting... 2/2","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"Selected model is at capacity. Please try a different model."}}}
+{"case":"0.141.0-compact-overloaded","t":5511,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000007","status":{"type":"systemError"}}}
+{"case":"0.141.0-compact-overloaded","t":5511,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000007","turnId":"00000000-0000-7000-8000-000000000010","willRetry":false,"error":{"message":"Selected model is at capacity. Please try a different model.","codexErrorInfo":"serverOverloaded"}}}
+{"case":"0.141.0-compact-overloaded","t":5511,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000007","turn":{"id":"00000000-0000-7000-8000-000000000010","status":"failed","error":{"message":"Selected model is at capacity. Please try a different model.","codexErrorInfo":"serverOverloaded"},"durationMs":2435}}}
+{"case":"0.141.0-conn-refused","t":588,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000012","status":{"type":"active"}}}
+{"case":"0.141.0-conn-refused","t":588,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000012","turn":{"id":"00000000-0000-7000-8000-000000000013","status":"inProgress"}}}
+{"case":"0.141.0-conn-refused","t":700,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000012","turnId":"00000000-0000-7000-8000-000000000013","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000014","clientId":null,"content":[]}}}
+{"case":"0.141.0-conn-refused","t":700,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000012","turnId":"00000000-0000-7000-8000-000000000013","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000014","clientId":null,"content":[]}}}
+{"case":"0.141.0-conn-refused","t":1354,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000012","turnId":"00000000-0000-7000-8000-000000000013","willRetry":true,"error":{"message":"Reconnecting... 1/2","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"stream disconnected before completion: error sending request for url (http://127.0.0.1:9/v1/responses)"}}}
+{"case":"0.141.0-conn-refused","t":2134,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000012","turnId":"00000000-0000-7000-8000-000000000013","willRetry":true,"error":{"message":"Reconnecting... 2/2","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"stream disconnected before completion: error sending request for url (http://127.0.0.1:9/v1/responses)"}}}
+{"case":"0.141.0-conn-refused","t":3116,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000012","status":{"type":"systemError"}}}
+{"case":"0.141.0-conn-refused","t":3116,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000012","turnId":"00000000-0000-7000-8000-000000000013","willRetry":false,"error":{"message":"stream disconnected before completion: error sending request for url (http://127.0.0.1:9/v1/responses)","codexErrorInfo":"other"}}}
+{"case":"0.141.0-conn-refused","t":3116,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000012","turn":{"id":"00000000-0000-7000-8000-000000000013","status":"failed","error":{"message":"stream disconnected before completion: error sending request for url (http://127.0.0.1:9/v1/responses)","codexErrorInfo":"other"},"durationMs":2556}}}
+{"case":"0.141.0-control","t":487,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000015","status":{"type":"active"}}}
+{"case":"0.141.0-control","t":487,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000015","turn":{"id":"00000000-0000-7000-8000-000000000016","status":"inProgress"}}}
+{"case":"0.141.0-control","t":2657,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000015","turnId":"00000000-0000-7000-8000-000000000016","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000017","clientId":null,"content":[]}}}
+{"case":"0.141.0-control","t":2657,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000015","turnId":"00000000-0000-7000-8000-000000000016","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000017","clientId":null,"content":[]}}}
+{"case":"0.141.0-control","t":4651,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000015","turnId":"00000000-0000-7000-8000-000000000016","item":{"type":"agentMessage","id":"msg_2","text":""}}}
+{"case":"0.141.0-control","t":4661,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000015","turnId":"00000000-0000-7000-8000-000000000016","item":{"type":"agentMessage","id":"msg_2","text":"pong"}}}
+{"case":"0.141.0-control","t":4811,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000015","status":{"type":"idle"}}}
+{"case":"0.141.0-control","t":4811,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000015","turn":{"id":"00000000-0000-7000-8000-000000000016","status":"completed","durationMs":4351}}}
+{"case":"0.141.0-interrupt","t":670,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000018","status":{"type":"active"}}}
+{"case":"0.141.0-interrupt","t":670,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000018","turn":{"id":"00000000-0000-7000-8000-000000000019","status":"inProgress"}}}
+{"case":"0.141.0-interrupt","t":2618,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000018","turnId":"00000000-0000-7000-8000-000000000019","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000020","clientId":null,"content":[]}}}
+{"case":"0.141.0-interrupt","t":2618,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000018","turnId":"00000000-0000-7000-8000-000000000019","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000020","clientId":null,"content":[]}}}
+{"case":"0.141.0-interrupt","t":4153,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000018","turnId":"00000000-0000-7000-8000-000000000019","item":{"type":"agentMessage","id":"msg_3","text":""}}}
+{"case":"0.141.0-interrupt","t":5669,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000018","status":{"type":"idle"}}}
+{"case":"0.141.0-interrupt","t":5669,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000018","turn":{"id":"00000000-0000-7000-8000-000000000019","status":"interrupted","durationMs":5027}}}
+{"case":"0.141.0-model-too-new-a","t":1276,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000021","status":{"type":"active"}}}
+{"case":"0.141.0-model-too-new-a","t":1276,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000021","turn":{"id":"00000000-0000-7000-8000-000000000022","status":"inProgress"}}}
+{"case":"0.141.0-model-too-new-a","t":6105,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000021","turnId":"00000000-0000-7000-8000-000000000022","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000023","clientId":null,"content":[]}}}
+{"case":"0.141.0-model-too-new-a","t":6105,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000021","turnId":"00000000-0000-7000-8000-000000000022","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000023","clientId":null,"content":[]}}}
+{"case":"0.141.0-model-too-new-a","t":7424,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000021","status":{"type":"systemError"}}}
+{"case":"0.141.0-model-too-new-a","t":7424,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000021","turnId":"00000000-0000-7000-8000-000000000022","willRetry":false,"error":{"message":"{\"type\":\"error\",\"status\":400,\"error\":{\"type\":\"invalid_request_error\",\"message\":\"The 'gpt-6-astra' model requires a newer version of Codex. Please upgrade to the latest app or CLI and try again.\"}}","codexErrorInfo":"other"}}}
+{"case":"0.141.0-model-too-new-a","t":7424,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000021","turn":{"id":"00000000-0000-7000-8000-000000000022","status":"failed","error":{"message":"{\"type\":\"error\",\"status\":400,\"error\":{\"type\":\"invalid_request_error\",\"message\":\"The 'gpt-6-astra' model requires a newer version of Codex. Please upgrade to the latest app or CLI and try again.\"}}","codexErrorInfo":"other"},"durationMs":6195}}}
+{"case":"0.141.0-model-too-new-b","t":387,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000024","status":{"type":"active"}}}
+{"case":"0.141.0-model-too-new-b","t":387,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000024","turn":{"id":"00000000-0000-7000-8000-000000000025","status":"inProgress"}}}
+{"case":"0.141.0-model-too-new-b","t":1162,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000024","turnId":"00000000-0000-7000-8000-000000000025","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000026","clientId":null,"content":[]}}}
+{"case":"0.141.0-model-too-new-b","t":1162,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000024","turnId":"00000000-0000-7000-8000-000000000025","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000026","clientId":null,"content":[]}}}
+{"case":"0.141.0-model-too-new-b","t":1993,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000024","status":{"type":"systemError"}}}
+{"case":"0.141.0-model-too-new-b","t":1993,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000024","turnId":"00000000-0000-7000-8000-000000000025","willRetry":false,"error":{"message":"{\"type\":\"error\",\"status\":400,\"error\":{\"type\":\"invalid_request_error\",\"message\":\"The 'gpt-6-astra' model requires a newer version of Codex. Please upgrade to the latest app or CLI and try again.\"}}","codexErrorInfo":"other"}}}
+{"case":"0.141.0-model-too-new-b","t":1993,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000024","turn":{"id":"00000000-0000-7000-8000-000000000025","status":"failed","error":{"message":"{\"type\":\"error\",\"status\":400,\"error\":{\"type\":\"invalid_request_error\",\"message\":\"The 'gpt-6-astra' model requires a newer version of Codex. Please upgrade to the latest app or CLI and try again.\"}}","codexErrorInfo":"other"},"durationMs":1633}}}
+{"case":"0.141.0-overloaded-503","t":407,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000027","status":{"type":"active"}}}
+{"case":"0.141.0-overloaded-503","t":407,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000027","turn":{"id":"00000000-0000-7000-8000-000000000028","status":"inProgress"}}}
+{"case":"0.141.0-overloaded-503","t":574,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000027","turnId":"00000000-0000-7000-8000-000000000028","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000029","clientId":null,"content":[]}}}
+{"case":"0.141.0-overloaded-503","t":574,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000027","turnId":"00000000-0000-7000-8000-000000000028","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000029","clientId":null,"content":[]}}}
+{"case":"0.141.0-overloaded-503","t":1296,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000027","status":{"type":"systemError"}}}
+{"case":"0.141.0-overloaded-503","t":1296,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000027","turnId":"00000000-0000-7000-8000-000000000028","willRetry":false,"error":{"message":"Selected model is at capacity. Please try a different model.","codexErrorInfo":"serverOverloaded"}}}
+{"case":"0.141.0-overloaded-503","t":1296,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000027","turn":{"id":"00000000-0000-7000-8000-000000000028","status":"failed","error":{"message":"Selected model is at capacity. Please try a different model.","codexErrorInfo":"serverOverloaded"},"durationMs":921}}}
+{"case":"0.141.0-overloaded-sse","t":510,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000030","status":{"type":"active"}}}
+{"case":"0.141.0-overloaded-sse","t":510,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000030","turn":{"id":"00000000-0000-7000-8000-000000000031","status":"inProgress"}}}
+{"case":"0.141.0-overloaded-sse","t":611,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000030","turnId":"00000000-0000-7000-8000-000000000031","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000032","clientId":null,"content":[]}}}
+{"case":"0.141.0-overloaded-sse","t":611,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000030","turnId":"00000000-0000-7000-8000-000000000031","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000032","clientId":null,"content":[]}}}
+{"case":"0.141.0-overloaded-sse","t":695,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000030","status":{"type":"systemError"}}}
+{"case":"0.141.0-overloaded-sse","t":695,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000030","turnId":"00000000-0000-7000-8000-000000000031","willRetry":false,"error":{"message":"Selected model is at capacity. Please try a different model.","codexErrorInfo":"serverOverloaded"}}}
+{"case":"0.141.0-overloaded-sse","t":695,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000030","turn":{"id":"00000000-0000-7000-8000-000000000031","status":"failed","error":{"message":"Selected model is at capacity. Please try a different model.","codexErrorInfo":"serverOverloaded"},"durationMs":213}}}
+{"case":"0.141.0-stream-drop","t":510,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000033","status":{"type":"active"}}}
+{"case":"0.141.0-stream-drop","t":510,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000033","turn":{"id":"00000000-0000-7000-8000-000000000034","status":"inProgress"}}}
+{"case":"0.141.0-stream-drop","t":621,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000033","turnId":"00000000-0000-7000-8000-000000000034","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000035","clientId":null,"content":[]}}}
+{"case":"0.141.0-stream-drop","t":621,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000033","turnId":"00000000-0000-7000-8000-000000000034","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000035","clientId":null,"content":[]}}}
+{"case":"0.141.0-stream-drop","t":740,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000033","turnId":"00000000-0000-7000-8000-000000000034","willRetry":true,"error":{"message":"Reconnecting... 1/2","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"stream disconnected before completion: stream closed before response.completed"}}}
+{"case":"0.141.0-stream-drop","t":942,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000033","turnId":"00000000-0000-7000-8000-000000000034","willRetry":true,"error":{"message":"Reconnecting... 2/2","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"stream disconnected before completion: stream closed before response.completed"}}}
+{"case":"0.141.0-stream-drop","t":1320,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000033","status":{"type":"systemError"}}}
+{"case":"0.141.0-stream-drop","t":1320,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000033","turnId":"00000000-0000-7000-8000-000000000034","willRetry":false,"error":{"message":"stream disconnected before completion: stream closed before response.completed","codexErrorInfo":"other"}}}
+{"case":"0.141.0-stream-drop","t":1320,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000033","turn":{"id":"00000000-0000-7000-8000-000000000034","status":"failed","error":{"message":"stream disconnected before completion: stream closed before response.completed","codexErrorInfo":"other"},"durationMs":838}}}
+{"case":"0.158.0-bad-model","t":1232,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000036","status":{"type":"active"}}}
+{"case":"0.158.0-bad-model","t":1232,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000036","turn":{"id":"00000000-0000-7000-8000-000000000037","status":"inProgress"}}}
+{"case":"0.158.0-bad-model","t":7177,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000036","turnId":"00000000-0000-7000-8000-000000000037","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000038","clientId":null,"content":[]}}}
+{"case":"0.158.0-bad-model","t":7215,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000036","turnId":"00000000-0000-7000-8000-000000000037","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000038","clientId":null,"content":[]}}}
+{"case":"0.158.0-bad-model","t":8236,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000036","status":{"type":"systemError"}}}
+{"case":"0.158.0-bad-model","t":8236,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000036","turnId":"00000000-0000-7000-8000-000000000037","willRetry":false,"error":{"message":"{\"type\":\"error\",\"status\":400,\"error\":{\"type\":\"invalid_request_error\",\"message\":\"The 'gpt-qa-nonexistent' model is not supported when using Codex with a ChatGPT account.\"}}","codexErrorInfo":"other"}}}
+{"case":"0.158.0-bad-model","t":8257,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000036","turn":{"id":"00000000-0000-7000-8000-000000000037","status":"failed","error":{"message":"{\"type\":\"error\",\"status\":400,\"error\":{\"type\":\"invalid_request_error\",\"message\":\"The 'gpt-qa-nonexistent' model is not supported when using Codex with a ChatGPT account.\"}}","codexErrorInfo":"other"},"durationMs":7576}}}
+{"case":"0.158.0-bad-turn-cwd","t":4437,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000039","status":{"type":"active"}}}
+{"case":"0.158.0-bad-turn-cwd","t":4438,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000039","turn":{"id":"00000000-0000-7000-8000-000000000040","status":"inProgress"}}}
+{"case":"0.158.0-bad-turn-cwd","t":7840,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000039","turnId":"00000000-0000-7000-8000-000000000040","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000041","clientId":null,"content":[]}}}
+{"case":"0.158.0-bad-turn-cwd","t":7851,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000039","turnId":"00000000-0000-7000-8000-000000000040","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000041","clientId":null,"content":[]}}}
+{"case":"0.158.0-bad-turn-cwd","t":9220,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000039","turnId":"00000000-0000-7000-8000-000000000040","item":{"type":"agentMessage","id":"msg_4","text":""}}}
+{"case":"0.158.0-bad-turn-cwd","t":9421,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000039","turnId":"00000000-0000-7000-8000-000000000040","item":{"type":"agentMessage","id":"msg_4","text":"pong"}}}
+{"case":"0.158.0-bad-turn-cwd","t":9566,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000039","status":{"type":"idle"}}}
+{"case":"0.158.0-bad-turn-cwd","t":9566,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000039","turn":{"id":"00000000-0000-7000-8000-000000000040","status":"completed","durationMs":5172}}}
+{"case":"0.158.0-compact-overloaded","t":943,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000042","status":{"type":"active"}}}
+{"case":"0.158.0-compact-overloaded","t":944,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000042","turn":{"id":"00000000-0000-7000-8000-000000000043","status":"inProgress"}}}
+{"case":"0.158.0-compact-overloaded","t":5760,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000042","turnId":"00000000-0000-7000-8000-000000000043","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000044","clientId":null,"content":[]}}}
+{"case":"0.158.0-compact-overloaded","t":5765,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000042","turnId":"00000000-0000-7000-8000-000000000043","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000044","clientId":null,"content":[]}}}
+{"case":"0.158.0-compact-overloaded","t":5770,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000042","turnId":"00000000-0000-7000-8000-000000000043","item":{"type":"agentMessage","id":"msg_ok","text":"pong"}}}
+{"case":"0.158.0-compact-overloaded","t":5771,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000042","turnId":"00000000-0000-7000-8000-000000000043","item":{"type":"agentMessage","id":"msg_ok","text":"pong"}}}
+{"case":"0.158.0-compact-overloaded","t":5795,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000042","status":{"type":"idle"}}}
+{"case":"0.158.0-compact-overloaded","t":5795,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000042","turn":{"id":"00000000-0000-7000-8000-000000000043","status":"completed","durationMs":4899}}}
+{"case":"0.158.0-compact-overloaded","t":5820,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000042","status":{"type":"active"}}}
+{"case":"0.158.0-compact-overloaded","t":5820,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000042","turn":{"id":"00000000-0000-7000-8000-000000000045","status":"inProgress"}}}
+{"case":"0.158.0-compact-overloaded","t":5821,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000042","turnId":"00000000-0000-7000-8000-000000000045","item":{"type":"contextCompaction","id":"00000000-0000-7000-8000-000000000046"}}}
+{"case":"0.158.0-compact-overloaded","t":6421,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000042","turnId":"00000000-0000-7000-8000-000000000045","willRetry":true,"error":{"message":"Reconnecting... 1/2","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"Selected model is at capacity. Please try a different model."}}}
+{"case":"0.158.0-compact-overloaded","t":7232,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000042","turnId":"00000000-0000-7000-8000-000000000045","willRetry":true,"error":{"message":"Reconnecting... 2/2","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"Selected model is at capacity. Please try a different model."}}}
+{"case":"0.158.0-compact-overloaded","t":8204,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000042","status":{"type":"systemError"}}}
+{"case":"0.158.0-compact-overloaded","t":8204,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000042","turnId":"00000000-0000-7000-8000-000000000045","willRetry":false,"error":{"message":"Selected model is at capacity. Please try a different model.","codexErrorInfo":"serverOverloaded"}}}
+{"case":"0.158.0-compact-overloaded","t":8207,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000042","turn":{"id":"00000000-0000-7000-8000-000000000045","status":"failed","error":{"message":"Selected model is at capacity. Please try a different model.","codexErrorInfo":"serverOverloaded"},"durationMs":2388}}}
+{"case":"0.158.0-conn-refused","t":1343,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000047","status":{"type":"active"}}}
+{"case":"0.158.0-conn-refused","t":1343,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000047","turn":{"id":"00000000-0000-7000-8000-000000000048","status":"inProgress"}}}
+{"case":"0.158.0-conn-refused","t":2002,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000047","turnId":"00000000-0000-7000-8000-000000000048","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000049","clientId":null,"content":[]}}}
+{"case":"0.158.0-conn-refused","t":2013,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000047","turnId":"00000000-0000-7000-8000-000000000048","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000049","clientId":null,"content":[]}}}
+{"case":"0.158.0-conn-refused","t":2616,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000047","turnId":"00000000-0000-7000-8000-000000000048","willRetry":true,"error":{"message":"Reconnecting... waiting for network","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"Connection failed: error sending request"}}}
+{"case":"0.158.0-conn-refused","t":8185,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000047","turnId":"00000000-0000-7000-8000-000000000048","willRetry":true,"error":{"message":"Reconnecting... waiting for network","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"Connection failed: error sending request"}}}
+{"case":"0.158.0-conn-refused","t":18778,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000047","turnId":"00000000-0000-7000-8000-000000000048","willRetry":true,"error":{"message":"Reconnecting... waiting for network","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"Connection failed: error sending request"}}}
+{"case":"0.158.0-conn-refused","t":39406,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000047","turnId":"00000000-0000-7000-8000-000000000048","willRetry":true,"error":{"message":"Reconnecting... waiting for network","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"Connection failed: error sending request"}}}
+{"case":"0.158.0-conn-refused","t":79975,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000047","turnId":"00000000-0000-7000-8000-000000000048","willRetry":true,"error":{"message":"Reconnecting... waiting for network","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"Connection failed: error sending request"}}}
+{"case":"0.158.0-conn-refused","t":140587,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000047","turnId":"00000000-0000-7000-8000-000000000048","willRetry":true,"error":{"message":"Reconnecting... waiting for network","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"Connection failed: error sending request"}}}
+{"case":"0.158.0-conn-refused","t":201225,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000047","turnId":"00000000-0000-7000-8000-000000000048","willRetry":true,"error":{"message":"Reconnecting... waiting for network","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"Connection failed: error sending request"}}}
+{"case":"0.158.0-control","t":3620,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000050","status":{"type":"active"}}}
+{"case":"0.158.0-control","t":3621,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000050","turn":{"id":"00000000-0000-7000-8000-000000000051","status":"inProgress"}}}
+{"case":"0.158.0-control","t":5019,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000050","turnId":"00000000-0000-7000-8000-000000000051","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000052","clientId":null,"content":[]}}}
+{"case":"0.158.0-control","t":5254,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000050","turnId":"00000000-0000-7000-8000-000000000051","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000052","clientId":null,"content":[]}}}
+{"case":"0.158.0-control","t":7276,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000050","turnId":"00000000-0000-7000-8000-000000000051","item":{"type":"agentMessage","id":"msg_5","text":""}}}
+{"case":"0.158.0-control","t":7480,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000050","turnId":"00000000-0000-7000-8000-000000000051","item":{"type":"agentMessage","id":"msg_5","text":"pong"}}}
+{"case":"0.158.0-control","t":7659,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000050","status":{"type":"idle"}}}
+{"case":"0.158.0-control","t":7659,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000050","turn":{"id":"00000000-0000-7000-8000-000000000051","status":"completed","durationMs":4520}}}
+{"case":"0.158.0-interrupt","t":929,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000053","status":{"type":"active"}}}
+{"case":"0.158.0-interrupt","t":929,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000053","turn":{"id":"00000000-0000-7000-8000-000000000054","status":"inProgress"}}}
+{"case":"0.158.0-interrupt","t":2320,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000053","turnId":"00000000-0000-7000-8000-000000000054","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000055","clientId":null,"content":[]}}}
+{"case":"0.158.0-interrupt","t":2325,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000053","turnId":"00000000-0000-7000-8000-000000000054","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000055","clientId":null,"content":[]}}}
+{"case":"0.158.0-interrupt","t":4063,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000053","turnId":"00000000-0000-7000-8000-000000000054","item":{"type":"agentMessage","id":"msg_6","text":""}}}
+{"case":"0.158.0-interrupt","t":5582,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000053","status":{"type":"idle"}}}
+{"case":"0.158.0-interrupt","t":5582,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000053","turn":{"id":"00000000-0000-7000-8000-000000000054","status":"interrupted","durationMs":4711}}}
+{"case":"0.158.0-overloaded-503","t":455,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000056","status":{"type":"active"}}}
+{"case":"0.158.0-overloaded-503","t":455,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000056","turn":{"id":"00000000-0000-7000-8000-000000000057","status":"inProgress"}}}
+{"case":"0.158.0-overloaded-503","t":1114,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000056","turnId":"00000000-0000-7000-8000-000000000057","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000058","clientId":null,"content":[]}}}
+{"case":"0.158.0-overloaded-503","t":1131,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000056","turnId":"00000000-0000-7000-8000-000000000057","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000058","clientId":null,"content":[]}}}
+{"case":"0.158.0-overloaded-503","t":1722,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000056","status":{"type":"systemError"}}}
+{"case":"0.158.0-overloaded-503","t":1722,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000056","turnId":"00000000-0000-7000-8000-000000000057","willRetry":false,"error":{"message":"Selected model is at capacity. Please try a different model.","codexErrorInfo":"serverOverloaded"}}}
+{"case":"0.158.0-overloaded-503","t":1753,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000056","turn":{"id":"00000000-0000-7000-8000-000000000057","status":"failed","error":{"message":"Selected model is at capacity. Please try a different model.","codexErrorInfo":"serverOverloaded"},"durationMs":1302}}}
+{"case":"0.158.0-overloaded-sse","t":944,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000059","status":{"type":"active"}}}
+{"case":"0.158.0-overloaded-sse","t":944,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000059","turn":{"id":"00000000-0000-7000-8000-000000000060","status":"inProgress"}}}
+{"case":"0.158.0-overloaded-sse","t":1196,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000059","turnId":"00000000-0000-7000-8000-000000000060","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000061","clientId":null,"content":[]}}}
+{"case":"0.158.0-overloaded-sse","t":1199,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000059","turnId":"00000000-0000-7000-8000-000000000060","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000061","clientId":null,"content":[]}}}
+{"case":"0.158.0-overloaded-sse","t":1204,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000059","status":{"type":"systemError"}}}
+{"case":"0.158.0-overloaded-sse","t":1204,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000059","turnId":"00000000-0000-7000-8000-000000000060","willRetry":false,"error":{"message":"Selected model is at capacity. Please try a different model.","codexErrorInfo":"serverOverloaded"}}}
+{"case":"0.158.0-overloaded-sse","t":1206,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000059","turn":{"id":"00000000-0000-7000-8000-000000000060","status":"failed","error":{"message":"Selected model is at capacity. Please try a different model.","codexErrorInfo":"serverOverloaded"},"durationMs":481}}}
+{"case":"0.158.0-stream-drop","t":1136,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000062","status":{"type":"active"}}}
+{"case":"0.158.0-stream-drop","t":1136,"method":"turn/started","params":{"threadId":"00000000-0000-7000-8000-000000000062","turn":{"id":"00000000-0000-7000-8000-000000000063","status":"inProgress"}}}
+{"case":"0.158.0-stream-drop","t":1721,"method":"item/started","params":{"threadId":"00000000-0000-7000-8000-000000000062","turnId":"00000000-0000-7000-8000-000000000063","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000064","clientId":null,"content":[]}}}
+{"case":"0.158.0-stream-drop","t":1733,"method":"item/completed","params":{"threadId":"00000000-0000-7000-8000-000000000062","turnId":"00000000-0000-7000-8000-000000000063","item":{"type":"userMessage","id":"00000000-0000-7000-8000-000000000064","clientId":null,"content":[]}}}
+{"case":"0.158.0-stream-drop","t":1738,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000062","turnId":"00000000-0000-7000-8000-000000000063","willRetry":true,"error":{"message":"Reconnecting... 1/2","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"stream disconnected before completion: stream closed before response.completed"}}}
+{"case":"0.158.0-stream-drop","t":1959,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000062","turnId":"00000000-0000-7000-8000-000000000063","willRetry":true,"error":{"message":"Reconnecting... 2/2","codexErrorInfo":{"responseStreamDisconnected":{"httpStatusCode":null}},"additionalDetails":"stream disconnected before completion: stream closed before response.completed"}}}
+{"case":"0.158.0-stream-drop","t":2514,"method":"thread/status/changed","params":{"threadId":"00000000-0000-7000-8000-000000000062","status":{"type":"systemError"}}}
+{"case":"0.158.0-stream-drop","t":2514,"method":"error","params":{"threadId":"00000000-0000-7000-8000-000000000062","turnId":"00000000-0000-7000-8000-000000000063","willRetry":false,"error":{"message":"stream disconnected before completion: stream closed before response.completed","codexErrorInfo":"other"}}}
+{"case":"0.158.0-stream-drop","t":2546,"method":"turn/completed","params":{"threadId":"00000000-0000-7000-8000-000000000062","turn":{"id":"00000000-0000-7000-8000-000000000063","status":"failed","error":{"message":"stream disconnected before completion: stream closed before response.completed","codexErrorInfo":"other"},"durationMs":1761}}}
diff --git a/src/main/codex/codex-account-session-bridge.test.ts b/src/main/codex/codex-account-session-bridge.test.ts
index 7cebd37c1f44..3befa0134731 100644
--- a/src/main/codex/codex-account-session-bridge.test.ts
+++ b/src/main/codex/codex-account-session-bridge.test.ts
@@ -1,14 +1,31 @@
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { mkdirSync, mkdtempSync, readFileSync, rmSync, statSync, writeFileSync } from 'node:fs'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  statSync,
+  writeFileSync
+} from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import {
   _internals,
   bridgeCodexSessionsIntoAccountHome,
-  startCodexAccountSessionBridgeInBackground
+  startCodexAccountSessionBridgeInBackground,
+  stopCodexAccountSessionBridges
 } from './codex-account-session-bridge'
+import { writeCodexStateDbBackfillStatus } from './codex-state-db-test-fixture'
+import SyncDatabase from '../sqlite/sync-database'
 
 let workspaceRoot: string
+const healIndexStub = vi.fn(async () => ({
+  outcome: 'up-to-date' as const,
+  healedThreads: 0,
+  missingThreads: 0,
+  failedThreads: 0
+}))
 
 function writeRollout(homePath: string, relativePath: string, contents: string): string {
   const filePath = join(homePath, 'sessions', relativePath)
@@ -21,12 +38,25 @@ function rolloutPath(homePath: string, relativePath: string): string {
   return join(homePath, 'sessions', relativePath)
 }
 
-const ROLLOUT_A = join('2026', '07', '20', 'rollout-2026-07-20T10-00-00-aaaa.jsonl')
-const ROLLOUT_B = join('2026', '07', '21', 'rollout-2026-07-21T10-00-00-bbbb.jsonl')
+const THREAD_A = '019a0000-0000-7000-8000-00000000000a'
+const THREAD_B = '019a0000-0000-7000-8000-00000000000b'
+const ROLLOUT_A = join(
+  '2026',
+  '07',
+  '20',
+  'rollout-2026-07-20T10-00-00-019a0000-0000-7000-8000-00000000000a.jsonl'
+)
+const ROLLOUT_B = join(
+  '2026',
+  '07',
+  '21',
+  'rollout-2026-07-21T10-00-00-019a0000-0000-7000-8000-00000000000b.jsonl'
+)
 
 beforeEach(() => {
   workspaceRoot = mkdtempSync(join(tmpdir(), 'codex-account-session-bridge-'))
   _internals.resetBackgroundBridgeTasks()
+  healIndexStub.mockClear()
 })
 
 afterEach(() => {
@@ -47,7 +77,14 @@ describe('bridgeCodexSessionsIntoAccountHome', () => {
       options: { batchSize: 1, yieldMs: 0 }
     })
 
-    expect(summary).toEqual({ scannedFiles: 2, linkedFiles: 2 })
+    expect(summary).toEqual({
+      scannedFiles: 2,
+      linkedFiles: 2,
+      bridgedThreads: new Map([
+        [THREAD_A, '2026-07-20T10-00-00'],
+        [THREAD_B, '2026-07-21T10-00-00']
+      ])
+    })
     expect(readFileSync(rolloutPath(targetHome, ROLLOUT_A), 'utf-8')).toBe('system session\n')
     expect(readFileSync(rolloutPath(targetHome, ROLLOUT_B), 'utf-8')).toBe('account a session\n')
   })
@@ -97,7 +134,11 @@ describe('bridgeCodexSessionsIntoAccountHome', () => {
       sourceCodexHomePaths: [systemHome]
     })
 
-    expect(second).toEqual({ scannedFiles: 1, linkedFiles: 0 })
+    expect(second).toEqual({
+      scannedFiles: 1,
+      linkedFiles: 0,
+      bridgedThreads: new Map([[THREAD_A, '2026-07-20T10-00-00']])
+    })
   })
 
   it('never links a home into itself or scans a duplicate source twice', async () => {
@@ -109,7 +150,27 @@ describe('bridgeCodexSessionsIntoAccountHome', () => {
       sourceCodexHomePaths: [targetHome, targetHome]
     })
 
-    expect(summary).toEqual({ scannedFiles: 0, linkedFiles: 0 })
+    expect(summary).toEqual({ scannedFiles: 0, linkedFiles: 0, bridgedThreads: new Map() })
+  })
+
+  it('does not hand a rollout it failed to link to the index heal', async () => {
+    const systemHome = join(workspaceRoot, 'system')
+    const targetHome = join(workspaceRoot, 'account')
+    writeRollout(systemHome, ROLLOUT_A, 'session\n')
+    writeRollout(systemHome, ROLLOUT_B, 'session\n')
+    // A file where the target's day directory belongs makes that one link fail.
+    mkdirSync(join(targetHome, 'sessions', '2026', '07'), { recursive: true })
+    writeFileSync(join(targetHome, 'sessions', '2026', '07', '20'), 'not a directory')
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    const summary = await bridgeCodexSessionsIntoAccountHome({
+      targetCodexHomePath: targetHome,
+      sourceCodexHomePaths: [systemHome]
+    })
+
+    warn.mockRestore()
+    expect(summary.linkedFiles).toBe(1)
+    expect(summary.bridgedThreads).toEqual(new Map([[THREAD_B, '2026-07-21T10-00-00']]))
   })
 
   it('skips a source home that has no sessions tree', async () => {
@@ -119,24 +180,35 @@ describe('bridgeCodexSessionsIntoAccountHome', () => {
       sourceCodexHomePaths: [join(workspaceRoot, 'missing')]
     })
 
-    expect(summary).toEqual({ scannedFiles: 0, linkedFiles: 0 })
+    expect(summary).toEqual({ scannedFiles: 0, linkedFiles: 0, bridgedThreads: new Map() })
   })
 })
 
+type BridgeDependencies = NonNullable<
+  Parameters<typeof startCodexAccountSessionBridgeInBackground>[1]
+>
+
+// Why: the real steps spawn `codex app-server`; their behavior is covered separately.
+function startBridge(
+  targetCodexHomePath: string,
+  sourceCodexHomePaths: string[],
+  dependencies: BridgeDependencies = {}
+): Promise<void> {
+  return startCodexAccountSessionBridgeInBackground(
+    { targetCodexHomePath, sourceCodexHomePaths },
+    { createStateDb: async () => false, healIndex: healIndexStub, ...dependencies }
+  )
+}
+
 describe('startCodexAccountSessionBridgeInBackground', () => {
   it('shares one in-flight task per target home', () => {
     const systemHome = join(workspaceRoot, 'system')
     const targetHome = join(workspaceRoot, 'account')
     writeRollout(systemHome, ROLLOUT_A, 'session\n')
+    writeCodexStateDbBackfillStatus(targetHome, 'complete')
 
-    const first = startCodexAccountSessionBridgeInBackground({
-      targetCodexHomePath: targetHome,
-      sourceCodexHomePaths: [systemHome]
-    })
-    const second = startCodexAccountSessionBridgeInBackground({
-      targetCodexHomePath: targetHome,
-      sourceCodexHomePaths: [systemHome]
-    })
+    const first = startBridge(targetHome, [systemHome])
+    const second = startBridge(targetHome, [systemHome])
 
     expect(second).toBe(first)
     return first
@@ -147,19 +219,203 @@ describe('startCodexAccountSessionBridgeInBackground', () => {
     const firstTarget = join(workspaceRoot, 'account-a')
     const secondTarget = join(workspaceRoot, 'account-b')
     writeRollout(systemHome, ROLLOUT_A, 'session\n')
+    writeCodexStateDbBackfillStatus(firstTarget, 'complete')
+    writeCodexStateDbBackfillStatus(secondTarget, 'complete')
 
     await Promise.all([
-      startCodexAccountSessionBridgeInBackground({
-        targetCodexHomePath: firstTarget,
-        sourceCodexHomePaths: [systemHome]
-      }),
-      startCodexAccountSessionBridgeInBackground({
-        targetCodexHomePath: secondTarget,
-        sourceCodexHomePaths: [systemHome]
-      })
+      startBridge(firstTarget, [systemHome]),
+      startBridge(secondTarget, [systemHome])
     ])
 
     expect(readFileSync(rolloutPath(firstTarget, ROLLOUT_A), 'utf-8')).toBe('session\n')
     expect(readFileSync(rolloutPath(secondTarget, ROLLOUT_A), 'utf-8')).toBe('session\n')
   })
+
+  // #20669: rollouts present when Codex first creates its state DB force a
+  // blocking backfill that times out the first TUI launch.
+  it('lets Codex index a new home before linking history into it', async () => {
+    const systemHome = join(workspaceRoot, 'system')
+    const targetHome = join(workspaceRoot, 'account')
+    writeRollout(systemHome, ROLLOUT_A, 'session\n')
+    const createStateDb = vi.fn(async (home: string) => {
+      expect(existsSync(rolloutPath(home, ROLLOUT_A))).toBe(false)
+      writeCodexStateDbBackfillStatus(home, 'complete')
+      return true
+    })
+
+    await startBridge(targetHome, [systemHome], { createStateDb })
+
+    expect(createStateDb).toHaveBeenCalledWith(targetHome)
+    expect(readFileSync(rolloutPath(targetHome, ROLLOUT_A), 'utf-8')).toBe('session\n')
+  })
+
+  // Why: an older Codex keeps no state DB, and `sqlite_home` keeps it outside
+  // the home; either way every launch must keep linking new history.
+  it('keeps linking new history on later launches when no state DB lives in the home', async () => {
+    const systemHome = join(workspaceRoot, 'system')
+    const targetHome = join(workspaceRoot, 'account')
+    writeRollout(systemHome, ROLLOUT_A, 'first\n')
+    const createStateDb = vi.fn(async () => true)
+
+    await startBridge(targetHome, [systemHome], { createStateDb })
+    writeRollout(systemHome, ROLLOUT_B, 'second\n')
+    await startBridge(targetHome, [systemHome], { createStateDb })
+
+    expect(readFileSync(rolloutPath(targetHome, ROLLOUT_A), 'utf-8')).toBe('first\n')
+    expect(readFileSync(rolloutPath(targetHome, ROLLOUT_B), 'utf-8')).toBe('second\n')
+    // Only the empty home needed Codex to run first.
+    expect(createStateDb).toHaveBeenCalledTimes(1)
+  })
+
+  it('does not start Codex on an empty home when no source has history', async () => {
+    const createStateDb = vi.fn(async () => true)
+
+    await startBridge(join(workspaceRoot, 'account'), [join(workspaceRoot, 'system')], {
+      createStateDb
+    })
+
+    expect(createStateDb).not.toHaveBeenCalled()
+  })
+
+  it('does not link history when Codex could not create the state DB', async () => {
+    const systemHome = join(workspaceRoot, 'system')
+    const targetHome = join(workspaceRoot, 'account')
+    writeRollout(systemHome, ROLLOUT_A, 'session\n')
+
+    await startBridge(targetHome, [systemHome], { createStateDb: async () => false })
+
+    expect(existsSync(rolloutPath(targetHome, ROLLOUT_A))).toBe(false)
+    expect(healIndexStub).not.toHaveBeenCalled()
+  })
+
+  it('bridges compressed-only history into a new home and indexes it', async () => {
+    const systemHome = join(workspaceRoot, 'system')
+    const targetHome = join(workspaceRoot, 'account')
+    const compressed = `${ROLLOUT_A}.zst`
+    writeRollout(systemHome, compressed, 'compressed\n')
+    const createStateDb = vi.fn(async (home: string) => {
+      writeCodexStateDbBackfillStatus(home, 'complete')
+      return true
+    })
+
+    await startBridge(targetHome, [systemHome], { createStateDb })
+
+    expect(readFileSync(rolloutPath(targetHome, compressed), 'utf-8')).toBe('compressed\n')
+    expect(healIndexStub).toHaveBeenCalledWith(
+      targetHome,
+      new Map([[THREAD_A, '2026-07-20T10-00-00']]),
+      {
+        shouldStop: expect.any(Function)
+      }
+    )
+  })
+
+  it('skips linking into a state DB that predates backfill tracking', async () => {
+    const systemHome = join(workspaceRoot, 'system')
+    const targetHome = join(workspaceRoot, 'account')
+    writeRollout(systemHome, ROLLOUT_A, 'session\n')
+    mkdirSync(targetHome, { recursive: true })
+    new SyncDatabase(join(targetHome, 'state_5.sqlite')).close()
+
+    await startBridge(targetHome, [systemHome])
+
+    expect(existsSync(rolloutPath(targetHome, ROLLOUT_A))).toBe(false)
+  })
+
+  it('skips linking while Codex is still indexing the home', async () => {
+    const systemHome = join(workspaceRoot, 'system')
+    const targetHome = join(workspaceRoot, 'account')
+    writeRollout(systemHome, ROLLOUT_A, 'session\n')
+    writeCodexStateDbBackfillStatus(targetHome, 'running')
+
+    await startBridge(targetHome, [systemHome])
+
+    expect(existsSync(rolloutPath(targetHome, ROLLOUT_A))).toBe(false)
+    expect(healIndexStub).not.toHaveBeenCalled()
+  })
+
+  it('reports why it skips a home whose state DB cannot be read', async () => {
+    const systemHome = join(workspaceRoot, 'system')
+    const targetHome = join(workspaceRoot, 'account')
+    writeRollout(systemHome, ROLLOUT_A, 'session\n')
+    mkdirSync(targetHome, { recursive: true })
+    writeFileSync(join(targetHome, 'state_5.sqlite'), 'not a sqlite database')
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    await startBridge(targetHome, [systemHome])
+
+    expect(existsSync(rolloutPath(targetHome, ROLLOUT_A))).toBe(false)
+    expect(warn).toHaveBeenCalledWith(
+      expect.stringContaining('Codex state DB is unreadable'),
+      expect.any(String)
+    )
+    warn.mockRestore()
+  })
+
+  it('indexes the bridged threads once linking finishes', async () => {
+    const systemHome = join(workspaceRoot, 'system')
+    const targetHome = join(workspaceRoot, 'account')
+    writeRollout(systemHome, ROLLOUT_A, 'session\n')
+    writeCodexStateDbBackfillStatus(targetHome, 'complete')
+
+    await startBridge(targetHome, [systemHome])
+
+    expect(healIndexStub).toHaveBeenCalledWith(
+      targetHome,
+      new Map([[THREAD_A, '2026-07-20T10-00-00']]),
+      {
+        shouldStop: expect.any(Function)
+      }
+    )
+  })
+
+  it('links nothing when the app quits while Codex creates the state DB', async () => {
+    const systemHome = join(workspaceRoot, 'system')
+    const targetHome = join(workspaceRoot, 'account')
+    writeRollout(systemHome, ROLLOUT_A, 'session\n')
+
+    await startBridge(targetHome, [systemHome], {
+      createStateDb: async (home) => {
+        writeCodexStateDbBackfillStatus(home, 'complete')
+        stopCodexAccountSessionBridges()
+        return true
+      }
+    })
+
+    expect(existsSync(rolloutPath(targetHome, ROLLOUT_A))).toBe(false)
+    expect(healIndexStub).not.toHaveBeenCalled()
+  })
+
+  it('does not start Codex on a new home after the app quits', async () => {
+    const systemHome = join(workspaceRoot, 'system')
+    writeRollout(systemHome, ROLLOUT_A, 'session\n')
+    const createStateDb = vi.fn(async () => true)
+    stopCodexAccountSessionBridges()
+
+    await startBridge(join(workspaceRoot, 'account'), [systemHome], { createStateDb })
+
+    expect(createStateDb).not.toHaveBeenCalled()
+  })
+
+  it('stops indexing and starts no new bridge once the app quits', async () => {
+    const systemHome = join(workspaceRoot, 'system')
+    const targetHome = join(workspaceRoot, 'account')
+    const laterTarget = join(workspaceRoot, 'later-account')
+    writeRollout(systemHome, ROLLOUT_A, 'session\n')
+    writeCodexStateDbBackfillStatus(targetHome, 'complete')
+    writeCodexStateDbBackfillStatus(laterTarget, 'complete')
+    let shouldStop: (() => boolean) | undefined
+
+    await startBridge(targetHome, [systemHome], {
+      healIndex: async (_home, _threads, options) => {
+        shouldStop = options?.shouldStop
+        stopCodexAccountSessionBridges()
+        return { outcome: 'stopped', healedThreads: 0, missingThreads: 0, failedThreads: 0 }
+      }
+    })
+    await startBridge(laterTarget, [systemHome])
+
+    expect(shouldStop?.()).toBe(true)
+    expect(existsSync(rolloutPath(laterTarget, ROLLOUT_A))).toBe(false)
+  })
 })
diff --git a/src/main/codex/codex-account-session-bridge.ts b/src/main/codex/codex-account-session-bridge.ts
index 72096103aa14..bb6110a8651e 100644
--- a/src/main/codex/codex-account-session-bridge.ts
+++ b/src/main/codex/codex-account-session-bridge.ts
@@ -3,7 +3,17 @@ import { dirname, join, relative } from 'node:path'
 import { normalizeRuntimePathForComparison } from '../../shared/cross-platform-path'
 import { listCodexSessionRolloutFilesIncrementally } from './codex-session-file-listing'
 import type { CodexSessionBridgeIncrementalOptions } from './codex-session-file-listing'
+import {
+  createCodexAccountStateDb,
+  healCodexAccountSessionIndex
+} from './codex-account-session-index-heal'
+import { parseCodexRolloutThreadId } from './codex-session-index-heal-state'
 import { linkCodexSessionFile } from './codex-session-link'
+import {
+  countCodexSessionFilesUpTo,
+  findNewestCodexStateDbPath,
+  readCodexStateDbBackfillStatus
+} from './codex-state-db'
 
 /**
  * Bridges Codex history between Orca-managed Codex homes.
@@ -19,24 +29,99 @@ import { linkCodexSessionFile } from './codex-session-link'
 export type CodexAccountSessionBridgeSummary = {
   scannedFiles: number
   linkedFiles: number
+  /** Thread id -> rollout timestamp for every rollout present in the target home via this bridge. */
+  bridgedThreads: Map<string, string>
 }
 
 const backgroundBridgeTasksByTargetHome = new Map<string, Promise<void>>()
+let stopping = false
+
+type BackgroundBridgeDependencies = {
+  createStateDb: typeof createCodexAccountStateDb
+  healIndex: typeof healCodexAccountSessionIndex
+}
+
+const defaultBackgroundBridgeDependencies: BackgroundBridgeDependencies = {
+  createStateDb: createCodexAccountStateDb,
+  healIndex: healCodexAccountSessionIndex
+}
+
+/**
+ * Why: Codex indexes every rollout present when it first creates a home's state
+ * DB, and the TUI gives up waiting after 30s. Linking history into a fresh home
+ * first turns its first launch into a minutes-long backfill (#20669), so an
+ * empty home gets its state DB before any history; the heal indexes it afterwards.
+ */
+async function isReadyForBridgedHistory(
+  targetCodexHomePath: string,
+  sourceCodexHomePaths: readonly string[],
+  dependencies: BackgroundBridgeDependencies
+): Promise<boolean> {
+  if (
+    !findNewestCodexStateDbPath(targetCodexHomePath) &&
+    !hasSessionRollouts(targetCodexHomePath)
+  ) {
+    if (
+      !sourceCodexHomePaths.some(hasSessionRollouts) ||
+      !(await dependencies.createStateDb(targetCodexHomePath))
+    ) {
+      return false
+    }
+  }
+  const status = readCodexStateDbBackfillStatus(targetCodexHomePath)
+  if (status.kind === 'unreadable') {
+    // Why: contention clears by the next launch; corruption would skip every launch, so surface it.
+    console.warn(
+      '[codex-account-session-bridge] Skipping history bridge; Codex state DB is unreadable:',
+      status.error
+    )
+    return false
+  }
+  // Why: no DB in a home that has history means Codex keeps it elsewhere
+  // (`sqlite_home`) or keeps none, so linking cannot stall a launch here.
+  // `not-tracked` is a pre-backfill schema that Codex migrates to `pending`.
+  return status.kind === 'complete' || status.kind === 'missing'
+}
+
+function hasSessionRollouts(codexHomePath: string): boolean {
+  return countCodexSessionFilesUpTo(join(codexHomePath, 'sessions'), 1) > 0
+}
 
 /**
  * Starts one background bridge per target home, sharing in-flight work.
  */
-export function startCodexAccountSessionBridgeInBackground(args: {
-  targetCodexHomePath: string
-  sourceCodexHomePaths: readonly string[]
-  options?: CodexSessionBridgeIncrementalOptions
-}): Promise<void> {
+export function startCodexAccountSessionBridgeInBackground(
+  args: {
+    targetCodexHomePath: string
+    sourceCodexHomePaths: readonly string[]
+    options?: CodexSessionBridgeIncrementalOptions
+  },
+  dependenciesOverride: Partial<BackgroundBridgeDependencies> = {}
+): Promise<void> {
+  if (stopping) {
+    return Promise.resolve()
+  }
   const key = normalizeRuntimePathForComparison(args.targetCodexHomePath)
   const inFlight = backgroundBridgeTasksByTargetHome.get(key)
   if (inFlight) {
     return inFlight
   }
-  const task = bridgeCodexSessionsIntoAccountHome(args)
+  const dependencies = { ...defaultBackgroundBridgeDependencies, ...dependenciesOverride }
+  const task = isReadyForBridgedHistory(
+    args.targetCodexHomePath,
+    args.sourceCodexHomePaths,
+    dependencies
+  )
+    .then(async (ready) => {
+      // Why: skip rather than feed a running backfill; the next launch retries.
+      if (!ready || stopping) {
+        return
+      }
+      const summary = await bridgeCodexSessionsIntoAccountHome(args)
+      await dependencies.healIndex(args.targetCodexHomePath, summary.bridgedThreads, {
+        shouldStop: () => stopping
+      })
+    })
     .catch((error: unknown) => {
       console.warn('[codex-account-session-bridge] Background session bridge failed:', error)
     })
@@ -50,6 +135,11 @@ export function startCodexAccountSessionBridgeInBackground(args: {
   return task
 }
 
+/** Stops background bridges at quit; links and index reads made so far are kept. */
+export function stopCodexAccountSessionBridges(): void {
+  stopping = true
+}
+
 /**
  * Mirrors every source home's rollouts into the target home's sessions tree.
  */
@@ -58,7 +148,11 @@ export async function bridgeCodexSessionsIntoAccountHome(args: {
   sourceCodexHomePaths: readonly string[]
   options?: CodexSessionBridgeIncrementalOptions
 }): Promise<CodexAccountSessionBridgeSummary> {
-  const summary: CodexAccountSessionBridgeSummary = { scannedFiles: 0, linkedFiles: 0 }
+  const summary: CodexAccountSessionBridgeSummary = {
+    scannedFiles: 0,
+    linkedFiles: 0,
+    bridgedThreads: new Map()
+  }
   const targetSessionsRoot = join(args.targetCodexHomePath, 'sessions')
   for (const sourceHomePath of dedupeSourceHomes(
     args.sourceCodexHomePaths,
@@ -73,9 +167,18 @@ export async function bridgeCodexSessionsIntoAccountHome(args: {
       args.options ?? {}
     )) {
       summary.scannedFiles += 1
-      if (bridgeRolloutIntoAccountHome(sourceSessionsRoot, targetSessionsRoot, sourceFilePath)) {
+      const result = bridgeRolloutIntoAccountHome(
+        sourceSessionsRoot,
+        targetSessionsRoot,
+        sourceFilePath
+      )
+      if (result === 'linked') {
         summary.linkedFiles += 1
       }
+      const rollout = parseCodexRolloutThreadId(sourceFilePath)
+      if (result !== 'failed' && rollout) {
+        summary.bridgedThreads.set(rollout.threadId, rollout.rolloutStamp)
+      }
     }
   }
   return summary
@@ -88,20 +191,20 @@ function bridgeRolloutIntoAccountHome(
   sourceSessionsRoot: string,
   targetSessionsRoot: string,
   sourceFilePath: string
-): boolean {
+): 'linked' | 'existing' | 'failed' {
   const targetFilePath = join(targetSessionsRoot, relative(sourceSessionsRoot, sourceFilePath))
   // Why: rollout names carry the session UUID, so an existing target path is the
   // same conversation already bridged (often the same inode) — never a conflict.
   if (existsSync(targetFilePath)) {
-    return false
+    return 'existing'
   }
   try {
     mkdirSync(dirname(targetFilePath), { recursive: true })
   } catch (error) {
     console.warn('[codex-account-session-bridge] Failed to create session directory:', error)
-    return false
+    return 'failed'
   }
-  return linkCodexSessionFile(sourceFilePath, targetFilePath)
+  return linkCodexSessionFile(sourceFilePath, targetFilePath) ? 'linked' : 'failed'
 }
 
 /**
@@ -127,5 +230,6 @@ function dedupeSourceHomes(
 export const _internals = {
   resetBackgroundBridgeTasks: (): void => {
     backgroundBridgeTasksByTargetHome.clear()
+    stopping = false
   }
 }
diff --git a/src/main/codex/codex-account-session-index-heal.test.ts b/src/main/codex/codex-account-session-index-heal.test.ts
new file mode 100644
index 000000000000..fbb5fae404ce
--- /dev/null
+++ b/src/main/codex/codex-account-session-index-heal.test.ts
@@ -0,0 +1,306 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import {
+  _internals,
+  createCodexAccountStateDb,
+  healCodexAccountSessionIndex
+} from './codex-account-session-index-heal'
+import {
+  CodexAppServerUnsupportedError,
+  type CodexAppServerInvocation,
+  type CodexAppServerRpc
+} from './codex-app-server-session'
+
+const HOME = '/codex-accounts/account-1/home'
+
+// Why: fails closed if a regression bypasses the fake session — never the real codex or ~/.codex.
+function buildInvocation(): CodexAppServerInvocation {
+  return {
+    command: '/nonexistent/orca-test-codex',
+    args: ['app-server'],
+    cliPath: null,
+    env: { CODEX_HOME: join(tmpdir(), 'orca-test-nonexistent-codex-home') },
+    timeoutMs: 1_000
+  }
+}
+
+/** Runs the heal body against a fake app-server that answers thread/read. */
+function fakeAppServer(onRead: (threadId: string) => void = () => {}) {
+  const readThreadIds: string[] = []
+  const runSession = vi.fn(
+    async (
+      _invocation: CodexAppServerInvocation,
+      body: (rpc: CodexAppServerRpc) => Promise<void>
+    ): Promise<void> => {
+      await body({
+        request: async (method, params) => {
+          expect(method).toBe('thread/read')
+          const threadId = String(params?.threadId)
+          readThreadIds.push(threadId)
+          onRead(threadId)
+          return {}
+        },
+        notify: () => {}
+      })
+    }
+  )
+  return { runSession, readThreadIds }
+}
+
+/** Bridged threads keyed by id, all from the same rollout timestamp. */
+function bridged(...threadIds: string[]): Map<string, string> {
+  return new Map(threadIds.map((threadId) => [threadId, '2026-07-20T10-00-00']))
+}
+
+beforeEach(() => {
+  _internals.resetFailedThreads()
+})
+
+describe('healCodexAccountSessionIndex', () => {
+  it('reads only bridged threads missing from the Codex index', async () => {
+    const { runSession, readThreadIds } = fakeAppServer()
+
+    const summary = await healCodexAccountSessionIndex(HOME, bridged('a', 'b', 'c'), {
+      readIndexedThreadIds: () => new Set(['b']),
+      buildInvocation,
+      runSession
+    })
+
+    expect(readThreadIds.sort()).toEqual(['a', 'c'])
+    expect(summary).toEqual({
+      outcome: 'completed',
+      healedThreads: 2,
+      missingThreads: 0,
+      failedThreads: 0
+    })
+  })
+
+  it('reads the most recent bridged rollouts first', async () => {
+    const { runSession, readThreadIds } = fakeAppServer()
+
+    await healCodexAccountSessionIndex(
+      HOME,
+      new Map([
+        ['middle', '2026-08-01T09-00-00'],
+        ['oldest', '2025-12-31T23-59-59'],
+        ['newest', '2026-09-28T01-46-16']
+      ]),
+      { readIndexedThreadIds: () => new Set(), buildInvocation, runSession, readConcurrency: 1 }
+    )
+
+    expect(readThreadIds).toEqual(['newest', 'middle', 'oldest'])
+  })
+
+  it('does not start Codex when every bridged thread is already indexed', async () => {
+    const { runSession } = fakeAppServer()
+
+    const summary = await healCodexAccountSessionIndex(HOME, bridged('a'), {
+      readIndexedThreadIds: () => new Set(['a']),
+      buildInvocation,
+      runSession
+    })
+
+    expect(summary.outcome).toBe('up-to-date')
+    expect(runSession).not.toHaveBeenCalled()
+  })
+
+  it('does not start Codex when its index cannot be read', async () => {
+    const { runSession } = fakeAppServer()
+
+    const summary = await healCodexAccountSessionIndex(HOME, bridged('a'), {
+      readIndexedThreadIds: () => null,
+      buildInvocation,
+      runSession
+    })
+
+    expect(summary.outcome).toBe('no-index')
+    expect(runSession).not.toHaveBeenCalled()
+  })
+
+  it('does not start Codex once the app is quitting', async () => {
+    const { runSession } = fakeAppServer()
+
+    const summary = await healCodexAccountSessionIndex(HOME, bridged('a'), {
+      readIndexedThreadIds: () => new Set(),
+      buildInvocation,
+      runSession,
+      shouldStop: () => true
+    })
+
+    expect(summary.outcome).toBe('stopped')
+    expect(runSession).not.toHaveBeenCalled()
+  })
+
+  it('stops retrying a thread Codex refuses to index until Orca restarts', async () => {
+    const { runSession, readThreadIds } = fakeAppServer((threadId) => {
+      if (threadId === 'broken') {
+        throw new Error('codex app-server thread/read failed: invalid rollout')
+      }
+    })
+    const dependencies = {
+      readIndexedThreadIds: () => new Set<string>(),
+      buildInvocation,
+      runSession
+    }
+
+    const first = await healCodexAccountSessionIndex(HOME, bridged('broken'), dependencies)
+    const second = await healCodexAccountSessionIndex(HOME, bridged('broken'), dependencies)
+
+    expect(first).toEqual({
+      outcome: 'completed',
+      healedThreads: 0,
+      missingThreads: 0,
+      failedThreads: 1
+    })
+    expect(second.outcome).toBe('up-to-date')
+    expect(readThreadIds).toEqual(['broken'])
+  })
+
+  it('remembers a refused thread only for the home that refused it', async () => {
+    const { runSession, readThreadIds } = fakeAppServer((threadId) => {
+      if (readThreadIds.length === 1) {
+        throw new Error(`codex app-server thread/read failed: invalid rollout ${threadId}`)
+      }
+    })
+    const dependencies = {
+      readIndexedThreadIds: () => new Set<string>(),
+      buildInvocation,
+      runSession
+    }
+
+    await healCodexAccountSessionIndex(HOME, bridged('shared'), dependencies)
+    const other = await healCodexAccountSessionIndex(
+      '/codex-accounts/account-2/home',
+      bridged('shared'),
+      dependencies
+    )
+
+    expect(other.healedThreads).toBe(1)
+    expect(readThreadIds).toEqual(['shared', 'shared'])
+  })
+
+  it('counts a rollout Codex cannot find as missing and does not reread it', async () => {
+    const { runSession, readThreadIds } = fakeAppServer(() => {
+      throw new Error('codex app-server thread/read failed: no rollout found for thread id gone')
+    })
+    const options = { readIndexedThreadIds: () => new Set<string>(), buildInvocation, runSession }
+
+    const first = await healCodexAccountSessionIndex(HOME, bridged('gone'), options)
+    const second = await healCodexAccountSessionIndex(HOME, bridged('gone'), options)
+
+    expect(first).toEqual({
+      outcome: 'completed',
+      healedThreads: 0,
+      missingThreads: 1,
+      failedThreads: 0
+    })
+    expect(second.outcome).toBe('up-to-date')
+    expect(readThreadIds).toEqual(['gone'])
+  })
+
+  it('retries a thread on the next pass when the app-server session fails', async () => {
+    const failing = vi.fn(async () => {
+      throw new Error('codex app-server exited before responding')
+    })
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const readIndexedThreadIds = (): Set<string> => new Set()
+
+    const first = await healCodexAccountSessionIndex(HOME, bridged('a'), {
+      readIndexedThreadIds,
+      buildInvocation,
+      runSession: failing
+    })
+    const { runSession, readThreadIds } = fakeAppServer()
+    const second = await healCodexAccountSessionIndex(HOME, bridged('a'), {
+      readIndexedThreadIds,
+      buildInvocation,
+      runSession
+    })
+
+    expect(first.outcome).toBe('aborted')
+    expect(second.outcome).toBe('completed')
+    expect(readThreadIds).toEqual(['a'])
+    warn.mockRestore()
+  })
+
+  it('reports a session that fails during quit as stopped, not unsupported', async () => {
+    let stopping = false
+    const summary = await healCodexAccountSessionIndex(HOME, bridged('a'), {
+      readIndexedThreadIds: () => new Set(),
+      buildInvocation,
+      runSession: async () => {
+        stopping = true
+        throw new CodexAppServerUnsupportedError('app-server killed during quit')
+      },
+      shouldStop: () => stopping
+    })
+
+    expect(summary.outcome).toBe('stopped')
+  })
+
+  it('aborts rather than writing off a thread while a live Codex holds the database', async () => {
+    const { runSession } = fakeAppServer(() => {
+      throw new Error('codex app-server thread/read failed: database is locked')
+    })
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    const summary = await healCodexAccountSessionIndex(HOME, bridged('a'), {
+      readIndexedThreadIds: () => new Set(),
+      buildInvocation,
+      runSession
+    })
+
+    expect(summary).toEqual({
+      outcome: 'aborted',
+      healedThreads: 0,
+      missingThreads: 0,
+      failedThreads: 0
+    })
+    warn.mockRestore()
+  })
+})
+
+describe('createCodexAccountStateDb', () => {
+  it('starts Codex on the home without sending any request', async () => {
+    const { runSession, readThreadIds } = fakeAppServer()
+    const invocations: string[] = []
+
+    const created = await createCodexAccountStateDb(HOME, {
+      buildInvocation: (home, timeoutMs) => {
+        invocations.push(home)
+        return { ...buildInvocation(), timeoutMs }
+      },
+      runSession
+    })
+
+    expect(created).toBe(true)
+    expect(invocations).toEqual([HOME])
+    expect(readThreadIds).toEqual([])
+  })
+
+  it('treats a Codex without app-server as having no state DB to stall', async () => {
+    const created = await createCodexAccountStateDb(HOME, {
+      buildInvocation,
+      runSession: async () => {
+        throw new CodexAppServerUnsupportedError('unknown subcommand app-server')
+      }
+    })
+
+    expect(created).toBe(true)
+  })
+
+  it('reports failure when Codex could not start', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    const created = await createCodexAccountStateDb(HOME, {
+      buildInvocation,
+      runSession: async () => {
+        throw new Error('spawn codex ENOENT')
+      }
+    })
+
+    expect(created).toBe(false)
+    warn.mockRestore()
+  })
+})
diff --git a/src/main/codex/codex-account-session-index-heal.ts b/src/main/codex/codex-account-session-index-heal.ts
new file mode 100644
index 000000000000..1af87e34407c
--- /dev/null
+++ b/src/main/codex/codex-account-session-index-heal.ts
@@ -0,0 +1,122 @@
+import { normalizeRuntimePathForComparison } from '../../shared/cross-platform-path'
+import {
+  isCodexAppServerUnsupportedError,
+  runCodexAppServerSession
+} from './codex-app-server-session'
+import {
+  buildNativeHealInvocation,
+  readCodexThreadsForIndexHeal,
+  type CodexSessionIndexHealOptions,
+  type CodexThreadReadPassOutcome
+} from './codex-session-index-heal'
+import { readIndexedCodexThreadIds } from './codex-state-db'
+
+// Why: Codex indexes a home's rollouts only once, when it first creates the
+// state DB, and the /resume picker's "All" view lists only indexed threads.
+// History bridged in afterwards needs `thread/read`, Codex's lazy-indexing
+// path, to become visible there (#20669).
+
+export type CodexAccountSessionIndexHealSummary = {
+  outcome: CodexThreadReadPassOutcome | 'up-to-date' | 'no-index'
+  healedThreads: number
+  missingThreads: number
+  failedThreads: number
+}
+
+export type CodexAccountSessionIndexHealOptions = CodexSessionIndexHealOptions & {
+  readIndexedThreadIds?: (codexHomePath: string) => Set<string> | null
+}
+
+// Why: app-server finishes state DB startup before it answers `initialize`,
+// which takes ~100ms on an empty home.
+const STATE_DB_CREATE_TIMEOUT_MS = 15_000
+
+// Why: a just-linked rollout Codex refuses or cannot find fails the same way on
+// every read; skip it until Orca restarts instead of respawning app-server each launch.
+const failedThreadIdsByHome = new Map<string, Set<string>>()
+
+/**
+ * Starts Codex once on an empty home so it creates and indexes its state DB
+ * before any history is bridged in. False when Codex could not start.
+ */
+export async function createCodexAccountStateDb(
+  codexHomePath: string,
+  options: Pick<CodexSessionIndexHealOptions, 'buildInvocation' | 'runSession'> = {}
+): Promise<boolean> {
+  const buildInvocation = options.buildInvocation ?? buildNativeHealInvocation
+  const runSession = options.runSession ?? runCodexAppServerSession
+  try {
+    await runSession(buildInvocation(codexHomePath, STATE_DB_CREATE_TIMEOUT_MS), async () => {})
+    return true
+  } catch (error) {
+    // Why: a Codex without app-server predates the state DB, so linking cannot stall it.
+    if (isCodexAppServerUnsupportedError(error)) {
+      return true
+    }
+    console.warn('[codex-account-session-index-heal] Failed to create Codex state DB:', error)
+    return false
+  }
+}
+
+/**
+ * Indexes the bridged threads Codex has not indexed yet, newest rollout first.
+ * Diffing against the state DB on every pass makes an interrupted heal resume
+ * on the next launch.
+ */
+export async function healCodexAccountSessionIndex(
+  codexHomePath: string,
+  bridgedThreads: ReadonlyMap<string, string>,
+  options: CodexAccountSessionIndexHealOptions = {}
+): Promise<CodexAccountSessionIndexHealSummary> {
+  const summary: CodexAccountSessionIndexHealSummary = {
+    outcome: 'up-to-date',
+    healedThreads: 0,
+    missingThreads: 0,
+    failedThreads: 0
+  }
+  if (bridgedThreads.size === 0) {
+    return summary
+  }
+  // Why: with no DB in the home, Codex keeps none (older CLI) or uses a
+  // `sqlite_home` shared by every Orca home, which already indexes these threads.
+  const indexed = (options.readIndexedThreadIds ?? readIndexedCodexThreadIds)(codexHomePath)
+  if (!indexed) {
+    return { ...summary, outcome: 'no-index' }
+  }
+  const homeKey = normalizeRuntimePathForComparison(codexHomePath)
+  const failed = failedThreadIdsByHome.get(homeKey) ?? new Set<string>()
+  failedThreadIdsByHome.set(homeKey, failed)
+  // Why: a large history takes minutes to index, and /resume hides unindexed
+  // threads once a directory has any indexed one, so recent work goes first.
+  const pending = [...bridgedThreads]
+    .filter(([threadId]) => !indexed.has(threadId) && !failed.has(threadId))
+    .sort(([, left], [, right]) => (left < right ? 1 : left > right ? -1 : 0))
+    .map(([threadId]) => ({ threadId }))
+  if (pending.length === 0) {
+    return summary
+  }
+  summary.outcome = await readCodexThreadsForIndexHeal(
+    codexHomePath,
+    pending,
+    ({ threadId }, outcome) => {
+      if (outcome === 'healed') {
+        summary.healedThreads += 1
+        return
+      }
+      failed.add(threadId)
+      if (outcome === 'missing') {
+        summary.missingThreads += 1
+      } else {
+        summary.failedThreads += 1
+      }
+    },
+    options
+  )
+  return summary
+}
+
+export const _internals = {
+  resetFailedThreads: (): void => {
+    failedThreadIdsByHome.clear()
+  }
+}
diff --git a/src/main/codex/codex-app-server-connection.test.ts b/src/main/codex/codex-app-server-connection.test.ts
index aa5a4474235a..a4ebd72cf014 100644
--- a/src/main/codex/codex-app-server-connection.test.ts
+++ b/src/main/codex/codex-app-server-connection.test.ts
@@ -2,6 +2,7 @@ import { EventEmitter } from 'node:events'
 import { realpathSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { PassThrough } from 'node:stream'
+import { providerDiagnosticOf } from '../../shared/agent-session-failure'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { spawnProcess } from '../../shared/child-process/run-process'
 import {
@@ -10,8 +11,12 @@ import {
   type CodexAppServerConnection,
   type CodexAppServerConnectionHandlers
 } from './codex-app-server-connection'
+import { PROVIDER_SUPERVISOR_MAX_STOP_MS } from './codex-app-server-posix-supervisor'
 import { isCodexAppServerUnsupportedError } from './codex-app-server-session'
 
+// close() waits out the supervisor's own stop before forcing the tree.
+const GRACEFUL_EXIT_MS = process.platform === 'win32' ? 1_500 : PROVIDER_SUPERVISOR_MAX_STOP_MS
+
 const originalCodexHome = process.env.CODEX_HOME
 
 afterEach(() => {
@@ -293,6 +298,9 @@ describe('openCodexAppServerConnection', () => {
 
     expect(isCodexAppServerRequestError(refusal)).toBe(true)
     expect((refusal as Error).message).toContain('bad params')
+    // Codex's own words, apart from Orca's prefix, for a person to read.
+    expect(providerDiagnosticOf(refusal)).toEqual({ text: 'bad params', audience: 'person' })
+    expect(providerDiagnosticOf(missing)).toBeUndefined()
     expect(isCodexAppServerUnsupportedError(missing)).toBe(true)
     expect(isCodexAppServerRequestError(missing)).toBe(false)
     await connection.close()
@@ -388,7 +396,7 @@ describe('openCodexAppServerConnection', () => {
       openCodexAppServerConnection({ command: 'codex', args: ['app-server'] }, {}, spawnImpl)
     )
 
-    await vi.advanceTimersByTimeAsync(5_000)
+    await vi.advanceTimersByTimeAsync(GRACEFUL_EXIT_MS + 3_500)
     const error = (await opening) as Error & { connection?: CodexAppServerConnection }
 
     expect(error.name).toBe('CodexAppServerHandshakeExitUnprovenError')
@@ -430,7 +438,7 @@ describe('openCodexAppServerConnection', () => {
     })
 
     const closing = connection.close()
-    await vi.advanceTimersByTimeAsync(2_000)
+    await vi.advanceTimersByTimeAsync(GRACEFUL_EXIT_MS + 500)
     await closing
 
     await vi.waitFor(() => expect(child.kill).toHaveBeenCalledWith('SIGKILL'))
@@ -464,7 +472,7 @@ describe('openCodexAppServerConnection', () => {
 
     const first = connection.close()
     const second = connection.close()
-    await vi.advanceTimersByTimeAsync(4_100)
+    await vi.advanceTimersByTimeAsync(GRACEFUL_EXIT_MS + 2_600)
 
     await expect(Promise.all([first, second])).resolves.toEqual([true, true])
     expect(child.kill.mock.calls.map(([signal]) => signal)).toEqual(['SIGSTOP', 'SIGKILL'])
@@ -481,7 +489,7 @@ describe('openCodexAppServerConnection', () => {
     )
 
     const first = connection.close()
-    await vi.advanceTimersByTimeAsync(5_000)
+    await vi.advanceTimersByTimeAsync(GRACEFUL_EXIT_MS + 3_500)
     await expect(first).resolves.toBe(false)
     child.emit('exit', 0, null)
 
@@ -575,6 +583,36 @@ describe('openCodexAppServerConnection', () => {
     await connection.close()
   })
 
+  it('delivers a notification beyond the daemon wire limit whole, never as an oversized frame', async () => {
+    const { child, spawnImpl } = stubChild()
+    answerInitialize(child)
+    const frames: string[] = []
+    const deltas: unknown[] = []
+    const connection = await openCodexAppServerConnection(
+      { command: 'codex', args: ['app-server'] },
+      {
+        onUnhandledFrame: (kind) => frames.push(kind),
+        onNotification: (method, params) => {
+          if (method === 'item/commandExecution/outputDelta') {
+            deltas.push(params)
+          }
+        }
+      },
+      spawnImpl
+    )
+
+    const params = { threadId: 'thread-1', itemId: 'exec-1', delta: '' }
+    params.delta = 'x'.repeat(16 * 1024 * 1024 + 1)
+    child.stdout.write(
+      `${JSON.stringify({ method: 'item/commandExecution/outputDelta', params })}\n`
+    )
+
+    await vi.waitFor(() => expect(deltas).toEqual([params]))
+    expect(frames).toEqual([])
+    expect(connection.closed).toBe(false)
+    await connection.close()
+  })
+
   it('keeps malformed and non-object JSON non-fatal and processes the next record', async () => {
     const { child, spawnImpl } = stubChild()
     answerInitialize(child)
diff --git a/src/main/codex/codex-app-server-connection.ts b/src/main/codex/codex-app-server-connection.ts
index c0ac7f07400a..5bed3b594d7d 100644
--- a/src/main/codex/codex-app-server-connection.ts
+++ b/src/main/codex/codex-app-server-connection.ts
@@ -1,11 +1,13 @@
 import { spawnProcess } from '../../shared/child-process/run-process'
 import { RetryableProcessExitProof } from '../../shared/child-process/retryable-process-exit-proof'
-import { createProviderSpawnSpec } from './codex-app-server-posix-supervisor'
+import {
+  createProviderSpawnSpec,
+  PROVIDER_SUPERVISOR_MAX_STOP_MS
+} from './codex-app-server-posix-supervisor'
 import { buildCodexAppServerExitError } from './codex-app-server-exit-error'
 import { initializeCodexAppServerConnection } from './codex-app-server-handshake'
 import { CodexAppServerHandshakeExitUnprovenError } from './codex-app-server-handshake-exit-proof'
 import { terminateCodexAppServerProcessTree } from './codex-app-server-process-teardown'
-import { CODEX_SPAWN_TOKEN_ENV } from './codex-structured-owner-identity'
 import { waitForProcessExitUntil } from './codex-process-exit-deadline'
 import {
   CodexAppServerTimeoutError,
@@ -44,7 +46,7 @@ export type CodexAppServerLaunch = {
 }
 
 const DEFAULT_REQUEST_TIMEOUT_MS = 30_000
-const GRACEFUL_EXIT_MS = 1_500
+export const GRACEFUL_EXIT_MS = 1_500
 const FORCED_EXIT_MS = 1_000
 const STDERR_TAIL_MAX_BYTES = 8192
 
@@ -64,12 +66,11 @@ export async function openCodexAppServerConnection(
   }
   const spawnSpec = createProviderSpawnSpec(launch, childEnv, process.platform)
   const child = spawnImpl(spawnSpec)
-  const spawnToken = launch.env?.[CODEX_SPAWN_TOKEN_ENV]
 
   function terminateProcessTree(): Promise<boolean> {
     // The supervisor and provider own separate POSIX groups so the supervisor can prove the
     // provider group empty before relaying its exit. Forced wrapper teardown uses descendant proof.
-    return terminateCodexAppServerProcessTree(child, spawnToken)
+    return terminateCodexAppServerProcessTree(child)
   }
 
   let stderrTail = ''
@@ -249,7 +250,11 @@ export async function openCodexAppServerConnection(
         // Already destroyed; the reap below still runs.
       }
       if (!exited) {
-        await waitForProcessExitUntil(exitPromise, GRACEFUL_EXIT_MS)
+        // The POSIX supervisor stops its own provider group; forcing it any sooner can orphan it.
+        await waitForProcessExitUntil(
+          exitPromise,
+          process.platform === 'win32' ? GRACEFUL_EXIT_MS : PROVIDER_SUPERVISOR_MAX_STOP_MS
+        )
         if (!exited) {
           const treeExited = await terminateProcessTree()
           if (!treeExited) {
diff --git a/src/main/codex/codex-app-server-exit-error.test.ts b/src/main/codex/codex-app-server-exit-error.test.ts
new file mode 100644
index 000000000000..63ec9a63743a
--- /dev/null
+++ b/src/main/codex/codex-app-server-exit-error.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, it } from 'vitest'
+import { providerDiagnosticOf } from '../../shared/agent-session-failure'
+import { buildCodexAppServerExitError } from './codex-app-server-exit-error'
+
+describe('buildCodexAppServerExitError', () => {
+  it("keeps the stderr tail apart from Orca's wording, as log text", () => {
+    const error = buildCodexAppServerExitError('  thread panicked at main.rs:4  ')
+    expect(error.message).toBe('codex app-server connection ended: thread panicked at main.rs:4')
+    expect(providerDiagnosticOf(error)).toEqual({
+      text: 'thread panicked at main.rs:4',
+      audience: 'log'
+    })
+  })
+
+  it('carries no diagnostic when a cause, not the stderr, explains the end', () => {
+    const error = buildCodexAppServerExitError('ignored', new Error('spawn codex ENOENT'))
+    expect(providerDiagnosticOf(error)).toBeUndefined()
+    expect(providerDiagnosticOf(buildCodexAppServerExitError(''))).toBeUndefined()
+  })
+})
diff --git a/src/main/codex/codex-app-server-exit-error.ts b/src/main/codex/codex-app-server-exit-error.ts
index 85d8bc7dd6e7..8812e6698a08 100644
--- a/src/main/codex/codex-app-server-exit-error.ts
+++ b/src/main/codex/codex-app-server-exit-error.ts
@@ -2,6 +2,7 @@
 // stderr tail is the only evidence: a CLI without the subcommand is a durable
 // capability fact, and anything else is this run's crash.
 
+import { providerDiagnostic, withProviderDiagnostic } from '../../shared/agent-session-failure'
 import { stderrIndicatesMissingAppServer } from './codex-app-server-capability-signal'
 import { CodexAppServerUnsupportedError } from './codex-app-server-session'
 
@@ -9,11 +10,17 @@ const EXIT_DETAIL_MAX_CHARS = 400
 
 export function buildCodexAppServerExitError(stderrTail: string, cause?: Error): Error {
   const tail = stderrTail.trim().slice(0, EXIT_DETAIL_MAX_CHARS)
+  // The tail is Codex's own stderr: a log, kept behind Details.
+  const diagnostic = providerDiagnostic(tail, 'log')
   if (stderrIndicatesMissingAppServer(stderrTail)) {
-    return new CodexAppServerUnsupportedError(
-      `codex CLI does not support the app-server subcommand: ${tail}`
+    return withProviderDiagnostic(
+      new CodexAppServerUnsupportedError(
+        `codex CLI does not support the app-server subcommand: ${tail}`
+      ),
+      diagnostic
     )
   }
   const detail = cause ? `: ${cause.message}` : tail ? `: ${tail}` : ''
-  return new Error(`codex app-server connection ended${detail}`)
+  const error = new Error(`codex app-server connection ended${detail}`)
+  return cause ? error : withProviderDiagnostic(error, diagnostic)
 }
diff --git a/src/main/codex/codex-app-server-posix-supervisor.integration.test.ts b/src/main/codex/codex-app-server-posix-supervisor.integration.test.ts
new file mode 100644
index 000000000000..846afaa973f4
--- /dev/null
+++ b/src/main/codex/codex-app-server-posix-supervisor.integration.test.ts
@@ -0,0 +1,355 @@
+import { spawn, type ChildProcess } from 'node:child_process'
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import {
+  POSIX_PROVIDER_SUPERVISOR_SCRIPT,
+  PROVIDER_SIGTERM_GRACE_MS,
+  PROVIDER_STDIN_END_GRACE_MS,
+  PROVIDER_SUPERVISOR_MAX_STOP_MS,
+  supervisedPosixLaunch,
+  type ProviderSupervisorOptions
+} from './codex-app-server-posix-supervisor'
+
+// The provider leads its own group; its grandchild shares that group and ignores SIGTERM.
+const PROVIDER = String.raw`
+  const { spawn } = require('node:child_process')
+  if (process.env.ORCA_TEST_PROVIDER_IGNORES_SIGTERM) process.on('SIGTERM', () => {})
+  if (process.env.ORCA_TEST_PROVIDER_SIGNAL_FILE) {
+    process.on('SIGTERM', () => {
+      require('node:fs').writeFileSync(process.env.ORCA_TEST_PROVIDER_SIGNAL_FILE, 'SIGTERM')
+      process.exit(0)
+    })
+  }
+  process.stdout.on('error', () => {})
+  const grandchild = spawn(
+    process.execPath,
+    ['-e', "process.on('SIGTERM', () => {}); process.stdout.write('armed'); setInterval(() => {}, 60000)"],
+    { stdio: ['ignore', 'pipe', 'ignore'] }
+  )
+  grandchild.stdout.once('data', () => {
+    process.stdout.write(JSON.stringify({ provider: process.pid, grandchild: grandchild.pid }) + '\n')
+    if (process.env.ORCA_TEST_PROVIDER_STREAMS_OUTPUT) setInterval(() => process.stdout.write('.'), 2)
+  })
+  setInterval(() => {}, 60000)
+`
+
+// Exits the moment its stdin ends, as Codex does on a normal close.
+const EXITS_ON_STDIN_END_PROVIDER = String.raw`
+  process.stdin.on('end', () => process.exit(0)).resume()
+  process.stdout.write(JSON.stringify({ provider: process.pid }) + '\n')
+`
+
+// Ignores stdin end and SIGTERM, recording when SIGTERM arrived, so only SIGKILL ends it.
+const RECORDS_SIGTERM_PROVIDER = String.raw`
+  process.on('SIGTERM', () => {
+    require('node:fs').writeFileSync(process.env.ORCA_TEST_PROVIDER_SIGNAL_FILE, String(Date.now()))
+  })
+  process.stdout.write(JSON.stringify({ provider: process.pid }) + '\n')
+  setInterval(() => {}, 60000)
+`
+
+// Stands in for Orca: launches the supervisor as its own child, then can be killed outright. A
+// second child holds the supervisor's stdin open, so only the parent-death watch can notice.
+// A clean-quit owner has no holder and exits normally on SIGUSR2, the way Orca quits.
+const OWNER = String.raw`
+  const { spawn } = require('node:child_process')
+  const quitsCleanly = Boolean(process.env.ORCA_TEST_OWNER_QUITS_CLEANLY)
+  if (quitsCleanly) process.on('SIGUSR2', () => process.exit(0))
+  const spec = JSON.parse(Buffer.from(process.env.ORCA_PROVIDER_SUPERVISOR_SPEC, 'base64').toString())
+  spec.ownerPid = process.pid
+  const supervisor = spawn(process.execPath, ['-e', process.env.ORCA_TEST_SUPERVISOR_SCRIPT], {
+    env: { ...process.env, ORCA_PROVIDER_SUPERVISOR_SPEC: Buffer.from(JSON.stringify(spec)).toString('base64') },
+    stdio: ['pipe', 'pipe', 'ignore'],
+    detached: true
+  })
+  const holder = quitsCleanly
+    ? null
+    : spawn(process.execPath, ['-e', 'setInterval(() => {}, 60000)'], {
+        stdio: ['ignore', supervisor.stdin, 'ignore']
+      })
+  process.stdout.write(JSON.stringify({ supervisor: supervisor.pid, ...(holder && { holder: holder.pid }) }) + '\n')
+  supervisor.stdout.pipe(process.stdout)
+  setInterval(() => {}, 60000)
+`
+
+// Preloaded into the supervisor: signals it the instant its provider exists, the spawn window.
+const SIGNAL_AFTER_SPAWN_PRELOAD = String.raw`
+  const childProcess = require('node:child_process')
+  const spawn = childProcess.spawn
+  childProcess.spawn = (...args) => {
+    const child = spawn(...args)
+    require('node:fs').writeFileSync(process.env.ORCA_TEST_PROVIDER_PID_FILE, String(child.pid))
+    process.kill(process.pid, 'SIGTERM')
+    return child
+  }
+`
+
+const recordedPids = new Set<number>()
+const tempDirs: string[] = []
+
+function tempDir(): string {
+  const dir = mkdtempSync(join(tmpdir(), 'orca-supervisor-'))
+  tempDirs.push(dir)
+  return dir
+}
+
+function alive(pid: number): boolean {
+  try {
+    process.kill(pid, 0)
+    return true
+  } catch (error) {
+    return !(error instanceof Error && 'code' in error && error.code === 'ESRCH')
+  }
+}
+
+async function waitFor(predicate: () => boolean, timeoutMs: number): Promise<boolean> {
+  const deadline = Date.now() + timeoutMs
+  while (!predicate()) {
+    if (Date.now() >= deadline) {
+      return false
+    }
+    await new Promise((resolve) => setTimeout(resolve, 25))
+  }
+  return true
+}
+
+function readPids(child: ChildProcess, keys: readonly string[]): Promise<Record<string, number>> {
+  return new Promise((resolve, reject) => {
+    const pids: Record<string, number> = {}
+    let buffered = ''
+    const timeout = setTimeout(() => reject(new Error(`no ${keys.join('/')} pids`)), 10_000)
+    const onData = (chunk: Buffer): void => {
+      buffered += chunk.toString()
+      const lines = buffered.split('\n')
+      buffered = lines.pop() ?? ''
+      for (const line of lines) {
+        const parsed: unknown = JSON.parse(line)
+        for (const [key, pid] of Object.entries(parsed ?? {})) {
+          if (typeof pid === 'number') {
+            pids[key] = pid
+            recordedPids.add(pid)
+          }
+        }
+      }
+      if (keys.every((key) => key in pids)) {
+        clearTimeout(timeout)
+        // Later output is not pids; the stream keeps flowing without a listener.
+        child.stdout!.off('data', onData)
+        resolve(pids)
+      }
+    }
+    child.stdout!.on('data', onData)
+  })
+}
+
+function launchSupervisor(
+  options: ProviderSupervisorOptions,
+  env: Record<string, string> = {},
+  provider: { command: string; args: string[] } = {
+    command: process.execPath,
+    args: ['-e', PROVIDER]
+  },
+  nodeArgs: string[] = []
+): { supervisor: ChildProcess; exit: Promise<{ code: number | null; signal: string | null }> } {
+  const launch = supervisedPosixLaunch(provider, { ...process.env, ...env }, options)
+  const supervisor = spawn(launch.command, [...nodeArgs, ...launch.args], {
+    env: launch.env,
+    stdio: ['pipe', 'pipe', 'ignore'],
+    detached: true
+  })
+  recordedPids.add(supervisor.pid!)
+  const exit = new Promise<{ code: number | null; signal: string | null }>((resolve) =>
+    supervisor.once('exit', (code, signal) => resolve({ code, signal }))
+  )
+  return { supervisor, exit }
+}
+
+async function launchUnderOwner(
+  options: ProviderSupervisorOptions,
+  env: Record<string, string> = {}
+): Promise<{ owner: ChildProcess; pids: Record<string, number> }> {
+  const launch = supervisedPosixLaunch(
+    { command: process.execPath, args: ['-e', PROVIDER] },
+    { ...process.env, ...env },
+    options
+  )
+  const owner = spawn(process.execPath, ['-e', OWNER], {
+    env: { ...launch.env, ORCA_TEST_SUPERVISOR_SCRIPT: POSIX_PROVIDER_SUPERVISOR_SCRIPT },
+    stdio: ['ignore', 'pipe', 'ignore']
+  })
+  recordedPids.add(owner.pid!)
+  const pids = await readPids(owner, ['supervisor', 'provider', 'grandchild'])
+  return { owner, pids }
+}
+
+afterEach(() => {
+  for (const pid of recordedPids) {
+    if (alive(pid)) {
+      process.kill(pid, 'SIGKILL')
+    }
+  }
+  recordedPids.clear()
+  for (const dir of tempDirs.splice(0)) {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+describe.runIf(process.platform !== 'win32')('POSIX provider supervisor processes', () => {
+  it('reaps the provider group on SIGTERM and exits only after the group is gone', async () => {
+    const { supervisor, exit } = launchSupervisor({ sigtermGraceMs: 300 })
+    const { provider, grandchild } = await readPids(supervisor, ['provider', 'grandchild'])
+
+    let groupAliveAtExit: boolean | null = null
+    void exit.then(() => {
+      groupAliveAtExit = alive(-provider)
+    })
+    supervisor.kill('SIGTERM')
+
+    await expect(exit).resolves.toEqual({ code: null, signal: 'SIGTERM' })
+    expect(groupAliveAtExit).toBe(false)
+    expect(alive(provider)).toBe(false)
+    expect(alive(grandchild)).toBe(false)
+  })
+
+  it('escalates a SIGTERM-ignoring provider to SIGKILL after the grace from the spec', async () => {
+    const graceMs = 200
+    const { supervisor, exit } = launchSupervisor(
+      { sigtermGraceMs: graceMs },
+      { ORCA_TEST_PROVIDER_IGNORES_SIGTERM: '1' }
+    )
+    const { provider, grandchild } = await readPids(supervisor, ['provider', 'grandchild'])
+
+    const signalledAt = Date.now()
+    supervisor.kill('SIGTERM')
+    const exited = await Promise.race([exit, new Promise((resolve) => setTimeout(resolve, 5_000))])
+
+    expect(exited).toEqual({ code: null, signal: 'SIGTERM' })
+    expect(Date.now() - signalledAt).toBeGreaterThanOrEqual(graceMs)
+    expect(Date.now() - signalledAt).toBeLessThan(PROVIDER_SIGTERM_GRACE_MS)
+    expect(alive(provider)).toBe(false)
+    expect(alive(grandchild)).toBe(false)
+  })
+
+  it('reaps a provider spawned in the instant before a stop arrives', async () => {
+    const dir = tempDir()
+    const preload = join(dir, 'signal-after-spawn.js')
+    const pidFile = join(dir, 'provider-pid')
+    writeFileSync(preload, SIGNAL_AFTER_SPAWN_PRELOAD)
+    const { exit } = launchSupervisor(
+      { sigtermGraceMs: 300 },
+      { ORCA_TEST_PROVIDER_PID_FILE: pidFile },
+      { command: process.execPath, args: ['-e', 'setInterval(() => {}, 60000)'] },
+      ['--require', preload]
+    )
+
+    await expect(exit).resolves.toEqual({ code: null, signal: 'SIGTERM' })
+    const provider = Number(readFileSync(pidFile, 'utf8'))
+    recordedPids.add(provider)
+    expect(await waitFor(() => !alive(provider), 3_000)).toBe(true)
+  })
+
+  it('never spawns the provider when its owner is not its parent at start', async () => {
+    const marker = join(tempDir(), 'provider-started')
+    const { exit } = launchSupervisor(
+      { ownerPid: process.pid === 1 ? 2 : 1 },
+      {},
+      { command: 'touch', args: [marker] }
+    )
+
+    await expect(exit).resolves.toEqual({ code: 1, signal: null })
+    await new Promise((resolve) => setTimeout(resolve, 200))
+    expect(existsSync(marker)).toBe(false)
+  })
+
+  it.each([
+    ['', {}],
+    // Output after the owner's death meets a closed pipe, which must not end the supervisor first.
+    [' while the provider is writing output', { ORCA_TEST_PROVIDER_STREAMS_OUTPUT: '1' }]
+  ])('reaps the provider group when its owner dies%s', async (_, env) => {
+    const graceMs = 300
+    const { owner, pids } = await launchUnderOwner({ sigtermGraceMs: graceMs }, env)
+
+    const killedAt = Date.now()
+    owner.kill('SIGKILL')
+
+    expect(await waitFor(() => !alive(-pids.provider), 3_000)).toBe(true)
+    // The grandchild ignores SIGTERM, so the group lasts until the grace ends in SIGKILL.
+    expect(Date.now() - killedAt).toBeGreaterThanOrEqual(graceMs)
+    expect(await waitFor(() => !alive(pids.supervisor), 3_000)).toBe(true)
+    expect(alive(pids.grandchild)).toBe(false)
+  })
+
+  it('closes a provider that exits on stdin end without waiting out any grace', async () => {
+    const { supervisor, exit } = launchSupervisor(
+      {},
+      {},
+      {
+        command: process.execPath,
+        args: ['-e', EXITS_ON_STDIN_END_PROVIDER]
+      }
+    )
+    const { provider } = await readPids(supervisor, ['provider'])
+
+    const endedAt = Date.now()
+    supervisor.stdin!.end()
+
+    await expect(exit).resolves.toEqual({ code: 0, signal: null })
+    expect(Date.now() - endedAt).toBeLessThan(PROVIDER_STDIN_END_GRACE_MS)
+    expect(alive(provider)).toBe(false)
+  })
+
+  it('gives a provider 1 s after stdin end, then 3 s after SIGTERM before SIGKILL', async () => {
+    const signalFile = join(tempDir(), 'provider-sigterm-at')
+    const { supervisor, exit } = launchSupervisor(
+      {},
+      { ORCA_TEST_PROVIDER_SIGNAL_FILE: signalFile },
+      { command: process.execPath, args: ['-e', RECORDS_SIGTERM_PROVIDER] }
+    )
+    const { provider } = await readPids(supervisor, ['provider'])
+
+    const endedAt = Date.now()
+    supervisor.stdin!.end()
+    const exited = await exit
+    const exitedAt = Date.now()
+    const signalledAt = Number(readFileSync(signalFile, 'utf8'))
+
+    expect(exited).toEqual({ code: 137, signal: null })
+    // Timers may fire a tick early against another process's clock.
+    expect(signalledAt - endedAt).toBeGreaterThanOrEqual(1_000 - 20)
+    expect(exitedAt - signalledAt).toBeGreaterThanOrEqual(3_000 - 20)
+    expect(exitedAt - endedAt).toBeLessThan(PROVIDER_SUPERVISOR_MAX_STOP_MS + 1_000)
+    expect(alive(provider)).toBe(false)
+  })
+
+  it('reaps the provider group and exits when its owner quits cleanly', async () => {
+    const { owner, pids } = await launchUnderOwner(
+      { sigtermGraceMs: 300 },
+      { ORCA_TEST_OWNER_QUITS_CLEANLY: '1' }
+    )
+    const ownerExit = new Promise((resolve) =>
+      owner.once('exit', (code, signal) => resolve({ code, signal }))
+    )
+
+    owner.kill('SIGUSR2')
+
+    await expect(ownerExit).resolves.toEqual({ code: 0, signal: null })
+    expect(await waitFor(() => !alive(-pids.provider), 3_000)).toBe(true)
+    expect(await waitFor(() => !alive(pids.supervisor), 3_000)).toBe(true)
+    expect(alive(pids.grandchild)).toBe(false)
+  })
+
+  it('asks the provider to stop with SIGTERM when its owner dies', async () => {
+    const signalFile = join(tempDir(), 'provider-signal')
+    const { owner, pids } = await launchUnderOwner(
+      { sigtermGraceMs: 300 },
+      { ORCA_TEST_PROVIDER_SIGNAL_FILE: signalFile }
+    )
+
+    owner.kill('SIGKILL')
+
+    expect(await waitFor(() => !alive(-pids.provider), 3_000)).toBe(true)
+    expect(existsSync(signalFile) && readFileSync(signalFile, 'utf8')).toBe('SIGTERM')
+  })
+})
diff --git a/src/main/codex/codex-app-server-posix-supervisor.test.ts b/src/main/codex/codex-app-server-posix-supervisor.test.ts
index f51157a443c7..6dbe03e5b2a2 100644
--- a/src/main/codex/codex-app-server-posix-supervisor.test.ts
+++ b/src/main/codex/codex-app-server-posix-supervisor.test.ts
@@ -3,6 +3,8 @@ import type { CodexAppServerLaunch } from './codex-app-server-connection'
 import {
   createProviderSpawnSpec,
   POSIX_PROVIDER_SUPERVISOR_SCRIPT,
+  PROVIDER_SIGTERM_GRACE_MS,
+  PROVIDER_STDIN_END_GRACE_MS,
   supervisedPosixLaunch
 } from './codex-app-server-posix-supervisor'
 
@@ -27,7 +29,10 @@ describe('structured provider supervision', () => {
       expect.objectContaining({
         command: '/opt/codex',
         args: ['app-server', '--flag'],
-        cwd: '/work/repo'
+        cwd: '/work/repo',
+        ownerPid: process.pid,
+        stdinEndGraceMs: PROVIDER_STDIN_END_GRACE_MS,
+        sigtermGraceMs: PROVIDER_SIGTERM_GRACE_MS
       })
     )
     expect(
@@ -38,7 +43,7 @@ describe('structured provider supervision', () => {
     )
     expect(POSIX_PROVIDER_SUPERVISOR_SCRIPT).toContain('delete childEnv.ELECTRON_RUN_AS_NODE')
     expect(spec.env.ELECTRON_RUN_AS_NODE).toBe('1')
-    expect(POSIX_PROVIDER_SUPERVISOR_SCRIPT).toContain('process.ppid !== originalParent')
+    expect(POSIX_PROVIDER_SUPERVISOR_SCRIPT).toContain('process.ppid !== spec.ownerPid')
     expect(POSIX_PROVIDER_SUPERVISOR_SCRIPT).toContain(
       "process.stdin.once('close', scheduleOwnerShutdown)"
     )
@@ -49,13 +54,26 @@ describe('structured provider supervision', () => {
     expect(POSIX_PROVIDER_SUPERVISOR_SCRIPT).not.toContain('process.ppid === 1')
   })
 
+  it('refuses a grace longer than recovery waits before SIGKILL', () => {
+    const stdinEnd = (stdinEndGraceMs: number) => () =>
+      supervisedPosixLaunch(launch, {}, { stdinEndGraceMs })
+    const sigterm = (sigtermGraceMs: number) => () =>
+      supervisedPosixLaunch(launch, {}, { sigtermGraceMs })
+
+    expect(stdinEnd(PROVIDER_STDIN_END_GRACE_MS)).not.toThrow()
+    expect(stdinEnd(PROVIDER_STDIN_END_GRACE_MS + 1)).toThrow(RangeError)
+    expect(sigterm(PROVIDER_SIGTERM_GRACE_MS)).not.toThrow()
+    expect(sigterm(PROVIDER_SIGTERM_GRACE_MS + 1)).toThrow(RangeError)
+  })
+
   it('uses direct provider spawning on Windows because the job owns the tree', () => {
     expect(createProviderSpawnSpec(launch, { PATH: '/bin' }, 'win32')).toEqual({
       program: '/opt/codex',
       args: ['app-server', '--flag'],
       env: { PATH: '/bin' },
       cwd: '/work/repo',
-      detached: false
+      detached: false,
+      supervised: false
     })
   })
 })
diff --git a/src/main/codex/codex-app-server-posix-supervisor.ts b/src/main/codex/codex-app-server-posix-supervisor.ts
index f83ba6f374bc..21dd56aeb5b5 100644
--- a/src/main/codex/codex-app-server-posix-supervisor.ts
+++ b/src/main/codex/codex-app-server-posix-supervisor.ts
@@ -1,9 +1,33 @@
 import type { CodexAppServerLaunch } from './codex-app-server-connection'
 
+/** Time the provider gets to exit on its own after its stdin ends, before SIGTERM. */
+export const PROVIDER_STDIN_END_GRACE_MS = 1_000
+/** Time the provider group gets to flush and exit after SIGTERM, before SIGKILL. */
+export const PROVIDER_SIGTERM_GRACE_MS = 3_000
+/**
+ * How long the supervisor waits for a SIGKILLed group to disappear. A killed process never runs
+ * again, so this only covers the kernel finishing the kill; waiting forever could hang close or
+ * recovery on a process stuck in the kernel, such as one blocked on a hung network drive.
+ */
+export const PROVIDER_GROUP_REAP_TIMEOUT_MS = 1_500
+/**
+ * Longest a supervisor can take to stop once asked (stdin end, grace, SIGTERM, grace, SIGKILL,
+ * reap); a SIGKILL sooner can orphan its group. The graces are also the largest a spec may carry.
+ */
+export const PROVIDER_SUPERVISOR_MAX_STOP_MS =
+  PROVIDER_STDIN_END_GRACE_MS + PROVIDER_SIGTERM_GRACE_MS + PROVIDER_GROUP_REAP_TIMEOUT_MS
+
 /** Inline supervisor source kept dependency-free for the spawned Node child. */
 export const POSIX_PROVIDER_SUPERVISOR_SCRIPT = `
 const { spawn } = require('node:child_process')
 const spec = JSON.parse(Buffer.from(process.env.ORCA_PROVIDER_SUPERVISOR_SPEC, 'base64').toString())
+// A detached supervisor is reparented when its owner exits. The new parent may
+// be PID 1 or a platform subreaper, so any other parent means no live owner.
+const ownerGone = () => process.ppid !== spec.ownerPid
+// Registered before the spawn, so a stop that lands while the provider starts still reaps it.
+for (const signal of ['SIGTERM', 'SIGINT', 'SIGHUP']) process.on(signal, () => stopProviderGroup(signal))
+// Orca can die before this runs; spawning then would start a provider nothing watches.
+if (ownerGone()) process.exit(1)
 const childEnv = { ...process.env }
 delete childEnv.ORCA_PROVIDER_SUPERVISOR_SPEC
 delete childEnv.ELECTRON_RUN_AS_NODE
@@ -13,7 +37,6 @@ const child = spawn(spec.command, spec.args, {
   stdio: ['pipe', 'pipe', 'pipe'],
   detached: true
 })
-const originalParent = process.ppid
 let timer
 let ownerShutdownTimer
 let settling = false
@@ -26,29 +49,47 @@ const providerGroupExists = () => {
     return Boolean(error && error.code !== 'ESRCH')
   }
 }
-const reapOwnedProviderGroup = async () => {
-  if (!child.pid) return false
-  try { process.kill(-child.pid, 'SIGKILL') } catch (error) {
-    if (error && error.code !== 'ESRCH') return false
-  }
-  const deadline = Date.now() + 1500
+const waitForProviderGroupExit = async (timeoutMs) => {
+  const deadline = Date.now() + timeoutMs
   while (providerGroupExists()) {
     if (Date.now() >= deadline) return false
     await new Promise((resolve) => setTimeout(resolve, 25))
   }
   return true
 }
-const terminateOwnedGroup = () => {
+const reapOwnedProviderGroup = async () => {
+  if (!child.pid) return false
+  try { process.kill(-child.pid, 'SIGKILL') } catch (error) {
+    if (error && error.code !== 'ESRCH') return false
+  }
+  return waitForProviderGroupExit(${PROVIDER_GROUP_REAP_TIMEOUT_MS})
+}
+const finishWithProviderOutcome = (code, signal) => {
+  if (!signal) return process.exit(code ?? 1)
+  // Re-raise with the default action; this supervisor's own handler would swallow it.
+  process.removeAllListeners(signal)
+  process.kill(process.pid, signal)
+}
+// Every stop is the same: SIGTERM the group, SIGKILL it after its grace, and exit only once it is
+// gone. Whoever stops this pid judges the provider by it, so a dead supervisor means a dead group.
+const stopProviderGroup = (receivedSignal) => {
   if (settling) return
   settling = true
   clearInterval(timer)
-  void reapOwnedProviderGroup().then((reaped) => process.exit(reaped ? 137 : 1))
+  if (ownerShutdownTimer) clearTimeout(ownerShutdownTimer)
+  try { process.kill(-child.pid, 'SIGTERM') } catch {}
+  void waitForProviderGroupExit(spec.sigtermGraceMs)
+    .then((exited) => exited || reapOwnedProviderGroup())
+    .then((reaped) => {
+      if (!reaped) return process.exit(1)
+      finishWithProviderOutcome(137, receivedSignal)
+    })
 }
 const scheduleOwnerShutdown = () => {
   if (settling || ownerShutdownTimer) return
   // A normal close ends the provider's stdin first; allow it to flush and
   // exit before forcing the group, while still bounding an orphaned child.
-  ownerShutdownTimer = setTimeout(terminateOwnedGroup, 1250)
+  ownerShutdownTimer = setTimeout(() => stopProviderGroup(null), spec.stdinEndGraceMs)
   ownerShutdownTimer.unref()
 }
 process.stdin.once('end', scheduleOwnerShutdown)
@@ -56,10 +97,9 @@ process.stdin.once('close', scheduleOwnerShutdown)
 process.stdin.pipe(child.stdin)
 child.stdout.pipe(process.stdout)
 child.stderr.pipe(process.stderr)
-for (const stream of [process.stdin, child.stdin, child.stdout, child.stderr]) stream.on('error', () => {})
-const finishWithProviderOutcome = (code, signal) => {
-  if (!signal) return process.exit(code ?? 1)
-  process.kill(process.pid, signal)
+// A dead owner's stdout pipe raises EPIPE; unhandled, it would end this pid before the group.
+for (const stream of [process.stdin, process.stdout, process.stderr, child.stdin, child.stdout, child.stderr]) {
+  stream.on('error', () => {})
 }
 const reapProviderExit = async (code, signal) => {
   if (settling) return
@@ -70,33 +110,54 @@ const reapProviderExit = async (code, signal) => {
   finishWithProviderOutcome(code, signal)
 }
 timer = setInterval(() => {
-  // A detached supervisor is reparented when its owner exits. The new parent
-  // may be PID 1 or a platform subreaper, so any parent change is proof that
-  // this process group no longer has a live Orca owner.
-  if (process.ppid !== originalParent) {
-    terminateOwnedGroup()
-  }
+  if (ownerGone()) stopProviderGroup(null)
 }, 100)
 timer.unref()
-child.once('error', () => {
+child.once('error', (error) => {
   clearInterval(timer)
-  process.exit(127)
+  // The owner sees only this pid's exit; stderr is where a missing provider binary can say so.
+  process.stderr.write(String(error && error.message) + '\\n', () => process.exit(127))
 })
 child.once('exit', (code, signal) => {
   void reapProviderExit(code, signal)
 })
 `
 
+export type ProviderSupervisorOptions = {
+  cwd?: string
+  /** The process the supervisor serves; it must be the supervisor's parent. */
+  ownerPid?: number
+  stdinEndGraceMs?: number
+  sigtermGraceMs?: number
+}
+
+// A longer grace than the max stop allows would let recovery or close SIGKILL mid-stop.
+function assertGraceWithin(name: string, graceMs: number, maxMs: number): void {
+  if (!(graceMs >= 0 && graceMs <= maxMs)) {
+    throw new RangeError(`Provider supervisor ${name} grace ${graceMs} ms is outside 0-${maxMs} ms`)
+  }
+}
+
 export function supervisedPosixLaunch(
   launch: CodexAppServerLaunch,
   childEnv: NodeJS.ProcessEnv,
-  cwd = launch.cwd ?? process.cwd()
+  {
+    cwd = launch.cwd ?? process.cwd(),
+    ownerPid = process.pid,
+    stdinEndGraceMs = PROVIDER_STDIN_END_GRACE_MS,
+    sigtermGraceMs = PROVIDER_SIGTERM_GRACE_MS
+  }: ProviderSupervisorOptions = {}
 ): { command: string; args: string[]; env: NodeJS.ProcessEnv } {
+  assertGraceWithin('stdin-end', stdinEndGraceMs, PROVIDER_STDIN_END_GRACE_MS)
+  assertGraceWithin('SIGTERM', sigtermGraceMs, PROVIDER_SIGTERM_GRACE_MS)
   const supervisorSpec = Buffer.from(
     JSON.stringify({
       command: launch.command,
       args: launch.args,
-      cwd
+      cwd,
+      ownerPid,
+      stdinEndGraceMs,
+      sigtermGraceMs
     })
   ).toString('base64')
   return {
@@ -116,13 +177,22 @@ export function createProviderSpawnSpec(
   launch: CodexAppServerLaunch,
   childEnv: NodeJS.ProcessEnv,
   platform: NodeJS.Platform
-): { program: string; args: string[]; env: NodeJS.ProcessEnv; cwd: string; detached: boolean } {
-  const supervised = platform === 'win32' ? null : supervisedPosixLaunch(launch, childEnv)
+): {
+  program: string
+  args: string[]
+  env: NodeJS.ProcessEnv
+  cwd: string
+  detached: boolean
+  /** The child is the supervisor, whose SIGTERM stops the provider and then itself. */
+  supervised: boolean
+} {
+  const supervisor = platform === 'win32' ? null : supervisedPosixLaunch(launch, childEnv)
   return {
-    program: supervised?.command ?? launch.command,
-    args: supervised?.args ?? launch.args,
-    env: supervised?.env ?? childEnv,
+    program: supervisor?.command ?? launch.command,
+    args: supervisor?.args ?? launch.args,
+    env: supervisor?.env ?? childEnv,
     cwd: launch.cwd ?? process.cwd(),
-    detached: platform !== 'win32'
+    detached: platform !== 'win32',
+    supervised: supervisor !== null
   }
 }
diff --git a/src/main/codex/codex-app-server-process-teardown.test.ts b/src/main/codex/codex-app-server-process-teardown.test.ts
index cec8f91d0815..295d780718d0 100644
--- a/src/main/codex/codex-app-server-process-teardown.test.ts
+++ b/src/main/codex/codex-app-server-process-teardown.test.ts
@@ -26,7 +26,7 @@ describe('terminateCodexAppServerProcessTree', () => {
     const release = Promise.withResolvers<void>()
     const terminateWindowsTree = vi.fn(() => release.promise)
 
-    const teardown = terminateCodexAppServerProcessTree(target, undefined, {
+    const teardown = terminateCodexAppServerProcessTree(target, {
       platform: 'win32',
       terminateWindowsTree
     })
@@ -38,52 +38,12 @@ describe('terminateCodexAppServerProcessTree', () => {
     expect(target.kill).toHaveBeenCalledWith('SIGKILL')
   })
 
-  it('kills exact Linux spawn-token PIDs before the recorded wrapper', async () => {
-    const target = child()
-    const findSpawnTokenProcesses = vi
-      .fn<() => Promise<number[] | null>>()
-      .mockResolvedValueOnce([1234, 2345, 3456])
-      .mockResolvedValueOnce([1234])
-      .mockResolvedValueOnce([1234])
-    const signalPid = vi.fn()
-
-    await expect(
-      terminateCodexAppServerProcessTree(target, 'spawn-1', {
-        platform: 'linux',
-        findSpawnTokenProcesses,
-        signalPid,
-        isPidPresent: () => false,
-        wait: async () => undefined
-      })
-    ).resolves.toBe(true)
-
-    expect(signalPid.mock.calls).toEqual([
-      [2345, 'SIGKILL'],
-      [3456, 'SIGKILL']
-    ])
-    expect(target.kill).toHaveBeenCalledTimes(1)
-    expect(target.kill).toHaveBeenCalledWith('SIGKILL')
-  })
-
-  it('keeps the wrapper reachable when Linux cannot prove descendant exit', async () => {
-    const target = child()
-
-    await expect(
-      terminateCodexAppServerProcessTree(target, 'spawn-1', {
-        platform: 'linux',
-        findSpawnTokenProcesses: async () => null
-      })
-    ).resolves.toBe(false)
-
-    expect(target.kill).not.toHaveBeenCalled()
-  })
-
   it('waits for an owned POSIX snapshot before killing the wrapper', async () => {
     const target = child()
     const snapshot = { rootPgid: 1234, descendants: [], capturedAtMs: 1 }
     const release = Promise.withResolvers<boolean>()
 
-    const teardown = terminateCodexAppServerProcessTree(target, undefined, {
+    const teardown = terminateCodexAppServerProcessTree(target, {
       platform: 'darwin',
       captureDescendants: async () => snapshot,
       terminateDescendants: () => release.promise
@@ -102,7 +62,7 @@ describe('terminateCodexAppServerProcessTree', () => {
     const signalProcessGroup = vi.fn()
 
     await expect(
-      terminateCodexAppServerProcessTree(target, undefined, {
+      terminateCodexAppServerProcessTree(target, {
         platform: 'darwin',
         dedicatedProcessGroup: true,
         captureDescendants,
@@ -119,7 +79,7 @@ describe('terminateCodexAppServerProcessTree', () => {
     const target = child()
 
     await expect(
-      terminateCodexAppServerProcessTree(target, undefined, {
+      terminateCodexAppServerProcessTree(target, {
         platform: 'linux',
         dedicatedProcessGroup: true,
         signalProcessGroup: () => {
@@ -142,7 +102,7 @@ describe('terminateCodexAppServerProcessTree', () => {
     const target = { pid: UNREACHABLE_PGID, kill: vi.fn(() => true) as ChildProcess['kill'] }
 
     await expect(
-      terminateCodexAppServerProcessTree(target, undefined, {
+      terminateCodexAppServerProcessTree(target, {
         platform: 'darwin',
         captureDescendants: async () => ({
           rootPgid: UNREACHABLE_PGID,
@@ -162,7 +122,7 @@ describe('terminateCodexAppServerProcessTree', () => {
     const signalProcessGroup = vi.fn()
 
     await expect(
-      terminateCodexAppServerProcessTree(target, undefined, {
+      terminateCodexAppServerProcessTree(target, {
         platform: 'darwin',
         captureDescendants: async () => ({ rootPgid: 1234, descendants: [], capturedAtMs: 1 }),
         terminateDescendants: async () => true,
@@ -191,7 +151,7 @@ describe('terminateCodexAppServerProcessTree', () => {
 
     const results = await Promise.all(
       targets.map((target) =>
-        terminateCodexAppServerProcessTree(target, undefined, {
+        terminateCodexAppServerProcessTree(target, {
           platform: 'linux',
           dedicatedProcessGroup: true,
           captureDescendants,
diff --git a/src/main/codex/codex-app-server-process-teardown.ts b/src/main/codex/codex-app-server-process-teardown.ts
index 5a9c6e3574b4..10e625bef7e8 100644
--- a/src/main/codex/codex-app-server-process-teardown.ts
+++ b/src/main/codex/codex-app-server-process-teardown.ts
@@ -2,11 +2,8 @@ import type { ChildProcessHandle } from '../../shared/child-process/run-process'
 import { captureDescendantSnapshot, type DescendantSnapshot } from '../pty-descendant-termination'
 import { terminateDescendantSnapshotAndWait } from '../pty-descendant-exit-verification'
 import { terminateWindowsProcessTree } from '../windows-process-tree-kill'
-import { findAgentSessionSpawnTokenProcesses } from '../runtime/agent-session-spawn-token-process-scan'
 import { recordSelfInitiatedTreeKill } from '../crash-reporting/self-initiated-tree-kill-log'
 
-const TOKEN_PROCESS_EXIT_TIMEOUT_MS = 3_500
-const TOKEN_PROCESS_POLL_MS = 25
 const activeTeardowns = new WeakMap<object, Promise<boolean>>()
 
 type TeardownChild = Pick<ChildProcessHandle, 'pid' | 'kill'>
@@ -14,16 +11,10 @@ type TeardownChild = Pick<ChildProcessHandle, 'pid' | 'kill'>
 export type CodexAppServerProcessTeardownDeps = {
   platform?: NodeJS.Platform
   dedicatedProcessGroup?: boolean
-  /** Diagnostic/recovery injection only; never used by the primary teardown. */
-  findSpawnTokenProcesses?: (spawnToken: string) => Promise<number[] | null>
   captureDescendants?: (rootPid: number) => Promise<DescendantSnapshot | null>
   terminateDescendants?: (snapshot: DescendantSnapshot) => Promise<boolean>
   terminateWindowsTree?: (rootPid: number, deps?: { site?: string }) => Promise<void>
-  signalPid?: (pid: number, signal: NodeJS.Signals) => void
   signalProcessGroup?: (pgid: number, signal: NodeJS.Signals) => void
-  isPidPresent?: (pid: number) => boolean
-  wait?: (ms: number) => Promise<void>
-  now?: () => number
 }
 
 function terminateDedicatedPosixGroup(
@@ -47,70 +38,11 @@ function terminateDedicatedPosixGroup(
   return true
 }
 
-function sendSignal(pid: number, signal: NodeJS.Signals): void {
-  try {
-    process.kill(pid, signal)
-  } catch {
-    // An already-gone exact PID is the desired outcome.
-  }
-}
-
-function isPidPresent(pid: number): boolean {
-  try {
-    process.kill(pid, 0)
-    return true
-  } catch (error) {
-    return (error as NodeJS.ErrnoException).code !== 'ESRCH'
-  }
-}
-
-async function diagnosticTokenFallback(
-  rootPid: number,
-  spawnToken: string,
-  deps: CodexAppServerProcessTeardownDeps
-): Promise<boolean> {
-  const find = deps.findSpawnTokenProcesses ?? findAgentSessionSpawnTokenProcesses
-  const signal = deps.signalPid ?? sendSignal
-  const pidPresent = deps.isPidPresent ?? isPidPresent
-  const delay =
-    deps.wait ?? ((ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms)))
-  const now = deps.now ?? Date.now
-  const deadline = now() + TOKEN_PROCESS_EXIT_TIMEOUT_MS
-  const signalled = new Set<number>()
-  while (now() < deadline) {
-    const pids = await find(spawnToken).catch(() => null)
-    if (pids === null) {
-      return false
-    }
-    for (const pid of pids.filter((candidate) => candidate !== rootPid)) {
-      signalled.add(pid)
-      signal(pid, 'SIGKILL')
-    }
-    if ([...signalled].every((pid) => !pidPresent(pid))) {
-      return true
-    }
-    await delay(TOKEN_PROCESS_POLL_MS)
-  }
-  return false
-}
-
 async function terminatePosixTree(
   child: TeardownChild,
   rootPid: number,
-  _spawnToken: string | undefined,
   deps: CodexAppServerProcessTeardownDeps
 ): Promise<boolean> {
-  // Kept only for explicit recovery callers/tests. Production always follows
-  // the dedicated process-group path below; token enumeration is evidence,
-  // never the owner of orphan-reaping decisions.
-  if (_spawnToken && deps.findSpawnTokenProcesses) {
-    const reaped = await diagnosticTokenFallback(rootPid, _spawnToken, deps)
-    if (reaped) {
-      child.kill('SIGKILL')
-      return true
-    }
-    return false
-  }
   child.kill('SIGSTOP')
   const capture = deps.captureDescendants ?? captureDescendantSnapshot
   const snapshot = await capture(rootPid).catch(() => null)
@@ -158,7 +90,6 @@ async function terminatePosixTree(
 /** Stops every process owned by one app-server launch before releasing its wrapper. */
 async function terminateOnce(
   child: TeardownChild,
-  spawnToken: string | undefined,
   deps: CodexAppServerProcessTeardownDeps
 ): Promise<boolean> {
   const rootPid = child.pid
@@ -176,12 +107,11 @@ async function terminateOnce(
   if (deps.dedicatedProcessGroup) {
     return terminateDedicatedPosixGroup(rootPid, deps)
   }
-  return terminatePosixTree(child, rootPid, spawnToken, deps)
+  return terminatePosixTree(child, rootPid, deps)
 }
 
 export function terminateCodexAppServerProcessTree(
   child: TeardownChild,
-  spawnToken?: string,
   deps: CodexAppServerProcessTeardownDeps = {}
 ): Promise<boolean> {
   const key = child as object
@@ -189,7 +119,7 @@ export function terminateCodexAppServerProcessTree(
   if (active) {
     return active
   }
-  const attempt = terminateOnce(child, spawnToken, deps).catch(() => false)
+  const attempt = terminateOnce(child, deps).catch(() => false)
   activeTeardowns.set(key, attempt)
   void attempt.then(() => {
     if (activeTeardowns.get(key) === attempt) {
diff --git a/src/main/codex/codex-app-server-record-dispatch.ts b/src/main/codex/codex-app-server-record-dispatch.ts
index e76f25093996..b1d3605b38f6 100644
--- a/src/main/codex/codex-app-server-record-dispatch.ts
+++ b/src/main/codex/codex-app-server-record-dispatch.ts
@@ -88,7 +88,8 @@ export function createCodexAppServerRecordDispatcher(input: {
           : new CodexAppServerRequestError(
               waiter.method,
               typeof error.code === 'number' ? error.code : null,
-              `codex app-server ${waiter.method} failed: ${detail}`
+              `codex app-server ${waiter.method} failed: ${detail}`,
+              typeof error.message === 'string' ? error.message : undefined
             )
       )
       return
diff --git a/src/main/codex/codex-app-server-request-error.ts b/src/main/codex/codex-app-server-request-error.ts
index 0dbefaca9655..0e7cc719017e 100644
--- a/src/main/codex/codex-app-server-request-error.ts
+++ b/src/main/codex/codex-app-server-request-error.ts
@@ -1,12 +1,23 @@
+import { providerDiagnostic, type ProviderDiagnostic } from '../../shared/agent-session-failure'
+
 /** Codex answered the call and refused it, rather than timing out or exiting. */
 export class CodexAppServerRequestError extends Error {
+  /** Codex's own `error.message`, kept apart from the Orca text around it. */
+  readonly providerDiagnostic?: ProviderDiagnostic
+
   constructor(
     readonly method: string,
     readonly code: number | null,
-    message: string
+    message: string,
+    providerMessage?: string
   ) {
     super(message)
     this.name = 'CodexAppServerRequestError'
+    const diagnostic =
+      providerMessage === undefined ? undefined : providerDiagnostic(providerMessage, 'person')
+    if (diagnostic) {
+      this.providerDiagnostic = diagnostic
+    }
   }
 }
 
diff --git a/src/main/codex/codex-background-command-tracker.ts b/src/main/codex/codex-background-command-tracker.ts
index 844134881ad6..922743f1a831 100644
--- a/src/main/codex/codex-background-command-tracker.ts
+++ b/src/main/codex/codex-background-command-tracker.ts
@@ -1,15 +1,20 @@
 import type { AgentSessionBackgroundTask } from '../../shared/agent-session-wire'
 import type { CodexBackgroundTaskEvent } from './codex-background-task-frames'
-import { codexCommandOutlivesTurn } from './codex-command-lifecycle'
 import { readRecord, readString } from './codex-item-field-readers'
 import { readCodexThreadItem } from './codex-structured-item-translation'
 import { MAX_CODEX_ITEM_STREAM_METADATA_BYTES } from './codex-item-stream-retention'
+import type { CodexAbandonedCommand } from './codex-prompt-registry'
 
 const MAX_SETTLED_COMMANDS = 128
 const MAX_DESCRIPTION_CHARS = 512
 
 type Command = { threadId: string; task: AgentSessionBackgroundTask; bytes: number }
 
+/** A command process starting, or ending: it exited, its thread closed, or the session ended. */
+export type CodexBackgroundCommandChange =
+  | { type: 'started'; threadId: string; task: AgentSessionBackgroundTask }
+  | { type: 'ended'; threadId: string; taskId: string }
+
 /** The label's reserved share of the description. Reserved, not merely capped:
  *  a label free to spend the whole budget clips away the command it qualifies,
  *  leaving a command row naming an agent and no command — the failure this
@@ -65,28 +70,17 @@ export class CodexBackgroundCommandTracker {
     )
   }
 
-  observe(event: CodexBackgroundTaskEvent): void {
+  observe(event: CodexBackgroundTaskEvent): CodexBackgroundCommandChange | null {
     const parsed = this.parse(event)
     if (!parsed || this.settled.has(parsed.key)) {
-      return
+      return null
     }
     const { key, command, completed } = parsed
-    const existing = this.commands.get(key)
     if (completed) {
-      if (existing) {
-        this.liveBytes -= existing.bytes
-        this.commands.delete(key)
-      }
-      const bytes = Buffer.byteLength(key, 'utf8') + 256
-      if (this.liveBytes + bytes <= this.maxMetadataBytes) {
-        this.settled.set(key, bytes)
-        this.settledBytes += bytes
-      }
-      this.trimSettled()
-      return
+      return this.end(key)
     }
-    if (existing) {
-      return
+    if (this.commands.has(key)) {
+      return null
     }
     if (this.liveBytes + command.bytes > this.maxMetadataBytes) {
       throw new Error('Codex command metadata was not admitted before observation')
@@ -94,6 +88,19 @@ export class CodexBackgroundCommandTracker {
     this.commands.set(key, command)
     this.liveBytes += command.bytes
     this.trimSettled()
+    return { type: 'started', threadId: command.threadId, task: command.task }
+  }
+
+  /** The thread closed: Codex stops its processes first, so none of them can report an exit. */
+  endThread(threadId: string): CodexBackgroundCommandChange[] {
+    return [...this.commands]
+      .filter(([, command]) => command.threadId === threadId)
+      .flatMap(([key]) => this.end(key) ?? [])
+  }
+
+  /** Its approval went unanswered until its turn ended, so its process never started. */
+  endUnapproved(command: CodexAbandonedCommand): CodexBackgroundCommandChange | null {
+    return this.end(JSON.stringify([command.threadId, command.itemId]))
   }
 
   tasks(
@@ -113,11 +120,45 @@ export class CodexBackgroundCommandTracker {
       })
   }
 
-  clear(): void {
+  /** The live commands one thread launched, as the strip would publish them. */
+  threadTasks(threadId: string): AgentSessionBackgroundTask[] {
+    return [...this.commands.values()]
+      .filter((command) => command.threadId === threadId)
+      .map((command) => command.task)
+  }
+
+  /** The session ended, and every command with it. */
+  clear(): CodexBackgroundCommandChange[] {
+    const ended = [...this.commands.values()].map(
+      ({ threadId, task }): CodexBackgroundCommandChange => ({
+        type: 'ended',
+        threadId,
+        taskId: task.id
+      })
+    )
     this.commands.clear()
     this.settled.clear()
     this.liveBytes = 0
     this.settledBytes = 0
+    return ended
+  }
+
+  /** Retires the key so a replayed frame cannot start the command again. */
+  private end(key: string): CodexBackgroundCommandChange | null {
+    const existing = this.commands.get(key)
+    if (existing) {
+      this.liveBytes -= existing.bytes
+      this.commands.delete(key)
+    }
+    const bytes = Buffer.byteLength(key, 'utf8') + 256
+    if (this.liveBytes + bytes <= this.maxMetadataBytes) {
+      this.settled.set(key, bytes)
+      this.settledBytes += bytes
+    }
+    this.trimSettled()
+    return existing
+      ? { type: 'ended', threadId: existing.threadId, taskId: existing.task.id }
+      : null
   }
 
   private trimSettled(): void {
@@ -140,8 +181,10 @@ export class CodexBackgroundCommandTracker {
     if (event.method !== 'item/started' && event.method !== 'item/completed') {
       return null
     }
+    // Any command may outlive its turn; `source` says only how Codex launched it. A stdin write
+    // starts no process: it reaches one already tracked.
     const item = readCodexThreadItem(readRecord(event.params).item)
-    if (!item || !codexCommandOutlivesTurn(item)) {
+    if (item?.type !== 'commandExecution' || item.source === 'unifiedExecInteraction') {
       return null
     }
     const key = JSON.stringify([event.threadId, item.id])
diff --git a/src/main/codex/codex-background-task-frames.ts b/src/main/codex/codex-background-task-frames.ts
index a2e7a7e2151a..f01863956b6c 100644
--- a/src/main/codex/codex-background-task-frames.ts
+++ b/src/main/codex/codex-background-task-frames.ts
@@ -15,6 +15,8 @@ export type CodexBackgroundTaskFrame =
       agentThreadId: string
       label: string | null
       parentTurnId: string | null | undefined
+      /** The reporting thread, for a `started` activity: the agent that spawned the child. */
+      spawnerThreadId: string | undefined
     }
   | {
       kind: 'turn'
@@ -22,6 +24,11 @@ export type CodexBackgroundTaskFrame =
       turnId: string
       state: NativeChatSubagentState
     }
+  | {
+      /** A child thread that closed: it ran its last turn, and Codex never said how it went. */
+      kind: 'thread-closed'
+      threadId: string
+    }
 
 export type CodexBackgroundTaskEvent = {
   method: string
@@ -29,10 +36,29 @@ export type CodexBackgroundTaskEvent = {
   params: unknown
 }
 
+/**
+ * The one way Codex ends a child's turn without `turn/completed`: a closed thread ran its last
+ * turn and Codex never said how it went. A turn-ending `error` is not one — Codex follows it with
+ * a failed `turn/completed` for the same turn, which is that turn's end and carries the duration
+ * and receipt time the error does not.
+ */
+function readCodexChildThreadClosed(
+  event: CodexBackgroundTaskEvent
+): CodexBackgroundTaskFrame | null {
+  return event.method === 'thread/closed'
+    ? { kind: 'thread-closed', threadId: event.threadId }
+    : null
+}
+
 export function readCodexBackgroundTaskFrame(
   event: CodexBackgroundTaskEvent,
   primaryThreadId: string
 ): CodexBackgroundTaskFrame | null {
+  // The session's own turn ends through the journal's turn boundaries, never here.
+  const ending = event.threadId === primaryThreadId ? null : readCodexChildThreadClosed(event)
+  if (ending) {
+    return ending
+  }
   if (event.method === 'turn/started' || event.method === 'turn/completed') {
     const turnId = readCodexTurnId(event.params)
     if (turnId === null) {
@@ -67,6 +93,8 @@ export function readCodexBackgroundTaskFrame(
     parentTurnId:
       activity.kind === 'started' || activity.kind === 'interacted'
         ? readCodexTurnId(event.params)
-        : undefined
+        : undefined,
+    // Only `started` names the spawner: other kinds ride whichever agent acted.
+    spawnerThreadId: activity.kind === 'started' ? event.threadId : undefined
   }
 }
diff --git a/src/main/codex/codex-background-task-tracker.ts b/src/main/codex/codex-background-task-tracker.ts
index a972b7bb4c11..6429a84d4fda 100644
--- a/src/main/codex/codex-background-task-tracker.ts
+++ b/src/main/codex/codex-background-task-tracker.ts
@@ -2,25 +2,50 @@ import type {
   AgentSessionBackgroundTask,
   AgentSessionBackgroundTaskState
 } from '../../shared/agent-session-wire'
+import type { AgentChildWorkEvidence } from '../../shared/agent-status-child-work-evidence'
 import {
   readCodexBackgroundTaskFrame,
   type CodexBackgroundTaskEvent
 } from './codex-background-task-frames'
 import { CodexSubagentExecutions } from './codex-subagent-executions'
 import { CodexBackgroundCommandTracker } from './codex-background-command-tracker'
+import { CodexChildWorkEvidence } from './codex-child-work-evidence'
+import type { CodexAbandonedCommand } from './codex-prompt-registry'
+import type { CodexStructuredSessionAdapterDeps } from './codex-structured-session-state'
 import { boundSubagentField } from './codex-subagent-group-body'
 
+/** Where a session's child-work evidence goes, and the host clock that stamps it. */
+export type CodexChildWorkSink = {
+  deliver: (evidence: AgentChildWorkEvidence[]) => void
+  now: () => number
+}
+
+export function codexChildWorkSink(
+  sessionId: string,
+  deps: Pick<CodexStructuredSessionAdapterDeps, 'onChildWorkEvidence' | 'now'>
+): CodexChildWorkSink {
+  return {
+    deliver: (evidence) => deps.onChildWorkEvidence?.(sessionId, evidence),
+    now: () => deps.now?.() ?? Date.now()
+  }
+}
+
 /** Projects the same child execution facts the durable roster consumes. */
 export class CodexBackgroundTaskTracker {
   private publishedFingerprint = '[]'
   private publishedState: AgentSessionBackgroundTaskState | null = null
   private readonly commands: CodexBackgroundCommandTracker
+  private readonly childWork: CodexChildWorkEvidence
 
   constructor(
     private readonly primaryThreadId: string,
-    private readonly executions = new CodexSubagentExecutions()
+    private readonly executions = new CodexSubagentExecutions(),
+    private readonly childWorkSink?: CodexChildWorkSink
   ) {
     this.commands = new CodexBackgroundCommandTracker(primaryThreadId)
+    this.childWork = new CodexChildWorkEvidence(primaryThreadId, executions, (threadId) =>
+      this.commands.threadTasks(threadId)
+    )
   }
 
   get state(): AgentSessionBackgroundTaskState | null {
@@ -32,20 +57,38 @@ export class CodexBackgroundTaskTracker {
     return this.commands.canObserve(event)
   }
 
-  observe(event: CodexBackgroundTaskEvent): boolean {
+  /** `unapproved`: commands whose approval the journal dropped with this frame's turn ending. */
+  observe(
+    event: CodexBackgroundTaskEvent,
+    unapproved: readonly CodexAbandonedCommand[] = []
+  ): boolean {
     const itemEvent = event.method === 'item/started' || event.method === 'item/completed'
-    if (itemEvent) {
-      this.commands.observe(event)
-    }
+    const command = itemEvent ? this.commands.observe(event) : null
+    const commands = [
+      ...unapproved.flatMap((abandoned) => this.commands.endUnapproved(abandoned) ?? []),
+      ...(event.method === 'thread/closed'
+        ? this.commands.endThread(event.threadId)
+        : command
+          ? [command]
+          : [])
+    ]
     const frame = readCodexBackgroundTaskFrame(event, this.primaryThreadId)
-    if (!frame) {
-      return itemEvent ? this.refresh() : false
-    }
-    if (frame.kind === 'subagent') {
-      this.executions.register(frame.agentThreadId, frame.label, frame.parentTurnId)
-    } else if (frame.threadId !== this.primaryThreadId) {
+    if (frame?.kind === 'subagent') {
+      this.executions.register(
+        frame.agentThreadId,
+        frame.label,
+        frame.parentTurnId,
+        frame.spawnerThreadId
+      )
+    } else if (frame?.kind === 'thread-closed') {
+      this.executions.closeThread(frame.threadId)
+    } else if (frame && frame.threadId !== this.primaryThreadId) {
       this.executions.observeTurn(frame.threadId, frame.turnId, frame.state)
     }
+    this.childWork.observe(event, frame, commands)
+    if (!frame) {
+      return itemEvent || commands.length > 0 ? this.refresh() : false
+    }
     // A primary-turn frame only prompts a republish: turn end reveals children,
     // it never settles them. Codex `spawn_agent` children keep reporting well
     // past their parent turn, so nothing here may sweep the roster.
@@ -54,10 +97,25 @@ export class CodexBackgroundTaskTracker {
 
   clear(): boolean {
     this.executions.clear()
-    this.commands.clear()
+    this.childWork.clear(this.commands.clear())
     return this.refresh()
   }
 
+  /** Everything the frames observed since the last drain said about the session's child work. */
+  drainChildWorkEvidence(observedAt: number): AgentChildWorkEvidence[] {
+    return this.childWork.drain(observedAt)
+  }
+
+  /** Hand the pending evidence to the host. Callers run this after the journal wrote the frame
+   *  and the parent's own row republished, so a child record never lands ahead of either. */
+  publishChildWork(): void {
+    // Drained even with no sink, so undelivered evidence never accumulates.
+    const evidence = this.drainChildWorkEvidence(this.childWorkSink?.now() ?? Date.now())
+    if (evidence.length > 0) {
+      this.childWorkSink?.deliver(evidence)
+    }
+  }
+
   private tasks(): AgentSessionBackgroundTask[] {
     const children = this.executions.workingChildren()
     const agents: AgentSessionBackgroundTask[] = children.map((child, index) => ({
diff --git a/src/main/codex/codex-child-work-evidence.test.ts b/src/main/codex/codex-child-work-evidence.test.ts
new file mode 100644
index 000000000000..5b1b1bc29b4f
--- /dev/null
+++ b/src/main/codex/codex-child-work-evidence.test.ts
@@ -0,0 +1,617 @@
+import { describe, expect, it } from 'vitest'
+import { createAgentChildWorkAdmission } from '../../shared/agent-status-child-work-admission'
+import type { AgentChildWorkRecord } from '../../shared/agent-status-child-work'
+import type { AgentChildWorkEvidence } from '../../shared/agent-status-child-work-evidence'
+import { reconcileAgentChildWorkEvidence } from '../../shared/agent-status-child-work-reconciliation'
+import {
+  agentChildWorkOwnedLiveness,
+  deriveAgentChildDisplayState
+} from '../../shared/agent-status-child-work-display'
+import { projectAgentChildWorkViews } from '../../shared/agent-status-child-work-view'
+import { createAgentStatusStore } from '../../shared/agent-status-store'
+import { makeStructuredAgentStatusSubject } from '../../shared/agent-status-subject'
+import type { CodexBackgroundTaskEvent } from './codex-background-task-frames'
+import { CodexBackgroundTaskTracker } from './codex-background-task-tracker'
+
+const PRIMARY = 'thread-parent'
+const PARENT_TURN = 'turn-parent'
+const CHILD = 'thread-child'
+const parent = makeStructuredAgentStatusSubject(
+  {
+    executionHostId: 'local',
+    wslDistro: null,
+    workspaceId: 'workspace-1',
+    workspaceKind: 'folder'
+  },
+  'session-1'
+)
+
+function turn(
+  method: 'turn/started' | 'turn/completed',
+  threadId: string,
+  turnId: string,
+  status = 'completed'
+): CodexBackgroundTaskEvent {
+  return { method, threadId, params: { threadId, turn: { id: turnId, status } } }
+}
+
+function spawned(
+  child = CHILD,
+  reporter = PRIMARY,
+  name = 'audit_build'
+): CodexBackgroundTaskEvent {
+  return {
+    method: 'item/started',
+    threadId: reporter,
+    params: {
+      threadId: reporter,
+      turnId: PARENT_TURN,
+      item: {
+        type: 'subAgentActivity',
+        id: `activity-${child}`,
+        kind: 'started',
+        agentThreadId: child,
+        agentPath: `/root/${name}`
+      }
+    }
+  }
+}
+
+function item(
+  method: 'item/started' | 'item/completed',
+  threadId: string,
+  turnId: string,
+  fields: Record<string, unknown>
+): CodexBackgroundTaskEvent {
+  return { method, threadId, params: { threadId, turnId, item: fields } }
+}
+
+function shell(id: string, command: string, status = 'inProgress', source = 'agent') {
+  return { type: 'commandExecution', id, command, source, status }
+}
+
+function harness() {
+  const tracker = new CodexBackgroundTaskTracker(PRIMARY)
+  const store = createAgentStatusStore({ epoch: 'epoch-1', mode: 'authority' })
+  expect(store.applyMutation({ parent: { subject: parent } })).not.toBeNull()
+  let minted = 0
+  const admission = createAgentChildWorkAdmission(store, {
+    mintChildWorkId: () => `child-${++minted}`
+  })
+  let clock = 1_000
+  const log: AgentChildWorkEvidence[][] = []
+  const send = (...events: CodexBackgroundTaskEvent[]): void => {
+    for (const event of events) {
+      tracker.observe(event)
+      clock += 10
+      const evidence = tracker.drainChildWorkEvidence(clock)
+      log.push(evidence)
+      reconcileAgentChildWorkEvidence({ store, admission, parent, provider: 'codex', evidence })
+    }
+  }
+  const records = (): AgentChildWorkRecord[] => store.getChildren(parent)
+  const byKind = (kind: AgentChildWorkRecord['kind']) =>
+    records().filter((record) => record.kind === kind)
+  const display = (childWorkId: string) => {
+    const children = records()
+    const views = projectAgentChildWorkViews(
+      children,
+      children.flatMap((child) => store.getAliasesForChild(child.childWorkId))
+    )
+    const view = views.find((candidate) => candidate.id === childWorkId)
+    return view && deriveAgentChildDisplayState(view, agentChildWorkOwnedLiveness(views, view.id))
+  }
+  return { tracker, store, send, records, byKind, display, log }
+}
+
+/** A child spawned by the parent turn and running its first turn. */
+function runningChild() {
+  const run = harness()
+  run.send(turn('turn/started', PRIMARY, PARENT_TURN), spawned(), turn('turn/started', CHILD, 'c1'))
+  return run
+}
+
+describe('Codex child-work evidence', () => {
+  it('records a spawned child by its thread, with its turn as the run', () => {
+    const { records, store, log, send } = runningChild()
+    // Codex delivers the announcement a second time, on `item/completed`.
+    send({ ...spawned(), method: 'item/completed' })
+    expect(records()).toEqual([
+      expect.objectContaining({
+        kind: 'agent',
+        membership: 'live',
+        state: 'working',
+        residency: 'background',
+        description: 'audit_build',
+        invocation: { invocationId: 'c1', generation: 1 },
+        stoppable: false
+      })
+    ])
+    const aliases = store.getAliasesForChild(records()[0]!.childWorkId)
+    expect(aliases.map(({ aliasKind, alias }) => [aliasKind, alias])).toEqual([
+      ['thread_id', CHILD],
+      ['turn_id', 'c1']
+    ])
+    // The host hears the child once.
+    expect(log.flat().filter((edge) => edge.type === 'live')).toHaveLength(1)
+  })
+
+  it('makes no record for a child whose turn began before its announcement, until it lands', () => {
+    const { send, records } = harness()
+    send(turn('turn/started', PRIMARY, PARENT_TURN), turn('turn/started', CHILD, 'c1'))
+    expect(records()).toEqual([])
+    send(spawned())
+    expect(records()).toEqual([expect.objectContaining({ membership: 'live', state: 'working' })])
+  })
+
+  it.each([
+    ['completed', 'succeeded'],
+    ['interrupted', 'cancelled'],
+    ['failed', 'failed'],
+    ['somethingNew', 'unknown']
+  ])('settles a child whose own turn ended %s as %s', (status, outcome) => {
+    const { send, tracker, records } = runningChild()
+    send(turn('turn/completed', CHILD, 'c1', status))
+    expect(records()).toEqual([
+      expect.objectContaining({ membership: 'settled', state: 'done', outcome })
+    ])
+    // Today's strip drops the child the moment its turn ends; only the record keeps its ending.
+    expect(tracker.state).toBeNull()
+  })
+
+  const childError = (turnId: string, willRetry: boolean): CodexBackgroundTaskEvent => ({
+    method: 'error',
+    threadId: CHILD,
+    params: { threadId: CHILD, turnId, willRetry, error: { message: 'boom' } }
+  })
+  const childClosed: CodexBackgroundTaskEvent = {
+    method: 'thread/closed',
+    threadId: CHILD,
+    params: { threadId: CHILD }
+  }
+
+  it('keeps a child working through an error Codex will not retry, and settles it on the failed turn/completed that follows', () => {
+    const { send, tracker, records } = runningChild()
+    send(childError('c1', false))
+    expect(records()).toEqual([expect.objectContaining({ membership: 'live' })])
+    expect(tracker.state?.tasks).toHaveLength(1)
+    send(turn('turn/completed', CHILD, 'c1', 'failed'))
+    expect(records()).toEqual([
+      expect.objectContaining({ membership: 'settled', state: 'done', outcome: 'failed' })
+    ])
+    expect(tracker.state).toBeNull()
+  })
+
+  it('settles a working child whose thread closed with no turn/completed, in the strip and the record together', () => {
+    const { send, tracker, records } = runningChild()
+    expect(tracker.state?.tasks).toHaveLength(1)
+    send(childClosed)
+    expect(records()).toEqual([
+      expect.objectContaining({ membership: 'settled', state: 'done', outcome: 'unknown' })
+    ])
+    expect(tracker.state).toBeNull()
+    // The first ending a turn gets stands.
+    send(turn('turn/completed', CHILD, 'c1', 'completed'))
+    expect(records()).toEqual([expect.objectContaining({ outcome: 'unknown' })])
+  })
+
+  it('keeps a child working through a retried error and a systemError status: its turn runs on', () => {
+    const { send, tracker, records } = runningChild()
+    send(childError('c1', true), {
+      method: 'thread/status/changed',
+      threadId: CHILD,
+      params: { threadId: CHILD, status: { type: 'systemError' } }
+    })
+    expect(records()).toEqual([expect.objectContaining({ membership: 'live', state: 'working' })])
+    expect(tracker.state?.tasks).toHaveLength(1)
+  })
+
+  it('never settles a child on its PARENT turn ending: children outlive the turn', () => {
+    const { send, records } = runningChild()
+    send(turn('turn/completed', PRIMARY, PARENT_TURN))
+    expect(records()).toEqual([expect.objectContaining({ membership: 'live', state: 'working' })])
+  })
+
+  it('reopens the same record for a follow-up turn on a finished child, as a new run', () => {
+    const { send, records } = runningChild()
+    send(turn('turn/completed', CHILD, 'c1'))
+    const [finished] = records()
+    send(turn('turn/started', CHILD, 'c2'))
+    expect(records()).toEqual([
+      expect.objectContaining({
+        childWorkId: finished!.childWorkId,
+        membership: 'live',
+        state: 'working',
+        invocation: { invocationId: 'c2', generation: 2 },
+        previousInvocations: [
+          expect.objectContaining({
+            fence: { invocationId: 'c1', generation: 1 },
+            outcome: 'succeeded'
+          })
+        ]
+      })
+    ])
+    // A late ending of the first run neither ends nor restarts the second.
+    send(turn('turn/completed', CHILD, 'c1', 'failed'))
+    expect(records()).toEqual([
+      expect.objectContaining({
+        membership: 'live',
+        invocation: { invocationId: 'c2', generation: 2 }
+      })
+    ])
+    send(turn('turn/completed', CHILD, 'c2', 'interrupted'))
+    expect(records()).toEqual([
+      expect.objectContaining({
+        childWorkId: finished!.childWorkId,
+        membership: 'settled',
+        outcome: 'cancelled'
+      })
+    ])
+  })
+
+  it('says which tool the child has open, the way a CLI row names a Codex shell', () => {
+    const { send, byKind } = runningChild()
+    send(item('item/started', CHILD, 'c1', shell('cmd-1', 'npm test')))
+    expect(byKind('agent')[0]?.operation).toEqual({
+      toolName: 'Bash',
+      input: 'npm test',
+      basis: 'open',
+      observedAt: 1_040
+    })
+    send(
+      item('item/started', CHILD, 'c1', {
+        type: 'mcpToolCall',
+        id: 'mcp-1',
+        server: 'github',
+        tool: 'search_issues',
+        arguments: { query: 'flaky' },
+        status: 'inProgress'
+      })
+    )
+    expect(byKind('agent')[0]?.operation).toMatchObject({
+      toolName: 'mcp__github__search_issues',
+      input: 'flaky'
+    })
+    // The newer call ends first: the child is still running the older one, since it opened.
+    send(
+      item('item/completed', CHILD, 'c1', { type: 'mcpToolCall', id: 'mcp-1', status: 'completed' })
+    )
+    expect(byKind('agent')[0]?.operation).toEqual({
+      toolName: 'Bash',
+      input: 'npm test',
+      basis: 'open',
+      observedAt: 1_040
+    })
+    send(item('item/completed', CHILD, 'c1', shell('cmd-1', 'npm test', 'completed')))
+    expect(byKind('agent')[0]?.operation).toBeUndefined()
+  })
+
+  it('names a unified-exec shell as the open call until its process exits', () => {
+    const { send, byKind } = runningChild()
+    // Codex runs every agent shell through unified exec, not only the ones that outlive a turn.
+    send(
+      item(
+        'item/started',
+        CHILD,
+        'c1',
+        shell('exec-1', 'npm test', 'inProgress', 'unifiedExecStartup')
+      )
+    )
+    expect(byKind('agent')[0]?.operation).toMatchObject({ toolName: 'Bash', input: 'npm test' })
+    send(
+      item(
+        'item/completed',
+        CHILD,
+        'c1',
+        shell('exec-1', 'npm test', 'completed', 'unifiedExecStartup')
+      )
+    )
+    expect(byKind('agent')[0]?.operation).toBeUndefined()
+    // An approved command starts on the approval path and completes from unified exec.
+    send(item('item/started', CHILD, 'c1', shell('exec-2', 'touch ~/marker')))
+    expect(byKind('agent')[0]?.operation).toMatchObject({
+      toolName: 'Bash',
+      input: 'touch ~/marker'
+    })
+    send(
+      item(
+        'item/completed',
+        CHILD,
+        'c1',
+        shell('exec-2', 'touch ~/marker', 'completed', 'unifiedExecStartup')
+      )
+    )
+    expect(byKind('agent')[0]?.operation).toBeUndefined()
+  })
+
+  it("never carries a run's open call into the next run when its ending was lost", () => {
+    const { send, byKind } = runningChild()
+    send(item('item/started', CHILD, 'c1', shell('cmd-1', 'npm test')))
+    send(turn('turn/started', CHILD, 'c2'))
+    expect(byKind('agent')[0]).toMatchObject({ invocation: { invocationId: 'c2', generation: 2 } })
+    expect(byKind('agent')[0]?.operation).toBeUndefined()
+  })
+
+  it('keeps what the child said last, and its usage, through to how it ended', () => {
+    const { send, byKind } = runningChild()
+    send(
+      item('item/completed', CHILD, 'c1', {
+        type: 'agentMessage',
+        id: 'msg-1',
+        text: 'Two tests\nflake on CI'
+      }),
+      {
+        method: 'thread/tokenUsage/updated',
+        threadId: CHILD,
+        params: { threadId: CHILD, tokenUsage: { total: { totalTokens: 4_200 } } }
+      }
+    )
+    expect(byKind('agent')[0]).toMatchObject({
+      lastMessage: 'Two tests flake on CI',
+      totalTokens: 4_200
+    })
+    send(turn('turn/completed', CHILD, 'c1'))
+    expect(byKind('agent')[0]).toMatchObject({
+      membership: 'settled',
+      outcome: 'succeeded',
+      lastMessage: 'Two tests flake on CI',
+      totalTokens: 4_200
+    })
+    // A new run has said nothing yet.
+    send(turn('turn/started', CHILD, 'c2'))
+    expect(byKind('agent')[0]).not.toHaveProperty('lastMessage')
+  })
+
+  it('files a message whose frame names no turn under the run that said it, never the next', () => {
+    const { send, byKind } = runningChild()
+    send({
+      method: 'item/completed',
+      threadId: CHILD,
+      params: { threadId: CHILD, item: { type: 'agentMessage', id: 'msg-1', text: 'Done' } }
+    })
+    expect(byKind('agent')[0]?.lastMessage).toBe('Done')
+    send(turn('turn/completed', CHILD, 'c1'), turn('turn/started', CHILD, 'c2'))
+    send(turn('turn/completed', CHILD, 'c2'))
+    expect(byKind('agent')[0]).toMatchObject({ outcome: 'succeeded' })
+    expect(byKind('agent')[0]).not.toHaveProperty('lastMessage')
+  })
+
+  it('reads a child waiting on the user from its own thread status', () => {
+    const { send, byKind } = runningChild()
+    const status = (status: unknown): CodexBackgroundTaskEvent => ({
+      method: 'thread/status/changed',
+      threadId: CHILD,
+      params: { threadId: CHILD, status }
+    })
+    send(status({ type: 'active', activeFlags: ['waitingOnApproval'] }))
+    expect(byKind('agent')[0]?.state).toBe('waiting')
+    send(status({ type: 'active', activeFlags: [] }))
+    expect(byKind('agent')[0]?.state).toBe('working')
+    send(status({ type: 'active', activeFlags: ['waitingOnUserInput'] }))
+    send(turn('turn/completed', CHILD, 'c1'))
+    send(turn('turn/started', CHILD, 'c2'))
+    // The wait ended with the turn that asked.
+    expect(byKind('agent')[0]?.state).toBe('working')
+  })
+
+  it('records a command from its start until its process exits, then removes it', () => {
+    const { send, byKind, display } = runningChild()
+    send(
+      item(
+        'item/started',
+        CHILD,
+        'c1',
+        shell('exec-1', 'npm run dev', 'inProgress', 'unifiedExecStartup')
+      )
+    )
+    const [agent] = byKind('agent')
+    // While the child's turn runs, the command is also the tool it has open.
+    expect(agent?.operation).toMatchObject({ toolName: 'Bash', input: 'npm run dev' })
+    expect(byKind('command')).toEqual([
+      expect.objectContaining({
+        membership: 'live',
+        description: 'npm run dev',
+        residency: 'background',
+        parentChildWorkId: agent!.childWorkId,
+        firstObservedAt: 1_040
+      })
+    ])
+    send(turn('turn/completed', CHILD, 'c1'))
+    expect(byKind('agent')[0]).toMatchObject({ membership: 'settled', outcome: 'succeeded' })
+    expect(byKind('command')).toEqual([expect.objectContaining({ membership: 'live' })])
+    expect(display(agent!.childWorkId)).toBe('monitoring')
+    send(
+      item('item/completed', CHILD, 'c1', {
+        ...shell('exec-1', 'npm run dev', 'completed', 'unifiedExecStartup'),
+        exitCode: 1
+      })
+    )
+    expect(byKind('command')).toEqual([])
+    expect(display(agent!.childWorkId)).toBe('done')
+  })
+
+  it('records an approved command while it runs, whatever source Codex starts it with', () => {
+    const { send, tracker, byKind, display } = runningChild()
+    // The approval path starts the item as `agent`; unified exec reports its exit.
+    send(item('item/started', CHILD, 'c1', shell('exec-2', 'npm run dev')))
+    const [agent] = byKind('agent')
+    expect(byKind('command')).toEqual([
+      expect.objectContaining({ membership: 'live', parentChildWorkId: agent!.childWorkId })
+    ])
+    send(turn('turn/completed', CHILD, 'c1'))
+    expect(display(agent!.childWorkId)).toBe('monitoring')
+    expect(tracker.state?.tasks).toEqual([expect.objectContaining({ kind: 'command' })])
+    send(
+      item(
+        'item/completed',
+        CHILD,
+        'c1',
+        shell('exec-2', 'npm run dev', 'completed', 'unifiedExecStartup')
+      )
+    )
+    expect(byKind('command')).toEqual([])
+    expect(display(agent!.childWorkId)).toBe('done')
+    expect(tracker.state).toBeNull()
+  })
+
+  it("removes a closed thread's running commands: Codex stops them and never reports their exit", () => {
+    const { send, tracker, byKind, display } = runningChild()
+    send(
+      item(
+        'item/started',
+        CHILD,
+        'c1',
+        shell('exec-1', 'npm run dev', 'inProgress', 'unifiedExecStartup')
+      ),
+      turn('turn/completed', CHILD, 'c1'),
+      turn('turn/completed', PRIMARY, PARENT_TURN)
+    )
+    const [agent] = byKind('agent')
+    expect(display(agent!.childWorkId)).toBe('monitoring')
+    send({ method: 'thread/closed', threadId: CHILD, params: { threadId: CHILD } })
+    expect(byKind('command')).toEqual([])
+    expect(display(agent!.childWorkId)).toBe('done')
+    expect(tracker.state).toBeNull()
+    // The exit Codex could not deliver starts nothing if it ever arrives.
+    send(
+      item(
+        'item/completed',
+        CHILD,
+        'c1',
+        shell('exec-1', 'npm run dev', 'completed', 'unifiedExecStartup')
+      )
+    )
+    expect(byKind('command')).toEqual([])
+  })
+
+  it("names the owner of a command launched before the host held its child's record", () => {
+    const { send, byKind } = harness()
+    send(
+      turn('turn/started', PRIMARY, PARENT_TURN),
+      turn('turn/started', CHILD, 'c1'),
+      item(
+        'item/started',
+        CHILD,
+        'c1',
+        shell('exec-1', 'tail -f log', 'inProgress', 'unifiedExecStartup')
+      )
+    )
+    expect(byKind('command')).toEqual([
+      expect.not.objectContaining({ parentChildWorkId: expect.anything() })
+    ])
+    send(spawned())
+    expect(byKind('command')).toEqual([
+      expect.objectContaining({
+        description: 'tail -f log',
+        parentChildWorkId: byKind('agent')[0]?.childWorkId
+      })
+    ])
+  })
+
+  it("records the session's own command with no owner from its start", () => {
+    const { send, byKind } = harness()
+    send(
+      turn('turn/started', PRIMARY, PARENT_TURN),
+      item(
+        'item/started',
+        PRIMARY,
+        PARENT_TURN,
+        shell('exec-9', 'sleep 90', 'inProgress', 'unifiedExecStartup')
+      )
+    )
+    expect(byKind('command')).toEqual([
+      expect.objectContaining({ membership: 'live', description: 'sleep 90' })
+    ])
+    expect(byKind('command')[0]).not.toHaveProperty('parentChildWorkId')
+    send(turn('turn/completed', PRIMARY, PARENT_TURN))
+    expect(byKind('command')).toEqual([expect.objectContaining({ membership: 'live' })])
+  })
+
+  it('leaves no record behind a finished shell, so none displaces a finished child', () => {
+    const { send, byKind, records, log } = runningChild()
+    send(turn('turn/completed', CHILD, 'c1'))
+    const before = log.length
+    // Codex runs every shell, however short, the way it runs one left running.
+    for (let index = 0; index < 40; index += 1) {
+      const id = `exec-${index}`
+      send(
+        item('item/started', PRIMARY, PARENT_TURN, {
+          ...shell(id, 'rg foo', 'inProgress', 'unifiedExecStartup'),
+          durationMs: 0
+        })
+      )
+      expect(byKind('command')).toEqual([expect.objectContaining({ description: 'rg foo' })])
+      send(
+        item('item/completed', PRIMARY, PARENT_TURN, {
+          ...shell(id, 'rg foo', 'completed', 'unifiedExecStartup'),
+          exitCode: 0
+        })
+      )
+      expect(byKind('command')).toEqual([])
+    }
+    send(turn('turn/completed', PRIMARY, PARENT_TURN))
+    expect(records()).toEqual([
+      expect.objectContaining({ kind: 'agent', membership: 'settled', outcome: 'succeeded' })
+    ])
+    // One edge when each shell starts and one when it exits, as the strip republishes today.
+    expect(
+      log
+        .slice(before)
+        .flat()
+        .map((edge) => edge.type)
+    ).toEqual(Array.from({ length: 40 }, () => ['live', 'removed']).flat())
+  })
+
+  it('names the child that spawned a nested child as its owner', () => {
+    const { send, byKind } = runningChild()
+    send(
+      spawned('thread-grandchild', CHILD, 'lint'),
+      turn('turn/started', 'thread-grandchild', 'g1')
+    )
+    const nested = byKind('agent').find((record) => record.description === 'lint')
+    const owner = byKind('agent').find((record) => record.description === 'audit_build')
+    expect(nested?.parentChildWorkId).toBe(owner?.childWorkId)
+  })
+
+  it('holds no evidence for a session with nowhere to deliver it', () => {
+    const tracker = new CodexBackgroundTaskTracker(PRIMARY)
+    tracker.observe(spawned())
+    tracker.observe(turn('turn/started', CHILD, 'c1'))
+    tracker.publishChildWork()
+    expect(tracker.drainChildWorkEvidence(1)).toEqual([])
+  })
+
+  it('settles every live child with no reported outcome, and removes every command, when the provider session ends', () => {
+    const { send, tracker, records, store } = runningChild()
+    send(
+      item(
+        'item/started',
+        PRIMARY,
+        PARENT_TURN,
+        shell('exec-1', 'npm run dev', 'inProgress', 'unifiedExecStartup')
+      ),
+      turn('turn/completed', PRIMARY, PARENT_TURN)
+    )
+    expect(records()).toHaveLength(2)
+    tracker.clear()
+    const evidence = tracker.drainChildWorkEvidence(9_000)
+    expect(evidence).toEqual([
+      {
+        type: 'removed',
+        observedAt: 9_000,
+        handle: { idKind: 'task_id', id: 'codex-command:primary:exec-1' }
+      },
+      { type: 'session-ended', observedAt: 9_000 }
+    ])
+    reconcileAgentChildWorkEvidence({
+      store,
+      admission: createAgentChildWorkAdmission(store, { mintChildWorkId: () => 'unused' }),
+      parent,
+      provider: 'codex',
+      evidence
+    })
+    expect(records()).toEqual([
+      expect.objectContaining({ kind: 'agent', membership: 'settled', outcome: 'unknown' })
+    ])
+  })
+})
diff --git a/src/main/codex/codex-child-work-evidence.ts b/src/main/codex/codex-child-work-evidence.ts
new file mode 100644
index 000000000000..93bda7a54a1f
--- /dev/null
+++ b/src/main/codex/codex-child-work-evidence.ts
@@ -0,0 +1,312 @@
+// Codex child threads, and the commands they leave running, decoded into child-work evidence for
+// the host's records.
+//
+// The background-task tracker already follows which child exists, which turn it runs and how that
+// turn ended (the executions), and which command process is still running (the command tracker).
+// A command is a record from its process start until it stops, and then its record goes: the
+// tracker says when, and this module only mirrors it. This module keeps what only the records
+// read — the tool a child has open, what it said last, its usage, whether it waits on the user —
+// and after each frame re-derives the whole observation of the child that frame was about. Edges
+// are stamped with the host clock when drained, after the journal handled the frame, so the host
+// never holds a record ahead of the frame's own rows. A parent turn ending is never evidence here:
+// Codex children outlive the turn that spawned them, so only a child's own turn, or the session,
+// ends it.
+
+import type { AgentSessionBackgroundTask } from '../../shared/agent-session-wire'
+import type {
+  AgentChildWorkEvidence,
+  AgentChildWorkLiveObservation
+} from '../../shared/agent-status-child-work-evidence'
+import type { CodexBackgroundCommandChange } from './codex-background-command-tracker'
+import type {
+  CodexBackgroundTaskEvent,
+  CodexBackgroundTaskFrame
+} from './codex-background-task-frames'
+import {
+  codexChildMessageText,
+  codexChildToolCall,
+  codexChildTurnOutcome,
+  codexToolCallEnded,
+  type CodexChildToolCall
+} from './codex-child-work-translation'
+import { readRecord } from './codex-item-field-readers'
+import { readCodexThreadItem } from './codex-structured-item-translation'
+import { codexThreadWaitsOnUser, readCodexTurnId } from './codex-structured-thread-facts'
+import { CODEX_TOKEN_USAGE_METHOD, readCodexThreadTokenTotal } from './codex-subagent-activity'
+import type { CodexExecutionChild, CodexSubagentExecutions } from './codex-subagent-executions'
+
+/** The executions' own child bound. */
+const MAX_CHILD_FACTS = 128
+const MAX_OPEN_CALLS_PER_CHILD = 16
+const CHILD_FRAME_METHODS: ReadonlySet<string> = new Set([
+  'item/started',
+  'item/completed',
+  'thread/status/changed',
+  CODEX_TOKEN_USAGE_METHOD
+])
+
+/** A tool call a child has started and not finished. `openedAt` is the host clock of the first
+ *  drain that carried it, so a later edge keeps the time the call opened. */
+type OpenCall = CodexChildToolCall & { turnId: string | null; openedAt?: number }
+
+type ChildFacts = {
+  openCalls: Map<string, OpenCall>
+  lastMessage?: { turnId: string | null; text: string }
+  totalTokens?: number
+  waiting: boolean
+  /** The last observation handed to the host, so an unchanged re-derivation sends nothing. */
+  published?: string
+}
+
+export type CodexPendingChildWork = (observedAt: number) => AgentChildWorkEvidence
+
+/** Evidence from a run only counts for that run: a fact recorded under another turn is stale. */
+function ofTurn<T extends { turnId: string | null }>(fact: T | undefined, turnId: string) {
+  return fact?.turnId === turnId ? fact : undefined
+}
+
+function commandLive(task: AgentSessionBackgroundTask, ownerId: string | null) {
+  return (observedAt: number): AgentChildWorkEvidence => ({
+    type: 'live',
+    observedAt,
+    child: {
+      handle: { idKind: 'task_id', id: task.id },
+      kind: 'command',
+      // Its own process, not a turn's: no turn ending may settle it.
+      residency: 'background',
+      state: 'working',
+      ...(task.description ? { description: task.description } : {}),
+      ...(ownerId !== null ? { ownerId } : {}),
+      stoppable: false
+    }
+  })
+}
+
+export class CodexChildWorkEvidence {
+  private readonly facts = new Map<string, ChildFacts>()
+  private pending: CodexPendingChildWork[] = []
+
+  constructor(
+    private readonly primaryThreadId: string,
+    private readonly executions: CodexSubagentExecutions,
+    private readonly liveCommands: (threadId: string) => readonly AgentSessionBackgroundTask[]
+  ) {}
+
+  /** After the tracker applied the frame: which command processes it saw start or stop, and the
+   *  child the frame is about. */
+  observe(
+    event: CodexBackgroundTaskEvent,
+    frame: CodexBackgroundTaskFrame | null,
+    commands: readonly CodexBackgroundCommandChange[]
+  ): void {
+    this.queueCommands(commands)
+    const threadId = this.childThread(event, frame)
+    if (threadId === null) {
+      return
+    }
+    const facts = this.factsFor(threadId)
+    if (facts && event.threadId === threadId) {
+      this.record(facts, event)
+    }
+    this.queueChild(threadId)
+  }
+
+  /** The provider session is gone, with the commands it ended: no child it still ran can report
+   *  its own ending. */
+  clear(commands: readonly CodexBackgroundCommandChange[]): void {
+    this.facts.clear()
+    this.queueCommands(commands)
+    this.pending.push((observedAt) => ({ type: 'session-ended', observedAt }))
+  }
+
+  drain(observedAt: number): AgentChildWorkEvidence[] {
+    const pending = this.pending
+    this.pending = []
+    return pending.map((edge) => edge(observedAt))
+  }
+
+  private childThread(
+    event: CodexBackgroundTaskEvent,
+    frame: CodexBackgroundTaskFrame | null
+  ): string | null {
+    const threadId =
+      frame?.kind === 'subagent'
+        ? frame.agentThreadId
+        : frame || CHILD_FRAME_METHODS.has(event.method)
+          ? event.threadId
+          : null
+    return threadId === this.primaryThreadId ? null : threadId
+  }
+
+  /** A command belongs to the child thread that launched it; the session's own agent is no owner.
+   *  A stopped command leaves no record: it has nothing left to report. */
+  private queueCommands(commands: readonly CodexBackgroundCommandChange[]): void {
+    for (const command of commands) {
+      if (command.type === 'started') {
+        const ownerId = command.threadId === this.primaryThreadId ? null : command.threadId
+        this.pending.push(commandLive(command.task, ownerId))
+        continue
+      }
+      const { taskId } = command
+      this.pending.push((observedAt) => ({
+        type: 'removed',
+        observedAt,
+        handle: { idKind: 'task_id', id: taskId }
+      }))
+    }
+  }
+
+  private record(facts: ChildFacts, event: CodexBackgroundTaskEvent): void {
+    if (event.method === CODEX_TOKEN_USAGE_METHOD) {
+      facts.totalTokens = readCodexThreadTokenTotal(event.params)?.totalTokens ?? facts.totalTokens
+      return
+    }
+    if (event.method === 'thread/status/changed') {
+      facts.waiting = codexThreadWaitsOnUser(event.params)
+      return
+    }
+    // Every Codex agent shell is unified exec: it is the open call until its process exits.
+    const item = readCodexThreadItem(readRecord(event.params).item)
+    if (!item) {
+      return
+    }
+    // A frame that names no turn belongs to the one the child is running.
+    const turnId =
+      readCodexTurnId(event.params) ??
+      this.executions.find(event.threadId)?.execution?.turnId ??
+      null
+    const text = event.method === 'item/completed' ? codexChildMessageText(item) : undefined
+    if (text) {
+      facts.lastMessage = { turnId, text }
+    }
+    // An end closes the call by id alone: its closing frame need not restate what it ran.
+    if (codexToolCallEnded(event.method, item)) {
+      facts.openCalls.delete(item.id)
+      return
+    }
+    const call = codexChildToolCall(item)
+    if (call && !facts.openCalls.has(item.id)) {
+      facts.openCalls.set(item.id, { ...call, turnId })
+      for (const stale of [...facts.openCalls.keys()].slice(0, -MAX_OPEN_CALLS_PER_CHILD)) {
+        facts.openCalls.delete(stale)
+      }
+    }
+  }
+
+  /** Re-derive the child's observation and hand it on when it changed. A child the provider has
+   *  not announced, or that never ran a turn, is no record. */
+  private queueChild(threadId: string): void {
+    const child = this.executions.find(threadId)
+    const facts = this.facts.get(threadId)
+    if (!child?.registered || !child.execution || !facts) {
+      return
+    }
+    const { turnId, state } = child.execution
+    if (state !== 'working') {
+      // The turn is over, and so is every call it had open.
+      facts.openCalls.clear()
+      facts.waiting = false
+      const lastMessage = ofTurn(facts.lastMessage, turnId)?.text
+      const { totalTokens } = facts
+      const outcome = codexChildTurnOutcome(state)
+      this.publish(facts, JSON.stringify(['ended', turnId, state]), (observedAt) => ({
+        type: 'ended',
+        observedAt,
+        handle: { idKind: 'thread_id', id: threadId, runId: turnId },
+        outcome,
+        ...(lastMessage ? { lastMessage } : {}),
+        ...(totalTokens !== undefined ? { totalTokens } : {})
+      }))
+      return
+    }
+    for (const [itemId, call] of facts.openCalls) {
+      if (!ofTurn(call, turnId)) {
+        facts.openCalls.delete(itemId)
+      }
+    }
+    const observation = this.liveAgent(threadId, child, facts, turnId)
+    const openCall = [...facts.openCalls].at(-1)
+    const announced = facts.published !== undefined
+    this.publish(facts, JSON.stringify(['live', observation, openCall?.[0]]), (observedAt) => {
+      if (!openCall) {
+        return { type: 'live', observedAt, child: { ...observation, operation: null } }
+      }
+      const [, call] = openCall
+      call.openedAt ??= observedAt
+      const operation = {
+        toolName: call.toolName,
+        ...(call.input ? { input: call.input } : {}),
+        basis: 'open' as const,
+        observedAt: call.openedAt
+      }
+      return { type: 'live', observedAt, child: { ...observation, operation } }
+    })
+    if (!announced) {
+      this.requeueOwnedBy(threadId)
+    }
+  }
+
+  private liveAgent(
+    threadId: string,
+    child: Readonly<CodexExecutionChild>,
+    facts: ChildFacts,
+    turnId: string
+  ): AgentChildWorkLiveObservation {
+    const lastMessage = ofTurn(facts.lastMessage, turnId)?.text
+    const spawner = child.spawnerThreadId
+    return {
+      handle: { idKind: 'thread_id', id: threadId, runId: turnId },
+      kind: 'agent',
+      // A spawned child may outlive the turn that spawned it.
+      residency: 'background',
+      state: facts.waiting ? 'waiting' : 'working',
+      // The agent path's last segment is the child's only label; today's row shows it there.
+      ...(child.label ? { description: child.label } : {}),
+      ...(facts.totalTokens !== undefined ? { totalTokens: facts.totalTokens } : {}),
+      ...(lastMessage ? { lastMessage } : {}),
+      ...(spawner && spawner !== this.primaryThreadId ? { ownerId: spawner } : {}),
+      stoppable: false
+    }
+  }
+
+  private publish(facts: ChildFacts, fingerprint: string, edge: CodexPendingChildWork): void {
+    if (facts.published !== fingerprint) {
+      facts.published = fingerprint
+      this.pending.push(edge)
+    }
+  }
+
+  /** Work a child launched before the host held its record was admitted with no owner; now that
+   *  the owner is recorded, say again whose it is. */
+  private requeueOwnedBy(threadId: string): void {
+    for (const task of this.liveCommands(threadId)) {
+      this.pending.push(commandLive(task, threadId))
+    }
+    for (const spawned of this.executions.workingChildren()) {
+      const facts = this.facts.get(spawned.agentThreadId)
+      if (spawned.spawnerThreadId === threadId && facts?.published !== undefined) {
+        facts.published = undefined
+        this.queueChild(spawned.agentThreadId)
+      }
+    }
+  }
+
+  private factsFor(threadId: string): ChildFacts | undefined {
+    const existing = this.facts.get(threadId)
+    if (existing) {
+      return existing
+    }
+    if (this.facts.size >= MAX_CHILD_FACTS) {
+      const idle = [...this.facts.keys()].find(
+        (id) => this.executions.find(id)?.execution?.state !== 'working'
+      )
+      if (idle === undefined) {
+        return undefined
+      }
+      this.facts.delete(idle)
+    }
+    const facts: ChildFacts = { openCalls: new Map(), waiting: false }
+    this.facts.set(threadId, facts)
+    return facts
+  }
+}
diff --git a/src/main/codex/codex-child-work-translation.ts b/src/main/codex/codex-child-work-translation.ts
new file mode 100644
index 000000000000..2763ac53b1c7
--- /dev/null
+++ b/src/main/codex/codex-child-work-translation.ts
@@ -0,0 +1,88 @@
+// Codex items and statuses, read in the child-work vocabulary.
+//
+// A tool is named the way Codex names it to its own hooks (`Bash`, `apply_patch`,
+// `mcp__server__tool`), so a structured Codex child running a shell reads exactly as a Codex
+// CLI agent running one does.
+
+import type { AgentChildWorkOutcome } from '../../shared/agent-status-child-work'
+import type { NativeChatSubagentState } from '../../shared/native-chat-types'
+import {
+  deriveFallbackToolInputPreview,
+  deriveToolInputPreview
+} from '../../shared/agent-hook-listener/tool-input-preview'
+import { readRecord, readString, readTextContent } from './codex-item-field-readers'
+import type { CodexThreadItem } from './codex-structured-item-translation'
+
+/** Raw provider text kept for a record; admission folds it to its own one-line bound. */
+export const CODEX_CHILD_WORK_TEXT_MAX_CHARS = 2_048
+
+export type CodexChildToolCall = { toolName: string; input?: string }
+
+function bounded(text: string | null | undefined): string | undefined {
+  return text ? text.slice(0, CODEX_CHILD_WORK_TEXT_MAX_CHARS) : undefined
+}
+
+function withInput(toolName: string, input: string | undefined): CodexChildToolCall {
+  const preview = bounded(input)
+  return preview ? { toolName, input: preview } : { toolName }
+}
+
+function firstChangePath(changes: unknown): string | undefined {
+  const [first] = Array.isArray(changes) ? changes : []
+  return readString(readRecord(first), 'path') ?? undefined
+}
+
+/** The tool a thread item runs, or null for an item that is not a tool call (a message, a
+ *  thought, a plan). */
+export function codexChildToolCall(item: CodexThreadItem): CodexChildToolCall | null {
+  switch (item.type) {
+    case 'commandExecution':
+      return withInput('Bash', deriveToolInputPreview('Bash', { command: item.command }))
+    case 'fileChange':
+      return withInput('apply_patch', firstChangePath(item.changes))
+    case 'mcpToolCall': {
+      const server = readString(item, 'server')
+      const tool = readString(item, 'tool')
+      if (!tool) {
+        return null
+      }
+      return withInput(
+        server ? `mcp__${server}__${tool}` : tool,
+        deriveFallbackToolInputPreview(item.arguments)
+      )
+    }
+    case 'webSearch':
+      return withInput('web_search', readString(item, 'query') ?? undefined)
+    default:
+      return null
+  }
+}
+
+/** Whether an item frame says the call is over, whatever frame carried it. */
+export function codexToolCallEnded(method: string, item: CodexThreadItem): boolean {
+  const status = readString(item, 'status')
+  return method === 'item/completed' || (status !== null && status !== 'inProgress')
+}
+
+/** What a child said: an assistant message's text. */
+export function codexChildMessageText(item: CodexThreadItem): string | undefined {
+  return item.type === 'agentMessage'
+    ? bounded(readString(item, 'text') ?? readTextContent(item, 'content'))
+    : undefined
+}
+
+/** A child turn's ending. Codex states three; anything else is an ending nobody classified. */
+export function codexChildTurnOutcome(state: NativeChatSubagentState): AgentChildWorkOutcome {
+  switch (state) {
+    case 'completed':
+      return 'succeeded'
+    case 'failed':
+      return 'failed'
+    case 'stopped':
+      return 'cancelled'
+    case 'unverifiable':
+    case 'working':
+    case 'idle':
+      return 'unknown'
+  }
+}
diff --git a/src/main/codex/codex-hook-legacy-cleanup.ts b/src/main/codex/codex-hook-legacy-cleanup.ts
index d2b5c3b586c4..415aabf61553 100644
--- a/src/main/codex/codex-hook-legacy-cleanup.ts
+++ b/src/main/codex/codex-hook-legacy-cleanup.ts
@@ -8,6 +8,10 @@ import {
   writeHooksJson
 } from '../agent-hooks/installer-utils'
 import { resolveHooksJsonWritePath } from '../agent-hooks/hook-config-write-path'
+import {
+  isAgentStatusHooksEnabledForAgent,
+  type AgentStatusHooksSettings
+} from '../../shared/agent-status-hooks-setting'
 import { writeFileAtomically } from '../codex-accounts/fs-utils'
 import { findManagedTomlBlocks } from '../agent-hooks/managed-toml-ownership'
 import { writeConfigAtomically, type CodexTrustEntry } from './config-toml-trust'
@@ -42,6 +46,17 @@ export function setSystemCodexHomeHookSweepSuppressed(gate: () => boolean): void
   systemCodexHomeHookSweepSuppressed = gate
 }
 
+// Why per agent: Codex turned off must re-arm the sweep exactly like the global switch off,
+// or its remove() leaves Orca's entry in the real ~/.codex.
+export function shouldSuppressSystemCodexHomeHookSweep(args: {
+  isHostSystemDefaultRealHome: boolean
+  settings: AgentStatusHooksSettings
+}): boolean {
+  return (
+    args.isHostSystemDefaultRealHome && isAgentStatusHooksEnabledForAgent(args.settings, 'codex')
+  )
+}
+
 function getLegacyCodexProfileTomlPath(): string {
   return join(getSystemCodexHomePath(), `${LEGACY_ORCA_PROFILE_NAME}.config.toml`)
 }
diff --git a/src/main/codex/codex-hook-sweep-per-agent-opt-out.test.ts b/src/main/codex/codex-hook-sweep-per-agent-opt-out.test.ts
new file mode 100644
index 000000000000..780f0dbbf80e
--- /dev/null
+++ b/src/main/codex/codex-hook-sweep-per-agent-opt-out.test.ts
@@ -0,0 +1,132 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import type * as Os from 'node:os'
+import { join } from 'node:path'
+import { wrapPosixHookCommand } from '../agent-hooks/installer-utils'
+import type { GlobalSettings } from '../../shared/global-settings-types'
+import { setupCodexHookHomes } from './hook-service-test-harness'
+
+const { getPathMock, homedirMock } = vi.hoisted(() => ({
+  getPathMock: vi.fn<(name: string) => string>(),
+  homedirMock: vi.fn<() => string>()
+}))
+
+vi.mock('electron', () => ({
+  app: {
+    getPath: getPathMock
+  }
+}))
+
+vi.mock('os', async (importOriginal) => {
+  const actual = await importOriginal<typeof Os>()
+  return {
+    ...actual,
+    homedir: homedirMock
+  }
+})
+
+import { CodexHookService } from './hook-service'
+import {
+  setSystemCodexHomeHookSweepSuppressed,
+  shouldSuppressSystemCodexHomeHookSweep
+} from './codex-hook-legacy-cleanup'
+
+const homes = setupCodexHookHomes(homedirMock, getPathMock)
+
+type HookSettings = Pick<GlobalSettings, 'agentStatusHooksEnabled' | 'disabledTuiAgents'>
+
+const CODEX_OFF: HookSettings = { agentStatusHooksEnabled: true, disabledTuiAgents: ['codex'] }
+const ALL_ON: HookSettings = { agentStatusHooksEnabled: true, disabledTuiAgents: [] }
+const OTHER_OFF: HookSettings = { agentStatusHooksEnabled: true, disabledTuiAgents: ['claude'] }
+const GLOBAL_OFF: HookSettings = { agentStatusHooksEnabled: false, disabledTuiAgents: [] }
+
+function orcaEntryCommand(): string {
+  const scriptPath = join(
+    homes.userDataDir,
+    'agent-hooks',
+    process.platform === 'win32' ? 'codex-hook.cmd' : 'codex-hook.sh'
+  )
+  return process.platform === 'win32' ? scriptPath : wrapPosixHookCommand(scriptPath)
+}
+
+function seedRealHomeHooks(): string {
+  const systemCodexHome = join(homes.tmpHome, '.codex')
+  const systemHooksPath = join(systemCodexHome, 'hooks.json')
+  mkdirSync(systemCodexHome, { recursive: true })
+  writeFileSync(
+    systemHooksPath,
+    `${JSON.stringify({
+      hooks: {
+        Stop: [
+          { hooks: [{ type: 'command', command: 'user-hook' }] },
+          { hooks: [{ type: 'command', command: orcaEntryCommand() }] }
+        ]
+      }
+    })}\n`,
+    'utf-8'
+  )
+  return systemHooksPath
+}
+
+function realHomeStopHooks(systemHooksPath: string): unknown {
+  return JSON.parse(readFileSync(systemHooksPath, 'utf-8')).hooks.Stop
+}
+
+describe('system ~/.codex sweep gate', () => {
+  afterEach(() => {
+    setSystemCodexHomeHookSweepSuppressed(() => false)
+  })
+
+  it.each([
+    { label: 'Codex turned off', settings: CODEX_OFF, suppressed: false },
+    { label: 'the global switch off', settings: GLOBAL_OFF, suppressed: false },
+    { label: 'every agent on', settings: ALL_ON, suppressed: true },
+    { label: 'another agent turned off', settings: OTHER_OFF, suppressed: true }
+  ])('on the real-home lane with $label, suppressed=$suppressed', ({ settings, suppressed }) => {
+    expect(
+      shouldSuppressSystemCodexHomeHookSweep({ isHostSystemDefaultRealHome: true, settings })
+    ).toBe(suppressed)
+  })
+
+  it('never suppresses off the real-home lane', () => {
+    expect(
+      shouldSuppressSystemCodexHomeHookSweep({
+        isHostSystemDefaultRealHome: false,
+        settings: ALL_ON
+      })
+    ).toBe(false)
+  })
+
+  it('turning Codex off removes the Orca entry from the real ~/.codex and keeps user hooks', async () => {
+    const systemHooksPath = seedRealHomeHooks()
+    setSystemCodexHomeHookSweepSuppressed(() =>
+      shouldSuppressSystemCodexHomeHookSweep({
+        isHostSystemDefaultRealHome: true,
+        settings: CODEX_OFF
+      })
+    )
+
+    await new CodexHookService().remove()
+
+    expect(realHomeStopHooks(systemHooksPath)).toEqual([
+      { hooks: [{ type: 'command', command: 'user-hook' }] }
+    ])
+  })
+
+  it('leaves the real-home entry in place while Codex hooks are on', async () => {
+    const systemHooksPath = seedRealHomeHooks()
+    setSystemCodexHomeHookSweepSuppressed(() =>
+      shouldSuppressSystemCodexHomeHookSweep({
+        isHostSystemDefaultRealHome: true,
+        settings: ALL_ON
+      })
+    )
+
+    await new CodexHookService().remove()
+
+    expect(realHomeStopHooks(systemHooksPath)).toEqual([
+      { hooks: [{ type: 'command', command: 'user-hook' }] },
+      { hooks: [{ type: 'command', command: orcaEntryCommand() }] }
+    ])
+  })
+})
diff --git a/src/main/codex/codex-index-heal-binary-contract.test.ts b/src/main/codex/codex-index-heal-binary-contract.test.ts
index 5580fc02d1d9..8954f618a6ad 100644
--- a/src/main/codex/codex-index-heal-binary-contract.test.ts
+++ b/src/main/codex/codex-index-heal-binary-contract.test.ts
@@ -3,10 +3,12 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { promisify } from 'node:util'
+import { zstdCompressSync } from 'node:zlib'
 import { afterEach, beforeAll, describe, expect, it } from 'vitest'
+import { CODEX_SHORT_LIVED_PROBE_APP_SERVER_ARGS } from '../codex-cli/codex-read-only-app-server-args'
 import SyncDatabase from '../sqlite/sync-database'
 import { runCodexAppServerSession, type CodexAppServerRpc } from './codex-app-server-session'
-import { findNewestCodexStateDbPath } from './codex-state-db'
+import { findNewestCodexStateDbPath, readCodexStateDbBackfillStatus } from './codex-state-db'
 
 // Why this file exists: every other index-heal test drives a stub app-server and
 // asserts "healed" as "the `thread/read` call did not error". That pins Orca's half
@@ -17,7 +19,7 @@ import { findNewestCodexStateDbPath } from './codex-state-db'
 // real-binary backstop, built to the same shape as the Git binary compatibility
 // contract in src/shared/git-binary-compatibility.test.ts.
 //
-// Keep it narrow. It pins the four arms that ablation established Orca relies on,
+// Keep it narrow. It pins the arms that ablation established Orca relies on,
 // and deliberately asserts nothing else about the app-server, so an unrelated Codex
 // release does not redden it into being disabled.
 
@@ -83,11 +85,18 @@ describeCodexContract(
       mkdirSync(join(home, 'sessions'), { recursive: true })
       // An app-server session over an empty sessions tree is what stamps the backfill complete.
       await runAppServerSession(home, async () => undefined)
+      // Why: the account bridge links history only after this no-request session stamps it.
+      expect(readCodexStateDbBackfillStatus(home).kind).toBe('complete')
       expect(readThreadRows(home)).toEqual([])
       return home
     }
 
-    function writeRollout(home: string, threadId: string, stamp: string): void {
+    function writeRollout(
+      home: string,
+      threadId: string,
+      stamp: string,
+      options: { compressed?: boolean } = {}
+    ): void {
       const dayDir = join(home, 'sessions', '2026', '08', '29')
       mkdirSync(dayDir, { recursive: true })
       const meta = {
@@ -112,10 +121,13 @@ describeCodexContract(
         type: 'event_msg',
         payload: { type: 'user_message', message: 'index-heal contract fixture' }
       }
-      writeFileSync(
-        join(dayDir, `rollout-${stamp}-${threadId}.jsonl`),
-        `${JSON.stringify(meta)}\n${JSON.stringify(userMessage)}\n`
-      )
+      const contents = `${JSON.stringify(meta)}\n${JSON.stringify(userMessage)}\n`
+      const fileName = `rollout-${stamp}-${threadId}.jsonl`
+      if (options.compressed) {
+        writeFileSync(join(dayDir, `${fileName}.zst`), zstdCompressSync(contents))
+      } else {
+        writeFileSync(join(dayDir, fileName), contents)
+      }
     }
 
     // Why reuse runCodexAppServerSession rather than a local JSON-RPC client: it is the
@@ -128,7 +140,8 @@ describeCodexContract(
       return runCodexAppServerSession(
         {
           command: binary!,
-          args: ['app-server'],
+          // Why: the heal and account state-DB creation launch with these exact args.
+          args: [...CODEX_SHORT_LIVED_PROBE_APP_SERVER_ARGS],
           cliPath: binary!,
           env: { CODEX_HOME: home },
           timeoutMs: SESSION_TIMEOUT_MS
@@ -171,6 +184,19 @@ describeCodexContract(
       expect(readThreadRows(home)).toEqual([{ id: threadId, archived: 0 }])
     })
 
+    // Why: the account bridge links `.jsonl.zst` history and heals it with the same read.
+    it('indexes a compressed-only rollout on read', async () => {
+      const home = await createBackfilledCodexHome()
+      const threadId = '01a04f62-715e-7830-9371-50db585caa74'
+      writeRollout(home, threadId, '2026-08-29T17-00-00', { compressed: true })
+
+      await runAppServerSession(home, async (rpc) => {
+        await rpc.request('thread/read', { threadId })
+      })
+
+      expect(readThreadRows(home)).toEqual([{ id: threadId, archived: 0 }])
+    })
+
     it('leaves an already-indexed thread as a single row', async () => {
       const home = await createBackfilledCodexHome()
       const threadId = '01a04f62-715e-7830-9371-50db585caa72'
diff --git a/src/main/codex/codex-persistent-command-retention.test.ts b/src/main/codex/codex-persistent-command-retention.test.ts
index 498d5b186ef4..2c123a3b910c 100644
--- a/src/main/codex/codex-persistent-command-retention.test.ts
+++ b/src/main/codex/codex-persistent-command-retention.test.ts
@@ -71,14 +71,15 @@ describe('persistent command retention', () => {
     items.streams.flush()
     const originalJoin = Array.prototype.join
     let retainedJoins = 0
-    const spy = vi
-      .spyOn(Array.prototype, 'join')
-      .mockImplementation(function (this: unknown[], separator) {
-        if (this[0] === 'retained-prefix') {
-          retainedJoins += 1
-        }
-        return originalJoin.call(this, separator)
-      })
+    const spy = vi.spyOn(Array.prototype, 'join').mockImplementation(function (
+      this: unknown[],
+      separator
+    ) {
+      if (this[0] === 'retained-prefix') {
+        retainedJoins += 1
+      }
+      return originalJoin.call(this, separator)
+    })
     try {
       for (let index = 0; index < 100; index += 1) {
         items.streams.flush()
diff --git a/src/main/codex/codex-prompt-registry-retention.test.ts b/src/main/codex/codex-prompt-registry-retention.test.ts
index 78e10cbcc77d..4757d731dcf7 100644
--- a/src/main/codex/codex-prompt-registry-retention.test.ts
+++ b/src/main/codex/codex-prompt-registry-retention.test.ts
@@ -108,3 +108,22 @@ describe('Codex prompt claim lifetime', () => {
     expect(prompt.deref()).toBeUndefined()
   })
 })
+
+describe('Codex abandoned command approvals', () => {
+  it("reports only a command's own approval that its turn ended unanswered, once", () => {
+    const registry = new CodexPromptRegistry()
+    const ask = (id: number, method: string, params: Record<string, string>) =>
+      registry.register({ id, method, params: { threadId: 'thread', turnId: 'turn', ...params } })
+    ask(1, 'item/commandExecution/requestApproval', { itemId: 'unanswered' })
+    const answered = ask(2, 'item/commandExecution/requestApproval', { itemId: 'answered' })
+    ask(3, 'item/commandExecution/requestApproval', { itemId: 'parent', approvalId: 'sub' })
+    ask(4, 'item/fileChange/requestApproval', { itemId: 'patch' })
+    if (!answered) {
+      throw new Error('Fixture prompt was refused')
+    }
+    registry.forget(answered)
+    registry.clearTurn('thread', 'turn')
+    expect(registry.takeAbandonedCommands()).toEqual([{ threadId: 'thread', itemId: 'unanswered' }])
+    expect(registry.takeAbandonedCommands()).toEqual([])
+  })
+})
diff --git a/src/main/codex/codex-prompt-registry.ts b/src/main/codex/codex-prompt-registry.ts
index 059f8a7a0d31..eda1fa0bf306 100644
--- a/src/main/codex/codex-prompt-registry.ts
+++ b/src/main/codex/codex-prompt-registry.ts
@@ -31,6 +31,9 @@ export type CodexPendingPrompt = {
   answers: Map<string, string>
 }
 
+export type CodexAbandonedCommand = { threadId: string; itemId: string }
+const NO_ABANDONED_COMMANDS: readonly CodexAbandonedCommand[] = []
+
 export type CodexPromptClaim = {
   readonly itemId: string
   readonly prompt: CodexPendingPrompt
@@ -54,6 +57,7 @@ export class CodexPromptRegistry {
   private readonly journalItemIds = new Map<string, string>()
   private readonly boundPrompts = new Map<string, CodexPendingPrompt>()
   private readonly claims = new Map<CodexPendingPrompt, CodexPromptClaim>()
+  private abandonedCommands: CodexAbandonedCommand[] = []
 
   get sizes(): { prompts: number; journalBindings: number } {
     return { prompts: this.byAddress.size, journalBindings: this.journalItemIds.size }
@@ -232,7 +236,25 @@ export class CodexPromptRegistry {
     )
     for (const prompt of prompts) {
       this.forget(prompt)
+      // Codex abandons a turn's unanswered prompts: a command still awaiting approval never ran.
+      // An `approvalId` asks for a subcommand, not the item's own command.
+      if (
+        prompt.method === CODEX_COMMAND_APPROVAL_METHOD &&
+        prompt.promptKey === prompt.codexItemId
+      ) {
+        this.abandonedCommands.push({ threadId: prompt.threadId, itemId: prompt.codexItemId })
+      }
+    }
+  }
+
+  /** The commands whose approval a turn ended without, since the last call. */
+  takeAbandonedCommands(): readonly CodexAbandonedCommand[] {
+    if (this.abandonedCommands.length === 0) {
+      return NO_ABANDONED_COMMANDS
     }
+    const taken = this.abandonedCommands
+    this.abandonedCommands = []
+    return taken
   }
 
   clear(): void {
@@ -240,6 +262,7 @@ export class CodexPromptRegistry {
     this.journalItemIds.clear()
     this.boundPrompts.clear()
     this.claims.clear()
+    this.abandonedCommands = []
   }
 
   private address(threadId: string, promptKey: string): string {
diff --git a/src/main/codex/codex-requested-close-turn-timing.test.ts b/src/main/codex/codex-requested-close-turn-timing.test.ts
index fbf50badaef4..a7baf6a14b59 100644
--- a/src/main/codex/codex-requested-close-turn-timing.test.ts
+++ b/src/main/codex/codex-requested-close-turn-timing.test.ts
@@ -1,4 +1,5 @@
 import { createCodexDispatchEchoes } from './codex-structured-dispatch-echo'
+import { createCodexTurnOpenWaits } from './codex-structured-turn-open-wait'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types'
 import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
@@ -72,6 +73,7 @@ describe('requested-close durable turn timing', () => {
         reportedOptions: {},
         fastModeTierByModel: new Map(),
         dispatchEchoes: createCodexDispatchEchoes(),
+        turnOpenWaits: createCodexTurnOpenWaits(),
         translator
       }
       const sessions = new Map([['session-1', session]])
diff --git a/src/main/codex/codex-session-index-heal-state.ts b/src/main/codex/codex-session-index-heal-state.ts
index 0a5fd0499c18..ab62b77669dd 100644
--- a/src/main/codex/codex-session-index-heal-state.ts
+++ b/src/main/codex/codex-session-index-heal-state.ts
@@ -22,7 +22,7 @@ const HEAL_UNSUPPORTED_RETRY_INTERVAL_MS = 24 * 60 * 60 * 1000
 const HEAL_FAILED_THREAD_RETRY_INTERVAL_MS = 24 * 60 * 60 * 1000
 
 const CODEX_ROLLOUT_THREAD_ID_PATTERN =
-  /^rollout-(.+)-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/i
+  /^rollout-(.+)-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl(?:\.zst)?$/i
 
 export type CodexSessionIndexHealPaths = {
   auditLogPath: string
@@ -70,11 +70,11 @@ export async function collectPendingHealThreads(
     if (!isPathInsideOrEqual(paths.systemSessionsRoot, line.target)) {
       continue
     }
-    const match = CODEX_ROLLOUT_THREAD_ID_PATTERN.exec(lastPathSegment(line.target))
-    if (!match) {
+    const rollout = parseCodexRolloutThreadId(line.target)
+    if (!rollout) {
       continue
     }
-    const threadId = match[2].toLowerCase()
+    const { threadId } = rollout
     const auditRecordId = typeof line.recordId === 'string' ? line.recordId : null
     if (
       auditRecordId
@@ -88,13 +88,21 @@ export async function collectPendingHealThreads(
       pendingByThreadId.delete(threadId)
       continue
     }
-    pendingByThreadId.set(threadId, { threadId, rolloutStamp: match[1], auditRecordId })
+    pendingByThreadId.set(threadId, { threadId, rolloutStamp: rollout.rolloutStamp, auditRecordId })
   }
   return [...pendingByThreadId.values()].sort((left, right) =>
     left.rolloutStamp < right.rolloutStamp ? 1 : left.rolloutStamp > right.rolloutStamp ? -1 : 0
   )
 }
 
+/** Thread id (lower-cased) and timestamp segment encoded in a rollout file name. */
+export function parseCodexRolloutThreadId(
+  filePath: string
+): { threadId: string; rolloutStamp: string } | null {
+  const match = CODEX_ROLLOUT_THREAD_ID_PATTERN.exec(lastPathSegment(filePath))
+  return match ? { threadId: match[2].toLowerCase(), rolloutStamp: match[1] } : null
+}
+
 function lastPathSegment(filePath: string): string {
   return filePath.split(/[\\/]/).at(-1) ?? ''
 }
diff --git a/src/main/codex/codex-session-index-heal.test.ts b/src/main/codex/codex-session-index-heal.test.ts
index 20051fe1058e..1be3d047207e 100644
--- a/src/main/codex/codex-session-index-heal.test.ts
+++ b/src/main/codex/codex-session-index-heal.test.ts
@@ -10,10 +10,12 @@ import {
 } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
+import { CODEX_SHORT_LIVED_PROBE_APP_SERVER_ARGS } from '../codex-cli/codex-read-only-app-server-args'
 import type { CodexAppServerInvocation } from './codex-app-server-session'
 import { createCodexSessionBackfillAuditWriter } from './codex-session-backfill-audit'
 import { CODEX_SESSION_INDEX_HEAL_VERSION } from './codex-session-index-heal-state'
 import {
+  buildNativeHealInvocation,
   runCodexSessionIndexHeal,
   type CodexSessionIndexHealPaths
 } from './codex-session-index-heal'
@@ -340,6 +342,7 @@ describe('runCodexSessionIndexHeal', () => {
     const marker = JSON.parse(readFileSync(rig.paths.healMarkerPath, 'utf-8')) as {
       retryableFailureAt: number
     }
+    expect(marker.retryableFailureAt).toEqual(expect.any(Number))
     marker.retryableFailureAt = 0
     writeFileSync(rig.paths.healMarkerPath, `${JSON.stringify(marker)}\n`, 'utf-8')
     const retried = await runCodexSessionIndexHeal(rig.paths, {
@@ -490,6 +493,25 @@ describe('runCodexSessionIndexHeal', () => {
     expect(resumed.healedThreads + summary.healedThreads).toBe(4)
   })
 
+  it('writes no completion marker when stop flips inside the last batch', async () => {
+    const rig = createHealRig({
+      auditedThreads: [
+        { stamp: '2026-07-02T10-00-00', id: threadId('2') },
+        { stamp: '2026-07-01T10-00-00', id: threadId('1') }
+      ]
+    })
+
+    const summary = await runCodexSessionIndexHeal(rig.paths, {
+      buildInvocation: rig.buildInvocation,
+      readConcurrency: 1,
+      interBatchDelayMs: 0,
+      shouldStop: () => rig.readLog().threadIds.length > 0
+    })
+
+    expect(summary).toMatchObject({ outcome: 'stopped', healedThreads: 1 })
+    expect(existsSync(rig.paths.healMarkerPath)).toBe(false)
+  })
+
   it('does not spawn another server when stop flips during the inter-batch delay', async () => {
     const rig = createHealRig({
       auditedThreads: [
@@ -777,3 +799,14 @@ describe('runCodexSessionIndexHeal', () => {
     warnSpy.mockRestore()
   })
 })
+
+describe('buildNativeHealInvocation', () => {
+  it('starts a read-only, plugin-free app-server pinned to the given home', () => {
+    const invocation = buildNativeHealInvocation('/codex-home', 1_000)
+
+    for (const arg of CODEX_SHORT_LIVED_PROBE_APP_SERVER_ARGS) {
+      expect(invocation.args).toContain(arg)
+    }
+    expect(invocation.env).toEqual({ CODEX_HOME: '/codex-home' })
+  })
+})
diff --git a/src/main/codex/codex-session-index-heal.ts b/src/main/codex/codex-session-index-heal.ts
index 12747312646c..364263f2f471 100644
--- a/src/main/codex/codex-session-index-heal.ts
+++ b/src/main/codex/codex-session-index-heal.ts
@@ -1,6 +1,7 @@
 import { dirname, join } from 'node:path'
 import { resolveCodexCommand } from '../codex-cli/command'
 import { isTransientSqliteContention } from '../sqlite/sqlite-read-failure'
+import { CODEX_SHORT_LIVED_PROBE_APP_SERVER_ARGS } from '../codex-cli/codex-read-only-app-server-args'
 import { getSpawnArgsForWindows } from '../win32-utils'
 import { getCodexSessionBackfillStateDirPath } from './codex-home-paths'
 import { resolveCodexSessionBackfillPaths } from './codex-session-backfill'
@@ -17,7 +18,8 @@ import {
 import {
   isCodexAppServerUnsupportedError,
   runCodexAppServerSession,
-  type CodexAppServerInvocation
+  type CodexAppServerInvocation,
+  type CodexAppServerRpc
 } from './codex-app-server-session'
 
 export type { CodexSessionIndexHealPaths } from './codex-session-index-heal-state'
@@ -49,12 +51,20 @@ export type CodexSessionIndexHealSummary = {
 export type CodexSessionIndexHealOptions = {
   /** Polled between reads and batches; true stops promptly, progress is kept. */
   shouldStop?: () => boolean
-  buildInvocation?: (systemCodexHomePath: string, timeoutMs: number) => CodexAppServerInvocation
+  buildInvocation?: (codexHomePath: string, timeoutMs: number) => CodexAppServerInvocation
+  runSession?: (
+    invocation: CodexAppServerInvocation,
+    body: (rpc: CodexAppServerRpc) => Promise<void>
+  ) => Promise<void>
   readsPerServerSession?: number
   readConcurrency?: number
   interBatchDelayMs?: number
 }
 
+export type CodexThreadReadOutcome = HealLedgerOutcome
+
+export type CodexThreadReadPassOutcome = 'completed' | 'stopped' | 'unsupported' | 'aborted'
+
 let backgroundHealTask: Promise<CodexSessionIndexHealSummary | null> | null = null
 
 export function resolveCodexSessionIndexHealPaths(
@@ -132,8 +142,54 @@ export async function runCodexSessionIndexHeal(
     return summary
   }
 
-  const systemCodexHomePath = dirname(paths.systemSessionsRoot)
+  const shouldStop = options.shouldStop ?? ((): boolean => false)
+  const outcome = await readCodexThreadsForIndexHeal(
+    dirname(paths.systemSessionsRoot),
+    pending,
+    (thread, readOutcome) => {
+      if (readOutcome === 'healed') {
+        summary.healedThreads += 1
+      } else if (readOutcome === 'missing') {
+        // The backfilled rollout was deleted after the audit was written.
+        summary.missingThreads += 1
+      } else {
+        summary.failedThreads += 1
+      }
+      recordHealOutcome(paths, thread, readOutcome)
+    },
+    options
+  )
+  if (outcome === 'unsupported') {
+    // Why: no retry churn on old CLIs — remember unsupported and re-probe
+    // after the retry interval or a version bump; nothing is marked healed.
+    writeHealMarker(paths, auditBytes, summary, { unsupportedAt: Date.now() })
+  }
+  if (outcome !== 'completed' || shouldStop()) {
+    summary.outcome = outcome === 'completed' ? 'stopped' : outcome
+    return summary
+  }
+  writeHealMarker(
+    paths,
+    auditBytes,
+    summary,
+    summary.failedThreads > 0 ? { retryableFailureAt: Date.now() } : undefined
+  )
+  return summary
+}
+
+/**
+ * Drives `thread/read` over `threads` in bounded app-server batches, reporting
+ * each settled read. Transport failures and sqlite contention abort the pass
+ * without reporting, so the caller's next pass retries those threads.
+ */
+export async function readCodexThreadsForIndexHeal<T extends { threadId: string }>(
+  codexHomePath: string,
+  threads: readonly T[],
+  onOutcome: (thread: T, outcome: CodexThreadReadOutcome) => void,
+  options: CodexSessionIndexHealOptions = {}
+): Promise<CodexThreadReadPassOutcome> {
   const buildInvocation = options.buildInvocation ?? buildNativeHealInvocation
+  const runSession = options.runSession ?? runCodexAppServerSession
   const readsPerServerSession = resolveHealWorkLimit(
     options.readsPerServerSession,
     HEAL_READS_PER_SERVER_SESSION
@@ -142,80 +198,55 @@ export async function runCodexSessionIndexHeal(
   const interBatchDelayMs = options.interBatchDelayMs ?? HEAL_INTER_BATCH_DELAY_MS
   const shouldStop = options.shouldStop ?? ((): boolean => false)
 
-  for (let offset = 0; offset < pending.length; offset += readsPerServerSession) {
+  for (let offset = 0; offset < threads.length; offset += readsPerServerSession) {
     if (shouldStop()) {
-      summary.outcome = 'stopped'
-      return summary
+      return 'stopped'
     }
     if (offset > 0 && interBatchDelayMs > 0) {
       await new Promise((resolve) => setTimeout(resolve, interBatchDelayMs))
       if (shouldStop()) {
-        // Why: opt-out can happen during the throttle delay; do not spawn a
-        // real-home app-server after the lane has been disabled.
-        summary.outcome = 'stopped'
-        return summary
+        // Why: opt-out can happen during the throttle delay; do not spawn an
+        // app-server after the lane has been disabled.
+        return 'stopped'
       }
     }
-    const batch = pending.slice(offset, offset + readsPerServerSession)
+    const batch = threads.slice(offset, offset + readsPerServerSession)
     const timeoutMs = HEAL_BATCH_TIMEOUT_BASE_MS + HEAL_BATCH_TIMEOUT_PER_READ_MS * batch.length
     try {
-      await runCodexAppServerSession(
-        buildInvocation(systemCodexHomePath, timeoutMs),
-        async (rpc) => {
-          let nextIndex = 0
-          const worker = async (): Promise<void> => {
-            while (nextIndex < batch.length && !shouldStop()) {
-              const thread = batch[nextIndex]
-              nextIndex += 1
-              await healOneThread(rpc, thread, paths, summary)
-            }
+      await runSession(buildInvocation(codexHomePath, timeoutMs), async (rpc) => {
+        let nextIndex = 0
+        const worker = async (): Promise<void> => {
+          while (nextIndex < batch.length && !shouldStop()) {
+            const thread = batch[nextIndex]
+            nextIndex += 1
+            onOutcome(thread, await readOneThread(rpc, thread.threadId))
           }
-          await Promise.all(Array.from({ length: readConcurrency }, () => worker()))
         }
-      )
+        await Promise.all(Array.from({ length: readConcurrency }, () => worker()))
+      })
     } catch (error) {
+      if (shouldStop()) {
+        return 'stopped'
+      }
       if (isCodexAppServerUnsupportedError(error)) {
-        if (shouldStop()) {
-          summary.outcome = 'stopped'
-          return summary
-        }
-        // Why: no retry churn on old CLIs — remember unsupported and re-probe
-        // after the retry interval or a version bump; nothing is marked healed.
-        writeHealMarker(paths, auditBytes, summary, { unsupportedAt: Date.now() })
-        summary.outcome = 'unsupported'
-        return summary
+        return 'unsupported'
       }
       // Transport failure (timeout, early exit, spawn error): unprocessed ids
-      // were never appended to the ledger, so the next pass resumes them.
+      // were never reported, so the next pass resumes them.
       console.warn('[codex-session-index-heal] Heal batch aborted:', error)
-      summary.outcome = 'aborted'
-      return summary
+      return 'aborted'
     }
   }
-
-  if (shouldStop()) {
-    summary.outcome = 'stopped'
-    return summary
-  }
-  writeHealMarker(
-    paths,
-    auditBytes,
-    summary,
-    summary.failedThreads > 0 ? { retryableFailureAt: Date.now() } : undefined
-  )
-  return summary
+  return 'completed'
 }
 
-async function healOneThread(
-  rpc: { request: (method: string, params?: Record<string, unknown>) => Promise<unknown> },
-  thread: PendingHealThread,
-  paths: CodexSessionIndexHealPaths,
-  summary: CodexSessionIndexHealSummary
-): Promise<void> {
+async function readOneThread(
+  rpc: CodexAppServerRpc,
+  threadId: string
+): Promise<CodexThreadReadOutcome> {
   try {
-    await rpc.request('thread/read', { threadId: thread.threadId })
-    summary.healedThreads += 1
-    recordHealOutcome(paths, thread, 'healed')
+    await rpc.request('thread/read', { threadId })
+    return 'healed'
   } catch (error) {
     if (isCodexAppServerUnsupportedError(error)) {
       throw error
@@ -223,22 +254,18 @@ async function healOneThread(
     const message = error instanceof Error ? error.message : String(error)
     if (!message.startsWith('codex app-server thread/read failed')) {
       // Not an RPC-level response: the server died or timed out. Abort the
-      // batch without recording, so the id is retried on the next pass.
+      // batch without reporting, so the id is retried on the next pass.
       throw error
     }
     if (/no rollout found/i.test(message)) {
-      // The backfilled rollout was deleted after the audit was written.
-      summary.missingThreads += 1
-      recordHealOutcome(paths, thread, 'missing')
-      return
+      return 'missing'
     }
     if (isTransientSqliteContention(message)) {
-      // Why: an active Codex process can briefly own sqlite; leave the id off
-      // the ledger and abort this pass so a later startup resumes it.
+      // Why: an active Codex process can briefly own sqlite; leave the id
+      // unreported and abort this pass so a later startup resumes it.
       throw error
     }
-    summary.failedThreads += 1
-    recordHealOutcome(paths, thread, 'failed')
+    return 'failed'
   }
 }
 
@@ -259,20 +286,23 @@ function resolveHealWorkLimit(value: number | undefined, maximum: number): numbe
   return Math.min(Math.floor(value), maximum)
 }
 
-function buildNativeHealInvocation(
-  systemCodexHomePath: string,
+export function buildNativeHealInvocation(
+  codexHomePath: string,
   timeoutMs: number
 ): CodexAppServerInvocation {
   const command = resolveCodexCommand()
-  const { spawnCmd, spawnArgs } = getSpawnArgsForWindows(command, ['app-server'])
+  // Why: each session is torn down after one batch, so plugin startup could
+  // leave marketplace clones running; indexing needs neither plugins nor tools.
+  const { spawnCmd, spawnArgs } = getSpawnArgsForWindows(command, [
+    ...CODEX_SHORT_LIVED_PROBE_APP_SERVER_ARGS
+  ])
   return {
     command: spawnCmd,
     args: spawnArgs,
     cliPath: command,
-    // Why: pin the real home explicitly — nested Orca launches can inherit a
-    // managed CODEX_HOME from the daemon environment, which would index the
-    // wrong sqlite DB.
-    env: { CODEX_HOME: systemCodexHomePath },
+    // Why: pin the home explicitly — nested Orca launches can inherit a managed
+    // CODEX_HOME from the daemon environment, which would index the wrong sqlite DB.
+    env: { CODEX_HOME: codexHomePath },
     timeoutMs
   }
 }
diff --git a/src/main/codex/codex-state-db-test-fixture.ts b/src/main/codex/codex-state-db-test-fixture.ts
new file mode 100644
index 000000000000..e84f0328c3b2
--- /dev/null
+++ b/src/main/codex/codex-state-db-test-fixture.ts
@@ -0,0 +1,14 @@
+import { mkdirSync } from 'node:fs'
+import { join } from 'node:path'
+import SyncDatabase from '../sqlite/sync-database'
+
+/** Writes a Codex state DB whose startup backfill reports `status`. */
+export function writeCodexStateDbBackfillStatus(codexHomePath: string, status: string): void {
+  mkdirSync(codexHomePath, { recursive: true })
+  const db = new SyncDatabase(join(codexHomePath, 'state_5.sqlite'))
+  db.exec(
+    'CREATE TABLE backfill_state (id INTEGER PRIMARY KEY, status TEXT NOT NULL); ' +
+      `INSERT INTO backfill_state (id, status) VALUES (1, '${status}')`
+  )
+  db.close()
+}
diff --git a/src/main/codex/codex-state-db.test.ts b/src/main/codex/codex-state-db.test.ts
index 7cf0ac88ac5f..a89a556b807c 100644
--- a/src/main/codex/codex-state-db.test.ts
+++ b/src/main/codex/codex-state-db.test.ts
@@ -1,12 +1,13 @@
 import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { afterEach, describe, expect, it } from 'vitest'
+import { afterEach, describe, expect, it, vi } from 'vitest'
 import SyncDatabase from '../sqlite/sync-database'
 import {
   findNewestCodexStateDbPath,
   isCodexStateDbBackfillPending,
-  readCodexStateDbBackfillStatus
+  readCodexStateDbBackfillStatus,
+  readIndexedCodexThreadIds
 } from './codex-state-db'
 
 const temporaryHomes: string[] = []
@@ -67,6 +68,19 @@ describe('Codex state DB backfill status', () => {
     expect(isCodexStateDbBackfillPending(home)).toBe(true)
   })
 
+  it('counts compressed rollouts, which Codex also backfills', async () => {
+    const home = await createHome()
+    const sessions = join(home, 'sessions', '2026', '08', '04')
+    await mkdir(sessions, { recursive: true })
+    await Promise.all(
+      Array.from({ length: 100 }, (_, index) =>
+        writeFile(join(sessions, `rollout-${index}.jsonl.zst`), '')
+      )
+    )
+
+    expect(isCodexStateDbBackfillPending(home)).toBe(true)
+  })
+
   it('does not call a complete backfill pending', async () => {
     const home = await createHome()
     createBackfillDb(home, 5, 'complete')
@@ -74,3 +88,27 @@ describe('Codex state DB backfill status', () => {
     expect(isCodexStateDbBackfillPending(home)).toBe(false)
   })
 })
+
+describe('readIndexedCodexThreadIds', () => {
+  it('returns lower-cased thread ids from the newest state DB', async () => {
+    const home = await createHome()
+    const path = createBackfillDb(home, 5, 'complete')
+    const db = new SyncDatabase(path)
+    db.exec(
+      "CREATE TABLE threads (id TEXT PRIMARY KEY); INSERT INTO threads (id) VALUES ('ABC'), ('def')"
+    )
+    db.close()
+
+    expect(readIndexedCodexThreadIds(home)).toEqual(new Set(['abc', 'def']))
+  })
+
+  it('returns null when there is no state DB or no threads table', async () => {
+    const home = await createHome()
+    expect(readIndexedCodexThreadIds(home)).toBeNull()
+
+    createBackfillDb(home, 5, 'complete')
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    expect(readIndexedCodexThreadIds(home)).toBeNull()
+    warn.mockRestore()
+  })
+})
diff --git a/src/main/codex/codex-state-db.ts b/src/main/codex/codex-state-db.ts
index e2b437aea3aa..ae8ff3eb0460 100644
--- a/src/main/codex/codex-state-db.ts
+++ b/src/main/codex/codex-state-db.ts
@@ -71,6 +71,37 @@ export function readCodexStateDbBackfillStatus(codexHomePath: string): CodexStat
   }
 }
 
+/**
+ * Lower-cased thread ids already in Codex's state DB, or null when the DB is
+ * missing or unreadable. Read-only; never creates or mutates Codex's database.
+ */
+export function readIndexedCodexThreadIds(codexHomePath: string): Set<string> | null {
+  const stateDbPath = findNewestCodexStateDbPath(codexHomePath)
+  if (!stateDbPath) {
+    return null
+  }
+  let db: SyncDatabase | null = null
+  try {
+    db = new SyncDatabase(stateDbPath, { readonly: true, fileMustExist: true })
+    const ids = new Set<string>()
+    for (const row of db.prepare('SELECT id FROM threads').all()) {
+      if (typeof row.id === 'string') {
+        ids.add(row.id.toLowerCase())
+      }
+    }
+    return ids
+  } catch (error) {
+    console.warn('[codex-state-db] Failed to read indexed Codex threads:', error)
+    return null
+  } finally {
+    try {
+      db?.close()
+    } catch {
+      // A close failure cannot change the read-only result already collected.
+    }
+  }
+}
+
 export function countCodexSessionFilesUpTo(sessionsRoot: string, limit: number): number {
   let count = 0
   const pendingDirectories = [sessionsRoot]
@@ -85,7 +116,11 @@ export function countCodexSessionFilesUpTo(sessionsRoot: string, limit: number):
     for (const entry of entries) {
       if (entry.isDirectory()) {
         pendingDirectories.push(join(directory, entry.name))
-      } else if (entry.isFile() && entry.name.endsWith('.jsonl')) {
+      } else if (
+        entry.isFile() &&
+        // Why: Codex's startup backfill parses compressed rollouts too.
+        (entry.name.endsWith('.jsonl') || entry.name.endsWith('.jsonl.zst'))
+      ) {
         count += 1
         if (count >= limit) {
           break
diff --git a/src/main/codex/codex-structured-child-environment.test.ts b/src/main/codex/codex-structured-child-environment.test.ts
index 201efc0b0c5b..4dcd49e96459 100644
--- a/src/main/codex/codex-structured-child-environment.test.ts
+++ b/src/main/codex/codex-structured-child-environment.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, it } from 'vitest'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { openCodexAppServerConnection } from './codex-app-server-connection'
 import { CODEX_SPAWN_TOKEN_ENV } from './codex-structured-owner-identity'
 import { buildCodexStructuredChildEnvironment } from './codex-structured-child-environment'
-import { ORCA_STRUCTURED_SESSION_ENV } from '../../shared/structured-session-marker'
 import {
   mintStructuredWorkerHandle,
   mintStructuredWorkerPaneKey,
@@ -9,6 +9,10 @@ import {
   structuredWorkerProcessIncarnation
 } from '../runtime/structured-worker-identity'
 
+const DEV_CLI_BIN_FIRST = /^[^:;]*[\\/]cli[\\/]bin[:;]/
+// The dev launcher by absolute path: a login shell's profile cannot reorder it behind a global.
+const DEV_CLI_LAUNCHER = /^[^:;]*[\\/]cli[\\/]bin[\\/]orca-dev$/
+
 describe('buildCodexStructuredChildEnvironment', () => {
   it('keeps shell exports while pinned launch values win', () => {
     expect(
@@ -28,11 +32,16 @@ describe('buildCodexStructuredChildEnvironment', () => {
       EXAMPLE_GATEWAY_TOKEN: 'shell-exported',
       CODEX_HOME: '/pinned/home',
       [CODEX_SPAWN_TOKEN_ENV]: 'spawn-token',
-      [ORCA_STRUCTURED_SESSION_ENV]: '1'
+      ORCA_AGENT_SESSION_ID: 'session-not-a-worker',
+      ORCA_STRUCTURED_SESSION: '1',
+      ORCA_CLI_COMMAND: expect.stringMatching(DEV_CLI_LAUNCHER),
+      ORCA_USER_DATA_PATH: expect.any(String),
+      // The test host is unpackaged, so this app's CLI is the dev launcher dir, first on PATH.
+      PATH: expect.stringMatching(DEV_CLI_BIN_FIRST)
     })
   })
 
-  it('adds the orchestration handle only for a registered structured worker', () => {
+  it('names every session by its id, and adds the handle only for a registered worker', () => {
     const launch = {
       command: 'codex',
       args: ['app-server'],
@@ -44,8 +53,12 @@ describe('buildCodexStructuredChildEnvironment', () => {
     const sessionId = 'a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d'
     expect(buildCodexStructuredChildEnvironment(launch, 'spawn-token', sessionId)).toEqual({
       [CODEX_SPAWN_TOKEN_ENV]: 'spawn-token',
-      // No identity yet, so the child carries only the refuse-rather-than-guess marker.
-      [ORCA_STRUCTURED_SESSION_ENV]: '1'
+      // Not a worker, so no handle: the id alone names this chat as a caller.
+      ORCA_AGENT_SESSION_ID: sessionId,
+      ORCA_STRUCTURED_SESSION: '1',
+      ORCA_CLI_COMMAND: expect.stringMatching(DEV_CLI_LAUNCHER),
+      ORCA_USER_DATA_PATH: expect.any(String),
+      PATH: expect.stringMatching(DEV_CLI_BIN_FIRST)
     })
 
     const handle = mintStructuredWorkerHandle()
@@ -61,7 +74,8 @@ describe('buildCodexStructuredChildEnvironment', () => {
     try {
       const env = buildCodexStructuredChildEnvironment(launch, 'spawn-token', sessionId)
       expect(env.ORCA_TERMINAL_HANDLE).toBe(handle)
-      expect(env.ORCA_CLI_COMMAND).toBe('orca')
+      expect(env.ORCA_AGENT_SESSION_ID).toBe(sessionId)
+      expect(env.ORCA_CLI_COMMAND).toMatch(DEV_CLI_LAUNCHER)
       // A pane key here would leak into hook-emitted agent statuses, which assume a PTY leaf.
       expect(env.ORCA_PANE_KEY).toBeUndefined()
     } finally {
@@ -69,3 +83,62 @@ describe('buildCodexStructuredChildEnvironment', () => {
     }
   })
 })
+
+/** A real child speaking Codex's JSONL framing, answering with the environment it was spawned with. */
+const ENV_REPORTING_APP_SERVER = String.raw`
+  const readline = require('node:readline')
+  const send = (payload) => process.stdout.write(JSON.stringify(payload) + '\n')
+  readline.createInterface({ input: process.stdin }).on('line', (line) => {
+    const message = JSON.parse(line)
+    if (message.method === 'initialize') return send({ id: message.id, result: {} })
+    if (message.method === 'test/env') {
+      return send({
+        id: message.id,
+        result: {
+          sessionId: process.env.ORCA_AGENT_SESSION_ID ?? null,
+          cliCommand: process.env.ORCA_CLI_COMMAND ?? null,
+          path: process.env.PATH ?? process.env.Path ?? null
+        }
+      })
+    }
+  })
+`
+
+describe('the spawned Codex child', () => {
+  afterEach(() => {
+    vi.unstubAllEnvs()
+  })
+
+  it("runs with its own session id and this app's CLI, over an id inherited by Orca itself", async () => {
+    // The builder's output is an overlay on process.env, so only the spawned child proves the id
+    // survives the merge — an Orca launched inside another session inherits that session's id.
+    vi.stubEnv('ORCA_AGENT_SESSION_ID', 'a0b1c2d3-0000-4000-8000-00000000abcd')
+    const sessionId = 'a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d'
+    const env = buildCodexStructuredChildEnvironment(
+      {
+        command: process.execPath,
+        args: ['-e', ENV_REPORTING_APP_SERVER],
+        cwd: process.cwd(),
+        codexHome: null,
+        resumeThreadId: null,
+        env: {}
+      },
+      'spawn-token',
+      sessionId
+    )
+    const connection = await openCodexAppServerConnection({
+      command: process.execPath,
+      args: ['-e', ENV_REPORTING_APP_SERVER],
+      env
+    })
+    try {
+      await expect(connection.request('test/env')).resolves.toEqual({
+        sessionId,
+        cliCommand: expect.stringMatching(DEV_CLI_LAUNCHER),
+        path: expect.stringMatching(DEV_CLI_BIN_FIRST)
+      })
+    } finally {
+      await connection.close()
+    }
+  })
+})
diff --git a/src/main/codex/codex-structured-child-environment.ts b/src/main/codex/codex-structured-child-environment.ts
index 72bf17a1bcef..38ea91abe268 100644
--- a/src/main/codex/codex-structured-child-environment.ts
+++ b/src/main/codex/codex-structured-child-environment.ts
@@ -1,6 +1,6 @@
 import type { CodexStructuredLaunch } from './codex-structured-session-state'
 import { CODEX_SPAWN_TOKEN_ENV } from './codex-structured-owner-identity'
-import { structuredWorkerChildIdentityEnv } from '../runtime/structured-worker-child-identity-env'
+import { structuredSessionChildIdentityEnv } from '../runtime/structured-session-child-identity-env'
 
 export function buildCodexStructuredChildEnvironment(
   launch: CodexStructuredLaunch,
@@ -8,9 +8,8 @@ export function buildCodexStructuredChildEnvironment(
   sessionId: string
 ): Record<string, string> {
   return {
-    // Only a dispatched structured worker gets the orchestration identity and the Orca CLI on
-    // PATH; an ordinary chat session's env passes through untouched.
-    ...structuredWorkerChildIdentityEnv(sessionId, {
+    // Every structured session speaks orchestration as itself: its injected id and the Orca CLI.
+    ...structuredSessionChildIdentityEnv(sessionId, {
       ...launch.env,
       ...(launch.codexHome ? { CODEX_HOME: launch.codexHome } : {})
     }),
diff --git a/src/main/codex/codex-structured-child-work-producer.test.ts b/src/main/codex/codex-structured-child-work-producer.test.ts
new file mode 100644
index 000000000000..611b7f75b57f
--- /dev/null
+++ b/src/main/codex/codex-structured-child-work-producer.test.ts
@@ -0,0 +1,530 @@
+// A Codex session's frames, through the real adapter, into the host's child records: the order the
+// host receives them in, and whether the parent row the records imply is today's row.
+
+import { describe, expect, it } from 'vitest'
+import {
+  foldAgentLeadStatus,
+  type AgentLeadStatusResolution
+} from '../../shared/agent-lead-status-fold'
+import { createAgentChildWorkAdmission } from '../../shared/agent-status-child-work-admission'
+import type { AgentChildWorkRecord } from '../../shared/agent-status-child-work'
+import { agentChildWorkLiveness } from '../../shared/agent-status-child-work-liveness'
+import { reconcileAgentChildWorkEvidence } from '../../shared/agent-status-child-work-reconciliation'
+import {
+  agentChildWorkOwnedLiveness,
+  deriveAgentChildDisplayState
+} from '../../shared/agent-status-child-work-display'
+import { projectAgentChildWorkViews } from '../../shared/agent-status-child-work-view'
+import { createAgentStatusStore } from '../../shared/agent-status-store'
+import { agentJournalLinkageFields } from '../../shared/agent-session-journal-producer'
+import type {
+  AgentJournalItemBody,
+  AgentJournalProducerLinkage
+} from '../../shared/agent-session-journal-types'
+import { makeStructuredAgentStatusSubject } from '../../shared/agent-status-subject'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { fakeCodex, identityFor, THREAD_ID } from './codex-structured-session-adapter-fixture'
+import { CodexStructuredSessionAdapter } from './codex-structured-session-adapter'
+
+const parent = makeStructuredAgentStatusSubject(
+  {
+    executionHostId: 'local',
+    wslDistro: null,
+    workspaceId: 'workspace-1',
+    workspaceKind: 'folder'
+  },
+  'session-1'
+)
+const REVIEWER = 'thread-reviewer'
+const TESTER = 'thread-tester'
+const LINTER = 'thread-linter'
+
+type Frame = { method: string; params: Record<string, unknown> }
+type Delivery = { kind: 'journal' | 'legacy' | 'evidence'; detail: string }
+type Liveness = ReturnType<typeof agentChildWorkLiveness>
+/** What the records and today's strip each said when the journal wrote or published a row. */
+type JournalMoment = { recorded: Liveness; legacy: Liveness }
+
+const turn = (
+  method: 'turn/started' | 'turn/completed',
+  threadId: string,
+  id: string,
+  status = 'completed'
+): Frame => ({
+  method,
+  params: { threadId, turn: { id, status } }
+})
+const spawned = (child: string, name: string, parentTurn: string): Frame => ({
+  method: 'item/started',
+  params: {
+    threadId: THREAD_ID,
+    turnId: parentTurn,
+    item: {
+      type: 'subAgentActivity',
+      id: `spawn-${child}`,
+      kind: 'started',
+      agentThreadId: child,
+      agentPath: `/root/${name}`
+    }
+  }
+})
+const item = (
+  method: 'item/started' | 'item/completed',
+  threadId: string,
+  turnId: string,
+  fields: Record<string, unknown>
+): Frame => ({
+  method,
+  params: { threadId, turnId, item: fields }
+})
+const status = (threadId: string, activeFlags: string[]): Frame => ({
+  method: 'thread/status/changed',
+  params: { threadId, status: { type: 'active', activeFlags } }
+})
+
+async function producer() {
+  const codex = fakeCodex()
+  const store = createAgentStatusStore({ epoch: 'epoch-1', mode: 'authority' })
+  expect(store.applyMutation({ parent: { subject: parent } })).not.toBeNull()
+  let minted = 0
+  const admission = createAgentChildWorkAdmission(store, {
+    mintChildWorkId: () => `child-${++minted}`
+  })
+  const deliveries: Delivery[] = []
+  const moments: JournalMoment[] = []
+  const records = (): AgentChildWorkRecord[] => store.getChildren(parent)
+  const recordedLiveness = () =>
+    agentChildWorkLiveness(records().filter((record) => record.membership === 'live'))
+  // Each journal write publishes the parent's row, so the records must imply its state right then.
+  const moment = () =>
+    moments.push({
+      recorded: recordedLiveness(),
+      legacy: agentChildWorkLiveness(adapter.backgroundTaskState('session-1')?.tasks)
+    })
+  const adapter = new CodexStructuredSessionAdapter({
+    resolveLaunch: async () => ({
+      command: 'codex',
+      args: ['app-server'],
+      cwd: '/work/repo',
+      codexHome: null,
+      resumeThreadId: null
+    }),
+    openConnection: codex.openConnection,
+    readProcessStartTime: async () => 1_700_000_000_000,
+    now: () => 1_700_000_000_500,
+    onBackgroundTasksChanged: (_sessionId, state) =>
+      deliveries.push({ kind: 'legacy', detail: String(state?.tasks?.length ?? 0) }),
+    onChildWorkEvidence: (sessionId, evidence) => {
+      expect(sessionId).toBe('session-1')
+      deliveries.push({ kind: 'evidence', detail: evidence.map((edge) => edge.type).join(',') })
+      reconcileAgentChildWorkEvidence({ store, admission, parent, provider: 'codex', evidence })
+    }
+  })
+  const rows: { body: AgentJournalItemBody; linkage: AgentJournalProducerLinkage }[] = []
+  const journal: StructuredAgentSessionEventSink = {
+    appendItem: (identity, body, options) => {
+      deliveries.push({ kind: 'journal', detail: JSON.stringify(identity) })
+      rows.push({ body, linkage: agentJournalLinkageFields(options) })
+      moment()
+    },
+    appendTombstone: () => {},
+    publish: moment
+  }
+  await adapter.acquire({
+    identity: identityFor('session-1'),
+    fence: 7,
+    spawnToken: 'spawn-9',
+    events: journal
+  })
+  const send = (frame: Frame): Delivery[] => {
+    const from = deliveries.length
+    codex.connections[0]!.handlers.onNotification?.(frame.method, frame.params)
+    return deliveries.slice(from)
+  }
+  /** The journal moments one frame produced. */
+  const momentsOf = (frame: Frame): JournalMoment[] => {
+    const from = moments.length
+    send(frame)
+    return moments.slice(from)
+  }
+  const byDescription = (description: string) =>
+    records().find((record) => record.description === description)
+  const display = (description: string) => {
+    const children = records()
+    const views = projectAgentChildWorkViews(
+      children,
+      children.flatMap((child) => store.getAliasesForChild(child.childWorkId))
+    )
+    const view = views.find((candidate) => candidate.description === description)
+    return view && deriveAgentChildDisplayState(view, agentChildWorkOwnedLiveness(views, view.id))
+  }
+  /** The producer stamp on the newest journal row that carries this text. */
+  const stampOf = (text: string) =>
+    rows.findLast((row) => JSON.stringify(row.body).includes(text))?.linkage
+  return {
+    adapter,
+    codex,
+    send,
+    momentsOf,
+    records,
+    recordedLiveness,
+    byDescription,
+    display,
+    stampOf
+  }
+}
+
+const fold = (
+  leadState: 'working' | 'done',
+  childWorkLiveness: Liveness
+): AgentLeadStatusResolution => foldAgentLeadStatus({ leadState, childWorkLiveness })
+/** The strip has no word for a child waiting on a human: to it, that child is working. */
+const asStrip = (liveness: Liveness): Liveness => (liveness === 'waiting' ? 'working' : liveness)
+const shellFrame = (
+  method: 'item/started' | 'item/completed',
+  threadId: string,
+  turnId: string,
+  id: string,
+  command: string,
+  source = 'unifiedExecStartup'
+): Frame =>
+  item(method, threadId, turnId, {
+    type: 'commandExecution',
+    id,
+    command,
+    source,
+    status: method === 'item/started' ? 'inProgress' : 'completed',
+    ...(method === 'item/completed' ? { exitCode: 0 } : {})
+  })
+
+describe('Codex structured child-work producer', () => {
+  it('delivers evidence only after the journal wrote the frame and the legacy row republished', async () => {
+    const { send, records } = await producer()
+    send(turn('turn/started', THREAD_ID, 'p1'))
+    send(turn('turn/started', REVIEWER, 'r1'))
+    const deliveries = send(spawned(REVIEWER, 'review', 'p1'))
+    const kinds = deliveries.map((delivery) => delivery.kind)
+    // The frame's own rows, then the parent's republished row, and only then its children.
+    expect(kinds.filter((kind) => kind === 'journal').length).toBeGreaterThan(0)
+    expect(kinds.slice(kinds.indexOf('legacy'))).toEqual(['legacy', 'evidence'])
+    expect(records()).toEqual([
+      expect.objectContaining({ description: 'review', membership: 'live' })
+    ])
+  })
+
+  it('records the parent state today reads, at every journal write, while adding outcome and activity', async () => {
+    const { adapter, momentsOf, records, recordedLiveness, byDescription, display } =
+      await producer()
+    const steps: {
+      frame: Frame
+      lead: 'working' | 'done'
+      childWaits?: true
+      check?: () => void
+    }[] = [
+      { frame: turn('turn/started', THREAD_ID, 'p1'), lead: 'working' },
+      // Codex reports the child's turn before its announcement.
+      {
+        frame: turn('turn/started', REVIEWER, 'r1'),
+        lead: 'working',
+        check: () => expect(records()).toEqual([])
+      },
+      { frame: spawned(REVIEWER, 'review', 'p1'), lead: 'working' },
+      // An approved command: Codex starts it on the approval path and reports its exit from
+      // unified exec.
+      {
+        frame: shellFrame('item/started', REVIEWER, 'r1', 'cmd-1', 'npm test', 'agent'),
+        lead: 'working',
+        check: () => {
+          expect(byDescription('review')?.operation).toMatchObject({
+            toolName: 'Bash',
+            input: 'npm test',
+            basis: 'open'
+          })
+          expect(byDescription('npm test')).toMatchObject({
+            membership: 'live',
+            parentChildWorkId: byDescription('review')?.childWorkId
+          })
+        }
+      },
+      // The child starts a dev server it will leave running past its own turn.
+      {
+        frame: shellFrame('item/started', REVIEWER, 'r1', 'exec-1', 'npm run dev'),
+        lead: 'working',
+        check: () =>
+          expect(byDescription('npm run dev')).toMatchObject({
+            membership: 'live',
+            parentChildWorkId: byDescription('review')?.childWorkId
+          })
+      },
+      {
+        frame: shellFrame('item/completed', REVIEWER, 'r1', 'cmd-1', 'npm test'),
+        lead: 'working',
+        check: () => {
+          // A finished command leaves nothing behind.
+          expect(byDescription('npm test')).toBeUndefined()
+          // The dev server is still the child's open call while its turn runs.
+          expect(byDescription('review')?.operation).toMatchObject({
+            toolName: 'Bash',
+            input: 'npm run dev'
+          })
+        }
+      },
+      {
+        frame: item('item/completed', REVIEWER, 'r1', {
+          type: 'agentMessage',
+          id: 'msg-1',
+          text: 'Dev server is up'
+        }),
+        lead: 'working'
+      },
+      // The parent's turn ends first; its child keeps running.
+      {
+        frame: turn('turn/completed', THREAD_ID, 'p1'),
+        lead: 'done',
+        check: () =>
+          expect(byDescription('review')).toMatchObject({ membership: 'live', state: 'working' })
+      },
+      // The legacy task list carries no child state, so only the records can say a child waits,
+      // and the shared fold ranks that wait above the parent's own state.
+      {
+        frame: status(REVIEWER, ['waitingOnApproval']),
+        lead: 'done',
+        childWaits: true,
+        check: () => {
+          expect(byDescription('review')?.state).toBe('waiting')
+          expect(agentChildWorkLiveness(adapter.backgroundTaskState('session-1')?.tasks)).toBe(
+            'working'
+          )
+        }
+      },
+      { frame: status(REVIEWER, []), lead: 'done' },
+      {
+        frame: turn('turn/completed', REVIEWER, 'r1'),
+        lead: 'done',
+        check: () => {
+          expect(byDescription('review')).toMatchObject({
+            membership: 'settled',
+            outcome: 'succeeded',
+            lastMessage: 'Dev server is up'
+          })
+          expect(byDescription('npm run dev')).toMatchObject({
+            membership: 'live',
+            parentChildWorkId: byDescription('review')?.childWorkId
+          })
+          // Finished, but a shell it launched still runs: the CLI parent rule reads monitoring.
+          expect(display('review')).toBe('monitoring')
+        }
+      },
+      { frame: turn('turn/started', THREAD_ID, 'p2'), lead: 'working' },
+      // The parent asks the finished child a follow-up: the same record, a new run.
+      {
+        frame: turn('turn/started', REVIEWER, 'r2'),
+        lead: 'working',
+        check: () =>
+          expect(byDescription('review')).toMatchObject({
+            childWorkId: 'child-1',
+            membership: 'live',
+            invocation: { invocationId: 'r2', generation: 2 },
+            previousInvocations: [expect.objectContaining({ outcome: 'succeeded' })]
+          })
+      },
+      { frame: spawned(TESTER, 'test', 'p2'), lead: 'working' },
+      { frame: turn('turn/started', TESTER, 't1'), lead: 'working' },
+      { frame: spawned(LINTER, 'lint', 'p2'), lead: 'working' },
+      { frame: turn('turn/started', LINTER, 'l1'), lead: 'working' },
+      // Codex ends this child's turn with an error it will not retry, then a failed completion.
+      {
+        frame: {
+          method: 'error',
+          params: { threadId: LINTER, turnId: 'l1', willRetry: false, error: { message: 'boom' } }
+        },
+        lead: 'working',
+        check: () => expect(byDescription('lint')).toMatchObject({ membership: 'live' })
+      },
+      {
+        frame: turn('turn/completed', LINTER, 'l1', 'failed'),
+        lead: 'working',
+        check: () =>
+          expect(byDescription('lint')).toMatchObject({ membership: 'settled', outcome: 'failed' })
+      },
+      {
+        frame: turn('turn/completed', REVIEWER, 'r2', 'interrupted'),
+        lead: 'working',
+        check: () =>
+          expect(byDescription('review')).toMatchObject({
+            membership: 'settled',
+            outcome: 'cancelled'
+          })
+      },
+      { frame: turn('turn/completed', THREAD_ID, 'p2'), lead: 'done' },
+      {
+        frame: turn('turn/completed', TESTER, 't1', 'failed'),
+        lead: 'done',
+        check: () =>
+          expect(byDescription('test')).toMatchObject({ membership: 'settled', outcome: 'failed' })
+      },
+      {
+        frame: shellFrame('item/completed', REVIEWER, 'r1', 'exec-1', 'npm run dev'),
+        lead: 'done',
+        check: () => {
+          expect(byDescription('npm run dev')).toBeUndefined()
+          expect(display('review')).toBe('interrupted')
+        }
+      }
+    ]
+    let journalMoments = 0
+    for (const [index, step] of steps.entries()) {
+      const frameMoments = momentsOf(step.frame)
+      journalMoments += frameMoments.length
+      for (const [at, { recorded, legacy }] of frameMoments.entries()) {
+        expect({ index, at, parent: fold(step.lead, asStrip(recorded)) }).toEqual({
+          index,
+          at,
+          parent: fold(step.lead, legacy)
+        })
+      }
+      const legacy = agentChildWorkLiveness(adapter.backgroundTaskState('session-1')?.tasks)
+      const recorded = recordedLiveness()
+      const expected = step.childWaits ? 'waiting' : legacy
+      expect({ index, parent: fold(step.lead, recorded) }).toEqual({
+        index,
+        parent: fold(step.lead, expected)
+      })
+      expect({ index, liveness: recorded }).toEqual({ index, liveness: expected })
+      step.check?.()
+    }
+    expect(journalMoments).toBeGreaterThan(steps.length)
+    const settled = records()
+    await adapter.closeSession('session-1')
+    // Every child had already ended; closing the session changes none of what they said.
+    expect(records()).toEqual(settled)
+    expect(
+      records().map(({ description, membership, outcome }) => ({
+        description,
+        membership,
+        outcome
+      }))
+    ).toEqual([
+      { description: 'review', membership: 'settled', outcome: 'cancelled' },
+      { description: 'test', membership: 'settled', outcome: 'failed' },
+      { description: 'lint', membership: 'settled', outcome: 'failed' }
+    ])
+    expect(adapter.backgroundTaskState('session-1')).toBeUndefined()
+  })
+
+  it("never reads done while the main agent's own shell runs past its turn", async () => {
+    const { momentsOf, send, recordedLiveness } = await producer()
+    send(turn('turn/started', THREAD_ID, 'p1'))
+    send(shellFrame('item/started', THREAD_ID, 'p1', 'exec-dev', 'npm run dev'))
+    const monitoring = { stateName: 'working', workingMode: 'monitoring' }
+    // The turn ends with the dev server running: straight to monitoring, never done in between.
+    const turnEnd = momentsOf(turn('turn/completed', THREAD_ID, 'p1'))
+    expect(turnEnd.length).toBeGreaterThan(0)
+    for (const { recorded } of turnEnd) {
+      expect(fold('done', recorded)).toEqual(monitoring)
+    }
+    expect(fold('done', recordedLiveness())).toEqual(monitoring)
+    momentsOf(shellFrame('item/completed', THREAD_ID, 'p1', 'exec-dev', 'npm run dev'))
+    expect(fold('done', recordedLiveness())).toEqual({ stateName: 'done' })
+  })
+
+  it('ends an approval left unanswered when its turn ends: Codex never ran the command', async () => {
+    const { adapter, codex, send, records, recordedLiveness, display, byDescription } =
+      await producer()
+    const approve = (threadId: string, turnId: string, itemId: string, command: string) => {
+      // The approval path starts the item before it asks, and drops the question at turn end.
+      send(shellFrame('item/started', threadId, turnId, itemId, command, 'agent'))
+      codex.connections[0]!.handlers.onServerRequest?.({
+        id: `approval-${itemId}`,
+        method: 'item/commandExecution/requestApproval',
+        params: { itemId, threadId, turnId }
+      })
+    }
+    send(turn('turn/started', THREAD_ID, 'p1'))
+    send(turn('turn/started', REVIEWER, 'r1'))
+    send(spawned(REVIEWER, 'review', 'p1'))
+    approve(REVIEWER, 'r1', 'call-child', 'npm run e2e')
+    approve(THREAD_ID, 'p1', 'call-main', 'npm run dev')
+    expect(records().filter((record) => record.kind === 'command')).toHaveLength(2)
+    // The user stops the child, then the main agent, each at its approval.
+    send(turn('turn/completed', REVIEWER, 'r1', 'interrupted'))
+    expect(byDescription('npm run e2e')).toBeUndefined()
+    expect(display('review')).toBe('interrupted')
+    send(turn('turn/completed', THREAD_ID, 'p1', 'interrupted'))
+    expect(byDescription('npm run dev')).toBeUndefined()
+    expect(adapter.backgroundTaskState('session-1')).toBeNull()
+    expect(fold('done', recordedLiveness())).toEqual({ stateName: 'done' })
+  })
+
+  it('keeps an answered approval running past its turn', async () => {
+    const { adapter, codex, send, byDescription } = await producer()
+    send(turn('turn/started', THREAD_ID, 'p1'))
+    send(shellFrame('item/started', THREAD_ID, 'p1', 'call-1', 'npm run dev', 'agent'))
+    codex.connections[0]!.handlers.onServerRequest?.({
+      id: 'approval-1',
+      method: 'item/commandExecution/requestApproval',
+      params: { itemId: 'call-1', threadId: THREAD_ID, turnId: 'p1' }
+    })
+    await adapter.answerPrompt({
+      sessionId: 'session-1',
+      itemId: 'call-1',
+      kind: 'approval',
+      response: { kind: 'option', optionId: 'accept' },
+      fence: 7,
+      commit: async () => {}
+    })
+    send(turn('turn/completed', THREAD_ID, 'p1'))
+    expect(byDescription('npm run dev')).toMatchObject({ membership: 'live' })
+    expect(adapter.backgroundTaskState('session-1')?.tasks).toEqual([
+      expect.objectContaining({ kind: 'command', description: 'npm run dev' })
+    ])
+  })
+
+  it("numbers a child's runs as the journal does: a row's attempt is its record's generation", async () => {
+    const { send, byDescription, stampOf } = await producer()
+    const says = (turnId: string, text: string) =>
+      item('item/completed', REVIEWER, turnId, { type: 'agentMessage', id: `msg-${text}`, text })
+    // The journal stamps a child row with its run only once it is past the first.
+    const runs = (text: string) => {
+      const stamp = stampOf(text)
+      return {
+        agentId: stamp?.agentId,
+        attempt: stamp ? (stamp.attempt ?? 1) : undefined,
+        generation: byDescription('review')?.invocation.generation
+      }
+    }
+    send(turn('turn/started', THREAD_ID, 'p1'))
+    // Codex reports the child's first turn before the spawn that announces it.
+    send(turn('turn/started', REVIEWER, 'r1'))
+    send(spawned(REVIEWER, 'review', 'p1'))
+    send(says('r1', 'run 1'))
+    expect(runs('run 1')).toEqual({ agentId: REVIEWER, attempt: 1, generation: 1 })
+    send(turn('turn/completed', REVIEWER, 'r1'))
+    // Each follow-up the parent sends is the child's next run, on both sides.
+    for (const run of [2, 3]) {
+      send(turn('turn/started', REVIEWER, `r${run}`))
+      send(says(`r${run}`, `run ${run}`))
+      expect(runs(`run ${run}`)).toEqual({ agentId: REVIEWER, attempt: run, generation: run })
+      send(turn('turn/completed', REVIEWER, `r${run}`))
+    }
+  })
+
+  it('settles a live child with no reported outcome when the provider exits unexpectedly', async () => {
+    const { codex, send, records } = await producer()
+    send(turn('turn/started', THREAD_ID, 'p1'))
+    send(spawned(REVIEWER, 'review', 'p1'))
+    send(turn('turn/started', REVIEWER, 'r1'))
+    expect(records()).toEqual([
+      expect.objectContaining({ description: 'review', membership: 'live', state: 'working' })
+    ])
+    codex.connections[0]!.handlers.onExit?.(new Error('provider exited'))
+    expect(records()).toEqual([
+      expect.objectContaining({
+        description: 'review',
+        membership: 'settled',
+        state: 'done',
+        outcome: 'unknown'
+      })
+    ])
+  })
+})
diff --git a/src/main/codex/codex-structured-compaction-refusal.test.ts b/src/main/codex/codex-structured-compaction-refusal.test.ts
new file mode 100644
index 000000000000..437f32f0a8ff
--- /dev/null
+++ b/src/main/codex/codex-structured-compaction-refusal.test.ts
@@ -0,0 +1,28 @@
+// A compaction Codex refuses up front keeps Codex's own words for the chat's failure row.
+
+import { describe, expect, it } from 'vitest'
+import { CodexAppServerRequestError } from './codex-app-server-connection'
+import { acquired, fakeCodex } from './codex-structured-session-adapter-fixture'
+
+describe('Codex compaction refused at the request', () => {
+  it("carries Codex's message as the detail, apart from Orca's wrapper", async () => {
+    const codex = fakeCodex({
+      'thread/compact/start': () => {
+        throw new CodexAppServerRequestError(
+          'thread/compact/start',
+          -32600,
+          'codex app-server thread/compact/start failed: thread has nothing to compact',
+          'thread has nothing to compact'
+        )
+      }
+    })
+    const adapter = await acquired(codex)
+
+    await expect(
+      adapter.compact({ turnId: 'compact-1', sessionId: 'session-1', fence: 7 })
+    ).resolves.toEqual({
+      outcome: 'failed',
+      detail: { text: 'thread has nothing to compact', audience: 'person' }
+    })
+  })
+})
diff --git a/src/main/codex/codex-structured-conversation-stop.test.ts b/src/main/codex/codex-structured-conversation-stop.test.ts
new file mode 100644
index 000000000000..1842afada724
--- /dev/null
+++ b/src/main/codex/codex-structured-conversation-stop.test.ts
@@ -0,0 +1,94 @@
+// A Codex Stop that names no turn. The fake keeps Codex 0.157's turn bookkeeping: it answers
+// `turn/start` before it opens the turn, and refuses an interrupt until then.
+
+import { describe, expect, it, vi } from 'vitest'
+import {
+  CODEX_TEST_THREAD_ID,
+  codexTurnLifecycleRig
+} from './codex-structured-dispatch-test-support'
+
+type Rig = Awaited<ReturnType<typeof codexTurnLifecycleRig>>
+
+async function openedTurn(rig: Rig): Promise<void> {
+  const sending = rig.send('client-1')
+  await vi.waitFor(() => expect(rig.turns.turnId).toBe('turn-1'))
+  rig.turns.start()
+  await sending
+}
+
+const stop = (rig: Rig, resolveLiveTurnId?: () => string | null) =>
+  rig.adapter.cancelTurn({
+    sessionId: 'session-1',
+    fence: 7,
+    ...(resolveLiveTurnId ? { resolveLiveTurnId } : {})
+  })
+
+describe('a Codex Stop that names no turn', () => {
+  it('interrupts the turn Codex opened when the journal shows none yet', async () => {
+    const rig = await codexTurnLifecycleRig()
+    await openedTurn(rig)
+
+    await expect(stop(rig, () => null)).resolves.toEqual({ cancelled: true })
+    expect(rig.interrupts().map((call) => call.params?.turnId)).toEqual(['turn-1'])
+  })
+
+  it('interrupts no turn that already ended', async () => {
+    const rig = await codexTurnLifecycleRig()
+    await openedTurn(rig)
+    rig.turns.end('completed')
+
+    await expect(stop(rig)).resolves.toEqual({ cancelled: false })
+    expect(rig.interrupts()).toEqual([])
+  })
+
+  it("names the journal's turn over the one it saw open, and carries Codex's refusal", async () => {
+    const rig = await codexTurnLifecycleRig()
+    await openedTurn(rig)
+
+    await expect(stop(rig, () => 'turn-journal')).resolves.toEqual({
+      cancelled: false,
+      refusal: {
+        detail: {
+          text: 'expected active turn id turn-journal but found turn-1',
+          audience: 'person'
+        }
+      }
+    })
+    expect(rig.interrupts().map((call) => call.params?.turnId)).toEqual(['turn-journal'])
+  })
+
+  it('interrupts nothing for another fence', async () => {
+    const rig = await codexTurnLifecycleRig()
+    await openedTurn(rig)
+
+    await expect(rig.adapter.cancelTurn({ sessionId: 'session-1', fence: 6 })).resolves.toEqual({
+      cancelled: false
+    })
+    expect(rig.interrupts()).toEqual([])
+  })
+
+  it('interrupts no earlier turn while a compaction the journal shows has not started', async () => {
+    const rig = await codexTurnLifecycleRig()
+    await openedTurn(rig)
+    rig.turns.end('completed')
+    const compaction = rig.adapter.compact({
+      turnId: 'compact:operation-1',
+      sessionId: 'session-1',
+      fence: 7
+    })
+    await vi.waitFor(() =>
+      expect(rig.codex.connections[0]!.calls.at(-1)?.method).toBe('thread/compact/start')
+    )
+
+    await expect(stop(rig, () => 'compact:operation-1')).resolves.toEqual({ cancelled: false })
+    expect(rig.interrupts()).toEqual([])
+
+    rig.notify('turn/started', { threadId: CODEX_TEST_THREAD_ID, turn: { id: 'turn-compact' } })
+    rig.notify('thread/compacted', { threadId: CODEX_TEST_THREAD_ID })
+    rig.notify('turn/completed', {
+      threadId: CODEX_TEST_THREAD_ID,
+      turn: { id: 'turn-compact', status: 'completed' }
+    })
+    await expect(compaction).resolves.toEqual({ outcome: 'compacted' })
+  })
+})
diff --git a/src/main/codex/codex-structured-dispatch-admission.test.ts b/src/main/codex/codex-structured-dispatch-admission.test.ts
index 5fc811b9382c..b3c8a3fefeb7 100644
--- a/src/main/codex/codex-structured-dispatch-admission.test.ts
+++ b/src/main/codex/codex-structured-dispatch-admission.test.ts
@@ -7,6 +7,7 @@ import {
   acquiredCodexAdapter,
   echoUserMessage,
   fakeCodexAppServer,
+  openAfterTurnStarts,
   startTurn,
   CODEX_TEST_THREAD_ID,
   CODEX_TEST_USER_MESSAGE,
@@ -140,7 +141,12 @@ describe('codex dispatch admission', () => {
     const { CodexAppServerRequestError } = await import('./codex-app-server-connection')
     const codex = fakeCodexAppServer({
       'turn/start': () => {
-        throw new CodexAppServerRequestError('turn/start', -32602, 'thread not found')
+        throw new CodexAppServerRequestError(
+          'turn/start',
+          -32602,
+          'codex app-server turn/start failed: thread not found',
+          'thread not found'
+        )
       }
     })
     const settlements: LateSettlement[] = []
@@ -148,9 +154,14 @@ describe('codex dispatch admission', () => {
     const connection = codex.connections[0]!
     startTurn(connection, 'turn-1')
 
+    // Codex's own words reach the sentence and the fact; Orca's prefix reaches neither.
     expect(await send(adapter, 'client-1')).toEqual({
       state: 'rejected',
-      reason: 'thread not found'
+      reason: 'The provider did not accept this message: thread not found.',
+      rejection: {
+        kind: 'providerRejected',
+        detail: { text: 'thread not found', audience: 'person' }
+      }
     })
 
     // A refused write is disarmed, so a later echo of that id settles nothing.
@@ -205,8 +216,9 @@ describe('codex dispatch admission', () => {
     await expect(send(adapter, 'client-unknown', 1_700_000_000_100)).rejects.toThrow(
       'request timed out after write'
     )
-    await send(adapter, 'client-later', 1_700_000_000_400)
-    startTurn(connection, 'turn-later')
+    const later = send(adapter, 'client-later', 1_700_000_000_400)
+    await openAfterTurnStarts(connection, 2, () => startTurn(connection, 'turn-later'))
+    await later
     echoUserMessage(connection, {
       turnId: 'turn-later',
       itemId: 'item-later',
@@ -269,9 +281,10 @@ describe('codex dispatch admission', () => {
     const adapter = await acquiredCodexAdapter({ codex, settlements, sink: recorded.sink })
     const connection = codex.connections[0]!
 
-    await send(adapter, 'client-opening', 1_700_000_000_600)
-    await send(adapter, 'client-queued', 1_700_000_000_200)
-    startTurn(connection, 'turn-1')
+    const opening = send(adapter, 'client-opening', 1_700_000_000_600)
+    const queued = send(adapter, 'client-queued', 1_700_000_000_200)
+    await openAfterTurnStarts(connection, 2, () => startTurn(connection, 'turn-1'))
+    await Promise.all([opening, queued])
     await send(adapter, 'client-mid-turn', 1_700_000_000_100)
 
     echoUserMessage(connection, {
@@ -315,8 +328,9 @@ describe('codex dispatch admission', () => {
     const adapter = await acquiredCodexAdapter({ codex, settlements, sink: recorded.sink })
     const connection = codex.connections[0]!
 
-    await send(adapter, 'client-late-echo', 1_700_000_000_100)
-    startTurn(connection, 'turn-1')
+    const sending = send(adapter, 'client-late-echo', 1_700_000_000_100)
+    await openAfterTurnStarts(connection, 1, () => startTurn(connection, 'turn-1'))
+    await sending
     connection.handlers.onNotification?.('turn/completed', {
       threadId: CODEX_TEST_THREAD_ID,
       turn: { id: 'turn-1' }
@@ -347,7 +361,8 @@ describe('codex dispatch admission', () => {
     }
     expect(await send(adapter, 'client-overflow')).toEqual({
       state: 'rejected',
-      reason: 'codex structured dispatch queue is full'
+      reason: 'codex structured dispatch queue is full',
+      rejection: { kind: 'queueFull' }
     })
 
     echoUserMessage(connection, { turnId: 'turn-1', itemId: 'item-u0', clientId: 'client-0' })
diff --git a/src/main/codex/codex-structured-dispatch-echo.test.ts b/src/main/codex/codex-structured-dispatch-echo.test.ts
index 94826c1df12f..a6791e5e788d 100644
--- a/src/main/codex/codex-structured-dispatch-echo.test.ts
+++ b/src/main/codex/codex-structured-dispatch-echo.test.ts
@@ -126,3 +126,44 @@ describe('readCodexDispatchEcho', () => {
     ).toBeNull()
   })
 })
+
+describe('the turn Codex answered a send into but has not opened', () => {
+  const NONE_OPEN = new Set<string>()
+
+  it('is the turn the latest armed send was answered into', () => {
+    const echoes = createCodexDispatchEchoes()
+    echoes.arm('client-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+    echoes.arm('client-2')
+    echoes.bindTurn('client-2', 'thread-1', 'turn-2')
+
+    expect(echoes.answeredUnopenedTurn('thread-1', NONE_OPEN)).toBe('turn-2')
+  })
+
+  it('is none once Codex opened that turn', () => {
+    const echoes = createCodexDispatchEchoes()
+    echoes.arm('client-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+
+    expect(echoes.answeredUnopenedTurn('thread-1', new Set(['turn-1']))).toBeNull()
+  })
+
+  it('is none once that turn ended, even with its send still armed for an echo', () => {
+    const echoes = createCodexDispatchEchoes()
+    echoes.arm('client-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+    // A completed end leaves its unechoed send armed.
+    expect(echoes.endTurn('thread-1', 'turn-1', { status: 'completed' })).toEqual([])
+
+    expect(echoes.answeredUnopenedTurn('thread-1', NONE_OPEN)).toBeNull()
+  })
+
+  it('is none for a send not yet answered, or answered on another thread', () => {
+    const echoes = createCodexDispatchEchoes()
+    echoes.arm('client-1')
+    echoes.arm('client-2')
+    echoes.bindTurn('client-2', 'thread-2', 'turn-2')
+
+    expect(echoes.answeredUnopenedTurn('thread-1', NONE_OPEN)).toBeNull()
+  })
+})
diff --git a/src/main/codex/codex-structured-dispatch-echo.ts b/src/main/codex/codex-structured-dispatch-echo.ts
index 4ecfcf2da01a..0d3794b5136b 100644
--- a/src/main/codex/codex-structured-dispatch-echo.ts
+++ b/src/main/codex/codex-structured-dispatch-echo.ts
@@ -1,8 +1,17 @@
+import type { ProviderDiagnostic } from '../../shared/agent-session-failure'
 import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types'
 
-/** Sends awaiting their echo. A send whose echo never arrives is
- *  retired by the journal's pending-submission recovery on exit, not from here. */
+/** Sends awaiting their echo. One bound to a turn that ended without taking it settles from that
+ *  end; any other whose echo never arrives is retired by the journal's recovery on exit. */
 export const MAX_CODEX_PENDING_DISPATCH_ECHOES = 256
+/** Turn ends kept for an answer read after the turn it names had already ended. */
+export const MAX_CODEX_RECORDED_TURN_ENDS = 64
+
+/** How a primary-thread turn ended, as Codex reported it. */
+export type CodexTurnEnd =
+  | { status: 'completed' }
+  | { status: 'interrupted' }
+  | { status: 'failed'; detail?: ProviderDiagnostic }
 
 export type CodexDispatchRequestOrigin = {
   requestedAt: number
@@ -24,6 +33,19 @@ export type CodexDispatchEchoes = {
   settle: (clientMessageId: string) => boolean
   /** Drops an armed send whose write never reached the provider. */
   disarm: (clientMessageId: string) => void
+  /**
+   * Binds a send to the turn Codex answered it into. Returns that turn's end when the answer is
+   * read after it; a send that end settles is no longer armed.
+   */
+  bindTurn: (clientMessageId: string, threadId: string, turnId: string) => CodexTurnEnd | null
+  /** The turn the latest armed send was answered into that is neither in `openTurnIds` nor ended:
+   *  one Codex has picked for the send but not opened. */
+  answeredUnopenedTurn: (threadId: string, openTurnIds: ReadonlySet<string>) => string | null
+  /**
+   * Records a turn's end and returns the sends bound to it that it settles: all of them unless it
+   * completed, which echoes its pending input first, so one it never echoed waits for recovery.
+   */
+  endTurn: (threadId: string, turnId: string, end: CodexTurnEnd) => string[]
   /** Submission origin for this exact send, retained until its echo settles it. */
   requestOrigin: (clientMessageId: string) => CodexDispatchRequestOrigin | null
   /** Highest causal sequence assigned to a dispatch in this session. */
@@ -33,8 +55,14 @@ export type CodexDispatchEchoes = {
 }
 
 export function createCodexDispatchEchoes(): CodexDispatchEchoes {
-  const armed = new Map<string, { requestedAt: number | null; sequence: number }>()
+  const armed = new Map<
+    string,
+    { requestedAt: number | null; sequence: number; turn?: { threadId: string; turnId: string } }
+  >()
+  const endedTurns = new Map<string, CodexTurnEnd>()
   let nextSequence = 0
+  const turnKey = (threadId: string, turnId: string): string => JSON.stringify([threadId, turnId])
+  const settles = (end: CodexTurnEnd): boolean => end.status !== 'completed'
   return {
     arm(clientMessageId, requestedAt) {
       const existing = armed.get(clientMessageId)
@@ -52,6 +80,51 @@ export function createCodexDispatchEchoes(): CodexDispatchEchoes {
     },
     settle: (clientMessageId) => armed.delete(clientMessageId),
     disarm: (clientMessageId) => void armed.delete(clientMessageId),
+    bindTurn: (clientMessageId, threadId, turnId) => {
+      const entry = armed.get(clientMessageId)
+      if (!entry) {
+        return null
+      }
+      entry.turn = { threadId, turnId }
+      const end = endedTurns.get(turnKey(threadId, turnId)) ?? null
+      if (end && settles(end)) {
+        armed.delete(clientMessageId)
+      }
+      return end
+    },
+    answeredUnopenedTurn: (threadId, openTurnIds) => {
+      const answered = [...armed.values()].flatMap(({ turn }) =>
+        turn?.threadId === threadId &&
+        !openTurnIds.has(turn.turnId) &&
+        !endedTurns.has(turnKey(threadId, turn.turnId))
+          ? [turn.turnId]
+          : []
+      )
+      return answered.at(-1) ?? null
+    },
+    endTurn: (threadId, turnId, end) => {
+      const turn = turnKey(threadId, turnId)
+      endedTurns.delete(turn)
+      endedTurns.set(turn, end)
+      for (const oldest of endedTurns.keys()) {
+        if (endedTurns.size <= MAX_CODEX_RECORDED_TURN_ENDS) {
+          break
+        }
+        endedTurns.delete(oldest)
+      }
+      if (!settles(end)) {
+        return []
+      }
+      const settled = [...armed].flatMap(([clientMessageId, entry]) =>
+        entry.turn && turnKey(entry.turn.threadId, entry.turn.turnId) === turn
+          ? [clientMessageId]
+          : []
+      )
+      for (const clientMessageId of settled) {
+        armed.delete(clientMessageId)
+      }
+      return settled
+    },
     requestOrigin: (clientMessageId) => {
       const origin = armed.get(clientMessageId)
       return origin?.requestedAt === null || origin === undefined
@@ -61,6 +134,7 @@ export function createCodexDispatchEchoes(): CodexDispatchEchoes {
     latestSequence: () => nextSequence - 1,
     clear: () => {
       armed.clear()
+      endedTurns.clear()
       nextSequence = 0
     },
     get size() {
diff --git a/src/main/codex/codex-structured-dispatch-test-support.ts b/src/main/codex/codex-structured-dispatch-test-support.ts
index 42efd57bab49..86f19349ee25 100644
--- a/src/main/codex/codex-structured-dispatch-test-support.ts
+++ b/src/main/codex/codex-structured-dispatch-test-support.ts
@@ -1,5 +1,5 @@
+import { expect, vi } from 'vitest'
 import type {
-  AgentJournalItemIdentity,
   AgentJournalMessageItem,
   AgentSessionJournalIdentity
 } from '../../shared/agent-session-journal-types'
@@ -11,6 +11,7 @@ import type {
 } from './codex-app-server-connection'
 import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
 import { CodexStructuredSessionAdapter } from './codex-structured-session-adapter'
+import { codexTurnLifecycleFake } from './codex-turn-lifecycle-fake'
 import type { CodexStructuredSessionAdapterDeps } from './codex-structured-session-state'
 
 export const CODEX_TEST_THREAD_ID = 'thread-abc'
@@ -30,11 +31,9 @@ type FakeConnection = Omit<CodexAppServerConnection, 'closed'> & {
   calls: { method: string; params?: Record<string, unknown> }[]
 }
 
-export type LateSettlement = {
-  sessionId: string
-  clientMessageId: string
-  providerIdentity: AgentJournalItemIdentity
-}
+export type LateSettlement = Parameters<
+  NonNullable<CodexStructuredSessionAdapterDeps['onDispatchSettledLate']>
+>[0]
 
 /** A `codex app-server` whose turn traffic the test drives by hand. */
 export function fakeCodexAppServer(routes: Record<string, CodexTestRoute> = {}): {
@@ -86,6 +85,7 @@ export async function acquiredCodexAdapter(input: {
   settlements: LateSettlement[]
   sink?: StructuredAgentSessionEventSink
   captureTurnProcesses?: CodexStructuredSessionAdapterDeps['captureTurnProcesses']
+  requestTimeoutMs?: number
 }): Promise<CodexStructuredSessionAdapter> {
   const adapter = new CodexStructuredSessionAdapter({
     resolveLaunch: async () => ({
@@ -98,8 +98,11 @@ export async function acquiredCodexAdapter(input: {
     openConnection: input.codex.openConnection,
     readProcessStartTime: async () => 1_700_000_000_000,
     captureTurnProcesses: input.captureTurnProcesses ?? (async () => null),
+    // A Stop must never reach for real processes on this machine under the fake pid.
+    terminateTurnProcesses: async () => true,
     now: () => 1_700_000_000_500,
-    onDispatchSettledLate: (settlement) => input.settlements.push(settlement)
+    onDispatchSettledLate: (settlement) => input.settlements.push(settlement),
+    ...(input.requestTimeoutMs === undefined ? {} : { requestTimeoutMs: input.requestTimeoutMs })
   })
   const identity: AgentSessionJournalIdentity = {
     sessionId: 'session-1',
@@ -133,9 +136,50 @@ export function echoUserMessage(
   })
 }
 
-export function startTurn(connection: FakeConnection, turnId: string): void {
+export function startTurn(connection: Pick<FakeConnection, 'handlers'>, turnId: string): void {
   connection.handlers.onNotification?.('turn/started', {
     threadId: CODEX_TEST_THREAD_ID,
     turn: { id: turnId }
   })
 }
+
+/** Runs `open` once `count` sends reached Codex, which opens a turn only after it answers. */
+export async function openAfterTurnStarts(
+  connection: Pick<FakeConnection, 'calls'>,
+  count: number,
+  open: () => void
+): Promise<void> {
+  await vi.waitFor(() =>
+    expect(connection.calls.filter((call) => call.method === 'turn/start')).toHaveLength(count)
+  )
+  open()
+}
+
+/** An acquired adapter over a fake Codex that keeps Codex's own turn bookkeeping. */
+export async function codexTurnLifecycleRig(options: { requestTimeoutMs?: number } = {}) {
+  const codex = fakeCodexAppServer()
+  const notify = (method: string, params: unknown): void =>
+    codex.connections.at(-1)?.handlers.onNotification?.(method, params)
+  const turns = codexTurnLifecycleFake(CODEX_TEST_THREAD_ID, () => notify)
+  Object.assign(codex.routes, turns.routes)
+  const settlements: LateSettlement[] = []
+  const adapter = await acquiredCodexAdapter({ codex, settlements, ...options })
+  const send = (clientMessageId: string) =>
+    adapter.dispatch({
+      sessionId: 'session-1',
+      clientMessageId,
+      body: CODEX_TEST_USER_MESSAGE,
+      fence: 7
+    })
+  const interrupts = () =>
+    codex.connections[0]!.calls.filter((call) => call.method === 'turn/interrupt')
+  return { codex, turns, adapter, send, settlements, notify, interrupts }
+}
+
+/** The promise's value, or `held` when it has not settled `withinMs` after every earlier task. */
+export function settledWithin<T>(promise: Promise<T>, withinMs = 50): Promise<T | 'held'> {
+  return Promise.race([
+    promise,
+    new Promise<'held'>((resolve) => setTimeout(() => resolve('held'), withinMs))
+  ])
+}
diff --git a/src/main/codex/codex-structured-fast-mode.test.ts b/src/main/codex/codex-structured-fast-mode.test.ts
index 3029bff280b4..73f279bd2c0f 100644
--- a/src/main/codex/codex-structured-fast-mode.test.ts
+++ b/src/main/codex/codex-structured-fast-mode.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it, vi } from 'vitest'
 import {
   USER_MESSAGE,
   adapterFor,
+  answerWithOpenedTurn,
   fakeCodex,
   identityFor,
   type Route
@@ -19,9 +20,9 @@ describe('Codex structured Fast mode dispatch', () => {
           }
         ],
         nextCursor: null
-      }),
-      'turn/start': () => ({ turn: { id: 'turn-fast' } })
+      })
     })
+    codex.routes['turn/start'] = answerWithOpenedTurn(codex, 'turn-fast')
     const adapter = adapterFor(codex)
     await adapter.acquire({
       identity: identityFor('session-1'),
@@ -43,7 +44,8 @@ describe('Codex structured Fast mode dispatch', () => {
   })
 
   it('uses Standard on the first turn after acquisition with Fast explicitly off', async () => {
-    const codex = fakeCodex({ 'turn/start': () => ({ turn: { id: 'turn-standard' } }) })
+    const codex = fakeCodex()
+    codex.routes['turn/start'] = answerWithOpenedTurn(codex, 'turn-standard')
     const adapter = adapterFor(codex)
     await adapter.acquire({
       identity: identityFor('session-1'),
@@ -91,10 +93,8 @@ describe('Codex structured Fast mode dispatch', () => {
         ],
         nextCursor: null
       }))
-      const codex = fakeCodex({
-        'model/list': listModels,
-        'turn/start': () => ({ turn: { id: 'turn-recovered' } })
-      })
+      const codex = fakeCodex({ 'model/list': listModels })
+      codex.routes['turn/start'] = answerWithOpenedTurn(codex, 'turn-recovered')
       const adapter = adapterFor(codex)
       await expect(
         adapter.acquire({
diff --git a/src/main/codex/codex-structured-journal-provider-verdicts.ts b/src/main/codex/codex-structured-journal-provider-verdicts.ts
deleted file mode 100644
index c8685dfedab9..000000000000
--- a/src/main/codex/codex-structured-journal-provider-verdicts.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// What Codex's own verdict frames mean beyond the row they print.
-//
-// Both are decoration to the transcript and load-bearing to the session's state,
-// which is why they are read here rather than left to the generic-frame fallback.
-
-import { codexThreadStoppedRunning, readCodexErrorWillRetry } from './codex-structured-thread-facts'
-
-export type CodexProviderVerdict =
-  /**
-   * Codex ended this turn with a fault.
-   *
-   * The app server emits `error` ONLY for a failure that affects turn status, and
-   * hardcodes `willRetry: false` there; a stream error it is about to retry carries
-   * `willRetry: true` and ends nothing. `turn/completed` may never follow, so this
-   * frame is the turn's only end — without it the running lifecycle row is a latch
-   * nothing re-derives and the chat reads working for the life of the session.
-   */
-  | 'turn-failed'
-  /**
-   * Codex reports the thread is no longer running.
-   *
-   * This settles no OPEN turn: the app server clears `running` on every error,
-   * including the ones it says do not affect turn status, so a turn still open
-   * here is still running and `turn/completed` is its end. What it does settle is
-   * a send whose dispatch was never answered — a timed-out dispatch is recorded
-   * as unverified delivery, reads as work still owed, and nothing else in a live
-   * session re-derives it.
-   */
-  | 'thread-stopped-running'
-  | null
-
-export function readCodexProviderVerdict(method: string, params: unknown): CodexProviderVerdict {
-  if (method === 'error') {
-    return readCodexErrorWillRetry(params) ? null : 'turn-failed'
-  }
-  if (method === 'thread/status/changed') {
-    return codexThreadStoppedRunning(params) ? 'thread-stopped-running' : null
-  }
-  return null
-}
diff --git a/src/main/codex/codex-structured-journal-restore-turn-grouping.test.ts b/src/main/codex/codex-structured-journal-restore-turn-grouping.test.ts
new file mode 100644
index 000000000000..8ce2591f57c3
--- /dev/null
+++ b/src/main/codex/codex-structured-journal-restore-turn-grouping.test.ts
@@ -0,0 +1,98 @@
+import { describe, expect, it } from 'vitest'
+import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types'
+import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key'
+import { nativeChatTurnFold } from '../../shared/native-chat-turn-fold'
+import { nativeChatRowTurnKeys } from '../../shared/native-chat-turn-grouping'
+import type { NativeChatMessage } from '../../shared/native-chat-types'
+import { projectStructuredItemToNativeChat } from '../../shared/structured-agent-session-projection'
+import { selectStructuredAgentTurnBars } from '../../shared/structured-agent-session-turn-timing'
+import { createCodexJournalTranslator } from './codex-structured-journal-translation'
+
+const THREAD_ID = 'thread-abc'
+
+function historicalTurn(index: number): Record<string, unknown> {
+  const id = `turn-${index}`
+  return {
+    id,
+    status: 'completed',
+    startedAt: 1_700_000_000 + index * 100,
+    completedAt: 1_700_000_050 + index * 100,
+    items: [
+      {
+        type: 'userMessage',
+        id: `user-${index}`,
+        content: [{ type: 'text', text: `ask ${index}` }]
+      },
+      { type: 'agentMessage', id: `interim-${index}`, text: `looking ${index}` },
+      { type: 'agentMessage', id: `answer-${index}`, text: `answer ${index}` }
+    ]
+  }
+}
+
+/** What the journal hands a reader after a restore: rows in append order. */
+function restoredJournal(turnCount: number): AgentJournalRenderItem[] {
+  const items: AgentJournalRenderItem[] = []
+  const translator = createCodexJournalTranslator({
+    sink: {
+      appendItem: (identity, body) => {
+        const sequence = items.length + 1
+        items.push({
+          itemId: agentJournalItemKey(identity),
+          revision: 1,
+          body,
+          sequence,
+          observedAt: sequence
+        })
+      },
+      appendTombstone: () => {},
+      publish: () => {}
+    },
+    sessionId: 'session-1',
+    primaryThreadId: () => THREAD_ID
+  })
+  const turns = Array.from({ length: turnCount }, (_, index) => historicalTurn(index + 1))
+  expect(translator.restoreThread(THREAD_ID, { turns })).toEqual({ accepted: true })
+  return items
+}
+
+describe('grouping a Codex thread restored from full history', () => {
+  it('keeps each turn with its own rows and folds each to its own answer', () => {
+    const items = restoredJournal(3)
+    const bars = selectStructuredAgentTurnBars(items, [], null)
+    const messages = items
+      .map(projectStructuredItemToNativeChat)
+      .filter((message): message is NativeChatMessage => message !== null)
+    const turnKeys = nativeChatRowTurnKeys(messages, bars.turnKeysByItemId)
+    const opener = (index: number): string => `codex:${THREAD_ID}:turn-${index}:0`
+
+    expect(messages.map((message, index) => [message.role, turnKeys[index]])).toEqual([
+      ['user', opener(1)],
+      ['assistant', opener(1)],
+      ['assistant', opener(1)],
+      ['user', opener(2)],
+      ['assistant', opener(2)],
+      ['assistant', opener(2)],
+      ['user', opener(3)],
+      ['assistant', opener(3)],
+      ['assistant', opener(3)]
+    ])
+    expect([...bars.settledTurns.keys()]).toEqual([opener(1), opener(2), opener(3)])
+
+    const { foldedRows } = nativeChatTurnFold({
+      rows: messages.map((message, index) => ({
+        turnKey: turnKeys[index],
+        role: message.role,
+        rendersProse: true,
+        outlivesTurn: false
+      })),
+      settledTurnKeys: new Set(bars.settledTurns.keys()),
+      expandedTurnKeys: new Set()
+    })
+    const visible = messages.filter((_, index) => !foldedRows.has(index))
+    expect(visible.map((message) => message.blocks)).toEqual(
+      ['ask 1', 'answer 1', 'ask 2', 'answer 2', 'ask 3', 'answer 3'].map((text) => [
+        { type: 'text', text }
+      ])
+    )
+  })
+})
diff --git a/src/main/codex/codex-structured-journal-settlement.ts b/src/main/codex/codex-structured-journal-settlement.ts
index e2164b9498dd..39d52e6b0475 100644
--- a/src/main/codex/codex-structured-journal-settlement.ts
+++ b/src/main/codex/codex-structured-journal-settlement.ts
@@ -174,82 +174,6 @@ export function settleCodexJournalTurn(input: {
   return ADMITTED
 }
 
-/** Settle streamed items whose terminal notification was rejected as oversized. */
-export function settleCodexOversizedNotification(input: {
-  sessionId: string
-  threadId: string
-  method: string
-  sink: StructuredAgentSessionEventSink
-  streams: CodexStructuredItemStreams
-  activeItems: Map<string, CodexActiveJournalItem>
-  linkageFor: CodexRowLinkage
-}): StructuredAgentSessionSinkAdmission {
-  const itemType = oversizedStreamItemType(input.method)
-  if (!itemType) {
-    return ADMITTED
-  }
-  const mutations: JournalLifecycleMutationInput[] = []
-  const activeItemsToForget: { key: string; threadId: string; itemId: string }[] = []
-  for (const [key, active] of input.activeItems) {
-    if (active.threadId !== input.threadId || active.item.type !== itemType) {
-      continue
-    }
-    const streamed = input.streams.snapshot(active.threadId, active.item.id)
-    const translated = streamed
-      ? codexStreamingJournalItem(active.item, streamed.text)
-      : codexJournalItem(active.item)
-    const body = interruptedBody(translated.body)
-    if (body) {
-      mutations.push(settledRow(input.linkageFor, active, body))
-    }
-    activeItemsToForget.push({ key, threadId: active.threadId, itemId: active.item.id })
-  }
-  if (mutations.length === 0) {
-    return ADMITTED
-  }
-  const admission = appendCodexLifecycleMutations(
-    input.sink,
-    `oversized-notification:${input.sessionId}:${input.threadId}:${input.method}`,
-    mutations
-  )
-  if (!admission.accepted) {
-    return admission
-  }
-  for (const active of activeItemsToForget) {
-    input.streams.forget(active.threadId, active.itemId)
-    input.activeItems.delete(active.key)
-  }
-  return ADMITTED
-}
-
-function oversizedStreamItemType(method: string): CodexThreadItem['type'] | null {
-  if (method === 'item/agentMessage/delta') {
-    return 'agentMessage'
-  }
-  if (method === 'item/plan/delta') {
-    return 'plan'
-  }
-  if (
-    method === 'command/exec/outputDelta' ||
-    method === 'process/outputDelta' ||
-    method === 'item/commandExecution/outputDelta' ||
-    method === 'item/commandExecution/terminalInteraction'
-  ) {
-    return 'commandExecution'
-  }
-  if (method === 'item/fileChange/outputDelta' || method === 'item/fileChange/patchUpdated') {
-    return 'fileChange'
-  }
-  if (
-    method === 'item/reasoning/summaryTextDelta' ||
-    method === 'item/reasoning/summaryPartAdded' ||
-    method === 'item/reasoning/textDelta'
-  ) {
-    return 'reasoning'
-  }
-  return null
-}
-
 /** A settled item or prompt, naming its producer: the settlement can be the row's first write. */
 function settledRow(
   linkageFor: CodexRowLinkage,
diff --git a/src/main/codex/codex-structured-journal-translation-frames.ts b/src/main/codex/codex-structured-journal-translation-frames.ts
deleted file mode 100644
index f94c10bfe667..000000000000
--- a/src/main/codex/codex-structured-journal-translation-frames.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * The translator's provider-frame arms.
- *
- * Each returns null for a frame it does not own, which is the translator's
- * signal to keep looking. Split out so the translator reads as routing rather
- * than as the shape checks each arm performs.
- */
-
-import type { CodexStructuredSessionEvent } from './codex-structured-session-adapter'
-import type { CodexJournalItems } from './codex-structured-journal-items'
-import type { CodexJournalTranslationAdmission } from './codex-structured-journal-contracts'
-import { settleCodexOversizedNotification } from './codex-structured-journal-settlement'
-import {
-  readCodexJournalRecord,
-  readCodexJournalString
-} from './codex-structured-journal-translation-values'
-
-type OversizedInput = Parameters<typeof settleCodexOversizedNotification>[0]
-
-/** A notification the transport refused to carry whole: settle whatever it
- *  opened rather than leaving the item mid-flight. */
-export function settleCodexOversizedNotificationFrame(input: {
-  sessionId: string
-  threadId: string
-  kind: string
-  payload: unknown
-  sink: OversizedInput['sink']
-  streams: OversizedInput['streams']
-  activeItems: OversizedInput['activeItems']
-  linkageFor: OversizedInput['linkageFor']
-}): CodexJournalTranslationAdmission | null {
-  if (input.kind !== 'frame:oversized-notification') {
-    return null
-  }
-  const method = readCodexJournalString(readCodexJournalRecord(input.payload), 'method')
-  return method
-    ? settleCodexOversizedNotification({
-        sessionId: input.sessionId,
-        threadId: input.threadId,
-        method,
-        sink: input.sink,
-        streams: input.streams,
-        activeItems: input.activeItems,
-        linkageFor: input.linkageFor
-      })
-    : null
-}
-
-export function createCodexOversizedNotificationSettler(
-  deps: { sink: OversizedInput['sink']; linkageFor: OversizedInput['linkageFor'] },
-  items: Pick<CodexJournalItems, 'streams' | 'activeItems'>
-) {
-  return settleOversizedNotification
-
-  /** Settles the item a notification the transport refused to carry left
-   *  mid-flight; null when the frame is not one. */
-  function settleOversizedNotification(
-    event: Extract<CodexStructuredSessionEvent, { type: 'provider-frame' }>
-  ): CodexJournalTranslationAdmission | null {
-    return settleCodexOversizedNotificationFrame({
-      ...event,
-      sink: deps.sink,
-      streams: items.streams,
-      activeItems: items.activeItems,
-      linkageFor: deps.linkageFor
-    })
-  }
-}
diff --git a/src/main/codex/codex-structured-journal-translation-restore.ts b/src/main/codex/codex-structured-journal-translation-restore.ts
index 7005c10a43b8..5dc68d6f764d 100644
--- a/src/main/codex/codex-structured-journal-translation-restore.ts
+++ b/src/main/codex/codex-structured-journal-translation-restore.ts
@@ -59,6 +59,17 @@ export function restoreCodexJournalThread(input: {
     if (!turnId) {
       continue
     }
+    // Ahead of the turn's items, as the live path writes it: readers credit every
+    // row to the nearest turn record before it.
+    const lifecycle = input.restoreTurnLifecycle
+      ? historicalTurnLifecycle(input.threadId, turn)
+      : null
+    if (lifecycle) {
+      const admission = input.restoreTurnLifecycle?.(lifecycle) ?? { accepted: true }
+      if (!admission.accepted) {
+        return admission
+      }
+    }
     input.currentTurnIds.set(input.threadId, new Set([turnId]))
     for (const item of Array.isArray(turn.items) ? turn.items : []) {
       const admission = input.handleItem({
@@ -72,15 +83,6 @@ export function restoreCodexJournalThread(input: {
     }
     input.currentTurnIds.delete(input.threadId)
     input.ordinals.forgetTurn(input.threadId, turnId)
-    const lifecycle = input.restoreTurnLifecycle
-      ? historicalTurnLifecycle(input.threadId, turn)
-      : null
-    if (lifecycle) {
-      const admission = input.restoreTurnLifecycle?.(lifecycle) ?? { accepted: true }
-      if (!admission.accepted) {
-        return admission
-      }
-    }
   }
   input.flush()
   return { accepted: true }
diff --git a/src/main/codex/codex-structured-journal-translation-streams.test.ts b/src/main/codex/codex-structured-journal-translation-streams.test.ts
index 8a924a9d78ab..ce6fd220132f 100644
--- a/src/main/codex/codex-structured-journal-translation-streams.test.ts
+++ b/src/main/codex/codex-structured-journal-translation-streams.test.ts
@@ -215,55 +215,6 @@ describe('codex journal translation', () => {
     ).toEqual(['notification:future/notification', 'request:future/request', 'frame:unclassified'])
   })
 
-  it('terminalizes the active streamed item when an oversized notification is rejected', () => {
-    const { translator, tap } = translatorWith()
-    translator.handle(TURN_STARTED)
-    translator.handle(
-      notification('item/started', {
-        item: {
-          type: 'commandExecution',
-          id: 'exec-oversized',
-          command: 'run',
-          status: 'inProgress'
-        }
-      })
-    )
-    const admission = translator.handle({
-      type: 'provider-frame',
-      sessionId: SESSION_ID,
-      threadId: THREAD_ID,
-      kind: 'frame:oversized-notification',
-      payload: {
-        reason: 'record-too-large',
-        observedBytes: 20 * 1024 * 1024,
-        maxBytes: 16 * 1024 * 1024,
-        classification: 'notification',
-        method: 'item/commandExecution/outputDelta'
-      }
-    })
-
-    expect(admission).toEqual({ accepted: true })
-    expect(tap.rows).toEqual([
-      expect.objectContaining({
-        body: expect.objectContaining({ kind: 'tool-call', state: 'running' })
-      }),
-      expect.objectContaining({
-        body: expect.objectContaining({ kind: 'tool-call', state: 'failed' })
-      }),
-      expect.objectContaining({
-        body: expect.objectContaining({
-          kind: 'status',
-          providerFrame: expect.objectContaining({ kind: 'frame:oversized-notification' })
-        })
-      })
-    ])
-    const diagnostic = tap.rows[2]?.body
-    expect(
-      diagnostic?.kind === 'status' ? diagnostic.providerFrame?.payload.byteLength : 0
-    ).toBeGreaterThan(0)
-    expect(JSON.stringify(diagnostic)).toContain('record-too-large')
-  })
-
   it('admits suppressed diagnostics before settling a completed turn', () => {
     const tap = recorder()
     let rejectSuppression = true
diff --git a/src/main/codex/codex-structured-journal-translation-turn-boundaries.ts b/src/main/codex/codex-structured-journal-translation-turn-boundaries.ts
index d4881de1897b..3116a329c97b 100644
--- a/src/main/codex/codex-structured-journal-translation-turn-boundaries.ts
+++ b/src/main/codex/codex-structured-journal-translation-turn-boundaries.ts
@@ -37,6 +37,14 @@ type TurnBoundaryEvent = {
   dispatchSequenceAtReceipt?: number
 }
 
+type TurnTerminal = {
+  state: 'completed' | 'interrupted'
+  completedAt: number
+  /** Null when Codex named no verdict, or when the host inferred this end itself. */
+  outcome?: AgentJournalTurnOutcome | null
+  durationMs?: number | null
+}
+
 /** Opens and settles the durable lifecycle row for each primary-thread turn. */
 export class CodexJournalTurnBoundaries {
   private readonly recentTurns = new CodexJournalRecentTurns()
@@ -132,6 +140,8 @@ export class CodexJournalTurnBoundaries {
     return admission
   }
 
+  /** Codex ends every turn with exactly one `turn/completed`, a failed one after
+   *  its `error` frame included, so this is the only live end. */
   complete(event: TurnBoundaryEvent): CodexJournalTranslationAdmission {
     const suppressionAdmission = this.deps.flushSuppression()
     if (!suppressionAdmission.accepted) {
@@ -188,81 +198,9 @@ export class CodexJournalTurnBoundaries {
     return admission
   }
 
-  /**
-   * Settles the turn a terminal `error` names.
-   *
-   * Codex reports a fault that ended a turn as an `error` notification carrying
-   * that turn's id, and `turn/completed` may never follow it — the app server
-   * marks the thread not-running off the error alone. Without this the running
-   * lifecycle row is a latch nothing re-derives, and the chat reads "Working"
-   * for the life of the session. A retrying stream error is NOT a turn end and
-   * never reaches here.
-   */
-  fail(event: TurnBoundaryEvent): CodexJournalTranslationAdmission {
-    const suppressionAdmission = this.deps.flushSuppression()
-    if (!suppressionAdmission.accepted) {
-      return suppressionAdmission
-    }
-    const turnId = readCodexTurnId(event.params) ?? this.deps.activeTurns.current(event.threadId)
-    // An error naming an already-settled turn is not a second end: its terminal
-    // row holds the start and duration this one could not reconstruct.
-    if (!turnId || !this.deps.activeTurns.isActive(event.threadId, turnId)) {
-      return CODEX_JOURNAL_ADMITTED
-    }
-    const turnLifecycle =
-      event.threadId === this.deps.primaryThreadId()
-        ? this.settled(event.threadId, turnId, {
-            state: 'completed',
-            outcome: 'failure',
-            completedAt: this.receiptTime(event)
-          })
-        : null
-    const requestOrigin = this.deps.activeTurns.requestOrigin(event.threadId, turnId)
-    const latestDispatchSequence = this.deps.activeTurns.latestDispatchSequence(
-      event.threadId,
-      turnId
-    )
-    const admission = settleCodexJournalTurn({
-      sink: this.deps.sink,
-      sessionId: event.sessionId,
-      threadId: event.threadId,
-      turnId,
-      turnLifecycle,
-      streams: this.deps.items.streams,
-      activeItems: this.deps.items.activeItems,
-      pendingPrompts: this.deps.pendingPrompts,
-      ...(this.deps.clearPromptTurn ? { clearPromptTurn: this.deps.clearPromptTurn } : {}),
-      linkageFor: this.deps.linkageFor
-    })
-    if (admission.accepted) {
-      if (turnLifecycle) {
-        this.recentTurns.remember(
-          event.threadId,
-          turnLifecycle,
-          requestOrigin,
-          latestDispatchSequence
-        )
-      }
-      this.deps.items.ordinals.forgetTurn(event.threadId, turnId)
-      this.deps.activeTurns.forget(event.threadId, turnId)
-      this.deps.resetActivity(event.threadId)
-    }
-    return admission
-  }
-
   /** Terminal lifecycle for a remembered turn; `startedAt` is absent when the start was never seen.
    *  The verdict travels as one record so a caller cannot supply the state and drop the outcome. */
-  settled(
-    threadId: string,
-    turnId: string,
-    terminal: {
-      state: 'completed' | 'interrupted'
-      completedAt: number
-      /** Null when Codex named no verdict, or when the host inferred this end itself. */
-      outcome?: AgentJournalTurnOutcome | null
-      durationMs?: number | null
-    }
-  ): AgentJournalTurnLifecycle {
+  settled(threadId: string, turnId: string, terminal: TurnTerminal): AgentJournalTurnLifecycle {
     const startedAt = this.deps.activeTurns.startedAt(threadId, turnId)
     // Carried forward from the exact echoed send that was attributed to this turn.
     const requestOrigin = this.deps.activeTurns.requestOrigin(threadId, turnId)
diff --git a/src/main/codex/codex-structured-journal-translation-turn-lifecycle.test.ts b/src/main/codex/codex-structured-journal-translation-turn-lifecycle.test.ts
index 6fc1e88d1840..6fb589caf4e0 100644
--- a/src/main/codex/codex-structured-journal-translation-turn-lifecycle.test.ts
+++ b/src/main/codex/codex-structured-journal-translation-turn-lifecycle.test.ts
@@ -346,7 +346,7 @@ describe('codex turn lifecycle rows', () => {
     const lifecycle = reduced(tap.rows).find((row) => row.key === LIFECYCLE_KEY)
     expect(lifecycle?.body).toMatchObject({
       kind: 'turn',
-      state: 'interrupted',
+      state: 'completed',
       outcome: 'failure',
       requestedAt: 900
     })
@@ -381,17 +381,17 @@ describe('codex turn lifecycle rows', () => {
   })
 
   // `TurnStatus` in the app-server protocol is `completed | interrupted | failed |
-  // inProgress`, and every one of those collapses to the same terminal lifecycle
-  // arm. `outcome` is what keeps a Codex failure distinguishable from a stop, and
-  // a status this build cannot place stays unknown rather than borrowing one.
+  // inProgress`. Only `interrupted` is a stop; every other end completed the
+  // turn, and `outcome` says how. A status this build cannot place stays unknown
+  // rather than borrowing a verdict.
   it.each([
-    ['interrupted', 'cancellation'],
-    ['failed', 'failure'],
-    ['cancelled', undefined],
-    ['inProgress', undefined]
+    ['interrupted', 'interrupted', 'cancellation'],
+    ['failed', 'completed', 'failure'],
+    ['someFutureStatus', 'completed', undefined],
+    ['inProgress', 'completed', undefined]
   ] as const)(
-    'maps a %s turn status to an interrupted lifecycle with outcome %s',
-    (status, outcome) => {
+    'maps a %s turn status to a %s lifecycle with outcome %s',
+    (status, state, outcome) => {
       const tap = recorder()
       const translator = translatorFor(tap)
 
@@ -405,7 +405,7 @@ describe('codex turn lifecycle rows', () => {
           body: {
             kind: 'turn',
             turnId: TURN_ID,
-            state: 'interrupted',
+            state,
             ...(outcome ? { outcome } : {}),
             userItemId: USER_ITEM_ID,
             startedAt: 1_000,
@@ -512,14 +512,29 @@ describe('codex turn lifecycle rows', () => {
             completedAt: 1_700_000_101,
             items: []
           },
+          {
+            id: 'turn-failed',
+            status: 'failed',
+            startedAt: 1_700_000_150,
+            completedAt: 1_700_000_152,
+            durationMs: 2_400,
+            items: []
+          },
+          {
+            id: 'turn-unplaced',
+            status: 'someFutureStatus',
+            startedAt: 1_700_000_170,
+            completedAt: 1_700_000_171,
+            items: []
+          },
           { id: 'turn-open', status: 'inProgress', startedAt: 1_700_000_200, items: [] },
           { id: 'turn-untimed', status: 'completed', items: [] }
         ]
       })
     ).toEqual({ accepted: true })
 
+    // Each record precedes its turn's items, the order the live path writes.
     expect(tap.rows).toEqual([
-      expect.objectContaining({ body: expect.objectContaining({ kind: 'message' }) }),
       {
         key: 'legacy:codex:session-1:turn-lifecycle%3Aturn-done',
         body: {
@@ -533,6 +548,7 @@ describe('codex turn lifecycle rows', () => {
           durationMs: 41_900
         }
       },
+      expect.objectContaining({ body: expect.objectContaining({ kind: 'message' }) }),
       {
         key: 'legacy:codex:session-1:turn-lifecycle%3Aturn-cut',
         body: {
@@ -544,6 +560,32 @@ describe('codex turn lifecycle rows', () => {
           startedAt: 1_700_000_100_000,
           completedAt: 1_700_000_101_000
         }
+      },
+      {
+        // The same shape a live failed completion writes.
+        key: 'legacy:codex:session-1:turn-lifecycle%3Aturn-failed',
+        body: {
+          kind: 'turn',
+          turnId: 'turn-failed',
+          state: 'completed',
+          outcome: 'failure',
+          userItemId: 'codex:thread-abc:turn-failed:0',
+          startedAt: 1_700_000_150_000,
+          completedAt: 1_700_000_152_000,
+          durationMs: 2_400
+        }
+      },
+      {
+        // Ended, but not a status this build can place: no verdict, never a clean finish.
+        key: 'legacy:codex:session-1:turn-lifecycle%3Aturn-unplaced',
+        body: {
+          kind: 'turn',
+          turnId: 'turn-unplaced',
+          state: 'completed',
+          userItemId: 'codex:thread-abc:turn-unplaced:0',
+          startedAt: 1_700_000_170_000,
+          completedAt: 1_700_000_171_000
+        }
       }
     ])
     expect(tap.tombstones).toEqual([])
diff --git a/src/main/codex/codex-structured-journal-translation-turn-settles-once.test.ts b/src/main/codex/codex-structured-journal-translation-turn-settles-once.test.ts
new file mode 100644
index 000000000000..77638a7d1ead
--- /dev/null
+++ b/src/main/codex/codex-structured-journal-translation-turn-settles-once.test.ts
@@ -0,0 +1,299 @@
+import { describe, expect, it } from 'vitest'
+import type {
+  AgentJournalItemBody,
+  AgentJournalItemIdentity
+} from '../../shared/agent-session-journal-types'
+import {
+  agentJournalItemKey,
+  agentJournalSubmissionKey
+} from '../../shared/agent-session-journal-item-key'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { createCodexJournalTranslator } from './codex-structured-journal-translation'
+import type { CodexStructuredSessionEvent } from './codex-structured-session-adapter'
+
+const SESSION_ID = 'session-1'
+const THREAD_ID = 'thread-abc'
+const TURN_ID = 'turn-1'
+const NEXT_TURN_ID = 'turn-2'
+const CLIENT_MESSAGE_ID = 'client-1'
+
+type Row = { key: string; body: AgentJournalItemBody }
+
+function recorder() {
+  const rows: Row[] = []
+  let refuseTerminal = 0
+  const sink: StructuredAgentSessionEventSink = {
+    appendItem: (identity: AgentJournalItemIdentity, body) =>
+      rows.push({ key: agentJournalItemKey(identity), body }),
+    tryAppendItem: (identity: AgentJournalItemIdentity, body) => {
+      if (body.kind === 'turn' && body.state !== 'running' && refuseTerminal > 0) {
+        refuseTerminal -= 1
+        return { accepted: false, reason: 'backpressure' }
+      }
+      rows.push({ key: agentJournalItemKey(identity), body })
+      return { accepted: true }
+    },
+    appendTombstone: () => {},
+    publish: () => {}
+  }
+  return {
+    sink,
+    rows,
+    refuseNextTerminalWrite: () => {
+      refuseTerminal += 1
+    }
+  }
+}
+
+function notification(method: string, params: unknown, observedAt: number) {
+  return {
+    type: 'notification',
+    sessionId: SESSION_ID,
+    threadId: THREAD_ID,
+    method,
+    params,
+    observedAt
+  } satisfies CodexStructuredSessionEvent
+}
+
+function translator(tap: ReturnType<typeof recorder>) {
+  return createCodexJournalTranslator({
+    sink: tap.sink,
+    sessionId: SESSION_ID,
+    primaryThreadId: () => THREAD_ID,
+    dispatchRequestOrigin: () => ({ requestedAt: 900, sequence: 0 })
+  })
+}
+
+/** Every lifecycle write for a turn, in order: what a reader could observe. */
+function turnWrites(rows: readonly Row[], turnId: string) {
+  return rows.flatMap((row) =>
+    row.body.kind === 'turn' && row.body.turnId === turnId ? [row.body] : []
+  )
+}
+
+function terminalWrites(rows: readonly Row[], turnId: string) {
+  return turnWrites(rows, turnId).filter((body) => body.state !== 'running')
+}
+
+/** The body the journal reducer keeps for a turn's lifecycle row. */
+function settledRecord(rows: readonly Row[], turnId: string) {
+  return rows
+    .map((row) => row.body)
+    .findLast((body) => body.kind === 'turn' && body.turnId === turnId)
+}
+
+/** Codex's frames for a turn that fails: the error, then the failed completion. */
+function runFailedTurn(handle: (event: CodexStructuredSessionEvent) => unknown) {
+  handle(notification('turn/started', { turn: { id: TURN_ID } }, 1_000))
+  handle(
+    notification(
+      'item/started',
+      {
+        turnId: TURN_ID,
+        turn: { id: TURN_ID },
+        item: { type: 'userMessage', id: 'user-1', clientId: CLIENT_MESSAGE_ID }
+      },
+      1_100
+    )
+  )
+  handle(
+    notification(
+      'item/completed',
+      {
+        turnId: TURN_ID,
+        item: { type: 'agentMessage', id: 'agent-1', text: 'Checking the build' }
+      },
+      1_500
+    )
+  )
+  handle(
+    notification(
+      'error',
+      {
+        threadId: THREAD_ID,
+        turnId: TURN_ID,
+        willRetry: false,
+        error: { message: 'stream disconnected before completion' }
+      },
+      2_000
+    )
+  )
+  handle(
+    notification(
+      'turn/completed',
+      { turn: { id: TURN_ID, status: 'failed', durationMs: 1_100 } },
+      2_100
+    )
+  )
+}
+
+describe('a Codex turn ends once, on its completion', () => {
+  it('records the failed completion Codex sends after the error, with the start this host saw', () => {
+    const tap = recorder()
+    const codex = translator(tap)
+
+    runFailedTurn((event) => codex.handle(event))
+
+    expect(terminalWrites(tap.rows, TURN_ID)).toHaveLength(1)
+    expect(settledRecord(tap.rows, TURN_ID)).toEqual({
+      kind: 'turn',
+      turnId: TURN_ID,
+      state: 'completed',
+      outcome: 'failure',
+      userItemId: agentJournalSubmissionKey(CLIENT_MESSAGE_ID),
+      startedAt: 1_000,
+      requestedAt: 900,
+      completedAt: 2_100,
+      durationMs: 1_100
+    })
+    expect(
+      tap.rows.filter((row) => row.body.kind === 'status' && row.body.tone === 'error')
+    ).toHaveLength(1)
+  })
+
+  it('records an exit between the error and the completion as interrupted, with no verdict', () => {
+    // Orca records only an end it observed. The exit is that end; the failure
+    // Codex would have named arrives only in the completion, which never came.
+    const tap = recorder()
+    const codex = translator(tap)
+    const events: CodexStructuredSessionEvent[] = []
+    runFailedTurn((event) => events.push(event))
+
+    for (const event of events.slice(0, -1)) {
+      codex.handle(event)
+    }
+    codex.handle({
+      type: 'ended',
+      sessionId: SESSION_ID,
+      reason: 'lost child',
+      cause: 'unexpected-exit',
+      fence: 1,
+      acquisitionGeneration: 'generation-1',
+      observedAt: 2_050
+    })
+
+    expect(terminalWrites(tap.rows, TURN_ID)).toEqual([
+      {
+        kind: 'turn',
+        turnId: TURN_ID,
+        state: 'interrupted',
+        userItemId: agentJournalSubmissionKey(CLIENT_MESSAGE_ID),
+        startedAt: 1_000,
+        requestedAt: 900,
+        completedAt: 2_050
+      }
+    ])
+    expect(
+      tap.rows.filter((row) => row.body.kind === 'status' && row.body.tone === 'error')
+    ).toHaveLength(1)
+  })
+
+  it('revises the still-open turn with a send Codex echoes between the error and the completion', () => {
+    // Codex records a failed turn's pending input after its `error` frame and
+    // before `turn/completed`, so the echo belongs to a turn that is still open.
+    const tap = recorder()
+    const codex = translator(tap)
+    const events: CodexStructuredSessionEvent[] = []
+    runFailedTurn((event) => events.push(event))
+    const [started, echo, reply, error, completion] = events
+
+    for (const event of [started, reply, error, echo, completion]) {
+      if (event) {
+        codex.handle(event)
+      }
+    }
+
+    expect(turnWrites(tap.rows, TURN_ID).map((body) => body.state)).toEqual([
+      'running',
+      'running',
+      'completed'
+    ])
+    expect(settledRecord(tap.rows, TURN_ID)).toMatchObject({
+      outcome: 'failure',
+      userItemId: agentJournalSubmissionKey(CLIENT_MESSAGE_ID),
+      requestedAt: 900,
+      startedAt: 1_000,
+      durationMs: 1_100
+    })
+  })
+
+  it('settles once when the sink refuses the completion and its retry lands', () => {
+    // A refused frame is Orca's only redelivery of a completion, and a refused
+    // end changes nothing, so the retry settles the turn exactly once.
+    const tap = recorder()
+    const codex = translator(tap)
+    const completion = notification(
+      'turn/completed',
+      { turn: { id: TURN_ID, status: 'completed', durationMs: 900 } },
+      2_000
+    )
+
+    codex.handle(notification('turn/started', { turn: { id: TURN_ID } }, 1_000))
+    tap.refuseNextTerminalWrite()
+    expect(codex.handle(completion)).toEqual({ accepted: false, reason: 'backpressure' })
+    expect(codex.handle(completion)).toEqual({ accepted: true })
+
+    expect(terminalWrites(tap.rows, TURN_ID)).toEqual([
+      expect.objectContaining({
+        state: 'completed',
+        outcome: 'success',
+        startedAt: 1_000,
+        completedAt: 2_000,
+        durationMs: 900
+      })
+    ])
+  })
+
+  it('settles an ordinary turn exactly as before', () => {
+    const tap = recorder()
+    const codex = translator(tap)
+
+    codex.handle(notification('turn/started', { turn: { id: TURN_ID } }, 1_000))
+    codex.handle(
+      notification(
+        'turn/completed',
+        { turn: { id: TURN_ID, status: 'completed', durationMs: 3_250 } },
+        4_500
+      )
+    )
+
+    expect(terminalWrites(tap.rows, TURN_ID)).toEqual([
+      {
+        kind: 'turn',
+        turnId: TURN_ID,
+        state: 'completed',
+        outcome: 'success',
+        userItemId: `codex:${THREAD_ID}:${TURN_ID}:0`,
+        startedAt: 1_000,
+        completedAt: 4_500,
+        durationMs: 3_250
+      }
+    ])
+  })
+
+  it('settles the next turn on its own after a failed one', () => {
+    const tap = recorder()
+    const codex = translator(tap)
+
+    runFailedTurn((event) => codex.handle(event))
+    const failed = settledRecord(tap.rows, TURN_ID)
+    codex.handle(notification('turn/started', { turn: { id: NEXT_TURN_ID } }, 3_000))
+    codex.handle(
+      notification(
+        'turn/completed',
+        { turn: { id: NEXT_TURN_ID, status: 'completed', durationMs: 1_000 } },
+        4_000
+      )
+    )
+
+    expect(settledRecord(tap.rows, TURN_ID)).toEqual(failed)
+    expect(terminalWrites(tap.rows, NEXT_TURN_ID)).toHaveLength(1)
+    expect(settledRecord(tap.rows, NEXT_TURN_ID)).toMatchObject({
+      state: 'completed',
+      outcome: 'success',
+      startedAt: 3_000,
+      completedAt: 4_000
+    })
+  })
+})
diff --git a/src/main/codex/codex-structured-journal-translation-turn-state.ts b/src/main/codex/codex-structured-journal-translation-turn-state.ts
index ec1cff041db8..4c1e739705d2 100644
--- a/src/main/codex/codex-structured-journal-translation-turn-state.ts
+++ b/src/main/codex/codex-structured-journal-translation-turn-state.ts
@@ -57,12 +57,6 @@ export class CodexJournalActiveTurns {
     return [...(this.byThread.get(threadId) ?? [])].at(-1) ?? null
   }
 
-  /** Whether this turn is still open here. A terminal row already written carries
-   *  the turn's start and duration, so a later end must not overwrite it. */
-  isActive(threadId: string, turnId: string): boolean {
-    return this.byThread.get(threadId)?.has(turnId) === true
-  }
-
   startedAt(threadId: string, turnId: string): number | undefined {
     return this.startedAtByTurn.get(this.turnKey(threadId, turnId))
   }
@@ -167,7 +161,7 @@ type RecentTurn = {
   bytes: number
 }
 
-/** Bounded terminal lifecycle window for exact echoes that arrive after completion. */
+/** Bounded terminal lifecycle window: exact echoes that arrive after completion revise it. */
 export class CodexJournalRecentTurns {
   private readonly turns = new Map<string, RecentTurn>()
   private retainedBytes = 0
diff --git a/src/main/codex/codex-structured-journal-translation-turns.ts b/src/main/codex/codex-structured-journal-translation-turns.ts
index 8678c1755994..52dca66a35b5 100644
--- a/src/main/codex/codex-structured-journal-translation-turns.ts
+++ b/src/main/codex/codex-structured-journal-translation-turns.ts
@@ -43,12 +43,12 @@ export function codexTurnLifecycleBody(
   return agentJournalTurnBody(turnLifecycle)
 }
 
-/** Maps a `turn/completed` status; a missing one is a clean finish. A terminal
- *  `error` also ends a turn and names its own outcome rather than coming here. */
+/** Maps a `turn/completed` status, live or restored. Only `interrupted` is a stop;
+ *  a failed turn completed, and `codexTurnOutcome` says it failed. */
 export function codexTurnLifecycleState(
   status: string | null
 ): Extract<AgentJournalTurnLifecycleState, 'completed' | 'interrupted'> {
-  return status === null || status === 'completed' ? 'completed' : 'interrupted'
+  return status === 'interrupted' ? 'interrupted' : 'completed'
 }
 
 /**
diff --git a/src/main/codex/codex-structured-journal-translation-writers.ts b/src/main/codex/codex-structured-journal-translation-writers.ts
index c4fba2c13708..72c1026452d8 100644
--- a/src/main/codex/codex-structured-journal-translation-writers.ts
+++ b/src/main/codex/codex-structured-journal-translation-writers.ts
@@ -8,7 +8,6 @@ import { CodexJournalGenericFrames } from './codex-structured-journal-generic-fr
 import { CodexJournalGoals } from './codex-structured-journal-goals'
 import { CodexJournalItems } from './codex-structured-journal-items'
 import { CodexJournalPrompts } from './codex-structured-journal-prompts'
-import { createCodexOversizedNotificationSettler } from './codex-structured-journal-translation-frames'
 import { CodexJournalActiveTurns } from './codex-structured-journal-translation-turn-state'
 import { CodexSubagentRoster } from './codex-subagent-roster'
 
@@ -39,7 +38,6 @@ export function createCodexJournalTranslatorWriters(deps: CodexJournalTranslator
       producerDeps,
       (threadId, itemId) => items.detailFor(threadId, itemId),
       activeTurn
-    ),
-    settleOversizedNotification: createCodexOversizedNotificationSettler(producerDeps, items)
+    )
   }
 }
diff --git a/src/main/codex/codex-structured-journal-translation.test.ts b/src/main/codex/codex-structured-journal-translation.test.ts
index d902b7b47252..676d9054ed70 100644
--- a/src/main/codex/codex-structured-journal-translation.test.ts
+++ b/src/main/codex/codex-structured-journal-translation.test.ts
@@ -287,7 +287,7 @@ describe('codex journal translation', () => {
     ).toBe('idle')
   })
 
-  describe('a terminal error ends the turn it names', () => {
+  describe('a turn-ending error is a row on the turn it names, and the completion ends it', () => {
     function statusOf(rows: readonly Row[]) {
       return projectStructuredAgentSessionStatus(
         reduced(rows).map((row, sequence) => ({
@@ -308,7 +308,11 @@ describe('codex journal translation', () => {
       })
     }
 
-    it('settles the turn and keeps the provider sentence as its own row', () => {
+    const FAILED_COMPLETION = notification('turn/completed', {
+      turn: { id: TURN_ID, status: 'failed', durationMs: 2_400 }
+    })
+
+    it('keeps the turn working through the error, and the failed completion settles it', () => {
       const tap = recorder()
       const translator = createCodexJournalTranslator({
         sink: tap.sink,
@@ -316,9 +320,12 @@ describe('codex journal translation', () => {
       })
 
       translator.handle(TURN_STARTED)
+      translator.handle(errorNotification({ turnId: TURN_ID, willRetry: false }))
+
       expect(statusOf(tap.rows)).toBe('working')
+      expect(tap.rows.filter((row) => row.body.kind === 'turn')).toHaveLength(1)
 
-      translator.handle(errorNotification({ turnId: TURN_ID, willRetry: false }))
+      translator.handle(FAILED_COMPLETION)
 
       expect(statusOf(tap.rows)).toBe('idle')
       expect(reduced(tap.rows).map((row) => row.body)).toContainEqual(
@@ -326,7 +333,8 @@ describe('codex journal translation', () => {
           kind: 'turn',
           turnId: TURN_ID,
           state: 'completed',
-          outcome: 'failure'
+          outcome: 'failure',
+          durationMs: 2_400
         })
       )
       // The message the user reads is still a row of its own.
@@ -353,7 +361,7 @@ describe('codex journal translation', () => {
       expect(tap.rows.filter((row) => row.body.kind === 'turn')).toHaveLength(1)
     })
 
-    it('does not overwrite the terminal row of a turn that already completed', () => {
+    it('writes only its row for an error after the turn completed', () => {
       const tap = recorder()
       const translator = createCodexJournalTranslator({
         sink: tap.sink,
@@ -361,21 +369,16 @@ describe('codex journal translation', () => {
       })
 
       translator.handle(TURN_STARTED)
-      translator.handle(
-        notification('turn/completed', {
-          turn: { id: TURN_ID, status: 'failed', durationMs: 4_000 }
-        })
-      )
+      translator.handle(FAILED_COMPLETION)
       const settled = reduced(tap.rows).find((row) => row.body.kind === 'turn')?.body
 
       translator.handle(errorNotification({ turnId: TURN_ID, willRetry: false }))
 
-      // The completion carries the duration a late error could not reconstruct.
       expect(reduced(tap.rows).find((row) => row.body.kind === 'turn')?.body).toEqual(settled)
       expect(statusOf(tap.rows)).toBe('idle')
     })
 
-    it('settles the running turn when the error names no turn', () => {
+    it('settles nothing when the error names no turn', () => {
       const tap = recorder()
       const translator = createCodexJournalTranslator({
         sink: tap.sink,
@@ -385,21 +388,8 @@ describe('codex journal translation', () => {
       translator.handle(TURN_STARTED)
       translator.handle(errorNotification({ willRetry: false }))
 
-      expect(statusOf(tap.rows)).toBe('idle')
-    })
-
-    it('does not reopen a running row when the completion arrives after the error', () => {
-      const tap = recorder()
-      const translator = createCodexJournalTranslator({
-        sink: tap.sink,
-        primaryThreadId: () => THREAD_ID
-      })
-
-      translator.handle(TURN_STARTED)
-      translator.handle(errorNotification({ turnId: TURN_ID, willRetry: false }))
-      translator.handle(notification('turn/completed', { turn: { id: TURN_ID, status: 'failed' } }))
-
-      expect(statusOf(tap.rows)).toBe('idle')
+      expect(statusOf(tap.rows)).toBe('working')
+      expect(tap.rows.filter((row) => row.body.kind === 'turn')).toHaveLength(1)
     })
   })
 
@@ -446,14 +436,12 @@ describe('codex journal translation', () => {
       expect(stopped).toEqual([])
     })
 
-    it('releases after systemError arrives before the terminal error notification', () => {
+    it('releases after the failed completion that follows systemError and the error', () => {
       const stopped: string[] = []
       const { translator } = translatorReporting(stopped)
 
       translator.handle(TURN_STARTED)
       translator.handle(statusChanged('systemError'))
-      expect(stopped).toEqual([])
-
       translator.handle(
         notification('error', {
           turnId: TURN_ID,
@@ -461,6 +449,9 @@ describe('codex journal translation', () => {
           error: { message: 'fatal' }
         })
       )
+      expect(stopped).toEqual([])
+
+      translator.handle(notification('turn/completed', { turn: { id: TURN_ID, status: 'failed' } }))
 
       expect(stopped).toEqual([THREAD_ID])
     })
diff --git a/src/main/codex/codex-structured-journal-translation.ts b/src/main/codex/codex-structured-journal-translation.ts
index fb90cb73128a..fadab8b4589c 100644
--- a/src/main/codex/codex-structured-journal-translation.ts
+++ b/src/main/codex/codex-structured-journal-translation.ts
@@ -11,9 +11,8 @@ import { restoreCodexJournalThread } from './codex-structured-journal-translatio
 import { CodexJournalTurnBoundaries } from './codex-structured-journal-translation-turn-boundaries'
 import { createCodexJournalTranslatorWriters } from './codex-structured-journal-translation-writers'
 import { publishCodexTurnLifecycle } from './codex-structured-journal-translation-turns'
-import { readCodexProviderVerdict } from './codex-structured-journal-provider-verdicts'
 import { createCodexThreadItemRouter } from './codex-structured-journal-thread-item-routing'
-import { readCodexTurnId } from './codex-structured-thread-facts'
+import { codexThreadStoppedRunning, readCodexTurnId } from './codex-structured-thread-facts'
 import type { CodexStructuredSessionEvent } from './codex-structured-session-adapter'
 
 export type {
@@ -36,17 +35,8 @@ export {
 export function createCodexJournalTranslator(
   deps: CodexJournalTranslatorDeps
 ): CodexJournalTranslator {
-  const {
-    activeTurns,
-    subagents,
-    linkageFor,
-    genericFrames,
-    items,
-    compactions,
-    goals,
-    prompts,
-    settleOversizedNotification
-  } = createCodexJournalTranslatorWriters(deps)
+  const { activeTurns, subagents, linkageFor, genericFrames, items, compactions, goals, prompts } =
+    createCodexJournalTranslatorWriters(deps)
   const flushStreams = (): CodexJournalTranslationAdmission =>
     items.streams.flush() ? CODEX_JOURNAL_ADMITTED : { accepted: false, reason: 'backpressure' }
   let readActivity = createCodexProviderActivityReader()
@@ -205,10 +195,6 @@ export function createCodexJournalTranslator(
         )
       }
       if (event.type === 'provider-frame') {
-        const settlement = settleOversizedNotification(event)
-        if (settlement && !settlement.accepted) {
-          return settlement
-        }
         return genericFrames.appendUnhandled(event.kind, event.payload, event.threadId)
       }
       if (event.method === 'turn/started' || event.method === 'turn/completed') {
@@ -249,28 +235,24 @@ export function createCodexJournalTranslator(
           return publishActivity(event, routed)
         }
       }
-      const verdict = readCodexProviderVerdict(event.method, event.params)
+      // A thread that stopped running settles no open turn: Codex clears `running`
+      // on every error, and an open turn ends on its `turn/completed`. It releases
+      // a send whose dispatch was never answered, which nothing else re-derives live.
       if (
-        verdict === 'thread-stopped-running' &&
+        event.method === 'thread/status/changed' &&
+        codexThreadStoppedRunning(event.params) &&
         event.threadId === (deps.primaryThreadId?.() ?? null)
       ) {
         primaryThreadStoppedRunning = true
         reportPrimaryThreadStoppedRunning()
       }
-      // The row carries the provider's sentence and is written first, so it lands
-      // inside the turn this same frame is about to end.
+      // A turn-ending `error` is a row inside the turn it names; the failed
+      // `turn/completed` Codex sends after it is that turn's end.
       const unhandled = genericFrames.appendUnhandled(
         `notification:${event.method}`,
         event.params,
         event.threadId
       )
-      if (unhandled.accepted && verdict === 'turn-failed') {
-        const failed = turnBoundaries.fail(event)
-        if (!failed.accepted) {
-          return failed
-        }
-        reportPrimaryThreadStoppedRunning()
-      }
       return publishActivity(event, unhandled)
     },
     cancelPrompt: (journalItemId) => prompts.cancel(journalItemId),
diff --git a/src/main/codex/codex-structured-journal-turn-endings-replay.test.ts b/src/main/codex/codex-structured-journal-turn-endings-replay.test.ts
new file mode 100644
index 000000000000..d1de7e747663
--- /dev/null
+++ b/src/main/codex/codex-structured-journal-turn-endings-replay.test.ts
@@ -0,0 +1,206 @@
+// Real `codex app-server` frame orders, replayed through the translator.
+//
+// The fixture is trimmed from captures of the real binary on 0.141.0 (the oldest
+// version Orca exercises) and 0.158.0, with only the upstream provider faked:
+// statuses, `willRetry`, the provider's sentence and `durationMs`, at the host
+// receipt time `t` each frame arrived. Ids are replaced with synthetic ones.
+
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import type {
+  AgentJournalItemBody,
+  AgentJournalItemIdentity
+} from '../../shared/agent-session-journal-types'
+import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { createCodexJournalTranslator } from './codex-structured-journal-translation'
+import {
+  readCodexThreadId,
+  readCodexTurnDurationMs,
+  readCodexTurnId,
+  readCodexTurnStatus
+} from './codex-structured-thread-facts'
+
+const SESSION_ID = 'session-1'
+
+type CapturedFrame = { case: string; t: number; method: string; params: Record<string, unknown> }
+type Row = { key: string; body: AgentJournalItemBody }
+
+const FRAMES: CapturedFrame[] = readFileSync(
+  join(__dirname, '__fixtures__', 'codex-app-server-turn-endings.jsonl'),
+  'utf8'
+)
+  .split('\n')
+  .filter((line) => line.length > 0)
+  .map((line) => JSON.parse(line))
+
+function framesOf(name: string): CapturedFrame[] {
+  const frames = FRAMES.filter((frame) => frame.case === name)
+  expect(frames.length).toBeGreaterThan(0)
+  return frames
+}
+
+/** Replays a case's frames, or only its first `count`. */
+function replay(name: string, count = Number.POSITIVE_INFINITY) {
+  const frames = framesOf(name).slice(0, count)
+  const threadId = readCodexThreadId(frames[0]?.params) ?? ''
+  const rows: Row[] = []
+  const sink: StructuredAgentSessionEventSink = {
+    appendItem: (identity: AgentJournalItemIdentity, body) =>
+      rows.push({ key: agentJournalItemKey(identity), body }),
+    appendTombstone: () => {},
+    publish: () => {}
+  }
+  const translator = createCodexJournalTranslator({
+    sink,
+    sessionId: SESSION_ID,
+    primaryThreadId: () => threadId
+  })
+  for (const frame of frames) {
+    expect(
+      translator.handle({
+        type: 'notification',
+        sessionId: SESSION_ID,
+        threadId,
+        method: frame.method,
+        params: frame.params,
+        observedAt: frame.t
+      })
+    ).toEqual({ accepted: true })
+  }
+  return { frames, rows, translator }
+}
+
+function turnWrites(rows: readonly Row[], turnId: string) {
+  return rows
+    .map((row) => row.body)
+    .filter((body) => body.kind === 'turn' && body.turnId === turnId)
+}
+
+function terminalWrites(rows: readonly Row[], turnId: string) {
+  return turnWrites(rows, turnId).filter((body) => body.kind === 'turn' && body.state !== 'running')
+}
+
+function receipt(frames: readonly CapturedFrame[], method: string, turnId: string): number {
+  const frame = frames.find(
+    (entry) => entry.method === method && readCodexTurnId(entry.params) === turnId
+  )
+  if (!frame) {
+    throw new Error(`no ${method} for ${turnId}`)
+  }
+  return frame.t
+}
+
+function completion(frames: readonly CapturedFrame[], turnId: string) {
+  const frame = frames.find(
+    (entry) => entry.method === 'turn/completed' && readCodexTurnId(entry.params) === turnId
+  )
+  return frame
+    ? {
+        t: frame.t,
+        status: readCodexTurnStatus(frame.params),
+        durationMs: readCodexTurnDurationMs(frame.params)
+      }
+    : null
+}
+
+const VERDICT: Record<string, { state: string; outcome: string }> = {
+  completed: { state: 'completed', outcome: 'success' },
+  failed: { state: 'completed', outcome: 'failure' },
+  interrupted: { state: 'interrupted', outcome: 'cancellation' }
+}
+
+const ENDED_CASES = [...new Set(FRAMES.map((frame) => frame.case))].filter(
+  (name) => name !== '0.158.0-conn-refused'
+)
+
+describe('captured Codex turns end once, on their own completion', () => {
+  it.each(ENDED_CASES)('%s', (name) => {
+    const { frames, rows } = replay(name)
+    const turnIds = frames
+      .filter((frame) => frame.method === 'turn/started')
+      .map((frame) => readCodexTurnId(frame.params) ?? '')
+
+    expect(turnIds.length).toBeGreaterThan(0)
+    for (const turnId of turnIds) {
+      const end = completion(frames, turnId)
+      expect(end).not.toBeNull()
+      if (!end) {
+        continue
+      }
+      const verdict = VERDICT[end.status ?? '']
+      expect(verdict).toBeDefined()
+      // One terminal write per turn, and it is Codex's own completion: its time,
+      // its duration and its verdict, with the start this host saw.
+      expect(terminalWrites(rows, turnId)).toEqual([
+        expect.objectContaining({
+          state: verdict?.state,
+          outcome: verdict?.outcome,
+          startedAt: receipt(frames, 'turn/started', turnId),
+          completedAt: end.t,
+          durationMs: end.durationMs
+        })
+      ])
+    }
+  })
+
+  it('keeps every failed turn working through its error until the completion', () => {
+    for (const name of ENDED_CASES) {
+      const frames = framesOf(name)
+      const failedTurns = frames
+        .filter((frame) => frame.method === 'error' && frame.params.willRetry === false)
+        .map((frame) => readCodexTurnId(frame.params) ?? '')
+      for (const turnId of failedTurns) {
+        const errorAt = frames.findIndex(
+          (frame) =>
+            frame.method === 'error' &&
+            frame.params.willRetry === false &&
+            readCodexTurnId(frame.params) === turnId
+        )
+        // Through the error, the turn is open; the completion right after it ends it.
+        expect(terminalWrites(replay(name, errorAt + 1).rows, turnId)).toEqual([])
+        expect(terminalWrites(replay(name).rows, turnId)).toHaveLength(1)
+      }
+    }
+  })
+
+  it('keeps a turn Codex is still retrying on 0.158.0 running, and the exit sweep ends it', () => {
+    const { frames, rows, translator } = replay('0.158.0-conn-refused')
+    const turnId =
+      readCodexTurnId(frames.find((frame) => frame.method === 'turn/started')?.params) ?? ''
+    const retries = frames.filter((frame) => frame.method === 'error')
+
+    // Seven "Reconnecting... waiting for network" frames over four minutes, all
+    // willRetry, and no completion: the turn is genuinely still open.
+    expect(retries).toHaveLength(7)
+    expect(retries.every((frame) => frame.params.willRetry === true)).toBe(true)
+    expect(turnWrites(rows, turnId)).toEqual([
+      expect.objectContaining({
+        state: 'running',
+        startedAt: receipt(frames, 'turn/started', turnId)
+      })
+    ])
+
+    translator.handle({
+      type: 'ended',
+      sessionId: SESSION_ID,
+      reason: 'lost child',
+      cause: 'unexpected-exit',
+      fence: 1,
+      acquisitionGeneration: 'generation-1',
+      observedAt: 250_000
+    })
+
+    expect(terminalWrites(rows, turnId)).toEqual([
+      {
+        kind: 'turn',
+        turnId,
+        state: 'interrupted',
+        userItemId: `codex:${readCodexThreadId(frames[0]?.params)}:${turnId}:0`,
+        startedAt: receipt(frames, 'turn/started', turnId),
+        completedAt: 250_000
+      }
+    ])
+  })
+})
diff --git a/src/main/codex/codex-structured-journal-turn-settles-once-journal.test.ts b/src/main/codex/codex-structured-journal-turn-settles-once-journal.test.ts
new file mode 100644
index 000000000000..4e3caaa8bc00
--- /dev/null
+++ b/src/main/codex/codex-structured-journal-turn-settles-once-journal.test.ts
@@ -0,0 +1,149 @@
+// A failed Codex turn through the real path its record takes:
+// translator → deferred sink queue → on-disk journal → the shared turn-timing reader.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
+import {
+  completedStructuredAgentTurnSeconds,
+  selectStructuredAgentRunningTurnTiming
+} from '../../shared/structured-agent-session-turn-timing'
+import { openAgentSessionJournal } from '../native-chat/agent-session-journal/journal-store-factory'
+import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { createCodexJournalTranslator } from './codex-structured-journal-translation'
+
+const SESSION = 'session-codex-failed-turn'
+const THREAD = 'thread-abc'
+const TURN = 'turn-1'
+
+const cleanups: (() => Promise<void>)[] = []
+afterEach(async () => {
+  for (const cleanup of cleanups.splice(0)) {
+    await cleanup()
+  }
+})
+
+async function session() {
+  const root = await mkdtemp(join(tmpdir(), 'orca-codex-failed-turn-'))
+  const journal = await openAgentSessionJournal({
+    identity: {
+      sessionId: SESSION,
+      workspaceId: 'workspace-1',
+      hostId: 'local',
+      agent: 'codex',
+      providerHandle: { kind: 'codex', threadId: THREAD }
+    },
+    journalDir: root,
+    now: () => 1_000
+  })
+  const deferred = createDeferredStructuredAgentSessionEventSink()
+  deferred.bind({ journal, fence: 1, publish: () => {} })
+  cleanups.push(async () => {
+    deferred.close()
+    await journal.close()
+    await rm(root, { recursive: true, force: true })
+  })
+  const translator = createCodexJournalTranslator({
+    sink: deferred.sink,
+    sessionId: SESSION,
+    primaryThreadId: () => THREAD,
+    schedule: (run) => {
+      run()
+      return () => {}
+    }
+  })
+  const on = (method: string, params: Record<string, unknown>, observedAt: number) =>
+    translator.handle({
+      type: 'notification',
+      sessionId: SESSION,
+      threadId: THREAD,
+      method,
+      params: { threadId: THREAD, ...params },
+      observedAt
+    })
+  return {
+    on,
+    drained: () => deferred.drained(),
+    items: async () => {
+      await deferred.drained()
+      return journal.snapshot().items
+    }
+  }
+}
+
+function turnRecord(rows: Awaited<ReturnType<Awaited<ReturnType<typeof session>>['items']>>) {
+  return rows
+    .map((item) => readAgentJournalTurn(item.body))
+    .findLast((record) => record?.turnId === TURN)
+}
+
+describe('a failed Codex turn in the journal', () => {
+  it('keeps the failed completion, its duration and the start, when it lands while the error is still queued', async () => {
+    const { on, drained, items } = await session()
+    on('turn/started', { turn: { id: TURN } }, 1_000)
+    on(
+      'item/completed',
+      { turnId: TURN, item: { type: 'agentMessage', id: 'agent-1', text: 'Checking the build' } },
+      1_500
+    )
+    await drained()
+
+    // Codex writes both frames back to back; the error's status row is still being
+    // written when the failed completion arrives.
+    on(
+      'error',
+      { turnId: TURN, willRetry: false, error: { message: 'stream disconnected' } },
+      3_000
+    )
+    on('turn/completed', { turn: { id: TURN, status: 'failed', durationMs: 1_900 } }, 3_100)
+
+    const rows = await items()
+    expect(turnRecord(rows)).toMatchObject({
+      state: 'completed',
+      outcome: 'failure',
+      startedAt: 1_000,
+      completedAt: 3_100,
+      durationMs: 1_900
+    })
+    // "Worked for" under the turn's message reads Codex's own duration.
+    expect(
+      completedStructuredAgentTurnSeconds(selectStructuredAgentRunningTurnTiming(rows, TURN))
+    ).toBe(1)
+  })
+
+  // Codex ends a turn once, so a second completion is not expected. If one came,
+  // the settlement id keeps the first record, whether it is still queued or written.
+  it.each([
+    ['still queued', false],
+    ['already written', true]
+  ] as const)(
+    'keeps the first completion when a second one arrives while the first is %s',
+    async (_label, drainFirst) => {
+      const { on, drained, items } = await session()
+      on('turn/started', { turn: { id: TURN } }, 1_000)
+      await drained()
+
+      // The reply's row is being written, so the first completion waits behind it.
+      on(
+        'item/completed',
+        { turnId: TURN, item: { type: 'agentMessage', id: 'agent-1', text: 'Done' } },
+        1_900
+      )
+      on('turn/completed', { turn: { id: TURN, status: 'completed', durationMs: 900 } }, 2_000)
+      if (drainFirst) {
+        await drained()
+      }
+      on('turn/completed', { turn: { id: TURN, status: 'failed' } }, 3_000)
+
+      expect(turnRecord(await items())).toMatchObject({
+        state: 'completed',
+        outcome: 'success',
+        startedAt: 1_000,
+        completedAt: 2_000,
+        durationMs: 900
+      })
+    }
+  )
+})
diff --git a/src/main/codex/codex-structured-launch-resolution.test.ts b/src/main/codex/codex-structured-launch-resolution.test.ts
index 60aab5ed1db3..36ab39e3babc 100644
--- a/src/main/codex/codex-structured-launch-resolution.test.ts
+++ b/src/main/codex/codex-structured-launch-resolution.test.ts
@@ -180,6 +180,16 @@ describe('codex structured launch resolution', () => {
     })
   })
 
+  // A thread opened on the configured default and then given a turn on the saved model reads to
+  // Codex as a model switch, and it injects the saved model's whole prompt a second time.
+  it('opens the thread on the model the record saved', async () => {
+    const launch = await resolverFor(
+      record({ options: { model: 'gpt-chosen', effort: 'high', fastMode: 'false' } })
+    )({ identity: IDENTITY })
+
+    expect(launch.model).toBe('gpt-chosen')
+  })
+
   // The configured CLI arguments are a terminal concern: a durable record written before they
   // stopped being read must not smuggle one back into app-server's argv.
   it("ignores the record's durable launch arguments", async () => {
diff --git a/src/main/codex/codex-structured-launch-resolution.ts b/src/main/codex/codex-structured-launch-resolution.ts
index 8a3fe002cb1e..ebfdb27200a5 100644
--- a/src/main/codex/codex-structured-launch-resolution.ts
+++ b/src/main/codex/codex-structured-launch-resolution.ts
@@ -94,6 +94,8 @@ export function createCodexStructuredLaunchResolver(
     const permissionPolicy = deps.resolvePermissionPolicy?.()
     const head = agentSessionProviderHandleChainHead(record.providerHandleChain)
     const resumeThreadId = head?.handle.provider === 'codex' ? head.handle.threadId : null
+    // The same saved options every turn sends, so the thread and its turns name one model.
+    const model = record.options?.model
     return {
       command,
       args: ['app-server'],
@@ -107,6 +109,7 @@ export function createCodexStructuredLaunchResolver(
       // forked or adopted head names a conversation Codex held.
       ...(resumeThreadId && head?.origin === 'created' ? { supersedeIfUnsaved: true } : {}),
       ...(permissionPolicy ? { permissionPolicy } : {}),
+      ...(model ? { model } : {}),
       ...(resumeThreadId
         ? {
             resumePath: await (deps.resolveRollout ?? resolvePinnedCodexRolloutProof)(
diff --git a/src/main/codex/codex-structured-prompt-ownership.test.ts b/src/main/codex/codex-structured-prompt-ownership.test.ts
index ecdc4c9a4be0..7dd048dd08af 100644
--- a/src/main/codex/codex-structured-prompt-ownership.test.ts
+++ b/src/main/codex/codex-structured-prompt-ownership.test.ts
@@ -261,7 +261,7 @@ describe('Codex live prompt ownership', () => {
         fence: 7,
         prompt: { itemId: 'journal-prompt' }
       })
-    ).resolves.toEqual({ cancelled: false })
+    ).resolves.toEqual({ cancelled: false, refusal: {} })
     await adapter.answerPrompt({
       sessionId: 'session-1',
       itemId: 'journal-prompt',
diff --git a/src/main/codex/codex-structured-prompt-ownership.ts b/src/main/codex/codex-structured-prompt-ownership.ts
index d58f08e731d2..1742d5ced697 100644
--- a/src/main/codex/codex-structured-prompt-ownership.ts
+++ b/src/main/codex/codex-structured-prompt-ownership.ts
@@ -1,6 +1,7 @@
 import {
   AgentSessionPromptAnswerRejectedError,
   AgentSessionPromptUnavailableError,
+  type AgentSessionCancelOutcome,
   type StructuredAgentSessionAdapter
 } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
 import type { StructuredSessionCompaction } from '../native-chat/agent-session-wire/structured-session-compaction'
@@ -16,19 +17,72 @@ import type { CodexStructuredTurnCancellation } from './codex-structured-turn-ca
 type CancelInput = Parameters<StructuredAgentSessionAdapter['cancelTurn']>[0]
 type AnswerInput = Parameters<StructuredAgentSessionAdapter['answerPrompt']>[0]
 
+/** How long a Stop waits for Codex to open the turn it answered a send into. Under the quit
+ *  path's eviction budget, which a close or quit queued behind the Stop spends. */
+export const CODEX_STOP_TURN_OPEN_WAIT_MS = 5_000
+
+/**
+ * A Stop that names no turn: interrupt the turn the journal shows, or else the one Codex reported
+ * started and not yet ended, which the journal can trail by a publish, or else the one Codex
+ * answered a send into, once it opens.
+ */
+async function cancelCodexConversation(
+  input: Parameters<typeof cancelCodexStructuredTurn>[0],
+  session: CodexSession
+): Promise<AgentSessionCancelOutcome> {
+  const { request, sessions, compactions, cancellation } = input
+  const liveTurnId = request.resolveLiveTurnId?.() ?? null
+  // A turn the journal shows that Codex has not started yet (a compaction's) has nothing to stop.
+  const turnId =
+    liveTurnId === null
+      ? ([...(session.activeTurnIds ?? [])].at(-1) ?? (await openedAnsweredTurn(session)))
+      : compactions.providerTurnId(request.sessionId, liveTurnId)
+  if (!turnId) {
+    return { cancelled: false }
+  }
+  const acquisitionGeneration = session.acquisitionGeneration
+  return cancellation.cancel(
+    session,
+    session.threadId,
+    turnId,
+    () =>
+      sessions.get(request.sessionId) === session &&
+      !session.ended &&
+      session.fence === request.fence &&
+      session.acquisitionGeneration === acquisitionGeneration
+  )
+}
+
+/** The turn Codex answered a send into and has not opened yet, once it opens; null when it ends,
+ *  the thread stops running or the child exits first, or the wait runs out. */
+async function openedAnsweredTurn(session: CodexSession): Promise<string | null> {
+  const openTurnIds = session.activeTurnIds ?? new Set<string>()
+  const answered = session.dispatchEchoes.answeredUnopenedTurn(session.threadId, openTurnIds)
+  if (!answered) {
+    return null
+  }
+  // Codex refuses an interrupt before it opens the turn.
+  await session.turnOpenWaits.wait(answered, CODEX_STOP_TURN_OPEN_WAIT_MS)
+  return session.activeTurnIds?.has(answered) ? answered : null
+}
+
 export async function cancelCodexStructuredTurn(input: {
   request: CancelInput
   sessions: Map<string, CodexSession>
   compactions: StructuredSessionCompaction
   cancellation: CodexStructuredTurnCancellation
-}): Promise<{ cancelled: boolean }> {
+}): Promise<AgentSessionCancelOutcome> {
   const { request, sessions, compactions, cancellation } = input
   const session = requireLiveCodexSession(sessions, request.sessionId)
-  const turnId = compactions.providerTurnId(request.sessionId, request.turnId)
+  const prompt = request.prompt
+  const requestedTurnId = request.turnId
+  if (requestedTurnId === undefined) {
+    return prompt ? { cancelled: false } : cancelCodexConversation(input, session)
+  }
+  const turnId = compactions.providerTurnId(request.sessionId, requestedTurnId)
   if (!turnId) {
     return { cancelled: false }
   }
-  const prompt = request.prompt
   if (!prompt) {
     return cancellation.cancel(session, session.threadId, turnId)
   }
@@ -49,7 +103,7 @@ export async function cancelCodexStructuredTurn(input: {
     !session.ended &&
     session.fence === request.fence &&
     session.acquisitionGeneration === acquisitionGeneration &&
-    compactions.providerTurnId(request.sessionId, request.turnId) === turnId &&
+    compactions.providerTurnId(request.sessionId, requestedTurnId) === turnId &&
     session.prompts.ownsBoundClaim(claim, prompt.itemId, claim.prompt.threadId, promptTurnId)
   let interruptConfirmed = false
   try {
diff --git a/src/main/codex/codex-structured-provider-events.ts b/src/main/codex/codex-structured-provider-events.ts
index d272aeb1d2a6..5c15b70fe0c8 100644
--- a/src/main/codex/codex-structured-provider-events.ts
+++ b/src/main/codex/codex-structured-provider-events.ts
@@ -25,6 +25,7 @@ export function translateCodexNotification(input: {
 }): CodexJournalTranslationAdmission {
   const { sessionId, session, method, params, observedAt, dispatchSequenceAtReceipt } = input
   codexRewind.observeCodexRewindActivity(session, method, params)
+  session.turnOpenWaits.observe(session.threadId, method, params)
   if (input.turnCancellation.handleNotification(sessionId, session, method, params, observedAt)) {
     return { accepted: true }
   }
diff --git a/src/main/codex/codex-structured-question-order.test.ts b/src/main/codex/codex-structured-question-order.test.ts
new file mode 100644
index 000000000000..ff9a210e17ad
--- /dev/null
+++ b/src/main/codex/codex-structured-question-order.test.ts
@@ -0,0 +1,257 @@
+// A Codex ask with several questions, driven from the real host journal through
+// the client's session reducer to the rows the transcript list draws.
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
+import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types'
+import {
+  EMPTY_STRUCTURED_AGENT_SESSION,
+  reduceStructuredAgentSession,
+  type StructuredAgentSessionState
+} from '../../shared/structured-agent-session-reducer'
+import { projectStructuredAgentSessionMessages } from '../../shared/structured-agent-session-message-projection'
+import { projectNativeChatTranscriptMessages } from '../../shared/native-chat-transcript-projection'
+import { AgentSessionRecordStore } from '../runtime/agent-session-record-store'
+import { CodexJournalPrompts } from './codex-structured-journal-prompts'
+import { CODEX_USER_INPUT_METHOD } from './codex-structured-prompt-replies'
+import type { StructuredAgentSessionAdapter } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
+import {
+  HOST_TEST_NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
+  hostTestOperationId,
+  resetHostTestOperationIds
+} from '../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import {
+  projectStructuredQuestionMessages,
+  structuredQuestionTranscript
+} from '../../renderer/src/components/native-chat/structured-agent-question-projection'
+
+const CALLER = { callerKey: 'client-1' }
+
+type Asked = readonly { id: string; question: string }[]
+
+// Codex's question ids are the model's own words, so their text order is not
+// the order it asked in. These two asks spell the two orders live QA saw.
+const ASKED: Asked = [
+  { id: 'scope', question: 'Which files are in scope?' },
+  { id: 'priority', question: 'What matters most?' },
+  { id: 'deadline', question: 'When is it due?' }
+]
+const ASKED_OUT_OF_ORDER: Asked = [
+  { id: 'format', question: 'Which format?' },
+  { id: 'audience', question: 'Who reads it?' },
+  { id: 'length', question: 'How long?' }
+]
+
+let root: string
+let store: AgentSessionRecordStore
+let host: StructuredAgentSessionHost
+let sink: StructuredAgentSessionEventSink | null
+let client: StructuredAgentSessionState
+let clock: number
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-codex-question-order-'))
+  resetHostTestOperationIds()
+  sink = null
+  clock = HOST_TEST_NOW
+  const adapter: StructuredAgentSessionAdapter = {
+    acquire: vi.fn<StructuredAgentSessionAdapter['acquire']>(async ({ fence, events }) => {
+      sink = events ?? null
+      return {
+        process: {
+          hostId: 'local',
+          pid: 4242,
+          processStartTimeMs: 1_700_000_000_000,
+          spawnToken: store.getRecord(SESSION)?.lease.reservedSpawnToken ?? 'spawn-a'
+        },
+        link: {
+          linkId: `link-${fence}`,
+          handle: { provider: 'codex', threadId: THREAD },
+          origin: 'created',
+          mintedAtFence: fence,
+          observedAt: HOST_TEST_NOW
+        }
+      }
+    }),
+    releaseAcquisition: vi.fn(async () => true),
+    dispatch: vi.fn(),
+    cancelTurn: vi.fn(async () => ({ cancelled: true })),
+    answerPrompt: vi.fn(async ({ commit }) => commit()),
+    setOption: vi.fn(async () => undefined)
+  }
+  store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
+  host = new StructuredAgentSessionHost({
+    store,
+    adapter,
+    journalRoot: root,
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => 'spawn-a',
+    // Every write lands on its own millisecond, as it does live.
+    now: () => (clock += 1)
+  })
+  expect((await host.attach(CALLER, hostTestAttachParams(null))).ok).toBe(true)
+  const page = await host.history({ sessionId: SESSION, direction: 'tail' })
+  if (!page.ok) {
+    throw new Error('no history page')
+  }
+  client = reduceStructuredAgentSession(EMPTY_STRUCTURED_AGENT_SESSION, {
+    type: 'history-page',
+    page: page.page
+  })
+  host.subscribe({
+    id: 'client',
+    sessionId: SESSION,
+    cursor: page.page.liveCursor ?? page.page.window.nextCursor,
+    emit: (event) => {
+      client = reduceStructuredAgentSession(client, { type: 'event', event })
+    }
+  })
+})
+
+afterEach(async () => {
+  await host.flushAllStreamedEvents()
+  await rm(root, { recursive: true, force: true })
+})
+
+function codexPrompts(): CodexJournalPrompts {
+  if (!sink) {
+    throw new Error('session was never acquired')
+  }
+  return new CodexJournalPrompts(
+    { sink, linkageFor: () => ({}) },
+    () => null,
+    () => 'turn-1'
+  )
+}
+
+async function ask(prompts: CodexJournalPrompts, asked: Asked = ASKED): Promise<void> {
+  prompts.handle({
+    threadId: THREAD,
+    method: CODEX_USER_INPUT_METHOD,
+    codexItemId: 'codex-item-1',
+    promptKey: '7',
+    params: {
+      threadId: THREAD,
+      turnId: 'turn-1',
+      questions: asked.map((question) => ({
+        ...question,
+        options: [
+          { label: 'Yes', description: '' },
+          { label: 'No', description: '' }
+        ]
+      }))
+    }
+  })
+  await host.flushStreamedEvents(SESSION)
+}
+
+function questionItem(question: string): AgentJournalRenderItem {
+  const item = client.items.find(
+    (candidate) => candidate.body.kind === 'question' && candidate.body.question === question
+  )
+  if (!item || item.body.kind !== 'question') {
+    throw new Error(`no journal item for ${question}`)
+  }
+  return item
+}
+
+async function answer(question: string): Promise<void> {
+  const item = questionItem(question)
+  if (item.body.kind !== 'question') {
+    return
+  }
+  const fields = {
+    itemId: item.itemId,
+    expectedRevision: item.revision,
+    optionId: item.body.options[0]!.id
+  }
+  const result = await host.respondToPrompt(CALLER, {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: store.getRecord(SESSION)?.lease.runtimeFence ?? 1,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.respondTo:question',
+        sessionId: SESSION,
+        fields
+      })
+    },
+    kind: 'question',
+    ...fields
+  })
+  expect(result.ok).toBe(true)
+  await host.flushStreamedEvents(SESSION)
+}
+
+/** The prompt rows the transcript list draws, top to bottom, as the questions each one shows. */
+function drawnPromptRows(): string[][] {
+  const { receipts } = structuredQuestionTranscript(client.items)
+  // The desktop list's projection: its comparator adds only a rank for rows the host never writes.
+  const rows = projectNativeChatTranscriptMessages(
+    projectStructuredAgentSessionMessages(
+      client.items,
+      [],
+      client.submissions,
+      projectStructuredQuestionMessages
+    )
+  )
+  return rows.flatMap((row) => {
+    const prompt = receipts.get(row.id)
+    if (!prompt || prompt.kind !== 'question') {
+      return []
+    }
+    const questions = prompt.questions?.length ? prompt.questions : [prompt]
+    return [questions.map(({ question }) => `${question} (${prompt.resolution.state})`)]
+  })
+}
+
+describe('a Codex ask with several questions', () => {
+  it('keeps the pending rest of the ask below the question already answered', async () => {
+    await ask(codexPrompts())
+    await answer(ASKED[0]!.question)
+
+    expect(drawnPromptRows()).toEqual([
+      ['Which files are in scope? (resolved)'],
+      ['What matters most? (pending)', 'When is it due? (pending)']
+    ])
+  })
+
+  it('draws every answered question in the order Codex asked it', async () => {
+    await ask(codexPrompts())
+    for (const { question } of ASKED) {
+      await answer(question)
+    }
+
+    expect(drawnPromptRows()).toEqual([
+      ['Which files are in scope? (resolved)'],
+      ['What matters most? (resolved)'],
+      ['When is it due? (resolved)']
+    ])
+    // Mobile draws the shared projection in journal order, one row per question.
+    expect(
+      projectStructuredAgentSessionMessages(client.items, [], client.submissions).map(
+        ({ blocks }) => (blocks[0]?.type === 'text' ? blocks[0].text.split('\n')[0] : null)
+      )
+    ).toEqual(ASKED.map(({ question }) => question))
+  })
+
+  it('draws a cancelled ask in the order Codex asked it', async () => {
+    const prompts = codexPrompts()
+    await ask(prompts, ASKED_OUT_OF_ORDER)
+    prompts.cancel(questionItem(ASKED_OUT_OF_ORDER[0]!.question).itemId)
+    await host.flushStreamedEvents(SESSION)
+
+    expect(drawnPromptRows()).toEqual([
+      ['Which format? (cancelled)'],
+      ['Who reads it? (cancelled)'],
+      ['How long? (cancelled)']
+    ])
+  })
+})
diff --git a/src/main/codex/codex-structured-session-acquire.ts b/src/main/codex/codex-structured-session-acquire.ts
index ae92bd48f544..0cbe62224c56 100644
--- a/src/main/codex/codex-structured-session-acquire.ts
+++ b/src/main/codex/codex-structured-session-acquire.ts
@@ -8,7 +8,7 @@ import {
   closeFailedCodexAcquisition,
   stopSupersededCodexAcquisition
 } from './codex-structured-acquisition-lifecycle'
-import { CodexBackgroundTaskTracker } from './codex-background-task-tracker'
+import { CodexBackgroundTaskTracker, codexChildWorkSink } from './codex-background-task-tracker'
 import { CodexSubagentExecutions } from './codex-subagent-executions'
 import { createCodexDispatchEchoes } from './codex-structured-dispatch-echo'
 import { createCodexJournalTranslator } from './codex-structured-journal-translation'
@@ -44,6 +44,8 @@ import type { CodexStructuredTurnCancellation } from './codex-structured-turn-ca
 import type { CodexStructuredNotificationRetry } from './codex-structured-notification-retry'
 import type { deliverCodexServerRequest } from './codex-structured-provider-events'
 
+const TURN_BOUNDARIES: ReadonlySet<string> = new Set(['turn/started', 'turn/completed'])
+
 export async function acquireCodexStructuredSession(input: {
   input: StructuredAgentSessionAcquireInput
   deps: CodexStructuredSessionAdapterDeps
@@ -138,7 +140,7 @@ export async function acquireCodexStructuredSession(input: {
       {
         onNotification: (method, params) => {
           // Stamped at receipt, ahead of any pre-publication buffering or retry.
-          const observedAt = isCodexTurnBoundary(method) ? (deps.now?.() ?? Date.now()) : undefined
+          const observedAt = TURN_BOUNDARIES.has(method) ? (deps.now?.() ?? Date.now()) : undefined
           const dispatchSequenceAtReceipt =
             method === 'turn/started' ? dispatchEchoes.latestSequence() : undefined
           input.deliver(
@@ -203,7 +205,7 @@ export async function acquireCodexStructuredSession(input: {
     primaryThreadId = opened.threadId
     const restoreAdmission = translator?.restoreThread(opened.threadId, opened.thread ?? {})
     if (restoreAdmission && !restoreAdmission.accepted) {
-      throw new AgentSessionAcquisitionRefusal(
+      throw AgentSessionAcquisitionRefusal.historyTooLarge(
         'Codex thread history exceeds the bounded restore queue; history was not partially imported.'
       )
     }
@@ -240,6 +242,8 @@ export async function acquireCodexStructuredSession(input: {
       throw new Error(`codex app-server for session ${sessionId} exited while being acquired`)
     }
     acquisitions.deleteIfCurrent(sessionId, attempt)
+    // Where this session's child work goes: the host's records, after each frame is journaled.
+    const sink = codexChildWorkSink(sessionId, deps)
     const session: CodexSession = {
       connection,
       ...codexSessionLifecycle(acquireInput.fence, acquired.acquisitionGeneration as string),
@@ -254,7 +258,7 @@ export async function acquireCodexStructuredSession(input: {
       ...(catalogAccess ? { catalogAccess } : {}),
       dispatchEchoes,
       translator,
-      backgroundTasks: new CodexBackgroundTaskTracker(opened.threadId, subagentExecutions),
+      backgroundTasks: new CodexBackgroundTaskTracker(opened.threadId, subagentExecutions, sink),
       forceCloseUnexpected: (reason) =>
         input.forceCloseUnexpected(
           sessionId,
@@ -299,7 +303,3 @@ export async function acquireCodexStructuredSession(input: {
     attempt.finish()
   }
 }
-
-function isCodexTurnBoundary(method: string): boolean {
-  return method === 'turn/started' || method === 'turn/completed'
-}
diff --git a/src/main/codex/codex-structured-session-adapter-fixture.ts b/src/main/codex/codex-structured-session-adapter-fixture.ts
index 3f2d32ee2eba..27e6eadb6c57 100644
--- a/src/main/codex/codex-structured-session-adapter-fixture.ts
+++ b/src/main/codex/codex-structured-session-adapter-fixture.ts
@@ -89,6 +89,19 @@ export function fakeCodex(routes: Record<string, Route> = {}): {
   return { connections, openConnection, routes }
 }
 
+/** A `turn/start` route for a Codex that opened the turn before its answer was read. */
+export function answerWithOpenedTurn(
+  codex: Pick<ReturnType<typeof fakeCodex>, 'connections'>,
+  turnId: string
+): Route {
+  return () => {
+    codex.connections
+      .at(-1)
+      ?.handlers.onNotification?.('turn/started', { threadId: THREAD_ID, turn: { id: turnId } })
+    return { turn: { id: turnId } }
+  }
+}
+
 export function adapterFor(
   codex: ReturnType<typeof fakeCodex>,
   launch: Partial<CodexStructuredLaunch> = {},
diff --git a/src/main/codex/codex-structured-session-adapter-lifecycle.test.ts b/src/main/codex/codex-structured-session-adapter-lifecycle.test.ts
index 6389cbe70d5e..bcfd2f733f06 100644
--- a/src/main/codex/codex-structured-session-adapter-lifecycle.test.ts
+++ b/src/main/codex/codex-structured-session-adapter-lifecycle.test.ts
@@ -181,6 +181,7 @@ describe('CodexStructuredSessionAdapter lifecycle', () => {
       type: 'ended',
       sessionId: 'session-1',
       reason: 'codex app-server connection ended',
+      failure: { kind: 'providerExited' },
       cause: 'unexpected-exit',
       fence: 7,
       acquisitionGeneration: 'generation-1',
diff --git a/src/main/codex/codex-structured-session-adapter.test.ts b/src/main/codex/codex-structured-session-adapter.test.ts
index 2dd4b8d78af6..70b2ecd7147a 100644
--- a/src/main/codex/codex-structured-session-adapter.test.ts
+++ b/src/main/codex/codex-structured-session-adapter.test.ts
@@ -6,7 +6,6 @@ import {
 } from './codex-app-server-connection'
 import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
 import { CODEX_SPAWN_TOKEN_ENV } from './codex-structured-owner-identity'
-import { ORCA_STRUCTURED_SESSION_ENV } from '../../shared/structured-session-marker'
 import {
   CodexStructuredSessionAdapter,
   type CodexStructuredLaunch,
@@ -17,6 +16,7 @@ import {
   USER_MESSAGE,
   acquired,
   adapterFor,
+  answerWithOpenedTurn,
   fakeCodex,
   identityFor
 } from './codex-structured-session-adapter-fixture'
@@ -35,7 +35,12 @@ describe('CodexStructuredSessionAdapter.acquire', () => {
     expect(codex.connections[0].launch.env).toEqual({
       [CODEX_SPAWN_TOKEN_ENV]: 'spawn-9',
       CODEX_HOME: '/codex/home',
-      [ORCA_STRUCTURED_SESSION_ENV]: '1'
+      ORCA_AGENT_SESSION_ID: 'session-1',
+      ORCA_STRUCTURED_SESSION: '1',
+      ORCA_CLI_COMMAND: expect.stringMatching(/^[^:;]*[\\/]cli[\\/]bin[\\/]orca-dev$/),
+      ORCA_USER_DATA_PATH: expect.any(String),
+      // The test host is unpackaged, so this app's CLI is the dev launcher dir, first on PATH.
+      PATH: expect.stringMatching(/^[^:;]*[\\/]cli[\\/]bin[:;]/)
     })
     expect(codex.connections[0].launch.cwd).toBe('/work/repo')
     expect(codex.connections[0].calls[0]).toEqual({
@@ -58,6 +63,20 @@ describe('CodexStructuredSessionAdapter.acquire', () => {
     expect(acquisition.acquisitionGeneration).toBe('generation-1')
   })
 
+  // A thread opened on Codex's configured default and then given a turn on the chosen model
+  // reads to Codex as a model switch, and it injects the chosen model's whole prompt again.
+  it('opens the thread on the model the session chose, not on the configured default', async () => {
+    const codex = fakeCodex()
+    const adapter = adapterFor(codex, { model: 'gpt-chosen' })
+
+    await adapter.acquire({ identity: identityFor('session-1'), fence: 7, spawnToken: 'spawn-9' })
+
+    expect(codex.connections[0].calls[0]).toEqual({
+      method: 'thread/start',
+      params: { cwd: '/work/repo', model: 'gpt-chosen' }
+    })
+  })
+
   it('resumes the thread the durable handle chain names, not the client one', async () => {
     const codex = fakeCodex()
     const adapter = adapterFor(codex, {
@@ -353,7 +372,8 @@ describe('CodexStructuredSessionAdapter.acquire', () => {
 
 describe('CodexStructuredSessionAdapter.dispatch', () => {
   it('admits a send as soon as Codex owns it', async () => {
-    const codex = fakeCodex({ 'turn/start': () => ({ turn: { id: 'turn-1' } }) })
+    const codex = fakeCodex()
+    codex.routes['turn/start'] = answerWithOpenedTurn(codex, 'turn-1')
     const adapter = await acquired(codex)
 
     const outcome = await adapter.dispatch({
@@ -452,7 +472,12 @@ describe('CodexStructuredSessionAdapter.dispatch', () => {
         body: USER_MESSAGE,
         fence: 7
       })
-    ).toEqual({ state: 'rejected', reason: 'turn already running' })
+    ).toEqual({
+      // Built without Codex's own words, so nothing is quoted and no detail is invented.
+      state: 'rejected',
+      reason: 'The provider did not accept this message.',
+      rejection: { kind: 'providerRejected' }
+    })
   })
 
   it('rethrows a dead child so the wire settles the submission unknown', async () => {
@@ -489,9 +514,9 @@ describe('CodexStructuredSessionAdapter.dispatch', () => {
           }
         ],
         nextCursor: null
-      }),
-      'turn/start': () => ({ turn: { id: 'turn-1' } })
+      })
     })
+    codex.routes['turn/start'] = answerWithOpenedTurn(codex, 'turn-1')
     const adapter = await acquired(codex)
 
     await adapter.setOption({ sessionId: 'session-1', key: 'model', value: 'gpt-5', fence: 7 })
diff --git a/src/main/codex/codex-structured-session-adapter.ts b/src/main/codex/codex-structured-session-adapter.ts
index b9affd8bd003..eebebe3aa441 100644
--- a/src/main/codex/codex-structured-session-adapter.ts
+++ b/src/main/codex/codex-structured-session-adapter.ts
@@ -34,6 +34,7 @@ import {
   translateCodexNotification
 } from './codex-structured-provider-events'
 import { CodexStructuredTurnCancellation } from './codex-structured-turn-cancellation'
+import { settleCodexSendsInEndedTurn } from './codex-structured-turn-end-settlement'
 import { createCodexStructuredNotificationRetry } from './codex-structured-notification-retry'
 import { acquireCodexStructuredSession } from './codex-structured-session-acquire'
 import { changeCodexThreadGoal } from './codex-structured-thread-goal'
@@ -154,11 +155,17 @@ export class CodexStructuredSessionAdapter implements StructuredAgentSessionAdap
     }
     if (event.type === 'notification') {
       this.compactions.codex(event.sessionId, event.method, event.params)
+      // Only an admitted turn end settles; a refused one settles on the retry that lands.
+      settleCodexSendsInEndedTurn(session, event.method, event.params, (settlement) =>
+        this.deps.onDispatchSettledLate?.({ sessionId: event.sessionId, ...settlement })
+      )
       // After the admission check, so a refused frame is observed by the strip
       // only on the retry that also reaches the journal.
-      if (session.backgroundTasks.observe(event)) {
+      if (session.backgroundTasks.observe(event, session.prompts.takeAbandonedCommands())) {
         this.deps.onBackgroundTasksChanged?.(event.sessionId, session.backgroundTasks.state)
       }
+      // After the journal and the parent's republished row, never ahead of either.
+      session.backgroundTasks.publishChildWork()
     }
     if (event.type === 'ended') {
       this.compactions.ended(event.sessionId)
@@ -257,12 +264,16 @@ export class CodexStructuredSessionAdapter implements StructuredAgentSessionAdap
             { threadId: session.threadId },
             { timeoutMs: this.deps.requestTimeoutMs }
           )
-          .catch((error) => {
-            if (isCodexAppServerRequestError(error)) {
-              return { error: error.message }
+          .then(
+            () => undefined,
+            (error) => {
+              if (isCodexAppServerRequestError(error)) {
+                const detail = error.providerDiagnostic
+                return { outcome: 'failed' as const, ...(detail ? { detail } : {}) }
+              }
+              throw error
             }
-            throw error
-          })
+          )
       },
       input.onLateResult,
       input.turnId
@@ -277,7 +288,8 @@ export class CodexStructuredSessionAdapter implements StructuredAgentSessionAdap
       this.deps.requestTimeoutMs
     )
 
-  supportsThreadGoal = (sessionId: string): boolean => this.sessions.has(sessionId)
+  // Provider-level: a goal change at rest starts the agent first.
+  supportsThreadGoal = (): boolean => true
 
   answerPrompt: StructuredAgentSessionAdapter['answerPrompt'] = (request) =>
     answerCodexStructuredPrompt({ request, sessions: this.sessions })
diff --git a/src/main/codex/codex-structured-session-cancel.test.ts b/src/main/codex/codex-structured-session-cancel.test.ts
index 1ac807a5ccd9..2d6c50adae46 100644
--- a/src/main/codex/codex-structured-session-cancel.test.ts
+++ b/src/main/codex/codex-structured-session-cancel.test.ts
@@ -142,14 +142,14 @@ describe('CodexStructuredSessionAdapter.cancelTurn', () => {
         turnId: 'turn-1',
         fence: 7
       })
-    ).resolves.toEqual({ cancelled: false })
+    ).resolves.toEqual({ cancelled: false, refusal: {} })
     await expect(
       (await acquired(absent)).cancelTurn({
         sessionId: 'session-1',
         turnId: 'turn-1',
         fence: 7
       })
-    ).resolves.toEqual({ cancelled: false })
+    ).resolves.toEqual({ cancelled: false, refusal: {} })
   })
 
   it('rethrows an unsettled interrupt so the turn is not shown as cancelled', async () => {
@@ -228,14 +228,22 @@ describe('CodexStructuredSessionAdapter.cancelTurn', () => {
 
     await expect(
       adapter.cancelTurn({ sessionId: 'session-1', turnId: 'turn-1', fence: 7 })
-    ).resolves.toEqual({ cancelled: false })
+    ).resolves.toEqual({ cancelled: false, unconfirmed: true })
     expect(events).toContainEqual(expect.objectContaining({ method: 'turn/completed' }))
   })
 
   it('accepts an immediate resend after verified interruption', async () => {
     let nextTurn = 0
     const codex = fakeCodex()
-    codex.routes['turn/start'] = () => ({ turn: { id: `turn-${++nextTurn}` } })
+    codex.routes['turn/start'] = () => {
+      // Codex opens each turn it answers; a send's dispatch waits for that.
+      const turnId = `turn-${++nextTurn}`
+      codex.connections[0].handlers.onNotification?.('turn/started', {
+        threadId: THREAD_ID,
+        turn: { id: turnId }
+      })
+      return { turn: { id: turnId } }
+    }
     codex.routes['turn/interrupt'] = () => {
       completeTurn(codex)
       return {}
diff --git a/src/main/codex/codex-structured-session-close.test.ts b/src/main/codex/codex-structured-session-close.test.ts
index dffa7157dd61..9d80a0fa9829 100644
--- a/src/main/codex/codex-structured-session-close.test.ts
+++ b/src/main/codex/codex-structured-session-close.test.ts
@@ -1,4 +1,5 @@
 import { createCodexDispatchEchoes } from './codex-structured-dispatch-echo'
+import { createCodexTurnOpenWaits } from './codex-structured-turn-open-wait'
 import { describe, expect, it, vi } from 'vitest'
 import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types'
 import type {
@@ -76,7 +77,7 @@ function claudeAdapterStub(): StructuredAgentSessionAdapter {
 }
 
 describe('Codex structured session close lifecycle', () => {
-  it('forwards a one-shot exit when lifecycle admission is rejected', () => {
+  function backpressuredSession(requestedClose: boolean) {
     const connection: CodexAppServerConnection = {
       pid: 4321,
       closed: true,
@@ -87,7 +88,6 @@ describe('Codex structured session close lifecycle', () => {
       close: async () => true
     }
     const prompts = new CodexPromptRegistry()
-    const clearPrompts = vi.spyOn(prompts, 'clear')
     const translator = {
       handle: vi.fn().mockReturnValueOnce({ accepted: false, reason: 'backpressure' as const }),
       dispose: vi.fn()
@@ -96,7 +96,7 @@ describe('Codex structured session close lifecycle', () => {
       connection,
       backgroundTasks: new CodexBackgroundTaskTracker('thread-1'),
       ended: false,
-      requestedClose: false,
+      requestedClose,
       fence: 7,
       acquisitionGeneration: 'generation-1',
       threadId: THREAD,
@@ -106,9 +106,15 @@ describe('Codex structured session close lifecycle', () => {
       reportedOptions: {},
       fastModeTierByModel: new Map(),
       dispatchEchoes: createCodexDispatchEchoes(),
+      turnOpenWaits: createCodexTurnOpenWaits(),
       translator
     }
-    const sessions = new Map([['session-1', session]])
+    return { connection, prompts, translator, session, sessions: new Map([['session-1', session]]) }
+  }
+
+  it('forwards a one-shot exit when lifecycle admission is rejected', () => {
+    const { connection, prompts, translator, session, sessions } = backpressuredSession(false)
+    const clearPrompts = vi.spyOn(prompts, 'clear')
     const onEvent = vi.fn()
 
     expect(
@@ -129,6 +135,29 @@ describe('Codex structured session close lifecycle', () => {
     expect(translator.handle).toHaveBeenCalledOnce()
   })
 
+  it("ends a Stop's wait for its turn to open when a requested close cannot publish its end yet", async () => {
+    const { connection, prompts, session, sessions } = backpressuredSession(true)
+    let released = false
+    void session.turnOpenWaits.wait('turn-1', 60_000).then(() => {
+      released = true
+    })
+
+    expect(
+      handleCodexSessionExit({
+        sessions,
+        sessionId: 'session-1',
+        connection,
+        error: new Error('codex session closed'),
+        closedByOrca: true,
+        prompts
+      })
+    ).toBe(false)
+    await Promise.resolve()
+    // Left for the retry, but the child is gone: nothing waits on a turn it would open.
+    expect(session.ended).toBe(false)
+    expect(released).toBe(true)
+  })
+
   it('mints a distinct child generation even when acquisitions share one fence', async () => {
     const { adapter } = adapterFixture()
     const input = { identity: identity('session-1'), fence: 7, spawnToken: 'spawn-1' }
diff --git a/src/main/codex/codex-structured-session-close.ts b/src/main/codex/codex-structured-session-close.ts
index 0a1de244dca1..5bf973308b10 100644
--- a/src/main/codex/codex-structured-session-close.ts
+++ b/src/main/codex/codex-structured-session-close.ts
@@ -1,3 +1,4 @@
+import { agentSessionFailureFact, providerDiagnosticOf } from '../../shared/agent-session-failure'
 import type { CodexAppServerConnection } from './codex-app-server-connection-types'
 import { closeProcessRegistry } from '../../shared/child-process/close-process-registry'
 import {
@@ -14,6 +15,9 @@ export function handleCodexSessionExit(input: {
   sessionId: string
   connection: CodexAppServerConnection | null
   error: Error
+  /** Set by Orca's own close. Absent only from the connection's onExit, which the connection
+   *  withholds while Orca is closing the child. */
+  closedByOrca?: true
   prompts?: CodexSession['prompts']
   allowFailedSettlement?: boolean
   onEvent?: (event: CodexStructuredSessionEvent) => void
@@ -25,10 +29,16 @@ export function handleCodexSessionExit(input: {
     return false
   }
   session.exitObservedAt ??= Date.now()
+  // Before the admission check: the child is gone whether or not its end was admitted.
+  session.turnOpenWaits.releaseAll()
   const event: StructuredAgentSessionEndedEvent = {
     type: 'ended',
     sessionId: input.sessionId,
     reason: input.error.message,
+    // Only the child's own exit blames Codex; a close Orca made, for any reason, is Orca's.
+    failure: input.closedByOrca
+      ? agentSessionFailureFact('hostFault')
+      : agentSessionFailureFact('providerExited', { detail: providerDiagnosticOf(input.error) }),
     cause: session.requestedClose ? 'requested-close' : 'unexpected-exit',
     fence: session.fence,
     acquisitionGeneration: session.acquisitionGeneration,
@@ -48,6 +58,8 @@ export function handleCodexSessionExit(input: {
   session.dispatchEchoes.clear()
   session.backgroundTasks.clear()
   input.onBackgroundTasksChanged?.(input.sessionId, null)
+  // Every close path funnels here, so the session's children end with it on each one.
+  session.backgroundTasks.publishChildWork()
   session.unbindReadingControl?.()
   input.onEvent?.(event)
   session.prompts.clear()
@@ -93,6 +105,7 @@ export async function closeCodexPublishedSession(
       sessionId,
       connection: session.connection,
       error: options?.unexpectedReason ?? new Error('codex session closed'),
+      closedByOrca: true,
       prompts: session.prompts,
       ...(options?.allowFailedSettlement ? { allowFailedSettlement: true } : {}),
       ...(onEvent ? { onEvent } : {})
diff --git a/src/main/codex/codex-structured-session-exit-blame.test.ts b/src/main/codex/codex-structured-session-exit-blame.test.ts
new file mode 100644
index 000000000000..591f0e61ae8f
--- /dev/null
+++ b/src/main/codex/codex-structured-session-exit-blame.test.ts
@@ -0,0 +1,68 @@
+// Only the Codex app-server child's own exit says Codex stopped; a close Orca made — a journal
+// sink that could not take a frame, a forced close — is Orca's.
+
+import { describe, expect, it, vi } from 'vitest'
+import { agentSessionFailureWords } from '../../shared/agent-session-failure-words'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { adapterFor, fakeCodex, identityFor } from './codex-structured-session-adapter-fixture'
+import type { CodexStructuredSessionEvent } from './codex-structured-session-state'
+
+function sink(overrides: Partial<StructuredAgentSessionEventSink> = {}) {
+  return { appendItem: vi.fn(), appendTombstone: vi.fn(), publish: vi.fn(), ...overrides }
+}
+
+async function startedCodex(events: StructuredAgentSessionEventSink) {
+  const codex = fakeCodex()
+  const emitted: CodexStructuredSessionEvent[] = []
+  const adapter = adapterFor(codex, {}, emitted)
+  await adapter.acquire({ identity: identityFor('session-1'), fence: 7, spawnToken: 's', events })
+  const ended = async () => {
+    await vi.waitFor(() => expect(emitted.some((event) => event.type === 'ended')).toBe(true))
+    return emitted.filter((event) => event.type === 'ended')
+  }
+  return { adapter, connection: codex.connections[0], ended }
+}
+
+describe('what a started Codex session says ended it', () => {
+  it('says Codex stopped when the child exits on its own', async () => {
+    const { connection, ended } = await startedCodex(sink())
+
+    connection.handlers.onExit?.(new Error('codex app-server connection ended: killed'))
+
+    const [event] = await ended()
+    expect(event).toMatchObject({ cause: 'unexpected-exit', failure: { kind: 'providerExited' } })
+    const failure = event && 'failure' in event ? event.failure : undefined
+    expect(
+      failure && agentSessionFailureWords(failure, { surface: 'row', agentName: 'Codex' }).text
+    ).toBe(
+      'Codex stopped while this response was in progress. You can continue in this conversation.'
+    )
+  })
+
+  it('blames Orca when a journal sink failure makes Orca close the child', async () => {
+    const { connection, ended } = await startedCodex(
+      sink({ tryAppendItem: () => ({ accepted: false, reason: 'failed' }) })
+    )
+
+    connection.handlers.onUnhandledFrame?.('frame:invalid-json', '{')
+
+    expect(await ended()).toMatchObject([
+      {
+        reason: 'Codex provider frame frame:invalid-json could not be durably recorded (failed)',
+        cause: 'unexpected-exit',
+        failure: { kind: 'hostFault' }
+      }
+    ])
+    expect(connection.closeCount).toBe(1)
+  })
+
+  it('blames Orca for a forced close', async () => {
+    const { adapter, ended } = await startedCodex(sink())
+
+    await expect(adapter.forceCloseSession('session-1')).resolves.toBe(true)
+
+    expect(await ended()).toMatchObject([
+      { cause: 'unexpected-exit', failure: { kind: 'hostFault' } }
+    ])
+  })
+})
diff --git a/src/main/codex/codex-structured-session-options-catalog.test.ts b/src/main/codex/codex-structured-session-options-catalog.test.ts
index a9fd420eb0ab..aac9e2946cf7 100644
--- a/src/main/codex/codex-structured-session-options-catalog.test.ts
+++ b/src/main/codex/codex-structured-session-options-catalog.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
 import { createCodexDispatchEchoes } from './codex-structured-dispatch-echo'
+import { createCodexTurnOpenWaits } from './codex-structured-turn-open-wait'
 import type { CodexAppServerConnection } from './codex-app-server-connection'
 import { CodexAcquisitionWindow } from './codex-structured-acquisition-window'
 import {
@@ -62,6 +63,7 @@ function storeSession(
     reportedOptions: { model: 'gpt-live', effort: 'high' },
     fastModeTierByModel: new Map(),
     dispatchEchoes: createCodexDispatchEchoes(),
+    turnOpenWaits: createCodexTurnOpenWaits(),
     translator: null,
     catalogAccess: { store, fingerprint: FINGERPRINT, accountHomePath: '/homes/a' }
   }
diff --git a/src/main/codex/codex-structured-session-options.test.ts b/src/main/codex/codex-structured-session-options.test.ts
index 47ed8b50e3aa..d99ecc0305e1 100644
--- a/src/main/codex/codex-structured-session-options.test.ts
+++ b/src/main/codex/codex-structured-session-options.test.ts
@@ -1,4 +1,5 @@
 import { createCodexDispatchEchoes } from './codex-structured-dispatch-echo'
+import { createCodexTurnOpenWaits } from './codex-structured-turn-open-wait'
 import { describe, expect, it, vi } from 'vitest'
 import type { CodexAppServerConnection } from './codex-app-server-connection'
 import { CodexAcquisitionWindow } from './codex-structured-acquisition-window'
@@ -36,6 +37,7 @@ function optionSession(request: CodexAppServerConnection['request']): CodexSessi
     reportedOptions: { model: 'gpt-live', effort: 'high' },
     fastModeTierByModel: new Map(),
     dispatchEchoes: createCodexDispatchEchoes(),
+    turnOpenWaits: createCodexTurnOpenWaits(),
     translator: null
   }
 }
diff --git a/src/main/codex/codex-structured-session-state.ts b/src/main/codex/codex-structured-session-state.ts
index b5e4796d21d9..02c56b419bdf 100644
--- a/src/main/codex/codex-structured-session-state.ts
+++ b/src/main/codex/codex-structured-session-state.ts
@@ -3,14 +3,20 @@ import type {
   AgentSessionJournalIdentity
 } from '../../shared/agent-session-journal-types'
 import { randomUUID } from 'node:crypto'
+import type { AgentJournalDispatchRejection } from '../../shared/agent-session-failure-words'
 import { cancelProcessAcquisition } from '../../shared/child-process/cancel-process-acquisition'
 import type {
   CodexAppServerConnection,
   openCodexAppServerConnection
 } from './codex-app-server-connection'
 import { CodexAcquisitionWindow } from './codex-structured-acquisition-window'
+import {
+  createCodexTurnOpenWaits,
+  type CodexTurnOpenWaits
+} from './codex-structured-turn-open-wait'
 import type { CodexDispatchEchoes } from './codex-structured-dispatch-echo'
 import type { AgentSessionBackgroundTaskState } from '../../shared/agent-session-wire'
+import type { AgentChildWorkEvidence } from '../../shared/agent-status-child-work-evidence'
 import type { CodexBackgroundTaskTracker } from './codex-background-task-tracker'
 import type { CodexJournalTranslator } from './codex-structured-journal-translation'
 import type { CodexTurnProcessSnapshot } from './codex-structured-turn-processes'
@@ -34,6 +40,8 @@ export type CodexStructuredLaunch = {
    *  rollout for it, start a new thread in its place. Never set for a thread a resume proved. */
   supersedeIfUnsaved?: boolean
   permissionPolicy?: CodexStructuredPermissionPolicy
+  /** The model the session chose; the thread opens on it so its first turn is not a switch. */
+  model?: string
   env?: Record<string, string>
 }
 
@@ -75,12 +83,16 @@ export type CodexStructuredSessionAdapterDeps = {
     sessionId: string,
     state: AgentSessionBackgroundTaskState | null
   ) => void
-  /** Identity for a send admitted earlier, once Codex echoes the user message. */
-  onDispatchSettledLate?: (input: {
-    sessionId: string
-    clientMessageId: string
-    providerIdentity: AgentJournalItemIdentity
-  }) => void
+  /** What the session's child work did, delivered after the journal handled the frame. */
+  onChildWorkEvidence?: (sessionId: string, evidence: AgentChildWorkEvidence[]) => void
+  /** A send admitted earlier: its identity once Codex echoes it, or its rejection when the turn
+   *  Codex answered it into ended without taking it. */
+  onDispatchSettledLate?: (
+    input: { sessionId: string; clientMessageId: string } & (
+      | { providerIdentity: AgentJournalItemIdentity }
+      | ({ state: 'rejected' } & AgentJournalDispatchRejection)
+    )
+  ) => void
   /** Codex reported its thread not running with no turn open: a send whose
    *  dispatch was never answered is owed nothing after this. */
   onPrimaryThreadStoppedRunning?: (input: { sessionId: string }) => void
@@ -110,7 +122,11 @@ export type CodexSession = {
   threadId: string
   historyPath: string | null
   historyMode?: 'legacy' | 'paginated'
+  /** Primary-thread turns Codex reported started and not yet ended, as read off the wire: what
+   *  rewind waits out and what a Stop naming no turn interrupts when the journal shows none. */
   activeTurnIds?: Set<string>
+  /** Stops waiting for the turn Codex answered a send into to open. */
+  turnOpenWaits: CodexTurnOpenWaits
   dispatchPending?: boolean
   prompts: CodexAcquisitionWindow['prompts']
   options: Map<string, string>
@@ -141,8 +157,17 @@ export function mintCodexAcquisitionGeneration(deps: CodexStructuredSessionAdapt
 export function codexSessionLifecycle(
   fence: number,
   acquisitionGeneration: string
-): Pick<CodexSession, 'ended' | 'requestedClose' | 'fence' | 'acquisitionGeneration'> {
-  return { ended: false, requestedClose: false, fence, acquisitionGeneration }
+): Pick<
+  CodexSession,
+  'ended' | 'requestedClose' | 'fence' | 'acquisitionGeneration' | 'turnOpenWaits'
+> {
+  return {
+    ended: false,
+    requestedClose: false,
+    fence,
+    acquisitionGeneration,
+    turnOpenWaits: createCodexTurnOpenWaits()
+  }
 }
 
 export function requireLiveCodexSession(
diff --git a/src/main/codex/codex-structured-thread-facts.ts b/src/main/codex/codex-structured-thread-facts.ts
index 7422d7e44ff3..f2a42e6d3dbf 100644
--- a/src/main/codex/codex-structured-thread-facts.ts
+++ b/src/main/codex/codex-structured-thread-facts.ts
@@ -47,6 +47,11 @@ export function readCodexTurnStatus(payload: unknown): string | null {
   return nonEmptyString(record(root.turn)?.status) ?? nonEmptyString(root.status)
 }
 
+/** A failed `turn/completed` carries Codex's reason as `turn.error.message`. */
+export function readCodexTurnErrorMessage(payload: unknown): string | null {
+  return nonEmptyString(record(record(record(payload)?.turn)?.error)?.message)
+}
+
 /** Codex's own turn duration, already in milliseconds; absent or malformed reads as null. */
 export function readCodexTurnDurationMs(payload: unknown): number | null {
   const root = record(payload)
@@ -57,12 +62,6 @@ export function readCodexTurnDurationMs(payload: unknown): number | null {
   return typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : null
 }
 
-/** `error` carries `willRetry`: Codex sets it on a stream error it is about to
- *  retry, and omits it (false) on one that ended the turn the frame names. */
-export function readCodexErrorWillRetry(payload: unknown): boolean {
-  return record(payload)?.willRetry === true
-}
-
 /** `thread/status/changed` carries a TAGGED status (`{status:{type}}`), never a
  *  bare string. `idle` and `systemError` are the two arms that mean the thread
  *  is not running; `active` and `notLoaded` are not. */
@@ -70,3 +69,13 @@ export function codexThreadStoppedRunning(payload: unknown): boolean {
   const type = record(record(payload)?.status)?.type
   return type === 'idle' || type === 'systemError'
 }
+
+/** An `active` thread flags each request it has open on the user (an approval, a question). */
+export function codexThreadWaitsOnUser(payload: unknown): boolean {
+  const status = record(record(payload)?.status)
+  const flags = status?.type === 'active' ? status.activeFlags : null
+  return (
+    Array.isArray(flags) &&
+    flags.some((flag) => flag === 'waitingOnApproval' || flag === 'waitingOnUserInput')
+  )
+}
diff --git a/src/main/codex/codex-structured-thread-open.test.ts b/src/main/codex/codex-structured-thread-open.test.ts
index b819a0dc6b21..fede869a83c9 100644
--- a/src/main/codex/codex-structured-thread-open.test.ts
+++ b/src/main/codex/codex-structured-thread-open.test.ts
@@ -261,6 +261,29 @@ describe('openCodexThread', () => {
       )
     })
 
+    it('opens the replacement thread on the chosen model', async () => {
+      const request = codexWithoutRollout()
+
+      await openCodexThread(
+        connectionFor(request),
+        {
+          cwd: '/workspace',
+          resumeThreadId: 'thread-unsaved',
+          supersedeIfUnsaved: true,
+          model: 'gpt-chosen'
+        },
+        2_000
+      )
+
+      // A resume keeps the thread's own saved model, provider and effort, which naming one skips.
+      expect(request.mock.calls[0]?.[1]).not.toHaveProperty('model')
+      expect(request).toHaveBeenLastCalledWith(
+        'thread/start',
+        { cwd: '/workspace', model: 'gpt-chosen' },
+        { timeoutMs: 2_000 }
+      )
+    })
+
     it('keeps the resume failure for a thread a resume already proved', async () => {
       const request = codexWithoutRollout()
 
diff --git a/src/main/codex/codex-structured-thread-open.ts b/src/main/codex/codex-structured-thread-open.ts
index 83cd710e1360..0f8b530d6240 100644
--- a/src/main/codex/codex-structured-thread-open.ts
+++ b/src/main/codex/codex-structured-thread-open.ts
@@ -90,14 +90,18 @@ export async function openCodexThread(
     resumePath?: string | null
     supersedeIfUnsaved?: boolean
     permissionPolicy?: CodexStructuredPermissionPolicy
+    /** Why: Codex renders a thread's base instructions for its opening model; a first turn on
+     *  another model reads as a mid-conversation switch and injects a second full prompt. */
+    model?: string
   },
   timeoutMs: number | undefined
 ): Promise<CodexOpenedThread> {
   const resumeThreadId = launch.resumeThreadId
+  const threadSettings = { cwd: launch.cwd, ...launch.permissionPolicy }
   const startThread = (): Promise<unknown> =>
     connection.request(
       'thread/start',
-      { cwd: launch.cwd, ...launch.permissionPolicy },
+      { ...threadSettings, ...(launch.model ? { model: launch.model } : {}) },
       { timeoutMs }
     )
   let supersededThreadId: string | undefined
@@ -105,10 +109,10 @@ export async function openCodexThread(
   if (!resumeThreadId) {
     opened = await startThread()
   } else {
+    // No model: naming one makes Codex skip the thread's saved model, provider and effort.
     const resumeParams = {
       threadId: resumeThreadId,
-      cwd: launch.cwd,
-      ...launch.permissionPolicy,
+      ...threadSettings,
       ...(launch.resumePath ? { path: launch.resumePath } : {})
     }
     try {
diff --git a/src/main/codex/codex-structured-turn-cancellation.ts b/src/main/codex/codex-structured-turn-cancellation.ts
index 4418da810571..524ab252e4f8 100644
--- a/src/main/codex/codex-structured-turn-cancellation.ts
+++ b/src/main/codex/codex-structured-turn-cancellation.ts
@@ -3,6 +3,8 @@ import {
   type CodexAppServerConnection
 } from './codex-app-server-connection'
 import { isCodexAppServerUnsupportedError } from './codex-app-server-session'
+import { providerDiagnosticOf } from '../../shared/agent-session-failure'
+import type { AgentSessionCancelOutcome } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
 import type {
   CodexSession,
   CodexStructuredSessionAdapterDeps,
@@ -91,7 +93,7 @@ export class CodexStructuredTurnCancellation {
     turnId: string,
     isCurrent: () => boolean = () => true,
     onConfirmed?: () => CodexJournalTranslationAdmission
-  ): Promise<{ cancelled: boolean }> {
+  ): Promise<AgentSessionCancelOutcome> {
     const state = this.state(session)
     const key = turnKey(threadId, turnId)
     state.blockedCompletions.add(key)
@@ -151,7 +153,14 @@ export class CodexStructuredTurnCancellation {
     // A failed cancellation must not permanently divert the provider's later
     // completion for this turn. Let the normal completion path settle it.
     this.releaseCompletion(session, key)
-    return { cancelled: false }
+    if (acknowledged) {
+      return { cancelled: false, unconfirmed: true }
+    }
+    if (!requestError) {
+      return { cancelled: false }
+    }
+    const detail = providerDiagnosticOf(requestError)
+    return { cancelled: false, refusal: detail ? { detail } : {} }
   }
 
   private capture(pid: number | undefined): Promise<CodexTurnProcessSnapshot | null> {
diff --git a/src/main/codex/codex-structured-turn-end-settlement.test.ts b/src/main/codex/codex-structured-turn-end-settlement.test.ts
new file mode 100644
index 000000000000..38cc648f79d9
--- /dev/null
+++ b/src/main/codex/codex-structured-turn-end-settlement.test.ts
@@ -0,0 +1,321 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types'
+import { classifyDispatchRejection } from '../../shared/structured-agent-session-dispatch-rejection'
+import { createCodexDispatchEchoes } from './codex-structured-dispatch-echo'
+import {
+  acquiredCodexAdapter,
+  CODEX_TEST_THREAD_ID,
+  CODEX_TEST_USER_MESSAGE,
+  fakeCodexAppServer,
+  type LateSettlement
+} from './codex-structured-dispatch-test-support'
+import { codexTurnLifecycleFake } from './codex-turn-lifecycle-fake'
+
+async function turnEndRig() {
+  const codex = fakeCodexAppServer()
+  const turns = codexTurnLifecycleFake(CODEX_TEST_THREAD_ID, () => {
+    const handlers = codex.connections.at(-1)?.handlers
+    return (method, params) => handlers?.onNotification?.(method, params)
+  })
+  Object.assign(codex.routes, turns.routes)
+  const settlements: LateSettlement[] = []
+  const bodies: AgentJournalItemBody[] = []
+  const adapter = await acquiredCodexAdapter({
+    codex,
+    settlements,
+    sink: {
+      appendItem: (_identity, body) => bodies.push(body),
+      appendTombstone: () => {},
+      publish: () => {}
+    }
+  })
+  const send = (clientMessageId: string) =>
+    adapter.dispatch({
+      sessionId: 'session-1',
+      clientMessageId,
+      body: CODEX_TEST_USER_MESSAGE,
+      fence: 7
+    })
+  // Codex answers a cold send before it opens the turn.
+  const sendAndOpen = async (clientMessageId: string) => {
+    const sending = send(clientMessageId)
+    await vi.waitFor(() => expect(turns.turnId).not.toBeNull())
+    turns.start()
+    return sending
+  }
+  const settledIds = () => settlements.map(({ clientMessageId }) => clientMessageId)
+  const categoryOf = (settlement: LateSettlement | undefined) =>
+    settlement && 'state' in settlement ? classifyDispatchRejection(settlement).category : null
+  return { codex, turns, adapter, send, sendAndOpen, settlements, settledIds, categoryOf, bodies }
+}
+
+describe('a Codex send its turn ended without echoing', () => {
+  it('is withdrawn when the turn is interrupted, once', async () => {
+    const rig = await turnEndRig()
+    await expect(rig.sendAndOpen('client-1')).resolves.toEqual({ state: 'admitted' })
+
+    rig.turns.end('interrupted')
+
+    expect(rig.settlements).toEqual([
+      expect.objectContaining({
+        sessionId: 'session-1',
+        clientMessageId: 'client-1',
+        state: 'rejected'
+      })
+    ])
+    expect(rig.categoryOf(rig.settlements[0])).toBe('withdrawn')
+  })
+
+  it('is rejected in Codex words when its failed turn ends without echoing it', async () => {
+    const rig = await turnEndRig()
+    await rig.sendAndOpen('client-1')
+
+    rig.codex.connections[0]!.handlers.onNotification?.('error', {
+      threadId: CODEX_TEST_THREAD_ID,
+      turnId: 'turn-1',
+      willRetry: false,
+      error: { message: 'usage limit reached' }
+    })
+    rig.turns.end('failed', 'usage limit reached')
+
+    expect(rig.settlements).toEqual([
+      expect.objectContaining({
+        clientMessageId: 'client-1',
+        state: 'rejected',
+        rejection: {
+          kind: 'providerRejected',
+          detail: { text: 'usage limit reached', audience: 'person' }
+        }
+      })
+    ])
+  })
+
+  it('is accepted when Codex records it after the error that fails its turn', async () => {
+    const rig = await turnEndRig()
+    await rig.sendAndOpen('client-1')
+    rig.turns.echo('client-1')
+    await rig.send('client-2')
+
+    // A failed turn keeps its steered input: Codex records it after the error, before the end.
+    rig.codex.connections[0]!.handlers.onNotification?.('error', {
+      threadId: CODEX_TEST_THREAD_ID,
+      turnId: 'turn-1',
+      willRetry: false,
+      error: { message: 'usage limit reached' }
+    })
+    rig.turns.echo('client-2')
+    rig.turns.end('failed', 'usage limit reached')
+
+    expect(rig.settlements).toEqual([
+      expect.objectContaining({ clientMessageId: 'client-1', providerIdentity: expect.anything() }),
+      expect.objectContaining({
+        clientMessageId: 'client-2',
+        providerIdentity: expect.objectContaining({ turnId: 'turn-1' })
+      })
+    ])
+  })
+
+  it('stays pending, still armed, when its turn completes without echoing it', async () => {
+    const rig = await turnEndRig()
+    await rig.sendAndOpen('client-1')
+
+    rig.turns.end('completed')
+    expect(rig.settlements).toEqual([])
+
+    // Codex echoes before a completed end; this late one only proves the send is still armed.
+    rig.turns.echo('client-1')
+    expect(rig.settlements).toEqual([
+      expect.objectContaining({
+        clientMessageId: 'client-1',
+        providerIdentity: expect.objectContaining({ turnId: 'turn-1' })
+      })
+    ])
+  })
+
+  it('accepts a send its turn echoed, with its key, exactly once', async () => {
+    const rig = await turnEndRig()
+    await rig.sendAndOpen('client-1')
+    rig.turns.echo('client-1')
+
+    rig.turns.end('interrupted')
+
+    expect(rig.settlements).toEqual([
+      {
+        sessionId: 'session-1',
+        clientMessageId: 'client-1',
+        providerIdentity: {
+          provider: 'codex',
+          threadId: CODEX_TEST_THREAD_ID,
+          turnId: 'turn-1',
+          ordinal: 0
+        }
+      }
+    ])
+  })
+
+  it('ignores an echo that arrives after the withdrawal', async () => {
+    const rig = await turnEndRig()
+    await rig.sendAndOpen('client-1')
+    rig.turns.end('interrupted')
+
+    rig.turns.echo('client-1')
+
+    expect(rig.settledIds()).toEqual(['client-1'])
+    expect(rig.categoryOf(rig.settlements[0])).toBe('withdrawn')
+  })
+
+  it('settles each of two sends steered into one interrupted turn once', async () => {
+    const rig = await turnEndRig()
+    await rig.sendAndOpen('client-1')
+    await rig.send('client-2')
+    expect(rig.turns.turnId).toBe('turn-1')
+
+    rig.turns.end('interrupted')
+
+    expect(rig.settledIds().sort()).toEqual(['client-1', 'client-2'])
+  })
+
+  it('settles a send whose answer arrived after turn/started when the turn is interrupted', async () => {
+    const rig = await turnEndRig()
+    const release = rig.turns.holdNextAnswer()
+    const sending = rig.send('client-1')
+    await vi.waitFor(() => expect(rig.turns.turnId).toBe('turn-1'))
+    rig.turns.start()
+    release()
+    await expect(sending).resolves.toEqual({ state: 'admitted' })
+
+    rig.turns.end('interrupted')
+
+    expect(rig.settledIds()).toEqual(['client-1'])
+  })
+
+  it('settles a send by the recorded end of a turn that finished before its answer arrived', async () => {
+    const rig = await turnEndRig()
+    const release = rig.turns.holdNextAnswer()
+    const sending = rig.send('client-1')
+    await vi.waitFor(() => expect(rig.turns.turnId).toBe('turn-1'))
+    rig.turns.start()
+    rig.turns.end('interrupted')
+    const rowsAtEnd = rig.bodies.filter((body) => body.kind === 'turn').length
+    release()
+
+    const outcome = await sending
+    expect(outcome.state === 'rejected' && classifyDispatchRejection(outcome).category).toBe(
+      'withdrawn'
+    )
+    expect(rig.settlements).toEqual([])
+    // The answer opens nothing: the turn keeps its terminal row.
+    expect(rig.bodies.filter((body) => body.kind === 'turn')).toHaveLength(rowsAtEnd)
+    expect(rig.bodies.findLast((body) => body.kind === 'turn')).toMatchObject({
+      state: 'interrupted'
+    })
+  })
+
+  it('rejects a send in Codex words by the recorded end of a failed turn that finished before its answer', async () => {
+    const rig = await turnEndRig()
+    const release = rig.turns.holdNextAnswer()
+    const sending = rig.send('client-1')
+    await vi.waitFor(() => expect(rig.turns.turnId).toBe('turn-1'))
+    rig.turns.start()
+    rig.turns.end('failed', 'usage limit reached')
+    release()
+
+    await expect(sending).resolves.toMatchObject({
+      state: 'rejected',
+      rejection: {
+        kind: 'providerRejected',
+        detail: { text: 'usage limit reached', audience: 'person' }
+      }
+    })
+    // Settled once, by the answer: a late echo is no longer owed anything.
+    rig.turns.echo('client-1')
+    expect(rig.settlements).toEqual([])
+  })
+
+  it('leaves a send pending, still armed, when its answer is read after its turn completed', async () => {
+    const rig = await turnEndRig()
+    const release = rig.turns.holdNextAnswer()
+    const sending = rig.send('client-1')
+    await vi.waitFor(() => expect(rig.turns.turnId).toBe('turn-1'))
+    rig.turns.start()
+    rig.turns.end('completed')
+    release()
+
+    await expect(sending).resolves.toEqual({ state: 'admitted' })
+    expect(rig.settlements).toEqual([])
+    rig.turns.echo('client-1')
+    expect(rig.settledIds()).toEqual(['client-1'])
+    expect(rig.settlements[0]).toHaveProperty('providerIdentity')
+  })
+
+  it('leaves a send whose answer timed out to its echo', async () => {
+    const rig = await turnEndRig()
+    rig.codex.routes['turn/start'] = () => {
+      throw new Error('codex app-server turn/start exceeded 30000ms')
+    }
+    await expect(rig.send('client-1')).rejects.toThrow('exceeded')
+
+    rig.codex.connections[0]!.handlers.onNotification?.('turn/started', {
+      threadId: CODEX_TEST_THREAD_ID,
+      turn: { id: 'turn-9' }
+    })
+    rig.codex.connections[0]!.handlers.onNotification?.('item/completed', {
+      threadId: CODEX_TEST_THREAD_ID,
+      turn: { id: 'turn-9' },
+      item: { type: 'userMessage', id: 'item-9', clientId: 'client-1', content: [] }
+    })
+
+    expect(rig.settlements).toEqual([
+      expect.objectContaining({
+        clientMessageId: 'client-1',
+        providerIdentity: expect.objectContaining({ turnId: 'turn-9' })
+      })
+    ])
+  })
+
+  it('ignores a turn end on a child thread', async () => {
+    const rig = await turnEndRig()
+    await rig.sendAndOpen('client-1')
+
+    rig.codex.connections[0]!.handlers.onNotification?.('turn/completed', {
+      threadId: 'thread-child',
+      turn: { id: 'turn-1', status: 'interrupted' }
+    })
+
+    expect(rig.settlements).toEqual([])
+  })
+})
+
+describe('a send bound to a turn', () => {
+  it('dies with the settlement its turn end makes', () => {
+    const echoes = createCodexDispatchEchoes()
+    echoes.arm('client-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+
+    expect(echoes.endTurn('thread-1', 'turn-1', { status: 'interrupted' })).toEqual(['client-1'])
+    expect(echoes.size).toBe(0)
+    expect(echoes.settle('client-1')).toBe(false)
+  })
+
+  it('dies with its child, which forgets recorded turn ends too', () => {
+    const echoes = createCodexDispatchEchoes()
+    echoes.arm('client-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+    echoes.endTurn('thread-2', 'turn-2', { status: 'interrupted' })
+
+    echoes.clear()
+
+    expect(echoes.size).toBe(0)
+    echoes.arm('client-2')
+    expect(echoes.bindTurn('client-2', 'thread-2', 'turn-2')).toBeNull()
+  })
+
+  it('is matched by thread as well as turn id', () => {
+    const echoes = createCodexDispatchEchoes()
+    echoes.arm('client-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+
+    expect(echoes.endTurn('thread-2', 'turn-1', { status: 'interrupted' })).toEqual([])
+    expect(echoes.size).toBe(1)
+  })
+})
diff --git a/src/main/codex/codex-structured-turn-end-settlement.ts b/src/main/codex/codex-structured-turn-end-settlement.ts
new file mode 100644
index 000000000000..5187aabf45aa
--- /dev/null
+++ b/src/main/codex/codex-structured-turn-end-settlement.ts
@@ -0,0 +1,96 @@
+// A send Codex answered into a turn that then ended without echoing it. Codex clears
+// a turn's pending input when it is interrupted, so that send never reached the model
+// and is withdrawn, as a Stop's host-side withdrawal is. Any other end records pending
+// input before `turn/completed`, a failed turn after its `error` frame, so only that
+// frame settles: a failed turn that never echoed the send refused it, in Codex's words,
+// and a completed one leaves it pending for the journal's recovery on exit.
+
+import {
+  agentSessionFailureFact,
+  providerDiagnostic,
+  type ProviderDiagnostic,
+  type SubmissionRejectionFact
+} from '../../shared/agent-session-failure'
+import {
+  agentSessionFailureWords,
+  type AgentJournalDispatchRejection
+} from '../../shared/agent-session-failure-words'
+import type { CodexTurnEnd } from './codex-structured-dispatch-echo'
+import type { CodexSession } from './codex-structured-session-state'
+import {
+  readCodexThreadId,
+  readCodexTurnErrorMessage,
+  readCodexTurnId,
+  readCodexTurnStatus
+} from './codex-structured-thread-facts'
+import { TUI_AGENT_DISPLAY_NAMES } from '../../shared/tui-agent-display-names'
+
+/** A message Codex rejected, in the words that name Codex and its legacy markers. */
+export function codexDispatchRejection(
+  failure: SubmissionRejectionFact
+): AgentJournalDispatchRejection {
+  return agentSessionFailureWords(failure, {
+    surface: 'rejection',
+    agentName: TUI_AGENT_DISPLAY_NAMES.codex,
+    provider: 'codex'
+  })
+}
+
+export type CodexTurnEndSettlement = {
+  clientMessageId: string
+  state: 'rejected'
+} & AgentJournalDispatchRejection
+
+function errorDetail(params: unknown): ProviderDiagnostic | undefined {
+  const message = readCodexTurnErrorMessage(params)
+  return message ? providerDiagnostic(message, 'person') : undefined
+}
+
+/** The end a primary-thread notification reports for its turn, or null for any other frame. */
+export function readCodexTurnEnd(method: string, params: unknown): CodexTurnEnd | null {
+  if (method !== 'turn/completed') {
+    return null
+  }
+  const status = readCodexTurnStatus(params)
+  if (status === 'interrupted') {
+    return { status: 'interrupted' }
+  }
+  if (status === 'failed') {
+    const detail = errorDetail(params)
+    return { status: 'failed', ...(detail ? { detail } : {}) }
+  }
+  return { status: 'completed' }
+}
+
+/** How an ended turn settles a send it never echoed; null leaves the send to its echo. */
+export function codexTurnEndRejection(end: CodexTurnEnd): AgentJournalDispatchRejection | null {
+  if (end.status === 'interrupted') {
+    return agentSessionFailureWords(agentSessionFailureFact('cancelled'), { surface: 'rejection' })
+  }
+  if (end.status === 'failed') {
+    return codexDispatchRejection(
+      agentSessionFailureFact('providerRejected', end.detail ? { detail: end.detail } : {})
+    )
+  }
+  return null
+}
+
+/** Settles the sends bound to the turn this admitted notification ended. */
+export function settleCodexSendsInEndedTurn(
+  session: Pick<CodexSession, 'threadId' | 'dispatchEchoes'>,
+  method: string,
+  params: unknown,
+  settle: (settlement: CodexTurnEndSettlement) => void
+): void {
+  const turnId = readCodexTurnId(params)
+  const end = readCodexTurnEnd(method, params)
+  if (!turnId || !end || (readCodexThreadId(params) ?? session.threadId) !== session.threadId) {
+    return
+  }
+  const rejection = codexTurnEndRejection(end)
+  for (const clientMessageId of session.dispatchEchoes.endTurn(session.threadId, turnId, end)) {
+    if (rejection) {
+      settle({ clientMessageId, state: 'rejected', ...rejection })
+    }
+  }
+}
diff --git a/src/main/codex/codex-structured-turn-open-wait.test.ts b/src/main/codex/codex-structured-turn-open-wait.test.ts
new file mode 100644
index 000000000000..125be2bba0b0
--- /dev/null
+++ b/src/main/codex/codex-structured-turn-open-wait.test.ts
@@ -0,0 +1,147 @@
+// A Codex Stop that names no turn, sent after Codex answered a cold send and before it opened that
+// turn, waits for the turn to open, or provably not to, and never the send itself. The fake keeps
+// Codex 0.157's turn bookkeeping: it answers before it opens the turn, and refuses an interrupt
+// until then.
+
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import {
+  CODEX_TEST_THREAD_ID,
+  codexTurnLifecycleRig,
+  settledWithin
+} from './codex-structured-dispatch-test-support'
+import { CODEX_STOP_TURN_OPEN_WAIT_MS } from './codex-structured-prompt-ownership'
+
+type Rig = Awaited<ReturnType<typeof codexTurnLifecycleRig>>
+
+const ADMITTED = { state: 'admitted' }
+const REFUSED = { cancelled: false }
+
+const stop = (rig: Rig) => rig.adapter.cancelTurn({ sessionId: 'session-1', fence: 7 })
+
+/** A cold send Codex answered into `turn-1` and has not opened. */
+async function answeredColdSend(rig: Rig): Promise<void> {
+  const sending = rig.send('client-1')
+  await vi.waitFor(() => expect(rig.turns.turnId).toBe('turn-1'))
+  // The send is not held for the turn to open: its handover ends at the answer.
+  expect(await settledWithin(sending)).toEqual(ADMITTED)
+}
+
+/** A Stop sent in the window, which Codex would refuse if it reached Codex now. */
+async function waitingStop(rig: Rig) {
+  await answeredColdSend(rig)
+  const stopping = stop(rig)
+  expect(await settledWithin(stopping)).toBe('held')
+  expect(rig.interrupts()).toEqual([])
+  // Wrapped: an async function returning the promise itself would wait for it.
+  return { stopping }
+}
+
+afterEach(() => {
+  vi.useRealTimers()
+})
+
+describe('a Codex send answered before its turn opens', () => {
+  it('is admitted at the answer when no Stop is pending', async () => {
+    const rig = await codexTurnLifecycleRig()
+
+    await answeredColdSend(rig)
+
+    expect(rig.turns.turnId).toBe('turn-1')
+  })
+})
+
+describe("a no-turn Stop in the window between Codex's answer and its turn opening", () => {
+  it('waits for the turn to open, then stops it', async () => {
+    const rig = await codexTurnLifecycleRig()
+    const { stopping } = await waitingStop(rig)
+
+    rig.turns.start()
+
+    expect(await settledWithin(stopping)).toEqual({ cancelled: true })
+    expect(rig.interrupts().map((call) => call.params?.turnId)).toEqual(['turn-1'])
+    expect(rig.turns.turnId).toBeNull()
+  })
+
+  it('does not wait when Codex opened the turn before its answer was read', async () => {
+    const rig = await codexTurnLifecycleRig()
+    const release = rig.turns.holdNextAnswer()
+    const sending = rig.send('client-1')
+    await vi.waitFor(() => expect(rig.turns.turnId).toBe('turn-1'))
+    rig.turns.start()
+    release()
+    await sending
+
+    expect(await settledWithin(stop(rig))).toEqual({ cancelled: true })
+  })
+
+  it('does not wait for a send Codex steered into the running turn', async () => {
+    const rig = await codexTurnLifecycleRig()
+    await answeredColdSend(rig)
+    rig.turns.start()
+    expect(await settledWithin(rig.send('client-2'))).toEqual(ADMITTED)
+
+    expect(await settledWithin(stop(rig))).toEqual({ cancelled: true })
+    expect(rig.interrupts().map((call) => call.params?.turnId)).toEqual(['turn-1'])
+  })
+
+  it('stops nothing when the turn ends without opening', async () => {
+    const rig = await codexTurnLifecycleRig()
+    const { stopping } = await waitingStop(rig)
+
+    rig.turns.end('interrupted')
+
+    expect(await settledWithin(stopping)).toEqual(REFUSED)
+    expect(rig.interrupts()).toEqual([])
+  })
+
+  it.each(['idle', 'systemError'])(
+    'stops nothing when Codex reports the thread %s',
+    async (type) => {
+      const rig = await codexTurnLifecycleRig()
+      const { stopping } = await waitingStop(rig)
+
+      rig.notify('thread/status/changed', { threadId: CODEX_TEST_THREAD_ID, status: { type } })
+
+      expect(await settledWithin(stopping)).toEqual(REFUSED)
+      expect(rig.interrupts()).toEqual([])
+    }
+  )
+
+  it('keeps waiting when a child thread stops running', async () => {
+    const rig = await codexTurnLifecycleRig()
+    const { stopping } = await waitingStop(rig)
+
+    rig.notify('thread/status/changed', { threadId: 'thread-child', status: { type: 'idle' } })
+
+    expect(await settledWithin(stopping)).toBe('held')
+    rig.turns.start()
+    expect(await settledWithin(stopping)).toEqual({ cancelled: true })
+  })
+
+  it('stops nothing when the child exits', async () => {
+    const rig = await codexTurnLifecycleRig()
+    const { stopping } = await waitingStop(rig)
+
+    rig.codex.connections[0]!.handlers.onExit?.(new Error('codex app-server exited'))
+
+    expect(await settledWithin(stopping)).toEqual(REFUSED)
+    expect(rig.interrupts()).toEqual([])
+  })
+
+  it('stops nothing once its bound runs out', async () => {
+    const rig = await codexTurnLifecycleRig()
+    await answeredColdSend(rig)
+    vi.useFakeTimers()
+    let outcome: unknown = 'held'
+    void stop(rig).then((value) => {
+      outcome = value
+    })
+
+    await vi.advanceTimersByTimeAsync(CODEX_STOP_TURN_OPEN_WAIT_MS - 1)
+    expect(outcome).toBe('held')
+    await vi.advanceTimersByTimeAsync(1)
+
+    expect(outcome).toEqual(REFUSED)
+    expect(rig.interrupts()).toEqual([])
+  })
+})
diff --git a/src/main/codex/codex-structured-turn-open-wait.ts b/src/main/codex/codex-structured-turn-open-wait.ts
new file mode 100644
index 000000000000..63e372940058
--- /dev/null
+++ b/src/main/codex/codex-structured-turn-open-wait.ts
@@ -0,0 +1,54 @@
+// A Stop's wait for the turn Codex answered a send into to open, or provably not to: it ended,
+// the thread stopped running, or the child is gone. Held in memory only.
+
+import {
+  codexThreadStoppedRunning,
+  readCodexThreadId,
+  readCodexTurnId
+} from './codex-structured-thread-facts'
+
+export type CodexTurnOpenWaits = {
+  /** Resolves once `turnId` opens or can no longer, and after `withinMs` at the latest. */
+  wait: (turnId: string, withinMs: number) => Promise<void>
+  /** Ends the waits a notification on the session's own thread answers. */
+  observe: (threadId: string, method: string, params: unknown) => void
+  /** Ends every wait: the child that would open their turns is gone. */
+  releaseAll: () => void
+}
+
+export function createCodexTurnOpenWaits(): CodexTurnOpenWaits {
+  const waits = new Map<() => void, string>()
+  const release = (turnId?: string): void => {
+    for (const [endWait, waitedTurnId] of waits) {
+      if (turnId === undefined || waitedTurnId === turnId) {
+        endWait()
+      }
+    }
+  }
+  return {
+    wait: (turnId, withinMs) =>
+      new Promise<void>((resolve) => {
+        const endWait = (): void => {
+          clearTimeout(bound)
+          waits.delete(endWait)
+          resolve()
+        }
+        const bound = setTimeout(endWait, withinMs)
+        waits.set(endWait, turnId)
+      }),
+    observe: (threadId, method, params) => {
+      if ((readCodexThreadId(params) ?? threadId) !== threadId) {
+        return
+      }
+      if (method === 'thread/status/changed' && codexThreadStoppedRunning(params)) {
+        release()
+        return
+      }
+      const turnId = readCodexTurnId(params)
+      if (turnId && (method === 'turn/started' || method === 'turn/completed')) {
+        release(turnId)
+      }
+    },
+    releaseAll: () => release()
+  }
+}
diff --git a/src/main/codex/codex-structured-turn-start.ts b/src/main/codex/codex-structured-turn-start.ts
index 2d22ce42f3ef..825a6c3c3752 100644
--- a/src/main/codex/codex-structured-turn-start.ts
+++ b/src/main/codex/codex-structured-turn-start.ts
@@ -1,3 +1,4 @@
+import { agentSessionFailureFact, providerDiagnosticOf } from '../../shared/agent-session-failure'
 import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
 import type { NativeChatBlock } from '../../shared/native-chat-types'
 import type { AgentSessionDispatchOutcome } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
@@ -7,7 +8,11 @@ import {
 } from './codex-app-server-connection'
 import { isCodexAppServerUnsupportedError } from './codex-app-server-session'
 import type { CodexDispatchEchoes } from './codex-structured-dispatch-echo'
-import { DISPATCH_REJECTED_CODEX_QUEUE_FULL } from '../../shared/structured-agent-session-dispatch-rejection'
+import { readCodexTurnId } from './codex-structured-thread-facts'
+import {
+  codexDispatchRejection,
+  codexTurnEndRejection
+} from './codex-structured-turn-end-settlement'
 import { decodeStructuredAgentSessionOptionValue } from '../../shared/structured-agent-session-option-codec'
 
 // Writing a Codex turn and learning which message landed where, which are not
@@ -15,7 +20,8 @@ import { decodeStructuredAgentSessionOptionValue } from '../../shared/structured
 // message issued while a turn is running is COALESCED into that turn: the same
 // turn id comes back, no second `turn/started` fires, and the user message is
 // echoed only when the running turn reaches it. So the response proves
-// admission and nothing about identity, which the echo settles later.
+// admission and nothing about identity, which the echo settles later. The turn
+// it names is kept with the send, so that turn's end can settle it.
 
 /** Keys Codex accepts as per-turn overrides. An unlisted key would otherwise
  *  become an arbitrary client-controlled `turn/start` parameter. Permission posture is owned by
@@ -86,7 +92,8 @@ function codexTurnOptions(host: CodexTurnHost): Record<string, string> {
 
 /**
  * Hands one submission to Codex. False means the bounded correlation window
- * refused it before the write; otherwise resolves when Codex has taken it.
+ * refused it before the write; otherwise resolves with the turn Codex answered
+ * it into, or null when the answer named none.
  */
 export async function startCodexTurn(
   host: CodexTurnHost,
@@ -96,13 +103,13 @@ export async function startCodexTurn(
     requestedAt?: number
     timeoutMs?: number
   }
-): Promise<boolean> {
+): Promise<{ turnId: string | null } | false> {
   // Armed before the write: the echo and `turn/started` can both land while the
   // response is in flight, and the start must snapshot this send in its frontier.
   if (!host.dispatchEchoes.arm(input.clientMessageId, input.requestedAt)) {
     return false
   }
-  await host.connection.request(
+  const answer = await host.connection.request(
     'turn/start',
     {
       threadId: host.threadId,
@@ -112,7 +119,7 @@ export async function startCodexTurn(
     },
     { timeoutMs: input.timeoutMs }
   )
-  return true
+  return { turnId: readCodexTurnId(answer) }
 }
 
 /**
@@ -126,19 +133,32 @@ export async function dispatchCodexTurn(
   input: { clientMessageId: string; body: AgentJournalMessageItem; requestedAt?: number },
   timeoutMs: number | undefined
 ): Promise<AgentSessionDispatchOutcome> {
+  let answer: { turnId: string | null } | false
   try {
-    if (!(await startCodexTurn(session, { ...input, timeoutMs }))) {
-      return { state: 'rejected', reason: DISPATCH_REJECTED_CODEX_QUEUE_FULL }
-    }
+    answer = await startCodexTurn(session, { ...input, timeoutMs })
   } catch (error) {
     if (isCodexAppServerRequestError(error) || isCodexAppServerUnsupportedError(error)) {
       // Codex answered and declined, so no echo for this write can arrive.
       session.dispatchEchoes.disarm(input.clientMessageId)
-      return { state: 'rejected', reason: (error as Error).message }
+      // Codex's own words, when it gave any, are the one part of the error a person can use.
+      return {
+        state: 'rejected',
+        ...codexDispatchRejection(
+          agentSessionFailureFact('providerRejected', { detail: providerDiagnosticOf(error) })
+        )
+      }
     }
     // A timeout or transport failure can happen after the frame was written.
     // Keep the correlation armed so a later echo can prove delivery.
     throw error
   }
-  return { state: 'admitted' }
+  if (!answer) {
+    return { state: 'rejected', ...codexDispatchRejection(agentSessionFailureFact('queueFull')) }
+  }
+  // An answer read after the turn it names already ended is settled by that end.
+  const endedFirst = answer.turnId
+    ? session.dispatchEchoes.bindTurn(input.clientMessageId, session.threadId, answer.turnId)
+    : null
+  const rejection = endedFirst ? codexTurnEndRejection(endedFirst) : null
+  return rejection ? { state: 'rejected', ...rejection } : { state: 'admitted' }
 }
diff --git a/src/main/codex/codex-subagent-executions.ts b/src/main/codex/codex-subagent-executions.ts
index 0f74babe7341..87d9327c70c0 100644
--- a/src/main/codex/codex-subagent-executions.ts
+++ b/src/main/codex/codex-subagent-executions.ts
@@ -94,6 +94,15 @@ export class CodexSubagentExecutions {
     return { child, execution }
   }
 
+  /** The child's thread closed with no `turn/completed`: the turn it was running ended, and how
+   *  it went is unknown. A child running none has nothing to end. */
+  closeThread(agentThreadId: string): void {
+    const current = this.children.get(agentThreadId)?.execution
+    if (current?.state === 'working') {
+      this.observeTurn(agentThreadId, current.turnId, 'unverifiable')
+    }
+  }
+
   /** Survives the child's turn, so a row outliving that turn can still name it. */
   label(agentThreadId: string): string | null {
     return this.children.get(agentThreadId)?.label ?? null
@@ -109,6 +118,11 @@ export class CodexSubagentExecutions {
     return this.children.get(agentThreadId)?.turnOrdinals.get(turnId) ?? null
   }
 
+  /** The child as last observed, without creating one. */
+  find(agentThreadId: string): Readonly<CodexExecutionChild> | undefined {
+    return this.children.get(agentThreadId)
+  }
+
   workingChildren(): CodexExecutionChild[] {
     return [...this.children.values()].filter(
       (child) => child.registered && child.execution?.state === 'working'
diff --git a/src/main/codex/codex-trust-grant-main-thread-boundary.test.ts b/src/main/codex/codex-trust-grant-main-thread-boundary.test.ts
deleted file mode 100644
index 4b88d95991c4..000000000000
--- a/src/main/codex/codex-trust-grant-main-thread-boundary.test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { existsSync, readFileSync, readdirSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-/**
- * Ratchet for stablyai/orca#16441.
- *
- * Codex hook trust used to be granted by blocking the Electron main thread on
- * `spawnSync` of a bundled ELECTRON_RUN_AS_NODE entry, for the whole
- * app-server deadline: 15s native, 35s WSL, ~45s on the three-session real-home
- * path. The window showed "Not Responding" during cold start and pane launch.
- *
- * The subprocess only ever existed to donate an event loop to a deliberately
- * blocked parent, so this guards the shape of the fix rather than one call
- * site: nothing on the trust-grant lane may start a child process
- * synchronously, and the forked entry must stay gone.
- */
-const CODEX_DIR = __dirname
-
-const SYNC_SPAWN_PATTERN = /\b(?:spawnSync|execSync|execFileSync|runProcessSync)\s*[(<]/
-
-/** Drop comments so the prose explaining the old idiom is not an offender. */
-function codeText(contents: string): string {
-  return contents
-    .split('\n')
-    .filter((line) => !/^\s*(?:\/\/|\/\*|\*)/.test(line))
-    .join('\n')
-}
-
-function listCodexSourceFiles(): string[] {
-  return readdirSync(CODEX_DIR).filter((name) => name.endsWith('.ts') && !name.endsWith('.test.ts'))
-}
-
-describe('codex trust grant main-thread boundary', () => {
-  it('starts no child process synchronously anywhere in the codex module', () => {
-    const offenders = listCodexSourceFiles().filter((name) =>
-      SYNC_SPAWN_PATTERN.test(codeText(readFileSync(join(CODEX_DIR, name), 'utf8')))
-    )
-    expect(offenders).toEqual([])
-  })
-
-  it('keeps the forked grant entry and its blocking bridge deleted', () => {
-    for (const name of [
-      'codex-app-server-grant-bridge.ts',
-      'codex-app-server-grant-entry.ts',
-      'codex-app-server-grant-envelope.ts'
-    ]) {
-      expect(existsSync(join(CODEX_DIR, name))).toBe(false)
-    }
-  })
-
-  it('keeps the trust-grant lane on async entry points', () => {
-    const grant = readFileSync(join(CODEX_DIR, 'codex-hook-trust-grant.ts'), 'utf8')
-    expect(grant).toContain('export async function grantManagedCodexHookTrust(')
-    const host = readFileSync(join(CODEX_DIR, 'codex-trust-grant-host.ts'), 'utf8')
-    expect(host).toContain('export async function resolveCodexTrustGrantHost(')
-    const realHome = readFileSync(join(CODEX_DIR, 'codex-real-home-hook-install.ts'), 'utf8')
-    expect(realHome).toContain('}): Promise<RealHomeCodexHookLane> {')
-  })
-})
diff --git a/src/main/codex/codex-turn-lifecycle-fake.ts b/src/main/codex/codex-turn-lifecycle-fake.ts
new file mode 100644
index 000000000000..4ed2507640ba
--- /dev/null
+++ b/src/main/codex/codex-turn-lifecycle-fake.ts
@@ -0,0 +1,112 @@
+// Codex 0.157's turn bookkeeping as `turn/start` and `turn/interrupt` see it, for
+// tests. From app-server `turn_processor.rs`: `turn/start` picks the turn before it
+// answers, a send while a turn is open is steered into it under the same id with no
+// second `turn/started`, and `turn_interrupt_inner` refuses with -32600 until the
+// turn has started. The answer can be held, so a test can deliver it after the
+// turn's own frames, as the wire allows.
+
+import { CodexAppServerRequestError } from './codex-app-server-connection'
+
+type Notify = (method: string, params: unknown) => void
+
+export type CodexTurnLifecycleFake = {
+  routes: {
+    'turn/start': () => unknown
+    'turn/interrupt': (params: Record<string, unknown> | undefined) => unknown
+  }
+  /** The next `turn/start` answer waits until the returned release runs. */
+  holdNextAnswer: () => () => void
+  /** Codex emits `turn/started` for the turn it picked last. */
+  start: () => void
+  /** Codex ends the picked or running turn on its own. */
+  end: (status: 'completed' | 'interrupted' | 'failed', errorMessage?: string) => void
+  /** Codex echoes a user message it recorded in the current turn. */
+  echo: (clientId: string) => void
+  readonly turnId: string | null
+}
+
+function refusal(message: string): CodexAppServerRequestError {
+  return new CodexAppServerRequestError(
+    'turn/interrupt',
+    -32600,
+    `codex app-server turn/interrupt failed: ${message}`,
+    message
+  )
+}
+
+export function codexTurnLifecycleFake(
+  threadId: string,
+  notify: () => Notify
+): CodexTurnLifecycleFake {
+  let minted = 0
+  let echoes = 0
+  let picked: string | null = null
+  let active: string | null = null
+  let lastTurn: string | null = null
+  let held: Promise<void> | null = null
+  const finish = (turnId: string, status: string, errorMessage?: string): void => {
+    picked = null
+    active = null
+    notify()('turn/completed', {
+      threadId,
+      turn: { id: turnId, status, ...(errorMessage ? { error: { message: errorMessage } } : {}) }
+    })
+  }
+  return {
+    routes: {
+      'turn/start': () => {
+        const turnId = active ?? picked ?? `turn-${++minted}`
+        picked ??= active ? null : turnId
+        lastTurn = turnId
+        const answer = { turn: { id: turnId, status: 'inProgress' } }
+        const wait = held
+        held = null
+        return wait ? wait.then(() => answer) : answer
+      },
+      'turn/interrupt': (params) => {
+        const turnId = params?.turnId
+        if (!active) {
+          throw refusal('no active turn to interrupt')
+        }
+        if (active !== turnId) {
+          throw refusal(`expected active turn id ${String(turnId)} but found ${active}`)
+        }
+        // Codex answers the interrupt once the turn has aborted.
+        finish(active, 'interrupted')
+        return {}
+      }
+    },
+    holdNextAnswer: () => {
+      let release!: () => void
+      held = new Promise<void>((resolve) => {
+        release = resolve
+      })
+      return () => release()
+    },
+    start: () => {
+      if (!picked) {
+        throw new Error('no picked turn to start')
+      }
+      active = picked
+      notify()('turn/started', { threadId, turn: { id: active, status: 'inProgress' } })
+    },
+    end: (status, errorMessage) => {
+      const turnId = active ?? picked
+      if (!turnId) {
+        throw new Error('no turn to end')
+      }
+      finish(turnId, status, errorMessage)
+    },
+    echo: (clientId) => {
+      const turnId = active ?? picked ?? lastTurn
+      notify()('item/completed', {
+        threadId,
+        turn: { id: turnId },
+        item: { type: 'userMessage', id: `item-user-${++echoes}`, clientId, content: [] }
+      })
+    },
+    get turnId() {
+      return active ?? picked
+    }
+  }
+}
diff --git a/src/main/codex/config-toml-trust-api-parity.test.ts b/src/main/codex/config-toml-trust-stale-writes.test.ts
similarity index 59%
rename from src/main/codex/config-toml-trust-api-parity.test.ts
rename to src/main/codex/config-toml-trust-stale-writes.test.ts
index d20cde89b8e2..6a8fb8398dec 100644
--- a/src/main/codex/config-toml-trust-api-parity.test.ts
+++ b/src/main/codex/config-toml-trust-stale-writes.test.ts
@@ -1,12 +1,6 @@
-import { afterEach, describe, expect, expectTypeOf, it } from 'vitest'
+import { afterEach, describe, expect, it } from 'vitest'
 import { chmodSync, readFileSync, readdirSync, statSync } from 'node:fs'
 import * as trustApi from './config-toml-trust'
-import type {
-  CodexEventLabel,
-  CodexHookTrustState,
-  CodexProjectTrustLevel,
-  CodexTrustEntry
-} from './config-toml-trust'
 import {
   createTrustConfigFixture,
   removeTrustConfigFixture
@@ -20,42 +14,6 @@ afterEach(() => {
   }
 })
 
-describe('config-toml-trust public API', () => {
-  it('retains the exact runtime export surface', () => {
-    expect(Object.keys(trustApi).sort()).toEqual(
-      [
-        'codexHookSourcePathsEqual',
-        'computeTrustKey',
-        'computeTrustedHash',
-        'escapeTomlString',
-        'getCodexExplicitHomeHookSourcePath',
-        'normalizeCodexHookSourcePath',
-        'normalizeCodexProjectPathForLookup',
-        'normalizeCodexProjectPathForRevocationLookup',
-        'normalizeHookTrustKeyForLookup',
-        'parseCodexProjectHeaderPath',
-        'parseTrustKey',
-        'readHookTrustEntries',
-        'readHookTrustEntriesFromContent',
-        'removeHookTrustEntries',
-        'removeHookTrustEntriesFromContent',
-        'upsertHookTrustEntries',
-        'upsertHookTrustEntriesInContent',
-        'upsertProjectTrustLevel',
-        'upsertProjectTrustLevelInContent',
-        'writeConfigAtomically'
-      ].sort()
-    )
-  })
-
-  it('retains the public type contracts', () => {
-    expectTypeOf<'stop' | 'session_start'>().toMatchTypeOf<CodexEventLabel>()
-    expectTypeOf<CodexProjectTrustLevel>().toEqualTypeOf<'trusted' | 'untrusted'>()
-    expectTypeOf<CodexTrustEntry>().toHaveProperty('sourcePath').toEqualTypeOf<string>()
-    expectTypeOf<CodexHookTrustState['enabled']>().toEqualTypeOf<boolean | undefined>()
-  })
-})
-
 describe('config.toml partial and stale writes', () => {
   it('preserves a truncated malformed prefix while appending trust', () => {
     const partial = ['model = "gpt-5"', '[mcp_servers.partial', 'command = "still-user-data'].join(
diff --git a/src/main/codex/hook-service-wsl-runtime.test.ts b/src/main/codex/hook-service-wsl-runtime.test.ts
index ba03d8352316..c052ad2f158a 100644
--- a/src/main/codex/hook-service-wsl-runtime.test.ts
+++ b/src/main/codex/hook-service-wsl-runtime.test.ts
@@ -29,17 +29,6 @@ type HooksConfig = {
   hooks: Record<string, { hooks?: { command?: string }[] }[]>
 }
 
-const managedEvents = [
-  'SessionStart',
-  'UserPromptSubmit',
-  'PreToolUse',
-  'PermissionRequest',
-  'PostToolUse',
-  'SubagentStart',
-  'SubagentStop',
-  'Stop'
-] as const
-
 let tempRoots: string[] = []
 
 afterEach(() => {
@@ -511,7 +500,6 @@ describe('Codex WSL runtime hook install', () => {
     expect((await _internals.installManagedHooksIntoWslRuntime(plan)).state).toBe('installed')
 
     const installed = JSON.parse(readFileSync(plan.configPath, 'utf-8')) as HooksConfig
-    expect(Object.keys(installed.hooks).sort()).toEqual([...managedEvents].sort())
     const managedCommand = installed.hooks.UserPromptSubmit[0]?.hooks?.[0]?.command
     expect(managedCommand).toBe(expectedManagedCommand(plan.commandScriptPath))
     expect(installed.hooks.UserPromptSubmit[1]?.hooks?.[0]?.command).toBe(userCommand)
diff --git a/src/main/crash-reporting/gpu-crash-diagnostics.test.ts b/src/main/crash-reporting/gpu-crash-diagnostics.test.ts
index 1982facd5f36..09c4d3d7658e 100644
--- a/src/main/crash-reporting/gpu-crash-diagnostics.test.ts
+++ b/src/main/crash-reporting/gpu-crash-diagnostics.test.ts
@@ -1,5 +1,3 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { describe, expect, it, vi } from 'vitest'
 import { buildGpuCrashDiagnostics, GpuCrashDiagnosticsRecorder } from './gpu-crash-diagnostics'
 
@@ -223,29 +221,3 @@ describe('GpuCrashDiagnosticsRecorder', () => {
     expect(recordBreadcrumb).toHaveBeenCalledWith({ gpuInfoLevel: 'unavailable' })
   })
 })
-
-describe('GPU crash diagnostics production wiring', () => {
-  it('starts diagnostics without delaying safe-graphics fallback', () => {
-    const source = readFileSync(
-      join(__dirname, '..', 'startup', 'main-process-preflight.ts'),
-      'utf8'
-    )
-    const listenerSource = readFileSync(
-      join(__dirname, '..', 'startup', 'main-process-ready-runtime.ts'),
-      'utf8'
-    )
-    const listenerStart = listenerSource.indexOf("  app.on('child-process-gone'")
-    expect(listenerStart).toBeGreaterThan(0)
-    const listener = listenerSource.slice(
-      listenerStart,
-      listenerSource.indexOf('\n  })', listenerStart)
-    )
-    expect(source).toMatch(
-      /recordBreadcrumb: \(data\) =>\s*recordDurableCrashBreadcrumb\('gpu_crash_hardware', data\)/
-    )
-    expect(listener).toMatch(
-      /const crashedAt = performance\.now\(\)[\s\S]*?void state\.gpuCrashDiagnostics\?\.record\(\)[\s\S]*?void handleGpuChildCrash\(details\.reason, details\.exitCode \?\? null, crashedAt\)/
-    )
-    expect(listener).not.toMatch(/state\.gpuCrashDiagnostics\?\.record\(\)[\s\S]*?\.then\(/)
-  })
-})
diff --git a/src/main/crash-reporting/gpu-crash-fallback-field-sessions.test.ts b/src/main/crash-reporting/gpu-crash-fallback-field-sessions.test.ts
index 43441250708e..4454bc484577 100644
--- a/src/main/crash-reporting/gpu-crash-fallback-field-sessions.test.ts
+++ b/src/main/crash-reporting/gpu-crash-fallback-field-sessions.test.ts
@@ -1,55 +1,9 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import {
   DEFAULT_GPU_CRASH_FALLBACK_THRESHOLD,
   DEFAULT_GPU_CRASH_FALLBACK_WINDOW_MS,
-  GpuCrashFallbackTracker,
-  isGpuFallbackCrashCandidate
+  GpuCrashFallbackTracker
 } from './gpu-crash-fallback-decision'
-import { shouldRecordProcessGoneCrash } from './process-gone-classification'
-
-/**
- * Replays the win32 GPU-child deaths from the 1.4.190 'crashed' renderer cluster
- * through the production decision path, so the reason no host was ever offered
- * Safe Graphics Mode is pinned rather than argued about.
- *
- * Each session below is one crash report's `Recent activity`; a breadcrumb's
- * `suppressedSinceLast=N` means N further identical GPU deaths were coalesced
- * into it, so the session saw N+1 GPU crashes.
- */
-
-type FieldSession = {
-  /** Crash-report id from the field bundle. */
-  report: string
-  /** GPU child crash times, ms since main-process start. */
-  gpuCrashesMsSinceLaunch: number[]
-}
-
-// crashed.txt: every win32 report in the cluster. Times are (breadcrumb ts -
-// mainProcessStartedAt); coalesced repeats are placed inside the same second,
-// which is the only interval the emitted breadcrumb pins them to.
-const CRASHED_CLUSTER_SESSIONS: FieldSession[] = [
-  // 23:36:54.200 - 23:36:49.931, suppressedSinceLast=1 -> 2 crashes
-  { report: 'db1f1ee2', gpuCrashesMsSinceLaunch: [4_269, 4_800] },
-  // 02:58:25.287 - 02:58:20.749, no suppression -> 1 crash
-  { report: '66cc54d8', gpuCrashesMsSinceLaunch: [4_538] },
-  // 21:47:05.776 - 21:46:59.584, suppressedSinceLast=1 -> 2 crashes
-  { report: '1f5564de', gpuCrashesMsSinceLaunch: [6_192, 6_240] },
-  // 00:17:17.840 - 00:17:15.732, no suppression -> 1 crash
-  { report: '96d8c63b', gpuCrashesMsSinceLaunch: [2_108] }
-]
-
-/** Ready-phase `child-process-gone` listener body — the wiring these claims rest on. */
-function readChildProcessGoneListener(): string {
-  const source = readFileSync(
-    join(__dirname, '..', 'startup', 'main-process-ready-runtime.ts'),
-    'utf8'
-  )
-  const start = source.indexOf("  app.on('child-process-gone'")
-  expect(start).toBeGreaterThan(0)
-  return source.slice(start, source.indexOf('\n  })', start))
-}
 
 function newTracker(): GpuCrashFallbackTracker {
   return new GpuCrashFallbackTracker({
@@ -58,73 +12,7 @@ function newTracker(): GpuCrashFallbackTracker {
   })
 }
 
-const FIELD_GPU_EVENT = {
-  source: 'child',
-  processType: 'GPU',
-  serviceName: 'GPU',
-  reason: 'crashed',
-  expectedTeardown: 'none'
-} as const
-
 describe('1.4.190 win32 GPU-child crash cluster', () => {
-  it('does not let process_gone_suppressed gate the fallback candidate check', () => {
-    // The GPU death is suppressed as recoverable churn (no user-facing report)...
-    expect(
-      shouldRecordProcessGoneCrash({
-        ...FIELD_GPU_EVENT,
-        platform: 'win32',
-        exitCode: -2147483645
-      })
-    ).toBe(false)
-    // ...but the fallback path reads the raw child-process-gone event, so the
-    // suppression cannot hide a broken driver from recovery.
-    expect(
-      isGpuFallbackCrashCandidate({
-        platform: 'win32',
-        processType: 'GPU',
-        reason: 'crashed'
-      })
-    ).toBe(true)
-    // Both assertions above still pass if the candidate check is moved behind the
-    // suppressed-report path, so pin that nothing branches ahead of it in index.ts.
-    const listener = readChildProcessGoneListener()
-    const guardStart = listener.indexOf('isGpuFallbackCrashCandidate(')
-    expect(guardStart).toBeGreaterThan(0)
-    expect(listener.slice(0, guardStart).match(/\bif\s*\(/g) ?? []).toHaveLength(1)
-    expect(listener).toMatch(
-      /isGpuFallbackCrashCandidate\([\s\S]*?state\.gpuCrashDiagnostics\?\.record\(\)[\s\S]*?handleGpuChildCrash\(/
-    )
-    // The `if (` count alone still allows `recorded && isGpuFallbackCrashCandidate(...)`, which
-    // re-couples recovery to the suppression decision, so pin the guard to that check alone.
-    const recoveryGuard = listener.slice(
-      listener.lastIndexOf('if (', guardStart),
-      listener.indexOf('handleGpuChildCrash(')
-    )
-    expect(recoveryGuard).not.toMatch(/&&|\|\|/)
-  })
-
-  it('never reaches the burst threshold in any observed cluster session', () => {
-    const outcomes = CRASHED_CLUSTER_SESSIONS.map((session) => {
-      // Each launch constructs a fresh tracker (src/main/index.ts), so evidence
-      // does not survive the relaunch these users performed after every crash.
-      const tracker = newTracker()
-      const engaged = session.gpuCrashesMsSinceLaunch.some(
-        (at) => tracker.recordGpuCrash(at).shouldEngageFallback
-      )
-      return {
-        report: session.report,
-        gpuCrashes: session.gpuCrashesMsSinceLaunch.length,
-        engagedSafeGraphicsPrompt: engaged
-      }
-    })
-    expect(outcomes).toEqual([
-      { report: 'db1f1ee2', gpuCrashes: 2, engagedSafeGraphicsPrompt: false },
-      { report: '66cc54d8', gpuCrashes: 1, engagedSafeGraphicsPrompt: false },
-      { report: '1f5564de', gpuCrashes: 2, engagedSafeGraphicsPrompt: false },
-      { report: '96d8c63b', gpuCrashes: 1, engagedSafeGraphicsPrompt: false }
-    ])
-  })
-
   it('engages on the session that did reach three crashes (field launch 51b9e93c)', () => {
     // oom.txt, win32: GPU crashed/exitCode=34 with suppressedSinceLast=2, then
     // `gpu_fallback_engaged (crashesInWindow=3)` and `gpu_fallback_restart_deferred`.
diff --git a/src/main/crash-reporting/gpu-fallback-recovered-launch.test.ts b/src/main/crash-reporting/gpu-fallback-recovered-launch.test.ts
index 23707754ff8e..dd918ba93977 100644
--- a/src/main/crash-reporting/gpu-fallback-recovered-launch.test.ts
+++ b/src/main/crash-reporting/gpu-fallback-recovered-launch.test.ts
@@ -1,5 +1,3 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { showMessageBoxMock } = vi.hoisted(() => ({
@@ -105,22 +103,3 @@ describe('handleGpuFallbackRecoveredLaunch', () => {
     expect(handlers.restartWithHardware).not.toHaveBeenCalled()
   })
 })
-
-describe('recovered safe-graphics production wiring', () => {
-  it('prompts only after the recovered window is shown and persists both consent states', () => {
-    const windowSource = readFileSync(
-      join(__dirname, '..', 'startup', 'main-window-controller.ts'),
-      'utf8'
-    )
-    const lifecycleSource = readFileSync(
-      join(__dirname, '..', 'startup', 'gpu-lifecycle.ts'),
-      'utf8'
-    )
-    expect(windowSource).toMatch(
-      /window\.once\('show',[\s\S]*?presentGpuFallbackRecoveredLaunchPrompt\(window\)/
-    )
-    expect(lifecycleSource).toMatch(
-      /persistMarker:[\s\S]*?userConfirmed: false[\s\S]*?confirmMarker:[\s\S]*?userConfirmed: true/
-    )
-  })
-})
diff --git a/src/main/daemon/__fixtures__/freebuff-serialize-baseline.json b/src/main/daemon/__fixtures__/freebuff-serialize-baseline.json
new file mode 100644
index 000000000000..1f35b2abaa05
--- /dev/null
+++ b/src/main/daemon/__fixtures__/freebuff-serialize-baseline.json
@@ -0,0 +1,30 @@
+{
+  "freebuff-lifecycle": [
+    "none/false/2/31:22f0e3d90d75ceaf6fd95853c0b772074e441596caadcea8d133b64bad5db0f6",
+    "none/true/2/31:22f0e3d90d75ceaf6fd95853c0b772074e441596caadcea8d133b64bad5db0f6",
+    "shrink/false/1/29:b5d123b659e7cdd5a3d8c6031529a032d60311b1073e46717d2cbed8d46b6ba4",
+    "shrink/false/2/32:c3408d293abaa4e25303a4d1acf1ea2f096a35ff685e548f98aec777355d10a5",
+    "shrink/false/2/34:6c1dd1d115eb1c2af110cfa30ce84649b206ff48c76bcbcdfa31877d1b918140",
+    "shrink/true/1/29:b5d123b659e7cdd5a3d8c6031529a032d60311b1073e46717d2cbed8d46b6ba4",
+    "shrink/true/2/32:c3408d293abaa4e25303a4d1acf1ea2f096a35ff685e548f98aec777355d10a5",
+    "shrink/true/2/34:6c1dd1d115eb1c2af110cfa30ce84649b206ff48c76bcbcdfa31877d1b918140",
+    "shrink-grow/false/2/33:407f38549bb5be0a2545ba448d21940a201f1cca92e8117e42f3b30907d7d486",
+    "shrink-grow/true/2/33:407f38549bb5be0a2545ba448d21940a201f1cca92e8117e42f3b30907d7d486",
+    "jitter/false/2/34:adbbc27204f00658207075d10787b1ae8d929226d70a5321e029635193dc432b",
+    "jitter/true/2/34:adbbc27204f00658207075d10787b1ae8d929226d70a5321e029635193dc432b"
+  ],
+  "freebuff-login": [
+    "shrink-grow/false/1/21:92981723de5526414b99435b93b94ec87341b90acc7fea71b492e3ea6ae0d445",
+    "shrink-grow/false/1/23:92981723de5526414b99435b93b94ec87341b90acc7fea71b492e3ea6ae0d445",
+    "shrink-grow/false/2/33:f8c02c8afab034cc4fdcaa06b97764a32f6432d0c6d5f47b5f675fe6fd4cf67c",
+    "shrink-grow/true/1/21:44734d78cecaf5ae6203125b92dde9b61816b626efd6b643f78ce3f41c8b1b2d",
+    "shrink-grow/true/1/23:44734d78cecaf5ae6203125b92dde9b61816b626efd6b643f78ce3f41c8b1b2d",
+    "shrink-grow/true/2/33:f8c02c8afab034cc4fdcaa06b97764a32f6432d0c6d5f47b5f675fe6fd4cf67c",
+    "jitter/false/1/11:073b9a35e7a854d650d63f00dcc126f89656fab0f39951de83ff50fd564faab9",
+    "jitter/false/1/21:a046fe007dfe1161435083c3ed3448b4e74fa2203d692db99353b8df3c45f9a1",
+    "jitter/true/1/11:073b9a35e7a854d650d63f00dcc126f89656fab0f39951de83ff50fd564faab9",
+    "jitter/true/1/21:719241163ae1c3629c6a6e0739bb66324f620b8e285d176853d06d0ae26a6c00"
+  ],
+  "freebuff-ready": [],
+  "freebuff-trust": []
+}
diff --git a/src/main/daemon/daemon-bash-shell-ready-rcfile.ts b/src/main/daemon/daemon-bash-shell-ready-rcfile.ts
index f7834dba9d71..76f05e9ddf58 100644
--- a/src/main/daemon/daemon-bash-shell-ready-rcfile.ts
+++ b/src/main/daemon/daemon-bash-shell-ready-rcfile.ts
@@ -1,5 +1,5 @@
 import { getPosixOmpShellWrapper } from '../pty/omp-shell-wrapper'
-import { getPosixCodexShellLaunchPreflight } from '../pty/codex-shell-launch-preflight'
+import { getPosixCodexShellLaunchPreflight } from '../../shared/codex-shell-function'
 import { BASH_PROMPT_COMMAND_COMPOSITION_BLOCK } from '../bash-prompt-command-composition'
 import { BASH_FEATURE_CHANNEL_BLOCK, SHELL_STARTUP_IDENTITY_MARKER_BLOCK } from '../shell-templates'
 
diff --git a/src/main/daemon/daemon-entry.ts b/src/main/daemon/daemon-entry.ts
index 9f8d878eddbe..8d409a9dc871 100644
--- a/src/main/daemon/daemon-entry.ts
+++ b/src/main/daemon/daemon-entry.ts
@@ -28,6 +28,7 @@ import { readCurrentDaemonReadyIdentity } from './daemon-ready-identity'
 import { publishDaemonPidFile } from './daemon-spawner'
 import { isNativePtyException } from './daemon-native-pty-exception'
 import { startDaemonScopeDeathWatch } from './daemon-scope-death-watch'
+import { isWindowsProcessTableAvailable } from '../windows/windows-process-table'
 
 export type ParsedDaemonArgs = {
   socketPath: string
@@ -334,6 +335,13 @@ async function main(): Promise<void> {
   daemonLog.log('ready')
 
   warmWindowsConptyOnce()
+  // Whether the addon loads is fixed for this process, and a detached daemon has
+  // no stderr, so the module's own warn cannot report it here. Both answers, so a
+  // bundle can tell "native" from "never asked" (#16905). Loading it now also pays
+  // the dlopen off the first teardown.
+  if (process.platform === 'win32') {
+    daemonLog.log('windows-process-table', { native: isWindowsProcessTableAvailable() })
+  }
 }
 
 // Only auto-run when executed directly (not imported for testing, or for the build guard's
diff --git a/src/main/daemon/daemon-foreground-confirmation-protocol.test.ts b/src/main/daemon/daemon-foreground-confirmation-protocol.test.ts
index 142d1706f9c5..e0c4d5230ea6 100644
--- a/src/main/daemon/daemon-foreground-confirmation-protocol.test.ts
+++ b/src/main/daemon/daemon-foreground-confirmation-protocol.test.ts
@@ -3,7 +3,7 @@ import { PREVIOUS_DAEMON_PROTOCOL_VERSIONS, PROTOCOL_VERSION } from './types'
 
 describe('foreground-confirmation daemon protocol', () => {
   it('rejects daemons from before the fresh-confirmation RPC', () => {
-    expect(PROTOCOL_VERSION).toBe(36)
+    expect(PROTOCOL_VERSION).toBe(37)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(19)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(22)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(23)
@@ -19,5 +19,6 @@ describe('foreground-confirmation daemon protocol', () => {
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(33)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(34)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(35)
+    expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(36)
   })
 })
diff --git a/src/main/daemon/daemon-host-manifest.ts b/src/main/daemon/daemon-host-manifest.ts
new file mode 100644
index 000000000000..83d6d4984da7
--- /dev/null
+++ b/src/main/daemon/daemon-host-manifest.ts
@@ -0,0 +1,162 @@
+import { cpSync, existsSync, mkdirSync } from 'node:fs'
+import { dirname, join, win32 as winPath } from 'node:path'
+
+// What the relocated host is made of: which files are mirrored, where each lands,
+// and which of a package's files are runtime rather than bulk. The lifecycle
+// around it -- when to materialize, what keeps a host valid, pruning -- is in
+// daemon-host-relocation.ts.
+
+/**
+ * The host exe keeps the app exe's own file name, so the relocated image is a byte-for-byte,
+ * name-included copy of a signed binary — nothing for EDR to read as a renamed image (MITRE T1036).
+ * Survival comes from the path (see daemon-host-relocation.ts). The one name-sensitive updater path is the
+ * no-PowerShell `taskkill /IM` fallback, where the daemon is killed and terminals cold-restore —
+ * the documented pre-relocation outcome, not a failure.
+ */
+export const daemonHostExeName = (execPath: string): string => winPath.basename(execPath)
+
+// V8 snapshots + ICU data the Electron bootstrap reads even under ELECTRON_RUN_AS_NODE; siblings of Orca.exe.
+const RUNTIME_DATA_FILES = ['icudtl.dat', 'snapshot_blob.bin', 'v8_context_snapshot.bin']
+
+/**
+ * Everything `require('@vscode/windows-process-tree')` walks, package-relative.
+ *
+ * One list, read three times: the copy plan mirrors the package containing them,
+ * materialization refuses to start without them, and a materialized host is only
+ * valid while it still has them. Keeping those three in one place is what stops
+ * "what we copy" and "what we accept" from drifting apart -- drift there means a
+ * host that is copied, published, refused, and copied again on every launch.
+ */
+export const WINDOWS_PROCESS_TREE_REQUIRED = [
+  'package.json',
+  'lib/index.js',
+  'build/Release/windows_process_tree.node'
+] as const
+
+export type CopyOp = {
+  sourcePath: string
+  /** Destination path relative to the host root, posix-separated. */
+  destRel: string
+  kind: 'file' | 'dir'
+  /** When true, a missing source is skipped rather than failing the copy. */
+  optional?: boolean
+  /** Per-source-path predicate for dir copies: return false to skip a path. */
+  filter?: (sourcePath: string) => boolean
+}
+
+export type DaemonHostSources = {
+  appDir: string
+  execPath: string
+  resourcesPath: string
+  entrySourcePath: string
+  entryRelPath: string
+  /** The addon's package; without it the daemon forks a shell per poll (#16905). */
+  windowsProcessTreeDir: string
+}
+
+/** A required file, a directory on the way to one, or anything in lib/ (index.js requires its siblings). */
+function isRuntimeProcessTreePath(packageRel: string): boolean {
+  return (
+    packageRel === '' ||
+    packageRel.startsWith('lib/') ||
+    WINDOWS_PROCESS_TREE_REQUIRED.some(
+      (required) => required === packageRel || required.startsWith(`${packageRel}/`)
+    )
+  )
+}
+
+// win32 path semantics so Windows paths decompose correctly off-win32 in cross-platform unit tests; production runs on win32 only.
+export function toPosixRelative(fromDir: string, absPath: string): string {
+  return winPath.relative(fromDir, absPath).split(winPath.sep).join('/')
+}
+
+export function destPath(root: string, destRel: string): string {
+  return join(root, ...destRel.split('/'))
+}
+
+// Drop node-pty's .pdb symbols and non-host-arch prebuilds (its bulk); keyed on host arch so a future win32-arm64 build keeps the prebuild it needs.
+const HOST_WIN_PREBUILD_DIR = `win32-${process.arch}`.toLowerCase()
+
+function isRuntimeNodePtyPath(sourcePath: string): boolean {
+  const p = sourcePath.toLowerCase()
+  if (p.endsWith('.pdb')) {
+    return false
+  }
+  // Keep only the host arch's win32 prebuild; drop any other win32-<arch> dir.
+  const prebuild = p.match(/prebuilds[\\/](win32-[^\\/]+)/)
+  return !prebuild || prebuild[1] === HOST_WIN_PREBUILD_DIR
+}
+
+/**
+ * The ordered copy plan. Every destRel mirrors the source's win-unpacked relative path so require()
+ * and node-pty's loader resolve the mirror identically to the packaged app. Pure so tests can assert layout.
+ */
+export function buildDaemonHostManifest(sources: DaemonHostSources): CopyOp[] {
+  const { appDir, execPath, resourcesPath, entrySourcePath, entryRelPath } = sources
+  const ops: CopyOp[] = []
+
+  // Host exe (verbatim name) + V8/ICU blobs at dest root. Top-level DLLs omitted: GPU/media libs a windowless run-as-node host never loads (~48MB saved).
+  ops.push({ sourcePath: execPath, destRel: daemonHostExeName(execPath), kind: 'file' })
+  for (const name of RUNTIME_DATA_FILES) {
+    ops.push({ sourcePath: join(appDir, name), destRel: name, kind: 'file', optional: true })
+  }
+
+  // Daemon bundle: entry + sibling chunks/ + out/package.json (CJS/ESM loader resolution), mirrored verbatim.
+  ops.push({ sourcePath: entrySourcePath, destRel: entryRelPath, kind: 'file' })
+  const chunksDir = join(winPath.dirname(entrySourcePath), 'chunks')
+  ops.push({
+    sourcePath: chunksDir,
+    destRel: toPosixRelative(appDir, chunksDir),
+    kind: 'dir',
+    optional: true
+  })
+  const pkgJson = join(resourcesPath, 'app.asar.unpacked', 'out', 'package.json')
+  ops.push({
+    sourcePath: pkgJson,
+    destRel: toPosixRelative(appDir, pkgJson),
+    kind: 'file',
+    optional: true
+  })
+
+  // @vscode/windows-process-tree, mirrored so the daemon's require() resolves it; without it every snapshot forks a powershell.exe (#16905).
+  // Filtered to the runtime files: the installed package is ~25MB of gyp intermediates (.obj/.pdb) around a ~150KB addon.
+  const { windowsProcessTreeDir } = sources
+  ops.push({
+    sourcePath: windowsProcessTreeDir,
+    destRel: toPosixRelative(appDir, windowsProcessTreeDir),
+    kind: 'dir',
+    filter: (sourcePath) =>
+      isRuntimeProcessTreePath(toPosixRelative(windowsProcessTreeDir, sourcePath))
+  })
+  // node-pty tree, mirrored so require('node-pty') resolves it; filtered to drop unused .pdb/other-arch prebuilds.
+  const nodePtyDir = join(resourcesPath, 'node_modules', 'node-pty')
+  ops.push({
+    sourcePath: nodePtyDir,
+    destRel: toPosixRelative(appDir, nodePtyDir),
+    kind: 'dir',
+    filter: isRuntimeNodePtyPath
+  })
+
+  return ops
+}
+
+export function executeManifest(ops: CopyOp[], stagingRoot: string): void {
+  for (const op of ops) {
+    if (!existsSync(op.sourcePath)) {
+      if (op.optional) {
+        continue
+      }
+      throw new Error(`daemon-host relocation: missing required input ${op.sourcePath}`)
+    }
+    const dest = destPath(stagingRoot, op.destRel)
+    mkdirSync(dirname(dest), { recursive: true })
+    const { filter } = op
+    // Dereference symlinks so the copy holds no link back into the install dir.
+    cpSync(op.sourcePath, dest, {
+      recursive: op.kind === 'dir',
+      dereference: true,
+      force: true,
+      ...(filter ? { filter: (src: string) => filter(src) } : {})
+    })
+  }
+}
diff --git a/src/main/daemon/daemon-host-relocation.test.ts b/src/main/daemon/daemon-host-relocation.test.ts
index e899a67ed43b..7b81bdcfa1e0 100644
--- a/src/main/daemon/daemon-host-relocation.test.ts
+++ b/src/main/daemon/daemon-host-relocation.test.ts
@@ -5,12 +5,14 @@ import {
   mkdtempSync,
   readFileSync,
   readdirSync,
+  realpathSync,
   renameSync,
   rmSync,
   utimesSync,
   writeFileSync
 } from 'node:fs'
 import os from 'node:os'
+import { createRequire } from 'node:module'
 import { basename, dirname, join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
@@ -37,8 +39,8 @@ function installHostApp(): void {
   } as AppEnvironment)
 }
 
+import { buildDaemonHostManifest } from './daemon-host-manifest'
 import {
-  buildDaemonHostManifest,
   collectPinnedDaemonVersions,
   getRelocatedDaemonHost,
   materializeRelocatedDaemonHost,
@@ -88,8 +90,35 @@ function buildInstallFixture(root: string): void {
     mkdirSync(join(prebuildsRoot, arch), { recursive: true })
     writeFileSync(join(prebuildsRoot, arch, 'pty.node'), `${arch}-prebuild`)
   }
+  const processTreeDir = join(root, 'resources', 'node_modules', '@vscode', 'windows-process-tree')
+  mkdirSync(join(processTreeDir, 'build', 'Release'), { recursive: true })
+  mkdirSync(join(processTreeDir, 'lib'), { recursive: true })
+  mkdirSync(join(processTreeDir, 'src'), { recursive: true })
+  writeFileSync(join(processTreeDir, 'package.json'), '{"main":"lib/index.js"}')
+  writeFileSync(join(processTreeDir, 'lib', 'index.js'), 'module.exports = {}')
+  writeFileSync(
+    join(processTreeDir, 'build', 'Release', 'windows_process_tree.node'),
+    'process-tree-native'
+  )
+  writeFileSync(join(processTreeDir, 'build', 'Release', 'windows_process_tree.pdb'), 'symbols')
+  writeFileSync(join(processTreeDir, 'src', 'process.cc'), 'source')
+  writeFileSync(join(processTreeDir, 'lib', 'promises.js'), 'require("./index")')
+  mkdirSync(join(processTreeDir, 'build', 'Release', 'obj'), { recursive: true })
+  writeFileSync(join(processTreeDir, 'build', 'Release', 'obj', 'addon.obj'), 'intermediate')
 }
 
+const PROCESS_TREE_DIR_REL = join('resources', 'node_modules', '@vscode', 'windows-process-tree')
+
+const PROCESS_TREE_ADDON_REL = join(
+  'resources',
+  'node_modules',
+  '@vscode',
+  'windows-process-tree',
+  'build',
+  'Release',
+  'windows_process_tree.node'
+)
+
 // The win32 prebuild dir the running host arch loads vs. the one that is pruned.
 const HOST_PREBUILD = `win32-${process.arch}`
 const OTHER_PREBUILD = HOST_PREBUILD === 'win32-arm64' ? 'win32-x64' : 'win32-arm64'
@@ -139,7 +168,8 @@ describe('buildDaemonHostManifest', () => {
       execPath: 'C:\\app\\Orca.exe',
       resourcesPath: 'C:\\app\\resources',
       entrySourcePath: 'C:\\app\\resources\\app.asar.unpacked\\out\\main\\daemon-entry.js',
-      entryRelPath: 'resources/app.asar.unpacked/out/main/daemon-entry.js'
+      entryRelPath: 'resources/app.asar.unpacked/out/main/daemon-entry.js',
+      windowsProcessTreeDir: 'C:\\app\\resources\\node_modules\\@vscode\\windows-process-tree'
     })
     const byDest = new Map(ops.map((op) => [op.destRel, op]))
     // The host exe keeps the source basename: a verbatim, signature-preserving copy with no
@@ -147,6 +177,9 @@ describe('buildDaemonHostManifest', () => {
     expect(byDest.get('Orca.exe')?.kind).toBe('file')
     const exeOp = ops.find((op) => op.sourcePath === 'C:\\app\\Orca.exe')
     expect(exeOp?.destRel).toBe('Orca.exe')
+    // Without this op the relocated daemon cannot resolve the native process
+    // table and falls back to a powershell.exe scan per snapshot (#16905).
+    expect(byDest.get('resources/node_modules/@vscode/windows-process-tree')?.kind).toBe('dir')
     // V8/ICU data blobs are read by the Electron bootstrap and kept.
     expect(byDest.has('icudtl.dat')).toBe(true)
     // GPU/graphics DLLs are never loaded by the windowless host, so not copied.
@@ -201,6 +234,34 @@ describe('materializeRelocatedDaemonHost', () => {
     const marker = JSON.parse(readFileSync(join(dest, '.materialized.json'), 'utf8'))
     expect(marker.version).toBe('9.9.9')
     expect(marker.entryRelPath).toBe('resources/app.asar.unpacked/out/main/daemon-entry.js')
+    // The whole package is mirrored, so require() finds every hop it walks.
+    const processTreeDest = join(
+      dest,
+      'resources',
+      'node_modules',
+      '@vscode',
+      'windows-process-tree'
+    )
+    expect(existsSync(join(processTreeDest, 'build', 'Release', 'windows_process_tree.node'))).toBe(
+      true
+    )
+    expect(existsSync(join(processTreeDest, 'lib', 'index.js'))).toBe(true)
+    expect(existsSync(join(processTreeDest, 'lib', 'promises.js'))).toBe(true)
+    // Build intermediates are ~25MB of the installed package; the loader never reads them.
+    expect(existsSync(join(processTreeDest, 'build', 'Release', 'windows_process_tree.pdb'))).toBe(
+      false
+    )
+    expect(existsSync(join(processTreeDest, 'build', 'Release', 'obj'))).toBe(false)
+    expect(existsSync(join(processTreeDest, 'src'))).toBe(false)
+    // The loader requires the BARE package, so resolution runs through the copied
+    // package.json's `main`. Asserting the .node subpath instead would still pass
+    // with package.json dropped from the filter, while the daemon's own require
+    // failed and it silently went back to the CIM scan.
+    expect(
+      createRequire(
+        join(dest, 'resources', 'app.asar.unpacked', 'out', 'main', 'chunks', 'a.js')
+      ).resolve('@vscode/windows-process-tree')
+    ).toBe(realpathSync(join(processTreeDest, 'lib', 'index.js')))
   })
 
   it('copies the exe verbatim: same file name and same bytes as the install-dir exe', () => {
@@ -225,6 +286,71 @@ describe('materializeRelocatedDaemonHost', () => {
     expect(getRelocatedDaemonHost()?.execPath).toBe(join(dest, 'Orca Nightly.exe'))
   })
 
+  it.each([
+    ['the binary', PROCESS_TREE_ADDON_REL],
+    ['package.json', join(PROCESS_TREE_DIR_REL, 'package.json')],
+    ['lib/index.js', join(PROCESS_TREE_DIR_REL, 'lib', 'index.js')]
+  ])('refuses a mirror that lost %s', (_label, relativePath) => {
+    // Any one of them missing means require() cannot reach the addon, and a host
+    // that cannot load it runs anyway -- forking a shell per snapshot (#16905).
+    materializeRelocatedDaemonHost()
+    const dest = join(localAppDataDir, 'Orca', 'daemon-host', '9.9.9')
+    expect(getRelocatedDaemonHost()).not.toBeNull()
+
+    rmSync(join(dest, relativePath))
+
+    expect(getRelocatedDaemonHost()).toBeNull()
+  })
+
+  it('rematerializes a host whose copied addon went missing', () => {
+    materializeRelocatedDaemonHost()
+    const dest = join(localAppDataDir, 'Orca', 'daemon-host', '9.9.9')
+    const relocatedAddon = join(dest, PROCESS_TREE_ADDON_REL)
+
+    rmSync(relocatedAddon)
+    // A sentinel proves the host was rebuilt rather than reused.
+    const sentinel = join(dest, 'sentinel.txt')
+    writeFileSync(sentinel, 'remove')
+
+    expect(materializeRelocatedDaemonHost()).not.toBeNull()
+    expect(readFileSync(relocatedAddon, 'utf8')).toBe('process-tree-native')
+    expect(existsSync(sentinel)).toBe(false)
+  })
+
+  it('does not read the install dir to decide an existing host is still good', () => {
+    // Relocation exists to outlive the install dir, so validity cannot depend on
+    // it: an updater mid-copy would otherwise condemn an intact host. A real
+    // upgrade changes the version keying this directory, which already forces a
+    // rebuild, and nothing else in the mirror is source-verified either.
+    materializeRelocatedDaemonHost()
+    const dest = join(localAppDataDir, 'Orca', 'daemon-host', '9.9.9')
+    const sentinel = join(dest, 'sentinel.txt')
+    writeFileSync(sentinel, 'keep')
+
+    rmSync(join(installDir, 'resources', 'node_modules', '@vscode'), {
+      recursive: true,
+      force: true
+    })
+
+    expect(getRelocatedDaemonHost()).not.toBeNull()
+    expect(existsSync(sentinel)).toBe(true)
+  })
+
+  it.each([
+    ['the binary', PROCESS_TREE_ADDON_REL],
+    ['package.json', join(PROCESS_TREE_DIR_REL, 'package.json')],
+    ['lib/index.js', join(PROCESS_TREE_DIR_REL, 'lib', 'index.js')]
+  ])('refuses to copy anything when the install lost %s', (_label, relativePath) => {
+    // Each of these would be accepted by the copy plan and then refused by the
+    // mirror check, which is a ~260MB copy per launch to reach a verdict the
+    // source could have given for free. Sharing one list is what prevents that.
+    rmSync(join(installDir, relativePath))
+
+    expect(materializeRelocatedDaemonHost()).toBeNull()
+    // Not even the host root: the source is checked before any directory is made.
+    expect(existsSync(join(localAppDataDir, 'Orca', 'daemon-host'))).toBe(false)
+  })
+
   it('is idempotent: a valid marker short-circuits without recopying', () => {
     materializeRelocatedDaemonHost()
     const dest = join(localAppDataDir, 'Orca', 'daemon-host', '9.9.9')
@@ -278,6 +404,13 @@ describe('getRelocatedDaemonHost', () => {
       join(dest, 'resources', 'app.asar.unpacked', 'out', 'main', 'daemon-entry.js'),
       'e'
     )
+    // The process-table files too, or this passes because the mirror has no addon
+    // and never exercises the version comparison it is named for.
+    mkdirSync(join(dest, PROCESS_TREE_DIR_REL, 'lib'), { recursive: true })
+    mkdirSync(dirname(join(dest, PROCESS_TREE_ADDON_REL)), { recursive: true })
+    writeFileSync(join(dest, PROCESS_TREE_DIR_REL, 'package.json'), '{}')
+    writeFileSync(join(dest, PROCESS_TREE_DIR_REL, 'lib', 'index.js'), 'm')
+    writeFileSync(join(dest, PROCESS_TREE_ADDON_REL), 'n')
     writeFileSync(
       join(dest, '.materialized.json'),
       JSON.stringify({
diff --git a/src/main/daemon/daemon-host-relocation.ts b/src/main/daemon/daemon-host-relocation.ts
index 13aab9fd8f95..51fed83530af 100644
--- a/src/main/daemon/daemon-host-relocation.ts
+++ b/src/main/daemon/daemon-host-relocation.ts
@@ -1,6 +1,5 @@
 import { randomBytes } from 'node:crypto'
 import {
-  cpSync,
   existsSync,
   mkdirSync,
   readFileSync,
@@ -9,8 +8,17 @@ import {
   rmSync,
   writeFileSync
 } from 'node:fs'
-import { dirname, join, win32 as winPath } from 'node:path'
+import { join, win32 as winPath } from 'node:path'
 import { getAppEnvironment } from '../../shared/app-environment'
+import {
+  buildDaemonHostManifest,
+  daemonHostExeName,
+  destPath,
+  executeManifest,
+  toPosixRelative,
+  WINDOWS_PROCESS_TREE_REQUIRED,
+  type DaemonHostSources
+} from './daemon-host-manifest'
 import type { ProcessLivenessVerdict } from './daemon-incarnation-evidence-types'
 import { parseDaemonPidFile } from './daemon-pid-file-parse'
 import { quarantineCorruptDaemonPidRecord } from './daemon-pid-record-quarantine'
@@ -41,52 +49,12 @@ const MARKER_NAME = '.materialized.json'
 // LOCAL appData (not roaming) so OneDrive/roaming never syncs this ~260MB runtime. Shared with NSIS uninstall (config/nsis/orca-installer-hooks.nsh) — keep in sync.
 const LOCAL_HOST_ROOT_NAME = 'Orca'
 
-/**
- * The host exe keeps the app exe's own file name, so the relocated image is a byte-for-byte,
- * name-included copy of a signed binary — nothing for EDR to read as a renamed image (MITRE T1036).
- * Survival comes from the path (see the module header). The one name-sensitive updater path is the
- * no-PowerShell `taskkill /IM` fallback, where the daemon is killed and terminals cold-restore —
- * the documented pre-relocation outcome, not a failure.
- */
-const daemonHostExeName = (execPath: string): string => winPath.basename(execPath)
-
-// V8 snapshots + ICU data the Electron bootstrap reads even under ELECTRON_RUN_AS_NODE; siblings of Orca.exe.
-const RUNTIME_DATA_FILES = ['icudtl.dat', 'snapshot_blob.bin', 'v8_context_snapshot.bin']
-
-type CopyOp = {
-  sourcePath: string
-  /** Destination path relative to the host root, posix-separated. */
-  destRel: string
-  kind: 'file' | 'dir'
-  /** When true, a missing source is skipped rather than failing the copy. */
-  optional?: boolean
-  /** Per-source-path predicate for dir copies: return false to skip a path. */
-  filter?: (sourcePath: string) => boolean
-}
-
-type DaemonHostSources = {
-  appDir: string
-  execPath: string
-  resourcesPath: string
-  entrySourcePath: string
-  entryRelPath: string
-}
-
 type MaterializeMarker = {
   version: string
   completedAt: string
   entryRelPath: string
 }
 
-// win32 path semantics so Windows paths decompose correctly off-win32 in cross-platform unit tests; production runs on win32 only.
-function toPosixRelative(fromDir: string, absPath: string): string {
-  return winPath.relative(fromDir, absPath).split(winPath.sep).join('/')
-}
-
-function destPath(root: string, destRel: string): string {
-  return join(root, ...destRel.split('/'))
-}
-
 // Mirror getDaemonEntryPath()'s resolution order so the copied entry is the exact file the in-dir fork would run.
 function resolveEntrySourcePath(resourcesPath: string): string {
   const unpackedRoot = join(resourcesPath, 'app.asar.unpacked')
@@ -132,83 +100,8 @@ function collectDaemonHostSources(): DaemonHostSources | null {
     execPath,
     resourcesPath,
     entrySourcePath,
-    entryRelPath: toPosixRelative(appDir, entrySourcePath)
-  }
-}
-
-// Drop node-pty's .pdb symbols and non-host-arch prebuilds (its bulk); keyed on host arch so a future win32-arm64 build keeps the prebuild it needs.
-const HOST_WIN_PREBUILD_DIR = `win32-${process.arch}`.toLowerCase()
-function isRuntimeNodePtyPath(sourcePath: string): boolean {
-  const p = sourcePath.toLowerCase()
-  if (p.endsWith('.pdb')) {
-    return false
-  }
-  // Keep only the host arch's win32 prebuild; drop any other win32-<arch> dir.
-  const prebuild = p.match(/prebuilds[\\/](win32-[^\\/]+)/)
-  return !prebuild || prebuild[1] === HOST_WIN_PREBUILD_DIR
-}
-
-/**
- * The ordered copy plan. Every destRel mirrors the source's win-unpacked relative path so require()
- * and node-pty's loader resolve the mirror identically to the packaged app. Pure so tests can assert layout.
- */
-export function buildDaemonHostManifest(sources: DaemonHostSources): CopyOp[] {
-  const { appDir, execPath, resourcesPath, entrySourcePath, entryRelPath } = sources
-  const ops: CopyOp[] = []
-
-  // Host exe (verbatim name) + V8/ICU blobs at dest root. Top-level DLLs omitted: GPU/media libs a windowless run-as-node host never loads (~48MB saved).
-  ops.push({ sourcePath: execPath, destRel: daemonHostExeName(execPath), kind: 'file' })
-  for (const name of RUNTIME_DATA_FILES) {
-    ops.push({ sourcePath: join(appDir, name), destRel: name, kind: 'file', optional: true })
-  }
-
-  // Daemon bundle: entry + sibling chunks/ + out/package.json (CJS/ESM loader resolution), mirrored verbatim.
-  ops.push({ sourcePath: entrySourcePath, destRel: entryRelPath, kind: 'file' })
-  const chunksDir = join(winPath.dirname(entrySourcePath), 'chunks')
-  ops.push({
-    sourcePath: chunksDir,
-    destRel: toPosixRelative(appDir, chunksDir),
-    kind: 'dir',
-    optional: true
-  })
-  const pkgJson = join(resourcesPath, 'app.asar.unpacked', 'out', 'package.json')
-  ops.push({
-    sourcePath: pkgJson,
-    destRel: toPosixRelative(appDir, pkgJson),
-    kind: 'file',
-    optional: true
-  })
-
-  // node-pty tree, mirrored so require('node-pty') resolves it; filtered to drop unused .pdb/other-arch prebuilds.
-  const nodePtyDir = join(resourcesPath, 'node_modules', 'node-pty')
-  ops.push({
-    sourcePath: nodePtyDir,
-    destRel: toPosixRelative(appDir, nodePtyDir),
-    kind: 'dir',
-    filter: isRuntimeNodePtyPath
-  })
-
-  return ops
-}
-
-function executeManifest(ops: CopyOp[], stagingRoot: string): void {
-  for (const op of ops) {
-    if (!existsSync(op.sourcePath)) {
-      if (op.optional) {
-        continue
-      }
-      throw new Error(`daemon-host relocation: missing required input ${op.sourcePath}`)
-    }
-    const dest = destPath(stagingRoot, op.destRel)
-    mkdirSync(dirname(dest), { recursive: true })
-    const { filter } = op
-    // Dereference symlinks so the copy holds no link back into the install dir.
-    cpSync(op.sourcePath, dest, {
-      recursive: op.kind === 'dir',
-      dereference: true,
-      force: true,
-      ...(filter ? { filter: (src: string) => filter(src) } : {})
-    })
+    entryRelPath: toPosixRelative(appDir, entrySourcePath),
+    windowsProcessTreeDir: join(resourcesPath, 'node_modules', '@vscode', 'windows-process-tree')
   }
 }
 
@@ -230,6 +123,17 @@ function readMarker(dir: string): MaterializeMarker | null {
   return null
 }
 
+function processTreeRelDir(sources: DaemonHostSources): string {
+  return toPosixRelative(sources.appDir, sources.windowsProcessTreeDir)
+}
+
+/** True when any file require() needs is absent from a copy of the package. */
+function missingProcessTreeFiles(packageDir: string): boolean {
+  return WINDOWS_PROCESS_TREE_REQUIRED.some(
+    (relative) => !existsSync(join(packageDir, ...relative.split('/')))
+  )
+}
+
 function hostRootDir(): string {
   // Prefer LOCAL appData (see LOCAL_HOST_ROOT_NAME); fall back to userData only if LOCALAPPDATA is unset.
   const localAppData = process.env.LOCALAPPDATA
@@ -260,6 +164,13 @@ export function getRelocatedDaemonHost(): RelocatedDaemonHost | null {
   if (!existsSync(execPath) || !existsSync(entryPath)) {
     return null
   }
+  // A mirror the daemon cannot load the addon from still runs -- it just forks a
+  // shell per snapshot (#16905) -- so treat it as unmaterialized and rebuild. Hosts
+  // from before this shipped have none of these files. Checked in the mirror, never
+  // in the install dir, which is the thing relocation exists to outlive.
+  if (missingProcessTreeFiles(destPath(dest, processTreeRelDir(sources)))) {
+    return null
+  }
   return { execPath, entryPath }
 }
 
@@ -276,6 +187,12 @@ export function materializeRelocatedDaemonHost(): RelocatedDaemonHost | null {
   if (!sources) {
     return null
   }
+  // Checked against the source before copying: the mirror check below would refuse
+  // the result anyway, and re-copying ~260MB on every launch to reach that verdict
+  // is the loop this shares its list with the copy plan to prevent.
+  if (missingProcessTreeFiles(sources.windowsProcessTreeDir)) {
+    return null
+  }
   const version = getAppEnvironment().getVersion()
   const root = hostRootDir()
   const dest = join(root, version)
diff --git a/src/main/daemon/daemon-protocol-version.test.ts b/src/main/daemon/daemon-protocol-version.test.ts
index dfe84947ff5d..b909c4c8fc88 100644
--- a/src/main/daemon/daemon-protocol-version.test.ts
+++ b/src/main/daemon/daemon-protocol-version.test.ts
@@ -3,6 +3,7 @@ import {
   AGENT_SESSION_CLAIM_DAEMON_PROTOCOL_VERSION,
   AGENT_SESSION_CREATE_OPERATION_DAEMON_PROTOCOL_VERSION,
   ASYNC_CWD_VALIDATION_DAEMON_PROTOCOL_VERSION,
+  CODEX_NO_DAEMON_SHELL_LAUNCH_DAEMON_PROTOCOL_VERSION,
   CODEX_SHELL_LAUNCH_PREFLIGHT_DAEMON_PROTOCOL_VERSION,
   COMPLETION_PROCESS_INSPECTION_PROTOCOL_VERSION,
   CONTENT_ADDRESSED_SHELL_WRAPPER_DAEMON_PROTOCOL_VERSION,
@@ -19,7 +20,8 @@ import {
 
 describe('daemon protocol version', () => {
   it('ships bounded history transfer after the 2031-unsubscribe fact', () => {
-    expect(PROTOCOL_VERSION).toBe(36)
+    expect(PROTOCOL_VERSION).toBe(37)
+    expect(CODEX_NO_DAEMON_SHELL_LAUNCH_DAEMON_PROTOCOL_VERSION).toBe(37)
     expect(CONTENT_ADDRESSED_SHELL_WRAPPER_DAEMON_PROTOCOL_VERSION).toBe(36)
     expect(ASYNC_CWD_VALIDATION_DAEMON_PROTOCOL_VERSION).toBe(35)
     expect(CODEX_SHELL_LAUNCH_PREFLIGHT_DAEMON_PROTOCOL_VERSION).toBe(34)
@@ -33,7 +35,7 @@ describe('daemon protocol version', () => {
     expect(AGENT_SESSION_CLAIM_DAEMON_PROTOCOL_VERSION).toBe(26)
     expect(AGENT_SESSION_CREATE_OPERATION_DAEMON_PROTOCOL_VERSION).toBe(26)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toEqual(
-      Array.from({ length: 35 }, (_, index) => index + 1)
+      Array.from({ length: 36 }, (_, index) => index + 1)
     )
   })
 
diff --git a/src/main/daemon/daemon-protocol-version.ts b/src/main/daemon/daemon-protocol-version.ts
index bae2ae972dc8..9c0ed0128fc9 100644
--- a/src/main/daemon/daemon-protocol-version.ts
+++ b/src/main/daemon/daemon-protocol-version.ts
@@ -1,6 +1,7 @@
 // Why: daemons survive app updates, so wire behavior must be version-gated.
-// v36 launches shells from content-addressed wrapper trees; older owners stay attachable.
-export const PROTOCOL_VERSION = 36
+// v37 runs Codex without the shared background server at the shell launch boundary; older owners stay attachable.
+export const PROTOCOL_VERSION = 37
+export const CODEX_NO_DAEMON_SHELL_LAUNCH_DAEMON_PROTOCOL_VERSION = 37
 export const CONTENT_ADDRESSED_SHELL_WRAPPER_DAEMON_PROTOCOL_VERSION = 36
 export const ASYNC_CWD_VALIDATION_DAEMON_PROTOCOL_VERSION = 35
 export const CODEX_SHELL_LAUNCH_PREFLIGHT_DAEMON_PROTOCOL_VERSION = 34
@@ -30,7 +31,7 @@ export const CLEAN_DISCONNECT_PROTOCOL_VERSION = 24
 export const MODE_2031_UNSUBSCRIBE_FACT_PROTOCOL_VERSION = 29
 export const PREVIOUS_DAEMON_PROTOCOL_VERSIONS = [
   1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
-  28, 29, 30, 31, 32, 33, 34, 35
+  28, 29, 30, 31, 32, 33, 34, 35, 36
 ] as const
 
 export function supportsPtyStartupIngress(protocolVersion: number): boolean {
diff --git a/src/main/daemon/daemon-pty-buffer-snapshots.ts b/src/main/daemon/daemon-pty-buffer-snapshots.ts
index f640483a39f9..0bfb6cd44c91 100644
--- a/src/main/daemon/daemon-pty-buffer-snapshots.ts
+++ b/src/main/daemon/daemon-pty-buffer-snapshots.ts
@@ -184,6 +184,11 @@ export abstract class DaemonPtyBufferSnapshots extends DaemonPtySessionControl {
     this.markSessionDirty(id)
   }
 
+  async resetInputModes(id: string): Promise<void> {
+    await this.client.request('resetInputModes', { sessionId: id })
+    this.markSessionDirty(id)
+  }
+
   acknowledgeDataEvent(_id: string, _charCount: number): void {
     // No flow control for daemon-backed terminals
   }
diff --git a/src/main/daemon/daemon-pty-router.ts b/src/main/daemon/daemon-pty-router.ts
index 2fbfd17a0391..c3330e618263 100644
--- a/src/main/daemon/daemon-pty-router.ts
+++ b/src/main/daemon/daemon-pty-router.ts
@@ -162,6 +162,10 @@ export class DaemonPtyRouter implements IPtyProvider {
     await this.adapterFor(id).clearBuffer(id)
   }
 
+  async resetInputModes(id: string): Promise<void> {
+    await this.adapterFor(id).resetInputModes(id)
+  }
+
   async closeStartupQueryAuthority(id: string): Promise<number> {
     return (await this.adapterFor(id).closeStartupQueryAuthority?.(id)) ?? 0
   }
diff --git a/src/main/daemon/daemon-pty-spawn-result.ts b/src/main/daemon/daemon-pty-spawn-result.ts
index 5e799230fa1f..afc7315abcd3 100644
--- a/src/main/daemon/daemon-pty-spawn-result.ts
+++ b/src/main/daemon/daemon-pty-spawn-result.ts
@@ -289,7 +289,7 @@ export abstract class DaemonPtySpawnResult extends DaemonPtySpawnRequest {
     const snapshotPrefix = reattachSnapshot.scrollbackAnsi + reattachSnapshot.rehydrateSequences
     const snapshotFrame = reattachSnapshot.snapshotAnsi
     const snapshotPayload = snapshotPrefix + snapshotFrame
-    // Why kitty flags ride beside the payload, not inside it: the snapshot reaches renderer xterms where POST_REPLAY_REATTACH_RESET's kitty reset must win (terminal-query-authority.md §kitty).
+    // Why kitty flags ride beside the payload, not inside it: renderers re-assert them in the replay epilogue, after the payload's screen switches (terminal-query-authority.md §kitty).
     // Why known `0` is no longer dropped: the pane tracker must be able to tell
     // "the app negotiated nothing" from "this reattach proved nothing".
     const kittyKeyboardFlags = parseTerminalKittyKeyboardFlags(
diff --git a/src/main/daemon/daemon-request-router.ts b/src/main/daemon/daemon-request-router.ts
index ae007366dd02..9bd0d7963b64 100644
--- a/src/main/daemon/daemon-request-router.ts
+++ b/src/main/daemon/daemon-request-router.ts
@@ -129,6 +129,9 @@ export class DaemonRequestRouter {
       case 'clearScrollback':
         this.options.host.clearScrollback(request.payload.sessionId)
         return {}
+      case 'resetInputModes':
+        this.options.host.resetInputModes(request.payload.sessionId)
+        return {}
       case 'listSessions':
         return { sessions: this.options.host.listSessions() }
       case 'shutdownIfIdle':
diff --git a/src/main/daemon/daemon-server.test.ts b/src/main/daemon/daemon-server.test.ts
index ef89b3ef3b09..3479b4eea450 100644
--- a/src/main/daemon/daemon-server.test.ts
+++ b/src/main/daemon/daemon-server.test.ts
@@ -437,23 +437,6 @@ describe('DaemonServer', () => {
       expect(['healthy', 'unhealthy', 'unknown']).toContain(result.health)
     })
 
-    it('handles write (fire-and-forget)', async () => {
-      await startServer()
-      const c = await connectClient()
-
-      await c.request('createOrAttach', {
-        sessionId: 'test-session',
-        cols: 80,
-        rows: 24
-      })
-
-      // Should not throw
-      c.notify('write', { sessionId: 'test-session', data: 'ls\n' })
-
-      // Give the server time to process
-      await new Promise((r) => setTimeout(r, 50))
-    })
-
     it('handles resize', async () => {
       await startServer()
       const c = await connectClient()
diff --git a/src/main/daemon/daemon-zsh-shell-ready-wrapper-spec.ts b/src/main/daemon/daemon-zsh-shell-ready-wrapper-spec.ts
index 2da68eef53b3..88e8af0b805f 100644
--- a/src/main/daemon/daemon-zsh-shell-ready-wrapper-spec.ts
+++ b/src/main/daemon/daemon-zsh-shell-ready-wrapper-spec.ts
@@ -14,8 +14,7 @@ export function getDaemonZshWrapperSpec(): ZshStartupHookSpec {
       managedWslCli: false,
       agentTeamsPath: true,
       remoteCliBinDir: false,
-      codexHome: true,
-      codexLaunchPreflight: true
+      codexHome: true
     }
   }
 }
diff --git a/src/main/daemon/degraded-daemon-pty-provider.test.ts b/src/main/daemon/degraded-daemon-pty-provider.test.ts
index f2e86abab280..363e9125b26a 100644
--- a/src/main/daemon/degraded-daemon-pty-provider.test.ts
+++ b/src/main/daemon/degraded-daemon-pty-provider.test.ts
@@ -50,6 +50,7 @@ function createProvider(
     getCwd: vi.fn(async () => ''),
     getInitialCwd: vi.fn(async () => ''),
     clearBuffer: vi.fn(async () => {}),
+    resetInputModes: vi.fn(async () => {}),
     acknowledgeDataEvent: vi.fn(),
     hasChildProcesses: vi.fn(async () => false),
     getForegroundProcess: vi.fn(async () => null),
diff --git a/src/main/daemon/degraded-daemon-pty-provider.ts b/src/main/daemon/degraded-daemon-pty-provider.ts
index 2b50424ae830..6db8c80ac879 100644
--- a/src/main/daemon/degraded-daemon-pty-provider.ts
+++ b/src/main/daemon/degraded-daemon-pty-provider.ts
@@ -168,6 +168,7 @@ export class DegradedDaemonPtyProvider implements IPtyProvider {
   }
 
   clearBuffer = (id: string): Promise<void> => this.providerFor(id).clearBuffer(id)
+  resetInputModes = (id: string): Promise<void> => this.providerFor(id).resetInputModes(id)
 
   async closeStartupQueryAuthority(id: string): Promise<number> {
     return (await this.providerFor(id).closeStartupQueryAuthority?.(id)) ?? 0
diff --git a/src/main/daemon/headless-emulator-modes.ts b/src/main/daemon/headless-emulator-modes.ts
index bf65d527a3cd..5ab7e2398ad6 100644
--- a/src/main/daemon/headless-emulator-modes.ts
+++ b/src/main/daemon/headless-emulator-modes.ts
@@ -1,5 +1,5 @@
 import type { Terminal } from '@xterm/headless'
-import type { TerminalMouseModeMirror } from './terminal-mouse-mode-mirror'
+import { readTerminalMouseEncoding } from '../../shared/terminal-mouse-encoding'
 import type { TerminalModes } from './types'
 
 type TerminalWithKittyKeyboard = Terminal & {
@@ -13,18 +13,16 @@ export function readKittyKeyboardFlags(terminal: Terminal): number {
 }
 
 /** Mode state a snapshot must carry so a restored pane behaves like the live one. */
-export function readTerminalModes(
-  terminal: Terminal,
-  mouseModes: TerminalMouseModeMirror
-): TerminalModes {
+export function readTerminalModes(terminal: Terminal): TerminalModes {
   const buffer = terminal.buffer.active
-  const mouseTrackingMode = mouseModes.mouseTrackingMode
+  const mouseTrackingMode = terminal.modes.mouseTrackingMode
+  const mouseEncoding = readTerminalMouseEncoding(terminal)
   return {
     bracketedPaste: terminal.modes.bracketedPasteMode,
     mouseTracking: mouseTrackingMode !== 'none',
     mouseTrackingMode,
-    sgrMouseMode: mouseModes.sgrMouseMode,
-    sgrMousePixelsMode: mouseModes.sgrMousePixelsMode,
+    sgrMouseMode: mouseEncoding === 'sgr',
+    sgrMousePixelsMode: mouseEncoding === 'sgr-pixels',
     applicationCursor: buffer.type === 'normal' ? terminal.modes.applicationCursorKeysMode : false,
     alternateScreen: buffer.type === 'alternate',
     kittyKeyboardFlags: readKittyKeyboardFlags(terminal)
diff --git a/src/main/daemon/headless-emulator.test.ts b/src/main/daemon/headless-emulator.test.ts
index 849f78b83080..326bba56fb56 100644
--- a/src/main/daemon/headless-emulator.test.ts
+++ b/src/main/daemon/headless-emulator.test.ts
@@ -455,7 +455,8 @@ describe('HeadlessEmulator', () => {
 
     it('tracks long split private mouse mode sequences', async () => {
       emulator = new HeadlessEmulator({ cols: 80, rows: 24 })
-      const fillerModes = Array.from({ length: 40 }, (_, i) => String(3000 + i)).join(';')
+      // Within xterm's 32-param cap: modes follow what xterm itself parsed, as every live viewer does.
+      const fillerModes = Array.from({ length: 29 }, (_, i) => String(3000 + i)).join(';')
 
       await emulator.write(`\x1b[?1002;${fillerModes};100`)
       await emulator.write('6h')
diff --git a/src/main/daemon/headless-emulator.ts b/src/main/daemon/headless-emulator.ts
index a74502e251f4..fa1cb054ee3d 100644
--- a/src/main/daemon/headless-emulator.ts
+++ b/src/main/daemon/headless-emulator.ts
@@ -12,7 +12,6 @@ import type { TerminalViewAttributes } from '../../shared/terminal-view-attribut
 import { collectHeadlessOscLinkRanges } from './headless-osc-link-ranges'
 import { readTerminalModes } from './headless-emulator-modes'
 import { buildRehydrateSequences } from './terminal-mode-rehydrate-sequences'
-import { TerminalMouseModeMirror } from './terminal-mouse-mode-mirror'
 import { TerminalOscCwdTitleScanner } from './terminal-osc-cwd-title-scanner'
 import { buildFrameRestoreSnapshotFields } from './terminal-frame-restore-sequences'
 import { splitTerminalSnapshotAnsi } from './terminal-snapshot-ansi-buffers'
@@ -60,7 +59,6 @@ export class HeadlessEmulator {
   protected terminal: Terminal
   protected serializer: SerializeAddon
   private oscText: TerminalOscCwdTitleScanner
-  private mouseModes = new TerminalMouseModeMirror()
   private readonly pathFlavor?: 'posix' | 'win32'
   private readonly remotePosixFileUriAuthority: boolean
   private restoredOscLinks: TerminalOscLinkRange[] = []
@@ -188,8 +186,6 @@ export class HeadlessEmulator {
         if (forwardQueryReplies) {
           this.queryReplyForwardingDepth -= 1
         }
-        // Why: commit the mouse-mode mirror only after xterm has parsed the same bytes (snapshots combine both).
-        this.mouseModes.scan(data)
         this.partialEscapeTail = advancePartialEscapeTail(this.partialEscapeTail, data)
         resolve()
       })
@@ -222,7 +218,6 @@ export class HeadlessEmulator {
         this.queryReplyForwardingDepth -= 1
       }
     }
-    this.mouseModes.scan(data)
     this.partialEscapeTail = advancePartialEscapeTail(this.partialEscapeTail, data)
     return true
   }
@@ -364,6 +359,6 @@ export class HeadlessEmulator {
   }
 
   private getModes(): TerminalModes {
-    return readTerminalModes(this.terminal, this.mouseModes)
+    return readTerminalModes(this.terminal)
   }
 }
diff --git a/src/main/daemon/node-pty-error-hints.test.ts b/src/main/daemon/node-pty-error-hints.test.ts
index f43951f05a66..361d8b73ba1e 100644
--- a/src/main/daemon/node-pty-error-hints.test.ts
+++ b/src/main/daemon/node-pty-error-hints.test.ts
@@ -1,22 +1,12 @@
 import { describe, expect, it } from 'vitest'
+import {
+  LEGACY_PTY_ALLOCATION_HINT,
+  LEGACY_TERMINAL_PROCESS_LIMIT_HINT,
+  PTY_ALLOCATION_HINT,
+  TERMINAL_PROCESS_LIMIT_HINT
+} from '../../shared/terminal-spawn-error-copy'
 import { addNodePtyRecoveryHint, parseNodePtyDiagnostic } from './node-pty-error-hints'
 
-const PTY_ALLOCATION_HINT = [
-  'Your system cannot allocate any more pty devices.',
-  '',
-  'Orca requires a pty device to launch a new terminal. This error is usually due to having too many terminal windows or terminal sessions open, either in Orca or another program.',
-  '',
-  'Free up some pty devices and try again.'
-].join('\n')
-
-const TERMINAL_PROCESS_LIMIT_HINT = [
-  'Your system cannot start another terminal process.',
-  '',
-  'This is usually due to having too many terminal sessions or other processes running.',
-  '',
-  'Close unused terminals or quit unused processes and try again.'
-].join('\n')
-
 describe('node-pty diagnostic error hints', () => {
   it('parses the native step and errno without dropping the original message', () => {
     const message =
@@ -32,46 +22,71 @@ describe('node-pty diagnostic error hints', () => {
     const message =
       "node-pty: open_slave failed: EMFILE (errno 24, Too many open files) - slave='/dev/ttys003'"
 
-    expect(addNodePtyRecoveryHint(message)).toBe(`${PTY_ALLOCATION_HINT} ${message}`)
+    expect(addNodePtyRecoveryHint(message)).toBe(`${PTY_ALLOCATION_HINT}\n${message}`)
   })
 
   it('hints when the system cannot allocate a pty master', () => {
     const message =
       'node-pty: posix_openpt failed: ENFILE (errno 23, Too many open files in system)'
 
-    expect(addNodePtyRecoveryHint(message)).toBe(`${PTY_ALLOCATION_HINT} ${message}`)
+    expect(addNodePtyRecoveryHint(message)).toBe(`${PTY_ALLOCATION_HINT}\n${message}`)
   })
 
   it('hints when macOS cannot configure a pty master device', () => {
     const message = 'node-pty: posix_openpt failed: errno (errno 6, Device not configured)'
 
-    expect(addNodePtyRecoveryHint(message)).toBe(`${PTY_ALLOCATION_HINT} ${message}`)
+    expect(addNodePtyRecoveryHint(message)).toBe(`${PTY_ALLOCATION_HINT}\n${message}`)
   })
 
   it('hints local wrapped spawn errors from pty allocation failures', () => {
     const message =
       'Failed to spawn shell "/bin/zsh": node-pty: open_slave failed: EMFILE (errno 24, Too many open files) - slave=\'/dev/ttys003\' (shell: /bin/zsh, cwd: /tmp, arch: arm64, platform: darwin 25.0.0, orca: 1.4.178). If this persists, please file an issue.'
 
-    expect(addNodePtyRecoveryHint(message)).toBe(`${PTY_ALLOCATION_HINT} ${message}`)
+    expect(addNodePtyRecoveryHint(message)).toBe(`${PTY_ALLOCATION_HINT}\n${message}`)
+  })
+
+  it('keeps the whole recovery action on the first line', () => {
+    const message =
+      'Failed to spawn shell "/bin/zsh": node-pty: posix_openpt failed: errno (errno 6, Device not configured) (shell: /bin/zsh). If this persists, please file an issue.'
+
+    expect(addNodePtyRecoveryHint(message).split('\n')[0]).toBe(PTY_ALLOCATION_HINT)
   })
 
   it('hints unstructured openpty allocation failures', () => {
     const message = 'Failed to spawn shell "/bin/bash": openpty(3) failed.'
 
-    expect(addNodePtyRecoveryHint(message)).toBe(`${PTY_ALLOCATION_HINT} ${message}`)
+    expect(addNodePtyRecoveryHint(message)).toBe(`${PTY_ALLOCATION_HINT}\n${message}`)
   })
 
   it('hints when posix_spawn reports the per-user process limit', () => {
     const message =
       "node-pty: posix_spawn failed: EAGAIN (errno 35, Resource temporarily unavailable) - helper='/tmp/node-pty/spawn-helper'"
 
-    expect(addNodePtyRecoveryHint(message)).toBe(`${TERMINAL_PROCESS_LIMIT_HINT} ${message}`)
+    expect(addNodePtyRecoveryHint(message)).toBe(`${TERMINAL_PROCESS_LIMIT_HINT}\n${message}`)
   })
 
   it('does not duplicate an existing recovery hint', () => {
     const message =
       "node-pty: open_slave failed: EMFILE (errno 24, Too many open files) - slave='/dev/ttys003'"
-    const hinted = `${PTY_ALLOCATION_HINT} ${message}`
+    const hinted = `${PTY_ALLOCATION_HINT}\n${message}`
+
+    expect(addNodePtyRecoveryHint(hinted)).toBe(hinted)
+  })
+
+  it('does not duplicate hints from an older remote host', () => {
+    const ptyError = 'node-pty: open_slave failed: EMFILE (errno 24, Too many open files)'
+    const processError = 'node-pty: posix_spawn failed: EAGAIN (errno 35, Resource unavailable)'
+
+    expect(addNodePtyRecoveryHint(`${LEGACY_PTY_ALLOCATION_HINT} ${ptyError}`)).toBe(
+      `${LEGACY_PTY_ALLOCATION_HINT} ${ptyError}`
+    )
+    expect(addNodePtyRecoveryHint(`${LEGACY_TERMINAL_PROCESS_LIMIT_HINT} ${processError}`)).toBe(
+      `${LEGACY_TERMINAL_PROCESS_LIMIT_HINT} ${processError}`
+    )
+  })
+
+  it('does not duplicate a legacy hint on unstructured openpty failures', () => {
+    const hinted = `${LEGACY_PTY_ALLOCATION_HINT} Failed to spawn shell "/bin/bash": openpty(3) failed.`
 
     expect(addNodePtyRecoveryHint(hinted)).toBe(hinted)
   })
diff --git a/src/main/daemon/node-pty-error-hints.ts b/src/main/daemon/node-pty-error-hints.ts
index 022fb98c5be8..182beb41a795 100644
--- a/src/main/daemon/node-pty-error-hints.ts
+++ b/src/main/daemon/node-pty-error-hints.ts
@@ -1,3 +1,10 @@
+import {
+  LEGACY_PTY_ALLOCATION_HINT,
+  LEGACY_TERMINAL_PROCESS_LIMIT_HINT,
+  PTY_ALLOCATION_HINT,
+  TERMINAL_PROCESS_LIMIT_HINT
+} from '../../shared/terminal-spawn-error-copy'
+
 export type NodePtyDiagnostic = {
   step: string
   errno: number
@@ -25,22 +32,6 @@ const RESOURCE_EXHAUSTION_ERRNOS = new Set([
   35 // EAGAIN on macOS
 ])
 
-const PTY_ALLOCATION_HINT = [
-  'Your system cannot allocate any more pty devices.',
-  '',
-  'Orca requires a pty device to launch a new terminal. This error is usually due to having too many terminal windows or terminal sessions open, either in Orca or another program.',
-  '',
-  'Free up some pty devices and try again.'
-].join('\n')
-
-const TERMINAL_PROCESS_LIMIT_HINT = [
-  'Your system cannot start another terminal process.',
-  '',
-  'This is usually due to having too many terminal sessions or other processes running.',
-  '',
-  'Close unused terminals or quit unused processes and try again.'
-].join('\n')
-
 export function parseNodePtyDiagnostic(message: string): NodePtyDiagnostic | null {
   const match =
     NODE_PTY_DIAGNOSTIC_RE.exec(message) ?? NODE_PTY_DIAGNOSTIC_ANYWHERE_RE.exec(message)
@@ -70,18 +61,30 @@ export function getNodePtyRecoveryHint(diagnostic: NodePtyDiagnostic): string |
   return null
 }
 
+function hasPtyAllocationHint(message: string): boolean {
+  return message.startsWith(PTY_ALLOCATION_HINT) || message.startsWith(LEGACY_PTY_ALLOCATION_HINT)
+}
+
 export function addNodePtyRecoveryHint(message: string): string {
   const diagnostic = parseNodePtyDiagnostic(message)
   if (!diagnostic) {
-    if (GENERIC_PTY_ALLOCATION_RE.test(message) && !message.startsWith(PTY_ALLOCATION_HINT)) {
-      return `${PTY_ALLOCATION_HINT} ${message}`
+    if (GENERIC_PTY_ALLOCATION_RE.test(message) && !hasPtyAllocationHint(message)) {
+      return `${PTY_ALLOCATION_HINT}\n${message}`
     }
     return message
   }
 
   const hint = getNodePtyRecoveryHint(diagnostic)
-  if (hint && message.startsWith(hint)) {
+  if (
+    !hint ||
+    message.startsWith(hint) ||
+    (hint === PTY_ALLOCATION_HINT && hasPtyAllocationHint(message)) ||
+    (hint === TERMINAL_PROCESS_LIMIT_HINT && message.startsWith(LEGACY_TERMINAL_PROCESS_LIMIT_HINT))
+  ) {
     return message
   }
-  return hint ? `${hint} ${message}` : message
+  // Older clients need both stale-daemon markers before their first-line IPC truncation.
+  const separator =
+    hint === PTY_ALLOCATION_HINT || hint === TERMINAL_PROCESS_LIMIT_HINT ? '\n' : ' '
+  return `${hint}${separator}${message}`
 }
diff --git a/src/main/daemon/process-boundary-ground.test.ts b/src/main/daemon/process-boundary-ground.test.ts
index dfdf5262eddc..5cefaa0694b2 100644
--- a/src/main/daemon/process-boundary-ground.test.ts
+++ b/src/main/daemon/process-boundary-ground.test.ts
@@ -142,7 +142,7 @@ describe('process boundary ground at a proven crash', () => {
     barrier.accept({ data, rawStartSeq: 0, rawEndSeq: data.length, transformed: false })
 
     await vi.waitFor(() => expect(released).toHaveLength(3))
-    expect(released[1]).toBe(PROCESS_BOUNDARY_GROUND)
+    expect(released[1]).toBe(`\x1b]133;D;137\x07${PROCESS_BOUNDARY_GROUND}`)
     expect(released[2]).toBe('\x1b[?2004h$ ')
     expect(barrier.getOwner()).toBe('shell')
     const snapshot = live.getSnapshot()
@@ -155,4 +155,19 @@ describe('process boundary ground at a proven crash', () => {
     }
     expect(live.getBufferTailLines(24).slice(0, 2)).toEqual(['$ tui', '$ '])
   })
+
+  it('pauses on an escape boundary so a mid-proof snapshot has no open OSC', () => {
+    const live = emulator(DAEMON_SESSION_SCROLLBACK_ROWS)
+    const barrier = new TerminalShellRecoveryBarrier({
+      confirmShellForeground: () => new Promise(() => {}),
+      release: (emission) => write(live, emission.data),
+      isAlive: () => true
+    })
+
+    const data = `\x1b[?1049h${DEAD_PROCESS_ARMS}TUI\x1b]133;D;137\x07$ `
+    barrier.accept({ data, rawStartSeq: 0, rawEndSeq: data.length, transformed: false })
+
+    expect(live.getSnapshot().pendingEscapeTailAnsi).toBeUndefined()
+    barrier.dispose()
+  })
 })
diff --git a/src/main/daemon/pty-subprocess/pty-shell-foreground-confirmation.ts b/src/main/daemon/pty-subprocess/pty-shell-foreground-confirmation.ts
index b4f6aa502f80..978da1ac67f2 100644
--- a/src/main/daemon/pty-subprocess/pty-shell-foreground-confirmation.ts
+++ b/src/main/daemon/pty-subprocess/pty-shell-foreground-confirmation.ts
@@ -8,7 +8,7 @@ import { readWindowsPtyJobProcessIds } from '../../providers/windows-pty-job-mem
  *  never cached state. */
 export async function confirmPtyShellForeground(args: {
   process: pty.IPty
-  shellPath: string
+  shellPath: string | undefined
   isDead: () => boolean
 }): Promise<boolean> {
   if (args.isDead() || !args.process.pid) {
diff --git a/src/main/daemon/pty-subprocess/shell-launch-plan.ts b/src/main/daemon/pty-subprocess/shell-launch-plan.ts
index b50ef12baac2..0c10f1493a5d 100644
--- a/src/main/daemon/pty-subprocess/shell-launch-plan.ts
+++ b/src/main/daemon/pty-subprocess/shell-launch-plan.ts
@@ -206,7 +206,8 @@ export function createPtyShellLaunchPlan(
         hasStartupCommand: Boolean(opts.command),
         waitsForShellReady,
         emitsStartupIdentity: waitsForShellReady
-      })
+      }),
+      { hasStartupCommand: Boolean(opts.command) }
     )
     Object.assign(env, shellLaunch.env)
     shellArgs =
diff --git a/src/main/daemon/pty-subprocess/spawn-environment.ts b/src/main/daemon/pty-subprocess/spawn-environment.ts
index 32281f386187..a063ffb3dd60 100644
--- a/src/main/daemon/pty-subprocess/spawn-environment.ts
+++ b/src/main/daemon/pty-subprocess/spawn-environment.ts
@@ -1,3 +1,5 @@
+import { getLegacyOpenCodeEnvKeysToDelete } from '../../opencode/legacy-shared-config-dir'
+import { restoreOrStripOverlayEnv } from '../../../shared/agent-overlay-env'
 import { delimiter } from 'node:path'
 import { dropInheritedOrcaFishHistory } from '../../fish-history-session'
 import { removeAppImageRuntimeEnv } from '../../pty/appimage-terminal-env'
@@ -21,6 +23,7 @@ import {
   expandWindowsEnvironmentVariables,
   expandWindowsPathEnvironmentVariables
 } from '../../../shared/windows-environment-expansion'
+import { applyScrubSafeAgentEnvAliases } from '../../../shared/agent-hook-scrub-safe-env'
 import type { TuiAgent } from '../../../shared/tui-agent'
 import type { PtySubprocessOptions } from '../pty-subprocess'
 
@@ -52,11 +55,33 @@ function deleteRequestedDaemonEnvKeys(
   env: Record<string, string>,
   keys: readonly string[] | undefined
 ): void {
+  const userDataPath = process.env.ORCA_USER_DATA_PATH
+  if (userDataPath) {
+    for (const key of getLegacyOpenCodeEnvKeysToDelete(env, userDataPath, {})) {
+      delete env[key]
+    }
+  }
   // Why: persistent daemon state can differ from Electron; delete CODEX_HOME only when its Orca overlay owns it.
   const deleteOrcaOwnedCodexHome =
     keys?.includes('ORCA_CODEX_HOME') === true &&
     env.ORCA_CODEX_HOME !== undefined &&
     env.CODEX_HOME === env.ORCA_CODEX_HOME
+  // A merged caller config can supersede the daemon's recorded overlay source.
+  if (
+    keys?.includes('ORCA_OPENCODE_CONFIG_DIR') &&
+    (env.OPENCODE_CONFIG_DIR === undefined ||
+      env.OPENCODE_CONFIG_DIR === env.ORCA_OPENCODE_CONFIG_DIR)
+  ) {
+    restoreOrStripOverlayEnv(
+      env,
+      {
+        primary: 'OPENCODE_CONFIG_DIR',
+        overlay: 'ORCA_OPENCODE_CONFIG_DIR',
+        source: 'ORCA_OPENCODE_SOURCE_CONFIG_DIR'
+      },
+      {}
+    )
+  }
   for (const key of keys ?? []) {
     delete env[key]
   }
@@ -171,6 +196,9 @@ export function createDaemonPtyEnvironment(opts: PtySubprocessOptions): Record<s
   delete env.ELECTRON_RUN_AS_NODE
   removeAppImageRuntimeEnv(env)
   removeInheritedNoColor(env)
+  // Why last: the aliases mirror pane identity AFTER every strip above has settled, so an
+  // alias can never outlive the value it mirrors.
+  applyScrubSafeAgentEnvAliases(env)
   env.LANG ??= 'en_US.UTF-8'
   return env
 }
diff --git a/src/main/daemon/repro-12101-mouse-tracking-survives-agent-death.test.ts b/src/main/daemon/repro-12101-mouse-tracking-survives-agent-death.test.ts
index f58536f36b81..91658df7d8ad 100644
--- a/src/main/daemon/repro-12101-mouse-tracking-survives-agent-death.test.ts
+++ b/src/main/daemon/repro-12101-mouse-tracking-survives-agent-death.test.ts
@@ -17,8 +17,8 @@ import { iterateTerminalHistorySeedChunks } from './terminal-history-seed-chunks
 // never armed mouse reporting, yet its snapshot re-arms it, so pointer motion
 // echoes literal SGR reports (^[[<35;col;rowM) into the prompt.
 //
-// This drives the REAL Session / HeadlessEmulator / TerminalMouseModeMirror /
-// buildRehydrateSequences / HistoryManager / HistoryReader, with a fake
+// This drives the REAL Session / HeadlessEmulator / buildRehydrateSequences /
+// HistoryManager / HistoryReader, with a fake
 // subprocess standing in for node-pty (a real PTY can't be SIGKILLed
 // deterministically mid-DECSET in vitest). The kill goes through Session.kill()'s
 // real teardown; only killWithDescendantSweep is stubbed so the test never
diff --git a/src/main/daemon/serialize-grid-transcript-replay.test.ts b/src/main/daemon/serialize-grid-transcript-replay.test.ts
index fc196d039247..1d10c62e492d 100644
--- a/src/main/daemon/serialize-grid-transcript-replay.test.ts
+++ b/src/main/daemon/serialize-grid-transcript-replay.test.ts
@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto'
 import { existsSync, readdirSync, readFileSync } from 'node:fs'
 import { basename, join } from 'node:path'
 import { describe, expect, it } from 'vitest'
@@ -27,11 +28,53 @@ const OLD_ADDON_PATH = process.env.ORCA_OLD_SERIALIZE_ADDON
 const SEEDS = Math.max(1, Number(process.env.SERIALIZE_TRANSCRIPT_SEEDS) || 2)
 
 // Checkpoints (default seeds) whose new replay diverges exactly as the previous
-// build's did — pre-existing upstream limitations, not regressions (verified
-// with ORCA_OLD_SERIALIZE_ADDON). Shrink when one is fixed.
-const KNOWN_PREEXISTING_I2_FAILURES: Record<string, number> = { less: 6, nano: 2, opencode: 5 }
+// build's did — pre-existing serializer limitations, not regressions (verified
+// with ORCA_OLD_SERIALIZE_ADDON): the live SGR pen leaks into the alt buffer, and
+// an alt buffer first entered after a shrink keeps hidden scrollback. Shrink when one is fixed.
+const KNOWN_PREEXISTING_I2_FAILURES: Record<string, number> = {
+  less: 6,
+  nano: 2,
+  opencode: 5,
+  // Shrink leaves the cursor one column short; also present in the pre-Qoder serializer.
+  'qoder-no-account': 2,
+  'qoder-ready': 2,
+  // Codex 0.157 header border restores with an extra attribute bit (STA-8628 fixtures).
+  'codex-0157-config-override-embedded-warning': 22,
+  'codex-0157-effort-override-embedded-warning': 4,
+  'codex-0157-no-daemon-effort-override': 16,
+  'codex-0157-plain-ready': 18,
+  // Fresh-home 0.157/0.158 captures: the live pen's true-colour fg/bg leaks onto restored cells.
+  'codex-0157-fresh-home-daemon-install': 48,
+  'codex-0158-fresh-home-greeting': 9,
+  'codex-0158-model-announcement-dialog': 8,
+  // Codex 0.157/0.158 startup-dialog captures: the same live-pen true-colour leak onto restored cells.
+  'codex-0157-update-available-dialog': 26,
+  'codex-0158-update-available-dialog': 8,
+  'codex-0157-hooks-review-dialog': 24,
+  'codex-0158-hooks-review-dialog': 8,
+  'codex-0157-model-retired-dialog': 22,
+  'codex-0158-model-retired-dialog': 6,
+  // Same extra dim bit on the 0.157/0.158 header row (STA-8834 fixtures).
+  'codex-0-157-1-update-dialog': 16,
+  'codex-0-157-1-timed-sleep-turn': 6,
+  'codex-0-158-0-approval': 12,
+  'codex-0-158-0-timed-turn': 20,
+  'codex-0-158-0-trustprompt': 36,
+  'claude-dialog-trust-workspace-answered': 13,
+  // DSH-TUI's whale intro paints whole rows of 24-bit background, and every one of this
+  // transcript's divergences is the same shape: `visible-grid row=0`, a true-colour
+  // background that the round trip does not restore to default. Verified as upstream, not a
+  // regression, by replaying it against the previous build
+  // (`build-serialize-addon-at-ref.mjs --ref origin/main`): I1 and I3 both hold.
+  'dsh-tui-ready-no-key': 10
+}
 KNOWN_PREEXISTING_I2_FAILURES['claude-code-ready-cold-start'] = 8
 
+// Exact resize checkpoints and full GridDiff hashes from base 6835b9b4e3ea, not this branch.
+const FREEBUFF_BASELINE: Record<string, readonly string[]> = JSON.parse(
+  readFileSync(join(__dirname, '__fixtures__/freebuff-serialize-baseline.json'), 'utf8')
+)
+
 type Transcript = { name: string; data: string; cols: number; rows: number }
 type Schedule = 'none' | 'shrink' | 'shrink-grow' | 'jitter'
 const SCHEDULES: readonly Schedule[] = ['none', 'shrink', 'shrink-grow', 'jitter']
@@ -123,6 +166,7 @@ describe('serialize round trip over captured PTY transcripts', () => {
     async (_name, transcript) => {
       const counts: Partial<Record<Verdict | 'checks', number>> = {}
       const blocking: string[] = []
+      const failureSignatures: string[] = []
       for (const schedule of SCHEDULES) {
         for (const conpty of [false, true]) {
           for (let seed = 1; seed <= SEEDS; seed++) {
@@ -137,6 +181,14 @@ describe('serialize round trip over captured PTY transcripts', () => {
                   `  ${transcript.name} ${schedule} conpty=${conpty} seed=${seed}: ${d.stage} row=${d.row} ${JSON.stringify(d.expected)?.slice(0, 160)} -> ${JSON.stringify(d.actual)?.slice(0, 160)}`
                 )
               }
+              if (check.gridDiff.new) {
+                const signature = createHash('sha256')
+                  .update(JSON.stringify(check.gridDiff.new))
+                  .digest('hex')
+                failureSignatures.push(
+                  `${schedule}/${conpty}/${seed}/${check.stepIndex}:${signature}`
+                )
+              }
               for (const verdict of verdicts(check, serializers.length > 1)) {
                 counts[verdict] = (counts[verdict] ?? 0) + 1
                 if (verdict === 'i1-bytes-differ' || verdict === 'regression') {
@@ -153,7 +205,9 @@ describe('serialize round trip over captured PTY transcripts', () => {
         console.log(`${transcript.name} ${JSON.stringify(counts)}`)
       }
       expect(blocking).toEqual([])
-      if (!OLD_ADDON_PATH && SEEDS === 2) {
+      if (SEEDS === 2 && transcript.name.startsWith('freebuff-')) {
+        expect(failureSignatures).toEqual(FREEBUFF_BASELINE[transcript.name] ?? [])
+      } else if (!OLD_ADDON_PATH && SEEDS === 2) {
         expect(counts['new-fail'] ?? 0).toBe(KNOWN_PREEXISTING_I2_FAILURES[transcript.name] ?? 0)
       }
     },
diff --git a/src/main/daemon/session-output-plane.ts b/src/main/daemon/session-output-plane.ts
index 507ca01a927e..04b3f773bda3 100644
--- a/src/main/daemon/session-output-plane.ts
+++ b/src/main/daemon/session-output-plane.ts
@@ -125,6 +125,16 @@ export class SessionOutputPlane {
     })
   }
 
+  /** Grounds the emulator and the cold-restore records without a client
+   *  broadcast; attached renderers ground themselves (Reset Terminal). */
+  applyInputModeGround(ground: string): void {
+    if (this.disposed) {
+      return
+    }
+    this.emulator.write(ground)
+    this.record({ kind: 'output', data: ground })
+  }
+
   isCursorOnEmptyPromptLine(): boolean {
     return this.emulator.isCursorOnEmptyPromptLine()
   }
diff --git a/src/main/daemon/session-reset-input-modes.test.ts b/src/main/daemon/session-reset-input-modes.test.ts
new file mode 100644
index 000000000000..ea1aa7e7351e
--- /dev/null
+++ b/src/main/daemon/session-reset-input-modes.test.ts
@@ -0,0 +1,89 @@
+import { describe, expect, it, vi } from 'vitest'
+import { Session } from './session'
+import type { SubprocessHandle } from './session-subprocess-handle'
+
+function createSession() {
+  let onData: ((data: string) => void) | null = null
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Session reads only these members.
+  const handle = {
+    pid: 999,
+    getForegroundProcess: () => null,
+    confirmShellForeground: vi.fn(async () => false),
+    write: () => {},
+    resize: () => {},
+    pause: () => {},
+    resume: () => {},
+    kill: () => {},
+    forceKill: () => {},
+    signal: () => {},
+    terminateOwnedTree: () => 'unavailable' as const,
+    onData(cb: (data: string) => void) {
+      onData = cb
+    },
+    onExit() {},
+    dispose: () => {}
+  } as unknown as SubprocessHandle
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the omitted options are optional.
+  const session = new Session({
+    sessionId: 'reset',
+    cols: 80,
+    rows: 24,
+    subprocess: handle,
+    shellReadySupported: false
+  } as never)
+  const received: string[] = []
+  session.attachClient({ onData: (data: string) => received.push(data), onExit: () => {} })
+  return { session, received, emit: (data: string) => onData?.(data) }
+}
+
+async function readModes(session: Session) {
+  await session.settleShellOwnershipConfirmation()
+  return session.getSnapshot()!.modes
+}
+
+describe('Session.resetInputModes', () => {
+  it('grounds modes an app left armed without a command end, and the next snapshot carries it', async () => {
+    const { session, received, emit } = createSession()
+    // A crashed app's arming with no OSC 133;D the barrier could ground at.
+    emit('prompt$ app\r\n\x1b[>31u\x1b[?1000h\x1b[?1006h\x1b[?2004h\x1b[?1h')
+    const armed = await readModes(session)
+    expect(armed).toMatchObject({
+      kittyKeyboardFlags: 31,
+      mouseTracking: true,
+      bracketedPaste: true
+    })
+    session.takePendingOutput(false)
+    const broadcast = received.length
+
+    session.resetInputModes()
+
+    expect(await readModes(session)).toMatchObject({
+      kittyKeyboardFlags: 0,
+      mouseTracking: false,
+      sgrMouseMode: false,
+      bracketedPaste: false,
+      applicationCursor: false,
+      alternateScreen: false
+    })
+    // Clients ground themselves; a zero-raw span here would be dropped or duplicated.
+    expect(received).toHaveLength(broadcast)
+    const records = session.takePendingOutput(false)!.records
+    expect(records).toEqual([{ kind: 'output', data: expect.stringContaining('\x1b[<99u') }])
+    session.dispose()
+  })
+
+  it('keeps focus reporting the terminal host armed for the pane', async () => {
+    const { session, emit } = createSession()
+    // ConPTY arms ?1004h before any shell marker.
+    emit('\x1b[?1004hprompt$ ')
+    await readModes(session)
+    session.takePendingOutput(false)
+
+    session.resetInputModes()
+
+    const [record] = session.takePendingOutput(false)!.records
+    expect(record).toMatchObject({ kind: 'output' })
+    expect(record?.kind === 'output' && record.data).not.toContain('\x1b[?1004l')
+    session.dispose()
+  })
+})
diff --git a/src/main/daemon/session.ts b/src/main/daemon/session.ts
index e69bec7c5b1c..7d1136652924 100644
--- a/src/main/daemon/session.ts
+++ b/src/main/daemon/session.ts
@@ -146,13 +146,9 @@ export class Session {
 
     // Daemon POSIX PTYs need the local provider's cooked-echo containment (#13137).
     // DA1/CPR stay immediate unless an echo-risk reply is already held (#13892, #15559).
-    if (this.startupIngress.answerLiveQueryReply(data)) {
-      return
-    }
-
-    // Why: keep queuing during the post-ready flush-gate window ('ready' but not yet flushed); a
-    // direct write would race fresh input ahead of the buffered startup command.
-    if (this.shellReady.tryEnqueue(data)) {
+    // Why the queue: keep queuing during the post-ready flush-gate window ('ready' but not yet
+    // flushed); a direct write would race fresh input ahead of the buffered startup command.
+    if (this.startupIngress.answerLiveQueryReply(data) || this.shellReady.tryEnqueue(data)) {
       return
     }
 
@@ -277,6 +273,10 @@ export class Session {
     this.output.clearScrollback(this.subprocess, this.shellReady.isGatingWrites)
   }
 
+  resetInputModes(): void {
+    this.output.applyInputModeGround(this.recoveryBarrier.groundInputModes())
+  }
+
   prepareForFinalSnapshot(): string {
     const held = this.shellReady.releaseHeldBytes()
     this.startupIngress.snapshotBarrier()
diff --git a/src/main/daemon/shell-ready.ts b/src/main/daemon/shell-ready.ts
index 5208f9ced6bd..a1065ba753ca 100644
--- a/src/main/daemon/shell-ready.ts
+++ b/src/main/daemon/shell-ready.ts
@@ -6,7 +6,7 @@ import {
   getPowerShellOsc133Bootstrap,
   isPowerShellExecutableName
 } from '../powershell-osc133-bootstrap'
-import { getFishCodexShellLaunchPreflight } from '../pty/codex-shell-launch-preflight'
+import { getFishCodexShellLaunchPreflight } from '../../shared/codex-shell-function'
 import { getFishShellReadyInitCommand } from '../shell-templates'
 import {
   encodeShellStartupFeatures,
@@ -126,7 +126,8 @@ const UNWRAPPED: ShellLaunchConfig = {
  */
 export function getShellLaunchConfig(
   shellPath: string,
-  features: readonly ShellStartupFeature[]
+  features: readonly ShellStartupFeature[],
+  options: { hasStartupCommand?: boolean } = {}
 ): ShellLaunchConfig {
   const shellName = pathWin32.basename(basename(shellPath)).toLowerCase()
 
@@ -177,17 +178,18 @@ export function getShellLaunchConfig(
     }
   }
 
-  // Why: mirrors local-pty-shell-ready.ts; markerless fish stays unwrapped. The
-  // selection is baked into the init command, so fish needs no feature env var.
-  if (shellName === 'fish' && features.includes('ready')) {
+  // Why: mirrors local-pty-shell-ready.ts; markerless fish stays unwrapped unless a
+  // startup command (e.g. Orca's Codex launch) needs the codex wrapper. The selection
+  // is baked into the init command, so fish needs no feature env var.
+  if (shellName === 'fish' && (features.includes('ready') || options.hasStartupCommand)) {
     return {
       args: [
         '-l',
         '-C',
-        `${getFishShellReadyInitCommand(SHELL_READY_MARKER)}\n${getFishCodexShellLaunchPreflight()}`
+        `${getFishShellReadyInitCommand(SHELL_READY_MARKER, features.includes('ready'))}\n${getFishCodexShellLaunchPreflight()}`
       ],
       env: {},
-      supportsReadyMarker: true
+      supportsReadyMarker: features.includes('ready')
     }
   }
 
diff --git a/src/main/daemon/terminal-armed-input-modes.ts b/src/main/daemon/terminal-armed-input-modes.ts
index e2ba02a2ca20..ca0e37a64108 100644
--- a/src/main/daemon/terminal-armed-input-modes.ts
+++ b/src/main/daemon/terminal-armed-input-modes.ts
@@ -8,7 +8,7 @@ const HOST_ARMABLE_MODE = 1004
 type ModeKey = number | 'kitty-main' | 'kitty-alt'
 // host: HOST_ARMABLE_MODE armed before any marker or by a prompt a 133;C proved; the ground keeps it.
 // prompt: armed outside a command, unproven until C.
-// command: armed after C; still on at 133;D, it triggers the ground.
+// command: armed after C; still on at any 133;D, it triggers the ground until disarmed.
 // stale: anything else still on; the ground clears it without it ever triggering.
 type ModeOwner = 'host' | 'prompt' | 'command' | 'stale'
 // Matches xterm.js's eviction limit, so the model drops the same entries.
@@ -104,13 +104,14 @@ export class TerminalArmedInputModes {
     this.enableOwner = 'prompt'
   }
 
-  /** OSC 133;D: true when the command left a mode it armed. Demoting makes it one-shot. */
+  /** OSC 133;D: true when a command's mode is still on. Not demoted: a nested shell's
+   *  stray D gets a refuted proof, and the app's real D must still trigger. */
   markCommandEnd(): boolean {
     let left = false
     for (const [key, owner] of this.owners) {
-      if (owner === 'command' || owner === 'prompt') {
-        // The other screen's kitty flags stay parked in xterm and reach no input.
-        left ||= owner === 'command' && (typeof key === 'number' || key === this.kittyKey())
+      // The other screen's kitty flags stay parked in xterm and reach no input.
+      left ||= owner === 'command' && (typeof key === 'number' || key === this.kittyKey())
+      if (owner === 'prompt') {
         this.owners.set(key, 'stale')
       }
     }
diff --git a/src/main/daemon/terminal-attach-cancellation.test.ts b/src/main/daemon/terminal-attach-cancellation.test.ts
new file mode 100644
index 000000000000..1c9fa0a1ea37
--- /dev/null
+++ b/src/main/daemon/terminal-attach-cancellation.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it, vi } from 'vitest'
+import { waitForTerminalAttachOperation } from './terminal-attach-cancellation'
+
+describe('terminal attach cancellation', () => {
+  it('removes cancellation listeners when the operation settles first', async () => {
+    const controller = new AbortController()
+    const removeListener = vi.spyOn(controller.signal, 'removeEventListener')
+
+    await expect(
+      waitForTerminalAttachOperation(Promise.resolve('ready'), controller.signal, 'session-1')
+    ).resolves.toBe('ready')
+
+    expect(removeListener).toHaveBeenCalledTimes(1)
+  })
+
+  it('preserves operation-first ordering when settlement and abort share a turn', async () => {
+    const controller = new AbortController()
+    const operation = Promise.withResolvers<string>()
+    const waiting = waitForTerminalAttachOperation(
+      operation.promise,
+      controller.signal,
+      'session-3'
+    )
+    operation.resolve('ready')
+    controller.abort()
+    await expect(waiting).resolves.toBe('ready')
+  })
+
+  it('rejects promptly on cancellation while the operation remains pending', async () => {
+    const controller = new AbortController()
+    const operation = new Promise<void>(() => {})
+    const waiting = waitForTerminalAttachOperation(operation, controller.signal, 'session-2')
+
+    controller.abort()
+
+    await expect(waiting).rejects.toMatchObject({ name: 'TerminalAttachCanceledError' })
+  })
+})
diff --git a/src/main/daemon/terminal-attach-cancellation.ts b/src/main/daemon/terminal-attach-cancellation.ts
index 9e87cbdb1bcc..21c037d91d3a 100644
--- a/src/main/daemon/terminal-attach-cancellation.ts
+++ b/src/main/daemon/terminal-attach-cancellation.ts
@@ -1,17 +1,17 @@
 import { TerminalAttachCanceledError } from './daemon-errors'
+import { PromiseSettlementWaiters } from '../../shared/promise-settlement-waiters'
 
-/** Never resolves; only rejects, so it can bound a wait without settling it. */
-export function rejectOnAbort(signal: AbortSignal | undefined, sessionId: string): Promise<never> {
+export function waitForTerminalAttachOperation<T>(
+  operation: Promise<T>,
+  signal: AbortSignal | undefined,
+  sessionId: string
+): Promise<T> {
   if (!signal) {
-    return new Promise<never>(() => {})
+    return operation
   }
-  return new Promise<never>((_resolve, reject) => {
-    if (signal.aborted) {
-      reject(new TerminalAttachCanceledError(sessionId))
-      return
-    }
-    signal.addEventListener('abort', () => reject(new TerminalAttachCanceledError(sessionId)), {
-      once: true
-    })
+  return new PromiseSettlementWaiters(operation).wait({
+    signal,
+    abortInMicrotask: true,
+    createAbortError: () => new TerminalAttachCanceledError(sessionId)
   })
 }
diff --git a/src/main/daemon/terminal-host-session-create.ts b/src/main/daemon/terminal-host-session-create.ts
index 7a8dbe379cc1..15e86a70a72c 100644
--- a/src/main/daemon/terminal-host-session-create.ts
+++ b/src/main/daemon/terminal-host-session-create.ts
@@ -12,7 +12,7 @@ import type { TerminalHostTombstones } from './terminal-host-tombstones'
 import type { TerminalSessionTeardown } from './terminal-session-teardown'
 import { resolveDaemonSessionScrollbackRows } from './daemon-session-scrollback-window'
 import { TerminalAttachCanceledError } from './daemon-errors'
-import { rejectOnAbort } from './terminal-attach-cancellation'
+import { waitForTerminalAttachOperation } from './terminal-attach-cancellation'
 import { SessionNotFoundError } from './types'
 import { resolveWslSessionContext } from './wsl-session-context'
 
@@ -47,10 +47,11 @@ export async function createOrAttachTerminalSession(
     // reaches this a beat after the attach that retired it, and refusing surfaced the raw
     // SessionNotFoundError to the user. Windows makes it the common case, where the plain-shell
     // sweep holds the claim across an OS identity probe and taskkill (#18046).
-    await Promise.race([
+    await waitForTerminalAttachOperation(
       deps.sessionTeardown.settle(opts.sessionId),
-      rejectOnAbort(opts.cancelSignal, opts.sessionId)
-    ])
+      opts.cancelSignal,
+      opts.sessionId
+    )
     deps.assertCreateAllowed()
     existing = deps.sessions.get(opts.sessionId)
     // Unkillable child, or a fresh teardown claimed it while we waited: still nobody's to recreate.
diff --git a/src/main/daemon/terminal-host.ts b/src/main/daemon/terminal-host.ts
index 8ccfe31b707b..d5669618c7a1 100644
--- a/src/main/daemon/terminal-host.ts
+++ b/src/main/daemon/terminal-host.ts
@@ -21,7 +21,7 @@ import { TerminalHostTombstones } from './terminal-host-tombstones'
 import { listLiveTerminalHostSessions } from './terminal-host-session-listing'
 import { createOrAttachTerminalSession } from './terminal-host-session-create'
 import { TerminalAttachCanceledError } from './daemon-errors'
-import { rejectOnAbort } from './terminal-attach-cancellation'
+import { waitForTerminalAttachOperation } from './terminal-attach-cancellation'
 import { randomUUID } from 'node:crypto'
 import { pruneRetiredPtyIncarnations } from '../../shared/retired-pty-incarnations'
 import {
@@ -84,7 +84,7 @@ export class TerminalHost {
       // Why: the create ahead of us can be stuck on an unreachable share for
       // minutes. Waiting unconditionally is what let one dead path strand every
       // later create and attach for the session, so a canceled caller leaves.
-      await Promise.race([inFlight, rejectOnAbort(opts.cancelSignal, opts.sessionId)])
+      await waitForTerminalAttachOperation(inFlight, opts.cancelSignal, opts.sessionId)
       this.assertCreateOrAttachAllowed(opts)
     }
     this.assertCreateOrAttachAllowed(opts)
@@ -277,6 +277,10 @@ export class TerminalHost {
     getAliveTerminalHostSession(this.sessions, sessionId).clearScrollback()
   }
 
+  resetInputModes(sessionId: string): void {
+    getAliveTerminalHostSession(this.sessions, sessionId).resetInputModes()
+  }
+
   // Why: null-not-throw — checkpoint is best-effort against a session that may have just exited.
   getSnapshot(sessionId: string, opts: { scrollbackRows?: number } = {}): TerminalSnapshot | null {
     return getTerminalHostSnapshot(this.sessions.get(sessionId), opts)
diff --git a/src/main/daemon/terminal-mode-rehydrate-sequences.ts b/src/main/daemon/terminal-mode-rehydrate-sequences.ts
index ac4e34897b6c..8537de08961b 100644
--- a/src/main/daemon/terminal-mode-rehydrate-sequences.ts
+++ b/src/main/daemon/terminal-mode-rehydrate-sequences.ts
@@ -1,11 +1,9 @@
 import type { TerminalModes } from './types'
 import { RESET_GRAPHIC_RENDITION } from '../../shared/terminal-mode-reset-profiles'
 
-// Why no kitty flags here: rehydrateSequences feeds renderer xterms, and
-// POST_REPLAY_REATTACH_RESET's deliberate kitty reset (stale CSI-u Ctrl+C
-// hazard) must stay authoritative. modes.kittyKeyboardFlags exists for
-// emulator re-seed parity only; a re-seeded emulator answers ?0u and
-// protocol-conformant programs re-push.
+// Why no kitty flags here: renderers re-assert the snapshot's kitty flags
+// (carried beside the payload) in their replay epilogue, after these screen
+// switches. A re-seeded emulator uses modes.kittyKeyboardFlags directly.
 export function buildRehydrateSequences(modes: TerminalModes): string {
   const seqs: string[] = []
   if (modes.alternateScreen) {
diff --git a/src/main/daemon/terminal-mouse-mode-mirror.ts b/src/main/daemon/terminal-mouse-mode-mirror.ts
deleted file mode 100644
index 7e2ea703cac5..000000000000
--- a/src/main/daemon/terminal-mouse-mode-mirror.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { ownRetainedString } from '../../shared/own-retained-string'
-import type { TerminalModes } from './types'
-
-type MouseTrackingMode = NonNullable<TerminalModes['mouseTrackingMode']>
-
-// Why: PTY/SSH chunks can split a long combined DECSET before the final h/l.
-// Keep parser state far beyond normal mode lists while still bounding memory.
-const PRIVATE_MODE_SCAN_TAIL_LIMIT = 4096
-
-/**
- * Mirrors DECSET mouse-protocol/encoding state from the raw byte stream.
- * xterm's public modes API does not expose which mouse protocol is active,
- * so snapshots track it independently of the headless terminal; callers
- * must feed `scan()` the same bytes the terminal parsed, in order.
- */
-export class TerminalMouseModeMirror {
-  private scanTail = ''
-  private trackingModeState: MouseTrackingMode = 'none'
-  private sgrMouseModeState = false
-  private sgrMousePixelsModeState = false
-
-  get mouseTrackingMode(): MouseTrackingMode {
-    return this.trackingModeState
-  }
-
-  get sgrMouseMode(): boolean {
-    return this.sgrMouseModeState
-  }
-
-  get sgrMousePixelsMode(): boolean {
-    return this.sgrMousePixelsModeState
-  }
-
-  scan(data: string): void {
-    // Why the pre-filter: this runs on the daemon's per-chunk hot path for
-    // every session; a flood chunk with no private-mode/reset introducer
-    // must not pay the regex pass (measured share of a 2.2x ingest
-    // regression — findings log 2026-07-03). Split sequences stay correct:
-    // an introducer split across chunks either left a non-empty scanTail
-    // (previous partial) or ends this chunk, which extractScanTail retains.
-    if (
-      this.scanTail.length === 0 &&
-      !data.includes('\x1b[?') &&
-      !data.includes('\x1bc') &&
-      !data.includes('\x9b')
-    ) {
-      this.scanTail = this.extractScanTail(data)
-      return
-    }
-    const input = this.scanTail.length === 0 ? data : this.scanTail + data
-    this.scanTail = this.extractScanTail(input)
-    // oxlint-disable-next-line no-control-regex -- terminal escape sequences require control chars
-    const privateModeRe = /\x1bc|\x1b\[\?([0-9;]+)([hl])|\x9b\?([0-9;]+)([hl])/g
-    let match: RegExpExecArray | null
-    while ((match = privateModeRe.exec(input)) !== null) {
-      if (match[0] === '\x1bc') {
-        this.trackingModeState = 'none'
-        this.sgrMouseModeState = false
-        this.sgrMousePixelsModeState = false
-        continue
-      }
-      const params = match[1] ?? match[3]
-      const enabled = (match[2] ?? match[4]) === 'h'
-      for (const rawParam of params.split(';')) {
-        if (rawParam === '') {
-          continue
-        }
-        const param = Number(rawParam)
-        if (!Number.isInteger(param)) {
-          continue
-        }
-        if (param === 9) {
-          this.trackingModeState = enabled ? 'x10' : 'none'
-        }
-        if (param === 1000) {
-          this.trackingModeState = enabled ? 'vt200' : 'none'
-        }
-        if (param === 1002) {
-          this.trackingModeState = enabled ? 'drag' : 'none'
-        }
-        if (param === 1003) {
-          this.trackingModeState = enabled ? 'any' : 'none'
-        }
-        if (param === 1006) {
-          this.sgrMouseModeState = enabled
-          this.sgrMousePixelsModeState = false
-        }
-        if (param === 1016) {
-          this.sgrMouseModeState = false
-          this.sgrMousePixelsModeState = enabled
-        }
-      }
-    }
-  }
-
-  private extractScanTail(input: string): string {
-    const start = Math.max(input.lastIndexOf('\x1b'), input.lastIndexOf('\x9b'))
-    if (start === -1) {
-      return ''
-    }
-    const tail = input.slice(start)
-    if (tail.length > PRIVATE_MODE_SCAN_TAIL_LIMIT) {
-      return ''
-    }
-    if (tail === '\x1b' || tail === '\x1b[' || tail === '\x9b') {
-      return tail
-    }
-    if (tail.startsWith('\x1b[?')) {
-      return this.isIncompleteParams(tail.slice(3)) ? ownRetainedString(tail) : ''
-    }
-    if (tail.startsWith('\x9b?')) {
-      return this.isIncompleteParams(tail.slice(2)) ? ownRetainedString(tail) : ''
-    }
-    return ''
-  }
-
-  private isIncompleteParams(params: string): boolean {
-    return /^[0-9;]*$/.test(params)
-  }
-}
diff --git a/src/main/daemon/terminal-mouse-tail-retention.test.ts b/src/main/daemon/terminal-mouse-tail-retention.test.ts
deleted file mode 100644
index 7a266b4b23dc..000000000000
--- a/src/main/daemon/terminal-mouse-tail-retention.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { TerminalMouseModeMirror } from './terminal-mouse-mode-mirror'
-
-function heapAfterGc(): number {
-  if (!('gc' in globalThis) || typeof globalThis.gc !== 'function') {
-    throw new Error('The test runner must enable --expose-gc')
-  }
-  // Isolate mirror ownership from V8's process-wide last successful regexp input.
-  void /reset/.test('reset')
-  globalThis.gc()
-  globalThis.gc()
-  return process.memoryUsage().heapUsed
-}
-
-describe('mouse mode scan tail retention', () => {
-  it.each(['\x1b[', '\x9b'])(
-    'retains a split %j mode sequence without retaining consumed output',
-    (introducer) => {
-      const before = heapAfterGc()
-      const mirrors = Array.from({ length: 8 }, (_value, index) => {
-        const mirror = new TerminalMouseModeMirror()
-        mirror.scan(`${index}:${'x'.repeat(4 * 1024 * 1024)}${introducer}?1049;2004;1000;`)
-        return mirror
-      })
-
-      expect(heapAfterGc() - before).toBeLessThan(2 * 1024 * 1024)
-      for (const mirror of mirrors) {
-        expect(mirror.mouseTrackingMode).toBe('none')
-        mirror.scan('1006h')
-        expect(mirror.mouseTrackingMode).toBe('vt200')
-        expect(mirror.sgrMouseMode).toBe(true)
-        mirror.scan('\x1b[?1016h')
-        expect(mirror.sgrMouseMode).toBe(false)
-        expect(mirror.sgrMousePixelsMode).toBe(true)
-        mirror.scan('\x1bc')
-        expect(mirror.mouseTrackingMode).toBe('none')
-        expect(mirror.sgrMousePixelsMode).toBe(false)
-      }
-    }
-  )
-})
diff --git a/src/main/daemon/terminal-shell-armed-input-mode-recovery.test.ts b/src/main/daemon/terminal-shell-armed-input-mode-recovery.test.ts
index fef4d762c698..630fe21d0bf3 100644
--- a/src/main/daemon/terminal-shell-armed-input-mode-recovery.test.ts
+++ b/src/main/daemon/terminal-shell-armed-input-mode-recovery.test.ts
@@ -50,14 +50,14 @@ describe('armed input modes arm the unclean-death trigger', () => {
     expect(triggers(scanner, chunk)).toBe(false)
   })
 
-  it('stays one-shot until a fresh enable', () => {
+  it('re-triggers at every D until the mode is disarmed', () => {
     const scanner = new TerminalShellLifecycleScanner()
 
     expect(triggers(scanner, `${COMMAND_START}\x1b[?1004hRUN${COMMAND_DONE}`)).toBe(true)
-    // A refuted proof leaves ?1004 armed; later prompts must not pause again.
-    expect(triggers(scanner, `$ ${COMMAND_START}ls${COMMAND_DONE}`)).toBe(false)
-    expect(triggers(scanner, `$ ${COMMAND_START}ls${COMMAND_DONE}`)).toBe(false)
-    expect(triggers(scanner, `$ ${COMMAND_START}\x1b[?1000hRUN${COMMAND_DONE}`)).toBe(true)
+    // A refuted proof leaves ?1004 armed and command-owned; each later D re-asks.
+    expect(triggers(scanner, `$ ${COMMAND_START}ls${COMMAND_DONE}`)).toBe(true)
+    expect(triggers(scanner, `$ ${COMMAND_START}ls${COMMAND_DONE}`)).toBe(true)
+    expect(triggers(scanner, `\x1b[?1004l$ ${COMMAND_START}ls${COMMAND_DONE}`)).toBe(false)
   })
 
   it('treats modes the prompt armed before the command started as shell-owned', () => {
@@ -342,6 +342,25 @@ describe('Session grounds a proven normal-buffer death', () => {
     expect(snapshot?.snapshotAnsi).toContain('\x1b[?1004h')
   })
 
+  it("grounds an agent's modes when it dies after nested shells' refuted Ds", async () => {
+    const leak = { data: `${COMMAND_START}nested\r\n${COMMAND_DONE}`, confirm: false }
+    const { snapshot, records, proofs } = await runSteps([
+      { data: `${PROMPT_START}$ ${COMMAND_START}\x1b[>1u\x1b[?1003hAGENT` },
+      ...Array.from({ length: 5 }, () => leak),
+      { data: `EXIT\r\n${COMMAND_DONE}${PROMPT_START}$ `, confirm: true },
+      { data: `${COMMAND_START}ls\r\n${COMMAND_DONE}${PROMPT_START}$ ` }
+    ])
+
+    // The confirmed ground disarms the modes: the next prompt opens no episode.
+    expect(proofs).toBe(6)
+    expect(
+      records.some(
+        (record) => record.kind === 'output' && record.data.includes(PROCESS_BOUNDARY_GROUND)
+      )
+    ).toBe(true)
+    expect(snapshot?.modes.mouseTrackingMode).toBe('none')
+  })
+
   it('flushes without the ground when the proof is refuted', async () => {
     const { snapshot, records } = await runNormalBufferDeath(false)
 
diff --git a/src/main/daemon/terminal-shell-lifecycle-scanner.test.ts b/src/main/daemon/terminal-shell-lifecycle-scanner.test.ts
index 7d5136d90503..48e1658bef1f 100644
--- a/src/main/daemon/terminal-shell-lifecycle-scanner.test.ts
+++ b/src/main/daemon/terminal-shell-lifecycle-scanner.test.ts
@@ -14,6 +14,7 @@ describe('TerminalShellLifecycleScanner', () => {
       const events = scanner.scan(chunk)
 
       expect(events.uncleanDeathTriggerEnd).toBe(chunk.indexOf('shell-marker'))
+      expect(events.uncleanDeathTriggerStart).toBe(chunk.indexOf('\x1b]133;D'))
       expect(chunk.slice(events.uncleanDeathTriggerEnd)).toBe('shell-marker')
       expect(scanner.isAlternateScreenActive).toBe(true)
       expect(scanner.owner).toBeUndefined()
@@ -45,6 +46,7 @@ describe('TerminalShellLifecycleScanner', () => {
       const events = scanner.scan('37\x07tail')
 
       expect(events.uncleanDeathTriggerEnd).toBe('37\x07'.length)
+      expect(events.uncleanDeathTriggerStart).toBe(0)
       expect('37\x07tail'.slice(events.uncleanDeathTriggerEnd)).toBe('tail')
       expect(scanner.owner).toBeUndefined()
     })
@@ -268,18 +270,19 @@ describe('TerminalShellLifecycleScanner', () => {
 })
 
 describe('unclean trigger arming', () => {
-  it('fires once per alternate-screen occupancy and re-arms only on a fresh entry', () => {
+  it('fires at every D while the alternate screen stays up, and never once it is left', () => {
     const scanner = new TerminalShellLifecycleScanner()
+    const prompt = '\x1b]133;C\x07ls\r\n\x1b]133;D;0\x07'
 
     expect(scanner.scan('\x1b[?1049hTUI\x1b]133;D;137\x07').uncleanDeathTriggerEnd).toBeDefined()
-    // Refuted path: no reset scanned, alt still active — a later prompt's D must not re-trigger.
-    const second = scanner.scan('\x1b]133;C\x07ls\r\n\x1b]133;D;0\x07')
-    expect(second.uncleanDeathTriggerEnd).toBeUndefined()
-    expect(second.cleanExitCandidate).toBeUndefined()
+    // Refuted path: no reset scanned, so each later D re-asks — one may be the TUI's real death.
+    for (let index = 0; index < 5; index += 1) {
+      expect(scanner.scan(prompt).uncleanDeathTriggerEnd).toBeDefined()
+    }
     expect(scanner.isAlternateScreenActive).toBe(true)
 
-    expect(
-      scanner.scan('\x1b]133;C\x07\x1b[?1049hAGAIN\x1b]133;D;9\x07').uncleanDeathTriggerEnd
-    ).toBeDefined()
+    const left = scanner.scan(`\x1b[?1049l${prompt}`)
+    expect(left.uncleanDeathTriggerEnd).toBeUndefined()
+    expect(scanner.scan(prompt).uncleanDeathTriggerEnd).toBeUndefined()
   })
 })
diff --git a/src/main/daemon/terminal-shell-lifecycle-scanner.ts b/src/main/daemon/terminal-shell-lifecycle-scanner.ts
index f62ab47cfd35..f93f9c4df66a 100644
--- a/src/main/daemon/terminal-shell-lifecycle-scanner.ts
+++ b/src/main/daemon/terminal-shell-lifecycle-scanner.ts
@@ -34,6 +34,8 @@ export type ShellLifecycleScanEvents = {
    * and after this index were NOT consumed; the caller re-feeds them.
    */
   uncleanDeathTriggerEnd?: number
+  /** Where that OSC 133;D begins in the chunk; 0 when it began in an earlier one. */
+  uncleanDeathTriggerStart?: number
   /** An OSC 133;D closed a command that had entered the alternate screen and left it cleanly. */
   cleanExitCandidate?: { generation: number }
 }
@@ -54,11 +56,6 @@ export class TerminalShellLifecycleScanner {
   private altActive = false
   private commandEnteredAlternateScreen = false
   private readonly inputModes = new TerminalArmedInputModes()
-  // Why one-shot: a refuted proof leaves the alt screen up (no reset was ever
-  // scanned), and without disarming every later prompt's D would re-open a full
-  // pause-and-inspect episode. Only a fresh alternate-screen enable re-arms; input
-  // modes are one-shot by markCommandEnd's demotion.
-  private uncleanTriggerArmed = false
 
   get owner(): TerminalOwner | undefined {
     return this.ownerState
@@ -97,7 +94,6 @@ export class TerminalShellLifecycleScanner {
       // this a mirror seeded mid-TUI never arms its unclean-death trigger and
       // the whole occupancy loses recovery.
       this.altActive = opts.alternateScreen
-      this.uncleanTriggerArmed = opts.alternateScreen
       this.commandEnteredAlternateScreen = opts.alternateScreen
     }
   }
@@ -123,7 +119,6 @@ export class TerminalShellLifecycleScanner {
         this.inputModes.reset()
         this.altActive = false
         this.commandEnteredAlternateScreen = false
-        this.uncleanTriggerArmed = false
         continue
       }
       if (oscPayload !== undefined) {
@@ -142,13 +137,12 @@ export class TerminalShellLifecycleScanner {
         }
         // An alternate screen or a command's input mode still up at command-finished
         // means the app died without its own teardown; the caller must repair first.
-        const leftInputModes = this.inputModes.markCommandEnd()
-        const uncleanDeath = (this.uncleanTriggerArmed && this.altActive) || leftInputModes
+        // Every D re-asks: a refuted one may be a nested shell's while the app lives.
+        const uncleanDeath = this.inputModes.markCommandEnd() || this.altActive
         const cleanExit = !uncleanDeath && this.commandEnteredAlternateScreen && !this.altActive
         this.revoke()
         this.commandEnteredAlternateScreen = false
         if (uncleanDeath) {
-          this.uncleanTriggerArmed = false
           this.scanTail = ''
           // Why the clamp: a complete OSC can never sit wholly inside the
           // carried tail (extractScanTail keeps incomplete ones only), so this
@@ -158,6 +152,7 @@ export class TerminalShellLifecycleScanner {
             0,
             match.index + match[0].length - previousTailLength
           )
+          events.uncleanDeathTriggerStart = Math.max(0, match.index - previousTailLength)
           return events
         }
         if (cleanExit) {
@@ -195,7 +190,6 @@ export class TerminalShellLifecycleScanner {
           this.altActive = enabled
           if (enabled) {
             this.commandEnteredAlternateScreen = true
-            this.uncleanTriggerArmed = true
           }
         }
       }
diff --git a/src/main/daemon/terminal-shell-recovery-barrier.test.ts b/src/main/daemon/terminal-shell-recovery-barrier.test.ts
index 7cea4ed314ee..dead64c9bec8 100644
--- a/src/main/daemon/terminal-shell-recovery-barrier.test.ts
+++ b/src/main/daemon/terminal-shell-recovery-barrier.test.ts
@@ -4,6 +4,10 @@ import { TerminalShellRecoveryBarrier } from './terminal-shell-recovery-barrier'
 import type { PtyIngressEmission } from '../../shared/pty-startup-ingress'
 
 const TRIGGER = '\x1b[?1049hTUI\x1b]133;D;137\x07'
+// The barrier holds the whole D mark; the ground rides on it.
+const MARK = '\x1b]133;D;137\x07'
+const HEAD = TRIGGER.slice(0, -MARK.length)
+const GROUNDED = `${MARK}${PROCESS_BOUNDARY_GROUND}`
 
 function passthrough(data: string, rawStartSeq = 0): PtyIngressEmission {
   return { data, rawStartSeq, rawEndSeq: rawStartSeq + data.length, transformed: false }
@@ -47,14 +51,14 @@ describe('TerminalShellRecoveryBarrier', () => {
     barrier.accept(passthrough(`${TRIGGER}SHELL-PROMPT`, 100))
     expect(confirm).toHaveBeenCalledTimes(1)
     expect(released).toEqual([
-      { data: TRIGGER, rawStartSeq: 100, rawEndSeq: 100 + TRIGGER.length, transformed: false }
+      { data: HEAD, rawStartSeq: 100, rawEndSeq: 100 + HEAD.length, transformed: false }
     ])
 
     resolveConfirm?.(true)
     await vi.waitFor(() => expect(released).toHaveLength(3))
     expect(released[1]).toEqual({
-      data: PROCESS_BOUNDARY_GROUND,
-      rawStartSeq: 100 + TRIGGER.length,
+      data: GROUNDED,
+      rawStartSeq: 100 + HEAD.length,
       rawEndSeq: 100 + TRIGGER.length,
       transformed: true
     })
@@ -80,12 +84,7 @@ describe('TerminalShellRecoveryBarrier', () => {
 
     resolveConfirm?.(true)
     await vi.waitFor(() => expect(released).toHaveLength(4))
-    expect(released.map((emission) => emission.data)).toEqual([
-      TRIGGER,
-      PROCESS_BOUNDARY_GROUND,
-      'late-1',
-      'late-2'
-    ])
+    expect(released.map((emission) => emission.data)).toEqual([HEAD, GROUNDED, 'late-1', 'late-2'])
   })
 
   it('flushes unmodified with no injection when the proof is refuted', async () => {
@@ -97,8 +96,8 @@ describe('TerminalShellRecoveryBarrier', () => {
     barrier.accept(passthrough(`${TRIGGER}nested-shell`))
     resolveConfirm?.(false)
 
-    await vi.waitFor(() => expect(released).toHaveLength(2))
-    expect(released.map((emission) => emission.data)).toEqual([TRIGGER, 'nested-shell'])
+    await vi.waitFor(() => expect(released).toHaveLength(3))
+    expect(released.map((emission) => emission.data)).toEqual([HEAD, MARK, 'nested-shell'])
     expect(barrier.getOwner()).toBeUndefined()
   })
 
@@ -110,12 +109,12 @@ describe('TerminalShellRecoveryBarrier', () => {
     })
 
     barrier.accept(passthrough(`${TRIGGER}prompt`))
-    await vi.waitFor(() => expect(released).toHaveLength(2))
-    expect(released.map((emission) => emission.data)).toEqual([TRIGGER, 'prompt'])
+    await vi.waitFor(() => expect(released).toHaveLength(3))
+    expect(released.map((emission) => emission.data)).toEqual([HEAD, MARK, 'prompt'])
 
     resolveConfirm?.(true)
     await new Promise((resolve) => setTimeout(resolve, 5))
-    expect(released).toHaveLength(2)
+    expect(released).toHaveLength(3)
     expect(barrier.getOwner()).toBeUndefined()
   })
 
@@ -128,7 +127,7 @@ describe('TerminalShellRecoveryBarrier', () => {
     barrier.accept(passthrough(TRIGGER))
     barrier.accept(passthrough('0123456789'))
 
-    expect(released.map((emission) => emission.data)).toEqual([TRIGGER, '0123456789'])
+    expect(released.map((emission) => emission.data)).toEqual([HEAD, MARK, '0123456789'])
     expect(barrier.getOwner()).toBeUndefined()
   })
 
@@ -144,8 +143,8 @@ describe('TerminalShellRecoveryBarrier', () => {
     alive = false
     resolveConfirm?.(true)
 
-    await vi.waitFor(() => expect(released).toHaveLength(2))
-    expect(released.map((emission) => emission.data)).toEqual([TRIGGER, 'prompt'])
+    await vi.waitFor(() => expect(released).toHaveLength(3))
+    expect(released.map((emission) => emission.data)).toEqual([HEAD, MARK, 'prompt'])
     expect(barrier.getOwner()).toBeUndefined()
   })
 
@@ -165,11 +164,11 @@ describe('TerminalShellRecoveryBarrier', () => {
 
     await vi.waitFor(() =>
       expect(released.map((emission) => emission.data)).toEqual([
-        TRIGGER,
-        PROCESS_BOUNDARY_GROUND,
+        HEAD,
+        GROUNDED,
         'first-prompt',
-        '\x1b[?1049hAGAIN\x1b]133;D;9\x07',
-        PROCESS_BOUNDARY_GROUND,
+        '\x1b[?1049hAGAIN',
+        `\x1b]133;D;9\x07${PROCESS_BOUNDARY_GROUND}`,
         'second-prompt'
       ])
     )
@@ -274,13 +273,12 @@ describe('TerminalShellRecoveryBarrier', () => {
     await vi.waitFor(() =>
       expect(released.map((emission) => emission.data)).toEqual([
         head,
-        '37\x07',
-        PROCESS_BOUNDARY_GROUND,
+        `37\x07${PROCESS_BOUNDARY_GROUND}`,
         'PROMPT'
       ])
     )
     expect(released[1]).toMatchObject({ rawStartSeq: head.length, rawEndSeq: head.length + 3 })
-    expect(released[3]).toMatchObject({
+    expect(released[2]).toMatchObject({
       rawStartSeq: head.length + 3,
       rawEndSeq: head.length + tail.length
     })
@@ -308,34 +306,71 @@ describe('TerminalShellRecoveryBarrier', () => {
 
     await settled
     await vi.waitFor(() =>
-      expect(released.map((emission) => emission.data)).toEqual([
-        TRIGGER,
-        PROCESS_BOUNDARY_GROUND,
-        'after-poison'
-      ])
+      expect(released.map((emission) => emission.data)).toEqual([HEAD, GROUNDED, 'after-poison'])
     )
     await expect(barrier.idle()).resolves.toBeUndefined()
   })
 
-  it('opens at most one episode per alternate-screen occupancy after a refuted proof', async () => {
+  it('asks at every D of a live TUI and releases every byte, in order, unmodified', async () => {
     const { barrier, released, confirm } = createBarrier({ confirm: async () => false })
-
-    barrier.accept(passthrough(`${TRIGGER}prompt`))
-    await vi.waitFor(() => expect(released).toHaveLength(2))
-    expect(confirm).toHaveBeenCalledTimes(1)
-
-    // Why: the refuted path never scans a reset, so alt stays active — later
-    // ordinary prompts must not each re-open a pause-and-inspect episode.
+    const leak = '\x1b]133;C\x07nested\x1b]133;D;0\x07'
+    const sent = [`\x1b[?1049h\x1b[?1003hTUI${leak}frame`]
     for (let index = 0; index < 5; index += 1) {
-      const prompt = passthrough(`\x1b]133;C\x07ls\r\n\x1b]133;D;0\x07`)
-      barrier.accept(prompt)
-      expect(released.at(-1)).toBe(prompt)
+      sent.push(`${leak}frame${index}`)
     }
-    expect(confirm).toHaveBeenCalledTimes(1)
 
-    // A fresh alternate-screen entry re-arms recovery.
-    barrier.accept(passthrough(`\x1b]133;C\x07\x1b[?1049hAGAIN\x1b]133;D;9\x07`))
-    expect(confirm).toHaveBeenCalledTimes(2)
+    let seq = 0
+    for (const data of sent) {
+      barrier.accept(passthrough(data, seq))
+      seq += data.length
+    }
+    await vi.waitFor(() => expect(confirm).toHaveBeenCalledTimes(6))
+    await barrier.idle()
+
+    expect(released.map((emission) => emission.data).join('')).toBe(sent.join(''))
+    expect(released.every((emission) => !emission.transformed)).toBe(true)
+    expect(barrier.getOwner()).toBeUndefined()
+  })
+
+  it("grounds a TUI that dies after many nested shells' Ds were refuted", async () => {
+    let dead = false
+    const { barrier, released, confirm } = createBarrier({ confirm: async () => dead })
+    const leak = '\x1b]133;C\x07nested\x1b]133;D;0\x07'
+
+    barrier.accept(passthrough(`\x1b[?1049hTUI${leak.repeat(5)}`))
+    await vi.waitFor(() => expect(confirm).toHaveBeenCalledTimes(5))
+    await barrier.idle()
+    dead = true
+    barrier.accept(passthrough('\x1b]133;D;137\x07prompt'))
+
+    await vi.waitFor(() => expect(barrier.getOwner()).toBe('shell'))
+    expect(released.slice(-2).map((emission) => emission.data)).toEqual([GROUNDED, 'prompt'])
+    // Grounded once: the next prompt opens no episode.
+    barrier.accept(passthrough('\x1b]133;C\x07ls\x1b]133;D;0\x07'))
+    expect(confirm).toHaveBeenCalledTimes(6)
+  })
+
+  it('grounds a real death D that arrives while a stray D is still being proven', async () => {
+    const proofs: ((confirmed: boolean) => void)[] = []
+    const { barrier, released, confirm } = createBarrier({
+      confirm: () => new Promise((resolve) => void proofs.push(resolve))
+    })
+    const leak = '\x1b[?1049h\x1b[?1003hTUI\x1b]133;C\x07nested\x1b]133;D;0\x07'
+
+    barrier.accept(passthrough(leak, 0))
+    barrier.accept(passthrough('frame\x1b]133;D;137\x07prompt', leak.length))
+    proofs[0]?.(false)
+    await vi.waitFor(() => expect(confirm).toHaveBeenCalledTimes(2))
+    proofs[1]?.(true)
+
+    await vi.waitFor(() => expect(barrier.getOwner()).toBe('shell'))
+    expect(released.map((emission) => emission.data)).toEqual([
+      leak.slice(0, -'\x1b]133;D;0\x07'.length),
+      '\x1b]133;D;0\x07',
+      'frame',
+      GROUNDED,
+      'prompt'
+    ])
   })
 
   it('bounds awaitProofSettled by its own deadline when a clean-exit proof hangs', async () => {
@@ -359,7 +394,7 @@ describe('TerminalShellRecoveryBarrier', () => {
     const barrier = new TerminalShellRecoveryBarrier({
       confirmShellForeground: confirm,
       release: (emission) => {
-        if (!headThrown && emission.data === TRIGGER) {
+        if (!headThrown && emission.data === HEAD) {
           headThrown = true
           throw new Error('client transport died mid-broadcast')
         }
@@ -373,10 +408,7 @@ describe('TerminalShellRecoveryBarrier', () => {
     resolveConfirm?.(true)
 
     await vi.waitFor(() =>
-      expect(released.map((emission) => emission.data)).toEqual([
-        PROCESS_BOUNDARY_GROUND,
-        'SHELL-PROMPT'
-      ])
+      expect(released.map((emission) => emission.data)).toEqual([GROUNDED, 'SHELL-PROMPT'])
     )
     expect(barrier.getOwner()).toBe('shell')
   })
@@ -385,11 +417,11 @@ describe('TerminalShellRecoveryBarrier', () => {
     const { barrier, released } = createBarrier({ confirm: () => new Promise(() => {}) })
 
     barrier.accept(passthrough(`${TRIGGER}prompt`))
-    expect(released.map((emission) => emission.data)).toEqual([TRIGGER])
+    expect(released.map((emission) => emission.data)).toEqual([HEAD])
 
     barrier.flushPending()
 
-    expect(released.map((emission) => emission.data)).toEqual([TRIGGER, 'prompt'])
+    expect(released.map((emission) => emission.data)).toEqual([HEAD, MARK, 'prompt'])
     expect(barrier.getOwner()).toBeUndefined()
   })
 
@@ -398,8 +430,50 @@ describe('TerminalShellRecoveryBarrier', () => {
     barrier.accept(passthrough(`${TRIGGER}prompt`))
     barrier.dispose()
 
-    expect(released.map((emission) => emission.data)).toEqual([TRIGGER])
+    expect(released.map((emission) => emission.data)).toEqual([HEAD])
     barrier.accept(passthrough('after-dispose'))
     expect(released).toHaveLength(1)
   })
+
+  it('carries the ground on an ESC-backslash terminator split from its ESC', async () => {
+    const { barrier, released } = createBarrier()
+    const head = '\x1b[?1049hTUI\x1b]133;D;137\x1b'
+    barrier.accept(passthrough(head, 0))
+    barrier.accept(passthrough('\\PROMPT', head.length))
+
+    await vi.waitFor(() => expect(barrier.getOwner()).toBe('shell'))
+    expect(released).toEqual([
+      passthrough(head, 0),
+      {
+        data: `\\${PROCESS_BOUNDARY_GROUND}`,
+        rawStartSeq: head.length,
+        rawEndSeq: head.length + 1,
+        transformed: true
+      },
+      passthrough('PROMPT', head.length + 1)
+    ])
+  })
+
+  it.each([
+    ['confirmed', async () => true],
+    ['refuted', async () => false],
+    ['timed out', () => new Promise<boolean>(() => {})]
+  ])('covers at least one raw unit with every emission when %s', async (_, confirm) => {
+    const { barrier, released } = createBarrier({ confirm, maxPendingMs: 20 })
+    const stream = [`${TRIGGER}p1`, '\x1b[?1049h\x1b]133;D;1\x1b', '\\p2', `${TRIGGER}`, 'p3']
+    let seq = 0
+    for (const data of stream) {
+      barrier.accept(passthrough(data, seq))
+      seq += data.length
+    }
+    await vi.waitFor(() => expect(released.at(-1)?.rawEndSeq).toBe(seq))
+
+    expect(released.every((emission) => emission.rawEndSeq > emission.rawStartSeq)).toBe(true)
+    const raw = released.map((emission) =>
+      emission.transformed
+        ? emission.data.slice(0, emission.rawEndSeq - emission.rawStartSeq)
+        : emission.data
+    )
+    expect(raw.join('')).toBe(stream.join(''))
+  })
 })
diff --git a/src/main/daemon/terminal-shell-recovery-barrier.ts b/src/main/daemon/terminal-shell-recovery-barrier.ts
index 69149835216a..d8a29d4b4b43 100644
--- a/src/main/daemon/terminal-shell-recovery-barrier.ts
+++ b/src/main/daemon/terminal-shell-recovery-barrier.ts
@@ -7,6 +7,9 @@ import type { TerminalOwner } from '../../shared/terminal-owner'
 // flood or hang means the trigger misfired, so bail out and flush unmodified.
 const MAX_QUEUED_BYTES = 262_144
 const MAX_PENDING_MS = 750
+// Why bounded: the grounded mark is one indivisible span, and the relay never
+// sends a span wider than its 16K source frame.
+const MAX_HELD_MARK_CHARS = 4096
 
 export type TerminalShellRecoveryBarrierOptions = {
   /** Fresh execution-host proof that the spawned shell owns the PTY foreground. */
@@ -22,13 +25,17 @@ export type TerminalShellRecoveryBarrierOptions = {
  * Ordered output barrier for dead-TUI mode recovery. Sits between startup
  * ingress and the output plane. When a shell-integration command-done marker
  * (OSC 133;D) arrives while the alternate screen is still active, the stream
- * pauses at that exact byte boundary, the execution host proves the shell owns
- * the PTY foreground, and on proof a mode reset is injected as in-stream output
- * so every downstream consumer (host emulator, mirrors, attached renderers,
+ * holds that marker, the execution host proves the shell owns the PTY
+ * foreground, and on proof a mode reset is injected as in-stream output so
+ * every downstream consumer (host emulator, mirrors, attached renderers,
  * history) converges — and the queued shell prompt then paints onto the normal
- * buffer instead of the discarded alternate screen. Any failure (refuted proof,
- * timeout, overflow, death, disposal) flushes the queue unmodified, preserving
- * incumbent behavior. Clean alternate-screen exits prove ownership without
+ * buffer instead of the discarded alternate screen. Holding the whole marker
+ * keeps a mid-proof snapshot on an escape boundary. The reset rides on it so
+ * every emission covers at least one raw unit: a zero-raw span is never sent by
+ * credit-windowed delivery (SSH relay), and its seq would not rise above a
+ * mid-proof snapshot, so snapshot-seq dedup would drop it. Any failure (refuted
+ * proof, timeout, overflow, death, disposal) flushes the queue unmodified,
+ * preserving incumbent behavior. Clean alternate-screen exits prove ownership without
  * pausing: the model needs no correction, only snapshot metadata.
  */
 export class TerminalShellRecoveryBarrier {
@@ -43,7 +50,6 @@ export class TerminalShellRecoveryBarrier {
   private queuedBytes = 0
   private pending = false
   private pendingGeneration = 0
-  private pendingRawSeq = 0
   private pendingEpisode = 0
   private bailTimer: ReturnType<typeof setTimeout> | null = null
   private idleWaiters: (() => void)[] = []
@@ -80,6 +86,13 @@ export class TerminalShellRecoveryBarrier {
     return this.scanner.owner
   }
 
+  /** Reset Terminal: grounds the lifecycle model now and returns the bytes for
+   *  the host's other models. Not released downstream: a zero-raw span is dropped
+   *  by credit-windowed delivery and snapshot-seq dedup, so each client grounds itself. */
+  groundInputModes(): string {
+    return this.scanner.groundProcessBoundary()
+  }
+
   /** Answers a paired runtime's ownership question from the barrier's settled
    *  state. The barrier scans bytes before any consumer receives them, so its
    *  verdict is never behind the caller's parse position — a fresh process
@@ -187,12 +200,16 @@ export class TerminalShellRecoveryBarrier {
       this.releaseDownstream(emission)
       return
     }
+    // end >= 1 keeps the held mark inside this emission's raw span.
     const splittable =
-      !emission.transformed && emission.rawEndSeq - emission.rawStartSeq === emission.data.length
+      end >= 1 &&
+      !emission.transformed &&
+      emission.rawEndSeq - emission.rawStartSeq === emission.data.length
     if (!splittable) {
       // Why skip the episode: the raw-seq boundary inside a transformed emission
-      // cannot be reconstructed, so release everything and keep the scanner
-      // honest about the remainder — incumbent behavior for this rare corner.
+      // (or a mark ending outside this one) cannot be reconstructed, so release
+      // everything and keep the scanner honest about the remainder — incumbent
+      // behavior for this rare corner.
       try {
         this.releaseDownstream(emission)
       } catch {
@@ -202,20 +219,29 @@ export class TerminalShellRecoveryBarrier {
       this.consumeForStateOnly(emission.data.slice(end))
       return
     }
+    const start = Math.max(events.uncleanDeathTriggerStart ?? 0, end - MAX_HELD_MARK_CHARS)
+    const markSeq = emission.rawStartSeq + start
     const splitSeq = emission.rawStartSeq + end
-    try {
-      this.releaseDownstream({
-        data: emission.data.slice(0, end),
-        rawStartSeq: emission.rawStartSeq,
-        rawEndSeq: splitSeq,
-        transformed: false
-      })
-    } catch {
-      // Why swallowed: the emulator and records already took the head inside
-      // emit before a client's broadcast threw; aborting here would cost the
-      // post-boundary prompt its entire recovery episode.
+    if (start > 0) {
+      try {
+        this.releaseDownstream({
+          data: emission.data.slice(0, start),
+          rawStartSeq: emission.rawStartSeq,
+          rawEndSeq: markSeq,
+          transformed: false
+        })
+      } catch {
+        // Why swallowed: the emulator and records already took the head inside
+        // emit before a client's broadcast threw; aborting here would cost the
+        // post-boundary prompt its entire recovery episode.
+      }
     }
-    this.enterPending(splitSeq)
+    this.enterPending({
+      data: emission.data.slice(start, end),
+      rawStartSeq: markSeq,
+      rawEndSeq: splitSeq,
+      transformed: false
+    })
     if (end < emission.data.length) {
       this.enqueue({
         data: emission.data.slice(end),
@@ -240,14 +266,15 @@ export class TerminalShellRecoveryBarrier {
     }
   }
 
-  private enterPending(rawSeq: number): void {
+  /** Opens an episode holding `mark` as the queue head, already scanned. */
+  private enterPending(mark: PtyIngressEmission): void {
     this.pending = true
     this.pendingEpisode += 1
     this.pendingGeneration = this.scanner.generation
-    this.pendingRawSeq = rawSeq
     const episode = this.pendingEpisode
     this.bailTimer = setTimeout(() => this.finishPending(episode, false), this.maxPendingMs)
     this.bailTimer.unref?.()
+    this.enqueue(mark)
     // Why the guard: the callback is injected; a synchronous throw must not
     // escape after pending flipped true and strand the episode until the bail.
     let proof: Promise<boolean>
@@ -279,21 +306,9 @@ export class TerminalShellRecoveryBarrier {
     this.queue = []
     this.queuedBytes = 0
     try {
-      if (confirmed && this.isAlive()) {
-        // Scanned before release so alt-state stays honest.
-        const ground = this.scanner.groundProcessBoundary()
-        try {
-          this.releaseDownstream({
-            data: ground,
-            rawStartSeq: this.pendingRawSeq,
-            rawEndSeq: this.pendingRawSeq,
-            transformed: true
-          })
-        } catch {
-          // Why swallowed: a throwing downstream client must not strand the
-          // queued prompt bytes below.
-        }
-        this.scanner.trySetOwner(this.pendingGeneration)
+      const mark = queued.shift()
+      if (mark) {
+        this.releaseMark(mark, confirmed && this.isAlive())
       }
       for (let index = 0; index < queued.length; index += 1) {
         if (this.disposed) {
@@ -318,6 +333,27 @@ export class TerminalShellRecoveryBarrier {
     }
   }
 
+  private releaseMark(mark: PtyIngressEmission, grounded: boolean): void {
+    try {
+      this.releaseDownstream(
+        grounded
+          ? {
+              ...mark,
+              // Scanned before release so alt-state stays honest.
+              data: mark.data + this.scanner.groundProcessBoundary(),
+              transformed: true
+            }
+          : mark
+      )
+    } catch {
+      // Why swallowed: a throwing downstream client must not strand the
+      // queued prompt bytes behind it.
+    }
+    if (grounded) {
+      this.scanner.trySetOwner(this.pendingGeneration)
+    }
+  }
+
   private enqueue(emission: PtyIngressEmission): void {
     this.queue.push(emission)
     this.queuedBytes += emission.data.length
diff --git a/src/main/daemon/terminal-snapshot-mouse-encoding.test.ts b/src/main/daemon/terminal-snapshot-mouse-encoding.test.ts
new file mode 100644
index 000000000000..0822aada4e19
--- /dev/null
+++ b/src/main/daemon/terminal-snapshot-mouse-encoding.test.ts
@@ -0,0 +1,162 @@
+// #23818: a restored pane must keep the mouse encoding (DECSET 1006/1016) with
+// the tracking mode, or it reports wheel events as legacy `ESC [ M` bytes that a
+// ConPTY host delivers to the app as typed text.
+import './xterm-env-polyfill'
+import { describe, expect, it } from 'vitest'
+import { Terminal } from '@xterm/headless'
+import { SerializeAddon } from '@xterm/addon-serialize'
+import { HeadlessEmulator } from './headless-emulator'
+import { serializeWithAbsoluteCursor } from '../../shared/terminal-serialize-absolute-cursor'
+import { readTerminalMouseEncoding } from '../../shared/terminal-mouse-encoding'
+
+const CODEX_FULLSCREEN_MODES = '\x1b[?1049h\x1b[?1000h\x1b[?1002h\x1b[?1003h\x1b[?1006h'
+const X10_WHEEL_UP_AT_10_5 = `\x1b[M${String.fromCharCode(96, 42, 37)}`
+const SGR_WHEEL_UP_AT_10_5 = '\x1b[<64;10;5M'
+
+function createTerminal(): { terminal: Terminal; addon: SerializeAddon } {
+  const terminal = new Terminal({ cols: 40, rows: 10, scrollback: 100, allowProposedApi: true })
+  const addon = new SerializeAddon()
+  terminal.loadAddon(addon)
+  return { terminal, addon }
+}
+
+function write(terminal: Terminal, data: string): Promise<void> {
+  return new Promise((resolve) => terminal.write(data, () => resolve()))
+}
+
+async function replay(data: string): Promise<Terminal> {
+  const { terminal } = createTerminal()
+  await write(terminal, data)
+  return terminal
+}
+
+type XtermCoreMouseEvent = {
+  col: number
+  row: number
+  x: number
+  y: number
+  button: number
+  action: number
+}
+
+/** xterm's private mouse state service: the encoder desktop viewers send reports through. */
+type XtermMouseStateService = {
+  areMouseEventsActive: boolean
+  encodeMouseEvent: (event: XtermCoreMouseEvent) => string
+}
+
+function isXtermMouseStateService(value: unknown): value is XtermMouseStateService {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    'areMouseEventsActive' in value &&
+    typeof value.areMouseEventsActive === 'boolean' &&
+    'encodeMouseEvent' in value &&
+    typeof value.encodeMouseEvent === 'function'
+  )
+}
+
+/** The report xterm's own encoder sends for a wheel-up, or null when tracking is off. */
+function wheelUpReport(terminal: Terminal): string | null {
+  const core = '_core' in terminal ? terminal._core : undefined
+  const service =
+    typeof core === 'object' && core !== null && 'mouseStateService' in core
+      ? core.mouseStateService
+      : undefined
+  if (!isXtermMouseStateService(service)) {
+    throw new Error('xterm mouse state service is unavailable')
+  }
+  if (!service.areMouseEventsActive) {
+    return null
+  }
+  return service.encodeMouseEvent({ col: 10, row: 5, x: 0, y: 0, button: 4, action: 0 })
+}
+
+describe('snapshot mouse encoding', () => {
+  it('the bare addon drops SGR encoding, so its restore reports X10 (the #23818 shape)', async () => {
+    const { terminal, addon } = createTerminal()
+    await write(terminal, `shell$ ${CODEX_FULLSCREEN_MODES}codex`)
+
+    const restored = await replay(addon.serialize())
+
+    expect(restored.modes.mouseTrackingMode).toBe('any')
+    expect(wheelUpReport(restored)).toBe(X10_WHEEL_UP_AT_10_5)
+  })
+
+  it('round-trips SGR encoding with the tracking mode, so the restore reports SGR', async () => {
+    const { terminal, addon } = createTerminal()
+    await write(terminal, `shell$ ${CODEX_FULLSCREEN_MODES}codex`)
+
+    const restored = await replay(serializeWithAbsoluteCursor(addon, terminal))
+
+    expect(restored.buffer.active.type).toBe('alternate')
+    expect(restored.modes.mouseTrackingMode).toBe('any')
+    expect(readTerminalMouseEncoding(restored)).toBe('sgr')
+    expect(wheelUpReport(restored)).toBe(SGR_WHEEL_UP_AT_10_5)
+  })
+
+  it('round-trips SGR-pixels encoding', async () => {
+    const { terminal, addon } = createTerminal()
+    await write(terminal, 'x\x1b[?1002h\x1b[?1016h')
+
+    const restored = await replay(serializeWithAbsoluteCursor(addon, terminal))
+
+    expect(restored.modes.mouseTrackingMode).toBe('drag')
+    expect(readTerminalMouseEncoding(restored)).toBe('sgr-pixels')
+  })
+
+  it('restores no mouse reports when tracking is off, even with SGR encoding armed', async () => {
+    const { terminal, addon } = createTerminal()
+    await write(terminal, 'x\x1b[?1003h\x1b[?1006h\x1b[?1003l')
+
+    const restored = await replay(serializeWithAbsoluteCursor(addon, terminal))
+
+    expect(restored.modes.mouseTrackingMode).toBe('none')
+    expect(wheelUpReport(restored)).toBeNull()
+  })
+
+  it('adds nothing for the default encoding or when modes are excluded', async () => {
+    const { terminal, addon } = createTerminal()
+    await write(terminal, 'x\x1b[?1000h')
+    const legacy = serializeWithAbsoluteCursor(addon, terminal)
+    expect(legacy).toContain('\x1b[?1000h')
+    expect(legacy).not.toContain('\x1b[?1006h')
+    expect(legacy).not.toContain('\x1b[?1016h')
+
+    await write(terminal, '\x1b[?1006h')
+    const excluded = serializeWithAbsoluteCursor(addon, terminal, { excludeModes: true })
+    expect(excluded).not.toContain('\x1b[?1006h')
+  })
+
+  it('carries the encoding from a renderer snapshot through a headless seed to its snapshot', async () => {
+    // Why: the runtime seeds its headless model from the desktop pane's snapshot, and
+    // mobile keeps only what follows the last `?1049h` of that model's snapshot.
+    const { terminal, addon } = createTerminal()
+    await write(terminal, `shell$ ${CODEX_FULLSCREEN_MODES}codex`)
+    const emulator = new HeadlessEmulator({ cols: 40, rows: 10 })
+    await emulator.write(serializeWithAbsoluteCursor(addon, terminal))
+
+    const snapshot = emulator.getSnapshot()
+    const data = snapshot.rehydrateSequences + snapshot.snapshotAnsi
+    const mobileReplay = data.slice(data.lastIndexOf('\x1b[?1049h'))
+
+    expect(snapshot.modes.mouseTrackingMode).toBe('any')
+    expect(snapshot.modes.sgrMouseMode).toBe(true)
+    expect(mobileReplay).toContain('\x1b[?1003h')
+    expect(mobileReplay).toContain('\x1b[?1006h')
+    expect(wheelUpReport(await replay(data))).toBe(SGR_WHEEL_UP_AT_10_5)
+    emulator.dispose()
+  })
+
+  it('a snapshot from an older host without the encoding restores as before', async () => {
+    const emulator = new HeadlessEmulator({ cols: 40, rows: 10 })
+    await emulator.write('\x1b[?1049h\x1b[?1003hcodex')
+
+    const snapshot = emulator.getSnapshot()
+
+    expect(snapshot.modes.mouseTrackingMode).toBe('any')
+    expect(snapshot.modes.sgrMouseMode).toBe(false)
+    expect(snapshot.rehydrateSequences).not.toContain('\x1b[?1006h')
+    emulator.dispose()
+  })
+})
diff --git a/src/main/daemon/types.ts b/src/main/daemon/types.ts
index d8d88fab0333..2ef4dfeb117a 100644
--- a/src/main/daemon/types.ts
+++ b/src/main/daemon/types.ts
@@ -206,9 +206,10 @@ export type GetCwdRequest = {
   }
 }
 
-export type ClearScrollbackRequest = {
+// Why resetInputModes is a type, not a clear flag: an older daemon rejects it instead of clearing.
+export type TerminalBufferActionRequest = {
   id: string
-  type: 'clearScrollback'
+  type: 'clearScrollback' | 'resetInputModes'
   payload: {
     sessionId: string
   }
@@ -321,7 +322,7 @@ export type DaemonRequest =
   | InspectProcessRequest
   | ConfirmForegroundProcessRequest
   | ConfirmShellForegroundRequest
-  | ClearScrollbackRequest
+  | TerminalBufferActionRequest
   | ShutdownRequest
   | PingRequest
   | SystemResolverHealthRequest
diff --git a/src/main/dsh/dsh-home-patch.test.ts b/src/main/dsh/dsh-home-patch.test.ts
new file mode 100644
index 000000000000..53ab8986715b
--- /dev/null
+++ b/src/main/dsh/dsh-home-patch.test.ts
@@ -0,0 +1,147 @@
+import { describe, expect, it } from 'vitest'
+import {
+  applyManagedDshPatch,
+  findManagedDshPatchRegion,
+  readManagedDshHooksConfigPath,
+  removeManagedDshPatch
+} from './dsh-home-patch'
+
+const HOOKS_PATH = '/home/dev/.orca/agent-hooks/dsh-hooks.json'
+
+/** applyManagedDshPatch returns null only for files it refuses to edit; these cases expect an edit. */
+function applyOrFail(text: string, hooksPath = HOOKS_PATH): string {
+  const next = applyManagedDshPatch(text, hooksPath)
+  if (next === null) {
+    throw new Error('expected the patch file to be editable')
+  }
+  return next
+}
+
+// The body DSH writes into a freshly initialized patch file.
+const PRISTINE = [
+  '# Your patch layer for this dsh profile, applied after every bundle layer:',
+  '# a top-level YAML array of loader patch entries (id-targeted config',
+  '# overrides, disables, and insert lists; `!!js` expressions allowed).',
+  '[]',
+  ''
+].join('\n')
+
+const USER_ROWS = ['- id: llm-deepseek', '  config:', "    apiKeyEnv: 'MY_KEY'", ''].join('\n')
+
+describe('applyManagedDshPatch', () => {
+  it('creates the managed block in an empty file', () => {
+    const text = applyOrFail('')
+    expect(readManagedDshHooksConfigPath(text)).toBe(HOOKS_PATH)
+    expect(text).toContain("name: '@deepseek-ai/dsh-hooks-claude-code'")
+    expect(text.endsWith('\n')).toBe(true)
+  })
+
+  it('replaces the empty flow sequence DSH ships, keeping its comments', () => {
+    const text = applyOrFail(PRISTINE)
+    // `- item` after `[]` is a YAML parse error, so the `[]` token has to go.
+    expect(text).not.toMatch(/^\[]$/m)
+    expect(text).toContain('# Your patch layer for this dsh profile')
+    expect(readManagedDshHooksConfigPath(text)).toBe(HOOKS_PATH)
+  })
+
+  it('appends after user rows without touching them', () => {
+    const text = applyOrFail(USER_ROWS)
+    expect(text.startsWith(USER_ROWS.trimEnd())).toBe(true)
+    expect(readManagedDshHooksConfigPath(text)).toBe(HOOKS_PATH)
+  })
+
+  it('rewrites its own block in place rather than stacking copies', () => {
+    const once = applyOrFail(USER_ROWS, '/old/path.json')
+    const twice = applyOrFail(once)
+    expect(twice.match(/orca-managed-dsh-hooks \(managed by Orca/g)).toHaveLength(1)
+    expect(readManagedDshHooksConfigPath(twice)).toBe(HOOKS_PATH)
+    expect(twice).not.toContain('/old/path.json')
+  })
+
+  it('is idempotent', () => {
+    const once = applyOrFail(PRISTINE)
+    expect(applyOrFail(once)).toBe(once)
+  })
+
+  it('treats `[] # comment` as the empty document it is, keeping the comment', () => {
+    // The exact-match check missed this and appended `- insert:` after the flow sequence.
+    const text = '[] # keep empty\n'
+    const next = applyOrFail(text)
+    expect(next).not.toMatch(/^\s*\[]/m)
+    expect(next).toContain('# keep empty')
+    expect(readManagedDshHooksConfigPath(next)).toBe(HOOKS_PATH)
+  })
+
+  it.each([
+    '- id: llm-deepseek\n  config: {}\n', // block sequence — editable
+    '\n',
+    '# only a comment\n'
+  ])('still edits %j', (text) => {
+    expect(applyManagedDshPatch(text, HOOKS_PATH)).not.toBeNull()
+  })
+
+  it.each(['[{ id: llm-deepseek }]\n', '[\n  { id: a },\n  { id: b }\n]\n'])(
+    'refuses to append after the non-empty flow sequence %j',
+    (text) => {
+      // YAML forbids a block entry after a flow sequence: appending would leave DSH unable
+      // to parse the user's own layer either, so there is no safe in-place edit.
+      expect(applyManagedDshPatch(text, HOOKS_PATH)).toBeNull()
+    }
+  )
+
+  it('quotes a path containing a single quote', () => {
+    const awkward = "/home/o'brien/.orca/agent-hooks/dsh-hooks.json"
+    expect(readManagedDshHooksConfigPath(applyOrFail('', awkward))).toBe(awkward)
+  })
+})
+
+describe('removeManagedDshPatch', () => {
+  it('restores the empty flow sequence when nothing else remains', () => {
+    const installed = applyOrFail(PRISTINE)
+    const { text, changed } = removeManagedDshPatch(installed)
+    expect(changed).toBe(true)
+    // Without this the file would come back as an unparseable empty document.
+    expect(text.trimEnd().endsWith('[]')).toBe(true)
+    expect(text).toContain('# Your patch layer for this dsh profile')
+  })
+
+  it('leaves user rows alone and adds no [] when they remain', () => {
+    const installed = applyOrFail(USER_ROWS)
+    const { text } = removeManagedDshPatch(installed)
+    expect(text.trimEnd()).toBe(USER_ROWS.trimEnd())
+  })
+
+  it('reports no change when the file carries no managed block', () => {
+    expect(removeManagedDshPatch(USER_ROWS)).toEqual({ text: USER_ROWS, changed: false })
+  })
+})
+
+describe('findManagedDshPatchRegion', () => {
+  const ORPHAN_START = '# >>> orca-managed-dsh-hooks (managed by Orca; do not edit) >>>'
+
+  it('fails closed on a truncated region rather than guessing its extent', () => {
+    // Splicing a guessed end marker would delete the user rows that follow.
+    const truncated = `${ORPHAN_START}\n${USER_ROWS}`
+    expect(findManagedDshPatchRegion(truncated)).toBeNull()
+    expect(removeManagedDshPatch(truncated).changed).toBe(false)
+  })
+
+  it('never pairs an orphan start with a later block\u2019s end', () => {
+    // The data-loss shape: an interrupted write leaves an orphan start above the user's
+    // rows, and the next install appends a complete block below them. Pairing the orphan
+    // with the new end marker would make the region cover the user's rows, so install
+    // (rewrite) and remove (strip) would both delete them.
+    const truncated = `${ORPHAN_START}\n${USER_ROWS}`
+    const installed = applyOrFail(truncated)
+    expect(installed).toContain('apiKeyEnv')
+
+    const region = findManagedDshPatchRegion(installed)
+    expect(region).not.toBeNull()
+    const covered = installed.split('\n').slice(region?.startLine ?? 0, (region?.endLine ?? 0) + 1)
+    expect(covered.join('\n')).not.toContain('apiKeyEnv')
+
+    // Both mutating paths must leave the user's rows intact, twice over.
+    expect(applyOrFail(installed)).toContain('apiKeyEnv')
+    expect(removeManagedDshPatch(installed).text).toContain('apiKeyEnv')
+  })
+})
diff --git a/src/main/dsh/dsh-home-patch.ts b/src/main/dsh/dsh-home-patch.ts
new file mode 100644
index 000000000000..723d030e214b
--- /dev/null
+++ b/src/main/dsh/dsh-home-patch.ts
@@ -0,0 +1,195 @@
+/**
+ * Orca's managed block inside `$DSH_HOME/cordis.patch.yml`.
+ *
+ * That file is a hand-editable top-level YAML sequence of loader patch entries, and no
+ * YAML library is vendored in the main process, so Orca manages only its own
+ * marker-delimited region: install rewrites the region, remove strips it, and everything
+ * outside the markers is copied through byte for byte. Appending sequence entries to a
+ * block sequence is always valid YAML, so the region can live at the end of any file.
+ *
+ * The one shape that is not append-safe is an empty *flow* sequence (`[]`), which is what
+ * DSH writes into a freshly initialized patch file. `- item` after `[]` is a parse error,
+ * so that token is dropped when the managed block is added and restored when it is the
+ * last thing removed — otherwise the file would come back as an unparseable empty
+ * document.
+ */
+
+const START_MARKER = '# >>> orca-managed-dsh-hooks (managed by Orca; do not edit) >>>'
+const END_MARKER = '# <<< orca-managed-dsh-hooks <<<'
+
+/** The loader row id Orca owns. A patch row is addressed by id, so this must be stable. */
+const MANAGED_ROW_ID = 'orca-agent-hooks'
+
+const EMPTY_FLOW_SEQUENCE = '[]'
+
+export type ManagedDshPatchRegion = { startLine: number; endLine: number }
+
+function splitLines(text: string): string[] {
+  return text.split('\n')
+}
+
+/** Locate the managed region, or null when the file carries none. */
+export function findManagedDshPatchRegion(text: string): ManagedDshPatchRegion | null {
+  // Why the NEAREST preceding start, not the first one: an interrupted write can leave an
+  // orphan start marker with no end. Pairing that orphan with a LATER block's end marker
+  // makes the region swallow every row in between — so the next install (which rewrites the
+  // region) or remove (which strips it) would delete the user's own rows. Walking forward
+  // and resetting the candidate on each start keeps an orphan un-paired, which leaves it as
+  // an inert comment line rather than a deletion range.
+  let startLine = -1
+  for (const [index, line] of splitLines(text).entries()) {
+    const trimmed = line.trim()
+    if (trimmed === START_MARKER) {
+      startLine = index
+    } else if (trimmed === END_MARKER && startLine !== -1) {
+      return { startLine, endLine: index }
+    }
+  }
+  return null
+}
+
+function buildManagedBlock(managedHooksPath: string): string[] {
+  return [
+    START_MARKER,
+    '- insert:',
+    `    - id: ${MANAGED_ROW_ID}`,
+    "      name: '@deepseek-ai/dsh-hooks-claude-code'",
+    '      config:',
+    `        configPath: ${quoteYamlScalar(managedHooksPath)}`,
+    END_MARKER
+  ]
+}
+
+/** Single-quoted YAML scalar: the only escape inside one is a doubled quote. */
+function quoteYamlScalar(value: string): string {
+  return `'${value.replaceAll("'", "''")}'`
+}
+
+function unquoteYamlScalar(value: string): string {
+  const trimmed = value.trim()
+  if (trimmed.startsWith("'") && trimmed.endsWith("'") && trimmed.length >= 2) {
+    return trimmed.slice(1, -1).replaceAll("''", "'")
+  }
+  if (trimmed.startsWith('"') && trimmed.endsWith('"') && trimmed.length >= 2) {
+    return trimmed.slice(1, -1)
+  }
+  return trimmed
+}
+
+/** The `configPath` Orca's managed region currently points at, if any. */
+export function readManagedDshHooksConfigPath(text: string): string | undefined {
+  const region = findManagedDshPatchRegion(text)
+  if (!region) {
+    return undefined
+  }
+  for (const line of splitLines(text).slice(region.startLine + 1, region.endLine)) {
+    const match = /^\s*configPath:\s*(.+?)\s*$/.exec(line)
+    if (match) {
+      return unquoteYamlScalar(match[1])
+    }
+  }
+  return undefined
+}
+
+function stripRegion(lines: string[], region: ManagedDshPatchRegion): string[] {
+  return [...lines.slice(0, region.startLine), ...lines.slice(region.endLine + 1)]
+}
+
+function isBlank(line: string): boolean {
+  return line.trim().length === 0
+}
+
+function isComment(line: string): boolean {
+  return line.trim().startsWith('#')
+}
+
+function documentBody(lines: readonly string[]): readonly string[] {
+  return lines.filter((line) => !isBlank(line) && !isComment(line))
+}
+
+/** Strips a trailing `# …` so `[] # keep empty` reads as the empty sequence it is. */
+function withoutTrailingComment(line: string): string {
+  const hash = line.indexOf('#')
+  return (hash === -1 ? line : line.slice(0, hash)).trim()
+}
+
+/** True when the body is the empty flow sequence, with or without a trailing comment. */
+function isEmptyFlowDocument(lines: readonly string[]): boolean {
+  const body = documentBody(lines)
+  return body.length === 1 && withoutTrailingComment(body[0]) === EMPTY_FLOW_SEQUENCE
+}
+
+/**
+ * True when Orca cannot append its block to this file: the body is a NON-EMPTY flow
+ * sequence (`[a, b]`, or one spread over lines).
+ *
+ * Why it matters: YAML forbids a block entry after a flow sequence, so appending Orca's
+ * `- insert:` would produce a file DSH cannot parse — losing the user's own patch layer as
+ * well as Orca's hooks. There is no safe in-place edit, so install refuses instead.
+ *
+ * Exported because status has to report the same refusal on every read, not just on the
+ * install that first hit it.
+ */
+export function isDshPatchFileUnappendable(text: string): boolean {
+  const lines = splitLines(text)
+  const body = documentBody(lines)
+  return body.length > 0 && body[0].trimStart().startsWith('[') && !isEmptyFlowDocument(lines)
+}
+
+function withoutTrailingBlanks(lines: readonly string[]): readonly string[] {
+  const end = lines.findLastIndex((line) => !isBlank(line))
+  return lines.slice(0, end + 1)
+}
+
+function joinPreservingTrailingNewline(lines: readonly string[]): string {
+  const text = lines.join('\n')
+  return text.endsWith('\n') || text.length === 0 ? text : `${text}\n`
+}
+
+/**
+ * Install (or refresh) Orca's managed region so the DSH hook bridge reads
+ * `managedHooksPath`. Everything outside the markers is preserved.
+ *
+ * Returns null when the file cannot be edited safely — see isNonEmptyFlowDocument. The
+ * caller reports that; it must never write a file DSH would then fail to parse.
+ */
+export function applyManagedDshPatch(text: string, managedHooksPath: string): string | null {
+  const lines = splitLines(text)
+  const block = buildManagedBlock(managedHooksPath)
+  const region = findManagedDshPatchRegion(text)
+  if (region) {
+    return joinPreservingTrailingNewline([
+      ...lines.slice(0, region.startLine),
+      ...block,
+      ...lines.slice(region.endLine + 1)
+    ])
+  }
+  if (isDshPatchFileUnappendable(text)) {
+    return null
+  }
+  // Why dropped: `- item` after `[]` is a parse error, and an empty sequence has nothing to
+  // preserve. Only the token goes — a trailing comment on that line stays.
+  const kept = isEmptyFlowDocument(lines)
+    ? lines.map((line) =>
+        withoutTrailingComment(line) === EMPTY_FLOW_SEQUENCE
+          ? line.slice(line.indexOf(EMPTY_FLOW_SEQUENCE) + EMPTY_FLOW_SEQUENCE.length)
+          : line
+      )
+    : lines
+  return joinPreservingTrailingNewline([...withoutTrailingBlanks(kept), ...block])
+}
+
+/** Strip Orca's managed region, restoring `[]` when nothing else is left. */
+export function removeManagedDshPatch(text: string): { text: string; changed: boolean } {
+  const region = findManagedDshPatchRegion(text)
+  if (!region) {
+    return { text, changed: false }
+  }
+  const kept = withoutTrailingBlanks(stripRegion(splitLines(text), region))
+  // Why restore `[]`: a document of comments alone is not a valid entry list, so removing
+  // Orca's block must not leave DSH a file it cannot parse.
+  const body = kept.every((line) => isBlank(line) || isComment(line))
+    ? [...kept, EMPTY_FLOW_SEQUENCE]
+    : kept
+  return { text: joinPreservingTrailingNewline(body), changed: true }
+}
diff --git a/src/main/dsh/hook-service.test.ts b/src/main/dsh/hook-service.test.ts
new file mode 100644
index 000000000000..331ecd978888
--- /dev/null
+++ b/src/main/dsh/hook-service.test.ts
@@ -0,0 +1,200 @@
+import {
+  chmodSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  statSync,
+  writeFileSync
+} from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { DshHookService } from './hook-service'
+import { DSH_HOOK_EVENTS } from './hook-settings'
+
+// Why: getSharedManagedScriptPath() writes under homedir()/.orca and the patch layer
+// resolves via DSH_HOME ?? ~/.dsh. Point the home env at a temp dir and clear DSH_HOME so
+// install/remove never touches the real ~/.orca or a developer's own DSH home.
+// Why both names: os.homedir() reads $HOME on POSIX and %USERPROFILE% on Windows, and this
+// file asserts the Windows script name too — setting only HOME would let a Windows run edit
+// the developer's real home.
+let home: string
+let originalHome: string | undefined
+let originalUserProfile: string | undefined
+let originalDshHome: string | undefined
+
+beforeEach(() => {
+  home = mkdtempSync(join(tmpdir(), 'orca-dsh-hook-'))
+  originalHome = process.env.HOME
+  originalUserProfile = process.env.USERPROFILE
+  originalDshHome = process.env.DSH_HOME
+  process.env.HOME = home
+  process.env.USERPROFILE = home
+  delete process.env.DSH_HOME
+})
+
+afterEach(() => {
+  if (originalHome === undefined) {
+    delete process.env.HOME
+  } else {
+    process.env.HOME = originalHome
+  }
+  if (originalUserProfile === undefined) {
+    delete process.env.USERPROFILE
+  } else {
+    process.env.USERPROFILE = originalUserProfile
+  }
+  if (originalDshHome === undefined) {
+    delete process.env.DSH_HOME
+  } else {
+    process.env.DSH_HOME = originalDshHome
+  }
+  rmSync(home, { recursive: true, force: true })
+})
+
+const configPath = (): string => join(home, '.dsh', 'cordis.patch.yml')
+const managedHooksPath = (): string => join(home, '.orca', 'agent-hooks', 'dsh-hooks.json')
+const scriptPath = (): string =>
+  join(home, '.orca', 'agent-hooks', process.platform === 'win32' ? 'dsh-hook.cmd' : 'dsh-hook.sh')
+
+function readManagedHooks(): { hooks: Record<string, unknown[]> } {
+  const parsed: { hooks: Record<string, unknown[]> } = JSON.parse(
+    readFileSync(managedHooksPath(), 'utf-8')
+  )
+  return parsed
+}
+
+describe('DshHookService', () => {
+  it('reports not_installed before install, with no DSH home on disk', () => {
+    expect(new DshHookService().getStatus().state).toBe('not_installed')
+  })
+
+  it('installs the patch block, the managed hooks file, and the script', () => {
+    const status = new DshHookService().install()
+    expect(status.state).toBe('installed')
+    expect(status.managedHooksPresent).toBe(true)
+    expect(status.configPath).toBe(configPath())
+
+    const patch = readFileSync(configPath(), 'utf-8')
+    expect(patch).toContain("name: '@deepseek-ai/dsh-hooks-claude-code'")
+    expect(patch).toContain(`configPath: '${managedHooksPath()}'`)
+
+    // Exactly the events DSH's bridge can fire — registering more would register nothing
+    // for them and leave the status permanently `partial`.
+    expect(Object.keys(readManagedHooks().hooks).sort()).toEqual([...DSH_HOOK_EVENTS].sort())
+    expect(readFileSync(scriptPath(), 'utf-8').length).toBeGreaterThan(0)
+  })
+
+  it('posts to the dsh hook route', () => {
+    new DshHookService().install()
+    expect(readFileSync(scriptPath(), 'utf-8')).toContain('/hook/dsh')
+  })
+
+  it('restores the pane identity DSH scrubs before anything reads it', () => {
+    // DSH drops env names containing KEY/TOKEN, so the script has to recover ORCA_PANE_KEY
+    // and ORCA_AGENT_LAUNCH_TOKEN from their aliases before the guard or the spool run.
+    new DshHookService().install()
+    const script = readFileSync(scriptPath(), 'utf-8')
+    const restoreAt = script.indexOf('ORCA_AGENT_PANE')
+    const guardAt = script.indexOf('ORCA_AGENT_HOOK_PORT')
+    expect(restoreAt).toBeGreaterThan(-1)
+    expect(script).toContain('ORCA_AGENT_LAUNCH')
+    expect(restoreAt).toBeLessThan(guardAt)
+  })
+
+  it('is idempotent', () => {
+    const service = new DshHookService()
+    service.install()
+    const first = readFileSync(configPath(), 'utf-8')
+    expect(service.install().state).toBe('installed')
+    expect(readFileSync(configPath(), 'utf-8')).toBe(first)
+  })
+
+  it('preserves an existing user patch layer through install and remove', () => {
+    const userRows = ['- id: llm-deepseek', '  config:', '    thinking: disabled', ''].join('\n')
+    mkdirSync(join(home, '.dsh'), { recursive: true })
+    writeFileSync(configPath(), userRows, 'utf-8')
+
+    const service = new DshHookService()
+    expect(service.install().state).toBe('installed')
+    expect(readFileSync(configPath(), 'utf-8')).toContain('thinking: disabled')
+
+    expect(service.remove().state).toBe('not_installed')
+    expect(readFileSync(configPath(), 'utf-8').trimEnd()).toBe(userRows.trimEnd())
+  })
+
+  it('removes the managed hooks file along with the block', () => {
+    const service = new DshHookService()
+    service.install()
+    service.remove()
+    expect(() => readFileSync(managedHooksPath(), 'utf-8')).toThrow()
+    expect(service.getStatus().state).toBe('not_installed')
+  })
+
+  it('reports partial when an event loses its managed hook', () => {
+    const service = new DshHookService()
+    service.install()
+    const managed = readManagedHooks()
+    delete managed.hooks.Stop
+    writeFileSync(managedHooksPath(), JSON.stringify(managed, null, 2), 'utf-8')
+
+    const status = service.getStatus()
+    expect(status.state).toBe('partial')
+    expect(status.detail).toContain('Stop')
+  })
+
+  it('reports not_installed when the block points somewhere else', () => {
+    const service = new DshHookService()
+    service.install()
+    writeFileSync(
+      configPath(),
+      readFileSync(configPath(), 'utf-8').replace(managedHooksPath(), '/somewhere/else.json'),
+      'utf-8'
+    )
+    const status = service.getStatus()
+    expect(status.state).toBe('not_installed')
+    expect(status.detail).toContain('/somewhere/else.json')
+  })
+
+  // Why POSIX-only: on Windows chmod toggles the read-only attribute, so `mode & 0o777`
+  // reads 0o666 for any writable file and the assertion cannot mean what it says.
+  it.skipIf(process.platform === 'win32')('keeps an owner-only patch file owner-only', () => {
+    // CWE-732: the temp+rename replacement must not widen the file to the umask default.
+    const userRows = '- id: llm-deepseek\n  config: {}\n'
+    mkdirSync(join(home, '.dsh'), { recursive: true })
+    writeFileSync(configPath(), userRows, 'utf-8')
+    chmodSync(configPath(), 0o600)
+
+    expect(new DshHookService().install().state).toBe('installed')
+    expect(statSync(configPath()).mode & 0o777).toBe(0o600)
+  })
+
+  it('refuses a flow-style patch file instead of corrupting it', () => {
+    // Appending a block entry after `[…]` is invalid YAML — DSH would then fail to load the
+    // user's own layer as well as Orca's hooks, so install must change nothing.
+    const flow = '[{ id: llm-deepseek }]\n'
+    mkdirSync(join(home, '.dsh'), { recursive: true })
+    writeFileSync(configPath(), flow, 'utf-8')
+
+    const service = new DshHookService()
+    const installed = service.install()
+    expect(installed.state).toBe('error')
+    expect(installed.detail).toContain('flow-style sequence')
+    expect(readFileSync(configPath(), 'utf-8')).toBe(flow)
+
+    // Why re-read: a later status poll must keep saying why, not decay to a bare
+    // `not_installed` that gives the user nothing to act on.
+    const polled = service.getStatus()
+    expect(polled.state).toBe('error')
+    expect(polled.detail).toContain('flow-style sequence')
+  })
+
+  it('honours DSH_HOME', () => {
+    const dshHome = join(home, 'custom-dsh-home')
+    process.env.DSH_HOME = dshHome
+    const status = new DshHookService().install()
+    expect(status.configPath).toBe(join(dshHome, 'cordis.patch.yml'))
+    expect(status.state).toBe('installed')
+  })
+})
diff --git a/src/main/dsh/hook-service.ts b/src/main/dsh/hook-service.ts
new file mode 100644
index 000000000000..0767f686f242
--- /dev/null
+++ b/src/main/dsh/hook-service.ts
@@ -0,0 +1,253 @@
+import { mkdirSync, readFileSync, rmSync } from 'node:fs'
+import { dirname } from 'node:path'
+import type { SFTPWrapper } from 'ssh2'
+
+import type { AgentHookInstallState, AgentHookInstallStatus } from '../../shared/agent-hook-types'
+import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence'
+import {
+  buildWindowsAgentHookCurlPostCommand,
+  writeHooksJson,
+  writeManagedScript
+} from '../agent-hooks/installer-utils'
+import { refreshManagedScriptIfPresent } from '../agent-hooks/managed-hook-script-refresh'
+import {
+  readTextFileRemote,
+  writeManagedScriptRemote,
+  writeTextFileRemoteAtomic
+} from '../agent-hooks/installer-utils-remote'
+import {
+  buildPosixHookPayloadCapture,
+  buildPosixHookSpoolLines,
+  buildWindowsHookEnvironmentGuardLines,
+  buildWindowsHookStdinDrainEpilogue
+} from '../agent-hooks/hook-stdin-contract'
+import { buildPosixAgentHookPostCommand } from '../agent-hooks/hook-post-command'
+import {
+  applyManagedDshPatch,
+  isDshPatchFileUnappendable,
+  readManagedDshHooksConfigPath,
+  removeManagedDshPatch
+} from './dsh-home-patch'
+import {
+  buildDshManagedHooksFile,
+  DSH_HOOK_EVENTS,
+  getDshConfigPath,
+  getDshManagedCommand,
+  getDshManagedCommandMatcher,
+  getDshManagedHooksPath,
+  getDshManagedScriptPath,
+  getDshRemoteConfigPath,
+  getDshRemoteManagedCommand,
+  getDshRemoteManagedHooksPath,
+  readManagedDshHookEvents
+} from './hook-settings'
+
+function getManagedScript(target: 'local' | 'posix' = 'local'): string {
+  if (target === 'local' && process.platform === 'win32') {
+    return [
+      '@echo off',
+      'setlocal',
+      // Why: same scrub as POSIX — restore the canonical names from their aliases first.
+      'if not defined ORCA_PANE_KEY if defined ORCA_AGENT_PANE set "ORCA_PANE_KEY=%ORCA_AGENT_PANE%"',
+      'if not defined ORCA_AGENT_LAUNCH_TOKEN if defined ORCA_AGENT_LAUNCH set "ORCA_AGENT_LAUNCH_TOKEN=%ORCA_AGENT_LAUNCH%"',
+      'if defined ORCA_AGENT_HOOK_ENDPOINT if exist "%ORCA_AGENT_HOOK_ENDPOINT%" call "%ORCA_AGENT_HOOK_ENDPOINT%" 2>nul',
+      ...buildWindowsHookEnvironmentGuardLines(),
+      buildWindowsAgentHookCurlPostCommand('dsh'),
+      'exit /b 0',
+      ...buildWindowsHookStdinDrainEpilogue(),
+      ''
+    ].join('\r\n')
+  }
+
+  return [
+    '#!/bin/sh',
+    // Why first: DSH's shell executor drops every env var whose NAME contains KEY, TOKEN,
+    // SECRET or PASSWORD before the hook starts, which takes ORCA_PANE_KEY and
+    // ORCA_AGENT_LAUNCH_TOKEN with it. Orca mirrors both onto scrub-safe aliases at spawn
+    // (see agent-hook-scrub-safe-env.ts); restore the canonical names from them so every
+    // line below — including the shared spool and post builders — is unchanged.
+    ': "${ORCA_PANE_KEY:=${ORCA_AGENT_PANE:-}}"',
+    ': "${ORCA_AGENT_LAUNCH_TOKEN:=${ORCA_AGENT_LAUNCH:-}}"',
+    'export ORCA_PANE_KEY ORCA_AGENT_LAUNCH_TOKEN',
+    ...buildPosixHookPayloadCapture(),
+    ...buildPosixHookSpoolLines('dsh'),
+    // Why: the endpoint file holds the live port/token; a PTY that outlived an Orca
+    // restart carries stale env, so source it to reach the new server.
+    'if [ -n "$ORCA_AGENT_HOOK_ENDPOINT" ] && [ -r "$ORCA_AGENT_HOOK_ENDPOINT" ]; then',
+    '  . "$ORCA_AGENT_HOOK_ENDPOINT" 2>/dev/null || :',
+    'fi',
+    'if [ -z "$ORCA_AGENT_HOOK_PORT" ] || [ -z "$ORCA_AGENT_HOOK_TOKEN" ] || [ -z "$ORCA_PANE_KEY" ]; then',
+    '  spool_hook_event',
+    '  exit 0',
+    'fi',
+    ...buildPosixAgentHookPostCommand('dsh').map((line, index, lines) =>
+      index === lines.length - 1 ? `${line} >/dev/null 2>&1 || spool_hook_event` : line
+    ),
+    'exit 0',
+    ''
+  ].join('\n')
+}
+
+/** '' when the file is absent (both are created lazily), null when it exists but cannot be read. */
+function readTextOrAbsent(path: string): string | null {
+  try {
+    return readFileSync(path, 'utf-8')
+  } catch (error) {
+    return isDefinitiveAbsence(error) ? '' : null
+  }
+}
+
+/** null for anything that is not parseable JSON; the caller reads that as "no events". */
+function parseJsonOrNull(text: string): unknown {
+  try {
+    return JSON.parse(text)
+  } catch {
+    return null
+  }
+}
+
+function writePatchText(configPath: string, text: string): void {
+  mkdirSync(dirname(configPath), { recursive: true })
+  // Why writeHooksJson: it owns the temp+rename and the rolling .bak this file needs too.
+  // Why preserveMode: an owner-only patch file must not widen to the umask default on rewrite.
+  writeHooksJson(configPath, {}, { serialized: text, preserveMode: true })
+}
+
+/** Why one constant: status has to say exactly what install said, on every later read. */
+const FLOW_STYLE_DETAIL =
+  'The DSH home patch is a flow-style sequence ([…]); rewrite it as a block sequence (one `- ` entry per line) so Orca can add its hooks without breaking it'
+
+function status(
+  configPath: string,
+  state: AgentHookInstallState,
+  detail: string | null,
+  managedHooksPresent = false
+): AgentHookInstallStatus {
+  return { agent: 'dsh', state, configPath, managedHooksPresent, detail }
+}
+
+function buildStatus(
+  patchText: string,
+  managedHooksPath: string,
+  managedText: string | null,
+  configPath: string
+): AgentHookInstallStatus {
+  if (managedText === null) {
+    return status(configPath, 'error', 'Could not read Orca managed hooks file')
+  }
+  // Why before the pointer check: a refused file carries no managed region, so the pointer
+  // path would report a bare `not_installed` and drop the one detail that says why.
+  if (isDshPatchFileUnappendable(patchText)) {
+    return status(configPath, 'error', FLOW_STYLE_DETAIL)
+  }
+  const pointer = readManagedDshHooksConfigPath(patchText)
+  if (pointer !== managedHooksPath) {
+    return status(
+      configPath,
+      'not_installed',
+      pointer === undefined
+        ? null
+        : `The Orca patch block points at ${pointer}, not the Orca managed hooks file`
+    )
+  }
+  const present = readManagedDshHookEvents(
+    parseJsonOrNull(managedText),
+    getDshManagedCommandMatcher()
+  )
+  const missing = DSH_HOOK_EVENTS.filter((event) => !present.has(event))
+  if (missing.length === 0) {
+    return status(configPath, 'installed', null, true)
+  }
+  // Why the split: nothing present is an uninstalled agent; some present is a broken install,
+  // and naming the gap is the only way a user can tell those apart.
+  return present.size === 0
+    ? status(configPath, 'not_installed', null)
+    : status(configPath, 'partial', `Managed hook missing for events: ${missing.join(', ')}`, true)
+}
+
+/** Installs Orca's status hooks into DSH. See `docs/reference/dsh-harness-integration.md`
+ *  for the profile/patch-layer model and the env-scrub finding the aliases work around. */
+export class DshHookService {
+  async refreshManagedScripts(): Promise<void> {
+    await refreshManagedScriptIfPresent(getDshManagedScriptPath(), getManagedScript())
+  }
+
+  getStatus(): AgentHookInstallStatus {
+    const configPath = getDshConfigPath()
+    const patchText = readTextOrAbsent(configPath)
+    if (patchText === null) {
+      return status(configPath, 'error', 'Could not read the DSH home patch file')
+    }
+    const managedHooksPath = getDshManagedHooksPath()
+    return buildStatus(patchText, managedHooksPath, readTextOrAbsent(managedHooksPath), configPath)
+  }
+
+  install(): AgentHookInstallStatus {
+    const configPath = getDshConfigPath()
+    const patchText = readTextOrAbsent(configPath)
+    if (patchText === null) {
+      return status(configPath, 'error', 'Could not read the DSH home patch file')
+    }
+    const scriptPath = getDshManagedScriptPath()
+    const managedHooksPath = getDshManagedHooksPath()
+    // Write the script and the managed hooks file first so the patch layer never points at
+    // files that do not exist yet — a bridge that cannot read its config runs no hooks.
+    writeManagedScript(scriptPath, getManagedScript())
+    writeHooksJson(
+      managedHooksPath,
+      { hooks: {} },
+      { serialized: buildDshManagedHooksFile(getDshManagedCommand(scriptPath)) }
+    )
+    const nextText = applyManagedDshPatch(patchText, managedHooksPath)
+    if (nextText === null) {
+      // Why refuse rather than edit: YAML forbids a block entry after a flow sequence, so
+      // appending here would leave DSH unable to parse the user's own patch layer either.
+      return status(configPath, 'error', FLOW_STYLE_DETAIL)
+    }
+    if (nextText !== patchText) {
+      writePatchText(configPath, nextText)
+    }
+    return this.getStatus()
+  }
+
+  /** Install on an SSH execution host, where DSH's shell contract is always POSIX. */
+  async installRemote(sftp: SFTPWrapper, remoteHome: string): Promise<AgentHookInstallStatus> {
+    const remoteConfigPath = getDshRemoteConfigPath(remoteHome)
+    const remoteScriptPath = `${remoteHome.replace(/\/$/, '')}/.orca/agent-hooks/dsh-hook.sh`
+    const remoteManagedHooksPath = getDshRemoteManagedHooksPath(remoteHome)
+    try {
+      const body = (await readTextFileRemote(sftp, remoteConfigPath)) ?? ''
+      await writeManagedScriptRemote(sftp, remoteScriptPath, getManagedScript('posix'))
+      await writeTextFileRemoteAtomic(
+        sftp,
+        remoteManagedHooksPath,
+        buildDshManagedHooksFile(getDshRemoteManagedCommand(remoteScriptPath))
+      )
+      const nextText = applyManagedDshPatch(body, remoteManagedHooksPath)
+      if (nextText === null) {
+        return status(remoteConfigPath, 'error', FLOW_STYLE_DETAIL)
+      }
+      await writeTextFileRemoteAtomic(sftp, remoteConfigPath, nextText)
+      return status(remoteConfigPath, 'installed', null, true)
+    } catch (err) {
+      return status(remoteConfigPath, 'error', err instanceof Error ? err.message : String(err))
+    }
+  }
+
+  remove(): AgentHookInstallStatus {
+    const configPath = getDshConfigPath()
+    const patchText = readTextOrAbsent(configPath)
+    if (patchText === null) {
+      return status(configPath, 'error', 'Could not read the DSH home patch file')
+    }
+    const { text: nextText, changed } = removeManagedDshPatch(patchText)
+    if (changed) {
+      writePatchText(configPath, nextText)
+    }
+    // Why force: the file is Orca's own and may already be gone; its absence is the goal.
+    rmSync(getDshManagedHooksPath(), { force: true })
+    return this.getStatus()
+  }
+}
+
+export const dshHookService = new DshHookService()
diff --git a/src/main/dsh/hook-settings.ts b/src/main/dsh/hook-settings.ts
new file mode 100644
index 000000000000..8ccbb8a92832
--- /dev/null
+++ b/src/main/dsh/hook-settings.ts
@@ -0,0 +1,110 @@
+import { homedir } from 'node:os'
+import { join, posix as pathPosix } from 'node:path'
+import {
+  buildManagedCommandHook,
+  createManagedCommandMatcher,
+  getSharedManagedScriptPath,
+  wrapPosixHookCommand,
+  wrapWindowsHookCommand,
+  type HookDefinition
+} from '../agent-hooks/installer-utils'
+import { readManagedHookEventsFromJson } from '../agent-hooks/managed-hooks-json-events'
+
+const DSH_SCRIPT_BASE = 'dsh-hook'
+
+/**
+ * The events DeepSeek Harness's own Claude-Code hook bridge
+ * (`@deepseek-ai/dsh-hooks-claude-code`) can fire. This is a strict subset of Claude's:
+ * the bridge documents no `Notification`, no `PermissionRequest` and no `SessionEnd`,
+ * and registering an unsupported event name makes it register nothing for that event.
+ * `normalizeDshEvent` is written against exactly this list.
+ */
+export const DSH_HOOK_EVENTS = [
+  'SessionStart',
+  'UserPromptSubmit',
+  'PreToolUse',
+  'PostToolUse',
+  'Stop'
+] as const
+
+export const DSH_MANAGED_HOOKS_FILE_NAME = 'dsh-hooks.json'
+
+/** `$DSH_HOME`, matching the launcher's own `DSH_HOME ?? ~/.dsh` resolution. */
+export function getDshHome(): string {
+  return process.env.DSH_HOME?.trim() || join(homedir(), '.dsh')
+}
+
+/**
+ * The home-level patch layer.
+ *
+ * Why here and not in a profile: DSH composes every profile as bundle patches, then the
+ * profile's own `cordis.patch.yml`, then this file. Installing one layer above every
+ * profile means a pane the user started themselves — any profile, including one Orca
+ * never launched — still reports status, and Orca never edits a profile the user owns.
+ */
+export function getDshConfigPath(): string {
+  return join(getDshHome(), 'cordis.patch.yml')
+}
+
+export function getDshRemoteConfigPath(remoteHome: string): string {
+  // Why: a remote $DSH_HOME is unknown over SFTP; default matches the launcher's own resolution.
+  return pathPosix.join(remoteHome.replace(/\/$/, ''), '.dsh', 'cordis.patch.yml')
+}
+
+export function getDshManagedScriptFileName(): string {
+  return process.platform === 'win32' ? `${DSH_SCRIPT_BASE}.cmd` : `${DSH_SCRIPT_BASE}.sh`
+}
+
+export function getDshManagedScriptPath(): string {
+  return getSharedManagedScriptPath(getDshManagedScriptFileName())
+}
+
+export function getDshManagedHooksPath(): string {
+  return getSharedManagedScriptPath(DSH_MANAGED_HOOKS_FILE_NAME)
+}
+
+export function getDshRemoteManagedHooksPath(remoteHome: string): string {
+  return pathPosix.join(
+    remoteHome.replace(/\/$/, ''),
+    '.orca',
+    'agent-hooks',
+    DSH_MANAGED_HOOKS_FILE_NAME
+  )
+}
+
+export function getDshManagedCommand(scriptPath: string): string {
+  // Why: DSH runs hooks through `ctx.shell`, which the base profile binds to bash
+  // everywhere except Windows, where it binds to PowerShell — the same split these two
+  // wrappers already encode.
+  return process.platform === 'win32'
+    ? wrapWindowsHookCommand(scriptPath)
+    : wrapPosixHookCommand(scriptPath)
+}
+
+export function getDshRemoteManagedCommand(scriptPath: string): string {
+  return wrapPosixHookCommand(scriptPath)
+}
+
+export function getDshManagedCommandMatcher(): (command: string | undefined) => boolean {
+  return createManagedCommandMatcher(getDshManagedScriptFileName())
+}
+
+/**
+ * The managed hooks file is Orca's outright: DSH has no user-owned `hooks.json`
+ * convention of its own, and the bridge reads whatever single path it is pointed at. So
+ * generate it wholesale rather than merging into someone's file.
+ */
+export function buildDshManagedHooksFile(command: string): string {
+  const hooks: Record<string, HookDefinition[]> = {}
+  for (const event of DSH_HOOK_EVENTS) {
+    hooks[event] = [{ hooks: [buildManagedCommandHook(command)] }]
+  }
+  return `${JSON.stringify({ hooks }, null, 2)}\n`
+}
+
+export function readManagedDshHookEvents(
+  parsed: unknown,
+  isManagedCommand: (command: string | undefined) => boolean
+): Set<string> {
+  return readManagedHookEventsFromJson(parsed, DSH_HOOK_EVENTS, isManagedCommand)
+}
diff --git a/src/main/fork-heimdall/orchestration/worker-idle-observation.test.ts b/src/main/fork-heimdall/orchestration/worker-idle-observation.test.ts
index 73574da036ec..396751da6552 100644
--- a/src/main/fork-heimdall/orchestration/worker-idle-observation.test.ts
+++ b/src/main/fork-heimdall/orchestration/worker-idle-observation.test.ts
@@ -164,7 +164,8 @@ describe('sendWorkerPrompt', () => {
     await sendWorkerPrompt(runtime, db(), run, 'dispatch-1', '  Keep both.  ')
     expect(sendTerminalAgentPrompt).toHaveBeenCalledWith(
       'term_1',
-      '[Heimdall owner reply] Keep both.'
+      '[Heimdall owner reply] Keep both.',
+      { inputKind: 'driving' }
     )
   })
 
diff --git a/src/main/fork-heimdall/orchestration/worker-prompt-send.ts b/src/main/fork-heimdall/orchestration/worker-prompt-send.ts
index e89273097644..18c699b1a5e2 100644
--- a/src/main/fork-heimdall/orchestration/worker-prompt-send.ts
+++ b/src/main/fork-heimdall/orchestration/worker-prompt-send.ts
@@ -55,7 +55,9 @@ export async function sendWorkerPrompt(
     throw new WorkerPromptUndeliverableError(dispatchId, `worker terminal is ${observation.status}`)
   }
   try {
-    await runtime.sendTerminalAgentPrompt(handle, `${HEIMDALL_OWNER_REPLY_PREFIX} ${text.trim()}`)
+    await runtime.sendTerminalAgentPrompt(handle, `${HEIMDALL_OWNER_REPLY_PREFIX} ${text.trim()}`, {
+      inputKind: 'driving'
+    })
   } catch (error) {
     throw new WorkerPromptUndeliverableError(
       dispatchId,
diff --git a/src/main/git-bash.test.ts b/src/main/git-bash.test.ts
index 367c07cbe54f..bd4633b019ff 100644
--- a/src/main/git-bash.test.ts
+++ b/src/main/git-bash.test.ts
@@ -169,4 +169,66 @@ describe('Git Bash path discovery', () => {
     )
     expect(isGitForWindowsBashLauncherPath('bash.exe')).toBe(false)
   })
+
+  it('identifies a launcher in an install folder named anything else', () => {
+    // Layout confirmed against a real Git 2.x install: bin, cmd, mingw64, usr, git-bash.exe.
+    const renamedInstall = (path: string): boolean =>
+      [
+        'C:\\Tools\\Git-2.55\\bin\\bash.exe',
+        'C:\\Tools\\Git-2.55\\usr\\bin\\bash.exe',
+        'C:\\Tools\\Git-2.55\\cmd\\git.exe',
+        'C:\\Tools\\Git-2.55\\git-bash.exe'
+      ].includes(path)
+    expect(
+      isGitForWindowsBashLauncherPath('C:\\Tools\\Git-2.55\\bin\\bash.exe', {
+        exists: renamedInstall
+      })
+    ).toBe(true)
+    expect(
+      isGitForWindowsBashLauncherPath('C:\\Users\\a\\scoop\\apps\\git\\current\\bin\\bash.exe', {
+        exists: (path) => path.startsWith('C:\\Users\\a\\scoop\\apps\\git\\current\\')
+      })
+    ).toBe(true)
+  })
+
+  // Each marker is individually necessary, so dropping one from the predicate cannot stay green.
+  it.each([
+    ['usr\\bin\\bash.exe', 'C:\\Tools\\Git-2.55\\usr\\bin\\bash.exe'],
+    ['cmd\\git.exe', 'C:\\Tools\\Git-2.55\\cmd\\git.exe'],
+    ['git-bash.exe', 'C:\\Tools\\Git-2.55\\git-bash.exe']
+  ])('refuses a renamed install root missing only %s', (_label, missingMarker) => {
+    expect(
+      isGitForWindowsBashLauncherPath('C:\\Tools\\Git-2.55\\bin\\bash.exe', {
+        exists: (path) => path !== missingMarker
+      })
+    ).toBe(false)
+  })
+
+  it('refuses a bash that is not a Git for Windows launcher, even where every path exists', () => {
+    const everythingExists = (): boolean => true
+    // A directly launched MSYS bash: no install root sits inside `usr`, so the markers cannot be met.
+    expect(
+      isGitForWindowsBashLauncherPath('C:\\Program Files\\Git\\usr\\bin\\bash.exe', {
+        exists: (path) => !path.includes('\\usr\\usr\\') && !path.includes('\\usr\\cmd\\')
+      })
+    ).toBe(false)
+    // Observed on a real Cygwin root: none of the three markers is present, nor bin\bash.exe itself.
+    const observedCygwinRoot = ['C:\\cygwin64\\etc', 'C:\\cygwin64\\var']
+    expect(
+      isGitForWindowsBashLauncherPath('C:\\cygwin64\\bin\\bash.exe', {
+        exists: (path) => observedCygwinRoot.includes(path)
+      })
+    ).toBe(false)
+    // A Cygwin root carrying a bash at both marker positions is still refused: `git-bash.exe` is Git
+    // for Windows' own launcher, and no Cygwin package installs one.
+    expect(
+      isGitForWindowsBashLauncherPath('C:\\cygwin64\\bin\\bash.exe', {
+        exists: (path) => path.endsWith('bin\\bash.exe') || path.endsWith('cmd\\git.exe')
+      })
+    ).toBe(false)
+    expect(
+      isGitForWindowsBashLauncherPath('C:\\Tools\\sh\\bash.exe', { exists: everythingExists })
+    ).toBe(false)
+    expect(isGitForWindowsBashLauncherPath('bash.exe', { exists: everythingExists })).toBe(false)
+  })
 })
diff --git a/src/main/git-bash.ts b/src/main/git-bash.ts
index 40866325ae74..a57edcaee4d0 100644
--- a/src/main/git-bash.ts
+++ b/src/main/git-bash.ts
@@ -114,10 +114,46 @@ export function isGitForWindowsBashPath(shellPath: string): boolean {
   return /(?:^|\\)(?:git|portablegit)(?:\\usr)?\\bin\\bash\.exe$/.test(normalized)
 }
 
-/** Git for Windows' `bin\bash.exe` is a launcher: it runs `..\usr\bin\bash.exe` as a child and waits. */
-export function isGitForWindowsBashLauncherPath(shellPath: string): boolean {
-  return /(?:^|\\)(?:git|portablegit)\\bin\\bash\.exe$/.test(
-    pathWin32.normalize(shellPath).toLowerCase()
+/**
+ * Files only a Git for Windows install root carries. `usr\bin\bash.exe` is the launcher's own
+ * hand-off target, and the other two separate that root from a Cygwin or MSYS2 one: neither ships a
+ * `cmd\` directory, and `git-bash.exe` is Git for Windows' own launcher rather than an upstream git
+ * binary, so no Cygwin package can put it here. All three confirmed present on a real Git 2.x
+ * install and absent from a real Cygwin root.
+ */
+const GIT_FOR_WINDOWS_ROOT_MARKERS = [
+  ['usr', 'bin', 'bash.exe'],
+  ['cmd', 'git.exe'],
+  ['git-bash.exe']
+] as const
+
+/**
+ * Git for Windows' `bin\bash.exe` is a launcher: it runs `..\usr\bin\bash.exe` as a child and waits.
+ *
+ * The installer's folder is named `Git`, but a user-chosen install directory, an unzipped
+ * PortableGit, and Scoop's `apps\git\current` are equally real, so a folder this does not recognize
+ * falls back to the install layout instead of denying the hand-off.
+ */
+export function isGitForWindowsBashLauncherPath(
+  shellPath: string,
+  options: Pick<GitBashPathOptions, 'exists'> = {}
+): boolean {
+  const normalized = pathWin32.normalize(shellPath)
+  if (/(?:^|\\)(?:git|portablegit)\\bin\\bash\.exe$/.test(normalized.toLowerCase())) {
+    return true
+  }
+  const binDirectory = pathWin32.dirname(normalized)
+  if (
+    pathWin32.basename(normalized).toLowerCase() !== 'bash.exe' ||
+    pathWin32.basename(binDirectory).toLowerCase() !== 'bin'
+  ) {
+    return false
+  }
+  // `usr\bin\bash.exe` lands here too, and is refused because no install root sits inside `usr`.
+  const installRoot = pathWin32.dirname(binDirectory)
+  const exists = options.exists ?? existsSync
+  return GIT_FOR_WINDOWS_ROOT_MARKERS.every((marker) =>
+    exists(pathWin32.join(installRoot, ...marker))
   )
 }
 
diff --git a/src/main/git/repo-api-parity.test.ts b/src/main/git/repo-api-parity.test.ts
deleted file mode 100644
index 9143b7bf65fb..000000000000
--- a/src/main/git/repo-api-parity.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import * as repo from './repo'
-
-describe('repo public API parity', () => {
-  it('keeps the historical runtime export surface', () => {
-    expect(Object.keys(repo).sort()).toEqual(
-      [
-        'DEFAULT_BASE_REF_PROBES',
-        'buildSearchBaseRefsArgv',
-        'getBaseRefDefault',
-        'getBranchConflictKind',
-        'getDefaultBaseRef',
-        'getDefaultRemote',
-        'getGitRepoRoot',
-        'getLinkedWorktreeMainRepoRoot',
-        'getRecentDriftSubjects',
-        'getRemoteCommitUrl',
-        'getRemoteCount',
-        'getRemoteDrift',
-        'getRemoteFileUrl',
-        'getRemoteUrl',
-        'getRepoName',
-        'isForEachRefExcludeUnsupportedError',
-        'isGitRepo',
-        'mergeBaseRefSearchResultGroups',
-        'normalizeGitRepoRootForInputPath',
-        'normalizeRefSearchQuery',
-        'parseAndFilterSearchRefDetails',
-        'parseRemoteCount',
-        'resolveDefaultBaseRefViaExec',
-        'resolveDefaultBaseRefWithLocalGit',
-        'searchBaseRefDetails',
-        'searchBaseRefs'
-      ].sort()
-    )
-  })
-})
diff --git a/src/main/git/status-read-coalescing.test.ts b/src/main/git/status-read-coalescing.test.ts
index e0170f8d6a5f..e7d755e7cfae 100644
--- a/src/main/git/status-read-coalescing.test.ts
+++ b/src/main/git/status-read-coalescing.test.ts
@@ -1,7 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as BoundedFileReader from '../../shared/node-bounded-file-reader'
-import type * as NodeFs from 'node:fs'
-import path from 'node:path'
 import {
   createBoundedFileReaderModuleMock,
   createFsPromisesModuleMock,
@@ -92,62 +90,6 @@ describe('getStatus', () => {
     expect(addOptions?.preferWslDirectGit).toBeUndefined()
   })
 
-  it('benchmarks concurrent status burst subprocess pressure', async () => {
-    const benchPath = process.env.ORCA_GIT_STATUS_COALESCING_BENCH_JSON
-    if (!benchPath) {
-      return
-    }
-
-    readFileMock.mockResolvedValue('gitdir: /repo/.git/worktrees/feature\n')
-    existsSyncMock.mockReturnValue(false)
-    gitExecFileAsyncMock.mockImplementation((args: string[]) => {
-      if (args.includes('status')) {
-        return Promise.resolve({ stdout: '' })
-      }
-      if (args.includes('--numstat')) {
-        return Promise.resolve({ stdout: '' })
-      }
-      return Promise.resolve({ stdout: '' })
-    })
-
-    const runBurst = async (withSignals: boolean): Promise<number> => {
-      gitExecFileAsyncMock.mockClear()
-      await Promise.all(
-        Array.from({ length: 10 }, () =>
-          getStatus('/repo', withSignals ? { signal: new AbortController().signal } : {})
-        )
-      )
-      return gitExecFileAsyncMock.mock.calls.filter(([args]) =>
-        (args as string[]).includes('status')
-      ).length
-    }
-
-    const startedAt = performance.now()
-    const unsignalledStatusCommandCalls = await runBurst(false)
-    const signalledStatusCommandCalls = await runBurst(true)
-    const durationMs = performance.now() - startedAt
-    const { mkdirSync, writeFileSync } = await vi.importActual<typeof NodeFs>('fs')
-    mkdirSync(path.dirname(benchPath), { recursive: true })
-    writeFileSync(
-      benchPath,
-      JSON.stringify({
-        scenario: 'git-status-concurrent-burst',
-        concurrentCalls: 10,
-        unsignalledStatusCommandCalls,
-        signalledStatusCommandCalls,
-        statusArgs: [
-          '-c',
-          'core.quotePath=false',
-          'status',
-          '--porcelain=v2',
-          '--branch',
-          '--untracked-files=all'
-        ],
-        durationMs
-      })
-    )
-  })
-
   it('coalesces identical in-flight status reads without caching after settle', async () => {
     readFileMock.mockResolvedValue('gitdir: /repo/.git/worktrees/feature\n')
     existsSyncMock.mockReturnValue(false)
diff --git a/src/main/git/upstream.test.ts b/src/main/git/upstream.test.ts
index b7644ad55439..1c4c45e09114 100644
--- a/src/main/git/upstream.test.ts
+++ b/src/main/git/upstream.test.ts
@@ -1,6 +1,4 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type * as NodeFs from 'node:fs'
-import path from 'node:path'
 
 const { gitExecFileAsyncMock } = vi.hoisted(() => ({
   gitExecFileAsyncMock: vi.fn()
@@ -25,54 +23,7 @@ describe('getUpstreamStatus', () => {
     invalidateGitUpstreamStatusReads()
   })
 
-  it('benchmarks concurrent upstream Git command pressure', async () => {
-    const benchPath = process.env.ORCA_GIT_UPSTREAM_COALESCING_BENCH_JSON
-    if (!benchPath) {
-      return
-    }
-    gitExecFileAsyncMock.mockImplementation((args: string[]) => {
-      if (args[0] === 'symbolic-ref') {
-        return Promise.resolve({ stdout: 'main\n' })
-      }
-      if (args[0] === 'rev-parse') {
-        return Promise.resolve({ stdout: 'origin/main\n' })
-      }
-      if (args[0] === 'rev-list') {
-        return Promise.resolve({ stdout: '2\t3\n' })
-      }
-      if (args[0] === 'log') {
-        return Promise.resolve({ stdout: '+ abc123 remote work\n' })
-      }
-      throw new Error(`unexpected git args: ${args.join(' ')}`)
-    })
-
-    await Promise.all(Array.from({ length: 10 }, () => getUpstreamStatus('/repo')))
-
-    const commands = gitExecFileAsyncMock.mock.calls.map(([args, options]) => ({ args, options }))
-    const commandCounts = Object.fromEntries(
-      ['symbolic-ref', 'rev-parse', 'rev-list', 'log'].map((command) => [
-        command,
-        commands.filter(({ args }) => args[0] === command).length
-      ])
-    )
-    const { mkdirSync, writeFileSync } = await vi.importActual<typeof NodeFs>('node:fs')
-    mkdirSync(path.dirname(benchPath), { recursive: true })
-    writeFileSync(
-      benchPath,
-      JSON.stringify({
-        scenario: 'local-git-upstream-concurrent-burst',
-        concurrentCalls: 10,
-        physicalGitCalls: commands.length,
-        commandCounts,
-        commandChain: ['symbolic-ref', 'rev-parse', 'rev-list', 'log'].map((command) =>
-          commands.find(({ args }) => args[0] === command)
-        )
-      })
-    )
-  })
-
-  // Why: the benchmark above only runs under an env var, so this is the CI-enforced
-  // guard that the native/WSL path actually coalesces rather than fanning out.
+  // Why: the CI-enforced guard that the native/WSL path actually coalesces rather than fanning out.
   it('shares one physical read across ten identical native callers', async () => {
     let resolveSymbolicRef = (): void => {}
     const symbolicRefGate = new Promise<void>((resolve) => {
diff --git a/src/main/gitea/client-scan-invalidation.test.ts b/src/main/gitea/client-scan-invalidation.test.ts
new file mode 100644
index 000000000000..b93bf4e18247
--- /dev/null
+++ b/src/main/gitea/client-scan-invalidation.test.ts
@@ -0,0 +1,169 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('../git/runner', () => ({
+  gitExecFileAsync: vi.fn(async () => ({
+    stdout: 'https://git.example.com/team/repo.git\n',
+    stderr: ''
+  }))
+}))
+vi.mock('../providers/ssh-git-dispatch', () => ({
+  getSSHGitProvider: vi.fn(() => undefined),
+  getSSHGitProviderGeneration: () => 0
+}))
+vi.mock('../source-control/pull-request-template', () => ({
+  readHostedPullRequestTemplate: vi.fn(async () => '')
+}))
+
+import {
+  getGiteaPullRequestForBranch,
+  getGiteaPullRequestForBranchOrThrow,
+  getGiteaRepoSlug,
+  invalidateGiteaPullRequestScanForRepo
+} from './client'
+import { createGiteaPullRequest } from './pull-request-creation'
+import { _resetGiteaRepoRefCache } from './repository-ref'
+import { _resetGiteaPullRequestScanCache } from './pull-request-scan-cache'
+
+const branch = 'feature/gitea'
+const pullRequest = {
+  number: 7,
+  title: 'Add Gitea',
+  state: 'open',
+  html_url: 'https://git.example.com/team/repo/pulls/7',
+  head: { ref: branch }
+}
+
+function createReview() {
+  return createGiteaPullRequest(
+    '/repo',
+    { provider: 'gitea', base: 'main', head: branch, title: 'Add Gitea', body: '' },
+    'local'
+  )
+}
+
+describe('Gitea scan invalidation after creation', () => {
+  beforeEach(() => {
+    vi.stubEnv('ORCA_GITEA_TOKEN', 'test-token')
+    vi.stubEnv('ORCA_GITEA_API_BASE_URL', '')
+    _resetGiteaRepoRefCache()
+    _resetGiteaPullRequestScanCache()
+  })
+
+  afterEach(() => {
+    _resetGiteaRepoRefCache()
+    _resetGiteaPullRequestScanCache()
+    vi.unstubAllGlobals()
+    vi.unstubAllEnvs()
+  })
+
+  it('refreshes cached misses in both modes after a successful create and coalesces readers', async () => {
+    let created = false
+    let listCalls = 0
+    let createCalls = 0
+    vi.stubGlobal(
+      'fetch',
+      vi.fn(async (url: URL, init?: RequestInit) => {
+        expect(url.pathname).toBe('/api/v1/repos/team/repo/pulls')
+        if (init?.method === 'POST') {
+          createCalls++
+          created = true
+          return Response.json(pullRequest)
+        }
+        listCalls++
+        return Response.json(created ? [pullRequest] : [])
+      })
+    )
+
+    expect(await getGiteaPullRequestForBranch('/repo', branch)).toBeNull()
+    expect(await getGiteaPullRequestForBranchOrThrow('/repo', branch)).toBeNull()
+    expect(listCalls).toBe(2)
+    expect(await createReview()).toMatchObject({ ok: true, number: 7 })
+
+    const refreshed = await Promise.all([
+      getGiteaPullRequestForBranchOrThrow('/repo', branch),
+      getGiteaPullRequestForBranchOrThrow('/repo', branch),
+      getGiteaPullRequestForBranch('/repo', branch),
+      getGiteaPullRequestForBranch('/repo', branch)
+    ])
+    expect(refreshed.map((review) => review?.number)).toEqual([7, 7, 7, 7])
+    expect(listCalls).toBe(4)
+    expect(createCalls).toBe(1)
+    expect(await getGiteaPullRequestForBranchOrThrow('/repo', branch)).toMatchObject({ number: 7 })
+    expect(listCalls).toBe(4)
+  })
+
+  it('retires a strict miss when a create attempt recovers an existing pull request', async () => {
+    let attempted = false
+    let listCalls = 0
+    vi.stubGlobal(
+      'fetch',
+      vi.fn(async (_url: URL, init?: RequestInit) => {
+        if (init?.method === 'POST') {
+          attempted = true
+          return Response.json({ message: 'already exists' }, { status: 409 })
+        }
+        listCalls++
+        return Response.json(attempted ? [pullRequest] : [])
+      })
+    )
+
+    expect(await getGiteaPullRequestForBranchOrThrow('/repo', branch)).toBeNull()
+    expect(await createReview()).toMatchObject({
+      ok: false,
+      code: 'already_exists',
+      existingReview: { number: 7 }
+    })
+    expect(await getGiteaPullRequestForBranchOrThrow('/repo', branch)).toMatchObject({ number: 7 })
+    expect(listCalls).toBe(3)
+  })
+
+  it.each(['before', 'after'] as const)(
+    'keeps fresh strict results when a pre-invalidation scan finishes %s its replacement',
+    async (completionOrder) => {
+      const oldResponse = Promise.withResolvers<Response>()
+      const freshResponse = Promise.withResolvers<Response>()
+      const oldStarted = Promise.withResolvers<void>()
+      const fetchMock = vi
+        .fn()
+        .mockImplementationOnce(() => {
+          oldStarted.resolve()
+          return oldResponse.promise
+        })
+        .mockImplementationOnce(() => freshResponse.promise)
+      vi.stubGlobal('fetch', fetchMock)
+
+      const stale = getGiteaPullRequestForBranchOrThrow('/repo', branch)
+      await oldStarted.promise
+      const repo = await getGiteaRepoSlug('/repo')
+      if (!repo) {
+        throw new Error('Expected test repository')
+      }
+      invalidateGiteaPullRequestScanForRepo(repo)
+      const fresh = getGiteaPullRequestForBranchOrThrow('/repo', branch)
+      const concurrent = getGiteaPullRequestForBranchOrThrow('/repo', branch)
+      try {
+        await new Promise<void>((resolve) => setImmediate(resolve))
+        expect(fetchMock).toHaveBeenCalledTimes(2)
+        if (completionOrder === 'before') {
+          oldResponse.resolve(Response.json([]))
+          expect(await stale).toBeNull()
+        }
+        freshResponse.resolve(Response.json([pullRequest]))
+        expect(await fresh).toMatchObject({ number: 7 })
+        expect(await concurrent).toMatchObject({ number: 7 })
+        if (completionOrder === 'after') {
+          oldResponse.resolve(Response.json([]))
+          expect(await stale).toBeNull()
+        }
+        expect(await getGiteaPullRequestForBranchOrThrow('/repo', branch)).toMatchObject({
+          number: 7
+        })
+        expect(fetchMock).toHaveBeenCalledTimes(2)
+      } finally {
+        oldResponse.resolve(Response.json([]))
+        freshResponse.resolve(Response.json([pullRequest]))
+        await Promise.all([stale, fresh, concurrent])
+      }
+    }
+  )
+})
diff --git a/src/main/gitea/client.ts b/src/main/gitea/client.ts
index ba9e7c3ed8f5..ba768bb81319 100644
--- a/src/main/gitea/client.ts
+++ b/src/main/gitea/client.ts
@@ -131,7 +131,9 @@ function giteaPullRequestScanKey(repo: GiteaRepoRef): string {
 /** Invalidate the shared /pulls scan after Orca itself creates a PR so the
  *  next worktree-card refresh sees it instead of a cached miss. */
 export function invalidateGiteaPullRequestScanForRepo(repo: GiteaRepoRef): void {
-  invalidateGiteaPullRequestScan(giteaPullRequestScanKey(repo))
+  const repoKey = giteaPullRequestScanKey(repo)
+  invalidateGiteaPullRequestScan(repoKey)
+  invalidateGiteaPullRequestScan(`${repoKey}::strict`)
 }
 
 async function getCommitStatus(
diff --git a/src/main/github/work-item-details-api-parity.test.ts b/src/main/github/work-item-details-api-parity.test.ts
deleted file mode 100644
index 187680f64cdb..000000000000
--- a/src/main/github/work-item-details-api-parity.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { describe, expect, expectTypeOf, it } from 'vitest'
-import type { GitHubPRFile, GitHubPRFileContents } from '../../shared/github/pull-request-types'
-import type { GitHubWorkItemDetails } from '../../shared/github/work-item-types'
-import type { IssueSourcePreference } from '../../shared/repo-types'
-import type { LocalGitExecOptions } from './gh-utils'
-import type { GitHubApiRepository } from './github-api-repository'
-import * as workItemDetails from './work-item-details'
-
-type GetWorkItemDetails = (
-  repoPath: string,
-  number: number,
-  type?: 'issue' | 'pr',
-  connectionId?: string | null,
-  localGitOptions?: LocalGitExecOptions,
-  preference?: IssueSourcePreference
-) => Promise<GitHubWorkItemDetails | null>
-
-type GetPRFileContents = (args: {
-  repoPath: string
-  connectionId?: string | null
-  localGitOptions?: LocalGitExecOptions
-  prRepo?: GitHubApiRepository | null
-  prNumber: number
-  path: string
-  oldPath?: string
-  status: GitHubPRFile['status']
-  headSha: string
-  baseSha: string
-}) => Promise<GitHubPRFileContents>
-
-describe('work-item-details public API parity', () => {
-  it('retains only the established runtime exports and call signatures', () => {
-    expect(Object.keys(workItemDetails).sort()).toEqual(['getPRFileContents', 'getWorkItemDetails'])
-    expectTypeOf(workItemDetails.getWorkItemDetails).toEqualTypeOf<GetWorkItemDetails>()
-    expectTypeOf(workItemDetails.getPRFileContents).toEqualTypeOf<GetPRFileContents>()
-  })
-})
diff --git a/src/main/global-fetch-call-site-audit.test.ts b/src/main/global-fetch-call-site-audit.test.ts
index 0c2133f320eb..907092515f54 100644
--- a/src/main/global-fetch-call-site-audit.test.ts
+++ b/src/main/global-fetch-call-site-audit.test.ts
@@ -23,6 +23,7 @@ const AUDITED_GLOBAL_FETCH_LINES = new Map<string, number>([
   ['main/orca-profiles/profile-cloud-client.ts', 1],
   ['main/orca-profiles/profile-cloud-org-members-client.ts', 1],
   ['main/rate-limits/codex-fetcher.ts', 3],
+  ['main/rate-limits/zcode-usage-fetcher.ts', 1],
   ['main/runtime/push/push-gateway-client.ts', 1],
   ['main/runtime/relay/relay-http-client.ts', 2],
   ['main/runtime/relay/relay-region-catalog-fetch.ts', 1],
diff --git a/src/main/headless-automation-dispatcher-source-boundary.test.ts b/src/main/headless-automation-dispatcher-source-boundary.test.ts
deleted file mode 100644
index 5f7a10fedec6..000000000000
--- a/src/main/headless-automation-dispatcher-source-boundary.test.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const source = readFileSync(join(__dirname, 'startup', 'main-process-automations.ts'), 'utf8')
-
-function sourceBetween(startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start + startPattern.length)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('headless automation dispatcher source boundaries', () => {
-  it('creates new-per-run workspaces from the resolved run target repo', () => {
-    const createArgsSection = sourceBetween('buildHeadlessAutomationWorktreeCreateArgs({', '})')
-
-    expect(createArgsSection).toContain('repo: target.repo')
-    expect(createArgsSection).not.toContain('automation.sourceContext')
-  })
-})
diff --git a/src/main/hermes/hermes-config-comment-boundaries.test.ts b/src/main/hermes/hermes-config-comment-boundaries.test.ts
new file mode 100644
index 000000000000..b28ad582ed91
--- /dev/null
+++ b/src/main/hermes/hermes-config-comment-boundaries.test.ts
@@ -0,0 +1,90 @@
+import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { describe, expect, it, vi } from 'vitest'
+import { parseDocument } from 'yaml'
+import { createManagedHookLocalFilesystem } from '../agent-hooks/managed-hook-local-filesystem'
+import { disablePlugin, enablePlugin, updateConfigContent } from './hermes-config-yaml'
+import { HermesHookService } from './hook-service'
+
+const fixtures = [
+  ...['  ', '    '].flatMap((indent) =>
+    [true, false].map((retained) => ({
+      name: `trailing list comment (${indent.length} spaces, retained: ${retained})`,
+      list: `${indent}# list head\n${retained ? `${indent}- keep\n` : ''}${indent}- orca-status # managed entry\n${indent}# list tail\n`,
+      suffix: '  custom: "off"\nmodel: "001"\n'
+    }))
+  ),
+  {
+    name: 'comment before the next root setting',
+    list: '    - keep\n    - orca-status # managed entry\n',
+    suffix: '# Operator notes\nmodel: "001"\n'
+  },
+  {
+    name: 'comment before the next plugin setting',
+    list: '    - keep\n    - orca-status # managed entry\n',
+    suffix: '  # Plugin notes\n  custom: "off"\nmodel: "001"\n'
+  },
+  {
+    name: 'comment at the end of the document',
+    list: '    - keep\n    - orca-status # managed entry\n',
+    suffix: '# End notes\n'
+  },
+  {
+    name: 'leading comment on the first retained entry',
+    list: '    # lead\n    - orca-status\n    # between\n    - keep\n',
+    suffix: 'model: "001"\n'
+  }
+]
+
+describe.each(['\n', '\r\n'])('Hermes comment boundaries (%j)', (eol) => {
+  describe.each(['install', 'remove'])('%s', (operation) => {
+    it.each(fixtures)('preserves $name exactly once through the service', async (fixture) => {
+      const key = operation === 'install' ? 'disabled' : 'enabled'
+      const enabled = operation === 'install' ? '  enabled: [orca-status]\n' : ''
+      const input = `plugins:\n${enabled}  ${key}:\n${fixture.list}${fixture.suffix}`.replaceAll(
+        '\n',
+        eol
+      )
+      const updater = operation === 'install' ? enablePlugin : disablePlugin
+      const result = updateConfigContent(input, updater)
+      expect(result.detail).toBeUndefined()
+      const output = result.content ?? ''
+      const parsed = parseDocument(output)
+      expect(parsed.errors).toEqual([])
+      expect(parsed.warnings).toEqual([])
+      expect(parsed.toJS()).toEqual(updater(parseDocument(input).toJS()))
+      for (const comment of input.match(/#[^\r\n]*/g) ?? []) {
+        expect(output.split(comment)).toHaveLength(2)
+      }
+      expect(output.endsWith(fixture.suffix.replaceAll('\n', eol))).toBe(true)
+      expect(updateConfigContent(output, updater).content).toBe(output)
+      if (eol === '\r\n') {
+        expect(output.replaceAll(eol, '')).not.toContain('\n')
+      }
+
+      const root = mkdtempSync(join(tmpdir(), 'orca-hermes-comments-'))
+      const home = join(root, '.hermes')
+      mkdirSync(home)
+      const path = join(home, 'config.yaml')
+      vi.stubEnv('HERMES_HOME', home)
+      try {
+        writeFileSync(path, input)
+        const service = new HermesHookService()
+        const status = operation === 'install' ? service.install() : service.remove()
+        expect(status.state).toBe(operation === 'install' ? 'installed' : 'not_installed')
+        expect(readFileSync(path, 'utf8')).toBe(output)
+        expect(readFileSync(`${path}.bak`, 'utf8')).toBe(input)
+        if (operation === 'install') {
+          writeFileSync(path, input)
+          const remote = await service.installRemote(createManagedHookLocalFilesystem(), root)
+          expect(remote.state).toBe('installed')
+          expect(readFileSync(path, 'utf8')).toBe(output)
+        }
+      } finally {
+        vi.unstubAllEnvs()
+        rmSync(root, { recursive: true, force: true })
+      }
+    })
+  })
+})
diff --git a/src/main/hermes/hermes-config-document.test.ts b/src/main/hermes/hermes-config-document.test.ts
new file mode 100644
index 000000000000..744b6c23f6f5
--- /dev/null
+++ b/src/main/hermes/hermes-config-document.test.ts
@@ -0,0 +1,166 @@
+import { describe, expect, it } from 'vitest'
+import { parse } from 'yaml'
+import { disablePlugin, enablePlugin, updateConfigContent } from './hermes-config-yaml'
+
+const fixture = [
+  '# Operator documentation',
+  'model: "001" # keep quoted',
+  'prompt: |',
+  '  First line',
+  '  Second line',
+  'defaults: &defaults',
+  '  temperature: 0.25 # setting',
+  'other: *defaults',
+  '',
+  'plugins:',
+  '  enabled:',
+  '    - "zeta" # last alphabetically',
+  '    - alpha # first occurrence',
+  '    - alpha # duplicate belongs to user',
+  '  disabled: [orca-status, blocked] # disabled choices',
+  '  custom: "off" # unrelated plugin setting',
+  '# End documentation',
+  ''
+].join('\n')
+
+describe('Hermes YAML document edits', () => {
+  it.each(['\n', '\r\n'])('preserves comments and values through install/remove (%j)', (eol) => {
+    const initial = fixture.replaceAll('\n', eol)
+    const installed = updateConfigContent(initial, enablePlugin)
+    expect(installed.detail).toBeUndefined()
+    expect(installed.content).not.toBeNull()
+    const enabled = installed.content ?? ''
+    expect(parse(enabled)).toEqual({
+      ...parse(initial),
+      plugins: {
+        enabled: ['zeta', 'alpha', 'alpha', 'orca-status'],
+        disabled: ['blocked'],
+        custom: 'off'
+      }
+    })
+    const removed = updateConfigContent(enabled, disablePlugin).content ?? ''
+    expect(parse(removed)).toEqual({
+      ...parse(initial),
+      plugins: { enabled: ['zeta', 'alpha', 'alpha'], disabled: ['blocked'], custom: 'off' }
+    })
+    for (const output of [enabled, removed]) {
+      for (const comment of initial.match(/#[^\r\n]*/g) ?? []) {
+        expect(output).toContain(comment)
+      }
+      expect(output).toContain('model: "001" # keep quoted')
+      expect(output).toContain(`prompt: |${eol}  First line${eol}  Second line`)
+      expect(output).toContain('&defaults')
+      expect(output).toContain('*defaults')
+      if (eol === '\r\n') {
+        expect(output.replaceAll('\r\n', '')).not.toContain('\n')
+      }
+    }
+  })
+
+  it.each([
+    '# existing\r\nplugins:\r\n  enabled: [zeta, orca-status, alpha, alpha]\r\n',
+    'plugins: &plugins\n  enabled: [orca-status]\nother: *plugins\n'
+  ])('returns exact bytes for a semantic no-op', (input) => {
+    expect(updateConfigContent(input, enablePlugin)).toEqual({ content: input })
+  })
+
+  it.each(['# no plugins\nmodel: test\n', 'plugins:\n  disabled: [blocked]\n'])(
+    'does not add absent lists when removing',
+    (input) => expect(updateConfigContent(input, disablePlugin)).toEqual({ content: input })
+  )
+
+  it('retains comments attached to removed Orca entries', () => {
+    const input =
+      'plugins:\n  enabled:\n    # keep this note\n    - orca-status # managed entry\n    - other\n'
+    const output = updateConfigContent(input, disablePlugin).content ?? ''
+    expect(parse(output).plugins.enabled).toEqual(['other'])
+    expect(output).toContain('# keep this note')
+    expect(output).toContain('# managed entry')
+    expect(output.match(/# keep this note/g)).toHaveLength(1)
+  })
+
+  it.each([
+    'plugins: [',
+    'plugins: {}\nplugins: {}\n',
+    '- invalid root\n',
+    'plugins: unexpected\n',
+    'plugins:\n  enabled: not-a-list\n',
+    'plugins:\n  enabled: [123]\n',
+    'plugins:\n  disabled: not-a-list\n',
+    'plugins: !custom {}\n',
+    'defaults: &defaults {plugins: {enabled: [other]}}\n<<: *defaults\n',
+    'defaults: &defaults {enabled: [other]}\nplugins:\n  <<: *defaults\n',
+    'plugins: &plugins\n  enabled: [other]\nother: *plugins\n',
+    'plugins:\n  enabled: &enabled [other]\nother: *enabled\n',
+    'enabled: &enabled [other]\nplugins:\n  enabled: *enabled\n',
+    'plugins:\n  enabled: [*missing]\n'
+  ])('refuses an unsafe update without a replacement (%s)', (input) => {
+    const output = updateConfigContent(input, enablePlugin)
+    expect(output.content).toBeNull()
+    expect(output.detail).toBeTruthy()
+  })
+
+  it('keeps folded scalars, quoted strings and long lines in a real update', () => {
+    const input = `# header\nprompt: >-\n  First line\n  Second line\nquoted: 'off'\nlong: ${'word '
+      .repeat(30)
+      .trimEnd()}\nplugins: {enabled: [other]}\n`
+    const output = updateConfigContent(input, enablePlugin).content ?? ''
+    expect(output).toContain('prompt: >-\n  First line\n  Second line\n')
+    expect(output).toContain("quoted: 'off'")
+    expect(output).toContain(`long: ${'word '.repeat(30).trimEnd()}\n`)
+    expect(parse(output)).toEqual({
+      ...parse(input),
+      plugins: { enabled: ['other', 'orca-status'] }
+    })
+  })
+
+  it.each(['\n', '\r\n'])(
+    'leaves unrelated source bytes intact with unusual indentation (%j)',
+    (eol) => {
+      const prefix =
+        'model:    "001" # spacing\nprompt: >-\n    First\n    Second\n\n# plugins\nplugins:\n    custom: |-\n        Unrelated\n        text\n'.replaceAll(
+          '\n',
+          eol
+        )
+      const input = `${prefix}    enabled: [other] # choices${eol}# ending${eol}`
+      const installed = updateConfigContent(input, enablePlugin).content ?? ''
+      expect(installed.startsWith(prefix)).toBe(true)
+      expect(installed.endsWith(`# ending${eol}`)).toBe(true)
+      const removed = updateConfigContent(installed, disablePlugin).content ?? ''
+      expect(removed.startsWith(prefix)).toBe(true)
+      expect(parse(removed)).toEqual(parse(input))
+    }
+  )
+
+  it.each([
+    'model: "001"',
+    'model: "001"\n# end\n...\n',
+    '{model: "001"}\n',
+    'plugins: {} # empty\n',
+    'plugins: {custom: "off",} # flow\n',
+    'plugins:\n    custom: >-\n        First\n        Second\n# end\n'
+  ])('inserts missing plugin keys without losing other values (%s)', (input) => {
+    const installed = updateConfigContent(input, enablePlugin)
+    expect(installed.detail).toBeUndefined()
+    const output = installed.content ?? ''
+    const parsed = parse(input)
+    expect(parse(output)).toEqual({
+      ...parsed,
+      plugins: { ...parsed.plugins, enabled: ['orca-status'] }
+    })
+    for (const comment of input.match(/#[^\r\n]*/g) ?? []) {
+      expect(output).toContain(comment)
+    }
+    if (input.includes('First')) {
+      expect(output).toContain('custom: >-\n        First\n        Second\n')
+    }
+  })
+
+  it.each(['', '# empty document\n', 'null\n'])('enables a plugin in an empty config', (input) => {
+    const output = updateConfigContent(input, enablePlugin).content ?? ''
+    expect(parse(output)).toEqual({ plugins: { enabled: ['orca-status'] } })
+    if (input.includes('#')) {
+      expect(output).toContain('# empty document')
+    }
+  })
+})
diff --git a/src/main/hermes/hermes-config-document.ts b/src/main/hermes/hermes-config-document.ts
new file mode 100644
index 000000000000..71fe4ade6084
--- /dev/null
+++ b/src/main/hermes/hermes-config-document.ts
@@ -0,0 +1,141 @@
+import { isDeepStrictEqual } from 'node:util'
+import { isAlias, isMap, isNode, isScalar, isSeq, parseDocument, visit } from 'yaml'
+import type { Document, YAMLMap, YAMLSeq } from 'yaml'
+import type { HermesConfig } from './hermes-config-yaml'
+import { applyHermesPluginSourceEdits } from './hermes-config-source-edits'
+
+function preserveRemovedComments(sequence: YAMLSeq, removed: unknown[], first: unknown): void {
+  const comments = removed.flatMap((node) =>
+    isNode(node)
+      ? [node === first && !sequence.flow ? null : node.commentBefore, node.comment].filter(
+          (text) => text != null
+        )
+      : []
+  )
+  if (comments.length > 0) {
+    sequence.comment = [sequence.comment, ...comments].filter((text) => text != null).join('\n')
+  }
+}
+
+function updateStringSequence(plugins: YAMLMap, key: string, values: unknown): void {
+  if (values === undefined) {
+    return
+  }
+  if (!Array.isArray(values) || values.some((value) => typeof value !== 'string')) {
+    throw new Error(`Hermes plugins.${key} must be a string list`)
+  }
+  const sequence = plugins.get(key, true)
+  if (sequence === undefined) {
+    plugins.set(key, values)
+    return
+  }
+  if (!isSeq(sequence)) {
+    throw new Error(`Hermes plugins.${key} must be a string list`)
+  }
+  const remaining = [...values]
+  const removed: unknown[] = []
+  const first = sequence.items[0]
+  sequence.items = sequence.items.filter((item) => {
+    if (!isScalar(item) || typeof item.value !== 'string') {
+      throw new Error(`Hermes plugins.${key} must contain plain string entries`)
+    }
+    const index = remaining.indexOf(item.value)
+    if (index === -1) {
+      removed.push(item)
+      return false
+    }
+    remaining.splice(index, 1)
+    return true
+  })
+  preserveRemovedComments(sequence, removed, first)
+  for (const value of remaining) {
+    sequence.add(value)
+  }
+}
+
+export function updateHermesPluginDocument(
+  content: string,
+  next: HermesConfig
+): { content: string | null; detail?: string } {
+  try {
+    const document: Document = parseDocument(content)
+    if (document.errors.length > 0 || document.warnings.length > 0) {
+      throw new Error(
+        [...document.errors, ...document.warnings].map((item) => item.message).join('; ')
+      )
+    }
+    if (isScalar(document.contents) && document.contents.value === null) {
+      const previous = document.contents
+      document.contents = document.createNode({})
+      document.contents.commentBefore = previous.commentBefore
+      document.contents.comment = previous.comment
+    }
+    if (document.contents === null) {
+      document.contents = document.createNode({})
+    }
+    if (!isMap(document.contents)) {
+      throw new Error('Hermes config.yaml root must be a mapping')
+    }
+    if (document.contents.anchor) {
+      throw new Error('Cannot safely edit an anchored Hermes root')
+    }
+    if (document.contents.has('<<')) {
+      throw new Error('Cannot safely edit a merged Hermes root')
+    }
+
+    let plugins = document.get('plugins', true)
+    if (plugins === undefined) {
+      document.set('plugins', document.createNode({}))
+      plugins = document.get('plugins', true)
+    }
+    if (!isMap(plugins)) {
+      throw new Error('Hermes plugins must be a plain mapping')
+    }
+    // Aliases into a changed subtree could silently change unrelated settings.
+    visit(plugins, {
+      Node: (_key, node) => {
+        if (isAlias(node) || node.anchor || node.tag) {
+          throw new Error('Cannot safely edit Hermes plugins with anchors, aliases or tags')
+        }
+      },
+      Pair: (_key, pair) => {
+        if (isScalar(pair.key) && pair.key.value === '<<') {
+          throw new Error('Cannot safely edit Hermes plugins with YAML merge keys')
+        }
+      }
+    })
+    for (const key of ['enabled', 'disabled']) {
+      const existing = plugins.get(key, true)
+      if (
+        existing !== undefined &&
+        (!isSeq(existing) ||
+          existing.items.some((item) => !isScalar(item) || typeof item.value !== 'string'))
+      ) {
+        throw new Error(`Hermes plugins.${key} must be a string list`)
+      }
+    }
+    const nextPlugins = next.plugins
+    if (typeof nextPlugins !== 'object' || nextPlugins === null) {
+      throw new Error('Hermes plugins must be a mapping')
+    }
+    if ('enabled' in nextPlugins) {
+      updateStringSequence(plugins, 'enabled', nextPlugins.enabled)
+    }
+    if ('disabled' in nextPlugins) {
+      updateStringSequence(plugins, 'disabled', nextPlugins.disabled)
+    }
+    const output = applyHermesPluginSourceEdits(content, document)
+    // Re-parse to reject edits that would change any unrelated alias-resolved value.
+    const verified = parseDocument(output)
+    if (
+      verified.errors.length > 0 ||
+      verified.warnings.length > 0 ||
+      !isDeepStrictEqual(verified.toJS(), next)
+    ) {
+      throw new Error('Hermes plugin update would change unrelated configuration')
+    }
+    return { content: output }
+  } catch (error) {
+    return { content: null, detail: error instanceof Error ? error.message : String(error) }
+  }
+}
diff --git a/src/main/hermes/hermes-config-flow-insertion.test.ts b/src/main/hermes/hermes-config-flow-insertion.test.ts
new file mode 100644
index 000000000000..f00c76c8f9ef
--- /dev/null
+++ b/src/main/hermes/hermes-config-flow-insertion.test.ts
@@ -0,0 +1,184 @@
+import { describe, expect, it } from 'vitest'
+import { isMap, parseDocument } from 'yaml'
+import { enablePlugin, updateConfigContent } from './hermes-config-yaml'
+
+const pluginEntries = [
+  { name: 'empty', text: ' # empty,\n', expected: {} },
+  { name: 'nonempty', text: 'custom: keep # note\n', expected: { custom: 'keep' } },
+  {
+    name: 'trailing comma',
+    text: 'custom: keep, # separator,\n',
+    expected: { custom: 'keep' }
+  },
+  {
+    name: 'comment comma',
+    text: 'custom: keep # no separator,\n',
+    expected: { custom: 'keep' }
+  },
+  {
+    name: 'nested commas',
+    text: 'custom: {names: ["a,", b,],} # nested,\n',
+    expected: { custom: { names: ['a,', 'b'] } }
+  },
+  {
+    name: 'explicit entry key',
+    text: '? custom : keep # explicit,\n',
+    expected: { custom: 'keep' }
+  }
+]
+
+const contexts = [
+  { name: 'block root', prefix: 'plugins: {', suffix: '} # outside' },
+  {
+    name: 'indented block root',
+    prefix: '    model: "001" # before\n    plugins: {',
+    suffix: '    } # outside\n    prompt: |-\n      Keep this text',
+    settings: { model: '001', prompt: 'Keep this text' }
+  },
+  { name: 'explicit plugins key', prefix: '? "plugins"\n: {', suffix: '} # outside' },
+  {
+    name: 'indented explicit plugins key',
+    prefix: '    ? plugins\n    : {',
+    suffix: '    } # outside'
+  },
+  { name: 'flow on next line', prefix: 'plugins:\n    {', suffix: '} # outside' },
+  {
+    name: 'nested in root flow',
+    prefix: '{model: "001", plugins: {',
+    suffix: '}, extra: [one, two,]} # outside',
+    settings: { model: '001', extra: ['one', 'two'] }
+  }
+]
+
+function expectInsertion(source: string, expected: unknown, eol: string): string {
+  const original = parseDocument(source)
+  expect(original.errors).toEqual([])
+  expect(original.warnings).toEqual([])
+  const plugins = original.get('plugins', true)
+  const parent = isMap(plugins) ? plugins : original.contents
+  if (!isMap(parent) || !parent.range) {
+    throw new Error('Fixture must contain a ranged mapping')
+  }
+  const position = parent.range[1] - 1
+  const result = updateConfigContent(source, enablePlugin)
+  expect(result.detail).toBeUndefined()
+  const output = result.content ?? ''
+  const document = parseDocument(output)
+  expect(document.errors).toEqual([])
+  expect(document.warnings).toEqual([])
+  expect(document.toJS()).toEqual(expected)
+  expect(output.startsWith(source.slice(0, position))).toBe(true)
+  expect(output.endsWith(source.slice(position))).toBe(true)
+  expect(updateConfigContent(output, enablePlugin)).toEqual({ content: output })
+  if (eol === '\r\n') {
+    expect(output.replaceAll(eol, '')).not.toContain('\n')
+  }
+  return output
+}
+
+describe.each(['\n', '\r\n'])('Hermes flow insertion indentation (%j)', (eol) => {
+  describe.each([false, true])('final newline = %j', (finalNewline) => {
+    describe.each(contexts)('$name', ({ prefix, suffix, settings }) => {
+      it.each(pluginEntries)('$name plugin map', ({ text, expected }) => {
+        const source = `${prefix}${text}${suffix}${finalNewline ? '\n' : ''}`.replaceAll('\n', eol)
+        expectInsertion(
+          source,
+          { ...settings, plugins: { ...expected, enabled: ['orca-status'] } },
+          eol
+        )
+      })
+    })
+
+    it.each([
+      { name: 'empty root', text: '{ # empty,\n}', expected: {} },
+      { name: 'nonempty root', text: '{model: "001" # note,\n}', expected: { model: '001' } },
+      {
+        name: 'indented root with nested trailing comma',
+        text: '    {model: {names: ["a,", b,],}, # separator,\n}',
+        expected: { model: { names: ['a,', 'b'] } }
+      }
+    ])('$name flow map', ({ text, expected }) => {
+      const source = `${text}${finalNewline ? '\n' : ''}`.replaceAll('\n', eol)
+      expectInsertion(source, { ...expected, plugins: { enabled: ['orca-status'] } }, eol)
+    })
+  })
+})
+
+describe.each(['\n', '\r\n'])('Hermes flow insertion with tab separation (%j)', (eol) => {
+  it.each(pluginEntries.slice(0, 3))('$name map after a tab', ({ text, expected }) => {
+    const source = `plugins: {${text}\t}`.replaceAll('\n', eol)
+    expectInsertion(source, { plugins: { ...expected, enabled: ['orca-status'] } }, eol)
+  })
+
+  it.each([
+    {
+      name: 'minimal tab',
+      source: 'plugins: {custom: keep # note\n\t}',
+      padding: '\n '
+    },
+    {
+      name: 'deeper escaped quoted key',
+      source: '    "plu\\u0067ins": {custom: keep # note\n    \t}',
+      padding: '\n     '
+    },
+    {
+      name: 'mixed spaces and tabs below required indentation',
+      source: '    plugins: {custom: keep # note\n    \t  \t }',
+      padding: '\n     '
+    },
+    {
+      name: 'whitespace-only closing line',
+      source: 'plugins: {custom: keep # note\n\t \t  }',
+      padding: '\n '
+    },
+    {
+      name: 'sufficient spaces before a tab',
+      source: 'plugins: {custom: keep # note\n \t}',
+      padding: ''
+    },
+    {
+      name: 'deeper sufficient spaces before mixed separation',
+      source: '    plugins: {custom: keep # note\n     \t \t}',
+      padding: ''
+    },
+    {
+      name: 'root flow with zero required indentation',
+      source: '    {plugins: {custom: keep # note\n\t}}',
+      padding: ''
+    },
+    {
+      name: 'tab after content on the same line',
+      source: 'plugins: {custom: keep\t}',
+      padding: ''
+    },
+    {
+      name: 'explicit plugins key',
+      source: '? "plugins"\n: {custom: keep # note\n\t}',
+      padding: '\n '
+    },
+    {
+      name: 'deeper split explicit key',
+      source: '    ?\n        "plugins"\n    : {custom: keep # note\n    \t}',
+      padding: '\n     '
+    }
+  ])('preserves source around $name', ({ source: input, padding }) => {
+    const source = input.replaceAll('\n', eol)
+    const output = expectInsertion(
+      source,
+      { plugins: { custom: 'keep', enabled: ['orca-status'] } },
+      eol
+    )
+    const insertion = `${padding}, enabled: [ orca-status ]`.replaceAll('\n', eol)
+    expect(output).toBe(source.replace('}', `${insertion}}`))
+  })
+
+  it('rejects an unrelated value change after repairing tab-separated insertion', () => {
+    const source = 'model: "001"\nplugins: {custom: keep # note\n\t}'.replaceAll('\n', eol)
+    expect(
+      updateConfigContent(source, (config) => ({ ...enablePlugin(config), model: 'changed' }))
+    ).toEqual({
+      content: null,
+      detail: 'Hermes plugin update would change unrelated configuration'
+    })
+  })
+})
diff --git a/src/main/hermes/hermes-config-preservation.test.ts b/src/main/hermes/hermes-config-preservation.test.ts
new file mode 100644
index 000000000000..9756f7a3230d
--- /dev/null
+++ b/src/main/hermes/hermes-config-preservation.test.ts
@@ -0,0 +1,202 @@
+import {
+  chmodSync,
+  existsSync,
+  linkSync,
+  lstatSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  readdirSync,
+  rmSync,
+  statSync,
+  symlinkSync,
+  utimesSync,
+  writeFileSync
+} from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { parse } from 'yaml'
+import { HermesHookService } from './hook-service'
+
+const configured =
+  '# Operator comments\r\nmodel: "fixture"\r\nplugins:\r\n  enabled: [orca-status]\r\n'
+const initial =
+  '# Recovery notes\nmodel: "001"\nprompt: |\n  First\n  Second\nplugins:\n  enabled: [other] # choices\n'
+
+describe('Hermes config preservation on disk', () => {
+  let directory: string
+  let configPath: string
+  const service = new HermesHookService()
+
+  beforeEach(() => {
+    directory = mkdtempSync(join(tmpdir(), 'orca-hermes-config-'))
+    configPath = join(directory, 'config.yaml')
+    vi.stubEnv('HERMES_HOME', directory)
+  })
+
+  afterEach(() => {
+    vi.unstubAllEnvs()
+    rmSync(directory, { recursive: true, force: true })
+  })
+
+  it('leaves unchanged bytes, inode, timestamp, mode and backup untouched', () => {
+    writeFileSync(configPath, configured, { mode: 0o600 })
+    writeFileSync(`${configPath}.bak`, 'previous recovery point', { mode: 0o600 })
+    utimesSync(configPath, 1_600_000_000, 1_600_000_000)
+    const before = statSync(configPath)
+    const backup = statSync(`${configPath}.bak`)
+    expect(service.install().state).toBe('installed')
+    expect(readFileSync(configPath, 'utf8')).toBe(configured)
+    const after = statSync(configPath)
+    expect([after.ino, after.mtimeMs, after.mode]).toEqual([
+      before.ino,
+      before.mtimeMs,
+      before.mode
+    ])
+    expect(statSync(`${configPath}.bak`)).toEqual(backup)
+    expect(readFileSync(`${configPath}.bak`, 'utf8')).toBe('previous recovery point')
+  })
+
+  it('does not create a backup on a no-op', () => {
+    writeFileSync(configPath, configured)
+    service.install()
+    expect(existsSync(`${configPath}.bak`)).toBe(false)
+  })
+
+  it('does not create a config when removing an absent integration', () => {
+    expect(service.remove().state).toBe('not_installed')
+    expect(readdirSync(directory)).toEqual([])
+  })
+
+  it('preserves comments and multiline values through real install and removal', () => {
+    writeFileSync(configPath, initial)
+    expect(service.install().state).toBe('installed')
+    const installed = readFileSync(configPath, 'utf8')
+    expect(parse(installed).plugins.enabled).toEqual(['other', 'orca-status'])
+    expect(readFileSync(`${configPath}.bak`, 'utf8')).toBe(initial)
+    expect(service.remove().state).toBe('not_installed')
+    const removed = readFileSync(configPath, 'utf8')
+    for (const output of [installed, removed]) {
+      expect(output).toContain('# Recovery notes')
+      expect(output).toContain('# choices')
+      expect(output).toContain('model: "001"')
+      expect(output).toContain('prompt: |\n  First\n  Second\n')
+    }
+    expect(parse(removed)).toEqual(parse(initial))
+    expect(readFileSync(`${configPath}.bak`, 'utf8')).toBe(installed)
+  })
+
+  it.skipIf(process.platform === 'win32').each([
+    [0o600, 0o022],
+    [0o600, 0],
+    [0o640, 0o077],
+    [0o640, 0]
+  ])('preserves mode %i with umask %i and a byte-exact backup', (mode, mask) => {
+    writeFileSync(configPath, initial)
+    chmodSync(configPath, mode)
+    const previous = process.umask(mask)
+    try {
+      expect(service.install().state).toBe('installed')
+    } finally {
+      process.umask(previous)
+    }
+    expect(statSync(configPath).mode & 0o777).toBe(mode)
+    expect(statSync(`${configPath}.bak`).mode & 0o777).toBe(mode)
+    expect(readFileSync(`${configPath}.bak`, 'utf8')).toBe(initial)
+    expect(readdirSync(directory).sort()).toEqual(['config.yaml', 'config.yaml.bak', 'plugins'])
+  })
+
+  it.skipIf(process.platform === 'win32')(
+    'creates a private new config with permissive umask',
+    () => {
+      const previous = process.umask(0)
+      try {
+        expect(service.install().state).toBe('installed')
+      } finally {
+        process.umask(previous)
+      }
+      expect(statSync(configPath).mode & 0o777).toBe(0o600)
+      expect(existsSync(`${configPath}.bak`)).toBe(false)
+    }
+  )
+
+  it.skipIf(process.platform === 'win32')('keeps the config symlink and updates its target', () => {
+    const target = join(directory, 'dotfiles.yaml')
+    writeFileSync(target, initial, { mode: 0o600 })
+    symlinkSync(target, configPath)
+    expect(service.install().state).toBe('installed')
+    expect(lstatSync(configPath).isSymbolicLink()).toBe(true)
+    expect(parse(readFileSync(target, 'utf8')).plugins.enabled).toContain('orca-status')
+    expect(readFileSync(`${target}.bak`, 'utf8')).toBe(initial)
+  })
+
+  it.skipIf(process.platform === 'win32')('refuses a dangling config symlink', () => {
+    symlinkSync(join(directory, 'missing.yaml'), configPath)
+    expect(() => service.install()).toThrow()
+    expect(lstatSync(configPath).isSymbolicLink()).toBe(true)
+    expect(readdirSync(directory)).toEqual(['config.yaml'])
+  })
+
+  it.skipIf(process.platform === 'win32')(
+    'refuses a symlinked backup without touching its target',
+    () => {
+      writeFileSync(configPath, initial)
+      const target = join(directory, 'unrelated')
+      writeFileSync(target, 'preserve me')
+      symlinkSync(target, `${configPath}.bak`)
+      expect(() => service.install()).toThrow('Refusing to overwrite symlinked backup')
+      expect(readFileSync(configPath, 'utf8')).toBe(initial)
+      expect(readFileSync(target, 'utf8')).toBe('preserve me')
+      expect(readdirSync(directory).some((name) => name.endsWith('.tmp'))).toBe(false)
+    }
+  )
+
+  it('replaces a hard-linked backup without changing the unrelated inode', () => {
+    writeFileSync(configPath, initial)
+    const target = join(directory, 'unrelated')
+    writeFileSync(target, 'preserve me')
+    linkSync(target, `${configPath}.bak`)
+    expect(service.install().state).toBe('installed')
+    expect(readFileSync(target, 'utf8')).toBe('preserve me')
+    expect(readFileSync(`${configPath}.bak`, 'utf8')).toBe(initial)
+  })
+
+  it('keeps the config and cleans temporary files when backup publication fails', () => {
+    writeFileSync(configPath, initial)
+    mkdirSync(`${configPath}.bak`)
+    expect(() => service.install()).toThrow()
+    expect(readFileSync(configPath, 'utf8')).toBe(initial)
+    expect(readdirSync(directory).some((name) => name.endsWith('.tmp'))).toBe(false)
+  })
+
+  it('keeps installed plugin files if removal cannot back up the config', () => {
+    expect(service.install().state).toBe('installed')
+    const before = readFileSync(configPath, 'utf8')
+    mkdirSync(`${configPath}.bak`)
+    expect(() => service.remove()).toThrow()
+    expect(readFileSync(configPath, 'utf8')).toBe(before)
+    expect(existsSync(join(directory, 'plugins', 'orca-status', '__init__.py'))).toBe(true)
+    expect(readdirSync(directory).some((name) => name.endsWith('.tmp'))).toBe(false)
+  })
+
+  it('refuses alias-bearing removal before deleting installed plugin files', () => {
+    expect(service.install().state).toBe('installed')
+    const input = 'plugins:\n  enabled: &enabled [orca-status, other]\ncopy: *enabled\n'
+    writeFileSync(configPath, input)
+    expect(service.remove().state).toBe('error')
+    expect(readFileSync(configPath, 'utf8')).toBe(input)
+    expect(existsSync(join(directory, 'plugins', 'orca-status', '__init__.py'))).toBe(true)
+    expect(existsSync(`${configPath}.bak`)).toBe(false)
+  })
+
+  it.each(['plugins: [', 'plugins: unexpected\n', 'plugins:\n  enabled: not-a-list\n'])(
+    'does not install files or rewrite unexpected YAML (%s)',
+    (input) => {
+      writeFileSync(configPath, input)
+      expect(service.install().state).toBe('error')
+      expect(readFileSync(configPath, 'utf8')).toBe(input)
+      expect(readdirSync(directory)).toEqual(['config.yaml'])
+    }
+  )
+})
diff --git a/src/main/hermes/hermes-config-remote-adapter.test.ts b/src/main/hermes/hermes-config-remote-adapter.test.ts
new file mode 100644
index 000000000000..3005d9ef9dd4
--- /dev/null
+++ b/src/main/hermes/hermes-config-remote-adapter.test.ts
@@ -0,0 +1,118 @@
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  readdirSync,
+  rmSync,
+  statSync,
+  writeFileSync
+} from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { parse } from 'yaml'
+import { createManagedHookLocalFilesystem } from '../agent-hooks/managed-hook-local-filesystem'
+import { HermesHookService } from './hook-service'
+
+describe('Hermes remote installer through a local filesystem adapter (no SSH)', () => {
+  let directory: string
+  let configPath: string
+  const service = new HermesHookService()
+
+  beforeEach(() => {
+    directory = mkdtempSync(join(tmpdir(), 'orca-hermes-remote-adapter-'))
+    mkdirSync(join(directory, '.hermes'))
+    configPath = join(directory, '.hermes', 'config.yaml')
+  })
+  afterEach(() => rmSync(directory, { recursive: true, force: true }))
+
+  it('does not rewrite a configured CRLF file or an existing backup', async () => {
+    const initial = '# operator notes\r\nplugins:\r\n  enabled: [zeta, orca-status, alpha]\r\n'
+    writeFileSync(configPath, initial)
+    writeFileSync(`${configPath}.bak`, 'recovery point')
+    const before = statSync(configPath)
+    expect((await service.installRemote(createManagedHookLocalFilesystem(), directory)).state).toBe(
+      'installed'
+    )
+    expect(readFileSync(configPath, 'utf8')).toBe(initial)
+    const after = statSync(configPath)
+    expect([after.ino, after.mtimeMs, after.mode]).toEqual([
+      before.ino,
+      before.mtimeMs,
+      before.mode
+    ])
+    expect(readFileSync(`${configPath}.bak`, 'utf8')).toBe('recovery point')
+  })
+
+  it.each(['\n', '\r\n'])(
+    'preserves comments and parsed values during real install (%j)',
+    async (eol) => {
+      const input =
+        '# notes\nmodel: "001"\nprompt: |\n  First\n  Second\nplugins:\n  enabled: [other]\n'.replaceAll(
+          '\n',
+          eol
+        )
+      writeFileSync(configPath, input)
+      const filesystem = createManagedHookLocalFilesystem()
+      expect((await service.installRemote(filesystem, directory)).state).toBe('installed')
+      const installed = readFileSync(configPath, 'utf8')
+      expect(installed).toContain('# notes')
+      expect(installed).toContain(`prompt: |${eol}  First${eol}  Second`)
+      expect(parse(installed)).toEqual({
+        ...parse(input),
+        plugins: { enabled: ['other', 'orca-status'] }
+      })
+      const before = statSync(configPath)
+      expect((await service.installRemote(filesystem, directory)).state).toBe('installed')
+      expect(statSync(configPath).ino).toBe(before.ino)
+      expect(existsSync(`${configPath}.bak`)).toBe(false)
+    }
+  )
+
+  it.skipIf(process.platform === 'win32').each([0o600, 0o640])(
+    'preserves mode %i despite umask',
+    async (mode) => {
+      writeFileSync(configPath, 'model: fixture\n')
+      chmodSync(configPath, mode)
+      const previous = process.umask(0o077)
+      try {
+        expect(
+          (await service.installRemote(createManagedHookLocalFilesystem(), directory)).state
+        ).toBe('installed')
+      } finally {
+        process.umask(previous)
+      }
+      expect(statSync(configPath).mode & 0o777).toBe(mode)
+    }
+  )
+
+  it.each(['plugins: [', 'plugins: unexpected\n', 'plugins:\n  enabled: [123]\n'])(
+    'refuses unsafe YAML before writing plugin files (%s)',
+    async (input) => {
+      writeFileSync(configPath, input)
+      expect(
+        (await service.installRemote(createManagedHookLocalFilesystem(), directory)).state
+      ).toBe('error')
+      expect(readFileSync(configPath, 'utf8')).toBe(input)
+      expect(readdirSync(join(directory, '.hermes'))).toEqual(['config.yaml'])
+    }
+  )
+
+  it('keeps the config and cleans staged files when remote rename fails', async () => {
+    writeFileSync(configPath, 'model: fixture\n')
+    const filesystem = createManagedHookLocalFilesystem()
+    const rename = filesystem.ext_openssh_rename.bind(filesystem)
+    filesystem.ext_openssh_rename = (source, destination, callback) => {
+      if (destination === configPath) {
+        callback(new Error('fixture rename refusal'))
+      } else {
+        rename(source, destination, callback)
+      }
+    }
+    expect((await service.installRemote(filesystem, directory)).state).toBe('error')
+    expect(readFileSync(configPath, 'utf8')).toBe('model: fixture\n')
+    expect(readdirSync(join(directory, '.hermes')).sort()).toEqual(['config.yaml', 'plugins'])
+  })
+})
diff --git a/src/main/hermes/hermes-config-source-edits.test.ts b/src/main/hermes/hermes-config-source-edits.test.ts
new file mode 100644
index 000000000000..01bc0a06f277
--- /dev/null
+++ b/src/main/hermes/hermes-config-source-edits.test.ts
@@ -0,0 +1,123 @@
+import { describe, expect, it } from 'vitest'
+import { parseDocument } from 'yaml'
+import { disablePlugin, enablePlugin, updateConfigContent } from './hermes-config-yaml'
+
+describe.each(['\n', '\r\n'])('Hermes source edit boundaries (%j)', (eol) => {
+  describe.each([
+    {
+      operation: 'remove',
+      key: 'enabled',
+      updater: disablePlugin,
+      expected: { enabled: [] }
+    },
+    {
+      operation: 'install',
+      key: 'disabled',
+      updater: enablePlugin,
+      expected: { disabled: [], enabled: ['orca-status'] }
+    }
+  ])('$operation with an emptied block list', ({ key, updater, expected }) => {
+    it('replaces a minimal indentless list without a final newline', () => {
+      const input = `plugins:${eol}  ${key}:${eol}  - orca-status`
+      const result = updateConfigContent(input, updater)
+      expect(result.detail).toBeUndefined()
+      const document = parseDocument(result.content ?? '')
+      expect(document.errors).toEqual([])
+      expect(document.warnings).toEqual([])
+      expect(document.toJS()).toEqual({ plugins: expected })
+    })
+
+    it.each([
+      ['indentless', '  ', '  '],
+      ['deeper indentless', '    ', '    '],
+      ['indented', '  ', '    ']
+    ])('preserves comments and unrelated settings (%s)', (_name, keyIndent, listIndent) => {
+      const prefix = [
+        'model:    "001" # untouched spacing',
+        'plugins:',
+        `${keyIndent}"${key}": # list note`,
+        `${listIndent}# first choice`,
+        ''
+      ].join(eol)
+      const custom = `${keyIndent}custom: 'off' # plugin setting${eol}`
+      const suffix = ['prompt: |-', '  First', '  Second', ''].join(eol)
+      const input = `${prefix}${listIndent}- orca-status # managed choice${eol}${custom}${suffix}`
+      const result = updateConfigContent(input, updater)
+      expect(result.detail).toBeUndefined()
+      const output = result.content ?? ''
+      const document = parseDocument(output)
+      expect(document.errors).toEqual([])
+      expect(document.warnings).toEqual([])
+      expect(document.toJS()).toEqual({
+        model: '001',
+        plugins: { ...expected, custom: 'off' },
+        prompt: 'First\nSecond'
+      })
+      expect(output.startsWith(prefix)).toBe(true)
+      expect(output).toContain(custom)
+      expect(output.endsWith(suffix)).toBe(true)
+      expect(output.match(/# managed choice/g)).toHaveLength(1)
+      if (eol === '\r\n') {
+        expect(output.replaceAll(eol, '')).not.toContain('\n')
+      }
+    })
+  })
+
+  it.each([
+    {
+      name: 'plugin trailing comma before a comment',
+      input: 'plugins: {custom: keep, # retain this comment\n  }\n',
+      expected: { plugins: { custom: 'keep', enabled: ['orca-status'] } }
+    },
+    {
+      name: 'root trailing comma before a comment',
+      input: '{model: "001", # retain this comment\n}\n',
+      expected: { model: '001', plugins: { enabled: ['orca-status'] } }
+    },
+    {
+      name: 'plugin trailing comma before several comments',
+      input: 'plugins: {custom: "keep # ,", # first\n  # last\n  } # outside\n',
+      expected: { plugins: { custom: 'keep # ,', enabled: ['orca-status'] } }
+    },
+    {
+      name: 'root trailing comma after a nested map',
+      input: '{model: {name: "001",}, # first\n # last\n}\n',
+      expected: { model: { name: '001' }, plugins: { enabled: ['orca-status'] } }
+    },
+    {
+      name: 'plugin comment ending in a comma without a separator',
+      input: 'plugins: {custom: keep # this comma is only a comment ,\n  }\n',
+      expected: { plugins: { custom: 'keep', enabled: ['orca-status'] } }
+    },
+    {
+      name: 'root comment ending in a comma without a separator',
+      input: '{model: "001" # this comma is only a comment ,\n}\n',
+      expected: { model: '001', plugins: { enabled: ['orca-status'] } }
+    },
+    {
+      name: 'earlier plugin separator without a trailing comma',
+      input: 'plugins: {custom: keep, extra: "off" # last value\n  }\n',
+      expected: { plugins: { custom: 'keep', extra: 'off', enabled: ['orca-status'] } }
+    },
+    {
+      name: 'nested sequence comma without a mapping separator',
+      input: 'plugins: {custom: [one, two,] # nested comma only\n  }\n',
+      expected: { plugins: { custom: ['one', 'two'], enabled: ['orca-status'] } }
+    }
+  ])('inserts entries with $name', ({ input, expected }) => {
+    const source = input.replaceAll('\n', eol)
+    const result = updateConfigContent(source, enablePlugin)
+    expect(result.detail).toBeUndefined()
+    const output = result.content ?? ''
+    const document = parseDocument(output)
+    expect(document.errors).toEqual([])
+    expect(document.warnings).toEqual([])
+    expect(document.toJS()).toEqual(expected)
+    const closingBrace = source.lastIndexOf('}')
+    expect(output.startsWith(source.slice(0, closingBrace))).toBe(true)
+    expect(output.endsWith(source.slice(closingBrace))).toBe(true)
+    if (eol === '\r\n') {
+      expect(output.replaceAll(eol, '')).not.toContain('\n')
+    }
+  })
+})
diff --git a/src/main/hermes/hermes-config-source-edits.ts b/src/main/hermes/hermes-config-source-edits.ts
new file mode 100644
index 000000000000..17b770e8abd7
--- /dev/null
+++ b/src/main/hermes/hermes-config-source-edits.ts
@@ -0,0 +1,158 @@
+import { isDeepStrictEqual } from 'node:util'
+import { Document, isMap, isNode, isSeq, parseDocument } from 'yaml'
+import type { Node, YAMLMap, YAMLSeq } from 'yaml'
+
+type SourceEdit = { start: number; end: number; text: string }
+
+function columnAt(source: string, offset: number): number {
+  return offset - source.lastIndexOf('\n', offset - 1) - 1
+}
+
+function indentFragment(fragment: string, difference: number): string {
+  return fragment.replace(
+    /\n( *)(?=\S)/g,
+    (_match, spaces: string) => `\n${' '.repeat(Math.max(0, spaces.length + difference))}`
+  )
+}
+
+function requireRange(node: unknown): [number, number, number] {
+  if (!isNode(node) || !node.range) {
+    throw new Error('Missing Hermes YAML source range')
+  }
+  return node.range
+}
+
+function insertPair(
+  source: string,
+  printed: string,
+  parent: YAMLMap,
+  updated: YAMLMap,
+  key: string,
+  enclosing: YAMLMap = parent
+): SourceEdit {
+  const pair = updated.items.find((item) => isNode(item.key) && item.key.toJSON() === key)
+  if (!pair) {
+    throw new Error(`Missing Hermes YAML key: ${key}`)
+  }
+  const keyRange = requireRange(pair.key)
+  const valueRange = requireRange(pair.value)
+  const parentRange = requireRange(parent)
+  if (parent.flow) {
+    const position = parentRange[1] - 1
+    if (source[position] !== '}') {
+      throw new Error('Unexpected Hermes flow mapping boundary')
+    }
+    const tail =
+      parent.srcToken?.type === 'flow-collection' ? parent.srcToken.items.at(-1) : undefined
+    const trailingComma =
+      tail?.key === undefined &&
+      tail?.sep === undefined &&
+      tail?.value === undefined &&
+      tail?.start.some((token) => token.type === 'comma')
+    const separator = parent.items.length > 0 && !trailingComma ? ', ' : ' '
+    // A flow closing brace may be outdented farther than an inserted entry or comma.
+    const minimumColumn = enclosing.flow ? 0 : columnAt(source, requireRange(enclosing)[0]) + 1
+    const column = columnAt(source, position)
+    const linePrefix = source.slice(position - column, position)
+    const spacesBeforeTab = /^( *)\t[ \t]*$/.exec(linePrefix)?.[1]?.length
+    // Tabs are separation, so insufficient leading spaces require a fresh indented line.
+    const padding =
+      spacesBeforeTab !== undefined && spacesBeforeTab < minimumColumn
+        ? `\n${' '.repeat(minimumColumn)}`
+        : ' '.repeat(Math.max(0, minimumColumn - column))
+    return {
+      start: position,
+      end: position,
+      text: padding + separator + printed.slice(keyRange[0], valueRange[1])
+    }
+  }
+  const column = columnAt(source, parentRange[0])
+  const fragment = printed.slice(keyRange[0], valueRange[2])
+  const prefix = parentRange[1] > 0 && source[parentRange[1] - 1] !== '\n' ? '\n' : ''
+  const text = `${prefix}${' '.repeat(column)}${indentFragment(fragment, column - columnAt(printed, keyRange[0]))}`
+  return {
+    start: parentRange[1],
+    end: parentRange[1],
+    text: text.endsWith('\n') ? text : `${text}\n`
+  }
+}
+
+export function applyHermesPluginSourceEdits(source: string, document: Document): string {
+  const printed = document.toString({ lineWidth: 0 })
+  const original = parseDocument(source, { keepSourceTokens: true })
+  const updated = parseDocument(printed)
+  if (!isMap(original.contents)) {
+    return source.includes('\r\n') ? printed.replaceAll('\n', '\r\n') : printed
+  }
+  if (!isMap(updated.contents)) {
+    throw new Error('Missing updated Hermes mapping')
+  }
+  const plugins = original.get('plugins', true)
+  const updatedPlugins = updated.get('plugins', true)
+  if (!isMap(updatedPlugins)) {
+    throw new Error('Missing updated Hermes plugins')
+  }
+  const edits: SourceEdit[] = []
+  if (plugins === undefined) {
+    edits.push(insertPair(source, printed, original.contents, updated.contents, 'plugins'))
+  } else {
+    if (!isMap(plugins)) {
+      throw new Error('Unexpected Hermes plugins mapping')
+    }
+    for (const key of ['enabled', 'disabled']) {
+      const previous = plugins.get(key, true)
+      const next = updatedPlugins.get(key, true)
+      if (!isNode(next)) {
+        continue
+      }
+      if (previous === undefined) {
+        edits.push(insertPair(source, printed, plugins, updatedPlugins, key, original.contents))
+      } else if (isNode(previous) && !isDeepStrictEqual(previous.toJSON(), next.toJSON())) {
+        const edited = document.createNode(document.getIn(['plugins', key], true))
+        if (!isSeq(edited)) {
+          throw new Error('Missing edited Hermes plugin list')
+        }
+        edits.push(replaceNode(source, plugins, previous, edited))
+      }
+    }
+  }
+  const newline = source.includes('\r\n') ? '\r\n' : '\n'
+  let result = source
+  for (const edit of edits.sort((a, b) => b.start - a.start)) {
+    result =
+      result.slice(0, edit.start) + edit.text.replaceAll('\n', newline) + result.slice(edit.end)
+  }
+  return result
+}
+
+function replaceNode(source: string, parent: YAMLMap, previous: Node, next: YAMLSeq): SourceEdit {
+  const before = requireRange(previous)
+  // YAML ranges can include the next key's indentation after a trailing comment.
+  const trailingIndent =
+    /(?:^|\n)([ \t]+)$/.exec(source.slice(before[0], before[2]))?.[1].length ?? 0
+  const end = before[2] - trailingIndent
+  // Printing only this list keeps neighboring comments out of its replacement.
+  const isolated = new Document()
+  const sequence = next.clone()
+  if (!isSeq(sequence)) {
+    throw new Error('Missing cloned Hermes plugin list')
+  }
+  isolated.contents = sequence
+  // The original leading comment remains outside the replaced source range.
+  isolated.contents.commentBefore = undefined
+  let fragment = isolated.toString({ lineWidth: 0 })
+  if (!source.slice(before[0], end).endsWith('\n') && !next.comment) {
+    fragment = fragment.replace(/\n$/, '')
+  }
+  const column = columnAt(source, before[0])
+  // Empty flow lists cannot use a block sequence's indentless position.
+  const replacementColumn =
+    isSeq(previous) && !previous.flow && (next.flow || next.items.length === 0)
+      ? Math.max(column, columnAt(source, requireRange(parent)[0]) + 2)
+      : column
+  return {
+    start: before[0],
+    end,
+    text: ' '.repeat(replacementColumn - column) + indentFragment(fragment, replacementColumn)
+  }
+}
diff --git a/src/main/hermes/hermes-config-yaml.ts b/src/main/hermes/hermes-config-yaml.ts
index 9641359c3ddf..c1fbdea98868 100644
--- a/src/main/hermes/hermes-config-yaml.ts
+++ b/src/main/hermes/hermes-config-yaml.ts
@@ -1,6 +1,8 @@
-import { parse, stringify } from 'yaml'
+import { isDeepStrictEqual } from 'node:util'
+import { parse } from 'yaml'
 
 import { HERMES_PLUGIN_NAME } from './hermes-managed-plugin-source'
+import { updateHermesPluginDocument } from './hermes-config-document'
 
 export type HermesConfig = Record<string, unknown>
 
@@ -41,16 +43,14 @@ export function parseHermesConfig(content: string | null): ConfigParseResult {
   }
 }
 
-export function serializeHermesConfig(config: HermesConfig): string {
-  return `${stringify(config, { lineWidth: 0 }).trimEnd()}\n`
-}
-
 export function enablePlugin(config: HermesConfig): HermesConfig {
   const next: HermesConfig = { ...config }
   const plugins = isRecord(next.plugins) ? { ...next.plugins } : {}
   const enabled = asStringArray(plugins.enabled) ?? []
   const disabled = asStringArray(plugins.disabled)
-  plugins.enabled = Array.from(new Set([...enabled, HERMES_PLUGIN_NAME])).sort()
+  plugins.enabled = enabled.includes(HERMES_PLUGIN_NAME)
+    ? enabled
+    : [...enabled, HERMES_PLUGIN_NAME]
   if (disabled === null) {
     // Why: Hermes treats a malformed disabled list as empty. Normalize it here
     // so Orca's install status matches what the real Hermes loader will do.
@@ -70,7 +70,7 @@ export function disablePlugin(config: HermesConfig): HermesConfig {
   }
   const plugins = { ...next.plugins }
   const enabled = asStringArray(plugins.enabled)
-  if (enabled !== null) {
+  if (enabled !== null && plugins.enabled !== undefined) {
     plugins.enabled = enabled.filter((name) => name !== HERMES_PLUGIN_NAME)
   }
   next.plugins = plugins
@@ -85,7 +85,11 @@ export function updateConfigContent(
   if (!parsed.ok) {
     return { content: null, detail: parsed.detail }
   }
-  return { content: serializeHermesConfig(updater(parsed.config)) }
+  const next = updater(parsed.config)
+  if (isDeepStrictEqual(parsed.config, next)) {
+    return { content: content ?? '' }
+  }
+  return updateHermesPluginDocument(content ?? '', next)
 }
 
 export function getConfigEnablement(config: HermesConfig): {
diff --git a/src/main/hermes/hermes-home-filesystem.ts b/src/main/hermes/hermes-home-filesystem.ts
index 7cd7a48a8634..9ff322d5bfa3 100644
--- a/src/main/hermes/hermes-home-filesystem.ts
+++ b/src/main/hermes/hermes-home-filesystem.ts
@@ -1,18 +1,11 @@
-import { randomUUID } from 'node:crypto'
-import {
-  copyFileSync,
-  existsSync,
-  mkdirSync,
-  readFileSync,
-  renameSync,
-  unlinkSync,
-  writeFileSync
-} from 'node:fs'
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { homedir } from 'node:os'
-import { dirname, join } from 'node:path'
+import { join } from 'node:path'
 
 import type { ConfigParseResult, HermesConfig } from './hermes-config-yaml'
-import { parseHermesConfig, serializeHermesConfig } from './hermes-config-yaml'
+import { parseHermesConfig } from './hermes-config-yaml'
+import { resolveHooksJsonWritePath } from '../agent-hooks/hook-config-write-path'
+import { writeHooksJson } from '../agent-hooks/installer-utils'
 import {
   HERMES_PLUGIN_MARKER,
   HERMES_PLUGIN_NAME,
@@ -41,43 +34,19 @@ function getInitPath(pluginDir = getPluginDir()): string {
   return join(pluginDir, '__init__.py')
 }
 
-export function readConfigFile(configPath: string): ConfigParseResult {
-  if (!existsSync(configPath)) {
-    return { ok: true, config: {} }
-  }
-  return parseHermesConfig(readFileSync(configPath, 'utf-8'))
-}
+type ConfigFileReadResult =
+  | { ok: true; config: HermesConfig; content: string }
+  | Extract<ConfigParseResult, { ok: false }>
 
-export function writeConfigFile(configPath: string, config: HermesConfig): void {
-  const dir = dirname(configPath)
-  mkdirSync(dir, { recursive: true })
-  const serialized = serializeHermesConfig(config)
-  if (existsSync(configPath)) {
-    try {
-      if (readFileSync(configPath, 'utf-8') === serialized) {
-        return
-      }
-    } catch {
-      // Fall through to the atomic write path.
-    }
-  }
+export function readConfigFile(configPath: string): ConfigFileReadResult {
+  const readPath = resolveHooksJsonWritePath(configPath)
+  const content = existsSync(readPath) ? readFileSync(readPath, 'utf-8') : ''
+  const parsed = parseHermesConfig(content)
+  return parsed.ok ? { ...parsed, content } : parsed
+}
 
-  const tmpPath = join(dir, `.${Date.now()}-${randomUUID()}.tmp`)
-  try {
-    writeFileSync(tmpPath, serialized, 'utf-8')
-    if (existsSync(configPath)) {
-      copyFileSync(configPath, `${configPath}.bak`)
-    }
-    renameSync(tmpPath, configPath)
-  } finally {
-    if (existsSync(tmpPath)) {
-      try {
-        unlinkSync(tmpPath)
-      } catch {
-        // best effort
-      }
-    }
-  }
+export function writeConfigFile(configPath: string, content: string): void {
+  writeHooksJson(configPath, {}, { serialized: content, preserveMode: true, defaultMode: 0o600 })
 }
 
 export function getPluginFilesState(pluginDir = getPluginDir()): {
diff --git a/src/main/hermes/hook-service.test.ts b/src/main/hermes/hook-service.test.ts
index 4180caf616e5..3158b551480a 100644
--- a/src/main/hermes/hook-service.test.ts
+++ b/src/main/hermes/hook-service.test.ts
@@ -74,7 +74,7 @@ describe('HermesHookService', () => {
     expect(config.plugins.disabled).toEqual([])
   })
 
-  it('normalizes malformed plugin lists during install', () => {
+  it('refuses malformed plugin lists during install', () => {
     writeFileSync(
       join(homeDir, 'config.yaml'),
       ['plugins:', '  enabled: "not-a-list"', '  disabled: "not-a-list"', ''].join('\n'),
@@ -83,12 +83,12 @@ describe('HermesHookService', () => {
 
     const status = new HermesHookService().install()
 
-    expect(status.state).toBe('installed')
+    expect(status.state).toBe('error')
     const config = parse(readFileSync(join(homeDir, 'config.yaml'), 'utf-8')) as {
       plugins: { enabled: string[]; disabled: string[] }
     }
-    expect(config.plugins.enabled).toEqual([_internals.HERMES_PLUGIN_NAME])
-    expect(config.plugins.disabled).toEqual([])
+    expect(config.plugins.enabled).toBe('not-a-list')
+    expect(config.plugins.disabled).toBe('not-a-list')
   })
 
   it('reports partial when the plugin exists but is not enabled', () => {
diff --git a/src/main/hermes/hook-service.ts b/src/main/hermes/hook-service.ts
index 6b1b141f7214..6b6d6ec88731 100644
--- a/src/main/hermes/hook-service.ts
+++ b/src/main/hermes/hook-service.ts
@@ -96,8 +96,20 @@ export class HermesHookService {
       }
     }
 
+    const next = updateConfigContent(parsed.content, enablePlugin)
+    if (next.content === null) {
+      return {
+        agent: 'hermes',
+        state: 'error',
+        configPath,
+        managedHooksPresent: getPluginFilesState().managed,
+        detail: `Could not update Hermes config.yaml: ${next.detail ?? 'unknown error'}`
+      }
+    }
     writePluginFiles()
-    writeConfigFile(configPath, enablePlugin(parsed.config))
+    if (next.content !== parsed.content) {
+      writeConfigFile(configPath, next.content)
+    }
     return this.getStatus()
   }
 
@@ -150,11 +162,23 @@ export class HermesHookService {
         detail: `Could not parse Hermes config.yaml: ${parsed.detail}`
       }
     }
+    const next = updateConfigContent(parsed.content, disablePlugin)
+    if (next.content === null) {
+      return {
+        agent: 'hermes',
+        state: 'error',
+        configPath,
+        managedHooksPresent: getPluginFilesState().managed,
+        detail: `Could not update Hermes config.yaml: ${next.detail ?? 'unknown error'}`
+      }
+    }
+    if (next.content !== parsed.content) {
+      writeConfigFile(configPath, next.content)
+    }
     const pluginDir = getPluginDir()
     if (getPluginFilesState(pluginDir).managed) {
       rmSync(pluginDir, { recursive: true, force: true })
     }
-    writeConfigFile(configPath, disablePlugin(parsed.config))
     return this.getStatus()
   }
 }
diff --git a/src/main/ipc/agent-trust.ts b/src/main/ipc/agent-trust.ts
index 34f39570ccb9..59b7eea3cbcf 100644
--- a/src/main/ipc/agent-trust.ts
+++ b/src/main/ipc/agent-trust.ts
@@ -1,3 +1,4 @@
+import { markQoderWorkspaceTrusted } from '../qoder/workspace-trust'
 import { ipcMain } from 'electron'
 import {
   type AgentTrustPreset,
@@ -6,6 +7,7 @@ import {
   markCopilotFolderTrusted,
   markCursorWorkspaceTrusted
 } from '../agent-trust-presets'
+import { awaitAgentTrustWriteWithinDeadline } from '../agent-trust-write-deadline'
 import { markRemoteAgentWorkspaceTrusted } from '../remote-agent-trust-presets'
 
 /**
@@ -33,17 +35,25 @@ export function registerAgentTrustHandlers(): void {
         if (connectionId) {
           // Why: SSH-launched agents read trust artifacts from the remote
           // user's home, not from this desktop process.
-          await markRemoteAgentWorkspaceTrusted({
-            preset: args.preset,
-            connectionId,
-            workspacePath: args.workspacePath
-          })
+          await awaitAgentTrustWriteWithinDeadline(
+            markRemoteAgentWorkspaceTrusted({
+              preset: args.preset,
+              connectionId,
+              workspacePath: args.workspacePath
+            }),
+            { preset: args.preset, workspacePath: args.workspacePath }
+          )
+        } else if (args.preset === 'qoder') {
+          markQoderWorkspaceTrusted(args.workspacePath)
         } else if (args.preset === 'cursor') {
           markCursorWorkspaceTrusted(args.workspacePath)
         } else if (args.preset === 'copilot') {
           markCopilotFolderTrusted(args.workspacePath)
         } else if (args.preset === 'codex') {
-          markCodexProjectTrusted(args.workspacePath)
+          await awaitAgentTrustWriteWithinDeadline(markCodexProjectTrusted(args.workspacePath), {
+            preset: args.preset,
+            workspacePath: args.workspacePath
+          })
         } else if (args.preset === 'antigravity') {
           markAntigravityWorkspaceTrusted(args.workspacePath)
         }
diff --git a/src/main/ipc/command-path-resolver.ts b/src/main/ipc/command-path-resolver.ts
index e2fe49747e0d..1f2934ba8b21 100644
--- a/src/main/ipc/command-path-resolver.ts
+++ b/src/main/ipc/command-path-resolver.ts
@@ -68,8 +68,16 @@ export async function isCommandOnLocalPath(
   command: string,
   options: ResolveCommandOptions = {}
 ): Promise<boolean> {
+  return (await resolveCommandOnLocalPath(command, options)) !== null
+}
+
+/** The absolute path `isCommandOnLocalPath` found, or null. */
+export async function resolveCommandOnLocalPath(
+  command: string,
+  options: ResolveCommandOptions = {}
+): Promise<string | null> {
   if (!command) {
-    return false
+    return null
   }
   const platform = options.platform ?? process.platform
   const env = options.env ?? process.env
@@ -98,9 +106,9 @@ export async function isCommandOnLocalPath(
         continue
       }
       if (await isExecutableFile(candidate, isWin)) {
-        return true
+        return candidate
       }
     }
   }
-  return false
+  return null
 }
diff --git a/src/main/ipc/desktop-renderer-runtime-capabilities.ts b/src/main/ipc/desktop-renderer-runtime-capabilities.ts
index 63ba9b1d0b11..0bcfd1bd686d 100644
--- a/src/main/ipc/desktop-renderer-runtime-capabilities.ts
+++ b/src/main/ipc/desktop-renderer-runtime-capabilities.ts
@@ -1,5 +1,6 @@
 import {
   AGENT_LAUNCH_RUNTIME_CAPABILITY,
+  AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
   AGENT_SESSION_BACKGROUND_TASK_ROW_STOP_CAPABILITY,
   AGENT_SESSION_BACKGROUND_TASK_STOP_CAPABILITY,
   AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY,
@@ -25,6 +26,7 @@ import {
 export const DESKTOP_RENDERER_RUNTIME_CLIENT_CAPABILITIES: readonly RuntimeCapability[] = [
   AGENT_SESSION_BACKGROUND_TASK_STOP_CAPABILITY,
   AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY,
+  AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
   AGENT_SESSION_TURN_ITEM_CAPABILITY,
   AGENT_SESSION_BACKGROUND_TASK_ROW_STOP_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
diff --git a/src/main/ipc/emulator-frame-stream-socket-lifetime.test.ts b/src/main/ipc/emulator-frame-stream-socket-lifetime.test.ts
new file mode 100644
index 000000000000..e09b897af932
--- /dev/null
+++ b/src/main/ipc/emulator-frame-stream-socket-lifetime.test.ts
@@ -0,0 +1,71 @@
+import { EventEmitter, once } from 'node:events'
+import { createServer, type Server } from 'node:http'
+import type { Socket } from 'node:net'
+import { afterEach, expect, it, vi } from 'vitest'
+
+const handlers = new Map<string, (event: unknown, args: unknown) => unknown>()
+vi.mock('electron', () => ({
+  ipcMain: {
+    handle: (channel: string, handler: (event: unknown, args: unknown) => unknown) => {
+      handlers.set(channel, handler)
+    }
+  },
+  BrowserWindow: { fromWebContents: () => ({}) }
+}))
+
+import { registerEmulatorFrameStreamHandlers } from './emulator-frame-stream'
+
+class Owner extends EventEmitter {
+  isDestroyed = (): boolean => false
+  send = (): void => {
+    this.emit('frame-received')
+  }
+}
+
+let server: Server | null = null
+let owner: Owner | null = null
+
+afterEach(async () => {
+  owner?.emit('destroyed')
+  owner = null
+  if (server) {
+    server.closeAllConnections()
+    await new Promise<void>((resolve) => server?.close(() => resolve()))
+    server = null
+  }
+})
+
+it.each(['did-navigate', 'render-process-gone', 'destroyed'])(
+  'closes the live MJPEG HTTP socket after %s',
+  async (goneEvent) => {
+    registerEmulatorFrameStreamHandlers()
+    const sockets = new Set<Socket>()
+    const httpServer = createServer((_request, response) => {
+      response.writeHead(200, { 'content-type': 'application/octet-stream' })
+      response.write(Buffer.from([0xff, 0xd8, 0x01, 0x02, 0xff, 0xd9]))
+    })
+    server = httpServer
+    httpServer.on('connection', (socket) => {
+      sockets.add(socket)
+      socket.once('close', () => sockets.delete(socket))
+    })
+    await new Promise<void>((resolve) => httpServer.listen(0, '127.0.0.1', resolve))
+    const address = httpServer.address()
+    if (!address || typeof address === 'string') {
+      throw new Error('Expected TCP address')
+    }
+    const sender = new Owner()
+    owner = sender
+    const frameReceived = once(sender, 'frame-received')
+    handlers.get('emulator:frameStreamStart')?.(
+      { sender },
+      { streamUrl: `http://127.0.0.1:${address.port}/stream.mjpeg` }
+    )
+    await frameReceived
+    expect(sockets.size).toBe(1)
+    const closed = Promise.all(Array.from(sockets, (socket) => once(socket, 'close')))
+    sender.emit(goneEvent)
+    await closed
+    expect(sockets.size).toBe(0)
+  }
+)
diff --git a/src/main/ipc/emulator-frame-stream.ts b/src/main/ipc/emulator-frame-stream.ts
index 4cf8eee1a5b0..9a8067041543 100644
--- a/src/main/ipc/emulator-frame-stream.ts
+++ b/src/main/ipc/emulator-frame-stream.ts
@@ -1,11 +1,11 @@
-import { BrowserWindow, ipcMain, type WebContents } from 'electron'
+import { BrowserWindow, ipcMain } from 'electron'
 import { randomUUID } from 'node:crypto'
 import { MjpegFrameStream } from '../emulator/mjpeg-frame-stream'
+import { abortWhenRendererGone } from './renderer-lifetime-abort'
 
 type FrameStreamSession = {
-  owner: WebContents
   stream: MjpegFrameStream
-  onOwnerDestroyed: () => void
+  disposeLifetime: () => void
 }
 
 const sessions = new Map<string, FrameStreamSession>()
@@ -15,11 +15,9 @@ function stopFrameStream(streamId: string): void {
   if (!session) {
     return
   }
-  session.stream.stop()
-  // Why: `.once('destroyed')` self-removes only when that event fires (window
-  // close), so an explicit stop must drop it or each show/hide cycle leaks one.
-  session.owner.removeListener('destroyed', session.onOwnerDestroyed)
   sessions.delete(streamId)
+  session.disposeLifetime()
+  session.stream.stop()
 }
 
 function frameToArrayBuffer(frame: Buffer<ArrayBufferLike>): ArrayBuffer {
@@ -45,12 +43,12 @@ export function registerEmulatorFrameStreamHandlers(): void {
         args.streamUrl,
         {
           onError: (message) => {
-            if (!owner.isDestroyed()) {
+            if (sessions.has(streamId) && !owner.isDestroyed()) {
               owner.send('emulator:frameStreamError', { streamId, message })
             }
           },
           onFrame: (frame) => {
-            if (!owner.isDestroyed()) {
+            if (sessions.has(streamId) && !owner.isDestroyed()) {
               owner.send('emulator:frameStreamFrame', {
                 streamId,
                 bytes: frameToArrayBuffer(frame)
@@ -61,10 +59,22 @@ export function registerEmulatorFrameStreamHandlers(): void {
         args.streamKey
       )
 
-      const onOwnerDestroyed = (): void => stopFrameStream(streamId)
-      sessions.set(streamId, { owner, stream, onOwnerDestroyed })
-      owner.once('destroyed', onOwnerDestroyed)
-      stream.start()
+      const lifetime = abortWhenRendererGone(owner)
+      const onRendererGone = (): void => stopFrameStream(streamId)
+      sessions.set(streamId, {
+        stream,
+        disposeLifetime: () => {
+          lifetime.signal.removeEventListener('abort', onRendererGone)
+          lifetime.dispose()
+        }
+      })
+      lifetime.signal.addEventListener('abort', onRendererGone, { once: true })
+      try {
+        stream.start()
+      } catch (error) {
+        stopFrameStream(streamId)
+        throw error
+      }
       return { streamId }
     }
   )
diff --git a/src/main/ipc/emulator-renderer-lifetime.test.ts b/src/main/ipc/emulator-renderer-lifetime.test.ts
new file mode 100644
index 000000000000..ecaa54b20ce0
--- /dev/null
+++ b/src/main/ipc/emulator-renderer-lifetime.test.ts
@@ -0,0 +1,233 @@
+import { EventEmitter } from 'node:events'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type { MjpegFrameStreamCallbacks } from '../emulator/mjpeg-frame-stream'
+import type { ScrcpyVideoSubscriber } from '../emulator/scrcpy-video-registry'
+
+const mocks = vi.hoisted(() => ({
+  handlers: new Map<string, (event: unknown, args: unknown) => unknown>(),
+  frameCallbacks: new Set<MjpegFrameStreamCallbacks>(),
+  videoSubscribers: new Set<ScrcpyVideoSubscriber>(),
+  frameStarts: vi.fn(),
+  frameStops: vi.fn(),
+  videoStarts: vi.fn(),
+  videoStops: vi.fn()
+}))
+
+vi.mock('electron', () => ({
+  ipcMain: {
+    handle: (channel: string, handler: (event: unknown, args: unknown) => unknown) => {
+      mocks.handlers.set(channel, handler)
+    }
+  },
+  BrowserWindow: { fromWebContents: () => ({}) }
+}))
+vi.mock('../emulator/mjpeg-frame-stream', () => ({
+  MjpegFrameStream: class {
+    constructor(
+      _url: string,
+      private callbacks: MjpegFrameStreamCallbacks
+    ) {}
+    start(): void {
+      mocks.frameStarts()
+      mocks.frameCallbacks.add(this.callbacks)
+    }
+    stop(): void {
+      mocks.frameStops()
+      mocks.frameCallbacks.delete(this.callbacks)
+    }
+  }
+}))
+vi.mock('../emulator/scrcpy-video-registry', () => ({
+  scrcpyVideoRegistry: {
+    subscribe: (_deviceId: string, subscriber: ScrcpyVideoSubscriber) => {
+      mocks.videoStarts()
+      mocks.videoSubscribers.add(subscriber)
+      return () => {
+        mocks.videoStops()
+        mocks.videoSubscribers.delete(subscriber)
+      }
+    }
+  }
+}))
+vi.mock('../emulator/emulator-probe', () => ({ emulatorProbe: () => {} }))
+
+import { registerEmulatorFrameStreamHandlers } from './emulator-frame-stream'
+import { registerEmulatorVideoStreamHandlers } from './emulator-video-stream'
+
+class Owner extends EventEmitter {
+  send = vi.fn()
+  isDestroyed = (): boolean => false
+}
+
+const owners: Owner[] = []
+const goneEvents = ['did-navigate', 'render-process-gone', 'destroyed'] as const
+
+function owner(): Owner {
+  const sender = new Owner()
+  owners.push(sender)
+  return sender
+}
+
+function start(sender: Owner, kind: 'frame' | 'video'): string {
+  const result = mocks.handlers.get(`emulator:${kind}StreamStart`)?.(
+    { sender },
+    kind === 'frame'
+      ? { streamUrl: 'http://127.0.0.1:0/stream.mjpeg' }
+      : { deviceId: 'emulator-5554' }
+  )
+  if (!result || typeof result !== 'object' || !('streamId' in result)) {
+    throw new Error('Missing stream result')
+  }
+  if (typeof result.streamId !== 'string') {
+    throw new Error('Missing stream id')
+  }
+  return result.streamId
+}
+
+function sendFrames(): void {
+  for (const callbacks of mocks.frameCallbacks) {
+    callbacks.onFrame(Buffer.from([0xff, 0xd8, 0xff, 0xd9]))
+  }
+  for (const subscriber of mocks.videoSubscribers) {
+    subscriber({
+      type: 'frame',
+      frame: { config: false, keyFrame: true, pts: '0', bytes: new ArrayBuffer(4) }
+    })
+  }
+}
+
+beforeEach(() => {
+  vi.useFakeTimers()
+  vi.clearAllMocks()
+  registerEmulatorFrameStreamHandlers()
+  registerEmulatorVideoStreamHandlers()
+})
+
+afterEach(() => {
+  for (const sender of owners.splice(0)) {
+    sender.emit('destroyed')
+  }
+  vi.clearAllTimers()
+  vi.useRealTimers()
+  mocks.frameCallbacks.clear()
+  mocks.videoSubscribers.clear()
+})
+
+it.each(goneEvents)('stops both live streams on %s and leaves no per-frame delivery', (event) => {
+  const sender = owner()
+  start(sender, 'frame')
+  start(sender, 'video')
+  vi.runOnlyPendingTimers()
+  sendFrames()
+  expect(sender.send).toHaveBeenCalledTimes(2)
+
+  sender.emit(event)
+  expect(mocks.frameCallbacks.size).toBe(0)
+  expect(mocks.videoSubscribers.size).toBe(0)
+  expect(mocks.frameStops).toHaveBeenCalledTimes(1)
+  expect(mocks.videoStops).toHaveBeenCalledTimes(1)
+  sendFrames()
+  expect(sender.send).toHaveBeenCalledTimes(2)
+  for (const gone of goneEvents) {
+    expect(sender.listenerCount(gone)).toBe(0)
+  }
+})
+
+it.each(goneEvents)('does not start deferred video work after %s', (event) => {
+  const sender = owner()
+  start(sender, 'video')
+  sender.emit(event)
+  vi.runOnlyPendingTimers()
+  expect(mocks.videoStarts).not.toHaveBeenCalled()
+  expect(mocks.videoSubscribers.size).toBe(0)
+})
+
+it('keeps only the current document streams after repeated reloads', () => {
+  const sender = owner()
+  for (let cycle = 0; cycle < 15; cycle++) {
+    start(sender, 'frame')
+    start(sender, 'video')
+    vi.runOnlyPendingTimers()
+    sender.emit('did-navigate')
+  }
+  start(sender, 'frame')
+  start(sender, 'video')
+  vi.runOnlyPendingTimers()
+  expect(mocks.frameCallbacks.size).toBe(1)
+  expect(mocks.videoSubscribers.size).toBe(1)
+  sendFrames()
+  expect(sender.send).toHaveBeenCalledTimes(2)
+})
+
+it('keeps streams through same-document or prevented navigation and releases on explicit stop', () => {
+  const sender = owner()
+  const frameId = start(sender, 'frame')
+  const videoId = start(sender, 'video')
+  vi.runOnlyPendingTimers()
+  sender.emit('did-start-navigation')
+  sender.emit('did-navigate-in-page')
+  sendFrames()
+  expect(sender.send).toHaveBeenCalledTimes(2)
+  mocks.handlers.get('emulator:frameStreamStop')?.({ sender }, { streamId: frameId })
+  mocks.handlers.get('emulator:videoStreamStop')?.({ sender }, { streamId: videoId })
+  expect(mocks.frameCallbacks.size).toBe(0)
+  expect(mocks.videoSubscribers.size).toBe(0)
+  for (const event of goneEvents) {
+    expect(sender.listenerCount(event)).toBe(0)
+  }
+})
+
+it('releases a failed frame-stream start without retaining renderer listeners', () => {
+  const sender = owner()
+  mocks.frameStarts.mockImplementationOnce(() => {
+    throw new Error('Stream unavailable')
+  })
+  expect(() => start(sender, 'frame')).toThrow('Stream unavailable')
+  expect(mocks.frameStops).toHaveBeenCalledTimes(1)
+  for (const event of goneEvents) {
+    expect(sender.listenerCount(event)).toBe(0)
+  }
+})
+
+it('keeps another renderer streams live when the first document reloads', () => {
+  const first = owner()
+  const second = owner()
+  for (const sender of [first, second]) {
+    start(sender, 'frame')
+    start(sender, 'video')
+  }
+  vi.runOnlyPendingTimers()
+  first.emit('did-navigate')
+  sendFrames()
+  expect(first.send).not.toHaveBeenCalled()
+  expect(second.send).toHaveBeenCalledTimes(2)
+  expect(mocks.frameCallbacks.size).toBe(1)
+  expect(mocks.videoSubscribers.size).toBe(1)
+})
+
+it.each([...goneEvents, 'explicit stop'] as const)(
+  'suppresses retired frame callbacks after %s while keeping current stream errors',
+  (event) => {
+    const sender = owner()
+    const streamId = start(sender, 'frame')
+    const callbacks = [...mocks.frameCallbacks][0]
+    callbacks.onError('active failure')
+    expect(sender.send).toHaveBeenCalledWith('emulator:frameStreamError', {
+      streamId,
+      message: 'active failure'
+    })
+    sender.send.mockClear()
+    mocks.frameStops.mockImplementationOnce(() => callbacks.onError('stop failure'))
+    if (event === 'explicit stop') {
+      mocks.handlers.get('emulator:frameStreamStop')?.({ sender }, { streamId })
+    } else {
+      sender.emit(event)
+    }
+    start(sender, 'frame')
+    callbacks.onError('late failure')
+    callbacks.onFrame(Buffer.from([0xff, 0xd8, 0xff, 0xd9]))
+    expect(sender.send).not.toHaveBeenCalled()
+    sendFrames()
+    expect(sender.send).toHaveBeenCalledOnce()
+  }
+)
diff --git a/src/main/ipc/emulator-video-stream.ts b/src/main/ipc/emulator-video-stream.ts
index 8bfe83671039..f6aeb8f2f75c 100644
--- a/src/main/ipc/emulator-video-stream.ts
+++ b/src/main/ipc/emulator-video-stream.ts
@@ -2,6 +2,7 @@ import { BrowserWindow, ipcMain, type WebContents } from 'electron'
 import { randomUUID } from 'node:crypto'
 import { scrcpyVideoRegistry } from '../emulator/scrcpy-video-registry'
 import { emulatorProbe } from '../emulator/emulator-probe'
+import { abortWhenRendererGone } from './renderer-lifetime-abort'
 
 // Bridges the main-process scrcpy video registry to renderer subscribers. The
 // renderer calls emulator:videoStreamStart with a deviceId; meta + H.264 access
@@ -11,7 +12,8 @@ export function registerEmulatorVideoStreamHandlers(): void {
   type Subscription = {
     owner: WebContents
     unsubscribe: () => void
-    onOwnerDestroyed: () => void
+    disposeLifetime: () => void
+    startTimer: ReturnType<typeof setTimeout> | null
   }
   const subscriptions = new Map<string, Subscription>()
 
@@ -20,11 +22,12 @@ export function registerEmulatorVideoStreamHandlers(): void {
     if (!subscription || (owner && subscription.owner !== owner)) {
       return
     }
-    subscription.unsubscribe()
-    // Why: `.once('destroyed')` self-removes only when that event fires (window
-    // close), so an explicit stop must drop it or each show/hide cycle leaks one.
-    subscription.owner.removeListener('destroyed', subscription.onOwnerDestroyed)
     subscriptions.delete(streamId)
+    if (subscription.startTimer !== null) {
+      clearTimeout(subscription.startTimer)
+    }
+    subscription.disposeLifetime()
+    subscription.unsubscribe()
   }
 
   ipcMain.handle(
@@ -44,14 +47,21 @@ export function registerEmulatorVideoStreamHandlers(): void {
         throw new Error('Video stream id is already in use by another renderer')
       }
       stopSubscription(streamId, owner)
-      const onOwnerDestroyed = (): void => stopSubscription(streamId, owner)
+      const lifetime = abortWhenRendererGone(owner)
+      const onRendererGone = (): void => stopSubscription(streamId, owner)
       const pendingSubscription: Subscription = {
         owner,
         unsubscribe: () => {},
-        onOwnerDestroyed
+        disposeLifetime: () => {
+          lifetime.signal.removeEventListener('abort', onRendererGone)
+          lifetime.dispose()
+        },
+        startTimer: null
       }
       subscriptions.set(streamId, pendingSubscription)
-      setTimeout(() => {
+      lifetime.signal.addEventListener('abort', onRendererGone, { once: true })
+      pendingSubscription.startTimer = setTimeout(() => {
+        pendingSubscription.startTimer = null
         if (owner.isDestroyed() || subscriptions.get(streamId) !== pendingSubscription) {
           return
         }
@@ -75,7 +85,6 @@ export function registerEmulatorVideoStreamHandlers(): void {
         })
         pendingSubscription.unsubscribe = unsubscribe
       }, 0)
-      owner.once('destroyed', onOwnerDestroyed)
       return { streamId }
     }
   )
diff --git a/src/main/ipc/filesystem-allowed-roots.ts b/src/main/ipc/filesystem-allowed-roots.ts
index fb4e9854c2e8..115e038218d6 100644
--- a/src/main/ipc/filesystem-allowed-roots.ts
+++ b/src/main/ipc/filesystem-allowed-roots.ts
@@ -1,4 +1,4 @@
-import { resolve } from 'node:path'
+import { isAbsolute, resolve } from 'node:path'
 import type { Store } from '../persistence'
 import { computeWorkspaceRoot, getWorktreePathSettings } from './worktree-logic'
 import {
@@ -14,13 +14,13 @@ import {
 import type { FolderWorkspace } from '../../shared/folder-workspace-types'
 import type { ProjectGroup } from '../../shared/project-group-types'
 import type { Repo } from '../../shared/repo-types'
+import { hasRemoteFilesystemOwner } from './remote-filesystem-owner'
 
 type FolderScopeStore = Pick<Store, 'getRepos'> &
   Partial<Pick<Store, 'getProjectGroups' | 'getFolderWorkspaces'>>
 
-// Why: SSH repo paths are remote-host paths; treating them as local roots could authorize unrelated local folders or probe SSH-only paths.
 function filterLocalRepos(repos: readonly Repo[]): Repo[] {
-  return repos.filter((repo) => !repo.connectionId)
+  return repos.filter((repo) => !hasRemoteFilesystemOwner(repo))
 }
 
 export function getLocalRepos(store: Store) {
@@ -30,11 +30,11 @@ export function getLocalRepos(store: Store) {
 function isRemoteOnlyFolderScope(
   folderPath: string,
   projectGroupId: string,
-  connectionId: string | null | undefined,
+  hasRemoteOwner: boolean,
   childGroupIndex: ProjectGroupChildIndex,
   repos: readonly Repo[]
 ): boolean {
-  if (connectionId) {
+  if (hasRemoteOwner) {
     return true
   }
   const groupIds = collectProjectGroupSubtreeIds(childGroupIndex, projectGroupId)
@@ -45,7 +45,7 @@ function isRemoteOnlyFolderScope(
       isPathInsideOrEqual(folderPath, repo.path)
     ) {
       // One local candidate settles the scope without scanning the remaining repositories.
-      if (!repo.connectionId) {
+      if (!hasRemoteFilesystemOwner(repo)) {
         return false
       }
       hasRemoteCandidate = true
@@ -54,15 +54,21 @@ function isRemoteOnlyFolderScope(
   return hasRemoteCandidate
 }
 
-function getFolderWorkspaceConnectionId(
+/**
+ * Deliberately stricter than `resolveFolderWorkspaceHost`, which lets the workspace's own
+ * `executionHostId` pin win: a workspace pinned `local` under a group carrying only a legacy
+ * `connectionId` dispatches locally but is denied here. Letting the pin win would hand out a root
+ * the store refuses today, so authorization keeps the fail-closed read of either field.
+ */
+function hasRemoteFolderWorkspaceOwner(
   workspace: FolderWorkspace,
   projectGroups: readonly ProjectGroup[]
-): string | null {
-  return (
-    workspace.connectionId ??
-    projectGroups.find((group) => group.id === workspace.projectGroupId)?.connectionId ??
-    null
-  )
+): boolean {
+  const group = projectGroups.find((group) => group.id === workspace.projectGroupId)
+  return hasRemoteFilesystemOwner({
+    connectionId: workspace.connectionId ?? group?.connectionId,
+    executionHostId: workspace.executionHostId ?? group?.executionHostId
+  })
 }
 
 function getLocalFolderScopeRoots(store: Store, repos: readonly Repo[]): string[] {
@@ -77,7 +83,7 @@ function getLocalFolderScopeRoots(store: Store, repos: readonly Repo[]): string[
       !isRemoteOnlyFolderScope(
         group.parentPath,
         group.id,
-        group.connectionId,
+        hasRemoteFilesystemOwner(group),
         childGroupIndex,
         repos
       )
@@ -90,7 +96,7 @@ function getLocalFolderScopeRoots(store: Store, repos: readonly Repo[]): string[
       !isRemoteOnlyFolderScope(
         workspace.folderPath,
         workspace.projectGroupId,
-        getFolderWorkspaceConnectionId(workspace, projectGroups),
+        hasRemoteFolderWorkspaceOwner(workspace, projectGroups),
         childGroupIndex,
         repos
       )
@@ -101,6 +107,28 @@ function getLocalFolderScopeRoots(store: Store, repos: readonly Repo[]): string[
   return roots
 }
 
+/** The single path implementation that both judges and resolves a local root. */
+type HostPathResolver = {
+  isAbsolute: (value: string) => boolean
+  resolve: (value: string) => string
+}
+
+/**
+ * The allowed root a `workspaceDir` with no local repo to anchor it may contribute, or `null`.
+ *
+ * The predicate has to be the host's own, not `isRuntimePathAbsolute`: that helper accepts either
+ * flavour, so on POSIX it calls `C:\ws` absolute while this `resolve` reads the same string as a
+ * relative name and anchors the root under the main-process cwd — authorizing an unrelated local
+ * tree. Pairing both here keeps them from diverging again; `hostPath` is injectable so the
+ * flavour matrix can run POSIX and Windows without the test choosing on `process.platform`.
+ */
+export function resolveUnanchoredWorkspaceRoot(
+  workspaceDir: string,
+  hostPath: HostPathResolver = { isAbsolute, resolve }
+): string | null {
+  return hostPath.isAbsolute(workspaceDir) ? hostPath.resolve(workspaceDir) : null
+}
+
 export function getAllowedRoots(store: Store): string[] {
   // Why one read: `getRepos` rehydrates every repo, and this runs twice per filesystem IPC.
   const repos = store.getRepos()
@@ -112,7 +140,10 @@ export function getAllowedRoots(store: Store): string[] {
   ]
   if (settings.workspaceDir) {
     if (localRepos.length === 0) {
-      roots.push(resolve(settings.workspaceDir))
+      const unanchoredRoot = resolveUnanchoredWorkspaceRoot(settings.workspaceDir)
+      if (unanchoredRoot) {
+        roots.push(unanchoredRoot)
+      }
     } else {
       const projectRuntimeByRepoId = resolveLocalProjectRuntimesForRepos(store, localRepos)
       for (const repo of localRepos) {
diff --git a/src/main/ipc/filesystem-auth.ts b/src/main/ipc/filesystem-auth.ts
index 894e39945c16..6110ea7baf20 100644
--- a/src/main/ipc/filesystem-auth.ts
+++ b/src/main/ipc/filesystem-auth.ts
@@ -183,7 +183,7 @@ async function isPathAllowedIncludingRegisteredWorktrees(
     return true
   }
 
-  if (isRegisteredWorktreePath(targetPath)) {
+  if (isRegisteredWorktreePath(targetPath, store)) {
     return true
   }
 
@@ -198,7 +198,9 @@ async function isPathAllowedIncludingRegisteredWorktrees(
     return true
   }
 
-  if (await isPathAllowedByCanonicalRegisteredRoot(targetPath, options.canonicalSourcePath)) {
+  if (
+    await isPathAllowedByCanonicalRegisteredRoot(targetPath, options.canonicalSourcePath, store)
+  ) {
     return true
   }
 
@@ -206,8 +208,8 @@ async function isPathAllowedIncludingRegisteredWorktrees(
 
   // Why: linked worktrees are already git-trusted; reuse the cached root index so reads don't spawn `git worktree list` each time.
   return (
-    isRegisteredWorktreePath(targetPath) ||
-    (await isPathAllowedByCanonicalRegisteredRoot(targetPath, options.canonicalSourcePath))
+    isRegisteredWorktreePath(targetPath, store) ||
+    (await isPathAllowedByCanonicalRegisteredRoot(targetPath, options.canonicalSourcePath, store))
   )
 }
 
diff --git a/src/main/ipc/filesystem-canonical-owner.test.ts b/src/main/ipc/filesystem-canonical-owner.test.ts
new file mode 100644
index 000000000000..ec4888a3f526
--- /dev/null
+++ b/src/main/ipc/filesystem-canonical-owner.test.ts
@@ -0,0 +1,369 @@
+import { join, posix, resolve, win32 } from 'node:path'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { Store } from '../persistence'
+import type { Repo } from '../../shared/repo-types'
+import type { ProjectGroup } from '../../shared/project-group-types'
+import type { FolderWorkspace } from '../../shared/folder-workspace-types'
+import { resolveFolderWorkspaceHost } from '../../shared/folder-workspace-execution-host'
+import {
+  getAllowedRoots,
+  getLocalRepos,
+  resolveUnanchoredWorkspaceRoot
+} from './filesystem-allowed-roots'
+import { isPathAllowed } from './filesystem-auth'
+import {
+  __resetCreatedWorktreeRootsForTests,
+  invalidateAuthorizedRootsCache,
+  isRegisteredWorktreePath,
+  rebuildAuthorizedRootsCache,
+  registerCreatedWorktreeRoot,
+  registerWorktreeRootsForRepo
+} from './registered-worktree-roots-cache'
+
+const mocks = vi.hoisted(() => ({
+  graph: vi.fn(),
+  stat: vi.fn(),
+  realpath: vi.fn(),
+  workspaceRoot: vi.fn(),
+  pathSettings: vi.fn(),
+  projectRuntimes: vi.fn()
+}))
+vi.mock('node:fs/promises', () => ({ stat: mocks.stat, realpath: mocks.realpath }))
+vi.mock('../repo-worktrees', () => ({ listRepoWorktreeGraph: mocks.graph, isRepoRoot: vi.fn() }))
+vi.mock('./worktree-logic', () => ({
+  computeWorkspaceRoot: mocks.workspaceRoot,
+  getWorktreePathSettings: mocks.pathSettings
+}))
+vi.mock('../project-runtime-git-options', () => ({
+  getWorktreeMirrorDistroForRuntime: vi.fn(),
+  resolveLocalProjectRuntimesForRepos: mocks.projectRuntimes
+}))
+
+/**
+ * Widened past `Repo['executionHostId']` on purpose: the union names the stamps Orca writes, while a
+ * store carries whatever an older build, a hand-edited catalog or a partial migration left behind.
+ * Those are exactly the stamps authorization has to place, so the matrix must be able to build them.
+ */
+type Owner = { connectionId?: string | null; executionHostId?: string | null }
+const root = resolve('/owner-fixture')
+const linked = resolve('/linked-fixture')
+function repo(owner: Owner = {}, overrides: Partial<Repo> = {}): Repo {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only `executionHostId` leaves the union, and only to the malformed stamps above; every other field is a checked `Repo` field.
+  return {
+    id: 'repo',
+    path: root,
+    displayName: 'repo',
+    badgeColor: '#000',
+    addedAt: 0,
+    ...owner,
+    ...overrides
+  } as Repo
+}
+function group(owner: Owner = {}, overrides: Partial<ProjectGroup> = {}): ProjectGroup {
+  return {
+    id: 'group',
+    name: 'group',
+    parentPath: root,
+    parentGroupId: null,
+    createdFrom: 'manual',
+    tabOrder: 0,
+    isCollapsed: false,
+    color: null,
+    createdAt: 0,
+    updatedAt: 0,
+    ...owner,
+    ...overrides
+  }
+}
+function folder(owner: Owner = {}): FolderWorkspace {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: same widened stamp as `repo`; all other fields are checked `FolderWorkspace` fields.
+  return {
+    id: 'folder',
+    projectGroupId: 'group',
+    name: 'folder',
+    folderPath: root,
+    linkedTask: null,
+    comment: '',
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: 0,
+    lastActivityAt: 0,
+    createdAt: 0,
+    updatedAt: 0,
+    ...owner
+  } as FolderWorkspace
+}
+function storeFor(
+  repos: Repo[] = [],
+  groups: ProjectGroup[] = [],
+  folders: FolderWorkspace[] = [],
+  settings: { workspaceDir?: string } = {}
+): Store {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Authorization reads only these catalog and settings methods; fixtures omit workspaceDir unless the case is about it.
+  return {
+    getRepos: () => repos,
+    getProjectGroups: () => groups,
+    getFolderWorkspaces: () => folders,
+    getSettings: () => settings
+  } as Store
+}
+
+const deniedOwners: { name: string; owner: Owner }[] = [
+  { name: 'canonical SSH', owner: { executionHostId: 'ssh:host-a' } },
+  { name: 'encoded canonical SSH', owner: { executionHostId: 'ssh:host%20a' } },
+  { name: 'legacy SSH', owner: { connectionId: 'host-a' } },
+  {
+    name: 'explicit local with legacy SSH',
+    owner: { executionHostId: 'local', connectionId: 'host-a' }
+  },
+  {
+    name: 'runtime with legacy SSH',
+    owner: { executionHostId: 'runtime:env', connectionId: 'host-a' }
+  },
+  // Host ids the shared parser rejects. Each must fail closed: an owner we cannot place is not
+  // evidence of a local one, and a bare `getSshTargetIdForExecutionHost` answers null for all five.
+  { name: 'empty SSH target', owner: { executionHostId: 'ssh:' } },
+  { name: 'undecodable SSH target', owner: { executionHostId: 'ssh:%zz' } },
+  { name: 'alias-delimiter SSH target', owner: { executionHostId: 'ssh:host-a|alias' } },
+  { name: 'wrong-case SSH prefix', owner: { executionHostId: 'SSH:host-a' } },
+  { name: 'unknown host kind', owner: { executionHostId: 'relay:host-a' } }
+]
+const allowedOwners: { name: string; owner: Owner }[] = [
+  { name: 'unscoped local', owner: {} },
+  { name: 'explicit local', owner: { executionHostId: 'local' } },
+  { name: 'blank host stamp', owner: { executionHostId: '  ' } },
+  { name: 'own-store runtime', owner: { executionHostId: 'runtime:env' } }
+]
+
+beforeEach(() => {
+  invalidateAuthorizedRootsCache()
+  __resetCreatedWorktreeRootsForTests()
+  vi.clearAllMocks()
+  mocks.graph.mockResolvedValue([])
+  mocks.stat.mockResolvedValue({})
+  mocks.realpath.mockImplementation(async (path: string) => path)
+  mocks.projectRuntimes.mockReturnValue(new Map())
+  mocks.pathSettings.mockImplementation(
+    (_repo: Repo, settings: { workspaceDir: string }) => settings
+  )
+  mocks.workspaceRoot.mockImplementation(
+    (_repoPath: string, settings: { workspaceDir: string }) => settings.workspaceDir
+  )
+})
+
+describe.each(deniedOwners)('$name fixture matrix', ({ owner }) => {
+  it.each([
+    ['repo root', () => storeFor([repo(owner)])],
+    ['group scope', () => storeFor([], [group(owner)])],
+    ['folder scope', () => storeFor([], [], [folder(owner)])],
+    ['folder inheriting the group', () => storeFor([], [group(owner)], [folder()])],
+    [
+      'local-looking group and folder over a remote child repo',
+      () => storeFor([repo(owner, { path: join(root, 'child') })], [group()], [folder()])
+    ]
+  ])('denies the %s', (_case, build) => {
+    expect(isPathAllowed(join(root, 'file'), build())).toBe(false)
+  })
+})
+
+describe.each(deniedOwners)('$name filesystem ownership', ({ owner }) => {
+  it('does not grant a repository root or register linked roots', async () => {
+    const store = storeFor([repo(owner)])
+    expect(getLocalRepos(store)).toEqual([])
+    expect(isPathAllowed(join(root, 'file'), store)).toBe(false)
+    registerWorktreeRootsForRepo(store, 'repo', [linked])
+    registerCreatedWorktreeRoot(store, 'repo', linked)
+    expect(isRegisteredWorktreePath(linked, store)).toBe(false)
+    await rebuildAuthorizedRootsCache(store)
+    expect(isRegisteredWorktreePath(root, store)).toBe(false)
+    expect(mocks.graph).not.toHaveBeenCalled()
+    expect(mocks.stat).not.toHaveBeenCalled()
+  })
+
+  it.each(['group', 'folder', 'inherited group'] as const)(
+    'does not grant an empty %s scope',
+    (kind) => {
+      const store = storeFor(
+        [],
+        kind !== 'folder' ? [group(owner)] : [],
+        kind === 'folder' ? [folder(owner)] : kind === 'inherited group' ? [folder()] : []
+      )
+      expect(getAllowedRoots(store)).toEqual([])
+      expect(isPathAllowed(join(root, 'file'), store)).toBe(false)
+    }
+  )
+
+  it('does not infer a local group or folder from a remote child repo', () => {
+    const store = storeFor(
+      [repo(owner, { path: join(root, 'child'), projectGroupId: 'nested' })],
+      [group(), group({}, { id: 'nested', parentGroupId: 'group', parentPath: null })],
+      [folder()]
+    )
+    expect(getAllowedRoots(store)).toEqual([])
+    expect(isPathAllowed(join(root, 'file'), store)).toBe(false)
+  })
+})
+
+describe.each(allowedOwners)('$name filesystem ownership', ({ owner }) => {
+  it('preserves repo, group, folder and recovered worktree roots', () => {
+    for (const store of [
+      storeFor([repo(owner)]),
+      storeFor([], [group(owner)]),
+      storeFor([], [], [folder(owner)])
+    ]) {
+      expect(getAllowedRoots(store)).toEqual([root])
+      expect(isPathAllowed(join(root, 'file'), store)).toBe(true)
+    }
+    const store = storeFor([repo(owner)])
+    registerWorktreeRootsForRepo(store, 'repo', [root])
+    registerCreatedWorktreeRoot(store, 'repo', linked)
+    invalidateAuthorizedRootsCache()
+    expect(isRegisteredWorktreePath(linked, store)).toBe(true)
+    expect(mocks.graph).not.toHaveBeenCalled()
+    expect(mocks.stat).not.toHaveBeenCalled()
+  })
+})
+
+it('preserves an unpinned mixed local and SSH folder scope', () => {
+  const store = storeFor(
+    [
+      repo({ executionHostId: 'ssh:host-a' }, { path: join(root, 'remote') }),
+      repo({}, { id: 'local', path: join(root, 'local') })
+    ],
+    [group()],
+    [folder()]
+  )
+  expect(getAllowedRoots(store)).toEqual([join(root, 'local'), root, root])
+})
+
+it('keeps an explicit SSH folder scope remote even with a local candidate', () => {
+  const store = storeFor(
+    [repo({}, { path: join(root, 'local') })],
+    [group({ executionHostId: 'ssh:host-a' })],
+    [folder()]
+  )
+  expect(getAllowedRoots(store)).toEqual([join(root, 'local')])
+  expect(isPathAllowed(join(root, 'file'), store)).toBe(false)
+})
+
+it('preserves explicit local folder overrides and the legacy empty connection override', () => {
+  expect(
+    getAllowedRoots(
+      storeFor(
+        [],
+        [group({ executionHostId: 'ssh:host-a' })],
+        [folder({ executionHostId: 'local' })]
+      )
+    )
+  ).toEqual([root])
+  expect(
+    getAllowedRoots(
+      storeFor([], [group({ connectionId: 'host-a' })], [folder({ connectionId: '' })])
+    )
+  ).toEqual([root])
+})
+
+it('denies a workspace pinned local under a group carrying only a legacy connection', () => {
+  const pinnedFolder = folder({ executionHostId: 'local' })
+  const legacyGroup = group({ connectionId: 'host-a' })
+  const store = storeFor([], [legacyGroup], [pinnedFolder])
+  expect(getAllowedRoots(store)).toEqual([])
+  expect(isPathAllowed(join(root, 'file'), store)).toBe(false)
+  // Dispatch reads the same row as local; authorization is deliberately the stricter of the two,
+  // because agreeing would grant a root this store refuses today.
+  expect(
+    resolveFolderWorkspaceHost(
+      { folderWorkspaces: [pinnedFolder], projectGroups: [legacyGroup], repos: [] },
+      'folder'
+    )
+  ).toEqual({ kind: 'local' })
+  // The mirrored row needs no such note: the workspace's own legacy connection is remote on both sides.
+  const mirrored = storeFor(
+    [],
+    [group({ executionHostId: 'local' }, { parentPath: null })],
+    [folder({ connectionId: 'host-a' })]
+  )
+  expect(getAllowedRoots(mirrored)).toEqual([])
+  expect(isPathAllowed(join(root, 'file'), mirrored)).toBe(false)
+})
+
+it('still grants a local directory that happens to share an SSH repo path', () => {
+  const store = storeFor([
+    repo({ executionHostId: 'ssh:host-a' }),
+    repo({}, { id: 'mine', path: root })
+  ])
+  expect(getAllowedRoots(store)).toEqual([root])
+  expect(isPathAllowed(join(root, 'file'), store)).toBe(true)
+})
+
+describe('workspace-directory fallback', () => {
+  const workspaceDir = resolve('/ws-fixture')
+
+  it('does not widen past the roots a local repo of its own would grant', () => {
+    const local = getAllowedRoots(storeFor([repo()], [], [], { workspaceDir }))
+    const sshOnly = getAllowedRoots(
+      storeFor([repo({ executionHostId: 'ssh:host-a' })], [], [], { workspaceDir })
+    )
+    expect(local).toEqual([root, workspaceDir])
+    // The SSH repo's own path is gone; nothing beyond the fallback the same config already granted.
+    expect(sshOnly).toEqual([workspaceDir])
+    expect(
+      isPathAllowed(
+        join(root, 'file'),
+        storeFor([repo({ connectionId: 'host-a' })], [], [], { workspaceDir })
+      )
+    ).toBe(false)
+  })
+
+  it('grants a workspace directory this host reads as absolute, with no local repo', () => {
+    expect(getAllowedRoots(storeFor([], [], [], { workspaceDir: '/ws-fixture' }))).toEqual([
+      resolve('/ws-fixture')
+    ])
+  })
+
+  it.each([
+    ['bare name', 'orca-ws'],
+    ['parent traversal', '..'],
+    ['relative traversal', '../orca-ws']
+  ])('grants nothing for a repo-relative %s with no repo to anchor it', (_case, dir) => {
+    // `resolve` would anchor these to the main-process cwd, granting an unrelated tree.
+    expect(getAllowedRoots(storeFor([], [], [], { workspaceDir: dir }))).toEqual([])
+    expect(
+      getAllowedRoots(
+        storeFor([repo({ executionHostId: 'ssh:host-a' })], [], [], {
+          workspaceDir: dir
+        })
+      )
+    ).toEqual([])
+  })
+
+  // Why guarded rather than injected: this is the end-to-end claim that the foreign-flavour string
+  // never reaches `resolve`, so it has to run against the real host path module — and on Windows the
+  // same string is a legitimate root. The flavour matrix below covers both hosts unguarded.
+  it.skipIf(process.platform === 'win32')(
+    'does not anchor a Windows-style workspace directory under the POSIX main-process cwd',
+    () => {
+      const store = storeFor([], [], [], { workspaceDir: 'C:\\workspaces' })
+      expect(getAllowedRoots(store)).toEqual([])
+      // The cross-platform predicate used to grant exactly this: `<cwd>/C:\workspaces`.
+      expect(isPathAllowed(join(resolve('C:\\workspaces'), 'file'), store)).toBe(false)
+    }
+  )
+
+  it.each([
+    ['POSIX absolute on POSIX', posix, '/orca-ws', true],
+    ['relative on POSIX', posix, '../orca-ws', false],
+    ['Windows drive on POSIX', posix, 'C:\\orca-ws', false],
+    ['Windows UNC on POSIX', posix, '\\\\wsl$\\Ubuntu\\home\\me\\ws', false],
+    ['POSIX absolute on Windows', win32, '/orca-ws', true],
+    ['relative on Windows', win32, '..\\orca-ws', false],
+    ['Windows drive on Windows', win32, 'C:\\orca-ws', true],
+    ['Windows UNC on Windows', win32, '\\\\wsl$\\Ubuntu\\home\\me\\ws', true]
+  ])(
+    'grants an unanchored %s workspace directory only when that host reads it as absolute',
+    (_case, hostPath, dir, granted) => {
+      expect(resolveUnanchoredWorkspaceRoot(dir, hostPath) !== null).toBe(granted)
+    }
+  )
+})
diff --git a/src/main/ipc/filesystem-markdown-document-listing.test.ts b/src/main/ipc/filesystem-markdown-document-listing.test.ts
index d70d46c48e11..be94530352dd 100644
--- a/src/main/ipc/filesystem-markdown-document-listing.test.ts
+++ b/src/main/ipc/filesystem-markdown-document-listing.test.ts
@@ -1,15 +1,28 @@
 import path from 'node:path'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type * as MarkdownDocumentsModule from './markdown-documents'
 import {
   handlers,
   store,
-  dirEntry,
   WORKTREE_FEATURE_PATH,
   readdirMock,
   getSshFilesystemProviderMock,
   resetFilesystemIpcMocks
 } from './filesystem-test-harness'
 
+const { listMarkdownDocumentsMock, localOptionsMock } = vi.hoisted(() => ({
+  listMarkdownDocumentsMock: vi.fn(),
+  localOptionsMock: vi.fn()
+}))
+
+vi.mock('./markdown-documents', async (importOriginal) => ({
+  ...(await importOriginal<typeof MarkdownDocumentsModule>()),
+  listMarkdownDocuments: listMarkdownDocumentsMock
+}))
+vi.mock('./local-worktree-runtime-options', () => ({
+  getLocalGitOptionsForRegisteredWorktree: localOptionsMock
+}))
+
 vi.mock('electron', async () => (await import('./filesystem-test-harness')).electronMock)
 vi.mock('fs/promises', async () => (await import('./filesystem-test-harness')).fsPromisesMock)
 vi.mock(
@@ -64,95 +77,39 @@ import { invalidateAuthorizedRootsCache } from './registered-worktree-roots-cach
 describe('registerFilesystemHandlers', () => {
   beforeEach(() => {
     resetFilesystemIpcMocks()
+    listMarkdownDocumentsMock.mockReset().mockResolvedValue([])
+    localOptionsMock.mockReset().mockReturnValue({})
     // Reset module-level auth cache so each test starts with a fresh dirty
     // flag — prevents stale worktree data from a prior test's cache rebuild.
     invalidateAuthorizedRootsCache()
   })
 
-  it('lists markdown documents recursively for a registered worktree', async () => {
-    readdirMock.mockImplementation(async (dirPath: string) => {
-      if (dirPath === WORKTREE_FEATURE_PATH) {
-        return [
-          dirEntry({ name: 'README.md', file: true }),
-          dirEntry({ name: 'docs', directory: true }),
-          dirEntry({ name: 'script.ts', file: true })
-        ]
-      }
-      if (dirPath === path.join(WORKTREE_FEATURE_PATH, 'docs')) {
-        return [
-          dirEntry({ name: 'Guide.MDX', file: true }),
-          dirEntry({ name: 'notes.markdown', file: true })
-        ]
-      }
-      return []
-    })
-
+  it('lists local documents through the bundled discovery path after authorization', async () => {
+    const documents = [{ filePath: path.join(WORKTREE_FEATURE_PATH, 'README.md') }]
+    listMarkdownDocumentsMock.mockResolvedValue(documents)
     registerFilesystemHandlers(store as never)
 
     await expect(
-      handlers.get('fs:listMarkdownDocuments')!(null, {
-        rootPath: WORKTREE_FEATURE_PATH
-      })
-    ).resolves.toEqual([
-      {
-        filePath: path.join(WORKTREE_FEATURE_PATH, 'docs', 'Guide.MDX'),
-        relativePath: 'docs/Guide.MDX',
-        basename: 'Guide.MDX',
-        name: 'Guide'
-      },
-      {
-        filePath: path.join(WORKTREE_FEATURE_PATH, 'docs', 'notes.markdown'),
-        relativePath: 'docs/notes.markdown',
-        basename: 'notes.markdown',
-        name: 'notes'
-      },
-      {
-        filePath: path.join(WORKTREE_FEATURE_PATH, 'README.md'),
-        relativePath: 'README.md',
-        basename: 'README.md',
-        name: 'README'
-      }
-    ])
+      handlers.get('fs:listMarkdownDocuments')!(null, { rootPath: WORKTREE_FEATURE_PATH })
+    ).resolves.toBe(documents)
+    expect(localOptionsMock).toHaveBeenCalledWith(
+      store,
+      WORKTREE_FEATURE_PATH,
+      WORKTREE_FEATURE_PATH
+    )
+    expect(listMarkdownDocumentsMock).toHaveBeenCalledWith(WORKTREE_FEATURE_PATH, {})
+    expect(readdirMock).not.toHaveBeenCalled()
   })
 
-  it('skips ignored and symlinked directories when listing markdown documents', async () => {
-    readdirMock.mockImplementation(async (dirPath: string) => {
-      if (dirPath === WORKTREE_FEATURE_PATH) {
-        return [
-          dirEntry({ name: '.git', directory: true }),
-          dirEntry({ name: '.hidden', directory: true }),
-          dirEntry({ name: '.github', directory: true }),
-          dirEntry({ name: 'node_modules', directory: true }),
-          dirEntry({ name: 'linked-docs', directory: true, symlink: true }),
-          dirEntry({ name: 'visible.md', file: true })
-        ]
-      }
-      if (dirPath === path.join(WORKTREE_FEATURE_PATH, '.github')) {
-        return [dirEntry({ name: 'CONTRIBUTING.md', file: true })]
-      }
-      throw new Error(`Unexpected readdir: ${dirPath}`)
-    })
-
+  it('passes the workspace runtime distro into document discovery', async () => {
+    localOptionsMock.mockReturnValue({ wslDistro: 'Ubuntu' })
     registerFilesystemHandlers(store as never)
 
-    await expect(
-      handlers.get('fs:listMarkdownDocuments')!(null, {
-        rootPath: WORKTREE_FEATURE_PATH
-      })
-    ).resolves.toEqual([
-      {
-        filePath: path.join(WORKTREE_FEATURE_PATH, '.github', 'CONTRIBUTING.md'),
-        relativePath: '.github/CONTRIBUTING.md',
-        basename: 'CONTRIBUTING.md',
-        name: 'CONTRIBUTING'
-      },
-      {
-        filePath: path.join(WORKTREE_FEATURE_PATH, 'visible.md'),
-        relativePath: 'visible.md',
-        basename: 'visible.md',
-        name: 'visible'
-      }
-    ])
+    await handlers.get('fs:listMarkdownDocuments')!(null, { rootPath: WORKTREE_FEATURE_PATH })
+
+    expect(listMarkdownDocumentsMock).toHaveBeenCalledWith(WORKTREE_FEATURE_PATH, {
+      wslDistro: 'Ubuntu'
+    })
   })
 
   it('rejects markdown document listing for authorized but unregistered roots', async () => {
@@ -165,6 +122,7 @@ describe('registerFilesystemHandlers', () => {
     ).rejects.toThrow('Access denied: unknown repository or worktree path')
 
     expect(readdirMock).not.toHaveBeenCalled()
+    expect(listMarkdownDocumentsMock).not.toHaveBeenCalled()
   })
 
   it('lists remote markdown documents through the SSH filesystem provider', async () => {
@@ -196,5 +154,7 @@ describe('registerFilesystemHandlers', () => {
         name: 'README'
       }
     ])
+    expect(listMarkdownDocumentsMock).not.toHaveBeenCalled()
+    expect(localOptionsMock).not.toHaveBeenCalled()
   })
 })
diff --git a/src/main/ipc/filesystem-pull-request-linked-issue-lifetime.test.ts b/src/main/ipc/filesystem-pull-request-linked-issue-lifetime.test.ts
new file mode 100644
index 000000000000..e71ea22f7ba8
--- /dev/null
+++ b/src/main/ipc/filesystem-pull-request-linked-issue-lifetime.test.ts
@@ -0,0 +1,189 @@
+import { setImmediate as nextTurn } from 'node:timers/promises'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  handlers,
+  store,
+  WORKTREE_FEATURE_PATH,
+  resolveCommitMessageSettingsMock,
+  generatePullRequestFieldsFromContextMock,
+  getPullRequestDraftContextMock,
+  resolveHostedReviewBodyForGenerationMock,
+  loadPullRequestLinkedIssueMock,
+  getSshGitProviderMock,
+  resetFilesystemIpcMocks
+} from './filesystem-test-harness'
+
+const linkedLookup = vi.hoisted(() => ({ run: (): Promise<null> => Promise.resolve(null) }))
+
+vi.mock('electron', async () => (await import('./filesystem-test-harness')).electronMock)
+vi.mock('fs/promises', async () => (await import('./filesystem-test-harness')).fsPromisesMock)
+vi.mock(
+  '../wsl-unc-delete',
+  async () => (await import('./filesystem-test-harness')).wslUncDeleteMock
+)
+vi.mock(
+  '../crash-reporting/crash-breadcrumb-store',
+  async () => (await import('./filesystem-test-harness')).crashBreadcrumbMock
+)
+vi.mock(
+  '../local-downloaded-folder-promotion',
+  async () => (await import('./filesystem-test-harness')).folderPromotionMock
+)
+vi.mock(
+  '../git/status',
+  async () => (await import('./filesystem-test-harness')).gitStatusModuleMock
+)
+vi.mock(
+  '../git/check-ignored-paths',
+  async () => (await import('./filesystem-test-harness')).gitIgnoredPathsMock
+)
+vi.mock('../git/worktree', async () => (await import('./filesystem-test-harness')).gitWorktreeMock)
+vi.mock(
+  '../providers/ssh-filesystem-dispatch',
+  async () => (await import('./filesystem-test-harness')).sshFilesystemDispatchMock
+)
+vi.mock(
+  '../providers/ssh-git-dispatch',
+  async () => (await import('./filesystem-test-harness')).sshGitDispatchMock
+)
+vi.mock(
+  '../text-generation/commit-message-text-generation',
+  async () => (await import('./filesystem-test-harness')).textGenerationModuleMock
+)
+vi.mock(
+  '../text-generation/pull-request-context',
+  async () => (await import('./filesystem-test-harness')).pullRequestContextMock
+)
+vi.mock(
+  '../source-control/pull-request-template',
+  async () => (await import('./filesystem-test-harness')).pullRequestTemplateMock
+)
+vi.mock('../source-control/pull-request-linked-issue', async () => {
+  const { loadPullRequestLinkedIssueMock } = await import('./filesystem-test-harness')
+  return {
+    loadPullRequestLinkedIssue: (...args: unknown[]) => {
+      loadPullRequestLinkedIssueMock(...args)
+      // A vi.fn return observer would itself handle the rejection under test.
+      return linkedLookup.run()
+    }
+  }
+})
+
+import { registerFilesystemHandlers } from './filesystem'
+import { invalidateAuthorizedRootsCache } from './registered-worktree-roots-cache'
+
+describe.each(['local', 'SSH'])('PR linked-issue lifetime on %s', (host) => {
+  const draftContext = {
+    base: 'main',
+    branch: 'feature/ai',
+    branchChangedByPreparation: false,
+    commitSummary: 'a1b2c3d Add generation',
+    changeSummary: 'README.md | 2 +-',
+    patch: '+hello',
+    currentTitle: '',
+    currentBody: '',
+    currentDraft: false
+  }
+  const request = {
+    base: 'main',
+    title: '',
+    body: '',
+    draft: false,
+    worktreePath: host === 'SSH' ? '/remote/repo' : WORKTREE_FEATURE_PATH,
+    ...(host === 'SSH' ? { connectionId: 'conn-1' } : {})
+  }
+
+  beforeEach(() => {
+    resetFilesystemIpcMocks()
+    linkedLookup.run = () => Promise.resolve(null)
+    invalidateAuthorizedRootsCache()
+    resolveCommitMessageSettingsMock.mockReturnValue({
+      ok: true,
+      params: { agentId: 'codex', model: 'gpt-5.4-mini' }
+    })
+    resolveHostedReviewBodyForGenerationMock.mockResolvedValue('')
+    getPullRequestDraftContextMock.mockResolvedValue(draftContext)
+    getSshGitProviderMock.mockReturnValue({
+      exec: vi.fn(),
+      executeCommitMessagePlan: vi.fn()
+    })
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The existing IPC harness provides every Store member reached by this handler.
+    registerFilesystemHandlers(store as never)
+  })
+
+  it.each(['no changes', 'context error', 'template error'])(
+    'observes a late lookup rejection after %s',
+    async (outcome) => {
+      const issue = Promise.withResolvers<null>()
+      linkedLookup.run = () => issue.promise
+      const preparationError = new Error('branch preparation failed')
+      if (outcome === 'no changes') {
+        getPullRequestDraftContextMock.mockResolvedValue(null)
+      } else if (outcome === 'context error') {
+        getPullRequestDraftContextMock.mockRejectedValue(preparationError)
+      } else {
+        resolveHostedReviewBodyForGenerationMock.mockRejectedValue(preparationError)
+      }
+      const unhandled = vi.fn()
+      process.on('unhandledRejection', unhandled)
+      try {
+        await expect(
+          handlers.get('git:generatePullRequestFields')!(null, request)
+        ).resolves.toEqual({
+          success: false,
+          error:
+            outcome === 'no changes' ? 'No branch changes to summarize.' : preparationError.message
+        })
+        expect(loadPullRequestLinkedIssueMock).toHaveBeenCalledTimes(1)
+        issue.reject(new Error('Timed out waiting for a GitLab operation slot.'))
+        await nextTurn()
+        expect(unhandled).not.toHaveBeenCalled()
+        expect(generatePullRequestFieldsFromContextMock).not.toHaveBeenCalled()
+      } finally {
+        void issue.promise.catch(() => undefined)
+        process.off('unhandledRejection', unhandled)
+      }
+    }
+  )
+
+  it('observes a lookup rejection while preparation is pending and preserves the later error', async () => {
+    const issue = Promise.withResolvers<null>()
+    const preparation = Promise.withResolvers<typeof draftContext>()
+    const failure = new Error('lookup admission failed')
+    linkedLookup.run = () => issue.promise
+    getPullRequestDraftContextMock.mockReturnValue(preparation.promise)
+    const unhandled = vi.fn()
+    process.on('unhandledRejection', unhandled)
+    const result = Promise.resolve(
+      handlers.get('git:generatePullRequestFields')!(null, request)
+    ).catch((error: unknown) => error)
+    try {
+      await nextTurn()
+      expect(getPullRequestDraftContextMock).toHaveBeenCalledTimes(1)
+      issue.reject(failure)
+      await nextTurn()
+      expect(unhandled).not.toHaveBeenCalled()
+      preparation.resolve(draftContext)
+      expect(await result).toBe(failure)
+      expect(generatePullRequestFieldsFromContextMock).not.toHaveBeenCalled()
+    } finally {
+      issue.resolve(null)
+      preparation.resolve(draftContext)
+      await result
+      process.off('unhandledRejection', unhandled)
+    }
+  })
+
+  it('still rejects the caller when preparation succeeds but the lookup fails', async () => {
+    const issue = Promise.withResolvers<null>()
+    const failure = new Error('lookup failed')
+    linkedLookup.run = () => issue.promise
+    const result = Promise.resolve(
+      handlers.get('git:generatePullRequestFields')!(null, request)
+    ).catch((error: unknown) => error)
+    await nextTurn()
+    issue.reject(failure)
+    expect(await result).toBe(failure)
+    expect(generatePullRequestFieldsFromContextMock).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/ipc/filesystem-watcher-canonical-root-paths.test.ts b/src/main/ipc/filesystem-watcher-canonical-root-paths.test.ts
index 45c14d485e0d..9aa42e3107ee 100644
--- a/src/main/ipc/filesystem-watcher-canonical-root-paths.test.ts
+++ b/src/main/ipc/filesystem-watcher-canonical-root-paths.test.ts
@@ -1,3 +1,4 @@
+import { createWatcherSender } from './filesystem-watcher-test-sender'
 /*
  * macOS FSEvents reports OS-canonical paths (symlinks resolved, on-disk
  * casing). Before the rewrite at the watcher boundary those events reached the
@@ -80,7 +81,7 @@ describe('local filesystem watcher canonical root paths', () => {
       return { unsubscribe: vi.fn() } as never
     })
     const sendMock = vi.fn()
-    const sender = { isDestroyed: () => false, send: sendMock, once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1, sendMock)
     await handlers['fs:watchWorktree']({ sender }, { worktreePath })
     watcherCallback!(null, events)
     await vi.waitFor(
diff --git a/src/main/ipc/filesystem-watcher-document-lifetime.test.ts b/src/main/ipc/filesystem-watcher-document-lifetime.test.ts
new file mode 100644
index 000000000000..9bc42d1ef737
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-document-lifetime.test.ts
@@ -0,0 +1,299 @@
+import { EventEmitter } from 'node:events'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createDebouncedBatch } from './filesystem-watcher-batch-control'
+
+type WatchArgs = { worktreePath: string; connectionId?: string }
+class Sender extends EventEmitter {
+  constructor(readonly id: number) {
+    super()
+  }
+  isDestroyed = () => false
+  send = vi.fn()
+}
+const { handleMock, watchRemote, createLocal, getProvider } = vi.hoisted(() => ({
+  handleMock: vi.fn(),
+  watchRemote: vi.fn(),
+  createLocal: vi.fn(),
+  getProvider: vi.fn()
+}))
+vi.mock('electron', () => ({ ipcMain: { handle: handleMock } }))
+vi.mock('node:fs/promises', () => ({ stat: async () => ({ isDirectory: () => true }) }))
+vi.mock('./filesystem-watcher-local-events', () => ({
+  createLocalWatcher: createLocal,
+  scheduleLocalBatchFlush: vi.fn()
+}))
+vi.mock('./parcel-watcher-process', () => ({ disposeWatcherProcess: vi.fn() }))
+vi.mock('../providers/ssh-filesystem-dispatch', () => ({
+  getSshFilesystemProvider: getProvider,
+  onSshFilesystemProviderRegistered: () => () => {}
+}))
+import {
+  REMOTE_WATCH_RETRY_MS,
+  watcherLifecycleState as state
+} from './filesystem-watcher-lifecycle-state'
+import { getLocalWatcherRoot, getRemoteWatcherKey } from './filesystem-watcher-paths'
+import { reinstallRemoteWatchersForConnection } from './filesystem-watcher-remote-controller'
+import { reinstallRemoteWatchersForConnectionCore } from './filesystem-watcher-remote-provider-rearm'
+import {
+  registerFilesystemWatcherHandlers,
+  closeAllWatchers,
+  closeLocalWatcherForWorktreePath,
+  closeRemoteWatcherForWorktreePath,
+  restoreLocalWatcherAfterFailedRemoval,
+  restoreRemoteWatcherAfterFailedRemoval
+} from './filesystem-watcher'
+
+const handlers = new Map<string, (event: { sender: Sender }, args: WatchArgs) => Promise<void>>()
+function invoke(channel: string, sender: Sender, args: WatchArgs): Promise<void> {
+  const handler = handlers.get(channel)
+  if (!handler) {
+    throw new Error(`Missing ${channel}`)
+  }
+  return handler({ sender }, args)
+}
+const watch = (sender: Sender, args: WatchArgs) => invoke('fs:watchWorktree', sender, args)
+const unwatch = (sender: Sender, args: WatchArgs) => invoke('fs:unwatchWorktree', sender, args)
+function deferred<T>() {
+  let resolve!: (value: T) => void
+  const promise = new Promise<T>((done) => {
+    resolve = done
+  })
+  return { promise, resolve }
+}
+function localRoot(unsubscribe = vi.fn(async () => {})) {
+  return {
+    subscription: { unsubscribe },
+    listeners: new Map(),
+    batch: createDebouncedBatch(),
+    rootPath: '/folder'
+  }
+}
+
+beforeEach(async () => {
+  await closeAllWatchers()
+  vi.clearAllMocks()
+  createLocal.mockImplementation(async () => localRoot())
+  watchRemote.mockImplementation(async () => vi.fn())
+  getProvider.mockReturnValue({ watch: watchRemote })
+  handleMock.mockImplementation((channel, handler) => handlers.set(channel, handler))
+  registerFilesystemWatcherHandlers()
+})
+afterEach(async () => {
+  await closeAllWatchers()
+  vi.useRealTimers()
+})
+
+describe('filesystem watcher renderer document ownership', () => {
+  it.each(['did-navigate', 'render-process-gone'])(
+    'releases installed local and SSH roots on %s without closing sibling owners',
+    async (event) => {
+      const sender = new Sender(1)
+      const sibling = new Sender(2)
+      const local = { worktreePath: '/folder' }
+      const remote = { ...local, connectionId: 'ssh' }
+      const root = localRoot()
+      const remoteClose = vi.fn()
+      createLocal.mockResolvedValue(root)
+      watchRemote.mockResolvedValue(remoteClose)
+      await watch(sender, local)
+      await watch(sender, remote)
+      await watch(sibling, local)
+      await watch(sibling, remote)
+      sender.emit(event)
+      await Promise.resolve()
+      expect(root.subscription.unsubscribe).not.toHaveBeenCalled()
+      expect(remoteClose).not.toHaveBeenCalled()
+      expect([...root.listeners.keys()]).toEqual([2])
+      expect([...state.desiredRemoteWatchers.values()][0].listeners.size).toBe(1)
+      sibling.emit(event)
+      await Promise.resolve()
+      expect(root.subscription.unsubscribe).toHaveBeenCalledTimes(1)
+      expect(remoteClose).toHaveBeenCalledTimes(1)
+      expect(state.watchedRoots.size).toBe(0)
+      expect(state.remoteWatchers.size).toBe(0)
+      expect(state.desiredRemoteWatchers.size).toBe(0)
+      expect(sender.eventNames()).toEqual([])
+      expect(sibling.eventNames()).toEqual([])
+    }
+  )
+
+  it('keeps same-document and blocked navigations alive, and removes lifecycle listeners at shutdown', async () => {
+    const sender = new Sender(1)
+    for (let cycle = 0; cycle < 3; cycle++) {
+      await watch(sender, { worktreePath: '/folder' })
+      sender.emit('did-start-navigation')
+      sender.emit('did-navigate-in-page')
+      expect(state.watchedRoots.size).toBe(1)
+      for (const event of ['destroyed', 'did-navigate', 'render-process-gone']) {
+        expect(sender.listenerCount(event)).toBe(1)
+      }
+      await closeAllWatchers()
+      expect(sender.eventNames()).toEqual([])
+    }
+  })
+
+  it.each(['local', 'ssh'])(
+    'does not revive a cancelled %s setup for a joiner whose document reloaded',
+    async (kind) => {
+      const sender = new Sender(1)
+      const joiner = new Sender(2)
+      const args = { worktreePath: '/folder', ...(kind === 'ssh' ? { connectionId: 'ssh' } : {}) }
+      const install = deferred<ReturnType<typeof localRoot> & (() => void)>()
+      const setup = kind === 'ssh' ? watchRemote : createLocal
+      setup.mockReturnValueOnce(install.promise)
+      const first = watch(sender, args)
+      await vi.waitFor(() => expect(setup).toHaveBeenCalledTimes(1))
+      await unwatch(sender, args)
+      await Promise.resolve()
+      const key =
+        kind === 'ssh' ? getRemoteWatcherKey('ssh', '/folder') : getLocalWatcherRoot('/folder').key
+      const token =
+        kind === 'ssh'
+          ? state.inFlightRemoteInstalls.get(key)
+          : state.inFlightLocalInstalls.get(key)
+      expect(token?.abortController.signal.aborted).toBe(true)
+      const pendingJoiner = watch(joiner, args)
+      joiner.emit('did-navigate')
+      const fresh = watch(joiner, { ...args, worktreePath: '/fresh' })
+      const closeLate = vi.fn(async () => {})
+      install.resolve(Object.assign(closeLate, localRoot(closeLate)))
+      await Promise.all([first, pendingJoiner, fresh])
+      expect(setup.mock.calls.filter(([path]) => path === '/folder')).toHaveLength(1)
+      expect(closeLate).toHaveBeenCalledTimes(1)
+      expect(kind === 'ssh' ? state.remoteWatchers.has(key) : state.watchedRoots.has(key)).toBe(
+        false
+      )
+      expect(setup).toHaveBeenCalledTimes(2)
+    }
+  )
+
+  it.each(['local', 'ssh'])(
+    'aborts pending %s setup on renderer crash and discards late success',
+    async (kind) => {
+      const sender = new Sender(1)
+      const setup = kind === 'ssh' ? watchRemote : createLocal
+      const install = deferred<ReturnType<typeof localRoot> & (() => void)>()
+      setup.mockReturnValueOnce(install.promise)
+      const pending = watch(sender, {
+        worktreePath: '/folder',
+        ...(kind === 'ssh' ? { connectionId: 'ssh' } : {})
+      })
+      await vi.waitFor(() => expect(setup).toHaveBeenCalledTimes(1))
+      const token = [
+        ...(kind === 'ssh' ? state.inFlightRemoteInstalls : state.inFlightLocalInstalls).values()
+      ][0]
+      sender.emit('render-process-gone')
+      await Promise.resolve()
+      expect(token.abortController.signal.aborted).toBe(true)
+      const closeLate = vi.fn(async () => {})
+      install.resolve(Object.assign(closeLate, localRoot(closeLate)))
+      await pending
+      expect(closeLate).toHaveBeenCalledTimes(1)
+      expect(state.watchedRoots.size + state.remoteWatchers.size).toBe(0)
+    }
+  )
+
+  it('does not re-arm stale SSH handler or retry snapshots after reload', async () => {
+    vi.useFakeTimers()
+    const sender = new Sender(1)
+    const args = { worktreePath: '/folder', connectionId: 'ssh' }
+    watchRemote.mockRejectedValueOnce(new Error('temporary unavailable'))
+    await watch(sender, args)
+    const retry = deferred<() => void>()
+    watchRemote.mockReturnValueOnce(retry.promise)
+    await vi.advanceTimersByTimeAsync(REMOTE_WATCH_RETRY_MS)
+    expect(watchRemote).toHaveBeenCalledTimes(2)
+    sender.emit('did-navigate')
+    // A fresh document can ask for the same root while the old retry is settling.
+    const fresh = watch(sender, args)
+    retry.resolve(vi.fn())
+    await fresh
+    expect(state.pendingRemoteWatcherRetries.size).toBe(0)
+    expect(state.remoteWatcherResyncStates.size).toBe(0)
+    expect(watchRemote).toHaveBeenCalledTimes(2)
+  })
+
+  it('does not re-arm an old provider snapshot into the same WebContents after replacement', async () => {
+    const sender = new Sender(1)
+    const args = { worktreePath: '/folder', connectionId: 'ssh' }
+    await watch(sender, args)
+    const pending = deferred<'unavailable'>()
+    const dependencies = {
+      install: vi.fn(() => pending.promise),
+      requestResync: vi.fn(),
+      scheduleRetry: vi.fn(),
+      scheduleDormant: vi.fn()
+    }
+    reinstallRemoteWatchersForConnectionCore('ssh', dependencies)
+    sender.emit('did-navigate')
+    await watch(sender, args)
+    pending.resolve('unavailable')
+    await pending.promise
+    await Promise.resolve()
+    expect(dependencies.scheduleRetry).not.toHaveBeenCalled()
+    expect(dependencies.requestResync).not.toHaveBeenCalled()
+    expect(dependencies.scheduleDormant).not.toHaveBeenCalled()
+  })
+
+  it.each(['local', 'ssh'])(
+    'does not restore a replaced sibling document after an awaited %s removal recovery',
+    async (kind) => {
+      const first = new Sender(1)
+      const sibling = new Sender(2)
+      const args = { worktreePath: '/folder', ...(kind === 'ssh' ? { connectionId: 'ssh' } : {}) }
+      await watch(first, args)
+      await watch(sibling, args)
+      await (kind === 'ssh'
+        ? closeRemoteWatcherForWorktreePath('ssh', '/folder')
+        : closeLocalWatcherForWorktreePath('/folder'))
+      const install = deferred<ReturnType<typeof localRoot> & (() => void)>()
+      const setup = kind === 'ssh' ? watchRemote : createLocal
+      setup.mockReturnValueOnce(install.promise)
+      const restore =
+        kind === 'ssh'
+          ? restoreRemoteWatcherAfterFailedRemoval('ssh', '/folder')
+          : restoreLocalWatcherAfterFailedRemoval('/folder')
+      await vi.waitFor(() => expect(setup).toHaveBeenCalledTimes(2))
+      sibling.emit('did-navigate')
+      install.resolve(Object.assign(vi.fn(), localRoot()))
+      await restore
+      expect(sibling.send).not.toHaveBeenCalled()
+      expect(first.send).toHaveBeenCalledTimes(1)
+      const roots = kind === 'ssh' ? state.remoteWatchers : state.watchedRoots
+      expect([...roots.values()][0].listeners.size).toBe(1)
+    }
+  )
+
+  it('retains zero roots and listeners across 15 reloads and a renderer crash', async () => {
+    const sender = new Sender(1)
+    const closeLocal = vi.fn(async () => {})
+    const closeRemote = vi.fn()
+    createLocal.mockImplementation(async () => localRoot(closeLocal))
+    watchRemote.mockResolvedValue(closeRemote)
+    for (let generation = 0; generation < 16; generation++) {
+      await watch(sender, { worktreePath: `/folder-${generation}` })
+      await watch(sender, { worktreePath: `/folder-${generation}`, connectionId: 'ssh' })
+      sender.emit(generation === 15 ? 'render-process-gone' : 'did-navigate')
+      await Promise.resolve()
+      expect(
+        state.watchedRoots.size + state.remoteWatchers.size + state.desiredRemoteWatchers.size
+      ).toBe(0)
+      expect(sender.eventNames()).toEqual([])
+    }
+    expect(closeLocal).toHaveBeenCalledTimes(16)
+    expect(closeRemote).toHaveBeenCalledTimes(16)
+  })
+
+  it('clears desired SSH roots while no provider is available and does not re-arm them on reconnect', async () => {
+    const sender = new Sender(1)
+    getProvider.mockReturnValue(undefined)
+    await watch(sender, { worktreePath: '/folder', connectionId: 'ssh' })
+    expect(state.pendingRemoteWatcherRetries.size).toBe(1)
+    sender.emit('render-process-gone')
+    getProvider.mockReturnValue({ watch: watchRemote })
+    reinstallRemoteWatchersForConnection('ssh')
+    expect(state.pendingRemoteWatcherRetries.size).toBe(0)
+    expect(state.desiredRemoteWatchers.size).toBe(0)
+    expect(watchRemote).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/ipc/filesystem-watcher-dormant-rearm.test.ts b/src/main/ipc/filesystem-watcher-dormant-rearm.test.ts
index 7d27d4ca780a..c4931cd7cb2b 100644
--- a/src/main/ipc/filesystem-watcher-dormant-rearm.test.ts
+++ b/src/main/ipc/filesystem-watcher-dormant-rearm.test.ts
@@ -1,3 +1,4 @@
+import { senderEvents } from './filesystem-watcher-test-sender'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { handleMock, getSshFilesystemProviderMock, providerRegistrationListeners } = vi.hoisted(
@@ -36,10 +37,11 @@ const DORMANT_FIRST_MS = 60_000
 function createSender(id: number): {
   isDestroyed: () => boolean
   send: ReturnType<typeof vi.fn>
+  removeListener: ReturnType<typeof vi.fn>
   once: ReturnType<typeof vi.fn>
   id: number
 } {
-  return { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id }
+  return { isDestroyed: () => false, send: vi.fn(), ...senderEvents(), id }
 }
 
 describe('remote filesystem watcher dormant re-arm', () => {
diff --git a/src/main/ipc/filesystem-watcher-handlers.ts b/src/main/ipc/filesystem-watcher-handlers.ts
index bac74f635891..39f9ef0c184f 100644
--- a/src/main/ipc/filesystem-watcher-handlers.ts
+++ b/src/main/ipc/filesystem-watcher-handlers.ts
@@ -1,10 +1,12 @@
 import { ipcMain } from 'electron'
+import { isCurrentWatcherSender } from './filesystem-watcher-sender-lifetime'
 import { onSshFilesystemProviderRegistered } from '../providers/ssh-filesystem-dispatch'
 import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
 import { getRemoteWatcherKey } from './filesystem-watcher-paths'
 import {
   cancelInFlightRemoteInstallIfUnowned,
   forgetDesiredRemoteWatcher,
+  registerWatcherSenderCleanup,
   releaseRemoteWatchListener
 } from './filesystem-watcher-listener-lifecycle'
 import {
@@ -30,6 +32,7 @@ export function registerFilesystemWatcherHandlers(): void {
   ipcMain.handle(
     'fs:watchWorktree',
     async (event, args: { worktreePath: string; connectionId?: string }): Promise<void> => {
+      const senderSignal = registerWatcherSenderCleanup(event.sender)
       if (args.connectionId) {
         // Why: a real new watch reopens the subsystem after closeAllWatchers latched it shut (also resets tests between cases).
         watcherLifecycleState.remoteWatchersClosed = false
@@ -42,6 +45,9 @@ export function registerFilesystemWatcherHandlers(): void {
           args.connectionId,
           args.worktreePath
         )
+        if (!isCurrentWatcherSender(event.sender, senderSignal)) {
+          return
+        }
         if (result === 'capacity') {
           // Why straight to the dormant backoff: the cap is full until some other root is released,
           // which a 1 Hz reinstall cannot bring about — it only adds relay load per refused root.
diff --git a/src/main/ipc/filesystem-watcher-large-batch.test.ts b/src/main/ipc/filesystem-watcher-large-batch.test.ts
index 3d71581595ea..240ca6290422 100644
--- a/src/main/ipc/filesystem-watcher-large-batch.test.ts
+++ b/src/main/ipc/filesystem-watcher-large-batch.test.ts
@@ -1,3 +1,4 @@
+import { createWatcherSender } from './filesystem-watcher-test-sender'
 import { join, resolve } from 'node:path'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
@@ -68,10 +69,7 @@ describe('local filesystem watcher large batches', () => {
       return { unsubscribe: vi.fn() } as never
     })
 
-    await handlers['fs:watchWorktree'](
-      { sender: { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 } },
-      { worktreePath }
-    )
+    await handlers['fs:watchWorktree']({ sender: createWatcherSender(1) }, { worktreePath })
 
     const events = Array.from({ length: 200_000 }, (_, index): WatcherEvent => ({
       type: 'delete',
@@ -92,7 +90,7 @@ describe('local filesystem watcher large batches', () => {
       return { unsubscribe: vi.fn() } as never
     })
     const worktreePath = resolve('/tmp/repo')
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree']({ sender }, { worktreePath })
     watcherCallback?.(
@@ -124,7 +122,7 @@ describe('local filesystem watcher large batches', () => {
     })
     const worktreePath = resolve('/tmp/repo')
     const filePath = join(worktreePath, 'a.ts')
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree']({ sender }, { worktreePath })
     watcherCallback?.(null, [{ type: 'update', path: filePath }])
@@ -152,7 +150,7 @@ describe('local filesystem watcher large batches', () => {
       return { unsubscribe: vi.fn() } as never
     })
     const worktreePath = resolve('/tmp/repo')
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree']({ sender }, { worktreePath })
     // Step under the trailing window so only the max wait can force a flush.
diff --git a/src/main/ipc/filesystem-watcher-lifecycle-state.ts b/src/main/ipc/filesystem-watcher-lifecycle-state.ts
index 7d6a120c0a72..feef5d40373e 100644
--- a/src/main/ipc/filesystem-watcher-lifecycle-state.ts
+++ b/src/main/ipc/filesystem-watcher-lifecycle-state.ts
@@ -65,7 +65,7 @@ export const watcherLifecycleState = {
   watchedRoots: new Map<string, WatchedRoot>(),
   unwatchableRoots: new Set<string>(),
   // Why: key cleanup by sender WebContents (not per root) to avoid MaxListeners warnings when a workspace has many worktrees open.
-  senderCleanupRegistered: new Set<number>(),
+  senderLifetimes: new Map<number, { signal: AbortSignal; dispose: () => void }>(),
   pendingTeardowns: new Map<string, ReturnType<typeof setTimeout>>(),
   // Why: @parcel/watcher unsubscribe does native async work that sender-destroy can start before shutdown, so will-quit must still await it.
   pendingLocalUnsubscribes: new Set<Promise<void>>(),
diff --git a/src/main/ipc/filesystem-watcher-listener-lifecycle.ts b/src/main/ipc/filesystem-watcher-listener-lifecycle.ts
index 713305069e32..c2dd5f3dc774 100644
--- a/src/main/ipc/filesystem-watcher-listener-lifecycle.ts
+++ b/src/main/ipc/filesystem-watcher-listener-lifecycle.ts
@@ -8,6 +8,7 @@ import {
   watcherLifecycleState
 } from './filesystem-watcher-lifecycle-state'
 import { cancelLocalBatchFlush } from './filesystem-watcher-batch-control'
+import { captureWatcherSenderLifetime } from './filesystem-watcher-sender-lifetime'
 
 export function rememberUnwatchableRoot(rootKey: string): void {
   const { unwatchableRoots } = watcherLifecycleState
@@ -172,13 +173,8 @@ export function releaseRemoteWatchListener(key: string, senderId: number): void
   watcherLifecycleState.remoteWatchers.delete(key)
 }
 
-export function registerWatcherSenderCleanup(sender: WebContents): void {
-  if (watcherLifecycleState.senderCleanupRegistered.has(sender.id)) {
-    return
-  }
-  watcherLifecycleState.senderCleanupRegistered.add(sender.id)
-  sender.once('destroyed', () => {
-    watcherLifecycleState.senderCleanupRegistered.delete(sender.id)
+export function registerWatcherSenderCleanup(sender: WebContents): AbortSignal {
+  return captureWatcherSenderLifetime(sender, () => {
     cleanupLocalWatchersForSender(sender.id)
     cleanupRemoteWatchersForSender(sender.id)
   })
@@ -215,6 +211,9 @@ function cleanupRemoteWatchersForSender(senderId: number): void {
   for (const key of Array.from(watcherLifecycleState.desiredRemoteWatchers.keys())) {
     forgetDesiredRemoteWatcher(key, senderId)
   }
+  for (const resync of watcherLifecycleState.remoteWatcherResyncStates.values()) {
+    resync.listeners.delete(senderId)
+  }
   for (const [key, suspended] of watcherLifecycleState.suspendedRemoteWatcherListeners) {
     suspended.listeners.delete(senderId)
     if (suspended.listeners.size === 0) {
diff --git a/src/main/ipc/filesystem-watcher-local-events.test.ts b/src/main/ipc/filesystem-watcher-local-events.test.ts
index b5ec3eab9391..343ee2bc3ad1 100644
--- a/src/main/ipc/filesystem-watcher-local-events.test.ts
+++ b/src/main/ipc/filesystem-watcher-local-events.test.ts
@@ -336,7 +336,7 @@ describe('local filesystem watcher flush serialization', () => {
     // Why real timers: fake-timers' refresh() revives a cleared handle, but Node's is a no-op — the bug only shows on real Timeouts.
     vi.useRealTimers()
     statMock.mockResolvedValue({ isDirectory: () => true })
-    const listener = { ...sender, id: 7, once: vi.fn() }
+    const listener = { ...sender, id: 7, removeListener: vi.fn(), once: vi.fn() }
     try {
       await subscribeLocalWatcher('/repo', listener as never)
       watcherCallback?.(null, [{ type: 'delete', path: '/repo/file.ts' }])
diff --git a/src/main/ipc/filesystem-watcher-local-removal.ts b/src/main/ipc/filesystem-watcher-local-removal.ts
index a3d4b6ff558b..78f015f7b941 100644
--- a/src/main/ipc/filesystem-watcher-local-removal.ts
+++ b/src/main/ipc/filesystem-watcher-local-removal.ts
@@ -1,3 +1,4 @@
+import { isCurrentWatcherSender } from './filesystem-watcher-sender-lifetime'
 import type { WebContents } from 'electron'
 import type { FsChangedPayload } from '../../shared/filesystem-entry-types'
 import {
@@ -10,6 +11,7 @@ import { getLocalWatcherRoot } from './filesystem-watcher-paths'
 import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
 import {
   abandonLocalUnsubscribes,
+  registerWatcherSenderCleanup,
   clearLocalCapacityRetry,
   trackDetachedLocalUnsubscribe
 } from './filesystem-watcher-listener-lifecycle'
@@ -124,29 +126,40 @@ export async function restoreLocalWatcherAfterFailedRemoval(worktreePath: string
     return
   }
   watcherLifecycleState.suspendedLocalWatcherListeners.delete(rootKey)
-  const failures: unknown[] = []
-  const failedListeners = new Map<number, WebContents>()
-  for (const sender of suspended.listeners.values()) {
-    if (sender.isDestroyed()) {
+  const failures: { sender: WebContents; signal: AbortSignal; error: unknown }[] = []
+  const owners = Array.from(suspended.listeners.values(), (sender) => ({
+    sender,
+    signal: registerWatcherSenderCleanup(sender)
+  }))
+  for (const { sender, signal } of owners) {
+    if (!isCurrentWatcherSender(sender, signal)) {
       continue
     }
     try {
-      await subscribeLocalWatcher(suspended.worktreePath, sender)
+      await subscribeLocalWatcher(suspended.worktreePath, sender, undefined, signal)
+      if (!isCurrentWatcherSender(sender, signal)) {
+        continue
+      }
       sender.send('fs:changed', {
         worktreePath: suspended.worktreePath,
         events: [{ kind: 'overflow', absolutePath: suspended.worktreePath }]
       } satisfies FsChangedPayload)
     } catch (error) {
-      failures.push(error)
-      failedListeners.set(sender.id, sender)
+      if (!isCurrentWatcherSender(sender, signal)) {
+        continue
+      }
+      failures.push({ sender, signal, error })
     }
   }
-  if (failures.length > 0) {
+  const liveFailures = failures.filter(({ sender, signal }) =>
+    isCurrentWatcherSender(sender, signal)
+  )
+  if (liveFailures.length > 0) {
     watcherLifecycleState.suspendedLocalWatcherListeners.set(rootKey, {
       worktreePath: suspended.worktreePath,
-      listeners: failedListeners
+      listeners: new Map(liveFailures.map(({ sender }) => [sender.id, sender]))
     })
-    throw failures[0]
+    throw liveFailures[0].error
   }
 }
 
diff --git a/src/main/ipc/filesystem-watcher-local-subscription.ts b/src/main/ipc/filesystem-watcher-local-subscription.ts
index e888893dbf46..c667210078ae 100644
--- a/src/main/ipc/filesystem-watcher-local-subscription.ts
+++ b/src/main/ipc/filesystem-watcher-local-subscription.ts
@@ -11,21 +11,25 @@ import {
   addLocalWatchListener,
   clearLocalCapacityRetry,
   rememberUnwatchableRoot,
+  registerWatcherSenderCleanup,
   takeLocalCapacityRetryListeners,
   trackDetachedLocalUnsubscribe
 } from './filesystem-watcher-listener-lifecycle'
 import { cancelLocalBatchFlush } from './filesystem-watcher-batch-control'
 import { scheduleLocalCapacityRetry } from './filesystem-watcher-local-capacity'
 import { installLocalWatcher } from './filesystem-watcher-local-install'
+import { isCurrentWatcherSender } from './filesystem-watcher-sender-lifetime'
 
 // ── Subscribe / Unsubscribe ──────────────────────────────────────────
 
 export async function subscribeLocalWatcher(
   worktreePath: string,
   sender: WebContents,
-  generation = watcherLifecycleState.localWatcherLifecycleGeneration
+  generation = watcherLifecycleState.localWatcherLifecycleGeneration,
+  senderSignal = registerWatcherSenderCleanup(sender)
 ): Promise<void> {
   if (
+    !isCurrentWatcherSender(sender, senderSignal) ||
     watcherLifecycleState.localWatchersClosed ||
     generation !== watcherLifecycleState.localWatcherLifecycleGeneration
   ) {
@@ -33,7 +37,7 @@ export async function subscribeLocalWatcher(
   }
   const finishInstall = beginWatcherInstall(worktreePath)
   try {
-    await subscribeWhileRemovalAllowed(worktreePath, sender, generation)
+    await subscribeWhileRemovalAllowed(worktreePath, sender, generation, senderSignal)
   } finally {
     finishInstall()
   }
@@ -42,9 +46,11 @@ export async function subscribeLocalWatcher(
 async function subscribeWhileRemovalAllowed(
   worktreePath: string,
   sender: WebContents,
-  generation: number
+  generation: number,
+  senderSignal: AbortSignal
 ): Promise<void> {
   if (
+    !isCurrentWatcherSender(sender, senderSignal) ||
     watcherLifecycleState.localWatchersClosed ||
     generation !== watcherLifecycleState.localWatcherLifecycleGeneration
   ) {
@@ -70,6 +76,9 @@ async function subscribeWhileRemovalAllowed(
     watcherLifecycleState.pendingTeardowns.delete(rootKey)
   }
   const capacityRetryListeners = takeLocalCapacityRetryListeners(rootKey)
+  const retrySignals = new Map(
+    capacityRetryListeners.map((listener) => [listener.id, registerWatcherSenderCleanup(listener)])
+  )
 
   if (root) {
     for (const listener of capacityRetryListeners) {
@@ -91,6 +100,10 @@ async function subscribeWhileRemovalAllowed(
       }
     }
     const result = await pendingInstall
+    const liveCapacityListeners = capacityRetryListeners.filter((listener) =>
+      isCurrentWatcherSender(listener, retrySignals.get(listener.id)!)
+    )
+    const senderIsCurrent = isCurrentWatcherSender(sender, senderSignal)
     if (
       result === 'cancelled' &&
       !canJoinInstall &&
@@ -102,33 +115,42 @@ async function subscribeWhileRemovalAllowed(
         watcherLifecycleState.pendingLocalInstallPromises.delete(rootKey)
       }
       const retryListeners = new Map(
-        capacityRetryListeners.map((listener) => [listener.id, listener])
+        liveCapacityListeners.map((listener) => [listener.id, listener])
       )
-      retryListeners.set(sender.id, sender)
+      if (senderIsCurrent) {
+        retryListeners.set(sender.id, sender)
+      }
       for (const listener of retryListeners.values()) {
         if (!listener.isDestroyed()) {
-          await subscribeWhileRemovalAllowed(worktreePath, listener, generation)
+          await subscribeWhileRemovalAllowed(
+            worktreePath,
+            listener,
+            generation,
+            listener === sender ? senderSignal : retrySignals.get(listener.id)!
+          )
         }
       }
       return
     }
     if (!inFlight) {
       if (result === 'installed') {
-        for (const listener of capacityRetryListeners) {
+        for (const listener of liveCapacityListeners) {
           addLocalWatchListener(rootKey, listener)
         }
       } else if (result === 'capacity') {
         const retryListeners = new Map(
-          capacityRetryListeners.map((listener) => [listener.id, listener])
+          liveCapacityListeners.map((listener) => [listener.id, listener])
         )
-        retryListeners.set(sender.id, sender)
+        if (senderIsCurrent) {
+          retryListeners.set(sender.id, sender)
+        }
         scheduleLocalCapacityRetry(rootKey, worktreePath, retryListeners, subscribeLocalWatcher)
       }
     }
     if (
       result === 'installed' &&
       watcherLifecycleState.watchedRoots.has(rootKey) &&
-      !sender.isDestroyed() &&
+      senderIsCurrent &&
       (!inFlight || inFlight.listeners.has(sender.id))
     ) {
       addLocalWatchListener(rootKey, sender)
diff --git a/src/main/ipc/filesystem-watcher-local-unsubscribe.test.ts b/src/main/ipc/filesystem-watcher-local-unsubscribe.test.ts
index eb161c1ba30c..da8b92dbcf8b 100644
--- a/src/main/ipc/filesystem-watcher-local-unsubscribe.test.ts
+++ b/src/main/ipc/filesystem-watcher-local-unsubscribe.test.ts
@@ -1,3 +1,4 @@
+import { createWatcherSender } from './filesystem-watcher-test-sender'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as ParcelWatcherProcess from './parcel-watcher-process'
 
@@ -85,6 +86,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
     const sender = {
       isDestroyed: () => false,
       send: vi.fn(),
+      removeListener: vi.fn(),
       once: vi.fn((event: string, callback: () => void) => {
         if (event === 'destroyed') {
           destroyedCallbacks.push(callback)
@@ -124,7 +126,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
       watcherCallback = callback as typeof watcherCallback
       return { unsubscribe: unsubscribeMock } as never
     })
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree']({ sender }, { worktreePath: '/tmp/repo' })
     watcherCallback(new Error('root disappeared'), [])
@@ -157,6 +159,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
     const sender = {
       isDestroyed: () => false,
       send: vi.fn(),
+      removeListener: vi.fn(),
       once: vi.fn((event: string, callback: () => void) => {
         if (event === 'destroyed') {
           destroyedCallbacks.push(callback)
@@ -197,18 +200,8 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
           subscribeResolvers.push(resolve as (subscription: { unsubscribe: () => void }) => void)
         })
     )
-    const senderOne = {
-      isDestroyed: () => false,
-      send: vi.fn(),
-      once: vi.fn(),
-      id: 1
-    }
-    const senderTwo = {
-      isDestroyed: () => false,
-      send: vi.fn(),
-      once: vi.fn(),
-      id: 2
-    }
+    const senderOne = createWatcherSender(1)
+    const senderTwo = createWatcherSender(2)
 
     const watchOne = handlers['fs:watchWorktree'](
       { sender: senderOne },
@@ -248,12 +241,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
     vi.mocked(stat).mockResolvedValue({ isDirectory: () => true } as never)
     const unsubscribeMock = vi.fn()
     vi.mocked(subscribeParcelWatcher).mockResolvedValue({ unsubscribe: unsubscribeMock } as never)
-    const sender = {
-      isDestroyed: () => false,
-      send: vi.fn(),
-      once: vi.fn(),
-      id: 1
-    }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree']({ sender }, { worktreePath: '/tmp/repo' })
 
@@ -274,12 +262,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
     vi.mocked(stat).mockResolvedValue({ isDirectory: () => true } as never)
     const unsubscribeMock = vi.fn()
     vi.mocked(subscribeParcelWatcher).mockResolvedValue({ unsubscribe: unsubscribeMock } as never)
-    const sender = {
-      isDestroyed: () => false,
-      send: vi.fn(),
-      once: vi.fn(),
-      id: 1
-    }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree']({ sender }, { worktreePath: '/tmp/repo' })
     await closeLocalWatcherForWorktreePath('/tmp/repo')
@@ -294,12 +277,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
     vi.mocked(stat).mockResolvedValue({ isDirectory: () => true } as never)
     const unsubscribeMock = vi.fn()
     vi.mocked(subscribeParcelWatcher).mockResolvedValue({ unsubscribe: unsubscribeMock } as never)
-    const sender = {
-      isDestroyed: () => false,
-      send: vi.fn(),
-      once: vi.fn(),
-      id: 1
-    }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree']({ sender }, { worktreePath: watchPath })
     await closeLocalWatcherForWorktreePath(closePath)
@@ -323,12 +301,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
         watcherCallback = callback as typeof watcherCallback
         return { unsubscribe: unsubscribeMock } as never
       })
-      const sender = {
-        isDestroyed: () => false,
-        send: vi.fn(),
-        once: vi.fn(),
-        id: 1
-      }
+      const sender = createWatcherSender(1)
 
       await handlers['fs:watchWorktree']({ sender }, { worktreePath: watchPath })
       watcherCallback(null, [{ type: 'update', path: `${watchPath}\\file.txt` }])
@@ -349,7 +322,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
     const terminationError = new Error('watcher child did not exit')
     const unsubscribeMock = vi.fn().mockRejectedValue(terminationError)
     vi.mocked(subscribeParcelWatcher).mockResolvedValue({ unsubscribe: unsubscribeMock } as never)
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree']({ sender }, { worktreePath: '/tmp/repo' })
 
@@ -372,6 +345,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
     const sender = {
       isDestroyed: () => false,
       send: vi.fn(),
+      removeListener: vi.fn(),
       once: vi.fn((event: string, callback: () => void) => {
         if (event === 'destroyed') {
           destroyedCallbacks.push(callback)
@@ -413,6 +387,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
     const sender = {
       isDestroyed: () => false,
       send: vi.fn(),
+      removeListener: vi.fn(),
       once: vi.fn((event: string, callback: () => void) => {
         if (event === 'destroyed') {
           destroyedCallbacks.push(callback)
@@ -448,7 +423,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
       watcherCallback = callback as typeof watcherCallback
       return { unsubscribe }
     })
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     await handlers['fs:watchWorktree']({ sender }, { worktreePath: '/tmp/repo' })
 
     watcherCallback(terminationError, [])
@@ -478,7 +453,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
           hooks?.signal?.addEventListener('abort', () => reject(terminationError), { once: true })
         })
     )
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     const watchPromise = handlers['fs:watchWorktree'](
       { sender },
       { worktreePath: '/tmp/repo' }
@@ -499,12 +474,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
     vi.mocked(stat).mockResolvedValue({ isDirectory: () => true } as never)
     const unsubscribeMock = vi.fn()
     vi.mocked(subscribeParcelWatcher).mockResolvedValue({ unsubscribe: unsubscribeMock } as never)
-    const sender = {
-      isDestroyed: () => false,
-      send: vi.fn(),
-      once: vi.fn(),
-      id: 1
-    }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree']({ sender }, { worktreePath: '/tmp/repo' })
 
@@ -532,12 +502,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
           resolveSubscribe = resolve as typeof resolveSubscribe
         })
     )
-    const sender = {
-      isDestroyed: () => false,
-      send: vi.fn(),
-      once: vi.fn(),
-      id: 1
-    }
+    const sender = createWatcherSender(1)
 
     const watchPromise = handlers['fs:watchWorktree'](
       { sender },
@@ -581,8 +546,8 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
         replacementCallback = callback
         return { unsubscribe: replacementUnsubscribe }
       })
-    const firstSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
-    const replacementSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
+    const firstSender = createWatcherSender(1)
+    const replacementSender = createWatcherSender(2)
 
     const firstWatch = handlers['fs:watchWorktree'](
       { sender: firstSender },
@@ -629,9 +594,9 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
       .mockImplementationOnce(install as never)
       .mockImplementationOnce(install as never)
     const lateUnsubscribe = vi.fn()
-    const firstSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
-    const joinerSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
-    const reopenSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 3 }
+    const firstSender = createWatcherSender(1)
+    const joinerSender = createWatcherSender(2)
+    const reopenSender = createWatcherSender(3)
     const first = handlers['fs:watchWorktree'](
       { sender: firstSender },
       { worktreePath: '/tmp/repo' }
@@ -675,12 +640,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
           resolveSubscribe = resolve as typeof resolveSubscribe
         })
     )
-    const sender = {
-      isDestroyed: () => false,
-      send: vi.fn(),
-      once: vi.fn(),
-      id: 1
-    }
+    const sender = createWatcherSender(1)
 
     const watchPromise = handlers['fs:watchWorktree'](
       { sender },
@@ -708,12 +668,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
     vi.mocked(subscribeParcelWatcher)
       .mockResolvedValueOnce({ unsubscribe: firstUnsubscribe } as never)
       .mockResolvedValueOnce({ unsubscribe: replacementUnsubscribe } as never)
-    const sender = {
-      isDestroyed: () => false,
-      send: vi.fn(),
-      once: vi.fn(),
-      id: 1
-    }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree']({ sender }, { worktreePath: '/tmp/repo' })
     await closeLocalWatcherForWorktreePath('/tmp/repo')
@@ -731,7 +686,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
     vi.mocked(stat).mockResolvedValue({ isDirectory: () => true } as never)
     const firstUnsubscribe = vi.fn()
     vi.mocked(subscribeParcelWatcher).mockResolvedValue({ unsubscribe: firstUnsubscribe } as never)
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree']({ sender }, { worktreePath: '/tmp/repo' })
     await closeLocalWatcherForWorktreePath('/tmp/repo')
@@ -751,6 +706,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
     const sender = {
       isDestroyed: () => false,
       send: vi.fn(),
+      removeListener: vi.fn(),
       once: vi.fn((event: string, callback: () => void) => {
         if (event === 'destroyed') {
           destroyedCallbacks.push(callback)
@@ -779,12 +735,7 @@ describe('local filesystem watcher unsubscribe cleanup', () => {
           resolveSubscribe = resolve as typeof resolveSubscribe
         })
     )
-    const sender = {
-      isDestroyed: () => false,
-      send: vi.fn(),
-      once: vi.fn(),
-      id: 1
-    }
+    const sender = createWatcherSender(1)
 
     const watchPromise = handlers['fs:watchWorktree'](
       { sender },
diff --git a/src/main/ipc/filesystem-watcher-native-capacity.test.ts b/src/main/ipc/filesystem-watcher-native-capacity.test.ts
index 670b7eb2af39..9d291f7a9ee6 100644
--- a/src/main/ipc/filesystem-watcher-native-capacity.test.ts
+++ b/src/main/ipc/filesystem-watcher-native-capacity.test.ts
@@ -1,3 +1,4 @@
+import { createWatcherSender } from './filesystem-watcher-test-sender'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { handleMock, statMock, subscribeViaWatcherProcessMock, disposeWatcherProcessMock } =
@@ -71,7 +72,7 @@ describe('native filesystem watcher capacity recovery', () => {
     subscribeViaWatcherProcessMock
       .mockRejectedValueOnce(new WatcherChildCapacityError())
       .mockResolvedValueOnce({ unsubscribe })
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     const args = { worktreePath: '/tmp/native-capacity-root' }
 
     await handlers['fs:watchWorktree']({ sender }, args)
@@ -86,7 +87,7 @@ describe('native filesystem watcher capacity recovery', () => {
   it('cancels the native capacity wait when its renderer unwatches', async () => {
     const releases = fillWatcherChildCapacity()
     subscribeViaWatcherProcessMock.mockRejectedValue(new WatcherChildCapacityError())
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     const args = { worktreePath: '/tmp/native-capacity-root' }
 
     await handlers['fs:watchWorktree']({ sender }, args)
diff --git a/src/main/ipc/filesystem-watcher-real.test.ts b/src/main/ipc/filesystem-watcher-real.test.ts
index 7c9556e7ba4d..f884e596f72d 100644
--- a/src/main/ipc/filesystem-watcher-real.test.ts
+++ b/src/main/ipc/filesystem-watcher-real.test.ts
@@ -1,3 +1,4 @@
+import { createWatcherSender } from './filesystem-watcher-test-sender'
 /*
  * Real (unmocked) @parcel/watcher integration test.
  *
@@ -76,15 +77,6 @@ describe('filesystem-watcher real @parcel/watcher integration', () => {
     vi.clearAllMocks()
   })
 
-  // Why: a clear, separate failure mode — if the native addon is missing from
-  // the bundle the watcher silently no-ops (doInstallLocalWatcher swallows the
-  // import error), so the wiring assertion below would time out with a vague
-  // message. This makes "addon absent" distinct from "wiring broken".
-  it('loads the real @parcel/watcher native addon', async () => {
-    const watcher = await import('@parcel/watcher')
-    expect(typeof watcher.subscribe).toBe('function')
-  })
-
   // Why: this integration targets the Linux native watcher path described
   // above; macOS developer sandboxes can load the addon while suppressing
   // subscribe callbacks, which makes this an environment check instead.
@@ -95,12 +87,7 @@ describe('filesystem-watcher real @parcel/watcher integration', () => {
       // tmpdir() returns /var, so compare canonical paths instead of aliases.
       tempDir = await realpath(await mkdtemp(join(tmpdir(), 'orca-fswatch-real-')))
       const sendMock = vi.fn()
-      const sender = {
-        isDestroyed: () => false,
-        send: sendMock,
-        once: vi.fn(),
-        id: 1
-      }
+      const sender = createWatcherSender(1, sendMock)
 
       // Subscribe resolves only after the native watcher is installed.
       await handlers['fs:watchWorktree']({ sender }, { worktreePath: tempDir })
@@ -139,7 +126,7 @@ describe('filesystem-watcher real @parcel/watcher integration', () => {
     await mkdir(join(root.realRoot, 'src'), { recursive: true })
 
     const sendMock = vi.fn()
-    const sender = { isDestroyed: () => false, send: sendMock, once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1, sendMock)
     await handlers['fs:watchWorktree']({ sender }, { worktreePath: root.aliasRoot })
 
     const expectedPath = join(root.aliasRoot, 'src', 'agent-edit.ts')
diff --git a/src/main/ipc/filesystem-watcher-remote-batch.test.ts b/src/main/ipc/filesystem-watcher-remote-batch.test.ts
index de1f4fb3d375..fc4566b97c9d 100644
--- a/src/main/ipc/filesystem-watcher-remote-batch.test.ts
+++ b/src/main/ipc/filesystem-watcher-remote-batch.test.ts
@@ -1,3 +1,4 @@
+import { senderEvents } from './filesystem-watcher-test-sender'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { FsChangeEvent } from '../../shared/filesystem-entry-types'
 
@@ -34,7 +35,13 @@ describe('remote filesystem watcher batching', () => {
   const watchCallbacks: WatchCallback[] = []
 
   function makeSender(overrides: Partial<{ isDestroyed: () => boolean }> = {}) {
-    return { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1, ...overrides }
+    return {
+      isDestroyed: () => false,
+      send: vi.fn(),
+      ...senderEvents(),
+      id: 1,
+      ...overrides
+    }
   }
 
   beforeEach(async () => {
diff --git a/src/main/ipc/filesystem-watcher-remote-cancellation.test.ts b/src/main/ipc/filesystem-watcher-remote-cancellation.test.ts
index 60e25db90403..26140876bb50 100644
--- a/src/main/ipc/filesystem-watcher-remote-cancellation.test.ts
+++ b/src/main/ipc/filesystem-watcher-remote-cancellation.test.ts
@@ -1,3 +1,4 @@
+import { createWatcherSender } from './filesystem-watcher-test-sender'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { handleMock, getSshFilesystemProviderMock } = vi.hoisted(() => ({
@@ -50,8 +51,8 @@ describe('remote filesystem watcher cancellation', () => {
     )
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock })
     const args = { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
-    const senderOne = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
-    const senderTwo = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
+    const senderOne = createWatcherSender(1)
+    const senderTwo = createWatcherSender(2)
     const first = handlers['fs:watchWorktree']({ sender: senderOne }, args) as Promise<unknown>
     const second = handlers['fs:watchWorktree']({ sender: senderTwo }, args) as Promise<unknown>
 
@@ -101,8 +102,8 @@ describe('remote filesystem watcher cancellation', () => {
       })
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock })
     const args = { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
-    const firstSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
-    const secondSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
+    const firstSender = createWatcherSender(1)
+    const secondSender = createWatcherSender(2)
     const first = handlers['fs:watchWorktree']({ sender: firstSender }, args) as Promise<unknown>
 
     await Promise.resolve()
@@ -136,6 +137,7 @@ describe('remote filesystem watcher cancellation', () => {
     const destroyedSender = {
       isDestroyed: () => false,
       send: vi.fn(),
+      removeListener: vi.fn(),
       once: vi.fn((event: string, callback: () => void) => {
         if (event === 'destroyed') {
           destroyedCallbacks.push(callback)
@@ -156,7 +158,7 @@ describe('remote filesystem watcher cancellation', () => {
     installs.get('/destroyed')?.resolve(vi.fn())
     await destroyedWatch
 
-    const shutdownSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
+    const shutdownSender = createWatcherSender(2)
     const shutdownArgs = { worktreePath: '/shutdown', connectionId: 'conn-1' }
     const shutdownWatch = handlers['fs:watchWorktree'](
       { sender: shutdownSender },
@@ -182,8 +184,8 @@ describe('remote filesystem watcher cancellation', () => {
     )
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock })
     const args = { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
-    const senderOne = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
-    const senderTwo = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
+    const senderOne = createWatcherSender(1)
+    const senderTwo = createWatcherSender(2)
     const first = handlers['fs:watchWorktree']({ sender: senderOne }, args) as Promise<unknown>
 
     await Promise.resolve()
@@ -216,8 +218,8 @@ describe('remote filesystem watcher cancellation', () => {
     )
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock })
     const args = { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
-    const firstSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
-    const secondSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
+    const firstSender = createWatcherSender(1)
+    const secondSender = createWatcherSender(2)
     const first = handlers['fs:watchWorktree']({ sender: firstSender }, args) as Promise<unknown>
 
     await Promise.resolve()
@@ -259,9 +261,9 @@ describe('remote filesystem watcher cancellation', () => {
     const args = { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
     const reopenArgs = { worktreePath: '/home/me/other', connectionId: 'conn-1' }
     const lateUnwatch = vi.fn()
-    const firstSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
-    const joinerSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
-    const reopenSender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 3 }
+    const firstSender = createWatcherSender(1)
+    const joinerSender = createWatcherSender(2)
+    const reopenSender = createWatcherSender(3)
     const first = handlers['fs:watchWorktree']({ sender: firstSender }, args) as Promise<unknown>
 
     await Promise.resolve()
diff --git a/src/main/ipc/filesystem-watcher-remote-capacity.test.ts b/src/main/ipc/filesystem-watcher-remote-capacity.test.ts
index 97a8f82bf330..f67083f845d5 100644
--- a/src/main/ipc/filesystem-watcher-remote-capacity.test.ts
+++ b/src/main/ipc/filesystem-watcher-remote-capacity.test.ts
@@ -1,3 +1,4 @@
+import { createWatcherSender } from './filesystem-watcher-test-sender'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { handleMock, getSshFilesystemProviderMock } = vi.hoisted(() => ({
@@ -58,7 +59,7 @@ describe('remote filesystem watcher capacity refusals', () => {
       throw new Error(WATCH_ROOT_CAPACITY_REFUSAL_MESSAGE)
     })
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock })
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     const args = { worktreePath: '/home/me/repos/one', connectionId: 'conn-capacity' }
 
     await handlers['fs:watchWorktree']({ sender }, args)
@@ -78,7 +79,7 @@ describe('remote filesystem watcher capacity refusals', () => {
       throw new Error('Relay channel lost')
     })
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock })
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
+    const sender = createWatcherSender(2)
     const args = { worktreePath: '/home/me/repos/two', connectionId: 'conn-unavailable' }
 
     await handlers['fs:watchWorktree']({ sender }, args)
diff --git a/src/main/ipc/filesystem-watcher-remote-controller.ts b/src/main/ipc/filesystem-watcher-remote-controller.ts
index 1b6953cd292b..8a4f4cc2e919 100644
--- a/src/main/ipc/filesystem-watcher-remote-controller.ts
+++ b/src/main/ipc/filesystem-watcher-remote-controller.ts
@@ -1,6 +1,7 @@
 import type { WebContents } from 'electron'
 import type { RemoteWatcherInstallToken } from './filesystem-watcher-lifecycle-state'
 import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+import { registerWatcherSenderCleanup } from './filesystem-watcher-listener-lifecycle'
 import {
   installRemoteWatcherCore,
   type RemoteWatcherTerminalErrorHandler
@@ -14,14 +15,16 @@ export function installRemoteWatcher(
   sender: WebContents,
   connectionId: string,
   worktreePath: string,
-  generation = watcherLifecycleState.remoteWatcherLifecycleGeneration
+  generation = watcherLifecycleState.remoteWatcherLifecycleGeneration,
+  senderSignal = registerWatcherSenderCleanup(sender)
 ) {
   return installRemoteWatcherCore(
     sender,
     connectionId,
     worktreePath,
     handleRemoteWatcherTerminalError,
-    generation
+    generation,
+    senderSignal
   )
 }
 
diff --git a/src/main/ipc/filesystem-watcher-remote-dormant.ts b/src/main/ipc/filesystem-watcher-remote-dormant.ts
index 7c168114f512..11783f7bb57d 100644
--- a/src/main/ipc/filesystem-watcher-remote-dormant.ts
+++ b/src/main/ipc/filesystem-watcher-remote-dormant.ts
@@ -1,3 +1,5 @@
+import { isCurrentWatcherSender } from './filesystem-watcher-sender-lifetime'
+import { registerWatcherSenderCleanup } from './filesystem-watcher-listener-lifecycle'
 import { getSshFilesystemProvider } from '../providers/ssh-filesystem-dispatch'
 import { isWatcherRemovalInProgressError } from './watcher-removal-gate'
 import type {
@@ -74,6 +76,7 @@ async function rearmDormantRemoteWatcher(
   }
 
   const listeners = Array.from(desired.listeners.values())
+  const signals = listeners.map(registerWatcherSenderCleanup)
   let results: Awaited<ReturnType<InstallRemoteWatcher>>[]
   try {
     results = await Promise.all(
@@ -84,6 +87,9 @@ async function rearmDormantRemoteWatcher(
       // Why: removal owns the key now and either forgets the intent or restores the watch itself.
       return
     }
+    if (!listeners.some((listener, index) => isCurrentWatcherSender(listener, signals[index]))) {
+      return
+    }
     scheduleDormantRemoteWatcherRearmCore(
       connectionId,
       worktreePath,
@@ -92,10 +98,16 @@ async function rearmDormantRemoteWatcher(
     )
     return
   }
+  if (!listeners.some((listener, index) => isCurrentWatcherSender(listener, signals[index]))) {
+    return
+  }
   dependencies.requestResync(
     key,
     worktreePath,
-    listeners.filter((_, index) => results[index] === 'installed')
+    listeners.filter(
+      (listener, index) =>
+        results[index] === 'installed' && isCurrentWatcherSender(listener, signals[index])
+    )
   )
   // Why: 'cancelled' means shutdown or the last listener left, so only a refusal stays dormant.
   if (results.some((result) => result === 'unavailable' || result === 'capacity')) {
diff --git a/src/main/ipc/filesystem-watcher-remote-install.ts b/src/main/ipc/filesystem-watcher-remote-install.ts
index 3ab5babbd916..b1a6bab61fad 100644
--- a/src/main/ipc/filesystem-watcher-remote-install.ts
+++ b/src/main/ipc/filesystem-watcher-remote-install.ts
@@ -15,6 +15,7 @@ import type {
 } from './filesystem-watcher-lifecycle-state'
 import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
 import { getRemoteWatcherKey } from './filesystem-watcher-paths'
+import { isCurrentWatcherSender } from './filesystem-watcher-sender-lifetime'
 import {
   addInFlightRemoteInstallListener,
   addRemoteWatchListener,
@@ -34,10 +35,12 @@ export async function installRemoteWatcherCore(
   connectionId: string,
   worktreePath: string,
   onTerminalError: RemoteWatcherTerminalErrorHandler,
-  generation = watcherLifecycleState.remoteWatcherLifecycleGeneration
+  generation = watcherLifecycleState.remoteWatcherLifecycleGeneration,
+  senderSignal = registerWatcherSenderCleanup(sender)
 ): Promise<RemoteWatcherInstallResult> {
   // Why: refuse installs racing in after teardown (or a waiter from an earlier lifecycle) so provider.watch() isn't called post-shutdown.
   if (
+    !isCurrentWatcherSender(sender, senderSignal) ||
     watcherLifecycleState.remoteWatchersClosed ||
     generation !== watcherLifecycleState.remoteWatcherLifecycleGeneration
   ) {
@@ -50,7 +53,8 @@ export async function installRemoteWatcherCore(
       connectionId,
       worktreePath,
       onTerminalError,
-      generation
+      generation,
+      senderSignal
     )
   } finally {
     finishInstall()
@@ -62,7 +66,8 @@ async function installRemoteWatcherWhileRemovalAllowed(
   connectionId: string,
   worktreePath: string,
   onTerminalError: RemoteWatcherTerminalErrorHandler,
-  generation: number
+  generation: number,
+  senderSignal: AbortSignal
 ): Promise<RemoteWatcherInstallResult> {
   const provider = getSshFilesystemProvider(connectionId)
   if (!provider || sender.isDestroyed()) {
@@ -85,6 +90,9 @@ async function installRemoteWatcherWhileRemovalAllowed(
       addInFlightRemoteInstallListener(inFlight, sender)
     }
     const result = await pendingInstall
+    if (!isCurrentWatcherSender(sender, senderSignal)) {
+      return 'cancelled'
+    }
     if (
       result === 'installed' &&
       watcherLifecycleState.remoteWatchers.has(key) &&
@@ -108,7 +116,8 @@ async function installRemoteWatcherWhileRemovalAllowed(
         connectionId,
         worktreePath,
         onTerminalError,
-        generation
+        generation,
+        senderSignal
       )
     }
     return result
diff --git a/src/main/ipc/filesystem-watcher-remote-provider-rearm.ts b/src/main/ipc/filesystem-watcher-remote-provider-rearm.ts
index 3cc657c4086d..5c55c537f072 100644
--- a/src/main/ipc/filesystem-watcher-remote-provider-rearm.ts
+++ b/src/main/ipc/filesystem-watcher-remote-provider-rearm.ts
@@ -1,3 +1,4 @@
+import { isCurrentWatcherSender } from './filesystem-watcher-sender-lifetime'
 import type { WebContents } from 'electron'
 import { isWatcherRemovalInProgressError } from './watcher-removal-gate'
 import type {
@@ -5,7 +6,10 @@ import type {
   RequestRemoteWatcherResync
 } from './filesystem-watcher-remote-retry'
 import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
-import { clearDormantRemoteWatcher } from './filesystem-watcher-listener-lifecycle'
+import {
+  clearDormantRemoteWatcher,
+  registerWatcherSenderCleanup
+} from './filesystem-watcher-listener-lifecycle'
 
 type ScheduleRemoteWatcherRetry = (
   sender: WebContents,
@@ -79,24 +83,33 @@ export function reinstallRemoteWatchersForConnectionCore(
     watcherLifecycleState.loggedUnavailableRemoteWatchers.delete(key)
 
     const listeners = Array.from(desired.listeners.values())
+    const signals = listeners.map(registerWatcherSenderCleanup)
+    const liveListeners = () =>
+      listeners.filter((listener, index) => isCurrentWatcherSender(listener, signals[index]))
     void Promise.all(
       listeners.map((listener) =>
         dependencies.install(listener, desired.connectionId, desired.worktreePath)
       )
     )
       .then((results) => {
+        if (liveListeners().length === 0) {
+          return
+        }
         // Why: events between the transport dropping and this reinstall are gone for good.
         dependencies.requestResync(
           key,
           desired.worktreePath,
-          listeners.filter((_, index) => results[index] === 'installed')
+          listeners.filter(
+            (listener, index) =>
+              results[index] === 'installed' && isCurrentWatcherSender(listener, signals[index])
+          )
         )
         if (results.some((result) => result === 'capacity')) {
           dependencies.scheduleDormant(desired.connectionId, desired.worktreePath)
           return
         }
         if (results.some((result) => result === 'unavailable')) {
-          for (const listener of listeners) {
+          for (const listener of liveListeners()) {
             dependencies.scheduleRetry(
               listener,
               desired.connectionId,
@@ -111,7 +124,7 @@ export function reinstallRemoteWatchersForConnectionCore(
         if (isWatcherRemovalInProgressError(error)) {
           return
         }
-        for (const listener of listeners) {
+        for (const listener of liveListeners()) {
           dependencies.scheduleRetry(
             listener,
             desired.connectionId,
diff --git a/src/main/ipc/filesystem-watcher-remote-rearm.test.ts b/src/main/ipc/filesystem-watcher-remote-rearm.test.ts
index 0eecfbd82e93..056b10579a74 100644
--- a/src/main/ipc/filesystem-watcher-remote-rearm.test.ts
+++ b/src/main/ipc/filesystem-watcher-remote-rearm.test.ts
@@ -1,3 +1,4 @@
+import { createWatcherSender } from './filesystem-watcher-test-sender'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { handleMock, getSshFilesystemProviderMock, providerRegistrationListeners } = vi.hoisted(
@@ -51,8 +52,8 @@ describe('remote filesystem watcher re-arm', () => {
   it('still resyncs when a fresh watch beat the failed reinstall to the retry slot', async () => {
     vi.useFakeTimers()
     const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const senderOne = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
-    const senderTwo = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
+    const senderOne = createWatcherSender(1)
+    const senderTwo = createWatcherSender(2)
     const args = { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
     getSshFilesystemProviderMock.mockReturnValue({ watch: vi.fn().mockResolvedValue(vi.fn()) })
 
diff --git a/src/main/ipc/filesystem-watcher-remote-removal.ts b/src/main/ipc/filesystem-watcher-remote-removal.ts
index 0e9c741851a6..a6c7f2a66363 100644
--- a/src/main/ipc/filesystem-watcher-remote-removal.ts
+++ b/src/main/ipc/filesystem-watcher-remote-removal.ts
@@ -1,3 +1,4 @@
+import { isCurrentWatcherSender } from './filesystem-watcher-sender-lifetime'
 import type { WebContents } from 'electron'
 import type { FsChangedPayload } from '../../shared/filesystem-entry-types'
 import { getSshFilesystemProvider } from '../providers/ssh-filesystem-dispatch'
@@ -5,6 +6,7 @@ import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
 import { getRemoteWatcherKey } from './filesystem-watcher-paths'
 import {
   clearDormantRemoteWatcher,
+  registerWatcherSenderCleanup,
   clearRemoteWatcherResync
 } from './filesystem-watcher-listener-lifecycle'
 import {
@@ -71,11 +73,18 @@ export async function restoreRemoteWatcherAfterFailedRemoval(
     return
   }
   watcherLifecycleState.suspendedRemoteWatcherListeners.delete(key)
-  for (const sender of suspended.listeners.values()) {
-    if (sender.isDestroyed()) {
+  const owners = Array.from(suspended.listeners.values(), (sender) => ({
+    sender,
+    signal: registerWatcherSenderCleanup(sender)
+  }))
+  for (const { sender, signal } of owners) {
+    if (!isCurrentWatcherSender(sender, signal)) {
+      continue
+    }
+    const result = await installRemoteWatcher(sender, connectionId, worktreePath, undefined, signal)
+    if (!isCurrentWatcherSender(sender, signal)) {
       continue
     }
-    const result = await installRemoteWatcher(sender, connectionId, worktreePath)
     if (result === 'capacity') {
       scheduleDormantRemoteWatcherRearm(connectionId, worktreePath)
     } else if (result === 'unavailable') {
diff --git a/src/main/ipc/filesystem-watcher-remote-retry.ts b/src/main/ipc/filesystem-watcher-remote-retry.ts
index d73f9ed4db4d..02c797e9c75b 100644
--- a/src/main/ipc/filesystem-watcher-remote-retry.ts
+++ b/src/main/ipc/filesystem-watcher-remote-retry.ts
@@ -1,3 +1,4 @@
+import { isCurrentWatcherSender } from './filesystem-watcher-sender-lifetime'
 import type { WebContents } from 'electron'
 import type { FsChangedPayload } from '../../shared/filesystem-entry-types'
 import { isWatcherRemovalInProgressError } from './watcher-removal-gate'
@@ -8,7 +9,10 @@ import {
   watcherLifecycleState
 } from './filesystem-watcher-lifecycle-state'
 import { getRemoteWatcherKey } from './filesystem-watcher-paths'
-import { clearRemoteWatcherResync } from './filesystem-watcher-listener-lifecycle'
+import {
+  clearRemoteWatcherResync,
+  registerWatcherSenderCleanup
+} from './filesystem-watcher-listener-lifecycle'
 import { isCurrentDesiredRemoteWatcher } from './filesystem-watcher-remote-desired'
 
 export type InstallRemoteWatcher = (
@@ -44,6 +48,9 @@ export function scheduleRemoteWatcherRetryCore(
   resyncOnInstall = false
 ): void {
   const key = getRemoteWatcherKey(connectionId, worktreePath)
+  if (watcherLifecycleState.remoteWatchersClosed || !isCurrentDesiredRemoteWatcher(key, sender)) {
+    return
+  }
   const existingRetry = watcherLifecycleState.pendingRemoteWatcherRetryListeners.get(key)
   if (existingRetry) {
     if (!sender.isDestroyed()) {
@@ -89,15 +96,24 @@ export function scheduleRemoteWatcherRetryCore(
     const listeners = Array.from(retry.listeners.values()).filter(
       (listener) => !listener.isDestroyed() && isCurrentDesiredRemoteWatcher(key, listener)
     )
+    const signals = listeners.map(registerWatcherSenderCleanup)
+    const liveListeners = () =>
+      listeners.filter((listener, index) => isCurrentWatcherSender(listener, signals[index]))
     void Promise.all(
       listeners.map((listener) => dependencies.install(listener, connectionId, worktreePath))
     )
       .then((results) => {
+        if (liveListeners().length === 0) {
+          return
+        }
         if (retry.resyncOnInstall) {
           dependencies.requestResync(
             key,
             worktreePath,
-            listeners.filter((_, index) => results[index] === 'installed')
+            listeners.filter(
+              (listener, index) =>
+                results[index] === 'installed' && isCurrentWatcherSender(listener, signals[index])
+            )
           )
         }
         // Why capacity leaves the fast window: the relay is refusing on a full watch-root cap, and a
@@ -108,7 +124,7 @@ export function scheduleRemoteWatcherRetryCore(
         }
         // Why: don't re-arm on 'cancelled' (renderer stopped watching) — it would fire a stale overflow when the 60s window expires.
         if (results.some((result) => result === 'unavailable')) {
-          for (const listener of listeners) {
+          for (const listener of liveListeners()) {
             scheduleRemoteWatcherRetryCore(
               listener,
               connectionId,
@@ -124,7 +140,7 @@ export function scheduleRemoteWatcherRetryCore(
         if (isWatcherRemovalInProgressError(error)) {
           return
         }
-        for (const listener of listeners) {
+        for (const listener of liveListeners()) {
           scheduleRemoteWatcherRetryCore(
             listener,
             connectionId,
diff --git a/src/main/ipc/filesystem-watcher-removal-deadline.test.ts b/src/main/ipc/filesystem-watcher-removal-deadline.test.ts
index 9eabdb8964e5..ca1e731c99a0 100644
--- a/src/main/ipc/filesystem-watcher-removal-deadline.test.ts
+++ b/src/main/ipc/filesystem-watcher-removal-deadline.test.ts
@@ -1,3 +1,4 @@
+import { createWatcherSender } from './filesystem-watcher-test-sender'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as ParcelWatcherProcess from './parcel-watcher-process'
 
@@ -84,12 +85,7 @@ describe('local filesystem watcher removal deadline', () => {
       // subscribe that ignores the abort signal exercises the deadline rather than the cancel path.
       // Once, so the wedge cannot leak into the next test.
       vi.mocked(subscribeViaWatcherProcess).mockImplementationOnce(() => new Promise(() => {}))
-      const sender = {
-        isDestroyed: () => false,
-        send: vi.fn(),
-        once: vi.fn(),
-        id: 1
-      }
+      const sender = createWatcherSender(1)
 
       const watchPromise = handlers['fs:watchWorktree'](
         { sender },
@@ -132,7 +128,7 @@ describe('local filesystem watcher removal deadline', () => {
         })
     )
     vi.mocked(subscribeParcelWatcher).mockResolvedValue({ unsubscribe: unsubscribeMock } as never)
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree']({ sender }, { worktreePath: '/tmp/repo' })
 
@@ -160,12 +156,7 @@ describe('local filesystem watcher removal deadline', () => {
     try {
       vi.mocked(stat).mockResolvedValue({ isDirectory: () => true } as never)
       vi.mocked(subscribeViaWatcherProcess).mockImplementationOnce(() => new Promise(() => {}))
-      const sender = {
-        isDestroyed: () => false,
-        send: vi.fn(),
-        once: vi.fn(),
-        id: 1
-      }
+      const sender = createWatcherSender(1)
 
       const watchPromise = handlers['fs:watchWorktree'](
         { sender },
@@ -209,7 +200,7 @@ describe('local filesystem watcher removal deadline', () => {
         })
     )
     vi.mocked(subscribeParcelWatcher).mockResolvedValue({ unsubscribe: unsubscribeMock } as never)
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     await handlers['fs:watchWorktree']({ sender }, { worktreePath: '/tmp/repo' })
 
     vi.useFakeTimers()
diff --git a/src/main/ipc/filesystem-watcher-sender-lifetime.ts b/src/main/ipc/filesystem-watcher-sender-lifetime.ts
new file mode 100644
index 000000000000..b72948471b13
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-sender-lifetime.ts
@@ -0,0 +1,36 @@
+import type { WebContents } from 'electron'
+import { abortWhenRendererGone } from './renderer-lifetime-abort'
+import { watcherLifecycleState } from './filesystem-watcher-lifecycle-state'
+
+export function captureWatcherSenderLifetime(
+  sender: WebContents,
+  cleanup: () => void
+): AbortSignal {
+  const existing = watcherLifecycleState.senderLifetimes.get(sender.id)
+  if (existing) {
+    return existing.signal
+  }
+  if (sender.isDestroyed()) {
+    return AbortSignal.abort()
+  }
+  const lifetime = abortWhenRendererGone(sender)
+  watcherLifecycleState.senderLifetimes.set(sender.id, lifetime)
+  lifetime.signal.addEventListener(
+    'abort',
+    () => {
+      lifetime.dispose()
+      watcherLifecycleState.senderLifetimes.delete(sender.id)
+      cleanup()
+    },
+    { once: true }
+  )
+  return lifetime.signal
+}
+
+export function isCurrentWatcherSender(sender: WebContents, signal: AbortSignal): boolean {
+  return (
+    !sender.isDestroyed() &&
+    !signal.aborted &&
+    watcherLifecycleState.senderLifetimes.get(sender.id)?.signal === signal
+  )
+}
diff --git a/src/main/ipc/filesystem-watcher-shutdown.ts b/src/main/ipc/filesystem-watcher-shutdown.ts
index 9f9cd2de3539..31a57ecab100 100644
--- a/src/main/ipc/filesystem-watcher-shutdown.ts
+++ b/src/main/ipc/filesystem-watcher-shutdown.ts
@@ -8,7 +8,10 @@ export async function closeAllWatchers(): Promise<void> {
   // Why: drop the intent with the rest of the state, but keep the provider-registration
   // subscription — a new fs:watchWorktree reopens the subsystem and still needs the re-arm hook.
   watcherLifecycleState.desiredRemoteWatchers.clear()
-  watcherLifecycleState.senderCleanupRegistered.clear()
+  for (const lifetime of watcherLifecycleState.senderLifetimes.values()) {
+    lifetime.dispose()
+  }
+  watcherLifecycleState.senderLifetimes.clear()
   watcherLifecycleState.unwatchableRoots.clear()
   watcherLifecycleState.suspendedLocalWatcherListeners.clear()
   watcherLifecycleState.suspendedRemoteWatcherListeners.clear()
diff --git a/src/main/ipc/filesystem-watcher-terminal-resync.test.ts b/src/main/ipc/filesystem-watcher-terminal-resync.test.ts
index 31e87d7a4c94..e8a81d1a7ff4 100644
--- a/src/main/ipc/filesystem-watcher-terminal-resync.test.ts
+++ b/src/main/ipc/filesystem-watcher-terminal-resync.test.ts
@@ -41,6 +41,7 @@ const OVERFLOW_PAYLOAD = {
 type MockSender = {
   isDestroyed: () => boolean
   send: ReturnType<typeof vi.fn>
+  removeListener: ReturnType<typeof vi.fn>
   once: ReturnType<typeof vi.fn>
   id: number
   destroy: () => void
@@ -52,6 +53,7 @@ function createSender(id: number): MockSender {
   return {
     isDestroyed: () => destroyed,
     send: vi.fn(),
+    removeListener: vi.fn(),
     once: vi.fn((event: string, handler: () => void) => {
       if (event === 'destroyed') {
         destroyedHandlers.push(handler)
diff --git a/src/main/ipc/filesystem-watcher-test-sender.ts b/src/main/ipc/filesystem-watcher-test-sender.ts
new file mode 100644
index 000000000000..4ff5a5bbcc18
--- /dev/null
+++ b/src/main/ipc/filesystem-watcher-test-sender.ts
@@ -0,0 +1,18 @@
+import { vi, type Mock } from 'vitest'
+
+type SenderEvents = { once: Mock; removeListener: Mock }
+
+export function senderEvents(): SenderEvents {
+  return { once: vi.fn(), removeListener: vi.fn() }
+}
+
+export function createWatcherSender(
+  id: number,
+  send: Mock = vi.fn()
+): SenderEvents & {
+  id: number
+  isDestroyed: () => boolean
+  send: Mock
+} {
+  return { id, isDestroyed: () => false, send, ...senderEvents() }
+}
diff --git a/src/main/ipc/filesystem-watcher-unwatchable-roots.test.ts b/src/main/ipc/filesystem-watcher-unwatchable-roots.test.ts
index 8378d55ab0de..78274bbe0282 100644
--- a/src/main/ipc/filesystem-watcher-unwatchable-roots.test.ts
+++ b/src/main/ipc/filesystem-watcher-unwatchable-roots.test.ts
@@ -1,3 +1,4 @@
+import { createWatcherSender } from './filesystem-watcher-test-sender'
 import { statSync } from 'node:fs'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
@@ -52,7 +53,7 @@ describe('filesystem watcher unwatchable root cache', () => {
 
   it('releases the install record when the root is a file', async () => {
     const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     vi.mocked(stat).mockResolvedValue(statSync(new URL(import.meta.url)))
     try {
       await handlers['fs:watchWorktree']({ sender }, { worktreePath: '/tmp/not-directory' })
@@ -66,7 +67,7 @@ describe('filesystem watcher unwatchable root cache', () => {
 
   it('evicts oldest failed local roots while suppressing recent retries', async () => {
     const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     vi.mocked(stat).mockRejectedValue(new Error('missing'))
 
     for (let i = 0; i < 257; i += 1) {
diff --git a/src/main/ipc/filesystem-watcher.test.ts b/src/main/ipc/filesystem-watcher.test.ts
index 2d9181d1155e..db6fcf206e50 100644
--- a/src/main/ipc/filesystem-watcher.test.ts
+++ b/src/main/ipc/filesystem-watcher.test.ts
@@ -1,3 +1,4 @@
+import { createWatcherSender } from './filesystem-watcher-test-sender'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { handleMock, getSshFilesystemProviderMock, providerRegistrationListeners } = vi.hoisted(
@@ -106,7 +107,7 @@ describe('registerFilesystemWatcherHandlers', () => {
     vi.mocked(subscribeParcelWatcher).mockResolvedValue({ unsubscribe: vi.fn() } as never)
 
     await handlers['fs:watchWorktree'](
-      { sender: { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 } },
+      { sender: createWatcherSender(1) },
       { worktreePath: 'C:\\repo' }
     )
 
@@ -140,7 +141,7 @@ describe('registerFilesystemWatcherHandlers', () => {
         rootPath: worktreePath
       }
     })
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     const args = { worktreePath: '\\\\wsl.localhost\\Ubuntu\\home\\me\\repo' }
 
     await expect(handlers['fs:watchWorktree']({ sender }, args)).resolves.toBeUndefined()
@@ -162,7 +163,7 @@ describe('registerFilesystemWatcherHandlers', () => {
       reserveWatcherChild()
     )
     vi.mocked(createWslWatcher).mockRejectedValue(new WatcherChildCapacityError())
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     const args = { worktreePath: '\\\\wsl.localhost\\Ubuntu\\home\\me\\repo' }
 
     await handlers['fs:watchWorktree']({ sender }, args)
@@ -178,7 +179,7 @@ describe('registerFilesystemWatcherHandlers', () => {
   it('rejects installs during destructive removal and allows a retry afterward', async () => {
     vi.mocked(stat).mockResolvedValue({ isDirectory: () => true } as never)
     vi.mocked(subscribeParcelWatcher).mockResolvedValue({ unsubscribe: vi.fn() } as never)
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     const removal = acquireWatcherRemovalGate('/repo')
     await removal.ready
 
@@ -201,12 +202,12 @@ describe('registerFilesystemWatcherHandlers', () => {
 
     await expect(
       handlers['fs:watchWorktree'](
-        { sender: { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 } },
+        { sender: createWatcherSender(1) },
         { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
       )
     ).resolves.toBeUndefined()
     await handlers['fs:watchWorktree'](
-      { sender: { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 } },
+      { sender: createWatcherSender(1) },
       { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
     )
 
@@ -226,7 +227,7 @@ describe('registerFilesystemWatcherHandlers', () => {
     vi.useFakeTimers()
     const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
     const sendMock = vi.fn()
-    const sender = { isDestroyed: () => false, send: sendMock, once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1, sendMock)
     const unwatchMock = vi.fn()
     const watchMock = vi.fn().mockResolvedValue(unwatchMock)
     getSshFilesystemProviderMock.mockReturnValueOnce(undefined)
@@ -261,7 +262,7 @@ describe('registerFilesystemWatcherHandlers', () => {
     vi.useFakeTimers()
     const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
     const sendMock = vi.fn()
-    const sender = { isDestroyed: () => false, send: sendMock, once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1, sendMock)
     const unwatchMock = vi.fn()
     const retryWatchMock = vi.fn().mockResolvedValue(unwatchMock)
     getSshFilesystemProviderMock
@@ -299,7 +300,7 @@ describe('registerFilesystemWatcherHandlers', () => {
     getSshFilesystemProviderMock.mockReturnValueOnce(undefined)
 
     await handlers['fs:watchWorktree'](
-      { sender: { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 } },
+      { sender: createWatcherSender(1) },
       { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
     )
 
@@ -315,8 +316,8 @@ describe('registerFilesystemWatcherHandlers', () => {
   it('retries all live renderer owners after a terminal relay watch failure', async () => {
     vi.useFakeTimers()
     const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const senderOne = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
-    const senderTwo = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
+    const senderOne = createWatcherSender(1)
+    const senderTwo = createWatcherSender(2)
     const watchMock = vi.fn().mockResolvedValue(vi.fn())
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock })
 
@@ -354,7 +355,7 @@ describe('registerFilesystemWatcherHandlers', () => {
   })
 
   it('reinstalls an SSH worktree watch when the provider is re-registered after a reconnect', async () => {
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     const staleUnwatch = vi.fn()
     const watchMock = vi.fn().mockResolvedValue(staleUnwatch)
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock })
@@ -390,7 +391,7 @@ describe('registerFilesystemWatcherHandlers', () => {
 
   it('re-arms an SSH watch whose first install found no provider yet', async () => {
     const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     // A connect slower than the retry window leaves the renderer subscribed with nothing installed.
     getSshFilesystemProviderMock.mockReturnValue(undefined)
 
@@ -411,7 +412,7 @@ describe('registerFilesystemWatcherHandlers', () => {
   it('resyncs after a reconnect whose reinstall only succeeded on a retry', async () => {
     vi.useFakeTimers()
     const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     getSshFilesystemProviderMock.mockReturnValue({ watch: vi.fn().mockResolvedValue(vi.fn()) })
 
     await handlers['fs:watchWorktree'](
@@ -440,7 +441,7 @@ describe('registerFilesystemWatcherHandlers', () => {
   })
 
   it('does not resurrect an SSH watch the renderer already unwatched', async () => {
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     const watchMock = vi.fn().mockResolvedValue(vi.fn())
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock })
 
@@ -462,7 +463,7 @@ describe('registerFilesystemWatcherHandlers', () => {
   })
 
   it('leaves watches on other connections untouched when one provider re-registers', async () => {
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     const watchMock = vi.fn().mockResolvedValue(vi.fn())
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock })
 
@@ -480,8 +481,8 @@ describe('registerFilesystemWatcherHandlers', () => {
   })
 
   it('reinstalls one shared watch when several senders share a re-registered connection', async () => {
-    const senderOne = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
-    const senderTwo = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
+    const senderOne = createWatcherSender(1)
+    const senderTwo = createWatcherSender(2)
     const watchMock = vi.fn().mockResolvedValue(vi.fn())
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock })
 
@@ -515,8 +516,11 @@ describe('registerFilesystemWatcherHandlers', () => {
     const sender = {
       isDestroyed: () => destroyed,
       send: vi.fn(),
-      once: vi.fn((_event: string, handler: () => void) => {
-        destroyHandlers.push(handler)
+      removeListener: vi.fn(),
+      once: vi.fn((event: string, handler: () => void) => {
+        if (event === 'destroyed') {
+          destroyHandlers.push(handler)
+        }
       }),
       id: 1
     }
@@ -545,8 +549,8 @@ describe('registerFilesystemWatcherHandlers', () => {
   it('shares SSH worktree watchers across renderer senders until the last unwatch', async () => {
     const sendOne = vi.fn()
     const sendTwo = vi.fn()
-    const senderOne = { isDestroyed: () => false, send: sendOne, once: vi.fn(), id: 1 }
-    const senderTwo = { isDestroyed: () => false, send: sendTwo, once: vi.fn(), id: 2 }
+    const senderOne = createWatcherSender(1, sendOne)
+    const senderTwo = createWatcherSender(2, sendTwo)
     const unwatchMock = vi.fn()
     const watchMock = vi.fn().mockResolvedValue(unwatchMock)
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock })
@@ -590,7 +594,7 @@ describe('registerFilesystemWatcherHandlers', () => {
     const provider = { watch: vi.fn().mockResolvedValue(vi.fn()), closeWatch }
     getSshFilesystemProviderMock.mockReturnValue(provider)
     await handlers['fs:watchWorktree'](
-      { sender: { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 } },
+      { sender: createWatcherSender(1) },
       { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
     )
 
@@ -615,7 +619,7 @@ describe('registerFilesystemWatcherHandlers', () => {
       .mockResolvedValueOnce(replacementUnwatch)
     const closeWatch = vi.fn().mockResolvedValue(undefined)
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock, closeWatch })
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree'](
       { sender },
@@ -642,7 +646,7 @@ describe('registerFilesystemWatcherHandlers', () => {
     const watchMock = vi.fn().mockResolvedValue(vi.fn())
     const closeWatch = vi.fn().mockResolvedValue(undefined)
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock, closeWatch })
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
 
     await handlers['fs:watchWorktree'](
       { sender },
@@ -666,7 +670,7 @@ describe('registerFilesystemWatcherHandlers', () => {
     const watchMock = vi.fn().mockResolvedValue(firstUnwatch)
     const closeWatch = vi.fn().mockResolvedValue(undefined)
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock, closeWatch })
-    const sender = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
+    const sender = createWatcherSender(1)
     const args = { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
 
     await handlers['fs:watchWorktree']({ sender }, args)
@@ -685,14 +689,12 @@ describe('registerFilesystemWatcherHandlers', () => {
     getSshFilesystemProviderMock.mockReturnValue({ watch: watchMock, closeWatch })
     const destroyedCallbacks: (() => void)[] = []
     const sender = {
-      isDestroyed: () => false,
-      send: vi.fn(),
+      ...createWatcherSender(1),
       once: vi.fn((event: string, callback: () => void) => {
         if (event === 'destroyed') {
           destroyedCallbacks.push(callback)
         }
-      }),
-      id: 1
+      })
     }
     const args = { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
 
@@ -709,8 +711,8 @@ describe('registerFilesystemWatcherHandlers', () => {
   it('preserves remote event routing when acknowledged teardown rejects', async () => {
     const sendOne = vi.fn()
     const sendTwo = vi.fn()
-    const senderOne = { isDestroyed: () => false, send: sendOne, once: vi.fn(), id: 1 }
-    const senderTwo = { isDestroyed: () => false, send: sendTwo, once: vi.fn(), id: 2 }
+    const senderOne = createWatcherSender(1, sendOne)
+    const senderTwo = createWatcherSender(2, sendTwo)
     const watchMock = vi.fn().mockResolvedValue(vi.fn())
     const closeWatch = vi
       .fn()
@@ -747,8 +749,8 @@ describe('registerFilesystemWatcherHandlers', () => {
   it('dedupes concurrent pending SSH worktree watcher installs', async () => {
     const sendOne = vi.fn()
     const sendTwo = vi.fn()
-    const senderOne = { isDestroyed: () => false, send: sendOne, once: vi.fn(), id: 1 }
-    const senderTwo = { isDestroyed: () => false, send: sendTwo, once: vi.fn(), id: 2 }
+    const senderOne = createWatcherSender(1, sendOne)
+    const senderTwo = createWatcherSender(2, sendTwo)
     const unwatchMock = vi.fn()
     let resolveWatch: (unwatch: () => void) => void = () => {}
     const watchPromise = new Promise<() => void>((resolve) => {
@@ -791,8 +793,8 @@ describe('registerFilesystemWatcherHandlers', () => {
   it('keeps a pending SSH watcher install alive when only one pending sender unwatches', async () => {
     const sendOne = vi.fn()
     const sendTwo = vi.fn()
-    const senderOne = { isDestroyed: () => false, send: sendOne, once: vi.fn(), id: 1 }
-    const senderTwo = { isDestroyed: () => false, send: sendTwo, once: vi.fn(), id: 2 }
+    const senderOne = createWatcherSender(1, sendOne)
+    const senderTwo = createWatcherSender(2, sendTwo)
     const unwatchMock = vi.fn()
     let resolveWatch: (unwatch: () => void) => void = () => {}
     const watchPromise = new Promise<() => void>((resolve) => {
@@ -833,14 +835,12 @@ describe('registerFilesystemWatcherHandlers', () => {
   it('unsubscribes if the sender is destroyed while an SSH watcher is opening', async () => {
     const destroyedCallbacks: (() => void)[] = []
     const sender = {
-      isDestroyed: () => false,
-      send: vi.fn(),
+      ...createWatcherSender(1),
       once: vi.fn((event: string, callback: () => void) => {
         if (event === 'destroyed') {
           destroyedCallbacks.push(callback)
         }
-      }),
-      id: 1
+      })
     }
     const unwatchMock = vi.fn()
     let resolveWatch: (unwatch: () => void) => void = () => {}
@@ -871,8 +871,8 @@ describe('registerFilesystemWatcherHandlers', () => {
 
   it('revives a pending SSH watcher install when a new sender joins after cancellation', async () => {
     const args = { worktreePath: '/home/me/repo', connectionId: 'conn-1' }
-    const senderOne = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 1 }
-    const senderTwo = { isDestroyed: () => false, send: vi.fn(), once: vi.fn(), id: 2 }
+    const senderOne = createWatcherSender(1)
+    const senderTwo = createWatcherSender(2)
     const unwatchMock = vi.fn()
     let resolveWatch!: (unwatch: () => void) => void
     const watchMock = vi.fn().mockReturnValue(
@@ -907,14 +907,12 @@ describe('registerFilesystemWatcherHandlers', () => {
   it('registers one destroyed listener for many SSH worktree watches', async () => {
     const destroyedCallbacks: (() => void)[] = []
     const sender = {
-      isDestroyed: () => false,
-      send: vi.fn(),
+      ...createWatcherSender(99),
       once: vi.fn((event: string, callback: () => void) => {
         if (event === 'destroyed') {
           destroyedCallbacks.push(callback)
         }
-      }),
-      id: 99
+      })
     }
     const unwatchMock = vi.fn()
     const watchMock = vi.fn().mockResolvedValue(unwatchMock)
@@ -929,7 +927,7 @@ describe('registerFilesystemWatcherHandlers', () => {
 
     // Why: WebContents warns after 10 listeners. The cleanup work still covers
     // every remote watch by scanning the shared remote watcher registry.
-    expect(sender.once).toHaveBeenCalledTimes(1)
+    expect(sender.once).toHaveBeenCalledTimes(3)
     expect(destroyedCallbacks).toHaveLength(1)
 
     destroyedCallbacks[0]()
diff --git a/src/main/ipc/filesystem/filesystem-git-pull-request-generation-handlers.ts b/src/main/ipc/filesystem/filesystem-git-pull-request-generation-handlers.ts
index 1c16a119b3b3..2361bbb4f4ca 100644
--- a/src/main/ipc/filesystem/filesystem-git-pull-request-generation-handlers.ts
+++ b/src/main/ipc/filesystem/filesystem-git-pull-request-generation-handlers.ts
@@ -89,6 +89,8 @@ export function registerFilesystemGitPullRequestGenerationHandlers(
           repoPath: args.worktreePath,
           connectionId: args.connectionId
         })
+        // Preparation can return before this lookup settles; retain its error for the later await.
+        void linkedIssueDetailsPromise.catch(() => undefined)
         let context: Awaited<ReturnType<typeof getPullRequestDraftContext>>
         try {
           const currentBody = await resolveHostedReviewBodyForGeneration({
@@ -151,6 +153,8 @@ export function registerFilesystemGitPullRequestGenerationHandlers(
         connectionId: args.connectionId,
         localGitOptions: gitOptions
       })
+      // Preparation can return before this lookup settles; retain its error for the later await.
+      void linkedIssueDetailsPromise.catch(() => undefined)
       let context: Awaited<ReturnType<typeof getPullRequestDraftContext>>
       try {
         const currentBody = await resolveHostedReviewBodyForGeneration({
diff --git a/src/main/ipc/filesystem/filesystem-read-handlers.ts b/src/main/ipc/filesystem/filesystem-read-handlers.ts
index 2850ba659b40..1d9fe681fee6 100644
--- a/src/main/ipc/filesystem/filesystem-read-handlers.ts
+++ b/src/main/ipc/filesystem/filesystem-read-handlers.ts
@@ -13,6 +13,7 @@ import { resolveRegisteredWorktreePath } from '../registered-worktree-roots-cach
 import { resolveAuthorizedPath } from '../filesystem-auth'
 import { isENOENT } from '../filesystem-path-containment'
 import { listMarkdownDocuments, markdownDocumentsFromRelativePaths } from '../markdown-documents'
+import { getLocalGitOptionsForRegisteredWorktree } from '../local-worktree-runtime-options'
 import { recordCrashBreadcrumb } from '../../crash-reporting/crash-breadcrumb-store'
 import { buildReadDirErrorBreadcrumb, type ReadDirThrowSite } from '../readdir-error-diagnostics'
 import type { FilesystemHandlerContext } from './filesystem-handler-context'
@@ -131,7 +132,10 @@ export function registerFilesystemReadHandlers(context: FilesystemHandlerContext
         return markdownDocumentsFromRelativePaths(args.rootPath, relativePaths)
       }
       const rootPath = await resolveRegisteredWorktreePath(args.rootPath, store)
-      return listMarkdownDocuments(rootPath)
+      return listMarkdownDocuments(
+        rootPath,
+        getLocalGitOptionsForRegisteredWorktree(store, args.rootPath, rootPath)
+      )
     }
   )
 
diff --git a/src/main/ipc/freebuff-detection.test.ts b/src/main/ipc/freebuff-detection.test.ts
new file mode 100644
index 000000000000..6c74e6409b5f
--- /dev/null
+++ b/src/main/ipc/freebuff-detection.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it } from 'vitest'
+import {
+  getTuiAgentDetectionProbeCommands,
+  KNOWN_TUI_AGENT_DETECTION_COMMANDS,
+  resolveDetectedTuiAgentIds
+} from './tui-agent-detection-commands'
+
+describe('Freebuff detection', () => {
+  it.each(['darwin', 'linux', 'win32', 'wsl'] as const)(
+    'detects Freebuff independently of Codebuff on %s',
+    (runtime) => {
+      expect(
+        getTuiAgentDetectionProbeCommands(KNOWN_TUI_AGENT_DETECTION_COMMANDS, runtime)
+      ).toContain('freebuff')
+      expect(
+        resolveDetectedTuiAgentIds(
+          KNOWN_TUI_AGENT_DETECTION_COMMANDS,
+          new Set(['freebuff']),
+          runtime
+        )
+      ).toEqual(['freebuff'])
+      expect(
+        resolveDetectedTuiAgentIds(
+          KNOWN_TUI_AGENT_DETECTION_COMMANDS,
+          new Set(['codebuff']),
+          runtime
+        )
+      ).toEqual(['codebuff'])
+      expect(
+        resolveDetectedTuiAgentIds(
+          KNOWN_TUI_AGENT_DETECTION_COMMANDS,
+          new Set(['freebuff', 'codebuff']),
+          runtime
+        )
+      ).toEqual(expect.arrayContaining(['freebuff', 'codebuff']))
+    }
+  )
+})
diff --git a/src/main/ipc/github-ipc-channel-parity.test.ts b/src/main/ipc/github-ipc-channel-parity.test.ts
deleted file mode 100644
index 1746890199a8..000000000000
--- a/src/main/ipc/github-ipc-channel-parity.test.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const mocks = await vi.hoisted(async () => {
-  const { createGitHubIpcMocks } = await import('./github-ipc-module-mocks')
-  return createGitHubIpcMocks()
-})
-
-vi.mock('electron', () => mocks.electron)
-vi.mock('../github/client', () => mocks.client)
-vi.mock('../github/work-item-details', () => mocks.workItemDetails)
-vi.mock('../github/pr-refresh-coordinator', () => mocks.prRefresh)
-vi.mock('../telemetry/client', () => mocks.telemetry)
-vi.mock('../telemetry/cohort-classifier', () => mocks.cohort)
-vi.mock('./ui', () => mocks.ui)
-
-import * as github from './github'
-import { createGitHubIpcHarness } from './github-ipc-test-harness'
-
-const EXPECTED_GITHUB_IPC_CHANNELS = [
-  'gh:prForBranch',
-  'gh:refreshPRNow',
-  'gh:enqueuePRRefresh',
-  'gh:reportVisiblePRRefreshCandidates',
-  'gh:issue',
-  'gh:listIssues',
-  'gh:createIssue',
-  'gh:listWorkItems',
-  'gh:countWorkItems',
-  'gh:workItem',
-  'gh:workItemByOwnerRepo',
-  'gh:workItemDetails',
-  'gh:notifyWorkItemMutated',
-  'gh:prFileContents',
-  'gh:repoSlug',
-  'gh:repoUpstream',
-  'gh:prChecks',
-  'gh:prCheckDetails',
-  'gh:prComments',
-  'gh:setPRCommentReaction',
-  'gh:resolveReviewThread',
-  'gh:setPRFileViewed',
-  'gh:addPRReviewCommentReply',
-  'gh:addPRReviewComment',
-  'gh:updatePRTitle',
-  'gh:mergePR',
-  'gh:setPRAutoMerge',
-  'gh:updatePRState',
-  'gh:markPRReadyForReview',
-  'gh:rerunPRChecks',
-  'gh:requestPRReviewers',
-  'gh:removePRReviewers',
-  'gh:updateIssue',
-  'gh:addIssueComment',
-  'gh:listLabels',
-  'gh:listAssignableUsers',
-  'gh:viewer',
-  'gh:checkOrcaStarred',
-  'gh:starOrca',
-  'gh:rateLimit',
-  'gh:diagnoseAuth',
-  'gh:listBindableAccounts',
-  'gh:validateAccountBinding',
-  'gh:listAccessibleProjects',
-  'gh:resolveProjectRef',
-  'gh:listProjectViews',
-  'gh:getProjectViewTable',
-  'gh:projectWorkItemDetailsBySlug',
-  'gh:updateProjectItemField',
-  'gh:clearProjectItemField',
-  'gh:updateIssueBySlug',
-  'gh:updatePullRequestBySlug',
-  'gh:addIssueCommentBySlug',
-  'gh:updateIssueCommentBySlug',
-  'gh:deleteIssueCommentBySlug',
-  'gh:listLabelsBySlug',
-  'gh:listAssignableUsersBySlug',
-  'gh:listIssueTypesBySlug',
-  'gh:updateIssueTypeBySlug'
-] as const
-
-describe('GitHub IPC channel parity', () => {
-  const harness = createGitHubIpcHarness(mocks)
-
-  beforeEach(harness.reset)
-
-  it('preserves the facade and fixed IPC channel contract', () => {
-    github.registerGitHubHandlers(harness.store as never, harness.stats as never)
-
-    // The preload facade now composes the two GitHub bridge owners; inspect
-    // both owners so the channel census remains tied to the actual invokes.
-    const preloadSource = [
-      '../../preload/api/gh-bridge-pull-requests-and-work-items.ts',
-      '../../preload/api/gh-bridge-mutations-and-projects.ts'
-    ]
-      .map((relativePath) => readFileSync(new URL(relativePath, import.meta.url), 'utf8'))
-      .join('\n')
-    const exposedChannels = [...preloadSource.matchAll(/ipcRenderer\.invoke\('(gh:[^']+)'/g)].map(
-      (match) => match[1]
-    )
-    const registeredChannels = mocks.electron.ipcMain.handle.mock.calls.map(
-      ([channel]) => channel as string
-    )
-
-    expect(Object.keys(github)).toEqual(['registerGitHubHandlers'])
-    expect(new Set(registeredChannels).size).toBe(registeredChannels.length)
-    expect(registeredChannels).toEqual(EXPECTED_GITHUB_IPC_CHANNELS)
-    expect(registeredChannels.toSorted()).toEqual([...new Set(exposedChannels)].toSorted())
-  })
-})
diff --git a/src/main/ipc/github-star-telemetry.test.ts b/src/main/ipc/github-star-telemetry.test.ts
index 30be879cef82..9dd9a1c1e910 100644
--- a/src/main/ipc/github-star-telemetry.test.ts
+++ b/src/main/ipc/github-star-telemetry.test.ts
@@ -55,31 +55,6 @@ describe('registerGitHubHandlers', () => {
     })
   })
 
-  it('accepts every app star source for success telemetry', async () => {
-    starOrcaMock.mockResolvedValue(true)
-
-    registerGitHubHandlers(store as never, stats as never)
-
-    for (const source of [
-      'star_nag',
-      'agent_value_moment',
-      'onboarding_completed',
-      'settings',
-      'landing'
-    ] as const) {
-      await expect(handlers['gh:starOrca'](null, source)).resolves.toBe(true)
-    }
-
-    expect(trackMock).toHaveBeenCalledTimes(5)
-    expect(trackMock.mock.calls.map(([, props]) => props)).toEqual([
-      { source: 'star_nag', nth_repo_added: undefined },
-      { source: 'agent_value_moment', nth_repo_added: undefined },
-      { source: 'onboarding_completed', nth_repo_added: undefined },
-      { source: 'settings', nth_repo_added: undefined },
-      { source: 'landing', nth_repo_added: undefined }
-    ])
-  })
-
   it('does not emit app_starred_orca when the star action returns false', async () => {
     starOrcaMock.mockResolvedValue(false)
 
diff --git a/src/main/ipc/markdown-documents-ripgrep-real.test.ts b/src/main/ipc/markdown-documents-ripgrep-real.test.ts
new file mode 100644
index 000000000000..373a6502c811
--- /dev/null
+++ b/src/main/ipc/markdown-documents-ripgrep-real.test.ts
@@ -0,0 +1,114 @@
+import { mkdir, mkdtemp, rm, symlink, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { basename, dirname, extname, join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { resetBundledRipgrepPathCacheForTests } from '../ripgrep/bundled-ripgrep-path'
+import { listMarkdownDocuments } from './markdown-documents'
+
+describe('Markdown listing with bundled ripgrep', () => {
+  let root: string
+
+  beforeEach(async () => {
+    root = await mkdtemp(join(tmpdir(), 'orca Markdown 日本語 '))
+    resetBundledRipgrepPathCacheForTests()
+  })
+
+  afterEach(async () => {
+    vi.unstubAllEnvs()
+    resetBundledRipgrepPathCacheForTests()
+    await rm(root, { recursive: true, force: true })
+  })
+
+  async function put(relativePath: string, content = 'document'): Promise<void> {
+    const filePath = join(root, relativePath)
+    await mkdir(dirname(filePath), { recursive: true })
+    await writeFile(filePath, content)
+  }
+
+  it('preserves Markdown visibility independently of ignore files and rg configuration', async () => {
+    const included = [
+      'README.md',
+      'Guide.MDX',
+      'docs/Notes.MARKDOWN',
+      '.hidden.md',
+      'docs/.hidden.mdx',
+      '.github/CONTRIBUTING.md',
+      'docs/.github/nested/guide.md',
+      '.github/normal/.hidden.md',
+      'ignored-git/readme.md',
+      'ignored-rg/readme.md',
+      'ignored-dot/readme.md',
+      'space folder/日本語 document.md',
+      'uppercase/NODE_MODULES/visible.md'
+    ]
+    const excluded = [
+      'plain.txt',
+      '.md',
+      'docs/.MDX',
+      '.git/hidden.md',
+      'node_modules/hidden.md',
+      'docs/node_modules/hidden.md',
+      '.hidden/hidden.md',
+      '.hidden/.github/hidden.md',
+      '.github/.hidden/hidden.md',
+      '.github/node_modules/hidden.md',
+      '.github/.md/hidden.md',
+      '.github.txt/hidden.md',
+      'docs/.md/hidden.md'
+    ]
+    for (const filePath of [...included, ...excluded]) {
+      await put(filePath)
+    }
+    await put('.gitignore', 'ignored-git/\n')
+    await put('.rgignore', 'ignored-rg/\n')
+    await put('.ignore', 'ignored-dot/\n')
+    await put('rg-config', '--glob=!*.md\n')
+    vi.stubEnv('RIPGREP_CONFIG_PATH', join(root, 'rg-config'))
+
+    expect(await listMarkdownDocuments(root)).toEqual(
+      included
+        .sort((left, right) => left.localeCompare(right))
+        .map((relativePath) => ({
+          filePath: join(root, relativePath),
+          relativePath,
+          basename: basename(relativePath),
+          name: basename(relativePath, extname(relativePath))
+        }))
+    )
+  })
+
+  it('does not follow directory links or file links', async () => {
+    await put('docs/original.md')
+    await symlink(
+      join(root, 'docs'),
+      join(root, 'linked-docs'),
+      process.platform === 'win32' ? 'junction' : 'dir'
+    )
+    // File symlinks require privileges that Windows test runners may not have.
+    if (process.platform !== 'win32') {
+      await symlink(join(root, 'docs/original.md'), join(root, 'linked.md'))
+      await symlink(join(root, 'missing.md'), join(root, 'broken.md'))
+    }
+    expect((await listMarkdownDocuments(root)).map((document) => document.relativePath)).toEqual([
+      'docs/original.md'
+    ])
+  })
+
+  it.skipIf(process.platform === 'win32')('preserves line breaks in filenames', async () => {
+    const names = ['line\nbreak.md', 'carriage\rreturn.MDX', 'nested\nfolder/文書.md']
+    for (const name of names) {
+      await put(name)
+    }
+    expect((await listMarkdownDocuments(root)).map((document) => document.relativePath)).toEqual(
+      names.sort((left, right) => left.localeCompare(right))
+    )
+  })
+
+  it('returns an empty list for an empty ordinary folder', async () => {
+    await expect(listMarkdownDocuments(root)).resolves.toEqual([])
+  })
+
+  it('rejects a missing root rather than treating it as an empty folder', async () => {
+    await expect(listMarkdownDocuments(join(root, 'missing'))).rejects.toThrow()
+  })
+})
diff --git a/src/main/ipc/markdown-documents-ripgrep.test.ts b/src/main/ipc/markdown-documents-ripgrep.test.ts
new file mode 100644
index 000000000000..daee482bae12
--- /dev/null
+++ b/src/main/ipc/markdown-documents-ripgrep.test.ts
@@ -0,0 +1,146 @@
+import { EventEmitter } from 'node:events'
+import { PassThrough } from 'node:stream'
+import { resolve } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { spawnMock } = vi.hoisted(() => ({ spawnMock: vi.fn() }))
+vi.mock('../ripgrep/bundled-ripgrep-spawn', () => ({ spawnBundledRipgrep: spawnMock }))
+
+import { listMarkdownDocuments } from './markdown-documents'
+
+class ListingProcess extends EventEmitter {
+  stdout = new PassThrough()
+  stderr = new PassThrough()
+  pid: number | undefined = 123
+  kill = vi.fn(() => true)
+}
+
+const root = resolve('/workspace/docs')
+const originalPlatform = process.platform
+let child: ListingProcess
+
+beforeEach(() => {
+  child = new ListingProcess()
+  spawnMock.mockReset().mockReturnValue(child)
+})
+afterEach(() => {
+  vi.useRealTimers()
+  vi.restoreAllMocks()
+  Object.defineProperty(process, 'platform', { configurable: true, value: originalPlatform })
+})
+
+describe('Markdown document ripgrep lifecycle', () => {
+  it('decodes split Unicode and NUL records without splitting newline filenames', async () => {
+    const result = listMarkdownDocuments(root)
+    const bytes = Buffer.from('./日本語\nnotes.MDX\0./.md\0./script.ts\0./README.md\0')
+    for (const byte of bytes) {
+      child.stdout.write(Buffer.from([byte]))
+    }
+    child.emit('close', 0, null)
+
+    expect((await result).map((doc) => doc.basename).sort()).toEqual([
+      'README.md',
+      '日本語\nnotes.MDX'
+    ])
+    expect(child.kill).not.toHaveBeenCalled()
+    expect(child.stdout.listenerCount('data')).toBe(0)
+    expect(child.listenerCount('close')).toBe(0)
+  })
+
+  it('accepts an empty listing', async () => {
+    const result = listMarkdownDocuments(root)
+    child.emit('close', 1, null)
+    await expect(result).resolves.toEqual([])
+  })
+
+  it('rejects an unreadable subtree even after receiving valid documents', async () => {
+    const result = listMarkdownDocuments(root)
+    child.stdout.write('./README.md\0')
+    child.stderr.write('Permission denied')
+    child.emit('close', 2, null)
+    await expect(result).rejects.toThrow('Permission denied')
+  })
+
+  it('rejects a truncated final path instead of returning partial documents', async () => {
+    const result = listMarkdownDocuments(root)
+    child.stdout.write('./README.md\0./unfinished.md')
+    child.emit('close', 0, null)
+    await expect(result).rejects.toThrow('Incomplete path')
+  })
+
+  it.each(['../escape.md', '/outside.md', './dir/../escape.md'])(
+    'rejects a path outside the relative listing protocol: %s',
+    async (path) => {
+      const result = listMarkdownDocuments(root)
+      child.stdout.write(`${path}\0`)
+      await expect(result).rejects.toThrow('Invalid path')
+      expect(child.kill).toHaveBeenCalledWith('SIGKILL')
+    }
+  )
+
+  it('rejects an oversized unfinished record without retaining the process', async () => {
+    const result = listMarkdownDocuments(root)
+    child.stdout.write(`./${'a'.repeat(1024 * 1024)}`)
+    await expect(result).rejects.toThrow('path exceeds')
+    expect(child.kill).toHaveBeenCalledWith('SIGKILL')
+  })
+
+  it('rejects a spawn failure and does not signal a missing process', async () => {
+    const result = listMarkdownDocuments(root)
+    child.pid = undefined
+    child.emit('error', Object.assign(new Error('missing bundled binary'), { code: 'ENOENT' }))
+    await expect(result).rejects.toThrow('missing bundled binary')
+    expect(child.kill).not.toHaveBeenCalled()
+  })
+
+  it('rejects synchronous spawn failures', async () => {
+    spawnMock.mockImplementation(() => {
+      throw new Error('spawn refused')
+    })
+    await expect(listMarkdownDocuments(root)).rejects.toThrow('spawn refused')
+  })
+
+  it('times out, kills the child and releases listeners even if close never arrives', async () => {
+    vi.useFakeTimers()
+    const result = listMarkdownDocuments(root)
+    const rejected = expect(result).rejects.toThrow('timed out')
+    child.stdout.write('./README.md\0')
+    await vi.advanceTimersByTimeAsync(15_000)
+    await rejected
+    expect(child.kill).toHaveBeenCalledWith('SIGKILL')
+    expect(child.stdout.listenerCount('data')).toBe(0)
+    expect(child.stderr.listenerCount('data')).toBe(0)
+    expect(child.listenerCount('close')).toBe(0)
+    expect(vi.getTimerCount()).toBe(0)
+    expect(() => child.emit('error', new Error('late error'))).not.toThrow()
+    expect(() => child.stdout.emit('error', new Error('late pipe error'))).not.toThrow()
+  })
+
+  it('rejects stdout failure instead of returning an incomplete set', async () => {
+    const result = listMarkdownDocuments(root)
+    child.stdout.emit('error', new Error('broken pipe'))
+    await expect(result).rejects.toThrow('broken pipe')
+  })
+
+  it('does not confuse an unreachable WSL cwd with no matching documents', async () => {
+    const result = listMarkdownDocuments(root, { wslDistro: 'Ubuntu' })
+    child.emit('close', 97, null)
+    await expect(result).rejects.toThrow('Search root is not reachable')
+  })
+
+  it.each([
+    { path: root, options: { wslDistro: 'Ubuntu' }, distro: 'Ubuntu' },
+    { path: '\\\\wsl.localhost\\Debian\\home\\repo', options: {}, distro: 'Debian' }
+  ])('selects the Linux binary for $distro', async ({ path, options, distro }) => {
+    Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' })
+    const result = listMarkdownDocuments(path, options)
+    expect(spawnMock).toHaveBeenCalledWith(expect.any(Array), {
+      cwd: path,
+      wslDistro: options.wslDistro,
+      wslDistroForOutput: distro,
+      stdio: ['ignore', 'pipe', 'pipe']
+    })
+    child.emit('close', 1, null)
+    await result
+  })
+})
diff --git a/src/main/ipc/markdown-documents.ts b/src/main/ipc/markdown-documents.ts
index 38466da60875..3977999b9aff 100644
--- a/src/main/ipc/markdown-documents.ts
+++ b/src/main/ipc/markdown-documents.ts
@@ -1,6 +1,11 @@
-import { readdir } from 'node:fs/promises'
 import { basename as pathBasename, extname, isAbsolute, join, relative, resolve } from 'node:path'
 import type { MarkdownDocument } from '../../shared/filesystem-entry-types'
+import { spawnBundledRipgrep } from '../ripgrep/bundled-ripgrep-spawn'
+import { parseWslPath } from '../wsl'
+import {
+  isRipgrepMissingCwdExit,
+  ripgrepMissingCwdError
+} from '../../shared/ripgrep-process-availability'
 
 function normalizeRelativePath(path: string): string {
   return path.replace(/[\\/]+/g, '/').replace(/^\/+/, '')
@@ -88,34 +93,132 @@ export function markdownDocumentsFromRelativePaths(
     .sort((a, b) => a.relativePath.localeCompare(b.relativePath))
 }
 
-export async function listMarkdownDocuments(rootPath: string): Promise<MarkdownDocument[]> {
-  const documents: MarkdownDocument[] = []
+const MARKDOWN_LISTING_TIMEOUT_MS = 15_000
+const MAX_MARKDOWN_PATH_BYTES = 1024 * 1024
 
-  async function visitDirectory(dirPath: string): Promise<void> {
-    const entries = await readdir(dirPath, { withFileTypes: true })
-    for (const entry of entries) {
-      if (entry.isSymbolicLink()) {
-        continue
-      }
+export async function listMarkdownDocuments(
+  rootPath: string,
+  options: { wslDistro?: string } = {}
+): Promise<MarkdownDocument[]> {
+  const child = spawnBundledRipgrep(
+    [
+      '--files',
+      '--hidden',
+      '--no-ignore',
+      '--no-config',
+      '--null',
+      '--path-separator',
+      '/',
+      // Directory-only globs preserve hidden Markdown files without traversing hidden folders.
+      '--glob',
+      '**',
+      '--glob',
+      '!**/.*/',
+      '--glob',
+      '**/.github/',
+      '--glob',
+      '!**/node_modules/',
+      '.'
+    ],
+    {
+      cwd: rootPath,
+      wslDistro: options.wslDistro,
+      wslDistroForOutput: parseWslPath(rootPath)?.distro ?? options.wslDistro,
+      stdio: ['ignore', 'pipe', 'pipe']
+    }
+  )
 
-      const entryPath = join(dirPath, entry.name)
-      if (entry.isDirectory()) {
-        if (entry.name === '.git' || entry.name === 'node_modules') {
-          continue
+  return new Promise((resolveListing, reject) => {
+    const documents: MarkdownDocument[] = []
+    let carry = ''
+    let stderr = ''
+    let settled = false
+    const finish = (error?: Error): void => {
+      if (settled) {
+        return
+      }
+      settled = true
+      clearTimeout(timer)
+      child.stdout?.off('data', onData)
+      child.stderr?.off('data', onStderr)
+      child.stdout?.off('error', onError)
+      child.stderr?.off('error', onError)
+      child.off('close', onClose)
+      child.off('error', onError)
+      // A spawn or pipe error can arrive after a timeout has already settled the listing.
+      child.on('error', ignoreLateError)
+      child.stdout?.on('error', ignoreLateError)
+      child.stderr?.on('error', ignoreLateError)
+      carry = ''
+      if (error) {
+        if (child.pid !== undefined) {
+          try {
+            child.kill('SIGKILL')
+          } catch {
+            // The process may have exited before the timeout or stream error arrived.
+          }
+        }
+        documents.length = 0
+        child.stdout?.resume()
+        child.stderr?.resume()
+        reject(error)
+      } else {
+        resolveListing(documents.sort((a, b) => a.relativePath.localeCompare(b.relativePath)))
+      }
+    }
+    const onError = (error: Error): void => finish(error)
+    const onStderr = (chunk: string): void => {
+      stderr = (stderr + chunk).slice(0, 4096)
+    }
+    const onData = (chunk: string): void => {
+      carry += chunk
+      let start = 0
+      let end: number
+      while ((end = carry.indexOf('\0', start)) !== -1) {
+        const path = carry.slice(start, end)
+        if (Buffer.byteLength(path) > MAX_MARKDOWN_PATH_BYTES) {
+          finish(new Error('Markdown document path exceeds the listing limit'))
+          return
         }
-        if (entry.name.startsWith('.') && entry.name !== '.github') {
-          continue
+        if (!path.startsWith('./') || path.split('/').includes('..')) {
+          finish(new Error('Invalid path in Markdown document listing'))
+          return
         }
-        await visitDirectory(entryPath)
-        continue
+        if (isMarkdownDocumentName(path)) {
+          documents.push(markdownDocumentFromFilePath(rootPath, join(rootPath, path.slice(2))))
+        }
+        start = end + 1
       }
-
-      if (entry.isFile() && isMarkdownDocumentName(entry.name)) {
-        documents.push(markdownDocumentFromFilePath(rootPath, entryPath))
+      carry = carry.slice(start)
+      if (Buffer.byteLength(carry) > MAX_MARKDOWN_PATH_BYTES) {
+        finish(new Error('Markdown document path exceeds the listing limit'))
       }
     }
-  }
-
-  await visitDirectory(rootPath)
-  return documents.sort((a, b) => a.relativePath.localeCompare(b.relativePath))
+    const onClose = (code: number | null, signal: NodeJS.Signals | null): void => {
+      if (isRipgrepMissingCwdExit(code)) {
+        finish(ripgrepMissingCwdError(rootPath))
+      } else if (signal || (code !== 0 && code !== 1)) {
+        finish(new Error(`Markdown document listing failed (${signal ?? code}): ${stderr.trim()}`))
+      } else if (carry) {
+        finish(new Error('Incomplete path in Markdown document listing'))
+      } else {
+        finish()
+      }
+    }
+    const timer = setTimeout(
+      () => finish(new Error('Markdown document listing timed out')),
+      MARKDOWN_LISTING_TIMEOUT_MS
+    )
+    timer.unref?.()
+    child.stdout?.setEncoding('utf8')
+    child.stderr?.setEncoding('utf8')
+    child.stdout?.on('data', onData)
+    child.stderr?.on('data', onStderr)
+    child.stdout?.on('error', onError)
+    child.stderr?.on('error', onError)
+    child.once('error', onError)
+    child.once('close', onClose)
+  })
 }
+
+function ignoreLateError(): void {}
diff --git a/src/main/ipc/native-chat-renderer-lifetime.test.ts b/src/main/ipc/native-chat-renderer-lifetime.test.ts
new file mode 100644
index 000000000000..c35be09cf4ef
--- /dev/null
+++ b/src/main/ipc/native-chat-renderer-lifetime.test.ts
@@ -0,0 +1,184 @@
+import { EventEmitter } from 'node:events'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type {
+  NativeChatTranscriptSubscription,
+  SubscribeNativeChatTranscriptArgs
+} from '../native-chat/transcript-watch-contract'
+
+const mocks = vi.hoisted(() => ({
+  listeners: new Map<string, (event: unknown, args: unknown) => void>(),
+  subscribe:
+    vi.fn<
+      (
+        args: SubscribeNativeChatTranscriptArgs,
+        signal?: AbortSignal
+      ) => Promise<NativeChatTranscriptSubscription>
+    >()
+}))
+
+vi.mock('electron', () => ({
+  ipcMain: {
+    handle: vi.fn(),
+    on: (channel: string, listener: (event: unknown, args: unknown) => void) => {
+      mocks.listeners.set(channel, listener)
+    }
+  }
+}))
+vi.mock('../native-chat/transcript-watch', () => ({
+  subscribeNativeChatTranscript: mocks.subscribe
+}))
+vi.mock('../native-chat/transcript-read-cache', () => ({ clearNativeChatTranscriptCache: vi.fn() }))
+
+import {
+  _getNativeChatPendingSubscriptionCountForTest,
+  _getNativeChatSenderCleanupCountForTest,
+  clearNativeChatSubscriptions,
+  registerNativeChatHandlers
+} from './native-chat'
+
+class Sender extends EventEmitter {
+  send = vi.fn()
+  isDestroyed = (): boolean => false
+  constructor(readonly id: number) {
+    super()
+  }
+}
+
+const live = new Set<SubscribeNativeChatTranscriptArgs>()
+const goneEvents = ['did-navigate', 'render-process-gone', 'destroyed'] as const
+
+function subscribe(sender: Sender, subscriptionId: string): void {
+  mocks.listeners.get('nativeChat:subscribe')?.(
+    { sender },
+    { subscriptionId, agent: 'claude', sessionId: 'one-agent-session' }
+  )
+}
+
+function emitAppend(): void {
+  for (const args of live) {
+    args.onAppend([])
+  }
+}
+
+function pendingSetup() {
+  let resolve: (subscription: NativeChatTranscriptSubscription) => void = () => {}
+  const promise = new Promise<NativeChatTranscriptSubscription>((settle) => {
+    resolve = settle
+  })
+  const unsubscribe = vi.fn()
+  return { promise, resolve: () => resolve({ watching: true, unsubscribe }), unsubscribe }
+}
+
+beforeEach(() => {
+  clearNativeChatSubscriptions()
+  live.clear()
+  mocks.subscribe.mockReset().mockImplementation(async (args) => {
+    live.add(args)
+    return { watching: true, unsubscribe: () => void live.delete(args) }
+  })
+  registerNativeChatHandlers()
+})
+
+afterEach(() => {
+  clearNativeChatSubscriptions()
+})
+
+it.each(goneEvents)('releases every live viewer subscription after %s', async (event) => {
+  const sender = new Sender(1)
+  subscribe(sender, 'pane-a')
+  subscribe(sender, 'pane-b')
+  await Promise.resolve()
+  expect(live.size).toBe(2)
+  emitAppend()
+  expect(sender.send).toHaveBeenCalledTimes(2)
+
+  sender.emit(event)
+  expect(live.size).toBe(0)
+  expect(_getNativeChatSenderCleanupCountForTest()).toBe(0)
+  emitAppend()
+  expect(sender.send).toHaveBeenCalledTimes(2)
+  for (const gone of goneEvents) {
+    expect(sender.listenerCount(gone)).toBe(0)
+  }
+})
+
+it.each(goneEvents)('aborts pending setup and closes a late watcher after %s', async (event) => {
+  const pending = pendingSetup()
+  mocks.subscribe.mockReturnValueOnce(pending.promise)
+  const sender = new Sender(2)
+  subscribe(sender, 'pending')
+  const signal = mocks.subscribe.mock.calls[0]?.[1]
+  expect(signal?.aborted).toBe(false)
+
+  sender.emit(event)
+  expect(signal?.aborted).toBe(true)
+  expect(_getNativeChatPendingSubscriptionCountForTest()).toBe(0)
+  pending.resolve()
+  await Promise.resolve()
+  expect(pending.unsubscribe).toHaveBeenCalledOnce()
+})
+
+it('does not publish callbacks from a replaced document into its replacement', async () => {
+  const pending = pendingSetup()
+  mocks.subscribe.mockReturnValueOnce(pending.promise)
+  const sender = new Sender(3)
+  subscribe(sender, 'same-id')
+  const oldArgs = mocks.subscribe.mock.calls[0]?.[0]
+  if (!oldArgs) {
+    throw new Error('Subscription was not started')
+  }
+  sender.emit('did-navigate')
+  subscribe(sender, 'same-id')
+  await Promise.resolve()
+  oldArgs.onTranscriptPending?.()
+  oldArgs.onInitialSnapshot?.([], false, 0)
+  oldArgs.onReplace?.([], false, 0)
+  oldArgs.onAppend([])
+  expect(sender.send).not.toHaveBeenCalled()
+  pending.resolve()
+  await Promise.resolve()
+  expect(pending.unsubscribe).toHaveBeenCalledOnce()
+  emitAppend()
+  expect(sender.send).toHaveBeenCalledOnce()
+})
+
+it('retains only the current watcher after repeated reloads', async () => {
+  const sender = new Sender(4)
+  for (let cycle = 0; cycle < 15; cycle++) {
+    subscribe(sender, `old-${cycle}`)
+    await Promise.resolve()
+    sender.emit('did-navigate')
+  }
+  subscribe(sender, 'current')
+  await Promise.resolve()
+  expect(live.size).toBe(1)
+  emitAppend()
+  expect(sender.send).toHaveBeenCalledOnce()
+  for (const event of goneEvents) {
+    expect(sender.listenerCount(event)).toBe(1)
+  }
+})
+
+it('preserves another viewer of the same agent session when one renderer reloads', async () => {
+  const first = new Sender(5)
+  const second = new Sender(6)
+  subscribe(first, 'shared-session')
+  subscribe(second, 'shared-session')
+  await Promise.resolve()
+  first.emit('did-navigate')
+  emitAppend()
+  expect(live.size).toBe(1)
+  expect(first.send).not.toHaveBeenCalled()
+  expect(second.send).toHaveBeenCalledOnce()
+})
+
+it('preserves subscriptions through same-document and prevented navigation', async () => {
+  const sender = new Sender(7)
+  subscribe(sender, 'current')
+  await Promise.resolve()
+  sender.emit('did-start-navigation')
+  sender.emit('did-navigate-in-page')
+  emitAppend()
+  expect(live.size).toBe(1)
+  expect(sender.send).toHaveBeenCalledOnce()
+})
diff --git a/src/main/ipc/native-chat-renderer-watcher-cleanup.test.ts b/src/main/ipc/native-chat-renderer-watcher-cleanup.test.ts
new file mode 100644
index 000000000000..a2cd6bb69ac2
--- /dev/null
+++ b/src/main/ipc/native-chat-renderer-watcher-cleanup.test.ts
@@ -0,0 +1,62 @@
+import { EventEmitter } from 'node:events'
+import { mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+
+const listeners = new Map<string, (event: unknown, args: unknown) => void>()
+vi.mock('electron', () => ({
+  ipcMain: {
+    handle: vi.fn(),
+    on: (channel: string, listener: (event: unknown, args: unknown) => void) => {
+      listeners.set(channel, listener)
+    }
+  }
+}))
+
+import { clearNativeChatSubscriptions, registerNativeChatHandlers } from './native-chat'
+import { getActiveNativeChatWatcherCount } from '../native-chat/transcript-watcher-count'
+
+let transcriptDirectory = ''
+let transcriptPath = ''
+
+beforeEach(async () => {
+  clearNativeChatSubscriptions()
+  registerNativeChatHandlers()
+  transcriptDirectory = await mkdtemp(join(tmpdir(), 'orca-native-chat-renderer-lifetime-'))
+  transcriptPath = join(transcriptDirectory, 'session.jsonl')
+  await writeFile(
+    transcriptPath,
+    `${JSON.stringify({
+      type: 'user',
+      uuid: 'message-1',
+      timestamp: '2026-09-25T00:00:00.000Z',
+      message: { role: 'user', content: 'Viewer fixture' }
+    })}\n`
+  )
+})
+
+afterEach(async () => {
+  clearNativeChatSubscriptions()
+  await rm(transcriptDirectory, { recursive: true, force: true })
+})
+
+it.each(['did-navigate', 'render-process-gone', 'destroyed'])(
+  'releases the installed transcript watcher on %s',
+  async (event) => {
+    const sender = Object.assign(new EventEmitter(), {
+      id: 1,
+      isDestroyed: () => false,
+      send: vi.fn()
+    })
+    const before = getActiveNativeChatWatcherCount()
+    listeners.get('nativeChat:subscribe')?.(
+      { sender },
+      { subscriptionId: 'view', agent: 'claude', sessionId: 'session', transcriptPath }
+    )
+    await vi.waitFor(() => expect(sender.send).toHaveBeenCalled())
+    expect(getActiveNativeChatWatcherCount()).toBe(before + 1)
+    sender.emit(event)
+    expect(getActiveNativeChatWatcherCount()).toBe(before)
+  }
+)
diff --git a/src/main/ipc/native-chat-subscribe-lifecycle.test.ts b/src/main/ipc/native-chat-subscribe-lifecycle.test.ts
index 43bab4fefbe4..0162f34afadc 100644
--- a/src/main/ipc/native-chat-subscribe-lifecycle.test.ts
+++ b/src/main/ipc/native-chat-subscribe-lifecycle.test.ts
@@ -1,3 +1,4 @@
+import { EventEmitter } from 'node:events'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { NativeChatTranscriptCompanion } from '../../shared/fork-native-chat-session-options/native-chat-transcript-companion'
 
@@ -48,6 +49,7 @@ type SenderHarness = {
     id: number
     isDestroyed: () => boolean
     once: (event: string, callback: () => void) => void
+    removeListener: (event: string, callback: () => void) => void
     send: ReturnType<typeof vi.fn>
   }
 }
@@ -78,23 +80,18 @@ function deferredSubscription(): DeferredSubscription {
 
 function createSender(id: number): SenderHarness {
   let destroyed = false
-  const destroyedCallbacks: (() => void)[] = []
+  const events = new EventEmitter()
   return {
     destroy: () => {
       destroyed = true
-      for (const callback of destroyedCallbacks) {
-        callback()
-      }
+      events.emit('destroyed')
     },
-    registeredCleanupCount: () => destroyedCallbacks.length,
+    registeredCleanupCount: () => events.listenerCount('destroyed'),
     sender: {
       id,
       isDestroyed: () => destroyed,
-      once: (event, callback) => {
-        if (event === 'destroyed') {
-          destroyedCallbacks.push(callback)
-        }
-      },
+      once: (event, callback) => void events.once(event, callback),
+      removeListener: (event, callback) => void events.removeListener(event, callback),
       send: vi.fn()
     }
   }
diff --git a/src/main/ipc/native-chat.test.ts b/src/main/ipc/native-chat.test.ts
index 680dd3153391..4892990c4aca 100644
--- a/src/main/ipc/native-chat.test.ts
+++ b/src/main/ipc/native-chat.test.ts
@@ -1,3 +1,4 @@
+import { EventEmitter } from 'node:events'
 import { appendFile, mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -188,17 +189,11 @@ describe('nativeChat:readSession handler', () => {
     expect(subscribe).toBeDefined()
 
     const sent: { channel: string; payload: unknown }[] = []
-    let destroyedCb: (() => void) | undefined
-    const sender = {
+    const sender = Object.assign(new EventEmitter(), {
       id: 1,
       isDestroyed: () => false,
-      once: (event: string, cb: () => void) => {
-        if (event === 'destroyed') {
-          destroyedCb = cb
-        }
-      },
       send: (channel: string, payload: unknown) => sent.push({ channel, payload })
-    }
+    })
 
     const previousHome = process.env.HOME
     process.env.HOME = root
@@ -241,8 +236,8 @@ describe('nativeChat:readSession handler', () => {
       expect(appendedIds()).toContain('a-1')
 
       // Destroyed window tears down the watcher without error.
-      expect(destroyedCb).toBeDefined()
-      destroyedCb!()
+      expect(sender.listenerCount('destroyed')).toBe(1)
+      sender.emit('destroyed')
     } finally {
       if (previousHome === undefined) {
         delete process.env.HOME
@@ -264,17 +259,11 @@ describe('nativeChat:readSession handler', () => {
     expect(subscribe).toBeDefined()
 
     const sent: { channel: string; payload: unknown }[] = []
-    let destroyedCb: (() => void) | undefined
-    const sender = {
+    const sender = Object.assign(new EventEmitter(), {
       id: 7,
       isDestroyed: () => false,
-      once: (event: string, cb: () => void) => {
-        if (event === 'destroyed') {
-          destroyedCb = cb
-        }
-      },
       send: (channel: string, payload: unknown) => sent.push({ channel, payload })
-    }
+    })
 
     const previousHome = process.env.HOME
     process.env.HOME = root
@@ -290,7 +279,7 @@ describe('nativeChat:readSession handler', () => {
         }
       })
 
-      destroyedCb!()
+      sender.emit('destroyed')
     } finally {
       if (previousHome === undefined) {
         delete process.env.HOME
@@ -322,17 +311,11 @@ describe('nativeChat:readSession handler', () => {
     expect(subscribe).toBeDefined()
 
     let destroyed = false
-    let destroyedCb: (() => void) | undefined
-    const sender = {
+    const sender = Object.assign(new EventEmitter(), {
       id: 41,
       isDestroyed: () => destroyed,
-      once: (event: string, cb: () => void) => {
-        if (event === 'destroyed') {
-          destroyedCb = cb
-        }
-      },
       send: vi.fn()
-    }
+    })
 
     const previousHome = process.env.HOME
     process.env.HOME = root
@@ -346,9 +329,9 @@ describe('nativeChat:readSession handler', () => {
         }
       )
 
-      expect(destroyedCb).toBeDefined()
+      expect(sender.listenerCount('destroyed')).toBe(1)
       destroyed = true
-      destroyedCb!()
+      sender.emit('destroyed')
 
       await waitFor(() => _getNativeChatSenderCleanupCountForTest() === 0)
       expect(sender.send).not.toHaveBeenCalled()
diff --git a/src/main/ipc/native-chat.ts b/src/main/ipc/native-chat.ts
index bee215780e82..248d3a221779 100644
--- a/src/main/ipc/native-chat.ts
+++ b/src/main/ipc/native-chat.ts
@@ -12,6 +12,7 @@ import {
   type NativeChatTranscriptSubscription,
   type SubscribeNativeChatTranscriptArgs
 } from '../native-chat/transcript-watch'
+import { abortWhenRendererGone } from './renderer-lifetime-abort'
 import {
   readSshNativeChatTranscript,
   subscribeSshNativeChatForSender
@@ -105,14 +106,12 @@ type PendingSubscription = {
   controller: AbortController
 }
 
-// Why: live subscriptions are keyed by (webContents.id, subscriptionId) so the
-// same renderer can watch several panes, and a destroyed window tears down all
-// of its watchers — strict teardown to avoid fd leaks (plan U4 risk).
+// A renderer document owns its viewers; replacement, crash, or destruction releases them.
 const liveSubscriptions = new Map<number, Map<string, LiveSubscription>>()
 // Why: unsubscribe and renderer destruction must invalidate async watcher setup
 // before it can publish a late subscription into the live map.
 const pendingSubscriptions = new Map<number, Map<string, PendingSubscription>>()
-const senderCleanupRegistered = new Set<number>()
+const senderLifetimes = new Map<number, ReturnType<typeof abortWhenRendererGone>>()
 
 function teardownSubscription(senderId: number, subscriptionId: string): void {
   const pendingBySubId = pendingSubscriptions.get(senderId)
@@ -134,8 +133,9 @@ function teardownSubscription(senderId: number, subscriptionId: string): void {
 }
 
 function teardownAllForSender(senderId: number): void {
-  // The destroyed event can arrive before async subscription setup stores a watcher.
-  senderCleanupRegistered.delete(senderId)
+  const lifetime = senderLifetimes.get(senderId)
+  senderLifetimes.delete(senderId)
+  lifetime?.dispose()
   for (const pending of pendingSubscriptions.get(senderId)?.values() ?? []) {
     pending.controller.abort()
   }
@@ -150,13 +150,22 @@ function teardownAllForSender(senderId: number): void {
   liveSubscriptions.delete(senderId)
 }
 
-function registerSenderCleanup(sender: WebContents): void {
-  if (senderCleanupRegistered.has(sender.id)) {
-    return
+function registerSenderCleanup(sender: WebContents): AbortSignal {
+  const existing = senderLifetimes.get(sender.id)
+  if (existing) {
+    return existing.signal
   }
-  senderCleanupRegistered.add(sender.id)
-  // Strict teardown: a closed/reloaded window releases every watcher it owns.
-  sender.once('destroyed', () => teardownAllForSender(sender.id))
+  const lifetime = abortWhenRendererGone(sender)
+  const onRendererGone = (): void => teardownAllForSender(sender.id)
+  senderLifetimes.set(sender.id, {
+    signal: lifetime.signal,
+    dispose: () => {
+      lifetime.signal.removeEventListener('abort', onRendererGone)
+      lifetime.dispose()
+    }
+  })
+  lifetime.signal.addEventListener('abort', onRendererGone, { once: true })
+  return lifetime.signal
 }
 
 function beginPendingSubscription(senderId: number, subscriptionId: string): PendingSubscription {
@@ -193,7 +202,9 @@ async function handleSubscribe(event: IpcMainEvent, args: NativeChatSubscribeArg
   const limit = args.limit && args.limit > 0 ? Math.floor(args.limit) : DESKTOP_READ_WINDOW
   // Replace any prior subscription under the same id (session change/resubscribe).
   const pending = beginPendingSubscription(sender.id, subscriptionId)
-  registerSenderCleanup(sender)
+  const rendererSignal = registerSenderCleanup(sender)
+  const canPublish = (): boolean =>
+    !sender.isDestroyed() && !rendererSignal.aborted && !pending.controller.signal.aborted
   if (args.sshConnectionId) {
     const subscription = subscribeSshNativeChatForSender({
       sender,
@@ -221,7 +232,7 @@ async function handleSubscribe(event: IpcMainEvent, args: NativeChatSubscribeArg
     transcriptPath,
     initialLimit: limit,
     onTranscriptPending: () => {
-      if (sender.isDestroyed()) {
+      if (!canPublish()) {
         return
       }
       // `pending` marks a window with no transcript behind it yet; clients that
@@ -233,7 +244,7 @@ async function handleSubscribe(event: IpcMainEvent, args: NativeChatSubscribeArg
       sender.send('nativeChat:appended', payload)
     },
     onInitialSnapshot: (messages, hasMore, beforeOffset, error, companion) => {
-      if (sender.isDestroyed()) {
+      if (!canPublish()) {
         return
       }
       // Forward an initial-drain error so a watching client's first frame carries it
@@ -252,7 +263,7 @@ async function handleSubscribe(event: IpcMainEvent, args: NativeChatSubscribeArg
       sender.send('nativeChat:appended', payload)
     },
     onReplace: (messages, hasMore, beforeOffset, companion) => {
-      if (sender.isDestroyed()) {
+      if (!canPublish()) {
         return
       }
       sender.send('nativeChat:appended', {
@@ -267,7 +278,7 @@ async function handleSubscribe(event: IpcMainEvent, args: NativeChatSubscribeArg
       } satisfies NativeChatAppendedPayload)
     },
     onAppend: (messages, companion) => {
-      if (sender.isDestroyed()) {
+      if (!canPublish()) {
         return
       }
       const payload: NativeChatAppendedPayload = {
@@ -292,7 +303,7 @@ async function handleSubscribe(event: IpcMainEvent, args: NativeChatSubscribeArg
   // Why: unmount, destruction, or a newer same-id subscribe can invalidate setup
   // while path resolution is pending; only the owning generation may publish its watcher.
   const stillCurrent = takePendingSubscription(sender.id, subscriptionId, pending)
-  if (sender.isDestroyed() || !stillCurrent) {
+  if (!canPublish() || !stillCurrent) {
     subscription.unsubscribe()
     return
   }
@@ -304,7 +315,7 @@ async function handleSubscribe(event: IpcMainEvent, args: NativeChatSubscribeArg
   }
   bySubId.set(subscriptionId, { subscription })
   liveSubscriptions.set(sender.id, bySubId)
-  if (!subscription.watching && !sender.isDestroyed()) {
+  if (!subscription.watching && canPublish()) {
     const payload: NativeChatAppendedPayload = {
       subscriptionId,
       frame: {
@@ -320,16 +331,19 @@ async function handleSubscribe(event: IpcMainEvent, args: NativeChatSubscribeArg
 
 /** Test-only: drop all live and pending transcript subscriptions between runs. */
 export function clearNativeChatSubscriptions(): void {
-  const senderIds = new Set([...liveSubscriptions.keys(), ...pendingSubscriptions.keys()])
+  const senderIds = new Set([
+    ...senderLifetimes.keys(),
+    ...liveSubscriptions.keys(),
+    ...pendingSubscriptions.keys()
+  ])
   for (const senderId of senderIds) {
     teardownAllForSender(senderId)
   }
   pendingSubscriptions.clear()
-  senderCleanupRegistered.clear()
 }
 
 export function _getNativeChatSenderCleanupCountForTest(): number {
-  return senderCleanupRegistered.size
+  return senderLifetimes.size
 }
 
 export function _getNativeChatPendingSubscriptionCountForTest(): number {
diff --git a/src/main/ipc/notification-options.ts b/src/main/ipc/notification-options.ts
index a19f6044a465..24d43545e138 100644
--- a/src/main/ipc/notification-options.ts
+++ b/src/main/ipc/notification-options.ts
@@ -76,7 +76,10 @@ function formatAgentNotificationStatusText(args: NotificationDispatchRequest): s
   if (args.agentState === 'working') {
     return translateMain('notifications.agentStatus.working', 'working')
   }
-  return args.agentState === 'done' && args.agentInterrupted
+  if (args.agentState === 'done' && args.agentTurnOutcome === 'failure') {
+    return translateMain('notifications.agentStatus.failed', 'failed')
+  }
+  return args.agentState === 'done' && args.agentTurnOutcome === 'cancellation'
     ? translateMain('notifications.agentStatus.stopped', 'stopped')
     : translateMain('notifications.agentStatus.finished', 'finished')
 }
@@ -104,7 +107,7 @@ function hasAgentNotificationSnapshot(args: NotificationDispatchRequest): boolea
     args.agentToolName ||
     args.agentToolInput ||
     args.agentLastAssistantMessage ||
-    args.agentInterrupted
+    args.agentTurnOutcome !== undefined
   )
 }
 
diff --git a/src/main/ipc/notifications-message-formatting.test.ts b/src/main/ipc/notifications-message-formatting.test.ts
index abf41bfae3cb..3d519293f3c8 100644
--- a/src/main/ipc/notifications-message-formatting.test.ts
+++ b/src/main/ipc/notifications-message-formatting.test.ts
@@ -217,7 +217,7 @@ describe('registerNotificationHandlers', () => {
           worktreeLabel: 'feat/notis',
           agentType: 'claude',
           agentState: 'done',
-          agentInterrupted: true,
+          agentTurnOutcome: 'cancellation',
           agentLastAssistantMessage: 'Stopped by user.'
         }
       )
@@ -316,7 +316,12 @@ describe('registerNotificationHandlers', () => {
     )
   })
 
-  it('reports an interrupted finish as stopped', async () => {
+  it.each([
+    { agentTurnOutcome: 'cancellation', word: 'stopped' },
+    { agentTurnOutcome: 'failure', word: 'failed' },
+    { agentTurnOutcome: 'success', word: 'finished' },
+    { agentTurnOutcome: undefined, word: 'finished' }
+  ] as const)('words a $agentTurnOutcome finish as $word', async ({ agentTurnOutcome, word }) => {
     registerNotificationHandlers({
       getSettings: () => ({
         notifications: {
@@ -336,14 +341,40 @@ describe('registerNotificationHandlers', () => {
         worktreeLabel: 'feat/notis',
         agentType: 'claude',
         agentState: 'done',
-        agentInterrupted: true
+        ...(agentTurnOutcome ? { agentTurnOutcome } : {})
       }
     )
 
     expect(notificationCtorMock).toHaveBeenCalledWith(
       expectedNativeNotificationOptions({
-        title: 'feat/notis - Claude stopped',
-        body: 'Claude stopped.'
+        title: `feat/notis - Claude ${word}`,
+        body: `Claude ${word}.`
+      })
+    )
+  })
+
+  it('counts a success verdict alone as an agent snapshot', async () => {
+    registerNotificationHandlers({
+      getSettings: () => ({
+        notifications: {
+          enabled: true,
+          agentTaskComplete: true,
+          terminalBell: false,
+          suppressWhenFocused: true
+        }
+      })
+    } as never)
+
+    const handler = getDispatchHandler()
+    await handler(
+      {},
+      { source: 'agent-task-complete', worktreeLabel: 'feat/notis', agentTurnOutcome: 'success' }
+    )
+
+    expect(notificationCtorMock).toHaveBeenCalledWith(
+      expectedNativeNotificationOptions({
+        title: 'feat/notis - Agent finished',
+        body: 'Agent finished.'
       })
     )
   })
diff --git a/src/main/ipc/pty-controller-process-inventory.test.ts b/src/main/ipc/pty-controller-process-inventory.test.ts
index e89d888978a5..004735c61cbc 100644
--- a/src/main/ipc/pty-controller-process-inventory.test.ts
+++ b/src/main/ipc/pty-controller-process-inventory.test.ts
@@ -47,7 +47,16 @@ vi.mock('node-pty', () => ({
 }))
 
 vi.mock('../opencode/hook-service', () => ({
-  openCodeHookService: { buildPtyEnv: () => ({}), clearPty: vi.fn() }
+  openCodeHookService: {
+    buildPtyEnv: () => ({}),
+    refreshLegacySharedPlugin: vi.fn(),
+    clearPty: vi.fn()
+  },
+  openCode2HookService: {
+    buildPtyEnv: () => ({}),
+    refreshLegacySharedPlugin: vi.fn(),
+    clearPty: vi.fn()
+  }
 }))
 
 vi.mock('../pi/titlebar-extension-service', () => ({
diff --git a/src/main/ipc/pty-daemon-spawn-agent-home-env.test.ts b/src/main/ipc/pty-daemon-spawn-agent-home-env.test.ts
index f73f11e7f932..092886b3fe75 100644
--- a/src/main/ipc/pty-daemon-spawn-agent-home-env.test.ts
+++ b/src/main/ipc/pty-daemon-spawn-agent-home-env.test.ts
@@ -413,6 +413,17 @@ describe('registerPtyHandlers', () => {
           ])
         )
       })
+      it('strips an inherited agent session id', async () => {
+        // Why: a daemon forked by an Orca launched inside a structured session inherits its id,
+        // and every daemon pane would present that session as its orchestration caller.
+        const inherited = await daemonSpawnAndGetOptions(undefined, undefined, undefined, {
+          ORCA_AGENT_SESSION_ID: 'a0b1c2d3-0000-4000-8000-00000000abcd',
+          ORCA_STRUCTURED_SESSION: '1'
+        })
+        expect(inherited.envToDelete).toEqual(
+          expect.arrayContaining(['ORCA_AGENT_SESSION_ID', 'ORCA_STRUCTURED_SESSION'])
+        )
+      })
       it('preserves an explicitly requested Claude child-session stamp', async () => {
         // Why: only inherited values are poison; a caller deliberately spawning a
         // nested Claude child passes the stamp in args.env and must keep it.
diff --git a/src/main/ipc/pty-daemon-ssh-lease-lifecycle.test.ts b/src/main/ipc/pty-daemon-ssh-lease-lifecycle.test.ts
index 128f163c5b34..5ae2adb49d72 100644
--- a/src/main/ipc/pty-daemon-ssh-lease-lifecycle.test.ts
+++ b/src/main/ipc/pty-daemon-ssh-lease-lifecycle.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it, vi } from 'vitest'
 import { openCodeClearPtyMock, piClearPtyMock } from './pty-ipc-mock-registry'
 import { setupPtyIpcSuite } from './pty-ipc-test-harness'
+import { TerminalIntentionalStops } from '../runtime/terminal-intentional-stops'
 import {
   SSH_PTY_IDENTITY_MISMATCH_ERROR,
   SSH_SESSION_EXPIRED_ERROR
@@ -359,7 +360,8 @@ describe('registerPtyHandlers', () => {
         const exitListeners = new Set<(payload: { id: string; code: number }) => void>()
         const runtime = {
           setPtyController: vi.fn(),
-          onPtyExit: vi.fn()
+          onPtyExit: vi.fn(),
+          intentionalPtyStops: new TerminalIntentionalStops()
         }
         setLocalPtyProvider({
           spawn: vi.fn(),
@@ -393,15 +395,14 @@ describe('registerPtyHandlers', () => {
         handlers.clear()
         registerPtyHandlers(mainWindow as never, runtime as never)
         const controller = runtime.setPtyController.mock.calls[0]?.[0] as {
-          markReversibleStops: (ptyIds: readonly string[]) => () => void
           stopAndWait: (ptyId: string) => Promise<boolean>
         }
-        const release = controller.markReversibleStops(['local-pty'])
+        const settleStop = runtime.intentionalPtyStops.mark('local-pty', 'reversible', null)
 
         const stopPromise = controller.stopAndWait('local-pty')
         await vi.advanceTimersByTimeAsync(1_200)
         await expect(stopPromise).resolves.toBe(true)
-        release()
+        settleStop(true)
 
         expect(
           mainWindow.webContents.send.mock.calls.filter((call) => call[0] === 'pty:exit')
diff --git a/src/main/ipc/pty-ipc-mock-registry.ts b/src/main/ipc/pty-ipc-mock-registry.ts
index 71b77621b755..f49978843d56 100644
--- a/src/main/ipc/pty-ipc-mock-registry.ts
+++ b/src/main/ipc/pty-ipc-mock-registry.ts
@@ -108,12 +108,14 @@ export const childProcessModuleMock = (original: Record<string, unknown>) => ({
 export const openCodeHookServiceModuleMock = () => ({
   openCodeHookService: {
     buildPtyEnv: openCodeBuildPtyEnvMock,
+    refreshLegacySharedPlugin: vi.fn<() => void>(),
     clearPty: openCodeClearPtyMock
   },
   // Separate mock per variant: assembly.ts picks the service by variant, and a shared
   // mock would hide a regression that hands an OpenCode 2 pane the v1 plugin.
   openCode2HookService: {
     buildPtyEnv: openCode2BuildPtyEnvMock,
+    refreshLegacySharedPlugin: vi.fn<() => void>(),
     clearPty: openCodeClearPtyMock
   }
 })
diff --git a/src/main/ipc/pty-pane-restart-replace.test.ts b/src/main/ipc/pty-pane-restart-replace.test.ts
index a1ced7904f8e..50558a0f8708 100644
--- a/src/main/ipc/pty-pane-restart-replace.test.ts
+++ b/src/main/ipc/pty-pane-restart-replace.test.ts
@@ -3,6 +3,7 @@ import { setupPtyIpcSuite, type PtyIpcSuiteFixtures } from './pty-ipc-test-harne
 import { SessionNotFoundError } from '../daemon/daemon-errors'
 import { makePaneKey } from '../../shared/stable-pane-id'
 import { registerPtyHandlers, setLocalPtyProvider } from './pty'
+import { TerminalIntentionalStops } from '../runtime/terminal-intentional-stops'
 
 vi.mock('electron', () => import('./pty-ipc-mock-registry').then((m) => m.electronModuleMock()))
 vi.mock('fs', () => import('./pty-ipc-mock-registry').then((m) => m.fsModuleMock()))
@@ -161,7 +162,8 @@ function installRestartHarness(
     seedHeadlessTerminal: vi.fn(),
     onPtySpawned: vi.fn(),
     onPtyExit: vi.fn(),
-    onPtyData: vi.fn()
+    onPtyData: vi.fn(),
+    intentionalPtyStops: new TerminalIntentionalStops()
   }
   return { providerSpawn, shutdown, store, runtime, control }
 }
diff --git a/src/main/ipc/pty-reset-input-modes.test.ts b/src/main/ipc/pty-reset-input-modes.test.ts
new file mode 100644
index 000000000000..55fa628078d5
--- /dev/null
+++ b/src/main/ipc/pty-reset-input-modes.test.ts
@@ -0,0 +1,106 @@
+import { describe, expect, it, vi } from 'vitest'
+import { onMock } from './pty-ipc-mock-registry'
+import { setupPtyIpcSuite } from './pty-ipc-test-harness'
+import { registerPtyHandlers } from './pty'
+
+vi.mock('electron', () => import('./pty-ipc-mock-registry').then((m) => m.electronModuleMock()))
+vi.mock('fs', () => import('./pty-ipc-mock-registry').then((m) => m.fsModuleMock()))
+vi.mock('node-pty', () => import('./pty-ipc-mock-registry').then((m) => m.nodePtyModuleMock()))
+vi.mock('node:child_process', async (importOriginal) =>
+  (await import('./pty-ipc-mock-registry')).childProcessModuleMock(await importOriginal())
+)
+vi.mock('../opencode/hook-service', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.openCodeHookServiceModuleMock())
+)
+vi.mock('../mimo/hook-service', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.mimoHookServiceModuleMock())
+)
+vi.mock('../agent-hooks/server', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock())
+)
+vi.mock('../pi/titlebar-extension-service', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock())
+)
+vi.mock('../pwsh', () => import('./pty-ipc-mock-registry').then((m) => m.pwshModuleMock()))
+vi.mock('../wsl', async (importOriginal) =>
+  (await import('./pty-ipc-mock-registry')).wslModuleMock(await importOriginal())
+)
+vi.mock('../telemetry/client', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.telemetryClientModuleMock())
+)
+vi.mock('../telemetry/classify-error', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.classifyErrorModuleMock())
+)
+vi.mock('../cli/linux-terminal-orca-cli-shim', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.linuxCliShimModuleMock())
+)
+vi.mock('../memory/pty-registry', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.ptyRegistryModuleMock())
+)
+vi.mock('../agent-hooks/migration-unsupported-pty-state', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.migrationUnsupportedPtyModuleMock())
+)
+vi.mock('../codex/codex-pane-account-registry', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.codexPaneAccountRegistryModuleMock())
+)
+vi.mock('../codex/codex-state-db-backfill-recovery', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.codexBackfillRecoveryModuleMock())
+)
+
+describe('Reset Terminal main-side entry points', () => {
+  const { handlers, mainWindow, installDaemonTestProvider } = setupPtyIpcSuite()
+
+  function setup() {
+    const resetInputModes = vi.fn(async () => {})
+    installDaemonTestProvider({ resetInputModes })
+    let controller: { resetInputModes: (ptyId: string) => Promise<void> } | undefined
+    const runtime = {
+      setPtyController: vi.fn((next) => {
+        controller = next
+      }),
+      resetHeadlessTerminalInputModes: vi.fn(async () => {})
+    }
+    handlers.clear()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: registration reads only these members.
+    registerPtyHandlers(mainWindow as never, runtime as never)
+    return { resetInputModes, runtime, controller: controller! }
+  }
+
+  it('grounds the provider and the headless model from the pane IPC', () => {
+    const { resetInputModes, runtime } = setup()
+    const listener = onMock.mock.calls.findLast(
+      (entry: unknown[]) => entry[0] === 'pty:resetInputModes'
+    )?.[1]
+    if (typeof listener !== 'function') {
+      throw new Error('missing pty:resetInputModes listener')
+    }
+
+    listener(null, { id: 'pty-1' })
+
+    expect(resetInputModes).toHaveBeenCalledWith('pty-1')
+    expect(runtime.resetHeadlessTerminalInputModes).toHaveBeenCalledWith('pty-1')
+    // The pane grounded itself before sending; echoing back would ground it twice.
+    expect(mainWindow.webContents.send).not.toHaveBeenCalledWith(
+      'pty:resetInputModes:request',
+      expect.anything()
+    )
+  })
+
+  it("grounds the host window's pane and the provider for a runtime-initiated reset", async () => {
+    const { resetInputModes, controller } = setup()
+
+    await controller.resetInputModes('pty-1')
+
+    expect(mainWindow.webContents.send).toHaveBeenCalledWith('pty:resetInputModes:request', {
+      ptyId: 'pty-1'
+    })
+    expect(resetInputModes).toHaveBeenCalledWith('pty-1')
+  })
+
+  it('swallows an older host rejecting the request', async () => {
+    const { resetInputModes, controller } = setup()
+    resetInputModes.mockRejectedValueOnce(new Error('Unknown request type: resetInputModes'))
+
+    await expect(controller.resetInputModes('pty-1')).resolves.toBeUndefined()
+  })
+})
diff --git a/src/main/ipc/pty-spawn-env-terminal-basics.test.ts b/src/main/ipc/pty-spawn-env-terminal-basics.test.ts
index c36fa3e40f5e..bed6953e2b12 100644
--- a/src/main/ipc/pty-spawn-env-terminal-basics.test.ts
+++ b/src/main/ipc/pty-spawn-env-terminal-basics.test.ts
@@ -351,6 +351,16 @@ describe('registerPtyHandlers', () => {
       expect(env.CLAUDE_CODE_SESSION_ID).toBeUndefined()
       expect(env.CLAUDE_CODE_BRIDGE_SESSION_ID).toBeUndefined()
     })
+    it('strips an inherited agent session id so a pane never claims that session', async () => {
+      // Why: an Orca launched inside a structured session inherits its id; every pane would then
+      // present that session as its orchestration caller instead of its own terminal.
+      const env = await spawnAndGetEnv(undefined, {
+        ORCA_AGENT_SESSION_ID: 'a0b1c2d3-0000-4000-8000-00000000abcd',
+        ORCA_STRUCTURED_SESSION: '1'
+      })
+      expect(env.ORCA_AGENT_SESSION_ID).toBeUndefined()
+      expect(env.ORCA_STRUCTURED_SESSION).toBeUndefined()
+    })
     it('keeps an explicitly requested Claude child-session stamp on a local spawn', async () => {
       const env = await spawnAndGetEnv(
         { CLAUDE_CODE_CHILD_SESSION: '1' },
diff --git a/src/main/ipc/pty-ssh-undelivered-kill.test.ts b/src/main/ipc/pty-ssh-undelivered-kill.test.ts
index d59d7d8543a1..2d92ffa18598 100644
--- a/src/main/ipc/pty-ssh-undelivered-kill.test.ts
+++ b/src/main/ipc/pty-ssh-undelivered-kill.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
 import { setupPtyIpcSuite } from './pty-ipc-test-harness'
+import { TerminalIntentionalStops } from '../runtime/terminal-intentional-stops'
 import { SSH_SESSION_EXPIRED_ERROR } from '../providers/ssh-pty-errors'
 import {
   registerPtyHandlers,
@@ -79,7 +80,8 @@ function installController(handlers: Map<string, never>) {
     setPtyController: vi.fn(),
     markPtyStopRequested: vi.fn(),
     markPtyLivenessUnverifiable: vi.fn(),
-    onPtyExit: vi.fn()
+    onPtyExit: vi.fn(),
+    intentionalPtyStops: new TerminalIntentionalStops()
   }
   handlers.clear()
   return { runtime }
@@ -91,7 +93,7 @@ describe('undelivered SSH stops', () => {
   function install(store: ReturnType<typeof createKillStore>): {
     kill: (ptyId: string) => boolean
     stopAndWait: (ptyId: string, opts?: { keepHistory?: boolean }) => Promise<boolean>
-    markReversibleStops: (ptyIds: readonly string[]) => () => void
+    recordUnconfirmedStop: (ptyId: string) => boolean
     runtime: ReturnType<typeof installController>['runtime']
   } {
     const { runtime } = installController(handlers as never)
@@ -103,15 +105,16 @@ describe('undelivered SSH stops', () => {
       undefined,
       store as never
     )
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: registerPtyHandlers installs the runtime PTY controller, which implements these members.
     const controller = runtime.setPtyController.mock.calls[0]?.[0] as {
       kill: (ptyId: string) => boolean
       stopAndWait: (ptyId: string, opts?: { keepHistory?: boolean }) => Promise<boolean>
-      markReversibleStops: (ptyIds: readonly string[]) => () => void
+      recordUnconfirmedStop: (ptyId: string) => boolean
     }
     return {
       kill: controller.kill,
       stopAndWait: controller.stopAndWait,
-      markReversibleStops: controller.markReversibleStops,
+      recordUnconfirmedStop: controller.recordUnconfirmedStop,
       runtime
     }
   }
@@ -298,15 +301,41 @@ describe('undelivered SSH stops', () => {
     )
     setPtyOwnership(SCOPED_PTY_ID, 'ssh-1')
     restorePtyIncarnation(SCOPED_PTY_ID, 'inc-f')
-    const { kill, markReversibleStops } = install(store)
-    const release = markReversibleStops([SCOPED_PTY_ID])
+    const { kill, runtime } = install(store)
+    const settleStop = runtime.intentionalPtyStops.mark(SCOPED_PTY_ID, 'reversible', null)
+
+    try {
+      kill(SCOPED_PTY_ID)
+      await new Promise((resolve) => setTimeout(resolve, 0))
+      expect(store.recordSshRemotePtyKillIntent).not.toHaveBeenCalled()
+    } finally {
+      settleStop(false)
+      unregisterSshPtyProvider('ssh-1')
+      deletePtyOwnership(SCOPED_PTY_ID)
+    }
+  })
+
+  it('records nothing while a reversible stop owns the PTY and a restart stop joins it', async () => {
+    const store = createKillStore()
+    registerSshPtyProvider(
+      'ssh-1',
+      sshProviderStub(async () => {
+        throw new Error('socket closed')
+      })
+    )
+    setPtyOwnership(SCOPED_PTY_ID, 'ssh-1')
+    restorePtyIncarnation(SCOPED_PTY_ID, 'inc-f')
+    const { kill, runtime } = install(store)
+    const settleSleep = runtime.intentionalPtyStops.mark(SCOPED_PTY_ID, 'reversible', null)
+    const settleRestart = runtime.intentionalPtyStops.mark(SCOPED_PTY_ID, 'replaced', null)
 
     try {
       kill(SCOPED_PTY_ID)
       await new Promise((resolve) => setTimeout(resolve, 0))
       expect(store.recordSshRemotePtyKillIntent).not.toHaveBeenCalled()
     } finally {
-      release()
+      settleRestart(false)
+      settleSleep(false)
       unregisterSshPtyProvider('ssh-1')
       deletePtyOwnership(SCOPED_PTY_ID)
     }
@@ -327,8 +356,8 @@ describe('undelivered SSH stops', () => {
     }
   })
 
-  // No incarnation means no fence, and an unfenced order can only be discarded or guessed at.
-  it('records nothing when the PTY incarnation was never learned', async () => {
+  // A legacy id with no incarnation has no fence, and an unfenced order can only be guessed at.
+  it('records nothing for a legacy id whose PTY incarnation was never learned', async () => {
     const store = createKillStore()
     registerSshPtyProvider(
       'ssh-1',
@@ -348,4 +377,82 @@ describe('undelivered SSH stops', () => {
       deletePtyOwnership('ssh:ssh-1@@pty-8')
     }
   })
+
+  // A `pty2:` id is epoch-scoped, so it names one process even when the incarnation was never
+  // learned: an offline close across a relaunch still owes the kill.
+  it('records the stop for an epoch-scoped id whose incarnation was never learned', () => {
+    const store = createKillStore()
+    const ptyId = 'ssh:ssh-1@@pty2:epoch-a:4'
+    setPtyOwnership(ptyId, 'ssh-1')
+    const { kill } = install(store)
+
+    try {
+      expect(kill(ptyId)).toBe(false)
+      expect(store.recordSshRemotePtyKillIntent).toHaveBeenCalledWith('ssh-1', 'pty2:epoch-a:4', {
+        requestedAt: expect.any(Number),
+        attempts: 0
+      })
+    } finally {
+      deletePtyOwnership(ptyId)
+    }
+  })
+
+  // One recorder: the explicit-close receipt promises the retry for an epoch-scoped id too.
+  it("records an explicit close's unconfirmed stop for an epoch-scoped id with no incarnation", () => {
+    const store = createKillStore()
+    const ptyId = 'ssh:ssh-1@@pty2:epoch-b:5'
+    setPtyOwnership(ptyId, 'ssh-1')
+    const { recordUnconfirmedStop } = install(store)
+
+    try {
+      expect(recordUnconfirmedStop(ptyId)).toBe(true)
+      expect(store.recordSshRemotePtyKillIntent).toHaveBeenCalledTimes(1)
+      expect(store.recordSshRemotePtyKillIntent).toHaveBeenCalledWith('ssh-1', 'pty2:epoch-b:5', {
+        requestedAt: expect.any(Number),
+        attempts: 0
+      })
+    } finally {
+      deletePtyOwnership(ptyId)
+    }
+  })
+
+  // An explicit close records its order when the stop goes unconfirmed, before the follow-up kill,
+  // so its receipt can promise the reconnect retry from the record itself.
+  it("records an explicit close's unconfirmed stop and says so", () => {
+    const store = createKillStore()
+    setPtyOwnership(SCOPED_PTY_ID, 'ssh-1')
+    restorePtyIncarnation(SCOPED_PTY_ID, 'inc-g')
+    const { recordUnconfirmedStop } = install(store)
+
+    try {
+      expect(recordUnconfirmedStop(SCOPED_PTY_ID)).toBe(true)
+      expect(store.recordSshRemotePtyKillIntent).toHaveBeenCalledWith(
+        'ssh-1',
+        'pty-7',
+        expect.objectContaining({ incarnationId: 'inc-g', attempts: 0 })
+      )
+    } finally {
+      deletePtyOwnership(SCOPED_PTY_ID)
+    }
+  })
+
+  it('reports no recorded order for a local or reversibly stopped PTY', () => {
+    const store = createKillStore()
+    setPtyOwnership('local-pty', null)
+    restorePtyIncarnation('local-pty', 'inc-h')
+    setPtyOwnership(SCOPED_PTY_ID, 'ssh-1')
+    restorePtyIncarnation(SCOPED_PTY_ID, 'inc-i')
+    const { recordUnconfirmedStop, runtime } = install(store)
+    const settleStop = runtime.intentionalPtyStops.mark(SCOPED_PTY_ID, 'reversible', null)
+
+    try {
+      expect(recordUnconfirmedStop('local-pty')).toBe(false)
+      expect(recordUnconfirmedStop(SCOPED_PTY_ID)).toBe(false)
+      expect(store.recordSshRemotePtyKillIntent).not.toHaveBeenCalled()
+    } finally {
+      settleStop(false)
+      deletePtyOwnership('local-pty')
+      deletePtyOwnership(SCOPED_PTY_ID)
+    }
+  })
 })
diff --git a/src/main/ipc/pty/delivery/exit.ts b/src/main/ipc/pty/delivery/exit.ts
index a7575f7c2e66..ad144b4d5879 100644
--- a/src/main/ipc/pty/delivery/exit.ts
+++ b/src/main/ipc/pty/delivery/exit.ts
@@ -7,57 +7,8 @@ import { allocatePtyLifecycleSequence } from '../host-env/types'
 import { makePtyDataPayload, sendPtyDataToRenderer } from './payload'
 import { getRendererInFlightCharsForPty } from './accounting'
 import { clearFlushTimerIfIdle } from './flush'
-import { ptyIncarnationById } from '../provider/ownership-state'
 import type { PtyIpcSession } from '../session'
 
-export type ReplacedPtyStop = {
-  incarnationId: string | undefined
-  expiryTimer?: NodeJS.Timeout
-}
-
-/** Labels the exit of a PTY that main stops so a new process can take its pane. Settle with
- *  whether the stop succeeded; a failed stop leaves no label behind. */
-export function markReplacedPtyStop(
-  session: PtyIpcSession,
-  id: string
-): (stopped: boolean) => void {
-  clearTimeout(session.replacedPtyStopsById.get(id)?.expiryTimer)
-  const mark: ReplacedPtyStop = { incarnationId: ptyIncarnationById.get(id) }
-  session.replacedPtyStopsById.set(id, mark)
-  return (stopped) => {
-    if (session.replacedPtyStopsById.get(id) !== mark) {
-      return
-    }
-    if (!stopped) {
-      session.replacedPtyStopsById.delete(id)
-      return
-    }
-    // Why a window: an SSH exit can reach the renderer after the stop settles; bound it like a synthetic kill.
-    mark.expiryTimer = setTimeout(() => {
-      if (session.replacedPtyStopsById.get(id) === mark) {
-        session.replacedPtyStopsById.delete(id)
-      }
-    }, SYNTHETIC_KILL_EXIT_DUPLICATE_WINDOW_MS)
-    mark.expiryTimer.unref?.()
-  }
-}
-
-function consumeReplacedPtyStop(
-  session: PtyIpcSession,
-  payload: { id: string; incarnationId?: string }
-): boolean {
-  const mark = session.replacedPtyStopsById.get(payload.id)
-  if (
-    !mark ||
-    (mark.incarnationId && payload.incarnationId && mark.incarnationId !== payload.incarnationId)
-  ) {
-    return false
-  }
-  clearTimeout(mark.expiryTimer)
-  session.replacedPtyStopsById.delete(payload.id)
-  return true
-}
-
 export function rememberSyntheticKillExit(
   session: PtyIpcSession,
   id: string,
@@ -202,12 +153,12 @@ export function finalizePtyExitForRenderer(
       session.schedulePendingDataAfterCreditReport(true)
     }
   }
+  const intentionalStops =
+    session.runtime?.intentionalPtyStops?.claimExit(payload.id, payload.incarnationId) ?? []
   session.mainWindow.webContents.send('pty:exit', {
     ...payload,
-    ...(session.reversibleStopOwnersByPtyId.has(payload.id)
-      ? { preserveRendererBinding: true }
-      : {}),
-    ...(consumeReplacedPtyStop(session, payload) ? { replacedByRestart: true } : {})
+    ...(intentionalStops.includes('reversible') ? { preserveRendererBinding: true } : {}),
+    ...(intentionalStops.includes('replaced') ? { replacedByRestart: true } : {})
   })
 }
 
diff --git a/src/main/ipc/pty/host-env/assembly.ts b/src/main/ipc/pty/host-env/assembly.ts
index b5daa5bed7f0..7d8250629031 100644
--- a/src/main/ipc/pty/host-env/assembly.ts
+++ b/src/main/ipc/pty/host-env/assembly.ts
@@ -1,11 +1,15 @@
 import { resolveSetupAgentSequenceLaunchCommand } from '../../../../shared/setup-agent-sequencing'
-import { isOpenCode2LaunchCommand } from '../../../../shared/opencode-launch-command'
+import { selectOpenCodeHookAgent } from '../../../../shared/opencode-launch-command'
 import {
   detectExplicitPiAgentKindFromCommand,
   isPiCompatibleAgentType
 } from '../../../../shared/pi-agent-kind'
 import { applyTerminalGitCredentialPromptGuard } from '../../terminal-git-credential-guard'
 import { openCode2HookService, openCodeHookService } from '../../../opencode/hook-service'
+import {
+  OPENCODE_CONFIG_DIR_ENV_KEYS,
+  isOpenCodeLegacySharedConfigDir
+} from '../../../opencode/legacy-shared-config-dir'
 import { mimoCodeHookService } from '../../../mimo/hook-service'
 import { agentHookServer } from '../../../agent-hooks/server'
 import { wslHookRelayManager } from '../../../agent-hooks/wsl-hook-relay-manager'
@@ -45,15 +49,31 @@ export function buildPtyHostEnv(
   mergePersistedWindowsPath(baseEnv)
   Object.assign(baseEnv, buildConfiguredProxyEnv(opts.networkProxySettings))
 
-  // Why: local path's baseEnv includes process.env but the daemon path doesn't (fork inheritance, not IPC); check both sources so guards stay in lock-step across spawn paths.
-  const preexistingOpenCodeConfigDir = resolveOpenCodeSourceConfigDir(baseEnv)
+  // Why: pre-1.4.209 panes exported Orca's retired shared hooks dir; inheriting it hides the user's global OpenCode config.
+  const isLegacyOpenCodeHooksDir = (dir: string | undefined): boolean =>
+    isOpenCodeLegacySharedConfigDir(dir, opts.userDataPath)
+  const inheritedOpenCodeEnv: NodeJS.ProcessEnv = {}
+  for (const key of OPENCODE_CONFIG_DIR_ENV_KEYS) {
+    if (isLegacyOpenCodeHooksDir(baseEnv[key])) {
+      delete baseEnv[key]
+    }
+    if (!isLegacyOpenCodeHooksDir(process.env[key])) {
+      inheritedOpenCodeEnv[key] = process.env[key]
+    }
+  }
+  // A daemon or sibling shell can retain a retired path that main no longer sees.
+  openCodeHookService.refreshLegacySharedPlugin()
+  openCode2HookService.refreshLegacySharedPlugin()
+  const resolvedOpenCodeConfigDir = resolveOpenCodeSourceConfigDir(baseEnv, inheritedOpenCodeEnv)
+  const preexistingOpenCodeConfigDir = isLegacyOpenCodeHooksDir(resolvedOpenCodeConfigDir)
+    ? undefined
+    : resolvedOpenCodeConfigDir
   const launchCommandHint = resolveSetupAgentSequenceLaunchCommand(baseEnv, opts.launchCommand)
-  // Typed launches do not carry the picker identity; infer the beta binary so
-  // it receives the OpenCode 2 hook endpoint and isolated plugin overlay.
-  const openCodeAgent =
-    opts.launchAgent === 'opencode2' || isOpenCode2LaunchCommand(launchCommandHint)
-      ? 'opencode2'
-      : 'opencode'
+  const openCodeAgent = selectOpenCodeHookAgent(
+    opts.launchAgent,
+    launchCommandHint,
+    (agent) => opts.agentStatusHooksEnabled && isTuiAgentEnabled(agent, opts.disabledTuiAgents)
+  )
   const explicitPiAgentKind = isPiCompatibleAgentType(opts.launchAgent)
     ? opts.launchAgent
     : opts.launchAgent === undefined
@@ -88,12 +108,26 @@ export function buildPtyHostEnv(
       ? resolvePiAgentSourceDir(baseEnv, 'prime-agent')
       : resolveScopedPiAgentSourceDir(baseEnv, 'prime-agent')
 
-  if (opts.agentStatusHooksEnabled) {
+  restoreOrStripOverlayEnv(
+    baseEnv,
+    {
+      primary: 'OPENCODE_CONFIG_DIR',
+      overlay: 'ORCA_OPENCODE_CONFIG_DIR',
+      source: 'ORCA_OPENCODE_SOURCE_CONFIG_DIR',
+      preserveExplicitPrimary: true
+    },
+    inheritedOpenCodeEnv
+  )
+  delete baseEnv.ORCA_OPENCODE_AGENT
+  if (openCodeAgent) {
     // Why: OPENCODE_CONFIG_DIR is a single path, not a colon-list; mirror the user's value into an overlay so their plugins and Orca's status plugin coexist. See docs/opencode-config-dir-collision.md.
     const openCodeStatusService =
       openCodeAgent === 'opencode2' ? openCode2HookService : openCodeHookService
     baseEnv.ORCA_OPENCODE_AGENT = openCodeAgent
-    Object.assign(baseEnv, openCodeStatusService.buildPtyEnv(id, preexistingOpenCodeConfigDir))
+    // WSL owns its config writes; only the guest overlay may enter a WSL pane.
+    if (!opts.isWsl) {
+      Object.assign(baseEnv, openCodeStatusService.buildPtyEnv(id, preexistingOpenCodeConfigDir))
+    }
     if (baseEnv.OPENCODE_CONFIG_DIR) {
       // Why: ~/.zshrc can re-export the user's default after spawn; shell-ready wrappers restore this PTY-scoped value.
       baseEnv.ORCA_OPENCODE_CONFIG_DIR = baseEnv.OPENCODE_CONFIG_DIR
@@ -104,6 +138,8 @@ export function buildPtyHostEnv(
         delete baseEnv.ORCA_OPENCODE_SOURCE_CONFIG_DIR
       }
     }
+  }
+  if (opts.agentStatusHooksEnabled) {
     if (isMimoLaunchCommand(launchCommandHint)) {
       const preexistingMimocodeHome = resolveMimocodeSourceHome(baseEnv)
       Object.assign(baseEnv, mimoCodeHookService.buildPtyEnv(id, preexistingMimocodeHome))
@@ -117,11 +153,6 @@ export function buildPtyHostEnv(
       }
     }
   } else {
-    restoreOrStripOverlayEnv(baseEnv, {
-      primary: 'OPENCODE_CONFIG_DIR',
-      overlay: 'ORCA_OPENCODE_CONFIG_DIR',
-      source: 'ORCA_OPENCODE_SOURCE_CONFIG_DIR'
-    })
     restoreOrStripOverlayEnv(baseEnv, {
       primary: 'MIMOCODE_HOME',
       overlay: 'ORCA_MIMOCODE_HOME',
@@ -148,13 +179,15 @@ export function buildPtyHostEnv(
         baseEnv.ORCA_AGENT_HOOK_ENDPOINT = guestEndpoint
       }
       // Why: OpenCode loads its status plugin from a guest config overlay, so point OPENCODE_CONFIG_DIR at the guest dir the relay materialized.
-      const opencodeOverlayDir = wslHookRelayManager.getOpenCodeOverlayDir(distro, openCodeAgent)
+      const opencodeOverlayDir = openCodeAgent
+        ? wslHookRelayManager.getOpenCodeOverlayDir(distro, openCodeAgent)
+        : null
       if (opencodeOverlayDir) {
         baseEnv.OPENCODE_CONFIG_DIR = opencodeOverlayDir
         baseEnv.ORCA_OPENCODE_CONFIG_DIR = opencodeOverlayDir
         delete baseEnv.ORCA_OPENCODE_SOURCE_CONFIG_DIR
       } else {
-        // Why: relay not connected yet (or older guest bundle) — never cross the Windows overlay path into WSL; drop it so in-guest OpenCode uses its own config (pre-fix behavior, no status but no regression).
+        // Only guest overlays belong in WSL; otherwise let OpenCode use its guest config.
         delete baseEnv.OPENCODE_CONFIG_DIR
         delete baseEnv.ORCA_OPENCODE_CONFIG_DIR
         delete baseEnv.ORCA_OPENCODE_SOURCE_CONFIG_DIR
@@ -253,7 +286,8 @@ export function buildPtyHostEnv(
     // Why: user startup files may re-export CODEX_HOME; shell-ready wrappers restore this runtime home before Codex launches.
     baseEnv.ORCA_CODEX_HOME = opts.selectedCodexHomePath
     const preflightCommand = resolveCodexShellLaunchPreflightCommand({
-      hooksEnabled: opts.codexStatusHooksEnabled ?? opts.agentStatusHooksEnabled,
+      hooksEnabled:
+        opts.agentStatusHooksEnabled && isTuiAgentEnabled('codex', opts.disabledTuiAgents),
       isPackaged: opts.isPackaged,
       isWsl: opts.isWsl,
       managedHomePath: opts.selectedCodexHomePath,
diff --git a/src/main/ipc/pty/host-env/codex-home.ts b/src/main/ipc/pty/host-env/codex-home.ts
index 7abde3361812..fbc0db2a04da 100644
--- a/src/main/ipc/pty/host-env/codex-home.ts
+++ b/src/main/ipc/pty/host-env/codex-home.ts
@@ -1,7 +1,5 @@
 import { normalizeRuntimePathForComparison } from '../../../../shared/cross-platform-path'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
-import { isTuiAgentEnabled } from '../../../../shared/tui-agent-selection'
-import { isAgentStatusHooksEnabled } from '../../../agent-hooks/managed-agent-hook-controls'
 import {
   isCodexHomeAuthReadyForLaunch,
   waitForManagedCodexAuthReady
@@ -31,12 +29,6 @@ export function shouldSkipCodexHomeEnvForWindowsShell(
   return isWslShellName(shellPath) || (typeof cwd === 'string' && parseWslPath(cwd) !== null)
 }
 
-export function isCodexStatusHooksEnabled(settings: GlobalSettings | undefined): boolean {
-  return (
-    isAgentStatusHooksEnabled(settings) && isTuiAgentEnabled('codex', settings?.disabledTuiAgents)
-  )
-}
-
 // Why: with the real-home flag ON, a host system-default launch resolves to a
 // null managed home. Signal the env builder to strip a nested-Orca-inherited
 // override instead of injecting one, so Codex runs on the user's own ~/.codex.
diff --git a/src/main/ipc/pty/host-env/opencode-hook-installation.test.ts b/src/main/ipc/pty/host-env/opencode-hook-installation.test.ts
new file mode 100644
index 000000000000..8a9114eb9427
--- /dev/null
+++ b/src/main/ipc/pty/host-env/opencode-hook-installation.test.ts
@@ -0,0 +1,495 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import {
+  createDaemonPtyEnvironment,
+  rescrubDaemonPtyEnvironment
+} from '../../../daemon/pty-subprocess/spawn-environment'
+import { getInheritedAgentHookEnvKeysToDelete } from './pi-agent'
+import { buildPtyHostEnv } from './assembly'
+import type { BuildPtyHostEnvOptions } from './types'
+
+const fixture = vi.hoisted(() => ({ userData: '', guestOverlay: '' }))
+vi.mock('../../../../shared/app-environment', () => ({
+  getAppEnvironment: () => ({ getPath: () => fixture.userData })
+}))
+vi.mock('../../../agent-hooks/server', () => ({
+  agentHookServer: { buildPtyEnv: () => ({ ORCA_AGENT_HOOK_PORT: '12345' }) }
+}))
+vi.mock('../../../agent-hooks/wsl-hook-relay-manager', () => ({
+  wslHookRelayManager: {
+    ensureForDistro: vi.fn(),
+    getGuestEndpointFilePath: () => '/guest/endpoint.json',
+    getOpenCodeOverlayDir: () => fixture.guestOverlay,
+    getGuestAgentPath: () => null
+  }
+}))
+vi.mock('../../../pi/titlebar-extension-service', () => ({
+  piTitlebarExtensionService: { buildPtyEnv: () => ({}), buildFreshOmpEnv: () => ({}) }
+}))
+vi.mock('../../../cli/orca-cli-child-path', () => ({ prependOrcaCliDirToChildPath: () => {} }))
+vi.mock('../../../cli/wsl-managed-cli', () => ({
+  getManagedWslCliDir: () => undefined,
+  getWslCliCommandName: () => 'orca-ide'
+}))
+
+let root: string
+let config: string
+let custom: string
+let options: BuildPtyHostEnvOptions
+const plugin = (dir: string, agent: string) => join(dir, 'plugins', `orca-${agent}-status.js`)
+
+beforeEach(() => {
+  root = mkdtempSync(join(tmpdir(), 'orca-opencode-disabled-'))
+  const home = join(root, 'home')
+  const xdg = join(root, 'xdg')
+  mkdirSync(home)
+  fixture.userData = join(root, 'user-data')
+  fixture.guestOverlay = join(root, 'guest-overlay')
+  config = join(xdg, 'opencode')
+  custom = join(root, 'custom')
+  mkdirSync(join(custom, 'plugins'), { recursive: true })
+  writeFileSync(join(custom, 'opencode.json'), '{"model":"fixture"}')
+  writeFileSync(join(custom, 'plugins', 'user.js'), '// user plugin')
+  vi.stubEnv('HOME', home)
+  vi.stubEnv('USERPROFILE', home)
+  vi.stubEnv('XDG_CONFIG_HOME', xdg)
+  for (const key of [
+    'OPENCODE_CONFIG_DIR',
+    'ORCA_OPENCODE_CONFIG_DIR',
+    'ORCA_OPENCODE_SOURCE_CONFIG_DIR',
+    'ORCA_OPENCODE_AGENT',
+    'ZDOTDIR'
+  ]) {
+    vi.stubEnv(key, undefined)
+  }
+  options = {
+    isPackaged: true,
+    userDataPath: fixture.userData,
+    selectedCodexHomePath: null,
+    agentStatusHooksEnabled: true
+  }
+})
+afterEach(() => {
+  vi.unstubAllEnvs()
+  rmSync(root, { recursive: true, force: true })
+})
+
+describe('OpenCode installation uses the current enabled agents', () => {
+  const combinations = [
+    { disabled: [], fallback: 'opencode' },
+    { disabled: ['opencode'], fallback: 'opencode2' },
+    { disabled: ['opencode2'], fallback: 'opencode' },
+    { disabled: ['opencode', 'opencode2'], fallback: undefined }
+  ]
+  for (const { disabled, fallback } of combinations) {
+    it.each(['default', 'custom'])(`bare %s config with disabled ${disabled.join(',')}`, (kind) => {
+      const env = buildPtyHostEnv(
+        'pane',
+        kind === 'custom' ? { OPENCODE_CONFIG_DIR: custom } : {},
+        {
+          ...options,
+          disabledTuiAgents: disabled
+        }
+      )
+      expect(env.ORCA_OPENCODE_AGENT).toBe(fallback)
+      const selected = env.OPENCODE_CONFIG_DIR ?? config
+      for (const agent of ['opencode', 'opencode2']) {
+        expect(existsSync(plugin(selected, agent))).toBe(agent === fallback)
+      }
+      if (kind === 'custom') {
+        expect(readFileSync(join(selected, 'plugins', 'user.js'), 'utf8')).toBe('// user plugin')
+        expect(readFileSync(join(selected, 'opencode.json'), 'utf8')).toBe('{"model":"fixture"}')
+        expect(existsSync(plugin(custom, 'opencode'))).toBe(false)
+      }
+    })
+    it.each(['opencode', 'opencode2'] as const)(
+      `explicit %s with disabled ${disabled.join(',')}`,
+      (agent) => {
+        for (const selection of [
+          { launchCommand: `${agent} --session fixture` },
+          { launchAgent: agent }
+        ]) {
+          const env = buildPtyHostEnv(
+            'pane',
+            {},
+            { ...options, ...selection, disabledTuiAgents: disabled }
+          )
+          const selected = disabled.includes(agent) ? undefined : agent
+          expect(env.ORCA_OPENCODE_AGENT).toBe(selected)
+          expect(existsSync(plugin(config, agent))).toBe(selected === agent)
+          expect(existsSync(plugin(config, agent === 'opencode' ? 'opencode2' : 'opencode'))).toBe(
+            false
+          )
+        }
+      }
+    )
+  }
+
+  it('reads enable/disable changes on the same services without deleting installed files', () => {
+    buildPtyHostEnv('first', {}, options)
+    const installed = plugin(config, 'opencode')
+    writeFileSync(installed, '// already installed sentinel')
+    const env = buildPtyHostEnv('second', {}, { ...options, disabledTuiAgents: ['opencode'] })
+    expect(env.ORCA_OPENCODE_AGENT).toBe('opencode2')
+    expect(readFileSync(installed, 'utf8')).toBe('// already installed sentinel')
+    buildPtyHostEnv('third', {}, options)
+    expect(readFileSync(installed, 'utf8')).toContain('/hook/opencode')
+  })
+
+  it.each([true, false])(
+    'restores inherited source and clears markers with hooks %s',
+    (enabled) => {
+      const first = buildPtyHostEnv('first', { OPENCODE_CONFIG_DIR: custom }, options)
+      const original = readFileSync(plugin(first.OPENCODE_CONFIG_DIR, 'opencode'), 'utf8')
+      const env = buildPtyHostEnv(
+        'second',
+        { ...first },
+        {
+          ...options,
+          agentStatusHooksEnabled: enabled,
+          disabledTuiAgents: ['opencode', 'opencode2']
+        }
+      )
+      expect(env.OPENCODE_CONFIG_DIR).toBe(custom)
+      expect(env.ORCA_OPENCODE_CONFIG_DIR).toBeUndefined()
+      expect(env.ORCA_OPENCODE_SOURCE_CONFIG_DIR).toBeUndefined()
+      expect(env.ORCA_OPENCODE_AGENT).toBeUndefined()
+      expect(readFileSync(plugin(first.OPENCODE_CONFIG_DIR, 'opencode'), 'utf8')).toBe(original)
+      expect(env.ORCA_AGENT_HOOK_PORT).toBe(enabled ? '12345' : undefined)
+    }
+  )
+
+  it('drops an inherited overlay without a source and preserves an unrelated explicit config', () => {
+    for (const primary of [fixture.guestOverlay, custom]) {
+      const env = buildPtyHostEnv(
+        'pane',
+        {
+          OPENCODE_CONFIG_DIR: primary,
+          ORCA_OPENCODE_CONFIG_DIR: fixture.guestOverlay,
+          ORCA_OPENCODE_AGENT: 'opencode'
+        },
+        { ...options, disabledTuiAgents: ['opencode', 'opencode2'] }
+      )
+      expect(env.OPENCODE_CONFIG_DIR).toBe(primary === custom ? custom : undefined)
+      expect(env.ORCA_OPENCODE_AGENT).toBeUndefined()
+    }
+  })
+
+  it('does not write a native plugin for WSL or inject a disabled guest overlay', () => {
+    const enabled = buildPtyHostEnv(
+      'wsl-enabled',
+      {},
+      { ...options, isWsl: true, launchAgent: 'opencode2' }
+    )
+    expect(enabled.OPENCODE_CONFIG_DIR).toBe(fixture.guestOverlay)
+    expect(existsSync(config)).toBe(false)
+    const disabled = buildPtyHostEnv(
+      'wsl-disabled',
+      {},
+      {
+        ...options,
+        isWsl: true,
+        disabledTuiAgents: ['opencode', 'opencode2']
+      }
+    )
+    expect(disabled.OPENCODE_CONFIG_DIR).toBeUndefined()
+    expect(disabled.ORCA_AGENT_HOOK_ENDPOINT).toBe('/guest/endpoint.json')
+    expect(existsSync(config)).toBe(false)
+  })
+})
+
+it.each(['source', 'no-source', 'user-config'])(
+  'carries sparse host cleanup into daemon %s env',
+  (kind) => {
+    const prepared = buildPtyHostEnv(
+      'daemon-pane',
+      {},
+      {
+        ...options,
+        disabledTuiAgents: ['opencode', 'opencode2']
+      }
+    )
+    vi.stubEnv('OPENCODE_CONFIG_DIR', kind === 'user-config' ? custom : fixture.guestOverlay)
+    vi.stubEnv('ORCA_OPENCODE_CONFIG_DIR', fixture.guestOverlay)
+    vi.stubEnv('ORCA_OPENCODE_AGENT', 'opencode')
+    if (kind === 'source') {
+      vi.stubEnv('ORCA_OPENCODE_SOURCE_CONFIG_DIR', custom)
+    }
+    const result = createDaemonPtyEnvironment({
+      sessionId: 'fixture',
+      cols: 80,
+      rows: 24,
+      env: prepared,
+      envToDelete: getInheritedAgentHookEnvKeysToDelete(prepared)
+    })
+    expect(result.OPENCODE_CONFIG_DIR).toBe(kind === 'no-source' ? undefined : custom)
+    expect(result.ORCA_OPENCODE_AGENT).toBeUndefined()
+    expect(result.ORCA_OPENCODE_CONFIG_DIR).toBeUndefined()
+    expect(result.ORCA_OPENCODE_SOURCE_CONFIG_DIR).toBeUndefined()
+  }
+)
+
+it.each([
+  { primary: 'overlay', source: true, explicit: true, expected: 'current' },
+  { primary: 'current', source: true, explicit: false, expected: 'current' },
+  { primary: 'overlay', source: true, explicit: false, expected: 'previous' },
+  { primary: 'absent', source: true, explicit: false, expected: 'previous' },
+  { primary: 'overlay', source: false, explicit: false, expected: undefined },
+  { primary: 'overlay', source: false, explicit: true, expected: 'current' },
+  { primary: 'absent', source: false, explicit: false, expected: undefined }
+])('daemon config precedence: $primary, source $source, explicit $explicit', (scenario) => {
+  const prepared = buildPtyHostEnv(
+    'daemon-pane',
+    scenario.explicit ? { OPENCODE_CONFIG_DIR: custom } : {},
+    { ...options, disabledTuiAgents: ['opencode', 'opencode2'] }
+  )
+  const previous = join(root, 'previous')
+  mkdirSync(previous)
+  writeFileSync(join(previous, 'opencode.json'), '{"model":"previous"}')
+  vi.stubEnv(
+    'OPENCODE_CONFIG_DIR',
+    scenario.primary === 'absent'
+      ? undefined
+      : scenario.primary === 'current'
+        ? custom
+        : fixture.guestOverlay
+  )
+  vi.stubEnv('ORCA_OPENCODE_CONFIG_DIR', fixture.guestOverlay)
+  vi.stubEnv('ORCA_OPENCODE_SOURCE_CONFIG_DIR', scenario.source ? previous : undefined)
+  vi.stubEnv('ORCA_OPENCODE_AGENT', 'opencode')
+  const request = {
+    sessionId: 'fixture',
+    cols: 80,
+    rows: 24,
+    env: prepared,
+    envToDelete: getInheritedAgentHookEnvKeysToDelete(prepared)
+  }
+  const result = createDaemonPtyEnvironment(request)
+  rescrubDaemonPtyEnvironment(result, request)
+  if (scenario.expected) {
+    expect(readFileSync(join(result.OPENCODE_CONFIG_DIR, 'opencode.json'), 'utf8')).toBe(
+      scenario.expected === 'current' ? '{"model":"fixture"}' : '{"model":"previous"}'
+    )
+  } else {
+    expect(result.OPENCODE_CONFIG_DIR).toBeUndefined()
+  }
+  expect(result.ORCA_OPENCODE_CONFIG_DIR).toBeUndefined()
+  expect(result.ORCA_OPENCODE_SOURCE_CONFIG_DIR).toBeUndefined()
+  expect(result.ORCA_OPENCODE_AGENT).toBeUndefined()
+})
+
+it.each(['opencode', 'opencode2'] as const)(
+  'keeps the freshly selected %s overlay through a stale daemon',
+  (agent) => {
+    const prepared = buildPtyHostEnv(
+      'pane',
+      { OPENCODE_CONFIG_DIR: custom },
+      {
+        ...options,
+        launchAgent: agent
+      }
+    )
+    vi.stubEnv('OPENCODE_CONFIG_DIR', fixture.guestOverlay)
+    vi.stubEnv('ORCA_OPENCODE_CONFIG_DIR', fixture.guestOverlay)
+    vi.stubEnv('ORCA_OPENCODE_SOURCE_CONFIG_DIR', join(root, 'stale-source'))
+    const result = createDaemonPtyEnvironment({
+      sessionId: 'fixture',
+      cols: 80,
+      rows: 24,
+      env: prepared,
+      envToDelete: getInheritedAgentHookEnvKeysToDelete(prepared)
+    })
+    expect(readFileSync(join(result.OPENCODE_CONFIG_DIR, 'opencode.json'), 'utf8')).toBe(
+      '{"model":"fixture"}'
+    )
+    expect(existsSync(plugin(result.OPENCODE_CONFIG_DIR, agent))).toBe(true)
+    expect(result.ORCA_OPENCODE_SOURCE_CONFIG_DIR).toBe(custom)
+    expect(result.ORCA_OPENCODE_AGENT).toBe(agent)
+  }
+)
+
+it.each([true, false])(
+  'preserves explicit host config over inherited markers with hooks %s',
+  (enabled) => {
+    const stale = join(root, 'stale-source')
+    mkdirSync(stale)
+    writeFileSync(join(stale, 'opencode.json'), '{"model":"stale"}')
+    for (const inheritedFromProcess of [true, false]) {
+      const markers = {
+        ORCA_OPENCODE_CONFIG_DIR: join(root, 'old-overlay'),
+        ORCA_OPENCODE_SOURCE_CONFIG_DIR: stale
+      }
+      for (const [key, value] of Object.entries(markers)) {
+        vi.stubEnv(key, inheritedFromProcess ? value : undefined)
+      }
+      const env = buildPtyHostEnv(
+        'explicit-config',
+        {
+          ...(inheritedFromProcess ? {} : markers),
+          OPENCODE_CONFIG_DIR: custom
+        },
+        { ...options, agentStatusHooksEnabled: enabled }
+      )
+      expect(readFileSync(join(env.OPENCODE_CONFIG_DIR, 'opencode.json'), 'utf8')).toBe(
+        '{"model":"fixture"}'
+      )
+      expect(env.ORCA_OPENCODE_SOURCE_CONFIG_DIR).toBe(enabled ? custom : undefined)
+      expect(existsSync(plugin(stale, 'opencode'))).toBe(false)
+    }
+  }
+)
+
+it.each([true, false])(
+  'drops host config for disabled WSL variants with explicit primary %s',
+  (explicit) => {
+    const overlay = 'C:\\Users\\fixture\\Orca\\opencode-overlays\\old'
+    const source = 'C:\\Users\\fixture\\config\\opencode'
+    vi.stubEnv('ORCA_OPENCODE_CONFIG_DIR', overlay)
+    vi.stubEnv('ORCA_OPENCODE_SOURCE_CONFIG_DIR', source)
+    const env = buildPtyHostEnv(
+      'wsl-disabled-inherited',
+      {
+        OPENCODE_CONFIG_DIR: explicit ? source : overlay,
+        ORCA_OPENCODE_CONFIG_DIR: overlay,
+        ORCA_OPENCODE_SOURCE_CONFIG_DIR: source
+      },
+      { ...options, isWsl: true, disabledTuiAgents: ['opencode', 'opencode2'] }
+    )
+    expect(env.OPENCODE_CONFIG_DIR).toBeUndefined()
+    expect(env.ORCA_OPENCODE_CONFIG_DIR).toBeUndefined()
+    expect(env.ORCA_OPENCODE_SOURCE_CONFIG_DIR).toBeUndefined()
+    expect(env.ORCA_OPENCODE_AGENT).toBeUndefined()
+    expect(env.ORCA_AGENT_HOOK_ENDPOINT).toBe('/guest/endpoint.json')
+    expect(existsSync(config)).toBe(false)
+  }
+)
+
+// Why: pre-1.4.209 panes exported Orca's retired <userData>/opencode-hooks/shared dir. OpenCode 2
+// treats OPENCODE_CONFIG_DIR as the only config dir, so inheriting it loaded a stale plugin and hid
+// the user's global config.
+describe.each([
+  { name: 'marked', marked: true },
+  { name: 'unmarked', marked: false }
+])('inherited retired shared hooks dir ($name)', ({ marked }) => {
+  it.each([
+    { agent: 'opencode', hooksDir: 'opencode-hooks' },
+    { agent: 'opencode', hooksDir: 'opencode2-hooks' },
+    { agent: 'opencode2', hooksDir: 'opencode-hooks' },
+    { agent: 'opencode2', hooksDir: 'opencode2-hooks' }
+  ] as const)('drops $hooksDir for $agent panes', ({ agent, hooksDir }) => {
+    const legacy = join(fixture.userData, hooksDir, 'shared')
+    mkdirSync(join(legacy, 'plugins'), { recursive: true })
+    const env = buildPtyHostEnv(
+      'pane',
+      marked
+        ? { OPENCODE_CONFIG_DIR: legacy, ORCA_OPENCODE_CONFIG_DIR: legacy }
+        : { OPENCODE_CONFIG_DIR: legacy },
+      { ...options, launchAgent: agent }
+    )
+    expect(env.OPENCODE_CONFIG_DIR).toBeUndefined()
+    expect(env.ORCA_OPENCODE_CONFIG_DIR).toBeUndefined()
+    expect(env.ORCA_OPENCODE_SOURCE_CONFIG_DIR).toBeUndefined()
+    expect(existsSync(plugin(config, agent))).toBe(true)
+    expect(existsSync(join(fixture.userData, `${agent}-config-overlays`))).toBe(false)
+  })
+})
+
+it('keeps a user config dir that merely sits beside the retired hooks dir', () => {
+  const neighbour = join(fixture.userData, 'opencode-hooks', 'mine')
+  mkdirSync(neighbour, { recursive: true })
+  const env = buildPtyHostEnv('pane', { OPENCODE_CONFIG_DIR: neighbour }, options)
+  expect(env.ORCA_OPENCODE_SOURCE_CONFIG_DIR).toBe(neighbour)
+  expect(env.OPENCODE_CONFIG_DIR).not.toBeUndefined()
+})
+
+it.each(['explicit', 'inherited'])('refreshes the %s stale plugin with hooks off', (source) => {
+  const legacy = join(fixture.userData, 'opencode-hooks', 'shared')
+  const stalePlugin = join(legacy, 'plugins', 'orca-opencode-status.js')
+  mkdirSync(join(legacy, 'plugins'), { recursive: true })
+  writeFileSync(stalePlugin, 'export default { id: "orca-opencode-status", server() {} }\n')
+  if (source === 'inherited') {
+    vi.stubEnv('OPENCODE_CONFIG_DIR', legacy)
+  }
+  const env = buildPtyHostEnv(
+    'pane',
+    source === 'explicit' ? { OPENCODE_CONFIG_DIR: legacy } : {},
+    { ...options, agentStatusHooksEnabled: false }
+  )
+  expect(env.OPENCODE_CONFIG_DIR).toBeUndefined()
+  expect(readFileSync(stalePlugin, 'utf8')).toContain('setup')
+})
+
+it.each([true, false])('strips daemon-inherited retired paths (known to main: %s)', (known) => {
+  const legacy = join(fixture.userData, 'opencode-hooks', 'shared')
+  if (known) {
+    vi.stubEnv('OPENCODE_CONFIG_DIR', legacy)
+  }
+  const env = buildPtyHostEnv('pane', {}, { ...options, agentStatusHooksEnabled: false })
+  vi.stubEnv('ORCA_USER_DATA_PATH', fixture.userData)
+  vi.stubEnv('OPENCODE_CONFIG_DIR', legacy)
+  const request = { sessionId: 'pane', cols: 80, rows: 24, cwd: root, env }
+  const result = createDaemonPtyEnvironment(request)
+  expect(result.OPENCODE_CONFIG_DIR).toBeUndefined()
+  result.OPENCODE_CONFIG_DIR = legacy
+  rescrubDaemonPtyEnvironment(result, request)
+  expect(result.OPENCODE_CONFIG_DIR).toBeUndefined()
+})
+
+it('preserves explicit user config over a retired daemon-inherited path', () => {
+  vi.stubEnv('ORCA_USER_DATA_PATH', fixture.userData)
+  vi.stubEnv('OPENCODE_CONFIG_DIR', join(fixture.userData, 'opencode-hooks', 'shared'))
+  const env = { OPENCODE_CONFIG_DIR: custom }
+  const result = createDaemonPtyEnvironment({
+    sessionId: 'pane',
+    cols: 80,
+    rows: 24,
+    cwd: root,
+    env
+  })
+  expect(result.OPENCODE_CONFIG_DIR).toBe(custom)
+})
+
+it('does not restore a retired source from process.env with hooks disabled', () => {
+  vi.stubEnv('ORCA_OPENCODE_SOURCE_CONFIG_DIR', join(fixture.userData, 'opencode-hooks', 'shared'))
+  const env = buildPtyHostEnv('pane', {}, { ...options, agentStatusHooksEnabled: false })
+  expect(env.OPENCODE_CONFIG_DIR).toBeUndefined()
+})
+
+it.each([true, false])(
+  'preserves explicit config with a retired parent source (hooks: %s)',
+  (enabled) => {
+    vi.stubEnv(
+      'ORCA_OPENCODE_SOURCE_CONFIG_DIR',
+      join(fixture.userData, 'opencode-hooks', 'shared')
+    )
+    const env = buildPtyHostEnv(
+      'pane',
+      { OPENCODE_CONFIG_DIR: custom },
+      { ...options, agentStatusHooksEnabled: enabled }
+    )
+    if (enabled) {
+      expect(env.ORCA_OPENCODE_SOURCE_CONFIG_DIR).toBe(custom)
+      expect(readFileSync(join(env.OPENCODE_CONFIG_DIR, 'opencode.json'), 'utf8')).toBe(
+        '{"model":"fixture"}'
+      )
+    } else {
+      expect(env.OPENCODE_CONFIG_DIR).toBe(custom)
+    }
+  }
+)
+
+it('repairs both legacy variants without main inheriting any retired path or enabling hooks', () => {
+  for (const agent of ['opencode', 'opencode2']) {
+    const path = plugin(join(fixture.userData, `${agent}-hooks`, 'shared'), agent)
+    mkdirSync(join(path, '..'), { recursive: true })
+    writeFileSync(path, '// old plugin')
+  }
+  buildPtyHostEnv('pane', {}, { ...options, agentStatusHooksEnabled: false })
+  for (const agent of ['opencode', 'opencode2']) {
+    expect(
+      readFileSync(plugin(join(fixture.userData, `${agent}-hooks`, 'shared'), agent), 'utf8')
+    ).toContain('setup')
+  }
+})
diff --git a/src/main/ipc/pty/host-env/pi-agent.ts b/src/main/ipc/pty/host-env/pi-agent.ts
index 545d04d063d1..caf18e3e1aa7 100644
--- a/src/main/ipc/pty/host-env/pi-agent.ts
+++ b/src/main/ipc/pty/host-env/pi-agent.ts
@@ -8,7 +8,11 @@ import {
   type PiAgentKind
 } from '../../../../shared/pi-agent-kind'
 import { readSessionShellStartupEnvVar } from '../../../pty/shell-startup-env'
-import { AGENT_HOOK_RUNTIME_ENV_KEYS, CLAUDE_CHILD_SESSION_STAMP_ENV_KEYS } from './spawn-env-keys'
+import {
+  AGENT_HOOK_RUNTIME_ENV_KEYS,
+  CLAUDE_CHILD_SESSION_STAMP_ENV_KEYS,
+  ORCA_AGENT_SESSION_CALLER_ENV_KEYS
+} from './spawn-env-keys'
 
 export function readEnvWithProcessFallback(
   baseEnv: Record<string, string>,
@@ -130,37 +134,27 @@ export function getInheritedAgentHookEnvKeysToDelete(
 ): string[] {
   const env = spawnEnv ?? {}
   // Why: providers merge process.env after cleanup; delete stale hook keys without dropping fresh coordinates buildPtyHostEnv set.
-  return AGENT_HOOK_RUNTIME_ENV_KEYS.filter((key) => env[key] === undefined)
+  return [
+    ...AGENT_HOOK_RUNTIME_ENV_KEYS,
+    'ORCA_OPENCODE_AGENT',
+    'ORCA_OPENCODE_CONFIG_DIR',
+    'ORCA_OPENCODE_SOURCE_CONFIG_DIR'
+  ].filter((key) => env[key] === undefined)
 }
 
-export function getInheritedClaudeSessionStampEnvKeysToDelete(
+export function getInheritedAgentSessionStampEnvKeysToDelete(
   spawnEnv: Record<string, string> | undefined
 ): string[] {
   const env = spawnEnv ?? {}
-  // Why: strip only values inherited from the pty host; a caller that explicitly
-  // provides a stamp (deliberately spawning a nested Claude child) keeps it.
-  return CLAUDE_CHILD_SESSION_STAMP_ENV_KEYS.filter((key) => env[key] === undefined)
+  // Why: a caller that explicitly provides a Claude stamp (a nested Claude child) keeps it; no
+  // terminal is a structured session, so the session caller keys always go.
+  return [
+    ...CLAUDE_CHILD_SESSION_STAMP_ENV_KEYS.filter((key) => env[key] === undefined),
+    ...ORCA_AGENT_SESSION_CALLER_ENV_KEYS
+  ]
 }
 
-// Why: a nested terminal can inherit prior OpenCode/Pi/OMP overlay env; restore the user's recorded source dir, else strip only Orca-owned values.
-export function restoreOrStripOverlayEnv(
-  baseEnv: Record<string, string>,
-  keys: {
-    primary: string
-    overlay: string
-    source: string
-  }
-): void {
-  const sourceValue = baseEnv[keys.source] ?? process.env[keys.source]
-  const overlayValue = baseEnv[keys.overlay] ?? process.env[keys.overlay]
-  if (sourceValue) {
-    baseEnv[keys.primary] = sourceValue
-  } else if (overlayValue && baseEnv[keys.primary] === overlayValue) {
-    delete baseEnv[keys.primary]
-  }
-  delete baseEnv[keys.overlay]
-  delete baseEnv[keys.source]
-}
+export { restoreOrStripOverlayEnv } from '../../../../shared/agent-overlay-env'
 
 export function isMimoLaunchCommand(launchCommand: string | undefined): boolean {
   const binary = getCommandTokenPathBasename(getFirstCommandToken(launchCommand ?? ''))
@@ -183,16 +177,20 @@ export function resolveMimocodeSourceHome(baseEnv: Record<string, string>): stri
 }
 
 export function resolveOpenCodeSourceConfigDir(
-  baseEnv: Record<string, string>
+  baseEnv: Record<string, string>,
+  inheritedEnv: NodeJS.ProcessEnv = process.env
 ): string | undefined {
+  const configDir = baseEnv.OPENCODE_CONFIG_DIR ?? inheritedEnv.OPENCODE_CONFIG_DIR
+  const orcaConfigDir = baseEnv.ORCA_OPENCODE_CONFIG_DIR ?? inheritedEnv.ORCA_OPENCODE_CONFIG_DIR
+  if (configDir && orcaConfigDir && configDir !== orcaConfigDir) {
+    return configDir
+  }
   const sourceDir =
-    baseEnv.ORCA_OPENCODE_SOURCE_CONFIG_DIR ?? process.env.ORCA_OPENCODE_SOURCE_CONFIG_DIR
+    baseEnv.ORCA_OPENCODE_SOURCE_CONFIG_DIR ?? inheritedEnv.ORCA_OPENCODE_SOURCE_CONFIG_DIR
   if (sourceDir) {
     return sourceDir
   }
 
-  const configDir = baseEnv.OPENCODE_CONFIG_DIR ?? process.env.OPENCODE_CONFIG_DIR
-  const orcaConfigDir = baseEnv.ORCA_OPENCODE_CONFIG_DIR ?? process.env.ORCA_OPENCODE_CONFIG_DIR
   // Why: with no recorded source dir, an inherited OPENCODE_CONFIG_DIR is Orca-owned, not user config; treating it as user config makes child Orcas mirror the hook dir.
   if (configDir && orcaConfigDir && configDir === orcaConfigDir) {
     return undefined
diff --git a/src/main/ipc/pty/host-env/spawn-env-keys.ts b/src/main/ipc/pty/host-env/spawn-env-keys.ts
index cabbde7b0ecb..ed070c7d043d 100644
--- a/src/main/ipc/pty/host-env/spawn-env-keys.ts
+++ b/src/main/ipc/pty/host-env/spawn-env-keys.ts
@@ -1,3 +1,6 @@
+import { ORCA_AGENT_SESSION_ID_ENV } from '../../../../shared/agent-session-caller-env'
+import { ORCA_STRUCTURED_SESSION_ENV } from '../../../../shared/structured-session-marker'
+
 export const AGENT_HOOK_RUNTIME_ENV_KEYS = [
   'ORCA_AGENT_HOOK_PORT',
   'ORCA_AGENT_HOOK_TOKEN',
@@ -15,3 +18,9 @@ export const CLAUDE_CHILD_SESSION_STAMP_ENV_KEYS = [
   'CLAUDE_CODE_SESSION_ID',
   'CLAUDE_CODE_BRIDGE_SESSION_ID'
 ] as const
+
+// Why: Orca writes these only into a structured session's own spawn, so an inherited value means a pty host launched from inside one — every pane would claim that session as its orchestration caller.
+export const ORCA_AGENT_SESSION_CALLER_ENV_KEYS = [
+  ORCA_AGENT_SESSION_ID_ENV,
+  ORCA_STRUCTURED_SESSION_ENV
+] as const
diff --git a/src/main/ipc/pty/host-env/types.ts b/src/main/ipc/pty/host-env/types.ts
index 37ef0614a504..3e7d30da1431 100644
--- a/src/main/ipc/pty/host-env/types.ts
+++ b/src/main/ipc/pty/host-env/types.ts
@@ -29,7 +29,6 @@ export type BuildPtyHostEnvOptions = {
   agentStatusHooksEnabled: boolean
   /** Per-agent opt-out; disabled agents must not receive managed extensions. */
   disabledTuiAgents?: Iterable<unknown> | null
-  codexStatusHooksEnabled?: boolean
   networkProxySettings?: NetworkProxySettings
   /** Headless paired runtimes hand browser launches to the client-hosted Orca browser. */
   routeBrowserOpensToClient?: boolean
diff --git a/src/main/ipc/pty/ipc/renderer-kill.ts b/src/main/ipc/pty/ipc/renderer-kill.ts
index 8f73e72aa596..10a0ffa476e2 100644
--- a/src/main/ipc/pty/ipc/renderer-kill.ts
+++ b/src/main/ipc/pty/ipc/renderer-kill.ts
@@ -1,10 +1,11 @@
 import { getPtyIpc } from '../../pty-host-bindings'
 import type { Store } from '../../../persistence'
 import type { OrcaRuntimeService } from '../../../runtime/orca-runtime'
+import type { TerminalIntentionalStopKind } from '../../../runtime/terminal-intentional-stops'
 import type { IPtyProvider } from '../../../providers/types'
 import { parseAppSshPtyId } from '../../../providers/ssh-pty-id'
 import { SSH_PROVIDER_UNREGISTERED_REASON } from '../../../../shared/pty-liveness-verdict'
-import { ptyOwnership } from '../provider/ownership-state'
+import { ptyIncarnationById, ptyOwnership } from '../provider/ownership-state'
 import { getProviderForPty, sshProviders, tryGetProviderForPty } from '../provider/registry'
 import { finishPtyShutdown, isPtyAlreadyGoneError } from '../provider/liveness'
 import { recordUndeliveredSshPtyKill } from '../runtime/undelivered-ssh-kill'
@@ -31,25 +32,47 @@ export function installPtyKillIpcHandler(deps: PtyKillIpcDeps): void {
   )
 }
 
-/** Stops a pane's PTY for the spawn replacing it. `markReplaced` labels the exit so the renderer
- *  reads it as a handoff, not the pane dying; a failed stop removes the label with nothing sent. */
-export async function stopReplacedPanePty(
+/** Stops a pane's PTY for the spawn replacing it. The stop register labels the exit so the
+ *  renderer reads it as a handoff, not the pane dying; a failed stop leaves no label. */
+export async function stopReplacedPanePty(deps: PtyKillIpcDeps, id: string): Promise<void> {
+  await stopRendererOwnedPtyAs(deps, { id }, 'replaced')
+}
+
+/** Stops a renderer-owned PTY and settles only once its shutdown has been observed or synthesized. */
+export async function stopRendererOwnedPty(
+  deps: PtyKillIpcDeps,
+  args: { id: string; keepHistory?: boolean }
+): Promise<void> {
+  // Why: only hibernation passes keepHistory, and its exit must keep the pane's wake binding.
+  await stopRendererOwnedPtyAs(deps, args, args?.keepHistory === true ? 'reversible' : null)
+}
+
+async function stopRendererOwnedPtyAs(
   deps: PtyKillIpcDeps,
-  id: string,
-  markReplaced: (id: string) => (stopped: boolean) => void
+  args: { id: string; keepHistory?: boolean },
+  intentionalStop: TerminalIntentionalStopKind | null
 ): Promise<void> {
-  const settle = markReplaced(id)
+  if (typeof args?.id !== 'string' || !args.id || args.id.startsWith('remote:')) {
+    // Why: runtime terminal handles belong to terminal.close; unowned PTY routing could target the local provider.
+    throw new Error('Invalid PTY provider id')
+  }
+  const settleStop = intentionalStop
+    ? deps.runtime?.intentionalPtyStops?.mark(
+        args.id,
+        intentionalStop,
+        ptyIncarnationById.get(args.id) ?? null
+      )
+    : undefined
+  let stopped = false
   try {
-    await stopRendererOwnedPty(deps, { id })
-  } catch (err) {
-    settle(false)
-    throw err
+    await stopRendererOwnedPtyProcess(deps, args)
+    stopped = true
+  } finally {
+    settleStop?.(stopped)
   }
-  settle(true)
 }
 
-/** Stops a renderer-owned PTY and settles only once its shutdown has been observed or synthesized. */
-export async function stopRendererOwnedPty(
+async function stopRendererOwnedPtyProcess(
   deps: PtyKillIpcDeps,
   args: { id: string; keepHistory?: boolean }
 ): Promise<void> {
@@ -61,10 +84,6 @@ export async function stopRendererOwnedPty(
     rememberSyntheticKillExit,
     sendPtyExitToRenderer
   } = deps
-  if (typeof args?.id !== 'string' || !args.id || args.id.startsWith('remote:')) {
-    // Why: runtime terminal handles belong to terminal.close; unowned PTY routing could target the local provider.
-    throw new Error('Invalid PTY provider id')
-  }
   runtime?.markPtyStopRequested?.(args.id)
   const ownedConnectionId = ptyOwnership.get(args.id)
   const parsedSshId = ownedConnectionId === undefined ? parseAppSshPtyId(args.id) : null
diff --git a/src/main/ipc/pty/ipc/resize-visibility.ts b/src/main/ipc/pty/ipc/resize-visibility.ts
index c9f3e92c6207..62e74738b726 100644
--- a/src/main/ipc/pty/ipc/resize-visibility.ts
+++ b/src/main/ipc/pty/ipc/resize-visibility.ts
@@ -322,4 +322,13 @@ export function installPtyResizeVisibilityIpc(session: PtyIpcSession): void {
       .catch(() => {})
     runtime?.clearHeadlessTerminalBuffer(args.id).catch(() => {})
   })
+
+  ipcMain.removeAllListeners('pty:resetInputModes')
+  ipcMain.on('pty:resetInputModes', (_event, args: { id: string }) => {
+    // Why: an older daemon or relay rejects the request; its model keeps the modes until reattach.
+    tryGetProviderForPty(args.id)
+      ?.resetInputModes(args.id)
+      .catch(() => {})
+    runtime?.resetHeadlessTerminalInputModes(args.id).catch(() => {})
+  })
 }
diff --git a/src/main/ipc/pty/ipc/spawn-commit-persist.ts b/src/main/ipc/pty/ipc/spawn-commit-persist.ts
index 5d9ad086920e..46fd8e714bb3 100644
--- a/src/main/ipc/pty/ipc/spawn-commit-persist.ts
+++ b/src/main/ipc/pty/ipc/spawn-commit-persist.ts
@@ -32,7 +32,7 @@ export async function persistPtyIpcSpawnCommit(ctx: PtyIpcSpawnState): Promise<P
       throw error
     }
     console.error('[pty] failed to persist PTY binding after attach:', error)
-    throw Object.assign(new Error(createTerminalSessionStateSaveFailureMessage()), {
+    throw Object.assign(new Error(createTerminalSessionStateSaveFailureMessage(error)), {
       agentSessionOperationOutcome: 'unknown' as const
     })
   }
@@ -73,7 +73,10 @@ export async function persistPtyIpcSpawnCommit(ctx: PtyIpcSpawnState): Promise<P
           ctx.deps.store.removeSshRemotePtyLease(args.connectionId, relayResultId)
         }
       })
-      throw Object.assign(new Error(createTerminalSessionStateSaveFailureMessage()), {
+      if (err instanceof Error && err.message === 'terminal_pane_owner_changed') {
+        throw err
+      }
+      throw Object.assign(new Error(createTerminalSessionStateSaveFailureMessage(err)), {
         agentSessionOperationOutcome: 'unknown' as const
       })
     }
@@ -83,6 +86,8 @@ export async function persistPtyIpcSpawnCommit(ctx: PtyIpcSpawnState): Promise<P
 
 export function publishPtyIpcSpawnCommit(ctx: PtyIpcSpawnState, committedSize: PtyGrid): void {
   const args = ctx.args
+  // Why here: every IPC spawn that survives its binding save publishes once through this point.
+  ctx.deps.runtime?.noteTerminalSpawnCommit?.(ctx.result)
   ctx.spawnTiming.log(ctx.result.id, {
     daemon: ctx.isDaemonHostSpawn,
     reattach: ctx.result.isReattach ?? false
diff --git a/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts b/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts
new file mode 100644
index 000000000000..40cd636896ab
--- /dev/null
+++ b/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts
@@ -0,0 +1,79 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { OrcaRuntimeWithRuntimeId } from '../../../runtime/orca-runtime-runtime-id'
+import { TerminalIntentionalStops } from '../../../runtime/terminal-intentional-stops'
+import { TerminalRunFactsRegister } from '../../../runtime/terminal-run-facts'
+import { ptySizes } from '../delivery/visibility-state'
+import { ptyIncarnationById, ptyOwnership } from '../provider/ownership-state'
+import { commitPtyIpcSpawn } from './spawn-commit'
+import { createPtyIpcSpawnState } from './spawn-state'
+import type { PtySpawnIpcDeps } from './spawn-types'
+
+const PTY_ID = 'orca-ipc-pty-run-facts'
+const INCARNATION_ID = 'inc-ipc-run-facts'
+
+async function commit(persistPtyBinding: ReturnType<typeof vi.fn>) {
+  const facts = new TerminalRunFactsRegister()
+  const stops = new TerminalIntentionalStops()
+  stops.mark(PTY_ID, 'reversible', null)(true)
+  const runtime = {
+    terminalRunFacts: facts,
+    intentionalPtyStops: stops,
+    // Why the real method: the case under test is what the runtime does with each commit.
+    noteTerminalSpawnCommit: OrcaRuntimeWithRuntimeId.prototype.noteTerminalSpawnCommit,
+    registerPreAllocatedHandleForPty: vi.fn(),
+    registerPty: vi.fn(),
+    cancelPendingPtyRegistration: vi.fn(),
+    reflowHeadlessTerminalToPtyGrid: vi.fn(),
+    seedHeadlessTerminal: vi.fn(),
+    noteTerminalSpawnCommand: vi.fn()
+  }
+  const ports = {
+    runtime,
+    store: { persistPtyBinding },
+    options: {},
+    sendPtySpawnedToRenderer: vi.fn()
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the commit reads only the ports above, and the store only for its binding save.
+  const deps = ports as unknown as PtySpawnIpcDeps
+  const ctx = createPtyIpcSpawnState(deps, {
+    worktreeId: 'wt-1',
+    tabId: 'tab-1',
+    leafId: 'leaf-1',
+    cols: 120,
+    rows: 40
+  })
+  ctx.validatedLeafId = 'leaf-1'
+  ctx.provider = { ...ctx.provider, shutdown: vi.fn().mockResolvedValue(undefined) }
+  ctx.result = { id: PTY_ID, incarnationId: INCARNATION_ID }
+  const outcome = await commitPtyIpcSpawn(ctx).then(
+    () => 'committed',
+    () => 'discarded'
+  )
+  return { outcome, facts, stops }
+}
+
+describe('renderer spawn commit: run facts', () => {
+  afterEach(() => {
+    ptySizes.delete(PTY_ID)
+    ptyOwnership.delete(PTY_ID)
+    ptyIncarnationById.delete(PTY_ID)
+  })
+
+  it('records a committed spawn and lets it supersede a landed stop no exit pinned', async () => {
+    const { outcome, facts, stops } = await commit(vi.fn().mockResolvedValue(true))
+
+    expect(outcome).toBe('committed')
+    expect(facts.read(PTY_ID, INCARNATION_ID).freshSpawn).toBe(true)
+    expect(stops.claimExit(PTY_ID, INCARNATION_ID)).toEqual([])
+  })
+
+  it('records nothing for a spawn discarded because its binding save failed', async () => {
+    const persistPtyBinding = vi.fn().mockRejectedValue(new Error('disk full'))
+    const { outcome, facts, stops } = await commit(persistPtyBinding)
+
+    expect(outcome).toBe('discarded')
+    expect(persistPtyBinding).toHaveBeenCalledOnce()
+    expect(facts.read(PTY_ID, INCARNATION_ID).freshSpawn).toBe(false)
+    expect(stops.claimExit(PTY_ID, INCARNATION_ID)).toEqual(['reversible'])
+  })
+})
diff --git a/src/main/ipc/pty/ipc/spawn-env-codex.ts b/src/main/ipc/pty/ipc/spawn-env-codex.ts
index 50173f93c3d2..cee47100b5f9 100644
--- a/src/main/ipc/pty/ipc/spawn-env-codex.ts
+++ b/src/main/ipc/pty/ipc/spawn-env-codex.ts
@@ -13,7 +13,6 @@ import {
   resolveCodexHomeAfterManagedAuthReadiness,
   shouldSkipCodexHomeEnvForWindowsShell,
   shouldStripInheritedOrcaCodexHome,
-  isCodexStatusHooksEnabled,
   codexHomePathsEqual
 } from '../host-env/codex-home'
 import { promoteAgentTeamsShimPath } from '../host-env/path'
@@ -152,7 +151,6 @@ export async function assemblePtyIpcSpawnCodexEnv(ctx: PtyIpcSpawnState): Promis
         wslDistro: ctx.codexSelectionTarget.runtime === 'wsl' ? ctx.expectedWslDistro : null,
         agentStatusHooksEnabled: isAgentStatusHooksEnabled(ptySettings),
         disabledTuiAgents: ptySettings?.disabledTuiAgents,
-        codexStatusHooksEnabled: isCodexStatusHooksEnabled(ptySettings),
         networkProxySettings: ptySettings,
         routeBrowserOpensToClient: ctx.deps.runtime?.shouldRelayTerminalBrowserOpens?.(),
         deferGitConfigGuardToDaemon:
diff --git a/src/main/ipc/pty/ipc/spawn-options-codex-isolation.test.ts b/src/main/ipc/pty/ipc/spawn-options-codex-isolation.test.ts
new file mode 100644
index 000000000000..0375ca7f88fc
--- /dev/null
+++ b/src/main/ipc/pty/ipc/spawn-options-codex-isolation.test.ts
@@ -0,0 +1,68 @@
+import { describe, expect, it, vi } from 'vitest'
+import { getDefaultSettings } from '../../../../shared/constants'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import { buildRuntimePtySpawnOptions } from '../runtime/spawn-options'
+import { createRuntimePtySpawnState } from '../runtime/spawn-state'
+import type { PtyRuntimeControllerDeps } from '../runtime/controller-deps'
+import { buildPtyIpcSpawnOptions } from './spawn-options'
+import { createPtyIpcSpawnState } from './spawn-state'
+import type { PtySpawnIpcDeps } from './spawn-types'
+
+function settingsWith(isolation: boolean | undefined): GlobalSettings {
+  const settings = getDefaultSettings('/tmp')
+  if (isolation === undefined) {
+    delete settings.codexTerminalServerIsolation
+    return settings
+  }
+  return { ...settings, codexTerminalServerIsolation: isolation }
+}
+
+async function ipcSpawnEnv(
+  isolation: boolean | undefined,
+  connectionId: string | null
+): Promise<Record<string, string> | undefined> {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: buildPtyIpcSpawnOptions only reads the members stubbed here; the rest belong to later spawn stages this test never runs.
+  const deps = {
+    transitionSpawnHiddenRendererPtyDeliveryState: vi.fn(),
+    getSettings: () => settingsWith(isolation),
+    runtime: { registerPreAllocatedHandleForPty: vi.fn() }
+  } as unknown as PtySpawnIpcDeps
+  const ctx = createPtyIpcSpawnState(deps, { cols: 80, rows: 24, connectionId })
+  ctx.env = { KEEP: '1' }
+  await buildPtyIpcSpawnOptions(ctx)
+  return ctx.spawnOptions.env
+}
+
+async function runtimeSpawnEnv(
+  isolation: boolean | undefined,
+  connectionId: string | null
+): Promise<Record<string, string> | undefined> {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: buildRuntimePtySpawnOptions only reads getSettings here; the rest belong to later spawn stages this test never runs.
+  const deps = { getSettings: () => settingsWith(isolation) } as unknown as PtyRuntimeControllerDeps
+  const ctx = createRuntimePtySpawnState(deps, { cols: 80, rows: 24, connectionId })
+  ctx.env = { KEEP: '1' }
+  await buildRuntimePtySpawnOptions(ctx)
+  return ctx.spawnOptions.env
+}
+
+// Why both hosts: SSH panes reach the relay with this env untouched, local ones reach
+// node-pty or the daemon; WSL forwarding is covered by wsl-orca-env.test.ts.
+describe.each([
+  ['renderer spawn', ipcSpawnEnv],
+  ['runtime spawn', runtimeSpawnEnv]
+])('%s: Codex terminal server isolation', (_name, spawnEnv) => {
+  it.each([null, 'ssh-1'])(
+    'injects nothing while the setting is on (connection %s)',
+    async (id) => {
+      expect(await spawnEnv(true, id)).toEqual({ KEEP: '1' })
+      expect(await spawnEnv(undefined, id)).toEqual({ KEEP: '1' })
+    }
+  )
+
+  it.each([null, 'ssh-1'])(
+    'opts new terminals out with ORCA_CODEX_ISOLATE=0 when off (connection %s)',
+    async (id) => {
+      expect(await spawnEnv(false, id)).toEqual({ KEEP: '1', ORCA_CODEX_ISOLATE: '0' })
+    }
+  )
+})
diff --git a/src/main/ipc/pty/ipc/spawn-options.ts b/src/main/ipc/pty/ipc/spawn-options.ts
index a2adf48771b6..66beb5aa05e8 100644
--- a/src/main/ipc/pty/ipc/spawn-options.ts
+++ b/src/main/ipc/pty/ipc/spawn-options.ts
@@ -1,3 +1,5 @@
+import { getAppEnvironment } from '../../../../shared/app-environment'
+import { getLegacyOpenCodeEnvKeysToDelete } from '../../../opencode/legacy-shared-config-dir'
 import { isTuiAgent } from '../../../../shared/tui-agent-config'
 import { CLAUDE_AUTH_ENV_VARS } from '../../../claude-accounts/environment'
 import { LEGACY_TERMINAL_SHIM_REMOTE_ENV_KEYS } from '../../../pty/legacy-terminal-shim-dir'
@@ -7,7 +9,7 @@ import {
   mergePtyEnvDeletions,
   removeCodexHomeDeletionRequests,
   getInheritedAgentHookEnvKeysToDelete,
-  getInheritedClaudeSessionStampEnvKeysToDelete
+  getInheritedAgentSessionStampEnvKeysToDelete
 } from '../host-env/pi-agent'
 import { promoteAgentTeamsShimPath, deleteRequestedEnvKeys } from '../host-env/path'
 import { beginPtySpawnForWorktree } from '../host-env/fresh-spawn-routing'
@@ -21,6 +23,8 @@ import { ptySizes } from '../delivery/visibility-state'
 import { shouldSeedPreAttachPtySize } from '../delivery/attached-pty-size'
 import { getStartupTerminalIngressIntent } from '../../terminal-startup-color-query-replies'
 import { resolveConfiguredTerminalShellArgs } from '../configured-terminal-shell-args'
+import { withCodexTerminalServerIsolationEnv } from '../../../../shared/codex-terminal-server-isolation'
+import { planCodexNoDaemonLaunch } from '../../../pty/codex-no-daemon-launch-command'
 import type { PtyIpcSpawnState } from './spawn-state'
 
 /** Carries deletions to provider-owned environments, including persistent older daemons. */
@@ -28,9 +32,11 @@ export async function buildPtyIpcSpawnOptions(
   ctx: PtyIpcSpawnState
 ): Promise<{ isReattach: true } | null> {
   const args = ctx.args
-  ctx.spawnEnv = ctx.preAllocatedHandle
-    ? { ...ctx.env, ORCA_TERMINAL_HANDLE: ctx.preAllocatedHandle }
-    : ctx.env
+  // Why here: every provider (local, daemon, SSH relay, WSL) spawns from this env.
+  ctx.spawnEnv = withCodexTerminalServerIsolationEnv(
+    ctx.preAllocatedHandle ? { ...ctx.env, ORCA_TERMINAL_HANDLE: ctx.preAllocatedHandle } : ctx.env,
+    ctx.deps.getSettings?.()
+  )
   const envToDelete = ctx.claudeAuth?.stripAuthEnv
     ? [...CLAUDE_AUTH_ENV_VARS, 'ANTHROPIC_CUSTOM_HEADERS']
     : undefined
@@ -43,7 +49,11 @@ export async function buildPtyIpcSpawnOptions(
     // Why: disable old hosts without removing ORCA_REAL_* while their Windows shim remains on PATH.
     ctx.isDaemonHostSpawn || args.connectionId ? LEGACY_TERMINAL_SHIM_REMOTE_ENV_KEYS : [],
     ctx.isDaemonHostSpawn ? getInheritedAgentHookEnvKeysToDelete(ctx.spawnEnv) : [],
-    getInheritedClaudeSessionStampEnvKeysToDelete(ctx.spawnEnv),
+    // The daemon must judge its own inherited value; main may have a different config.
+    !args.connectionId && !ctx.isDaemonHostSpawn
+      ? getLegacyOpenCodeEnvKeysToDelete(ctx.spawnEnv, getAppEnvironment().getPath('userData'))
+      : [],
+    getInheritedAgentSessionStampEnvKeysToDelete(ctx.spawnEnv),
     ctx.skipCodexHomeEnv ? CODEX_HOME_ENV_KEYS : [],
     // Why: the persistent daemon compares its own merged CODEX_HOME pair;
     // main cannot safely decide ownership for a process it may not parent.
@@ -71,8 +81,17 @@ export async function buildPtyIpcSpawnOptions(
   if (ctx.combinedEnvToDelete) {
     ctx.spawnOptions.envToDelete = ctx.combinedEnvToDelete
   }
-  if (ctx.launchCommand !== undefined) {
-    ctx.spawnOptions.command = ctx.launchCommand
+  const noDaemonLaunch = planCodexNoDaemonLaunch({
+    command: ctx.launchCommand,
+    executesOnThisHost: !args.connectionId && ctx.codexSelectionTarget.runtime !== 'wsl',
+    shellOverride: ctx.effectiveShellOverride,
+    env: ctx.spawnEnv,
+    envToDelete: ctx.combinedEnvToDelete,
+    cwd: ctx.cwd
+  })
+  const launchCommand = noDaemonLaunch ? await noDaemonLaunch : ctx.launchCommand
+  if (launchCommand !== undefined) {
+    ctx.spawnOptions.command = launchCommand
   }
   if (args.commandDelivery !== undefined) {
     ctx.spawnOptions.commandDelivery = args.commandDelivery
diff --git a/src/main/ipc/pty/ipc/write-input-chunk-yield.test.ts b/src/main/ipc/pty/ipc/write-input-chunk-yield.test.ts
index ceeb5127b7df..4afd2b008f17 100644
--- a/src/main/ipc/pty/ipc/write-input-chunk-yield.test.ts
+++ b/src/main/ipc/pty/ipc/write-input-chunk-yield.test.ts
@@ -68,7 +68,7 @@ describe('chunked pty write yield', () => {
     }) as typeof setImmediate)
 
     const outcome = await Promise.race([
-      createWriteInput()({ id: PTY_ID, data: THREE_CHUNK_INPUT }),
+      createWriteInput()({ inputKind: 'driving', id: PTY_ID, data: THREE_CHUNK_INPUT }),
       afterImmediateTurns(50)
     ])
 
@@ -88,6 +88,7 @@ describe('chunked pty write yield', () => {
     const immediate = vi.spyOn(globalThis, 'setImmediate')
 
     const outcome = createWriteInput()({
+      inputKind: 'driving',
       id: PTY_ID,
       data: 'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES)
     })
diff --git a/src/main/ipc/pty/ipc/write-input-user-input.test.ts b/src/main/ipc/pty/ipc/write-input-user-input.test.ts
new file mode 100644
index 000000000000..d4f20f00a680
--- /dev/null
+++ b/src/main/ipc/pty/ipc/write-input-user-input.test.ts
@@ -0,0 +1,63 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { TerminalRunFactsRegister } from '../../../runtime/terminal-run-facts'
+import { ptyOwnership } from '../provider/ownership-state'
+import { createPtyWriteInput } from './write-input'
+
+const PTY_ID = 'pty-user-input'
+
+const { provider } = vi.hoisted(() => ({
+  provider: { write: vi.fn(), hasPty: vi.fn(() => true) }
+}))
+
+vi.mock('../provider/registry', () => ({
+  tryGetProviderForPty: (id: string) => (id === PTY_ID ? provider : undefined)
+}))
+
+function createWriteInput(facts: TerminalRunFactsRegister) {
+  const runtime = { getDriver: () => ({ kind: 'desktop' }), terminalRunFacts: facts }
+  const mainWindow = { isDestroyed: () => false, webContents: { send: vi.fn() } }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: write input reads only getDriver and terminalRunFacts from the runtime, and isDestroyed/webContents from the window.
+  return createPtyWriteInput({ mainWindow: mainWindow as never, runtime: runtime as never })
+}
+
+beforeEach(() => {
+  ptyOwnership.set(PTY_ID, null)
+  provider.write.mockReset()
+})
+
+afterEach(() => {
+  ptyOwnership.delete(PTY_ID)
+})
+
+describe('renderer PTY writes: input kind', () => {
+  it.each(['writePtyInput', 'writePtyInputAccepted'] as const)(
+    '%s records driving input before the provider write',
+    async (writer) => {
+      const facts = new TerminalRunFactsRegister()
+      facts.recordSpawnCommit({ id: PTY_ID, incarnationId: 'inc-1' })
+      const recordedAtWrite: (number | null)[] = []
+      provider.write.mockImplementation(() => {
+        recordedAtWrite.push(facts.read(PTY_ID, 'inc-1').firstUserInputAt)
+      })
+
+      await createWriteInput(facts)[writer]({ id: PTY_ID, data: 'exit\r', inputKind: 'driving' })
+
+      expect(recordedAtWrite).toEqual([expect.any(Number)])
+    }
+  )
+
+  it.each([
+    ['a launch write', 'launch', 'echo startup\r'],
+    ['a query reply', 'query-reply', '\x1b[3;4R'],
+    ['a driving write that is only a reply', 'driving', '\x1b[3;4R'],
+    ['a driving write that is only focus reports', 'driving', '\x1b[I\x1b[O']
+  ] as const)('records nothing for %s', async (_label, inputKind, data) => {
+    const facts = new TerminalRunFactsRegister()
+    facts.recordSpawnCommit({ id: PTY_ID, incarnationId: 'inc-1' })
+
+    await createWriteInput(facts).writePtyInput({ id: PTY_ID, data, inputKind })
+
+    expect(provider.write).toHaveBeenCalledOnce()
+    expect(facts.read(PTY_ID, 'inc-1').firstUserInputAt).toBeNull()
+  })
+})
diff --git a/src/main/ipc/pty/ipc/write-input.ts b/src/main/ipc/pty/ipc/write-input.ts
index aa14ffe2f0fa..df682b6fd50b 100644
--- a/src/main/ipc/pty/ipc/write-input.ts
+++ b/src/main/ipc/pty/ipc/write-input.ts
@@ -10,6 +10,7 @@ import {
 } from '../../../../shared/terminal-input'
 import { ptyOwnership } from '../provider/ownership-state'
 import { tryGetProviderForPty } from '../provider/registry'
+import type { TerminalInputKind } from '../../../../shared/terminal-input-kind'
 import { interactiveOutputCharsByPty, lastInputAtByPty } from '../delivery/visibility-state'
 
 export function isMainWindowPtyIpcEvent(
@@ -26,7 +27,7 @@ export function isMainWindowPtyIpcEvent(
   )
 }
 
-export type PtyWritePayload = { id: string; data: string }
+export type PtyWritePayload = { id: string; data: string; inputKind: TerminalInputKind }
 export type PtyViewportClaimPayload = { id: string; cols: number; rows: number }
 
 export function createPtyWriteInput(deps: {
@@ -206,6 +207,12 @@ export function createPtyWriteInput(deps: {
   const isPtyWriteEventFromMainWindow = (event: IpcMainEvent | IpcMainInvokeEvent): boolean =>
     isMainWindowPtyIpcEvent(event, mainWindow)
 
+  const noteRendererPtyInput = (args: PtyWritePayload): void => {
+    lastInputAtByPty.set(args.id, performance.now())
+    interactiveOutputCharsByPty.set(args.id, 0)
+    runtime?.terminalRunFacts?.recordInput(args.id, args.inputKind, args.data)
+  }
+
   const writePtyInput = (args: PtyWritePayload): boolean | Promise<boolean> => {
     // Why: mobile-presence-lock defense-in-depth — the renderer's onData guard can let one keystroke slip during the state-flip lag, so catch it server-side. See docs/mobile-presence-lock.md.
     if (runtime?.getDriver(args.id).kind === 'mobile') {
@@ -216,9 +223,7 @@ export function createPtyWriteInput(deps: {
       return false
     }
     try {
-      const now = performance.now()
-      lastInputAtByPty.set(args.id, now)
-      interactiveOutputCharsByPty.set(args.id, 0)
+      noteRendererPtyInput(args)
       return writePtyProviderInput(provider, args.id, args.data)
     } catch {
       return false
@@ -238,9 +243,7 @@ export function createPtyWriteInput(deps: {
       return false
     }
     try {
-      const now = performance.now()
-      lastInputAtByPty.set(args.id, now)
-      interactiveOutputCharsByPty.set(args.id, 0)
+      noteRendererPtyInput(args)
       return writePtyProviderInputAcknowledged(provider, args.id, args.data)
     } catch {
       return false
@@ -260,9 +263,7 @@ export function createPtyWriteInput(deps: {
       return false
     }
     try {
-      const now = performance.now()
-      lastInputAtByPty.set(args.id, now)
-      interactiveOutputCharsByPty.set(args.id, 0)
+      noteRendererPtyInput(args)
       return writePtyProviderInput(provider, args.id, args.data)
     } catch {
       return false
diff --git a/src/main/ipc/pty/opencode-legacy-spawn-deletions.test.ts b/src/main/ipc/pty/opencode-legacy-spawn-deletions.test.ts
new file mode 100644
index 000000000000..1c7203ab0467
--- /dev/null
+++ b/src/main/ipc/pty/opencode-legacy-spawn-deletions.test.ts
@@ -0,0 +1,64 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { join } from 'node:path'
+import { createDaemonPtyEnvironment } from '../../daemon/pty-subprocess/spawn-environment'
+import { getAppEnvironment } from '../../../shared/app-environment'
+import { buildPtyIpcSpawnOptions } from './ipc/spawn-options'
+import { createPtyIpcSpawnState } from './ipc/spawn-state'
+import type { PtySpawnIpcDeps } from './ipc/spawn-types'
+import { buildRuntimePtySpawnOptions } from './runtime/spawn-options'
+import { createRuntimePtySpawnState } from './runtime/spawn-state'
+import type { PtyRuntimeControllerDeps } from './runtime/controller-deps'
+
+afterEach(() => vi.unstubAllEnvs())
+
+describe.each(['renderer', 'runtime'])('%s retired OpenCode environment deletion', (route) => {
+  it.each([
+    { connectionId: undefined, daemon: false, explicit: undefined, deleted: true },
+    { connectionId: undefined, daemon: true, explicit: undefined, deleted: false },
+    { connectionId: undefined, daemon: true, explicit: '/user/config', deleted: false },
+    { connectionId: 'ssh-host', daemon: false, explicit: undefined, deleted: false }
+  ])(
+    'respects explicit=$explicit, daemon=$daemon, and connection=$connectionId',
+    async ({ connectionId, daemon, explicit, deleted }) => {
+      const legacy = join(getAppEnvironment().getPath('userData'), 'opencode-hooks', 'shared')
+      vi.stubEnv('OPENCODE_CONFIG_DIR', legacy)
+      const args = { cols: 80, rows: 24, connectionId }
+      const env: Record<string, string> = explicit ? { OPENCODE_CONFIG_DIR: explicit } : {}
+      let deletions: string[] | undefined
+      if (route === 'renderer') {
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this option-only path reads no required dependency methods with no worktree or hidden pane.
+        const ctx = createPtyIpcSpawnState({} as PtySpawnIpcDeps, args)
+        ctx.env = env
+        ctx.isDaemonHostSpawn = daemon
+        await buildPtyIpcSpawnOptions(ctx)
+        deletions = ctx.spawnOptions.envToDelete
+        ctx.finishTerminalInstall()
+      } else {
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this option-only path reads no required dependency methods with no worktree or hidden pane.
+        const ctx = createRuntimePtySpawnState({} as PtyRuntimeControllerDeps, args)
+        ctx.env = env
+        ctx.isDaemonHostSpawn = daemon
+        await buildRuntimePtySpawnOptions(ctx)
+        deletions = ctx.spawnOptions.envToDelete
+        ctx.finishTerminalInstall()
+      }
+      expect(deletions?.includes('OPENCODE_CONFIG_DIR') ?? false).toBe(deleted)
+      expect(env.OPENCODE_CONFIG_DIR).toBe(explicit)
+      if (daemon) {
+        vi.stubEnv('ORCA_USER_DATA_PATH', getAppEnvironment().getPath('userData'))
+        for (const inherited of [legacy, '/daemon/user-config']) {
+          vi.stubEnv('OPENCODE_CONFIG_DIR', inherited)
+          const request = { sessionId: 'pane', cols: 80, rows: 24, env, envToDelete: deletions }
+          const result = createDaemonPtyEnvironment(request)
+          expect(result.OPENCODE_CONFIG_DIR).toBe(
+            explicit ?? (inherited === legacy ? undefined : inherited)
+          )
+          expect(
+            createDaemonPtyEnvironment({ ...request, envToDelete: ['OPENCODE_CONFIG_DIR'] })
+              .OPENCODE_CONFIG_DIR
+          ).toBeUndefined()
+        }
+      }
+    }
+  )
+})
diff --git a/src/main/ipc/pty/provider/local-configure.ts b/src/main/ipc/pty/provider/local-configure.ts
index bf07eddf0bbb..7777863ad81d 100644
--- a/src/main/ipc/pty/provider/local-configure.ts
+++ b/src/main/ipc/pty/provider/local-configure.ts
@@ -14,7 +14,6 @@ import { markClaudePtyExited } from '../../../claude-accounts/live-pty-gate'
 import { buildPtyHostEnv } from '../host-env/assembly'
 import {
   getCompatibleSelectedCodexHomePath,
-  isCodexStatusHooksEnabled,
   shouldStripInheritedOrcaCodexHome
 } from '../host-env/codex-home'
 import type { GetSelectedCodexHomePath } from '../host-env/types'
@@ -89,7 +88,6 @@ export function configureLocalPtyProvider(args: {
         wslDistro: ctx?.wslDistro ?? null,
         agentStatusHooksEnabled: isAgentStatusHooksEnabled(ptySettings),
         disabledTuiAgents: ptySettings?.disabledTuiAgents,
-        codexStatusHooksEnabled: isCodexStatusHooksEnabled(ptySettings),
         networkProxySettings: ptySettings,
         routeBrowserOpensToClient: runtime?.shouldRelayTerminalBrowserOpens?.()
       })
diff --git a/src/main/ipc/pty/pty-spawn-shell-override-parity.test.ts b/src/main/ipc/pty/pty-spawn-shell-override-parity.test.ts
deleted file mode 100644
index 67bee9ca7007..000000000000
--- a/src/main/ipc/pty/pty-spawn-shell-override-parity.test.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-/**
- * The two spawn preflights are twins: one serves renderer/IPC spawns, the other serves runtime
- * spawns (`terminal.create` from the CLI, headless serve, and paired remote environments). They
- * had drifted — the runtime twin passed a literal `undefined` for the caller's shell, so on a
- * Windows host a runtime-created terminal could only ever be the host's default shell. A caller
- * asking for cmd or PowerShell had to send it as `command`, which the provider TYPES into that
- * default shell: the pty stayed the default shell with the requested one running inside it, and
- * leaving that child dropped the caller's handle back onto a prompt it never asked for.
- *
- * Source-level because the functional seam is a whole spawn pipeline; what actually regressed is
- * one twin silently not reading a field the other reads.
- */
-const PREFLIGHTS = ['ipc', 'runtime'] as const
-
-describe.each(PREFLIGHTS)('%s pty spawn preflight', (lane) => {
-  const source = readFileSync(join(__dirname, lane, 'spawn-preflight.ts'), 'utf8')
-
-  it("resolves Windows terminal runtime options from the caller's requested shell", () => {
-    expect(source).toContain('requestedShellOverride: args.shellOverride')
-    expect(source).not.toContain('requestedShellOverride: undefined')
-  })
-})
diff --git a/src/main/ipc/pty/register-handlers.ts b/src/main/ipc/pty/register-handlers.ts
index b58f8d206087..3a1e198adb06 100644
--- a/src/main/ipc/pty/register-handlers.ts
+++ b/src/main/ipc/pty/register-handlers.ts
@@ -17,7 +17,6 @@ import {
   stopReplacedPanePty,
   type PtyKillIpcDeps
 } from './ipc/renderer-kill'
-import { markReplacedPtyStop } from './delivery/exit'
 import { installPtyWriteIpcHandlers } from './ipc/write'
 import { installPtySpawnIpcHandler } from './ipc/spawn'
 import { installPtyRuntimeController } from './runtime/controller'
@@ -238,7 +237,6 @@ export function registerPtyHandlers(
     options,
     trustedTerminalHandleEnv: session.trustedTerminalHandleEnv,
     retiredRejectedPtyIds: session.retiredRejectedPtyIds,
-    reversibleStopOwnersByPtyId: session.reversibleStopOwnersByPtyId,
     mainWindow,
     transitionSpawnHiddenRendererPtyDeliveryState:
       session.transitionSpawnHiddenRendererPtyDeliveryState,
@@ -276,8 +274,7 @@ export function registerPtyHandlers(
     trustedTerminalHandleEnv: session.trustedTerminalHandleEnv,
     sendPtySpawnedToRenderer: session.sendPtySpawnedToRenderer,
     syncPtyBackgroundedDelivery: session.syncPtyBackgroundedDelivery,
-    stopReplacedPty: (id) =>
-      stopReplacedPanePty(killDeps, id, (ptyId) => markReplacedPtyStop(session, ptyId))
+    stopReplacedPty: (id) => stopReplacedPanePty(killDeps, id)
   })
   installPtyWriteIpcHandlers({ mainWindow, runtime })
   installPtyResizeVisibilityIpc(session)
diff --git a/src/main/ipc/pty/register-without-renderer.test.ts b/src/main/ipc/pty/register-without-renderer.test.ts
index 513d969f1108..a5d19f020fc0 100644
--- a/src/main/ipc/pty/register-without-renderer.test.ts
+++ b/src/main/ipc/pty/register-without-renderer.test.ts
@@ -128,8 +128,8 @@ describe('PTY registration without renderer delivery', () => {
       throw new Error('missing runtime PTY controller')
     }
 
-    expect(controller.write('daemon-pty', 'local input')).toBe(true)
-    expect(controller.write(remoteId, 'remote input')).toBe(true)
+    expect(controller.write('daemon-pty', 'local input', 'driving')).toBe(true)
+    expect(controller.write(remoteId, 'remote input', 'driving')).toBe(true)
     await controller.clearBuffer?.('daemon-pty')
     await controller.clearBuffer?.(remoteId)
     await expect(controller.attach?.('daemon-pty')).resolves.toBe(true)
@@ -147,7 +147,7 @@ describe('PTY registration without renderer delivery', () => {
     expect(attach).toHaveBeenCalledExactlyOnceWith('daemon-pty')
 
     unregisterSshPtyProvider('ssh-a')
-    expect(controller.write(remoteId, 'disconnected input')).toBe(false)
+    expect(controller.write(remoteId, 'disconnected input', 'driving')).toBe(false)
     await expect(controller.probePtyLiveness?.(remoteId)).resolves.toBeNull()
     expect(local.write).toHaveBeenCalledTimes(1)
   })
diff --git a/src/main/ipc/pty/runtime/controller-deps.ts b/src/main/ipc/pty/runtime/controller-deps.ts
index 8f20245505ca..e1bfd5d7f104 100644
--- a/src/main/ipc/pty/runtime/controller-deps.ts
+++ b/src/main/ipc/pty/runtime/controller-deps.ts
@@ -82,7 +82,6 @@ export type PtyRuntimeControllerDeps = {
   }
   trustedTerminalHandleEnv: Set<string>
   retiredRejectedPtyIds: Map<string, NodeJS.Timeout>
-  reversibleStopOwnersByPtyId: Map<string, number>
   mainWindow?: PtyRendererDelivery
   transitionSpawnHiddenRendererPtyDeliveryState?: (id: string, hidden: boolean) => void
   syncPtyBackgroundedDelivery?: (id: string, caller: string) => void
diff --git a/src/main/ipc/pty/runtime/controller.ts b/src/main/ipc/pty/runtime/controller.ts
index 8512bc7c16bc..4013e06e37fa 100644
--- a/src/main/ipc/pty/runtime/controller.ts
+++ b/src/main/ipc/pty/runtime/controller.ts
@@ -4,13 +4,13 @@ import type { PtyRuntimeControllerDeps } from './controller-deps'
 import { spawnPtyFromRuntimeController } from './spawn'
 import {
   killPtyFromRuntimeController,
-  markReversibleStopsFromRuntimeController,
   retireRejectedPtyFromRuntimeController,
   stopAndWaitPtyFromRuntimeController
 } from './kill'
 import {
   attachPtyFromRuntimeController,
   clearBufferFromRuntimeController,
+  resetInputModesFromRuntimeController,
   confirmForegroundProcessFromRuntimeController,
   confirmShellForegroundFromRuntimeController,
   getCwdFromRuntimeController,
@@ -27,6 +27,7 @@ import {
   waitForRendererSerializerFromRuntimeController,
   writePtyFromRuntimeController
 } from './operations'
+import { recordUnconfirmedExplicitSshStop } from './undelivered-ssh-kill'
 import { supportsForegroundProcessEvidenceFromRuntimeController } from './foreground-process-evidence-capability'
 import {
   listProcessesFromRuntimeController,
@@ -44,9 +45,9 @@ export function installPtyRuntimeController(deps: PtyRuntimeControllerDeps): voi
     },
     adoptStablePane,
     spawn: async (args) => spawnPtyFromRuntimeController(deps, args),
-    write: (ptyId, data) => writePtyFromRuntimeController(ptyId, data),
-    writeWithSettlement: (ptyId, data) =>
-      writePtyFromRuntimeController(ptyId, data, { waitForSettlement: true }),
+    write: (ptyId, data, inputKind) => writePtyFromRuntimeController(deps, ptyId, data, inputKind),
+    writeWithSettlement: (ptyId, data, inputKind) =>
+      writePtyFromRuntimeController(deps, ptyId, data, inputKind, { waitForSettlement: true }),
     probePtyLiveness: (ptyId) => probePtyLivenessFromRuntimeController(deps, ptyId),
     // Why: subscriber-driven ingestion for daemon sessions no renderer pane
     // ever attached. Local daemon sessions only — SSH panes have their own
@@ -56,8 +57,13 @@ export function installPtyRuntimeController(deps: PtyRuntimeControllerDeps): voi
     kill: (ptyId) => killPtyFromRuntimeController(deps, ptyId),
     retireRejectedPty: (ptyId, stopConfirmed) =>
       retireRejectedPtyFromRuntimeController(deps, ptyId, stopConfirmed),
-    markReversibleStops: (ptyIds) => markReversibleStopsFromRuntimeController(deps, ptyIds),
     stopAndWait: (ptyId, opts) => stopAndWaitPtyFromRuntimeController(deps, ptyId, opts),
+    recordUnconfirmedStop: (ptyId) =>
+      recordUnconfirmedExplicitSshStop({
+        store: deps.store,
+        ptyId,
+        reversible: runtime?.intentionalPtyStops?.isReversibleStopInFlight(ptyId) ?? false
+      }),
     getForegroundProcess: (ptyId) => getForegroundProcessFromRuntimeController(ptyId),
     inspectProcess: (ptyId, options) => inspectProcessFromRuntimeController(ptyId, options),
     confirmForegroundProcess: (ptyId) => confirmForegroundProcessFromRuntimeController(ptyId),
@@ -65,6 +71,7 @@ export function installPtyRuntimeController(deps: PtyRuntimeControllerDeps): voi
     getCwd: (ptyId) => getCwdFromRuntimeController(ptyId),
     hasChildProcesses: (ptyId) => hasChildProcessesFromRuntimeController(ptyId),
     clearBuffer: (ptyId) => clearBufferFromRuntimeController(deps, ptyId),
+    resetInputModes: (ptyId) => resetInputModesFromRuntimeController(deps, ptyId),
     hasPty: (ptyId) => hasPtyFromRuntimeController(deps, ptyId),
     listProcesses: (connectionId, opts) =>
       listProcessesFromRuntimeController(deps, connectionId, opts),
diff --git a/src/main/ipc/pty/runtime/kill.ts b/src/main/ipc/pty/runtime/kill.ts
index 98bdc1e97aef..edbd12b0b182 100644
--- a/src/main/ipc/pty/runtime/kill.ts
+++ b/src/main/ipc/pty/runtime/kill.ts
@@ -19,8 +19,7 @@ export function killPtyFromRuntimeController(
     rememberSyntheticKillExit,
     sendPtyExitToRenderer,
     finishPtyShutdown,
-    retiredRejectedPtyIds,
-    reversibleStopOwnersByPtyId
+    retiredRejectedPtyIds
   } = deps
   runtime?.markPtyStopRequested?.(ptyId)
   let connectionId: string | null | undefined = ptyOwnership.get(ptyId)
@@ -31,7 +30,7 @@ export function killPtyFromRuntimeController(
       store,
       ptyId,
       connectionId,
-      reversible: reversibleStopOwnersByPtyId.has(ptyId),
+      reversible: runtime?.intentionalPtyStops?.isReversibleStopInFlight(ptyId) ?? false,
       incarnationId
     })
   }
@@ -184,31 +183,6 @@ export function retireRejectedPtyFromRuntimeController(
   })
 }
 
-export function markReversibleStopsFromRuntimeController(
-  deps: PtyRuntimeControllerDeps,
-  ptyIds: readonly string[]
-): () => void {
-  const { reversibleStopOwnersByPtyId } = deps
-  for (const ptyId of ptyIds) {
-    reversibleStopOwnersByPtyId.set(ptyId, (reversibleStopOwnersByPtyId.get(ptyId) ?? 0) + 1)
-  }
-  let released = false
-  return () => {
-    if (released) {
-      return
-    }
-    released = true
-    for (const ptyId of ptyIds) {
-      const owners = (reversibleStopOwnersByPtyId.get(ptyId) ?? 0) - 1
-      if (owners > 0) {
-        reversibleStopOwnersByPtyId.set(ptyId, owners)
-      } else {
-        reversibleStopOwnersByPtyId.delete(ptyId)
-      }
-    }
-  }
-}
-
 /**
  * Deliberately records no undelivered-stop intent, unlike `killPtyFromRuntimeController`.
  *
diff --git a/src/main/ipc/pty/runtime/operations.ts b/src/main/ipc/pty/runtime/operations.ts
index f03892a6e31d..c555c0b31021 100644
--- a/src/main/ipc/pty/runtime/operations.ts
+++ b/src/main/ipc/pty/runtime/operations.ts
@@ -12,16 +12,28 @@ import {
   writeUnverifiable,
   type WriteSettlement
 } from '../../../../shared/pty-write-settlement'
+import type { TerminalInputKind } from '../../../../shared/terminal-input-kind'
 
-export function writePtyFromRuntimeController(ptyId: string, data: string): boolean
+type RuntimeWriteDeps = Pick<PtyRuntimeControllerDeps, 'runtime'>
+
+export function writePtyFromRuntimeController(
+  deps: RuntimeWriteDeps,
+  ptyId: string,
+  data: string,
+  inputKind: TerminalInputKind
+): boolean
 export function writePtyFromRuntimeController(
+  deps: RuntimeWriteDeps,
   ptyId: string,
   data: string,
+  inputKind: TerminalInputKind,
   options: { waitForSettlement: true }
 ): WriteSettlement | Promise<WriteSettlement>
 export function writePtyFromRuntimeController(
+  deps: RuntimeWriteDeps,
   ptyId: string,
   data: string,
+  inputKind: TerminalInputKind,
   options?: { waitForSettlement: true }
 ): boolean | WriteSettlement | Promise<WriteSettlement> {
   let provider: IPtyProvider
@@ -36,6 +48,7 @@ export function writePtyFromRuntimeController(
     if (!provider.writeWithSettlement) {
       return writeRefused('provider_cannot_settle')
     }
+    deps.runtime?.terminalRunFacts?.recordInput(ptyId, inputKind, data)
     try {
       return provider.writeWithSettlement(ptyId, data)
     } catch {
@@ -43,6 +56,7 @@ export function writePtyFromRuntimeController(
       return writeUnverifiable('provider_threw_after_handoff', true)
     }
   }
+  deps.runtime?.terminalRunFacts?.recordInput(ptyId, inputKind, data)
   try {
     return provider.write(ptyId, data) !== false
   } catch {
@@ -179,6 +193,21 @@ export async function clearBufferFromRuntimeController(
   }
 }
 
+export async function resetInputModesFromRuntimeController(
+  deps: PtyRuntimeControllerDeps,
+  ptyId: string
+): Promise<void> {
+  // Why: a remote client's reset must also ground this host window's view of the pane.
+  if (deps.mainWindow && !deps.mainWindow.isDestroyed()) {
+    deps.mainWindow.webContents.send('pty:resetInputModes:request', { ptyId })
+  }
+  try {
+    await getProviderForPty(ptyId).resetInputModes(ptyId)
+  } catch {
+    /* best effort: an older daemon or relay rejects the request */
+  }
+}
+
 const settledLocalPtyProviderStartups = new WeakSet<Promise<void>>()
 const watchedLocalPtyProviderStartups = new WeakSet<Promise<void>>()
 
diff --git a/src/main/ipc/pty/runtime/spawn-commit-run-facts.test.ts b/src/main/ipc/pty/runtime/spawn-commit-run-facts.test.ts
new file mode 100644
index 000000000000..5701b9f82c9d
--- /dev/null
+++ b/src/main/ipc/pty/runtime/spawn-commit-run-facts.test.ts
@@ -0,0 +1,147 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { OrcaRuntimeWithRuntimeId } from '../../../runtime/orca-runtime-runtime-id'
+import { TerminalIntentionalStops } from '../../../runtime/terminal-intentional-stops'
+import { TerminalRunFactsRegister } from '../../../runtime/terminal-run-facts'
+import { ptySizes } from '../delivery/visibility-state'
+import { ptyIncarnationById, ptyOwnership } from '../provider/ownership-state'
+import { commitRuntimePtySpawn } from './spawn-commit'
+import { createRuntimePtySpawnState, type RuntimePtySpawnArgs } from './spawn-state'
+import type { PtyRuntimeControllerDeps } from './controller-deps'
+
+const PTY_ID = 'orca-pty-run-facts'
+const INCARNATION_ID = 'inc-run-facts'
+
+const ADOPTED = {
+  disposition: 'adopted',
+  owner: {
+    claim: { kind: 'terminal' },
+    generation: 'g1',
+    phase: 'live',
+    ptyId: PTY_ID,
+    surface: { worktreeId: 'wt-1', tabId: 'tab-1', leafId: 'leaf-1', terminalHandle: 'h1' }
+  }
+}
+
+async function commit(
+  result: Record<string, unknown>,
+  facts = new TerminalRunFactsRegister(),
+  intentionalPtyStops = new TerminalIntentionalStops(),
+  prepare?: (ctx: ReturnType<typeof createRuntimePtySpawnState>) => void
+) {
+  const runtime = {
+    terminalRunFacts: facts,
+    intentionalPtyStops,
+    // Why the real method: the case under test is what the runtime does with each commit.
+    noteTerminalSpawnCommit: OrcaRuntimeWithRuntimeId.prototype.noteTerminalSpawnCommit,
+    registerPreAllocatedHandleForPty: vi.fn(),
+    registerPty: vi.fn(),
+    cancelPendingPtyRegistration: vi.fn(),
+    reflowHeadlessTerminalToPtyGrid: vi.fn(),
+    seedHeadlessTerminal: vi.fn(),
+    noteTerminalSpawnCommand: vi.fn()
+  }
+  const ports = { runtime, store: undefined, options: {}, sendPtySpawnedToRenderer: vi.fn() }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the commit reads only the ports above; store-less deps skip every persistence branch.
+  const deps = ports as unknown as PtyRuntimeControllerDeps
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a worktree-less spawn needs only its grid.
+  const args = { cols: 120, rows: 40 } as unknown as RuntimePtySpawnArgs
+  const ctx = createRuntimePtySpawnState(deps, args)
+  const spawned = { id: PTY_ID, incarnationId: INCARNATION_ID, ...result }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: each case sets the spawn-result fields the commit reads.
+  ctx.result = spawned as unknown as typeof ctx.result
+  prepare?.(ctx)
+  await commitRuntimePtySpawn(ctx)
+  return facts.read(PTY_ID, INCARNATION_ID)
+}
+
+describe('runtime spawn commit: run facts', () => {
+  afterEach(() => {
+    ptySizes.delete(PTY_ID)
+    ptyOwnership.delete(PTY_ID)
+    ptyIncarnationById.delete(PTY_ID)
+  })
+
+  it('records a new process as a fresh spawn', async () => {
+    expect((await commit({})).freshSpawn).toBe(true)
+  })
+
+  it('never reads an SSH adoption that omits isReattach as fresh', async () => {
+    expect((await commit({ agentSessionEnsure: ADOPTED })).freshSpawn).toBe(false)
+  })
+
+  it('never reads a cold restore as fresh', async () => {
+    const coldRestore = { scrollback: 'prior output', cwd: '/tmp' }
+
+    expect((await commit({ coldRestore })).freshSpawn).toBe(false)
+  })
+
+  it('keeps a process run facts when the same incarnation commits again', async () => {
+    const facts = new TerminalRunFactsRegister()
+    await commit({}, facts)
+    facts.recordInput(PTY_ID, 'driving', 'ls\r', 100)
+
+    expect(await commit({ isReattach: true }, facts)).toEqual({
+      freshSpawn: true,
+      firstUserInputAt: 100
+    })
+  })
+
+  it.each([
+    { spawn: 'new process', result: {} },
+    { spawn: 'adoption', result: { agentSessionEnsure: ADOPTED } }
+  ])('lets a committed $spawn supersede a landed stop that no exit pinned', async ({ result }) => {
+    const stops = new TerminalIntentionalStops()
+    stops.mark(PTY_ID, 'reversible', null)(true)
+
+    await commit(result, new TerminalRunFactsRegister(), stops)
+
+    expect(stops.claimExit(PTY_ID, INCARNATION_ID)).toEqual([])
+  })
+
+  it('records nothing for a spawn discarded because its binding save failed', async () => {
+    const facts = new TerminalRunFactsRegister()
+    const stops = new TerminalIntentionalStops()
+    stops.mark(PTY_ID, 'reversible', null)(true)
+    const persistPtyBinding = vi.fn().mockRejectedValue(new Error('disk full'))
+
+    await expect(
+      commit({}, facts, stops, (ctx) => {
+        ctx.provider = { ...ctx.provider, shutdown: vi.fn().mockResolvedValue(undefined) }
+        ctx.hostSessionBinding = {
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the commit calls only persistPtyBinding on this store.
+          store: { persistPtyBinding } as unknown as NonNullable<
+            typeof ctx.hostSessionBinding
+          >['store'],
+          worktreeId: 'wt-1',
+          tabId: 'tab-1',
+          leafId: 'leaf-1'
+        }
+      })
+    ).rejects.toThrow()
+
+    expect(persistPtyBinding).toHaveBeenCalledOnce()
+    expect(facts.read(PTY_ID, INCARNATION_ID).freshSpawn).toBe(false)
+    expect(stops.claimExit(PTY_ID, INCARNATION_ID)).toEqual(['reversible'])
+  })
+
+  it.each([
+    { spawn: 'new process', result: {} },
+    { spawn: 'adoption', result: { agentSessionEnsure: ADOPTED } }
+  ])('records nothing for a $spawn that exited during start', async ({ result }) => {
+    const facts = new TerminalRunFactsRegister()
+    const stops = new TerminalIntentionalStops()
+    stops.mark(PTY_ID, 'reversible', null)(true)
+
+    await expect(
+      commit(result, facts, stops, (ctx) => {
+        ctx.args.worktreeId = 'wt-1'
+        ctx.deps.runtime!.registerPty = vi.fn(() => {
+          throw new Error('agent_session_exited_during_start')
+        })
+      })
+    ).rejects.toThrow('agent_session_exited_during_start')
+
+    expect(facts.read(PTY_ID, INCARNATION_ID).freshSpawn).toBe(false)
+    expect(stops.claimExit(PTY_ID, INCARNATION_ID)).toEqual(['reversible'])
+  })
+})
diff --git a/src/main/ipc/pty/runtime/spawn-commit.ts b/src/main/ipc/pty/runtime/spawn-commit.ts
index 856039e7d5a3..f326200cabc9 100644
--- a/src/main/ipc/pty/runtime/spawn-commit.ts
+++ b/src/main/ipc/pty/runtime/spawn-commit.ts
@@ -66,7 +66,7 @@ export async function commitRuntimePtySpawn(ctx: RuntimePtySpawnState) {
       throw error
     }
     console.error('[pty] failed to persist runtime PTY binding after attach:', error)
-    throw Object.assign(new Error(createTerminalSessionStateSaveFailureMessage()), {
+    throw Object.assign(new Error(createTerminalSessionStateSaveFailureMessage(error)), {
       agentSessionOperationOutcome: 'unknown' as const
     })
   }
@@ -92,6 +92,11 @@ export async function commitRuntimePtySpawn(ctx: RuntimePtySpawnState) {
     if (rejectedRegistration) {
       await rejectedRegistration
     }
+    // Why here: an adoption returns before the commit site below.
+    ctx.deps.runtime?.noteTerminalSpawnCommit?.(
+      ctx.result,
+      ctx.hostSessionBinding?.expectedSourceBinding
+    )
     ptyOwnership.set(ctx.result.id, args.connectionId ?? ptyOwnership.get(ctx.result.id) ?? null)
     ctx.deps.runtime?.registerPreAllocatedHandleForPty(ctx.result.id, owner.surface.terminalHandle)
     if (ctx.result.incarnationId) {
@@ -151,7 +156,7 @@ export async function commitRuntimePtySpawn(ctx: RuntimePtySpawnState) {
       if (err instanceof Error && err.message === 'terminal_split_source_not_found') {
         throw err
       }
-      throw Object.assign(new Error(createTerminalSessionStateSaveFailureMessage()), {
+      throw Object.assign(new Error(createTerminalSessionStateSaveFailureMessage(err)), {
         agentSessionOperationOutcome: 'unknown' as const
       })
     }
@@ -187,6 +192,12 @@ export async function commitRuntimePtySpawn(ctx: RuntimePtySpawnState) {
     // Why: non-worktree PTYs have no later surface-registration phase to clear admission intent.
     ctx.deps.runtime?.cancelPendingPtyRegistration?.(ctx.result.id, ctx.result.incarnationId)
   }
+  // Why after registration: a spawn discarded for a failed save or rejected for exiting during
+  // start must not record facts or end a stop.
+  ctx.deps.runtime?.noteTerminalSpawnCommit?.(
+    ctx.result,
+    ctx.hostSessionBinding?.expectedSourceBinding
+  )
   if (args.preAllocatedHandle && !ctx.stablePaneOwner?.handle) {
     ctx.deps.runtime?.registerPreAllocatedHandleForPty(ctx.result.id, args.preAllocatedHandle)
   }
diff --git a/src/main/ipc/pty/runtime/spawn-options.ts b/src/main/ipc/pty/runtime/spawn-options.ts
index 67c633560e97..80bd16e31ce1 100644
--- a/src/main/ipc/pty/runtime/spawn-options.ts
+++ b/src/main/ipc/pty/runtime/spawn-options.ts
@@ -1,3 +1,5 @@
+import { getAppEnvironment } from '../../../../shared/app-environment'
+import { getLegacyOpenCodeEnvKeysToDelete } from '../../../opencode/legacy-shared-config-dir'
 import type { IPtyProvider, PtySpawnResult } from '../../../providers/types'
 import { LocalPtyProvider } from '../../../providers/local-pty-provider'
 import { makePaneKey, isTerminalLeafId } from '../../../../shared/stable-pane-id'
@@ -9,7 +11,7 @@ import {
   mergePtyEnvDeletions,
   removeCodexHomeDeletionRequests,
   getInheritedAgentHookEnvKeysToDelete,
-  getInheritedClaudeSessionStampEnvKeysToDelete
+  getInheritedAgentSessionStampEnvKeysToDelete
 } from '../host-env/pi-agent'
 import { promoteAgentTeamsShimPath, deleteRequestedEnvKeys } from '../host-env/path'
 import {
@@ -21,6 +23,8 @@ import { CLAUDE_AUTH_ENV_VARS } from '../../../claude-accounts/environment'
 import { LEGACY_TERMINAL_SHIM_REMOTE_ENV_KEYS } from '../../../pty/legacy-terminal-shim-dir'
 import { PI_PROCESS_OWNER_ENV_KEYS } from '../../../pty/pi-process-owner-env'
 import { resolveConfiguredTerminalShellArgs } from '../configured-terminal-shell-args'
+import { withCodexTerminalServerIsolationEnv } from '../../../../shared/codex-terminal-server-isolation'
+import { planCodexNoDaemonLaunch } from '../../../pty/codex-no-daemon-launch-command'
 import { resolveStablePaneOwner } from '../pane/stable-owner'
 import { getStartupTerminalIngressIntent } from '../../terminal-startup-color-query-replies'
 import {
@@ -38,6 +42,8 @@ export async function buildRuntimePtySpawnOptions(
 > {
   const args = ctx.args
 
+  // Why here: every provider (local, daemon, SSH relay, WSL) spawns from this env.
+  ctx.env = withCodexTerminalServerIsolationEnv(ctx.env, ctx.deps.getSettings?.())
   const authEnvToDelete = ctx.claudeAuth?.stripAuthEnv
     ? [...CLAUDE_AUTH_ENV_VARS, 'ANTHROPIC_CUSTOM_HEADERS']
     : undefined
@@ -72,8 +78,12 @@ export async function buildRuntimePtySpawnOptions(
     // Why: disable old hosts without removing ORCA_REAL_* while their Windows shim remains on PATH.
     ctx.isDaemonHostSpawn || args.connectionId ? LEGACY_TERMINAL_SHIM_REMOTE_ENV_KEYS : [],
     ctx.isDaemonHostSpawn ? getInheritedAgentHookEnvKeysToDelete(ctx.env) : [],
+    // The daemon must judge its own inherited value; main may have a different config.
+    !args.connectionId && !ctx.isDaemonHostSpawn
+      ? getLegacyOpenCodeEnvKeysToDelete(ctx.env, getAppEnvironment().getPath('userData'))
+      : [],
     // Why: ungated, unlike the agent-hook keys — the local provider and the relay host also spread their own process.env into every spawn.
-    getInheritedClaudeSessionStampEnvKeysToDelete(ctx.env)
+    getInheritedAgentSessionStampEnvKeysToDelete(ctx.env)
   )
   if (ctx.skipCodexHomeEnv) {
     ctx.spawnOptions.envToDelete = mergePtyEnvDeletions(
@@ -92,8 +102,17 @@ export async function buildRuntimePtySpawnOptions(
   }
   deleteRequestedEnvKeys(ctx.env, ctx.spawnOptions.envToDelete)
   promoteAgentTeamsShimPath(ctx.env, ctx.requestedAgentTeamsPath)
-  if (ctx.launchCommand !== undefined) {
-    ctx.spawnOptions.command = ctx.launchCommand
+  const noDaemonLaunch = planCodexNoDaemonLaunch({
+    command: ctx.launchCommand,
+    executesOnThisHost: !args.connectionId && ctx.codexSelectionTarget.runtime !== 'wsl',
+    shellOverride: ctx.daemonShellOverride,
+    env: ctx.env,
+    envToDelete: ctx.spawnOptions.envToDelete,
+    cwd: ctx.cwd
+  })
+  const launchCommand = noDaemonLaunch ? await noDaemonLaunch : ctx.launchCommand
+  if (launchCommand !== undefined) {
+    ctx.spawnOptions.command = launchCommand
   }
   if (args.commandDelivery !== undefined) {
     ctx.spawnOptions.commandDelivery = args.commandDelivery
diff --git a/src/main/ipc/pty/runtime/spawn-preflight-requested-shell.test.ts b/src/main/ipc/pty/runtime/spawn-preflight-requested-shell.test.ts
index 46f16081efae..a299327fc3f2 100644
--- a/src/main/ipc/pty/runtime/spawn-preflight-requested-shell.test.ts
+++ b/src/main/ipc/pty/runtime/spawn-preflight-requested-shell.test.ts
@@ -43,7 +43,6 @@ function makeDeps(): PtyRuntimeControllerDeps {
     finishPtyShutdown,
     trustedTerminalHandleEnv: new Set(),
     retiredRejectedPtyIds: new Map(),
-    reversibleStopOwnersByPtyId: new Map(),
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only `operations.ts` (write/clearBuffer) reads `mainWindow`; the spawn preflight and option build never touch it, and a real BrowserWindow cannot exist in vitest.
     mainWindow: {} as BrowserWindow
   }
diff --git a/src/main/ipc/pty/runtime/spawn-preflight.ts b/src/main/ipc/pty/runtime/spawn-preflight.ts
index 2bd10feaab63..452f63550860 100644
--- a/src/main/ipc/pty/runtime/spawn-preflight.ts
+++ b/src/main/ipc/pty/runtime/spawn-preflight.ts
@@ -12,7 +12,6 @@ import {
   resolveCodexHomeAfterManagedAuthReadiness,
   shouldSkipCodexHomeEnvForWindowsShell,
   shouldStripInheritedOrcaCodexHome,
-  isCodexStatusHooksEnabled,
   codexHomePathsEqual
 } from '../host-env/codex-home'
 import { promoteAgentTeamsShimPath } from '../host-env/path'
@@ -286,7 +285,6 @@ export async function prepareRuntimePtySpawn(
         wslDistro: ctx.codexSelectionTarget.runtime === 'wsl' ? ctx.expectedWslDistro : null,
         agentStatusHooksEnabled: isAgentStatusHooksEnabled(ptySettings),
         disabledTuiAgents: ptySettings?.disabledTuiAgents,
-        codexStatusHooksEnabled: isCodexStatusHooksEnabled(ptySettings),
         networkProxySettings: ptySettings,
         routeBrowserOpensToClient: ctx.deps.runtime?.shouldRelayTerminalBrowserOpens?.(),
         deferGitConfigGuardToDaemon:
diff --git a/src/main/ipc/pty/runtime/undelivered-ssh-kill.ts b/src/main/ipc/pty/runtime/undelivered-ssh-kill.ts
index e41b16290979..45b80ea1f9e1 100644
--- a/src/main/ipc/pty/runtime/undelivered-ssh-kill.ts
+++ b/src/main/ipc/pty/runtime/undelivered-ssh-kill.ts
@@ -1,6 +1,8 @@
 import type { Store } from '../../../persistence'
-import { ptyIncarnationById } from '../provider/ownership-state'
+import { parseAppSshPtyId } from '../../../providers/ssh-pty-id'
+import { ptyIncarnationById, ptyOwnership } from '../provider/ownership-state'
 import { getRelayPtyId } from '../provider/registry'
+import { isEpochScopedRelayPtyId } from '../../../../shared/ssh-pending-pty-kill'
 
 export type UndeliveredSshPtyKill = {
   store: Store | undefined
@@ -25,29 +27,43 @@ export type UndeliveredSshPtyKill = {
  *  - **reversible**: see above.
  *  - **no `connectionId`**: a local PTY's owner is this process, so a failed kill has no later host
  *    to ask; there is nothing to replay against.
- *  - **no incarnation**: the replay fence is the host-minted PTY incarnation, and a relay renumbers
- *    from `pty-1` on every start. An order we could never safely aim can only be discarded later,
- *    or worse, guessed at.
+ *  - **no incarnation on a legacy id**: a legacy relay renumbers from `pty-1` on every start, so
+ *    without the host-minted incarnation the order could never be safely aimed. A `pty2:` id is
+ *    epoch-scoped and names one process, so it is recorded without one.
  *  - **an id naming another connection**: `getRelayPtyId` throws on those, and this runs inside
  *    promise `.catch` handlers where that would surface as an unhandled rejection. */
-export function recordUndeliveredSshPtyKill(args: UndeliveredSshPtyKill): void {
+export function recordUndeliveredSshPtyKill(args: UndeliveredSshPtyKill): boolean {
   const { store, ptyId, connectionId } = args
   if (!store || !connectionId || args.reversible) {
-    return
-  }
-  const incarnationId = args.incarnationId ?? ptyIncarnationById.get(ptyId)
-  if (!incarnationId) {
-    return
+    return false
   }
   let relayPtyId: string
   try {
     relayPtyId = getRelayPtyId(connectionId, ptyId)
   } catch {
-    return
+    return false
+  }
+  const incarnationId = args.incarnationId ?? ptyIncarnationById.get(ptyId)
+  if (!incarnationId && !isEpochScopedRelayPtyId(relayPtyId)) {
+    return false
   }
   store.recordSshRemotePtyKillIntent(connectionId, relayPtyId, {
     requestedAt: args.now ?? Date.now(),
-    incarnationId,
+    ...(incarnationId ? { incarnationId } : {}),
     attempts: 0
   })
+  return true
+}
+
+/** Records the replay order for an explicit close whose stop went unconfirmed, before its follow-up
+ *  kill is sent, so the close receipt can promise the retry only when an order really exists. */
+export function recordUnconfirmedExplicitSshStop(args: {
+  store: Store | undefined
+  ptyId: string
+  reversible: boolean
+}): boolean {
+  return recordUndeliveredSshPtyKill({
+    ...args,
+    connectionId: ptyOwnership.get(args.ptyId) ?? parseAppSshPtyId(args.ptyId)?.connectionId
+  })
 }
diff --git a/src/main/ipc/pty/session.ts b/src/main/ipc/pty/session.ts
index e5c59d9b81a1..be666fc62482 100644
--- a/src/main/ipc/pty/session.ts
+++ b/src/main/ipc/pty/session.ts
@@ -10,7 +10,6 @@ import type {
   PtyRendererDeliveryStateReport
 } from '../../../shared/pty-renderer-delivery-health'
 import type { PtyRendererDeliveryDebugSnapshot } from './delivery/debug'
-import type { ReplacedPtyStop } from './delivery/exit'
 import { PtyProducerFlowController } from '../pty-producer-flow-control'
 import { PtyPendingDataDrainQueue, type PendingPtyData } from '../pty-pending-data-drain-queue'
 import type { SshPtyOutputIntake } from '../ssh-pty-output-intake'
@@ -108,8 +107,6 @@ export type PtyIpcSession = {
     string,
     { cleanupTimer: NodeJS.Timeout; incarnationId: string | undefined }
   >
-  reversibleStopOwnersByPtyId: Map<string, number>
-  replacedPtyStopsById: Map<string, ReplacedPtyStop>
   retiredRejectedPtyIds: Map<string, NodeJS.Timeout>
   pendingSerializeRequests: Map<
     string,
@@ -238,8 +235,6 @@ export function createPtyIpcSession(args: {
     sourceCreditPendingPtys: new Set(),
     backgroundedDeliverySyncByPty: new Map(),
     syntheticKillExitPtyIds: new Map(),
-    reversibleStopOwnersByPtyId: new Map(),
-    replacedPtyStopsById: new Map(),
     retiredRejectedPtyIds: new Map(),
     pendingSerializeRequests: new Map(),
     canSendPtyDataToRenderer: unsetSessionFn,
diff --git a/src/main/ipc/register-core-handlers/register-core-handlers.test.ts b/src/main/ipc/register-core-handlers/register-core-handlers.test.ts
index 61cedeca21a8..968ed1c4fd50 100644
--- a/src/main/ipc/register-core-handlers/register-core-handlers.test.ts
+++ b/src/main/ipc/register-core-handlers/register-core-handlers.test.ts
@@ -571,7 +571,7 @@ describe('registerCoreHandlers', () => {
     expect(registerLocalhostWorktreeLabelHandlersMock).toHaveBeenCalledWith(store)
     expect(registerTelemetryHandlersMock).toHaveBeenCalledWith(store)
     expect(registerOrcaProfileHandlersMock).toHaveBeenCalledWith(store, { onBeforeRelaunch })
-    expect(registerSessionHandlersMock).toHaveBeenCalledWith(store)
+    expect(registerSessionHandlersMock).toHaveBeenCalledWith(store, runtime)
     expect(registerUIHandlersMock).toHaveBeenCalledWith(store, {
       isDashboardPopoutRenderer: isDashboardPopoutRendererMock
     })
diff --git a/src/main/ipc/register-core-handlers/register-core-handlers.ts b/src/main/ipc/register-core-handlers/register-core-handlers.ts
index 2e1f701f64de..769ee3775a77 100644
--- a/src/main/ipc/register-core-handlers/register-core-handlers.ts
+++ b/src/main/ipc/register-core-handlers/register-core-handlers.ts
@@ -209,7 +209,7 @@ export function registerCoreHandlers(
   registerBrowserHandlers()
   registerShellHandlers(store)
   registerPetHandlers()
-  registerSessionHandlers(store)
+  registerSessionHandlers(store, runtime)
   registerUIHandlers(store, { isDashboardPopoutRenderer })
   registerEmulatorFrameStreamHandlers()
   registerEmulatorVideoStreamHandlers()
diff --git a/src/main/ipc/registered-worktree-root-owner.ts b/src/main/ipc/registered-worktree-root-owner.ts
new file mode 100644
index 000000000000..37b1ed25e38a
--- /dev/null
+++ b/src/main/ipc/registered-worktree-root-owner.ts
@@ -0,0 +1,35 @@
+import { resolve } from 'node:path'
+import { getRepoExecutionHostId } from '../../shared/execution-host'
+import type { Repo } from '../../shared/repo-types'
+import { hasRemoteFilesystemOwner } from './remote-filesystem-owner'
+
+export function getWorktreeRootOwnerKey(repo: Repo): string {
+  return JSON.stringify([repo.id, resolve(repo.path), getRepoExecutionHostId(repo)])
+}
+
+// Why the shared predicate: an unplaceable host stamp must not register roots either — the same
+// allow-list, reached through `git worktree list` instead of the repo path.
+export function getLocalWorktreeRootOwners(repos: readonly Repo[]): Map<string, Repo> {
+  return new Map(
+    repos
+      .filter((repo) => !hasRemoteFilesystemOwner(repo))
+      .map((repo) => [getWorktreeRootOwnerKey(repo), repo])
+  )
+}
+
+export function resolveWorktreeRootOwner(
+  repos: readonly Repo[],
+  repo: Repo | string,
+  owners: ReadonlyMap<string, Repo>
+): string | undefined {
+  // ID-only callers are safe only when the entire catalog has one matching row.
+  if (typeof repo === 'string') {
+    const matches = repos.filter((candidate) => candidate.id === repo)
+    if (matches.length !== 1) {
+      return undefined
+    }
+    repo = matches[0]
+  }
+  const key = getWorktreeRootOwnerKey(repo)
+  return !repo.connectionId && owners.has(key) ? key : undefined
+}
diff --git a/src/main/ipc/registered-worktree-root-ownership.test.ts b/src/main/ipc/registered-worktree-root-ownership.test.ts
new file mode 100644
index 000000000000..c03f923d7ec4
--- /dev/null
+++ b/src/main/ipc/registered-worktree-root-ownership.test.ts
@@ -0,0 +1,294 @@
+import { join, resolve } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { Store } from '../persistence'
+import type { Repo } from '../../shared/repo-types'
+
+const mocks = vi.hoisted(() => ({ graph: vi.fn(), stat: vi.fn(), realpath: vi.fn() }))
+vi.mock('node:fs', () => ({ realpathSync: (path: string) => path, statSync: mocks.stat }))
+vi.mock('node:fs/promises', () => ({ stat: mocks.stat, realpath: mocks.realpath }))
+vi.mock('../repo-worktrees', () => ({
+  listRepoWorktreeGraph: mocks.graph,
+  isRepoRoot: vi.fn(() => false)
+}))
+vi.mock('./worktree-logic', () => ({
+  computeWorkspaceRoot: vi.fn(),
+  getWorktreePathSettings: vi.fn()
+}))
+vi.mock('../project-runtime-git-options', () => ({
+  getWorktreeMirrorDistroForRuntime: vi.fn(),
+  resolveLocalProjectRuntimesForRepos: vi.fn()
+}))
+import { resolveAuthorizedPath } from './filesystem-auth'
+import {
+  __resetCreatedWorktreeRootsForTests,
+  invalidateAuthorizedRootsCache,
+  rebuildAuthorizedRootsCache,
+  registerCreatedWorktreeRoot,
+  registerWorktreeRootsForRepo
+} from './registered-worktree-roots-cache'
+
+const root = resolve('/registry-review-repo')
+const linked = resolve('/registry-review-linked')
+const canonical = resolve('/registry-review-canonical')
+const replacement = resolve('/registry-review-replacement')
+const local: Repo = { id: 'owner', path: root, displayName: 'repo', badgeColor: '#000', addedAt: 0 }
+function fixture(repos: Repo[]): Store {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The actual authorization APIs only read these four store methods; filesystem and graph boundaries are mocked.
+  return {
+    getRepos: () => repos,
+    getProjectGroups: () => [],
+    getFolderWorkspaces: () => [],
+    getSettings: () => ({})
+  } as unknown as Store
+}
+function deferred<T>() {
+  let resolvePromise!: (value: T) => void
+  let rejectPromise!: (error: unknown) => void
+  const promise = new Promise<T>((resolve, reject) => {
+    resolvePromise = resolve
+    rejectPromise = reject
+  })
+  return { promise, resolve: resolvePromise, reject: rejectPromise }
+}
+async function deferredAlias(store: Store) {
+  const normalization = deferred<string>()
+  mocks.realpath.mockImplementation((path: string) => {
+    if (path === linked) {
+      return normalization.promise
+    }
+    if (path === join(linked, 'file')) {
+      return Promise.resolve(join(canonical, 'file'))
+    }
+    return Promise.resolve(path)
+  })
+  const authorization = resolveAuthorizedPath(join(linked, 'file'), store)
+  await vi.waitFor(() => expect(mocks.realpath).toHaveBeenCalledWith(linked))
+  return { authorization, normalization }
+}
+async function expectDenied(path: string, store: Store) {
+  await expect(resolveAuthorizedPath(path, store)).rejects.toThrow('Access denied')
+}
+beforeEach(() => {
+  invalidateAuthorizedRootsCache()
+  __resetCreatedWorktreeRootsForTests()
+  vi.resetAllMocks()
+  mocks.graph.mockResolvedValue([])
+  mocks.stat.mockResolvedValue({})
+  mocks.realpath.mockImplementation(async (path: string) => path)
+})
+afterEach(() => vi.useRealTimers())
+
+describe('canonical alias publication respects current registration', () => {
+  it.each(['canonical', 'legacy'] as const)(
+    'retires an in-flight alias after %s SSH ownership',
+    async (hostEncoding) => {
+      const repos = [{ ...local }]
+      const store = fixture(repos)
+      registerWorktreeRootsForRepo(store, local.id, [linked])
+      const { authorization, normalization } = await deferredAlias(store)
+      repos[0] =
+        hostEncoding === 'canonical'
+          ? { ...local, executionHostId: 'ssh:remote' }
+          : { ...local, connectionId: 'remote' }
+      invalidateAuthorizedRootsCache()
+      normalization.resolve(canonical)
+      await expect(authorization).rejects.toThrow('Access denied')
+      await expectDenied(join(canonical, 'later'), store)
+    }
+  )
+  it('does not let an obsolete alias outlive a replacement listing', async () => {
+    const store = fixture([local])
+    registerWorktreeRootsForRepo(store, local.id, [linked])
+    const { authorization, normalization } = await deferredAlias(store)
+    registerWorktreeRootsForRepo(store, local.id, [replacement])
+    normalization.resolve(canonical)
+    await expect(authorization).rejects.toThrow('Access denied')
+    await expectDenied(join(canonical, 'later'), store)
+    await expect(resolveAuthorizedPath(join(replacement, 'file'), store)).resolves.toBe(
+      join(replacement, 'file')
+    )
+  })
+  it('does not cache an alias from an invalidated listing', async () => {
+    const store = fixture([local])
+    registerWorktreeRootsForRepo(store, local.id, [linked])
+    const { authorization, normalization } = await deferredAlias(store)
+    invalidateAuthorizedRootsCache()
+    normalization.resolve(canonical)
+    await expect(authorization).rejects.toThrow('Access denied')
+    await expectDenied(join(canonical, 'later'), store)
+  })
+  it('retains a completed alias while its original owner remains local', async () => {
+    const store = fixture([local])
+    registerWorktreeRootsForRepo(store, local.id, [linked])
+    const { authorization, normalization } = await deferredAlias(store)
+    normalization.resolve(canonical)
+    await expect(authorization).resolves.toBe(join(canonical, 'file'))
+    await expect(resolveAuthorizedPath(join(canonical, 'later'), store)).resolves.toBe(
+      join(canonical, 'later')
+    )
+  })
+})
+
+describe('recovered grant ownership and prune completion', () => {
+  it('does not apply old ENOENT evidence to a renewed recovered grant', async () => {
+    const probe = deferred<object>()
+    mocks.stat.mockReturnValueOnce(probe.promise)
+    const store = fixture([local])
+    registerCreatedWorktreeRoot(store, local.id, linked)
+    const rebuilding = rebuildAuthorizedRootsCache(store)
+    await vi.waitFor(() => expect(mocks.stat).toHaveBeenCalledWith(linked))
+    registerCreatedWorktreeRoot(store, local.id, linked)
+    probe.reject(Object.assign(new Error('old absence'), { code: 'ENOENT' }))
+    await rebuilding
+    await expect(resolveAuthorizedPath(join(linked, 'file'), store)).resolves.toBe(
+      join(linked, 'file')
+    )
+  })
+  it.each([false, true])(
+    'retires recovered roots after same-ID local path replacement (invalidate=%s)',
+    async (invalidate) => {
+      const repos = [{ ...local }]
+      const store = fixture(repos)
+      registerCreatedWorktreeRoot(store, local.id, linked)
+      repos[0] = { ...local, path: replacement }
+      if (invalidate) {
+        invalidateAuthorizedRootsCache()
+      }
+      await expectDenied(join(linked, 'file'), store)
+    }
+  )
+  it.each(['listed', 'created'] as const)(
+    'rejects ambiguous %s registration for one ID and two local paths',
+    async (kind) => {
+      const store = fixture([local, { ...local, path: replacement }])
+      if (kind === 'listed') {
+        registerWorktreeRootsForRepo(store, local.id, [linked])
+      } else {
+        registerCreatedWorktreeRoot(store, local.id, linked)
+      }
+      await expectDenied(join(linked, 'file'), store)
+    }
+  )
+  it('preserves a still-local recovered root across ordinary invalidation', async () => {
+    const store = fixture([local])
+    registerCreatedWorktreeRoot(store, local.id, linked)
+    invalidateAuthorizedRootsCache()
+    await expect(resolveAuthorizedPath(join(linked, 'file'), store)).resolves.toBe(
+      join(linked, 'file')
+    )
+  })
+  it('preserves a recovered root when its filesystem probe returns EIO', async () => {
+    const store = fixture([local])
+    registerCreatedWorktreeRoot(store, local.id, linked)
+    mocks.stat.mockRejectedValue(Object.assign(new Error('unavailable'), { code: 'EIO' }))
+    await rebuildAuthorizedRootsCache(store)
+    await expect(resolveAuthorizedPath(join(linked, 'file'), store)).resolves.toBe(
+      join(linked, 'file')
+    )
+  })
+  it('preserves a recovered root on timeout and after late ENOENT', async () => {
+    vi.useFakeTimers()
+    const probe = deferred<object>()
+    mocks.stat.mockReturnValueOnce(probe.promise)
+    const store = fixture([local])
+    registerCreatedWorktreeRoot(store, local.id, linked)
+    const rebuilding = rebuildAuthorizedRootsCache(store)
+    await vi.advanceTimersByTimeAsync(1_001)
+    await rebuilding
+    probe.reject(Object.assign(new Error('late absence'), { code: 'ENOENT' }))
+    await Promise.resolve()
+    await expect(resolveAuthorizedPath(join(linked, 'file'), store)).resolves.toBe(
+      join(linked, 'file')
+    )
+  })
+  it('keeps the newer registration when an older graph listing completes', async () => {
+    const graph = deferred<{ path: string }[]>()
+    mocks.graph.mockReturnValueOnce(graph.promise)
+    const store = fixture([local])
+    const rebuilding = rebuildAuthorizedRootsCache(store)
+    expect(mocks.graph).toHaveBeenCalledOnce()
+    registerWorktreeRootsForRepo(store, local.id, [replacement])
+    graph.resolve([{ path: linked }])
+    await rebuilding
+    await expectDenied(join(linked, 'file'), store)
+    await expect(resolveAuthorizedPath(join(replacement, 'file'), store)).resolves.toBe(
+      join(replacement, 'file')
+    )
+  })
+})
+
+describe('qualified registration', () => {
+  it.each(['listed', 'created'] as const)(
+    'keeps legitimate %s roots with overlapping local and SSH IDs',
+    async (kind) => {
+      const remote: Repo = { ...local, executionHostId: 'ssh:remote' }
+      const store = fixture([local, remote])
+      if (kind === 'listed') {
+        registerWorktreeRootsForRepo(store, local, [linked])
+        registerWorktreeRootsForRepo(store, remote, [replacement])
+      } else {
+        registerCreatedWorktreeRoot(store, local, linked)
+        registerCreatedWorktreeRoot(store, remote, replacement)
+      }
+      await expect(resolveAuthorizedPath(join(linked, 'file'), store)).resolves.toBe(
+        join(linked, 'file')
+      )
+      await expectDenied(join(replacement, 'file'), store)
+    }
+  )
+  it('preserves a root still owned by another qualified local repository', async () => {
+    const second = { ...local, path: replacement }
+    const repos = [local, second]
+    const store = fixture(repos)
+    registerCreatedWorktreeRoot(store, local, linked)
+    registerCreatedWorktreeRoot(store, second, linked)
+    repos[0] = { ...local, executionHostId: 'ssh:remote' }
+    invalidateAuthorizedRootsCache()
+    await expect(resolveAuthorizedPath(join(linked, 'file'), store)).resolves.toBe(
+      join(linked, 'file')
+    )
+  })
+  it('keeps recovered roots across harmless display metadata changes', async () => {
+    const repos = [{ ...local }]
+    const store = fixture(repos)
+    registerCreatedWorktreeRoot(store, local, linked)
+    repos[0] = { ...local, displayName: 'Renamed' }
+    invalidateAuthorizedRootsCache()
+    await expect(resolveAuthorizedPath(join(linked, 'file'), store)).resolves.toBe(
+      join(linked, 'file')
+    )
+    expect(mocks.graph).not.toHaveBeenCalled()
+    expect(mocks.stat).not.toHaveBeenCalled()
+  })
+  it('preserves own-store runtime roots but retires a changed runtime identity', async () => {
+    const runtime: Repo = { ...local, executionHostId: 'runtime:a' }
+    const repos = [runtime]
+    const store = fixture(repos)
+    registerCreatedWorktreeRoot(store, runtime, linked)
+    await expect(resolveAuthorizedPath(join(linked, 'file'), store)).resolves.toBe(
+      join(linked, 'file')
+    )
+    repos[0] = { ...runtime, executionHostId: 'runtime:b' }
+    await expectDenied(join(linked, 'file'), store)
+  })
+  it.each(['canonical', 'legacy'] as const)(
+    'discards obsolete %s SSH graph results',
+    async (hostEncoding) => {
+      const graph = deferred<{ path: string }[]>()
+      mocks.graph.mockReturnValueOnce(graph.promise)
+      const repos = [{ ...local }]
+      const store = fixture(repos)
+      const rebuilding = rebuildAuthorizedRootsCache(store)
+      repos[0] =
+        hostEncoding === 'canonical'
+          ? { ...local, executionHostId: 'ssh:remote' }
+          : { ...local, connectionId: 'remote' }
+      invalidateAuthorizedRootsCache()
+      graph.resolve([{ path: linked }])
+      await rebuilding
+      await expectDenied(join(linked, 'file'), store)
+      expect(mocks.graph).toHaveBeenCalledOnce()
+      expect(mocks.stat).not.toHaveBeenCalled()
+    }
+  )
+})
diff --git a/src/main/ipc/registered-worktree-root-probes.ts b/src/main/ipc/registered-worktree-root-probes.ts
new file mode 100644
index 000000000000..ca295f02dd1f
--- /dev/null
+++ b/src/main/ipc/registered-worktree-root-probes.ts
@@ -0,0 +1,70 @@
+import { stat } from 'node:fs/promises'
+import { resolve } from 'node:path'
+import { withTimeout } from '../../shared/promise-timeout-fallback'
+import type { Repo } from '../../shared/repo-types'
+import { getErrorCode } from '../git/worktree-operation-options'
+import { listRepoWorktreeGraph } from '../repo-worktrees'
+
+const CREATED_WORKTREE_ROOT_PROBE_TIMEOUT_MS = 1_000
+const AUTHORIZED_ROOTS_REBUILD_CONCURRENCY = 8
+
+type ListedRoots = { roots: Set<string>; listingFailed: boolean }
+
+export async function listWorktreeRootsWithConcurrency(
+  repos: readonly Repo[]
+): Promise<ListedRoots[]> {
+  const results: ListedRoots[] = []
+  let nextIndex = 0
+  await Promise.all(
+    Array.from(
+      { length: Math.min(AUTHORIZED_ROOTS_REBUILD_CONCURRENCY, repos.length) },
+      async () => {
+        while (nextIndex < repos.length) {
+          const index = nextIndex++
+          const repo = repos[index]
+          const roots = new Set([resolve(repo.path)])
+          let listingFailed = false
+          try {
+            for (const worktree of await listRepoWorktreeGraph(repo)) {
+              roots.add(resolve(worktree.path))
+            }
+          } catch (error) {
+            console.warn(
+              `[filesystem-auth] skipping repo ${repo.path} during cache rebuild:`,
+              error
+            )
+            listingFailed = true
+          }
+          results[index] = { roots, listingFailed }
+        }
+      }
+    )
+  )
+  return results
+}
+
+/** An unavailable mount is not evidence that a recovered worktree disappeared. */
+export async function pruneCreatedWorktreeRoots(
+  recoveredRoots: ReadonlySet<string>,
+  listed: ListedRoots
+): Promise<Set<string>> {
+  const recovered = new Set(recoveredRoots)
+  if (!listed.listingFailed) {
+    await Promise.all(
+      [...recovered].map(async (root) => {
+        if (listed.roots.has(root) || (await isRootGoneFromDisk(root))) {
+          recovered.delete(root)
+        }
+      })
+    )
+  }
+  return recovered
+}
+
+async function isRootGoneFromDisk(targetPath: string): Promise<boolean> {
+  const probe = stat(targetPath).then(
+    () => false,
+    (error: unknown) => getErrorCode(error) === 'ENOENT'
+  )
+  return withTimeout(probe, CREATED_WORKTREE_ROOT_PROBE_TIMEOUT_MS, false)
+}
diff --git a/src/main/ipc/registered-worktree-root-refresh.test.ts b/src/main/ipc/registered-worktree-root-refresh.test.ts
new file mode 100644
index 000000000000..f33221adb05a
--- /dev/null
+++ b/src/main/ipc/registered-worktree-root-refresh.test.ts
@@ -0,0 +1,128 @@
+import { join, resolve } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { Store } from '../persistence'
+import type { Repo } from '../../shared/repo-types'
+
+const mocks = vi.hoisted(() => ({ graph: vi.fn(), stat: vi.fn(), realpath: vi.fn() }))
+vi.mock('node:fs', () => ({ realpathSync: (path: string) => path, statSync: mocks.stat }))
+vi.mock('node:fs/promises', () => ({ stat: mocks.stat, realpath: mocks.realpath }))
+vi.mock('../repo-worktrees', () => ({
+  listRepoWorktreeGraph: mocks.graph,
+  isRepoRoot: vi.fn(() => false)
+}))
+vi.mock('./worktree-logic', () => ({
+  computeWorkspaceRoot: vi.fn(),
+  getWorktreePathSettings: vi.fn()
+}))
+vi.mock('../project-runtime-git-options', () => ({
+  getWorktreeMirrorDistroForRuntime: vi.fn(),
+  resolveLocalProjectRuntimesForRepos: vi.fn()
+}))
+import { resolveAuthorizedPath } from './filesystem-auth'
+import {
+  __resetCreatedWorktreeRootsForTests,
+  invalidateAuthorizedRootsCache,
+  rebuildAuthorizedRootsCache,
+  registerWorktreeRootsForRepo
+} from './registered-worktree-roots-cache'
+
+const root = resolve('/registry-review-repo')
+const linked = resolve('/registry-review-linked')
+const replacement = resolve('/registry-review-replacement')
+const local: Repo = { id: 'owner', path: root, displayName: 'repo', badgeColor: '#000', addedAt: 0 }
+function fixture(repos: Repo[]): Store {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The actual authorization APIs only read these four store methods; filesystem and graph boundaries are mocked.
+  return {
+    getRepos: () => repos,
+    getProjectGroups: () => [],
+    getFolderWorkspaces: () => [],
+    getSettings: () => ({})
+  } as unknown as Store
+}
+function deferred<T>() {
+  let resolvePromise!: (value: T) => void
+  let rejectPromise!: (error: unknown) => void
+  const promise = new Promise<T>((resolve, reject) => {
+    resolvePromise = resolve
+    rejectPromise = reject
+  })
+  return { promise, resolve: resolvePromise, reject: rejectPromise }
+}
+beforeEach(() => {
+  invalidateAuthorizedRootsCache()
+  __resetCreatedWorktreeRootsForTests()
+  vi.resetAllMocks()
+  mocks.graph.mockResolvedValue([])
+  mocks.stat.mockResolvedValue({})
+  mocks.realpath.mockImplementation(async (path: string) => path)
+})
+afterEach(() => vi.useRealTimers())
+
+describe('current request follows a superseded rebuild', () => {
+  it('rebuilds the current local catalog before deciding a request that joined obsolete work', async () => {
+    const graph = deferred<{ path: string }[]>()
+    mocks.graph.mockReturnValueOnce(graph.promise)
+    const repos = [{ ...local }]
+    const store = fixture(repos)
+    const first = resolveAuthorizedPath(join(linked, 'file'), store)
+    const firstResult = first.then(
+      (value) => ({ value }),
+      (error) => ({ error })
+    )
+    await vi.waitFor(() => expect(mocks.graph).toHaveBeenCalledOnce())
+    repos[0] = { ...local, path: replacement }
+    invalidateAuthorizedRootsCache()
+    mocks.graph.mockResolvedValue([{ path: linked }])
+    const current = resolveAuthorizedPath(join(linked, 'file'), store)
+    const currentResult = current.then(
+      (value) => ({ value }),
+      (error) => ({ error })
+    )
+    await Promise.resolve()
+    await Promise.resolve()
+    await Promise.resolve()
+    graph.resolve([])
+    const [, result] = await Promise.all([firstResult, currentResult])
+    expect(result).toEqual({ value: join(linked, 'file') })
+    expect(mocks.graph).toHaveBeenCalledTimes(2)
+  })
+})
+
+it.each([1, 64, 256])('records catalog work for %s cold-rebuild repositories', async (count) => {
+  let pathReads = 0
+  const repos: Repo[] = Array.from({ length: count }, (_, i) => ({
+    id: `repo-${i}`,
+    get path() {
+      pathReads++
+      return resolve(`/review-repo-${i}`)
+    },
+    displayName: 'repo',
+    badgeColor: '#000',
+    addedAt: 0
+  }))
+  const store = fixture(repos)
+  const getRepos = vi.spyOn(store, 'getRepos')
+  await rebuildAuthorizedRootsCache(store)
+  expect(mocks.graph).toHaveBeenCalledTimes(count)
+  expect(getRepos.mock.calls.length).toBeLessThanOrEqual(3)
+  expect(pathReads).toBeLessThanOrEqual(4 * count)
+})
+it('records catalog work for one warm linked-file authorization', async () => {
+  const repo: Repo = {
+    id: 'repo',
+    path: resolve('/review-repo'),
+    displayName: 'repo',
+    badgeColor: '#000',
+    addedAt: 0
+  }
+  const store = fixture([repo])
+  const getRepos = vi.spyOn(store, 'getRepos')
+  const linked = resolve('/review-linked')
+  registerWorktreeRootsForRepo(store, repo.id, [linked])
+  getRepos.mockClear()
+  await expect(resolveAuthorizedPath(resolve(linked, 'file'), store)).resolves.toBe(
+    resolve(linked, 'file')
+  )
+  expect(mocks.graph).not.toHaveBeenCalled()
+  expect(getRepos.mock.calls.length).toBeLessThanOrEqual(3)
+})
diff --git a/src/main/ipc/registered-worktree-roots-cache.ts b/src/main/ipc/registered-worktree-roots-cache.ts
index ad8c40535cff..30d89fce2dd4 100644
--- a/src/main/ipc/registered-worktree-roots-cache.ts
+++ b/src/main/ipc/registered-worktree-roots-cache.ts
@@ -1,313 +1,244 @@
-import { stat } from 'node:fs/promises'
 import { resolve } from 'node:path'
-import { withTimeout } from '../../shared/promise-timeout-fallback'
-import { getErrorCode } from '../git/worktree-operation-options'
+import type { Repo } from '../../shared/repo-types'
 import type { Store } from '../persistence'
-import { isRepoRoot, listRepoWorktreeGraph } from '../repo-worktrees'
-import { getLocalRepos } from './filesystem-allowed-roots'
+import {
+  listWorktreeRootsWithConcurrency,
+  pruneCreatedWorktreeRoots
+} from './registered-worktree-root-probes'
 import { isDescendantOrEqual, normalizeExistingPath } from './filesystem-path-containment'
+import {
+  getLocalWorktreeRootOwners,
+  resolveWorktreeRootOwner
+} from './registered-worktree-root-owner'
+
+type RegisteredOwner = {
+  repoId: string
+  listed: Set<string> | null
+  recovered: Set<string>
+  aliases: Set<string>
+  revision: number
+  dirty: boolean
+}
 
 const registeredWorktreeRoots = new Set<string>()
-const registeredWorktreeRootsByRepo = new Map<string, Set<string>>()
-/**
- * Roots Git confirmed by direct read while `git worktree list` could not see them.
- *
- * Why a layer of its own: everything in `registeredWorktreeRootsByRepo` is derived from the listing,
- * so a rebuild recomputes it from the very listing that failed and would re-deny a worktree the
- * create just recovered. This layer survives rebuilds and is pruned only on evidence (#16520).
- */
-const createdWorktreeRootsByRepo = new Map<string, Set<string>>()
-/** A recovered create is rare (Git's listing must be broken); cap the layer so it can never grow unbounded. */
-const CREATED_WORKTREE_ROOTS_MAX = 64
-/** The prune runs inside filesystem-auth resolution, so a hung mount must not stall it. */
-const CREATED_WORKTREE_ROOT_PROBE_TIMEOUT_MS = 1_000
-const registeredWorktreeRootRepoIds = new Set<string>()
+const registeredOwners = new Map<string, RegisteredOwner>()
 const registeredWorktreeRootsRevisionByRepo = new Map<string, number>()
-let registeredWorktreeRootsRevisionSequence = 0
-let registeredWorktreeRootsBaseRevision = 0
+const CREATED_WORKTREE_ROOTS_MAX = 64
+let revisionSequence = 0
+let baseRevision = 0
+let invalidationGeneration = 0
+let registryStore: Store | null = null
+let currentOwners = new Map<string, Repo>()
 let registeredWorktreeRootsDirty = true
 let registeredWorktreeRootsRefresh: Promise<void> | null = null
-const AUTHORIZED_ROOTS_REBUILD_CONCURRENCY = 8
 
-export function invalidateAuthorizedRootsCache(): void {
-  registeredWorktreeRootsDirty = true
-  // Why: dirty roots can't be trusted for auth short-circuits; fresh worktrees:list seeds safe per-repo roots before a full rebuild.
-  registeredWorktreeRoots.clear()
-  registeredWorktreeRootsByRepo.clear()
-  registeredWorktreeRootRepoIds.clear()
-  // The recovered layer is deliberately not cleared: repo mutations are frequent, and dropping it here
-  // would re-deny a recovered worktree every time an unrelated repo is added or removed.
-  refreshRegisteredWorktreeRoots()
-  registeredWorktreeRootsBaseRevision = ++registeredWorktreeRootsRevisionSequence
-  registeredWorktreeRootsRevisionByRepo.clear()
+function advanceOwner(owner: RegisteredOwner): void {
+  owner.revision = ++revisionSequence
+  owner.aliases.clear()
+  registeredWorktreeRootsRevisionByRepo.set(owner.repoId, owner.revision)
 }
 
-export async function rebuildAuthorizedRootsCache(store: Store): Promise<void> {
-  // Why: bounded parallelism keeps the Windows speedup without one git process per repo.
-  // Why no realpath here: canonicalizing every root on invalidation would trigger macOS TCC prompts; handlers still canonicalize the target before any operation.
-  const repos = getLocalRepos(store)
-  const perProjectResults = await mapWithConcurrency(
-    repos,
-    AUTHORIZED_ROOTS_REBUILD_CONCURRENCY,
-    async (repo) => {
-      const roots: string[] = []
-      try {
-        roots.push(resolve(repo.path))
-
-        for (const worktree of await listRepoWorktreeGraph(repo)) {
-          roots.push(resolve(worktree.path))
-        }
-      } catch (error) {
-        // Why: one inaccessible repo (EACCES/EIO) must not break the whole rebuild and disable File Explorer/Quick Open for the rest; skip it.
-        console.warn(`[filesystem-auth] skipping repo ${repo.path} during cache rebuild:`, error)
-        return { repoId: repo.id, roots, listingFailed: true }
-      }
-      return { repoId: repo.id, roots, listingFailed: false }
-    }
-  )
-  await pruneCreatedWorktreeRoots(perProjectResults, new Set(repos.map((repo) => repo.id)))
-
-  registeredWorktreeRoots.clear()
-  registeredWorktreeRootsByRepo.clear()
-  registeredWorktreeRootRepoIds.clear()
-  for (const { repoId, roots } of perProjectResults) {
-    const normalizedRoots = new Set<string>()
-    for (const root of roots) {
-      normalizedRoots.add(root)
-      registeredWorktreeRoots.add(root)
-    }
-    registeredWorktreeRootsByRepo.set(repoId, normalizedRoots)
-    registeredWorktreeRootRepoIds.add(repoId)
+function synchronizeOwners(store: Store): Repo[] {
+  const repos = store.getRepos()
+  const owners = getLocalWorktreeRootOwners(repos)
+  if (registryStore !== store) {
+    registeredOwners.clear()
+    registryStore = store
+    invalidationGeneration++
   }
-  for (const roots of createdWorktreeRootsByRepo.values()) {
-    for (const root of roots) {
-      registeredWorktreeRoots.add(root)
+  let changed = currentOwners.size !== owners.size
+  for (const [key, owner] of registeredOwners) {
+    if (!owners.has(key)) {
+      advanceOwner(owner)
+      registeredOwners.delete(key)
+      changed = true
     }
   }
-  registeredWorktreeRootsDirty = false
-  registeredWorktreeRootsBaseRevision = ++registeredWorktreeRootsRevisionSequence
-  registeredWorktreeRootsRevisionByRepo.clear()
-}
-
-/**
- * Retire recovered roots on evidence: the listing can see the worktree again, or it is gone from disk.
- *
- * Nothing is retired for want of evidence. A repo whose listing threw is left untouched, and so is a
- * root whose probe hangs or errors for any reason but ENOENT — a dead mount fails the listing and the
- * probe alike, and pruning on that would revoke the worktree in the very outage this layer exists for.
- */
-async function pruneCreatedWorktreeRoots(
-  results: readonly { repoId: string; roots: string[]; listingFailed: boolean }[],
-  localRepoIds: Set<string>
-): Promise<void> {
-  const listedByRepo = new Map(
-    results.filter((result) => !result.listingFailed).map((r) => [r.repoId, new Set(r.roots)])
-  )
-  const probes: Promise<void>[] = []
-  for (const [repoId, roots] of createdWorktreeRootsByRepo) {
-    if (!localRepoIds.has(repoId)) {
-      createdWorktreeRootsByRepo.delete(repoId)
-      continue
-    }
-    const listed = listedByRepo.get(repoId)
-    if (!listed) {
-      continue
-    }
-    for (const root of roots) {
-      if (listed.has(root)) {
-        roots.delete(root)
-        continue
-      }
-      // Probe in parallel: a repo may hold up to CREATED_WORKTREE_ROOTS_MAX roots, and serial
-      // timeouts would multiply into a rebuild stall of their own.
-      probes.push(
-        isRootGoneFromDisk(root).then((gone) => {
-          if (gone) {
-            roots.delete(root)
-          }
-        })
-      )
+  for (const [key, repo] of owners) {
+    if (!registeredOwners.has(key)) {
+      registeredOwners.set(key, {
+        repoId: repo.id,
+        listed: null,
+        recovered: new Set(),
+        aliases: new Set(),
+        revision: ++revisionSequence,
+        dirty: true
+      })
+      changed = true
     }
   }
-  await Promise.all(probes)
-  for (const [repoId, roots] of createdWorktreeRootsByRepo) {
-    if (roots.size === 0) {
-      createdWorktreeRootsByRepo.delete(repoId)
-    }
+  currentOwners = owners
+  if (changed) {
+    refreshRegisteredWorktreeRoots()
   }
+  registeredWorktreeRootsDirty = [...registeredOwners.values()].some((owner) => owner.dirty)
+  return repos
 }
 
-/** Only a definitive ENOENT counts as removal; the timeout unblocks the rebuild but cannot cancel the syscall. */
-async function isRootGoneFromDisk(targetPath: string): Promise<boolean> {
-  const probe = stat(targetPath).then(
-    () => false,
-    (error: unknown) => getErrorCode(error) === 'ENOENT'
-  )
-  return withTimeout(probe, CREATED_WORKTREE_ROOT_PROBE_TIMEOUT_MS, false)
+export function invalidateAuthorizedRootsCache(): void {
+  invalidationGeneration++
+  for (const owner of registeredOwners.values()) {
+    owner.listed = null
+    owner.dirty = true
+    advanceOwner(owner)
+  }
+  refreshRegisteredWorktreeRoots()
+  registeredWorktreeRootsDirty = true
+  baseRevision = ++revisionSequence
+  registeredWorktreeRootsRevisionByRepo.clear()
 }
 
-async function mapWithConcurrency<T, R>(
-  items: readonly T[],
-  maxConcurrent: number,
-  mapper: (item: T) => Promise<R>
-): Promise<R[]> {
-  const results: R[] = []
-  let nextIndex = 0
-  const workerCount = Math.min(maxConcurrent, items.length)
-  await Promise.all(
-    Array.from({ length: workerCount }, async () => {
-      while (nextIndex < items.length) {
-        const index = nextIndex
-        nextIndex += 1
-        results[index] = await mapper(items[index])
+export async function rebuildAuthorizedRootsCache(store: Store): Promise<void> {
+  synchronizeOwners(store)
+  const generation = invalidationGeneration
+  const pending = [...currentOwners].map(([key, repo]) => ({
+    key,
+    repo,
+    owner: registeredOwners.get(key),
+    revision: registeredOwners.get(key)?.revision
+  }))
+  const listings = await listWorktreeRootsWithConcurrency(pending.map((entry) => entry.repo))
+  const results = pending.map((entry, index) => ({ ...entry, ...listings[index] }))
+  const isCurrent = (entry: (typeof pending)[number]): boolean =>
+    generation === invalidationGeneration &&
+    registeredOwners.get(entry.key) === entry.owner &&
+    entry.owner?.revision === entry.revision
+  synchronizeOwners(store)
+  const pruned = await Promise.all(
+    results.map(async (entry) => {
+      if (!entry.owner || !isCurrent(entry)) {
+        return null
       }
+      const recovered = await pruneCreatedWorktreeRoots(entry.owner.recovered, entry)
+      return { ...entry, recovered }
     })
   )
-  return results
+  synchronizeOwners(store)
+  for (const entry of pruned) {
+    // A fresh create or ownership change makes both the graph and absence probes obsolete.
+    if (!entry || !entry.owner || !isCurrent(entry)) {
+      continue
+    }
+    entry.owner.listed = entry.roots
+    entry.owner.dirty = false
+    entry.owner.recovered = entry.recovered
+    advanceOwner(entry.owner)
+  }
+  refreshRegisteredWorktreeRoots()
+  registeredWorktreeRootsDirty = [...registeredOwners.values()].some((owner) => owner.dirty)
 }
 
 export function registerWorktreeRootsForRepo(
   store: Store,
-  repoId: string,
+  repo: Repo | string,
   worktreeRoots: string[]
 ): void {
-  const localRepoIds = new Set(getLocalRepos(store).map((repo) => repo.id))
-  for (const registeredRepoId of registeredWorktreeRootsByRepo.keys()) {
-    if (!localRepoIds.has(registeredRepoId)) {
-      registeredWorktreeRootsByRepo.delete(registeredRepoId)
-      registeredWorktreeRootRepoIds.delete(registeredRepoId)
-      registeredWorktreeRootsRevisionByRepo.set(
-        registeredRepoId,
-        ++registeredWorktreeRootsRevisionSequence
-      )
-    }
-  }
-
-  if (!localRepoIds.has(repoId)) {
-    refreshRegisteredWorktreeRoots()
-    registeredWorktreeRootsDirty = !allLocalRepoRootsRegistered(localRepoIds)
+  const repos = synchronizeOwners(store)
+  const key = resolveWorktreeRootOwner(repos, repo, currentOwners)
+  const owner = key === undefined ? undefined : registeredOwners.get(key)
+  if (!owner) {
     return
   }
-
-  registeredWorktreeRootsByRepo.set(repoId, new Set(worktreeRoots.map((root) => resolve(root))))
-  registeredWorktreeRootRepoIds.add(repoId)
-  registeredWorktreeRootsRevisionByRepo.set(repoId, ++registeredWorktreeRootsRevisionSequence)
+  owner.listed = new Set(worktreeRoots.map((root) => resolve(root)))
+  owner.dirty = false
+  advanceOwner(owner)
   refreshRegisteredWorktreeRoots()
-  registeredWorktreeRootsDirty = !allLocalRepoRootsRegistered(localRepoIds)
+  registeredWorktreeRootsDirty = [...registeredOwners.values()].some((entry) => entry.dirty)
 }
 
-/**
- * Authorize one worktree root that Git confirmed by direct read but could not list.
- *
- * Why not `registerWorktreeRootsForRepo`: that replaces the repo's set, and a create recovered without
- * a listing has no full set to put there. The root goes in the recovered layer instead, so the next
- * rebuild cannot drop it while Git's listing is still broken (#16520).
- */
+/** Preserve directly confirmed creates when an unavailable listing cannot name them. */
 export function registerCreatedWorktreeRoot(
   store: Store,
-  repoId: string,
+  repo: Repo | string,
   worktreeRoot: string
 ): void {
-  const localRepoIds = new Set(getLocalRepos(store).map((repo) => repo.id))
-  if (!localRepoIds.has(repoId)) {
+  const repos = synchronizeOwners(store)
+  const key = resolveWorktreeRootOwner(repos, repo, currentOwners)
+  const owner = key === undefined ? undefined : registeredOwners.get(key)
+  if (!owner) {
     return
   }
-  const roots = createdWorktreeRootsByRepo.get(repoId) ?? new Set<string>()
   const root = resolve(worktreeRoot)
-  if (!roots.has(root) && roots.size >= CREATED_WORKTREE_ROOTS_MAX) {
-    // Refuse rather than evict: dropping an already-authorized root denies a worktree the user is
-    // using, while declining this one only leaves the new create as unauthorized as it is today.
+  if (!owner.recovered.has(root) && owner.recovered.size >= CREATED_WORKTREE_ROOTS_MAX) {
     console.warn(
-      `[filesystem-auth] recovered-root layer full for repo ${repoId}; not authorizing ${root}`
+      `[filesystem-auth] recovered-root layer full for repo ${owner.repoId}; not authorizing ${root}`
     )
     return
   }
-  roots.add(root)
-  createdWorktreeRootsByRepo.set(repoId, roots)
-  registeredWorktreeRootsRevisionByRepo.set(repoId, ++registeredWorktreeRootsRevisionSequence)
+  owner.recovered.add(root)
+  owner.dirty = true
+  advanceOwner(owner)
   refreshRegisteredWorktreeRoots()
   registeredWorktreeRootsDirty = true
 }
 
-/** The recovered layer outlives cache invalidation by design, so suites need an explicit reset. */
 export function __resetCreatedWorktreeRootsForTests(): void {
-  createdWorktreeRootsByRepo.clear()
+  for (const owner of registeredOwners.values()) {
+    owner.recovered.clear()
+    advanceOwner(owner)
+  }
   refreshRegisteredWorktreeRoots()
 }
 
 export function getRegisteredWorktreeRootsRevision(repoId: string): number {
-  return registeredWorktreeRootsRevisionByRepo.get(repoId) ?? registeredWorktreeRootsBaseRevision
+  return registeredWorktreeRootsRevisionByRepo.get(repoId) ?? baseRevision
 }
 
 export async function ensureAuthorizedRootsCache(store: Store): Promise<void> {
-  if (!registeredWorktreeRootsDirty) {
-    return
-  }
-  if (!registeredWorktreeRootsRefresh) {
-    registeredWorktreeRootsRefresh = rebuildAuthorizedRootsCache(store).finally(() => {
-      registeredWorktreeRootsRefresh = null
-    })
+  synchronizeOwners(store)
+  // Follow one superseded refresh; continuous catalog churn must not pin authorization forever.
+  for (let attempt = 0; registeredWorktreeRootsDirty && attempt < 2; attempt++) {
+    if (!registeredWorktreeRootsRefresh) {
+      registeredWorktreeRootsRefresh = rebuildAuthorizedRootsCache(store).finally(() => {
+        registeredWorktreeRootsRefresh = null
+      })
+    }
+    await registeredWorktreeRootsRefresh
   }
-  await registeredWorktreeRootsRefresh
 }
 
-/**
- * Resolve and verify that a worktree path belongs to a registered repo.
- *
- * Why not resolveAuthorizedPath: linked worktrees can live outside repo/workspace roots; git trusts exact `git worktree list` registration, not containment.
- */
 export async function resolveRegisteredWorktreePath(
   worktreePath: string,
   store: Store
 ): Promise<string> {
-  // Reject malformed paths (null byte) early to prevent probing via realpath.
   if (!worktreePath || worktreePath.includes('\0')) {
     throw new Error('Access denied: invalid worktree path')
   }
-
+  synchronizeOwners(store)
   const resolvedTarget = resolve(worktreePath)
-  if (registeredWorktreeRoots.has(resolvedTarget) || isRepoRoot(store.getRepos(), resolvedTarget)) {
+  if (
+    registeredWorktreeRoots.has(resolvedTarget) ||
+    [...currentOwners.values()].some((repo) => resolve(repo.path) === resolvedTarget)
+  ) {
     return resolvedTarget
   }
-
-  if (registeredWorktreeRootsDirty) {
-    await ensureAuthorizedRootsCache(store)
-  }
-
+  await ensureAuthorizedRootsCache(store)
   if (registeredWorktreeRoots.has(resolvedTarget)) {
     return resolvedTarget
   }
-
-  // Resolve symlinks only after the cheap registered-root check: on macOS realpath() can trigger TCC prompts.
   const normalizedTarget = await normalizeExistingPath(resolvedTarget)
+  synchronizeOwners(store)
   if (registeredWorktreeRoots.has(normalizedTarget)) {
     return normalizedTarget
   }
-
   throw new Error('Access denied: unknown repository or worktree path')
 }
 
 function refreshRegisteredWorktreeRoots(): void {
   registeredWorktreeRoots.clear()
-  for (const byRepo of [registeredWorktreeRootsByRepo, createdWorktreeRootsByRepo]) {
-    for (const roots of byRepo.values()) {
-      for (const root of roots) {
-        registeredWorktreeRoots.add(root)
+  for (const owner of registeredOwners.values()) {
+    for (const roots of [owner.listed, owner.recovered, owner.aliases]) {
+      if (roots) {
+        for (const root of roots) {
+          registeredWorktreeRoots.add(root)
+        }
       }
     }
   }
 }
 
-function allLocalRepoRootsRegistered(localRepoIds: Set<string>): boolean {
-  for (const repoId of localRepoIds) {
-    if (!registeredWorktreeRootRepoIds.has(repoId)) {
-      return false
-    }
-  }
-  return true
-}
-
-export function isRegisteredWorktreePath(targetPath: string): boolean {
+export function isRegisteredWorktreePath(targetPath: string, store: Store): boolean {
+  synchronizeOwners(store)
   for (const root of registeredWorktreeRoots) {
     if (isDescendantOrEqual(targetPath, root)) {
       return true
@@ -318,31 +249,49 @@ export function isRegisteredWorktreePath(targetPath: string): boolean {
 
 export async function isPathAllowedByCanonicalRegisteredRoot(
   targetPath: string,
-  sourcePath: string | undefined
+  sourcePath: string | undefined,
+  store: Store
 ): Promise<boolean> {
   if (!sourcePath) {
     return false
   }
+  synchronizeOwners(store)
   const textualRoot = findRegisteredWorktreeRoot(sourcePath)
   if (!textualRoot) {
     return false
   }
+  const generation = invalidationGeneration
+  const owners = [...registeredOwners.values()]
+    .filter(
+      (owner) =>
+        owner.listed?.has(textualRoot) ||
+        owner.recovered.has(textualRoot) ||
+        owner.aliases.has(textualRoot)
+    )
+    .map((owner) => ({ owner, revision: owner.revision }))
   const canonicalRoot = await normalizeExistingPath(textualRoot)
-  if (!isDescendantOrEqual(targetPath, canonicalRoot)) {
+  synchronizeOwners(store)
+  if (generation !== invalidationGeneration || !isDescendantOrEqual(targetPath, canonicalRoot)) {
     return false
   }
-  // Why: #1524 stopped realpath'ing every root (macOS privacy prompts); cache only the actively-accessed root so /var→/private/var aliases resolve.
-  registeredWorktreeRoots.add(canonicalRoot)
-  return true
+  let allowed = false
+  for (const { owner, revision } of owners) {
+    if (owner.revision !== revision) {
+      continue
+    }
+    owner.aliases.add(canonicalRoot)
+    allowed = true
+  }
+  if (allowed) {
+    registeredWorktreeRoots.add(canonicalRoot)
+  }
+  return allowed
 }
 
 function findRegisteredWorktreeRoot(targetPath: string): string | null {
   let bestRoot: string | null = null
   for (const root of registeredWorktreeRoots) {
-    if (!isDescendantOrEqual(targetPath, root)) {
-      continue
-    }
-    if (!bestRoot || root.length > bestRoot.length) {
+    if (isDescendantOrEqual(targetPath, root) && (!bestRoot || root.length > bestRoot.length)) {
       bestRoot = root
     }
   }
diff --git a/src/main/ipc/remote-filesystem-owner.ts b/src/main/ipc/remote-filesystem-owner.ts
new file mode 100644
index 000000000000..9fc17f83bad4
--- /dev/null
+++ b/src/main/ipc/remote-filesystem-owner.ts
@@ -0,0 +1,25 @@
+import { parseExecutionHostId } from '../../shared/execution-host'
+
+/**
+ * Whether another machine holds this row's files, so its path must not authorize local reads.
+ *
+ * Fails closed on a stamp the parser rejects — empty `ssh:`, a bad escape, an embedded `|` (refused
+ * so an alias cannot be rebound), an unknown prefix. `getSshTargetIdForExecutionHost` answers null
+ * for all of them, and in an allow-list "cannot place this owner" must not read as "this machine".
+ * A `runtime:` stamp stays local: on a repo row it names the store's own runtime, never a peer.
+ */
+export function hasRemoteFilesystemOwner(scope: {
+  connectionId?: string | null
+  executionHostId?: string | null
+}): boolean {
+  // Keep legacy exclusions, including runtime rows whose connection belongs to that runtime.
+  if (scope.connectionId) {
+    return true
+  }
+  const stampedHostId = scope.executionHostId?.trim()
+  if (!stampedHostId) {
+    return false
+  }
+  const host = parseExecutionHostId(stampedHostId)
+  return host === null || host.kind === 'ssh'
+}
diff --git a/src/main/ipc/remote-workspace-relay-sync.ts b/src/main/ipc/remote-workspace-relay-sync.ts
index b4dcab5a0bff..428522240900 100644
--- a/src/main/ipc/remote-workspace-relay-sync.ts
+++ b/src/main/ipc/remote-workspace-relay-sync.ts
@@ -2,7 +2,8 @@ import type {
   RemoteWorkspaceObservedPatchResult,
   RemoteWorkspaceObservedSnapshot,
   RemoteWorkspacePatchResult,
-  RemoteWorkspaceSession
+  RemoteWorkspaceSession,
+  RemoteWorkspaceSnapshot
 } from '../../shared/remote-workspace-types'
 import type { SshTarget } from '../../shared/ssh-types'
 import { getActiveMultiplexer } from './ssh'
@@ -18,9 +19,11 @@ import {
   remoteWorkspaceSessionMatchesSnapshot
 } from './remote-workspace-snapshot-normalization'
 
-export async function getRemoteSnapshot(
-  target: SshTarget
-): Promise<RemoteWorkspaceObservedSnapshot | null> {
+// Keep comparison and cache mutation together in the response continuation.
+export async function readRemoteSnapshot<Result>(
+  target: SshTarget,
+  receive: (snapshot: RemoteWorkspaceSnapshot) => Result
+): Promise<Result | null> {
   const mux = getActiveMultiplexer(target.id)
   if (!mux) {
     return null
@@ -28,8 +31,7 @@ export async function getRemoteSnapshot(
   const namespace = getRemoteWorkspaceNamespace(target)
   try {
     const raw = await mux.request('workspace.get', { namespace })
-    const snapshot = normalizeSnapshot(raw, namespace)
-    return rememberRemoteWorkspaceSnapshot(target.id, snapshot)
+    return receive(normalizeSnapshot(raw, namespace))
   } catch (err) {
     if ((err as { code?: unknown })?.code === -32601) {
       return null
@@ -38,6 +40,14 @@ export async function getRemoteSnapshot(
   }
 }
 
+export function getRemoteSnapshot(
+  target: SshTarget
+): Promise<RemoteWorkspaceObservedSnapshot | null> {
+  return readRemoteSnapshot(target, (snapshot) =>
+    rememberRemoteWorkspaceSnapshot(target.id, snapshot)
+  )
+}
+
 function observePatchResult(
   targetId: string,
   result: RemoteWorkspacePatchResult
diff --git a/src/main/ipc/remote-workspace-snapshot-cache.ts b/src/main/ipc/remote-workspace-snapshot-cache.ts
index 36be88e633a2..2f9e26c5e81a 100644
--- a/src/main/ipc/remote-workspace-snapshot-cache.ts
+++ b/src/main/ipc/remote-workspace-snapshot-cache.ts
@@ -17,11 +17,12 @@ type RemoteWorkspaceSnapshotCacheEntry = {
 
 const latestSnapshotByTargetId = new Map<string, RemoteWorkspaceSnapshotCacheEntry>()
 
-function snapshotsAreIdentical(
-  previous: RemoteWorkspaceObservedSnapshot,
+export function remoteWorkspaceSnapshotsAreIdentical(
+  previous: RemoteWorkspaceSnapshot | undefined,
   next: RemoteWorkspaceSnapshot
 ): boolean {
   return (
+    previous !== undefined &&
     previous.namespace === next.namespace &&
     previous.revision === next.revision &&
     previous.updatedAt === next.updatedAt &&
@@ -59,7 +60,7 @@ export function rememberRemoteWorkspaceSnapshot(
   // observations do not revoke an in-flight upload authority.
   const normalizedSnapshot = normalizeSnapshot(snapshot, snapshot.namespace)
   const current = latestSnapshotByTargetId.get(targetId)
-  if (current && snapshotsAreIdentical(current.snapshot, normalizedSnapshot)) {
+  if (current && remoteWorkspaceSnapshotsAreIdentical(current.snapshot, normalizedSnapshot)) {
     // Re-reading an unchanged revision is not a new host observation. Keep the
     // token (and the contiguous local-patch authorization window) stable so a
     // polling read cannot invalidate an upload that is already in flight.
diff --git a/src/main/ipc/remote-workspace-stale-resync.test.ts b/src/main/ipc/remote-workspace-stale-resync.test.ts
index 2c7ceece9d44..07950563a940 100644
--- a/src/main/ipc/remote-workspace-stale-resync.test.ts
+++ b/src/main/ipc/remote-workspace-stale-resync.test.ts
@@ -1,9 +1,13 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { Store } from '../persistence'
+import { SshChannelMultiplexer } from '../ssh/ssh-channel-multiplexer'
+import { encodeJsonRpcFrame } from '../ssh/relay-protocol'
 import {
   REMOTE_WORKSPACE_STALE_NOTIFICATION,
+  REMOTE_WORKSPACE_CHANGED_NOTIFICATION,
   type RemoteWorkspaceChangedEvent,
-  type RemoteWorkspaceSession
+  type RemoteWorkspaceSession,
+  type RemoteWorkspaceSnapshot
 } from '../../shared/remote-workspace-types'
 
 const { getActiveMultiplexerMock, getSshConnectionStoreMock } = vi.hoisted(() => ({
@@ -29,6 +33,13 @@ import {
   handleRemoteWorkspaceNotification,
   registerRemoteWorkspaceHandlers
 } from './remote-workspace'
+import {
+  getCachedRemoteWorkspaceSnapshot,
+  rememberLocallyPatchedRemoteWorkspaceSnapshot,
+  rememberRemoteWorkspaceSnapshot
+} from './remote-workspace-snapshot-cache'
+import { isRemoteWorkspaceResyncInFlight } from './remote-workspace-stale-resync'
+import { CLIENT_ID } from './remote-workspace-client-identity'
 
 function session(activeTabId: string): RemoteWorkspaceSession {
   return {
@@ -41,6 +52,16 @@ function session(activeTabId: string): RemoteWorkspaceSession {
   }
 }
 
+function snapshot(revision: number, tabId: string): RemoteWorkspaceSnapshot {
+  return {
+    namespace: 'target-1',
+    revision,
+    updatedAt: revision,
+    schemaVersion: 1,
+    session: session(tabId)
+  }
+}
+
 describe('workspace.stale resync', () => {
   const sent: RemoteWorkspaceChangedEvent[] = []
   const request = vi.fn()
@@ -150,4 +171,271 @@ describe('workspace.stale resync', () => {
     await Promise.resolve()
     expect(sent).toHaveLength(1)
   })
+
+  it.each(['own', 'peer'] as const)(
+    'checks a %s snapshot against the own patch reply received during its pending read',
+    async (source) => {
+      rememberRemoteWorkspaceSnapshot('target-1', snapshot(1, 'tab-before-patch'))
+      const ownSnapshot = snapshot(2, 'tab-from-own-patch')
+      const readSnapshot = source === 'own' ? ownSnapshot : snapshot(3, 'tab-from-peer')
+      request.mockResolvedValue(readSnapshot)
+      let releaseRead: ((value: RemoteWorkspaceSnapshot) => void) | undefined
+      request.mockImplementationOnce(
+        () =>
+          new Promise<RemoteWorkspaceSnapshot>((resolve) => {
+            releaseRead = resolve
+          })
+      )
+
+      handleRemoteWorkspaceNotification('target-1', REMOTE_WORKSPACE_STALE_NOTIFICATION, {
+        namespace: 'target-1'
+      })
+      expect(request).toHaveBeenCalledTimes(1)
+      expect(isRemoteWorkspaceResyncInFlight('target-1')).toBe(true)
+
+      // The relay publishes the stale marker before returning this client's patch reply.
+      rememberLocallyPatchedRemoteWorkspaceSnapshot('target-1', ownSnapshot)
+      releaseRead?.(readSnapshot)
+      await vi.waitFor(() => expect(isRemoteWorkspaceResyncInFlight('target-1')).toBe(false))
+
+      expect(sent.map((event) => event.snapshot.session.activeTabId)).toEqual(
+        source === 'own' ? [] : ['tab-from-peer']
+      )
+    }
+  )
+
+  it('delivers a peer snapshot cached by a stale-revision patch reply during the read', async () => {
+    rememberRemoteWorkspaceSnapshot('target-1', snapshot(1, 'tab-before-peer'))
+    const peerSnapshot = snapshot(2, 'tab-from-peer')
+    let releaseRead: ((value: RemoteWorkspaceSnapshot) => void) | undefined
+    request.mockImplementationOnce(
+      () =>
+        new Promise<RemoteWorkspaceSnapshot>((resolve) => {
+          releaseRead = resolve
+        })
+    )
+
+    handleRemoteWorkspaceNotification('target-1', REMOTE_WORKSPACE_STALE_NOTIFICATION, {
+      namespace: 'target-1'
+    })
+    // A rejected local patch caches the peer snapshot, but the renderer only records a conflict.
+    rememberRemoteWorkspaceSnapshot('target-1', peerSnapshot)
+    releaseRead?.(peerSnapshot)
+    await vi.waitFor(() => expect(isRemoteWorkspaceResyncInFlight('target-1')).toBe(false))
+
+    expect(sent.map((event) => event.snapshot.session.activeTabId)).toEqual(['tab-from-peer'])
+    expect(request).toHaveBeenCalledTimes(1)
+  })
+
+  it('suppresses an own reply already acknowledged before the marker', async () => {
+    const ownSnapshot = snapshot(2, 'tab-from-own-patch')
+    rememberLocallyPatchedRemoteWorkspaceSnapshot('target-1', ownSnapshot)
+    request.mockResolvedValue(ownSnapshot)
+
+    handleRemoteWorkspaceNotification('target-1', REMOTE_WORKSPACE_STALE_NOTIFICATION, {
+      namespace: 'target-1'
+    })
+    await vi.waitFor(() => expect(isRemoteWorkspaceResyncInFlight('target-1')).toBe(false))
+
+    expect(sent).toEqual([])
+  })
+
+  it('still reads a queued peer change after suppressing the own echo', async () => {
+    const ownSnapshot = snapshot(2, 'tab-from-own-patch')
+    let releaseRead: ((value: RemoteWorkspaceSnapshot) => void) | undefined
+    request.mockImplementationOnce(
+      () =>
+        new Promise<RemoteWorkspaceSnapshot>((resolve) => {
+          releaseRead = resolve
+        })
+    )
+    request.mockResolvedValue(snapshot(3, 'tab-from-peer'))
+
+    for (let index = 0; index < 2; index += 1) {
+      handleRemoteWorkspaceNotification('target-1', REMOTE_WORKSPACE_STALE_NOTIFICATION, {
+        namespace: 'target-1'
+      })
+    }
+
+    rememberLocallyPatchedRemoteWorkspaceSnapshot('target-1', ownSnapshot)
+    releaseRead?.(ownSnapshot)
+    await vi.waitFor(() => expect(isRemoteWorkspaceResyncInFlight('target-1')).toBe(false))
+
+    expect(request).toHaveBeenCalledTimes(2)
+    expect(sent.map((event) => event.snapshot.session.activeTabId)).toEqual(['tab-from-peer'])
+  })
+
+  it('keeps an own acknowledgement from suppressing another target', async () => {
+    const releases: ((value: RemoteWorkspaceSnapshot) => void)[] = []
+    request.mockImplementation(
+      () => new Promise<RemoteWorkspaceSnapshot>((resolve) => releases.push(resolve))
+    )
+    for (const targetId of ['target-1', 'target-2']) {
+      handleRemoteWorkspaceNotification(targetId, REMOTE_WORKSPACE_STALE_NOTIFICATION, {
+        namespace: 'target-1'
+      })
+    }
+    const ownSnapshot = snapshot(2, 'same-tab')
+    rememberLocallyPatchedRemoteWorkspaceSnapshot('target-1', ownSnapshot)
+    releases[0]?.(ownSnapshot)
+    releases[1]?.(ownSnapshot)
+    await vi.waitFor(() => {
+      expect(isRemoteWorkspaceResyncInFlight('target-1')).toBe(false)
+      expect(isRemoteWorkspaceResyncInFlight('target-2')).toBe(false)
+    })
+
+    expect(sent.map((event) => event.targetId)).toEqual(['target-2'])
+  })
+
+  it('does not deliver a captured read after a same-token own acknowledgement advances the cache', async () => {
+    rememberRemoteWorkspaceSnapshot('target-1', snapshot(1, 'initial-tab'))
+    request.mockResolvedValue(snapshot(3, 'newer-own-tab'))
+    let releaseRead: ((value: RemoteWorkspaceSnapshot) => void) | undefined
+    request.mockImplementationOnce(
+      () =>
+        new Promise<RemoteWorkspaceSnapshot>((resolve) => {
+          releaseRead = resolve
+        })
+    )
+    handleRemoteWorkspaceNotification('target-1', REMOTE_WORKSPACE_STALE_NOTIFICATION, {
+      namespace: 'target-1'
+    })
+
+    releaseRead?.(snapshot(2, 'peer-tab'))
+    queueMicrotask(() => {
+      rememberLocallyPatchedRemoteWorkspaceSnapshot('target-1', snapshot(3, 'newer-own-tab'))
+    })
+    await vi.waitFor(() => expect(isRemoteWorkspaceResyncInFlight('target-1')).toBe(false))
+
+    expect(getCachedRemoteWorkspaceSnapshot('target-1')?.revision).toBe(3)
+    expect(sent.map((event) => event.snapshot.revision)).toEqual([])
+    expect(request).toHaveBeenCalledTimes(2)
+  })
+
+  it.each([
+    { source: 'peer', order: 'response-first' },
+    { source: 'peer', order: 'notification-first' },
+    { source: 'own', order: 'response-first' },
+    { source: 'own', order: 'notification-first' }
+  ])(
+    'never publishes an older read after a newer $source notification ($order)',
+    async ({ source, order }) => {
+      let receive: ((data: Buffer) => void) | undefined
+      const mux = new SshChannelMultiplexer({
+        write: () => {},
+        onData: (callback) => {
+          receive = callback
+        },
+        onClose: () => {}
+      })
+      const read = vi.spyOn(mux, 'request')
+      getActiveMultiplexerMock.mockReturnValue(mux)
+      mux.onNotification((method, params) =>
+        handleRemoteWorkspaceNotification('target-1', method, params)
+      )
+      const initial = rememberRemoteWorkspaceSnapshot('target-1', snapshot(2, 'initial-tab'))
+      const sourceClientId = source === 'own' ? CLIENT_ID : 'peer-client'
+      try {
+        handleRemoteWorkspaceNotification('target-1', REMOTE_WORKSPACE_STALE_NOTIFICATION, {
+          namespace: 'target-1'
+        })
+        const reply = { jsonrpc: '2.0', id: 1, result: snapshot(2, 'older-read') } as const
+        const changed = {
+          jsonrpc: '2.0',
+          method: REMOTE_WORKSPACE_CHANGED_NOTIFICATION,
+          params: { snapshot: snapshot(3, 'newer-source'), sourceClientId }
+        } as const
+        const messages = order === 'response-first' ? [reply, changed] : [changed, reply]
+        receive?.(
+          Buffer.concat(messages.map((message, index) => encodeJsonRpcFrame(message, index + 1, 0)))
+        )
+        if (source === 'own') {
+          expect(getCachedRemoteWorkspaceSnapshot('target-1')?.hostObservationToken).toBe(
+            initial.hostObservationToken
+          )
+        }
+        await new Promise((resolve) => setImmediate(resolve))
+        expect(getCachedRemoteWorkspaceSnapshot('target-1')?.revision).toBe(3)
+        expect(sent.map((event) => event.snapshot.revision)).toEqual([3])
+        await vi.waitFor(() => expect(read).toHaveBeenCalledTimes(2))
+        receive?.(
+          encodeJsonRpcFrame({ jsonrpc: '2.0', id: 2, result: snapshot(3, 'newer-source') }, 3, 0)
+        )
+        await vi.waitFor(() => expect(isRemoteWorkspaceResyncInFlight('target-1')).toBe(false))
+        expect(sent.map((event) => event.snapshot.revision)).toEqual([3])
+        expect(sent[0].sourceClientId).toBe(sourceClientId)
+      } finally {
+        mux.dispose()
+      }
+    }
+  )
+
+  it.each([2, 3])(
+    'does not deliver a captured read after peer revision %i replaces it',
+    async (peerRevision) => {
+      rememberRemoteWorkspaceSnapshot('target-1', snapshot(1, 'initial-tab'))
+      const peer = snapshot(peerRevision, 'newer-peer')
+      request.mockResolvedValue(peer)
+      let releaseRead: ((value: RemoteWorkspaceSnapshot) => void) | undefined
+      request.mockImplementationOnce(
+        () =>
+          new Promise<RemoteWorkspaceSnapshot>((resolve) => {
+            releaseRead = resolve
+          })
+      )
+      handleRemoteWorkspaceNotification('target-1', REMOTE_WORKSPACE_STALE_NOTIFICATION, {
+        namespace: 'target-1'
+      })
+
+      releaseRead?.(snapshot(2, 'older-read'))
+      queueMicrotask(() => {
+        handleRemoteWorkspaceNotification('target-1', REMOTE_WORKSPACE_CHANGED_NOTIFICATION, {
+          snapshot: peer,
+          sourceClientId: 'peer-client'
+        })
+      })
+      await vi.waitFor(() => expect(isRemoteWorkspaceResyncInFlight('target-1')).toBe(false))
+
+      expect(getCachedRemoteWorkspaceSnapshot('target-1')?.session.activeTabId).toBe('newer-peer')
+      expect(sent.map((event) => event.snapshot.session.activeTabId)).toEqual(['newer-peer'])
+      expect(request).toHaveBeenCalledTimes(2)
+    }
+  )
+
+  it('accepts a relay reset after rereading a response that raced a host change', async () => {
+    rememberRemoteWorkspaceSnapshot('target-1', snapshot(40, 'before-reset'))
+    request.mockResolvedValue(snapshot(1, 'after-reset'))
+    let releaseRead: ((value: RemoteWorkspaceSnapshot) => void) | undefined
+    request.mockImplementationOnce(
+      () =>
+        new Promise<RemoteWorkspaceSnapshot>((resolve) => {
+          releaseRead = resolve
+        })
+    )
+    handleRemoteWorkspaceNotification('target-1', REMOTE_WORKSPACE_STALE_NOTIFICATION, {
+      namespace: 'target-1'
+    })
+    handleRemoteWorkspaceNotification('target-1', REMOTE_WORKSPACE_CHANGED_NOTIFICATION, {
+      snapshot: snapshot(41, 'last-before-reset'),
+      sourceClientId: 'peer-client'
+    })
+    releaseRead?.(snapshot(1, 'after-reset'))
+    await vi.waitFor(() => expect(isRemoteWorkspaceResyncInFlight('target-1')).toBe(false))
+
+    expect(getCachedRemoteWorkspaceSnapshot('target-1')?.revision).toBe(1)
+    expect(sent.map((event) => event.snapshot.revision)).toEqual([41, 1])
+    expect(request).toHaveBeenCalledTimes(2)
+  })
+
+  it('still accepts a lower revision after a relay reset', async () => {
+    rememberRemoteWorkspaceSnapshot('target-1', snapshot(40, 'before-reset'))
+    request.mockResolvedValue(snapshot(1, 'after-reset'))
+    handleRemoteWorkspaceNotification('target-1', REMOTE_WORKSPACE_STALE_NOTIFICATION, {
+      namespace: 'target-1'
+    })
+    await vi.waitFor(() => expect(isRemoteWorkspaceResyncInFlight('target-1')).toBe(false))
+    expect(getCachedRemoteWorkspaceSnapshot('target-1')?.revision).toBe(1)
+    expect(sent.map((event) => event.snapshot.session.activeTabId)).toEqual(['after-reset'])
+    expect(request).toHaveBeenCalledTimes(1)
+  })
 })
diff --git a/src/main/ipc/remote-workspace-stale-resync.ts b/src/main/ipc/remote-workspace-stale-resync.ts
index 38c96977e976..93f25722df24 100644
--- a/src/main/ipc/remote-workspace-stale-resync.ts
+++ b/src/main/ipc/remote-workspace-stale-resync.ts
@@ -1,7 +1,11 @@
 import type { RemoteWorkspaceObservedSnapshot } from '../../shared/remote-workspace-types'
 import type { SshTarget } from '../../shared/ssh-types'
-import { getRemoteSnapshot } from './remote-workspace-relay-sync'
-import { getCachedRemoteWorkspaceSnapshot } from './remote-workspace-snapshot-cache'
+import { readRemoteSnapshot } from './remote-workspace-relay-sync'
+import {
+  getCachedRemoteWorkspaceSnapshot,
+  remoteWorkspaceSnapshotsAreIdentical,
+  rememberRemoteWorkspaceSnapshot
+} from './remote-workspace-snapshot-cache'
 import { remoteWorkspaceSessionMatchesSnapshot } from './remote-workspace-snapshot-normalization'
 
 type PendingResync = { promise: Promise<void>; requeued: boolean }
@@ -39,17 +43,48 @@ export function resyncStaleRemoteWorkspace(
     try {
       do {
         pending.requeued = false
-        const previous = getCachedRemoteWorkspaceSnapshot(target.id)
-        const snapshot = await getRemoteSnapshot(target)
-        if (!snapshot) {
-          return
+        const cachedBeforeRead = getCachedRemoteWorkspaceSnapshot(target.id)
+        const observation = await readRemoteSnapshot(target, (snapshot) => {
+          // An own patch reply can update the cache while this read is pending.
+          const previous = getCachedRemoteWorkspaceSnapshot(target.id)
+          const changedDuringRead = cachedBeforeRead
+            ? !remoteWorkspaceSnapshotsAreIdentical(previous, cachedBeforeRead)
+            : previous !== undefined
+          if (changedDuringRead) {
+            if (!remoteWorkspaceSnapshotsAreIdentical(previous, snapshot)) {
+              // Reread a conflicting observation; revision comparisons would reject valid relay resets.
+              pending.requeued = true
+              return null
+            }
+            // Only a same-token own ack proves the renderer has this; a stale-revision reply caches undelivered peer state.
+            if (
+              !cachedBeforeRead ||
+              previous?.hostObservationToken === cachedBeforeRead.hostObservationToken
+            ) {
+              return null
+            }
+          }
+          return {
+            unchanged:
+              !changedDuringRead &&
+              remoteWorkspaceSessionMatchesSnapshot(previous, snapshot.session),
+            snapshot: rememberRemoteWorkspaceSnapshot(target.id, snapshot)
+          }
+        })
+        if (!observation) {
+          continue
         }
         // Suppress the echo: our own patch response already cached this session, and re-publishing it
         // makes the renderer rehydrate a state it authored.
-        if (remoteWorkspaceSessionMatchesSnapshot(previous, snapshot.session)) {
+        if (observation.unchanged) {
+          continue
+        }
+        const latest = getCachedRemoteWorkspaceSnapshot(target.id)
+        if (!remoteWorkspaceSnapshotsAreIdentical(latest, observation.snapshot)) {
+          pending.requeued = true
           continue
         }
-        deliver(snapshot)
+        deliver(observation.snapshot)
       } while (pending.requeued)
     } catch (error) {
       onError(error)
diff --git a/src/main/ipc/session.ts b/src/main/ipc/session.ts
index 855401f96c1f..f1f0c1b14e15 100644
--- a/src/main/ipc/session.ts
+++ b/src/main/ipc/session.ts
@@ -1,11 +1,13 @@
 import { ipcMain } from 'electron'
 import type { Store } from '../persistence'
+import type { OrcaRuntimeService } from '../runtime/orca-runtime'
+import { parseTerminalSurfaceCloseTarget } from '../../shared/terminal-surface-close-target'
 import type {
   WorkspaceSessionPatch,
   WorkspaceSessionState
 } from '../../shared/workspace-session-state-types'
 
-export function registerSessionHandlers(store: Store): void {
+export function registerSessionHandlers(store: Store, runtime: OrcaRuntimeService): void {
   // Why: hostId is an optional second arg so an older renderer that invokes
   // these channels without it keeps reading/writing the 'local' partition
   // exactly as before. Channel names stay stable.
@@ -28,6 +30,23 @@ export function registerSessionHandlers(store: Store): void {
     store.patchWorkspaceSession(args, hostId)
   })
 
+  // Why: a renderer save cannot shrink membership main owns, so each close commits it explicitly.
+  ipcMain.handle(
+    'session:close-terminal-surface',
+    (_event, args: { worktreeId?: unknown; target?: unknown; reason?: unknown } | undefined) => {
+      const target = parseTerminalSurfaceCloseTarget(args?.target)
+      if (typeof args?.worktreeId !== 'string' || !target) {
+        throw new Error('invalid_terminal_surface')
+      }
+      // Why only these two: main alone closes a tab for its process exit.
+      return runtime.closeTerminalSurfaceFromRenderer({
+        worktreeId: args.worktreeId,
+        target,
+        reason: args.reason === 'cleanup' ? 'cleanup' : 'user'
+      })
+    }
+  )
+
   ipcMain.handle('session:flush', () => {
     // Why: durable lifecycle RPCs must propagate disk failures instead of
     // returning success through Store.flush(), which intentionally only logs.
diff --git a/src/main/ipc/settings.ts b/src/main/ipc/settings.ts
index f3c1b8aeaf8e..d2a79ef1885c 100644
--- a/src/main/ipc/settings.ts
+++ b/src/main/ipc/settings.ts
@@ -12,6 +12,7 @@ import { SETTINGS_CHANGED_WHITELIST, type SettingsChangedKey } from '../../share
 import type { AgentAwakeService } from '../agent-awake-service'
 import { sanitizeFloatingWorkspaceDirectorySetting } from './floating-workspace-directory'
 import { applyAgentStatusHooksEnabled } from '../agent-hooks/managed-agent-hook-controls'
+import { isAgentStatusHooksEnabledForAgent } from '../../shared/agent-status-hooks-setting'
 import { recordManagedHookInstallFailure } from '../agent-hooks/install-telemetry'
 import { applyElectronProxySettings } from '../network/proxy-settings'
 import { applyBrowserSessionProxies } from '../browser/browser-session-proxy'
@@ -242,13 +243,7 @@ export function registerSettingsHandlers(
           userInitiated: true,
           shouldHydrateShellPath: app.isPackaged,
           onInstallError: recordManagedHookInstallFailure,
-          shouldContinue: (agent) => {
-            const settings = store.getSettings()
-            return (
-              settings.agentStatusHooksEnabled !== false &&
-              !settings.disabledTuiAgents.includes(agent)
-            )
-          }
+          shouldContinue: (agent) => isAgentStatusHooksEnabledForAgent(store.getSettings(), agent)
         })
       } catch (error) {
         console.warn('[settings] failed to reconcile managed agent hooks:', error)
diff --git a/src/main/ipc/speech-worker-exit-lifetime.test.ts b/src/main/ipc/speech-worker-exit-lifetime.test.ts
new file mode 100644
index 000000000000..dc0cfb4a210f
--- /dev/null
+++ b/src/main/ipc/speech-worker-exit-lifetime.test.ts
@@ -0,0 +1,288 @@
+import { EventEmitter } from 'node:events'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { Store } from '../persistence'
+import type { ModelManager } from '../speech/model-manager'
+import type { SttService } from '../speech/stt-service'
+import type { RuntimeStore } from '../runtime/runtime-store-contract'
+
+type SpeechHandler = (
+  event: { sender: { id: number } },
+  modelOrSession: string,
+  hotwords?: string[],
+  sessionId?: string
+) => Promise<void>
+
+type TestWorker = EventEmitter & {
+  emitStoppedOnStop: boolean
+  postMessage: (message: { type: string }) => void
+}
+
+const environment = vi.hoisted(
+  (): {
+    handlers: Map<string, SpeechHandler>
+    window: TestWindow | null
+    service: SttService | null
+    workers: TestWorker[]
+    readyOnInit: boolean
+  } => ({
+    handlers: new Map<string, SpeechHandler>(),
+    window: null,
+    service: null,
+    workers: [],
+    readyOnInit: true
+  })
+)
+
+vi.mock('electron', () => ({
+  ipcMain: {
+    handle: (name: string, callback: SpeechHandler) => environment.handlers.set(name, callback)
+  },
+  BrowserWindow: { fromWebContents: () => environment.window },
+  systemPreferences: {
+    getMediaAccessStatus: () => 'granted',
+    askForMediaAccess: async () => true
+  }
+}))
+vi.mock('../speech/speech-runtime-service', () => ({
+  getSpeechModelManager: () => ({ getModelState: async () => ({ status: 'ready' }) }),
+  getSpeechSttService: () => environment.service
+}))
+vi.mock('../speech/openai-api-key-store', () => ({
+  readOpenAiSpeechApiKey: vi.fn(),
+  clearOpenAiSpeechApiKey: vi.fn(),
+  hasOpenAiSpeechApiKey: () => false,
+  saveOpenAiSpeechApiKey: vi.fn()
+}))
+vi.mock('../speech/model-catalog', () => ({
+  SPEECH_MODEL_CATALOG: [],
+  getCatalogModel: () => ({
+    id: 'test-model',
+    provider: 'local',
+    type: 'transducer',
+    streaming: true,
+    sampleRate: 16000,
+    files: []
+  })
+}))
+vi.mock('../speech/stt-worker-paths', () => ({
+  getSttWorkerPath: () => 'unused-worker',
+  getSherpaModulePath: () => 'unused-module'
+}))
+vi.mock('node:worker_threads', async () => {
+  const { EventEmitter: WorkerEvents } = await import('node:events')
+  return {
+    Worker: class extends WorkerEvents implements TestWorker {
+      emitStoppedOnStop = true
+      constructor() {
+        super()
+        environment.workers.push(this)
+      }
+      postMessage(message: { type: string }): void {
+        if (message.type === 'init' && environment.readyOnInit) {
+          queueMicrotask(() => this.emit('message', { type: 'ready' }))
+        }
+        if (message.type === 'stop' && this.emitStoppedOnStop) {
+          queueMicrotask(() => this.emit('message', { type: 'stopped' }))
+        }
+      }
+      async terminate(): Promise<number> {
+        this.emit('exit', 0)
+        return 0
+      }
+    }
+  }
+})
+
+import { registerSpeechHandlers } from './speech'
+import { SttService as SpeechService } from '../speech/stt-service'
+import { RuntimeMobileDictationController } from '../runtime/runtime-mobile-dictation-controller'
+
+class TestWindow extends EventEmitter {
+  destroyed = false
+  webContents = { send: vi.fn() }
+  isDestroyed(): boolean {
+    return this.destroyed
+  }
+}
+
+function handler(name: string): SpeechHandler {
+  const callback = environment.handlers.get(name)
+  if (!callback) {
+    throw new Error(`Missing handler: ${name}`)
+  }
+  return callback
+}
+
+function worker(): TestWorker {
+  const current = environment.workers.at(-1)
+  if (!current) {
+    throw new Error('No worker created')
+  }
+  return current
+}
+
+function service(): SttService {
+  if (!environment.service) {
+    throw new Error('No service created')
+  }
+  return environment.service
+}
+
+const sender = { sender: { id: 9 } }
+const start = (session = 'one'): Promise<void> =>
+  handler('speech:startDictation')(sender, 'test-model', undefined, session)
+const stop = (session = 'one'): Promise<void> => handler('speech:stopDictation')(sender, session)
+
+describe('speech worker exit ownership', () => {
+  let window: TestWindow
+  beforeEach(() => {
+    environment.handlers.clear()
+    environment.workers = []
+    environment.readyOnInit = true
+    window = new TestWindow()
+    environment.window = window
+    const modelManager: Pick<ModelManager, 'getModelState' | 'getModelDir'> = {
+      getModelState: async () => ({ id: 'test-model', status: 'ready' as const }),
+      getModelDir: () => 'unused-model'
+    }
+    environment.service = new SpeechService(
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Local startup reads only these two model-manager methods.
+      modelManager as ModelManager
+    )
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Mocked runtime accessors do not read the store.
+    registerSpeechHandlers({} as Store)
+  })
+  afterEach(async () => {
+    window.destroyed = true
+    window.emit('closed')
+    await Promise.resolve()
+    await Promise.resolve()
+    await service().prepareModelForDeletion('test-model')
+  })
+
+  it.each([0, 1])('releases the window listener after unexpected exit code %i', async (code) => {
+    for (let cycle = 0; cycle < 15; cycle++) {
+      await start(String(cycle))
+      expect(window.listenerCount('closed')).toBe(1)
+      const current = worker()
+      current.emit('exit', code)
+      expect(service().isActive()).toBe(false)
+      expect(window.listenerCount('closed')).toBe(0)
+      expect(current.listenerCount('message')).toBe(0)
+      expect(current.listenerCount('error')).toBe(0)
+      expect(current.listenerCount('exit')).toBe(0)
+      await stop(String(cycle))
+    }
+    expect(
+      window.webContents.send.mock.calls.filter(([name]) => name === 'speech:stopped')
+    ).toHaveLength(15)
+  })
+
+  it('does not duplicate the in-flight stop notification', async () => {
+    await start()
+    worker().emitStoppedOnStop = false
+    const pendingStop = stop()
+    worker().emit('exit', 1)
+    await pendingStop
+    expect(window.listenerCount('closed')).toBe(0)
+    expect(
+      window.webContents.send.mock.calls.filter(([name]) => name === 'speech:stopped')
+    ).toHaveLength(1)
+  })
+
+  it('keeps a normal stop reusable and ignores a later idle-worker exit', async () => {
+    await start()
+    const current = worker()
+    await stop()
+    expect(window.listenerCount('closed')).toBe(0)
+    await start('two')
+    expect(worker()).toBe(current)
+    await stop('two')
+    current.emit('exit', 0)
+    expect(
+      window.webContents.send.mock.calls.filter(([name]) => name === 'speech:stopped')
+    ).toHaveLength(2)
+  })
+
+  it('cleans a failed startup and allows a new session', async () => {
+    environment.readyOnInit = false
+    const pendingStart = start()
+    const rejected = expect(pendingStart).rejects.toThrow('Speech worker exited before ready: 1')
+    await Promise.resolve()
+    worker().emit('exit', 1)
+    await rejected
+    expect(window.listenerCount('closed')).toBe(0)
+    environment.readyOnInit = true
+    await start('two')
+    expect(service().isActive()).toBe(true)
+    await stop('two')
+  })
+
+  it('preserves error delivery and listener cleanup', async () => {
+    await start()
+    const current = worker()
+    current.emit('error', new Error('synthetic failure'))
+    await vi.waitFor(() => expect(window.listenerCount('closed')).toBe(0))
+    expect(window.webContents.send).toHaveBeenCalledWith('speech:error', {
+      error: 'Error: synthetic failure',
+      sessionId: 'one'
+    })
+    current.emit('exit', 1)
+    expect(service().isActive()).toBe(false)
+  })
+
+  it('preserves startup cancellation without duplicate stopped events', async () => {
+    environment.readyOnInit = false
+    const pendingStart = start()
+    const rejected = expect(pendingStart).rejects.toThrow('Speech worker exited before ready: 1')
+    await Promise.resolve()
+    worker().emitStoppedOnStop = false
+    const pendingStop = stop()
+    worker().emit('exit', 1)
+    await Promise.all([pendingStop, rejected])
+    expect(window.listenerCount('closed')).toBe(0)
+    expect(
+      window.webContents.send.mock.calls.filter(([name]) => name === 'speech:stopped')
+    ).toHaveLength(1)
+  })
+
+  it('preserves mobile partial text and completion after worker exit', async () => {
+    const store = { getSettings: () => ({ voice: { enabled: true, sttModel: 'test-model' } }) }
+    const controller = new RuntimeMobileDictationController(
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The controller reads settings; mocked speech accessors ignore the rest of the store.
+      () => store as RuntimeStore
+    )
+    const params = { dictationId: 'mobile', clientId: 'client', connectionId: 'connection' }
+    await controller.start(params)
+    worker().emit('message', { type: 'partial', text: 'keep these words' })
+    worker().emit('exit', 0)
+    await expect(controller.finish(params)).resolves.toEqual({
+      dictationId: 'mobile',
+      text: 'keep these words'
+    })
+    expect(service().isActive()).toBe(false)
+  })
+
+  it('clears old ownership before notifying a sink that immediately starts again', async () => {
+    let restarted: Promise<void> | undefined
+    await service().startDictation(
+      'test-model',
+      (event) => {
+        if (event.type === 'stopped') {
+          restarted = service().startDictation('test-model', vi.fn(), undefined, 'replacement')
+        }
+      },
+      undefined,
+      'original'
+    )
+    const retired = worker()
+    retired.emit('exit', 0)
+    expect(restarted).toBeDefined()
+    await restarted
+    expect(worker()).not.toBe(retired)
+    retired.emit('exit', 0)
+    retired.emit('message', { type: 'stopped' })
+    expect(service().isActive()).toBe(true)
+    await service().stopDictation('replacement')
+  })
+})
diff --git a/src/main/ipc/ssh-connection-state-callbacks.ts b/src/main/ipc/ssh-connection-state-callbacks.ts
index e42b164cae8f..5daa25ed2b17 100644
--- a/src/main/ipc/ssh-connection-state-callbacks.ts
+++ b/src/main/ipc/ssh-connection-state-callbacks.ts
@@ -120,9 +120,9 @@ export function handleSshConnectionStateChange(targetId: string, state: SshConne
 
 export function createSshConnectionCallbacks(): SshConnectionCallbacks {
   return {
-    onCredentialRequest: (targetId, kind, detail, signal) => {
+    onCredentialRequest: (targetId, kind, detail, echo, signal) => {
       credentialRequestedForTarget.add(targetId)
-      return requestCredential(getCurrentMainWindow, targetId, kind, detail, signal)
+      return requestCredential(getCurrentMainWindow, targetId, kind, detail, echo, signal)
     },
     onStateChange: handleSshConnectionStateChange
   }
diff --git a/src/main/ipc/ssh-passphrase.test.ts b/src/main/ipc/ssh-passphrase.test.ts
index 560ddd6d6f39..f3d2a65f9ed8 100644
--- a/src/main/ipc/ssh-passphrase.test.ts
+++ b/src/main/ipc/ssh-passphrase.test.ts
@@ -25,6 +25,7 @@ describe('SSH credential requests', () => {
       'target-1',
       'keyboard-interactive',
       'Duo response',
+      undefined,
       controller.signal
     )
     const request = vi.mocked(window.webContents.send).mock.calls[0][1] as { requestId: string }
diff --git a/src/main/ipc/ssh-passphrase.ts b/src/main/ipc/ssh-passphrase.ts
index 6de7d483bcd0..abebfa3a3aef 100644
--- a/src/main/ipc/ssh-passphrase.ts
+++ b/src/main/ipc/ssh-passphrase.ts
@@ -18,6 +18,7 @@ export function requestCredential(
   targetId: string,
   kind: SshCredentialKind,
   detail: string,
+  echo?: boolean,
   signal?: AbortSignal
 ): Promise<string | null> {
   const requestId = randomUUID()
@@ -43,7 +44,7 @@ export function requestCredential(
 
   const win = getMainWindow()
   if (win && !win.isDestroyed()) {
-    win.webContents.send('ssh:credential-request', { requestId, targetId, kind, detail })
+    win.webContents.send('ssh:credential-request', { requestId, targetId, kind, detail, echo })
   } else {
     finish(null)
   }
diff --git a/src/main/ipc/telemetry.test.ts b/src/main/ipc/telemetry.test.ts
index 9b28270551a0..b49e1882e98b 100644
--- a/src/main/ipc/telemetry.test.ts
+++ b/src/main/ipc/telemetry.test.ts
@@ -161,6 +161,7 @@ describe('telemetry IPC handlers', () => {
       bucket_source: 'crossed_now'
     })
     handler({}, 'daemon_audit_eligibility', {})
+    handler({}, 'agent_token_usage', {})
     expect(trackMock).not.toHaveBeenCalled()
     expect(getCohortAtEmitMock).not.toHaveBeenCalled()
   })
diff --git a/src/main/ipc/telemetry.ts b/src/main/ipc/telemetry.ts
index 767ebed598fe..ad954b20ce19 100644
--- a/src/main/ipc/telemetry.ts
+++ b/src/main/ipc/telemetry.ts
@@ -23,6 +23,7 @@ import type { EventName, EventProps, OptInVia } from '../../shared/telemetry-eve
 let storeRef: Store | null = null
 
 const MAIN_OWNED_TELEMETRY_EVENTS = new Set<EventName>([
+  'agent_token_usage',
   'app_starred_orca',
   'daemon_adopted',
   'daemon_audit_eligibility',
diff --git a/src/main/ipc/worktree-remote.ts b/src/main/ipc/worktree-remote.ts
index 4f066027efaf..767c6ece2460 100644
--- a/src/main/ipc/worktree-remote.ts
+++ b/src/main/ipc/worktree-remote.ts
@@ -1,3 +1,4 @@
+import { markQoderWorkspaceTrusted } from '../qoder/workspace-trust'
 /* eslint-disable max-lines */
 // Why: worktree create helpers (local + remote) split out of worktrees.ts; the cohesive create flow runs this file just over the per-file line limit.
 
@@ -157,6 +158,7 @@ import {
   markCopilotFolderTrusted,
   markCursorWorkspaceTrusted
 } from '../agent-trust-presets'
+import { awaitAgentTrustWriteWithinDeadline } from '../agent-trust-write-deadline'
 import {
   getLocalProjectGitExecOptions,
   getLocalProjectWorktreeGitOptions,
@@ -438,12 +440,21 @@ async function spawnLocalStartupAndSetupTerminals(args: {
     if (isTuiAgent(createdWithAgent)) {
       const preset = TUI_AGENT_CONFIG[createdWithAgent].preflightTrust
       try {
-        if (preset === 'cursor') {
+        if (preset === 'qoder') {
+          markQoderWorkspaceTrusted(worktree.path)
+        } else if (preset === 'cursor') {
           markCursorWorkspaceTrusted(worktree.path)
         } else if (preset === 'copilot') {
           markCopilotFolderTrusted(worktree.path)
         } else if (preset === 'codex') {
-          markCodexProjectTrusted(worktree.path)
+          // Why: the PTY below spawns Codex immediately; a discarded Promise let
+          // it reach the trust menu before the write landed, and its rejection
+          // escaped this synchronous catch. Bounded so a wedged config lane
+          // cannot stall worktree creation.
+          await awaitAgentTrustWriteWithinDeadline(markCodexProjectTrusted(worktree.path), {
+            preset,
+            workspacePath: worktree.path
+          })
         }
       } catch {
         // Best-effort: launch still proceeds and the agent can ask interactively.
@@ -2944,14 +2955,14 @@ async function performLocalWorktreeCreate(
   // Why gated: registration replaces the repo's root set, so registering a create recovered without
   // a listing would revoke filesystem access to every worktree that listing would have named.
   if (listingComplete) {
-    registerWorktreeRootsForRepo(store, repo.id, [
+    registerWorktreeRootsForRepo(store, repo, [
       repo.path,
       ...gitWorktrees.map((worktree) => worktree.path)
     ])
   } else {
     // Recovered without a listing: authorize just the new root, or the create the user just made
     // is rejected by filesystem/git-status IPC until a full scan repopulates the cache.
-    registerCreatedWorktreeRoot(store, repo.id, created.path)
+    registerCreatedWorktreeRoot(store, repo, created.path)
   }
 
   // Why: link user-configured shared paths (e.g. `node_modules`, `.env`) before setup runs so setup scripts see them in place.
diff --git a/src/main/ipc/worktrees-authoritative-local-metadata-pruning.test.ts b/src/main/ipc/worktrees-authoritative-local-metadata-pruning.test.ts
index d7549def4ed5..fdeea389d611 100644
--- a/src/main/ipc/worktrees-authoritative-local-metadata-pruning.test.ts
+++ b/src/main/ipc/worktrees-authoritative-local-metadata-pruning.test.ts
@@ -319,7 +319,10 @@ describe('authoritative local worktree metadata pruning integration', () => {
 
       expect(store.removeWorktreeLineage).not.toHaveBeenCalled()
       // Only the detected listing re-derives; its fresh re-scan is what registers the roots.
-      expect(isRegisteredWorktreePath(REPO_PATH)).toBe(channel === 'worktrees:listDetected')
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The fixture supplies the local repository rows read by this registry check.
+      expect(isRegisteredWorktreePath(REPO_PATH, store as never)).toBe(
+        channel === 'worktrees:listDetected'
+      )
     }
   )
 
@@ -357,7 +360,8 @@ describe('authoritative local worktree metadata pruning integration', () => {
     await pending
 
     expect(store.removeWorktreeLineage).not.toHaveBeenCalled()
-    expect(isRegisteredWorktreePath(newPath)).toBe(true)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The fixture supplies the local repository rows read by this registry check.
+    expect(isRegisteredWorktreePath(newPath, store as never)).toBe(true)
   })
 
   it.each(['scan generation', 'caller request'] as const)(
@@ -406,7 +410,8 @@ describe('authoritative local worktree metadata pruning integration', () => {
 
       expect(store.pruneSessionlessMissingLocalWorktreeMetadataForRepo).not.toHaveBeenCalled()
       expect(store.removeWorktreeLineage).not.toHaveBeenCalled()
-      expect(isRegisteredWorktreePath(REPO_PATH)).toBe(false)
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The fixture supplies the local repository rows read by this registry check.
+      expect(isRegisteredWorktreePath(REPO_PATH, store as never)).toBe(false)
       expect(pruneCleanupScanSnapshotsMock).not.toHaveBeenCalled()
       expect(pruneSpaceAnalysisSnapshotsMock).not.toHaveBeenCalled()
     }
@@ -454,7 +459,8 @@ describe('authoritative local worktree metadata pruning integration', () => {
 
     expect(store.pruneSessionlessMissingLocalWorktreeMetadataForRepo).toHaveBeenCalledTimes(1)
     expect(store.removeWorktreeLineage).not.toHaveBeenCalled()
-    expect(isRegisteredWorktreePath(newPath)).toBe(true)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The fixture supplies the local repository rows read by this registry check.
+    expect(isRegisteredWorktreePath(newPath, store as never)).toBe(true)
   })
 
   it('does not capture or prune on an initial WSL scan', async () => {
diff --git a/src/main/ipc/worktrees-canonical-ssh-listing.test.ts b/src/main/ipc/worktrees-canonical-ssh-listing.test.ts
new file mode 100644
index 000000000000..31a2b43a9681
--- /dev/null
+++ b/src/main/ipc/worktrees-canonical-ssh-listing.test.ts
@@ -0,0 +1,230 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { hydrateRepo } from '../persistence/tracking-repos/repo-hydration'
+import type { Repo } from '../../shared/repo-types'
+import {
+  getSshProviderAuthority,
+  resetSshProviderAuthorities,
+  rotateSshProviderAuthority
+} from '../ssh/ssh-provider-authority'
+
+const mocks = vi.hoisted(() => ({
+  handlers: new Map<string, (event: unknown, args?: unknown) => unknown>(),
+  provider: vi.fn(),
+  remoteList: vi.fn(),
+  git: vi.fn(),
+  roots: vi.fn(),
+  rootsRevision: vi.fn(),
+  pruneLineage: vi.fn()
+}))
+vi.mock('electron', () => ({
+  ipcMain: {
+    handle: (channel: string, handler: (event: unknown, args?: unknown) => unknown) =>
+      mocks.handlers.set(channel, handler)
+  },
+  app: { getPath: () => '/test' }
+}))
+vi.mock('../git/runner', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  gitExecFileAsync: mocks.git
+}))
+vi.mock('../providers/ssh-git-dispatch', () => ({
+  getSshGitProvider: mocks.provider,
+  getSshGitProviderGeneration: () => 1
+}))
+vi.mock('../project-runtime-git-options', () => ({ getLocalProjectWorktreeGitOptions: () => ({}) }))
+vi.mock('./registered-worktree-roots-cache', () => ({
+  getRegisteredWorktreeRootsRevision: mocks.rootsRevision,
+  registerWorktreeRootsForRepo: mocks.roots
+}))
+vi.mock('../worktree-lineage-pruning', () => ({
+  pruneLineageForMissingRepoWorktrees: mocks.pruneLineage
+}))
+vi.mock('./worktrees/listing/authoritative-local-worktree-metadata-pruning', () => ({
+  pruneMetadataMissingFromAuthoritativeLocalScan: vi.fn()
+}))
+import { registerDetectedWorktreeHandlers } from './worktrees/listing/register-detected-worktree-handlers'
+import { registerWorktreeCatalogHandlers } from './worktrees/listing/register-worktree-catalog-handlers'
+import { registerHostCatalogHandlers } from './worktrees/listing/register-host-catalog-handlers'
+import {
+  __resetDetectedWorktreeScanCacheForTests,
+  __getDetectedWorktreeScanCacheStatsForTests,
+  invalidateDetectedWorktreeScanCache,
+  listDetectedGitWorktrees,
+  rememberLocalWorktreeRoots
+} from './worktrees/listing/detected-worktree-scan-cache'
+
+const path = '/remote/repository'
+const rows = [{ path, head: 'abc', branch: 'main', isBare: false, isMainWorktree: true }]
+const channels = ['legacyDetected', 'hostDetected', 'list', 'listAll', 'known'] as const
+function fixture(fields: Pick<Repo, 'connectionId' | 'executionHostId'>) {
+  const repo = hydrateRepo(
+    { id: 'repo', path, displayName: 'repo', badgeColor: '#000', addedAt: 0, ...fields },
+    new Map()
+  )
+  const store = {
+    getRepo: () => repo,
+    getRepos: () => [repo],
+    getProjects: () => [],
+    getSettings: () => ({}),
+    getAllWorktreeMeta: () => ({}),
+    getProjectHostSetups: () => [],
+    getWorktreeMeta: () => undefined,
+    setWorktreeMeta: vi.fn(),
+    getAllWorktreeLineage: () => ({}),
+    getAllWorkspaceLineage: () => ({}),
+    removeWorktreeLineage: vi.fn(),
+    captureNativeLocalWorktreeMetadataScanExpectation: () => undefined
+  }
+  const context = {
+    store,
+    detectedWorktreeCancellations: {
+      begin: () => new AbortController(),
+      finish: () => {},
+      cancel: () => {}
+    }
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: These handlers only use this store and request cancellation surface.
+  registerDetectedWorktreeHandlers(context as never)
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Catalog listing uses only the supplied store accessors.
+  registerWorktreeCatalogHandlers(context as never)
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Known-host reading uses only the supplied store accessors.
+  registerHostCatalogHandlers(context as never)
+  return { repo, store }
+}
+function invoke(channel: (typeof channels)[number]) {
+  const hostArgs = {
+    repoId: 'repo',
+    executionHostId: 'ssh:host-a',
+    providerRequestId: 'request',
+    expectedAuthority: getSshProviderAuthority('host-a')
+  }
+  if (channel === 'legacyDetected') {
+    return mocks.handlers.get('worktrees:listDetected')!(null, { repoId: 'repo' })
+  }
+  if (channel === 'hostDetected') {
+    return mocks.handlers.get('worktrees:listDetected')!(null, hostArgs)
+  }
+  if (channel === 'known') {
+    return mocks.handlers.get('worktrees:listKnownForExecutionHost')!(null, hostArgs)
+  }
+  return mocks.handlers.get(`worktrees:${channel}`)!(null, { repoId: 'repo' })
+}
+beforeEach(() => {
+  vi.clearAllMocks()
+  mocks.handlers.clear()
+  __resetDetectedWorktreeScanCacheForTests()
+  resetSshProviderAuthorities()
+  mocks.provider.mockReturnValue({ listWorktrees: mocks.remoteList })
+  mocks.remoteList.mockResolvedValue(rows)
+  mocks.rootsRevision.mockReturnValue(1)
+  mocks.git.mockRejectedValue(new Error('unexpected local Git'))
+})
+
+describe.each([
+  { hostEncoding: 'canonical', fields: { executionHostId: 'ssh:host-a' as const } },
+  { hostEncoding: 'legacy', fields: { connectionId: 'host-a' } }
+])('$hostEncoding SSH listing', ({ fields }) => {
+  it.each(channels)('keeps %s on the direct SSH boundary', async (channel) => {
+    fixture(fields)
+    const result = await invoke(channel)
+    if (channel === 'known') {
+      expect(result).toMatchObject({ status: 'complete', result: { authoritative: false } })
+      expect(mocks.remoteList).not.toHaveBeenCalled()
+    } else {
+      expect(mocks.remoteList).toHaveBeenCalledTimes(1)
+      expect(mocks.remoteList.mock.calls[0][0]).toBe(path)
+      if (channel === 'hostDetected') {
+        expect(result).toMatchObject({ status: 'complete', result: { authoritative: true } })
+      } else if (channel === 'legacyDetected') {
+        expect(result).toMatchObject({ authoritative: true })
+      } else {
+        expect(result).toHaveLength(1)
+        expect(mocks.pruneLineage).toHaveBeenCalledTimes(1)
+      }
+    }
+    expect(mocks.git).not.toHaveBeenCalled()
+    expect(mocks.roots).not.toHaveBeenCalled()
+    expect(__getDetectedWorktreeScanCacheStatsForTests()).toEqual({ cacheSize: 0, inFlightSize: 0 })
+  })
+
+  it('reports disconnection without replaying an authoritative local-cache answer', async () => {
+    fixture(fields)
+    await invoke('legacyDetected')
+    mocks.provider.mockReturnValue(undefined)
+    expect(await invoke('legacyDetected')).toMatchObject({ authoritative: false })
+    expect(mocks.git).not.toHaveBeenCalled()
+  })
+
+  it('rejects a legacy listing after provider authority rotates', async () => {
+    fixture(fields)
+    let finish = (_rows: typeof rows): void => {}
+    mocks.remoteList.mockReturnValue(
+      new Promise<typeof rows>((resolve) => {
+        finish = resolve
+      })
+    )
+    const pending = invoke('legacyDetected')
+    await Promise.resolve()
+    rotateSshProviderAuthority('host-a')
+    finish(rows)
+    expect(await pending).toMatchObject({ authoritative: false })
+    expect(mocks.roots).not.toHaveBeenCalled()
+    expect(mocks.pruneLineage).not.toHaveBeenCalled()
+  })
+
+  it('bypasses local cache when the lower scan entry point is called directly', async () => {
+    const { repo, store } = fixture(fields)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Remote scan bypass only needs the mocked Git options and provider.
+    await listDetectedGitWorktrees(store as never, repo)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Remote scan bypass only needs the mocked Git options and provider.
+    await listDetectedGitWorktrees(store as never, repo)
+    expect(mocks.remoteList).toHaveBeenCalledTimes(2)
+    expect(__getDetectedWorktreeScanCacheStatsForTests()).toEqual({ cacheSize: 0, inFlightSize: 0 })
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: A remote row must return before reading the store.
+    rememberLocalWorktreeRoots(store as never, repo, rows)
+    expect(mocks.roots).not.toHaveBeenCalled()
+  })
+
+  it.each([
+    ['list', 'mutation'],
+    ['listAll', 'mutation'],
+    ['list', 'roots revision'],
+    ['listAll', 'roots revision']
+  ] as const)('preserves lineage when %s is overtaken by a %s', async (channel, change) => {
+    const { repo } = fixture(fields)
+    let finish = (_rows: typeof rows): void => {}
+    mocks.remoteList.mockReturnValue(
+      new Promise<typeof rows>((resolve) => {
+        finish = resolve
+      })
+    )
+    const pending = invoke(channel)
+    expect(mocks.remoteList).toHaveBeenCalledTimes(1)
+    if (change === 'mutation') {
+      invalidateDetectedWorktreeScanCache(repo.id)
+    } else {
+      mocks.rootsRevision.mockReturnValue(2)
+    }
+    finish(rows)
+    expect(await pending).toHaveLength(1)
+    expect(mocks.pruneLineage).not.toHaveBeenCalled()
+    expect(mocks.roots).not.toHaveBeenCalled()
+  })
+})
+
+it.each([undefined, 'nested'])(
+  'keeps runtime rows out of local cache and root registration: %s',
+  async (connectionId) => {
+    const { repo, store } = fixture({ executionHostId: 'runtime:env', connectionId })
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Runtime scan must reject before any listing or store side effects.
+    await expect(listDetectedGitWorktrees(store as never, repo)).rejects.toThrow(
+      'not reachable from this process'
+    )
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: A nonlocal row must return before reading the store.
+    rememberLocalWorktreeRoots(store as never, repo, rows)
+    expect(mocks.provider).not.toHaveBeenCalled()
+    expect(mocks.git).not.toHaveBeenCalled()
+    expect(mocks.roots).not.toHaveBeenCalled()
+    expect(__getDetectedWorktreeScanCacheStatsForTests()).toEqual({ cacheSize: 0, inFlightSize: 0 })
+  }
+)
diff --git a/src/main/ipc/worktrees/listing/detected-provider-listing.ts b/src/main/ipc/worktrees/listing/detected-provider-listing.ts
index 84243189b0b8..975cb5eeb783 100644
--- a/src/main/ipc/worktrees/listing/detected-provider-listing.ts
+++ b/src/main/ipc/worktrees/listing/detected-provider-listing.ts
@@ -1,3 +1,7 @@
+import {
+  getRepoExecutionHostId,
+  getSshTargetIdForExecutionHost
+} from '../../../../shared/execution-host'
 import type { Store } from '../../../persistence/loading-store/store'
 import type { Repo } from '../../../../shared/repo-types'
 import { getSshGitProvider } from '../../../providers/ssh-git-dispatch'
@@ -61,9 +65,11 @@ export async function listDetectedWorktreesForCapturedRepo(
   store: Store,
   repo: Repo,
   isCurrent: () => boolean,
-  capturedProvider = repo.connectionId ? getSshGitProvider(repo.connectionId) : undefined,
+  capturedProvider?: SshGitProvider,
   providerAbort?: { signal: AbortSignal; status: () => 'canceled' | 'timed-out' }
 ): Promise<DetectedWorktreeListResult | { providerAbortStatus: 'canceled' | 'timed-out' } | null> {
+  const connectionId = getSshTargetIdForExecutionHost(getRepoExecutionHostId(repo))
+  const provider = capturedProvider ?? (connectionId ? getSshGitProvider(connectionId) : undefined)
   const abortedResult = () =>
     providerAbort?.signal.aborted
       ? ({ providerAbortStatus: providerAbort.status() } as const)
@@ -105,7 +111,7 @@ export async function listDetectedWorktreesForCapturedRepo(
         )
       }
     }
-    if (repo.connectionId && !capturedProvider) {
+    if (connectionId && !provider) {
       const aborted = abortedResult()
       if (aborted) {
         return aborted
@@ -124,8 +130,8 @@ export async function listDetectedWorktreesForCapturedRepo(
     }
     const scan = await scanUntilNotOvertaken(
       repo.id,
-      repo.connectionId && capturedProvider
-        ? () => listSshWorktreesWithMutationWitness(capturedProvider, repo, providerAbort?.signal)
+      connectionId && provider
+        ? () => listSshWorktreesWithMutationWitness(provider, repo, providerAbort?.signal)
         : () => listDetectedGitWorktrees(store, repo),
       () => isCurrent() && !providerAbort?.signal.aborted
     )
@@ -197,7 +203,7 @@ export async function listDetectedWorktreesForCapturedRepo(
     // Why: retention alone leaves inert rows with no explanation; the cause rides with the listing.
     const unavailableReason = describeWorktreeScanFailure(err)
     const failureKind = classifyWorktreeScanFailure(unavailableReason)
-    if (repo.connectionId) {
+    if (connectionId) {
       const worktrees = listDisconnectedSshWorktrees(store, repo, sshWorktreeMetaIndex())
       return {
         repoId: repo.id,
diff --git a/src/main/ipc/worktrees/listing/detected-scan-failure-authority.test.ts b/src/main/ipc/worktrees/listing/detected-scan-failure-authority.test.ts
index 4e436b8dcf13..5c600a0f8ffd 100644
--- a/src/main/ipc/worktrees/listing/detected-scan-failure-authority.test.ts
+++ b/src/main/ipc/worktrees/listing/detected-scan-failure-authority.test.ts
@@ -56,8 +56,10 @@ function wslHostFailure(): Error {
   })
 }
 
+const store = createStore()
+
 async function listDetected(): Promise<DetectedWorktreeListResult> {
-  const result = await listDetectedWorktreesForCapturedRepo(createStore(), repo, () => true)
+  const result = await listDetectedWorktreesForCapturedRepo(store, repo, () => true)
   return result as DetectedWorktreeListResult
 }
 
@@ -81,7 +83,7 @@ describe('detected worktree listing authority', () => {
     // Why: the retained rows must carry the cause, or the user sees inert worktrees with no explanation.
     expect(result.unavailableReason).toContain('Command failed: wsl.exe')
     // The destructive halves of a fresh scan must not run against a listing that failed.
-    expect(isRegisteredWorktreePath(REPO_PATH)).toBe(false)
+    expect(isRegisteredWorktreePath(REPO_PATH, store)).toBe(false)
     expect(removeWorktreeLineage).not.toHaveBeenCalled()
   })
 
@@ -118,7 +120,7 @@ describe('detected worktree listing authority', () => {
 
     expect(result.authoritative).toBe(false)
     expect(result.unavailableReason).toContain('No such file or directory')
-    expect(isRegisteredWorktreePath(REPO_PATH)).toBe(false)
+    expect(isRegisteredWorktreePath(REPO_PATH, store)).toBe(false)
     expect(removeWorktreeLineage).not.toHaveBeenCalled()
   })
 
@@ -136,7 +138,7 @@ describe('detected worktree listing authority', () => {
     expect(result.source).toBe('git')
     expect(result.worktrees).toEqual([])
     expect(result.unavailableReason).toBeUndefined()
-    expect(isRegisteredWorktreePath(REPO_PATH)).toBe(true)
+    expect(isRegisteredWorktreePath(REPO_PATH, store)).toBe(true)
   })
 
   it('keeps an empty listing authoritative when the repo path is gone', async () => {
@@ -161,6 +163,6 @@ describe('detected worktree listing authority', () => {
 
     expect(result.authoritative).toBe(true)
     expect(result.worktrees.map((worktree) => worktree.path)).toEqual([REPO_PATH])
-    expect(isRegisteredWorktreePath(REPO_PATH)).toBe(true)
+    expect(isRegisteredWorktreePath(REPO_PATH, store)).toBe(true)
   })
 })
diff --git a/src/main/ipc/worktrees/listing/detected-worktree-scan-cache.ts b/src/main/ipc/worktrees/listing/detected-worktree-scan-cache.ts
index 4ed0b88ffced..dad44c64a692 100644
--- a/src/main/ipc/worktrees/listing/detected-worktree-scan-cache.ts
+++ b/src/main/ipc/worktrees/listing/detected-worktree-scan-cache.ts
@@ -1,3 +1,4 @@
+import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
 import type { GitWorktreeInfo } from '../../../../shared/worktree/types'
 import type { Store } from '../../../persistence/loading-store/store'
 import type { Repo } from '../../../../shared/repo-types'
@@ -119,7 +120,7 @@ export async function listDetectedGitWorktrees(
   repo: Repo
 ): Promise<DetectedWorktreeScanResult> {
   const localWorktreeGitOptions = getLocalProjectWorktreeGitOptions(store, repo)
-  if (repo.connectionId || isFolderRepo(repo)) {
+  if (getRepoExecutionHostId(repo) !== LOCAL_EXECUTION_HOST_ID || isFolderRepo(repo)) {
     const generation = getLocalWorktreeScanGeneration(repo.id)
     return {
       gitWorktrees: await listRepoWorktreesForDetectedScan(repo, localWorktreeGitOptions),
@@ -295,11 +296,11 @@ export function rememberLocalWorktreeRoots(
   repo: Repo,
   gitWorktrees: GitWorktreeInfo[]
 ): void {
-  if (repo.connectionId) {
+  if (getRepoExecutionHostId(repo) !== LOCAL_EXECUTION_HOST_ID) {
     return
   }
   // Why: reuse the `git worktree list` result so later git/file IPC validation skips a second scan that can trigger macOS folder-permission prompts.
-  registerWorktreeRootsForRepo(store, repo.id, [
+  registerWorktreeRootsForRepo(store, repo, [
     repo.path,
     ...gitWorktrees.map((worktree) => worktree.path)
   ])
diff --git a/src/main/ipc/worktrees/listing/host-qualified-worktree-listing.ts b/src/main/ipc/worktrees/listing/host-qualified-worktree-listing.ts
index 3026a1b06527..57800d63bab6 100644
--- a/src/main/ipc/worktrees/listing/host-qualified-worktree-listing.ts
+++ b/src/main/ipc/worktrees/listing/host-qualified-worktree-listing.ts
@@ -1,3 +1,9 @@
+import {
+  getRepoExecutionHostId,
+  getSshTargetIdForExecutionHost,
+  parseExecutionHostId,
+  LOCAL_EXECUTION_HOST_ID
+} from '../../../../shared/execution-host'
 import type { Store } from '../../../persistence/loading-store/store'
 import { PROVIDER_REQUEST_ID_MAX_UTF8_BYTES } from '../../../../shared/detected-worktree-provider-contract'
 import type {
@@ -5,7 +11,6 @@ import type {
   HostQualifiedDetectedWorktreeResult,
   DirectSshDetectedWorktreeRequest
 } from '../../../../shared/detected-worktree-provider-contract'
-import { parseExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
 import { isCurrentSshProviderAuthority } from '../../../ssh/ssh-provider-authority'
 import { getSshGitProvider } from '../../../providers/ssh-git-dispatch'
 import {
@@ -63,9 +68,10 @@ export async function listHostQualifiedDetectedWorktrees(
   if (!repo) {
     return rejected('ambiguous-owner')
   }
+  const connectionId = getSshTargetIdForExecutionHost(getRepoExecutionHostId(repo))
   if (
-    (parsedHost.kind === 'local' && repo.connectionId) ||
-    (parsedHost.kind === 'ssh' && repo.connectionId !== parsedHost.targetId)
+    (parsedHost.kind === 'local' && connectionId) ||
+    (parsedHost.kind === 'ssh' && connectionId !== parsedHost.targetId)
   ) {
     return rejected('rejected')
   }
@@ -75,8 +81,8 @@ export async function listHostQualifiedDetectedWorktrees(
       return false
     }
     if (
-      (parsedHost.kind === 'local' && repo.connectionId) ||
-      (parsedHost.kind === 'ssh' && repo.connectionId !== parsedHost.targetId)
+      (parsedHost.kind === 'local' && connectionId) ||
+      (parsedHost.kind === 'ssh' && connectionId !== parsedHost.targetId)
     ) {
       return false
     }
diff --git a/src/main/ipc/worktrees/listing/register-detected-worktree-handlers.ts b/src/main/ipc/worktrees/listing/register-detected-worktree-handlers.ts
index 66e8e85a4a5b..442a70985c8d 100644
--- a/src/main/ipc/worktrees/listing/register-detected-worktree-handlers.ts
+++ b/src/main/ipc/worktrees/listing/register-detected-worktree-handlers.ts
@@ -5,7 +5,11 @@ import type {
   DirectSshDetectedWorktreeRequest,
   ProviderRequestId
 } from '../../../../shared/detected-worktree-provider-contract'
-import { parseExecutionHostId } from '../../../../shared/execution-host'
+import {
+  parseExecutionHostId,
+  getRepoExecutionHostId,
+  getSshTargetIdForExecutionHost
+} from '../../../../shared/execution-host'
 import {
   registerSshProviderRequestAbort,
   getSshProviderAuthority,
@@ -99,17 +103,16 @@ export function registerDetectedWorktreeHandlers(context: WorktreeIpcContext): v
           worktrees: []
         }
       }
-      const provider = repo.connectionId ? getSshGitProvider(repo.connectionId) : undefined
-      const authority = repo.connectionId
-        ? { ...getSshProviderAuthority(repo.connectionId) }
-        : undefined
+      const connectionId = getSshTargetIdForExecutionHost(getRepoExecutionHostId(repo))
+      const provider = connectionId ? getSshGitProvider(connectionId) : undefined
+      const authority = connectionId ? { ...getSshProviderAuthority(connectionId) } : undefined
       const result = await listDetectedWorktreesForCapturedRepo(
         store,
         repo,
         () =>
           isCapturedRepoCurrent(store, repo) &&
-          (!repo.connectionId ||
-            (getSshGitProvider(repo.connectionId) === provider &&
+          (!connectionId ||
+            (getSshGitProvider(connectionId) === provider &&
               authority !== undefined &&
               isCurrentSshProviderAuthority(authority))),
         provider
diff --git a/src/main/ipc/worktrees/listing/register-host-catalog-handlers.ts b/src/main/ipc/worktrees/listing/register-host-catalog-handlers.ts
index 4467506e790c..ac231a4c697f 100644
--- a/src/main/ipc/worktrees/listing/register-host-catalog-handlers.ts
+++ b/src/main/ipc/worktrees/listing/register-host-catalog-handlers.ts
@@ -1,3 +1,8 @@
+import {
+  getRepoExecutionHostId,
+  getSshTargetIdForExecutionHost,
+  parseExecutionHostId
+} from '../../../../shared/execution-host'
 import { ipcMain } from 'electron'
 import type {
   ListKnownWorktreesForExecutionHostArgs,
@@ -5,7 +10,6 @@ import type {
   ForgetRemovedWorktreesForExecutionHostArgs,
   ForgetRemovedWorktreesForExecutionHostResult
 } from '../../../../shared/detected-worktree-provider-contract'
-import { parseExecutionHostId } from '../../../../shared/execution-host'
 import type { DetectedWorktree } from '../../../../shared/worktree/types'
 import { isFolderRepo } from '../../../../shared/repo-kind'
 import { projectResolvedWorktreeLineage } from '../../../../shared/resolved-worktree-lineage'
@@ -47,7 +51,10 @@ export function registerHostCatalogHandlers(context: WorktreeIpcContext): void {
       // Why: findExactRepoOwner repeats this same all-candidates-owned check, and getRepos() re-hydrates the
       // whole catalog, so a separate pass here is pure cost.
       const repo = findExactRepoOwner(store, requestedRepoId, requestedExecutionHostId)
-      if (!repo || repo.connectionId !== parsedHost.targetId) {
+      if (
+        !repo ||
+        getSshTargetIdForExecutionHost(getRepoExecutionHostId(repo)) !== parsedHost.targetId
+      ) {
         return rejected()
       }
       const complete = (worktrees: DetectedWorktree[]): HostQualifiedKnownWorktreeResult => ({
diff --git a/src/main/ipc/worktrees/listing/register-worktree-catalog-handlers.ts b/src/main/ipc/worktrees/listing/register-worktree-catalog-handlers.ts
index 4f3055c63a2e..89de29f30e84 100644
--- a/src/main/ipc/worktrees/listing/register-worktree-catalog-handlers.ts
+++ b/src/main/ipc/worktrees/listing/register-worktree-catalog-handlers.ts
@@ -1,6 +1,10 @@
 import { ipcMain } from 'electron'
 import { isFolderRepo } from '../../../../shared/repo-kind'
-import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../shared/execution-host'
+import {
+  getRepoExecutionHostId,
+  getSshTargetIdForExecutionHost,
+  type ExecutionHostId
+} from '../../../../shared/execution-host'
 import { getSshGitProvider } from '../../../providers/ssh-git-dispatch'
 import { EMPTY_RETIRED_NAME_REGISTRY } from '../../../../shared/worktree/retired-name-registry'
 import { getRetiredNameRegistryForRepo } from '../../../worktree-name-retirement'
@@ -28,6 +32,8 @@ import {
   readAllWorktreeMetaForRepo
 } from '../../../persistence/host-qualified-worktree-meta'
 import type { WorktreeMeta } from '../../../../shared/worktree/meta-types'
+import { getLocalWorktreeScanGeneration } from '../../../local-worktree-scan-generation'
+import { getRegisteredWorktreeRootsRevision } from '../../registered-worktree-roots-cache'
 
 const WORKTREE_LIST_ALL_CONCURRENCY = 8
 
@@ -89,6 +95,7 @@ export function registerWorktreeCatalogHandlers(context: WorktreeIpcContext): vo
 
     // Why: each local repo listing can spawn `git worktree list`; cap fan-out so large fleets don't start unbounded subprocesses.
     const results = await mapWithConcurrency(repos, WORKTREE_LIST_ALL_CONCURRENCY, async (repo) => {
+      const connectionId = getSshTargetIdForExecutionHost(getRepoExecutionHostId(repo))
       try {
         let gitWorktrees
         let freshScan = true
@@ -97,18 +104,22 @@ export function registerWorktreeCatalogHandlers(context: WorktreeIpcContext): vo
         let hygieneDue: boolean | undefined
         if (isFolderRepo(repo)) {
           return listVisibleFolderWorkspaces(store, repo)
-        } else if (repo.connectionId) {
-          const provider = getSshGitProvider(repo.connectionId)
+        } else if (connectionId) {
+          const provider = getSshGitProvider(connectionId)
           if (!provider) {
             warnOnce(
               loggedUnavailableSshGitProviders,
-              `${repo.connectionId}:${repo.id}`,
-              `[worktrees] SSH git provider unavailable; skipping worktree list for repo "${repo.displayName}" (${repo.id}) at ${repo.path} on connection ${repo.connectionId}`
+              `${connectionId}:${repo.id}`,
+              `[worktrees] SSH git provider unavailable; skipping worktree list for repo "${repo.displayName}" (${repo.id}) at ${repo.path} on connection ${connectionId}`
             )
             return listDisconnectedSshWorktrees(store, repo, sshMetaIndexForRepo(repo))
           }
-          loggedUnavailableSshGitProviders.delete(`${repo.connectionId}:${repo.id}`)
+          loggedUnavailableSshGitProviders.delete(`${connectionId}:${repo.id}`)
           try {
+            sideEffectToken = {
+              generation: getLocalWorktreeScanGeneration(repo.id),
+              authorizedRootsRevision: getRegisteredWorktreeRootsRevision(repo.id)
+            }
             gitWorktrees = await provider.listWorktrees(repo.path)
           } catch (err) {
             warnOnce(
@@ -177,8 +188,9 @@ export function registerWorktreeCatalogHandlers(context: WorktreeIpcContext): vo
     if (!repo) {
       return []
     }
-    const allMeta = repo.connectionId ? readAllWorktreeMetaForRepo(store, repo) : undefined
-    const sshWorktreeMetaIndex = repo.connectionId
+    const connectionId = getSshTargetIdForExecutionHost(getRepoExecutionHostId(repo))
+    const allMeta = connectionId ? readAllWorktreeMetaForRepo(store, repo) : undefined
+    const sshWorktreeMetaIndex = connectionId
       ? createSshWorktreeMetaIndex(Object.entries(allMeta ?? {}))
       : new Map()
 
@@ -190,18 +202,22 @@ export function registerWorktreeCatalogHandlers(context: WorktreeIpcContext): vo
       let hygieneDue: boolean | undefined
       if (isFolderRepo(repo)) {
         return listVisibleFolderWorkspaces(store, repo)
-      } else if (repo.connectionId) {
-        const provider = getSshGitProvider(repo.connectionId)
+      } else if (connectionId) {
+        const provider = getSshGitProvider(connectionId)
         if (!provider) {
           warnOnce(
             loggedUnavailableSshGitProviders,
-            `${repo.connectionId}:${repo.id}`,
-            `[worktrees] SSH git provider unavailable; skipping worktree list for repo "${repo.displayName}" (${repo.id}) at ${repo.path} on connection ${repo.connectionId}`
+            `${connectionId}:${repo.id}`,
+            `[worktrees] SSH git provider unavailable; skipping worktree list for repo "${repo.displayName}" (${repo.id}) at ${repo.path} on connection ${connectionId}`
           )
           return listDisconnectedSshWorktrees(store, repo, sshWorktreeMetaIndex)
         }
-        loggedUnavailableSshGitProviders.delete(`${repo.connectionId}:${repo.id}`)
+        loggedUnavailableSshGitProviders.delete(`${connectionId}:${repo.id}`)
         try {
+          sideEffectToken = {
+            generation: getLocalWorktreeScanGeneration(repo.id),
+            authorizedRootsRevision: getRegisteredWorktreeRootsRevision(repo.id)
+          }
           gitWorktrees = await provider.listWorktrees(repo.path)
         } catch (err) {
           warnOnce(
diff --git a/src/main/kimi/hook-service-config-delete-race.test.ts b/src/main/kimi/hook-service-config-delete-race.test.ts
new file mode 100644
index 000000000000..6a801cef4c0a
--- /dev/null
+++ b/src/main/kimi/hook-service-config-delete-race.test.ts
@@ -0,0 +1,91 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type * as NodeFs from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+
+const deleteRace = vi.hoisted((): { path: string | null; code: string } => ({
+  path: null,
+  code: 'ENOENT'
+}))
+
+// Why: simulates the config file (or an ancestor directory) vanishing between
+// writeConfigToml's existsSync check and its statSync mode read — e.g. a
+// concurrent uninstall, user delete, or a directory replaced by a file.
+vi.mock('node:fs', async (importOriginal) => {
+  const actual = await importOriginal<typeof NodeFs>()
+  const statSync = (
+    target: NodeFs.PathLike,
+    options?: NodeFs.StatSyncOptions
+  ): NodeFs.Stats | NodeFs.BigIntStats | undefined => {
+    if (typeof target === 'string' && target === deleteRace.path) {
+      throw Object.assign(new Error(`${deleteRace.code}: simulated race`), {
+        code: deleteRace.code
+      })
+    }
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: forwarding actual.statSync's own overload signature.
+    return actual.statSync(target, options as NodeFs.StatSyncOptions)
+  }
+  const patched = { ...actual, statSync }
+  return { ...patched, default: patched }
+})
+
+const fs = await vi.importActual<typeof NodeFs>('node:fs')
+const { KimiHookService } = await import('./hook-service')
+const { KIMI_HOOK_EVENTS } = await import('./kimi-hook-config-toml')
+
+let home: string
+let originalHome: string | undefined
+let originalKimiHome: string | undefined
+let originalUserProfile: string | undefined
+
+const configPath = (): string => join(home, '.kimi-code', 'config.toml')
+
+beforeEach(() => {
+  home = fs.mkdtempSync(join(tmpdir(), 'orca-kimi-hook-delete-race-'))
+  originalHome = process.env.HOME
+  originalKimiHome = process.env.KIMI_CODE_HOME
+  originalUserProfile = process.env.USERPROFILE
+  process.env.HOME = home
+  process.env.KIMI_CODE_HOME = join(home, '.kimi-code')
+  process.env.USERPROFILE = home
+})
+
+afterEach(() => {
+  deleteRace.path = null
+  deleteRace.code = 'ENOENT'
+  if (originalHome === undefined) {
+    delete process.env.HOME
+  } else {
+    process.env.HOME = originalHome
+  }
+  if (originalKimiHome === undefined) {
+    delete process.env.KIMI_CODE_HOME
+  } else {
+    process.env.KIMI_CODE_HOME = originalKimiHome
+  }
+  if (originalUserProfile === undefined) {
+    delete process.env.USERPROFILE
+  } else {
+    process.env.USERPROFILE = originalUserProfile
+  }
+  fs.rmSync(home, { recursive: true, force: true })
+})
+
+describe('KimiHookService config delete race', () => {
+  it.each(['ENOENT', 'ENOTDIR'])(
+    'still writes the config when the mode stat fails with %s',
+    (code) => {
+      fs.mkdirSync(join(home, '.kimi-code'), { recursive: true })
+      fs.writeFileSync(configPath(), 'api_key = "fixture-only"\n')
+      deleteRace.path = configPath()
+      deleteRace.code = code
+
+      expect(() => new KimiHookService().install()).not.toThrow()
+
+      const config = fs.readFileSync(configPath(), 'utf-8')
+      for (const event of KIMI_HOOK_EVENTS) {
+        expect(config).toContain(`event = "${event}"`)
+      }
+    }
+  )
+})
diff --git a/src/main/kimi/hook-service.ts b/src/main/kimi/hook-service.ts
index 1df8ff968cfe..f4f4dfbe534f 100644
--- a/src/main/kimi/hook-service.ts
+++ b/src/main/kimi/hook-service.ts
@@ -14,6 +14,7 @@ import { dirname, join, posix as pathPosix } from 'node:path'
 import { randomUUID } from 'node:crypto'
 import type { SFTPWrapper } from 'ssh2'
 import type { AgentHookInstallState, AgentHookInstallStatus } from '../../shared/agent-hook-types'
+import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence'
 import {
   createManagedCommandMatcher,
   getSharedManagedScriptPath,
@@ -149,7 +150,14 @@ function writeConfigToml(configPath: string, text: string): void {
     } catch {
       // Fall through to the atomic write path.
     }
-    mode = statSync(configPath).mode & 0o777
+    try {
+      mode = statSync(configPath).mode & 0o777
+    } catch (error) {
+      // Why: file was deleted between the existsSync check and here — nothing to preserve.
+      if (!isDefinitiveAbsence(error)) {
+        throw error
+      }
+    }
   }
   const tmpPath = join(dir, `.${Date.now()}-${randomUUID()}.tmp`)
   try {
diff --git a/src/main/lib/html-to-pdf.test.ts b/src/main/lib/html-to-pdf.test.ts
new file mode 100644
index 000000000000..03ead7c66f14
--- /dev/null
+++ b/src/main/lib/html-to-pdf.test.ts
@@ -0,0 +1,315 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { join } from 'node:path'
+
+const fake = vi.hoisted(() => ({
+  files: new Map<string, string>(),
+  handlers: new Map<string, (...args: unknown[]) => void>(),
+  write: vi.fn<(path: string, html: string, options: unknown) => Promise<void>>(),
+  unlink: vi.fn<(path: string) => Promise<void>>(),
+  construct: vi.fn<(options: unknown) => void>(),
+  load: vi.fn<(path: string) => Promise<void>>(),
+  images: vi.fn<(script: string, userGesture: boolean) => Promise<void>>(),
+  print: vi.fn<(options: unknown) => Promise<Buffer>>(),
+  isDestroyed: vi.fn<() => boolean>(),
+  destroy: vi.fn<() => void>(),
+  uuid: vi.fn<() => string>()
+}))
+
+vi.mock('electron', () => ({
+  app: { getPath: () => '/mock-export-temp' },
+  BrowserWindow: class {
+    constructor(options: unknown) {
+      fake.construct(options)
+    }
+    webContents = {
+      once: (event: string, listener: (...args: unknown[]) => void) => {
+        fake.handlers.set(event, listener)
+      },
+      executeJavaScript: fake.images,
+      printToPDF: fake.print
+    }
+    loadFile = fake.load
+    isDestroyed = fake.isDestroyed
+    destroy = fake.destroy
+  }
+}))
+vi.mock('node:fs/promises', () => ({ writeFile: fake.write, unlink: fake.unlink }))
+vi.mock('node:crypto', () => ({ randomUUID: fake.uuid }))
+
+import { ExportTimeoutError, htmlToPdf } from './html-to-pdf'
+
+const HTML = '<p>synthetic export</p>'
+const TEMP_PATH = join('/mock-export-temp', 'orca-export-test-export.html')
+const PDF = Buffer.from('synthetic PDF buffer')
+
+beforeEach(() => {
+  vi.useFakeTimers()
+  vi.resetAllMocks()
+  fake.files.clear()
+  fake.handlers.clear()
+  fake.uuid.mockReturnValue('test-export')
+  fake.write.mockImplementation(async (path, html) => {
+    fake.files.set(path, html)
+  })
+  fake.unlink.mockImplementation(async (path) => {
+    fake.files.delete(path)
+  })
+  fake.load.mockImplementation(async () => {
+    fake.handlers.get('did-finish-load')?.()
+  })
+  fake.images.mockResolvedValue()
+  fake.print.mockResolvedValue(PDF)
+  fake.isDestroyed.mockReturnValue(false)
+})
+
+afterEach(() => {
+  vi.useRealTimers()
+})
+
+describe('htmlToPdf resource ownership', () => {
+  it('removes the temporary document when window construction throws', async () => {
+    const error = new Error('window construction failed')
+    fake.construct.mockImplementation(() => {
+      throw error
+    })
+
+    await expect(htmlToPdf(HTML)).rejects.toBe(error)
+
+    expect(fake.write).toHaveBeenCalledWith(TEMP_PATH, HTML, { encoding: 'utf-8', flag: 'wx' })
+    expect(fake.unlink).toHaveBeenCalledExactlyOnceWith(TEMP_PATH)
+    expect(fake.files.size).toBe(0)
+    expect(fake.destroy).not.toHaveBeenCalled()
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('removes a partial document when writing rejects', async () => {
+    const error = new Error('disk full')
+    fake.write.mockImplementation(async (path) => {
+      fake.files.set(path, '<partial')
+      throw error
+    })
+
+    await expect(htmlToPdf(HTML)).rejects.toBe(error)
+
+    expect(fake.files.size).toBe(0)
+    expect(fake.unlink).toHaveBeenCalledExactlyOnceWith(TEMP_PATH)
+    expect(fake.construct).not.toHaveBeenCalled()
+  })
+
+  it('preserves the write error when no file exists and cleanup also rejects', async () => {
+    const error = new Error('write denied')
+    fake.write.mockRejectedValue(error)
+    fake.unlink.mockRejectedValue(new Error('ENOENT'))
+
+    await expect(htmlToPdf(HTML)).rejects.toBe(error)
+
+    expect(fake.unlink).toHaveBeenCalledExactlyOnceWith(TEMP_PATH)
+    expect(fake.construct).not.toHaveBeenCalled()
+  })
+
+  it('preserves the construction error when best-effort cleanup fails', async () => {
+    const error = new Error('window construction failed')
+    fake.construct.mockImplementation(() => {
+      throw error
+    })
+    fake.unlink.mockRejectedValue(new Error('unlink denied'))
+
+    await expect(htmlToPdf(HTML)).rejects.toBe(error)
+
+    expect(fake.unlink).toHaveBeenCalledExactlyOnceWith(TEMP_PATH)
+    expect(fake.files.size).toBe(1)
+  })
+
+  it('does not accumulate temporary documents across repeated failed exports', async () => {
+    fake.construct.mockImplementation(() => {
+      throw new Error('window construction failed')
+    })
+    for (let index = 0; index < 10; index++) {
+      fake.uuid.mockReturnValue(`export-${index}`)
+      await expect(htmlToPdf(HTML)).rejects.toThrow('window construction failed')
+    }
+
+    expect(fake.files.size).toBe(0)
+    expect(fake.unlink).toHaveBeenCalledTimes(10)
+  })
+
+  it('keeps window security, print settings and the returned PDF unchanged', async () => {
+    await expect(htmlToPdf(HTML)).resolves.toBe(PDF)
+
+    expect(fake.construct).toHaveBeenCalledExactlyOnceWith({
+      show: false,
+      webPreferences: {
+        sandbox: true,
+        contextIsolation: true,
+        nodeIntegration: false,
+        javascript: true
+      }
+    })
+    expect(fake.load).toHaveBeenCalledExactlyOnceWith(TEMP_PATH)
+    expect(fake.images).toHaveBeenCalledWith(expect.stringContaining('document.images'), true)
+    expect(fake.print).toHaveBeenCalledExactlyOnceWith({
+      printBackground: true,
+      pageSize: 'A4',
+      margins: { top: 0.75, bottom: 0.75, left: 0.75, right: 0.75 }
+    })
+    expect(fake.destroy).toHaveBeenCalledOnce()
+    expect(fake.unlink).toHaveBeenCalledExactlyOnceWith(TEMP_PATH)
+    expect(fake.files.size).toBe(0)
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('waits for images before printing', async () => {
+    const images = Promise.withResolvers<void>()
+    fake.images.mockReturnValue(images.promise)
+    const result = htmlToPdf(HTML)
+    await vi.advanceTimersByTimeAsync(0)
+
+    expect(fake.images).toHaveBeenCalledOnce()
+    expect(fake.print).not.toHaveBeenCalled()
+    expect(fake.unlink).not.toHaveBeenCalled()
+
+    images.resolve()
+    await expect(result).resolves.toBe(PDF)
+    expect(fake.print).toHaveBeenCalledOnce()
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it.each(['images', 'print'] as const)('cleans up after %s failure', async (stage) => {
+    const error = new Error(`${stage} failed`)
+    fake[stage].mockRejectedValue(error)
+
+    await expect(htmlToPdf(HTML)).rejects.toBe(error)
+
+    expect(fake.destroy).toHaveBeenCalledOnce()
+    expect(fake.files.size).toBe(0)
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('cleans up after a load rejection', async () => {
+    const error = new Error('load failed')
+    fake.load.mockRejectedValue(error)
+
+    await expect(htmlToPdf(HTML)).rejects.toBe(error)
+
+    expect(fake.destroy).toHaveBeenCalledOnce()
+    expect(fake.files.size).toBe(0)
+    expect(fake.images).not.toHaveBeenCalled()
+  })
+
+  it('keeps the render timeout type and clears its resources', async () => {
+    const images = Promise.withResolvers<void>()
+    fake.images.mockReturnValue(images.promise)
+    const result = expect(htmlToPdf(HTML)).rejects.toBeInstanceOf(ExportTimeoutError)
+    await vi.advanceTimersByTimeAsync(60_000)
+    await result
+
+    expect(fake.destroy).toHaveBeenCalledOnce()
+    expect(fake.files.size).toBe(0)
+    expect(vi.getTimerCount()).toBe(0)
+    images.reject(new Error('late renderer failure'))
+    await Promise.resolve()
+  })
+
+  it('does not destroy an already-destroyed window again', async () => {
+    fake.isDestroyed.mockReturnValue(true)
+
+    await expect(htmlToPdf(HTML)).resolves.toBe(PDF)
+
+    expect(fake.destroy).not.toHaveBeenCalled()
+    expect(fake.files.size).toBe(0)
+  })
+
+  it('still removes the document if window destruction throws', async () => {
+    const error = new Error('window destruction failed')
+    fake.destroy.mockImplementation(() => {
+      throw error
+    })
+
+    await expect(htmlToPdf(HTML)).rejects.toBe(error)
+
+    expect(fake.unlink).toHaveBeenCalledExactlyOnceWith(TEMP_PATH)
+    expect(fake.files.size).toBe(0)
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('keeps a successful export successful when best-effort cleanup rejects', async () => {
+    fake.unlink.mockRejectedValue(new Error('unlink denied'))
+
+    await expect(htmlToPdf(HTML)).resolves.toBe(PDF)
+
+    expect(fake.destroy).toHaveBeenCalledOnce()
+    expect(fake.unlink).toHaveBeenCalledExactlyOnceWith(TEMP_PATH)
+    expect(vi.getTimerCount()).toBe(0)
+  })
+  it('leaves a pre-existing file at the temp path in place instead of deleting it', async () => {
+    const error = Object.assign(new Error('file already exists'), { code: 'EEXIST' })
+    fake.files.set(TEMP_PATH, 'FILE THIS EXPORT DID NOT CREATE')
+    fake.write.mockRejectedValue(error)
+
+    await expect(htmlToPdf(HTML)).rejects.toBe(error)
+
+    expect(fake.unlink).not.toHaveBeenCalled()
+    expect(fake.files.get(TEMP_PATH)).toBe('FILE THIS EXPORT DID NOT CREATE')
+    expect(fake.construct).not.toHaveBeenCalled()
+  })
+
+  it('times out and cleans up when loading never settles', async () => {
+    fake.load.mockReturnValue(new Promise<void>(() => {}))
+
+    const result = expect(htmlToPdf(HTML)).rejects.toBeInstanceOf(ExportTimeoutError)
+    await vi.advanceTimersByTimeAsync(60_000)
+    await result
+
+    expect(fake.images).not.toHaveBeenCalled()
+    expect(fake.destroy).toHaveBeenCalledOnce()
+    expect(fake.unlink).toHaveBeenCalledExactlyOnceWith(TEMP_PATH)
+    expect(fake.files.size).toBe(0)
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('times out and cleans up when neither load event ever fires', async () => {
+    fake.load.mockResolvedValue()
+
+    const result = expect(htmlToPdf(HTML)).rejects.toBeInstanceOf(ExportTimeoutError)
+    await vi.advanceTimersByTimeAsync(60_000)
+    await result
+
+    expect(fake.print).not.toHaveBeenCalled()
+    expect(fake.destroy).toHaveBeenCalledOnce()
+    expect(fake.files.size).toBe(0)
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('cleans up after a did-fail-load event', async () => {
+    fake.load.mockImplementation(async () => {
+      fake.handlers.get('did-fail-load')?.({}, -6, 'ERR_FILE_NOT_FOUND')
+    })
+
+    await expect(htmlToPdf(HTML)).rejects.toThrow('ERR_FILE_NOT_FOUND (-6)')
+
+    expect(fake.images).not.toHaveBeenCalled()
+    expect(fake.destroy).toHaveBeenCalledOnce()
+    expect(fake.files.size).toBe(0)
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('never removes a temp path belonging to a concurrent export', async () => {
+    const images = Promise.withResolvers<void>()
+    fake.images.mockReturnValueOnce(images.promise)
+    fake.uuid.mockReturnValueOnce('first-export').mockReturnValueOnce('second-export')
+    const firstPath = join('/mock-export-temp', 'orca-export-first-export.html')
+    const secondPath = join('/mock-export-temp', 'orca-export-second-export.html')
+
+    const first = htmlToPdf(HTML)
+    await vi.advanceTimersByTimeAsync(0)
+    await expect(htmlToPdf(HTML)).resolves.toBe(PDF)
+
+    expect(fake.unlink).toHaveBeenCalledExactlyOnceWith(secondPath)
+    expect(fake.files.has(firstPath)).toBe(true)
+
+    images.resolve()
+    await expect(first).resolves.toBe(PDF)
+    expect(fake.unlink).toHaveBeenCalledWith(firstPath)
+    expect(fake.files.size).toBe(0)
+  })
+})
diff --git a/src/main/lib/html-to-pdf.ts b/src/main/lib/html-to-pdf.ts
index f0cc467e5152..a375e7ef7c73 100644
--- a/src/main/lib/html-to-pdf.ts
+++ b/src/main/lib/html-to-pdf.ts
@@ -33,66 +33,93 @@ new Promise((resolve) => {
 export async function htmlToPdf(html: string): Promise<Buffer> {
   const tempDir = app.getPath('temp')
   const tempPath = path.join(tempDir, `orca-export-${randomUUID()}.html`)
-  await writeFile(tempPath, html, 'utf-8')
 
-  const win = new BrowserWindow({
-    show: false,
-    webPreferences: {
-      sandbox: true,
-      contextIsolation: true,
-      nodeIntegration: false,
-      // Why: image-wait needs to run a short script inside the export page, and
-      // the exported renderer DOM may already embed scripts/SVGs (e.g. Mermaid)
-      // that need JS to paint correctly. The window stays sandboxed and
-      // isolated so this is safe.
-      javascript: true
+  // Why: 'wx' is an exclusive create, so the shared temp dir cannot pre-seat this
+  // path as a symlink and have the export write through it. EEXIST is the one
+  // failure where the path is not ours, so it must not be unlinked below.
+  try {
+    await writeFile(tempPath, html, { encoding: 'utf-8', flag: 'wx' })
+  } catch (error) {
+    if (isAlreadyExists(error)) {
+      throw error
     }
-  })
-
-  let timer: NodeJS.Timeout | undefined
+    await removeOwnTempDocument(tempPath)
+    throw error
+  }
 
   try {
-    const loadPromise = new Promise<void>((resolve, reject) => {
-      win.webContents.once('did-finish-load', () => resolve())
-      win.webContents.once('did-fail-load', (_event, errorCode, errorDescription) => {
-        reject(new Error(`Failed to load export document: ${errorDescription} (${errorCode})`))
-      })
+    const win = new BrowserWindow({
+      show: false,
+      webPreferences: {
+        sandbox: true,
+        contextIsolation: true,
+        nodeIntegration: false,
+        // Why: image-wait needs to run a short script inside the export page, and
+        // the exported renderer DOM may already embed scripts/SVGs (e.g. Mermaid)
+        // that need JS to paint correctly. The window stays sandboxed and
+        // isolated so this is safe.
+        javascript: true
+      }
     })
 
-    await win.loadFile(tempPath)
-    await loadPromise
+    let timer: NodeJS.Timeout | undefined
 
-    const renderAndPrint = (async (): Promise<Buffer> => {
-      await win.webContents.executeJavaScript(WAIT_FOR_IMAGES_SCRIPT, true)
-      return win.webContents.printToPDF({
-        printBackground: true,
-        pageSize: 'A4',
-        margins: {
-          top: 0.75,
-          bottom: 0.75,
-          left: 0.75,
-          right: 0.75
-        }
+    try {
+      // Why: the timeout has to cover loading too. An export document whose script
+      // never yields fires neither did-finish-load nor did-fail-load, so a
+      // render-only timeout would leave this window and its temp file forever.
+      const timeoutPromise = new Promise<never>((_resolve, reject) => {
+        timer = setTimeout(() => reject(new ExportTimeoutError()), EXPORT_TIMEOUT_MS)
       })
-    })()
 
-    const timeoutPromise = new Promise<never>((_resolve, reject) => {
-      timer = setTimeout(() => reject(new ExportTimeoutError()), EXPORT_TIMEOUT_MS)
-    })
+      const loadAndPrint = (async (): Promise<Buffer> => {
+        const loadPromise = new Promise<void>((resolve, reject) => {
+          win.webContents.once('did-finish-load', () => resolve())
+          win.webContents.once('did-fail-load', (_event, errorCode, errorDescription) => {
+            reject(new Error(`Failed to load export document: ${errorDescription} (${errorCode})`))
+          })
+        })
 
-    return await Promise.race([renderAndPrint, timeoutPromise])
-  } finally {
-    if (timer) {
-      clearTimeout(timer)
-    }
-    if (!win.isDestroyed()) {
-      win.destroy()
-    }
-    try {
-      await unlink(tempPath)
-    } catch {
-      // Why: best-effort cleanup — losing the temp file should not surface
-      // as a user-facing export failure.
+        await win.loadFile(tempPath)
+        await loadPromise
+        await win.webContents.executeJavaScript(WAIT_FOR_IMAGES_SCRIPT, true)
+        return win.webContents.printToPDF({
+          printBackground: true,
+          pageSize: 'A4',
+          margins: {
+            top: 0.75,
+            bottom: 0.75,
+            left: 0.75,
+            right: 0.75
+          }
+        })
+      })()
+
+      return await Promise.race([loadAndPrint, timeoutPromise])
+    } finally {
+      if (timer) {
+        clearTimeout(timer)
+      }
+      if (!win.isDestroyed()) {
+        win.destroy()
+      }
     }
+  } finally {
+    await removeOwnTempDocument(tempPath)
+  }
+}
+
+function isAlreadyExists(error: unknown): boolean {
+  return error instanceof Error && 'code' in error && error.code === 'EEXIST'
+}
+
+// unlink never follows a symlink, so this removes the entry this export created
+// and never the target of one swapped in underneath it.
+async function removeOwnTempDocument(tempPath: string): Promise<void> {
+  try {
+    await unlink(tempPath)
+  } catch {
+    // Why: best-effort cleanup — losing the temp file should not surface
+    // as a user-facing export failure.
   }
 }
diff --git a/src/main/linear/teams.test.ts b/src/main/linear/teams.test.ts
index d0d8986373d8..55808711824f 100644
--- a/src/main/linear/teams.test.ts
+++ b/src/main/linear/teams.test.ts
@@ -72,16 +72,15 @@ function makeConnection<TNode>(pages: TNode[][]) {
   return {
     nodes,
     pageInfo: { hasNextPage: pages.length > 1 },
-    fetchNext: vi
-      .fn()
-      .mockImplementation(
-        async function fetchNext(this: { nodes: TNode[]; pageInfo: { hasNextPage: boolean } }) {
-          pageIndex += 1
-          this.nodes.push(...(pages[pageIndex] ?? []))
-          this.pageInfo.hasNextPage = pageIndex < pages.length - 1
-          return this
-        }
-      )
+    fetchNext: vi.fn().mockImplementation(async function fetchNext(this: {
+      nodes: TNode[]
+      pageInfo: { hasNextPage: boolean }
+    }) {
+      pageIndex += 1
+      this.nodes.push(...(pages[pageIndex] ?? []))
+      this.pageInfo.hasNextPage = pageIndex < pages.length - 1
+      return this
+    })
   }
 }
 
diff --git a/src/main/local-worktree-filesystem.test.ts b/src/main/local-worktree-filesystem.test.ts
index 4bb4f182bddd..d69d82b914fc 100644
--- a/src/main/local-worktree-filesystem.test.ts
+++ b/src/main/local-worktree-filesystem.test.ts
@@ -25,6 +25,7 @@ import {
   toHostFilesystemPath,
   toHostRemovalPath
 } from './local-worktree-filesystem'
+import { isWorktreePathMissing } from './worktree-removal-safety'
 
 function completeExecFile(stdout = ''): void {
   runProcessMock.mockResolvedValue({ code: 0, signal: null, stdout, stderr: '', timedOut: false })
@@ -218,23 +219,68 @@ describe('local worktree filesystem runtime access', () => {
     })
   })
 
-  it('reports missing WSL stat targets with an ENOENT-shaped error', async () => {
+  // Captured verbatim from live hosts: GNU coreutils 9.4 (Ubuntu 24.04) and BusyBox v1.36.1.
+  it.each([
+    ['GNU', "stat: cannot statx '/mnt/c/repo/missing/.git': No such file or directory\n"],
+    ['GNU', "stat: cannot statx '/mnt/c/repo/missing/.git': Not a directory\n"],
+    ['BusyBox', "stat: can't stat '/mnt/c/repo/missing/.git': No such file or directory\n"],
+    ['BusyBox', "stat: can't stat '/mnt/c/repo/missing/.git': Not a directory\n"]
+  ])('reports a missing WSL stat target as ENOENT on %s userland', async (_userland, stderr) => {
     await withPlatform('win32', async () => {
-      failExecFile(1, "stat: cannot statx '/mnt/c/repo/missing/.git': No such file or directory\n")
+      failExecFile(1, stderr)
       const access = getLocalWorktreePathAccess({ wslDistro: 'Ubuntu' })
 
       await expect(access.statPath('/mnt/c/repo/missing/.git')).rejects.toMatchObject({
         code: 'ENOENT'
       })
+      await expect(isWorktreePathMissing('/mnt/c/repo/missing', access.statPath)).resolves.toBe(
+        true
+      )
+    })
+  })
+
+  it.each([
+    ['GNU', "stat: cannot statx '/mnt/c/repo/locked': Permission denied\n"],
+    ['BusyBox', "stat: can't stat '/mnt/c/repo/locked': Permission denied\n"]
+  ])(
+    'does not treat an unreadable WSL stat target as missing on %s userland',
+    async (_userland, stderr) => {
+      await withPlatform('win32', async () => {
+        failExecFile(1, stderr)
+        const access = getLocalWorktreePathAccess({ wslDistro: 'Ubuntu' })
+
+        await expect(access.statPath('/mnt/c/repo/locked')).rejects.toThrow('Permission denied')
+        // A delete that did not happen still has to look like a failure, or cleanup silently "succeeds".
+        await expect(isWorktreePathMissing('/mnt/c/repo/locked', access.statPath)).resolves.toBe(
+          false
+        )
+      })
+    }
+  )
+
+  it('pins the stat probe to the C locale so its error text stays English', async () => {
+    await withPlatform('win32', async () => {
+      completeExecFile('directory')
+      await getLocalWorktreePathAccess({ wslDistro: 'Ubuntu' }).statPath('/mnt/c/repo/feature')
+
+      const args = runProcessMock.mock.calls[0]?.[0].args as string[]
+      expect(args.at(-1)).toContain('LC_ALL=C stat -c %F --')
     })
   })
 
-  it('does not treat an unreadable WSL stat target as missing', async () => {
+  it('reports a translated stat failure as a failure rather than as absence', async () => {
     await withPlatform('win32', async () => {
-      failExecFile(1, "stat: cannot statx '/mnt/c/repo/locked': Permission denied\n")
+      // Synthetic: no host available here ships a non-English locale, and the probe pins LC_ALL=C
+      // anyway. The point is the direction it errs if that pin ever comes off.
+      failExecFile(1, "stat: <translated verb> '/mnt/c/repo/missing': <translated errno>\n")
       const access = getLocalWorktreePathAccess({ wslDistro: 'Ubuntu' })
 
-      await expect(access.statPath('/mnt/c/repo/locked')).rejects.toThrow('Permission denied')
+      await expect(access.statPath('/mnt/c/repo/missing')).rejects.not.toMatchObject({
+        code: 'ENOENT'
+      })
+      await expect(isWorktreePathMissing('/mnt/c/repo/missing', access.statPath)).resolves.toBe(
+        false
+      )
     })
   })
 })
diff --git a/src/main/local-worktree-filesystem.ts b/src/main/local-worktree-filesystem.ts
index 23861c71a875..d6820dd5b146 100644
--- a/src/main/local-worktree-filesystem.ts
+++ b/src/main/local-worktree-filesystem.ts
@@ -53,17 +53,20 @@ async function runWslCommand(distro: string, command: string): Promise<string> {
   return result.stdout
 }
 
+/**
+ * Only stat's trailing strerror text is portable: GNU coreutils says `cannot statx`,
+ * BusyBox says `can't stat`, so matching the verb made a BusyBox distro report a
+ * successful cleanup as a permanent failure. The tail stays English because the probe
+ * pins LC_ALL=C, and stat is the only thing in that probe that writes to stderr.
+ */
+const WSL_MISSING_PATH_STDERR = /: (?:No such file or directory|Not a directory)\r?\n?$/
+
 function isWslMissingPathError(error: unknown): boolean {
   if (typeof error !== 'object' || error === null || !('exitCode' in error)) {
     return false
   }
   const stderr = 'stderr' in error && typeof error.stderr === 'string' ? error.stderr : ''
-  return (
-    error.exitCode === 1 &&
-    /^stat: cannot stat(?:x)? [\s\S]+: (?:No such file or directory|Not a directory)\r?\n?$/.test(
-      stderr
-    )
-  )
+  return error.exitCode === 1 && WSL_MISSING_PATH_STDERR.test(stderr)
 }
 
 export function toLocalWorktreeRuntimePath(
diff --git a/src/main/muse/hook-settings.ts b/src/main/muse/hook-settings.ts
index 5b5fe3f63fd5..0ef3d5d462bb 100644
--- a/src/main/muse/hook-settings.ts
+++ b/src/main/muse/hook-settings.ts
@@ -4,11 +4,11 @@ import {
   buildManagedCommandHook,
   createManagedCommandMatcher,
   getSharedManagedScriptPath,
-  isPlainObject,
   wrapPosixHookCommand,
   wrapWindowsHookCommand,
   type HookDefinition
 } from '../agent-hooks/installer-utils'
+import { readManagedHookEventsFromJson } from '../agent-hooks/managed-hooks-json-events'
 
 const MUSE_SCRIPT_BASE = 'muse-hook'
 
@@ -87,45 +87,9 @@ export function readManagedMuseHookEvents(
   parsed: unknown,
   isManagedCommand: (command: string | undefined) => boolean
 ): Set<string> {
-  const present = new Set<string>()
-  if (!isPlainObject(parsed) || !isPlainObject(parsed.hooks)) {
-    return present
-  }
-  for (const event of MUSE_HOOK_EVENTS) {
-    const definitions = parsed.hooks[event]
-    if (!Array.isArray(definitions)) {
-      continue
-    }
-    // Why: a hand-edited managed file can hold null definitions, non-array
-    // hook lists, or null entries — treat all of them as absent so status
-    // calculation never throws on user content.
-    if (
-      definitions.some((definition) =>
-        managedHookEntries(definition).some((hook) => isManagedCommand(hookEntryCommand(hook)))
-      )
-    ) {
-      present.add(event)
-    }
-  }
-  return present
+  return readManagedHookEventsFromJson(parsed, MUSE_HOOK_EVENTS, isManagedCommand)
 }
 
 export function getMuseManagedCommandMatcher(): (command: string | undefined) => boolean {
   return createManagedCommandMatcher(getMuseManagedScriptFileName())
 }
-
-function managedHookEntries(definition: unknown): readonly unknown[] {
-  if (!isPlainObject(definition)) {
-    return []
-  }
-  const hooks = definition.hooks
-  return Array.isArray(hooks) ? hooks : []
-}
-
-function hookEntryCommand(hook: unknown): string | undefined {
-  if (!isPlainObject(hook)) {
-    return undefined
-  }
-  const command = hook.command
-  return typeof command === 'string' ? command : undefined
-}
diff --git a/src/main/native-chat/agent-model-catalog/agent-model-catalog-store.test.ts b/src/main/native-chat/agent-model-catalog/agent-model-catalog-store.test.ts
index 5f0b2f3bc7a8..34e0294b4586 100644
--- a/src/main/native-chat/agent-model-catalog/agent-model-catalog-store.test.ts
+++ b/src/main/native-chat/agent-model-catalog/agent-model-catalog-store.test.ts
@@ -153,6 +153,46 @@ describe('agent model catalog store', () => {
     expect(save).toHaveBeenCalledTimes(2)
   })
 
+  it("keeps a live child's default effort through a listing that names none, across a restart", async () => {
+    const directory = mkdtempSync(join(tmpdir(), 'agent-model-catalog-'))
+    const store = new AgentModelCatalogStore()
+    await store.attachPersistence(createAgentModelCatalogFilePersistence(directory))
+    const efforts = [
+      { value: 'medium', label: 'Medium' },
+      { value: 'high', label: 'High' }
+    ]
+    const listing = (defaultEffort?: string): AgentModelCatalogSuccess => ({
+      models: [
+        {
+          id: 'opus',
+          label: 'Opus',
+          isDefault: true,
+          efforts,
+          ...(defaultEffort ? { defaultEffort } : {})
+        }
+      ],
+      fastModeTierByModel: new Map(),
+      origin: 'live-session'
+    })
+    store.recordSuccess('fp', 'claude', listing('medium'))
+    // A session-less probe never names Claude's default.
+    store.recordSuccess('fp', 'claude', { ...listing(), origin: 'probe' })
+    expect(store.get('fp')!.models[0]!.defaultEffort).toBe('medium')
+    await store.flushPersistence()
+    const restarted = new AgentModelCatalogStore()
+    await restarted.attachPersistence(createAgentModelCatalogFilePersistence(directory))
+    expect(restarted.get('fp')!.models[0]!.defaultEffort).toBe('medium')
+
+    // A newer report replaces it; a model that stops offering it drops it.
+    store.recordSuccess('fp', 'claude', listing('high'))
+    expect(store.get('fp')!.models[0]!.defaultEffort).toBe('high')
+    store.recordSuccess('fp', 'claude', {
+      ...listing(),
+      models: [{ id: 'opus', label: 'Opus', isDefault: true, efforts: [efforts[0]!] }]
+    })
+    expect(store.get('fp')!.models[0]).not.toHaveProperty('defaultEffort')
+  })
+
   it('persists successes only and hydrates them across a restart', async () => {
     const directory = mkdtempSync(join(tmpdir(), 'agent-model-catalog-'))
     const store = new AgentModelCatalogStore()
diff --git a/src/main/native-chat/agent-model-catalog/agent-model-catalog-store.ts b/src/main/native-chat/agent-model-catalog/agent-model-catalog-store.ts
index eb26d78de5f2..dcb6e3935ac5 100644
--- a/src/main/native-chat/agent-model-catalog/agent-model-catalog-store.ts
+++ b/src/main/native-chat/agent-model-catalog/agent-model-catalog-store.ts
@@ -53,6 +53,22 @@ function tierRecord(tiers: ReadonlyMap<string, string>): Record<string, string>
   return Object.fromEntries(tiers.entries())
 }
 
+/** A listing that names no default effort for a model keeps the one a live child reported for it,
+ *  while that model still offers it: Claude's listing never names one, only a running child does. */
+function withKnownDefaultEfforts(
+  models: readonly AgentSessionModelOption[],
+  previous: AgentModelCatalogEntry | undefined
+): AgentSessionModelOption[] {
+  return models.map((model) => {
+    const known = previous?.models.find((entry) => entry.id === model.id)?.defaultEffort
+    return model.defaultEffort === undefined &&
+      known !== undefined &&
+      model.efforts.some((choice) => choice.value === known)
+      ? { ...model, defaultEffort: known }
+      : { ...model }
+  })
+}
+
 function listingKey(entry: AgentModelCatalogEntry): string {
   return JSON.stringify([
     entry.origin,
@@ -135,16 +151,16 @@ export class AgentModelCatalogStore {
       // An empty list identifies no model; it is doubt, not a catalog.
       return null
     }
+    const previous = this.entries.get(fingerprint)
     const entry: AgentModelCatalogEntry = {
       agent,
       fingerprint,
-      models: success.models.map((model) => ({ ...model })),
+      models: withKnownDefaultEfforts(success.models, previous),
       ...(success.fastModeSupport ? { fastModeSupport: success.fastModeSupport } : {}),
       fastModeTierByModel: tierRecord(success.fastModeTierByModel),
       origin: success.origin,
       fetchedAt: this.now()
     }
-    const previous = this.entries.get(fingerprint)
     this.entries.delete(fingerprint)
     this.entries.set(fingerprint, entry)
     this.failures.delete(fingerprint)
diff --git a/src/main/native-chat/agent-session-journal/journal-crash-boundary.test.ts b/src/main/native-chat/agent-session-journal/journal-crash-boundary.test.ts
index d142672f8e5c..6cc267a90547 100644
--- a/src/main/native-chat/agent-session-journal/journal-crash-boundary.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-crash-boundary.test.ts
@@ -16,7 +16,8 @@ import type {
   AgentSessionJournalIdentity
 } from '../../../shared/agent-session-journal-types'
 import { hasUnansweredStructuredAgentSessionDispatch } from '../../../shared/structured-agent-session-projection'
-import { dispatchWriteFailureReason } from '../../../shared/structured-agent-session-dispatch-rejection'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
 import { digestPayload } from './journal-payload-bounds'
 import {
   reconcileSubmissions,
@@ -180,7 +181,7 @@ describe('crash between provider accept and journal commit', () => {
     await journal.resolveDispatch({
       clientMessageId: 'cm_write_failed',
       state: 'rejected',
-      reason: dispatchWriteFailureReason(new Error('broken pipe')),
+      ...agentSessionFailureWords(agentSessionFailureFact('writeFailed'), { surface: 'rejection' }),
       fence: 1
     })
 
@@ -191,7 +192,7 @@ describe('crash between provider accept and journal commit', () => {
     // so recovery must not reopen it as doubt.
     expect(restarted.submissions()[0]).toMatchObject({
       dispatchState: 'rejected',
-      reason: 'provider_write_failed: broken pipe'
+      reason: 'provider_write_failed'
     })
     expect(restarted.submissions()[0]?.recovered).toBeUndefined()
     expect(hasUnansweredStructuredAgentSessionDispatch(restarted.submissions())).toBe(false)
@@ -250,7 +251,9 @@ describe('crash between provider accept and journal commit', () => {
     await restarted.resolveDispatch({
       clientMessageId: 'cm_1',
       state: 'rejected',
-      reason: 'not_delivered',
+      ...agentSessionFailureWords(agentSessionFailureFact('notDelivered'), {
+        surface: 'rejection'
+      }),
       fence: 2,
       recovered: true
     })
diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-reason-bound.test.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-reason-bound.test.ts
index 70052865242d..668232e607d9 100644
--- a/src/main/native-chat/agent-session-journal/journal-dispatch-reason-bound.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-dispatch-reason-bound.test.ts
@@ -4,9 +4,9 @@ import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types'
 import {
+  classifyDispatchRejection,
   DISPATCH_REJECTED_WRITE_FAILED,
-  dispatchRejectionReasonIsInternal,
-  dispatchRejectionWasTransportWriteFailure
+  isWriteFailureSubmission
 } from '../../../shared/structured-agent-session-dispatch-rejection'
 import { DEFAULT_JOURNAL_PAYLOAD_LIMITS } from './journal-payload-bounds'
 import type { openAgentSessionJournal } from './journal-store-factory'
@@ -45,7 +45,14 @@ async function settle(reason: string): Promise<string | null> {
     body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hi' }] },
     fence: 1
   })
-  await journal.resolveDispatch({ clientMessageId: 'msg-1', state: 'rejected', reason, fence: 1 })
+  await journal.resolveDispatch({
+    clientMessageId: 'msg-1',
+    // A rejection's reason comes only from `agentSessionFailureWords`; an unknown's is still free
+    // text (an adapter's error), so it is what reaches the bound.
+    state: 'unknown',
+    reason,
+    fence: 1
+  })
   return journal.snapshot().submissions[0]?.reason ?? null
 }
 
@@ -81,7 +88,8 @@ describe('dispatch reason bounding', () => {
   it('keeps a clipped transport failure classifiable', async () => {
     const stored = await settle(`${DISPATCH_REJECTED_WRITE_FAILED}: ${HUGE}`)
     expect(stored).not.toBe(`${DISPATCH_REJECTED_WRITE_FAILED}: ${HUGE}`)
-    expect(dispatchRejectionWasTransportWriteFailure(stored)).toBe(true)
-    expect(dispatchRejectionReasonIsInternal(stored)).toBe(true)
+    // Read as an older host wrote it: by the reason alone.
+    expect(isWriteFailureSubmission({ reason: stored })).toBe(true)
+    expect(classifyDispatchRejection({ reason: stored })).toMatchObject({ kind: 'writeFailed' })
   })
 })
diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-reducer.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-reducer.ts
new file mode 100644
index 000000000000..470ed3dfcb24
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-dispatch-reducer.ts
@@ -0,0 +1,68 @@
+// How a `dispatch` row settles its submission. Field by field, so a key the row gains must be
+// copied here to reach any reader.
+
+import {
+  readAgentSessionFailureFact,
+  type UnreadAgentSessionFailureFact
+} from '../../../shared/agent-session-failure'
+import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
+import type { JournalReducerState } from './journal-reducer'
+import type { JournalRow } from './journal-row-schema'
+
+export function applyJournalDispatchRow(
+  state: JournalReducerState,
+  row: Extract<JournalRow, { kind: 'dispatch' }>
+): void {
+  const submission = state.submissions.get(row.clientMessageId)
+  if (!submission) {
+    return
+  }
+  // `rejected` is terminal; a late `unknown` must not reopen a settled answer.
+  if (submission.dispatchState === 'rejected' || submission.dispatchState === 'accepted') {
+    return
+  }
+  submission.fence = row.fence
+  submission.dispatchState = row.state
+  submission.providerItemId = row.providerItemId
+  submission.reason = row.reason
+  // Read where it can be placed; a kind it cannot place is kept as written, so the classifier
+  // still knows a fact was there without this build claiming what it says.
+  const rejection =
+    row.state === 'rejected'
+      ? (readAgentSessionFailureFact(row.rejection) ?? unreadFailureFact(row.rejection))
+      : undefined
+  if (rejection) {
+    submission.rejection = rejection
+  } else {
+    delete submission.rejection
+  }
+  submission.resolvedAt = row.state === 'pending' ? null : row.ts
+  if (row.state === 'pending') {
+    submission.handedOverAt = row.ts
+  }
+  if (row.recovered) {
+    submission.recovered = row.recovered
+  } else {
+    delete submission.recovered
+  }
+  if (row.state !== 'accepted' || !row.providerItemId) {
+    return
+  }
+  state.aliases.set(row.providerItemId, agentJournalSubmissionKey(row.clientMessageId))
+  state.receipts.set(row.clientMessageId, {
+    clientMessageId: row.clientMessageId,
+    providerItemId: row.providerItemId,
+    cursor: { epoch: row.epoch, sequence: row.seq },
+    acceptedAt: row.ts
+  })
+}
+
+function unreadFailureFact(value: unknown): UnreadAgentSessionFailureFact | undefined {
+  return typeof value === 'object' &&
+    value !== null &&
+    'kind' in value &&
+    typeof value.kind === 'string' &&
+    value.kind
+    ? { kind: value.kind }
+    : undefined
+}
diff --git a/src/main/native-chat/agent-session-journal/journal-open-failure.test.ts b/src/main/native-chat/agent-session-journal/journal-open-failure.test.ts
new file mode 100644
index 000000000000..a5427f76fdc7
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-open-failure.test.ts
@@ -0,0 +1,159 @@
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import { openJournalDatabase } from './journal-database'
+import {
+  classifyJournalOpenFailure,
+  createJournalOpenReadRefusals,
+  journalOpenReadRefusal
+} from './journal-open-failure'
+import { loadJournal } from './journal-open'
+import { journalDatabaseFile } from './journal-paths'
+
+let root: string
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-journal-open-failure-'))
+})
+
+afterEach(async () => {
+  await rm(root, { recursive: true, force: true })
+})
+
+/** What the journal's own open throws for the file as it stands. */
+function openFailure(): unknown {
+  try {
+    loadJournal(root, 'session-1')
+  } catch (error) {
+    return error
+  }
+  throw new Error('the journal opened')
+}
+
+/** A thrown value shaped as node:sqlite shapes one, with the result code it reports. */
+function nodeSqliteError(errcode: number): Error {
+  return Object.assign(new Error('sqlite'), { code: 'ERR_SQLITE_ERROR', errcode })
+}
+
+function systemError(code: string, errno: number): Error {
+  return Object.assign(new Error(`${code}: open`), { code, errno })
+}
+
+describe('classifyJournalOpenFailure', () => {
+  it('calls a journal that is not a database corrupt', async () => {
+    await writeFile(journalDatabaseFile(root), 'not a database '.repeat(64))
+    const error = openFailure()
+    expect(error).toMatchObject({ errcode: 26 })
+    expect(classifyJournalOpenFailure(error)).toBe('journalCorrupt')
+  })
+
+  it('calls a journal whose pages are damaged corrupt', async () => {
+    const path = journalDatabaseFile(root)
+    const opened = openJournalDatabase(path)
+    opened.db.exec('PRAGMA journal_mode = DELETE')
+    opened.db.close()
+    const bytes = await readFile(path)
+    // Page 1 holds the header and schema; every table's root page follows it.
+    bytes.fill(0xab, 4096)
+    await writeFile(path, bytes)
+    const error = openFailure()
+    expect(error).toMatchObject({ errcode: 11 })
+    expect(classifyJournalOpenFailure(error)).toBe('journalCorrupt')
+  })
+
+  it.each([
+    ['SQLITE_CORRUPT_VTAB', 267],
+    ['SQLITE_CORRUPT_SEQUENCE', 523],
+    ['SQLITE_CORRUPT_INDEX', 779]
+  ])('reads an extended corrupt code as corrupt: %s', (_name, errcode) => {
+    expect(classifyJournalOpenFailure(nodeSqliteError(errcode))).toBe('journalCorrupt')
+  })
+
+  it("reads the Bun driver's corrupt code as corrupt", () => {
+    const error = Object.assign(new Error('file is not a database'), {
+      name: 'SQLiteError',
+      code: 'SQLITE_NOTADB',
+      errno: 26
+    })
+    expect(classifyJournalOpenFailure(error)).toBe('journalCorrupt')
+  })
+
+  it('finds corruption a wrapper names as its cause', () => {
+    const wrapped = new Error('opening the conversation failed', {
+      cause: new Error('the journal would not open', { cause: nodeSqliteError(11) })
+    })
+    expect(classifyJournalOpenFailure(wrapped)).toBe('journalCorrupt')
+  })
+
+  it.each([
+    ['a busy database', nodeSqliteError(5)],
+    ['a locked database', nodeSqliteError(6)],
+    ['a database SQLite cannot open', nodeSqliteError(14)],
+    ['a disk I/O error', nodeSqliteError(10)],
+    ['permission denied', systemError('EACCES', -13)],
+    ['too many open files', systemError('EMFILE', -24)],
+    ['a Windows error whose low byte reads as corrupt', systemError('EUNKNOWN', -4085)],
+    ['an error that only claims a corrupt code', Object.assign(new Error('x'), { errcode: 11 })],
+    ['a thrown string', 'database disk image is malformed'],
+    ['nothing at all', undefined]
+  ])('calls any other failure one that can clear: %s', (_label, error) => {
+    expect(classifyJournalOpenFailure(error)).toBe('journalUnavailable')
+  })
+
+  it('stops on a cause chain that loops back on itself', () => {
+    const first = new Error('first')
+    const second = new Error('second', { cause: first })
+    Object.assign(first, { cause: second })
+    expect(classifyJournalOpenFailure(first)).toBe('journalUnavailable')
+  })
+})
+
+describe('journalOpenReadRefusal', () => {
+  it('names the reason, keeps the message the code and the storage text only as the cause', () => {
+    vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+    const storage = nodeSqliteError(26)
+    const refusal = journalOpenReadRefusal(storage)
+    expect(refusal.message).toBe('agent_session_journal_unreadable')
+    expect(refusal.refusal).toMatchObject({
+      code: 'agent_session_journal_unreadable',
+      details: { reason: 'journalCorrupt' }
+    })
+    expect(refusal.cause).toBe(storage)
+    vi.restoreAllMocks()
+  })
+
+  it('passes a refusal the open already raised through unchanged', () => {
+    const raised = agentSessionRefusalError('agent_session_identity_required', {
+      reason: 'recordMissing'
+    })
+    expect(journalOpenReadRefusal(raised)).toBe(raised)
+  })
+})
+
+describe('createJournalOpenReadRefusals', () => {
+  it('logs a session once per failure until it opens, and each session on its own', () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+    const refusals = createJournalOpenReadRefusals()
+    const denied = systemError('EACCES', -13)
+    const corrupt = nodeSqliteError(26)
+
+    for (let attempt = 0; attempt < 3; attempt += 1) {
+      const refusal = refusals.refusal('session-1', denied)
+      expect(refusal.refusal).toMatchObject({ details: { reason: 'journalUnavailable' } })
+      expect(refusal.cause).toBe(denied)
+    }
+    expect(warn).toHaveBeenCalledTimes(1)
+    refusals.refusal('session-2', denied)
+    expect(warn).toHaveBeenCalledTimes(2)
+    expect(refusals.refusal('session-1', corrupt).refusal).toMatchObject({
+      details: { reason: 'journalCorrupt' }
+    })
+    expect(warn).toHaveBeenCalledTimes(3)
+    refusals.forget('session-1')
+    refusals.refusal('session-1', corrupt)
+    expect(warn).toHaveBeenCalledTimes(4)
+    vi.restoreAllMocks()
+  })
+})
diff --git a/src/main/native-chat/agent-session-journal/journal-open-failure.ts b/src/main/native-chat/agent-session-journal/journal-open-failure.ts
new file mode 100644
index 000000000000..5e4cff1f3ee2
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-open-failure.ts
@@ -0,0 +1,80 @@
+// What a failed journal open means for the chat: its history is damaged, which no retry reads
+// past, or the open failed in a way that can clear (a lock, permissions, too many open files).
+
+import type { AgentSessionRefusalReason } from '../../../shared/agent-session-refusal-details'
+import {
+  AgentSessionRefusalError,
+  isAgentSessionRefusalError,
+  refuse
+} from '../../../shared/agent-session-wire-refusals'
+import { isSqliteCorruption } from '../../sqlite/sqlite-read-failure'
+
+export type JournalOpenFailure = AgentSessionRefusalReason<'agent_session_journal_unreadable'>
+
+// Bounds a cause chain that loops back on itself.
+const MAX_CAUSE_DEPTH = 8
+
+/** Damage only where the storage says so; anything unproven can clear. */
+export function classifyJournalOpenFailure(error: unknown): JournalOpenFailure {
+  let current = error
+  for (let depth = 0; depth < MAX_CAUSE_DEPTH && current !== undefined; depth += 1) {
+    if (isSqliteCorruption(current)) {
+      return 'journalCorrupt'
+    }
+    current = current instanceof Error ? current.cause : undefined
+  }
+  return 'journalUnavailable'
+}
+
+/**
+ * What a read throws when the conversation it reaches cannot be opened. The storage's own text
+ * (a path, "file is not a database") goes to the log only; the reader gets the classified refusal,
+ * whose message stays the bare code.
+ */
+export function journalOpenReadRefusal(error: unknown): AgentSessionRefusalError {
+  if (isAgentSessionRefusalError(error)) {
+    return error
+  }
+  return unreadableRefusal(error, classifyJournalOpenFailure(error), true)
+}
+
+const MAX_LOGGED_SESSIONS = 256
+
+/**
+ * The read door's refusals for one host. A reader reconnects on a timer while an open can clear,
+ * so a session's failure is logged once until that session opens or the failure changes.
+ */
+export function createJournalOpenReadRefusals() {
+  const logged = new Map<string, string>()
+  return {
+    refusal: (sessionId: string, error: unknown): AgentSessionRefusalError => {
+      if (isAgentSessionRefusalError(error)) {
+        return error
+      }
+      const reason = classifyJournalOpenFailure(error)
+      const failure = `${reason}:${error instanceof Error ? error.message : String(error)}`
+      const repeat = logged.get(sessionId) === failure
+      // Past the cap a new session logs every failure rather than evict another's.
+      if (!repeat && (logged.has(sessionId) || logged.size < MAX_LOGGED_SESSIONS)) {
+        logged.set(sessionId, failure)
+      }
+      return unreadableRefusal(error, reason, !repeat)
+    },
+    /** The session opened or closed: its next failure is news. */
+    forget: (sessionId: string): void => {
+      logged.delete(sessionId)
+    }
+  }
+}
+
+function unreadableRefusal(
+  error: unknown,
+  reason: JournalOpenFailure,
+  log: boolean
+): AgentSessionRefusalError {
+  if (log) {
+    console.warn('[agent-session] opening the conversation for a read failed:', error)
+  }
+  const code = 'agent_session_journal_unreadable'
+  return new AgentSessionRefusalError(refuse(code, { reason }, code), { cause: error })
+}
diff --git a/src/main/native-chat/agent-session-journal/journal-pending-submission-recovery.ts b/src/main/native-chat/agent-session-journal/journal-pending-submission-recovery.ts
index c4138ba22418..c252a57d8a57 100644
--- a/src/main/native-chat/agent-session-journal/journal-pending-submission-recovery.ts
+++ b/src/main/native-chat/agent-session-journal/journal-pending-submission-recovery.ts
@@ -1,8 +1,12 @@
+import type { AgentJournalDispatchRejection } from '../../../shared/agent-session-failure-words'
+import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types'
+import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
 import { DISPATCH_DOUBT_HOST_RESTARTED } from './journal-dispatch-doubt-reasons'
 import type { AgentSessionJournal } from './journal-store'
 
 /** Settles every submission a process fact left unanswerable. Doubt is never
- *  proof of non-delivery, so nothing here ever becomes re-deliverable. */
+ *  proof of non-delivery, so nothing here ever becomes re-deliverable. A queued
+ *  submission was never handed over, so it is not in doubt and is left alone. */
 export async function markJournalPendingSubmissionsUnknown(
   journal: AgentSessionJournal,
   fence: number,
@@ -12,8 +16,9 @@ export async function markJournalPendingSubmissionsUnknown(
     .submissions()
     .filter(
       (entry) =>
-        entry.dispatchState === 'pending' ||
-        (entry.dispatchState === 'unknown' && entry.recovered !== true)
+        !isQueuedAgentJournalSubmission(entry) &&
+        (entry.dispatchState === 'pending' ||
+          (entry.dispatchState === 'unknown' && entry.recovered !== true))
     )
   for (const entry of unresolved) {
     // An earlier reason already names a sharper fact than "the host restarted".
@@ -31,27 +36,51 @@ export async function markJournalPendingSubmissionsUnknown(
 }
 
 /** Settles every submission a child that never proved its start left unanswered as `rejected`:
- *  such a child accepted nothing, so each is provably unwritten and safe to send again. */
+ *  such a child accepted nothing, so each is provably unwritten and safe to send again. A queued
+ *  submission was never handed to that child; the delivery loop settles it. */
 export async function rejectJournalPendingSubmissions(
   journal: AgentSessionJournal,
   fence: number,
-  reason: string
+  rejection: AgentJournalDispatchRejection
 ): Promise<string[]> {
   const unwritten = journal
     .submissions()
     .filter(
       (entry) =>
-        entry.dispatchState === 'pending' ||
-        (entry.dispatchState === 'unknown' && entry.recovered !== true)
+        !isQueuedAgentJournalSubmission(entry) &&
+        (entry.dispatchState === 'pending' ||
+          (entry.dispatchState === 'unknown' && entry.recovered !== true))
     )
   for (const entry of unwritten) {
     await journal.resolveDispatch({
       clientMessageId: entry.clientMessageId,
       state: 'rejected',
-      reason,
+      ...rejection,
       fence,
       recovered: true
     })
   }
   return unwritten.map((entry) => entry.clientMessageId)
 }
+
+/** Rejects queued submissions — accepted, never handed over, so provably unwritten. */
+export async function rejectJournalQueuedSubmissions(
+  journal: AgentSessionJournal,
+  fence: number,
+  rejection: AgentJournalDispatchRejection,
+  which: (submission: AgentJournalSubmission) => boolean = () => true
+): Promise<string[]> {
+  const queued = journal
+    .submissions()
+    .filter((entry) => isQueuedAgentJournalSubmission(entry) && which(entry))
+  for (const entry of queued) {
+    await journal.resolveDispatch({
+      clientMessageId: entry.clientMessageId,
+      state: 'rejected',
+      ...rejection,
+      fence,
+      recovered: true
+    })
+  }
+  return queued.map((entry) => entry.clientMessageId)
+}
diff --git a/src/main/native-chat/agent-session-journal/journal-reducer-rejection-fact.test.ts b/src/main/native-chat/agent-session-journal/journal-reducer-rejection-fact.test.ts
new file mode 100644
index 000000000000..3332e53b0b3e
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-reducer-rejection-fact.test.ts
@@ -0,0 +1,100 @@
+// A dispatch row's typed rejection fact, as the reducer folds it onto the submission.
+
+import { describe, expect, it } from 'vitest'
+import {
+  classifyDispatchRejection,
+  DISPATCH_REJECTED_QUEUE_FULL
+} from '../../../shared/structured-agent-session-dispatch-rejection'
+import {
+  applyJournalRow,
+  createJournalReducerState,
+  type JournalReducerState
+} from './journal-reducer'
+import type { JournalRow } from './journal-row-schema'
+
+const EPOCH = 'epoch-1'
+
+function base(seq: number): { v: number; epoch: string; seq: number; fence: number; ts: number } {
+  return { v: 1, epoch: EPOCH, seq, fence: 1, ts: 1_000 + seq }
+}
+
+function fold(rows: JournalRow[]): JournalReducerState {
+  const state = createJournalReducerState('session-1', EPOCH)
+  for (const row of rows) {
+    applyJournalRow(state, row)
+  }
+  return state
+}
+
+describe('a rejected dispatch', () => {
+  const submission: JournalRow = {
+    kind: 'submission',
+    clientMessageId: 'cm_1',
+    payloadFingerprint: 'fp_1',
+    providerHandle: { kind: 'codex', threadId: 'thread-1' },
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hi' }] },
+    ...base(1)
+  }
+
+  it("copies a rejection's typed fact onto the submission, and only on `rejected`", () => {
+    const rejection = { kind: 'providerRejected', detail: { text: 'Too long', audience: 'person' } }
+    const state = fold([
+      submission,
+      {
+        kind: 'dispatch',
+        clientMessageId: 'cm_1',
+        state: 'rejected',
+        providerItemId: null,
+        reason: 'The provider did not accept this message.',
+        rejection: { kind: 'providerRejected', detail: { text: 'Too long', audience: 'person' } },
+        ...base(2)
+      }
+    ])
+    expect(state.submissions.get('cm_1')).toMatchObject({
+      dispatchState: 'rejected',
+      reason: 'The provider did not accept this message.',
+      rejection
+    })
+
+    const doubt = fold([
+      { ...submission, clientMessageId: 'cm_2' },
+      {
+        kind: 'dispatch',
+        clientMessageId: 'cm_2',
+        state: 'unknown',
+        providerItemId: null,
+        reason: 'provider_exited_before_acknowledgement',
+        rejection: { kind: 'writeFailed' },
+        ...base(2)
+      }
+    ])
+    expect(doubt.submissions.get('cm_2')).not.toHaveProperty('rejection')
+  })
+
+  it('keeps only the kind of a rejection fact it cannot place, so it reads as no verdict', () => {
+    const rejected = (rejection: unknown): JournalRow => {
+      const row: JournalRow = {
+        kind: 'dispatch',
+        clientMessageId: 'cm_1',
+        state: 'rejected',
+        providerItemId: null,
+        reason: DISPATCH_REJECTED_QUEUE_FULL,
+        ...base(2)
+      }
+      // A row read from disk carries whatever the host that wrote it did.
+      return Object.assign(row, { rejection })
+    }
+    // A newer host's kind: the marker beside it must not decide.
+    const newer = fold([submission, rejected({ kind: 'futureKind', detail: 'x' })])
+    const settled = newer.submissions.get('cm_1')
+    expect(settled).toMatchObject({ dispatchState: 'rejected', rejection: { kind: 'futureKind' } })
+    expect(settled && classifyDispatchRejection(settled)).toEqual({
+      category: 'undelivered',
+      verdict: null
+    })
+    // Not a fact at all: dropped, leaving the reason.
+    const malformed = fold([submission, rejected('queueFull')]).submissions.get('cm_1')
+    expect(malformed).not.toHaveProperty('rejection')
+    expect(malformed && classifyDispatchRejection(malformed)).toMatchObject({ kind: 'queueFull' })
+  })
+})
diff --git a/src/main/native-chat/agent-session-journal/journal-reducer.test.ts b/src/main/native-chat/agent-session-journal/journal-reducer.test.ts
index 825c5aaf3473..eea740e754d8 100644
--- a/src/main/native-chat/agent-session-journal/journal-reducer.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-reducer.test.ts
@@ -118,6 +118,39 @@ describe('ordering', () => {
     expect(renderJournalState(state).items.map((item) => item.itemId)).toEqual(['earlier', 'later'])
   })
 
+  it("places a batch's writes by their order in it, and keeps that place on revision", () => {
+    // One Codex ask writes all its questions in one batch; their ids are not their order.
+    const state = fold([
+      {
+        kind: 'lifecycle-batch',
+        settlementId: 'ask',
+        mutations: [
+          { kind: 'item', itemId: 'scope', revision: 1, body: text('first') },
+          { kind: 'item', itemId: 'priority', revision: 1, body: text('second') },
+          { kind: 'item', itemId: 'deadline', revision: 1, body: text('third') }
+        ],
+        ...base(1)
+      },
+      {
+        kind: 'lifecycle-batch',
+        settlementId: 'answer',
+        mutations: [{ kind: 'item', itemId: 'deadline', revision: 2, body: text('answered') }],
+        ...base(2)
+      }
+    ])
+    expect(
+      renderJournalState(state).items.map(({ itemId, sequence, sequenceIndex }) => ({
+        itemId,
+        sequence,
+        sequenceIndex
+      }))
+    ).toEqual([
+      { itemId: 'scope', sequence: 1, sequenceIndex: undefined },
+      { itemId: 'priority', sequence: 1, sequenceIndex: 1 },
+      { itemId: 'deadline', sequence: 1, sequenceIndex: 2 }
+    ])
+  })
+
   it('orders by sequence even when the observed timestamp runs backwards', () => {
     const state = fold([
       { kind: 'item', itemId: 'late', revision: 1, body: text('late'), ...base(1), ts: 9_000 },
diff --git a/src/main/native-chat/agent-session-journal/journal-reducer.ts b/src/main/native-chat/agent-session-journal/journal-reducer.ts
index 273502c8cf2b..d7e22575702d 100644
--- a/src/main/native-chat/agent-session-journal/journal-reducer.ts
+++ b/src/main/native-chat/agent-session-journal/journal-reducer.ts
@@ -4,9 +4,10 @@
 //
 // Rules: highest revision wins, a tombstone removes, a late lower revision is
 // dropped rather than resurrecting stale content, and ordering is by the
-// sequence of the row that CREATED an item (a later revision updates the body,
-// it does not move the bubble). Producer linkage is likewise the creating
-// write's: a revision naming no producer keeps it, one naming any replaces it.
+// position (sequence, then place in the row) of the write that CREATED an item
+// (a later revision updates the body, it does not move the bubble). Producer
+// linkage is likewise the creating write's: a revision naming no producer keeps
+// it, one naming any replaces it.
 
 import type {
   AgentJournalAcceptanceReceipt,
@@ -15,6 +16,7 @@ import type {
   AgentJournalSubmission
 } from '../../../shared/agent-session-journal-types'
 import { journalBatchMutationProducer, journalRenderItem } from './journal-render-item'
+import { compareAgentJournalItems } from '../../../shared/agent-session-journal-position'
 import {
   agentJournalSubmissionKey,
   parseAgentJournalItemKey
@@ -26,7 +28,8 @@ import {
 import { structuredAgentSessionPayloadFingerprint } from '../../../shared/structured-agent-session-mutation'
 import { journalItemRevisionIsStale } from './journal-item-revision'
 import type { JournalRow } from './journal-row-schema'
-import { dispatchRejectionWasTransportWriteFailure } from '../../../shared/structured-agent-session-dispatch-rejection'
+import { applyJournalDispatchRow } from './journal-dispatch-reducer'
+import { isWriteFailureSubmission } from '../../../shared/structured-agent-session-dispatch-rejection'
 
 export const MAX_JOURNAL_APPLIED_SETTLEMENT_IDS = 4_096
 
@@ -39,6 +42,8 @@ export type JournalReducerState = {
   oldestSequence: number
   highestFence: number
   items: Map<string, AgentJournalRenderItem>
+  /** Fence of the writer that created each item: the generation a running turn belongs to. */
+  itemFences: Map<string, number>
   /** Revision of a removed item, so a late lower revision cannot resurrect it. */
   tombstones: Map<string, number>
   submissions: Map<string, AgentJournalSubmission>
@@ -58,6 +63,7 @@ export function createJournalReducerState(sessionId: string, epoch: string): Jou
     oldestSequence: 1,
     highestFence: 0,
     items: new Map(),
+    itemFences: new Map(),
     tombstones: new Map(),
     submissions: new Map(),
     receipts: new Map(),
@@ -79,7 +85,13 @@ export function applyJournalRow(state: JournalReducerState, row: JournalRow): vo
     }
     const itemId = resolveJournalItemId(state, row.itemId, row.body)
     acceptSubmissionFromProviderItem(state, row.itemId, itemId, row)
-    upsertItem(state, itemId, row.revision, journalRenderItem(itemId, row.revision, row.body, row))
+    upsertItem(
+      state,
+      itemId,
+      row.revision,
+      journalRenderItem(itemId, row.revision, row.body, row),
+      row.fence
+    )
     return
   }
   if (row.kind === 'tombstone') {
@@ -90,25 +102,17 @@ export function applyJournalRow(state: JournalReducerState, row: JournalRow): vo
     if (state.appliedSettlementIds.has(row.settlementId)) {
       return
     }
-    for (const mutation of row.mutations) {
+    for (const [sequenceIndex, mutation] of row.mutations.entries()) {
       if (mutation.kind === 'item') {
         if (journalItemRevisionIsStale(state, mutation.itemId, mutation.revision)) {
           continue
         }
-        const itemId = resolveJournalItemId(state, mutation.itemId, mutation.body)
+        const { revision, body } = mutation
+        const itemId = resolveJournalItemId(state, mutation.itemId, body)
         acceptSubmissionFromProviderItem(state, mutation.itemId, itemId, row)
-        upsertItem(
-          state,
-          itemId,
-          mutation.revision,
-          journalRenderItem(
-            itemId,
-            mutation.revision,
-            mutation.body,
-            row,
-            journalBatchMutationProducer(row, mutation)
-          )
-        )
+        const producer = journalBatchMutationProducer(row, mutation)
+        const item = journalRenderItem(itemId, revision, body, row, producer, sequenceIndex)
+        upsertItem(state, itemId, revision, item, row.fence)
       } else {
         removeItem(state, resolveItemId(state, mutation.itemId), mutation.revision)
       }
@@ -120,7 +124,7 @@ export function applyJournalRow(state: JournalReducerState, row: JournalRow): vo
     applySubmission(state, row)
     return
   }
-  applyDispatch(state, row)
+  applyJournalDispatchRow(state, row)
 }
 
 export function rememberAppliedSettlementId(
@@ -172,7 +176,7 @@ export function resolveJournalItemId(
     .find(
       (candidate) =>
         candidate.dispatchState !== 'rejected' &&
-        !dispatchRejectionWasTransportWriteFailure(candidate.reason) &&
+        !isWriteFailureSubmission(candidate) &&
         candidate.payloadFingerprint === fingerprint &&
         state.items.get(agentJournalSubmissionKey(candidate.clientMessageId))?.revision === 0
     )
@@ -192,7 +196,8 @@ function upsertItem(
   state: JournalReducerState,
   itemId: string,
   revision: number,
-  next: AgentJournalRenderItem
+  next: AgentJournalRenderItem,
+  fence: number
 ): void {
   const tombstoned = state.tombstones.get(itemId)
   if (tombstoned !== undefined && revision <= tombstoned) {
@@ -204,6 +209,7 @@ function upsertItem(
   }
   if (!existing) {
     state.items.set(itemId, next)
+    state.itemFences.set(itemId, fence)
     state.tombstones.delete(itemId)
     return
   }
@@ -216,14 +222,16 @@ function upsertItem(
     existing.body.kind === 'message' &&
     existing.body.role === 'user' &&
     parseAgentJournalItemKey(itemId)?.provider === 'orca'
+  const { sequenceIndex: _revisedAt, ...revised } = next
   state.items.set(itemId, {
-    ...next,
+    ...revised,
     // Settlements, prompt answers and reopen sweeps revise rows any agent wrote
     // without naming one; each would otherwise hand a subagent's row to the session.
     ...(namesAgentJournalProducer(next) ? {} : agentJournalLinkageFields(existing)),
     // Provider history may normalize text or omit local attachments from the original send.
     body: submitted ? existing.body : next.body,
     sequence: existing.sequence,
+    ...(existing.sequenceIndex !== undefined ? { sequenceIndex: existing.sequenceIndex } : {}),
     observedAt: existing.observedAt
   })
   state.tombstones.delete(itemId)
@@ -240,6 +248,7 @@ function removeItem(state: JournalReducerState, itemId: string, revision: number
   }
   state.tombstones.set(itemId, revision)
   state.items.delete(itemId)
+  state.itemFences.delete(itemId)
 }
 
 function applySubmission(
@@ -254,44 +263,11 @@ function applySubmission(
     providerItemId: null,
     reason: null,
     submittedAt: row.ts,
-    resolvedAt: null
+    resolvedAt: null,
+    ...(row.handoverRecorded ? { handoverRecorded: true, acceptedSequence: row.seq } : {})
   })
   const itemId = agentJournalSubmissionKey(row.clientMessageId)
-  upsertItem(state, itemId, 0, journalRenderItem(itemId, 0, row.body, row))
-}
-
-function applyDispatch(
-  state: JournalReducerState,
-  row: Extract<JournalRow, { kind: 'dispatch' }>
-): void {
-  const submission = state.submissions.get(row.clientMessageId)
-  if (!submission) {
-    return
-  }
-  // `rejected` is terminal; a late `unknown` must not reopen a settled answer.
-  if (submission.dispatchState === 'rejected' || submission.dispatchState === 'accepted') {
-    return
-  }
-  submission.fence = row.fence
-  submission.dispatchState = row.state
-  submission.providerItemId = row.providerItemId
-  submission.reason = row.reason
-  submission.resolvedAt = row.state === 'pending' ? null : row.ts
-  if (row.recovered) {
-    submission.recovered = row.recovered
-  } else {
-    delete submission.recovered
-  }
-  if (row.state !== 'accepted' || !row.providerItemId) {
-    return
-  }
-  state.aliases.set(row.providerItemId, agentJournalSubmissionKey(row.clientMessageId))
-  state.receipts.set(row.clientMessageId, {
-    clientMessageId: row.clientMessageId,
-    providerItemId: row.providerItemId,
-    cursor: { epoch: row.epoch, sequence: row.seq },
-    acceptedAt: row.ts
-  })
+  upsertItem(state, itemId, 0, journalRenderItem(itemId, 0, row.body, row), row.fence)
 }
 
 function acceptSubmissionFromProviderItem(
@@ -329,9 +305,9 @@ function acceptSubmissionFromProviderItem(
 
 /** Project the folded state into the client-facing snapshot. */
 export function renderJournalState(state: JournalReducerState): AgentJournalSnapshot {
-  // Sequence is the sole ordering key; map insertion order is not, because a
-  // re-created item re-enters the map after the items that followed it.
-  const items = [...state.items.values()].sort((a, b) => a.sequence - b.sequence)
+  // The journal position is the sole ordering key; map insertion order is not,
+  // because a re-created item re-enters the map after the items that followed it.
+  const items = [...state.items.values()].sort(compareAgentJournalItems)
   return {
     sessionId: state.sessionId,
     cursor: { epoch: state.epoch, sequence: state.lastSequence },
diff --git a/src/main/native-chat/agent-session-journal/journal-render-item.ts b/src/main/native-chat/agent-session-journal/journal-render-item.ts
index 6f41ff3e8627..516086eed3d0 100644
--- a/src/main/native-chat/agent-session-journal/journal-render-item.ts
+++ b/src/main/native-chat/agent-session-journal/journal-render-item.ts
@@ -19,13 +19,16 @@ export function journalRenderItem(
   revision: number,
   body: AgentJournalItemBody,
   row: JournalRow,
-  producer: AgentJournalProducerLinkage = row
+  producer: AgentJournalProducerLinkage = row,
+  /** Which of the row's writes this is; only a lifecycle batch has more than one. */
+  sequenceIndex = 0
 ): AgentJournalRenderItem {
   return {
     itemId,
     revision,
     body,
     sequence: row.seq,
+    ...(sequenceIndex > 0 ? { sequenceIndex } : {}),
     observedAt: row.ts,
     ...(row.recovered ? { recoveredAt: row.ts } : {}),
     ...(row.recovered ? { recovered: row.recovered } : {}),
diff --git a/src/main/native-chat/agent-session-journal/journal-restart-reconciliation.test.ts b/src/main/native-chat/agent-session-journal/journal-restart-reconciliation.test.ts
index 46d161b1172b..4428e13953e1 100644
--- a/src/main/native-chat/agent-session-journal/journal-restart-reconciliation.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-restart-reconciliation.test.ts
@@ -15,6 +15,9 @@ import { digestPayload } from './journal-payload-bounds'
 import { reconcileJournalSubmissionsAgainstHistory } from './journal-restart-reconciliation'
 import type { ProviderHistoryItem, ProviderHistoryWindow } from './journal-submission-reconciler'
 import { createTrackedJournalOpener } from './journal-store-test-open'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
+import { classifyDispatchRejection } from '../../../shared/structured-agent-session-dispatch-rejection'
 
 const IDENTITY: AgentSessionJournalIdentity = {
   sessionId: 'session-1',
@@ -122,7 +125,18 @@ describe('reconcileJournalSubmissionsAgainstHistory', () => {
     expect(settled).toEqual(['cm_1'])
     const submission = journal.submissions()[0]
     expect(submission?.dispatchState).toBe('rejected')
-    expect(submission?.reason).toBe('not_delivered')
+    // A sentence, since released clients print the reason as it is, and the fact beside it.
+    expect(submission?.reason).toBe(
+      agentSessionFailureWords(agentSessionFailureFact('notDelivered'), { surface: 'rejection' })
+        .reason
+    )
+    expect(submission?.rejection).toEqual({ kind: 'notDelivered' })
+    // Nobody failed: the crash stranded it before the provider took it.
+    expect(submission && classifyDispatchRejection(submission)).toEqual({
+      category: 'undelivered',
+      verdict: null,
+      kind: 'notDelivered'
+    })
   })
 
   it('leaves a submission unknown while the provider reports a turn in flight', async () => {
@@ -254,7 +268,7 @@ describe('reconcileJournalSubmissionsAgainstHistory', () => {
       'accepted',
       'rejected'
     ])
-    expect(restarted.submissions()[1]?.reason).toBe('not_delivered')
+    expect(restarted.submissions()[1]?.rejection).toEqual({ kind: 'notDelivered' })
   })
 
   it('leaves two identical unsettled sends unknown rather than guessing between them', async () => {
diff --git a/src/main/native-chat/agent-session-journal/journal-restart-reconciliation.ts b/src/main/native-chat/agent-session-journal/journal-restart-reconciliation.ts
index 626baa9820aa..7b36fc88dc63 100644
--- a/src/main/native-chat/agent-session-journal/journal-restart-reconciliation.ts
+++ b/src/main/native-chat/agent-session-journal/journal-restart-reconciliation.ts
@@ -10,6 +10,8 @@
 // through the user's Retry, which rotates the client message id; Orca still
 // never puts a message back on the wire on the user's behalf.
 
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
 import type {
   AgentJournalMessageItem,
   AgentJournalSubmission
@@ -18,6 +20,7 @@ import {
   agentJournalItemKey,
   agentJournalSubmissionKey
 } from '../../../shared/agent-session-journal-item-key'
+import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
 import type { AgentSessionJournal } from './journal-store'
 import { reconcileSubmissions, type ProviderHistoryWindow } from './journal-submission-reconciler'
 
@@ -42,7 +45,11 @@ function comparableSubmissions(journal: AgentSessionJournal): AgentJournalSubmis
   const { items, submissions } = journal.snapshot()
   const bodies = new Map(items.map((item) => [item.itemId, item.body]))
   return submissions.filter((submission) => {
-    if (submission.dispatchState !== 'pending' && submission.dispatchState !== 'unknown') {
+    if (
+      (submission.dispatchState !== 'pending' && submission.dispatchState !== 'unknown') ||
+      // Never handed over, so provider history cannot hold it.
+      isQueuedAgentJournalSubmission(submission)
+    ) {
       return false
     }
     const body = bodies.get(agentJournalSubmissionKey(submission.clientMessageId))
@@ -111,7 +118,9 @@ export async function reconcileJournalSubmissionsAgainstHistory(input: {
         : {
             clientMessageId: outcome.clientMessageId,
             state: 'rejected',
-            reason: outcome.reason,
+            ...agentSessionFailureWords(agentSessionFailureFact('notDelivered'), {
+              surface: 'rejection'
+            }),
             fence: input.fence,
             recovered: true
           }
diff --git a/src/main/native-chat/agent-session-journal/journal-row-builders.ts b/src/main/native-chat/agent-session-journal/journal-row-builders.ts
index e17ccf0cdf87..ee56f28f8a25 100644
--- a/src/main/native-chat/agent-session-journal/journal-row-builders.ts
+++ b/src/main/native-chat/agent-session-journal/journal-row-builders.ts
@@ -1,5 +1,4 @@
 import type {
-  AgentJournalDispatchState,
   AgentJournalItemBody,
   AgentJournalItemIdentity,
   AgentJournalMessageItem,
@@ -65,6 +64,7 @@ export function journalSubmissionRowBuilder(
     payloadFingerprint: string
     body: AgentJournalMessageItem
     fence: number
+    handoverRecorded?: true
   }
 ): RowBuilder<JournalSubmissionRow> {
   return (seq, ts) =>
@@ -77,23 +77,22 @@ export function journalDispatchRowBuilder(
 ): RowBuilder<JournalDispatchRow> {
   const providerItemId =
     input.state === 'accepted' ? agentJournalItemKey(input.providerIdentity) : null
-  return (seq, ts) =>
-    buildJournalDispatchRow({
-      state: state(),
-      clientMessageId: input.clientMessageId,
-      dispatchState: input.state,
-      providerItemId,
-      reason: boundedDispatchReason(input),
-      seq,
-      fence: input.fence,
-      ts,
-      recovered: input.recovered
-    })
+  // The only dispatch-row builder: its input type is what makes a rejected row carry its fact.
+  return (seq, ts) => ({
+    kind: 'dispatch',
+    clientMessageId: input.clientMessageId,
+    state: input.state,
+    providerItemId,
+    reason: boundedDispatchReason(input),
+    ...(input.state === 'rejected' ? { rejection: input.rejection } : {}),
+    ...journalRowBase(state().epoch, seq, input.fence, ts),
+    ...(input.recovered ? { recovered: input.recovered } : {})
+  })
 }
 
 /** `reason` is the only unbounded field written by Orca's own code: a provider error is
  *  arbitrary text, and a multi-megabyte one reached the row verbatim. Bounded head-first,
- *  because `dispatchRejectionWasTransportWriteFailure` prefix-matches the value. Rows
+ *  because `isWriteFailureSubmission` prefix-matches the value. Rows
  *  written before this keep their full text, so readers still meet unbounded ones. */
 function boundedDispatchReason(input: ResolveDispatchInput): string | null {
   if (input.state === 'accepted' || input.state === 'pending' || !input.reason) {
@@ -267,6 +266,7 @@ export function buildJournalSubmissionRow(input: {
   seq: number
   fence: number
   ts: number
+  handoverRecorded?: true
 }): JournalSubmissionRow {
   return {
     kind: 'submission',
@@ -274,28 +274,7 @@ export function buildJournalSubmissionRow(input: {
     payloadFingerprint: input.payloadFingerprint,
     providerHandle: input.providerHandle,
     body: input.body,
-    ...journalRowBase(input.state.epoch, input.seq, input.fence, input.ts)
-  }
-}
-
-export function buildJournalDispatchRow(input: {
-  state: JournalReducerState
-  clientMessageId: string
-  dispatchState: AgentJournalDispatchState
-  providerItemId: string | null
-  reason: string | null
-  seq: number
-  fence: number
-  ts: number
-  recovered?: true
-}): JournalDispatchRow {
-  return {
-    kind: 'dispatch',
-    clientMessageId: input.clientMessageId,
-    state: input.dispatchState,
-    providerItemId: input.providerItemId,
-    reason: input.reason,
     ...journalRowBase(input.state.epoch, input.seq, input.fence, input.ts),
-    ...(input.recovered ? { recovered: input.recovered } : {})
+    ...(input.handoverRecorded ? { handoverRecorded: true } : {})
   }
 }
diff --git a/src/main/native-chat/agent-session-journal/journal-row-schema.ts b/src/main/native-chat/agent-session-journal/journal-row-schema.ts
index 99cb47971e95..786d422876cb 100644
--- a/src/main/native-chat/agent-session-journal/journal-row-schema.ts
+++ b/src/main/native-chat/agent-session-journal/journal-row-schema.ts
@@ -5,6 +5,7 @@
 // UNREADABLE, not skippable: the caller must degrade to read-only rather than
 // render a partial timeline or compact past a row it cannot interpret.
 
+import type { AgentSessionFailureFact } from '../../../shared/agent-session-failure'
 import {
   AGENT_SESSION_JOURNAL_SCHEMA_VERSION,
   type AgentJournalDispatchState,
@@ -77,6 +78,9 @@ export type JournalSubmissionRow = JournalRowBase & {
   payloadFingerprint: string
   providerHandle: AgentSessionProviderHandle
   body: AgentJournalMessageItem
+  /** Accepted to be handed over by a later `dispatch{pending}` row; absent on rows whose writer
+   *  dispatched in the same step. Older readers keep the key and ignore it. */
+  handoverRecorded?: true
 }
 
 export type JournalDispatchRow = JournalRowBase & {
@@ -86,6 +90,9 @@ export type JournalDispatchRow = JournalRowBase & {
   /** Provider item identity adopted on accept. */
   providerItemId: string | null
   reason: string | null
+  /** On `rejected`: why, typed. Older readers keep the key and ignore it; a malformed one is
+   *  dropped when read, never the row. */
+  rejection?: AgentSessionFailureFact
 }
 
 /** An item mutation may name its own producer, because one batch can CREATE
diff --git a/src/main/native-chat/agent-session-journal/journal-store-close.test.ts b/src/main/native-chat/agent-session-journal/journal-store-close.test.ts
index 960c65a638a3..af53cd16d3db 100644
--- a/src/main/native-chat/agent-session-journal/journal-store-close.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-store-close.test.ts
@@ -13,6 +13,8 @@ import type {
   AgentJournalItemIdentity,
   AgentSessionJournalIdentity
 } from '../../../shared/agent-session-journal-types'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
 import { journalDatabaseFile } from './journal-paths'
 import type { AgentSessionJournal } from './journal-store'
 import { createTrackedJournalOpener } from './journal-store-test-open'
@@ -117,7 +119,16 @@ describe('closed-state admission happens at enqueue', () => {
           fence: 1
         })
       ),
-      settle(journal.resolveDispatch({ clientMessageId: 'cm_1', state: 'rejected', fence: 1 })),
+      settle(
+        journal.resolveDispatch({
+          clientMessageId: 'cm_1',
+          state: 'rejected',
+          ...agentSessionFailureWords(agentSessionFailureFact('hostFault'), {
+            surface: 'rejection'
+          }),
+          fence: 1
+        })
+      ),
       settle(
         journal.appendLifecycleBatch({
           settlementId: 'settle',
diff --git a/src/main/native-chat/agent-session-journal/journal-store-contracts.ts b/src/main/native-chat/agent-session-journal/journal-store-contracts.ts
index cea47e381fe4..c2210efb253b 100644
--- a/src/main/native-chat/agent-session-journal/journal-store-contracts.ts
+++ b/src/main/native-chat/agent-session-journal/journal-store-contracts.ts
@@ -1,3 +1,4 @@
+import type { AgentJournalDispatchRejection } from '../../../shared/agent-session-failure-words'
 import type {
   AgentJournalCursor,
   AgentJournalItemBody,
@@ -31,7 +32,10 @@ export type ResolveDispatchInput = {
 } & (
   | { state: 'accepted'; providerIdentity: AgentJournalItemIdentity }
   | { state: 'pending' }
-  | { state: 'rejected' | 'unknown'; reason?: string | null }
+  /** `reason` is what released clients print, `rejection` what newer ones read: both from
+   *  `agentSessionFailureWords`, never written by hand. */
+  | ({ state: 'rejected' } & AgentJournalDispatchRejection)
+  | { state: 'unknown'; reason?: string | null }
 )
 
 export type JournalAppendResult = {
@@ -59,6 +63,8 @@ export type JournalSubmissionInput = {
   payloadFingerprint: string
   body: AgentJournalMessageItem
   fence: number
+  /** The send is accepted now and handed over later, by a `dispatch{pending}` row. */
+  handoverRecorded?: true
 }
 
 export type JournalItemAppendInput = {
diff --git a/src/main/native-chat/agent-session-journal/journal-store.test.ts b/src/main/native-chat/agent-session-journal/journal-store.test.ts
index ffaea5c5d6f1..3637f03dab6c 100644
--- a/src/main/native-chat/agent-session-journal/journal-store.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-store.test.ts
@@ -424,3 +424,31 @@ async function withJournalDatabase(
     opened.db.close()
   }
 }
+
+describe('what a handle found on disk when it opened', () => {
+  const submission = (clientMessageId: string) => ({
+    clientMessageId,
+    payloadFingerprint: 'fp',
+    body: { kind: 'message' as const, role: 'user' as const, blocks: [] },
+    fence: 1,
+    handoverRecorded: true as const
+  })
+
+  it('names rows an earlier handle wrote, and never a row of a later epoch', async () => {
+    const earlier = await open()
+    await earlier.appendItem(item(1), body('one'), { fence: 1 })
+    await earlier.appendSubmission(submission('earlier'))
+    await earlier.close()
+
+    const journal = await open()
+    const leftover = journal.submissions().find((entry) => entry.clientMessageId === 'earlier')
+    expect(journal.wroteBeforeOpen(leftover?.acceptedSequence)).toBe(true)
+
+    // Sequences restart with an epoch, so a row accepted after it can sit below the open cursor.
+    await journal.replaceEpochItems('handle_forked', 1, [])
+    await journal.appendSubmission(submission('later'))
+    const later = journal.submissions().find((entry) => entry.clientMessageId === 'later')
+    expect(later?.acceptedSequence).toBeLessThanOrEqual(2)
+    expect(journal.wroteBeforeOpen(later?.acceptedSequence)).toBe(false)
+  })
+})
diff --git a/src/main/native-chat/agent-session-journal/journal-store.ts b/src/main/native-chat/agent-session-journal/journal-store.ts
index 568fbe4d39d3..3be3aebbc514 100644
--- a/src/main/native-chat/agent-session-journal/journal-store.ts
+++ b/src/main/native-chat/agent-session-journal/journal-store.ts
@@ -1,5 +1,6 @@
 // Append-only journal store for one agent session.
 
+import type { AgentJournalDispatchRejection } from '../../../shared/agent-session-failure-words'
 import { randomUUID } from 'node:crypto'
 import type {
   AgentJournalAcceptanceReceipt,
@@ -28,7 +29,8 @@ import { readJournalRowsAfterCursor, type JournalLoad } from './journal-open'
 import { journalDatabaseFile } from './journal-paths'
 import {
   markJournalPendingSubmissionsUnknown,
-  rejectJournalPendingSubmissions
+  rejectJournalPendingSubmissions,
+  rejectJournalQueuedSubmissions
 } from './journal-pending-submission-recovery'
 import {
   applyJournalRow,
@@ -75,6 +77,7 @@ export class AgentSessionJournal {
   private state: JournalReducerState
   private readOnly = false
   private malformedRows = 0
+  private openedThrough: AgentJournalCursor = { epoch: '', sequence: 0 }
   private database: OpenJournalDatabase | null = null
   private onCommitted: (() => void) | null = null
   private readonly queue: JournalWriteQueue
@@ -147,6 +150,16 @@ export class AgentSessionJournal {
     return this.journalDir
   }
 
+  /** Whether a row at this sequence was on disk when this handle opened, so an earlier handle
+   *  wrote it. Sequences restart with each epoch, so a row of a later epoch never was. */
+  wroteBeforeOpen(sequence: number | undefined): boolean {
+    return (
+      sequence !== undefined &&
+      this.state.epoch === this.openedThrough.epoch &&
+      sequence <= this.openedThrough.sequence
+    )
+  }
+
   /** What the last open's repair did. */
   get repair(): { malformedRows: number } {
     return { malformedRows: this.malformedRows }
@@ -157,6 +170,7 @@ export class AgentSessionJournal {
     this.database = openJournalDatabase(this.dbPath)
     try {
       await this.restore()
+      this.openedThrough = this.cursor()
     } catch (error) {
       // Nothing else holds a reference to this connection, so a throw here is
       // the leak site unless the store releases it itself — and a close that
@@ -220,6 +234,9 @@ export class AgentSessionJournal {
   /** Includes revisions and completion tombstones, whose timestamps disappear from render items. */
   lastActivityAt = (): number => this.state.lastActivityAt
 
+  /** Fence of the writer that created the item, while it is in the timeline. */
+  itemFence = (itemId: string): number | undefined => this.state.itemFences.get(itemId)
+
   submissions = (): AgentJournalSubmission[] => [...this.state.submissions.values()]
 
   pendingSubmissions = (): AgentJournalSubmission[] =>
@@ -306,8 +323,20 @@ export class AgentSessionJournal {
   }
 
   /** Reject unanswered sends after an owner that never proved its start ended: none was written. */
-  async rejectPendingSubmissions(fence: number, reason: string): Promise<string[]> {
-    return rejectJournalPendingSubmissions(this, fence, reason)
+  async rejectPendingSubmissions(
+    fence: number,
+    rejection: AgentJournalDispatchRejection
+  ): Promise<string[]> {
+    return rejectJournalPendingSubmissions(this, fence, rejection)
+  }
+
+  /** Reject sends accepted but never handed over, optionally only those `which` names. */
+  async rejectQueuedSubmissions(
+    fence: number,
+    rejection: AgentJournalDispatchRejection,
+    which?: (submission: AgentJournalSubmission) => boolean
+  ): Promise<string[]> {
+    return rejectJournalQueuedSubmissions(this, fence, rejection, which)
   }
 
   /** The escape hatch for corruption, an unreconcilable prefix, a forked handle,
diff --git a/src/main/native-chat/agent-session-journal/journal-submission-reconciler.ts b/src/main/native-chat/agent-session-journal/journal-submission-reconciler.ts
index 16999de0363e..4647ba1e0e37 100644
--- a/src/main/native-chat/agent-session-journal/journal-submission-reconciler.ts
+++ b/src/main/native-chat/agent-session-journal/journal-submission-reconciler.ts
@@ -18,6 +18,7 @@ import type {
   AgentJournalSubmission
 } from '../../../shared/agent-session-journal-types'
 import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import { DISPATCH_REJECTED_NOT_DELIVERED } from '../../../shared/structured-agent-session-dispatch-rejection'
 
 export type ProviderHistoryItem = {
   /** The provider's own id for this item. Used to claim it at most once; the
@@ -55,7 +56,7 @@ export type SubmissionReconciliation =
   | { clientMessageId: string; outcome: 'rejected'; reason: SubmissionRejectionReason }
   | { clientMessageId: string; outcome: 'unknown'; reason: SubmissionUnknownReason }
 
-export type SubmissionRejectionReason = 'not_delivered'
+export type SubmissionRejectionReason = typeof DISPATCH_REJECTED_NOT_DELIVERED
 
 export type SubmissionUnknownReason =
   | 'history_boundary_inconsistent'
@@ -197,6 +198,6 @@ function resolveOne(
   return {
     clientMessageId: submission.clientMessageId,
     outcome: 'rejected',
-    reason: 'not_delivered'
+    reason: DISPATCH_REJECTED_NOT_DELIVERED
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/agent-session-empty-delta-retention.test.ts b/src/main/native-chat/agent-session-wire/agent-session-empty-delta-retention.test.ts
index 3907fa7a6458..5a859fb2e81f 100644
--- a/src/main/native-chat/agent-session-wire/agent-session-empty-delta-retention.test.ts
+++ b/src/main/native-chat/agent-session-wire/agent-session-empty-delta-retention.test.ts
@@ -24,15 +24,16 @@ describe('empty streamed deltas', () => {
       }
       const originalJoin = Array.prototype.join
       let retainedSlots = -1
-      const spy = vi
-        .spyOn(Array.prototype, 'join')
-        .mockImplementation(function (this: unknown[], separator) {
-          // Byte counters cannot detect empty entries retained by the stream's chunk array.
-          if (separator === '' && this[0] === prefix) {
-            retainedSlots = this.length
-          }
-          return originalJoin.call(this, separator)
-        })
+      const spy = vi.spyOn(Array.prototype, 'join').mockImplementation(function (
+        this: unknown[],
+        separator
+      ) {
+        // Byte counters cannot detect empty entries retained by the stream's chunk array.
+        if (separator === '' && this[0] === prefix) {
+          retainedSlots = this.length
+        }
+        return originalJoin.call(this, separator)
+      })
       let snapshot: ReturnType<typeof streams.snapshot>
       try {
         snapshot = streams.snapshot('thread', 'item')
diff --git a/src/main/native-chat/agent-session-wire/agent-session-journal-batch.ts b/src/main/native-chat/agent-session-wire/agent-session-journal-batch.ts
index 57f2291e4762..b70a18a83861 100644
--- a/src/main/native-chat/agent-session-wire/agent-session-journal-batch.ts
+++ b/src/main/native-chat/agent-session-wire/agent-session-journal-batch.ts
@@ -6,6 +6,7 @@
 // key instead of appearing as a second copy of the user's own message.
 
 import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
+import { compareAgentJournalItems } from '../../../shared/agent-session-journal-position'
 import type {
   AgentJournalRenderItem,
   AgentJournalSnapshot,
@@ -65,7 +66,7 @@ export function projectJournalBatch(input: {
   const items = [...touchedItemIds]
     .map((itemId) => live.get(itemId))
     .filter((item) => item !== undefined)
-    .sort((a, b) => a.sequence - b.sequence)
+    .sort(compareAgentJournalItems)
   return {
     ok: true,
     batch: {
diff --git a/src/main/native-chat/agent-session-wire/agent-session-journal-recovery.test.ts b/src/main/native-chat/agent-session-wire/agent-session-journal-recovery.test.ts
index 214c889b5c9d..1c60029c7d32 100644
--- a/src/main/native-chat/agent-session-wire/agent-session-journal-recovery.test.ts
+++ b/src/main/native-chat/agent-session-wire/agent-session-journal-recovery.test.ts
@@ -6,14 +6,14 @@
 import { mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type {
   AgentJournalItemIdentity,
   AgentSessionJournalIdentity
 } from '../../../shared/agent-session-journal-types'
 import { openJournalDatabase } from '../agent-session-journal/journal-database'
 import { JOURNAL_DB_SCHEMA_VERSION } from '../agent-session-journal/journal-database-schema'
-import { loadJournal } from '../agent-session-journal/journal-open'
+import { loadJournal, replayJournal } from '../agent-session-journal/journal-open'
 import { journalDatabaseFile } from '../agent-session-journal/journal-paths'
 import { readJournalEpochRows } from '../agent-session-journal/journal-row-table'
 import { createTrackedJournalOpener } from '../agent-session-journal/journal-store-test-open'
@@ -24,6 +24,12 @@ import {
   recoveryJournalDir
 } from './agent-session-journal-recovery'
 
+// Only the store's own replay goes through the mock; the probe's, inside the same module, does not.
+vi.mock('../agent-session-journal/journal-open', async (importOriginal) => {
+  const actual = await importOriginal<{ replayJournal: typeof replayJournal }>()
+  return { ...actual, replayJournal: vi.fn(actual.replayJournal) }
+})
+
 const CODEX_SESSION = '019fd532-7c11-7a90-b6de-4e1a2c3d5f60'
 
 const IDENTITY: AgentSessionJournalIdentity = {
@@ -160,6 +166,21 @@ describe('openAgentSessionJournalWithRecovery', () => {
     expect(opened.snapshot().items).toHaveLength(2)
   })
 
+  it('reads the journal once: the probe is the open', async () => {
+    await seedJournal(2)
+    vi.mocked(replayJournal).mockClear()
+    const opened = journals.track(
+      await openAgentSessionJournalWithRecovery({
+        identity: IDENTITY,
+        journalDir,
+        fence: 1,
+        historyFilePath
+      }).then((result) => result.journal)
+    )
+    expect(opened.snapshot().items).toHaveLength(2)
+    expect(replayJournal).not.toHaveBeenCalled()
+  })
+
   it('rebuilds a holed journal in place on a fresh epoch', async () => {
     await seedJournal(3)
     await deleteRow(3)
diff --git a/src/main/native-chat/agent-session-wire/agent-session-journal-recovery.ts b/src/main/native-chat/agent-session-wire/agent-session-journal-recovery.ts
index 6e771a318092..29d324be9718 100644
--- a/src/main/native-chat/agent-session-wire/agent-session-journal-recovery.ts
+++ b/src/main/native-chat/agent-session-wire/agent-session-journal-recovery.ts
@@ -67,7 +67,9 @@ export async function openAgentSessionJournalWithRecovery(input: {
   }
   const journal = await openAgentSessionJournal({
     identity: input.identity,
-    journalDir: input.journalDir
+    journalDir: input.journalDir,
+    // The probe is this open's replay; omitted, not `null`, when there was nothing to load.
+    ...(probe ? { loaded: probe } : {})
   })
   if (!probe?.corrupt) {
     return { journal, recovery: null }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-accept-then-deliver.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-accept-then-deliver.test.ts
new file mode 100644
index 000000000000..fb4ee607e38d
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-accept-then-deliver.test.ts
@@ -0,0 +1,862 @@
+// A send is accepted, then delivered: the host answers once the message is recorded, and the
+// session's delivery loop starts a provider child for it and hands it over. Against the real host,
+// store and journal; each assertion reads what an open chat or the journal's next reader sees.
+
+import type { AgentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
+import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types'
+import type {
+  AgentSessionSubscribeEvent,
+  AgentSessionTurnCompletionEvent
+} from '../../../shared/agent-session-wire'
+import {
+  classifyDispatchRejection,
+  DISPATCH_REJECTED_CANCELLED
+} from '../../../shared/structured-agent-session-dispatch-rejection'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import { journalDirectoryFor } from '../agent-session-journal/journal-paths'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import { openAgentSessionJournal } from '../agent-session-journal/journal-store-factory'
+import {
+  AgentSessionPreSpawnError,
+  type StructuredAgentSessionAdapter
+} from './structured-agent-session-adapter'
+import { journalIdentityFor } from './structured-agent-session-attach'
+import { attachParamsForRecord } from './structured-agent-session-conversation-open'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import type { StructuredAgentSessionChildEndCause } from './structured-agent-session-host-types'
+import { persistRewindRecord } from './structured-rewind-recovery'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
+  hostTestDrawnRowIds,
+  hostTestMessage,
+  hostTestOperationId,
+  resetHostTestOperationIds
+} from './structured-agent-session-host-test-data'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
+
+const CALLER = { callerKey: 'client-1' }
+
+function eventually(assertion: () => void | Promise<void>): Promise<void> {
+  return vi.waitFor(assertion, { timeout: 10_000 })
+}
+
+let root: string
+let store: AgentSessionRecordStore
+let host: StructuredAgentSessionHost
+let acquire: Mock<StructuredAgentSessionAdapter['acquire']>
+let dispatch: Mock<StructuredAgentSessionAdapter['dispatch']>
+let adapterExtras: Partial<StructuredAgentSessionAdapter>
+let idleMs: number
+
+const spawnChild: StructuredAgentSessionAdapter['acquire'] = async ({ fence, spawnToken }) => ({
+  process: { hostId: 'local', pid: 4242, processStartTimeMs: 1_700_000_000_000, spawnToken },
+  acquisitionGeneration: `generation-${acquire.mock.calls.length}`,
+  link: {
+    linkId: `link-${fence}`,
+    handle: { provider: 'codex' as const, threadId: THREAD },
+    origin: store.getRecord(SESSION)?.providerHandleChain.length
+      ? ('resumed' as const)
+      : ('created' as const),
+    mintedAtFence: fence,
+    observedAt: NOW
+  }
+})
+
+async function startHost(): Promise<void> {
+  host = new StructuredAgentSessionHost({
+    store,
+    adapter: {
+      acquire,
+      dispatch,
+      closeSession: vi.fn(async () => true),
+      releaseAcquisition: vi.fn(async () => true),
+      cancelTurn: vi.fn(async () => ({ cancelled: false })),
+      answerPrompt: vi.fn(async () => undefined),
+      setOption: vi.fn(async () => undefined),
+      ...adapterExtras
+    },
+    journalRoot: root,
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => `spawn-${acquire.mock.calls.length}`,
+    idleSweep: { intervalMs: 5, idleMs },
+    now: () => NOW
+  })
+}
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-accept-deliver-'))
+  resetHostTestOperationIds()
+  adapterExtras = {}
+  idleMs = 60 * 60_000
+  acquire = vi.fn(spawnChild)
+  dispatch = vi.fn(async () => ({
+    state: 'accepted' as const,
+    providerIdentity: {
+      provider: 'codex' as const,
+      threadId: THREAD,
+      turnId: `turn-${dispatch.mock.calls.length}`,
+      ordinal: dispatch.mock.calls.length
+    }
+  }))
+  store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
+  await startHost()
+  expect(await host.attach(CALLER, hostTestAttachParams(null))).toMatchObject({ ok: true })
+})
+
+afterEach(async () => {
+  await host.flushAllStreamedEvents()
+  await rm(root, { recursive: true, force: true })
+})
+
+function sendParams(text: string) {
+  const body = hostTestMessage(text)
+  return {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: 1,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.send',
+        sessionId: SESSION,
+        fields: { body }
+      })
+    },
+    body
+  }
+}
+
+/** Accepted at once, whatever the child is doing; answers the message id. */
+async function accept(text: string): Promise<string> {
+  const params = sendParams(text)
+  expect(await host.send(CALLER, params)).toMatchObject({
+    ok: true,
+    value: { submission: { dispatchState: 'pending', handoverRecorded: true } }
+  })
+  return params.envelope.clientOperationId
+}
+
+function stop() {
+  const turnId = 'turn-none'
+  return host.cancel(CALLER, {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: null,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.cancel',
+        sessionId: SESSION,
+        fields: { turnId }
+      })
+    },
+    turnId
+  })
+}
+
+async function submission(id: string): Promise<AgentJournalSubmission | undefined> {
+  return (await host.journalSnapshot(SESSION)).submissions.find(
+    (entry) => entry.clientMessageId === id
+  )
+}
+
+/** Read back after the conversation was closed, through the same open any reader takes. */
+async function reopened(id: string): Promise<AgentJournalSubmission | undefined> {
+  await host.revealSession(SESSION)
+  return submission(id)
+}
+
+async function errorRows(): Promise<string[]> {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.body.kind === 'status' && item.body.tone === 'error' ? [item.body.text] : []
+  )
+}
+
+async function errorFailures(): Promise<(AgentSessionFailureFact | undefined)[]> {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.body.kind === 'status' && item.body.tone === 'error' ? [item.body.failure] : []
+  )
+}
+
+let subscriptions = 0
+
+async function subscribe(): Promise<AgentSessionSubscribeEvent[]> {
+  const events: AgentSessionSubscribeEvent[] = []
+  subscriptions += 1
+  // Cloned as received: a frame shares the journal's live objects, which later rows revise.
+  await host.subscribe({
+    id: `sub-${subscriptions}`,
+    sessionId: SESSION,
+    emit: (event) => events.push(structuredClone(event))
+  })
+  return events
+}
+
+/** What an open chat was told about one message, in frame order. */
+function framedStates(events: AgentSessionSubscribeEvent[], id: string): string[] {
+  return events.flatMap((event) =>
+    event.type === 'batch'
+      ? event.batch.submissions
+          .filter((entry) => entry.clientMessageId === id)
+          .map((entry) =>
+            entry.dispatchState === 'pending' && entry.handedOverAt !== undefined
+              ? 'handed-over'
+              : entry.dispatchState
+          )
+      : []
+  )
+}
+
+function deferred<T>() {
+  let resolve!: (value: T) => void
+  let reject!: (error: unknown) => void
+  const promise = new Promise<T>((next, fail) => {
+    resolve = next
+    reject = fail
+  })
+  return { promise, resolve, reject }
+}
+
+/** Rows written by an earlier host process that ended before handing them over. */
+async function writeAsEarlierProcess(
+  write: (journal: AgentSessionJournal, fence: number) => Promise<void>
+): Promise<void> {
+  await host.close(SESSION)
+  const record = store.getRecord(SESSION)!
+  const params = attachParamsForRecord(record, {
+    clientOperationId: 'earlier',
+    expectedRuntimeFence: record.lease.runtimeFence
+  })
+  const journal = await openAgentSessionJournal({
+    identity: journalIdentityFor(record, params),
+    journalDir: journalDirectoryFor(root, {
+      workspaceId: record.location.workspaceId,
+      sessionId: SESSION
+    })
+  })
+  await write(journal, record.lease.runtimeFence)
+  await journal.close()
+}
+
+function earlierSubmission(id: string, text: string, handoverRecorded?: true) {
+  const body = hostTestMessage(text)
+  return {
+    clientMessageId: id,
+    payloadFingerprint: computeAgentSessionPayloadFingerprint({
+      method: 'agentSession.send',
+      sessionId: SESSION,
+      fields: { body }
+    }),
+    body,
+    ...(handoverRecorded ? { handoverRecorded } : {})
+  }
+}
+
+describe('a send is answered at acceptance', () => {
+  it('answers before the child starts, then an open chat sees the handover and the reply (W2)', async () => {
+    await host.close(SESSION)
+    const starting = deferred<void>()
+    acquire.mockImplementationOnce(async (input) => {
+      await starting.promise
+      return spawnChild(input)
+    })
+
+    const answering = deferred<void>()
+    const answer = dispatch.getMockImplementation()!
+    dispatch.mockImplementationOnce(async (input) => {
+      await answering.promise
+      return answer(input)
+    })
+
+    const id = await accept('hello')
+    const events = await subscribe()
+    await eventually(async () => expect(acquire).toHaveBeenCalledTimes(2))
+    expect(dispatch).not.toHaveBeenCalled()
+
+    starting.resolve()
+    await eventually(async () => expect(framedStates(events, id)).toEqual(['handed-over']))
+    answering.resolve()
+    await eventually(async () =>
+      expect(framedStates(events, id)).toEqual(['handed-over', 'accepted'])
+    )
+  })
+
+  it('accepts a second send while the first one starts the child, before handing either over (W6)', async () => {
+    await host.close(SESSION)
+    const starting = deferred<void>()
+    acquire.mockImplementationOnce(async (input) => {
+      await starting.promise
+      return spawnChild(input)
+    })
+    const first = await accept('first')
+    await eventually(async () => expect(acquire).toHaveBeenCalledTimes(2))
+    const second = host.send(CALLER, sendParams('second'))
+
+    starting.resolve()
+    const secondResult = await second
+    if (!secondResult.ok) {
+      throw new Error('the second send was refused')
+    }
+    const secondId = secondResult.value.clientMessageId
+    await eventually(async () =>
+      expect((await submission(secondId))?.dispatchState).toBe('accepted')
+    )
+    expect(dispatch.mock.calls.map(([input]) => input.clientMessageId)).toEqual([first, secondId])
+    // The second was accepted while the start held the queue — before the first was handed over.
+    expect((await submission(secondId))!.submittedAt).toBeLessThanOrEqual(
+      (await submission(first))!.handedOverAt!
+    )
+    const rows = (await host.journalSnapshot(SESSION)).submissions
+    expect(rows.map((row) => row.clientMessageId)).toEqual([first, secondId])
+  })
+})
+
+describe('a start the chat needed and did not get', () => {
+  it('writes one error row and rejects every queued message with it; the next send starts (W3)', async () => {
+    await host.close(SESSION)
+    acquire.mockRejectedValueOnce(new Error('spawn codex ENOENT'))
+    const first = await accept('first')
+    const second = await accept('second')
+
+    await eventually(async () => expect((await submission(second))?.dispatchState).toBe('rejected'))
+    const rows = await errorRows()
+    expect(rows).toHaveLength(1)
+    // Orca's spawn error goes to the log; the row and every message say what failed, typed. The
+    // child is gone, but no exit was observed, so nothing blames the provider.
+    expect(rows[0]).toBe("Codex couldn't restart. Send your message to try again.")
+    const failure = {
+      kind: 'restartFailed',
+      refusal: { code: 'agent_session_operation_invalid', details: { ownerVerdict: 'exited' } }
+    }
+    expect(await errorFailures()).toEqual([failure])
+    for (const id of [first, second]) {
+      expect(await submission(id)).toMatchObject({
+        dispatchState: 'rejected',
+        reason: rows[0],
+        rejection: failure
+      })
+    }
+
+    const next = await accept('after the fix')
+    await eventually(async () => expect((await submission(next))?.dispatchState).toBe('accepted'))
+    expect(await errorRows()).toHaveLength(1)
+  })
+
+  it('draws the messages it failed above the error row, since they were accepted first', async () => {
+    await host.close(SESSION)
+    acquire.mockRejectedValueOnce(new Error('spawn codex ENOENT'))
+    const first = await accept('first')
+    const second = await accept('second')
+    await eventually(async () => expect((await submission(second))?.dispatchState).toBe('rejected'))
+
+    const snapshot = await host.journalSnapshot(SESSION)
+    const errorRow = snapshot.items.find(
+      (item) => item.body.kind === 'status' && item.body.tone === 'error'
+    )?.itemId
+    const shown = [agentJournalSubmissionKey(first), agentJournalSubmissionKey(second), errorRow]
+    const drawn = hostTestDrawnRowIds(snapshot, [
+      { clientMessageId: first, text: 'first' },
+      { clientMessageId: second, text: 'second' }
+    ])
+    expect(drawn.filter((id) => shown.includes(id))).toEqual(shown)
+  })
+
+  it('notifies failed once for the queued messages one start failure refused', async () => {
+    await host.close(SESSION)
+    acquire.mockRejectedValueOnce(new Error('spawn codex ENOENT'))
+    const completions: AgentSessionTurnCompletionEvent[] = []
+    host.subscribeTurnCompletions({ id: 'dot-1', emit: (event) => completions.push(event) })
+    await accept('first')
+    const second = await accept('second')
+
+    await eventually(async () => expect((await submission(second))?.dispatchState).toBe('rejected'))
+    await host.flushAllStreamedEvents()
+    expect(completions).toEqual([
+      {
+        type: 'completion',
+        completion: expect.objectContaining({
+          sessionId: SESSION,
+          turnId: agentJournalSubmissionKey(second),
+          outcome: 'failure'
+        })
+      }
+    ])
+  })
+
+  it.each([
+    [
+      'eligibility',
+      () => {
+        adapterExtras = { supportsLocation: () => false }
+      },
+      {
+        text: "Codex couldn't restart. Start a new chat to continue.",
+        failure: {
+          kind: 'restartFailed',
+          refusal: {
+            code: 'structured_agent_session_unsupported',
+            details: { reason: 'hostUnsupported' }
+          }
+        }
+      }
+    ],
+    [
+      'spawn',
+      () => acquire.mockRejectedValueOnce(new Error('spawn codex ENOENT')),
+      {
+        text: "Codex couldn't restart. Send your message to try again.",
+        failure: {
+          kind: 'restartFailed',
+          refusal: { code: 'agent_session_operation_invalid', details: { ownerVerdict: 'exited' } }
+        }
+      }
+    ],
+    [
+      'auth',
+      () =>
+        acquire.mockRejectedValueOnce(
+          new AgentSessionPreSpawnError(new Error('Not logged in. Please run /login.'))
+        ),
+      {
+        // No process ever started, so nothing says the provider stopped.
+        text: "Codex couldn't restart. Send your message to try again.",
+        failure: {
+          kind: 'restartFailed',
+          refusal: { code: 'agent_session_operation_invalid', details: { ownerVerdict: 'exited' } }
+        }
+      }
+    ]
+  ])('writes one row a live chat sees for a %s refusal (W14)', async (_source, arrange, row) => {
+    await host.close(SESSION)
+    arrange()
+    await host.flushAllStreamedEvents()
+    await startHost()
+    const id = await accept('hello')
+    const events = await subscribe()
+
+    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('rejected'))
+    expect(await errorRows()).toEqual([row.text])
+    expect(await errorFailures()).toEqual([row.failure])
+    const framedRows = events.flatMap((event) =>
+      event.type === 'batch' || event.type === 'snapshot'
+        ? (event.type === 'batch' ? event.batch.items : event.page.items).filter(
+            (item) => item.body.kind === 'status' && item.body.tone === 'error'
+          )
+        : []
+    )
+    expect(framedRows.length).toBeGreaterThan(0)
+  })
+
+  it('names the start failure on queued messages when the attach fails after acquiring (W4′a)', async () => {
+    await host.close(SESSION)
+    const id = await accept('hello')
+    // The attach's own success record is the post-acquisition step that fails.
+    const record = vi.spyOn(store, 'recordOperationOutcome')
+    record.mockImplementation(async (input) => {
+      if (input.operationId !== id && input.outcome.status === 'succeeded') {
+        record.mockRestore()
+        throw new Error('record store write failed')
+      }
+      return AgentSessionRecordStore.prototype.recordOperationOutcome.call(store, input)
+    })
+
+    // Read through the open any reader takes, so a conversation the failure dropped is reopened
+    // and its message read as that reopen settles it.
+    let settled: AgentJournalSubmission | undefined
+    await eventually(async () => {
+      settled = await reopened(id)
+      expect(settled?.dispatchState).not.toBe('pending')
+    })
+    // The message names the start that failed, not a close or a restart it never met — and never
+    // the store's own error, which is Orca's and goes to the log.
+    expect(settled).toMatchObject({
+      dispatchState: 'rejected',
+      rejection: (await errorFailures())[0]
+    })
+    expect(settled?.reason).not.toContain('record store write failed')
+    expect(await errorRows()).toEqual([settled?.reason])
+  })
+})
+
+describe('an attach that fails after indexing its child', () => {
+  it('leaves no child behind, so the next send starts one and is delivered', async () => {
+    await host.close(SESSION)
+    const owned: boolean[] = []
+    host.subscribeStatus({
+      id: 'list-1',
+      emit: (event) => {
+        if (event.type === 'status') {
+          owned.push(event.session.hostExecutionOwned === true)
+        }
+      }
+    })
+    const first = await accept('hello')
+    // The attach's own success record is the step after `onAttached` indexed the child.
+    const record = vi.spyOn(store, 'recordOperationOutcome')
+    record.mockImplementation(async (input) => {
+      if (input.operationId !== first && input.outcome.status === 'succeeded') {
+        record.mockRestore()
+        throw new Error('record store write failed')
+      }
+      return AgentSessionRecordStore.prototype.recordOperationOutcome.call(store, input)
+    })
+    await eventually(async () => expect((await submission(first))?.dispatchState).toBe('rejected'))
+    // Nothing was indexed, so nothing had to be taken back: no list ever showed a child.
+    expect(host['sessions'].get(SESSION)?.child).toBeNull()
+    expect(owned).not.toContain(true)
+    const acquiresBefore = acquire.mock.calls.length
+
+    const next = await accept('after the failure')
+
+    await eventually(async () => expect((await submission(next))?.dispatchState).toBe('accepted'))
+    expect(acquire).toHaveBeenCalledTimes(acquiresBefore + 1)
+    expect(dispatch.mock.calls.map(([input]) => input.clientMessageId)).toEqual([next])
+  })
+})
+
+describe('what an earlier host process left behind', () => {
+  it('rejects a message it accepted and never handed over, as not sent (W4′b)', async () => {
+    await writeAsEarlierProcess(async (journal, fence) => {
+      await journal.appendSubmission({ ...earlierSubmission('queued', 'q', true), fence })
+    })
+
+    await host.revealSession(SESSION)
+
+    expect(await submission('queued')).toMatchObject({
+      dispatchState: 'rejected',
+      ...agentSessionFailureWords(agentSessionFailureFact('hostRestarted'), {
+        surface: 'rejection'
+      })
+    })
+    expect(dispatch).not.toHaveBeenCalled()
+  })
+
+  it('leaves a legacy pending message and a handed-over one in doubt, never re-sent (W4′c)', async () => {
+    const providerHistoryWindow = vi.fn(async () => null)
+    adapterExtras = { providerHistoryWindow }
+    await writeAsEarlierProcess(async (journal, fence) => {
+      await journal.appendSubmission({ ...earlierSubmission('legacy', 'l'), fence })
+      await journal.appendSubmission({ ...earlierSubmission('handed', 'h', true), fence })
+      await journal.resolveDispatch({ clientMessageId: 'handed', state: 'pending', fence })
+    })
+    await host.flushAllStreamedEvents()
+    await startHost()
+
+    await host.revealSession(SESSION)
+
+    expect(await submission('legacy')).toMatchObject({ dispatchState: 'unknown', recovered: true })
+    expect(await submission('handed')).toMatchObject({ dispatchState: 'unknown', recovered: true })
+    // Deciding them from provider history waits for a won lease (W4′d).
+    expect(providerHistoryWindow).not.toHaveBeenCalled()
+    expect(dispatch).not.toHaveBeenCalled()
+  })
+})
+
+describe('a child that exits before its message is handed over', () => {
+  it('rejects the message with the exit reason instead of starting another child (W24)', async () => {
+    // Each child the loop starts dies between its start step and its handover step.
+    const awaitStarted = vi.fn(async (sessionId: string) => {
+      await host.handleAdapterEvent({
+        type: 'ended',
+        sessionId,
+        fence: store.getRecord(sessionId)!.lease.runtimeFence,
+        acquisitionGeneration: `generation-${acquire.mock.calls.length}`,
+        reason: 'codex app-server crashed',
+        cause: 'unexpected-exit'
+      })
+    })
+    adapterExtras = { awaitStarted }
+    await host.close(SESSION)
+    await startHost()
+
+    const id = await accept('hello')
+
+    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('rejected'))
+    expect(await submission(id)).toMatchObject({
+      reason: 'Codex stopped before this message was sent.',
+      rejection: { kind: 'providerExited' }
+    })
+    expect(acquire).toHaveBeenCalledTimes(2)
+    expect(dispatch).not.toHaveBeenCalled()
+  })
+})
+
+describe('a start whose failure the delivery loop settles before the exit is published', () => {
+  it('keeps one row in the words its rejected messages carry', async () => {
+    // The adapter's startup answer and its later exit event word the same start differently.
+    const awaitStarted = vi.fn(async () => agentSessionFailureFact('startFailed'))
+    adapterExtras = { awaitStarted }
+    acquire.mockImplementation(async (input) => ({
+      ...(await spawnChild(input)),
+      providerChildPhase: 'starting' as const
+    }))
+    await host.close(SESSION)
+    await startHost()
+
+    const first = await accept('first')
+    const second = await accept('second')
+    await eventually(async () => expect((await submission(second))?.dispatchState).toBe('rejected'))
+    await host.handleAdapterEvent({
+      type: 'ended',
+      sessionId: SESSION,
+      fence: store.getRecord(SESSION)!.lease.runtimeFence,
+      acquisitionGeneration: `generation-${acquire.mock.calls.length}`,
+      reason: 'codex app-server exited with code 1',
+      failure: agentSessionFailureFact('providerStartFailed', {
+        detail: { text: 'codex: config.toml is invalid', audience: 'person' }
+      }),
+      cause: 'unexpected-exit',
+      startupUnproven: true
+    })
+    await host.flushStreamedEvents(SESSION)
+
+    const rows = (await host.journalSnapshot(SESSION)).items.filter((item) =>
+      item.itemId.includes('start-failure')
+    )
+    expect(rows).toHaveLength(1)
+    const words = agentSessionFailureWords(agentSessionFailureFact('startFailed'), {
+      surface: 'rejection',
+      agentName: 'Codex',
+      provider: 'codex'
+    })
+    expect(rows[0].body).toMatchObject({ text: words.reason, failure: words.rejection })
+    for (const id of [first, second]) {
+      expect(await submission(id)).toMatchObject({
+        dispatchState: 'rejected',
+        reason: words.reason,
+        rejection: words.rejection
+      })
+    }
+  })
+})
+
+describe('Stop withdraws what is queued', () => {
+  it('withdraws a crash leftover ahead of any delivery step (W17a)', async () => {
+    await writeAsEarlierProcess(async (journal, fence) => {
+      await journal.appendSubmission({ ...earlierSubmission('leftover', 'l', true), fence })
+    })
+
+    // Stop's own open wakes the delivery loop, whose first step queues behind this Stop.
+    expect(await stop()).toMatchObject({ ok: true })
+
+    expect(await submission('leftover')).toMatchObject({
+      dispatchState: 'rejected',
+      reason: DISPATCH_REJECTED_CANCELLED
+    })
+    expect(acquire).toHaveBeenCalledTimes(1)
+  })
+
+  it('withdraws a message whose start holds the queue: nothing is handed over (W17b)', async () => {
+    await host.close(SESSION)
+    const starting = deferred<void>()
+    acquire.mockImplementationOnce(async (input) => {
+      await starting.promise
+      return spawnChild(input)
+    })
+    const id = await accept('hello')
+    await eventually(async () => expect(acquire).toHaveBeenCalledTimes(2))
+    const stopped = stop()
+
+    starting.resolve()
+    expect(await stopped).toMatchObject({ ok: true })
+    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('rejected'))
+    expect(await submission(id)).toMatchObject({ reason: DISPATCH_REJECTED_CANCELLED })
+    expect((await submission(id))?.handedOverAt).toBeUndefined()
+    expect(dispatch).not.toHaveBeenCalled()
+  })
+
+  it('stops a child still proving its start, and the delivery loop ends with it (W17c)', async () => {
+    const ended = deferred<void>()
+    const awaitStarted = vi.fn(() => ended.promise)
+    const closeSession = vi.fn(async () => {
+      ended.resolve()
+      return true
+    })
+    adapterExtras = { awaitStarted, closeSession }
+    await host.close(SESSION)
+    await startHost()
+    acquire.mockImplementationOnce(async (input) => ({
+      ...(await spawnChild(input)),
+      providerChildPhase: 'starting' as const
+    }))
+    const id = await accept('hello')
+    await eventually(async () => expect(awaitStarted).toHaveBeenCalled())
+
+    expect(await stop()).toMatchObject({ ok: true, value: { cancelled: true } })
+
+    expect(await reopened(id)).toMatchObject({
+      dispatchState: 'rejected',
+      reason: DISPATCH_REJECTED_CANCELLED
+    })
+    expect(closeSession).toHaveBeenCalled()
+    // A loop still waiting on that start would swallow this send; it starts a new child instead.
+    awaitStarted.mockImplementation(async () => undefined)
+    const next = await accept('after stop')
+    await eventually(async () => expect((await submission(next))?.dispatchState).toBe('accepted'))
+    expect(dispatch).toHaveBeenCalledTimes(1)
+  })
+})
+
+describe('an eviction between acceptance and handover', () => {
+  it('rejects the message as not sent, never leaves it in doubt (W24)', async () => {
+    const started = deferred<void>()
+    adapterExtras = { awaitStarted: () => started.promise }
+    await host.close(SESSION)
+    await startHost()
+    const id = await accept('hello')
+    await eventually(async () => expect(acquire).toHaveBeenCalledTimes(2))
+    // Between the delivery loop's start step and its handover step.
+    await host.close(SESSION)
+    started.resolve()
+
+    expect(await reopened(id)).toMatchObject({
+      dispatchState: 'rejected',
+      ...agentSessionFailureWords(agentSessionFailureFact('chatClosed'), { surface: 'rejection' })
+    })
+    expect(dispatch).not.toHaveBeenCalled()
+  })
+
+  it('rejects a queued message behind a handed-over one, which alone stays in doubt (W24)', async () => {
+    const second = deferred<void>()
+    const awaitStarted = vi.fn(async (): Promise<void> => undefined)
+    adapterExtras = { awaitStarted }
+    await host.close(SESSION)
+    await startHost()
+    dispatch.mockResolvedValueOnce({ state: 'admitted' })
+    const handed = await accept('handed over')
+    await eventually(async () => expect((await submission(handed))?.handedOverAt).toBeDefined())
+    awaitStarted.mockImplementation(() => second.promise)
+    const queued = await accept('still queued')
+    await eventually(async () => expect(awaitStarted).toHaveBeenCalledTimes(2))
+
+    await host.close(SESSION)
+    second.resolve()
+
+    expect(await reopened(queued)).toMatchObject({
+      dispatchState: 'rejected',
+      ...agentSessionFailureWords(agentSessionFailureFact('chatClosed'), { surface: 'rejection' })
+    })
+    expect(await submission(handed)).toMatchObject({ dispatchState: 'unknown' })
+    expect(dispatch).toHaveBeenCalledTimes(1)
+  })
+
+  it('does not stop an idle child while a message is still queued for it (W24)', async () => {
+    idleMs = 0
+    const started = deferred<void>()
+    adapterExtras = { awaitStarted: () => started.promise }
+    await host.close(SESSION)
+    await startHost()
+    const id = await accept('hello')
+    await eventually(async () => expect(acquire).toHaveBeenCalledTimes(2))
+    // The idle sweep ticks every few milliseconds meanwhile.
+    await new Promise((resolve) => setTimeout(resolve, 20))
+
+    started.resolve()
+    // Handed to the child it was queued for; the eviction may follow once nothing is owed.
+    await eventually(async () => expect(dispatch).toHaveBeenCalledTimes(1))
+    expect(dispatch.mock.calls[0]?.[0].clientMessageId).toBe(id)
+    expect(acquire).toHaveBeenCalledTimes(2)
+  })
+})
+
+// A close abandons what is queued before it stops the child, so a release that then fails still
+// leaves every queued message rejected as closed, never blamed on the provider.
+describe('a close that stops the child and then fails', () => {
+  const END_CHILD = {
+    evict: () => host.close(SESSION)
+  } satisfies Partial<Record<StructuredAgentSessionChildEndCause, () => Promise<void>>>
+
+  it.each([
+    { end: 'evict', starting: true, kind: 'chatClosed', verdict: null },
+    { end: 'evict', starting: false, kind: 'chatClosed', verdict: null }
+  ] as const)(
+    'rejects what is queued as $kind after a $end (during startup: $starting)',
+    async ({ end, starting, kind, verdict }) => {
+      const started = deferred<void>()
+      adapterExtras = {
+        awaitStarted: () => started.promise,
+        // Once: the host's own teardown acknowledges again.
+        acknowledgeSessionRelease: vi.fn().mockImplementationOnce(() => {
+          throw new Error('release acknowledgement failed')
+        })
+      }
+      await host.close(SESSION)
+      await startHost()
+      acquire.mockImplementationOnce(async (input) => ({
+        ...(await spawnChild(input)),
+        ...(starting ? { providerChildPhase: 'starting' as const } : {})
+      }))
+      const id = await accept('hello')
+      await eventually(() => expect(acquire).toHaveBeenCalledTimes(2))
+
+      await expect(END_CHILD[end]()).rejects.toThrow()
+      expect(host.hasSession(SESSION)).toBe(true)
+      started.resolve()
+
+      await eventually(async () => expect((await submission(id))?.dispatchState).toBe('rejected'))
+      const rejected = (await submission(id))!
+      expect(rejected.rejection).toMatchObject({ kind })
+      expect(classifyDispatchRejection(rejected).verdict).toBe(verdict)
+      expect(dispatch).not.toHaveBeenCalled()
+    }
+  )
+})
+
+describe('a compaction or rewind an earlier child left prepared', () => {
+  async function leftPrepared(prepare: (fence: number) => Promise<unknown>): Promise<void> {
+    await host.close(SESSION)
+    await prepare(store.getRecord(SESSION)!.lease.runtimeFence)
+    // A new process: nothing is open and no view attaches.
+    await host.flushAllStreamedEvents()
+    await startHost()
+  }
+
+  it('settles an interrupted compaction at open, so a send is accepted and delivered (R16)', async () => {
+    await leftPrepared((fence) =>
+      store.setConversationCommand(SESSION, fence, {
+        command: 'compact',
+        runtimeFence: fence,
+        operationId: 'compact-op',
+        callerKey: 'client-1',
+        phase: 'prepared',
+        state: 'unknown'
+      })
+    )
+
+    const id = await accept('after the compaction')
+
+    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('accepted'))
+    expect(store.getRecord(SESSION)?.conversationCommand).toMatchObject({
+      phase: 'committed',
+      state: 'unknown'
+    })
+  })
+
+  it('completes a rewind the provider already applied at open, so a send is accepted (R16)', async () => {
+    await leftPrepared((fence) =>
+      persistRewindRecord(store, SESSION, fence, {
+        operationId: 'rewind-op',
+        callerKey: 'client-1',
+        itemId: 'orca:rewound',
+        providerItemId: `codex:${THREAD}:turn-1:0`,
+        expectedEpoch: 'epoch-before',
+        phase: 'provider-succeeded',
+        hydrationVerified: true,
+        retained: []
+      })
+    )
+
+    const id = await accept('after the rewind')
+
+    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('accepted'))
+    expect(store.getRecord(SESSION)?.rewind).toMatchObject({ phase: 'completed' })
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition-options.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition-options.test.ts
index e3da044d43c9..7c12909e0363 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition-options.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition-options.test.ts
@@ -15,6 +15,7 @@ import {
   attachFingerprintFields,
   type AgentSessionAttachParams
 } from './structured-agent-session-attach'
+import { openTestAttachConversation } from './structured-agent-session-attach-test-conversation'
 import { performAttach } from './structured-agent-session-attach-flow'
 import type { AgentSessionCreatePhaseRecorder } from '../../observability/agent-session-instrumentation'
 
@@ -154,6 +155,7 @@ describe('structured session acquisition options', () => {
       store: initialStore,
       adapter: withHistory('created'),
       journalRoot: root,
+      openConversation: openTestAttachConversation(root!),
       authority: {
         spawnToken: 'spawn-a',
         claimKeyId: 'key-1',
@@ -194,6 +196,7 @@ describe('structured session acquisition options', () => {
       store,
       adapter: withHistory('resumed'),
       journalRoot: root,
+      openConversation: openTestAttachConversation(root!),
       authority: {
         spawnToken: 'spawn-b',
         claimKeyId: 'key-1',
@@ -228,6 +231,7 @@ describe('structured session acquisition options', () => {
       store,
       adapter: sessionAdapter,
       journalRoot: root,
+      openConversation: openTestAttachConversation(root!),
       authority: {
         spawnToken: 'spawn-a',
         claimKeyId: 'key-1',
@@ -260,6 +264,7 @@ describe('structured session acquisition options', () => {
         store,
         adapter: sessionAdapter,
         journalRoot: root!,
+        openConversation: openTestAttachConversation(root!),
         authority: {
           spawnToken,
           claimKeyId: 'key-1',
@@ -291,6 +296,7 @@ describe('structured session acquisition options', () => {
       store,
       adapter: adapter({ origin: 'created' }),
       journalRoot: root,
+      openConversation: openTestAttachConversation(root!),
       authority: {
         spawnToken: 'spawn-a',
         claimKeyId: 'key-1',
@@ -330,6 +336,7 @@ describe('structured session acquisition options', () => {
         }
       }),
       journalRoot: root,
+      openConversation: openTestAttachConversation(root!),
       authority: {
         spawnToken: 'spawn-b',
         claimKeyId: 'key-1',
@@ -369,6 +376,7 @@ describe('structured session acquisition options', () => {
       store,
       adapter: sessionAdapter,
       journalRoot: root,
+      openConversation: openTestAttachConversation(root!),
       authority: {
         spawnToken: 'spawn-a',
         claimKeyId: 'key-1',
@@ -408,6 +416,7 @@ describe('structured session acquisition options', () => {
         store,
         adapter: failingAdapter,
         journalRoot: root,
+        openConversation: openTestAttachConversation(root!),
         authority: {
           spawnToken: 'spawn-a',
           claimKeyId: 'key-1',
@@ -421,7 +430,10 @@ describe('structured session acquisition options', () => {
       })
     ).resolves.toEqual({
       ok: false,
-      refusal: { code: 'agent_session_operation_invalid', message: 'model list unavailable' }
+      refusal: {
+        code: 'agent_session_operation_invalid',
+        message: "Codex couldn't restart. Send your message to try again."
+      }
     })
     expect(releaseAcquisition).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease.ownerProcess).toBeNull()
@@ -499,6 +511,7 @@ describe('structured session acquisition options', () => {
           store: target,
           adapter: failingAdapter,
           journalRoot: root!,
+          openConversation: openTestAttachConversation(root!, failingAdapter),
           authority: {
             spawnToken: operationId === CREATE_OPERATION ? 'spawn-a' : 'spawn-b',
             claimKeyId: 'key-1',
@@ -511,12 +524,16 @@ describe('structured session acquisition options', () => {
           onAttached: () => {}
         })
 
-      // A proven exit before the journal opens is answered once, as the refusal its replay gives.
+      // A proven exit before the journal opens is answered once, as the refusal its replay gives;
+      // no exit was observed, so it names no situation.
       const failed = perform(store, CREATE_OPERATION, null)
       await (exitProven && failurePoint !== 'journal'
         ? expect(failed).resolves.toEqual({
             ok: false,
-            refusal: { code: 'agent_session_operation_invalid', message: injected.message }
+            refusal: {
+              code: 'agent_session_operation_invalid',
+              message: "Codex couldn't restart. Send your message to try again."
+            }
           })
         : expect(failed).rejects.toThrow(
             exitProven ? injected.message : 'agent_session_acquisition_exit_unproven'
@@ -596,6 +613,7 @@ describe('the tab a create reserves', () => {
       store,
       adapter: adapter({ origin: 'created' }),
       journalRoot: root!,
+      openConversation: openTestAttachConversation(root!),
       authority: {
         spawnToken: 'spawn-a',
         claimKeyId: 'key-1',
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-router.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-router.ts
index 7fa1446d6c53..bb003f93427d 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-router.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-router.ts
@@ -1,3 +1,4 @@
+import type { SubmissionRejectionFact } from '../../../shared/agent-session-failure'
 import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types'
 import type {
   AgentSessionAccountHome,
@@ -61,8 +62,8 @@ export class StructuredAgentSessionAdapterRouter implements StructuredAgentSessi
   dispatch: StructuredAgentSessionAdapter['dispatch'] = (input) =>
     this.owner(input.sessionId).dispatch(input)
 
-  rewindSupport: NonNullable<StructuredAgentSessionAdapter['rewindSupport']> = (sessionId) =>
-    this.liveOwnerOrNull(sessionId)?.rewindSupport?.(sessionId) ?? {
+  rewindSupport: NonNullable<StructuredAgentSessionAdapter['rewindSupport']> = (sessionId, agent) =>
+    this.capabilityOwner(sessionId, agent)?.rewindSupport?.(sessionId) ?? {
       supported: false,
       reason: 'unsupported'
     }
@@ -94,11 +95,11 @@ export class StructuredAgentSessionAdapterRouter implements StructuredAgentSessi
     return change(input)
   }
 
-  supportsThreadGoal = (sessionId: string): boolean =>
-    this.liveOwnerOrNull(sessionId)?.supportsThreadGoal?.(sessionId) ?? false
+  supportsThreadGoal = (sessionId: string, agent?: string): boolean =>
+    this.capabilityOwner(sessionId, agent)?.supportsThreadGoal?.(sessionId) ?? false
 
-  recordsContextUsage = (sessionId: string): boolean =>
-    this.liveOwnerOrNull(sessionId)?.recordsContextUsage?.(sessionId) ?? false
+  recordsContextUsage = (sessionId: string, agent?: string): boolean =>
+    this.capabilityOwner(sessionId, agent)?.recordsContextUsage?.(sessionId) ?? false
 
   stopBackgroundTasks: NonNullable<StructuredAgentSessionAdapter['stopBackgroundTasks']> = (
     input
@@ -122,6 +123,8 @@ export class StructuredAgentSessionAdapterRouter implements StructuredAgentSessi
 
   awaitOptionWritable = (sessionId: string): Promise<void> =>
     this.liveOwnerOrNull(sessionId)?.awaitOptionWritable?.(sessionId) ?? Promise.resolve()
+  awaitStarted = (sessionId: string): Promise<void | SubmissionRejectionFact> =>
+    this.liveOwnerOrNull(sessionId)?.awaitStarted?.(sessionId) ?? Promise.resolve()
 
   readOptions = (input: { sessionId: string; fence: number }) => {
     const reader = this.owner(input.sessionId).readOptions
@@ -214,6 +217,11 @@ export class StructuredAgentSessionAdapterRouter implements StructuredAgentSessi
     return adapter
   }
 
+  /** The live owner, or for a session at rest the provider it would start under. */
+  private capabilityOwner(sessionId: string, agent?: string): StructuredAgentSessionAdapter | null {
+    return this.liveOwnerOrNull(sessionId) ?? (agent ? this.adapterForAgent(agent) : null)
+  }
+
   private liveOwnerOrNull(sessionId: string): StructuredAgentSessionAdapter | null {
     const route = this.routes.get(sessionId)
     return route?.state === 'live' ? route.adapter : null
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter.ts
index 9174afc7fd2d..e4ef8eb85f88 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter.ts
@@ -27,23 +27,40 @@ import type {
   AgentSessionBackgroundTaskState,
   AgentSessionOptionsResult,
   AgentSessionSlashCommand,
-  AgentSessionThreadGoalChange,
-  AgentSessionWireRefusalCode
+  AgentSessionThreadGoalChange
 } from '../../../shared/agent-session-wire'
-import { isAgentSessionWireRefusalCode } from '../../../shared/agent-session-wire-refusals'
+import {
+  isAgentSessionWireRefusalCode,
+  type AgentSessionRefusalReason
+} from '../../../shared/agent-session-wire-refusals'
+import type {
+  ProviderDiagnostic,
+  SubmissionRejectionFact
+} from '../../../shared/agent-session-failure'
+import type { AgentJournalDispatchRejection } from '../../../shared/agent-session-failure-words'
 import type { AgentSessionPromptResponse } from '../../../shared/agent-session-question-answer'
 import type { ProviderHistoryWindow } from '../agent-session-journal/journal-submission-reconciler'
 import type { StructuredAgentSessionEventSink } from './structured-agent-session-event-sink'
+import type { StructuredSessionCompactionResult } from './structured-session-compaction'
 import type { AgentSessionCreatePhaseRecorder } from '../../observability/agent-session-instrumentation'
 
 export class AgentSessionAcquisitionRefusal extends Error {
+  readonly code = 'agent_session_operation_invalid'
+
   constructor(
     message: string,
-    readonly code: AgentSessionWireRefusalCode = 'agent_session_operation_invalid'
+    /** The situation, so the chat can say what to do; the message is Orca's log wording. Absent,
+     *  the provider refused its own start. */
+    readonly reason: AgentSessionRefusalReason<'agent_session_operation_invalid'> = 'providerStartFailed'
   ) {
     super(message)
     this.name = 'AgentSessionAcquisitionRefusal'
   }
+
+  /** The conversation's history is more than this host can restore. */
+  static historyTooLarge(message: string): AgentSessionAcquisitionRefusal {
+    return new AgentSessionAcquisitionRefusal(message, 'historyTooLarge')
+  }
 }
 
 export class AgentSessionPromptUnavailableError extends Error {
@@ -103,11 +120,24 @@ export type AgentSessionAcquisition = {
   providerChildPhase?: StructuredAgentSessionProviderChildPhase
 }
 
+/** A refusal before spawn that a person can act on; the site that refused names it. */
+export type AgentSessionPreSpawnReason = Extract<
+  AgentSessionRefusalReason<'agent_session_operation_invalid'>,
+  'managedAccountEnvOverride' | 'accountSwitchInProgress' | 'managedAccountUnsupported'
+>
+
 /** Acquisition failed with first-hand proof that no provider process existed. */
 export class AgentSessionPreSpawnError extends Error {
-  constructor(cause: unknown) {
-    super(cause instanceof Error ? cause.message : String(cause), { cause })
+  /** Absent: Orca's own reason, which only the log reads. A wrapped pre-spawn error keeps its. */
+  readonly reason: AgentSessionPreSpawnReason | undefined
+
+  constructor(
+    cause: unknown,
+    options: { reason?: AgentSessionPreSpawnReason; message?: string } = {}
+  ) {
+    super(options.message ?? (cause instanceof Error ? cause.message : String(cause)), { cause })
     this.name = 'AgentSessionPreSpawnError'
+    this.reason = options.reason ?? (isAgentSessionPreSpawnError(cause) ? cause.reason : undefined)
   }
 }
 
@@ -125,14 +155,19 @@ export type AgentSessionDispatchOutcome =
    * anything and never promotes this to `unknown`.
    */
   | { state: 'admitted' }
-  | { state: 'rejected'; reason: string }
+  /** Words from `agentSessionFailureWords`, never written by hand. */
+  | ({ state: 'rejected' } & AgentJournalDispatchRejection)
   /** The call did not settle. Never re-send on the user's behalf. */
   | { state: 'unknown'; reason: string }
 
 export type StructuredAgentSessionEndedEvent = {
   type: 'ended'
   sessionId: string
+  /** Log text only; the chat's words come from `failure`. */
   reason: string
+  /** Why it ended, as the adapter knows it: the provider's exit with its own diagnostic, or an
+   *  Orca fault. Absent reads as a provider exit with nothing to add. */
+  failure?: SubmissionRejectionFact
   cause: 'unexpected-exit' | 'requested-close'
   fence: number
   acquisitionGeneration: string
@@ -184,6 +219,14 @@ export type StructuredAgentSessionSetOptionInput = {
   fence: number
 }
 
+/** `refusal`: the provider answered the Stop and declined it, in its own words when it gave any.
+ *  `unconfirmed`: the provider took the Stop, but Orca could not confirm the turn's work ended. */
+export type AgentSessionCancelOutcome = {
+  cancelled: boolean
+  refusal?: { detail?: ProviderDiagnostic }
+  unconfirmed?: true
+}
+
 export type StructuredAgentSessionAdapter = {
   /** Provider-aware capability check for hosts that route more than one adapter. */
   supportsCreate?(location: AgentSessionExecutionLocation, agent: string): boolean
@@ -209,7 +252,8 @@ export type StructuredAgentSessionAdapter = {
     /** Revalidate after preparation, immediately before writing to the provider. */
     beforeDispatch?: () => Promise<void>
   }): Promise<AgentSessionDispatchOutcome>
-  rewindSupport?(sessionId: string): AgentSessionRewindSupport
+  /** `agent` answers for a session with no child running, from the provider alone. */
+  rewindSupport?(sessionId: string, agent?: string): AgentSessionRewindSupport
   recoverRewind?(input: {
     sessionId: string
     fence: number
@@ -234,13 +278,14 @@ export type StructuredAgentSessionAdapter = {
     turnId: string
     sessionId: string
     fence: number
-    onLateResult?: (result: { error?: string }) => Promise<void>
-  }): Promise<{ error?: string }>
+    onLateResult?: (result: StructuredSessionCompactionResult) => Promise<void>
+  }): Promise<StructuredSessionCompactionResult>
   /** Cancels one turn, not the session: a session-wide interrupt would also kill
-   *  a turn the client never asked to stop. */
+   *  a turn the client never asked to stop. With no `turnId` the conversation asked to stop
+   *  everything it has in flight — a running turn, or a dispatch whose turn has not opened yet. */
   cancelTurn(input: {
     sessionId: string
-    turnId: string
+    turnId?: string
     fence: number
     prompt?: { itemId: string }
     /** Latest journal submission for this fence, when the host has one. */
@@ -249,7 +294,7 @@ export type StructuredAgentSessionAdapter = {
      *  could have named. A function, not a value, because the guard re-checks after the
      *  delivery fence may have waited. Absent for direct callers with no journal. */
     resolveLiveTurnId?: () => string | null
-  }): Promise<{ cancelled: boolean }>
+  }): Promise<AgentSessionCancelOutcome>
   /** Changes the provider thread's goal. `rejected` is the provider refusing the
    *  change; a throw leaves its effect unknown. Absent where no goal exists. */
   changeThreadGoal?(input: {
@@ -260,10 +305,10 @@ export type StructuredAgentSessionAdapter = {
      *  start a new goal rather than rewrite that one's objective in place. */
     replacesGoal: boolean
   }): Promise<{ ok: true } | { ok: false; rejected: string }>
-  /** Whether this live session can change its goal. */
-  supportsThreadGoal?(sessionId: string): boolean
-  /** Whether this live session writes context facts to its turn rows. */
-  recordsContextUsage?(sessionId: string): boolean
+  /** Whether this session can change its goal; `agent` answers one at rest. */
+  supportsThreadGoal?(sessionId: string, agent?: string): boolean
+  /** Whether this session writes context facts to its turn rows; `agent` answers one at rest. */
+  recordsContextUsage?(sessionId: string, agent?: string): boolean
   stopBackgroundTasks?(input: {
     sessionId: string
     fence: number
@@ -289,6 +334,10 @@ export type StructuredAgentSessionAdapter = {
   ): Promise<void | Readonly<Record<string, string>>>
   /** Resolves once a live session can take an option write, or after a bound; never rejects. */
   awaitOptionWritable?(sessionId: string): Promise<void>
+  /** Resolves once a session published before it proved its start has proven it, failed, or been
+   *  closed; at once for any other. A start that did not land resolves with the chat's words for
+   *  why. Never rejects. */
+  awaitStarted?(sessionId: string): Promise<void | SubmissionRejectionFact>
   readOptions?(input: { sessionId: string; fence: number }): Promise<AgentSessionOptionsResult>
   /** Option keys skipped after a provider rejected their persisted restore value. */
   readOptionRestoreFailures?(sessionId: string): readonly string[]
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts
index 0248799980a7..4b8e1d87ba39 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts
@@ -11,10 +11,12 @@ import {
   attachFingerprintFields,
   type AgentSessionAttachParams
 } from './structured-agent-session-attach'
+import { openTestAttachConversation } from './structured-agent-session-attach-test-conversation'
 import { performAttach, type AttachFlowInput } from './structured-agent-session-attach-flow'
 import { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { agentSessionJournalCloseRetries } from '../agent-session-journal/journal-close-retry'
 import * as legacyImport from '../agent-session-journal/journal-legacy-import'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
 
 const NOW = 1_800_000_000_000
 const SESSION = 'codex_adopting_session'
@@ -121,6 +123,7 @@ async function attach(
     store,
     adapter: sessionAdapter,
     journalRoot: root!,
+    openConversation: openTestAttachConversation(root!),
     authority: {
       spawnToken: 'spawn-a',
       claimKeyId: 'key-1',
@@ -210,7 +213,7 @@ describe('adopting a provider conversation on create', () => {
     }
   )
 
-  it('still releases acquisition and closes the provisional journal on an import write failure', async () => {
+  it('still releases acquisition on an import write failure, and leaves the conversation open', async () => {
     root = await mkdtemp(join(tmpdir(), 'orca-adopt-write-failure-'))
     const transcriptPath = join(root, 'rollout.jsonl')
     await writeCodexRollout(transcriptPath, 'valid source')
@@ -222,7 +225,51 @@ describe('adopting a provider conversation on create', () => {
     await expect(attach(transcriptPath, sessionAdapter)).rejects.toThrow('disk write failed')
     expect(sessionAdapter.acquire).toHaveBeenCalledTimes(1)
     expect(sessionAdapter.releaseAcquisition).toHaveBeenCalledTimes(1)
-    expect(close).toHaveBeenCalledTimes(1)
+    // The journal is the conversation's, not the attach's: a failed import closes nothing.
+    expect(close).not.toHaveBeenCalled()
+  })
+
+  it('leaves the conversation writable when the import fails after acquiring', async () => {
+    root = await mkdtemp(join(tmpdir(), 'orca-adopt-host-failure-'))
+    const transcriptPath = join(root, 'rollout.jsonl')
+    await writeCodexRollout(transcriptPath, 'valid source')
+    store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
+    const host = new StructuredAgentSessionHost({
+      store,
+      adapter: adapter(),
+      journalRoot: root,
+      claimKeyId: 'key-1',
+      mintSpawnToken: () => 'spawn-a',
+      now: () => NOW
+    })
+    vi.spyOn(AgentSessionJournal.prototype, 'replaceEpochItems').mockRejectedValueOnce(
+      new Error('disk write failed')
+    )
+    const attached = await host
+      .attach({ callerKey: 'client-1' }, attachParams(transcriptPath))
+      .catch(() => null)
+    expect(attached?.ok).not.toBe(true)
+
+    const body = { kind: 'message' as const, role: 'user' as const, blocks: [] }
+    const sent = await host.send(
+      { callerKey: 'client-1' },
+      {
+        envelope: {
+          sessionId: SESSION,
+          clientOperationId: `${NOW}-${'2'.padStart(32, '0')}`,
+          expectedRuntimeFence: null,
+          payloadFingerprint: computeAgentSessionPayloadFingerprint({
+            method: 'agentSession.send',
+            sessionId: SESSION,
+            fields: { body }
+          })
+        },
+        body
+      }
+    )
+    // The failed attach kept the conversation's own journal open, so the send is recorded.
+    expect(sent).toMatchObject({ ok: true, value: { submission: { dispatchState: 'pending' } } })
+    await host.flushAllStreamedEvents()
   })
 
   it('prepares a valid source once before acquisition and imports those exact items', async () => {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.ts
index 459d21b1f3b7..3eccc4f94571 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.ts
@@ -1,7 +1,11 @@
-import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
+import {
+  agentSessionRefusalError,
+  isAgentSessionRefusalError,
+  refuse,
+  type AgentSessionWireRefusal
+} from '../../../shared/agent-session-wire'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import type { AgentSessionAttachParams, AttachedJournal } from './structured-agent-session-attach'
-import { agentSessionJournalCloseRetries } from '../agent-session-journal/journal-close-retry'
 import type { JournalReplacementItem } from '../agent-session-journal/journal-epoch-replacement'
 import {
   importLegacyTranscriptIntoJournal,
@@ -19,10 +23,13 @@ export async function prepareAdoptedTranscript(
   } catch (error) {
     return {
       ok: false,
-      refusal: {
-        code: 'agent_session_identity_required',
-        message: error instanceof Error ? error.message : String(error)
-      }
+      refusal: isAgentSessionRefusalError(error)
+        ? error.refusal
+        : refuse(
+            'agent_session_identity_required',
+            { reason: 'transcriptUnreadable' },
+            error instanceof Error ? error.message : String(error)
+          )
     }
   }
 }
@@ -36,7 +43,9 @@ async function readAdoptedTranscript(
     return null
   }
   if (!adopt.transcriptPath) {
-    throw new Error('agent_session_identity_required')
+    throw agentSessionRefusalError('agent_session_identity_required', {
+      reason: 'transcriptNotFound'
+    })
   }
   const prepared = await prepareLegacyTranscriptImport({
     agent: params.agent,
@@ -50,7 +59,9 @@ async function readAdoptedTranscript(
     throw new Error(prepared.error)
   }
   if (prepared.items.length === 0) {
-    throw new Error('agent_session_identity_required')
+    throw agentSessionRefusalError('agent_session_identity_required', {
+      reason: 'transcriptUnreadable'
+    })
   }
   return prepared.items
 }
@@ -62,13 +73,8 @@ export async function importAdoptedTranscript(
   record: AgentSessionRecord,
   prepared: JournalReplacementItem[] | null
 ): Promise<void> {
-  try {
-    await applyAdoptedTranscript(params, attached, record, prepared)
-  } catch (error) {
-    // Publication has not taken ownership of this provisional journal yet.
-    await agentSessionJournalCloseRetries.closeOrRetain(attached.journal)
-    throw error
-  }
+  // The journal is the conversation's, which outlives a failed import; nothing here closes it.
+  await applyAdoptedTranscript(params, attached, record, prepared)
 }
 
 async function applyAdoptedTranscript(
@@ -87,7 +93,9 @@ async function applyAdoptedTranscript(
     return
   }
   if (!adopt.transcriptPath) {
-    throw new Error('agent_session_identity_required')
+    throw agentSessionRefusalError('agent_session_identity_required', {
+      reason: 'transcriptNotFound'
+    })
   }
   const imported = await importLegacyTranscriptIntoJournal({
     journal: attached.journal,
@@ -105,6 +113,8 @@ async function applyAdoptedTranscript(
   // `replaced: false` means the transcript decoded to nothing. The row promised a conversation and
   // the provider resumed one, so an empty journal here is a disagreement, not an empty chat.
   if (!imported.replaced) {
-    throw new Error('agent_session_identity_required')
+    throw agentSessionRefusalError('agent_session_identity_required', {
+      reason: 'transcriptUnreadable'
+    })
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-agent-start.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-agent-start.ts
new file mode 100644
index 000000000000..a4c93fa00f88
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-agent-start.ts
@@ -0,0 +1,212 @@
+// Giving a session its provider child back.
+//
+// Only work starts one: the delivery loop for a queued message, and the few operations that need
+// the provider itself — never a view, and never the app launching. It runs inside the session's
+// serialize, with the attach it is given, so the eligibility it reads is the one the attach acts
+// on.
+
+import {
+  providerDiagnosticOf,
+  type ProviderDiagnostic
+} from '../../../shared/agent-session-failure'
+import {
+  agentSessionRefusalFromReference,
+  readAgentSessionRefusalReference,
+  refuse,
+  refuseUnclassified,
+  type AgentSessionRefusalDetailsByCode,
+  type AgentSessionWireRefusalCode
+} from '../../../shared/agent-session-wire-refusals'
+import { agentSessionWriteNoticeEnglish } from '../../../shared/agent-session-refusal-notice'
+import type {
+  AgentSessionAttachResult,
+  AgentSessionMutationResult,
+  AgentSessionWireRefusal
+} from '../../../shared/agent-session-wire'
+import { terminalOwnerRefusalMessage } from '../../../shared/agent-session-legacy-handoff-lease'
+import type { StructuredAgentSessionAttachContext } from './structured-agent-session-attach-context'
+import { attachStructuredAgentSessionUnderSerialize } from './structured-agent-session-attach-orchestration'
+import { failedCreateRefusal } from './structured-agent-session-failed-create-refusal'
+import { adapterSupportsRecord } from './structured-agent-session-provider-support'
+import {
+  structuredAgentSessionResumeOperationId,
+  structuredAgentSessionResumeParams
+} from './structured-agent-session-resume-eligibility'
+
+/** A resume answers with the attach's own refusal, verdict and all, so the asker can tell a lease
+ *  someone else is settling from an owner that will not come back. */
+export type StructuredAgentSessionResumeOutcome =
+  | { ok: true }
+  | {
+      ok: false
+      refusal: AgentSessionWireRefusal
+      /** What the provider said about the failed start, for the chat's own record; host-side
+       *  only, never on the refusal. */
+      diagnostic?: ProviderDiagnostic
+    }
+
+/** The attach's caller key: the ledger row a start settles is Orca's own. */
+const AGENT_START_CALLER_KEY = 'trusted-local:agent-start'
+
+/**
+ * Gives the session a provider child if it has none, for a caller inside its serialize — which is
+ * what makes "if it has none" exact: two askers run this in turn, and the second finds the first
+ * one's child. A failed start leaves the next asker to make its own.
+ */
+export async function ensureStructuredAgentSessionAgent(
+  context: StructuredAgentSessionAttachContext,
+  sessionId: string,
+  startedFor?: string
+): Promise<StructuredAgentSessionResumeOutcome> {
+  if (context.sessions.get(sessionId)?.child) {
+    return { ok: true }
+  }
+  const started = await startStructuredAgentSessionAgent(context, sessionId, startedFor)
+  if (!started.ok || context.sessions.get(sessionId)?.child) {
+    return started
+  }
+  return refuseResume(
+    'agent_session_ownership_unknown',
+    { reason: 'noProviderChild' },
+    'The session attached without a provider child to write to.'
+  )
+}
+
+/** The same, for an operation's admission: a start that throws is that operation's refusal. */
+export function ensureStructuredAgentSessionAgentForOperation(
+  context: StructuredAgentSessionAttachContext,
+  sessionId: string
+): Promise<StructuredAgentSessionResumeOutcome> {
+  return ensureStructuredAgentSessionAgent(context, sessionId).catch((error: unknown) => {
+    // The error is Orca's own and goes to the log; the refusal says only that the start failed.
+    console.warn('[agent-session] starting the agent for an operation failed:', error)
+    return {
+      ok: false,
+      refusal: refuseUnclassified(
+        'agent_session_owner_restart_failed',
+        agentSessionWriteNoticeEnglish(['restartFailed'])
+      )
+    }
+  })
+}
+
+async function startStructuredAgentSessionAgent(
+  context: StructuredAgentSessionAttachContext,
+  sessionId: string,
+  startedFor: string | undefined
+): Promise<StructuredAgentSessionResumeOutcome> {
+  const callerKey = AGENT_START_CALLER_KEY
+  // The record is read only once this host has adjudicated it and recovery resolution has
+  // concluded about any owner a failed attempt left in `recovering`, so the eligibility below sees
+  // the lease the resolver handed back.
+  const unreconciled = await context.reconcileLeases(sessionId)
+  if (unreconciled) {
+    return { ok: false, refusal: unreconciled }
+  }
+  await context.runtimeState.resolveRecovery(sessionId)
+  const record = context.deps.store.getRecord(sessionId)
+  if (!record) {
+    return refuseResume(
+      'agent_session_identity_required',
+      { reason: 'recordMissing' },
+      'No structured session exists by that id.'
+    )
+  }
+  if (!adapterSupportsRecord(context.deps.adapter, record)) {
+    return refuseResume(
+      'structured_agent_session_unsupported',
+      { reason: 'hostUnsupported' },
+      'This execution host cannot resume the requested structured agent session.'
+    )
+  }
+  const params = structuredAgentSessionResumeParams(
+    record,
+    structuredAgentSessionResumeOperationId(context.now())
+  )
+  if (!params) {
+    return record.lease.unreconciled
+      ? refuseResume(
+          'execution_owner_reconciling',
+          { reason: 'hostReconciling' },
+          'This host has not yet adjudicated the session lease.'
+        )
+      : record.lease.claimStatus === 'conflicted'
+        ? refuseResume(
+            'agent_session_conflict',
+            { reason: 'claimConflicted' },
+            terminalOwnerRefusalMessage(record.lease)
+          )
+        : refuseResume(
+            'agent_session_ownership_unknown',
+            { reason: 'notResumable' },
+            'The session lease is not one this host may resume.'
+          )
+  }
+  let attached: AgentSessionMutationResult<AgentSessionAttachResult>
+  let acquisitionError: unknown
+  try {
+    attached = await attachStructuredAgentSessionUnderSerialize(context, callerKey, params, {
+      ...(startedFor === undefined ? {} : { startedFor }),
+      onAcquisitionFailed: (error) => {
+        acquisitionError = error
+      }
+    })
+  } catch (error) {
+    // The attach settles an acquisition that failed — the ledger row, the released lease — before
+    // it rethrows the cause. That row is the answer: a failure it recorded is this resume's
+    // refusal, verdict and all. Only an error it did not record is a fault for the caller.
+    const settled = settledResumeRefusal(
+      context,
+      callerKey,
+      params.envelope.clientOperationId,
+      sessionId,
+      error
+    )
+    if (settled) {
+      return withDiagnostic(settled.refusal, error)
+    }
+    throw error
+  }
+  return attached.ok ? { ok: true } : withDiagnostic(attached.refusal, acquisitionError)
+}
+
+function withDiagnostic(
+  refusal: AgentSessionWireRefusal,
+  error: unknown
+): StructuredAgentSessionResumeOutcome {
+  const diagnostic = providerDiagnosticOf(error)
+  return { ok: false, refusal, ...(diagnostic ? { diagnostic } : {}) }
+}
+
+function settledResumeRefusal(
+  context: Pick<StructuredAgentSessionAttachContext, 'deps'>,
+  callerKey: string,
+  operationId: string,
+  sessionId: string,
+  error: unknown
+): { ok: false; refusal: AgentSessionWireRefusal } | null {
+  const outcome = context.deps.store.getOperationRow(callerKey, operationId)?.outcome
+  const reference =
+    outcome?.status === 'failed'
+      ? readAgentSessionRefusalReference({ code: outcome.code, details: outcome.details })
+      : undefined
+  if (outcome?.status !== 'failed' || !reference) {
+    return null
+  }
+  return failedCreateRefusal(
+    agentSessionRefusalFromReference(
+      reference,
+      outcome.message ?? (error instanceof Error ? error.message : String(error))
+    ),
+    outcome.status,
+    context.deps.store.getRecord(sessionId)
+  )
+}
+
+function refuseResume<C extends AgentSessionWireRefusalCode>(
+  code: C,
+  details: NoInfer<AgentSessionRefusalDetailsByCode[C]>,
+  message: string
+): StructuredAgentSessionResumeOutcome {
+  return { ok: false, refusal: refuse(code, details, message) }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-append-delivery.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-append-delivery.test.ts
index c8c908aae70c..55128a23c9c5 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-append-delivery.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-append-delivery.test.ts
@@ -50,8 +50,16 @@ function liveReader() {
         submissions.push(...event.page.submissions)
       }
     }
+    const rows = new Map<string, string>()
+    for (const item of items) {
+      if (item.body.kind === 'status') {
+        rows.set(item.itemId, item.body.text)
+      }
+    }
     return {
       statuses: items.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : [])),
+      /** Each status row as the chat renders it: its latest revision, once. */
+      statusRows: [...rows.values()],
       submissions,
       batches: events.slice(opened).filter((event) => event.type === 'batch').length
     }
@@ -85,6 +93,7 @@ function exitBeforeProof(): Promise<void> {
     fence: store.getRecord(SESSION)?.lease.runtimeFence ?? 0,
     acquisitionGeneration: `generation-${generation}`,
     reason: EXIT_REASON,
+    failure: { kind: 'providerExited', detail: { text: EXIT_REASON, audience: 'log' } },
     cause: 'unexpected-exit',
     startupUnproven: true
   })
@@ -150,12 +159,16 @@ describe('an open chat receives every row its journal commits', () => {
 
     await exitBeforeProof()
 
-    expect(pane.received().statuses).toEqual([
-      expect.stringMatching(/stopped before it finished starting: .*not signed in/)
-    ])
-    expect(pane.received().submissions).toContainEqual(
-      expect.objectContaining({ clientMessageId: held, dispatchState: 'rejected' })
+    // The exit ends the child; the delivery loop, which reads why, rejects what it had queued.
+    await vi.waitFor(() =>
+      expect(pane.received().submissions).toContainEqual(
+        expect.objectContaining({ clientMessageId: held, dispatchState: 'rejected' })
+      )
     )
+    // One row, however many of its writers reported the start.
+    expect(pane.received().statusRows).toEqual([
+      'Codex stopped before it finished starting. Send your message to try again.'
+    ])
   })
 
   it('shows a revision the provider queued with no publish behind it', async () => {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-context.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-context.ts
index 4b9b46716cb2..90c638c23fb9 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-context.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-context.ts
@@ -15,6 +15,7 @@ import type {
 } from './structured-agent-session-host-types'
 import type { StructuredAgentSessionHostRuntimeState } from './structured-agent-session-host-runtime-state'
 import type { StructuredAgentSessionTaskQueue } from './structured-agent-session-task-queue'
+import type { StructuredAgentSessionConversationOpenOptions } from './structured-agent-session-conversation-open'
 
 export type StructuredAgentSessionAttachContext = {
   deps: StructuredAgentSessionHostDeps
@@ -38,8 +39,10 @@ export type StructuredAgentSessionAttachContext = {
   reconcileLeases: (sessionId: string) => Promise<AgentSessionWireRefusal | null>
   serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
   now: () => number
-  /** Paired with `sessions.delete` by `forgetStructuredAgentSession`; a failed attach that only
-   *  deleted would leave the store's row behind. */
-  forgetStatus: (sessionId: string) => void
-  publishStatus?: (sessionId: string) => void
+  publishStatus: (sessionId: string) => void
+  /** The conversation's one open journal, opened when closed; see `conversation-open`. */
+  openConversation: (
+    sessionId: string,
+    options?: StructuredAgentSessionConversationOpenOptions
+  ) => Promise<StructuredAgentSessionHostSession | null>
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-failure.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-failure.ts
index 3a77aa2d6cca..16af00e32ea5 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-failure.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-failure.ts
@@ -24,8 +24,7 @@ export async function settlePostAcquisitionAttachFailure(
           ? 'root-exit-observed'
           : 'exit-proven'
   }
-  // A failed close must not prevent durable failure settlement.
-  await Promise.resolve(input.onAttachFailed?.()).catch(() => undefined)
+  input.onAcquisitionReleased?.(cause, { rootGone: exitProof !== 'unproven' })
   try {
     await input.store.settleFailedPostAcquisitionAttachment({
       sessionId: record.sessionId,
@@ -36,6 +35,7 @@ export async function settlePostAcquisitionAttachFailure(
       outcome: {
         status: 'failed',
         code: 'agent_session_operation_invalid',
+        details: { reason: 'attachFailed' },
         message: cause instanceof Error ? cause.message : String(cause)
       },
       exitProof,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts
index cf37a9a6fe2d..8fdee5c62bdb 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts
@@ -1,7 +1,9 @@
+import { refuse } from '../../../shared/agent-session-wire-refusals'
 import { settlePostAcquisitionAttachFailure } from './structured-agent-session-attach-failure'
 import {
   failedAcquisitionRefusal,
-  failedAcquisitionSettlement
+  failedAcquisitionSettlement,
+  preSpawnFailureInWords
 } from './structured-agent-session-failed-create-refusal'
 import type {
   StructuredAgentSessionAdapter,
@@ -41,6 +43,7 @@ import {
   type AgentSessionCreatePhaseRecorder
 } from '../../observability/agent-session-instrumentation'
 import type { ProviderHistoryWindow } from '../agent-session-journal/journal-submission-reconciler'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 
 export type AttachFlowInput = {
   store: AgentSessionRecordStore
@@ -66,8 +69,14 @@ export type AttachFlowInput = {
   onAcquiring?: () => Promise<void> | void
   /** Settles writes already captured by the superseded journal before opening another. */
   beforeJournalOpen?: () => Promise<void> | void
-  /** Closes and removes partial publication after journal attachment fails. */
-  onAttachFailed?: () => Promise<void>
+  /** The conversation's own open journal, which the attach adopts: it never opens one itself. */
+  openConversation: (record: AgentSessionRecord) => Promise<AgentSessionJournal>
+  /** A failure after acquisition released the session's acquisition; `cause` is that failure and
+   *  `rootGone` whether the release saw the provider root go. */
+  onAcquisitionReleased?: (cause: unknown, verdict: { rootGone: boolean }) => void
+  /** The error an acquisition failed with, for a host-side reader of the provider's words; the
+   *  refusal never carries them. */
+  onAcquisitionFailed?: (error: unknown) => void
 }
 
 export async function performAttach(
@@ -76,10 +85,11 @@ export async function performAttach(
   const { params, store } = input
   const unsupported = (): AgentSessionMutationResult<AgentSessionAttachResult> => ({
     ok: false,
-    refusal: {
-      code: 'structured_agent_session_unsupported',
-      message: 'This execution host cannot create the requested structured agent session.'
-    }
+    refusal: refuse(
+      'structured_agent_session_unsupported',
+      { reason: 'hostUnsupported' },
+      'This execution host cannot create the requested structured agent session.'
+    )
   })
   const sessionId = params.envelope.sessionId
   const admitted = admitAttachOrRefuse(params)
@@ -168,6 +178,10 @@ export async function performAttach(
       acquiredOwner = true
     }
   } catch (error) {
+    const wording = {
+      record: reservedRecord ?? store.getRecord(sessionId),
+      newSession: !params.providerHandle
+    }
     const spawnToken = reservedRecord?.lease.reservedSpawnToken
     if (reservedRecord && spawnToken && !unsupportedReservationSettlementAttempted) {
       // Settle processless proof and failed operation atomically.
@@ -178,7 +192,7 @@ export async function performAttach(
           spawnToken,
           callerKey: input.callerKey,
           operationId: params.envelope.clientOperationId,
-          ...failedAcquisitionSettlement(error),
+          ...failedAcquisitionSettlement(error, wording),
           now: input.now()
         })
       } catch (settlementError) {
@@ -188,11 +202,18 @@ export async function performAttach(
         )
       }
     }
+    input.onAcquisitionFailed?.(error)
+    const failed = failedAcquisitionRefusal(error, wording)
+    const thrown = failed ? error : preSpawnFailureInWords(error, wording)
+    if (failed || thrown !== error) {
+      // The answer carries only its sentence, so what failed is kept here.
+      console.warn('[agent-session] provider start failed:', error)
+    }
     return (
-      failedAcquisitionRefusal(error) ?? {
+      failed ?? {
         ok: false,
         refusal: classifyStoreFailure(
-          error,
+          thrown,
           store.getRecord(sessionId)?.lease.runtimeFence ?? null,
           store.getRecord(sessionId)
         )
@@ -208,6 +229,7 @@ export async function performAttach(
       params,
       journalRoot: input.journalRoot,
       adapter: input.adapter,
+      openConversation: input.openConversation,
       providerHistoryWindow
     })
     await importAdoptedTranscript(params, attached, record, preparedTranscript.items)
@@ -277,6 +299,7 @@ async function settleUnsupportedReservation(
       outcome: {
         status: 'failed',
         code: 'structured_agent_session_unsupported',
+        details: { reason: 'hostUnsupported' },
         message: 'Structured session support changed before the provider could start.'
       },
       exitProof: 'processless',
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts
index bf62c3fffced..40804bf55e2e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts
@@ -1,3 +1,4 @@
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
 import { recoverStructuredRewind } from './structured-rewind-recovery'
 import { recoverInterruptedCompaction } from './structured-compaction-recovery'
 // The host's attach, lifted out of the host class.
@@ -14,7 +15,7 @@ import type {
   AgentSessionTurnActivity
 } from '../../../shared/agent-session-wire'
 import type { AgentSessionAttachParams } from './structured-agent-session-attach'
-import { performAttach } from './structured-agent-session-attach-flow'
+import { performAttach, type AttachFlowInput } from './structured-agent-session-attach-flow'
 import { stampFailedCreateOwnerVerdict } from './structured-agent-session-failed-create-refusal'
 import {
   pinnedAgentSessionLaunchArgs,
@@ -22,10 +23,18 @@ import {
 } from './structured-agent-session-launch-env'
 import { refuseAgentSessionMutation } from './structured-agent-session-mutation-admission'
 import { settleStaleStructuredAgentSessionState } from './structured-agent-session-dead-generation-settlement'
+import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation'
 import type { StructuredAgentSessionAttachContext } from './structured-agent-session-attach-context'
-import { forgetStructuredAgentSession } from './structured-agent-session-host-lifetime'
+import type {
+  StructuredAgentSessionProviderChild,
+  StructuredAgentSessionStopVerdict
+} from './structured-agent-session-host-types'
+import {
+  endProviderChild,
+  indexProviderChild,
+  structuredAgentSessionConversationFence
+} from './structured-agent-session-provider-child'
 import type { DeferredStructuredAgentSessionEventSink } from './structured-agent-session-event-sink'
-import { agentSessionJournalCloseRetries } from '../agent-session-journal/journal-close-retry'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import {
   addAgentSessionCreatePhaseAttributes,
@@ -35,17 +44,18 @@ import {
 } from '../../observability/agent-session-instrumentation'
 
 export type StructuredAgentSessionAttachOptions = {
-  /** Provider-exit recovery: refuses once the ticket the restart was issued for is stale. */
-  admitRecoveryTicket?: () => boolean
   recordPhase?: AgentSessionCreatePhaseRecorder
+  onAcquisitionFailed?: AttachFlowInput['onAcquisitionFailed']
+  /** The queued message a start is for; see `StructuredAgentSessionProviderChild.startedFor`. */
+  startedFor?: string
 }
 
 /**
  * The attach itself, for a caller already inside the session's serialize.
  *
- * That is every caller that has to know what the session looks like RIGHT NOW: a hold, a send
- * making sure it has an owner, provider-exit recovery. They run their
- * check and this attach in one serialized step, so "the session has no child" is still true when
+ * That is every caller that has to know what the session looks like RIGHT NOW: the delivery loop,
+ * and an operation that needs the provider. They run their check and this attach in one serialized
+ * step, so "the session has no child" is still true when
  * the attach starts. `attachStructuredAgentSession` is this under `serialize`, for a client.
  */
 export function attachStructuredAgentSessionUnderSerialize(
@@ -94,12 +104,10 @@ async function runAttach(
 ): Promise<AgentSessionMutationResult<AgentSessionAttachResult>> {
   const sessionId = params.envelope.sessionId
   const recordPhase = options.recordPhase
-  if (options.admitRecoveryTicket && !options.admitRecoveryTicket()) {
-    return refuseAgentSessionMutation({
-      code: 'agent_session_checkpoint_stale',
-      message: 'The provider-exit recovery ticket is no longer current.'
-    })
-  }
+  // Readers of a conversation already open are re-baselined when this attach moves its fence.
+  const fenceBefore = context.sessions.has(sessionId)
+    ? structuredAgentSessionConversationFence(context.deps.store, sessionId)
+    : null
   const unreconciled = await withAgentSessionCreatePhase('reconcile_leases', recordPhase, () =>
     context.reconcileLeases(sessionId)
   )
@@ -113,17 +121,19 @@ async function runAttach(
     context.runtimeState.probeOwner(sessionId)
   )
   // A child this attach spawns writes through a sink this attempt owns. Only a successful
-  // attach makes it the session's; any other exit closes it with whatever the child queued.
+  // attach makes the child and its sink the session's; any other exit closes the sink with
+  // whatever the child queued, and leaves the conversation's child as it was.
   const attemptSink = context.runtimeState.mintEventSink(sessionId)
-  let attemptSinkAdopted = false
   // Read before the reserve clears it: how the previous generation ended decides how whatever it
   // left running is settled.
-  const priorDeathEvidence = context.deps.store.getRecord(sessionId)?.lease.deathEvidence ?? null
-  const attached = stampFailedCreateOwnerVerdict(
-    context.deps.store,
-    callerKey,
-    params.envelope,
-    await performAttach({
+  const priorRecord = context.deps.store.getRecord(sessionId)
+  const priorDeathEvidence = priorRecord?.lease.deathEvidence ?? null
+  const attempt: { candidate: AttachCandidate | null; committed: boolean } = {
+    candidate: null,
+    committed: false
+  }
+  try {
+    const attached = await performAttach({
       store: context.deps.store,
       adapter: context.deps.adapter,
       journalRoot: context.deps.journalRoot,
@@ -147,66 +157,51 @@ async function runAttach(
       params,
       now: () => context.now(),
       recordPhase,
-      // Site 9: this closes the PRIOR map entry it drops, never the provisional
-      // journal — it has no reference to that one. `onAttached` owns that.
-      onAttachFailed: async () => {
-        await forgetStructuredAgentSession(context, sessionId)
-        context.runtimeState.currentEventSink(sessionId)?.close()
-        context.runtimeState.discardEventSink(sessionId)
+      ...(options.onAcquisitionFailed ? { onAcquisitionFailed: options.onAcquisitionFailed } : {}),
+      openConversation: async (record) => {
+        const conversation = await context.openConversation(record.sessionId, {
+          acquisition: true
+        })
+        if (!conversation) {
+          throw new Error('agent_session_identity_required')
+        }
+        return conversation.journal
       },
+      // The cleanup released the acquisition, which for a re-attach is the live child itself.
+      onAcquisitionReleased: (cause, verdict) =>
+        endReleasedChild(context, sessionId, cause, verdict),
       onAttached: async (attached, acquisitionGeneration, acquiredOwner, providerChildPhase) => {
-        const fence = context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0
-        const previous = context.sessions.get(sessionId)
-        const previousFence = previous?.fence
+        const fence = structuredAgentSessionConversationFence(context.deps.store, sessionId)
+        const current = context.sessions.get(sessionId)?.child ?? null
+        const startedFor = acquiredOwner ? options.startedFor : current?.startedFor
         // A re-attach to a live child keeps the sink that child already writes through.
         const eventSink = acquiredOwner
           ? attemptSink
           : (context.runtimeState.currentEventSink(sessionId) ?? attemptSink)
-        // Site 8: the provisional journal has no owner until the map takes it,
-        // and the barrier below throws by design.
-        try {
-          if (acquiredOwner) {
-            // Before the drain: the buffered events are the new child's, never a stale row's.
-            await settleStaleStructuredAgentSessionState({
-              journal: attached.journal,
-              sessionId,
-              fence,
-              acquisitionGeneration,
-              deathEvidence: priorDeathEvidence
-            })
-          }
-          await bindAndDrain(eventSink, attached.journal, fence, (activity) =>
-            context.subscribers.publish(sessionId, attached.journal, activity)
-          )
-        } catch (error) {
-          await agentSessionJournalCloseRetries.closeOrRetain(attached.journal)
-          throw error
+        if (acquiredOwner) {
+          // Before the drain: the buffered events are the new child's, never a stale row's.
+          await settleStaleStructuredAgentSessionState({
+            journal: attached.journal,
+            sessionId,
+            fence,
+            acquisitionGeneration,
+            deathEvidence: priorDeathEvidence,
+            failureTextContext: structuredAgentSessionFailureWordsContext(priorRecord)
+          })
         }
-        // Site 10: a `set` over a live entry would orphan its handle — and a
-        // close that REJECTED did not release it. The replacement is therefore
-        // ABORTED rather than completed over a handle nothing can reach again:
-        // `previous` stays indexed, so teardown still owns it and can retry.
-        if (previous && previous.journal !== attached.journal) {
-          try {
-            await previous.journal.close()
-          } catch (error) {
-            await agentSessionJournalCloseRetries.closeOrRetain(attached.journal)
-            throw error
+        await bindAndDrain(eventSink, attached.journal, fence, (activity) =>
+          context.subscribers.publish(sessionId, attached.journal, activity)
+        )
+        attempt.candidate = {
+          sink: eventSink,
+          child: {
+            generation: acquisitionGeneration ?? current?.generation ?? null,
+            fence,
+            // A re-attach to a live child keeps what that child already proved, and its cause.
+            phase: acquiredOwner ? providerChildPhase : (current?.phase ?? 'ready'),
+            ...(startedFor === undefined ? {} : { startedFor })
           }
         }
-        context.runtimeState.adoptEventSink(sessionId, eventSink)
-        attemptSinkAdopted = eventSink === attemptSink
-        context.sessions.set(sessionId, {
-          journal: attached.journal,
-          params,
-          fence,
-          hasProviderChild: true,
-          // A re-attach to a live child keeps what that child already proved.
-          providerChildPhase: acquiredOwner
-            ? providerChildPhase
-            : (previous?.providerChildPhase ?? 'ready'),
-          acquisitionGeneration: acquisitionGeneration ?? previous?.acquisitionGeneration ?? null
-        })
         await recoverStructuredRewind(
           context.deps.store,
           sessionId,
@@ -216,21 +211,61 @@ async function runAttach(
           context.now
         )
         await recoverInterruptedCompaction(context.deps.store, sessionId, attached.journal, fence)
-        if (attached.recovery) {
-          context.subscribers.reset(sessionId, attached.journal, attached.recovery.reset, fence)
-        } else if (previousFence !== undefined && previousFence !== fence) {
+        if (fenceBefore !== null && fence !== fenceBefore) {
           context.subscribers.snapshot(sessionId, attached.journal, fence)
         } else {
           context.subscribers.publish(sessionId, attached.journal)
         }
       }
-    }).finally(() => {
-      if (!attemptSinkAdopted) {
-        attemptSink.close()
-      }
     })
-  )
-  return attached
+    const { candidate } = attempt
+    const conversation = context.sessions.get(sessionId)
+    if (attached.ok && candidate && conversation) {
+      context.runtimeState.adoptEventSink(sessionId, candidate.sink)
+      attempt.committed = candidate.sink === attemptSink
+      indexProviderChild(conversation, candidate.child)
+      context.publishStatus?.(sessionId)
+    }
+    return stampFailedCreateOwnerVerdict(context.deps.store, callerKey, params.envelope, attached)
+  } finally {
+    if (!attempt.committed) {
+      attemptSink.close()
+    }
+  }
+}
+
+type AttachCandidate = {
+  child: StructuredAgentSessionProviderChild
+  sink: DeferredStructuredAgentSessionEventSink
+}
+
+function endReleasedChild(
+  context: StructuredAgentSessionAttachContext,
+  sessionId: string,
+  cause: unknown,
+  verdict: StructuredAgentSessionStopVerdict
+): void {
+  const session = context.sessions.get(sessionId)
+  const child = session?.child
+  if (
+    !session ||
+    !child ||
+    !endProviderChild(session, {
+      generation: child.generation,
+      fence: child.fence,
+      cause: 'attach-failed',
+      reason: cause instanceof Error ? cause.message : String(cause),
+      // Orca failed to attach; the provider said nothing.
+      failure: agentSessionFailureFact('hostFault'),
+      duringStartup: child.phase === 'starting',
+      ...verdict
+    })
+  ) {
+    return
+  }
+  context.runtimeState.currentEventSink(sessionId)?.close()
+  context.runtimeState.discardEventSink(sessionId)
+  context.publishStatus?.(sessionId)
 }
 
 /** Binds the sink to the journal and waits for the barrier the host publishes
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-reconciliation.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-reconciliation.test.ts
index 97f429933d87..36f6ebc79e85 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-reconciliation.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-reconciliation.test.ts
@@ -8,11 +8,13 @@ import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { agentSessionRecordFixture } from '../../../shared/agent-session-record.test-fixture'
 import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import { projectStructuredAgentSessionStatusState } from '../../../shared/structured-agent-session-projection'
 import { digestPayload } from '../agent-session-journal/journal-payload-bounds'
 import { journalDirectoryFor } from '../agent-session-journal/journal-paths'
 import type { ProviderHistoryWindow } from '../agent-session-journal/journal-submission-reconciler'
 import { createTrackedJournalOpener } from '../agent-session-journal/journal-store-test-open'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import { openTestAttachConversation } from './structured-agent-session-attach-test-conversation'
 import {
   attachJournal,
   journalIdentityFor,
@@ -85,6 +87,7 @@ async function attach(adapter: StructuredAgentSessionAdapter) {
     record: RECORD,
     params: PARAMS,
     journalRoot: root,
+    openConversation: openTestAttachConversation(root),
     adapter
   })
   journals.track(attached.journal)
@@ -110,11 +113,24 @@ describe('attachJournal restart reconciliation', () => {
     expect(attached.unconfirmedClientMessageIds).toEqual([])
     const submission = attached.journal.submissions()[0]
     expect(submission?.dispatchState).toBe('rejected')
-    expect(submission?.reason).toBe('not_delivered')
+    expect(submission?.rejection).toEqual({ kind: 'notDelivered' })
     // Deciding is not sending: nothing here puts the message back on the wire.
     expect(dispatch).not.toHaveBeenCalled()
   })
 
+  it('gives a send the provider never received no verdict and no listing', async () => {
+    await crashedJournal()
+    const { adapter } = adapterWith(async () => window())
+
+    const attached = await attach(adapter)
+
+    // Nobody failed: the crash stranded it, so the chat must not read Failed or be listed by it.
+    const { items, submissions } = attached.journal.snapshot()
+    expect(
+      projectStructuredAgentSessionStatusState(items, submissions, RECORD.lease.runtimeFence)
+    ).toMatchObject({ summary: { status: null }, latestRequest: null })
+  })
+
   it('still reports a submission unconfirmed when the window cannot decide it', async () => {
     await crashedJournal()
     const { adapter, dispatch } = adapterWith(async () => window({ turnInFlight: true }))
@@ -147,4 +163,37 @@ describe('attachJournal restart reconciliation', () => {
     expect(attached.unconfirmedClientMessageIds).toEqual(['cm_1'])
     expect(attached.journal.submissions()[0]?.dispatchState).toBe('unknown')
   })
+
+  it('leaves a message the open conversation still has queued alone (W4′e)', async () => {
+    const journal = await journals.open({
+      identity: IDENTITY,
+      journalDir: journalDirectoryFor(root, {
+        workspaceId: IDENTITY.workspaceId,
+        sessionId: IDENTITY.sessionId
+      })
+    })
+    await journal.appendSubmission({
+      clientMessageId: 'queued',
+      payloadFingerprint: digestPayload('still queued'),
+      body: userMessage('still queued'),
+      fence: RECORD.lease.runtimeFence,
+      handoverRecorded: true
+    })
+    // History that holds nothing: absence would prove a handed-over message undelivered.
+    const { adapter, dispatch } = adapterWith(async () => window())
+
+    const attached = await attachJournal({
+      record: RECORD,
+      params: PARAMS,
+      journalRoot: root,
+
+      adapter,
+      openConversation: async () => journal
+    })
+
+    expect(attached.journal).toBe(journal)
+    expect(journal.submissions()[0]).toMatchObject({ dispatchState: 'pending' })
+    expect(journal.submissions()[0]?.handedOverAt).toBeUndefined()
+    expect(dispatch).not.toHaveBeenCalled()
+  })
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-test-conversation.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-test-conversation.ts
new file mode 100644
index 000000000000..1e2322cbc6d8
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-test-conversation.ts
@@ -0,0 +1,18 @@
+import type { AgentSessionRecord } from '../../../shared/agent-session-record'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import { openStructuredAgentSessionConversationJournal } from './structured-agent-session-conversation-open'
+
+/** For a test that attaches without a host: the conversation's journal, through the one open a
+ *  host would take, so the attach under test adopts it the way it adopts the host's. */
+export function openTestAttachConversation(
+  journalRoot: string,
+  adapter: Pick<StructuredAgentSessionAdapter, 'historyFilePath'> = {}
+): (record: AgentSessionRecord) => Promise<AgentSessionJournal> {
+  return async (record) =>
+    (
+      await openStructuredAgentSessionConversationJournal({ journalRoot, adapter }, record, {
+        acquisition: true
+      })
+    ).session.journal
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts
index de5fa297daf8..10c4866cea3f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts
@@ -24,10 +24,14 @@ import type {
   AgentSessionRecord
 } from '../../../shared/agent-session-record'
 import {
-  AGENT_SESSION_WIRE_REFUSAL_CODES,
+  AgentSessionRefusalError,
+  agentSessionRefusalFromReference,
+  agentSessionRefusalReference,
+  isAgentSessionWireRefusalCode,
+  refuse,
   type AgentSessionMutationEnvelope,
-  type AgentSessionWireRefusal,
-  type AgentSessionWireRefusalCode
+  type AgentSessionRefusalReference,
+  type AgentSessionWireRefusal
 } from '../../../shared/agent-session-wire'
 import {
   agentSessionFingerprintConflict,
@@ -35,15 +39,9 @@ import {
 } from '../../../shared/agent-session-mutation-envelope'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import { agentSessionProviderHandleChainHead } from '../../../shared/agent-session-provider-handle'
-import { agentSessionJournalCloseRetries } from '../agent-session-journal/journal-close-retry'
-import { journalDirectoryFor } from '../agent-session-journal/journal-paths'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { reconcileJournalSubmissionsAgainstHistory } from '../agent-session-journal/journal-restart-reconciliation'
 import type { ProviderHistoryWindow } from '../agent-session-journal/journal-submission-reconciler'
-import {
-  openAgentSessionJournalWithRecovery,
-  type AgentSessionJournalRecovery
-} from './agent-session-journal-recovery'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import { structuredAgentSessionRefusalMessage } from './structured-agent-session-refusal-message'
 
@@ -124,10 +122,11 @@ export function admitAttachOrRefuse(
   if (params.providerHandle && params.providerHandle.kind !== params.provider) {
     return {
       ok: false,
-      refusal: {
-        code: 'agent_session_operation_invalid',
-        message: `A ${params.provider} session requires a ${params.provider} provider handle.`
-      }
+      refusal: refuse(
+        'agent_session_operation_invalid',
+        { reason: 'requestMalformed' },
+        `A ${params.provider} session requires a ${params.provider} provider handle.`
+      )
     }
   }
   const fingerprint = computeAgentSessionPayloadFingerprint({
@@ -165,16 +164,13 @@ export function journalIdentityFor(
 
 export type AttachedJournal = {
   journal: AgentSessionJournal
-  recovery: AgentSessionJournalRecovery | null
-  /** Submissions still `unknown` after this open: the crash boundary settled
-   *  them there and provider history could not decide them either. */
+  /** Submissions the crash boundary left `unknown` that provider history could not decide. */
   unconfirmedClientMessageIds: string[]
 }
 
 /**
- * Open the session's journal, recovering it when the stored one is unusable,
- * settle every submission left in flight by a previous process, then let
- * provider history decide the ones it can prove.
+ * The conversation's journal — opened, and its crash boundary settled, by the conversation's own
+ * open — with provider history deciding the submissions that boundary could only doubt.
  *
  * Why the reconciliation belongs HERE and nowhere else: this runs after the
  * record store handed this host the lease and before `onAttached` starts a
@@ -182,54 +178,44 @@ export type AttachedJournal = {
  * is read, and the window stays valid until the resume consumes it. Every other
  * settlement site — a proven child exit — runs while the host
  * may still start another child, and a read there could be overtaken before it
- * is acted on. Orca still never re-sends: this decides state only.
+ * is acted on. Orca still never re-sends: this decides state only. A queued
+ * submission is left alone: it was never handed over, so history cannot hold it.
  */
 export async function attachJournal(input: {
   record: AgentSessionRecord
   params: AgentSessionAttachParams
   journalRoot: string
   adapter: StructuredAgentSessionAdapter
+  /** The host's open conversation, whose journal the attach adopts. */
+  openConversation: (record: AgentSessionRecord) => Promise<AgentSessionJournal>
   /** Provider history sampled before a new child is acquired. `null` means the
    *  adapter had no usable history; omit to read lazily for direct callers. */
   providerHistoryWindow?: ProviderHistoryWindow | null
 }): Promise<AttachedJournal> {
   const identity = journalIdentityFor(input.record, input.params)
   const fence = input.record.lease.runtimeFence
-  const historyFilePath = input.adapter.historyFilePath
-    ? await input.adapter.historyFilePath({ identity })
-    : null
-  const opened = await openAgentSessionJournalWithRecovery({
+  const journal = await input.openConversation(input.record)
+  const settled = await reconcileAgainstProviderHistory({
+    adapter: input.adapter,
     identity,
-    journalDir: journalDirectoryFor(input.journalRoot, {
-      workspaceId: identity.workspaceId,
-      sessionId: identity.sessionId
-    }),
+    journal,
     fence,
-    historyFilePath
+    accountHome: input.record.accountHome,
+    ...(Object.hasOwn(input, 'providerHistoryWindow')
+      ? { history: input.providerHistoryWindow }
+      : {})
   })
-  try {
-    // That await is a WRITE. A failure in it leaves the journal with no caller
-    // holding a reference to close it.
-    const unconfirmed = await opened.journal.markPendingSubmissionsUnknown(fence)
-    const settled = await reconcileAgainstProviderHistory({
-      adapter: input.adapter,
-      identity,
-      journal: opened.journal,
-      fence,
-      accountHome: input.record.accountHome,
-      ...(Object.hasOwn(input, 'providerHistoryWindow')
-        ? { history: input.providerHistoryWindow }
-        : {})
-    })
-    return {
-      ...opened,
-      unconfirmedClientMessageIds: unconfirmed.filter((id) => !settled.includes(id))
-    }
-  } catch (error) {
-    // A rejected close leaves the handle open, so the journal is retained for a
-    // later retry rather than dropped along with the only reference to it.
-    await agentSessionJournalCloseRetries.closeOrRetain(opened.journal)
-    throw error
+  return {
+    journal,
+    unconfirmedClientMessageIds: journal
+      .submissions()
+      .filter(
+        (entry) =>
+          entry.dispatchState === 'unknown' &&
+          entry.recovered === true &&
+          !settled.includes(entry.clientMessageId)
+      )
+      .map((entry) => entry.clientMessageId)
   }
 }
 
@@ -350,16 +336,21 @@ export function classifyStoreFailure(
   record: AgentSessionRecord | null = null
 ): AgentSessionWireRefusal {
   const rawCode = error instanceof Error ? error.message : String(error)
-  if (!(AGENT_SESSION_WIRE_REFUSAL_CODES as readonly string[]).includes(rawCode)) {
+  if (!isAgentSessionWireRefusalCode(rawCode)) {
     throw error
   }
-  const code = rawCode as AgentSessionWireRefusalCode
-  return {
-    code,
-    // Why: a latched session is exactly where a bare store code strands the user.
-    message:
-      structuredAgentSessionRefusalMessage(code, record) ??
-      `The session store refused this call: ${code}.`,
-    ...(code === 'agent_session_checkpoint_stale' && currentFence !== null ? { currentFence } : {})
-  }
+  // A refusal error's message is its code, so its details are this code's.
+  const emitted: AgentSessionRefusalReference =
+    error instanceof AgentSessionRefusalError
+      ? agentSessionRefusalReference(error.refusal)
+      : { code: rawCode }
+  // Why: a latched session is exactly where a bare store code strands the user.
+  const told = structuredAgentSessionRefusalMessage(emitted, record)
+  const reference = told?.reference ?? emitted
+  return agentSessionRefusalFromReference(
+    reference.code === 'agent_session_checkpoint_stale' && currentFence !== null
+      ? { code: reference.code, details: { ...reference.details, currentFence } }
+      : reference,
+    told?.message ?? `The session store refused this call: ${rawCode}.`
+  )
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-background-task-channel.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-background-task-channel.ts
index 5d922d723503..a88949a296f5 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-background-task-channel.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-background-task-channel.ts
@@ -12,21 +12,25 @@ import type {
   StructuredAgentSessionHostDeps,
   StructuredAgentSessionHostSession
 } from './structured-agent-session-host-types'
+import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
 
 export class StructuredAgentSessionBackgroundTaskChannel {
   constructor(
     private readonly deps: StructuredAgentSessionHostDeps,
     private readonly sessions: Map<string, StructuredAgentSessionHostSession>,
     private readonly subscribers: AgentSessionSubscribers,
-    private readonly requireSession: (sessionId: string) => StructuredAgentSessionHostSession,
+    /** The host's accessor: opens a conversation at rest, and never starts an agent. */
+    private readonly conversation: (
+      sessionId: string
+    ) => Promise<StructuredAgentSessionHostSession>,
     /** Task edges change the status summary too; the feed's equality check
      *  keeps a no-op re-projection from reaching subscribers. */
     private readonly onPublished: (sessionId: string) => void
   ) {}
 
-  history(request: AgentSessionHistoryRequest): AgentSessionHistoryResult {
+  async history(request: AgentSessionHistoryRequest): Promise<AgentSessionHistoryResult> {
     const result = readStructuredAgentSessionHistoryResult({
-      journal: this.requireSession(request.sessionId).journal,
+      journal: (await this.conversation(request.sessionId)).journal,
       record: this.deps.store.getRecord(request.sessionId),
       request
     })
@@ -42,13 +46,14 @@ export class StructuredAgentSessionBackgroundTaskChannel {
     }
   }
 
-  subscribe(input: AgentSessionSubscribeInput): () => void {
-    const session = this.requireSession(input.sessionId)
+  /** Resolves once the conversation is open and the subscriber holds its opening frame. */
+  async subscribe(input: AgentSessionSubscribeInput): Promise<() => void> {
+    const session = await this.conversation(input.sessionId)
     const backgroundTasks = this.state(input.sessionId)
     return this.subscribers.open({
       ...input,
       journal: session.journal,
-      fence: this.deps.store.getRecord(input.sessionId)?.lease.runtimeFence ?? 0,
+      fence: structuredAgentSessionConversationFence(this.deps.store, input.sessionId),
       ...(backgroundTasks !== undefined ? { backgroundTasks } : {})
     })
   }
@@ -57,7 +62,11 @@ export class StructuredAgentSessionBackgroundTaskChannel {
     const session = this.sessions.get(sessionId)
     const state = publishedState !== undefined ? publishedState : this.state(sessionId)
     if (session && state !== undefined) {
-      this.subscribers.backgroundTasks(sessionId, state, session.fence)
+      this.subscribers.backgroundTasks(
+        sessionId,
+        state,
+        structuredAgentSessionConversationFence(this.deps.store, sessionId)
+      )
       this.onPublished(sessionId)
     }
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-echo-working.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-echo-working.test.ts
new file mode 100644
index 000000000000..0fe206201604
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-echo-working.test.ts
@@ -0,0 +1,146 @@
+// Claude's echo of a sent message both answers the send and opens its turn. Whatever order the
+// host publishes those in, a chat reading its frames one at a time must read working throughout:
+// Stop and every session list's Working come from that one rule.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it } from 'vitest'
+import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import { isStructuredAgentSessionMainAgentWorking } from '../../../shared/structured-agent-session-main-agent-working'
+import { ClaudeStructuredSessionAdapter } from '../../claude/claude-structured-session-adapter'
+import {
+  fakeClaude,
+  PROVIDER_SESSION_ID
+} from '../../claude/claude-structured-session-test-support'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  hostTestAttachParams,
+  hostTestMessage,
+  hostTestOperationId,
+  resetHostTestOperationIds
+} from './structured-agent-session-host-test-data'
+
+const CALLER = { callerKey: 'client-1' }
+
+let root: string
+let host: StructuredAgentSessionHost
+let adapter: ClaudeStructuredSessionAdapter
+let store: AgentSessionRecordStore
+const claude = { current: fakeClaude({ replayUuid: null }) }
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-claude-echo-working-'))
+  resetHostTestOperationIds()
+  claude.current = fakeClaude({ replayUuid: null })
+  const lifecycle: Promise<void>[] = []
+  adapter = new ClaudeStructuredSessionAdapter({
+    resolveLaunch: async () => ({
+      pathToClaudeCodeExecutable: 'claude',
+      options: {},
+      cwd: root,
+      claudeConfigDir: join(root, 'claude-home'),
+      providerSessionId: PROVIDER_SESSION_ID,
+      resumeLeafUuid: null,
+      resumesTranscript: false,
+      continuesChain: false
+    }),
+    onEvent: (event) => {
+      const mapped = structuredClaudeLifecycleEvent(event)
+      if (mapped) {
+        lifecycle.push(host.handleAdapterEvent(mapped))
+      }
+    },
+    // As the runtime wires it.
+    onDispatchSettledLate: (settlement) => void host.settleLateDispatch(settlement),
+    openConnection: claude.current.openConnection,
+    readProcessStartTime: async () => 1_700_000_000_000,
+    now: () => NOW
+  })
+  store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
+  host = new StructuredAgentSessionHost({
+    store,
+    adapter: Object.assign(adapter, { supportsCreate: () => true }),
+    journalRoot: root,
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => 'spawn-a',
+    now: () => NOW
+  })
+  const params = hostTestAttachParams(null, {
+    provider: 'claude',
+    agent: 'claude',
+    accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: join(root, 'claude-home') },
+    providerHandle: { kind: 'claude', sessionId: PROVIDER_SESSION_ID, leafUuid: null }
+  })
+  expect(await host.attach(CALLER, params)).toMatchObject({ ok: true })
+  await adapter.awaitStarted(SESSION)
+  await Promise.all(lifecycle)
+})
+
+afterEach(async () => {
+  await adapter.closeAll()
+  await host.flushAllStreamedEvents()
+  await rm(root, { recursive: true, force: true })
+})
+
+function settled(): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, 20))
+}
+
+it('reads working at every published frame from the send through the echo that opens its turn', async () => {
+  const submissions = new Map<string, AgentJournalSubmission>()
+  const turns = new Map<string, string>()
+  const working: boolean[] = []
+  const fence = store.getRecord(SESSION)!.lease.runtimeFence
+  host.subscribe({
+    id: 'chat-1',
+    sessionId: SESSION,
+    emit: (event) => {
+      if (event.type !== 'batch') {
+        return
+      }
+      for (const submission of event.batch.submissions) {
+        submissions.set(submission.clientMessageId, submission)
+      }
+      for (const item of event.batch.items) {
+        if (item.body.kind === 'turn') {
+          turns.set(item.itemId, item.body.state)
+        }
+      }
+      const running = [...turns].find(([, state]) => state === 'running')?.[0] ?? null
+      working.push(
+        isStructuredAgentSessionMainAgentWorking(running, [...submissions.values()], fence)
+      )
+    }
+  })
+  const body = hostTestMessage('hi')
+  await host.send(CALLER, {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: fence,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.send',
+        sessionId: SESSION,
+        fields: { body }
+      })
+    },
+    body
+  })
+  await settled()
+  const connection = claude.current.connections[0]!
+  // Claude echoes the written message back, which is what opens its turn.
+  connection.handlers.onMessage?.({ ...connection.sent.at(-1)!, uuid: 'echo-uuid' })
+  await settled()
+
+  expect([...submissions.values()].map((submission) => submission.dispatchState)).toEqual([
+    'accepted'
+  ])
+  expect([...turns.values()]).toEqual(['running'])
+  expect(working).not.toContain(false)
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-queued-stop.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-queued-stop.test.ts
new file mode 100644
index 000000000000..e8b8d0f00442
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-queued-stop.test.ts
@@ -0,0 +1,196 @@
+// A follow-up Claude queued behind the running turn is dropped by Stop, so the chat must record it
+// as withdrawn and stop reading as working — under the SessionStart hook Orca installs, whose frame
+// proves the start before the turn's system/init says the CLI can cancel its queue.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/structured-agent-session-dispatch-rejection'
+import { activeStructuredAgentSessionTurnId } from '../../../shared/structured-agent-session-live-turn'
+import { projectStructuredAgentSessionStatus } from '../../../shared/structured-agent-session-projection'
+import { ClaudeStructuredSessionAdapter } from '../../claude/claude-structured-session-adapter'
+import {
+  fakeClaude,
+  PROVIDER_SESSION_ID
+} from '../../claude/claude-structured-session-test-support'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  hostTestAttachParams,
+  hostTestMessage,
+  hostTestOperationId,
+  resetHostTestOperationIds
+} from './structured-agent-session-host-test-data'
+
+const CALLER = { callerKey: 'client-1' }
+// As Claude Code 2.1.280 advertises them on a turn's system/init frame.
+const CAPABILITIES = ['interrupt_receipt_v1', 'interrupt_cancel_queued_v1', 'msg_lifecycle_v1']
+
+let root: string
+let host: StructuredAgentSessionHost
+let adapter: ClaudeStructuredSessionAdapter
+let store: AgentSessionRecordStore
+let queued: string[]
+let claude: ReturnType<typeof fakeClaude>
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-claude-queued-stop-'))
+  resetHostTestOperationIds()
+  queued = []
+  claude = fakeClaude({
+    replayUuid: null,
+    initProof: 'session-start',
+    // What the real CLI answers: cancel_queued cancels the queue, a plain interrupt keeps it.
+    routes: {
+      interrupt: (params) =>
+        params?.cancelQueued
+          ? { still_queued: [], cancelled: queued.splice(0) }
+          : { still_queued: [...queued] }
+    }
+  })
+  const lifecycle: Promise<void>[] = []
+  adapter = new ClaudeStructuredSessionAdapter({
+    resolveLaunch: async () => ({
+      pathToClaudeCodeExecutable: 'claude',
+      options: {},
+      cwd: root,
+      claudeConfigDir: join(root, 'claude-home'),
+      providerSessionId: PROVIDER_SESSION_ID,
+      resumeLeafUuid: null,
+      resumesTranscript: false,
+      continuesChain: false
+    }),
+    onEvent: (event) => {
+      const mapped = structuredClaudeLifecycleEvent(event)
+      if (mapped) {
+        lifecycle.push(host.handleAdapterEvent(mapped))
+      }
+    },
+    // As the runtime wires it.
+    onDispatchSettledLate: (settlement) => void host.settleLateDispatch(settlement),
+    openConnection: claude.openConnection,
+    readProcessStartTime: async () => 1_700_000_000_000,
+    now: () => NOW
+  })
+  store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
+  host = new StructuredAgentSessionHost({
+    store,
+    adapter: Object.assign(adapter, { supportsCreate: () => true }),
+    journalRoot: root,
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => 'spawn-a',
+    now: () => NOW
+  })
+  const params = hostTestAttachParams(null, {
+    provider: 'claude',
+    agent: 'claude',
+    accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: join(root, 'claude-home') },
+    providerHandle: { kind: 'claude', sessionId: PROVIDER_SESSION_ID, leafUuid: null }
+  })
+  expect(await host.attach(CALLER, params)).toMatchObject({ ok: true })
+  await adapter.awaitStarted(SESSION)
+  await Promise.all(lifecycle)
+})
+
+afterEach(async () => {
+  await adapter.closeAll()
+  await host.flushAllStreamedEvents()
+  await rm(root, { recursive: true, force: true })
+})
+
+function eventually(assertion: () => unknown): Promise<unknown> {
+  return vi.waitFor(assertion, { timeout: 10_000 })
+}
+
+function envelope(
+  method: 'agentSession.send' | 'agentSession.cancel',
+  fields: Record<string, unknown>
+) {
+  return {
+    sessionId: SESSION,
+    clientOperationId: hostTestOperationId(),
+    expectedRuntimeFence: store.getRecord(SESSION)!.lease.runtimeFence,
+    payloadFingerprint: computeAgentSessionPayloadFingerprint({
+      method,
+      sessionId: SESSION,
+      fields
+    })
+  }
+}
+
+async function send(text: string): Promise<string> {
+  const body = hostTestMessage(text)
+  const sent = await host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
+  if (!sent.ok) {
+    throw new Error('send refused')
+  }
+  return sent.value.clientMessageId
+}
+
+async function dispatch(clientMessageId: string) {
+  const submission = (await host.journalSnapshot(SESSION)).submissions.find(
+    (entry) => entry.clientMessageId === clientMessageId
+  )
+  return { state: submission?.dispatchState, reason: submission?.reason }
+}
+
+async function status(): Promise<string> {
+  const snapshot = await host.journalSnapshot(SESSION)
+  return projectStructuredAgentSessionStatus(
+    snapshot.items,
+    snapshot.submissions,
+    store.getRecord(SESSION)!.lease.runtimeFence
+  )
+}
+
+it('withdraws a follow-up Claude queued behind the running turn when that turn is stopped', async () => {
+  const connection = claude.connections[0]!
+  const first = await send('Write a long reply.')
+  await eventually(() => expect(connection.sent).toHaveLength(1))
+  // Claude opens the turn: its system/init, then the echo of the message it runs.
+  connection.handlers.onMessage?.({
+    type: 'system',
+    subtype: 'init',
+    session_id: PROVIDER_SESSION_ID,
+    uuid: 'turn-init',
+    model: 'claude-sonnet-5',
+    capabilities: CAPABILITIES
+  })
+  connection.handlers.onMessage?.({
+    ...connection.sent.at(-1)!,
+    uuid: connection.sent.at(-1)!.uuid
+  })
+  await eventually(async () => expect((await dispatch(first)).state).toBe('accepted'))
+  const turnId = activeStructuredAgentSessionTurnId((await host.journalSnapshot(SESSION)).items)
+  expect(turnId).not.toBeNull()
+
+  const followUp = await send('And then this.')
+  await eventually(() => expect(connection.sent).toHaveLength(2))
+  queued.push(String(connection.sent.at(-1)!.uuid))
+  await eventually(async () => expect((await dispatch(followUp)).state).toBe('pending'))
+
+  const stopped = await host.cancel(CALLER, {
+    envelope: envelope('agentSession.cancel', { turnId }),
+    turnId: turnId!
+  })
+  expect(stopped).toMatchObject({ ok: true, value: { cancelled: true } })
+  // The interrupted turn closes as the CLI ends it.
+  connection.handlers.onMessage?.({
+    type: 'result',
+    subtype: 'error_during_execution',
+    session_id: PROVIDER_SESSION_ID,
+    uuid: 'interrupted-result'
+  })
+  await eventually(async () =>
+    expect(await dispatch(followUp)).toEqual({
+      state: 'rejected',
+      reason: DISPATCH_REJECTED_CANCELLED
+    })
+  )
+  await eventually(async () => expect(await status()).toBe('idle'))
+}, 15_000)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-root-exit.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-root-exit.test.ts
index a73e46b898e7..4a8f0a1440f9 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-root-exit.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-root-exit.test.ts
@@ -11,7 +11,7 @@ import {
 import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import { createTrackedJournalOpener } from '../agent-session-journal/journal-store-test-open'
 import type { AgentSessionAttachParams } from './structured-agent-session-attach'
-import { evictHeldStructuredAgentSession } from './structured-agent-session-host-lifetime'
+import { stopStructuredAgentSessionAgentUnderSerialize } from './structured-agent-session-host-lifetime'
 import { StructuredAgentSessionHostRuntimeState } from './structured-agent-session-host-runtime-state'
 import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
 
@@ -24,7 +24,7 @@ afterEach(async () => {
   await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })))
 })
 
-describe('Claude root-exit eviction', () => {
+describe('Claude root-exit stop', () => {
   it('releases a captured live claim after the provider root exits', async () => {
     const root = await mkdtemp(join(tmpdir(), 'orca-claude-root-exit-'))
     roots.push(root)
@@ -78,6 +78,7 @@ describe('Claude root-exit eviction', () => {
       journalDir: join(root, 'journal')
     })
     const close = vi.spyOn(journal, 'close')
+    const publishStatus = vi.fn()
     const params: AgentSessionAttachParams = {
       envelope: {
         sessionId: 'session-1',
@@ -103,10 +104,11 @@ describe('Claude root-exit eviction', () => {
         {
           journal,
           params,
-          fence,
-          hasProviderChild: true,
-          providerChildPhase: 'ready',
-          acquisitionGeneration: acquisition.acquisitionGeneration ?? null
+          child: {
+            generation: acquisition.acquisitionGeneration ?? null,
+            fence,
+            phase: 'ready'
+          }
         }
       ]
     ])
@@ -115,13 +117,13 @@ describe('Claude root-exit eviction', () => {
 
     claude.connections[0]!.handlers.onExit?.(new Error('provider exited'))
     await expect(
-      evictHeldStructuredAgentSession(
+      stopStructuredAgentSessionAgentUnderSerialize(
         {
           deps,
           runtimeState,
           sessions,
           now: () => NOW + 30 * 60_000,
-          forgetStatus: vi.fn()
+          publishStatus
         },
         'session-1'
       )
@@ -132,8 +134,10 @@ describe('Claude root-exit eviction', () => {
       ownerProcess: null,
       deathEvidence: { kind: 'exit-observed' }
     })
-    expect(sessions.size).toBe(0)
-    expect(close).toHaveBeenCalledOnce()
+    // The agent went to rest; the conversation stays open and listed.
+    expect(sessions.get('session-1')?.child).toBeNull()
+    expect(close).not.toHaveBeenCalled()
+    expect(publishStatus).toHaveBeenCalledWith('session-1')
     // The adapter agrees the session is over: nothing is left to refuse the next start.
     await expect(adapter.closeSession('session-1')).resolves.toBe(true)
   })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-client-delivery.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-client-delivery.ts
index aa3f298a0778..f5c7fb825f3d 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-client-delivery.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-client-delivery.ts
@@ -1,3 +1,4 @@
+import { AgentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import type { AgentChildWorkEvidence } from '../../../shared/agent-status-child-work-evidence'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { AgentSessionSubscribers } from './structured-agent-session-subscribers'
@@ -28,10 +29,20 @@ export class StructuredAgentSessionClientDelivery {
     private readonly sessions: Map<string, StructuredAgentSessionHostSession>,
     now: () => number,
     deps: () => StructuredAgentSessionHostDeps,
-    private readonly onJournalActivity?: (sessionId: string) => void
+    private readonly onJournalActivity?: (sessionId: string) => void,
+    onAgentStarted?: (sessionId: string) => void
   ) {
-    this.statusFeed = createStructuredAgentSessionHostStatusFeed({ sessions, now, deps })
-    this.turnCompletionFeed = new StructuredAgentSessionTurnCompletionFeed({ sessions, now })
+    this.statusFeed = createStructuredAgentSessionHostStatusFeed({
+      sessions,
+      now,
+      deps,
+      ...(onAgentStarted ? { onAgentStarted } : {})
+    })
+    this.turnCompletionFeed = new StructuredAgentSessionTurnCompletionFeed({
+      sessions,
+      now,
+      readStatusState: (sessionId, journal) => this.statusFeed.statusState(sessionId, journal)
+    })
     this.sendSettlement = new StructuredAgentSessionSendSettlement((sessionId) =>
       this.requireJournal(sessionId)
     )
@@ -66,10 +77,16 @@ export class StructuredAgentSessionClientDelivery {
     subscriber: StructuredAgentSessionTurnCompletionSubscriber
   ): (() => void) => this.turnCompletionFeed.subscribe(subscriber)
 
-  closeSession(sessionId: string): void {
+  /** The conversation's handle closed. Its status row stays in every session list; the
+   *  agent-status store keeps it too while the chat still has a tab to show it in. */
+  closeSession(sessionId: string, options: { listed: boolean }): void {
     this.sendSettlement.closeSession(sessionId)
-    this.statusFeed.close(sessionId)
-    // The next attach re-baselines rather than announcing the turn it was already holding.
+    if (options.listed) {
+      this.statusFeed.revokeLive(sessionId)
+    } else {
+      this.statusFeed.close(sessionId)
+    }
+    // The next open re-baselines rather than announcing the turn it was already holding.
     this.turnCompletionFeed.forget(sessionId)
   }
 
@@ -81,7 +98,8 @@ export class StructuredAgentSessionClientDelivery {
     this.statusFeed.publish(sessionId, journal)
     this.sendSettlement.publish(sessionId, journal)
     // Derived here rather than per-subscriber: this edge runs whether or not anyone is
-    // subscribed, which is the whole reason a backgrounded chat can complete at all.
+    // subscribed, which is the whole reason a backgrounded chat can complete at all. After the
+    // status publish, so it reads the projection that publish cached.
     this.turnCompletionFeed.observe(sessionId, journal)
     this.onJournalActivity?.(sessionId)
   }
@@ -89,7 +107,7 @@ export class StructuredAgentSessionClientDelivery {
   private requireJournal(sessionId: string): AgentSessionJournal {
     const journal = this.sessions.get(sessionId)?.journal
     if (!journal) {
-      throw new Error(AGENT_SESSION_NOT_ATTACHED.code)
+      throw new AgentSessionRefusalError(AGENT_SESSION_NOT_ATTACHED)
     }
     return journal
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-close-retry.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-close-retry.test.ts
index b9e8f8e506d7..f5410de74f62 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-close-retry.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-close-retry.test.ts
@@ -78,10 +78,7 @@ function hostSession(journal: AgentSessionJournal): StructuredAgentSessionHostSe
   return {
     journal,
     params: {} as StructuredAgentSessionHostSession['params'],
-    fence: 1,
-    hasProviderChild: false,
-    providerChildPhase: 'ready',
-    acquisitionGeneration: null
+    child: null
   }
 }
 
@@ -138,7 +135,7 @@ function attachContext(
     reconcileLeases: async () => null,
     serialize: <T>(_sessionId: string, task: () => Promise<T>) => task(),
     now: () => 1,
-    forgetStatus: () => undefined
+    publishStatus: () => undefined
   } as unknown as StructuredAgentSessionAttachContext
 }
 
@@ -178,40 +175,34 @@ describe('the registry', () => {
 })
 
 describe('the attach orchestration', () => {
-  it('ABORTS the map replacement when the previous journal will not close', async () => {
-    const previousDir = join(root, 'previous')
-    const provisionalDir = join(root, 'provisional')
-    const previous = flakyClose(
-      await journals.open({ identity: IDENTITY, journalDir: previousDir }),
-      1
-    )
-    const provisional = await journals.open({
-      identity: IDENTITY,
-      journalDir: provisionalDir
-    })
-    attachFlow.journal = provisional
-    const sessions = new Map([[SESSION, hostSession(previous)]])
+  // The attach adopts the conversation's one open journal; it never opens a second handle, so
+  // there is no replacement to abort and no provisional journal to close.
+  it('keeps the journal it adopted indexed and open when an attach succeeds', async () => {
+    const directory = join(root, 'adopted')
+    const journal = await journals.open({ identity: IDENTITY, journalDir: directory })
+    attachFlow.journal = journal
+    const sessions = new Map([[SESSION, hostSession(journal)]])
 
-    await expect(
-      attachStructuredAgentSession(attachContext(sessions), 'caller-1', attachParams)
-    ).rejects.toThrow('close rejected')
+    await attachStructuredAgentSession(attachContext(sessions), 'caller-1', attachParams)
 
-    // The live entry is UNTOUCHED: overwriting it would have left its handle
-    // open with nothing able to reach it again.
-    expect(sessions.get(SESSION)?.journal).toBe(previous)
-    // And the provisional journal is owned by the registry, not orphaned.
+    expect(sessions.get(SESSION)?.journal).toBe(journal)
+    await expect(
+      journal.appendItem(
+        { provider: 'orca', clientMessageId: 'after-attach' },
+        {
+          kind: 'status',
+          text: 'still writable'
+        }
+      )
+    ).resolves.toBeDefined()
     expect(agentSessionJournalCloseRetries.pendingDirectories).toEqual([])
-    await expectNothingHoldsTheDirectory(provisionalDir)
   })
 
-  it('retains the provisional journal when its own close rejects on the barrier path', async () => {
-    const provisionalDir = join(root, 'provisional-barrier')
-    const provisional = flakyClose(
-      await journals.open({ identity: IDENTITY, journalDir: provisionalDir }),
-      1
-    )
-    attachFlow.journal = provisional
-    const sessions = new Map<string, StructuredAgentSessionHostSession>()
+  it('leaves the conversation indexed and open when the sink barrier fails', async () => {
+    const directory = join(root, 'adopted-barrier')
+    const journal = await journals.open({ identity: IDENTITY, journalDir: directory })
+    attachFlow.journal = journal
+    const sessions = new Map([[SESSION, hostSession(journal)]])
     const context = attachContext(sessions)
     const failing = {
       sink: {},
@@ -229,9 +220,19 @@ describe('the attach orchestration', () => {
       'sink barrier failed'
     )
 
-    expect(sessions.size).toBe(0)
-    // Retained rather than dropped, so teardown can still release the handle.
-    expect(agentSessionJournalCloseRetries.pendingDirectories).toEqual([provisionalDir])
+    // A failed attach does not end the conversation: its queued messages and the failure row
+    // are written into this same journal.
+    expect(sessions.get(SESSION)?.journal).toBe(journal)
+    await expect(
+      journal.appendItem(
+        { provider: 'orca', clientMessageId: 'after-failure' },
+        {
+          kind: 'status',
+          text: 'still writable'
+        }
+      )
+    ).resolves.toBeDefined()
+    expect(agentSessionJournalCloseRetries.pendingDirectories).toEqual([])
   })
 })
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-close.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-close.test.ts
new file mode 100644
index 000000000000..bf3cd1f96a60
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-close.test.ts
@@ -0,0 +1,326 @@
+// Stopping an agent and closing its conversation's handle are two things, and a reader, a session
+// list and a send each see only the one that happened. Ticks are driven by hand.
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import type { AgentSessionStatusSummary } from '../../../shared/agent-session-wire'
+import { readStructuredSessionGateFacts } from '../../runtime/orchestration/structured-mailbox-pointer-host'
+import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
+import { setStructuredAgentSessionHost } from './structured-agent-session-registry'
+import {
+  collectSubscriber,
+  createRestTestRig,
+  foundRestTestChat,
+  IDLE_MS,
+  readerSaw,
+  REST_TEST_CALLER as CALLER,
+  REST_TEST_SESSION as SESSION,
+  restTestSend,
+  sweepOnce,
+  type RestTestRig
+} from './structured-agent-session-rest-test-rig'
+import { StructuredAgentSessionIdleSweep } from './structured-agent-session-idle-sweep'
+import { hostTestAttachParams } from './structured-agent-session-host-test-data'
+
+let rig: RestTestRig
+
+const COLD_START = { timeout: 10_000 }
+
+beforeEach(async () => {
+  rig = await createRestTestRig({ idleSweep: { intervalMs: 3_600_000 } })
+  setStructuredAgentSessionHost(rig.host)
+})
+
+afterEach(async () => {
+  setStructuredAgentSessionHost(null)
+  await rig.dispose()
+})
+
+function fence(): number {
+  return rig.store.getRecord(SESSION)?.lease.runtimeFence ?? 1
+}
+
+function openSession(): StructuredAgentSessionHostSession | undefined {
+  return rig.host.collaboratorsForTests().sessions.get(SESSION)
+}
+
+function statusRows(): AgentSessionStatusSummary[] {
+  return rig.statusEvents
+    .flatMap((event) => (event.type === 'status' ? [event.session] : []))
+    .filter((summary) => summary.sessionId === SESSION)
+}
+
+describe('a stop that fails', () => {
+  it('is retried on the next tick (P2-11 a)', async () => {
+    await foundRestTestChat(rig)
+    rig.adapter.closeSession.mockResolvedValueOnce(false)
+    rig.clock.now += IDLE_MS + 1
+
+    await sweepOnce(rig.host)
+    expect(openSession()?.owesProviderChildWindDown).toMatchObject({
+      generation: expect.any(String)
+    })
+    await sweepOnce(rig.host)
+
+    expect(rig.adapter.closeSession).toHaveBeenCalledTimes(2)
+    expect(rig.store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
+    expect(statusRows().at(-1)?.hostExecutionOwned).toBeUndefined()
+  })
+
+  it('finishes its wind-down on the next tick, whatever its own writes did to the clock (P2-11 b)', async () => {
+    await foundRestTestChat(rig)
+    rig.clock.now += IDLE_MS + 1
+    // The child is proven gone and its work settled, then handing the lease back fails.
+    const transition = vi
+      .spyOn(rig.store, 'transitionHandoff')
+      .mockRejectedValueOnce(new Error('store unavailable'))
+
+    await sweepOnce(rig.host)
+    expect(transition).toHaveBeenCalledOnce()
+    expect(rig.store.getRecord(SESSION)?.lease.claimStatus).toBe('live')
+    // Five minutes later, not thirty.
+    rig.clock.now += 5 * 60_000
+    await sweepOnce(rig.host)
+
+    expect(rig.store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
+    expect(rig.adapter.closeSession).toHaveBeenCalledOnce()
+  })
+})
+
+describe('closing the handle', () => {
+  it('keeps a tabbed chat listed and its reader open, and a send reopens it for that reader (P2-14)', async () => {
+    await foundRestTestChat(rig)
+    const reader = collectSubscriber()
+    await rig.host.subscribe({ id: 'reader', sessionId: SESSION, emit: reader.emit })
+    rig.clock.now += IDLE_MS + 1
+
+    await sweepOnce(rig.host)
+    expect(rig.host.hasSession(SESSION)).toBe(false)
+    // The row stays in the agent-status store, idle and no longer running here, and a session
+    // list that connects now still gets it.
+    expect(rig.sink.forget).not.toHaveBeenCalled()
+    expect(rig.sink.publish.mock.calls.at(-1)?.[0]).toMatchObject({ sessionId: SESSION })
+    expect(statusRows().at(-1)?.hostExecutionOwned).toBeUndefined()
+    const late: { type: string; sessions?: AgentSessionStatusSummary[] }[] = []
+    rig.host.subscribeStatus({ id: 'late', emit: (event) => late.push(event) })
+    expect(late[0]?.sessions?.map((summary) => summary.sessionId)).toContain(SESSION)
+    expect(reader.events.some((event) => event.type === 'end')).toBe(false)
+
+    const sent = await rig.host.send(CALLER, restTestSend('after the close', fence()))
+    expect(sent.ok).toBe(true)
+    // A cold start: reopen, reconcile and acquire.
+    await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledTimes(2), COLD_START)
+    // The reader opened on the first handle is fed by the second.
+    await vi.waitFor(() => expect(readerSaw(reader.events).texts).toContain('after the close'))
+  })
+
+  it('drops the agent-status row of a chat whose tab is gone (P2-14, retired)', async () => {
+    await foundRestTestChat(rig)
+    await rig.store.setSessionTabVisibility(SESSION, false)
+    rig.clock.now += IDLE_MS + 1
+
+    await sweepOnce(rig.host)
+    expect(rig.host.hasSession(SESSION)).toBe(false)
+    expect(rig.sink.forget).toHaveBeenCalled()
+  })
+
+  it('forgets the row of a resting chat once its tab closes (P2-32)', async () => {
+    await foundRestTestChat(rig)
+    rig.clock.now += IDLE_MS + 1
+    await sweepOnce(rig.host)
+    expect(rig.sink.forget).not.toHaveBeenCalled()
+
+    await rig.host.setSessionTabVisibility(SESSION, false)
+    expect(rig.sink.forget).toHaveBeenCalled()
+  })
+
+  it('keeps the row when a chat with an open tab is evicted, and forgets it once the tab closes', async () => {
+    await foundRestTestChat(rig)
+
+    await rig.host.close(SESSION)
+    expect(rig.adapter.closeSession).toHaveBeenCalledWith(SESSION)
+    // The stop says not-running; the row belongs to the tab, so nothing forgets it.
+    expect(rig.sink.forget).not.toHaveBeenCalled()
+    expect(rig.sink.publish.mock.calls.at(-1)?.[0]).toMatchObject({ sessionId: SESSION })
+    expect(rig.sink.publish.mock.calls.at(-1)?.[0].hostExecutionOwned).toBeUndefined()
+
+    await rig.host.setSessionTabVisibility(SESSION, false)
+    expect(rig.sink.forget).toHaveBeenCalledOnce()
+  })
+
+  it('never hands a reader a handle it is closing (P2-25)', async () => {
+    await foundRestTestChat(rig)
+    const journal = openSession()?.journal
+    if (!journal) {
+      throw new Error('the conversation should be open')
+    }
+    const closing = Promise.withResolvers<void>()
+    const gate = Promise.withResolvers<void>()
+    const close = journal.close.bind(journal)
+    vi.spyOn(journal, 'close').mockImplementation(async () => {
+      await close()
+      closing.resolve()
+      await gate.promise
+    })
+    rig.clock.now += IDLE_MS + 1
+    const tick = sweepOnce(rig.host)
+    await closing.promise
+
+    const history = rig.host.history({ sessionId: SESSION, direction: 'tail' })
+    const facts = readStructuredSessionGateFacts(SESSION)
+    gate.resolve()
+    await tick
+
+    const page = await history
+    expect(page.ok && page.page.items.length).toBeGreaterThan(0)
+    await expect(facts).resolves.not.toBeNull()
+    // And the handle a write finds is a live one.
+    const sent = await rig.host.send(CALLER, restTestSend('after the close', fence()))
+    expect(sent.ok).toBe(true)
+    // A cold start: reopen, reconcile and acquire.
+    await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledTimes(2), COLD_START)
+  })
+
+  it('never re-enters the session lock: a send and a Stop right after still finish (P2-28)', async () => {
+    await foundRestTestChat(rig)
+    rig.clock.now += IDLE_MS + 1
+    const tick = sweepOnce(rig.host)
+    const within = <T>(work: Promise<T>) =>
+      Promise.race([
+        work,
+        new Promise<never>((_, reject) => setTimeout(() => reject(new Error('wedged')), 2_000))
+      ])
+    const sent = within(rig.host.send(CALLER, restTestSend('right after', fence())))
+
+    await within(tick)
+    expect(await sent).toMatchObject({ ok: true })
+    await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledTimes(2))
+    await expect(within(sweepOnce(rig.host))).resolves.toBeUndefined()
+  })
+})
+
+describe('the sweep and the lease (P2-20)', () => {
+  it('reads only open conversations and never probes or resolves a lease', async () => {
+    await foundRestTestChat(rig)
+    const probeOwner = vi.fn(async () => ({ outcome: 'pid-absent' as const }))
+    await rig.restart({ probeOwner })
+    setStructuredAgentSessionHost(rig.host)
+    await rig.store.transitionHandoff(SESSION, (current) => ({
+      ...current,
+      lease: { ...current.lease, handoffStage: 'recovering' }
+    }))
+    const resolveRecovery = vi.spyOn(
+      rig.host.collaboratorsForTests().runtimeState,
+      'resolveRecovery'
+    )
+    // Open, at rest, on a lease still recovering.
+    await rig.host.journalSnapshot(SESSION)
+    expect(rig.host.hasSession(SESSION)).toBe(true)
+    rig.clock.now += IDLE_MS + 1
+
+    await sweepOnce(rig.host)
+    expect(rig.host.hasSession(SESSION)).toBe(false)
+    expect(probeOwner).not.toHaveBeenCalled()
+    expect(resolveRecovery).not.toHaveBeenCalled()
+  })
+})
+
+describe('a start that never finishes (P2-15)', () => {
+  it('is stopped by the sweep, and the delivery loop alone writes its one row and rejection', async () => {
+    const stopReason = 'Codex never finished starting, so Orca stopped it.'
+    const order: string[] = []
+    const started = Promise.withResolvers<void>()
+    rig.adapter.closeSession.mockImplementation(async () => {
+      order.push('stopped')
+      started.resolve()
+      return true
+    })
+    const spawn = rig.adapter.acquire.getMockImplementation()!
+    rig.adapter.acquire.mockImplementationOnce(async (input) => ({
+      ...(await spawn(input)),
+      providerChildPhase: 'starting' as const
+    }))
+    Object.assign(rig.host.deps.adapter, { awaitStarted: () => started.promise })
+    const reject = AgentSessionJournal.prototype.rejectQueuedSubmissions
+    vi.spyOn(AgentSessionJournal.prototype, 'rejectQueuedSubmissions').mockImplementation(function (
+      this: AgentSessionJournal,
+      ...args
+    ) {
+      // Not the open's sweep of an earlier process's leftovers.
+      if (args[1].rejection.kind !== 'hostRestarted') {
+        order.push(`rejected: ${args[1].reason}`)
+      }
+      return reject.apply(this, args)
+    })
+    const reader = collectSubscriber()
+    const attached = await rig.host.attach(CALLER, hostTestAttachParams(null))
+    expect(attached.ok).toBe(true)
+    await rig.host.subscribe({ id: 'reader', sessionId: SESSION, emit: reader.emit })
+    const sent = await rig.host.send(CALLER, restTestSend('stuck behind the start', fence()))
+    expect(sent.ok).toBe(true)
+    rig.clock.now += IDLE_MS + 1
+
+    await sweepOnce(rig.host)
+    expect(rig.adapter.closeSession).toHaveBeenCalledWith(SESSION)
+    await vi.waitFor(() =>
+      expect(readerSaw(reader.events).submissions).toContainEqual(
+        expect.objectContaining({ dispatchState: 'rejected', reason: stopReason })
+      )
+    )
+    // One rejection, written after the stop by the loop, with the stop's own words.
+    expect(order).toEqual(['stopped', `rejected: ${stopReason}`])
+    const errorRows = reader.events.flatMap((event) =>
+      event.type === 'batch'
+        ? event.batch.items.filter(
+            (item) => item.body.kind === 'status' && item.body.tone === 'error'
+          )
+        : []
+    )
+    expect(errorRows.map((item) => (item.body.kind === 'status' ? item.body.text : null))).toEqual([
+      stopReason
+    ])
+    expect(rig.adapter.dispatch).not.toHaveBeenCalled()
+
+    const again = await rig.host.send(CALLER, restTestSend('try again', fence()))
+    expect(again.ok).toBe(true)
+    await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledOnce(), COLD_START)
+    await expect(sweepOnce(rig.host)).resolves.toBeUndefined()
+  })
+})
+
+describe('the wind-down retry with a message queued (P2-31)', () => {
+  it('waits for the delivery rather than rejecting a message accepted after the failed stop', async () => {
+    const queued = { clientMessageId: 'm', dispatchState: 'pending', handoverRecorded: true }
+    const session = {
+      journal: {
+        submissions: () => [queued],
+        pendingSubmissions: () => [queued],
+        snapshot: () => ({ items: [] })
+      },
+      child: null,
+      owesProviderChildWindDown: { generation: 'generation-1', fence: 1 }
+    }
+    const stopAgent = vi.fn(async () => undefined)
+    const sweep = new StructuredAgentSessionIdleSweep({
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a session fixture carrying only the journal and child facts the sweep reads.
+      sessions: Object.assign(new Map([[SESSION, session as never]]), {
+        lastActivityAt: () => 0,
+        touch: () => undefined
+      }),
+      serialize: (_id, task) => task(),
+      now: () => IDLE_MS + 1,
+      isDisposed: () => false,
+      deliveryActive: () => true,
+      backgroundTaskState: () => undefined,
+      hasOpenDispatch: () => false,
+      stopAgent,
+      stopStartingAgent: stopAgent,
+      closeConversation: vi.fn(async () => false),
+      onError: (_id, error) => {
+        throw error
+      }
+    })
+    await sweep.tick()
+    expect(stopAgent).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
new file mode 100644
index 000000000000..0fbd1a0a233c
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
@@ -0,0 +1,148 @@
+// How a conversation is reached, closed and swept — the host's lifetime rules in one place.
+//
+// A conversation is reached only through `conversation`, which opens it at rest and starts no
+// agent. It closes when its tab closes or the idle sweep finds its handle is only a cache. Every
+// public entry point here takes the session's serialize once and calls the under-serialize forms,
+// because the queue is not reentrant.
+
+import {
+  AgentSessionRefusalError,
+  agentSessionRefusalError
+} from '../../../shared/agent-session-wire-refusals'
+import { createJournalOpenReadRefusals } from '../agent-session-journal/journal-open-failure'
+import type { StructuredAgentSessionConversations } from './structured-agent-session-conversations'
+import {
+  abandonQueuedStructuredAgentSessionMessages,
+  closeStructuredAgentSessionConversationUnderSerialize,
+  stopStructuredAgentSessionAgentUnderSerialize,
+  type StructuredAgentSessionLifetimeContext
+} from './structured-agent-session-host-lifetime'
+import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
+import { StructuredAgentSessionIdleSweep } from './structured-agent-session-idle-sweep'
+import { AGENT_SESSION_NOT_ATTACHED } from './structured-agent-session-mutation-admission'
+import { adapterSupportsRecord } from './structured-agent-session-provider-support'
+
+export type StructuredAgentSessionConversationLifetime = ReturnType<
+  typeof createStructuredAgentSessionConversationLifetime
+>
+
+export function createStructuredAgentSessionConversationLifetime(host: {
+  /** Resolved per call: the host's collaborators are assigned after this is built. */
+  context: () => StructuredAgentSessionLifetimeContext
+  sessions: StructuredAgentSessionConversations
+  serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
+  /** PR 1's one open function, for a caller inside the session's serialize. */
+  open: (sessionId: string) => Promise<StructuredAgentSessionHostSession | null>
+  deliveryActive: (sessionId: string) => boolean
+  /** The handle closed: `listed` keeps the chat's row in the agent-status store for its tab. */
+  closeStatus: (sessionId: string, options: { listed: boolean }) => void
+}) {
+  let disposed = false
+  const { sessions, serialize } = host
+  const deps = () => host.context().deps
+  const readRefusals = createJournalOpenReadRefusals()
+  // The sweep's stop puts an idle agent to rest: nothing is queued, so no loop reads its cause.
+  const stopAgent = (sessionId: string) =>
+    stopStructuredAgentSessionAgentUnderSerialize(host.context(), sessionId)
+
+  const closeConversation = (sessionId: string): Promise<boolean> =>
+    closeStructuredAgentSessionConversationUnderSerialize(
+      {
+        sessions,
+        closeStatus: (id) => {
+          const tabs = deps().store.getVisibleSessionTabIndex()
+          // A legacy store cannot say, so the row stays; restart is the boundary that forgets.
+          host.closeStatus(id, { listed: !tabs.present || tabs.sessionIds.includes(id) })
+        }
+      },
+      sessionId
+    )
+
+  const idleSweep = new StructuredAgentSessionIdleSweep({
+    sessions,
+    serialize,
+    now: () => host.context().now(),
+    isDisposed: () => disposed,
+    deliveryActive: host.deliveryActive,
+    backgroundTaskState: (sessionId) => deps().adapter.backgroundTaskState?.(sessionId),
+    hasOpenDispatch: (sessionId) => {
+      const record = deps().store.getRecord(sessionId)
+      return record !== null && deps().hasOpenDispatch?.(record) === true
+    },
+    stopAgent,
+    // A host stop: the delivery loop waiting on this child writes the one error row and rejects
+    // what is queued with it, both worded from the hostStopped fact.
+    stopStartingAgent: (sessionId) =>
+      stopStructuredAgentSessionAgentUnderSerialize(host.context(), sessionId, {
+        cause: 'host-stop'
+      }),
+    closeConversation,
+    onError: (sessionId, error) => deps().onEventSinkError?.({ sessionId, error }),
+    ...deps().idleSweep
+  })
+
+  return {
+    idleSweep,
+    stopAgent,
+    /** Quit has begun: nothing opens a conversation or sweeps one after this. */
+    dispose: (): void => {
+      disposed = true
+      idleSweep.dispose()
+    },
+    /**
+     * The only way any code reaches a session. An open conversation answers without the lock, so
+     * a read never waits behind a start; a closed one is opened once, under it. Nothing here
+     * touches the lease or starts a child. Use the result before the next `await`: a close can
+     * drop it after.
+     */
+    conversation: async (sessionId: string): Promise<StructuredAgentSessionHostSession> => {
+      const open = sessions.get(sessionId)
+      if (open) {
+        readRefusals.forget(sessionId)
+        return open
+      }
+      const record = deps().store.getRecord(sessionId)
+      if (!record) {
+        throw agentSessionRefusalError('agent_session_identity_required', {
+          reason: 'recordMissing'
+        })
+      }
+      if (!adapterSupportsRecord(deps().adapter, record)) {
+        throw agentSessionRefusalError('structured_agent_session_unsupported', {
+          reason: 'hostUnsupported'
+        })
+      }
+      return serialize(sessionId, async () => {
+        // Read at the open itself: a read queued before quit began runs after it.
+        if (disposed) {
+          throw new AgentSessionRefusalError(AGENT_SESSION_NOT_ATTACHED)
+        }
+        const session = await host.open(sessionId).catch((error: unknown) => {
+          throw readRefusals.refusal(sessionId, error)
+        })
+        if (!session) {
+          throw agentSessionRefusalError('agent_session_identity_required', {
+            reason: 'recordMissing'
+          })
+        }
+        readRefusals.forget(sessionId)
+        return session
+      })
+    },
+    /** Ends a chat's resources, not the chat: its record and journal stay on disk, and what is
+     *  still queued will not be sent. */
+    close: (sessionId: string): Promise<void> =>
+      serialize(sessionId, async () => {
+        readRefusals.forget(sessionId)
+        const session = sessions.get(sessionId)
+        if (session) {
+          // Abandoned before the stop, so no start delivers it.
+          await abandonQueuedStructuredAgentSessionMessages(deps(), sessionId, session.journal)
+        }
+        await stopStructuredAgentSessionAgentUnderSerialize(host.context(), sessionId, {
+          cause: 'evict'
+        })
+        await closeConversation(sessionId)
+      })
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-open.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-open.ts
new file mode 100644
index 000000000000..dd8853954e3f
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-open.ts
@@ -0,0 +1,186 @@
+// The one way a conversation's journal becomes open on this host: for a send, for a reader, and
+// for an attach that finds none open.
+//
+// It opens with recovery, so an unusable journal is rebuilt rather than refused, and it marks what
+// an earlier host process handed over and left unanswered as in doubt, and settles what it left
+// running — the crash boundary. That
+// needs no lease: provider history decides such a row later, under a won lease, in the attach. A
+// row an earlier process accepted and never handed over is the delivery loop's, which the open
+// wakes. Nothing here starts a provider child.
+
+import type { AgentJournalResetReason } from '../../../shared/agent-session-journal-types'
+import { journalDirectoryFor } from '../agent-session-journal/journal-paths'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import { openAgentSessionJournalWithRecovery } from './agent-session-journal-recovery'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import type { AgentSessionRecord } from '../../../shared/agent-session-record'
+import {
+  attachFingerprintFields,
+  journalIdentityFor,
+  type AgentSessionAttachParams
+} from './structured-agent-session-attach'
+import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import { settleStaleStructuredAgentSessionState } from './structured-agent-session-dead-generation-settlement'
+import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation'
+import type {
+  StructuredAgentSessionHostDeps,
+  StructuredAgentSessionHostSession
+} from './structured-agent-session-host-types'
+
+export type OpenedStructuredAgentSessionConversation = {
+  session: StructuredAgentSessionHostSession
+  /** Set when the journal was rebuilt on the way; readers reload from a snapshot. */
+  reset: AgentJournalResetReason | null
+}
+
+export type StructuredAgentSessionConversationOpenDeps = {
+  store: Pick<AgentSessionRecordStore, 'getRecord'>
+  adapter: Pick<StructuredAgentSessionAdapter, 'historyFilePath'>
+  journalRoot: string
+  onEventSinkError?: StructuredAgentSessionHostDeps['onEventSinkError']
+}
+
+/** An acquisition's own open: its reserve cleared the record's death evidence, so it settles
+ *  what the gone generation left running itself, from what it read before. */
+export type StructuredAgentSessionConversationOpenOptions = { acquisition?: boolean }
+
+export type StructuredAgentSessionConversationOpenContext = {
+  deps: StructuredAgentSessionConversationOpenDeps
+  sessions: Map<string, StructuredAgentSessionHostSession>
+  /** Indexes a conversation that just became open; the host publishes it and wakes delivery. */
+  adoptOpened: (
+    sessionId: string,
+    opened: OpenedStructuredAgentSessionConversation
+  ) => Promise<void>
+}
+
+/** The open conversation, or null when this host has no record of it. For a caller inside the
+ *  session's serialize, which is what makes "not open yet" exact. */
+export async function openStructuredAgentSessionConversation(
+  context: StructuredAgentSessionConversationOpenContext,
+  sessionId: string,
+  options: StructuredAgentSessionConversationOpenOptions = {}
+): Promise<StructuredAgentSessionHostSession | null> {
+  const open = context.sessions.get(sessionId)
+  if (open) {
+    return open
+  }
+  const record = context.deps.store.getRecord(sessionId)
+  if (!record) {
+    return null
+  }
+  const opened = await openStructuredAgentSessionConversationJournal(context.deps, record, options)
+  await context.adoptOpened(sessionId, opened)
+  return opened.session
+}
+
+/** The open itself, indexed by nobody yet: the caller adopts the result. */
+export async function openStructuredAgentSessionConversationJournal(
+  deps: Omit<StructuredAgentSessionConversationOpenDeps, 'store'>,
+  record: AgentSessionRecord,
+  options: StructuredAgentSessionConversationOpenOptions = {}
+): Promise<OpenedStructuredAgentSessionConversation> {
+  const { sessionId } = record
+  const fence = record.lease.runtimeFence
+  const params = attachParamsForRecord(record, {
+    clientOperationId: `read-restore:${sessionId}`,
+    expectedRuntimeFence: fence
+  })
+  const identity = journalIdentityFor(record, params)
+  const opened = await openAgentSessionJournalWithRecovery({
+    identity,
+    journalDir: journalDirectoryFor(deps.journalRoot, {
+      workspaceId: record.location.workspaceId,
+      sessionId
+    }),
+    fence,
+    historyFilePath: (await deps.adapter.historyFilePath?.({ identity })) ?? null
+  })
+  try {
+    // A queued row found here is a leftover the delivery loop's first step rejects; a handed-over
+    // one is only doubt, which provider history decides under a won lease.
+    await opened.journal.markPendingSubmissionsUnknown(fence)
+  } catch (error) {
+    deps.onEventSinkError?.({ sessionId, error })
+  }
+  // No child in this process writes to a journal nobody had open, so whatever it shows running
+  // belongs to a generation that is gone, whatever the lease still claims. Settled before any
+  // reader or child sees it.
+  if (!options.acquisition) {
+    await settleGoneGeneration(deps, record, opened.journal)
+  }
+  return {
+    session: { journal: opened.journal, params, child: null },
+    reset: opened.recovery?.reset ?? null
+  }
+}
+
+/**
+ * The open's settle again, for a conversation already open: a proof of death written since it
+ * opened (the startup reconcile, a recovery) revises what the open could only call `unverifiable`.
+ * A record holds a proof only while released, so no child here is writing. A no-op once revised.
+ */
+export async function resettleOpenStructuredAgentSessionConversation(
+  deps: StructuredAgentSessionConversationOpenDeps,
+  sessionId: string,
+  session: StructuredAgentSessionHostSession | undefined
+): Promise<void> {
+  const record = deps.store.getRecord(sessionId)
+  if (session && record?.lease.deathEvidence) {
+    await settleGoneGeneration(deps, record, session.journal)
+  }
+}
+
+async function settleGoneGeneration(
+  deps: Pick<StructuredAgentSessionConversationOpenDeps, 'onEventSinkError'>,
+  record: AgentSessionRecord,
+  journal: AgentSessionJournal
+): Promise<void> {
+  try {
+    await settleStaleStructuredAgentSessionState({
+      journal,
+      sessionId: record.sessionId,
+      fence: record.lease.runtimeFence,
+      acquisitionGeneration: null,
+      deathEvidence: record.lease.deathEvidence ?? null,
+      failureTextContext: structuredAgentSessionFailureWordsContext(record)
+    })
+  } catch (error) {
+    // Best effort: the next open or acquire re-derives it.
+    deps.onEventSinkError?.({ sessionId: record.sessionId, error })
+  }
+}
+
+export function attachParamsForRecord(
+  record: AgentSessionRecord,
+  input: {
+    clientOperationId: string
+    expectedRuntimeFence: number
+  }
+): AgentSessionAttachParams {
+  const params: AgentSessionAttachParams = {
+    envelope: {
+      sessionId: record.sessionId,
+      clientOperationId: input.clientOperationId,
+      expectedRuntimeFence: input.expectedRuntimeFence,
+      payloadFingerprint: ''
+    },
+    location: record.location,
+    provider: record.provider,
+    agent: record.provider,
+    accountHome: record.accountHome,
+    runtimeKind: 'native'
+  }
+  return {
+    ...params,
+    envelope: {
+      ...params.envelope,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.attach',
+        sessionId: record.sessionId,
+        fields: attachFingerprintFields(params)
+      })
+    }
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-stop.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-stop.test.ts
new file mode 100644
index 000000000000..ab0368a6b921
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-stop.test.ts
@@ -0,0 +1,277 @@
+// A Stop that names no turn stops what the conversation has in flight: it withdraws what is
+// queued, and interrupts a handed-over message even before the provider has opened its turn —
+// the gap no client can name a turn for. Against the real host, store and journal.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types'
+import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/structured-agent-session-dispatch-rejection'
+import { CancelParams } from '../../../shared/rpc-contract/structured-agent-session-params'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
+  hostTestMessage,
+  hostTestOperationId,
+  resetHostTestOperationIds
+} from './structured-agent-session-host-test-data'
+
+const CALLER = { callerKey: 'client-1' }
+const ALREADY_FINISHED = 'The provider had already finished this turn.'
+
+let root: string
+let store: AgentSessionRecordStore
+let host: StructuredAgentSessionHost
+let dispatch: Mock<StructuredAgentSessionAdapter['dispatch']>
+let cancelTurn: Mock<StructuredAgentSessionAdapter['cancelTurn']>
+let awaitStarted: Mock<NonNullable<StructuredAgentSessionAdapter['awaitStarted']>>
+
+function eventually(assertion: () => void | Promise<void>): Promise<void> {
+  return vi.waitFor(assertion, { timeout: 10_000 })
+}
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-conversation-stop-'))
+  resetHostTestOperationIds()
+  // Admitted, not accepted: the message is written and its turn has not opened.
+  dispatch = vi.fn(async () => ({ state: 'admitted' as const }))
+  cancelTurn = vi.fn(async () => ({ cancelled: true }))
+  awaitStarted = vi.fn(async () => undefined)
+  store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
+  host = new StructuredAgentSessionHost({
+    store,
+    adapter: {
+      acquire: async ({ fence, spawnToken }) => ({
+        process: { hostId: 'local', pid: 4242, processStartTimeMs: 1_700_000_000_000, spawnToken },
+        acquisitionGeneration: 'generation-1',
+        link: {
+          linkId: `link-${fence}`,
+          handle: { provider: 'codex' as const, threadId: THREAD },
+          origin: 'created' as const,
+          mintedAtFence: fence,
+          observedAt: NOW
+        }
+      }),
+      dispatch,
+      awaitStarted,
+      closeSession: vi.fn(async () => true),
+      releaseAcquisition: vi.fn(async () => true),
+      cancelTurn,
+      answerPrompt: vi.fn(async () => undefined),
+      setOption: vi.fn(async () => undefined)
+    },
+    journalRoot: root,
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => 'spawn-1',
+    now: () => NOW
+  })
+  expect(await host.attach(CALLER, hostTestAttachParams(null))).toMatchObject({ ok: true })
+})
+
+afterEach(async () => {
+  await host.flushAllStreamedEvents()
+  await rm(root, { recursive: true, force: true })
+})
+
+function send(text: string) {
+  const body = hostTestMessage(text)
+  const clientOperationId = hostTestOperationId()
+  const result = host.send(CALLER, {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId,
+      expectedRuntimeFence: 1,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.send',
+        sessionId: SESSION,
+        fields: { body }
+      })
+    },
+    body
+  })
+  return { id: clientOperationId, result }
+}
+
+function stop(turnId?: string, clientOperationId = hostTestOperationId()) {
+  const fields = turnId === undefined ? {} : { turnId }
+  return host.cancel(CALLER, {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId,
+      expectedRuntimeFence: null,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.cancel',
+        sessionId: SESSION,
+        fields
+      })
+    },
+    ...fields
+  })
+}
+
+async function submission(id: string): Promise<AgentJournalSubmission | undefined> {
+  return (await host.journalSnapshot(SESSION)).submissions.find(
+    (entry) => entry.clientMessageId === id
+  )
+}
+
+async function statusRows(): Promise<string[]> {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.body.kind === 'status' ? [item.body.text] : []
+  )
+}
+
+describe('a Stop that names no turn', () => {
+  it('is a valid cancel, and only a plain Stop may omit the turn', () => {
+    const envelope = {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: 1,
+      payloadFingerprint: '0'.repeat(64)
+    }
+    expect(CancelParams.safeParse({ envelope }).success).toBe(true)
+    expect(
+      CancelParams.safeParse({ envelope, prompt: { itemId: 'item-1', expectedRevision: 1 } })
+        .success
+    ).toBe(false)
+    expect(CancelParams.safeParse({ envelope, scope: 'background-tasks' }).success).toBe(false)
+  })
+
+  it('interrupts a handed-over message before its turn opens, as a cancellation', async () => {
+    const { id, result } = send('hello')
+    await result
+    await eventually(async () => expect((await submission(id))?.handedOverAt).toBeDefined())
+    expect(
+      (await host.journalSnapshot(SESSION)).items.some((item) => item.body.kind === 'turn')
+    ).toBe(false)
+
+    const stopped = await stop()
+
+    expect(stopped).toEqual({
+      ok: true,
+      replayed: false,
+      fence: 1,
+      cursor: expect.anything(),
+      value: { cancelled: true }
+    })
+    expect(cancelTurn).toHaveBeenCalledTimes(1)
+    expect(cancelTurn.mock.calls[0]![0]).not.toHaveProperty('turnId')
+    expect(cancelTurn.mock.calls[0]![0]).toMatchObject({ sessionId: SESSION, fence: 1 })
+    expect(await statusRows()).toEqual(['Cancellation requested.'])
+  })
+
+  it('withdraws what is queued on a ready child and asks the provider for nothing more', async () => {
+    const started = Promise.withResolvers<undefined>()
+    awaitStarted.mockImplementationOnce(() => started.promise)
+    const { id, result } = send('hello')
+    await result
+    await eventually(() => expect(awaitStarted).toHaveBeenCalled())
+
+    expect(await stop()).toMatchObject({ ok: true, value: { cancelled: true } })
+    started.resolve(undefined)
+
+    expect(await submission(id)).toMatchObject({
+      dispatchState: 'rejected',
+      reason: DISPATCH_REJECTED_CANCELLED
+    })
+    expect(cancelTurn).not.toHaveBeenCalled()
+    await host.flushStreamedEvents(SESSION)
+    expect(dispatch).not.toHaveBeenCalled()
+    expect(await statusRows()).toEqual([])
+  })
+
+  it('withdraws a send still on its way in, which the host takes first', async () => {
+    const { id, result } = send('hello')
+    const stopped = stop()
+
+    expect(await result).toMatchObject({ ok: true })
+    expect(await stopped).toMatchObject({ ok: true, value: { cancelled: true } })
+    expect(await submission(id)).toMatchObject({
+      dispatchState: 'rejected',
+      reason: DISPATCH_REJECTED_CANCELLED
+    })
+    await host.flushStreamedEvents(SESSION)
+    expect(dispatch).not.toHaveBeenCalled()
+  })
+
+  it('says the agent did not stop, in its words, when it refused', async () => {
+    const { id, result } = send('hello')
+    await result
+    await eventually(async () => expect((await submission(id))?.handedOverAt).toBeDefined())
+    cancelTurn.mockResolvedValueOnce({
+      cancelled: false,
+      refusal: { detail: { text: 'no active turn to interrupt', audience: 'person' } }
+    })
+
+    expect(await stop()).toMatchObject({ ok: true, value: { cancelled: false } })
+
+    expect(cancelTurn).toHaveBeenCalledOnce()
+    expect(await statusRows()).toEqual(["Codex didn't stop: no active turn to interrupt."])
+  })
+
+  it('says the Stop is unconfirmed, not that nothing ran, when the provider took it', async () => {
+    const { id, result } = send('hello')
+    await result
+    await eventually(async () => expect((await submission(id))?.handedOverAt).toBeDefined())
+    cancelTurn.mockResolvedValueOnce({ cancelled: false, unconfirmed: true })
+
+    expect(await stop()).toMatchObject({ ok: true, value: { cancelled: false } })
+
+    expect(await statusRows()).toEqual(['Cancellation was not confirmed.'])
+  })
+
+  it('says the agent had no turn to stop when it had none', async () => {
+    const { id, result } = send('hello')
+    await result
+    await eventually(async () => expect((await submission(id))?.handedOverAt).toBeDefined())
+    cancelTurn.mockResolvedValueOnce({ cancelled: false })
+
+    expect(await stop()).toMatchObject({ ok: true, value: { cancelled: false } })
+
+    expect(await statusRows()).toEqual(['Codex had no turn running to stop.'])
+  })
+
+  it('stops nothing when it reuses the id of a Stop the host already ran', async () => {
+    const operationId = hostTestOperationId()
+    expect(await stop(undefined, operationId)).toMatchObject({ ok: true, replayed: false })
+    const { id, result } = send('hello')
+    await result
+    await eventually(async () => expect((await submission(id))?.handedOverAt).toBeDefined())
+
+    // Why the client never reuses a no-turn Stop's id: the same id is the same Stop.
+    expect(await stop(undefined, operationId)).toMatchObject({
+      ok: true,
+      replayed: true,
+      value: { cancelled: false }
+    })
+    expect(cancelTurn).not.toHaveBeenCalled()
+    expect(await stop()).toMatchObject({ ok: true, value: { cancelled: true } })
+    expect(cancelTurn).toHaveBeenCalledOnce()
+  })
+
+  it('is a quiet no-op with nothing in flight', async () => {
+    expect(await stop()).toMatchObject({ ok: true, value: { cancelled: false } })
+    expect(cancelTurn).not.toHaveBeenCalled()
+    expect(await statusRows()).toEqual([])
+  })
+})
+
+describe('a Stop that names its turn, as an older client sends it', () => {
+  it('reaches the provider with that turn and keeps its not-cancelled note', async () => {
+    cancelTurn.mockResolvedValueOnce({ cancelled: false })
+
+    expect(await stop('turn-1')).toMatchObject({
+      ok: true,
+      value: { turnId: 'turn-1', cancelled: false }
+    })
+    expect(cancelTurn).toHaveBeenCalledWith(expect.objectContaining({ turnId: 'turn-1' }))
+    expect(await statusRows()).toEqual([ALREADY_FINISHED])
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.test.ts
index 202ffe50ae4d..b294540990d9 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.test.ts
@@ -37,10 +37,7 @@ function session(journal: AgentSessionJournal) {
   return {
     journal,
     params: hostTestAttachParams(null),
-    fence: 0,
-    hasProviderChild: false,
-    providerChildPhase: 'ready' as const,
-    acquisitionGeneration: null
+    child: null
   }
 }
 
@@ -57,7 +54,8 @@ describe('a conversation delivers what its journal commits', () => {
     const deliver = vi.fn()
     const conversations = new StructuredAgentSessionConversations({
       deliver,
-      onDeliveryError: vi.fn()
+      onDeliveryError: vi.fn(),
+      now: () => 0
     })
     const journal = await openJournal('a')
     conversations.set('session-1', session(journal))
@@ -73,7 +71,11 @@ describe('a conversation delivers what its journal commits', () => {
     const deliver = vi.fn()
     // Collaborators hold the host's map as a plain `Map`; `set` still reaches the binding.
     const sessions: Map<string, StructuredAgentSessionHostSession> =
-      new StructuredAgentSessionConversations({ deliver, onDeliveryError: vi.fn() })
+      new StructuredAgentSessionConversations({
+        deliver,
+        onDeliveryError: vi.fn(),
+        now: () => 0
+      })
     const journal = await openJournal('a')
     sessions.set('session-1', session(journal))
 
@@ -86,7 +88,8 @@ describe('a conversation delivers what its journal commits', () => {
     const deliver = vi.fn()
     const conversations = new StructuredAgentSessionConversations({
       deliver,
-      onDeliveryError: vi.fn()
+      onDeliveryError: vi.fn(),
+      now: () => 0
     })
     const journal = await openJournal('a')
     conversations.set('session-1', session(journal))
@@ -100,7 +103,8 @@ describe('a conversation delivers what its journal commits', () => {
     const deliver = vi.fn()
     const conversations = new StructuredAgentSessionConversations({
       deliver,
-      onDeliveryError: vi.fn()
+      onDeliveryError: vi.fn(),
+      now: () => 0
     })
     const replaced = await openJournal('a')
     const current = await openJournal('b')
@@ -118,7 +122,8 @@ describe('a conversation delivers what its journal commits', () => {
     const deliver = vi.fn()
     const conversations = new StructuredAgentSessionConversations({
       deliver,
-      onDeliveryError: vi.fn()
+      onDeliveryError: vi.fn(),
+      now: () => 0
     })
     const journal = await openJournal('a')
     conversations.set('session-1', session(journal))
@@ -136,7 +141,8 @@ describe('a conversation delivers what its journal commits', () => {
       deliver: () => {
         throw failure
       },
-      onDeliveryError
+      onDeliveryError,
+      now: () => 0
     })
     const journal = await openJournal('a')
     conversations.set('session-1', session(journal))
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.ts
index 2f38ddf4da25..6fcaef07483a 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.ts
@@ -8,15 +8,21 @@ import type { StructuredAgentSessionHostSession } from './structured-agent-sessi
  *
  * Delivery runs a microtask after the commit, so a reader that throws cannot fail a write that is
  * already durable. A handle this map has since replaced or dropped delivers nothing.
+ *
+ * Each entry also carries when it last saw activity — its open, then every journal publish — which
+ * is the idle sweep's clock. In memory only, so it dies with the entry.
  */
 export class StructuredAgentSessionConversations extends Map<
   string,
   StructuredAgentSessionHostSession
 > {
+  private readonly activity = new Map<string, number>()
+
   constructor(
     private readonly delivery: {
       deliver: (sessionId: string, journal: AgentSessionJournal) => void
       onDeliveryError: (sessionId: string, error: unknown) => void
+      now: () => number
     }
   ) {
     super()
@@ -42,6 +48,22 @@ export class StructuredAgentSessionConversations extends Map<
         }
       })
     })
+    this.activity.set(sessionId, this.delivery.now())
     return super.set(sessionId, session)
   }
+
+  override delete(sessionId: string): boolean {
+    this.activity.delete(sessionId)
+    return super.delete(sessionId)
+  }
+
+  touch(sessionId: string): void {
+    if (this.has(sessionId)) {
+      this.activity.set(sessionId, this.delivery.now())
+    }
+  }
+
+  lastActivityAt(sessionId: string): number | undefined {
+    return this.activity.get(sessionId)
+  }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-crash-mid-start.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-crash-mid-start.test.ts
index 09a5aee05b7a..6e364ccb477b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-crash-mid-start.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-crash-mid-start.test.ts
@@ -146,7 +146,9 @@ describe('a host that dies while its Codex child is starting', () => {
       ownerProcess: null,
       deathEvidence: { kind: 'pid-absent' }
     })
-    await relaunched.hold(SESSION, 'desktop-chat:1')
+    // What the next send's delivery does: start at the record's current fence.
+    const fence = store.getRecord(SESSION)?.lease.runtimeFence ?? null
+    expect(await relaunched.attach(CALLER, hostTestAttachParams(fence))).toMatchObject({ ok: true })
     expect(restarted.connections).toHaveLength(1)
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
       claimStatus: 'live',
@@ -156,7 +158,7 @@ describe('a host that dies while its Codex child is starting', () => {
 })
 
 // The client keeps a create it never heard back from and retries it under the same operation id, so
-// that replay, not a fresh hold, is what the user's Retry and first send go through.
+// that replay, not a fresh start, is what the user's Retry and first send go through.
 describe('a create replayed after the host that ran it died', () => {
   const PAST_OPERATION_EXPIRY =
     AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS + AGENT_SESSION_OPERATION_FUTURE_SKEW_MS + 60_000
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-crash-turn-end.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-crash-turn-end.test.ts
new file mode 100644
index 000000000000..0d83491ee21f
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-crash-turn-end.test.ts
@@ -0,0 +1,528 @@
+// Where a turn a crash cut short ends, when the provider wrote nothing while it worked.
+//
+// Claude reports a Bash call once when it starts and again only when it finishes, so a command
+// that runs for half a minute leaves one journal row at its start. The lease renewal the host
+// wrote every ten seconds is what saw the child working after that row.
+
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentSessionOwnerProbe } from '../../../shared/agent-session-lease-adjudication'
+import type { AgentSessionRecord } from '../../../shared/agent-session-record'
+import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire'
+import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record'
+import {
+  completedStructuredAgentTurnSeconds,
+  selectStructuredAgentTurnTimings
+} from '../../../shared/structured-agent-session-turn-timing'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import { AGENT_SESSION_STORE_FILE_NAME } from '../../runtime/agent-session-record-store-file'
+import { journalDirectoryFor } from '../agent-session-journal/journal-paths'
+import { openAgentSessionJournal } from '../agent-session-journal/journal-store-factory'
+import {
+  AgentSessionAcquisitionExitUnprovenError,
+  type StructuredAgentSessionAdapter
+} from './structured-agent-session-adapter'
+import { resettleOpenStructuredAgentSessionConversation } from './structured-agent-session-conversation-open'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import { STRUCTURED_AGENT_SESSION_IDLE_MS } from './structured-agent-session-idle-sweep'
+import type { StructuredAgentSessionHostDeps } from './structured-agent-session-host-types'
+import {
+  hostTestAttachParams,
+  HOST_TEST_LOCATION as LOCATION,
+  HOST_TEST_SESSION as SESSION
+} from './structured-agent-session-host-test-data'
+
+const PROVIDER_SESSION = 'provider-session-alpha-1'
+/** The tool call's row: the last thing the provider wrote before the crash. */
+const TOOL_STARTED_AT = 1_800_000_000_000
+/** The last renewal before the crash, while the command was still running. */
+const LAST_RENEWED_AT = TOOL_STARTED_AT + 25_000
+/** Orca comes back an hour later. */
+const RELAUNCHED_AT = TOOL_STARTED_AT + 60 * 60 * 1000
+
+let root: string
+let store: AgentSessionRecordStore
+let host: StructuredAgentSessionHost
+
+function crashedClaudeRecord(): AgentSessionRecord {
+  const linkId = 'claude-13-link'
+  return {
+    schemaVersion: 2,
+    sessionId: SESSION,
+    location: LOCATION,
+    provider: 'claude',
+    providerHandleChain: [
+      {
+        linkId,
+        handle: { provider: 'claude', sessionId: PROVIDER_SESSION, leafUuid: null },
+        origin: 'created',
+        mintedAtFence: 13,
+        observedAt: TOOL_STARTED_AT - 60_000
+      }
+    ],
+    accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: '/home/dev/.claude' },
+    createdAt: TOOL_STARTED_AT - 60_000,
+    updatedAt: LAST_RENEWED_AT,
+    lease: {
+      sessionId: SESSION,
+      runtimeKind: 'native',
+      runtimeFence: 13,
+      handoffStage: null,
+      provenHandleLinkId: linkId,
+      ownerProcess: {
+        hostId: 'local',
+        pid: 12_546,
+        processStartTimeMs: TOOL_STARTED_AT - 60_000,
+        spawnToken: 'spawn-crashed'
+      },
+      reservedSpawnToken: 'spawn-crashed',
+      leaseDeadlineAt: LAST_RENEWED_AT + 30_000,
+      lastRenewedAt: LAST_RENEWED_AT,
+      handoffOperationId: null,
+      journalCheckpoint: null,
+      claimKeyId: 'key-1',
+      claimStatus: 'live',
+      unreconciled: false,
+      deathEvidence: null
+    }
+  }
+}
+
+async function seedCrashedStore(): Promise<void> {
+  const directory = join(root, 'store')
+  await mkdir(directory, { recursive: true })
+  await writeFile(
+    join(directory, AGENT_SESSION_STORE_FILE_NAME),
+    JSON.stringify({
+      schemaVersion: 2,
+      hostId: 'local',
+      records: { [SESSION]: crashedClaudeRecord() },
+      operations: {},
+      retiredClaimKeys: [],
+      unusableRecords: {}
+    }),
+    'utf-8'
+  )
+  store = await AgentSessionRecordStore.open({ directory, hostId: 'local' })
+}
+
+/** A running turn whose only row after its start is a Bash call that never reported back, for a
+ *  send the provider never acknowledged: the reopen settles it at the fence after the crash. */
+async function seedClaudeToolTurn(): Promise<void> {
+  let now = TOOL_STARTED_AT - 2_000
+  const journal = await openAgentSessionJournal({
+    identity: {
+      sessionId: SESSION,
+      workspaceId: LOCATION.workspaceId,
+      hostId: LOCATION.executionHostId,
+      agent: 'claude',
+      providerHandle: { kind: 'claude', sessionId: PROVIDER_SESSION, leafUuid: null }
+    },
+    journalDir: journalDirectoryFor(root, {
+      workspaceId: LOCATION.workspaceId,
+      sessionId: SESSION
+    }),
+    now: () => now
+  })
+  await journal.appendSubmission({
+    clientMessageId: 'send-1',
+    payloadFingerprint: '0'.repeat(64),
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'run the loop' }] },
+    fence: 13
+  })
+  await journal.appendItem(
+    { provider: 'claude', sessionId: PROVIDER_SESSION, uuid: 'uuid-turn' },
+    { kind: 'turn', turnId: 'turn-1', state: 'running', startedAt: now },
+    { fence: 13 }
+  )
+  now = TOOL_STARTED_AT
+  await journal.appendItem(
+    { provider: 'claude', sessionId: PROVIDER_SESSION, uuid: 'uuid-bash' },
+    {
+      kind: 'tool-call',
+      name: 'Bash',
+      input: { command: 'for i in $(seq 90); do sleep 1; done' },
+      state: 'running'
+    },
+    { fence: 13 }
+  )
+  await journal.close()
+}
+
+function openHost(overrides: Partial<StructuredAgentSessionHostDeps>): void {
+  host = new StructuredAgentSessionHost({
+    store,
+    adapter: {
+      acquire: vi.fn(),
+      dispatch: vi.fn(),
+      cancelTurn: vi.fn(),
+      answerPrompt: vi.fn(),
+      setOption: vi.fn(),
+      supportsCreate: () => true
+    },
+    journalRoot: root,
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => 'spawn-new',
+    now: () => RELAUNCHED_AT,
+    ...overrides
+  })
+}
+
+/** What a client reads over the wire. */
+async function settledTurn() {
+  return (await host.journalSnapshot(SESSION)).items
+    .map((item) => readAgentJournalTurn(item.body))
+    .find(Boolean)
+}
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-crash-turn-end-'))
+  await seedCrashedStore()
+  await seedClaudeToolTurn()
+})
+
+afterEach(async () => {
+  await host?.flushAllStreamedEvents()
+  await rm(root, { recursive: true, force: true })
+})
+
+describe('a turn a crash cut short mid-tool', () => {
+  it('ends at the last renewal, not at the tool call the provider last reported', async () => {
+    openHost({ probeOwner: async () => ({ outcome: 'pid-absent' }) })
+
+    await host.restoreReadableSessions()
+
+    expect(store.getRecord(SESSION)?.lease.deathEvidence).toMatchObject({
+      kind: 'pid-absent',
+      observedAt: RELAUNCHED_AT,
+      lastProvenAliveAt: LAST_RENEWED_AT
+    })
+    expect(await settledTurn()).toMatchObject({
+      state: 'interrupted',
+      completedAt: LAST_RENEWED_AT
+    })
+    // "Worked for 27s", where the tool call's row alone reads 2s.
+    const [timing] = selectStructuredAgentTurnTimings(
+      (await host.journalSnapshot(SESSION)).items
+    ).values()
+    expect(completedStructuredAgentTurnSeconds(timing)).toBe(27)
+  })
+
+  it('ends at the pre-crash renewal when the child outlived Orca and recovery stopped it', async () => {
+    // The orphan is alive at relaunch, but its output went nowhere: none of that is work shown.
+    let alive = true
+    const probeOwner = async (): Promise<AgentSessionOwnerProbe> =>
+      alive
+        ? { outcome: 'identity-matched', matchedOn: ['spawn-token'] }
+        : { outcome: 'pid-absent' }
+    const stopOwnerProcess = vi.fn(() => {
+      alive = false
+    })
+    openHost({ probeOwner, stopOwnerProcess })
+
+    await host.restoreReadableSessions()
+
+    expect(stopOwnerProcess).toHaveBeenCalledOnce()
+    expect(store.getRecord(SESSION)?.lease.deathEvidence).toMatchObject({
+      kind: 'pid-absent',
+      lastProvenAliveAt: LAST_RENEWED_AT
+    })
+    expect(await settledTurn()).toMatchObject({
+      state: 'interrupted',
+      completedAt: LAST_RENEWED_AT
+    })
+  })
+})
+
+/** Every turn state a subscriber was sent, in order: snapshots, then live batches. */
+function turnStatesSent(events: readonly AgentSessionSubscribeEvent[]) {
+  return events
+    .flatMap((event) =>
+      event.type === 'snapshot' ? event.page.items : event.type === 'batch' ? event.batch.items : []
+    )
+    .flatMap((item) => readAgentJournalTurn(item.body) ?? [])
+}
+
+function attach(fence: number) {
+  return host.attach(
+    { callerKey: 'client-1' },
+    hostTestAttachParams(fence, {
+      provider: 'claude',
+      agent: 'claude',
+      accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: '/home/dev/.claude' },
+      providerHandle: { kind: 'claude', sessionId: PROVIDER_SESSION, leafUuid: null }
+    })
+  )
+}
+
+/** Runs whatever this session's serialize already has queued. */
+function drainSession(): Promise<void> {
+  return host.collaboratorsForTests().serialize(SESSION, async () => {})
+}
+
+// On desktop the chat on screen at relaunch opens before the startup reconcile has probed its owner,
+// so the open can only call the turn unverifiable; the proof, whoever writes it, then revises it.
+describe('a turn a read reached before the reconcile proved its owner dead', () => {
+  it('reads unverifiable, then interrupted at the last renewal, and a subscriber is sent both', async () => {
+    openHost({ probeOwner: async () => ({ outcome: 'pid-absent' }) })
+    const events: AgentSessionSubscribeEvent[] = []
+    const unsubscribe = await host.subscribe({
+      id: 'reader-1',
+      sessionId: SESSION,
+      emit: (event) => events.push(event)
+    })
+    expect(await settledTurn()).toEqual(UNVERIFIABLE_TURN)
+
+    await host.reconcileRestartLeases()
+    await drainSession()
+
+    // A paired or phone client learns of the revision through the ordinary journal publish.
+    await vi.waitFor(() =>
+      expect(turnStatesSent(events)).toMatchObject([
+        { state: 'unverifiable' },
+        { state: 'interrupted', completedAt: LAST_RENEWED_AT }
+      ])
+    )
+    const { items } = await host.journalSnapshot(SESSION)
+    const [timing] = selectStructuredAgentTurnTimings(items).values()
+    expect(completedStructuredAgentTurnSeconds(timing)).toBe(27)
+    expect(items.filter((item) => item.body.kind === 'status')).toHaveLength(1)
+    unsubscribe()
+  })
+
+  it('revises nothing twice, whoever re-runs the settle', async () => {
+    openHost({ probeOwner: async () => ({ outcome: 'pid-absent' }) })
+    await host.history({ sessionId: SESSION, direction: 'tail' })
+    await host.reconcileRestartLeases()
+    await drainSession()
+    const settled = await host.journalSnapshot(SESSION)
+
+    await host
+      .collaboratorsForTests()
+      .serialize(SESSION, () =>
+        resettleOpenStructuredAgentSessionConversation(
+          host.deps,
+          SESSION,
+          host.collaboratorsForTests().sessions.get(SESSION)
+        )
+      )
+    await host.restoreReadableSessions()
+
+    expect(await host.journalSnapshot(SESSION)).toEqual(settled)
+  })
+
+  it('revises it when recovery stops a child that outlived Orca, with no send', async () => {
+    let alive = true
+    const probeOwner = async (): Promise<AgentSessionOwnerProbe> =>
+      alive
+        ? { outcome: 'identity-matched', matchedOn: ['spawn-token'] }
+        : { outcome: 'pid-absent' }
+    const stopOwnerProcess = vi.fn(() => {
+      alive = false
+    })
+    const acquire = vi.fn<StructuredAgentSessionAdapter['acquire']>()
+    openHost({
+      adapter: {
+        acquire,
+        dispatch: vi.fn(),
+        cancelTurn: vi.fn(),
+        answerPrompt: vi.fn(),
+        setOption: vi.fn(),
+        supportsCreate: () => true
+      },
+      probeOwner,
+      stopOwnerProcess
+    })
+    await host.history({ sessionId: SESSION, direction: 'tail' })
+    expect(await settledTurn()).toEqual(UNVERIFIABLE_TURN)
+
+    // The reconcile only parks the live orphan in recovery; recovery's stop is what proves it gone.
+    await host.restoreReadableSessions()
+    await drainSession()
+
+    expect(stopOwnerProcess).toHaveBeenCalledOnce()
+    expect(acquire).not.toHaveBeenCalled()
+    expect(await settledTurn()).toMatchObject({
+      state: 'interrupted',
+      completedAt: LAST_RENEWED_AT
+    })
+  })
+
+  it('never touches the turn a start after the crash is writing', async () => {
+    const acquire = vi.fn<StructuredAgentSessionAdapter['acquire']>(
+      async ({ fence, spawnToken, onSpawned, events }) => {
+        const process = {
+          hostId: 'local',
+          pid: 8_000,
+          processStartTimeMs: RELAUNCHED_AT,
+          spawnToken
+        }
+        await onSpawned?.(process)
+        // The new child is already working when its start lands, ahead of the queued revision.
+        events?.appendItem(
+          { provider: 'claude', sessionId: PROVIDER_SESSION, uuid: 'uuid-turn-2' },
+          { kind: 'turn', turnId: 'turn-2', state: 'running', startedAt: RELAUNCHED_AT }
+        )
+        return {
+          process,
+          link: {
+            linkId: `claude-${fence}-link`,
+            handle: { provider: 'claude', sessionId: PROVIDER_SESSION, leafUuid: null },
+            origin: 'resumed',
+            mintedAtFence: fence,
+            observedAt: RELAUNCHED_AT
+          }
+        }
+      }
+    )
+    openHost({
+      adapter: {
+        acquire,
+        dispatch: vi.fn(),
+        cancelTurn: vi.fn(),
+        answerPrompt: vi.fn(),
+        setOption: vi.fn(),
+        supportsCreate: () => true
+      },
+      probeOwner: async () => ({ outcome: 'pid-absent' })
+    })
+    await host.history({ sessionId: SESSION, direction: 'tail' })
+
+    // The start runs the reconcile itself, so the revision it queues waits behind the start.
+    await expect(attach(14)).resolves.toMatchObject({ ok: true })
+    await host.flushStreamedEvents(SESSION)
+    await drainSession()
+
+    const turns = (await host.journalSnapshot(SESSION)).items.flatMap(
+      (item) => readAgentJournalTurn(item.body) ?? []
+    )
+    expect(turns).toMatchObject([
+      { turnId: 'turn-1', state: 'interrupted', completedAt: LAST_RENEWED_AT },
+      { turnId: 'turn-2', state: 'running' }
+    ])
+  })
+
+  it('stays unverifiable when the revision cannot be written, and a later open revises it', async () => {
+    let now = RELAUNCHED_AT
+    const onEventSinkError = vi.fn()
+    openHost({
+      probeOwner: async () => ({ outcome: 'pid-absent' }),
+      now: () => now,
+      onEventSinkError
+    })
+    await host.history({ sessionId: SESSION, direction: 'tail' })
+    const { journal } = host.collaboratorsForTests().sessions.get(SESSION)!
+    vi.spyOn(journal, 'appendLifecycleBatch').mockRejectedValueOnce(new Error('disk full'))
+
+    await host.reconcileRestartLeases()
+    await drainSession()
+
+    expect(onEventSinkError).toHaveBeenCalledOnce()
+    expect(await settledTurn()).toEqual(UNVERIFIABLE_TURN)
+    // The proof is durable on the record, so the next open converges.
+    now += STRUCTURED_AGENT_SESSION_IDLE_MS + 1
+    await host.collaboratorsForTests().lifetime.idleSweep.tick()
+    expect(host.hasSession(SESSION)).toBe(false)
+    expect(await settledTurn()).toMatchObject({
+      state: 'interrupted',
+      completedAt: LAST_RENEWED_AT
+    })
+  })
+})
+
+/** A relaunched host whose first start after the crash, at fence 15, fails with `failure`; every
+ *  later start succeeds. The crashed owner, and any child left behind, probe gone. */
+async function hostWithFailingFirstStart(failure: Error) {
+  let now = RELAUNCHED_AT
+  const acquire = vi.fn<StructuredAgentSessionAdapter['acquire']>(
+    async ({ fence, spawnToken, onSpawned }) => {
+      const process = { hostId: 'local', pid: 7_000 + fence, processStartTimeMs: now, spawnToken }
+      await onSpawned?.(process)
+      if (fence === 15) {
+        throw failure
+      }
+      return {
+        process,
+        link: {
+          linkId: `claude-${fence}-link`,
+          handle: { provider: 'claude', sessionId: PROVIDER_SESSION, leafUuid: null },
+          origin: 'resumed',
+          mintedAtFence: fence,
+          observedAt: now
+        }
+      }
+    }
+  )
+  openHost({
+    adapter: {
+      acquire,
+      releaseAcquisition: async () => true,
+      dispatch: vi.fn(),
+      cancelTurn: vi.fn(),
+      answerPrompt: vi.fn(),
+      setOption: vi.fn(),
+      supportsCreate: () => true
+    },
+    probeOwner: async () => ({ outcome: 'pid-absent' }),
+    now: () => now
+  })
+  await host.reconcileRestartLeases()
+  return {
+    attach,
+    advance: (ms: number) => {
+      now += ms
+    }
+  }
+}
+
+/** The turn as the crashed owner left it, with no end: nothing proves when that owner stopped. */
+const UNVERIFIABLE_TURN = {
+  turnId: 'turn-1',
+  state: 'unverifiable',
+  startedAt: TOOL_STARTED_AT - 2_000
+}
+
+// The relaunch proved the fence-13 owner gone, but a start reserving fence 15 clears that proof
+// before the turn is settled; what the record holds afterwards is about the start's own child.
+describe('a turn a newer start could not settle before it failed', () => {
+  it('is not judged by the death of the child it left for recovery', async () => {
+    const { attach, advance } = await hostWithFailingFirstStart(
+      new AgentSessionAcquisitionExitUnprovenError(new Error('hung'))
+    )
+
+    await attach(14).catch(() => undefined)
+    expect(store.getRecord(SESSION)?.lease).toMatchObject({
+      runtimeFence: 15,
+      handoffStage: 'recovering',
+      lastRenewedAt: RELAUNCHED_AT
+    })
+    advance(60_000)
+    // Recovery records that child's death, then the client retries at the fence it was told.
+    await expect(attach(15)).resolves.toMatchObject({ refusal: { currentFence: 16 } })
+    expect(store.getRecord(SESSION)?.lease.deathEvidence).toMatchObject({
+      ownerFence: 15,
+      lastProvenAliveAt: RELAUNCHED_AT
+    })
+    await expect(attach(16)).resolves.toMatchObject({ ok: true })
+
+    expect(await settledTurn()).toEqual(UNVERIFIABLE_TURN)
+  })
+
+  it('is not judged by the watched exit of a start that failed', async () => {
+    const { attach, advance } = await hostWithFailingFirstStart(new Error('claude exited (code 1)'))
+
+    await expect(attach(14)).resolves.toMatchObject({ ok: false })
+    expect(store.getRecord(SESSION)?.lease.deathEvidence).toMatchObject({
+      kind: 'exit-observed',
+      ownerFence: 15,
+      observedAt: RELAUNCHED_AT
+    })
+    advance(60_000)
+    await expect(attach(16)).resolves.toMatchObject({ ok: true })
+
+    // Main ended it at the failed start, an hour after the crash, with the start's reason.
+    expect(await settledTurn()).toEqual(UNVERIFIABLE_TURN)
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.test.ts
index d553fbaecf37..4a0febb6ceb9 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.test.ts
@@ -4,16 +4,21 @@ import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { openAgentSessionJournal } from '../agent-session-journal/journal-store-factory'
 import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types'
-import { dispatchRejectionReasonIsInternal } from '../../../shared/structured-agent-session-dispatch-rejection'
+import {
+  agentSessionFailureFact,
+  MAX_PROVIDER_DIAGNOSTIC_CHARS,
+  providerDiagnostic
+} from '../../../shared/agent-session-failure'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import {
   captureUnfinishedStructuredAgentSessionWork,
-  MAX_UNEXPECTED_EXIT_REASON_CHARS,
   settleStructuredAgentSessionDeadGeneration,
-  UNEXPECTED_PROVIDER_EXIT_OUTCOME,
   unfinishedStructuredAgentSessionWorkWasInterrupted
 } from './structured-agent-session-dead-generation-settlement'
 
+const UNEXPECTED_PROVIDER_EXIT_OUTCOME =
+  'The agent stopped while this response was in progress. You can continue in this conversation.'
+
 const SESSION = 'session-dead-generation'
 const THREAD = 'thread-1'
 let root: string
@@ -143,7 +148,7 @@ describe('dead structured-session generation settlement', () => {
     ).toHaveLength(1)
   })
 
-  it('keeps the actionable tail when the provider dumps a stderr wall into its exit reason', async () => {
+  it('keeps a stderr wall out of the sentence, as a bounded detail for a log', async () => {
     await seedUnfinishedWork()
 
     await expect(
@@ -155,19 +160,47 @@ describe('dead structured-session generation settlement', () => {
         pendingSubmissionReason: 'provider_exited_before_acknowledgement',
         verdict: { state: 'interrupted', completedAt: 1_000 },
         showUnexpectedExitOutcome: true,
-        unexpectedExitReason: 'stack frame '.repeat(4_000)
+        exitFailure: agentSessionFailureFact('providerExited', {
+          detail: providerDiagnostic('stack frame '.repeat(4_000), 'log')
+        })
       })
     ).resolves.toBe(true)
 
     const statuses = journal
       .snapshot()
-      .items.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : []))
+      .items.flatMap((item) => (item.body.kind === 'status' ? [item.body] : []))
     expect(statuses).toHaveLength(1)
-    // The cause is bounded before composing, so the row never reaches the byte cap that would
-    // truncate the sentence telling the user the conversation is still usable.
-    expect(statuses[0]).toContain('stack frame')
-    expect(statuses[0]).toMatch(/You can continue in this conversation\.$/)
-    expect(statuses[0]?.length).toBeLessThan(MAX_UNEXPECTED_EXIT_REASON_CHARS * 2)
+    expect(statuses[0]?.text).toBe(UNEXPECTED_PROVIDER_EXIT_OUTCOME)
+    expect(statuses[0]?.failure?.kind).toBe('providerExited')
+    expect(statuses[0]?.failure?.detail?.audience).toBe('log')
+    expect(statuses[0]?.failure?.detail?.text.length).toBe(MAX_PROVIDER_DIAGNOSTIC_CHARS)
+  })
+
+  it("words Orca's own fault as Orca's, never as the provider stopping", async () => {
+    await seedUnfinishedWork()
+
+    await settleStructuredAgentSessionDeadGeneration({
+      journal,
+      sessionId: SESSION,
+      fence: 7,
+      settlementId: `provider-exit:${SESSION}:7:generation-1`,
+      pendingSubmissionReason: 'provider_exited_before_acknowledgement',
+      verdict: { state: 'interrupted', completedAt: 1_000 },
+      showUnexpectedExitOutcome: true,
+      // Orca stopped the provider because its own journal failed.
+      exitFailure: agentSessionFailureFact('hostFault')
+    })
+
+    const statuses = journal
+      .snapshot()
+      .items.flatMap((item) => (item.body.kind === 'status' ? [item.body] : []))
+    expect(statuses).toEqual([
+      {
+        kind: 'status',
+        text: "Orca ran into a problem, so this didn't go through. Try again.",
+        failure: { kind: 'hostFault' }
+      }
+    ])
   })
 
   it('retries an already settled expected close without writing through a closed journal gate', async () => {
@@ -190,6 +223,7 @@ describe('dead structured-session generation settlement', () => {
       | 'submissions'
       | 'markPendingSubmissionsUnknown'
       | 'rejectPendingSubmissions'
+      | 'rejectQueuedSubmissions'
       | 'appendLifecycleBatch'
     > = {
       snapshot: () => ({
@@ -203,6 +237,9 @@ describe('dead structured-session generation settlement', () => {
       rejectPendingSubmissions: async () => {
         throw new Error('journal_closed')
       },
+      rejectQueuedSubmissions: async () => {
+        throw new Error('journal_closed')
+      },
       appendLifecycleBatch: async () => {
         throw new Error('journal_closed')
       }
@@ -272,16 +309,24 @@ describe('dead structured-session generation settlement', () => {
       settlementId: `provider-exit:${SESSION}:7:generation-1`,
       pendingSubmissionReason: 'provider_closed_before_acknowledgement',
       verdict: { state: 'interrupted', completedAt: 1_000 },
-      unexpectedExitReason: 'claude stream-json exited (code 1): not signed in',
-      exitedDuringStartup: true
+      exitFailure: agentSessionFailureFact('providerExited', {
+        detail: providerDiagnostic('code 1\nnot signed in', 'log')
+      }),
+      exitedDuringStartup: { generation: 'generation-1' }
     })
 
-    const reason =
-      'The provider stopped before it finished starting: claude stream-json exited (code 1): not signed in.'
+    // The sentence is Orca's; the stderr the exit carried rides as a log detail only.
     expect(journal.submissions()).toEqual([
-      expect.objectContaining({ clientMessageId: 'client-held', dispatchState: 'rejected', reason })
+      expect.objectContaining({
+        clientMessageId: 'client-held',
+        dispatchState: 'rejected',
+        reason: 'The agent stopped before it finished starting. Send your message to try again.',
+        rejection: {
+          kind: 'providerStartFailed',
+          detail: { text: 'code 1\nnot signed in', audience: 'log' }
+        }
+      })
     ])
-    expect(dispatchRejectionReasonIsInternal(reason)).toBe(false)
   })
 
   it("keeps a subagent's settled rows the subagent's, in one batch and after a reopen", async () => {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.ts
index 05f7b4a7fe84..8ee3430c5c91 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.ts
@@ -1,4 +1,10 @@
+import {
+  agentSessionFailureFact,
+  MAX_PROVIDER_DIAGNOSTIC_CHARS,
+  type SubmissionRejectionFact
+} from '../../../shared/agent-session-failure'
 import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
 import type {
   AgentJournalItemBody,
   AgentJournalRenderItem
@@ -6,75 +12,32 @@ import type {
 import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record'
 import { partitionJournalLifecycleMutations } from '../agent-session-journal/journal-lifecycle-batch-partition'
 import type { JournalLifecycleMutationInput } from '../agent-session-journal/journal-row-builders'
-import {
-  boundJournalStatusText,
-  cancelledJournalPromptBody
-} from '../agent-session-journal/journal-prompt-body-bounds'
+import { cancelledJournalPromptBody } from '../agent-session-journal/journal-prompt-body-bounds'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import {
+  agentSessionFailureWords,
+  type AgentSessionFailureWordsContext
+} from '../../../shared/agent-session-failure-words'
+import { structuredAgentSessionStartFailure } from './structured-agent-session-failure-text'
+import {
+  hasStructuredAgentSessionStartFailureRow,
+  structuredAgentSessionStartFailureRow
+} from './structured-agent-session-start-failure-row'
 import type { AgentSessionDeathEvidence } from '../../../shared/agent-session-record'
 import {
+  provenUnverifiableTurnRevisions,
   runningTurnLifecycleRevisions,
   turnVerdictFromDeathEvidence,
   type StructuredAgentSessionTurnVerdict
 } from './structured-agent-session-stale-turn-verdict'
 
-export const UNEXPECTED_PROVIDER_EXIT_OUTCOME =
-  'The provider stopped while this response was in progress. You can continue in this conversation.'
-
-/** A provider may put a whole stderr dump in its exit reason; unbounded it would push the
- *  actionable tail past the row's byte cap and lose it to truncation. */
-export const MAX_UNEXPECTED_EXIT_REASON_CHARS = 512
-
-/** The cause is the only thing separating an auth failure from an OOM kill, so it is carried
- *  into the copy rather than left in the durable record nothing renders. */
-export function unexpectedProviderExitOutcome(reason?: string): string {
-  const detail = exitReasonDetail(reason)
-  return detail
-    ? `The provider stopped while this response was in progress: ${detail}. You can continue in this conversation.`
-    : UNEXPECTED_PROVIDER_EXIT_OUTCOME
-}
-
-/** A restart that produced no child, answered to the send that asked for it; its cause is the
- *  whole story, and nothing is remembered, so the next try is a fresh one. A new chat is offered
- *  only when the host holds nothing this chat could restart from. */
-export function ownerRestartFailedOutcome(input: {
-  agentName: string
-  reason?: string
-  resumable: boolean
-}): string {
-  const detail = exitReasonDetail(input.reason)
-  const failed = detail
-    ? `${input.agentName} couldn't restart: ${detail}.`
-    : `${input.agentName} couldn't restart.`
-  return input.resumable ? failed : `${failed} Start a new chat to continue.`
-}
-
-/** A start that never finished has no response to interrupt; its cause is the whole story. */
-export function providerStartupFailureOutcome(reason?: string): string {
-  const detail = exitReasonDetail(reason)
-  return detail
-    ? `The provider stopped before it finished starting: ${detail}.`
-    : 'The provider stopped before it finished starting.'
-}
-
-/** Why a send a child that never started left unwritten was rejected. The child's own diagnostic is
- *  the cause the user can act on, so it is the reason, in the words the chat row uses. */
-export function providerStartupFailureRejection(cause?: unknown): string {
-  return providerStartupFailureOutcome(
-    cause === undefined ? undefined : cause instanceof Error ? cause.message : String(cause)
-  )
-}
-
-function exitReasonDetail(reason: string | undefined): string | undefined {
-  return reason
-    ?.slice(0, MAX_UNEXPECTED_EXIT_REASON_CHARS)
-    .trim()
-    .replace(/[.\s]+$/, '')
-}
+/** Bounds the exit reason the lease keeps as log evidence; a provider diagnostic is held to the
+ *  same cap. */
+export const MAX_UNEXPECTED_EXIT_REASON_CHARS = MAX_PROVIDER_DIAGNOSTIC_CHARS
 
 type DeadGenerationSubmission = Pick<
   ReturnType<AgentSessionJournal['submissions']>[number],
-  'clientMessageId' | 'dispatchState' | 'recovered'
+  'clientMessageId' | 'dispatchState' | 'recovered' | 'handoverRecorded' | 'handedOverAt'
 >
 
 export type DeadGenerationJournal = {
@@ -142,10 +105,13 @@ export async function settleStructuredAgentSessionDeadGeneration(input: {
   verdict: StructuredAgentSessionTurnVerdict
   pendingSubmissionReason: string
   showUnexpectedExitOutcome?: boolean
-  /** Why the provider stopped, when the host has it. Rendered with the outcome copy. */
-  unexpectedExitReason?: string
-  /** The provider never finished starting; the outcome says so instead of naming a response. */
-  exitedDuringStartup?: boolean
+  /** Why the provider stopped, as the adapter told it; the row's sentence is this fact's. */
+  exitFailure?: SubmissionRejectionFact
+  /** Who a failed start's sentence names. */
+  failureTextContext?: AgentSessionFailureWordsContext
+  /** The provider never finished starting: the start that failed, keyed by the child's
+   *  generation. Its row is the one the delivery loop writes for the same start. */
+  exitedDuringStartup?: { generation: string | null }
   onError?: (sessionId: string, error: unknown) => void
 }): Promise<boolean> {
   try {
@@ -154,27 +120,41 @@ export async function settleStructuredAgentSessionDeadGeneration(input: {
     if (!showUnexpectedExitOutcome && !hasUnfinishedWork) {
       return true
     }
-    // A child that never proved its start accepted nothing — input is written only after it
-    // initializes — so every send it left unanswered is provably unwritten and is rejected with the
-    // child's own diagnostic. A proven child's unanswered sends stay in doubt.
-    await (input.exitedDuringStartup
-      ? input.journal.rejectPendingSubmissions(
-          input.fence,
-          providerStartupFailureRejection(input.unexpectedExitReason)
-        )
+    // A queued message is the delivery loop's to settle: it was never handed to this child. A
+    // child that never proved its start accepted nothing either — input is written only after it
+    // initializes — so every send it was handed is rejected with the child's own diagnostic. A
+    // proven child's handed-over sends stay in doubt.
+    const startupFailure = input.exitedDuringStartup
+      ? structuredAgentSessionStartFailure({ exit: input.exitFailure }, input.failureTextContext)
+      : null
+    await (startupFailure
+      ? input.journal.rejectPendingSubmissions(input.fence, startupFailure)
       : input.journal.markPendingSubmissionsUnknown(input.fence, input.pendingSubmissionReason))
     const items = input.journal.snapshot().items
     const mutations: JournalLifecycleMutationInput[] = []
-    if (showUnexpectedExitOutcome) {
+    if (showUnexpectedExitOutcome && input.exitedDuringStartup && startupFailure) {
+      const startKey = input.exitedDuringStartup.generation ?? input.settlementId
+      // A start a message waited on is the delivery loop's to record, before or after this exit,
+      // in the words it rejected the message with; this row is for a command, goal or rewind start.
+      // A row already written stays: rejected is terminal, so its words are not reworded.
+      const recordedByDeliveryLoop =
+        input.journal.submissions?.().some(isQueuedAgentJournalSubmission) ||
+        hasStructuredAgentSessionStartFailureRow(items, startKey)
+      if (!recordedByDeliveryLoop) {
+        mutations.push(structuredAgentSessionStartFailureRow(startKey, startupFailure))
+      }
+    } else if (showUnexpectedExitOutcome) {
       mutations.push({
         kind: 'item',
         identity: { provider: 'orca', clientMessageId: input.settlementId },
         body: {
           kind: 'status',
-          text: boundJournalStatusText(
-            input.exitedDuringStartup
-              ? providerStartupFailureOutcome(input.unexpectedExitReason)
-              : unexpectedProviderExitOutcome(input.unexpectedExitReason)
+          ...agentSessionFailureWords(
+            input.exitFailure ?? agentSessionFailureFact('providerExited'),
+            {
+              ...input.failureTextContext,
+              surface: 'row'
+            }
           )
         }
       })
@@ -206,9 +186,9 @@ export async function settleStructuredAgentSessionDeadGeneration(input: {
 /**
  * Settles whatever a generation with no child in this process left running: found when a new child
  * is acquired, or when a chat is reopened for reading. Derived from the journal and the lease's
- * death evidence each time, so nothing is owed in between. Only an observed exit earns an end time
- * and the exit copy. Must run before a new child's buffered events land, or a live turn would be
- * judged.
+ * death evidence each time, so nothing is owed in between. Proven death ends the turn interrupted,
+ * and a proof written after an earlier settle revises what that settle left `unverifiable`. Must
+ * run before a new child's buffered events land, or a live turn would be judged.
  */
 export async function settleStaleStructuredAgentSessionState(input: {
   journal: AgentSessionJournal
@@ -216,10 +196,15 @@ export async function settleStaleStructuredAgentSessionState(input: {
   fence: number
   acquisitionGeneration: string | null
   deathEvidence: AgentSessionDeathEvidence | null
+  /** Who the exit row names. */
+  failureTextContext?: AgentSessionFailureWordsContext
 }): Promise<number> {
   const { journal } = input
   const items = journal.snapshot().items
-  const verdict = turnVerdictFromDeathEvidence(input.deathEvidence)
+  // Each turn is judged by the evidence only if it names that turn's owner.
+  const verdictFor = (item: AgentJournalRenderItem) =>
+    turnVerdictFromDeathEvidence(input.deathEvidence, journal.itemFence(item.itemId))
+  // Per attempt: a retry re-partitions only what is left, and a reused chunk id would skip it.
   const generation = input.acquisitionGeneration ?? `seq-${journal.cursor().sequence}`
   const settlementId = `stale-session:${input.sessionId}:${input.fence}:${generation}`
   const mutations: JournalLifecycleMutationInput[] = []
@@ -230,14 +215,32 @@ export async function settleStaleStructuredAgentSessionState(input: {
       mutations.push({ kind: 'item', identity, body })
     }
   }
-  mutations.push(...runningTurnLifecycleRevisions(items, verdict))
-  if (verdict.state === 'interrupted' && items.some(isInProgressItem)) {
+  const proven = provenUnverifiableTurnRevisions(items, input.deathEvidence, journal)
+  mutations.push(
+    ...items.flatMap((item) => runningTurnLifecycleRevisions([item], verdictFor(item))),
+    ...proven
+  )
+  const evidence = input.deathEvidence
+  if (
+    evidence &&
+    (proven.length > 0 ||
+      items.some((item) => isInProgressItem(item) && verdictFor(item).state === 'interrupted'))
+  ) {
     mutations.unshift({
       kind: 'item',
-      identity: { provider: 'orca', clientMessageId: settlementId },
+      // Named by the death it explains, so a retry after a partly written settle adds no second row.
+      identity: {
+        provider: 'orca',
+        clientMessageId: `stale-session:${input.sessionId}:death-${evidence.ownerFence ?? 'unowned'}-${evidence.observedAt}`
+      },
+      // The death evidence is Orca's log text, never a sentence for a person: the row says only
+      // that the provider stopped.
       body: {
         kind: 'status',
-        text: boundJournalStatusText(unexpectedProviderExitOutcome(input.deathEvidence?.detail))
+        ...agentSessionFailureWords(agentSessionFailureFact('providerExited'), {
+          ...input.failureTextContext,
+          surface: 'row'
+        })
       }
     })
   }
@@ -298,7 +301,9 @@ function hasUnsettledSubmission(journal: DeadGenerationJournal): boolean {
   return submissions
     ? submissions.some(
         (submission) =>
-          submission.dispatchState === 'pending' ||
+          // A queued message is not work in progress: nothing has it yet.
+          (submission.dispatchState === 'pending' &&
+            !(submission.handoverRecorded && submission.handedOverAt === undefined)) ||
           (submission.dispatchState === 'unknown' && submission.recovered !== true)
       )
     : (journal.pendingSubmissions?.().length ?? 0) > 0
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop.test.ts
new file mode 100644
index 000000000000..242daf74faf6
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop.test.ts
@@ -0,0 +1,57 @@
+import { describe, expect, it } from 'vitest'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { structuredAgentSessionEndedChildFailure } from './structured-agent-session-delivery-loop'
+import type {
+  StructuredAgentSessionChildEndCause,
+  StructuredAgentSessionEndedChild
+} from './structured-agent-session-host-types'
+
+const EXIT_FAILURE = agentSessionFailureFact('providerExited', {
+  detail: { text: 'crashed', audience: 'log' }
+})
+
+function ended(
+  cause: StructuredAgentSessionChildEndCause,
+  duringStartup: boolean
+): StructuredAgentSessionEndedChild {
+  return {
+    generation: 'generation-1',
+    fence: 2,
+    rootGone: true,
+    cause,
+    reason: null,
+    failure: EXIT_FAILURE,
+    duringStartup,
+    endedAt: { epoch: 'epoch-1', sequence: 3 }
+  }
+}
+
+describe('what a child end means for the messages queued behind it', () => {
+  it.each([false, true])("fails nothing after a user's Stop (during startup: %s)", (starting) => {
+    expect(structuredAgentSessionEndedChildFailure(ended('user-stop', starting))).toBeNull()
+  })
+
+  it.each([false, true])(
+    'is a start Orca stopped after a host stop (during startup: %s)',
+    (starting) => {
+      expect(structuredAgentSessionEndedChildFailure(ended('host-stop', starting))).toEqual({
+        failure: { kind: 'hostStopped' }
+      })
+    }
+  )
+
+  it.each(['exit', 'attach-failed', 'evict'] as const)(
+    'carries the recorded failure of a %s, as a failed start while starting',
+    (cause) => {
+      expect(structuredAgentSessionEndedChildFailure(ended(cause, true))).toEqual({
+        exit: EXIT_FAILURE
+      })
+      expect(structuredAgentSessionEndedChildFailure(ended(cause, false))).toEqual({
+        failure: EXIT_FAILURE
+      })
+      expect(
+        structuredAgentSessionEndedChildFailure({ ...ended(cause, false), failure: undefined })
+      ).toEqual({ failure: agentSessionFailureFact('providerExited') })
+    }
+  )
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop.ts
new file mode 100644
index 000000000000..7dd17306105d
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop.ts
@@ -0,0 +1,290 @@
+// The one thing that starts a provider child for a send, the one thing that hands a message to
+// it, and the one thing that settles a queued message because of a start, a child or a leftover.
+//
+// A send is accepted on its own serialized step and returns; this loop does the rest. It exists
+// for a session exactly while a message is queued there — accepted, not yet handed over — and
+// every step re-reads the journal and the conversation's child record to decide, so there is no
+// loop state to disagree with them. Each step is its own serialized task. That is what lets a Stop
+// that arrives while a start holds the queue withdraw the queued messages before the handover that
+// would have written them. Stop and the conversation's close are the only other writers of a
+// queued message: a child's exit only ends the child, and this loop reads why.
+
+import {
+  agentSessionFailureFact,
+  type SubmissionRejectionFact
+} from '../../../shared/agent-session-failure'
+import {
+  agentSessionFailureWords,
+  type AgentSessionFailureWordsContext
+} from '../../../shared/agent-session-failure-words'
+import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import {
+  structuredAgentSessionStartFailure,
+  type StructuredAgentSessionStartFailureCause
+} from './structured-agent-session-failure-text'
+import type { StructuredAgentSessionResumeOutcome } from './structured-agent-session-agent-start'
+import type {
+  StructuredAgentSessionChildEndCause,
+  StructuredAgentSessionEndedChild,
+  StructuredAgentSessionHostSession,
+  StructuredAgentSessionProviderChildIdentity
+} from './structured-agent-session-host-types'
+import {
+  oldestQueuedSubmission,
+  recordStructuredAgentSessionStartFailure
+} from './structured-agent-session-start-failure-row'
+import { failedProviderChildStart } from './structured-agent-session-provider-child'
+import { handOverSubmission } from './structured-agent-session-turns'
+
+export type StructuredAgentSessionDeliveryLoopDeps = {
+  sessions: ReadonlyMap<string, StructuredAgentSessionHostSession>
+  adapter: StructuredAgentSessionAdapter
+  serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
+  /** A start step, tracked from enqueue so quit waits for the child it may produce. */
+  trackStart: <T>(start: Promise<T>) => Promise<T>
+  /** Gives the session a provider child if it has none; for a caller inside `serialize`. */
+  /** Starts a child for `startedFor`, the queued message at the head, if the session has none. */
+  ensureProviderChild: (
+    sessionId: string,
+    startedFor: string
+  ) => Promise<StructuredAgentSessionResumeOutcome>
+  /** The fence the conversation's own writes carry; see `structuredAgentSessionConversationFence`. */
+  conversationFence: (sessionId: string) => number
+  /** Who the chat's failure sentences name. */
+  failureTextContext: (sessionId: string) => AgentSessionFailureWordsContext
+  onError: (sessionId: string, error: unknown) => void
+}
+
+type Step = 'continue' | 'stop'
+
+type Prepared =
+  | 'stop'
+  | Extract<StructuredAgentSessionResumeOutcome, { ok: false }>
+  | { ok: true; awaited: StructuredAgentSessionProviderChildIdentity | null }
+
+/** A failed start before it is worded; `fail` words it once, through the one wording point. */
+type StartFailure = { startKey: string | null; cause: StructuredAgentSessionStartFailureCause }
+
+export class StructuredAgentSessionDeliveryLoop {
+  private readonly running = new Set<string>()
+  private disposed = false
+
+  constructor(private readonly deps: StructuredAgentSessionDeliveryLoopDeps) {}
+
+  isRunning(sessionId: string): boolean {
+    return this.running.has(sessionId)
+  }
+
+  /** Quit: no step after this one starts a child or hands a message over. */
+  dispose(): void {
+    this.disposed = true
+  }
+
+  /** From inside the session's serialize, after a message was accepted or the conversation
+   *  opened. A loop already running re-reads the journal on its next step. */
+  wake(sessionId: string): void {
+    if (this.disposed || this.running.has(sessionId)) {
+      return
+    }
+    this.running.add(sessionId)
+    void this.run(sessionId)
+  }
+
+  private async run(sessionId: string): Promise<void> {
+    try {
+      for (;;) {
+        const prepared = await this.deps.trackStart(
+          this.deps.serialize(sessionId, () => this.prepare(sessionId))
+        )
+        if (prepared === 'stop') {
+          return
+        }
+        if (!prepared.ok) {
+          const { refusal, diagnostic } = prepared
+          const cause = { refusal, ...(diagnostic ? { diagnostic } : {}) }
+          await this.deps.serialize(sessionId, () =>
+            this.fail(sessionId, { startKey: null, cause })
+          )
+          return
+        }
+        // A child published before it proved its start takes no input yet; waited for outside
+        // the queue so a Stop can reach it meanwhile.
+        const failure = await this.deps.adapter.awaitStarted?.(sessionId)
+        const handed = await this.deps.serialize(sessionId, () =>
+          this.handOver(sessionId, prepared.awaited, failure || null)
+        )
+        if (handed === 'stop') {
+          return
+        }
+      }
+    } catch (error) {
+      // The error is Orca's own and goes to the log; the chat says only that Orca failed.
+      this.deps.onError(sessionId, error)
+      const cause = { hostFault: true } as const
+      await this.deps
+        .serialize(sessionId, () => this.fail(sessionId, { startKey: null, cause }))
+        .catch((failure: unknown) => {
+          // Rows left queued are rejected by the next open, or by the next loop an accept wakes.
+          this.running.delete(sessionId)
+          this.deps.onError(sessionId, failure)
+        })
+    }
+  }
+
+  /** Settles what an earlier host process left queued, then makes the session ready. */
+  private async prepare(sessionId: string): Promise<Prepared> {
+    const session = this.deps.sessions.get(sessionId)
+    if (!session || this.disposed) {
+      return this.stop(sessionId)
+    }
+    await session.journal.rejectQueuedSubmissions(
+      this.deps.conversationFence(sessionId),
+      agentSessionFailureWords(agentSessionFailureFact('hostRestarted'), { surface: 'rejection' }),
+      // A handle closes only with nothing queued, so one an earlier handle wrote is a leftover.
+      (submission) => session.journal.wroteBeforeOpen(submission.acceptedSequence)
+    )
+    const oldest = oldestQueuedSubmission(session)
+    if (!oldest) {
+      return this.stop(sessionId)
+    }
+    const failedStart = startThatFailedWhileQueued(session, oldest)
+    if (failedStart) {
+      return this.fail(sessionId, failedStart)
+    }
+    const ready = await this.deps.ensureProviderChild(sessionId, oldest.clientMessageId)
+    if (!ready.ok) {
+      return ready
+    }
+    const child = this.deps.sessions.get(sessionId)?.child
+    // The child this run waits on; handover checks it is still the one there.
+    return {
+      ok: true,
+      awaited: child ? { generation: child.generation, fence: child.fence } : null
+    }
+  }
+
+  private async handOver(
+    sessionId: string,
+    awaited: StructuredAgentSessionProviderChildIdentity | null,
+    startFailure: SubmissionRejectionFact | null
+  ): Promise<Step> {
+    const session = this.deps.sessions.get(sessionId)
+    if (!session || this.disposed) {
+      return this.stop(sessionId)
+    }
+    // Re-derived here, not carried from the start: the child may have ended, or another may have
+    // taken its place, since.
+    const { child } = session
+    const awaitedChild =
+      child && awaited && child.generation === awaited.generation && child.fence === awaited.fence
+        ? child
+        : null
+    // The host's `starting` trails the adapter's `started` by one serialized step, so for the child
+    // waited on, the adapter's own answer decides whether its start landed.
+    if (!awaitedChild || (awaitedChild.phase === 'starting' && startFailure !== null)) {
+      // The child waited on is gone, replaced by another, or settled its start without proving it.
+      const ended = awaitedChild ? undefined : session.lastEndedChild
+      const endedFailure = ended ? structuredAgentSessionEndedChildFailure(ended) : undefined
+      // A user's Stop is not a failure: the next step starts, or waits on, a child for what is
+      // queued.
+      if (endedFailure === null) {
+        return 'continue'
+      }
+      return this.fail(sessionId, {
+        startKey: awaited?.generation ?? null,
+        cause: endedFailure ??
+          // Gone with no end observed: nothing says the provider stopped.
+          { failure: startFailure ?? agentSessionFailureFact('startFailed') }
+      })
+    }
+    const next = oldestQueuedSubmission(session)
+    if (!next) {
+      return this.stop(sessionId)
+    }
+    await handOverSubmission(
+      {
+        sessionId,
+        journal: session.journal,
+        fence: awaitedChild.fence,
+        adapter: this.deps.adapter,
+        providerChildPhase: () => this.deps.sessions.get(sessionId)?.child?.phase,
+        failureTextContext: this.deps.failureTextContext(sessionId)
+      },
+      next
+    )
+    return 'continue'
+  }
+
+  private async fail(sessionId: string, failure: StartFailure): Promise<'stop'> {
+    const session = this.deps.sessions.get(sessionId)
+    if (session) {
+      await recordStructuredAgentSessionStartFailure(
+        { journal: session.journal, fence: this.deps.conversationFence(sessionId) },
+        {
+          startKey: failure.startKey,
+          ...structuredAgentSessionStartFailure(
+            failure.cause,
+            this.deps.failureTextContext(sessionId)
+          )
+        }
+      )
+    }
+    return this.stop(sessionId)
+  }
+
+  /** Inside the serialized step that found nothing to do, so an accept after it wakes anew. */
+  private stop(sessionId: string): 'stop' {
+    this.running.delete(sessionId)
+    return 'stop'
+  }
+}
+
+/** A start that died while this message waited on it — a view's, say — is the message's failed
+ *  start: settled with it, under its key, rather than started again into the same failure. */
+function startThatFailedWhileQueued(
+  session: StructuredAgentSessionHostSession,
+  oldest: NonNullable<ReturnType<typeof oldestQueuedSubmission>>
+): StartFailure | null {
+  const ended = failedProviderChildStart(session)
+  if (
+    !ended ||
+    oldest.acceptedSequence === undefined ||
+    ended.endedAt.epoch !== session.journal.cursor().epoch ||
+    ended.endedAt.sequence < oldest.acceptedSequence
+  ) {
+    return null
+  }
+  const cause = structuredAgentSessionEndedChildFailure(ended)
+  return cause ? { startKey: ended.generation, cause } : null
+}
+
+function providerEndFailure(
+  ended: StructuredAgentSessionEndedChild
+): StructuredAgentSessionStartFailureCause {
+  if (ended.duringStartup) {
+    return { exit: ended.failure }
+  }
+  return { failure: ended.failure ?? agentSessionFailureFact('providerExited') }
+}
+
+// Every end cause, so a new one does not compile until it says whether it fails what is queued.
+const ENDED_CHILD_FAILURE = {
+  'user-stop': () => null,
+  // The host stopping the child is Orca's cause, never the provider's: a start that never finished.
+  'host-stop': () => ({ failure: agentSessionFailureFact('hostStopped') }),
+  exit: providerEndFailure,
+  // The attach records its own fault as the end's failure.
+  'attach-failed': providerEndFailure,
+  // Reached only when an eviction's stop landed and a later step failed, leaving the conversation.
+  evict: providerEndFailure
+} satisfies Record<
+  StructuredAgentSessionChildEndCause,
+  (ended: StructuredAgentSessionEndedChild) => StructuredAgentSessionStartFailureCause | null
+>
+
+/** Why a queued message the child never took is rejected; null when its end fails nothing. */
+export function structuredAgentSessionEndedChildFailure(
+  ended: StructuredAgentSessionEndedChild
+): StructuredAgentSessionStartFailureCause | null {
+  return ENDED_CHILD_FAILURE[ended.cause](ended)
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-event-recovery.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-event-recovery.ts
index 19989e107119..f7a50627370e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-event-recovery.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-event-recovery.ts
@@ -1,3 +1,4 @@
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
 import {
   stopAgentSessionProviderRoot,
   type StructuredAgentSessionLifecycleEvent
@@ -7,12 +8,8 @@ import type {
   StructuredAgentSessionHostSession
 } from './structured-agent-session-host-types'
 import type { StructuredAgentSessionSinkBarrier } from './structured-agent-session-event-sink'
-import type { StructuredAgentSessionHolds } from './structured-agent-session-holds'
 import { settleStructuredAgentSessionProviderStarted } from './structured-agent-session-provider-started'
-import {
-  isStructuredAgentSessionRecoveryTicketCurrent,
-  settleUnexpectedStructuredAgentSessionExit
-} from './structured-agent-session-unexpected-exit'
+import { settleUnexpectedStructuredAgentSessionExit } from './structured-agent-session-unexpected-exit'
 
 export class StructuredAgentSessionEventRecovery {
   private readonly sinkFailures = new Set<string>()
@@ -25,12 +22,8 @@ export class StructuredAgentSessionEventRecovery {
       flushLifecycle: (sessionId: string) => Promise<StructuredAgentSessionSinkBarrier>
       publishFence: (sessionId: string, session: StructuredAgentSessionHostSession) => void
       publishStatus?: (sessionId: string) => void
-      hasResumeCapableHolder: (sessionId: string) => boolean
-      restartReleaseGrace: (sessionId: string) => void
       serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
       now: () => number
-      /** The one restart every asker shares; the holds put an unheld child on the idle clock. */
-      ensureProviderChild: StructuredAgentSessionHolds['ensureProviderChild']
       onBarrierError: (sessionId: string, error: unknown) => void
     }
   ) {}
@@ -42,14 +35,13 @@ export class StructuredAgentSessionEventRecovery {
     this.sinkFailures.add(sessionId)
     void this.context
       .serialize(sessionId, async () => {
-        const session = this.context.sessions.get(sessionId)
+        const child = this.context.sessions.get(sessionId)?.child
         const stop =
           this.context.deps.adapter.forceCloseSession ?? this.context.deps.adapter.closeSession
-        if (!session?.hasProviderChild || !stop) {
+        if (!child || !stop) {
           return null
         }
-        const fence = session.fence
-        const acquisitionGeneration = session.acquisitionGeneration
+        const { fence, generation: acquisitionGeneration } = child
         const stopped = await stopAgentSessionProviderRoot(() => stop(sessionId))
         if (!stopped || !acquisitionGeneration) {
           return null
@@ -58,6 +50,8 @@ export class StructuredAgentSessionEventRecovery {
           type: 'ended',
           sessionId,
           reason: `journal sink failure: ${error instanceof Error ? error.message : String(error)}`,
+          // Orca stopped the provider because its own journal failed.
+          failure: agentSessionFailureFact('hostFault'),
           cause: 'unexpected-exit',
           fence,
           acquisitionGeneration
@@ -68,34 +62,12 @@ export class StructuredAgentSessionEventRecovery {
       .finally(() => this.sinkFailures.delete(sessionId))
   }
 
+  /** An exit is settled and shown; nothing restarts the child. The next send does, through the
+   *  delivery loop, which also owns any message still queued. */
   async handle(event: StructuredAgentSessionLifecycleEvent): Promise<void> {
     if (event.type === 'started') {
       return settleStructuredAgentSessionProviderStarted(this.context, event)
     }
-    const ticket = await settleUnexpectedStructuredAgentSessionExit(this.context, event)
-    if (!ticket) {
-      return
-    }
-    // One serialized step with the ticket check inside it: a hold or a send that got there first
-    // has already replaced the owner, and this step finds that child and attaches nothing — or,
-    // once the lease has moved on, refuses on the stale ticket rather than spawning a second child.
-    try {
-      const resumed = await this.context.serialize(ticket.sessionId, () =>
-        this.context.ensureProviderChild(ticket.sessionId, {
-          admitRecoveryTicket: () =>
-            isStructuredAgentSessionRecoveryTicketCurrent(this.context, ticket)
-        })
-      )
-      if (!resumed.ok && isStructuredAgentSessionRecoveryTicketCurrent(this.context, ticket)) {
-        this.context.onBarrierError(
-          ticket.sessionId,
-          new Error(`${resumed.refusal.code}: ${resumed.refusal.message}`)
-        )
-      }
-    } catch (error) {
-      if (isStructuredAgentSessionRecoveryTicketCurrent(this.context, ticket)) {
-        this.context.onBarrierError(ticket.sessionId, error)
-      }
-    }
+    await settleUnexpectedStructuredAgentSessionExit(this.context, event)
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink-queue.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink-queue.ts
index c9a32533db44..428a3c1c0d4b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink-queue.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink-queue.ts
@@ -15,6 +15,8 @@ export type StructuredAgentSessionSinkOperation = {
   lifecycleBytes?: number
   lifecycle?: boolean
   coalescingKey?: string
+  /** The queued operation with this key wins, as the journal keeps a settlement's first batch. */
+  keepsFirst?: boolean
   run: (target: StructuredAgentSessionEventTarget) => Promise<unknown> | void
 }
 
@@ -117,10 +119,13 @@ export class StructuredAgentSessionSinkQueue {
     if (this.failure !== null) {
       return { accepted: false, reason: 'failed' }
     }
-    const sequence = ++this.acceptedSequence
     const key = options.coalescingKey ?? operation.coalescingKey
     const replaceAt = key ? this.queue.findIndex((queued) => queued.coalescingKey === key) : -1
     const replaced = replaceAt >= 0 ? this.queue[replaceAt] : undefined
+    if (replaced && operation.keepsFirst) {
+      return { accepted: true }
+    }
+    const sequence = ++this.acceptedSequence
     const lifecycle = operation.lifecycle ?? options.lifecycle === true
     const lifecycleBytes = lifecycle ? (operation.lifecycleBytes ?? operation.bytes) : 0
     const nextBytes = this.queuedBytes - (replaced?.bytes ?? 0) + operation.bytes
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.test.ts
index 6c3747fb824a..b8c1d0b7c0e4 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.test.ts
@@ -384,6 +384,32 @@ describe('deferred structured agent-session event sink', () => {
     expect(log).toEqual([{ call: 'appendItem', fence: 6, ordinal: 1 }])
   })
 
+  it('keeps the first queued lifecycle batch for a settlement, as the journal does', async () => {
+    // The journal applies a settlement id once and skips any later batch with it,
+    // so the queue must not let a later batch replace one it has not run yet.
+    const log: Recorded[] = []
+    const deferred = createDeferredStructuredAgentSessionEventSink()
+    const batch = (ordinal: number) => [
+      { kind: 'item' as const, identity: identity(ordinal), body: BODY }
+    ]
+
+    deferred.sink.appendLifecycleBatch?.('turn-completed:turn-1', batch(0))
+    expect(deferred.sink.tryAppendLifecycleBatch?.('turn-completed:turn-1', batch(1))).toEqual({
+      accepted: true
+    })
+    expect(deferred.state().queuedOperations).toBe(1)
+
+    const bound = target(6, log)
+    deferred.bind(bound)
+    await deferred.drained()
+
+    expect(
+      vi
+        .mocked(bound.journal.appendLifecycleBatch)
+        .mock.calls.map(([input]) => input.mutations.map((mutation) => mutation.identity))
+    ).toEqual([[identity(0)]])
+  })
+
   it('keeps a replacement checkpoint after distinct intervening operations', async () => {
     const log: Recorded[] = []
     const deferred = createDeferredStructuredAgentSessionEventSink()
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.ts
index 923342b7fa6d..ad92e1c24cab 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.ts
@@ -205,6 +205,7 @@ export function createDeferredStructuredAgentSessionEventSink(
       {
         bytes: Buffer.byteLength(JSON.stringify({ settlementId, mutations }), 'utf8') + 512,
         coalescingKey: `lifecycle:${settlementId}`,
+        keepsFirst: true,
         run: (bound) =>
           bound.journal.appendLifecycleBatch({
             settlementId,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-eviction.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-eviction.test.ts
index cb0cb2fb2334..8fc810de2a4d 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-eviction.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-eviction.test.ts
@@ -30,8 +30,8 @@ function context(): StructuredAgentSessionEvictionContext & { order: string[] }
         return true
       })
     } as unknown as StructuredAgentSessionEvictionContext['adapter'],
-    forget: vi.fn(async () => {
-      order.push('forget')
+    acknowledgeRelease: vi.fn(() => {
+      order.push('acknowledgeRelease')
     }),
     discardSink: vi.fn(() => order.push('discardSink')),
     settleWork: vi.fn(async () => {
@@ -51,7 +51,7 @@ function runtimeState(): StructuredAgentSessionHostRuntimeState {
 }
 
 describe('structured agent session eviction', () => {
-  it('stops the child before it lets the sink go, then forgets the session', async () => {
+  it('stops the child before it lets the sink go, then acknowledges the release', async () => {
     const ctx = context()
     await evictStructuredAgentSession(ctx)
     expect(ctx.order).toEqual([
@@ -62,7 +62,7 @@ describe('structured agent session eviction', () => {
       'close',
       'discardSink',
       'releaseLease',
-      'forget'
+      'acknowledgeRelease'
     ])
   })
 
@@ -90,7 +90,7 @@ describe('structured agent session eviction', () => {
       'close-sink',
       'discard-sink',
       'release-lease',
-      'forget-session'
+      'acknowledge-release'
     ])
   })
 
@@ -114,7 +114,7 @@ describe('structured agent session eviction', () => {
     }
   })
 
-  it('aborts after a failed drain barrier without unbinding or forgetting the session', async () => {
+  it('aborts after a failed drain barrier without unbinding or acknowledging the release', async () => {
     const ctx = context()
     ctx.eventSink.drained = vi.fn(async () => {
       ctx.order.push('drained')
@@ -128,7 +128,7 @@ describe('structured agent session eviction', () => {
     expect(ctx.eventSink.close).not.toHaveBeenCalled()
     expect(ctx.discardSink).not.toHaveBeenCalled()
     expect(ctx.releaseLease).not.toHaveBeenCalled()
-    expect(ctx.forget).not.toHaveBeenCalled()
+    expect(ctx.acknowledgeRelease).not.toHaveBeenCalled()
     expect(ctx.order).toEqual(['closeSession', 'drained'])
   })
 })
@@ -154,9 +154,9 @@ describe('rows the provider emits while closing', () => {
           return true
         }
       } as never,
-      forget: async () => {},
       discardSink: () => state.discardEventSink(sessionId),
-      releaseLease: async () => {}
+      releaseLease: async () => {},
+      acknowledgeRelease: () => {}
     })
 
     expect(published).toEqual(['final-flush'])
@@ -174,9 +174,13 @@ describe('a child that will not stop', () => {
     ctx.adapter.closeSession = vi.fn(async () => {
       throw error
     })
+    const stopped = vi.fn()
+    ctx.onProviderChildStopped = stopped
 
     await evictStructuredAgentSession(ctx)
 
+    // The host ends its child on the one reading of the verdict, not a second one of its own.
+    expect(stopped).toHaveBeenCalledWith({ rootGone: true })
     expect(ctx.order).toEqual([
       'drained',
       'settleWork',
@@ -184,18 +188,18 @@ describe('a child that will not stop', () => {
       'close',
       'discardSink',
       'releaseLease',
-      'forget'
+      'acknowledgeRelease'
     ])
   })
 
-  it('aborts without forgetting the session, so the next close is a real retry', async () => {
+  it('aborts without acknowledging the release, so the next stop is a real retry', async () => {
     const ctx = context()
     ctx.adapter.closeSession = vi.fn(async () => false)
 
     await expect(evictStructuredAgentSession(ctx)).rejects.toMatchObject({
       step: 'stop-provider-child'
     })
-    expect(ctx.forget).not.toHaveBeenCalled()
+    expect(ctx.acknowledgeRelease).not.toHaveBeenCalled()
     expect(ctx.discardSink).not.toHaveBeenCalled()
     expect(ctx.order).toEqual([])
   })
@@ -210,7 +214,7 @@ describe('a child that will not stop', () => {
       StructuredAgentSessionEvictionError
     )
     expect(ctx.eventSink.close).not.toHaveBeenCalled()
-    expect(ctx.forget).not.toHaveBeenCalled()
+    expect(ctx.acknowledgeRelease).not.toHaveBeenCalled()
   })
 })
 
@@ -225,9 +229,9 @@ describe('eviction against the real sink cache', () => {
       sessionId,
       eventSink: state.eventSinkFor(sessionId),
       adapter: { closeSession: async () => true } as never,
-      forget: async () => {},
       discardSink: () => state.discardEventSink(sessionId),
-      releaseLease: async () => {}
+      releaseLease: async () => {},
+      acknowledgeRelease: () => {}
     })
 
     const published: string[] = []
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-eviction.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-eviction.ts
index e5a1d942818c..226781117bdf 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-eviction.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-eviction.ts
@@ -1,4 +1,4 @@
-// Releasing one structured session's resources.
+// Stopping one structured session's provider child and handing its lease back.
 //
 // Teardown is a DATA list, not a method body, for the reason this file exists at all: the host
 // tracked which sessions were live in a map, and tore them down at three unrelated call sites
@@ -22,6 +22,7 @@ import {
   type StructuredAgentSessionAdapter
 } from './structured-agent-session-adapter'
 import type { DeferredStructuredAgentSessionEventSink } from './structured-agent-session-event-sink'
+import type { StructuredAgentSessionStopVerdict } from './structured-agent-session-host-types'
 import { withTimeout } from '../../../shared/promise-timeout-fallback'
 
 export type StructuredAgentSessionEvictionContext = {
@@ -29,17 +30,17 @@ export type StructuredAgentSessionEvictionContext = {
   hasProviderChild?: boolean
   eventSink: DeferredStructuredAgentSessionEventSink
   adapter: StructuredAgentSessionAdapter
-  /** Closes the session's journal handle and drops the map entry. Async and
-   *  awaited: `close()` is ordered behind queued writes, and a delete that
-   *  returns while the close is still queued leaves nothing to retry. */
-  forget: () => Promise<void>
+  /** Tells the adapter the released lease is done with, so it drops this child's route and index.
+   *  The conversation stays: stopping the agent never closes its journal. */
+  acknowledgeRelease: () => Promise<void> | void
   /** Drops the cached sink so a later attach mints a fresh one. */
   discardSink: () => void
   /** Fires right before the stop, while the child's turn and background roster are still live. A
    *  throw is logged, never allowed to abort the stop. */
   beforeProviderChildStop?: () => void
-  /** Fires once the adapter has PROVEN the child gone, so host bookkeeping stops claiming one. */
-  onProviderChildStopped?: () => void
+  /** Fires with the stop's verdict once `stopAgentSessionProviderRoot` read the root gone, so host
+   *  bookkeeping stops claiming a child. */
+  onProviderChildStopped?: (verdict: StructuredAgentSessionStopVerdict) => void
   /** Whether this host still owes the child's wind-down. Distinct from `hasProviderChild`, which a
    *  proven exit retires mid-run: the two disagree for exactly the steps a retry has to repeat. */
   owesProviderChildWindDown?: boolean
@@ -51,7 +52,7 @@ export type StructuredAgentSessionEvictionContext = {
 }
 
 /** The resume offer is advisory; a stalled sink must not hold the child's stop behind it. */
-const SNAPSHOT_DRAIN_TIMEOUT_MS = 1_000
+export const SNAPSHOT_DRAIN_TIMEOUT_MS = 1_000
 
 export type StructuredAgentSessionEvictionStep = {
   name: string
@@ -84,13 +85,13 @@ export const STRUCTURED_AGENT_SESSION_EVICTION_STEPS: readonly StructuredAgentSe
         }
         // An adapter with no close has nothing to stop; anything else must PROVE the exit.
         const stop = context.adapter.disposeSession ?? context.adapter.closeSession
-        if (
-          stop &&
-          !(await stopAgentSessionProviderRoot(() => stop.call(context.adapter, context.sessionId)))
-        ) {
+        const rootGone = stop
+          ? await stopAgentSessionProviderRoot(() => stop.call(context.adapter, context.sessionId))
+          : true
+        if (!rootGone) {
           throw new Error('provider child exit was not proven')
         }
-        context.onProviderChildStopped?.()
+        context.onProviderChildStopped?.({ rootGone })
       }
     },
     {
@@ -115,11 +116,11 @@ export const STRUCTURED_AGENT_SESSION_EVICTION_STEPS: readonly StructuredAgentSe
     // these two; eviction has to as well.
     { name: 'discard-sink', run: (context) => context.discardSink() },
     // Why here and not last: the durable lease still names a process this host just stopped, and a
-    // record left claiming a live owner is one nothing can resume — the next surface to open the
-    // chat would find a session it may not acquire. Placed BEFORE forget so a release that cannot
-    // be written aborts while the session is still indexed, which is what makes the retry real.
+    // record left claiming a live owner is one nothing can resume — the next send would find a
+    // session it may not acquire. Placed BEFORE the acknowledgement so a release that cannot be
+    // written aborts while the adapter still routes the session, which is what makes the retry real.
     { name: 'release-lease', run: (context) => context.releaseLease() },
-    { name: 'forget-session', run: (context) => context.forget() }
+    { name: 'acknowledge-release', run: (context) => context.acknowledgeRelease() }
   ]
 
 export class StructuredAgentSessionEvictionError extends Error {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-owner-verdict.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-owner-verdict.test.ts
index ee664ebc0d42..317e7ca81a0d 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-owner-verdict.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-owner-verdict.test.ts
@@ -13,6 +13,7 @@ import {
   type StructuredAgentSessionAdapter
 } from './structured-agent-session-adapter'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import { withObservedProviderExit } from './structured-agent-session-failure-text'
 import {
   HOST_TEST_NOW as NOW,
   HOST_TEST_SESSION as SESSION,
@@ -23,6 +24,10 @@ import {
 
 const CALLER = { callerKey: 'client-1' }
 const EXIT_REASON = 'claude stream-json exited (code 1): stderr tail'
+// The refusal says what the chat's start failure says; the error text stays in the log.
+const COULD_NOT_RESTART = "Codex couldn't restart. Send your message to try again."
+const PROVIDER_STOPPED =
+  'Codex stopped before it finished starting. Send your message to try again.'
 
 let root: string
 let store: AgentSessionRecordStore
@@ -66,47 +71,75 @@ afterEach(async () => {
 })
 
 describe('failed create owner verdict', () => {
-  it('answers an exit-proven failure as exited on the first call and its replay, and a new operation starts fresh', async () => {
-    // The cleanup's release proves the whole tree gone: the common failed start.
-    acquire.mockRejectedValueOnce(new Error(EXIT_REASON))
-    const first = hostTestAttachParams(null)
-    const refusal = {
-      code: 'agent_session_operation_invalid',
-      message: EXIT_REASON,
-      ownerVerdict: 'exited'
-    }
-
-    await expect(host.attach(CALLER, first)).resolves.toEqual({ ok: false, refusal })
-    await expect(host.attach(CALLER, first)).resolves.toEqual({ ok: false, refusal })
-    expect(acquire).toHaveBeenCalledOnce()
+  it.each([
+    // The cleanup's release proves the whole tree gone, which says nothing about why it failed.
+    ['a failure the cleanup proved gone', () => new Error(EXIT_REASON), {}, COULD_NOT_RESTART],
+    // Only an exit the adapter saw says the provider stopped.
+    [
+      'an exit the adapter observed',
+      () => withObservedProviderExit(new Error(EXIT_REASON)),
+      { reason: 'providerStartFailed' },
+      PROVIDER_STOPPED
+    ]
+  ])(
+    'answers %s as exited on the first call and its replay, and a new operation starts fresh',
+    async (_case, failure, situation, message) => {
+      acquire.mockRejectedValueOnce(failure())
+      const first = hostTestAttachParams(null)
+      // The replay names the same details as the first answer: the ledger kept them beside the code,
+      // and the verdict reaches released clients at the top level exactly as before.
+      const refusal = {
+        code: 'agent_session_operation_invalid',
+        details: { ...situation, ownerVerdict: 'exited' },
+        message,
+        ownerVerdict: 'exited'
+      }
 
-    const retry = hostTestAttachParams(null)
-    expect(retry.envelope.clientOperationId).not.toBe(first.envelope.clientOperationId)
-    await expect(host.attach(CALLER, retry)).resolves.toMatchObject({ ok: true })
-    expect(acquire).toHaveBeenCalledTimes(2)
-    expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('live')
-  })
+      await expect(host.attach(CALLER, first)).resolves.toEqual({ ok: false, refusal })
+      await expect(host.attach(CALLER, first)).resolves.toEqual({ ok: false, refusal })
+      expect(acquire).toHaveBeenCalledOnce()
 
-  it('answers a first-hand root exit as exited on the first call, in the shape its replay takes', async () => {
-    acquire.mockRejectedValueOnce(
-      new AgentSessionAcquisitionRootExitObservedError(new Error(EXIT_REASON))
-    )
-    const first = hostTestAttachParams(null)
-    const refusal = {
-      code: 'agent_session_operation_invalid',
-      message: EXIT_REASON,
-      ownerVerdict: 'exited'
+      const retry = hostTestAttachParams(null)
+      expect(retry.envelope.clientOperationId).not.toBe(first.envelope.clientOperationId)
+      await expect(host.attach(CALLER, retry)).resolves.toMatchObject({ ok: true })
+      expect(acquire).toHaveBeenCalledTimes(2)
+      expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('live')
     }
+  )
+
+  it.each([
+    // A cleanup that saw the root go may have stopped it itself.
+    ['a root exit the cleanup saw', () => new Error(EXIT_REASON), {}, COULD_NOT_RESTART],
+    [
+      'a root exit the adapter observed',
+      () => withObservedProviderExit(new Error(EXIT_REASON)),
+      { reason: 'providerStartFailed' },
+      PROVIDER_STOPPED
+    ]
+  ])(
+    'answers %s as exited on the first call, in the shape its replay takes',
+    async (_case, cause, situation, message) => {
+      acquire.mockRejectedValueOnce(new AgentSessionAcquisitionRootExitObservedError(cause()))
+      const first = hostTestAttachParams(null)
+      // The replay names the same details as the first answer: the ledger kept them beside the code,
+      // and the verdict reaches released clients at the top level exactly as before.
+      const refusal = {
+        code: 'agent_session_operation_invalid',
+        details: { ...situation, ownerVerdict: 'exited' },
+        message,
+        ownerVerdict: 'exited'
+      }
 
-    await expect(host.attach(CALLER, first)).resolves.toEqual({ ok: false, refusal })
-    await expect(host.attach(CALLER, first)).resolves.toEqual({ ok: false, refusal })
-    expect(acquire).toHaveBeenCalledOnce()
+      await expect(host.attach(CALLER, first)).resolves.toEqual({ ok: false, refusal })
+      await expect(host.attach(CALLER, first)).resolves.toEqual({ ok: false, refusal })
+      expect(acquire).toHaveBeenCalledOnce()
 
-    await expect(host.attach(CALLER, hostTestAttachParams(null))).resolves.toMatchObject({
-      ok: true
-    })
-    expect(acquire).toHaveBeenCalledTimes(2)
-  })
+      await expect(host.attach(CALLER, hostTestAttachParams(null))).resolves.toMatchObject({
+        ok: true
+      })
+      expect(acquire).toHaveBeenCalledTimes(2)
+    }
+  )
 
   it('answers an acquisition refusal with its verdict directly', async () => {
     acquire.mockRejectedValueOnce(new AgentSessionAcquisitionRefusal('not signed in'))
@@ -115,7 +148,8 @@ describe('failed create owner verdict', () => {
       ok: false,
       refusal: {
         code: 'agent_session_operation_invalid',
-        message: 'not signed in',
+        details: { reason: 'providerStartFailed', ownerVerdict: 'exited' },
+        message: PROVIDER_STOPPED,
         ownerVerdict: 'exited'
       }
     })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-refusal.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-refusal.ts
index a5e00fde53c0..90f52db3d095 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-refusal.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-refusal.ts
@@ -1,7 +1,12 @@
-import type {
-  AgentSessionAttachResult,
-  AgentSessionMutationResult,
-  AgentSessionWireRefusal
+import {
+  isAgentSessionWireRefusalCode,
+  refuse,
+  refuseUnclassified,
+  withAgentSessionRefusalFacts,
+  type AgentSessionAttachResult,
+  type AgentSessionMutationResult,
+  type AgentSessionRefusalDetailsByCode,
+  type AgentSessionWireRefusal
 } from '../../../shared/agent-session-wire'
 import type {
   AgentSessionOperationOutcome,
@@ -15,16 +20,50 @@ import {
   AgentSessionAcquisitionExitUnprovenError,
   AgentSessionAcquisitionRefusal,
   AgentSessionAcquisitionRootExitObservedError,
+  AgentSessionPreSpawnError,
   isAgentSessionPreSpawnError
 } from './structured-agent-session-adapter'
+import {
+  providerExitObserved,
+  structuredAgentSessionStartFailure
+} from './structured-agent-session-failure-text'
+import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation'
+
+/** Who a failed acquisition's sentence names, and whether it was the session's first start. */
+export type FailedAcquisitionWording = {
+  record: AgentSessionRecord | null
+  newSession: boolean
+}
+
+/** The refusal a failed acquisition answers with, worded as the start failure it records: its
+ *  error text is Orca's or the provider's log wording, so it goes to the log, never the wire. */
+function failedAcquisitionWireRefusal(
+  details: AgentSessionRefusalDetailsByCode['agent_session_operation_invalid'] | undefined,
+  wording: FailedAcquisitionWording
+): AgentSessionWireRefusal {
+  const code = 'agent_session_operation_invalid'
+  const refusal = details ? refuse(code, details, code) : refuseUnclassified(code, code)
+  const { reason } = structuredAgentSessionStartFailure(
+    { refusal, ...(wording.newSession ? { newSession: true as const } : {}) },
+    structuredAgentSessionFailureWordsContext(wording.record)
+  )
+  return { ...refusal, message: reason }
+}
 
 /** What a failed acquisition proved about its process, and the outcome its operation settles to. */
-export function failedAcquisitionSettlement(error: unknown): {
+export function failedAcquisitionSettlement(
+  error: unknown,
+  wording: FailedAcquisitionWording
+): {
   exitProof: AgentSessionAcquisitionExitProof
   outcome: Extract<AgentSessionOperationOutcome, { status: 'failed' }>
 } {
   if (error instanceof AgentSessionAcquisitionExitUnprovenError) {
-    const outcome = { code: 'agent_session_ownership_unknown', message: error.message }
+    const outcome = {
+      code: 'agent_session_ownership_unknown',
+      details: { reason: 'ownerUnproven' as const },
+      message: error.message
+    }
     return { exitProof: 'unproven', outcome: { status: 'failed', ...outcome } }
   }
   const exitProof = isAgentSessionPreSpawnError(error)
@@ -32,33 +71,79 @@ export function failedAcquisitionSettlement(error: unknown): {
     : error instanceof AgentSessionAcquisitionRootExitObservedError
       ? 'root-exit-observed'
       : 'exit-proven'
-  const message = error instanceof Error ? error.message : String(error)
-  const code =
-    error instanceof AgentSessionAcquisitionRefusal ? error.code : 'agent_session_operation_invalid'
-  return { exitProof, outcome: { status: 'failed', code, message } }
+  const raw = error instanceof Error ? error.message : String(error)
+  const details = failedAcquisitionDetails(error)
+  const message =
+    failedAcquisitionRefusal(error, wording)?.refusal.message ??
+    // A store refusal's message is its code, which its replay has always carried.
+    (isAgentSessionWireRefusalCode(raw)
+      ? raw
+      : failedAcquisitionWireRefusal(details, wording).message)
+  return {
+    exitProof,
+    outcome: {
+      status: 'failed',
+      code: 'agent_session_operation_invalid',
+      ...(details ? { details } : {}),
+      message
+    }
+  }
+}
+
+/** Cleanup proved the child gone after the start failed, whatever failed it. */
+function isExitProvenAcquisitionFailure(error: unknown): error is Error {
+  return (
+    error instanceof AgentSessionAcquisitionRootExitObservedError ||
+    error instanceof AgentSessionAcquisitionExitProvenError
+  )
+}
+
+/** The situation a failed acquisition stands for: what the adapter typed, or a provider the
+ *  adapter saw exit while starting. A provider refusing a request, a timeout, a store refusal or
+ *  Orca's own fault names none: the child being gone now says nothing about why. */
+function failedAcquisitionDetails(
+  error: unknown
+): AgentSessionRefusalDetailsByCode['agent_session_operation_invalid'] | undefined {
+  if (error instanceof AgentSessionAcquisitionRefusal) {
+    return { reason: error.reason }
+  }
+  if (isAgentSessionPreSpawnError(error) && error.reason) {
+    return { reason: error.reason }
+  }
+  if (isExitProvenAcquisitionFailure(error) && providerExitObserved(error)) {
+    return { reason: 'providerStartFailed' }
+  }
+  return undefined
 }
 
 /** A failed acquisition answered as a refusal on the first call, in the shape its replay takes;
  *  null leaves the error to the store-failure classification. */
 export function failedAcquisitionRefusal(
-  error: unknown
+  error: unknown,
+  wording: FailedAcquisitionWording
 ): { ok: false; refusal: AgentSessionWireRefusal } | null {
-  if (error instanceof AgentSessionAcquisitionRefusal) {
-    return { ok: false, refusal: { code: error.code, message: error.message } }
-  }
-  // A proven exit is a settled fact; its message is the provider's own diagnostic.
-  if (
-    error instanceof AgentSessionAcquisitionRootExitObservedError ||
-    error instanceof AgentSessionAcquisitionExitProvenError
-  ) {
+  // A proven exit is a settled failure, answered in the shape its ledger row replays.
+  if (error instanceof AgentSessionAcquisitionRefusal || isExitProvenAcquisitionFailure(error)) {
     return {
       ok: false,
-      refusal: { code: 'agent_session_operation_invalid', message: error.message }
+      refusal: failedAcquisitionWireRefusal(failedAcquisitionDetails(error), wording)
     }
   }
   return null
 }
 
+/** A start that failed before any process still throws, in the sentence its replay reads: the
+ *  error's own text is Orca's or the refusing site's, so it goes to the log. A message that is
+ *  itself a code keeps it, since the wire routes on it. */
+export function preSpawnFailureInWords(error: unknown, wording: FailedAcquisitionWording): unknown {
+  if (!isAgentSessionPreSpawnError(error) || /^[a-z0-9_]+$/.test(error.message)) {
+    return error
+  }
+  return new AgentSessionPreSpawnError(error, {
+    message: failedAcquisitionSettlement(error, wording).outcome.message
+  })
+}
+
 /** Only a durably failed operation says anything about retrying under a new one. */
 export function failedCreateRefusal(
   refusal: AgentSessionWireRefusal,
@@ -68,7 +153,9 @@ export function failedCreateRefusal(
   return status === 'failed' && record
     ? {
         ok: false,
-        refusal: { ...refusal, ownerVerdict: agentSessionLeaseOwnerVerdict(record.lease) }
+        refusal: withAgentSessionRefusalFacts(refusal, {
+          ownerVerdict: agentSessionLeaseOwnerVerdict(record.lease)
+        })
       }
     : { ok: false, refusal }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-sink-release.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-sink-release.test.ts
index c61d93cbb8fd..69f9b95c03a3 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-sink-release.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-sink-release.test.ts
@@ -82,8 +82,11 @@ describe('a create that fails after its child wrote through the unbound sink', (
 
       const failed = host.attach(CALLER, hostTestAttachParams(null))
       await (cause instanceof AgentSessionPreSpawnError
-        ? expect(failed).rejects.toThrow(EXIT_REASON)
-        : expect(failed).resolves.toMatchObject({ ok: false, refusal: { message: EXIT_REASON } }))
+        ? expect(failed).rejects.toThrow("Codex couldn't restart. Send your message to try again.")
+        : expect(failed).resolves.toMatchObject({
+            ok: false,
+            refusal: { message: "Codex couldn't restart. Send your message to try again." }
+          }))
 
       await expect(host.attach(CALLER, hostTestAttachParams(null))).resolves.toMatchObject({
         ok: true
@@ -118,7 +121,7 @@ describe('a create that fails after its child wrote through the unbound sink', (
     // The session stays indexed across this failure: it is a resume, not a create.
     const failed = host.attach(CALLER, hostTestAttachParams(releasedFence))
     await (cause instanceof AgentSessionPreSpawnError
-      ? expect(failed).rejects.toThrow(EXIT_REASON)
+      ? expect(failed).rejects.toThrow("Codex couldn't restart. Send your message to try again.")
       : expect(failed).resolves.toMatchObject({ ok: false }))
 
     const fence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.test.ts
new file mode 100644
index 000000000000..fcebdda77266
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.test.ts
@@ -0,0 +1,201 @@
+import { describe, expect, it } from 'vitest'
+import {
+  MAX_PROVIDER_DIAGNOSTIC_CHARS,
+  providerDiagnostic,
+  withProviderDiagnostic
+} from '../../../shared/agent-session-failure'
+import {
+  AgentSessionRefusalError,
+  refuse,
+  refuseUnclassified
+} from '../../../shared/agent-session-wire-refusals'
+import { AgentSessionAcquisitionRefusal } from './structured-agent-session-adapter'
+import { MAX_UNEXPECTED_EXIT_REASON_CHARS } from './structured-agent-session-dead-generation-settlement'
+import {
+  structuredAgentSessionStartFailure,
+  withObservedProviderExit
+} from './structured-agent-session-failure-text'
+
+/** What Orca's own error text looks like: a code, a marker, a uuid, a path, an exception. */
+const ORCA_INTERNAL =
+  /agent_session_|execution_owner|provider_[a-z_]+|[0-9a-f]{8}-[0-9a-f]{4}-|[/\\][\w.-]+[/\\]|Error:|ENOENT/
+
+describe('structuredAgentSessionStartFailure', () => {
+  it('keeps a provider diagnostic only when the error carried one', () => {
+    const carried = withProviderDiagnostic(
+      new Error('claude stream-json exited (code 1): boom'),
+      providerDiagnostic('code 1\nboom', 'log')
+    )
+    expect(structuredAgentSessionStartFailure({ error: carried }, { agentName: 'Claude' })).toEqual(
+      {
+        reason: "Claude couldn't start. Send your message to try again.",
+        rejection: { kind: 'startFailed', detail: { text: 'code 1\nboom', audience: 'log' } }
+      }
+    )
+    // Orca's own words, however provider-like, are never promoted to a detail.
+    expect(
+      structuredAgentSessionStartFailure({ error: new Error('Not logged in. Run /login.') })
+        .rejection
+    ).toEqual({ kind: 'startFailed' })
+  })
+
+  it('keeps a start refusal the adapter typed', () => {
+    const refusal = new AgentSessionAcquisitionRefusal(
+      'Claude is not signed in for the selected account.',
+      'notSignedIn'
+    )
+    expect(structuredAgentSessionStartFailure({ error: refusal }, { agentName: 'Claude' })).toEqual(
+      {
+        reason:
+          'Claude is not signed in for the selected account. Sign in, then send your message again.',
+        rejection: { kind: 'notSignedIn' }
+      }
+    )
+  })
+
+  it.each([
+    [
+      'managedAccountEnvOverride',
+      'This Claude launch sets its own Anthropic sign-in variables. Remove them to use a managed Claude account.'
+    ],
+    [
+      'accountSwitchInProgress',
+      'A Claude account switch is in progress. Try again after it finishes.'
+    ],
+    [
+      'managedAccountUnsupported',
+      'While a Claude account is added in WSL, Claude chats need a Windows Claude account. Choose or add one in Claude Accounts settings, then send your message again.'
+    ]
+  ] as const)('words a start refused for %s by that situation', (reason, sentence) => {
+    const code = 'agent_session_operation_invalid'
+    expect(
+      structuredAgentSessionStartFailure(
+        { refusal: refuse(code, { reason }, code) },
+        { agentName: 'Claude' }
+      )
+    ).toEqual({ reason: sentence, rejection: { kind: reason } })
+  })
+
+  it('words a refused restart by its situation, never its message', () => {
+    const words = structuredAgentSessionStartFailure(
+      {
+        refusal: refuse(
+          'agent_session_ownership_unknown',
+          { reason: 'ownerUnproven' },
+          'Orca cannot prove that process 4242 on host-1 has exited.'
+        )
+      },
+      { agentName: 'Claude' }
+    )
+    expect(words).toEqual({
+      reason: "Claude couldn't restart. Send your message to try again.",
+      rejection: {
+        kind: 'restartFailed',
+        refusal: {
+          code: 'agent_session_ownership_unknown',
+          details: { reason: 'ownerUnproven' }
+        }
+      }
+    })
+  })
+
+  it("reads an exit before the start as a failed start, and an Orca fault as Orca's", () => {
+    expect(
+      structuredAgentSessionStartFailure({
+        exit: { kind: 'providerExited', detail: { text: 'stderr', audience: 'log' } }
+      }).rejection
+    ).toEqual({ kind: 'providerStartFailed', detail: { text: 'stderr', audience: 'log' } })
+    expect(structuredAgentSessionStartFailure({ exit: { kind: 'hostFault' } }).rejection).toEqual({
+      kind: 'hostFault'
+    })
+    expect(structuredAgentSessionStartFailure({ hostFault: true }).reason).not.toMatch(
+      ORCA_INTERNAL
+    )
+  })
+
+  it("holds any provider detail to the lease record's cap", () => {
+    expect(MAX_PROVIDER_DIAGNOSTIC_CHARS).toBe(512)
+    expect(MAX_UNEXPECTED_EXIT_REASON_CHARS).toBe(MAX_PROVIDER_DIAGNOSTIC_CHARS)
+    const long = 'x'.repeat(4_000)
+    // However the caller built the detail, the fact stores at most the cap.
+    const words = structuredAgentSessionStartFailure({
+      diagnostic: { text: long, audience: 'log' }
+    })
+    expect(words.rejection.detail?.text).toHaveLength(MAX_UNEXPECTED_EXIT_REASON_CHARS)
+    expect(
+      structuredAgentSessionStartFailure({
+        exit: { kind: 'providerExited', detail: { text: long, audience: 'log' } }
+      }).rejection.detail?.text
+    ).toHaveLength(MAX_UNEXPECTED_EXIT_REASON_CHARS)
+  })
+
+  it('says the provider stopped only when an exit was observed', () => {
+    // An `exited` verdict says only that nothing runs now, not that the provider stopped.
+    const gone = refuseUnclassified('agent_session_operation_invalid', 'thread gone', {
+      ownerVerdict: 'exited'
+    })
+    const person = { text: 'no rollout found for thread id T', audience: 'person' } as const
+    expect(
+      structuredAgentSessionStartFailure(
+        { refusal: gone, diagnostic: person },
+        { agentName: 'Codex' }
+      )
+    ).toEqual({
+      reason: "Codex couldn't restart. Send your message to try again.",
+      rejection: {
+        kind: 'restartFailed',
+        detail: person,
+        refusal: {
+          code: 'agent_session_operation_invalid',
+          details: { ownerVerdict: 'exited' }
+        }
+      }
+    })
+    const observed = refuse(
+      'agent_session_operation_invalid',
+      { reason: 'providerStartFailed', ownerVerdict: 'exited' },
+      'exited (code 1)'
+    )
+    expect(
+      structuredAgentSessionStartFailure({
+        refusal: observed,
+        diagnostic: { text: 'code 1', audience: 'log' }
+      })
+    ).toEqual({
+      reason: 'The agent stopped before it finished starting. Send your message to try again.',
+      rejection: { kind: 'providerStartFailed', detail: { text: 'code 1', audience: 'log' } }
+    })
+    // A start that threw proves nothing about the provider: it may be Orca's, or a failed spawn.
+    expect(
+      structuredAgentSessionStartFailure({ error: new Error('spawn claude ENOENT') }, {})
+    ).toEqual({
+      reason: "The agent couldn't start. Send your message to try again.",
+      rejection: { kind: 'startFailed' }
+    })
+    // The same error, once the adapter that observed the child's exit marked it, blames the provider.
+    const exit = withObservedProviderExit(
+      withProviderDiagnostic(new Error('exited (code 1)'), providerDiagnostic('code 1', 'log'))
+    )
+    expect(
+      structuredAgentSessionStartFailure({ error: new Error('wrapped', { cause: exit }) })
+    ).toEqual({
+      reason: 'The agent stopped before it finished starting. Send your message to try again.',
+      rejection: { kind: 'providerStartFailed', detail: { text: 'code 1', audience: 'log' } }
+    })
+  })
+
+  it('reads a thrown refusal the same as a returned one', () => {
+    const thrown = new AgentSessionRefusalError(
+      refuse(
+        'agent_session_conflict',
+        { reason: 'claimConflicted' },
+        'Another process claims this session.'
+      )
+    )
+    expect(thrown.message).toBe('agent_session_conflict')
+    expect(structuredAgentSessionStartFailure({ refusal: thrown.refusal }).rejection).toEqual({
+      kind: 'restartFailed',
+      refusal: { code: 'agent_session_conflict', details: { reason: 'claimConflicted' } }
+    })
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
new file mode 100644
index 000000000000..c0c2172230dc
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
@@ -0,0 +1,163 @@
+// The facts a start or an exit reduces to, and the one place a failed start is worded. The
+// sentence itself comes from `agentSessionFailureWords`, beside the fact it states.
+
+import {
+  agentSessionFailureFact,
+  providerDiagnosticOf,
+  type SubmissionRejectionFact,
+  type AgentSessionFailureKind,
+  type ProviderDiagnostic
+} from '../../../shared/agent-session-failure'
+import type { AgentSessionRefusalReason } from '../../../shared/agent-session-refusal-details'
+import {
+  agentSessionFailureWords,
+  type AgentJournalDispatchRejection,
+  type AgentSessionFailureWordsContext
+} from '../../../shared/agent-session-failure-words'
+import {
+  agentSessionRefusalReference,
+  type AgentSessionWireRefusal
+} from '../../../shared/agent-session-wire-refusals'
+import { AgentSessionAcquisitionRefusal } from './structured-agent-session-adapter'
+
+/** Start refusals whose situation is itself what the person reads, with its own next step. */
+const TYPED_START_REFUSALS = [
+  'notSignedIn',
+  'historyTooLarge',
+  'managedAccountEnvOverride',
+  'accountSwitchInProgress',
+  'managedAccountUnsupported'
+] as const satisfies readonly (AgentSessionFailureKind &
+  AgentSessionRefusalReason<'agent_session_operation_invalid'>)[]
+
+function typedStartRefusal(
+  reason: string | undefined
+): (typeof TYPED_START_REFUSALS)[number] | undefined {
+  return TYPED_START_REFUSALS.find((typed) => typed === reason)
+}
+
+/** Marks the error an adapter observed its child's exit with, where it observed it. */
+export function withObservedProviderExit<TError extends Error>(error: TError): TError {
+  return Object.assign(error, { providerExitObserved: true })
+}
+
+/** Whether the adapter saw the child exit on its own. Follows `cause` and the errors a cleanup
+ *  aggregated, since the acquisition errors wrap what the adapter threw. */
+export function providerExitObserved(error: unknown, depth = 0): boolean {
+  if (depth >= 6 || !(error instanceof Error)) {
+    return false
+  }
+  if ('providerExitObserved' in error && error.providerExitObserved === true) {
+    return true
+  }
+  if (
+    error instanceof AggregateError &&
+    error.errors.some((inner) => providerExitObserved(inner, depth + 1))
+  ) {
+    return true
+  }
+  return providerExitObserved(error.cause, depth + 1)
+}
+
+/** A start that did not land. A refusal the adapter typed keeps its situation, and an exit the
+ *  adapter observed says the provider stopped; anything else blames no one — it may be Orca's, or
+ *  a spawn that failed. Either keeps the provider's diagnostic when the error carried one. */
+export function providerStartupFailureFact(cause?: unknown): SubmissionRejectionFact {
+  const typed = typedStartRefusal(
+    cause instanceof AgentSessionAcquisitionRefusal ? cause.reason : undefined
+  )
+  if (typed) {
+    return agentSessionFailureFact(typed)
+  }
+  return agentSessionFailureFact(
+    providerExitObserved(cause) ? 'providerStartFailed' : 'startFailed',
+    { detail: providerDiagnosticOf(cause) }
+  )
+}
+
+/** A child that ended before it proved its start: an exit is a start that failed, keeping the
+ *  provider's diagnostic; an Orca fault or a typed start refusal stays what it was. */
+function startupFailureFromExit(
+  failure: SubmissionRejectionFact | undefined
+): SubmissionRejectionFact {
+  if (!failure || failure.kind === 'providerExited') {
+    return agentSessionFailureFact('providerStartFailed', { detail: failure?.detail })
+  }
+  return failure
+}
+
+/** What the chat records when a session could not be made ready. Only a refusal the host typed as
+ *  an observed exit says the provider stopped; a verdict of `exited` means only that nothing runs
+ *  now. */
+function refusedStartFailureFact(
+  cause: Extract<StructuredAgentSessionStartFailureCause, { refusal: unknown }>
+): SubmissionRejectionFact {
+  const { refusal, diagnostic } = cause
+  const reason = refusal.details?.reason
+  const typed = typedStartRefusal(reason)
+  if (typed) {
+    return agentSessionFailureFact(typed)
+  }
+  if (reason === 'providerStartFailed') {
+    return agentSessionFailureFact('providerStartFailed', { detail: diagnostic })
+  }
+  return agentSessionFailureFact(cause.newSession ? 'startFailed' : 'restartFailed', {
+    detail: diagnostic,
+    refusal: agentSessionRefusalReference(refusal)
+  })
+}
+
+/** Why a start the chat needed did not land, as the place that saw it knows it. */
+export type StructuredAgentSessionStartFailureCause =
+  /** The session could not be made ready; the provider's words, if any, are kept host-side, off
+   *  the refusal. `newSession`: one that never ran, so it failed to start rather than restart. */
+  | { refusal: AgentSessionWireRefusal; diagnostic?: ProviderDiagnostic; newSession?: true }
+  /** A start that threw, or an adapter's own startup failure; any diagnostic it carries. */
+  | { error: unknown }
+  /** The child ended before it proved its start, as its ended event told it. */
+  | { exit: SubmissionRejectionFact | undefined }
+  /** The provider exited while starting; only its words are known, and the caller names their
+   *  audience. */
+  | { diagnostic: ProviderDiagnostic | undefined }
+  /** Orca's own fault; its error belongs in the log. */
+  | { hostFault: true }
+  /** Already typed where it was observed. */
+  | { failure: SubmissionRejectionFact }
+
+/** A start failure's row repeats the sentence its rejected messages carry: both are about the
+ *  messages the start was for. */
+export type StructuredAgentSessionStartFailureWords = AgentJournalDispatchRejection
+
+/** The fact a failed start records, for a writer that words it on its own surface. */
+export function structuredAgentSessionStartFailureFact(
+  cause: StructuredAgentSessionStartFailureCause
+): SubmissionRejectionFact {
+  if ('refusal' in cause) {
+    return refusedStartFailureFact(cause)
+  }
+  if ('error' in cause) {
+    return providerStartupFailureFact(cause.error)
+  }
+  if ('exit' in cause) {
+    return startupFailureFromExit(cause.exit)
+  }
+  if ('diagnostic' in cause) {
+    return agentSessionFailureFact('providerStartFailed', { detail: cause.diagnostic })
+  }
+  if ('hostFault' in cause) {
+    return agentSessionFailureFact('hostFault')
+  }
+  return cause.failure
+}
+
+/** The one place a failed start is worded: the error row and every message it rejects carry this
+ *  sentence and this fact, whichever writer saw the start fail. */
+export function structuredAgentSessionStartFailure(
+  cause: StructuredAgentSessionStartFailureCause,
+  context: AgentSessionFailureWordsContext = {}
+): StructuredAgentSessionStartFailureWords {
+  return agentSessionFailureWords(structuredAgentSessionStartFailureFact(cause), {
+    ...context,
+    surface: 'rejection'
+  })
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-forget-status.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-forget-status.test.ts
index 20531bd64653..90e07ddf88ca 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-forget-status.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-forget-status.test.ts
@@ -21,11 +21,10 @@ import type { StructuredAgentSessionAttachContext } from './structured-agent-ses
 import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
 import { StructuredAgentSessionStatusFeed } from './structured-agent-session-status-feed'
 
-// Everything before the journal is out of scope here; what matters is that the orchestration's
-// own `onAttachFailed` runs, which is the real one.
+// Everything before the journal is out of scope here; what matters is what the orchestration does
+// when the attach throws after acquisition.
 vi.mock('./structured-agent-session-attach-flow', () => ({
-  performAttach: async (input: { onAttachFailed?: () => Promise<void> }) => {
-    await input.onAttachFailed?.()
+  performAttach: async () => {
     throw new Error('attach failed after acquisition')
   }
 }))
@@ -136,10 +135,7 @@ async function workingSession(): Promise<{
           accountHome: ownerRecord().accountHome,
           runtimeKind: 'native'
         },
-        fence: 1,
-        hasProviderChild: true,
-        providerChildPhase: 'ready',
-        acquisitionGeneration: null
+        child: { generation: null, fence: 1, phase: 'ready' }
       }
     ]
   ])
@@ -190,7 +186,7 @@ function attachContext(
     reconcileLeases: async () => null,
     serialize: <T>(_sessionId: string, task: () => Promise<T>) => task(),
     now: () => 1,
-    forgetStatus: (sessionId: string) => feed.forget(sessionId)
+    publishStatus: (sessionId: string) => feed.publish(sessionId)
   } as unknown as StructuredAgentSessionAttachContext
 }
 
@@ -230,15 +226,19 @@ describe('a session that leaves the host without an explicit close', () => {
     expect(server.getStatusSnapshot()).toEqual([expect.objectContaining({ prompt: 'other host' })])
   })
 
-  it('leaves the agent-status store with it when an attach fails', async () => {
+  // A failed attach no longer drops the session: the conversation stays open for the failure to be
+  // written into, so its row stays with it and the later close forgets both together.
+  it('keeps the session and its status row together when an attach fails', async () => {
     const { server, feed, sessions } = await workingSession()
+    const drop = vi.spyOn(server, 'dropStructuredStatus')
 
     await expect(
       attachStructuredAgentSession(attachContext(sessions, feed), 'caller-1', attachParams)
     ).rejects.toThrow('attach failed after acquisition')
 
-    expect(sessions.has(SESSION)).toBe(false)
-    expect(server.getStatusSnapshot()).toEqual([])
+    expect(sessions.has(SESSION)).toBe(true)
+    expect(drop).not.toHaveBeenCalled()
+    expect(server.getStatusSnapshot()).toHaveLength(1)
   })
 
   // The feed's own cache deliberately retains the projection for reload history; only the store
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-grouped-prompt.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-grouped-prompt.test.ts
index 013f4191c30a..8181110a5a6b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-grouped-prompt.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-grouped-prompt.test.ts
@@ -96,7 +96,7 @@ async function seedGroupedQuestion(): Promise<{ itemId: string; revision: number
   })
   await host.flushStreamedEvents(SESSION)
   const itemId = agentJournalItemKey(identity)
-  const page = host.history({ sessionId: SESSION, direction: 'tail' })
+  const page = await host.history({ sessionId: SESSION, direction: 'tail' })
   const appended = page.ok ? page.page.items.find((item) => item.itemId === itemId) : null
   if (!appended) {
     throw new Error('provider question was not written to the journal')
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-hold-resume-race.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-hold-resume-race.test.ts
deleted file mode 100644
index 974a69b1c3c8..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-hold-resume-race.test.ts
+++ /dev/null
@@ -1,260 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { runKeyedSerializedOperation } from '../../cli/keyed-promise-queue'
-import type { StructuredAgentSessionResumeOutcome } from './structured-agent-session-hold-resume'
-import { StructuredAgentSessionHolds } from './structured-agent-session-holds'
-
-const GRACE_MS = 15_000
-const pendingHolds: StructuredAgentSessionHolds[] = []
-
-/** The host's per-session queue: a second hold waits for the attach the first one is running. */
-function keyedSerialize() {
-  const chains = new Map<string, Promise<void>>()
-  return <T>(sessionId: string, task: () => Promise<T>) =>
-    runKeyedSerializedOperation(chains, sessionId, task)
-}
-
-function resumeHarness() {
-  const resumeGate = Promise.withResolvers<void>()
-  let child = false
-  let turnActive = false
-  const evict = vi.fn(async () => {
-    child = false
-  })
-  const resume = vi.fn(async () => {
-    await resumeGate.promise
-    child = true
-    return { ok: true as const }
-  })
-  const holds = new StructuredAgentSessionHolds({
-    resume,
-    serialize: keyedSerialize(),
-    hasProviderChild: () => child,
-    hasOwedWork: () => turnActive,
-    evict,
-    graceMs: GRACE_MS
-  })
-  pendingHolds.push(holds)
-  return {
-    holds,
-    resume,
-    resumeGate,
-    evict,
-    hasChild: () => child,
-    setTurnActive: (value: boolean) => {
-      turnActive = value
-    }
-  }
-}
-
-beforeEach(() => vi.useFakeTimers())
-afterEach(() => {
-  for (const holds of pendingHolds.splice(0)) {
-    holds.dispose()
-  }
-  vi.useRealTimers()
-})
-
-describe('a surface leaving while its structured session resumes', () => {
-  it('releases the acquired child after the last surface disconnects during resume', async () => {
-    const { holds, resumeGate, evict, hasChild } = resumeHarness()
-    const hold = holds.hold('session-1', 'connection-1:chat')
-
-    holds.release('session-1', 'connection-1:chat')
-    expect(holds.isReleasePending('session-1')).toBe(false)
-    resumeGate.resolve()
-    await hold
-
-    expect(hasChild()).toBe(true)
-    expect(holds.isHeld('session-1')).toBe(false)
-    expect(holds.isReleasePending('session-1')).toBe(true)
-    await vi.advanceTimersByTimeAsync(GRACE_MS - 1)
-    expect(evict).not.toHaveBeenCalled()
-    await vi.advanceTimersByTimeAsync(1)
-    expect(evict).toHaveBeenCalledExactlyOnceWith('session-1')
-    expect(hasChild()).toBe(false)
-  })
-
-  it('waits for an active turn before releasing the late child', async () => {
-    const { holds, resumeGate, evict, setTurnActive } = resumeHarness()
-    const hold = holds.hold('session-1', 'connection-1:chat')
-    holds.release('session-1', 'connection-1:chat')
-    setTurnActive(true)
-    resumeGate.resolve()
-    await hold
-
-    await vi.advanceTimersByTimeAsync(GRACE_MS * 2)
-    expect(evict).not.toHaveBeenCalled()
-    expect(holds.isReleasePending('session-1')).toBe(true)
-
-    setTurnActive(false)
-    await vi.advanceTimersByTimeAsync(GRACE_MS)
-    expect(evict).toHaveBeenCalledExactlyOnceWith('session-1')
-  })
-
-  it.each([false, true])('preserves an arriving holder with resume=%s', async (resume) => {
-    const { holds, resumeGate, evict } = resumeHarness()
-    const first = holds.hold('session-1', 'connection-1:chat')
-    holds.release('session-1', 'connection-1:chat')
-    const replacement = holds.hold('session-1', 'connection-2:chat', { resume })
-    resumeGate.resolve()
-    await Promise.all([first, replacement])
-
-    await vi.advanceTimersByTimeAsync(GRACE_MS * 2)
-    expect(holds.isHeld('session-1')).toBe(true)
-    expect(holds.isReleasePending('session-1')).toBe(false)
-    expect(evict).not.toHaveBeenCalled()
-
-    holds.release('session-1', 'connection-2:chat')
-    await vi.advanceTimersByTimeAsync(GRACE_MS)
-    expect(evict).toHaveBeenCalledExactlyOnceWith('session-1')
-  })
-
-  it('cancels the late-child release when a surface reconnects during grace', async () => {
-    const { holds, resumeGate, evict } = resumeHarness()
-    const hold = holds.hold('session-1', 'connection-1:chat')
-    holds.release('session-1', 'connection-1:chat')
-    resumeGate.resolve()
-    await hold
-    expect(holds.isReleasePending('session-1')).toBe(true)
-
-    await holds.hold('session-1', 'connection-2:chat')
-    await vi.advanceTimersByTimeAsync(GRACE_MS * 2)
-    expect(holds.isReleasePending('session-1')).toBe(false)
-    expect(evict).not.toHaveBeenCalled()
-  })
-
-  it('preserves a failed resume without scheduling eviction', async () => {
-    const { holds, resumeGate, evict, hasChild } = resumeHarness()
-    const failure = new Error('provider acquisition failed')
-    const hold = holds.hold('session-1', 'connection-1:chat')
-    const rejected = expect(hold).rejects.toBe(failure)
-    holds.release('session-1', 'connection-1:chat')
-    resumeGate.reject(failure)
-    await rejected
-
-    await vi.advanceTimersByTimeAsync(GRACE_MS * 2)
-    expect(hasChild()).toBe(false)
-    expect(holds.isHeld('session-1')).toBe(false)
-    expect(holds.isReleasePending('session-1')).toBe(false)
-    expect(evict).not.toHaveBeenCalled()
-  })
-
-  it('leaves late acquisition cleanup to host teardown after disposal', async () => {
-    const { holds, resumeGate, evict } = resumeHarness()
-    const hold = holds.hold('session-1', 'connection-1:chat')
-    holds.release('session-1', 'connection-1:chat')
-    holds.dispose()
-    resumeGate.resolve()
-    await hold
-
-    await vi.advanceTimersByTimeAsync(GRACE_MS * 2)
-    expect(holds.isReleasePending('session-1')).toBe(false)
-    expect(evict).not.toHaveBeenCalled()
-  })
-
-  it('does not restart release timers when a surface leaves after disposal', async () => {
-    const { holds, resumeGate, evict } = resumeHarness()
-    const hold = holds.hold('session-1', 'connection-1:chat')
-    resumeGate.resolve()
-    await hold
-    holds.dispose()
-    holds.release('session-1', 'connection-1:chat')
-
-    await vi.advanceTimersByTimeAsync(GRACE_MS * 2)
-    expect(holds.isHeld('session-1')).toBe(false)
-    expect(holds.isReleasePending('session-1')).toBe(false)
-    expect(evict).not.toHaveBeenCalled()
-  })
-
-  it('releases a late child acquired after explicit close forgot its holders', async () => {
-    const { holds, resumeGate, evict } = resumeHarness()
-    const hold = holds.hold('session-1', 'connection-1:chat')
-    holds.forget('session-1')
-    resumeGate.resolve()
-    await hold
-
-    await vi.advanceTimersByTimeAsync(GRACE_MS)
-    expect(holds.isHeld('session-1')).toBe(false)
-    expect(evict).toHaveBeenCalledExactlyOnceWith('session-1')
-  })
-
-  it('lets a holder that left and came back make its own attempt behind a failing one, and its failure releases it', async () => {
-    const { holds, resume, resumeGate, evict } = resumeHarness()
-    const first = holds.hold('session-1', 'same-holder')
-    const firstRejected = expect(first).rejects.toThrow('acquisition failed')
-    holds.release('session-1', 'same-holder')
-    const replacement = holds.hold('session-1', 'same-holder')
-    const replacementRejected = expect(replacement).rejects.toThrow('acquisition failed')
-    await vi.advanceTimersByTimeAsync(0)
-    expect(holds.isHeld('session-1')).toBe(true)
-    expect(resume).toHaveBeenCalledOnce()
-
-    // The gate stays rejected, so the replacement's own attempt fails the same way.
-    resumeGate.reject(new Error('acquisition failed'))
-    await Promise.all([firstRejected, replacementRejected])
-
-    expect(resume).toHaveBeenCalledTimes(2)
-    expect(holds.isHeld('session-1')).toBe(false)
-    expect(holds.isReleasePending('session-1')).toBe(false)
-    await vi.advanceTimersByTimeAsync(GRACE_MS * 2)
-    expect(evict).not.toHaveBeenCalled()
-  })
-
-  it('keeps a re-hold that finds the child the failing attempt ahead of it left behind', async () => {
-    const gate = Promise.withResolvers<void>()
-    let child = false
-    const holds = new StructuredAgentSessionHolds({
-      // The child is up before the attempt settles, and then the attempt fails behind it.
-      resume: async () => {
-        child = true
-        await gate.promise
-        return { ok: true as const }
-      },
-      serialize: keyedSerialize(),
-      hasProviderChild: () => child,
-      hasOwedWork: () => false,
-      evict: async () => {},
-      graceMs: GRACE_MS
-    })
-    pendingHolds.push(holds)
-    const first = holds.hold('session-1', 'same-holder')
-    const rejected = expect(first).rejects.toThrow('acquisition failed')
-    holds.release('session-1', 'same-holder')
-    const replacement = holds.hold('session-1', 'same-holder')
-
-    gate.reject(new Error('acquisition failed'))
-    await rejected
-    // The first hold's failure released only the holder it added, at the incarnation it added;
-    // the replacement then ran, found the child, and kept the holder it re-took.
-    await replacement
-
-    expect(holds.isHeld('session-1')).toBe(true)
-    expect(holds.isReleasePending('session-1')).toBe(false)
-  })
-
-  it('starts a fresh resume once the failed one has settled', async () => {
-    let child = false
-    const resume = vi
-      .fn<() => Promise<StructuredAgentSessionResumeOutcome>>()
-      .mockRejectedValueOnce(new Error('first acquisition failed'))
-      .mockImplementationOnce(async () => {
-        child = true
-        return { ok: true }
-      })
-    const holds = new StructuredAgentSessionHolds({
-      resume,
-      serialize: keyedSerialize(),
-      hasProviderChild: () => child,
-      hasOwedWork: () => false,
-      evict: async () => {},
-      graceMs: GRACE_MS
-    })
-    pendingHolds.push(holds)
-
-    await expect(holds.hold('session-1', 'chat-1')).rejects.toThrow('first acquisition failed')
-    await holds.hold('session-1', 'chat-1')
-
-    expect(resume).toHaveBeenCalledTimes(2)
-    expect(holds.isHeld('session-1')).toBe(true)
-  })
-})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-hold-resume.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-hold-resume.ts
deleted file mode 100644
index b29af8c06bbd..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-hold-resume.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-// Giving a session its provider child back.
-//
-// This is the replacement for the startup resume, and the difference is only in WHO asks: the same
-// eligibility rule, run when a surface binds, when a send finds the owner gone, or when a child
-// exits under an open surface — never when the app launches. It runs inside the session's
-// serialize, with the attach it is given, so the eligibility it reads is the one the attach acts
-// on. A write-capable hold must fail when acquisition is refused so the surface never mistakes a
-// readable journal for a live provider child.
-
-import type {
-  AgentSessionAttachResult,
-  AgentSessionMutationResult,
-  AgentSessionWireRefusal
-} from '../../../shared/agent-session-wire'
-import { isAgentSessionWireRefusalCode } from '../../../shared/agent-session-wire-refusals'
-import { terminalOwnerRefusalMessage } from '../../../shared/agent-session-legacy-handoff-lease'
-import type { StructuredAgentSessionAttachContext } from './structured-agent-session-attach-context'
-import {
-  attachStructuredAgentSessionUnderSerialize,
-  type StructuredAgentSessionAttachOptions
-} from './structured-agent-session-attach-orchestration'
-import { failedCreateRefusal } from './structured-agent-session-failed-create-refusal'
-import { adapterSupportsRecord } from './structured-agent-session-provider-support'
-import {
-  structuredAgentSessionResumeOperationId,
-  structuredAgentSessionResumeParams
-} from './structured-agent-session-resume-eligibility'
-
-/** A resume answers with the attach's own refusal, verdict and all, so the asker can tell a lease
- *  someone else is settling from an owner that will not come back. */
-export type StructuredAgentSessionResumeOutcome =
-  | { ok: true }
-  | { ok: false; refusal: AgentSessionWireRefusal }
-
-export async function resumeHeldStructuredAgentSession(input: {
-  sessionId: string
-  context: StructuredAgentSessionAttachContext
-  /** Who is asking; the attach keys the ledger row it settles by it. */
-  callerKey: string
-  attachOptions?: StructuredAgentSessionAttachOptions
-}): Promise<StructuredAgentSessionResumeOutcome> {
-  const { sessionId, context, callerKey } = input
-  // The record is read only once this host has adjudicated it and recovery resolution has
-  // concluded about any owner a failed attempt left in `recovering`, so the eligibility below sees
-  // the lease the resolver handed back.
-  const unreconciled = await context.reconcileLeases(sessionId)
-  if (unreconciled) {
-    return { ok: false, refusal: unreconciled }
-  }
-  await context.runtimeState.resolveRecovery(sessionId)
-  const record = context.deps.store.getRecord(sessionId)
-  if (!record) {
-    return refuse('agent_session_identity_required', 'No structured session exists by that id.')
-  }
-  if (!adapterSupportsRecord(context.deps.adapter, record)) {
-    return refuse(
-      'structured_agent_session_unsupported',
-      'This execution host cannot resume the requested structured agent session.'
-    )
-  }
-  const params = structuredAgentSessionResumeParams(
-    record,
-    structuredAgentSessionResumeOperationId(context.now())
-  )
-  if (!params) {
-    return record.lease.unreconciled
-      ? refuse(
-          'execution_owner_reconciling',
-          'This host has not yet adjudicated the session lease.'
-        )
-      : record.lease.claimStatus === 'conflicted'
-        ? refuse('agent_session_conflict', terminalOwnerRefusalMessage(record.lease))
-        : refuse(
-            'agent_session_ownership_unknown',
-            'The session lease is not one this host may resume.'
-          )
-  }
-  let attached: AgentSessionMutationResult<AgentSessionAttachResult>
-  try {
-    attached = await attachStructuredAgentSessionUnderSerialize(
-      context,
-      callerKey,
-      params,
-      input.attachOptions
-    )
-  } catch (error) {
-    // The attach settles an acquisition that failed — the ledger row, the released lease — before
-    // it rethrows the cause. That row is the answer: a failure it recorded is this resume's
-    // refusal, verdict and all. Only an error it did not record is a fault for the caller.
-    const settled = settledResumeRefusal(
-      context,
-      callerKey,
-      params.envelope.clientOperationId,
-      sessionId,
-      error
-    )
-    if (settled) {
-      return settled
-    }
-    throw error
-  }
-  return attached.ok ? { ok: true } : { ok: false, refusal: attached.refusal }
-}
-
-function settledResumeRefusal(
-  context: Pick<StructuredAgentSessionAttachContext, 'deps'>,
-  callerKey: string,
-  operationId: string,
-  sessionId: string,
-  error: unknown
-): StructuredAgentSessionResumeOutcome | null {
-  const outcome = context.deps.store.getOperationRow(callerKey, operationId)?.outcome
-  if (outcome?.status !== 'failed' || !isAgentSessionWireRefusalCode(outcome.code)) {
-    return null
-  }
-  return failedCreateRefusal(
-    {
-      code: outcome.code,
-      message: outcome.message ?? (error instanceof Error ? error.message : String(error))
-    },
-    outcome.status,
-    context.deps.store.getRecord(sessionId)
-  )
-}
-
-function refuse(
-  code: AgentSessionWireRefusal['code'],
-  message: string
-): StructuredAgentSessionResumeOutcome {
-  return { ok: false, refusal: { code, message } }
-}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-holders.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-holders.ts
deleted file mode 100644
index 531717168b17..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-holders.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-// Who WANTS this session alive, as a set of ids rather than a count.
-//
-// A refcount is the obvious shape and the wrong one. Every path that decrements it — a chat tab
-// closing, a transport dying, a client retrying a release it already sent — can fire twice or not
-// at all, and an integer cannot tell those apart: a duplicate release evicts a session somebody is
-// still looking at, and a lost one leaks the child forever. A set answers both idempotently,
-// because it records WHICH surface holds the session, not how many do.
-
-type Holder = { resumeCapable: boolean; incarnation: symbol }
-
-export class StructuredAgentSessionHolders {
-  private readonly bySession = new Map<string, Map<string, Holder>>()
-
-  /** True when the session gained its FIRST holder — the edge that ends a pending release. */
-  add(sessionId: string, holderId: string, resumeCapable = true): boolean {
-    const holders = this.bySession.get(sessionId)
-    if (!holders) {
-      this.bySession.set(sessionId, new Map([[holderId, { resumeCapable, incarnation: Symbol() }]]))
-      return true
-    }
-    const previous = holders.get(holderId)
-    holders.set(holderId, {
-      resumeCapable: (previous?.resumeCapable ?? false) || resumeCapable,
-      incarnation: previous?.incarnation ?? Symbol()
-    })
-    return false
-  }
-
-  /** True when the session lost its LAST holder — the edge that starts one. */
-  remove(sessionId: string, holderId: string, expectedIncarnation?: symbol): boolean {
-    const holders = this.bySession.get(sessionId)
-    if (
-      expectedIncarnation !== undefined &&
-      holders?.get(holderId)?.incarnation !== expectedIncarnation
-    ) {
-      return false
-    }
-    if (!holders?.delete(holderId) || holders.size > 0) {
-      return false
-    }
-    this.bySession.delete(sessionId)
-    return true
-  }
-
-  isHeld(sessionId: string): boolean {
-    return (this.bySession.get(sessionId)?.size ?? 0) > 0
-  }
-
-  has(sessionId: string, holderId: string): boolean {
-    return this.bySession.get(sessionId)?.has(holderId) ?? false
-  }
-
-  incarnation(sessionId: string, holderId: string): symbol | undefined {
-    return this.bySession.get(sessionId)?.get(holderId)?.incarnation
-  }
-
-  holderIds(sessionId: string): string[] {
-    return [...(this.bySession.get(sessionId)?.keys() ?? [])]
-  }
-
-  hasResumeCapableHolder(sessionId: string): boolean {
-    return [...(this.bySession.get(sessionId)?.values() ?? [])].some(
-      (holder) => holder.resumeCapable
-    )
-  }
-
-  /** Drops every holder of one session without evaluating the edge, for a session that is gone. */
-  forget(sessionId: string): void {
-    this.bySession.delete(sessionId)
-  }
-}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-holds.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-holds.test.ts
deleted file mode 100644
index 68027f81887c..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-holds.test.ts
+++ /dev/null
@@ -1,346 +0,0 @@
-// The parts a session's lifetime is assembled from: the holder set, the release clock, and the
-// deadline that keeps teardown from hanging.
-
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { runKeyedSerializedOperation } from '../../cli/keyed-promise-queue'
-import { StructuredAgentSessionHolders } from './structured-agent-session-holders'
-import { StructuredAgentSessionReleaseClock } from './structured-agent-session-release-clock'
-import { StructuredAgentSessionHolds } from './structured-agent-session-holds'
-import {
-  STRUCTURED_AGENT_SESSION_EVICTION_STEPS,
-  evictStructuredAgentSession
-} from './structured-agent-session-eviction'
-import {
-  StructuredAgentSessionEvictionTimeoutError,
-  withStructuredAgentSessionEvictionDeadline
-} from './structured-agent-session-eviction-deadline'
-
-const clocks: StructuredAgentSessionReleaseClock[] = []
-
-/** The host's per-session queue, so a hold and a writer really take turns. */
-function keyedSerialize() {
-  const chains = new Map<string, Promise<void>>()
-  return <T>(sessionId: string, task: () => Promise<T>) =>
-    runKeyedSerializedOperation(chains, sessionId, task)
-}
-
-function clock(deps: {
-  hasOwedWork?: () => boolean
-  isHeld?: () => boolean
-  evict: (sessionId: string) => Promise<void>
-  onError?: (input: { sessionId: string; error: unknown }) => void
-}): StructuredAgentSessionReleaseClock {
-  const created = new StructuredAgentSessionReleaseClock({
-    hasOwedWork: deps.hasOwedWork ?? (() => false),
-    isHeld: deps.isHeld ?? (() => false),
-    evict: deps.evict,
-    ...(deps.onError ? { onError: deps.onError } : {}),
-    graceMs: 1
-  })
-  clocks.push(created)
-  return created
-}
-
-afterEach(() => {
-  for (const created of clocks.splice(0)) {
-    created.dispose()
-  }
-})
-
-describe('the holder set', () => {
-  it('reports the first and last holder, and nothing in between', () => {
-    const holders = new StructuredAgentSessionHolders()
-
-    expect(holders.add('session-1', 'a')).toBe(true)
-    expect(holders.add('session-1', 'b')).toBe(false)
-    expect(holders.remove('session-1', 'a')).toBe(false)
-    expect(holders.remove('session-1', 'b')).toBe(true)
-    expect(holders.isHeld('session-1')).toBe(false)
-  })
-
-  // The reason this is a set and not a count: every release path can fire twice or not at all.
-  it('absorbs a duplicate hold and a duplicate release', () => {
-    const holders = new StructuredAgentSessionHolders()
-
-    holders.add('session-1', 'a')
-    holders.add('session-1', 'a')
-    expect(holders.remove('session-1', 'a')).toBe(true)
-    expect(holders.remove('session-1', 'a')).toBe(false)
-    expect(holders.holderIds('session-1')).toEqual([])
-  })
-
-  it('keeps one session holders out of another session holders', () => {
-    const holders = new StructuredAgentSessionHolders()
-
-    holders.add('session-1', 'a')
-    holders.add('session-2', 'a')
-    holders.remove('session-1', 'a')
-
-    expect(holders.isHeld('session-1')).toBe(false)
-    expect(holders.isHeld('session-2')).toBe(true)
-  })
-
-  it('distinguishes retaining holders from holders that may resume a provider', () => {
-    const holders = new StructuredAgentSessionHolders()
-
-    holders.add('session-1', 'subscriber', false)
-    expect(holders.hasResumeCapableHolder('session-1')).toBe(false)
-
-    holders.add('session-1', 'chat', true)
-    expect(holders.hasResumeCapableHolder('session-1')).toBe(true)
-    holders.remove('session-1', 'chat')
-    expect(holders.hasResumeCapableHolder('session-1')).toBe(false)
-  })
-})
-
-describe('the release clock', () => {
-  it('waits out a running turn instead of evicting into it', async () => {
-    const evict = vi.fn(async () => {})
-    let turnRunning = true
-    const releasing = clock({ hasOwedWork: () => turnRunning, evict })
-
-    releasing.arm('session-1')
-    await new Promise((resolve) => setTimeout(resolve, 30))
-    expect(evict).not.toHaveBeenCalled()
-
-    turnRunning = false
-    await vi.waitFor(() => expect(evict).toHaveBeenCalledWith('session-1'))
-  })
-
-  it('stands down when a holder arrives during the wait', async () => {
-    const evict = vi.fn(async () => {})
-    const releasing = clock({ isHeld: () => true, evict })
-
-    releasing.arm('session-1')
-    await new Promise((resolve) => setTimeout(resolve, 30))
-
-    expect(evict).not.toHaveBeenCalled()
-  })
-
-  it('keeps an idle unheld child for thirty minutes, and activity starts the window over', async () => {
-    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
-    try {
-      const evict = vi.fn(async () => {})
-      const idle = new StructuredAgentSessionReleaseClock({
-        hasOwedWork: () => false,
-        isHeld: () => false,
-        evict
-      })
-      clocks.push(idle)
-      const minutes = (count: number) => vi.advanceTimersByTimeAsync(count * 60_000)
-
-      idle.arm('session-1')
-      await minutes(20)
-      idle.renew('session-1')
-      await minutes(29)
-      expect(evict).not.toHaveBeenCalled()
-
-      await minutes(1)
-      expect(evict).toHaveBeenCalledWith('session-1')
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('does not start a window for a session nothing released', async () => {
-    const evict = vi.fn(async () => {})
-    const releasing = clock({ evict })
-
-    releasing.renew('session-1')
-    await new Promise((resolve) => setTimeout(resolve, 30))
-
-    expect(releasing.isArmed('session-1')).toBe(false)
-    expect(evict).not.toHaveBeenCalled()
-  })
-
-  it('reports a failed eviction rather than swallowing it', async () => {
-    const onError = vi.fn()
-    const releasing = clock({
-      evict: async () => {
-        throw new Error('child would not stop')
-      },
-      onError
-    })
-
-    releasing.arm('session-1')
-
-    await vi.waitFor(() =>
-      expect(onError).toHaveBeenCalledWith({
-        sessionId: 'session-1',
-        error: expect.objectContaining({ message: 'child would not stop' })
-      })
-    )
-  })
-})
-
-describe('holds', () => {
-  it('resumes a session on its first hold and not on a retained one', async () => {
-    let child = false
-    const resume = vi.fn(async () => {
-      child = true
-      return { ok: true as const }
-    })
-    const holds = new StructuredAgentSessionHolds({
-      resume,
-      serialize: keyedSerialize(),
-      hasProviderChild: () => child,
-      hasOwedWork: () => false,
-      evict: async () => {},
-      graceMs: 1
-    })
-
-    await holds.hold('session-1', 'stream-1', { resume: false })
-    expect(resume).not.toHaveBeenCalled()
-
-    await holds.hold('session-1', 'chat-1')
-    expect(resume).toHaveBeenCalledOnce()
-
-    child = true
-    await holds.hold('session-1', 'chat-2')
-    expect(resume).toHaveBeenCalledOnce()
-    holds.dispose()
-  })
-
-  it('runs one resume for a writer and a hold that ask in the same gap', async () => {
-    const gate = Promise.withResolvers<void>()
-    let child = false
-    const resume = vi.fn(async () => {
-      await gate.promise
-      child = true
-      return { ok: true as const }
-    })
-    const serialize = keyedSerialize()
-    const holds = new StructuredAgentSessionHolds({
-      resume,
-      serialize,
-      hasProviderChild: () => child,
-      hasOwedWork: () => false,
-      evict: async () => {},
-      graceMs: 1
-    })
-
-    // A send's ensure-owner step: already inside the session's serialize when it asks.
-    const writer = serialize('session-1', () => holds.ensureProviderChild('session-1'))
-    const hold = holds.hold('session-1', 'chat-1')
-    gate.resolve()
-
-    await expect(writer).resolves.toEqual({ ok: true })
-    await hold
-    // The hold ran after the writer's step and found the child: nothing to resume.
-    expect(resume).toHaveBeenCalledOnce()
-    // The surface arrived while the writer's resume ran, so the child it got is held, not idle.
-    expect(holds.isHeld('session-1')).toBe(true)
-    expect(holds.isReleasePending('session-1')).toBe(false)
-    holds.dispose()
-  })
-
-  it('puts a child a writer resumed with no surface on the idle clock', async () => {
-    let child = false
-    const serialize = keyedSerialize()
-    const holds = new StructuredAgentSessionHolds({
-      resume: async () => {
-        child = true
-        return { ok: true as const }
-      },
-      serialize,
-      hasProviderChild: () => child,
-      hasOwedWork: () => false,
-      evict: async () => {},
-      graceMs: 60_000
-    })
-
-    await serialize('session-1', () => holds.ensureProviderChild('session-1'))
-
-    expect(holds.isHeld('session-1')).toBe(false)
-    expect(holds.isReleasePending('session-1')).toBe(true)
-    holds.dispose()
-  })
-
-  it('never arms the clock for a session with nothing to stop', async () => {
-    const evict = vi.fn(async () => {})
-    const holds = new StructuredAgentSessionHolds({
-      resume: async () => ({ ok: true as const }),
-      serialize: keyedSerialize(),
-      hasProviderChild: () => false,
-      hasOwedWork: () => false,
-      evict,
-      graceMs: 1
-    })
-
-    await holds.hold('session-1', 'chat-1', { resume: false })
-    holds.release('session-1', 'chat-1')
-    await new Promise((resolve) => setTimeout(resolve, 20))
-
-    expect(evict).not.toHaveBeenCalled()
-    expect(holds.isReleasePending('session-1')).toBe(false)
-    holds.dispose()
-  })
-
-  it('fails a write-capable hold when resume proves no provider child', async () => {
-    const holds = new StructuredAgentSessionHolds({
-      resume: async () => ({ ok: true as const }),
-      serialize: keyedSerialize(),
-      hasProviderChild: () => false,
-      hasOwedWork: () => false,
-      evict: async () => {},
-      graceMs: 1
-    })
-
-    await expect(holds.hold('session-1', 'chat-1')).rejects.toThrow(
-      'agent_session_ownership_unknown'
-    )
-    expect(holds.isHeld('session-1')).toBe(false)
-    holds.dispose()
-  })
-})
-
-describe('the teardown deadline', () => {
-  it('leaves the child loaded instead of forcing it, and keeps the session indexed', async () => {
-    const forget = vi.fn()
-    const releaseLease = vi.fn(async () => {})
-
-    await expect(
-      evictStructuredAgentSession(
-        {
-          sessionId: 'session-1',
-          eventSink: {
-            unbind: vi.fn(),
-            drained: vi.fn(async () => {}),
-            close: vi.fn()
-          } as never,
-          adapter: { closeSession: () => new Promise<void>(() => {}) } as never,
-          forget,
-          discardSink: vi.fn(),
-          releaseLease
-        },
-        withStructuredAgentSessionEvictionDeadline(STRUCTURED_AGENT_SESSION_EVICTION_STEPS, 5)
-      )
-    ).rejects.toMatchObject({ step: 'stop-provider-child' })
-
-    expect(forget).not.toHaveBeenCalled()
-    expect(releaseLease).not.toHaveBeenCalled()
-  })
-
-  it('names the step that ran out of time', async () => {
-    const [step] = withStructuredAgentSessionEvictionDeadline(
-      [{ name: 'slow-step', run: () => new Promise<void>(() => {}) }],
-      5
-    )
-
-    await expect(step?.run({} as never)).rejects.toBeInstanceOf(
-      StructuredAgentSessionEvictionTimeoutError
-    )
-  })
-
-  it('does not delay a step that finishes', async () => {
-    const ran: string[] = []
-    const steps = withStructuredAgentSessionEvictionDeadline(
-      [{ name: 'fast-step', run: () => void ran.push('fast-step') }],
-      5_000
-    )
-
-    await steps[0]?.run({} as never)
-
-    expect(ran).toEqual(['fast-step'])
-  })
-})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-holds.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-holds.ts
deleted file mode 100644
index 0acbccb6b55f..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-holds.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-// The lifetime of a structured session, tied to the surfaces that want one.
-//
-// Nothing used to tell the host that a chat WANTED a session, and nothing told it when a chat
-// stopped wanting one. Both halves of that gap cost real processes: sessions nobody had opened got
-// an app-server at every launch, and sessions the user closed kept theirs until the app quit.
-//
-// A surface takes a hold when it binds and drops it when it goes away. The first hold on a session
-// with no child resumes it — that, and not the shape of a lease on disk, is what makes a provider
-// process exist. The last hold leaving starts the idle release clock. Transport close is the BACKSTOP,
-// not the mechanism: a client that vanishes mid-flight never sends its release, so the caller
-// registers one against the connection and the holder set absorbs the duplicate.
-//
-// A send to a childless session resumes it too, and so does provider-exit recovery under an open
-// surface. All three go through `ensureProviderChild` inside the session's serialize, so they take
-// turns: the first to run attaches, and the next finds the child and attaches nothing. Two attaches
-// for one session would race against the same released fence, and the loser's stale fence refused
-// it — a hold that lost dropped its holder, a send that lost was refused.
-
-import {
-  StructuredAgentSessionReleaseClock,
-  type StructuredAgentSessionReleaseClockDeps
-} from './structured-agent-session-release-clock'
-import { StructuredAgentSessionHolders } from './structured-agent-session-holders'
-import type { StructuredAgentSessionResumeOutcome } from './structured-agent-session-hold-resume'
-import type { StructuredAgentSessionAttachOptions } from './structured-agent-session-attach-orchestration'
-
-export type StructuredAgentSessionHoldsDeps = {
-  /** Attaches a provider child, for a caller already inside `serialize`. */
-  resume: (
-    sessionId: string,
-    attachOptions?: StructuredAgentSessionAttachOptions
-  ) => Promise<StructuredAgentSessionResumeOutcome>
-  serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
-  /** Whether evicting this session would actually free anything. */
-  hasProviderChild: (sessionId: string) => boolean
-  hasOwedWork: (sessionId: string) => boolean
-  evict: (sessionId: string) => Promise<void>
-  onError?: (input: { sessionId: string; error: unknown }) => void
-  graceMs?: number
-}
-
-export type StructuredAgentSessionHoldOptions = {
-  /** False for a hold that only RETAINS — a subscription stream, which must not make a child
-   *  exist just by reading history. */
-  resume?: boolean
-}
-
-export class StructuredAgentSessionHolds {
-  private readonly holders = new StructuredAgentSessionHolders()
-  private readonly clock: StructuredAgentSessionReleaseClock
-  private disposed = false
-
-  constructor(private readonly deps: StructuredAgentSessionHoldsDeps) {
-    const clockDeps: StructuredAgentSessionReleaseClockDeps = {
-      hasOwedWork: deps.hasOwedWork,
-      isHeld: (sessionId) => this.holders.isHeld(sessionId),
-      evict: (sessionId) => this.deps.evict(sessionId),
-      ...(deps.onError ? { onError: deps.onError } : {}),
-      ...(deps.graceMs === undefined ? {} : { graceMs: deps.graceMs })
-    }
-    this.clock = new StructuredAgentSessionReleaseClock(clockDeps)
-  }
-
-  async hold(
-    sessionId: string,
-    holderId: string,
-    options: StructuredAgentSessionHoldOptions = {}
-  ): Promise<void> {
-    const alreadyHeld = this.holders.has(sessionId, holderId)
-    this.holders.add(sessionId, holderId, options.resume !== false)
-    const incarnation = this.holders.incarnation(sessionId, holderId)
-    // Unconditional, not only on the first-holder edge: a second surface arriving during the grace
-    // window must cancel the pending release too.
-    this.clock.cancel(sessionId)
-    if (options.resume === false) {
-      return
-    }
-    let resumed: StructuredAgentSessionResumeOutcome
-    try {
-      resumed = await this.deps.serialize(sessionId, () => this.ensureProviderChild(sessionId))
-    } catch (error) {
-      this.releaseFailedHold(sessionId, holderId, alreadyHeld, incarnation)
-      throw error
-    }
-    if (!resumed.ok) {
-      this.releaseFailedHold(sessionId, holderId, alreadyHeld, incarnation)
-      // The RPC surface raises a refusal as its code.
-      throw new Error(resumed.refusal.code)
-    }
-  }
-
-  /** Only the holder this call added, at the incarnation it added: a same-ID hold that left and
-   *  came back while this one waited owns the holder now, and its own attempt decides it. */
-  private releaseFailedHold(
-    sessionId: string,
-    holderId: string,
-    alreadyHeld: boolean,
-    incarnation: symbol | undefined
-  ): void {
-    if (!alreadyHeld && incarnation !== undefined) {
-      this.release(sessionId, holderId, incarnation)
-    }
-  }
-
-  /**
-   * Gives the session a provider child if it has none.
-   *
-   * For a caller already inside the session's serialize, which is what makes "if it has none"
-   * exact: a hold and a send that both find the owner gone run this in turn, and the second sees
-   * the first one's child. Each caller makes at most one attach, and a failed one leaves the
-   * next caller to make its own. With no surface holding the session afterwards, the child goes
-   * on the same clock a departed surface would start — including the surface that held it when
-   * provider-exit recovery began and left while the attach ran.
-   */
-  async ensureProviderChild(
-    sessionId: string,
-    attachOptions?: StructuredAgentSessionAttachOptions
-  ): Promise<StructuredAgentSessionResumeOutcome> {
-    if (this.deps.hasProviderChild(sessionId)) {
-      return { ok: true }
-    }
-    const resumed = await this.deps.resume(sessionId, attachOptions)
-    if (!resumed.ok) {
-      return resumed
-    }
-    if (!this.deps.hasProviderChild(sessionId)) {
-      return {
-        ok: false,
-        refusal: {
-          code: 'agent_session_ownership_unknown',
-          message: 'The session attached without a provider child to write to.'
-        }
-      }
-    }
-    // The last surface can disconnect before acquisition makes a child available to release.
-    if (!this.disposed && !this.holders.isHeld(sessionId)) {
-      this.clock.arm(sessionId)
-    }
-    return { ok: true }
-  }
-
-  /** Activity — a journal write, or a start reaching the work it held; only a pending release
-   *  notices, and it restarts its full window. */
-  renew(sessionId: string): void {
-    this.clock.renew(sessionId)
-  }
-
-  release(sessionId: string, holderId: string, expectedIncarnation?: symbol): void {
-    if (!this.holders.remove(sessionId, holderId, expectedIncarnation)) {
-      return
-    }
-    if (!this.disposed && this.deps.hasProviderChild(sessionId)) {
-      this.clock.arm(sessionId)
-    }
-  }
-
-  /** Drops the holders of a session that is gone, whoever evicted it. */
-  forget(sessionId: string): void {
-    this.clock.cancel(sessionId)
-    this.holders.forget(sessionId)
-  }
-
-  isHeld(sessionId: string): boolean {
-    return this.holders.isHeld(sessionId)
-  }
-
-  hasResumeCapableHolder(sessionId: string): boolean {
-    return this.holders.hasResumeCapableHolder(sessionId)
-  }
-
-  isReleasePending(sessionId: string): boolean {
-    return this.clock.isArmed(sessionId)
-  }
-
-  dispose(): void {
-    this.disposed = true
-    this.clock.dispose()
-  }
-}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-delivery.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-delivery.ts
new file mode 100644
index 000000000000..d85d1dfee0f2
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-delivery.ts
@@ -0,0 +1,125 @@
+// The host's conversations: how one becomes open, and the delivery loop that hands its accepted
+// messages to a provider child. Bundled because they share one invariant — a conversation open
+// with a message queued has a delivery loop — and the open is where a loop for leftovers wakes.
+
+import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
+import type { AgentJournalResetReason } from '../../../shared/agent-session-journal-types'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import {
+  openStructuredAgentSessionConversation,
+  resettleOpenStructuredAgentSessionConversation,
+  type OpenedStructuredAgentSessionConversation,
+  type StructuredAgentSessionConversationOpenOptions
+} from './structured-agent-session-conversation-open'
+import { StructuredAgentSessionDeliveryLoop } from './structured-agent-session-delivery-loop'
+import type { StructuredAgentSessionResumeOutcome } from './structured-agent-session-agent-start'
+import type {
+  StructuredAgentSessionHostDeps,
+  StructuredAgentSessionHostSession
+} from './structured-agent-session-host-types'
+import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
+import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation'
+import { settleInterruptedCompaction } from './structured-compaction-recovery'
+import { recoverStructuredRewind } from './structured-rewind-recovery'
+
+export type StructuredAgentSessionConversationDelivery = {
+  loop: StructuredAgentSessionDeliveryLoop
+  /** For a caller inside the session's serialize. */
+  open: (
+    sessionId: string,
+    options?: StructuredAgentSessionConversationOpenOptions
+  ) => Promise<StructuredAgentSessionHostSession | null>
+  /** Stops the loop and the resettle on a proof of death; quit's first step. */
+  dispose: () => void
+  /** Indexes a conversation some other open produced, as `open` would have. */
+  adoptOpened: (
+    sessionId: string,
+    opened: OpenedStructuredAgentSessionConversation
+  ) => Promise<void>
+}
+
+export function createStructuredAgentSessionConversationDelivery(input: {
+  deps: StructuredAgentSessionHostDeps
+  sessions: Map<string, StructuredAgentSessionHostSession>
+  serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
+  trackStart: <T>(start: Promise<T>) => Promise<T>
+  /** Starts a child for `startedFor`, the queued message at the head, if the session has none. */
+  ensureProviderChild: (
+    sessionId: string,
+    startedFor: string
+  ) => Promise<StructuredAgentSessionResumeOutcome>
+  reset: (sessionId: string, journal: AgentSessionJournal, reset: AgentJournalResetReason) => void
+  publishRestored: (sessionId: string) => void
+}): StructuredAgentSessionConversationDelivery {
+  const { deps, sessions } = input
+  const loop = new StructuredAgentSessionDeliveryLoop({
+    sessions,
+    adapter: deps.adapter,
+    serialize: input.serialize,
+    trackStart: input.trackStart,
+    ensureProviderChild: input.ensureProviderChild,
+    conversationFence: (sessionId) =>
+      structuredAgentSessionConversationFence(deps.store, sessionId),
+    failureTextContext: (sessionId) =>
+      structuredAgentSessionFailureWordsContext(deps.store.getRecord(sessionId)),
+    onError: (sessionId, error) => deps.onEventSinkError?.({ sessionId, error })
+  })
+  const adoptOpened = async (
+    sessionId: string,
+    opened: OpenedStructuredAgentSessionConversation
+  ): Promise<void> => {
+    const { session, reset } = opened
+    sessions.set(sessionId, session)
+    if (reset) {
+      input.reset(sessionId, session.journal, reset)
+    }
+    input.publishRestored(sessionId)
+    await settleInterruptedCommands(deps, sessionId, session)
+    if (session.journal.submissions().some(isQueuedAgentJournalSubmission)) {
+      loop.wake(sessionId)
+    }
+  }
+  // A chat open before its owner's death was proven revises what its open settled. Queued, never
+  // awaited: the writer can hold this session's serialize (an attach recovering its lease).
+  const stopResettling = deps.store.onDeathEvidence((sessionId) => {
+    if (sessions.has(sessionId)) {
+      void input
+        .trackStart(
+          input.serialize(sessionId, () =>
+            resettleOpenStructuredAgentSessionConversation(deps, sessionId, sessions.get(sessionId))
+          )
+        )
+        .catch((error: unknown) => deps.onEventSinkError?.({ sessionId, error }))
+    }
+  })
+  return {
+    loop,
+    adoptOpened,
+    dispose: () => {
+      loop.dispose()
+      stopResettling()
+    },
+    open: (sessionId, options) =>
+      openStructuredAgentSessionConversation({ deps, sessions, adoptOpened }, sessionId, options)
+  }
+}
+
+/**
+ * A compaction or rewind found prepared when the conversation opens was started under a child
+ * this process no longer has — the open runs only when none is indexed — so nothing will finish
+ * it, and left alone it refuses every send, so no agent would ever start to. Settled here instead
+ * of by a start inside acceptance. A Codex rewind only its provider can prove stays for the attach.
+ */
+async function settleInterruptedCommands(
+  deps: StructuredAgentSessionHostDeps,
+  sessionId: string,
+  session: StructuredAgentSessionHostSession
+): Promise<void> {
+  const fence = structuredAgentSessionConversationFence(deps.store, sessionId)
+  try {
+    await settleInterruptedCompaction(deps.store, sessionId, session.journal, fence)
+    await recoverStructuredRewind(deps.store, sessionId, session.journal, fence)
+  } catch (error) {
+    deps.onEventSinkError?.({ sessionId, error })
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-lifetime.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-lifetime.ts
index 0eed19031c7b..c9ba8714b4ee 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-lifetime.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-lifetime.ts
@@ -1,27 +1,34 @@
-// The host's half of a session's lifetime: what a close does, and what a hold is wired to.
+// The host's half of a session's lifetime: stopping its agent, and closing its conversation.
 //
-// Lifted out of the host for the same reason attaching was — the host is a coordinator, and the
-// sequence that stops a provider child and hands its lease back reads better next to the holder
-// bookkeeping that decides when to run it than buried among the twenty other things a session can
-// do.
+// Two operations, because they end two different things. Stopping the agent ends the provider
+// child and hands the lease back; the conversation — its open journal, its status row and its
+// readers — stays, and the next send starts a new child. Closing the conversation drops the open
+// journal handle, a cache the next read or write reopens.
+//
+// Both are written for a caller already inside the session's serialize: the queue is not
+// reentrant, so every public entry point takes it once and calls these.
 
-import { agentChildWorkLiveness } from '../../../shared/agent-status-child-work-liveness'
-import { activeStructuredAgentSessionTurnId } from '../../../shared/structured-agent-session-projection'
+import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
 import {
   evictStructuredAgentSession,
   STRUCTURED_AGENT_SESSION_EVICTION_STEPS,
   type StructuredAgentSessionEvictionContext
 } from './structured-agent-session-eviction'
 import { withStructuredAgentSessionEvictionDeadline } from './structured-agent-session-eviction-deadline'
-import { StructuredAgentSessionHolds } from './structured-agent-session-holds'
 import type { StructuredAgentSessionHostRuntimeState } from './structured-agent-session-host-runtime-state'
 import type {
+  StructuredAgentSessionChildEndCause,
   StructuredAgentSessionHostDeps,
-  StructuredAgentSessionHostSession
+  StructuredAgentSessionHostSession,
+  StructuredAgentSessionProviderChildIdentity
 } from './structured-agent-session-host-types'
+import {
+  endProviderChild,
+  structuredAgentSessionConversationFence
+} from './structured-agent-session-provider-child'
 import { releaseStoredStructuredAgentSessionOwner } from './structured-agent-session-lease-release'
-import { resumeHeldStructuredAgentSession } from './structured-agent-session-hold-resume'
-import type { StructuredAgentSessionAttachContext } from './structured-agent-session-attach-context'
 import { settleStructuredAgentSessionDeadGeneration } from './structured-agent-session-dead-generation-settlement'
 
 export type StructuredAgentSessionLifetimeContext = {
@@ -29,8 +36,8 @@ export type StructuredAgentSessionLifetimeContext = {
   runtimeState: StructuredAgentSessionHostRuntimeState
   sessions: Map<string, StructuredAgentSessionHostSession>
   now: () => number
-  /** Drops the session's row from the agent-status store; see `forgetStructuredAgentSession`. */
-  forgetStatus: (sessionId: string) => void
+  /** Re-projects the session's status after its agent stopped and the chat stays. */
+  publishStatus?: (sessionId: string) => void
   /** Quit-only snapshot taken immediately before the provider child is stopped. */
   restartWitness?: {
     beforeStop: (sessionId: string) => void
@@ -38,73 +45,96 @@ export type StructuredAgentSessionLifetimeContext = {
   }
 }
 
-/** Dropping a session and dropping its status row are ONE operation: the store keeps the row until
- *  told, so a caller that only deletes strands a live-looking row no reader can ever decay. */
-export async function forgetStructuredAgentSession(
-  context: StructuredAgentSessionLifetimeContext,
-  sessionId: string
-): Promise<void> {
-  await context.sessions.get(sessionId)?.journal.close()
-  context.sessions.delete(sessionId)
-  context.forgetStatus(sessionId)
+type ConversationCloseDeps = Pick<StructuredAgentSessionHostDeps, 'onEventSinkError'> & {
+  store: Pick<StructuredAgentSessionHostDeps['store'], 'getRecord'>
 }
 
-function hasProviderChild(
-  context: StructuredAgentSessionLifetimeContext,
-  sessionId: string
-): boolean {
-  return context.sessions.get(sessionId)?.hasProviderChild === true
+/** A conversation's handle closes with nothing queued: what is still queued when the chat closes,
+ *  or the app quits, will not be handed over. Best effort: the next open's delivery loop rejects a
+ *  leftover itself. */
+export async function abandonQueuedStructuredAgentSessionMessages(
+  deps: ConversationCloseDeps,
+  sessionId: string,
+  journal: StructuredAgentSessionHostSession['journal']
+): Promise<void> {
+  await journal
+    .rejectQueuedSubmissions(
+      structuredAgentSessionConversationFence(deps.store, sessionId),
+      agentSessionFailureWords(agentSessionFailureFact('chatClosed'), { surface: 'rejection' })
+    )
+    .catch((error: unknown) => deps.onEventSinkError?.({ sessionId, error }))
 }
 
 /** The wind-down this host owes for the session's child. A live child always owes one, whatever a
- *  previous childless eviction recorded: a remembered `false` must never outrank the child in front
- *  of it. */
-function owesProviderChildWindDown(session: StructuredAgentSessionHostSession): boolean {
-  return session.hasProviderChild || session.owesProviderChildWindDown === true
+ *  previous childless eviction recorded: a remembered tombstone must never outrank the child in
+ *  front of it. */
+function owedProviderChildWindDown(
+  session: StructuredAgentSessionHostSession
+): StructuredAgentSessionProviderChildIdentity | undefined {
+  return session.child
+    ? { generation: session.child.generation, fence: session.child.fence }
+    : session.owesProviderChildWindDown
 }
 
-/** Runs the eviction steps under a deadline. A step that fails — or runs out of time — aborts the
- *  rest, which leaves the session indexed and the child loaded so the next close is a real retry. */
-export async function evictHeldStructuredAgentSession(
+/**
+ * The agent goes to rest; the conversation stays. Runs the eviction steps under a deadline. A step
+ * that fails — or runs out of time — aborts the rest and leaves the wind-down owed, so the next
+ * stop is a real retry. `ending` is how the child's end is told: a user's Stop, the host stopping it
+ * for a cause (with its text), or an eviction the conversation's close follows.
+ */
+export async function stopStructuredAgentSessionAgentUnderSerialize(
   context: StructuredAgentSessionLifetimeContext,
-  sessionId: string
+  sessionId: string,
+  ending: {
+    cause: Extract<StructuredAgentSessionChildEndCause, 'user-stop' | 'host-stop' | 'evict'>
+    reason?: string
+  } = { cause: 'user-stop' }
 ): Promise<void> {
   const session = context.sessions.get(sessionId)
   if (!session) {
     return
   }
-  // The obligation OUTLIVES the child. `hasProviderChild` is retired the instant the adapter
-  // proves the exit, so a step that aborts after that point would otherwise leave the retry
-  // reading "no child here" and skipping the settlement and the lease release it still owes.
-  const owesWindDown = owesProviderChildWindDown(session)
-  session.owesProviderChildWindDown = owesWindDown
+  // The obligation OUTLIVES the child. `child` is ended the instant the adapter proves the exit,
+  // so a step that aborts after that point would otherwise leave the retry reading "no child
+  // here" and skipping the settlement and the lease release it still owes.
+  const owed = owedProviderChildWindDown(session)
+  session.owesProviderChildWindDown = owed
+  const stopping = session.child
   let settlementError: unknown
   const eviction: StructuredAgentSessionEvictionContext = {
     sessionId,
     // The retry must not re-stop a child the adapter already proved gone, so this stays honest.
-    hasProviderChild: session.hasProviderChild,
-    owesProviderChildWindDown: owesWindDown,
+    hasProviderChild: stopping !== null,
+    owesProviderChildWindDown: owed !== undefined,
     eventSink: context.runtimeState.eventSinkFor(sessionId),
     adapter: context.deps.adapter,
     ...(context.restartWitness
       ? { beforeProviderChildStop: () => context.restartWitness?.beforeStop(sessionId) }
       : {}),
-    // Host state must not disagree with the adapter for the seven steps in between.
-    onProviderChildStopped: () => {
-      session.hasProviderChild = false
+    // Host state must not disagree with the adapter for the steps in between.
+    onProviderChildStopped: (verdict) => {
+      if (stopping) {
+        endProviderChild(session, {
+          generation: stopping.generation,
+          fence: stopping.fence,
+          cause: ending.cause,
+          reason: ending.reason ?? null,
+          duringStartup: stopping.phase === 'starting',
+          ...verdict
+        })
+      }
       context.restartWitness?.stopped(sessionId)
     },
-    forget: async () => {
-      await forgetStructuredAgentSession(context, sessionId)
-      context.deps.adapter.acknowledgeSessionRelease?.(sessionId)
-    },
+    acknowledgeRelease: () => context.deps.adapter.acknowledgeSessionRelease?.(sessionId),
     discardSink: () => context.runtimeState.discardEventSink(sessionId),
     settleWork: async () => {
+      const fence =
+        owed?.fence ?? structuredAgentSessionConversationFence(context.deps.store, sessionId)
       const settled = await settleStructuredAgentSessionDeadGeneration({
         journal: session.journal,
         sessionId,
-        fence: session.fence,
-        settlementId: `expected-close:${sessionId}:${session.fence}:${session.acquisitionGeneration ?? 'unknown'}`,
+        fence,
+        settlementId: `expected-close:${sessionId}:${fence}:${owed?.generation ?? 'unknown'}`,
         pendingSubmissionReason: 'provider_closed_before_acknowledgement',
         verdict: { state: 'interrupted', completedAt: context.now() },
         showUnexpectedExitOutcome: false,
@@ -114,20 +144,24 @@ export async function evictHeldStructuredAgentSession(
         }
       })
       if (!settled) {
-        // Without the cause the quit log names the step and nothing else.
+        // Without the cause the log names the step and nothing else.
         throw new Error('dead generation work settlement failed', { cause: settlementError })
       }
     },
     releaseLease: async () => {
-      await releaseStoredStructuredAgentSessionOwner({
-        store: context.deps.store,
-        sessionId,
-        hasProviderChild: owesWindDown,
-        expectedFence: session.fence,
-        now: context.now()
-      })
-      session.owesProviderChildWindDown = false
-      context.forgetStatus(sessionId)
+      if (owed) {
+        await releaseStoredStructuredAgentSessionOwner({
+          store: context.deps.store,
+          sessionId,
+          hasProviderChild: true,
+          expectedFence: owed.fence,
+          now: context.now()
+        })
+      }
+      session.owesProviderChildWindDown = undefined
+      // Whatever ended the child, the row belongs to the conversation: it shows not-running, and
+      // only the conversation's close forgets it.
+      context.publishStatus?.(sessionId)
     }
   }
   await evictStructuredAgentSession(
@@ -136,6 +170,41 @@ export async function evictHeldStructuredAgentSession(
   )
 }
 
+/** Whether the conversation's handle is only a cache now: no child, no wind-down owed, and nothing
+ *  queued or waiting on the provider. */
+export function structuredAgentSessionConversationClosable(
+  session: StructuredAgentSessionHostSession
+): boolean {
+  return (
+    owedProviderChildWindDown(session) === undefined &&
+    !session.journal.submissions().some(isQueuedAgentJournalSubmission) &&
+    session.journal.pendingSubmissions().length === 0
+  )
+}
+
+/**
+ * Drops the conversation's open handle. The entry leaves the map BEFORE the handle closes, so a
+ * lock-free reader sees an open handle or none — never one that is closing — and one arriving
+ * after the delete waits behind this step and reopens. Answers false, closing nothing, when the
+ * handle is still more than a cache.
+ */
+export async function closeStructuredAgentSessionConversationUnderSerialize(
+  context: Pick<StructuredAgentSessionLifetimeContext, 'sessions'> & {
+    /** The status row outlives the handle; see `StructuredAgentSessionClientDelivery`. */
+    closeStatus: (sessionId: string) => void
+  },
+  sessionId: string
+): Promise<boolean> {
+  const session = context.sessions.get(sessionId)
+  if (!session || !structuredAgentSessionConversationClosable(session)) {
+    return false
+  }
+  context.sessions.delete(sessionId)
+  context.closeStatus(sessionId)
+  await session.journal.close()
+  return true
+}
+
 /** Stops every provider child owned by this host while keeping failed evictions reachable. A
  *  session whose child is already stopped but whose wind-down aborted is still in scope — that is
  *  the retry. */
@@ -146,9 +215,9 @@ export async function evictOwnedStructuredAgentSessions(
   retainOnFailure: Set<string>
 ): Promise<void> {
   const ownedSessionIds = [...context.sessions]
-    .filter(([, session]) => owesProviderChildWindDown(session))
+    .filter(([, session]) => owedProviderChildWindDown(session) !== undefined)
     .map(([sessionId]) => sessionId)
-  // Retained up front and cleared only once an eviction settles: the quit phase is bounded, and a
+  // Retained up front and cleared only once a stop settles: the quit phase is bounded, and a
   // timeout leaves these still running. Closing their journals underneath them is the one outcome
   // the retain set exists to prevent.
   for (const sessionId of ownedSessionIds) {
@@ -159,7 +228,7 @@ export async function evictOwnedStructuredAgentSessions(
     ownedSessionIds.map(async (sessionId) => {
       try {
         await context.serialize(sessionId, () =>
-          evictHeldStructuredAgentSession(context, sessionId)
+          stopStructuredAgentSessionAgentUnderSerialize(context, sessionId)
         )
         retainOnFailure.delete(sessionId)
       } catch (error) {
@@ -171,47 +240,3 @@ export async function evictOwnedStructuredAgentSessions(
     throw new AggregateError(failures, 'structured agent-session child eviction failed')
   }
 }
-
-/** The holds resume through the host's own attach, inside the session's serialize: a hold's
- *  resume and a send's ensure-owner step are the same serialized attach with a different asker. */
-export function createStructuredAgentSessionHolds(
-  attachContext: () => StructuredAgentSessionAttachContext,
-  close: (sessionId: string) => Promise<void>
-): StructuredAgentSessionHolds {
-  const context = attachContext()
-  return new StructuredAgentSessionHolds({
-    resume: (sessionId, attachOptions) =>
-      resumeHeldStructuredAgentSession({
-        sessionId,
-        context: attachContext(),
-        callerKey: attachOptions?.admitRecoveryTicket
-          ? 'trusted-local:provider-exit-recovery'
-          : 'trusted-local:surface-hold',
-        ...(attachOptions ? { attachOptions } : {})
-      }),
-    // Tracked from enqueue: a quit drains a queued resume before it evicts, so no child is
-    // spawned behind the eviction and orphaned.
-    serialize: (sessionId, task) => {
-      const current = attachContext()
-      return current.tasks.trackAttach(current.serialize(sessionId, task))
-    },
-    evict: close,
-    hasProviderChild: (sessionId) => hasProviderChild(context, sessionId),
-    // A send pending while the child is still starting is held for that start; evicting would
-    // refuse it. Any other pending send may wait on an echo that never comes, so eviction retires it.
-    // Subagents, commands and monitors outlive the lead's turn inside the child, so the live roster
-    // the sidebar shows as working is owed too; stopping the child would end them silently.
-    hasOwedWork: (sessionId) => {
-      const session = context.sessions.get(sessionId)
-      return session
-        ? activeStructuredAgentSessionTurnId(session.journal.snapshot().items) !== null ||
-            (session.providerChildPhase === 'starting' &&
-              session.journal.pendingSubmissions().length > 0) ||
-            agentChildWorkLiveness(context.deps.adapter.backgroundTaskState?.(sessionId)?.tasks) !==
-              null
-        : false
-    },
-    onError: (error) => context.deps.onEventSinkError?.(error),
-    ...(context.deps.releaseGraceMs === undefined ? {} : { graceMs: context.deps.releaseGraceMs })
-  })
-}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts
index c1ae42e237c6..1586bd4a1c16 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts
@@ -1,10 +1,11 @@
-// Everything a client can ask an ATTACHED session to do: send a turn, cancel one, answer a prompt,
-// change an option, read the options back.
+// Everything a client can ask a session to do: send a turn, cancel one, answer a prompt, change an
+// option, read the options back.
 //
 // They share one shape — admit the envelope against the lease, run a plan, publish the journal — so
-// they share one path here rather than five copies in the host. The host keeps attach, holds and
-// teardown. A send is the one mutation that may need those first: it makes sure the session has
-// an owner as a step of its own serialized admission, see `structured-agent-session-send-preparation`.
+// they share one path here rather than five copies in the host. The host keeps attach and teardown.
+// Each opens the conversation first. A send, a Stop and an option pick are conversation writes,
+// admitted without the writer lease; the delivery loop starts the provider child a send needs, and
+// an operation only the provider can perform starts it before admission.
 
 import type {
   AgentJournalItemIdentity,
@@ -15,21 +16,30 @@ import type {
   AgentSessionMutationEnvelope,
   AgentSessionMutationResult,
   AgentSessionOptionResult,
-  AgentSessionOptionsResult,
   AgentSessionPromptResult,
   AgentSessionSendResult,
   AgentSessionThreadGoalChange,
   AgentSessionThreadGoalResult
 } from '../../../shared/agent-session-wire'
-import type { StructuredAgentSessionHolds } from './structured-agent-session-holds'
+import { isStructuredAgentSessionMainAgentWorking } from '../../../shared/structured-agent-session-main-agent-working'
+import {
+  agentSessionFailureWords,
+  type AgentJournalDispatchRejection
+} from '../../../shared/agent-session-failure-words'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
 import type { AgentSessionPromptRequest } from './structured-agent-session-turns-prompt'
 import { threadGoalPlan } from './structured-agent-session-thread-goal'
+import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
 import {
   admitAndRunAgentSessionMutation,
-  type AgentSessionMutationRequest
+  type AgentSessionMutationRequest,
+  type AgentSessionMutationSessionPreparation
 } from './structured-agent-session-mutation-admission'
 import {
-  prepareStructuredAgentSessionSend,
+  openForWrite,
+  openWithAgent,
+  sendPreparation,
+  structuredAgentSessionFailureWordsContext,
   structuredAgentSessionSendBlock
 } from './structured-agent-session-send-preparation'
 import {
@@ -44,19 +54,27 @@ import type {
   StructuredAgentSessionHostDeps,
   StructuredAgentSessionHostSession
 } from './structured-agent-session-host-types'
+import {
+  readStructuredAgentSessionOptions,
+  recordStructuredAgentSessionOptionIntent
+} from './structured-agent-session-options-read'
 
 export type StructuredAgentSessionMutationContext = {
   deps: StructuredAgentSessionHostDeps
   sessions: Map<string, StructuredAgentSessionHostSession>
   publish: (sessionId: string, journal: StructuredAgentSessionHostSession['journal']) => void
   flushStreamedEvents: (sessionId: string) => Promise<void>
-  requireSession: (sessionId: string) => StructuredAgentSessionHostSession
+  /** The host's accessor, for a caller outside the session's serialize. */
+  conversation: (sessionId: string) => Promise<StructuredAgentSessionHostSession>
   serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
-  /** A send that finds the owner gone brings it back through here, inside its own serialize. */
-  holds: Pick<StructuredAgentSessionHolds, 'ensureProviderChild'>
-  /** Makes a closed session's journal readable again, inside the caller's serialize, for a send
-   *  the ledger answers without an owner. */
-  restoreReadable: (sessionId: string) => Promise<boolean>
+  /** The session's conversation, opened when closed; inside the caller's serialize. */
+  openConversation: (sessionId: string) => Promise<StructuredAgentSessionHostSession | null>
+  /** Gives the session a provider child; inside the caller's serialize. */
+  ensureAgent: (sessionId: string) => Promise<AgentSessionMutationSessionPreparation>
+  /** A message was accepted: the session's delivery loop hands it over. */
+  wakeDelivery: (sessionId: string) => void
+  /** Stops the session's provider child, keeping its conversation; inside the caller's serialize. */
+  stopAgent: (sessionId: string) => Promise<void>
   now: () => number
 }
 
@@ -78,7 +96,7 @@ function mutate<TValue>(
       prepareSession,
       publish: (journal) => context.publish(envelope.sessionId, journal),
       flushStreamedEvents: context.flushStreamedEvents,
-      providerChildPhase: () => context.sessions.get(envelope.sessionId)?.providerChildPhase,
+      providerChildPhase: () => context.sessions.get(envelope.sessionId)?.child?.phase,
       now: () => context.now()
     })
   )
@@ -101,12 +119,19 @@ export function sendStructuredAgentSessionTurn(
     params.envelope,
     {
       ...plan,
-      run: (ctx) => {
+      run: async (ctx) => {
         const blocked = structuredAgentSessionSendBlock(context.deps.store.getRecord(ctx.sessionId))
-        return blocked ? Promise.resolve(blocked) : plan.run(ctx)
+        if (blocked) {
+          return blocked
+        }
+        const accepted = await plan.run(ctx)
+        if (accepted.ok) {
+          context.wakeDelivery(ctx.sessionId)
+        }
+        return accepted
       }
     },
-    (ledger, record) => prepareStructuredAgentSessionSend(context, params.envelope, ledger, record)
+    sendPreparation(context, params.envelope)
   )
 }
 
@@ -115,7 +140,7 @@ export function cancelStructuredAgentSessionTurn(
   caller: StructuredAgentSessionCaller,
   params: {
     envelope: AgentSessionMutationEnvelope
-    turnId: string
+    turnId?: string
     scope?: 'background-tasks'
     taskId?: string
     prompt?: { itemId: string; expectedRevision: number }
@@ -131,7 +156,55 @@ export function cancelStructuredAgentSessionTurn(
             context.serialize(`compact-cancel:${sessionId}`, task)
         }
       : context
-  return mutate(cancellationContext, caller, params.envelope, cancelPlan(params))
+  const plan = cancelPlan(params)
+  if (params.scope || params.prompt) {
+    return mutate(
+      cancellationContext,
+      caller,
+      params.envelope,
+      plan,
+      openForWrite(context, params.envelope)
+    )
+  }
+  return mutate(
+    cancellationContext,
+    caller,
+    params.envelope,
+    {
+      ...plan,
+      run: async (ctx) => {
+        // Stop withdraws every queued message first, whatever the start or the child is doing.
+        const withdrawn = await ctx.journal.rejectQueuedSubmissions(
+          ctx.fence,
+          agentSessionFailureWords(agentSessionFailureFact('cancelled'), { surface: 'rejection' })
+        )
+        const named = params.turnId !== undefined ? { turnId: params.turnId } : {}
+        const child = context.sessions.get(ctx.sessionId)?.child
+        if (child?.phase === 'starting') {
+          // A start that may never land is the one thing here Stop has to end; the chat stays.
+          await context.stopAgent(ctx.sessionId)
+          return { ok: true, value: { ...named, cancelled: true } }
+        }
+        // A Stop naming no turn ends nothing more unless the session reads working, by the rule
+        // every session list and the chat's own Stop read it.
+        const inFlight =
+          params.turnId !== undefined ||
+          isStructuredAgentSessionMainAgentWorking(
+            ctx.journal.activeTurnId(),
+            ctx.journal.submissions(),
+            ctx.fence
+          )
+        const record = context.deps.store.getRecord(ctx.sessionId)
+        return child && inFlight
+          ? plan.run({
+              ...ctx,
+              failureTextContext: structuredAgentSessionFailureWordsContext(record)
+            })
+          : { ok: true, value: { ...named, cancelled: withdrawn.length > 0 } }
+      }
+    },
+    openForWrite(context, params.envelope)
+  )
 }
 
 export function respondToStructuredAgentSessionPrompt(
@@ -139,7 +212,13 @@ export function respondToStructuredAgentSessionPrompt(
   caller: StructuredAgentSessionCaller,
   params: AgentSessionPromptRequest & { envelope: AgentSessionMutationEnvelope }
 ): Promise<AgentSessionMutationResult<AgentSessionPromptResult>> {
-  return mutate(context, caller, params.envelope, promptPlan(params))
+  return mutate(
+    context,
+    caller,
+    params.envelope,
+    promptPlan(params),
+    openForWrite(context, params.envelope)
+  )
 }
 
 export async function setStructuredAgentSessionOption(
@@ -149,7 +228,26 @@ export async function setStructuredAgentSessionOption(
 ): Promise<AgentSessionMutationResult<AgentSessionOptionResult>> {
   // Outside the queue: a pick made while the provider starts then queues behind what its start persists.
   await context.deps.adapter.awaitOptionWritable?.(params.envelope.sessionId)
-  return mutate(context, caller, params.envelope, setOptionPlan(params))
+  const plan = setOptionPlan(params)
+  const atRest = () => !context.sessions.get(params.envelope.sessionId)?.child
+  return mutate(
+    context,
+    caller,
+    params.envelope,
+    {
+      ...plan,
+      // Read as the call is admitted: with no child running, the pick is a conversation write —
+      // intent the next start replays. A running child's pick is still its owner's to make.
+      get conversationWrite() {
+        return atRest() ? (true as const) : undefined
+      },
+      run: (ctx) =>
+        atRest()
+          ? recordStructuredAgentSessionOptionIntent(context.deps.store, ctx, params)
+          : plan.run(ctx)
+    },
+    openForWrite(context, params.envelope)
+  )
 }
 
 export function changeStructuredAgentSessionThreadGoal(
@@ -157,38 +255,13 @@ export function changeStructuredAgentSessionThreadGoal(
   caller: StructuredAgentSessionCaller,
   params: { envelope: AgentSessionMutationEnvelope; change: AgentSessionThreadGoalChange }
 ): Promise<AgentSessionMutationResult<AgentSessionThreadGoalResult>> {
-  return mutate(context, caller, params.envelope, threadGoalPlan(params))
-}
-
-export function readStructuredAgentSessionOptions(
-  context: StructuredAgentSessionMutationContext,
-  sessionId: string
-): Promise<AgentSessionOptionsResult> {
-  return context.serialize(sessionId, async () => {
-    const session = context.requireSession(sessionId)
-    if (!context.deps.adapter.readOptions) {
-      throw new Error('structured_agent_session_options_unsupported')
-    }
-    const options = await context.deps.adapter.readOptions({ sessionId, fence: session.fence })
-    return {
-      ...options,
-      rewind:
-        context.deps.store.getRecord(sessionId)?.rewind?.phase === 'prepared' ||
-        context.deps.store.getRecord(sessionId)?.rewind?.phase === 'provider-succeeded'
-          ? { supported: false, reason: 'outcome-unknown' }
-          : (context.deps.adapter.rewindSupport?.(sessionId) ?? {
-              supported: false,
-              reason: 'unsupported'
-            }),
-      conversationCommands: context.deps.adapter.compact ? ['clear', 'compact'] : ['clear'],
-      ...(context.deps.adapter.supportsThreadGoal?.(sessionId)
-        ? { threadGoal: { current: session.journal.threadGoal() } }
-        : {}),
-      ...(context.deps.adapter.recordsContextUsage?.(sessionId)
-        ? { contextUsage: { current: session.journal.contextUsage() } }
-        : {})
-    }
-  })
+  return mutate(
+    context,
+    caller,
+    params.envelope,
+    threadGoalPlan(params),
+    openWithAgent(context, params.envelope)
+  )
 }
 
 /** Settle provider-proven delivery independently of an in-flight client mutation. */
@@ -197,12 +270,16 @@ export async function settleStructuredAgentSessionLateDispatch(
   input: {
     sessionId: string
     clientMessageId: string
-  } & ({ providerIdentity: AgentJournalItemIdentity } | { state: 'rejected'; reason: string })
+  } & (
+    | { providerIdentity: AgentJournalItemIdentity }
+    | ({ state: 'rejected' } & AgentJournalDispatchRejection)
+  )
 ): Promise<void> {
   const session = context.sessions.get(input.sessionId)
   if (!session) {
     return
   }
+  const fence = structuredAgentSessionConversationFence(context.deps.store, input.sessionId)
   // The journal queue drains before close; the host queue would defer this past teardown.
   await session.journal.resolveDispatch(
     'providerIdentity' in input
@@ -210,55 +287,18 @@ export async function settleStructuredAgentSessionLateDispatch(
           clientMessageId: input.clientMessageId,
           state: 'accepted',
           providerIdentity: input.providerIdentity,
-          fence: session.fence
+          fence
         }
       : {
           clientMessageId: input.clientMessageId,
           state: 'rejected',
           reason: input.reason,
-          fence: session.fence
+          rejection: input.rejection,
+          fence
         }
   )
 }
 
-/**
- * Releases sends the provider can no longer be holding.
- *
- * A dispatch whose RPC timed out is recorded `unknown` — doubt, never proof of
- * non-delivery — and a live `unknown` reads as work still owed, so the session
- * shows working until something re-derives it. The provider reporting its thread
- * not running, with no turn open, IS that re-derivation.
- *
- * `pending` is deliberately untouched: that send's dispatch has not returned yet
- * and may be in flight right now. And `recovered` only retires the obligation —
- * it never makes a send re-deliverable, because the provider may well have run it.
- */
-export async function releaseStructuredAgentSessionUnansweredDispatches(
-  context: Pick<StructuredAgentSessionMutationContext, 'sessions'>,
-  input: { sessionId: string; reason: string }
-): Promise<void> {
-  const session = context.sessions.get(input.sessionId)
-  if (!session) {
-    return
-  }
-  const stranded = session.journal
-    .submissions()
-    .filter((entry) => entry.dispatchState === 'unknown' && entry.recovered !== true)
-  if (stranded.length === 0) {
-    return
-  }
-  for (const entry of stranded) {
-    await session.journal.resolveDispatch({
-      clientMessageId: entry.clientMessageId,
-      state: 'unknown',
-      // The earlier reason names a sharper fact than this one does.
-      reason: entry.reason ?? input.reason,
-      fence: session.fence,
-      recovered: true
-    })
-  }
-}
-
 /** The host's thin mutation surface. Each call re-reads the context, so a session
  *  map or fence that moves between calls is never captured by a stale closure. */
 export function structuredAgentSessionMutationDelegates(
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-runtime-state.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-runtime-state.ts
index 39fe7c3fc22a..63f37a37590e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-runtime-state.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-runtime-state.ts
@@ -34,8 +34,9 @@ export class StructuredAgentSessionHostRuntimeState {
     this.leaseRenewer.start()
   }
 
-  stopLeaseRenewal(): void {
-    this.leaseRenewer.stop()
+  /** Resolves once a renewal tick already in flight has finished writing. */
+  stopLeaseRenewal(): Promise<void> {
+    return this.leaseRenewer.stop()
   }
 
   /** The sink the session's current child writes through, created on first use. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.test.ts
index d04e17d2d26c..1baaafb6f6b7 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.test.ts
@@ -1,11 +1,25 @@
 import { describe, expect, it, vi } from 'vitest'
-import { structuredAgentSessionHostTeardownPhases } from './structured-agent-session-host-teardown'
+import { WILL_QUIT_TEARDOWN_DEADLINE_MS } from '../../../shared/quit-teardown-deadline'
+import {
+  GRACEFUL_EXIT_MS as CLAUDE_WINDOWS_GRACEFUL_EXIT_MS,
+  SUPERVISED_GRACEFUL_EXIT_MS
+} from '../../claude/claude-child-exit-proof-ladder'
+import { GRACEFUL_EXIT_MS as CODEX_WINDOWS_GRACEFUL_EXIT_MS } from '../../codex/codex-app-server-connection'
+import { PROVIDER_SUPERVISOR_MAX_STOP_MS } from '../../codex/codex-app-server-posix-supervisor'
+import { SNAPSHOT_DRAIN_TIMEOUT_MS } from './structured-agent-session-eviction'
+import {
+  CHILD_EVICTION_TIMEOUT_MS,
+  EVICTION_MARGIN_MS,
+  RESUME_MARKER_RECORD_TIMEOUT_MS,
+  structuredAgentSessionHostTeardownPhases
+} from './structured-agent-session-host-teardown'
+
+const noop = async (): Promise<void> => undefined
 
 describe('structured agent-session host teardown', () => {
   it('names every phase, so the quit-path order is pinned rather than incidental', () => {
-    const noop = async (): Promise<void> => undefined
     const phases = structuredAgentSessionHostTeardownPhases({
-      holds: { dispose: noop },
+      idleSweep: { dispose: noop },
       runtimeState: { stopLeaseRenewal: () => undefined, flushAllEventSinks: noop },
       tasks: { drainAttaches: noop },
       evictOwnedSessions: noop,
@@ -14,7 +28,7 @@ describe('structured agent-session host teardown', () => {
     })
     expect(phases.map((phase) => phase.name)).toEqual([
       'begin-resume-markers',
-      'dispose-holds',
+      'dispose-idle-sweep',
       'stop-lease-renewal',
       'drain-attaches',
       'evict-owned-sessions',
@@ -23,6 +37,56 @@ describe('structured agent-session host teardown', () => {
     ])
   })
 
+  it("derives quit's child-eviction bound from every provider's supervised close", () => {
+    // Eviction drains the sink for the resume offer before it stops the child, inside one bound.
+    // Each close's tree-kill fallback is deliberately outside it: once main exits the supervisor
+    // stops its group itself, and next launch's recovery settles the lease.
+    const closes = {
+      claude: SUPERVISED_GRACEFUL_EXIT_MS,
+      codex: PROVIDER_SUPERVISOR_MAX_STOP_MS,
+      // No supervisor on Windows, so its closes wait less than any supervised one.
+      claudeWindows: CLAUDE_WINDOWS_GRACEFUL_EXIT_MS,
+      codexWindows: CODEX_WINDOWS_GRACEFUL_EXIT_MS
+    }
+    expect(CHILD_EVICTION_TIMEOUT_MS).toBe(
+      SNAPSHOT_DRAIN_TIMEOUT_MS + Math.max(closes.claude, closes.codex) + EVICTION_MARGIN_MS
+    )
+    for (const closeMs of Object.values(closes)) {
+      expect(SNAPSHOT_DRAIN_TIMEOUT_MS + closeMs + EVICTION_MARGIN_MS).toBeLessThanOrEqual(
+        CHILD_EVICTION_TIMEOUT_MS
+      )
+    }
+    // The resume markers recorded after eviction still fit under quit's global deadline.
+    expect(CHILD_EVICTION_TIMEOUT_MS + RESUME_MARKER_RECORD_TIMEOUT_MS).toBeLessThan(
+      WILL_QUIT_TEARDOWN_DEADLINE_MS
+    )
+  })
+
+  it('ends child eviction as soon as every chat has closed, not at its bound', async () => {
+    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+    const evict = structuredAgentSessionHostTeardownPhases({
+      idleSweep: { dispose: noop },
+      runtimeState: { stopLeaseRenewal: () => undefined, flushAllEventSinks: noop },
+      tasks: { drainAttaches: noop },
+      evictOwnedSessions: noop,
+      beginResumeMarkers: () => {},
+      recordResumeMarkers: noop
+    }).find((phase) => phase.name === 'evict-owned-sessions')
+    try {
+      let finished = false
+      const run = Promise.resolve(evict?.run()).then(() => {
+        finished = true
+      })
+      // No timer advances: the phase settles with the eviction, not at CHILD_EVICTION_TIMEOUT_MS.
+      await vi.advanceTimersByTimeAsync(0)
+      expect(finished).toBe(true)
+      await run
+      expect(vi.getTimerCount()).toBe(0)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
   it('bounds stalled recovery publication without preventing later cleanup', async () => {
     vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
     const warning = vi.spyOn(console, 'warn').mockImplementation(() => {})
@@ -30,7 +94,7 @@ describe('structured agent-session host teardown', () => {
     const cleaned = vi.fn(async () => {})
     const flush = vi.fn(async () => cleaned())
     const phases = structuredAgentSessionHostTeardownPhases({
-      holds: { dispose: cleaned },
+      idleSweep: { dispose: cleaned },
       runtimeState: { stopLeaseRenewal: () => {}, flushAllEventSinks: flush },
       tasks: { drainAttaches: cleaned },
       evictOwnedSessions: cleaned,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.ts
index 6b1693c3dca2..bc9a48c5dacb 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.ts
@@ -7,8 +7,12 @@
 // nothing can ever close them.
 
 import type { AgentSessionResumeTrigger } from '../../../shared/agent-session-resume-marker'
+import { SUPERVISED_GRACEFUL_EXIT_MS } from '../../claude/claude-child-exit-proof-ladder'
+import { PROVIDER_SUPERVISOR_MAX_STOP_MS } from '../../codex/codex-app-server-posix-supervisor'
+import { SNAPSHOT_DRAIN_TIMEOUT_MS } from './structured-agent-session-eviction'
 import type { StructuredAgentSessionRestartResume } from './structured-agent-session-restart-resume-host'
 import {
+  abandonQueuedStructuredAgentSessionMessages,
   evictOwnedStructuredAgentSessions,
   type StructuredAgentSessionLifetimeContext
 } from './structured-agent-session-host-lifetime'
@@ -22,12 +26,20 @@ export type StructuredAgentSessionTeardownPhase = {
 }
 
 /** Advisory persistence must not hold shutdown open. */
-const RESUME_MARKER_RECORD_TIMEOUT_MS = 2_000
+export const RESUME_MARKER_RECORD_TIMEOUT_MS = 2_000
 
-/** Eight steps at ten seconds each would outlast the global quit deadline, and a quit that dies
- *  mid-eviction leaves the lease unreleased — the exact state restart has to clean up. Bounded
- *  well below that deadline so the phases after this one still get to run. */
-const CHILD_EVICTION_TIMEOUT_MS = 8_000
+/** Covers a provider's stop observed late on a loaded host. */
+export const EVICTION_MARGIN_MS = 1_000
+
+/** A quit that dies mid-eviction leaves the lease unreleased — the exact state restart has to
+ *  clean up — so this covers the sink drain plus the longest supervised provider close, well below
+ *  the global quit deadline so later phases still run. A close's tree-kill fallback is outside it:
+ *  once main exits the supervisor stops its group itself, and next launch's recovery settles the
+ *  lease. Windows closes have no supervisor and wait less. */
+export const CHILD_EVICTION_TIMEOUT_MS =
+  SNAPSHOT_DRAIN_TIMEOUT_MS +
+  Math.max(SUPERVISED_GRACEFUL_EXIT_MS, PROVIDER_SUPERVISOR_MAX_STOP_MS) +
+  EVICTION_MARGIN_MS
 
 /** Bounds a phase without swallowing its failure, which `withTimeout` alone would. */
 async function withPhaseTimeout(run: () => Promise<void>, timeoutMs: number): Promise<void> {
@@ -46,9 +58,9 @@ async function withPhaseTimeout(run: () => Promise<void>, timeoutMs: number): Pr
 
 /** The quit-path phase order, which is load-bearing rather than incidental. */
 export function structuredAgentSessionHostTeardownPhases(collaborators: {
-  holds: { dispose: () => Promise<void> | void }
+  idleSweep: { dispose: () => Promise<void> | void }
   runtimeState: {
-    stopLeaseRenewal: () => void
+    stopLeaseRenewal: () => Promise<void> | void
     flushAllEventSinks: () => Promise<void>
   }
   tasks: { drainAttaches: () => Promise<void> }
@@ -68,7 +80,7 @@ export function structuredAgentSessionHostTeardownPhases(collaborators: {
         }
       }
     },
-    { name: 'dispose-holds', run: () => collaborators.holds.dispose() },
+    { name: 'dispose-idle-sweep', run: () => collaborators.idleSweep.dispose() },
     { name: 'stop-lease-renewal', run: () => collaborators.runtimeState.stopLeaseRenewal() },
     { name: 'drain-attaches', run: () => collaborators.tasks.drainAttaches() },
     {
@@ -93,6 +105,8 @@ export async function tearDownStructuredAgentSessionHost(input: {
   sessions: Map<string, StructuredAgentSessionHostSession>
   retainSessionIds?: ReadonlySet<string>
   acknowledgeSessionRelease?: (sessionId: string) => void
+  /** Quit closes every conversation, so it settles what they still queue as a close does. */
+  abandonQueued?: (sessionId: string, session: StructuredAgentSessionHostSession) => Promise<void>
 }): Promise<void> {
   const failures: unknown[] = []
   for (const phase of input.phases) {
@@ -107,7 +121,12 @@ export async function tearDownStructuredAgentSessionHost(input: {
     ([sessionId]) => !input.retainSessionIds?.has(sessionId)
   )
   // `allSettled`, so one rejected close cannot skip the others.
-  const closed = await Promise.allSettled(entries.map(([, session]) => session.journal.close()))
+  const closed = await Promise.allSettled(
+    entries.map(async ([sessionId, session]) => {
+      await input.abandonQueued?.(sessionId, session)
+      await session.journal.close()
+    })
+  )
   closed.forEach((result, index) => {
     const sessionId = entries[index]?.[0]
     if (result.status === 'fulfilled') {
@@ -133,7 +152,7 @@ export async function tearDownStructuredAgentSessionHost(input: {
 
 export async function flushStructuredAgentSessionHost(
   context: StructuredAgentSessionLifetimeContext &
-    Pick<Parameters<typeof structuredAgentSessionHostTeardownPhases>[0], 'holds' | 'tasks'> & {
+    Pick<Parameters<typeof structuredAgentSessionHostTeardownPhases>[0], 'idleSweep' | 'tasks'> & {
       restartResume: StructuredAgentSessionRestartResume
       serialize: (sessionId: string, task: () => Promise<void>) => Promise<void>
       trigger: AgentSessionResumeTrigger
@@ -160,6 +179,8 @@ export async function flushStructuredAgentSessionHost(
     sessions: context.sessions,
     retainSessionIds,
     acknowledgeSessionRelease: (sessionId) =>
-      context.deps.adapter.acknowledgeSessionRelease?.(sessionId)
+      context.deps.adapter.acknowledgeSessionRelease?.(sessionId),
+    abandonQueued: (sessionId, session) =>
+      abandonQueuedStructuredAgentSessionMessages(context.deps, sessionId, session.journal)
   })
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-abandon.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-abandon.test.ts
new file mode 100644
index 000000000000..b069fecd1bb1
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-abandon.test.ts
@@ -0,0 +1,123 @@
+// The helper is what the restart specs remove their temp directory behind, so what it waits for is
+// load-bearing: a store commit that lands afterwards re-creates the directory it just removed.
+
+import { existsSync } from 'node:fs'
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import { abandonStructuredAgentSessionHost } from './structured-agent-session-host-test-abandon'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
+  hostTestMessage
+} from './structured-agent-session-host-test-data'
+
+const CALLER = { callerKey: 'client-1' }
+
+describe('abandoning a structured agent-session host', () => {
+  it('waits for the restart the delivery loop woke for an accepted send', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-abandon-'))
+    const store = await AgentSessionRecordStore.open({
+      directory: join(root, 'store'),
+      hostId: 'local'
+    })
+    // Holds the restart inside its provider acquisition, so the point teardown must not run past
+    // is exact rather than a timing window.
+    let gate: Promise<void> | null = null
+    let openGate = (): void => {}
+    let reportEntered = (): void => {}
+    const entered = new Promise<void>((resolve) => {
+      reportEntered = resolve
+    })
+    const adapter: StructuredAgentSessionAdapter = {
+      acquire: async ({ fence }) => {
+        if (gate) {
+          reportEntered()
+          await gate
+        }
+        return {
+          process: {
+            hostId: 'local',
+            pid: 4242,
+            processStartTimeMs: NOW - 1_000,
+            spawnToken: store.getRecord(SESSION)?.lease.reservedSpawnToken ?? 'spawn-a'
+          },
+          link: {
+            linkId: `link-${fence}`,
+            handle: { provider: 'codex', threadId: THREAD },
+            origin: 'created',
+            mintedAtFence: fence,
+            observedAt: NOW
+          }
+        }
+      },
+      dispatch: async () => ({
+        state: 'accepted',
+        providerIdentity: { provider: 'codex', threadId: THREAD, turnId: 'turn-1', ordinal: 1 }
+      }),
+      cancelTurn: async () => ({ cancelled: true }),
+      answerPrompt: async () => undefined,
+      releaseAcquisition: async () => true,
+      setOption: async () => undefined
+    }
+    const host = new StructuredAgentSessionHost({
+      store,
+      adapter,
+      probeOwner: async () => ({
+        outcome: 'identity-matched',
+        matchedOn: ['process-start-time']
+      }),
+      journalRoot: root,
+      claimKeyId: 'key-1',
+      mintSpawnToken: () => 'spawn-a',
+      now: () => NOW
+    })
+    expect(await host.attach(CALLER, hostTestAttachParams(null))).toMatchObject({ ok: true })
+    // The conversation stays and its provider child does not, so the next send makes the delivery
+    // loop start one — the shape the refusal-oracle spec ends on.
+    await host.close(SESSION)
+    gate = new Promise<void>((resolve) => {
+      openGate = resolve
+    })
+
+    const body = hostTestMessage('delivery loop')
+    expect(
+      await host.send(CALLER, {
+        envelope: {
+          sessionId: SESSION,
+          clientOperationId: `${NOW}-000000000000000000000000000003e9`,
+          expectedRuntimeFence: store.getRecord(SESSION)?.lease.runtimeFence ?? 1,
+          payloadFingerprint: computeAgentSessionPayloadFingerprint({
+            method: 'agentSession.send',
+            sessionId: SESSION,
+            fields: { body }
+          })
+        },
+        body
+      })
+    ).toMatchObject({ ok: true })
+    await entered
+
+    let abandoned = false
+    const abandoning = abandonStructuredAgentSessionHost(host).then(() => {
+      abandoned = true
+    })
+    await new Promise((resolve) => setTimeout(resolve, 20))
+    expect(abandoned).toBe(false)
+
+    openGate()
+    await abandoning
+
+    // Nothing is left to put the directory back after this returns.
+    await rm(root, { recursive: true })
+    await new Promise((resolve) => setTimeout(resolve, 200))
+    expect(existsSync(root)).toBe(false)
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-abandon.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-abandon.ts
new file mode 100644
index 000000000000..a4069875bade
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-abandon.ts
@@ -0,0 +1,25 @@
+// What a host that VANISHES without a clean quit has to release, for the tests that model one.
+//
+// Deliberately not the quit path: quit evicts provider children and releases leases, and that is
+// the state a restart test is checking gets re-derived from disk. It stops short of ownership.
+//
+// What it cannot skip is work already in flight, which is what every copy of this helper used to
+// get wrong. Two producers reach the session store after the last awaited call has returned — a
+// lease-renewal tick, and the restart the delivery loop wakes for an accepted send — and the store
+// re-creates its own directory before every commit. A commit landing after the test removed its
+// temp directory therefore puts that directory back, and the removal fails with ENOTEMPTY. Quit
+// waits for both, in its `stop-lease-renewal` and `drain-attaches` phases; so does this.
+
+import type { StructuredAgentSessionHost } from './structured-agent-session-host'
+
+export async function abandonStructuredAgentSessionHost(
+  host: StructuredAgentSessionHost
+): Promise<void> {
+  // First, so the drain below cannot race the loop into enqueueing another step.
+  host['conversationDelivery'].dispose()
+  host['lifetime'].dispose()
+  await host['runtimeState'].stopLeaseRenewal()
+  await host['tasks'].drainAttaches()
+  await Promise.all([...host['sessions'].values()].map((session) => session.journal.close()))
+  host['sessions'].clear()
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data.ts
index 69e6d029d607..959a02919a23 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data.ts
@@ -1,6 +1,12 @@
-import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import type {
+  AgentJournalMessageItem,
+  AgentJournalSnapshot
+} from '../../../shared/agent-session-journal-types'
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
 import type { AgentSessionExecutionLocation } from '../../../shared/agent-session-record'
+import { projectNativeChatTranscriptMessages } from '../../../shared/native-chat-transcript-projection'
+import { projectStructuredAgentSessionMessages } from '../../../shared/structured-agent-session-message-projection'
+import { createStructuredAgentSessionOutboxEntry } from '../../../shared/structured-agent-session-outbox'
 import { attachFingerprintFields } from './structured-agent-session-attach'
 import type { AgentSessionAttachParams } from './structured-agent-session-attach'
 
@@ -61,3 +67,23 @@ export function hostTestAttachParams(
     }
   }
 }
+
+/** The row ids a chat draws from `snapshot`, top to bottom, while its composer still holds `sent`
+ *  as dispatched, as it does until the journal accepts them. */
+export function hostTestDrawnRowIds(
+  snapshot: AgentJournalSnapshot,
+  sent: readonly { clientMessageId: string; text: string }[]
+): string[] {
+  const outbox = sent.map((message) => ({
+    ...createStructuredAgentSessionOutboxEntry({
+      ...message,
+      sessionId: HOST_TEST_SESSION,
+      attachments: [],
+      queuedAt: HOST_TEST_NOW
+    }),
+    state: 'dispatching' as const
+  }))
+  return projectNativeChatTranscriptMessages(
+    projectStructuredAgentSessionMessages(snapshot.items, outbox, snapshot.submissions)
+  ).map(({ id }) => id)
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-harness.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-harness.ts
index e0ac9c00d88a..1e0d77b0d524 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-harness.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-harness.ts
@@ -107,7 +107,7 @@ async function seedApproval(optionId = 'allow'): Promise<{ itemId: string; revis
   })
   await host.flushStreamedEvents(SESSION)
   const itemId = agentJournalItemKey(identity)
-  const page = host.history({ sessionId: SESSION, direction: 'tail' })
+  const page = await host.history({ sessionId: SESSION, direction: 'tail' })
   const appended = page.ok ? page.page.items.find((item) => item.itemId === itemId) : null
   if (!appended) {
     throw new Error('provider approval was not written to the journal')
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
index fd2c911c74e5..44699536a6fe 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
@@ -1,4 +1,6 @@
+import type { SubmissionRejectionFact } from '../../../shared/agent-session-failure'
 import type { AgentSessionOwnerProbe } from '../../../shared/agent-session-lease-adjudication'
+import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import type { AgentSessionStatusSummary } from '../../../shared/agent-session-wire'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
@@ -18,7 +20,7 @@ export type StructuredAgentSessionCaller = { callerKey: string }
 /** What the host believes about a session it just made addressable again. The workspace and agent
  *  come from the record, so a caller publishes the host's view rather than a client's assertion.
  *  `readable` is false when the journal could not be opened — the tab is still worth publishing,
- *  because attach recovers what read restore cannot. */
+ *  because the chat shows that failure and its Retry. */
 export type StructuredAgentSessionReveal = {
   sessionId: string
   workspaceId: string
@@ -26,25 +28,66 @@ export type StructuredAgentSessionReveal = {
   readable: boolean
 }
 
+/** Which provider child: the adapter acquisition and the lease fence it writes at. */
+export type StructuredAgentSessionProviderChildIdentity = {
+  readonly generation: string | null
+  readonly fence: number
+}
+
+/** The provider process behind a conversation. Written only in
+ *  `structured-agent-session-provider-child`. */
+export type StructuredAgentSessionProviderChild = StructuredAgentSessionProviderChildIdentity & {
+  /** A publish-first acquire is `starting` until the adapter's `started` event; only then are its
+   *  reported options fact. */
+  phase: StructuredAgentSessionProviderChildPhase
+  /** The queued message whose delivery started this child, fixed when the start is made; absent
+   *  for any other start. In memory only: it tells a restart offer its own start from another. */
+  readonly startedFor?: string
+}
+
+/** What ending a child established about its provider root. A stop's comes only from
+ *  `stopAgentSessionProviderRoot`; an observed exit's root is gone by definition. */
+export type StructuredAgentSessionStopVerdict = { rootGone: boolean }
+
+export type StructuredAgentSessionChildEndCause =
+  | 'user-stop'
+  | 'host-stop'
+  | 'exit'
+  | 'attach-failed'
+  | 'evict'
+
+/** How the conversation's last child ended. In memory only: the delivery loop reads it to tell a
+ *  Stop from a failure. */
+export type StructuredAgentSessionEndedChild = StructuredAgentSessionProviderChildIdentity &
+  StructuredAgentSessionStopVerdict & {
+    /** `user-stop` is a Stop the user asked for; `host-stop` is the host stopping the child for a
+     *  cause of its own, which fails the start the delivery loop was waiting on. */
+    cause: StructuredAgentSessionChildEndCause
+    /** Descriptive text only — the provider's diagnostic, or the host's cause. Decides nothing. */
+    reason: string | null
+    /** What the chat records about this end; absent reads as a provider exit with no detail. */
+    failure?: SubmissionRejectionFact
+    duringStartup: boolean
+    startedFor?: string
+    /** Where the conversation's journal stood when the child ended, to order the end against a
+     *  message's acceptance. */
+    endedAt: AgentJournalCursor
+  }
+
+/** The conversation: its journal, params and readers outlive any child that serves it. */
 export type StructuredAgentSessionHostSession = {
   /** Readonly: a new handle enters only through the session map's `set`, which binds its delivery. */
   readonly journal: AgentSessionJournal
   params: AgentSessionAttachParams
-  fence: number
-  /** Whether THIS host generation is running the provider process behind the session. A journal
-   *  restored for reading has none — so it may not be evicted to free a child, nor have its lease
-   *  released as an observed exit. */
-  hasProviderChild: boolean
-  /** Whether the child behind `hasProviderChild` has proven its start. A publish-first acquire
-   *  is `starting` until the adapter's `started` event; only then are its reported options fact. */
-  providerChildPhase: StructuredAgentSessionProviderChildPhase
+  /** The child THIS host generation runs for the conversation. A conversation opened for reading
+   *  has none — so it may not be evicted to free a child, nor have its lease released as an
+   *  observed exit. */
+  child: StructuredAgentSessionProviderChild | null
   /** The wind-down this host still owes for a child it started: settling that generation's work
-   *  and handing the lease back. A separate fact from `hasProviderChild`, which goes false the
-   *  moment the adapter proves the exit — an eviction that aborts after that point must still be
-   *  able to finish the wind-down on the next close. */
-  owesProviderChildWindDown?: boolean
-  /** Exact adapter acquisition behind `hasProviderChild`; retained after exit to fence recovery. */
-  acquisitionGeneration: string | null
+   *  and handing the lease back. Outlives `child`, which ends the moment the adapter proves the
+   *  exit — an eviction that aborts after that point must still finish it on the next close. */
+  owesProviderChildWindDown?: StructuredAgentSessionProviderChildIdentity
+  lastEndedChild?: StructuredAgentSessionEndedChild
 }
 
 export type StructuredAgentSessionHostDeps = {
@@ -70,8 +113,10 @@ export type StructuredAgentSessionHostDeps = {
     provider: AgentSessionRecord['provider']
   ) => Promise<Record<string, string> | undefined> | Record<string, string> | undefined
   now?: () => number
-  /** How long a session outlives its last surface. Tests drive this; production takes the default. */
-  releaseGraceMs?: number
+  /** The idle sweep's period and window. Tests drive these; production takes the defaults. */
+  idleSweep?: { intervalMs?: number; idleMs?: number }
+  /** Whether an orchestration dispatch still owns this session's worker; absent answers no. */
+  hasOpenDispatch?: (record: AgentSessionRecord) => boolean
   onEventSinkError?: (input: { sessionId: string; error: unknown }) => void
   /** Every status projection this host publishes. `replay` marks a re-projection of state the host
    *  already knew (restore, an arriving subscriber) rather than a fresh journal edge. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.test.ts
index ad2ac96da7aa..58a84cecd5f7 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.test.ts
@@ -139,11 +139,13 @@ describe('attach', () => {
     })
     const params = attachParams()
 
+    // Orca's own store fault: the child is gone, but nothing blames the provider.
     const refused = {
       ok: false,
       refusal: {
         code: 'agent_session_operation_invalid',
-        message: 'agent_session_provider_handle_stale_fence',
+        details: { ownerVerdict: 'exited' },
+        message: "Codex couldn't restart. Send your message to try again.",
         ownerVerdict: 'exited'
       }
     }
@@ -161,7 +163,10 @@ describe('attach', () => {
 
     await expect(host.attach(CALLER, attachParams())).resolves.toMatchObject({
       ok: false,
-      refusal: { message: 'commit failed', ownerVerdict: 'exited' }
+      refusal: {
+        message: "Codex couldn't restart. Send your message to try again.",
+        ownerVerdict: 'exited'
+      }
     })
 
     expect(releaseAcquisition).toHaveBeenCalledWith({ sessionId: SESSION })
@@ -209,7 +214,7 @@ describe('cancel', () => {
       turnId: 'turn-1'
     })
     expect(result).toMatchObject({ ok: true, value: { cancelled: true } })
-    const page = host.history({ sessionId: SESSION, direction: 'tail' })
+    const page = await host.history({ sessionId: SESSION, direction: 'tail' })
     expect(page.ok && page.page.items[0]?.body).toMatchObject({
       kind: 'status',
       text: 'Cancellation requested.'
@@ -333,7 +338,7 @@ describe('cancel', () => {
       refusal: { code: 'agent_session_operation_unknown' }
     })
     expect(cancelTurn).toHaveBeenCalledTimes(1)
-    expect(host.history({ sessionId: SESSION, direction: 'tail' })).toMatchObject({
+    expect(await host.history({ sessionId: SESSION, direction: 'tail' })).toMatchObject({
       ok: true,
       page: {
         items: [
@@ -396,7 +401,7 @@ describe('respondToPrompt', () => {
       ...fields
     })
 
-    const page = host.history({ sessionId: SESSION, direction: 'tail' })
+    const page = await host.history({ sessionId: SESSION, direction: 'tail' })
     const answered = page.ok ? page.page.items.find((item) => item.itemId === itemId) : null
     expect(answered).toMatchObject({
       revision: 2,
@@ -491,7 +496,7 @@ describe('respondToPrompt', () => {
       ...fields
     })
     expect(result.ok).toBe(true)
-    const page = host.history({ sessionId: SESSION, direction: 'tail' })
+    const page = await host.history({ sessionId: SESSION, direction: 'tail' })
     const statusId = agentJournalItemKey({
       provider: 'orca',
       clientMessageId: `${prompt.itemId}#delivery`
@@ -521,7 +526,7 @@ describe('setOption', () => {
     })
     expect(setOption).toHaveBeenCalledTimes(1)
     expect(store.getRecord(SESSION)?.options).toEqual({ model: 'gpt-5', effort: 'high' })
-    const page = host.history({ sessionId: SESSION, direction: 'tail' })
+    const page = await host.history({ sessionId: SESSION, direction: 'tail' })
     expect(page.ok && page.page.items).toHaveLength(0)
   })
 
@@ -605,13 +610,13 @@ describe('restart', () => {
     expect(host.listSessionTabs()).toEqual([
       { sessionId: SESSION, workspaceId: 'workspace-1', agent: 'codex' }
     ])
-    const history = host.history({ sessionId: SESSION, direction: 'tail' })
+    const history = await host.history({ sessionId: SESSION, direction: 'tail' })
     expect(history.ok && history.page.items).not.toHaveLength(0)
     expect(acquire).not.toHaveBeenCalled()
     expect(listRecords).toHaveBeenCalledTimes(restoreReads)
   })
 
-  it('clears a stale conflicted recovery at restart, and reacquires the native owner when a surface holds it', async () => {
+  it('clears a stale conflicted recovery at restart, and reacquires the native owner on the next start', async () => {
     await attach()
     await store.transitionHandoff(SESSION, (record) => ({
       ...record,
@@ -626,9 +631,10 @@ describe('restart', () => {
     acquire.mockClear()
 
     await host.restoreReadableSessions()
-    // The recovery stage clears on evidence at startup; the child comes back only once a surface
-    // holds the session (see structured-agent-session-surface-lifetime.test.ts).
-    await host.hold(SESSION, 'surface-1')
+    // The recovery stage clears on evidence at startup; the child comes back only once work
+    // starts it — here the explicit attach a send's delivery would make.
+    const fence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
+    expect(await host.attach(CALLER, ensureParams(fence))).toMatchObject({ ok: true })
 
     expect(acquire).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
@@ -660,12 +666,15 @@ describe('restart', () => {
       return settled(input)
     })
 
-    const hold = host.hold(SESSION, 'surface-1')
+    const start = host.attach(
+      CALLER,
+      ensureParams(store.getRecord(SESSION)?.lease.runtimeFence ?? 0)
+    )
     await started.promise
     const claimMidStart = store.getRecord(SESSION)?.lease.claimStatus
     const status = host.handoffStatus(SESSION)
     release.resolve()
-    await hold
+    await start
 
     // Mid-start the lease is only reserved; ownership does not wait for the agent.
     expect(claimMidStart).toBe('reserved')
@@ -718,7 +727,7 @@ describe('subscribe', () => {
   it('opens with a snapshot and then streams cursor-qualified batches', async () => {
     await attach()
     const events: AgentSessionSubscribeEvent[] = []
-    const dispose = host.subscribe({
+    const dispose = await host.subscribe({
       id: 'sub-1',
       sessionId: SESSION,
       emit: (event) => events.push(event)
@@ -748,7 +757,7 @@ describe('subscribe', () => {
     }
 
     const events: AgentSessionSubscribeEvent[] = []
-    host.subscribe({
+    await host.subscribe({
       id: 'sub-2',
       sessionId: SESSION,
       emit: (event) => events.push(event),
@@ -769,14 +778,14 @@ describe('subscribe', () => {
   it('drops a failed transport without aborting the mutation or other subscribers', async () => {
     await attach()
     const events: AgentSessionSubscribeEvent[] = []
-    host.subscribe({
+    await host.subscribe({
       id: 'dead-sub',
       sessionId: SESSION,
       emit: () => {
         throw new Error('socket closed')
       }
     })
-    host.subscribe({
+    await host.subscribe({
       id: 'live-sub',
       sessionId: SESSION,
       emit: (event) => events.push(event)
@@ -788,15 +797,25 @@ describe('subscribe', () => {
       body
     })
 
-    expect(result).toMatchObject({ ok: true, value: { submission: { dispatchState: 'accepted' } } })
-    expect(dispatch).toHaveBeenCalledTimes(1)
-    expect(events.some((event) => event.type === 'batch')).toBe(true)
+    expect(result).toMatchObject({ ok: true, value: { submission: { dispatchState: 'pending' } } })
+    // The failed transport does not stop the delivery loop either: the handover still lands and
+    // reaches the live subscriber.
+    await vi.waitFor(() => expect(dispatch).toHaveBeenCalledTimes(1))
+    await vi.waitFor(() =>
+      expect(
+        events.some(
+          (event) =>
+            event.type === 'batch' &&
+            event.batch.submissions?.some((entry) => entry.dispatchState === 'accepted')
+        )
+      ).toBe(true)
+    )
   })
 
   it('resets a subscriber whose epoch is gone', async () => {
     await attach()
     const events: AgentSessionSubscribeEvent[] = []
-    host.subscribe({
+    await host.subscribe({
       id: 'sub-3',
       sessionId: SESSION,
       emit: (event) => events.push(event),
@@ -808,7 +827,7 @@ describe('subscribe', () => {
   it('publishes the replacement fence when the owner generation changes', async () => {
     const record = await attach()
     const events: AgentSessionSubscribeEvent[] = []
-    host.subscribe({
+    await host.subscribe({
       id: 'sub-4',
       sessionId: SESSION,
       emit: (event) => events.push(event)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index 40bbc38238d9..26697d3f6819 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -2,43 +2,46 @@ import type { AgentSessionRewindParams } from '../../../shared/agent-session-rew
 import { rewindStructuredAgentSession } from './structured-agent-session-rewind'
 import { StructuredConversationCommandController } from './structured-conversation-command-controller'
 // Structured agent-session host: where the lease, journal, and provider adapter meet.
-// Mutations share one durable admission path and serialize per session.
+// Mutations share one durable admission path and serialize per session. A conversation is reached
+// only through `conversation`, which opens it at rest; an agent is started only by work that needs
+// it, and the idle sweep is the one thing that puts it to rest.
 
 import type { AgentJournalSnapshot } from '../../../shared/agent-session-journal-types'
 import type { AgentSessionExecutionLocation } from '../../../shared/agent-session-record'
 import type * as SessionWire from '../../../shared/agent-session-wire'
 import type { AgentSessionAttachParams } from './structured-agent-session-attach'
-import { AGENT_SESSION_NOT_ATTACHED } from './structured-agent-session-mutation-admission'
 import { createRestartReconciler } from './structured-agent-session-restart-reconcile'
 import type { AgentSessionSubscribeInput } from './structured-agent-session-subscribers'
 import { StructuredAgentSessionTaskQueue } from './structured-agent-session-task-queue'
 import * as providerSupport from './structured-agent-session-provider-support'
-import { createStructuredAgentSessionHostRestore } from './structured-agent-session-reveal'
+import {
+  createStructuredAgentSessionHostRestore,
+  revealStructuredAgentSession
+} from './structured-agent-session-reveal'
 import { structuredAgentSessionOwnerStatus } from './structured-agent-session-owner-status'
 import { StructuredAgentSessionHostRuntimeState } from './structured-agent-session-host-runtime-state'
 import { attachStructuredAgentSession } from './structured-agent-session-attach-orchestration'
+import type { StructuredAgentSessionLifetimeContext } from './structured-agent-session-host-lifetime'
 import {
-  createStructuredAgentSessionHolds,
-  evictHeldStructuredAgentSession,
-  type StructuredAgentSessionLifetimeContext
-} from './structured-agent-session-host-lifetime'
-import type {
-  StructuredAgentSessionHolds,
-  StructuredAgentSessionHoldOptions
-} from './structured-agent-session-holds'
+  ensureStructuredAgentSessionAgent,
+  ensureStructuredAgentSessionAgentForOperation
+} from './structured-agent-session-agent-start'
+import {
+  createStructuredAgentSessionConversationLifetime,
+  type StructuredAgentSessionConversationLifetime
+} from './structured-agent-session-conversation-lifetime'
 import type { StructuredAgentSessionAttachContext } from './structured-agent-session-attach-context'
 import * as sessionTabs from './structured-agent-session-host-tabs'
 import {
   structuredAgentSessionMutationDelegates,
   settleStructuredAgentSessionLateDispatch,
-  type StructuredAgentSessionMutationContext,
-  releaseStructuredAgentSessionUnansweredDispatches
+  type StructuredAgentSessionMutationContext
 } from './structured-agent-session-host-mutations'
+import { releaseStructuredAgentSessionUnansweredDispatches } from './structured-agent-session-unanswered-dispatch-release'
 import { flushStructuredAgentSessionHost } from './structured-agent-session-host-teardown'
 import type {
   StructuredAgentSessionCaller,
   StructuredAgentSessionHostDeps,
-  StructuredAgentSessionHostSession,
   StructuredAgentSessionReveal
 } from './structured-agent-session-host-types'
 import { StructuredAgentSessionEventRecovery } from './structured-agent-session-event-recovery'
@@ -50,6 +53,8 @@ import {
   type StructuredAgentSessionRestartResume
 } from './structured-agent-session-restart-resume-host'
 import { structuredAgentSessionRestartResumeSurfaces } from './structured-agent-session-restart-resume-wiring'
+import { createStructuredAgentSessionConversationDelivery } from './structured-agent-session-host-delivery'
+import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
 export type { StructuredAgentSessionHostDeps } from './structured-agent-session-host-types'
 
 export class StructuredAgentSessionHost {
@@ -59,13 +64,16 @@ export class StructuredAgentSessionHost {
   )
   private readonly sessions = new StructuredAgentSessionConversations({
     deliver: (sessionId, journal) => this.subscribers.publish(sessionId, journal),
-    onDeliveryError: (sessionId, error) => this.deps.onEventSinkError?.({ sessionId, error })
+    onDeliveryError: (sessionId, error) => this.deps.onEventSinkError?.({ sessionId, error }),
+    now: () => this.now()
   })
+  // Every journal publish is activity: the one renewal the idle sweep reads.
   private readonly clientDelivery = new StructuredAgentSessionClientDelivery(
     this.sessions,
     () => this.now(),
     () => this.deps,
-    (sessionId) => this.holds.renew(sessionId)
+    (sessionId) => this.sessions.touch(sessionId),
+    (sessionId) => this.restartResume.onAgentStarted(sessionId)
   )
   private readonly subscribers = this.clientDelivery.subscribers
   private readonly tasks = new StructuredAgentSessionTaskQueue()
@@ -74,7 +82,10 @@ export class StructuredAgentSessionHost {
     sessionId: string
   ) => Promise<SessionWire.AgentSessionWireRefusal | null>
   private readonly restore: ReturnType<typeof createStructuredAgentSessionHostRestore>
-  private readonly holds: StructuredAgentSessionHolds
+  private readonly lifetime: StructuredAgentSessionConversationLifetime
+  private readonly conversationDelivery: ReturnType<
+    typeof createStructuredAgentSessionConversationDelivery
+  >
   private readonly eventRecovery: StructuredAgentSessionEventRecovery
   private readonly backgroundTasks: StructuredAgentSessionBackgroundTaskChannel
   /** Public because the RPC surface addresses it directly; see the restart-resume collaborator. */
@@ -85,7 +96,7 @@ export class StructuredAgentSessionHost {
       deps,
       this.sessions,
       this.subscribers,
-      (sessionId) => this.requireSession(sessionId),
+      (sessionId) => this.lifetime.conversation(sessionId),
       this.clientDelivery.publishStatus
     )
     this.runtimeState = new StructuredAgentSessionHostRuntimeState(deps, (sessionId, error) =>
@@ -97,10 +108,23 @@ export class StructuredAgentSessionHost {
       ...(deps.probeOwners ? { probeMany: deps.probeOwners } : {}),
       now: () => this.now()
     })
-    this.holds = createStructuredAgentSessionHolds(
-      () => this.attachContext(),
-      (sessionId) => this.close(sessionId)
-    )
+    this.conversationDelivery = createStructuredAgentSessionConversationDelivery({
+      deps,
+      sessions: this.sessions,
+      serialize: (sessionId, task) => this.serialize(sessionId, task),
+      // Quit drains a delivery start before it evicts, so the child it produces is stopped.
+      trackStart: (start) => this.tasks.trackAttach(start),
+      ensureProviderChild: (sessionId, startedFor) =>
+        ensureStructuredAgentSessionAgent(this.attachContext(), sessionId, startedFor),
+      reset: (sessionId, journal, reset) =>
+        this.subscribers.reset(
+          sessionId,
+          journal,
+          reset,
+          structuredAgentSessionConversationFence(deps.store, sessionId)
+        ),
+      publishRestored: this.clientDelivery.publishRestored
+    })
     this.restore = createStructuredAgentSessionHostRestore(deps, {
       reconcile: this.reconcileLeases,
       resolveRecovery: (sessionId) => this.runtimeState.resolveRecovery(sessionId),
@@ -108,10 +132,7 @@ export class StructuredAgentSessionHost {
       hasSession: this.hasSession,
       // Site 10: cannot overwrite a live entry — the restorer returns early on
       // `hasSession` inside the same serialized step as this `set`.
-      onReadable: (sessionId, restored) => {
-        this.sessions.set(sessionId, restored)
-        this.clientDelivery.publishRestored(sessionId)
-      }
+      onReadable: this.conversationDelivery.adoptOpened
     })
     this.eventRecovery = new StructuredAgentSessionEventRecovery({
       deps,
@@ -119,14 +140,14 @@ export class StructuredAgentSessionHost {
       sessions: this.sessions,
       flushLifecycle: (sessionId) => this.runtimeState.lifecycleBarrier(sessionId),
       publishFence: (sessionId, session) =>
-        this.subscribers.snapshot(sessionId, session.journal, session.fence),
+        this.subscribers.snapshot(
+          sessionId,
+          session.journal,
+          structuredAgentSessionConversationFence(deps.store, sessionId)
+        ),
       publishStatus: this.clientDelivery.publishStatusAndSettlement,
-      hasResumeCapableHolder: (sessionId) => this.holds.hasResumeCapableHolder(sessionId),
-      restartReleaseGrace: (sessionId) => this.holds.renew(sessionId),
-      // Tracked: a quit drains a queued restart before it evicts, so no child outlives it.
       serialize: (sessionId, task) => this.tasks.trackAttach(this.serialize(sessionId, task)),
       now: () => this.now(),
-      ensureProviderChild: (id, options) => this.holds.ensureProviderChild(id, options),
       onBarrierError: (sessionId, error) => deps.onEventSinkError?.({ sessionId, error })
     })
     this.restartResume = createStructuredAgentSessionRestartResume(
@@ -134,24 +155,21 @@ export class StructuredAgentSessionHost {
       this.sessions,
       structuredAgentSessionRestartResumeSurfaces(this, this.now)
     )
+    this.lifetime = createStructuredAgentSessionConversationLifetime({
+      context: () => this.lifetimeContext(),
+      sessions: this.sessions,
+      serialize: (sessionId, task) => this.serialize(sessionId, task),
+      open: (sessionId) => this.conversationDelivery.open(sessionId),
+      deliveryActive: (sessionId) => this.conversationDelivery.loop.isRunning(sessionId),
+      closeStatus: (sessionId, options) => this.clientDelivery.closeSession(sessionId, options)
+    })
     this.runtimeState.startLeaseRenewal()
+    this.lifetime.idleSweep.start()
   }
 
   private now = (): number => this.deps.now?.() ?? Date.now()
 
   hasSession = (sessionId: string): boolean => this.sessions.has(sessionId)
-  isHeld = (sessionId: string): boolean => this.holds.isHeld(sessionId)
-
-  /** A surface bound to this session and wants it live. The FIRST hold on a session with no
-   *  provider child is what resumes one; a retained hold (a subscription) only keeps it. */
-  hold = (
-    sessionId: string,
-    holderId: string,
-    options?: StructuredAgentSessionHoldOptions
-  ): Promise<void> => this.holds.hold(sessionId, holderId, options)
-
-  /** That surface is gone. The child outlives it by the idle window, and by any running turn. */
-  release = (sessionId: string, holderId: string): void => this.holds.release(sessionId, holderId)
 
   handleAdapterEvent = (event: Parameters<StructuredAgentSessionEventRecovery['handle']>[0]) =>
     this.eventRecovery.handle(event)
@@ -162,7 +180,7 @@ export class StructuredAgentSessionHost {
       runtimeState: this.runtimeState,
       sessions: this.sessions,
       now: () => this.now(),
-      forgetStatus: this.clientDelivery.forgetStatus
+      publishStatus: this.clientDelivery.publishStatus
     }
   }
 
@@ -174,19 +192,12 @@ export class StructuredAgentSessionHost {
       tasks: this.tasks,
       reconcileLeases: (sessionId) => this.reconcileLeases(sessionId),
       serialize: (sessionId, task) => this.serialize(sessionId, task),
-      publishStatus: this.clientDelivery.publishStatus
+      publishStatus: this.clientDelivery.publishStatus,
+      openConversation: this.conversationDelivery.open
     }
   }
-  /** Releases a session's resources without ending the conversation: the record and journal stay
-   *  on disk, so the same session can be attached again. */
-  close(sessionId: string): Promise<void> {
-    return this.serialize(sessionId, async () => {
-      await evictHeldStructuredAgentSession(this.lifetimeContext(), sessionId)
-      this.clientDelivery.closeSession(sessionId)
-      // The holders now look at a session that is gone; a failed eviction throws above, keeping them.
-      this.holds.forget(sessionId)
-    })
-  }
+  /** Releases a session's resources without ending the conversation; see the lifetime's close. */
+  close = (sessionId: string): Promise<void> => this.lifetime.close(sessionId)
 
   supportsCreate = (location: AgentSessionExecutionLocation, agent: string): boolean =>
     providerSupport.adapterSupportsCreate(this.deps.adapter, location, agent)
@@ -195,8 +206,17 @@ export class StructuredAgentSessionHost {
   getPersistedVisibleSessionTabIndex = () => this.deps.store.getVisibleSessionTabIndex()
   getSessionTabId = (sessionId: string): string | null => this.deps.store.getSessionTabId(sessionId)
 
-  setSessionTabVisibility = (sessionId: string, visible: boolean, tabId?: string): Promise<void> =>
-    sessionTabs.setStructuredAgentSessionTabVisibility(this, sessionId, visible, tabId)
+  setSessionTabVisibility = async (
+    sessionId: string,
+    visible: boolean,
+    tabId?: string
+  ): Promise<void> => {
+    await sessionTabs.setStructuredAgentSessionTabVisibility(this, sessionId, visible, tabId)
+    // The tab edge of the row's lifetime; the handle close is the other.
+    if (!visible && !this.sessions.get(sessionId)?.child) {
+      this.clientDelivery.forgetStatus(sessionId)
+    }
+  }
 
   reconcileRestartLeases = async (): Promise<void> => {
     const refusal = await this.reconcileLeases('startup')
@@ -210,7 +230,7 @@ export class StructuredAgentSessionHost {
 
   /** Make one persisted session addressable again; see `structured-agent-session-reveal`. */
   revealSession = (sessionId: string): Promise<StructuredAgentSessionReveal> =>
-    this.restore.revealSession(sessionId)
+    revealStructuredAgentSession(this.deps, sessionId, (id) => this.lifetime.conversation(id))
 
   private serialize = this.tasks.serialize.bind(this.tasks)
 
@@ -227,9 +247,10 @@ export class StructuredAgentSessionHost {
   // Trigger inlined rather than imported: `AgentSessionResumeTrigger` in shared is the canonical
   // type, and this file has no line budget left for the import.
   async flushAllStreamedEvents(options?: { trigger?: 'quit' | 'update' }): Promise<void> {
+    this.conversationDelivery.dispose()
     await flushStructuredAgentSessionHost({
       ...this.lifetimeContext(),
-      holds: this.holds,
+      idleSweep: this.lifetime,
       tasks: this.tasks,
       restartResume: this.restartResume,
       serialize: this.serialize,
@@ -243,10 +264,13 @@ export class StructuredAgentSessionHost {
       sessions: this.sessions,
       publish: (sessionId, journal) => this.subscribers.publish(sessionId, journal),
       flushStreamedEvents: this.flushStreamedEvents,
-      requireSession: (sessionId) => this.requireSession(sessionId),
+      conversation: this.lifetime.conversation,
       serialize: (sessionId, task) => this.serialize(sessionId, task),
-      holds: this.holds,
-      restoreReadable: (sessionId) => this.restore.restoreReadableUnderSerialize(sessionId),
+      openConversation: this.conversationDelivery.open,
+      ensureAgent: (sessionId) =>
+        ensureStructuredAgentSessionAgentForOperation(this.attachContext(), sessionId),
+      wakeDelivery: (sessionId) => this.conversationDelivery.loop.wake(sessionId),
+      stopAgent: this.lifetime.stopAgent,
       now: () => this.now()
     }
   }
@@ -282,10 +306,10 @@ export class StructuredAgentSessionHost {
 
   /** The fully reduced timeline, for readers that cannot tolerate a page's ambiguity — rows are
    *  revised or tombstoned in place, so an item's ABSENCE from a bounded page proves nothing. */
-  journalSnapshot = (sessionId: string): AgentJournalSnapshot =>
-    this.requireSession(sessionId).journal.snapshot()
+  journalSnapshot = async (sessionId: string): Promise<AgentJournalSnapshot> =>
+    (await this.lifetime.conversation(sessionId)).journal.snapshot()
 
-  subscribe = (input: AgentSessionSubscribeInput): (() => void) =>
+  subscribe = (input: AgentSessionSubscribeInput): Promise<() => void> =>
     this.backgroundTasks.subscribe(input)
 
   settleLateDispatch = (input: Parameters<typeof settleStructuredAgentSessionLateDispatch>[1]) =>
@@ -306,11 +330,13 @@ export class StructuredAgentSessionHost {
   /** Turns that settle from now on. Live-only: nothing missed is replayed. */
   subscribeTurnCompletions = this.clientDelivery.subscribeTurnCompletions
 
-  private requireSession(sessionId: string): StructuredAgentSessionHostSession {
-    const session = this.sessions.get(sessionId)
-    if (!session) {
-      throw new Error(AGENT_SESSION_NOT_ATTACHED.code)
-    }
-    return session
-  }
+  /** Test rigs only: the collaborators the host builds itself, typed, for tests that drive them. */
+  collaboratorsForTests = () => ({
+    sessions: this.sessions,
+    subscribers: this.subscribers,
+    runtimeState: this.runtimeState,
+    conversationDelivery: this.conversationDelivery,
+    lifetime: this.lifetime,
+    serialize: this.serialize
+  })
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.test.ts
new file mode 100644
index 000000000000..ebc2009fa7db
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.test.ts
@@ -0,0 +1,314 @@
+// The idle sweep on a real host: what puts an agent to rest, what keeps it running, and what a
+// reader and the session lists see when it does.
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentSessionStatusSummary } from '../../../shared/agent-session-wire'
+import {
+  collectSubscriber,
+  createRestTestRig,
+  foundRestTestChat,
+  readerSaw,
+  IDLE_MS,
+  REST_TEST_CALLER as CALLER,
+  REST_TEST_SESSION as SESSION,
+  REST_TEST_THREAD as THREAD,
+  restTestSend,
+  sweepTicks,
+  type RestTestRig
+} from './structured-agent-session-rest-test-rig'
+import { StructuredAgentSessionIdleSweep } from './structured-agent-session-idle-sweep'
+
+let rig: RestTestRig
+
+beforeEach(async () => {
+  rig = await createRestTestRig()
+})
+
+afterEach(async () => {
+  await rig.dispose()
+})
+
+function providerEvents() {
+  const events = rig.adapter.acquire.mock.calls.at(-1)?.[0].events
+  if (!events) {
+    throw new Error('no provider child was started')
+  }
+  return events
+}
+
+function lastStatus(): AgentSessionStatusSummary | undefined {
+  return rig.statusEvents
+    .flatMap((event) => (event.type === 'status' ? [event.session] : []))
+    .findLast((summary) => summary.sessionId === SESSION)
+}
+
+function fence(): number {
+  return rig.store.getRecord(SESSION)?.lease.runtimeFence ?? 1
+}
+
+describe('the idle sweep', () => {
+  it('stops an idle agent and keeps the conversation, its status row and its reader (P2-07)', async () => {
+    await foundRestTestChat(rig)
+    const reader = collectSubscriber()
+    await rig.host.subscribe({ id: 'reader', sessionId: SESSION, emit: reader.emit })
+    rig.clock.now += IDLE_MS + 1
+
+    await vi.waitFor(() => expect(rig.adapter.closeSession).toHaveBeenCalledWith(SESSION))
+    await vi.waitFor(() => expect(rig.store.getRecord(SESSION)?.lease.claimStatus).toBe('released'))
+    await vi.waitFor(() => expect(rig.adapter.acknowledgeSessionRelease).toHaveBeenCalledOnce())
+    expect(rig.adapter.acknowledgeSessionRelease).toHaveBeenCalledWith(SESSION)
+    // Listed, idle, and no longer running on this host — never dropped from any list.
+    expect(lastStatus()).toMatchObject({ status: 'idle' })
+    expect(lastStatus()?.hostExecutionOwned).toBeUndefined()
+    expect(rig.sink.forget).not.toHaveBeenCalled()
+    expect(reader.events.some((event) => event.type === 'end')).toBe(false)
+
+    // Everything a chat at rest answers still answers, and the next send starts a new agent.
+    await expect(rig.host.readOptions(SESSION)).resolves.toMatchObject({ current: {} })
+    const sent = await rig.host.send(CALLER, restTestSend('carry on', fence()))
+    expect(sent.ok).toBe(true)
+    await vi.waitFor(() => expect(rig.adapter.acquire).toHaveBeenCalledTimes(2))
+    await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledTimes(2))
+    await vi.waitFor(() => expect(readerSaw(reader.events).texts).toContain('carry on'))
+  })
+
+  it('never stops an agent a message is queued for, and hands the message over (P2-08)', async () => {
+    await foundRestTestChat(rig)
+    rig.adapter.closeSession.mockClear()
+    // The loop takes the message and waits on the child's start, outside the lock.
+    const started = Promise.withResolvers<void>()
+    const awaitStarted = vi.fn(() => started.promise)
+    Object.assign(rig.host.deps.adapter, { awaitStarted })
+    const reader = collectSubscriber()
+    await rig.host.subscribe({ id: 'reader', sessionId: SESSION, emit: reader.emit })
+    const sent = await rig.host.send(CALLER, restTestSend('queued one', fence()))
+    expect(sent.ok).toBe(true)
+    await vi.waitFor(() => expect(awaitStarted).toHaveBeenCalled())
+    rig.clock.now += IDLE_MS + 1
+
+    await sweepTicks()
+    expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+    started.resolve()
+    await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledTimes(2))
+    const settled = (await rig.host.journalSnapshot(SESSION)).submissions.at(-1)
+    expect(settled?.dispatchState).toBe('accepted')
+    const seen = readerSaw(reader.events).submissions
+    expect(seen.some((row) => row.dispatchState === 'accepted')).toBe(true)
+    expect(
+      seen.some((row) => row.dispatchState === 'rejected' || row.dispatchState === 'unknown')
+    ).toBe(false)
+  })
+
+  it('never stops an agent whose background work still runs (P2-09)', async () => {
+    await foundRestTestChat(rig)
+    // A Codex subagent thread is one of these tasks; the tracker projects both kinds alike.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a background roster fixture; the sweep reads only whether live tasks exist.
+    rig.adapter.backgroundTaskState.mockReturnValue({
+      state: 'monitoring',
+      tasks: [
+        {
+          taskId: 'subagent-1',
+          kind: 'subagent',
+          status: 'running',
+          title: 'reviewer',
+          startedAt: rig.clock.now
+        }
+      ]
+    } as never)
+    rig.clock.now += IDLE_MS + 1
+
+    await sweepTicks()
+    expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+    rig.adapter.backgroundTaskState.mockReturnValue(undefined)
+    rig.clock.now += IDLE_MS + 1
+    await vi.waitFor(() => expect(rig.adapter.closeSession).toHaveBeenCalledWith(SESSION))
+  })
+
+  // A finished child reads done before the lead's wake-up turn writes its first row; stopping the
+  // agent in that gap would lose the wake-up. Owed work is activity, as main's release clock had it.
+  it('gives an agent a full idle window after its background work ends', async () => {
+    await foundRestTestChat(rig)
+    rig.adapter.backgroundTaskState.mockReturnValue({
+      state: 'monitoring',
+      tasks: [{ id: 'subagent-1', kind: 'agent', state: 'working' }]
+    })
+    rig.clock.now += IDLE_MS + 1
+    await sweepTicks()
+    rig.adapter.backgroundTaskState.mockReturnValue({
+      state: 'monitoring',
+      tasks: [{ id: 'subagent-1', kind: 'agent', state: 'done' }]
+    })
+
+    await sweepTicks()
+    expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+    rig.clock.now += IDLE_MS + 1
+    await vi.waitFor(() => expect(rig.adapter.closeSession).toHaveBeenCalledWith(SESSION))
+  })
+
+  // Owed work is read every tick, not once a window: work that ends just before a window would
+  // have closed still leaves the agent a full window after it.
+  it('gives a full window after background work that ends late in a window', async () => {
+    await foundRestTestChat(rig)
+    const subagent = (state: 'working' | 'done') => ({
+      state: 'monitoring' as const,
+      tasks: [{ id: 'subagent-1', kind: 'agent' as const, state }]
+    })
+    rig.adapter.backgroundTaskState.mockReturnValue(subagent('working'))
+    rig.clock.now += IDLE_MS + 1
+    await sweepTicks()
+    rig.clock.now += IDLE_MS - 60_000
+    await sweepTicks()
+    rig.adapter.backgroundTaskState.mockReturnValue(subagent('done'))
+    rig.clock.now += 60_000 + 1
+
+    await sweepTicks()
+    expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+    rig.clock.now += IDLE_MS
+    await vi.waitFor(() => expect(rig.adapter.closeSession).toHaveBeenCalledWith(SESSION))
+  })
+
+  it('stops an agent whose roster holds only children that went idle or finished', async () => {
+    await foundRestTestChat(rig)
+    rig.adapter.backgroundTaskState.mockReturnValue({
+      state: 'monitoring',
+      tasks: [
+        { id: 'subagent-1', kind: 'agent', state: 'idle' },
+        { id: 'command-1', kind: 'command', state: 'done' }
+      ]
+    })
+    rig.clock.now += IDLE_MS + 1
+
+    await vi.waitFor(() => expect(rig.adapter.closeSession).toHaveBeenCalledWith(SESSION))
+  })
+
+  it('never stops an agent while its lead turn runs, however quiet (P2-10)', async () => {
+    await foundRestTestChat(rig)
+    providerEvents().appendItem(
+      { provider: 'codex', threadId: THREAD, turnId: 'working', ordinal: 50 },
+      { kind: 'turn', turnId: 'working', state: 'running' }
+    )
+    await rig.host.flushStreamedEvents(SESSION)
+    rig.clock.now += IDLE_MS + 1
+
+    await sweepTicks()
+    expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+  })
+
+  it('stops an agent whose chat is still open on screen (P2-12)', async () => {
+    await foundRestTestChat(rig)
+    const reader = collectSubscriber()
+    await rig.host.subscribe({ id: 'on-screen', sessionId: SESSION, emit: reader.emit })
+    rig.clock.now += IDLE_MS + 1
+
+    await vi.waitFor(() => expect(rig.adapter.closeSession).toHaveBeenCalledWith(SESSION))
+    expect(reader.events.some((event) => event.type === 'end')).toBe(false)
+  })
+
+  it('counts the idle window from the last activity (P2-13)', async () => {
+    await foundRestTestChat(rig)
+    rig.clock.now += IDLE_MS - 60_000
+    // Activity at 29 minutes: a provider row reaching the journal.
+    providerEvents().appendItem(
+      { provider: 'codex', threadId: THREAD, turnId: 'turn-1', ordinal: 60 },
+      { kind: 'status', text: 'still thinking' }
+    )
+    await rig.host.flushStreamedEvents(SESSION)
+    rig.clock.now += 60_001
+
+    await sweepTicks()
+    expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+    rig.clock.now += IDLE_MS
+    await vi.waitFor(() => expect(rig.adapter.closeSession).toHaveBeenCalledWith(SESSION))
+  })
+
+  it('never stops a worker whose orchestration dispatch is open, and stops it once it settles (P2-19 i)', async () => {
+    await rig.dispose()
+    let open = true
+    const hasOpenDispatch = vi.fn(() => open)
+    rig = await createRestTestRig({ hasOpenDispatch })
+    await foundRestTestChat(rig)
+    rig.clock.now += 2 * IDLE_MS
+
+    await sweepTicks(12)
+    expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+    expect(hasOpenDispatch).toHaveBeenCalledWith(expect.objectContaining({ sessionId: SESSION }))
+    open = false
+    rig.clock.now += IDLE_MS + 1
+    await vi.waitFor(() => expect(rig.adapter.closeSession).toHaveBeenCalledWith(SESSION))
+  })
+
+  it('keeps a child an unanswered prompt waits on (P2-22 i)', async () => {
+    await foundRestTestChat(rig)
+    providerEvents().appendItem(
+      { provider: 'codex', threadId: THREAD, turnId: 'subagent-turn', ordinal: 70 },
+      {
+        kind: 'approval',
+        title: 'Run the command?',
+        detail: null,
+        options: [{ id: 'allow', label: 'Allow' }],
+        resolution: { state: 'pending', selectedOptionId: null, resolvedBy: null, resolvedAt: null }
+      }
+    )
+    await rig.host.flushStreamedEvents(SESSION)
+    rig.clock.now += IDLE_MS + 1
+
+    await sweepTicks()
+    expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+  })
+})
+
+describe('the idle sweep with no child running (P2-22 ii)', () => {
+  it('closes a handle whose only leftover is a prompt nobody can answer', async () => {
+    const journal = {
+      submissions: () => [],
+      pendingSubmissions: () => [],
+      snapshot: () => ({
+        items: [
+          {
+            itemId: 'prompt',
+            revision: 1,
+            sequence: 1,
+            observedAt: 0,
+            body: {
+              kind: 'approval',
+              title: 'Run?',
+              detail: null,
+              options: [],
+              resolution: {
+                state: 'pending',
+                selectedOptionId: null,
+                resolvedBy: null,
+                resolvedAt: null
+              }
+            }
+          }
+        ]
+      })
+    }
+    const sessions = Object.assign(
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a session fixture carrying only the journal and child facts the sweep reads.
+      new Map([[SESSION, { journal, child: null } as never]]),
+      { lastActivityAt: () => 0, touch: () => undefined }
+    )
+    const stopAgent = vi.fn(async () => undefined)
+    const closeConversation = vi.fn(async () => true)
+    const sweep = new StructuredAgentSessionIdleSweep({
+      sessions,
+      serialize: (_id, task) => task(),
+      now: () => IDLE_MS + 1,
+      isDisposed: () => false,
+      deliveryActive: () => false,
+      backgroundTaskState: () => undefined,
+      hasOpenDispatch: () => false,
+      stopAgent,
+      stopStartingAgent: stopAgent,
+      closeConversation,
+      onError: (_id, error) => {
+        throw error
+      }
+    })
+    await sweep.tick()
+    expect(stopAgent).not.toHaveBeenCalled()
+    expect(closeConversation).toHaveBeenCalledWith(SESSION)
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.ts
new file mode 100644
index 000000000000..2394b604171c
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.ts
@@ -0,0 +1,151 @@
+// The one thing that puts an idle agent to rest.
+//
+// Nothing a viewer does keeps an agent alive or starts one: a chat on screen and a chat in a
+// background tab are the same to this sweep. Every few minutes it looks at each open conversation
+// and stops the provider child of one that has been quiet for the idle window and owes no work,
+// then drops the open journal handle of one that is only a cache. The conversation itself — its
+// record, tab, status row and readers — is untouched, and the next send starts a new child.
+//
+// Owed work is derived on every tick, never stored, so there is nothing to disagree with it.
+
+import { agentChildWorkLiveness } from '../../../shared/agent-status-child-work-liveness'
+import { activeStructuredAgentSessionTurnId } from '../../../shared/structured-agent-session-projection'
+import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
+import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types'
+import type { AgentSessionBackgroundTaskState } from '../../../shared/agent-session-wire'
+import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
+
+export const STRUCTURED_AGENT_SESSION_IDLE_SWEEP_INTERVAL_MS = 5 * 60_000
+export const STRUCTURED_AGENT_SESSION_IDLE_MS = 30 * 60_000
+
+export type StructuredAgentSessionIdleSweepDeps = {
+  sessions: ReadonlyMap<string, StructuredAgentSessionHostSession> & {
+    lastActivityAt: (sessionId: string) => number | undefined
+    touch: (sessionId: string) => void
+  }
+  serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
+  now: () => number
+  isDisposed: () => boolean
+  deliveryActive: (sessionId: string) => boolean
+  backgroundTaskState: (sessionId: string) => AgentSessionBackgroundTaskState | null | undefined
+  /** An orchestration dispatch that still owns this session's worker; derived from its database. */
+  hasOpenDispatch: (sessionId: string) => boolean
+  /** Each of these runs inside the session's serialize and never takes it again. */
+  stopAgent: (sessionId: string) => Promise<void>
+  stopStartingAgent: (sessionId: string) => Promise<void>
+  closeConversation: (sessionId: string) => Promise<boolean>
+  onError: (sessionId: string, error: unknown) => void
+  intervalMs?: number
+  idleMs?: number
+}
+
+/** A prompt the user has not answered. A subagent can raise one the lead turn cannot see. */
+export function hasPendingStructuredAgentSessionPrompt(
+  items: readonly AgentJournalRenderItem[]
+): boolean {
+  return items.some(
+    (item) =>
+      (item.body.kind === 'approval' || item.body.kind === 'question') &&
+      item.body.resolution.state === 'pending'
+  )
+}
+
+export class StructuredAgentSessionIdleSweep {
+  private timer: ReturnType<typeof setInterval> | null = null
+  private running = false
+
+  constructor(private readonly deps: StructuredAgentSessionIdleSweepDeps) {}
+
+  start(): void {
+    this.timer = setInterval(
+      () => void this.tick(),
+      this.deps.intervalMs ?? STRUCTURED_AGENT_SESSION_IDLE_SWEEP_INTERVAL_MS
+    )
+    // An idle sweep must never be the reason a process stays alive at quit.
+    this.timer.unref?.()
+  }
+
+  dispose(): void {
+    if (this.timer) {
+      clearInterval(this.timer)
+      this.timer = null
+    }
+  }
+
+  /** One pass over every open conversation. Sessions run concurrently, so one waiting behind a
+   *  locked start does not hold up the rest; a pass still running skips the next. */
+  async tick(): Promise<void> {
+    if (this.running || this.deps.isDisposed()) {
+      return
+    }
+    this.running = true
+    try {
+      await Promise.allSettled(
+        [...this.deps.sessions.keys()].map((sessionId) =>
+          this.deps
+            .serialize(sessionId, () => this.tickUnderSerialize(sessionId))
+            .catch((error: unknown) => this.deps.onError(sessionId, error))
+        )
+      )
+    } finally {
+      this.running = false
+    }
+  }
+
+  /** Re-derives everything inside the session's lock, so an accept already queued ahead is seen. */
+  private async tickUnderSerialize(sessionId: string): Promise<void> {
+    const session = this.deps.sessions.get(sessionId)
+    if (!session || this.deps.isDisposed()) {
+      return
+    }
+    // A stop that failed after the child was proven gone: finish it now, before the idle test, so
+    // the rows its settlement wrote cannot push the retry out. A message accepted since goes first.
+    if (
+      session.owesProviderChildWindDown !== undefined &&
+      !session.child &&
+      !this.queuedOrDelivering(sessionId, session)
+    ) {
+      await this.deps.stopAgent(sessionId)
+      return
+    }
+    // Owed work is activity, read every tick, so the agent gets a full window once it ends: a child
+    // can read done before the lead's wake-up turn writes anything.
+    if (session.child && session.child.phase !== 'starting' && this.owesWork(sessionId, session)) {
+      this.deps.sessions.touch(sessionId)
+      return
+    }
+    const lastActivityAt = this.deps.sessions.lastActivityAt(sessionId) ?? this.deps.now()
+    if (this.deps.now() - lastActivityAt < (this.deps.idleMs ?? STRUCTURED_AGENT_SESSION_IDLE_MS)) {
+      return
+    }
+    if (session.child) {
+      // A start that has been quiet this long is not coming: the host stops it, with its reason.
+      if (session.child.phase === 'starting') {
+        await this.deps.stopStartingAgent(sessionId)
+        return
+      }
+      await this.deps.stopAgent(sessionId)
+    }
+    await this.deps.closeConversation(sessionId)
+  }
+
+  private queuedOrDelivering(sessionId: string, session: StructuredAgentSessionHostSession) {
+    return (
+      this.deps.deliveryActive(sessionId) ||
+      session.journal.submissions().some(isQueuedAgentJournalSubmission)
+    )
+  }
+
+  /** Work the running child still owes. Scoped to the child: with none, nothing here can pin the
+   *  handle, and a leftover prompt or turn row is only history. */
+  private owesWork(sessionId: string, session: StructuredAgentSessionHostSession): boolean {
+    const items = session.journal.snapshot().items
+    return (
+      activeStructuredAgentSessionTurnId(items) !== null ||
+      this.queuedOrDelivering(sessionId, session) ||
+      agentChildWorkLiveness(this.deps.backgroundTaskState(sessionId)?.tasks) !== null ||
+      this.deps.hasOpenDispatch(sessionId) ||
+      hasPendingStructuredAgentSessionPrompt(items)
+    )
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-journal-handles.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-journal-handles.test.ts
index ef08e1c7e93d..8dabd942705e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-journal-handles.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-journal-handles.test.ts
@@ -15,11 +15,7 @@ import { journalDatabaseFile } from '../agent-session-journal/journal-paths'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { createTrackedJournalOpener } from '../agent-session-journal/journal-store-test-open'
 import { openAgentSessionJournalWithRecovery } from './agent-session-journal-recovery'
-import {
-  evictStructuredAgentSession,
-  STRUCTURED_AGENT_SESSION_EVICTION_STEPS,
-  type StructuredAgentSessionEvictionContext
-} from './structured-agent-session-eviction'
+import { closeStructuredAgentSessionConversationUnderSerialize } from './structured-agent-session-host-lifetime'
 import { tearDownStructuredAgentSessionHost } from './structured-agent-session-host-teardown'
 import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
 
@@ -73,29 +69,7 @@ function hostSession(journal: AgentSessionJournal): StructuredAgentSessionHostSe
   return {
     journal,
     params: {} as StructuredAgentSessionHostSession['params'],
-    fence: 1,
-    hasProviderChild: false,
-    providerChildPhase: 'ready',
-    acquisitionGeneration: null
-  }
-}
-
-function evictionContext(
-  overrides: Partial<StructuredAgentSessionEvictionContext>
-): StructuredAgentSessionEvictionContext {
-  return {
-    sessionId: SESSION,
-    hasProviderChild: false,
-    eventSink: {
-      drained: async () => ({ ok: true }) as const,
-      unbind: () => undefined,
-      close: () => undefined
-    } as unknown as StructuredAgentSessionEvictionContext['eventSink'],
-    adapter: {} as StructuredAgentSessionEvictionContext['adapter'],
-    forget: async () => undefined,
-    discardSink: () => undefined,
-    releaseLease: async () => undefined,
-    ...overrides
+    child: null
   }
 }
 
@@ -140,46 +114,44 @@ describe('site 6: recovery rehydration', () => {
   })
 })
 
-describe('sites 9 and 10: the delete and overwrite callbacks', () => {
-  it('awaits the journal close before dropping the map entry', async () => {
+describe('sites 9 and 10: closing a conversation handle', () => {
+  it('drops the map entry before the close, and releases the handle', async () => {
     const journal = await journals.open({ identity: IDENTITY, journalDir })
     const sessions = new Map([[SESSION, hostSession(journal)]])
     const order: string[] = []
+    const close = journal.close.bind(journal)
+    journal.close = async () => {
+      // A lock-free reader arriving now must find no entry, never a closing handle.
+      order.push(sessions.has(SESSION) ? 'close-while-indexed' : 'close-after-delete')
+      await close()
+      order.push('closed')
+    }
 
-    await evictStructuredAgentSession(
-      evictionContext({
-        forget: async () => {
-          order.push('close-started')
-          await sessions.get(SESSION)?.journal.close()
-          order.push('closed')
-          sessions.delete(SESSION)
-          order.push('forgotten')
-        }
-      }),
-      STRUCTURED_AGENT_SESSION_EVICTION_STEPS
-    )
+    await expect(
+      closeStructuredAgentSessionConversationUnderSerialize(
+        { sessions, closeStatus: () => order.push('status') },
+        SESSION
+      )
+    ).resolves.toBe(true)
 
-    expect(order).toEqual(['close-started', 'closed', 'forgotten'])
+    expect(order).toEqual(['status', 'close-after-delete', 'closed'])
     expect(sessions.size).toBe(0)
     await expectNothingHoldsTheDirectory(journalDir)
   })
 
-  it('aborts the eviction with the session still indexed when the close rejects', async () => {
+  it('surfaces a rejected close to its caller', async () => {
     const journal = await journals.open({ identity: IDENTITY, journalDir })
     const sessions = new Map([[SESSION, hostSession(journal)]])
+    const close = journal.close.bind(journal)
+    journal.close = () => Promise.reject(new Error('close rejected'))
 
     await expect(
-      evictStructuredAgentSession(
-        evictionContext({
-          forget: async () => {
-            await Promise.reject(new Error('close rejected'))
-          }
-        }),
-        STRUCTURED_AGENT_SESSION_EVICTION_STEPS
+      closeStructuredAgentSessionConversationUnderSerialize(
+        { sessions, closeStatus: () => undefined },
+        SESSION
       )
-    ).rejects.toMatchObject({ step: 'forget-session' })
-    // Still indexed, so the next close is a real retry.
-    expect(sessions.has(SESSION)).toBe(true)
+    ).rejects.toThrow('close rejected')
+    journal.close = close
   })
 })
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement.test.ts
index 1874f7ee1c67..2194b992fb0e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement.test.ts
@@ -24,6 +24,8 @@ import {
   hostTestOperationId,
   resetHostTestOperationIds
 } from './structured-agent-session-host-test-data'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
 
 const CALLER = { callerKey: 'client-1' }
 
@@ -60,8 +62,8 @@ function sendParams(text: string): {
   }
 }
 
-function submissions(): unknown {
-  const state = host.history({ sessionId: SESSION, direction: 'tail' })
+async function submissions(): Promise<unknown> {
+  const state = await host.history({ sessionId: SESSION, direction: 'tail' })
   return state.ok ? state.page.submissions : null
 }
 
@@ -71,6 +73,18 @@ function journal(): AgentSessionJournal {
   ).sessions.get(SESSION)!.journal
 }
 
+/** A send is accepted first; this waits for the delivery loop to hand it to the provider. */
+async function handedOver(clientMessageId: string): Promise<void> {
+  await vi.waitFor(async () => {
+    expect(
+      journal()
+        .submissions()
+        .find((entry) => entry.clientMessageId === clientMessageId)?.handedOverAt
+    ).toBeDefined()
+    expect(dispatch).toHaveBeenCalled()
+  })
+}
+
 beforeEach(async () => {
   root = await mkdtemp(join(tmpdir(), 'orca-wire-late-settle-'))
   resetHostTestOperationIds()
@@ -126,14 +140,14 @@ describe('settling a send the provider proves it received after the ack window',
         })
     )
     const events: AgentSessionSubscribeEvent[] = []
-    const unsubscribe = host.subscribe({
+    const unsubscribe = await host.subscribe({
       id: 'late-receipt',
       sessionId: SESSION,
       emit: (event) => events.push(event)
     })
     const params = sendParams('echo before send completes')
     const pending = host.send(CALLER, params)
-    await vi.waitFor(() => expect(dispatch).toHaveBeenCalledTimes(1))
+    await vi.waitFor(async () => expect(dispatch).toHaveBeenCalledTimes(1))
     try {
       await host.settleLateDispatch({
         sessionId: SESSION,
@@ -152,10 +166,13 @@ describe('settling a send the provider proves it received after the ack window',
       finishDispatch({ state: 'unknown', reason: 'ack timeout' })
       unsubscribe()
     }
-    await expect(pending).resolves.toMatchObject({
-      ok: true,
-      value: { submission: { dispatchState: 'accepted' } }
-    })
+    await expect(pending).resolves.toMatchObject({ ok: true })
+    // The late `unknown` from the handover does not reopen the proven acceptance.
+    await vi.waitFor(async () =>
+      expect(await submissions()).toMatchObject([
+        { clientMessageId: params.envelope.clientOperationId, dispatchState: 'accepted' }
+      ])
+    )
     await expect(host.send(CALLER, { ...params, retryUnknown: true })).resolves.toMatchObject({
       ok: true,
       value: { submission: { dispatchState: 'accepted' } }
@@ -167,6 +184,10 @@ describe('settling a send the provider proves it received after the ack window',
     dispatch.mockResolvedValueOnce({ state: 'unknown', reason: 'ack timeout' })
     const params = sendParams('received just before shutdown')
     await host.send(CALLER, params)
+    await handedOver(params.envelope.clientOperationId)
+    await vi.waitFor(async () =>
+      expect(await submissions()).toMatchObject([{ dispatchState: 'unknown' }])
+    )
     let settlement: Promise<void> | undefined
     closeSession.mockImplementationOnce(async () => {
       settlement = host.settleLateDispatch({
@@ -181,15 +202,18 @@ describe('settling a send the provider proves it received after the ack window',
     await host.close(SESSION)
     await expect(settlement).resolves.toBeUndefined()
     await host.revealSession(SESSION)
-    expect(submissions()).toMatchObject([{ dispatchState: 'accepted' }])
+    expect(await submissions()).toMatchObject([{ dispatchState: 'accepted' }])
     expect(dispatch).toHaveBeenCalledTimes(1)
   })
 
   it('moves a durable unknown to accepted so nothing offers to send it again', async () => {
     dispatch.mockRejectedValueOnce(new Error('socket closed'))
     const params = sendParams('sent while a turn was running')
-    const first = await host.send(CALLER, params)
-    expect(first).toMatchObject({ ok: true, value: { submission: { dispatchState: 'unknown' } } })
+    await host.send(CALLER, params)
+    await handedOver(params.envelope.clientOperationId)
+    await vi.waitFor(async () =>
+      expect(await submissions()).toMatchObject([{ dispatchState: 'unknown' }])
+    )
 
     await host.settleLateDispatch({
       sessionId: SESSION,
@@ -197,7 +221,7 @@ describe('settling a send the provider proves it received after the ack window',
       providerIdentity: { provider: 'claude', sessionId: THREAD, uuid: 'late-uuid' }
     })
 
-    expect(submissions()).toMatchObject([
+    expect(await submissions()).toMatchObject([
       { clientMessageId: params.envelope.clientOperationId, dispatchState: 'accepted' }
     ])
     // The point of the fix: the client stops rendering Retry, and Retry is what
@@ -209,19 +233,21 @@ describe('settling a send the provider proves it received after the ack window',
     dispatch.mockResolvedValueOnce({ state: 'admitted' })
     const params = sendParams('queued behind the active turn')
     await host.send(CALLER, params)
+    await handedOver(params.envelope.clientOperationId)
 
     await host.settleLateDispatch({
       sessionId: SESSION,
       clientMessageId: params.envelope.clientOperationId,
       state: 'rejected',
-      reason: DISPATCH_REJECTED_CANCELLED
+      ...agentSessionFailureWords(agentSessionFailureFact('cancelled'), { surface: 'rejection' })
     })
 
-    expect(submissions()).toMatchObject([
+    expect(await submissions()).toMatchObject([
       {
         clientMessageId: params.envelope.clientOperationId,
         dispatchState: 'rejected',
-        reason: DISPATCH_REJECTED_CANCELLED
+        reason: DISPATCH_REJECTED_CANCELLED,
+        rejection: { kind: 'cancelled' }
       }
     ])
   })
@@ -230,6 +256,7 @@ describe('settling a send the provider proves it received after the ack window',
     dispatch.mockResolvedValueOnce({ state: 'admitted' })
     const params = sendParams('settle from provider echo')
     await host.send(CALLER, params)
+    await handedOver(params.envelope.clientOperationId)
     vi.spyOn(journal(), 'resolveDispatch').mockRejectedValueOnce(
       new Error('direct settlement write failed')
     )
@@ -247,7 +274,7 @@ describe('settling a send the provider proves it received after the ack window',
       { fence: store.getRecord(SESSION)?.lease.runtimeFence ?? 1 }
     )
 
-    expect(submissions()).toMatchObject([
+    expect(await submissions()).toMatchObject([
       {
         clientMessageId: params.envelope.clientOperationId,
         dispatchState: 'accepted',
@@ -259,6 +286,9 @@ describe('settling a send the provider proves it received after the ack window',
   it('leaves an already accepted send alone', async () => {
     const params = sendParams('ordinary send')
     await host.send(CALLER, params)
+    await vi.waitFor(async () =>
+      expect(await submissions()).toMatchObject([{ dispatchState: 'accepted' }])
+    )
 
     await host.settleLateDispatch({
       sessionId: SESSION,
@@ -266,7 +296,7 @@ describe('settling a send the provider proves it received after the ack window',
       providerIdentity: { provider: 'claude', sessionId: THREAD, uuid: 'a-different-uuid' }
     })
 
-    expect(submissions()).toMatchObject([
+    expect(await submissions()).toMatchObject([
       { clientMessageId: params.envelope.clientOperationId, dispatchState: 'accepted' }
     ])
   })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-launch-send-after-create.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-launch-send-after-create.test.ts
index 300f1423cb3c..cd26b96e5cd1 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-launch-send-after-create.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-launch-send-after-create.test.ts
@@ -57,12 +57,19 @@ async function launchAndDeliver(): Promise<{
     text: 'fix the failing test'
   })
   const sent = await send.mock.results[0]!.value
-  return {
-    messageId,
-    dispatchState: sent.ok
-      ? sent.value.submission.dispatchState
-      : `refused:${sent.refusal.code}:${sent.refusal.message}`
+  if (!sent.ok) {
+    return { messageId, dispatchState: `refused:${sent.refusal.code}:${sent.refusal.message}` }
   }
+  // Accepted first; the delivery loop hands it over, and that outcome is what reached the agent.
+  let dispatchState = sent.value.submission.dispatchState
+  await vi.waitFor(async () => {
+    dispatchState =
+      (await host.journalSnapshot(created.value.sessionId)).submissions.find(
+        (entry) => entry.clientMessageId === sent.value.clientMessageId
+      )?.dispatchState ?? 'missing'
+    expect(dispatchState).not.toBe('pending')
+  })
+  return { messageId, dispatchState }
 }
 
 beforeEach(() => {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-lease-renewer.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-lease-renewer.test.ts
index f969e3c0bbf7..9545e42b051c 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-lease-renewer.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-lease-renewer.test.ts
@@ -190,11 +190,36 @@ describe('structured agent-session lease renewal', () => {
         { timeout: 5000 }
       )
     } finally {
-      renewer.stop()
+      await renewer.stop()
       vi.useRealTimers()
     }
   })
 
+  it('stops only once a renewal already in flight has finished writing', async () => {
+    const store = await liveStore()
+    let releaseProbe = (): void => {}
+    const probing = new Promise<void>((resolve) => {
+      releaseProbe = resolve
+    })
+    const renewer = new StructuredAgentSessionLeaseRenewer({
+      store,
+      probe: async () => {
+        await probing
+        return { outcome: 'identity-matched', matchedOn: ['process-start-time'] }
+      },
+      now: () => NOW + 10_000
+    })
+
+    void renewer.renewNow()
+    // Nothing has been written yet: the tick is parked in its probe.
+    expect(store.getRecord('session-renewal')?.lease.lastRenewedAt).toBe(NOW)
+    const stopped = renewer.stop()
+    releaseProbe()
+    await stopped
+
+    expect(store.getRecord('session-renewal')?.lease.lastRenewedAt).toBe(NOW + 10_000)
+  })
+
   it('renews every live owner only after re-proving its child identity', async () => {
     const store = await liveStore()
     const probe = vi.fn(async () => ({
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-lease-renewer.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-lease-renewer.ts
index 96eb344fee90..a61e11b6f4f1 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-lease-renewer.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-lease-renewer.ts
@@ -10,6 +10,9 @@ const RENEW_INTERVAL_MS = Math.floor(AGENT_SESSION_LEASE_TTL_MS / 3)
 export class StructuredAgentSessionLeaseRenewer {
   private timer: ReturnType<typeof setInterval> | null = null
   private running = false
+  /** The tick in flight. Never rejects: the timer path reports renewal failures through `onError`,
+   *  and stopping must not turn one into a teardown failure as well. */
+  private inFlight: Promise<void> = Promise.resolve()
 
   constructor(
     private readonly input: {
@@ -32,70 +35,81 @@ export class StructuredAgentSessionLeaseRenewer {
     this.timer.unref?.()
   }
 
-  stop(): void {
+  /** Clearing the interval only stops the NEXT tick. A tick already past its guard still has a
+   *  store transaction to commit, and that transaction re-creates the store directory, so a stop
+   *  that returned before it landed would let the write outlive whatever tore the host down. */
+  stop(): Promise<void> {
     if (this.timer) {
       clearInterval(this.timer)
       this.timer = null
     }
+    return this.inFlight
   }
 
-  async renewNow(): Promise<void> {
+  renewNow(): Promise<void> {
     if (this.running) {
-      return
+      return this.inFlight
     }
     this.running = true
+    const attempt = this.renewOnce().finally(() => {
+      this.running = false
+    })
+    this.inFlight = attempt.then(
+      () => undefined,
+      () => undefined
+    )
+    return attempt
+  }
+
+  private async renewOnce(): Promise<void> {
+    const records = this.input.store.listRecords().filter(
+      (record) =>
+        !record.lease.unreconciled &&
+        record.lease.claimStatus === 'live' &&
+        record.lease.ownerProcess !== null &&
+        // A record parked in recovery has no transport the host can vouch for; renewing it
+        // keeps an orphan pid's lease reading as a healthy owner.
+        record.lease.handoffStage !== 'recovering'
+    )
+    const probes = await this.probe(records)
+    const renewals: {
+      sessionId: string
+      fence: number
+      childProbe: AgentSessionOwnerProbe
+      now: number
+    }[] = []
+    const now = this.input.now()
+    for (const record of records) {
+      const probe = probes.get(record.sessionId)
+      if (!probe) {
+        continue
+      }
+      renewals.push({
+        sessionId: record.sessionId,
+        fence: record.lease.runtimeFence,
+        childProbe: probe,
+        now
+      })
+    }
+    // The store persists the whole record file per transaction, so keep the healthy path to
+    // one commit. If one renewal is superseded, retrying individually preserves isolation.
+    let results: PromiseSettledResult<AgentSessionRecord>[]
     try {
-      const records = this.input.store.listRecords().filter(
-        (record) =>
-          !record.lease.unreconciled &&
-          record.lease.claimStatus === 'live' &&
-          record.lease.ownerProcess !== null &&
-          // A record parked in recovery has no transport the host can vouch for; renewing it
-          // keeps an orphan pid's lease reading as a healthy owner.
-          record.lease.handoffStage !== 'recovering'
+      const renewed = await this.input.store.renewLeases(renewals)
+      results = renewed.map((record) => ({ status: 'fulfilled', value: record }) as const)
+    } catch {
+      results = await Promise.allSettled(
+        renewals.map((renewal) => this.input.store.renewLease(renewal))
       )
-      const probes = await this.probe(records)
-      const renewals: {
-        sessionId: string
-        fence: number
-        childProbe: AgentSessionOwnerProbe
-        now: number
-      }[] = []
-      const now = this.input.now()
-      for (const record of records) {
-        const probe = probes.get(record.sessionId)
-        if (!probe) {
-          continue
+    }
+    results.forEach((result, index) => {
+      if (result.status === 'rejected') {
+        const renewal = renewals[index]
+        if (renewal) {
+          this.input.onError?.({ sessionId: renewal.sessionId, error: result.reason })
         }
-        renewals.push({
-          sessionId: record.sessionId,
-          fence: record.lease.runtimeFence,
-          childProbe: probe,
-          now
-        })
       }
-      // The store persists the whole record file per transaction, so keep the healthy path to
-      // one commit. If one renewal is superseded, retrying individually preserves isolation.
-      let results: PromiseSettledResult<AgentSessionRecord>[]
-      try {
-        const renewed = await this.input.store.renewLeases(renewals)
-        results = renewed.map((record) => ({ status: 'fulfilled', value: record }) as const)
-      } catch {
-        results = await Promise.allSettled(
-          renewals.map((renewal) => this.input.store.renewLease(renewal))
-        )
-      }
-      results.forEach((result, index) => {
-        if (result.status === 'rejected') {
-          const renewal = renewals[index]
-          if (renewal) {
-            this.input.onError?.({ sessionId: renewal.sessionId, error: result.reason })
-          }
-        }
-      })
-    } finally {
-      this.running = false
-    }
+    })
   }
 
   private async probe(
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-legacy-handoff-record.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-legacy-handoff-record.test.ts
index 5e0d7c836168..213126fb5eb5 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-legacy-handoff-record.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-legacy-handoff-record.test.ts
@@ -25,12 +25,18 @@ import {
 
 const CALLER = { callerKey: 'client-1' }
 
+/** Delivery runs on its own serialized steps; under a loaded runner they take more than a second. */
+function eventually(assertion: () => void | Promise<void>): Promise<void> {
+  return vi.waitFor(assertion, { timeout: 10_000 })
+}
+
 let root: string
 let store: AgentSessionRecordStore
 let host: StructuredAgentSessionHost
 let acquire: Mock<StructuredAgentSessionAdapter['acquire']>
 let probe: Mock<() => Promise<AgentSessionOwnerProbe>>
 let stopOwnerProcess: Mock<(pid: number, signal: 'SIGTERM' | 'SIGKILL') => void>
+let dispatch: Mock<StructuredAgentSessionAdapter['dispatch']>
 
 function openHost(): void {
   host = new StructuredAgentSessionHost({
@@ -39,7 +45,7 @@ function openHost(): void {
       acquire,
       closeSession: vi.fn(async () => true),
       releaseAcquisition: vi.fn(async () => true),
-      dispatch: vi.fn(async () => ({ state: 'admitted' as const })),
+      dispatch,
       cancelTurn: vi.fn(async () => ({ cancelled: false })),
       answerPrompt: vi.fn(async () => undefined),
       setOption: vi.fn(async () => undefined)
@@ -71,6 +77,23 @@ async function persistFromOlderBuild(lease: OlderBuildLease): Promise<void> {
   openHost()
 }
 
+/** A send is accepted at once; what became of it is the submission's state once the host's
+ *  delivery settles it — handed over, or rejected with the reason the chat shows. */
+async function delivered(text: string) {
+  const sent = await send(text)
+  expect(sent).toMatchObject({ ok: true })
+  const clientMessageId = sent.ok ? sent.value.clientMessageId : ''
+  const submission = async () =>
+    (await host.journalSnapshot(SESSION)).submissions.find(
+      (candidate) => candidate.clientMessageId === clientMessageId
+    )
+  await eventually(async () => {
+    const current = await submission()
+    expect(current?.dispatchState !== 'pending' || current?.handedOverAt !== undefined).toBe(true)
+  })
+  return submission()
+}
+
 async function send(text: string) {
   const body = hostTestMessage(text)
   return host.send(CALLER, {
@@ -93,6 +116,7 @@ beforeEach(async () => {
   resetHostTestOperationIds()
   probe = vi.fn(async () => ({ outcome: 'pid-absent' as const }))
   stopOwnerProcess = vi.fn()
+  dispatch = vi.fn(async () => ({ state: 'admitted' as const }))
   acquire = vi.fn(async ({ fence, spawnToken }) => ({
     process: { hostId: 'local', pid: 4242, processStartTimeMs: NOW - 1_000, spawnToken },
     link: {
@@ -143,7 +167,8 @@ describe('a record an older build left mid terminal handoff', () => {
       handoffOperationId: null
     })
     expect(store.getRecord(SESSION)?.lease).not.toHaveProperty('settlementRetryRequired')
-    expect(await send('after the upgrade')).toMatchObject({ ok: true })
+    expect(await delivered('after the upgrade')).toMatchObject({ dispatchState: 'pending' })
+    expect(dispatch).toHaveBeenCalledOnce()
     expect(acquire).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
       runtimeKind: 'native',
@@ -175,7 +200,8 @@ describe('a record an older build left mid terminal handoff', () => {
       handoffStage: null,
       handoffOperationId: null
     })
-    expect(await send('after the upgrade')).toMatchObject({ ok: true })
+    expect(await delivered('after the upgrade')).toMatchObject({ dispatchState: 'pending' })
+    expect(dispatch).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease).toMatchObject({ claimStatus: 'live' })
   })
 
@@ -194,7 +220,8 @@ describe('a record an older build left mid terminal handoff', () => {
       handoffStage: null,
       claimStatus: 'released'
     })
-    expect(await send('after the upgrade')).toMatchObject({ ok: true })
+    expect(await delivered('after the upgrade')).toMatchObject({ dispatchState: 'pending' })
+    expect(dispatch).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
       runtimeKind: 'native',
       claimStatus: 'live'
@@ -216,27 +243,38 @@ describe('a record an older build left mid terminal handoff', () => {
       claimStatus: 'conflicted',
       handoffStage: 'recovering'
     })
-    // Sending and opening the chat both say what frees it: quitting that terminal agent.
+    // Sending and opening the chat both say what frees it: quitting that terminal agent. A send is
+    // accepted, then rejected by the start that cannot take the lease, and the chat's row says why,
+    // worded from the refusal's details; only the live refusal names the process.
     const quitTerminal =
       'This chat is still open in a terminal agent (process 4242). Quit that agent to continue the chat here.'
-    expect(await send('while the terminal still runs')).toMatchObject({
-      ok: false,
-      refusal: { code: 'agent_session_conflict', message: quitTerminal }
+    expect(await delivered('while the terminal still runs')).toMatchObject({
+      dispatchState: 'rejected'
     })
+    expect(
+      (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+        item.body.kind === 'status' && item.body.tone === 'error' ? [item.body.text] : []
+      )
+    ).toEqual([
+      "Codex couldn't restart. This chat is still open in a terminal agent. Quit that agent to continue the chat here."
+    ])
     const fence = store.getRecord(SESSION)?.lease.runtimeFence ?? null
     expect(await host.attach(CALLER, hostTestAttachParams(fence))).toMatchObject({
       ok: false,
       refusal: { code: 'agent_session_conflict', message: quitTerminal }
     })
+    expect(dispatch).not.toHaveBeenCalled()
     expect(stopOwnerProcess).not.toHaveBeenCalled()
     expect(acquire).not.toHaveBeenCalled()
 
-    // The user closes the terminal; the next open proves it gone and the chat takes over.
+    // The user closes the terminal; the next send's start proves it gone and the chat takes over.
     probe.mockResolvedValue({ outcome: 'pid-absent' })
-    await host.hold(SESSION, 'surface-1')
 
     expect(stopOwnerProcess).not.toHaveBeenCalled()
-    expect(await send('after the terminal closed')).toMatchObject({ ok: true })
+    expect(await delivered('after the terminal closed')).toMatchObject({
+      dispatchState: 'pending'
+    })
+    expect(dispatch).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
       runtimeKind: 'native',
       claimStatus: 'live',
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-main-agent-working-agreement.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-main-agent-working-agreement.test.ts
new file mode 100644
index 000000000000..35c02972829c
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-main-agent-working-agreement.test.ts
@@ -0,0 +1,229 @@
+// The chat's own Stop and every session list read whether the main agent is working through one
+// rule, but over two copies of the host's journal: the chat reduces its stream, and a list reads the
+// status feed. Both leave the host from one publication edge, so once each has landed they must say
+// the same thing. Against the real host, store, journal, stream and status feed.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import type { AgentSessionBackgroundTaskState } from '../../../shared/agent-session-background-task-wire'
+import type { AgentJournalItemBody } from '../../../shared/agent-session-journal-types'
+import type { AgentSessionStatusSummary } from '../../../shared/agent-session-wire'
+import { structuredAgentSessionAgentStatus } from '../../../shared/structured-agent-session-agent-status'
+import { activeStructuredAgentSessionTurnId } from '../../../shared/structured-agent-session-live-turn'
+import { isStructuredAgentSessionMainAgentWorking } from '../../../shared/structured-agent-session-main-agent-working'
+import {
+  EMPTY_STRUCTURED_AGENT_SESSION,
+  reduceStructuredAgentSession,
+  type StructuredAgentSessionState
+} from '../../../shared/structured-agent-session-reducer'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import type { StructuredAgentSessionEventSink } from './structured-agent-session-event-sink'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
+  hostTestMessage,
+  hostTestOperationId,
+  resetHostTestOperationIds
+} from './structured-agent-session-host-test-data'
+
+const CALLER = { callerKey: 'client-1' }
+const PROVIDER_ROW = { provider: 'codex' as const, threadId: THREAD, turnId: 'turn-1' }
+
+let root: string
+let store: AgentSessionRecordStore
+let host: StructuredAgentSessionHost
+let dispatch: Mock<StructuredAgentSessionAdapter['dispatch']>
+let events: StructuredAgentSessionEventSink | undefined
+let backgroundTasks: AgentSessionBackgroundTaskState | null
+let chat: StructuredAgentSessionState
+let listed: AgentSessionStatusSummary | undefined
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-main-agent-working-'))
+  resetHostTestOperationIds()
+  events = undefined
+  backgroundTasks = null
+  chat = EMPTY_STRUCTURED_AGENT_SESSION
+  listed = undefined
+  // Written, and the provider has neither opened a turn for it nor answered it.
+  dispatch = vi.fn(async () => ({ state: 'admitted' as const }))
+  store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
+  host = new StructuredAgentSessionHost({
+    store,
+    adapter: {
+      acquire: async (input) => {
+        events = input.events
+        return {
+          process: {
+            hostId: 'local',
+            pid: 4242,
+            processStartTimeMs: 1_700_000_000_000,
+            spawnToken: input.spawnToken
+          },
+          acquisitionGeneration: 'generation-1',
+          link: {
+            linkId: `link-${input.fence}`,
+            handle: { provider: 'codex' as const, threadId: THREAD },
+            origin: 'created' as const,
+            mintedAtFence: input.fence,
+            observedAt: NOW
+          }
+        }
+      },
+      dispatch,
+      awaitStarted: vi.fn(async () => undefined),
+      closeSession: vi.fn(async () => true),
+      releaseAcquisition: vi.fn(async () => true),
+      cancelTurn: vi.fn(async () => ({ cancelled: true })),
+      answerPrompt: vi.fn(async () => undefined),
+      setOption: vi.fn(async () => undefined),
+      backgroundTaskState: () => backgroundTasks
+    },
+    journalRoot: root,
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => 'spawn-1',
+    now: () => NOW
+  })
+  expect(await host.attach(CALLER, hostTestAttachParams(null))).toMatchObject({ ok: true })
+  host.subscribe({
+    id: 'chat-1',
+    sessionId: SESSION,
+    emit: (event) => {
+      chat = reduceStructuredAgentSession(chat, { type: 'event', event: structuredClone(event) })
+    }
+  })
+  host.subscribeStatus({
+    id: 'list-1',
+    emit: (event) => {
+      if (event.type === 'status' && event.session.sessionId === SESSION) {
+        listed = structuredClone(event.session)
+      } else if (event.type === 'snapshot') {
+        listed = event.sessions.find((session) => session.sessionId === SESSION) ?? listed
+      }
+    }
+  })
+})
+
+afterEach(async () => {
+  await host.flushAllStreamedEvents()
+  await rm(root, { recursive: true, force: true })
+})
+
+async function send(text: string): Promise<string> {
+  const body = hostTestMessage(text)
+  const clientOperationId = hostTestOperationId()
+  expect(
+    await host.send(CALLER, {
+      envelope: {
+        sessionId: SESSION,
+        clientOperationId,
+        expectedRuntimeFence: 1,
+        payloadFingerprint: computeAgentSessionPayloadFingerprint({
+          method: 'agentSession.send',
+          sessionId: SESSION,
+          fields: { body }
+        })
+      },
+      body
+    })
+  ).toMatchObject({ ok: true })
+  return clientOperationId
+}
+
+async function provider(ordinal: number, body: AgentJournalItemBody): Promise<void> {
+  events!.appendItem({ ...PROVIDER_ROW, ordinal }, body)
+  events!.publish()
+  await host.flushStreamedEvents(SESSION)
+}
+
+/** What the chat's Stop reads: the transport state's rule over the chat's reduced stream. */
+function chatReadsWorking(): boolean {
+  return isStructuredAgentSessionMainAgentWorking(
+    activeStructuredAgentSessionTurnId(chat.items),
+    chat.submissions,
+    chat.fence
+  )
+}
+
+/** What a session list's row reads for the main agent, and the whole row, from the status feed. */
+function listReads(): { mainAgent: string; row: string } {
+  const summary = listed
+  if (!summary?.status) {
+    return { mainAgent: 'none', row: 'none' }
+  }
+  const status = structuredAgentSessionAgentStatus({ ...summary, status: summary.status })
+  return { mainAgent: status.mainAgent.state, row: status.state }
+}
+
+describe('the main agent read by the chat and by a session list', () => {
+  it('agrees while a rate-limited request retries with no turn open', async () => {
+    const id = await send('hello')
+    await vi.waitFor(async () =>
+      expect((await host.journalSnapshot(SESSION)).submissions[0]?.handedOverAt).toBeDefined()
+    )
+    // What Claude writes for an HTTP 429 retry: a status row, no echo, no turn.
+    await provider(1, { kind: 'status', text: 'rate_limit', tone: 'error' })
+    await provider(2, { kind: 'status', text: 'rate_limit', tone: 'error' })
+
+    expect(chat.submissions.map((submission) => submission.clientMessageId)).toEqual([id])
+    expect(activeStructuredAgentSessionTurnId(chat.items)).toBeNull()
+    expect(chatReadsWorking()).toBe(true)
+    expect(listReads().mainAgent).toBe('working')
+  })
+
+  it('agrees once the handed-over message is answered and only a subagent still runs', async () => {
+    dispatch.mockResolvedValueOnce({
+      state: 'accepted',
+      providerIdentity: { provider: 'codex', threadId: THREAD, turnId: 'turn-1', ordinal: 0 }
+    })
+    await send('fan out')
+    await vi.waitFor(async () =>
+      expect((await host.journalSnapshot(SESSION)).submissions[0]?.dispatchState).toBe('accepted')
+    )
+    await provider(1, { kind: 'turn', turnId: 'turn-1', state: 'running' })
+    expect(chatReadsWorking()).toBe(true)
+    expect(listReads().mainAgent).toBe('working')
+
+    await provider(1, { kind: 'turn', turnId: 'turn-1', state: 'completed', outcome: 'success' })
+    backgroundTasks = {
+      state: 'monitoring',
+      tasks: [{ id: 'task-1', kind: 'agent', name: 'deep_review', state: 'working' }]
+    }
+    host.publishBackgroundTaskState(SESSION)
+    await host.flushStreamedEvents(SESSION)
+
+    expect(chat.backgroundTasks?.tasks).toHaveLength(1)
+    // The row reads Working for the subagent; the main agent, and so Stop, does not.
+    expect(listReads()).toEqual({ mainAgent: 'done', row: 'working' })
+    expect(chatReadsWorking()).toBe(false)
+  })
+
+  it('agrees when the child that was handed the message exits', async () => {
+    await send('hello')
+    await vi.waitFor(async () =>
+      expect((await host.journalSnapshot(SESSION)).submissions[0]?.handedOverAt).toBeDefined()
+    )
+    expect(chatReadsWorking()).toBe(true)
+
+    await host.handleAdapterEvent({
+      type: 'ended',
+      sessionId: SESSION,
+      fence: store.getRecord(SESSION)!.lease.runtimeFence,
+      acquisitionGeneration: 'generation-1',
+      reason: 'codex app-server crashed',
+      cause: 'unexpected-exit'
+    })
+    await host.flushStreamedEvents(SESSION)
+
+    expect(chat.fence).toBe(store.getRecord(SESSION)!.lease.runtimeFence)
+    expect(chatReadsWorking()).toBe(false)
+    expect(listReads().mainAgent).not.toBe('working')
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-admission.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-admission.ts
index 62be89001596..6a623428e4f0 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-admission.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-admission.ts
@@ -15,10 +15,11 @@ import {
 } from '../../../shared/agent-session-mutation-envelope'
 import type { AgentSessionOperationDecision } from '../../../shared/agent-session-operation-ledger'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
-import type {
-  AgentSessionMutationEnvelope,
-  AgentSessionMutationResult,
-  AgentSessionWireRefusal
+import {
+  refuse,
+  type AgentSessionMutationEnvelope,
+  type AgentSessionMutationResult,
+  type AgentSessionWireRefusal
 } from '../../../shared/agent-session-wire'
 import { AGENT_SESSION_UNATTACHED_REFUSAL_CODE } from '../../../shared/structured-agent-session-read-refusal'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
@@ -31,10 +32,11 @@ import type { AgentSessionTurnContext } from './structured-agent-session-turns'
 
 // The code is shared with the client so a read that refuses this way can be told apart from a
 // transcript that failed to load; the two must never drift apart.
-export const AGENT_SESSION_NOT_ATTACHED: AgentSessionWireRefusal = {
-  code: AGENT_SESSION_UNATTACHED_REFUSAL_CODE,
-  message: 'This host holds no attached session by that id.'
-}
+export const AGENT_SESSION_NOT_ATTACHED: AgentSessionWireRefusal = refuse(
+  AGENT_SESSION_UNATTACHED_REFUSAL_CODE,
+  { reason: 'sessionNotAttached' },
+  'This host holds no attached session by that id.'
+)
 
 export function refuseAgentSessionMutation(refusal: AgentSessionWireRefusal): {
   ok: false
@@ -107,7 +109,8 @@ export async function admitAndRunAgentSessionMutation<TValue>(
     envelope,
     hostFingerprint,
     now: request.now(),
-    ...(plan.operationIdScope ? { operationIdScope: plan.operationIdScope } : {})
+    ...(plan.operationIdScope ? { operationIdScope: plan.operationIdScope } : {}),
+    ...(plan.conversationWrite ? { conversationWrite: true } : {})
   })
   if (!admitted) {
     return refuseAgentSessionMutation(AGENT_SESSION_NOT_ATTACHED)
@@ -141,7 +144,8 @@ export async function admitAndRunAgentSessionMutation<TValue>(
       envelope,
       hostFingerprint,
       ledger: { decision: 'admit', row: admission.row },
-      lease: record.lease
+      lease: record.lease,
+      ...(plan.conversationWrite ? { conversationWrite: true } : {})
     })
     if (rerun.decision === 'refused') {
       return refuseAgentSessionMutation(rerun.refusal)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-plans.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-plans.ts
index 226881d38bfe..2007f9bc1741 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-plans.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-plans.ts
@@ -29,8 +29,9 @@ export type MutationPlan<TValue> = {
   method: string
   fields: Record<string, unknown>
   operationIdScope?: 'global'
+  /** Admitted without the writer lease: see `admitAgentSessionMutation`. */
+  conversationWrite?: true
   markUnknownBeforeRun?: boolean
-  beforeRun?: () => void
   run: (ctx: AgentSessionTurnContext) => Promise<TurnOutcome<TValue>>
   replay: (ctx: AgentSessionTurnContext, outcome: AgentSessionOperationOutcome) => TValue | null
   rerunWhenReplayMissing?: (ctx: AgentSessionTurnContext) => boolean
@@ -50,19 +51,22 @@ export function sendPlan(params: {
   return {
     method: 'agentSession.send',
     operationIdScope: 'global',
+    conversationWrite: true,
     markUnknownBeforeRun: true,
     // A control signal is not payload; it cannot alter durable replay.
     fields: { body: params.body },
-    ...(params.beforeRun ? { beforeRun: params.beforeRun } : {}),
     recoverUnknownFromDurableState: true,
     // `retryUnknown` is a compatibility-only client signal. A recorded send
     // always replays and never reaches the provider twice.
-    run: (ctx) =>
-      performSend(ctx, {
+    run: (ctx) => {
+      // Asked at acceptance: a send accepted after this one is queued behind it.
+      params.beforeRun?.()
+      return performSend(ctx, {
         clientMessageId,
         payloadFingerprint: params.envelope.payloadFingerprint,
         body: params.body
-      }),
+      })
+    },
     replay: (ctx, outcome) => {
       const submission = ctx.journal
         .submissions()
@@ -94,15 +98,17 @@ export function sendPlan(params: {
 
 export function cancelPlan(params: {
   envelope: AgentSessionMutationEnvelope
-  turnId: string
+  turnId?: string
   scope?: 'background-tasks'
   taskId?: string
   prompt?: { itemId: string; expectedRevision: number }
 }): MutationPlan<AgentSessionCancelResult> {
   return {
     method: 'agentSession.cancel',
+    // Stop is a conversation write; a prompt or background-task cancel needs the live child.
+    ...(params.scope || params.prompt ? {} : { conversationWrite: true as const }),
     fields: {
-      turnId: params.turnId,
+      ...(params.turnId !== undefined ? { turnId: params.turnId } : {}),
       ...(params.scope ? { scope: params.scope } : {}),
       ...(params.taskId ? { taskId: params.taskId } : {}),
       ...(params.prompt ? { prompt: params.prompt } : {})
@@ -110,14 +116,17 @@ export function cancelPlan(params: {
     run: (ctx) =>
       performCancel(ctx, {
         clientOperationId: params.envelope.clientOperationId,
-        turnId: params.turnId,
+        ...(params.turnId !== undefined ? { turnId: params.turnId } : {}),
         ...(params.scope ? { scope: params.scope } : {}),
         ...(params.taskId ? { taskId: params.taskId } : {}),
         ...(params.prompt ? { prompt: params.prompt } : {})
       }),
     // Interrupting twice would kill a turn the client never asked to stop, so a
     // replay reports the turn as already handled instead.
-    replay: () => ({ turnId: params.turnId, cancelled: false })
+    replay: () => ({
+      ...(params.turnId !== undefined ? { turnId: params.turnId } : {}),
+      cancelled: false
+    })
   }
 }
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-operation-settlement.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-operation-settlement.test.ts
index b1eb5704f015..094ddffdcb27 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-operation-settlement.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-operation-settlement.test.ts
@@ -2,7 +2,6 @@ import { join } from 'node:path'
 import { afterEach, expect, it, vi } from 'vitest'
 import {
   AgentSessionPreDispatchError,
-  AGENT_SESSION_ADMISSION_BARRIER_TIMEOUT_MS,
   runSettledAgentSessionMutation
 } from './structured-agent-session-operation-settlement'
 import {
@@ -42,6 +41,9 @@ async function context(): Promise<AgentSessionTurnContext> {
   }
 }
 
+/** Longer than any bookkeeping bound: a refusal must already be answered by then. */
+const SETTLED_WAIT_MS = 2_000
+
 afterEach(() => {
   vi.useRealTimers()
   vi.restoreAllMocks()
@@ -80,7 +82,7 @@ it('returns a pre-dispatch refusal without waiting on redundant uncertainty pers
   })
   try {
     await refusing.promise
-    await vi.advanceTimersByTimeAsync(AGENT_SESSION_ADMISSION_BARRIER_TIMEOUT_MS)
+    await vi.advanceTimersByTimeAsync(SETTLED_WAIT_MS)
     expect(returned).toBe(true)
     expect(writes).toHaveBeenCalledOnce()
     expect(hostTestState().dispatch).not.toHaveBeenCalled()
@@ -129,9 +131,10 @@ it.each([1, 2])(
   }
 )
 
-// The pre-dispatch check judges only what the journal already holds; the send path never waits on
-// the provider's stream barrier, so a sink that stalls or fails cannot delay or double a send.
-it('dispatches without touching the event-stream barrier', async () => {
+// A send's plan only accepts: it records the submission and never waits on the provider's stream
+// barrier, so a sink that stalls or fails cannot delay or double a send. Handing it over is the
+// delivery loop's.
+it('accepts without touching the event-stream barrier or the provider', async () => {
   const ctx = await context()
   const { store } = hostTestState()
   vi.spyOn(store, 'recordOperationOutcome').mockResolvedValue()
@@ -149,42 +152,33 @@ it('dispatches without touching the event-stream barrier', async () => {
   })
   expect(result).toMatchObject({ ok: true })
   expect(beforeRun).toHaveBeenCalledOnce()
-  expect(hostTestState().dispatch).toHaveBeenCalledOnce()
-  expect(ctx.journal.submissions()[0]?.dispatchState).toBe('accepted')
+  expect(hostTestState().dispatch).not.toHaveBeenCalled()
+  expect(ctx.journal.submissions()[0]).toMatchObject({
+    dispatchState: 'pending',
+    handoverRecorded: true
+  })
   expect(barrier).not.toHaveBeenCalled()
 })
 
-it('refuses a superseded send without waiting on a stalled refusal write, and never dispatches late', async () => {
+it('refuses a superseded send at acceptance, recording and dispatching nothing', async () => {
   const ctx = await context()
   const { store } = hostTestState()
   vi.spyOn(store, 'recordOperationOutcome').mockResolvedValue()
-  const pending = Promise.withResolvers<void>()
-  const refusing = Promise.withResolvers<void>()
-  vi.spyOn(ctx.journal, 'resolveDispatch').mockImplementationOnce(() => {
-    refusing.resolve()
-    return pending.promise.then(() => ctx.journal.cursor())
-  })
-  vi.spyOn(console, 'warn').mockImplementation(() => {})
   const beforeRun = vi.fn(() => {
     throw new AgentSessionPreDispatchError('agent_session_restart_work_superseded')
   })
   const body = hostTestMessage('Continue the interrupted work')
   const operation = envelope('agentSession.send', { body })
   vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
-  const result = runSettledAgentSessionMutation({
+  const result = await runSettledAgentSessionMutation({
     store,
     operationCallerKey: 'test',
     envelope: operation,
     context: ctx,
     plan: sendPlan({ envelope: operation, body, beforeRun })
   }).catch((error: unknown) => error)
-  await refusing.promise
-  await vi.advanceTimersByTimeAsync(AGENT_SESSION_ADMISSION_BARRIER_TIMEOUT_MS)
-  expect(await result).toBeInstanceOf(AgentSessionPreDispatchError)
-  expect(hostTestState().dispatch).not.toHaveBeenCalled()
-  expect(ctx.journal.submissions()[0]?.dispatchState).toBe('pending')
-  pending.resolve()
-  await vi.advanceTimersByTimeAsync(0)
+  expect(result).toBeInstanceOf(AgentSessionPreDispatchError)
+  expect(ctx.journal.submissions()).toEqual([])
   expect(hostTestState().dispatch).not.toHaveBeenCalled()
   expect(vi.getTimerCount()).toBe(0)
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-operation-settlement.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-operation-settlement.ts
index baf871aef65e..e4675bfefb14 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-operation-settlement.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-operation-settlement.ts
@@ -11,8 +11,6 @@ export class AgentSessionPreDispatchError extends Error {
   }
 }
 
-export const AGENT_SESSION_ADMISSION_BARRIER_TIMEOUT_MS = 2_000
-
 export async function runSettledAgentSessionMutation<TValue>(input: {
   store: AgentSessionRecordStore
   operationCallerKey: string
@@ -33,10 +31,7 @@ export async function runSettledAgentSessionMutation<TValue>(input: {
     if (input.plan.markUnknownBeforeRun) {
       await settle({ status: 'unknown' })
     }
-    outcome = await input.plan.run({
-      ...input.context,
-      ...(input.plan.beforeRun ? { beforeDispatch: input.plan.beforeRun } : {})
-    })
+    outcome = await input.plan.run(input.context)
     await settle(
       outcome.ok
         ? (input.plan.settledOutcome?.(outcome.value) ?? {
@@ -46,6 +41,8 @@ export async function runSettledAgentSessionMutation<TValue>(input: {
         : {
             status: 'failed',
             code: outcome.refusal.code,
+            ...(outcome.refusal.details ? { details: outcome.refusal.details } : {}),
+            // The row's own field, which builds before details read; copied from the legacy mirror.
             ...(outcome.refusal.rewindReason ? { rewindReason: outcome.refusal.rewindReason } : {})
           }
     )
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-operation-start-refusal.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-operation-start-refusal.test.ts
new file mode 100644
index 000000000000..7700a616b382
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-operation-start-refusal.test.ts
@@ -0,0 +1,61 @@
+// What an operation that needs the agent is told when it cannot have one: a typed refusal in
+// words a person can read, never Orca's own error text.
+
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentSessionRecord } from '../../../shared/agent-session-record'
+import type { StructuredAgentSessionAttachContext } from './structured-agent-session-attach-context'
+import { ensureStructuredAgentSessionAgentForOperation } from './structured-agent-session-agent-start'
+import { recordStructuredAgentSessionOptionIntent } from './structured-agent-session-options-read'
+
+const SESSION = 'session-1'
+
+describe('an operation whose agent start throws', () => {
+  it('is refused as a failed restart, with the error only in the log', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const cause = new Error('EACCES: permission denied, open /Users/me/.orca/leases.json')
+    const context = {
+      sessions: new Map(),
+      reconcileLeases: () => Promise.reject(cause)
+    }
+
+    const refused = await ensureStructuredAgentSessionAgentForOperation(
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a partial context double; the start throws at `reconcileLeases`, before any other member is read.
+      context as unknown as StructuredAgentSessionAttachContext,
+      SESSION
+    )
+
+    expect(refused).toEqual({
+      ok: false,
+      refusal: {
+        code: 'agent_session_owner_restart_failed',
+        message: "The agent couldn't restart."
+      }
+    })
+    expect(warn).toHaveBeenCalledWith(expect.stringContaining('starting the agent'), cause)
+    warn.mockRestore()
+  })
+})
+
+describe('an option picked while the chat is at rest', () => {
+  it('refuses a key the provider would not accept as a rejected option', async () => {
+    const persistOptions = vi.fn(async () => {})
+    const refused = await recordStructuredAgentSessionOptionIntent(
+      {
+        getRecord: () =>
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the intent reads only the record's provider and options.
+          ({ provider: 'codex', options: {} }) as unknown as AgentSessionRecord
+      },
+      { sessionId: SESSION, persistOptions, publish: () => {} },
+      { key: 'notAnOption', value: 'x' }
+    )
+
+    expect(refused).toMatchObject({
+      ok: false,
+      refusal: {
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'optionRejected' }
+      }
+    })
+    expect(persistOptions).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-option-error.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-option-error.ts
index 607db1e6c4ba..47f67910cf97 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-option-error.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-option-error.ts
@@ -1,6 +1,10 @@
 /** Option validation failed before the provider session was mutated. */
 export class AgentSessionOptionRejectedError extends Error {
-  constructor(cause: unknown) {
+  constructor(
+    cause: unknown,
+    /** `providerStarting`: nothing is wrong with the value; the session cannot take it yet. */
+    readonly refusalReason: 'optionRejected' | 'providerStarting' = 'optionRejected'
+  ) {
     super(cause instanceof Error ? cause.message : String(cause), { cause })
     this.name = 'AgentSessionOptionRejectedError'
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-option-settlement.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-option-settlement.test.ts
index 7957ed326a8e..3eae8a7ae08f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-option-settlement.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-option-settlement.test.ts
@@ -152,6 +152,11 @@ describe('structured session options and close', () => {
       envelope: envelope('agentSession.send', { body }),
       body
     })
+    // Accepted, then handed over by the delivery loop; the status is read once it answered.
+    await vi.waitFor(() => expect(dispatchedModels).toEqual([DEFAULT_MODEL]))
+    await vi.waitFor(async () =>
+      expect((await host.journalSnapshot(SESSION)).submissions[0]?.dispatchState).toBe('accepted')
+    )
     const events: AgentSessionStatusEvent[] = []
     host.subscribeStatus({ id: 'session-list', emit: (event) => events.push(event) })
     expect(events).toEqual([
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-options-read.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-options-read.ts
new file mode 100644
index 000000000000..3bad8d9789f1
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-options-read.ts
@@ -0,0 +1,134 @@
+// A chat's options, live or at rest.
+//
+// At rest nothing here needs a child. The pick is the record's own `options` — what the next start replays —
+// and the list is the host's model catalog, the same one the picker already reads before a chat
+// exists. A pick made at rest is written to the record as intent, through the same transition a live
+// pick takes, so the next start applies it.
+
+import {
+  refuse,
+  type AgentSessionOptionResult,
+  type AgentSessionOptionsResult
+} from '../../../shared/agent-session-wire'
+import { decodeStructuredAgentSessionOptionValue } from '../../../shared/structured-agent-session-option-codec'
+import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import { journalOpenReadRefusal } from '../agent-session-journal/journal-open-failure'
+import { isClaudeStructuredOptionKey } from '../../claude/claude-structured-options'
+import { isCodexTurnOptionKey } from '../../codex/codex-structured-turn-start'
+import type { StructuredAgentSessionHostDeps } from './structured-agent-session-host-types'
+import type { AgentSessionTurnContext, TurnOutcome } from './structured-agent-session-turns'
+import type { StructuredAgentSessionMutationContext } from './structured-agent-session-host-mutations'
+
+type RestingOptions = Pick<AgentSessionOptionsResult, 'models' | 'fastModeSupport' | 'current'>
+
+async function readStructuredAgentSessionOptionsAtRest(
+  deps: Pick<StructuredAgentSessionHostDeps, 'store' | 'modelCatalog'>,
+  sessionId: string
+): Promise<RestingOptions> {
+  const record = deps.store.getRecord(sessionId)
+  if (!record) {
+    throw new Error('agent_session_identity_required')
+  }
+  const catalog = (await deps.modelCatalog
+    ?.read({ agent: record.provider, sessionId })
+    .catch(() => null)) ?? { origin: 'unknown' as const }
+  const models = catalog.origin === 'unknown' ? [] : catalog.models
+  const saved = record.options ?? {}
+  const fastMode =
+    saved.fastMode === undefined
+      ? null
+      : decodeStructuredAgentSessionOptionValue('fastMode', saved.fastMode)
+  // An unknown model is one the client already treats as unconfirmed.
+  const model = saved.model ?? models.find((entry) => entry.isDefault)?.id ?? ''
+  // As a live child answers: the pick, else what Claude runs for this model when none is sent.
+  // A live Codex child answers only the effort its thread reported, never the model's default.
+  const effort =
+    saved.effort ??
+    (record.provider === 'claude'
+      ? models.find((entry) => entry.id === model)?.defaultEffort
+      : undefined)
+  return {
+    models,
+    ...(catalog.origin !== 'unknown' && catalog.fastModeSupport
+      ? { fastModeSupport: catalog.fastModeSupport }
+      : {}),
+    current: {
+      model,
+      ...(effort ? { effort } : {}),
+      ...(typeof fastMode === 'boolean' ? { fastMode } : {})
+    }
+  }
+}
+
+/** Records a pick for the next start. Only a key the provider would accept is kept. */
+export async function recordStructuredAgentSessionOptionIntent(
+  store: Pick<AgentSessionRecordStore, 'getRecord'>,
+  ctx: Pick<AgentSessionTurnContext, 'sessionId' | 'persistOptions' | 'publish'>,
+  input: { key: string; value: string }
+): Promise<TurnOutcome<AgentSessionOptionResult>> {
+  const record = store.getRecord(ctx.sessionId)
+  const accepted =
+    record?.provider === 'codex'
+      ? isCodexTurnOptionKey(input.key)
+      : record?.provider === 'claude' && isClaudeStructuredOptionKey(input.key)
+  if (!record || !accepted) {
+    return {
+      ok: false,
+      refusal: refuse(
+        'agent_session_operation_invalid',
+        { reason: 'optionRejected' },
+        `${record?.provider ?? 'This session'} has no session option named ${input.key}`
+      )
+    }
+  }
+  const options = { ...record.options, [input.key]: input.value }
+  await ctx.persistOptions(options)
+  ctx.publish()
+  return { ok: true, value: { ...input, options } }
+}
+
+/** A live child's own answer, or the answer at rest; the goal, usage and rewind either way. */
+export async function readStructuredAgentSessionOptions(
+  context: Pick<
+    StructuredAgentSessionMutationContext,
+    'deps' | 'serialize' | 'openConversation' | 'conversation'
+  >,
+  sessionId: string
+): Promise<AgentSessionOptionsResult> {
+  const { adapter, store } = context.deps
+  const live = await context.serialize(sessionId, async () => {
+    const session = await context.openConversation(sessionId).catch((error: unknown) => {
+      throw journalOpenReadRefusal(error)
+    })
+    const child = session?.child
+    if (!child) {
+      return null
+    }
+    if (!adapter.readOptions) {
+      throw new Error('structured_agent_session_options_unsupported')
+    }
+    return adapter.readOptions({ sessionId, fence: child.fence })
+  })
+  const options = live ?? (await readStructuredAgentSessionOptionsAtRest(context.deps, sessionId))
+  // Re-acquired after the reads above: the handle they saw may have closed and reopened since.
+  const session = await context.conversation(sessionId)
+  const phase = store.getRecord(sessionId)?.rewind?.phase
+  const agent = session.params.provider
+  return {
+    ...options,
+    rewind:
+      phase === 'prepared' || phase === 'provider-succeeded'
+        ? { supported: false, reason: 'outcome-unknown' }
+        : (adapter.rewindSupport?.(sessionId, agent) ?? {
+            supported: false,
+            reason: 'unsupported'
+          }),
+    conversationCommands: adapter.compact ? ['clear', 'compact'] : ['clear'],
+    ...(adapter.supportsThreadGoal?.(sessionId, agent)
+      ? { threadGoal: { current: session.journal.threadGoal() } }
+      : {}),
+    ...(adapter.recordsContextUsage?.(sessionId, agent)
+      ? { contextUsage: { current: session.journal.contextUsage() } }
+      : {})
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-owed-work-release.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-owed-work-release.test.ts
index d2d5d746469b..9da47ae1f22d 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-owed-work-release.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-owed-work-release.test.ts
@@ -1,10 +1,12 @@
-// Switching away from a chat starts the release clock, and the clock must never stop a provider
-// child that still owes the user work.
+// The idle sweep must never stop a provider child that still owes the user work.
 //
 // A Claude chat is published before its CLI answers initialize, and a message sent in that window
-// is held until it does; evicting then refuses a message the user already sent. And a lead whose
-// turn has settled can leave subagents, commands and monitors running inside the child; evicting
-// then ends them silently.
+// is accepted and stays queued until it does; the delivery loop hands it over once startup lands.
+// The idle sweep ticks meanwhile. Inside the idle window it must leave that queued message and the
+// starting child alone, and every journal publish — the handover included — starts the window
+// again; only a chat quiet for the whole window loses its agent. And a lead whose turn has settled
+// can leave subagents, commands and monitors running inside the child; stopping it then ends them
+// silently.
 
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -29,8 +31,8 @@ import {
 } from './structured-agent-session-host-test-data'
 
 const CALLER = { callerKey: 'client-1' }
-const SURFACE = 'desktop-chat:1'
-const GRACE_MS = 5
+const SWEEP_MS = 5
+const IDLE_MS = 1_000
 
 let root: string
 let store: AgentSessionRecordStore
@@ -39,12 +41,14 @@ let adapter: ClaudeStructuredSessionAdapter
 let claude: ReturnType<typeof fakeClaude>
 let landInit: () => void
 let lifecycle: Promise<void>[]
+let clock: number
 
 beforeEach(async () => {
   root = await mkdtemp(join(tmpdir(), 'orca-owed-work-release-'))
   resetHostTestOperationIds()
   claude = fakeClaude()
   lifecycle = []
+  clock = NOW
   const initLanded = new Promise<void>((resolve) => {
     landInit = resolve
   })
@@ -65,7 +69,7 @@ beforeEach(async () => {
         lifecycle.push(host.handleAdapterEvent(mapped))
       }
     },
-    // As the runtime wires it: a held prompt's outcome reaches the journal out of band.
+    // As the runtime wires it: an admitted prompt's outcome reaches the journal out of band.
     onDispatchSettledLate: (settlement) => void host.settleLateDispatch(settlement),
     // Initialize answers only when the test says so.
     openConnection: async (launch, handlers) => {
@@ -87,8 +91,8 @@ beforeEach(async () => {
     journalRoot: root,
     claimKeyId: 'key-1',
     mintSpawnToken: () => 'spawn-a',
-    releaseGraceMs: GRACE_MS,
-    now: () => NOW
+    idleSweep: { intervalMs: SWEEP_MS, idleMs: IDLE_MS },
+    now: () => clock
   })
 })
 
@@ -111,7 +115,6 @@ async function attachStarting(): Promise<void> {
     })
   )
   expect(created).toMatchObject({ ok: true })
-  await host.hold(SESSION, SURFACE)
 }
 
 async function send(text: string, dispatchState = 'pending'): Promise<string> {
@@ -133,38 +136,48 @@ async function send(text: string, dispatchState = 'pending'): Promise<string> {
   return sent.ok ? sent.value.clientMessageId : ''
 }
 
-function dispatchState(clientMessageId: string): string | undefined {
-  return host
-    .journalSnapshot(SESSION)
-    .submissions.find((entry) => entry.clientMessageId === clientMessageId)?.dispatchState
+async function dispatchState(clientMessageId: string): Promise<string | undefined> {
+  return (await host.journalSnapshot(SESSION)).submissions.find(
+    (entry) => entry.clientMessageId === clientMessageId
+  )?.dispatchState
+}
+
+/** The delivery loop hands a message over on its own serialized steps after startup lands; this
+ *  yields to them without moving the host clock. */
+async function untilSent(connection: { sent: unknown[] }): Promise<void> {
+  for (let turn = 0; turn < 2000 && connection.sent.length === 0; turn += 1) {
+    await new Promise((resolve) => setImmediate(resolve))
+  }
 }
 
-/** Long enough for several grace windows to elapse, so "not evicted" means the clock declined. */
-function waitOutSeveralGraceWindows(): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, GRACE_MS * 20))
+/** Long enough for many sweep ticks, so "not stopped" means the sweep declined. */
+function waitOutSeveralSweeps(): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, SWEEP_MS * 20))
 }
 
-describe('a chat left while its Claude CLI is still starting', () => {
-  it('keeps the session for a message it is holding, and delivers it once startup lands', async () => {
+describe('a Claude chat whose CLI is still starting', () => {
+  it('keeps a message queued inside the idle window, and delivers it once startup lands', async () => {
     await attachStarting()
     const held = await send('sent while starting')
 
-    host.release(SESSION, SURFACE)
-    await waitOutSeveralGraceWindows()
+    clock += IDLE_MS - 1
+    await waitOutSeveralSweeps()
 
     expect(host.hasSession(SESSION)).toBe(true)
     expect(claude.connections[0].closeCount).toBe(0)
-    expect(dispatchState(held)).toBe('pending')
+    expect(await dispatchState(held)).toBe('pending')
 
     landInit()
-    await adapter.drainStartup(SESSION)
+    await adapter.awaitStarted(SESSION)
 
-    expect(claude.connections[0].sent).toEqual([expect.objectContaining({ type: 'user' })])
-    await vi.waitFor(() => expect(dispatchState(held)).toBe('accepted'))
+    await vi.waitFor(
+      () => expect(claude.connections[0].sent).toEqual([expect.objectContaining({ type: 'user' })]),
+      { timeout: 3000 }
+    )
+    await vi.waitFor(async () => expect(await dispatchState(held)).toBe('accepted'))
   })
 
-  it('gives the message it wrote at startup a full grace to open its turn', async () => {
-    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+  it('gives the message it hands over at startup a full idle window to open its turn', async () => {
     await attachStarting()
     const held = await send('sent while starting')
     const connection = claude.connections[0]
@@ -172,31 +185,34 @@ describe('a chat left while its Claude CLI is still starting', () => {
     connection.send = async (message) => {
       connection.sent.push(message)
     }
-    host.release(SESSION, SURFACE)
-    await vi.advanceTimersByTimeAsync(GRACE_MS * 3 - 1)
+    clock += IDLE_MS - 1
+    await waitOutSeveralSweeps()
     expect(host.hasSession(SESSION)).toBe(true)
 
-    // Startup lands just before the clock's next tick.
+    // Startup lands just before the window closes; the handover's publish starts it again.
     landInit()
-    await adapter.drainStartup(SESSION)
+    await adapter.awaitStarted(SESSION)
     await Promise.all(lifecycle)
+    await untilSent(connection)
     expect(connection.sent).toEqual([expect.objectContaining({ type: 'user' })])
-    await vi.advanceTimersByTimeAsync(GRACE_MS - 1)
+    clock += IDLE_MS - 1
+    await waitOutSeveralSweeps()
 
     expect(host.hasSession(SESSION)).toBe(true)
     expect(connection.closeCount).toBe(0)
     connection.handlers.onMessage?.(connection.sent[0])
     await host.flushStreamedEvents(SESSION)
-    await vi.advanceTimersByTimeAsync(GRACE_MS * 3)
+    await waitOutSeveralSweeps()
     expect(host.hasSession(SESSION)).toBe(true)
-    expect(dispatchState(held)).toBe('accepted')
+    expect(await dispatchState(held)).toBe('accepted')
   })
 
-  it('is released after the grace once its turn has finished', async () => {
+  it('stops the agent and closes the conversation once its turn has finished and it idled', async () => {
     await attachStarting()
     landInit()
-    await adapter.drainStartup(SESSION)
-    await send('answered', 'accepted')
+    await adapter.awaitStarted(SESSION)
+    const answered = await send('answered')
+    await vi.waitFor(async () => expect(await dispatchState(answered)).toBe('accepted'))
     claude.connections[0].handlers.onMessage?.({
       type: 'result',
       subtype: 'success',
@@ -206,25 +222,25 @@ describe('a chat left while its Claude CLI is still starting', () => {
       result: 'done'
     })
     await host.flushStreamedEvents(SESSION)
-    expect(host.journalSnapshot(SESSION).submissions).toHaveLength(1)
+    expect((await host.journalSnapshot(SESSION)).submissions).toHaveLength(1)
 
-    host.release(SESSION, SURFACE)
+    clock += IDLE_MS
 
     await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
     expect(claude.connections[0].closeCount).toBe(1)
   })
 
-  it('is released after the grace when it owes nothing', async () => {
+  it('stops a start that stayed quiet for the whole window when it owes nothing', async () => {
     await attachStarting()
 
-    host.release(SESSION, SURFACE)
+    clock += IDLE_MS
 
     await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
     expect(claude.connections[0].closeCount).toBe(1)
   })
 })
 
-describe('a chat left while its settled lead still has background work running', () => {
+describe('a chat whose settled lead still has background work running', () => {
   function frame(message: Record<string, unknown>): void {
     claude.connections[0].handlers.onMessage?.({ session_id: PROVIDER_SESSION_ID, ...message })
   }
@@ -232,8 +248,9 @@ describe('a chat left while its settled lead still has background work running',
   async function settleTurnLeavingTask(taskType: string): Promise<void> {
     await attachStarting()
     landInit()
-    await adapter.drainStartup(SESSION)
-    await send('fan out', 'accepted')
+    await adapter.awaitStarted(SESSION)
+    const fanOut = await send('fan out')
+    await vi.waitFor(async () => expect(await dispatchState(fanOut)).toBe('accepted'))
     frame({
       type: 'system',
       subtype: 'task_started',
@@ -253,11 +270,11 @@ describe('a chat left while its settled lead still has background work running',
     ['a subagent', 'local_agent'],
     ['a background command', 'local_bash'],
     ['a monitor', 'monitor']
-  ])('keeps the session while %s runs, then releases it once that settles', async (_, type) => {
+  ])('keeps the agent while %s runs, then stops it once that settles', async (_, type) => {
     await settleTurnLeavingTask(type)
 
-    host.release(SESSION, SURFACE)
-    await waitOutSeveralGraceWindows()
+    clock += IDLE_MS
+    await waitOutSeveralSweeps()
 
     expect(host.hasSession(SESSION)).toBe(true)
     expect(claude.connections[0].closeCount).toBe(0)
@@ -272,6 +289,7 @@ describe('a chat left while its settled lead still has background work running',
     // A finished background task can wake the lead; that turn is owed too until it settles.
     frame({ type: 'result', subtype: 'success', uuid: 'result-2', is_error: false, result: 'ok' })
     await host.flushStreamedEvents(SESSION)
+    clock += IDLE_MS
 
     await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
     expect(claude.connections[0].closeCount).toBe(1)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-pre-spawn-first-answer.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-pre-spawn-first-answer.test.ts
new file mode 100644
index 000000000000..89772d454690
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-pre-spawn-first-answer.test.ts
@@ -0,0 +1,185 @@
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import { mapRuntimeError } from '../../runtime/rpc/errors'
+import {
+  AgentSessionPreSpawnError,
+  type AgentSessionPreSpawnReason,
+  type StructuredAgentSessionAdapter
+} from './structured-agent-session-adapter'
+import {
+  attachFingerprintFields,
+  type AgentSessionAttachParams
+} from './structured-agent-session-attach'
+import { openTestAttachConversation } from './structured-agent-session-attach-test-conversation'
+import { performAttach } from './structured-agent-session-attach-flow'
+
+const NOW = 1_800_000_000_000
+const SESSION = 'session-alpha'
+const OPERATION = `${NOW}-${'1'.padStart(32, '0')}`
+let root: string | null = null
+
+afterEach(async () => {
+  vi.restoreAllMocks()
+  if (root) {
+    await rm(root, { recursive: true, force: true })
+  }
+  root = null
+})
+
+function createParams(): AgentSessionAttachParams {
+  const params: AgentSessionAttachParams = {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: OPERATION,
+      expectedRuntimeFence: null,
+      payloadFingerprint: ''
+    },
+    location: {
+      executionHostId: 'local',
+      wslDistro: null,
+      workspaceId: 'workspace-1',
+      workspaceKind: 'folder'
+    },
+    provider: 'claude',
+    agent: 'claude',
+    accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: '/home/dev/.claude' },
+    runtimeKind: 'native'
+  }
+  return {
+    ...params,
+    envelope: {
+      ...params.envelope,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.attach',
+        sessionId: SESSION,
+        fields: attachFingerprintFields(params)
+      })
+    }
+  }
+}
+
+/** The thrown first answer as the wire sends it, and the ledger's replay of the same operation. */
+async function firstAnswerAndReplay(thrown: AgentSessionPreSpawnError) {
+  root = await mkdtemp(join(tmpdir(), 'orca-pre-spawn-first-answer-'))
+  const store = await AgentSessionRecordStore.open({
+    directory: join(root, 'store'),
+    hostId: 'local'
+  })
+  const unused = async (): Promise<never> => {
+    throw new Error('not reached before a spawn')
+  }
+  const adapter: StructuredAgentSessionAdapter = {
+    acquire: async () => {
+      throw thrown
+    },
+    dispatch: unused,
+    cancelTurn: unused,
+    answerPrompt: unused,
+    setOption: unused
+  }
+  const input = {
+    store,
+    adapter,
+    journalRoot: root,
+    openConversation: openTestAttachConversation(root),
+    authority: {
+      spawnToken: 'spawn-a',
+      claimKeyId: 'key-1',
+      handoffOperationId: OPERATION,
+      probe: { outcome: 'reservation-unused' as const }
+    },
+    callerKey: 'client-1',
+    params: createParams(),
+    now: () => NOW,
+    onAttached: () => {}
+  }
+  const first = await performAttach(input).then(
+    () => null,
+    (error: unknown) => error
+  )
+  expect(first).toBeInstanceOf(AgentSessionPreSpawnError)
+  return {
+    first: mapRuntimeError('req-1', { runtimeId: 'runtime-1' }, first),
+    replay: await performAttach(input)
+  }
+}
+
+describe('a create that fails before any process spawns', () => {
+  it.each<[string, string, AgentSessionPreSpawnReason | undefined, string]>([
+    [
+      'the managed account env override',
+      'This Claude launch defines explicit Anthropic auth environment variables.',
+      'managedAccountEnvOverride',
+      'This Claude launch sets its own Anthropic sign-in variables. Remove them to use a managed Claude account.'
+    ],
+    [
+      'an account switch in progress',
+      'A Claude account switch is in progress. Try again after it finishes.',
+      'accountSwitchInProgress',
+      'A Claude account switch is in progress. Try again after it finishes.'
+    ],
+    [
+      'a Claude account added in WSL',
+      'structured Claude is not offered under the active managed Claude account',
+      'managedAccountUnsupported',
+      'While a Claude account is added in WSL, Claude chats need a Windows Claude account. Choose or add one in Claude Accounts settings, then send your message again.'
+    ],
+    [
+      "Orca's own reason",
+      'claude sessions pin CLAUDE_CONFIG_DIR, not CODEX_HOME',
+      undefined,
+      "Claude couldn't start. Send your message to try again."
+    ]
+  ])('answers %s first in the words its replay reads', async (_, raw, reason, sentence) => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+
+    const { first, replay } = await firstAnswerAndReplay(
+      new AgentSessionPreSpawnError(new Error(raw), reason ? { reason } : {})
+    )
+
+    // Thrown as before: the wire code is unchanged, only the words are the replay's.
+    expect(first).toMatchObject({ ok: false, error: { code: 'runtime_error', message: sentence } })
+    expect(replay).toMatchObject({
+      ok: false,
+      refusal: {
+        code: 'agent_session_operation_invalid',
+        message: sentence,
+        ...(reason ? { details: { reason } } : {})
+      }
+    })
+    if (!reason) {
+      expect(replay).not.toHaveProperty('refusal.details')
+    }
+    if (raw !== sentence) {
+      expect(JSON.stringify([first, replay])).not.toContain(raw)
+    }
+    // What failed is kept for the log.
+    expect(warn).toHaveBeenCalledWith(
+      '[agent-session] provider start failed:',
+      expect.objectContaining({ message: raw })
+    )
+  })
+
+  it('keeps a message that is itself a code, and the wire code it maps to', async () => {
+    const { first } = await firstAnswerAndReplay(
+      new AgentSessionPreSpawnError(new Error('runtime_unavailable'))
+    )
+
+    expect(first).toMatchObject({
+      ok: false,
+      error: { code: 'runtime_unavailable', message: 'runtime_unavailable' }
+    })
+  })
+
+  it('keeps the situation of a pre-spawn error it wraps', () => {
+    const typed = new AgentSessionPreSpawnError(new Error('switching'), {
+      reason: 'accountSwitchInProgress'
+    })
+
+    expect(new AgentSessionPreSpawnError(typed).reason).toBe('accountSwitchInProgress')
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-processless-reservation.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-processless-reservation.test.ts
index e0fa13b33622..348d5a3d90cb 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-processless-reservation.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-processless-reservation.test.ts
@@ -12,6 +12,7 @@ import {
   attachFingerprintFields,
   type AgentSessionAttachParams
 } from './structured-agent-session-attach'
+import { openTestAttachConversation } from './structured-agent-session-attach-test-conversation'
 import { performAttach } from './structured-agent-session-attach-flow'
 
 const NOW = 1_800_000_000_000
@@ -86,6 +87,7 @@ describe('processless structured session reservation', () => {
         store,
         adapter,
         journalRoot: root,
+        openConversation: openTestAttachConversation(root!),
         authority: {
           spawnToken: 'spawn-a',
           claimKeyId: 'key-1',
@@ -133,6 +135,7 @@ describe('processless structured session reservation', () => {
       store,
       adapter,
       journalRoot: root,
+      openConversation: openTestAttachConversation(root!),
       authority: {
         spawnToken: 'spawn-a',
         claimKeyId: 'key-1',
@@ -172,6 +175,7 @@ describe('processless structured session reservation', () => {
       store,
       adapter,
       journalRoot: root,
+      openConversation: openTestAttachConversation(root!),
       authority: {
         spawnToken: 'spawn-drift',
         claimKeyId: 'key-1',
@@ -224,6 +228,7 @@ describe('processless structured session reservation', () => {
         store,
         adapter,
         journalRoot: root,
+        openConversation: openTestAttachConversation(root!),
         authority: {
           spawnToken: 'spawn-a',
           claimKeyId: 'key-1',
@@ -235,7 +240,7 @@ describe('processless structured session reservation', () => {
         now: () => NOW,
         onAttached: () => {}
       })
-    ).rejects.toThrow('workspace no longer exists')
+    ).rejects.toThrow("Codex couldn't restart. Send your message to try again.")
     expect(settlement).toHaveBeenCalledExactlyOnceWith(
       expect.objectContaining({ exitProof: 'processless', spawnToken: 'spawn-a' })
     )
@@ -290,6 +295,7 @@ describe('processless structured session reservation', () => {
       store,
       adapter,
       journalRoot: root,
+      openConversation: openTestAttachConversation(root!),
       authority: {
         spawnToken: 'spawn-a',
         claimKeyId: 'key-1',
@@ -302,7 +308,9 @@ describe('processless structured session reservation', () => {
       onAttached: () => {}
     }
 
-    await expect(performAttach(input)).rejects.toThrow('launch not ready')
+    await expect(performAttach(input)).rejects.toThrow(
+      "Codex couldn't restart. Send your message to try again."
+    )
     await expect(performAttach(input)).resolves.toMatchObject({
       ok: false,
       refusal: { code: 'agent_session_operation_invalid' }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-state.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-state.ts
index 7f71a9c28ce4..7324e3be9ec5 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-state.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-state.ts
@@ -2,7 +2,7 @@ import type {
   AgentJournalItemBody,
   AgentJournalRenderItem
 } from '../../../shared/agent-session-journal-types'
-import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
+import { refuse, type AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
 import type { AgentSessionTurnContext } from './structured-agent-session-turns'
 
 type PendingPromptBody = Extract<AgentJournalItemBody, { kind: 'approval' | 'question' }>
@@ -11,8 +11,12 @@ export type PendingPromptValidation =
   | { ok: true; item: AgentJournalRenderItem; prompt: PendingPromptBody }
   | { ok: false; refusal: AgentSessionWireRefusal }
 
-function invalid(message: string): PendingPromptValidation {
-  return { ok: false, refusal: { code: 'agent_session_operation_invalid', message } }
+/** The prompt the client named is not one waiting on the user: nothing to answer. */
+function promptGone(message: string): PendingPromptValidation {
+  return {
+    ok: false,
+    refusal: refuse('agent_session_operation_invalid', { reason: 'promptGone' }, message)
+  }
 }
 
 export function validatePendingPrompt(
@@ -25,34 +29,36 @@ export function validatePendingPrompt(
 ): PendingPromptValidation {
   const item = ctx.journal.snapshot().items.find((entry) => entry.itemId === input.itemId)
   if (!item) {
-    return invalid(`No item ${input.itemId} in session ${ctx.sessionId}.`)
+    return promptGone(`No item ${input.itemId} in session ${ctx.sessionId}.`)
   }
   const prompt = item.body.kind === 'approval' || item.body.kind === 'question' ? item.body : null
   if (!prompt || (input.kind !== undefined && prompt.kind !== input.kind)) {
-    return invalid(
+    return promptGone(
       `Item ${input.itemId} is not a pending${input.kind ? ` ${input.kind}` : ' prompt'}.`
     )
   }
   if (item.revision !== input.expectedRevision) {
     return {
       ok: false,
-      refusal: {
-        code: 'agent_session_item_revision_stale',
-        message: `Item ${input.itemId} has moved on.`,
-        currentRevision: item.revision,
-        resolution: prompt.resolution
-      }
+      refusal: refuse(
+        'agent_session_item_revision_stale',
+        { reason: 'promptMoved', currentRevision: item.revision, resolution: prompt.resolution },
+        `Item ${input.itemId} has moved on.`
+      )
     }
   }
   if (prompt.resolution.state !== 'pending') {
     return {
       ok: false,
-      refusal: {
-        code: 'agent_session_already_resolved',
-        message: `Item ${input.itemId} was already ${prompt.resolution.state}.`,
-        currentRevision: item.revision,
-        resolution: prompt.resolution
-      }
+      refusal: refuse(
+        'agent_session_already_resolved',
+        {
+          reason: 'promptAlreadyResolved',
+          currentRevision: item.revision,
+          resolution: prompt.resolution
+        },
+        `Item ${input.itemId} was already ${prompt.resolution.state}.`
+      )
     }
   }
   return { ok: true, item, prompt }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-child-record.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-child-record.test.ts
new file mode 100644
index 000000000000..fb66a1e1a8fd
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-child-record.test.ts
@@ -0,0 +1,742 @@
+// The provider child is its own record on the conversation: stopping it, losing it or failing to
+// start it ends the child, never the conversation. Against the real host, store and journal, with a
+// live subscriber opened before each action.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types'
+import type {
+  AgentSessionStatusSummary,
+  AgentSessionSubscribeEvent
+} from '../../../shared/agent-session-wire'
+import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/structured-agent-session-dispatch-rejection'
+import {
+  agentSessionFailureFact,
+  type AgentSessionFailureFact,
+  type SubmissionRejectionFact
+} from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
+import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record'
+import { openAgentSessionJournal } from '../agent-session-journal/journal-store-factory'
+import { journalDirectoryFor } from '../agent-session-journal/journal-paths'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import { ensureStructuredAgentSessionAgent } from './structured-agent-session-agent-start'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import { stopStructuredAgentSessionAgentUnderSerialize } from './structured-agent-session-host-lifetime'
+import {
+  HOST_TEST_LOCATION,
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
+  hostTestMessage,
+  hostTestOperationId,
+  resetHostTestOperationIds
+} from './structured-agent-session-host-test-data'
+
+const CALLER = { callerKey: 'client-1' }
+
+let root: string
+let store: AgentSessionRecordStore
+let host: StructuredAgentSessionHost
+let acquire: Mock<StructuredAgentSessionAdapter['acquire']>
+let dispatch: Mock<StructuredAgentSessionAdapter['dispatch']>
+let adapterExtras: Partial<StructuredAgentSessionAdapter>
+
+function eventually(assertion: () => void | Promise<void>): Promise<void> {
+  return vi.waitFor(assertion, { timeout: 10_000 })
+}
+
+function generation(): string {
+  return `generation-${acquire.mock.calls.length}`
+}
+
+const spawnChild: StructuredAgentSessionAdapter['acquire'] = async ({ fence, spawnToken }) => ({
+  process: { hostId: 'local', pid: 4242, processStartTimeMs: 1_700_000_000_000, spawnToken },
+  acquisitionGeneration: generation(),
+  link: {
+    linkId: `link-${fence}`,
+    handle: { provider: 'codex' as const, threadId: THREAD },
+    origin: store.getRecord(SESSION)?.providerHandleChain.length
+      ? ('resumed' as const)
+      : ('created' as const),
+    mintedAtFence: fence,
+    observedAt: NOW
+  }
+})
+
+/** A Claude-shaped child: published at spawn, so it is `starting` until `started`. */
+const spawnStartingChild: StructuredAgentSessionAdapter['acquire'] = async (input) => ({
+  ...(await spawnChild(input)),
+  providerChildPhase: 'starting' as const
+})
+
+function startHost(): void {
+  host = new StructuredAgentSessionHost({
+    store,
+    adapter: {
+      acquire,
+      dispatch,
+      closeSession: vi.fn(async () => true),
+      releaseAcquisition: vi.fn(async () => true),
+      cancelTurn: vi.fn(async () => ({ cancelled: false })),
+      answerPrompt: vi.fn(async () => undefined),
+      setOption: vi.fn(async () => undefined),
+      ...adapterExtras
+    },
+    journalRoot: root,
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => `spawn-${acquire.mock.calls.length}`,
+    now: () => NOW
+  })
+}
+
+async function restartHost(): Promise<void> {
+  await host.flushAllStreamedEvents()
+  startHost()
+}
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-child-record-'))
+  resetHostTestOperationIds()
+  adapterExtras = {}
+  acquire = vi.fn(spawnChild)
+  dispatch = vi.fn(async (input) => ({
+    state: 'accepted' as const,
+    providerIdentity: {
+      provider: 'codex' as const,
+      threadId: THREAD,
+      turnId: `turn-${input.clientMessageId}`,
+      ordinal: dispatch.mock.calls.length
+    }
+  }))
+  store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
+  startHost()
+  expect(await host.attach(CALLER, hostTestAttachParams(null))).toMatchObject({ ok: true })
+  await host.close(SESSION)
+})
+
+afterEach(async () => {
+  await host.flushAllStreamedEvents()
+  await rm(root, { recursive: true, force: true })
+})
+
+function sendParams(text: string) {
+  const body = hostTestMessage(text)
+  return {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: 1,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.send',
+        sessionId: SESSION,
+        fields: { body }
+      })
+    },
+    body
+  }
+}
+
+async function accept(text: string): Promise<string> {
+  const params = sendParams(text)
+  const sent = await host.send(CALLER, params)
+  expect(sent).toMatchObject({ ok: true, value: { submission: { dispatchState: 'pending' } } })
+  return params.envelope.clientOperationId
+}
+
+function stop() {
+  const turnId = 'turn-none'
+  return host.cancel(CALLER, {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: null,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.cancel',
+        sessionId: SESSION,
+        fields: { turnId }
+      })
+    },
+    turnId
+  })
+}
+
+async function submission(id: string): Promise<AgentJournalSubmission | undefined> {
+  return (await host.journalSnapshot(SESSION)).submissions.find(
+    (entry) => entry.clientMessageId === id
+  )
+}
+
+async function statusRows(): Promise<
+  {
+    itemId: string
+    text: string
+    tone?: string
+    failure?: AgentSessionFailureFact
+  }[]
+> {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.body.kind === 'status'
+      ? [
+          {
+            itemId: item.itemId,
+            text: item.body.text,
+            ...(item.body.tone ? { tone: item.body.tone } : {}),
+            ...(item.body.failure ? { failure: item.body.failure } : {})
+          }
+        ]
+      : []
+  )
+}
+
+/** The child the conversation has now, as its lifecycle events name it. */
+function currentChild() {
+  const child = conversation()?.child
+  if (!child?.generation) {
+    throw new Error('no child indexed')
+  }
+  return { sessionId: SESSION, fence: child.fence, acquisitionGeneration: child.generation }
+}
+
+function exit(child: ReturnType<typeof currentChild>, reason: string, startupUnproven?: true) {
+  return host.handleAdapterEvent({
+    type: 'ended',
+    ...child,
+    reason,
+    // As an adapter reports it: the exit's stderr as a log detail.
+    failure: { kind: 'providerExited', detail: { text: reason, audience: 'log' } },
+    cause: 'unexpected-exit',
+    ...(startupUnproven ? { startupUnproven } : {})
+  })
+}
+
+function rejectedIn(events: AgentSessionSubscribeEvent[], id: string): boolean {
+  return events.some(
+    (event) =>
+      event.type === 'batch' &&
+      event.batch.submissions.some(
+        (entry) => entry.clientMessageId === id && entry.dispatchState === 'rejected'
+      )
+  )
+}
+
+function conversation() {
+  return host['sessions'].get(SESSION)
+}
+
+async function subscribe(): Promise<AgentSessionSubscribeEvent[]> {
+  const events: AgentSessionSubscribeEvent[] = []
+  await host.subscribe({
+    id: 'sub-1',
+    sessionId: SESSION,
+    emit: (event) => events.push(structuredClone(event))
+  })
+  return events
+}
+
+/** The chat's status row as a session list sees it, frame by frame. */
+function watchStatus(): AgentSessionStatusSummary[] {
+  const frames: AgentSessionStatusSummary[] = []
+  host.subscribeStatus({
+    id: 'list-1',
+    emit: (event) => {
+      if (event.type === 'status' && event.session.sessionId === SESSION) {
+        frames.push(event.session)
+      }
+    }
+  })
+  return frames
+}
+
+function deferred<T>() {
+  let resolve!: (value: T) => void
+  const promise = new Promise<T>((next) => {
+    resolve = next
+  })
+  return { promise, resolve }
+}
+
+describe('Stop on a child still proving its start', () => {
+  it('ends the child and keeps the conversation and its readers (R1)', async () => {
+    const ended = deferred<void>()
+    adapterExtras = {
+      awaitStarted: vi.fn(() => ended.promise),
+      closeSession: vi.fn(async () => {
+        ended.resolve()
+        return true
+      })
+    }
+    await restartHost()
+    acquire.mockImplementationOnce(spawnStartingChild)
+    const first = await accept('hello')
+    const journal = conversation()?.journal
+    const events = await subscribe()
+    const frames = watchStatus()
+    await eventually(() => expect(conversation()?.child?.phase).toBe('starting'))
+
+    expect(await stop()).toMatchObject({ ok: true, value: { cancelled: true } })
+
+    // The same conversation: no reopen, and the chat told it is idle again.
+    expect(conversation()?.journal).toBe(journal)
+    expect(conversation()?.child).toBeNull()
+    expect(conversation()?.lastEndedChild).toMatchObject({ cause: 'user-stop', rootGone: true })
+    expect(frames.at(-1)).not.toHaveProperty('hostExecutionPhase')
+    expect(frames.at(-1)).not.toHaveProperty('hostExecutionOwned')
+    expect(await submission(first)).toMatchObject({
+      dispatchState: 'rejected',
+      reason: DISPATCH_REJECTED_CANCELLED
+    })
+    // A Stop is not a failure: no row, and the loop is gone.
+    expect(await statusRows()).toEqual([])
+    await eventually(() => expect(host['conversationDelivery'].loop.isRunning(SESSION)).toBe(false))
+
+    const next = await accept('after stop')
+    await eventually(async () => expect((await submission(next))?.dispatchState).toBe('accepted'))
+    expect(conversation()?.journal).toBe(journal)
+    expect(dispatch.mock.calls.map(([input]) => input.clientMessageId)).toEqual([next])
+    // The reader opened before the Stop saw the next message delivered on the same stream.
+    expect(
+      events.some(
+        (event) =>
+          event.type === 'batch' &&
+          event.batch.submissions.some(
+            (entry) => entry.clientMessageId === next && entry.dispatchState === 'accepted'
+          )
+      )
+    ).toBe(true)
+  })
+})
+
+describe('settling an earlier child before the next one takes its message', () => {
+  it("settles the earlier child's turn from its death evidence and leaves the queued message to the new child (R1)", async () => {
+    // The earlier child exited mid-turn; the released lease keeps only its death evidence.
+    await store.transitionHandoff(SESSION, (record) => ({
+      ...record,
+      lease: {
+        ...record.lease,
+        deathEvidence: { kind: 'exit-observed', detail: 'provider exited', observedAt: NOW - 1_000 }
+      }
+    }))
+    const releasedFence = store.getRecord(SESSION)!.lease.runtimeFence
+    const journal = await openAgentSessionJournal({
+      identity: {
+        sessionId: SESSION,
+        workspaceId: HOST_TEST_LOCATION.workspaceId,
+        hostId: HOST_TEST_LOCATION.executionHostId,
+        agent: 'codex',
+        providerHandle: { kind: 'codex', threadId: THREAD }
+      },
+      journalDir: journalDirectoryFor(root, {
+        workspaceId: HOST_TEST_LOCATION.workspaceId,
+        sessionId: SESSION
+      })
+    })
+    await journal.appendItem(
+      { provider: 'codex', threadId: THREAD, turnId: 'earlier-turn', ordinal: 0 },
+      { kind: 'turn', turnId: 'earlier-turn', state: 'running', startedAt: NOW - 5_000 },
+      { fence: releasedFence }
+    )
+    await journal.close()
+    const id = await accept('for the next child')
+
+    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('accepted'))
+    // The exit was observed, so its receipt ends the turn, and the chat says why it stopped.
+    const items = conversation()!.journal.snapshot().items
+    expect(items.map((item) => readAgentJournalTurn(item.body)).filter(Boolean)).toContainEqual(
+      expect.objectContaining({
+        turnId: 'earlier-turn',
+        state: 'interrupted',
+        completedAt: NOW - 1_000
+      })
+    )
+    expect(
+      items.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : []))
+    ).toContain(
+      'Codex stopped while this response was in progress. You can continue in this conversation.'
+    )
+    // Handed over at the new child's fence, which the attach reserved after settling.
+    const newFence = store.getRecord(SESSION)!.lease.runtimeFence
+    expect(newFence).toBeGreaterThan(releasedFence)
+    expect((await submission(id))?.fence).toBe(newFence)
+    expect(conversation()?.child).toMatchObject({ generation: generation(), fence: newFence })
+  })
+})
+
+const START_EXIT = 'claude stream-json exited (code 1)'
+const START_TEXT = 'Codex stopped before it finished starting. Send your message to try again.'
+const START_FAILURE: SubmissionRejectionFact = {
+  kind: 'providerStartFailed',
+  detail: { text: START_EXIT, audience: 'log' }
+}
+
+describe('a published child that dies while it proves its start', () => {
+  const EXIT = START_EXIT
+  const TEXT = START_TEXT
+
+  it.each([['the loop sees the start fail first'], ['the exit is processed first']])(
+    'leaves one error row keyed by the start, and every queued message rejected with it: %s (R2)',
+    async (order) => {
+      const settled = deferred<SubmissionRejectionFact>()
+      adapterExtras = { awaitStarted: vi.fn(() => settled.promise) }
+      await restartHost()
+      acquire.mockImplementation(spawnStartingChild)
+      const first = await accept('first')
+      const events = await subscribe()
+      const second = await accept('second')
+      await eventually(() => expect(adapterExtras.awaitStarted).toHaveBeenCalled())
+      const child = currentChild()
+
+      if (order === 'the exit is processed first') {
+        await exit(child, EXIT, true)
+        settled.resolve(START_FAILURE)
+      } else {
+        settled.resolve(START_FAILURE)
+        await eventually(async () =>
+          expect((await submission(second))?.dispatchState).toBe('rejected')
+        )
+        await exit(child, EXIT, true)
+      }
+
+      await eventually(async () =>
+        expect((await submission(second))?.dispatchState).toBe('rejected')
+      )
+      expect(await statusRows()).toEqual([
+        {
+          itemId: `orca:${encodeURIComponent(`start-failure:${child.acquisitionGeneration}`)}`,
+          text: TEXT,
+          tone: 'error',
+          failure: START_FAILURE
+        }
+      ])
+      for (const id of [first, second]) {
+        expect(await submission(id)).toMatchObject({
+          dispatchState: 'rejected',
+          reason: TEXT,
+          rejection: START_FAILURE
+        })
+      }
+      expect(rejectedIn(events, second)).toBe(true)
+      expect(dispatch).not.toHaveBeenCalled()
+      expect(acquire).toHaveBeenCalledTimes(2)
+    }
+  )
+})
+
+/** A start by an operation that needs the agent, such as a goal change, outside the loop. */
+function startForOperation() {
+  return host['serialize'](SESSION, () =>
+    ensureStructuredAgentSessionAgent(host['attachContext'](), SESSION)
+  )
+}
+
+describe('a start another operation made that dies while a sent message waits on it', () => {
+  const EXIT = START_EXIT
+  const TEXT = START_TEXT
+
+  it("is the message's own failed start: one error row, the message rejected, no second start (R2)", async () => {
+    adapterExtras = { awaitStarted: vi.fn(async () => START_FAILURE) }
+    await restartHost()
+    acquire.mockImplementation(spawnStartingChild)
+    // An operation that needs the agent starts a child that has not proven its start.
+    await startForOperation()
+    const operationChild = currentChild()
+    const events = await subscribe()
+    const params = sendParams('hello')
+
+    // Accepted first; that child's exit is settled before the loop's first step.
+    const sent = host.send(CALLER, params)
+    const exited = exit(operationChild, EXIT, true)
+    expect(await sent).toMatchObject({
+      ok: true,
+      value: { submission: { dispatchState: 'pending' } }
+    })
+    await exited
+    const id = params.envelope.clientOperationId
+
+    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('rejected'))
+    await settleLoop()
+    expect((await submission(id))?.reason).toBe(TEXT)
+    expect(await statusRows()).toEqual([
+      {
+        itemId: `orca:${encodeURIComponent(`start-failure:${operationChild.acquisitionGeneration}`)}`,
+        text: TEXT,
+        tone: 'error',
+        failure: START_FAILURE
+      }
+    ])
+    expect(rejectedIn(events, id)).toBe(true)
+    // The setup's child and the operation's: nothing started again into the same failure.
+    expect(acquire).toHaveBeenCalledTimes(2)
+    expect(dispatch).not.toHaveBeenCalled()
+  })
+
+  it('leaves a message sent after that start failed to a fresh start (R2)', async () => {
+    await restartHost()
+    acquire.mockImplementationOnce(spawnStartingChild)
+    await startForOperation()
+    await exit(currentChild(), EXIT, true)
+    expect(await statusRows()).toHaveLength(1)
+
+    const id = await accept('after the failure')
+
+    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('accepted'))
+    expect(acquire).toHaveBeenCalledTimes(3)
+  })
+
+  it('starts again for a message whose proven child crashed: only a failed start settles it (R2)', async () => {
+    await restartHost()
+    await startForOperation()
+    const params = sendParams('hello')
+
+    const sent = host.send(CALLER, params)
+    const exited = exit(currentChild(), 'codex app-server crashed')
+    await sent
+    await exited
+    const id = params.envelope.clientOperationId
+
+    await eventually(async () => expect((await submission(id))?.dispatchState).not.toBe('pending'))
+    expect((await submission(id))?.dispatchState).toBe('accepted')
+    expect(acquire).toHaveBeenCalledTimes(3)
+  })
+
+  it('waits on a child started since the failed one, not on the failure (R2)', async () => {
+    adapterExtras = { awaitStarted: vi.fn(async () => undefined) }
+    await restartHost()
+    acquire.mockImplementation(spawnStartingChild)
+    await startForOperation()
+    const params = sendParams('hello')
+
+    // A second operation's start lands after the first child's exit, before the loop's first step.
+    const sent = host.send(CALLER, params)
+    const exited = exit(currentChild(), EXIT, true)
+    const held = startForOperation()
+    await sent
+    await exited
+    await held
+    const id = params.envelope.clientOperationId
+
+    await eventually(async () => expect((await submission(id))?.dispatchState).not.toBe('pending'))
+    expect((await submission(id))?.dispatchState).toBe('accepted')
+    expect(acquire).toHaveBeenCalledTimes(3)
+  })
+})
+
+describe('a child that ends before its message is handed over', () => {
+  it('starts one child for the message, then rejects it and stops (R2)', async () => {
+    // The child the loop starts exits between its start step and its handover step.
+    adapterExtras = {
+      awaitStarted: vi.fn(async () => {
+        await exit(currentChild(), 'codex app-server crashed')
+      })
+    }
+    await restartHost()
+    const id = await accept('hello')
+    const events = await subscribe()
+
+    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('rejected'))
+    // The exit's stderr rides beside the sentence, never in it.
+    const failure = {
+      kind: 'providerExited',
+      detail: { text: 'codex app-server crashed', audience: 'log' }
+    }
+    expect(await submission(id)).toMatchObject({
+      reason: 'Codex stopped before this message was sent.',
+      rejection: failure
+    })
+    expect(await statusRows()).toEqual([
+      { itemId: expect.any(String), text: (await submission(id))?.reason, tone: 'error', failure }
+    ])
+    expect(rejectedIn(events, id)).toBe(true)
+    await eventually(() => expect(host['conversationDelivery'].loop.isRunning(SESSION)).toBe(false))
+    expect(acquire).toHaveBeenCalledTimes(2)
+    expect(dispatch).not.toHaveBeenCalled()
+  })
+})
+
+describe('another child indexed while the loop waits on the one it started', () => {
+  it('hands nothing over until the child now there has proven its start (R2)', async () => {
+    const starts = new Map<string, ReturnType<typeof deferred<void>>>()
+    const startOf = (generation: string) => {
+      const start = starts.get(generation) ?? deferred<void>()
+      starts.set(generation, start)
+      return start
+    }
+    adapterExtras = {
+      awaitStarted: vi.fn(() => startOf(currentChild().acquisitionGeneration).promise),
+      // The stop ends the child without settling the start the loop is waiting on.
+      closeSession: vi.fn(async () => true)
+    }
+    await restartHost()
+    acquire.mockImplementation(spawnStartingChild)
+    const first = await accept('first')
+    await eventually(() => expect(adapterExtras.awaitStarted).toHaveBeenCalledTimes(1))
+    const stopped = currentChild()
+    expect(await stop()).toMatchObject({ ok: true })
+    const second = await accept('second')
+    // An operation that needs the agent starts its own child before the loop's handover step runs.
+    await host['serialize'](SESSION, () =>
+      ensureStructuredAgentSessionAgent(host['attachContext'](), SESSION)
+    )
+    const replacement = currentChild()
+    expect(replacement.acquisitionGeneration).not.toBe(stopped.acquisitionGeneration)
+
+    startOf(stopped.acquisitionGeneration).resolve()
+    await eventually(() => expect(adapterExtras.awaitStarted).toHaveBeenCalledTimes(2))
+    expect(dispatch).not.toHaveBeenCalled()
+
+    await host.handleAdapterEvent({
+      type: 'started',
+      ...replacement,
+      reportedOptions: { model: 'sonnet' },
+      restoreSkippedOptions: []
+    })
+    startOf(replacement.acquisitionGeneration).resolve()
+
+    await eventually(async () => expect((await submission(second))?.dispatchState).toBe('accepted'))
+    expect(dispatch.mock.calls.map(([input]) => input.clientMessageId)).toEqual([second])
+    expect(await submission(first)).toMatchObject({ reason: DISPATCH_REJECTED_CANCELLED })
+  })
+})
+
+describe('a quit with a message still queued', () => {
+  /** Read by the next launch, through the same open any reader takes. */
+  async function afterRelaunch(id: string): Promise<AgentJournalSubmission | undefined> {
+    startHost()
+    await host.revealSession(SESSION)
+    return await submission(id)
+  }
+
+  it('settles a message no child ever had the way a chat close does (R2)', async () => {
+    // Quit has begun — its first step stops the delivery loops — when this message is accepted.
+    host['conversationDelivery'].loop.dispose()
+    const id = await accept('hello')
+    expect(conversation()?.child).toBeNull()
+    await host.flushAllStreamedEvents()
+
+    expect(await afterRelaunch(id)).toMatchObject({
+      dispatchState: 'rejected',
+      ...agentSessionFailureWords(agentSessionFailureFact('chatClosed'), { surface: 'rejection' })
+    })
+  })
+
+  it('waits for the start already in flight and stops the child it produced (R2)', async () => {
+    const starting = deferred<void>()
+    const closeSession = vi.fn(async () => true)
+    adapterExtras = { closeSession }
+    await restartHost()
+    // The loop's start step is under way, but has not reached its attach yet.
+    const resolveRecovery = host['runtimeState'].resolveRecovery.bind(host['runtimeState'])
+    const recovering = vi.spyOn(host['runtimeState'], 'resolveRecovery')
+    recovering.mockImplementationOnce(async (sessionId) => {
+      await starting.promise
+      return resolveRecovery(sessionId)
+    })
+    const id = await accept('hello')
+    await eventually(() => expect(recovering).toHaveBeenCalled())
+
+    const quit = host.flushAllStreamedEvents()
+    starting.resolve()
+    await quit
+
+    expect(closeSession).toHaveBeenCalledWith(SESSION)
+    expect(store.getRecord(SESSION)?.lease).toMatchObject({ claimStatus: 'released' })
+    expect(dispatch).not.toHaveBeenCalled()
+    expect(await afterRelaunch(id)).toMatchObject({
+      dispatchState: 'rejected',
+      ...agentSessionFailureWords(agentSessionFailureFact('chatClosed'), { surface: 'rejection' })
+    })
+  })
+})
+
+describe('a send whose start failed, sent again with the same operation id', () => {
+  it('replays the recorded rejection and starts no second agent (R2)', async () => {
+    acquire.mockRejectedValueOnce(new Error('spawn claude ENOENT'))
+    const fenceBefore = store.getRecord(SESSION)!.lease.runtimeFence
+    const params = sendParams('hello')
+    // A failed start is a rejected message, never a refused send.
+    expect(await host.send(CALLER, params)).toMatchObject({
+      ok: true,
+      value: { submission: { dispatchState: 'pending' } }
+    })
+    const id = params.envelope.clientOperationId
+    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('rejected'))
+    // The start moved the fence while the message was out.
+    expect(store.getRecord(SESSION)!.lease.runtimeFence).toBeGreaterThan(fenceBefore)
+    const starts = acquire.mock.calls.length
+
+    const replay = await host.send(CALLER, params)
+
+    expect(replay).toMatchObject({
+      ok: true,
+      replayed: true,
+      value: { submission: { clientMessageId: id, dispatchState: 'rejected' } }
+    })
+    await settleLoop()
+    expect(acquire).toHaveBeenCalledTimes(starts)
+    expect(dispatch).not.toHaveBeenCalled()
+  })
+})
+
+async function settleLoop(): Promise<void> {
+  await eventually(() => expect(host['conversationDelivery'].loop.isRunning(SESSION)).toBe(false))
+}
+
+describe('how a stopped child ends the start its loop was waiting on', () => {
+  /** A child the loop waits on, whose start the stop below does not settle, so a message sent
+   *  after the stop is queued when the loop next looks. */
+  async function stoppedWhileStarting(stop: () => Promise<void>) {
+    const start = deferred<void>()
+    adapterExtras = {
+      awaitStarted: vi.fn(() => start.promise),
+      closeSession: vi.fn(async () => true)
+    }
+    await restartHost()
+    acquire.mockImplementationOnce(spawnStartingChild)
+    await accept('first')
+    await eventually(() => expect(adapterExtras.awaitStarted).toHaveBeenCalledTimes(1))
+    await stop()
+    const second = await accept('second')
+    adapterExtras.awaitStarted = undefined
+    start.resolve()
+    return second
+  }
+
+  it("goes on after a user's Stop and delivers what was sent since (R2)", async () => {
+    const second = await stoppedWhileStarting(async () => {
+      expect(await stop()).toMatchObject({ ok: true })
+    })
+
+    await eventually(async () => expect((await submission(second))?.dispatchState).toBe('accepted'))
+    expect(conversation()?.lastEndedChild).toMatchObject({ cause: 'user-stop', reason: null })
+    expect(await statusRows()).toEqual([])
+  })
+
+  it("fails the start after a host stop, as a start Orca stopped rather than the provider's (R2)", async () => {
+    const reason = 'the start watchdog fired'
+    const second = await stoppedWhileStarting(() =>
+      host['serialize'](SESSION, () =>
+        stopStructuredAgentSessionAgentUnderSerialize(host['lifetimeContext'](), SESSION, {
+          cause: 'host-stop',
+          reason
+        })
+      )
+    )
+
+    await eventually(async () => expect((await submission(second))?.dispatchState).toBe('rejected'))
+    // The sentence is the constructor's, not the reason the stop was given.
+    const text = 'Codex never finished starting, so Orca stopped it.'
+    expect(await submission(second)).toMatchObject({
+      reason: text,
+      rejection: { kind: 'hostStopped' }
+    })
+    expect(await statusRows()).toEqual([
+      { itemId: expect.any(String), text, tone: 'error', failure: { kind: 'hostStopped' } }
+    ])
+    expect(dispatch).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-child.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-child.ts
new file mode 100644
index 000000000000..da5e491e1d18
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-child.ts
@@ -0,0 +1,83 @@
+// The provider child behind a conversation, kept as its own record on the conversation's entry.
+//
+// The entry is the conversation and outlives any number of children. A child enters only when an
+// attach has fully succeeded, and leaves only through `endProviderChild`, which every ending shares:
+// an exit, a failed re-attach, a Stop and an eviction. Each is matched on the child's generation
+// and fence, so an ending that arrives late for an older child cannot end a newer one.
+
+import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import type {
+  StructuredAgentSessionEndedChild,
+  StructuredAgentSessionHostSession,
+  StructuredAgentSessionProviderChild,
+  StructuredAgentSessionProviderChildIdentity
+} from './structured-agent-session-host-types'
+
+type ChildBearer = Pick<StructuredAgentSessionHostSession, 'child' | 'lastEndedChild'> & {
+  journal: Pick<AgentSessionJournal, 'cursor'>
+}
+
+/** The fence a conversation write carries: the record's, which is where the next child starts. A
+ *  child's own writes carry `child.fence`, which equals it while that child holds the lease. */
+export function structuredAgentSessionConversationFence(
+  store: Pick<AgentSessionRecordStore, 'getRecord'>,
+  sessionId: string
+): number {
+  return store.getRecord(sessionId)?.lease.runtimeFence ?? 0
+}
+
+/** For the end of a successful attach only: a failed one never wrote a child to take back. */
+export function indexProviderChild(
+  session: ChildBearer,
+  child: StructuredAgentSessionProviderChild
+): void {
+  session.child = child
+}
+
+export function markProviderChildStarted(
+  session: ChildBearer,
+  identity: StructuredAgentSessionProviderChildIdentity
+): boolean {
+  const child = matchingChild(session, identity)
+  if (child) {
+    child.phase = 'ready'
+  }
+  return child !== null
+}
+
+export function endProviderChild(
+  session: ChildBearer,
+  ended: Omit<StructuredAgentSessionEndedChild, 'endedAt' | 'startedFor'>
+): boolean {
+  const child = matchingChild(session, ended)
+  if (!child) {
+    return false
+  }
+  session.child = null
+  session.lastEndedChild = {
+    ...ended,
+    ...(child.startedFor === undefined ? {} : { startedFor: child.startedFor }),
+    endedAt: session.journal.cursor()
+  }
+  return true
+}
+
+/** The conversation's last start died before it proved itself, and nothing started since. Only a
+ *  send retries it: a view or an exit recovery would respawn into the same failure, adding a row. */
+export function failedProviderChildStart(
+  session: Pick<ChildBearer, 'child' | 'lastEndedChild'>
+): StructuredAgentSessionEndedChild | null {
+  const ended = session.lastEndedChild
+  return !session.child && ended?.duringStartup && ended.cause !== 'user-stop' ? ended : null
+}
+
+function matchingChild(
+  session: ChildBearer,
+  identity: StructuredAgentSessionProviderChildIdentity
+): StructuredAgentSessionProviderChild | null {
+  const { child } = session
+  return child && child.generation === identity.generation && child.fence === identity.fence
+    ? child
+    : null
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-restore.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-restore.test.ts
index c8a2e4bba14f..5da0861aa197 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-restore.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-restore.test.ts
@@ -5,12 +5,15 @@ import { afterEach, describe, expect, it } from 'vitest'
 import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import { abandonStructuredAgentSessionHost } from './structured-agent-session-host-test-abandon'
 import {
   HOST_TEST_NOW,
   HOST_TEST_SESSION,
   hostTestAttachParams,
   resetHostTestOperationIds
 } from './structured-agent-session-host-test-data'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
 
 const CLAUDE_SESSION = 'claude-session'
 const hosts: StructuredAgentSessionHost[] = []
@@ -34,7 +37,12 @@ function claudeAdapter(): StructuredAgentSessionAdapter {
         observedAt: HOST_TEST_NOW
       }
     }),
-    dispatch: async () => ({ state: 'rejected', reason: 'unused' }),
+    dispatch: async () => ({
+      state: 'rejected',
+      ...agentSessionFailureWords(agentSessionFailureFact('providerRejected'), {
+        surface: 'rejection'
+      })
+    }),
     cancelTurn: async () => ({ cancelled: false }),
     answerPrompt: async () => undefined,
     setOption: async () => undefined
@@ -58,15 +66,8 @@ function createHost(
   return host
 }
 
-async function abandonHost(host: StructuredAgentSessionHost): Promise<void> {
-  host['runtimeState'].stopLeaseRenewal()
-  host['holds'].dispose()
-  await Promise.all([...host['sessions'].values()].map((session) => session.journal.close()))
-  host['sessions'].clear()
-}
-
 afterEach(async () => {
-  await Promise.all(hosts.splice(0).map(abandonHost))
+  await Promise.all(hosts.splice(0).map(abandonStructuredAgentSessionHost))
   await rm(root, { recursive: true, force: true })
   root = ''
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-started.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-started.test.ts
index 52699fd062f6..b18369838698 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-started.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-started.test.ts
@@ -37,7 +37,17 @@ beforeEach(async () => {
   resetHostTestOperationIds()
   lifecycle = []
   statuses = []
-  const claude = fakeClaude({ initDelayMs: INIT_DELAY_MS, initModel: 'claude-opus-9' })
+  // A CLI whose own default is not the catalog's: startup reports it through get_settings,
+  // since system/init arrives only with the first command.
+  const claude = fakeClaude({
+    initDelayMs: INIT_DELAY_MS,
+    initModel: 'claude-opus-9',
+    settings: {
+      applied: { model: 'claude-opus-9', effort: 'high', advisor: null, ultracode: false },
+      effective: { model: 'claude-opus-9', effortLevel: 'high', env: {} },
+      sources: {}
+    }
+  })
   adapter = new ClaudeStructuredSessionAdapter({
     resolveLaunch: async () => ({
       pathToClaudeCodeExecutable: 'claude',
@@ -80,8 +90,8 @@ afterEach(async () => {
   await rm(root, { recursive: true, force: true })
 })
 
-function claudeParams() {
-  return hostTestAttachParams(null, {
+function claudeParams(expectedRuntimeFence: number | null = null) {
+  return hostTestAttachParams(expectedRuntimeFence, {
     provider: 'claude',
     agent: 'claude',
     accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: join(root, 'claude-home') },
@@ -102,7 +112,7 @@ describe('a publish-first Claude create whose init is slow', () => {
     expect(store.getRecord(SESSION)?.options?.model).toBeUndefined()
     expect(lastPhase()).toBe('starting')
 
-    await adapter.drainStartup(SESSION)
+    await adapter.awaitStarted(SESSION)
     await Promise.all(lifecycle)
 
     expect(store.getRecord(SESSION)?.options?.model).toBe('claude-opus-9')
@@ -116,7 +126,7 @@ describe('a publish-first Claude create whose init is slow', () => {
     ).resolves.toMatchObject({ ok: true })
     expect(store.getRecord(SESSION)?.options?.model).toBe('opus')
 
-    await adapter.drainStartup(SESSION)
+    await adapter.awaitStarted(SESSION)
     await Promise.all(lifecycle)
 
     expect(store.getRecord(SESSION)?.options?.model).toBe('opus')
@@ -126,19 +136,21 @@ describe('a publish-first Claude create whose init is slow', () => {
   it('keeps the picked model across a resume whose new child starts on its own default', async () => {
     const params = claudeParams()
     await host.attach(CALLER, { ...params, options: { model: 'opus' } })
-    await adapter.drainStartup(SESSION)
+    await adapter.awaitStarted(SESSION)
     await Promise.all(lifecycle)
     await host.close(SESSION)
     const releasedFence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
 
-    // Reopening the chat: the surface's first hold resumes the session.
-    await host.hold(SESSION, 'chat-1')
+    // Starting the chat again resumes the session under a new fence.
+    await expect(host.attach(CALLER, claudeParams(releasedFence))).resolves.toMatchObject({
+      ok: true
+    })
     expect(store.getRecord(SESSION)?.lease.runtimeFence).toBeGreaterThan(releasedFence)
     // The new child's init reports its CLI default; the saved pick is restored over it.
     expect(store.getRecord(SESSION)?.options?.model).toBe('opus')
     expect(lastPhase()).toBe('starting')
 
-    await adapter.drainStartup(SESSION)
+    await adapter.awaitStarted(SESSION)
     await Promise.all(lifecycle)
 
     expect(store.getRecord(SESSION)?.options?.model).toBe('opus')
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-started.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-started.ts
index 55c718f967b9..8f3c0390aaa1 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-started.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-started.ts
@@ -16,6 +16,7 @@ import type {
   StructuredAgentSessionHostSession
 } from './structured-agent-session-host-types'
 import { nativeSessionOptionsFromReport } from './structured-agent-session-option-restoration'
+import { markProviderChildStarted } from './structured-agent-session-provider-child'
 
 export type StructuredAgentSessionProviderStartedContext = {
   deps: StructuredAgentSessionHostDeps
@@ -23,7 +24,6 @@ export type StructuredAgentSessionProviderStartedContext = {
   serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
   now: () => number
   publishStatus?: (sessionId: string) => void
-  restartReleaseGrace: (sessionId: string) => void
   onBarrierError: (sessionId: string, error: unknown) => void
 }
 
@@ -35,16 +35,14 @@ export function settleStructuredAgentSessionProviderStarted(
   return context.serialize(event.sessionId, async () => {
     const session = context.sessions.get(event.sessionId)
     if (
-      !session?.hasProviderChild ||
-      session.fence !== event.fence ||
-      session.acquisitionGeneration !== event.acquisitionGeneration
+      !session ||
+      !markProviderChildStarted(session, {
+        generation: event.acquisitionGeneration,
+        fence: event.fence
+      })
     ) {
       return
     }
-    session.providerChildPhase = 'ready'
-    // Prompts held for the start are written now but open a turn only on their echo; a release
-    // tick in between would stop the child before it runs them.
-    context.restartReleaseGrace(event.sessionId)
     try {
       await persistStartedOptions(context, event)
     } catch (error) {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-read-restore.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-read-restore.test.ts
index 34e3fb8a4cf8..514008e49f9b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-read-restore.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-read-restore.test.ts
@@ -48,6 +48,11 @@ const store = {
 } as unknown as AgentSessionRecordStore
 
 let journalRoot: string
+const openDeps = () => ({
+  store,
+  journalRoot,
+  adapter: {}
+})
 const opened: AgentSessionJournal[] = []
 
 async function writeRemnant(name: string): Promise<string> {
@@ -73,29 +78,29 @@ describe('a session whose journal is still the pre-SQLite format', () => {
   it('is published, carrying the message that explains it', async () => {
     const transcript = await writeRemnant('log.jsonl')
 
-    const restored = await restoreStructuredAgentSessionRead(store, journalRoot, SESSION_ID)
+    const restored = await restoreStructuredAgentSessionRead(openDeps(), SESSION_ID)
 
     expect(restored).not.toBeNull()
-    opened.push(restored!.journal)
-    const disclosed = restored!.journal
+    opened.push(restored!.session.journal)
+    const disclosed = restored!.session.journal
       .snapshot()
       .items.map((entry) => (entry.body.kind === 'status' ? entry.body.text : ''))
     expect(disclosed.join('')).toContain(transcript)
     // Publishing it costs no agent process; acquisition still waits for the user.
-    expect(restored!.hasProviderChild).toBe(false)
+    expect(restored!.session.child).toBeNull()
   })
 
   it('is published for a remnant whose log is gone', async () => {
     await writeRemnant('snapshot.json')
 
-    const restored = await restoreStructuredAgentSessionRead(store, journalRoot, SESSION_ID)
+    const restored = await restoreStructuredAgentSessionRead(openDeps(), SESSION_ID)
 
     expect(restored).not.toBeNull()
-    opened.push(restored!.journal)
+    opened.push(restored!.session.journal)
   })
 
   it('still drops a session with neither a journal nor a remnant', async () => {
-    const restored = await restoreStructuredAgentSessionRead(store, journalRoot, SESSION_ID)
+    const restored = await restoreStructuredAgentSessionRead(openDeps(), SESSION_ID)
 
     expect(restored).toBeNull()
   })
@@ -103,7 +108,7 @@ describe('a session whose journal is still the pre-SQLite format', () => {
   it('still drops a session with no record', async () => {
     await writeRemnant('log.jsonl')
 
-    const restored = await restoreStructuredAgentSessionRead(store, journalRoot, 'unknown-session')
+    const restored = await restoreStructuredAgentSessionRead(openDeps(), 'unknown-session')
 
     expect(restored).toBeNull()
   })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-read-restore.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-read-restore.ts
index 65b913daf42a..0e1441b729c7 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-read-restore.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-read-restore.ts
@@ -1,104 +1,32 @@
-import type { AgentSessionRecord } from '../../../shared/agent-session-record'
-import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import { findJournalFileFormatRemnant } from '../agent-session-journal/journal-file-format-remnant'
-import { loadJournal } from '../agent-session-journal/journal-open'
-import { journalDirectoryFor } from '../agent-session-journal/journal-paths'
-import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
-import { openAgentSessionJournal } from '../agent-session-journal/journal-store-factory'
+import { existsSync } from 'node:fs'
+import { journalDatabaseFile, journalDirectoryFor } from '../agent-session-journal/journal-paths'
 import {
-  attachFingerprintFields,
-  journalIdentityFor,
-  type AgentSessionAttachParams
-} from './structured-agent-session-attach'
-import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
-
-export type RestoredStructuredAgentSessionRead = {
-  journal: AgentSessionJournal
-  params: AgentSessionAttachParams
-  fence: number
-  hasProviderChild: false
-  providerChildPhase: 'ready'
-  acquisitionGeneration: null
-}
+  openStructuredAgentSessionConversationJournal,
+  type OpenedStructuredAgentSessionConversation,
+  type StructuredAgentSessionConversationOpenDeps
+} from './structured-agent-session-conversation-open'
 
+/**
+ * A reader's open: the conversation's own open, for a session that has a journal to read. One
+ * with none — never written, or gone — stays unpublished rather than founding an empty one.
+ * Opening can still write: the crash boundary, and the row explaining an old-format history.
+ */
 export async function restoreStructuredAgentSessionRead(
-  store: AgentSessionRecordStore,
-  journalRoot: string,
+  deps: StructuredAgentSessionConversationOpenDeps,
   sessionId: string
-): Promise<RestoredStructuredAgentSessionRead | null> {
-  const record = store.getRecord(sessionId)
+): Promise<OpenedStructuredAgentSessionConversation | null> {
+  const record = deps.store.getRecord(sessionId)
   if (!record) {
     return null
   }
-  const params = attachParamsForRecord(record, {
-    clientOperationId: `read-restore:${record.sessionId}`,
-    expectedRuntimeFence: record.lease.runtimeFence
-  })
-  const journalDir = journalDirectoryFor(journalRoot, {
+  const journalDir = journalDirectoryFor(deps.journalRoot, {
     workspaceId: record.location.workspaceId,
     sessionId
   })
-  const loaded = loadJournal(journalDir, sessionId)
-  if (loaded?.corrupt) {
+  // A session still in the pre-SQLite format has no `journal.db`; the open imports it.
+  if (!existsSync(journalDatabaseFile(journalDir)) && !findJournalFileFormatRemnant(journalDir)) {
     return null
   }
-  // A session still in the pre-SQLite format has no `journal.db` to load. Dropping
-  // it here leaves it unpublished, which is also what prunes its tab out of the
-  // saved workspace — so the chat disappears with nowhere to explain itself.
-  if (!loaded && !findJournalFileFormatRemnant(journalDir)) {
-    return null
-  }
-  const journal = await openAgentSessionJournal({
-    identity: journalIdentityFor(record, params),
-    journalDir,
-    // Omitted, not `null`: the store reads `null` as "replay already ran and
-    // found nothing" and founds a fresh epoch. In process the probe above is the
-    // previous statement, so the window is zero-width; this holds the line for a
-    // database another process creates in between.
-    ...(loaded ? { loaded } : {})
-  })
-  // Read restore opens the journal and nothing else: no adapter call, so no
-  // provider child. Opening it can still write — a session whose history is in
-  // the old format founds its epoch and commits the row explaining that here.
-  return {
-    journal,
-    params,
-    fence: record.lease.runtimeFence,
-    hasProviderChild: false,
-    providerChildPhase: 'ready',
-    acquisitionGeneration: null
-  }
-}
-
-export function attachParamsForRecord(
-  record: AgentSessionRecord,
-  input: {
-    clientOperationId: string
-    expectedRuntimeFence: number
-  }
-): AgentSessionAttachParams {
-  const params: AgentSessionAttachParams = {
-    envelope: {
-      sessionId: record.sessionId,
-      clientOperationId: input.clientOperationId,
-      expectedRuntimeFence: input.expectedRuntimeFence,
-      payloadFingerprint: ''
-    },
-    location: record.location,
-    provider: record.provider,
-    agent: record.provider,
-    accountHome: record.accountHome,
-    runtimeKind: 'native'
-  }
-  return {
-    ...params,
-    envelope: {
-      ...params.envelope,
-      payloadFingerprint: computeAgentSessionPayloadFingerprint({
-        method: 'agentSession.attach',
-        sessionId: record.sessionId,
-        fields: attachFingerprintFields(params)
-      })
-    }
-  }
+  return openStructuredAgentSessionConversationJournal(deps, record)
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-readable-restorer.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-readable-restorer.test.ts
index a788e1ebb666..d1cc9408a62e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-readable-restorer.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-readable-restorer.test.ts
@@ -19,15 +19,17 @@ describe('StructuredAgentSessionReadableRestorer', () => {
       (sessionId) => ({ sessionId }) as AgentSessionRecord
     )
     const restorer = new StructuredAgentSessionReadableRestorer({
-      store: { listRecords: () => records } as never,
-      journalRoot: '/tmp/journals',
+      openDeps: {
+        store: { getRecord: () => null, listRecords: () => records },
+        journalRoot: '/tmp/journals',
+        adapter: {}
+      },
       supportsRecord: () => true,
       reconcile: async () => null,
       resolveRecovery: async () => undefined,
       serialize: async (_sessionId, task) => task(),
       hasSession: () => false,
-      onReadable: () => undefined,
-      settleStaleState: async () => undefined
+      onReadable: () => undefined
     })
 
     await restorer.restore(['visible-a', 'visible-b', 'background-a', 'background-b'])
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-readable-restorer.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-readable-restorer.ts
index 5775ecc54019..06bd043aec0c 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-readable-restorer.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-readable-restorer.ts
@@ -1,30 +1,13 @@
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
-import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
-import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
-import type { RestoredStructuredAgentSessionRead } from './structured-agent-session-read-restore'
-import {
-  restoreOneStructuredAgentSessionRead,
-  restoreOneStructuredAgentSessionReadUnderSerialize,
-  restoreStructuredAgentSessionsOnRestart
-} from './structured-agent-session-restart-restore'
+import type { StructuredAgentSessionReadRestoreDeps } from './structured-agent-session-restart-restore'
+import { restoreStructuredAgentSessionsOnRestart } from './structured-agent-session-restart-restore'
 
 export class StructuredAgentSessionReadableRestorer {
   private restorePromise: Promise<void> | null = null
 
   constructor(
-    private readonly input: {
-      store: AgentSessionRecordStore
-      journalRoot: string
+    private readonly input: StructuredAgentSessionReadRestoreDeps & {
       supportsRecord: (record: AgentSessionRecord) => boolean
-      reconcile: (sessionId: string) => Promise<AgentSessionWireRefusal | null>
-      resolveRecovery: (sessionId: string) => Promise<unknown>
-      serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
-      hasSession: (sessionId: string) => boolean
-      onReadable: (sessionId: string, restored: RestoredStructuredAgentSessionRead) => void
-      settleStaleState: (
-        sessionId: string,
-        restored: RestoredStructuredAgentSessionRead
-      ) => Promise<void>
     }
   ) {}
 
@@ -36,46 +19,11 @@ export class StructuredAgentSessionReadableRestorer {
     return this.restorePromise
   }
 
-  /**
-   * One session, on demand, after startup.
-   *
-   * Deliberately outside `restorePromise`: that latch answers "has the startup sweep run", and a
-   * surface asking for a session the sweep never covered — or that was closed since — must not be
-   * told yes because the sweep finished. Needs no dedupe of its own; the per-session task queue
-   * `serialize` runs on already orders concurrent callers, and the second one sees `hasSession`.
-   *
-   * Provider-agnostic by construction: eligibility is `supportsRecord`, which the adapter router
-   * answers for Claude and Codex from the record's own provider.
-   */
-  async restoreOne(sessionId: string): Promise<boolean> {
-    if (!this.supports(sessionId)) {
-      return false
-    }
-    await restoreOneStructuredAgentSessionRead(this.input, sessionId)
-    return this.input.hasSession(sessionId)
-  }
-
-  /** `restoreOne` for a caller already inside the session's serialize. Reconciliation is skipped
-   *  on purpose: a lease this host has not adjudicated is the attach's problem, and a replay
-   *  needs only the journal. */
-  async restoreOneUnderSerialize(sessionId: string): Promise<boolean> {
-    if (!this.supports(sessionId)) {
-      return false
-    }
-    await restoreOneStructuredAgentSessionReadUnderSerialize(this.input, sessionId)
-    return this.input.hasSession(sessionId)
-  }
-
-  private supports(sessionId: string): boolean {
-    const record = this.input.store.getRecord(sessionId)
-    return record !== null && this.input.supportsRecord(record)
-  }
-
   private async restoreReadableSessions(sessionIds?: readonly string[]): Promise<void> {
     const targetOrder = sessionIds
       ? new Map(sessionIds.map((sessionId, index) => [sessionId, index]))
       : null
-    const records = this.input.store
+    const records = this.input.openDeps.store
       .listRecords()
       .filter(
         (record) =>
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-recovered-turn-clock.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-recovered-turn-clock.test.ts
index 72a908a3361c..a2be16103274 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-recovered-turn-clock.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-recovered-turn-clock.test.ts
@@ -88,7 +88,11 @@ async function sessionWithRunningTurn() {
       }
     }
   })
-  const completions = new StructuredAgentSessionTurnCompletionFeed({ sessions, now: () => clock })
+  const completions = new StructuredAgentSessionTurnCompletionFeed({
+    sessions,
+    now: () => clock,
+    readStatusState: (sessionId, source) => feed.statusState(sessionId, source)
+  })
   const completionEvents: AgentSessionTurnCompletionEvent[] = []
   completions.subscribe({ id: 'dot-1', emit: (event) => completionEvents.push(event) })
   // Both feeds have seen the turn running, so its settlement is a transition they must judge.
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-exits.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-exits.test.ts
index ff2492c58761..2da22f958733 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-exits.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-exits.test.ts
@@ -11,6 +11,7 @@ import { readProcessStartTimeMs } from '../../runtime/agent-session-process-iden
 import { createStructuredAgentSessionOwnerProbe } from '../../runtime/structured-agent-session-owner-probe'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import { abandonStructuredAgentSessionHost } from './structured-agent-session-host-test-abandon'
 import type { StructuredAgentSessionHostDeps } from './structured-agent-session-host-types'
 import {
   HOST_TEST_NOW as NOW,
@@ -59,6 +60,12 @@ async function stopOwner(child: ReturnType<typeof spawnProcess>): Promise<void>
   spawnedOwners.delete(child)
 }
 
+/** What a send's delivery or `agentSession.ensure` does: attach at the record's current fence. */
+async function startAgent(): Promise<void> {
+  const fence = store.getRecord(SESSION)?.lease.runtimeFence ?? null
+  expect((await host.attach(CALLER, hostTestAttachParams(fence))).ok).toBe(true)
+}
+
 function adapter(): StructuredAgentSessionAdapter {
   return {
     acquire,
@@ -82,17 +89,8 @@ function openHost(overrides: Partial<StructuredAgentSessionHostDeps> = {}): void
   })
 }
 
-async function abandonHost(abandonedHost: StructuredAgentSessionHost): Promise<void> {
-  abandonedHost['runtimeState'].stopLeaseRenewal()
-  abandonedHost['holds'].dispose()
-  await Promise.all(
-    [...abandonedHost['sessions'].values()].map((session) => session.journal.close())
-  )
-  abandonedHost['sessions'].clear()
-}
-
 async function reopenStore(): Promise<void> {
-  await abandonHost(host)
+  await abandonStructuredAgentSessionHost(host)
   store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
 }
 
@@ -119,8 +117,8 @@ beforeEach(async () => {
 })
 
 afterEach(async () => {
-  await abandonHost(host)
-  await Promise.all([...supersededHosts].map(abandonHost))
+  await abandonStructuredAgentSessionHost(host)
+  await Promise.all([...supersededHosts].map(abandonStructuredAgentSessionHost))
   supersededHosts.clear()
   await Promise.all([...spawnedOwners].map((child) => stopOwner(child)))
   await rm(root, { recursive: true, force: true })
@@ -195,8 +193,8 @@ describe('recovery exits', () => {
       runtimeFence: 4
     })
 
-    // The ordinary native recovery path remains: the first surface hold resumes it.
-    await host.hold(SESSION, 'surface-1')
+    // The ordinary native recovery path remains: the next start resumes it.
+    await startAgent()
     expect(acquire).toHaveBeenCalledTimes(3)
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
       claimStatus: 'live',
@@ -240,7 +238,7 @@ describe('recovery exits', () => {
     })
   })
 
-  it('heals a stranded native owner during startup restore, and spawns nothing until a surface asks', async () => {
+  it('heals a stranded native owner during startup restore, and spawns nothing until work asks', async () => {
     expect((await host.attach(CALLER, hostTestAttachParams(null))).ok).toBe(true)
     await reopenStore()
 
@@ -260,7 +258,7 @@ describe('recovery exits', () => {
     await host.restoreReadableSessions()
 
     // Healing is startup's job; spawning is not. The orphan is stopped and the lease is free, but
-    // nothing has asked to look at this session, so no replacement child exists yet.
+    // nothing has asked this session for work, so no replacement child exists yet.
     expect(stopOwnerProcess).toHaveBeenCalledWith(4242, 'SIGTERM')
     expect(acquire).toHaveBeenCalledTimes(1)
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
@@ -269,7 +267,7 @@ describe('recovery exits', () => {
       ownerProcess: null
     })
 
-    await host.hold(SESSION, 'surface-1')
+    await startAgent()
 
     expect(acquire).toHaveBeenCalledTimes(2)
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
@@ -338,7 +336,7 @@ describe('recovery exits', () => {
       }
     })
 
-    await host.hold(SESSION, 'surface-overlap')
+    await startAgent()
 
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
       runtimeFence: 3,
@@ -346,6 +344,6 @@ describe('recovery exits', () => {
       handoffStage: null,
       ownerProcess: { pid: replacement.process.pid, spawnToken: 'spawn-b' }
     })
-    expect(host.history({ sessionId: SESSION, direction: 'tail' }).ok).toBe(true)
+    expect((await host.history({ sessionId: SESSION, direction: 'tail' })).ok).toBe(true)
   })
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-resolution.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-resolution.test.ts
index 7fbd785894d8..063e8c64af71 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-resolution.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-resolution.test.ts
@@ -1,3 +1,4 @@
+import { spawn } from 'node:child_process'
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -8,6 +9,7 @@ import {
   writeOlderBuildLease
 } from '../../runtime/agent-session-older-build-lease.test-fixture'
 import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import { supervisedPosixLaunch } from '../../codex/codex-app-server-posix-supervisor'
 import {
   resolveStructuredSessionRecovery,
   type StructuredSessionRecoveryResolutionDeps
@@ -62,7 +64,7 @@ async function reserve(store: AgentSessionRecordStore) {
   })
 }
 
-async function liveOwner(store: AgentSessionRecordStore) {
+async function liveOwner(store: AgentSessionRecordStore, pid = 4242) {
   const reserved = await reserve(store)
   const fence = reserved.record.lease.runtimeFence
   await store.commitProcessIdentity({
@@ -70,7 +72,7 @@ async function liveOwner(store: AgentSessionRecordStore) {
     fence,
     process: {
       hostId: 'local',
-      pid: 4242,
+      pid,
       processStartTimeMs: NOW - 1_000,
       spawnToken: 'spawn-recovery'
     },
@@ -302,3 +304,72 @@ describe('structured session recovery resolution', () => {
     ).toBe('not-applicable')
   })
 })
+
+describe.runIf(process.platform !== 'win32')(
+  'structured session recovery of a supervised owner',
+  () => {
+    const recordedPids: number[] = []
+    const alive = (pid: number): boolean => {
+      try {
+        process.kill(pid, 0)
+        return true
+      } catch (error) {
+        return !(error instanceof Error && 'code' in error && error.code === 'ESRCH')
+      }
+    }
+
+    afterEach(() => {
+      for (const pid of recordedPids.splice(0)) {
+        if (alive(pid)) {
+          process.kill(pid, 'SIGKILL')
+        }
+      }
+    })
+
+    it('evicts only after the supervisor has reaped a provider that ignores SIGTERM', async () => {
+      const launch = supervisedPosixLaunch(
+        {
+          command: process.execPath,
+          args: [
+            '-e',
+            "process.on('SIGTERM', () => {}); process.stdout.write(process.pid + '\\n'); setInterval(() => {}, 60000)"
+          ]
+        },
+        process.env
+      )
+      const supervisor = spawn(launch.command, launch.args, {
+        env: launch.env,
+        stdio: ['pipe', 'pipe', 'ignore'],
+        detached: true
+      })
+      recordedPids.push(supervisor.pid!)
+      const provider = await new Promise<number>((resolve, reject) => {
+        const timeout = setTimeout(() => reject(new Error('provider never started')), 10_000)
+        supervisor.stdout.once('data', (chunk: Buffer) => {
+          clearTimeout(timeout)
+          resolve(Number(chunk.toString().trim()))
+        })
+      })
+      recordedPids.push(provider)
+      const store = await openStore()
+      await liveOwner(store, supervisor.pid!)
+      await latch(store)
+
+      const result = await resolveStructuredSessionRecovery(
+        {
+          store,
+          // The recorded pid is the supervisor's; its absence is the proof recovery evicts on.
+          probeRecord: async () =>
+            alive(supervisor.pid!) ? MATCHED : { outcome: 'pid-absent' as const },
+          now: () => NOW + 10_000
+        },
+        SESSION
+      )
+
+      expect(result).toBe('resolved')
+      // Evicted on proof of death, which must hold for the provider too, not only the supervisor.
+      expect(store.getRecord(SESSION)?.lease.deathEvidence).not.toBeNull()
+      expect(alive(provider)).toBe(false)
+    })
+  }
+)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-resolution.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-resolution.ts
index 5e04cbdf90ef..385d438f7a04 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-resolution.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-resolution.ts
@@ -15,6 +15,7 @@ import {
   type AgentSessionOwnerProbe
 } from '../../../shared/agent-session-lease-adjudication'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
+import { PROVIDER_SUPERVISOR_MAX_STOP_MS } from '../../codex/codex-app-server-posix-supervisor'
 import { releaseUnprovenAgentSessionOwner } from '../../runtime/agent-session-lease-transitions'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 
@@ -28,8 +29,13 @@ export type StructuredSessionRecoveryResolutionDeps = {
   delay?: (ms: number) => Promise<void>
 }
 
-const STOP_PROBES_PER_SIGNAL = 4
 const STOP_PROBE_INTERVAL_MS = 250
+// A POSIX structured owner is its provider supervisor, which exits only after its provider
+// group. A SIGKILL that lands first leaves the group running, so SIGTERM outlasts its stop.
+const STOP_PROBES: Record<StructuredSessionRecoveryStopSignal, number> = {
+  SIGTERM: Math.ceil(PROVIDER_SUPERVISOR_MAX_STOP_MS / STOP_PROBE_INTERVAL_MS) + 1,
+  SIGKILL: 4
+}
 
 const UNRESOLVED_REFUSALS: ReadonlySet<string> = new Set([
   'agent_session_ownership_unknown',
@@ -94,7 +100,7 @@ async function stopOwnerAndReprobe(
   let probe: AgentSessionOwnerProbe = { outcome: 'indeterminate', reason: 'owner stop requested' }
   for (const signal of ['SIGTERM', 'SIGKILL'] as const) {
     stop(pid, signal)
-    for (let attempt = 0; attempt < STOP_PROBES_PER_SIGNAL; attempt += 1) {
+    for (let attempt = 0; attempt < STOP_PROBES[signal]; attempt += 1) {
       probe = await deps.probeRecord(record)
       if (isProvenDeadProbe(probe)) {
         return probe
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-refusal-details.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-refusal-details.test.ts
new file mode 100644
index 000000000000..505bec74c23d
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-refusal-details.test.ts
@@ -0,0 +1,274 @@
+// A refusal's details name the situation, so every place that answers for a refusal — the first
+// reply, a ledger replay, the store fallback copy — must name the same one.
+
+import { describe, expect, it } from 'vitest'
+import {
+  agentSessionRecordFixture,
+  agentSessionLeaseFixture
+} from '../../../shared/agent-session-record.test-fixture'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import { classifyStoreFailure } from './structured-agent-session-attach'
+import {
+  AgentSessionAcquisitionExitProvenError,
+  AgentSessionAcquisitionExitUnprovenError,
+  AgentSessionAcquisitionRefusal,
+  AgentSessionPreSpawnError
+} from './structured-agent-session-adapter'
+import {
+  failedAcquisitionRefusal,
+  failedAcquisitionSettlement
+} from './structured-agent-session-failed-create-refusal'
+import { withObservedProviderExit } from './structured-agent-session-failure-text'
+import { resolveAgentSessionReplayOutcome } from './structured-agent-session-replay-outcome'
+
+const CLAUDE_CREATE = {
+  record: agentSessionRecordFixture(),
+  newSession: true
+}
+
+function replay(outcome: Parameters<typeof resolveAgentSessionReplayOutcome>[0]['outcome']) {
+  return resolveAgentSessionReplayOutcome({
+    operationId: 'op-1',
+    outcome,
+    reconstruct: () => null
+  })
+}
+
+describe('a ledger replay names the details its first answer did', () => {
+  it.each([
+    [new AgentSessionAcquisitionRefusal('not signed in', 'notSignedIn'), 'notSignedIn'],
+    [
+      new AgentSessionAcquisitionExitProvenError(
+        withObservedProviderExit(new Error('exited (code 1)'))
+      ),
+      'providerStartFailed'
+    ],
+    // Gone now, with no exit observed: no situation, on the first answer or the replay.
+    [new AgentSessionAcquisitionExitProvenError(new Error('spawn codex ENOENT')), undefined]
+  ])('for a failed create: %s', (error, reason) => {
+    const first = failedAcquisitionRefusal(error, CLAUDE_CREATE)
+    const replayed = replay(failedAcquisitionSettlement(error, CLAUDE_CREATE).outcome)
+    expect(first?.refusal.details?.reason).toBe(reason)
+    expect(replayed).toMatchObject({
+      decision: 'refuse',
+      refusal: { code: first?.refusal.code, ...(reason ? { details: first?.refusal.details } : {}) }
+    })
+    if (!reason) {
+      expect(replayed).not.toHaveProperty('refusal.details')
+    }
+  })
+
+  it('for a create whose cleanup could not prove the child gone', () => {
+    const outcome = failedAcquisitionSettlement(
+      new AgentSessionAcquisitionExitUnprovenError(new Error('probe failed')),
+      CLAUDE_CREATE
+    ).outcome
+    expect(replay(outcome)).toMatchObject({
+      refusal: { code: 'agent_session_ownership_unknown', details: { reason: 'ownerUnproven' } }
+    })
+  })
+
+  it.each([
+    [
+      new AgentSessionAcquisitionExitProvenError(
+        withObservedProviderExit(
+          new Error('claude stream-json exited (code 1): claude: not signed in (rig)')
+        )
+      ),
+      'Claude stopped before it finished starting. Send your message to try again.'
+    ],
+    [
+      new AgentSessionAcquisitionExitProvenError(new Error('spawn claude ENOENT')),
+      "Claude couldn't start. Send your message to try again."
+    ],
+    [
+      new AgentSessionAcquisitionRefusal(
+        'Claude is not signed in for the selected account. Sign in with the Claude CLI for this CLAUDE_CONFIG_DIR, then retry.',
+        'notSignedIn'
+      ),
+      'Claude is not signed in for the selected account. Sign in, then send your message again.'
+    ],
+    [
+      AgentSessionAcquisitionRefusal.historyTooLarge(
+        'Codex thread history exceeds the bounded restore queue; history was not partially imported.'
+      ),
+      "This conversation's history is too large to restore here. Start a new chat to continue."
+    ]
+  ])('answers and replays %s in the sentence its start failure reads as', (error, sentence) => {
+    const first = failedAcquisitionRefusal(error, CLAUDE_CREATE)
+    const replayed = replay(failedAcquisitionSettlement(error, CLAUDE_CREATE).outcome)
+    expect(first?.refusal.message).toBe(sentence)
+    expect(replayed).toMatchObject({ decision: 'refuse', refusal: { message: sentence } })
+    for (const message of [
+      first?.refusal.message,
+      failedAcquisitionSettlement(error, CLAUDE_CREATE).outcome.message
+    ]) {
+      expect(message).not.toMatch(
+        /stream-json|exited \(code|ENOENT|CLAUDE_CONFIG_DIR|restore queue/
+      )
+    }
+  })
+
+  it('replays a spawn that failed before any process in a sentence, not its error', () => {
+    const outcome = failedAcquisitionSettlement(
+      new AgentSessionPreSpawnError(new Error('spawn claude ENOENT')),
+      CLAUDE_CREATE
+    ).outcome
+    expect(replay(outcome)).toMatchObject({
+      refusal: { message: "Claude couldn't start. Send your message to try again." }
+    })
+  })
+
+  it('keeps the code a store refusal replays with, and the unproven-exit marker', () => {
+    expect(
+      failedAcquisitionSettlement(new Error('agent_session_conflict'), CLAUDE_CREATE).outcome
+        .message
+    ).toBe('agent_session_conflict')
+    expect(
+      failedAcquisitionSettlement(
+        new AgentSessionAcquisitionExitUnprovenError(new Error('probe failed')),
+        CLAUDE_CREATE
+      ).outcome.message
+    ).toBe('agent_session_acquisition_exit_unproven')
+  })
+
+  it('replays the facts beside the reason, and mirrors them where released clients read', () => {
+    const resolution = {
+      state: 'resolved' as const,
+      selectedOptionId: 'allow',
+      resolvedBy: 'phone',
+      resolvedAt: 5
+    }
+    const replayed = replay({
+      status: 'failed',
+      code: 'agent_session_item_revision_stale',
+      details: { reason: 'promptMoved', currentRevision: 3, resolution }
+    })
+    expect(replayed).toMatchObject({
+      refusal: {
+        code: 'agent_session_item_revision_stale',
+        details: { reason: 'promptMoved', currentRevision: 3, resolution },
+        currentRevision: 3,
+        resolution
+      }
+    })
+  })
+
+  it('reads a row an older host wrote, with no details, as naming none', () => {
+    const replayed = replay({ status: 'failed', code: 'agent_session_conflict' })
+    expect(replayed).toMatchObject({ refusal: { code: 'agent_session_conflict' } })
+    expect(replayed.decision === 'refuse' && replayed.refusal).not.toHaveProperty('details')
+  })
+
+  it('drops the cause an unreleased build wrote, and a reason the code does not list', () => {
+    for (const row of [
+      { status: 'failed' as const, code: 'agent_session_conflict', cause: 'claimConflicted' },
+      {
+        status: 'failed' as const,
+        code: 'agent_session_conflict',
+        details: { reason: 'promptGone' as const }
+      }
+    ]) {
+      const replayed = replay(row)
+      expect(replayed).toMatchObject({ refusal: { code: 'agent_session_conflict' } })
+      expect(replayed.decision === 'refuse' && replayed.refusal).not.toHaveProperty('details')
+    }
+  })
+
+  it('names a code this build cannot place as refused earlier', () => {
+    expect(replay({ status: 'failed', code: 'agent_session_future_code' })).toMatchObject({
+      refusal: {
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'operationRefusedEarlier' }
+      }
+    })
+  })
+
+  it('names a lost outcome and a lost result', () => {
+    expect(replay({ status: 'unknown' })).toMatchObject({
+      refusal: { details: { reason: 'outcomeUnknown' } }
+    })
+    expect(replay({ status: 'succeeded', sessionId: 's' })).toMatchObject({
+      refusal: { details: { reason: 'resultLost' } }
+    })
+  })
+})
+
+describe('the store fallback copy', () => {
+  const record = agentSessionRecordFixture(
+    agentSessionLeaseFixture({
+      ownerProcess: { hostId: 'local', pid: 4242, processStartTimeMs: 1, spawnToken: 'spawn-1' }
+    })
+  )
+
+  it('words a situation its code would misdescribe by the situation', () => {
+    const refusal = classifyStoreFailure(
+      agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'replaySuperseded' }),
+      null,
+      record
+    )
+    expect(refusal).toMatchObject({
+      code: 'agent_session_ownership_unknown',
+      details: { reason: 'replaySuperseded' }
+    })
+    // Not the latched-owner story: this owner is not in doubt, the replay is just stale.
+    expect(refusal.message).not.toContain('4242')
+  })
+
+  it('keeps the latched-owner story, with its reason, for an owner it cannot prove gone', () => {
+    const refusal = classifyStoreFailure(
+      agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' }),
+      null,
+      record
+    )
+    expect(refusal.details?.reason).toBe('ownerUnproven')
+    expect(refusal.message).toContain('4242')
+  })
+
+  it('does not promise an update fixes a record this build cannot read', () => {
+    // Unreadable covers a damaged record as well as one a newer build wrote.
+    expect(
+      classifyStoreFailure(
+        agentSessionRefusalError('execution_owner_reconciling', { reason: 'recordUnreadable' }),
+        null,
+        null
+      )
+    ).toEqual({
+      code: 'execution_owner_reconciling',
+      details: { reason: 'recordUnreadable' },
+      message:
+        "Orca can't read this chat's saved state. If a newer version of Orca saved it, update Orca to open it; otherwise start a new chat."
+    })
+  })
+
+  it('names the latch for a bare code an older path still throws', () => {
+    expect(
+      classifyStoreFailure(new Error('agent_session_conflict'), null, {
+        ...record,
+        lease: { ...record.lease, claimStatus: 'conflicted' }
+      }).details
+    ).toEqual({ reason: 'claimConflicted' })
+    expect(
+      classifyStoreFailure(new Error('agent_session_conflict'), null, null)
+    ).not.toHaveProperty('details')
+  })
+
+  it('puts the current fence in the details of a stale checkpoint, and mirrors it', () => {
+    expect(
+      classifyStoreFailure(
+        agentSessionRefusalError('agent_session_checkpoint_stale', { reason: 'fenceStale' }),
+        7,
+        null
+      )
+    ).toEqual({
+      code: 'agent_session_checkpoint_stale',
+      details: { reason: 'fenceStale', currentFence: 7 },
+      currentFence: 7,
+      message: 'The session store refused this call: agent_session_checkpoint_stale.'
+    })
+    // A bare code names no reason, but the fence is still a fact.
+    expect(
+      classifyStoreFailure(new Error('agent_session_checkpoint_stale'), 7, null)
+    ).toMatchObject({ details: { currentFence: 7 }, currentFence: 7 })
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-refusal-message.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-refusal-message.ts
index 9d5cab66e278..7a7a9e289ef5 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-refusal-message.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-refusal-message.ts
@@ -9,7 +9,10 @@
 
 import { terminalOwnerRefusalMessage } from '../../../shared/agent-session-legacy-handoff-lease'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
-import type { AgentSessionWireRefusalCode } from '../../../shared/agent-session-wire'
+import type {
+  AgentSessionAnyRefusalReason,
+  AgentSessionRefusalReference
+} from '../../../shared/agent-session-wire'
 
 function ownerDescription(record: AgentSessionRecord): string {
   const owner = record.lease.ownerProcess
@@ -25,19 +28,63 @@ function latchedMessage(record: AgentSessionRecord): string {
     : 'Orca cannot tell whether an agent started for this session before the app stopped, so it will not start a second one on the same conversation. Quit any leftover agent process for this workspace and reopen this chat.'
 }
 
-/** Null when the code has no session-specific story to tell; the caller keeps its own wording. */
+/**
+ * A situation whose own words the store's code would get wrong: each of these reaches the chat as
+ * `ownership_unknown` or `conflict`, which by code alone would read as the latched-owner story.
+ */
+const SITUATION_MESSAGES: Partial<Record<AgentSessionAnyRefusalReason, string>> = {
+  replaySuperseded: 'A newer start of this chat replaced this one. Try again.',
+  leaseMoved: 'This chat changed hands while Orca was starting it. Try again.',
+  spawnIdentityMismatch:
+    'The agent that started was not the one Orca launched, so Orca did not use it. Try again.',
+  identityMismatch:
+    'This chat belongs to a different workspace, agent or account. Start a new chat to continue.',
+  sessionExists: 'This chat already exists. Open it to continue.',
+  tabIdTaken: 'Another chat already uses this tab. Try again.',
+  conversationHeldElsewhere:
+    'Another chat is already working in this conversation. Open that chat to continue.',
+  // Also a damaged record, which no update opens.
+  recordUnreadable:
+    "Orca can't read this chat's saved state. If a newer version of Orca saved it, update Orca to open it; otherwise start a new chat."
+}
+
+/**
+ * The words and the situation for a store refusal. The reason is what the emitter named, when it
+ * named one; the latched branches name their own. Null when neither has a story to tell, and the
+ * caller keeps its own wording.
+ */
 export function structuredAgentSessionRefusalMessage(
-  code: AgentSessionWireRefusalCode,
+  emitted: AgentSessionRefusalReference,
   record: AgentSessionRecord | null
-): string | null {
+): { message: string; reference: AgentSessionRefusalReference } | null {
+  const reason = emitted.details?.reason
+  const situational = reason ? SITUATION_MESSAGES[reason] : undefined
+  if (situational) {
+    return { message: situational, reference: emitted }
+  }
   if (!record) {
     return null
   }
+  const { code } = emitted
   if (code === 'agent_session_ownership_unknown' || code === 'agent_session_conflict') {
-    return latchedMessage(record)
+    const message = latchedMessage(record)
+    if (record.lease.claimStatus === 'conflicted') {
+      return { message, reference: { code, details: { reason: 'claimConflicted' } } }
+    }
+    return {
+      message,
+      reference:
+        code === 'agent_session_conflict' && reason === 'ownerAlive'
+          ? { code, details: { reason: 'ownerAlive' } }
+          : { code, details: { reason: 'ownerUnproven' } }
+    }
   }
   if (code === 'execution_owner_reconciling') {
-    return 'Orca is still working out who owns this session on this machine. Reopen the chat in a moment.'
+    return {
+      message:
+        'Orca is still working out who owns this session on this machine. Reopen the chat in a moment.',
+      reference: { code, details: { reason: 'hostReconciling' } }
+    }
   }
   return null
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-refusal-retry.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-refusal-retry.test.ts
index 87f4f9e3d65e..4043e27b30c7 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-refusal-retry.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-refusal-retry.test.ts
@@ -19,6 +19,7 @@ import {
 import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import { abandonStructuredAgentSessionHost } from './structured-agent-session-host-test-abandon'
 import {
   HOST_TEST_NOW as NOW,
   HOST_TEST_SESSION as SESSION,
@@ -103,16 +104,9 @@ async function createHarness(options: { attached?: boolean } = {}) {
   return harness
 }
 
-async function abandonHost(host: StructuredAgentSessionHost): Promise<void> {
-  host['runtimeState'].stopLeaseRenewal()
-  host['holds'].dispose()
-  await Promise.all([...host['sessions'].values()].map((session) => session.journal.close()))
-  host['sessions'].clear()
-}
-
 afterEach(async () => {
   const completed = harnesses.splice(0)
-  await Promise.all(completed.map(async ({ host }) => abandonHost(host)))
+  await Promise.all(completed.map(async ({ host }) => abandonStructuredAgentSessionHost(host)))
   await Promise.all(completed.map(async ({ root }) => rm(root, { recursive: true })))
 })
 
@@ -225,16 +219,20 @@ const UNREACHABLE = new Set<Pair>([
   // StructuredAgentSessionHost.mutate maps an absent record to AGENT_SESSION_NOT_ATTACHED.
   'agentSession.setOption:agent_session_identity_required',
   'agentSession.send:agent_session_identity_required',
-  // No structured-agent-session host branch emits agent_session_journal_unreadable.
+  // Only a send opens the conversation it writes to.
   'agentSession.setOption:agent_session_journal_unreadable',
-  'agentSession.send:agent_session_journal_unreadable',
   // Send reconstructs doubt from its global tombstone instead of refusing it.
   'agentSession.send:agent_session_operation_unknown',
   // Only a send restarts a lost owner.
   'agentSession.setOption:agent_session_owner_restart_failed',
   // A write names its target, not an owner generation; only an attach compares fences.
   'agentSession.setOption:agent_session_checkpoint_stale',
-  'agentSession.send:agent_session_checkpoint_stale'
+  'agentSession.send:agent_session_checkpoint_stale',
+  // A send is a conversation write: admitted whoever owns the lease, and a start it needs that
+  // fails rejects the accepted message rather than refusing the call.
+  'agentSession.send:agent_session_conflict',
+  'agentSession.send:execution_owner_reconciling',
+  'agentSession.send:agent_session_owner_restart_failed'
 ])
 
 describe('agentSessionRefusalOperationState host oracle', () => {
@@ -251,7 +249,7 @@ describe('agentSessionRefusalOperationState host oracle', () => {
     expect(stale.setOption).toHaveBeenCalledTimes(1)
 
     const conflict = await createHarness()
-    for (const method of ['agentSession.setOption', 'agentSession.send'] as const) {
+    for (const method of ['agentSession.setOption'] as const) {
       await setLease(conflict, (current) => ({
         ...current,
         lease: { ...current.lease, handoffStage: 'new-owner-proving' }
@@ -331,7 +329,7 @@ describe('agentSessionRefusalOperationState host oracle', () => {
     record(await assertHostAgreement(unknown, optionUnknown, 'agent_session_operation_unknown'))
 
     const reconciling = await createHarness()
-    for (const method of ['agentSession.setOption', 'agentSession.send'] as const) {
+    for (const method of ['agentSession.setOption'] as const) {
       await setLease(reconciling, (current) => ({
         ...current,
         lease: { ...current.lease, unreconciled: true }
@@ -348,16 +346,21 @@ describe('agentSessionRefusalOperationState host oracle', () => {
       )
     }
 
-    const unrecoverable = await createHarness()
-    await unrecoverable.host.close(SESSION)
-    unrecoverable.host.deps.adapter.acquire = async () => {
-      throw new Error('no provider thread to resume')
+    const unreadable = await createHarness()
+    await unreadable.host.close(SESSION)
+    unreadable.host.deps.adapter.historyFilePath = async () => {
+      throw new Error('transcript unreadable')
     }
+    const unreadableSend = { method: 'agentSession.send' as const, operationId: operationId() }
     record(
       await assertHostAgreement(
-        unrecoverable,
-        { method: 'agentSession.send', operationId: operationId() },
-        'agent_session_owner_restart_failed'
+        unreadable,
+        unreadableSend,
+        'agent_session_journal_unreadable',
+        async () => {
+          delete unreadable.host.deps.adapter.historyFilePath
+          return { harness: unreadable, spec: unreadableSend }
+        }
       )
     )
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-release-clock.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-release-clock.ts
deleted file mode 100644
index 91daa5606a81..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-release-clock.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-// The delay between "nothing holds this session and nothing has happened in it" and "stop its
-// provider child".
-//
-// It is an IDLE window, not a short grace. A surface that reconnects — a mobile socket dropping on
-// a network switch, a renderer remounting a tab, a worktree switch hiding the pane — releases and
-// re-holds, and a send to a chat nobody is looking at restarts its owner; stopping the child soon
-// after either costs the user a respawn plus a resume on the next message. And a turn the user
-// already asked for must finish: stopping the child mid-answer strands the open turn marker.
-//
-// So the clock arms when the last holder leaves, every journal write while it is armed starts it
-// again, and a tick that finds work still owed — a turn running, a message sent but not yet
-// taken by the provider, or a subagent, command or monitor still running — re-arms instead of
-// evicting. The child goes only after a full window
-// with no holder and no owed work. Quit still stops every child at once.
-
-export const STRUCTURED_AGENT_SESSION_RELEASE_GRACE_MS = 30 * 60_000
-
-export type StructuredAgentSessionReleaseClockDeps = {
-  /** Never evict while work is owed; a true answer re-arms the clock instead. */
-  hasOwedWork: (sessionId: string) => boolean
-  /** Re-checked at fire time: a holder may have arrived while the timer ran. */
-  isHeld: (sessionId: string) => boolean
-  evict: (sessionId: string) => Promise<void>
-  onError?: (input: { sessionId: string; error: unknown }) => void
-  graceMs?: number
-}
-
-export class StructuredAgentSessionReleaseClock {
-  private readonly timers = new Map<string, ReturnType<typeof setTimeout>>()
-  private readonly graceMs: number
-
-  constructor(private readonly deps: StructuredAgentSessionReleaseClockDeps) {
-    this.graceMs = deps.graceMs ?? STRUCTURED_AGENT_SESSION_RELEASE_GRACE_MS
-  }
-
-  arm(sessionId: string): void {
-    this.cancel(sessionId)
-    const timer = setTimeout(() => {
-      this.timers.delete(sessionId)
-      this.fire(sessionId)
-    }, this.graceMs)
-    // A pending release must never be the reason a process stays alive at quit.
-    timer.unref?.()
-    this.timers.set(sessionId, timer)
-  }
-
-  /** Activity in an unheld session: the idle window starts over. */
-  renew(sessionId: string): void {
-    if (this.timers.has(sessionId)) {
-      this.arm(sessionId)
-    }
-  }
-
-  cancel(sessionId: string): void {
-    const timer = this.timers.get(sessionId)
-    if (timer) {
-      clearTimeout(timer)
-      this.timers.delete(sessionId)
-    }
-  }
-
-  isArmed(sessionId: string): boolean {
-    return this.timers.has(sessionId)
-  }
-
-  dispose(): void {
-    for (const timer of this.timers.values()) {
-      clearTimeout(timer)
-    }
-    this.timers.clear()
-  }
-
-  private fire(sessionId: string): void {
-    if (this.deps.isHeld(sessionId)) {
-      return
-    }
-    if (this.deps.hasOwedWork(sessionId)) {
-      this.arm(sessionId)
-      return
-    }
-    void this.deps.evict(sessionId).catch((error: unknown) => {
-      this.deps.onError?.({ sessionId, error })
-    })
-  }
-}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-replay-outcome.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-replay-outcome.ts
index c81c45dfba50..00fa33a30fb4 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-replay-outcome.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-replay-outcome.ts
@@ -1,9 +1,11 @@
 import { rewindRefusal } from './structured-rewind-refusal'
 import type { AgentSessionOperationOutcome } from '../../../shared/agent-session-operation-ledger'
 import {
-  AGENT_SESSION_WIRE_REFUSAL_CODES,
-  type AgentSessionWireRefusal,
-  type AgentSessionWireRefusalCode
+  agentSessionRefusalFromReference,
+  readAgentSessionRefusalReference,
+  refuse,
+  type AgentSessionRefusalReference,
+  type AgentSessionWireRefusal
 } from '../../../shared/agent-session-wire'
 
 export type AgentSessionReplayOutcomeDecision<TValue> =
@@ -23,15 +25,12 @@ export function resolveAgentSessionReplayOutcome<TValue>(input: {
     if (outcome.rewindReason) {
       return { decision: 'refuse', refusal: rewindRefusal(outcome.rewindReason).refusal }
     }
-    const code = (AGENT_SESSION_WIRE_REFUSAL_CODES as readonly string[]).includes(outcome.code)
-      ? (outcome.code as AgentSessionWireRefusalCode)
-      : 'agent_session_operation_invalid'
     return {
       decision: 'refuse',
-      refusal: {
-        code,
-        message: outcome.message ?? `Operation ${operationId} was already refused: ${outcome.code}.`
-      }
+      refusal: agentSessionRefusalFromReference(
+        recordedRefusal(outcome.code, outcome.details),
+        outcome.message ?? `Operation ${operationId} was already refused: ${outcome.code}.`
+      )
     }
   }
   if (outcome.status === 'unknown') {
@@ -44,10 +43,11 @@ export function resolveAgentSessionReplayOutcome<TValue>(input: {
     }
     return {
       decision: 'refuse',
-      refusal: {
-        code: 'agent_session_operation_unknown',
-        message: `The outcome of operation ${operationId} is unknown; it was not run again.`
-      }
+      refusal: refuse(
+        'agent_session_operation_unknown',
+        { reason: 'outcomeUnknown' },
+        `The outcome of operation ${operationId} is unknown; it was not run again.`
+      )
     }
   }
   const recorded = input.reconstruct()
@@ -60,10 +60,22 @@ export function resolveAgentSessionReplayOutcome<TValue>(input: {
   return outcome.status === 'succeeded'
     ? {
         decision: 'refuse',
-        refusal: {
-          code: 'agent_session_operation_unknown',
-          message: `Operation ${operationId} succeeded, but its result is no longer reconstructable.`
-        }
+        refusal: refuse(
+          'agent_session_operation_unknown',
+          { reason: 'resultLost' },
+          `Operation ${operationId} succeeded, but its result is no longer reconstructable.`
+        )
       }
     : { decision: 'rerun' }
 }
+
+/** The refusal a failed row recorded, so a replay says what the first answer said. A code this
+ *  build does not know was refused for a reason it cannot name. */
+function recordedRefusal(code: string, details: unknown): AgentSessionRefusalReference {
+  return (
+    readAgentSessionRefusalReference({ code, details }) ?? {
+      code: 'agent_session_operation_invalid',
+      details: { reason: 'operationRefusedEarlier' }
+    }
+  )
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig.ts
new file mode 100644
index 000000000000..3ea116fa361d
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig.ts
@@ -0,0 +1,224 @@
+// A real host over a real store and journal, with a scripted provider and a clock the test moves,
+// for the tests of a conversation that outlives its agent. The idle sweep runs on its own short
+// interval; a test moves `clock.now` past the idle window and waits for the outcome.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { expect, vi, type Mock } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import type {
+  AgentSessionMutationEnvelope,
+  AgentSessionStatusEvent,
+  AgentSessionSubscribeEvent
+} from '../../../shared/agent-session-wire'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import type {
+  AgentSessionDispatchOutcome,
+  StructuredAgentSessionAdapter
+} from './structured-agent-session-adapter'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import type { StructuredAgentSessionHostDeps } from './structured-agent-session-host-types'
+import {
+  HOST_TEST_NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
+  hostTestMessage,
+  hostTestOperationId,
+  resetHostTestOperationIds
+} from './structured-agent-session-host-test-data'
+import { STRUCTURED_AGENT_SESSION_IDLE_MS } from './structured-agent-session-idle-sweep'
+
+export const REST_TEST_CALLER = { callerKey: 'client-1' }
+export const IDLE_MS = STRUCTURED_AGENT_SESSION_IDLE_MS
+export const SWEEP_INTERVAL_MS = 5
+
+export type RestTestAdapter = {
+  acquire: Mock<StructuredAgentSessionAdapter['acquire']>
+  closeSession: Mock<NonNullable<StructuredAgentSessionAdapter['closeSession']>>
+  dispatch: Mock<StructuredAgentSessionAdapter['dispatch']>
+  acknowledgeSessionRelease: Mock<
+    NonNullable<StructuredAgentSessionAdapter['acknowledgeSessionRelease']>
+  >
+  backgroundTaskState: Mock<NonNullable<StructuredAgentSessionAdapter['backgroundTaskState']>>
+  readOptions: Mock<NonNullable<StructuredAgentSessionAdapter['readOptions']>>
+}
+
+export type RestTestRig = {
+  root: string
+  store: AgentSessionRecordStore
+  host: StructuredAgentSessionHost
+  adapter: RestTestAdapter
+  clock: { now: number }
+  statusEvents: AgentSessionStatusEvent[]
+  sink: { publish: Mock; forget: Mock }
+  /** Opens a fresh host over the same store and journals: what a restart leaves behind. */
+  restart: (deps?: Partial<StructuredAgentSessionHostDeps>) => Promise<StructuredAgentSessionHost>
+  dispose: () => Promise<void>
+}
+
+let ordinal = 0
+let generations = 0
+
+export function acceptedDispatch(): AgentSessionDispatchOutcome {
+  ordinal += 1
+  return {
+    state: 'accepted',
+    providerIdentity: { provider: 'codex', threadId: THREAD, turnId: `turn-${ordinal}`, ordinal }
+  }
+}
+
+export function restTestSend(
+  text: string,
+  fence = 1
+): { envelope: AgentSessionMutationEnvelope; body: AgentJournalMessageItem } {
+  const body = hostTestMessage(text)
+  return {
+    body,
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: fence,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.send',
+        sessionId: SESSION,
+        fields: { body }
+      })
+    }
+  }
+}
+
+/** Every item and submission a reader was sent, whatever frame carried it. */
+export function readerSaw(events: readonly AgentSessionSubscribeEvent[]) {
+  const items = events.flatMap((event) =>
+    event.type === 'batch' ? event.batch.items : event.type === 'end' ? [] : event.page.items
+  )
+  const submissions = events.flatMap((event) =>
+    event.type === 'batch' ? event.batch.submissions : []
+  )
+  return {
+    texts: items.flatMap((item) =>
+      item.body.kind === 'message'
+        ? item.body.blocks.flatMap((block) => (block.type === 'text' ? [block.text] : []))
+        : []
+    ),
+    submissions
+  }
+}
+
+export function collectSubscriber(): {
+  events: AgentSessionSubscribeEvent[]
+  emit: (event: AgentSessionSubscribeEvent) => void
+} {
+  const events: AgentSessionSubscribeEvent[] = []
+  return { events, emit: (event) => events.push(event) }
+}
+
+export async function createRestTestRig(
+  deps: Partial<StructuredAgentSessionHostDeps> = {}
+): Promise<RestTestRig> {
+  resetHostTestOperationIds()
+  ordinal = 0
+  const root = await mkdtemp(join(tmpdir(), 'orca-rest-'))
+  const clock = { now: HOST_TEST_NOW }
+  const statusEvents: AgentSessionStatusEvent[] = []
+  const sink = { publish: vi.fn(), forget: vi.fn() }
+  let store = await AgentSessionRecordStore.open({
+    directory: join(root, 'store'),
+    hostId: 'local'
+  })
+  const adapter: RestTestAdapter = {
+    acquire: vi.fn(async ({ fence, spawnToken }) => ({
+      acquisitionGeneration: `generation-${++generations}`,
+      process: { hostId: 'local', pid: 4242, processStartTimeMs: 1_700_000_000_000, spawnToken },
+      link: {
+        linkId: `link-${fence}`,
+        handle: { provider: 'codex' as const, threadId: THREAD },
+        origin: store.getRecord(SESSION)?.providerHandleChain.length
+          ? ('resumed' as const)
+          : ('created' as const),
+        mintedAtFence: fence,
+        observedAt: clock.now
+      }
+    })),
+    closeSession: vi.fn(async () => true),
+    dispatch: vi.fn(async () => acceptedDispatch()),
+    acknowledgeSessionRelease: vi.fn(),
+    backgroundTaskState: vi.fn(() => undefined),
+    readOptions: vi.fn(async () => ({ models: [], current: { model: 'gpt-live' } }))
+  }
+  const hostFor = (overrides: Partial<StructuredAgentSessionHostDeps>) =>
+    new StructuredAgentSessionHost({
+      store,
+      adapter: {
+        ...adapter,
+        releaseAcquisition: vi.fn(async () => true),
+        cancelTurn: async () => ({ cancelled: true }),
+        answerPrompt: async ({ commit }) => commit(),
+        setOption: async () => undefined
+      },
+      journalRoot: root,
+      claimKeyId: 'key-1',
+      mintSpawnToken: () => 'spawn-a',
+      probeOwner: async () => ({ outcome: 'pid-absent' }),
+      now: () => clock.now,
+      statusSink: sink,
+      idleSweep: { intervalMs: SWEEP_INTERVAL_MS },
+      ...deps,
+      ...overrides
+    })
+  const rig: RestTestRig = {
+    root,
+    store,
+    host: hostFor({}),
+    adapter,
+    clock,
+    statusEvents,
+    sink,
+    restart: async (overrides = {}) => {
+      await rig.host.flushAllStreamedEvents().catch(() => undefined)
+      store = await AgentSessionRecordStore.open({
+        directory: join(root, 'store'),
+        hostId: 'local'
+      })
+      rig.store = store
+      rig.host = hostFor(overrides)
+      rig.host.subscribeStatus({ id: 'status', emit: (event) => statusEvents.push(event) })
+      return rig.host
+    },
+    dispose: async () => {
+      await rig.host.flushAllStreamedEvents().catch(() => undefined)
+      await rm(root, { recursive: true, force: true })
+    }
+  }
+  rig.host.subscribeStatus({ id: 'status', emit: (event) => statusEvents.push(event) })
+  return rig
+}
+
+/** Creates the chat, lists its tab, and sends one message so its journal is on disk. */
+export async function foundRestTestChat(rig: RestTestRig): Promise<void> {
+  const attached = await rig.host.attach(REST_TEST_CALLER, hostTestAttachParams(null))
+  if (!attached.ok) {
+    throw new Error(`attach refused: ${attached.refusal.code}`)
+  }
+  await rig.store.setSessionTabVisibility(SESSION, true)
+  const sent = await rig.host.send(REST_TEST_CALLER, restTestSend('hello', attached.fence))
+  if (!sent.ok) {
+    throw new Error(`send refused: ${sent.refusal.code}`)
+  }
+  await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalled())
+}
+
+/** Runs one sweep pass now, for a test that set `idleSweep.intervalMs` out of reach. */
+export function sweepOnce(host: StructuredAgentSessionHost): Promise<void> {
+  return host.collaboratorsForTests().lifetime.idleSweep.tick()
+}
+
+/** Waits long enough for several sweep ticks to have run. */
+export function sweepTicks(count = 6): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, SWEEP_INTERVAL_MS * count))
+}
+
+export { SESSION as REST_TEST_SESSION, THREAD as REST_TEST_THREAD }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-candidates.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-candidates.ts
index 46879aefe49a..50008ce79c44 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-candidates.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-candidates.ts
@@ -2,16 +2,11 @@
 //
 // A different question from storage: the durable record decides which markers are still present;
 // this decides which of those a resume may act on. The offer, the click and the pre-send check all
-// ask it, and all get the same answer: the marker stands until the user sends a newer message.
+// ask it, and all get the same answer.
 
-import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
-import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import type { AgentSessionResumeMarker } from '../../../shared/agent-session-resume-marker'
-import {
-  latestStructuredAgentSessionPrompt,
-  latestStructuredAgentSessionUserItem
-} from '../../../shared/structured-agent-session-projection'
+import { latestStructuredAgentSessionPrompt } from '../../../shared/structured-agent-session-projection'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import { adapterSupportsRecord } from './structured-agent-session-provider-support'
@@ -23,61 +18,29 @@ import {
 /** The only part of a live session this reads. */
 export type StructuredAgentSessionRestartJournalSource = { journal: AgentSessionJournal }
 
-export type StructuredAgentSessionRestartCandidateOptions = {
-  /** A continuation already in flight; its own submission is not newer user work. */
-  pendingContinuationId?: string
-}
-
 export type StructuredAgentSessionRestartCandidateReader = (
   markers: readonly AgentSessionResumeMarker[],
-  leaseState: 'must-be-released' | 'may-be-held',
-  options?: StructuredAgentSessionRestartCandidateOptions
+  leaseState: 'must-be-released' | 'may-be-held'
 ) => StructuredAgentSessionResumableSet
 
-/** The newest user message in a live session's journal, the same fact the predicate compares
- *  against a marker. Undefined when the session is not readable here, which decides nothing. */
-export function liveStructuredAgentSessionLatestUserItemId(
-  sessions: ReadonlyMap<string, StructuredAgentSessionRestartJournalSource>,
-  sessionId: string
-): string | null | undefined {
-  const session = sessions.get(sessionId)
-  return session
-    ? (latestStructuredAgentSessionUserItem(session.journal.snapshot().items)?.itemId ?? null)
-    : undefined
-}
-
 export function createStructuredAgentSessionRestartCandidateReader(deps: {
   /** The host's live session map; a marker's chat is readable once listing has revealed it. */
   sessions: ReadonlyMap<string, StructuredAgentSessionRestartJournalSource>
   getRecord: (sessionId: string) => AgentSessionRecord | null
   adapter: StructuredAgentSessionAdapter
+  /** Whether the chat moved on since the offer was taken; see the offer withdrawal. */
+  movedOn: (marker: AgentSessionResumeMarker) => boolean
 }): StructuredAgentSessionRestartCandidateReader {
-  return (markers, leaseState, options = {}) => {
-    const items = new Map<string, AgentJournalRenderItem[] | undefined>()
-    const itemsFor = (sessionId: string): AgentJournalRenderItem[] | undefined => {
-      if (items.has(sessionId)) {
-        return items.get(sessionId)
-      }
-      let snapshot = deps.sessions.get(sessionId)?.journal.snapshot().items
-      if (snapshot && options.pendingContinuationId) {
-        const ownItemId = agentJournalSubmissionKey(options.pendingContinuationId)
-        snapshot = snapshot.filter((item) => item.itemId !== ownItemId)
-      }
-      items.set(sessionId, snapshot)
-      return snapshot
-    }
-    return structuredAgentSessionResumableSet({
+  return (markers, leaseState) =>
+    structuredAgentSessionResumableSet({
       markers,
       getRecord: deps.getRecord,
       supportsRecord: (record) => adapterSupportsRecord(deps.adapter, record),
-      latestPrompt: (sessionId) => latestStructuredAgentSessionPrompt(itemsFor(sessionId) ?? []),
-      latestUserItemId: (sessionId) => {
-        const snapshot = itemsFor(sessionId)
-        return snapshot === undefined
-          ? undefined
-          : (latestStructuredAgentSessionUserItem(snapshot)?.itemId ?? null)
-      },
+      movedOn: deps.movedOn,
+      latestPrompt: (sessionId) =>
+        latestStructuredAgentSessionPrompt(
+          deps.sessions.get(sessionId)?.journal.snapshot().items ?? []
+        ),
       leaseState
     })
-  }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-cap.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-cap.test.ts
new file mode 100644
index 000000000000..9ded5b54d983
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-cap.test.ts
@@ -0,0 +1,86 @@
+// "Resume all" starts agents a few at a time. A continuation is a send, so a chat counts as started
+// once its agent took the message or its start failed — not when the message was accepted, which
+// is instant and would let every agent start at once.
+
+import { expect, it, vi } from 'vitest'
+import {
+  startStructuredAgentSessionContinuation,
+  type StructuredAgentSessionContinuationDeps
+} from './structured-agent-session-restart-continuation'
+import {
+  resumeStructuredAgentSessionsFromRestart,
+  STRUCTURED_AGENT_SESSION_RESUME_CONCURRENCY,
+  StructuredAgentSessionResumeAdmission
+} from './structured-agent-session-restart-resume-runner'
+import { marker } from './structured-agent-session-restart-resume-test-harness'
+
+type Handover = { dispatchState: string; reason?: string | null } | undefined
+
+it('holds each slot from accept until handover or rejection, and frees it when the wait ends (P2-27)', async () => {
+  const handovers = new Map<string, PromiseWithResolvers<Handover>>()
+  let waiting = 0
+  let mostWaiting = 0
+  const deps = (sessionId: string): StructuredAgentSessionContinuationDeps => ({
+    currentFence: () => 1,
+    send: vi.fn(async () => ({ ok: true, value: { submission: { dispatchState: 'pending' } } })),
+    awaitHandedOver: async () => {
+      const handover = Promise.withResolvers<Handover>()
+      handovers.set(sessionId, handover)
+      waiting += 1
+      mostWaiting = Math.max(mostWaiting, waiting)
+      try {
+        return await handover.promise
+      } finally {
+        waiting -= 1
+      }
+    },
+    awaitSettlement: async () => ({ dispatchState: 'accepted' }),
+    note: async () => undefined,
+    onNoteFailed: () => undefined
+  })
+  const sessions = Array.from({ length: 8 }, (_, index) => `session-${index}`)
+  const outcomes = resumeStructuredAgentSessionsFromRestart(
+    {
+      admission: new StructuredAgentSessionResumeAdmission(),
+      consumeMarker: async () => true,
+      resume: async (sessionId) => {
+        const started = await startStructuredAgentSessionContinuation(
+          deps(sessionId),
+          sessionId,
+          marker(),
+          'operation-1'
+        )
+        if ('done' in started && started.done.outcome === 'refused') {
+          throw new Error(started.done.reason ?? 'refused')
+        }
+      }
+    },
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the runner reads only each candidate's session id.
+    sessions.map((sessionId) => ({ sessionId }) as never),
+    'modal'
+  )
+  const settle = async (sessionId: string, handover: Handover) => {
+    await vi.waitFor(() => expect(handovers.has(sessionId)).toBe(true))
+    handovers.get(sessionId)!.resolve(handover)
+  }
+
+  await vi.waitFor(() => expect(waiting).toBe(STRUCTURED_AGENT_SESSION_RESUME_CONCURRENCY))
+  // Accepted but not yet handed over: a slow start keeps its slot.
+  await new Promise((resolve) => setTimeout(resolve, 20))
+  expect(handovers.size).toBe(STRUCTURED_AGENT_SESSION_RESUME_CONCURRENCY)
+  await settle('session-0', { dispatchState: 'pending' })
+  await settle('session-1', { dispatchState: 'rejected', reason: 'Codex could not start.' })
+  // The session closed, or too many waited: the wait proves nothing, and the slot is freed.
+  await settle('session-2', undefined)
+  for (const sessionId of sessions.slice(3)) {
+    await settle(sessionId, { dispatchState: 'pending' })
+  }
+
+  const results = await outcomes
+  expect(mostWaiting).toBe(STRUCTURED_AGENT_SESSION_RESUME_CONCURRENCY)
+  expect(results.find((result) => result.sessionId === 'session-1')).toMatchObject({
+    outcome: 'refused',
+    reason: 'Codex could not start.'
+  })
+  expect(results.filter((result) => result.outcome === 'resumed')).toHaveLength(7)
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-child-work.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-child-work.test.ts
index 63c778144eef..6d8514c830e9 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-child-work.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-child-work.test.ts
@@ -2,10 +2,7 @@
 
 import { expect, it, vi } from 'vitest'
 import { interruptedRestart } from './structured-agent-session-restart-interruption-test-harness'
-import {
-  HOST_TEST_SESSION as SESSION,
-  HOST_TEST_THREAD as THREAD
-} from './structured-agent-session-host-test-data'
+import { HOST_TEST_SESSION as SESSION } from './structured-agent-session-host-test-data'
 
 // What the user hit: the lead had finished, its subagent had not. The offer names the subagent
 // from the roster snapshot taken BEFORE the child stopped — the close that follows settles the
@@ -21,65 +18,22 @@ it('offers a chat whose subagent the restart stopped, named from the stop-time s
   ])
 })
 
-// On resume the provider restates what it lost in its own words, rewriting the row before the
-// continuation is dispatched. What the offer was admitted for still stands.
-it('continues a stopped subagent after the provider restates its row', async () => {
-  const { host, acquire, dispatch } = await interruptedRestart('children')
-  await host.hold(SESSION, 'pane')
-  const events = acquire.mock.calls[0]?.[0].events
-  if (!events) {
-    throw new Error('missing resumed provider event sink')
-  }
-  const admit = vi.spyOn(host.deps.store, 'admitMutationOperation')
-  admit.mockImplementationOnce(async (input) => {
-    events.appendItem(
-      { provider: 'codex', threadId: THREAD, turnId: 'settled-turn', ordinal: 2 },
-      {
-        kind: 'message',
-        role: 'system',
-        blocks: [
-          {
-            type: 'subagent-group',
-            groupId: 'settled-turn',
-            agents: [{ id: 'child-1', label: 'Review loop 4', state: 'completed' }]
-          }
-        ]
-      }
-    )
-    await host.flushStreamedEvents(SESSION)
-    admit.mockRestore()
-    return host.deps.store.admitMutationOperation(input)
-  })
+// The offer was admitted for the subagent's work; the continuation asks the agent to carry it on.
+it('continues a chat whose subagent the restart stopped', async () => {
+  const { host, dispatch } = await interruptedRestart('children')
   expect(
     (await host.restartResume.continueAfterRestart([SESSION], 'modal')).continued
   ).toMatchObject([{ outcome: 'continued' }])
   expect(dispatch).toHaveBeenCalledTimes(1)
-  host.release(SESSION, 'pane')
 })
 
-// The user opens the chat before choosing Resume, and the reattached provider restates its row.
+// The user opens the chat before choosing Resume: reading it starts nothing, so the offer stands.
 it('still offers and continues a chat the user opened before resuming', async () => {
   const { host, acquire, dispatch } = await interruptedRestart('children')
-  await host.hold(SESSION, 'pane')
-  const events = acquire.mock.calls[0]?.[0].events
-  if (!events) {
-    throw new Error('missing resumed provider event sink')
-  }
-  events.appendItem(
-    { provider: 'codex', threadId: THREAD, turnId: 'settled-turn', ordinal: 2 },
-    {
-      kind: 'message',
-      role: 'system',
-      blocks: [
-        {
-          type: 'subagent-group',
-          groupId: 'settled-turn',
-          agents: [{ id: 'child-1', label: 'Review loop 4', state: 'completed' }]
-        }
-      ]
-    }
-  )
-  await host.flushStreamedEvents(SESSION)
+  const unsubscribe = await host.subscribe({ id: 'pane', sessionId: SESSION, emit: vi.fn() })
+  await host.history({ sessionId: SESSION, direction: 'tail' })
+  unsubscribe()
+  expect(acquire).not.toHaveBeenCalled()
   expect(await host.restartResume.list()).toMatchObject([
     { sessionId: SESSION, activity: { tasks: [{ kind: 'agent', label: 'Review loop 4' }] } }
   ])
@@ -87,5 +41,4 @@ it('still offers and continues a chat the user opened before resuming', async ()
     (await host.restartResume.continueAfterRestart([SESSION], 'modal')).continued
   ).toMatchObject([{ outcome: 'continued' }])
   expect(dispatch).toHaveBeenCalledTimes(1)
-  host.release(SESSION, 'pane')
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-envelope.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-envelope.ts
new file mode 100644
index 000000000000..cfa2c7b502ee
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-envelope.ts
@@ -0,0 +1,77 @@
+// The restart continuation as a message: its body, which depends on the marker alone, and its
+// identity, which is one per resume action.
+
+import { createHash } from 'node:crypto'
+import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import { restartContinuationMessage } from '../../../shared/agent-session-restart-continuation'
+import type { AgentSessionResumeMarker } from '../../../shared/agent-session-resume-marker'
+import type { AgentSessionMutationEnvelope } from '../../../shared/agent-session-wire'
+
+/** The message body, built once so both the send and any test read the same text. */
+export function restartContinuationBody(marker: AgentSessionResumeMarker): AgentJournalMessageItem {
+  return {
+    kind: 'message',
+    role: 'user',
+    blocks: [{ type: 'text', text: restartContinuationMessage(marker) }]
+  }
+}
+
+const hex16 = (parts: readonly unknown[]): string =>
+  createHash('sha256').update(JSON.stringify(parts)).digest('hex').slice(0, 16)
+
+/** Names the offer: every continuation any of its actions sends carries it, and nothing else does. */
+function restartOfferTag(marker: AgentSessionResumeMarker): string {
+  return hex16([marker.teardownId, marker.sessionId])
+}
+
+/** One resume action's continuation: the offer's tag, then the action's own part, so a retry is a
+ *  new message, never a replay of the one that failed. Dated by the action, not the quit: the
+ *  ledger refuses a new id dated more than a day back, and an offer has no expiry. */
+export function restartContinuationId(
+  marker: AgentSessionResumeMarker,
+  operationId: string,
+  actionAt: number
+): string {
+  return `${Math.trunc(actionAt).toString().padStart(13, '0')}-${restartOfferTag(marker)}${hex16([
+    marker.teardownId,
+    marker.sessionId,
+    marker.work.kind,
+    marker.work.id,
+    marker.providerHandleRoot,
+    operationId
+  ])}`
+}
+
+/** Whether a message is a continuation one of this offer's resume actions sent, read off its id. */
+export function isRestartContinuationOf(
+  marker: AgentSessionResumeMarker,
+  clientMessageId: string
+): boolean {
+  return /^\d{13}-[0-9a-f]{32}$/.test(clientMessageId)
+    ? clientMessageId.slice(14, 30) === restartOfferTag(marker)
+    : false
+}
+
+/** The fence only fills the envelope: admission names this send by its operation id, not a fence. */
+export function restartContinuationEnvelope(
+  sessionId: string,
+  fence: number,
+  marker: AgentSessionResumeMarker,
+  continuationId: string
+): { envelope: AgentSessionMutationEnvelope; body: AgentJournalMessageItem } {
+  const body = restartContinuationBody(marker)
+  return {
+    body,
+    envelope: {
+      sessionId,
+      clientOperationId: continuationId,
+      expectedRuntimeFence: fence,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.send',
+        sessionId,
+        fields: { body }
+      })
+    }
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-wait.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-wait.test.ts
new file mode 100644
index 000000000000..cfbdd9ce35e1
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-wait.test.ts
@@ -0,0 +1,112 @@
+// The restart continuation is accepted like any send, so its verdict is its delivery: a cold start
+// longer than the legacy client wait must not turn a continuation that went through into an
+// "unconfirmed" one.
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types'
+import { structuredAgentSessionRestartResumeSurfaces } from './structured-agent-session-restart-resume-wiring'
+import { StructuredAgentSessionSendSettlement } from './structured-agent-session-send-settlement'
+
+const SESSION = 'session-1'
+const MESSAGE = 'continuation-1'
+
+let submission: AgentJournalSubmission
+const journal = {
+  submissions: (): AgentJournalSubmission[] => [submission],
+  cursor: () => ({ epoch: 'epoch-1', sequence: 1 })
+}
+
+beforeEach(() => {
+  vi.useFakeTimers()
+  submission = {
+    clientMessageId: MESSAGE,
+    fence: 2,
+    payloadFingerprint: 'fingerprint',
+    dispatchState: 'pending',
+    providerItemId: null,
+    reason: null,
+    submittedAt: 1,
+    resolvedAt: null,
+    handoverRecorded: true
+  }
+})
+
+afterEach(() => {
+  vi.useRealTimers()
+})
+
+describe('the restart continuation waits for its delivery (W18)', () => {
+  it('reaches accepted after a 40 s cold start, with nothing filed as unconfirmed', async () => {
+    const settlement = new StructuredAgentSessionSendSettlement(() => journal)
+    const surfaces = structuredAgentSessionRestartResumeSurfaces(
+      {
+        revealSession: async () => ({ readable: true }),
+        send: async () => {
+          throw new Error('not used')
+        },
+        waitForSendSettlement: settlement.wait
+      },
+      () => 0
+    )
+
+    const verdict = surfaces.awaitSendSettlement(SESSION, MESSAGE)
+    await vi.advanceTimersByTimeAsync(40_000)
+    submission = { ...submission, dispatchState: 'accepted', providerItemId: 'item-1' }
+    settlement.publish(SESSION, journal)
+
+    await expect(verdict).resolves.toMatchObject({
+      value: { submission: { dispatchState: 'accepted' } }
+    })
+  })
+})
+
+describe('a restart batch holds a chat until its continuation is handed over', () => {
+  function surfacesOver(settlement: StructuredAgentSessionSendSettlement) {
+    return structuredAgentSessionRestartResumeSurfaces(
+      {
+        revealSession: async () => ({ readable: true }),
+        send: async () => {
+          throw new Error('not used')
+        },
+        waitForSendSettlement: settlement.wait
+      },
+      () => 0
+    )
+  }
+
+  it('keeps waiting through a slow start and resolves once the agent takes the message', async () => {
+    const settlement = new StructuredAgentSessionSendSettlement(() => journal)
+    let released = false
+    const handedOver = surfacesOver(settlement)
+      .awaitSendHandedOver(SESSION, MESSAGE)
+      .then((result) => {
+        released = true
+        return result
+      })
+    await vi.advanceTimersByTimeAsync(5 * 60_000)
+    expect(released).toBe(false)
+    // Handed over: still pending at the provider, no longer queued.
+    submission = { ...submission, handedOverAt: 2 }
+    settlement.publish(SESSION, journal)
+    await expect(handedOver).resolves.toMatchObject({
+      value: { submission: { dispatchState: 'pending', handedOverAt: 2 } }
+    })
+  })
+
+  it('resolves once the start fails and the message is rejected', async () => {
+    const settlement = new StructuredAgentSessionSendSettlement(() => journal)
+    const handedOver = surfacesOver(settlement).awaitSendHandedOver(SESSION, MESSAGE)
+    submission = { ...submission, dispatchState: 'rejected', reason: 'Codex could not start.' }
+    settlement.publish(SESSION, journal)
+    await expect(handedOver).resolves.toMatchObject({
+      value: { submission: { dispatchState: 'rejected' } }
+    })
+  })
+
+  it('resolves undefined when the session closes first', async () => {
+    const settlement = new StructuredAgentSessionSendSettlement(() => journal)
+    const handedOver = surfacesOver(settlement).awaitSendHandedOver(SESSION, MESSAGE)
+    settlement.closeSession(SESSION)
+    await expect(handedOver).resolves.toBeUndefined()
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.test.ts
index 2d558f8f0287..0fe36994cd7c 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.test.ts
@@ -6,13 +6,22 @@ import {
   AGENT_SESSION_RESTART_NOT_CONNECTED_NOTE
 } from '../../../shared/agent-session-restart-continuation'
 import {
-  continueStructuredAgentSessionAfterRestart,
   RestartContinuationSupersededError,
+  startStructuredAgentSessionContinuation,
   type StructuredAgentSessionContinuationDeps
 } from './structured-agent-session-restart-continuation'
 
+/** The whole continuation: handed over, then its verdict. */
+async function continueStructuredAgentSessionAfterRestart(
+  ...args: Parameters<typeof startStructuredAgentSessionContinuation>
+) {
+  const started = await startStructuredAgentSessionContinuation(...args)
+  return 'done' in started ? started.done : started.verdict()
+}
+
 function dependencies(
-  settledDispatch: 'accepted' | 'pending' | 'unknown' | 'rejected'
+  settledDispatch: 'accepted' | 'pending' | 'unknown' | 'rejected',
+  handedOver: 'pending' | 'rejected' | undefined = 'pending'
 ): StructuredAgentSessionContinuationDeps & {
   note: ReturnType<typeof vi.fn>
   send: ReturnType<typeof vi.fn>
@@ -27,6 +36,14 @@ function dependencies(
       dispatchState: settledDispatch,
       reason: settledDispatch === 'rejected' ? 'provider_refused' : null
     })),
+    awaitHandedOver: vi.fn(async () =>
+      handedOver
+        ? {
+            dispatchState: handedOver,
+            reason: handedOver === 'rejected' ? 'Codex could not start.' : null
+          }
+        : undefined
+    ),
     note: vi.fn(async () => undefined),
     onNoteFailed: vi.fn()
   }
@@ -36,7 +53,7 @@ it('reports an accepted continuation and records its note', async () => {
   const deps = dependencies('accepted')
 
   await expect(
-    continueStructuredAgentSessionAfterRestart(deps, SESSION, marker())
+    continueStructuredAgentSessionAfterRestart(deps, SESSION, marker(), 'operation-1')
   ).resolves.toEqual({
     sessionId: SESSION,
     outcome: 'continued'
@@ -58,20 +75,20 @@ it.each([
     const deps = dependencies(settled)
 
     await expect(
-      continueStructuredAgentSessionAfterRestart(deps, SESSION, marker())
+      continueStructuredAgentSessionAfterRestart(deps, SESSION, marker(), 'operation-1')
     ).resolves.toEqual(expected)
     expect(deps.note).toHaveBeenCalledExactlyOnceWith(...note)
   }
 )
 
-it('notes a superseded continuation in the chat and still reports the refusal', async () => {
+it("writes nothing in the chat when the user's own message came first, and still refuses", async () => {
   const deps = dependencies('accepted')
   deps.send.mockRejectedValue(new RestartContinuationSupersededError())
 
   await expect(
-    continueStructuredAgentSessionAfterRestart(deps, SESSION, marker())
+    continueStructuredAgentSessionAfterRestart(deps, SESSION, marker(), 'operation-1')
   ).rejects.toBeInstanceOf(RestartContinuationSupersededError)
-  expect(deps.note).toHaveBeenCalledExactlyOnceWith(...REFUSED)
+  expect(deps.note).not.toHaveBeenCalled()
 })
 
 // An ownership refusal would meet the user's own message too, so the note gives no advice to send one.
@@ -83,7 +100,7 @@ it.each([
   deps.send.mockResolvedValue({ ok: false, refusal: { code } })
 
   await expect(
-    continueStructuredAgentSessionAfterRestart(deps, SESSION, marker())
+    continueStructuredAgentSessionAfterRestart(deps, SESSION, marker(), 'operation-1')
   ).resolves.toEqual({
     sessionId: SESSION,
     outcome: 'refused',
@@ -98,7 +115,7 @@ it('reports an unattached chat without sending', async () => {
   deps.currentFence = () => null
 
   await expect(
-    continueStructuredAgentSessionAfterRestart(deps, SESSION, marker())
+    continueStructuredAgentSessionAfterRestart(deps, SESSION, marker(), 'operation-1')
   ).resolves.toEqual({
     sessionId: SESSION,
     outcome: 'refused',
@@ -106,3 +123,45 @@ it('reports an unattached chat without sending', async () => {
   })
   expect(deps.send).not.toHaveBeenCalled()
 })
+
+// A start that failed rejects the continuation before any provider saw it: that is the verdict.
+it('reports a continuation rejected at handover without waiting for the provider', async () => {
+  const deps = dependencies('accepted', 'rejected')
+
+  await expect(
+    continueStructuredAgentSessionAfterRestart(deps, SESSION, marker(), 'operation-1')
+  ).resolves.toEqual({ sessionId: SESSION, outcome: 'refused', reason: 'Codex could not start.' })
+  expect(deps.awaitSettlement).not.toHaveBeenCalled()
+  expect(deps.note).toHaveBeenCalledExactlyOnceWith(...REFUSED)
+})
+
+// The start completes once the agent took the message; the provider's answer is a later verdict.
+it('returns at handover and leaves the provider verdict to be awaited', async () => {
+  const deps = dependencies('accepted')
+
+  const started = await startStructuredAgentSessionContinuation(
+    deps,
+    SESSION,
+    marker(),
+    'operation-1'
+  )
+
+  expect(deps.awaitHandedOver).toHaveBeenCalledOnce()
+  expect(deps.awaitSettlement).not.toHaveBeenCalled()
+  if (!('verdict' in started)) {
+    throw new Error('expected a handed-over continuation')
+  }
+  await expect(started.verdict()).resolves.toEqual({ sessionId: SESSION, outcome: 'continued' })
+  expect(deps.note).toHaveBeenCalledOnce()
+})
+
+// A handover wait that ends without an answer — the session closed, or too many waited — proves
+// nothing, so the provider's verdict still decides.
+it('still awaits the verdict when the handover wait ends unanswered', async () => {
+  const deps = dependencies('unknown', undefined)
+
+  await expect(
+    continueStructuredAgentSessionAfterRestart(deps, SESSION, marker(), 'operation-1')
+  ).resolves.toEqual({ sessionId: SESSION, outcome: 'unknown' })
+  expect(deps.note).toHaveBeenCalledExactlyOnceWith(...UNCONFIRMED)
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.ts
index c025c0dc46af..9dd049293856 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.ts
@@ -1,27 +1,31 @@
 // Asking an interrupted agent to carry on, on the user's opt-in.
 //
-// Reattaching and continuing are SEPARATE operations: `resume` reattaches and sends nothing; this
-// adds one message on top of it. Both the restart prompt and an opted-in launch come here, so a
-// SETTING can reach this send — acceptable because the work is the user's own, the message asks the
-// agent to verify its last action before repeating it, and the launch toast reports what happened.
+// The continuation is a send like any other: accepted into the conversation, and delivered by the
+// session's delivery loop, which starts the agent. Both the restart prompt and an opted-in launch
+// come here, so a SETTING can reach this send — acceptable because the work is the user's own, the
+// message asks the agent to verify its last action before repeating it, and the launch toast
+// reports what happened.
 
 import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import {
+  readAgentSessionFailureFact,
+  type UnreadAgentSessionFailureFact
+} from '../../../shared/agent-session-failure'
+import type { AgentSessionRefusalReference } from '../../../shared/agent-session-wire-refusals'
 import type {
   AgentSessionMutationEnvelope,
   AgentSessionMutationResult,
   AgentSessionSendResult
 } from '../../../shared/agent-session-wire'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
-import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
 import {
   AGENT_SESSION_RESTART_CONTINUATION_NOTE,
   AGENT_SESSION_RESTART_CONTINUATION_REFUSED_NOTE,
   AGENT_SESSION_RESTART_CONTINUATION_UNCONFIRMED_NOTE,
-  AGENT_SESSION_RESTART_NOT_CONNECTED_NOTE,
-  restartContinuationMessage
+  AGENT_SESSION_RESTART_NOT_CONNECTED_NOTE
 } from '../../../shared/agent-session-restart-continuation'
 import { AgentSessionPreDispatchError } from './structured-agent-session-operation-settlement'
-import { createHash } from 'node:crypto'
+import { restartContinuationEnvelope } from './structured-agent-session-restart-continuation-envelope'
 import type { AgentSessionResumeMarker } from '../../../shared/agent-session-resume-marker'
 
 /**
@@ -40,11 +44,16 @@ export type StructuredAgentSessionContinuationOutcome = {
   sessionId: string
   outcome: 'continued' | 'pending' | 'unknown' | 'refused'
   reason?: string
+  /** The refusal that kept the agent from starting; `reason` is then its code. */
+  refusal?: AgentSessionRefusalReference
 }
 
 /** The slice of the host one continuation needs. Structural so this module never imports the host. */
 export type StructuredAgentSessionContinuationHost = {
-  sessions: ReadonlyMap<string, { journal: AgentSessionJournal; fence: number }>
+  sessions: ReadonlyMap<string, { journal: AgentSessionJournal }>
+  /** The fence a conversation write carries; null when this host has no record of the session.
+   *  The send opens the conversation itself, so a closed one still answers. */
+  conversationFence: (sessionId: string) => number | null
   send: (input: {
     envelope: AgentSessionMutationEnvelope
     body: AgentJournalMessageItem
@@ -54,15 +63,15 @@ export type StructuredAgentSessionContinuationHost = {
     sessionId: string,
     clientMessageId: string
   ) => Promise<{ value: AgentSessionSendResult } | undefined>
+  awaitSendHandedOver: (
+    sessionId: string,
+    clientMessageId: string
+  ) => Promise<{ value: AgentSessionSendResult } | undefined>
   onNoteFailed: (sessionId: string, error: unknown) => void
   now: () => number
-  /** Whether the marker is still an offer, with the continuation's own submission set aside.
-   *  Re-asked right before dispatch, so a newer user message refuses the send; a provider turn
-   *  running then does not, since both providers queue a message sent mid-turn. */
-  stillResumable: (
-    marker: AgentSessionResumeMarker,
-    options: { pendingContinuationId: string }
-  ) => boolean
+  /** Whether the marker is still an offer. Asked at acceptance, inside the session lock, so the
+   *  first message accepted since the restart decides: the user's, or this continuation. */
+  stillResumable: (marker: AgentSessionResumeMarker) => boolean
 }
 
 /** Binds one continuation to the host: the superseded check before dispatch, the settlement
@@ -72,52 +81,39 @@ export function restartContinuationDeps(
   marker: AgentSessionResumeMarker
 ): StructuredAgentSessionContinuationDeps {
   return {
-    currentFence: (sessionId) => host.sessions.get(sessionId)?.fence ?? null,
+    currentFence: host.conversationFence,
     send: (input) =>
       host.send({
         ...input,
         beforeRun: () => {
-          if (
-            !host.stillResumable(marker, {
-              pendingContinuationId: input.envelope.clientOperationId
-            })
-          ) {
+          if (!host.stillResumable(marker)) {
             throw new RestartContinuationSupersededError()
           }
         }
       }),
     awaitSettlement: async (sessionId, clientMessageId) =>
       (await host.awaitSendSettlement(sessionId, clientMessageId))?.value.submission,
+    awaitHandedOver: async (sessionId, clientMessageId) =>
+      (await host.awaitSendHandedOver(sessionId, clientMessageId))?.value.submission,
     onNoteFailed: host.onNoteFailed,
     note: restartNoteWriter(host)
   }
 }
 
-/** The note for a reattach that failed before any continuation was attempted. */
-export function noteRestartReattachFailed(
-  host: StructuredAgentSessionContinuationHost,
-  sessionId: string
-): Promise<void> {
-  return noteNotContinued(
-    { note: restartNoteWriter(host), onNoteFailed: host.onNoteFailed },
-    sessionId,
-    'not-connected'
-  )
-}
-
 /** Writes a host-authored status note into the chat. */
 function restartNoteWriter(
-  host: Pick<StructuredAgentSessionContinuationHost, 'sessions' | 'now'>
+  host: Pick<StructuredAgentSessionContinuationHost, 'sessions' | 'conversationFence' | 'now'>
 ): StructuredAgentSessionContinuationDeps['note'] {
   return async (sessionId, text, tone) => {
     const session = host.sessions.get(sessionId)
-    if (!session) {
+    const fence = host.conversationFence(sessionId)
+    if (!session || fence === null) {
       return
     }
     await session.journal.appendItem(
       { provider: 'orca', clientMessageId: `restart-continuation:${sessionId}:${host.now()}` },
       { kind: 'status', text, ...(tone ? { tone } : {}) },
-      { fence: session.fence }
+      { fence }
     )
   }
 }
@@ -129,59 +125,25 @@ const OWNERSHIP_REFUSALS = new Set([
   'execution_owner_reconciling'
 ])
 
+/** The user's own message was accepted first; the offer is spent, and nothing failed. */
+export const RESTART_CONTINUATION_SUPERSEDED = 'agent_session_restart_work_superseded'
+
 /** Only this pre-dispatch failure proves a thrown send did not deliver. */
 export class RestartContinuationSupersededError extends AgentSessionPreDispatchError {
   constructor() {
-    super('agent_session_restart_work_superseded')
+    super(RESTART_CONTINUATION_SUPERSEDED)
     this.name = 'RestartContinuationSupersededError'
   }
 }
 
-/** The message body, built once so both the send and any test read the same text. */
-export function restartContinuationBody(marker: AgentSessionResumeMarker): AgentJournalMessageItem {
-  return {
-    kind: 'message',
-    role: 'user',
-    blocks: [{ type: 'text', text: restartContinuationMessage(marker) }]
-  }
-}
-
-/** The fence only fills the envelope: admission names this send by its operation id, not a fence. */
-export function restartContinuationEnvelope(
-  sessionId: string,
-  fence: number,
-  marker: AgentSessionResumeMarker
-): { envelope: AgentSessionMutationEnvelope; body: AgentJournalMessageItem } {
-  const body = restartContinuationBody(marker)
-  return {
-    body,
-    envelope: {
-      sessionId,
-      // The same interrupted work must reach the durable ledger with the same message identity.
-      clientOperationId: `${marker.recordedAt.toString().padStart(13, '0')}-${createHash('sha256')
-        .update(
-          JSON.stringify([
-            marker.teardownId,
-            sessionId,
-            marker.work.kind,
-            marker.work.id,
-            marker.providerHandleRoot
-          ])
-        )
-        .digest('hex')
-        .slice(0, 32)}`,
-      expectedRuntimeFence: fence,
-      payloadFingerprint: computeAgentSessionPayloadFingerprint({
-        method: 'agentSession.send',
-        sessionId,
-        fields: { body }
-      })
-    }
-  }
+type ContinuationSubmission = {
+  dispatchState?: string
+  reason?: string | null
+  rejection?: UnreadAgentSessionFailureFact
 }
 
 export type StructuredAgentSessionContinuationDeps = {
-  /** Runtime fence as it stands now; null when the session is not attached. */
+  /** Runtime fence as it stands now; null when this host has no record of the session. */
   currentFence: (sessionId: string) => number | null
   send: (input: {
     envelope: AgentSessionMutationEnvelope
@@ -202,7 +164,13 @@ export type StructuredAgentSessionContinuationDeps = {
   awaitSettlement: (
     sessionId: string,
     clientMessageId: string
-  ) => Promise<{ dispatchState?: string; reason?: string | null } | undefined>
+  ) => Promise<ContinuationSubmission | undefined>
+  /** Waits until the send is handed to a started agent or rejected. Undefined when the wait ended
+   *  first — the session closed, or too many waited — which proves neither. */
+  awaitHandedOver: (
+    sessionId: string,
+    clientMessageId: string
+  ) => Promise<ContinuationSubmission | undefined>
   /** Records a host-authored journal note: that this send was Orca's, not the user's, or that the
    *  chat did not carry on. `tone` is a display hint older clients render as plain text. */
   note: (sessionId: string, text: string, tone?: 'error' | 'warning') => Promise<void>
@@ -211,26 +179,61 @@ export type StructuredAgentSessionContinuationDeps = {
   onNoteFailed: (sessionId: string, error: unknown) => void
 }
 
+/** A continuation handed to its agent, or already decided. */
+export type StartedStructuredAgentSessionContinuation =
+  | { done: StructuredAgentSessionContinuationOutcome }
+  | { verdict: () => Promise<StructuredAgentSessionContinuationOutcome> }
+
 /**
- * Sends the continuation to ONE already-reconnected session.
- *
- * The caller must have reconnected it first: this deliberately does not reconnect, so that every
- * eligibility check, the admission gate and the consume-once ordering stay in the resume path and
- * are not re-implemented here.
+ * Sends the continuation to ONE session and returns once the agent has taken it or its start
+ * failed — the point a restart batch counts a start as done. What the provider then answered is
+ * the `verdict`, awaited separately so a slow answer does not hold the batch.
  */
-export async function continueStructuredAgentSessionAfterRestart(
+export async function startStructuredAgentSessionContinuation(
   deps: StructuredAgentSessionContinuationDeps,
   sessionId: string,
-  marker: AgentSessionResumeMarker
-): Promise<StructuredAgentSessionContinuationOutcome> {
-  let result: StructuredAgentSessionContinuationOutcome
+  marker: AgentSessionResumeMarker,
+  /** This action's continuation, as its offer recorded it. */
+  continuationId: string
+): Promise<StartedStructuredAgentSessionContinuation> {
+  let started: StartedStructuredAgentSessionContinuation
   try {
-    result = await sendContinuation(deps, sessionId, marker)
+    started = await sendContinuation(deps, sessionId, marker, continuationId)
   } catch (error) {
-    await noteNotContinued(deps, sessionId, 'refused')
+    // The user's own message came first: nothing failed, so the chat says nothing.
+    if (!(error instanceof RestartContinuationSupersededError)) {
+      await noteNotContinued(deps, sessionId, 'refused')
+    }
     throw error
   }
-  if (result.outcome !== 'continued') {
+  if ('done' in started) {
+    await noteOutcome(deps, sessionId, started.done)
+    return started
+  }
+  const { verdict } = started
+  return {
+    verdict: async () => {
+      const outcome = await verdict()
+      await noteOutcome(deps, sessionId, outcome)
+      return outcome
+    }
+  }
+}
+
+async function noteOutcome(
+  deps: Pick<StructuredAgentSessionContinuationDeps, 'note' | 'onNoteFailed'>,
+  sessionId: string,
+  result: StructuredAgentSessionContinuationOutcome
+): Promise<void> {
+  if (result.outcome === 'continued') {
+    // Only an accepted dispatch gets the note: it is a durable claim that Orca asked this agent to
+    // carry on. Best effort — losing it must not turn a delivered continuation into a failure.
+    try {
+      await deps.note(sessionId, AGENT_SESSION_RESTART_CONTINUATION_NOTE)
+    } catch (error) {
+      deps.onNoteFailed(sessionId, error)
+    }
+  } else {
     await noteNotContinued(
       deps,
       sessionId,
@@ -241,7 +244,6 @@ export async function continueStructuredAgentSessionAfterRestart(
           : 'refused'
     )
   }
-  return result
 }
 
 /** The chat itself carries the failure, so it survives the toast, a dismissed record and a restart,
@@ -269,13 +271,14 @@ async function noteNotContinued(
 async function sendContinuation(
   deps: StructuredAgentSessionContinuationDeps,
   sessionId: string,
-  marker: AgentSessionResumeMarker
-): Promise<StructuredAgentSessionContinuationOutcome> {
+  marker: AgentSessionResumeMarker,
+  continuationId: string
+): Promise<StartedStructuredAgentSessionContinuation> {
   const fence = deps.currentFence(sessionId)
   if (fence === null) {
-    return { sessionId, outcome: 'refused', reason: 'agent_session_not_attached' }
+    return { done: { sessionId, outcome: 'refused', reason: 'agent_session_not_attached' } }
   }
-  const { envelope, body } = restartContinuationEnvelope(sessionId, fence, marker)
+  const { envelope, body } = restartContinuationEnvelope(sessionId, fence, marker, continuationId)
   const sent = await deps.send({ envelope, body }).catch((error: unknown) => {
     if (error instanceof AgentSessionPreDispatchError) {
       throw error
@@ -285,46 +288,64 @@ async function sendContinuation(
     return null
   })
   if (!sent) {
-    return { sessionId, outcome: 'unknown' }
+    return { done: { sessionId, outcome: 'unknown' } }
   }
   if (!sent.ok) {
     return {
-      sessionId,
-      outcome: 'refused',
-      reason: sent.refusal?.code ?? 'agent_session_send_failed'
+      done: {
+        sessionId,
+        outcome: 'refused',
+        reason: sent.refusal?.code ?? 'agent_session_send_failed'
+      }
     }
   }
-  // The send result carries the dispatch as it stood when Orca took the message, which for a normal
-  // successful send is `pending`. Judging it here would report every delivered continuation as
-  // pending and never write the note, so the settled value is what decides.
-  const submission =
-    (await deps.awaitSettlement(sessionId, envelope.clientOperationId).catch(() => undefined)) ??
-    sent.value?.submission
+  const clientMessageId = envelope.clientOperationId
+  const handedOver = await deps.awaitHandedOver(sessionId, clientMessageId).catch(() => undefined)
+  if (handedOver?.dispatchState === 'rejected') {
+    return { done: refusedBy(sessionId, handedOver) }
+  }
+  return {
+    verdict: async () =>
+      verdictOf(
+        sessionId,
+        // The send result carries the dispatch as it stood when Orca took the message, which for
+        // a normal successful send is `pending`, so the settled value is what decides.
+        (await deps.awaitSettlement(sessionId, clientMessageId).catch(() => undefined)) ??
+          handedOver ??
+          sent.value?.submission
+      )
+  }
+}
+
+function refusedBy(
+  sessionId: string,
+  submission: ContinuationSubmission
+): StructuredAgentSessionContinuationOutcome {
+  // A start the agent was refused files that refusal's code, which the failure guidance keys on.
+  const refusal = readAgentSessionFailureFact(submission.rejection)?.refusal
+  return {
+    sessionId,
+    outcome: 'refused',
+    reason: refusal?.code ?? submission.reason ?? 'agent_session_dispatch_rejected',
+    ...(refusal ? { refusal } : {})
+  }
+}
+
+function verdictOf(
+  sessionId: string,
+  submission: ContinuationSubmission | undefined
+): StructuredAgentSessionContinuationOutcome {
   const dispatch = submission?.dispatchState
-  if (dispatch === 'rejected') {
-    return {
-      sessionId,
-      outcome: 'refused',
-      reason: submission?.reason ?? 'agent_session_dispatch_rejected'
-    }
+  if (submission && dispatch === 'rejected') {
+    return refusedBy(sessionId, submission)
   }
   if (dispatch === 'pending') {
     // Still pending after settlement gave up: handed off, never confirmed.
     return { sessionId, outcome: 'pending' }
   }
-  if (dispatch !== 'accepted') {
-    // `unknown`, or a peer that reported no state at all. Delivery is unverifiable, so this claims
-    // neither success nor failure — and writes no note saying the agent was asked to continue.
-    return { sessionId, outcome: 'unknown' }
-  }
-  // Only an accepted dispatch gets the note: it is a durable claim that Orca asked this agent to
-  // carry on, and it must not sit beside a message the provider refused or never confirmed. Best
-  // effort beyond that — losing the note must not turn a delivered continuation into a failure —
-  // but reported, never swallowed.
-  try {
-    await deps.note(sessionId, AGENT_SESSION_RESTART_CONTINUATION_NOTE)
-  } catch (error) {
-    deps.onNoteFailed(sessionId, error)
-  }
-  return { sessionId, outcome: 'continued' }
+  // `unknown`, or a peer that reported no state at all: delivery is unverifiable, so this claims
+  // neither success nor failure — and writes no note saying the agent was asked to continue.
+  return dispatch === 'accepted'
+    ? { sessionId, outcome: 'continued' }
+    : { sessionId, outcome: 'unknown' }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-filing.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-filing.test.ts
index 5dcc3ca7690c..f1fe0a40b421 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-filing.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-filing.test.ts
@@ -2,21 +2,18 @@ import { afterEach, expect, it, vi } from 'vitest'
 import { AgentSessionRecoveryCapsule } from '../../runtime/agent-session-recovery-capsule'
 import {
   AGENT_SESSION_RESTART_CONTINUATION_REFUSED_NOTE,
-  AGENT_SESSION_RESTART_CONTINUATION_UNCONFIRMED_NOTE,
-  AGENT_SESSION_RESTART_NOT_CONNECTED_NOTE
+  AGENT_SESSION_RESTART_CONTINUATION_UNCONFIRMED_NOTE
 } from '../../../shared/agent-session-restart-continuation'
-import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
-import { AgentSessionJournal } from '../agent-session-journal/journal-store'
-import { latestStructuredAgentSessionUserItem } from '../../../shared/structured-agent-session-projection'
 import { StructuredAgentSessionResumeAdmission } from './structured-agent-session-restart-resume-runner'
+import { STRUCTURED_AGENT_SESSION_RESTART_CONTINUATION_CALLER } from './structured-agent-session-restart-resume-wiring'
 import {
   interruptedRestart,
   statusNotes
 } from './structured-agent-session-restart-interruption-test-harness'
+import { CALLER, envelope } from './structured-agent-session-host-test-harness'
 import {
   HOST_TEST_NOW as NOW,
   HOST_TEST_SESSION as SESSION,
-  HOST_TEST_THREAD as THREAD,
   hostTestMessage
 } from './structured-agent-session-host-test-data'
 
@@ -24,206 +21,71 @@ import {
 
 afterEach(() => vi.restoreAllMocks())
 
-function providerEvents(acquire: Awaited<ReturnType<typeof interruptedRestart>>['acquire']) {
-  const events = acquire.mock.calls[0]?.[0].events
-  if (!events) {
-    throw new Error('missing resumed provider event sink')
-  }
-  return events
-}
-
-// The reported case: after the reattach the provider replays a queued message, which the chat
-// journals as a newer user turn, so the continuation is refused just before dispatch.
-it('files a continuation superseded by a replayed message, lists it and says so in the chat', async () => {
-  const { host, acquire, dispatch, root } = await interruptedRestart()
-  await host.restartResume.list()
-  await host.hold(SESSION, 'pane')
-  const events = providerEvents(acquire)
-  const append = AgentSessionJournal.prototype.appendSubmission
-  vi.spyOn(AgentSessionJournal.prototype, 'appendSubmission').mockImplementationOnce(
-    async function (this: AgentSessionJournal, input) {
-      const cursor = await append.call(this, input)
-      events.appendItem(
-        { provider: 'codex', threadId: THREAD, turnId: 'replayed-turn', ordinal: 1 },
-        hostTestMessage('A queued notification the provider replayed')
-      )
-      return cursor
-    }
-  )
-
-  const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
-
-  expect(dispatch).not.toHaveBeenCalled()
-  expect(result.resumed).toMatchObject([
-    { outcome: 'refused', reason: 'agent_session_restart_work_superseded' }
-  ])
-  const failure = {
-    sessionId: SESSION,
-    outcome: 'refused',
-    reason: 'agent_session_restart_work_superseded'
-  }
-  expect(result.failed).toMatchObject([failure])
-  expect(await host.restartResume.listFailures()).toMatchObject([failure])
-  expect(await new AgentSessionRecoveryCapsule(root).listFailed(NOW)).toHaveLength(1)
-  expect(statusNotes(host)).toContainEqual({
-    text: AGENT_SESSION_RESTART_CONTINUATION_REFUSED_NOTE,
-    tone: 'error'
-  })
-  host.release(SESSION, 'pane')
-})
-
-// Nothing was attempted and nothing is owed: the user moved on between listing and acting.
+// Nothing was owed once the user's own message came first: the offer is spent and nothing is filed.
 it('files nothing for a chat the user moved on in before its attempt, and spends the offer', async () => {
-  const { host, acquire, root } = await interruptedRestart()
+  const { host, root, dispatch } = await interruptedRestart()
   await host.restartResume.list()
-  await host.hold(SESSION, 'pane')
-  const events = providerEvents(acquire)
   const admit = StructuredAgentSessionResumeAdmission.prototype.run
   vi.spyOn(StructuredAgentSessionResumeAdmission.prototype, 'run').mockImplementationOnce(
     async function (this, ...args) {
-      events.appendItem(
-        { provider: 'codex', threadId: THREAD, turnId: 'newer-turn', ordinal: 1 },
-        hostTestMessage('A newer task from another client')
-      )
-      await host.flushStreamedEvents(SESSION)
+      const body = hostTestMessage('A newer task from another client')
+      await host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
       return admit.apply(this, args)
     }
   )
 
   const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
 
-  expect(result.resumed).toMatchObject([{ reason: 'agent_session_resume_not_eligible' }])
+  expect(result.continued.filter((entry) => entry.outcome === 'continued')).toEqual([])
   expect(result.failed).toEqual([])
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
   const capsule = new AgentSessionRecoveryCapsule(root)
   expect(await capsule.listFailed(NOW)).toEqual([])
   expect(await capsule.list(NOW)).toEqual([])
-  expect(statusNotes(host)).toEqual([])
-  host.release(SESSION, 'pane')
+  expect(await statusNotes(host)).toEqual([])
 })
 
-it.each(['resume', 'continueAfterRestart'] as const)(
-  'says so in the chat when the reattach itself fails (%s)',
-  async (action) => {
-    const { host, acquire } = await interruptedRestart()
-    await host.restartResume.list()
-    acquire.mockRejectedValueOnce(new Error('provider could not reconnect'))
+// The continuation is accepted and its agent then fails to start: the message is rejected with the
+// cause, the failure is filed, and the chat says the agent did not carry on.
+it('says so in the chat when the agent cannot start for the continuation', async () => {
+  const { host, acquire } = await interruptedRestart()
+  await host.restartResume.list()
+  acquire.mockRejectedValueOnce(new Error('provider could not reconnect'))
 
-    await host.restartResume[action]([SESSION], 'modal')
+  await host.restartResume.continueAfterRestart([SESSION], 'modal')
 
-    expect(await host.restartResume.listFailures()).toMatchObject([
-      { sessionId: SESSION, outcome: 'refused' }
-    ])
-    // The fix depends on why it failed, which the dialog explains; "send a message" would not work.
-    expect(statusNotes(host)).toEqual([
-      { text: AGENT_SESSION_RESTART_NOT_CONNECTED_NOTE, tone: 'error' }
-    ])
-  }
-)
+  expect(await host.restartResume.listFailures()).toMatchObject([
+    { sessionId: SESSION, outcome: 'refused', retryable: true }
+  ])
+  expect(await statusNotes(host)).toContainEqual({
+    text: AGENT_SESSION_RESTART_CONTINUATION_REFUSED_NOTE,
+    tone: 'error'
+  })
+})
 
-/** A continuation the provider accepted whose settlement could not be written: filed unconfirmed. */
-async function unconfirmedContinuation() {
-  const state = await interruptedRestart()
-  const { host, store } = state
+// A send that throws after Orca may have taken it cannot be proven undelivered: filed unconfirmed,
+// and it stays on record while the agent that may be carrying on keeps running.
+it('keeps an unconfirmed failure while the agent the continuation started keeps running', async () => {
+  const { host, store } = await interruptedRestart()
   vi.spyOn(console, 'warn').mockImplementation(() => {})
   await host.restartResume.list()
-  await host.hold(SESSION, 'pane')
   const settle = store.recordOperationOutcome.bind(store)
   vi.spyOn(store, 'recordOperationOutcome').mockImplementation(async (input) => {
-    if (input.outcome.status === 'succeeded') {
+    if (
+      input.callerKey === STRUCTURED_AGENT_SESSION_RESTART_CONTINUATION_CALLER &&
+      input.outcome.status === 'succeeded'
+    ) {
       throw new Error('operation outcome could not be persisted')
     }
     return settle(input)
   })
+
   const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
+
   expect(result.failed).toMatchObject([{ sessionId: SESSION, outcome: 'unconfirmed' }])
-  expect(statusNotes(host)).toContainEqual({
+  expect(await statusNotes(host)).toContainEqual({
     text: AGENT_SESSION_RESTART_CONTINUATION_UNCONFIRMED_NOTE,
     tone: 'warning'
   })
-  const continuation = host.journalSnapshot(SESSION).submissions.at(-1)
-  const providerItemId = continuation?.providerItemId
-  if (!continuation || !providerItemId) {
-    throw new Error('missing accepted continuation')
-  }
-  return { ...state, continuation, providerItemId, events: providerEvents(state.acquire) }
-}
-
-// The warning asked the user to check the agent's reply; a turn opened by the continuation's own
-// message is that reply starting, however the provider names the message.
-it.each(['submission key', 'provider key'] as const)(
-  'retires an unconfirmed failure once the continuation opens a turn (%s)',
-  async (naming) => {
-    const { host, root, continuation, providerItemId, events } = await unconfirmedContinuation()
-    events.appendItem(
-      { provider: 'codex', threadId: THREAD, turnId: 'continued-turn', ordinal: 1 },
-      {
-        kind: 'turn',
-        turnId: 'continued-turn',
-        state: 'running',
-        userItemId:
-          naming === 'submission key'
-            ? agentJournalSubmissionKey(continuation.clientMessageId)
-            : providerItemId
-      },
-      { lifecycle: true }
-    )
-    await host.flushStreamedEvents(SESSION)
-
-    expect(await host.restartResume.listFailures()).toEqual([])
-    await vi.waitFor(async () => {
-      expect(await new AgentSessionRecoveryCapsule(root).listFailed(NOW)).toEqual([])
-    })
-    host.release(SESSION, 'pane')
-  }
-)
-
-it('keeps an unconfirmed failure while the newest turn is not the continuation’s', async () => {
-  const { host, events } = await unconfirmedContinuation()
-  // Provider output opened this turn, keyed by its own row rather than by any user message.
-  events.appendItem(
-    { provider: 'codex', threadId: THREAD, turnId: 'provider-turn', ordinal: 1 },
-    { kind: 'turn', turnId: 'provider-turn', state: 'running', userItemId: 'provider-turn-row' },
-    { lifecycle: true }
-  )
-  await host.flushStreamedEvents(SESSION)
-
-  expect(await host.restartResume.listFailures()).toMatchObject([{ outcome: 'unconfirmed' }])
-  host.release(SESSION, 'pane')
-})
-
-// Nothing journaled the continuation, so the newest user message is still the interrupted one and
-// the turn it opened is the interrupted work reporting in, not the agent carrying on.
-it('keeps an unconfirmed failure whose continuation was never journaled while the interrupted turn runs', async () => {
-  const { host, acquire, store, marker } = await interruptedRestart('submission', false)
-  vi.spyOn(console, 'warn').mockImplementation(() => {})
-  await host.restartResume.list()
-  await host.hold(SESSION, 'pane')
-  const events = providerEvents(acquire)
-  events.appendItem(
-    { provider: 'codex', threadId: THREAD, turnId: 'original-turn', ordinal: 1 },
-    hostTestMessage('Perform the original task')
-  )
-  await host.flushStreamedEvents(SESSION)
-  // A send that throws before recording anything cannot be proven undelivered.
-  vi.spyOn(store, 'admitMutationOperation').mockRejectedValueOnce(new Error('store unavailable'))
-  const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
-  expect(result.failed).toMatchObject([{ sessionId: SESSION, outcome: 'unconfirmed' }])
-  const submissions = host.journalSnapshot(SESSION).submissions
-  const original = submissions[0]?.providerItemId
-  if (submissions.length !== 1 || !original) {
-    throw new Error('expected only the original submission, accepted by the provider')
-  }
-  expect(latestStructuredAgentSessionUserItem(host.journalSnapshot(SESSION).items)?.itemId).toBe(
-    marker?.latestUserItemId
-  )
-
-  events.appendItem(
-    { provider: 'codex', threadId: THREAD, turnId: 'original-turn', ordinal: 2 },
-    { kind: 'turn', turnId: 'original-turn', state: 'running', userItemId: original },
-    { lifecycle: true }
-  )
-  await host.flushStreamedEvents(SESSION)
-
   expect(await host.restartResume.listFailures()).toMatchObject([{ outcome: 'unconfirmed' }])
-  host.release(SESSION, 'pane')
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-ledger.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-ledger.ts
index 3b8fad40de09..ee769b9e8c33 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-ledger.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-ledger.ts
@@ -4,9 +4,8 @@
 // the offer, so without this record nothing durable would point at the chat the user has to
 // continue by hand. The capsule holds the record; this decides what goes in and when it leaves.
 //
-// Whether a record is still current is derived, never cached: it is current only while the chat's
-// newest user message is the one it had when the failure was filed. The user's own send, from any
-// client, therefore retires it without a hook on the send path.
+// A record ends when the chat's agent is started again outside a resume action — the host retires
+// it at that start, with the offer — or by a successful retry, or a dismissal.
 
 import type {
   AgentSessionRecoveryCapsule,
@@ -18,19 +17,10 @@ import type {
   AgentSessionResumeFailureOutcome,
   AgentSessionResumeMarker
 } from '../../../shared/agent-session-resume-marker'
-import type { AgentJournalSnapshot } from '../../../shared/agent-session-journal-types'
-import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
-import { isRootAgentJournalItem } from '../../../shared/agent-session-journal-producer'
-import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record'
-import { latestStructuredAgentSessionUserItem } from '../../../shared/structured-agent-session-projection'
 import { normalizeOptionalField } from '../../../shared/agent-status-field-normalization'
 import { AGENT_MODEL_MAX_LENGTH } from '../../../shared/agent-status-types'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import { adapterSupportsRecord } from './structured-agent-session-provider-support'
-import {
-  liveStructuredAgentSessionLatestUserItemId,
-  type StructuredAgentSessionRestartJournalSource
-} from './structured-agent-session-restart-candidates'
 import type { StructuredAgentSessionContinuationOutcome } from './structured-agent-session-restart-continuation'
 import type {
   StructuredAgentSessionResumeCandidate,
@@ -40,37 +30,18 @@ import {
   STRUCTURED_AGENT_SESSION_RESUME_NOT_ELIGIBLE,
   type StructuredAgentSessionResumeOutcome
 } from './structured-agent-session-restart-resume-runner'
+import { RESTART_CONTINUATION_SUPERSEDED } from './structured-agent-session-restart-continuation'
 
 type FailureCapsule = Pick<
   AgentSessionRecoveryCapsule,
-  | 'listFailed'
-  | 'completeResume'
-  | 'failResume'
-  | 'rollbackResume'
-  | 'dismiss'
-  | 'clearAll'
-  | 'forgetSuperseded'
+  'listFailed' | 'completeResume' | 'failResume' | 'rollbackResume' | 'dismiss' | 'clearAll'
 >
 
-/** What a failure is filed against: the chat's newest user message as its own attempt ended. Kept
- *  per chat rather than read at settlement, because the rest of a batch can take a while and a
- *  message the user sends meanwhile answers the failure rather than belongs to it. */
-export type StructuredAgentSessionRestartAttempts = {
-  observe: (sessionId: string) => void
-  latestUserItemId: (sessionId: string) => string | null
-}
-
 export type StructuredAgentSessionRestartFailureLedger = {
   /** The stored records, current or not. */
   read: () => Promise<AgentSessionResumeFailureRecord[]>
-  /** The current records as rows a surface can show; sessions this host no longer holds are left
-   *  out, and records the chat has since superseded are dropped and pruned. */
+  /** The records as rows a surface can show; sessions this build cannot run are left out. */
   list: () => Promise<StructuredAgentSessionResumeFailure[]>
-  /** One action's attempts; a chat never observed after an attempt falls back to its reserved
-   *  marker. */
-  attempts: (
-    markers: ReadonlyMap<string, AgentSessionResumeMarker>
-  ) => StructuredAgentSessionRestartAttempts
   /** Settles one operation's reservations: the agent carried on, or the failure is filed. Rows the
    *  operation still owns after that are reopened. */
   settle: (
@@ -78,7 +49,8 @@ export type StructuredAgentSessionRestartFailureLedger = {
     outcomes: readonly StructuredAgentSessionResumeOutcome[],
     action: {
       candidates: readonly StructuredAgentSessionResumeCandidate[]
-      attempts: StructuredAgentSessionRestartAttempts
+      /** The reserved markers; a failure carries its marker's message id for older readers. */
+      markers: ReadonlyMap<string, AgentSessionResumeMarker>
       /** How a reattached session's action ended; null when the agent carried on. Reattaching alone
        *  is not the whole action, so the runner's own outcome cannot decide this. */
       failureAfterResume: (sessionId: string) => AgentSessionResumeFailureOutcome | null
@@ -99,54 +71,14 @@ export function continuationFailureOutcome(
   return outcome === 'continued' ? null : outcome === 'refused' ? 'refused' : 'unconfirmed'
 }
 
-/** Whether the chat itself has moved past a failure: a newer user message, or, for a delivery
- *  nobody confirmed, a turn the continuation's own message opened. */
-function failureAnsweredByChat(
-  failure: AgentSessionResumeFailureRecord,
-  snapshot: AgentJournalSnapshot
-): boolean {
-  const latest = latestStructuredAgentSessionUserItem(snapshot.items)?.itemId ?? null
-  if (latest !== failure.latestUserItemId) {
-    return true
-  }
-  // Only when the continuation's message was journaled: otherwise the newest user message is the
-  // interrupted one, whose own turn proves nothing about the continuation.
-  return (
-    failure.outcome === 'unconfirmed' &&
-    latest !== null &&
-    latest !== failure.marker.latestUserItemId &&
-    newestTurnUserItemId(snapshot) === latest
-  )
-}
-
-/** The user message that opened the newest root turn, resolved through a provider key the send was
- *  accepted under. */
-function newestTurnUserItemId(snapshot: AgentJournalSnapshot): string | null {
-  for (let index = snapshot.items.length - 1; index >= 0; index -= 1) {
-    const item = snapshot.items[index]
-    const turn = isRootAgentJournalItem(item) ? readAgentJournalTurn(item?.body) : null
-    if (!turn) {
-      continue
-    }
-    const key = turn.userItemId
-    if (key === undefined) {
-      return null
-    }
-    const accepted = snapshot.submissions.find((entry) => entry.providerItemId === key)
-    return accepted ? agentJournalSubmissionKey(accepted.clientMessageId) : key
-  }
-  return null
-}
-
 export function createStructuredAgentSessionRestartFailureLedger(deps: {
   capsule?: FailureCapsule
-  sessions: ReadonlyMap<string, StructuredAgentSessionRestartJournalSource>
-  /** Makes a persisted chat's journal readable here, as listing an offer does. */
-  reveal: (sessionId: string) => Promise<void>
   getRecord: (sessionId: string) => AgentSessionRecord | null
   adapter: StructuredAgentSessionAdapter
   /** The predicate a retry applies to the failure's marker. */
   retryable: (marker: AgentSessionResumeMarker) => boolean
+  /** Makes the failed chats readable here, so `retryable` reads each one's journal. */
+  reveal: (markers: readonly AgentSessionResumeMarker[]) => Promise<void>
   now: () => number
   /** The capsule's single mutation lane, shared with the offer's own operations. */
   enqueue: <T>(operation: () => Promise<T>) => Promise<T>
@@ -184,41 +116,16 @@ export function createStructuredAgentSessionRestartFailureLedger(deps: {
         failedAt: failure.failedAt,
         outcome: failure.outcome,
         reason: failure.reason,
+        ...(failure.details ? { details: failure.details } : {}),
         retryable: deps.retryable(failure.marker)
       }
     ]
   }
 
   const list = async (): Promise<StructuredAgentSessionResumeFailure[]> => {
-    const current: AgentSessionResumeFailureRecord[] = []
-    const superseded: AgentSessionResumeFailureRecord[] = []
-    for (const failure of await read()) {
-      const sessionId = failure.marker.sessionId
-      if (!deps.sessions.has(sessionId)) {
-        await deps.reveal(sessionId)
-      }
-      const snapshot = deps.sessions.get(sessionId)?.journal.snapshot()
-      // An unreadable journal decides nothing; the record stays until something that can decide.
-      if (snapshot && failureAnsweredByChat(failure, snapshot)) {
-        superseded.push(failure)
-      } else {
-        current.push(failure)
-      }
-    }
-    const capsule = deps.capsule
-    if (capsule && superseded.length > 0) {
-      const gone = superseded.map((failure) => ({
-        sessionId: failure.marker.sessionId,
-        recordedAt: failure.marker.recordedAt,
-        failedAt: failure.failedAt
-      }))
-      void deps
-        .enqueue(() => capsule.forgetSuperseded(gone, deps.now()))
-        .catch(() => {
-          console.warn('[structured-agent-session] pruning superseded restart failures failed')
-        })
-    }
-    return current.flatMap(toRow)
+    const failures = await read()
+    await deps.reveal(failures.map((failure) => failure.marker))
+    return failures.flatMap(toRow)
   }
 
   const settle: StructuredAgentSessionRestartFailureLedger['settle'] = async (
@@ -232,16 +139,22 @@ export function createStructuredAgentSessionRestartFailureLedger(deps: {
     }
     const completed: string[] = []
     const failures: AgentSessionResumeFailureInput[] = []
-    const promptBySession = new Map(
-      action.candidates.map((candidate) => [candidate.sessionId, candidate.latestPrompt])
-    )
+    // A retry keeps the prompt its first failure named: the chat's newest user message since then
+    // is the rejected continuation, and a message of the user's own would have ended the offer.
+    const promptBySession = new Map([
+      ...action.candidates.map(
+        (candidate) => [candidate.sessionId, candidate.latestPrompt] as const
+      ),
+      ...(await read()).map((filed) => [filed.marker.sessionId, filed.latestPrompt] as const)
+    ])
     for (const outcome of outcomes) {
       const resumed = outcome.outcome === 'resumed'
-      // Ineligible means the user moved on or the offer no longer applies (record gone,
-      // conversation forked), so there is nothing to retry and the offer is spent.
+      // Ineligible means the offer no longer applies (record gone, conversation forked), and
+      // superseded means the user's own message came first: nothing to retry, and the offer is spent.
       const failure = resumed
         ? action.failureAfterResume(outcome.sessionId)
-        : outcome.reason === STRUCTURED_AGENT_SESSION_RESUME_NOT_ELIGIBLE
+        : outcome.reason === STRUCTURED_AGENT_SESSION_RESUME_NOT_ELIGIBLE ||
+            outcome.reason === RESTART_CONTINUATION_SUPERSEDED
           ? null
           : 'refused'
       if (failure === null) {
@@ -255,8 +168,9 @@ export function createStructuredAgentSessionRestartFailureLedger(deps: {
         reason: resumed
           ? action.failureReason(outcome.sessionId)
           : (outcome.reason ?? 'agent_session_resume_refused'),
+        ...(!resumed && outcome.details ? { details: outcome.details } : {}),
         latestPrompt: promptBySession.get(outcome.sessionId) ?? '',
-        latestUserItemId: action.attempts.latestUserItemId(outcome.sessionId)
+        latestUserItemId: action.markers.get(outcome.sessionId)?.latestUserItemId ?? null
       })
     }
     await deps
@@ -280,27 +194,9 @@ export function createStructuredAgentSessionRestartFailureLedger(deps: {
       })
   }
 
-  const attempts: StructuredAgentSessionRestartFailureLedger['attempts'] = (markers) => {
-    const observed = new Map<string, string | null>()
-    return {
-      // Observed after the attempt, so the continuation's own message is part of the filed state.
-      observe: (sessionId) => {
-        const latest = liveStructuredAgentSessionLatestUserItemId(deps.sessions, sessionId)
-        if (latest !== undefined) {
-          observed.set(sessionId, latest)
-        }
-      },
-      latestUserItemId: (sessionId) => {
-        const latest = observed.get(sessionId)
-        return latest !== undefined ? latest : (markers.get(sessionId)?.latestUserItemId ?? null)
-      }
-    }
-  }
-
   return {
     read,
     list,
-    attempts,
     settle,
     dismiss: (sessionIds, beforeClearAll) =>
       deps.enqueue(async () => {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-interruption-test-harness.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-interruption-test-harness.ts
index 1bcb27ca4a2e..d88a6330e789 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-interruption-test-harness.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-interruption-test-harness.ts
@@ -10,8 +10,8 @@ import {
 } from '../../runtime/agent-session-recovery-capsule'
 import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import { parseAgentSessionResumeMarker } from '../../../shared/agent-session-resume-marker'
-import { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import type { StructuredAgentSessionHostDeps } from './structured-agent-session-host-types'
 import { StructuredAgentSessionResumeAdmission } from './structured-agent-session-restart-resume-runner'
 import {
   adapter,
@@ -25,14 +25,30 @@ import {
   HOST_TEST_NOW as NOW,
   HOST_TEST_SESSION as SESSION,
   HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
   hostTestMessage
 } from './structured-agent-session-host-test-data'
 
-export const GRACE = 15_000
+/** Starts the agent explicitly — the attach a client's ensure makes — for a test that needs a
+ *  running child before its next step. Nothing else starts one ahead of a send. */
+export async function startAgent(state: {
+  host: StructuredAgentSessionHost
+  store: AgentSessionRecordStore
+}): Promise<void> {
+  const result = await state.host.attach(
+    CALLER,
+    hostTestAttachParams(state.store.getRecord(SESSION)?.lease.runtimeFence ?? null)
+  )
+  expect(result.ok).toBe(true)
+}
 
 export async function interruptedRestart(
   work: 'turn' | 'submission' | 'send-after-reply' | 'children' = 'turn',
-  historyBoundaryConsistent = true
+  historyBoundaryConsistent = true,
+  /** What the restarted host proves about the recorded owner; gone unless a test says otherwise. */
+  probeOwner: NonNullable<StructuredAgentSessionHostDeps['probeOwner']> = async () => ({
+    outcome: 'pid-absent'
+  })
 ) {
   const previous = hostTestState()
   await attach()
@@ -52,6 +68,8 @@ export async function interruptedRestart(
     previous.dispatch.mockResolvedValueOnce({ state: 'admitted' })
     const body = hostTestMessage('Perform the original task')
     await previous.host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
+    // Accepted first, handed over after: the work in flight is a send the provider took.
+    await vi.waitFor(() => expect(previous.dispatch).toHaveBeenCalledOnce())
   } else if (work === 'children') {
     events.appendItem(
       { provider: 'codex', threadId: THREAD, turnId: 'settled-turn', ordinal: 1 },
@@ -97,6 +115,8 @@ export async function interruptedRestart(
     hostId: 'local'
   })
   const closeSession = vi.fn(async () => true)
+  // The relaunch comes after the quit that recorded the offer.
+  const clock = { now: NOW + 1 }
   const host = new StructuredAgentSessionHost({
     store,
     adapter: {
@@ -115,10 +135,9 @@ export async function interruptedRestart(
     journalRoot: previous.root,
     claimKeyId: 'key-1',
     mintSpawnToken: () => 'spawn-next',
-    probeOwner: async () => ({ outcome: 'pid-absent' }),
+    probeOwner,
     recoveryCapsule: new AgentSessionRecoveryCapsule(previous.root),
-    releaseGraceMs: GRACE,
-    now: () => NOW
+    now: () => clock.now
   })
   replaceHostTestState({ store, host })
   previous.acquire.mockClear()
@@ -128,43 +147,34 @@ export async function interruptedRestart(
     await readFile(join(previous.root, AGENT_SESSION_RECOVERY_CAPSULE_FILE), 'utf8')
   )
   const marker = parseAgentSessionResumeMarker(capsule.entries[0]?.marker)
-  return { ...hostTestState(), host, store, closeSession, marker }
+  return { ...hostTestState(), host, store, closeSession, marker, clock }
 }
 
-export function statusNotes(host: StructuredAgentSessionHost) {
-  return host
-    .journalSnapshot(SESSION)
-    .items.flatMap((item) =>
-      item.body.kind === 'status' ? [{ text: item.body.text, tone: item.body.tone }] : []
-    )
+export async function statusNotes(host: StructuredAgentSessionHost) {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.body.kind === 'status' ? [{ text: item.body.text, tone: item.body.tone }] : []
+  )
 }
 
-/** A reattach that succeeds and a continuation the host refuses: a message from another client
- *  lands while the continuation is being recorded. `userAnswers` has the user reply in the chat
- *  just before or after its own attempt, while the rest of a batch would still be running. */
+/** A continuation the host refuses because the user's own message was accepted first: another
+ *  client's send lands after the action reserved the offer, just before the continuation is
+ *  accepted. `userAnswers` instead has the user send before or after the whole attempt. */
 export async function supersededRefusal(userAnswers?: 'before' | 'after') {
-  const { host, acquire, dispatch, root } = await interruptedRestart()
+  const { host, store, acquire, dispatch, root } = await interruptedRestart()
   await host.restartResume.list()
-  await host.hold(SESSION, 'pane')
-  const events = acquire.mock.calls[0]?.[0].events
-  if (!events) {
-    throw new Error('missing resumed provider event sink')
+  const body = hostTestMessage('A newer task from another client')
+  const answer = () =>
+    host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
+  const send = host.send
+  const writing = vi.spyOn(host, 'send')
+  if (!userAnswers) {
+    writing.mockImplementationOnce(async (caller, params) => {
+      await answer()
+      return send(caller, params)
+    })
   }
-  const append = AgentSessionJournal.prototype.appendSubmission
-  const writing = vi.spyOn(AgentSessionJournal.prototype, 'appendSubmission')
-  writing.mockImplementationOnce(async function (this: AgentSessionJournal, input) {
-    const cursor = await append.call(this, input)
-    events.appendItem(
-      { provider: 'codex', threadId: THREAD, turnId: 'newer-turn', ordinal: 1 },
-      hostTestMessage('A newer task from another client')
-    )
-    return cursor
-  })
   const admit = StructuredAgentSessionResumeAdmission.prototype.run
   const admitting = vi.spyOn(StructuredAgentSessionResumeAdmission.prototype, 'run')
-  const body = hostTestMessage('Carry on from where you stopped')
-  const answer = () =>
-    host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
   if (userAnswers) {
     admitting.mockImplementationOnce(async function (this, ...args) {
       await (userAnswers === 'before' ? answer() : null)
@@ -177,9 +187,7 @@ export async function supersededRefusal(userAnswers?: 'before' | 'after') {
   }
   try {
     const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
-    expect(result.continued).toMatchObject([{ outcome: 'refused' }])
-    expect(dispatch).toHaveBeenCalledTimes(userAnswers ? 1 : 0)
-    return { host, root, result }
+    return { host, store, acquire, dispatch, root, result }
   } finally {
     writing.mockRestore()
     admitting.mockRestore()
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-after-reattach.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-after-reattach.test.ts
index 912594a1737b..032b0e07b2af 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-after-reattach.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-after-reattach.test.ts
@@ -1,99 +1,42 @@
-// An offer across the provider reattaching and rewriting the chat in its own words: a notice turn
-// of its own, restated rows. None of it withdraws the offer or changes the message Resume sends.
+// An offer across a failed attempt and its retry, and across builds: the message Resume sends
+// depends on the marker alone, and each action sends its own.
 
 import { expect, it } from 'vitest'
 import { AgentSessionRecoveryCapsule } from '../../runtime/agent-session-recovery-capsule'
 import { AGENT_SESSION_RESTART_CONTINUATION_MESSAGE } from '../../../shared/agent-session-restart-continuation'
-import { restartContinuationBody } from './structured-agent-session-restart-continuation'
+import { restartContinuationBody } from './structured-agent-session-restart-continuation-envelope'
 import { interruptedRestart } from './structured-agent-session-restart-interruption-test-harness'
 import {
   HOST_TEST_NOW as NOW,
-  HOST_TEST_SESSION as SESSION,
-  HOST_TEST_THREAD as THREAD
+  HOST_TEST_SESSION as SESSION
 } from './structured-agent-session-host-test-data'
 
-function resumedEvents(state: Awaited<ReturnType<typeof interruptedRestart>>) {
-  // The latest acquisition: an earlier one may have been refused.
-  const events = state.acquire.mock.calls.at(-1)?.[0].events
-  if (!events) {
-    throw new Error('missing resumed provider event sink')
-  }
-  return events
-}
-
-// THE REPORTED REFUSAL: opening the chat reattached Claude, which opened a turn of its own to say
-// the previous session did not finish, and closed it. The chat is still offered and Resume sends —
-// including when the offer is a send that had not become a turn, where that closed notice turn is
-// the newest turn in the journal.
-it.each(['turn', 'submission'] as const)(
-  'still offers and continues a %s offer after the provider opens and closes a notice turn',
-  async (work) => {
-    const state = await interruptedRestart(work, false)
-    const { host, dispatch } = state
-    await host.hold(SESSION, 'pane')
-    const events = resumedEvents(state)
-    const notice = { provider: 'codex', threadId: THREAD, turnId: 'notice-turn' } as const
-    events.appendItem(
-      { ...notice, ordinal: 1 },
-      { kind: 'turn', turnId: 'notice-turn', state: 'running', userItemId: 'turn:notice-turn' }
-    )
-    events.appendItem(
-      { ...notice, ordinal: 2 },
-      {
-        kind: 'message',
-        role: 'assistant',
-        blocks: [{ type: 'text', text: "didn't finish before the previous session ended" }]
-      }
-    )
-    events.appendItem(
-      { ...notice, ordinal: 1 },
-      { kind: 'turn', turnId: 'notice-turn', state: 'completed', userItemId: 'turn:notice-turn' }
-    )
-    await host.flushStreamedEvents(SESSION)
-
-    expect(await host.restartResume.list()).toMatchObject([{ sessionId: SESSION }])
-    expect(
-      (await host.restartResume.continueAfterRestart([SESSION], 'modal')).continued
-    ).toMatchObject([{ outcome: 'continued' }])
-    expect(dispatch).toHaveBeenCalledTimes(1)
-    host.release(SESSION, 'pane')
-  }
-)
-
-// A retry after the first attempt never reached the provider, with the rows restated in between:
-// the body depends on the marker alone, so the ledger fingerprint stays the offer's.
-it('sends the same continuation body on a retry after the provider restates its rows', async () => {
-  const state = await interruptedRestart('children')
-  const { host, acquire, dispatch, marker } = state
+// The first attempt's start failed, so its continuation was rejected and never reached the agent.
+// A retry is a new action with a new message, not a replay of the rejected one, and it is
+// delivered with the same body.
+it("delivers a retry as a new continuation after the first one's start failed", async () => {
+  const { host, acquire, dispatch, marker } = await interruptedRestart('children')
   if (!marker) {
     throw new Error('missing interrupted restart marker')
   }
   acquire.mockRejectedValueOnce(new Error('provider could not reconnect'))
-  await host.restartResume.continueAfterRestart([SESSION], 'modal')
-  expect(await host.restartResume.listFailures()).toMatchObject([{ retryable: true }])
+  const first = await host.restartResume.continueAfterRestart([SESSION], 'modal')
+  expect(first.failed).toMatchObject([{ sessionId: SESSION, outcome: 'refused', retryable: true }])
+  const [rejected] = (await host.journalSnapshot(SESSION)).submissions
+  expect(rejected).toMatchObject({ dispatchState: 'rejected' })
 
-  await host.hold(SESSION, 'pane')
-  resumedEvents(state).appendItem(
-    { provider: 'codex', threadId: THREAD, turnId: 'settled-turn', ordinal: 2 },
-    {
-      kind: 'message',
-      role: 'system',
-      blocks: [
-        {
-          type: 'subagent-group',
-          groupId: 'settled-turn',
-          agents: [{ id: 'child-1', label: 'Review loop 4', state: 'completed' }]
-        }
-      ]
-    }
-  )
-  await host.flushStreamedEvents(SESSION)
   const retried = await host.restartResume.continueAfterRestart([SESSION], 'retry')
 
   expect(retried.continued).toMatchObject([{ outcome: 'continued' }])
-  expect(dispatch).toHaveBeenCalledTimes(1)
-  expect(dispatch.mock.calls[0]?.[0].body).toEqual(restartContinuationBody(marker))
-  host.release(SESSION, 'pane')
+  expect(dispatch).toHaveBeenCalledOnce()
+  const sent = dispatch.mock.calls[0]?.[0]
+  expect(sent?.clientMessageId).not.toBe(rejected?.clientMessageId)
+  expect(sent?.body).toEqual(restartContinuationBody(marker))
+  expect((await host.journalSnapshot(SESSION)).submissions).toMatchObject([
+    { clientMessageId: rejected?.clientMessageId, dispatchState: 'rejected' },
+    { clientMessageId: sent?.clientMessageId, dispatchState: 'accepted' }
+  ])
+  expect(retried.failed).toEqual([])
 })
 
 // A marker from a build that recorded only a working lead: no snapshot, so no activity to name,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-endings.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-endings.test.ts
index 69f6f661c370..aefa34f4b673 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-endings.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-endings.test.ts
@@ -1,10 +1,11 @@
-// The ways an offer ends. Every ending is the user's own act, and every ending DELETES the
-// durable record — nothing stays behind to be re-filtered on every later read.
+// The ways an offer ends. Every ending DELETES the durable record — nothing stays behind to be
+// re-filtered on every later read.
 
 import { expect, it, vi } from 'vitest'
 import { AgentSessionRecoveryCapsule } from '../../runtime/agent-session-recovery-capsule'
-import { StructuredAgentSessionReadableRestorer } from './structured-agent-session-readable-restorer'
+import { rename, writeFile, rm } from 'node:fs/promises'
 import { interruptedRestart } from './structured-agent-session-restart-interruption-test-harness'
+import { journalDirectoryFor } from '../agent-session-journal/journal-paths'
 import { CALLER, envelope } from './structured-agent-session-host-test-harness'
 import {
   HOST_TEST_NOW as NOW,
@@ -12,36 +13,47 @@ import {
   hostTestMessage
 } from './structured-agent-session-host-test-data'
 
-// The user answering the chat themselves is the one signal the offer is moot. The next listing
-// notices and deletes the durable record, not merely hides it.
+// The user's own message starts the chat's agent again, which ends the offer: the durable record
+// is deleted, not merely hidden (R-04).
 it('deletes the offer once the user sends their own message in that chat', async () => {
   const { host, root, dispatch } = await interruptedRestart()
   const capsule = new AgentSessionRecoveryCapsule(root)
   expect(await capsule.list(NOW)).toHaveLength(1)
 
-  await host.hold(SESSION, 'pane')
   dispatch.mockResolvedValueOnce({ state: 'admitted' })
   const body = hostTestMessage('Never mind, do this instead')
   await host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
 
+  // Written when the agent's start is proven: a cold start.
+  await vi.waitFor(
+    async () => {
+      expect(await capsule.list(NOW)).toEqual([])
+    },
+    { timeout: 10_000 }
+  )
   expect(await host.restartResume.list()).toEqual([])
-  await vi.waitFor(async () => {
-    expect(await capsule.list(NOW)).toEqual([])
-  })
-  host.release(SESSION, 'pane')
 })
 
-// A journal this host cannot read says nothing about the user moving on, so it must not end the offer.
+// A journal this host cannot read decides nothing, so it must not end the offer.
 it('keeps the offer when the chat cannot be read on this host', async () => {
-  const { host, root } = await interruptedRestart('submission')
+  const { host, root, store } = await interruptedRestart('submission')
   const capsule = new AgentSessionRecoveryCapsule(root)
-  const restoring = vi
-    .spyOn(StructuredAgentSessionReadableRestorer.prototype, 'restoreOne')
-    .mockRejectedValue(new Error('journal unreadable'))
+  const location = store.getRecord(SESSION)?.location
+  if (!location) {
+    throw new Error('missing session record')
+  }
+  // A file where the journal directory belongs: this host cannot open the conversation at all.
+  const journalDir = journalDirectoryFor(root, {
+    workspaceId: location.workspaceId,
+    sessionId: SESSION
+  })
+  await rename(journalDir, `${journalDir}.aside`)
+  await writeFile(journalDir, 'not a journal')
   try {
     expect(await host.restartResume.list()).toMatchObject([{ sessionId: SESSION }])
   } finally {
-    restoring.mockRestore()
+    await rm(journalDir)
+    await rename(`${journalDir}.aside`, journalDir)
   }
   expect(await capsule.list(NOW)).toHaveLength(1)
   expect(await host.restartResume.list()).toMatchObject([{ sessionId: SESSION }])
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-withdrawal.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-withdrawal.test.ts
new file mode 100644
index 000000000000..d36e5702d1dc
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-withdrawal.test.ts
@@ -0,0 +1,548 @@
+// A restart offer ends when the chat moves on after the restart: another message accepted, or its
+// agent started, other than by the offer's own continuation. Each case reads the offer list and the
+// capsule, never only an in-memory set.
+
+import { mkdtemp, readFile, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
+import {
+  AgentSessionRecoveryCapsule,
+  AGENT_SESSION_RECOVERY_CAPSULE_FILE
+} from '../../runtime/agent-session-recovery-capsule'
+import { parseAgentSessionResumeMarker } from '../../../shared/agent-session-resume-marker'
+import { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire'
+import {
+  interruptedRestart,
+  statusNotes
+} from './structured-agent-session-restart-interruption-test-harness'
+import { CALLER, envelope } from './structured-agent-session-host-test-harness'
+import { STRUCTURED_AGENT_SESSION_IDLE_MS } from './structured-agent-session-idle-sweep'
+import { createStructuredAgentSessionRestartOfferWithdrawal } from './structured-agent-session-restart-offer-withdrawal'
+import { restartContinuationId } from './structured-agent-session-restart-continuation-envelope'
+import { sweepOnce } from './structured-agent-session-rest-test-rig'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  hostTestMessage
+} from './structured-agent-session-host-test-data'
+
+afterEach(() => vi.restoreAllMocks())
+
+const SUPERSEDED = 'agent_session_restart_work_superseded'
+
+/** A start under a loaded machine: reconcile, acquire, hand over. */
+const COLD_START = { timeout: 10_000 }
+
+async function offered(work: 'turn' | 'submission' = 'turn') {
+  const state = await interruptedRestart(work, false)
+  expect(await state.host.restartResume.list()).toHaveLength(1)
+  return state
+}
+
+function offersIn(root: string) {
+  return new AgentSessionRecoveryCapsule(root).list(NOW)
+}
+
+function userSend(text: string) {
+  const body = hostTestMessage(text)
+  return { envelope: envelope('agentSession.send', { body }), body }
+}
+
+function compactParams() {
+  return {
+    command: 'compact' as const,
+    envelope: envelope('agentSession.conversationCommand', { command: 'compact' })
+  }
+}
+
+function sentTexts(dispatch: Awaited<ReturnType<typeof offered>>['dispatch']): string[] {
+  return dispatch.mock.calls.map(([input]) =>
+    input.body.blocks.flatMap((block) => (block.type === 'text' ? [block.text] : [])).join('')
+  )
+}
+
+it('withdraws the offer when /compact starts the agent at rest (R-01)', async () => {
+  const { host, root, acquire } = await offered()
+  Object.assign(host.deps.adapter, { compact: vi.fn(async () => ({})) })
+
+  expect(await host.conversationCommand(CALLER, compactParams())).toMatchObject({ ok: true })
+
+  expect(acquire).toHaveBeenCalledOnce()
+  await vi.waitFor(async () => expect(await offersIn(root)).toEqual([]), COLD_START)
+  expect(await host.restartResume.list()).toEqual([])
+})
+
+it('keeps the offer through every way of looking at the chat (R-02)', async () => {
+  const { host, root, acquire } = await offered()
+  const unsubscribe = await host.subscribe({ id: 'pane', sessionId: SESSION, emit: vi.fn() })
+  await host.history({ sessionId: SESSION, direction: 'tail' })
+  await host.readOptions(SESSION)
+  host.readCommands(SESSION)
+  await host.handoffStatus(SESSION)
+  await host.revealSession(SESSION)
+  unsubscribe()
+
+  expect(acquire).not.toHaveBeenCalled()
+  expect(await host.restartResume.list()).toHaveLength(1)
+  expect(await offersIn(root)).toHaveLength(1)
+})
+
+it("does not let the offer's own continuation withdraw it (R-03)", async () => {
+  const { host, root, dispatch } = await offered()
+  const dismiss = vi.spyOn(AgentSessionRecoveryCapsule.prototype, 'dismiss')
+
+  const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
+
+  expect(result.continued).toMatchObject([{ outcome: 'continued' }])
+  expect(dispatch).toHaveBeenCalledOnce()
+  // The start was the continuation's own: whatever asked, it withdrew nothing.
+  for (const call of dismiss.mock.results) {
+    expect(await call.value).toBe(0)
+  }
+  // Ended by the success path instead.
+  expect(await offersIn(root)).toEqual([])
+})
+
+it('refuses the continuation when another start lands inside its action (R-03b)', async () => {
+  const { host, root, dispatch } = await offered()
+  Object.assign(host.deps.adapter, { compact: vi.fn(async () => ({})) })
+  const send = host.send
+  vi.spyOn(host, 'send').mockImplementationOnce(async (caller, params) => {
+    // Another client's /compact starts the agent after the action reserved the offer.
+    expect(await host.conversationCommand(CALLER, compactParams())).toMatchObject({ ok: true })
+    return send(caller, params)
+  })
+
+  const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
+
+  expect(result.continued).toMatchObject([{ outcome: 'refused', reason: SUPERSEDED }])
+  expect(dispatch).not.toHaveBeenCalled()
+  expect(await offersIn(root)).toEqual([])
+  expect(result.failed).toEqual([])
+})
+
+it('keeps the offer when a tabbed chat is restored at boot (R-05)', async () => {
+  const { host, store, root, acquire } = await offered()
+  await store.setSessionTabVisibility(SESSION, true)
+
+  await host.restoreReadableSessions([SESSION])
+
+  expect(acquire).not.toHaveBeenCalled()
+  expect(await host.restartResume.list()).toHaveLength(1)
+  expect(await offersIn(root)).toHaveLength(1)
+})
+
+it('reads an older build’s marker whose message id no longer matches, and one with none (R-06)', async () => {
+  const { host, root, dispatch, marker } = await offered('submission')
+  if (!marker) {
+    throw new Error('missing interrupted restart marker')
+  }
+  // The older build compared this id with the chat's newest message; nothing does now.
+  await host.restartResume.dismiss([SESSION])
+  await new AgentSessionRecoveryCapsule(root).record(
+    [{ ...marker, latestUserItemId: 'user-sent-under-the-older-build' }],
+    NOW
+  )
+  expect(await host.restartResume.list()).toHaveLength(1)
+  const { latestUserItemId: _dropped, ...withoutId } = marker
+  expect(parseAgentSessionResumeMarker(withoutId)).toEqual(withoutId)
+
+  await host.send(CALLER, userSend('Carry on'))
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce(), COLD_START)
+  await vi.waitFor(async () => expect(await offersIn(root)).toEqual([]), COLD_START)
+})
+
+it('still writes the message id the previous build requires on every marker', async () => {
+  const { root } = await offered('submission')
+  const capsule = JSON.parse(
+    await readFile(join(root, AGENT_SESSION_RECOVERY_CAPSULE_FILE), 'utf8')
+  )
+  expect(capsule.entries[0]?.marker).toHaveProperty('latestUserItemId')
+})
+
+/** Sends a message whose start fails, and waits for it to be rejected. */
+async function sendWhoseStartFails(state: Awaited<ReturnType<typeof offered>>) {
+  state.acquire.mockRejectedValueOnce(new Error('Not signed in'))
+  const params = userSend('while signed out')
+  await state.host.send(CALLER, params)
+  await vi.waitFor(async () =>
+    expect(
+      (await state.host.journalSnapshot(SESSION)).submissions.find(
+        (entry) => entry.clientMessageId === params.envelope.clientOperationId
+      )
+    ).toMatchObject({ dispatchState: 'rejected' })
+  )
+}
+
+// A message the user sent is activity even when its start then failed.
+it('withdraws the offer when the user sends a message whose start then fails (R-08)', async () => {
+  const state = await offered()
+  const { host, root, dispatch } = state
+
+  await sendWhoseStartFails(state)
+
+  expect(await host.restartResume.list()).toEqual([])
+  await vi.waitFor(async () => expect(await offersIn(root)).toEqual([]), COLD_START)
+  // A click from a surface that still shows the offer finds nothing to act on.
+  expect(await host.restartResume.continueAfterRestart([SESSION], 'stale-click')).toMatchObject({
+    resumed: [],
+    continued: []
+  })
+  expect(dispatch).not.toHaveBeenCalled()
+})
+
+// The idle sweep closes a chat's open handle, and the next read opens a new one: the user's message
+// still counts, because it is read against where the journal stood when the offer was taken.
+it('keeps the offer withdrawn after the idle sweep closes the chat and it is read again', async () => {
+  const state = await offered()
+  const { host, root, clock } = state
+  await sendWhoseStartFails(state)
+  clock.now += STRUCTURED_AGENT_SESSION_IDLE_MS + 1
+
+  await sweepOnce(host)
+  expect(host.hasSession(SESSION)).toBe(false)
+  await host.revealSession(SESSION)
+
+  expect(await host.restartResume.list()).toEqual([])
+  // The listing retires what it finds moved on; the write trails the answer.
+  await vi.waitFor(async () => expect(await offersIn(root)).toEqual([]))
+})
+
+// A failure the chat moved on from is read from its journal like an offer is, open or not.
+it('keeps a failure not retryable after the user moved on and the sweep closed the chat', async () => {
+  const state = await offered()
+  const { host, clock } = state
+  state.acquire.mockRejectedValueOnce(new Error('provider could not reconnect'))
+  const resumed = await host.restartResume.continueAfterRestart([SESSION], 'modal')
+  expect(resumed.failed).toMatchObject([{ sessionId: SESSION, retryable: true }])
+  await sendWhoseStartFails(state)
+  expect(await host.restartResume.listFailures()).toMatchObject([{ retryable: false }])
+  clock.now += STRUCTURED_AGENT_SESSION_IDLE_MS + 1
+
+  await sweepOnce(host)
+  expect(host.hasSession(SESSION)).toBe(false)
+
+  expect(await host.restartResume.listFailures()).toMatchObject([{ retryable: false }])
+})
+
+const DAY_AND_AN_HOUR = 25 * 60 * 60 * 1000
+
+// An offer has no expiry; the ledger refuses a new id dated more than a day back.
+it('resumes more than a day after the quit', async () => {
+  const state = await offered()
+  const { host, clock, dispatch } = state
+  clock.now += DAY_AND_AN_HOUR
+
+  const resumed = await host.restartResume.continueAfterRestart([SESSION], 'modal')
+
+  expect(resumed.continued).toMatchObject([{ sessionId: SESSION, outcome: 'continued' }])
+  expect(sentTexts(dispatch)).toHaveLength(1)
+  expect(await host.restartResume.listFailures()).toEqual([])
+})
+
+// The offer remembers its own continuations; nothing about them expires before the offer does.
+it('keeps a failed resume retryable more than a day later, after the ledger pruned its row', async () => {
+  const state = await offered()
+  const { host, clock, store } = state
+  state.acquire.mockRejectedValueOnce(new Error('provider could not reconnect'))
+  const first = await host.restartResume.continueAfterRestart([SESSION], 'modal')
+  expect(first.failed).toMatchObject([{ sessionId: SESSION, retryable: true }])
+  clock.now += DAY_AND_AN_HOUR
+  // What an app restart does to the operation ledger a day on.
+  await store.reconcileOnRestart({
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: reconciliation only reads the probe outcome.
+    probe: async () => ({ outcome: 'pid-absent' }) as never,
+    now: clock.now
+  })
+
+  expect(await host.restartResume.listFailures()).toMatchObject([
+    { sessionId: SESSION, retryable: true }
+  ])
+  const retried = await host.restartResume.continueAfterRestart([SESSION], 'retry')
+  expect(retried.continued).toMatchObject([{ sessionId: SESSION, outcome: 'continued' }])
+})
+
+// The start was the continuation's own even after the provider refused it: the child it started,
+// running or since stopped, is still the offer's, so the offer stays retryable.
+it('keeps a resume retryable when its agent started but refused the continuation', async () => {
+  const state = await offered()
+  const { host, store } = state
+  const acquire = state.acquire.getMockImplementation()
+  if (!acquire) {
+    throw new Error('the harness acquire has no implementation')
+  }
+  state.acquire.mockImplementationOnce(async (input) => ({
+    ...(await acquire(input)),
+    acquisitionGeneration: 'generation-continuation'
+  }))
+  state.dispatch.mockResolvedValueOnce({
+    state: 'rejected',
+    ...agentSessionFailureWords(
+      agentSessionFailureFact('providerRejected', {
+        detail: { text: 'the provider refused the turn', audience: 'log' }
+      }),
+      { surface: 'rejection' }
+    )
+  })
+
+  const first = await host.restartResume.continueAfterRestart([SESSION], 'modal')
+
+  expect(state.acquire).toHaveBeenCalledOnce()
+  expect(first.failed).toMatchObject([{ sessionId: SESSION, retryable: true }])
+  expect(await host.restartResume.listFailures()).toMatchObject([
+    { sessionId: SESSION, retryable: true }
+  ])
+  // The child the continuation started exits after proving its start.
+  await host.handleAdapterEvent({
+    type: 'ended',
+    sessionId: SESSION,
+    fence: store.getRecord(SESSION)?.lease.runtimeFence ?? 0,
+    acquisitionGeneration: 'generation-continuation',
+    reason: 'codex app-server exited',
+    cause: 'unexpected-exit'
+  })
+  expect(await host.restartResume.listFailures()).toMatchObject([
+    { sessionId: SESSION, retryable: true }
+  ])
+  const retried = await host.restartResume.continueAfterRestart([SESSION], 'retry')
+  expect(retried.continued).toMatchObject([{ sessionId: SESSION, outcome: 'continued' }])
+})
+
+// A continuation handed to the agent may have landed even with no answer yet, so a retry could send
+// it twice: the failure it files is not retryable, as for one whose dispatch is in doubt.
+it('keeps an unanswered continuation the agent was handed from being sent again', async () => {
+  const state = await offered()
+  const { host } = state
+  // The agent took it and never answered; the wait for that answer ended first (too many waited).
+  state.dispatch.mockResolvedValueOnce({ state: 'admitted' })
+  const wait = host.waitForSendSettlement
+  vi.spyOn(host, 'waitForSendSettlement').mockImplementation(async (...args) =>
+    args[2]?.until === 'handed-over' ? wait(...args) : undefined
+  )
+
+  const first = await host.restartResume.continueAfterRestart([SESSION], 'modal')
+
+  expect(first.continued).toMatchObject([{ sessionId: SESSION, outcome: 'pending' }])
+  expect(await host.restartResume.listFailures()).toMatchObject([
+    { sessionId: SESSION, outcome: 'unconfirmed', retryable: false }
+  ])
+  expect(await host.restartResume.continueAfterRestart([SESSION], 'retry')).toMatchObject({
+    continued: []
+  })
+  expect(state.dispatch).toHaveBeenCalledOnce()
+})
+
+// The rejected continuation is the chat's newest user message; the row still names the user's.
+it("names the user's prompt on a failed retry, not the rejected continuation", async () => {
+  const state = await offered('submission')
+  const { host } = state
+  state.acquire.mockRejectedValueOnce(new Error('provider could not reconnect'))
+  const first = await host.restartResume.continueAfterRestart([SESSION], 'modal')
+  expect(first.failed).toMatchObject([{ latestPrompt: 'Perform the original task' }])
+
+  state.acquire.mockRejectedValueOnce(new Error('provider could not reconnect'))
+  const retried = await host.restartResume.continueAfterRestart([SESSION], 'retry')
+
+  expect(retried.failed).toMatchObject([
+    { latestPrompt: 'Perform the original task', retryable: true }
+  ])
+})
+
+// Resume that runs by itself at launch goes through the same call a click does, and the same rule
+// decides: whichever of the two was accepted first since the restart wins.
+it("refuses an automatic continuation when the user's message was accepted first, and writes nothing", async () => {
+  const { host, root, dispatch } = await offered()
+  const events: AgentSessionSubscribeEvent[] = []
+  const unsubscribe = await host.subscribe({
+    id: 'pane',
+    sessionId: SESSION,
+    emit: (event) => events.push(structuredClone(event))
+  })
+  const send = host.send
+  vi.spyOn(host, 'send').mockImplementationOnce(async (caller, params) => {
+    // Both accepted before any start, the user's first: the continuation queues behind the user's
+    // acceptance, ahead of the start that acceptance wakes.
+    let continuation: ReturnType<typeof send> | undefined
+    const append = AgentSessionJournal.prototype.appendSubmission
+    vi.spyOn(AgentSessionJournal.prototype, 'appendSubmission').mockImplementationOnce(
+      async function (this: AgentSessionJournal, ...args) {
+        continuation = send(caller, params)
+        await new Promise((resolve) => setTimeout(resolve, 50))
+        return append.apply(this, args)
+      }
+    )
+    await send(CALLER, userSend('A new request'))
+    return continuation!
+  })
+
+  const result = await host.restartResume.continueAfterRestart(undefined, 'launch')
+
+  expect(result.continued).toMatchObject([{ outcome: 'refused', reason: SUPERSEDED }])
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce(), COLD_START)
+  expect(sentTexts(dispatch)).toEqual(['A new request'])
+  // Nothing the user did failed: no row reached the reader, and nothing is kept.
+  expect(await statusNotes(host)).toEqual([])
+  expect(
+    events.some(
+      (event) =>
+        event.type === 'batch' && event.batch.items.some((item) => item.body.kind === 'status')
+    )
+  ).toBe(false)
+  expect(await offersIn(root)).toEqual([])
+  expect(await new AgentSessionRecoveryCapsule(root).listFailed(NOW)).toEqual([])
+  unsubscribe()
+})
+
+it('delivers a clicked continuation and a message sent right after it, in the order accepted', async () => {
+  const { host, root, dispatch } = await offered()
+  const send = host.send
+  vi.spyOn(host, 'send').mockImplementationOnce(async (caller, params) => {
+    const continuation = send(caller, params)
+    const user = send(CALLER, userSend('And then this'))
+    await user
+    return continuation
+  })
+
+  const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
+
+  expect(result.continued).toMatchObject([{ outcome: 'continued' }])
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledTimes(2), COLD_START)
+  const [first, second] = sentTexts(dispatch)
+  expect(first).not.toBe('And then this')
+  expect(second).toBe('And then this')
+  expect(await offersIn(root)).toEqual([])
+})
+
+describe('reading the chat against where the offer was taken', () => {
+  const TAKEN = { epoch: 'epoch-1', sequence: 5 }
+
+  const OFFER = {
+    sessionId: SESSION,
+    work: { kind: 'turn' as const, id: 'turn-1' },
+    recordedAt: NOW,
+    trigger: 'quit' as const,
+    providerHandleRoot: 'codex:"thread"',
+    teardownId: 'teardown-1'
+  }
+
+  function movedOn(
+    input: {
+      epoch?: string
+      submissions?: {
+        clientMessageId: string
+        acceptedSequence: number
+        dispatchState: string
+        handoverRecorded?: boolean
+        handedOverAt?: number
+      }[]
+    },
+    journalCursor: { epoch: string; sequence: number } | null = TAKEN
+  ): boolean {
+    const session = {
+      child: null,
+      journal: {
+        cursor: () => ({ epoch: input.epoch ?? TAKEN.epoch, sequence: 9 }),
+        submissions: () => input.submissions ?? []
+      }
+    }
+    const withdrawal = createStructuredAgentSessionRestartOfferWithdrawal({
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fact reads only the journal's cursor and submissions and the child fields given here.
+      sessions: new Map([[SESSION, session as never]]),
+      now: () => NOW,
+      enqueue: (operation) => operation()
+    })
+    return withdrawal.movedOn({ ...OFFER, ...(journalCursor ? { journalCursor } : {}) })
+  }
+
+  it('counts a message accepted after that position, and nothing before it', () => {
+    const at = (acceptedSequence: number) => ({
+      clientMessageId: `m-${acceptedSequence}`,
+      acceptedSequence,
+      dispatchState: 'rejected'
+    })
+    expect(movedOn({ submissions: [at(4), at(5)] })).toBe(false)
+    expect(movedOn({ submissions: [at(4), at(6)] })).toBe(true)
+  })
+
+  it('counts a journal on another epoch as moved on', () => {
+    expect(movedOn({ epoch: 'epoch-2' })).toBe(true)
+  })
+
+  it("does not count the offer's own continuation while queued or rejected, so a retry still runs", () => {
+    const own = restartContinuationId(OFFER, 'operation-1', NOW)
+    const rejected = { clientMessageId: own, acceptedSequence: 7, dispatchState: 'rejected' }
+    const queued = { ...rejected, dispatchState: 'pending', handoverRecorded: true }
+    expect(movedOn({ submissions: [rejected] })).toBe(false)
+    expect(movedOn({ submissions: [queued] })).toBe(false)
+    // Handed over, it may have reached the agent, answered or not.
+    expect(movedOn({ submissions: [{ ...queued, handedOverAt: NOW }] })).toBe(true)
+    expect(movedOn({ submissions: [{ ...rejected, dispatchState: 'accepted' }] })).toBe(true)
+    // Another offer's continuation, and any other message, is the chat moving on.
+    const other = restartContinuationId({ ...OFFER, teardownId: 'teardown-2' }, 'operation-1', NOW)
+    expect(movedOn({ submissions: [{ ...rejected, clientMessageId: other }] })).toBe(true)
+  })
+
+  // The retry's reservation lapses with the app, and the capsule hands back the failure's marker,
+  // written before the retry ran. The next launch rejects the retry's queued continuation.
+  it('keeps a failure retryable after the app crashed during its retry', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-crash-during-retry-'))
+    try {
+      const capsule = new AgentSessionRecoveryCapsule(root)
+      await capsule.record([{ ...OFFER, journalCursor: TAKEN }], NOW)
+      await capsule.beginResume([SESSION], 'operation-a', NOW)
+      await capsule.failResume(
+        'operation-a',
+        [
+          {
+            sessionId: SESSION,
+            failedAt: NOW,
+            outcome: 'refused',
+            reason: 'x',
+            latestPrompt: '',
+            latestUserItemId: null
+          }
+        ],
+        NOW
+      )
+      const [retrying] = await capsule.beginResume([SESSION], 'operation-b', NOW + 1)
+      if (!retrying) {
+        throw new Error('the retry reserved nothing')
+      }
+      const retry = restartContinuationId(retrying, 'operation-b', NOW + 1)
+      const afterCrash = NOW + 60 * 60_000
+      expect(await capsule.list(afterCrash)).toEqual([])
+      const [failed] = await capsule.listFailed(afterCrash)
+
+      const session = {
+        child: null,
+        journal: {
+          cursor: () => ({ epoch: TAKEN.epoch, sequence: 9 }),
+          submissions: () => [
+            { clientMessageId: retry, acceptedSequence: 7, dispatchState: 'rejected' }
+          ]
+        }
+      }
+      const withdrawal = createStructuredAgentSessionRestartOfferWithdrawal({
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fact reads only the journal's cursor and submissions and the child fields given here.
+        sessions: new Map([[SESSION, session as never]]),
+        now: () => afterCrash,
+        enqueue: (operation) => operation()
+      })
+      if (!failed) {
+        throw new Error('the failure did not outlive the crash')
+      }
+      expect(withdrawal.movedOn(failed.marker)).toBe(false)
+    } finally {
+      await rm(root, { recursive: true, force: true })
+    }
+  })
+
+  it('leaves an older build’s offer, which recorded no position, to a start', () => {
+    const after = { clientMessageId: 'm-7', acceptedSequence: 7, dispatchState: 'accepted' }
+    expect(movedOn({ submissions: [after], epoch: 'epoch-2' }, null)).toBe(false)
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-withdrawal.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-withdrawal.ts
new file mode 100644
index 000000000000..76d8006d9a1a
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-withdrawal.ts
@@ -0,0 +1,92 @@
+// When a restart offer ends without being acted on: the chat moved on.
+//
+// One derived fact decides it, for the offer list and for the continuation's own acceptance alike:
+// since the offer was taken, another message was accepted in the chat, or its agent proved a start.
+// A message is read against the journal position the offer recorded, so the answer survives any
+// number of handle closes. A start is known only to the host that saw it, so it is also written
+// to the recovery file when it happens. A restored row, a replayed row or a view carries neither,
+// so opening a chat withdraws nothing. The rest of a resume action does not count: its own
+// continuation, and the start that continuation waits on.
+
+import type { AgentSessionRecoveryCapsule } from '../../runtime/agent-session-recovery-capsule'
+import type { AgentSessionResumeMarker } from '../../../shared/agent-session-resume-marker'
+import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
+import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
+import { isRestartContinuationOf } from './structured-agent-session-restart-continuation-envelope'
+
+export type StructuredAgentSessionRestartOfferWithdrawal = ReturnType<
+  typeof createStructuredAgentSessionRestartOfferWithdrawal
+>
+
+export type StructuredAgentSessionRestartOfferSession = Pick<
+  StructuredAgentSessionHostSession,
+  'journal' | 'child' | 'lastEndedChild'
+>
+
+export function createStructuredAgentSessionRestartOfferWithdrawal(deps: {
+  sessions: ReadonlyMap<string, StructuredAgentSessionRestartOfferSession>
+  capsule?: Pick<AgentSessionRecoveryCapsule, 'dismiss'>
+  now: () => number
+  /** The capsule's single mutation lane, shared with the offer's own operations. */
+  enqueue: <T>(operation: () => Promise<T>) => Promise<T>
+}) {
+  const movedOn = (marker: AgentSessionResumeMarker): boolean => {
+    const session = deps.sessions.get(marker.sessionId)
+    if (!session) {
+      return false
+    }
+    const taken = marker.journalCursor
+    // An older build's offer recorded no position: only a start withdraws it.
+    const accepted =
+      taken !== undefined &&
+      (session.journal.cursor().epoch !== taken.epoch ||
+        session.journal.submissions().some(
+          (submission) =>
+            (submission.acceptedSequence ?? 0) > taken.sequence &&
+            // The offer's own continuation, still queued or rejected, never reached the agent: a
+            // retry sends a new one. One handed over may have, answered or not.
+            !(
+              (isQueuedAgentJournalSubmission(submission) ||
+                submission.dispatchState === 'rejected') &&
+              isRestartContinuationOf(marker, submission.clientMessageId)
+            )
+        ))
+    // Proven, not merely spawned: a start that failed during startup never ran the agent. Whose
+    // start it was is fixed when it was made, so a continuation rejected since still owns it.
+    const started =
+      session.child?.phase === 'ready'
+        ? session.child
+        : session.lastEndedChild?.duringStartup === false
+          ? session.lastEndedChild
+          : undefined
+    return (
+      accepted ||
+      (started !== undefined &&
+        !(started.startedFor !== undefined && isRestartContinuationOf(marker, started.startedFor)))
+    )
+  }
+
+  return {
+    movedOn,
+    /** The chat's agent proved a start: the offer and any failure record go from the recovery file,
+     *  unless the start was for one of that offer's own continuations. Advisory: a failed write is
+     *  logged, never raised. */
+    onAgentStarted: (sessionId: string): void => {
+      const session = deps.sessions.get(sessionId)
+      const capsule = deps.capsule
+      if (!capsule || !session) {
+        return
+      }
+      const startedFor = session.child?.startedFor
+      void deps
+        .enqueue(() =>
+          capsule.dismiss([sessionId], deps.now(), (marker) =>
+            startedFor === undefined ? false : isRestartContinuationOf(marker, startedFor)
+          )
+        )
+        .catch(() => {
+          console.warn('[structured-agent-session] withdrawing a restart offer failed')
+        })
+    }
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts
index c3301861c010..b45e08314a0d 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts
@@ -7,8 +7,6 @@ import { parseAgentSessionResumeMarker } from '../../../shared/agent-session-res
 import { join } from 'node:path'
 import { afterEach, expect, it, vi } from 'vitest'
 import { AgentSessionJournal } from '../agent-session-journal/journal-store'
-import { pendingApproval } from './structured-agent-session-restart-resume-test-harness'
-import { restartContinuationEnvelope } from './structured-agent-session-restart-continuation'
 import {
   AGENT_SESSION_RESTART_CONTINUATION_NOTE,
   AGENT_SESSION_RESTART_CONTINUATION_REFUSED_NOTE,
@@ -16,8 +14,8 @@ import {
 } from '../../../shared/agent-session-restart-continuation'
 import { STRUCTURED_AGENT_SESSION_RESTART_CONTINUATION_CALLER } from './structured-agent-session-restart-resume-wiring'
 import {
-  GRACE,
   interruptedRestart,
+  startAgent,
   statusNotes,
   supersededRefusal
 } from './structured-agent-session-restart-interruption-test-harness'
@@ -33,6 +31,8 @@ import {
   HOST_TEST_THREAD as THREAD,
   hostTestMessage
 } from './structured-agent-session-host-test-data'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
 
 afterEach(() => vi.useRealTimers())
 
@@ -40,7 +40,7 @@ it('publishes continuation attribution to the subscribed chat without another pr
   const { host } = await interruptedRestart()
   await host.restartResume.list()
   const emit = vi.fn()
-  const unsubscribe = host.subscribe({ id: 'pane', sessionId: SESSION, emit })
+  const unsubscribe = await host.subscribe({ id: 'pane', sessionId: SESSION, emit })
   try {
     expect(
       (await host.restartResume.continueAfterRestart([SESSION], 'modal')).continued
@@ -81,273 +81,75 @@ it.each(['turn', 'submission'] as const)(
   async (work) => {
     const { host, dispatch } = await interruptedRestart(work, false)
     expect(await host.restartResume.list()).toHaveLength(1)
-    await host.hold(SESSION, 'pane')
+    await startAgent(hostTestState())
     dispatch.mockResolvedValueOnce({ state: 'admitted' })
     const body = hostTestMessage('Stop the old task and do this instead')
     await host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
     await host.restartResume.continueAfterRestart([SESSION], 'modal')
     expect(dispatch).toHaveBeenCalledTimes(1)
-    expect(host.journalSnapshot(SESSION).submissions).toHaveLength(work === 'turn' ? 1 : 2)
-    host.release(SESSION, 'pane')
-    expect(host.isHeld(SESSION)).toBe(false)
+    expect((await host.journalSnapshot(SESSION)).submissions).toHaveLength(work === 'turn' ? 1 : 2)
   }
 )
 
-it('preserves the offer when the original submission receives its provider echo', async () => {
-  const { host, acquire, dispatch } = await interruptedRestart('submission', false)
-  expect(await host.restartResume.list()).toHaveLength(1)
-  await host.hold(SESSION, 'pane')
-  const events = acquire.mock.calls[0]?.[0].events
-  if (!events) {
-    throw new Error('missing resumed provider event sink')
-  }
-  events.appendItem(
-    { provider: 'codex', threadId: THREAD, turnId: 'original-turn', ordinal: 1 },
-    hostTestMessage('Perform the original task')
-  )
-  await host.flushStreamedEvents(SESSION)
-  expect(host.journalSnapshot(SESSION).submissions[0]?.dispatchState).toBe('accepted')
-  expect(
-    (await host.restartResume.continueAfterRestart([SESSION], 'modal')).continued
-  ).toMatchObject([{ outcome: 'continued' }])
-  expect(acquire).toHaveBeenCalledTimes(1)
-  expect(dispatch).toHaveBeenCalledTimes(1)
-  host.release(SESSION, 'pane')
-  expect(host.isHeld(SESSION)).toBe(false)
-})
-
-// Teardown judged the chat working, and only the user moving on withdraws that. A send the
-// provider proves it never received is still the chat Orca stopped; the continuation asks the agent
+// Teardown judged the chat working. A send the provider proves it never received is still the chat
+// Orca stopped; the continuation asks the agent
 // to check what finished rather than refusing.
 it('still continues a chat whose last send acquisition proves was never delivered', async () => {
   const { host, acquire, dispatch } = await interruptedRestart('submission')
   expect(await host.restartResume.list()).toHaveLength(1)
   const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
-  expect(host.journalSnapshot(SESSION).submissions[0]).toMatchObject({
+  expect((await host.journalSnapshot(SESSION)).submissions[0]).toMatchObject({
     dispatchState: 'rejected',
-    reason: 'not_delivered'
+    rejection: { kind: 'notDelivered' }
   })
   expect(acquire).toHaveBeenCalledTimes(1)
   expect(dispatch).toHaveBeenCalledTimes(1)
   expect(result.continued).toMatchObject([{ outcome: 'continued' }])
-  expect(host.isHeld(SESSION)).toBe(false)
-})
-
-/** Holds the continuation at send admission while `during` runs, then lets it proceed. */
-async function continueAcross(
-  state: Awaited<ReturnType<typeof interruptedRestart>>,
-  during: (events: NonNullable<ReturnType<typeof resumedEvents>>) => void
-) {
-  const { host, store } = state
-  expect(await host.restartResume.list()).toHaveLength(1)
-  await host.hold(SESSION, 'pane')
-  const events = resumedEvents(state)
-  if (!events) {
-    throw new Error('missing resumed provider event sink')
-  }
-  const admitting = Promise.withResolvers<void>()
-  const proceed = Promise.withResolvers<void>()
-  const admit = store.admitMutationOperation
-  vi.spyOn(store, 'admitMutationOperation').mockImplementationOnce(async (input) => {
-    admitting.resolve()
-    await proceed.promise
-    return admit(input)
-  })
-  const continuing = host.restartResume.continueAfterRestart([SESSION], 'modal')
-  await admitting.promise
-  during(events)
-  await host.flushStreamedEvents(SESSION)
-  proceed.resolve()
-  return continuing
-}
-
-function resumedEvents(state: Awaited<ReturnType<typeof interruptedRestart>>) {
-  return state.acquire.mock.calls[0]?.[0].events
-}
-
-it('refuses at send admission once the user has sent a newer message', async () => {
-  const state = await interruptedRestart()
-  const { host, dispatch } = state
-  const result = await continueAcross(state, (events) =>
-    events.appendItem(
-      { provider: 'codex', threadId: THREAD, turnId: 'newer-turn', ordinal: 1 },
-      hostTestMessage('A newer task from another client')
-    )
-  )
-  expect(result.resumed).toMatchObject([
-    { outcome: 'refused', reason: 'agent_session_restart_work_superseded' }
-  ])
-  expect(dispatch).not.toHaveBeenCalled()
-  expect(host.journalSnapshot(SESSION).submissions).toMatchObject([
-    { dispatchState: 'rejected', reason: 'agent_session_restart_work_superseded' }
-  ])
-  host.release(SESSION, 'pane')
-  expect(host.isHeld(SESSION)).toBe(false)
-})
-
-// Claude opens a turn of its own on reattach to say the last session did not finish. Resume is
-// pressed while that turn still runs: the continuation is sent and the provider queues it.
-it('sends the continuation while a turn the provider opened is still running', async () => {
-  const state = await interruptedRestart()
-  const { host, dispatch } = state
-  const result = await continueAcross(state, (events) =>
-    events.appendItem(
-      { provider: 'codex', threadId: THREAD, turnId: 'notice-turn', ordinal: 1 },
-      { kind: 'turn', turnId: 'notice-turn', state: 'running' }
-    )
-  )
-  expect(result.continued).toMatchObject([{ outcome: 'continued' }])
-  expect(dispatch).toHaveBeenCalledTimes(1)
-  host.release(SESSION, 'pane')
 })
 
-// The send the user made just before quitting, after an earlier exchange had finished. Neither
-// that finished turn nor the provider completing the send's own turn after the restart withdraws it.
+// The send the user made just before quitting, after an earlier exchange had finished: that
+// finished turn does not withdraw it.
 it('offers and continues a send made after an earlier completed turn', async () => {
-  const state = await interruptedRestart('send-after-reply', false)
-  const { host, dispatch, marker } = state
+  const { host, dispatch, marker } = await interruptedRestart('send-after-reply', false)
   expect(marker?.work.kind).toBe('submission')
-  const result = await continueAcross(state, (events) =>
-    events.appendItem(
-      { provider: 'codex', threadId: THREAD, turnId: 'original-turn', ordinal: 1 },
-      { kind: 'turn', turnId: 'original-turn', state: 'completed' }
-    )
-  )
+  const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
   expect(result.continued).toMatchObject([{ outcome: 'continued' }])
   expect(dispatch).toHaveBeenCalledTimes(1)
-  host.release(SESSION, 'pane')
 })
 
-it.each([false, true])(
-  'refuses a queued newer message before dispatch even if later settlement fails: %s',
-  async (settlementFails) => {
-    const { host, store, acquire, dispatch } = await interruptedRestart('submission', false)
-    expect(await host.restartResume.list()).toHaveLength(1)
-    await host.hold(SESSION, 'pane')
-    const events = acquire.mock.calls[0]?.[0].events
-    if (!events) {
-      throw new Error('missing resumed provider event sink')
-    }
-    const warning = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const settle = store.recordOperationOutcome.bind(store)
-    let admitted = false
-    vi.spyOn(store, 'recordOperationOutcome').mockImplementation(async (input) => {
-      if (admitted) {
-        if (settlementFails) {
-          throw new Error('operation outcome could not be persisted')
-        }
-        return settle(input)
-      }
-      await settle(input)
-      admitted = true
-      events.appendItem(
-        { provider: 'codex', threadId: THREAD, turnId: 'original-turn', ordinal: 2 },
-        { kind: 'status', text: 'Provider finished its last action' }
-      )
-      events.appendItem(
-        { provider: 'codex', threadId: THREAD, turnId: 'original-turn', ordinal: 1 },
-        hostTestMessage('A newer task from another client'),
-        { lifecycle: true }
-      )
-    })
-
-    const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
-
-    expect(result.continued).toMatchObject([
-      { outcome: 'refused', reason: 'agent_session_restart_work_superseded' }
-    ])
-    expect(dispatch).not.toHaveBeenCalled()
-    expect(host.journalSnapshot(SESSION).submissions).toHaveLength(2)
-    expect(host.journalSnapshot(SESSION).submissions[1]?.dispatchState).toBe('rejected')
-    host.release(SESSION, 'pane')
-    expect(host.isHeld(SESSION)).toBe(false)
-    // The offer is spent, but the refusal is kept as a durable failure: a retry finds it, and the
-    // superseded chat is still not eligible, so nothing runs and the record stays for the user.
-    expect(await host.restartResume.continueAfterRestart([SESSION], 'retry')).toMatchObject({
-      resumed: [],
-      continued: [],
-      sessions: [],
-      failed: [
-        { sessionId: SESSION, outcome: 'refused', reason: 'agent_session_restart_work_superseded' }
-      ]
-    })
-    expect(dispatch).not.toHaveBeenCalled()
-    if (settlementFails) {
-      expect(store.recordOperationOutcome).toHaveBeenCalledOnce()
-      expect(warning).not.toHaveBeenCalled()
-    }
-    warning.mockRestore()
-  }
-)
-
-// What the provider says after reattaching does not re-judge the offer.
-it.each(['completed', 'approval', 'question'] as const)(
-  'continues past provider %s evidence accepted while recording the continuation',
-  async (event) => {
-    const { host, acquire, dispatch } = await interruptedRestart()
-    await host.restartResume.list()
-    await host.hold(SESSION, 'pane')
-    const events = acquire.mock.calls[0]?.[0].events
-    if (!events) {
-      throw new Error('missing resumed provider event sink')
-    }
-    const append = AgentSessionJournal.prototype.appendSubmission
-    const writing = vi.spyOn(AgentSessionJournal.prototype, 'appendSubmission')
-    writing.mockImplementationOnce(async function (this: AgentSessionJournal, input) {
-      const cursor = await append.call(this, input)
-      events.appendItem(
-        { provider: 'codex', threadId: THREAD, turnId: 'interrupted-turn', ordinal: 1 },
-        event === 'completed'
-          ? { kind: 'turn', turnId: 'interrupted-turn', state: 'completed' }
-          : { ...pendingApproval().body, question: 'Which action?', kind: event },
-        { lifecycle: true }
-      )
-      return cursor
-    })
-    try {
-      const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
-      expect(result.continued).toMatchObject([{ outcome: 'continued' }])
-      expect(dispatch).toHaveBeenCalledTimes(1)
-    } finally {
-      writing.mockRestore()
-      host.release(SESSION, 'pane')
-    }
-  }
-)
-
 it('replays the same logical continuation through the durable send ledger', async () => {
-  const { host, store, dispatch, marker } = await interruptedRestart()
-  if (!marker) {
-    throw new Error('missing interrupted restart marker')
-  }
+  const { host, dispatch } = await interruptedRestart()
+  const sending = vi.spyOn(host, 'send')
   await host.restartResume.continueAfterRestart([SESSION], 'modal')
-  const fence = store.getRecord(SESSION)?.lease.runtimeFence
-  if (fence === undefined) {
-    throw new Error('missing resumed lease')
+  const sent = sending.mock.calls[0]?.[1]
+  sending.mockRestore()
+  if (!sent) {
+    throw new Error('the continuation was not sent')
   }
   const replay = await host.send(
     { callerKey: STRUCTURED_AGENT_SESSION_RESTART_CONTINUATION_CALLER },
-    restartContinuationEnvelope(SESSION, fence, marker)
+    { envelope: sent.envelope, body: sent.body }
   )
   expect(replay).toMatchObject({ ok: true, replayed: true })
-  expect(host.journalSnapshot(SESSION).submissions).toHaveLength(1)
+  expect((await host.journalSnapshot(SESSION)).submissions).toHaveLength(1)
   expect(dispatch).toHaveBeenCalledTimes(1)
 })
 
+// A send that throws after Orca may have taken it is not proof it was not delivered.
 it.each([false, true])(
-  'keeps dispatched delivery unconfirmed when settlement fails (uncertainty write fails: %s)',
+  'keeps a continuation unconfirmed when its acceptance cannot be recorded (uncertainty write fails: %s)',
   async (uncertaintyFails) => {
-    const { host, store, dispatch } = await interruptedRestart()
+    const { host, store } = await interruptedRestart()
     const warning = vi.spyOn(console, 'warn').mockImplementation(() => {})
     expect(await host.restartResume.list()).toHaveLength(1)
-    await host.hold(SESSION, 'pane')
     const settle = store.recordOperationOutcome.bind(store)
-    let dispatched = false
-    vi.spyOn(store, 'recordOperationOutcome').mockImplementation(async (input) => {
-      if (input.outcome.status === 'succeeded') {
-        dispatched = true
-      }
-      if (dispatched && (input.outcome.status === 'succeeded' || uncertaintyFails)) {
+    const recording = vi.spyOn(store, 'recordOperationOutcome')
+    recording.mockImplementation(async (input) => {
+      // Only the continuation's own record: the start it makes records its attach as usual.
+      if (
+        input.callerKey === STRUCTURED_AGENT_SESSION_RESTART_CONTINUATION_CALLER &&
+        (input.outcome.status === 'succeeded' || uncertaintyFails)
+      ) {
         throw new Error('operation outcome could not be persisted')
       }
       return settle(input)
@@ -355,127 +157,96 @@ it.each([false, true])(
 
     const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
 
-    expect(dispatch).toHaveBeenCalledTimes(1)
-    expect(host.journalSnapshot(SESSION).submissions[0]?.dispatchState).toBe('accepted')
     expect(result.continued).toMatchObject([{ sessionId: SESSION, outcome: 'unknown' }])
-    // Filed as unconfirmed, with a warning in the chat; the continuation's own message is part of
-    // the filed state, so it does not retire the record it caused.
+    // Filed as unconfirmed, with a warning in the chat.
     expect(result.failed).toMatchObject([{ sessionId: SESSION, outcome: 'unconfirmed' }])
-    expect(statusNotes(host)).toContainEqual({
+    expect(await statusNotes(host)).toContainEqual({
       text: AGENT_SESSION_RESTART_CONTINUATION_UNCONFIRMED_NOTE,
       tone: 'warning'
     })
-    host.release(SESSION, 'pane')
-    expect(host.isHeld(SESSION)).toBe(false)
-    await host.restartResume.continueAfterRestart([SESSION], 'retry')
-    expect(dispatch).toHaveBeenCalledTimes(1)
-    expect(await host.restartResume.listFailures()).toMatchObject([{ outcome: 'unconfirmed' }])
-    expect(warning.mock.calls.flat()).not.toContainEqual(
-      expect.objectContaining({ message: 'operation outcome could not be persisted' })
-    )
+    recording.mockRestore()
     warning.mockRestore()
   }
 )
 
-it('releases a failed acquisition and leaves the offer retryable', async () => {
+// The continuation is accepted, then its start fails: the message is rejected with the cause and
+// the failure is filed, and nothing is stopped because nothing started.
+it('rejects the continuation when its start fails, and files a retryable refusal', async () => {
   const { host, acquire, dispatch, closeSession } = await interruptedRestart()
   acquire.mockRejectedValueOnce(new Error('provider could not reconnect'))
-  expect(await host.restartResume.resume([SESSION], 'modal')).toMatchObject([
-    { outcome: 'refused' }
+  const result = await host.restartResume.continueAfterRestart([SESSION], 'modal')
+  expect(result.resumed).toMatchObject([{ outcome: 'refused' }])
+  expect(result.continued).toMatchObject([{ outcome: 'refused' }])
+  // Nothing ran, so the offer stands as a failure a retry can act on.
+  expect(result.failed).toMatchObject([{ sessionId: SESSION, outcome: 'refused', retryable: true }])
+  expect(await statusNotes(host)).toContainEqual({
+    text: AGENT_SESSION_RESTART_CONTINUATION_REFUSED_NOTE,
+    tone: 'error'
+  })
+  expect((await host.journalSnapshot(SESSION)).submissions).toMatchObject([
+    { dispatchState: 'rejected' }
   ])
-  expect(host.isHeld(SESSION)).toBe(false)
-  await host.restartResume.continueAfterRestart([SESSION], 'retry')
-  expect(acquire).toHaveBeenCalledTimes(2)
-  expect(dispatch).toHaveBeenCalledTimes(1)
+  expect(acquire).toHaveBeenCalledTimes(1)
+  expect(dispatch).not.toHaveBeenCalled()
   expect(closeSession).not.toHaveBeenCalled()
 })
 
-it.each([false, true])(
-  'admits one durable continuation under concurrent calls (pane already live: %s)',
-  async (alreadyLive) => {
-    const { host, root, acquire, dispatch } = await interruptedRestart()
-    if (alreadyLive) {
-      expect(await host.restartResume.list()).toHaveLength(1)
-      await host.hold(SESSION, 'pane')
-    }
-    const results = await Promise.all([
-      host.restartResume.continueAfterRestart([SESSION], 'window-one'),
-      host.restartResume.continueAfterRestart([SESSION], 'window-two')
-    ])
-    expect(
-      results.flatMap((result) => result.resumed).filter((r) => r.outcome === 'resumed')
-    ).toHaveLength(1)
-    expect(
-      results.flatMap((result) => result.continued).filter((r) => r.outcome === 'continued')
-    ).toHaveLength(1)
-    expect(acquire).toHaveBeenCalledTimes(1)
-    expect(dispatch).toHaveBeenCalledTimes(1)
-    expect(host.journalSnapshot(SESSION).submissions).toHaveLength(1)
-    expect(await new AgentSessionRecoveryCapsule(root).list(NOW)).toEqual([])
-    await host.restartResume.continueAfterRestart([SESSION], 'later-click')
-    expect(dispatch).toHaveBeenCalledTimes(1)
-    host.release(SESSION, 'pane')
-  }
-)
-
-it.each([false, true])(
-  'releases reconnect acquisition to idle eviction (pane: %s)',
-  async (pane) => {
-    const { host, acquire, dispatch, closeSession } = await interruptedRestart()
-    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
-    expect(await host.restartResume.resume([SESSION], 'modal')).toMatchObject([
-      { outcome: 'resumed' }
-    ])
-    expect(host.isHeld(SESSION)).toBe(false)
-    if (pane) {
-      await host.hold(SESSION, 'pane')
-      await vi.advanceTimersByTimeAsync(GRACE * 2)
-      expect(closeSession).not.toHaveBeenCalled()
-      host.release(SESSION, 'pane')
-    }
-    await vi.advanceTimersByTimeAsync(GRACE)
-    await vi.waitFor(() => expect(closeSession).toHaveBeenCalledTimes(1))
-    expect(acquire).toHaveBeenCalledTimes(1)
-    expect(dispatch).not.toHaveBeenCalled()
-  }
-)
+it('admits one durable continuation under concurrent calls', async () => {
+  const { host, root, acquire, dispatch } = await interruptedRestart()
+  const results = await Promise.all([
+    host.restartResume.continueAfterRestart([SESSION], 'window-one'),
+    host.restartResume.continueAfterRestart([SESSION], 'window-two')
+  ])
+  expect(
+    results.flatMap((result) => result.resumed).filter((r) => r.outcome === 'resumed')
+  ).toHaveLength(1)
+  expect(
+    results.flatMap((result) => result.continued).filter((r) => r.outcome === 'continued')
+  ).toHaveLength(1)
+  expect(acquire).toHaveBeenCalledTimes(1)
+  expect(dispatch).toHaveBeenCalledTimes(1)
+  expect((await host.journalSnapshot(SESSION)).submissions).toHaveLength(1)
+  expect(await new AgentSessionRecoveryCapsule(root).list(NOW)).toEqual([])
+  await host.restartResume.continueAfterRestart([SESSION], 'later-click')
+  expect(dispatch).toHaveBeenCalledTimes(1)
+})
 
-it('retains acquisition through slow continuation settlement, then releases it', async () => {
-  const { host, dispatch, closeSession } = await interruptedRestart()
-  vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+// The batch counts a chat done once its agent took the continuation; the provider's slow answer is
+// awaited after, and decides the outcome.
+it('waits out a slow provider answer before reporting the continuation', async () => {
+  const { host, dispatch } = await interruptedRestart()
   const settlement = Promise.withResolvers<Awaited<ReturnType<typeof dispatch>>>()
   const dispatched = Promise.withResolvers<void>()
   dispatch.mockImplementationOnce(() => {
     dispatched.resolve()
     return settlement.promise
   })
-  const continuing = host.restartResume.continueAfterRestart([SESSION], 'modal')
+  let settled = false
+  const continuing = host.restartResume
+    .continueAfterRestart([SESSION], 'modal')
+    .finally(() => (settled = true))
   await dispatched.promise
-  await vi.advanceTimersByTimeAsync(GRACE * 2)
-  expect(host.isHeld(SESSION)).toBe(true)
-  expect(closeSession).not.toHaveBeenCalled()
-  settlement.resolve({ state: 'rejected', reason: 'provider refused' })
+  await new Promise((resolve) => setTimeout(resolve, 20))
+  expect(settled).toBe(false)
+  settlement.resolve({
+    state: 'rejected',
+    ...agentSessionFailureWords(agentSessionFailureFact('providerRejected'), {
+      surface: 'rejection'
+    })
+  })
   expect((await continuing).continued).toMatchObject([{ outcome: 'refused' }])
-  expect(host.isHeld(SESSION)).toBe(false)
-  await vi.advanceTimersByTimeAsync(GRACE)
-  await vi.waitFor(() => expect(closeSession).toHaveBeenCalledTimes(1))
   expect(dispatch).toHaveBeenCalledTimes(1)
 })
 
-// Opening the chat is inspection only. The explicit restart action is what removes the durable
-// offer, so ordinary pane lifecycle must not make this status disappear.
+// Opening the chat is inspection only: it starts nothing, and the explicit restart action is what
+// removes the durable offer, so reading the chat must not make this status disappear.
 it('keeps offering a chat after the user opens it', async () => {
-  const { host, root, store } = await interruptedRestart()
+  const { host, root, acquire } = await interruptedRestart()
   expect(await host.restartResume.list()).toHaveLength(1)
-  vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
-  await host.hold(SESSION, 'pane')
-  host.release(SESSION, 'pane')
-  await vi.advanceTimersByTimeAsync(GRACE)
-  // The whole eviction, not just the provider stop: the lease returns to `released` on the step
-  // before the last, and until it does the offer is refused for a reason that is not recovery.
-  await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
-  expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
-  vi.useRealTimers()
+  const unsubscribe = await host.subscribe({ id: 'pane', sessionId: SESSION, emit: vi.fn() })
+  await host.history({ sessionId: SESSION, direction: 'tail' })
+  unsubscribe()
+  expect(acquire).not.toHaveBeenCalled()
 
   expect(await host.restartResume.list()).toHaveLength(1)
   await host.restartResume.recordMarkers()
@@ -544,7 +315,7 @@ it('keeps concurrent recovery reads independent and non-destructive', async () =
   list.mockRestore()
 })
 
-it('fails closed on corrupt recovery storage while ordinary hold and send still work', async () => {
+it('fails closed on corrupt recovery storage while an ordinary send still works', async () => {
   const { host, root, dispatch } = await interruptedRestart()
   await writeFile(join(root, AGENT_SESSION_RECOVERY_CAPSULE_FILE), '{')
   const warning = vi.spyOn(console, 'warn').mockImplementation(() => {})
@@ -555,81 +326,56 @@ it('fails closed on corrupt recovery storage while ordinary hold and send still
     sessions: [],
     failed: []
   })
-  await host.hold(SESSION, 'pane')
   const body = hostTestMessage('A fresh ordinary request')
   expect(
     await host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
   ).toMatchObject({ ok: true })
-  expect(dispatch).toHaveBeenCalledTimes(1)
-  // list; the action's read of offers and of failures; the post-action refresh of both.
-  expect(warning).toHaveBeenCalledTimes(5)
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledTimes(1))
+  // list; the action's read of offers and of failures; the post-action refresh of both. The send
+  // cannot withdraw an offer it cannot read either, and says so.
+  const withdrawing = '[structured-agent-session] withdrawing a restart offer failed'
+  await vi.waitFor(() => expect(warning).toHaveBeenLastCalledWith(withdrawing))
+  expect(warning.mock.calls.filter(([message]) => message !== withdrawing)).toHaveLength(5)
   warning.mockRestore()
-  host.release(SESSION, 'pane')
 })
 
-// The toast is gone in seconds and the offer is spent by the reattach, so without this record
-// nothing on any surface would still name the chat the user has to continue by hand.
-it('keeps a refused continuation as a durable failure that names the chat and the reason', async () => {
-  const { host, root, result } = await supersededRefusal()
-  const failure = {
-    sessionId: SESSION,
-    outcome: 'refused',
-    reason: 'agent_session_restart_work_superseded',
-    latestPrompt: expect.any(String),
-    agent: 'codex',
-    retryable: false
-  }
-  expect(result).toMatchObject({ sessions: [], failed: [failure] })
-  // The chat itself says what happened and what to do.
-  expect(statusNotes(host)).toContainEqual({
-    text: AGENT_SESSION_RESTART_CONTINUATION_REFUSED_NOTE,
-    tone: 'error'
+// The user's own message was accepted first: the continuation is refused, and since nothing the
+// user did failed, the chat says nothing and no failure is kept.
+it("refuses a continuation quietly when the user's own message was accepted first", async () => {
+  const { host, root, dispatch, result } = await supersededRefusal()
+  expect(result).toMatchObject({
+    continued: [{ outcome: 'refused', reason: 'agent_session_restart_work_superseded' }],
+    sessions: [],
+    failed: []
   })
-  expect(await host.restartResume.list()).toEqual([])
-  expect(await host.restartResume.listFailures()).toMatchObject([failure])
-  // Durable: a fresh reader of the same file sees it too.
-  expect(await new AgentSessionRecoveryCapsule(root).listFailed(NOW)).toMatchObject([
-    { marker: { sessionId: SESSION }, outcome: 'refused' }
-  ])
-  host.release(SESSION, 'pane')
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
+  expect(await statusNotes(host)).toEqual([])
+  expect(await new AgentSessionRecoveryCapsule(root).list(NOW)).toEqual([])
+  expect(await new AgentSessionRecoveryCapsule(root).listFailed(NOW)).toEqual([])
 })
 
-// The failure asked the user to continue the chat themselves; their own message is that
-// continuation. Nothing on the send path clears it: the listing sees the newer message.
+/** A continuation whose start failed, filed as a retryable failure. */
+async function failedContinuation() {
+  const state = await interruptedRestart()
+  state.acquire.mockRejectedValueOnce(new Error('provider could not reconnect'))
+  const result = await state.host.restartResume.continueAfterRestart([SESSION], 'modal')
+  expect(result.failed).toMatchObject([{ sessionId: SESSION, outcome: 'refused' }])
+  return state
+}
+
+// Starting the chat's agent again answers a failure, as it ends an offer.
 it('retires a recorded failure once the user sends in that chat, with no send hook', async () => {
-  const { host, root } = await supersededRefusal()
+  const { host, root, dispatch } = await failedContinuation()
   const body = hostTestMessage('Carry on from where you stopped')
   await host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
-  expect(await host.restartResume.listFailures()).toEqual([])
-  // Pruned from the file too, not only hidden.
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
+  // Pruned from the file, not only hidden.
   await vi.waitFor(async () => {
     expect(await new AgentSessionRecoveryCapsule(root).listFailed(NOW)).toEqual([])
   })
-  host.release(SESSION, 'pane')
+  expect(await host.restartResume.listFailures()).toEqual([])
 })
 
-// The user can reply in a chat while other chats in the same action are still being continued,
-// before its turn in the batch or after its own note asks them to. Either reply answers the failure.
-it.each(['before', 'after'] as const)(
-  'retires a failure the user answered %s its own attempt, before the action settled',
-  async (userAnswers) => {
-    const { host, root, result } = await supersededRefusal(userAnswers)
-    expect(result.resumed).toMatchObject([
-      userAnswers === 'before' ? { reason: 'agent_session_resume_not_eligible' } : {}
-    ])
-    expect(
-      statusNotes(host).some(
-        (note) => note.text === AGENT_SESSION_RESTART_CONTINUATION_REFUSED_NOTE
-      )
-    ).toBe(userAnswers === 'after')
-    expect(result.failed).toEqual([])
-    await vi.waitFor(async () => {
-      expect(await new AgentSessionRecoveryCapsule(root).listFailed(NOW)).toEqual([])
-    })
-    host.release(SESSION, 'pane')
-  }
-)
-
 it('removes a failure when a named retry succeeds', async () => {
   const { host, root, dispatch } = await interruptedRestart()
   const capsule = new AgentSessionRecoveryCapsule(root)
@@ -645,7 +391,7 @@ it('removes a failure when a named retry succeeds', async () => {
         outcome: 'refused',
         reason: 'agent_session_conflict',
         latestPrompt: '',
-        latestUserItemId: pending!.latestUserItemId
+        latestUserItemId: pending!.latestUserItemId ?? null
       }
     ],
     NOW
@@ -661,7 +407,7 @@ it('removes a failure when a named retry succeeds', async () => {
 })
 
 it('dismisses one failure by name and leaves the rest of the durable records alone', async () => {
-  const { host, root } = await supersededRefusal()
+  const { host, root } = await failedContinuation()
   const capsule = new AgentSessionRecoveryCapsule(root)
   const other = parseAgentSessionResumeMarker({
     sessionId: 'session-other',
@@ -680,7 +426,6 @@ it('dismisses one failure by name and leaves the rest of the durable records alo
   expect(await host.restartResume.dismiss([SESSION])).toBe(1)
   expect(await host.restartResume.listFailures()).toEqual([])
   expect(await capsule.list(NOW)).toEqual([other])
-  host.release(SESSION, 'pane')
 })
 
 it('logs teardown capsule publication failure and still releases the provider', async () => {
@@ -699,7 +444,9 @@ it('logs teardown capsule publication failure and still releases the provider',
   await mkdir(capsulePath)
   const warning = vi.spyOn(console, 'warn').mockImplementation(() => {})
   await expect(previous.host.flushAllStreamedEvents()).resolves.toBeUndefined()
-  expect(() => previous.host.journalSnapshot(SESSION)).toThrow('agent_session_ownership_unknown')
+  await expect(previous.host.journalSnapshot(SESSION)).rejects.toThrow(
+    'agent_session_ownership_unknown'
+  )
   expect(warning).toHaveBeenCalledWith(
     '[structured-agent-session] recording recovery capsule failed'
   )
@@ -708,3 +455,29 @@ it('logs teardown capsule publication failure and still releases the provider',
   warning.mockRestore()
   await rm(capsulePath, { recursive: true })
 })
+
+// The resume ledger's reason stays the refusal code, which is what every renderer's guidance keys
+// on; the details are filed beside it, never in its place.
+it('files a restart refused by a conflicted claim under its code, with its details beside it', async () => {
+  // The terminal agent that holds the claim is still running, so nothing may take it over.
+  const { host, store } = await interruptedRestart('turn', true, async () => ({
+    outcome: 'identity-matched',
+    matchedOn: ['spawn-token']
+  }))
+  await store.transitionHandoff(SESSION, (record) => ({
+    ...record,
+    lease: {
+      ...record.lease,
+      claimStatus: 'conflicted',
+      ownerProcess: { hostId: 'local', pid: 4242, processStartTimeMs: 1, spawnToken: 'terminal' }
+    }
+  }))
+
+  await host.restartResume.continueAfterRestart([SESSION], 'modal')
+
+  await vi.waitFor(async () =>
+    expect(await host.restartResume.listFailures()).toMatchObject([
+      { reason: 'agent_session_conflict', details: { reason: 'claimConflicted' } }
+    ])
+  )
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-restore.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-restore.test.ts
index 56d5e0b23172..90875832c8f2 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-restore.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-restore.test.ts
@@ -10,10 +10,13 @@ vi.mock('./structured-agent-session-read-restore', () => ({
   restoreStructuredAgentSessionRead: restoreRead
 }))
 
-import {
-  restoreOneStructuredAgentSessionRead,
-  restoreStructuredAgentSessionsOnRestart
-} from './structured-agent-session-restart-restore'
+import { restoreStructuredAgentSessionsOnRestart } from './structured-agent-session-restart-restore'
+
+const NO_OPEN_DEPS = {
+  store: { getRecord: () => null, listRecords: () => [] },
+  journalRoot: '/tmp/journals',
+  adapter: {}
+}
 
 describe('restart journal restoration', () => {
   beforeEach(() => restoreRead.mockReset())
@@ -22,17 +25,19 @@ describe('restart journal restoration', () => {
     const gate = Promise.withResolvers<void>()
     let active = 0
     let peak = 0
-    restoreRead.mockImplementation(async (_store, _root, sessionId: string) => {
+    restoreRead.mockImplementation(async (_deps, sessionId: string) => {
       active += 1
       peak = Math.max(peak, active)
       await gate.promise
       active -= 1
       return {
-        journal: {},
-        params: { location: { workspaceId: 'workspace-1' }, provider: 'codex' },
-        fence: 1,
-        hasProviderChild: false,
-        sessionId
+        session: {
+          journal: {},
+          params: { location: { workspaceId: 'workspace-1' }, provider: 'codex' },
+          child: null,
+          sessionId
+        },
+        reset: null
       }
     })
     const records = Array.from(
@@ -41,15 +46,13 @@ describe('restart journal restoration', () => {
     )
 
     const restoration = restoreStructuredAgentSessionsOnRestart({
-      store: {} as never,
-      journalRoot: '/tmp/journals',
+      openDeps: NO_OPEN_DEPS,
       records,
       reconcile: async () => null,
       resolveRecovery: async () => undefined,
       serialize: async (_sessionId, task) => task(),
       hasSession: () => false,
-      onReadable: () => undefined,
-      settleStaleState: async () => undefined
+      onReadable: () => undefined
     })
 
     await vi.waitFor(() => expect(active).toBe(4))
@@ -82,61 +85,51 @@ describe('restart journal restoration', () => {
       runtimeKind: 'native'
     }
     const restored = {
-      journal: {},
-      params,
-      fence: 4,
-      hasProviderChild: false,
-      acquisitionGeneration: null
+      session: { journal: {}, params, child: null },
+      reset: null
     }
-    restoreRead.mockResolvedValue(restored)
+    // The open is what settles: it runs after recovery resolution and before the publish.
+    restoreRead.mockImplementation(async () => {
+      calls.push('open')
+      return restored
+    })
 
-    await restoreOneStructuredAgentSessionRead(
-      {
-        store: {} as never,
-        journalRoot: '/tmp/journals',
-        reconcile: async () => null,
-        resolveRecovery: async () => {
-          calls.push('resolveRecovery')
-        },
-        serialize: async (_sessionId, task) => task(),
-        hasSession: () => false,
-        onReadable: () => {
-          calls.push('onReadable')
-        },
-        settleStaleState: async (_sessionId, settled) => {
-          calls.push(settled === restored ? 'settleStaleState:restored' : 'settleStaleState')
-        }
+    await restoreStructuredAgentSessionsOnRestart({
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the restore reads only the record's session id here.
+      records: [{ sessionId: 'session-1' } as AgentSessionRecord],
+      openDeps: NO_OPEN_DEPS,
+      reconcile: async () => null,
+      resolveRecovery: async () => {
+        calls.push('resolveRecovery')
       },
-      'session-1'
-    )
+      serialize: async (_sessionId, task) => task(),
+      hasSession: () => false,
+      onReadable: (_sessionId, readable) => {
+        calls.push(readable === restored ? 'onReadable:restored' : 'onReadable')
+      }
+    })
 
-    expect(calls).toEqual(['resolveRecovery', 'settleStaleState:restored', 'onReadable'])
+    expect(calls).toEqual(['resolveRecovery', 'open', 'onReadable:restored'])
   })
 
   it('does not settle again when a second restore finds the session already open', async () => {
-    const settleStaleState = vi.fn(async () => undefined)
     restoreRead.mockResolvedValue({
-      journal: {},
-      params: {},
-      fence: 4,
-      hasProviderChild: false,
-      acquisitionGeneration: null
+      session: { journal: {}, params: {}, child: null },
+      reset: null
     })
 
-    await restoreOneStructuredAgentSessionRead(
-      {
-        store: {} as never,
-        journalRoot: '/tmp/journals',
-        reconcile: async () => null,
-        resolveRecovery: async () => undefined,
-        serialize: async (_sessionId, task) => task(),
-        hasSession: () => true,
-        onReadable: () => undefined,
-        settleStaleState
-      },
-      'session-1'
-    )
+    await restoreStructuredAgentSessionsOnRestart({
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the restore reads only the record's session id here.
+      records: [{ sessionId: 'session-1' } as AgentSessionRecord],
+      openDeps: NO_OPEN_DEPS,
+      reconcile: async () => null,
+      resolveRecovery: async () => undefined,
+      serialize: async (_sessionId, task) => task(),
+      hasSession: () => true,
+      onReadable: () => undefined
+    })
 
-    expect(settleStaleState).not.toHaveBeenCalled()
+    // The open is where the settlement runs, and a session already open is not opened again.
+    expect(restoreRead).not.toHaveBeenCalled()
   })
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-restore.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-restore.ts
index 1b5d8864ae5c..d54687c25a64 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-restore.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-restore.ts
@@ -8,43 +8,37 @@
 // It does not owe a provider child. This used to resume every record whose lease was `released`,
 // which is the normal end state of a chat the user closed cleanly — so a
 // healthy profile started an app-server per session it had ever used, in parallel, at every launch,
-// with no client attached and nothing on screen. A child now exists because a surface asked for the
-// session (see `structured-agent-session-holds`), not because a record survived on disk.
+// with no client attached and nothing on screen. A child now exists because work asked for it — a
+// send, through the delivery loop — not because a record survived on disk.
 
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
-import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import { mapWithConcurrency } from '../../../shared/map-with-concurrency'
-import {
-  restoreStructuredAgentSessionRead,
-  type RestoredStructuredAgentSessionRead
-} from './structured-agent-session-read-restore'
+import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import type {
+  OpenedStructuredAgentSessionConversation,
+  StructuredAgentSessionConversationOpenDeps
+} from './structured-agent-session-conversation-open'
+import { restoreStructuredAgentSessionRead } from './structured-agent-session-read-restore'
 
 const JOURNAL_RESTORE_CONCURRENCY = 4
 
 export type StructuredAgentSessionReadRestoreDeps = {
-  store: AgentSessionRecordStore
-  journalRoot: string
+  openDeps: StructuredAgentSessionConversationOpenDeps & {
+    store: Pick<AgentSessionRecordStore, 'getRecord' | 'listRecords'>
+  }
   reconcile: (sessionId: string) => Promise<AgentSessionWireRefusal | null>
   resolveRecovery: (sessionId: string) => Promise<unknown>
   serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
   hasSession: (sessionId: string) => boolean
-  onReadable: (sessionId: string, restored: RestoredStructuredAgentSessionRead) => void
-  /** Settles what a previous generation left running. Best effort: the next acquire re-derives it. */
-  settleStaleState: (
+  onReadable: (
     sessionId: string,
-    restored: RestoredStructuredAgentSessionRead
-  ) => Promise<void>
+    opened: OpenedStructuredAgentSessionConversation
+  ) => Promise<void> | void
 }
 
-/**
- * One session's share of the restart restore, and the whole of an on-demand one.
- *
- * Startup maps this over every supported record; a surface asking for a session it cannot see
- * calls it for one id. The CALLER decides which records are eligible — startup filters by
- * `supportsRecord` before mapping, so an on-demand caller owes the same check.
- */
-export async function restoreOneStructuredAgentSessionRead(
+/** One session's share of the restart restore. Startup maps this over every supported record. */
+async function restoreOneStructuredAgentSessionRead(
   input: StructuredAgentSessionReadRestoreDeps,
   sessionId: string
 ): Promise<void> {
@@ -58,31 +52,21 @@ export async function restoreOneStructuredAgentSessionRead(
   )
 }
 
-/** The serialized half of the restore, for a caller already inside the session's serialize — a
- *  send replaying into a session this host has closed, which needs the journal and no child. */
-export async function restoreOneStructuredAgentSessionReadUnderSerialize(
-  input: Pick<
-    StructuredAgentSessionReadRestoreDeps,
-    'store' | 'journalRoot' | 'hasSession' | 'onReadable' | 'settleStaleState'
-  >,
+/** The serialized half of the restore. */
+async function restoreOneStructuredAgentSessionReadUnderSerialize(
+  input: Pick<StructuredAgentSessionReadRestoreDeps, 'openDeps' | 'hasSession' | 'onReadable'>,
   sessionId: string
 ): Promise<void> {
   if (input.hasSession(sessionId)) {
-    // A surface that took a hold mid-restore already attached this one.
+    // A read or a send mid-restore already opened this one.
     return
   }
-  const restored = await restoreStructuredAgentSessionRead(
-    input.store,
-    input.journalRoot,
-    sessionId
-  )
-  if (!restored) {
+  const opened = await restoreStructuredAgentSessionRead(input.openDeps, sessionId)
+  if (!opened) {
     return
   }
-  // No child in this process writes to a journal with no map entry, so anything it shows running
-  // belongs to a generation that is gone. Settled before it is published, so no reader sees it run.
-  await input.settleStaleState(sessionId, restored)
-  input.onReadable(sessionId, restored)
+  // The open settled what a gone generation left running, so no reader sees it run.
+  await input.onReadable(sessionId, opened)
 }
 
 export async function restoreStructuredAgentSessionsOnRestart(
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-host.ts
index 29453e74652b..d053caf006b2 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-host.ts
@@ -1,21 +1,18 @@
 // Restart offers are durable per-session records. Listing reserves nothing and removes only offers
 // the chat has provably moved past; an explicit action reserves records, and only a completed
-// action removes them — or files what went wrong.
+// action removes them — or files what went wrong. Starting the chat's agent again withdraws them.
 
 import { randomUUID } from 'node:crypto'
+import {
+  AgentSessionRefusalError,
+  agentSessionRefusalFromReference
+} from '../../../shared/agent-session-wire-refusals'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import type { AgentSessionRecoveryCapsule } from '../../runtime/agent-session-recovery-capsule'
 import type {
   AgentSessionResumeMarker,
   AgentSessionResumeTrigger
 } from '../../../shared/agent-session-resume-marker'
-import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
-import type {
-  AgentSessionMutationEnvelope,
-  AgentSessionMutationResult,
-  AgentSessionSendResult
-} from '../../../shared/agent-session-wire'
-import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import { createStructuredAgentSessionRestartCandidateReader } from './structured-agent-session-restart-candidates'
 import {
@@ -34,32 +31,21 @@ import {
   type StructuredAgentSessionResumeOutcome
 } from './structured-agent-session-restart-resume-runner'
 import {
-  continueStructuredAgentSessionAfterRestart,
-  noteRestartReattachFailed,
   restartContinuationDeps,
+  startStructuredAgentSessionContinuation,
   type StructuredAgentSessionContinuationHost,
   type StructuredAgentSessionContinuationOutcome
 } from './structured-agent-session-restart-continuation'
+import { restartContinuationId } from './structured-agent-session-restart-continuation-envelope'
+import {
+  createStructuredAgentSessionRestartOfferWithdrawal,
+  type StructuredAgentSessionRestartOfferSession
+} from './structured-agent-session-restart-offer-withdrawal'
+import type { StructuredAgentSessionRestartResumeSurfaces } from './structured-agent-session-restart-resume-wiring'
 import { createStructuredAgentSessionRestartWitnesses } from './structured-agent-session-restart-witnesses'
+import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
 
-type LiveSession = { journal: AgentSessionJournal; hasProviderChild: boolean; fence: number }
-
-export type StructuredAgentSessionRestartResumeSurfaces = {
-  revealSession: (sessionId: string) => Promise<{ readable: boolean }>
-  hold: (sessionId: string, holderId: string) => Promise<void>
-  release: (sessionId: string, holderId: string) => void
-  send: (input: {
-    envelope: AgentSessionMutationEnvelope
-    body: AgentJournalMessageItem
-    beforeRun?: () => void
-  }) => Promise<AgentSessionMutationResult<AgentSessionSendResult>>
-  awaitSendSettlement: (
-    sessionId: string,
-    clientMessageId: string
-  ) => Promise<{ value: AgentSessionSendResult } | undefined>
-  onNoteFailed: (sessionId: string, error: unknown) => void
-  now: () => number
-}
+type LiveSession = StructuredAgentSessionRestartOfferSession
 
 export type StructuredAgentSessionRestartResume = {
   /** Teardown: begin, then per session a snapshot right before its child stops and a confirmation
@@ -71,10 +57,6 @@ export type StructuredAgentSessionRestartResume = {
   list: () => Promise<StructuredAgentSessionResumeCandidate[]>
   /** Offers already acted on whose agent did not carry on. Read-only; nothing here is spent. */
   listFailures: () => Promise<StructuredAgentSessionResumeFailure[]>
-  resume: (
-    sessionIds: readonly string[] | undefined,
-    owner: string
-  ) => Promise<StructuredAgentSessionResumeOutcome[]>
   continueAfterRestart: (
     sessionIds: readonly string[] | undefined,
     owner: string
@@ -86,6 +68,8 @@ export type StructuredAgentSessionRestartResume = {
   }>
   /** Named sessions forget their offer or failure; unnamed, every durable record goes. */
   dismiss: (sessionIds?: readonly string[]) => Promise<number>
+  /** The chat's agent proved a start: its offer ends unless the start is a resume's own. */
+  onAgentStarted: (sessionId: string) => void
 }
 
 export function createStructuredAgentSessionRestartResume(
@@ -100,11 +84,6 @@ export function createStructuredAgentSessionRestartResume(
   const admission = new StructuredAgentSessionResumeAdmission()
   const enqueueRecoveryOperation = createStructuredAgentSessionRestartOperationQueue()
 
-  const derive = createStructuredAgentSessionRestartCandidateReader({
-    sessions,
-    getRecord: deps.store.getRecord,
-    adapter: deps.adapter
-  })
   const witnesses = createStructuredAgentSessionRestartWitnesses({
     sessions,
     getRecord: deps.store.getRecord,
@@ -114,15 +93,24 @@ export function createStructuredAgentSessionRestartResume(
     now: surfaces.now,
     enqueue: enqueueRecoveryOperation
   })
-  const failures = createStructuredAgentSessionRestartFailureLedger({
+  const withdrawal = createStructuredAgentSessionRestartOfferWithdrawal({
+    sessions,
     ...(deps.recoveryCapsule ? { capsule: deps.recoveryCapsule } : {}),
+    now: surfaces.now,
+    enqueue: enqueueRecoveryOperation
+  })
+  const derive = createStructuredAgentSessionRestartCandidateReader({
     sessions,
-    reveal: async (sessionId) => {
-      await surfaces.revealSession(sessionId).catch(() => null)
-    },
+    getRecord: deps.store.getRecord,
+    adapter: deps.adapter,
+    movedOn: withdrawal.movedOn
+  })
+  const failures = createStructuredAgentSessionRestartFailureLedger({
+    ...(deps.recoveryCapsule ? { capsule: deps.recoveryCapsule } : {}),
     getRecord: deps.store.getRecord,
     adapter: deps.adapter,
     retryable: (marker) => derive([marker], 'may-be-held').candidates.length === 1,
+    reveal: (markers) => revealMarkers(markers),
     now: surfaces.now,
     enqueue: enqueueRecoveryOperation
   })
@@ -152,19 +140,20 @@ export function createStructuredAgentSessionRestartResume(
   const continuationHost: StructuredAgentSessionContinuationHost = {
     ...surfaces,
     sessions,
-    stillResumable: (marker, options) =>
-      derive([marker], 'may-be-held', options).candidates.length === 1
+    conversationFence: (sessionId) =>
+      deps.store.getRecord(sessionId)
+        ? structuredAgentSessionConversationFence(deps.store, sessionId)
+        : null,
+    stillResumable: (marker) => derive([marker], 'may-be-held').candidates.length === 1
   }
 
+  /** One explicit action: reserve the offers, then continue each through `continueOne`, a few at
+   *  a time. The runner counts a chat as done once `continueOne` returns. */
   const run = async (
     sessionIds: readonly string[] | undefined,
     owner: string,
-    afterAcquire?: (marker: AgentSessionResumeMarker) => Promise<void>,
-    settlement: Omit<Parameters<typeof failures.settle>[2], 'candidates' | 'attempts'> = {
-      failureAfterResume: () => null,
-      failureReason: () => 'agent_session_resume_refused'
-    }
-  ): Promise<StructuredAgentSessionResumeOutcome[]> => {
+    continueOne: (marker: AgentSessionResumeMarker, continuationId: string) => Promise<void>
+  ) => {
     // An explicit action supersedes teardown witnesses captured by this host. The durable mutation
     // lane below also drains a publication already in flight before completion.
     witnesses.clear()
@@ -175,25 +164,26 @@ export function createStructuredAgentSessionRestartResume(
     retireSuperseded(derived.superseded)
     const eligible = derived.candidates.filter((candidate) => requested.has(candidate.sessionId))
     if (eligible.length === 0) {
-      return []
+      return null
     }
     const operationId = randomUUID()
+    const actionAt = surfaces.now()
+    // Tagged with its offer, so a rejected one is told apart for as long as the offer lasts.
+    const continuationFor = (marker: AgentSessionResumeMarker) =>
+      restartContinuationId(marker, operationId, actionAt)
     const reserved =
       (await enqueueRecoveryOperation(
         () =>
           deps.recoveryCapsule?.beginResume(
             eligible.map((candidate) => candidate.sessionId),
             operationId,
-            surfaces.now()
+            actionAt
           ) ?? Promise.resolve([])
       )) ?? []
     const markersBySession = new Map(reserved.map((marker) => [marker.sessionId, marker]))
     const candidates = derive(reserved, 'may-be-held').candidates
-    const attempts = failures.attempts(markersBySession)
-
-    let outcomes: StructuredAgentSessionResumeOutcome[]
     try {
-      outcomes = await resumeStructuredAgentSessionsFromRestart(
+      const outcomes = await resumeStructuredAgentSessionsFromRestart(
         {
           admission,
           consumeMarker: async (sessionId) => {
@@ -201,26 +191,16 @@ export function createStructuredAgentSessionRestartResume(
             return marker !== undefined && derive([marker], 'may-be-held').candidates.length === 1
           },
           resume: async (sessionId) => {
-            const holder = `restart-resume:${sessionId}`
-            try {
-              await surfaces.hold(sessionId, holder).catch(async (error: unknown) => {
-                // The reattach failure is filed like any other, so the chat must say so too.
-                await noteRestartReattachFailed(continuationHost, sessionId)
-                throw error
-              })
-              const marker = markersBySession.get(sessionId)
-              if (marker) {
-                await afterAcquire?.(marker)
-              }
-            } finally {
-              attempts.observe(sessionId)
-              surfaces.release(sessionId, holder)
+            const marker = markersBySession.get(sessionId)
+            if (marker) {
+              await continueOne(marker, continuationFor(marker))
             }
           }
         },
         candidates,
         owner
       )
+      return { operationId, outcomes, candidates, markers: markersBySession }
     } catch (error) {
       if (deps.recoveryCapsule) {
         await enqueueRecoveryOperation(() =>
@@ -231,8 +211,6 @@ export function createStructuredAgentSessionRestartResume(
       }
       throw error
     }
-    await failures.settle(operationId, outcomes, { candidates, attempts, ...settlement })
-    return outcomes
   }
 
   const continueAfterRestart = async (
@@ -245,34 +223,50 @@ export function createStructuredAgentSessionRestartResume(
     failed?: StructuredAgentSessionResumeFailure[]
   }> => {
     const continued: StructuredAgentSessionContinuationOutcome[] = []
-    const continuationFor = (sessionId: string) =>
-      continued.find((outcome) => outcome.sessionId === sessionId)
-    const resumed = await run(
-      sessionIds,
-      owner,
-      async (marker) => {
-        continued.push(
-          await continueStructuredAgentSessionAfterRestart(
-            restartContinuationDeps(continuationHost, marker),
-            marker.sessionId,
-            marker
-          )
-        )
-      },
-      {
+    const verdicts: Promise<void>[] = []
+    // A chat holds its slot until its agent took the continuation or its start failed, so a batch
+    // never starts more agents at once than the runner allows; the provider's answer comes after.
+    const action = await run(sessionIds, owner, async (marker, continuationId) => {
+      const started = await startStructuredAgentSessionContinuation(
+        restartContinuationDeps(continuationHost, marker),
+        marker.sessionId,
+        marker,
+        continuationId
+      )
+      if ('done' in started) {
+        continued.push(started.done)
+        const { outcome, reason, refusal } = started.done
+        if (outcome === 'refused') {
+          // Thrown as a refusal so the filed failure keeps its details beside the code.
+          throw refusal
+            ? new AgentSessionRefusalError(agentSessionRefusalFromReference(refusal, refusal.code))
+            : new Error(reason ?? 'agent_session_continuation_refused')
+        }
+        return
+      }
+      verdicts.push(started.verdict().then((outcome) => void continued.push(outcome)))
+    })
+    await Promise.all(verdicts)
+    const resumed = action?.outcomes ?? []
+    if (action) {
+      await failures.settle(action.operationId, resumed, {
+        candidates: action.candidates,
+        markers: action.markers,
         failureAfterResume: (sessionId) => {
-          const outcome = continuationFor(sessionId)
-          // Reattached but never asked to continue: nothing confirms the agent carried on.
-          return outcome ? continuationFailureOutcome(outcome.outcome) : 'unconfirmed'
+          const outcome = continued.find((entry) => entry.sessionId === sessionId)
+          return outcome ? continuationFailureOutcome(outcome.outcome) : null
         },
         failureReason: (sessionId) => {
-          const outcome = continuationFor(sessionId)
+          const outcome = continued.find((entry) => entry.sessionId === sessionId)
           return outcome?.reason ?? outcome?.outcome ?? 'agent_session_continuation_unknown'
         }
-      }
-    )
+      })
+    }
     for (const outcome of resumed) {
-      if (outcome.outcome !== 'resumed') {
+      if (
+        outcome.outcome !== 'resumed' &&
+        !continued.some((entry) => entry.sessionId === outcome.sessionId)
+      ) {
         continued.push({
           sessionId: outcome.sessionId,
           outcome: 'refused',
@@ -306,7 +300,7 @@ export function createStructuredAgentSessionRestartResume(
     // Do not let a teardown witness already captured in this host republish after explicit
     // dismissal. A later capture is a new interruption and may create a fresh offer normally.
     dismiss: (sessionIds) => failures.dismiss(sessionIds, witnesses.clear),
-    resume: (sessionIds, owner) => run(sessionIds, owner),
-    continueAfterRestart
+    continueAfterRestart,
+    onAgentStarted: withdrawal.onAgentStarted
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-runner.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-runner.ts
index 33a07e80335c..a298e23f454e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-runner.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-runner.ts
@@ -1,14 +1,17 @@
 // Delivering the explicit restart action: the one path that turns a resumable candidate back into
-// a live agent.
+// a working agent.
 //
 // The manual "Resume" button and the automatic setting both land here, so the two can never drift
 // into different eligibility or different double-fire protection.
 //
-// Resume itself acquires a provider child, not a new send. The first resume-capable hold on a
-// childless session re-acquires the provider's own conversation — Claude's `resume` by session id,
-// Codex's thread id — which is native continuation. Nothing re-sends the user's prompt: that is
-// what makes an agent redo work it already finished.
+// A resume is the continuation send. Its delivery starts the provider on its own conversation —
+// Claude's `resume` by session id, Codex's thread id — which is native continuation. Nothing
+// re-sends the user's prompt: that is what makes an agent redo work it already finished.
 
+import {
+  isAgentSessionRefusalError,
+  type AgentSessionAnyRefusalDetails
+} from '../../../shared/agent-session-wire-refusals'
 import { forEachWithConcurrency } from '../../../shared/map-with-concurrency'
 import type { StructuredAgentSessionResumeCandidate } from './structured-agent-session-restart-resume-set'
 
@@ -27,6 +30,8 @@ export type StructuredAgentSessionResumeOutcome = {
   outcome: 'resumed' | 'refused'
   /** Refusal code; `agent_session_resume_already_in_progress` names the live owner in `owner`. */
   reason?: string
+  /** A thrown refusal's details, kept apart so `reason` stays the code readers match. */
+  details?: AgentSessionAnyRefusalDetails
   owner?: string
 }
 
@@ -52,7 +57,7 @@ function resumeAdmissionOwner(error: unknown): string | null {
  * One resume per session at a time, whoever is asking.
  *
  * Two surfaces can reach for the same chat at once — the banner's "Resume all" and a user clicking
- * one row — and both would otherwise take a hold, race the acquisition, and leave the loser's
+ * one row — and both would otherwise send the continuation twice, and leave the loser's
  * refusal looking like a real failure. The second caller is told who holds it instead.
  */
 export class StructuredAgentSessionResumeAdmission {
@@ -80,7 +85,7 @@ export type StructuredAgentSessionResumeRunnerDeps = {
   admission: StructuredAgentSessionResumeAdmission
   /** Validates this action's durable reservation. False means the candidate is no longer eligible. */
   consumeMarker: (sessionId: string) => Promise<boolean>
-  /** Acquires the provider child for the reserved session. */
+  /** Continues the reserved session; resolves once its agent took the message or refused it. */
   resume: (sessionId: string) => Promise<void>
   concurrency?: number
 }
@@ -123,10 +128,12 @@ async function resumeOne(
   } catch (error) {
     const reason = error instanceof Error ? error.message : String(error)
     const owner = resumeAdmissionOwner(error)
+    const details = isAgentSessionRefusalError(error) ? error.refusal.details : undefined
     return {
       sessionId,
       outcome: 'refused',
       reason,
+      ...(details ? { details } : {}),
       ...(owner === null ? {} : { owner })
     }
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-set.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-set.ts
index 245fbcf4bbf1..3c91a9732b9b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-set.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-set.ts
@@ -7,12 +7,12 @@
 // restored thread), and every reading of those rewrites as "the work is done" dropped chats that
 // were owed a resume.
 //
-// An offer ends only by the user's own actions. The ones this predicate can see — a newer message
-// of theirs in that chat, or the conversation forked — are reported back as `superseded` so the
-// caller DELETES the record rather than filtering it forever. What remains are structural checks
-// that are not about work at all: the record still exists and this build supports it, and the
-// lease is free.
+// An offer ends when the chat moves on after the restart — another message accepted, or its agent
+// started — or when the conversation forked. Both are reported back as `superseded` so the caller
+// DELETES the record rather than filtering it forever. What remains are structural checks that are not about work at all: the record still
+// exists and this build supports it, and the lease is free.
 
+import type { AgentSessionAnyRefusalDetails } from '../../../shared/agent-session-wire-refusals'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import {
   agentSessionProviderHandleChainHead,
@@ -57,6 +57,8 @@ export type StructuredAgentSessionResumeFailure = StructuredAgentSessionResumeCa
   outcome: AgentSessionResumeFailureOutcome
   /** The host's or provider's refusal code, verbatim, so it can be quoted in a report. */
   reason: string
+  /** The refusal's details beside its code in `reason`; absent on older records and non-refusals. */
+  details?: AgentSessionAnyRefusalDetails
   /** Whether naming it in an action would run it again: whether it is still an offer. A
    *  continuation the chat already holds, or the user having moved on, makes a retry a no-op no
    *  matter what the reason says. */
@@ -65,8 +67,8 @@ export type StructuredAgentSessionResumeFailure = StructuredAgentSessionResumeCa
 
 export type StructuredAgentSessionResumableSet = {
   candidates: StructuredAgentSessionResumeCandidate[]
-  /** Markers the chat has provably moved past — a newer user message, or a forked conversation.
-   *  Every ending deletes: the caller retires these rather than re-filtering them forever. */
+  /** Markers the chat has provably moved past, or whose conversation forked. Every ending deletes:
+   *  the caller retires these rather than re-filtering them forever. */
   superseded: AgentSessionResumeMarker[]
 }
 
@@ -75,8 +77,8 @@ export type StructuredAgentSessionResumeSetInput = {
   getRecord: (sessionId: string) => AgentSessionRecord | null
   supportsRecord: (record: AgentSessionRecord) => boolean
   latestPrompt: (sessionId: string) => string
-  /** Undefined when the chat's journal is not readable here, which decides nothing. */
-  latestUserItemId: (sessionId: string) => string | null | undefined
+  /** Whether the chat moved on since the offer was taken; false when its journal is not open here. */
+  movedOn: (marker: AgentSessionResumeMarker) => boolean
   /**
    * Whether the lease must be free.
    *
@@ -103,7 +105,7 @@ export function structuredAgentSessionResumableSet(
       continue
     }
     // A conversation that FORKED since teardown is not the one we marked, and can never be again:
-    // deleted like a newer message, so it cannot sit unseen forever. Compared by identity root,
+    // deleted, so it cannot sit unseen forever. Compared by identity root,
     // because a resume legitimately advances Claude's leaf and that is not a fork.
     const head = agentSessionProviderHandleChainHead(record.providerHandleChain)
     if (!head) {
@@ -113,10 +115,7 @@ export function structuredAgentSessionResumableSet(
       superseded.push(marker)
       continue
     }
-    // The user moving on is the one thing that withdraws the offer. Anything the provider does on
-    // its own after reattaching — a turn it opens, a prompt, restated rows — is not.
-    const latestUserItemId = input.latestUserItemId(marker.sessionId)
-    if (latestUserItemId !== undefined && latestUserItemId !== marker.latestUserItemId) {
+    if (input.movedOn(marker)) {
       superseded.push(marker)
       continue
     }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-test-harness.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-test-harness.ts
index e5b65009634a..e359e31157b9 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-test-harness.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-test-harness.ts
@@ -145,7 +145,7 @@ export type HarnessJournal = {
   appendItem: (envelope: unknown, body: { kind: string; text: string }) => Promise<void>
 }
 
-export type HarnessSession = { journal: HarnessJournal; hasProviderChild: boolean; fence?: number }
+export type HarnessSession = { journal: HarnessJournal; child: { fence: number } | null }
 
 export function journal(
   items: AgentJournalRenderItem[],
@@ -203,13 +203,12 @@ export function resumableSet(input: {
   markers: AgentSessionResumeMarker[]
   items?: AgentJournalRenderItem[]
   chain?: AgentSessionRecord['providerHandleChain']
-  latestUserItemId?: string | null
 }) {
   return structuredAgentSessionResumableSet({
     markers: input.markers,
     getRecord: () => record(input.chain === undefined ? {} : { chain: input.chain }),
     supportsRecord: () => true,
     latestPrompt: () => 'fix the auth bug',
-    latestUserItemId: () => input.latestUserItemId ?? null
+    movedOn: () => false
   })
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-wiring.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-wiring.ts
index 07ec6b81599f..4004502e4081 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-wiring.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-wiring.ts
@@ -11,7 +11,27 @@ import type {
   AgentSessionMutationResult,
   AgentSessionSendResult
 } from '../../../shared/agent-session-wire'
-import type { StructuredAgentSessionRestartResumeSurfaces } from './structured-agent-session-restart-resume-host'
+import { MAX_TIMER_DELAY_MS } from '../../../shared/timer-delay'
+import type { SendSettlementWaitOptions } from './structured-agent-session-send-settlement'
+
+export type StructuredAgentSessionRestartResumeSurfaces = {
+  revealSession: (sessionId: string) => Promise<{ readable: boolean }>
+  send: (input: {
+    envelope: AgentSessionMutationEnvelope
+    body: AgentJournalMessageItem
+    beforeRun?: () => void
+  }) => Promise<AgentSessionMutationResult<AgentSessionSendResult>>
+  awaitSendSettlement: (
+    sessionId: string,
+    clientMessageId: string
+  ) => Promise<{ value: AgentSessionSendResult } | undefined>
+  awaitSendHandedOver: (
+    sessionId: string,
+    clientMessageId: string
+  ) => Promise<{ value: AgentSessionSendResult } | undefined>
+  onNoteFailed: (sessionId: string, error: unknown) => void
+  now: () => number
+}
 
 /** The caller key the continuation sends under, so its writes are attributable to Orca itself. */
 export const STRUCTURED_AGENT_SESSION_RESTART_CONTINUATION_CALLER =
@@ -21,8 +41,6 @@ export const STRUCTURED_AGENT_SESSION_RESTART_CONTINUATION_CALLER =
  *  dependency, and nothing outside this list is reachable from here. */
 type RestartResumeHostBindings = {
   revealSession: (sessionId: string) => Promise<{ readable: boolean }>
-  hold: (sessionId: string, holderId: string) => Promise<void>
-  release: (sessionId: string, holderId: string) => void
   send: (
     caller: { callerKey: string },
     params: {
@@ -34,7 +52,8 @@ type RestartResumeHostBindings = {
   /** The host's existing settlement waiter; a send returns while its dispatch is still pending. */
   waitForSendSettlement: (
     sessionId: string,
-    clientMessageId: string
+    clientMessageId: string,
+    options: SendSettlementWaitOptions
   ) => Promise<{ value: AgentSessionSendResult } | undefined>
 }
 
@@ -44,11 +63,19 @@ export function structuredAgentSessionRestartResumeSurfaces(
 ): StructuredAgentSessionRestartResumeSurfaces {
   return {
     revealSession: host.revealSession,
-    hold: host.hold,
-    release: host.release,
     send: (params) =>
       host.send({ callerKey: STRUCTURED_AGENT_SESSION_RESTART_CONTINUATION_CALLER }, params),
-    awaitSendSettlement: host.waitForSendSettlement,
+    // Accepted like any send, so its verdict is its delivery, however long the start takes; the
+    // wait ends when the submission settles or the session closes.
+    awaitSendSettlement: (sessionId, clientMessageId) =>
+      host.waitForSendSettlement(sessionId, clientMessageId, { budgetMs: MAX_TIMER_DELAY_MS }),
+    // How long a restart batch holds a chat's slot: until the agent took the message or its start
+    // failed. Undefined — the session closed, or too many waited — frees the slot too.
+    awaitSendHandedOver: (sessionId, clientMessageId) =>
+      host.waitForSendSettlement(sessionId, clientMessageId, {
+        until: 'handed-over',
+        budgetMs: MAX_TIMER_DELAY_MS
+      }),
     onNoteFailed: () =>
       console.warn('[structured-agent-session] restart continuation attribution failed'),
     now
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume.test.ts
index 1d6a8a1fc5ec..efcd70345a83 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume.test.ts
@@ -17,6 +17,7 @@ import { structuredAgentSessionWorkingAtStop } from './structured-agent-session-
 import {
   CLAUDE_ROOT,
   claudeRecord,
+  EPOCH,
   HANDLE_ROOT,
   journal,
   TEARDOWN_CURRENT,
@@ -48,7 +49,7 @@ describe('deriving what was working at teardown', () => {
   it('marks a session this host was running a turn for', () => {
     const markers = markersAtTeardown({
       sessions: new Map([
-        [SESSION, { journal: journal([turnItem('turn-1', 'running')]), hasProviderChild: true }]
+        [SESSION, { journal: journal([turnItem('turn-1', 'running')]), child: { fence: 1 } }]
       ]),
       getRecord: () => record(),
       backgroundTasks: () => undefined,
@@ -64,6 +65,7 @@ describe('deriving what was working at teardown', () => {
         recordedAt: NOW,
         trigger: 'quit',
         teardownId: TEARDOWN_CURRENT,
+        journalCursor: { epoch: EPOCH, sequence: 1 },
         providerHandleRoot: HANDLE_ROOT,
         latestUserItemId: null,
         activity: { state: 'working', prompts: [], tasks: [] }
@@ -74,7 +76,7 @@ describe('deriving what was working at teardown', () => {
   it('carries the update trigger so the surface can say the restart was not the user choice', () => {
     const [recorded] = markersAtTeardown({
       sessions: new Map([
-        [SESSION, { journal: journal([turnItem('turn-1', 'running')]), hasProviderChild: true }]
+        [SESSION, { journal: journal([turnItem('turn-1', 'running')]), child: { fence: 1 } }]
       ]),
       getRecord: () => record(),
       backgroundTasks: () => undefined,
@@ -89,7 +91,7 @@ describe('deriving what was working at teardown', () => {
   it('marks nothing for an idle session', () => {
     expect(
       markersAtTeardown({
-        sessions: new Map([[SESSION, { journal: journal([]), hasProviderChild: true }]]),
+        sessions: new Map([[SESSION, { journal: journal([]), child: { fence: 1 } }]]),
         getRecord: () => record(),
         backgroundTasks: () => undefined,
         trigger: 'quit',
@@ -103,7 +105,7 @@ describe('deriving what was working at teardown', () => {
     expect(
       markersAtTeardown({
         sessions: new Map([
-          [SESSION, { journal: journal([turnItem('turn-1', 'completed')]), hasProviderChild: true }]
+          [SESSION, { journal: journal([turnItem('turn-1', 'completed')]), child: { fence: 1 } }]
         ]),
         getRecord: () => record(),
         backgroundTasks: () => undefined,
@@ -115,12 +117,12 @@ describe('deriving what was working at teardown', () => {
   })
 
   // The user's stated fear. A journal restored for READING carries whatever `running` row an older
-  // crash left behind, and it is the live `hasProviderChild` — not that row — that decides.
+  // crash left behind, and it is the live `child` — not that row — that decides.
   it('marks nothing for a stale running row this host was not executing', () => {
     expect(
       markersAtTeardown({
         sessions: new Map([
-          [SESSION, { journal: journal([turnItem('turn-1', 'running')]), hasProviderChild: false }]
+          [SESSION, { journal: journal([turnItem('turn-1', 'running')]), child: null }]
         ]),
         getRecord: () => record(),
         backgroundTasks: () => undefined,
@@ -141,7 +143,7 @@ describe('deriving what was working at teardown', () => {
           SESSION,
           {
             journal: journal([turnItem('turn-1', 'running'), pendingApproval()]),
-            hasProviderChild: true
+            child: { fence: 1 }
           }
         ]
       ]),
@@ -165,7 +167,7 @@ describe('deriving what was working at teardown', () => {
   it('marks a settled lead whose subagent was still running, anchored on its last turn', () => {
     const markers = markersAtTeardown({
       sessions: new Map([
-        [SESSION, { journal: journal([turnItem('turn-1', 'completed')]), hasProviderChild: true }]
+        [SESSION, { journal: journal([turnItem('turn-1', 'completed')]), child: { fence: 1 } }]
       ]),
       getRecord: () => record(),
       backgroundTasks: () => [
@@ -188,7 +190,7 @@ describe('deriving what was working at teardown', () => {
   it('records only the live rows of the roster, bounded', () => {
     const [recorded] = markersAtTeardown({
       sessions: new Map([
-        [SESSION, { journal: journal([turnItem('turn-1', 'completed')]), hasProviderChild: true }]
+        [SESSION, { journal: journal([turnItem('turn-1', 'completed')]), child: { fence: 1 } }]
       ]),
       getRecord: () => record(),
       backgroundTasks: () => [
@@ -213,7 +215,7 @@ describe('deriving what was working at teardown', () => {
   it('marks a settled lead whose only live work is a monitor', () => {
     const markers = markersAtTeardown({
       sessions: new Map([
-        [SESSION, { journal: journal([turnItem('turn-1', 'completed')]), hasProviderChild: true }]
+        [SESSION, { journal: journal([turnItem('turn-1', 'completed')]), child: { fence: 1 } }]
       ]),
       getRecord: () => record(),
       backgroundTasks: () => [{ id: 'task-m', kind: 'monitor', name: 'ci-watch' }],
@@ -230,7 +232,7 @@ describe('deriving what was working at teardown', () => {
     expect(
       markersAtTeardown({
         sessions: new Map([
-          [SESSION, { journal: journal([turnItem('turn-1', 'completed')]), hasProviderChild: true }]
+          [SESSION, { journal: journal([turnItem('turn-1', 'completed')]), child: { fence: 1 } }]
         ]),
         getRecord: () => record(),
         backgroundTasks: () => [
@@ -248,7 +250,7 @@ describe('deriving what was working at teardown', () => {
   it('records the identity root so an advancing Claude leaf cannot invalidate the marker', () => {
     const [recorded] = markersAtTeardown({
       sessions: new Map([
-        [SESSION, { journal: journal([turnItem('turn-1', 'running')]), hasProviderChild: true }]
+        [SESSION, { journal: journal([turnItem('turn-1', 'running')]), child: { fence: 1 } }]
       ]),
       getRecord: () => claudeRecord(null),
       backgroundTasks: () => undefined,
@@ -264,7 +266,7 @@ describe('deriving what was working at teardown', () => {
     expect(
       markersAtTeardown({
         sessions: new Map([
-          [SESSION, { journal: journal([turnItem('turn-1', 'running')]), hasProviderChild: true }]
+          [SESSION, { journal: journal([turnItem('turn-1', 'running')]), child: { fence: 1 } }]
         ]),
         getRecord: () => record({ chain: [] }),
         backgroundTasks: () => undefined,
@@ -285,7 +287,7 @@ describe('deriving what was working at teardown', () => {
           SESSION,
           {
             journal: journal([], false, [submission('msg-1', 'pending')]),
-            hasProviderChild: true
+            child: { fence: 1 }
           }
         ]
       ]),
@@ -310,7 +312,7 @@ describe('deriving what was working at teardown', () => {
             journal: journal([turnItem('turn-0', 'completed')], false, [
               submission('msg-1', 'pending')
             ]),
-            hasProviderChild: true
+            child: { fence: 1 }
           }
         ]
       ]),
@@ -324,6 +326,67 @@ describe('deriving what was working at teardown', () => {
     expect(recorded?.work).toEqual({ kind: 'submission', id: 'msg-1' })
   })
 
+  // Accepted while the agent was starting and never handed over: the chat shows working, but no
+  // agent had the message, and quit rejects it as never sent.
+  it('marks nothing for a session whose only work is a message still queued', () => {
+    const queued = { ...submission('msg-1', 'pending'), handoverRecorded: true as const }
+    expect(
+      markersAtTeardown({
+        sessions: new Map([
+          [
+            SESSION,
+            {
+              journal: journal([turnItem('turn-0', 'completed')], false, [queued]),
+              child: { fence: 1 }
+            }
+          ]
+        ]),
+        getRecord: () => claudeRecord(null),
+        backgroundTasks: () => undefined,
+        trigger: 'quit',
+        teardownId: TEARDOWN_CURRENT,
+        now: NOW
+      })
+    ).toEqual([])
+  })
+
+  it('marks a handed-over message over a newer queued one, and a turn a queued one waits behind', () => {
+    const handedOver = {
+      ...submission('msg-1', 'pending'),
+      handoverRecorded: true as const,
+      handedOverAt: NOW
+    }
+    const queued = { ...submission('msg-2', 'pending'), handoverRecorded: true as const }
+    const markers = markersAtTeardown({
+      sessions: new Map([
+        [
+          SESSION,
+          {
+            journal: journal([turnItem('turn-0', 'completed')], false, [handedOver, queued]),
+            child: { fence: 1 }
+          }
+        ],
+        [
+          'session-running',
+          {
+            journal: journal([turnItem('turn-1', 'running')], false, [queued]),
+            child: { fence: 1 }
+          }
+        ]
+      ]),
+      getRecord: () => claudeRecord(null),
+      backgroundTasks: () => undefined,
+      trigger: 'quit',
+      teardownId: TEARDOWN_CURRENT,
+      now: NOW
+    })
+
+    expect(markers.map((entry) => entry.work)).toEqual([
+      { kind: 'submission', id: 'msg-1' },
+      { kind: 'turn', id: 'turn-1' }
+    ])
+  })
+
   // Once a turn exists it is the better identity: it is what eviction rewrites, so it is what the
   // journal can be asked about at launch.
   it('prefers the running turn over the send that opened it', () => {
@@ -335,7 +398,7 @@ describe('deriving what was working at teardown', () => {
             journal: journal([turnItem('turn-1', 'running')], false, [
               submission('msg-1', 'accepted')
             ]),
-            hasProviderChild: true
+            child: { fence: 1 }
           }
         ]
       ]),
@@ -390,7 +453,7 @@ describe('the resumable set', () => {
       getRecord: () => claudeRecord('5aed93d6-advanced-leaf'),
       supportsRecord: () => true,
       latestPrompt: () => '',
-      latestUserItemId: () => null
+      movedOn: () => false
     })
 
     expect(candidates).toHaveLength(1)
@@ -405,14 +468,14 @@ describe('the resumable set', () => {
       getRecord: () => claudeRecord(null, 'prov-session-2'),
       supportsRecord: () => true,
       latestPrompt: () => '',
-      latestUserItemId: () => null
+      movedOn: () => false
     })
 
     expect(set.candidates).toEqual([])
     expect(set.superseded).toEqual([forked])
   })
 
-  // An offer has no expiry: it ends only by the user's own actions, however old it is.
+  // An offer has no expiry, however old it is.
   it('still offers a months-old marker', () => {
     const monthsAgo = NOW - 90 * 24 * 60 * 60 * 1000
     expect(resumableSet({ markers: [marker({ recordedAt: monthsAgo })] }).candidates).toHaveLength(
@@ -420,16 +483,6 @@ describe('the resumable set', () => {
     )
   })
 
-  // The user moving on is what withdraws an offer — and it is reported for DELETION, not merely
-  // filtered, so the record does not have to be re-filtered on every read forever.
-  it('withdraws and reports for deletion once the user has sent a newer message', () => {
-    const withdrawn = marker()
-    const set = resumableSet({ markers: [withdrawn], latestUserItemId: 'user-newer' })
-
-    expect(set.candidates).toEqual([])
-    expect(set.superseded).toEqual([withdrawn])
-  })
-
   // Structural refusals are NOT endings: a record this host cannot see right now must not delete
   // a durable offer the user still owns.
   it('does not report a structurally refused marker for deletion', () => {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-status-publication.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-status-publication.test.ts
index 884fba78a4ec..524d8943fac2 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-status-publication.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-status-publication.test.ts
@@ -95,7 +95,12 @@ async function restartWithPersistedTurn(): Promise<StructuredAgentSessionHost> {
   const host = createHost(store)
   expect(await host.attach(CALLER, hostTestAttachParams(null))).toMatchObject({ ok: true })
   const body = hostTestMessage('persisted conversation')
-  await host.send(CALLER, { envelope: sendEnvelope(store, { body }), body })
+  const sent = await host.send(CALLER, { envelope: sendEnvelope(store, { body }), body })
+  if (!sent.ok) {
+    throw new Error('send was refused')
+  }
+  // Delivered, not just accepted: a message still queued at the restart was never a request.
+  await host.waitForSendSettlement(SESSION, sent.value.clientMessageId)
   await host.flushAllStreamedEvents()
   return createHost(await AgentSessionRecordStore.open({ directory, hostId: 'local' }))
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-teardown.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-teardown.test.ts
index cc40d4831875..bf740ac405b2 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-teardown.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-teardown.test.ts
@@ -30,7 +30,7 @@ it.each(['beginTeardown', 'captureBeforeStop', 'recordMarkers'] as const)(
       )
       expect(warning.mock.calls.flat().map(String).join(' ')).not.toContain(failure.message)
       expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
-      expect(() => host.journalSnapshot(SESSION)).toThrow('agent_session_ownership_unknown')
+      await expect(host.journalSnapshot(SESSION)).rejects.toThrow('agent_session_ownership_unknown')
     } finally {
       operation.mockRestore()
       warning.mockRestore()
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-resume-eligibility.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-resume-eligibility.ts
index 2e031b9f071e..93a7962d4a20 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-resume-eligibility.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-resume-eligibility.ts
@@ -11,7 +11,7 @@ import { agentSessionLeaseIsReleased } from '../../../shared/agent-session-lease
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import { randomUUID } from 'node:crypto'
 import type { AgentSessionAttachParams } from './structured-agent-session-attach'
-import { attachParamsForRecord } from './structured-agent-session-read-restore'
+import { attachParamsForRecord } from './structured-agent-session-conversation-open'
 
 export function isResumableStructuredAgentSessionRecord(record: AgentSessionRecord): boolean {
   return agentSessionLeaseIsReleased(record.lease)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-reveal.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-reveal.test.ts
index 1172e993b963..49a116ec7f7a 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-reveal.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-reveal.test.ts
@@ -3,8 +3,8 @@
  *
  * The reveal path is the only way an Agent Session History row reaches a chat whose tab this
  * process never published — a chat closed cleanly, or one this process has not opened since
- * launch. It is exercised here through the readable restorer rather than the whole host, because
- * what it must get right is which records it accepts and what it does when the journal is gone.
+ * launch. It opens the conversation through the host's accessor and starts no agent; what it must
+ * get right is which records it accepts and what it answers when the journal cannot be opened.
  */
 
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -13,8 +13,6 @@ import {
   agentSessionLeaseFixture,
   agentSessionRecordFixture
 } from '../../../shared/agent-session-record.test-fixture'
-import { StructuredAgentSessionReadableRestorer } from './structured-agent-session-readable-restorer'
-import * as readRestore from './structured-agent-session-read-restore'
 import * as providerSupport from './structured-agent-session-provider-support'
 import { revealStructuredAgentSession } from './structured-agent-session-reveal'
 
@@ -35,114 +33,10 @@ function recordFor(provider: 'claude' | 'codex', sessionId: string): AgentSessio
   }
 }
 
-function harness(
-  records: AgentSessionRecord[],
-  options: { supports?: (record: AgentSessionRecord) => boolean } = {}
-) {
-  const live = new Map<string, unknown>()
-  const serializedIds: string[] = []
-  const serialize = <T>(sessionId: string, task: () => Promise<T>): Promise<T> => {
-    serializedIds.push(sessionId)
-    return task()
-  }
-  const restorer = new StructuredAgentSessionReadableRestorer({
-    store: {
-      getRecord: (sessionId: string) => records.find((r) => r.sessionId === sessionId) ?? null,
-      listRecords: () => records
-    } as never,
-    journalRoot: '/journals',
-    supportsRecord: options.supports ?? (() => true),
-    reconcile: async () => null,
-    resolveRecovery: async () => undefined,
-    serialize,
-    hasSession: (sessionId) => live.has(sessionId),
-    onReadable: (sessionId, restored) => live.set(sessionId, restored),
-    settleStaleState: async () => undefined
-  })
-  return { restorer, live, serializedIds }
-}
-
-const readable = { journal: {}, params: {}, fence: 1 } as never
-
 afterEach(() => {
   vi.restoreAllMocks()
 })
 
-describe('revealing one structured session on demand', () => {
-  beforeEach(() => {
-    vi.spyOn(readRestore, 'restoreStructuredAgentSessionRead').mockResolvedValue(readable)
-  })
-
-  it.each(['claude', 'codex'] as const)('restores a persisted %s chat', async (provider) => {
-    const sessionId = `session-${provider}`
-    const { restorer, live } = harness([recordFor(provider, sessionId)])
-
-    await expect(restorer.restoreOne(sessionId)).resolves.toBe(true)
-    expect(live.has(sessionId)).toBe(true)
-  })
-
-  it('does not need the startup sweep to have run, or run it', async () => {
-    // The whole point: `restore()` is latched to once per process, and a surface asking later must
-    // not be answered from that latch — nor trip it, which would skip every other record.
-    const records = [recordFor('codex', 'session-asked'), recordFor('claude', 'session-untouched')]
-    const { restorer, live } = harness(records)
-
-    await restorer.restoreOne('session-asked')
-
-    expect(live.has('session-asked')).toBe(true)
-    expect(live.has('session-untouched')).toBe(false)
-  })
-
-  it('serializes against the session it restores', async () => {
-    const { restorer, serializedIds } = harness([recordFor('claude', 'session-serialized')])
-
-    await restorer.restoreOne('session-serialized')
-
-    // Ordering against close/eviction is the task queue's job, so the restore must be inside it.
-    expect(serializedIds).toEqual(['session-serialized'])
-  })
-
-  it('returns the live session instead of restoring over it', async () => {
-    const { restorer, live } = harness([recordFor('codex', 'session-live')])
-    live.set('session-live', readable)
-
-    await expect(restorer.restoreOne('session-live')).resolves.toBe(true)
-    expect(readRestore.restoreStructuredAgentSessionRead).not.toHaveBeenCalled()
-  })
-
-  it('refuses a record no adapter supports', async () => {
-    const { restorer } = harness([recordFor('codex', 'session-unsupported')], {
-      supports: () => false
-    })
-
-    await expect(restorer.restoreOne('session-unsupported')).resolves.toBe(false)
-    expect(readRestore.restoreStructuredAgentSessionRead).not.toHaveBeenCalled()
-  })
-
-  it('refuses a session this host holds no record for', async () => {
-    const { restorer } = harness([])
-
-    await expect(restorer.restoreOne('session-absent')).resolves.toBe(false)
-  })
-})
-
-describe('a record whose journal cannot be read', () => {
-  it('reports not-readable without throwing, for either provider', async () => {
-    // A chat whose journal predates the SQLite store restores to nothing here. That is not a
-    // refusal: attach still recovers it, so the caller publishes the tab and lets the pane's hold
-    // finish the job. Throwing, or reporting success, would both be wrong.
-    vi.spyOn(readRestore, 'restoreStructuredAgentSessionRead').mockResolvedValue(null)
-    const { restorer, live } = harness([
-      recordFor('claude', 'session-no-journal-claude'),
-      recordFor('codex', 'session-no-journal-codex')
-    ])
-
-    await expect(restorer.restoreOne('session-no-journal-claude')).resolves.toBe(false)
-    await expect(restorer.restoreOne('session-no-journal-codex')).resolves.toBe(false)
-    expect(live.size).toBe(0)
-  })
-})
-
 describe('the host answer a client acts on', () => {
   beforeEach(() => {
     // Eligibility is the router's call; these cases are about what the answer carries.
@@ -154,39 +48,45 @@ describe('the host answer a client acts on', () => {
     return { ...base, location: { ...base.location, workspaceId } }
   }
 
-  it("answers with the record's own workspace and provider, never a caller's", async () => {
-    // The security property: a client sends only a session id, so the tab cannot be aimed at
-    // another workspace by asking for one.
-    const stored = record('claude', 'workspace-from-record')
-
-    await expect(
-      revealStructuredAgentSession(
-        { store: { getRecord: () => stored } as never, adapter: {} as never },
-        'session-answered',
-        () => true,
-        async () => true
-      )
-    ).resolves.toEqual({
-      sessionId: 'session-answered',
-      workspaceId: 'workspace-from-record',
-      agent: 'claude',
-      readable: true
-    })
-  })
-
-  it('refuses a session this host holds no record for', async () => {
+  it.each(['claude', 'codex'] as const)(
+    "answers a %s chat with the record's own workspace and provider, never a caller's",
+    async (provider) => {
+      // The security property: a client sends only a session id, so the tab cannot be aimed at
+      // another workspace by asking for one.
+      const stored = record(provider, 'workspace-from-record')
+      const open = vi.fn(async () => undefined)
+
+      await expect(
+        revealStructuredAgentSession(
+          { store: { getRecord: () => stored } as never, adapter: {} as never },
+          'session-answered',
+          open
+        )
+      ).resolves.toEqual({
+        sessionId: 'session-answered',
+        workspaceId: 'workspace-from-record',
+        agent: provider,
+        readable: true
+      })
+      expect(open).toHaveBeenCalledExactlyOnceWith('session-answered')
+    }
+  )
+
+  it('refuses a session this host holds no record for, opening nothing', async () => {
+    const open = vi.fn(async () => undefined)
     await expect(
       revealStructuredAgentSession(
         { store: { getRecord: () => null } as never, adapter: {} as never },
         'session-absent',
-        () => false,
-        async () => false
+        open
       )
     ).rejects.toThrow('agent_session_identity_required')
+    expect(open).not.toHaveBeenCalled()
   })
 
   it('refuses a record no adapter of this host supports', async () => {
     vi.mocked(providerSupport.adapterSupportsRecord).mockReturnValue(false)
+    const open = vi.fn(async () => undefined)
 
     await expect(
       revealStructuredAgentSession(
@@ -195,14 +95,14 @@ describe('the host answer a client acts on', () => {
           adapter: {} as never
         },
         'session-answered',
-        () => false,
-        async () => false
+        open
       )
     ).rejects.toThrow('structured_agent_session_unsupported')
+    expect(open).not.toHaveBeenCalled()
   })
 
-  it('answers not-readable without refusing when the journal could not be restored', async () => {
-    // The tab is still worth publishing: attach recovers what read restore cannot.
+  it('answers not-readable without refusing when the journal could not be opened', async () => {
+    // The tab is still worth publishing: the chat shows the failure and keeps retrying the read.
     await expect(
       revealStructuredAgentSession(
         {
@@ -210,26 +110,10 @@ describe('the host answer a client acts on', () => {
           adapter: {} as never
         },
         'session-answered',
-        () => false,
-        async () => false
+        async () => {
+          throw new Error('journal unreadable')
+        }
       )
     ).resolves.toMatchObject({ readable: false, agent: 'codex' })
   })
-
-  it('does not restore over a session that is already live', async () => {
-    const restoreReadable = vi.fn(async () => true)
-
-    await expect(
-      revealStructuredAgentSession(
-        {
-          store: { getRecord: () => record('codex', 'workspace-1') } as never,
-          adapter: {} as never
-        },
-        'session-answered',
-        () => true,
-        restoreReadable
-      )
-    ).resolves.toMatchObject({ readable: true })
-    expect(restoreReadable).not.toHaveBeenCalled()
-  })
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-reveal.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-reveal.ts
index 097cd6b479ae..2a1899ab1ccd 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-reveal.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-reveal.ts
@@ -6,11 +6,11 @@
 // launch — is reachable in Agent Session History by id and by nothing else. This is the lookup that
 // turns that id back into something a client can publish.
 //
-// It is deliberately the whole of what reveal does on the host. It takes no hold: a provider child
-// exists because a surface asked for one, and the chat pane asks when it binds. And a journal it
-// cannot read is not a refusal — a chat whose journal predates the SQLite store restores to nothing
-// here, yet attach still recovers it, so the tab is worth publishing either way.
+// It is deliberately the whole of what reveal does on the host. It starts no provider child: only
+// a send does. And a journal it cannot open is not a refusal — the chat shows that failure with a
+// Retry, so the tab is worth publishing either way.
 
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import { adapterSupportsRecord } from './structured-agent-session-provider-support'
 import { StructuredAgentSessionReadableRestorer } from './structured-agent-session-readable-restorer'
 import { StructuredAgentSessionRestartRestoreGate } from './structured-agent-session-restart-restore-gate'
@@ -18,26 +18,29 @@ import type {
   StructuredAgentSessionHostDeps,
   StructuredAgentSessionReveal
 } from './structured-agent-session-host-types'
-import { settleStaleStructuredAgentSessionState } from './structured-agent-session-dead-generation-settlement'
 
-/** Throws its refusal as the code itself, matching `resumeHeldStructuredAgentSession`. */
+/** Throws its refusal as the code itself. */
 export async function revealStructuredAgentSession(
   deps: Pick<StructuredAgentSessionHostDeps, 'store' | 'adapter'>,
   sessionId: string,
-  hasSession: (sessionId: string) => boolean,
-  restoreReadable: (sessionId: string) => Promise<boolean>
+  openConversation: (sessionId: string) => Promise<unknown>
 ): Promise<StructuredAgentSessionReveal> {
   const record = deps.store.getRecord(sessionId)
   if (!record) {
-    throw new Error('agent_session_identity_required')
+    throw agentSessionRefusalError('agent_session_identity_required', { reason: 'recordMissing' })
   }
   if (!adapterSupportsRecord(deps.adapter, record)) {
-    throw new Error('structured_agent_session_unsupported')
+    throw agentSessionRefusalError('structured_agent_session_unsupported', {
+      reason: 'hostUnsupported'
+    })
   }
   // Lease state is not consulted on purpose: this neither claims the lease nor spawns a child, so a
-  // contested or reconciling chat still reveals and the hold that follows adjudicates it. Refusing
+  // contested or reconciling chat still reveals and the send that follows adjudicates it. Refusing
   // here would hide the one view of a session a user needs when its ownership is in doubt.
-  const readable = hasSession(sessionId) || (await restoreReadable(sessionId))
+  const readable = await openConversation(sessionId).then(
+    () => true,
+    () => false
+  )
   return {
     sessionId,
     // From the record, never from a caller: a client that knows only a session id must not be able
@@ -48,50 +51,23 @@ export async function revealStructuredAgentSession(
   }
 }
 
-/**
- * The host's whole readable-restore surface: the startup sweep and the on-demand reveal.
- *
- * Bundled the way the lifetime collaborators are, because the two share the restorer
- * and differ only in who is asking — startup, once, for everything; a surface, later, for one.
- */
+/** The host's startup readable-restore sweep: reconcile, resolve, then open each chat's journal. */
 export function createStructuredAgentSessionHostRestore(
   deps: StructuredAgentSessionHostDeps,
   wiring: Omit<
     ConstructorParameters<typeof StructuredAgentSessionReadableRestorer>[0],
-    'store' | 'journalRoot' | 'supportsRecord' | 'settleStaleState'
+    'openDeps' | 'supportsRecord'
   >
 ): {
   restoreReadableSessions: (sessionIds?: readonly string[]) => Promise<void>
-  revealSession: (sessionId: string) => Promise<StructuredAgentSessionReveal>
-  /** One session, for a caller already inside its serialize. */
-  restoreReadableUnderSerialize: (sessionId: string) => Promise<boolean>
 } {
   const restorer = new StructuredAgentSessionReadableRestorer({
-    store: deps.store,
-    journalRoot: deps.journalRoot,
+    openDeps: deps,
     supportsRecord: (record) => adapterSupportsRecord(deps.adapter, record),
-    settleStaleState: async (sessionId, restored) => {
-      try {
-        await settleStaleStructuredAgentSessionState({
-          journal: restored.journal,
-          sessionId,
-          fence: restored.fence,
-          acquisitionGeneration: null,
-          deathEvidence: deps.store.getRecord(sessionId)?.lease.deathEvidence ?? null
-        })
-      } catch (error) {
-        deps.onEventSinkError?.({ sessionId, error })
-      }
-    },
     ...wiring
   })
   const gate = new StructuredAgentSessionRestartRestoreGate()
   return {
-    restoreReadableSessions: (sessionIds) => gate.run(() => restorer.restore(sessionIds)),
-    revealSession: (sessionId) =>
-      revealStructuredAgentSession(deps, sessionId, wiring.hasSession, (id) =>
-        restorer.restoreOne(id)
-      ),
-    restoreReadableUnderSerialize: (sessionId) => restorer.restoreOneUnderSerialize(sessionId)
+    restoreReadableSessions: (sessionIds) => gate.run(() => restorer.restore(sessionIds))
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-at-rest.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-at-rest.test.ts
new file mode 100644
index 000000000000..a596cc5c9edb
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-at-rest.test.ts
@@ -0,0 +1,225 @@
+// A Codex rewind whose outcome only the provider can prove, found on a chat at rest: nothing on
+// screen will start the agent that settles it, so the next send does, and its message is kept.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import type {
+  AgentSessionDispatchOutcome,
+  StructuredAgentSessionAdapter
+} from './structured-agent-session-adapter'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import type { StructuredAgentSessionEventSink } from './structured-agent-session-event-sink'
+import {
+  HOST_TEST_NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
+  hostTestMessage,
+  hostTestOperationId,
+  resetHostTestOperationIds
+} from './structured-agent-session-host-test-data'
+
+const caller = { callerKey: 'desktop' }
+const KEPT = { provider: 'codex' as const, threadId: THREAD, turnId: 'kept', ordinal: 0 }
+
+let directory: string
+let store: AgentSessionRecordStore
+let host: StructuredAgentSessionHost
+let sink: StructuredAgentSessionEventSink
+let acquires = 0
+const rewind = vi.fn<NonNullable<StructuredAgentSessionAdapter['rewind']>>()
+const recoverRewind = vi.fn<NonNullable<StructuredAgentSessionAdapter['recoverRewind']>>()
+const rewindSupport = vi.fn<NonNullable<StructuredAgentSessionAdapter['rewindSupport']>>()
+const dispatch = vi.fn<StructuredAgentSessionAdapter['dispatch']>()
+
+function adapter(): StructuredAgentSessionAdapter {
+  return {
+    supportsCreate: (_location, agent) => agent === 'codex',
+    supportsLocation: () => true,
+    acquire: async (input) => {
+      acquires += 1
+      sink = input.events!
+      return {
+        process: {
+          hostId: 'local',
+          pid: 4000 + acquires,
+          processStartTimeMs: HOST_TEST_NOW,
+          spawnToken: input.spawnToken
+        },
+        acquisitionGeneration: `generation-${acquires}`,
+        link: {
+          linkId: `link-${acquires}`,
+          mintedAtFence: input.fence,
+          observedAt: HOST_TEST_NOW,
+          origin: acquires === 1 ? 'created' : 'resumed',
+          handle: { provider: 'codex', threadId: THREAD }
+        }
+      }
+    },
+    dispatch,
+    cancelTurn: async () => ({ cancelled: false }),
+    answerPrompt: async () => {},
+    setOption: async () => {},
+    rewindSupport,
+    rewind,
+    recoverRewind,
+    releaseAcquisition: async () => true,
+    closeSession: async () => true
+  }
+}
+
+function openHost(): StructuredAgentSessionHost {
+  return new StructuredAgentSessionHost({
+    store,
+    adapter: adapter(),
+    journalRoot: directory,
+    claimKeyId: 'key',
+    now: () => HOST_TEST_NOW,
+    probeOwner: async () => ({ outcome: 'exit-observed' }),
+    idleSweep: { intervalMs: 3_600_000 }
+  })
+}
+
+beforeEach(async () => {
+  resetHostTestOperationIds()
+  acquires = 0
+  rewind.mockReset()
+  recoverRewind.mockReset().mockResolvedValue({
+    ok: true,
+    items: [{ identity: KEPT, body: hostTestMessage('verified history') }]
+  })
+  rewindSupport.mockReset().mockReturnValue({ supported: true })
+  dispatch.mockReset().mockImplementation(async (input): Promise<AgentSessionDispatchOutcome> => ({
+    state: 'accepted',
+    providerIdentity: {
+      provider: 'codex',
+      threadId: THREAD,
+      turnId: input.clientMessageId,
+      ordinal: 1
+    }
+  }))
+  directory = await mkdtemp(join(tmpdir(), 'orca-rewind-rest-'))
+  store = await AgentSessionRecordStore.open({
+    directory: join(directory, 'store'),
+    hostId: 'local'
+  })
+  host = openHost()
+})
+
+afterEach(async () => {
+  await host.flushAllStreamedEvents()
+  await rm(directory, { recursive: true, force: true })
+})
+
+function fence(): number {
+  return store.getRecord(SESSION)!.lease.runtimeFence
+}
+
+function rewindParams(itemId: string, expectedEpoch: string) {
+  return {
+    itemId,
+    expectedEpoch,
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: fence(),
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.rewind',
+        sessionId: SESSION,
+        fields: { itemId, expectedEpoch }
+      })
+    }
+  }
+}
+
+function sendParams(text: string) {
+  const body = hostTestMessage(text)
+  return {
+    body,
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: fence(),
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.send',
+        sessionId: SESSION,
+        fields: { body }
+      })
+    }
+  }
+}
+
+/** A chat whose rewind the provider applied, whose Orca side never finished, reopened at rest. */
+async function interruptedRewindAtRest(): Promise<void> {
+  expect(await host.attach(caller, hostTestAttachParams(null))).toMatchObject({ ok: true })
+  const drop = { ...KEPT, turnId: 'drop' }
+  sink.appendItem(KEPT, hostTestMessage('verified history'))
+  sink.appendItem(drop, hostTestMessage('to be rewound'))
+  await host.flushStreamedEvents(SESSION)
+  rewind.mockImplementation(async (input) => {
+    await input.onReverted?.()
+    throw new Error('history unavailable')
+  })
+  const epoch = (await host.journalSnapshot(SESSION)).cursor.epoch
+  await expect(host.rewind(caller, rewindParams(agentJournalItemKey(drop), epoch))).rejects.toThrow(
+    'history unavailable'
+  )
+  expect(store.getRecord(SESSION)?.rewind).toMatchObject({ phase: 'prepared' })
+  await host.flushAllStreamedEvents()
+  store = await AgentSessionRecordStore.open({
+    directory: join(directory, 'store'),
+    hostId: 'local'
+  })
+  host = openHost()
+}
+
+describe('an interrupted Codex rewind on a chat at rest (R16)', () => {
+  it('is settled by the start a send makes, and the message is delivered after it', async () => {
+    await interruptedRewindAtRest()
+    expect(host.hasSession(SESSION)).toBe(false)
+    const before = acquires
+
+    const sent = await host.send(caller, sendParams('after the rewind'))
+    expect(sent).toMatchObject({ ok: true })
+    expect(acquires - before).toBe(1)
+    expect(recoverRewind).toHaveBeenCalledOnce()
+    expect(store.getRecord(SESSION)?.rewind?.phase).toBe('completed')
+    await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
+    const snapshot = await host.journalSnapshot(SESSION)
+    const texts = snapshot.items.flatMap((item) =>
+      item.body.kind === 'message'
+        ? item.body.blocks.flatMap((block) => (block.type === 'text' ? [block.text] : []))
+        : []
+    )
+    // The recovered history, then the new message — nothing the rewind dropped, nothing lost.
+    expect(texts).toEqual(['verified history', 'after the rewind'])
+    expect(snapshot.submissions.at(-1)?.dispatchState).toBe('accepted')
+  })
+})
+
+describe('a rewind asked of a chat at rest (P2-23)', () => {
+  it('starts the agent first and answers with what the provider says', async () => {
+    expect(await host.attach(caller, hostTestAttachParams(null))).toMatchObject({ ok: true })
+    sink.appendItem(KEPT, hostTestMessage('kept'))
+    await host.flushStreamedEvents(SESSION)
+    const epoch = (await host.journalSnapshot(SESSION)).cursor.epoch
+    await host.flushAllStreamedEvents()
+    store = await AgentSessionRecordStore.open({
+      directory: join(directory, 'store'),
+      hostId: 'local'
+    })
+    host = openHost()
+    const before = acquires
+    rewindSupport.mockReturnValue({ supported: false, reason: 'history-not-paginated' })
+
+    const result = await host.rewind(caller, rewindParams(agentJournalItemKey(KEPT), epoch))
+    expect(acquires - before).toBe(1)
+    expect(result).toMatchObject({ ok: false, refusal: { rewindReason: 'history-not-paginated' } })
+    expect(rewind).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind.test.ts
index b82248cb06ff..a8ded60e6ffb 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind.test.ts
@@ -139,6 +139,14 @@ async function seed(acceptedSubmissions = false) {
           }
         })
       ).toMatchObject({ ok: true })
+      // Accepted into the conversation first; the delivery loop hands it over after.
+      await vi.waitFor(async () =>
+        expect(
+          (await host.journalSnapshot(HOST_TEST_SESSION)).submissions.find(
+            (entry) => entry.clientMessageId === clientOperationId
+          )?.dispatchState
+        ).toBe('accepted')
+      )
       if (i === 1) {
         selectedItemId = agentJournalSubmissionKey(clientOperationId)
       }
@@ -149,10 +157,8 @@ async function seed(acceptedSubmissions = false) {
   await host.flushStreamedEvents(HOST_TEST_SESSION)
   return selectedItemId
 }
-function params(
-  itemId: string,
-  expectedEpoch = host.journalSnapshot(HOST_TEST_SESSION).cursor.epoch
-) {
+async function params(itemId: string, epoch?: string) {
+  const expectedEpoch = epoch ?? (await host.journalSnapshot(HOST_TEST_SESSION)).cursor.epoch
   return {
     itemId,
     expectedEpoch,
@@ -173,14 +179,14 @@ describe('host rewind', () => {
   it('resolves accepted codex user submissions to provider targets', async () => {
     const target = await seed(true)
     expect(target.startsWith('orca:')).toBe(true)
-    expect(await host.rewind(caller, params(target))).toMatchObject({ ok: true })
-    expect(host.journalSnapshot(HOST_TEST_SESSION).items).toHaveLength(1)
+    expect(await host.rewind(caller, await params(target))).toMatchObject({ ok: true })
+    expect((await host.journalSnapshot(HOST_TEST_SESSION)).items).toHaveLength(1)
     expect(rewind).toHaveBeenCalledWith(expect.objectContaining({ beforeTurnId: 'drop' }))
   })
 
   it('finishes a durable provider success on reattach without repeating the provider mutation', async () => {
     const target = await seed()
-    const request = params(target)
+    const request = await params(target)
     const replace = vi
       .spyOn(AgentSessionJournal.prototype, 'replaceEpochItems')
       .mockRejectedValueOnce(new Error('disk failed'))
@@ -189,7 +195,7 @@ describe('host rewind', () => {
     replace.mockRestore()
     const fence = store.getRecord(HOST_TEST_SESSION)!.lease.runtimeFence
     expect(await host.attach(caller, hostTestAttachParams(fence))).toMatchObject({ ok: true })
-    expect(host.journalSnapshot(HOST_TEST_SESSION).items).toHaveLength(1)
+    expect((await host.journalSnapshot(HOST_TEST_SESSION)).items).toHaveLength(1)
     expect(store.getRecord(HOST_TEST_SESSION)?.rewind?.phase).toBe('completed')
     expect(await host.rewind(caller, request)).toMatchObject({ ok: true, replayed: true })
     expect(rewind).toHaveBeenCalledTimes(1)
@@ -197,13 +203,13 @@ describe('host rewind', () => {
 
   it('retries complete hydration after native acknowledgement without committing partial history', async () => {
     const target = await seed()
-    const before = host.journalSnapshot(HOST_TEST_SESSION)
+    const before = await host.journalSnapshot(HOST_TEST_SESSION)
     rewind.mockImplementation(async (input) => {
       await input.onReverted?.()
       throw new Error('history unavailable')
     })
-    await expect(host.rewind(caller, params(target))).rejects.toThrow('history unavailable')
-    expect(host.journalSnapshot(HOST_TEST_SESSION)).toEqual(before)
+    await expect(host.rewind(caller, await params(target))).rejects.toThrow('history unavailable')
+    expect(await host.journalSnapshot(HOST_TEST_SESSION)).toEqual(before)
     expect(store.getRecord(HOST_TEST_SESSION)?.rewind).toMatchObject({
       phase: 'prepared',
       providerApplied: true
@@ -222,8 +228,8 @@ describe('host rewind', () => {
         hostTestAttachParams(store.getRecord(HOST_TEST_SESSION)!.lease.runtimeFence)
       )
     ).toMatchObject({ ok: true })
-    expect(host.journalSnapshot(HOST_TEST_SESSION).items).toHaveLength(1)
-    expect(host.journalSnapshot(HOST_TEST_SESSION).items[0]?.body).toEqual(
+    expect((await host.journalSnapshot(HOST_TEST_SESSION)).items).toHaveLength(1)
+    expect((await host.journalSnapshot(HOST_TEST_SESSION)).items[0]?.body).toEqual(
       hostTestMessage('verified history')
     )
     expect(recoverRewind).toHaveBeenCalledTimes(2)
@@ -238,9 +244,9 @@ describe('host rewind', () => {
           finish = () => resolve({ ok: true })
         })
     )
-    const first = host.rewind(caller, params(target))
-    const second = host.rewind(caller, params(target))
-    await vi.waitFor(() => expect(finish).toBeTypeOf('function'))
+    const first = host.rewind(caller, await params(target))
+    const second = host.rewind(caller, await params(target))
+    await vi.waitFor(async () => expect(finish).toBeTypeOf('function'))
     finish()
     expect(await first).toMatchObject({ ok: true })
     expect(await second).toMatchObject({ ok: false, refusal: { rewindReason: 'stale-epoch' } })
@@ -248,11 +254,13 @@ describe('host rewind', () => {
   })
   it('replaces the epoch with the retained prefix and replays without another provider call', async () => {
     const target = await seed()
-    const request = params(target)
+    const request = await params(target)
     const result = await host.rewind(caller, request)
     expect(result).toMatchObject({ ok: true })
-    expect(host.journalSnapshot(HOST_TEST_SESSION).items).toHaveLength(1)
-    expect(host.journalSnapshot(HOST_TEST_SESSION).cursor.epoch).not.toBe(request.expectedEpoch)
+    expect((await host.journalSnapshot(HOST_TEST_SESSION)).items).toHaveLength(1)
+    expect((await host.journalSnapshot(HOST_TEST_SESSION)).cursor.epoch).not.toBe(
+      request.expectedEpoch
+    )
     expect(await host.rewind(caller, request)).toMatchObject({ ok: true, replayed: true })
     expect(rewind).toHaveBeenCalledTimes(1)
   })
@@ -262,7 +270,7 @@ describe('host rewind', () => {
       { provider: 'orca', clientMessageId: 'active' },
       { kind: 'status', text: 'working', turnLifecycle: { turnId: 'active', state: 'running' } }
     )
-    expect(await host.rewind(caller, params(target))).toMatchObject({
+    expect(await host.rewind(caller, await params(target))).toMatchObject({
       ok: false,
       refusal: { rewindReason: 'busy' }
     })
@@ -270,11 +278,11 @@ describe('host rewind', () => {
   })
   it('refuses stale epochs and targets from another provider', async () => {
     const target = await seed()
-    expect(await host.rewind(caller, params(target, 'old-epoch'))).toMatchObject({
+    expect(await host.rewind(caller, await params(target, 'old-epoch'))).toMatchObject({
       ok: false,
       refusal: { rewindReason: 'stale-epoch' }
     })
-    expect(await host.rewind(caller, params('claude:foreign'))).toMatchObject({
+    expect(await host.rewind(caller, await params('claude:foreign'))).toMatchObject({
       ok: false,
       refusal: { rewindReason: 'invalid-target' }
     })
@@ -282,18 +290,18 @@ describe('host rewind', () => {
   })
   it('keeps a failed hydration epoch intact and blocks sends and duplicate rewind', async () => {
     const target = await seed()
-    const request = params(target)
-    const before = host.journalSnapshot(HOST_TEST_SESSION)
+    const request = await params(target)
+    const before = await host.journalSnapshot(HOST_TEST_SESSION)
     rewind.mockRejectedValue(new Error('hydration failed'))
     await expect(host.rewind(caller, request)).rejects.toThrow('hydration failed')
-    expect(host.journalSnapshot(HOST_TEST_SESSION)).toEqual(before)
+    expect(await host.journalSnapshot(HOST_TEST_SESSION)).toEqual(before)
     expect(await host.rewind(caller, request)).toMatchObject({
       ok: false,
       refusal: { code: 'agent_session_operation_unknown' }
     })
     const body = hostTestMessage('new prompt')
     const envelope = {
-      ...params(target).envelope,
+      ...(await params(target)).envelope,
       payloadFingerprint: computeAgentSessionPayloadFingerprint({
         method: 'agentSession.send',
         sessionId: HOST_TEST_SESSION,
@@ -318,9 +326,9 @@ describe('host rewind', () => {
 
   it('clears an unapplied prepared rewind after observing the target still present', async () => {
     const target = await seed()
-    const before = host.journalSnapshot(HOST_TEST_SESSION)
+    const before = await host.journalSnapshot(HOST_TEST_SESSION)
     rewind.mockRejectedValueOnce(new Error('read failed before revert'))
-    await expect(host.rewind(caller, params(target))).rejects.toThrow('read failed')
+    await expect(host.rewind(caller, await params(target))).rejects.toThrow('read failed')
     recoverRewind.mockResolvedValueOnce({ ok: false, reason: 'provider-refused' })
     expect(
       await host.attach(
@@ -328,9 +336,9 @@ describe('host rewind', () => {
         hostTestAttachParams(store.getRecord(HOST_TEST_SESSION)!.lease.runtimeFence)
       )
     ).toMatchObject({ ok: true })
-    expect(host.journalSnapshot(HOST_TEST_SESSION)).toEqual(before)
+    expect(await host.journalSnapshot(HOST_TEST_SESSION)).toEqual(before)
     expect(store.getRecord(HOST_TEST_SESSION)?.rewind?.phase).toBe('refused')
-    expect(await host.rewind(caller, params(target))).toMatchObject({ ok: true })
+    expect(await host.rewind(caller, await params(target))).toMatchObject({ ok: true })
   })
 
   it('keeps host-stamped turn and goal rows through a Codex provider hydration', async () => {
@@ -384,12 +392,17 @@ describe('host rewind', () => {
       return { ok: true, items }
     })
 
-    expect(await host.rewind(caller, params(agentJournalItemKey(message('drop'))))).toMatchObject({
+    expect(
+      await host.rewind(caller, await params(agentJournalItemKey(message('drop'))))
+    ).toMatchObject({
       ok: true
     })
 
     expect(
-      host.journalSnapshot(HOST_TEST_SESSION).items.map(({ itemId, body }) => ({ itemId, body }))
+      (await host.journalSnapshot(HOST_TEST_SESSION)).items.map(({ itemId, body }) => ({
+        itemId,
+        body
+      }))
     ).toEqual([
       { itemId: agentJournalItemKey(message('kept')), body: hostTestMessage('kept from provider') },
       { itemId: agentJournalItemKey(goalRow), body: goalBody },
@@ -429,9 +442,9 @@ describe('host rewind', () => {
       throw new Error('lost after provider revert')
     })
 
-    await expect(host.rewind(caller, params(agentJournalItemKey(message('drop'))))).rejects.toThrow(
-      'lost after provider revert'
-    )
+    await expect(
+      host.rewind(caller, await params(agentJournalItemKey(message('drop'))))
+    ).rejects.toThrow('lost after provider revert')
     recoverRewind.mockResolvedValueOnce({
       ok: true,
       items: [{ identity: message('kept'), body: hostTestMessage('kept from recovery') }]
@@ -444,7 +457,10 @@ describe('host rewind', () => {
     ).toMatchObject({ ok: true })
 
     expect(
-      host.journalSnapshot(HOST_TEST_SESSION).items.map(({ itemId, body }) => ({ itemId, body }))
+      (await host.journalSnapshot(HOST_TEST_SESSION)).items.map(({ itemId, body }) => ({
+        itemId,
+        body
+      }))
     ).toEqual([
       { itemId: agentJournalItemKey(message('kept')), body: hostTestMessage('kept from recovery') },
       { itemId: agentJournalItemKey(goalRow), body: goalBody }
@@ -463,7 +479,7 @@ describe('host rewind', () => {
       await input.onReverted?.()
       throw new Error('lost after revert')
     })
-    await expect(host.rewind(caller, params(target))).rejects.toThrow('lost after revert')
+    await expect(host.rewind(caller, await params(target))).rejects.toThrow('lost after revert')
     recoverRewind.mockResolvedValueOnce({ ok: true, items })
     expect(
       await host.attach(
@@ -471,7 +487,7 @@ describe('host rewind', () => {
         hostTestAttachParams(store.getRecord(HOST_TEST_SESSION)!.lease.runtimeFence)
       )
     ).toMatchObject({ ok: true })
-    expect(host.journalSnapshot(HOST_TEST_SESSION).items).toHaveLength(2)
+    expect((await host.journalSnapshot(HOST_TEST_SESSION)).items).toHaveLength(2)
     expect(store.getRecord(HOST_TEST_SESSION)?.rewind?.phase).toBe('completed')
   })
 
@@ -479,7 +495,7 @@ describe('host rewind', () => {
     'never commits a recovered prefix that omits an expected retained %s',
     async (missing) => {
       const target = await seed()
-      const before = host.journalSnapshot(HOST_TEST_SESSION)
+      const before = await host.journalSnapshot(HOST_TEST_SESSION)
       const items = [0, 1].map((ordinal) => ({
         identity: {
           provider: 'codex' as const,
@@ -493,7 +509,7 @@ describe('host rewind', () => {
         await input.onPrepared?.(items)
         throw new Error('reply lost')
       })
-      await expect(host.rewind(caller, params(target))).rejects.toThrow('reply lost')
+      await expect(host.rewind(caller, await params(target))).rejects.toThrow('reply lost')
       recoverRewind.mockResolvedValueOnce({
         ok: true,
         items: missing === 'turn' ? [] : items.slice(0, 1)
@@ -514,7 +530,7 @@ describe('host rewind', () => {
 
   it('settles the existing epoch after a crash between journal commit and record completion', async () => {
     const target = await seed()
-    const request = params(target)
+    const request = await params(target)
     const transition = store.transitionHandoff.bind(store)
     const checkpoint = vi
       .spyOn(store, 'transitionHandoff')
@@ -528,7 +544,7 @@ describe('host rewind', () => {
         })
       )
     await expect(host.rewind(caller, request)).rejects.toThrow('completion write failed')
-    const committed = host.journalSnapshot(HOST_TEST_SESSION)
+    const committed = await host.journalSnapshot(HOST_TEST_SESSION)
     expect(committed.cursor.epoch).not.toBe(request.expectedEpoch)
     checkpoint.mockRestore()
     const replace = vi.spyOn(AgentSessionJournal.prototype, 'replaceEpochItems')
@@ -538,7 +554,7 @@ describe('host rewind', () => {
         hostTestAttachParams(store.getRecord(HOST_TEST_SESSION)!.lease.runtimeFence)
       )
     ).toMatchObject({ ok: true })
-    expect(host.journalSnapshot(HOST_TEST_SESSION)).toEqual(committed)
+    expect(await host.journalSnapshot(HOST_TEST_SESSION)).toEqual(committed)
     expect(replace).not.toHaveBeenCalled()
     replace.mockRestore()
     expect(await host.rewind(caller, request)).toMatchObject({ ok: true, replayed: true })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind.ts
index baedbe7c4d19..45dd7244896e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind.ts
@@ -13,6 +13,7 @@ import type {
 import type { AgentSessionMutationResult } from '../../../shared/agent-session-wire'
 import { AGENT_SESSION_HISTORY_MAX_PAGE_BYTES } from './agent-session-history-page-bounds'
 import type { StructuredAgentSessionMutationContext } from './structured-agent-session-host-mutations'
+import { openWithAgent } from './structured-agent-session-send-preparation'
 import type { StructuredAgentSessionAttachContext } from './structured-agent-session-attach-context'
 import type { StructuredAgentSessionCaller } from './structured-agent-session-host-types'
 import { admitAndRunAgentSessionMutation } from './structured-agent-session-mutation-admission'
@@ -35,6 +36,8 @@ export async function rewindStructuredAgentSession(
       adapter: context.deps.adapter,
       callerKey: caller.callerKey,
       envelope: params.envelope,
+      // Only the provider can do this, so an agent at rest is started first.
+      prepareSession: openWithAgent(context, params.envelope),
       journal: () => context.sessions.get(sessionId)?.journal,
       publish: (journal) => context.publish(sessionId, journal),
       flushStreamedEvents: context.flushStreamedEvents,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-block.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-block.test.ts
new file mode 100644
index 000000000000..798820258897
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-block.test.ts
@@ -0,0 +1,120 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { AgentSessionConversationCommandRecord } from '../../../shared/agent-session-conversation-command'
+import { agentSessionRecordFixture } from '../../../shared/agent-session-record.test-fixture'
+import {
+  openConversationForWrite,
+  structuredAgentSessionSendBlock
+} from './structured-agent-session-send-preparation'
+
+function withCommand(command: AgentSessionConversationCommandRecord) {
+  return { ...agentSessionRecordFixture(), conversationCommand: command }
+}
+
+const COMMAND = { operationId: 'operation-1', callerKey: 'client-1', runtimeFence: 7 }
+
+describe('a send refused by the conversation command it follows', () => {
+  it('says a /clear that never committed did not finish, not that the chat was cleared', () => {
+    const blocked = structuredAgentSessionSendBlock(
+      withCommand({
+        ...COMMAND,
+        command: 'clear',
+        state: 'unknown',
+        phase: 'prepared',
+        replacementSessionId: 'clear-replacement-1'
+      })
+    )
+
+    expect(blocked?.refusal).toMatchObject({
+      code: 'agent_session_operation_invalid',
+      details: { reason: 'clearUnconfirmed' },
+      message: "The last /clear didn't finish. Start a new chat to continue."
+    })
+  })
+
+  it('says a committed /clear cleared the conversation', () => {
+    const blocked = structuredAgentSessionSendBlock(
+      withCommand({
+        ...COMMAND,
+        command: 'clear',
+        state: 'completed',
+        phase: 'committed',
+        replacementSessionId: 'clear-replacement-1'
+      })
+    )
+
+    expect(blocked?.refusal).toMatchObject({
+      code: 'agent_session_operation_invalid',
+      details: { reason: 'conversationCleared' }
+    })
+  })
+
+  it('keeps an unconfirmed /compact as an unconfirmed command', () => {
+    const blocked = structuredAgentSessionSendBlock(
+      withCommand({ ...COMMAND, command: 'compact', state: 'unknown', phase: 'prepared' })
+    )
+
+    expect(blocked?.refusal).toMatchObject({
+      details: { reason: 'conversationCommandUnconfirmed' }
+    })
+  })
+
+  it('lets a send follow a /clear whose new conversation failed to start', () => {
+    expect(
+      structuredAgentSessionSendBlock(
+        withCommand({ ...COMMAND, command: 'clear', state: 'completed', phase: 'committed' })
+      )
+    ).toBeNull()
+  })
+})
+
+describe('a write whose conversation the host could not open', () => {
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  const ENVELOPE = {
+    sessionId: 'session-1',
+    clientOperationId: 'operation-1',
+    expectedRuntimeFence: 1,
+    payloadFingerprint: ''
+  }
+
+  function refusedBy(error: unknown) {
+    vi.spyOn(console, 'warn').mockImplementation(() => {})
+    return openConversationForWrite(async () => {
+      throw error
+    }, ENVELOPE)
+  }
+
+  it('says a corrupt history is final, in words and not the error', async () => {
+    const corrupt = Object.assign(new Error('/Users/me/journal.db: file is not a database'), {
+      code: 'ERR_SQLITE_ERROR',
+      errcode: 26
+    })
+
+    expect(await refusedBy(corrupt)).toEqual({
+      ok: false,
+      refusal: {
+        code: 'agent_session_journal_unreadable',
+        details: { reason: 'journalCorrupt' },
+        message: 'Unable to load this chat.'
+      }
+    })
+  })
+
+  it('says any other failed open can clear', async () => {
+    const denied = Object.assign(new Error('EACCES: permission denied, open /Users/me'), {
+      code: 'EACCES',
+      errno: -13
+    })
+
+    expect(await refusedBy(denied)).toEqual({
+      ok: false,
+      refusal: {
+        code: 'agent_session_journal_unreadable',
+        details: { reason: 'journalUnavailable' },
+        message: "Orca couldn't open this chat's history right now. Try again."
+      }
+    })
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts
index 0f75c9a33224..2494535e019b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts
@@ -120,11 +120,16 @@ describe('structured send idempotency', () => {
     await performSend(context, input)
     const replay = await performSend(context, input)
 
+    // Acceptance records the one submission; the reused id answers with it and writes nothing.
+    // Handing it over is the delivery loop's, never a second accept's.
     expect(replay).toMatchObject({
       ok: true,
-      value: { clientMessageId: 'shared-send-id', submission: { dispatchState: 'accepted' } }
+      value: {
+        clientMessageId: 'shared-send-id',
+        submission: { dispatchState: 'pending', handoverRecorded: true }
+      }
     })
-    expect(dispatch).toHaveBeenCalledOnce()
+    expect(dispatch).not.toHaveBeenCalled()
     expect(journal.submissions()).toHaveLength(1)
   })
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-open-stale-turn.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-open-stale-turn.test.ts
new file mode 100644
index 000000000000..0a14f4361197
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-open-stale-turn.test.ts
@@ -0,0 +1,157 @@
+// A send can be what opens a conversation this process has not read yet: a chat nobody has on
+// screen after the app died, sent to from a phone or the CLI. Whatever that journal shows running
+// belongs to a generation that is gone, so it is settled when the journal opens, not only when a
+// new child starts: a start that then fails would leave the turn running for every reader.
+
+import { cp, rm } from 'node:fs/promises'
+import { join } from 'node:path'
+import { afterEach, expect, it, vi } from 'vitest'
+import type { AgentSessionOwnerProbe } from '../../../shared/agent-session-lease-adjudication'
+import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import {
+  adapter,
+  attach,
+  CALLER,
+  envelope,
+  hostTestState,
+  replaceHostTestState
+} from './structured-agent-session-host-test-harness'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestMessage
+} from './structured-agent-session-host-test-data'
+
+/** Delivery runs on its own serialized steps; under a loaded runner they take more than a second. */
+function eventually(assertion: () => unknown): Promise<unknown> {
+  return vi.waitFor(assertion, { timeout: 10_000 })
+}
+
+const relaunchedRoots: string[] = []
+
+afterEach(async () => {
+  await Promise.all(
+    relaunchedRoots.splice(0).map((dir) => rm(dir, { recursive: true, force: true }))
+  )
+})
+
+/** A host that dies mid-turn, relaunched over a copy of its files taken at the crash. */
+async function relaunchAfterCrashMidTurn(
+  probe: AgentSessionOwnerProbe,
+  { reconcile = true }: { reconcile?: boolean } = {}
+) {
+  const dying = hostTestState()
+  await attach()
+  const events = dying.acquire.mock.calls[0]?.[0].events
+  if (!events) {
+    throw new Error('missing provider event sink')
+  }
+  events.appendItem(
+    { provider: 'codex', threadId: THREAD, turnId: 'crashed-turn', ordinal: 1 },
+    { kind: 'turn', turnId: 'crashed-turn', state: 'running' }
+  )
+  await dying.host.flushStreamedEvents(SESSION)
+  // An empty renewal queues behind every record write, so they are on disk.
+  await dying.store.renewLeases([])
+  const relaunched = `${dying.root}-relaunched`
+  relaunchedRoots.push(relaunched)
+  // A dead process holds no lock.
+  await cp(dying.root, relaunched, {
+    recursive: true,
+    filter: (source) => !source.includes('.lock')
+  })
+  const store = await AgentSessionRecordStore.open({
+    directory: join(relaunched, 'store'),
+    hostId: 'local'
+  })
+  const acquire = vi.fn(async () => {
+    throw new Error('claude: command not found')
+  })
+  const host = new StructuredAgentSessionHost({
+    store,
+    adapter: { ...adapter(), acquire },
+    journalRoot: relaunched,
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => 'spawn-next',
+    probeOwner: async () => probe,
+    now: () => NOW
+  })
+  if (reconcile) {
+    await host.reconcileRestartLeases()
+  }
+  replaceHostTestState({ store, host })
+  return { host, acquire }
+}
+
+async function turnStates(host: StructuredAgentSessionHost) {
+  return (await host.journalSnapshot(SESSION)).items
+    .flatMap((item) => readAgentJournalTurn(item.body) ?? [])
+    .map((turn) => turn.state)
+}
+
+// A host that cannot prove the old owner gone leaves its lease in recovery, still claimed, until
+// the next acquire resolves it: the open is not that acquire, and the turn is no less gone. Only
+// the proof decides whether it reads interrupted.
+const PROBES = [
+  ['the old owner is proven gone', { outcome: 'pid-absent' }, 'interrupted'],
+  [
+    'nothing proves the old owner gone',
+    { outcome: 'indeterminate', reason: 'This host cannot probe structured session owners.' },
+    'unverifiable'
+  ]
+] as const satisfies readonly (readonly [string, AgentSessionOwnerProbe, string])[]
+
+it.each(PROBES)(
+  'settles a turn a dead generation left running when a send opens the chat and its start fails, when %s',
+  async (_when, probe, settled) => {
+    const { host, acquire } = await relaunchAfterCrashMidTurn(probe)
+    expect(host.hasSession(SESSION)).toBe(false)
+
+    const body = hostTestMessage('sent to a chat nobody has open')
+    const sendEnvelope = envelope('agentSession.send', { body })
+    await expect(host.send(CALLER, { envelope: sendEnvelope, body })).resolves.toMatchObject({
+      ok: true
+    })
+    await eventually(async () =>
+      expect(
+        (await host.journalSnapshot(SESSION)).submissions.find(
+          (entry) => entry.clientMessageId === sendEnvelope.clientOperationId
+        )
+      ).toMatchObject({ dispatchState: 'rejected' })
+    )
+
+    expect(acquire).toHaveBeenCalledOnce()
+    expect(await turnStates(host)).toEqual([settled])
+    await host.flushAllStreamedEvents()
+  }
+)
+
+it.each(PROBES)(
+  'settles the same turn when a reader opens the chat, when %s',
+  async (_when, probe, settled) => {
+    const { host } = await relaunchAfterCrashMidTurn(probe)
+
+    await host.revealSession(SESSION)
+
+    expect(await turnStates(host)).toEqual([settled])
+    await host.flushAllStreamedEvents()
+  }
+)
+
+// On desktop the chat on screen at relaunch reads before startup reconciles the leases: nothing
+// has proved its owner gone yet, and the reconcile's proof then revises what the open settled.
+it('settles it when a read reaches the chat before the startup reconcile, then revises it', async () => {
+  const { host } = await relaunchAfterCrashMidTurn({ outcome: 'pid-absent' }, { reconcile: false })
+  expect(hostTestState().store.getRecord(SESSION)?.lease.claimStatus).toBe('live')
+
+  await host.history({ sessionId: SESSION, direction: 'tail' })
+  expect(await turnStates(host)).toEqual(['unverifiable'])
+  await host.reconcileRestartLeases()
+  await host.restoreReadableSessions([SESSION])
+
+  expect(await turnStates(host)).toEqual(['interrupted'])
+  await host.flushAllStreamedEvents()
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-preparation.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-preparation.test.ts
index a93a64b0dc2e..259ad16c858e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-send-preparation.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-preparation.test.ts
@@ -1,11 +1,11 @@
-// A send, or a hold, that finds the session's provider child gone, against the real host.
+// A send, or a hold, that finds the session's provider child gone, against the real host. The
+// send is accepted at once; its delivery restarts the child, or rejects it with the reason.
 
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
-import { agentSessionRefusalOperationState } from '../../../shared/agent-session-refusal-retry'
 import type {
   AgentSessionMutationEnvelope,
   AgentSessionSubscribeEvent
@@ -13,6 +13,7 @@ import type {
 import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import { CodexAppServerRequestError } from '../../codex/codex-app-server-request-error'
 import {
   HOST_TEST_NOW as NOW,
   HOST_TEST_SESSION as SESSION,
@@ -24,8 +25,11 @@ import {
 } from './structured-agent-session-host-test-data'
 
 const CALLER = { callerKey: 'client-1' }
-// Long enough that no release fires mid-test; whether one is pending is asserted directly.
-const GRACE_MS = 60_000
+
+/** Delivery runs on its own serialized steps; under a loaded runner they take more than a second. */
+function eventually(assertion: () => void | Promise<void>): Promise<void> {
+  return vi.waitFor(assertion, { timeout: 10_000 })
+}
 
 let root: string
 let store: AgentSessionRecordStore
@@ -78,7 +82,6 @@ beforeEach(async () => {
     journalRoot: root,
     claimKeyId: 'key-1',
     mintSpawnToken: () => `spawn-${acquire.mock.calls.length}`,
-    releaseGraceMs: GRACE_MS,
     now: () => NOW,
     onEventSinkError: ({ error }) => hostErrors.push(error)
   })
@@ -105,15 +108,37 @@ function sendParams(text: string, operationId = hostTestOperationId()) {
   return { envelope, body }
 }
 
-/** Every status row the chat shows, oldest first; none when the session is not even readable. */
-function journalStatuses(): string[] {
-  if (!host.hasSession(SESSION)) {
-    return []
-  }
-  const history = host.history({ sessionId: SESSION, direction: 'tail' })
-  return history.ok
-    ? history.page.items.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : []))
-    : []
+/** Accepted at once, before any owner exists for it; answers the message id. */
+async function accept(params: ReturnType<typeof sendParams>): Promise<string> {
+  const result = await host.send(CALLER, params)
+  expect(result, JSON.stringify(result)).toMatchObject({
+    ok: true,
+    replayed: false,
+    value: { submission: { dispatchState: 'pending', handoverRecorded: true } }
+  })
+  return params.envelope.clientOperationId
+}
+
+async function submission(clientMessageId: string) {
+  return (await host.journalSnapshot(SESSION)).submissions.find(
+    (entry) => entry.clientMessageId === clientMessageId
+  )
+}
+
+/** The submission once delivery is done with it: handed over, or rejected unwritten. */
+async function settled(clientMessageId: string) {
+  await eventually(async () => {
+    const current = await submission(clientMessageId)
+    expect(current?.dispatchState !== 'pending' || current.handedOverAt !== undefined).toBe(true)
+  })
+  return submission(clientMessageId)
+}
+
+/** The failure rows a start the chat needed left, oldest first. */
+async function errorStatuses(): Promise<string[]> {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.body.kind === 'status' && item.body.tone === 'error' ? [item.body.text] : []
+  )
 }
 
 /** The child timed out or exited: its lease is handed back and the host holds no session. */
@@ -130,15 +155,14 @@ describe('a send with no live owner', () => {
   it('restarts the owner once and delivers against it', async () => {
     await loseOwner()
 
-    const result = await host.send(CALLER, sendParams('after the child died'))
+    await accept(sendParams('after the child died'))
 
-    expect(result).toMatchObject({ ok: true, replayed: false })
+    await eventually(async () => expect(dispatch).toHaveBeenCalledOnce())
     expect(acquire).toHaveBeenCalledOnce()
-    expect(dispatch).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('live')
   })
 
-  it('restarts the owner before the send is admitted, so the send is admitted once', async () => {
+  it('accepts the send before anything restarts, and the restart hands it over', async () => {
     await loseOwner()
     const order: string[] = []
     const spawnChild = acquire.getMockImplementation()!
@@ -152,21 +176,18 @@ describe('a send with no live owner', () => {
       return admit(args)
     })
 
-    await expect(host.send(CALLER, sendParams('ensure first'))).resolves.toMatchObject({
-      ok: true,
-      replayed: false
-    })
+    await accept(sendParams('accept first'))
+    await eventually(async () => expect(dispatch).toHaveBeenCalledOnce())
 
-    expect(order).toEqual(['acquire', 'admit'])
+    expect(order).toEqual(['admit', 'acquire'])
   })
 
   it('leaves a live owner alone', async () => {
     acquire.mockClear()
 
-    await expect(host.send(CALLER, sendParams('owner is live'))).resolves.toMatchObject({
-      ok: true
-    })
+    await accept(sendParams('owner is live'))
 
+    await eventually(async () => expect(dispatch).toHaveBeenCalledOnce())
     expect(acquire).not.toHaveBeenCalled()
   })
 
@@ -184,37 +205,12 @@ describe('a send with no live owner', () => {
       }
     }))
 
-    await host.send(CALLER, sendParams('into a cleared chat'))
-
-    expect(acquire).not.toHaveBeenCalled()
-  })
-
-  it('renews the idle window on journal activity in an unheld session', async () => {
-    await loseOwner()
-    await expect(host.send(CALLER, sendParams('restart'))).resolves.toMatchObject({ ok: true })
-    const arm = vi.spyOn(host['holds']['clock'], 'arm')
-
-    await expect(host.send(CALLER, sendParams('more activity'))).resolves.toMatchObject({
-      ok: true
-    })
-
-    expect(arm).toHaveBeenCalledWith(SESSION)
-  })
-
-  it('releases the restarted child on the usual clock only when no surface holds it', async () => {
-    await loseOwner()
-    await expect(host.send(CALLER, sendParams('nobody is watching'))).resolves.toMatchObject({
-      ok: true
+    await expect(host.send(CALLER, sendParams('into a cleared chat'))).resolves.toMatchObject({
+      ok: false,
+      refusal: { code: 'agent_session_operation_invalid' }
     })
-    expect(host['holds'].isReleasePending(SESSION)).toBe(true)
 
-    await host.close(SESSION)
-    // A reading surface that does not itself restart the agent.
-    await host.hold(SESSION, 'desktop-chat:1', { resume: false })
-    await expect(host.send(CALLER, sendParams('the chat is open'))).resolves.toMatchObject({
-      ok: true
-    })
-    expect(host['holds'].isReleasePending(SESSION)).toBe(false)
+    expect(acquire).not.toHaveBeenCalled()
   })
 
   it('restarts an owner that exited while the session stayed readable', async () => {
@@ -231,15 +227,15 @@ describe('a send with no live owner', () => {
     expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
     acquire.mockClear()
 
-    await expect(host.send(CALLER, sendParams('after an exit'))).resolves.toMatchObject({
-      ok: true
-    })
+    await accept(sendParams('after an exit'))
+    await eventually(async () => expect(dispatch).toHaveBeenCalledOnce())
     expect(acquire).toHaveBeenCalledOnce()
   })
 
   it('restarts nothing for a resend the journal already answers', async () => {
     const params = sendParams('sent once')
-    await expect(host.send(CALLER, params)).resolves.toMatchObject({ ok: true, replayed: false })
+    await accept(params)
+    await eventually(async () => expect(dispatch).toHaveBeenCalledOnce())
     // The child died during startup: the lease is handed back, the fence moves, and the session
     // stays readable. The client resends against the new fence.
     await host.handleAdapterEvent({
@@ -268,12 +264,9 @@ describe('a send with no live owner', () => {
     expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
 
     // Retry rotates the id: a genuinely new send restarts the owner once.
-    await expect(host.send(CALLER, sendParams('sent once'))).resolves.toMatchObject({
-      ok: true,
-      replayed: false
-    })
+    await accept(sendParams('sent once'))
+    await eventually(async () => expect(dispatch).toHaveBeenCalledTimes(2))
     expect(acquire).toHaveBeenCalledOnce()
-    expect(dispatch).toHaveBeenCalledTimes(2)
   })
 
   it('restarts nothing for a send the ledger holds but the journal never saw', async () => {
@@ -320,7 +313,7 @@ describe('a send with no live owner', () => {
     expect(dispatch).not.toHaveBeenCalled()
   })
 
-  it('admits a send that arrives after the restart has already claimed the lease', async () => {
+  it('accepts a send that arrives while a restart holds the queue, and hands both over in order', async () => {
     await loseOwner()
     const lostFence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
     let claimed = () => {}
@@ -334,18 +327,22 @@ describe('a send with no live owner', () => {
       return spawnChild!(input)
     })
 
-    const first = host.send(CALLER, sendParams('first'))
+    const first = await accept(sendParams('first'))
     await claim
     expect(store.getRecord(SESSION)?.lease.runtimeFence).toBe(lostFence + 1)
+    // Written against the lost owner's fence, which admits it: a send is a conversation write.
     const late = sendParams('second')
     late.envelope.expectedRuntimeFence = lostFence
     const second = host.send(CALLER, late)
     release()
 
-    expect(await first).toMatchObject({ ok: true })
     expect(await second).toMatchObject({ ok: true })
+    await eventually(async () => expect(dispatch).toHaveBeenCalledTimes(2))
     expect(acquire).toHaveBeenCalledOnce()
-    expect(dispatch).toHaveBeenCalledTimes(2)
+    expect(dispatch.mock.calls.map(([input]) => input.clientMessageId)).toEqual([
+      first,
+      late.envelope.clientOperationId
+    ])
   })
 
   it('shares one restart between concurrent sends', async () => {
@@ -358,142 +355,151 @@ describe('a send with no live owner', () => {
     ])
 
     expect(results.map((result) => result.ok)).toEqual([true, true, true])
+    await eventually(async () => expect(dispatch).toHaveBeenCalledTimes(3))
     expect(acquire).toHaveBeenCalledOnce()
-    expect(dispatch).toHaveBeenCalledTimes(3)
-  })
-
-  it('shares one restart between a hold and a send that arrive in the same gap', async () => {
-    await loseOwner()
-
-    const [held, sent] = await Promise.allSettled([
-      host.hold(SESSION, 'desktop-chat:1'),
-      host.send(CALLER, sendParams('while the chat opens'))
-    ])
-
-    expect(held).toMatchObject({ status: 'fulfilled' })
-    expect(sent).toMatchObject({ status: 'fulfilled', value: { ok: true } })
-    expect(acquire).toHaveBeenCalledOnce()
-    expect(dispatch).toHaveBeenCalledOnce()
-    expect(host['holds'].isHeld(SESSION)).toBe(true)
-    expect(host['holds'].isReleasePending(SESSION)).toBe(false)
   })
 
   it('replays into a closed session without spawning anything', async () => {
     const params = sendParams('sent once')
-    await expect(host.send(CALLER, params)).resolves.toMatchObject({ ok: true, replayed: false })
+    await accept(params)
+    await eventually(async () => expect(dispatch).toHaveBeenCalledOnce())
     await loseOwner()
 
     await expect(host.send(CALLER, params)).resolves.toMatchObject({ ok: true, replayed: true })
     await expect(host.send(CALLER, params)).resolves.toMatchObject({ ok: true, replayed: true })
 
-    // The journal was made readable for the answer; the record's lease was left as it was.
+    // The conversation was opened for the answer; the record's lease was left as it was.
     expect(host.hasSession(SESSION)).toBe(true)
     expect(acquire).not.toHaveBeenCalled()
     expect(dispatch).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
-    expect(host['holds'].isReleasePending(SESSION)).toBe(false)
   })
 
-  it("refuses with the restart's own cause, in the answer and in the chat", async () => {
+  it("rejects the accepted message with the restart's own cause, and says so in the chat once", async () => {
     await loseOwner()
     acquire.mockRejectedValue(new Error('Not signed in. Run codex login'))
     const params = sendParams('while signed out')
+    // The acquire's error is Orca's wrapper, not the provider's words: it goes to the log. No exit
+    // was observed, so the chat does not say the provider stopped.
+    const cause = "Codex couldn't restart. Send your message to try again."
 
-    const result = await host.send(CALLER, params)
+    const id = await accept(params)
 
-    expect(result).toEqual({
-      ok: false,
-      refusal: {
-        code: 'agent_session_owner_restart_failed',
-        message: "Codex couldn't restart: Not signed in. Run codex login.",
-        // The failed attach proved its child gone: nothing runs for this session.
-        ownerVerdict: 'exited'
-      }
+    expect(await settled(id)).toMatchObject({
+      dispatchState: 'rejected',
+      reason: cause,
+      rejection: { kind: 'restartFailed' }
     })
     expect(dispatch).not.toHaveBeenCalled()
-    expect(hostErrors).not.toEqual([])
-    expect(agentSessionRefusalOperationState('agent_session_owner_restart_failed')).toBe(
-      'settled-rejected'
+    // Accepted, so the ledger answers a resend with the rejection rather than a second attempt.
+    expect(
+      store.getOperationRow(CALLER.callerKey, params.envelope.clientOperationId)
+    ).toMatchObject({ outcome: { status: 'succeeded' } })
+    // One row, in the error tone, so the reason outlives the error strip.
+    expect(await errorStatuses()).toEqual([cause])
+  })
+
+  it("keeps Codex's own words behind a refused resume without saying the provider stopped", async () => {
+    await loseOwner()
+    const said = `no rollout found for thread id ${THREAD}`
+    acquire.mockRejectedValue(
+      new CodexAppServerRequestError('thread/resume', -32600, `thread/resume failed: ${said}`, said)
     )
-    // Refused before admission: the ledger holds nothing a resend would replay.
-    expect(store.getOperationRow(CALLER.callerKey, params.envelope.clientOperationId)).toBeNull()
-    // The same status row a failed start leaves, so the reason outlives the error strip.
-    expect(journalStatuses()).toEqual([
-      'The provider stopped before it finished starting: Not signed in. Run codex login.'
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+
+    const id = await accept(sendParams('after the thread went away'))
+
+    // The sentence names no cause and quotes nothing; Codex's words ride in the fact for Details.
+    const rejection = {
+      kind: 'restartFailed',
+      detail: { text: said, audience: 'person' },
+      refusal: { code: 'agent_session_operation_invalid', details: { ownerVerdict: 'exited' } }
+    }
+    expect(await settled(id)).toMatchObject({
+      dispatchState: 'rejected',
+      reason: "Codex couldn't restart. Send your message to try again.",
+      rejection
+    })
+    expect(await errorStatuses()).toEqual([
+      "Codex couldn't restart. Send your message to try again."
     ])
+    // Orca's own text is logged once where the start failed.
+    expect(warn).toHaveBeenCalledWith(
+      '[agent-session] provider start failed:',
+      expect.objectContaining({ message: `thread/resume failed: ${said}` })
+    )
+    warn.mockRestore()
   })
 
-  it('restarts again for a Retry of the refused send, under its own id or a new one', async () => {
+  it('restarts again for a Retry under a new id, and replays a resend of the same id', async () => {
     await loseOwner()
     acquire.mockRejectedValue(new Error('Not signed in'))
     const params = sendParams('while signed out')
-    await expect(host.send(CALLER, params)).resolves.toMatchObject({
-      ok: false,
-      refusal: { code: 'agent_session_owner_restart_failed' }
-    })
+    await settled(await accept(params))
+    expect(acquire).toHaveBeenCalledTimes(1)
 
-    // A client that resends the same id gets another attempt, and the chat no second row.
+    // A client that resends the same id gets the recorded rejection, and the chat no second row.
     await expect(host.send(CALLER, params)).resolves.toMatchObject({
-      ok: false,
-      refusal: { code: 'agent_session_owner_restart_failed' }
+      ok: true,
+      replayed: true,
+      value: { submission: { dispatchState: 'rejected' } }
     })
-    expect(acquire).toHaveBeenCalledTimes(2)
-    expect(journalStatuses()).toHaveLength(1)
+    expect(acquire).toHaveBeenCalledTimes(1)
+    expect(await errorStatuses()).toHaveLength(1)
 
-    // The outbox's Retry rotates the id: also a fresh attempt.
-    await expect(host.send(CALLER, sendParams('while signed out'))).resolves.toMatchObject({
-      ok: false,
-      refusal: { code: 'agent_session_owner_restart_failed' }
+    // The outbox's Retry rotates the id: a fresh attempt, with its own row.
+    expect(await settled(await accept(sendParams('while signed out')))).toMatchObject({
+      dispatchState: 'rejected'
     })
-    expect(acquire).toHaveBeenCalledTimes(3)
+    expect(acquire).toHaveBeenCalledTimes(2)
+    expect(await errorStatuses()).toHaveLength(2)
     expect(dispatch).not.toHaveBeenCalled()
   })
 
   it('restarts and delivers a later send once the cause clears', async () => {
     await loseOwner()
     acquire.mockRejectedValueOnce(new Error('Not signed in'))
-    await expect(host.send(CALLER, sendParams('while signed out'))).resolves.toMatchObject({
-      ok: false,
-      refusal: { code: 'agent_session_owner_restart_failed' }
+    expect(await settled(await accept(sendParams('while signed out')))).toMatchObject({
+      dispatchState: 'rejected'
     })
 
     // The user signed in; nothing about the failed attempt is remembered.
-    await expect(host.send(CALLER, sendParams('signed in now'))).resolves.toMatchObject({
-      ok: true,
-      replayed: false
-    })
+    await accept(sendParams('signed in now'))
+    await eventually(async () => expect(dispatch).toHaveBeenCalledOnce())
     expect(acquire).toHaveBeenCalledTimes(2)
-    expect(dispatch).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('live')
   })
 
   it('suggests a new chat only when this host has nothing to restart the chat from', async () => {
     await loseOwner()
     acquire.mockRejectedValue(new Error('Not signed in'))
-    const failed = await host.send(CALLER, sendParams('restart fails'))
-    expect(failed).toMatchObject({
-      ok: false,
-      refusal: { code: 'agent_session_owner_restart_failed' }
-    })
-    expect(failed.ok ? '' : failed.refusal.message).not.toMatch(/new chat/)
+    const failed = await settled(await accept(sendParams('restart fails')))
+    expect(failed).toMatchObject({ dispatchState: 'rejected' })
+    expect(failed?.reason).not.toMatch(/new chat/)
 
     // The adapter cannot run this record where it lives: no retry would bring it back.
     host.deps.adapter.supportsLocation = () => false
-    const unresumable = await host.send(CALLER, sendParams('cannot resume here'))
+    const unresumable = await settled(await accept(sendParams('cannot resume here')))
 
     expect(unresumable).toMatchObject({
-      ok: false,
-      refusal: {
-        code: 'agent_session_owner_restart_failed',
-        message:
-          "Codex couldn't restart: This execution host cannot resume the requested structured agent session. Start a new chat to continue."
+      dispatchState: 'rejected',
+      reason: "Codex couldn't restart. Start a new chat to continue.",
+      rejection: {
+        kind: 'restartFailed',
+        refusal: {
+          code: 'structured_agent_session_unsupported',
+          details: { reason: 'hostUnsupported' }
+        }
       }
     })
   })
 
-  it('runs the send as the lease stands when the restart met a lease someone else is settling', async () => {
+  it('rejects the message with the cause when the restart met a lease someone else is settling', async () => {
     await loseOwner()
-    vi.spyOn(host['holds'], 'ensureProviderChild').mockResolvedValueOnce({
+    vi.spyOn(
+      host['conversationDelivery'].loop['deps'],
+      'ensureProviderChild'
+    ).mockResolvedValueOnce({
       ok: false,
       refusal: {
         code: 'execution_owner_reconciling',
@@ -501,151 +507,41 @@ describe('a send with no live owner', () => {
       }
     })
 
-    const result = await host.send(CALLER, sendParams('owner being settled'))
+    const id = await accept(sendParams('owner being settled'))
 
-    // The ordinary lease check answers, retryably; nothing terminal and nothing in the chat.
-    expect(result).toMatchObject({
-      ok: false,
-      refusal: { code: 'agent_session_ownership_unknown' }
+    // The refusal's prose stays out of the chat; its code rides in the fact.
+    const cause = "Codex couldn't restart. Send your message to try again."
+    expect(await settled(id)).toMatchObject({
+      dispatchState: 'rejected',
+      reason: cause,
+      rejection: { kind: 'restartFailed', refusal: { code: 'execution_owner_reconciling' } }
     })
     expect(acquire).not.toHaveBeenCalled()
-    expect(journalStatuses()).toEqual([])
+    expect(await errorStatuses()).toEqual([cause])
   })
 
-  it('runs the send as the lease stands when the restart itself faults', async () => {
+  it('rejects the message, and reports the fault, when the restart itself faults', async () => {
     await loseOwner()
-    vi.spyOn(host['holds'], 'ensureProviderChild').mockRejectedValueOnce(
-      new Error('spawn-token mint failed')
-    )
+    vi.spyOn(
+      host['conversationDelivery'].loop['deps'],
+      'ensureProviderChild'
+    ).mockRejectedValueOnce(new Error('spawn-token mint failed'))
 
-    const result = await host.send(CALLER, sendParams('bookkeeping failed'))
+    const id = await accept(sendParams('bookkeeping failed'))
 
-    expect(result).toMatchObject({
-      ok: false,
-      refusal: { code: 'agent_session_ownership_unknown' }
+    // Orca's own fault: reported to the log, and the chat says only that Orca failed.
+    expect(await settled(id)).toMatchObject({
+      dispatchState: 'rejected',
+      reason: "Orca ran into a problem, so this didn't go through. Try again.",
+      rejection: { kind: 'hostFault' }
     })
     expect(hostErrors).toContainEqual(
       expect.objectContaining({ message: 'spawn-token mint failed' })
     )
-    expect(journalStatuses()).toEqual([])
-  })
-
-  it('keeps a second surface holder taken during an auto-restart, and starts nothing for it', async () => {
-    await host.hold(SESSION, 'desktop-chat:1')
-    const exitedFence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
-    acquire.mockClear()
-    const entered = Promise.withResolvers<void>()
-    const gate = Promise.withResolvers<void>()
-    const spawnChild = acquire.getMockImplementation()!
-    acquire.mockImplementationOnce(async (input) => {
-      entered.resolve()
-      await gate.promise
-      return spawnChild(input)
-    })
-
-    // The held child exits: the host restarts it on its own, under the surface that holds it.
-    const restarted = host.handleAdapterEvent({
-      type: 'ended',
-      sessionId: SESSION,
-      reason: 'provider exited',
-      cause: 'unexpected-exit',
-      fence: exitedFence,
-      acquisitionGeneration: 'generation-1'
-    })
-    await entered.promise
-    const second = host.hold(SESSION, 'paired-phone:1')
-    gate.resolve()
-    await Promise.all([restarted, second])
-
-    expect(acquire).toHaveBeenCalledOnce()
-    expect(host['holds']['holders'].holderIds(SESSION)).toEqual([
-      'desktop-chat:1',
-      'paired-phone:1'
-    ])
-    expect(host['holds'].isReleasePending(SESSION)).toBe(false)
-    expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('live')
+    expect(await errorStatuses()).toHaveLength(1)
   })
 
-  it('puts the child of an auto-restart on the idle clock when its surface left mid-attach', async () => {
-    await host.hold(SESSION, 'desktop-chat:1')
-    const exitedFence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
-    acquire.mockClear()
-    const entered = Promise.withResolvers<void>()
-    const gate = Promise.withResolvers<void>()
-    const spawnChild = acquire.getMockImplementation()!
-    acquire.mockImplementationOnce(async (input) => {
-      entered.resolve()
-      await gate.promise
-      return spawnChild(input)
-    })
-
-    const restarted = host.handleAdapterEvent({
-      type: 'ended',
-      sessionId: SESSION,
-      reason: 'provider exited',
-      cause: 'unexpected-exit',
-      fence: exitedFence,
-      acquisitionGeneration: 'generation-1'
-    })
-    await entered.promise
-    // The only surface leaves while the host is still spawning the child it asked for.
-    host.release(SESSION, 'desktop-chat:1')
-    gate.resolve()
-    await restarted
-
-    expect(acquire).toHaveBeenCalledOnce()
-    expect(host['holds'].isHeld(SESSION)).toBe(false)
-    // Nobody holds the child, so it goes on the same clock a departed surface would start.
-    expect(host['holds'].isReleasePending(SESSION)).toBe(true)
-    expect(hostErrors).toEqual([])
-  })
-
-  it('counts a queued restart as in flight from the moment it is asked for, so a quit drains it', async () => {
-    const closeSession = vi.mocked(host.deps.adapter.closeSession!)
-    acquire.mockClear()
-    const gate = Promise.withResolvers<void>()
-    closeSession.mockImplementationOnce(async () => {
-      await gate.promise
-      return true
-    })
-    const closing = host.close(SESSION)
-    const hold = host.hold(SESSION, 'desktop-chat:1')
-    let drained = false
-    void host['tasks'].drainAttaches().then(() => {
-      drained = true
-    })
-    await new Promise<void>((resolve) => setImmediate(resolve))
-
-    // The hold waits its turn behind the close, and the quit's drain waits for the hold: the
-    // child it is about to spawn must exist before the quit decides what to evict.
-    expect(acquire).not.toHaveBeenCalled()
-    expect(drained).toBe(false)
-
-    gate.resolve()
-    await Promise.all([closing, hold])
-    await new Promise<void>((resolve) => setImmediate(resolve))
-    expect(acquire).toHaveBeenCalledOnce()
-    expect(drained).toBe(true)
-  })
-
-  it('adjudicates a lease this host has not reconciled before a hold resumes it', async () => {
-    await loseOwner()
-    await store.transitionHandoff(SESSION, (current) => ({
-      ...current,
-      lease: { ...current.lease, unreconciled: true }
-    }))
-    host.deps.probeOwner = async () => ({ outcome: 'pid-absent' })
-
-    await host.hold(SESSION, 'desktop-chat:1')
-
-    expect(acquire).toHaveBeenCalledOnce()
-    expect(store.getRecord(SESSION)?.lease).toMatchObject({
-      unreconciled: false,
-      claimStatus: 'live'
-    })
-  })
-
-  it('exits the recovery stage a failed attempt latched before a hold resumes', async () => {
+  it('exits the recovery stage a failed attempt latched before its delivery resumes it', async () => {
     await loseOwner()
     // What an acquisition whose exit could not be proven leaves behind: nobody's, but latched.
     await store.transitionHandoff(SESSION, (current) => ({
@@ -654,8 +550,9 @@ describe('a send with no live owner', () => {
     }))
     host.deps.probeOwner = async () => ({ outcome: 'pid-absent' })
 
-    await host.hold(SESSION, 'desktop-chat:1')
+    await accept(sendParams('latched owner'))
 
+    await eventually(async () => expect(dispatch).toHaveBeenCalledOnce())
     expect(acquire).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
       handoffStage: null,
@@ -663,20 +560,22 @@ describe('a send with no live owner', () => {
     })
   })
 
-  it('leaves a lease it cannot adjudicate alone', async () => {
+  it('adjudicates a lease this host has not reconciled before its delivery resumes it', async () => {
     await loseOwner()
     await store.transitionHandoff(SESSION, (current) => ({
       ...current,
       lease: { ...current.lease, unreconciled: true }
     }))
 
-    const result = await host.send(CALLER, sendParams('owner unverifiable'))
+    // The send's start is the same serialized resume a hold runs, reconciliation first.
+    await accept(sendParams('owner unverified'))
 
-    expect(result).toMatchObject({
-      ok: false,
-      refusal: { code: 'agent_session_ownership_unknown' }
+    await eventually(async () => expect(dispatch).toHaveBeenCalledOnce())
+    expect(acquire).toHaveBeenCalledOnce()
+    expect(store.getRecord(SESSION)?.lease).toMatchObject({
+      unreconciled: false,
+      claimStatus: 'live'
     })
-    expect(acquire).not.toHaveBeenCalled()
   })
 })
 
@@ -689,32 +588,30 @@ describe('a write fenced to an owner the pane has not seen replaced', () => {
     const params = sendParams('after the release')
     params.envelope.expectedRuntimeFence = seenFence
 
-    expect(await host.send(CALLER, params)).toMatchObject({
-      ok: true,
-      replayed: false,
-      value: { submission: { dispatchState: 'accepted' } }
-    })
+    const id = await accept(params)
+    expect(await settled(id)).toMatchObject({ dispatchState: 'accepted' })
 
     expect(acquire).toHaveBeenCalledOnce()
     expect(dispatch).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease.runtimeFence).toBeGreaterThan(seenFence + 1)
   })
 
-  // Clients resend a refused message when the fence they hold moves, and a refused restart leaves
-  // no ledger row, so a frame carrying each failed attempt's fence would resend it forever.
-  it("keeps the pane's fence on the row a failed restart publishes", async () => {
+  // Clients resend a refused message when the fence they hold moves. A failed start is a
+  // rejected message now, never a refused send, and the pane keeps the fence it subscribed under.
+  it("keeps the pane's fence on the rows a failed start publishes, and rejects the message", async () => {
     const seenFence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
     const frames: AgentSessionSubscribeEvent[] = []
-    host.subscribe({ id: 'pane', sessionId: SESSION, emit: (event) => frames.push(event) })
+    await host.subscribe({ id: 'pane', sessionId: SESSION, emit: (event) => frames.push(event) })
     await loseOwner()
     acquire.mockRejectedValueOnce(new Error('Not signed in'))
     const subscribed = frames.length
 
-    expect(await host.send(CALLER, sendParams('while signed out'))).toMatchObject({
-      ok: false,
-      refusal: { code: 'agent_session_owner_restart_failed' }
-    })
+    const id = await accept(sendParams('while signed out'))
 
+    expect(await settled(id)).toMatchObject({
+      dispatchState: 'rejected',
+      rejection: { kind: 'restartFailed' }
+    })
     expect(store.getRecord(SESSION)?.lease.runtimeFence).toBeGreaterThan(seenFence + 1)
     const published = frames.slice(subscribed)
     expect(published.length).toBeGreaterThan(0)
@@ -736,7 +633,8 @@ describe('a write fenced to an owner the pane has not seen replaced', () => {
       return spawnChild(input)
     })
 
-    const first = host.send(CALLER, sendParams('starts the agent'))
+    const firstParams = sendParams('starts the agent')
+    const first = host.send(CALLER, firstParams)
     await claim
     const cancelFields = { turnId: 'turn-1' }
     const stop = host.cancel(CALLER, {
@@ -760,7 +658,14 @@ describe('a write fenced to an owner the pane has not seen replaced', () => {
     expect(await first).toMatchObject({ ok: true })
     expect(await stop).toMatchObject({ ok: true, replayed: false })
     expect(await second).toMatchObject({ ok: true, replayed: false })
+    // The Stop withdrew the message its start held; the one typed after it is delivered.
+    expect(await settled(late.envelope.clientOperationId)).toMatchObject({
+      dispatchState: 'accepted'
+    })
+    expect(await submission(firstParams.envelope.clientOperationId)).toMatchObject({
+      dispatchState: 'rejected'
+    })
     expect(acquire).toHaveBeenCalledOnce()
-    expect(dispatch).toHaveBeenCalledTimes(2)
+    expect(dispatch).toHaveBeenCalledTimes(1)
   })
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-preparation.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-preparation.ts
index 09986f2e1296..a7a0e9710556 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-send-preparation.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-preparation.ts
@@ -1,70 +1,29 @@
-// What a send needs from the session before its lease is checked.
-//
-// A provider child that exits or fails to start hands its lease back. Before this, a send to that
-// session was refused `agent_session_ownership_unknown` — which a client reads as "not admitted
-// yet" and resends forever — and only a surface hold could ever make a new child. Now the send
-// makes sure it has an owner as a step of its own serialized admission: a released lease where
-// resume is allowed gets a child first; anything else runs as it is and meets the lease check.
-// A restart that fails refuses with a code the client stops auto-retrying on, carrying the
-// restart's own cause, and writes that cause into the chat the way a start that failed does, so
-// the user sees why. A manual Retry or a new send is a fresh attempt: a refusal before admission
-// leaves no ledger row behind.
-//
-// The ledger's answer comes first, so a send it already holds a row for restarts nothing:
-// admission replays or refuses it whoever owns the session now, and a closed session is made
-// readable for that, never given a child. Otherwise each resend of a message whose child died at
-// startup would spawn another child that dies the same way.
-//
-// A child that has not proven its start is still the owner: the send is admitted against it and
-// the adapter holds the message until startup lands, or rejects it with the child's own reason
-// when the child dies first. The exit settlement writes that reason into the chat.
+// What a send or a Stop needs from the session before the ledger places its row: the
+// conversation open. Nothing here needs an owner — a send is accepted into the conversation and
+// the delivery loop makes the session ready — so a refusal before acceptance is only one the
+// conversation itself makes: a rewind or conversation command in doubt, a cleared conversation,
+// or a journal that cannot be opened.
 
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
-import type {
-  AgentSessionMutationEnvelope,
-  AgentSessionWireRefusal
+import {
+  refuse,
+  type AgentSessionMutationEnvelope,
+  type AgentSessionWireRefusal
 } from '../../../shared/agent-session-wire'
-import type { AgentSessionWireRefusalCode } from '../../../shared/agent-session-wire-refusals'
-import { boundJournalStatusText } from '../agent-session-journal/journal-prompt-body-bounds'
 import { TUI_AGENT_DISPLAY_NAMES } from '../../../shared/tui-agent-display-names'
+import type { AgentSessionFailureWordsContext } from '../../../shared/agent-session-failure-words'
+import { agentSessionWriteNoticeEnglish } from '../../../shared/agent-session-refusal-notice'
 import {
-  ownerRestartFailedOutcome,
-  providerStartupFailureOutcome
-} from './structured-agent-session-dead-generation-settlement'
+  classifyJournalOpenFailure,
+  type JournalOpenFailure
+} from '../agent-session-journal/journal-open-failure'
 import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
-import type { StructuredAgentSessionMutationContext } from './structured-agent-session-host-mutations'
-import type { AgentSessionMutationSessionPreparation } from './structured-agent-session-mutation-admission'
-import { isResumableStructuredAgentSessionRecord } from './structured-agent-session-resume-eligibility'
+import {
+  AGENT_SESSION_NOT_ATTACHED,
+  type AgentSessionMutationSessionPreparation
+} from './structured-agent-session-mutation-admission'
 import { rewindRefusal } from './structured-rewind-refusal'
-
-/**
- * What a refused resume means for the send that ran it. `transient`: the resume met a lease
- * someone else is settling, which is not proof it cannot resume — the send runs as the lease
- * stands and admission reports it. `failed`: the restart itself failed; the send answers with the
- * cause and stops the client's retry loop, and the user may clear the cause and retry.
- * `unresumable`: this host has nothing to restart the chat from — no record, or none it can run —
- * so only a new chat continues. A new wire code does not compile until it is classified here.
- */
-const RESUME_REFUSAL_OUTCOME: Record<
-  AgentSessionWireRefusalCode,
-  'transient' | 'failed' | 'unresumable'
-> = {
-  execution_owner_reconciling: 'transient',
-  agent_session_conflict: 'transient',
-  agent_session_checkpoint_stale: 'transient',
-  agent_session_ownership_unknown: 'transient',
-  agent_session_operation_capacity: 'transient',
-  structured_agent_session_unsupported: 'unresumable',
-  agent_session_operation_conflict: 'failed',
-  agent_session_operation_expired: 'failed',
-  agent_session_operation_invalid: 'failed',
-  agent_session_operation_unknown: 'failed',
-  agent_session_item_revision_stale: 'failed',
-  agent_session_already_resolved: 'failed',
-  agent_session_identity_required: 'unresumable',
-  agent_session_journal_unreadable: 'failed',
-  agent_session_owner_restart_failed: 'failed'
-}
+import type { StructuredAgentSessionMutationContext } from './structured-agent-session-host-mutations'
 
 /** Why the record refuses any send right now, whoever owns it; null when a send may run. */
 export function structuredAgentSessionSendBlock(
@@ -82,144 +41,93 @@ export function structuredAgentSessionSendBlock(
   ) {
     return {
       ok: false,
-      refusal: {
-        code: 'agent_session_operation_invalid',
-        message: command.replacementSessionId
-          ? 'This conversation has been cleared. Use the current conversation.'
-          : 'The conversation operation is unconfirmed.'
-      }
+      refusal:
+        command.phase === 'committed' && command.replacementSessionId
+          ? refuse(
+              'agent_session_operation_invalid',
+              { reason: 'conversationCleared' },
+              'This conversation has been cleared. Use the current conversation.'
+            )
+          : // A prepared /clear names its replacement before that conversation exists.
+            command.command === 'clear'
+            ? refuse(
+                'agent_session_operation_invalid',
+                { reason: 'clearUnconfirmed' },
+                "The last /clear didn't finish. Start a new chat to continue."
+              )
+            : refuse(
+                'agent_session_operation_invalid',
+                { reason: 'conversationCommandUnconfirmed' },
+                'The conversation operation is unconfirmed.'
+              )
     }
   }
   return null
 }
 
-/** Whether this send is the one that must bring the owner back: no child, a lease handed back
- *  cleanly, and nothing on the record that refuses the send anyway. Live, unverifiable, still
- *  reserved, or handed off: that lease is not this send's to replace. */
-export function structuredAgentSessionSendNeedsOwner(
-  session: StructuredAgentSessionHostSession | undefined,
-  record: AgentSessionRecord
-): boolean {
-  return (
-    session?.hasProviderChild !== true &&
-    isResumableStructuredAgentSessionRecord(record) &&
-    structuredAgentSessionSendBlock(record) === null
-  )
-}
-
-type SendPreparationContext = Pick<
-  StructuredAgentSessionMutationContext,
-  'deps' | 'sessions' | 'holds' | 'restoreReadable'
->
-
-export async function prepareStructuredAgentSessionSend(
-  context: SendPreparationContext,
-  envelope: AgentSessionMutationEnvelope,
-  ledger: 'admit' | 'replay',
-  record: AgentSessionRecord
+/** The conversation a send or a Stop writes to, opened when this host holds it closed. */
+export async function openConversationForWrite(
+  openConversation: (sessionId: string) => Promise<StructuredAgentSessionHostSession | null>,
+  envelope: AgentSessionMutationEnvelope
 ): Promise<AgentSessionMutationSessionPreparation> {
-  const { sessionId } = record
-  if (ledger !== 'admit') {
-    if (!context.sessions.has(sessionId)) {
-      await context.restoreReadable(sessionId)
+  try {
+    if (await openConversation(envelope.sessionId)) {
+      return { ok: true }
     }
-    return { ok: true }
-  }
-  if (structuredAgentSessionSendNeedsOwner(context.sessions.get(sessionId), record)) {
-    const refusal = await restartOwnerForSend(context, envelope, record)
-    if (refusal) {
-      return { ok: false, refusal }
+    return { ok: false, refusal: AGENT_SESSION_NOT_ATTACHED }
+  } catch (error) {
+    console.warn('[agent-session] opening the conversation for a write failed:', error)
+    const reason = classifyJournalOpenFailure(error)
+    return {
+      ok: false,
+      refusal: refuse('agent_session_journal_unreadable', { reason }, JOURNAL_OPEN_MESSAGE[reason])
     }
   }
-  return { ok: true }
 }
 
-/** One restart attempt. Answers with the refusal that ends the send, or null when the send goes
- *  on to admission — after a child, after a transient refusal, or after a fault in the restart's
- *  own bookkeeping, which is reported and never gates the user's action. */
-async function restartOwnerForSend(
-  context: SendPreparationContext,
-  envelope: AgentSessionMutationEnvelope,
-  record: AgentSessionRecord
-): Promise<AgentSessionWireRefusal | null> {
-  const { sessionId } = envelope
-  let resumed: Awaited<ReturnType<typeof context.holds.ensureProviderChild>>
-  try {
-    resumed = await context.holds.ensureProviderChild(sessionId)
-  } catch (error) {
-    context.deps.onEventSinkError?.({ sessionId, error })
-    return null
-  }
-  const outcome = resumed.ok ? null : RESUME_REFUSAL_OUTCOME[resumed.refusal.code]
-  if (resumed.ok || outcome === 'transient') {
-    return null
-  }
-  const refusal = ownerRestartFailedRefusal(record, resumed.refusal, outcome !== 'unresumable')
-  context.deps.onEventSinkError?.({
-    sessionId,
-    error: new Error(`${resumed.refusal.code}: ${resumed.refusal.message}`)
-  })
-  // A restart whose child died starting leaves the row any start that died leaves, so the chat
-  // reads the same whether the send met that death before admission or after it.
-  await recordFailedRestart(
-    context,
-    envelope,
-    resumed.refusal.ownerVerdict === 'exited'
-      ? providerStartupFailureOutcome(resumed.refusal.message)
-      : refusal.message
-  )
-  return refusal
+// Released clients print a refusal's message for a send; it fits a Stop too.
+const JOURNAL_OPEN_MESSAGE: Record<JournalOpenFailure, string> = {
+  journalCorrupt: agentSessionWriteNoticeEnglish(['historyUnusable']),
+  journalUnavailable: agentSessionWriteNoticeEnglish(['historyUnavailable', 'tryAgain'])
 }
 
-/** The client stops on the code; the message carries the restart's own cause, and the verdict —
- *  when the failed attach proved its child gone — tells a client nothing runs for the session. */
-function ownerRestartFailedRefusal(
-  record: AgentSessionRecord,
-  cause: AgentSessionWireRefusal,
-  resumable: boolean
-): AgentSessionWireRefusal {
-  return {
-    code: 'agent_session_owner_restart_failed',
-    message: ownerRestartFailedOutcome({
-      agentName: TUI_AGENT_DISPLAY_NAMES[record.provider],
-      reason: cause.message,
-      resumable
-    }),
-    ...(cause.ownerVerdict ? { ownerVerdict: cause.ownerVerdict } : {})
+/** The conversation a write lands in, opened when this host holds it closed. */
+export function openForWrite(
+  context: Pick<StructuredAgentSessionMutationContext, 'openConversation'>,
+  envelope: AgentSessionMutationEnvelope
+): () => Promise<AgentSessionMutationSessionPreparation> {
+  return () => openConversationForWrite(context.openConversation, envelope)
+}
+
+/** For an operation only the provider can perform: the conversation, then its agent. */
+export function openWithAgent(
+  context: Pick<StructuredAgentSessionMutationContext, 'openConversation' | 'ensureAgent'>,
+  envelope: AgentSessionMutationEnvelope
+): () => Promise<AgentSessionMutationSessionPreparation> {
+  return async () => {
+    const opened = await openConversationForWrite(context.openConversation, envelope)
+    return opened.ok ? context.ensureAgent(envelope.sessionId) : opened
   }
 }
 
-/** The same status row a start that failed leaves in the chat, so the reason outlives the error
- *  strip. The journal is made readable for it when the failed attach left none behind. Keyed by
- *  the send, not the clock: a resend of the same id that fails again adds no second row. */
-async function recordFailedRestart(
-  context: SendPreparationContext,
-  envelope: AgentSessionMutationEnvelope,
-  text: string
-): Promise<void> {
-  const { sessionId } = envelope
-  try {
-    if (!context.sessions.has(sessionId)) {
-      await context.restoreReadable(sessionId)
-    }
-    const session = context.sessions.get(sessionId)
-    if (!session) {
-      return
-    }
-    const settlementId = `failed-restart:${envelope.clientOperationId}`
-    await session.journal.appendLifecycleBatch({
-      settlementId,
-      fence: session.fence,
-      recovered: true,
-      mutations: [
-        {
-          kind: 'item',
-          identity: { provider: 'orca', clientMessageId: settlementId },
-          body: { kind: 'status', text: boundJournalStatusText(text) }
-        }
-      ]
-    })
-  } catch (error) {
-    context.deps.onEventSinkError?.({ sessionId, error })
+/** A rewind still in doubt once the conversation is open is one only its provider can settle —
+ *  the open settles every other — so a send starts the agent, whose attach recovers it. */
+export function sendPreparation(
+  context: Pick<StructuredAgentSessionMutationContext, 'openConversation' | 'ensureAgent' | 'deps'>,
+  envelope: AgentSessionMutationEnvelope
+): () => Promise<AgentSessionMutationSessionPreparation> {
+  return async () => {
+    const opened = await openConversationForWrite(context.openConversation, envelope)
+    const phase = context.deps.store.getRecord(envelope.sessionId)?.rewind?.phase
+    return opened.ok && (phase === 'prepared' || phase === 'provider-succeeded')
+      ? context.ensureAgent(envelope.sessionId)
+      : opened
   }
 }
+
+/** Who a failure sentence names: the chat's agent, when the record says. */
+export function structuredAgentSessionFailureWordsContext(
+  record: AgentSessionRecord | null
+): AgentSessionFailureWordsContext {
+  return record ? { agentName: TUI_AGENT_DISPLAY_NAMES[record.provider] } : {}
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-restarts-failed-start.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-restarts-failed-start.test.ts
index e2e2fb81102e..f339aa1113fc 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-send-restarts-failed-start.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-restarts-failed-start.test.ts
@@ -1,17 +1,17 @@
 // A session that published and then lost its child before startup (not signed in, say) keeps a
 // released lease and a chat the user can still type into. The send is the user asking for the
-// child back: the host restarts it before admitting the write and delivers against the new owner,
-// instead of parking the message behind a lease nothing would ever re-acquire.
+// child back: the host accepts the message, and its delivery restarts the child and hands the
+// message to the new owner, instead of parking it behind a lease nothing would ever re-acquire.
 //
 // A child is published before it has proven its start, and it owns the send from that moment: the
-// message is admitted against it and the adapter holds it for the start. When the child exits
-// first, the exit settlement rejects the message and writes the cause into the chat, once, and
-// the next send is a fresh restart.
+// message is handed to it. When the child exits first, the exit settlement rejects the message and
+// writes the cause into the chat, once, and the next send is a fresh restart.
 
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
+import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
 import type { AgentSessionMutationEnvelope } from '../../../shared/agent-session-wire'
 import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
@@ -22,12 +22,18 @@ import {
   HOST_TEST_SESSION as SESSION,
   HOST_TEST_THREAD as THREAD,
   hostTestAttachParams,
+  hostTestDrawnRowIds,
   hostTestMessage,
   hostTestOperationId,
   resetHostTestOperationIds
 } from './structured-agent-session-host-test-data'
 
 const CALLER = { callerKey: 'client-1' }
+
+/** Delivery runs on its own serialized steps; under a loaded runner they take more than a second. */
+function eventually(assertion: () => void | Promise<void>): Promise<void> {
+  return vi.waitFor(assertion, { timeout: 10_000 })
+}
 const EXIT_REASON = 'Claude Code is not signed in. Sign in with the Claude CLI'
 
 let root: string
@@ -53,7 +59,7 @@ function sendEnvelope(
   }
 }
 
-/** A send is admitted against the child it meets, proven or not; the adapter holds the rest. */
+/** A send is accepted at once and handed to the child delivery finds or starts. */
 async function send(
   text: string,
   fence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
@@ -63,9 +69,13 @@ async function send(
   expect(sent, JSON.stringify(sent)).toMatchObject({
     ok: true,
     replayed: false,
-    value: { submission: { dispatchState: 'pending' } }
+    value: { submission: { dispatchState: 'pending', handoverRecorded: true } }
   })
-  return sent.ok ? sent.value.clientMessageId : ''
+  const clientMessageId = sent.ok ? sent.value.clientMessageId : ''
+  await eventually(async () =>
+    expect((await submission(clientMessageId))?.handedOverAt).toBeDefined()
+  )
+  return clientMessageId
 }
 
 /** The child of the current acquisition, as the adapter would identify it in a lifecycle event. */
@@ -91,21 +101,27 @@ function exitBeforeProof(): Promise<void> {
     type: 'ended',
     ...currentChild(),
     reason: EXIT_REASON,
+    failure: { kind: 'providerExited', detail: { text: EXIT_REASON, audience: 'log' } },
     cause: 'unexpected-exit',
     startupUnproven: true
   })
 }
 
-function journalStatuses(): string[] {
-  return host
-    .journalSnapshot(SESSION)
-    .items.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : []))
+const STARTUP_FAILURE = {
+  kind: 'providerStartFailed',
+  detail: { text: EXIT_REASON, audience: 'log' }
 }
 
-function submission(clientMessageId: string) {
-  return host
-    .journalSnapshot(SESSION)
-    .submissions.find((entry) => entry.clientMessageId === clientMessageId)
+async function journalStatuses(): Promise<string[]> {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.body.kind === 'status' ? [item.body.text] : []
+  )
+}
+
+async function submission(clientMessageId: string) {
+  return (await host.journalSnapshot(SESSION)).submissions.find(
+    (entry) => entry.clientMessageId === clientMessageId
+  )
 }
 
 beforeEach(async () => {
@@ -166,8 +182,7 @@ describe('a send into a published session whose child ended before startup', ()
 
     await send('hello again', releasedFence)
 
-    // A send still fenced to the lost owner is admitted once against the restarted one, with no
-    // stale round trip.
+    // Accepted at the lost owner's fence and handed to the child delivery started, once.
     expect(acquire).toHaveBeenCalledTimes(2)
     expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('live')
     expect(dispatch).toHaveBeenCalledOnce()
@@ -183,40 +198,50 @@ describe('a send into a published session whose child ended before startup', ()
 
   it('retires the held message with the cause when the restarted child exits before proving its start', async () => {
     const releasedFence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
-    const rowsBefore = journalStatuses().length
+    const rowsBefore = (await journalStatuses()).length
 
     const held = await send('still not signed in', releasedFence)
     await exitBeforeProof()
 
     // The child never proved its start, so it accepted nothing: the exit rejects the message this
     // host admitted, so nothing pins the session and Retry stays offered, and one row names the cause.
-    expect(submission(held)).toMatchObject({
+    expect(await submission(held)).toMatchObject({
       dispatchState: 'rejected',
-      reason: expect.stringContaining(EXIT_REASON),
+      reason: 'Codex stopped before it finished starting. Send your message to try again.',
+      rejection: STARTUP_FAILURE,
       recovered: true
     })
     expect(
-      host.journalSnapshot(SESSION).submissions.filter((e) => e.dispatchState === 'pending')
+      (await host.journalSnapshot(SESSION)).submissions.filter((e) => e.dispatchState === 'pending')
     ).toEqual([])
-    expect(journalStatuses().slice(rowsBefore)).toEqual([
-      expect.stringMatching(/stopped before it finished starting: .*not signed in/)
+    expect((await journalStatuses()).slice(rowsBefore)).toEqual([
+      'Codex stopped before it finished starting. Send your message to try again.'
     ])
+    // Accepted before the restart it needed, so the chat draws it above the row naming the cause.
+    const snapshot = await host.journalSnapshot(SESSION)
+    const causeRow = snapshot.items.findLast((item) => item.body.kind === 'status')?.itemId
+    const shown = [agentJournalSubmissionKey(held), causeRow]
+    expect(
+      hostTestDrawnRowIds(snapshot, [
+        { clientMessageId: held, text: 'still not signed in' }
+      ]).filter((id) => shown.includes(id))
+    ).toEqual(shown)
     // The failed restart moved the fence twice: the acquisition, and the exit that released it.
     expect(store.getRecord(SESSION)?.lease.runtimeFence).toBe(releasedFence + 2)
     expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
     // One spawn per user action: nothing restarted it a second time.
     expect(acquire).toHaveBeenCalledTimes(2)
 
-    // Retry is a fresh action: it restarts once and is admitted against the new child.
+    // Retry is a fresh action: it restarts once and is handed to the new child.
     await send('signed in now')
     expect(acquire).toHaveBeenCalledTimes(3)
     expect(dispatch).toHaveBeenCalledTimes(2)
-    expect(journalStatuses().slice(rowsBefore)).toHaveLength(1)
+    expect((await journalStatuses()).slice(rowsBefore)).toHaveLength(1)
   })
 })
 
 describe('a send while the child of the first start is still proving itself', () => {
-  it('is admitted against the starting child, and nothing restarts it', async () => {
+  it('is handed to the starting child, and nothing restarts it', async () => {
     await send('hello')
 
     expect(dispatch).toHaveBeenCalledOnce()
@@ -225,7 +250,7 @@ describe('a send while the child of the first start is still proving itself', ()
     await proveStarted()
 
     expect(acquire).toHaveBeenCalledOnce()
-    expect(journalStatuses()).toEqual([])
+    expect(await journalStatuses()).toEqual([])
   })
 
   it('is retired with the cause when that child exits first, and restarts nothing', async () => {
@@ -234,14 +259,15 @@ describe('a send while the child of the first start is still proving itself', ()
 
     await exitBeforeProof()
 
-    expect(submission(held)).toMatchObject({
+    expect(await submission(held)).toMatchObject({
       dispatchState: 'rejected',
-      reason: expect.stringContaining(EXIT_REASON),
+      reason: 'Codex stopped before it finished starting. Send your message to try again.',
+      rejection: STARTUP_FAILURE,
       recovered: true
     })
     expect(acquire).toHaveBeenCalledOnce()
-    expect(journalStatuses()).toEqual([
-      expect.stringMatching(/stopped before it finished starting: .*not signed in/)
+    expect(await journalStatuses()).toEqual([
+      'Codex stopped before it finished starting. Send your message to try again.'
     ])
     expect(store.getRecord(SESSION)?.lease.runtimeFence).toBe(fence + 1)
   })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.test.ts
index b461d508f42a..ff9765d1cee7 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.test.ts
@@ -61,7 +61,7 @@ describe('structured send settlement compatibility wait', () => {
   it('removes an abandoned wait on transport cancellation', async () => {
     const settlements = new StructuredAgentSessionSendSettlement(() => journal('pending'))
     const controller = new AbortController()
-    const pending = settlements.wait('session-1', 'client-1', controller.signal)
+    const pending = settlements.wait('session-1', 'client-1', { signal: controller.signal })
 
     controller.abort(new Error('transport closed'))
     await expect(pending).rejects.toThrow('transport closed')
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.ts
index 6150e3412a69..bc265833c429 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.ts
@@ -3,8 +3,12 @@ import type {
   AgentJournalSubmission
 } from '../../../shared/agent-session-journal-types'
 import type { AgentSessionSendResult } from '../../../shared/agent-session-wire'
+import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 
+/** What a settlement read needs of a journal. */
+type SendSettlementJournal = Pick<AgentSessionJournal, 'submissions' | 'cursor'>
+
 type SettledSend = {
   cursor: AgentJournalCursor
   value: AgentSessionSendResult
@@ -12,8 +16,19 @@ type SettledSend = {
 
 type SendSettlement = SettledSend | 'pending' | 'missing'
 
+/** What ends a wait: the provider's answer, or only the host handing the message over. */
+export type SendSettlementPoint = 'answered' | 'handed-over'
+
+export type SendSettlementWaitOptions = {
+  signal?: AbortSignal
+  /** How long to observe; unanswered by then resolves undefined. */
+  budgetMs?: number
+  until?: SendSettlementPoint
+}
+
 type SendSettlementWaiter = {
   clientMessageId: string
+  until: SendSettlementPoint
   resolve: (result: SettledSend | undefined) => void
   reject: (error: Error) => void
   timer: ReturnType<typeof setTimeout>
@@ -23,12 +38,15 @@ type SendSettlementWaiter = {
 
 // Known legacy clients abandon the RPC after 15s without cancelling its socket dispatch.
 const SEND_SETTLEMENT_WAIT_TIMEOUT_MS = 30_000
+/** Long enough for a cold provider start; a longer one replays through the same wait. */
+export const STRUCTURED_AGENT_SESSION_START_WAIT_MS = 120_000
 const MAX_SEND_SETTLEMENT_WAITERS_PER_SESSION = 64
 const MAX_SEND_SETTLEMENT_WAITERS = 1_024
 
 function settledSend(
-  journal: AgentSessionJournal,
+  journal: SendSettlementJournal,
   clientMessageId: string,
+  until: SendSettlementPoint,
   submission: AgentJournalSubmission | undefined = journal
     .submissions()
     .find((candidate) => candidate.clientMessageId === clientMessageId)
@@ -36,9 +54,11 @@ function settledSend(
   if (!submission) {
     return 'missing'
   }
-  return submission.dispatchState === 'pending'
-    ? 'pending'
-    : { cursor: journal.cursor(), value: { clientMessageId, submission } }
+  const waiting =
+    until === 'handed-over'
+      ? isQueuedAgentJournalSubmission(submission)
+      : submission.dispatchState === 'pending'
+  return waiting ? 'pending' : { cursor: journal.cursor(), value: { clientMessageId, submission } }
 }
 
 function abortError(signal: AbortSignal): Error {
@@ -52,17 +72,19 @@ export class StructuredAgentSessionSendSettlement {
   private readonly waiters = new Map<string, Set<SendSettlementWaiter>>()
   private waiterCount = 0
 
-  constructor(private readonly journalFor: (sessionId: string) => AgentSessionJournal) {}
+  constructor(private readonly journalFor: (sessionId: string) => SendSettlementJournal) {}
 
   wait = (
     sessionId: string,
     clientMessageId: string,
-    signal?: AbortSignal
+    options: SendSettlementWaitOptions = {}
   ): Promise<SettledSend | undefined> => {
+    const { signal } = options
+    const until = options.until ?? 'answered'
     if (signal?.aborted) {
       return Promise.reject(abortError(signal))
     }
-    const immediate = settledSend(this.journalFor(sessionId), clientMessageId)
+    const immediate = settledSend(this.journalFor(sessionId), clientMessageId, until)
     if (immediate === 'missing') {
       return Promise.reject(new Error('agent session send disappeared before settlement'))
     }
@@ -79,12 +101,13 @@ export class StructuredAgentSessionSendSettlement {
     return new Promise((resolve, reject) => {
       const waiter: SendSettlementWaiter = {
         clientMessageId,
+        until,
         resolve,
         reject,
         timer: setTimeout(() => {
           this.remove(sessionId, waiter)
           resolve(undefined)
-        }, SEND_SETTLEMENT_WAIT_TIMEOUT_MS)
+        }, options.budgetMs ?? SEND_SETTLEMENT_WAIT_TIMEOUT_MS)
       }
       waiter.timer.unref?.()
       const session = existingSession ?? new Set<SendSettlementWaiter>()
@@ -106,7 +129,7 @@ export class StructuredAgentSessionSendSettlement {
     })
   }
 
-  publish(sessionId: string, journal: AgentSessionJournal): void {
+  publish(sessionId: string, journal: SendSettlementJournal): void {
     const waiters = this.waiters.get(sessionId)
     if (!waiters) {
       return
@@ -118,6 +141,7 @@ export class StructuredAgentSessionSendSettlement {
       const result = settledSend(
         journal,
         waiter.clientMessageId,
+        waiter.until,
         submissions.get(waiter.clientMessageId)
       )
       if (result !== 'pending') {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts
index 638d8a8679f6..d2b9d27c1a04 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts
@@ -23,6 +23,8 @@ import {
   HOST_TEST_THREAD as THREAD,
   hostTestMessage
 } from './structured-agent-session-host-test-data'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
 
 let store: AgentSessionRecordStore
 let host: StructuredAgentSessionHost
@@ -32,6 +34,28 @@ beforeEach(() => {
   ;({ store, host, dispatch } = hostTestState())
 })
 
+function hostJournal(): AgentSessionJournal {
+  return (
+    host as unknown as { sessions: Map<string, { journal: AgentSessionJournal }> }
+  ).sessions.get(SESSION)!.journal
+}
+
+/** A send is accepted, then the session's delivery loop hands it over: wait for the handover's
+ *  outcome, or with `handedOver`, only for the handover itself (an admitted send stays pending). */
+async function delivered(clientMessageId: string, options: { handedOver?: true } = {}) {
+  let submission: ReturnType<AgentSessionJournal['submissions']>[number] | undefined
+  await vi.waitFor(() => {
+    submission = hostJournal()
+      .submissions()
+      .find((entry) => entry.clientMessageId === clientMessageId)
+    expect(submission?.handedOverAt).toBeDefined()
+    if (!options.handedOver) {
+      expect(submission?.dispatchState).not.toBe('pending')
+    }
+  })
+  return submission!
+}
+
 describe('send', () => {
   it('writes the submission before dispatching and resolves it accepted', async () => {
     await attach()
@@ -43,9 +67,17 @@ describe('send', () => {
     if (!result.ok) {
       throw new Error(`expected a send, got ${result.refusal.code}`)
     }
-    expect(result.value.submission.dispatchState).toBe('accepted')
+    // Answered once accepted; the delivery loop hands it over after.
+    expect(result.value.submission).toMatchObject({
+      dispatchState: 'pending',
+      handoverRecorded: true
+    })
+    expect(result.value.submission.handedOverAt).toBeUndefined()
+    await expect(delivered(result.value.clientMessageId)).resolves.toMatchObject({
+      dispatchState: 'accepted'
+    })
     expect(dispatch).toHaveBeenCalledTimes(1)
-    const page = host.history({ sessionId: SESSION, direction: 'tail' })
+    const page = await host.history({ sessionId: SESSION, direction: 'tail' })
     expect(page.ok && page.page.items).toHaveLength(1)
     expect(page.ok && page.page.fence).toBe(1)
     expect(page.page.hostNow).toBe(NOW)
@@ -75,11 +107,11 @@ describe('send', () => {
     await attach()
     dispatch.mockRejectedValueOnce(new Error('socket closed'))
     const body = hostTestMessage('add a retry')
-    const result = await host.send(CALLER, {
-      envelope: envelope('agentSession.send', { body }),
-      body
+    const params = { envelope: envelope('agentSession.send', { body }), body }
+    await host.send(CALLER, params)
+    await expect(delivered(params.envelope.clientOperationId)).resolves.toMatchObject({
+      dispatchState: 'unknown'
     })
-    expect(result).toMatchObject({ ok: true, value: { submission: { dispatchState: 'unknown' } } })
   })
 
   it('replays a retried send from the journal without dispatching twice', async () => {
@@ -87,6 +119,7 @@ describe('send', () => {
     const body = hostTestMessage('add a retry')
     const params = { envelope: envelope('agentSession.send', { body }), body }
     await host.send(CALLER, params)
+    await delivered(params.envelope.clientOperationId)
     const retry = await host.send(CALLER, params)
     expect(retry).toMatchObject({ ok: true, replayed: true })
     expect(dispatch).toHaveBeenCalledTimes(1)
@@ -98,10 +131,9 @@ describe('send', () => {
     const body = hostTestMessage('possibly delivered')
     const params = { envelope: envelope('agentSession.send', { body }), body }
 
-    const first = await host.send(CALLER, params)
-    expect(first).toMatchObject({
-      ok: true,
-      value: { submission: { dispatchState: 'unknown' } }
+    await host.send(CALLER, params)
+    await expect(delivered(params.envelope.clientOperationId)).resolves.toMatchObject({
+      dispatchState: 'unknown'
     })
     // A thrown adapter call is indistinguishable from a lost reply, so Retry
     // replays the recorded outcome.
@@ -110,7 +142,7 @@ describe('send', () => {
       value: { submission: { dispatchState: 'unknown' } }
     })
     expect(dispatch).toHaveBeenCalledTimes(1)
-    const state = host.history({ sessionId: SESSION, direction: 'tail' })
+    const state = await host.history({ sessionId: SESSION, direction: 'tail' })
     expect(state.ok && state.page.submissions).toHaveLength(1)
   })
 
@@ -129,6 +161,7 @@ describe('send', () => {
     const params = { envelope: envelope('agentSession.send', { body }), body }
 
     await host.send(CALLER, params)
+    await delivered(params.envelope.clientOperationId)
     await expect(host.send(CALLER, { ...params, retryUnknown: true })).resolves.toMatchObject({
       ok: true,
       value: {
@@ -136,7 +169,7 @@ describe('send', () => {
       }
     })
     expect(dispatch).toHaveBeenCalledTimes(1)
-    const state = host.history({ sessionId: SESSION, direction: 'tail' })
+    const state = await host.history({ sessionId: SESSION, direction: 'tail' })
     expect(state.ok && state.page.submissions).toHaveLength(1)
   })
 
@@ -145,30 +178,29 @@ describe('send', () => {
     dispatch
       .mockImplementationOnce(async () => ({
         state: 'rejected' as const,
-        reason: 'provider_write_failed: broken pipe'
+        ...agentSessionFailureWords(agentSessionFailureFact('writeFailed'), {
+          surface: 'rejection'
+        })
       }))
       .mockImplementationOnce(async () => accepted())
     const body = hostTestMessage('never written')
     const params = { envelope: envelope('agentSession.send', { body }), body }
 
-    await expect(host.send(CALLER, params)).resolves.toMatchObject({
-      ok: true,
-      value: {
-        submission: { dispatchState: 'rejected', reason: 'provider_write_failed: broken pipe' }
-      }
+    await host.send(CALLER, params)
+    await expect(delivered(params.envelope.clientOperationId)).resolves.toMatchObject({
+      dispatchState: 'rejected',
+      reason: 'provider_write_failed'
     })
     // What the user's Retry does with a rejection: a fresh client message id,
     // which is a first delivery by construction and cannot duplicate the frame
     // that never left the process.
-    await expect(
-      host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
-    ).resolves.toMatchObject({
-      ok: true,
-      replayed: false,
-      value: { submission: { dispatchState: 'accepted' } }
+    const rotated = { envelope: envelope('agentSession.send', { body }), body }
+    await expect(host.send(CALLER, rotated)).resolves.toMatchObject({ ok: true, replayed: false })
+    await expect(delivered(rotated.envelope.clientOperationId)).resolves.toMatchObject({
+      dispatchState: 'accepted'
     })
     expect(dispatch).toHaveBeenCalledTimes(2)
-    const state = host.history({ sessionId: SESSION, direction: 'tail' })
+    const state = await host.history({ sessionId: SESSION, direction: 'tail' })
     expect(state.ok && state.page.submissions).toHaveLength(2)
   })
 
@@ -183,10 +215,9 @@ describe('send', () => {
     const body = hostTestMessage('a message the provider may already hold')
     const params = { envelope: envelope('agentSession.send', { body }), body }
 
-    const first = await host.send(CALLER, params)
-    expect(first).toMatchObject({
-      ok: true,
-      value: { submission: { dispatchState: 'unknown' } }
+    await host.send(CALLER, params)
+    await expect(delivered(params.envelope.clientOperationId)).resolves.toMatchObject({
+      dispatchState: 'unknown'
     })
     // No `unknown` is re-delivered under its own id, whatever its reason says,
     // so Retry replays the recorded outcome instead of writing again.
@@ -203,6 +234,7 @@ describe('send', () => {
     const body = hostTestMessage('settled for good')
     const params = { envelope: envelope('agentSession.send', { body }), body }
     await host.send(CALLER, params)
+    await delivered(params.envelope.clientOperationId)
     const journal = (
       host as unknown as { sessions: Map<string, { journal: AgentSessionJournal }> }
     ).sessions.get(SESSION)!.journal
@@ -223,7 +255,7 @@ describe('send', () => {
     expect(journal.receiptFor(params.envelope.clientOperationId)).not.toBeNull()
   })
 
-  it('leaves an admitted send pending and writes no dispatch row', async () => {
+  it('leaves an admitted send pending once handed over', async () => {
     await attach()
     dispatch.mockImplementationOnce(async () => ({ state: 'admitted' as const }))
     const body = hostTestMessage('queued behind a running turn')
@@ -233,9 +265,9 @@ describe('send', () => {
       ok: true,
       value: { submission: { dispatchState: 'pending', reason: null, resolvedAt: null } }
     })
-    const journal = (
-      host as unknown as { sessions: Map<string, { journal: AgentSessionJournal }> }
-    ).sessions.get(SESSION)!.journal
+    await delivered(params.envelope.clientOperationId, { handedOver: true })
+    await vi.waitFor(() => expect(dispatch).toHaveBeenCalledTimes(1))
+    const journal = hostJournal()
     expect(journal.pendingSubmissions()).toHaveLength(1)
   })
 
@@ -245,6 +277,8 @@ describe('send', () => {
     const body = hostTestMessage('written, never acknowledged')
     const params = { envelope: envelope('agentSession.send', { body }), body }
     await host.send(CALLER, params)
+    await delivered(params.envelope.clientOperationId, { handedOver: true })
+    await vi.waitFor(() => expect(dispatch).toHaveBeenCalledTimes(1))
     const journal = (
       host as unknown as { sessions: Map<string, { journal: AgentSessionJournal }> }
     ).sessions.get(SESSION)!.journal
@@ -281,6 +315,8 @@ describe('send', () => {
     const params = { envelope: envelope('agentSession.send', { body }), body }
 
     await expect(host.send(CALLER, params)).rejects.toThrow('operation settlement failed')
+    // The submission was recorded before the ledger write failed, so it is still delivered.
+    await delivered(params.envelope.clientOperationId)
     await expect(host.send(CALLER, params)).resolves.toMatchObject({
       ok: true,
       replayed: true,
@@ -333,9 +369,8 @@ describe('send', () => {
 
     await expect(host.send(CALLER, params)).rejects.toThrow('operation settlement failed')
     settlement.mockRestore()
-    const journal = (
-      host as unknown as { sessions: Map<string, { journal: AgentSessionJournal }> }
-    ).sessions.get(SESSION)!.journal
+    await delivered(params.envelope.clientOperationId)
+    const journal = hostJournal()
     await journal.rollEpoch('schema_unreadable', store.getRecord(SESSION)?.lease.runtimeFence ?? 1)
     expect(journal.submissions()).toHaveLength(0)
 
@@ -362,6 +397,7 @@ describe('send', () => {
     const params = { envelope: envelope('agentSession.send', { body }), body }
 
     await host.send(CALLER, params)
+    await delivered(params.envelope.clientOperationId)
     expect(dispatch).toHaveBeenCalledTimes(1)
     await store.recordOperationOutcome({
       callerKey: CALLER.callerKey,
@@ -393,6 +429,8 @@ describe('send', () => {
     const body = hostTestMessage('written, then the child died')
     const params = { envelope: envelope('agentSession.send', { body }), body }
     await host.send(CALLER, params)
+    await delivered(params.envelope.clientOperationId, { handedOver: true })
+    await vi.waitFor(() => expect(dispatch).toHaveBeenCalledTimes(1))
     const journal = (
       host as unknown as { sessions: Map<string, { journal: AgentSessionJournal }> }
     ).sessions.get(SESSION)!.journal
@@ -411,21 +449,25 @@ describe('send', () => {
 
   it('advances an explicit retry after a ledger-unknown send is reconciled in the journal', async () => {
     await attach()
-    const journal = (
-      host as unknown as { sessions: Map<string, { journal: AgentSessionJournal }> }
-    ).sessions.get(SESSION)!.journal
-    vi.spyOn(journal, 'resolveDispatch').mockRejectedValueOnce(new Error('journal resolve failed'))
+    const journal = hostJournal()
+    const resolve = journal.resolveDispatch.bind(journal)
+    // The handover row lands; the provider's answer, written after the adapter took the
+    // message, does not.
+    vi.spyOn(journal, 'resolveDispatch')
+      .mockImplementationOnce(resolve)
+      .mockRejectedValueOnce(new Error('journal resolve failed'))
     const body = hostTestMessage('possibly delivered before persistence failed')
     const params = { envelope: envelope('agentSession.send', { body }), body }
 
-    await expect(host.send(CALLER, params)).rejects.toThrow('journal resolve failed')
-    expect(journal.submissions()).toMatchObject([
-      { clientMessageId: params.envelope.clientOperationId, dispatchState: 'unknown' }
-    ])
+    await expect(host.send(CALLER, params)).resolves.toMatchObject({ ok: true })
+    await expect(delivered(params.envelope.clientOperationId)).resolves.toMatchObject({
+      dispatchState: 'unknown'
+    })
+    // Acceptance is what the ledger answers for; delivery is the journal's to say.
     expect(
       store.listOperationRows().find((row) => row.operationId === params.envelope.clientOperationId)
         ?.outcome
-    ).toEqual({ status: 'unknown' })
+    ).toMatchObject({ status: 'succeeded' })
     expect(dispatch).toHaveBeenCalledTimes(1)
 
     await journal.markPendingSubmissionsUnknown(store.getRecord(SESSION)?.lease.runtimeFence ?? 1)
@@ -446,7 +488,7 @@ describe('send', () => {
     expect(journal.submissions()).toHaveLength(1)
   })
 
-  it('admits a send fenced to another generation, and replays it by id once the fence catches up', async () => {
+  it('admits a send fenced to another generation, delivers it once, and replays it by id', async () => {
     const record = await attach()
     const body = hostTestMessage('add a retry')
     const params = {
@@ -457,10 +499,9 @@ describe('send', () => {
       ),
       body
     }
-    expect(await host.send(CALLER, params)).toMatchObject({
-      ok: true,
-      replayed: false,
-      value: { submission: { dispatchState: 'accepted' } }
+    expect(await host.send(CALLER, params)).toMatchObject({ ok: true, replayed: false })
+    await expect(delivered(params.envelope.clientOperationId)).resolves.toMatchObject({
+      dispatchState: 'accepted'
     })
     const retry = {
       ...params,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-settled-attach-retry.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-settled-attach-retry.test.ts
index f0dd60965ee4..7602afa230be 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-settled-attach-retry.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-settled-attach-retry.test.ts
@@ -125,6 +125,11 @@ afterEach(async () => {
   await rm(root, { recursive: true, force: true })
 })
 
+/** The host starting the agent with no message to deliver, as an operation that needs it does. */
+function startAgent(): Promise<unknown> {
+  return host['serialize'](SESSION, () => host['mutationContext']().ensureAgent(SESSION))
+}
+
 describe('settled attach retry', () => {
   it('settles a post-acquisition journal failure and retries without a restart', async () => {
     const historyFilePath = vi
@@ -314,6 +319,8 @@ describe('settled attach retry', () => {
     }
     const first = await host.send(CALLER, unknownParams)
     expect(first).toMatchObject({ ok: true, value: { submission: { dispatchState: 'pending' } } })
+    // Handed over before the host dies: that is what makes the restart's answer doubt.
+    await vi.waitFor(() => expect(dispatch).toHaveBeenCalledTimes(1))
 
     await host.flushAllStreamedEvents()
     store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
@@ -327,7 +334,7 @@ describe('settled attach retry', () => {
       now: () => NOW
     })
     await host.restoreReadableSessions()
-    await host.hold(SESSION, 'desktop-chat:restart')
+    await startAgent()
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
       claimStatus: 'live',
       handoffStage: null,
@@ -343,8 +350,8 @@ describe('settled attach retry', () => {
     if (!sent.ok) {
       throw new Error(`unexpected restored send refusal: ${sent.refusal.message}`)
     }
-    expect(dispatch).toHaveBeenCalledTimes(2)
-    const restoredHistory = host.history({ sessionId: SESSION, direction: 'tail' })
+    await vi.waitFor(() => expect(dispatch).toHaveBeenCalledTimes(2))
+    const restoredHistory = await host.history({ sessionId: SESSION, direction: 'tail' })
     if (!restoredHistory.ok) {
       throw new Error(`unexpected restored history reset: ${restoredHistory.reset}`)
     }
@@ -376,7 +383,10 @@ describe('settled attach retry', () => {
 
     await expect(host.attach(CALLER, hostTestAttachParams(null))).resolves.toMatchObject({
       ok: false,
-      refusal: { message: 'resume rejected', ownerVerdict: 'exited' }
+      refusal: {
+        message: "Codex couldn't restart. Send your message to try again.",
+        ownerVerdict: 'exited'
+      }
     })
 
     expect(releaseAcquisition).toHaveBeenCalledTimes(1)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-open.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-open.test.ts
new file mode 100644
index 000000000000..83959233f6f3
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-open.test.ts
@@ -0,0 +1,114 @@
+// A turn an exited agent left running, whose settlement write failed, is settled by the next open of
+// the conversation, not only by the next send: a reader reopening a chat the idle sweep closed, or
+// reading it before the restart restore reaches it.
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record'
+import { setStructuredAgentSessionHost } from './structured-agent-session-registry'
+import {
+  collectSubscriber,
+  createRestTestRig,
+  foundRestTestChat,
+  IDLE_MS,
+  REST_TEST_SESSION as SESSION,
+  REST_TEST_THREAD,
+  sweepOnce,
+  type RestTestRig
+} from './structured-agent-session-rest-test-rig'
+
+let rig: RestTestRig
+
+beforeEach(async () => {
+  rig = await createRestTestRig({ idleSweep: { intervalMs: 3_600_000 } })
+  setStructuredAgentSessionHost(rig.host)
+})
+
+afterEach(async () => {
+  setStructuredAgentSessionHost(null)
+  await rig.dispose()
+})
+
+/** A turn in flight whose agent exits, and whose exit settlement the journal refuses: by default
+ *  also the retry that recording the exit queues, so only an open is left to settle it. */
+async function exitWithUnwrittenSettlement(refusedWrites = 2): Promise<void> {
+  await foundRestTestChat(rig)
+  const open = rig.host.collaboratorsForTests().sessions.get(SESSION)!
+  const running = open.child!
+  rig.adapter.acquire.mock.calls
+    .at(-1)?.[0]
+    .events?.appendItem(
+      { provider: 'codex', threadId: REST_TEST_THREAD, turnId: 'working', ordinal: 50 },
+      { kind: 'turn', turnId: 'working', state: 'running' }
+    )
+  await rig.host.flushStreamedEvents(SESSION)
+  const append = vi.spyOn(open.journal, 'appendLifecycleBatch')
+  for (let refused = 0; refused < refusedWrites; refused += 1) {
+    append.mockRejectedValueOnce(new Error('disk full'))
+  }
+  await rig.host.handleAdapterEvent({
+    type: 'ended',
+    sessionId: SESSION,
+    reason: 'killed',
+    cause: 'unexpected-exit',
+    fence: running.fence,
+    acquisitionGeneration: running.generation!
+  })
+  await vi.waitFor(() =>
+    expect(rig.store.getRecord(SESSION)?.lease).toMatchObject({
+      claimStatus: 'released',
+      deathEvidence: { kind: 'exit-observed' }
+    })
+  )
+  await rig.host.collaboratorsForTests().serialize(SESSION, async () => {})
+}
+
+async function workingTurnState(): Promise<string | undefined> {
+  const items = (await rig.host.journalSnapshot(SESSION)).items
+  return items
+    .map((item) => readAgentJournalTurn(item.body))
+    .find((turn) => turn?.turnId === 'working')?.state
+}
+
+describe('a turn its gone agent left running', () => {
+  it('is settled in place by the retry recording the exit queues, with no reopen', async () => {
+    await exitWithUnwrittenSettlement(1)
+
+    expect(rig.host.collaboratorsForTests().sessions.has(SESSION)).toBe(true)
+    expect(await workingTurnState()).toBe('interrupted')
+    const { items } = await rig.host.journalSnapshot(SESSION)
+    expect(JSON.stringify(items)).toContain(
+      'Codex stopped while this response was in progress. You can continue in this conversation.'
+    )
+    expect(rig.adapter.acquire).toHaveBeenCalledOnce()
+  })
+
+  it('is settled when the idle-closed conversation is opened again, and its reader sees it', async () => {
+    await exitWithUnwrittenSettlement()
+    expect(await workingTurnState()).toBe('running')
+    rig.clock.now += IDLE_MS + 1
+    await sweepOnce(rig.host)
+    expect(rig.host.collaboratorsForTests().sessions.has(SESSION)).toBe(false)
+
+    const reader = collectSubscriber()
+    await rig.host.subscribe({ id: 'reader', sessionId: SESSION, emit: reader.emit })
+
+    expect(await workingTurnState()).toBe('interrupted')
+    // The death evidence is Orca's log text: the row says only that the provider stopped.
+    expect(JSON.stringify(reader.events)).toContain(
+      'Codex stopped while this response was in progress. You can continue in this conversation.'
+    )
+    expect(rig.adapter.acquire).toHaveBeenCalledOnce()
+  })
+
+  it('is settled by a read after a restart that reaches the chat before the restore does', async () => {
+    await exitWithUnwrittenSettlement()
+    await rig.restart()
+    setStructuredAgentSessionHost(rig.host)
+
+    // The client's read opens the chat first; the restore then finds it open and skips it.
+    expect(await workingTurnState()).toBe('interrupted')
+    await rig.host.restoreReadableSessions([SESSION])
+    expect(await workingTurnState()).toBe('interrupted')
+    expect(rig.adapter.acquire).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.test.ts
index 4ab7b3ad010c..2c7a91e76378 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.test.ts
@@ -4,6 +4,8 @@ import { join } from 'node:path'
 import { describe, expect, it, vi } from 'vitest'
 import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
 import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types'
+import type { AgentSessionDeathEvidence } from '../../../shared/agent-session-record'
+import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { createTrackedJournalOpener } from '../agent-session-journal/journal-store-test-open'
 import { settleStaleStructuredAgentSessionState } from './structured-agent-session-dead-generation-settlement'
@@ -75,17 +77,77 @@ function promptItem(state: 'pending' | 'resolved', sequence: number): AgentJourn
 }
 
 describe('turn verdict from death evidence', () => {
-  it('earns an end time only from an observed exit', () => {
+  /** Judges a turn the fence-1 owner wrote, by evidence naming that owner. */
+  const verdictForTurn = (evidence: AgentSessionDeathEvidence | null | undefined) =>
+    turnVerdictFromDeathEvidence(evidence && { ownerFence: 1, ...evidence }, 1)
+
+  it('ends a watched exit at the exit', () => {
+    expect(verdictForTurn({ kind: 'exit-observed', detail: 'exit', observedAt: 500 })).toEqual({
+      state: 'interrupted',
+      completedAt: 500
+    })
+  })
+
+  it.each(['pid-absent', 'identity-mismatch'] as const)(
+    'ends a %s proof at the last proof of life, never after the probe',
+    (kind) => {
+      const proof = (lastProvenAliveAt?: number) => ({
+        kind,
+        detail: 'gone',
+        observedAt: 9_000,
+        ...(lastProvenAliveAt === undefined ? {} : { lastProvenAliveAt })
+      })
+      // Probed at 9000, long after the crash: the downtime is never counted as work.
+      expect(verdictForTurn(proof(8_000))).toEqual({ state: 'interrupted', completedAt: 8_000 })
+      expect(verdictForTurn(proof(9_500))).toEqual({ state: 'interrupted', completedAt: 9_000 })
+      // A proof that recorded no proof of life has only the probe.
+      expect(verdictForTurn(proof())).toEqual({ state: 'interrupted', completedAt: 9_000 })
+    }
+  )
+
+  it('ends a watched exit at the exit even when a renewal is recorded', () => {
     expect(
-      turnVerdictFromDeathEvidence({ kind: 'exit-observed', detail: 'exit', observedAt: 500 })
+      verdictForTurn({
+        kind: 'exit-observed',
+        detail: 'exit',
+        observedAt: 500,
+        lastProvenAliveAt: 400
+      })
     ).toEqual({ state: 'interrupted', completedAt: 500 })
-    expect(
-      turnVerdictFromDeathEvidence({ kind: 'pid-absent', detail: 'gone', observedAt: 500 })
-    ).toEqual({ state: 'unverifiable' })
-    expect(
-      turnVerdictFromDeathEvidence({ kind: 'identity-mismatch', detail: 'pid', observedAt: 500 })
-    ).toEqual({ state: 'unverifiable' })
-    expect(turnVerdictFromDeathEvidence(null)).toEqual({ state: 'unverifiable' })
+  })
+
+  it('leaves a release nothing proved unverifiable', () => {
+    expect(verdictForTurn(null)).toEqual({ state: 'unverifiable' })
+    expect(verdictForTurn(undefined)).toEqual({ state: 'unverifiable' })
+  })
+  it('keeps the rule an older build applied to evidence that names no owner', () => {
+    // Only a watched exit was proof then; a probe's proof stays unverifiable.
+    const legacy = { detail: 'gone', observedAt: 9_000, lastProvenAliveAt: 8_000 }
+    expect(turnVerdictFromDeathEvidence({ ...legacy, kind: 'exit-observed' }, 1)).toEqual({
+      state: 'interrupted',
+      completedAt: 9_000
+    })
+    expect(turnVerdictFromDeathEvidence({ ...legacy, kind: 'pid-absent' }, 1)).toEqual({
+      state: 'unverifiable'
+    })
+  })
+
+  it('gives a turn no end from evidence about any other owner', () => {
+    const proof = {
+      kind: 'pid-absent' as const,
+      detail: 'gone',
+      observedAt: 9_000,
+      lastProvenAliveAt: 8_000
+    }
+    // A newer start's death, and a turn whose writer the timeline no longer knows: neither proves
+    // the turn's own owner gone.
+    for (const [evidence, turnFence] of [
+      [{ ...proof, ownerFence: 3 }, 1],
+      [{ ...proof, kind: 'exit-observed' as const, ownerFence: 3 }, 1],
+      [{ ...proof, ownerFence: 1 }, undefined]
+    ] as const) {
+      expect(turnVerdictFromDeathEvidence(evidence, turnFence)).toEqual({ state: 'unverifiable' })
+    }
   })
 })
 
@@ -162,6 +224,13 @@ describe('running turn lifecycle revisions', () => {
     })
   })
 
+  it('never ends a turn before it began, when the last proof of life predates it', () => {
+    const item = lifecycleItem('turn-2', 'running', 2, { startedAt: 500 })
+    expect(
+      runningTurnLifecycleRevisions([item], { state: 'interrupted', completedAt: 300 })
+    ).toMatchObject([{ body: { kind: 'turn', state: 'interrupted', completedAt: 500 } }])
+  })
+
   it('revises a legacy status-form running row from an older host into a typed turn', () => {
     expect(
       runningTurnLifecycleRevisions([legacyLifecycleItem('turn-2', 30)], { state: 'unverifiable' })
@@ -180,11 +249,22 @@ describe('running turn lifecycle revisions', () => {
   })
 })
 
+/** A probe that found the fence-1 owner gone at 9000, last proven alive at 100. */
+const PROVEN: AgentSessionDeathEvidence = {
+  kind: 'pid-absent',
+  detail: 'recorded pid absent on host',
+  observedAt: 9_000,
+  ownerFence: 1,
+  lastProvenAliveAt: 100
+}
+
 describe('stale session state on a cold acquire', () => {
   function journalWith(items: AgentJournalRenderItem[]) {
     const appendLifecycleBatch = vi.fn(async () => ({ epoch: 'epoch-1', sequence: 9 }))
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the settle reads only these journal members.
     const journal = {
       snapshot: () => ({ items }),
+      itemFence: () => 1,
       cursor: () => ({ epoch: 'epoch-1', sequence: 8 }),
       appendLifecycleBatch
     } as unknown as AgentSessionJournal
@@ -310,6 +390,255 @@ describe('stale session state on a cold acquire', () => {
     }
   })
 
+  it('ends a probe-proven turn at its last proof of life, not at a row written after it', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-stale-session-'))
+    const journals = createTrackedJournalOpener()
+    let now = 100
+    try {
+      const journal = await journals.open({
+        identity: {
+          sessionId: 'session-1',
+          workspaceId: 'workspace-1',
+          hostId: 'local',
+          agent: 'codex',
+          providerHandle: { kind: 'codex', threadId: THREAD }
+        },
+        journalDir: root,
+        now: () => now
+      })
+      const command = { provider: 'codex' as const, threadId: THREAD, turnId: 'turn-1', ordinal: 1 }
+      const shell = { kind: 'tool-call' as const, name: 'shell', input: { command: 'pnpm test' } }
+      await journal.appendItem(
+        { ...command, ordinal: 0 },
+        { kind: 'turn', turnId: 'turn-1', state: 'running', startedAt: 100 },
+        { fence: 1 }
+      )
+      now = 200
+      await journal.appendItem(command, { ...shell, state: 'running' }, { fence: 1 })
+      // Rows can outlast the last renewal; only the renewal is proof of life.
+      now = 700
+      await journal.appendItem(
+        command,
+        { ...shell, input: { command: 'pnpm test', streamed: 'ok' }, state: 'running' },
+        { fence: 1 }
+      )
+      now = 9_000
+
+      await settleStaleStructuredAgentSessionState({
+        journal,
+        sessionId: 'session-1',
+        fence: 2,
+        acquisitionGeneration: 'generation-2',
+        deathEvidence: {
+          kind: 'pid-absent',
+          detail: 'recorded pid absent on host',
+          observedAt: 9_000,
+          ownerFence: 1,
+          lastProvenAliveAt: 650
+        }
+      })
+
+      const items = journal.snapshot().items
+      expect(items.map((item) => readAgentJournalTurn(item.body)).find(Boolean)).toMatchObject({
+        state: 'interrupted',
+        completedAt: 650
+      })
+      // The probe's detail is Orca's, so the row carries none.
+      expect(
+        items.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : []))
+      ).toEqual([
+        'The agent stopped while this response was in progress. You can continue in this conversation.'
+      ])
+    } finally {
+      await journals.closeAll()
+      await rm(root, { recursive: true, force: true })
+    }
+  })
+
+  it('ends a crashed turn at its last proof of life, not at a send accepted before the proof', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-stale-session-'))
+    const journals = createTrackedJournalOpener()
+    let now = 100
+    try {
+      const journal = await journals.open({
+        identity: {
+          sessionId: 'session-1',
+          workspaceId: 'workspace-1',
+          hostId: 'local',
+          agent: 'codex',
+          providerHandle: { kind: 'codex', threadId: THREAD }
+        },
+        journalDir: root,
+        now: () => now
+      })
+      await journal.appendItem(
+        RUNNING_IDENTITY,
+        { kind: 'turn', turnId: 'turn-2', state: 'running', startedAt: 100 },
+        { fence: 1 }
+      )
+      now = 200
+      await journal.appendItem(
+        { ...RUNNING_IDENTITY, ordinal: 1 },
+        { kind: 'tool-call', name: 'shell', input: { command: 'pnpm test' }, state: 'running' },
+        { fence: 1 }
+      )
+      const settle = (deathEvidence: AgentSessionDeathEvidence | null) =>
+        settleStaleStructuredAgentSessionState({
+          journal,
+          sessionId: 'session-1',
+          fence: 1,
+          acquisitionGeneration: null,
+          deathEvidence
+        })
+      // An hour later the relaunch opens the chat before anything proved the owner gone.
+      now = 3_600_000
+      await settle(null)
+      const turn = () => journal.snapshot().items.map((item) => readAgentJournalTurn(item.body))[0]
+      expect(turn()).toMatchObject({ state: 'unverifiable' })
+      now = 3_605_000
+      await journal.appendSubmission({
+        clientMessageId: 'send-1',
+        payloadFingerprint: 'fingerprint-1',
+        body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'still there?' }] },
+        fence: 1,
+        handoverRecorded: true
+      })
+      await journal.resolveDispatch({ clientMessageId: 'send-1', state: 'pending', fence: 1 })
+      now = 3_606_000
+
+      await settle({
+        kind: 'pid-absent',
+        detail: 'gone',
+        observedAt: 3_606_000,
+        ownerFence: 1,
+        lastProvenAliveAt: 210
+      })
+
+      expect(turn()).toMatchObject({ state: 'interrupted', completedAt: 210 })
+    } finally {
+      await journals.closeAll()
+      await rm(root, { recursive: true, force: true })
+    }
+  })
+
+  it('revises an unverifiable turn only from a proof naming its own owner, and only once', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-stale-session-'))
+    const journals = createTrackedJournalOpener()
+    let now = 100
+    try {
+      const journal = await journals.open({
+        identity: {
+          sessionId: 'session-1',
+          workspaceId: 'workspace-1',
+          hostId: 'local',
+          agent: 'codex',
+          providerHandle: { kind: 'codex', threadId: THREAD }
+        },
+        journalDir: root,
+        now: () => now
+      })
+      await journal.appendItem(
+        RUNNING_IDENTITY,
+        { kind: 'turn', turnId: 'turn-2', state: 'running', startedAt: 100 },
+        { fence: 1 }
+      )
+      now = 400
+      // The open, before anything proved the fence-1 owner gone.
+      const settle = (deathEvidence: AgentSessionDeathEvidence | null) =>
+        settleStaleStructuredAgentSessionState({
+          journal,
+          sessionId: 'session-1',
+          fence: 2,
+          acquisitionGeneration: null,
+          deathEvidence
+        })
+      await settle(null)
+      now = 9_000
+      const turn = () => journal.snapshot().items.map((item) => readAgentJournalTurn(item.body))[0]
+      expect(turn()).toMatchObject({ state: 'unverifiable' })
+
+      const unrevised = journal.cursor()
+      await expect(settle({ ...PROVEN, ownerFence: 2 })).resolves.toBe(0)
+      const { ownerFence: _ownerFence, ...olderBuildProof } = PROVEN
+      await expect(settle({ ...olderBuildProof, kind: 'exit-observed' })).resolves.toBe(0)
+      expect(journal.cursor()).toEqual(unrevised)
+      expect(turn()).toMatchObject({ state: 'unverifiable' })
+
+      await expect(settle(PROVEN)).resolves.toBe(2)
+      expect(turn()).toEqual({
+        turnId: 'turn-2',
+        state: 'interrupted',
+        startedAt: 100,
+        completedAt: 100
+      })
+      const revised = journal.cursor()
+      await expect(settle(PROVEN)).resolves.toBe(0)
+      expect(journal.cursor()).toEqual(revised)
+      expect(journal.snapshot().items.filter((item) => item.body.kind === 'status')).toHaveLength(1)
+    } finally {
+      await journals.closeAll()
+      await rm(root, { recursive: true, force: true })
+    }
+  })
+
+  it('adds one row for a death however many attempts its settle takes to write', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-stale-session-'))
+    const journals = createTrackedJournalOpener()
+    let now = 100
+    try {
+      const journal = await journals.open({
+        identity: {
+          sessionId: 'session-1',
+          workspaceId: 'workspace-1',
+          hostId: 'local',
+          agent: 'codex',
+          providerHandle: { kind: 'codex', threadId: THREAD }
+        },
+        journalDir: root,
+        now: () => now
+      })
+      // Enough running turns that the settle writes two batches, and its retry two again.
+      for (let index = 0; index < 399; index++) {
+        const turnId = `turn-${index}`
+        await journal.appendItem(
+          { ...RUNNING_IDENTITY, turnId },
+          { kind: 'turn', turnId, state: 'running', startedAt: 100 },
+          { fence: 1 }
+        )
+      }
+      now = 9_000
+      const settle = () =>
+        settleStaleStructuredAgentSessionState({
+          journal,
+          sessionId: 'session-1',
+          fence: 2,
+          acquisitionGeneration: null,
+          deathEvidence: PROVEN
+        })
+      const turns = () =>
+        journal.snapshot().items.flatMap((item) => readAgentJournalTurn(item.body) ?? [])
+      const statusRows = () =>
+        journal.snapshot().items.filter((item) => item.body.kind === 'status')
+      const append = journal.appendLifecycleBatch.bind(journal)
+      const secondBatchFails = vi
+        .spyOn(journal, 'appendLifecycleBatch')
+        .mockImplementationOnce(append)
+        .mockRejectedValueOnce(new Error('disk full'))
+
+      await expect(settle()).rejects.toThrow('disk full')
+      secondBatchFails.mockRestore()
+      expect(turns().filter((turn) => turn.state === 'running')).toHaveLength(200)
+      expect(statusRows()).toHaveLength(1)
+
+      await settle()
+      expect(turns().filter((turn) => turn.state !== 'interrupted')).toEqual([])
+      expect(statusRows()).toHaveLength(1)
+    } finally {
+      await journals.closeAll()
+      await rm(root, { recursive: true, force: true })
+    }
+  })
+
   it('writes nothing when no turn is running and keys on the journal position without a generation', async () => {
     const idle = journalWith([
       lifecycleItem('turn-1', 'completed', 1, { startedAt: 10, completedAt: 20 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.ts
index b6e9b9bde5ea..b23018aeba83 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.ts
@@ -1,8 +1,10 @@
 // What the host may durably say about a turn whose provider child is gone.
 //
-// `interrupted` requires the host to have seen the child exit; that receipt is the only end time it
-// is allowed to record. Everything weaker — a pid probe, an identity mismatch, a journal found
-// running with no observed exit on the record — is `unverifiable` and carries no end at all.
+// `interrupted` requires proof that the child which wrote the turn is gone: death evidence naming
+// that turn's owner by fence — a watched exit, or a local probe that found the recorded pid gone or
+// reused. A release nothing proved — lost contact, an unverifiable identity, a stop that outlived the
+// ladder — carries none, and neither does a later owner's death; the turn is then `unverifiable`
+// with no end at all, until a proof naming its owner is written and revises it.
 
 import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
 import type {
@@ -15,6 +17,7 @@ import {
 } from '../../../shared/agent-session-turn-record'
 import type { AgentSessionDeathEvidence } from '../../../shared/agent-session-record'
 import type { JournalLifecycleMutationInput } from '../agent-session-journal/journal-row-builders'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 
 export type StructuredAgentSessionTurnVerdict =
   | { state: 'interrupted'; completedAt: number }
@@ -25,11 +28,31 @@ export const UNVERIFIABLE_TURN_VERDICT: StructuredAgentSessionTurnVerdict = {
 }
 
 export function turnVerdictFromDeathEvidence(
-  evidence: AgentSessionDeathEvidence | null | undefined
+  evidence: AgentSessionDeathEvidence | null | undefined,
+  /** Fence of the owner that wrote the turn. */
+  turnFence: number | undefined
 ): StructuredAgentSessionTurnVerdict {
-  return evidence?.kind === 'exit-observed'
-    ? { state: 'interrupted', completedAt: evidence.observedAt }
-    : UNVERIFIABLE_TURN_VERDICT
+  if (!evidence) {
+    return UNVERIFIABLE_TURN_VERDICT
+  }
+  if (evidence.ownerFence === undefined) {
+    // Evidence an older build wrote names no owner; it keeps the rule that build applied.
+    return evidence.kind === 'exit-observed'
+      ? { state: 'interrupted', completedAt: evidence.observedAt }
+      : UNVERIFIABLE_TURN_VERDICT
+  }
+  if (evidence.ownerFence !== turnFence) {
+    return UNVERIFIABLE_TURN_VERDICT
+  }
+  if (evidence.kind === 'exit-observed') {
+    return { state: 'interrupted', completedAt: evidence.observedAt }
+  }
+  // A probe finds a dead child long after it died; its last renewal bounds the end, so the turn never
+  // counts the time Orca was down. Timeline rows don't: a send can land there after the death.
+  return {
+    state: 'interrupted',
+    completedAt: Math.min(evidence.lastProvenAliveAt ?? evidence.observedAt, evidence.observedAt)
+  }
 }
 
 /** Revises every still-running lifecycle item in place, keeping its identity and start. */
@@ -37,23 +60,43 @@ export function runningTurnLifecycleRevisions(
   items: readonly AgentJournalRenderItem[],
   verdict: StructuredAgentSessionTurnVerdict
 ): JournalLifecycleMutationInput[] {
-  const revisions: JournalLifecycleMutationInput[] = []
-  for (const item of items) {
+  return items.flatMap((item) => {
     const turn = readAgentJournalTurn(item.body)
-    if (turn?.state !== 'running') {
-      continue
-    }
-    const identity = parseAgentJournalItemKey(item.itemId)
-    if (!identity) {
-      continue
-    }
-    revisions.push({
-      kind: 'item',
-      identity,
-      body: agentJournalTurnBody(settledLifecycle(turn, verdict))
-    })
+    return turn?.state === 'running' ? turnLifecycleRevision(item, turn, verdict) : []
+  })
+}
+
+/**
+ * A turn an earlier settle could only call `unverifiable`, because the proof had not been written
+ * yet, revised once a proof names the owner that wrote it. Only ever upward, and never from an
+ * older build's proof, which names no owner.
+ */
+export function provenUnverifiableTurnRevisions(
+  items: readonly AgentJournalRenderItem[],
+  evidence: AgentSessionDeathEvidence | null | undefined,
+  journal: Pick<AgentSessionJournal, 'itemFence'>
+): JournalLifecycleMutationInput[] {
+  const ownerFence = evidence?.ownerFence
+  if (ownerFence === undefined) {
+    return []
   }
-  return revisions
+  return items.flatMap((item) => {
+    const turn = readAgentJournalTurn(item.body)
+    return turn?.state === 'unverifiable' && journal.itemFence(item.itemId) === ownerFence
+      ? turnLifecycleRevision(item, turn, turnVerdictFromDeathEvidence(evidence, ownerFence))
+      : []
+  })
+}
+
+function turnLifecycleRevision(
+  item: AgentJournalRenderItem,
+  turn: AgentJournalTurnLifecycle,
+  verdict: StructuredAgentSessionTurnVerdict
+): JournalLifecycleMutationInput[] {
+  const identity = parseAgentJournalItemKey(item.itemId)
+  return identity
+    ? [{ kind: 'item', identity, body: agentJournalTurnBody(settledLifecycle(turn, verdict)) }]
+    : []
 }
 
 /** The verdict owns the turn's end and nothing else; every other field the row
@@ -69,7 +112,10 @@ function settledLifecycle(
     durationMs: _durationMs,
     ...kept
   } = lifecycle
-  return verdict.state === 'interrupted'
-    ? { ...kept, state: verdict.state, completedAt: verdict.completedAt }
-    : { ...kept, state: verdict.state }
+  if (verdict.state !== 'interrupted') {
+    return { ...kept, state: verdict.state }
+  }
+  // A renewal can predate the turn, which started with its owner alive; it never ends before that.
+  const began = Math.max(lifecycle.requestedAt ?? 0, lifecycle.startedAt ?? 0)
+  return { ...kept, state: verdict.state, completedAt: Math.max(verdict.completedAt, began) }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-row.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-row.ts
new file mode 100644
index 000000000000..77ba7fe5f583
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-row.ts
@@ -0,0 +1,80 @@
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
+import { structuredAgentSessionStartFailureRowIdentity } from '../../../shared/structured-agent-session-start-failure-row-key'
+import type { JournalLifecycleMutationInput } from '../agent-session-journal/journal-row-builders'
+import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
+import type { StructuredAgentSessionStartFailureWords } from './structured-agent-session-failure-text'
+
+/** A start that failed, keyed like its row, in the words `structuredAgentSessionStartFailure` gave. */
+export type StructuredAgentSessionStartFailure = StructuredAgentSessionStartFailureWords & {
+  startKey: string | null
+}
+
+/**
+ * The one row a start that failed leaves in the chat, whoever saw it fail: an error row, so the
+ * reason outlives any error strip. Keyed by the start — the child's generation, or the oldest
+ * message it was for when no child was ever published — so a second report of the same failure
+ * lands on the same row instead of adding one.
+ */
+export function structuredAgentSessionStartFailureRow(
+  startKey: string,
+  words: StructuredAgentSessionStartFailureWords
+): JournalLifecycleMutationInput {
+  return {
+    kind: 'item',
+    identity: structuredAgentSessionStartFailureRowIdentity(startKey),
+    // The row repeats the sentence the start's rejected messages carry.
+    body: { kind: 'status', text: words.reason, tone: 'error', failure: words.rejection }
+  }
+}
+
+/** Whether the start's row is already written. Its words are the ones its rejected messages carry,
+ *  and rejected is terminal, so the exit's later report of the same start must not reword it. */
+export function hasStructuredAgentSessionStartFailureRow(
+  items: readonly { itemId: string }[],
+  startKey: string
+): boolean {
+  const itemId = agentJournalItemKey(structuredAgentSessionStartFailureRowIdentity(startKey))
+  return items.some((item) => item.itemId === itemId)
+}
+
+/**
+ * A start the delivery loop needed and did not get: the start's row, and every queued message
+ * rejected with the same words. Writes nothing when nothing is still queued: a start whose
+ * messages Stop withdrew did not fail anyone.
+ */
+export async function recordStructuredAgentSessionStartFailure(
+  session: Pick<StructuredAgentSessionHostSession, 'journal'> & { fence: number },
+  failure: StructuredAgentSessionStartFailure
+): Promise<void> {
+  const oldest = oldestQueuedSubmission(session)
+  if (!oldest) {
+    return
+  }
+  const startKey = failure.startKey ?? oldest.clientMessageId
+  await session.journal.appendLifecycleBatch({
+    settlementId: `start-failure:${startKey}`,
+    fence: session.fence,
+    recovered: true,
+    mutations: [structuredAgentSessionStartFailureRow(startKey, failure)]
+  })
+  await session.journal.rejectQueuedSubmissions(session.fence, {
+    reason: failure.reason,
+    rejection: failure.rejection
+  })
+}
+
+export function oldestQueuedSubmission(
+  session: Pick<StructuredAgentSessionHostSession, 'journal'>
+): ReturnType<StructuredAgentSessionHostSession['journal']['submissions']>[number] | undefined {
+  let oldest: ReturnType<typeof oldestQueuedSubmission>
+  for (const submission of session.journal.submissions()) {
+    if (
+      isQueuedAgentJournalSubmission(submission) &&
+      (oldest === undefined || (submission.acceptedSequence ?? 0) < (oldest.acceptedSequence ?? 0))
+    ) {
+      oldest = submission
+    }
+  }
+  return oldest
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-writer.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-writer.test.ts
new file mode 100644
index 000000000000..5ce1fdb3694e
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-writer.test.ts
@@ -0,0 +1,194 @@
+// A start a queued message waited on can be seen failing twice: by the delivery loop, when the
+// adapter settles the start without proving it, and by the exit settlement, when the child's exit
+// lands. The chat gets one row for that start, the loop's, in the words the message was rejected
+// with — whichever of the two reports first.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  agentSessionFailureFact,
+  type SubmissionRejectionFact
+} from '../../../shared/agent-session-failure'
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
+  hostTestMessage,
+  hostTestOperationId,
+  resetHostTestOperationIds
+} from './structured-agent-session-host-test-data'
+
+const CALLER = { callerKey: 'client-1' }
+const EXIT_REASON = 'Claude Code is not signed in. Sign in with the Claude CLI'
+const ADAPTER_FAILURE = agentSessionFailureFact('notSignedIn')
+const ADAPTER_FAILURE_TEXT =
+  'Codex is not signed in for the selected account. Sign in, then send your message again.'
+// The exit's reason is Orca's log text; the row says only that the start stopped.
+const EXIT_TEXT = 'Codex stopped before it finished starting. Send your message to try again.'
+// The first child (generation-1) is lost at setup; the send starts generation-2.
+const START_ROW = agentJournalItemKey({
+  provider: 'orca',
+  clientMessageId: 'start-failure:generation-2'
+})
+
+function eventually(assertion: () => void | Promise<void>): Promise<void> {
+  return vi.waitFor(assertion, { timeout: 10_000 })
+}
+
+let root: string
+let store: AgentSessionRecordStore
+let host: StructuredAgentSessionHost
+let generation = 0
+let settleStart: (failure: SubmissionRejectionFact | undefined) => void = () => {}
+let awaitStarted = vi.fn<() => Promise<SubmissionRejectionFact | undefined>>()
+let frames: AgentSessionSubscribeEvent[] = []
+
+function exitBeforeProof(): Promise<void> {
+  return host.handleAdapterEvent({
+    type: 'ended',
+    sessionId: SESSION,
+    fence: store.getRecord(SESSION)?.lease.runtimeFence ?? 0,
+    acquisitionGeneration: `generation-${generation}`,
+    reason: EXIT_REASON,
+    cause: 'unexpected-exit',
+    startupUnproven: true
+  })
+}
+
+async function sendQueued(text: string): Promise<string> {
+  const body = hostTestMessage(text)
+  const sent = await host.send(CALLER, {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: store.getRecord(SESSION)?.lease.runtimeFence ?? 0,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.send',
+        sessionId: SESSION,
+        fields: { body }
+      })
+    },
+    body
+  })
+  expect(sent).toMatchObject({ ok: true })
+  // The loop started a child and waits on its start with the message still queued.
+  await eventually(() => expect(awaitStarted).toHaveBeenCalledOnce())
+  expect(generation).toBe(2)
+  return sent.ok ? sent.value.clientMessageId : ''
+}
+
+async function submission(clientMessageId: string) {
+  return (await host.journalSnapshot(SESSION)).submissions.find(
+    (entry) => entry.clientMessageId === clientMessageId
+  )
+}
+
+/** Every text the subscriber was sent for the start's row, in order. */
+function publishedStartRows(): string[] {
+  return frames.flatMap((frame) =>
+    frame.type === 'batch'
+      ? frame.batch.items.flatMap((item) =>
+          item.itemId === START_ROW && item.body.kind === 'status' ? [item.body.text] : []
+        )
+      : []
+  )
+}
+
+async function startRows(): Promise<string[]> {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.itemId === START_ROW && item.body.kind === 'status' ? [item.body.text] : []
+  )
+}
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-start-failure-writer-'))
+  resetHostTestOperationIds()
+  generation = 0
+  frames = []
+  awaitStarted = vi.fn(
+    () => new Promise<SubmissionRejectionFact | undefined>((resolve) => (settleStart = resolve))
+  )
+  store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
+  host = new StructuredAgentSessionHost({
+    store,
+    adapter: {
+      acquire: vi.fn(async ({ fence, spawnToken }) => ({
+        process: { hostId: 'local', pid: 4242, processStartTimeMs: 1_700_000_000_000, spawnToken },
+        link: {
+          linkId: `link-${fence}`,
+          handle: { provider: 'codex' as const, threadId: THREAD },
+          origin: generation === 0 ? ('created' as const) : ('resumed' as const),
+          mintedAtFence: fence,
+          observedAt: NOW
+        },
+        acquisitionGeneration: `generation-${++generation}`,
+        providerChildPhase: 'starting' as const
+      })),
+      awaitStarted,
+      releaseAcquisition: vi.fn(async () => true),
+      closeSession: vi.fn(async () => true),
+      dispatch: vi.fn(async () => ({ state: 'admitted' as const })),
+      cancelTurn: vi.fn(async () => ({ cancelled: true })),
+      answerPrompt: vi.fn(async () => undefined),
+      setOption: vi.fn(async () => undefined)
+    },
+    journalRoot: root,
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => `spawn-${generation + 1}`,
+    now: () => NOW
+  })
+  await expect(host.attach(CALLER, hostTestAttachParams(null))).resolves.toMatchObject({
+    ok: true
+  })
+  await exitBeforeProof()
+  await host.subscribe({ id: 'pane', sessionId: SESSION, emit: (event) => frames.push(event) })
+})
+
+afterEach(async () => {
+  await host.flushAllStreamedEvents()
+  await rm(root, { recursive: true, force: true })
+})
+
+describe('a queued message whose start fails and whose child then exits', () => {
+  it("keeps the loop's row when the loop saw the failure first", async () => {
+    const queued = await sendQueued('hello')
+
+    settleStart(ADAPTER_FAILURE)
+    await eventually(async () =>
+      expect(await submission(queued)).toMatchObject({
+        dispatchState: 'rejected',
+        reason: ADAPTER_FAILURE_TEXT,
+        rejection: ADAPTER_FAILURE
+      })
+    )
+    await exitBeforeProof()
+    await host.flushStreamedEvents(SESSION)
+
+    expect(await startRows()).toEqual([ADAPTER_FAILURE_TEXT])
+    expect(publishedStartRows()).toEqual([ADAPTER_FAILURE_TEXT])
+  })
+
+  it('leaves the row to the loop when the exit lands while the message still waits', async () => {
+    const queued = await sendQueued('hello')
+
+    await exitBeforeProof()
+    expect(await submission(queued)).toMatchObject({ dispatchState: 'pending' })
+    settleStart(undefined)
+    await eventually(async () =>
+      expect(await submission(queued)).toMatchObject({ dispatchState: 'rejected' })
+    )
+    await host.flushStreamedEvents(SESSION)
+
+    expect(await startRows()).toEqual([EXIT_TEXT])
+    // Written once, after the message was settled, not first by the exit and again by the loop.
+    expect(publishedStartRows()).toEqual([EXIT_TEXT])
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-failure-exit.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-failure-exit.test.ts
index 0fd544ec9eea..dae8635cd69d 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-failure-exit.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-failure-exit.test.ts
@@ -4,7 +4,6 @@ import {
   agentSessionLeaseFixture,
   agentSessionRecordFixture
 } from '../../../shared/agent-session-record.test-fixture'
-import { providerStartupFailureOutcome } from './structured-agent-session-dead-generation-settlement'
 import {
   settleUnexpectedStructuredAgentSessionExit,
   type StructuredAgentSessionUnexpectedExitContext,
@@ -13,16 +12,16 @@ import {
 
 const SESSION = 'session-1'
 const GENERATION = 'generation-1'
-const REASON = 'Claude Code is not signed in. Sign in with the Claude CLI'
+const REASON = 'claude stream-json exited (code 1): session limit reached'
+const STARTUP_TEXT = 'Claude stopped before it finished starting. Send your message to try again.'
 
 function startedSession(): StructuredAgentSessionUnexpectedExitSession & {
   journal: { appendLifecycleBatch: ReturnType<typeof vi.fn> }
 } {
   return {
-    hasProviderChild: true,
-    fence: 7,
-    acquisitionGeneration: GENERATION,
+    child: { generation: GENERATION, fence: 7, phase: 'ready' },
     journal: {
+      cursor: () => ({ epoch: 'epoch-1', sequence: 0 }),
       // Nothing ran: the start failed before any response or acknowledged prompt.
       snapshot: () => ({ items: [] }),
       appendLifecycleBatch: vi.fn(async () => ({ epoch: 'epoch-1', sequence: 1 })),
@@ -56,7 +55,6 @@ function contextFor(session: StructuredAgentSessionUnexpectedExitSession) {
     sessions: new Map([[SESSION, session]]),
     flushLifecycle: async () => ({ ok: true }),
     publishFence: vi.fn(),
-    hasResumeCapableHolder: () => true,
     serialize: async <T>(_sessionId: string, task: () => Promise<T>) => task(),
     now: () => 1
   }
@@ -73,47 +71,70 @@ const ended = {
 }
 
 describe('a provider that ends before it finished starting', () => {
-  it('tells the user why, even with no response in progress, and does not auto-resume', async () => {
+  it('tells the user why, even with no response in progress', async () => {
     const session = startedSession()
 
-    const ticket = await settleUnexpectedStructuredAgentSessionExit(contextFor(session), {
+    await settleUnexpectedStructuredAgentSessionExit(contextFor(session), {
       ...ended,
+      // The adapter typed the start's own failure; the host keeps it rather than reword it.
+      failure: { kind: 'notSignedIn' },
       startupUnproven: true
     })
 
-    expect(ticket).toBeNull()
     expect(session.journal.appendLifecycleBatch).toHaveBeenCalledWith(
       expect.objectContaining({
         mutations: [
           expect.objectContaining({
-            body: { kind: 'status', text: providerStartupFailureOutcome(REASON) }
+            // The same row the delivery loop writes for a failed start: an error, keyed by it.
+            identity: { provider: 'orca', clientMessageId: `start-failure:${GENERATION}` },
+            body: {
+              kind: 'status',
+              text: 'Claude is not signed in for the selected account. Sign in, then send your message again.',
+              tone: 'error',
+              failure: { kind: 'notSignedIn' }
+            }
           })
         ]
       })
     )
-    expect(providerStartupFailureOutcome(REASON)).toContain('not signed in')
   })
 
-  it('keeps an ordinary idle exit silent and resumable', async () => {
+  it('keeps an ordinary idle exit silent', async () => {
     const session = startedSession()
 
-    const ticket = await settleUnexpectedStructuredAgentSessionExit(contextFor(session), ended)
+    await settleUnexpectedStructuredAgentSessionExit(contextFor(session), ended)
 
-    expect(ticket).not.toBeNull()
+    expect(session.child).toBeNull()
     expect(session.journal.appendLifecycleBatch).not.toHaveBeenCalled()
   })
 
   it("reads a start that failed off the host's own phase when the provider omits the flag", async () => {
-    const session = { ...startedSession(), providerChildPhase: 'starting' as const }
+    const session = {
+      ...startedSession(),
+      child: { generation: GENERATION, fence: 7, phase: 'starting' as const }
+    }
 
-    const ticket = await settleUnexpectedStructuredAgentSessionExit(contextFor(session), ended)
+    await settleUnexpectedStructuredAgentSessionExit(contextFor(session), {
+      ...ended,
+      failure: { kind: 'providerExited', detail: { text: REASON, audience: 'log' } }
+    })
 
-    expect(ticket).toBeNull()
     expect(session.journal.appendLifecycleBatch).toHaveBeenCalledWith(
       expect.objectContaining({
         mutations: [
           expect.objectContaining({
-            body: { kind: 'status', text: providerStartupFailureOutcome(REASON) }
+            // The same row the delivery loop writes for a failed start: an error, keyed by it.
+            identity: { provider: 'orca', clientMessageId: `start-failure:${GENERATION}` },
+            // The exit's stderr stays out of the sentence, as a log detail beside it.
+            body: {
+              kind: 'status',
+              text: STARTUP_TEXT,
+              tone: 'error',
+              failure: {
+                kind: 'providerStartFailed',
+                detail: { text: REASON, audience: 'log' }
+              }
+            }
           })
         ]
       })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-child.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-child.test.ts
new file mode 100644
index 000000000000..78e10bec076d
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-child.test.ts
@@ -0,0 +1,76 @@
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it } from 'vitest'
+import type { AgentSessionStatusEvent } from '../../../shared/agent-session-wire'
+import { createTrackedJournalOpener } from '../agent-session-journal/journal-store-test-open'
+import { StructuredAgentSessionStatusFeed } from './structured-agent-session-status-feed'
+import { indexedStatusFeedSession } from './structured-agent-session-status-feed-test-session'
+
+const SESSION = 'status-session'
+const journals = createTrackedJournalOpener()
+let root: string
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-status-child-'))
+})
+
+afterEach(async () => {
+  await journals.closeAll()
+  await rm(root, { recursive: true, force: true })
+})
+
+it('publishes each provider child even when a replacement has the same startup phase', async () => {
+  const journal = await journals.open({
+    identity: {
+      sessionId: SESSION,
+      workspaceId: 'workspace-1',
+      hostId: 'local',
+      agent: 'codex',
+      providerHandle: { kind: 'codex', threadId: 'thread-1' }
+    },
+    journalDir: join(root, SESSION)
+  })
+  const sessions = new Map<string, ReturnType<typeof indexedStatusFeedSession>>()
+  const setChild = (
+    child: {
+      phase: 'starting' | 'ready'
+      generation: string
+      fence: number
+    } | null
+  ) => sessions.set(SESSION, indexedStatusFeedSession({ journal, child }))
+  setChild({ phase: 'starting', generation: 'child-1', fence: 1 })
+  const events: AgentSessionStatusEvent[] = []
+  const feed = new StructuredAgentSessionStatusFeed({
+    sessions,
+    getRecord: () => null,
+    now: () => 1
+  })
+  const dispose = feed.subscribe({ id: 'list-1', emit: (event) => events.push(event) })
+  expect(events.at(-1)).toMatchObject({
+    type: 'snapshot',
+    sessions: [
+      {
+        hostExecutionOwned: true,
+        hostExecutionPhase: 'starting',
+        hostExecutionChild: { generation: 'child-1', fence: 1 }
+      }
+    ]
+  })
+  setChild({ phase: 'starting', generation: 'child-2', fence: 2 })
+  feed.publish(SESSION, journal)
+  expect(events.at(-1)).toMatchObject({
+    session: {
+      hostExecutionPhase: 'starting',
+      hostExecutionChild: { generation: 'child-2', fence: 2 }
+    }
+  })
+  setChild({ phase: 'ready', generation: 'child-2', fence: 2 })
+  feed.publish(SESSION, journal)
+  expect(events.at(-1)).toMatchObject({ session: { hostExecutionPhase: 'ready' } })
+  setChild(null)
+  feed.publish(SESSION, journal)
+  expect(events.at(-1)).not.toMatchObject({ session: { hostExecutionPhase: expect.any(String) } })
+  expect(events.at(-1)).not.toMatchObject({ session: { hostExecutionChild: expect.any(Object) } })
+  dispose()
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-test-session.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-test-session.ts
index e4fa6ebed1bf..da7275cc6418 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-test-session.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-test-session.ts
@@ -1,18 +1,13 @@
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import type { StructuredAgentSessionProviderChildIdentity } from './structured-agent-session-host-types'
 
 export function indexedStatusFeedSession(session: {
   journal: AgentSessionJournal
-  hasProviderChild?: boolean
-  providerChildPhase?: 'starting' | 'ready'
-  fence?: number
+  child?: (StructuredAgentSessionProviderChildIdentity & { phase: 'starting' | 'ready' }) | null
 }) {
   return {
     journal: session.journal,
-    fence: session.fence ?? 1,
-    ...(session.hasProviderChild !== undefined
-      ? { hasProviderChild: session.hasProviderChild }
-      : {}),
-    ...(session.providerChildPhase ? { providerChildPhase: session.providerChildPhase } : {}),
+    ...(session.child !== undefined ? { child: session.child } : {}),
     params: {
       location: {
         executionHostId: 'local' as const,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.test.ts
index 65c7f54fb305..eda619694e35 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.test.ts
@@ -3,6 +3,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
+import { agentSessionRecordFixture } from '../../../shared/agent-session-record.test-fixture'
 import type {
   AgentSessionBackgroundTask,
   AgentSessionStatusEvent,
@@ -33,6 +34,8 @@ const USER_IDENTITY = {
   ordinal: 1
 } as const
 
+type Indexed = Parameters<typeof indexed>[0]
+
 let root: string
 const journals = createTrackedJournalOpener()
 
@@ -82,7 +85,8 @@ function feedFor(
         }
       }
     } as unknown as ReadonlyMap<string, ReturnType<typeof indexed>>,
-    getRecord: () => record as AgentSessionRecord | null,
+    // A partial record still has a lease: the feed reads the conversation's fence off it.
+    getRecord: () => (record ? { ...agentSessionRecordFixture(), ...record } : null),
     now: () => (now += 1)
   })
   const events: AgentSessionStatusEvent[] = []
@@ -91,27 +95,11 @@ function feedFor(
 }
 
 describe('StructuredAgentSessionStatusFeed', () => {
-  it('projects whether the owned child has proven its start, and nothing once it is not owned', async () => {
-    const journal = await openJournal()
-    const session = { journal, hasProviderChild: true, providerChildPhase: 'starting' as const }
-    const sessions = new Map<string, Parameters<typeof indexed>[0]>([[SESSION, session]])
-    const { feed, events, dispose } = feedFor(sessions)
-    expect(events.at(-1)).toMatchObject({
-      type: 'snapshot',
-      sessions: [{ hostExecutionOwned: true, hostExecutionPhase: 'starting' }]
-    })
-    sessions.set(SESSION, { ...session, providerChildPhase: 'ready' })
-    feed.publish(SESSION, journal)
-    expect(events.at(-1)).toMatchObject({ session: { hostExecutionPhase: 'ready' } })
-    sessions.set(SESSION, { ...session, hasProviderChild: false })
-    feed.publish(SESSION, journal)
-    expect(events.at(-1)).not.toMatchObject({ session: { hostExecutionPhase: expect.any(String) } })
-    dispose()
-  })
-
   it('publishes provider ownership transitions without changing journal time', async () => {
     const journal = await openJournal()
-    const sessions = new Map([[SESSION, { journal, hasProviderChild: true }]])
+    const sessions = new Map<string, Indexed>([
+      [SESSION, { journal, child: { phase: 'ready', generation: 'child-1', fence: 1 } }]
+    ])
     const { feed, events, dispose } = feedFor(sessions)
     events.length = 0
     await journal.appendItem(
@@ -130,7 +118,7 @@ describe('StructuredAgentSessionStatusFeed', () => {
       throw new Error('status publication missing')
     }
     const journalTime = firstStatus.session.updatedAt
-    sessions.get(SESSION)!.hasProviderChild = false
+    sessions.get(SESSION)!.child = null
     feed.publish(SESSION, journal)
     expect(events.at(-1)).toEqual({
       type: 'status',
@@ -167,8 +155,10 @@ describe('StructuredAgentSessionStatusFeed', () => {
 
   it('stops projecting an old-host unknown submission after the owner fence advances', async () => {
     const journal = await openJournal()
-    const session = { journal, fence: 1 }
-    const { feed, events } = feedFor(new Map([[SESSION, session]]))
+    // The conversation's fence is the record's: a child's end moves it.
+    const lease = agentSessionRecordFixture().lease
+    const record = agentSessionRecordFixture({ ...lease, runtimeFence: 1 })
+    const { feed, events } = feedFor(new Map([[SESSION, { journal }]]), record)
     await journal.appendSubmission({
       clientMessageId: 'old-host',
       payloadFingerprint: 'fp',
@@ -183,9 +173,10 @@ describe('StructuredAgentSessionStatusFeed', () => {
     })
     feed.publish(SESSION)
     expect(events.at(-1)).toMatchObject({ session: { status: 'working' } })
-    session.fence = 2
+    record.lease.runtimeFence = 2
     feed.publish(SESSION)
-    expect(events.at(-1)).toMatchObject({ session: { status: 'idle' } })
+    // Its only send outlived the host that sent it and became no turn: nothing left to list.
+    expect(events.at(-1)).toMatchObject({ session: { status: null } })
   })
 
   it('publishes working from the pending submission, before the provider replays the turn', async () => {
@@ -793,7 +784,9 @@ describe('the status sink sees the roster the broadcast cache deliberately lacks
 
   it('receives every change once, ownership revocation, and the forget edge', async () => {
     const journal = await openJournal()
-    const sessions = new Map([[SESSION, { journal, hasProviderChild: true }]])
+    const sessions = new Map<string, Indexed>([
+      [SESSION, { journal, child: { phase: 'ready', generation: 'child-1', fence: 1 } }]
+    ])
     const { sink, published, forgotten } = sinkFor()
     const { feed } = feedFor(sessions, null, undefined, undefined, sink)
     await journal.appendItem(
@@ -815,6 +808,8 @@ describe('the status sink sees the roster the broadcast cache deliberately lacks
     feed.revokeLive(SESSION)
     expect(published.at(-1)).toMatchObject({ sessionId: SESSION, status: 'idle' })
     expect(published.at(-1)?.hostExecutionOwned).toBeUndefined()
+    expect(published.at(-1)?.hostExecutionPhase).toBeUndefined()
+    expect(published.at(-1)?.hostExecutionChild).toBeUndefined()
 
     // Exactly what `close` does after eviction: the cache keeps the projection, the sink does not.
     sessions.delete(SESSION)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.ts
index eef1c0e06f98..22a61a006bb6 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.ts
@@ -22,10 +22,10 @@ import {
   type AgentSessionStatusSummary
 } from '../../../shared/agent-session-wire'
 import type { AgentChildWorkEvidence } from '../../../shared/agent-status-child-work-evidence'
-import { projectStructuredAgentSessionStatusSummary } from '../../../shared/structured-agent-session-projection'
+import { projectStructuredAgentSessionStatusState } from '../../../shared/structured-agent-session-projection'
 import { structuredAgentSessionAgentStatus } from '../../../shared/structured-agent-session-agent-status'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
-import type { StructuredAgentSessionProviderChildPhase } from './structured-agent-session-adapter'
+import type { StructuredAgentSessionProviderChild } from './structured-agent-session-host-types'
 import { structuredAgentSessionProviderSessionMetadata } from './structured-agent-session-history-result'
 import {
   StructuredAgentSessionStatusOwnership,
@@ -34,6 +34,10 @@ import {
 
 export type { StructuredAgentSessionStatusSink } from './structured-agent-session-status-ownership'
 
+export type StructuredAgentSessionStatusState = ReturnType<
+  typeof projectStructuredAgentSessionStatusState
+>
+
 export type StructuredAgentSessionStatusSubscriber = {
   id: string
   emit: (event: AgentSessionStatusEvent) => void
@@ -42,9 +46,7 @@ export type StructuredAgentSessionStatusSubscriber = {
 type StatusFeedSession = {
   journal: AgentSessionJournal
   params: { location: AgentSessionRecord['location']; provider: AgentSessionRecord['provider'] }
-  hasProviderChild?: boolean
-  providerChildPhase?: StructuredAgentSessionProviderChildPhase
-  fence?: number
+  child?: Pick<StructuredAgentSessionProviderChild, 'phase' | 'generation' | 'fence'> | null
 }
 
 export type StructuredAgentSessionStatusFeedDeps = {
@@ -60,6 +62,8 @@ export type StructuredAgentSessionStatusFeedDeps = {
   /** Live provider-owned background tasks for the summary, so session lists can
    *  render subagent children. Optional: a provider without the hook projects none. */
   readBackgroundTasks?: (sessionId: string) => AgentSessionBackgroundTaskState | null | undefined
+  /** The session's agent proved a start: its row's phase became `ready`. */
+  onAgentStarted?: (sessionId: string) => void
 }
 
 function summariesEqual(a: AgentSessionStatusSummary, b: AgentSessionStatusSummary): boolean {
@@ -69,6 +73,8 @@ function summariesEqual(a: AgentSessionStatusSummary, b: AgentSessionStatusSumma
     a.status === b.status &&
     a.hostExecutionOwned === b.hostExecutionOwned &&
     a.hostExecutionPhase === b.hostExecutionPhase &&
+    a.hostExecutionChild?.generation === b.hostExecutionChild?.generation &&
+    a.hostExecutionChild?.fence === b.hostExecutionChild?.fence &&
     a.rewindBlockedReason === b.rewindBlockedReason &&
     // A moved state clock changes ranking; row activity alone, including a subagent's, does not.
     // An idle state the journal cannot date still republishes, since readers date it by `updatedAt`,
@@ -117,6 +123,7 @@ export function createStructuredAgentSessionHostStatusFeed(args: {
     onSessionStatusChanged?: StructuredAgentSessionStatusFeedDeps['onStatusChanged']
     statusSink?: StructuredAgentSessionStatusSink
   }
+  onAgentStarted?: (sessionId: string) => void
 }): StructuredAgentSessionStatusFeed {
   return new StructuredAgentSessionStatusFeed({
     sessions: args.sessions,
@@ -126,7 +133,8 @@ export function createStructuredAgentSessionHostStatusFeed(args: {
     readBackgroundTasks: (sessionId) => args.deps().adapter.backgroundTaskState?.(sessionId),
     // Resolved per call for the same reason the other deps are: the host builds this feed in a
     // field initializer, before its constructor parameters are assigned.
-    statusSink: () => args.deps().statusSink
+    statusSink: () => args.deps().statusSink,
+    ...(args.onAgentStarted ? { onAgentStarted: args.onAgentStarted } : {})
   })
 }
 
@@ -144,7 +152,7 @@ export class StructuredAgentSessionStatusFeed {
       sequence: number
       readOnly: boolean
       fence: number | undefined
-      summary: ReturnType<typeof projectStructuredAgentSessionStatusSummary>
+      state: StructuredAgentSessionStatusState
     }
   >()
 
@@ -197,7 +205,12 @@ export class StructuredAgentSessionStatusFeed {
     if (!previous) {
       return
     }
-    const { hostExecutionOwned: _hostExecutionOwned, ...retained } = previous
+    const {
+      hostExecutionOwned: _hostExecutionOwned,
+      hostExecutionPhase: _hostExecutionPhase,
+      hostExecutionChild: _hostExecutionChild,
+      ...retained
+    } = previous
     this.published.set(sessionId, retained)
     this.sink(retained)
     this.broadcast({
@@ -206,6 +219,17 @@ export class StructuredAgentSessionStatusFeed {
     })
   }
 
+  /** The projection behind the session's row and the latest request it read, cached per commit,
+   *  so the completion feed follows the same request without snapshotting the journal again. */
+  statusState(
+    sessionId: string,
+    journal?: AgentSessionJournal
+  ): StructuredAgentSessionStatusState | null {
+    const session = this.deps.sessions.get(sessionId)
+    const source = journal ?? session?.journal
+    return source ? this.projectionFor(source, this.deps.getRecord(sessionId)) : null
+  }
+
   /** Re-projects one session after its journal changed; equal projections are not re-sent. */
   publish(sessionId: string, journal?: AgentSessionJournal, options?: { replay?: boolean }): void {
     const session = this.deps.sessions.get(sessionId)
@@ -223,6 +247,9 @@ export class StructuredAgentSessionStatusFeed {
     this.published.set(sessionId, summary)
     this.sink(summary, session.params.location)
     this.broadcast({ type: 'status', session: summary })
+    if (summary.hostExecutionPhase === 'ready' && previous?.hostExecutionPhase !== 'ready') {
+      this.deps.onAgentStarted?.(sessionId)
+    }
     try {
       this.deps.onStatusChanged?.(summary, { replay: options?.replay === true })
     } catch (error) {
@@ -236,34 +263,8 @@ export class StructuredAgentSessionStatusFeed {
     session: StatusFeedSession,
     journal: AgentSessionJournal
   ): AgentSessionStatusSummary {
-    // An unreadable journal projects as "no turn": the chat itself shows the reset.
-    const cursor = journal.cursor()
-    const readOnly = journal.isReadOnly
-    const fence = session.fence
-    let projection = this.journalProjections.get(journal)
-    if (
-      !projection ||
-      projection.epoch !== cursor.epoch ||
-      projection.sequence !== cursor.sequence ||
-      projection.readOnly !== readOnly ||
-      projection.fence !== fence
-    ) {
-      // A journalled submission bumps `lastSequence`, so the send-time working
-      // signal reaches the cache; the lease fence does not, hence the extra key.
-      const snapshot = readOnly ? null : journal.snapshot()
-      projection = {
-        ...cursor,
-        readOnly,
-        fence,
-        summary: projectStructuredAgentSessionStatusSummary(
-          snapshot?.items ?? [],
-          snapshot?.submissions ?? [],
-          fence
-        )
-      }
-      this.journalProjections.set(journal, projection)
-    }
     const record = this.deps.getRecord(sessionId)
+    const { summary: projected } = this.projectionFor(journal, record)
     const providerSession = structuredAgentSessionProviderSessionMetadata(record)
     // The journal has no model: the record's acknowledged options are where a mid-session
     // switch lands, so the row follows whichever is in force.
@@ -278,15 +279,14 @@ export class StructuredAgentSessionStatusFeed {
       sessionId,
       workspaceId: session.params.location.workspaceId,
       agent: session.params.provider,
-      ...(session.hasProviderChild
+      ...(session.child
         ? {
             hostExecutionOwned: true as const,
-            ...(session.providerChildPhase
-              ? { hostExecutionPhase: session.providerChildPhase }
-              : {})
+            hostExecutionPhase: session.child.phase,
+            hostExecutionChild: { generation: session.child.generation, fence: session.child.fence }
           }
         : {}),
-      ...projection.summary,
+      ...projected,
       ...(record?.rewind?.phase === 'prepared' || record?.rewind?.phase === 'provider-succeeded'
         ? { rewindBlockedReason: 'outcome-unknown' as const }
         : {}),
@@ -310,6 +310,41 @@ export class StructuredAgentSessionStatusFeed {
     }
   }
 
+  private projectionFor(
+    journal: AgentSessionJournal,
+    record: AgentSessionRecord | null
+  ): StructuredAgentSessionStatusState {
+    // An unreadable journal projects as "no turn": the chat itself shows the reset.
+    const cursor = journal.cursor()
+    const readOnly = journal.isReadOnly
+    // The conversation's fence, which a child's end moves: its unanswered sends stop counting.
+    const fence = record?.lease.runtimeFence
+    let projection = this.journalProjections.get(journal)
+    if (
+      !projection ||
+      projection.epoch !== cursor.epoch ||
+      projection.sequence !== cursor.sequence ||
+      projection.readOnly !== readOnly ||
+      projection.fence !== fence
+    ) {
+      // A journalled submission bumps `lastSequence`, so the send-time working
+      // signal reaches the cache; the lease fence does not, hence the extra key.
+      const snapshot = readOnly ? null : journal.snapshot()
+      projection = {
+        ...cursor,
+        readOnly,
+        fence,
+        state: projectStructuredAgentSessionStatusState(
+          snapshot?.items ?? [],
+          snapshot?.submissions ?? [],
+          fence
+        )
+      }
+      this.journalProjections.set(journal, projection)
+    }
+    return projection.state
+  }
+
   /** A failing sink must never cost the subscribers their status event. */
   private sink(
     summary: AgentSessionStatusSummary,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-recency.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-recency.test.ts
index cf9089326671..cb8b3d7d7c53 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-recency.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-recency.test.ts
@@ -63,7 +63,15 @@ async function openSession() {
   const roster: { tasks: AgentSessionBackgroundTask[] } = { tasks: [] }
   const server = new AgentHookServer()
   const feed = new StructuredAgentSessionStatusFeed({
-    sessions: new Map([[SESSION, indexedStatusFeedSession({ journal, hasProviderChild: true })]]),
+    sessions: new Map([
+      [
+        SESSION,
+        indexedStatusFeedSession({
+          journal,
+          child: { phase: 'ready', generation: 'child-1', fence: 1 }
+        })
+      ]
+    ]),
     getRecord: () => null,
     now: () => 1,
     readBackgroundTasks: () => ({ state: 'monitoring', tasks: roster.tasks }),
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.ts
index 0b54ea7c4309..f600d6dd9bba 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.ts
@@ -58,6 +58,10 @@ export class AgentSessionSubscribers {
     return this.activityBySession.size
   }
 
+  subscriberCountForTests(sessionId: string): number {
+    return this.bySession.get(sessionId)?.size ?? 0
+  }
+
   open(input: {
     id: string
     sessionId: string
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-surface-lifetime.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-surface-lifetime.test.ts
index 25c95b48dbec..b04a9b3d820a 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-surface-lifetime.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-surface-lifetime.test.ts
@@ -1,7 +1,8 @@
-// The lifetime of a provider child, from the surfaces that hold the session.
+// The lifetime of a provider child, against the real host rather than a double.
 //
-// Two leaks meet here and each has to be tested against the real host, not a double: a chat that
-// closes without stopping its app-server, and a launch that starts one for every record on disk.
+// Two leaks meet here: a chat that closes without stopping its app-server, and a launch that
+// starts one for every record on disk. A view never starts or keeps a child; work starts one, the
+// idle sweep stops it, and an exit is settled and left for the next send.
 
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -16,7 +17,6 @@ import type {
   AgentSessionMutationEnvelope,
   AgentSessionSubscribeEvent
 } from '../../../shared/agent-session-wire'
-import { AGENT_SESSION_UNATTACHED_REFUSAL_CODE } from '../../../shared/structured-agent-session-read-refusal'
 import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import {
   AgentSessionAcquisitionRootExitObservedError,
@@ -24,7 +24,7 @@ import {
 } from './structured-agent-session-adapter'
 import type { StructuredAgentSessionEventSink } from './structured-agent-session-event-sink'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
-import { unexpectedProviderExitOutcome } from './structured-agent-session-dead-generation-settlement'
+import { abandonStructuredAgentSessionHost } from './structured-agent-session-host-test-abandon'
 import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record'
 import type { StructuredAgentSessionStatusSink } from './structured-agent-session-status-feed'
 import {
@@ -36,11 +36,16 @@ import {
   hostTestOperationId,
   resetHostTestOperationIds
 } from './structured-agent-session-host-test-data'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
+
+const UNEXPECTED_PROVIDER_EXIT_OUTCOME =
+  'Codex stopped while this response was in progress. You can continue in this conversation.'
 
 const CALLER = { callerKey: 'client-1' }
-const SURFACE = 'desktop-chat:1'
-/** Short enough to keep the suite fast, long enough that an eviction is a decision and not a race. */
-const GRACE_MS = 5
+/** Short enough to keep the suite fast; the host clock below decides what is idle. */
+const SWEEP_MS = 5
+const IDLE_MS = 1_000
 
 let root: string
 let store: AgentSessionRecordStore
@@ -51,6 +56,7 @@ let dispatch: Mock<StructuredAgentSessionAdapter['dispatch']>
 let sink: StructuredAgentSessionEventSink | null
 let hostErrors: unknown[]
 let statusSink: StructuredAgentSessionStatusSink
+let clock: number
 function adapter(): StructuredAgentSessionAdapter {
   return {
     acquire,
@@ -72,8 +78,8 @@ function openHost(
     journalRoot: root,
     claimKeyId: 'key-1',
     mintSpawnToken: () => `spawn-${acquire.mock.calls.length}`,
-    releaseGraceMs: GRACE_MS,
-    now: () => NOW,
+    idleSweep: { intervalMs: SWEEP_MS, idleMs: IDLE_MS },
+    now: () => clock,
     onEventSinkError: ({ error }) => hostErrors.push(error),
     statusSink,
     ...(probeOwner ? { probeOwner } : {})
@@ -93,6 +99,12 @@ async function attach(): Promise<void> {
   expect(await host.attach(CALLER, hostTestAttachParams(null))).toMatchObject({ ok: true })
 }
 
+/** What a send's delivery or `agentSession.ensure` does: attach at the record's current fence. */
+async function startAgent(): Promise<void> {
+  const fence = store.getRecord(SESSION)?.lease.runtimeFence ?? null
+  expect(await host.attach(CALLER, hostTestAttachParams(fence))).toMatchObject({ ok: true })
+}
+
 function envelope(method: string, fields: Record<string, unknown>): AgentSessionMutationEnvelope {
   return {
     sessionId: SESSION,
@@ -113,7 +125,7 @@ function emitTurnLifecycle(state: 'running' | 'completed', ordinal: number): voi
   )
 }
 
-/** Eviction is a sequence, not an event: the child stops first and the session is forgotten last. */
+/** The sweep stops the child first and closes the conversation last. */
 function waitForEviction(): Promise<void> {
   return vi.waitFor(() => {
     expect(closeSession).toHaveBeenCalledWith(SESSION)
@@ -121,9 +133,9 @@ function waitForEviction(): Promise<void> {
   })
 }
 
-/** Long enough for several grace windows to elapse, so "not evicted" means the clock declined. */
-function waitOutSeveralGraceWindows(): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, GRACE_MS * 20))
+/** Long enough for many sweep ticks, so "not stopped" means the sweep declined. */
+function waitOutSeveralSweeps(): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, SWEEP_MS * 20))
 }
 
 /** Fails the next eviction at `drain-published`, which leaves the session indexed for a retry. */
@@ -189,6 +201,7 @@ beforeEach(async () => {
   resetHostTestOperationIds()
   sink = null
   hostErrors = []
+  clock = NOW
   statusSink = { publish: vi.fn(), forget: vi.fn() }
   let generation = 0
   acquire = vi.fn(async ({ fence, spawnToken, events }) => {
@@ -208,7 +221,12 @@ beforeEach(async () => {
     }
   })
   closeSession = vi.fn(async () => true)
-  dispatch = vi.fn(async () => ({ state: 'rejected' as const, reason: 'unused' }))
+  dispatch = vi.fn(async () => ({
+    state: 'rejected' as const,
+    ...agentSessionFailureWords(agentSessionFailureFact('providerRejected'), {
+      surface: 'rejection'
+    })
+  }))
   store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
   openHost()
 })
@@ -219,13 +237,13 @@ afterEach(async () => {
 })
 
 describe('a chat that closes', () => {
-  it('releases the provider child it was holding', async () => {
+  it('stops the provider child it started', async () => {
     await attach()
-    await host.hold(SESSION, SURFACE)
 
-    host.release(SESSION, SURFACE)
+    await host.close(SESSION)
 
-    await waitForEviction()
+    expect(closeSession).toHaveBeenCalledWith(SESSION)
+    expect(host.hasSession(SESSION)).toBe(false)
     expect(hostErrors).toEqual([])
     // The record and its journal stay; only the process and the claim on it go.
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
@@ -235,49 +253,24 @@ describe('a chat that closes', () => {
     })
   })
 
-  it('keeps the child while another surface still holds the session', async () => {
-    await attach()
-    await host.hold(SESSION, SURFACE)
-    await host.hold(SESSION, 'paired-phone:1')
-
-    host.release(SESSION, SURFACE)
-    await waitOutSeveralGraceWindows()
-
-    expect(closeSession).not.toHaveBeenCalled()
-    expect(host.hasSession(SESSION)).toBe(true)
-  })
-
   // The pane outlives the close by a few frames — a workspace delete closes the chats inside it
-  // while their panes are still mounted — so whatever a read raises in that window is what the user
-  // sees. This is the code the client narrows on to keep that window off the pane; a host that
-  // starts raising a different one there puts the red error back.
-  it('answers a read from the pane that outlived it with the code the client treats as transitional', async () => {
+  // while their panes are still mounted. A read in that window reopens the conversation as a cache
+  // and is answered, never refused; it starts nothing.
+  it('answers a read from the pane that outlived it without starting a child', async () => {
     await attach()
-    await host.hold(SESSION, SURFACE)
 
     await host.close(SESSION)
-
     expect(host.hasSession(SESSION)).toBe(false)
-    expect(() => host.history({ sessionId: SESSION, direction: 'tail' })).toThrow(
-      AGENT_SESSION_UNATTACHED_REFUSAL_CODE
-    )
-    expect(() =>
-      host.subscribe({ id: 'sub-1', sessionId: SESSION, emit: () => undefined })
-    ).toThrow(AGENT_SESSION_UNATTACHED_REFUSAL_CODE)
-  })
-
-  it('does not lose the session to a release the client sent twice', async () => {
-    await attach()
-    await host.hold(SESSION, SURFACE)
-    await host.hold(SESSION, 'paired-phone:1')
-
-    // A retried release must retire ONE holder, which is what a set gets right and a count does not.
-    host.release(SESSION, SURFACE)
-    host.release(SESSION, SURFACE)
-    await waitOutSeveralGraceWindows()
 
-    expect(closeSession).not.toHaveBeenCalled()
-    expect(host.hasSession(SESSION)).toBe(true)
+    expect((await host.history({ sessionId: SESSION, direction: 'tail' })).ok).toBe(true)
+    const unsubscribe = await host.subscribe({
+      id: 'sub-1',
+      sessionId: SESSION,
+      emit: () => undefined
+    })
+    unsubscribe()
+    expect(acquire).toHaveBeenCalledOnce()
+    expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
   })
 
   it('answers a compatibility wait with what eviction recorded', async () => {
@@ -295,6 +288,8 @@ describe('a chat that closes', () => {
     if (!result.ok) {
       throw new Error('send was refused')
     }
+    // Handed over first: a message still queued at close is rejected as never sent instead.
+    await vi.waitFor(() => expect(dispatch).toHaveBeenCalled())
     const settlement = host.waitForSendSettlement(SESSION, result.value.clientMessageId)
 
     await host.close(SESSION)
@@ -307,7 +302,7 @@ describe('a chat that closes', () => {
     })
   })
 
-  it('retries teardown after journal close loses its result', async () => {
+  it('keeps the stop it made when the journal close loses its result', async () => {
     await attach()
     const session = host['sessions'].get(SESSION)
     expect(session).toBeDefined()
@@ -319,27 +314,16 @@ describe('a chat that closes', () => {
       })
       .mockImplementation(closeJournal)
 
-    await expect(host.close(SESSION)).rejects.toMatchObject({
-      step: 'forget-session',
-      cause: expect.objectContaining({ message: 'journal close result lost' })
-    })
-    expect(host.hasSession(SESSION)).toBe(true)
-    expect(host['sessions'].get(SESSION)?.hasProviderChild).toBe(false)
+    // The child is stopped and the lease released before the handle closes; the entry is dropped
+    // before that close, so a lost result leaves no closing handle for a reader to find.
+    await expect(host.close(SESSION)).rejects.toThrow('journal close result lost')
+    expect(host.hasSession(SESSION)).toBe(false)
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
       claimStatus: 'released',
       ownerProcess: null
     })
-    expect(statusSink.forget).toHaveBeenCalledWith({
-      kind: 'structured-session',
-      sessionId: SESSION,
-      executionHostId: 'local',
-      wslDistro: null,
-      workspaceId: 'workspace-1',
-      workspaceKind: 'git-worktree'
-    })
 
     await expect(host.close(SESSION)).resolves.toBeUndefined()
-    expect(host.hasSession(SESSION)).toBe(false)
     expect(closeSession).toHaveBeenCalledOnce()
   })
 
@@ -362,7 +346,7 @@ describe('a chat that closes', () => {
 
     await expect(host.close(SESSION)).rejects.toMatchObject({ step: 'drain-published' })
     // The child is proven gone, but the wind-down it owes is not done: nothing settled, no release.
-    expect(session!.hasProviderChild).toBe(false)
+    expect(session!.child).toBeNull()
     expect(store.getRecord(SESSION)?.lease.claimStatus).not.toBe('released')
 
     await expect(host.close(SESSION)).resolves.toBeUndefined()
@@ -376,31 +360,31 @@ describe('a chat that closes', () => {
 })
 
 describe('a session with a turn in flight', () => {
-  it('is not evicted while the turn runs, and is once it ends', async () => {
+  it('is not stopped while the turn runs, and is once it ends and idles', async () => {
     await attach()
-    await host.hold(SESSION, SURFACE)
     emitTurnLifecycle('running', 1)
     await host.flushStreamedEvents(SESSION)
 
-    host.release(SESSION, SURFACE)
-    await waitOutSeveralGraceWindows()
+    clock += IDLE_MS
+    await waitOutSeveralSweeps()
 
     expect(closeSession).not.toHaveBeenCalled()
     expect(host.hasSession(SESSION)).toBe(true)
 
     emitTurnLifecycle('completed', 2)
     await host.flushStreamedEvents(SESSION)
+    clock += IDLE_MS
 
     await waitForEviction()
   })
 
-  // Codex settles an admitted send only on its echo, which may never come; eviction retires it.
-  it('is evicted with an admitted send outstanding once no turn runs', async () => {
+  // Codex settles an admitted send only on its echo, which may never come; the stop retires it.
+  it('is stopped with an admitted send outstanding once no turn runs', async () => {
     await attach()
-    await host.hold(SESSION, SURFACE)
     await sendPending('admitted, never echoed')
+    await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
 
-    host.release(SESSION, SURFACE)
+    clock += IDLE_MS
 
     await waitForEviction()
   })
@@ -410,16 +394,13 @@ describe('startup', () => {
   it('settles an idle absent owner without chat pollution and resumes the same provider identity', async () => {
     await attach()
     const beforeRestart = store.getRecord(SESSION)
-    host['runtimeState'].stopLeaseRenewal()
-    host['holds'].dispose()
-    await host['sessions'].get(SESSION)?.journal.close()
-    host['sessions'].clear()
+    await abandonStructuredAgentSessionHost(host)
 
     store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
     openHost(async () => ({ outcome: 'pid-absent' }))
     await host.restoreReadableSessions()
 
-    const restored = host.history({ sessionId: SESSION, direction: 'tail' })
+    const restored = await host.history({ sessionId: SESSION, direction: 'tail' })
     expect(restored.ok && restored.page.items.some((item) => item.body.kind === 'status')).toBe(
       false
     )
@@ -428,7 +409,7 @@ describe('startup', () => {
       ownerProcess: null
     })
 
-    await host.hold(SESSION, SURFACE)
+    await startAgent()
     expect(store.getRecord(SESSION)?.providerHandleChain.at(-1)?.handle).toEqual(
       beforeRestart?.providerHandleChain.at(-1)?.handle
     )
@@ -446,16 +427,23 @@ describe('startup', () => {
     expect(host.listSessionTabs()).toEqual([
       { sessionId: SESSION, workspaceId: 'workspace-1', agent: 'codex' }
     ])
-    expect(host.history({ sessionId: SESSION, direction: 'tail' }).ok).toBe(true)
+    expect((await host.history({ sessionId: SESSION, direction: 'tail' })).ok).toBe(true)
     expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
   })
 
-  it('gives the child back to a chat a surface actually opens', async () => {
+  it('gives the child back for work, never for a read', async () => {
     await attach()
     await reboot()
     await host.restoreReadableSessions()
 
-    await host.hold(SESSION, SURFACE)
+    const unsubscribe = await host.subscribe({
+      id: 'viewer-1',
+      sessionId: SESSION,
+      emit: () => undefined
+    })
+    expect(acquire).not.toHaveBeenCalled()
+    await startAgent()
+    unsubscribe()
 
     expect(acquire).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
@@ -466,16 +454,15 @@ describe('startup', () => {
   })
 })
 
-describe('a session evicted and opened again', () => {
+describe('a session closed and started again', () => {
   it('publishes provider events to the reattached chat', async () => {
     await attach()
-    await host.hold(SESSION, SURFACE)
-    host.release(SESSION, SURFACE)
-    await waitForEviction()
+    await host.close(SESSION)
+    expect(host.hasSession(SESSION)).toBe(false)
 
-    await host.hold(SESSION, 'desktop-chat:2')
+    await startAgent()
     const events: AgentSessionSubscribeEvent[] = []
-    const unsubscribe = host.subscribe({
+    const unsubscribe = await host.subscribe({
       id: 'subscriber-1',
       sessionId: SESSION,
       emit: (event) => events.push(event)
@@ -492,6 +479,12 @@ describe('a session evicted and opened again', () => {
   })
 })
 
+async function submissionState(clientMessageId: string): Promise<string | undefined> {
+  return (await host.journalSnapshot(SESSION)).submissions.find(
+    (entry) => entry.clientMessageId === clientMessageId
+  )?.dispatchState
+}
+
 describe('an unexpected provider exit', () => {
   it('publishes terminal settlement to a waiting older client', async () => {
     await attach()
@@ -508,6 +501,8 @@ describe('an unexpected provider exit', () => {
     if (!result.ok) {
       throw new Error('send was refused')
     }
+    // Accepted first; the exit must meet a message the provider was handed.
+    await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
     const settlement = host.waitForSendSettlement(SESSION, result.value.clientMessageId)
     const exitedFence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
 
@@ -531,7 +526,7 @@ describe('an unexpected provider exit', () => {
     await failJournalSinkUntilReleased()
 
     expect(dispatch).not.toHaveBeenCalled()
-    const history = host.history({ sessionId: SESSION, direction: 'tail' })
+    const history = await host.history({ sessionId: SESSION, direction: 'tail' })
     expect(
       history.ok &&
         history.page.items.some(
@@ -553,17 +548,18 @@ describe('an unexpected provider exit', () => {
     replaceFailedSink()
   })
 
-  it('releases the exact generation, reacquires outside the queue, and dispatches a new message', async () => {
+  it('releases the exact generation, starts nothing, and the next message starts a child', async () => {
     await attach()
-    await host.hold(SESSION, SURFACE)
     dispatch.mockRejectedValueOnce(new Error('provider delivery became unknown'))
     const unknownBody = hostTestMessage('message with unknown delivery')
+    const unknownEnvelope = envelope('agentSession.send', { body: unknownBody })
     await expect(
-      host.send(CALLER, {
-        envelope: envelope('agentSession.send', { body: unknownBody }),
-        body: unknownBody
-      })
-    ).resolves.toMatchObject({ ok: true, value: { submission: { dispatchState: 'unknown' } } })
+      host.send(CALLER, { envelope: unknownEnvelope, body: unknownBody })
+    ).resolves.toMatchObject({ ok: true, value: { submission: { dispatchState: 'pending' } } })
+    // Accepted, then handed over by the delivery loop, where the thrown dispatch becomes doubt.
+    await vi.waitFor(async () =>
+      expect(await submissionState(unknownEnvelope.clientOperationId)).toBe('unknown')
+    )
     const exitedFence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
 
     await host.handleAdapterEvent({
@@ -575,32 +571,42 @@ describe('an unexpected provider exit', () => {
       acquisitionGeneration: 'generation-1'
     })
 
-    const recoveredHistory = host.history({ sessionId: SESSION, direction: 'tail' })
+    const recoveredHistory = await host.history({ sessionId: SESSION, direction: 'tail' })
     expect(
       recoveredHistory.ok &&
         hasUnansweredStructuredAgentSessionDispatch(recoveredHistory.page.submissions)
     ).toBe(false)
-    expect(acquire).toHaveBeenCalledTimes(2)
+    // No respawn: the exit is settled and shown, and the conversation waits for work.
+    expect(acquire).toHaveBeenCalledOnce()
     expect(dispatch).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
-      claimStatus: 'live',
-      runtimeFence: exitedFence + 2,
-      ownerProcess: { pid: 4242 }
+      claimStatus: 'released',
+      runtimeFence: exitedFence + 1
     })
     dispatch.mockResolvedValueOnce({
       state: 'accepted',
       providerIdentity: { provider: 'codex', threadId: THREAD, turnId: 'turn-next', ordinal: 1 }
     })
     const body = hostTestMessage('a distinct next message')
-    await expect(
-      host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
-    ).resolves.toMatchObject({ ok: true, value: { submission: { dispatchState: 'accepted' } } })
+    const nextEnvelope = envelope('agentSession.send', { body })
+    await expect(host.send(CALLER, { envelope: nextEnvelope, body })).resolves.toMatchObject({
+      ok: true,
+      value: { submission: { dispatchState: 'pending' } }
+    })
+    await vi.waitFor(async () =>
+      expect(await submissionState(nextEnvelope.clientOperationId)).toBe('accepted')
+    )
+    expect(acquire).toHaveBeenCalledTimes(2)
     expect(dispatch).toHaveBeenCalledTimes(2)
   })
 
-  it('does not reacquire for a subscription-only hold or a stale child generation', async () => {
+  it('does not reacquire for a live reader or a stale child generation', async () => {
     await attach()
-    await host.hold(SESSION, 'subscriber-1', { resume: false })
+    const unsubscribe = await host.subscribe({
+      id: 'subscriber-1',
+      sessionId: SESSION,
+      emit: () => undefined
+    })
     const exitedFence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
 
     await host.handleAdapterEvent({
@@ -628,11 +634,11 @@ describe('an unexpected provider exit', () => {
       runtimeFence: exitedFence + 1,
       deathEvidence: { kind: 'exit-observed' }
     })
+    unsubscribe()
   })
 
   it('keeps a requested close out of recovery', async () => {
     await attach()
-    await host.hold(SESSION, SURFACE)
     const fence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
 
     await host.handleAdapterEvent({
@@ -650,7 +656,6 @@ describe('an unexpected provider exit', () => {
 
   it('recovers after a failed lifecycle barrier and dispatches a distinct next message', async () => {
     await attach()
-    await host.hold(SESSION, SURFACE)
     dispatch.mockRejectedValueOnce(new Error('provider delivery became unknown'))
     const unknownBody = hostTestMessage('message with unknown delivery')
     const unknownParams = {
@@ -659,8 +664,11 @@ describe('an unexpected provider exit', () => {
     }
     await expect(host.send(CALLER, unknownParams)).resolves.toMatchObject({
       ok: true,
-      value: { submission: { dispatchState: 'unknown' } }
+      value: { submission: { dispatchState: 'pending' } }
     })
+    await vi.waitFor(async () =>
+      expect(await submissionState(unknownParams.envelope.clientOperationId)).toBe('unknown')
+    )
     const runtimeState = (
       host as unknown as {
         runtimeState: { lifecycleBarrier: () => Promise<{ ok: false; error: Error }> }
@@ -682,21 +690,20 @@ describe('an unexpected provider exit', () => {
     })
 
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
-      claimStatus: 'live',
-      runtimeFence: exitedFence + 2,
-      ownerProcess: { pid: 4242 }
+      claimStatus: 'released',
+      runtimeFence: exitedFence + 1
     })
-    expect(acquire).toHaveBeenCalledTimes(2)
+    expect(acquire).toHaveBeenCalledOnce()
     expect(dispatch).toHaveBeenCalledOnce()
     expect(hostErrors).toContainEqual(expect.objectContaining({ message: 'journal failed' }))
-    const history = host.history({ sessionId: SESSION, direction: 'tail' })
+    const history = await host.history({ sessionId: SESSION, direction: 'tail' })
     expect(history.ok && history.page.submissions[0]?.dispatchState).toBe('unknown')
     // A send whose delivery outcome is unknown IS work in progress, so the reassuring outcome is
-    // written — carrying the cause, and never the old bare `Provider exited: <reason>` row.
+    // written — its failure fact beside it, and never the old bare `Provider exited: <reason>` row.
     const statuses = history.ok
       ? history.page.items.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : []))
       : []
-    expect(statuses).toEqual([unexpectedProviderExitOutcome('provider exited')])
+    expect(statuses).toEqual([UNEXPECTED_PROVIDER_EXIT_OUTCOME])
     expect(statuses.some((text) => text.startsWith('Provider exited'))).toBe(false)
 
     dispatch.mockResolvedValueOnce({
@@ -704,15 +711,19 @@ describe('an unexpected provider exit', () => {
       providerIdentity: { provider: 'codex', threadId: THREAD, turnId: 'turn-next', ordinal: 1 }
     })
     const body = hostTestMessage('a distinct next message after failed-barrier recovery')
-    await expect(
-      host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
-    ).resolves.toMatchObject({ ok: true, value: { submission: { dispatchState: 'accepted' } } })
+    const nextEnvelope = envelope('agentSession.send', { body })
+    await expect(host.send(CALLER, { envelope: nextEnvelope, body })).resolves.toMatchObject({
+      ok: true,
+      value: { submission: { dispatchState: 'pending' } }
+    })
+    await vi.waitFor(async () =>
+      expect(await submissionState(nextEnvelope.clientOperationId)).toBe('accepted')
+    )
     expect(dispatch).toHaveBeenCalledTimes(2)
   })
 
   it('releases the lease when the exit settlement cannot be written, and the next send settles the turn it left', async () => {
     await attach()
-    await host.hold(SESSION, SURFACE)
     emitTurnLifecycle('running', 1)
     await host.flushStreamedEvents(SESSION)
     const runtimeState = (
@@ -733,10 +744,10 @@ describe('an unexpected provider exit', () => {
       }
     ).sessions.get(SESSION)
     expect(session).toBeDefined()
-    // The dead generation's handle never accepts its settlement.
-    vi.spyOn(session!.journal, 'appendLifecycleBatch').mockRejectedValue(
-      new Error('settlement still unavailable')
-    )
+    // The conversation's one handle refuses every write of the exit's settlement.
+    const refusing = vi
+      .spyOn(session!.journal, 'appendLifecycleBatch')
+      .mockRejectedValue(new Error('settlement still unavailable'))
     const exitedFence = store.getRecord(SESSION)?.lease.runtimeFence ?? 0
 
     await host.handleAdapterEvent({
@@ -756,26 +767,39 @@ describe('an unexpected provider exit', () => {
       runtimeFence: exitedFence + 1,
       deathEvidence: { kind: 'exit-observed', detail: 'provider exited', observedAt: NOW }
     })
+    // The retry recording the exit queues is refused too; once the journal writes again, the next
+    // acquire re-derives it.
+    await host.collaboratorsForTests().serialize(SESSION, async () => {})
+    refusing.mockRestore()
 
     dispatch.mockResolvedValueOnce({
       state: 'accepted',
       providerIdentity: { provider: 'codex', threadId: THREAD, turnId: 'turn-next', ordinal: 1 }
     })
     const body = hostTestMessage('sent after a settlement that never landed')
-    await expect(
-      host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
-    ).resolves.toMatchObject({ ok: true, value: { submission: { dispatchState: 'accepted' } } })
+    const sentEnvelope = envelope('agentSession.send', { body })
+    await expect(host.send(CALLER, { envelope: sentEnvelope, body })).resolves.toMatchObject({
+      ok: true,
+      value: { submission: { dispatchState: 'pending' } }
+    })
+    await vi.waitFor(async () =>
+      expect(await submissionState(sentEnvelope.clientOperationId)).toBe('accepted')
+    )
     expect(acquire).toHaveBeenCalledTimes(2)
     // The new child's acquire settled the turn from the release's evidence: ended at the exit's
-    // receipt, with the exit's own reason in the row.
-    const history = host.history({ sessionId: SESSION, direction: 'tail' })
+    // receipt. The evidence is Orca's log text, so the row says only that the provider stopped.
+    const history = await host.history({ sessionId: SESSION, direction: 'tail' })
     const items = history.ok ? history.page.items : []
     expect(items.map((item) => readAgentJournalTurn(item.body)).filter(Boolean)).toContainEqual(
       expect.objectContaining({ turnId: 'turn-1', state: 'interrupted', completedAt: NOW })
     )
-    expect(
-      items.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : []))
-    ).toContain(unexpectedProviderExitOutcome('provider exited'))
+    const statuses = items.flatMap((item) => (item.body.kind === 'status' ? [item.body] : []))
+    expect(statuses).toContainEqual({
+      kind: 'status',
+      text: UNEXPECTED_PROVIDER_EXIT_OUTCOME,
+      failure: { kind: 'providerExited' }
+    })
+    expect(statuses.map((status) => status.text).join('\n')).not.toContain('provider exited')
   })
 })
 
@@ -790,7 +814,7 @@ describe('a quit over an eviction that never got its retry', () => {
     failNextDrain()
 
     await expect(host.close(SESSION)).rejects.toMatchObject({ step: 'drain-published' })
-    expect(host['sessions'].get(SESSION)?.hasProviderChild).toBe(false)
+    expect(host['sessions'].get(SESSION)?.child).toBeNull()
     expect(store.getRecord(SESSION)?.lease.claimStatus).not.toBe('released')
 
     await host.flushAllStreamedEvents()
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.test.ts
index 3d4e84919861..f490eb2e9cdf 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.test.ts
@@ -125,7 +125,11 @@ describe('performThreadGoalChange', () => {
 
     expect(result).toEqual({
       ok: false,
-      refusal: { code: 'agent_session_operation_invalid', message: 'goals feature is disabled' }
+      refusal: {
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'providerRejected' },
+        message: 'goals feature is disabled'
+      }
     })
     expect(journal.snapshot().items).toEqual([])
   })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.ts
index 3f63679d55fb..639daf6ab30b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.ts
@@ -1,6 +1,7 @@
 // `agentSession.threadGoal`: change the provider thread's goal through the same
 // admission, ledger and journal path every other session mutation takes.
 
+import { refuse, type AgentSessionRefusalReason } from '../../../shared/agent-session-wire-refusals'
 import type {
   AgentJournalItemIdentity,
   AgentJournalThreadGoal
@@ -13,8 +14,11 @@ import type {
 import type { MutationPlan } from './structured-agent-session-mutation-plans'
 import type { AgentSessionTurnContext, TurnOutcome } from './structured-agent-session-turns'
 
-function refused(message: string): TurnOutcome<AgentSessionThreadGoalResult> {
-  return { ok: false, refusal: { code: 'agent_session_operation_invalid', message } }
+function refused(
+  reason: AgentSessionRefusalReason<'agent_session_operation_invalid'>,
+  message: string
+): TurnOutcome<AgentSessionThreadGoalResult> {
+  return { ok: false, refusal: refuse('agent_session_operation_invalid', { reason }, message) }
 }
 
 /** Keyed by the operation, so a replayed set upserts its one objective row. */
@@ -44,7 +48,7 @@ export async function performThreadGoalChange(
   input: { clientOperationId: string; change: AgentSessionThreadGoalChange }
 ): Promise<TurnOutcome<AgentSessionThreadGoalResult>> {
   if (!ctx.adapter.changeThreadGoal || !ctx.adapter.supportsThreadGoal?.(ctx.sessionId)) {
-    return refused('Goals are unavailable for this chat session.')
+    return refused('goalsUnsupported', 'Goals are unavailable for this chat session.')
   }
   const { change } = input
   const identity = objectiveIdentity(input.clientOperationId)
@@ -89,7 +93,7 @@ export async function performThreadGoalChange(
   }
   if (!result.ok) {
     await withdrawObjective()
-    return refused(result.rejected)
+    return refused('providerRejected', result.rejected)
   }
   return { ok: true, value: { change: change.kind } }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.test.ts
index c0e652724af8..93d4a54cdc92 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.test.ts
@@ -1,6 +1,18 @@
 import { describe, expect, it, vi } from 'vitest'
-import type { AgentJournalTurnLifecycle } from '../../../shared/agent-session-journal-types'
+import type {
+  AgentJournalRenderItem,
+  AgentJournalSubmission,
+  AgentJournalTurnLifecycle
+} from '../../../shared/agent-session-journal-types'
+import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
 import type { AgentSessionTurnCompletionEvent } from '../../../shared/agent-session-wire'
+import {
+  DISPATCH_REJECTED_CANCELLED,
+  DISPATCH_REJECTED_HOST_RESTARTED,
+  DISPATCH_REJECTED_NOT_DELIVERED,
+  DISPATCH_REJECTED_PROVIDER_CLOSED
+} from '../../../shared/structured-agent-session-dispatch-rejection'
+import { projectStructuredAgentSessionStatusState } from '../../../shared/structured-agent-session-projection'
 import { StructuredAgentSessionTurnCompletionFeed } from './structured-agent-session-turn-completion-feed'
 
 const LOCATION = {
@@ -10,6 +22,8 @@ const LOCATION = {
   workspaceKind: 'git-worktree'
 } as const
 
+const START_FAILURE = 'Claude is not signed in.'
+
 function turn(
   turnId: string,
   state: AgentJournalTurnLifecycle['state'],
@@ -18,33 +32,102 @@ function turn(
   return { turnId, state, ...(outcome ? { outcome } : {}) }
 }
 
+function turnItem(lifecycle: AgentJournalTurnLifecycle, sequence: number): AgentJournalRenderItem {
+  return {
+    itemId: `codex:turn:${lifecycle.turnId}`,
+    revision: 1,
+    sequence,
+    observedAt: sequence,
+    body: { kind: 'turn', ...lifecycle }
+  }
+}
+
+function userEntry(clientMessageId: string, sequence: number): AgentJournalRenderItem {
+  return {
+    itemId: agentJournalSubmissionKey(clientMessageId),
+    revision: 0,
+    sequence,
+    observedAt: sequence,
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: clientMessageId }] }
+  }
+}
+
+function sent(
+  clientMessageId: string,
+  fields: Partial<AgentJournalSubmission> & Pick<AgentJournalSubmission, 'dispatchState'>
+): AgentJournalSubmission {
+  return {
+    clientMessageId,
+    fence: 1,
+    payloadFingerprint: clientMessageId,
+    providerItemId: null,
+    reason: null,
+    submittedAt: 10,
+    resolvedAt: 20,
+    handoverRecorded: true,
+    ...fields
+  }
+}
+
+const pending = (clientMessageId: string, fence = 1) =>
+  sent(clientMessageId, { dispatchState: 'pending', fence, handedOverAt: 11, resolvedAt: null })
+const refused = (clientMessageId: string, reason = START_FAILURE) =>
+  sent(clientMessageId, { dispatchState: 'rejected', reason })
+
 function harness(): {
   feed: StructuredAgentSessionTurnCompletionFeed
   setTurn: (next: AgentJournalTurnLifecycle | null) => void
+  setJournal: (
+    items: AgentJournalRenderItem[],
+    submissions: AgentJournalSubmission[],
+    fence?: number
+  ) => void
   setCursor: (next: { epoch: string; sequence: number }) => void
   observe: () => void
   events: AgentSessionTurnCompletionEvent[]
+  outcomes: () => [string, string][]
+  /** Whether each completion said the user is being asked something. */
+  awaitingUser: () => boolean[]
   listen: () => () => void
 } {
-  let current: AgentJournalTurnLifecycle | null = null
+  let items: AgentJournalRenderItem[] = []
+  let submissions: AgentJournalSubmission[] = []
+  let fence: number | undefined
   let cursor = { epoch: 'epoch-1', sequence: 0 }
-  const journal = {
-    newestTurn: () => current,
-    cursor: () => cursor
-  }
+  const journal = { cursor: () => cursor }
   const sessions = new Map([['session-1', { journal, params: { location: LOCATION } }]])
-  const feed = new StructuredAgentSessionTurnCompletionFeed({ sessions, now: () => 1_700 })
+  const feed = new StructuredAgentSessionTurnCompletionFeed({
+    sessions,
+    now: () => 1_700,
+    // The status feed's projection, computed as it computes it.
+    readStatusState: () => projectStructuredAgentSessionStatusState(items, submissions, fence)
+  })
   const events: AgentSessionTurnCompletionEvent[] = []
   return {
     feed,
     setTurn: (next) => {
-      current = next
+      items = next ? [turnItem(next, 1)] : []
+      submissions = []
+    },
+    setJournal: (nextItems, nextSubmissions, nextFence) => {
+      items = nextItems
+      submissions = nextSubmissions
+      fence = nextFence
+      cursor = { ...cursor, sequence: cursor.sequence + 1 }
     },
     setCursor: (next) => {
       cursor = next
     },
     observe: () => feed.observe('session-1'),
     events,
+    outcomes: () =>
+      events.flatMap((event): [string, string][] =>
+        event.type === 'completion' ? [[event.completion.turnId, event.completion.outcome]] : []
+      ),
+    awaitingUser: () =>
+      events.flatMap((event) =>
+        event.type === 'completion' ? [event.completion.awaitingUser === true] : []
+      ),
     listen: () => feed.subscribe({ id: 'sub', emit: (event) => events.push(event) })
   }
 }
@@ -59,7 +142,8 @@ describe('StructuredAgentSessionTurnCompletionFeed', () => {
     h.setTurn(turn('turn-1', 'completed', 'success'))
     h.setCursor({ epoch: 'epoch-1', sequence: 2 })
     h.observe()
-    expect(h.events).toEqual([
+    // Strict: an idle settle omits `awaitingUser` rather than sending it undefined.
+    expect(h.events).toStrictEqual([
       {
         type: 'completion',
         completion: {
@@ -261,3 +345,318 @@ describe('StructuredAgentSessionTurnCompletionFeed', () => {
     expect(emit).not.toHaveBeenCalled()
   })
 })
+
+describe('a request the agent or its start refused', () => {
+  const M1 = agentJournalSubmissionKey('m1')
+  const M2 = agentJournalSubmissionKey('m2')
+  const M3 = agentJournalSubmissionKey('m3')
+  const settledTurn = turnItem(turn('t1', 'completed', 'success'), 2)
+
+  /** A session whose first turn succeeded, as the feed saw it happen. */
+  function afterSuccessfulTurn() {
+    const h = harness()
+    h.listen()
+    h.setJournal([userEntry('m1', 1), turnItem(turn('t1', 'running'), 2)], [])
+    h.observe()
+    h.setJournal([userEntry('m1', 1), settledTurn], [sent('m1', { dispatchState: 'accepted' })])
+    h.observe()
+    expect(h.outcomes()).toEqual([['t1', 'success']])
+    return h
+  }
+
+  it('notifies failed once when the only send fails to start, named by its item key', () => {
+    const h = harness()
+    h.listen()
+    h.observe()
+    h.setJournal([userEntry('m1', 1)], [pending('m1')])
+    h.observe()
+    h.setJournal([userEntry('m1', 1)], [refused('m1')])
+    h.observe()
+    h.observe()
+    expect(h.events).toEqual([
+      {
+        type: 'completion',
+        completion: {
+          scope: LOCATION,
+          sessionId: 'session-1',
+          turnId: M1,
+          outcome: 'failure',
+          completedAt: 1_700
+        }
+      }
+    ])
+  })
+
+  it('stays silent on a first observation of a send that had already failed', () => {
+    // A restart, reopen or re-attach: the failure is history, not news.
+    const h = harness()
+    h.listen()
+    h.setJournal([userEntry('m1', 1)], [refused('m1')])
+    h.observe()
+    h.observe()
+    expect(h.events).toEqual([])
+  })
+
+  it('re-baselines an epoch replacement that surfaces an older failure', () => {
+    const h = afterSuccessfulTurn()
+    h.setJournal([userEntry('m1', 1)], [refused('m1')])
+    h.setCursor({ epoch: 'epoch-2', sequence: 1 })
+    h.observe()
+    expect(h.outcomes()).toEqual([['t1', 'success']])
+  })
+
+  it.each([
+    DISPATCH_REJECTED_CANCELLED,
+    DISPATCH_REJECTED_HOST_RESTARTED,
+    DISPATCH_REJECTED_PROVIDER_CLOSED,
+    DISPATCH_REJECTED_NOT_DELIVERED
+  ])('never notifies a send %s, alone or after a turn', (reason) => {
+    const alone = harness()
+    alone.listen()
+    alone.observe()
+    alone.setJournal([userEntry('m1', 1)], [pending('m1')])
+    alone.observe()
+    alone.setJournal([userEntry('m1', 1)], [refused('m1', reason)])
+    alone.observe()
+    expect(alone.events).toEqual([])
+
+    // The latest request falls back to the turn already announced, which must not announce again.
+    const h = afterSuccessfulTurn()
+    const accepted = sent('m1', { dispatchState: 'accepted' })
+    h.setJournal([userEntry('m1', 1), settledTurn, userEntry('m2', 3)], [accepted, pending('m2')])
+    h.observe()
+    h.setJournal(
+      [userEntry('m1', 1), settledTurn, userEntry('m2', 3)],
+      [accepted, refused('m2', reason)]
+    )
+    h.observe()
+    expect(h.outcomes()).toEqual([['t1', 'success']])
+  })
+
+  it('never notifies a crash-stranded send that restart reconciliation finds undelivered', () => {
+    const h = afterSuccessfulTurn()
+    const items = [userEntry('m1', 1), settledTurn, userEntry('m2', 3)]
+    const accepted = sent('m1', { dispatchState: 'accepted' })
+    h.setJournal(items, [accepted, sent('m2', { dispatchState: 'unknown', recovered: true })], 2)
+    h.observe()
+    h.setJournal(
+      items,
+      [
+        accepted,
+        sent('m2', {
+          dispatchState: 'rejected',
+          reason: DISPATCH_REJECTED_NOT_DELIVERED,
+          fence: 2,
+          recovered: true
+        })
+      ],
+      2
+    )
+    h.observe()
+    expect(h.outcomes()).toEqual([['t1', 'success']])
+  })
+
+  it('notifies failed, then success, when a failed start is retried and the retry succeeds', () => {
+    const h = harness()
+    h.listen()
+    h.observe()
+    h.setJournal([userEntry('m1', 1)], [refused('m1')])
+    h.observe()
+    h.setJournal([userEntry('m1', 1), userEntry('m2', 2)], [refused('m1'), pending('m2')])
+    h.observe()
+    const accepted = sent('m2', { dispatchState: 'accepted' })
+    h.setJournal(
+      [userEntry('m1', 1), userEntry('m2', 2), turnItem(turn('t2', 'running'), 3)],
+      [refused('m1'), accepted]
+    )
+    h.observe()
+    h.setJournal(
+      [userEntry('m1', 1), userEntry('m2', 2), turnItem(turn('t2', 'completed', 'success'), 3)],
+      [refused('m1'), accepted]
+    )
+    h.observe()
+    expect(h.outcomes()).toEqual([
+      [M1, 'failure'],
+      ['t2', 'success']
+    ])
+  })
+
+  it('notifies each failed start that follows another', () => {
+    const h = harness()
+    h.listen()
+    h.observe()
+    h.setJournal([userEntry('m1', 1)], [refused('m1')])
+    h.observe()
+    h.setJournal([userEntry('m1', 1), userEntry('m2', 2)], [refused('m1'), pending('m2')])
+    h.observe()
+    h.setJournal([userEntry('m1', 1), userEntry('m2', 2)], [refused('m1'), refused('m2')])
+    h.observe()
+    expect(h.outcomes()).toEqual([
+      [M1, 'failure'],
+      [M2, 'failure']
+    ])
+  })
+
+  it.each([
+    ['in one commit', [['m2', 'm3']]],
+    ['oldest first, across commits', [['m2'], ['m3']]],
+    ['newest first, across commits', [['m3'], ['m2']]]
+  ])('notifies once for queued sends one start failure refused %s', (_name, batches) => {
+    const h = afterSuccessfulTurn()
+    const items = [userEntry('m1', 1), settledTurn, userEntry('m2', 3), userEntry('m3', 4)]
+    const accepted = sent('m1', { dispatchState: 'accepted' })
+    const queued = (id: string) => sent(id, { dispatchState: 'pending', resolvedAt: null })
+    const answered = new Set<string>()
+    const submissions = () => [
+      accepted,
+      ...['m2', 'm3'].map((id) => (answered.has(id) ? refused(id) : queued(id)))
+    ]
+    h.setJournal(items, submissions())
+    h.observe()
+    for (const batch of batches) {
+      batch.forEach((id) => answered.add(id))
+      h.setJournal(items, submissions())
+      h.observe()
+    }
+    expect(h.outcomes()).toEqual([
+      ['t1', 'success'],
+      [M3, 'failure']
+    ])
+  })
+
+  it('does not wait on a send left pending at an older fence', () => {
+    const h = harness()
+    h.listen()
+    h.setJournal([userEntry('m1', 1), userEntry('m2', 2)], [pending('m1', 1), pending('m2', 2)], 2)
+    h.observe()
+    h.setJournal([userEntry('m1', 1), userEntry('m2', 2)], [pending('m1', 1), refused('m2')], 2)
+    h.observe()
+    expect(h.outcomes()).toEqual([[M2, 'failure']])
+  })
+})
+
+describe('a request that settles while the user is asked something', () => {
+  const M1 = agentJournalSubmissionKey('m1')
+
+  /** An approval the user has not answered; `agentId` makes it a subagent's. */
+  function approval(
+    itemId: string,
+    sequence: number,
+    state: 'pending' | 'resolved',
+    agentId?: string
+  ): AgentJournalRenderItem {
+    return {
+      itemId,
+      revision: state === 'pending' ? 1 : 2,
+      sequence,
+      observedAt: sequence,
+      ...(agentId ? { agentId } : {}),
+      body: {
+        kind: 'approval',
+        title: 'Run command?',
+        detail: null,
+        options: [{ id: 'yes', label: 'Allow' }],
+        resolution: { state, selectedOptionId: null, resolvedBy: null, resolvedAt: null }
+      }
+    }
+  }
+
+  it('notifies once when the main turn settles while a subagent waits on an approval', () => {
+    const h = harness()
+    h.listen()
+    const user = userEntry('m1', 1)
+    const accepted = [sent('m1', { dispatchState: 'accepted' })]
+    h.setJournal([user, turnItem(turn('t1', 'running'), 2)], accepted)
+    h.observe()
+    h.setJournal(
+      [user, turnItem(turn('t1', 'running'), 2), approval('a1', 3, 'pending', 'child-1')],
+      accepted
+    )
+    h.observe()
+    h.setJournal(
+      [
+        user,
+        turnItem(turn('t1', 'completed', 'success'), 2),
+        approval('a1', 3, 'pending', 'child-1')
+      ],
+      accepted
+    )
+    h.observe()
+    expect(h.outcomes()).toEqual([['t1', 'success']])
+    expect(h.awaitingUser()).toEqual([true])
+
+    // Answering the prompt settles the session idle on the request already announced.
+    h.setJournal(
+      [
+        user,
+        turnItem(turn('t1', 'completed', 'success'), 2),
+        approval('a1', 3, 'resolved', 'child-1')
+      ],
+      accepted
+    )
+    h.observe()
+    expect(h.outcomes()).toEqual([['t1', 'success']])
+  })
+
+  it('notifies a refused send once while a prompt is pending', () => {
+    const h = harness()
+    h.listen()
+    const prompt = approval('a1', 1, 'pending', 'child-1')
+    h.setJournal([prompt, userEntry('m1', 2)], [pending('m1')])
+    h.observe()
+    h.setJournal([prompt, userEntry('m1', 2)], [refused('m1')])
+    h.observe()
+    expect(h.outcomes()).toEqual([[M1, 'failure']])
+    expect(h.awaitingUser()).toEqual([true])
+    h.setJournal([approval('a1', 1, 'resolved', 'child-1'), userEntry('m1', 2)], [refused('m1')])
+    h.observe()
+    expect(h.outcomes()).toEqual([[M1, 'failure']])
+  })
+
+  it('sends nothing while the main turn asks for permission, and one event when it settles', () => {
+    const h = harness()
+    h.listen()
+    const user = userEntry('m1', 1)
+    const accepted = [sent('m1', { dispatchState: 'accepted' })]
+    h.setJournal([user, turnItem(turn('t1', 'running'), 2)], accepted)
+    h.observe()
+    h.setJournal([user, turnItem(turn('t1', 'running'), 2), approval('a1', 3, 'pending')], accepted)
+    h.observe()
+    expect(h.events).toEqual([])
+    h.setJournal(
+      [user, turnItem(turn('t1', 'running'), 2), approval('a1', 3, 'resolved')],
+      accepted
+    )
+    h.observe()
+    h.setJournal(
+      [user, turnItem(turn('t1', 'completed', 'success'), 2), approval('a1', 3, 'resolved')],
+      accepted
+    )
+    h.observe()
+    expect(h.outcomes()).toEqual([['t1', 'success']])
+    // Idle when it settles: the prompt was already answered.
+    expect(h.awaitingUser()).toEqual([false])
+  })
+
+  it('still waits on a queued send the prompt hides, so the queue notifies once', () => {
+    const h = harness()
+    h.listen()
+    const prompt = approval('a1', 3, 'pending', 'child-1')
+    const items = [userEntry('m1', 1), turnItem(turn('t1', 'running'), 2), prompt]
+    const queued = sent('m2', { dispatchState: 'pending', resolvedAt: null })
+    const accepted = sent('m1', { dispatchState: 'accepted' })
+    h.setJournal([...items, userEntry('m2', 4)], [accepted, queued])
+    h.observe()
+    h.setJournal(
+      [
+        userEntry('m1', 1),
+        turnItem(turn('t1', 'completed', 'success'), 2),
+        prompt,
+        userEntry('m2', 4)
+      ],
+      [accepted, queued]
+    )
+    h.observe()
+    expect(h.events).toEqual([])
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.ts
index 1281fbec49bf..ca9f64c05731 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.ts
@@ -1,4 +1,5 @@
-// The host's answer to "a turn just finished", derived once per journal commit.
+// The host's answer to "a request just finished", derived once per journal commit. A request is
+// the one the status row reports: a turn, or a send the agent or its start refused.
 //
 // WHY THE HOST DERIVES IT: a structured session runs on the execution host and keeps journalling
 // whether or not any renderer has a reader mounted. A client that derived completions itself would
@@ -10,41 +11,45 @@
 // needs, a completion is an edge that has already passed. Keeping a queue would create a durable
 // obligation with nothing to retire it.
 
-import type { AgentJournalTurnLifecycle } from '../../../shared/agent-session-journal-types'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
-import { readAgentJournalTurnOutcome } from '../../../shared/agent-session-turn-record'
 import type {
   AgentSessionTurnCompletion,
   AgentSessionTurnCompletionEvent
 } from '../../../shared/agent-session-wire'
+import type { StructuredAgentSessionLatestRequest } from '../../../shared/structured-agent-session-latest-request'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import type { StructuredAgentSessionStatusState } from './structured-agent-session-status-feed'
 
 export type StructuredAgentSessionTurnCompletionSubscriber = {
   id: string
   emit: (event: AgentSessionTurnCompletionEvent) => void
 }
 
-/** Only the newest-turn reader and cursor are needed here; asking for the whole journal would overstate it. */
 type CompletionFeedCursor = { epoch: string; sequence: number }
 
-type CompletionFeedJournal = Pick<AgentSessionJournal, 'newestTurn' | 'cursor'>
-
 type CompletionFeedSession = {
-  journal: CompletionFeedJournal
+  journal: Pick<AgentSessionJournal, 'cursor'>
   params: { location: AgentSessionRecord['location'] }
 }
 
 export type StructuredAgentSessionTurnCompletionFeedDeps = {
   sessions: ReadonlyMap<string, CompletionFeedSession>
   now: () => number
+  /** The status feed's projection for this commit, so the event follows the request its row reports. */
+  readStatusState: (
+    sessionId: string,
+    journal?: AgentSessionJournal
+  ) => StructuredAgentSessionStatusState | null
 }
 
-/** Per-session baseline. `settledTurnId` is the last settled turn this feed has accounted for;
+type RequestMark = Pick<StructuredAgentSessionLatestRequest, 'kind' | 'id'>
+
+/** Per-session baseline. `settled` is the last settled request this feed has accounted for;
  *  absence of the whole entry — not a null field — is what makes the first observation silent. */
-type SessionBaseline = CompletionFeedCursor & { settledTurnId: string | null }
+type SessionBaseline = CompletionFeedCursor & { settled: RequestMark | null }
 
-function isSettled(turn: AgentJournalTurnLifecycle | null): turn is AgentJournalTurnLifecycle {
-  return turn !== null && turn.state !== 'running'
+function settledMark(request: StructuredAgentSessionLatestRequest | null): RequestMark | null {
+  return request && !request.running ? { kind: request.kind, id: request.id } : null
 }
 
 export class StructuredAgentSessionTurnCompletionFeed {
@@ -80,29 +85,24 @@ export class StructuredAgentSessionTurnCompletionFeed {
 
   /**
    * One journal publication. Emits at most one completion, and only on the transition into a
-   * settled turn this feed has not already accounted for.
+   * settled request this feed has not already accounted for.
    *
    * The first observation of a session only records where it is, so restore, restart, rewind and
-   * a re-read of history all pass through silently. An already-settled turn republished by an
-   * in-place revision carries the same turn id and so cannot fire twice.
+   * a re-read of history all pass through silently. An already-settled request republished by an
+   * in-place revision carries the same identity and so cannot fire twice.
    */
-  observe(sessionId: string, journal?: CompletionFeedJournal): void {
+  observe(sessionId: string, journal?: AgentSessionJournal): void {
     const session = this.deps.sessions.get(sessionId)
-    if (!session) {
+    const state = session ? this.deps.readStatusState(sessionId, journal) : null
+    if (!session || !state) {
       return
     }
-    const source = journal ?? session.journal
-    const cursor = source.cursor()
-    const turn = source.newestTurn()
-    const settled = isSettled(turn) ? turn : null
+    const cursor = (journal ?? session.journal).cursor()
+    const request = state.latestRequest
     const baseline = this.baselines.get(sessionId)
     if (!baseline) {
       // Baseline only. Whatever the session was already holding is history, not news.
-      this.baselines.set(sessionId, {
-        epoch: cursor.epoch,
-        sequence: cursor.sequence,
-        settledTurnId: settled?.turnId ?? null
-      })
+      this.baselines.set(sessionId, { ...cursor, settled: settledMark(request) })
       return
     }
     if (baseline.epoch !== cursor.epoch || cursor.sequence < baseline.sequence) {
@@ -111,24 +111,31 @@ export class StructuredAgentSessionTurnCompletionFeed {
       // newest settled row as a fresh completion.
       baseline.epoch = cursor.epoch
       baseline.sequence = cursor.sequence
-      baseline.settledTurnId = settled?.turnId ?? null
+      baseline.settled = settledMark(request)
       return
     }
     baseline.sequence = cursor.sequence
-    if (!settled) {
+    if (request?.running) {
       // A running turn clears the mark, so this detector fires on each running → settled
       // transition rather than on an id it happens not to have seen.
-      baseline.settledTurnId = null
+      baseline.settled = null
       return
     }
-    if (baseline.settledTurnId === settled.turnId) {
+    // Owed work waits, so sends refused one commit at a time announce once, when the last is
+    // answered. A pending prompt does not wait (structured chat has no other attention producer):
+    // the event says so itself, and answering it keeps the same identity.
+    // A withdrawn send leaves the older request latest.
+    if (
+      state.owesWork ||
+      !request ||
+      (baseline.settled?.kind === request.kind && baseline.settled.id === request.id)
+    ) {
       return
     }
-    baseline.settledTurnId = settled.turnId
+    baseline.settled = settledMark(request)
     // ABSENT OUTCOME IS UNKNOWN: a turn the host only saw stop carries no verdict and gets no
     // event. Inferring success here is the one mistake that would light the dot on a failure.
-    const outcome = readAgentJournalTurnOutcome(settled)
-    if (!outcome) {
+    if (!request.outcome) {
       return
     }
     this.broadcast({
@@ -136,9 +143,11 @@ export class StructuredAgentSessionTurnCompletionFeed {
       completion: {
         scope: session.params.location,
         sessionId,
-        turnId: settled.turnId,
-        outcome,
-        completedAt: this.deps.now()
+        turnId: request.id,
+        outcome: request.outcome,
+        completedAt: this.deps.now(),
+        // Stated here, not joined from the status stream: remote clients receive the two unordered.
+        ...(state.summary.status === 'attention' ? { awaitingUser: true } : {})
       }
     })
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-turns-options.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-turns-options.ts
index cb1685405a1b..9230e56cbe83 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-turns-options.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-turns-options.ts
@@ -1,4 +1,4 @@
-import type { AgentSessionOptionResult } from '../../../shared/agent-session-wire'
+import { refuse, type AgentSessionOptionResult } from '../../../shared/agent-session-wire'
 import { isAgentSessionOptionRejectedError } from './structured-agent-session-option-error'
 import type { AgentSessionTurnContext, TurnOutcome } from './structured-agent-session-turns'
 
@@ -17,7 +17,11 @@ export async function performSetOption(
     if (isAgentSessionOptionRejectedError(error)) {
       return {
         ok: false,
-        refusal: { code: 'agent_session_operation_invalid', message: error.message }
+        refusal: refuse(
+          'agent_session_operation_invalid',
+          { reason: error.refusalReason },
+          error.message
+        )
       }
     }
     throw error
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-turns-prompt.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-turns-prompt.ts
index e235ccb49400..f10b64be1dbd 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-turns-prompt.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-turns-prompt.ts
@@ -1,3 +1,5 @@
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
 import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
 import {
   agentSessionPromptQuestions,
@@ -12,7 +14,11 @@ import type {
   AgentJournalQuestionItem,
   AgentJournalResolution
 } from '../../../shared/agent-session-journal-types'
-import type { AgentSessionPromptResult } from '../../../shared/agent-session-wire'
+import {
+  refuse,
+  type AgentSessionPromptResult,
+  type AgentSessionRefusalReason
+} from '../../../shared/agent-session-wire'
 import {
   AgentSessionPromptAnswerRejectedError,
   AgentSessionPromptUnavailableError
@@ -29,8 +35,11 @@ export type AgentSessionPromptRequest = {
   answers?: AgentSessionQuestionAnswer[]
 }
 
-function invalid(message: string): TurnOutcome<never> {
-  return { ok: false, refusal: { code: 'agent_session_operation_invalid', message } }
+function invalid(
+  reason: AgentSessionRefusalReason<'agent_session_operation_invalid'>,
+  message: string
+): TurnOutcome<never> {
+  return { ok: false, refusal: refuse('agent_session_operation_invalid', { reason }, message) }
 }
 
 /** The one place a client's choice is read; an answer an older client packed into `optionId` is unpacked here, once. */
@@ -73,6 +82,7 @@ export async function performPrompt(
   const choice = readPromptChoice(prompt, input)
   if (!choice) {
     return invalid(
+      'optionRejected',
       input.optionId !== undefined
         ? `Option ${input.optionId} is not offered by item ${input.itemId}.`
         : `The answers do not match the questions on item ${input.itemId}.`
@@ -81,7 +91,7 @@ export async function performPrompt(
   const { response } = choice
   const identity = parseAgentJournalItemKey(input.itemId)
   if (!identity) {
-    return invalid(`Item id ${input.itemId} is not a well-formed item key.`)
+    return invalid('requestMalformed', `Item id ${input.itemId} is not a well-formed item key.`)
   }
 
   const resolution: AgentJournalResolution = {
@@ -110,23 +120,23 @@ export async function performPrompt(
       }
     })
   } catch (error) {
-    if (
-      !committed.item &&
-      (error instanceof AgentSessionPromptUnavailableError ||
-        error instanceof AgentSessionPromptAnswerRejectedError)
-    ) {
-      return invalid(error.message)
+    if (!committed.item && error instanceof AgentSessionPromptUnavailableError) {
+      return invalid('promptGone', error.message)
+    }
+    if (!committed.item && error instanceof AgentSessionPromptAnswerRejectedError) {
+      return invalid('optionRejected', error.message)
     }
     if (!committed.item) {
       throw error
     }
+    // The adapter's error is Orca's; the row says only what the user needs to know.
     await ctx.journal.appendItem(
       { provider: 'orca', clientMessageId: `${input.itemId}#delivery` },
       {
         kind: 'status',
-        text: `Your answer was recorded but the agent did not confirm it: ${
-          error instanceof Error ? error.message : String(error)
-        }`
+        ...agentSessionFailureWords(agentSessionFailureFact('answerUnconfirmed'), {
+          surface: 'row'
+        })
       },
       { fence: ctx.fence }
     )
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-turns.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-turns.ts
index 794b4fe8df90..46c4638dc4ee 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-turns.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-turns.ts
@@ -6,30 +6,35 @@
 // row the next attach settles as `unknown`, whereas the reverse would lose a
 // turn the provider already accepted.
 
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import {
+  agentSessionFailureWords,
+  type AgentSessionFailureWordsContext
+} from '../../../shared/agent-session-failure-words'
 import type {
   AgentJournalMessageItem,
+  AgentJournalStatusItem,
   AgentJournalSubmission
 } from '../../../shared/agent-session-journal-types'
-import type {
-  AgentSessionCancelResult,
-  AgentSessionSendResult,
-  AgentSessionWireRefusal
+import {
+  refuse,
+  type AgentSessionCancelResult,
+  type AgentSessionRefusalReason,
+  type AgentSessionSendResult,
+  type AgentSessionWireRefusal
 } from '../../../shared/agent-session-wire'
 import { DISPATCH_DOUBT_PERSISTENCE_FAILED } from '../agent-session-journal/journal-dispatch-doubt-reasons'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { latestJournalDispatchObservation } from '../agent-session-journal/journal-dispatch-observation'
 import type {
+  AgentSessionCancelOutcome,
   AgentSessionDispatchOutcome,
   StructuredAgentSessionAdapter,
   StructuredAgentSessionProviderChildPhase
 } from './structured-agent-session-adapter'
-import { providerStartupFailureRejection } from './structured-agent-session-dead-generation-settlement'
+import { structuredAgentSessionStartFailure } from './structured-agent-session-failure-text'
 import { validatePendingPrompt } from './structured-agent-session-prompt-state'
-import { withTimeout } from '../../../shared/promise-timeout-fallback'
-import {
-  AgentSessionPreDispatchError,
-  AGENT_SESSION_ADMISSION_BARRIER_TIMEOUT_MS
-} from './structured-agent-session-operation-settlement'
+import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
 export { performSetOption } from './structured-agent-session-turns-options'
 export { performPrompt } from './structured-agent-session-turns-prompt'
 
@@ -47,10 +52,10 @@ export type AgentSessionTurnContext = {
   publish: () => void
   /** Drains provider lifecycle already accepted by the execution host. */
   flushStreamedEvents: () => Promise<void>
-  /** Re-derives authorization after submission persistence, immediately before provider dispatch. */
-  beforeDispatch?: () => void
   /** What the host holds about the child this dispatch is for, read at the moment it is needed. */
   providerChildPhase?: () => StructuredAgentSessionProviderChildPhase | undefined
+  /** Who a Stop's refusal row names. */
+  failureTextContext?: AgentSessionFailureWordsContext
   now: () => number
 }
 
@@ -58,8 +63,11 @@ export type TurnOutcome<TValue> =
   | { ok: true; value: TValue }
   | { ok: false; refusal: AgentSessionWireRefusal }
 
-function invalid(message: string): { ok: false; refusal: AgentSessionWireRefusal } {
-  return { ok: false, refusal: { code: 'agent_session_operation_invalid', message } }
+function invalid(
+  reason: AgentSessionRefusalReason<'agent_session_operation_invalid'>,
+  message: string
+): { ok: false; refusal: AgentSessionWireRefusal } {
+  return { ok: false, refusal: refuse('agent_session_operation_invalid', { reason }, message) }
 }
 
 /** A thrown adapter error is indistinguishable from a lost reply, so it settles as `unknown`
@@ -67,10 +75,10 @@ function invalid(message: string): { ok: false; refusal: AgentSessionWireRefusal
  *  accepted nothing (input is written only after it initializes), so a dispatch it could not
  *  take is provably unwritten and is rejected with the cause the adapter gave. */
 async function dispatchSafely(
-  ctx: AgentSessionTurnContext,
+  ctx: AgentSessionHandoverContext,
   clientMessageId: string,
   body: AgentJournalMessageItem,
-  requestedAt: number | undefined
+  requestedAt: number
 ): Promise<AgentSessionDispatchOutcome> {
   try {
     return await ctx.adapter.dispatch({
@@ -78,15 +86,14 @@ async function dispatchSafely(
       clientMessageId,
       body,
       fence: ctx.fence,
-      ...(ctx.beforeDispatch ? { beforeDispatch: async () => ctx.beforeDispatch?.() } : {}),
-      ...(requestedAt === undefined ? {} : { requestedAt })
+      requestedAt
     })
   } catch (error) {
-    if (error instanceof AgentSessionPreDispatchError) {
-      throw error
-    }
     if (ctx.providerChildPhase?.() === 'starting') {
-      return { state: 'rejected', reason: providerStartupFailureRejection(error) }
+      return {
+        state: 'rejected',
+        ...structuredAgentSessionStartFailure({ error }, ctx.failureTextContext)
+      }
     }
     return { state: 'unknown', reason: error instanceof Error ? error.message : String(error) }
   }
@@ -95,13 +102,9 @@ async function dispatchSafely(
 async function appendStatus(
   ctx: AgentSessionTurnContext,
   clientMessageId: string,
-  text: string
+  body: AgentJournalStatusItem
 ): Promise<void> {
-  await ctx.journal.appendItem(
-    { provider: 'orca', clientMessageId },
-    { kind: 'status', text },
-    { fence: ctx.fence }
-  )
+  await ctx.journal.appendItem({ provider: 'orca', clientMessageId }, body, { fence: ctx.fence })
 }
 
 /**
@@ -111,6 +114,8 @@ async function appendStatus(
  * the whole content of the word — and one message reached the model five times
  * when this was a judgement call instead of an invariant. A distinct send after
  * a terminal rejection uses a fresh id, which is a first delivery.
+ *
+ * Accepting only records the message; the session's delivery loop hands it over.
  */
 export async function performSend(
   ctx: AgentSessionTurnContext,
@@ -124,7 +129,10 @@ export async function performSend(
     .submissions()
     .find((entry) => entry.clientMessageId === input.clientMessageId)
   if (existing && existing.payloadFingerprint !== input.payloadFingerprint) {
-    return invalid(`Message id ${input.clientMessageId} was already used for another send.`)
+    return invalid(
+      'messageIdReused',
+      `Message id ${input.clientMessageId} was already used for another send.`
+    )
   }
   if (existing) {
     return {
@@ -133,86 +141,88 @@ export async function performSend(
     }
   }
   try {
-    await ctx.journal.appendSubmission({ ...input, fence: ctx.fence })
+    await ctx.journal.appendSubmission({ ...input, fence: ctx.fence, handoverRecorded: true })
   } catch {
-    return invalid('The message could not be recorded and was not sent.')
+    return invalid('journalWriteFailed', 'The message could not be recorded and was not sent.')
   }
+  return {
+    ok: true,
+    value: {
+      clientMessageId: input.clientMessageId,
+      submission: requireSubmission(ctx, input.clientMessageId)
+    }
+  }
+}
 
-  // The row just written is the send's instant on the host clock; the turn this
+export type AgentSessionHandoverContext = Pick<
+  AgentSessionTurnContext,
+  'sessionId' | 'journal' | 'fence' | 'adapter' | 'providerChildPhase'
+> & {
+  /** Who a start failure met at dispatch names, as the start's own row does. */
+  failureTextContext?: AgentSessionFailureWordsContext
+}
+
+/**
+ * Hands one queued submission to the provider. The `dispatch{pending}` row goes first: a crash
+ * after it leaves a message in doubt, never one that reads as queued and so provably unwritten.
+ */
+export async function handOverSubmission(
+  ctx: AgentSessionHandoverContext,
+  submission: AgentJournalSubmission
+): Promise<void> {
+  const { clientMessageId } = submission
+  const body = ctx.journal.itemBody(agentJournalSubmissionKey(clientMessageId))
+  if (body?.kind !== 'message') {
+    await ctx.journal.resolveDispatch({
+      clientMessageId,
+      state: 'rejected',
+      ...agentSessionFailureWords(agentSessionFailureFact('hostFault'), { surface: 'rejection' }),
+      fence: ctx.fence
+    })
+    return
+  }
+  await ctx.journal.resolveDispatch({ clientMessageId, state: 'pending', fence: ctx.fence })
+  // The row written at acceptance is the send's instant on the host clock; the turn this
   // dispatch opens records it so the live counter never re-anchors at turn-open.
-  const requestedAt = ctx.journal
-    .submissions()
-    .find((entry) => entry.clientMessageId === input.clientMessageId)?.submittedAt
-  const outcome = await dispatchSafely(ctx, input.clientMessageId, input.body, requestedAt).catch(
-    async (error: unknown) => {
-      if (error instanceof AgentSessionPreDispatchError) {
-        const recorded = await withTimeout(
-          ctx.journal
-            .resolveDispatch({
-              clientMessageId: input.clientMessageId,
-              state: 'rejected',
-              reason: error.message,
-              fence: ctx.fence
-            })
-            .then(() => true),
-          AGENT_SESSION_ADMISSION_BARRIER_TIMEOUT_MS,
-          false
-        )
-        if (!recorded) {
-          console.warn('[structured-agent-session] pre-dispatch refusal persistence failed')
-        }
-      }
-      throw error
-    }
-  )
+  const outcome = await dispatchSafely(ctx, clientMessageId, body, submission.submittedAt)
   // An admission needs no dispatch row: the submission is already pending.
   if (outcome.state === 'admitted') {
-    return {
-      ok: true,
-      value: {
-        clientMessageId: input.clientMessageId,
-        submission: requireSubmission(ctx, input.clientMessageId)
-      }
-    }
+    return
   }
   try {
     await ctx.journal.resolveDispatch(
       outcome.state === 'accepted'
         ? {
-            clientMessageId: input.clientMessageId,
+            clientMessageId,
             state: 'accepted',
             providerIdentity: outcome.providerIdentity,
             fence: ctx.fence
           }
-        : {
-            clientMessageId: input.clientMessageId,
-            state: outcome.state,
-            reason: outcome.reason,
-            fence: ctx.fence
-          }
+        : outcome.state === 'rejected'
+          ? {
+              clientMessageId,
+              state: 'rejected',
+              reason: outcome.reason,
+              rejection: outcome.rejection,
+              fence: ctx.fence
+            }
+          : { clientMessageId, state: 'unknown', reason: outcome.reason, fence: ctx.fence }
     )
   } catch (error) {
     // A failed resolution must not strand a pending row; an unknown result is
     // explicitly replayable.
     try {
       await ctx.journal.resolveDispatch({
-        clientMessageId: input.clientMessageId,
+        clientMessageId,
         state: 'unknown',
         reason: DISPATCH_DOUBT_PERSISTENCE_FAILED,
         fence: ctx.fence
       })
     } catch {
-      // Nothing further to record; the pending row is settled on the next attach.
+      // Nothing further to record; the pending row is settled on the next open.
     }
     throw error
   }
-  return {
-    ok: true,
-    value: {
-      clientMessageId: input.clientMessageId,
-      submission: requireSubmission(ctx, input.clientMessageId)
-    }
-  }
 }
 
 function requireSubmission(
@@ -232,7 +242,8 @@ export async function performCancel(
   ctx: AgentSessionTurnContext,
   input: {
     clientOperationId: string
-    turnId: string
+    /** Absent: whatever the conversation has in flight; present: only while that turn is current. */
+    turnId?: string
     scope?: 'background-tasks'
     taskId?: string
     prompt?: { itemId: string; expectedRevision: number }
@@ -245,46 +256,70 @@ export async function performCancel(
     }
   }
   let cancelled = false
-  let note = 'Cancellation requested.'
+  let note: AgentJournalStatusItem | null = { kind: 'status', text: 'Cancellation requested.' }
   try {
     const dispatchStatus = latestJournalDispatchObservation(ctx.journal, ctx.fence)
-    cancelled = input.scope
-      ? (
-          await ctx.adapter.stopBackgroundTasks?.({
-            sessionId: ctx.sessionId,
-            fence: ctx.fence,
-            ...(input.taskId ? { taskId: input.taskId } : {})
-          })
-        )?.cancelled === true
-      : (
-          await ctx.adapter.cancelTurn({
-            sessionId: ctx.sessionId,
-            turnId: input.turnId,
-            fence: ctx.fence,
-            // The journal is what the client read to name a turn, so it is what judges the request.
-            resolveLiveTurnId: () => ctx.journal.activeTurnId(),
-            ...(dispatchStatus ? { dispatchStatus } : {}),
-            ...(input.prompt ? { prompt: { itemId: input.prompt.itemId } } : {})
-          })
-        ).cancelled
-    if (!cancelled) {
-      note = 'The provider had already finished this turn.'
+    const outcome: AgentSessionCancelOutcome = input.scope
+      ? {
+          cancelled:
+            (
+              await ctx.adapter.stopBackgroundTasks?.({
+                sessionId: ctx.sessionId,
+                fence: ctx.fence,
+                ...(input.taskId ? { taskId: input.taskId } : {})
+              })
+            )?.cancelled === true
+        }
+      : await ctx.adapter.cancelTurn({
+          sessionId: ctx.sessionId,
+          ...(input.turnId !== undefined ? { turnId: input.turnId } : {}),
+          fence: ctx.fence,
+          // The journal is what the client read to name a turn, so it is what judges the request.
+          resolveLiveTurnId: () => ctx.journal.activeTurnId(),
+          ...(dispatchStatus ? { dispatchStatus } : {}),
+          ...(input.prompt ? { prompt: { itemId: input.prompt.itemId } } : {})
+        })
+    cancelled = outcome.cancelled
+    if (!cancelled && input.turnId !== undefined) {
+      note = { kind: 'status', text: 'The provider had already finished this turn.' }
+    } else if (!cancelled && input.prompt) {
+      note = null
+    } else if (!cancelled && outcome.unconfirmed) {
+      note = {
+        kind: 'status',
+        ...agentSessionFailureWords(agentSessionFailureFact('cancelUnconfirmed'), {
+          surface: 'row'
+        })
+      }
+    } else if (!cancelled) {
+      // Sent only while the chat reads working, so a Stop that ended nothing must say why.
+      const detail = outcome.refusal?.detail
+      note = {
+        kind: 'status',
+        ...agentSessionFailureWords(
+          agentSessionFailureFact('stopRefused', detail ? { detail } : {}),
+          { ...ctx.failureTextContext, surface: 'row' }
+        )
+      }
     }
   } catch (error) {
     if (input.prompt) {
       throw error
     }
-    note = `Cancellation was not confirmed: ${
-      error instanceof Error ? error.message : String(error)
-    }`
+    // The adapter's error is Orca's; the row says only that the stop is unconfirmed.
+    note = {
+      kind: 'status',
+      ...agentSessionFailureWords(agentSessionFailureFact('cancelUnconfirmed'), { surface: 'row' })
+    }
   }
   if (cancelled && input.prompt) {
     await ctx.flushStreamedEvents()
   }
-  if (input.scope) {
-    return { ok: true, value: { turnId: input.turnId, cancelled } }
+  const value = { ...(input.turnId !== undefined ? { turnId: input.turnId } : {}), cancelled }
+  if (input.scope || note === null) {
+    return { ok: true, value }
   }
   // Keyed by the operation id so a replayed cancel upserts one item, not two.
   await appendStatus(ctx, input.clientOperationId, note)
-  return { ok: true, value: { turnId: input.turnId, cancelled } }
+  return { ok: true, value }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unanswered-dispatch-release.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unanswered-dispatch-release.test.ts
index 79f21a349b42..9a27415dc711 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-unanswered-dispatch-release.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unanswered-dispatch-release.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest'
 import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types'
 import { projectStructuredAgentSessionStatus } from '../../../shared/structured-agent-session-projection'
-import { releaseStructuredAgentSessionUnansweredDispatches } from './structured-agent-session-host-mutations'
+import { releaseStructuredAgentSessionUnansweredDispatches } from './structured-agent-session-unanswered-dispatch-release'
 
 const FENCE = 7
 
@@ -32,10 +32,12 @@ function contextWith(submissions: AgentJournalSubmission[]) {
       return { epoch: 'e', sequence: 1 }
     })
   }
-  // The mutation reads only `journal.submissions`, `journal.resolveDispatch` and `fence`.
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: all three are supplied here; the rest of the host session is unreachable from this mutation.
-  const session = { journal, fence: FENCE } as unknown as ReleaseSession
-  const context: ReleaseContext = { sessions: new Map([['s-1', session]]) }
+  // The mutation reads only `journal.submissions`, `journal.resolveDispatch` and the record fence.
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: all three are supplied here; the rest of the session and the record is unreachable from this mutation.
+  const context = {
+    sessions: new Map([['s-1', { journal }]]),
+    deps: { store: { getRecord: () => ({ lease: { runtimeFence: FENCE } }) } }
+  } as unknown as ReleaseContext
   return { context, resolved, journal }
 }
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unanswered-dispatch-release.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unanswered-dispatch-release.ts
new file mode 100644
index 000000000000..713838c177ec
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unanswered-dispatch-release.ts
@@ -0,0 +1,43 @@
+import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
+import type { StructuredAgentSessionHostDeps } from './structured-agent-session-host-types'
+import type { StructuredAgentSessionMutationContext } from './structured-agent-session-host-mutations'
+
+/**
+ * Releases sends the provider can no longer be holding.
+ *
+ * A dispatch whose RPC timed out is recorded `unknown` — doubt, never proof of
+ * non-delivery — and a live `unknown` reads as work still owed, so the session
+ * shows working until something re-derives it. The provider reporting its thread
+ * not running, with no turn open, IS that re-derivation.
+ *
+ * `pending` is deliberately untouched: that send's dispatch has not returned yet
+ * and may be in flight right now. And `recovered` only retires the obligation —
+ * it never makes a send re-deliverable, because the provider may well have run it.
+ */
+export async function releaseStructuredAgentSessionUnansweredDispatches(
+  context: Pick<StructuredAgentSessionMutationContext, 'sessions'> & {
+    deps: { store: Pick<StructuredAgentSessionHostDeps['store'], 'getRecord'> }
+  },
+  input: { sessionId: string; reason: string }
+): Promise<void> {
+  const session = context.sessions.get(input.sessionId)
+  if (!session) {
+    return
+  }
+  const stranded = session.journal
+    .submissions()
+    .filter((entry) => entry.dispatchState === 'unknown' && entry.recovered !== true)
+  if (stranded.length === 0) {
+    return
+  }
+  for (const entry of stranded) {
+    await session.journal.resolveDispatch({
+      clientMessageId: entry.clientMessageId,
+      state: 'unknown',
+      // The earlier reason names a sharper fact than this one does.
+      reason: entry.reason ?? input.reason,
+      fence: structuredAgentSessionConversationFence(context.deps.store, input.sessionId),
+      recovered: true
+    })
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.test.ts
index 98901380aa39..451629f7b45f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.test.ts
@@ -7,52 +7,19 @@ import {
   agentSessionRecordFixture
 } from '../../../shared/agent-session-record.test-fixture'
 import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
+import { settleStaleStructuredAgentSessionState } from './structured-agent-session-dead-generation-settlement'
 import {
-  settleStaleStructuredAgentSessionState,
-  unexpectedProviderExitOutcome
-} from './structured-agent-session-dead-generation-settlement'
-import {
-  isStructuredAgentSessionRecoveryTicketCurrent,
   settleUnexpectedStructuredAgentSessionExit,
   type StructuredAgentSessionUnexpectedExitContext,
-  type StructuredAgentSessionUnexpectedExitSession,
-  type StructuredAgentSessionRecoveryTicket
+  type StructuredAgentSessionUnexpectedExitSession
 } from './structured-agent-session-unexpected-exit'
 
+const exitOutcome = (agent: string): string =>
+  `${agent} stopped while this response was in progress. You can continue in this conversation.`
+
 const SESSION = 'session-1'
 const GENERATION = 'generation-1'
 
-const ticket: StructuredAgentSessionRecoveryTicket = {
-  sessionId: SESSION,
-  releasedFence: 8,
-  deadAcquisitionGeneration: GENERATION,
-  stableSettlementId: 'settlement-1'
-}
-
-function recoveryContext(input: {
-  generation?: string
-  handoffStage?: AgentSessionRecord['lease']['handoffStage']
-  resumeCapable?: boolean
-}) {
-  const session = {
-    hasProviderChild: false,
-    fence: 8,
-    acquisitionGeneration: input.generation ?? GENERATION
-  } as StructuredAgentSessionHostSession
-  const record = {
-    lease: {
-      runtimeFence: 8,
-      claimStatus: 'released',
-      handoffStage: input.handoffStage ?? null
-    }
-  } as AgentSessionRecord
-  return {
-    sessions: new Map([[SESSION, session]]),
-    store: { getRecord: () => record },
-    hasResumeCapableHolder: () => input.resumeCapable ?? true
-  } as never
-}
-
 function lifecycleItem(
   turnId: string,
   sequence: number,
@@ -104,7 +71,7 @@ function mutableStore() {
   }
 }
 
-describe('provider-exit recovery tickets', () => {
+describe('provider-exit settlement', () => {
   it.each([undefined, 2_000])('keeps exit receipt %s when settling fails', async (observedAt) => {
     let now = observedAt === undefined ? 2_000 : 30_000
     let record = agentSessionRecordFixture(
@@ -121,14 +88,15 @@ describe('provider-exit recovery tickets', () => {
       .fn()
       .mockRejectedValueOnce(new Error('journal unavailable'))
       .mockResolvedValue({ epoch: 'epoch-1', sequence: 2 })
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the exit reads only the child record and these journal methods; the rest of the session is unreachable from it.
     const session = {
-      hasProviderChild: true,
-      fence: 7,
-      acquisitionGeneration: GENERATION,
+      child: { generation: GENERATION, fence: 7, phase: 'ready' },
       journal: {
+        cursor: () => ({ epoch: 'epoch-1', sequence: 0 }),
         snapshot: () => ({
           items: [lifecycleItem('turn-1', 1, { state: 'running', startedAt: 1_000 })]
         }),
+        itemFence: () => 7,
         appendLifecycleBatch,
         markPendingSubmissionsUnknown: vi.fn(async () => [])
       }
@@ -143,7 +111,6 @@ describe('provider-exit recovery tickets', () => {
           return { ok: false, error: new Error('sink unavailable') }
         },
         publishFence: vi.fn(),
-        hasResumeCapableHolder: () => true,
         serialize: async (_sessionId, task) => task(),
         now: () => now
       } as never,
@@ -157,7 +124,7 @@ describe('provider-exit recovery tickets', () => {
         observedAt
       }
     )
-    // Released, not latched: the next acquire or read restore settles what this write left.
+    // Released, not latched: a later settle from this evidence finishes what this write left.
     expect(record.lease).toMatchObject({
       claimStatus: 'released',
       handoffStage: null,
@@ -193,11 +160,11 @@ describe('provider-exit recovery tickets', () => {
       lifecycleItem('turn-1', 1, { state: 'completed', startedAt: 10, completedAt: 20 }),
       lifecycleItem('turn-2', 2, { state: 'running', startedAt: 30 })
     ]
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the exit reads only the child record and these journal methods; the rest of the session is unreachable from it.
     const session = {
-      hasProviderChild: true,
-      fence: 7,
-      acquisitionGeneration: GENERATION,
+      child: { generation: GENERATION, fence: 7, phase: 'ready' },
       journal: {
+        cursor: () => ({ epoch: 'epoch-1', sequence: 0 }),
         snapshot: () => ({ items }),
         appendLifecycleBatch,
         markPendingSubmissionsUnknown: vi.fn(async () => [])
@@ -217,13 +184,12 @@ describe('provider-exit recovery tickets', () => {
       transitionHandoff: async () => ({ lease: { runtimeFence: 8 } })
     }
 
-    const result = await settleUnexpectedStructuredAgentSessionExit(
+    await settleUnexpectedStructuredAgentSessionExit(
       {
         store,
         sessions: new Map([[SESSION, session]]),
         flushLifecycle: async () => ({ ok: true }),
         publishFence: vi.fn(),
-        hasResumeCapableHolder: () => true,
         serialize: async (_sessionId, task) => task(),
         now: () => 1_234
       } as never,
@@ -237,12 +203,11 @@ describe('provider-exit recovery tickets', () => {
       }
     )
 
-    expect(result).toMatchObject({ releasedFence: 8 })
     expect(session.journal.markPendingSubmissionsUnknown).toHaveBeenCalledWith(
       7,
       'provider_exited_before_acknowledgement'
     )
-    expect(session.hasProviderChild).toBe(false)
+    expect(session.child).toBeNull()
     // The running row is revised to interrupted at exit receipt, never tombstoned.
     expect(appendLifecycleBatch).toHaveBeenCalledExactlyOnceWith({
       settlementId: `dead-generation:provider-exit:${SESSION}:7:${GENERATION}`,
@@ -255,7 +220,11 @@ describe('provider-exit recovery tickets', () => {
             provider: 'orca',
             clientMessageId: `provider-exit:${SESSION}:7:${GENERATION}`
           },
-          body: { kind: 'status', text: unexpectedProviderExitOutcome('provider exited') }
+          body: {
+            kind: 'status',
+            text: exitOutcome('The agent'),
+            failure: { kind: 'providerExited' }
+          }
         },
         {
           kind: 'item',
@@ -299,10 +268,9 @@ describe('provider-exit recovery tickets', () => {
         sequence: 3
       }))
       const session: StructuredAgentSessionUnexpectedExitSession = {
-        hasProviderChild: true,
-        fence: 7,
-        acquisitionGeneration: GENERATION,
+        child: { generation: GENERATION, fence: 7, phase: 'ready' },
         journal: {
+          cursor: () => ({ epoch: 'epoch-1', sequence: 0 }),
           snapshot: () => ({ items }),
           appendLifecycleBatch,
           markPendingSubmissionsUnknown: vi.fn(async () => []),
@@ -325,7 +293,6 @@ describe('provider-exit recovery tickets', () => {
           return { ok: true }
         },
         publishFence: vi.fn(),
-        hasResumeCapableHolder: () => true,
         serialize: async <T>(_sessionId: string, task: () => Promise<T>) => task(),
         now: () => 1_234
       }
@@ -345,7 +312,8 @@ describe('provider-exit recovery tickets', () => {
           expect.objectContaining({
             body: {
               kind: 'status',
-              text: unexpectedProviderExitOutcome('provider exited after completing the turn')
+              text: exitOutcome('Claude'),
+              failure: { kind: 'providerExited' }
             }
           })
         ])
@@ -356,10 +324,9 @@ describe('provider-exit recovery tickets', () => {
   it('settles a submission the dead child never acknowledged', async () => {
     const markPendingSubmissionsUnknown = vi.fn(async () => ['client-1'])
     const session: StructuredAgentSessionUnexpectedExitSession = {
-      hasProviderChild: true,
-      fence: 7,
-      acquisitionGeneration: GENERATION,
+      child: { generation: GENERATION, fence: 7, phase: 'ready' },
       journal: {
+        cursor: () => ({ epoch: 'epoch-1', sequence: 0 }),
         snapshot: () => ({ items: [] }),
         appendLifecycleBatch: vi.fn(async () => ({ epoch: 'epoch-1', sequence: 1 })),
         markPendingSubmissionsUnknown,
@@ -374,7 +341,6 @@ describe('provider-exit recovery tickets', () => {
       sessions: new Map([[SESSION, session]]),
       flushLifecycle: async () => ({ ok: true }),
       publishFence: vi.fn(),
-      hasResumeCapableHolder: () => true,
       serialize: async <T>(_sessionId: string, task: () => Promise<T>) => task(),
       now: () => 1
     }
@@ -395,7 +361,11 @@ describe('provider-exit recovery tickets', () => {
       expect.objectContaining({
         mutations: [
           expect.objectContaining({
-            body: { kind: 'status', text: unexpectedProviderExitOutcome('provider exited') }
+            body: {
+              kind: 'status',
+              text: exitOutcome('Claude'),
+              failure: { kind: 'providerExited' }
+            }
           })
         ]
       })
@@ -404,10 +374,9 @@ describe('provider-exit recovery tickets', () => {
 
   it('releases without offering a restart while terminal settlement is failing', async () => {
     const session: StructuredAgentSessionUnexpectedExitSession = {
-      hasProviderChild: true,
-      fence: 7,
-      acquisitionGeneration: GENERATION,
+      child: { generation: GENERATION, fence: 7, phase: 'ready' },
       journal: {
+        cursor: () => ({ epoch: 'epoch-1', sequence: 0 }),
         markPendingSubmissionsUnknown: vi.fn(async () => []),
         rejectPendingSubmissions: vi.fn(async () => []),
         snapshot: () => ({
@@ -434,45 +403,14 @@ describe('provider-exit recovery tickets', () => {
       sessions: new Map([[SESSION, session]]),
       flushLifecycle: async () => ({ ok: false, error: new Error('sink failed') }),
       publishFence,
-      hasResumeCapableHolder: () => true,
       serialize: async (_sessionId, task) => task(),
       now: () => 1,
       onBarrierError: release
     }
-    const result = await settleUnexpectedStructuredAgentSessionExit(context, event)
+    await settleUnexpectedStructuredAgentSessionExit(context, event)
 
-    expect(result).toBeNull()
-    expect(session.hasProviderChild).toBe(false)
-    expect(session.fence).toBe(8)
+    expect(session.child).toBeNull()
     expect(publishFence).toHaveBeenCalledTimes(1)
     expect(release).toHaveBeenCalledTimes(2)
   })
-
-  it('admits the exact released generation for a resume-capable holder', () => {
-    expect(isStructuredAgentSessionRecoveryTicketCurrent(recoveryContext({}), ticket)).toBe(true)
-  })
-
-  it('is cancelled by a latched stage before reattachment', () => {
-    expect(
-      isStructuredAgentSessionRecoveryTicketCurrent(
-        recoveryContext({ handoffStage: 'recovering' }),
-        ticket
-      )
-    ).toBe(false)
-  })
-
-  it('is cancelled when its holder or dead acquisition generation is no longer current', () => {
-    expect(
-      isStructuredAgentSessionRecoveryTicketCurrent(
-        recoveryContext({ resumeCapable: false }),
-        ticket
-      )
-    ).toBe(false)
-    expect(
-      isStructuredAgentSessionRecoveryTicketCurrent(
-        recoveryContext({ generation: 'generation-new' }),
-        ticket
-      )
-    ).toBe(false)
-  })
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.ts
index f21de56f2bad..5025c5a6f82f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.ts
@@ -1,8 +1,9 @@
-import type {
-  StructuredAgentSessionEndedEvent,
-  StructuredAgentSessionProviderChildPhase
-} from './structured-agent-session-adapter'
+import type { AgentSessionFailureWordsContext } from '../../../shared/agent-session-failure-words'
+import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import type { StructuredAgentSessionEndedEvent } from './structured-agent-session-adapter'
 import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
+import { endProviderChild } from './structured-agent-session-provider-child'
 import {
   releaseStoredStructuredAgentSessionOwnerAfterUnexpectedExit,
   type StructuredAgentSessionLeaseStore
@@ -21,20 +22,10 @@ type UnexpectedExitLifecycleEvent = StructuredAgentSessionEndedEvent & {
   cause: 'unexpected-exit'
 }
 
-export type StructuredAgentSessionRecoveryTicket = {
-  sessionId: string
-  releasedFence: number
-  deadAcquisitionGeneration: string
-  stableSettlementId: string
-}
-
-export type StructuredAgentSessionUnexpectedExitSession = {
-  journal: DeadGenerationJournal
-  hasProviderChild: boolean
-  fence: number
-  acquisitionGeneration: string | null
-  providerChildPhase?: StructuredAgentSessionProviderChildPhase
-}
+export type StructuredAgentSessionUnexpectedExitSession = Pick<
+  StructuredAgentSessionHostSession,
+  'child' | 'lastEndedChild'
+> & { journal: DeadGenerationJournal & Pick<AgentSessionJournal, 'cursor'> }
 
 export type StructuredAgentSessionUnexpectedExitContext<
   TSession extends StructuredAgentSessionUnexpectedExitSession = StructuredAgentSessionHostSession
@@ -44,7 +35,6 @@ export type StructuredAgentSessionUnexpectedExitContext<
   flushLifecycle: (sessionId: string) => Promise<StructuredAgentSessionSinkBarrier>
   publishFence: (sessionId: string, session: TSession) => void
   publishStatus?: (sessionId: string) => void
-  hasResumeCapableHolder: (sessionId: string) => boolean
   serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
   now: () => number
   onBarrierError?: (sessionId: string, error: unknown) => void
@@ -55,40 +45,50 @@ export async function settleUnexpectedStructuredAgentSessionExit<
 >(
   context: StructuredAgentSessionUnexpectedExitContext<TSession>,
   event: StructuredAgentSessionEndedEvent
-): Promise<StructuredAgentSessionRecoveryTicket | null> {
+): Promise<void> {
   if (event.cause !== 'unexpected-exit') {
-    return null
+    return
   }
   const unexpectedEvent = event as UnexpectedExitLifecycleEvent
   // Receipt of the exit is the one end time the host may record for a running turn.
   const observedAt = event.observedAt ?? context.now()
   return context.serialize(unexpectedEvent.sessionId, async () => {
     const session = context.sessions.get(unexpectedEvent.sessionId)
+    const child = session?.child
     if (
-      !session?.hasProviderChild ||
-      session.fence !== unexpectedEvent.fence ||
-      session.acquisitionGeneration !== unexpectedEvent.acquisitionGeneration
+      !session ||
+      !child ||
+      child.fence !== unexpectedEvent.fence ||
+      child.generation !== unexpectedEvent.acquisitionGeneration
     ) {
-      return null
+      return
+    }
+    // The host's own phase decides, so a provider that omits the flag still gets a start that
+    // failed told as one: the row says so.
+    const exitedDuringStartup =
+      unexpectedEvent.startupUnproven === true || child.phase === 'starting'
+    const endChild = (): void => {
+      endProviderChild(session, {
+        generation: child.generation,
+        fence: child.fence,
+        cause: 'exit',
+        reason: unexpectedEvent.reason,
+        ...(unexpectedEvent.failure ? { failure: unexpectedEvent.failure } : {}),
+        duringStartup: exitedDuringStartup,
+        // The adapter publishes an exit only once it saw the root go, first-hand or proven.
+        rootGone: true
+      })
+      context.publishStatus?.(unexpectedEvent.sessionId)
     }
     const record = context.store.getRecord(unexpectedEvent.sessionId)
     if (!record || record.lease.handoffStage !== null) {
       // An acquisition or recovery already owns this lease's transition.
-      session.hasProviderChild = false
-      context.publishStatus?.(unexpectedEvent.sessionId)
-      return null
+      endChild()
+      return
     }
-    // The host's own phase decides, so a provider that omits the flag still gets a start that
-    // failed told as one: the row says so, and nothing resumes into the same failure.
-    const exitedDuringStartup =
-      unexpectedEvent.startupUnproven === true || session.providerChildPhase === 'starting'
 
-    let settlementFailed = false
     const stableSettlementId = providerExitSettlementId(unexpectedEvent)
     const unfinishedWork = captureUnfinishedStructuredAgentSessionWork(session.journal)
-    let released: Awaited<
-      ReturnType<typeof releaseStoredStructuredAgentSessionOwnerAfterUnexpectedExit>
-    > | null = null
     try {
       try {
         const barrier = await context.flushLifecycle(unexpectedEvent.sessionId)
@@ -98,13 +98,15 @@ export async function settleUnexpectedStructuredAgentSessionExit<
       } catch (error) {
         context.onBarrierError?.(unexpectedEvent.sessionId, error)
       }
-      settlementFailed = !(await retryUnexpectedExitSettlement({
+      await retryUnexpectedExitSettlement({
         context,
         event: unexpectedEvent,
-        session,
+        journal: session.journal,
+        fence: child.fence,
         stableSettlementId,
         verdict: { state: 'interrupted', completedAt: observedAt },
         exitedDuringStartup,
+        failureTextContext: structuredAgentSessionFailureWordsContext(record),
         // A failed start always says why: no response was running to carry the reason.
         showUnexpectedExitOutcome:
           exitedDuringStartup ||
@@ -113,96 +115,62 @@ export async function settleUnexpectedStructuredAgentSessionExit<
             session.journal,
             observedAt
           )
-      }))
+      })
     } finally {
       // Provider exit was positively observed, so release the owner even when
       // terminal settlement could not be durably accepted.
+      let released: Awaited<
+        ReturnType<typeof releaseStoredStructuredAgentSessionOwnerAfterUnexpectedExit>
+      > | null = null
       try {
         released = await releaseStoredStructuredAgentSessionOwnerAfterUnexpectedExit({
           store: context.store,
           sessionId: unexpectedEvent.sessionId,
           expectedFence: unexpectedEvent.fence,
           expectedAcquisitionGeneration: unexpectedEvent.acquisitionGeneration,
-          acquisitionGeneration: session.acquisitionGeneration,
+          acquisitionGeneration: child.generation,
           now: context.now(),
           exitObservedAt: observedAt,
-          // Bare cause: whatever this settlement could not write is settled from it later, by the
-          // next acquire or read restore, and `exit-observed` already says the rest.
+          // Bare cause: whatever this settlement could not write is settled from it later (the
+          // settle recording it queues, or the next open or acquire); `exit-observed` says the rest.
           exitReason: unexpectedEvent.reason.slice(0, MAX_UNEXPECTED_EXIT_REASON_CHARS)
         })
       } catch (error) {
         context.onBarrierError?.(unexpectedEvent.sessionId, error)
       } finally {
-        session.hasProviderChild = false
-        context.publishStatus?.(unexpectedEvent.sessionId)
+        endChild()
         if (released) {
-          session.fence = released.lease.runtimeFence
           context.publishFence(unexpectedEvent.sessionId, session)
         }
       }
     }
-    if (settlementFailed || !released) {
-      return null
-    }
-    // Resuming a start that failed would respawn into the same failure; the next send retries.
-    if (exitedDuringStartup || !context.hasResumeCapableHolder(unexpectedEvent.sessionId)) {
-      return null
-    }
-    return {
-      sessionId: unexpectedEvent.sessionId,
-      releasedFence: released.lease.runtimeFence,
-      deadAcquisitionGeneration: unexpectedEvent.acquisitionGeneration,
-      stableSettlementId
-    }
   })
 }
 
-export function isStructuredAgentSessionRecoveryTicketCurrent(
-  context: {
-    store: Pick<StructuredAgentSessionLeaseStore, 'getRecord'>
-    sessions: Map<
-      string,
-      Pick<
-        StructuredAgentSessionUnexpectedExitSession,
-        'hasProviderChild' | 'fence' | 'acquisitionGeneration'
-      >
-    >
-    hasResumeCapableHolder: (sessionId: string) => boolean
-  },
-  ticket: StructuredAgentSessionRecoveryTicket
-): boolean {
-  const session = context.sessions.get(ticket.sessionId)
-  const record = context.store.getRecord(ticket.sessionId)
-  return (
-    session?.hasProviderChild === false &&
-    session.fence === ticket.releasedFence &&
-    session.acquisitionGeneration === ticket.deadAcquisitionGeneration &&
-    record?.lease.runtimeFence === ticket.releasedFence &&
-    record.lease.claimStatus === 'released' &&
-    record.lease.handoffStage === null &&
-    context.hasResumeCapableHolder(ticket.sessionId)
-  )
-}
-
 async function retryUnexpectedExitSettlement(input: {
   context: Pick<StructuredAgentSessionUnexpectedExitContext, 'onBarrierError'>
   event: UnexpectedExitLifecycleEvent
-  session: Pick<StructuredAgentSessionUnexpectedExitSession, 'journal' | 'fence'>
+  journal: DeadGenerationJournal
+  fence: number
   stableSettlementId: string
   verdict: StructuredAgentSessionTurnVerdict
   exitedDuringStartup: boolean
+  failureTextContext: AgentSessionFailureWordsContext
   showUnexpectedExitOutcome?: boolean
 }): Promise<boolean> {
   return settleStructuredAgentSessionDeadGeneration({
-    journal: input.session.journal,
+    journal: input.journal,
     sessionId: input.event.sessionId,
-    fence: input.session.fence,
+    fence: input.fence,
     settlementId: input.stableSettlementId,
     verdict: input.verdict,
     pendingSubmissionReason: 'provider_exited_before_acknowledgement',
     showUnexpectedExitOutcome: input.showUnexpectedExitOutcome,
-    unexpectedExitReason: input.event.reason,
-    exitedDuringStartup: input.exitedDuringStartup,
+    ...(input.event.failure ? { exitFailure: input.event.failure } : {}),
+    failureTextContext: input.failureTextContext,
+    ...(input.exitedDuringStartup
+      ? { exitedDuringStartup: { generation: input.event.acquisitionGeneration } }
+      : {}),
     onError: input.context.onBarrierError
   })
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-view-start-after-failed-start.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-view-start-after-failed-start.test.ts
new file mode 100644
index 000000000000..957ac2f275db
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-view-start-after-failed-start.test.ts
@@ -0,0 +1,212 @@
+// A Claude chat whose CLI exits before it finishes starting leaves one red row per start. A view
+// opening, or coming back to, a chat whose last start failed used to start the CLI again, so every
+// look at the chat added an identical row. Only a send retries a failed start: it is the user asking.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import { ClaudeStructuredSessionAdapter } from '../../claude/claude-structured-session-adapter'
+import {
+  fakeClaude,
+  PROVIDER_SESSION_ID
+} from '../../claude/claude-structured-session-test-support'
+import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  hostTestAttachParams,
+  hostTestMessage,
+  hostTestOperationId,
+  resetHostTestOperationIds
+} from './structured-agent-session-host-test-data'
+
+/** Delivery runs on its own serialized steps; under a loaded runner they take more than a second. */
+function eventually(assertion: () => unknown): Promise<unknown> {
+  return vi.waitFor(assertion, { timeout: 10_000 })
+}
+
+const CALLER = { callerKey: 'client-1' }
+const SURFACE = 'desktop-chat:1'
+const LAUNCH_FAILURE =
+  'claude stream-json exited (code 1): qa-shim: simulated claude launch failure'
+
+let root: string
+let store: AgentSessionRecordStore
+let host: StructuredAgentSessionHost
+let adapter: ClaudeStructuredSessionAdapter
+let claude: ReturnType<typeof fakeClaude>
+let lifecycle: Promise<void>[]
+/** Every initialize waits on it: a start that must outlast a step does not race a timer. */
+let initGate: Promise<void>
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-view-start-after-failed-start-'))
+  resetHostTestOperationIds()
+  lifecycle = []
+  initGate = Promise.resolve()
+  // Every start spawns, is published, and exits before it answers initialize.
+  claude = fakeClaude({ initDelayMs: 20, exitBeforeInit: LAUNCH_FAILURE })
+  adapter = new ClaudeStructuredSessionAdapter({
+    resolveLaunch: async () => ({
+      pathToClaudeCodeExecutable: 'claude',
+      options: {},
+      cwd: root,
+      claudeConfigDir: join(root, 'claude-home'),
+      providerSessionId: PROVIDER_SESSION_ID,
+      resumeLeafUuid: null,
+      resumesTranscript: (store.getRecord(SESSION)?.providerHandleChain.length ?? 0) > 0,
+      continuesChain: (store.getRecord(SESSION)?.providerHandleChain.length ?? 0) > 0
+    }),
+    onEvent: (event) => {
+      const mapped = structuredClaudeLifecycleEvent(event)
+      if (mapped) {
+        lifecycle.push(host.handleAdapterEvent(mapped))
+      }
+    },
+    openConnection: async (launch, handlers) => {
+      const connection = await claude.openConnection(launch, handlers)
+      const initialize = connection.initializationResult
+      return Object.assign(connection, {
+        initializationResult: async () => {
+          await initGate
+          return initialize()
+        }
+      })
+    },
+    readProcessStartTime: async () => 1_700_000_000_000,
+    now: () => NOW
+  })
+  store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
+  host = new StructuredAgentSessionHost({
+    store,
+    adapter: Object.assign(adapter, { supportsCreate: () => true }),
+    journalRoot: root,
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => `spawn-${claude.connections.length + 1}`,
+    now: () => NOW
+  })
+})
+
+afterEach(async () => {
+  await adapter.closeAll()
+  await host.flushAllStreamedEvents()
+  await rm(root, { recursive: true, force: true })
+})
+
+/** Waits until the adapter has published every exit it saw and the host settled each one. */
+async function settleExits(): Promise<void> {
+  await eventually(async () => {
+    await adapter.drainObservedExits()
+    await Promise.all(lifecycle)
+    expect((await host.journalSnapshot(SESSION)).items.length).toBeGreaterThan(0)
+  })
+  await Promise.all(lifecycle)
+}
+
+/** A view of the chat: a subscription, which reads the chat and starts nothing. */
+function view(id: string): Promise<() => void> {
+  return host.subscribe({ id, sessionId: SESSION, emit: () => undefined })
+}
+
+/** The chat as it renders: the user's messages and the error rows, in journal order. */
+async function timeline(): Promise<string[]> {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.body.kind === 'message'
+      ? ['message']
+      : item.body.kind === 'status' && item.body.tone === 'error'
+        ? [item.body.text]
+        : []
+  )
+}
+
+async function send(text: string): Promise<string> {
+  const body = hostTestMessage(text)
+  const sent = await host.send(CALLER, {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: store.getRecord(SESSION)?.lease.runtimeFence ?? 1,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.send',
+        sessionId: SESSION,
+        fields: { body }
+      })
+    },
+    body
+  })
+  expect(sent).toMatchObject({ ok: true })
+  return sent.ok ? sent.value.clientMessageId : ''
+}
+
+describe('a fresh chat whose Claude start fails', () => {
+  // QA saw three failed starts from opening the chat alone: the create's, and the view's.
+  it.each([
+    ['after the create already died', false],
+    ['while the create is still starting', true]
+  ] as const)(
+    'starts once for the open and once for a send, one row each, when the view binds %s',
+    async (_when, createStillStarting) => {
+      // Released only once the views bound, so no runner is slow enough to let the create die first.
+      let releaseCreate = (): void => {}
+      const createGate = new Promise<void>((resolve) => {
+        releaseCreate = resolve
+      })
+      if (!createStillStarting) {
+        releaseCreate()
+      }
+      initGate = createGate
+      claude = fakeClaude({ exitBeforeInit: LAUNCH_FAILURE })
+      await expect(
+        host.attach(
+          CALLER,
+          hostTestAttachParams(null, {
+            provider: 'claude',
+            agent: 'claude',
+            accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: join(root, 'claude-home') },
+            providerHandle: { kind: 'claude', sessionId: PROVIDER_SESSION_ID, leafUuid: null }
+          })
+        )
+      ).resolves.toMatchObject({ ok: true })
+      if (!createStillStarting) {
+        await settleExits()
+      }
+      // Two surfaces bind, as a pane and a second window do.
+      const unsubscribe = await view(SURFACE)
+      await view('desktop-chat:2')
+      if (createStillStarting) {
+        // The views bound to the create's child itself, before it exited.
+        expect(await timeline()).toEqual([])
+        releaseCreate()
+      }
+      await settleExits()
+      // The row says the provider stopped; its stderr stays out of the sentence.
+      const startFailure =
+        'Claude stopped before it finished starting. Send your message to try again.'
+      // Opening the chat: the create's start, once, and its row.
+      expect(claude.connections).toHaveLength(1)
+      expect(await timeline()).toEqual([startFailure])
+
+      const sent = await send('reply with exactly: alpha')
+      await eventually(async () =>
+        expect(
+          (await host.journalSnapshot(SESSION)).submissions.find((s) => s.clientMessageId === sent)
+        ).toMatchObject({ dispatchState: 'rejected', reason: startFailure })
+      )
+      await settleExits()
+      // The send's own start, once, and one row for it below the message.
+      expect(claude.connections).toHaveLength(2)
+      expect(await timeline()).toEqual([startFailure, 'message', startFailure])
+
+      // Switching away and back re-subscribes; it starts nothing and adds no row.
+      unsubscribe()
+      await view(SURFACE)
+      await settleExits()
+      expect(claude.connections).toHaveLength(2)
+      expect(await timeline()).toEqual([startFailure, 'message', startFailure])
+    }
+  )
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-wedged-profile-migration.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-wedged-profile-migration.test.ts
index 0778d2711291..a492b0b65ce1 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-wedged-profile-migration.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-wedged-profile-migration.test.ts
@@ -6,9 +6,9 @@
 // conversation — the journal, the provider handle chain, and the recorded evidence all survive.
 //
 // "Usable" means ACQUIRABLE, not acquired. Startup no longer resumes a provider child for a record
-// nobody is looking at; a surface taking a hold is what spawns one. So the migration's job is to
-// leave the lease in a state a hold can claim, and these tests prove that by adjudicating it rather
-// than by reading fields off it.
+// nobody is looking at; work that needs the agent is what spawns one. So the migration's job is to
+// leave the lease in a state an attach can claim, and these tests prove that by adjudicating it
+// rather than by reading fields off it.
 
 import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -149,6 +149,11 @@ function openHost(overrides: Partial<StructuredAgentSessionHostDeps> = {}): void
   })
 }
 
+/** The host starting the agent with no message to deliver, as an operation that needs it does. */
+function startAgent(): Promise<unknown> {
+  return host['serialize'](SESSION, () => host['mutationContext']().ensureAgent(SESSION))
+}
+
 beforeEach(async () => {
   root = await mkdtemp(join(tmpdir(), 'orca-wedged-profile-'))
   resetHostTestOperationIds()
@@ -186,6 +191,9 @@ function isAcquirable(lease: NonNullable<ReturnType<typeof store.getRecord>>['le
   )
 }
 
+/** After the owner's last renewal, so a turn it proves dead ends at its start, never before. */
+const SEEDED_TURN_STARTED_AT = NOW - 5_000
+
 async function seedRunningTurn(provider: 'codex' | 'claude' = 'codex'): Promise<void> {
   const journal = await openAgentSessionJournal({
     identity: {
@@ -204,7 +212,7 @@ async function seedRunningTurn(provider: 'codex' | 'claude' = 'codex'): Promise<
     provider === 'codex'
       ? { provider: 'codex', threadId: THREAD, turnId: 'turn-1', ordinal: 0 }
       : { provider: 'claude', sessionId: 'provider-session-alpha-1', uuid: 'uuid-running' },
-    { kind: 'turn', turnId: 'turn-1', state: 'running', startedAt: NOW - 5_000 },
+    { kind: 'turn', turnId: 'turn-1', state: 'running', startedAt: SEEDED_TURN_STARTED_AT },
     { fence: 13 }
   )
   await journal.close()
@@ -301,6 +309,16 @@ describe('already-wedged profiles become usable on load', () => {
       'a quit that left the owner for a probe to prove gone',
       wedgedRecord({ claimStatus: 'live', handoffStage: null, ownerProcess: DEAD_OWNER }),
       null,
+      { state: 'interrupted', completedAt: SEEDED_TURN_STARTED_AT }
+    ],
+    [
+      'a quit that left an owner on a host this one cannot probe',
+      wedgedRecord({
+        claimStatus: 'live',
+        handoffStage: null,
+        ownerProcess: { ...DEAD_OWNER, hostId: 'remote-host' }
+      }),
+      null,
       { state: 'unverifiable' }
     ]
   ] as const)(
@@ -309,8 +327,18 @@ describe('already-wedged profiles become usable on load', () => {
       await seedStore({ ...seeded, lease: { ...seeded.lease, deathEvidence } })
       await seedRunningTurn()
       const published: AgentSessionStatusSummary[] = []
+      const remote = seeded.lease.ownerProcess?.hostId === 'remote-host'
       openHost({
-        statusSink: { publish: (summary) => published.push(summary), forget: () => {} }
+        statusSink: { publish: (summary) => published.push(summary), forget: () => {} },
+        // Loss of contact is never proof of death: a remote owner only ever probes indeterminate.
+        ...(remote
+          ? {
+              probeOwner: async () => ({
+                outcome: 'indeterminate' as const,
+                reason: 'owner runs on remote-host, which this host cannot probe'
+              })
+            }
+          : {})
       })
 
       await host.restoreReadableSessions()
@@ -323,28 +351,50 @@ describe('already-wedged profiles become usable on load', () => {
         ...verdict
       })
       expect(activeStructuredAgentSessionTurnId(restoredJournal().snapshot().items)).toBe(null)
+      // The row never carries the proof's detail, which is Orca's log text.
+      const statusRows = restoredJournal()
+        .snapshot()
+        .items.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : []))
+      expect(statusRows).toEqual(
+        remote
+          ? []
+          : [
+              'Codex stopped while this response was in progress. You can continue in this conversation.'
+            ]
+      )
       // What the sidebar reads: every status this restart published says the chat is not working.
       expect(published.filter((summary) => summary.sessionId === SESSION)).not.toEqual([])
       expect(published.map((summary) => summary.status)).not.toContain('working')
+      // A crash is not something the user did: no outcome is claimed, so no reader files it as a
+      // cancellation the user already knows about.
+      expect(published.map((summary) => summary.turnOutcome)).toEqual(
+        published.map(() => undefined)
+      )
     }
   )
 
-  it('settles restart eviction through attach when a hold arrives before the boot sweep', async () => {
+  it('settles restart eviction through attach when a start arrives before the boot sweep', async () => {
     await seedStore(
       wedgedRecord({ claimStatus: 'live', handoffStage: null, ownerProcess: DEAD_OWNER })
     )
     await seedRunningTurn()
     openHost()
 
-    await host.hold(SESSION, 'desktop-chat:restart')
+    // The attach adjudicates the dead owner first, which moves the fence; like a client's ensure,
+    // it is retried at the fence the refusal names.
+    const stale = await host.attach(CALLER, hostTestAttachParams(13))
+    const fence = stale.ok ? 13 : (stale.refusal.currentFence ?? 13)
+    expect(stale.ok || stale.refusal.code === 'agent_session_checkpoint_stale').toBe(true)
+    expect(stale.ok || (await host.attach(CALLER, hostTestAttachParams(fence))).ok).toBe(true)
 
     expect(acquire).toHaveBeenCalledOnce()
     expect(activeStructuredAgentSessionTurnId(restoredJournal().snapshot().items)).toBe(null)
-    // A pid probe proved the owner gone; nobody saw it exit, so the turn has no end.
+    // A pid probe proved the owner gone, so the turn was cut short when it was last proven alive.
     expect(turnLifecycle('turn-1')).toEqual({
       turnId: 'turn-1',
-      state: 'unverifiable',
+      state: 'interrupted',
       startedAt: NOW - 5_000,
+      completedAt: SEEDED_TURN_STARTED_AT,
       recovered: true
     })
     expect(store.getRecord(SESSION)?.lease).toMatchObject({
@@ -398,7 +448,7 @@ describe('already-wedged profiles become usable on load', () => {
     ['a restart eviction', false],
     ['a proven eviction by recovery', true]
   ] as const)(
-    'settles the turn %s left even when the handle it was restored with never writes',
+    'settles the turn %s left at the next acquire when the read restore could not write it',
     async (_origin, ownerOutlivedRestart) => {
       await seedStore(
         wedgedRecord({ claimStatus: 'live', handoffStage: null, ownerProcess: DEAD_OWNER })
@@ -415,15 +465,13 @@ describe('already-wedged profiles become usable on load', () => {
             : { outcome: 'pid-absent' },
         stopOwnerProcess
       })
-      // The read restore's settlement fails, and the handle it restored with never writes again.
+      // The read restore's settlement fails, and nothing retries it.
       const failing = vi
         .spyOn(AgentSessionJournal.prototype, 'appendLifecycleBatch')
         .mockRejectedValue(new Error('journal unavailable'))
       await host.restoreReadableSessions()
       failing.mockRestore()
-      vi.spyOn(restoredJournal(), 'appendLifecycleBatch').mockRejectedValue(
-        new Error('journal unavailable')
-      )
+      expect(activeStructuredAgentSessionTurnId(restoredJournal().snapshot().items)).toBe('turn-1')
       expect(stopOwnerProcess).toHaveBeenCalledTimes(ownerOutlivedRestart ? 1 : 0)
       expect(store.getRecord(SESSION)?.lease).toMatchObject({
         claimStatus: 'released',
@@ -431,15 +479,16 @@ describe('already-wedged profiles become usable on load', () => {
         deathEvidence: { kind: 'pid-absent' }
       })
 
-      await host.hold(SESSION, 'desktop-chat:restart')
+      await startAgent()
 
       expect(acquire).toHaveBeenCalledOnce()
       expect(store.getRecord(SESSION)?.lease).toMatchObject({ claimStatus: 'live' })
-      // A pid probe proved the owner gone; nobody saw it exit, so the turn has no end.
+      // A pid probe proved the owner gone, so the turn was cut short when it was last proven alive.
       expect(turnLifecycle('turn-1')).toEqual({
         turnId: 'turn-1',
-        state: 'unverifiable',
+        state: 'interrupted',
         startedAt: NOW - 5_000,
+        completedAt: SEEDED_TURN_STARTED_AT,
         recovered: true
       })
     }
@@ -655,7 +704,8 @@ describe('already-wedged profiles become usable on load', () => {
     await host.restoreReadableSessions()
     expect(order).toEqual([])
     expect(scan).not.toHaveBeenCalled()
-    await host.hold(SESSION, 'holder-1')
+    const fence = store.getRecord(SESSION)?.lease.runtimeFence ?? null
+    expect(await host.attach(CALLER, hostTestAttachParams(fence))).toMatchObject({ ok: true })
 
     expect(order).toEqual(['acquire'])
   })
@@ -681,9 +731,9 @@ describe('already-wedged profiles become usable on load', () => {
     })
     expect(acquire).not.toHaveBeenCalled()
 
-    // The user quits that terminal: the next open proves it gone and the chat takes over.
+    // The user quits that terminal: the next start proves it gone and the chat takes over.
     probe = { outcome: 'pid-absent' }
-    await host.hold(SESSION, 'holder-1')
+    await startAgent()
     expect(acquire).toHaveBeenCalledOnce()
     expect(stopOwnerProcess).not.toHaveBeenCalled()
   })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-working-at-teardown.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-working-at-teardown.ts
index 8eac02dc17b7..366ce1cf948e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-working-at-teardown.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-working-at-teardown.ts
@@ -17,6 +17,7 @@ import {
   agentSessionProviderHandleRoot
 } from '../../../shared/agent-session-provider-handle'
 import { latestStructuredAgentSessionUserItem } from '../../../shared/structured-agent-session-projection'
+import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import type {
   AgentSessionResumeMarker,
@@ -135,8 +136,7 @@ function liveTasks(
 type WorkingCandidateSession = {
   journal: AgentSessionJournal
   /** Only this host generation's own child counts. A restored-for-reading journal has none. */
-  hasProviderChild: boolean
-  fence?: number
+  child: { fence: number } | null
 }
 
 /** The offer one session is owed, taken right before teardown stops its provider child; null when
@@ -154,16 +154,24 @@ export function structuredAgentSessionWorkingAtStop(input: {
 }): AgentSessionResumeMarker | null {
   const { sessionId, session } = input
   // A journal this host cannot read tells us nothing about what the turn was doing.
-  if (!session?.hasProviderChild || session.journal.isReadOnly) {
+  if (!session?.child || session.journal.isReadOnly) {
     return null
   }
   const snapshot = session.journal.snapshot()
+  // A queued message reached no agent, so it is no work to resume: quit rejects it as never sent.
+  const handedOver = snapshot.submissions.filter(
+    (submission) => !isQueuedAgentJournalSubmission(submission)
+  )
   const roster = input.backgroundTasks(sessionId)
-  const status = structuredAgentSessionShownStatus(snapshot, roster, session.fence)
+  const status = structuredAgentSessionShownStatus(
+    { items: snapshot.items, submissions: handedOver },
+    roster,
+    session.child.fence
+  )
   if (status.state === 'done') {
     return null
   }
-  const work = structuredAgentSessionResumeWork(snapshot.items, snapshot.submissions)
+  const work = structuredAgentSessionResumeWork(snapshot.items, handedOver)
   const head = agentSessionProviderHandleChainHead(
     input.getRecord(sessionId)?.providerHandleChain ?? []
   )
@@ -184,6 +192,7 @@ export function structuredAgentSessionWorkingAtStop(input: {
     recordedAt: input.now,
     trigger: input.trigger,
     teardownId: input.teardownId,
+    journalCursor: snapshot.cursor,
     // Root, not key: the close path advances Claude's leaf moments after this runs, and a key
     // comparison would then refuse the session forever.
     providerHandleRoot: agentSessionProviderHandleRoot(head.handle),
diff --git a/src/main/native-chat/agent-session-wire/structured-compaction-recovery.test.ts b/src/main/native-chat/agent-session-wire/structured-compaction-recovery.test.ts
new file mode 100644
index 000000000000..4c565bcf4e2f
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-compaction-recovery.test.ts
@@ -0,0 +1,48 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import { settleInterruptedCompaction } from './structured-compaction-recovery'
+
+describe('settleInterruptedCompaction', () => {
+  it("records the unconfirmed compaction in its fact's own words, on the row and the command", async () => {
+    const command = {
+      command: 'compact' as const,
+      state: 'unknown' as const,
+      phase: 'prepared' as const,
+      operationId: 'op-1',
+      callerKey: 'client-1',
+      runtimeFence: 1
+    }
+    const setConversationCommand = vi.fn(async () => undefined)
+    const store = {
+      getRecord: () => ({ conversationCommand: command }),
+      setConversationCommand,
+      recordOperationOutcome: vi.fn(async () => undefined)
+    }
+    const appendItem = vi.fn(async () => ({ cursor: { epoch: 'e', sequence: 1 } }))
+
+    await settleInterruptedCompaction(
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the function reads only the members stubbed above.
+      store as unknown as AgentSessionRecordStore,
+      'session-1',
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the function calls only `appendItem`.
+      { appendItem } as unknown as AgentSessionJournal,
+      2
+    )
+
+    const words = {
+      text: 'Compaction completion is unconfirmed.',
+      failure: { kind: 'compactionUnconfirmed' }
+    }
+    expect(appendItem).toHaveBeenCalledWith(
+      { provider: 'orca', clientMessageId: 'compact:op-1' },
+      { kind: 'status', ...words },
+      { fence: 2 }
+    )
+    expect(setConversationCommand).toHaveBeenCalledWith(
+      'session-1',
+      2,
+      expect.objectContaining({ error: words.text, failure: words.failure, state: 'unknown' })
+    )
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-compaction-recovery.ts b/src/main/native-chat/agent-session-wire/structured-compaction-recovery.ts
index 2199da053922..b581d746f620 100644
--- a/src/main/native-chat/agent-session-wire/structured-compaction-recovery.ts
+++ b/src/main/native-chat/agent-session-wire/structured-compaction-recovery.ts
@@ -1,3 +1,5 @@
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 
@@ -9,21 +11,38 @@ export async function recoverInterruptedCompaction(
   fence: number
 ): Promise<void> {
   const command = store.getRecord(sessionId)?.conversationCommand
-  if (
-    command?.command !== 'compact' ||
-    command.phase !== 'prepared' ||
-    command.runtimeFence === undefined ||
-    command.runtimeFence === fence
-  ) {
+  if (command?.runtimeFence === undefined || command.runtimeFence === fence) {
     return
   }
-  const error = 'Previous compaction completion could not be confirmed after session recovery.'
+  await settleInterruptedCompaction(store, sessionId, journal, fence)
+}
+
+/** A compaction still prepared whose child can no longer finish it: its outcome is unknown. */
+export async function settleInterruptedCompaction(
+  store: AgentSessionRecordStore,
+  sessionId: string,
+  journal: AgentSessionJournal,
+  fence: number
+): Promise<void> {
+  const command = store.getRecord(sessionId)?.conversationCommand
+  if (command?.command !== 'compact' || command.phase !== 'prepared') {
+    return
+  }
+  const words = agentSessionFailureWords(agentSessionFailureFact('compactionUnconfirmed'), {
+    surface: 'row'
+  })
   await journal.appendItem(
     { provider: 'orca', clientMessageId: `compact:${command.operationId}` },
-    { kind: 'status', text: error },
+    { kind: 'status', ...words },
     { fence }
   )
-  const recovered = { ...command, phase: 'committed' as const, state: 'unknown' as const, error }
+  const recovered = {
+    ...command,
+    phase: 'committed' as const,
+    state: 'unknown' as const,
+    error: words.text,
+    failure: words.failure
+  }
   await store.setConversationCommand(sessionId, fence, recovered)
   await store.recordOperationOutcome({
     callerKey: command.callerKey,
diff --git a/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.test.ts b/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.test.ts
index 5a3370c910f5..fe3e443c4959 100644
--- a/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.test.ts
@@ -29,12 +29,12 @@ describe('conversationCommandBlocked background tasks', () => {
       contextWith({ state: 'monitoring', supportsTaskStop: true }),
       RECORD
     )
-    expect(blocked).toBe('Stop background tasks before using this command.')
+    expect(blocked?.message).toBe('Stop background tasks before using this command.')
   })
 
   it('asks for a stop on a host that predates the stop-capability field', () => {
     const blocked = conversationCommandBlocked(contextWith({ state: 'monitoring' }), RECORD)
-    expect(blocked).toBe('Stop background tasks before using this command.')
+    expect(blocked?.message).toBe('Stop background tasks before using this command.')
   })
 
   it('asks the user to wait when the provider exposes no stop at all', () => {
@@ -43,7 +43,7 @@ describe('conversationCommandBlocked background tasks', () => {
       contextWith({ state: 'monitoring', supportsStopAll: false }),
       RECORD
     )
-    expect(blocked).toBe('Wait for background tasks to finish before using this command.')
+    expect(blocked?.message).toBe('Wait for background tasks to finish before using this command.')
   })
 
   it('still refuses on the open turn, not on the work the strip now shows', () => {
@@ -63,7 +63,7 @@ describe('conversationCommandBlocked background tasks', () => {
           }
         ]
       }) as unknown as ReturnType<typeof ctx.journal.snapshot>
-    expect(conversationCommandBlocked(ctx, RECORD)).toBe(
+    expect(conversationCommandBlocked(ctx, RECORD)?.message).toBe(
       'Wait for the current turn to finish before using this command.'
     )
   })
diff --git a/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.ts b/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.ts
index 78b9f4a59d0f..cecdbbf0b139 100644
--- a/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.ts
+++ b/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.ts
@@ -1,33 +1,51 @@
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import { activeStructuredAgentSessionTurnId } from '../../../shared/structured-agent-session-projection'
 import type { AgentSessionTurnContext } from './structured-agent-session-turns'
+import {
+  refuse,
+  type AgentSessionRefusalReason,
+  type AgentSessionWireRefusal
+} from '../../../shared/agent-session-wire-refusals'
+
+function blocked(
+  reason: AgentSessionRefusalReason<'agent_session_operation_invalid'>,
+  message: string
+): AgentSessionWireRefusal {
+  return refuse('agent_session_operation_invalid', { reason }, message)
+}
 
 export function conversationCommandBlocked(
   ctx: AgentSessionTurnContext,
   record: AgentSessionRecord
-): string | null {
+): AgentSessionWireRefusal | null {
   const items = ctx.journal.snapshot().items
   if (record.rewind?.phase === 'prepared' || record.rewind?.phase === 'provider-succeeded') {
-    return 'agent_session_rewind:outcome-unknown'
+    return blocked('rewindUnconfirmed', 'agent_session_rewind:outcome-unknown')
   }
   if (
     record.conversationCommand?.command === 'clear' &&
     record.conversationCommand.phase === 'committed' &&
     record.conversationCommand.replacementSessionId
   ) {
-    return 'This conversation has been cleared. Open the current conversation to continue.'
+    return blocked(
+      'conversationCleared',
+      'This conversation has been cleared. Open the current conversation to continue.'
+    )
   }
   if (
     record.conversationCommand?.state === 'unknown' &&
     record.conversationCommand.phase === 'prepared'
   ) {
-    return 'The previous conversation operation is unconfirmed.'
+    return blocked(
+      'conversationCommandUnconfirmed',
+      'The previous conversation operation is unconfirmed.'
+    )
   }
   if (record.lease.handoffStage || record.lease.handoffOperationId) {
-    return 'Wait for the session handoff to finish.'
+    return blocked('handoffInFlight', 'Wait for the session handoff to finish.')
   }
   if (activeStructuredAgentSessionTurnId(items)) {
-    return 'Wait for the current turn to finish before using this command.'
+    return blocked('turnActive', 'Wait for the current turn to finish before using this command.')
   }
   if (
     items.some(
@@ -36,23 +54,35 @@ export function conversationCommandBlocked(
         item.body.resolution.state === 'pending'
     )
   ) {
-    return 'Resolve the pending question or approval before using this command.'
+    return blocked(
+      'promptPending',
+      'Resolve the pending question or approval before using this command.'
+    )
   }
   const backgroundTasks = ctx.adapter.backgroundTaskState?.(ctx.sessionId)
   if (backgroundTasks?.state === 'monitoring') {
     // Only ask for a stop the host can actually perform. A provider that
     // exposes neither a targeted nor an untargeted stop would otherwise leave
     // the command refused behind an instruction nobody can follow.
-    return backgroundTasks.supportsTaskStop || backgroundTasks.supportsStopAll !== false
-      ? 'Stop background tasks before using this command.'
-      : 'Wait for background tasks to finish before using this command.'
+    return blocked(
+      'backgroundTasksRunning',
+      backgroundTasks.supportsTaskStop || backgroundTasks.supportsStopAll !== false
+        ? 'Stop background tasks before using this command.'
+        : 'Wait for background tasks to finish before using this command.'
+    )
   }
   if (
-    ctx.journal
-      .submissions()
-      .some((entry) => entry.dispatchState === 'pending' || entry.dispatchState === 'unknown')
+    ctx.journal.submissions().some(
+      (entry) =>
+        entry.dispatchState === 'pending' ||
+        // Doubt left by an earlier child is not this one's work in flight.
+        (entry.dispatchState === 'unknown' && entry.recovered !== true && entry.fence === ctx.fence)
+    )
   ) {
-    return 'Resolve pending or unconfirmed messages before using this command.'
+    return blocked(
+      'messagesUnsettled',
+      'Resolve pending or unconfirmed messages before using this command.'
+    )
   }
   return null
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-conversation-command-controller.ts b/src/main/native-chat/agent-session-wire/structured-conversation-command-controller.ts
index e5a0283ba836..662ec70e8dd9 100644
--- a/src/main/native-chat/agent-session-wire/structured-conversation-command-controller.ts
+++ b/src/main/native-chat/agent-session-wire/structured-conversation-command-controller.ts
@@ -1,3 +1,4 @@
+import { refuse } from '../../../shared/agent-session-wire-refusals'
 import { sendStructuredAgentSessionTurn } from './structured-agent-session-host-mutations'
 import {
   runStructuredConversationCommand,
@@ -20,10 +21,11 @@ export class StructuredConversationCommandController {
     this.pending.has(params.envelope.sessionId)
       ? Promise.resolve({
           ok: false,
-          refusal: {
-            code: 'agent_session_operation_invalid',
-            message: 'Wait for the conversation operation to finish.'
-          }
+          refusal: refuse(
+            'agent_session_operation_invalid',
+            { reason: 'conversationCommandInFlight' },
+            'Wait for the conversation operation to finish.'
+          )
         })
       : sendStructuredAgentSessionTurn(this.context(), caller, params)
 
@@ -33,10 +35,11 @@ export class StructuredConversationCommandController {
     if (pending && pending.key !== key) {
       return Promise.resolve({
         ok: false as const,
-        refusal: {
-          code: 'agent_session_operation_invalid' as const,
-          message: 'Wait for the conversation operation to finish.'
-        }
+        refusal: refuse(
+          'agent_session_operation_invalid',
+          { reason: 'conversationCommandInFlight' },
+          'Wait for the conversation operation to finish.'
+        )
       })
     }
     const entry = pending ?? { key, count: 0 }
diff --git a/src/main/native-chat/agent-session-wire/structured-conversation-command.test.ts b/src/main/native-chat/agent-session-wire/structured-conversation-command.test.ts
index 37d8d4ee83d7..445326f60b09 100644
--- a/src/main/native-chat/agent-session-wire/structured-conversation-command.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-conversation-command.test.ts
@@ -6,7 +6,11 @@ import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-ses
 import type { AgentSessionConversationCommand } from '../../../shared/agent-session-conversation-command'
 import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
-import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import {
+  AgentSessionAcquisitionRefusal,
+  type StructuredAgentSessionAdapter
+} from './structured-agent-session-adapter'
+import type { StructuredSessionCompactionResult } from './structured-session-compaction'
 import {
   HOST_TEST_NOW,
   HOST_TEST_SESSION,
@@ -43,7 +47,7 @@ function commandParams(command: AgentSessionConversationCommand) {
 beforeEach(async () => {
   resetHostTestOperationIds()
   acquisitions = 0
-  compact.mockReset().mockResolvedValue({})
+  compact.mockReset().mockResolvedValue({ outcome: 'compacted' })
   directory = await mkdtemp(join(tmpdir(), 'orca-conversation-command-'))
   store = await AgentSessionRecordStore.open({
     directory: join(directory, 'store'),
@@ -117,7 +121,7 @@ describe('host conversation commands', () => {
     })
     expect(compact).toHaveBeenCalledTimes(1)
     expect(adapter.dispatch).not.toHaveBeenCalled()
-    const history = host.history({ sessionId: HOST_TEST_SESSION, direction: 'tail' })
+    const history = await host.history({ sessionId: HOST_TEST_SESSION, direction: 'tail' })
     expect(history.page.submissions).toEqual([])
     expect(
       history.page.items.some(
@@ -127,12 +131,47 @@ describe('host conversation commands', () => {
   })
 
   it('reports provider compaction failure without a stuck lifecycle', async () => {
-    compact.mockResolvedValue({ error: 'Not enough messages to compact.' })
+    const detail = { text: 'Not enough messages to compact.', audience: 'person' as const }
+    compact.mockResolvedValue({ outcome: 'failed', detail })
+    const failure = { kind: 'compactionFailed', detail }
     expect(await host.conversationCommand(caller, commandParams('compact'))).toMatchObject({
       ok: true,
-      value: { state: 'completed', error: 'Not enough messages to compact.' }
+      value: {
+        state: 'completed',
+        error: 'Compaction failed: Not enough messages to compact.',
+        failure
+      }
     })
     expect(store.getRecord(HOST_TEST_SESSION)?.conversationCommand?.state).toBe('completed')
+    const rows = await host.history({ sessionId: HOST_TEST_SESSION, direction: 'tail' })
+    expect(rows.ok && rows.page.items.map((item) => item.body)).toContainEqual({
+      kind: 'status',
+      text: 'Compaction failed: Not enough messages to compact.',
+      failure
+    })
+  })
+
+  it('says only that compaction failed when the provider gave no words', async () => {
+    compact.mockResolvedValue({ outcome: 'failed' })
+    expect(await host.conversationCommand(caller, commandParams('compact'))).toMatchObject({
+      ok: true,
+      value: { error: 'Compaction failed.', failure: { kind: 'compactionFailed' } }
+    })
+  })
+
+  it('records a compaction the provider never confirmed as unconfirmed, not failed', async () => {
+    compact.mockResolvedValue({ outcome: 'unconfirmed' })
+    const failure = { kind: 'compactionUnconfirmed' }
+    expect(await host.conversationCommand(caller, commandParams('compact'))).toMatchObject({
+      ok: true,
+      value: { error: 'Compaction completion is unconfirmed.', failure }
+    })
+    const rows = await host.history({ sessionId: HOST_TEST_SESSION, direction: 'tail' })
+    expect(rows.ok && rows.page.items.map((item) => item.body)).toContainEqual({
+      kind: 'status',
+      text: 'Compaction completion is unconfirmed.',
+      failure
+    })
   })
 
   it('keeps an unknown compaction from being executed again', async () => {
@@ -204,7 +243,7 @@ describe('host conversation commands', () => {
     })
     expect(store.getRecord(HOST_TEST_SESSION)).not.toBeNull()
     expect(store.listVisibleSessionIds()).toEqual([nextId])
-    expect(host.history({ sessionId: nextId, direction: 'tail' }).page.items).toEqual([])
+    expect((await host.history({ sessionId: nextId, direction: 'tail' })).page.items).toEqual([])
     expect(await host.conversationCommand(caller, params)).toMatchObject({
       ok: true,
       replayed: true,
@@ -236,7 +275,13 @@ describe('host conversation commands', () => {
     })
     expect(await host.conversationCommand(caller, commandParams('clear'))).toMatchObject({
       ok: true,
-      value: { state: 'completed', replacementSessionId: undefined, error: expect.any(String) }
+      value: {
+        state: 'completed',
+        replacementSessionId: undefined,
+        // The refusal's message is Orca's log text; the result words its situation.
+        error: "Codex couldn't start. Start a new chat to continue.",
+        failure: { kind: 'startFailed', refusal: { code: 'structured_agent_session_unsupported' } }
+      }
     })
     expect(store.listVisibleSessionIds()).toEqual([HOST_TEST_SESSION])
     expect(acquisitions).toBe(1)
@@ -245,6 +290,31 @@ describe('host conversation commands', () => {
     })
   })
 
+  it('tells the user to run /clear again when the replacement could not start', async () => {
+    vi.mocked(adapter.acquire).mockRejectedValueOnce(new Error('spawn codex ENOENT'))
+    expect(await host.conversationCommand(caller, commandParams('clear'))).toMatchObject({
+      ok: true,
+      value: { state: 'completed', error: "Codex couldn't start. Run /clear again." }
+    })
+  })
+
+  it('keeps the situation a refused replacement start named', async () => {
+    vi.mocked(adapter.acquire).mockRejectedValueOnce(
+      new AgentSessionAcquisitionRefusal('Codex is not signed in.', 'notSignedIn')
+    )
+    expect(await host.conversationCommand(caller, commandParams('clear'))).toMatchObject({
+      ok: true,
+      value: {
+        state: 'completed',
+        replacementSessionId: undefined,
+        // The next step is the command the user ran, not a message into the old conversation.
+        error: 'Codex is not signed in for the selected account. Sign in, then run /clear again.',
+        failure: { kind: 'notSignedIn' }
+      }
+    })
+    expect(store.listVisibleSessionIds()).toEqual([HOST_TEST_SESSION])
+  })
+
   it('runs a command whose fence the client has not caught up to', async () => {
     const params = commandParams('compact')
     params.envelope.expectedRuntimeFence++
@@ -252,7 +322,7 @@ describe('host conversation commands', () => {
     expect(compact).toHaveBeenCalledTimes(1)
   })
   it('allows cancellation while compaction is awaiting completion and refuses a second client', async () => {
-    let finish!: (value: {}) => void
+    let finish!: (value: StructuredSessionCompactionResult) => void
     compact.mockImplementation(
       () =>
         new Promise((resolve) => {
@@ -280,7 +350,7 @@ describe('host conversation commands', () => {
     })
     expect(cancel).toMatchObject({ ok: true, value: { cancelled: true } })
     expect(adapter.cancelTurn).toHaveBeenCalled()
-    finish({})
+    finish({ outcome: 'compacted' })
     await running
   })
 
@@ -306,7 +376,7 @@ describe('host conversation commands', () => {
     compact.mockRejectedValue(new Error('connection lost'))
     const params = commandParams('compact')
     await expect(host.conversationCommand(caller, params)).rejects.toThrow()
-    await compact.mock.calls[0]![0].onLateResult?.({})
+    await compact.mock.calls[0]![0].onLateResult?.({ outcome: 'compacted' })
     expect(await host.conversationCommand(caller, params)).toMatchObject({
       ok: true,
       replayed: true,
@@ -343,7 +413,7 @@ describe('host conversation commands', () => {
       replayed: true,
       value: { state: 'unknown' }
     })
-    compact.mockResolvedValue({})
+    compact.mockResolvedValue({ outcome: 'compacted' })
     expect(await host.conversationCommand(caller, commandParams('compact'))).toMatchObject({
       ok: true,
       value: { state: 'completed' }
diff --git a/src/main/native-chat/agent-session-wire/structured-conversation-command.ts b/src/main/native-chat/agent-session-wire/structured-conversation-command.ts
index 5894defc4839..2075c24d7bb0 100644
--- a/src/main/native-chat/agent-session-wire/structured-conversation-command.ts
+++ b/src/main/native-chat/agent-session-wire/structured-conversation-command.ts
@@ -16,9 +16,55 @@ import {
 } from './structured-agent-session-attach'
 import { admitAndRunAgentSessionMutation } from './structured-agent-session-mutation-admission'
 import type { StructuredAgentSessionMutationContext } from './structured-agent-session-host-mutations'
+import {
+  openWithAgent,
+  structuredAgentSessionFailureWordsContext
+} from './structured-agent-session-send-preparation'
 import type { StructuredAgentSessionCaller } from './structured-agent-session-host-types'
 import type { StructuredAgentSessionHost } from './structured-agent-session-host'
 import { conversationCommandBlocked } from './structured-conversation-command-admission'
+import {
+  agentSessionFailureFact,
+  type AgentSessionFailureFact
+} from '../../../shared/agent-session-failure'
+import {
+  agentSessionFailureWords,
+  type AgentSessionFailureWordsContext
+} from '../../../shared/agent-session-failure-words'
+import { structuredAgentSessionStartFailureFact } from './structured-agent-session-failure-text'
+import type { StructuredSessionCompactionResult } from './structured-session-compaction'
+
+/** A compaction that did not succeed, keeping only what the provider wrote for a person. */
+function compactionFailure(
+  result: StructuredSessionCompactionResult
+): AgentSessionFailureFact | undefined {
+  switch (result.outcome) {
+    case 'compacted':
+      return undefined
+    case 'unconfirmed':
+      return agentSessionFailureFact('compactionUnconfirmed')
+    case 'failed':
+      return agentSessionFailureFact('compactionFailed', { detail: result.detail })
+  }
+}
+
+function compactionStatusBody(failure: AgentSessionFailureFact | undefined) {
+  return failure
+    ? { kind: 'status' as const, ...agentSessionFailureWords(failure, { surface: 'row' }) }
+    : { kind: 'status' as const, text: 'Conversation compacted.' }
+}
+
+/** A command's `error` is the sentence its row shows. */
+function conversationCommandFailure(
+  failure: AgentSessionFailureFact | undefined,
+  context: AgentSessionFailureWordsContext = {}
+) {
+  if (!failure) {
+    return {}
+  }
+  const words = agentSessionFailureWords(failure, { ...context, surface: 'row' })
+  return { error: words.text, failure: words.failure }
+}
 
 export type ConversationCommandParams = {
   envelope: AgentSessionMutationEnvelope
@@ -52,6 +98,8 @@ export function runStructuredConversationCommand(
       adapter: context.deps.adapter,
       callerKey: caller.callerKey,
       envelope,
+      // Only the provider can do this, so an agent at rest is started first.
+      prepareSession: openWithAgent(context, params.envelope),
       journal: () => context.sessions.get(sessionId)?.journal,
       publish: (journal) => context.publish(sessionId, journal),
       flushStreamedEvents: context.flushStreamedEvents,
@@ -90,10 +138,7 @@ export function runStructuredConversationCommand(
               ? null
               : conversationCommandBlocked(ctx, record)
           if (blocked) {
-            return {
-              ok: false,
-              refusal: { code: 'agent_session_operation_invalid', message: blocked }
-            }
+            return { ok: false, refusal: blocked }
           }
           const replacementSessionId =
             command === 'clear'
@@ -113,7 +158,7 @@ export function runStructuredConversationCommand(
             ...(replacementSessionId ? { replacementSessionId } : {})
           }
           await store.setConversationCommand(sessionId, ctx.fence, prepared)
-          let error: string | undefined
+          let failure: AgentSessionFailureFact | undefined
           if (command === 'clear' && replacementSessionId) {
             const attach: AgentSessionAttachParams = {
               envelope: {
@@ -149,12 +194,19 @@ export function runStructuredConversationCommand(
               ) {
                 throw new Error(acquired.refusal.message)
               }
+              // The refusal's message is Orca's log text; the result keeps its situation instead.
               const failed = {
                 ...prepared,
                 replacementSessionId: undefined,
                 phase: 'committed' as const,
                 state: 'completed' as const,
-                error: acquired.refusal.message.slice(0, 4096)
+                ...conversationCommandFailure(
+                  structuredAgentSessionStartFailureFact({
+                    refusal: acquired.refusal,
+                    newSession: true
+                  }),
+                  { ...structuredAgentSessionFailureWordsContext(record), command: 'clear' }
+                )
               }
               await store.setConversationCommand(sessionId, ctx.fence, failed)
               return { ok: true, value: failed }
@@ -177,7 +229,7 @@ export function runStructuredConversationCommand(
               { fence: ctx.fence }
             )
             try {
-              error = (
+              failure = compactionFailure(
                 await ctx.adapter.compact({
                   turnId: `compact:${clientOperationId}`,
                   sessionId,
@@ -191,16 +243,15 @@ export function runStructuredConversationCommand(
                         return
                       }
                       await host.flushStreamedEvents(sessionId)
-                      await ctx.journal.appendItem(
-                        identity,
-                        { kind: 'status', text: result.error ?? 'Conversation compacted.' },
-                        { fence: ctx.fence }
-                      )
+                      const late = compactionFailure(result)
+                      await ctx.journal.appendItem(identity, compactionStatusBody(late), {
+                        fence: ctx.fence
+                      })
                       await store.setConversationCommand(sessionId, ctx.fence, {
                         ...prepared,
                         phase: 'committed',
                         state: 'completed',
-                        ...(result.error ? { error: result.error.slice(0, 4096) } : {})
+                        ...conversationCommandFailure(late)
                       })
                       await store.recordOperationOutcome({
                         callerKey: caller.callerKey,
@@ -213,27 +264,25 @@ export function runStructuredConversationCommand(
                       })
                     })
                 })
-              ).error
+              )
               await host.flushStreamedEvents(sessionId)
             } catch (cause) {
               await ctx.journal.appendItem(
                 identity,
-                { kind: 'status', text: 'Compaction completion is unconfirmed.' },
+                compactionStatusBody(agentSessionFailureFact('compactionUnconfirmed')),
                 { fence: ctx.fence }
               )
               throw cause
             }
-            await ctx.journal.appendItem(
-              identity,
-              { kind: 'status', text: error ?? 'Conversation compacted.' },
-              { fence: ctx.fence }
-            )
+            await ctx.journal.appendItem(identity, compactionStatusBody(failure), {
+              fence: ctx.fence
+            })
           }
           const completed = {
             ...prepared,
             phase: 'committed' as const,
             state: 'completed' as const,
-            ...(error ? { error: error.slice(0, 4096) } : {})
+            ...conversationCommandFailure(failure)
           }
           await store.setConversationCommand(sessionId, ctx.fence, completed)
           return { ok: true, value: completed }
diff --git a/src/main/native-chat/agent-session-wire/structured-rewind-journal-body.test.ts b/src/main/native-chat/agent-session-wire/structured-rewind-journal-body.test.ts
index 6fa4d32293b9..9de1925791fa 100644
--- a/src/main/native-chat/agent-session-wire/structured-rewind-journal-body.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-rewind-journal-body.test.ts
@@ -2,6 +2,13 @@ import { describe, expect, it } from 'vitest'
 import { AgentSessionRewindRecordSchema } from '../../../shared/agent-session-rewind'
 import { restoreRewindJournalBody } from './structured-rewind-journal-body'
 
+/** A row this build cannot place: still a row, never its stored JSON, and not a failure — a
+ *  hostFault's "Try again" would be false for a placeholder. */
+const UNPLACEABLE = {
+  kind: 'status',
+  text: 'Orca could not show this item after the rewind.'
+}
+
 describe('rewind recovery of newer durable records', () => {
   it('keeps an unknown message role and block readable without discarding the row', () => {
     expect(
@@ -43,16 +50,13 @@ describe('rewind recovery of newer durable records', () => {
       input: { path: 'file' },
       state: 'paused-by-provider'
     }
-    expect(restoreRewindJournalBody(body)).toEqual({ kind: 'status', text: JSON.stringify(body) })
+    expect(restoreRewindJournalBody(body)).toEqual(UNPLACEABLE)
     const status = {
       kind: 'status' as const,
       text: 'state',
       turnLifecycle: { turnId: 'turn', state: 'future-state' }
     }
-    expect(restoreRewindJournalBody(status)).toEqual({
-      kind: 'status',
-      text: JSON.stringify(status)
-    })
+    expect(restoreRewindJournalBody(status)).toEqual(UNPLACEABLE)
   })
   it.each(['interrupted', 'unverifiable'] as const)(
     'keeps a %s turn and its recorded endpoints',
@@ -82,10 +86,7 @@ describe('rewind recovery of newer durable records', () => {
     }
     expect(restoreRewindJournalBody(turn)).toEqual(turn)
     const unknown = { ...turn, state: 'future-state' }
-    expect(restoreRewindJournalBody(unknown)).toEqual({
-      kind: 'status',
-      text: JSON.stringify(unknown)
-    })
+    expect(restoreRewindJournalBody(unknown)).toEqual(UNPLACEABLE)
   })
   it('keeps a known turn outcome across rewind recovery in both journal shapes', () => {
     const turn = {
diff --git a/src/main/native-chat/agent-session-wire/structured-rewind-journal-body.ts b/src/main/native-chat/agent-session-wire/structured-rewind-journal-body.ts
index addc234e2a13..99489b18769a 100644
--- a/src/main/native-chat/agent-session-wire/structured-rewind-journal-body.ts
+++ b/src/main/native-chat/agent-session-wire/structured-rewind-journal-body.ts
@@ -9,10 +9,15 @@ import { NATIVE_CHAT_ROLES } from '../../../shared/native-chat-types'
 
 type StoredBody = AgentSessionRewindRecord['retained'][number]['body']
 
-/** Unknown future values remain visible evidence, never invented turn or prompt state. */
+/** A row this build cannot place stays visible as a row, never invented turn or prompt state —
+ *  and never as its stored JSON, which is Orca's record, not something a person reads. */
 export function restoreRewindJournalBody(body: StoredBody): AgentJournalItemBody {
   let normalized: unknown = body
-  const fallback = () => ({ kind: 'status', text: JSON.stringify(body) })
+  // A placeholder, not a failure anyone can act on, so it carries no fact.
+  const fallback = () => ({
+    kind: 'status',
+    text: 'Orca could not show this item after the rewind.'
+  })
   if (body.kind === 'message') {
     normalized = {
       ...body,
diff --git a/src/main/native-chat/agent-session-wire/structured-rewind-refusal.ts b/src/main/native-chat/agent-session-wire/structured-rewind-refusal.ts
index 5ea205a527cd..af309b13f405 100644
--- a/src/main/native-chat/agent-session-wire/structured-rewind-refusal.ts
+++ b/src/main/native-chat/agent-session-wire/structured-rewind-refusal.ts
@@ -2,23 +2,28 @@ import {
   AGENT_SESSION_REWIND_REASONS,
   type AgentSessionRewindReason
 } from '../../../shared/agent-session-rewind'
-import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
+import { refuse, type AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
 
 export function rewindRefusal(reason: AgentSessionRewindReason): {
   ok: false
   refusal: AgentSessionWireRefusal
 } {
-  const knownReason =
+  const rewindReason =
     AGENT_SESSION_REWIND_REASONS.find((value) => value === reason) ?? 'outcome-unknown'
+  const message = `agent_session_rewind:${rewindReason}`
   return {
     ok: false,
-    refusal: {
-      code:
-        knownReason === 'outcome-unknown'
-          ? 'agent_session_operation_unknown'
-          : 'agent_session_operation_invalid',
-      message: `agent_session_rewind:${knownReason}`,
-      rewindReason: knownReason
-    }
+    refusal:
+      rewindReason === 'outcome-unknown'
+        ? refuse(
+            'agent_session_operation_unknown',
+            { reason: 'rewindUnconfirmed', rewindReason },
+            message
+          )
+        : refuse(
+            'agent_session_operation_invalid',
+            { reason: 'rewindRefused', rewindReason },
+            message
+          )
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-session-compaction.test.ts b/src/main/native-chat/agent-session-wire/structured-session-compaction.test.ts
index 13a22b655b31..8936a4a28d07 100644
--- a/src/main/native-chat/agent-session-wire/structured-session-compaction.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-session-compaction.test.ts
@@ -6,7 +6,7 @@ describe('structured compaction lifecycle', () => {
     const tracker = new StructuredSessionCompaction()
     const finished = vi.fn()
     const result = tracker
-      .run('session', 'thread', async () => ({}))
+      .run('session', 'thread', async () => undefined)
       .then((value) => {
         finished()
         return value
@@ -28,7 +28,7 @@ describe('structured compaction lifecycle', () => {
       threadId: 'thread',
       turn: { id: 'compact-turn', status: 'completed' }
     })
-    await expect(result).resolves.toEqual({})
+    await expect(result).resolves.toEqual({ outcome: 'compacted' })
   })
 
   it('observes notifications arriving before the request acknowledgment', async () => {
@@ -41,7 +41,10 @@ describe('structured compaction lifecycle', () => {
           turn: { id: 'c', status: 'failed', error: { message: 'Unavailable' } }
         })
       })
-    ).resolves.toEqual({ error: 'Unavailable' })
+    ).resolves.toEqual({
+      outcome: 'failed',
+      detail: { text: 'Unavailable', audience: 'person' }
+    })
   })
 
   it.each(['success', 'failed'])(
@@ -63,7 +66,12 @@ describe('structured compaction lifecycle', () => {
         result: ''
       })
       await expect(result).resolves.toEqual(
-        state === 'success' ? {} : { error: 'Not enough messages to compact.' }
+        state === 'success'
+          ? { outcome: 'compacted' }
+          : {
+              outcome: 'failed',
+              detail: { text: 'Not enough messages to compact.', audience: 'person' }
+            }
       )
     }
   )
@@ -72,26 +80,26 @@ describe('structured compaction lifecycle', () => {
     const tracker = new StructuredSessionCompaction()
     const pending = tracker.run('s', 'p', async () => {})
     tracker.ended('s')
-    await expect(pending).resolves.toEqual({ error: 'The provider exited during compaction.' })
+    await expect(pending).resolves.toEqual({ outcome: 'unconfirmed' })
     const next = tracker.run('s', 'p', async () => {
       tracker.claude('s', { type: 'system', subtype: 'compact_boundary', session_id: 'p' })
       tracker.claude('s', { type: 'result', subtype: 'success', session_id: 'p' })
     })
-    await expect(next).resolves.toEqual({})
+    await expect(next).resolves.toEqual({ outcome: 'compacted' })
   })
   it('reconciles a terminal frame after timeout without repeating the provider request', async () => {
     vi.useFakeTimers()
     try {
       const tracker = new StructuredSessionCompaction(10)
       const late = vi.fn(async () => {})
-      const invoke = vi.fn(async () => ({}))
+      const invoke = vi.fn(async () => undefined)
       const result = tracker.run('s', 'p', invoke, late)
       const rejected = expect(result).rejects.toThrow('unconfirmed')
       await vi.advanceTimersByTimeAsync(11)
       await rejected
       tracker.claude('s', { type: 'system', subtype: 'compact_boundary', session_id: 'p' })
       tracker.claude('s', { type: 'result', subtype: 'success', session_id: 'p' })
-      expect(late).toHaveBeenCalledWith({})
+      expect(late).toHaveBeenCalledWith({ outcome: 'compacted' })
       expect(invoke).toHaveBeenCalledTimes(1)
     } finally {
       vi.useRealTimers()
@@ -100,9 +108,34 @@ describe('structured compaction lifecycle', () => {
 
   it('does not mistake an unrelated completed turn for compaction', async () => {
     const tracker = new StructuredSessionCompaction()
-    const result = tracker.run('s', 't', async () => ({}))
+    const result = tracker.run('s', 't', async () => undefined)
     tracker.codex('s', 'turn/started', { threadId: 't', turn: { id: 'c' } })
     tracker.codex('s', 'turn/completed', { threadId: 't', turn: { id: 'c', status: 'completed' } })
-    await expect(result).resolves.toEqual({ error: 'Compaction did not complete.' })
+    await expect(result).resolves.toEqual({ outcome: 'unconfirmed' })
+  })
+
+  it('fails, not merely unconfirmed, a Codex compaction turn that did not complete', async () => {
+    const tracker = new StructuredSessionCompaction()
+    const result = tracker.run('s', 't', async () => undefined)
+    tracker.codex('s', 'turn/started', { threadId: 't', turn: { id: 'c' } })
+    tracker.codex('s', 'turn/completed', {
+      threadId: 't',
+      turn: { id: 'c', status: 'interrupted' }
+    })
+    await expect(result).resolves.toEqual({ outcome: 'failed' })
+  })
+
+  it('leaves a Claude turn that ended without confirming compaction unconfirmed', async () => {
+    const tracker = new StructuredSessionCompaction()
+    const result = tracker.run('s', 'p', async () => {})
+    tracker.claude('s', { type: 'result', subtype: 'success', session_id: 'p' })
+    await expect(result).resolves.toEqual({ outcome: 'unconfirmed' })
+  })
+
+  it('fails a Claude compaction whose turn ended in error', async () => {
+    const tracker = new StructuredSessionCompaction()
+    const result = tracker.run('s', 'p', async () => {})
+    tracker.claude('s', { type: 'result', subtype: 'error_during_execution', session_id: 'p' })
+    await expect(result).resolves.toEqual({ outcome: 'failed' })
   })
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-session-compaction.ts b/src/main/native-chat/agent-session-wire/structured-session-compaction.ts
index 328c283dc118..5f5c88d0b075 100644
--- a/src/main/native-chat/agent-session-wire/structured-session-compaction.ts
+++ b/src/main/native-chat/agent-session-wire/structured-session-compaction.ts
@@ -1,10 +1,32 @@
+import { providerDiagnostic, type ProviderDiagnostic } from '../../../shared/agent-session-failure'
+
+/** How a compaction ended. `unconfirmed`: the provider never said whether it compacted, so it may
+ *  have. `detail` is the provider's own words for a failure, when it gave any. */
+export type StructuredSessionCompactionResult =
+  | { outcome: 'compacted' }
+  | { outcome: 'failed'; detail?: ProviderDiagnostic }
+  | { outcome: 'unconfirmed' }
+
+/** A compaction that never began: refused before it was sent, or by the provider at the request. */
+export type StructuredSessionCompactionRefusal = Extract<
+  StructuredSessionCompactionResult,
+  { outcome: 'failed' }
+>
+
+function compactionFailed(
+  detail: ProviderDiagnostic | undefined
+): StructuredSessionCompactionRefusal {
+  return { outcome: 'failed', ...(detail ? { detail } : {}) }
+}
+
 type PendingCompaction = {
   identity: string
   commandTurnId?: string
   turnId?: string
-  error?: string
+  /** The provider reported the compaction failed, with its words when it gave any. */
+  failed?: { detail?: ProviderDiagnostic }
   compacted: boolean
-  finish: (result: { error?: string }) => void
+  finish: (result: StructuredSessionCompactionResult) => void
 }
 
 function record(value: unknown): Record<string, unknown> {
@@ -26,17 +48,17 @@ export class StructuredSessionCompaction {
   async run(
     sessionId: string,
     identity: string,
-    invoke: () => Promise<unknown>,
-    onLateResult?: (result: { error?: string }) => Promise<void>,
+    invoke: () => Promise<StructuredSessionCompactionRefusal | undefined>,
+    onLateResult?: (result: StructuredSessionCompactionResult) => Promise<void>,
     commandTurnId?: string
-  ): Promise<{ error?: string }> {
+  ): Promise<StructuredSessionCompactionResult> {
     if (this.pending.has(sessionId)) {
       throw new Error('Compaction is already running.')
     }
     let timer: ReturnType<typeof setTimeout>
     let expired = false
-    const completion = new Promise<{ error?: string }>((resolve, reject) => {
-      const finish = (result: { error?: string }) => {
+    const completion = new Promise<StructuredSessionCompactionResult>((resolve, reject) => {
+      const finish = (result: StructuredSessionCompactionResult) => {
         this.pending.delete(sessionId)
         if (expired && onLateResult) {
           void onLateResult(result).catch((error) =>
@@ -60,9 +82,9 @@ export class StructuredSessionCompaction {
     // Observe rejection even while invoke is waiting for its own receipt.
     void completion.catch(() => {})
     try {
-      const admission = record(await invoke())
-      if (typeof admission.error === 'string') {
-        this.pending.get(sessionId)?.finish({ error: admission.error })
+      const refusal = await invoke()
+      if (refusal) {
+        this.pending.get(sessionId)?.finish(compactionFailed(refusal.detail))
       }
       return await completion
     } catch (error) {
@@ -89,7 +111,8 @@ export class StructuredSessionCompaction {
   }
 
   ended(sessionId: string): void {
-    this.pending.get(sessionId)?.finish({ error: 'The provider exited during compaction.' })
+    // It may have compacted before it exited.
+    this.pending.get(sessionId)?.finish({ outcome: 'unconfirmed' })
   }
 
   codex(sessionId: string, method: string, value: unknown): void {
@@ -108,9 +131,11 @@ export class StructuredSessionCompaction {
     if (method === 'turn/completed' && turn.id === pending.turnId) {
       const error = record(turn.error).message
       pending.finish(
-        turn.status === 'completed' && pending.compacted
-          ? {}
-          : { error: typeof error === 'string' ? error : 'Compaction did not complete.' }
+        turn.status !== 'completed'
+          ? compactionFailed(
+              typeof error === 'string' ? providerDiagnostic(error, 'person') : undefined
+            )
+          : { outcome: pending.compacted ? 'compacted' : 'unconfirmed' }
       )
     }
   }
@@ -121,8 +146,12 @@ export class StructuredSessionCompaction {
       return
     }
     if (message.compact_result === 'failed') {
-      pending.error =
-        typeof message.compact_error === 'string' ? message.compact_error : 'Compaction failed.'
+      pending.failed = {
+        detail:
+          typeof message.compact_error === 'string'
+            ? providerDiagnostic(message.compact_error, 'person')
+            : undefined
+      }
     }
     if (message.compact_result === 'success' || message.subtype === 'compact_boundary') {
       pending.compacted = true
@@ -132,12 +161,13 @@ export class StructuredSessionCompaction {
         message.is_error === true ||
         (typeof message.subtype === 'string' && message.subtype.startsWith('error'))
       ) {
-        pending.error ??= 'Compaction did not complete.'
+        pending.failed ??= {}
       }
-      const error =
-        pending.error ??
-        (pending.compacted ? undefined : 'Compaction was not confirmed by the provider.')
-      pending.finish(error ? { error } : {})
+      pending.finish(
+        pending.failed
+          ? compactionFailed(pending.failed.detail)
+          : { outcome: pending.compacted ? 'compacted' : 'unconfirmed' }
+      )
     }
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/unhandled-provider-frame.ts b/src/main/native-chat/agent-session-wire/unhandled-provider-frame.ts
index cbb0857c8591..915bbad5e545 100644
--- a/src/main/native-chat/agent-session-wire/unhandled-provider-frame.ts
+++ b/src/main/native-chat/agent-session-wire/unhandled-provider-frame.ts
@@ -1,4 +1,4 @@
-import type { AgentJournalStatusItem } from '../../../shared/agent-session-journal-types'
+import type { AgentJournalPlainStatusItem } from '../../../shared/agent-session-journal-types'
 import {
   boundInlineText,
   boundPayload,
@@ -12,7 +12,7 @@ import {
 } from './provider-frame-disposition'
 
 export type UnhandledProviderFrameJournalItem = {
-  body: AgentJournalStatusItem
+  body: AgentJournalPlainStatusItem
   /** Why the frame surfaced. Error frames are exempt from generic-row caps. */
   classification: 'timeline-substantive' | 'error-surface'
 }
diff --git a/src/main/native-chat/claude-structured-managed-account-support.ts b/src/main/native-chat/claude-structured-managed-account-support.ts
index dccf6216bda8..3b42c44c443f 100644
--- a/src/main/native-chat/claude-structured-managed-account-support.ts
+++ b/src/main/native-chat/claude-structured-managed-account-support.ts
@@ -43,12 +43,19 @@ export function structuredClaudeMatchesActiveManagedAccount(
     // apart after the fact: honest deselection, where ambient auth is the truth and the UI names no
     // identity, and the WSL-only case, where the prune emptied the host slot and persisted null
     // while the UI still names the WSL account. The presence of any WSL-bound account decides.
-    return !accounts.some((candidate) => candidate.managedAuthRuntime === 'wsl')
+    return !hasWslBoundClaudeAccount(settings)
   }
   const active = accounts.find((candidate) => candidate.id === activeHostId)
   return active ? active.managedAuthRuntime !== 'wsl' : false
 }
 
+/** Whether any managed Claude account lives in WSL, the account shape the gate refuses over. */
+export function hasWslBoundClaudeAccount(settings: ClaudeManagedAccountGateSettings): boolean {
+  return (settings.claudeManagedAccounts ?? []).some(
+    (candidate) => candidate.managedAuthRuntime === 'wsl'
+  )
+}
+
 /** Reads the gate's settings, answering null when they cannot be read so callers refuse. */
 export function readClaudeManagedAccountGateSettings(
   getSettings: () => ClaudeManagedAccountGateSettings
diff --git a/src/main/native-chat/fork-native-chat-relay/transcript-tail-reader.ts b/src/main/native-chat/fork-native-chat-relay/transcript-tail-reader.ts
index 499d8dfb8f95..45481cadb7c8 100644
--- a/src/main/native-chat/fork-native-chat-relay/transcript-tail-reader.ts
+++ b/src/main/native-chat/fork-native-chat-relay/transcript-tail-reader.ts
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/main/native-chat/transcript-tail-reader.ts
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 import { open, stat } from 'node:fs/promises'
 import type { AgentType, NativeChatMessage } from '../../../shared/native-chat-types'
 import {
diff --git a/src/main/native-chat/fork-native-chat-relay/transcript-watch-subscription.ts b/src/main/native-chat/fork-native-chat-relay/transcript-watch-subscription.ts
index fc2999f4d92e..52e0dc450e25 100644
--- a/src/main/native-chat/fork-native-chat-relay/transcript-watch-subscription.ts
+++ b/src/main/native-chat/fork-native-chat-relay/transcript-watch-subscription.ts
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/main/native-chat/transcript-watch.ts
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 import { extname } from 'node:path'
 import type { NativeChatMessage } from '../../../shared/native-chat-types'
 import {
diff --git a/src/main/native-chat/structured-agent-session-history-adoption.ts b/src/main/native-chat/structured-agent-session-history-adoption.ts
index d470735b0320..e64e8f799d8f 100644
--- a/src/main/native-chat/structured-agent-session-history-adoption.ts
+++ b/src/main/native-chat/structured-agent-session-history-adoption.ts
@@ -5,6 +5,7 @@
 // journal, and a call site written there would compile however wrong it was. The runtime hands over
 // the facts it owns — the account homes it recognises, the records it holds — and this decides.
 
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import type { AgentSessionOperationRow } from '../../shared/agent-session-operation-ledger'
 import type { AgentSessionProviderHandle } from '../../shared/agent-session-journal-types'
 import type { AgentSessionLease, AgentSessionRecord } from '../../shared/agent-session-record'
@@ -106,10 +107,11 @@ export function findConflictingStructuredAdoption(input: {
 export function structuredAdoptionConflictError(
   ownership: StructuredAgentSessionAdoptionOwnership
 ): Error {
-  return new Error(
+  return agentSessionRefusalError(
     agentSessionLeaseAdmitsWriter(ownership.lease)
       ? 'agent_session_conflict'
-      : 'agent_session_ownership_unknown'
+      : 'agent_session_ownership_unknown',
+    { reason: 'conversationHeldElsewhere' }
   )
 }
 
@@ -152,5 +154,7 @@ export async function resolveStructuredAgentSessionAdoption(input: {
   }
   // Refuse rather than fall back to the default home. Resuming under a home that does not hold the
   // conversation is how a "resume" silently becomes a blank chat wearing the old chat's name.
-  throw new Error('agent_session_identity_required')
+  throw agentSessionRefusalError('agent_session_identity_required', {
+    reason: 'transcriptNotFound'
+  })
 }
diff --git a/src/main/network/macos-tailscale-dns-diagnostic.ts b/src/main/network/macos-tailscale-dns-diagnostic.ts
index a4dc948c0bdb..a8e5a92ef584 100644
--- a/src/main/network/macos-tailscale-dns-diagnostic.ts
+++ b/src/main/network/macos-tailscale-dns-diagnostic.ts
@@ -14,8 +14,28 @@ type CacheEntry = {
 
 let cache: CacheEntry | null = null
 
+// Symbolic errno/Chromium codes carry the weight because they are locale-independent; the
+// English phrases only add coverage, so a localized or reworded string costs the hint, never
+// a wrong message. Deliberately over-inclusive: a false candidate re-reads cached DNS state,
+// a missed one silently drops the diagnostic that explains a broken connection.
 const NETWORK_LOOKUP_FAILURE_RE =
-  /\b(?:ENOTFOUND|EAI_AGAIN|ESERVFAIL|ERR_NAME_NOT_RESOLVED)\b|lookup address|nodename nor servname|name resolution|dns|websocket|connection refused/i
+  /\b(?:ENOTFOUND|ENODATA|EAI_AGAIN|EAI_FAIL|EAI_NODATA|EAI_NONAME|ESERVFAIL|ERR_NAME_NOT_RESOLVED|ERR_NAME_RESOLUTION_FAILED|getaddrinfo)\b|lookup address|nodename nor servname|name resolution|name or service not known|no address associated with hostname|(?:could not|couldn't|cannot|can't|unable to|failed to) resolve|dns|websocket|connection refused/i
+
+const MAGIC_DNS_HINT =
+  'macOS is using Tailscale MagicDNS (100.100.100.100) as the only global DNS resolver; add an upstream DNS server to the active network service or configure Tailscale global nameservers, then retry.'
+
+/**
+ * Single source of truth for "could a DNS sample explain this failure?". The probe-admission
+ * gate and the hint decision must never disagree — a gate stricter than the hint test silently
+ * loses the diagnostic for a genuine DNS failure.
+ */
+export function isMacTailscaleDnsHintCandidate(message: string, detail?: string | null): boolean {
+  // Already hinted: re-wrapping a hinted message would match on its own "DNS" text.
+  if (message.endsWith(MAGIC_DNS_HINT)) {
+    return false
+  }
+  return NETWORK_LOOKUP_FAILURE_RE.test(`${message}\n${detail ?? ''}`)
+}
 
 function globalDnsSection(scutilOutput: string): string {
   const scopedStart = scutilOutput.indexOf('\nDNS configuration (for scoped queries)')
@@ -66,26 +86,31 @@ function readMacTailscaleDnsDiagnostic(now = Date.now()): DnsDiagnostic | null {
   return diagnostic
 }
 
+// Why: Claude/Codex own the failing API transports, so Orca can only point
+// users at the macOS resolver configuration that makes those transports fail.
+function appendMagicDnsHint(message: string, diagnostic: DnsDiagnostic | null): string {
+  return diagnostic ? `${message} ${MAGIC_DNS_HINT}` : message
+}
+
 export function withMacTailscaleDnsHintForDiagnostic(
   message: string,
   detail: string | null | undefined,
   diagnostic: DnsDiagnostic | null
 ): string {
-  const probeText = `${message}\n${detail ?? ''}`
-  if (!NETWORK_LOOKUP_FAILURE_RE.test(probeText)) {
+  return isMacTailscaleDnsHintCandidate(message, detail)
+    ? appendMagicDnsHint(message, diagnostic)
+    : message
+}
+
+export function withMacTailscaleDnsHint(message: string, detail?: string | null): string {
+  // The hint only describes macOS resolver state, so nothing off darwin can produce it.
+  if (process.platform !== 'darwin') {
     return message
   }
-  if (!diagnostic) {
+  if (!isMacTailscaleDnsHintCandidate(message, detail)) {
     return message
   }
-
-  // Why: Claude/Codex own the failing API transports, so Orca can only point
-  // users at the macOS resolver configuration that makes those transports fail.
-  return `${message} macOS is using Tailscale MagicDNS (100.100.100.100) as the only global DNS resolver; add an upstream DNS server to the active network service or configure Tailscale global nameservers, then retry.`
-}
-
-export function withMacTailscaleDnsHint(message: string, detail?: string | null): string {
-  return withMacTailscaleDnsHintForDiagnostic(message, detail, readMacTailscaleDnsDiagnostic())
+  return appendMagicDnsHint(message, readMacTailscaleDnsDiagnostic())
 }
 
 export function __resetMacTailscaleDnsDiagnosticCacheForTests(): void {
diff --git a/src/main/network/macos-tailscale-dns-probe-admission.test.ts b/src/main/network/macos-tailscale-dns-probe-admission.test.ts
new file mode 100644
index 000000000000..9297c356f138
--- /dev/null
+++ b/src/main/network/macos-tailscale-dns-probe-admission.test.ts
@@ -0,0 +1,160 @@
+import { execFileSync } from 'node:child_process'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { formatAgentCliFailureMessage } from '../text-generation/source-control-agent-failure'
+import {
+  __resetMacTailscaleDnsDiagnosticCacheForTests,
+  parseMacTailscaleDnsDiagnostic,
+  withMacTailscaleDnsHint,
+  withMacTailscaleDnsHintForDiagnostic
+} from './macos-tailscale-dns-diagnostic'
+
+vi.mock('node:child_process', () => ({ execFileSync: vi.fn() }))
+
+const MAGIC_DNS = 'DNS configuration\n  nameserver[0] : 100.100.100.100\n'
+const PUBLIC_DNS = 'DNS configuration\n  nameserver[0] : 1.1.1.1\n'
+
+beforeEach(() => {
+  vi.spyOn(process, 'platform', 'get').mockReturnValue('darwin')
+  vi.spyOn(Date, 'now').mockReturnValue(1_000)
+  vi.mocked(execFileSync).mockReset().mockReturnValue(MAGIC_DNS)
+  __resetMacTailscaleDnsDiagnosticCacheForTests()
+})
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  __resetMacTailscaleDnsDiagnosticCacheForTests()
+})
+
+describe('macOS DNS probe admission', () => {
+  it.each(['permission denied', 'authentication failed', 'PTY timeout', '', 'invalid JSON'])(
+    'does not probe for an unrelated error: %s',
+    (detail) => {
+      expect(withMacTailscaleDnsHint('Codex failed.', detail)).toBe('Codex failed.')
+      expect(execFileSync).not.toHaveBeenCalled()
+    }
+  )
+
+  it.each([
+    'ENOTFOUND',
+    'eai_again',
+    'lookup address',
+    'DNS failure',
+    'websocket',
+    'connection refused'
+  ])('still diagnoses a relevant detail: %s', (detail) => {
+    expect(withMacTailscaleDnsHint('Codex failed.', detail)).toContain('Tailscale MagicDNS')
+    expect(execFileSync).toHaveBeenCalledOnce()
+  })
+
+  it('recognizes a relevant message without detail', () => {
+    expect(withMacTailscaleDnsHint('ERR_NAME_NOT_RESOLVED')).toContain('Tailscale MagicDNS')
+    expect(execFileSync).toHaveBeenCalledOnce()
+  })
+
+  it.each(['linux', 'win32'] as const)('never probes on %s', (platform) => {
+    vi.spyOn(process, 'platform', 'get').mockReturnValue(platform)
+    expect(withMacTailscaleDnsHint('ENOTFOUND')).toBe('ENOTFOUND')
+    expect(execFileSync).not.toHaveBeenCalled()
+  })
+
+  it('does not warm the diagnostic cache for an unrelated failure', () => {
+    vi.mocked(execFileSync).mockReturnValue(PUBLIC_DNS)
+    withMacTailscaleDnsHint('permission denied')
+    expect(execFileSync).not.toHaveBeenCalled()
+
+    vi.mocked(execFileSync).mockReturnValue(MAGIC_DNS)
+    expect(withMacTailscaleDnsHint('ENOTFOUND')).toContain('Tailscale MagicDNS')
+    expect(execFileSync).toHaveBeenCalledOnce()
+  })
+
+  it('reuses the sample inside the five-minute window and refreshes it after', () => {
+    expect(withMacTailscaleDnsHint('ENOTFOUND')).toContain('Tailscale MagicDNS')
+
+    vi.mocked(Date.now).mockReturnValue(300_999)
+    vi.mocked(execFileSync).mockReturnValue(PUBLIC_DNS)
+    expect(withMacTailscaleDnsHint('ENOTFOUND')).toContain('Tailscale MagicDNS')
+
+    vi.mocked(Date.now).mockReturnValue(301_000)
+    expect(withMacTailscaleDnsHint('permission denied')).toBe('permission denied')
+    // The invariant is the resolver state the next relevant error reports, not the probe count.
+    expect(withMacTailscaleDnsHint('ENOTFOUND')).toBe('ENOTFOUND')
+  })
+
+  it.each(['empty output', 'failed command'])('retains negative caching for %s', (failure) => {
+    vi.mocked(execFileSync).mockImplementation(() => {
+      if (failure === 'failed command') {
+        throw new Error('probe failed')
+      }
+      return ''
+    })
+    expect(withMacTailscaleDnsHint('ENOTFOUND')).toBe('ENOTFOUND')
+    expect(withMacTailscaleDnsHint('EAI_AGAIN')).toBe('EAI_AGAIN')
+    expect(execFileSync).toHaveBeenCalledOnce()
+  })
+
+  it.each([
+    'EAI_NONAME',
+    'EAI_FAIL',
+    'ENODATA',
+    'getaddrinfo failed',
+    'could not resolve host orca.example',
+    'Name or service not known',
+    'ERR_NAME_RESOLUTION_FAILED',
+    'Temporary failure in name resolution'
+  ])('diagnoses the resolution failure wording %s', (detail) => {
+    expect(withMacTailscaleDnsHint('Codex failed.', detail)).toContain('Tailscale MagicDNS')
+  })
+
+  it('never lets probe admission change the message the hint decision would produce', () => {
+    const diagnostic = parseMacTailscaleDnsDiagnostic(MAGIC_DNS)
+    const details = [
+      'permission denied',
+      'authentication failed',
+      'PTY timeout',
+      'invalid JSON',
+      '',
+      'ENOTFOUND',
+      'EAI_AGAIN',
+      'EAI_NONAME',
+      'getaddrinfo failed',
+      'could not resolve host orca.example',
+      'connection refused',
+      'websocket closed'
+    ]
+
+    for (const detail of details) {
+      __resetMacTailscaleDnsDiagnosticCacheForTests()
+      expect(withMacTailscaleDnsHint('Codex failed.', detail)).toBe(
+        withMacTailscaleDnsHintForDiagnostic('Codex failed.', detail, diagnostic)
+      )
+    }
+  })
+
+  it('does not append or re-probe for a message that already carries the hint', () => {
+    const hinted = withMacTailscaleDnsHint('Codex failed.', 'ENOTFOUND')
+    expect(execFileSync).toHaveBeenCalledOnce()
+    // Past the cache window, so a second probe would run if the hint were re-admitted.
+    vi.mocked(Date.now).mockReturnValue(301_000)
+
+    expect(withMacTailscaleDnsHint(hinted, 'ENOTFOUND')).toBe(hinted)
+    expect(execFileSync).toHaveBeenCalledOnce()
+  })
+
+  it('avoids probing while formatting a local CLI permission failure', () => {
+    expect(formatAgentCliFailureMessage('Codex', '', 'permission denied', 1)).toBe(
+      'Codex CLI command failed with code 1: permission denied'
+    )
+    expect(execFileSync).not.toHaveBeenCalled()
+  })
+
+  it('keeps local network hints and honors the remote host opt-out', () => {
+    expect(
+      formatAgentCliFailureMessage('Codex', '', 'ENOTFOUND', 1, { includeLocalMacDnsHint: false })
+    ).toBe('Codex CLI command failed with code 1: ENOTFOUND')
+    expect(execFileSync).not.toHaveBeenCalled()
+    expect(formatAgentCliFailureMessage('Codex', '', 'ENOTFOUND', 1)).toContain(
+      'Tailscale MagicDNS'
+    )
+    expect(execFileSync).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/main/notebook/notebook-kernel.test.ts b/src/main/notebook/notebook-kernel.test.ts
index 899205dc2fe4..1ed290e3f9e9 100644
--- a/src/main/notebook/notebook-kernel.test.ts
+++ b/src/main/notebook/notebook-kernel.test.ts
@@ -8,21 +8,189 @@ vi.mock('../../../resources/notebook/kernel-bridge.py?asset&asarUnpack', () => (
 
 import { createFrameReader, startNotebookKernel } from './notebook-kernel'
 
+function collect(chunks: string[]): unknown[] {
+  const frames: unknown[] = []
+  const read = createFrameReader((frame) => frames.push(frame))
+  for (const chunk of chunks) {
+    read(chunk)
+  }
+  return frames
+}
+
 describe('createFrameReader', () => {
   it('reassembles frames split across chunks and skips stray lines', () => {
-    const frames: unknown[] = []
-    const read = createFrameReader((frame) => frames.push(frame))
-    read('warning: something printed\n{"type": "rea')
-    read('dy"}\n{"type": "stream", "content": {"name": "stdout", "text": "hi"}}\n[1, 2]\n')
-    read('{"type": "missing", "externallyManaged": true}\n{"type": "missing"}\n')
-    read('{"type": "unknown"}\n{"type": "done", "status": "ok", "execution_count": 3}\n{"partial')
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    try {
+      expect(
+        collect([
+          'warning: something printed\n{"type": "rea',
+          'dy"}\n{"type": "stream", "content": {"name": "stdout", "text": "hi"}}\n[1, 2]\n',
+          '{"type": "missing", "externallyManaged": true}\n{"type": "missing"}\n',
+          '{"type": "unknown"}\n{"type": "done", "status": "ok", "execution_count": 3}\n{"partial'
+        ])
+      ).toEqual([
+        { type: 'ready' },
+        { type: 'stream', content: { name: 'stdout', text: 'hi' } },
+        { type: 'missing', externallyManaged: true },
+        { type: 'missing', externallyManaged: false },
+        { type: 'done', status: 'ok', execution_count: 3 }
+      ])
+    } finally {
+      warn.mockRestore()
+    }
+  })
+
+  it('avoids repeatedly scanning an incomplete image record for newlines', () => {
+    const frame = { type: 'display_data', content: { data: { 'image/png': 'x'.repeat(524_288) } } }
+    const wire = `${JSON.stringify(frame)}\n`
+    const chunks: string[] = []
+    for (let offset = 0; offset < wire.length; offset += 4096) {
+      chunks.push(wire.slice(offset, offset + 4096))
+    }
+    const originalSplit: { split(separator: unknown, limit?: number): string[] }['split'] =
+      String.prototype.split
+    const originalIndexOf = String.prototype.indexOf
+    let scannedCharacters = 0
+    const split = vi.spyOn(String.prototype, 'split').mockImplementation(function (
+      this: string,
+      separator: unknown,
+      limit?: number
+    ) {
+      if (separator === '\n') {
+        scannedCharacters += this.length
+      }
+      return originalSplit.call(this, separator, limit)
+    })
+    const indexOf = vi.spyOn(String.prototype, 'indexOf').mockImplementation(function (
+      this: string,
+      search: string,
+      position = 0
+    ) {
+      const found = originalIndexOf.call(this, search, position)
+      if (search === '\n') {
+        scannedCharacters += (found === -1 ? this.length : found + 1) - position
+      }
+      return found
+    })
+    let frames: unknown[]
+    try {
+      frames = collect(chunks)
+    } finally {
+      split.mockRestore()
+      indexOf.mockRestore()
+    }
+    expect(frames).toEqual([frame])
+    expect(scannedCharacters).toBeLessThanOrEqual(wire.length * 2)
+  })
+
+  it('does not measure record bytes when no size limit applies', () => {
+    const frame = { type: 'display_data', content: { data: { 'image/png': 'x'.repeat(65_536) } } }
+    const byteLength = vi.spyOn(Buffer, 'byteLength')
+    let frames: unknown[]
+    let measurements: number
+    try {
+      frames = collect([`${JSON.stringify(frame)}\n`])
+      measurements = byteLength.mock.calls.length
+    } finally {
+      byteLength.mockRestore()
+    }
+    expect(frames).toEqual([frame])
+    expect(measurements).toBe(0)
+  })
+
+  it('preserves code units at every split boundary', () => {
+    const frames = [
+      { type: 'stream', content: { text: 'café 漢字 🐋\n\u0000' } },
+      { type: 'execute_result', content: { data: { 'text/plain': '42' } } },
+      { type: 'done', status: 'ok', execution_count: 3 }
+    ]
+    const wire = `${frames.map((frame) => JSON.stringify(frame)).join('\n')}\n`
+    for (let offset = 0; offset <= wire.length; offset++) {
+      expect(collect([wire.slice(0, offset), '', wire.slice(offset)])).toEqual(frames)
+    }
+    expect(collect(wire.split(''))).toEqual(frames)
+  })
+
+  it('skips malformed and unsupported records without losing valid neighbors', () => {
+    const wire = [
+      'startup warning',
+      '',
+      '  ',
+      'null',
+      '[]',
+      '{"type":"ready"}',
+      '{"type":"missing","externallyManaged":true}',
+      '{"type":"missing","externallyManaged":"true"}',
+      '{"type":"stream","content":[]}',
+      '{"type":"unknown","content":{}}',
+      '{"type":"done","status":12,"execution_count":"3"}',
+      ''
+    ].join('\r\n')
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    let frames: unknown[]
+    let reported: number
+    try {
+      frames = collect([wire])
+      reported = warn.mock.calls.length
+    } finally {
+      warn.mockRestore()
+    }
     expect(frames).toEqual([
       { type: 'ready' },
-      { type: 'stream', content: { name: 'stdout', text: 'hi' } },
       { type: 'missing', externallyManaged: true },
       { type: 'missing', externallyManaged: false },
-      { type: 'done', status: 'ok', execution_count: 3 }
+      { type: 'done', status: '12', execution_count: null }
     ])
+    // The unreadable line is reported; a parsed record of an unknown shape is not.
+    expect(reported).toBe(1)
+  })
+
+  it('does not apply the shared transport size limit to notebook display data', () => {
+    const frame = {
+      type: 'display_data',
+      content: { data: { 'image/png': 'x'.repeat(16 * 1024 * 1024 + 1) } }
+    }
+    expect(collect([JSON.stringify(frame), '\n'])).toEqual([frame])
+  })
+
+  it('waits for the final newline before delivering a record', () => {
+    const frames: unknown[] = []
+    const read = createFrameReader((frame) => frames.push(frame))
+    read('{"type":"rea')
+    expect(frames).toEqual([])
+    read('dy"}\n{"type":"missing"}')
+    expect(frames).toEqual([{ type: 'ready' }])
+    read('')
+    expect(frames).toHaveLength(1)
+    read('\n')
+    expect(frames).toEqual([{ type: 'ready' }, { type: 'missing', externallyManaged: false }])
+  })
+
+  it('holds a never-terminated record without emitting or rejecting it', () => {
+    const frames: unknown[] = []
+    const text = 'x'.repeat(200_000)
+    const wire = JSON.stringify({ type: 'stream', content: { name: 'stdout', text } })
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const read = createFrameReader((frame) => frames.push(frame))
+    try {
+      for (let offset = 0; offset < wire.length; offset += 4096) {
+        read(wire.slice(offset, offset + 4096))
+      }
+      expect(frames).toEqual([])
+      expect(warn).not.toHaveBeenCalled()
+      read('\n')
+    } finally {
+      warn.mockRestore()
+    }
+    expect(frames).toEqual([{ type: 'stream', content: { name: 'stdout', text } }])
+  })
+
+  it('does not swallow a consumer exception as malformed JSON', () => {
+    const error = new Error('consumer failed')
+    const read = createFrameReader(() => {
+      throw error
+    })
+    expect(() => read('{"type":"ready"}\n')).toThrow(error)
   })
 })
 
diff --git a/src/main/notebook/notebook-kernel.ts b/src/main/notebook/notebook-kernel.ts
index 6e50542f1f97..413b3bfeb653 100644
--- a/src/main/notebook/notebook-kernel.ts
+++ b/src/main/notebook/notebook-kernel.ts
@@ -1,6 +1,7 @@
 import bridgePath from '../../../resources/notebook/kernel-bridge.py?asset&asarUnpack'
 import { spawnProcess } from '../../shared/child-process/run-process'
 import { forceTerminateProcessTree } from '../../shared/child-process/process-tree-termination'
+import { createNdjsonParser } from '../../shared/main-process-ndjson-framer'
 import {
   KERNEL_OUTPUT_TYPES,
   type KernelFrame,
@@ -16,13 +17,7 @@ function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === 'object' && value !== null && !Array.isArray(value)
 }
 
-function parseFrame(line: string): BridgeFrame | null {
-  let value: unknown
-  try {
-    value = JSON.parse(line)
-  } catch {
-    return null
-  }
+function parseFrame(value: unknown): BridgeFrame | null {
   if (!isRecord(value)) {
     return null
   }
@@ -46,17 +41,20 @@ function parseFrame(line: string): BridgeFrame | null {
 
 /** Splits bridge stdout into frames, skipping any line that is not one. */
 export function createFrameReader(onFrame: (frame: BridgeFrame) => void): (text: string) => void {
-  let partial = ''
-  return (text) => {
-    const lines = (partial + text).split('\n')
-    partial = lines.pop() ?? ''
-    for (const line of lines) {
-      const frame = parseFrame(line)
+  // Each frame ships as its line completes; a consumer throw escapes the stdout listener and is fatal anyway.
+  const parser = createNdjsonParser(
+    (value) => {
+      const frame = parseFrame(value)
       if (frame) {
         onFrame(frame)
       }
-    }
-  }
+    },
+    // The bridge keeps fd 1 to itself, so an unreadable line means the frame channel is damaged.
+    (error) => console.warn('[notebook-kernel] Dropped an unreadable bridge record:', error),
+    // Notebook display frames can contain large images; preserve the existing unrestricted size.
+    { maxLineBytes: Number.POSITIVE_INFINITY }
+  )
+  return (text) => parser.feed(text)
 }
 
 export type NotebookKernel = {
diff --git a/src/main/opencode-usage/store.ts b/src/main/opencode-usage/store.ts
index 5dc8a87c67b1..3bdcefeb0a77 100644
--- a/src/main/opencode-usage/store.ts
+++ b/src/main/opencode-usage/store.ts
@@ -1,3 +1,4 @@
+import { codexOpenCodeTokenSessions } from '../usage/agent-token-usage'
 import { app } from 'electron'
 import { join } from 'node:path'
 import type {
@@ -50,6 +51,10 @@ export class OpenCodeUsageStore extends UsageProviderStoreLifecycle<
 > {
   constructor(store: Pick<Store, 'getRepos' | 'getAllWorktreeMeta'>) {
     super(store, {
+      tokenUsage: {
+        provider: 'opencode',
+        selectSessions: (state) => codexOpenCodeTokenSessions(state.sessions)
+      },
       logTag: '[opencode-usage]',
       resolveCacheFile: getOpenCodeUsageFile,
       createDefaultState: getDefaultState,
diff --git a/src/main/opencode/hook-plugin-dispose-host.test.ts b/src/main/opencode/hook-plugin-dispose-host.test.ts
new file mode 100644
index 000000000000..179714d8c831
--- /dev/null
+++ b/src/main/opencode/hook-plugin-dispose-host.test.ts
@@ -0,0 +1,165 @@
+/**
+ * Executes the generated plugin through each OpenCode host entry point, because
+ * what disposal means differs by host: OpenCode 1 disposes only on instance
+ * teardown (which cancels every run), OpenCode 2 also on a plugin hot reload.
+ */
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { getPathMock } = vi.hoisted(() => ({
+  getPathMock: vi.fn<(name: string) => string>()
+}))
+
+vi.mock('electron', () => ({
+  app: { getPath: getPathMock }
+}))
+
+import { _internals } from './hook-service'
+
+type PluginHooks = {
+  event: (input: { event: unknown }) => Promise<void>
+  dispose?: () => Promise<void>
+}
+type HostEvent = { type: string; data: Record<string, unknown> }
+type PluginModule = {
+  default?: {
+    server?: (ctx: unknown) => Promise<PluginHooks>
+    setup?: (ctx: unknown) => Promise<() => Promise<void>>
+  }
+}
+
+const ENV_KEYS = [
+  'ORCA_PANE_KEY',
+  'ORCA_OPENCODE_AGENT',
+  'ORCA_AGENT_HOOK_ENDPOINT',
+  'ORCA_AGENT_HOOK_PORT',
+  'ORCA_AGENT_HOOK_TOKEN'
+] as const
+
+// A live OpenCode 2 event bus: stays open until the subscriber aborts.
+function createEventBus(): {
+  push: (event: HostEvent) => void
+  subscribe: (input: { signal: AbortSignal }) => AsyncGenerator<HostEvent>
+} {
+  const queue: HostEvent[] = []
+  let wake: (() => void) | null = null
+  return {
+    push(event) {
+      queue.push(event)
+      wake?.()
+    },
+    async *subscribe({ signal }) {
+      while (!signal.aborted) {
+        const next = queue.shift()
+        if (next) {
+          yield next
+          continue
+        }
+        await new Promise<void>((resolve) => {
+          wake = resolve
+          signal.addEventListener('abort', () => resolve(), { once: true })
+        })
+        wake = null
+      }
+    }
+  }
+}
+
+describe.each(['opencode', 'opencode2'] as const)('%s plugin disposal by host', (agent) => {
+  let tempDir: string
+  let savedEnv: Record<string, string | undefined>
+  let names: string[]
+
+  beforeEach(() => {
+    tempDir = mkdtempSync(join(tmpdir(), 'orca-opencode-dispose-host-'))
+    savedEnv = {}
+    for (const key of ENV_KEYS) {
+      savedEnv[key] = process.env[key]
+    }
+    process.env.ORCA_PANE_KEY = 'tab-1:leaf-1'
+    process.env.ORCA_OPENCODE_AGENT = agent
+    delete process.env.ORCA_AGENT_HOOK_ENDPOINT
+    process.env.ORCA_AGENT_HOOK_PORT = '59999'
+    process.env.ORCA_AGENT_HOOK_TOKEN = 'test-token'
+    names = []
+    vi.stubGlobal(
+      'fetch',
+      vi.fn(async (_input: RequestInfo | URL, init?: RequestInit) => {
+        names.push(String(JSON.parse(String(init?.body)).payload?.hook_event_name))
+        return new Response('{}', { status: 200 })
+      })
+    )
+  })
+
+  afterEach(() => {
+    vi.unstubAllGlobals()
+    for (const key of ENV_KEYS) {
+      if (savedEnv[key] === undefined) {
+        delete process.env[key]
+      } else {
+        process.env[key] = savedEnv[key]
+      }
+    }
+    rmSync(tempDir, { recursive: true, force: true })
+  })
+
+  async function loadPluginModule(): Promise<PluginModule> {
+    const pluginPath = join(tempDir, `orca-${agent}-status.mjs`)
+    writeFileSync(
+      pluginPath,
+      agent === 'opencode2'
+        ? _internals.getOpenCode2PluginSource()
+        : _internals.getOpenCodePluginSource()
+    )
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the generated plugin module exports this shape.
+    return (await import(pathToFileURL(pluginPath).href)) as PluginModule
+  }
+
+  function setupContext(bus: ReturnType<typeof createEventBus>): unknown {
+    return {
+      session: {
+        get: async ({ sessionID }: { sessionID: string }) => ({ id: sessionID }),
+        hook: async () => ({ dispose: async () => {} })
+      },
+      event: { subscribe: bus.subscribe }
+    }
+  }
+
+  it('publishes a final Idle when the OpenCode 1 instance tears down mid-turn', async () => {
+    const module = await loadPluginModule()
+    const hooks = await module.default?.server?.({
+      client: { session: { get: async () => ({ data: { id: 'ses_root' } }) } }
+    })
+    await hooks?.event({
+      event: {
+        type: 'session.status',
+        properties: { sessionID: 'ses_root', status: { type: 'busy' } }
+      }
+    })
+    await hooks?.dispose?.()
+
+    expect(names).toEqual(['SessionBusy', 'SessionIdle'])
+  })
+
+  it('keeps the pane Working when OpenCode 2 reloads the plugin mid-turn', async () => {
+    const module = await loadPluginModule()
+    const firstBus = createEventBus()
+    const firstCleanup = await module.default?.setup?.(setupContext(firstBus))
+    firstBus.push({ type: 'session.execution.started', data: { sessionID: 'ses_root' } })
+    await vi.waitFor(() => expect(names).toEqual(['SessionBusy']))
+
+    await firstCleanup?.()
+    expect(names).toEqual(['SessionBusy'])
+
+    // The turn kept running; its end reaches the reloaded plugin.
+    const secondBus = createEventBus()
+    const secondCleanup = await module.default?.setup?.(setupContext(secondBus))
+    secondBus.push({ type: 'session.execution.succeeded', data: { sessionID: 'ses_root' } })
+    await vi.waitFor(() => expect(names).toEqual(['SessionBusy', 'SessionIdle']))
+    await secondCleanup?.()
+    expect(names).toEqual(['SessionBusy', 'SessionIdle'])
+  })
+})
diff --git a/src/main/opencode/hook-service.test.ts b/src/main/opencode/hook-service.test.ts
index 920c0b5e392e..c8941d833137 100644
--- a/src/main/opencode/hook-service.test.ts
+++ b/src/main/opencode/hook-service.test.ts
@@ -1,13 +1,17 @@
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   existsSync,
+  openSync,
+  closeSync,
   lstatSync,
   mkdirSync,
   mkdtempSync,
   readFileSync,
   readdirSync,
   rmSync,
+  statSync,
   symlinkSync,
+  utimesSync,
   writeFileSync
 } from 'node:fs'
 import { createHash } from 'node:crypto'
@@ -45,26 +49,6 @@ beforeEach(() => {
 const { isUsableId, toSafeDirName } = _internals
 
 describe('OpenCode hook plugin source', () => {
-  it('preserves the public module surface', async () => {
-    const module = await import('./hook-service')
-
-    expect(Object.keys(module).sort()).toEqual([
-      'OpenCodeHookService',
-      '_internals',
-      'getOpenCode2PluginSource',
-      'getOpenCodeFamilyPluginSource',
-      'getOpenCodePluginSource',
-      'openCode2HookService',
-      'openCodeHookService'
-    ])
-    expect(Object.keys(module._internals).sort()).toEqual([
-      'getOpenCode2PluginSource',
-      'getOpenCodePluginSource',
-      'isUsableId',
-      'toSafeDirName'
-    ])
-  })
-
   it('keeps family routing and session-start policy separate', () => {
     const primarySource = getOpenCodePluginSource()
     const familySource = getOpenCodeFamilyPluginSource('/hook/mimo-code', {
@@ -93,11 +77,11 @@ describe('OpenCode hook plugin source', () => {
     const digest = (source: string): string => createHash('sha256').update(source).digest('hex')
 
     expect(digest(getOpenCodePluginSource())).toBe(
-      'f2c469ff2d360ed94955d715705b9d4dd633dd334887906fbb534c1925ec81c9'
+      '655d603f31c3e4462b4c600861833cbdba9dd541f693e11a349e7a57b8c059d7'
     )
     expect(
       digest(getOpenCodeFamilyPluginSource('/hook/mimo-code', { emitSessionStart: false }))
-    ).toBe('2267e2ab6e854e71c9bae12afed97e464f93b2b14f3e25dca133ca6666c98752')
+    ).toBe('d36d869823cc3dd506565e0512beb278fe4fd6533bd12be30bd98db140ca9f3e')
   })
 
   it('filters child sessions via parentID lookup before forwarding events', () => {
@@ -290,6 +274,51 @@ describe('OpenCodeHookService buildPtyEnv / clearPty round-trip', () => {
     expect(pluginSource).toContain('messageID: part.messageID')
   })
 
+  // Why: OpenCode 2 reloads a plugin whose file mtime changed, which restarted status mid-turn.
+  it('leaves a current installed plugin untouched and replaces a stale one', () => {
+    const service = new OpenCodeHookService()
+    service.buildPtyEnv(daemonSessionId)
+    const pluginPath = join(resolveOpenCodeConfigDirectory(), 'plugins', 'orca-opencode-status.js')
+    const past = new Date('2020-01-01T00:00:00Z')
+    utimesSync(pluginPath, past, past)
+
+    service.buildPtyEnv(daemonSessionId)
+    expect(statSync(pluginPath).mtimeMs).toBe(past.getTime())
+
+    writeFileSync(pluginPath, 'stale plugin')
+    service.buildPtyEnv(daemonSessionId)
+    expect(readFileSync(pluginPath, 'utf8')).toBe(_internals.getOpenCodePluginSource())
+  })
+
+  // Why: OpenCode 2 loads through a file-level symlink (dotfile managers) and stats its target.
+  it.skipIf(process.platform === 'win32')(
+    'compares a symlinked plugin by its target and writes through only when stale',
+    () => {
+      const service = new OpenCodeHookService()
+      const pluginPath = join(
+        resolveOpenCodeConfigDirectory(),
+        'plugins',
+        'orca-opencode-status.js'
+      )
+      const targetPath = join(userDataDir, 'dotfiles-orca-opencode-status.js')
+      writeFileSync(targetPath, _internals.getOpenCodePluginSource())
+      rmSync(pluginPath, { force: true })
+      symlinkSync(targetPath, pluginPath)
+      const past = new Date('2020-01-01T00:00:00Z')
+      utimesSync(targetPath, past, past)
+
+      service.buildPtyEnv(daemonSessionId)
+      expect(statSync(targetPath).mtimeMs).toBe(past.getTime())
+
+      writeFileSync(targetPath, 'stale plugin')
+      service.buildPtyEnv(daemonSessionId)
+      expect(lstatSync(pluginPath).isSymbolicLink()).toBe(true)
+      expect(readFileSync(targetPath, 'utf8')).toBe(_internals.getOpenCodePluginSource())
+      rmSync(pluginPath, { force: true })
+      rmSync(targetPath, { force: true })
+    }
+  )
+
   // Why: #22234 — OpenCode 2 installs under the plain `opencode` name, and its loader
   // rejects a default export that only has server(). Asserting the emitted *source* is
   // not enough; the installed file is what the v2 server validates, so load it.
@@ -313,6 +342,93 @@ describe('OpenCodeHookService buildPtyEnv / clearPty round-trip', () => {
     expect(module.default?.setup).toBeTypeOf('function')
   })
 
+  // Why: pre-1.4.209 Orca wrote a server()-only plugin into <userData>/opencode-hooks/shared and
+  // stopped maintaining it; shells and OpenCode 2 background services still pointing there got
+  // "Plugin must export a default definition with an id and an effect or setup function."
+  it('refreshes a stale plugin left in the retired shared hooks dir', async () => {
+    const legacyPluginPath = join(
+      userDataDir,
+      'opencode-hooks',
+      'shared',
+      'plugins',
+      'orca-opencode-status.js'
+    )
+    mkdirSync(join(legacyPluginPath, '..'), { recursive: true })
+    writeFileSync(
+      legacyPluginPath,
+      'export default { id: "orca-opencode-status", server: async () => ({}) };\n'
+    )
+
+    new OpenCodeHookService().buildPtyEnv(daemonSessionId)
+
+    const modulePath = join(userDataDir, `legacy-opencode-plugin-${Date.now()}.mjs`)
+    writeFileSync(modulePath, readFileSync(legacyPluginPath, 'utf8'))
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the assertions below validate the shape this names.
+    const module = (await import(pathToFileURL(modulePath).href)) as {
+      default?: { id?: unknown; server?: unknown; setup?: unknown }
+    }
+    expect(module.default?.id).toBe('orca-opencode-status')
+    expect(module.default?.server).toBeTypeOf('function')
+    expect(module.default?.setup).toBeTypeOf('function')
+  })
+
+  it('repairs late and overwritten legacy plugins atomically on the same service', () => {
+    const service = new OpenCodeHookService()
+    service.refreshLegacySharedPlugin()
+    const path = join(userDataDir, 'opencode-hooks', 'shared', 'plugins', 'orca-opencode-status.js')
+    mkdirSync(join(path, '..'), { recursive: true })
+    for (const stale of ['// late old install', '// old process overwrote repair']) {
+      writeFileSync(path, stale)
+      const reader = openSync(path, 'r')
+      try {
+        service.refreshLegacySharedPlugin()
+        expect(readFileSync(path, 'utf8')).toBe(getOpenCodePluginSource())
+        expect(readFileSync(reader, 'utf8')).toBe(stale)
+        expect(readdirSync(join(path, '..'))).toEqual(['orca-opencode-status.js'])
+      } finally {
+        closeSync(reader)
+      }
+    }
+  })
+
+  it('reports repair failures and retries after the obstruction is removed', () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const path = join(userDataDir, 'opencode-hooks', 'shared', 'plugins', 'orca-opencode-status.js')
+    const service = new OpenCodeHookService()
+    try {
+      service.refreshLegacySharedPlugin()
+      expect(warn).not.toHaveBeenCalled()
+      mkdirSync(path, { recursive: true })
+      service.refreshLegacySharedPlugin()
+      expect(warn).toHaveBeenCalledWith(
+        '[OpenCode] Failed to repair legacy status plugin:',
+        path,
+        expect.any(Error)
+      )
+      rmSync(path, { recursive: true })
+      writeFileSync(path, '// stale')
+      service.refreshLegacySharedPlugin()
+      expect(readFileSync(path, 'utf8')).toBe(getOpenCodePluginSource())
+    } finally {
+      warn.mockRestore()
+    }
+  })
+
+  it('leaves an up-to-date legacy plugin untouched and never creates the retired dir', () => {
+    const legacyDir = join(userDataDir, 'opencode-hooks')
+    new OpenCodeHookService().buildPtyEnv(daemonSessionId)
+    expect(existsSync(legacyDir)).toBe(false)
+
+    const legacyPluginPath = join(legacyDir, 'shared', 'plugins', 'orca-opencode-status.js')
+    mkdirSync(join(legacyPluginPath, '..'), { recursive: true })
+    writeFileSync(legacyPluginPath, getOpenCodePluginSource())
+    const past = new Date('2020-01-01T00:00:00Z')
+    utimesSync(legacyPluginPath, past, past)
+    new OpenCodeHookService().buildPtyEnv(daemonSessionId)
+    // Why: a running OpenCode 2 service re-runs its plugin load on every write to a watched plugin file.
+    expect(statSync(legacyPluginPath).mtimeMs).toBe(past.getTime())
+  })
+
   // Why: #22506 — both variants install side by side in one global plugins dir, and
   // OpenCode 2 kills every plugin after the first that reuses an id ("Duplicate plugin
   // ID"). Discovery sorts by path, so orca-opencode-status.js always wins and the
@@ -609,6 +725,19 @@ describe('OpenCodeHookService overlay mode (user OPENCODE_CONFIG_DIR set)', () =
     expectUserConfigIntact()
   })
 
+  it('leaves a current overlay plugin file in place across spawns', () => {
+    const service = new OpenCodeHookService()
+    const overlayDir = service.buildPtyEnv(ptyId, userConfigDir).OPENCODE_CONFIG_DIR!
+    const pluginPath = join(overlayDir, 'plugins', 'orca-opencode-status.js')
+    const past = new Date('2020-01-01T00:00:00Z')
+    utimesSync(pluginPath, past, past)
+
+    service.buildPtyEnv(ptyId, userConfigDir)
+
+    expect(statSync(pluginPath).mtimeMs).toBe(past.getTime())
+    expect(readFileSync(pluginPath, 'utf8')).toBe(_internals.getOpenCodePluginSource())
+  })
+
   it('reconciles stale mirrored entries while preserving OpenCode runtime files', () => {
     const service = new OpenCodeHookService()
     const firstEnv = service.buildPtyEnv(ptyId, userConfigDir)
diff --git a/src/main/opencode/hook-service.ts b/src/main/opencode/hook-service.ts
index f46667ed1b87..74f24577c6ed 100644
--- a/src/main/opencode/hook-service.ts
+++ b/src/main/opencode/hook-service.ts
@@ -1,3 +1,4 @@
+import { writeFileAtomically } from '../codex-accounts/fs-utils'
 import { getAppEnvironment } from '../../shared/app-environment'
 import { join } from 'node:path'
 import {
@@ -22,11 +23,18 @@ import { getStatusPluginOwnershipSource } from './status-plugin-ownership-source
 import { getStatusPluginLifecycleSource } from './status-plugin-lifecycle-source'
 import { getStatusPluginFactorySource } from './status-plugin-factory-source'
 import { resolveOpenCodeConfigDirectory } from '../../shared/opencode-config-directory'
+import {
+  getOpenCodeLegacySharedConfigDir,
+  OPENCODE2_LEGACY_HOOKS_DIR,
+  OPENCODE_LEGACY_HOOKS_DIR
+} from './legacy-shared-config-dir'
+import {
+  isInstalledOpenCodePluginCurrent,
+  isOverlayOpenCodePluginCurrent
+} from '../../shared/opencode-installed-plugin'
 
 const ORCA_OPENCODE_PLUGIN_FILE = 'orca-opencode-status.js'
-const OPENCODE_LEGACY_HOOKS_DIR = 'opencode-hooks'
 const OPENCODE_OVERLAY_DIR = 'opencode-config-overlays'
-const OPENCODE_SHARED_CONFIG_DIR = 'shared'
 const OPENCODE_OVERLAY_MANIFEST_FILE = '.orca-opencode-overlay-manifest.json'
 
 type OpenCodeOverlayManifest = {
@@ -127,6 +135,7 @@ export class OpenCodeHookService {
       return existingConfigDir ? { OPENCODE_CONFIG_DIR: existingConfigDir } : {}
     }
 
+    this.refreshLegacySharedPlugin()
     const managedConfigDir = this.getSharedConfigDir()
     if (!existingConfigDir || existingConfigDir === managedConfigDir) {
       try {
@@ -150,6 +159,23 @@ export class OpenCodeHookService {
     }
   }
 
+  // Why: pre-1.4.209 Orca left a server()-only plugin here that OpenCode 2 rejects. Only helps
+  // processes that load it later; a running OpenCode 2 service keeps its cached module until restarted.
+  refreshLegacySharedPlugin(): void {
+    const pluginPath = join(this.getSharedConfigDir(), 'plugins', this.pluginFileName)
+    try {
+      const source = this.pluginSource()
+      if (readFileSync(pluginPath, 'utf8') !== source) {
+        writeFileAtomically(pluginPath, source)
+      }
+    } catch (error) {
+      if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+        return
+      }
+      console.warn('[OpenCode] Failed to repair legacy status plugin:', pluginPath, error)
+    }
+  }
+
   private getOverlayRoot(): string {
     return join(getAppEnvironment().getPath('userData'), this.overlayDir)
   }
@@ -159,10 +185,9 @@ export class OpenCodeHookService {
   }
 
   private getSharedConfigDir(): string {
-    return join(
+    return getOpenCodeLegacySharedConfigDir(
       getAppEnvironment().getPath('userData'),
-      this.legacyHooksDir,
-      OPENCODE_SHARED_CONFIG_DIR
+      this.legacyHooksDir
     )
   }
 
@@ -257,25 +282,32 @@ export class OpenCodeHookService {
     const pluginsDir = join(overlayDir, 'plugins')
     mkdirSync(pluginsDir, { recursive: true })
     const pluginPath = join(pluginsDir, this.pluginFileName)
-    try {
-      unlinkSync(pluginPath)
-    } catch {
-      // File may not exist on a fresh overlay; a real failure surfaces on writeFileSync below.
+    const source = this.pluginSource()
+    if (!isOverlayOpenCodePluginCurrent(pluginPath, source)) {
+      try {
+        unlinkSync(pluginPath)
+      } catch {
+        // File may not exist on a fresh overlay; a real failure surfaces on writeFileSync below.
+      }
+      writeFileSync(pluginPath, source)
     }
-    writeFileSync(pluginPath, this.pluginSource())
   }
 
   private writePluginToConfigDir(configDir: string): void {
     const pluginsDir = join(configDir, 'plugins')
     mkdirSync(pluginsDir, { recursive: true })
-    writeFileSync(join(pluginsDir, this.pluginFileName), this.pluginSource())
+    const pluginPath = join(pluginsDir, this.pluginFileName)
+    const source = this.pluginSource()
+    if (!isInstalledOpenCodePluginCurrent(pluginPath, source)) {
+      writeFileSync(pluginPath, source)
+    }
   }
 }
 
 export const openCodeHookService = new OpenCodeHookService()
 export const openCode2HookService = new OpenCodeHookService({
   pluginFileName: 'orca-opencode2-status.js',
-  legacyHooksDir: 'opencode2-hooks',
+  legacyHooksDir: OPENCODE2_LEGACY_HOOKS_DIR,
   overlayDir: 'opencode2-config-overlays',
   pluginSource: getOpenCode2PluginSource
 })
diff --git a/src/main/opencode/legacy-shared-config-dir.test.ts b/src/main/opencode/legacy-shared-config-dir.test.ts
new file mode 100644
index 000000000000..f4a20713e8b4
--- /dev/null
+++ b/src/main/opencode/legacy-shared-config-dir.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it } from 'vitest'
+import { join } from 'node:path'
+import { isOpenCodeLegacySharedConfigDir } from './legacy-shared-config-dir'
+
+describe('retired config directory recognition', () => {
+  const root = join(process.cwd(), 'user-data')
+  it.each(['opencode-hooks', 'opencode2-hooks'])('normalizes %s paths', (hooks) => {
+    const path = join(root, hooks, 'shared')
+    expect(isOpenCodeLegacySharedConfigDir(`${path}/`, root)).toBe(true)
+    expect(isOpenCodeLegacySharedConfigDir(`${path}/../shared`, root)).toBe(true)
+    expect(isOpenCodeLegacySharedConfigDir(`${path}/../mine`, root)).toBe(false)
+    expect(isOpenCodeLegacySharedConfigDir(`${path}-custom`, root)).toBe(false)
+    expect(isOpenCodeLegacySharedConfigDir(undefined, root)).toBe(false)
+  })
+  it.skipIf(process.platform !== 'win32')('handles Windows casing and separators', () => {
+    expect(isOpenCodeLegacySharedConfigDir('C:/ORCA/opencode-hooks/shared/', 'c:\\orca')).toBe(true)
+  })
+})
+
+describe('isOpenCodeLegacySharedConfigDir', () => {
+  const userData = join('fixture', 'user-data')
+
+  it('matches only the retired shared dirs of both OpenCode variants', () => {
+    expect(
+      isOpenCodeLegacySharedConfigDir(join(userData, 'opencode-hooks', 'shared'), userData)
+    ).toBe(true)
+    expect(
+      isOpenCodeLegacySharedConfigDir(join(userData, 'opencode2-hooks', 'shared'), userData)
+    ).toBe(true)
+    expect(
+      isOpenCodeLegacySharedConfigDir(join(userData, 'opencode-hooks', 'mine'), userData)
+    ).toBe(false)
+    expect(
+      isOpenCodeLegacySharedConfigDir(join('other', 'opencode-hooks', 'shared'), userData)
+    ).toBe(false)
+    expect(isOpenCodeLegacySharedConfigDir(undefined, userData)).toBe(false)
+  })
+})
diff --git a/src/main/opencode/legacy-shared-config-dir.ts b/src/main/opencode/legacy-shared-config-dir.ts
new file mode 100644
index 000000000000..8b0c2b842e45
--- /dev/null
+++ b/src/main/opencode/legacy-shared-config-dir.ts
@@ -0,0 +1,48 @@
+import { join, resolve } from 'node:path'
+
+export const OPENCODE_LEGACY_HOOKS_DIR = 'opencode-hooks'
+export const OPENCODE2_LEGACY_HOOKS_DIR = 'opencode2-hooks'
+
+// Why: before 1.4.209 Orca pointed OPENCODE_CONFIG_DIR at this dir; shells and OpenCode 2 background services from then can still load it.
+export function getOpenCodeLegacySharedConfigDir(
+  userDataPath: string,
+  legacyHooksDir: string
+): string {
+  return join(userDataPath, legacyHooksDir, 'shared')
+}
+
+export function isOpenCodeLegacySharedConfigDir(
+  configDir: string | undefined,
+  userDataPath: string
+): boolean {
+  return (
+    configDir !== undefined &&
+    [OPENCODE_LEGACY_HOOKS_DIR, OPENCODE2_LEGACY_HOOKS_DIR].some(
+      (hooksDir) =>
+        normalizeConfigPath(configDir) ===
+        normalizeConfigPath(getOpenCodeLegacySharedConfigDir(userDataPath, hooksDir))
+    )
+  )
+}
+
+function normalizeConfigPath(path: string): string {
+  const resolved = resolve(path)
+  return process.platform === 'win32' ? resolved.toLowerCase() : resolved
+}
+
+export const OPENCODE_CONFIG_DIR_ENV_KEYS = [
+  'OPENCODE_CONFIG_DIR',
+  'ORCA_OPENCODE_CONFIG_DIR',
+  'ORCA_OPENCODE_SOURCE_CONFIG_DIR'
+] as const
+
+/** Carries retired inherited paths through providers that merge their environment later. */
+export function getLegacyOpenCodeEnvKeysToDelete(
+  env: Record<string, string | undefined> | undefined,
+  userDataPath: string,
+  inherited: Record<string, string | undefined> = process.env
+): string[] {
+  return OPENCODE_CONFIG_DIR_ENV_KEYS.filter((key) =>
+    isOpenCodeLegacySharedConfigDir(env?.[key] ?? inherited[key], userDataPath)
+  )
+}
diff --git a/src/main/opencode/status-plugin-factory-source.ts b/src/main/opencode/status-plugin-factory-source.ts
index 8348cc968eb7..218d15c3e41f 100644
--- a/src/main/opencode/status-plugin-factory-source.ts
+++ b/src/main/opencode/status-plugin-factory-source.ts
@@ -23,6 +23,7 @@ export function getStatusPluginFactorySource(options: {
     'export const OrcaOpenCodeStatusPlugin = async (_ctx) => {',
     `  if (process.env.ORCA_OPENCODE_AGENT && process.env.ORCA_OPENCODE_AGENT !== '${expectedAgent}') return {};`,
     '  const client = _ctx?.client;',
+    '  const sessionsOutliveDispose = _ctx?.sessionsOutliveDispose === true;',
     '  const factoryID = ++nextFactoryID;',
     '  activeFactoryIDs.add(factoryID);',
     '  let disposed = false;',
@@ -242,7 +243,14 @@ export function getStatusPluginFactorySource(options: {
     '        pendingAssistantPart = null;',
     '      }',
     '      const ownsDeliveredMessagePart = deliveredMessagePartFactoryID === factoryID;',
-    '      if (desiredFactoryID === factoryID || ownsDeliveredMessagePart) {',
+    '      // Why: OpenCode 1 disposes only on instance teardown, which cancels every run, so a final',
+    '      // Idle is true. OpenCode 2 also disposes on a hot reload mid-turn, so it publishes nothing.',
+    '      if (sessionsOutliveDispose) {',
+    '        if (desiredFactoryID === factoryID) {',
+    '          clearStatusRetry();',
+    '          statusRevision += 1;',
+    '        }',
+    '      } else if (desiredFactoryID === factoryID || ownsDeliveredMessagePart) {',
     '        clearStatusRetry();',
     '        statusRevision += 1;',
     '        // A MessagePart may have changed the listener to Working after the',
@@ -250,17 +258,13 @@ export function getStatusPluginFactorySource(options: {
     '        statusDeliveryDirty = ownsDeliveredMessagePart;',
     '        busyRecoveryUsed = false;',
     '        busyRecoveryEndpointKey = "";',
-    '        const fallbackFactoryID = Array.from(activeFactoryIDs).find(',
-    '          (id) => id !== factoryID',
-    '        );',
+    '        const fallbackFactoryID = Array.from(activeFactoryIDs).find((id) => id !== factoryID);',
     '        if (fallbackFactoryID !== undefined) {',
     '          await publishAggregateStatus(',
     '            fallbackFactoryID,',
     '            desiredStatusProperties?.sessionID',
     '          );',
     '        } else {',
-    '          // Why: Instance disposal can happen while the PTY stays alive;',
-    '          // publish a final idle so Orca does not retain a dead owner.',
     '          if (!deliveredStatusKey.startsWith("idle:") || ownsDeliveredMessagePart) {',
     '            await setStatus(',
     '              "idle",',
diff --git a/src/main/opencode2/status-plugin-setup-lifetime.test.ts b/src/main/opencode2/status-plugin-setup-lifetime.test.ts
new file mode 100644
index 000000000000..5a2c4280ced5
--- /dev/null
+++ b/src/main/opencode2/status-plugin-setup-lifetime.test.ts
@@ -0,0 +1,204 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { getOpenCode2SetupSource } from './status-plugin-setup-source'
+
+type Hooks = { event: (event: unknown) => Promise<void>; dispose?: () => Promise<void> }
+
+function createSetup(factory: () => Promise<Hooks>) {
+  const setup: unknown = new Function(
+    'OrcaOpenCodeStatusPlugin',
+    'AbortController',
+    'console',
+    `${getOpenCode2SetupSource().join('\n')}\nreturn setupOpenCode2Status;`
+  )(factory, AbortController, { warn: vi.fn() })
+  if (typeof setup !== 'function') {
+    throw new Error('Missing generated setup')
+  }
+  return async (context: unknown) => {
+    const cleanup: unknown = await setup(context)
+    if (typeof cleanup !== 'function') {
+      throw new Error('Missing generated cleanup')
+    }
+    return cleanup
+  }
+}
+
+function deferred() {
+  let finish = () => {}
+  const promise = new Promise<void>((resolve) => {
+    finish = resolve
+  })
+  return { promise, finish }
+}
+
+beforeEach(() => {
+  vi.stubGlobal(
+    'fetch',
+    vi.fn(async () => new Response('{}', { status: 200 }))
+  )
+})
+afterEach(() => {
+  expect(fetch).not.toHaveBeenCalled()
+  vi.unstubAllGlobals()
+})
+
+describe('generated OpenCode 2 setup ownership', () => {
+  it.each(['throw', 'reject'] as const)(
+    'disposes the factory after prompt registration %s',
+    async (failure) => {
+      const hooks = { event: vi.fn(async () => {}), dispose: vi.fn(async () => {}) }
+      const subscribe = vi.fn(async function* () {})
+      const hook = () => {
+        if (failure === 'throw') {
+          throw new Error('Registration failed')
+        }
+        return Promise.reject(new Error('Registration failed'))
+      }
+      const cleanup = await createSetup(async () => hooks)({
+        session: { hook },
+        event: { subscribe }
+      })
+      expect(hooks.dispose).toHaveBeenCalledOnce()
+      expect(subscribe).not.toHaveBeenCalled()
+      await cleanup()
+      expect(hooks.dispose).toHaveBeenCalledOnce()
+    }
+  )
+
+  it.each(['throw', 'reject'] as const)(
+    'disposes the factory after prompt cleanup %s',
+    async (failure) => {
+      const hooks = { event: vi.fn(async () => {}), dispose: vi.fn(async () => {}) }
+      const promptDispose = vi.fn(() => {
+        if (failure === 'throw') {
+          throw new Error('Prompt cleanup failed')
+        }
+        return Promise.reject(new Error('Prompt cleanup failed'))
+      })
+      let signal: AbortSignal | undefined
+      const cleanup = await createSetup(async () => hooks)({
+        session: { hook: async () => ({ dispose: promptDispose }) },
+        event: {
+          subscribe: (options: { signal: AbortSignal }) => {
+            signal = options.signal
+            return []
+          }
+        }
+      })
+      await cleanup()
+      expect(signal?.aborted).toBe(true)
+      expect(promptDispose).toHaveBeenCalledOnce()
+      expect(hooks.dispose).toHaveBeenCalledOnce()
+    }
+  )
+
+  it('waits for in-flight delivery before factory cleanup after a prompt cleanup failure', async () => {
+    const delivery = deferred()
+    const started = deferred()
+    const order: string[] = []
+    const hooks = {
+      event: vi.fn(async () => {
+        started.finish()
+        await delivery.promise
+        order.push('event')
+      }),
+      dispose: vi.fn(async () => {
+        order.push('factory')
+      })
+    }
+    const cleanup = await createSetup(async () => hooks)({
+      session: {
+        hook: async () => ({
+          dispose: async () => {
+            order.push('prompt')
+            throw new Error('Failed')
+          }
+        })
+      },
+      event: {
+        subscribe: async function* ({ signal }: { signal: AbortSignal }) {
+          try {
+            yield { type: 'session.execution.started', data: { sessionID: 'synthetic' } }
+            if (!signal.aborted) {
+              yield { type: 'session.execution.succeeded', data: { sessionID: 'synthetic' } }
+            }
+          } finally {
+            order.push('subscription')
+          }
+        }
+      }
+    })
+    await started.promise
+    const disposing = cleanup()
+    await Promise.resolve()
+    expect(hooks.dispose).not.toHaveBeenCalled()
+    delivery.finish()
+    await disposing
+    expect(order).toEqual(['prompt', 'event', 'subscription', 'factory'])
+    expect(hooks.event).toHaveBeenCalledOnce()
+    expect(hooks.dispose).toHaveBeenCalledOnce()
+  })
+
+  it.each(['setup', 'unload'] as const)(
+    'keeps %s fail-open when factory cleanup also rejects',
+    async (stage) => {
+      const hooks = {
+        event: vi.fn(async () => {}),
+        dispose: vi.fn(async () => {
+          throw new Error('Factory cleanup failed')
+        })
+      }
+      const cleanup = await createSetup(async () => hooks)({
+        session: {
+          hook: async () => {
+            if (stage === 'setup') {
+              throw new Error('Registration failed')
+            }
+            return {
+              dispose: async () => {
+                throw new Error('Prompt cleanup failed')
+              }
+            }
+          }
+        },
+        event: { subscribe: async function* () {} }
+      })
+      await cleanup()
+      expect(hooks.dispose).toHaveBeenCalledOnce()
+    }
+  )
+
+  it('disposes both owners once on ordinary unload', async () => {
+    const hooks = { event: vi.fn(async () => {}), dispose: vi.fn(async () => {}) }
+    const promptDispose = vi.fn(async () => {})
+    const cleanup = await createSetup(async () => hooks)({
+      session: { hook: async () => ({ dispose: promptDispose }) },
+      event: { subscribe: async function* () {} }
+    })
+    expect(hooks.dispose).not.toHaveBeenCalled()
+    await cleanup()
+    expect(promptDispose).toHaveBeenCalledOnce()
+    expect(hooks.dispose).toHaveBeenCalledOnce()
+  })
+
+  it('accepts absent optional disposers', async () => {
+    const cleanup = await createSetup(async () => ({ event: async () => {} }))({
+      session: { hook: async () => undefined },
+      event: { subscribe: async function* () {} }
+    })
+    await cleanup()
+  })
+
+  it('skips allocation for an unusable context and tolerates factory rejection', async () => {
+    const factory = vi.fn(async (): Promise<Hooks> => {
+      throw new Error('Factory failed')
+    })
+    await (
+      await createSetup(factory)(undefined)
+    )()
+    expect(factory).not.toHaveBeenCalled()
+    await (
+      await createSetup(factory)({ session: { hook: vi.fn() }, event: { subscribe: vi.fn() } })
+    )()
+    expect(factory).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/main/opencode2/status-plugin-setup-source.ts b/src/main/opencode2/status-plugin-setup-source.ts
index c4bf8d0ea724..7b825056ecd8 100644
--- a/src/main/opencode2/status-plugin-setup-source.ts
+++ b/src/main/opencode2/status-plugin-setup-source.ts
@@ -10,6 +10,7 @@ const NON_SESSION_FORM_OWNERS = new Set(["global"]);
 
 async function setupOpenCode2Status(ctx) {
   const noop = async () => {};
+  let hooks;
   // Why: OpenCode may probe setup() with no context during startup, and the setup
   // API shape can drift between releases. Never throw from setup — a throw surfaces
   // as an 'orca-opencode-status' plugin failed error in the TUI, which is worse
@@ -23,7 +24,8 @@ async function setupOpenCode2Status(ctx) {
     // Without it, resolveRootSessionID returns null for every session and a
     // subagent's work publishes as if it were the root's.
     const client = { session: { get: async (input, options) => { const result = await ctx.session.get(input, options); return result && typeof result.id === "string" ? { data: result } : result; } } };
-    const hooks = await OrcaOpenCodeStatusPlugin({ client });
+    // Why: this host disposes plugins on a hot reload while turns keep running.
+    hooks = await OrcaOpenCodeStatusPlugin({ client, sessionsOutliveDispose: true });
     if (!hooks || typeof hooks.event !== "function") return noop;
     const promptRegistration = await ctx.session.hook("prompt", async (properties) => {
       await hooks.event({ event: { type: "session.next.prompt.admitted", properties } });
@@ -79,14 +81,22 @@ async function setupOpenCode2Status(ctx) {
     return async () => {
       try {
         controller.abort();
-        await promptRegistration?.dispose?.();
-        await consuming;
-        await hooks.dispose?.();
+        // Each owner must finish cleanup even when an earlier disposer rejects.
+        try {
+          await promptRegistration?.dispose?.();
+        } finally {
+          try {
+            await consuming;
+          } finally {
+            await hooks.dispose?.();
+          }
+        }
       } catch {
         // Why: cleanup runs during plugin unload; a throw here also fails the plugin.
       }
     };
   } catch {
+    try { await hooks?.dispose?.(); } catch {}
     return noop;
   }
 }
diff --git a/src/main/orcad/orcad-bun-launcher.integration.test.ts b/src/main/orcad/orcad-bun-launcher.integration.test.ts
index 82272700f168..8ee18d53293f 100644
--- a/src/main/orcad/orcad-bun-launcher.integration.test.ts
+++ b/src/main/orcad/orcad-bun-launcher.integration.test.ts
@@ -1,5 +1,5 @@
 import { build } from 'esbuild'
-import { existsSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import { copyFile, mkdtemp, readFile, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join, resolve } from 'node:path'
@@ -23,6 +23,22 @@ describe.skipIf(!existsSync(runtimePath))('real Bun launcher lifecycle', () => {
     await copyFile(runtimePath, join(directory, orcadBunRuntimeFilename(process.platform)))
     await writeFile(join(directory, '.build-target'), `${process.platform}-${process.arch}\n`)
     await build({
+      // Record entry before imports without relying on either process's stdout.
+      banner: {
+        js: `
+          function traceLauncherPhase(phase) {
+            const runtime = process.versions.bun ? 'bun' : 'node'
+            try {
+              require('node:fs').appendFileSync(process.env.ORCA_TEST_PHASES + '.' + runtime,
+                JSON.stringify({ at: Date.now(), phase, pid: process.pid, runtime, arch: process.arch }) + '\\n')
+            } catch (error) {
+              console.error('launcher fixture trace failed:', error)
+            }
+          }
+          traceLauncherPhase('entry')
+          process.once('exit', code => traceLauncherPhase('exit:' + code))
+        `
+      },
       stdin: {
         contents: `
           import {handoffToBundledOrcad, OrcadBundledRuntimeError} from './src/main/orcad/orcad-bundled-runtime'
@@ -30,12 +46,16 @@ describe.skipIf(!existsSync(runtimePath))('real Bun launcher lifecycle', () => {
           import {resolveOrcadExitCode} from './src/main/orcad/orcad-exit-code'
           import {writeFile} from 'node:fs/promises'
           if (!process.versions.bun) {
+            traceLauncherPhase('before-handoff')
             if (!handoffToBundledOrcad()) throw new Error('Missing bundled runtime')
+            traceLauncherPhase('after-handoff')
             process.on('message', signal => process.emit(signal))
           } else {
+            traceLauncherPhase('before-booting')
             console.log('booting:' + process.pid)
             console.log('runtime:' + process.versions.bun)
             console.log('channel-env:' + (process.env.ORCA_BUNDLED_LAUNCHER_CHANNEL ?? 'absent'))
+            traceLauncherPhase('booting-written')
             process.on('exit', code => console.log('runtime-exit:' + code))
             const keepalive = setInterval(() => {}, 1_000)
             const install = async () => {
@@ -99,6 +119,13 @@ describe.skipIf(!existsSync(runtimePath))('real Bun launcher lifecycle', () => {
     const runtime = options.direct
       ? join(directory, orcadBunRuntimeFilename(process.platform))
       : nodePath
+    const startedAt = Date.now()
+    const events: { at: number; event: string }[] = []
+    const record = (event: string): void => {
+      if (events.length < 16) {
+        events.push({ at: Date.now(), event })
+      }
+    }
     const child = spawnProcess({
       program: options.nohup ? 'nohup' : runtime,
       args: [...(options.nohup ? [runtime] : []), join(directory, 'orcad.js')],
@@ -106,6 +133,7 @@ describe.skipIf(!existsSync(runtimePath))('real Bun launcher lifecycle', () => {
         ...process.env,
         ORCA_BACKGROUND_LAUNCH: '1',
         ORCA_TEST_DONE: join(directory, 'done'),
+        ORCA_TEST_PHASES: join(directory, 'phases'),
         ORCA_TEST_DELAY_INSTALL: options.delay ? '1' : '0',
         ORCA_TEST_STALL: options.stall ? '1' : '0',
         ORCA_TEST_FAIL_STARTUP: options.failStartup ? '1' : '0'
@@ -114,8 +142,10 @@ describe.skipIf(!existsSync(runtimePath))('real Bun launcher lifecycle', () => {
       stdio: ['ignore', 'pipe', 'pipe', 'ipc']
     })
     children.add(child)
+    child.once('spawn', () => record('spawn'))
     let closed = false
     child.once('close', () => {
+      record('close')
       closed = true
     })
     let output = ''
@@ -128,18 +158,57 @@ describe.skipIf(!existsSync(runtimePath))('real Bun launcher lifecycle', () => {
         runtimes.delete(Number(pid))
       }
     }
-    child.stdout.on('data', capture)
-    child.stderr.on('data', capture)
+    const streams = [
+      ['stdout', child.stdout],
+      ['stderr', child.stderr]
+    ] as const
+    for (const [name, stream] of streams) {
+      stream.on('data', capture)
+      stream.once('data', () => record(`${name}:data`))
+      stream.once('end', () => record(`${name}:end`))
+      stream.once('close', () => record(`${name}:close`))
+    }
     const exit = new Promise<{ code: number | null; signal: NodeJS.Signals | null }>(
       (resolve, reject) => {
-        child.once('error', reject)
+        child.once('error', (error) => {
+          record(`error:${error.message}`)
+          reject(error)
+        })
         child.once('exit', (code, signal) => {
+          record(`exit:${code}:${signal}`)
           children.delete(child)
           resolve({ code, signal })
         })
       }
     )
-    return { child, output: () => output, exit, isClosed: () => closed }
+    const diagnostics = () => ({
+      startedAt,
+      elapsedMs: Date.now() - startedAt,
+      events,
+      pid: child.pid,
+      exitCode: child.exitCode,
+      signalCode: child.signalCode,
+      connected: child.connected,
+      closed,
+      streams: streams.map(([name, stream]) => ({
+        name,
+        ended: stream.readableEnded,
+        destroyed: stream.destroyed,
+        error: stream.errored?.message,
+        bufferedBytes: stream.readableLength
+      })),
+      phases: ['node', 'bun'].map((runtime) => {
+        try {
+          return {
+            runtime,
+            trace: readFileSync(join(directory, `phases.${runtime}`), 'utf8').slice(0, 4096)
+          }
+        } catch (error) {
+          return { runtime, error: String(error) }
+        }
+      })
+    })
+    return { child, output: () => output, exit, isClosed: () => closed, diagnostics }
   }
 
   it.each([false, true])(
@@ -214,7 +283,12 @@ describe.skipIf(!existsSync(runtimePath))('real Bun launcher lifecycle', () => {
 
   it('preserves a startup configuration verdict after early launcher loss', async () => {
     const h = launch({ delay: true, failStartup: true })
-    await vi.waitFor(() => expect(h.output()).toContain('booting:'), { timeout: 5_000 })
+    try {
+      await vi.waitFor(() => expect(h.output()).toContain('booting:'), { timeout: 5_000 })
+    } catch (error) {
+      console.error('Bun launcher startup diagnostics:', JSON.stringify(h.diagnostics()))
+      throw error
+    }
     h.child.kill('SIGKILL')
     await h.exit
     await vi.waitFor(() => expect(h.output()).toContain('runtime-exit:78'), { timeout: 5_000 })
diff --git a/src/main/orcad/orcad-sidecar-runtime-client.test.ts b/src/main/orcad/orcad-sidecar-runtime-client.test.ts
index 1ec2055c0d24..64d81444c541 100644
--- a/src/main/orcad/orcad-sidecar-runtime-client.test.ts
+++ b/src/main/orcad/orcad-sidecar-runtime-client.test.ts
@@ -39,14 +39,16 @@ describe('sidecar response framing', () => {
     const wire = `${JSON.stringify({ id, ok: true, result: 'x'.repeat(1024 * 1024) })}\n`
     const originalIndexOf = String.prototype.indexOf
     let searchedCharacters = 0
-    const search = vi
-      .spyOn(String.prototype, 'indexOf')
-      .mockImplementation(function (this: string, value, position) {
-        if (value === '\n') {
-          searchedCharacters += this.length - (position ?? 0)
-        }
-        return originalIndexOf.call(this, value, position)
-      })
+    const search = vi.spyOn(String.prototype, 'indexOf').mockImplementation(function (
+      this: string,
+      value,
+      position
+    ) {
+      if (value === '\n') {
+        searchedCharacters += this.length - (position ?? 0)
+      }
+      return originalIndexOf.call(this, value, position)
+    })
     try {
       for (let offset = 0; offset < wire.length; offset += 256) {
         socket.emit('data', wire.slice(offset, offset + 256))
diff --git a/src/main/persistence-host-admitted-terminal-membership.test.ts b/src/main/persistence-host-admitted-terminal-membership.test.ts
index 3470215a5152..83a6898c6671 100644
--- a/src/main/persistence-host-admitted-terminal-membership.test.ts
+++ b/src/main/persistence-host-admitted-terminal-membership.test.ts
@@ -136,7 +136,7 @@ describe('host-admitted terminal membership survives a stale renderer replay', (
   })
 
   // Closing must still work afterwards. Closes are host-driven: the retirement is
-  // computed from the store's own session (see persistTerminalSurfaceRetirements),
+  // computed from the store's own session (see stageTerminalSurfaceRetirements),
   // which is what outranks the fence this create just raised.
   it('still lets the authoritative retirement path close the host-admitted tab', async () => {
     const store = await createStore()
diff --git a/src/main/persistence-ssh-pending-pty-kill.test.ts b/src/main/persistence-ssh-pending-pty-kill.test.ts
index 1d9c665c56f6..19298b3288fd 100644
--- a/src/main/persistence-ssh-pending-pty-kill.test.ts
+++ b/src/main/persistence-ssh-pending-pty-kill.test.ts
@@ -50,6 +50,19 @@ describe('Store SSH pending PTY kills', () => {
     ])
   })
 
+  it('keeps an epoch-scoped intent with no incarnation across a restart, and drops a legacy one', async () => {
+    const store = await createStore()
+    for (const ptyId of ['pty2:epoch-a:1', 'pty-2']) {
+      store.recordSshRemotePtyKillIntent('ssh-1', ptyId, { requestedAt: NOW, attempts: 0 })
+    }
+    store.flush()
+
+    const reloaded = await createStore()
+    expect(reloaded.getSshRemotePtyKillIntents('ssh-1', NOW)).toEqual([
+      { ptyId: 'pty2:epoch-a:1', intent: { requestedAt: NOW, attempts: 0 } }
+    ])
+  })
+
   // A kill issued while the provider was already unregistered writes no lease of its own, and that
   // offline close is the case most likely to strand a remote shell.
   it('records an intent for a PTY that has no lease row yet', async () => {
diff --git a/src/main/persistence/leasing-ssh-ptys/ssh-normalization.ts b/src/main/persistence/leasing-ssh-ptys/ssh-normalization.ts
index 58b0cd0473a1..a23bd421dd59 100644
--- a/src/main/persistence/leasing-ssh-ptys/ssh-normalization.ts
+++ b/src/main/persistence/leasing-ssh-ptys/ssh-normalization.ts
@@ -61,7 +61,7 @@ export function normalizeSshRemotePtyLease(value: unknown): SshRemotePtyLease |
     return null
   }
   const now = Date.now()
-  const pendingKill = normalizeSshPendingPtyKill(raw.pendingKill)
+  const pendingKill = normalizeSshPendingPtyKill(raw.pendingKill, raw.ptyId)
   return {
     targetId: raw.targetId,
     ptyId: raw.ptyId,
diff --git a/src/main/persistence/leasing-ssh-ptys/ssh-pty-kill-intent-operations.ts b/src/main/persistence/leasing-ssh-ptys/ssh-pty-kill-intent-operations.ts
index 52d1c51e9f2b..a499ba10253b 100644
--- a/src/main/persistence/leasing-ssh-ptys/ssh-pty-kill-intent-operations.ts
+++ b/src/main/persistence/leasing-ssh-ptys/ssh-pty-kill-intent-operations.ts
@@ -126,7 +126,7 @@ export function recordSshRemotePtyKillIntent(
     const prior = existing.pendingKill
     // Same incarnation means a repeated close; a recycled relay id starts a new intent lifetime.
     existing.pendingKill =
-      prior?.incarnationId === intent.incarnationId
+      prior && prior.incarnationId === intent.incarnationId
         ? {
             ...intent,
             requestedAt: Math.min(prior.requestedAt, now),
diff --git a/src/main/persistence/loading-store/profile-state-delayed-authority-fixture.ts b/src/main/persistence/loading-store/profile-state-delayed-authority-fixture.ts
index cebd91b05389..26709b33e3fa 100644
--- a/src/main/persistence/loading-store/profile-state-delayed-authority-fixture.ts
+++ b/src/main/persistence/loading-store/profile-state-delayed-authority-fixture.ts
@@ -29,12 +29,18 @@ export class DelayedAuthority implements AsyncProfileStateAuthority {
     | { started: ReturnType<typeof deferred<void>>; finish: ReturnType<typeof deferred<void>> }
     | undefined
   readonly captures: ProfileStateDomainReplacement[][] = []
+  private failNext = false
   readonly close = vi.fn(async () => {
     this.inner.close()
   })
 
   constructor(readonly inner: ProfileStateSqliteAuthority) {}
 
+  /** Fail the next profile write the way a full disk would, after any paused gate opens. */
+  failNextWrite() {
+    this.failNext = true
+  }
+
   pause() {
     const gate = { started: deferred<void>(), finish: deferred<void>() }
     this.next = gate
@@ -51,17 +57,17 @@ export class DelayedAuthority implements AsyncProfileStateAuthority {
   }
   async writeSerializedState(payload: Buffer) {
     const captured = Buffer.from(payload)
-    await this.dispatch(() => this.inner.writeSerializedState(captured))
+    await this.dispatch(() => this.inner.writeSerializedState(captured), true)
   }
   async writeSerializedDomains(replacements: readonly ProfileStateDomainReplacement[]) {
     const captured = structuredClone(replacements)
     this.captures.push([...captured])
-    await this.dispatch(() => this.inner.writeSerializedDomains(captured))
+    await this.dispatch(() => this.inner.writeSerializedDomains(captured), true)
   }
   async writeCompleteSerializedDomains(replacements: readonly ProfileStateDomainReplacement[]) {
     const captured = structuredClone(replacements)
     this.captures.push([...captured])
-    await this.dispatch(() => this.inner.writeCompleteSerializedDomains(captured))
+    await this.dispatch(() => this.inner.writeCompleteSerializedDomains(captured), true)
   }
   async writeSerializedAutomationRuns(
     replacements: readonly ProfileStateDomainReplacement[],
@@ -69,7 +75,10 @@ export class DelayedAuthority implements AsyncProfileStateAuthority {
   ) {
     const captured = structuredClone(replacements)
     const capturedRuns = structuredClone(runs)
-    await this.dispatch(() => this.inner.writeSerializedAutomationRuns(captured, capturedRuns))
+    await this.dispatch(
+      () => this.inner.writeSerializedAutomationRuns(captured, capturedRuns),
+      true
+    )
   }
   async writeJsonExport(path: string) {
     return this.inner.writeJsonExport(path)
@@ -83,11 +92,15 @@ export class DelayedAuthority implements AsyncProfileStateAuthority {
   async quarantineDatabase(root?: string, reason?: string) {
     return this.inner.quarantineDatabase(root, reason)
   }
-  private async dispatch(operation: () => void) {
+  private async dispatch(operation: () => void, write = false) {
     const gate = this.next
     this.next = undefined
     gate?.started.resolve()
     await gate?.finish.promise
+    if (write && this.failNext) {
+      this.failNext = false
+      throw new Error('profile_state_write_failed')
+    }
     operation()
   }
 }
diff --git a/src/main/persistence/loading-store/pty-binding-persistence.ts b/src/main/persistence/loading-store/pty-binding-persistence.ts
index f902ff7d2526..c90544f75026 100644
--- a/src/main/persistence/loading-store/pty-binding-persistence.ts
+++ b/src/main/persistence/loading-store/pty-binding-persistence.ts
@@ -92,7 +92,10 @@ export class PtyBindingPersistenceOperations {
         const paneKey = `${args.tabId}:${args.leafId}`
         const bindingWorktreeId = args.expectedSourceBinding?.worktreeId ?? args.worktreeId
         const session = sessions.getWorkspaceSession(resolvedHostId)
-        if (ptyBindingIsRefused(args, session, bindingWorktreeId, paneKey)) {
+        const partitions = sessions
+          .getWorkspaceSessionHostIds()
+          .map((hostId) => sessions.getWorkspaceSession(hostId))
+        if (ptyBindingIsRefused(args, session, bindingWorktreeId, paneKey, partitions)) {
           outcome = 'refused'
           return { value: false, persist: false }
         }
diff --git a/src/main/persistence/loading-store/pty-binding-refusals.ts b/src/main/persistence/loading-store/pty-binding-refusals.ts
index 3c61056bfca1..636e69bd936e 100644
--- a/src/main/persistence/loading-store/pty-binding-refusals.ts
+++ b/src/main/persistence/loading-store/pty-binding-refusals.ts
@@ -1,3 +1,4 @@
+import { hasClosedTerminalTabRecord } from '../../../shared/closed-terminal-tab-tombstones'
 import { isTerminalLeafId } from '../../../shared/stable-pane-id'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import { layoutContainsLeafId } from '../restoring-sessions/terminal-layout-normalization'
@@ -13,7 +14,7 @@ export type PtyBindingRefusalRequest = {
 }
 
 /**
- * The four fences a binding must clear before anything is mutated, so a refusal leaves nothing
+ * The five fences a binding must clear before anything is mutated, so a refusal leaves nothing
  * half-written. Order matters: every `false` here is returned before the write path or the
  * fast lane can run, which is what the relay's lease expiry and the stable-owner throw rely on.
  */
@@ -21,7 +22,10 @@ export function ptyBindingIsRefused(
   args: PtyBindingRefusalRequest,
   session: WorkspaceSessionState,
   bindingWorktreeId: string,
-  paneKey: string
+  paneKey: string,
+  /** Every host partition: a close is recorded where the tab lived, which need not be where this
+   *  binding lands (a relay reattach binds into `local`). */
+  partitions: readonly WorkspaceSessionState[] = [session]
 ): boolean {
   if (args.expectedSourceBinding) {
     const expected = args.expectedSourceBinding
@@ -56,6 +60,19 @@ export function ptyBindingIsRefused(
       return true
     }
   }
+  const existingTab = session.tabsByWorktree?.[bindingWorktreeId]?.find(
+    (candidate) => candidate.id === args.tabId
+  )
+  // Why: a closed tab's spawn can commit after the close, even after a crash and relaunch; tab
+  // ids are uuids, so a recorded id is never a new tab.
+  if (
+    !existingTab &&
+    partitions.some((partition) =>
+      hasClosedTerminalTabRecord(partition.closedTerminalTabTombstonesByTabId, args.tabId)
+    )
+  ) {
+    return true
+  }
   // Mirrors the four creating branches of the write path — mint a tab, mint a root leaf, split
   // the root and graft a leaf, mint a layout — each of which sets `terminalMembershipChanged`.
   if (
@@ -65,9 +82,6 @@ export function ptyBindingIsRefused(
     return true
   }
   if (args.mayCreate === false) {
-    const existingTab = session.tabsByWorktree?.[bindingWorktreeId]?.find(
-      (candidate) => candidate.id === args.tabId
-    )
     const existingLayout = session.terminalLayoutsByTabId?.[args.tabId]
     const wouldCreateTopology =
       !existingTab ||
diff --git a/src/main/persistence/loading-store/pty-binding-span.ts b/src/main/persistence/loading-store/pty-binding-span.ts
index 58bed424a516..903d93c4967f 100644
--- a/src/main/persistence/loading-store/pty-binding-span.ts
+++ b/src/main/persistence/loading-store/pty-binding-span.ts
@@ -10,11 +10,13 @@ export type PtyBindingSpanOutcome = 'fast_lane' | 'flushed' | 'refused' | 'threw
  */
 export type PtyBindingOrigin = 'reattach' | 'spawn' | 'relay_reattach' | 'split' | 'unknown'
 
+export type PtySpawnCommitOrigin = Extract<PtyBindingOrigin, 'reattach' | 'spawn' | 'split'>
+
 /** The spawn-commit paths share one rule: a split outranks a reattach, a reattach outranks a spawn. */
 export function spawnCommitBindingOrigin(
   commit: { isReattach?: boolean; agentSessionEnsure?: { disposition: string } },
   expectedSourceBinding?: unknown
-): PtyBindingOrigin {
+): PtySpawnCommitOrigin {
   if (expectedSourceBinding !== undefined) {
     return 'split'
   }
diff --git a/src/main/persistence/loading-store/pty-retirement-publication-during-read.test.ts b/src/main/persistence/loading-store/pty-retirement-publication-during-read.test.ts
index dd6754c1d73d..34b6e742804e 100644
--- a/src/main/persistence/loading-store/pty-retirement-publication-during-read.test.ts
+++ b/src/main/persistence/loading-store/pty-retirement-publication-during-read.test.ts
@@ -29,9 +29,6 @@ class RetirementRuntime extends OrcaRuntimeService {
   generations(): number {
     return this.ptyLifecycleGenerationById.size
   }
-  retirements(): number {
-    return this.pendingPtySurfaceRetirementsByPtyId.size
-  }
   async closeTab(): Promise<void> {
     const snapshot = this.snapshot()
     const tab = snapshot?.tabs[0]
@@ -96,10 +93,8 @@ it.each(['read', 'replacement', 'legacy-replacement'] as const)(
     gate.finish.resolve()
     await exiting
     expect(readState().workspaceSession.terminalLayoutsByTabId[binding.tabId]).toBeUndefined()
-    expect(runtime.snapshot()?.tabs).toHaveLength(action === 'read' ? 0 : 1)
-    if (action === 'read') {
-      expect(runtime.retirements()).toBe(0)
-    }
+    // Why every action: the exit retired the leaf in memory before any of them could run.
+    expect(runtime.snapshot()?.tabs).toHaveLength(0)
   }
 )
 
diff --git a/src/main/persistence/loading-store/pty-spawn-commit-dependencies-fixture.ts b/src/main/persistence/loading-store/pty-spawn-commit-dependencies-fixture.ts
index b1d185c38b19..2777fdfde4b5 100644
--- a/src/main/persistence/loading-store/pty-spawn-commit-dependencies-fixture.ts
+++ b/src/main/persistence/loading-store/pty-spawn-commit-dependencies-fixture.ts
@@ -37,7 +37,6 @@ export function createPtySpawnCommitDependencies(
     sendPtyExitToRenderer: unexpectedPreflight,
     finishPtyShutdown: unexpectedPreflight,
     retiredRejectedPtyIds: new Map(),
-    reversibleStopOwnersByPtyId: new Map(),
     get mainWindow() {
       return unexpectedPreflight()
     }
diff --git a/src/main/persistence/loading-store/pty-spawn-replacement-durability.test.ts b/src/main/persistence/loading-store/pty-spawn-replacement-durability.test.ts
index 719a3bbe9242..202ad5e6a2d3 100644
--- a/src/main/persistence/loading-store/pty-spawn-replacement-durability.test.ts
+++ b/src/main/persistence/loading-store/pty-spawn-replacement-durability.test.ts
@@ -1,3 +1,4 @@
+import { isTerminalSessionStorageCapacityFailure } from '../../../shared/terminal-session-state-save-failure'
 import { afterEach, expect, it, vi } from 'vitest'
 import { deferred, fixture } from './profile-state-delayed-authority-fixture'
 import { OrcaRuntimeService } from '../../runtime/orca-runtime'
@@ -36,11 +37,17 @@ afterEach(() => {
 
 it.each(
   ['ipc', 'runtime'].flatMap((controller) =>
-    ['save', 'shutdown'].map((replacementDuring) => ({ controller, replacementDuring }))
+    ['save', 'shutdown'].flatMap((replacementDuring) =>
+      ['profile-state-writer-exit', 'ENOSPC'].map((code) => ({
+        controller,
+        replacementDuring,
+        code
+      }))
+    )
   )
 )(
-  'preserves a successor during $replacementDuring when the predecessor $controller save fails',
-  async ({ controller, replacementDuring }) => {
+  'preserves a successor during $replacementDuring when the predecessor $controller save fails with $code',
+  async ({ controller, replacementDuring, code }) => {
     const { store, authority } = await fixture()
     const runtime = new OrcaRuntimeService(store)
     runtime.onPtySpawned(binding.ptyId, binding.incarnationId)
@@ -70,10 +77,18 @@ it.each(
       commit = () => commitRuntimePtySpawn(ctx)
     }
     const gate = authority.pause()
-    const pending = expect(commit()).rejects.toThrow('ORCA_TERMINAL_SESSION_STATE_SAVE_FAILED')
+    const pending = commit().catch((error: unknown) => {
+      expect(error).toBeInstanceOf(Error)
+      if (!(error instanceof Error)) {
+        throw error
+      }
+      expect(error.message).toContain('ORCA_TERMINAL_SESSION_STATE_SAVE_FAILED')
+      expect(isTerminalSessionStorageCapacityFailure(error.message)).toBe(code === 'ENOSPC')
+      return 'rejected'
+    })
     await gate.started.promise
     if (replacementDuring === 'shutdown') {
-      gate.finish.reject(new Error('disk full'))
+      gate.finish.reject(Object.assign(new Error('worker exited'), { code }))
       await shutdownStarted.promise
     }
     await runtime.onPtyExit(binding.ptyId, 0, binding.incarnationId, { providerExitObserved: true })
@@ -81,10 +96,10 @@ it.each(
     ptyIncarnationById.set(binding.ptyId, replacementIncarnation)
     ptyOwnership.set(binding.ptyId, 'successor-host')
     if (replacementDuring === 'save') {
-      gate.finish.reject(new Error('disk full'))
+      gate.finish.reject(Object.assign(new Error('worker exited'), { code }))
     }
     shutdownFinished.resolve()
-    await pending
+    expect(await pending).toBe('rejected')
     if (replacementDuring === 'save') {
       expect(shutdown).not.toHaveBeenCalled()
     } else {
@@ -144,3 +159,14 @@ it.each(['ipc', 'runtime'])(
     })
   }
 )
+
+it('does not label an IPC binding ownership refusal as a storage failure', async () => {
+  const { store } = await fixture()
+  const runtime = new OrcaRuntimeService(store)
+  const deps = createPtySpawnCommitDependencies(runtime, store)
+  const ctx = createPtyIpcSpawnState(deps, { ...binding, cols: 80, rows: 24 })
+  ctx.result = { id: binding.ptyId, incarnationId: binding.incarnationId }
+  ctx.validatedLeafId = binding.leafId
+  vi.spyOn(store, 'persistPtyBinding').mockResolvedValue(false)
+  await expect(commitPtyIpcSpawn(ctx)).rejects.toThrow('terminal_pane_owner_changed')
+})
diff --git a/src/main/persistence/loading-store/terminal-close-async-durability.test.ts b/src/main/persistence/loading-store/terminal-close-async-durability.test.ts
new file mode 100644
index 000000000000..090d2340932a
--- /dev/null
+++ b/src/main/persistence/loading-store/terminal-close-async-durability.test.ts
@@ -0,0 +1,227 @@
+import { expect, it, vi } from 'vitest'
+import { fixture } from './profile-state-delayed-authority-fixture'
+import { OrcaRuntimeService } from '../../runtime/orca-runtime'
+import type { RuntimeMobileSessionTabsSnapshot } from '../../../shared/runtime-types'
+
+vi.mock('../../telemetry/client', () => ({ track: vi.fn() }))
+vi.mock('../../telemetry/cohort-classifier', () => ({
+  getCohortAtEmit: () => ({ nth_repo_added: 2 })
+}))
+vi.mock('../../ssh/ssh-config-parser', () => ({
+  loadUserSshConfig: () => ({ hosts: [] }),
+  sshConfigHostsToTargets: () => []
+}))
+
+const binding = {
+  worktreeId: 'repo-local::/fixture/local',
+  tabId: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa',
+  leafId: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb',
+  ptyId: 'closing-pty',
+  incarnationId: 'cccccccc-cccc-4ccc-8ccc-cccccccccccc'
+}
+const siblingLeafId = 'dddddddd-dddd-4ddd-8ddd-dddddddddddd'
+
+class CloseRuntime extends OrcaRuntimeService {
+  async closeHeadlessTab(): Promise<void> {
+    const snapshot = this.mobileSessionTabsByWorktree.get(binding.worktreeId)
+    const tab = snapshot?.tabs[0]
+    if (!snapshot || tab?.type !== 'terminal') {
+      throw new Error('missing test tab')
+    }
+    await this.closeHeadlessMobileTerminalTab(binding.worktreeId, snapshot, tab)
+  }
+  publish(): void {
+    const snapshot: RuntimeMobileSessionTabsSnapshot = {
+      worktree: binding.worktreeId,
+      publicationEpoch: 'close-test',
+      snapshotVersion: 1,
+      activeGroupId: null,
+      activeTabId: `${binding.tabId}::${binding.leafId}`,
+      activeTabType: 'terminal',
+      tabs: [
+        {
+          type: 'terminal',
+          id: `${binding.tabId}::${binding.leafId}`,
+          parentTabId: binding.tabId,
+          leafId: binding.leafId,
+          ptyId: binding.ptyId,
+          title: 'Terminal',
+          isActive: true
+        }
+      ]
+    }
+    this.storeMobileSessionSnapshot(binding.worktreeId, snapshot)
+  }
+}
+
+async function closeFixture(options: { split?: boolean } = {}) {
+  const result = await fixture()
+  await result.store.persistPtyBinding(binding)
+  if (options.split) {
+    await result.store.persistPtyBinding({
+      ...binding,
+      leafId: siblingLeafId,
+      ptyId: 'sibling-pty',
+      incarnationId: 'eeeeeeee-eeee-4eee-8eee-eeeeeeeeeeee',
+      expectedSourceBinding: binding
+    })
+  }
+  const runtime = new CloseRuntime(result.store)
+  const kill = vi.fn(() => true)
+  runtime.setPtyController({ write: () => true, kill, getForegroundProcess: async () => null })
+  return {
+    ...result,
+    runtime,
+    kill,
+    persistedLeafIds: () =>
+      Object.keys(
+        result.readState().workspaceSession.terminalLayoutsByTabId[binding.tabId]?.ptyIdsByLeafId ??
+          {}
+      ),
+    liveLeafIds: () =>
+      Object.keys(
+        result.store.getWorkspaceSession().terminalLayoutsByTabId[binding.tabId]?.ptyIdsByLeafId ??
+          {}
+      )
+  }
+}
+
+it.each([
+  ['tab', { kind: 'tab' as const, tabId: binding.tabId }, []],
+  [
+    'split pane',
+    { kind: 'pane' as const, tabId: binding.tabId, leafId: binding.leafId },
+    [siblingLeafId]
+  ]
+])('acknowledges a renderer %s close only once it is durable', async (kind, target, remaining) => {
+  const { authority, runtime, persistedLeafIds } = await closeFixture({ split: kind !== 'tab' })
+  const before = persistedLeafIds()
+  const gate = authority.pause()
+  let acknowledged = false
+  const closing = runtime
+    .closeTerminalSurfaceFromRenderer({ worktreeId: binding.worktreeId, target: target })
+    .then(() => {
+      acknowledged = true
+    })
+  try {
+    await Promise.race([gate.started.promise, closing])
+    expect(acknowledged).toBe(false)
+    expect(persistedLeafIds()).toEqual(before)
+  } finally {
+    gate.finish.resolve()
+  }
+  await closing
+  expect(persistedLeafIds()).toEqual(remaining)
+})
+
+it('keeps a phone close and still kills when its durable write fails', async () => {
+  const { authority, store, runtime, kill, persistedLeafIds, liveLeafIds } = await closeFixture()
+  runtime.registerPty(binding.ptyId, binding.worktreeId, null, binding)
+  runtime.publish()
+  const failure = vi.spyOn(console, 'error').mockImplementation(() => {})
+  const gate = authority.pause()
+  const closing = runtime.closeHeadlessTab()
+  await Promise.race([gate.started.promise, closing])
+  gate.finish.reject(new Error('close disk refused'))
+
+  await expect(closing).resolves.toBeUndefined()
+  expect(kill).toHaveBeenCalledExactlyOnceWith(binding.ptyId)
+  expect(liveLeafIds()).toEqual([])
+  expect(persistedLeafIds()).toEqual([binding.leafId])
+  expect(failure).toHaveBeenCalledWith(
+    '[runtime] failed to persist terminal close:',
+    expect.objectContaining({ message: 'close disk refused' })
+  )
+
+  // Nothing rolled the removal back, so the next write makes it durable.
+  await store.flushPendingOrThrowAsync()
+  expect(persistedLeafIds()).toEqual([])
+})
+
+it('keeps a renderer close when its durable write fails', async () => {
+  const { authority, runtime, persistedLeafIds, liveLeafIds } = await closeFixture()
+  vi.spyOn(console, 'error').mockImplementation(() => {})
+  const gate = authority.pause()
+  const closing = runtime.closeTerminalSurfaceFromRenderer({
+    worktreeId: binding.worktreeId,
+    target: {
+      kind: 'tab',
+      tabId: binding.tabId
+    }
+  })
+  await Promise.race([gate.started.promise, closing])
+  gate.finish.reject(new Error('close disk refused'))
+
+  await expect(closing).resolves.toBeUndefined()
+  expect(liveLeafIds()).toEqual([])
+  expect(persistedLeafIds()).toEqual([binding.leafId])
+})
+
+it('commits nothing for a pane that restarted while its close waited for the writer', async () => {
+  const { authority, store, runtime, liveLeafIds } = await closeFixture({ split: true })
+  const gate = authority.pause()
+  const session = store.getWorkspaceSession()
+  store.setWorkspaceSession({ ...session, activeTabIdByWorktree: { [binding.worktreeId]: null } })
+  const earlierWrite = store.flushPendingOrThrowAsync()
+  await gate.started.promise
+  // The restart is queued first, so it lands after the close captured the pane it meant.
+  const restart = store.persistPtyBinding({
+    ...binding,
+    ptyId: 'restarted-pty',
+    incarnationId: 'ffffffff-ffff-4fff-8fff-ffffffffffff'
+  })
+  const closing = runtime.closeTerminalSurfaceFromRenderer({
+    worktreeId: binding.worktreeId,
+    target: {
+      kind: 'pane',
+      tabId: binding.tabId,
+      leafId: binding.leafId
+    }
+  })
+  gate.finish.resolve()
+  await earlierWrite
+  await expect(restart).resolves.toBe(true)
+  await closing
+
+  expect(liveLeafIds()).toEqual([binding.leafId, siblingLeafId])
+})
+
+it('commits a renderer tab close whose split pane bound while the close waited for the writer', async () => {
+  const { authority, store, runtime, persistedLeafIds, liveLeafIds } = await closeFixture()
+  const gate = authority.pause()
+  const session = store.getWorkspaceSession()
+  store.setWorkspaceSession({ ...session, activeTabIdByWorktree: { [binding.worktreeId]: null } })
+  const earlierWrite = store.flushPendingOrThrowAsync()
+  await gate.started.promise
+  // The split's binding is queued first, so it grows the tab after the close was asked.
+  const split = store.persistPtyBinding({
+    ...binding,
+    leafId: siblingLeafId,
+    ptyId: 'sibling-pty',
+    incarnationId: 'eeeeeeee-eeee-4eee-8eee-eeeeeeeeeeee',
+    expectedSourceBinding: binding
+  })
+  const closing = runtime.closeTerminalSurfaceFromRenderer({
+    worktreeId: binding.worktreeId,
+    target: {
+      kind: 'tab',
+      tabId: binding.tabId
+    }
+  })
+  gate.finish.resolve()
+  await earlierWrite
+  await expect(split).resolves.toBe(true)
+  await expect(closing).resolves.toBeUndefined()
+
+  expect(persistedLeafIds()).toEqual([])
+  expect(liveLeafIds()).toEqual([])
+  expect(
+    store
+      .getWorkspaceSession()
+      .tabsByWorktree[binding.worktreeId]?.some((tab) => tab.id === binding.tabId)
+  ).toBe(false)
+  // Why: skipping the owner fence for the layout owner's own close must not skip its record.
+  expect(store.getWorkspaceSession().closedTerminalTabTombstonesByTabId?.[binding.tabId]).toEqual(
+    expect.objectContaining({ worktreeId: binding.worktreeId, reason: 'user' })
+  )
+})
diff --git a/src/main/persistence/profile-state/profile-state-writer-capacity-errors.test.ts b/src/main/persistence/profile-state/profile-state-writer-capacity-errors.test.ts
new file mode 100644
index 000000000000..f537af8833ca
--- /dev/null
+++ b/src/main/persistence/profile-state/profile-state-writer-capacity-errors.test.ts
@@ -0,0 +1,47 @@
+import Database from '../../sqlite/sync-database'
+import { expect, it } from 'vitest'
+import {
+  decodeProfileStateWriterError,
+  encodeProfileStateWriterError
+} from './profile-state-writer-errors'
+import {
+  createTerminalSessionStateSaveFailureMessage,
+  isTerminalSessionStorageCapacityFailure
+} from '../../../shared/terminal-session-state-save-failure'
+
+it.each(['ENOSPC', 'EDQUOT', 'SQLITE_FULL', 'EACCES', 'SQLITE_BUSY'])(
+  'preserves capacity evidence across the writer boundary for %s',
+  (code) => {
+    const error = new Error('private path must not cross the worker boundary', {
+      cause: Object.assign(new Error('private details'), { code })
+    })
+    const encoded = encodeProfileStateWriterError(error)
+    expect(encoded.message).toBe('Profile state persistence failed')
+    const decoded = decodeProfileStateWriterError(JSON.parse(JSON.stringify(encoded)))
+    const capacity = ['ENOSPC', 'EDQUOT', 'SQLITE_FULL'].includes(code)
+    expect(
+      isTerminalSessionStorageCapacityFailure(createTerminalSessionStateSaveFailureMessage(decoded))
+    ).toBe(capacity)
+  }
+)
+
+it('classifies a real SQLite capacity failure after worker serialization', () => {
+  const db = new Database(':memory:')
+  try {
+    db.exec('PRAGMA page_size=512; CREATE TABLE writes(data BLOB); PRAGMA max_page_count=2')
+    let failure: unknown
+    try {
+      db.exec('INSERT INTO writes VALUES (zeroblob(4096))')
+    } catch (error) {
+      failure = error
+    }
+    expect(failure).toBeDefined()
+    const decoded = decodeProfileStateWriterError(encodeProfileStateWriterError(failure))
+    expect(
+      isTerminalSessionStorageCapacityFailure(createTerminalSessionStateSaveFailureMessage(decoded))
+    ).toBe(true)
+    db.exec("INSERT INTO writes VALUES ('small')")
+  } finally {
+    db.close()
+  }
+})
diff --git a/src/main/persistence/profile-state/profile-state-writer-errors.ts b/src/main/persistence/profile-state/profile-state-writer-errors.ts
index 28237862ce2a..afb30d520c87 100644
--- a/src/main/persistence/profile-state/profile-state-writer-errors.ts
+++ b/src/main/persistence/profile-state/profile-state-writer-errors.ts
@@ -1,3 +1,4 @@
+import { storageCapacityErrorCode } from '../../../shared/storage-capacity-error'
 import {
   ProfileStateDocumentCorruptionError,
   ProfileStateRevisionConflictError
@@ -64,7 +65,7 @@ export function encodeProfileStateWriterError(
     return { code: error.code, message: error.message, outcome }
   }
   return {
-    code: 'profile-state-write-failed',
+    code: storageCapacityErrorCode(error) ?? 'profile-state-write-failed',
     message: 'Profile state persistence failed',
     outcome
   }
diff --git a/src/main/persistence/profile-state/profile-state-writer-worker.test.ts b/src/main/persistence/profile-state/profile-state-writer-worker.test.ts
index 6fa1efe9a6ef..bcf2f54ee518 100644
--- a/src/main/persistence/profile-state/profile-state-writer-worker.test.ts
+++ b/src/main/persistence/profile-state/profile-state-writer-worker.test.ts
@@ -2,7 +2,7 @@ import { build } from 'esbuild'
 import { mkdtempSync, readFileSync, rmSync, writeFileSync, existsSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join, resolve } from 'node:path'
-import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
 import { ProfileStateSqliteAuthority } from './profile-state-sqlite-authority'
 import { ProfileStateRevisionConflictError } from './profile-state-document-validation'
 import { openProfileStateDatabase } from './profile-state-database'
@@ -266,12 +266,26 @@ describe('persistent profile state write worker', () => {
       })
     `
       )
-      const client = clientFor(f.initialization, broken, 150)
+      const client = clientFor(f.initialization, broken)
       await client.ready
-      const failure = await client
-        .writeSerializedDomains([{ domain: 'settings', payload: '{}' }])
-        .catch((error: unknown) => error)
-      expect(profileStateWriterFailureOutcome(failure)).toBe('indeterminate')
+      if (mode === 'timeout') {
+        vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+      }
+      try {
+        const failure = client
+          .writeSerializedDomains([{ domain: 'settings', payload: '{}' }])
+          .catch((error: unknown) => error)
+        if (mode === 'timeout') {
+          await vi.advanceTimersByTimeAsync(5000)
+        }
+        const observedFailure = await failure
+        expect(profileStateWriterFailureOutcome(observedFailure)).toBe('indeterminate')
+        if (mode === 'timeout') {
+          expect(observedFailure).toMatchObject({ code: 'profile-state-writer-timeout' })
+        }
+      } finally {
+        vi.useRealTimers()
+      }
       await client.close()
       expect(readState(f.path, f.profileId)).toEqual({ settings: { theme: 'dark' } })
       rmSync(f.root, { recursive: true })
diff --git a/src/main/persistence/runtime-authored-workspace-session-fields.ts b/src/main/persistence/runtime-authored-workspace-session-fields.ts
index e87b47cd5355..80a9d30b532d 100644
--- a/src/main/persistence/runtime-authored-workspace-session-fields.ts
+++ b/src/main/persistence/runtime-authored-workspace-session-fields.ts
@@ -4,9 +4,9 @@ import type { WorkspaceSessionState } from '../../shared/workspace-session-state
  * Keeps session fields the renderer persist snapshot does not author across a full write.
  *
  * A session write replaces the stored object. Zustand-built payloads omit runtime-owned
- * client-hosted pages, and they omit-when-empty the write-once default-terminal-tab marker.
- * Without this, those slices vanish on the next desktop write and only show up missing after
- * restart.
+ * client-hosted pages and terminal close records, and they omit-when-empty the write-once
+ * default-terminal-tab marker. Without this, those slices vanish on the next desktop write and
+ * only show up missing after restart.
  *
  * Callers do not opt in: the Store applies this inside setLocalWorkspaceSession and
  * setHostWorkspaceSession, so the before-unload stage path inherits it too.
@@ -44,6 +44,16 @@ export function preserveRuntimeAuthoredWorkspaceSessionFields(
       clientHostedBrowserPagesByWorktree: prior.clientHostedBrowserPagesByWorktree
     }
   }
+  // Why: close records are main's alone (its close transaction); a renderer save never carries them.
+  if (
+    next.closedTerminalTabTombstonesByTabId === undefined &&
+    prior?.closedTerminalTabTombstonesByTabId !== undefined
+  ) {
+    result = {
+      ...result,
+      closedTerminalTabTombstonesByTabId: prior.closedTerminalTabTombstonesByTabId
+    }
+  }
   // Why union: persist snapshots omit this write-once map (empty Zustand slice, omit-when-empty
   // payload). Treating omission as "never applied" re-spawns default terminals on every attach.
   return unionWriteOnceDefaultTerminalTabsApplied(result, prior)
diff --git a/src/main/persistence/tracking-repos/repo-update-host-guard.test.ts b/src/main/persistence/tracking-repos/repo-update-host-guard.test.ts
new file mode 100644
index 000000000000..101cbc2e2b2d
--- /dev/null
+++ b/src/main/persistence/tracking-repos/repo-update-host-guard.test.ts
@@ -0,0 +1,98 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { Repo } from '../../../shared/repo-types'
+import { RepoUpdatePersistenceOperations } from './repo-update-operations'
+
+function makeRepo(overrides: Partial<Repo> & Pick<Repo, 'id'>): Repo {
+  return {
+    path: '/repos/example',
+    displayName: 'Example',
+    badgeColor: '#000000',
+    addedAt: 0,
+    kind: 'git',
+    ...overrides
+  }
+}
+
+function makeOperations(repos: Repo[]) {
+  const state = { repos, projectGroups: [] }
+  const scheduleSave = vi.fn()
+  const operations = new RepoUpdatePersistenceOperations({
+    state,
+    bumpLocalWorktreeScanGeneration: vi.fn(),
+    syncProjectHostSetupCompatibilityState: vi.fn(),
+    scheduleSave,
+    hydrateRepo: (repo) => repo
+  })
+  return { operations, scheduleSave, state }
+}
+
+describe('updateRepo host guard', () => {
+  let errors: string[]
+
+  beforeEach(() => {
+    errors = []
+    vi.spyOn(console, 'error').mockImplementation((...args: unknown[]) => {
+      errors.push(args.map(String).join(' '))
+    })
+  })
+
+  it('reports a host mismatch instead of returning the same silent null as a missing row', () => {
+    // #22421's exact shape: the row exists under `runtime:env-1`, the caller addressed the probe host.
+    const { operations, scheduleSave } = makeOperations([
+      makeRepo({ id: 'repo-1', executionHostId: 'runtime:env-1' })
+    ])
+
+    const result = operations.updateRepo('repo-1', { displayName: 'Renamed' }, 'local')
+
+    expect(result).toBeNull()
+    expect(scheduleSave).not.toHaveBeenCalled()
+    expect(errors).toHaveLength(1)
+    expect(errors[0]).toContain('repo-1')
+    expect(errors[0]).toContain('requested host local')
+    expect(errors[0]).toContain('runtime:env-1')
+  })
+
+  it('stays silent when the row genuinely does not exist', () => {
+    const { operations } = makeOperations([
+      makeRepo({ id: 'repo-1', executionHostId: 'runtime:env-1' })
+    ])
+
+    expect(operations.updateRepo('repo-missing', { displayName: 'Renamed' }, 'local')).toBeNull()
+    expect(errors).toEqual([])
+  })
+
+  it('writes when the host argument matches the row stamp', () => {
+    const { operations, scheduleSave, state } = makeOperations([
+      makeRepo({ id: 'repo-1', executionHostId: 'runtime:env-1' })
+    ])
+
+    const result = operations.updateRepo('repo-1', { displayName: 'Renamed' }, 'runtime:env-1')
+
+    expect(result?.displayName).toBe('Renamed')
+    expect(state.repos[0].displayName).toBe('Renamed')
+    expect(scheduleSave).toHaveBeenCalledTimes(1)
+    expect(errors).toEqual([])
+  })
+
+  it('still refuses a cross-host write when both hosts hold a row with the same id', () => {
+    const local = makeRepo({ id: 'repo-1', displayName: 'Local', executionHostId: 'local' })
+    const peer = makeRepo({ id: 'repo-1', displayName: 'Peer', executionHostId: 'ssh:peer' })
+    const { operations, state } = makeOperations([local, peer])
+
+    const result = operations.updateRepo('repo-1', { displayName: 'Local edit' }, 'local')
+
+    expect(result?.displayName).toBe('Local edit')
+    // The peer's row is untouched: a client-local write must never repair another host's metadata.
+    expect(state.repos[1].displayName).toBe('Peer')
+  })
+
+  it('writes without a host argument exactly as before', () => {
+    const { operations, state } = makeOperations([
+      makeRepo({ id: 'repo-1', executionHostId: 'runtime:env-1' })
+    ])
+
+    expect(operations.updateRepo('repo-1', { displayName: 'Renamed' })?.displayName).toBe('Renamed')
+    expect(state.repos[0].displayName).toBe('Renamed')
+    expect(errors).toEqual([])
+  })
+})
diff --git a/src/main/persistence/tracking-repos/repo-update-operations.ts b/src/main/persistence/tracking-repos/repo-update-operations.ts
index 399d05ac653a..79444a32a19d 100644
--- a/src/main/persistence/tracking-repos/repo-update-operations.ts
+++ b/src/main/persistence/tracking-repos/repo-update-operations.ts
@@ -10,17 +10,50 @@ import { invalidateGhAccountTokenCache } from '../../github/gh-account-token'
 import { sanitizeRepoUpdatesForPersistence } from './repo-sanitization'
 
 export type RepoUpdateMutationOperations = {
-  state: PersistedState
+  state: Pick<PersistedState, 'repos' | 'projectGroups'>
   bumpLocalWorktreeScanGeneration: (repoId: string) => void
   syncProjectHostSetupCompatibilityState: () => void
   scheduleSave: () => void
   hydrateRepo: (repo: Repo) => Repo
 }
 
+/**
+ * Resolve the row a host-scoped write may touch, and report the one failure the `Repo | null` return
+ * cannot express: the row exists, but under a different host stamp.
+ *
+ * `hostId` is the row's own `executionHostId`, never the host a caller probed or a user selected. A
+ * caller that passes anything else gets the same `null` as a deleted row, so its write is discarded
+ * with no error and no failing test — how #22421 shipped an enrichment pass that never persisted.
+ */
+export function findRepoRowForHostScopedWrite(
+  repos: readonly Repo[],
+  id: string,
+  hostId: ExecutionHostId | undefined
+): Repo | undefined {
+  if (!hostId) {
+    return repos.find((candidate) => candidate.id === id)
+  }
+  const matched = repos.find(
+    (candidate) => candidate.id === id && getRepoExecutionHostId(candidate) === hostId
+  )
+  if (matched) {
+    return matched
+  }
+  const storedHostIds = repos
+    .filter((candidate) => candidate.id === id)
+    .map((candidate) => getRepoExecutionHostId(candidate))
+  if (storedHostIds.length > 0) {
+    console.error(
+      `[persistence] Discarded a repo update for ${id}: requested host ${hostId}, but the row is stored on ${storedHostIds.join(', ')}. Address updateRepo by the row's own executionHostId stamp.`
+    )
+  }
+  return undefined
+}
+
 export class RepoUpdatePersistenceOperations {
   constructor(private readonly operations: RepoUpdateMutationOperations) {}
 
-  private get state(): PersistedState {
+  private get state(): Pick<PersistedState, 'repos' | 'projectGroups'> {
     return this.operations.state
   }
 
@@ -77,10 +110,7 @@ export class RepoUpdatePersistenceOperations {
     },
     hostId?: ExecutionHostId
   ): Repo | null {
-    const repo = this.state.repos.find(
-      (candidate) =>
-        candidate.id === id && (!hostId || getRepoExecutionHostId(candidate) === hostId)
-    )
+    const repo = findRepoRowForHostScopedWrite(this.state.repos, id, hostId)
     if (!repo) {
       return null
     }
diff --git a/src/main/pi/agent-status-extension-source.ts b/src/main/pi/agent-status-extension-source.ts
index bdf9061779c7..58a18b78fa56 100644
--- a/src/main/pi/agent-status-extension-source.ts
+++ b/src/main/pi/agent-status-extension-source.ts
@@ -46,7 +46,7 @@ export function getPiAgentStatusExtensionSource(kind: PiAgentKind = 'pi'): strin
           '  const sessionFile = sessionManager?.getSessionFile?.()',
           "  runtimeOmpSessionMetadata = typeof sessionId === 'string' && sessionId && typeof sessionFile === 'string' && sessionFile ? { session_id: sessionId, session_file: sessionFile } : {}",
           '  trackModelSession(runtimeOmpSessionMetadata.session_id)',
-          '  updateModelMetadata(ctx)', 
+          '  updateModelMetadata(ctx)',
           '}',
           '',
           'function getPostSessionMetadata(ompRuntime: boolean): Record<string, unknown> {',
@@ -75,7 +75,7 @@ export function getPiAgentStatusExtensionSource(kind: PiAgentKind = 'pi'): strin
           '  const sessionId = sessionManager?.getSessionId?.()',
           '  const sessionFile = sessionManager?.getSessionFile?.()',
           "  sessionMetadata = typeof sessionId === 'string' && sessionId && typeof sessionFile === 'string' && sessionFile ? { session_id: sessionId, session_file: sessionFile } : {}",
-          '  trackModelSession(sessionMetadata.session_id)', 
+          '  trackModelSession(sessionMetadata.session_id)',
           '}',
           '',
           'function updateRuntimeOmpSessionMetadata(ctx: unknown): void {',
diff --git a/src/main/pi/titlebar-extension-service.test.ts b/src/main/pi/titlebar-extension-service.test.ts
index 1240d1859a8b..bc259e893a9d 100644
--- a/src/main/pi/titlebar-extension-service.test.ts
+++ b/src/main/pi/titlebar-extension-service.test.ts
@@ -156,9 +156,14 @@ describe('PiTitlebarExtensionService', () => {
     homedirOverride.current = fakeHome
     vi.stubEnv('PI_CONFIG_DIR', 'host-profile')
     try {
-      const env = new PiTitlebarExtensionService().buildPtyEnv('pty-ambient-root', undefined, 'omp', {
-        materializeDefaultHome: true
-      })
+      const env = new PiTitlebarExtensionService().buildPtyEnv(
+        'pty-ambient-root',
+        undefined,
+        'omp',
+        {
+          materializeDefaultHome: true
+        }
+      )
       expect(env.ORCA_OMP_SOURCE_AGENT_DIR).toBe(join(fakeHome, '.omp', 'agent'))
       expect(existsSync(join(fakeHome, 'host-profile'))).toBe(false)
     } finally {
@@ -272,7 +277,6 @@ describe('PiTitlebarExtensionService', () => {
     const env = svc.buildPtyEnv('pty-omp-sqlite', piHome, 'omp')
 
     const sourcePath = join(piHome, 'agent.db')
-    const content = 'agent.db credentials'
 
     expect(env.PI_CODING_AGENT_DIR).toBeUndefined()
     expect(readFileSync(env.ORCA_OMP_FRESH_CONFIG, 'utf8')).toBe('autoResume: false\n')
@@ -282,9 +286,6 @@ describe('PiTitlebarExtensionService', () => {
     expect(existsSync(sourcePath)).toBe(false)
     expect(existsSync(join(userDataDir, 'omp-agent-overlays'))).toBe(false)
     expect(existsSync(join(piHome, 'history.db'))).toBe(false)
-    writeFileSync(sourcePath, content)
-
-    expect(readFileSync(sourcePath, 'utf-8')).toBe(content)
   })
 
   it('migrates missing OMP state from the old source overlay without overwriting source files', () => {
diff --git a/src/main/pi/titlebar-extension-service.ts b/src/main/pi/titlebar-extension-service.ts
index 64a021603f7b..4b698c02f09a 100644
--- a/src/main/pi/titlebar-extension-service.ts
+++ b/src/main/pi/titlebar-extension-service.ts
@@ -191,8 +191,7 @@ export class PiTitlebarExtensionService {
   ): Record<string, string> {
     const freshConfigEnv = kind === 'omp' ? this.buildFreshOmpEnv() : {}
     // The caller resolves the effective launch environment before this point.
-    const sourceAgentDir =
-      existingAgentDir || getDefaultPiAgentDir(kind, options?.configDirName)
+    const sourceAgentDir = existingAgentDir || getDefaultPiAgentDir(kind, options?.configDirName)
     if (kind !== 'prime-agent') {
       try {
         this.safeRemoveOverlay(this.getPtyOverlayDir(ptyId, kind), kind)
diff --git a/src/main/plugins/plugin-host-methods.test.ts b/src/main/plugins/plugin-host-methods.test.ts
index ee6e7a5b9d02..7f196c9eb818 100644
--- a/src/main/plugins/plugin-host-methods.test.ts
+++ b/src/main/plugins/plugin-host-methods.test.ts
@@ -194,10 +194,14 @@ describe('terminal.sendText explicit worktree routing', () => {
         { includeVisualLayouts: false }
       )
       expect(delegate.sendTerminal).toHaveBeenCalledTimes(1)
-      expect(delegate.sendTerminal).toHaveBeenCalledWith(terminalId, {
-        text: 'echo hi',
-        enter: true
-      })
+      expect(delegate.sendTerminal).toHaveBeenCalledWith(
+        terminalId,
+        {
+          text: 'echo hi',
+          enter: true
+        },
+        { inputKind: 'driving' }
+      )
       expect(vi.mocked(delegate.listTerminals).mock.invocationCallOrder[0]!).toBeLessThan(
         vi.mocked(delegate.sendTerminal).mock.invocationCallOrder[0]!
       )
diff --git a/src/main/plugins/plugin-host-service-bindings.ts b/src/main/plugins/plugin-host-service-bindings.ts
index 266b819dbaea..731934d55954 100644
--- a/src/main/plugins/plugin-host-service-bindings.ts
+++ b/src/main/plugins/plugin-host-service-bindings.ts
@@ -3,6 +3,7 @@ import { PLUGIN_WORKSPACE_TERMINAL_LIMIT } from '../../shared/plugins/plugin-hos
 import type { PluginHostServices } from './plugin-host-methods'
 import { PluginSecretsStore } from './plugin-secrets-store'
 import { PluginKvStore } from './plugin-storage-store'
+import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 
 /** Structural subset of OrcaRuntimeService exposed to plugin facade bindings. */
 export type PluginRuntimeDelegate = {
@@ -19,7 +20,8 @@ export type PluginRuntimeDelegate = {
   ): Promise<{ terminals: { handle: string; title: string | null }[] }>
   sendTerminal(
     handle: string,
-    action: { text?: string; enter?: boolean }
+    action: { text?: string; enter?: boolean },
+    options: { inputKind: TerminalInputKind }
   ): Promise<{ accepted: boolean }>
   dispatchPluginNotification(input: {
     pluginId: string
@@ -59,7 +61,7 @@ export function bindPluginHostServices(input: {
         .map((terminal) => ({ id: terminal.handle }))
     },
     sendTerminalText: async (terminalId, action) => {
-      const result = await delegate.sendTerminal(terminalId, action)
+      const result = await delegate.sendTerminal(terminalId, action, { inputKind: 'driving' })
       return { accepted: result.accepted }
     },
     dispatchPluginNotification: (notification) => delegate.dispatchPluginNotification(notification),
diff --git a/src/main/ports/port-scan-command-client.test.ts b/src/main/ports/port-scan-command-client.test.ts
index 37e8451a4dad..d79fe80fbbdb 100644
--- a/src/main/ports/port-scan-command-client.test.ts
+++ b/src/main/ports/port-scan-command-client.test.ts
@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs'
 import { join, sep } from 'node:path'
 import { Worker } from 'node:worker_threads'
 import { afterEach, describe, expect, it, vi } from 'vitest'
@@ -244,17 +243,6 @@ describe('resolveWorkerEntryPath', () => {
     expect(resolved).toBe(join(moduleDir, WORKER_ENTRY_FILENAME))
     expect(resolved).not.toContain('app.asar')
   })
-
-  // A rename in the build config would leave both branches pointing at a file
-  // that is never emitted, and only the packaged one fails silently.
-  it('names the entry the main build actually emits', () => {
-    const config = readFileSync(
-      join(import.meta.dirname, '..', '..', '..', 'electron.vite.config.ts'),
-      'utf8'
-    )
-
-    expect(config).toContain("'port-scan-command-worker-entry': resolve(")
-  })
 })
 
 const REAL_WORKER_BLOCK_MS = 800
diff --git a/src/main/ports/port-scan-command-import-boundary.test.ts b/src/main/ports/port-scan-command-import-boundary.test.ts
deleted file mode 100644
index bd9b9d05fb83..000000000000
--- a/src/main/ports/port-scan-command-import-boundary.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-// Why (#11161): libuv runs process creation inline on the calling event loop,
-// so the port scan only stays off CrBrowserMain while these main-thread modules
-// spawn nothing themselves. Spawning belongs to port-scan-command-execution.ts,
-// which only the worker entry imports.
-const MAIN_THREAD_MODULES = ['local-workspace-port-scanner.ts', 'port-scan-command-client.ts']
-
-describe('port scan main-thread spawn boundary', () => {
-  it.each(MAIN_THREAD_MODULES)('keeps %s free of child_process', (fileName) => {
-    const source = readFileSync(join(import.meta.dirname, fileName), 'utf8')
-
-    expect(source).not.toMatch(/from\s+['"](node:)?child_process['"]/)
-    expect(source).not.toMatch(/require\(\s*['"](node:)?child_process['"]\s*\)/)
-  })
-})
diff --git a/src/main/powershell-osc133-bootstrap.ts b/src/main/powershell-osc133-bootstrap.ts
index f776521d498c..0dd39fa2a673 100644
--- a/src/main/powershell-osc133-bootstrap.ts
+++ b/src/main/powershell-osc133-bootstrap.ts
@@ -1,5 +1,5 @@
 import { getPowerShellOmpShellWrapper } from './pty/omp-shell-wrapper'
-import { getPowerShellCodexShellLaunchPreflight } from './pty/codex-shell-launch-preflight'
+import { getPowerShellCodexShellLaunchPreflight } from '../shared/codex-shell-function'
 export { encodePowerShellCommand } from '../shared/powershell-command-encoding'
 
 /**
diff --git a/src/main/preflight/freebuff-remote-detection.test.ts b/src/main/preflight/freebuff-remote-detection.test.ts
new file mode 100644
index 000000000000..de8408da088f
--- /dev/null
+++ b/src/main/preflight/freebuff-remote-detection.test.ts
@@ -0,0 +1,31 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+const { getActiveMultiplexerMock } = vi.hoisted(() => ({
+  getActiveMultiplexerMock: vi.fn()
+}))
+
+vi.mock('../ssh/ssh-target-registry', () => ({
+  getActiveMultiplexer: getActiveMultiplexerMock
+}))
+
+import { detectRemoteAgents } from './agent-detection'
+
+afterEach(() => vi.resetAllMocks())
+
+describe('Freebuff SSH detection', () => {
+  it('asks the execution host to detect Freebuff separately from Codebuff', async () => {
+    const request = vi.fn().mockResolvedValue({ agents: ['freebuff'] })
+    getActiveMultiplexerMock.mockReturnValue({ isDisposed: () => false, request })
+
+    await expect(detectRemoteAgents({ connectionId: 'ssh-freebuff' })).resolves.toEqual([
+      'freebuff'
+    ])
+    expect(getActiveMultiplexerMock).toHaveBeenCalledWith('ssh-freebuff')
+    expect(request).toHaveBeenCalledWith('preflight.detectAgents', {
+      commands: expect.arrayContaining([
+        { id: 'freebuff', cmd: 'freebuff' },
+        { id: 'codebuff', cmd: 'codebuff' }
+      ])
+    })
+  })
+})
diff --git a/src/main/project-groups/nested-repo-glob-budget.test.ts b/src/main/project-groups/nested-repo-glob-budget.test.ts
new file mode 100644
index 000000000000..41b051a0134f
--- /dev/null
+++ b/src/main/project-groups/nested-repo-glob-budget.test.ts
@@ -0,0 +1,193 @@
+import { describe, expect, it } from 'vitest'
+import {
+  isIgnoredNestedRepoDirectory,
+  readNestedRepoGitignoreRules,
+  readNestedRepoGlobMatchSteps
+} from './nested-repo-scan-rules'
+
+async function readRules(content: string) {
+  return readNestedRepoGitignoreRules({
+    folderPath: '/synthetic',
+    entries: [{ name: '.gitignore', isDirectory: false }],
+    baseSegments: [],
+    filesystem: {
+      readDirectory: async () => [],
+      readTextFile: async () => content,
+      joinPath: (parent, child) => `${parent}/${child}`,
+      basename: (path) => path,
+      hasGitMarker: () => false,
+      isSelectedPathGitRepo: () => false
+    }
+  })
+}
+
+function strings(alphabet: string[], maxLength: number): string[] {
+  const result = ['']
+  let layer = ['']
+  for (let length = 1; length <= maxLength; length++) {
+    layer = layer.flatMap((prefix) => alphabet.map((character) => prefix + character))
+    result.push(...layer)
+  }
+  return result
+}
+
+function segmentLists(alphabet: string[], maxLength: number): string[][] {
+  const result: string[][] = []
+  let layer: string[][] = [[]]
+  for (let length = 1; length <= maxLength; length++) {
+    layer = layer.flatMap((prefix) => alphabet.map((token) => [...prefix, token]))
+    result.push(...layer)
+  }
+  return result
+}
+
+// Pre-change oracle: a regular expression per wildcard segment, plus an unmemoized `**` walk over
+// uncollapsed segments. Differential cases hold the shipped matcher to exactly this behaviour.
+function referenceSegment(pattern: string): string | RegExp {
+  if (!pattern.includes('*') && !pattern.includes('?')) {
+    return pattern
+  }
+  const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, '\\$&')
+  return new RegExp(`^${escaped.replace(/\*/g, '[^/]*').replace(/\?/g, '[^/]')}$`)
+}
+
+function referenceSegmentMatches(pattern: string | RegExp, value: string): boolean {
+  return typeof pattern === 'string' ? pattern === value : pattern.test(value)
+}
+
+function referenceIgnored(line: string, candidateSegments: string[]): boolean {
+  const anchored = line.startsWith('/')
+  const pattern = line.replace(/^\/+/, '').replace(/\/+$/, '')
+  if (!anchored && !pattern.includes('/')) {
+    const segment = referenceSegment(pattern)
+    return candidateSegments.some((candidate) => referenceSegmentMatches(segment, candidate))
+  }
+  const patternSegments = pattern
+    .split('/')
+    .map((segment) => (segment === '**' ? segment : referenceSegment(segment)))
+  const matchFrom = (patternIndex: number, candidateIndex: number): boolean => {
+    if (patternIndex >= patternSegments.length) {
+      return candidateIndex >= candidateSegments.length
+    }
+    const segment = patternSegments[patternIndex]
+    if (segment === '**') {
+      return (
+        matchFrom(patternIndex + 1, candidateIndex) ||
+        (candidateIndex < candidateSegments.length && matchFrom(patternIndex, candidateIndex + 1))
+      )
+    }
+    return (
+      candidateIndex < candidateSegments.length &&
+      referenceSegmentMatches(segment, candidateSegments[candidateIndex] ?? '') &&
+      matchFrom(patternIndex + 1, candidateIndex + 1)
+    )
+  }
+  return matchFrom(0, 0)
+}
+
+function stepsSpentOn(run: () => void): number {
+  const before = readNestedRepoGlobMatchSteps()
+  run()
+  return readNestedRepoGlobMatchSteps() - before
+}
+
+describe('nested repository wildcard work budget', () => {
+  it('bounds wildcard segment work for fifty adverse names', async () => {
+    const rules = await readRules(`${'*a'.repeat(12)}b`)
+    const name = `${'a'.repeat(24)}c`
+    let ignored = 0
+    const steps = stepsSpentOn(() => {
+      for (let index = 0; index < 50; index++) {
+        ignored += Number(isIgnoredNestedRepoDirectory(name, [name], rules))
+      }
+    })
+    expect(ignored).toBe(0)
+    // O(pattern length x name length) per name, ~51 steps in practice; the pre-change expression
+    // revisited earlier stars and needed ~25 ms for each of these names.
+    expect(steps).toBeLessThan(50 * 100)
+  })
+
+  it('bounds ** path work for a long run of double stars', async () => {
+    const rules = await readRules(`${'**/'.repeat(24)}z`)
+    const candidate = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']
+    let ignored = true
+    // Parse-time collapse of the `**` run; uncollapsed this shape cost ~49M recursive calls.
+    const steps = stepsSpentOn(() => {
+      ignored = isIgnoredNestedRepoDirectory('h', candidate, rules)
+    })
+    expect(ignored).toBe(false)
+    expect(steps).toBeLessThan(100)
+  })
+
+  it('bounds ** path work when non-collapsible segments separate the double stars', async () => {
+    const rules = await readRules(Array.from({ length: 12 }, () => '**/*').join('/'))
+    const candidate = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']
+    let ignored = true
+    // Memoization; without it this shape revisits pairs and costs over a thousand calls.
+    const steps = stepsSpentOn(() => {
+      ignored = isIgnoredNestedRepoDirectory('h', candidate, rules)
+    })
+    expect(ignored).toBe(false)
+    expect(steps).toBeLessThan(400)
+  })
+
+  it('accepts exactly the same paths for a collapsed and an expanded ** run', async () => {
+    const collapsed = await readRules('**/x')
+    const expanded = await readRules('**/**/**/x')
+    for (const candidate of segmentLists(['a', 'x'], 4)) {
+      const name = candidate.at(-1) ?? ''
+      const label = candidate.join('/')
+      const expectedMatch = referenceIgnored('**/x', candidate)
+      expect(isIgnoredNestedRepoDirectory(name, candidate, collapsed), label).toBe(expectedMatch)
+      expect(isIgnoredNestedRepoDirectory(name, candidate, expanded), label).toBe(expectedMatch)
+      expect(referenceIgnored('**/**/**/x', candidate), label).toBe(expectedMatch)
+    }
+  })
+
+  it('preserves wildcard results for every short pattern and name', async () => {
+    const names = strings(['a', 'b', '?'], 4)
+    for (const pattern of strings(['a', 'b', '*', '?'], 4).slice(1)) {
+      const rules = await readRules(pattern)
+      for (const name of names) {
+        expect(isIgnoredNestedRepoDirectory(name, [name], rules), `${pattern} / ${name}`).toBe(
+          referenceIgnored(pattern, [name])
+        )
+      }
+    }
+  })
+
+  it('preserves path results for every short multi-segment pattern and candidate path', async () => {
+    const candidates = segmentLists(['a', 'b', 'ab'], 3)
+    for (const patternSegments of segmentLists(['a', 'b', '*', '?', '**'], 3)) {
+      const joined = patternSegments.join('/')
+      // The leading slash anchors the rule, which is the non-basenameOnly path even at one segment.
+      for (const line of [joined, `/${joined}`]) {
+        const rules = await readRules(line)
+        for (const candidate of candidates) {
+          expect(
+            isIgnoredNestedRepoDirectory(candidate.at(-1) ?? '', candidate, rules),
+            `${line} / ${candidate.join('/')}`
+          ).toBe(referenceIgnored(line, candidate))
+        }
+      }
+    }
+  })
+
+  it.each([
+    ['[literal]+.*', '[literal]+.suffix', true],
+    ['[literal]+.*', 'literal-suffix', false],
+    ['a\\*', 'a\\suffix', true],
+    ['*', 'a/b', false],
+    ['a?', 'a\n', true],
+    ['a?b', 'a\nb', true],
+    ['a*b', 'ab\n', false],
+    ['?', '😀', false],
+    ['??', '😀', true],
+    ['*😀?', 'x😀a', true],
+    ['*?*a*', 'ba', true],
+    ['**b**', 'abca', true]
+  ])('preserves literal and code-unit matching for %s / %s', async (pattern, name, expected) => {
+    const rules = await readRules(pattern)
+    expect(isIgnoredNestedRepoDirectory(name, [name], rules)).toBe(expected)
+  })
+})
diff --git a/src/main/project-groups/nested-repo-scan-rules.ts b/src/main/project-groups/nested-repo-scan-rules.ts
index 3a8399172528..d38bd1f09833 100644
--- a/src/main/project-groups/nested-repo-scan-rules.ts
+++ b/src/main/project-groups/nested-repo-scan-rules.ts
@@ -17,12 +17,15 @@ export type NestedRepoScanFilesystem = {
 
 type IgnoreRule = {
   pattern: string
-  segmentPatterns: (string | RegExp)[]
+  segmentPatterns: GlobSegment[]
+  memoizePathWalk: boolean
   negate: boolean
   basenameOnly: boolean
   baseSegments: string[]
 }
 
+type GlobSegment = string | { pattern: string }
+
 export type TraversalFolder = {
   path: string
   depth: number
@@ -83,42 +86,107 @@ function shouldSkipDirectory(name: string, depth: number): boolean {
   return depth > 0 && name.startsWith('.')
 }
 
-function compileGlobSegment(pattern: string): string | RegExp {
+function compileGlobSegment(pattern: string): GlobSegment {
   if (!pattern.includes('*') && !pattern.includes('?')) {
     return pattern
   }
-  const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, '\\$&')
-  return new RegExp(`^${escaped.replace(/\*/g, '[^/]*').replace(/\?/g, '[^/]')}$`)
+  return { pattern }
 }
 
-function globSegmentMatches(pattern: string | RegExp, value: string): boolean {
-  return typeof pattern === 'string' ? pattern === value : pattern.test(value)
+let globMatchSteps = 0
+
+/**
+ * Monotonic count of matcher steps taken since process start.
+ *
+ * Budget tests assert on a delta so an algorithmic regression fails deterministically instead of
+ * riding on how fast the machine running the suite happens to be.
+ */
+export function readNestedRepoGlobMatchSteps(): number {
+  return globMatchSteps
+}
+
+function globSegmentMatches(segment: GlobSegment, value: string): boolean {
+  globMatchSteps++
+  if (typeof segment === 'string') {
+    return segment === value
+  }
+  const { pattern } = segment
+  let patternIndex = 0
+  let valueIndex = 0
+  let starIndex = -1
+  let starMatchIndex = 0
+  // Retry only the latest star, avoiding combinatorial regular-expression backtracking.
+  while (valueIndex < value.length) {
+    globMatchSteps++
+    const token = pattern[patternIndex]
+    if (token === '*') {
+      starIndex = patternIndex++
+      starMatchIndex = valueIndex
+    } else if (token === value[valueIndex] || (token === '?' && value[valueIndex] !== '/')) {
+      patternIndex++
+      valueIndex++
+    } else if (starIndex !== -1 && value[starMatchIndex] !== '/') {
+      patternIndex = starIndex + 1
+      valueIndex = ++starMatchIndex
+    } else {
+      return false
+    }
+  }
+  while (pattern[patternIndex] === '*') {
+    patternIndex++
+  }
+  return patternIndex === pattern.length
 }
 
 function pathSegmentsMatch(
-  patternSegments: (string | RegExp)[],
-  candidateSegments: string[]
+  patternSegments: GlobSegment[],
+  candidateSegments: string[],
+  memoize: boolean
 ): boolean {
+  const memoStride = candidateSegments.length + 1
+  // Allocating the table costs more than the walk it would save on the overwhelmingly common
+  // shapes, so only rules that can actually revisit a pair pay for it.
+  const visited = memoize ? new Map<number, boolean>() : undefined
   const matchFrom = (patternIndex: number, candidateIndex: number): boolean => {
+    globMatchSteps++
     if (patternIndex >= patternSegments.length) {
       return candidateIndex >= candidateSegments.length
     }
-    const pattern = patternSegments[patternIndex]
-    if (pattern === '**') {
-      return (
-        matchFrom(patternIndex + 1, candidateIndex) ||
-        (candidateIndex < candidateSegments.length && matchFrom(patternIndex, candidateIndex + 1))
-      )
+    const memoKey = patternIndex * memoStride + candidateIndex
+    const memoized = visited?.get(memoKey)
+    if (memoized !== undefined) {
+      return memoized
     }
-    return (
-      candidateIndex < candidateSegments.length &&
-      globSegmentMatches(pattern, candidateSegments[candidateIndex] ?? '') &&
-      matchFrom(patternIndex + 1, candidateIndex + 1)
-    )
+    const pattern = patternSegments[patternIndex]
+    const matched =
+      pattern === '**'
+        ? matchFrom(patternIndex + 1, candidateIndex) ||
+          (candidateIndex < candidateSegments.length && matchFrom(patternIndex, candidateIndex + 1))
+        : candidateIndex < candidateSegments.length &&
+          globSegmentMatches(pattern, candidateSegments[candidateIndex] ?? '') &&
+          matchFrom(patternIndex + 1, candidateIndex + 1)
+    visited?.set(memoKey, matched)
+    return matched
   }
   return matchFrom(0, 0)
 }
 
+function compilePathSegments(pattern: string): GlobSegment[] {
+  const segments: GlobSegment[] = []
+  for (const segment of pattern.split('/')) {
+    // `**` spans zero or more segments, so `**/**` accepts exactly what `**` accepts: collapsing a
+    // run keeps one adversarial line from handing the path matcher dozens of forking segments.
+    if (segment === '**') {
+      if (segments.at(-1) !== '**') {
+        segments.push(segment)
+      }
+      continue
+    }
+    segments.push(compileGlobSegment(segment))
+  }
+  return segments
+}
+
 function parseGitignoreRules(content: string, baseSegments: string[]): IgnoreRule[] {
   return content
     .split(/\r?\n/)
@@ -130,13 +198,15 @@ function parseGitignoreRules(content: string, baseSegments: string[]): IgnoreRul
       const anchored = unprefixed.startsWith('/')
       const pattern = unprefixed.replace(/^\/+/, '').replace(/\/+$/, '')
       const basenameOnly = !anchored && !pattern.includes('/')
+      const segmentPatterns = basenameOnly
+        ? [compileGlobSegment(pattern)]
+        : compilePathSegments(pattern)
       return {
         pattern,
-        segmentPatterns: basenameOnly
-          ? [compileGlobSegment(pattern)]
-          : pattern
-              .split('/')
-              .map((segment) => (segment === '**' ? segment : compileGlobSegment(segment))),
+        segmentPatterns,
+        // One `**` walks the candidate segments once; two or more reach the same (pattern,
+        // candidate) pair by many routes, which is what turns the walk exponential.
+        memoizePathWalk: segmentPatterns.filter((segment) => segment === '**').length > 1,
         negate,
         basenameOnly,
         baseSegments
@@ -158,7 +228,7 @@ export function isIgnoredNestedRepoDirectory(
     const relativeSegments = segments.slice(rule.baseSegments.length)
     const matches = rule.basenameOnly
       ? relativeSegments.some((segment) => globSegmentMatches(rule.segmentPatterns[0], segment))
-      : pathSegmentsMatch(rule.segmentPatterns, relativeSegments)
+      : pathSegmentsMatch(rule.segmentPatterns, relativeSegments, rule.memoizePathWalk)
     if (matches) {
       ignored = !rule.negate
     }
diff --git a/src/main/providers/agent-foreground-process-git-bash.win32.test.ts b/src/main/providers/agent-foreground-process-git-bash.win32.test.ts
index f8fe5f2ac79d..4133375180fa 100644
--- a/src/main/providers/agent-foreground-process-git-bash.win32.test.ts
+++ b/src/main/providers/agent-foreground-process-git-bash.win32.test.ts
@@ -1,6 +1,6 @@
-import { mkdtempSync } from 'node:fs'
+import { mkdtempSync, rmdirSync, symlinkSync } from 'node:fs'
 import { tmpdir } from 'node:os'
-import { join } from 'node:path'
+import { dirname, join } from 'node:path'
 import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
 import { removeTreeSync } from '../../shared/windows-transient-lock-removal'
 import { WINDOWS_GIT_BASH_SHELL } from '../../shared/windows-terminal-shell'
@@ -10,12 +10,88 @@ import { spawnNativeDaemonPty } from '../daemon/pty-subprocess/native-pty-spawn'
 import { canUseBunPty, spawnBunPty } from '../daemon/pty-subprocess/bun-pty-process'
 import { createWindowsBunPtyLaunch } from '../daemon/pty-subprocess/windows-bun-pty-launch'
 import { createDaemonPtyEnvironment } from '../daemon/pty-subprocess/spawn-environment'
+import type { PtyShellLaunchPlan } from '../daemon/pty-subprocess/shell-launch-plan'
 import type { PtySubprocessOptions } from '../daemon/pty-subprocess'
-import { isGitForWindowsBashLauncherPath } from '../git-bash'
+import { isGitForWindowsBashLauncherPath, resolveGitBashPath } from '../git-bash'
 import { readWindowsPtyJobProcessIds } from './windows-pty-job-membership'
 
 const describeOnWindows = process.platform === 'win32' ? describe : describe.skip
 
+async function spawnPlannedPane(
+  plan: PtyShellLaunchPlan,
+  env: Record<string, string>,
+  opts: PtySubprocessOptions
+): ReturnType<typeof spawnNativeDaemonPty> {
+  return spawnNativeDaemonPty(
+    { ...plan, env, cols: opts.cols, rows: opts.rows },
+    {
+      canUseBunPty,
+      spawnBunPty: (args) =>
+        spawnBunPty(args, {
+          // Source tests use the TS worker; packaged hosts resolve their adjacent JS worker.
+          createWindowsLaunch: (launch) =>
+            createWindowsBunPtyLaunch(launch, {
+              workerPath: join(__dirname, '../daemon/pty-subprocess/windows-bun-pty-gate-entry.ts')
+            })
+        })
+    }
+  )
+}
+
+/** Drives a live pane through prompt -> foreground command -> interrupt -> background job. */
+async function proveIdlePromptCycle(
+  spawned: Awaited<ReturnType<typeof spawnNativeDaemonPty>>,
+  expectedJobSize: number
+): Promise<void> {
+  const proc = spawned.process
+  let output = ''
+  let dead = false
+  proc.onData((chunk) => {
+    output += chunk
+  })
+  proc.onExit(() => {
+    dead = true
+  })
+  const confirm = (): Promise<boolean> =>
+    confirmPtyShellForeground({
+      process: proc,
+      shellPath: spawned.shellPath,
+      isDead: () => dead
+    })
+  try {
+    await vi.waitFor(() => expect(output).toContain('$'), { timeout: 20_000 })
+    await vi.waitFor(() => expect(readWindowsPtyJobProcessIds(proc)?.size).toBe(expectedJobSize), {
+      timeout: 5_000
+    })
+    await vi.waitFor(async () => expect(await confirm(), 'initial prompt').toBe(true), {
+      timeout: 5_000
+    })
+
+    // Interrupt only after the child is ready, not during a transient shell fork.
+    proc.write(
+      "node -e \"console.log(['ORCA','FOREGROUND_READY'].join('_')); setInterval(() => {}, 1000)\"\r"
+    )
+    await vi.waitFor(() => expect(output).toContain('ORCA_FOREGROUND_READY'), {
+      timeout: 10_000
+    })
+    await vi.waitFor(async () => expect(await confirm()).toBe(false), { timeout: 10_000 })
+
+    proc.write('\x03')
+    await vi.waitFor(
+      async () => {
+        expect(dead, 'terminal survived foreground interrupt').toBe(false)
+        expect(await confirm(), 'prompt after interrupt').toBe(true)
+      },
+      { timeout: 10_000 }
+    )
+
+    proc.write('sleep 60 &\r')
+    await vi.waitFor(async () => expect(await confirm()).toBe(false), { timeout: 10_000 })
+  } finally {
+    proc.kill()
+  }
+}
+
 describeOnWindows("Git Bash launcher shell proof with Orca's real launch", () => {
   let userData: string
   const previousUserData = process.env.ORCA_USER_DATA_PATH
@@ -54,72 +130,40 @@ describeOnWindows("Git Bash launcher shell proof with Orca's real launch", () =>
       const plan = createPtyShellLaunchPlan(opts, env)
       expect(isGitForWindowsBashLauncherPath(plan.shellPath)).toBe(true)
       expect(plan.shellArgs.join(' ')).toContain('exec "$BASH"')
-      const spawned = await spawnNativeDaemonPty(
-        { ...plan, env, cols: opts.cols, rows: opts.rows },
-        {
-          canUseBunPty,
-          spawnBunPty: (args) =>
-            spawnBunPty(args, {
-              // Source tests use the TS worker; packaged hosts resolve their adjacent JS worker.
-              createWindowsLaunch: (launch) =>
-                createWindowsBunPtyLaunch(launch, {
-                  workerPath: join(
-                    __dirname,
-                    '../daemon/pty-subprocess/windows-bun-pty-gate-entry.ts'
-                  )
-                })
-            })
-        }
-      )
-      const proc = spawned.process
-      let output = ''
-      let dead = false
-      proc.onData((chunk) => {
-        output += chunk
-      })
-      proc.onExit(() => {
-        dead = true
-      })
-      const confirm = (): Promise<boolean> =>
-        confirmPtyShellForeground({
-          process: proc,
-          shellPath: spawned.shellPath,
-          isDead: () => dead
-        })
-      try {
-        await vi.waitFor(() => expect(output).toContain('$'), { timeout: 20_000 })
-        // Launcher, exec stub, interactive bash: the shape that a size-1 or size-2 rule never matches.
-        await vi.waitFor(() => expect(readWindowsPtyJobProcessIds(proc)?.size).toBe(3), {
-          timeout: 5_000
-        })
-        await vi.waitFor(async () => expect(await confirm(), 'initial prompt').toBe(true), {
-          timeout: 5_000
-        })
-
-        // Interrupt only after the child is ready, not during a transient shell fork.
-        proc.write(
-          "node -e \"console.log(['ORCA','FOREGROUND_READY'].join('_')); setInterval(() => {}, 1000)\"\r"
-        )
-        await vi.waitFor(() => expect(output).toContain('ORCA_FOREGROUND_READY'), {
-          timeout: 10_000
-        })
-        await vi.waitFor(async () => expect(await confirm()).toBe(false), { timeout: 10_000 })
-
-        proc.write('\x03')
-        await vi.waitFor(
-          async () => {
-            expect(dead, 'terminal survived foreground interrupt').toBe(false)
-            expect(await confirm(), 'prompt after interrupt').toBe(true)
-          },
-          { timeout: 10_000 }
-        )
-
-        proc.write('sleep 60 &\r')
-        await vi.waitFor(async () => expect(await confirm()).toBe(false), { timeout: 10_000 })
-      } finally {
-        proc.kill()
-      }
+      // Launcher, exec stub, interactive bash: the shape that a size-1 or size-2 rule never matches.
+      await proveIdlePromptCycle(await spawnPlannedPane(plan, env, opts), 3)
     },
     60_000
   )
+
+  it('confirms an idle prompt for an install folder named neither Git nor PortableGit', async () => {
+    const discovered = resolveGitBashPath()
+    if (!discovered) {
+      throw new Error('this host has no Git for Windows install to stage')
+    }
+    expect(isGitForWindowsBashLauncherPath(discovered)).toBe(true)
+    // A junction, not a copy: the operator's install is neither modified nor duplicated.
+    const stagingRoot = mkdtempSync(join(tmpdir(), 'orca-git-renamed-'))
+    const stagedInstall = join(stagingRoot, 'Git-2.55')
+    symlinkSync(dirname(dirname(discovered)), stagedInstall, 'junction')
+    const opts: PtySubprocessOptions = {
+      sessionId: 'git-bash-renamed-shell-proof',
+      cols: 120,
+      rows: 30,
+      cwd: tmpdir(),
+      shellOverride: join(stagedInstall, 'bin', 'bash.exe')
+    }
+    try {
+      const env = createDaemonPtyEnvironment(opts)
+      const plan = createPtyShellLaunchPlan(opts, env)
+      expect(plan.shellPath).toBe(opts.shellOverride)
+      expect(isGitForWindowsBashLauncherPath(plan.shellPath)).toBe(true)
+      // No Git Bash startup args for an unrecognized folder, so no exec stub: launcher -> bash.
+      await proveIdlePromptCycle(await spawnPlannedPane(plan, env, opts), 2)
+    } finally {
+      // rmdir, never a recursive remove: it detaches the junction and cannot reach the target.
+      rmdirSync(stagedInstall)
+      removeTreeSync(stagingRoot)
+    }
+  }, 60_000)
 })
diff --git a/src/main/providers/local-pty-provider.ts b/src/main/providers/local-pty-provider.ts
index a8e2f9ce6094..728e8a1273ab 100644
--- a/src/main/providers/local-pty-provider.ts
+++ b/src/main/providers/local-pty-provider.ts
@@ -118,6 +118,8 @@ export class LocalPtyProvider implements IPtyProvider {
   clearBuffer(id: string): Promise<void> {
     return clearLocalPtyBuffer(id)
   }
+  // A direct PTY keeps no terminal model of its own.
+  async resetInputModes(_id: string): Promise<void> {}
   closeStartupQueryAuthority(id: string): number {
     return closeLocalPtyStartupQueryAuthority(id)
   }
diff --git a/src/main/providers/local-pty-shell-ready-bash-rcfile.ts b/src/main/providers/local-pty-shell-ready-bash-rcfile.ts
index 877fdda3bcc8..0bbcd0712ea0 100644
--- a/src/main/providers/local-pty-shell-ready-bash-rcfile.ts
+++ b/src/main/providers/local-pty-shell-ready-bash-rcfile.ts
@@ -7,7 +7,7 @@
 import { BASH_PROMPT_COMMAND_COMPOSITION_BLOCK } from '../bash-prompt-command-composition'
 import { WSL_MANAGED_CLI_PATH_RESTORE } from '../wsl-managed-cli-path-restore'
 import { getPosixOmpShellWrapper } from '../pty/omp-shell-wrapper'
-import { getPosixCodexShellLaunchPreflight } from '../pty/codex-shell-launch-preflight'
+import { getPosixCodexShellLaunchPreflight } from '../../shared/codex-shell-function'
 import { getBashStartupCommandPromptBlock } from '../pty/posix-shell-startup-command'
 import { BASH_FEATURE_CHANNEL_BLOCK, SHELL_STARTUP_IDENTITY_MARKER_BLOCK } from '../shell-templates'
 import { SHELL_READY_MARKER_ESCAPED } from './local-pty-shell-ready-marker'
diff --git a/src/main/providers/local-pty-shell-ready-wrapper-fileset.ts b/src/main/providers/local-pty-shell-ready-wrapper-fileset.ts
index 47fb521afcbc..528dd6ee149c 100644
--- a/src/main/providers/local-pty-shell-ready-wrapper-fileset.ts
+++ b/src/main/providers/local-pty-shell-ready-wrapper-fileset.ts
@@ -27,8 +27,7 @@ export function getLocalZshWrapperSpec(): ZshStartupHookSpec {
       managedWslCli: true,
       agentTeamsPath: true,
       remoteCliBinDir: false,
-      codexHome: true,
-      codexLaunchPreflight: true
+      codexHome: true
     }
   }
 }
diff --git a/src/main/providers/local-pty-shell-ready.ts b/src/main/providers/local-pty-shell-ready.ts
index 61a04fdf024f..5a0388aff9fc 100644
--- a/src/main/providers/local-pty-shell-ready.ts
+++ b/src/main/providers/local-pty-shell-ready.ts
@@ -10,7 +10,7 @@ import {
   getPowerShellOsc133Bootstrap,
   isPowerShellExecutableName
 } from '../powershell-osc133-bootstrap'
-import { getFishCodexShellLaunchPreflight } from '../pty/codex-shell-launch-preflight'
+import { getFishCodexShellLaunchPreflight } from '../../shared/codex-shell-function'
 import { POSIX_SHELL_STARTUP_COMMAND_ENV } from '../pty/posix-shell-startup-command'
 import { getFishShellReadyInitCommand } from '../shell-templates'
 import {
diff --git a/src/main/providers/local-pty-spawn-environment.ts b/src/main/providers/local-pty-spawn-environment.ts
index 47aaac6cef0d..645fcacb2d0d 100644
--- a/src/main/providers/local-pty-spawn-environment.ts
+++ b/src/main/providers/local-pty-spawn-environment.ts
@@ -8,6 +8,7 @@ import { stripInheritedBuildModeEnv } from '../pty/build-mode-env'
 import { stripPiProcessOwnerEnv } from '../pty/pi-process-owner-env'
 import { removeInheritedNoColor } from '../pty/terminal-color-env'
 import { isWindowsGitBashShellPath } from '../git-bash'
+import { applyScrubSafeAgentEnvAliases } from '../../shared/agent-hook-scrub-safe-env'
 import { removeUnspecifiedPaneIdentityEnv } from './local-pty-launch-helpers'
 import type { LocalPtyLaunchPlan } from './local-pty-launch-plan'
 import type { LocalPtyProviderOptions } from './local-pty-provider-types'
@@ -42,6 +43,8 @@ export function buildLocalPtySpawnEnvironment(args: {
   if (spawn.env?.TERM) {
     spawnEnv.TERM = spawn.env.TERM
   }
+  // Why after the strips and deletes: an alias must never outlive the value it mirrors.
+  applyScrubSafeAgentEnvAliases(spawnEnv)
 
   spawnEnv.LANG ??= 'en_US.UTF-8'
 
diff --git a/src/main/providers/local-pty-utils.ts b/src/main/providers/local-pty-utils.ts
index 735393449f25..8009260923dc 100644
--- a/src/main/providers/local-pty-utils.ts
+++ b/src/main/providers/local-pty-utils.ts
@@ -2,6 +2,7 @@ import { basename, isAbsolute, join } from 'node:path'
 import { existsSync, accessSync, statSync, chmodSync, constants as fsConstants } from 'node:fs'
 import type * as pty from 'node-pty'
 import { usesNodePtySpawnHelper } from '../../shared/node-pty-spawn-helper'
+import { TERMINAL_SPAWN_ISSUE_REQUEST } from '../../shared/terminal-spawn-error-copy'
 import {
   hostReportsChildExitStatus,
   wrapShellSpawnForMacosTccAttribution
@@ -307,7 +308,6 @@ export function spawnShellWithFallback(params: ShellSpawnParams): ShellSpawnResu
 
   const diag = formatLocalPtyEnvironmentDiag({ shell: shellPath, cwd })
   throw new Error(
-    `Failed to spawn shell "${shellPath}": ${primaryError ?? 'unknown error'} (${diag}). ` +
-      `If this persists, please file an issue.`
+    `Failed to spawn shell "${shellPath}": ${primaryError ?? 'unknown error'} (${diag}). ${TERMINAL_SPAWN_ISSUE_REQUEST}`
   )
 }
diff --git a/src/main/providers/provider-dispatch.test.ts b/src/main/providers/provider-dispatch.test.ts
index cc63cfb9d09d..7ac956b70fde 100644
--- a/src/main/providers/provider-dispatch.test.ts
+++ b/src/main/providers/provider-dispatch.test.ts
@@ -49,7 +49,16 @@ vi.mock('node-pty', () => ({
 }))
 
 vi.mock('../opencode/hook-service', () => ({
-  openCodeHookService: { buildPtyEnv: () => ({}), clearPty: vi.fn() }
+  openCodeHookService: {
+    buildPtyEnv: () => ({}),
+    refreshLegacySharedPlugin: vi.fn(),
+    clearPty: vi.fn()
+  },
+  openCode2HookService: {
+    buildPtyEnv: () => ({}),
+    refreshLegacySharedPlugin: vi.fn(),
+    clearPty: vi.fn()
+  }
 }))
 
 vi.mock('../pi/titlebar-extension-service', () => ({
@@ -109,6 +118,7 @@ describe('PTY provider dispatch', () => {
       getCwd: vi.fn(),
       getInitialCwd: vi.fn(),
       clearBuffer: vi.fn(),
+      resetInputModes: vi.fn(),
       acknowledgeDataEvent: vi.fn(),
       hasChildProcesses: vi.fn(),
       getForegroundProcess: vi.fn(),
@@ -155,8 +165,8 @@ describe('PTY provider dispatch', () => {
     })) as { id: string }
 
     expect(result.id).toBe('ssh-pty-1')
-    // Why: the relay host can be launched from a Claude session too, so the stamps are
-    // stripped on the SSH path as well. Compared as a set — envToDelete is consumed by
+    // Why: the relay host can be launched from a Claude or structured session too, so the
+    // stamps are stripped on the SSH path as well; a remote pane never names a local session. Compared as a set — envToDelete is consumed by
     // membership only, so a reordering of the merge sources must not fail this.
     const sshSpawnArgs = vi.mocked(mockSshProvider.spawn).mock.calls.at(-1)![0]
     expect([...(sshSpawnArgs.envToDelete ?? [])].sort()).toEqual(
@@ -167,7 +177,9 @@ describe('PTY provider dispatch', () => {
         'CLAUDE_CODE_BRIDGE_SESSION_ID',
         'ORCA_PI_STATUS_OWNED',
         'ORCA_PRIME_AGENT_STATUS_OWNED',
-        'ORCA_PI_TITLE_MARKER_OWNED'
+        'ORCA_PI_TITLE_MARKER_OWNED',
+        'ORCA_AGENT_SESSION_ID',
+        'ORCA_STRUCTURED_SESSION'
       ].sort()
     )
     expect(mockSshProvider.spawn).toHaveBeenCalledWith(
diff --git a/src/main/providers/pty-provider-contract.ts b/src/main/providers/pty-provider-contract.ts
index 4b31fbbb2c8b..d2b38bd4b2f2 100644
--- a/src/main/providers/pty-provider-contract.ts
+++ b/src/main/providers/pty-provider-contract.ts
@@ -224,6 +224,8 @@ export type IPtyProvider = {
   getCwd(id: string): Promise<string>
   getInitialCwd(id: string): Promise<string>
   clearBuffer(id: string): Promise<void>
+  /** Grounds the host's own terminal models (Reset Terminal); renderers ground themselves. */
+  resetInputModes(id: string): Promise<void>
   /** Ordered handoff from startup source authority to the live/hidden view authority. */
   closeStartupQueryAuthority?: (id: string) => Promise<number> | number
   acknowledgeDataEvent(id: string, charCount: number): void
diff --git a/src/main/providers/pty-spawn-result.ts b/src/main/providers/pty-spawn-result.ts
index 90b41d9656a6..2886a00e8b66 100644
--- a/src/main/providers/pty-spawn-result.ts
+++ b/src/main/providers/pty-spawn-result.ts
@@ -52,8 +52,8 @@ export type PtySpawnResult = {
   }
   /** Kitty keyboard flags persisted in the daemon snapshot, threaded so the
    *  re-seeded runtime emulator answers hidden `CSI ? u` with the real flags
-   *  (terminal-query-authority.md §kitty). Never replayed into a renderer
-   *  xterm — POST_REPLAY_REATTACH_RESET's kitty reset stays authoritative. */
+   *  (terminal-query-authority.md §kitty). Renderers re-assert them in their
+   *  replay epilogue, after the payload's screen switches. */
   snapshotKittyKeyboardFlags?: number
   /** Renderer-domain sequence main reconciled for the attach boundary those
    *  flags describe. Set by main, not the provider. */
diff --git a/src/main/providers/settled-pty-writer-census.test.ts b/src/main/providers/settled-pty-writer-census.test.ts
deleted file mode 100644
index 08dd99894007..000000000000
--- a/src/main/providers/settled-pty-writer-census.test.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { execFileSync } from 'node:child_process'
-import { describe, expect, it, vi } from 'vitest'
-import { LocalPtyProvider } from './local-pty-provider'
-import { SshPtyProvider } from './ssh-pty-provider'
-import { createMockMux } from './ssh-pty-provider-mock-multiplexer'
-import { DaemonPtyRouter } from '../daemon/daemon-pty-router'
-import { DegradedDaemonPtyProvider } from '../daemon/degraded-daemon-pty-provider'
-import { DaemonPtyAdapter } from '../daemon/daemon-pty-adapter'
-
-vi.mock('electron', () => ({
-  app: { getPath: vi.fn(() => '/tmp'), isPackaged: false },
-  BrowserWindow: { fromId: vi.fn(() => null) },
-  ipcMain: { on: vi.fn(), removeListener: vi.fn() },
-  webContents: { fromId: vi.fn(() => null) }
-}))
-
-const REPO_ROOT = join(__dirname, '..', '..', '..')
-
-/**
- * Requiring the method is satisfiable by a lie: the degraded daemon router used to answer it
- * with `provider.write(...) !== false`, reproducing the fire-and-forget bug through the fix.
- * The census pins the producers and reads their bodies, so a new provider or a revived
- * fabricated handoff fails here rather than silently clearing a mailbox reservation.
- */
-const SETTLED_PTY_WRITER_FILES = [
-  'src/main/providers/local-pty-provider.ts',
-  'src/main/providers/ssh-pty-provider.ts',
-  'src/main/daemon/daemon-pty-router.ts',
-  'src/main/daemon/degraded-daemon-pty-provider.ts',
-  'src/main/daemon/daemon-pty-adapter.ts'
-]
-
-/** Where the provider-side settlement is actually decided; the adapter inherits its own. */
-const SETTLED_WRITER_DECLARATIONS = [
-  'src/main/providers/local-pty-provider.ts',
-  'src/main/providers/ssh-pty-provider.ts',
-  'src/main/providers/ssh-pty-provider-rpc-operations.ts',
-  'src/main/daemon/daemon-pty-router.ts',
-  'src/main/daemon/degraded-daemon-pty-provider.ts',
-  'src/main/daemon/daemon-pty-session-input.ts'
-]
-
-function declaredProviderFiles(): string[] {
-  const output = execFileSync('git', ['grep', '-l', '--', 'implements IPtyProvider', 'src/main'], {
-    cwd: REPO_ROOT,
-    encoding: 'utf8'
-  })
-  // Tests may name the clause while pinning it; only production declarations count.
-  return output
-    .split('\n')
-    .filter((file) => file && !file.endsWith('.test.ts'))
-    .sort()
-}
-
-function settledWriterBody(file: string): string {
-  const source = readFileSync(join(REPO_ROOT, file), 'utf8')
-  const start = source.indexOf('writeWithSettlement')
-  expect(start, `${file} declares no settled writer`).toBeGreaterThan(-1)
-  const end = source.indexOf('\n  }', start)
-  return source.slice(start, end === -1 ? source.length : end)
-}
-
-describe('settled PTY writer census', () => {
-  it('covers every production provider class that declares IPtyProvider', () => {
-    expect(declaredProviderFiles()).toEqual([...SETTLED_PTY_WRITER_FILES].sort())
-  })
-
-  it('exposes a settled writer on every production provider instance', () => {
-    const daemonClient = { isConnected: () => false, onEvent: vi.fn(() => vi.fn()) }
-    const adapter = new DaemonPtyAdapter(daemonClient as never)
-    const instances = [
-      new LocalPtyProvider({} as never),
-      new SshPtyProvider('conn-census', createMockMux() as never),
-      new DaemonPtyRouter({ current: adapter, legacy: [] }),
-      new DegradedDaemonPtyProvider({
-        current: adapter,
-        legacy: [],
-        fallback: new LocalPtyProvider({} as never)
-      }),
-      adapter
-    ]
-    for (const provider of instances) {
-      expect(typeof provider.writeWithSettlement, provider.constructor.name).toBe('function')
-    }
-  })
-
-  it('never synthesizes a settlement from the fire-and-forget write', () => {
-    for (const file of SETTLED_WRITER_DECLARATIONS) {
-      expect(settledWriterBody(file), file).not.toMatch(/\.write\(/)
-    }
-  })
-})
diff --git a/src/main/providers/ssh-filesystem-provider.test.ts b/src/main/providers/ssh-filesystem-provider.test.ts
index a20dfb98d9bc..0917c4cf81ae 100644
--- a/src/main/providers/ssh-filesystem-provider.test.ts
+++ b/src/main/providers/ssh-filesystem-provider.test.ts
@@ -527,18 +527,6 @@ describe('SshFilesystemProvider', () => {
   })
 
   describe('watch', () => {
-    it('sends fs.watch request and returns unsubscribe', async () => {
-      const callback = vi.fn()
-      const unsub = await provider.watch('/home/user/project', callback)
-
-      expect(mux.request).toHaveBeenCalledWith(
-        'fs.watch',
-        { rootPath: '/home/user/project', watchId: expect.any(Number) },
-        { signal: expect.any(AbortSignal) }
-      )
-      expect(typeof unsub).toBe('function')
-    })
-
     it('uses a registration-owned cancellation signal for the mux fs.watch request', async () => {
       mux.request.mockResolvedValue(undefined)
       const controller = new AbortController()
diff --git a/src/main/providers/ssh-pty-provider-agent-session-create-operation.test.ts b/src/main/providers/ssh-pty-provider-agent-session-create-operation.test.ts
index e088b21f0258..61b0293f25b4 100644
--- a/src/main/providers/ssh-pty-provider-agent-session-create-operation.test.ts
+++ b/src/main/providers/ssh-pty-provider-agent-session-create-operation.test.ts
@@ -57,18 +57,30 @@ function requestPayloads(transport: ReturnType<typeof createTransport>): Record<
   })
 }
 
+// Why a macrotask yield: FrameDecoder stops after FRAME_DECODER_MAX_TURN_MS of decoding and
+// resumes the rest of the fed bytes from setImmediate, and feed() refuses to drain while that
+// continuation is pending. Under load a delivered response can therefore only be decoded a
+// macrotask later, which a microtask-only poll can never reach. Matches waitForRequestCount in
+// ssh-git-provider-test-harness.
+async function waitForValue<T>(produce: () => T | undefined, what: string): Promise<T> {
+  for (let turn = 0; turn < 20; turn += 1) {
+    const value = produce()
+    if (value !== undefined) {
+      return value
+    }
+    await new Promise<void>((resolve) => setTimeout(resolve, 0))
+  }
+  throw new Error(`never observed: ${what}`)
+}
+
 async function waitForRequest(
   transport: ReturnType<typeof createTransport>,
   method: string
 ): Promise<Record<string, unknown>> {
-  for (let turn = 0; turn < 10; turn += 1) {
-    const request = requestPayloads(transport).find((payload) => payload.method === method)
-    if (request) {
-      return request
-    }
-    await Promise.resolve()
-  }
-  throw new Error(`request not dispatched: ${method}`)
+  return waitForValue(
+    () => requestPayloads(transport).find((payload) => payload.method === method),
+    `request ${method}`
+  )
 }
 
 describe('SSH fresh agent-session create operations', () => {
@@ -377,6 +389,8 @@ describe('SSH fresh agent-session create operations', () => {
       ])
     )
     await expect(replacement).resolves.toMatchObject({ incarnationId: 'incarnation-new' })
+    // The same-buffer data frame can decode a decoder turn after the spawn response resolves.
+    await waitForValue(() => onData.mock.calls.at(0), 'replacement source data')
     expect(onData.mock.calls.map(([payload]) => payload.data)).toEqual(['new'])
 
     transport.deliver(
diff --git a/src/main/providers/ssh-pty-provider-rpc-operations.ts b/src/main/providers/ssh-pty-provider-rpc-operations.ts
index 9beb19e73033..626f096adce5 100644
--- a/src/main/providers/ssh-pty-provider-rpc-operations.ts
+++ b/src/main/providers/ssh-pty-provider-rpc-operations.ts
@@ -42,6 +42,9 @@ export function createSshPtyProviderRpcOperations({ mux, toRelayPtyId }: SshPtyP
     clearBuffer: async (id: string): Promise<void> => {
       await mux.request('pty.clearBuffer', { id: toRelayPtyId(id) })
     },
+    resetInputModes: async (id: string): Promise<void> => {
+      await mux.request('pty.resetInputModes', { id: toRelayPtyId(id) })
+    },
     closeStartupQueryAuthority: async (id: string): Promise<number> => {
       const result = (await mux.request('pty.closeStartupQueryAuthority', {
         id: toRelayPtyId(id)
diff --git a/src/main/providers/ssh-pty-provider.ts b/src/main/providers/ssh-pty-provider.ts
index 3ccd1bb666e9..ae5dfe183920 100644
--- a/src/main/providers/ssh-pty-provider.ts
+++ b/src/main/providers/ssh-pty-provider.ts
@@ -59,6 +59,7 @@ export class SshPtyProvider implements IPtyProvider {
   getCwd = (id: string): Promise<string> => this.rpcOperations.getCwd(id)
   getInitialCwd = (id: string): Promise<string> => this.rpcOperations.getInitialCwd(id)
   clearBuffer = (id: string): Promise<void> => this.rpcOperations.clearBuffer(id)
+  resetInputModes = (id: string): Promise<void> => this.rpcOperations.resetInputModes(id)
   closeStartupQueryAuthority = (id: string): Promise<number> =>
     this.rpcOperations.closeStartupQueryAuthority(id)
   acknowledgeDataEvent = (id: string, charCount: number): void =>
diff --git a/src/main/providers/windows-shell-args.test.ts b/src/main/providers/windows-shell-args.test.ts
index c71b9b067229..38352a1b6d48 100644
--- a/src/main/providers/windows-shell-args.test.ts
+++ b/src/main/providers/windows-shell-args.test.ts
@@ -308,6 +308,31 @@ describe('resolveWindowsShellLaunchArgs', () => {
     expect(result.startupCommandDeliveredInShellArgs).toBeUndefined()
   })
 
+  it('keeps a plain Git Bash tab a login shell and wraps one with a startup command', () => {
+    const plain = resolveWindowsShellLaunchArgs(
+      'C:\\Program Files\\Git\\bin\\bash.exe',
+      'C:\\Users\\alice',
+      'C:\\Users\\alice'
+    )
+    const launched = resolveWindowsShellLaunchArgs(
+      'C:\\Program Files\\Git\\bin\\bash.exe',
+      'C:\\Users\\alice',
+      'C:\\Users\\alice',
+      undefined,
+      "codex 'fix the bug'"
+    )
+
+    expect(plain.shellArgs).toEqual([
+      '-c',
+      'chcp.com 65001 >/dev/null 2>&1; exec "$BASH" --login -i'
+    ])
+    // Why: without a preflight, only the rcfile carries the codex --no-daemon wrapper.
+    expect(readFileSync(getGitBashRcfilePath(launched.shellArgs[1]), 'utf8')).toContain(
+      'set -- --no-daemon "$@"'
+    )
+    expect(launched.startupCommandDeliveredInShellArgs).toBeUndefined()
+  })
+
   it('quotes a spaced preflight path through each shell environment', () => {
     const cmd = resolveWindowsShellLaunchArgs(
       'cmd.exe',
diff --git a/src/main/providers/windows-shell-args.ts b/src/main/providers/windows-shell-args.ts
index 70fd22a06ade..c5ceade00a44 100644
--- a/src/main/providers/windows-shell-args.ts
+++ b/src/main/providers/windows-shell-args.ts
@@ -29,8 +29,9 @@ const CMD_CODEX_LAUNCH_PREFLIGHT = `if defined ORCA_CODEX_LAUNCH_PREFLIGHT call
 // `&&`) keeps startup working even if chcp.com is missing.
 const GIT_BASH_UTF8_LOGIN_COMMAND = 'chcp.com 65001 >/dev/null 2>&1; exec "$BASH" --login -i'
 
-function getGitBashLaunchCommand(codexLaunchPreflightCommand?: string): string {
-  if (!codexLaunchPreflightCommand) {
+// Why the rcfile for a startup command: it defines the codex wrapper Orca's launches need.
+function getGitBashLaunchCommand(useWrapper: boolean): string {
+  if (!useWrapper) {
     return GIT_BASH_UTF8_LOGIN_COMMAND
   }
 
@@ -216,7 +217,10 @@ export function resolveWindowsShellLaunchArgs(
 
   if (isWindowsGitBashShellPath(shellPath)) {
     return {
-      shellArgs: ['-c', getGitBashLaunchCommand(codexLaunchPreflightCommand)],
+      shellArgs: [
+        '-c',
+        getGitBashLaunchCommand(Boolean(codexLaunchPreflightCommand) || Boolean(startupCommand))
+      ],
       effectiveCwd: nativeCwd,
       validationCwd: nativeCwd
     }
diff --git a/src/main/pty/codex-launch-shell-wrapping.test.ts b/src/main/pty/codex-launch-shell-wrapping.test.ts
new file mode 100644
index 000000000000..02d6c223a2fb
--- /dev/null
+++ b/src/main/pty/codex-launch-shell-wrapping.test.ts
@@ -0,0 +1,80 @@
+import { mkdtempSync, readFileSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { shouldUseShellReadyStartupDelivery } from '../../shared/codex-startup-delivery'
+import { selectShellStartupFeatures } from '../shell-startup-features'
+
+// Why: the codex --no-daemon wrapper only reaches shells Orca wraps. Orca's own
+// Codex launches carry a startup command, so each launch shell must be wrapped.
+const COMMAND = "codex 'fix the bug'"
+const NO_DAEMON = 'set -- --no-daemon "$@"'
+const FISH_NO_DAEMON = 'set argv --no-daemon $argv'
+
+function codexLaunchFeatures(shellPath: string) {
+  // Why an empty env: a system-default Codex home, with hooks off, carries no overlay key.
+  const waitsForShellReady = shouldUseShellReadyStartupDelivery({ command: COMMAND, shellPath })
+  return selectShellStartupFeatures({
+    shellPath,
+    env: {},
+    hasStartupCommand: true,
+    waitsForShellReady,
+    emitsStartupIdentity: waitsForShellReady
+  })
+}
+
+function wrapperText(config: { args: string[] | null; env: Record<string, string> }): string {
+  if (config.env.ZDOTDIR) {
+    return readFileSync(join(config.env.ZDOTDIR, '.zshenv'), 'utf8')
+  }
+  const rcfile = config.args?.[config.args.indexOf('--rcfile') + 1]
+  return rcfile && config.args?.includes('--rcfile')
+    ? readFileSync(rcfile, 'utf8')
+    : (config.args ?? []).join('\n')
+}
+
+describe.skipIf(process.platform === 'win32')('Orca Codex launch shells carry the wrapper', () => {
+  let userData: string
+  const original = process.env.ORCA_USER_DATA_PATH
+
+  beforeEach(() => {
+    userData = mkdtempSync(join(tmpdir(), 'orca-codex-launch-wrap-'))
+    process.env.ORCA_USER_DATA_PATH = userData
+    vi.resetModules()
+  })
+
+  afterEach(() => {
+    if (original === undefined) {
+      delete process.env.ORCA_USER_DATA_PATH
+    } else {
+      process.env.ORCA_USER_DATA_PATH = original
+    }
+    rmSync(userData, { recursive: true, force: true })
+  })
+
+  it.each([
+    ['/bin/bash', NO_DAEMON],
+    ['/bin/zsh', NO_DAEMON],
+    ['/usr/bin/fish', FISH_NO_DAEMON]
+  ])('daemon transport wraps %s', async (shell, marker) => {
+    const { getShellLaunchConfig } = await import('../daemon/shell-ready')
+
+    expect(
+      wrapperText(
+        getShellLaunchConfig(shell, codexLaunchFeatures(shell), { hasStartupCommand: true })
+      )
+    ).toContain(marker)
+  })
+
+  it.each([
+    ['/bin/bash', NO_DAEMON],
+    ['/bin/zsh', NO_DAEMON],
+    ['/usr/bin/fish', FISH_NO_DAEMON]
+  ])('local transport wraps %s', async (shell, marker) => {
+    const { getShellLaunchConfig } = await import('../providers/local-pty-shell-ready')
+
+    expect(wrapperText(getShellLaunchConfig(shell, codexLaunchFeatures(shell), COMMAND))).toContain(
+      marker
+    )
+  })
+})
diff --git a/src/main/pty/codex-no-daemon-binary-contract.test.ts b/src/main/pty/codex-no-daemon-binary-contract.test.ts
new file mode 100644
index 000000000000..1e0116f26881
--- /dev/null
+++ b/src/main/pty/codex-no-daemon-binary-contract.test.ts
@@ -0,0 +1,75 @@
+import { execFile } from 'node:child_process'
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { promisify } from 'node:util'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { CODEX_SHARED_SERVER_ARGS } from '../../shared/codex-shell-function'
+
+// Why: Orca's codex shell wrapper puts --no-daemon first for every subcommand but
+// agents/queue (src/shared/codex-shell-function.ts). Its tests use a fake codex, so
+// only the real binary can catch a renamed flag or a new subcommand rejecting it.
+
+const execFileAsync = promisify(execFile)
+const binary = process.env.ORCA_CODEX_NO_DAEMON_CONTRACT_BINARY
+const expectedVersion = process.env.ORCA_CODEX_NO_DAEMON_CONTRACT_VERSION
+const WRAPPER_SKIPPED_SUBCOMMANDS: ReadonlySet<string> = new Set(CODEX_SHARED_SERVER_ARGS)
+const TIMEOUT_MS = 30_000
+
+describe.runIf(process.env.ORCA_CODEX_NO_DAEMON_CONTRACT_REQUIRED === '1' && !binary)(
+  'codex --no-daemon contract prerequisites',
+  () => {
+    it('was given a Codex binary to run against', () => {
+      expect.fail('ORCA_CODEX_NO_DAEMON_CONTRACT_REQUIRED=1 but no binary was given')
+    })
+  }
+)
+
+describe.runIf(binary)('codex --no-daemon binary contract', { timeout: 120_000 }, () => {
+  let home: string
+  let help: string
+
+  beforeAll(async () => {
+    // Why a disposable home: never read or start anything under the user's ~/.codex.
+    home = mkdtempSync(join(tmpdir(), 'orca-codex-no-daemon-contract-'))
+    const version = await run(['--version'])
+    expect(version.stdout.trim()).toBe(`codex-cli ${expectedVersion}`)
+    help = (await run(['--help'])).stdout
+  })
+
+  afterAll(() => {
+    rmSync(home, { recursive: true, force: true })
+  })
+
+  function run(args: string[]): Promise<{ stdout: string; stderr: string }> {
+    return execFileAsync(binary!, args, {
+      timeout: TIMEOUT_MS,
+      env: { ...process.env, CODEX_HOME: home }
+    })
+  }
+
+  function listedSubcommands(): string[] {
+    const section = help.split(/^Commands:\n/m)[1]?.split(/\n\s*\n/)[0] ?? ''
+    return [...section.matchAll(/^ {2}([a-z][a-z0-9-]*)\s/gm)].map((match) => match[1])
+  }
+
+  it('lists --no-daemon in --help, which is what the wrapper probes', () => {
+    expect(help).toContain('--no-daemon')
+  })
+
+  it('accepts --no-daemon first for every listed subcommand the wrapper does not skip', async () => {
+    const subcommands = listedSubcommands()
+    // Why a floor: a help layout change must fail here, not shrink the check to nothing.
+    expect(subcommands.length).toBeGreaterThan(20)
+    expect(subcommands).toEqual(expect.arrayContaining(['exec', 'resume', 'agents', 'queue']))
+    const rejected: string[] = []
+    for (const subcommand of subcommands.filter((name) => !WRAPPER_SKIPPED_SUBCOMMANDS.has(name))) {
+      // Why bare `help`: clap's help subcommand treats `--help` as a command name.
+      const args = subcommand === 'help' ? ['help'] : [subcommand, '--help']
+      await run(['--no-daemon', ...args]).catch((error: { stderr?: string }) =>
+        rejected.push(`${subcommand}: ${error.stderr?.trim() ?? String(error)}`)
+      )
+    }
+    expect(rejected).toEqual([])
+  })
+})
diff --git a/src/main/pty/codex-no-daemon-launch-command.test.ts b/src/main/pty/codex-no-daemon-launch-command.test.ts
new file mode 100644
index 000000000000..985f9a2131cb
--- /dev/null
+++ b/src/main/pty/codex-no-daemon-launch-command.test.ts
@@ -0,0 +1,102 @@
+import { chmodSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { dirname, join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { planCodexNoDaemonLaunch, type LocalCodexLaunch } from './codex-no-daemon-launch-command'
+
+const HELP_WITH_FLAG = 'Usage: codex [OPTIONS] [PROMPT]\n      --no-daemon  Run in-process\n'
+const HELP_WITHOUT_FLAG = 'Usage: codex [OPTIONS] [PROMPT]\n      --no-alt-screen\n'
+const hostPlatform = process.platform
+
+describe.skipIf(hostPlatform === 'win32')('planCodexNoDaemonLaunch', () => {
+  let dir: string
+  let codex: string
+
+  beforeEach(() => {
+    dir = mkdtempSync(join(tmpdir(), 'orca-codex-no-daemon-launch-'))
+    codex = writeCodex('codex', HELP_WITH_FLAG)
+  })
+
+  afterEach(() => {
+    Object.defineProperty(process, 'platform', { configurable: true, value: hostPlatform })
+    vi.unstubAllEnvs()
+    rmSync(dir, { recursive: true, force: true })
+  })
+
+  function writeCodex(name: string, help: string): string {
+    const path = join(dir, name)
+    mkdirSync(dirname(path), { recursive: true })
+    writeFileSync(path, `#!/bin/sh\nprintf '%s' '${help}'\n`)
+    chmodSync(path, 0o755)
+    return path
+  }
+
+  function plan(command: string, overrides: Partial<LocalCodexLaunch> = {}) {
+    return planCodexNoDaemonLaunch({
+      command,
+      executesOnThisHost: true,
+      shellOverride: undefined,
+      env: {},
+      cwd: dir,
+      ...overrides
+    })
+  }
+
+  it('adds --no-daemon once, right after a path-named codex', async () => {
+    await expect(plan(`${codex} --yolo 'fix the bug'`)).resolves.toBe(
+      `${codex} --no-daemon --yolo 'fix the bug'`
+    )
+  })
+
+  it.each([
+    ['agents'],
+    ['queue --thread T'],
+    ['--no-daemon'],
+    ['resume --no-daemon'],
+    ['--remote unix://'],
+    ['--remote=ws://h:1']
+  ])('leaves `codex %s` alone: it needs the shared server or has the flag', (args) => {
+    expect(plan(`${codex} ${args}`)).toBeNull()
+  })
+
+  it('leaves SSH and WSL launches to the codex function on that host', () => {
+    expect(plan(`${codex} --yolo`, { executesOnThisHost: false })).toBeNull()
+  })
+
+  it('ignores an inherited opt-out the pane deletes', async () => {
+    vi.stubEnv('ORCA_CODEX_ISOLATE', '0')
+
+    await expect(plan(`${codex} --yolo`, { envToDelete: ['ORCA_CODEX_ISOLATE'] })).resolves.toBe(
+      `${codex} --no-daemon --yolo`
+    )
+  })
+
+  it('honours ORCA_CODEX_ISOLATE=0 from the pane env', () => {
+    expect(plan(`${codex} --yolo`, { env: { ORCA_CODEX_ISOLATE: '0' } })).toBeNull()
+  })
+
+  it('keeps the command when the binary predates --no-daemon', async () => {
+    const oldCodex = writeCodex('0.155/codex', HELP_WITHOUT_FLAG)
+
+    await expect(plan(`${oldCodex} --yolo`)).resolves.toBe(`${oldCodex} --yolo`)
+  })
+
+  it.each([['codex --yolo'], ['claude --yolo'], ['/opt/bin/codexx --yolo']])(
+    'leaves `%s` to the shell function or to another agent',
+    (command) => {
+      expect(plan(command)).toBeNull()
+    }
+  )
+
+  it('probes a bare codex on PATH for cmd.exe, which has no codex function', async () => {
+    Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' })
+    writeCodex('codex.exe', HELP_WITH_FLAG)
+
+    await expect(
+      plan('codex --yolo', {
+        shellOverride: 'cmd.exe',
+        env: { PATH: dir, PATHEXT: '.exe' }
+      })
+    ).resolves.toBe('codex --no-daemon --yolo')
+  })
+})
diff --git a/src/main/pty/codex-no-daemon-launch-command.ts b/src/main/pty/codex-no-daemon-launch-command.ts
new file mode 100644
index 000000000000..eec860555680
--- /dev/null
+++ b/src/main/pty/codex-no-daemon-launch-command.ts
@@ -0,0 +1,99 @@
+import { isAbsolute, win32 as pathWin32 } from 'node:path'
+import { runProcess } from '../../shared/child-process/run-process'
+import { tokenizeStartupCommand } from '../../shared/tui-agent-startup-shell'
+import { resolveLocalWindowsAgentStartupShell } from '../../shared/windows-terminal-shell'
+import { resolveCommandOnLocalPath } from '../ipc/command-path-resolver'
+import { CODEX_SHARED_SERVER_ARGS } from '../../shared/codex-shell-function'
+
+const CODEX_EXECUTABLE = /^codex(\.(exe|cmd|bat|ps1))?$/i
+const SHARED_SERVER_ARGS: ReadonlySet<string> = new Set(CODEX_SHARED_SERVER_ARGS)
+// Why bounded: a hung binary must not hold the pane; a slow probe only costs the flag.
+const HELP_PROBE_TIMEOUT_MS = 5_000
+
+export type LocalCodexLaunch = {
+  command: string | undefined
+  /** False for SSH and WSL spawns: their shell's codex function probes on that host. */
+  executesOnThisHost: boolean
+  /** Shell the provider will launch; undefined means the platform default. */
+  shellOverride: string | undefined
+  /** Env the PTY gets on top of this process's own. */
+  env: Record<string, string | undefined> | undefined
+  /** Keys the provider removes from that merged env. */
+  envToDelete?: readonly string[]
+  cwd: string | undefined
+}
+
+/**
+ * The launch command with `--no-daemon` after the Codex executable, applying the
+ * shell codex function's rule (src/shared/codex-shell-function.ts) where that
+ * function never runs: cmd.exe defines none, and a path-named binary bypasses it.
+ * Everywhere else the function probes the binary the shell itself resolves after
+ * the user's startup files, which main cannot see. Null (synchronously) when
+ * nothing applies: an extra await tick would reorder the pane-spawn reservation
+ * races the spawn handlers arbitrate right after this.
+ */
+export function planCodexNoDaemonLaunch(launch: LocalCodexLaunch): Promise<string> | null {
+  const { command } = launch
+  if (!command || !launch.executesOnThisHost) {
+    return null
+  }
+  const shell =
+    resolveLocalWindowsAgentStartupShell({
+      platform: process.platform,
+      isRemote: false,
+      terminalWindowsShell: launch.shellOverride
+    }) ?? 'posix'
+  const parsed = tokenizeStartupCommand(command, shell)
+  const executableSpan = parsed.ok ? parsed.spans[0] : undefined
+  if (!parsed.ok || !executableSpan || executableSpan.divergesFromShell) {
+    return null
+  }
+  const [executable, ...args] = parsed.tokens
+  if (
+    !CODEX_EXECUTABLE.test(pathWin32.basename(executable)) ||
+    (shell !== 'cmd' && !isAbsolute(executable))
+  ) {
+    return null
+  }
+  const env = { ...process.env, ...launch.env }
+  for (const key of launch.envToDelete ?? []) {
+    delete env[key]
+  }
+  if (
+    env.ORCA_CODEX_ISOLATE === '0' ||
+    args.some((arg) => SHARED_SERVER_ARGS.has(arg) || arg.startsWith('--remote='))
+  ) {
+    return null
+  }
+  return supportsNoDaemon(executable, env, launch.cwd).then((supported) =>
+    supported
+      ? `${command.slice(0, executableSpan.end)} --no-daemon${command.slice(executableSpan.end)}`
+      : command
+  )
+}
+
+// Why probe every launch: a cached answer goes stale across an upgrade, and 0.155 and older exit 2 on the flag.
+async function supportsNoDaemon(
+  executable: string,
+  env: NodeJS.ProcessEnv,
+  cwd: string | undefined
+): Promise<boolean> {
+  const program = isAbsolute(executable)
+    ? executable
+    : await resolveCommandOnLocalPath(executable, { env, cwd })
+  if (!program) {
+    return false
+  }
+  try {
+    const help = await runProcess({
+      program,
+      args: ['--help'],
+      cwd,
+      env,
+      timeoutMs: HELP_PROBE_TIMEOUT_MS
+    })
+    return help.stdout.includes('--no-daemon')
+  } catch {
+    return false
+  }
+}
diff --git a/src/main/pty/codex-shell-launch-preflight.test.ts b/src/main/pty/codex-shell-launch-preflight.test.ts
index f0673fc9c951..72fbc5c14a51 100644
--- a/src/main/pty/codex-shell-launch-preflight.test.ts
+++ b/src/main/pty/codex-shell-launch-preflight.test.ts
@@ -13,12 +13,12 @@ import { tmpdir } from 'node:os'
 import { delimiter, isAbsolute, join } from 'node:path'
 import { execFileSync, spawnSync } from 'node:child_process'
 import { afterEach, describe, expect, it } from 'vitest'
+import { resolveCodexShellLaunchPreflightCommand } from './codex-shell-launch-preflight'
 import {
   getFishCodexShellLaunchPreflight,
   getPosixCodexShellLaunchPreflight,
-  getPowerShellCodexShellLaunchPreflight,
-  resolveCodexShellLaunchPreflightCommand
-} from './codex-shell-launch-preflight'
+  getPowerShellCodexShellLaunchPreflight
+} from '../../shared/codex-shell-function'
 import { fishRequirementViolation, resolveFishBinary } from '../../shared/fish-binary-requirement'
 
 const roots: string[] = []
@@ -309,9 +309,8 @@ describe.skipIf(process.platform === 'win32')('Codex shell launch preflight', ()
 
   // Regression for #16893: an unquoted `(type -t codex)` expands to zero words when
   // codex is absent, so `test` saw `= file` (2 args) and printed "Missing argument
-  // at index 3" on every fish pane launch. Needs a valid executable
-  // ORCA_CODEX_LAUNCH_PREFLIGHT so the `and` chain reaches the second `test`, and
-  // the real `-l -C` launch shape both shell-ready call sites use.
+  // at index 3" on every fish pane launch. Uses the real `-l -C` launch shape both
+  // shell-ready call sites use.
   it.skipIf(!fishAvailable)('stays silent and installs no wrapper when codex is absent', () => {
     const { bin, preflight } = createFishSandbox('orca-codex-fish-absent-')
 
diff --git a/src/main/pty/codex-shell-launch-preflight.ts b/src/main/pty/codex-shell-launch-preflight.ts
index 87e5df758276..b6c17074d79c 100644
--- a/src/main/pty/codex-shell-launch-preflight.ts
+++ b/src/main/pty/codex-shell-launch-preflight.ts
@@ -64,58 +64,3 @@ function isExecutableFileOnDisk(path: string, platform: NodeJS.Platform): boolea
     return false
   }
 }
-
-export function getPosixCodexShellLaunchPreflight(): string {
-  return `# Why: a typed alias expands inside the shell, after pane launch prep.
-# Why unalias inside the substitution: an alias named codex makes command -v
-# report the alias text, and the subshell leaves the user's own alias intact.
-# Why || : twice — zsh alone aborts inside the substitution, but every shell's
-# assignment adopts its exit status, so an absent codex trips set -e in bash too.
-__orca_codex_binary="$(unalias codex 2>/dev/null || :; command -v codex 2>/dev/null || :)"
-if [[ -n "\${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "\${ORCA_CODEX_LAUNCH_PREFLIGHT}" && -n "\${__orca_codex_binary:-}" && -x "\${__orca_codex_binary}" ]]; then
-  # Why the function reserved word: it suppresses alias expansion of the name,
-  # which otherwise rewrites this header at parse time and aborts the whole file.
-  function codex {
-    "\${ORCA_CODEX_LAUNCH_PREFLIGHT}" agent hooks prepare-codex >/dev/null 2>&1 || :
-    command codex "$@"
-  }
-fi
-unset __orca_codex_binary
-`
-}
-
-export function getFishCodexShellLaunchPreflight(): string {
-  return `# Why captured: an unquoted (type -t codex) expands to zero words when codex is
-# absent, leaving "test = file" — fish then errors instead of failing closed.
-# Quoting in place is not the fix; fish never substitutes inside double quotes.
-set -l __orca_codex_type (type -t codex 2>/dev/null)
-if test -x "$ORCA_CODEX_LAUNCH_PREFLIGHT"; and test "$__orca_codex_type" = file
-  function codex
-    command "$ORCA_CODEX_LAUNCH_PREFLIGHT" agent hooks prepare-codex >/dev/null 2>&1; or true
-    command codex $argv
-  end
-end
-set -e __orca_codex_type`
-}
-
-export function getPowerShellCodexShellLaunchPreflight(): string {
-  return `$orcaCodexCommand = Get-Command codex -ErrorAction SilentlyContinue | Select-Object -First 1
-if ($env:ORCA_CODEX_LAUNCH_PREFLIGHT -and $orcaCodexCommand -and
-    $orcaCodexCommand.CommandType -in @("Application", "ExternalScript")) {
-    function Global:codex {
-        try {
-            & $env:ORCA_CODEX_LAUNCH_PREFLIGHT agent hooks prepare-codex *> $null
-        } catch {
-        }
-        $orcaCodexExecutable = Get-Command codex -CommandType Application,ExternalScript -ErrorAction SilentlyContinue | Select-Object -First 1
-        if (-not $orcaCodexExecutable) {
-            Write-Error "codex executable not found"
-            $global:LASTEXITCODE = 127
-            return
-        }
-        & $orcaCodexExecutable.Source @args
-        $global:LASTEXITCODE = $LASTEXITCODE
-    }
-}
-Remove-Variable orcaCodexCommand -ErrorAction SilentlyContinue`
-}
diff --git a/src/main/pty/codex-shell-no-daemon.test.ts b/src/main/pty/codex-shell-no-daemon.test.ts
new file mode 100644
index 000000000000..25ee00a962c4
--- /dev/null
+++ b/src/main/pty/codex-shell-no-daemon.test.ts
@@ -0,0 +1,353 @@
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  writeFileSync
+} from 'node:fs'
+import { tmpdir } from 'node:os'
+import { delimiter, join } from 'node:path'
+import { spawnSync } from 'node:child_process'
+import { afterEach, describe, expect, it } from 'vitest'
+import {
+  getFishCodexShellLaunchPreflight,
+  getPosixCodexShellLaunchPreflight,
+  getPowerShellCodexShellLaunchPreflight
+} from '../../shared/codex-shell-function'
+import { resolveFishBinary } from '../../shared/fish-binary-requirement'
+
+const isWindows = process.platform === 'win32'
+const fishLookup = resolveFishBinary()
+const canRun = (command: string): boolean =>
+  spawnSync(command, ['-NoLogo', '-NoProfile', '-Command', 'exit 0']).status === 0
+const pwshAvailable = canRun('pwsh')
+
+const HELP_WITH_FLAG = 'Usage: codex [OPTIONS] [PROMPT]\n      --no-daemon  Run in-process\n'
+const HELP_WITHOUT_FLAG = 'Usage: codex [OPTIONS] [PROMPT]\n      --no-alt-screen\n'
+
+// Why argv as whole words: the rule is a whole-argument denylist (plan §4).
+const ADDED: string[][] = [
+  [],
+  ['fix the bug'],
+  ['exec the plan'],
+  ['-m', 'gpt-5', '--yolo', 'x'],
+  ['resume'],
+  ['resume', '--last'],
+  ['--yolo', 'resume', '--last'],
+  ['fork', '--last'],
+  ['-a', 'never', 'resume'],
+  ['-c', 'model=o3'],
+  ['archive', 'S'],
+  ['delete', 'S'],
+  ['exec', 'x'],
+  ['e', 'x'],
+  ['-m', 'x', 'exec', 'x'],
+  ['review'],
+  ['login'],
+  ['mcp', 'list']
+]
+const UNCHANGED: string[][] = [
+  ['agents'],
+  ['-m', 'x', 'agents'],
+  ['-c', 'k=v', 'agents'],
+  ['--image=a.png', 'agents'],
+  ['agents', '--remote', 'X'],
+  ['queue', '--thread', 'T', '--message', 'M'],
+  ['-c', 'k=v', 'queue'],
+  ['--no-daemon'],
+  ['resume', '--no-daemon'],
+  ['-m', 'x', '--no-daemon'],
+  ['--remote', 'unix://'],
+  ['--remote=ws://h:1'],
+  ['resume', '--remote', 'X'],
+  ['-m', 'agents'],
+  ['--', 'agents'],
+  ['--', '--remote']
+]
+const ALL = [...ADDED, ...UNCHANGED]
+
+type Shell = 'bash' | 'zsh' | 'fish' | 'pwsh' | 'powershell'
+const isPowerShell = (shell: Shell): boolean => shell === 'pwsh' || shell === 'powershell'
+const roots: string[] = []
+
+afterEach(() => {
+  for (const root of roots.splice(0)) {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+
+function writeExecutable(path: string, content: string): void {
+  writeFileSync(path, content)
+  chmodSync(path, 0o755)
+}
+
+type Sandbox = { bin: string; codex: string; helpFile: string; helpLog: string }
+
+/** Fake codex: `--help` prints the help file and logs the probe; any other call prints its argv. */
+function makeSandbox(help: string): Sandbox {
+  const root = mkdtempSync(join(tmpdir(), 'orca-codex-no-daemon-'))
+  roots.push(root)
+  const bin = join(root, 'bin')
+  mkdirSync(bin)
+  const helpFile = join(root, 'help.txt')
+  const helpLog = join(root, 'help.log')
+  writeFileSync(helpFile, help)
+  writeFileSync(helpLog, '')
+  if (isWindows) {
+    // Why a .cmd shim over node: the shape npm installs, and what Get-Command resolves.
+    writeFileSync(
+      join(bin, 'fake.js'),
+      `const fs = require('fs')
+const a = process.argv.slice(2)
+if (a.length === 1 && a[0] === '--help') {
+  fs.appendFileSync(${JSON.stringify(helpLog)}, 'help\\n')
+  process.stdout.write(fs.readFileSync(${JSON.stringify(helpFile)}, 'utf8'))
+  process.exit(0)
+}
+let out = ['ARGV', ...a].join('|')
+if (process.env.FAKE_CODEX_READ_STDIN === '1') out += '|stdin=' + fs.readFileSync(0, 'utf8').trim()
+console.log(out)
+process.exit(Number(process.env.FAKE_CODEX_EXIT || 0))
+`
+    )
+    const codex = join(bin, 'codex.cmd')
+    writeFileSync(codex, '@node "%~dp0fake.js" %*\r\n')
+    return { bin, codex, helpFile, helpLog }
+  }
+  const codex = join(bin, 'codex')
+  writeExecutable(
+    codex,
+    `#!/bin/sh
+if [ "$#" -eq 1 ] && [ "$1" = --help ]; then echo help >> ${JSON.stringify(helpLog)}; cat ${JSON.stringify(helpFile)}; exit 0; fi
+out=ARGV
+for a in "$@"; do out="$out|$a"; done
+[ "\${FAKE_CODEX_READ_STDIN:-}" = 1 ] && out="$out|stdin=$(cat)"
+printf '%s\\n' "$out"
+exit "\${FAKE_CODEX_EXIT:-0}"
+`
+  )
+  return { bin, codex, helpFile, helpLog }
+}
+
+function helpProbes(sandbox: Sandbox): number {
+  return readFileSync(sandbox.helpLog, 'utf8').split('\n').filter(Boolean).length
+}
+
+function quote(shell: Shell, word: string): string {
+  if (isPowerShell(shell)) {
+    return `'${word.replace(/'/g, "''")}'`
+  }
+  if (shell === 'fish') {
+    return `'${word.replace(/\\/g, '\\\\').replace(/'/g, "\\'")}'`
+  }
+  return `'${word.replace(/'/g, `'\\''`)}'`
+}
+
+function codexCall(shell: Shell, argv: string[]): string {
+  return ['codex', ...argv.map((word) => quote(shell, word))].join(' ')
+}
+
+function run(
+  shell: Shell,
+  script: string,
+  sandbox: Sandbox,
+  env: Record<string, string> = {},
+  preamble = ''
+): { status: number | null; stdout: string; stderr: string } {
+  const template =
+    shell === 'fish'
+      ? getFishCodexShellLaunchPreflight()
+      : isPowerShell(shell)
+        ? getPowerShellCodexShellLaunchPreflight()
+        : getPosixCodexShellLaunchPreflight()
+  // Why the guard: rows include `login`, which a real codex would run against the host's account.
+  const guard = isPowerShell(shell)
+    ? `if ((Get-Command codex -CommandType Application | Select-Object -First 1).Source -ne ${quote(shell, sandbox.codex)}) { exit 97 }`
+    : shell === 'fish'
+      ? `test (command -s codex) = ${quote(shell, sandbox.codex)}; or exit 97`
+      : `[ "$(command -v codex)" = ${quote(shell, sandbox.codex)} ] || exit 97`
+  const body = `${guard}\n${preamble}\n${template}\n${script}`
+  // Why a file for bash/zsh: it is read line by line like a startup file, so an alias it defines applies.
+  const scriptFile = join(sandbox.bin, '..', 'script.sh')
+  writeFileSync(scriptFile, body)
+  const [command, args]: [string, string[]] =
+    shell === 'bash'
+      ? ['/bin/bash', ['--noprofile', '--norc', scriptFile]]
+      : shell === 'zsh'
+        ? ['/bin/zsh', ['-f', scriptFile]]
+        : shell === 'fish'
+          ? [String(fishLookup.path), ['--no-config', '-c', body]]
+          : [shell, ['-NoLogo', '-NoProfile', '-NonInteractive', '-Command', body]]
+  const result = spawnSync(command, args, {
+    encoding: 'utf-8',
+    env: {
+      ...process.env,
+      PATH: `${sandbox.bin}${delimiter}${process.env.PATH ?? ''}`,
+      CODEX_HOME: join(sandbox.bin, '..', 'codex-home'),
+      ...env
+    }
+  })
+  return { status: result.status, stdout: result.stdout, stderr: result.stderr }
+}
+
+function lines(output: string): string[] {
+  return output.trimEnd().split(/\r?\n/)
+}
+
+function expectedLine(argv: string[], added: boolean): string {
+  return ['ARGV', ...(added ? ['--no-daemon'] : []), ...argv].join('|')
+}
+
+const shells: [Shell, boolean][] = [
+  ['bash', !isWindows && existsSync('/bin/bash')],
+  ['zsh', !isWindows && existsSync('/bin/zsh')],
+  ['fish', fishLookup.available],
+  ['pwsh', pwshAvailable],
+  // Why: Windows PowerShell 5.1 turns redirected native stderr into errors, unlike pwsh.
+  ['powershell', isWindows && canRun('powershell')]
+]
+
+describe('codex wrapper --no-daemon rule', () => {
+  it('has pwsh when CI demanded it', () => {
+    expect(process.env.ORCA_REQUIRE_PWSH !== '1' || pwshAvailable).toBe(true)
+  })
+
+  for (const [shell, available] of shells) {
+    describe.skipIf(!available)(shell, () => {
+      it('adds --no-daemon first unless an argument is denylisted', () => {
+        const sandbox = makeSandbox(HELP_WITH_FLAG)
+        const result = run(shell, ALL.map((argv) => codexCall(shell, argv)).join('\n'), sandbox)
+
+        expect(result.stderr).toBe('')
+        expect(lines(result.stdout)).toEqual([
+          ...ADDED.map((argv) => expectedLine(argv, true)),
+          ...UNCHANGED.map((argv) => expectedLine(argv, false))
+        ])
+        // Why: a denylisted launch must not pay for, or depend on, the --help probe.
+        expect(helpProbes(sandbox)).toBe(ADDED.length)
+      })
+
+      it('adds nothing when --help does not list the flag (0.155 and older)', () => {
+        const sandbox = makeSandbox(HELP_WITHOUT_FLAG)
+        const result = run(shell, ALL.map((argv) => codexCall(shell, argv)).join('\n'), sandbox)
+
+        expect(lines(result.stdout)).toEqual(ALL.map((argv) => expectedLine(argv, false)))
+      })
+
+      it('adds nothing with ORCA_CODEX_ISOLATE=0, read on every call', () => {
+        const sandbox = makeSandbox(HELP_WITH_FLAG)
+        const setIsolate = (value: string): string =>
+          isPowerShell(shell)
+            ? `$env:ORCA_CODEX_ISOLATE = '${value}'`
+            : shell === 'fish'
+              ? `set -gx ORCA_CODEX_ISOLATE ${value}`
+              : `export ORCA_CODEX_ISOLATE=${value}`
+        const result = run(
+          shell,
+          ['codex a', setIsolate('1'), 'codex b', setIsolate('0'), 'codex c'].join('\n'),
+          sandbox,
+          { ORCA_CODEX_ISOLATE: '0' }
+        )
+
+        expect(lines(result.stdout)).toEqual(['ARGV|a', 'ARGV|--no-daemon|b', 'ARGV|c'])
+      })
+
+      it('re-probes --help when Codex changes version mid-shell', () => {
+        const sandbox = makeSandbox(HELP_WITH_FLAG)
+        const swap = (help: string): string =>
+          isPowerShell(shell)
+            ? `Set-Content -NoNewline -LiteralPath ${quote(shell, sandbox.helpFile)} -Value ${quote(shell, help)}`
+            : `printf '%s' ${quote(shell, help)} > ${quote(shell, sandbox.helpFile)}`
+        const result = run(
+          shell,
+          ['codex a', swap(HELP_WITHOUT_FLAG), 'codex b', swap(HELP_WITH_FLAG), 'codex c'].join(
+            '\n'
+          ),
+          sandbox
+        )
+
+        expect(lines(result.stdout)).toEqual(['ARGV|--no-daemon|a', 'ARGV|b', 'ARGV|--no-daemon|c'])
+      })
+
+      it("keeps piped stdin for Codex and returns Codex's exit status", () => {
+        const sandbox = makeSandbox(HELP_WITH_FLAG)
+        const script = isPowerShell(shell)
+          ? `'piped' | codex exec -\n"status=$LASTEXITCODE"`
+          : shell === 'fish'
+            ? `printf piped | codex exec -\necho status=$status`
+            : `printf piped | codex exec -\necho status=$?`
+        const result = run(shell, script, sandbox, {
+          FAKE_CODEX_READ_STDIN: '1',
+          FAKE_CODEX_EXIT: '3'
+        })
+
+        expect(lines(result.stdout)).toEqual(['ARGV|--no-daemon|exec|-|stdin=piped', 'status=3'])
+      })
+    })
+  }
+
+  for (const [shell, enableAliases] of [
+    ['bash', 'shopt -s expand_aliases'],
+    ['zsh', 'setopt aliases']
+  ] as const) {
+    it.skipIf(isWindows || !existsSync(`/bin/${shell}`))(
+      `applies a user alias named codex defined before the wrapper in ${shell}`,
+      () => {
+        const sandbox = makeSandbox(HELP_WITH_FLAG)
+        const result = run(
+          shell,
+          'codex x',
+          sandbox,
+          {},
+          `${enableAliases}\nalias codex='codex --alias-flag'`
+        )
+
+        expect(result.status, result.stderr).toBe(0)
+        expect(result.stdout.trim()).toBe('ARGV|--no-daemon|--alias-flag|x')
+      }
+    )
+  }
+
+  it.skipIf(isWindows || !existsSync('/bin/zsh'))(
+    'creates no globals under warn_create_global',
+    () => {
+      const sandbox = makeSandbox(HELP_WITH_FLAG)
+      const result = run('zsh', 'setopt warn_create_global no_unset\ncodex x', sandbox)
+
+      expect(result.stderr).toBe('')
+      expect(result.stdout.trim()).toBe('ARGV|--no-daemon|x')
+    }
+  )
+
+  for (const [shell, available] of shells.filter(([name]) => isPowerShell(name))) {
+    it.skipIf(!available)(
+      `${shell} runs under StrictMode and Stop with a failing, noisy hook prep`,
+      () => {
+        const sandbox = makeSandbox(HELP_WITH_FLAG)
+        const prep = join(sandbox.bin, isWindows ? 'orca-prep.cmd' : 'orca-prep')
+        writeExecutable(
+          prep,
+          isWindows
+            ? '@echo prep-noise 1>&2\r\n@exit /b 7\r\n'
+            : '#!/bin/sh\necho prep-noise >&2\nexit 7\n'
+        )
+        const result = run(
+          shell,
+          'codex x\n"status=$LASTEXITCODE"',
+          sandbox,
+          { ORCA_CODEX_LAUNCH_PREFLIGHT: prep },
+          [
+            'Set-StrictMode -Version Latest',
+            '$ErrorActionPreference = "Stop"',
+            '$PSNativeCommandUseErrorActionPreference = $true'
+          ].join('\n')
+        )
+
+        expect(result.status, result.stderr).toBe(0)
+        expect(lines(result.stdout)).toEqual(['ARGV|--no-daemon|x', 'status=0'])
+      }
+    )
+  }
+})
diff --git a/src/main/pty/node-pty-self-exit-pseudoconsole-close.test.ts b/src/main/pty/node-pty-self-exit-pseudoconsole-close.test.ts
index 1f9cae275c30..6d8b6411ba56 100644
--- a/src/main/pty/node-pty-self-exit-pseudoconsole-close.test.ts
+++ b/src/main/pty/node-pty-self-exit-pseudoconsole-close.test.ts
@@ -84,7 +84,7 @@ describe('node-pty patch: pseudoconsole close on the self-exit path', () => {
       [
         '+      baton->shellExited = true;',
         '+      if (baton->consoleClosed) {',
-        '+        const bool removed = remove_pty_baton(baton->id);',
+        '+        const bool removed = remove_pty_baton_locked(baton->id);',
         '+        assert(removed);',
         '+        (void)removed;',
         '+      }'
@@ -138,7 +138,7 @@ describe('node-pty patch: pseudoconsole close on the self-exit path', () => {
     expect(ptyKillHunk).toContain(
       [
         '+      if (handle->shellExited) {',
-        '+        const bool removed = remove_pty_baton(id);',
+        '+        const bool removed = remove_pty_baton_locked(id);',
         '+        assert(removed);',
         '+        (void)removed;'
       ].join('\n')
diff --git a/src/main/pty/wsl-orca-env.test.ts b/src/main/pty/wsl-orca-env.test.ts
index 1df30613076a..a108a1ae55f6 100644
--- a/src/main/pty/wsl-orca-env.test.ts
+++ b/src/main/pty/wsl-orca-env.test.ts
@@ -64,6 +64,7 @@ describe('addOrcaWslInteropEnv', () => {
       ORCA_CLI_COMMAND: 'orca-ide',
       ORCA_WSL_CLI_DIR: 'C:\\Users\\jin\\AppData\\Roaming\\Orca\\wsl-managed-cli\\hash',
       ORCA_CODEX_LAUNCH_PREFLIGHT: 'C:\\Program Files\\Orca\\resources\\bin\\orca.exe',
+      ORCA_CODEX_ISOLATE: '0',
       ORCA_OMP_FRESH_CONFIG: 'C:\\Orca\\fresh-session.yml',
       ORCA_OMP_STATUS_EXTENSION: 'C:\\Users\\jin\\.omp\\agent\\extensions\\orca-agent-status.ts',
       ORCA_PRIME_AGENT_STATUS_EXTENSION: 'C:\\stale\\orca-agent-status.ts',
@@ -90,6 +91,7 @@ describe('addOrcaWslInteropEnv', () => {
     expect(env.WSLENV).toContain('ORCA_CLI_COMMAND/u')
     expect(env.WSLENV).toContain('ORCA_WSL_CLI_DIR/p')
     expect(env.WSLENV).toContain('ORCA_CODEX_LAUNCH_PREFLIGHT/p')
+    expect(env.WSLENV).toContain('ORCA_CODEX_ISOLATE/u')
     expect(env.WSLENV).toContain('ORCA_OMP_STATUS_EXTENSION/p')
     expect(env.WSLENV).toContain('ORCA_OMP_FRESH_CONFIG/p')
     expect(env.WSLENV).not.toContain('ORCA_PRIME_AGENT_STATUS_EXTENSION')
diff --git a/src/main/pty/wsl-orca-env.ts b/src/main/pty/wsl-orca-env.ts
index b3047fd8a27f..0044399009f4 100644
--- a/src/main/pty/wsl-orca-env.ts
+++ b/src/main/pty/wsl-orca-env.ts
@@ -82,6 +82,7 @@ export function addOrcaWslInteropEnv(env: Record<string, string>): void {
     // Why /p: the managed CLI launcher lives in the host's userData tree.
     'ORCA_WSL_CLI_DIR/p',
     'ORCA_CODEX_LAUNCH_PREFLIGHT/p',
+    'ORCA_CODEX_ISOLATE/u',
     'ORCA_PANE_KEY/u',
     'ORCA_TAB_ID/u',
     'ORCA_WORKTREE_ID/u',
diff --git a/src/main/qoder/hook-service.test.ts b/src/main/qoder/hook-service.test.ts
new file mode 100644
index 000000000000..3af282ecd767
--- /dev/null
+++ b/src/main/qoder/hook-service.test.ts
@@ -0,0 +1,102 @@
+import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import type * as OsModule from 'node:os'
+import { join } from 'node:path'
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
+const sandbox = vi.hoisted(() => ({ home: '' }))
+vi.mock('node:os', async (importOriginal) => ({
+  ...(await importOriginal<typeof OsModule>()),
+  homedir: () => sandbox.home
+}))
+vi.mock('electron', () => ({ app: { getPath: () => sandbox.home } }))
+import { getManagedLifecycleHook, hasSameManagedHookInvocation } from '../claude/hook-settings'
+import { createManagedCommandMatcher } from '../agent-hooks/installer-utils'
+import { qoderHookService, QODER_HOOK_EVENTS } from './hook-service'
+import { markQoderWorkspaceTrusted, withQoderTrustedWorkspace } from './workspace-trust'
+
+beforeAll(() => {
+  sandbox.home = mkdtempSync(join(tmpdir(), 'orca-qoder-test-'))
+  mkdirSync(join(sandbox.home, '.qoder'))
+})
+afterAll(() => {
+  rmSync(sandbox.home, { recursive: true, force: true })
+})
+
+describe('Qoder managed configuration', () => {
+  it('preserves user hooks and trust, installs idempotently, then removes only Orca hooks', () => {
+    const path = join(sandbox.home, '.qoder', 'settings.json')
+    const userHook = { hooks: [{ type: 'command', command: 'echo user-hook' }] }
+    writeFileSync(
+      path,
+      JSON.stringify({
+        model: 'custom',
+        hooks: { Stop: [userHook] },
+        permissions: { trustDirectories: ['/existing'] }
+      })
+    )
+    expect(qoderHookService.install().state).toBe('installed')
+    expect(qoderHookService.install().state).toBe('installed')
+    const installed = JSON.parse(readFileSync(path, 'utf8'))
+    for (const event of QODER_HOOK_EVENTS) {
+      expect(installed.hooks[event]).toHaveLength(event === 'Stop' ? 2 : 1)
+    }
+    expect(installed.hooks.TeammateIdle).toBeUndefined()
+    expect(installed.statusLine).toBeUndefined()
+    markQoderWorkspaceTrusted('/new-workspace')
+    const trusted = JSON.parse(readFileSync(path, 'utf8'))
+    expect(trusted.permissions.trustDirectories).toEqual(['/existing', '/new-workspace'])
+    expect(trusted.hooks).toEqual(installed.hooks)
+    expect(qoderHookService.remove().state).toBe('not_installed')
+    expect(JSON.parse(readFileSync(path, 'utf8'))).toMatchObject({
+      model: 'custom',
+      hooks: { Stop: [userHook] }
+    })
+  })
+
+  it("writes every Qoder event whatever Claude version is passed, since Claude's table never applies", () => {
+    const path = join(sandbox.home, '.qoder', 'settings.json')
+    writeFileSync(path, JSON.stringify({ hooks: {} }))
+    expect(qoderHookService.install({ claudeVersion: '1.0.62' }).state).toBe('installed')
+    const installed = JSON.parse(readFileSync(path, 'utf8'))
+    expect(Object.keys(installed.hooks).sort()).toEqual([...QODER_HOOK_EVENTS].sort())
+    expect(installed.statusLine).toBeUndefined()
+    expect(qoderHookService.remove().state).toBe('not_installed')
+  })
+
+  it('refuses malformed settings instead of overwriting them', () => {
+    const path = join(sandbox.home, '.qoder', 'settings.json')
+    writeFileSync(path, '{broken')
+    expect(qoderHookService.install().state).toBe('error')
+    markQoderWorkspaceTrusted('/new-workspace')
+    expect(readFileSync(path, 'utf8')).toBe('{broken')
+    expect(withQoderTrustedWorkspace({ permissions: 'invalid' }, '/workspace')).toBeNull()
+    expect(
+      withQoderTrustedWorkspace({ permissions: { trustDirectories: true } }, '/workspace')
+    ).toBeNull()
+  })
+})
+
+describe('Qoder Windows hook shell', () => {
+  it('uses the documented explicit shell without relying on Git Bash or another PowerShell hop', () => {
+    vi.spyOn(process, 'platform', 'get').mockReturnValue('win32')
+    try {
+      const hook = getManagedLifecycleHook(
+        'C:\\Users\\a b\\.orca\\agent-hooks\\qoder-hook.cmd',
+        {
+          configDirName: '.qoder',
+          scriptBaseName: 'qoder-hook',
+          usesWindowsCompatLauncher: true,
+          windowsHookShell: 'powershell'
+        },
+        { gitBashAvailable: true }
+      )
+      expect(hook.shell).toBe('powershell')
+      expect(hook.command).toContain('$env:USERPROFILE')
+      expect(hook.command).not.toMatch(/EncodedCommand|ExecutionPolicy|\|\|/)
+      expect(createManagedCommandMatcher('qoder-hook.cmd')(hook.command)).toBe(true)
+      expect(hasSameManagedHookInvocation({ ...hook, shell: undefined }, hook)).toBe(false)
+    } finally {
+      vi.restoreAllMocks()
+    }
+  })
+})
diff --git a/src/main/qoder/hook-service.ts b/src/main/qoder/hook-service.ts
new file mode 100644
index 000000000000..ac9e869638c8
--- /dev/null
+++ b/src/main/qoder/hook-service.ts
@@ -0,0 +1,38 @@
+import type { ClaudeManagedHookPlan } from '../claude/claude-managed-hook-events'
+import { ClaudeHookService } from '../claude/hook-service'
+
+// Qoder documents Claude-shaped hooks at https://docs.qoder.com/cli/hooks.
+export const QODER_HOOK_EVENTS = [
+  'SessionStart',
+  'SessionEnd',
+  'UserPromptSubmit',
+  'PreToolUse',
+  'PostToolUse',
+  'PostToolUseFailure',
+  'PermissionRequest',
+  'Stop',
+  'StopFailure',
+  'Notification',
+  'PostCompact'
+] as const
+
+// Why: Qoder's own CLI reads these events, so Claude's version table never applies; the statusline
+// usage feed is Claude-only.
+export const QODER_MANAGED_HOOK_PLAN: ClaudeManagedHookPlan = {
+  install: QODER_HOOK_EVENTS.map((eventName) => ({ eventName, definition: {} })),
+  retire: [],
+  statusLine: 'leave'
+}
+
+export const qoderHookService = new ClaudeHookService({
+  agent: 'qoder',
+  source: 'qoder',
+  displayName: 'Qoder CLI',
+  settings: {
+    configDirName: '.qoder',
+    scriptBaseName: 'qoder-hook',
+    usesWindowsCompatLauncher: true,
+    windowsHookShell: 'powershell'
+  },
+  hookPlan: QODER_MANAGED_HOOK_PLAN
+})
diff --git a/src/main/qoder/workspace-trust.ts b/src/main/qoder/workspace-trust.ts
new file mode 100644
index 000000000000..2a834f7cbcb0
--- /dev/null
+++ b/src/main/qoder/workspace-trust.ts
@@ -0,0 +1,78 @@
+import { realpathSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { join, posix } from 'node:path'
+import { isPlainObject, readHooksJson, writeHooksJson } from '../agent-hooks/installer-utils'
+import { parseHooksJsonText } from '../agent-hooks/hooks-json-read'
+import { isENOENT } from '../ipc/filesystem-path-containment'
+import type { IFilesystemProvider } from '../providers/types'
+
+// Qoder 1.1.64 writes this exact shape after accepting its folder-trust prompt.
+export function withQoderTrustedWorkspace(
+  config: Record<string, unknown>,
+  workspacePath: string
+): Record<string, unknown> | null {
+  if (config.permissions !== undefined && !isPlainObject(config.permissions)) {
+    return null
+  }
+  const permissions = isPlainObject(config.permissions) ? config.permissions : {}
+  if (permissions.trustDirectories !== undefined && !Array.isArray(permissions.trustDirectories)) {
+    return null
+  }
+  const existing = Array.isArray(permissions.trustDirectories) ? permissions.trustDirectories : []
+  if (existing.includes(workspacePath)) {
+    return config
+  }
+  return {
+    ...config,
+    permissions: { ...permissions, trustDirectories: [...existing, workspacePath] }
+  }
+}
+
+export function markQoderWorkspaceTrusted(workspacePath: string): void {
+  let canonicalPath = workspacePath
+  try {
+    canonicalPath = realpathSync.native(workspacePath)
+  } catch {
+    /* Keep the supplied path when absent. */
+  }
+  const configPath = join(homedir(), '.qoder', 'settings.json')
+  const config = readHooksJson(configPath)
+  if (!config) {
+    return
+  }
+  const updated = withQoderTrustedWorkspace(config, canonicalPath)
+  if (updated && updated !== config) {
+    writeHooksJson(configPath, updated)
+  }
+}
+
+export async function markRemoteQoderWorkspaceTrusted(
+  fsProvider: IFilesystemProvider,
+  remoteHome: string,
+  workspacePath: string
+): Promise<void> {
+  const configDir = posix.join(remoteHome, '.qoder')
+  const configPath = posix.join(configDir, 'settings.json')
+  let config: Record<string, unknown> | null
+  try {
+    const result = await fsProvider.readFile(configPath)
+    if (result.isBinary) {
+      return
+    }
+    config = parseHooksJsonText(result.content)
+  } catch (error) {
+    if (!isENOENT(error)) {
+      return
+    }
+    config = {}
+  }
+  if (!config) {
+    return
+  }
+  const updated = withQoderTrustedWorkspace(config, workspacePath)
+  if (!updated || updated === config) {
+    return
+  }
+  await fsProvider.createDir(configDir)
+  await fsProvider.writeFile(configPath, `${JSON.stringify(updated, null, 2)}\n`)
+}
diff --git a/src/main/quit-teardown-agent-browser-daemons.test.ts b/src/main/quit-teardown-agent-browser-daemons.test.ts
deleted file mode 100644
index 315eba73aa00..000000000000
--- a/src/main/quit-teardown-agent-browser-daemons.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-/**
- * agent-browser forks a daemon per browser tab that Orca holds no handle on, and
- * `destroyAllSessions` closes each one by spawning another agent-browser child —
- * hundreds of ms apiece. Left off the will-quit barrier, `app.quit()` fired first and
- * every open tab's daemon outlived the app (#16367).
- */
-const source = readFileSync(join(__dirname, 'startup', 'main-process-quit.ts'), 'utf8')
-
-function teardownBarrierMembers(): string {
-  const start = source.indexOf('settleTeardownWithinDeadline([')
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf('])', start)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('quit teardown of agent-browser daemons', () => {
-  it('joins the will-quit teardown barrier', () => {
-    expect(teardownBarrierMembers()).toContain("{ name: 'browser', promise: browserShutdown }")
-  })
-
-  it('captures the destroyAllSessions promise instead of firing and forgetting', () => {
-    expect(source).toMatch(
-      /const browserShutdown = \(async \(\): Promise<void> => \{[\s\S]*?await state\.runtime\?\.getAgentBrowserBridge\(\)\?\.destroyAllSessions\(\)\s+\}\)\(\)/
-    )
-    // Why: a second, uncaptured call site is the pre-fix shape — it loses the race to app.quit().
-    expect(source.match(/getAgentBrowserBridge\(\)\?\.destroyAllSessions\(\)/g)).toHaveLength(1)
-  })
-})
diff --git a/src/main/rate-limits/grok-fetcher.ts b/src/main/rate-limits/grok-fetcher.ts
index 33c4fac9aec3..b776613a3359 100644
--- a/src/main/rate-limits/grok-fetcher.ts
+++ b/src/main/rate-limits/grok-fetcher.ts
@@ -109,12 +109,11 @@ function usageScalars(config: GrokBillingConfig): (GrokMoneyVal | undefined)[] {
   ]
 }
 
-// Why: proto3 JSON drops default zeros, so an omitted percent can mean zero —
-// but only an explicitly-emitted zero proves this encoder keeps them. #15740
-// ships `onDemandUsed: {val: 0}`, so there the omission means "not reported"
-// and must never render as 0%. Non-zero money fields prove nothing either way,
-// so #9214/#9219 accounts that carry only those keep their genuine 0%.
-function emitsExplicitZeroScalar(config: GrokBillingConfig): boolean {
+function omittedPercentIsUnreported(config: GrokBillingConfig): boolean {
+  // A strict zero cap rejects numeric prefixes like "0invalid" accepted by parseMoneyVal.
+  if (parseMoneyVal(config.onDemandCap) === 0 && Number(config.onDemandCap?.val) === 0) {
+    return [config.onDemandUsed, config.used].some((value) => (parseMoneyVal(value) ?? 0) > 0)
+  }
   return usageScalars(config).some((value) => parseMoneyVal(value) === 0)
 }
 
@@ -130,10 +129,8 @@ function resolveWeeklyPercent(config: GrokBillingConfig): number | null {
   if (reported !== undefined) {
     return null
   }
-  // Why: infer the dropped zero only when nothing else in the payload speaks
-  // for consumption — an explicit zero proves the encoder keeps defaults, and a
-  // computable budget pair is a real monthly number this must not shadow.
-  if (emitsExplicitZeroScalar(config) || mapMonthlyUsage(config) !== null) {
+  // A computable monthly budget must not be relabelled as weekly zero usage.
+  if (omittedPercentIsUnreported(config) || mapMonthlyUsage(config) !== null) {
     return null
   }
   return hasConfirmedWeeklyPeriod(config) ? 0 : null
diff --git a/src/main/rate-limits/grok-weekly-zero.test.ts b/src/main/rate-limits/grok-weekly-zero.test.ts
new file mode 100644
index 000000000000..f8c8b098ebfc
--- /dev/null
+++ b/src/main/rate-limits/grok-weekly-zero.test.ts
@@ -0,0 +1,225 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const netFetchMock = vi.hoisted(() => vi.fn())
+vi.mock('electron', () => ({ net: { fetch: netFetchMock } }))
+vi.mock('./grok-auth', () => ({
+  readGrokAuthSession: () => {
+    throw new Error('Tests must supply synthetic auth')
+  },
+  isGrokAccessTokenFresh: () => true
+}))
+
+import { fetchGrokRateLimits } from './grok-fetcher'
+
+const START = '2026-09-13T16:33:14.392197+00:00'
+const END = '2026-09-20T16:33:14.392197+00:00'
+const PERIOD = { type: 'USAGE_PERIOD_TYPE_WEEKLY', start: START, end: END }
+const CONFIRMED_PERIOD = {
+  currentPeriod: PERIOD,
+  billingPeriodStart: START,
+  billingPeriodEnd: END
+}
+// Reporter deminit02-hue's #20657 payload; authentication is synthetic.
+const REPORTER_CONFIG = {
+  ...CONFIRMED_PERIOD,
+  onDemandCap: { val: 0 },
+  onDemandUsed: { val: 0 },
+  prepaidBalance: { val: 0 },
+  isUnifiedBillingUser: true
+}
+const AUTH = {
+  status: 'ok',
+  session: {
+    accessToken: 'fixture-only',
+    userId: 'fixture-user',
+    email: 'grok@example.invalid',
+    teamId: null,
+    oidcClientId: null,
+    expiresAtMs: Date.parse('2099-01-01T00:00:00Z')
+  }
+} as const
+
+function jsonResponse(body: unknown, status = 200) {
+  return { ok: status >= 200 && status < 300, status, json: async () => body }
+}
+
+async function fetchConfig(config: Record<string, unknown>, flat = false) {
+  netFetchMock
+    .mockResolvedValueOnce(jsonResponse(flat ? config : { config }))
+    .mockResolvedValueOnce(jsonResponse({ config: {} }))
+  return fetchGrokRateLimits({ authReadResult: AUTH })
+}
+
+describe('Grok weekly zero evidence', () => {
+  beforeEach(() => netFetchMock.mockReset())
+
+  it.each([false, true])('maps the reporter payload with flat=%s', async (flat) => {
+    const result = await fetchConfig(REPORTER_CONFIG, flat)
+    expect(result.status).toBe('ok')
+    expect(result.weekly).toMatchObject({
+      usedPercent: 0,
+      windowMinutes: 10_080,
+      resetsAt: Date.parse(END)
+    })
+    expect(result.monthly).toBeUndefined()
+    expect(netFetchMock).toHaveBeenCalledTimes(1)
+  })
+
+  it.each([0, '0', '0.00'])('accepts money zero encoded as %s', async (val) => {
+    const result = await fetchConfig({
+      ...REPORTER_CONFIG,
+      onDemandCap: { val },
+      onDemandUsed: { val },
+      prepaidBalance: { val }
+    })
+    expect(result.weekly?.usedPercent).toBe(0)
+    expect(netFetchMock).toHaveBeenCalledTimes(1)
+  })
+
+  it.each([
+    { name: 'absent', cap: undefined },
+    { name: 'empty', cap: {} },
+    { name: 'malformed', cap: { val: 'unknown' } },
+    { name: 'zero prefix', cap: { val: '0invalid' } },
+    { name: 'negative', cap: { val: -1 } },
+    { name: 'nonfinite', cap: { val: Infinity } },
+    { name: 'positive', cap: { val: 250 } }
+  ])('keeps $name cap with explicit money zeros unknown', async ({ cap }) => {
+    const result = await fetchConfig({ ...REPORTER_CONFIG, onDemandCap: cap })
+    expect(result.status).toBe('unavailable')
+    expect(result.weekly).toBeNull()
+    expect(netFetchMock).toHaveBeenCalledTimes(2)
+  })
+
+  it.each(['onDemandUsed', 'used'])('does not infer zero beside positive %s', async (field) => {
+    const result = await fetchConfig({ ...REPORTER_CONFIG, [field]: { val: '37.5' } })
+    expect(result.status).toBe('unavailable')
+    expect(result.weekly).toBeNull()
+    expect(netFetchMock).toHaveBeenCalledTimes(2)
+  })
+
+  it.each([
+    { name: 'absent cap and no money', config: CONFIRMED_PERIOD },
+    { name: 'prepaid only', config: { ...CONFIRMED_PERIOD, prepaidBalance: { val: 25 } } },
+    { name: 'zero cap and prepaid', config: { ...REPORTER_CONFIG, prepaidBalance: { val: 25 } } }
+  ])('preserves $name zero inference', async ({ config }) => {
+    const result = await fetchConfig(config)
+    expect(result.weekly?.usedPercent).toBe(0)
+    expect(netFetchMock).toHaveBeenCalledTimes(1)
+  })
+
+  it.each([0, 23, -10, 150])(
+    'honors finite explicit percent %s before money evidence',
+    async (percent) => {
+      const result = await fetchConfig({
+        ...REPORTER_CONFIG,
+        creditUsagePercent: percent,
+        onDemandUsed: { val: 37.5 },
+        monthlyLimit: { val: 100 },
+        used: { val: 25 },
+        billingPeriodStart: undefined
+      })
+      expect(result.weekly?.usedPercent).toBe(Math.min(100, Math.max(0, percent)))
+      expect(result.monthly).toBeUndefined()
+      expect(netFetchMock).toHaveBeenCalledTimes(1)
+    }
+  )
+
+  it.each([null, '0', 'invalid', Number.NaN, Infinity, -Infinity])(
+    'does not infer an invalid explicit percent %s',
+    async (percent) => {
+      const result = await fetchConfig({ ...REPORTER_CONFIG, creditUsagePercent: percent })
+      expect(result.status).toBe('unavailable')
+      expect(result.weekly).toBeNull()
+      expect(netFetchMock).toHaveBeenCalledTimes(2)
+    }
+  )
+
+  it.each([
+    { billingPeriodStart: undefined },
+    { billingPeriodEnd: undefined },
+    { billingPeriodStart: 'invalid' },
+    { billingPeriodEnd: 'invalid' },
+    { billingPeriodStart: END },
+    { billingPeriodEnd: START },
+    { currentPeriod: undefined },
+    { currentPeriod: { ...PERIOD, type: 'USAGE_PERIOD_TYPE_MONTHLY' } },
+    { currentPeriod: { ...PERIOD, start: 'invalid' } },
+    { currentPeriod: { ...PERIOD, end: 'invalid' } }
+  ])('requires confirmed weekly bounds: %o', async (period) => {
+    const result = await fetchConfig({ ...REPORTER_CONFIG, ...period })
+    expect(result.status).toBe('unavailable')
+    expect(result.weekly).toBeNull()
+    expect(netFetchMock).toHaveBeenCalledTimes(2)
+  })
+
+  it.each([0, 25])('keeps a computable monthly pair with used=%s monthly', async (used) => {
+    const result = await fetchConfig({
+      ...REPORTER_CONFIG,
+      monthlyLimit: { val: '100' },
+      used: { val: used }
+    })
+    expect(result.status).toBe('ok')
+    expect(result.weekly).toBeNull()
+    expect(result.monthly).toMatchObject({ usedPercent: used, windowMinutes: 43_200 })
+    expect(netFetchMock).toHaveBeenCalledTimes(1)
+  })
+
+  it.each([0, '0', -1, 'invalid', null, Infinity, Number.NaN])(
+    'rejects invalid monthly denominator %s',
+    async (val) => {
+      netFetchMock
+        .mockResolvedValueOnce(jsonResponse({ config: { subscriptionTier: 'Fixture' } }))
+        .mockResolvedValueOnce(
+          jsonResponse({ config: { monthlyLimit: { val }, used: { val: 12 } } })
+        )
+      const result = await fetchGrokRateLimits({ authReadResult: AUTH })
+      expect(result.status).toBe('unavailable')
+      expect(result.weekly).toBeNull()
+      expect(result.monthly).toBeUndefined()
+      expect(netFetchMock).toHaveBeenCalledTimes(2)
+    }
+  )
+
+  it.each([false, true])('preserves monthly fallback with flat=%s', async (flat) => {
+    const config = { monthlyLimit: { val: 200 }, used: { val: 50 }, billingPeriodEnd: END }
+    netFetchMock
+      .mockResolvedValueOnce(
+        jsonResponse({ config: { ...REPORTER_CONFIG, onDemandCap: { val: 250 } } })
+      )
+      .mockResolvedValueOnce(jsonResponse(flat ? config : { config }))
+    const result = await fetchGrokRateLimits({ authReadResult: AUTH })
+    expect(result.status).toBe('ok')
+    expect(result.weekly).toBeNull()
+    expect(result.monthly).toMatchObject({ usedPercent: 25, resetsAt: Date.parse(END) })
+    expect(netFetchMock).toHaveBeenCalledTimes(2)
+  })
+
+  it.each([401, 403, 500])('preserves fallback HTTP %s errors', async (status) => {
+    netFetchMock
+      .mockResolvedValueOnce(jsonResponse({ config: { subscriptionTier: 'Fixture' } }))
+      .mockResolvedValueOnce(jsonResponse({}, status))
+    const result = await fetchGrokRateLimits({ authReadResult: AUTH })
+    expect(result.status).toBe('error')
+    expect(result.error).toContain(`HTTP ${status}`)
+    expect(netFetchMock).toHaveBeenCalledTimes(2)
+  })
+
+  it('aborts the default billing fallback with the caller signal', async () => {
+    const controller = new AbortController()
+    let signal: AbortSignal | null | undefined
+    netFetchMock
+      .mockResolvedValueOnce(jsonResponse({ config: { subscriptionTier: 'Fixture' } }))
+      .mockImplementationOnce((_url, init: RequestInit) => {
+        signal = init.signal
+        return new Promise((_resolve, reject) => {
+          signal?.addEventListener('abort', () => reject(new Error('aborted')), { once: true })
+        })
+      })
+    const pending = fetchGrokRateLimits({ authReadResult: AUTH, signal: controller.signal })
+    await vi.waitFor(() => expect(netFetchMock).toHaveBeenCalledTimes(2))
+    controller.abort()
+    expect(signal?.aborted).toBe(true)
+    expect(await pending).toMatchObject({ status: 'error', error: 'aborted' })
+  })
+})
diff --git a/src/main/rate-limits/minimax/minimax-fetcher.test.ts b/src/main/rate-limits/minimax/minimax-fetcher.test.ts
index d587c6b92568..d03c6a7c589b 100644
--- a/src/main/rate-limits/minimax/minimax-fetcher.test.ts
+++ b/src/main/rate-limits/minimax/minimax-fetcher.test.ts
@@ -19,12 +19,7 @@ vi.mock('electron', () => ({
   session: { fromPartition: sessionFromPartitionMock }
 }))
 
-import {
-  extractMiniMaxCookieValue,
-  fetchMiniMaxRateLimits,
-  normalizeMiniMaxCookieHeader,
-  redactMiniMaxSecret
-} from './minimax-fetcher'
+import { fetchMiniMaxRateLimits } from './minimax-fetcher'
 
 const MINIMAX_URL = 'https://platform.minimax.io/v1/api/openplatform/coding_plan/remains'
 
@@ -646,54 +641,3 @@ describe('fetchMiniMaxRateLimits', () => {
     })
   })
 })
-
-describe('normalizeMiniMaxCookieHeader', () => {
-  it('preserves all cookie pairs from a browser Cookie header', () => {
-    const normalized = normalizeMiniMaxCookieHeader(
-      '_token=tok; session=other; ak_bmsc=ak; minimax_group_id_v2=42; random=xyz'
-    )
-    expect(normalized).toBe(
-      '_token=tok; session=other; ak_bmsc=ak; minimax_group_id_v2=42; random=xyz'
-    )
-  })
-
-  it('normalizes quoted MiniMax cookie storage syntax', () => {
-    expect(normalizeMiniMaxCookieHeader('_token:"tok" minimax_group_id_v2:"42"')).toBe(
-      '_token=tok; minimax_group_id_v2=42'
-    )
-  })
-
-  it('accepts a copied Cookie header line', () => {
-    expect(normalizeMiniMaxCookieHeader('Cookie: session=abc; other=xyz')).toBe(
-      'session=abc; other=xyz'
-    )
-  })
-})
-
-describe('extractMiniMaxCookieValue', () => {
-  it('returns the value for a given cookie name', () => {
-    expect(extractMiniMaxCookieValue(FULL_COOKIE, 'minimax_group_id_v2')).toBe('12345')
-  })
-  it('returns null when the name is absent', () => {
-    expect(extractMiniMaxCookieValue('_token=tok', 'minimax_group_id_v2')).toBeNull()
-  })
-})
-
-describe('redactMiniMaxSecret', () => {
-  it('redacts _token values', () => {
-    expect(redactMiniMaxSecret('cookie _token=eyJhABCDEF')).toContain('_token=[REDACTED]')
-    expect(redactMiniMaxSecret('cookie _token=eyJhABCDEF')).not.toContain('eyJhABCDEF')
-  })
-  it('redacts minimax_group_id_v2 values', () => {
-    expect(redactMiniMaxSecret('minimax_group_id_v2=99999 trailing')).not.toContain('99999')
-  })
-  it('redacts MiniMax anti-bot cookie values', () => {
-    const redacted = redactMiniMaxSecret('ak_bmsc=secret bm_sv:"secret2"')
-    expect(redacted).not.toContain('secret')
-    expect(redacted).toContain('ak_bmsc=[REDACTED]')
-    expect(redacted).toContain('bm_sv:[REDACTED]')
-  })
-  it('redacts Cookie: header lines', () => {
-    expect(redactMiniMaxSecret('X-Cookie: _token=secret')).toContain('[REDACTED]')
-  })
-})
diff --git a/src/main/rate-limits/rate-limit-service-test-harness.ts b/src/main/rate-limits/rate-limit-service-test-harness.ts
index 021de01108d3..f51839d108b9 100644
--- a/src/main/rate-limits/rate-limit-service-test-harness.ts
+++ b/src/main/rate-limits/rate-limit-service-test-harness.ts
@@ -11,6 +11,7 @@ import { readGrokAuthSession } from './grok-auth'
 import { fetchCursorRateLimits } from './cursor-fetcher'
 import { readCursorAuthSession } from './cursor-auth'
 import { fetchOpenCodeGoUsage } from './opencode-go-usage-source-selection'
+import { fetchZcodeRateLimits } from './zcode-usage-fetcher'
 import { hasMiniMaxSessionCookie } from '../minimax/minimax-cookie-store'
 
 export type Deferred<T> = {
@@ -92,6 +93,7 @@ export function mockFreshBackgroundProviderFetches(): void {
   vi.mocked(fetchMiniMaxRateLimits).mockImplementation(async () => okProvider('minimax', 0))
   vi.mocked(fetchGrokRateLimits).mockImplementation(async () => unavailableProvider('grok'))
   vi.mocked(fetchCursorRateLimits).mockImplementation(async () => unavailableProvider('cursor'))
+  vi.mocked(fetchZcodeRateLimits).mockImplementation(async () => unavailableProvider('zcode'))
 }
 
 /** Shared `beforeEach` body: healthy stubs for every provider the service polls. */
@@ -110,6 +112,7 @@ export function resetRateLimitProviderMocks(): void {
     status: 'unavailable'
   })
   vi.mocked(fetchCursorRateLimits).mockResolvedValue(unavailableProvider('cursor'))
+  vi.mocked(fetchZcodeRateLimits).mockResolvedValue(unavailableProvider('zcode'))
   vi.mocked(hasMiniMaxSessionCookie).mockReturnValue(false)
   vi.mocked(readGrokAuthSession).mockReturnValue({ status: 'missing' })
   vi.mocked(readCursorAuthSession).mockResolvedValue({ status: 'missing' })
diff --git a/src/main/rate-limits/service-account-target-selection.test.ts b/src/main/rate-limits/service-account-target-selection.test.ts
index 2deeadfcdaad..bb5de4b64856 100644
--- a/src/main/rate-limits/service-account-target-selection.test.ts
+++ b/src/main/rate-limits/service-account-target-selection.test.ts
@@ -32,6 +32,10 @@ vi.mock('./opencode-go-usage-source-selection', () => ({
   fetchOpenCodeGoUsage: vi.fn()
 }))
 
+vi.mock('./zcode-usage-fetcher', () => ({
+  fetchZcodeRateLimits: vi.fn()
+}))
+
 vi.mock('./minimax/minimax-fetcher', () => ({
   fetchMiniMaxRateLimits: vi.fn()
 }))
diff --git a/src/main/rate-limits/service-antigravity-usage.test.ts b/src/main/rate-limits/service-antigravity-usage.test.ts
index 9f2fc2c8244c..3696f434dec5 100644
--- a/src/main/rate-limits/service-antigravity-usage.test.ts
+++ b/src/main/rate-limits/service-antigravity-usage.test.ts
@@ -39,6 +39,8 @@ vi.mock('./grok-fetcher', () => ({
   fetchGrokRateLimits: vi.fn()
 }))
 
+vi.mock('./zcode-usage-fetcher', () => ({ fetchZcodeRateLimits: vi.fn() }))
+
 vi.mock('./cursor-fetcher', () => ({
   fetchCursorRateLimits: vi.fn()
 }))
diff --git a/src/main/rate-limits/service-cursor-usage.test.ts b/src/main/rate-limits/service-cursor-usage.test.ts
index 37984b89a522..3646f9f85863 100644
--- a/src/main/rate-limits/service-cursor-usage.test.ts
+++ b/src/main/rate-limits/service-cursor-usage.test.ts
@@ -23,6 +23,8 @@ vi.mock('./opencode-go-usage-source-selection', () => ({ fetchOpenCodeGoUsage: v
 vi.mock('./minimax/minimax-fetcher', () => ({ fetchMiniMaxRateLimits: vi.fn() }))
 vi.mock('./grok-fetcher', () => ({ fetchGrokRateLimits: vi.fn() }))
 vi.mock('./grok-auth', () => ({ readGrokAuthSession: vi.fn(() => ({ status: 'missing' })) }))
+vi.mock('./zcode-usage-fetcher', () => ({ fetchZcodeRateLimits: vi.fn() }))
+
 vi.mock('./cursor-fetcher', () => ({ fetchCursorRateLimits: vi.fn() }))
 vi.mock('./cursor-auth', () => ({ readCursorAuthSession: vi.fn() }))
 vi.mock('../minimax/minimax-cookie-store', () => ({ hasMiniMaxSessionCookie: vi.fn(() => false) }))
diff --git a/src/main/rate-limits/service-inactive-account-previews.test.ts b/src/main/rate-limits/service-inactive-account-previews.test.ts
index 300292efcc21..23f0a0e6bbac 100644
--- a/src/main/rate-limits/service-inactive-account-previews.test.ts
+++ b/src/main/rate-limits/service-inactive-account-previews.test.ts
@@ -39,6 +39,10 @@ vi.mock('./opencode-go-usage-source-selection', () => ({
   fetchOpenCodeGoUsage: vi.fn()
 }))
 
+vi.mock('./zcode-usage-fetcher', () => ({
+  fetchZcodeRateLimits: vi.fn()
+}))
+
 vi.mock('./minimax/minimax-fetcher', () => ({
   fetchMiniMaxRateLimits: vi.fn()
 }))
diff --git a/src/main/rate-limits/service-live-claude-usage.test.ts b/src/main/rate-limits/service-live-claude-usage.test.ts
index 3c51a09aa5ff..07f6ccf0d272 100644
--- a/src/main/rate-limits/service-live-claude-usage.test.ts
+++ b/src/main/rate-limits/service-live-claude-usage.test.ts
@@ -36,6 +36,10 @@ vi.mock('./opencode-go-usage-source-selection', () => ({
   fetchOpenCodeGoUsage: vi.fn()
 }))
 
+vi.mock('./zcode-usage-fetcher', () => ({
+  fetchZcodeRateLimits: vi.fn()
+}))
+
 vi.mock('./minimax/minimax-fetcher', () => ({
   fetchMiniMaxRateLimits: vi.fn()
 }))
diff --git a/src/main/rate-limits/service-minimax-usage.test.ts b/src/main/rate-limits/service-minimax-usage.test.ts
index 8b2253364723..93f95de78474 100644
--- a/src/main/rate-limits/service-minimax-usage.test.ts
+++ b/src/main/rate-limits/service-minimax-usage.test.ts
@@ -33,6 +33,10 @@ vi.mock('./opencode-go-usage-source-selection', () => ({
   fetchOpenCodeGoUsage: vi.fn()
 }))
 
+vi.mock('./zcode-usage-fetcher', () => ({
+  fetchZcodeRateLimits: vi.fn()
+}))
+
 vi.mock('./minimax/minimax-fetcher', () => ({
   fetchMiniMaxRateLimits: vi.fn()
 }))
diff --git a/src/main/rate-limits/service-refresh-orchestration.test.ts b/src/main/rate-limits/service-refresh-orchestration.test.ts
index b184d51eda6a..9577a87d6a3f 100644
--- a/src/main/rate-limits/service-refresh-orchestration.test.ts
+++ b/src/main/rate-limits/service-refresh-orchestration.test.ts
@@ -7,6 +7,7 @@ import { fetchGeminiRateLimits } from './gemini-usage-fetcher'
 import { fetchKimiRateLimits } from './kimi-fetcher'
 import { fetchMiniMaxRateLimits } from './minimax/minimax-fetcher'
 import { fetchGrokRateLimits } from './grok-fetcher'
+import { fetchZcodeRateLimits } from './zcode-usage-fetcher'
 import { readGrokAuthSession } from './grok-auth'
 import { fetchOpenCodeGoUsage } from './opencode-go-usage-source-selection'
 import {
@@ -40,6 +41,10 @@ vi.mock('./opencode-go-usage-source-selection', () => ({
   fetchOpenCodeGoUsage: vi.fn()
 }))
 
+vi.mock('./zcode-usage-fetcher', () => ({
+  fetchZcodeRateLimits: vi.fn()
+}))
+
 vi.mock('./minimax/minimax-fetcher', () => ({
   fetchMiniMaxRateLimits: vi.fn()
 }))
@@ -73,6 +78,57 @@ describe('RateLimitService', () => {
     resetRateLimitProviderMocks()
   })
 
+  it('publishes a ZCode quota snapshot alongside the other providers', async () => {
+    vi.mocked(fetchClaudeRateLimits).mockResolvedValue(okProvider('claude', 7))
+    vi.mocked(fetchCodexRateLimits).mockResolvedValue(okProvider('codex', 8))
+    vi.mocked(fetchZcodeRateLimits).mockResolvedValue(okProvider('zcode', 42))
+    const service = new RateLimitService()
+
+    await service.refresh()
+
+    expect(fetchZcodeRateLimits).toHaveBeenCalledTimes(1)
+    expect(service.getState().zcode?.session?.usedPercent).toBe(42)
+    expect(service.getState().codex?.session?.usedPercent).toBe(8)
+  })
+
+  it('does not keep a previous ZCode account quota after a failed account switch', async () => {
+    vi.mocked(fetchZcodeRateLimits)
+      .mockResolvedValueOnce({
+        ...okProvider('zcode', 42),
+        usageMetadata: { source: 'web', authProvenance: 'account-a' }
+      })
+      .mockResolvedValueOnce({
+        ...errorProvider('zcode', 'request failed'),
+        usageMetadata: { source: 'web', authProvenance: 'account-b', failureKind: 'network' }
+      })
+    const service = new RateLimitService()
+
+    await service.refresh()
+    await service.refresh()
+
+    expect(service.getState().zcode?.status).toBe('error')
+    expect(service.getState().zcode?.session).toBeNull()
+  })
+
+  it('keeps a recent ZCode quota after a failed retry for the same account', async () => {
+    vi.mocked(fetchZcodeRateLimits)
+      .mockResolvedValueOnce({
+        ...okProvider('zcode', 42),
+        usageMetadata: { source: 'web', authProvenance: 'account-a' }
+      })
+      .mockResolvedValueOnce({
+        ...errorProvider('zcode', 'request failed'),
+        usageMetadata: { source: 'web', authProvenance: 'account-a', failureKind: 'network' }
+      })
+    const service = new RateLimitService()
+
+    await service.refresh()
+    await service.refresh()
+
+    expect(service.getState().zcode?.status).toBe('error')
+    expect(service.getState().zcode?.session?.usedPercent).toBe(42)
+  })
+
   it('does not reread Grok auth when callers read state snapshots', () => {
     vi.mocked(readGrokAuthSession).mockReturnValue({
       status: 'ok',
diff --git a/src/main/rate-limits/service-window-activation.test.ts b/src/main/rate-limits/service-window-activation.test.ts
index 7c83bd7d0260..54296c396b9b 100644
--- a/src/main/rate-limits/service-window-activation.test.ts
+++ b/src/main/rate-limits/service-window-activation.test.ts
@@ -41,6 +41,10 @@ vi.mock('./opencode-go-usage-source-selection', () => ({
   fetchOpenCodeGoUsage: vi.fn()
 }))
 
+vi.mock('./zcode-usage-fetcher', () => ({
+  fetchZcodeRateLimits: vi.fn()
+}))
+
 vi.mock('./minimax/minimax-fetcher', () => ({
   fetchMiniMaxRateLimits: vi.fn()
 }))
diff --git a/src/main/rate-limits/service/service-full-cycle-application.ts b/src/main/rate-limits/service/service-full-cycle-application.ts
index 9e9d9506a051..70b58933c163 100644
--- a/src/main/rate-limits/service/service-full-cycle-application.ts
+++ b/src/main/rate-limits/service/service-full-cycle-application.ts
@@ -36,7 +36,8 @@ export abstract class RateLimitServiceFullCycleApplication extends RateLimitServ
         miniMaxResult
       ],
       grokResultPromise,
-      cursorResultPromise
+      cursorResultPromise,
+      zcodeResultPromise
     } = prepared
     if (signal.aborted) {
       return
@@ -193,12 +194,17 @@ export abstract class RateLimitServiceFullCycleApplication extends RateLimitServ
         : this.state.minimax
     })
 
-    const [grokSettled, cursorSettled] = await Promise.all([grokResultPromise, cursorResultPromise])
+    const [grokSettled, cursorSettled, zcodeSettled] = await Promise.all([
+      grokResultPromise,
+      cursorResultPromise,
+      zcodeResultPromise
+    ])
     if (signal.aborted) {
       return
     }
     const grok = settleSiblingProviderResult('grok', grokSettled)
     const cursor = settleSiblingProviderResult('cursor', cursorSettled)
+    const zcode = settleSiblingProviderResult('zcode', zcodeSettled)
     // Why: the stale policy keeps a recent snapshot through a failed refresh, but
     // a snapshot belonging to a different Cursor account must not survive the
     // switch — the Accounts pane would name the new account beside the old
@@ -210,12 +216,23 @@ export abstract class RateLimitServiceFullCycleApplication extends RateLimitServ
       previousCursorAccount !== undefined &&
       cursorAccount !== undefined &&
       previousCursorAccount !== cursorAccount
+    const previousZcodeAccount = previousState.zcode?.usageMetadata?.authProvenance
+    const zcodeAccount = zcode.usageMetadata?.authProvenance
+    const sameZcodeAccount =
+      previousZcodeAccount !== undefined &&
+      zcodeAccount !== undefined &&
+      previousZcodeAccount === zcodeAccount
     this.trackActiveFailureStreak('grok', grok)
     this.trackActiveFailureStreak('cursor', cursor)
+    this.trackActiveFailureStreak('zcode', zcode)
     this.updateState({
       ...this.state,
       grok: this.applyStalePolicy(grok, previousState.grok),
-      cursor: cursorAccountChanged ? cursor : this.applyStalePolicy(cursor, previousState.cursor)
+      cursor: cursorAccountChanged ? cursor : this.applyStalePolicy(cursor, previousState.cursor),
+      zcode:
+        zcode.status === 'error' && !sameZcodeAccount
+          ? zcode
+          : this.applyStalePolicy(zcode, previousState.zcode)
     })
   }
 }
diff --git a/src/main/rate-limits/service/service-full-cycle-preparation.ts b/src/main/rate-limits/service/service-full-cycle-preparation.ts
index df36011ab312..55a2cc2a0622 100644
--- a/src/main/rate-limits/service/service-full-cycle-preparation.ts
+++ b/src/main/rate-limits/service/service-full-cycle-preparation.ts
@@ -5,6 +5,7 @@ import { fetchGrokRateLimits } from '../grok-fetcher'
 import { readGrokAuthSession } from '../grok-auth'
 import { fetchCursorRateLimits } from '../cursor-fetcher'
 import { readCursorAuthSession } from '../cursor-auth'
+import { fetchZcodeRateLimits } from '../zcode-usage-fetcher'
 import { fetchMiniMaxRateLimits } from '../minimax/minimax-fetcher'
 import { createHash } from 'node:crypto'
 import { fetchOpenCodeGoUsage } from '../opencode-go-usage-source-selection'
@@ -44,6 +45,7 @@ export type FetchAllCyclePrepared = {
   ]
   grokResultPromise: Promise<SettledProviderResult>
   cursorResultPromise: Promise<SettledProviderResult>
+  zcodeResultPromise: Promise<SettledProviderResult>
 }
 
 export abstract class RateLimitServiceFullCyclePreparation extends RateLimitServiceFetchPolicy {
@@ -130,7 +132,8 @@ export abstract class RateLimitServiceFullCyclePreparation extends RateLimitServ
         ? this.withFetchingStatus(null, 'minimax')
         : this.withFetchingStatus(previousState.minimax, 'minimax'),
       grok: this.withFetchingStatus(previousState.grok, 'grok'),
-      cursor: this.withFetchingStatus(previousState.cursor, 'cursor')
+      cursor: this.withFetchingStatus(previousState.cursor, 'cursor'),
+      zcode: this.withFetchingStatus(previousState.zcode, 'zcode')
     })
 
     // Why: the Cursor probe reads the macOS Keychain, so it is awaited inside the
@@ -145,6 +148,11 @@ export abstract class RateLimitServiceFullCyclePreparation extends RateLimitServ
         (reason) => ({ status: 'rejected', reason }) as const
       )
 
+    const zcodeResultPromise = fetchZcodeRateLimits({ signal }).then(
+      (value) => ({ status: 'fulfilled', value }) as const,
+      (reason) => ({ status: 'rejected', reason }) as const
+    )
+
     const missingWslCodexHome =
       codexFetchGated || codexHomePath ? null : this.getMissingWslCodexHomeResult(codexTarget)
     const grokResultPromise = fetchGrokRateLimits({
@@ -231,7 +239,8 @@ export abstract class RateLimitServiceFullCyclePreparation extends RateLimitServ
         miniMaxResult
       ],
       grokResultPromise,
-      cursorResultPromise
+      cursorResultPromise,
+      zcodeResultPromise
     }
   }
 }
diff --git a/src/main/rate-limits/service/service-polling.ts b/src/main/rate-limits/service/service-polling.ts
index e49c003cbb1d..402495080c27 100644
--- a/src/main/rate-limits/service/service-polling.ts
+++ b/src/main/rate-limits/service/service-polling.ts
@@ -79,7 +79,8 @@ export abstract class RateLimitServicePolling extends RateLimitServiceFetchQueue
       minimax: this.state.minimax,
       grok: this.state.grok,
       antigravity: this.state.antigravity,
-      cursor: this.state.cursor
+      cursor: this.state.cursor,
+      zcode: this.state.zcode
     }
     return Object.entries(byProvider).map(([provider, limits]) => ({
       provider: provider as ActiveRateLimitProvider,
diff --git a/src/main/rate-limits/service/service-state.ts b/src/main/rate-limits/service/service-state.ts
index a10bfa3f3c00..7af82c6c3135 100644
--- a/src/main/rate-limits/service/service-state.ts
+++ b/src/main/rate-limits/service/service-state.ts
@@ -32,7 +32,8 @@ export abstract class RateLimitServiceState {
     antigravity: null,
     minimax: null,
     grok: null,
-    cursor: null
+    cursor: null,
+    zcode: null
   }
   protected grokAuthConfigured = readGrokAuthSession().status === 'ok'
   // Why: the Cursor probe reads the macOS Keychain, so it cannot run synchronously
@@ -52,7 +53,8 @@ export abstract class RateLimitServiceState {
     minimax: 0,
     grok: 0,
     antigravity: 0,
-    cursor: 0
+    cursor: 0,
+    zcode: 0
   }
   // Why: consecutive failures drive exponential backoff of the fast activation-retry lane; reset on any success/unavailable result.
   protected activeFailureStreakByProvider: Record<ActiveRateLimitProvider, number> = {
@@ -64,7 +66,8 @@ export abstract class RateLimitServiceState {
     minimax: 0,
     grok: 0,
     antigravity: 0,
-    cursor: 0
+    cursor: 0,
+    zcode: 0
   }
   protected mainWindow: BrowserWindow | null = null
   protected detachWindowListeners: (() => void) | null = null
diff --git a/src/main/rate-limits/service/service-types.ts b/src/main/rate-limits/service/service-types.ts
index 9783f37f77df..a3998c13abe4 100644
--- a/src/main/rate-limits/service/service-types.ts
+++ b/src/main/rate-limits/service/service-types.ts
@@ -110,6 +110,7 @@ export type InternalRateLimitState = {
   minimax: ProviderRateLimits | null
   grok: ProviderRateLimits | null
   cursor: ProviderRateLimits | null
+  zcode: ProviderRateLimits | null
 }
 
 export function normalizePollingInterval(ms: number): number {
diff --git a/src/main/rate-limits/zcode-usage-fetcher.test.ts b/src/main/rate-limits/zcode-usage-fetcher.test.ts
new file mode 100644
index 000000000000..b587d196be0f
--- /dev/null
+++ b/src/main/rate-limits/zcode-usage-fetcher.test.ts
@@ -0,0 +1,292 @@
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { fetchZcodeRateLimits } from './zcode-usage-fetcher'
+
+let dir: string
+let configPath: string
+
+beforeEach(() => {
+  dir = mkdtempSync(join(tmpdir(), 'orca-zcode-usage-'))
+  configPath = join(dir, 'config.json')
+  vi.stubGlobal('fetch', vi.fn())
+  vi.useFakeTimers()
+  vi.setSystemTime(new Date('2026-08-12T06:00:00.000Z'))
+})
+
+afterEach(() => {
+  vi.unstubAllGlobals()
+  vi.useRealTimers()
+  rmSync(dir, { recursive: true, force: true })
+})
+
+function writeConfig(overrides: Record<string, unknown> = {}): void {
+  mkdirSync(dir, { recursive: true })
+  writeFileSync(
+    configPath,
+    JSON.stringify({
+      model: { main: 'bigmodel-coding-plan/GLM-5.2' },
+      provider: {
+        other: { options: { apiKey: 'ignored', baseURL: 'https://example.com/v1' } },
+        'bigmodel-coding-plan': {
+          options: {
+            apiKey: 'test-secret',
+            baseURL: 'https://open.bigmodel.cn/api/anthropic'
+          }
+        }
+      },
+      ...overrides
+    })
+  )
+}
+
+describe('fetchZcodeRateLimits', () => {
+  it('returns unavailable without a supported Coding Plan credential', async () => {
+    writeFileSync(configPath, JSON.stringify({ provider: {} }))
+
+    const result = await fetchZcodeRateLimits({ configPath })
+
+    expect(result).toMatchObject({ provider: 'zcode', status: 'unavailable' })
+    expect(fetch).not.toHaveBeenCalled()
+  })
+
+  it('does not infer an account from the only configured provider without a selected model', async () => {
+    writeConfig({
+      model: {},
+      provider: {
+        zai: { options: { apiKey: 'sole-account', baseURL: 'https://api.z.ai/v1' } }
+      }
+    })
+
+    const result = await fetchZcodeRateLimits({ configPath })
+
+    expect(result.status).toBe('unavailable')
+    expect(fetch).not.toHaveBeenCalled()
+  })
+
+  it('queries the matching quota endpoint and maps rolling, weekly, and MCP limits', async () => {
+    writeConfig()
+    vi.mocked(fetch).mockResolvedValue(
+      new Response(
+        JSON.stringify({
+          success: true,
+          data: {
+            level: 'max',
+            limits: [
+              {
+                type: 'TIME_LIMIT',
+                unit: 5,
+                number: 1,
+                percentage: 3,
+                nextResetTime: 1_787_000_000_000
+              },
+              {
+                type: 'TOKENS_LIMIT',
+                unit: 6,
+                number: 1,
+                percentage: 44,
+                nextResetTime: 1_786_600_000_000
+              },
+              {
+                type: 'TOKENS_LIMIT',
+                unit: 3,
+                number: 5,
+                percentage: 12,
+                nextResetTime: 1_786_500_000_000
+              }
+            ]
+          }
+        })
+      )
+    )
+
+    const result = await fetchZcodeRateLimits({ configPath })
+
+    expect(fetch).toHaveBeenCalledWith(
+      'https://open.bigmodel.cn/api/monitor/usage/quota/limit',
+      expect.objectContaining({
+        method: 'GET',
+        redirect: 'error',
+        headers: expect.objectContaining({ Authorization: 'test-secret' })
+      })
+    )
+    expect(result).toMatchObject({ provider: 'zcode', status: 'ok', planType: 'max' })
+    expect(result.session).toEqual({
+      usedPercent: 12,
+      windowMinutes: 300,
+      resetsAt: 1_786_500_000_000,
+      resetDescription: null
+    })
+    expect(result.weekly?.usedPercent).toBe(44)
+    expect(result.monthly?.usedPercent).toBe(3)
+  })
+
+  it('uses CREDIT_LIMIT counts when the reported percentage is stale', async () => {
+    writeConfig()
+    vi.mocked(fetch).mockResolvedValue(
+      new Response(
+        JSON.stringify({
+          success: true,
+          code: 200,
+          data: {
+            limits: [
+              {
+                type: 'CREDIT_LIMIT',
+                unit: 3,
+                number: 5,
+                usage: 2_000,
+                currentValue: 500,
+                remaining: 1_500,
+                percentage: 1
+              },
+              {
+                type: 'CREDIT_LIMIT',
+                unit: 6,
+                number: 1,
+                usage: 10_000,
+                remaining: 8_000,
+                percentage: 0
+              }
+            ]
+          }
+        })
+      )
+    )
+
+    const result = await fetchZcodeRateLimits({ configPath })
+
+    expect(result.status).toBe('ok')
+    expect(result.session?.usedPercent).toBe(25)
+    expect(result.weekly?.usedPercent).toBe(20)
+    expect(result.monthly).toBeNull()
+  })
+
+  it('drops an implausible five-hour reset without discarding the quota value', async () => {
+    writeConfig()
+    vi.mocked(fetch).mockResolvedValue(
+      new Response(
+        JSON.stringify({
+          success: true,
+          data: {
+            limits: [
+              {
+                type: 'CREDIT_LIMIT',
+                unit: 3,
+                number: 5,
+                percentage: 25,
+                nextResetTime: Date.now() + 10 * 60 * 60_000
+              }
+            ]
+          }
+        })
+      )
+    )
+
+    const result = await fetchZcodeRateLimits({ configPath })
+
+    expect(result.session?.usedPercent).toBe(25)
+    expect(result.session?.resetsAt).toBeNull()
+  })
+
+  it('selects the legacy string model provider when several accounts are configured', async () => {
+    writeConfig({
+      model: 'zai/GLM-5.3',
+      provider: {
+        zai: { options: { apiKey: 'selected-key', baseURL: 'https://api.z.ai/v1' } },
+        bigmodel: { options: { apiKey: 'other-key', baseURL: 'https://open.bigmodel.cn/v1' } }
+      }
+    })
+    vi.mocked(fetch).mockResolvedValue(
+      new Response(
+        JSON.stringify({
+          success: true,
+          data: { limits: [{ type: 'CREDIT_LIMIT', unit: 3, number: 5, percentage: 20 }] }
+        })
+      )
+    )
+
+    const result = await fetchZcodeRateLimits({ configPath })
+
+    expect(result.status).toBe('ok')
+    expect(fetch).toHaveBeenCalledWith(
+      'https://api.z.ai/api/monitor/usage/quota/limit',
+      expect.objectContaining({
+        headers: expect.objectContaining({ Authorization: 'selected-key' })
+      })
+    )
+  })
+
+  it('does not substitute a different account when the selected provider lacks a key', async () => {
+    writeConfig({
+      model: { main: 'unconfigured/GLM-5.3' },
+      provider: { zai: { options: { apiKey: 'other-account', baseURL: 'https://api.z.ai/v1' } } }
+    })
+
+    const result = await fetchZcodeRateLimits({ configPath })
+
+    expect(result.status).toBe('unavailable')
+    expect(fetch).not.toHaveBeenCalled()
+  })
+
+  it('rejects a nonstandard HTTPS port before sending the key', async () => {
+    writeConfig({
+      provider: { zai: { options: { apiKey: 'secret', baseURL: 'https://api.z.ai:4444/v1' } } }
+    })
+
+    const result = await fetchZcodeRateLimits({ configPath })
+
+    expect(result.status).toBe('unavailable')
+    expect(fetch).not.toHaveBeenCalled()
+  })
+
+  it('supports the Z.AI endpoint without exposing credentials in errors', async () => {
+    writeConfig({
+      model: { main: 'zai/GLM-5.2' },
+      provider: {
+        zai: { options: { apiKey: 'never-log-me', baseURL: 'https://api.z.ai/api/anthropic' } }
+      }
+    })
+    vi.mocked(fetch).mockResolvedValue(new Response('denied', { status: 401 }))
+
+    const result = await fetchZcodeRateLimits({ configPath })
+
+    expect(fetch).toHaveBeenCalledWith(
+      'https://api.z.ai/api/monitor/usage/quota/limit',
+      expect.any(Object)
+    )
+    expect(result.status).toBe('error')
+    expect(result.error).toBe('ZCode quota request failed (401)')
+    expect(JSON.stringify(result)).not.toContain('never-log-me')
+  })
+
+  it('changes the non-secret account identity when the selected key changes', async () => {
+    writeConfig()
+    vi.mocked(fetch).mockResolvedValue(new Response('denied', { status: 401 }))
+
+    const first = await fetchZcodeRateLimits({ configPath })
+    writeConfig({
+      provider: {
+        'bigmodel-coding-plan': {
+          options: { apiKey: 'new-key', baseURL: 'https://open.bigmodel.cn/api/anthropic' }
+        }
+      }
+    })
+    const second = await fetchZcodeRateLimits({ configPath })
+
+    expect(first.usageMetadata?.authProvenance).toMatch(/^[a-f0-9]{64}$/)
+    expect(second.usageMetadata?.authProvenance).not.toBe(first.usageMetadata?.authProvenance)
+    expect(JSON.stringify(first)).not.toContain('test-secret')
+    expect(JSON.stringify(second)).not.toContain('new-key')
+  })
+
+  it('rejects malformed successful responses', async () => {
+    writeConfig()
+    vi.mocked(fetch).mockResolvedValue(new Response(JSON.stringify({ success: true, data: {} })))
+
+    const result = await fetchZcodeRateLimits({ configPath })
+
+    expect(result.status).toBe('error')
+    expect(result.usageMetadata?.failureKind).toBe('parse')
+  })
+})
diff --git a/src/main/rate-limits/zcode-usage-fetcher.ts b/src/main/rate-limits/zcode-usage-fetcher.ts
new file mode 100644
index 000000000000..852def603e32
--- /dev/null
+++ b/src/main/rate-limits/zcode-usage-fetcher.ts
@@ -0,0 +1,277 @@
+import { createHmac, randomBytes } from 'node:crypto'
+import { readFileSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+import { cancelUnreadResponseBody } from '../lib/unread-response-body'
+import type { ProviderRateLimits, RateLimitWindow } from '../../shared/rate-limit-types'
+
+const API_TIMEOUT_MS = 15_000
+const SUPPORTED_HOSTS = new Set(['api.z.ai', 'open.bigmodel.cn', 'dev.bigmodel.cn'])
+const CREDENTIAL_IDENTITY_KEY = randomBytes(32)
+
+type QuotaLimit = {
+  type?: unknown
+  unit?: unknown
+  number?: unknown
+  usage?: unknown
+  currentValue?: unknown
+  remaining?: unknown
+  percentage?: unknown
+  nextResetTime?: unknown
+}
+
+type ZcodeUsageCredentials = {
+  apiKey: string
+  quotaUrl: string
+  authProvenance: string
+}
+
+// Why readers and not casts: both JSON sources are outside our control — a user-edited
+// config file and a remote response — so their shape is a guess until something checks it.
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function readRecord(value: unknown): Record<string, unknown> | null {
+  return isRecord(value) ? value : null
+}
+
+function readMainProvider(model: unknown): string | null {
+  const name = typeof model === 'string' ? model : readRecord(model)?.main
+  if (typeof name !== 'string') {
+    return null
+  }
+  const delimiter = name.indexOf('/')
+  return delimiter > 0 && delimiter < name.length - 1 ? name.slice(0, delimiter) : null
+}
+
+function unavailable(error: string): ProviderRateLimits {
+  return {
+    provider: 'zcode',
+    session: null,
+    weekly: null,
+    monthly: null,
+    updatedAt: Date.now(),
+    error,
+    status: 'unavailable',
+    usageMetadata: { source: 'web', failureKind: 'missing-credentials' }
+  }
+}
+
+function failed(
+  error: string,
+  failureKind: 'network' | 'server' | 'parse',
+  authProvenance: string
+): ProviderRateLimits {
+  return {
+    provider: 'zcode',
+    session: null,
+    weekly: null,
+    monthly: null,
+    updatedAt: Date.now(),
+    error,
+    status: 'error',
+    usageMetadata: { source: 'web', failureKind, authProvenance }
+  }
+}
+
+function readCredentials(configPath: string): ZcodeUsageCredentials | null {
+  let config: Record<string, unknown> | null
+  try {
+    config = readRecord(JSON.parse(readFileSync(configPath, 'utf8')))
+  } catch {
+    return null
+  }
+
+  if (!config) {
+    return null
+  }
+  // A quota from another configured account must never appear as the selected model's quota.
+  const mainProvider = readMainProvider(config.model)
+  if (!mainProvider) {
+    return null
+  }
+  const options = readRecord(readRecord(readRecord(config.provider)?.[mainProvider])?.options)
+  const apiKey = options?.apiKey
+  const baseURL = options?.baseURL
+  if (
+    typeof apiKey !== 'string' ||
+    !apiKey.trim() ||
+    /[\r\n]/.test(apiKey) ||
+    typeof baseURL !== 'string'
+  ) {
+    return null
+  }
+  try {
+    const parsed = new URL(baseURL)
+    if (
+      parsed.protocol !== 'https:' ||
+      !SUPPORTED_HOSTS.has(parsed.hostname) ||
+      (parsed.port !== '' && parsed.port !== '443')
+    ) {
+      return null
+    }
+    return {
+      apiKey: apiKey.trim(),
+      quotaUrl: `${parsed.origin}/api/monitor/usage/quota/limit`,
+      authProvenance: createHmac('sha256', CREDENTIAL_IDENTITY_KEY)
+        .update(JSON.stringify([mainProvider, parsed.origin, apiKey.trim()]))
+        .digest('hex')
+    }
+  } catch {
+    return null
+  }
+}
+
+function asNumber(value: unknown): number | null {
+  return typeof value === 'number' && Number.isFinite(value) ? value : null
+}
+
+function asUsedPercent(limit: QuotaLimit): number | null {
+  const total = asNumber(limit.usage)
+  if (total !== null && total > 0) {
+    const current = asNumber(limit.currentValue)
+    const remaining = asNumber(limit.remaining)
+    if (current !== null || remaining !== null) {
+      const used = current ?? total - (remaining ?? 0)
+      return Math.min(100, Math.max(0, (used / total) * 100))
+    }
+  }
+  const reported = asNumber(limit.percentage)
+  return reported === null ? null : Math.min(100, Math.max(0, reported))
+}
+
+function asResetTime(value: unknown): number | null {
+  return typeof value === 'number' && Number.isFinite(value) && value > 0 ? value : null
+}
+
+function asWindowMinutes(limit: QuotaLimit): number | null {
+  if (limit.type === 'TIME_LIMIT' && limit.unit === 5 && limit.number === 1) {
+    // Z.ai's monthly MCP marker is encoded as one minute.
+    return 30 * 24 * 60
+  }
+  const multipliers: Record<number, number> = { 1: 1440, 3: 60, 5: 1, 6: 10080 }
+  const unit = asNumber(limit.unit)
+  const count = asNumber(limit.number)
+  if (unit === null || count === null || !Number.isInteger(count) || count <= 0) {
+    return null
+  }
+  const multiplier = multipliers[unit]
+  return multiplier ? count * multiplier : null
+}
+
+function asWindow(limit: QuotaLimit | undefined): RateLimitWindow | null {
+  if (!limit) {
+    return null
+  }
+  const usedPercent = asUsedPercent(limit)
+  const windowMinutes = asWindowMinutes(limit)
+  if (usedPercent === null || windowMinutes === null) {
+    return null
+  }
+  const reset = asResetTime(limit.nextResetTime)
+  return {
+    usedPercent,
+    windowMinutes,
+    resetsAt:
+      windowMinutes === 300 && reset !== null && reset > Date.now() + 301 * 60_000 ? null : reset,
+    resetDescription: null
+  }
+}
+
+export async function fetchZcodeRateLimits(
+  options: {
+    configPath?: string
+    signal?: AbortSignal
+  } = {}
+): Promise<ProviderRateLimits> {
+  const configPath = options.configPath ?? join(homedir(), '.zcode', 'cli', 'config.json')
+  const credentials = readCredentials(configPath)
+  if (!credentials) {
+    return unavailable('ZCode Coding Plan credentials are not configured')
+  }
+
+  let response: Response
+  try {
+    const signal = options.signal
+      ? AbortSignal.any([options.signal, AbortSignal.timeout(API_TIMEOUT_MS)])
+      : AbortSignal.timeout(API_TIMEOUT_MS)
+    response = await fetch(credentials.quotaUrl, {
+      method: 'GET',
+      redirect: 'error',
+      headers: {
+        Authorization: credentials.apiKey,
+        'Accept-Language': 'en-US,en',
+        'Content-Type': 'application/json'
+      },
+      signal
+    })
+  } catch (error) {
+    return failed(
+      error instanceof Error ? error.message : 'ZCode quota request failed',
+      'network',
+      credentials.authProvenance
+    )
+  }
+
+  if (!response.ok) {
+    await cancelUnreadResponseBody(response)
+    return failed(
+      `ZCode quota request failed (${response.status})`,
+      'server',
+      credentials.authProvenance
+    )
+  }
+
+  let payload: Record<string, unknown> | null
+  try {
+    payload = readRecord(await response.json())
+  } catch {
+    return failed('Could not parse ZCode quota response', 'parse', credentials.authProvenance)
+  }
+  const data = readRecord(payload?.data)
+  const code = payload?.code
+  const reported = data?.limits
+  if (
+    payload?.success !== true ||
+    (code !== undefined && code !== 0 && code !== 200) ||
+    !Array.isArray(reported)
+  ) {
+    const msg = payload?.msg
+    const message = typeof msg === 'string' ? msg : 'Invalid ZCode quota response'
+    return failed(message, 'parse', credentials.authProvenance)
+  }
+
+  const limits = reported.filter((value): value is QuotaLimit => isRecord(value))
+  const planLimits = limits
+    .filter((limit) => limit.type === 'TOKENS_LIMIT' || limit.type === 'CREDIT_LIMIT')
+    .map(asWindow)
+    .filter((limit): limit is RateLimitWindow => limit !== null)
+    .sort((left, right) => left.windowMinutes - right.windowMinutes)
+  const session = planLimits.find((limit) => limit.windowMinutes === 300) ?? null
+  const weekly = planLimits.find((limit) => limit.windowMinutes === 10080) ?? null
+  const monthly = asWindow(limits.find((limit) => limit.type === 'TIME_LIMIT'))
+  if (!session && !weekly && !monthly) {
+    return failed(
+      'ZCode quota response contained no usable limits',
+      'parse',
+      credentials.authProvenance
+    )
+  }
+
+  return {
+    provider: 'zcode',
+    session,
+    weekly,
+    monthly,
+    planType: typeof data?.level === 'string' ? data.level : null,
+    updatedAt: Date.now(),
+    error: null,
+    status: 'ok',
+    usageMetadata: {
+      source: 'web',
+      credentialSource: configPath,
+      authProvenance: credentials.authProvenance
+    }
+  }
+}
diff --git a/src/main/remote-agent-trust-presets.test.ts b/src/main/remote-agent-trust-presets.test.ts
index d1ff9ee24ca0..4b0692bb1427 100644
--- a/src/main/remote-agent-trust-presets.test.ts
+++ b/src/main/remote-agent-trust-presets.test.ts
@@ -159,4 +159,122 @@ describe('markRemoteAgentWorkspaceTrusted', () => {
 
     expect(fsProvider.writeFile).not.toHaveBeenCalled()
   })
+
+  it.each(['codex', 'copilot'] as const)(
+    'leaves the remote %s config untouched when the read fails',
+    async (preset) => {
+      const fsProvider = makeFsProvider({
+        readFile: vi.fn(async () => {
+          throw new Error('file stream stalled')
+        })
+      })
+      mocks.getSshFilesystemProvider.mockReturnValue(fsProvider)
+
+      await expect(
+        markRemoteAgentWorkspaceTrusted({ preset, connectionId: 'ssh-1', workspacePath: '/repo' })
+      ).rejects.toThrow()
+
+      expect(fsProvider.writeFile).not.toHaveBeenCalled()
+    }
+  )
+
+  it.each(['codex', 'copilot'] as const)(
+    'leaves the remote %s config untouched when the read comes back binary',
+    async (preset) => {
+      const fsProvider = makeFsProvider({
+        readFile: vi.fn(async () => ({ content: 'AAEC', isBinary: true }))
+      })
+      mocks.getSshFilesystemProvider.mockReturnValue(fsProvider)
+
+      await expect(
+        markRemoteAgentWorkspaceTrusted({ preset, connectionId: 'ssh-1', workspacePath: '/repo' })
+      ).rejects.toThrow()
+
+      expect(fsProvider.writeFile).not.toHaveBeenCalled()
+    }
+  )
+
+  it('creates the remote Codex config when the relay reports it missing', async () => {
+    // The relay rebuilds remote errors without Node's .code; only the message survives.
+    const fsProvider = makeFsProvider({
+      readFile: vi.fn(async () => {
+        throw new Error("ENOENT: no such file or directory, stat '/home/u/.codex/config.toml'")
+      })
+    })
+    mocks.getSshFilesystemProvider.mockReturnValue(fsProvider)
+
+    await markRemoteAgentWorkspaceTrusted({
+      preset: 'codex',
+      connectionId: 'ssh-1',
+      workspacePath: '/repo'
+    })
+
+    expect(fsProvider.writeFile).toHaveBeenCalledWith(
+      '/home/u/.codex/config.toml',
+      '[projects."/real/repo"]\ntrust_level = "trusted"\n'
+    )
+  })
+})
+
+describe('remote Qoder trust', () => {
+  it('preserves settings and hooks while trusting the execution host canonical folder', async () => {
+    const original = {
+      model: 'custom',
+      hooks: { Stop: [] },
+      permissions: { trustDirectories: ['/old'], other: true }
+    }
+    const fsProvider = makeFsProvider({
+      readFile: vi.fn(async () => ({ content: JSON.stringify(original), isBinary: false }))
+    })
+    mocks.getActiveMultiplexer.mockReturnValue({
+      request: vi.fn(async () => ({ resolvedPath: '/home/remote' }))
+    })
+    mocks.getSshFilesystemProvider.mockReturnValue(fsProvider)
+    await markRemoteAgentWorkspaceTrusted({
+      preset: 'qoder',
+      connectionId: 'ssh-qoder',
+      workspacePath: '/folder'
+    })
+    expect(fsProvider.writeFile).toHaveBeenCalledWith(
+      '/home/remote/.qoder/settings.json',
+      `${JSON.stringify(
+        {
+          ...original,
+          permissions: { ...original.permissions, trustDirectories: ['/old', '/real/folder'] }
+        },
+        null,
+        2
+      )}\n`
+    )
+  })
+
+  it.each(['malformed', 'denied', 'binary', 'trusted'])(
+    'does not overwrite %s remote settings',
+    async (kind) => {
+      const fsProvider = makeFsProvider({
+        readFile: vi.fn(async () => {
+          if (kind === 'denied') {
+            throw Object.assign(new Error('denied'), { code: 'EACCES' })
+          }
+          return {
+            content:
+              kind === 'trusted'
+                ? JSON.stringify({ permissions: { trustDirectories: ['/real/folder'] } })
+                : '{broken',
+            isBinary: kind === 'binary'
+          }
+        })
+      })
+      mocks.getActiveMultiplexer.mockReturnValue({
+        request: vi.fn(async () => ({ resolvedPath: '/home/remote' }))
+      })
+      mocks.getSshFilesystemProvider.mockReturnValue(fsProvider)
+      await markRemoteAgentWorkspaceTrusted({
+        preset: 'qoder',
+        connectionId: 'ssh-qoder',
+        workspacePath: '/folder'
+      })
+      expect(fsProvider.writeFile).not.toHaveBeenCalled()
+    }
+  )
 })
diff --git a/src/main/remote-agent-trust-presets.ts b/src/main/remote-agent-trust-presets.ts
index a9ccb382c09e..021f18683cae 100644
--- a/src/main/remote-agent-trust-presets.ts
+++ b/src/main/remote-agent-trust-presets.ts
@@ -1,8 +1,10 @@
+import { markRemoteQoderWorkspaceTrusted } from './qoder/workspace-trust'
 import type { AgentTrustPreset } from './agent-trust-presets'
 import { upsertProjectTrustLevelInContent } from './codex/config-toml-trust'
 import { getActiveMultiplexer } from './ssh/ssh-target-registry'
 import { getSshFilesystemProvider } from './providers/ssh-filesystem-dispatch'
-import type { IFilesystemProvider } from './providers/types'
+import type { FileReadResult, IFilesystemProvider } from './providers/types'
+import { isENOENT } from './ipc/filesystem-path-containment'
 import {
   isWindowsAbsolutePathLike,
   normalizeRuntimePathSeparators
@@ -20,7 +22,9 @@ export async function markRemoteAgentWorkspaceTrusted(args: {
   }
 
   const workspacePath = await canonicalizeRemoteWorkspacePath(fsProvider, args.workspacePath)
-  if (args.preset === 'codex') {
+  if (args.preset === 'qoder') {
+    await markRemoteQoderWorkspaceTrusted(fsProvider, home, workspacePath)
+  } else if (args.preset === 'codex') {
     await markRemoteCodexProjectTrusted(fsProvider, home, workspacePath)
   } else if (args.preset === 'cursor') {
     await markRemoteCursorWorkspaceTrusted(fsProvider, home, workspacePath)
@@ -73,12 +77,20 @@ async function readRemoteTextFile(
   fsProvider: IFilesystemProvider,
   filePath: string
 ): Promise<string> {
+  let result: FileReadResult
   try {
-    const result = await fsProvider.readFile(filePath)
-    return result.isBinary ? '' : result.content
-  } catch {
-    return ''
+    result = await fsProvider.readFile(filePath)
+  } catch (error) {
+    // Why: only definitive absence may seed empty; a failed read would otherwise overwrite the user's config.
+    if (isENOENT(error)) {
+      return ''
+    }
+    throw error
+  }
+  if (result.isBinary) {
+    throw new Error(`Refusing to rewrite non-text remote config: ${filePath}`)
   }
+  return result.content
 }
 
 async function markRemoteCodexProjectTrusted(
diff --git a/src/main/repo-git-remote-avatar-refresh.test.ts b/src/main/repo-git-remote-avatar-refresh.test.ts
index ab5eb7ae1147..a787f5501bf3 100644
--- a/src/main/repo-git-remote-avatar-refresh.test.ts
+++ b/src/main/repo-git-remote-avatar-refresh.test.ts
@@ -231,34 +231,60 @@ it('repairs only the matching owner when repo IDs and paths collide across hosts
   expect(projectHostSetupProjectionFromRepos([local, ssh]).projects).toHaveLength(1)
 })
 
-it.each(['ssh:build', 'runtime:peer'] as const)(
-  'keeps local metadata writes scoped when a same-id %s row comes first',
-  async (hostId) => {
-    const foreignIdentity = identity('https://github.com/foreign/app.git')
-    const foreignIcon = githubAvatarIcon({ owner: 'foreign', repo: 'app' })
-    const foreign = repo({
-      executionHostId: hostId,
-      gitRemoteIdentity: foreignIdentity,
-      repoIcon: foreignIcon
-    })
-    const local = repo({ gitRemoteIdentity: identity('https://github.com/old-local/app.git') })
-    const store = storeFor([foreign, local])
-    vi.mocked(probeGitRemoteIdentity).mockImplementation(async (_path, probeHostId) => ({
-      status: 'resolved',
-      identity: probeHostId === 'local' ? identity() : foreignIdentity
-    }))
-    await refresh(store)
-    expect(foreign.gitRemoteIdentity).toBe(foreignIdentity)
-    expect(foreign.repoIcon).toBe(foreignIcon)
-    expect(local.gitRemoteIdentity).toEqual(identity())
-    expect(local.repoIcon).toEqual(githubAvatarIcon({ owner: 'org-b', repo: 'app' }))
-    expect(store.updateRepo).toHaveBeenCalledExactlyOnceWith(
-      'app',
-      { gitRemoteIdentity: identity(), repoIcon: local.repoIcon },
-      'local'
-    )
+it('keeps local metadata writes scoped when a same-id ssh:build row comes first', async () => {
+  const foreignIdentity = identity('https://github.com/foreign/app.git')
+  const foreignIcon = githubAvatarIcon({ owner: 'foreign', repo: 'app' })
+  const foreign = repo({
+    executionHostId: 'ssh:build',
+    gitRemoteIdentity: foreignIdentity,
+    repoIcon: foreignIcon
+  })
+  const local = repo({ gitRemoteIdentity: identity('https://github.com/old-local/app.git') })
+  const store = storeFor([foreign, local])
+  vi.mocked(probeGitRemoteIdentity).mockImplementation(async (_path, probeHostId) => ({
+    status: 'resolved',
+    identity: probeHostId === 'local' ? identity() : foreignIdentity
+  }))
+  await refresh(store)
+  expect(foreign.gitRemoteIdentity).toBe(foreignIdentity)
+  expect(foreign.repoIcon).toBe(foreignIcon)
+  expect(local.gitRemoteIdentity).toEqual(identity())
+  expect(local.repoIcon).toEqual(githubAvatarIcon({ owner: 'org-b', repo: 'app' }))
+  expect(store.updateRepo).toHaveBeenCalledExactlyOnceWith(
+    'app',
+    { gitRemoteIdentity: identity(), repoIcon: local.repoIcon },
+    'local'
+  )
+})
+
+// Why this row is repaired where the `ssh:build` one above is not: a `runtime:` stamp reaches this
+// store only from a client addressing *this* host, so the files are here and `local` is the only
+// host that can answer for them (`getStoredRepoExecutionHostId`). Both rows are written, each
+// addressed by its own stamp, because that is what the store matches a write against.
+it('repairs a same-id runtime-addressed row under its own stamp', async () => {
+  const runtimeRow = repo({
+    executionHostId: 'runtime:env-a',
+    gitRemoteIdentity: identity('https://github.com/old-runtime/app.git'),
+    repoIcon: githubAvatarIcon({ owner: 'old-runtime', repo: 'app' })
+  })
+  const local = repo({ gitRemoteIdentity: identity('https://github.com/old-local/app.git') })
+  const store = storeFor([runtimeRow, local])
+  vi.mocked(probeGitRemoteIdentity).mockResolvedValue({ status: 'resolved', identity: identity() })
+  await refresh(store)
+  expect(probeGitRemoteIdentity).toHaveBeenCalledWith(
+    '/workspace/app',
+    'local',
+    expect.objectContaining({ signal: expect.any(AbortSignal) })
+  )
+  const repaired = {
+    gitRemoteIdentity: identity(),
+    repoIcon: githubAvatarIcon({ owner: 'org-b', repo: 'app' })
   }
-)
+  expect(runtimeRow).toMatchObject(repaired)
+  expect(local).toMatchObject(repaired)
+  expect(store.updateRepo).toHaveBeenCalledWith('app', repaired, 'runtime:env-a')
+  expect(store.updateRepo).toHaveBeenCalledWith('app', repaired, 'local')
+})
 
 it('does not write after a pending local probe becomes peer-owned', async () => {
   let answer: ((value: GitRemoteIdentityProbe) => void) | undefined
diff --git a/src/main/repo-git-remote-identity-enrichment.test.ts b/src/main/repo-git-remote-identity-enrichment.test.ts
index 8012145fdbc7..d1e54e11de8a 100644
--- a/src/main/repo-git-remote-identity-enrichment.test.ts
+++ b/src/main/repo-git-remote-identity-enrichment.test.ts
@@ -1,4 +1,5 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
+import { getRepoExecutionHostId, type ExecutionHostId } from '../shared/execution-host'
 import type { GitRemoteIdentity } from '../shared/git-remote-identity'
 import type { Repo } from '../shared/repo-types'
 import { type GitRemoteIdentityProbe, probeGitRemoteIdentity } from './repo-git-remote-identity'
@@ -15,7 +16,11 @@ vi.mock('./repo-git-remote-identity', () => ({
 type RepoIdentityStore = {
   getRepos: () => Repo[]
   getRepo: (id: string) => Repo | undefined
-  updateRepo: (id: string, updates: Pick<Partial<Repo>, 'gitRemoteIdentity'>) => Repo | null
+  updateRepo: (
+    id: string,
+    updates: Pick<Partial<Repo>, 'gitRemoteIdentity'>,
+    hostId?: ExecutionHostId
+  ) => Repo | null
 }
 
 const remoteIdentity: GitRemoteIdentity = {
@@ -42,8 +47,13 @@ function makeStore(...repos: Repo[]): RepoIdentityStore & { updateRepo: ReturnTy
   return {
     getRepos: () => repos,
     getRepo: (id) => repos.find((candidate) => candidate.id === id),
-    updateRepo: vi.fn((id, updates) => {
-      const target = repos.find((candidate) => candidate.id === id)
+    // Mirrors the real store: `hostId` is matched against the row's own stamp, so a write
+    // addressed to the wrong host finds no row (src/main/persistence/tracking-repos).
+    updateRepo: vi.fn((id, updates, hostId) => {
+      const target = repos.find(
+        (candidate) =>
+          candidate.id === id && (!hostId || getRepoExecutionHostId(candidate) === hostId)
+      )
       if (!target) {
         return null
       }
@@ -129,7 +139,10 @@ describe('enrichMissingRepoGitRemoteIdentities', () => {
     await flushRepoGitRemoteIdentityEnrichmentForTests()
   })
 
-  it('never probes a runtime row through this client dispatch table', async () => {
+  it('never probes a runtime row that names a nested SSH target', async () => {
+    // Why: `connectionId` on a `runtime:` row names a target inside that server's namespace, so
+    // dialing it here reaches a same-named box of ours, and the same path on this machine is a
+    // different checkout. Neither host is probeable from here, so the row is skipped outright.
     vi.mocked(probeGitRemoteIdentity).mockResolvedValue({ status: 'unavailable' })
     const store = makeStore(
       makeRepo({ connectionId: 'nested-1', executionHostId: 'runtime:env-a' })
@@ -141,6 +154,30 @@ describe('enrichMissingRepoGitRemoteIdentities', () => {
     expect(store.updateRepo).not.toHaveBeenCalled()
   })
 
+  it('probes a self-addressed runtime row here and writes it back under its own stamp', async () => {
+    // Why: a bare `runtime:` stamp is how a paired client addresses a repo registered in *this*
+    // process, so its files are local. Skipping it left `gitRemoteIdentity` unset forever, which
+    // consumers read as pending. The write must carry the row's stamp, not the probe host — the
+    // store matches that argument against the stamp, so `local` would match no row.
+    vi.mocked(probeGitRemoteIdentity).mockResolvedValue(resolvedProbe)
+    const repo = makeRepo({ executionHostId: 'runtime:env-a' })
+    const store = makeStore(repo)
+
+    await sweep(store)
+
+    expect(probeGitRemoteIdentity).toHaveBeenCalledWith(
+      '/workspace/sample-app',
+      'local',
+      expect.objectContaining({ signal: expect.any(AbortSignal) })
+    )
+    expect(store.updateRepo).toHaveBeenCalledWith(
+      'repo-1',
+      { gitRemoteIdentity: remoteIdentity },
+      'runtime:env-a'
+    )
+    expect(repo.gitRemoteIdentity).toEqual(remoteIdentity)
+  })
+
   it('keeps same-path rows on two different SSH hosts from sharing one backoff', async () => {
     // Why: the location key decides coalescing and backoff. Keyed on the raw field, two rows that
     // carry only `executionHostId` collapse onto one key, so the first host being down suppresses
diff --git a/src/main/repo-git-remote-identity-enrichment.ts b/src/main/repo-git-remote-identity-enrichment.ts
index 4c81174a79bd..f1cea725efc0 100644
--- a/src/main/repo-git-remote-identity-enrichment.ts
+++ b/src/main/repo-git-remote-identity-enrichment.ts
@@ -1,6 +1,6 @@
 import {
   getRepoExecutionHostId,
-  getSshTargetIdForExecutionHost,
+  getRepoSshConnectionId,
   LOCAL_EXECUTION_HOST_ID,
   type ExecutionHostId
 } from '../shared/execution-host'
@@ -8,6 +8,7 @@ import type { Repo } from '../shared/repo-types'
 import { githubAvatarIcon, type RepoIcon } from '../shared/repo-icon'
 import { isUnresolvedSshHostAlias } from '../shared/git-remote-host-alias'
 import { getProjectProviderIdentity } from '../shared/project-host-setup-projection'
+import { getStoredRepoExecutionHostId } from './repo-execution-host'
 import { probeGitRemoteIdentity } from './repo-git-remote-identity'
 
 const NO_IDENTITY_RETRY_TTL_MS = 5 * 60 * 1000
@@ -58,12 +59,13 @@ function getRepoLocationKey(repo: Pick<Repo, 'path' | 'connectionId' | 'executio
   return `${getRepoExecutionHostId(repo)}\0${repo.path}`
 }
 
-// A peer's nested SSH targets belong to its dispatch table, never this client's.
+// A peer's nested SSH targets belong to its dispatch table, never this client's, so a `runtime:`
+// row that names one has no host here to probe. A `runtime:` stamp on its own is how a paired
+// client addresses files registered in *this* process (`getStoredRepoExecutionHostId`), so that row
+// keeps the local probe it has always had — dropping it leaves its identity permanently pending.
 function getRepoProbeHostId(repo: Repo): ExecutionHostId | null {
-  const hostId = getRepoExecutionHostId(repo)
-  return hostId === LOCAL_EXECUTION_HOST_ID || getSshTargetIdForExecutionHost(hostId)
-    ? hostId
-    : null
+  const hostId = getStoredRepoExecutionHostId(repo)
+  return hostId === LOCAL_EXECUTION_HOST_ID && getRepoSshConnectionId(repo) ? null : hostId
 }
 
 function getCurrentRepo(store: RepoIdentityStore, snapshot: Repo): Repo | undefined {
@@ -131,8 +133,7 @@ function writeIdentity(
   gitRemoteIdentity: Repo['gitRemoteIdentity']
 ): boolean {
   // A peer's repo metadata must never be repaired from a client-local probe.
-  const hostId = getRepoProbeHostId(snapshot)
-  if (!hostId) {
+  if (!getRepoProbeHostId(snapshot)) {
     return false
   }
   const current = getCurrentRepo(store, snapshot)
@@ -143,8 +144,11 @@ function writeIdentity(
   const icon = gitRemoteIdentity
     ? getAutomaticGitHubIconRefresh(current, gitRemoteIdentity)
     : undefined
+  // The row's own host, not the probe's: the store matches this argument against the row's stamp,
+  // so a `runtime:` row probed locally is only addressable here under that stamp.
+  const storeHostId = getRepoExecutionHostId(snapshot)
   const update = (updates: Pick<Partial<Repo>, 'gitRemoteIdentity' | 'repoIcon'>): Repo | null => {
-    return store.updateRepo(snapshot.id, updates, hostId)
+    return store.updateRepo(snapshot.id, updates, storeHostId)
   }
   if (icon) {
     return !!update({ ...(writeRemote ? { gitRemoteIdentity } : {}), repoIcon: icon })
diff --git a/src/main/runtime/__fixtures__/claude-dialog-trust-workspace-answered.meta.json b/src/main/runtime/__fixtures__/claude-dialog-trust-workspace-answered.meta.json
new file mode 100644
index 000000000000..ce80eebc6a7f
--- /dev/null
+++ b/src/main/runtime/__fixtures__/claude-dialog-trust-workspace-answered.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-25T21:10:00.000Z",
+  "platform": "darwin",
+  "command": ["claude"],
+  "cols": 120,
+  "rows": 40,
+  "note": "Claude Code v2.1.280, macOS arm64, first launch in an untrusted folder with an isolated CLAUDE_CONFIG_DIR (the trust answer went to a throwaway config); Down then Enter picked 'Yes, I trust this folder' and the capture ends on the idle composer; API-key auth",
+  "exitCode": null
+}
diff --git a/src/main/runtime/__fixtures__/claude-dialog-trust-workspace-answered.txt b/src/main/runtime/__fixtures__/claude-dialog-trust-workspace-answered.txt
new file mode 100644
index 000000000000..80b75267b38d
--- /dev/null
+++ b/src/main/runtime/__fixtures__/claude-dialog-trust-workspace-answered.txt
@@ -0,0 +1,21 @@
+78[?25h[?25l[?2004h[?2031h[?1004h

+────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

+Accessingworkspace:

+

+/private/tmp/claude-trust-review/proj

+

+Quicksafetycheck:Isthisaprojectyoucreatedoroneyoutrust?(Likeyourowncode,awell-knownopensource

+project,orworkfromyourteam).Ifnot,takeamomenttoreviewwhat'sinthisfolderfirst.

+

+ClaudeCode'llbeabletoread,edit,andexecutefileshere.

+

+]8;id=zaxmda;https://code.claude.com/docs/en/securitySecurity guide]8;;

+

+❯No,exit

+Yes,Itrustthisfolder

+

+Entertoconfirm·Esctocancel

+[>0q[?u(B
 No, exit
❯Yes, I trust this folder

+
+
+[>4m[<u[?1004l[?2031l[?2004l
















[?2004h[?2031h[?1004h[?1049h[?1000h[?1002h[?1003h[?1006h[?25l]0;✳ Claude Code
 ▐▛███▛█Claude Codev2.1.280
▝▜██████▀Opus 5.5 (1M context) · API Usage Billing
  ▝▝ ▝▝  /private/tmp/claude-trust-review/proj
◐ medium · /effort
────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
❯  
────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
⏸ manual mode on · ? for shortcuts · ← for agents[>0q
        
 ▐▛▛█ 
·▜██████·
~~
▗▟▛███▛█▄
▜███▘
  ▝▝ ▝▝  
 ▐ 
▝▀
        
 ▐▛▛█ 
·▜██████·
~~
▗▟▛███▛█▄
▜███▘
  ▝▝ ▝▝  
 ▐ 
▝▀

\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/claude-dialog-trust-workspace-narrow.meta.json b/src/main/runtime/__fixtures__/claude-dialog-trust-workspace-narrow.meta.json
new file mode 100644
index 000000000000..5841c7e66944
--- /dev/null
+++ b/src/main/runtime/__fixtures__/claude-dialog-trust-workspace-narrow.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-25T21:03:00.000Z",
+  "platform": "darwin",
+  "command": ["claude"],
+  "cols": 60,
+  "rows": 30,
+  "note": "Claude Code v2.1.280, macOS arm64, first launch in an untrusted folder with an isolated CLAUDE_CONFIG_DIR (no operator config touched); a narrow pane, where Claude wraps the dialog's opening question across lines; capture ends with the trust dialog owning the screen",
+  "exitCode": null
+}
diff --git a/src/main/runtime/__fixtures__/claude-dialog-trust-workspace-narrow.txt b/src/main/runtime/__fixtures__/claude-dialog-trust-workspace-narrow.txt
new file mode 100644
index 000000000000..9e15b7b1e853
--- /dev/null
+++ b/src/main/runtime/__fixtures__/claude-dialog-trust-workspace-narrow.txt
@@ -0,0 +1,21 @@
+78[?25h[?25l[?2004h[?2031h[?1004h

+────────────────────────────────────────────────────────────

+Accessingworkspace:

+

+/private/tmp/claude-trust-review/proj

+

+Quicksafetycheck:Isthisaprojectyoucreatedorone

+youtrust?(Likeyourowncode,awell-knownopensource

+project,orworkfromyourteam).Ifnot,takeamomentto

+reviewwhat'sinthisfolderfirst.

+

+ClaudeCode'llbeabletoread,edit,andexecutefiles

+here.

+

+]8;id=zaxmda;https://code.claude.com/docs/en/securitySecurity guide]8;;

+

+❯No,exit

+Yes,Itrustthisfolder

+

+Entertoconfirm·Esctocancel

+[>0q[?u
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/claude-dialog-trust-workspace.meta.json b/src/main/runtime/__fixtures__/claude-dialog-trust-workspace.meta.json
new file mode 100644
index 000000000000..ecfd36098d27
--- /dev/null
+++ b/src/main/runtime/__fixtures__/claude-dialog-trust-workspace.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-25T20:03:23.885Z",
+  "platform": "darwin",
+  "command": ["claude", "--dangerously-skip-permissions"],
+  "cols": 120,
+  "rows": 40,
+  "note": "Claude Code v2.1.280, macOS arm64, first launch in an untrusted git worktree; API-key auth; capture ends with the trust dialog owning the screen",
+  "exitCode": 129
+}
diff --git a/src/main/runtime/__fixtures__/claude-dialog-trust-workspace.txt b/src/main/runtime/__fixtures__/claude-dialog-trust-workspace.txt
new file mode 100644
index 000000000000..c8eb94c6b5c1
--- /dev/null
+++ b/src/main/runtime/__fixtures__/claude-dialog-trust-workspace.txt
@@ -0,0 +1,18 @@
+78[?25h[?25l[?2004h[?2031h[?1004h

+────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

+Accessingworkspace:

+

+/Users/xxxxxxxxxxxxx/orca/workspaces/repo/qa-untrusted-raw

+

+Quicksafetycheck:Isthisaprojectyoucreatedoroneyoutrust?(Likeyourowncode,awell-knownopensource

+project,orworkfromyourteam).Ifnot,takeamomenttoreviewwhat'sinthisfolderfirst.

+

+ClaudeCode'llbeabletoread,edit,andexecutefileshere.

+

+]8;id=zaxmda;https://code.claude.com/docs/en/securitySecurity guide]8;;

+

+❯No,exit

+Yes,Itrustthisfolder

+

+Entertoconfirm·Esctocancel

+[>0q[?u
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0-150-1-turn.meta.json b/src/main/runtime/__fixtures__/codex-0-150-1-turn.meta.json
new file mode 100644
index 000000000000..21b39d7625b3
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-150-1-turn.meta.json
@@ -0,0 +1,16 @@
+{
+  "capturedAt": "2026-09-29T01:35:32.695Z",
+  "platform": "darwin",
+  "command": [
+    "codex",
+    "-c",
+    "check_for_update_on_startup=false",
+    "--dangerously-bypass-approvals-and-sandbox",
+    "-m",
+    "gpt-5.6-sol"
+  ],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.150.1: launch, one short turn, settled idle after it. STA-8834.",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/codex-0-150-1-turn.txt b/src/main/runtime/__fixtures__/codex-0-150-1-turn.txt
new file mode 100644
index 000000000000..4d4c5dacccf0
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-150-1-turn.txt
@@ -0,0 +1,18 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h╭───────────────────────────────────────╮│ >_ OpenAI Codex (v0.150.1)            ││                                       ││ model:     loading   /model to change ││ directory: loading                    │╰───────────────────────────────────────╯  › Ask Codex to do anything   ? for shortcuts[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h╭──────────────────────────────────────────────────╮│ >_ OpenAI Codex (v0.150.1)                       ││                                                  ││ model:       loading   /model to change          ││ directory:   ~/orca-lanes/sta8834/corpus/scratch ││ permissions: YOLO mode                           │╰──────────────────────────────────────────────────╯  › Ask Codex to do anything   ? for shortcuts[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;scratch[?2026h[0 q[?25h[?2026l[?2026hgpt-5.6-sol default · ~/orca-lanes/sta8834/corpus/scratch[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠋ scratch]0;⠙ scratch[?2026hMMMMMMMMM
+╭────────────────────────────────────────────────────╮
+│ >_ OpenAI Codex (v0.150.1)                         │
+│                                                    │
+│ model:       gpt-5.6-sol medium   /model to change │
+│ directory:   ~/orca-lanes/sta8834/corpus/scratch   │
+│ permissions: YOLO mode                             │
+╰────────────────────────────────────────────────────╯
+
+  Tip: Try the Desktop app. Run 'codex app' or visit https://chatgpt.com/codex?app-landing-page=true • Booting MCP server: node_repl (0s • esc to interrupt)  › Ask Codex to do anything   gpt-5.6-sol medium · ~/orca-lanes/sta8834/corpus/scratch[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;scratch[?2026h  › Ask Codex to do anything   gpt-5.6-sol medium · ~/orca-lanes/sta8834/corpus/scratch[0 q[?25h[?2026l[?2026hMM
+
+• You have 3 usage limit resets available. Run /usage to use one.[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026hReply with the single wordOK.[0 q[?25h[?2026l[?2026hMMMM
+
+
+› Reply with the single word OK.
+Ask Codex to do anything[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠋ scratch[?2026h • Working (0s • esc to interrupt)  › Ask Codex to do anything   gpt-5.6-sol medium · ~/orca-lanes/sta8834/corpus/scratch[0 q[?25h[?2026l]0;⠙ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠹ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠸ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠼ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠴ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026hW[0 q[?25h[?2026l]0;⠦ scratch[?2026h[0 q[?25h[?2026l[?2026hWo[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠧ scratch[?2026h•Wor[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠇ scratch[?2026h•Work[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h•Worki[0 q[?25h[?2026l]0;⠏ scratch[?2026h[0 q[?25h[?2026l[?2026hWorkin[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l]0;⠋ scratch[?2026hWorking[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h•Working1[0 q[?25h[?2026l]0;⠙ scratch[?2026h[0 q[?25h[?2026l[?2026hWorking[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l]0;⠹ scratch[?2026h[0 q[?25h[?2026l[?2026hWorking[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l]0;⠸ scratch[?2026horking[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l[?2026hrking[0 q[?25h[?2026l]0;⠼ scratch[?2026h[0 q[?25h[?2026l[?2026h•king[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠴ scratch[?2026hing[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠦ scratch[?2026hng[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠧ scratch[?2026hg[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠇ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠏ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠋ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠙ scratch[?2026h2[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠹ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠸ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠼ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠴ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026hW[0 q[?25h[?2026l]0;⠦ scratch[?2026h[0 q[?25h[?2026l[?2026hWo[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠧ scratch[?2026h•Wor[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠇ scratch[?2026h•Work[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h•Worki[0 q[?25h[?2026l]0;⠏ scratch[?2026h[0 q[?25h[?2026l[?2026hWorkin[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l]0;⠋ scratch[?2026hWorking[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h•Working3[0 q[?25h[?2026l]0;⠙ scratch[?2026h[0 q[?25h[?2026l[?2026hWorking[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l]0;⠹ scratch[?2026h[0 q[?25h[?2026l[?2026hWorking[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l]0;⠸ scratch[?2026horking[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l[?2026hrking[0 q[?25h[?2026l]0;⠼ scratch[?2026h[0 q[?25h[?2026l[?2026h•king[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠴ scratch[?2026hing[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠦ scratch[?2026hng[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026hg[0 q[?25h[?2026l]0;⠧ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠇ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠏ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠋ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠙ scratch[?2026h4[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠹ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠸ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠼ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠴ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026hW[0 q[?25h[?2026l]0;⠦ scratch[?2026h[0 q[?25h[?2026l[?2026hWo[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠧ scratch[?2026h•Wor[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠇ scratch[?2026h•Work[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026hWorki[0 q[?25h[?2026l]0;⠏ scratch[?2026h•[0 q[?25h[?2026l[?2026hWorkin[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l]0;⠋ scratch[?2026hWorking[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l]0;⠙ scratch[?2026hWorking5[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h•Working[0 q[?25h[?2026l]0;⠹ scratch[?2026h[0 q[?25h[?2026l[?2026hWorking[0 q[?25h[?2026l[?2026h•[0 q[?25h[?2026l]0;⠸ scratch[?2026horking[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h•rking[0 q[?25h[?2026l]0;⠼ scratch[?2026h[0 q[?25h[?2026l[?2026h•king[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠴ scratch[?2026h[0 q[?25h[?2026l[?2026h•ing[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠦ scratch[?2026hng[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026hg[0 q[?25h[?2026l]0;⠧ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠇ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠏ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠋ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h6[0 q[?25h[?2026l]0;⠙ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠹ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠸ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠼ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠴ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026hW[0 q[?25h[?2026l]0;⠦ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026hWo[0 q[?25h[?2026l]0;⠧ scratch[?2026h•[0 q[?25h[?2026l[?2026hWor[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠇ scratch[?2026h•Work[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l[?2026hMM
+
+• OK  › Ask Codex to do anything   gpt-5.6-sol medium · ~/orca-lanes/sta8834/corpus/scratch[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;⠏ scratch[?2026h[0 q[?25h[?2026l[?2026h[0 q[?25h[?2026l]0;scratch[?2026h[0 q[?25h[?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0-155-1-timed-turn.meta.json b/src/main/runtime/__fixtures__/codex-0-155-1-timed-turn.meta.json
new file mode 100644
index 000000000000..ca6db1a32546
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-155-1-timed-turn.meta.json
@@ -0,0 +1,14 @@
+{
+  "capturedAt": "2026-09-29T01:44:01.149Z",
+  "platform": "darwin",
+  "command": [
+    "codex",
+    "-c",
+    "check_for_update_on_startup=false",
+    "--dangerously-bypass-approvals-and-sandbox"
+  ],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.155.1, default tui animations. One tool-using turn sent once the composer had been quiet 2.5s; cut 20s past the last busy frame, before exit. <name>.timing.json holds each PTY chunk as [ms since spawn, UTF-16 length] and the prompt-submit time. STA-8834.",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/codex-0-155-1-timed-turn.timing.json b/src/main/runtime/__fixtures__/codex-0-155-1-timed-turn.timing.json
new file mode 100644
index 000000000000..8258e899ce04
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-155-1-timed-turn.timing.json
@@ -0,0 +1 @@
+{"promptSentAtMs":4478.2,"chunks":[[63.6,8],[63.7,47],[164.3,17],[164.5,730],[164.6,8],[164.6,78],[164.8,78],[165.4,78],[171.5,78],[172.5,78],[174.7,17],[174.8,794],[174.9,132],[175.2,79],[175.7,79],[197.3,79],[197.5,79],[203.1,79],[205.8,71],[205.8,8],[206,71],[206.2,87],[636.8,79],[641.5,79],[642.3,12],[642.6,202],[642.8,71],[642.9,8],[671.8,79],[728.1,14],[749.8,31],[749.8,767],[749.9,506],[750.9,77],[792.1,12],[793.2,77],[995.7,72],[995.7,178],[1340.2,77],[3899.1,153],[4478.5,104],[4478.5,94],[4478.6,160],[4483.3,77],[4488.7,77],[4510.6,14],[4511.7,18],[4511.9,509],[4545.3,14],[4545.4,77],[4579.4,77],[4613,77],[4646.2,14],[4646.3,77],[4679.2,77],[4712.4,77],[4721.2,77],[4732.5,77],[4741.8,77],[4755.1,14],[4755.2,77],[4756.4,30],[4763.7,132],[4798.3,77],[4831.8,77],[4865.3,30],[4865.4,77],[4898,77],[4931.8,77],[4965.6,30],[4965.7,77],[4998.3,77],[5032,77],[5066.6,30],[5066.7,77],[5100.6,111],[5134.7,77],[5168.8,30],[5168.8,77],[5202.5,111],[5235.8,77],[5269.8,30],[5269.9,77],[5304,111],[5338,77],[5372.6,30],[5372.7,111],[5406.4,77],[5440.5,77],[5474.5,30],[5474.6,111],[5508.1,77],[5542.1,30],[5542.2,82],[5542.2,8],[5576.7,111],[5610.9,77],[5645.1,30],[5645.3,77],[5678.4,111],[5712.5,77],[5745.7,30],[5745.9,77],[5779,111],[5812.7,77],[5845.4,30],[5845.6,111],[5879.6,77],[5913.5,77],[5945.9,30],[5946,111],[5980.4,77],[6014.5,77],[6048.6,30],[6048.7,77],[6082,77],[6116.5,77],[6150.1,30],[6150.2,77],[6183.5,77],[6217.5,77],[6251.7,30],[6252.1,77],[6285.1,77],[6318.6,77],[6352.7,30],[6352.9,77],[6386.1,77],[6425.6,77],[6459.8,30],[6460,77],[6493.6,77],[6527.3,90],[6561.3,30],[6561.4,77],[6594.4,77],[6627.4,77],[6661,30],[6661.2,77],[6695,77],[6729.1,77],[6763.1,30],[6763.2,77],[6797.2,77],[6831.3,77],[6865.4,30],[6865.5,77],[6898.9,77],[6933.1,77],[6967.1,30],[6967.2,77],[7001.2,77],[7035.3,77],[7068.9,30],[7069,77],[7102.2,111],[7136.6,77],[7169.9,30],[7170.3,77],[7204.3,111],[7238.4,77],[7272.3,30],[7272.3,77],[7305.3,111],[7339,77],[7373,30],[7373.2,111],[7407.1,77],[7441.1,77],[7474.7,30],[7474.9,111],[7508.5,77],[7542.6,30],[7542.8,90],[7576.9,111],[7610,77],[7644.6,30],[7644.7,77],[7679,111],[7712.9,77],[7746.6,30],[7746.8,77],[7779.2,111],[7813,77],[7847,30],[7847.1,111],[7881.2,77],[7915.3,77],[7949.3,30],[7949.4,111],[7982.8,77],[8016.8,77],[8050.1,30],[8050.1,29],[8050.1,48],[8083.8,77],[8117.9,77],[8151.5,30],[8151.5,77],[8185.7,77],[8219.4,77],[8252.2,30],[8252.3,77],[8286.4,77],[8320.4,77],[8354.4,30],[8354.5,77],[8388,77],[8422,77],[8456,30],[8456,77],[8490.2,77],[8524.5,90],[8558.4,30],[8558.6,77],[8592.8,77],[8626.1,77],[8659.8,30],[8660.1,77],[8694.5,77],[8727.9,77],[8761.8,30],[8762,77],[8796.8,77],[8830.8,77],[8864.1,30],[8864.3,77],[8897.6,77],[8931.7,77],[8965.2,30],[8965.3,77],[8999.4,77],[9032.6,77],[9066.7,30],[9066.8,77],[9101.1,111],[9135.1,77],[9169,30],[9169.2,77],[9202.6,111],[9236.7,77],[9270.7,30],[9270.8,77],[9305,111],[9339.3,77],[9373.7,30],[9373.9,111],[9407.8,77],[9441,77],[9474.5,30],[9474.6,111],[9507,77],[9540.9,90],[9574.4,30],[9574.5,111],[9608.6,77],[9642.6,30],[9642.7,77],[9676.7,111],[9710.9,77],[9744.2,30],[9744.2,77],[9778.4,111],[9812.5,77],[9846.5,30],[9846.6,111],[9880.7,77],[9914.9,77],[9948.5,30],[9948.6,111],[9982.6,77],[10015.9,77],[10049.2,30],[10049.2,77],[10082.8,69],[10082.8,8],[10116.3,77],[10149.7,30],[10149.8,77],[10183.7,77],[10218.2,77],[10251,30],[10251.1,77],[10284.1,77],[10317.7,77],[10352.3,30],[10352.3,69],[10352.4,8],[10386.5,77],[10420.5,77],[10454.8,30],[10455.1,77],[10488.6,77],[10521.9,90],[10555.8,30],[10556.1,77],[10590.5,77],[10624.7,77],[10658.7,30],[10658.9,77],[10692.4,69],[10692.5,8],[10726.2,77],[10760.1,30],[10760.2,77],[10794.4,77],[10828.5,77],[10861.6,30],[10861.8,77],[10894.7,77],[10928.6,77],[10962.6,30],[10962.8,77],[10995.4,77],[11029.6,77],[11063.4,30],[11063.5,77],[11097.3,111],[11131.7,77],[11165,30],[11165.1,77],[11199.2,111],[11233.1,77],[11266.3,30],[11266.4,77],[11299.6,111],[11333.2,77],[11367.2,30],[11367.3,77],[11401.5,111],[11435.5,77],[11469.4,30],[11469.5,111],[11503.6,77],[11537.7,90],[11571.7,30],[11571.8,111],[11606,77],[11639.6,77],[11672.8,30],[11672.9,111],[11695.8,77],[11730.1,77],[11764.1,30],[11764.2,111],[11798.4,77],[11832.2,77],[11864.9,30],[11865,111],[11898.6,77],[11932.3,77],[11966.4,30],[11966.5,97],[11966.5,14],[12000.2,77],[12033.5,77],[12067.5,30],[12067.6,77],[12101.2,77],[12135.4,69],[12135.5,8],[12168.8,30],[12168.9,69],[12169,8],[12203.1,77],[12237.2,77],[12270.6,30],[12270.8,63],[12270.8,14],[12304.9,77],[12339.7,77],[12373.6,30],[12373.8,77],[12406.9,77],[12441.1,77],[12475.2,30],[12475.4,77],[12509.1,77],[12543.1,30],[12543.4,90],[12577.4,77],[12611.4,77],[12644.6,30],[12644.8,77],[12678.6,77],[12712.7,77],[12746.3,30],[12746.4,77],[12779.6,77],[12812.5,77],[12846.1,30],[12846.2,77],[12880.3,77],[12914.3,77],[12948.3,30],[12948.4,77],[12982.7,77],[13016.9,77],[13049.9,30],[13050.1,77],[13083.6,111],[13117.1,77],[13151.1,30],[13151.2,77],[13184.2,111],[13217.4,77],[13250.7,30],[13250.8,77],[13284.9,111],[13301.8,77],[13336.6,77],[13370.1,30],[13370.1,111],[13403.8,77],[13438.1,77],[13472,30],[13472.2,111],[13505.2,77],[13539.6,90],[13572.7,30],[13572.8,111],[13607.6,77],[13641.8,77],[13675.5,30],[13675.6,111],[13709.7,77],[13742.2,30],[13742.3,63],[13742.3,14],[13776.5,111],[13810.3,77],[13844.3,30],[13844.6,77],[13877.7,111],[13911.7,77],[13944.4,30],[13944.6,111],[13978,77],[14012.1,77],[14046.6,30],[14046.8,77],[14080.9,77],[14115,77],[14148.5,30],[14148.7,63],[14148.7,14],[14182.8,77],[14217,77],[14250.6,30],[14250.7,77],[14284.9,77],[14319,77],[14353.5,30],[14353.5,77],[14387.7,77],[14421.9,77],[14456,30],[14456.2,77],[14490.3,77],[14523.9,119],[14558.3,30],[14558.3,77],[14592.5,77],[14626.6,77],[14660,30],[14660,77],[14694.1,77],[14728,77],[14761.6,30],[14761.6,69],[14761.7,8],[14771.2,73],[14771.3,192],[14805.5,77],[14839.7,77],[14873.5,30],[14873.7,77],[14907.8,77],[14941.4,77],[14974,30],[14974.1,77],[15007.3,77],[15040.5,77],[15074.5,30],[15074.6,77],[15106.9,111],[15140.6,77],[15172.8,30],[15172.9,77],[15180,14],[15182.8,41],[15183,177],[15192.7,77],[15226.5,77],[15260.2,41],[15260.2,77],[15294.3,111],[15328.5,77],[15361.7,41],[15361.9,63],[15362,14],[15395.9,111],[15429.6,77],[15463.6,41],[15463.8,77],[15496.8,111],[15531.1,90],[15565,41],[15565.2,111],[15599.4,77],[15632.9,77],[15666.2,41],[15666.4,111],[15700.3,77],[15734.5,77],[15768.5,41],[15768.6,111],[15802.6,77],[15835.4,77],[15869.2,41],[15869.3,111],[15903.2,77],[15935.8,77],[15969.9,41],[15970,111],[16003.5,77],[16037.5,77],[16071.6,41],[16071.8,77],[16105.7,77],[16138.7,77],[16172.9,41],[16172.9,77],[16207,77],[16241.4,77],[16275.4,41],[16275.4,69],[16275.5,8],[16309.6,77],[16343.6,41],[16343.8,77],[16377.8,77],[16411.9,77],[16445.8,41],[16445.9,77],[16480.1,77],[16513.3,90],[16547.1,41],[16547.2,77],[16580.9,77],[16615.2,77],[16648.6,41],[16648.7,77],[16682,77],[16715.1,77],[16748.6,41],[16748.7,77],[16781.9,77],[16816.1,77],[16850.1,41],[16850.2,77],[16884.8,77],[16919,77],[16952.9,41],[16953,77],[16987.7,77],[17021.1,77],[17054.5,41],[17054.5,69],[17054.6,8],[17088.6,103],[17088.7,8],[17122.5,77],[17155.9,41],[17156,77],[17190.1,111],[17224.3,77],[17258.3,41],[17258.4,69],[17258.4,8],[17292.3,111],[17326.3,77],[17360.7,41],[17360.8,77],[17395.7,111],[17429.9,77],[17463.9,41],[17464.1,77],[17498,111],[17531.3,90],[17564.9,41],[17565.1,111],[17599.1,77],[17633.1,77],[17666.7,41],[17666.7,111],[17700.9,77],[17734.8,77],[17768.8,41],[17768.9,103],[17769,8],[17803,77],[17837.1,77],[17871.1,41],[17871.1,111],[17904.8,77],[17939,77],[17973.1,41],[17973.2,111],[18006.8,77],[18040.7,77],[18074.5,41],[18074.5,63],[18074.5,14],[18108.6,77],[18142,41],[18142.1,77],[18175.5,77],[18209.1,69],[18209.2,8],[18242.3,41],[18242.4,77],[18276.6,77],[18310.2,77],[18344.2,41],[18344.3,77],[18378.4,77],[18412.6,77],[18446.6,41],[18446.7,77],[18479.9,69],[18479.9,8],[18513.5,90],[18546.9,41],[18547,77],[18576.3,77],[18609.3,77],[18642.9,41],[18643,77],[18677.1,77],[18711.2,77],[18744.2,41],[18744.3,77],[18777.3,77],[18787.6,18],[18787.8,759],[18797.1,77],[18813.8,77],[18823.3,77],[18856.4,41],[18856.4,77],[18890.3,77],[18924.4,77],[18958.4,41],[18958.5,77],[18992.4,77],[19026.6,77],[19060.6,41],[19060.7,77],[19094.9,111],[19129,77],[19162.9,41],[19163,69],[19163,8],[19197.1,111],[19231.5,77],[19264.7,41],[19264.9,69],[19265,8],[19299.2,111],[19332.9,77],[19366.9,41],[19367.1,29],[19367.1,48],[19401.3,111],[19435.4,77],[19469.5,41],[19469.6,63],[19469.6,48],[19503.8,77],[19537,90],[19571,41],[19571.1,111],[19605.3,77],[19639.3,77],[19672.5,41],[19672.5,111],[19716,77],[19746.1,41],[19746.1,77],[19779.7,111],[19813.8,77],[19847.7,41],[19847.7,97],[19847.8,14],[19881.8,77],[19916,77],[19950.1,41],[19950.1,103],[19950.2,8],[19984.4,77],[20018.7,77],[20052.7,41],[20052.9,77],[20087.2,77],[20121.5,77],[20155.6,41],[20155.8,69],[20155.8,8],[20189,77],[20223.5,77],[20257.4,41],[20257.6,63],[20257.6,14],[20291.2,69],[20291.3,8],[20324.7,77],[20358.1,41],[20358.2,77],[20392.4,77],[20426.5,77],[20460.6,41],[20460.7,77],[20494.8,77],[20528.9,90],[20562.9,41],[20563,77],[20597.2,77],[20630.5,77],[20664.6,41],[20664.7,77],[20699.5,77],[20733.6,77],[20766.9,41],[20767,77],[20800.2,77],[20834.6,77],[20867.8,41],[20868,77],[20901.6,77],[20935.6,77],[20968.8,41],[20969,29],[20969.1,48],[21003.3,69],[21003.4,8],[21037.4,77],[21071.4,41],[21071.6,69],[21071.6,8],[21105.8,111],[21139.9,77],[21174,41],[21174.1,77],[21207.6,111],[21218.4,77],[21251.8,41],[21251.9,77],[21286.2,111],[21320.1,77],[21354.2,41],[21354.3,63],[21354.3,14],[21388.7,111],[21422.8,77],[21456.1,41],[21456.2,77],[21490.3,111],[21524.4,90],[21558.6,41],[21558.9,77],[21593.2,111],[21627.5,77],[21661.5,41],[21661.6,63],[21661.6,48],[21695.9,77],[21730,77],[21763.4,41],[21763.4,103],[21763.5,8],[21797.6,77],[21831.4,77],[21865.4,41],[21865.4,97],[21865.4,14],[21899.6,77],[21933.7,77],[21967.8,41],[21967.8,111],[22002,77],[22036.1,77],[22070.2,41],[22070.2,29],[22070.3,48],[22104.2,77],[22138.5,77],[22171.9,41],[22172.1,77],[22206.3,77],[22240.6,77],[22273.1,41],[22273.2,77],[22307.3,77],[22341.1,77],[22375,41],[22375.1,69],[22375.1,8],[22409.4,77],[22443.5,41],[22443.6,63],[22443.7,14],[22477.9,77],[22511.2,90],[22544.7,41],[22544.8,77],[22579,77],[22612.5,77],[22646.4,41],[22646.5,77],[22679.8,77],[22713.9,77],[22748.5,41],[22748.6,69],[22748.6,8],[22782.7,77],[22817,77],[22850.2,41],[22850.3,63],[22850.3,14],[22883.7,77],[22894.2,18],[22894.2,117],[22894.3,673],[22894.3,8],[22928.5,77],[22962,41],[22962,77],[22996.5,77],[23030.5,77],[23064.6,41],[23064.7,29],[23064.7,48],[23098.2,111],[23133,77],[23166.4,41],[23166.5,77],[23193.2,18],[23193.2,65],[23193.3,561],[23193.3,8],[23295.2,41],[23397.5,41],[23499.7,41],[23601.5,41],[23703.1,41],[23805.7,41],[23908.4,41],[24010.6,41],[24048,41],[24048.1,245],[24057.7,77],[24083.3,77],[24083.7,39],[24092.3,73],[24092.4,108],[24092.4,14]]}
diff --git a/src/main/runtime/__fixtures__/codex-0-155-1-timed-turn.txt b/src/main/runtime/__fixtures__/codex-0-155-1-timed-turn.txt
new file mode 100644
index 000000000000..6064224f724b
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-155-1-timed-turn.txt
@@ -0,0 +1,26 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h╭───────────────────────────────────────╮│ >_ OpenAI Codex (v0.155.1)            ││                                       ││ model:     loading   /model to change ││ directory: loading                    │╰───────────────────────────────────────╯  › Ask Codex to do anything   ? for shortcuts[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h╭──────────────────────────────────────────────────╮│ >_ OpenAI Codex (v0.155.1)                       ││                                                  ││ model:       loading   /model to change          ││ directory:   ~/orca-lanes/sta8834/corpus/scratch ││ permissions: YOLO mode                           │╰──────────────────────────────────────────────────╯  › Ask Codex to do anything   ? for shortcuts[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l]0;scratch[?2026hgpt-6-sol default · ~/orca-lanes/sta8834/corpus/scratch[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l[?2026h[0 q╭[?25h[?2026l]0;⠋ scratch]0;⠙ scratch[?2026hMMMMMMMMM
+╭──────────────────────────────────────────────────╮
+│ >_ OpenAI Codex (v0.155.1)                       │
+│                                                  │
+│ model:       gpt-6-sol medium   /model to change │
+│ directory:   ~/orca-lanes/sta8834/corpus/scratch │
+│ permissions: YOLO mode                           │
+╰──────────────────────────────────────────────────╯
+
+  Tip: New Use /fast to enable our fastest inference with increased plan usage.  › Ask Codex to do anything   gpt-6-sol medium · ~/orca-lanes/sta8834/corpus/scratch[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;scratch[?2026h[0 q [?25h[?2026l[?2026hMM
+
+• You have 3 usage limit resets available. Run /usage to use one.[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026hList the files here and summarizein2bullets.[0 q [?25h[?2026l[?2026hMMMM
+
+
+› List the files here and summarize in 2 bullets.
+Ask Codex to do anything[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ scratch[?2026h • Working (0s • esc to interrupt)  › Ask Codex to do anything   gpt-6-sol medium · ~/orca-lanes/sta8834/corpus/scratch[0 q [?25h[?2026l]0;⠏ scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ scratch[?2026h[0 q [?25h[?2026l]0;⠙ renaming... ⠙ | scratch[?2026h · renaming... ⠙[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ renaming... ⠹ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ renaming... ⠸ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ renaming... ⠼ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ renaming... ⠴ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ renaming... ⠦ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ renaming... ⠧ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ renaming... ⠇ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠏ renaming... ⠏ | scratch[?2026h1[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ renaming... ⠋ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ renaming... ⠙ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ renaming... ⠹ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ renaming... ⠸ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ renaming... ⠼ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ renaming... ⠴ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ renaming... ⠦ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ renaming... ⠧ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ renaming... ⠇ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h2[0 q [?25h[?2026l]0;⠏ renaming... ⠏ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ renaming... ⠋ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ renaming... ⠙ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ renaming... ⠹ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ renaming... ⠸ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ renaming... ⠼ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ renaming... ⠴ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ renaming... ⠦ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ renaming... ⠧ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ renaming... ⠇ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠏ renaming... ⠏ | scratch[?2026h3[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ renaming... ⠋ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ renaming... ⠙ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ renaming... ⠹ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ renaming... ⠸ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ renaming... ⠼ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ renaming... ⠴ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ renaming... ⠦ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ renaming... ⠧ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ renaming... ⠇ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h4[0 q [?25h[?2026l]0;⠏ renaming... ⠏ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ renaming... ⠋ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ renaming... ⠙ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ renaming... ⠹ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ renaming... ⠸ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ renaming... ⠼ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ renaming... ⠴ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ renaming... ⠦ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ renaming... ⠧ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ renaming... ⠇ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h5[0 q [?25h[?2026l]0;⠏ renaming... ⠏ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ renaming... ⠋ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ renaming... ⠙ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ renaming... ⠹ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ renaming... ⠸ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ renaming... ⠼ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ renaming... ⠴ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ renaming... ⠦ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ renaming... ⠧ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ renaming... ⠇ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h6[0 q [?25h[?2026l]0;⠏ renaming... ⠏ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ renaming... ⠋ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ renaming... ⠙ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ renaming... ⠹ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ renaming... ⠸ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ renaming... ⠼ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ renaming... ⠴ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ renaming... ⠦ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ renaming... ⠧ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ renaming... ⠇ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h7[0 q [?25h[?2026l]0;⠏ renaming... ⠏ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ renaming... ⠋ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ renaming... ⠙ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ renaming... ⠹ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ renaming... ⠸ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ renaming... ⠼ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ renaming... ⠴ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ renaming... ⠦ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ renaming... ⠧ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ renaming... ⠇ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠏ renaming... ⠏ | scratch[?2026h8[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ renaming... ⠋ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ renaming... ⠙ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ renaming... ⠹ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ renaming... ⠸ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ renaming... ⠼ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ renaming... ⠴ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ renaming... ⠦ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ renaming... ⠧ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ renaming... ⠇ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h9[0 q [?25h[?2026l]0;⠏ renaming... ⠏ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ renaming... ⠋ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ renaming... ⠙ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ renaming... ⠹ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ renaming... ⠸ | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ renaming... ⠼ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ renaming... ⠴ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ renaming... ⠦ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ renaming... ⠧ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ renaming... ⠇ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h10s • esc to interupt)[0 q [?25h[?2026l]0;⠏ renaming... ⠏ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ renaming... ⠋ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ renaming... ⠙ | scratch[?2026h[0 q [?25h[?2026l[?2026hMM
+
+• I’ll inspect the current directory and summarize what’s there in two bullets.[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ renaming... ⠹ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ renaming... ⠸ | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ renaming... ⠼ | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ renaming... ⠴ | scratch[?2026h[0 q [?25h[?2026l]0;⠴ scratch]0;⠴ List and summarize files | scratch[?2026h•List ad summarize files[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h1[0 q [?25h[?2026l]0;⠏ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h2[0 q [?25h[?2026l]0;⠏ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h3[0 q [?25h[?2026l]0;⠏ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h4[0 q [?25h[?2026l]0;⠏ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h • Explored  └ List rg --files -g '*' -g '!*/.git/*' • Working (14s • esc to interrupt)  › Ask Codex to do anything   gpt-6-sol medium · ~/orca-lanes/sta8834/corpus/scratch · List and summarize files[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h5[0 q [?25h[?2026l]0;⠏ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h6[0 q [?25h[?2026l]0;⠏ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h7[0 q [?25h[?2026l]0;⠏ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ List and summarize files | scratch[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠦ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠧ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠇ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h8[0 q [?25h[?2026l]0;⠏ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠋ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠙ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠹ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026hMMM
+
+• Explored
+  └ List rg --files -g '*' -g '!*/.git/*' • Working (18s • esc to interrupt)  › Ask Codex to do anything   gpt-6-sol medium · ~/orca-lanes/sta8834/corpus/scratch · List and summarize files[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠸ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠼ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026h•[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;⠴ List and summarize files | scratch[?2026h[0 q [?25h[?2026l[?2026hMM
+
+• - README.md and notes.txt are the two working files.  › Ask Codex to do anything   gpt-6-sol medium · ~/orca-lanes/sta8834/corpus/scratch · List and summarize files[0 q [?25h[?2026l]0;⠦ List and summarize files | scratch]0;⠧ List and summarize files | scratch]0;⠇ List and summarize files | scratch]0;⠏ List and summarize files | scratch]0;⠋ List and summarize files | scratch]0;⠙ List and summarize files | scratch]0;⠹ List and summarize files | scratch]0;⠸ List and summarize files | scratch]0;⠼ List and summarize files | scratch[?2026hM
+  - A .git/ directory is present, containing repository metadata and history.[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l[?2026h[0 q [?25h[?2026l]0;List and summarize files | scratch[?2026hMM
+
+  done 9:43 PM[0 q [?25h[?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0-157-1-timed-sleep-turn.meta.json b/src/main/runtime/__fixtures__/codex-0-157-1-timed-sleep-turn.meta.json
new file mode 100644
index 000000000000..ea7309f786de
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-157-1-timed-sleep-turn.meta.json
@@ -0,0 +1,17 @@
+{
+  "capturedAt": "2026-09-29T04:07:03.525Z",
+  "platform": "darwin",
+  "command": [
+    "codex",
+    "--no-daemon",
+    "-c",
+    "check_for_update_on_startup=false",
+    "--dangerously-bypass-approvals-and-sandbox",
+    "-c",
+    "tui.fullscreen_transcript=true"
+  ],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.157.1, default tui animations, fullscreen transcript (the 0.157 default). One turn running `sleep 25`, sent once the composer had been quiet 3s; cut 6s past the last busy frame, before exit. <name>.timing.json holds each PTY chunk as [ms since spawn, UTF-16 length] and the prompt-submit time.",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/codex-0-157-1-timed-sleep-turn.timing.json b/src/main/runtime/__fixtures__/codex-0-157-1-timed-sleep-turn.timing.json
new file mode 100644
index 000000000000..1617fedd5fc7
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-157-1-timed-sleep-turn.timing.json
@@ -0,0 +1 @@
+{"promptSentAtMs":5158.6,"chunks":[[78.3,55],[329.8,80],[329.9,9],[330.2,14],[330.2,552],[330.3,43],[330.5,43],[330.9,43],[332.1,43],[333.8,14],[333.8,408],[333.9,43],[334.4,43],[341,43],[341.3,43],[341.6,43],[353.9,43],[873.7,43],[873.8,43],[874,43],[874.3,35],[874.3,8],[874.5,43],[895.6,43],[900.8,43],[902.2,12],[902.6,43],[903.1,14],[903.2,465],[912.4,43],[942.2,35],[942.3,8],[1007.7,14],[1042.8,287],[1042.9,8],[1043.9,43],[1078.5,12],[1080,35],[1080.1,8],[1297.3,43],[1341.1,43],[4357.1,43],[4357.2,87],[4357.4,43],[4357.5,43],[4357.6,43],[4357.7,43],[4357.8,43],[4357.9,43],[4358,43],[4358.1,43],[4358.2,43],[4358.4,43],[4358.5,43],[4358.6,43],[4358.7,43],[4358.8,43],[4358.9,43],[4359,43],[4359.1,43],[4359.2,43],[4359.3,43],[4359.4,43],[4359.7,86],[4359.7,35],[4359.7,8],[4359.8,43],[4359.9,43],[4360,43],[4360.2,43],[4360.3,43],[4360.4,43],[4360.5,43],[4360.6,43],[4360.7,43],[4360.8,43],[4360.9,43],[4361,43],[4361.1,43],[4361.2,43],[4361.3,43],[4361.4,43],[4361.5,43],[4361.6,43],[4361.7,43],[4361.8,43],[4361.9,43],[4362,43],[4362.1,43],[4362.2,43],[4362.4,43],[4362.5,43],[4362.6,43],[4362.7,43],[4362.9,43],[4363,43],[4363.1,43],[4363.2,43],[4363.3,43],[4363.4,43],[4363.5,43],[4363.7,43],[4363.8,43],[4363.9,43],[4364,43],[4364.1,43],[4364.2,43],[4364.3,43],[4364.4,43],[4364.5,43],[4364.6,43],[4364.7,43],[4364.9,43],[4388.8,177],[4388.8,8],[5158.9,44],[5159.3,14],[5159.4,320],[5163.8,43],[5172,43],[5188,14],[5189.3,163],[5189.5,8],[5222.5,14],[5222.7,43],[5256.2,43],[5291.7,43],[5325.2,14],[5325.3,43],[5359,43],[5392.5,43],[5419,14],[5419.3,35],[5419.3,8],[5441.1,43],[5450.8,35],[5450.9,8],[5472.1,43],[5473.6,18],[5482.2,89],[5516.7,18],[5516.9,35],[5516.9,8],[5550,43],[5585.2,43],[5619.9,18],[5620.1,35],[5620.1,8],[5655.6,35],[5655.7,8],[5689.8,43],[5724.5,18],[5724.6,43],[5759.6,43],[5793,83],[5827.1,18],[5827.2,43],[5860.5,83],[5895.6,43],[5930.6,18],[5930.8,43],[5964.5,83],[5999.7,43],[6034.4,18],[6034.5,43],[6068,75],[6068.1,8],[6103.8,18],[6104,43],[6139,43],[6171.6,83],[6204.5,18],[6204.7,54],[6204.7,8],[6237.7,83],[6272.7,43],[6306.9,18],[6307.1,43],[6341.3,83],[6375,43],[6409.9,18],[6410.1,43],[6444,75],[6444,8],[6478.6,43],[6512.1,18],[6512.3,43],[6546.8,83],[6581.9,43],[6614.2,18],[6614.3,43],[6649.8,83],[6685.6,43],[6719.9,18],[6720.1,43],[6756.1,43],[6791.2,43],[6826.2,18],[6826.3,35],[6826.4,8],[6852.3,43],[6885.3,43],[6918.4,18],[6918.6,35],[6918.6,8],[6951.1,43],[6985.6,43],[7020.6,18],[7020.7,43],[7054.8,43],[7089.5,43],[7123.1,18],[7123.2,43],[7158.4,43],[7194,62],[7229.1,18],[7229.2,43],[7264.3,43],[7299.8,43],[7342.4,18],[7342.7,43],[7376.8,43],[7409.4,18],[7410,43],[7443.7,43],[7478.8,43],[7512.2,18],[7512.4,43],[7547.7,43],[7581.5,43],[7592.2,43],[7626.3,18],[7626.5,43],[7660.1,43],[7696.8,43],[7733.1,18],[7733.3,43],[7766.6,83],[7800.9,43],[7812.7,18],[7812.8,43],[7846.2,43],[7881,83],[7914.4,18],[7914.6,35],[7914.6,8],[7949.1,43],[7983.5,83],[8019.1,61],[8052,83],[8085.7,43],[8119,18],[8119.2,43],[8153.4,83],[8190.7,62],[8222.1,18],[8222.3,43],[8256,83],[8288.6,43],[8321.8,18],[8321.9,43],[8355,83],[8389.2,43],[8422.9,18],[8423.2,43],[8456.5,83],[8489.9,43],[8522.1,18],[8522.2,43],[8560.2,83],[8593.7,43],[8629.1,101],[8663.2,43],[8698.2,43],[8732.2,18],[8732.3,43],[8766.6,43],[8800.7,43],[8834.1,18],[8834.3,35],[8834.3,8],[8868.1,43],[8901.7,43],[8941.9,18],[8942.1,35],[8942.1,8],[8989.7,43],[9038.5,18],[9039,43],[9076.5,43],[9099.3,43],[9134.4,18],[9134.6,43],[9148.5,35],[9148.6,8],[9181.7,43],[9215.8,18],[9215.9,54],[9215.9,8],[9249.3,43],[9285.3,43],[9303,142],[9339.3,43],[9372,43],[9406.7,18],[9406.8,43],[9441.1,43],[9478.8,43],[9514.6,18],[9514.7,43],[9548.5,43],[9583.9,43],[9628.8,18],[9629,35],[9629,8],[9662.2,43],[9702.5,61],[9738.2,43],[9773.7,83],[9808,18],[9808.2,35],[9808.2,8],[9844.1,43],[9879.8,83],[9916.4,18],[9916.7,43],[9952.3,83],[9989.8,43],[10039.3,18],[10042.2,43],[10077.3,83],[10110.8,18],[10111,43],[10148.1,83],[10183.3,43],[10226.6,18],[10227,62],[10281.4,83],[10314.8,18],[10315,43],[10349,83],[10381.7,43],[10428.5,18],[10428.6,69],[10428.7,14],[10464.4,43],[10500.6,43],[10557.6,18],[10557.7,83],[10591.7,43],[10626.4,101],[10666.4,43],[10700.1,43],[10744.3,18],[10744.5,43],[10781.1,43],[10813.2,18],[10813.4,35],[10813.4,8],[10847.1,43],[10955.4,18],[10955.5,35],[10955.6,8],[11018.5,18],[11018.7,43],[11052.1,43],[11085.1,43],[11118.1,18],[11118.2,43],[11153.8,43],[11186.2,43],[11220.4,18],[11220.6,62],[11255,43],[11289,43],[11322.2,18],[11322.9,43],[11356.2,43],[11389.7,43],[11423.4,18],[11423.6,43],[11457.7,43],[11491.8,43],[11525.6,18],[11525.7,35],[11525.8,8],[11558.4,43],[11591.8,43],[11652.2,18],[11652.4,43],[11695.6,43],[11729.1,18],[11729.3,43],[11789.3,83],[11845.3,18],[11845.6,43],[11882,83],[11918.7,18],[11918.9,43],[11951.6,83],[11987.3,43],[12038.6,18],[12038.9,43],[12076.5,83],[12109,18],[12109.2,43],[12154.6,83],[12195.6,54],[12195.7,8],[12230.6,18],[12230.9,43],[12263.8,83],[12309.3,61],[12343.1,83],[12378.3,43],[12421.6,18],[12422,43],[12457,83],[12492.6,43],[12535.3,18],[12538.6,83],[12596,43],[12631.3,101],[12726.4,18],[12727.1,43],[12831.3,18],[12831.5,43],[12866,43],[12900.1,43],[12935.5,18],[12936.1,43],[12969.6,43],[13008.6,18],[13008.8,43],[13042.5,43],[13078,43],[13112.9,18],[13113.1,43],[13147.7,43],[13181.9,43],[13226.9,18],[13227.1,62],[13303.6,18],[13303.9,72],[13304,8],[13304.4,35],[13304.4,8],[13304.5,14],[13307.2,34],[13366.5,96],[13447.3,77],[13483.8,43],[13518.6,34],[13518.8,43],[13567.2,43],[13632.6,34],[13632.8,43],[13673.3,43],[13710,34],[13710.2,35],[13710.2,8],[13746.5,43],[13786.5,83],[13821.1,34],[13821.3,43],[13856.8,83],[13891.2,43],[13939.3,77],[14044.1,34],[14044.3,83],[14096.1,75],[14096.3,8],[14131.5,34],[14131.7,43],[14215.6,34],[14215.7,14],[14215.8,99],[14262.3,83],[14320.3,34],[14320.7,35],[14320.7,8],[14404.6,34],[14404.8,83],[14490.4,83],[14523.5,34],[14523.7,75],[14523.7,8],[14556.9,43],[14601.9,34],[14602.1,43],[14656.3,83],[14700.4,43],[14743.3,34],[14743.8,43],[14800.1,43],[14854.5,34],[14854.6,43],[14897.5,43],[14932,34],[14932.2,43],[14977.6,43],[15021.9,77],[15081.3,43],[15115.7,34],[15116.1,43],[15152.2,43],[15187,43],[15241,34],[15241.1,183],[15295.3,43],[15376.1,34],[15377.8,43],[15431.7,34],[15431.8,43],[15478.1,43],[15518.5,77],[15553.5,43],[15623.3,77],[15689.1,43],[15720.5,77],[15754.9,43],[15795.5,83],[15828.8,34],[15828.9,43],[15863.3,83],[15898,43],[15940.9,34],[15941,43],[15985.1,83],[16031.2,34],[16031.3,43],[16065.5,83],[16108.9,34],[16109.1,43],[16196.9,113],[16231.8,77],[16269.9,83],[16311.1,34],[16311.2,43],[16390.2,83],[16423.6,34],[16423.8,43],[16459.2,75],[16459.3,8],[16497.1,43],[16561.2,34],[16561.5,83],[16607.1,34],[16607.3,43],[16663.9,83],[16698.5,43],[16742.7,34],[16743,43],[16815.7,34],[16815.9,43],[16852.1,43],[16886.1,43],[16966.2,34],[16966.4,43],[17002.4,34],[17002.6,35],[17002.7,8],[17035.8,43],[17073.9,43],[17107.4,77],[17152.4,43],[17187.9,43],[17235.6,96],[17320.3,34],[17320.5,43],[17365.5,43],[17405.9,34],[17412.1,43],[17491.8,43],[17528.8,34],[17529,43],[17569.5,43],[17634.6,34],[17634.8,43],[17671.9,43],[17715.6,34],[17715.8,43],[17750.7,43],[17793.2,83],[17825.6,34],[17825.8,43],[17864.4,83],[17902.4,43],[17934.9,34],[17936.1,43],[18011.4,34],[18011.6,69],[18011.6,14],[18045.4,43],[18078.8,83],[18114.2,34],[18114.4,43],[18153.8,83],[18186.1,43],[18220.3,34],[18220.5,54],[18220.6,8],[18256.6,83],[18315.2,34],[18315.3,43],[18349.2,83],[18394.5,43],[18428.3,34],[18428.5,75],[18428.5,8],[18463.6,43],[18497.1,43],[18531.3,34],[18531.4,83],[18566.3,43],[18612.3,34],[18613.2,43],[18647.6,69],[18648,14],[18681.3,43],[18717.6,34],[18717.7,43],[18752.8,43],[18787.1,43],[18821.9,77],[18885.1,43],[18955.7,34],[18955.8,43],[19003.4,34],[19003.5,43],[19051.9,43],[19092.8,43],[19125.7,34],[19125.9,35],[19125.9,8],[19171,43],[19219.5,34],[19219.7,54],[19219.7,8],[19284.6,43],[19328.3,77],[19374.3,43],[19411.8,77],[19450.3,43],[19484.5,43],[19540.6,77],[19578.3,43],[19623.8,34],[19624.1,43],[19660.9,43],[19696.3,43],[19783.5,34],[19783.7,75],[19783.7,8],[19851.9,34],[19852.2,43],[19888.5,83],[19922.5,34],[19922.7,43],[19957.9,83],[19991.9,43],[20026.9,34],[20027.1,43],[20063.2,83],[20103,34],[20103.2,35],[20103.2,8],[20137.4,43],[20187.5,83],[20228.8,34],[20229,48],[20229,14],[20263.8,83],[20297.7,43],[20331.7,34],[20331.8,35],[20331.8,8],[20376.6,83],[20410.5,34],[20411.2,43],[20514.6,34],[20514.6,83],[20548.4,83],[20583.5,43],[20617.4,34],[20617.6,35],[20617.6,8],[20652.3,83],[20685.6,43],[20721.4,34],[20721.5,43],[20755.3,43],[20790,43],[20824.7,34],[20824.8,43],[20859.2,43],[20895.5,43],[20929.5,63],[20929.5,14],[20996.6,43],[21034,34],[21034.1,35],[21034.2,8],[21075.3,43],[21109.5,34],[21109.6,43],[21162.4,43],[21227.6,34],[21227.8,48],[21227.8,14],[21261.7,43],[21308.9,34],[21309.2,43],[21355.4,43],[21390.9,43],[21434,77],[21472.7,43],[21518.5,34],[21518.7,43],[21555.5,43],[21593.7,43],[21629.7,34],[21629.8,43],[21663.4,43],[21698,43],[21734.8,77],[21767.9,83],[21801.5,43],[21840.7,34],[21840.8,43],[21876.3,83],[21909.9,34],[21910.1,43],[21947.1,43],[21983.8,83],[22020.6,34],[22020.7,43],[22055,83],[22107.6,34],[22107.8,43],[22172.6,83],[22208,34],[22208.1,54],[22208.1,8],[22246.2,83],[22280.1,43],[22319.4,34],[22319.7,43],[22352.8,83],[22409.7,34],[22409.9,35],[22409.9,8],[22486.2,83],[22523.8,34],[22524,83],[22577.4,43],[22619.1,34],[22620.2,83],[22656.4,43],[22692,43],[22725.4,34],[22725.5,43],[22760,43],[22803.6,34],[22803.6,35],[22803.7,8],[22840.5,43],[22875.7,43],[22914.5,34],[22914.7,43],[22958.6,43],[23011.3,77],[23084.5,43],[23119.3,34],[23119.5,43],[23185.9,43],[23221.9,34],[23222.2,62],[23278.6,43],[23333.3,77],[23369.3,43],[23402.6,34],[23402.8,43],[23436.3,43],[23511.4,34],[23511.6,43],[23557.8,43],[23601,43],[23636,34],[23636.2,35],[23636.2,8],[23674.7,43],[23708.7,34],[23709.8,43],[23755.4,43],[23800.4,83],[23835.7,77],[23875.7,83],[23920.4,34],[23920.5,35],[23920.6,8],[23956.8,75],[23956.9,8],[24001,43],[24047,34],[24047.2,83],[24083.5,43],[24173.7,34],[24173.9,83],[24236.4,34],[24236.6,54],[24236.6,8],[24282.1,83],[24325.6,34],[24325.8,43],[24372.6,83],[24405.5,34],[24405.7,43],[24464.3,83],[24500.2,43],[24554.2,34],[24554.3,83],[24588.7,43],[24624.2,34],[24624.3,83],[24681.9,43],[24727.4,34],[24727.5,43],[24788.3,43],[24825.1,77],[24858.3,43],[24931.7,34],[24931.8,43],[24967.4,43],[25015.5,77],[25054,43],[25097.6,43],[25151.3,34],[25151.7,43],[25185.2,43],[25228,34],[25229,63],[25262.3,43],[25295.6,43],[25380.4,34],[25381,43],[25414.4,34],[25414.6,43],[25513.1,34],[25513.5,43],[25554,43],[25587.5,43],[25623.6,34],[25623.8,43],[25658.6,43],[25699.8,43],[25733.3,34],[25733.5,43],[25775.4,83],[25819.7,34],[25820.4,43],[25854.5,43],[25927.8,34],[25927.8,83],[25964.1,83],[26004.8,34],[26005.1,43],[26040.1,43],[26076.4,83],[26162,34],[26162.2,83],[26202.4,34],[26203,62],[26270.5,83],[26319.7,77],[26361.5,83],[26407.5,34],[26407.7,43],[26498.6,83],[26532.2,34],[26532.4,69],[26532.4,14],[26609,34],[26609.2,43],[26645.4,14],[26645.4,69],[26679.5,43],[26714.6,34],[26714.9,43],[26772.1,43],[26805.3,34],[26805.3,43],[26846.1,43],[26880.9,43],[26914.1,34],[26914.2,43],[27022.1,34],[27022.3,43],[27057.8,43],[27092.1,43],[27127.2,34],[27127.5,43],[27161.3,43],[27196.1,62],[27232.1,77],[27266.6,43],[27299.9,43],[27333.3,34],[27333.5,35],[27333.5,8],[27368.9,43],[27401.6,43],[27435.8,34],[27435.9,43],[27468.8,43],[27503.7,34],[27503.9,43],[27538.5,43],[27572.8,43],[27607.4,34],[27607.6,43],[27642.7,43],[27677.8,43],[27714.2,77],[27747,43],[27781.5,83],[27815.5,77],[27849.6,43],[27888.4,83],[27924.6,34],[27924.8,35],[27924.9,8],[27963.3,83],[27997,43],[28031.5,34],[28031.8,43],[28066.7,83],[28099.7,43],[28134.2,34],[28134.5,43],[28169.1,83],[28201.5,62],[28247.2,117],[28285.5,43],[28319.5,77],[28353.9,83],[28388.8,43],[28431.6,117],[28468.8,43],[28501.3,43],[28536.2,34],[28536.4,69],[28536.5,14],[28570.5,43],[28604.8,34],[28605,35],[28605,8],[28642.3,83],[28677.6,43],[28726.6,34],[28726.8,43],[28780.2,43],[28815.5,34],[28815.6,35],[28815.7,8],[28851.1,43],[28885.1,43],[28919.2,34],[28919.4,43],[28963.8,43],[28998.6,43],[29053.3,34],[29053.5,35],[29053.5,8],[29092.1,43],[29125.7,34],[29125.8,43],[29164,43],[29198.9,62],[29235.1,34],[29235.3,43],[29275.2,43],[29310.7,77],[29348.4,43],[29382.1,43],[29475.5,34],[29475.7,43],[29514.2,34],[29514.4,43],[29549.6,43],[29584.5,43],[29628.1,34],[29628.3,43],[29664.5,43],[29728.6,34],[29728.9,43],[29765.5,83],[29832.9,77],[29867,83],[29921.5,34],[29921.7,43],[29966.7,83],[30002.5,34],[30002.7,43],[30036.8,43],[30071.6,83],[30122.8,77],[30156.8,83],[30191.6,62],[30225.7,34],[30225.8,43],[30276.2,75],[30276.2,8],[30364.4,34],[30364.5,69],[30364.6,14],[30406.1,77],[30449.9,83],[30495.3,43],[30530.4,34],[30530.6,83],[30566.3,43],[30611.4,34],[30611.6,43],[30646.5,83],[30740,34],[30740.3,43],[30775.4,43],[30810.2,34],[30810.3,43],[30845.9,35],[30846,8],[30880.5,43],[30917.6,34],[30918.1,43],[30952.4,43],[30986,43],[31020.9,34],[31021.2,35],[31021.2,8],[31054.8,43],[31089.8,43],[31124.8,34],[31125.2,43],[31158.6,43],[31193.5,62],[31228.3,34],[31228.6,43],[31274.5,43],[31308.1,34],[31308.2,35],[31308.2,8],[31343.5,43],[31378.4,43],[31413.4,34],[31413.7,35],[31413.7,8],[31447.4,43],[31482.6,43],[31517.6,34],[31517.8,43],[31553,43],[31587.2,43],[31622.3,34],[31622.6,35],[31622.6,8],[31658,43],[31691,43],[31726,34],[31726.2,35],[31726.2,8],[31761.1,83],[31796.3,43],[31830.8,34],[31831,35],[31831,8],[31866.4,75],[31866.5,8],[31901.6,43],[31936.4,34],[31936.5,43],[31971.6,83],[32006.5,34],[32006.7,43],[32041.1,43],[32074.6,83],[32109.5,34],[32109.7,43],[32143.6,75],[32143.7,8],[32178.9,43],[32212.8,34],[32213,62],[32247.2,83],[32280.5,43],[32315.5,34],[32315.7,43],[32350.8,83],[32385.9,43],[32420.4,34],[32420.6,43],[32453.7,75],[32453.8,8],[32489.1,43],[32522.3,34],[32522.5,35],[32522.5,8],[32557.7,83],[32592.1,43],[32627.1,34],[32627.4,75],[32627.4,8],[32662.5,43],[32697.7,43],[32731.3,34],[32731.5,43],[32766.6,43],[32801.9,34],[32802,43],[32835.6,43],[32870.8,43],[32905.8,34],[32906,43],[32941.1,43],[32976.3,43],[33009.8,34],[33010.1,43],[33045.2,43],[33080.4,43],[33115.9,34],[33116,43],[33151.3,43],[33186.5,43],[33221.4,34],[33221.5,54],[33221.5,8],[33256.2,43],[33289.3,43],[33324.3,34],[33324.5,43],[33359.4,43],[33394.2,43],[33429.1,34],[33429.3,43],[33464.5,43],[33499.6,43],[33534.1,34],[33534.2,43],[33569.5,43],[33602.9,34],[33603,43],[33638.3,43],[33671.5,43],[33706.5,34],[33706.6,43],[33739.9,43],[33773.7,83],[33807.9,34],[33808.1,43],[33843.3,43],[33878.4,83],[33913.4,34],[33913.5,43],[33948.6,43],[33983.7,83],[34017.5,34],[34017.6,43],[34052.2,75],[34052.2,8],[34086.6,43],[34121.6,34],[34121.7,43],[34156.9,83],[34190.2,62],[34229.1,34],[34229.4,14],[34229.4,195],[34231,43],[34254.1,83],[34264.1,43],[34298.8,43],[34333.8,34],[34333.9,75],[34333.9,8],[34369.1,43],[34403.7,34],[34403.8,35],[34403.9,8],[34437.1,75],[34437.1,8],[34470.8,43],[34505.7,34],[34505.9,43],[34539.9,83],[34573,43],[34608.2,34],[34608.4,43],[34642.5,83],[34677.6,43],[34710.7,34],[34710.9,43],[34745.9,43],[34781,43],[34815.5,34],[34815.6,43],[34849.6,43],[34883.4,43],[34917.5,34],[34917.6,43],[34952.9,43],[34987.3,43],[35021.1,34],[35021.3,43],[35056.4,43],[35074.9,102],[35074.9,8],[35148.7,34],[35148.9,43],[35166.4,35],[35166.4,8],[35172.4,43],[35190.3,32],[35190.5,14],[35190.5,271],[35201.3,180]]}
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0-157-1-timed-sleep-turn.txt b/src/main/runtime/__fixtures__/codex-0-157-1-timed-sleep-turn.txt
new file mode 100644
index 000000000000..e151336f4216
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-157-1-timed-sleep-turn.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭───────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.1)            ││                                       ││ model:     loading   /model to change ││ directory: loading                    │╰───────────────────────────────────────╯›Ask Codex to do anything?forshortcuts[0 q╭[?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l───────────╮           │           │  loading  /model to change          │  ~/orca-lanes/sta8834/corpus/scratch ││ permissions: YOLO mode                           │╰──────────────────────────────────────────────────╯[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;scratch[?2026h[?25h[?2026l[?2026h[?25lTip:Visitthe]8;;https://community.openai.com/c/codex/37Codex community forum]8;;(]8;;https://community.openai.com/c/codex/37https://community.openai.com/c/codex/37]8;;).GPT-6-Sol default·~/orca-lanes/sta8834/corpus/scratch[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ scratch[?2026h[?25lGPT-6-Sol medium  /model tochangemdim · ~/orca-lanes/sta834/corpus/scratch[?25h[?2026l[?2026h[?25h[?2026l]0;scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25lRun the shell command `sleep25`andthenreplywithexactly:FIRSTDONE[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l› Runtheshellcommand`sleep25`andthenreplywithexactly:FIRSTDONEAsk Codex to do anything?forshortcuts[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ scratch[?2026h[?25l•Working(0s • esc to interrupt)[?25h[?2026l]0;⠸ scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25l·⠴[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25l1[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l2[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25l3[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25l4[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25l · 1 background terminal running · /ps to view · /stop to close[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25l5[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25l6[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25l7[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25l•[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25l8[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25l⠼[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ scratch]0;⠼ Run sleep command | scratch[?2026h[?25lRun sleep command[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l•9[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l10s • esc to interupt) · 1 background terminal runing · /ps to view · /stop to close[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•1[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l2[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l3[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l4[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l5[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l6[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l7[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l8[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l9[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l20[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l1[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l2[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25l3[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l4[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25l5[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l6[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l7[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l8[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25l9[?25h[?2026l]0;⠸ Run sleep command | scratch[?2026h[?25l•Ransleep 25  └ (no output)[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ Run sleep command | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l• FIRSTDONE [?25h[?2026l]0;⠹ Run sleep command | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;Run sleep command | scratch[?2026h[?25lTip:Whengoalsareenabled,use/goaltosetorinspecttheobjectiveforalong-runningtask.[?25h[?2026l[?2026h[?25l  12:06 AM                                                                                                              [?25h[?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0-157-1-update-dialog.meta.json b/src/main/runtime/__fixtures__/codex-0-157-1-update-dialog.meta.json
new file mode 100644
index 000000000000..f43deccb9669
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-157-1-update-dialog.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-29T01:41:43.328Z",
+  "platform": "darwin",
+  "command": ["codex", "--no-daemon", "--dangerously-bypass-approvals-and-sandbox"],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.157.1: launch with the update check on; the update dialog owns the screen. STA-8834.",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/codex-0-157-1-update-dialog.txt b/src/main/runtime/__fixtures__/codex-0-157-1-update-dialog.txt
new file mode 100644
index 000000000000..4bd327737350
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-157-1-update-dialog.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭───────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.1)            ││                                       ││ model:     loading   /model to change ││ directory: loading                    │╰───────────────────────────────────────╯›Ask Codex to do anything?forshortcuts[0 q╭[?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l───────────╮           │           │  loading  /model to change          │  ~/orca-lanes/sta8834/corpus/scratch ││ permissions: YOLO mode                           │╰──────────────────────────────────────────────────╯[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l   Updat available · 0.157.1→0.158.0  Releasenotes:]8;;https://github.com/openai/codex/releases/latesthttps://github.com/openai/codex/releases/latest]8;; › 1. Update now (runs `npm install -g @openai/codex`)                                                                     2. Skip  3. Skip until next versionenter continue · esc skip [?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0-158-0-approval.meta.json b/src/main/runtime/__fixtures__/codex-0-158-0-approval.meta.json
new file mode 100644
index 000000000000..a333bd294738
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-158-0-approval.meta.json
@@ -0,0 +1,18 @@
+{
+  "capturedAt": "2026-09-29T01:43:13.919Z",
+  "platform": "darwin",
+  "command": [
+    "codex",
+    "--no-daemon",
+    "-c",
+    "check_for_update_on_startup=false",
+    "-a",
+    "on-request",
+    "-s",
+    "read-only"
+  ],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.158.0: read-only sandbox with on-request approvals; a command approval dialog owns the screen at the end. STA-8834.",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/codex-0-158-0-approval.txt b/src/main/runtime/__fixtures__/codex-0-158-0-approval.txt
new file mode 100644
index 000000000000..925a5165fc5e
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-158-0-approval.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l>_ OpenAI Codex (v0.158.0)loadingAll right. What have you got?⣀⣤⣤⣤⣀⣀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣦⣤⣤⣤⣤⣤⣤⡀⢀⣾⣿⣿⠿⠋⠉⠉⢉⣭⣿⣿⣿⣿⣿⠿⣿⣿⣿⣿⣷⣄⣀⣾⣿⣿⠃⣀⣴⣾⣿⣿⡿⠟⠋⣀⡀⠈⠙⢿⣿⣿⣧⣀⣶⣿⣿⣿⣿⡇⢸⣿⣿⡿⠛⠉⢀⣠⣴⣿⣿⣿⣷⣦⣀⠈⢻⣿⣿⡇⣰⣿⣿⡿⢿⣿⣿⡇⢸⣿⣿⢀⣤⣶⣿⣿⣿⠟⠛⠻⣿⣿⣿⣿⣮⣿⣿⡷⢰⣿⣿⡟⠁⢸⣿⣿⡇⢸⣿⣿⣿⣿⠿⠿⣿⣿⣿⣦⣄⡀⠈⠛⠿⣿⣿⣿⣧⡀⣾⣿⣿⠃⢸⣿⣿⡇⢸⣿⣿⠋⠁⠈⠙⢻⣿⣿⣿⣶⣤⡀⠹⢿⣿⣷⡄⢸⣿⣿⣇⠸⣿⣿⣷⣦⣼⣿⣿⢸⣿⣿⠻⢿⣿⣿⡇⠘⣿⣿⣿⠈⢿⣿⣿⣦⡀⠈⠛⠿⣿⣿⣿⣿⣄⡀⢀⣠⣼⣿⣿⣿⣿⡇⣿⣿⣿⠇⢻⣿⣿⣿⣷⣦⣀⠈⠙⠻⣿⣿⣿⣶⣶⣿⣿⣿⣿⣿⣿⣿⡇⣠⣿⣿⣿⢸⣿⣿⡿⢿⣿⣿⣿⣦⣠⣴⣿⣿⣿⡿⠟⠋⢸⣿⣿⣿⣿⣷⣴⣿⣿⣿⠃⠘⣿⣿⣷⠈⠛⢿⣿⣿⣿⠿⠋⠉⣠⣴⣿⣿⣿⣿⣿⣿⣿⣿⠟⠁⠻⣿⣿⣿⣤⣀⠈⠉⢀⣤⣶⣿⣿⣿⠿⠟⠁⣰⣿⣿⡟⠋⠁⠈⠿⣿⣿⣿⣿⣶⣾⣿⣿⣿⣿⠟⠋⠁⣠⣼⣿⣿⡟⠙⠛⠛⠛⠻⠛⢿⣿⣿⣿⣿⣷⣾⣿⣿⣿⡿⠏⠈⠙⠛⠿⠿⠿⠿⠛⠉›Ask Codex to do anything?forshortcuts[0 q [?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l~/orca-lanes/sta8834/corpus/scratch[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;scratch[?2026h[?25lGPT-6-Sol default·~/orca-lanes/sta8834/corpus/scratch[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ scratch]0;⠙ scratch[?2026h[?25lmdim · ~/orca-lanes/sta834/corpus/scratch[?25h[?2026l[?2026h[?25h[?2026l]0;scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25lRun `touch approved.txt`.[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l› Run`touchapproved.txt`.Ask Codex to do anything?forshortcuts[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ scratch[?2026h[?25l•Working(0s • esc to interrupt)[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ scratch[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25l·⠙[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25l1[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25l2[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25l3[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25l4[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25l5[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25l6[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25l7[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l8[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25l9[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25l• I [?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l’ll[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25lcreate[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25l⠴[?25h[?2026l[?2026h[?25lthe[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25l⠦[?25h[?2026l[?2026h[?25lfile[?25h[?2026l[?2026h[?25linthecurrent[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25l⠧[?25h[?2026l[?2026h[?25lworkspace;[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25l⠇[?25h[?2026l[?2026h[?25lthis[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25lrequires[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25l⠋[?25h[?2026l[?2026h[?25lwrite[?25h[?2026l[?2026h[?25laccess[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25l⠙[?25h[?2026l[?2026h[?25lbeyond[?25h[?2026l[?2026h[?25lthe[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25l⠹[?25h[?2026l[?2026h[?25lread-only[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25lsandbox.[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25l⠼[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25l⠴[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25l⠦[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25l⠧[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25l⠇[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25l⠏[?25h[?2026l[?2026h[?25l•Working(11s • esc to interrupt)[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25l2[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25l3[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;[ . ] Action Required | ⠸ | scratch[?2026h[?25l•Runningtouch approved.txtWould you like to run the following command?Environment:localReason:May I create approved.txt in the current workspace as requested?$touch approved.txt › 1. Yes, proceed (y)                                                                                                    2. Yes, and don't ask againforcommandsthatstartwith`touchapproved.txt`(p)3.No,andtellCodexwhattododifferently(esc)Press enter to confirm or esc to cancel                                                                               [?2026l]0;[ . ] Action Required | ⠼ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠴ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠦ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠧ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠇ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠏ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠋ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠙ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠹ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠸ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠼ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠴ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠦ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠧ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠇ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠏ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠋ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠙ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠹ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠸ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠼ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠴ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠦ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠧ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠇ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠏ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠋ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠙ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠹ | scratch]0;[ ! ] Action Required | ⠸ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠼ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠴ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠦ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠧ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠇ | scratch[?2026h[?2026l]0;[ ! ] Action Required | ⠏ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠋ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠙ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠹ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠸ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠼ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠴ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠦ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠧ | scratch[?2026h[?2026l]0;[ . ] Action Required | ⠇ | scratch[?2026h[?2026l]0;[ . ] Action Required | scratch]0;[ . ] Action Required | Create approved.txt | scratch[?2026h[?2026l]0;[ ! ] Action Required | Create approved.txt | scratch]0;[ . ] Action Required | Create approved.txt | scratch]0;[ ! ] Action Required | Create approved.txt | scratch]0;[ . ] Action Required | Create approved.txt | scratch]0;[ ! ] Action Required | Create approved.txt | scratch]0;[ . ] Action Required | Create approved.txt | scratch]0;[ ! ] Action Required | Create approved.txt | scratch]0;[ . ] Action Required | Create approved.txt | scratch]0;[ ! ] Action Required | Create approved.txt | scratch]0;[ . ] Action Required | Create approved.txt | scratch]0;[ ! ] Action Required | Create approved.txt | scratch]0;[ . ] Action Required | Create approved.txt | scratch]0;[ ! ] Action Required | Create approved.txt | scratch
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0-158-0-timed-turn.meta.json b/src/main/runtime/__fixtures__/codex-0-158-0-timed-turn.meta.json
new file mode 100644
index 000000000000..2c3defda30a3
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-158-0-timed-turn.meta.json
@@ -0,0 +1,15 @@
+{
+  "capturedAt": "2026-09-29T01:46:36.717Z",
+  "platform": "darwin",
+  "command": [
+    "codex",
+    "--no-daemon",
+    "-c",
+    "check_for_update_on_startup=false",
+    "--dangerously-bypass-approvals-and-sandbox"
+  ],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.158.0, default tui animations. One tool-using turn sent once the composer had been quiet 2.5s; cut 20s past the last busy frame, before exit. <name>.timing.json holds each PTY chunk as [ms since spawn, UTF-16 length] and the prompt-submit time. STA-8834.",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/codex-0-158-0-timed-turn.timing.json b/src/main/runtime/__fixtures__/codex-0-158-0-timed-turn.timing.json
new file mode 100644
index 000000000000..02745d043e1d
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-158-0-timed-turn.timing.json
@@ -0,0 +1 @@
+{"promptSentAtMs":7226.9,"chunks":[[70.2,28],[70.4,27],[321.3,80],[321.5,9],[324.7,14],[324.8,578],[325.8,494],[327,43],[329.1,43],[331.5,43],[333.5,43],[335.5,43],[340.4,216],[340.5,8],[342.3,43],[344,43],[346,43],[372.5,43],[374.1,43],[385.8,43],[1330.3,43],[1332.2,35],[1332.2,8],[1334.4,43],[1336.3,43],[1338.5,43],[1340.5,43],[2820.3,43],[2829.5,43],[2831.2,12],[2833.5,43],[2835.6,169],[2835.7,8],[2842.6,43],[2866,43],[2922.5,14],[2944.6,14],[2946.2,14],[2946.2,180],[2947.8,43],[2949.3,43],[3006.8,12],[3009.4,43],[3941,43],[4089.1,43],[6627.2,43],[6627.3,377],[6627.3,14],[6627.4,35],[6627.4,8],[6627.6,43],[6627.7,43],[6627.8,43],[6627.9,43],[6628,43],[6628.2,43],[6628.3,43],[6628.4,35],[6628.4,8],[6628.5,35],[6628.5,8],[6628.6,43],[6628.7,43],[6628.9,43],[6629,43],[6629.1,43],[6629.2,43],[6629.3,43],[6629.4,35],[6629.4,8],[6629.5,43],[6629.7,43],[6629.8,43],[6629.9,35],[6629.9,8],[6630,35],[6630,8],[6630.1,43],[6630.2,35],[6630.3,8],[6630.4,43],[6630.5,35],[6630.5,8],[6630.6,35],[6630.6,8],[6630.7,43],[6630.8,35],[6630.9,8],[6630.9,43],[6631.1,43],[6631.2,35],[6631.2,8],[6631.3,35],[6631.3,8],[6631.4,35],[6631.4,8],[6631.5,35],[6631.5,8],[6631.6,35],[6631.6,8],[6631.7,35],[6631.7,8],[6631.9,35],[6631.9,8],[6632,35],[6632,8],[6632.1,43],[6632.2,35],[6632.2,8],[6632.3,43],[6632.4,43],[6632.5,43],[6659.2,117],[6659.3,8],[7227.9,44],[7228.6,138],[7228.7,14],[7229,161],[7229.2,8],[7239.4,43],[7247.7,43],[7271.8,14],[7273,163],[7273.1,8],[7306.6,43],[7339.4,14],[7339.5,35],[7339.6,8],[7374.3,43],[7407.9,43],[7441.3,14],[7441.5,43],[7474.6,43],[7490.5,43],[7513.7,43],[7535.2,14],[7535.3,35],[7535.3,8],[7536.4,18],[7545.7,89],[7578.7,43],[7611.6,43],[7646,18],[7646.1,43],[7679.3,43],[7713.6,43],[7747,18],[7747.2,35],[7747.2,8],[7780,43],[7813.5,43],[7846.7,18],[7846.8,75],[7846.9,8],[7879.7,43],[7912.9,43],[7946.5,18],[7946.7,83],[7980.7,43],[8015.1,43],[8048.9,18],[8049.1,83],[8083.6,43],[8116.9,43],[8150.3,18],[8150.5,69],[8150.6,14],[8185.3,43],[8219.4,35],[8219.5,8],[8253.4,18],[8253.5,75],[8253.5,8],[8287.5,62],[8321.7,83],[8354.9,18],[8355,43],[8388.5,43],[8422.7,83],[8456.2,18],[8456.4,35],[8456.4,8],[8489.6,43],[8522.9,83],[8534.4,18],[8534.6,43],[8568.8,43],[8603.1,43],[8637.1,18],[8637.4,69],[8637.4,14],[8672.2,43],[8706.4,83],[8738.4,18],[8738.6,43],[8772.8,43],[8806.7,43],[8840,18],[8840.2,35],[8840.3,8],[8874.6,43],[8908,43],[8941.4,18],[8941.7,35],[8941.7,8],[8976.8,43],[9010.8,43],[9044.4,18],[9044.7,43],[9077.8,43],[9112.4,43],[9146.4,18],[9146.5,35],[9146.5,8],[9179.7,43],[9213.5,43],[9247,18],[9247.2,35],[9247.2,8],[9281.4,54],[9281.4,8],[9315.9,43],[9349.2,18],[9349.4,35],[9349.4,8],[9383.7,43],[9418,43],[9446.6,18],[9446.8,90],[9447,8],[9456.9,43],[9493.4,63],[9502.6,60],[9519.3,82],[9534.9,18],[9535.1,52],[9535.2,8],[9555.5,58],[9555.7,8],[9575.4,61],[9597.6,59],[9619.5,64],[9629.8,51],[9629.9,8],[9643,18],[9643.2,52],[9643.3,8],[9668.1,56],[9668.4,8],[9684.5,58],[9786.6,18],[9788.1,72],[9788.2,8],[9889.3,18],[9890.6,80],[9918.4,171],[9953.3,101],[9985.2,43],[10018.5,43],[10051.6,18],[10051.8,75],[10051.8,8],[10085.6,43],[10119.4,43],[10152.9,18],[10153.1,75],[10153.1,8],[10186.5,43],[10220.8,43],[10254.6,18],[10254.8,69],[10254.9,14],[10289.8,54],[10290,8],[10324.3,83],[10357.6,18],[10357.9,43],[10391.4,43],[10424,83],[10457.5,18],[10457.7,35],[10457.7,8],[10491,43],[10524.9,83],[10558.6,18],[10559,35],[10559.1,8],[10592.5,43],[10626.9,83],[10660.9,18],[10661.1,43],[10694.8,43],[10729.4,83],[10763.4,18],[10763.5,43],[10798.4,43],[10833.1,18],[10833.2,43],[10866.5,43],[10900.5,43],[10933.6,18],[10933.7,43],[10966.9,43],[11000.6,43],[11034.6,18],[11034.9,43],[11069.1,43],[11103,43],[11137.1,18],[11137.2,35],[11137.3,8],[11169.2,43],[11199,43],[11231.3,18],[11231.4,43],[11260.7,338],[11260.8,8],[11270.5,43],[11286.1,62],[11296.4,72],[11296.5,8],[11330.4,43],[11364.5,18],[11364.7,43],[11398.1,43],[11432.1,18],[11432.3,35],[11432.3,8],[11465.9,43],[11498.9,43],[11532.8,18],[11533,35],[11533,8],[11566.1,43],[11598.9,43],[11633,18],[11633.2,35],[11633.2,8],[11667.1,43],[11700.9,43],[11735,18],[11735.2,43],[11769.5,43],[11802.8,43],[11835.7,18],[11835.9,35],[11835.9,8],[11869.6,83],[11903.7,43],[11937.8,18],[11938.1,35],[11938.1,8],[11961.5,119],[11962.2,14],[11965.3,41],[11970.6,103],[12004.5,43],[12038.7,41],[12038.9,75],[12039,8],[12073.3,43],[12107.2,43],[12141,41],[12141.3,14],[12141.4,69],[12174.7,43],[12208.4,43],[12241.5,41],[12241.8,14],[12241.8,69],[12276.1,62],[12309.7,43],[12343.6,41],[12343.7,69],[12343.8,14],[12378,43],[12412.2,43],[12445.3,41],[12445.4,75],[12445.4,8],[12479.1,43],[12512.6,75],[12512.7,8],[12545.6,41],[12545.8,35],[12545.9,8],[12579.3,43],[12612.8,83],[12646.7,41],[12647,35],[12647,8],[12664.5,43],[12698.5,43],[12731.6,41],[12732,14],[12732,69],[12766.1,43],[12799.5,43],[12833.8,41],[12834.3,35],[12834.3,8],[12867.9,43],[12902.4,43],[12935.2,41],[12935.7,35],[12935.8,8],[12969.7,43],[13003.8,43],[13037.5,41],[13037.7,43],[13071.9,43],[13104.8,43],[13137.8,41],[13138,43],[13171.4,43],[13205.7,43],[13240.2,41],[13240.3,43],[13274.4,62],[13307.9,43],[13341.3,41],[13341.5,35],[13341.5,8],[13376.5,43],[13409.8,43],[13443.1,41],[13443.3,43],[13476.8,43],[13510.5,43],[13544.3,41],[13544.5,35],[13544.5,8],[13578.7,43],[13612.2,43],[13645.2,41],[13645.4,35],[13645.4,8],[13679.6,43],[13714.4,43],[13747.5,41],[13747.8,35],[13747.9,8],[13781.8,43],[13814.6,43],[13848,41],[13848.3,69],[13848.3,14],[13881.6,43],[13916.7,43],[13950.2,41],[13950.4,69],[13950.4,14],[13984.6,43],[14018.3,43],[14052.6,41],[14052.7,69],[14052.7,14],[14086.4,43],[14120.6,43],[14154.9,41],[14155,69],[14155,14],[14181.8,43],[14211.3,43],[14244.5,41],[14244.7,75],[14244.7,8],[14277.6,54],[14277.7,8],[14287.3,273],[14287.3,8],[14305.4,43],[14315.6,43],[14349.5,41],[14349.6,75],[14349.7,8],[14383.6,43],[14417.1,75],[14417.2,8],[14451.1,41],[14451.3,35],[14451.3,8],[14485.5,43],[14520.1,75],[14520.2,8],[14554.3,41],[14554.5,35],[14554.6,8],[14589.7,43],[14624.4,83],[14656.7,41],[14657,35],[14657,8],[14691.2,43],[14724.7,83],[14758.2,41],[14758.3,35],[14758.3,8],[14792.3,43],[14826.5,43],[14859.9,41],[14860,35],[14860,8],[14893.7,43],[14927.8,43],[14961.2,41],[14961.4,43],[14971.2,43],[14981.8,89],[14981.8,14],[14992.9,54],[14993,8],[15014.7,52],[15014.8,8],[15038.6,41],[15038.8,93],[15038.9,14],[15060.8,50],[15060.8,8],[15078.9,68],[15078.9,8],[15100.6,56],[15100.7,8],[15120.6,50],[15120.6,8],[15148.5,41],[15148.8,56],[15148.8,8],[15158.6,51],[15158.6,8],[15211.6,65],[15223,53],[15223.1,8],[15232,41],[15232.3,53],[15232.3,8],[15333.7,41],[15435.2,41],[15436.8,14],[15436.9,136],[15447.1,59],[15485.9,43],[15524.5,43],[15534.6,41],[15534.7,43],[15551,43],[15551.2,39],[15559.7,180]]}
diff --git a/src/main/runtime/__fixtures__/codex-0-158-0-timed-turn.txt b/src/main/runtime/__fixtures__/codex-0-158-0-timed-turn.txt
new file mode 100644
index 000000000000..f589f998bb8e
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-158-0-timed-turn.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l>_ OpenAI Codex (v0.158.0)loadingShall we see where this goes?⣀⣤⣤⣤⣀⣀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣦⣤⣤⣤⣤⣤⣤⡀⢀⣾⣿⣿⠿⠋⠉⠉⢉⣭⣿⣿⣿⣿⣿⠿⣿⣿⣿⣿⣷⣄⣀⣾⣿⣿⠃⣀⣴⣾⣿⣿⡿⠟⠋⣀⡀⠈⠙⢿⣿⣿⣧⣀⣶⣿⣿⣿⣿⡇⢸⣿⣿⡿⠛⠉⢀⣠⣴⣿⣿⣿⣷⣦⣀⠈⢻⣿⣿⡇⣰⣿⣿⡿⢿⣿⣿⡇⢸⣿⣿⢀⣤⣶⣿⣿⣿⠟⠛⠻⣿⣿⣿⣿⣮⣿⣿⡷⢰⣿⣿⡟⠁⢸⣿⣿⡇⢸⣿⣿⣿⣿⠿⠿⣿⣿⣿⣦⣄⡀⠈⠛⠿⣿⣿⣿⣧⡀⣾⣿⣿⠃⢸⣿⣿⡇⢸⣿⣿⠋⠁⠈⠙⢻⣿⣿⣿⣶⣤⡀⠹⢿⣿⣷⡄⢸⣿⣿⣇⠸⣿⣿⣷⣦⣼⣿⣿⢸⣿⣿⠻⢿⣿⣿⡇⠘⣿⣿⣿⠈⢿⣿⣿⣦⡀⠈⠛⠿⣿⣿⣿⣿⣄⡀⢀⣠⣼⣿⣿⣿⣿⡇⣿⣿⣿⠇⢻⣿⣿⣿⣷⣦⣀⠈⠙⠻⣿⣿⣿⣶⣶⣿⣿⣿⣿⣿⣿⣿⡇⣠⣿⣿⣿⢸⣿⣿⡿⢿⣿⣿⣿⣦⣠⣴⣿⣿⣿⡿⠟⠋⢸⣿⣿⣿⣿⣷⣴⣿⣿⣿⠃⠘⣿⣿⣷⠈⠛⢿⣿⣿⣿⠿⠋⠉⣠⣴⣿⣿⣿⣿⣿⣿⣿⣿⠟⠁⠻⣿⣿⣿⣤⣀⠈⠉⢀⣤⣶⣿⣿⣿⠿⠟⠁⣰⣿⣿⡟⠋⠁⠈⠿⣿⣿⣿⣿⣶⣾⣿⣿⣿⣿⠟⠋⠁⣠⣼⣿⣿⡟⠙⠛⠛⠛⠻⠛⢿⣿⣿⣿⣿⣷⣾⣿⣿⣿⡿⠏⠈⠙⠛⠿⠿⠿⠿⠛⠉›Ask Codex to do anything?forshortcuts[0 q [?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l~/orca-lanes/sta8834/corpus/scratch  permissions: YOLO modeShall we see where this goes?[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;scratch[?2026h[?25h[?2026l[?2026h[?25lGPT-6-Sol default·~/orca-lanes/sta8834/corpus/scratch[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ scratch]0;⠙ scratch[?2026h[?25lmdim · ~/orca-lanes/sta834/corpus/scratch[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25lList the files here and summarizein2bullets.[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25lAsk Codex to do anything?forshortcuts[?25h[?2026l[?2026h[?25l› Listthefileshereandsummarizein2bullets.[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ scratch[?2026h[?25l•Working(0s • esc to interrupt)[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ scratch[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25l·⠧[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25l1[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25l2[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25l• I’ll [?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25linspect[?25h[?2026l[?2026h[?25lthe[?25h[?2026l[?2026h[?25ldirectorycontents[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25land[?25h[?2026l[?2026h[?25lsummarize[?25h[?2026l[?2026h[?25lwhat[?25h[?2026l[?2026h[?25l’s[?25h[?2026l[?2026h[?25lpresent[?25h[?2026l[?2026h[?25lin[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25ltwo[?25h[?2026l[?2026h[?25lbullets[?25h[?2026l[?2026h[?25l.[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25l⠏[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25l⠋[?25h[?2026l[?2026h[?25l•Working(2s • esc to interrupt)[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25l3[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ ⠹ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ ⠸ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ ⠼ | scratch[?2026h[?25h[?2026l[?2026h[?25l•Explored  └ Listrg--files-g'*'-g'.*'    + Show details                                                                                                      [?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l4[?25h[?2026l[?2026h[?25l⠼[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ ⠴ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ ⠦ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ ⠧ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ ⠇ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ ⠏ | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ ⠋ | scratch[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ ⠙ | scratch[?2026h[?25h[?2026l[?2026h[?25l•⠙[?25h[?2026l]0;⠙ scratch]0;⠙ List and summarize files | scratch[?2026h[?25lList and summarize files[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ List and summarize files | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ List and summarize files | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ List and summarize files | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25l5[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ List and summarize files | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ List and summarize files | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠧ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠇ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ List and summarize files | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25l6[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠦ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠇ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠏ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ List and summarize files | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ List and summarize files | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ List and summarize files | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠸ List and summarize files | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠼ List and summarize files | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25l7[?25h[?2026l[?2026h[?25l    Read README.md,notes.txt    + Show details                                                                                                      [?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠴ List and summarize files | scratch[?2026h[?25l•[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠦ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠧ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠇ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l•[?25h[?2026l]0;⠏ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l• •` [?25h[?2026l[?2026h[?25lREADME[?25h[?2026l[?2026h[?25l.md[?25h[?2026l]0;⠹ List and summarize files | scratch[?2026h[?25lREADME.md[?25h[?2026l[?2026h[?25l—[?25h[?2026l[?2026h[?25lcontainsthe[?25h[?2026l[?2026h[?25lheading[?25h[?2026l[?2026h[?25l“[?25h[?2026l]0;⠸ List and summarize files | scratch[?2026h[?25lscratch[?25h[?2026l[?2026h[?25l.”[?25h[?2026l[?2026h[?25l•`[?25h[?2026l[?2026h[?25lnotes[?25h[?2026l]0;⠼ List and summarize files | scratch[?2026h[?25l.txt[?25h[?2026l]0;⠴ List and summarize files | scratch]0;⠦ List and summarize files | scratch[?2026h[?25lnotes.txt —containsthetext“hello[?25h[?2026l[?2026h[?25l.”[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠧ List and summarize files | scratch[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;List and summarize files | scratch[?2026h[?25l  9:46 PM                                                                                                               [?25h[?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0-158-0-trustprompt.meta.json b/src/main/runtime/__fixtures__/codex-0-158-0-trustprompt.meta.json
new file mode 100644
index 000000000000..a80d88f5af99
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-158-0-trustprompt.meta.json
@@ -0,0 +1,15 @@
+{
+  "capturedAt": "2026-09-29T01:32:55.701Z",
+  "platform": "darwin",
+  "command": [
+    "codex",
+    "--no-daemon",
+    "-c",
+    "check_for_update_on_startup=false",
+    "--dangerously-bypass-approvals-and-sandbox"
+  ],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.158.0: launch in an untrusted folder; the recording ends on the unanswered trust dialog. STA-8834.",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/codex-0-158-0-trustprompt.txt b/src/main/runtime/__fixtures__/codex-0-158-0-trustprompt.txt
new file mode 100644
index 000000000000..fd002b0fe041
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0-158-0-trustprompt.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l>_ OpenAI Codex (v0.158.0)loadingHello, world. Hello, you.⣀⣤⣤⣤⣀⣀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣦⣤⣤⣤⣤⣤⣤⡀⢀⣾⣿⣿⠿⠋⠉⠉⢉⣭⣿⣿⣿⣿⣿⠿⣿⣿⣿⣿⣷⣄⣀⣾⣿⣿⠃⣀⣴⣾⣿⣿⡿⠟⠋⣀⡀⠈⠙⢿⣿⣿⣧⣀⣶⣿⣿⣿⣿⡇⢸⣿⣿⡿⠛⠉⢀⣠⣴⣿⣿⣿⣷⣦⣀⠈⢻⣿⣿⡇⣰⣿⣿⡿⢿⣿⣿⡇⢸⣿⣿⢀⣤⣶⣿⣿⣿⠟⠛⠻⣿⣿⣿⣿⣮⣿⣿⡷⢰⣿⣿⡟⠁⢸⣿⣿⡇⢸⣿⣿⣿⣿⠿⠿⣿⣿⣿⣦⣄⡀⠈⠛⠿⣿⣿⣿⣧⡀⣾⣿⣿⠃⢸⣿⣿⡇⢸⣿⣿⠋⠁⠈⠙⢻⣿⣿⣿⣶⣤⡀⠹⢿⣿⣷⡄⢸⣿⣿⣇⠸⣿⣿⣷⣦⣼⣿⣿⢸⣿⣿⠻⢿⣿⣿⡇⠘⣿⣿⣿⠈⢿⣿⣿⣦⡀⠈⠛⠿⣿⣿⣿⣿⣄⡀⢀⣠⣼⣿⣿⣿⣿⡇⣿⣿⣿⠇⢻⣿⣿⣿⣷⣦⣀⠈⠙⠻⣿⣿⣿⣶⣶⣿⣿⣿⣿⣿⣿⣿⡇⣠⣿⣿⣿⢸⣿⣿⡿⢿⣿⣿⣿⣦⣠⣴⣿⣿⣿⡿⠟⠋⢸⣿⣿⣿⣿⣷⣴⣿⣿⣿⠃⠘⣿⣿⣷⠈⠛⢿⣿⣿⣿⠿⠋⠉⣠⣴⣿⣿⣿⣿⣿⣿⣿⣿⠟⠁⠻⣿⣿⣿⣤⣀⠈⠉⢀⣤⣶⣿⣿⣿⠿⠟⠁⣰⣿⣿⡟⠋⠁⠈⠿⣿⣿⣿⣿⣶⣾⣿⣿⣿⣿⠟⠋⠁⣠⣼⣿⣿⡟⠙⠛⠛⠛⠻⠛⢿⣿⣿⣿⣿⣷⣾⣿⣿⣿⡿⠏⠈⠙⠛⠿⠿⠿⠿⠛⠉›Ask Codex to do anything?forshortcuts[0 q [?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l~/orca-lanes/sta8834/corpus/scratch  permissions: YOLO modeHello, world. Hello, you.[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?1006l[?1015l[?1003l[?1002l[?1000l[?1007h[?2026h[?25l  Folder access/Users/xxxxxx/orca-lanes/sta8834/corpus/scratch                                                                      Trustthisfolder?Codexcanread,edit,andrunfileshere,subjecttoyourpermissionsettings.Foldersettingscan run code automatically,evenwithoutamodelrequest.Continueonlyifyoutrustthesefiles.Yourtrustdecisionwillbesaved.› 1. Trust and continue                                                                                                 2.Quitenter continue · esc quit [?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0157-config-override-embedded-warning.meta.json b/src/main/runtime/__fixtures__/codex-0157-config-override-embedded-warning.meta.json
new file mode 100644
index 000000000000..9adb710acedb
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-config-override-embedded-warning.meta.json
@@ -0,0 +1,14 @@
+{
+  "capturedAt": "2026-09-27T20:00:34.230Z",
+  "platform": "darwin",
+  "command": [
+    "codex",
+    "--dangerously-bypass-approvals-and-sandbox",
+    "-c",
+    "model_reasoning_effort=high"
+  ],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.157.1 with only -c model_reasoning_effort. Same embedded-warning cell-diff header repaint as the -m/-c launch (STA-8628). Worktree-path leaf redacted by the recorder scan.",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/codex-0157-config-override-embedded-warning.txt b/src/main/runtime/__fixtures__/codex-0157-config-override-embedded-warning.txt
new file mode 100644
index 000000000000..8a5d933c1cc2
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-config-override-embedded-warning.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭───────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.1)            ││                                       ││ model:     loading   /model to change ││ directory: loading                    │╰───────────────────────────────────────╯›Ask Codex to do anything?forshortcuts[0 q╭[?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l───────────────────╮                   │                   │  loading  /model to change                  │  ~/orca/…/orca/…start-for-codex-times-out-at ││ permissions: YOLO mode                                   │╰──────────────────────────────────────────────────────────╯[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;sta-8628-bug-worker-s...[?2026h[?25l ╭──────────────────────────────────────────────────────────╮>_OpenAI Codex(v0.157.1)                           modl:    loading   /model to change                 diectory:  ~/orca/…/orca/…start-for-codex-times-out-at│ permissions: YOLO mode                                   │╰──────────────────────────────────────────────────────────╯Tip:Use/inittocreateanAGENTS.mdwithproject-specificguidance.GPT-6-Sol default·~/orca/workspaces/orca/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX⚠1 warning·f2toview[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ sta-8628-bug-worker-s...[?2026h[?25l╭──────────────────────────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.1)                               │                        model:GPT-6-Sol high/modeltochangedirctory:~/orca/…/orca/…start-for-codex-times-out-atpemissions:YOLO mode                                  ╰──────────────────────────────────────────────────────────╯ high · ~/orca/workspaces/orca/sta-862-bug-worke-star-for-codex-times-out-a[?25h[?2026l[?2026h[?25h[?2026l]0;sta-8628-bug-worker-s...[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0157-effort-override-embedded-warning.meta.json b/src/main/runtime/__fixtures__/codex-0157-effort-override-embedded-warning.meta.json
new file mode 100644
index 000000000000..602cf71904bc
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-effort-override-embedded-warning.meta.json
@@ -0,0 +1,16 @@
+{
+  "capturedAt": "2026-09-27T19:35:31.761Z",
+  "platform": "darwin",
+  "command": [
+    "codex",
+    "--dangerously-bypass-approvals-and-sandbox",
+    "-m",
+    "gpt-6-sol",
+    "-c",
+    "model_reasoning_effort=high"
+  ],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.157.1 with -m and -c model_reasoning_effort (the worker-start argv). Embedded mode shows a startup warning and redraws the header by cell diff, so a line-folded tail reads `dirctory:` (STA-8628). Worktree-path leaf redacted by the recorder scan.",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/codex-0157-effort-override-embedded-warning.txt b/src/main/runtime/__fixtures__/codex-0157-effort-override-embedded-warning.txt
new file mode 100644
index 000000000000..04777d9a88c3
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-effort-override-embedded-warning.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭───────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.1)            ││                                       ││ model:     loading   /model to change ││ directory: loading                    │╰───────────────────────────────────────╯›Ask Codex to do anything?forshortcuts[0 q╭[?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l───────────────────╮                   │                   │  loading  /model to change                  │  ~/orca/…/orca/…start-for-codex-times-out-at ││ permissions: YOLO mode                                   │╰──────────────────────────────────────────────────────────╯[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;sta-8628-bug-worker-s...[?2026h[?25h[?2026l[?2026h[?25l ╭──────────────────────────────────────────────────────────╮>_OpenAI Codex(v0.157.1)                           modl:    loading   /model to change                 diectory:  ~/orca/…/orca/…start-for-codex-times-out-at│ permissions: YOLO mode                                   │╰──────────────────────────────────────────────────────────╯Tip:Use/agentstoopentheagentcommandcenter.GPT-6-Sol default·~/orca/workspaces/orca/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX⚠1 warning·f2toview[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ sta-8628-bug-worker-s...[?2026h[?25l╭──────────────────────────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.1)                               │                        model:GPT-6-Sol high/modeltochangedirctory:~/orca/…/orca/…start-for-codex-times-out-atpemissions:YOLO mode                                  ╰──────────────────────────────────────────────────────────╯ high · ~/orca/workspaces/orca/sta-862-bug-worke-star-for-codex-times-out-a[?25h[?2026l[?2026h[?25h[?2026l]0;sta-8628-bug-worker-s...[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0157-fresh-home-daemon-install.meta.json b/src/main/runtime/__fixtures__/codex-0157-fresh-home-daemon-install.meta.json
new file mode 100644
index 000000000000..04203db4fbe7
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-fresh-home-daemon-install.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-28T21:45:00.000Z",
+  "platform": "darwin",
+  "command": ["codex", "--dangerously-bypass-approvals-and-sandbox"],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.157.0, plain launch (no -m/-c) on a fresh CODEX_HOME. The provisional screen reads `model: loading` while Codex installs and starts its shared daemon (`Installing daemon from CLI version 0.157.0`); 0.157 discards typed input during that start. The live header fills in at the end. Cut 6 s after spawn. Home-directory user name redacted by hand, same length.",
+  "exitCode": null
+}
diff --git a/src/main/runtime/__fixtures__/codex-0157-fresh-home-daemon-install.txt b/src/main/runtime/__fixtures__/codex-0157-fresh-home-daemon-install.txt
new file mode 100644
index 000000000000..a6aa2c9af2c6
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-fresh-home-daemon-install.txt
@@ -0,0 +1,2 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭───────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.0)            ││                                       ││ model:     loading   /model to change ││ directory: loading                    │╰───────────────────────────────────────╯ › Ask Codex to do anything ? for shortcuts[0 q╭[?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l─────────────╮             │             │  loading  /model to change            │  /Users/user1/cr/rounds/x157fresh/repo ││ permissions: YOLO mode                             │╰────────────────────────────────────────────────────╯[?25h[?2026l[?2026h[?25h[?2026l[?1006l[?1015l[?1003l[?1002l[?1000l[<1u[?1007l[?1049l[<1u[>4;0m[?2004l[?1004l[0 q[?25hInstalling daemon from CLI version 0.157.0 into /Users/user1/cr/rounds/x157fresh/home/.codex/packages/app-server-daemon...
+[?2004h[>4;0m[>7u[?1004h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭────────────────────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.0)                         ││                                                    ││ model:       loading   /model to change            ││ directory:   /Users/user1/cr/rounds/x157fresh/repo ││ permissions: YOLO mode                             │╰────────────────────────────────────────────────────╯ › Ask Codex to do anything ? for shortcuts[0 q╭[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;repo[?2026h[?25h[?2026l[?2026h[?25lTip: Visit the ]8;;https://community.openai.com/c/codex/37Codex community forum]8;; (]8;;https://community.openai.com/c/codex/37https://community.openai.com/c/codex/37]8;;).GPT-6-Astra default · /Users/user1/cr/rounds/x157fresh/repo←agens · ? for shortcuts[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ repo]0;repo[?2026h[?25lGPT-6-Astra   /model to change⠈⢀⠁⠂⠄⠈⠁⠈⠁⠈⢀⠠⠄⠠⢀⠠⡀⠠⠁⢀⠁[?25h[?2026l[?2026h[?25l⠄[?25h[?2026l[?2026h[?25l⠄[?25h[?2026l[?2026h[?25l⠈⢀⠁⠐⠂⠄⠈⠁⠈⠁⠈⢀⠠⠄⠠⢀⠠⠄⡀⠈⠠⠁⢀⠁[?25h[?2026l[?2026h[?25l⠈⢀⠁⠐⠂⠄⠈⠁⠈⠁⠈⢀⠠⠄⠠⢀⠠⠄⡀⠈⠠⠁⢀[?25h[?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0157-hooks-review-dialog.meta.json b/src/main/runtime/__fixtures__/codex-0157-hooks-review-dialog.meta.json
new file mode 100644
index 000000000000..ebc2a471a20f
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-hooks-review-dialog.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-29T03:30:27.000Z",
+  "platform": "darwin",
+  "command": ["codex", "--dangerously-bypass-approvals-and-sandbox"],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.157.0, plain launch on a fresh CODEX_HOME with a hooks.json of 8 command hooks that were never trusted. Over the provisional screen Codex paints `Hooks need review`, `1. Review hooks` / `2. Trust all and continue` / `3. Continue without trusting (hooks won't run)` and the key row `enter confirm · esc skip`, where older builds wrote `Press enter to confirm`. No key was sent (only automatic terminal-query replies). Cut 6 s after spawn. Home-directory user name redacted by hand, same length.",
+  "exitCode": null
+}
diff --git a/src/main/runtime/__fixtures__/codex-0157-hooks-review-dialog.txt b/src/main/runtime/__fixtures__/codex-0157-hooks-review-dialog.txt
new file mode 100644
index 000000000000..14b1ad743e14
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-hooks-review-dialog.txt
@@ -0,0 +1,2 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭───────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.0)            ││                                       ││ model:     loading   /model to change ││ directory: loading                    │╰───────────────────────────────────────╯ › Ask Codex to do anything ? for shortcuts[0 q╭[?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l───────────╮           │           │  loading  /model to change          │  /Users/user1/cr/rounds/dlg-h57/repo ││ permissions: YOLO mode                           │╰──────────────────────────────────────────────────╯[?25h[?2026l[?1006l[?1015l[?1003l[?1002l[?1000l[<1u[?1007l[?1049l[<1u[>4;0m[?2004l[?1004l[0 q[?25hInstalling daemon from CLI version 0.157.0 into /Users/user1/cr/rounds/dlg-h57/home/.codex/packages/app-server-daemon...
+[?2004h[>4;0m[>7u[?1004h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭──────────────────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.0)                       ││                                                  ││ model:       loading   /model to change          ││ directory:   /Users/user1/cr/rounds/dlg-h57/repo ││ permissions: YOLO mode                           │╰──────────────────────────────────────────────────╯ › Ask Codex to do anything ? for shortcuts[0 q╭[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l   Hooks need review  8 hooks are new or changed.  Hooks can run outside the sandbox after you trust them.  › 1. Review hooks                                                                                                         2. Trust all and continue  3. Continue without trusting (hooks won't run) enter confirm · esc skip                                                                                                 [?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0157-model-retired-dialog.meta.json b/src/main/runtime/__fixtures__/codex-0157-model-retired-dialog.meta.json
new file mode 100644
index 000000000000..0e97bbe47154
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-model-retired-dialog.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-29T03:31:06.000Z",
+  "platform": "darwin",
+  "command": ["codex", "--dangerously-bypass-approvals-and-sandbox"],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.157.0, plain launch on a fresh CODEX_HOME whose config.toml sets model = \"gpt-5.4-mini\", a model missing from 0.157's catalog, so Codex shows its retired-model notice without choices: `GPT-5.4 Mini is no longer available`, `Switch to GPT-6 Luna to continue.` and the key row `enter/esc continue · ctrl+c quit`. Enter or Esc switches the model; the heading comes from the model catalog, not the older `Codex just got an upgrade` wording. No key was sent (only automatic terminal-query replies). Cut 6 s after spawn. Home-directory user name redacted by hand, same length.",
+  "exitCode": null
+}
diff --git a/src/main/runtime/__fixtures__/codex-0157-model-retired-dialog.txt b/src/main/runtime/__fixtures__/codex-0157-model-retired-dialog.txt
new file mode 100644
index 000000000000..776b261a2d60
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-model-retired-dialog.txt
@@ -0,0 +1,2 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭───────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.0)            ││                                       ││ model:     loading   /model to change ││ directory: loading                    │╰───────────────────────────────────────╯ › Ask Codex to do anything ? for shortcuts[0 q╭[?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l───────────╮           │           │  loading  /model to change          │  /Users/user1/cr/rounds/dlg-m57/repo ││ permissions: YOLO mode                           │╰──────────────────────────────────────────────────╯[?25h[?2026l[?1006l[?1015l[?1003l[?1002l[?1000l[<1u[?1007l[?1049l[<1u[>4;0m[?2004l[?1004l[0 q[?25hInstalling daemon from CLI version 0.157.0 into /Users/user1/cr/rounds/dlg-m57/home/.codex/packages/app-server-daemon...
+[?2004h[>4;0m[>7u[?1004h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭──────────────────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.0)                       ││                                                  ││ model:       loading   /model to change          ││ directory:   /Users/user1/cr/rounds/dlg-m57/repo ││ permissions: YOLO mode                           │╰──────────────────────────────────────────────────╯ › Ask Codex to do anything ? for shortcuts[0 q╭[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l   GPT-5.4 Mini is no longer available   Codex now uses GPT-6 Luna in place of GPT-5.4 Mini. Switch to GPT-6 Luna to continue.  enter/esc continue · ctrl+c quit     [?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0157-no-daemon-effort-override.meta.json b/src/main/runtime/__fixtures__/codex-0157-no-daemon-effort-override.meta.json
new file mode 100644
index 000000000000..91a98c0b0c78
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-no-daemon-effort-override.meta.json
@@ -0,0 +1,17 @@
+{
+  "capturedAt": "2026-09-27T20:48:19.864Z",
+  "platform": "darwin",
+  "command": [
+    "codex",
+    "--no-daemon",
+    "--dangerously-bypass-approvals-and-sandbox",
+    "-m",
+    "gpt-6-sol",
+    "-c",
+    "model_reasoning_effort=high"
+  ],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.157.1 with --no-daemon, -m and -c model_reasoning_effort. No startup warning; header fills in from `loading`. Worktree-path leaf redacted by the recorder scan.",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/codex-0157-no-daemon-effort-override.txt b/src/main/runtime/__fixtures__/codex-0157-no-daemon-effort-override.txt
new file mode 100644
index 000000000000..e6e8d151af5a
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-no-daemon-effort-override.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭───────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.1)            ││                                       ││ model:     loading   /model to change ││ directory: loading                    │╰───────────────────────────────────────╯›Ask Codex to do anything?forshortcuts[0 q╭[?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l───────────────────╮                   │                   │  loading  /model to change                  │  ~/orca/…/orca/…start-for-codex-times-out-at ││ permissions: YOLO mode                                   │╰──────────────────────────────────────────────────────────╯[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;sta-8628-bug-worker-s...[?2026h[?25lTip:NEW:Preventsleepwhilerunningisnowavailablein/experimental.GPT-6-Sol default·~/orca/workspaces/orca/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ sta-8628-bug-worker-s...[?2026h[?25lGPT-6-Sol high  /model tochangehigh · ~/orca/workspaces/orca/sta-862-bug-worke-star-for-codex-times-out-a[?25h[?2026l[?2026h[?25h[?2026l]0;⠹ sta-8628-bug-worker-s...]0;sta-8628-bug-worker-s...[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0157-plain-ready.meta.json b/src/main/runtime/__fixtures__/codex-0157-plain-ready.meta.json
new file mode 100644
index 000000000000..07d30431d7b2
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-plain-ready.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-27T19:35:31.758Z",
+  "platform": "darwin",
+  "command": ["codex", "--dangerously-bypass-approvals-and-sandbox"],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.157.1, plain launch (no -m/-c). Header paints with `loading` rows, then fills in; the ready baseline for STA-8628. Worktree-path leaf redacted by the recorder scan.",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/codex-0157-plain-ready.txt b/src/main/runtime/__fixtures__/codex-0157-plain-ready.txt
new file mode 100644
index 000000000000..c346994bd910
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-plain-ready.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭───────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.1)            ││                                       ││ model:     loading   /model to change ││ directory: loading                    │╰───────────────────────────────────────╯›Ask Codex to do anything?forshortcuts[0 q╭[?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l───────────────────╮                   │                   │  loading  /model to change                  │  ~/orca/…/orca/…start-for-codex-times-out-at ││ permissions: YOLO mode                                   │╰──────────────────────────────────────────────────────────╯[?25h[?2026l[?1006l[?1015l[?1003l[?1002l[?1000l[<1u[?1007l[?1049l[<1u[>4;0m[?2004l[?1004l[0 q[?25h[?2004h[>4;0m[>7u[?1004h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭──────────────────────────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.1)                               ││                                                          ││ model:       loading   /model to change                  ││ directory:   ~/orca/…/orca/…start-for-codex-times-out-at ││ permissions: YOLO mode                                   │╰──────────────────────────────────────────────────────────╯›Ask Codex to do anything?forshortcuts[0 q╭[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;sta-8628-bug-worker-s...[?2026h[?25h[?2026l[?2026h[?25lTip:Use/agentstoopentheagentcommandcenter.GPT-6-Sol default·~/orca/workspaces/orca/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX←agens · ?forshortcuts[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ sta-8628-bug-worker-s...[?2026h[?25lGPT-6-Sol medium  /model tochangemdim · ~/orca/workspaces/orca/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;sta-8628-bug-worker-s...[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0157-update-available-dialog.meta.json b/src/main/runtime/__fixtures__/codex-0157-update-available-dialog.meta.json
new file mode 100644
index 000000000000..a81301d2215f
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-update-available-dialog.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-29T03:29:52.000Z",
+  "platform": "darwin",
+  "command": ["codex", "--dangerously-bypass-approvals-and-sandbox"],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.157.0, plain launch on a fresh CODEX_HOME whose config.toml sets check_for_update_on_startup = true, with a version.json cache naming 0.159.0 checked moments earlier (so no network check) and CODEX_MANAGED_BY_NPM=1 so Codex offers an update command. Over the provisional screen Codex paints `Update available · 0.157.0 → 0.159.0`, `1. Update now (runs `npm install -g @openai/codex`)` / `2. Skip` / `3. Skip until next version` and the key row `enter continue · esc skip`, where older builds wrote `Press enter to continue`. Enter picks Update now. No key was sent (only automatic terminal-query replies). Cut 6 s after spawn. Home-directory user name redacted by hand, same length.",
+  "exitCode": null
+}
diff --git a/src/main/runtime/__fixtures__/codex-0157-update-available-dialog.txt b/src/main/runtime/__fixtures__/codex-0157-update-available-dialog.txt
new file mode 100644
index 000000000000..4701e63af24b
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0157-update-available-dialog.txt
@@ -0,0 +1,2 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭───────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.0)            ││                                       ││ model:     loading   /model to change ││ directory: loading                    │╰───────────────────────────────────────╯ › Ask Codex to do anything ? for shortcuts[0 q╭[?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l───────────╮           │           │  loading  /model to change          │  /Users/user1/cr/rounds/dlg-u57/repo ││ permissions: YOLO mode                           │╰──────────────────────────────────────────────────╯[?25h[?2026l[?2026h[?25h[?2026l[?1006l[?1015l[?1003l[?1002l[?1000l[<1u[?1007l[?1049l[<1u[>4;0m[?2004l[?1004l[0 q[?25hInstalling daemon from CLI version 0.157.0 into /Users/user1/cr/rounds/dlg-u57/home/.codex/packages/app-server-daemon...
+[?2004h[>4;0m[>7u[?1004h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l╭──────────────────────────────────────────────────╮│ >_ OpenAI Codex (v0.157.0)                       ││                                                  ││ model:       loading   /model to change          ││ directory:   /Users/user1/cr/rounds/dlg-u57/repo ││ permissions: YOLO mode                           │╰──────────────────────────────────────────────────╯ › Ask Codex to do anything ? for shortcuts[0 q╭[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l   Update available · 0.157.0 → 0.159.0  Release notes: ]8;;https://github.com/openai/codex/releases/latesthttps://github.com/openai/codex/releases/latest]8;; › 1. Update now (runs `npm install -g @openai/codex`)                                                                     2. Skip  3. Skip until next version   enter continue · esc skip    [?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0158-fresh-home-greeting.meta.json b/src/main/runtime/__fixtures__/codex-0158-fresh-home-greeting.meta.json
new file mode 100644
index 000000000000..ea7d9513a9f7
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0158-fresh-home-greeting.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-28T21:44:00.000Z",
+  "platform": "darwin",
+  "command": ["codex", "--dangerously-bypass-approvals-and-sandbox"],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.158.0, plain launch (no -m/-c) on a fresh CODEX_HOME. Greeting layout: an unboxed `>_ OpenAI Codex (v0.158.0)` header with no model:/directory: labels, starting from a provisional screen whose directory reads `loading`; the live status row under the composer appears last. Braille logo animation frames included. Cut 4.6 s after spawn. Home-directory user name redacted by hand, same length.",
+  "exitCode": null
+}
diff --git a/src/main/runtime/__fixtures__/codex-0158-fresh-home-greeting.txt b/src/main/runtime/__fixtures__/codex-0158-fresh-home-greeting.txt
new file mode 100644
index 000000000000..72670b00f4b4
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0158-fresh-home-greeting.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l>_ OpenAI Codex (v0.158.0)loadingShall we see where this goes?⣀⣤⣤⣤⣀⣀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣦⣤⣤⣤⣤⣤⣤⡀⢀⣾⣿⣿⠿⠋⠉⠉⢉⣭⣿⣿⣿⣿⣿⠿⣿⣿⣿⣿⣷⣄⣀⣾⣿⣿⠃⣀⣴⣾⣿⣿⡿⠟⠋⣀⡀⠈⠙⢿⣿⣿⣧⣀⣶⣿⣿⣿⣿⡇⢸⣿⣿⡿⠛⠉⢀⣠⣴⣿⣿⣿⣷⣦⣀⠈⢻⣿⣿⡇⣰⣿⣿⡿⢿⣿⣿⡇⢸⣿⣿⢀⣤⣶⣿⣿⣿⠟⠛⠻⣿⣿⣿⣿⣮⣿⣿⡷⢰⣿⣿⡟⠁⢸⣿⣿⡇⢸⣿⣿⣿⣿⠿⠿⣿⣿⣿⣦⣄⡀⠈⠛⠿⣿⣿⣿⣧⡀⣾⣿⣿⠃⢸⣿⣿⡇⢸⣿⣿⠋⠁⠈⠙⢻⣿⣿⣿⣶⣤⡀⠹⢿⣿⣷⡄⢸⣿⣿⣇⠸⣿⣿⣷⣦⣼⣿⣿⢸⣿⣿⠻⢿⣿⣿⡇⠘⣿⣿⣿⠈⢿⣿⣿⣦⡀⠈⠛⠿⣿⣿⣿⣿⣄⡀⢀⣠⣼⣿⣿⣿⣿⡇⣿⣿⣿⠇⢻⣿⣿⣿⣷⣦⣀⠈⠙⠻⣿⣿⣿⣶⣶⣿⣿⣿⣿⣿⣿⣿⡇⣠⣿⣿⣿⢸⣿⣿⡿⢿⣿⣿⣿⣦⣠⣴⣿⣿⣿⡿⠟⠋⢸⣿⣿⣿⣿⣷⣴⣿⣿⣿⠃⠘⣿⣿⣷⠈⠛⢿⣿⣿⣿⠿⠋⠉⣠⣴⣿⣿⣿⣿⣿⣿⣿⣿⠟⠁⠻⣿⣿⣿⣤⣀⠈⠉⢀⣤⣶⣿⣿⣿⠿⠟⠁⣰⣿⣿⡟⠋⠁⠈⠿⣿⣿⣿⣿⣶⣾⣿⣿⣿⣿⠟⠋⠁⣠⣼⣿⣿⡟⠙⠛⠛⠛⠻⠛⢿⣿⣿⣿⣿⣷⣾⣿⣿⣿⡿⠏⠈⠙⠛⠿⠿⠿⠿⠛⠉ › Ask Codex to do anything ? for shortcuts[0 q [?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l/Users/user1/cr/rounds/x158fresh/repo  permissions: YOLO modeShall we see where this goes?[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;repo[?2026h[?25h[?2026l[?2026h[?25lGPT-6-Astra default · /Users/user1/cr/rounds/x158fresh/repo←agens · ? for shortcuts[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠋ repo[?2026h[?25h[?2026l[?2026h[?25h[?2026l]0;⠙ repo[?2026h[?25h[?2026l]0;repo[?2026h[?25l⠈⢀⠁⠂⠄⠈⠁⠈⠁⠈⢀⠠⠄⠠⢀⠠⡀⠠⠁⢀⠁[?25h[?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0158-hooks-review-dialog.meta.json b/src/main/runtime/__fixtures__/codex-0158-hooks-review-dialog.meta.json
new file mode 100644
index 000000000000..896d34744827
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0158-hooks-review-dialog.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-29T03:30:46.000Z",
+  "platform": "darwin",
+  "command": ["codex", "--dangerously-bypass-approvals-and-sandbox"],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.158.0, plain launch on a fresh CODEX_HOME with a hooks.json of 8 command hooks that were never trusted. Over the provisional screen Codex paints `Hooks need review`, `1. Review hooks` / `2. Trust all and continue` / `3. Continue without trusting (hooks won't run)` and the key row `enter confirm · esc skip`, where older builds wrote `Press enter to confirm`. No key was sent (only automatic terminal-query replies). Cut 6 s after spawn. Home-directory user name redacted by hand, same length.",
+  "exitCode": null
+}
diff --git a/src/main/runtime/__fixtures__/codex-0158-hooks-review-dialog.txt b/src/main/runtime/__fixtures__/codex-0158-hooks-review-dialog.txt
new file mode 100644
index 000000000000..ad25e6eda6ee
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0158-hooks-review-dialog.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l>_ OpenAI Codex (v0.158.0)loadingBring your unfinished thoughts.⣀⣤⣤⣤⣀⣀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣦⣤⣤⣤⣤⣤⣤⡀⢀⣾⣿⣿⠿⠋⠉⠉⢉⣭⣿⣿⣿⣿⣿⠿⣿⣿⣿⣿⣷⣄⣀⣾⣿⣿⠃⣀⣴⣾⣿⣿⡿⠟⠋⣀⡀⠈⠙⢿⣿⣿⣧⣀⣶⣿⣿⣿⣿⡇⢸⣿⣿⡿⠛⠉⢀⣠⣴⣿⣿⣿⣷⣦⣀⠈⢻⣿⣿⡇⣰⣿⣿⡿⢿⣿⣿⡇⢸⣿⣿⢀⣤⣶⣿⣿⣿⠟⠛⠻⣿⣿⣿⣿⣮⣿⣿⡷⢰⣿⣿⡟⠁⢸⣿⣿⡇⢸⣿⣿⣿⣿⠿⠿⣿⣿⣿⣦⣄⡀⠈⠛⠿⣿⣿⣿⣧⡀⣾⣿⣿⠃⢸⣿⣿⡇⢸⣿⣿⠋⠁⠈⠙⢻⣿⣿⣿⣶⣤⡀⠹⢿⣿⣷⡄⢸⣿⣿⣇⠸⣿⣿⣷⣦⣼⣿⣿⢸⣿⣿⠻⢿⣿⣿⡇⠘⣿⣿⣿⠈⢿⣿⣿⣦⡀⠈⠛⠿⣿⣿⣿⣿⣄⡀⢀⣠⣼⣿⣿⣿⣿⡇⣿⣿⣿⠇⢻⣿⣿⣿⣷⣦⣀⠈⠙⠻⣿⣿⣿⣶⣶⣿⣿⣿⣿⣿⣿⣿⡇⣠⣿⣿⣿⢸⣿⣿⡿⢿⣿⣿⣿⣦⣠⣴⣿⣿⣿⡿⠟⠋⢸⣿⣿⣿⣿⣷⣴⣿⣿⣿⠃⠘⣿⣿⣷⠈⠛⢿⣿⣿⣿⠿⠋⠉⣠⣴⣿⣿⣿⣿⣿⣿⣿⣿⠟⠁⠻⣿⣿⣿⣤⣀⠈⠉⢀⣤⣶⣿⣿⣿⠿⠟⠁⣰⣿⣿⡟⠋⠁⠈⠿⣿⣿⣿⣿⣶⣾⣿⣿⣿⣿⠟⠋⠁⣠⣼⣿⣿⡟⠙⠛⠛⠛⠻⠛⢿⣿⣿⣿⣿⣷⣾⣿⣿⣿⡿⠏⠈⠙⠛⠿⠿⠿⠿⠛⠉ › Ask Codex to do anything ? for shortcuts[0 q [?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l/Users/user1/cr/rounds/dlg-h58/repo  permissions: YOLO modeBring your unfinished thoughts.[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l   Hooks need review  8 hooks are new or changed.  Hooks can run outside the sandbox after you trust them.  › 1. Review hooks                                                                                                         2. Trust all and continue  3. Continue without trusting (hooks won't run) enter confirm · esc skip                                                                                                 [?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0158-model-announcement-dialog.meta.json b/src/main/runtime/__fixtures__/codex-0158-model-announcement-dialog.meta.json
new file mode 100644
index 000000000000..05790b10e952
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0158-model-announcement-dialog.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-28T21:44:30.000Z",
+  "platform": "darwin",
+  "command": ["codex", "--dangerously-bypass-approvals-and-sandbox"],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.158.0, plain launch on a fresh CODEX_HOME whose config.toml sets an older model with an available upgrade. After the provisional screen, Codex paints its model announcement (`Meet GPT-6 Sol`, `1. Try new model` / `2. Use existing model`, `enter/esc confirm`), which owns Enter. Cut 6 s after spawn. Home-directory user name redacted by hand, same length.",
+  "exitCode": null
+}
diff --git a/src/main/runtime/__fixtures__/codex-0158-model-announcement-dialog.txt b/src/main/runtime/__fixtures__/codex-0158-model-announcement-dialog.txt
new file mode 100644
index 000000000000..a5c88157d749
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0158-model-announcement-dialog.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l>_ OpenAI Codex (v0.158.0)loadingHere for a quick fix or the extended edition?⣀⣤⣤⣤⣀⣀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣦⣤⣤⣤⣤⣤⣤⡀⢀⣾⣿⣿⠿⠋⠉⠉⢉⣭⣿⣿⣿⣿⣿⠿⣿⣿⣿⣿⣷⣄⣀⣾⣿⣿⠃⣀⣴⣾⣿⣿⡿⠟⠋⣀⡀⠈⠙⢿⣿⣿⣧⣀⣶⣿⣿⣿⣿⡇⢸⣿⣿⡿⠛⠉⢀⣠⣴⣿⣿⣿⣷⣦⣀⠈⢻⣿⣿⡇⣰⣿⣿⡿⢿⣿⣿⡇⢸⣿⣿⢀⣤⣶⣿⣿⣿⠟⠛⠻⣿⣿⣿⣿⣮⣿⣿⡷⢰⣿⣿⡟⠁⢸⣿⣿⡇⢸⣿⣿⣿⣿⠿⠿⣿⣿⣿⣦⣄⡀⠈⠛⠿⣿⣿⣿⣧⡀⣾⣿⣿⠃⢸⣿⣿⡇⢸⣿⣿⠋⠁⠈⠙⢻⣿⣿⣿⣶⣤⡀⠹⢿⣿⣷⡄⢸⣿⣿⣇⠸⣿⣿⣷⣦⣼⣿⣿⢸⣿⣿⠻⢿⣿⣿⡇⠘⣿⣿⣿⠈⢿⣿⣿⣦⡀⠈⠛⠿⣿⣿⣿⣿⣄⡀⢀⣠⣼⣿⣿⣿⣿⡇⣿⣿⣿⠇⢻⣿⣿⣿⣷⣦⣀⠈⠙⠻⣿⣿⣿⣶⣶⣿⣿⣿⣿⣿⣿⣿⡇⣠⣿⣿⣿⢸⣿⣿⡿⢿⣿⣿⣿⣦⣠⣴⣿⣿⣿⡿⠟⠋⢸⣿⣿⣿⣿⣷⣴⣿⣿⣿⠃⠘⣿⣿⣷⠈⠛⢿⣿⣿⣿⠿⠋⠉⣠⣴⣿⣿⣿⣿⣿⣿⣿⣿⠟⠁⠻⣿⣿⣿⣤⣀⠈⠉⢀⣤⣶⣿⣿⣿⠿⠟⠁⣰⣿⣿⡟⠋⠁⠈⠿⣿⣿⣿⣿⣶⣾⣿⣿⣿⣿⠟⠋⠁⣠⣼⣿⣿⡟⠙⠛⠛⠛⠻⠛⢿⣿⣿⣿⣿⣷⣾⣿⣿⣿⡿⠏⠈⠙⠛⠿⠿⠿⠿⠛⠉ › Ask Codex to do anything ? for shortcuts[0 q [?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l/Users/user1/cr/rounds/x158mig/repo  permissions: YOLO modeHere for a quick fix or the extended edition?[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l   Meet GPT-6 Sol   Our latest Sol is more intelligent and more efficient so your usage limits go further. This model is a great daily  driver for complex tasks, especially coding. › 1. Try new model                                                                                                        2. Use existing model   enter/esc confirm · ctrl+c quit    [?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0158-model-retired-dialog.meta.json b/src/main/runtime/__fixtures__/codex-0158-model-retired-dialog.meta.json
new file mode 100644
index 000000000000..92137927416c
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0158-model-retired-dialog.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-29T03:31:56.000Z",
+  "platform": "darwin",
+  "command": ["codex", "--dangerously-bypass-approvals-and-sandbox"],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.158.0, plain launch on a fresh CODEX_HOME whose config.toml sets model_provider = \"amazon-bedrock\" and model = \"openai.gpt-5.4\" (0.158 keeps the notice for a model missing from its catalog only on the OpenAI and Bedrock providers, and the OpenAI provider asks for a sign-in first, which the rig does not have). Codex shows the notice without choices: `GPT-5.4 on Amazon Bedrock is no longer offered in Codex`, `Switch to GPT-6 Sol on Amazon Bedrock to continue.` and the key row `enter/esc continue · ctrl+c quit`. Enter or Esc switches the model. No key was sent (only automatic terminal-query replies). Cut 6 s after spawn. Home-directory user name redacted by hand, same length.",
+  "exitCode": null
+}
diff --git a/src/main/runtime/__fixtures__/codex-0158-model-retired-dialog.txt b/src/main/runtime/__fixtures__/codex-0158-model-retired-dialog.txt
new file mode 100644
index 000000000000..fd9fac82c431
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0158-model-retired-dialog.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l>_ OpenAI Codex (v0.158.0)loadingBring a question. Bonus points if it’s a weird one.⣀⣤⣤⣤⣀⣀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣦⣤⣤⣤⣤⣤⣤⡀⢀⣾⣿⣿⠿⠋⠉⠉⢉⣭⣿⣿⣿⣿⣿⠿⣿⣿⣿⣿⣷⣄⣀⣾⣿⣿⠃⣀⣴⣾⣿⣿⡿⠟⠋⣀⡀⠈⠙⢿⣿⣿⣧⣀⣶⣿⣿⣿⣿⡇⢸⣿⣿⡿⠛⠉⢀⣠⣴⣿⣿⣿⣷⣦⣀⠈⢻⣿⣿⡇⣰⣿⣿⡿⢿⣿⣿⡇⢸⣿⣿⢀⣤⣶⣿⣿⣿⠟⠛⠻⣿⣿⣿⣿⣮⣿⣿⡷⢰⣿⣿⡟⠁⢸⣿⣿⡇⢸⣿⣿⣿⣿⠿⠿⣿⣿⣿⣦⣄⡀⠈⠛⠿⣿⣿⣿⣧⡀⣾⣿⣿⠃⢸⣿⣿⡇⢸⣿⣿⠋⠁⠈⠙⢻⣿⣿⣿⣶⣤⡀⠹⢿⣿⣷⡄⢸⣿⣿⣇⠸⣿⣿⣷⣦⣼⣿⣿⢸⣿⣿⠻⢿⣿⣿⡇⠘⣿⣿⣿⠈⢿⣿⣿⣦⡀⠈⠛⠿⣿⣿⣿⣿⣄⡀⢀⣠⣼⣿⣿⣿⣿⡇⣿⣿⣿⠇⢻⣿⣿⣿⣷⣦⣀⠈⠙⠻⣿⣿⣿⣶⣶⣿⣿⣿⣿⣿⣿⣿⡇⣠⣿⣿⣿⢸⣿⣿⡿⢿⣿⣿⣿⣦⣠⣴⣿⣿⣿⡿⠟⠋⢸⣿⣿⣿⣿⣷⣴⣿⣿⣿⠃⠘⣿⣿⣷⠈⠛⢿⣿⣿⣿⠿⠋⠉⣠⣴⣿⣿⣿⣿⣿⣿⣿⣿⠟⠁⠻⣿⣿⣿⣤⣀⠈⠉⢀⣤⣶⣿⣿⣿⠿⠟⠁⣰⣿⣿⡟⠋⠁⠈⠿⣿⣿⣿⣿⣶⣾⣿⣿⣿⣿⠟⠋⠁⣠⣼⣿⣿⡟⠙⠛⠛⠛⠻⠛⢿⣿⣿⣿⣿⣷⣾⣿⣿⣿⡿⠏⠈⠙⠛⠿⠿⠿⠿⠛⠉ › Ask Codex to do anything ? for shortcuts[0 q [?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l/Users/user1/cr/rounds/dlg-m58b/repo  permissions: YOLO modeBring a question. Bonus points if it’s a weird one.[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l   GPT-5.4 on Amazon Bedrock is no longer offered in Codex   Codex now uses GPT-6 Sol on Amazon Bedrock in place of GPT-5.4 on Amazon Bedrock. Switch to GPT-6 Sol on Amazon  Bedrock to continue.  enter/esc continue · ctrl+c quit    [?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/codex-0158-update-available-dialog.meta.json b/src/main/runtime/__fixtures__/codex-0158-update-available-dialog.meta.json
new file mode 100644
index 000000000000..db18029d3085
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0158-update-available-dialog.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-29T03:30:10.000Z",
+  "platform": "darwin",
+  "command": ["codex", "--dangerously-bypass-approvals-and-sandbox"],
+  "cols": 120,
+  "rows": 40,
+  "note": "codex-cli 0.158.0, plain launch on a fresh CODEX_HOME whose config.toml sets check_for_update_on_startup = true, with a version.json cache naming 0.159.0 checked moments earlier (so no network check) and CODEX_MANAGED_BY_NPM=1 so Codex offers an update command. Over the provisional screen Codex paints `Update available · 0.158.0 → 0.159.0`, `1. Update now (runs `npm install -g @openai/codex`)` / `2. Skip` / `3. Skip until next version` and the key row `enter continue · esc skip`, where older builds wrote `Press enter to continue`. Enter picks Update now. No key was sent (only automatic terminal-query replies). Cut 6 s after spawn. Home-directory user name redacted by hand, same length.",
+  "exitCode": null
+}
diff --git a/src/main/runtime/__fixtures__/codex-0158-update-available-dialog.txt b/src/main/runtime/__fixtures__/codex-0158-update-available-dialog.txt
new file mode 100644
index 000000000000..2c92e766ae26
--- /dev/null
+++ b/src/main/runtime/__fixtures__/codex-0158-update-available-dialog.txt
@@ -0,0 +1 @@
+[?2004h[>4;0m[>7u[?1004h]10;?\]11;?\[?u[?2026h[?25l[?1049h[>4;0m[>7u[?1007l[?1000h[?1002h[?1006h[?1003h[?25l[?2026h[?25l>_ OpenAI Codex (v0.158.0)loadingHere for a quick fix or the extended edition?⣀⣤⣤⣤⣀⣀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣦⣤⣤⣤⣤⣤⣤⡀⢀⣾⣿⣿⠿⠋⠉⠉⢉⣭⣿⣿⣿⣿⣿⠿⣿⣿⣿⣿⣷⣄⣀⣾⣿⣿⠃⣀⣴⣾⣿⣿⡿⠟⠋⣀⡀⠈⠙⢿⣿⣿⣧⣀⣶⣿⣿⣿⣿⡇⢸⣿⣿⡿⠛⠉⢀⣠⣴⣿⣿⣿⣷⣦⣀⠈⢻⣿⣿⡇⣰⣿⣿⡿⢿⣿⣿⡇⢸⣿⣿⢀⣤⣶⣿⣿⣿⠟⠛⠻⣿⣿⣿⣿⣮⣿⣿⡷⢰⣿⣿⡟⠁⢸⣿⣿⡇⢸⣿⣿⣿⣿⠿⠿⣿⣿⣿⣦⣄⡀⠈⠛⠿⣿⣿⣿⣧⡀⣾⣿⣿⠃⢸⣿⣿⡇⢸⣿⣿⠋⠁⠈⠙⢻⣿⣿⣿⣶⣤⡀⠹⢿⣿⣷⡄⢸⣿⣿⣇⠸⣿⣿⣷⣦⣼⣿⣿⢸⣿⣿⠻⢿⣿⣿⡇⠘⣿⣿⣿⠈⢿⣿⣿⣦⡀⠈⠛⠿⣿⣿⣿⣿⣄⡀⢀⣠⣼⣿⣿⣿⣿⡇⣿⣿⣿⠇⢻⣿⣿⣿⣷⣦⣀⠈⠙⠻⣿⣿⣿⣶⣶⣿⣿⣿⣿⣿⣿⣿⡇⣠⣿⣿⣿⢸⣿⣿⡿⢿⣿⣿⣿⣦⣠⣴⣿⣿⣿⡿⠟⠋⢸⣿⣿⣿⣿⣷⣴⣿⣿⣿⠃⠘⣿⣿⣷⠈⠛⢿⣿⣿⣿⠿⠋⠉⣠⣴⣿⣿⣿⣿⣿⣿⣿⣿⠟⠁⠻⣿⣿⣿⣤⣀⠈⠉⢀⣤⣶⣿⣿⣿⠿⠟⠁⣰⣿⣿⡟⠋⠁⠈⠿⣿⣿⣿⣿⣶⣾⣿⣿⣿⣿⠟⠋⠁⣠⣼⣿⣿⡟⠙⠛⠛⠛⠻⠛⢿⣿⣿⣿⣿⣷⣾⣿⣿⣿⡿⠏⠈⠙⠛⠿⠿⠿⠿⠛⠉ › Ask Codex to do anything ? for shortcuts[0 q [?25h[?2026l[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l/Users/user1/cr/rounds/dlg-u58/repo  permissions: YOLO modeHere for a quick fix or the extended edition?[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25h[?2026l[?2026h[?25l   Update available · 0.158.0 → 0.159.0  Release notes: ]8;;https://github.com/openai/codex/releases/latesthttps://github.com/openai/codex/releases/latest]8;; › 1. Update now (runs `npm install -g @openai/codex`)                                                                     2. Skip  3. Skip until next version   enter continue · esc skip    [?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/dsh-tui-ready-no-key.meta.json b/src/main/runtime/__fixtures__/dsh-tui-ready-no-key.meta.json
new file mode 100644
index 000000000000..5c5284b50567
--- /dev/null
+++ b/src/main/runtime/__fixtures__/dsh-tui-ready-no-key.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-23T07:34:39.531Z",
+  "platform": "darwin",
+  "command": ["dsh-tui"],
+  "cols": 120,
+  "rows": 40,
+  "note": "dsh-tui 0.10.2 on @deepseek-ai/dsh 0.1.5-rc.1, macOS arm64, no DEEPSEEK_API_KEY, empty workspace, DSH_TUI_LANG=en",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/dsh-tui-ready-no-key.txt b/src/main/runtime/__fixtures__/dsh-tui-ready-no-key.txt
new file mode 100644
index 000000000000..34f9432049a9
--- /dev/null
+++ b/src/main/runtime/__fixtures__/dsh-tui-ready-no-key.txt
@@ -0,0 +1 @@
+[?25l[?2004h[?1004h]11;?[>0q[?1049h[?1000h[?1002h[?1003h[?1006h]0;✦ 🐋 ]8;;
✦ dsh-TUI  v0.10.2
█▀▀▀▄█▀▀▀▀█▀▀▀▀█▀▀▀▄█▀▀▀▀█▀▀▀▀█▀▀▀▀██
███████████
▄▀▄▄███▀▀▀█▀▀▀█▄▄▄▀▀▀▀▄█▀▀▀█▀▀▀██
▀▀▀▀▄▄▄▀▀▀██████████
▄▄▄▄▄▄▄▄▄▀▀▀▀▀▀▀▀▀▀▀▀█▄▄▄▀█▄▄▄▄█▄▄▄▄██▄▄▄▀█▄▄▄▄█▄▄▄▄██
▄▀▀▀▀▀▀▀▀▀▀▀▀▄▄▀▀▀▀▀▀▀▀▀██▄▀▄█▀▀▀▄███▀▀▀▀█▀▀▀▀█▀▀▀▀
▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄▄▀▀▀▀▀████████████
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀█▀▀▀██▀▀▀██▄▄▄▀████▀▀▀▀▀▀▄▀▀▀▄
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀████████████
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀█████████▄▄▄▄█▄▄▄▀█▄▄▄▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀deepseek-flash · Max effort
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄/private/tmp/dsh-ws
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀Tip: Clicktool/thinking/summaryrowstofold;subagentcardsopendetail;…
⚠ The dsh engine (0.1.5-rc.3) is newer than the 0.1.5-rc.1 this UI is 
validated against, so issues are possible; downgrade via npm i -g 
@deepseek-ai/dsh@0.1.5-rc.1 for stability, or wait for a dsh-tui update.
Explore the uncharted!
▶（Ctrl+P to expand）Contextloaded·Systemprompt18sections·Runtimecontext2items·Skills14·Tools27
╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
❯  ⛶
╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
deepseek-flash · max · dsh-ws]8;;
✦
█
█
█
█
█
█
█
█
█
█
E]8;;
✦ 
█▀
█
█
█
█▄
█
█
█▀
█
█
Ex]8;;
✦ ds
█▀▀▀
█
█
█
█▄▄▄
█
█
█▀▀▀
█
█
Expl]8;;
✦ dsh
█▀▀▀▄
██
██
██
█▄▄▄▀
██
██
█▀▀▀█
██
██
Explo]8;;
✦ dsh-
█▀▀▀▄
██
██
██
█▄▄▄▀
██
██
█▀▀▀█
██
██
Explor]8;;
▀▀]8;;
✦ dsh-T
█▀▀▀▄█
███
███
███
█▄▄▄▀█
██
███
█▀▀▀██
███
███
Explore]8;;
✦ dsh-TU
█▀▀▀▄█▀
███
███▀
███
█▄▄▄▀█▄
██▄
███
█▀▀▀██▀
███
███
Explore ]8;;
✦ dsh-TU
█▀▀▀▄█▀
███
███▀
███
█▄▄▄▀█▄
██▄
███
█▀▀▀██▀
███
███
Explore ]8;;
✦ dsh-TUI
▀▀▄█▀▀▀
██
██▀▀▀
██
▄▄▀█▄▄▄
█▄▀▄
██
▀▀██▀▀▀
██
██
Explore th]8;;
▀▀]8;;
✦ dsh-TUI
▀▀▄█▀▀▀▀
██
██▀▀▀
██
▄▄▀█▄▄▄▄
█▄▀▄
███
▀▀██▀▀▀█
███
███
Explore the]8;;
 dsh-TUI
▀▄█▀▀▀▀
██
██▀▀▀
██
▄▀█▄▄▄▄
█▄▀▄
███
▀██▀▀▀█
███
███
xplore the ]8;;
dsh-TUI
▄█▀▀▀▀█▀
███
██▀▀▀█▀
███
▀█▄▄▄▄█▄
█▄▀▄█▀
████
██▀▀▀██▄
████
████
plore the un]8;;
h-TUI
█▀▀▀▀█▀▀
██
█▀▀▀█▀▀
██
█▄▄▄▄█▄▄
▄▀▄█▀▀
███
█▀▀▀██▄▄
████
███
ore the unc]8;;
-
▀▀▀▀█▀▀▀
█
▀▀▀█▀▀▀
█
▄▄▄▄█▄▄▄
▄▀
▀▄
re the unch]8;;
▄▄▄
▀]8;;
TUI
▀▀▀█▀▀▀▀
█
▀▀█▀▀▀
█
▄▄▄█▄▄▄▄
▀▄█▀▀▀▄
███
▀▀██▄▄▄▀
███
███
e the uncha]8;;
UI
▀▀█▀▀▀▀
█
▀█▀▀▀
█
▄▄█▄▄▄▄
▄█▀▀▀▄
███
▀██▄▄▄▀
███
███
 the unchar]8;;
▄
▀▀▀▀▀]8;;
I
▀█▀▀▀▀█
██
█▀▀▀█
██
▄█▄▄▄▄█
█▀▀▀▄█
████
██▄▄▄▀█
████
████
the unchart]8;;
█▀▀▀▀█▀
██
█▀▀▀█▄
██
█▄▄▄▄█
█▀▀▀▄█
████
█▄▄▄▀█
███
███
he uncharte]8;;
▄▄▀▄▄
▀▀▀▀]8;;
█▀▀▀▀█▀
██
█▀▀▀█▄
██
█▄▄▄▄█
█▀▀▀▄█
████
█▄▄▄▀█
███
███
e uncharte]8;;
▀▀█▀▀▀▄
██
▀█▄▄▄▀
█
▄▄█
▀▄██
████
▄▀███
███
███
ncharted!]8;;
▄
▄▄▀▀▀▀▀▀▄▄
▀   ▀▀   ▀
▄]8;;
▀▀█▀▀▀▄
██
▀█▄▄▄▀
█
▄▄█
▀▄██
████
▄▀███
███
███
ncharted!]8;;
▀█▀▀▀▄█
███
█▄▄▄▀
█
▄██
▄███
█████
▀████
████
████
charted!]8;;
█▀▀▀▄█▀
███
█▄▄▄▀▀
█
██▄
███▀
████
████▀
████
███▄
harted!]8;;
▄▄▄▄
▄▀▀▀▀▄▄▀▀▀▀▄
▀  ▀  ▀]8;;
█▀▀▀▄█▀▀
███
█▄▄▄▀▀▀
█
██▄▄
███▀▀
████
████▀▀
████
███▄▄
arted!]8;;
▀▀▀▄█▀▀▀
██
▄▄▄▀▀▀▀
█▄▄▄
██▀▀
███
███▀▀
███
██▄▄
rted!]8;;
▄  ▄
▄▀    ▀▄
▀  ▀]8;;
▀▀▄█▀▀▀▀
██
▄▄▀▀▀▀▄
█
█▄▄▄▀
██▀▀▀▀
██
███▀▀▀
███
██▄▄▄▄
ted!]8;;
✦
▀▄█▀▀▀▀
██
▄▀▀▀▀▄
█
█▄▄▄▀
██▀▀▀▀
██
██▀▀▀
███
██▄▄▄▄
ed!]8;;
     
           
   ]8;;
✦ d
▄█▀▀▀▀█▀
███
▀▀▀▀▄█▀
██
█▄▄▄▀█▄
██▀▀▀▀█▀
███
██▀▀▀▀
██
██▄▄▄▄█▄
d!]8;;
✦ ds
█▀▀▀▀█▀▀
██
▀▀▀▄█▀▀
██
█▄▄▄▀█▄▄
█▀▀▀▀█▀
██
█▀▀▀▀
█
█▄▄▄▄█▄]8;;
✦ ds
▀▀▀▀█▀▀
█
▀▀▀▄█▀▀
██
▄▄▄▀█▄▄
▀▀▀▀█▀
█
▀▀▀▀
▄▄▄▄█▄]8;;
✦ dsh-
▀▀█▀▀▀▀
█
▀▄█▀▀▀
██
▄▀█▄▄▄▄
▀▀
▀
▄▄]8;;
 ▄▀▄ ▄
 ▀▀▀▄ ▄▀▀▀
  ▀▀▀▀▀▀
 ▀▀▀▀
 ▄▀▀▀
▀▀▀
▀▀
▀▀]8;;
✦ dsh-T
▀▀█▀▀▀▀
█
▀▄█▀▀▀
██
▄▀█▄▄▄▄
▀▀█▀▀
█
▀▀▀
▄▄█▄▄]8;;
✦ dsh-TU
▀█▀▀▀▀█
██
▄█▀▀▀█
███
▀█▄▄▄▄█
▀█▀▀█
██
▀▄
█
▄█▄▀█]8;;
  ▀▄ ▄
  ▀▀▀▀   ▄▀▀▀
 ▀▀▄▀▀▀▀▀▀
 ▀▀▀▀▀▀
▄▄▀▀▀▀▀
▀▀▀▀
▀▀]8;;
✦ dsh-TUI
█▀▀▀▀█▀
██
█▀▀▀█▀
██
█▄▄▄▄█▄
█▀▀▀▀█▀
██
▀▀▀▄▀
█
█▄▄▄▀█▄]8;;
✦ dsh-TUI
█▀▀▀▀█▀▀
██
█▀▀▀█▀▀
██
█▄▄▄▄█▄▄
█▀▀█▀▀
██
▀▀▀▀
█▄▄█▄▄]8;;
   ▄ 
  ▀▀▀    
 ▀   ▄▀▀▄
▀▄▀▀▀▀▀
 ▀▀▀▀▀
▀▀▀▀▀
▀▀
▀▀
▀]8;;
✦ dsh-TUI
▀▀▀▀█▀▀▀▀
█
▀▀▀█▀▀▀
█
▄▄▄▄█▄▄▄▄
▀▀▀▀▀
▀▀▀▀▄
█
▄▄▄▄▀]8;;
dsh-TUI
▀▀█▀▀▀▀
█
▀█▀▀▀
█
▄▄█▄▄▄▄
▀█▀▀▀▀
█
▀▀▀▀▄
█
▄█▄▄▄▀]8;;
sh-TUI
▀█▀▀▀▀█
██
█▀▀▀█
██
▄█▄▄▄▄█
▀█▀▀▀▀
█
▄▀▀▀▄
██
▀█▄▄▄▀
E]8;;
 
   ▄▀▄
   ▀▀▀▀    
  ▀▀▀▀    ▄
  ▄▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀
▀▀▀▀
▀]8;;
h-TUI
█▀▀▀▀█
██
█▀▀▀██
██
█▄▄▄▄█
█▀▀▀▀
█
▀▀▀▄
█
█▄▄▄▀
Ex]8;;
-TUI
█▀▀▀▀█
███
█▀▀▀██
███
█▄▄▄▄█
█▀▀▀▀
█
▀▀▀▄
█
█▄▄▄▀
Exp]8;;
▄
▀▀▀   
▀▀▀▀▄  ▄▀▀▄
▀▀▀▀▄▀▀▀▀▀ 
▄▄▀▀▀▀▀   
▀▀▀▀▀    
▀     
▀▀▀ 
 ]8;;
TUI
▀▀▀▀█
██
▀▀▀██
██
▄▄▄▄█
▀▀▀▀
▀▀▀▄
█
▄▄▄▀
Expl]8;;
UI
▀▀▀██
██
▀▀██
██
▄▄▄██
Explo]8;;
I
▀▀██
██
▀██
██
▄▄██
▀
▄
█
▀
Explor]8;;
▄▀▄ ▄
▀▀▀▀ ▄▀▀▀
▀▀▀▀▀▀▀▀ 
▀▀▀▀▀▀ 
▄▀▀▀  
▀▀▀  
▀ 
▀ 
 ]8;;
▀██
██
██
██
▄██
▀
▄
█
▀
Explore]8;;
██
██
██
██
██
Explore t]8;;
▄▀  ▄ 
▀▀▀▀▄ ▄▄▀▀▀  
▀▀▀▀▀▀▀▀  
▀▀▀▀▀  
 ▀▀▀   
▀▀▀ 
▀▀]8;;
█
█
█
█
█
Explore th]8;;
█
█
█
█
Explore the]8;;
▄▀▄ ▄ 
▀▀▀▄ ▄▀▀▀ 
▀▀▀▀▀▀▀ 
▀▀▀▀ 
▄▀▀▀ 
▀▀ 
▀ 
▀ ]8;;
█
█
xplore the ]8;;
█
█
plore the u]8;;
lore the un]8;;
ore the unc]8;;
re the unch]8;;
e the unch]8;;
▀▀
▀▀▀▀▄
▀ ]8;;
▀
▀▀▀▄▄
▀▀▀▀▀
 ]8;;
▀
▀▀▀  
▀▀▀▄ 
▀]8;;
▀▀
▀▀▀▄ 
 ▀]8;;
 ▄▀▄ ▄
 ▀▀▀▄ ▄▀▀▀
  ▀▀▀▀▀▀
 ▀▀▀▀
 ▄▀▀▀
▀▀▀
▀▀
▀▀]8;;
  ▀▄ ▄
  ▀▀▀▀   ▄▀▀▀
 ▀▀▄▀▀▀▀▀▀
 ▀▀▀▀▀▀
▄▄▀▀▀▀▀
▀▀▀▀
▀▀]8;;
   ▄ 
  ▀▀▀    
 ▀   ▄▀▀▄
▀▄▀▀▀▀▀
 ▀▀▀▀▀
▀▀▀▀▀
▀▀
▀▀
▀]8;;
 
   ▄▀▄
   ▀▀▀▀    
  ▀▀▀▀    ▄
  ▄▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀
▀▀▀▀
▀]8;;
▄
▀▀▀   
▀▀▀▀▄  ▄▀▀▄
▀▀▀▀▄▀▀▀▀▀ 
▄▄▀▀▀▀▀   
▀▀▀▀▀    
▀     
▀▀▀ 
 ]8;;
▀▀
▀▀▀▀▄
▀ ]8;;
▄▀▄ ▄
▀▀▀▀ ▄▀▀▀
▀▀▀▀▀▀▀▀ 
▀▀▀▀▀▀ 
▄▀▀▀  
▀▀▀  
▀ 
▀▀ 
▀▀▀▄▄
▀▀▀▀▀
 ]8;;
▀▀]8;;
▀
▀▀▀  
▀▀▀▄ 
▀]8;;
▀▀]8;;
▄▀  ▄ 
▀▀▀▀▄ ▄▄▀▀▀  
▀▀▀▀▀▀▀▀  
▀▀▀▀▀  
 ▀▀▀   
▀▀▀ 
▀▀]8;;
▀▀
▀▀▀▄ 
 ▀]8;;
▄▀▄ ▄ 
▀▀▀▄ ▄▀▀▀ 
▀▀▀▀▀▀▀ 
▀▀▀▀ 
▄▀▀▀ 
▀▀ 
▀ 
▀ ]8;;
▀▀
▀▀▀▀▄
▀ ]8;;
▀
▀▀▀▄▄
▀▀▀▀▀
 ]8;;
▀
▀▀▀  
▀▀▀▄ 
▀]8;;
▀▀
▀▀▀▄ 
 ▀]8;;
 ▄▀▄ ▄
 ▀▀▀▄ ▄▀▀▀
  ▀▀▀▀▀▀
 ▀▀▀▀
 ▄▀▀▀
▀▀▀
▀▀
▀▀]8;;
  ▀▄ ▄
  ▀▀▀▀   ▄▀▀▀
 ▀▀▄▀▀▀▀▀▀
 ▀▀▀▀▀▀
▄▄▀▀▀▀▀
▀▀▀▀
▀▀]8;;
   ▄ 
  ▀▀▀    
 ▀   ▄▀▀▄
▀▄▀▀▀▀▀
 ▀▀▀▀▀
▀▀▀▀▀
▀▀
▀▀
▀]8;;
 
   ▄▀▄
   ▀▀▀▀    
  ▀▀▀▀    ▄
  ▄▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀
▀▀▀▀
▀]8;;
▀▀
▀▀▀▀▄
▀ ]8;;
▄
▀▀▀   
▀▀▀▀▄  ▄▀▀▄
▀▀▀▀▄▀▀▀▀▀ 
▄▄▀▀▀▀▀   
▀▀▀▀▀    
▀     
▀▀▀ 
 ]8;;
▀▀]8;;
▀
▀▀▀▀▄
▀▀▀▀▀
 ]8;;
▀▀]8;;
▀
▀▀▀▀ 
▀▀▀▄ 
▀]8;;
▄▀▄ ▄
▀▀▀▀ ▄▀▀▀
▀▀▀▀▀▀▀▀ 
▀▀▀▀▀▀ 
▄▀▀▀  
▀▀▀  
▀ 
▀ 
 ]8;;
▀▀▀▀
▀▀▀▀
▄▀▄▄]8;;
▀▀
▀▀▀▄ 
 ▀]8;;
▄▀  ▄ 
▀▀▀▀▄ ▄▄▀▀▀  
▀▀▀▀▀▀▀▀  
▀▀▀▀▀  
 ▀▀▀   
▀▀▀ 
▀▀]8;;
▄▄▄▄    
  ▄
 ▀▀▀▀
▀▀▀▀]8;;
▄▀▄ ▄ 
▀▀▀▄ ▄▀▀▀ 
▀▀▀▀▀▀▀ 
▀▀▀▀ 
▄▀▀▀ 
▀▀ 
▀ 
▀ ]8;;
 ▀▀▀▀
▀▄▄
▄▄▄▄    
▄▄▄]8;;
  ▄
 ▀▀▀▀
 ▀▀▀▀]8;;
▀▄▄
▄▄▄▄    
  ▄
▀▀▀]8;;
 ▀▀▀▀
 ▀▀▀▀
▀▄▄
▄▄▄ ]8;;
▀▀
▀▀▀▀▄
▀ ]8;;
▄▄▄▄    
  ▄
 ▀▀▀▀
▀▀▀▀]8;;
▀
▀▀▀▄▄
▀▀▀▀▀
 ]8;;
 ▀▀▀▀
▀▄▄
▄▄▄▄    
▄▄▄]8;;
▀
▀▀▀  
▀▀▀▄ 
▀]8;;
▀▀
▀▀▀▄ 
 ▀]8;;
  ▄
 ▀▀▀▀
 ▀▀▀▀]8;;
▀▄▄
▄▄▄▄    
  ▄
▀▀▀]8;;
 ▀▀▀▀
 ▀▀▀▀
▀▄▄
▄▄▄ ]8;;
 ▄▀▄ ▄
 ▀▀▀▄ ▄▀▀▀
  ▀▀▀▀▀▀
 ▀▀▀▀
 ▄▀▀▀
▀▀▀
▀▀
▀▀]8;;
▄▄▄▄    
  ▄
 ▀▀▀▀
▀▀▀▀]8;;
  ▀▄ ▄
  ▀▀▀▀   ▄▀▀▀
 ▀▀▄▀▀▀▀▀▀
 ▀▀▀▀▀▀
▄▄▀▀▀▀▀
▀▀▀▀
▀▀]8;;
 ▀▀▀▀
▀▄▄
▄▄▄▄    
▄▄▄]8;;
   ▄ 
  ▀▀▀    
 ▀   ▄▀▀▄
▀▄▀▀▀▀▀
 ▀▀▀▀▀
▀▀▀▀▀
▀▀
▀▀
▀]8;;
  ▄
 ▀▀▀▀
 ▀▀▀▀]8;;
▀▀]8;;
▀▀
▀▀▀▀▄
▀ ]8;;
 
   ▄▀▄
   ▀▀▀▀    
  ▀▀▀▀    ▄
  ▄▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀
▀▀▀▀
▀]8;;
▀▀]8;;
▀
▀▀▀▀▀
▀▀▀▀▀
 ]8;;
▀▄▄
▄▄▄▄    
  ▄
▀▀▀]8;;
▄
▀▀▀   
▀▀▀▀▄  ▄▀▀▄
▀▀▀▀▄▀▀▀▀▀ 
▄▄▀▀▀▀▀   
▀▀▀▀▀    
▀     
▀▀▀ 
▄
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/freebuff-lifecycle.meta.json b/src/main/runtime/__fixtures__/freebuff-lifecycle.meta.json
new file mode 100644
index 000000000000..57f6174485f2
--- /dev/null
+++ b/src/main/runtime/__fixtures__/freebuff-lifecycle.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-28T07:56:49.813Z",
+  "platform": "darwin",
+  "command": ["freebuff", "--cwd", "/tmp/orca-freebuff-folder-workspace"],
+  "cols": 120,
+  "rows": 40,
+  "note": "Freebuff 0.1.2 authenticated free plan; choice, answer, tool, interruption, tool error",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/freebuff-lifecycle.txt b/src/main/runtime/__fixtures__/freebuff-lifecycle.txt
new file mode 100644
index 000000000000..0f965581bceb
--- /dev/null
+++ b/src/main/runtime/__fixtures__/freebuff-lifecycle.txt
@@ -0,0 +1 @@
+]11;?]10;?[?2031h]10;?]11;?[>0q[?25l[?1016$p[?2027$p[?2031$p[?1004$p[?2004$p[?2026$p[?u]99;i=opentui-notifications:p=?;\]1337;Capabilities\]66;w=1; \]66;s=2; \[?1049h[>4;1m[?2027h[?2004h[?1000h[?1002h[?1003h[?1006h]4;0;?[?2026h[?25l ███████████                        ██                 ▄████  ▄██                                                        ███▀▀▀▀▀▀▀▀                        ██                 ██    ██▀                                                         ███ █████  ██████ ▄█████   ▄████▄  ██████▄  ██   ██ ████████████                                                        ███ ███▀▀  ██▀   ███▄▄▄██ ██▄▄▄███ ██   ▀██ ██   ██   ██    ██                                                          ███ ███    ███   ███▀▀▀▀▀ ██▀▀▀▀▀  ██▄  ▄██ ██▄  ██   ██    ██                                                          ███ ██▀    ██▀    ▀█████   ▀████▀  ██████▀   ▀████▀   ██    ██                                                                                                                                                                                  ┌──────────────────────────────────────────────────────────────────┐                                                    │ Your first message starts the session.                           │                                                    │ Some models aren't available on this connection                  │                                                    └──────────────────────────────────────────────────────────────────┘                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│                                                                                                                      ││  ▍Enter a coding task or / for commands                                                                              ││                                                                                                                      │╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ GLM 5.3 Flash • max · /private/tmp/orca-freebuff-folder-workspace · /model to change · Chat: New chat                   ← for history · ? for help                                                                                             [?2026l[?1004h[?2026h[?25l│ 1 day streak                                                     │└──────────────────────────────────────────────────────────────────┘[?2026l[?2026h[?25l100/100 Freebucks remaining                    │                                                                  ││✦ Refer friends → earn Freebucks:││││⎘ Copy invite link  Learn More ↵│└──────────────────────────────────────────────────────────────────┘[?2026l[?2026h[?25l ███████████                        ██                 ▄████  ▄██                                                        ███▀▀▀▀▀▀▀▀                        ██                 ██    ██▀                                                         ███ █████  ██████ ▄█████   ▄████▄  ██████▄  ██   ██ ████████████                                                        ███ ███▀▀  ██▀   ███▄▄▄██ ██▄▄▄███ ██   ▀██ ██   ██   ██    ██                                                          ███ ███    ███   ███▀▀▀▀▀ ██▀▀▀▀▀  ██▄  ▄██ ██▄  ██   ██    ██                                                          ███ ██▀    ██▀    ▀█████   ▀████▀  ██████▀   ▀████▀   ██    ██                                                                                                                                                                                  ┌──────────────────────────────────────────────────────────────────┐                                                    │ Your first message starts the session.                           │                                                    │ 100/100 Freebucks remaining                                      │                                                    │ 1 day streak                                                     │                                                    │                                                                  │                                                    │ ✦ Refer friends → earn Freebucks:                                │                                                    │                                                                  │                                                    │ ⎘ Copy invite link  Learn More ↵                                 │                                                    └──────────────────────────────────────────────────────────────────┘                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│                                                                                                                      ││  ▍Enter a coding task or / for commands                                                                              ││                                                                                                                      │╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ GLM 5.3 Flash • max · /private/tmp/orca-freebuff-folder-workspace · /model to change · Chat: New chat                   ← for history · ? for help                                                                                             [?2026l[?2026h[?25l╭────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│Geo Daniela — La primera IA de remuneraciones de Chile  Ad││Liquidaciones PDF, Previred CSV, LRE CSV y portal del trabajador. Demo 30 min para PYME.││ Learn more geodaniela.cl│╰────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯[?2026l[?2026h[?25lUse ask_user to ask me to choose blue orgreen.Waitformyreply.Donotmodifyfiles.▍[?2026l]0;Freebuff: Use ask_user to ask me to choose blue or green. W…[?2026h[?25l                                                                                                                        ┌──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐│Starting your model session… Your message is saved.                               ││Esc: back to draft│└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘[?2026l[?2026h[?25lSession active                        └──────────────────────────────────────────────────────────────────┘                                    [12:55 AM]  Use ask_user to ask me to choose blue or green. Wait for my reply. Do not modify files. ⎘                                                                    ╭────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│Geo Daniela — La primera IA de remuneraciones de Chile  Ad││ Liquidaciones PDF, Previred CSV, LRE CSV y portal del trabajador. Demo 30 min para PYME.                           │ Learn more  geodaniela.cl                                ╰────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ 44m left                                                                                                ✕ End session  ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│││  ▍Enter a coding task or / for commands                                                                              ││                                                   │╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ GLM 5.3 Flash • max · /private/tmp/orca-freebuff-folder-workspace · /model to change · Chat: Use ask_user to ask me to choose blue or green.Wait for my reply. Do not modify files.                                        [?2026l[?2026h[?25lthinking...        ■ Esc[?2026l[?2026h[?25lhinking...[?2026l[?2026h[?25ltinking...[?2026l[?2026h[?25lthnking...[?2026l[?2026h[?25lthiking...[?2026l[?2026h[?25lthining...[?2026l[?2026h[?25lthinkng...[?2026l[?2026h[?25l1s[?2026l[?2026h[?25lthinkig...[?2026l[?2026h[?25lthinkin...[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lhinking...[?2026l[?2026h[?25l2[?2026l[?2026h[?25ltinking...[?2026l[?2026h[?25lthnking...[?2026l[?2026h[?25lthiking...[?2026l[?2026h[?25lthining...[?2026l[?2026h[?25lthinkng...[?2026l[?2026h[?25lthinkig...[?2026l[?2026h[?25l3[?2026l[?2026h[?25lthinkin...[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lhinking...[?2026l[?2026h[?25ltinking...[?2026l[?2026h[?25l4[?2026l[?2026h[?25lthnking...[?2026l[?2026h[?25lthiking...[?2026l[?2026h[?25lthining...[?2026l[?2026h[?25lthinkng...[?2026l[?2026h[?25lthinkig...[?2026l[?2026h[?25lthinkin...[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25l5[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lhinking...[?2026l[?2026h[?25ltinking...[?2026l[?2026h[?25lthnking...[?2026l[?2026h[?25lthiking...[?2026l[?2026h[?25l6[?2026l[?2026h[?25lthining...[?2026l[?2026h[?25lthinkng...[?2026l[?2026h[?25lworking... [?2026l[?2026h[?25l• ThinkingThe user wants me to ask them to choose between blue and green using the ask_user tool. This is straightforward — I should call ask_user with a single question offering those two options, then wait for their reply. No file modifications needed.[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l ▀▀  ██▀███▄▄▄████▄▄▄███▀███████   ██   ███    ██████▀▀▀▀▀██▀▀▀▀▀▄▄████▄██ ▀  ▀   ▀▀▀▀ ▀███▀                                                                      ┌──────────────────────────────────────────────────────────────────┐│ Session active                                              ││100/100 Freebucks remaining││ 1 day streak                                                     │└──────────────────────────────────────────────────────────────────┘                              [12:55 AM]     Use ask_user to ask me to choose blue or green. Wait for my reply. Do not modify files. ⎘ • Thinking   The user wants me to ask them to choose between blue and green using the ask_user tool. This is straightforward — I should call ask_user with a single question offering those two options, then wait for   their reply. No file modifications needed.                                                                                                ╭────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│Geo Daniela — La primera IA de remuneraciones de Chile  Ad││Liquidaciones PDF, Previred CSV, LRE CSV y portal del trabajador. Demo 30 min para PYME.││ Learn more geodaniela.cl│╰────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯                                                                                                                     6s ╭─────────────────────────────────────────────── Some questions for you ───────────────────────────────────────────────╮│Close ✕││                                                                                                                      ││▼ Which color would you like to choose?                      ││  ○ Blue                                                                                                              ││    Pick blue as the color                                                                                            ││  ○ Green                                                                                                             ││  ○ Custom                                                                                                            ││                                                                                                                      ││╭──────────╮│││ Submit  │    ↑↓ navigate • Enter select││╰──────────╯│╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯[?2026l[?2026h[?25l7[?2026l[?2026h[?25l [?2026l[?2026h[?25l█████                          ▄███ ▄██▀▀▀▀▀▀▀▀                           ▀███████▄▄▄▄██   ████████████ ███▀▀  ██▀   ███▄▄▄██ ██▄▄▄███ ██   ▀██ ██   ██   ██    █████ ███    ███   ███▀▀▀▀▀ ██▀▀▀▀▀  ██▄  ▄██ ██▄  ██   ██    ██      ███ ██▀    ██▀    ▀█████   ▀████▀  ██████▀   ▀████▀   ██    ██                              ┌──────────────────────────────────────────────────────────────────┐│ Session active                                                   ││100/100 Freebucks remaining││1 day streak│└──────────────────────────────────────────────────────────────────┘                         [12:55 AM] Use ask_user to ask me to choose blue or green. Wait for my reply. Do not modify files. ⎘                                                                                                                  • Thinking                                  The user wants me to ask them to choose between blue and green using the ask_user tool. This is    straightforward — I should call ask_user with a single question offering those two options, then wait for            their reply. No file modifications needed.                                                                                                          ╭────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│ Geo Daniela — La primera IA de remuneraciones de Chile                                                          Ad │ │ Liquidaciones PDF, Previred CSV, LRE CSV y portal del trabajador. Demo 30 min para PYME.                           │  │  Learn more  geodaniela.cl                                                                                         │  ╰────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯                                                                                                                      7s ╭─────────────────────────────────────────────── Some questions for you ───────────────────────────────────────────────╮                                                                                                               Close ✕                                                                                                                      ▶ Which color would you like to choose? ↳ "Blue"╭──────────╮│Submit│╰──────────╯[?2026l[?2026h[?25l                                                                                                                                                                                                                                                                                                                                                                                                                              ╭────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮  │ Geo Daniela — La primera IA de remuneraciones de Chile                                                          Ad │  │Liquidaciones PDF, Previred CSV, LRE CSV y portal del trabajador. Demo 30 min para PYME.      │  │ Learn more geodaniela.cl│  ╰────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯  working...                                                                                                  7s  ■ Esc  ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│            ││ ▍Enter a coding task or / for commands  ││            │╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯[?2026l[?2026h[?25l ▀    ██▀▀█████▀████▀████▀▀████▀█   ██                                                                 ┌──────────────────────────────────────────────────────────────────┐│ Session active                                              ││ 100/100 Freebucks remaining                                 ││ 1 day streak                                                │└──────────────────────────────────────────────────────────────────┘                                                                     [12:55 AM]      Use ask_user to ask me to choose blue or green. Wait for my reply. Do not modify files. ⎘               • Thinking                                                         The user wants me to ask them to choose between blue and green using the ask_user tool. This is   straightforward — I should call ask_user with a single question offering those two options, then wait for   their reply. No file modifications needed.                                                        ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│                                                                                                          ││Your answer:                              ││││1. Which color would you like to choose?││↳ Blue│││╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l8[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l9[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l10[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l└──────────────────────────────────────────────────────────────────┘  [12:55 AM]                                                         Use ask_user to ask me to choose blue or green. Wait for my reply. Do not modify files. ⎘                              • Thinking       The user wants me to ask them to choose between blue and green using the ask_user tool. This is straightforward — I should call ask_user with a single question offering those two options, then wait for   their reply. No file modifications needed.                                                                                          ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│                                                                                                ││Your answer:                                                                                              ││                                          ││1. Which color would you like to choose?││↳ Blue││                                                                                                                  │╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯                • Thinking                                  The user chose Blue. They asked me to wait for their reply and not modify files. I've received their answer.   I should acknowledge it simply and not do anything else.                                                                                                                     You chose Blue. Noted — and I haven't modified any files, as requested.[?2026l[?2026h[?25l                                                                      [12:55 AM] Use ask_user to ask me to choose blue or green. Wait for my reply. Do not modify files. ⎘                                                                                            • Thinking   The user wants me to ask them to choose between blue and green using the ask_user tool. This is  straightforward —I should call ask_ur with asingle question offeringthose two ptions, then wait for  their reply. Nofile mdifition needed.                                                                                                             ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │                                                                                                                  │ Your answer:              1. Which color would you like to choose?   ↳ Blue                                        ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯                                                                                                                       • Thinking   The user chose Blue. They asked me to wait for their reply and not modify files. I've received their answer.  I shouldacknowledgeit simply andnt do anything els.                                                                                                               You chose Blue. Noted — and I haven't modified any files, as requested.█                                                                       ⎘•20s•△▽█44m left · 13.2K (1%)✕ End session[?2026l[?2026h[?25lThe user wants me to ask them to choose between blue and green using the ask_user tool. This is   straightforward — I should call ask_user with a single question offering those two options, then wait for   their reply. No file modifications needed.                                                        ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│                                                                                                          ││Your answer:                              ││││1. Which color would you like to choose?││   ↳ Blue                                                                                                         │╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯                                            ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │Looooooong running AI agentsAd│ │ Build and run AI agents that don't time out on Trigger.dev                                        trigger.dev ↗ │ ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ [?2026l[?2026h[?25lRun sleep 20 then say done. Do not modify files.▍[?2026l]0;Freebuff: Run sleep 20 then say done. Do not modify files.[?2026h[?25l                                                                                                                                                                                                          ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│││Your answer:││                                                                                                                  │1. Which color would you like to choose?  ↳ Blue    ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯          ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │Looooooong running AI agentsAd││Build and run AI agents that don't time out on Trigger.devtrigger.dev ↗│╰╯                                • Thinking                                                                  The user chose Blue. They asked me to wait for their reply and not modify files. I've received their answer.     I should acknowledge it simply and not do anything else.          You chose Blue. Noted — and I haven't modified any files, as requested.                                                                                                ⎘•20s•△▽  [12:56 AM]                                                             Run sleep 20 then say done. Do not modify files. ⎘        ▍Enter a coding task or / for commands           [?2026l[?2026h[?25l▸ Thinking                                                                                                                       ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮              Your answer:                                          1. Which color would you like to choose? ↳ Blue │                                                                                                                  │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯                                                                                                                      ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ Looooooong running AI agents                                         Ad │ Build and run AI agents that don't time out on Trigger.dev                                        trigger.dev ↗ │ ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯            ▸ Thinking                                                                                                                                                               You chose Blue. Noted — and I haven't modified any files, as requested.                                                                        ⎘•20s•△▽           [12:56 AM] Run sleep 20 then say done. Do not modify files. ⎘                                                     thinking...                  ■ Esc[?2026l[?2026h[?25lhinking...[?2026l[?2026h[?25ltinking...[?2026l[?2026h[?25lthnking...[?2026l[?2026h[?25lthiking...[?2026l[?2026h[?25lthining...[?2026l[?2026h[?25lthinkng...[?2026l[?2026h[?25l1s[?2026l[?2026h[?25lthinkig...[?2026l[?2026h[?25lthinkin...[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lhinking...[?2026l[?2026h[?25l2[?2026l[?2026h[?25ltinking...[?2026l[?2026h[?25lthnking...[?2026l[?2026h[?25lthiking...[?2026l[?2026h[?25lthining...[?2026l[?2026h[?25lthinkng...[?2026l[?2026h[?25lthinkig...[?2026l[?2026h[?25l3[?2026l[?2026h[?25lthinkin...[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lhinking...[?2026l[?2026h[?25ltinking...[?2026l[?2026h[?25l4[?2026l[?2026h[?25lthnking...[?2026l[?2026h[?25lthiking...[?2026l[?2026h[?25lthining...[?2026l[?2026h[?25lthinkng...[?2026l[?2026h[?25lthinkig...[?2026l[?2026h[?25lthinkin...[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25l5[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lhinking...[?2026l[?2026h[?25ltinking...[?2026l[?2026h[?25l [?2026l[?2026h[?25lthnking...[?2026l[?2026h[?25lthiking...[?2026l[?2026h[?25l6[?2026l[?2026h[?25lthining...[?2026l[?2026h[?25lthinkng...[?2026l[?2026h[?25lthinkig...[?2026l[?2026h[?25lthinkin...[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25l7[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lhinking...[?2026l[?2026h[?25lworking... [?2026l[?2026h[?25l│ Your answer:││││1. Which color would you like to choose?││   ↳ Blue                                                                                                         │╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯                                            ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │Looooooong running AI agentsAd│ │ Build and run AI agents that don't time out on Trigger.dev                                        trigger.dev ↗ │ ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯▸ Thinking                                                                                                                                         You chose Blue. Noted — and I haven't modified any files, as requested.                                                                                                                     ⎘ • 20s • △▽  [12:56 AM] Run sleep 20 then say done. Do not modify files. ⎘                                                                       • Thinking        The user wants me to run `sleep 20` in the terminal and then say "done". This is a simple, harmless command —   it just waits 20 seconds. No files modified. The tool guidance says to ask permission for commands other   than the listed use cases, but this is trivially safe and the user explicitly requested it, which is explicit permission itself. Let[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l me run it with an appropriate timeout (default is[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l  ↳ Blue    ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯          ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │Looooooong running AI agentsAd││Build and run AI agents that don't time out on Trigger.devtrigger.dev ↗│╰╯                                ▸ Thinking                                                                                                                                                                                   You chose Blue. Noted — and I haven't modified any files, as requested.          ⎘•20s•△▽  [12:56 AM]                                                             Run sleep 20 then say done. Do not modify files. ⎘         • Thinking   The user wants me to run `sleep 20` in the terminal and then say "done". This is a simple, harmless command — it just waits 20 seconds. No files modified. The tool guidance says to ask permission for commands other   than the listed use cases, but this is trivially safe and the user explicitly requested it, which is explicit prmission itself. Let me run it withan appopriate timeout (default is 30, which is fine for a 20-second sleep).                                                                                                                                                                                                                $ sleep 20                                                                 8[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l            ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮  │Looooooong running AI agentsAd│ │Build and run AI agents that don't time out on Trigger.devtrigger.dev ↗│ ╰╯                                  ▸ Thinking                                                                                                                                                                                     You chose Blue. Noted — and I haven't modified any files, as requested.           ⎘•20s•△▽    [12:56 AM]                                                              Run sleep 20 then say done. Do not modify files. ⎘           • Thinking    The user wants me to run `sleep 20` in the terminal and then say "done". This is a simple, harmless command —  it just waits 20 seconds. No files modified. The tool guidance says to ask permission for commands other    than the listed use cases, but this is trivially safe and the user explicitly requested it, which is explicit  prmission itself. Let me run it withan appopriate timeout (default is 30, which is fine for a 20-second  sleep).                                                                                                                                                                                                                  $ sleep 20                                                                                                              [response interrupted]           ⎘•△▽▄44m left · 13.2K (1%)✕ End session[?2026l[?2026h[?25l╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯▸ Thinking                                                                                                                                         You chose Blue. Noted — and I haven't modified any files, as requested.                                                                                                                    ⎘ • 20s • △▽   [12:56 AM] Run sleep 20 then say done. Do not modify files. ⎘                                                                       • Thinking        The user wants me to run `sleep 20` in the terminal and then say "done". This is a simple, harmless command —   it just waits 20 seconds. No files modified. The tool guidance says to ask permission for commands other   than the listed use cases, but this is trivially safe and the user explicitly requested it, which is explicit permission itself. Let me run it with an appropriate timeout (default is 30s, which is fine for a 20-second   sleep).                                                                                                              $ sleep 20                                                                                                                                                                                                               ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│Looooooong running AI agentsAd││Build and run AI agents that don't time out on Trigger.devtrigger.dev ↗│╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯[?2026l[?2026h[?25lRun sh -c "exit 7" and report the result. Do not modify files.▍[?2026l]0;Freebuff: Run sh -c "exit 7" and report the result. Do not …[?2026h[?25l                                                                                                                   You chose Blue. Noted — and I haven't modified any files, as requested.          ⎘•20s•△▽  [12:56 AM]                                                             Run sleep 20 then say done. Do not modify files. ⎘         • Thinking   The user wants me to run `sleep 20` in the terminal and then say "done". This is a simple, harmless command — it just waits 20 seconds. No files modified. The tool guidance says to ask permission for commands other   than the listed use cases, but this is trivially safe and the user explicitly requested it, which is explicit prmission itself. Let me run it withan appopriate timeout (default is 30, which is fine for a 20-second sleep).                                                                                                                                                                                                                $ sleep 20                                                                                                            ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│ Looooooong running AI agentsAd││Build and run AI agents that don't time out on Trigger.devtrigger.dev ↗│╰╯                                [response interrupted]                                                                                                                                                                ⎘ • △▽   [12:56 AM]            Run sh -c "exit 7" and report the result. Do not modify files. ⎘    ▍Enter a coding task or / for commands                         [?2026l[?2026h[?25l│Build and run AI agents that don't time out on Trigger.devtrigger.dev ↗│ ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯          ▸ Thinking              You chose Blue. Noted — and I haven't modified any files, as requested. ⎘•20s•△▽             [12:56 AM]                                                                                                      Run sleep 20 then say done. Do not modify files. ⎘                                                                                                                                                                        ▸ Thinking                                                                                                              $ sleep 20            ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │ Looooooong running AI agents                                                                                 Ad │ Build and run AI agents that don't time out on Trigger.devtrigger.dev ↗ ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯                                                                                                                     [response interrupted]                       ⎘•△▽       [12:56 AM] Run sh -c "exit 7" and report the result. Do not modify files. ⎘                                                                   thinking...                  ■ Esc[?2026l[?2026h[?25lhinking...[?2026l[?2026h[?25ltinking...[?2026l[?2026h[?25lthnking...[?2026l[?2026h[?25lthiking...[?2026l[?2026h[?25lthining...[?2026l[?2026h[?25lthinkng...[?2026l[?2026h[?25l1s[?2026l[?2026h[?25lthinkig...[?2026l[?2026h[?25lthinkin...[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lhinking...[?2026l[?2026h[?25l2[?2026l[?2026h[?25ltinking...[?2026l[?2026h[?25lthnking...[?2026l[?2026h[?25lthiking...[?2026l[?2026h[?25lthining...[?2026l[?2026h[?25lthinkng...[?2026l[?2026h[?25lManaged Postgresthat keepsupwith your machins     Scale your production wokloads withTigerData'smanaged, unfked PstgreSQL ndhigh-availability multi-AZ…SttFreTrial  tigerdata.com[?2026l[?2026h[?25lthinkig...[?2026l[?2026h[?25l3[?2026l[?2026h[?25lthinkin...[?2026l[?2026h[?25lthinking..[?2026l[?2026h[?25lworking.. [?2026l[?2026h[?25lYou chose Blue. Noted — and I haven't modified any files, as requested.                                                                                                                     ⎘ • 20s • △▽  [12:56 AM] Run sleep 20 then say done. Do not modify files. ⎘                                                                       ▸ Thinking         $ sleep 20                                                    ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│ Looooooong running AI agentsAd││Build and run AI agents that don't time out on Trigger.devtrigger.dev ↗│╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯[response interrupted]                                                                                                                          ⎘• △▽                                                                           [12:56 AM]                                                                                                         Run sh -c "exit 7" and report the result. Do not modify files. ⎘                      • Thinking    The user wants me to run `sh -c "exit 7"` and report the result. This is a harmless command — it just exits   with code 7. It doesn't modify files. Let me run it with the run_terminal_command tool.                                                                 $ sh -c "exit 7"[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l  [12:56 AM]                                                             Run sleep 20 then say done. Do not modify files. ⎘         ▸ Thinking                                                    $ sleep 20          ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│ Looooooong running AI agentsAd││Build and run AI agents that don't time out on Trigger.devtrigger.dev ↗│╰╯                                [response interrupted]                                                                                                                                                                 ⎘ • △▽  [12:56 AM]            Run sh -c "exit 7" and report the result. Do not modify files. ⎘     • Thinking   The user wants me to run `sh -c "exit 7"` and report the result. This is a harmless command — it just exits with code 7. It doesn't modify files. Let me run it with the run_terminal_command tool.          $ sh -c "exit 7"                                                                                              command: sh -c "exit 7"                                                                  stdout: exitCode: 7     [?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l4[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l5[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l6[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l7[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l8[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25lworking...[?2026l[?2026h[?25l9[?2026l[?2026h[?25l            [response interrupted]                             ⎘•△▽           [12:56 AM]  Run sh -c "exit 7" and report the result. Do not modify files. ⎘• Thinking                                                                                                          The user wants me to run `sh -c "exit 7"` and report the result. This is a harmless command — it just exits     with code 7. It doesn't modify files. Let me run it with the run_terminal_command tool.                                                                                                                                 $ sh -c "exit 7"command: sh -c "exit 7"stdout:     exitCode: 7            • Thinking                                                       The command `sh -c "exit 7"` was run. It exited with code 7, no stdout output. I should report the result. No   files modified.                                                                                                            The command ran and completed with:                                                      - Exit code: 7 (as expected, since  exit 7  was explicitly called)- stdout: empty - stderr: none                 No files were modified.[?2026l[?2026h[?25l[response interrupted]                       ⎘•△▽       [12:56 AM] Run sh -c "exit 7" and report the result. Do not modify files. ⎘                                                                   • Thinking   The user wants me to run `sh -c "exit 7"` and report the result. This is a harmless command — it just exits  with code 7. It doesn't modify files.Letme run it withthe run_terminal_command tool.                                                                                                              $ sh -c "exit 7" command: sh -c "exit 7" stdout:                 exitCode: 7             • Thinking   The command `sh -c "exit 7"` was run. It exited with code 7, no stdout output. I should report the result. No  files odified.                                                                                                               The command ran and completed with: - Exit code: 7 (s expectd, since  exit 7  was explicitly called) stdout: empty                                                    errnone                 No files were modified.                        ⎘•9s•△▽▄43m left · 13.3K (1%)✕ End session[?2026l[?2026h[?25l                      • Thinking    The user wants me to run `sh -c "exit 7"` and report the result. This is a harmless command — it just exits   with code 7. It doesn't modify files. Let me run it with the run_terminal_command tool.                                                                 $ sh -c "exit 7"command: sh -c "exit 7"stdout:                                                                                                       exitCode: 7                                                                              ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│ Your AI Agent’s Data Layer, Built on MongoDB AtlasAd││ Power your agentic workflows with MongoDB Atlas for reliable, scalable session memory and real-…mongodb.com ↗│╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯[?2026l[?2026h[?25l [?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/freebuff-login.meta.json b/src/main/runtime/__fixtures__/freebuff-login.meta.json
new file mode 100644
index 000000000000..390bcedba909
--- /dev/null
+++ b/src/main/runtime/__fixtures__/freebuff-login.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-28T07:20:19.119Z",
+  "platform": "darwin",
+  "command": ["freebuff", "--cwd", "/tmp/orca-freebuff-verify"],
+  "cols": 100,
+  "rows": 32,
+  "note": "Freebuff npm 0.1.2, unauthenticated, macOS arm64; no model inference",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/freebuff-login.txt b/src/main/runtime/__fixtures__/freebuff-login.txt
new file mode 100644
index 000000000000..d90d8905cebd
--- /dev/null
+++ b/src/main/runtime/__fixtures__/freebuff-login.txt
@@ -0,0 +1 @@
+]11;?]10;?[?2031h]10;?]11;?[>0q[?25l[?1016$p[?2027$p[?2031$p[?1004$p[?2004$p[?2026$p[?u]99;i=opentui-notifications:p=?;\]1337;Capabilities\]66;w=1; \]66;s=2; \[?1049h[>4;1m[?2027h[?2004h[?1000h[?1002h[?1003h[?1006h]4;0;?[?2026h[?25l ███████████                        ██                 ▄████  ▄██                                    ███▀▀▀▀▀▀▀▀                        ██                 ██    ██▀                                     ███ █████  ██████ ▄█████   ▄████▄  ██████▄  ██   ██ ████████████                                    ███ ███▀▀  ██▀   ███▄▄▄██ ██▄▄▄███ ██   ▀██ ██   ██   ██    ██                                      ███ ███    ███   ███▀▀▀▀▀ ██▀▀▀▀▀  ██▄  ▄██ ██▄  ██   ██    ██                                      ███ ██▀    ██▀    ▀█████   ▀████▀  ██████▀   ▀████▀   ██    ██                                                                                                                                          ┌──────────────────────────────────────────────────────────────────┐                                │ Your first message starts the session.                           │                                │ Some models aren't available on this connection                  │                                └──────────────────────────────────────────────────────────────────┘                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Try one of these:                                                                                   → Explain this codebase                                                                             → Find opportunities to refactor                                                                    → Improve my test coverage                                                                                                                                                                             ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮│                                                                                                  ││  ▍Enter a coding task or / for commands                                                          ││                                                                                                  │╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ GLM 5.3 Flash • max · /private/tmp/orca-freebuff-verify · /model to change · Chat: New chat         ← for history · ? for help                                                                         [?2026l[?1004h[?2026h[?25l                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  ███████████                        ██                 ▄████  ▄██                                    ███▀▀▀▀▀▀▀▀                        ██                 ██    ██▀                                     ███ █████  ██████ ▄█████   ▄████▄  ██████▄  ██   ██ ████████████                                    ███ ███▀▀  ██▀   ███▄▄▄██ ██▄▄▄███ ██   ▀██ ██   ██   ██    ██                                      ███ ███    ███   ███▀▀▀▀▀ ██▀▀▀▀▀  ██▄  ▄██ ██▄  ██   ██    ██                                      ███ ██▀    ██▀    ▀█████   ▀████▀  ██████▀   ▀████▀   ██    ██                                                                                                                                                               Press ENTER to login...                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      [?2026l[?2026h[?25l                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  ███████████                        ██                 ▄████  ▄██                                    ███▀▀▀▀▀▀▀▀                        ██                 ██    ██▀                                     ███ █████  ██████ ▄█████   ▄████▄  ██████▄  ██   ██ ████████████                                    ███ ███▀▀  ██▀   ███▄▄▄██ ██▄▄▄███ ██   ▀██ ██   ██   ██    ██                                      ███ ███    ███   ███▀▀▀▀▀ ██▀▀▀▀▀  ██▄  ▄██ ██▄  ██   ██    ██                                      ███ ██▀    ██▀    ▀█████   ▀████▀  ██████▀   ▀████▀   ██    ██                                                                                                                                                               Press ENTER to login...                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      [?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/freebuff-ready.meta.json b/src/main/runtime/__fixtures__/freebuff-ready.meta.json
new file mode 100644
index 000000000000..4555254cd8f8
--- /dev/null
+++ b/src/main/runtime/__fixtures__/freebuff-ready.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-28T08:15:15.356Z",
+  "platform": "darwin",
+  "command": ["freebuff", "--cwd", "/tmp/orca-freebuff-trust"],
+  "cols": 120,
+  "rows": 40,
+  "note": "Freebuff 0.1.2 authenticated, declined repository agent files; waiting for first message",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/freebuff-ready.txt b/src/main/runtime/__fixtures__/freebuff-ready.txt
new file mode 100644
index 000000000000..150521f88b99
--- /dev/null
+++ b/src/main/runtime/__fixtures__/freebuff-ready.txt
@@ -0,0 +1,11 @@
+]11;?]10;?
+freebuff found agent files in this repository it has not run before:
+
+  /private/tmp/orca-freebuff-trust/.agents
+    agents: demo.ts
+
+These run with your permissions and can read your environment. Only load them if you trust this repository.
+
+Load and run these? [y/N] n
+Skipped agents and mcp.json in /private/tmp/orca-freebuff-trust/.agents for this run. Re-run and answer y to trust it, or set CODEBUFF_TRUST_AGENT_DIRS=1 (or pass --trust-agents).
+[?2031h]10;?]11;?[>0q[?25l[?1016$p[?2027$p[?2031$p[?1004$p[?2004$p[?2026$p[?u]99;i=opentui-notifications:p=?;\]1337;Capabilities\]66;w=1; \]66;s=2; \[?1049h[>4;1m[?2027h[?2004h[?1000h[?1002h[?1003h[?1006h]4;0;?[?2026h[?25l ███████████                        ██                 ▄████  ▄██                                                        ███▀▀▀▀▀▀▀▀                        ██                 ██    ██▀                                                         ███ █████  ██████ ▄█████   ▄████▄  ██████▄  ██   ██ ████████████                                                        ███ ███▀▀  ██▀   ███▄▄▄██ ██▄▄▄███ ██   ▀██ ██   ██   ██    ██                                                          ███ ███    ███   ███▀▀▀▀▀ ██▀▀▀▀▀  ██▄  ▄██ ██▄  ██   ██    ██                                                          ███ ██▀    ██▀    ▀█████   ▀████▀  ██████▀   ▀████▀   ██    ██                                                                                                                                                                                  ┌──────────────────────────────────────────────────────────────────┐                                                    │ Your first message starts the session.                           │                                                    │ Some models aren't available on this connection                  │                                                    └──────────────────────────────────────────────────────────────────┘                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│                                                                                                                      ││  ▍Enter a coding task or / for commands                                                                              ││                                                                                                                      │╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ GLM 5.3 Flash • max · /private/tmp/orca-freebuff-trust · /model to change · Chat: New chat                              ← for history · ? for help                                                                                             [?2026l[?1004h[?2026h[?25l95/100 Freebucks remaining                     │                                                                  ││✦ Refer friends → earn Freebucks:││││⎘ Copy invite link  Learn More ↵│└──────────────────────────────────────────────────────────────────┘[?2026l[?2026h[?25l1 day streak                                 ✦ Refer friends → earn Freebucks:                                │ ⎘ Copy invite link  Learn More ↵                                 │└──────────────────────────────────────────────────────────────────┘[?2026l[?2026h[?25l ███████████                        ██                 ▄████  ▄██                                                        ███▀▀▀▀▀▀▀▀                        ██                 ██    ██▀                                                         ███ █████  ██████ ▄█████   ▄████▄  ██████▄  ██   ██ ████████████                                                        ███ ███▀▀  ██▀   ███▄▄▄██ ██▄▄▄███ ██   ▀██ ██   ██   ██    ██                                                          ███ ███    ███   ███▀▀▀▀▀ ██▀▀▀▀▀  ██▄  ▄██ ██▄  ██   ██    ██                                                          ███ ██▀    ██▀    ▀█████   ▀████▀  ██████▀   ▀████▀   ██    ██                                                                                                                                                                                  ┌──────────────────────────────────────────────────────────────────┐                                                    │ Your first message starts the session.                           │                                                    │ 95/100 Freebucks remaining                                       │                                                    │ 1 day streak                                                     │                                                    │                                                                  │                                                    │ ✦ Refer friends → earn Freebucks:                                │                                                    │                                                                  │                                                    │ ⎘ Copy invite link  Learn More ↵                                 │                                                    └──────────────────────────────────────────────────────────────────┘                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│                                                                                                                      ││  ▍Enter a coding task or / for commands                                                                              ││                                                                                                                      │╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ GLM 5.3 Flash • max · /private/tmp/orca-freebuff-trust · /model to change · Chat: New chat                              ← for history · ? for help                                                                                             [?2026l[?2026h[?25l╭────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮│MARS | A robot to build physical AI agents  Ad││A mobile robot with an arm to run agents for $995. Start in simulation. Bring it to life.││ Learn more innate.bot│╰────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯[?2026l
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/freebuff-trust.meta.json b/src/main/runtime/__fixtures__/freebuff-trust.meta.json
new file mode 100644
index 000000000000..d4513cba70e3
--- /dev/null
+++ b/src/main/runtime/__fixtures__/freebuff-trust.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-28T08:09:19.020Z",
+  "platform": "darwin",
+  "command": ["freebuff", "--cwd", "/tmp/orca-freebuff-trust"],
+  "cols": 120,
+  "rows": 40,
+  "note": "Freebuff 0.1.2; harmless repository agent file trust prompt, not accepted",
+  "exitCode": 0
+}
diff --git a/src/main/runtime/__fixtures__/freebuff-trust.txt b/src/main/runtime/__fixtures__/freebuff-trust.txt
new file mode 100644
index 000000000000..48ca2e771609
--- /dev/null
+++ b/src/main/runtime/__fixtures__/freebuff-trust.txt
@@ -0,0 +1,9 @@
+]11;?]10;?
+freebuff found agent files in this repository it has not run before:
+
+  /private/tmp/orca-freebuff-trust/.agents
+    agents: demo.ts
+
+These run with your permissions and can read your environment. Only load them if you trust this repository.
+
+Load and run these? [y/N] 
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures.ts b/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures.ts
index 4e2ebdf60269..c0053bc75ae2 100644
--- a/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures.ts
+++ b/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures.ts
@@ -21,6 +21,7 @@ import {
   WORKTREE_ID,
   WORKTREE_PATH,
   canaryProcess,
+  makeDeferred,
   makeSession
 } from './orca-runtime-terminal-close-continuity-state-fixture'
 import { createCloseContinuityGraphFixture } from './orca-runtime-terminal-close-continuity-graph-fixture'
@@ -46,18 +47,11 @@ export {
   makeSession
 } from './orca-runtime-terminal-close-continuity-state-fixture'
 
-function makeDeferred() {
-  let resolve!: () => void
-  const promise = new Promise<void>((settle) => {
-    resolve = settle
-  })
-  return { promise, resolve }
-}
-
 export type CloseContinuityHarness = {
   runtime: OrcaRuntimeService
   acknowledged: ReturnType<typeof makeDeferred>
   closeTerminal: Mock<(...args: unknown[]) => unknown>
+  closeTerminalPane: Mock<(...args: unknown[]) => unknown>
   closeTerminalTab: Mock<(...args: unknown[]) => unknown>
   flushOrThrow: Mock<() => void>
   kill: Mock<(ptyId: string) => boolean>
@@ -68,6 +62,7 @@ export type CloseContinuityHarness = {
   syncFixtureTabWithoutLeaf: () => void
   syncSplitFixtureGraph: () => void
   getSession: () => WorkspaceSessionState
+  editSession: (edit: (session: WorkspaceSessionState) => WorkspaceSessionState) => void
   makeSessionUnavailable: () => void
   removeVictimFromInventory: () => void
   retirePersistedTab: () => void
@@ -123,6 +118,7 @@ function createHarness(
   let closeTerminalTabError: Error | null = null
   let closeTerminalTabAction: (() => void | Promise<void>) | null = null
   const closeTerminal = vi.fn()
+  const closeTerminalPane = vi.fn()
   const closeTerminalTab = vi.fn(() => {
     if (closeTerminalTabError) {
       return Promise.reject(closeTerminalTabError)
@@ -163,7 +159,8 @@ function createHarness(
     ...(options.includeCanary ? [canaryProcess] : [])
   ])
   const runtime = new OrcaRuntimeService(store as never)
-  runtime.setNotifier({ closeTerminal, closeTerminalTab } as never)
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: these close paths call only the listed notifier methods.
+  runtime.setNotifier({ closeTerminal, closeTerminalPane, closeTerminalTab } as never)
   runtime.setPtyController({
     write: () => true,
     kill,
@@ -206,12 +203,16 @@ function createHarness(
     runtime,
     acknowledged,
     closeTerminal,
+    closeTerminalPane,
     closeTerminalTab,
     flushOrThrow: store.flushOrThrow,
     kill,
     stopAndWait,
     ...graph,
     getSession: () => session,
+    editSession: (edit) => {
+      session = edit(session)
+    },
     makeSessionUnavailable: () => {
       sessionAvailable = false
     },
diff --git a/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-state-fixture.ts b/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-state-fixture.ts
index d304ff57d232..21013296dafe 100644
--- a/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-state-fixture.ts
+++ b/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-state-fixture.ts
@@ -106,3 +106,11 @@ export function makeSession(ptyId = PTY_ID, includeCanary = false): WorkspaceSes
     }
   }
 }
+
+export function makeDeferred() {
+  let resolve!: () => void
+  const promise = new Promise<void>((settle) => {
+    resolve = settle
+  })
+  return { promise, resolve }
+}
diff --git a/src/main/runtime/__fixtures__/qoder-no-account.meta.json b/src/main/runtime/__fixtures__/qoder-no-account.meta.json
new file mode 100644
index 000000000000..e434627627c0
--- /dev/null
+++ b/src/main/runtime/__fixtures__/qoder-no-account.meta.json
@@ -0,0 +1,17 @@
+{
+  "capturedAt": "2026-09-28T08:03:27.131Z",
+  "platform": "darwin",
+  "command": [
+    "qodercli",
+    "--config-dir",
+    "/tmp/orca-qoder-probe/config",
+    "--cwd",
+    "/tmp/orca-qoder-probe/workspace",
+    "--prompt-interactive",
+    "Reply with hello."
+  ],
+  "cols": 100,
+  "rows": 32,
+  "note": "Qoder CLI 1.1.64; isolated trusted folder; no account; lifecycle hook capture",
+  "exitCode": 129
+}
diff --git a/src/main/runtime/__fixtures__/qoder-no-account.txt b/src/main/runtime/__fixtures__/qoder-no-account.txt
new file mode 100644
index 000000000000..9c6753425599
--- /dev/null
+++ b/src/main/runtime/__fixtures__/qoder-no-account.txt
@@ -0,0 +1,66 @@
+[?u]11;?\[>q[>4;?m
]0;◇ Qoder CLI | Ready                                                             ]8;;78

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+[?25h[?25l[?1006l[?1002l[?1004h]0;◇ Qoder CLI | Ready                                                             [?2004h[?2004h[?1004h

+ ██████╭─Tipsforgettingstarted────────────────────────────────╮

+████│1.UseAGENTS.mdfilestocustomizeinteractions│

+██████QoderCLIv1.1.64│2./helpformoreinformation│

+████│3.Askcodingquestions,editcodeorruncommands│

+ ██████NotLoginPleaseAuth│4.Bespecificforthebestresults│

+╰───────────────────────────────────────────────────────────╯

+

+

+ Authenticating

+────────────────────────────────────────────────────────────────────────────────────────────────────

+

+⠋Waitingforauthentication...

+

+Escback

+[>0q
Welcome to Qoder CLI
Signintogetstarted,orexittheapplication.

❯1.Signintocontinue
   2. Exittheapplication

+

+↑/↓navigate·Enterselect·Escback

+]0;✦ Qoder CLI | Working                                                           
 > Reply with hello.

 Welcome to Qoder CLI
────────────────────────────────────────────────────────────────────────────────────────────────────
Sign in toget started, orexittheapplication.

❯1.Signintocontinue
   2. Exit the application

+

+↑/↓navigate·Enterselect·Escback

+]0;✦ Reply with hello. | Working                                                   ]0;◇ Reply with hello. | Ready                                                     
 x Qoder authenticationisnotready.Pleasesigninagain(e.g.via/login)beforesendinga
   message.
 Welcome to Qoder CLI
────────────────────────────────────────────────────────────────────────────────────────────────────
Sign in toget started, orexittheapplication.

❯1.Signintocontinue
   2. Exit the application

+

+↑/↓navigate·Enterselect·Escback

+


+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/qoder-ready.meta.json b/src/main/runtime/__fixtures__/qoder-ready.meta.json
new file mode 100644
index 000000000000..d197b691db48
--- /dev/null
+++ b/src/main/runtime/__fixtures__/qoder-ready.meta.json
@@ -0,0 +1,9 @@
+{
+  "capturedAt": "2026-09-28T08:15:00.339Z",
+  "platform": "darwin",
+  "command": ["qodercli", "--cwd", "/tmp/orca-qoder-probe/workspace"],
+  "cols": 100,
+  "rows": 32,
+  "note": "Qoder CLI 1.1.64; existing browser-login config; credit limit reached; no prompt submitted",
+  "exitCode": 129
+}
diff --git a/src/main/runtime/__fixtures__/qoder-ready.txt b/src/main/runtime/__fixtures__/qoder-ready.txt
new file mode 100644
index 000000000000..e198f8ff3bbb
--- /dev/null
+++ b/src/main/runtime/__fixtures__/qoder-ready.txt
@@ -0,0 +1,66 @@
+[?u]11;?\[>q[>4;?m
]0;◇ Qoder CLI | Ready                                                             ]8;;78

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+[?25h[?25l[?1006l[?1002l[?1004h]0;◇ Qoder CLI | Ready                                                             [?2004h[?2004h[?1004h

+ ██████╭─Tipsforgettingstarted──────────────────────────────╮

+████│1.UseAGENTS.mdfilestocustomizeinteractions│

+██████QoderCLIv1.1.64│2./helpformoreinformation│

+████│3.Askcodingquestions,editcodeorruncommands│

+ ██████SignedinBrowserLogin│4.Bespecificforthebestresults│

+╰─────────────────────────────────────────────────────────╯

+

+

+?forshortcuts

+────────────────────────────────────────────────────────────────────────────────────────────────────

+Shift+TabtoAcceptEdits

+────────────────────────────────────────────────────────────────────────────────────────────────────

+> Typeyourmessageor@path/to/file

+────────────────────────────────────────────────────────────────────────────────────────────────────

+Model·ctx░░░░░░░░░░0%·/private/tmp/orca-qoder-probe/workspace

+[>0q
Qwen3.8-Max Model · ctx░░░░░░░░░░ 0% · /privte/tmp/oca-qoder-robe/workspace

+
●Warning:Truecolor(24-bit)supportnotdetected.Usingaterminalwithtruecolor enabled will
   result in a better visual experience.

                                                                                    ? for shortcuts
────────────────────────────────────────────────────────────────────────────────────────────────────
 Shift+Tab to Accept Edits                                                             1 MCP server
────────────────────────────────────────────────────────────────────────────────────────────────────

+> Typeyourmessageor@path/to/file

+────────────────────────────────────────────────────────────────────────────────────────────────────

+Qwen3.8-MaxModel·ctx░░░░░░░░░░0%·/private/tmp/orca-qoder-probe/workspace

+
1MCPserver · 34kills

+
+
+
+
+
Creditsexhausted.Use/usagefordetailsor/upgradefor more.

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/runtime/__fixtures__/qoder-trust-dialog.meta.json b/src/main/runtime/__fixtures__/qoder-trust-dialog.meta.json
new file mode 100644
index 000000000000..f028a668af32
--- /dev/null
+++ b/src/main/runtime/__fixtures__/qoder-trust-dialog.meta.json
@@ -0,0 +1,15 @@
+{
+  "capturedAt": "2026-09-28T07:56:42.619Z",
+  "platform": "darwin",
+  "command": [
+    "qodercli",
+    "--config-dir",
+    "/tmp/orca-qoder-probe/config",
+    "--cwd",
+    "/tmp/orca-qoder-probe/workspace"
+  ],
+  "cols": 100,
+  "rows": 32,
+  "note": "Qoder CLI 1.1.64; isolated configuration; no account",
+  "exitCode": 129
+}
diff --git a/src/main/runtime/__fixtures__/qoder-trust-dialog.txt b/src/main/runtime/__fixtures__/qoder-trust-dialog.txt
new file mode 100644
index 000000000000..039f945f776d
--- /dev/null
+++ b/src/main/runtime/__fixtures__/qoder-trust-dialog.txt
@@ -0,0 +1,58 @@
+[?u]11;?\[>q[>4;?m
]0;◇ Qoder CLI | Ready                                                             ]8;;78

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+[?25h[?25l[?1006l[?1002l[?1004h]0;◇ Qoder CLI | Ready                                                             [?2004h[?2004h[?1004h

+ ██████╭─Tipsforgettingstarted────────────────────────────────╮

+████│1.UseAGENTS.mdfilestocustomizeinteractions│

+██████QoderCLIv1.1.64│2./helpformoreinformation│

+████│3.Askcodingquestions,editcodeorruncommands│

+ ██████NotLoginPleaseAuth│4.Bespecificforthebestresults│

+╰───────────────────────────────────────────────────────────╯

+

+

+ Doyoutrustthefilesinthisfolder?

+────────────────────────────────────────────────────────────────────────────────────────────────────

+Pleaseconfirmthisisyourownprojectorfromatrustedsource.Oncetrusted,QoderCLIcan

+read,modify,andexecutefileshere,andwillloadlocalconfigurations(commands,hooks,MCP

+servers,agents,skills,settings).

+

+/private/tmp/orca-qoder-probe/workspace

+

+❯1.Trustfolder

+2.Don'ttrustandexit

+

+↑/↓navigate·Enterselect·Escback

+[>0q
 ● Warning: True color (24-bit) supportnotdetected.Usingaterminalwithtruecolorenabledwill
   result in a better visual experience.

 Do you trust the files in this folder?
────────────────────────────────────────────────────────────────────────────────────────────────────
Pleaseconfirmthisisyourownprojectorfromatrustedsource.Oncetrusted,QoderCLIcan
read, modify, and execute files here, andwillloadlocalconfigurations(commands,hooks,MCP
servers,agents,skills,settings).

/private/tmp/orca-qoder-probe/workspace
 ❯ 1. Trust folder

+2.Don'ttrustandexit

+

+↑/↓navigate·Enterselect·Escback

+
\ No newline at end of file
diff --git a/src/main/runtime/acknowledged-terminal-tab-retirement-fixture.ts b/src/main/runtime/acknowledged-terminal-tab-retirement-fixture.ts
index 51cd8b4cd8bf..12b3340d2ac4 100644
--- a/src/main/runtime/acknowledged-terminal-tab-retirement-fixture.ts
+++ b/src/main/runtime/acknowledged-terminal-tab-retirement-fixture.ts
@@ -3,6 +3,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { vi } from 'vitest'
 import { getDefaultWorkspaceSession } from '../../shared/constants'
+import type { PersistedState } from '../../shared/persisted-state-types'
 import type { RuntimeSyncWindowGraph } from '../../shared/runtime-types'
 import { closeTerminalTabInWorkspaceSession } from '../../shared/workspace-session-terminal-tab-close'
 import { ProfileStateSqliteAuthority } from '../persistence/profile-state/profile-state-sqlite-authority'
@@ -30,8 +31,9 @@ function deferred(): { promise: Promise<void>; resolve: () => void } {
 
 export function createAcknowledgedTabRetirementFixture(bound = false) {
   const directory = mkdtempSync(join(tmpdir(), 'orca-close-ack-'))
+  const databasePath = join(directory, 'profile-state.db')
   const authority = new DelayedAuthority(
-    new ProfileStateSqliteAuthority(join(directory, 'profile-state.db'), 'ack-retirement')
+    new ProfileStateSqliteAuthority(databasePath, 'ack-retirement')
   )
   const store = new Store({
     dataFile: join(directory, 'orca-data.json'),
@@ -149,6 +151,7 @@ export function createAcknowledgedTabRetirementFixture(bound = false) {
   store.setWorkspaceSession(
     advanceTerminalTopologyRevision(store.getWorkspaceSession(), ACK_WORKTREE)
   )
+  let finalFlush: Promise<void> | undefined
   const entered = deferred()
   const acknowledgement = deferred()
   const closeTerminalTab = vi.fn(async () => {
@@ -184,15 +187,30 @@ export function createAcknowledgedTabRetirementFixture(bound = false) {
     acknowledgement,
     closeTerminalTab,
     publish,
+    /** Reads what a relaunch would load, independent of the store's in-memory state. */
+    readDisk: (): PersistedState => {
+      const reader = new ProfileStateSqliteAuthority(databasePath, 'ack-retirement')
+      try {
+        return JSON.parse(reader.readSerializedState() ?? '{}')
+      } finally {
+        reader.close()
+      }
+    },
     hasTab: () =>
       store.getWorkspaceSession().tabsByWorktree[ACK_WORKTREE].some((tab) => tab.id === ACK_TAB),
     close: (options: { force?: boolean } = {}) =>
       runtime.closeMobileSessionTab(`id:${ACK_WORKTREE}`, ACK_TAB, { reason: 'user', ...options }),
+    /** The app-quit flush; it finalizes persistence, so dispose must not flush again. */
+    quit: () => (finalFlush ??= store.flushFinalOrThrowAsync()),
     dispose: async () => {
       runtime.setNotifier(null)
       runtime.syncWindowGraph(1, { tabs: [], leaves: [], mobileSessionTabs: [] })
-      await store.flushPendingOrThrowAsync()
-      await store.freezeWritesAsync()
+      if (finalFlush) {
+        await finalFlush
+      } else {
+        await store.flushPendingOrThrowAsync()
+        await store.freezeWritesAsync()
+      }
       setRuntimeDesktopSurface(null)
       rmSync(directory, { recursive: true, force: true })
     }
diff --git a/src/main/runtime/agent-prompt-line-settle.test.ts b/src/main/runtime/agent-prompt-line-settle.test.ts
index 45d8bca53a65..4ac0d9648ee2 100644
--- a/src/main/runtime/agent-prompt-line-settle.test.ts
+++ b/src/main/runtime/agent-prompt-line-settle.test.ts
@@ -37,7 +37,7 @@ describe('agent prompt line-settle scheduling', () => {
       () => undefined,
       'antigravity'
     )
-    const submission = runtime.sendTerminalAgentPrompt(handle, prompt)
+    const submission = runtime.sendTerminalAgentPrompt(handle, prompt, { inputKind: 'driving' })
     const stalled = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     await vi.advanceTimersByTimeAsync(submitDelayMs - 1)
diff --git a/src/main/runtime/agent-prompt-receipt-correlation.test.ts b/src/main/runtime/agent-prompt-receipt-correlation.test.ts
index e6b6d7f27936..77e8967b6d34 100644
--- a/src/main/runtime/agent-prompt-receipt-correlation.test.ts
+++ b/src/main/runtime/agent-prompt-receipt-correlation.test.ts
@@ -34,6 +34,7 @@ describe('agent prompt receipt correlation', () => {
     runtime.onPtyData('pty-prompt', '\x1b]0;Codex working\x07', Date.now())
 
     const firstPromise = runtime.sendTerminalAgentPrompt(handle, 'first prompt', {
+      inputKind: 'driving',
       acceptQueued: true,
       requestId: 'historical-first',
       observationTimeoutMs: 0
@@ -41,6 +42,7 @@ describe('agent prompt receipt correlation', () => {
     await vi.runAllTimersAsync()
     const first = await firstPromise
     const secondPromise = runtime.sendTerminalAgentPrompt(handle, 'second prompt', {
+      inputKind: 'driving',
       acceptQueued: true,
       requestId: 'historical-second',
       observationTimeoutMs: 0
diff --git a/src/main/runtime/agent-prompt-submission-omp-atomic.test.ts b/src/main/runtime/agent-prompt-submission-omp-atomic.test.ts
index 5eee26ac9cec..a4987b5e1cfd 100644
--- a/src/main/runtime/agent-prompt-submission-omp-atomic.test.ts
+++ b/src/main/runtime/agent-prompt-submission-omp-atomic.test.ts
@@ -73,7 +73,8 @@ type BundledWriter = {
     handle: string,
     ptyId: string,
     generation: number,
-    pastePayload: string
+    pastePayload: string,
+    options: { inputKind: 'driving' }
   ): Promise<unknown>
 }
 
@@ -197,7 +198,9 @@ describe('OMP agent prompt submission', () => {
     }
     const pastePayload = `${AGENT_PROMPT_BRACKETED_PASTE_START}bundled${AGENT_PROMPT_BRACKETED_PASTE_END}`
 
-    await runtime.writeTerminalAgentPrompt('handle', PTY_ID, 1, pastePayload)
+    await runtime.writeTerminalAgentPrompt('handle', PTY_ID, 1, pastePayload, {
+      inputKind: 'driving'
+    })
 
     expect(writes).toEqual([pastePayload + AGENT_PROMPT_SUBMIT])
     expect(Buffer.from(writes[0]!).at(-1)).toBe(0x0d)
@@ -220,7 +223,9 @@ describe('OMP agent prompt submission', () => {
     )
     runtime = created.runtime
 
-    await expect(runtime.sendTerminalAgentPrompt(created.handle, prompt)).resolves.toMatchObject({
+    await expect(
+      runtime.sendTerminalAgentPrompt(created.handle, prompt, { inputKind: 'driving' })
+    ).resolves.toMatchObject({
       accepted: true
     })
 
@@ -236,6 +241,7 @@ describe('OMP agent prompt submission', () => {
 
     await expect(
       created.runtime.sendTerminalAgentPrompt(created.handle, 'inspect the receipt', {
+        inputKind: 'driving',
         acceptQueued: true,
         requestId: 'omp-atomic-receipt'
       })
@@ -255,6 +261,7 @@ describe('OMP agent prompt submission', () => {
     const cancelledRuntime = await createAgentPromptSubmissionRuntime(() => undefined, 'omp')
     await expect(
       cancelledRuntime.runtime.sendTerminalAgentPrompt(cancelledRuntime.handle, 'cancel me', {
+        inputKind: 'driving',
         signal: cancelled.signal,
         beforeWrite: () => cancelled.abort()
       })
@@ -264,6 +271,7 @@ describe('OMP agent prompt submission', () => {
     const permissionRuntime = await createAgentPromptSubmissionRuntime(() => undefined, 'omp')
     await expect(
       permissionRuntime.runtime.sendTerminalAgentPrompt(permissionRuntime.handle, 'do not paste', {
+        inputKind: 'driving',
         beforeWrite: () => {
           permissionRuntime.runtime.onPtyData(
             PTY_ID,
@@ -281,6 +289,7 @@ describe('OMP agent prompt submission', () => {
 
     await expect(
       created.runtime.sendTerminalAgentPrompt(created.handle, 'stay on this process', {
+        inputKind: 'driving',
         beforeWrite: () => {
           created.runtime.synchronizePtyOutputSequenceFromProvider(
             PTY_ID,
@@ -310,7 +319,9 @@ describe('OMP agent prompt submission', () => {
     // The startup shell emits this before the agent settles, so it races every dispatch preamble.
     runtime.emitDaemonPtyTransientFact(PTY_ID, { kind: 'command-finished', exitCode: 0 })
 
-    await expect(runtime.sendTerminalAgentPrompt(created.handle, prompt)).resolves.toMatchObject({
+    await expect(
+      runtime.sendTerminalAgentPrompt(created.handle, prompt, { inputKind: 'driving' })
+    ).resolves.toMatchObject({
       accepted: true
     })
 
@@ -336,7 +347,9 @@ describe('OMP agent prompt submission', () => {
       Buffer.byteLength(buildAgentPromptPasteBytes(prompt), 'utf8')
     )
 
-    const submission = created.runtime.sendTerminalAgentPrompt(created.handle, prompt)
+    const submission = created.runtime.sendTerminalAgentPrompt(created.handle, prompt, {
+      inputKind: 'driving'
+    })
     await vi.advanceTimersByTimeAsync(delayMs - 1)
     expect(created.writes).toEqual([buildAgentPromptPasteBytes(prompt)])
 
diff --git a/src/main/runtime/agent-prompt-submission-runtime-hook-and-generation.test.ts b/src/main/runtime/agent-prompt-submission-runtime-hook-and-generation.test.ts
index c893623a18af..3d0c317a31b4 100644
--- a/src/main/runtime/agent-prompt-submission-runtime-hook-and-generation.test.ts
+++ b/src/main/runtime/agent-prompt-submission-runtime-hook-and-generation.test.ts
@@ -102,7 +102,9 @@ describe('agent prompt submission runtime hook and generation cases', () => {
       getForegroundProcess: async () => null
     })
 
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     await vi.runAllTimersAsync()
 
     await expect(submission).resolves.toMatchObject({ accepted: true })
@@ -130,6 +132,7 @@ describe('agent prompt submission runtime hook and generation cases', () => {
     })
 
     const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving',
       acceptQueued: true,
       requestId: 'antigravity-pre-invocation',
       observationTimeoutMs: 20_000
@@ -156,7 +159,9 @@ describe('agent prompt submission runtime hook and generation cases', () => {
       stateStartedAt: 1_000
     })
 
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     const rejected = expect(submission).rejects.toThrow('agent_prompt_stalled')
     await vi.runAllTimersAsync()
 
@@ -171,6 +176,7 @@ describe('agent prompt submission runtime hook and generation cases', () => {
     const { runtime, handle, writes } = await createHookOnlyPromptRuntime(hook, 'codex')
 
     const firstPromise = runtime.sendTerminalAgentPrompt(handle, 'first prompt', {
+      inputKind: 'driving',
       acceptQueued: true,
       requestId: 'hook-queued-first',
       observationTimeoutMs: 0
@@ -193,6 +199,7 @@ describe('agent prompt submission runtime hook and generation cases', () => {
       getForegroundProcess: async () => null
     })
     const secondPromise = runtime.sendTerminalAgentPrompt(handle, 'second prompt', {
+      inputKind: 'driving',
       acceptQueued: true,
       requestId: 'hook-queued-second',
       observationTimeoutMs: 500
@@ -219,7 +226,9 @@ describe('agent prompt submission runtime hook and generation cases', () => {
   it('does not write Enter after the PTY generation changes during settlement', async () => {
     vi.useFakeTimers()
     const { runtime, handle, writes } = await createPromptRuntime(() => undefined)
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     const rejected = expect(submission).rejects.toThrow('terminal_handle_stale')
 
     await vi.advanceTimersByTimeAsync(0)
@@ -256,6 +265,7 @@ describe('agent prompt submission runtime hook and generation cases', () => {
     )
 
     const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving',
       signal: controller.signal
     })
     const rejected = expect(submission).rejects.toThrow('request_aborted')
@@ -291,7 +301,9 @@ describe('agent prompt submission runtime hook and generation cases', () => {
       sequenceAtSpawnStart
     )
 
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     await vi.runAllTimersAsync()
 
     await expect(submission).resolves.toMatchObject({ accepted: true })
@@ -318,9 +330,9 @@ describe('agent prompt submission runtime hook and generation cases', () => {
       sequenceAtSpawnStart
     )
 
-    await expect(runtime.sendTerminalAgentPrompt(handle, 'review this')).rejects.toThrow(
-      'agent_prompt_blocked'
-    )
+    await expect(
+      runtime.sendTerminalAgentPrompt(handle, 'review this', { inputKind: 'driving' })
+    ).rejects.toThrow('agent_prompt_blocked')
     expect(writes).toEqual([])
   })
 
@@ -331,7 +343,9 @@ describe('agent prompt submission runtime hook and generation cases', () => {
         runtime.onPtyData('pty-prompt', '\x1b]0;Codex waiting for permission\x07', Date.now())
       }
     })
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     const rejected = expect(submission).rejects.toThrow('agent_prompt_blocked')
 
     await vi.runAllTimersAsync()
@@ -351,8 +365,10 @@ describe('agent prompt submission runtime hook and generation cases', () => {
       }
     })
 
-    const first = runtime.sendTerminalAgentPrompt(handle, 'first prompt')
-    const second = runtime.sendTerminalAgentPrompt(handle, 'second prompt')
+    const first = runtime.sendTerminalAgentPrompt(handle, 'first prompt', { inputKind: 'driving' })
+    const second = runtime.sendTerminalAgentPrompt(handle, 'second prompt', {
+      inputKind: 'driving'
+    })
     await vi.runAllTimersAsync()
     await Promise.all([first, second])
 
@@ -373,6 +389,7 @@ describe('agent prompt submission runtime hook and generation cases', () => {
     runtime.onPtyData('pty-prompt', '\x1b]0;Codex working\x07', Date.now())
 
     const firstPromise = runtime.sendTerminalAgentPrompt(handle, 'first prompt', {
+      inputKind: 'driving',
       acceptQueued: true,
       requestId: 'queued-first',
       observationTimeoutMs: 0
@@ -380,6 +397,7 @@ describe('agent prompt submission runtime hook and generation cases', () => {
     await vi.runAllTimersAsync()
     const first = await firstPromise
     const secondPromise = runtime.sendTerminalAgentPrompt(handle, 'second prompt', {
+      inputKind: 'driving',
       acceptQueued: true,
       requestId: 'queued-second',
       observationTimeoutMs: 0
@@ -418,6 +436,7 @@ describe('agent prompt submission runtime hook and generation cases', () => {
     })
 
     const first = runtime.sendTerminalAgentPrompt(handle, 'obsolete prompt', {
+      inputKind: 'driving',
       beforeWrite: async () => {
         firstWriteReached()
         await firstGate
@@ -430,7 +449,9 @@ describe('agent prompt submission runtime hook and generation cases', () => {
       0
     )
 
-    const replacement = runtime.sendTerminalAgentPrompt(handle, 'replacement prompt')
+    const replacement = runtime.sendTerminalAgentPrompt(handle, 'replacement prompt', {
+      inputKind: 'driving'
+    })
     await vi.runAllTimersAsync()
     await expect(replacement).resolves.toMatchObject({ accepted: true })
     expect(writes.some((data) => data.includes('replacement prompt'))).toBe(true)
@@ -444,6 +465,7 @@ describe('agent prompt submission runtime hook and generation cases', () => {
     let writeChecks = 0
 
     const submission = runtime.sendTerminalAgentPrompt(handle, 'x'.repeat(20_000), {
+      inputKind: 'driving',
       beforeWrite: () => {
         writeChecks += 1
         if (writeChecks === 2) {
@@ -466,6 +488,7 @@ describe('agent prompt submission runtime hook and generation cases', () => {
     const controller = new AbortController()
     const { runtime, handle, writes } = await createPromptRuntime(() => undefined)
     const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving',
       signal: controller.signal
     })
     const rejected = expect(submission).rejects.toThrow('request_aborted')
@@ -483,6 +506,7 @@ describe('agent prompt submission runtime hook and generation cases', () => {
     const controller = new AbortController()
     const { runtime, handle, writes } = await createPromptRuntime(() => undefined)
     const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving',
       signal: controller.signal
     })
     const rejected = expect(submission).rejects.toThrow('request_aborted')
diff --git a/src/main/runtime/agent-prompt-submission-runtime.test.ts b/src/main/runtime/agent-prompt-submission-runtime.test.ts
index 873863ada75c..700445483a9b 100644
--- a/src/main/runtime/agent-prompt-submission-runtime.test.ts
+++ b/src/main/runtime/agent-prompt-submission-runtime.test.ts
@@ -43,7 +43,9 @@ describe('agent prompt submission runtime', () => {
       }
     )
 
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     await vi.runAllTimersAsync()
 
     await expect(submission).resolves.toMatchObject({ accepted: true })
@@ -59,7 +61,9 @@ describe('agent prompt submission runtime', () => {
       }
     })
 
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     await vi.runAllTimersAsync()
 
     await expect(submission).resolves.toMatchObject({ accepted: true })
@@ -75,7 +79,9 @@ describe('agent prompt submission runtime', () => {
         runtime.onPtyData('pty-prompt', '\x1b[2J\x1b[H› review this', Date.now())
       }
     })
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     const rejected = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     await vi.runAllTimersAsync()
@@ -93,7 +99,9 @@ describe('agent prompt submission runtime', () => {
       }
     })
     runtime.onPtyData('pty-prompt', '\x1b]0;Codex idle\x07', Date.now())
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     const rejected = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     await vi.runAllTimersAsync()
@@ -109,7 +117,9 @@ describe('agent prompt submission runtime', () => {
         runtime.onPtyData('pty-prompt', '\x1b]0;Codex waiting for permission\x07', Date.now())
       }
     })
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     const rejected = expect(submission).rejects.toThrow('agent_prompt_blocked')
 
     await vi.runAllTimersAsync()
@@ -122,9 +132,9 @@ describe('agent prompt submission runtime', () => {
     const { runtime, handle, writes } = await createPromptRuntime(() => undefined)
     runtime.onPtyData('pty-prompt', '\x1b]0;Codex waiting for permission\x07', Date.now())
 
-    await expect(runtime.sendTerminalAgentPrompt(handle, 'review this')).rejects.toThrow(
-      'agent_prompt_blocked'
-    )
+    await expect(
+      runtime.sendTerminalAgentPrompt(handle, 'review this', { inputKind: 'driving' })
+    ).rejects.toThrow('agent_prompt_blocked')
     expect(writes).toEqual([])
   })
 
@@ -140,9 +150,9 @@ describe('agent prompt submission runtime', () => {
       Date.now()
     )
 
-    await expect(runtime.sendTerminalAgentPrompt(handle, 'review this')).rejects.toThrow(
-      'agent_prompt_blocked'
-    )
+    await expect(
+      runtime.sendTerminalAgentPrompt(handle, 'review this', { inputKind: 'driving' })
+    ).rejects.toThrow('agent_prompt_blocked')
     expect(writes).toEqual([])
   })
 
@@ -155,9 +165,9 @@ describe('agent prompt submission runtime', () => {
       Date.now()
     )
 
-    await expect(runtime.sendTerminalAgentPrompt(handle, 'review this')).rejects.toThrow(
-      'agent_prompt_blocked'
-    )
+    await expect(
+      runtime.sendTerminalAgentPrompt(handle, 'review this', { inputKind: 'driving' })
+    ).rejects.toThrow('agent_prompt_blocked')
     expect(writes).toEqual([])
   })
 
@@ -175,7 +185,9 @@ describe('agent prompt submission runtime', () => {
     )
     runtime.onPtyData('pty-prompt', '}\x07\x07', Date.now())
 
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     const rejected = expect(submission).rejects.toThrow('agent_prompt_blocked')
     await vi.runAllTimersAsync()
 
@@ -197,9 +209,9 @@ describe('agent prompt submission runtime', () => {
       Date.now()
     )
 
-    await expect(runtime.sendTerminalAgentPrompt(handle, 'review this')).rejects.toThrow(
-      'agent_prompt_blocked'
-    )
+    await expect(
+      runtime.sendTerminalAgentPrompt(handle, 'review this', { inputKind: 'driving' })
+    ).rejects.toThrow('agent_prompt_blocked')
     expect(writes).toEqual([])
   })
 
@@ -214,7 +226,9 @@ describe('agent prompt submission runtime', () => {
       text: 'Permission required\r\nAllow once\r\nAllow always\r\nReject\r\n'
     })
 
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     await vi.runAllTimersAsync()
 
     await expect(submission).resolves.toMatchObject({ accepted: true })
@@ -235,7 +249,9 @@ describe('agent prompt submission runtime', () => {
       }
     })
     runtime.onPtyData('pty-prompt', '\x1b]0;Codex idle\x07', Date.now())
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     const rejected = expect(submission).rejects.toThrow('agent_prompt_blocked')
 
     await vi.runAllTimersAsync()
@@ -257,7 +273,9 @@ describe('agent prompt submission runtime', () => {
         runtime.onPtyData('pty-prompt', output, Date.now())
       }
     })
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     const rejected = expect(submission).rejects.toThrow('agent_prompt_blocked')
 
     await vi.runAllTimersAsync()
@@ -271,6 +289,7 @@ describe('agent prompt submission runtime', () => {
     let writeChecks = 0
 
     const submission = runtime.sendTerminalAgentPrompt(handle, 'x'.repeat(20_000), {
+      inputKind: 'driving',
       beforeWrite: () => {
         writeChecks += 1
         if (writeChecks === 2) {
@@ -291,6 +310,7 @@ describe('agent prompt submission runtime', () => {
     let writeChecks = 0
 
     const submission = runtime.sendTerminalAgentPrompt(handle, 'x'.repeat(20_000), {
+      inputKind: 'driving',
       beforeWrite: () => {
         writeChecks += 1
         if (writeChecks === 2) {
@@ -319,9 +339,9 @@ describe('agent prompt submission runtime', () => {
     )
     runtime.onPtyData('pty-prompt', '\x1b]0;Codex waiting for permission\x07', Date.now())
 
-    await expect(runtime.sendTerminalAgentPrompt(handle, 'review this')).rejects.toThrow(
-      'agent_prompt_blocked'
-    )
+    await expect(
+      runtime.sendTerminalAgentPrompt(handle, 'review this', { inputKind: 'driving' })
+    ).rejects.toThrow('agent_prompt_blocked')
     expect(writes).toEqual([])
   })
 
@@ -369,7 +389,9 @@ describe('agent prompt submission runtime', () => {
     )
     vi.setSystemTime(2_000)
 
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     await vi.runAllTimersAsync()
 
     await expect(submission).resolves.toMatchObject({ accepted: true })
@@ -389,7 +411,9 @@ describe('agent prompt submission runtime', () => {
       Date.now()
     )
 
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     await vi.runAllTimersAsync()
 
     await expect(submission).resolves.toMatchObject({ accepted: true })
@@ -408,7 +432,9 @@ describe('agent prompt submission runtime', () => {
       Date.now()
     )
 
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     const rejected = expect(submission).rejects.toThrow('agent_prompt_stalled')
     await vi.runAllTimersAsync()
 
@@ -432,7 +458,9 @@ describe('agent prompt submission runtime', () => {
       Date.now()
     )
 
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     await vi.runAllTimersAsync()
 
     await expect(submission).resolves.toMatchObject({ accepted: true })
@@ -453,6 +481,7 @@ describe('agent prompt submission runtime', () => {
     )
 
     const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving',
       acceptQueued: true,
       requestId: 'queued-output-only',
       observationTimeoutMs: 0
diff --git a/src/main/runtime/agent-prompt-submission-windows-submit-delay.test.ts b/src/main/runtime/agent-prompt-submission-windows-submit-delay.test.ts
index f6298df8b175..3bc936c78a5b 100644
--- a/src/main/runtime/agent-prompt-submission-windows-submit-delay.test.ts
+++ b/src/main/runtime/agent-prompt-submission-windows-submit-delay.test.ts
@@ -111,7 +111,9 @@ describe('agent prompt submit delay on a ConPTY host', () => {
     vi.useFakeTimers()
     const { runtime, handle, writes } = await createPromptRuntime()
     const delayMs = submitDelayFor('review this', 'win32')
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     const stalled = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     await vi.advanceTimersByTimeAsync(delayMs - 1)
@@ -131,7 +133,7 @@ describe('agent prompt submit delay on a ConPTY host', () => {
     // Measured ConPTY ingest for 8 KB is 60-89 ms; the old constant charged 1_500 ms.
     const delayMs = submitDelayFor(prompt, 'win32')
     expect(delayMs).toBeLessThan(700)
-    const submission = runtime.sendTerminalAgentPrompt(handle, prompt)
+    const submission = runtime.sendTerminalAgentPrompt(handle, prompt, { inputKind: 'driving' })
     const stalled = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     await vi.advanceTimersByTimeAsync(delayMs)
@@ -146,7 +148,7 @@ describe('agent prompt submit delay on a ConPTY host', () => {
     vi.useFakeTimers()
     const { runtime, handle, writes, submitTimes } = await createPromptRuntime()
     const prompt = 'y'.repeat(320_000)
-    const submission = runtime.sendTerminalAgentPrompt(handle, prompt)
+    const submission = runtime.sendTerminalAgentPrompt(handle, prompt, { inputKind: 'driving' })
     const stalled = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     // Every byte is already handed to node-pty here -- the hazard is that the *host* is
@@ -167,6 +169,7 @@ describe('agent prompt submit delay on a ConPTY host', () => {
     const controller = new AbortController()
     const { runtime, handle, writes } = await createPromptRuntime()
     const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving',
       signal: controller.signal
     })
     const rejected = expect(submission).rejects.toThrow('request_aborted')
@@ -186,7 +189,9 @@ describe('agent prompt submit delay on a ConPTY host', () => {
     const { runtime, handle, writes } = await createPromptRuntime()
     const delayMs = submitDelayFor(HOST_PROBE_PROMPT, 'darwin')
     expect(delayMs).toBeLessThan(submitDelayFor(HOST_PROBE_PROMPT, 'win32'))
-    const submission = runtime.sendTerminalAgentPrompt(handle, HOST_PROBE_PROMPT)
+    const submission = runtime.sendTerminalAgentPrompt(handle, HOST_PROBE_PROMPT, {
+      inputKind: 'driving'
+    })
     const stalled = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     await vi.advanceTimersByTimeAsync(delayMs - 1)
@@ -215,7 +220,9 @@ describe('agent prompt submit delay follows the execution host', () => {
     patchPtyRecord(runtime, { isWsl: true, wslDistro: 'Ubuntu' })
     const delayMs = submitDelayFor(HOST_PROBE_PROMPT, 'win32')
     expect(delayMs).toBeGreaterThan(submitDelayFor(HOST_PROBE_PROMPT, 'linux'))
-    const submission = runtime.sendTerminalAgentPrompt(handle, HOST_PROBE_PROMPT)
+    const submission = runtime.sendTerminalAgentPrompt(handle, HOST_PROBE_PROMPT, {
+      inputKind: 'driving'
+    })
     const stalled = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     await vi.advanceTimersByTimeAsync(delayMs - 1)
@@ -235,7 +242,9 @@ describe('agent prompt submit delay follows the execution host', () => {
     registerSshRemotePlatform('win32')
     const clientDelayMs = submitDelayFor(HOST_PROBE_PROMPT, 'darwin')
     const hostDelayMs = submitDelayFor(HOST_PROBE_PROMPT, 'win32')
-    const submission = runtime.sendTerminalAgentPrompt(handle, HOST_PROBE_PROMPT)
+    const submission = runtime.sendTerminalAgentPrompt(handle, HOST_PROBE_PROMPT, {
+      inputKind: 'driving'
+    })
     const stalled = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     await vi.advanceTimersByTimeAsync(clientDelayMs)
@@ -255,7 +264,9 @@ describe('agent prompt submit delay follows the execution host', () => {
     registerSshRemotePlatform('linux')
     const delayMs = submitDelayFor(HOST_PROBE_PROMPT, 'linux')
     expect(delayMs).toBeLessThan(submitDelayFor(HOST_PROBE_PROMPT, 'win32'))
-    const submission = runtime.sendTerminalAgentPrompt(handle, HOST_PROBE_PROMPT)
+    const submission = runtime.sendTerminalAgentPrompt(handle, HOST_PROBE_PROMPT, {
+      inputKind: 'driving'
+    })
     const stalled = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     await vi.advanceTimersByTimeAsync(delayMs - 1)
@@ -277,7 +288,9 @@ describe('agent prompt submit delay follows the execution host', () => {
     })
     registerSshRemotePlatform(undefined)
     const delayMs = submitDelayFor(HOST_PROBE_PROMPT, 'win32')
-    const submission = runtime.sendTerminalAgentPrompt(handle, HOST_PROBE_PROMPT)
+    const submission = runtime.sendTerminalAgentPrompt(handle, HOST_PROBE_PROMPT, {
+      inputKind: 'driving'
+    })
     const stalled = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     await vi.advanceTimersByTimeAsync(delayMs - 1)
@@ -341,7 +354,9 @@ describe('agent prompt render gate on a ConPTY host', () => {
     useHostPlatform('win32')
     vi.useFakeTimers()
     const { runtime, handle, writes, submitTimes } = await createSettlementRuntime()
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'y'.repeat(320_000))
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'y'.repeat(320_000), {
+      inputKind: 'driving'
+    })
     const stalled = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     // Marker at 100 ms + a 1_500 ms quiet window would have submitted at ~1_600 ms, while
@@ -370,7 +385,7 @@ describe('agent prompt render gate on a ConPTY host', () => {
       markerDelayMs: ingestMs - 1_000,
       noiseUntilMs: ingestMs + 20_000
     })
-    const submission = runtime.sendTerminalAgentPrompt(handle, prompt)
+    const submission = runtime.sendTerminalAgentPrompt(handle, prompt, { inputKind: 'driving' })
     const stalled = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     await vi.advanceTimersByTimeAsync(ingestMs + 8_000 - 1)
@@ -387,7 +402,9 @@ describe('agent prompt render gate on a ConPTY host', () => {
     useHostPlatform('win32')
     vi.useFakeTimers()
     const { runtime, handle, submitTimes } = await createSettlementRuntime()
-    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this')
+    const submission = runtime.sendTerminalAgentPrompt(handle, 'review this', {
+      inputKind: 'driving'
+    })
     const stalled = expect(submission).rejects.toThrow('agent_prompt_stalled')
 
     await vi.runAllTimersAsync()
@@ -409,7 +426,11 @@ describe('plain terminal send suffix delay', () => {
     useHostPlatform('win32')
     vi.useFakeTimers()
     const { runtime, handle, writes, submitTimes } = await createPromptRuntime()
-    const send = runtime.sendTerminal(handle, { text: 'z'.repeat(320_000), enter: true })
+    const send = runtime.sendTerminal(
+      handle,
+      { text: 'z'.repeat(320_000), enter: true },
+      { inputKind: 'driving' }
+    )
 
     // Same hazard as the agent-prompt path: a flat 500 ms wrote Enter mid-paste here.
     await vi.advanceTimersByTimeAsync(3_342)
@@ -429,7 +450,7 @@ describe('plain terminal send suffix delay', () => {
     const send = runtime.sendTerminal(
       handle,
       { text: 'z'.repeat(320_000), enter: true },
-      { signal: controller.signal }
+      { inputKind: 'driving', signal: controller.signal }
     )
     const rejected = expect(send).rejects.toThrow('request_aborted')
 
diff --git a/src/main/runtime/agent-session-acquisition-failure-settlement.ts b/src/main/runtime/agent-session-acquisition-failure-settlement.ts
index a3e114081186..f6efaa890c37 100644
--- a/src/main/runtime/agent-session-acquisition-failure-settlement.ts
+++ b/src/main/runtime/agent-session-acquisition-failure-settlement.ts
@@ -86,12 +86,14 @@ export function settleFailedAgentSessionPostAcquisitionAttachment(
   }
   const next =
     args.exitProof === 'unproven'
-      ? withLease(record, {
-          ...record.lease,
-          handoffStage: 'recovering',
-          handoffOperationId: null,
-          lastRenewedAt: args.now
-        })
+      ? {
+          ...withLease(record, {
+            ...record.lease,
+            handoffStage: 'recovering',
+            handoffOperationId: null
+          }),
+          updatedAt: args.now
+        }
       : withLease(record, {
           ...record.lease,
           runtimeFence: nextAgentSessionFence(record.lease),
@@ -101,18 +103,15 @@ export function settleFailedAgentSessionPostAcquisitionAttachment(
           claimStatus: 'released',
           lastRenewedAt: args.now,
           handoffOperationId: null,
-          deathEvidence:
-            args.exitProof === 'root-exit-observed'
-              ? {
-                  kind: 'exit-observed',
-                  detail: 'the provider process exited; its descendants were not proven gone',
-                  observedAt: args.now
-                }
-              : {
-                  kind: 'exit-observed',
-                  detail: 'post-acquisition cleanup proved no provider child remains',
-                  observedAt: args.now
-                }
+          deathEvidence: {
+            kind: 'exit-observed',
+            detail:
+              args.exitProof === 'root-exit-observed'
+                ? 'the provider process exited; its descendants were not proven gone'
+                : 'post-acquisition cleanup proved no provider child remains',
+            observedAt: args.now,
+            ownerFence: record.lease.runtimeFence
+          }
         })
   state.records.set(args.sessionId, next)
   state.operations = settleAgentSessionOperation(state.operations, args)
@@ -133,14 +132,17 @@ function settleFailedLease(
     throw new Error('agent_session_ownership_unknown')
   }
   if (args.exitProof === 'unproven' && record.lease.ownerProcess) {
-    return withLease(record, {
-      ...record.lease,
-      handoffStage: 'recovering',
-      // The operation is durably settled failed below; a lease still naming it would
-      // read as an in-flight transfer to every consumer that keys on the stage + id pair.
-      handoffOperationId: null,
-      lastRenewedAt: args.now
-    })
+    // Parking in recovery proves nothing alive, so `lastRenewedAt` keeps the spawn's proof.
+    return {
+      ...withLease(record, {
+        ...record.lease,
+        handoffStage: 'recovering',
+        // The operation is durably settled failed below; a lease still naming it would
+        // read as an in-flight transfer to every consumer that keys on the stage + id pair.
+        handoffOperationId: null
+      }),
+      updatedAt: args.now
+    }
   }
   return withLease(record, {
     ...record.lease,
@@ -151,7 +153,7 @@ function settleFailedLease(
     claimStatus: 'released',
     lastRenewedAt: args.now,
     handoffOperationId: null,
-    deathEvidence: acquisitionDeathEvidence(args.exitProof, args.now)
+    deathEvidence: acquisitionDeathEvidence(args.exitProof, args.now, record.lease.runtimeFence)
   })
 }
 
@@ -159,25 +161,27 @@ function settleFailedLease(
  *  when nothing was. */
 function acquisitionDeathEvidence(
   exitProof: AgentSessionAcquisitionExitProof,
-  observedAt: number
+  observedAt: number,
+  ownerFence: number
 ): AgentSessionDeathEvidence | null {
   if (exitProof === 'unproven') {
     return null
   }
+  const proof = { observedAt, ownerFence }
   if (exitProof === 'processless') {
-    return { kind: 'pid-absent', detail: 'reservation failed before spawn', observedAt }
+    return { kind: 'pid-absent', detail: 'reservation failed before spawn', ...proof }
   }
   if (exitProof === 'root-exit-observed') {
     return {
       kind: 'exit-observed',
       detail: 'the provider process exited; its descendants were not proven gone',
-      observedAt
+      ...proof
     }
   }
   // Cleanup proved no child of this attempt remains; it may never have spawned.
   return {
     kind: 'exit-observed',
     detail: 'acquisition cleanup proved no provider child remains',
-    observedAt
+    ...proof
   }
 }
diff --git a/src/main/runtime/agent-session-conversation-command-record.ts b/src/main/runtime/agent-session-conversation-command-record.ts
index f09e5d50fc56..297b9dd34e73 100644
--- a/src/main/runtime/agent-session-conversation-command-record.ts
+++ b/src/main/runtime/agent-session-conversation-command-record.ts
@@ -1,3 +1,4 @@
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import type { AgentSessionStoreState } from './agent-session-record-store-file'
 import { AgentSessionTabTable } from './agent-session-tab-table'
 import type { AgentSessionConversationCommandRecord } from '../../shared/agent-session-conversation-command'
@@ -10,7 +11,7 @@ export function commitConversationCommandRecord(
 ): void {
   const record = state.records.get(sessionId)
   if (!record || record.lease.runtimeFence !== fence) {
-    throw new Error('agent_session_checkpoint_stale')
+    throw agentSessionRefusalError('agent_session_checkpoint_stale', { reason: 'leaseMoved' })
   }
   state.records.set(sessionId, { ...record, conversationCommand: command })
   if (
@@ -19,7 +20,7 @@ export function commitConversationCommandRecord(
     command.replacementSessionId
   ) {
     if (!state.records.has(command.replacementSessionId)) {
-      throw new Error('agent_session_identity_required')
+      throw agentSessionRefusalError('agent_session_identity_required', { reason: 'recordMissing' })
     }
     state.sessionTabs ??= new AgentSessionTabTable()
     state.sessionTabs.move(sessionId, command.replacementSessionId)
diff --git a/src/main/runtime/agent-session-death-evidence-persistence.test.ts b/src/main/runtime/agent-session-death-evidence-persistence.test.ts
new file mode 100644
index 000000000000..6e0bff8098cd
--- /dev/null
+++ b/src/main/runtime/agent-session-death-evidence-persistence.test.ts
@@ -0,0 +1,228 @@
+import { mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentSessionDeathEvidence } from '../../shared/agent-session-record'
+import {
+  agentSessionLeaseFixture,
+  agentSessionRecordFixture
+} from '../../shared/agent-session-record.test-fixture'
+import type { AgentSessionFailedAcquisitionSettlement } from './agent-session-acquisition-failure-settlement'
+import { AgentSessionRecordStore } from './agent-session-record-store'
+import { agentSessionStorePath } from './agent-session-record-store-file'
+
+const SESSION = 'session-alpha-1'
+/** The fixture lease's last renewal. */
+const LAST_RENEWED_AT = 30_000
+
+let directory: string
+
+async function seed(deathEvidence: AgentSessionDeathEvidence | null): Promise<void> {
+  const lease =
+    deathEvidence === null
+      ? agentSessionLeaseFixture()
+      : agentSessionLeaseFixture({
+          ownerProcess: null,
+          reservedSpawnToken: null,
+          claimStatus: 'released',
+          deathEvidence
+        })
+  await writeFile(
+    agentSessionStorePath(directory),
+    JSON.stringify({
+      schemaVersion: 2,
+      hostId: 'local',
+      records: { [SESSION]: agentSessionRecordFixture(lease) },
+      operations: {},
+      retiredClaimKeys: [],
+      unusableRecords: {}
+    })
+  )
+}
+
+function open(): Promise<AgentSessionRecordStore> {
+  return AgentSessionRecordStore.open({ directory, hostId: 'local' })
+}
+
+beforeEach(async () => {
+  directory = await mkdtemp(join(tmpdir(), 'orca-death-evidence-'))
+})
+
+afterEach(async () => {
+  await rm(directory, { recursive: true, force: true })
+})
+
+describe('death evidence on disk', () => {
+  it('records the last renewal before the crash and reads it back after another restart', async () => {
+    await seed(null)
+    const crashed = await open()
+    await crashed.reconcileOnRestart({
+      probe: async () => ({ outcome: 'pid-absent' }),
+      now: 90_000
+    })
+    const evidence = {
+      kind: 'pid-absent',
+      detail: 'recorded pid absent on host',
+      observedAt: 90_000,
+      ownerFence: 7,
+      lastProvenAliveAt: LAST_RENEWED_AT
+    }
+    expect(crashed.getRecord(SESSION)?.lease.deathEvidence).toEqual(evidence)
+    expect((await open()).getRecord(SESSION)?.lease.deathEvidence).toEqual(evidence)
+  })
+
+  it('loads evidence an older build wrote without a proven-alive time', async () => {
+    const olderBuild = { kind: 'pid-absent' as const, detail: 'gone', observedAt: 90_000 }
+    await seed(olderBuild)
+    const store = await open()
+    expect(store.isSessionUnreadable(SESSION)).toBe(false)
+    expect(store.getRecord(SESSION)?.lease.deathEvidence).toEqual(olderBuild)
+  })
+
+  it.each([
+    ['proves the owner alive after the probe found it gone', { lastProvenAliveAt: 90_001 }],
+    ['names no possible owner', { ownerFence: -1 }]
+  ])('quarantines evidence that %s', async (_why, field) => {
+    await seed({ kind: 'pid-absent', detail: 'gone', observedAt: 90_000, ...field })
+    expect((await open()).isSessionUnreadable(SESSION)).toBe(true)
+  })
+})
+
+describe('who is told a proof of death landed', () => {
+  it('tells a listener once the proof is committed, and never for a write that proves nothing', async () => {
+    await seed(null)
+    const store = await open()
+    const told: unknown[] = []
+    store.onDeathEvidence((sessionId) => told.push(store.getRecord(sessionId)?.lease.deathEvidence))
+    const unsubscribed = vi.fn()
+    store.onDeathEvidence(unsubscribed)()
+
+    await expect(
+      store.evictProvenDeadOwner({
+        sessionId: SESSION,
+        expectedFence: 6,
+        probe: { outcome: 'pid-absent' },
+        now: 80_000
+      })
+    ).rejects.toThrow()
+    await store.reconcileOnRestart({ probe: async () => ({ outcome: 'pid-absent' }), now: 90_000 })
+    // The proof already on the record is not news to a later write.
+    await store.setSessionTabVisibility(SESSION, true)
+
+    expect(told).toEqual([expect.objectContaining({ kind: 'pid-absent', ownerFence: 7 })])
+    expect(unsubscribed).not.toHaveBeenCalled()
+  })
+})
+
+describe('a failed acquisition', () => {
+  const NOW = 1_800_000_000_000
+  const OPERATION_ID = `${NOW}-${'1'.padStart(32, '0')}`
+
+  /** Reserve and observe the spawn at NOW, as an attach does before it can fail. */
+  async function spawnedOwner(store: AgentSessionRecordStore): Promise<number> {
+    const reserved = await store.reserveOwner({
+      sessionId: SESSION,
+      location: agentSessionRecordFixture().location,
+      provider: 'claude',
+      accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: '/home/dev/.claude' },
+      expectedFence: null,
+      spawnToken: 'spawn-a',
+      claimKeyId: 'key-1',
+      handoffOperationId: OPERATION_ID,
+      probe: { outcome: 'indeterminate', reason: 'no answer' },
+      operation: { callerKey: 'client-1', operationId: OPERATION_ID, fingerprint: 'fp-1' },
+      now: NOW
+    })
+    const fence = reserved.record.lease.runtimeFence
+    await store.commitProcessIdentity({
+      sessionId: SESSION,
+      fence,
+      process: { hostId: 'local', pid: 4242, processStartTimeMs: NOW, spawnToken: 'spawn-a' },
+      now: NOW
+    })
+    return fence
+  }
+
+  function unproven(fence: number, now: number): AgentSessionFailedAcquisitionSettlement {
+    return {
+      sessionId: SESSION,
+      fence,
+      spawnToken: 'spawn-a',
+      callerKey: 'client-1',
+      operationId: OPERATION_ID,
+      outcome: { status: 'failed', code: 'agent_session_operation_invalid', message: 'failed' },
+      exitProof: 'unproven',
+      now
+    }
+  }
+
+  it.each([
+    ['before the owner proved its handle', false],
+    ['after the owner proved its handle', true]
+  ] as const)(
+    'parks in recovery keeping the last proof of life, not the failure, %s',
+    async (_when, proved) => {
+      const store = await open()
+      const fence = await spawnedOwner(store)
+      if (proved) {
+        await store.proveOwner({
+          sessionId: SESSION,
+          fence,
+          link: {
+            linkId: 'link-1',
+            handle: { provider: 'claude', sessionId: 'provider-session-1', leafUuid: null },
+            origin: 'created',
+            mintedAtFence: fence,
+            observedAt: NOW
+          },
+          now: NOW
+        })
+        await store.settleFailedPostAcquisitionAttachment(unproven(fence, NOW + 60_000))
+      } else {
+        await store.settleFailedAcquisition(unproven(fence, NOW + 60_000))
+      }
+      expect(store.getRecord(SESSION)?.lease).toMatchObject({
+        handoffStage: 'recovering',
+        lastRenewedAt: NOW
+      })
+
+      const evicted = await store.evictProvenDeadOwner({
+        sessionId: SESSION,
+        expectedFence: fence,
+        probe: { outcome: 'pid-absent' },
+        now: NOW + 120_000
+      })
+      expect(evicted.lease.deathEvidence).toMatchObject({ lastProvenAliveAt: NOW })
+    }
+  )
+
+  it.each(['exit-proven', 'root-exit-observed', 'processless'] as const)(
+    'names its own fence in the proof when cleanup settles it %s',
+    async (exitProof) => {
+      const store = await open()
+      const fence = await spawnedOwner(store)
+      const settled =
+        exitProof === 'processless'
+          ? await store.settleFailedAcquisition({ ...unproven(fence, NOW), exitProof })
+          : await (async () => {
+              await store.proveOwner({
+                sessionId: SESSION,
+                fence,
+                link: {
+                  linkId: 'link-1',
+                  handle: { provider: 'claude', sessionId: 'provider-session-1', leafUuid: null },
+                  origin: 'created',
+                  mintedAtFence: fence,
+                  observedAt: NOW
+                },
+                now: NOW
+              })
+              return store.settleFailedPostAcquisitionAttachment({
+                ...unproven(fence, NOW),
+                exitProof
+              })
+            })()
+      expect(settled.lease.deathEvidence).toMatchObject({ ownerFence: fence })
+    }
+  )
+})
diff --git a/src/main/runtime/agent-session-launch-env-backfill.test.ts b/src/main/runtime/agent-session-launch-env-backfill.test.ts
deleted file mode 100644
index 50cf9e6b35ca..000000000000
--- a/src/main/runtime/agent-session-launch-env-backfill.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { mkdtemp, rm } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { AgentSessionRecordStore } from './agent-session-record-store'
-import type { AgentSessionReserveRequest } from './agent-session-reservation-admission'
-
-const NOW = 1_800_000_000_000
-const SESSION = 'session-launch-env'
-let directory: string
-
-function request(overrides: Partial<AgentSessionReserveRequest> = {}): AgentSessionReserveRequest {
-  return {
-    sessionId: SESSION,
-    location: {
-      executionHostId: 'local',
-      wslDistro: null,
-      workspaceId: 'workspace-1',
-      workspaceKind: 'git-worktree'
-    },
-    provider: 'claude',
-    accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: '/home/dev/.claude' },
-    expectedFence: null,
-    spawnToken: 'spawn-a',
-    claimKeyId: 'key-1',
-    handoffOperationId: null,
-    probe: { outcome: 'reservation-unused' },
-    operation: {
-      callerKey: 'client-1',
-      operationId: `${NOW}-00000000000000000000000000000001`,
-      fingerprint: 'fp-1'
-    },
-    now: NOW,
-    ...overrides
-  }
-}
-
-beforeEach(async () => {
-  directory = await mkdtemp(join(tmpdir(), 'orca-agent-session-launch-env-'))
-})
-
-afterEach(async () => {
-  await rm(directory, { recursive: true, force: true })
-})
-
-describe('legacy agent session launch environment', () => {
-  it('durably pins the first environment resolved by a current reservation', async () => {
-    const store = await AgentSessionRecordStore.open({ directory, hostId: 'local' })
-    await store.reserveOwner(request())
-    await store.reserveOwner(
-      request({
-        expectedFence: 1,
-        spawnToken: 'spawn-b',
-        launchEnv: { ANTHROPIC_AUTH_TOKEN: 'pinned-token' },
-        operation: {
-          callerKey: 'client-1',
-          operationId: `${NOW}-00000000000000000000000000000002`,
-          fingerprint: 'fp-2'
-        }
-      })
-    )
-
-    const reopened = await AgentSessionRecordStore.open({ directory, hostId: 'local' })
-    expect(
-      (reopened.getRecord(SESSION) as { launchEnv?: Record<string, string> } | null)?.launchEnv
-    ).toBeUndefined()
-  })
-
-  it('rejects an environment that could not be reloaded before writing it', async () => {
-    const store = await AgentSessionRecordStore.open({ directory, hostId: 'local' })
-    const launchEnv = Object.fromEntries(
-      Array.from({ length: 257 }, (_, index) => [`KEY_${index}`, 'value'])
-    )
-
-    await expect(store.reserveOwner(request({ launchEnv }))).rejects.toThrow(
-      'agent_session_launch_env_invalid'
-    )
-    expect(store.getRecord(SESSION)).toBeNull()
-  })
-
-  it('rejects an overlong environment key before writing it', async () => {
-    const store = await AgentSessionRecordStore.open({ directory, hostId: 'local' })
-
-    await expect(
-      store.reserveOwner(request({ launchEnv: { ['K'.repeat(513)]: 'value' } }))
-    ).rejects.toThrow('agent_session_launch_env_invalid')
-    expect(store.getRecord(SESSION)).toBeNull()
-  })
-})
diff --git a/src/main/runtime/agent-session-lease-transitions.ts b/src/main/runtime/agent-session-lease-transitions.ts
index 12c283454795..41e8d300e1e9 100644
--- a/src/main/runtime/agent-session-lease-transitions.ts
+++ b/src/main/runtime/agent-session-lease-transitions.ts
@@ -6,6 +6,7 @@
  * observed process identity, and a proved provider handle — in that order, at one fence.
  */
 
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import {
   adjudicateAgentSessionRestart,
   evaluateAgentSessionAcquisition,
@@ -41,10 +42,10 @@ export function withLease(
 
 export function assertFence(lease: AgentSessionLease, fence: number): void {
   if (lease.runtimeFence !== fence) {
-    throw new Error('agent_session_checkpoint_stale')
+    throw agentSessionRefusalError('agent_session_checkpoint_stale', { reason: 'leaseMoved' })
   }
   if (lease.unreconciled) {
-    throw new Error('execution_owner_reconciling')
+    throw agentSessionRefusalError('execution_owner_reconciling', { reason: 'hostReconciling' })
   }
 }
 
@@ -66,7 +67,7 @@ export function reserveAgentSessionOwner(args: {
     probe: args.probe
   })
   if (decision.decision === 'refused') {
-    throw new Error(decision.code)
+    throw agentSessionRefusalError(decision.code, decision.details)
   }
   if (decision.decision === 'retry-reservation') {
     return { record, disposition: 'retry-reservation' }
@@ -106,11 +107,15 @@ export function commitAgentSessionProcessIdentity(
   const { record } = args
   assertFence(record.lease, args.fence)
   if (record.lease.claimStatus !== 'reserved' || record.lease.ownerProcess !== null) {
-    throw new Error('agent_session_ownership_unknown')
+    throw agentSessionRefusalError('agent_session_ownership_unknown', {
+      reason: 'spawnIdentityMismatch'
+    })
   }
   if (record.lease.reservedSpawnToken !== args.process.spawnToken) {
     // Why: a child that cannot echo the reserved token is not the process Orca started.
-    throw new Error('agent_session_ownership_unknown')
+    throw agentSessionRefusalError('agent_session_ownership_unknown', {
+      reason: 'spawnIdentityMismatch'
+    })
   }
   return withLease(record, {
     ...record.lease,
@@ -137,7 +142,9 @@ export function proveAgentSessionOwner(args: {
     record.lease.handoffStage !== 'new-owner-proving' ||
     record.lease.ownerProcess === null
   ) {
-    throw new Error('agent_session_ownership_unknown')
+    throw agentSessionRefusalError('agent_session_ownership_unknown', {
+      reason: 'spawnIdentityMismatch'
+    })
   }
   if (args.link.handle.provider !== record.provider) {
     throw new Error('agent_session_provider_handle_provider_mismatch')
diff --git a/src/main/runtime/agent-session-operation-admission.test.ts b/src/main/runtime/agent-session-operation-admission.test.ts
index 0b8b9ff91f20..41df221ad122 100644
--- a/src/main/runtime/agent-session-operation-admission.test.ts
+++ b/src/main/runtime/agent-session-operation-admission.test.ts
@@ -48,6 +48,10 @@ describe('global agent-session operation admission', () => {
         fingerprint: 'different-send',
         now: NOW + 1
       }).decision
-    ).toEqual({ decision: 'refused', code: 'agent_session_operation_conflict' })
+    ).toEqual({
+      decision: 'refused',
+      code: 'agent_session_operation_conflict',
+      details: { reason: 'operationIdReused' }
+    })
   })
 })
diff --git a/src/main/runtime/agent-session-operation-admission.ts b/src/main/runtime/agent-session-operation-admission.ts
index e7a4165120ed..f16d48efb9d8 100644
--- a/src/main/runtime/agent-session-operation-admission.ts
+++ b/src/main/runtime/agent-session-operation-admission.ts
@@ -36,6 +36,7 @@ export type AgentSessionMutationOperationAdmission = {
   hostFingerprint: string
   now: number
   operationIdScope?: 'global'
+  conversationWrite?: true
 }
 
 export type AgentSessionMutationOperationDecision = {
@@ -149,7 +150,8 @@ export function admitAgentSessionMutationOperation(
     envelope: args.envelope,
     hostFingerprint: args.hostFingerprint,
     ledger: ledger.decision,
-    lease: record.lease
+    lease: record.lease,
+    ...(args.conversationWrite ? { conversationWrite: true } : {})
   })
   if (ledger.decision.decision === 'admit' && admission.decision === 'refused') {
     ledger.rows.delete(agentSessionOperationKey(operation.callerKey, operation.operationId))
diff --git a/src/main/runtime/agent-session-orphan-child-reaper.test.ts b/src/main/runtime/agent-session-orphan-child-reaper.test.ts
deleted file mode 100644
index eb837ac4a223..000000000000
--- a/src/main/runtime/agent-session-orphan-child-reaper.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// A child spawned under a reservation whose record was lost is invisible to the lease. Reaping
-// is bounded cleanup only; it never replaces the lease proof required to grant another writer.
-
-import { describe, expect, it, vi } from 'vitest'
-import type { AgentSessionRecordStore } from './agent-session-record-store'
-import { stopOrphanAgentSessionChildren } from './agent-session-orphan-child-reaper'
-
-function storeWithLeasedTokens(tokens: readonly string[]) {
-  return {
-    listOrphanSpawnTokens: (observed: readonly string[]) =>
-      observed.filter((token) => !tokens.includes(token))
-  } as Pick<AgentSessionRecordStore, 'listOrphanSpawnTokens'>
-}
-
-describe('orphan agent-session child reaper', () => {
-  it('stops every process whose spawn token no lease claims', async () => {
-    const stop = vi.fn()
-
-    const stopped = await stopOrphanAgentSessionChildren({
-      store: storeWithLeasedTokens(['token-owned']),
-      scan: async () =>
-        new Map([
-          ['token-owned', [101]],
-          ['token-lost', [202, 203]]
-        ]),
-      stop
-    })
-
-    expect(stopped).toEqual([202, 203])
-    expect(stop).toHaveBeenCalledWith(202, 'SIGTERM')
-    expect(stop).toHaveBeenCalledWith(203, 'SIGTERM')
-    expect(stop).not.toHaveBeenCalledWith(101, 'SIGTERM')
-  })
-
-  it('stops nothing on a host that cannot enumerate spawn tokens', async () => {
-    const stop = vi.fn()
-
-    // Null is "cannot answer", never "no tokens" — treating it as an empty scan would be a
-    // license to signal nothing, but a future empty-map reading would be a license to signal
-    // whatever the caller guessed.
-    const stopped = await stopOrphanAgentSessionChildren({
-      store: {
-        listOrphanSpawnTokens: () => {
-          throw new Error('the reaper must not ask when the host could not answer')
-        }
-      },
-      scan: async () => null,
-      stop
-    })
-
-    expect(stopped).toEqual([])
-    expect(stop).not.toHaveBeenCalled()
-  })
-
-  it('surfaces a failure to signal an observed orphan', async () => {
-    const failure = Object.assign(new Error('not permitted'), { code: 'EPERM' })
-
-    await expect(
-      stopOrphanAgentSessionChildren({
-        store: storeWithLeasedTokens([]),
-        scan: async () => new Map([['token-lost', [202]]]),
-        stop: () => {
-          throw failure
-        }
-      })
-    ).rejects.toBe(failure)
-  })
-})
diff --git a/src/main/runtime/agent-session-orphan-child-reaper.ts b/src/main/runtime/agent-session-orphan-child-reaper.ts
deleted file mode 100644
index 68d9c8990240..000000000000
--- a/src/main/runtime/agent-session-orphan-child-reaper.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Best-effort stop for provider children that carry an Orca spawn token no lease claims.
- *
- * A child spawned under a reservation whose record was lost — the primary store file went with it,
- * or the crash beat the durable write — is unreachable but still connected to the provider session.
- * Only a token match justifies signalling a process; neither age nor CPU is evidence, and a host
- * that cannot enumerate tokens stops nothing. This never proves process exit or licenses a new
- * owner; lease adjudication remains the single-writer boundary.
- */
-
-import type { AgentSessionRecordStore } from './agent-session-record-store'
-import {
-  scanAgentSessionSpawnTokenProcesses,
-  type AgentSessionSpawnTokenScan
-} from './agent-session-spawn-token-process-scan'
-
-export type AgentSessionOrphanStopSignal = 'SIGTERM' | 'SIGKILL'
-
-function defaultStop(pid: number, signal: AgentSessionOrphanStopSignal): void {
-  try {
-    process.kill(pid, signal)
-  } catch (error) {
-    if ((error as NodeJS.ErrnoException).code !== 'ESRCH') {
-      throw error
-    }
-  }
-}
-
-/** Returns the pids signalled, so the caller can report what it reaped. */
-export async function stopOrphanAgentSessionChildren(input: {
-  store: Pick<AgentSessionRecordStore, 'listOrphanSpawnTokens'>
-  scan?: () => Promise<AgentSessionSpawnTokenScan | null>
-  stop?: (pid: number, signal: AgentSessionOrphanStopSignal) => void
-}): Promise<number[]> {
-  const observed = await (input.scan ?? scanAgentSessionSpawnTokenProcesses)()
-  if (observed === null || observed.size === 0) {
-    return []
-  }
-  const stop = input.stop ?? defaultStop
-  const stopped: number[] = []
-  for (const token of input.store.listOrphanSpawnTokens([...observed.keys()])) {
-    for (const pid of observed.get(token) ?? []) {
-      stop(pid, 'SIGTERM')
-      stopped.push(pid)
-    }
-  }
-  return stopped
-}
diff --git a/src/main/runtime/agent-session-provider-handle-transition.ts b/src/main/runtime/agent-session-provider-handle-transition.ts
index f04089018684..57d2ecb172c0 100644
--- a/src/main/runtime/agent-session-provider-handle-transition.ts
+++ b/src/main/runtime/agent-session-provider-handle-transition.ts
@@ -1,3 +1,4 @@
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import {
   agentSessionProviderHandleChainHead,
   appendAgentSessionProviderHandleLink,
@@ -20,7 +21,7 @@ export function recordAgentSessionProviderHandle(args: {
     throw new Error('agent_session_provider_handle_invalid')
   }
   if (record.lease.claimStatus !== 'live' && record.lease.handoffStage !== 'new-owner-proving') {
-    throw new Error('agent_session_ownership_unknown')
+    throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'leaseMoved' })
   }
   const providerHandleChain = appendAgentSessionProviderHandleLink(
     record.providerHandleChain,
diff --git a/src/main/runtime/agent-session-record-options.ts b/src/main/runtime/agent-session-record-options.ts
index 8cf88d685f37..697b63a0422c 100644
--- a/src/main/runtime/agent-session-record-options.ts
+++ b/src/main/runtime/agent-session-record-options.ts
@@ -1,3 +1,4 @@
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import type {
   AgentSessionOptionsReplacement,
   AgentSessionRecord
@@ -7,8 +8,11 @@ export function replaceAgentSessionRecordOptions(
   record: AgentSessionRecord,
   replacement: AgentSessionOptionsReplacement
 ): AgentSessionRecord {
-  if (record.lease.runtimeFence !== replacement.fence || record.lease.claimStatus !== 'live') {
-    throw new Error('agent_session_ownership_unknown')
+  const { lease } = record
+  // At rest the host is the only writer: a pick is intent the next start replays.
+  const atRest = lease.claimStatus === 'released' && lease.ownerProcess === null
+  if (lease.runtimeFence !== replacement.fence || (lease.claimStatus !== 'live' && !atRest)) {
+    throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'leaseMoved' })
   }
   return { ...record, options: { ...replacement.options }, updatedAt: replacement.now }
 }
diff --git a/src/main/runtime/agent-session-record-store-tab-table.test.ts b/src/main/runtime/agent-session-record-store-tab-table.test.ts
index e0ecfec28358..56bcb6debb6a 100644
--- a/src/main/runtime/agent-session-record-store-tab-table.test.ts
+++ b/src/main/runtime/agent-session-record-store-tab-table.test.ts
@@ -9,6 +9,7 @@ import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import type { AgentSessionOwnerProbe } from '../../shared/agent-session-lease-adjudication'
 import type { AgentSessionExecutionLocation } from '../../shared/agent-session-record'
+import { isAgentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import { AgentSessionRecordStore } from './agent-session-record-store'
 import { agentSessionStorePath } from './agent-session-record-store-file'
 import type { AgentSessionReserveRequest } from './agent-session-reservation-admission'
@@ -94,6 +95,34 @@ describe('chat tab table', () => {
     expect(store.getRecord('session-beta')).toBeNull()
   })
 
+  it('refuses showing a tab with the situation typed, as every chat refusal is', async () => {
+    const store = await open()
+    await store.reserveOwner(reserveRequest({ surfaceTabId: 'tab-alpha' }))
+    await store.setSessionTabVisibility('session-alpha', true, 'tab-alpha')
+    await store.reserveOwner(
+      reserveRequest({
+        sessionId: 'session-beta',
+        operation: { callerKey: 'client-1', operationId: operationId(), fingerprint: 'fp-2' }
+      })
+    )
+
+    // The message stays the code: readers of a thrown refusal treat it as one.
+    await expect(
+      store.setSessionTabVisibility('session-beta', true, 'tab-alpha')
+    ).rejects.toSatisfy(
+      (error) =>
+        isAgentSessionRefusalError(error) &&
+        error.message === 'agent_session_conflict' &&
+        error.refusal.details?.reason === 'tabIdTaken'
+    )
+    await expect(store.setSessionTabVisibility('session-gone', true)).rejects.toSatisfy(
+      (error) =>
+        isAgentSessionRefusalError(error) &&
+        error.message === 'agent_session_identity_required' &&
+        error.refusal.details?.reason === 'recordMissing'
+    )
+  })
+
   it('frees a reserved id once its chat is hidden', async () => {
     const store = await open()
     await store.reserveOwner(reserveRequest({ surfaceTabId: 'tab-alpha' }))
diff --git a/src/main/runtime/agent-session-record-store.test.ts b/src/main/runtime/agent-session-record-store.test.ts
index ce38e43d0ea3..5ee25d36813d 100644
--- a/src/main/runtime/agent-session-record-store.test.ts
+++ b/src/main/runtime/agent-session-record-store.test.ts
@@ -753,13 +753,7 @@ describe('host and workspace isolation', () => {
   })
 })
 
-describe('orphans, claim keys, checkpoints, and unreadable rows', () => {
-  it('calls a spawn token with no lease an orphan', async () => {
-    const store = await open()
-    await establishOwner(store)
-    expect(store.listOrphanSpawnTokens(['spawn-a', 'spawn-z'])).toEqual(['spawn-z'])
-  })
-
+describe('claim keys, checkpoints, and unreadable rows', () => {
   it('keeps a retired claim key verifiable for the retention window', async () => {
     const store = await open()
     await store.retireClaimKey('key-1', NOW)
diff --git a/src/main/runtime/agent-session-record-store.ts b/src/main/runtime/agent-session-record-store.ts
index b2bf36323015..925fa38d8d18 100644
--- a/src/main/runtime/agent-session-record-store.ts
+++ b/src/main/runtime/agent-session-record-store.ts
@@ -1,3 +1,4 @@
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import { commitConversationCommandRecord } from './agent-session-conversation-command-record'
 import { setAgentSessionRecordConversationName } from './agent-session-record-conversation-name'
 /** Durable single-writer session records and their operation ledger. */
@@ -24,7 +25,6 @@ import {
   retireAgentSessionClaimKey
 } from './agent-session-claim-key-retention'
 import type { AgentSessionOwnerProbe } from '../../shared/agent-session-lease-adjudication'
-import { classifyObservedAgentSessionSpawnToken } from '../../shared/agent-session-lease-adjudication'
 import type { AgentSessionProviderHandleLink } from '../../shared/agent-session-provider-handle'
 import {
   agentSessionScopeKey,
@@ -77,6 +77,8 @@ export const AGENT_SESSION_LEASE_TTL_MS = 30_000,
   AGENT_SESSION_LEASE_RENEW_INTERVAL_MS = 10_000
 
 export class AgentSessionRecordStore {
+  private readonly deathEvidenceListeners = new Set<(sessionId: string) => void>()
+
   private constructor(private readonly transactions: AgentSessionStoreTransactionQueue) {}
 
   static async open(args: { directory: string; hostId: string }): Promise<AgentSessionRecordStore> {
@@ -179,14 +181,6 @@ export class AgentSessionRecordStore {
   isClaimKeyVerifiable = (keyId: string, now: number): boolean =>
     isAgentSessionClaimKeyVerifiable(this.state, keyId, now)
 
-  /** Spawn tokens observed on the host with no matching lease. Stop them; never adopt them. */
-  listOrphanSpawnTokens(observedTokens: readonly string[]): string[] {
-    const leases = this.listRecords().map((record) => record.lease)
-    return observedTokens.filter(
-      (spawnToken) => classifyObservedAgentSessionSpawnToken({ spawnToken, leases }) === 'orphan'
-    )
-  }
-
   async reserveOwner(request: AgentSessionReserveRequest): Promise<AgentSessionReserveResult> {
     return this.transact(() =>
       commitAgentSessionReservation(this.state, request, AGENT_SESSION_LEASE_TTL_MS)
@@ -326,11 +320,9 @@ export class AgentSessionRecordStore {
     return this.transact(() => {
       const record = this.state.records.get(sessionId)
       if (!record) {
-        throw new Error(
-          this.isSessionUnreadable(sessionId)
-            ? 'execution_owner_reconciling'
-            : 'agent_session_identity_required'
-        )
+        throw this.isSessionUnreadable(sessionId)
+          ? agentSessionRefusalError('execution_owner_reconciling', { reason: 'recordUnreadable' })
+          : agentSessionRefusalError('agent_session_identity_required', { reason: 'recordMissing' })
       }
       const next = apply(record)
       this.state.records.set(sessionId, next)
@@ -338,6 +330,32 @@ export class AgentSessionRecordStore {
     })
   }
 
+  /** Told, once committed, of each session a transaction wrote a proof of death for — whichever
+   *  transition wrote it, since every one lands here. Must not throw. */
+  onDeathEvidence(listener: (sessionId: string) => void): () => void {
+    this.deathEvidenceListeners.add(listener)
+    return () => this.deathEvidenceListeners.delete(listener)
+  }
+
   /** Serialize every mutation against the latest committed disk state. */
-  private transact = <T>(apply: () => T): Promise<T> => this.transactions.transact(apply)
+  private transact = async <T>(apply: () => T): Promise<T> => {
+    let proven: string[] = []
+    const result = await this.transactions.transact(() => {
+      if (this.deathEvidenceListeners.size === 0) {
+        return apply()
+      }
+      const before = new Map(
+        [...this.state.records].map(([id, record]) => [id, record.lease.deathEvidence])
+      )
+      const applied = apply()
+      proven = [...this.state.records]
+        .filter(([id, { lease }]) => lease.deathEvidence && lease.deathEvidence !== before.get(id))
+        .map(([id]) => id)
+      return applied
+    })
+    for (const sessionId of proven) {
+      this.deathEvidenceListeners.forEach((listener) => listener(sessionId))
+    }
+    return result
+  }
 }
diff --git a/src/main/runtime/agent-session-recovery-capsule-entries.ts b/src/main/runtime/agent-session-recovery-capsule-entries.ts
index de8a452c87a2..a5d1d899723a 100644
--- a/src/main/runtime/agent-session-recovery-capsule-entries.ts
+++ b/src/main/runtime/agent-session-recovery-capsule-entries.ts
@@ -4,6 +4,10 @@
 // — can be read on its own. Every value parsed here re-enters from a file this process did not
 // necessarily write, including one written by an older or newer build.
 
+import {
+  readAgentSessionRefusalReference,
+  type AgentSessionAnyRefusalDetails
+} from '../../shared/agent-session-wire-refusals'
 import { z } from 'zod'
 import {
   AGENT_SESSION_RESUME_FAILURE_OUTCOMES,
@@ -28,6 +32,7 @@ const failureSchema = z.object({
   failedAt: z.number().int().nonnegative(),
   outcome: z.enum(AGENT_SESSION_RESUME_FAILURE_OUTCOMES),
   reason: z.string().max(MAX_FAILURE_FIELD_LENGTH),
+  details: z.unknown().optional(),
   latestPrompt: z.string().max(MAX_FAILURE_FIELD_LENGTH),
   latestUserItemId: z.string().max(MAX_FAILURE_FIELD_LENGTH).nullable()
 })
@@ -47,7 +52,11 @@ export type AgentSessionResumeFailureRecord = {
   marker: AgentSessionResumeMarker
   failedAt: number
   outcome: AgentSessionResumeFailureOutcome
+  /** The refusal code, as it always was; the renderer's guidance keys on it. */
   reason: string
+  /** The refusal's details beside the code; absent on older records and non-refusals. A record
+   *  an unreleased build wrote with a `cause` instead reads as having none. */
+  details?: AgentSessionAnyRefusalDetails
   /** The prompt the offer quoted, snapshotted because the session may no longer be readable. */
   latestPrompt: string
   /** The chat's newest user message when this was filed, as the marker records it at teardown. A
@@ -109,7 +118,16 @@ function parseFailures(value: unknown): AgentSessionResumeFailureRecord[] {
   return (Array.isArray(value) ? value : []).flatMap((failure: unknown) => {
     const parsed = failureSchema.safeParse(failure)
     const marker = parsed.success ? parseAgentSessionResumeMarker(parsed.data.marker) : null
-    return parsed.success && marker ? [{ ...parsed.data, marker }] : []
+    if (!parsed.success || !marker) {
+      return []
+    }
+    const { details: stored, ...rest } = parsed.data
+    // `reason` is the refusal code, so the details are read against it.
+    const details = readAgentSessionRefusalReference({
+      code: rest.reason,
+      details: stored
+    })?.details
+    return [{ ...rest, marker, ...(details ? { details } : {}) }]
   })
 }
 
diff --git a/src/main/runtime/agent-session-recovery-capsule.test.ts b/src/main/runtime/agent-session-recovery-capsule.test.ts
index 2150e5c7d516..d70fde57af30 100644
--- a/src/main/runtime/agent-session-recovery-capsule.test.ts
+++ b/src/main/runtime/agent-session-recovery-capsule.test.ts
@@ -342,6 +342,41 @@ describe('durable restart offers', () => {
     expect(JSON.parse(await readFile(filePath, 'utf8')).failed).toEqual([readable])
   })
 
+  it('keeps refusal details beside the code, read back against that code', async () => {
+    const readable = {
+      marker: marker(),
+      failedAt: NOW,
+      outcome: 'refused',
+      reason: 'agent_session_conflict',
+      latestPrompt: '',
+      latestUserItemId: null
+    }
+    await writeFile(
+      filePath,
+      JSON.stringify({
+        version: 2,
+        entries: [],
+        failed: [
+          { ...readable, details: { reason: 'claimConflicted', note: 'dropped' } },
+          // An unreleased build wrote a cause here; it still parses, naming nothing.
+          { ...readable, marker: marker({ sessionId: 'older' }), cause: 'claimConflicted' },
+          // A reason the code does not list is not this code's.
+          {
+            ...readable,
+            marker: marker({ sessionId: 'foreign' }),
+            details: { reason: 'promptGone' }
+          }
+        ]
+      })
+    )
+
+    expect(await capsule.listFailed(NOW)).toEqual([
+      { ...readable, details: { reason: 'claimConflicted' } },
+      { ...readable, marker: marker({ sessionId: 'older' }) },
+      { ...readable, marker: marker({ sessionId: 'foreign' }) }
+    ])
+  })
+
   it('reads a malformed failure list as no failures', async () => {
     await writeFile(
       filePath,
diff --git a/src/main/runtime/agent-session-recovery-capsule.ts b/src/main/runtime/agent-session-recovery-capsule.ts
index 8b54871b9f4a..80ed0bb726e2 100644
--- a/src/main/runtime/agent-session-recovery-capsule.ts
+++ b/src/main/runtime/agent-session-recovery-capsule.ts
@@ -201,15 +201,20 @@ export class AgentSessionRecoveryCapsule {
 
   /** Forgets the named sessions whatever their state. Unlike `clearAll`, this is not a fence: a
    *  later teardown of the same chat may record a fresh offer. */
-  dismiss(sessionIds: readonly string[], now: number): Promise<number> {
+  dismiss(
+    sessionIds: readonly string[],
+    now: number,
+    /** A record this answers true for stays: read against the stored marker, under the lock. */
+    keep: (marker: AgentSessionResumeMarker) => boolean = () => false
+  ): Promise<number> {
     return withFileTransactionLock(this.filePath, async () => {
       const named = new Set(sessionIds)
       const state = await this.readState()
       const { entries, failed } = normalizeState(state, now)
       const dismissed = new Set(
         [...entries, ...failed]
+          .filter((record) => named.has(record.marker.sessionId) && !keep(record.marker))
           .map((record) => record.marker.sessionId)
-          .filter((sessionId) => named.has(sessionId))
       )
       if (dismissed.size > 0) {
         await this.publish(
diff --git a/src/main/runtime/agent-session-reservation-admission.ts b/src/main/runtime/agent-session-reservation-admission.ts
index 9b74186ffbec..d86383ddae72 100644
--- a/src/main/runtime/agent-session-reservation-admission.ts
+++ b/src/main/runtime/agent-session-reservation-admission.ts
@@ -9,6 +9,7 @@
  * inside a transaction, which is what makes the record and its operation row land together.
  */
 
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import {
   agentSessionOperationKey,
   evaluateAgentSessionOperation,
@@ -112,7 +113,7 @@ export function requireAgentSessionRecordForReplay(
   if (!record) {
     // Why: the recorded effect is no longer reconstructable, and re-running it would be a second
     // spawn rather than a replay.
-    throw new Error('agent_session_ownership_unknown')
+    throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'recordMissing' })
   }
   return record
 }
@@ -128,11 +129,13 @@ export function admitPendingAgentSessionReservationReplay(
     probe: request.probe
   })
   if (decision.decision === 'refused') {
-    throw new Error(decision.code)
+    throw agentSessionRefusalError(decision.code, decision.details)
   }
   if (decision.decision !== 'retry-reservation') {
     // A replay may continue only its still-present reservation.
-    throw new Error('agent_session_ownership_unknown')
+    throw agentSessionRefusalError('agent_session_ownership_unknown', {
+      reason: 'replaySuperseded'
+    })
   }
   return record
 }
@@ -170,10 +173,10 @@ export function applyAgentSessionReservation(
   const existing = state.records.get(request.sessionId)
   if (!existing) {
     if (state.unreadableRecords.has(request.sessionId)) {
-      throw new Error('execution_owner_reconciling')
+      throw agentSessionRefusalError('execution_owner_reconciling', { reason: 'recordUnreadable' })
     }
     if (request.expectedFence !== null) {
-      throw new Error('agent_session_checkpoint_stale')
+      throw agentSessionRefusalError('agent_session_checkpoint_stale', { reason: 'recordMissing' })
     }
     assertReservedTabUnheld(state, request)
     return { record: createAgentSessionRecord(request, reservation), disposition: 'created' }
@@ -185,7 +188,7 @@ export function applyAgentSessionReservation(
     existing.accountHome.path !== request.accountHome.path
   ) {
     // Why: location, provider, and account are the session identity; changing one is a fork.
-    throw new Error('agent_session_conflict')
+    throw agentSessionRefusalError('agent_session_conflict', { reason: 'identityMismatch' })
   }
   // A create may take over only a record that never bound a conversation and whose last
   // attempt is proven gone: that is the same as creating it fresh, under a fresh provider id.
@@ -194,7 +197,7 @@ export function applyAgentSessionReservation(
     !request.adoptedHandleLink &&
     agentSessionLeaseOwnerVerdict(existing.lease) === 'exited'
   if (request.expectedFence === null && !recreatable) {
-    throw new Error('agent_session_conflict')
+    throw agentSessionRefusalError('agent_session_conflict', { reason: 'sessionExists' })
   }
   assertReservedTabUnheld(state, request)
   const pinned = {
@@ -240,7 +243,9 @@ function assertAdoptedConversationUnowned(
       (link) => agentSessionProviderHandleRoot(link.handle) === root
     )
     if (holdsSameConversation) {
-      throw new Error('agent_session_conflict')
+      throw agentSessionRefusalError('agent_session_conflict', {
+        reason: 'conversationHeldElsewhere'
+      })
     }
   }
 }
@@ -258,11 +263,13 @@ function assertReservedTabUnheld(
     return
   }
   if (!isAgentSessionSurfaceTabId(request.surfaceTabId)) {
-    throw new Error('agent_session_operation_invalid')
+    throw agentSessionRefusalError('agent_session_operation_invalid', {
+      reason: 'requestMalformed'
+    })
   }
   const holder = state.sessionTabs?.sessionIdFor(request.surfaceTabId)
   if (holder !== undefined && holder !== request.sessionId) {
-    throw new Error('agent_session_conflict')
+    throw agentSessionRefusalError('agent_session_conflict', { reason: 'tabIdTaken' })
   }
 }
 
@@ -324,7 +331,7 @@ export function commitAgentSessionReservation(
   if (decision.decision === 'refused') {
     // An aged-out row proves nothing more: a released reservation runs no effect.
     if (decision.code !== 'agent_session_operation_expired' || !continued) {
-      throw new Error(decision.code)
+      throw agentSessionRefusalError(decision.code, decision.details)
     }
     const row = pendingAgentSessionOperationRow({ ...request.operation, now: request.now })
     return reserveWithOperationRow(state, continued, row, leaseTtlMs)
diff --git a/src/main/runtime/agent-session-restart-lease-transitions.ts b/src/main/runtime/agent-session-restart-lease-transitions.ts
index 70104588a584..b4269d21c677 100644
--- a/src/main/runtime/agent-session-restart-lease-transitions.ts
+++ b/src/main/runtime/agent-session-restart-lease-transitions.ts
@@ -52,10 +52,13 @@ export function applyAgentSessionRestartAdjudication(args: {
       deathEvidence: adjudication.evidence
     })
   }
-  return withLease(record, {
-    ...record.lease,
-    handoffStage: adjudication.stage,
-    unreconciled: false,
-    lastRenewedAt: args.now
-  })
+  // Parking in recovery proves nothing alive, so `lastRenewedAt` keeps the pre-crash proof.
+  return {
+    ...withLease(record, {
+      ...record.lease,
+      handoffStage: adjudication.stage,
+      unreconciled: false
+    }),
+    updatedAt: args.now
+  }
 }
diff --git a/src/main/runtime/agent-session-spawn-token-process-scan.ts b/src/main/runtime/agent-session-spawn-token-process-scan.ts
index 6db1c069110f..55e860f93205 100644
--- a/src/main/runtime/agent-session-spawn-token-process-scan.ts
+++ b/src/main/runtime/agent-session-spawn-token-process-scan.ts
@@ -56,7 +56,7 @@ export async function scanAgentSessionSpawnTokenProcesses(
 /**
  * Diagnostic evidence only. A null result is deliberately typed as
  * `unverifiable`, not as an empty process set; callers must never use this
- * Linux read-back as ownership or orphan-reaping proof.
+ * Linux read-back as ownership proof.
  */
 export async function scanAgentSessionSpawnTokenEvidence(
   platform: NodeJS.Platform = process.platform,
diff --git a/src/main/runtime/agent-session-surface-release-transition.test.ts b/src/main/runtime/agent-session-surface-release-transition.test.ts
index 5e671acc77f5..0ea30d901976 100644
--- a/src/main/runtime/agent-session-surface-release-transition.test.ts
+++ b/src/main/runtime/agent-session-surface-release-transition.test.ts
@@ -18,5 +18,7 @@ describe('agent session surface release transition', () => {
     })
 
     expect(released.lease.runtimeFence).toBe(9)
+    // The proof names the owner it released, not the fence the floor moved to.
+    expect(released.lease.deathEvidence).toMatchObject({ kind: 'exit-observed', ownerFence: 7 })
   })
 })
diff --git a/src/main/runtime/agent-session-surface-release-transition.ts b/src/main/runtime/agent-session-surface-release-transition.ts
index 5c57c18ba41d..fe98a8705248 100644
--- a/src/main/runtime/agent-session-surface-release-transition.ts
+++ b/src/main/runtime/agent-session-surface-release-transition.ts
@@ -8,6 +8,7 @@
 // The fence still moves, so the next owner is a new generation: an attach or settlement still
 // holding the stopped owner's fence is refused as stale rather than acting on its successor.
 
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import type { AgentSessionRecord } from '../../shared/agent-session-record'
 import { nextAgentSessionFence } from '../../shared/agent-session-next-fence'
 import { assertFence, withLease } from './agent-session-lease-transitions'
@@ -37,7 +38,7 @@ export function releaseAgentSessionOwnerAfterSurfaceClose(args: {
   const { record } = args
   assertFence(record.lease, args.expectedFence)
   if (!isSurfaceReleasableAgentSessionRecord(record)) {
-    throw new Error('agent_session_ownership_unknown')
+    throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'leaseMoved' })
   }
   return withLease(record, {
     ...record.lease,
@@ -50,7 +51,8 @@ export function releaseAgentSessionOwnerAfterSurfaceClose(args: {
     deathEvidence: {
       kind: 'exit-observed',
       detail: args.exitReason ?? 'the last surface holding this session released it',
-      observedAt: args.exitObservedAt ?? args.now
+      observedAt: args.exitObservedAt ?? args.now,
+      ownerFence: record.lease.runtimeFence
     }
   })
 }
diff --git a/src/main/runtime/agent-session-tab-table.ts b/src/main/runtime/agent-session-tab-table.ts
index 3855d4319895..6022aac8bf2b 100644
--- a/src/main/runtime/agent-session-tab-table.ts
+++ b/src/main/runtime/agent-session-tab-table.ts
@@ -1,4 +1,5 @@
 import { isAgentSessionId, type AgentSessionRecord } from '../../shared/agent-session-record'
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import { isAgentSessionSurfaceTabId } from '../../shared/agent-session-surface-tab-id'
 import { structuredAgentSessionTabId } from '../../shared/structured-agent-session-projection'
 import type { AgentSessionStoreState } from './agent-session-record-store-file'
@@ -92,7 +93,7 @@ export class AgentSessionTabTable {
   private put(tabId: string, sessionId: string): void {
     const owner = this.sessionByTab.get(tabId)
     if (owner !== undefined && owner !== sessionId) {
-      throw new Error('agent_session_conflict')
+      throw agentSessionRefusalError('agent_session_conflict', { reason: 'tabIdTaken' })
     }
     this.hide(sessionId)
     this.sessionByTab.set(tabId, sessionId)
@@ -120,7 +121,7 @@ export function setAgentSessionTabVisibility(
   tabId?: string
 ): void {
   if (visible && !state.records.has(sessionId)) {
-    throw new Error('agent_session_identity_required')
+    throw agentSessionRefusalError('agent_session_identity_required', { reason: 'recordMissing' })
   }
   state.sessionTabs ??= new AgentSessionTabTable()
   if (visible) {
diff --git a/src/main/runtime/agent-startup-input-assembly-census.test.ts b/src/main/runtime/agent-startup-input-assembly-census.test.ts
deleted file mode 100644
index ca05ed03648d..000000000000
--- a/src/main/runtime/agent-startup-input-assembly-census.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const REPO_ROOT = join(import.meta.dirname, '../../..')
-
-/**
- * The host modules that turn settings into `buildAgentStartupPlan` inputs.
- *
- * `buildAgentStartupPlan` was always shared; the input assembly was not, and the hand-rolled
- * copies drifted — one dropped `sessionOptionsOverrideAgentArgs` and let configured args defeat a
- * picked model. This pins the funnel so a sixth host site cannot re-derive the inputs by hand.
- */
-const MIGRATED_HOST_LAUNCH_MODULES = [
-  'src/main/runtime/orca-runtime-create-agent-session.ts',
-  'src/main/runtime/orca-runtime-resolve-mobile-session-terminal-command.ts',
-  'src/main/runtime/orca-runtime-resolve-worktree-removal-target.ts',
-  'src/main/runtime/runtime-worktree-agent-startup.ts'
-]
-
-/** Reading any of these next to a startup plan means the inputs are being assembled by hand. */
-const HAND_ASSEMBLY_MARKERS = [
-  'resolveTuiAgentLaunchArgs(',
-  'resolveTuiAgentLaunchEnv(',
-  'resolveLocalWindowsAgentStartupShell('
-]
-
-function read(file: string): string {
-  return readFileSync(join(REPO_ROOT, file), 'utf8')
-}
-
-describe('host agent-startup input assembly census', () => {
-  it('routes every migrated host launch site through the shared resolver', () => {
-    const missing = MIGRATED_HOST_LAUNCH_MODULES.filter(
-      (file) => !read(file).includes('resolveAgentStartupPlanInputs(')
-    )
-    expect(missing).toEqual([])
-  })
-
-  it('leaves no migrated host site assembling the settings-derived inputs by hand', () => {
-    const handAssembled = MIGRATED_HOST_LAUNCH_MODULES.filter((file) => {
-      const source = read(file)
-      return HAND_ASSEMBLY_MARKERS.some((marker) => source.includes(marker))
-    })
-    expect(handAssembled).toEqual([])
-  })
-
-  it('detects hand assembly when it is present', () => {
-    // Positive control: the markers are real names, so an empty result above is a true negative
-    // rather than a typo that can never match.
-    const resumeSite = read(
-      'src/main/runtime/orca-runtime-get-agent-session-execution-namespace.ts'
-    )
-    expect(HAND_ASSEMBLY_MARKERS.some((marker) => resumeSite.includes(marker))).toBe(true)
-  })
-})
diff --git a/src/main/runtime/agent-transcript-pane-test-harness.ts b/src/main/runtime/agent-transcript-pane-test-harness.ts
index 5f0c20267d99..14ad56a8d9dd 100644
--- a/src/main/runtime/agent-transcript-pane-test-harness.ts
+++ b/src/main/runtime/agent-transcript-pane-test-harness.ts
@@ -18,6 +18,8 @@ export type TranscriptPaneOptions = {
   /** Simulates a PTY controller whose foreground probe never settles. */
   foregroundProbeHangs?: boolean
   onForegroundProbe?: () => void
+  /** PTY grid the controller reports; the runtime's emulator otherwise defaults to 80x24. */
+  size?: { cols: number; rows: number }
 }
 
 export async function createTranscriptPane(
@@ -39,6 +41,7 @@ export async function createTranscriptPane(
     spawn: vi.fn().mockResolvedValue({ id: TRANSCRIPT_PANE_PTY_ID, incarnationId: 'inc-1' }),
     write: () => true,
     kill: () => true,
+    getSize: () => options.size ?? null,
     getForegroundProcess: (): Promise<string | null> => {
       options.onForegroundProbe?.()
       return options.foregroundProbeHangs === true
diff --git a/src/main/runtime/agent-transcript-replay-test-harness.ts b/src/main/runtime/agent-transcript-replay-test-harness.ts
new file mode 100644
index 000000000000..5b57656ab4ac
--- /dev/null
+++ b/src/main/runtime/agent-transcript-replay-test-harness.ts
@@ -0,0 +1,56 @@
+// Replays captured PTY bytes the way onPtyData does, for suites asserting a rule on every frame.
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { HeadlessEmulator } from '../daemon/headless-emulator'
+import { projectTerminalVisibleLines } from './orca-runtime-terminal-projection'
+import { normalizeTerminalChunk } from './terminal-ansi-normalization'
+import { appendNormalizedToTailBuffer } from './terminal-tail-buffer'
+import { buildPreview } from './terminal-tail-state'
+import { buildTerminalWaitText } from './terminal-wait-tail-state'
+
+const DEFAULT_CHUNK_CHARS = 64
+
+export type TranscriptReplayFrame = { screenLines: string[]; waitText: string }
+
+export function readRuntimeFixture(name: string): string {
+  return readFileSync(join(__dirname, '__fixtures__', `${name}.txt`), 'utf8')
+}
+
+/** A string is cut into fixed 64-char chunks; an array replays the recorded PTY chunks as-is. */
+export async function* replayTranscript(
+  data: string | readonly string[],
+  cols: number,
+  rows: number
+): AsyncGenerator<TranscriptReplayFrame> {
+  const chunks = typeof data === 'string' ? splitIntoChunks(data) : data
+  const emulator = new HeadlessEmulator({ cols, rows })
+  let lines: string[] = []
+  let partialLine = ''
+  let pendingAnsi = ''
+  let redrawCursor: ReturnType<typeof appendNormalizedToTailBuffer>['redrawCursor'] = null
+  try {
+    for (const chunk of chunks) {
+      await emulator.write(chunk)
+      const normalized = normalizeTerminalChunk(chunk, pendingAnsi)
+      pendingAnsi = normalized.pendingAnsi
+      const tail = appendNormalizedToTailBuffer(lines, partialLine, normalized.text, redrawCursor)
+      lines = tail.lines
+      partialLine = tail.partialLine
+      redrawCursor = tail.redrawCursor
+      yield {
+        screenLines: projectTerminalVisibleLines(emulator).lines,
+        waitText: buildTerminalWaitText(lines, partialLine, buildPreview(lines, partialLine))
+      }
+    }
+  } finally {
+    emulator.dispose()
+  }
+}
+
+function splitIntoChunks(data: string): string[] {
+  const chunks: string[] = []
+  for (let offset = 0; offset < data.length; offset += DEFAULT_CHUNK_CHARS) {
+    chunks.push(data.slice(offset, offset + DEFAULT_CHUNK_CHARS))
+  }
+  return chunks
+}
diff --git a/src/main/runtime/claude-agent-teams-tmux-dispatcher.ts b/src/main/runtime/claude-agent-teams-tmux-dispatcher.ts
index a9a3b4484a81..eb4acb14d5e2 100644
--- a/src/main/runtime/claude-agent-teams-tmux-dispatcher.ts
+++ b/src/main/runtime/claude-agent-teams-tmux-dispatcher.ts
@@ -226,7 +226,7 @@ export class ClaudeAgentTeamsTmuxDispatcher {
     const pane = this.resolvePane(team, tmuxValue(parsed, '-t') ?? envPane)
     const text = tmuxSendKeysText(parsed.positional, parsed.flags.has('-l'))
     if (text) {
-      await api.sendTerminal(pane.handle, { text })
+      await api.sendTerminal(pane.handle, { text }, { inputKind: 'driving' })
     }
     return ''
   }
diff --git a/src/main/runtime/claude-agent-teams-types.ts b/src/main/runtime/claude-agent-teams-types.ts
index 10234f5226da..bddfad17d171 100644
--- a/src/main/runtime/claude-agent-teams-types.ts
+++ b/src/main/runtime/claude-agent-teams-types.ts
@@ -6,6 +6,7 @@ import type {
   RuntimeTerminalShow,
   RuntimeTerminalSplit
 } from '../../shared/runtime-types'
+import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 
 export type AgentTeamsTmuxCompatRequest = {
   teamId: string
@@ -43,7 +44,8 @@ export type AgentTeamsTerminalApi = {
   readTerminal(handle: string, opts?: { limit?: number }): Promise<RuntimeTerminalRead>
   sendTerminal(
     handle: string,
-    action: { text?: string; enter?: boolean; interrupt?: boolean }
+    action: { text?: string; enter?: boolean; interrupt?: boolean },
+    options: { inputKind: TerminalInputKind }
   ): Promise<RuntimeTerminalSend>
   focusTerminal(handle: string): Promise<RuntimeTerminalFocus>
   closeTerminal(handle: string): Promise<RuntimeTerminalClose>
diff --git a/src/main/runtime/claude-structured-exit-mid-response.test.ts b/src/main/runtime/claude-structured-exit-mid-response.test.ts
new file mode 100644
index 000000000000..fd30df7dad0e
--- /dev/null
+++ b/src/main/runtime/claude-structured-exit-mid-response.test.ts
@@ -0,0 +1,72 @@
+// A Claude CLI that exits on its own after its start landed, with a message handed to it: the chat
+// says Claude stopped, by name. Against the production runtime, adapter, record store and host,
+// with only the CLI process scripted.
+
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
+import { hostTestMessage } from '../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
+import { waitForStructuredAgentSessionRecovery } from './structured-agent-session-runtime'
+import {
+  createScriptedClaudeRuntime,
+  scriptedClaudeExitError
+} from './structured-claude-scripted-runtime-test-support'
+
+const SESSION = 'claude-exit-mid-response'
+const CALLER = { callerKey: 'client-1' }
+
+let claude = createScriptedClaudeRuntime([SESSION])
+let operations = 0
+
+afterEach(async () => {
+  vi.restoreAllMocks()
+  await claude.dispose()
+  claude = createScriptedClaudeRuntime([SESSION])
+})
+
+async function send(host: StructuredAgentSessionHost, text: string): Promise<void> {
+  const body = hostTestMessage(text)
+  const sent = await host.send(CALLER, {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: `${Date.now()}-${(++operations).toString(16).padStart(32, '0')}`,
+      expectedRuntimeFence: host.deps.store.getRecord(SESSION)?.lease.runtimeFence ?? 0,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.send',
+        sessionId: SESSION,
+        fields: { body }
+      })
+    },
+    body
+  })
+  expect(sent, JSON.stringify(sent)).toMatchObject({ ok: true })
+}
+
+describe('a started Claude CLI that exits while a response is in progress', () => {
+  it('says Claude stopped, and that the conversation can continue', async () => {
+    const host = await claude.install()
+    await expect(host.attach(CALLER, claude.attachParams(SESSION, null))).resolves.toMatchObject({
+      ok: true
+    })
+    await send(host, 'hello')
+    await vi.waitFor(() => expect(claude.child(SESSION).calls).toContain('send'))
+
+    claude.child(SESSION).exit(scriptedClaudeExitError('claude stream-json exited (code 137)'))
+    await waitForStructuredAgentSessionRecovery()
+
+    await vi.waitFor(async () =>
+      expect(
+        (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+          item.body.kind === 'status' && item.body.failure
+            ? [{ text: item.body.text, kind: item.body.failure.kind }]
+            : []
+        )
+      ).toEqual([
+        {
+          text: 'Claude stopped while this response was in progress. You can continue in this conversation.',
+          kind: 'providerExited'
+        }
+      ])
+    )
+  })
+})
diff --git a/src/main/runtime/claude-structured-failed-start-resume.test.ts b/src/main/runtime/claude-structured-failed-start-resume.test.ts
index 32362cbafdce..cd4f44d59f8a 100644
--- a/src/main/runtime/claude-structured-failed-start-resume.test.ts
+++ b/src/main/runtime/claude-structured-failed-start-resume.test.ts
@@ -55,7 +55,7 @@ describe('a Claude chat whose CLI exits the moment it is spawned', () => {
   // Before the spawn returns, the start time of a dead pid is unreadable; during that read, the
   // child is found closed afterwards. Both must answer with what the CLI said.
   it.each(['spawn', 'start-time-read'] as const)(
-    "refuses the create with the CLI's own diagnostic when it exits at %s",
+    "refuses the create in a sentence, not the CLI's diagnostic, when it exits at %s",
     async (at) => {
       const diagnostic = 'claude stream-json exited (code 1): claude: not signed in'
       claude.behave(SESSION, { exitsDuringSpawn: { diagnostic, at } })
@@ -65,7 +65,10 @@ describe('a Claude chat whose CLI exits the moment it is spawned', () => {
 
       expect(created).toMatchObject({
         ok: false,
-        refusal: { message: expect.stringContaining('not signed in'), ownerVerdict: 'exited' }
+        refusal: {
+          message: 'Claude stopped before it finished starting. Send your message to try again.',
+          ownerVerdict: 'exited'
+        }
       })
     }
   )
diff --git a/src/main/runtime/claude-structured-fake-connection-test-fixture.ts b/src/main/runtime/claude-structured-fake-connection-test-fixture.ts
index b64f6980689d..3404bcbf283c 100644
--- a/src/main/runtime/claude-structured-fake-connection-test-fixture.ts
+++ b/src/main/runtime/claude-structured-fake-connection-test-fixture.ts
@@ -76,7 +76,7 @@ export function fakeClaude(providerSession: string) {
         connection.calls.push({ subtype: 'interrupt', params: {} })
         return undefined
       },
-      cancelAsyncMessage: async () => {},
+      cancelAsyncMessage: async () => false,
       stopTask: async (taskId) => {
         connection.calls.push({ subtype: 'stop_task', params: { taskId } })
       },
diff --git a/src/main/runtime/claude-structured-resumed-start-failure.test.ts b/src/main/runtime/claude-structured-resumed-start-failure.test.ts
index 8fcef7e4a48b..7a0c66e1b85c 100644
--- a/src/main/runtime/claude-structured-resumed-start-failure.test.ts
+++ b/src/main/runtime/claude-structured-resumed-start-failure.test.ts
@@ -7,11 +7,15 @@ import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-sessio
 import type { AgentSessionSubscribeEvent } from '../../shared/agent-session-wire'
 import { hostTestMessage } from '../native-chat/agent-session-wire/structured-agent-session-host-test-data'
 import { waitForStructuredAgentSessionRecovery } from './structured-agent-session-runtime'
-import { createScriptedClaudeRuntime } from './structured-claude-scripted-runtime-test-support'
+import {
+  createScriptedClaudeRuntime,
+  scriptedClaudeExitError
+} from './structured-claude-scripted-runtime-test-support'
 
 const SESSION = 'claude-resumed-start'
 const CALLER = { callerKey: 'client-1' }
 const DIAGNOSTIC = 'claude stream-json exited (code 1): claude: not signed in'
+const STARTUP_TEXT = 'Claude stopped before it finished starting. Send your message to try again.'
 
 let claude = createScriptedClaudeRuntime([SESSION])
 
@@ -38,11 +42,11 @@ describe('a reopened Claude chat whose CLI dies before initialize', () => {
     await waitForStructuredAgentSessionRecovery()
     await host.close(SESSION)
 
-    // The user reopens it; this time the CLI never answers, then dies, and its tree is unprovable.
+    // The user reopens it and sends; this time the CLI never answers, then dies, and its tree is
+    // unprovable. Opening starts nothing: the send does.
     claude.behave(SESSION, { initHangs: true, closeUnproven: true })
-    await host.hold(SESSION, 'surface-1')
     const events: AgentSessionSubscribeEvent[] = []
-    host.subscribe({ id: 'sub-1', sessionId: SESSION, emit: (event) => events.push(event) })
+    await host.subscribe({ id: 'sub-1', sessionId: SESSION, emit: (event) => events.push(event) })
     const body = hostTestMessage('hello')
     const fence = host.deps.store.getRecord(SESSION)?.lease.runtimeFence ?? 0
     const sent = await host.send(CALLER, {
@@ -59,21 +63,22 @@ describe('a reopened Claude chat whose CLI dies before initialize', () => {
       body
     })
     expect(sent).toMatchObject({ ok: true, value: { submission: { dispatchState: 'pending' } } })
+    // Accepted first; the delivery loop starts the second child after.
+    await vi.waitFor(() => expect(claude.children(SESSION)).toHaveLength(2))
 
-    claude.child(SESSION).exit(new Error(DIAGNOSTIC))
+    claude.child(SESSION).exit(scriptedClaudeExitError(DIAGNOSTIC))
     await waitForStructuredAgentSessionRecovery()
 
-    await vi.waitFor(() =>
-      expect(statusTexts(events)).toContainEqual(
-        expect.stringMatching(/stopped before it finished starting: .*not signed in/)
-      )
-    )
+    await vi.waitFor(() => expect(statusTexts(events)).toContainEqual(STARTUP_TEXT))
     // Never written, so it did not happen: refused, not left in doubt.
-    const submission = host
-      .journalSnapshot(SESSION)
-      .submissions.find(
-        (entry) => entry.clientMessageId === (sent.ok && sent.value.clientMessageId)
-      )
-    expect(submission).toMatchObject({ dispatchState: 'rejected' })
+    const submission = (await host.journalSnapshot(SESSION)).submissions.find(
+      (entry) => entry.clientMessageId === (sent.ok && sent.value.clientMessageId)
+    )
+    // The stderr the exit carried is beside the sentence, as a log detail, and never in it.
+    expect(submission).toMatchObject({
+      dispatchState: 'rejected',
+      reason: STARTUP_TEXT,
+      rejection: { kind: 'providerStartFailed', detail: { text: DIAGNOSTIC, audience: 'log' } }
+    })
   })
 })
diff --git a/src/main/runtime/claude-structured-send-held-for-startup.test.ts b/src/main/runtime/claude-structured-send-held-for-startup.test.ts
index 19e058110553..efb8d3cde16a 100644
--- a/src/main/runtime/claude-structured-send-held-for-startup.test.ts
+++ b/src/main/runtime/claude-structured-send-held-for-startup.test.ts
@@ -1,8 +1,8 @@
 // A Claude chat is published the moment its child spawns, before the CLI has answered initialize.
-// A send in that window — into a fresh start, or into the restart a send itself asked for after
-// a start that failed — is admitted and held until the child proves its start. When the CLI dies
-// first, the held message is rejected with the CLI's own diagnostic, the chat shows the cause
-// once, and nothing is left as a delivery nobody can confirm. Against the production runtime,
+// A send in that window — into a fresh start, or into the restart the delivery loop makes for a
+// send after a start that failed — is accepted and stays queued until the child proves its start.
+// When the CLI dies first, the queued message is rejected with the CLI's own diagnostic, the chat
+// shows the cause once, and nothing is left as a delivery nobody can confirm. Against the production runtime,
 // adapter, record store and host, with only the CLI process scripted.
 
 import { afterEach, describe, expect, it, vi } from 'vitest'
@@ -10,11 +10,15 @@ import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-sessio
 import { hostTestMessage } from '../native-chat/agent-session-wire/structured-agent-session-host-test-data'
 import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
 import { waitForStructuredAgentSessionRecovery } from './structured-agent-session-runtime'
-import { createScriptedClaudeRuntime } from './structured-claude-scripted-runtime-test-support'
+import {
+  createScriptedClaudeRuntime,
+  scriptedClaudeExitError
+} from './structured-claude-scripted-runtime-test-support'
 
 const SESSION = 'claude-send-held'
 const CALLER = { callerKey: 'client-1' }
 const DIAGNOSTIC = 'claude stream-json exited (code 1): claude: not signed in (rig)'
+const STARTUP_TEXT = 'Claude stopped before it finished starting. Send your message to try again.'
 
 let claude = createScriptedClaudeRuntime([SESSION])
 let operations = 0
@@ -39,7 +43,7 @@ async function send(host: StructuredAgentSessionHost, text: string): Promise<str
     },
     body
   })
-  // Admitted and held for the start, never refused: the message shows as sent.
+  // Accepted and queued for the start, never refused: the message shows as sent.
   expect(sent, JSON.stringify(sent)).toMatchObject({
     ok: true,
     replayed: false,
@@ -52,22 +56,22 @@ function fence(host: StructuredAgentSessionHost): number {
   return host.deps.store.getRecord(SESSION)?.lease.runtimeFence ?? 0
 }
 
-function statusRows(host: StructuredAgentSessionHost): string[] {
-  return host
-    .journalSnapshot(SESSION)
-    .items.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : []))
+async function statusRows(host: StructuredAgentSessionHost): Promise<string[]> {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.body.kind === 'status' ? [item.body.text] : []
+  )
 }
 
-function submission(host: StructuredAgentSessionHost, clientMessageId: string) {
-  return host
-    .journalSnapshot(SESSION)
-    .submissions.find((entry) => entry.clientMessageId === clientMessageId)
+async function submission(host: StructuredAgentSessionHost, clientMessageId: string) {
+  return (await host.journalSnapshot(SESSION)).submissions.find(
+    (entry) => entry.clientMessageId === clientMessageId
+  )
 }
 
 /** The CLI keeps dying at startup: the latest child exits with the diagnostic once it exists. */
 async function failLatestStart(host: StructuredAgentSessionHost, count: number): Promise<void> {
   await vi.waitFor(() => expect(claude.children(SESSION)).toHaveLength(count))
-  claude.child(SESSION).exit(new Error(DIAGNOSTIC))
+  claude.child(SESSION).exit(scriptedClaudeExitError(DIAGNOSTIC))
   await waitForStructuredAgentSessionRecovery()
   await vi.waitFor(() =>
     expect(host.deps.store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
@@ -82,27 +86,28 @@ describe('a send into a Claude chat whose CLI keeps failing at startup', () => {
       ok: true
     })
     await failLatestStart(host, 1)
-    expect(statusRows(host)).toEqual([expect.stringContaining('not signed in')])
+    expect(await statusRows(host)).toEqual([STARTUP_TEXT])
     const releasedFence = fence(host)
 
-    // The send asks for the child back and is held for its start; the CLI dies again first.
+    // The delivery loop asks for the child back and the message waits for its start; the CLI
+    // dies again first.
     const held = await send(host, 'hello?')
-    expect(claude.children(SESSION)).toHaveLength(2)
-    expect(host.deps.store.getRecord(SESSION)?.lease.claimStatus).toBe('live')
+    await vi.waitFor(() => expect(claude.children(SESSION)).toHaveLength(2))
+    await vi.waitFor(() =>
+      expect(host.deps.store.getRecord(SESSION)?.lease.claimStatus).toBe('live')
+    )
     await failLatestStart(host, 2)
 
     // Rejected with the cause, not left in doubt; one row for this attempt names it.
-    await vi.waitFor(() =>
-      expect(submission(host, held)).toMatchObject({
+    await vi.waitFor(async () =>
+      expect(await submission(host, held)).toMatchObject({
         dispatchState: 'rejected',
         // Worded for the user: the red line under the composer shows it as it stands.
-        reason: `The provider stopped before it finished starting: ${DIAGNOSTIC}.`
+        reason: STARTUP_TEXT,
+        rejection: { kind: 'providerStartFailed' }
       })
     )
-    expect(statusRows(host)).toEqual([
-      expect.stringContaining('not signed in'),
-      expect.stringMatching(/stopped before it finished starting: .*not signed in \(rig\)/)
-    ])
+    expect(await statusRows(host)).toEqual([STARTUP_TEXT, STARTUP_TEXT])
     // The restart moved the fence twice: its acquisition, and the exit that released it.
     expect(fence(host)).toBe(releasedFence + 2)
     expect(claude.children(SESSION)).toHaveLength(2)
@@ -111,18 +116,18 @@ describe('a send into a Claude chat whose CLI keeps failing at startup', () => {
     // The user signs in and retries: one restart, proven, written to the CLI.
     claude.behave(SESSION, {})
     await send(host, 'hello again')
-    expect(claude.children(SESSION)).toHaveLength(3)
-    expect(fence(host)).toBe(releasedFence + 3)
+    await vi.waitFor(() => expect(claude.children(SESSION)).toHaveLength(3))
+    await vi.waitFor(() => expect(fence(host)).toBe(releasedFence + 3))
     await vi.waitFor(() => expect(claude.child(SESSION).calls).toContain('send'))
     await vi.waitFor(() =>
       expect(host.deps.store.getRecord(SESSION)?.lease.claimStatus).toBe('live')
     )
-    expect(statusRows(host)).toHaveLength(2)
+    expect(await statusRows(host)).toHaveLength(2)
   })
 })
 
 describe('a send while the first Claude start is still answering initialize', () => {
-  it('is held, and written once the CLI proves its start', async () => {
+  it('is queued, and written once the CLI proves its start', async () => {
     claude.behave(SESSION, { initHangs: true })
     const host = await claude.install()
     await host.attach(CALLER, claude.attachParams(SESSION, null))
@@ -130,12 +135,12 @@ describe('a send while the first Claude start is still answering initialize', ()
     await send(host, 'hello')
     expect(claude.child(SESSION).calls).not.toContain('send')
 
-    // The CLI answers: startup lands and the held message is written to the proven child.
+    // The CLI answers: startup lands and the queued message is written to the proven child.
     claude.child(SESSION).answerInit()
 
     await vi.waitFor(() => expect(claude.child(SESSION).calls).toContain('send'))
     expect(claude.children(SESSION)).toHaveLength(1)
-    expect(statusRows(host)).toEqual([])
+    expect(await statusRows(host)).toEqual([])
   })
 
   it('is rejected with the diagnostic when the CLI dies first, and restarts nothing', async () => {
@@ -147,16 +152,15 @@ describe('a send while the first Claude start is still answering initialize', ()
     const held = await send(host, 'hello')
     await failLatestStart(host, 1)
 
-    await vi.waitFor(() =>
-      expect(submission(host, held)).toMatchObject({
+    await vi.waitFor(async () =>
+      expect(await submission(host, held)).toMatchObject({
         dispatchState: 'rejected',
         // Worded for the user: the red line under the composer shows it as it stands.
-        reason: `The provider stopped before it finished starting: ${DIAGNOSTIC}.`
+        reason: STARTUP_TEXT,
+        rejection: { kind: 'providerStartFailed' }
       })
     )
-    expect(statusRows(host)).toEqual([
-      expect.stringMatching(/stopped before it finished starting: .*not signed in \(rig\)/)
-    ])
+    expect(await statusRows(host)).toEqual([STARTUP_TEXT])
     expect(fence(host)).toBe(startedFence + 1)
     expect(claude.children(SESSION)).toHaveLength(1)
     expect(claude.child(SESSION).calls).not.toContain('send')
diff --git a/src/main/runtime/claude-structured-send-restart-dies-before-dispatch.test.ts b/src/main/runtime/claude-structured-send-restart-dies-before-dispatch.test.ts
index 0d4b49096379..183879abe1a6 100644
--- a/src/main/runtime/claude-structured-send-restart-dies-before-dispatch.test.ts
+++ b/src/main/runtime/claude-structured-send-restart-dies-before-dispatch.test.ts
@@ -1,10 +1,9 @@
-// A send restarts a chat's Claude child and is admitted against it while it is still starting.
-// When that child dies before the send's dispatch reaches the adapter, the adapter has no session
-// to hold the message for, so the dispatch throws. A child that never proved its start accepted
-// nothing — input is only written after initialize — so the send settles `rejected` with the
-// child's own diagnostic, never as a delivery nobody can confirm, and a client that was
-// subscribed the whole time receives the failure row and the rejected submission over the wire.
-// Against the production runtime, adapter, record store and host, with only the CLI scripted.
+// A send is accepted into a chat whose Claude child is gone, and its delivery restarts the child.
+// When that child dies before it proves its start, the message was never handed to it — delivery
+// waits for the start — so the send settles `rejected` with the child's own diagnostic, never as a
+// delivery nobody can confirm, and a client that was subscribed the whole time receives the
+// failure row and the rejected submission over the wire. Against the production runtime, adapter,
+// record store and host, with only the CLI scripted.
 
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
@@ -12,11 +11,20 @@ import type { AgentSessionSubscribeEvent } from '../../shared/agent-session-wire
 import { hostTestMessage } from '../native-chat/agent-session-wire/structured-agent-session-host-test-data'
 import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
 import { waitForStructuredAgentSessionRecovery } from './structured-agent-session-runtime'
-import { createScriptedClaudeRuntime } from './structured-claude-scripted-runtime-test-support'
+import {
+  createScriptedClaudeRuntime,
+  scriptedClaudeExitError
+} from './structured-claude-scripted-runtime-test-support'
 
 const SESSION = 'claude-send-restart-dies-first'
 const CALLER = { callerKey: 'client-1' }
 const DIAGNOSTIC = 'claude stream-json exited (code 1): claude: not signed in (rig)'
+const STARTUP_TEXT = 'Claude stopped before it finished starting. Send your message to try again.'
+
+/** Delivery runs on its own serialized steps; under a loaded runner they take more than a second. */
+function eventually(assertion: () => unknown): Promise<unknown> {
+  return vi.waitFor(assertion, { timeout: 10_000 })
+}
 
 let claude = createScriptedClaudeRuntime([SESSION])
 let operations = 0
@@ -73,37 +81,27 @@ async function send(host: StructuredAgentSessionHost, text: string): Promise<str
   return clientOperationId
 }
 
-function statusRows(host: StructuredAgentSessionHost): string[] {
-  return host
-    .journalSnapshot(SESSION)
-    .items.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : []))
+async function statusRows(host: StructuredAgentSessionHost): Promise<string[]> {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.body.kind === 'status' ? [item.body.text] : []
+  )
 }
 
-function submission(host: StructuredAgentSessionHost, clientMessageId: string) {
-  return host
-    .journalSnapshot(SESSION)
-    .submissions.find((entry) => entry.clientMessageId === clientMessageId)
+async function submission(host: StructuredAgentSessionHost, clientMessageId: string) {
+  return (await host.journalSnapshot(SESSION)).submissions.find(
+    (entry) => entry.clientMessageId === clientMessageId
+  )
 }
 
 async function failLatestStart(host: StructuredAgentSessionHost, count: number): Promise<void> {
-  await vi.waitFor(() => expect(claude.children(SESSION)).toHaveLength(count))
-  claude.child(SESSION).exit(new Error(DIAGNOSTIC))
+  await eventually(() => expect(claude.children(SESSION)).toHaveLength(count))
+  claude.child(SESSION).exit(scriptedClaudeExitError(DIAGNOSTIC))
   await waitForStructuredAgentSessionRecovery()
-  await vi.waitFor(() =>
+  await eventually(() =>
     expect(host.deps.store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
   )
 }
 
-/** The restarted child dies the instant the send's dispatch reaches the adapter. */
-function killChildAtDispatch(host: StructuredAgentSessionHost): void {
-  const adapter = host.deps.adapter
-  const dispatch = adapter.dispatch.bind(adapter)
-  vi.spyOn(adapter, 'dispatch').mockImplementationOnce((input) => {
-    claude.child(SESSION).exit(new Error(DIAGNOSTIC))
-    return dispatch(input)
-  })
-}
-
 /** Everything a subscriber received, flattened to the rows and submissions it was shown. */
 function received(events: AgentSessionSubscribeEvent[]) {
   const statusTexts: string[] = []
@@ -129,7 +127,7 @@ function received(events: AgentSessionSubscribeEvent[]) {
   return { statusTexts, submissions, fences }
 }
 
-describe('a send whose restarted Claude child dies before the dispatch reaches the adapter', () => {
+describe('a send whose restarted Claude child dies before it proves its start', () => {
   it('settles rejected with the diagnostic, keeps one failure row, and a Retry is one new attempt', async () => {
     claude.behave(SESSION, { initHangs: true })
     const host = await claude.install()
@@ -139,28 +137,21 @@ describe('a send whose restarted Claude child dies before the dispatch reaches t
     await failLatestStart(host, 1)
     const releasedFence = fence(host)
 
-    killChildAtDispatch(host)
     const sent = await send(host, 'hello?')
-    // The send's own answer already says it was not delivered; it does not wait for the exit.
-    expect(answered.get(sent)).toBe('rejected')
-    expect(claude.children(SESSION)).toHaveLength(2)
-    await waitForStructuredAgentSessionRecovery()
-    await vi.waitFor(() =>
-      expect(host.deps.store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
-    )
+    // Accepted: the answer comes before the restart it needs.
+    expect(answered.get(sent)).toBe('pending')
+    await failLatestStart(host, 2)
 
     // Provably not delivered, with the cause; not "unconfirmed".
-    await vi.waitFor(() =>
-      expect(submission(host, sent)).toMatchObject({
+    await eventually(async () =>
+      expect(await submission(host, sent)).toMatchObject({
         dispatchState: 'rejected',
         // Worded for the user: the red line under the composer shows it as it stands.
-        reason: `The provider stopped before it finished starting: ${DIAGNOSTIC}.`
+        reason: STARTUP_TEXT,
+        rejection: { kind: 'providerStartFailed' }
       })
     )
-    expect(statusRows(host)).toEqual([
-      expect.stringContaining('not signed in'),
-      expect.stringMatching(/stopped before it finished starting: .*not signed in \(rig\)/)
-    ])
+    expect(await statusRows(host)).toEqual([STARTUP_TEXT, STARTUP_TEXT])
     expect(fence(host)).toBe(releasedFence + 2)
     expect(claude.children(SESSION)).toHaveLength(2)
     expect(claude.child(SESSION).calls).not.toContain('send')
@@ -168,40 +159,14 @@ describe('a send whose restarted Claude child dies before the dispatch reaches t
     // Retry under a new id: one restart, and once the CLI is healthy the message is written.
     claude.behave(SESSION, {})
     await send(host, 'hello again')
-    expect(claude.children(SESSION)).toHaveLength(3)
-    await vi.waitFor(() => expect(claude.child(SESSION).calls).toContain('send'))
+    await eventually(() => expect(claude.children(SESSION)).toHaveLength(3))
+    await eventually(() => expect(claude.child(SESSION).calls).toContain('send'))
     expect(claude.child(SESSION).calls.filter((call) => call === 'send')).toHaveLength(1)
-    expect(statusRows(host)).toHaveLength(2)
-  })
-
-  it('names the diagnostic even when the exit was fully processed before the dispatch arrived', async () => {
-    claude.behave(SESSION, { initHangs: true })
-    const host = await claude.install()
-    await expect(host.attach(CALLER, claude.attachParams(SESSION, null))).resolves.toMatchObject({
-      ok: true
-    })
-    await failLatestStart(host, 1)
-    const adapter = host.deps.adapter
-    const dispatch = adapter.dispatch.bind(adapter)
-    vi.spyOn(adapter, 'dispatch').mockImplementationOnce(async (input) => {
-      claude.child(SESSION).exit(new Error(DIAGNOSTIC))
-      // The adapter settles and publishes the exit; the host's own settlement waits behind this send.
-      await new Promise((resolve) => setTimeout(resolve, 300))
-      return dispatch(input)
-    })
-
-    const sent = await send(host, 'hello?')
-    expect(answered.get(sent)).toBe('rejected')
-    await waitForStructuredAgentSessionRecovery()
-    expect(submission(host, sent)).toMatchObject({
-      dispatchState: 'rejected',
-      reason: `The provider stopped before it finished starting: ${DIAGNOSTIC}.`
-    })
-    expect(statusRows(host)).toHaveLength(2)
+    expect(await statusRows(host)).toHaveLength(2)
   })
 
   // A restart refused because its child died before it was handed over leaves one row, from the
-  // send, in the words any failed start uses.
+  // delivery, in the words any failed start uses, and rejects the message with them.
   it.each(['spawn', 'start-time-read'] as const)(
     'leaves one row for a restart whose child exits at %s',
     async (at) => {
@@ -213,16 +178,17 @@ describe('a send whose restarted Claude child dies before the dispatch reaches t
       await failLatestStart(host, 1)
 
       claude.behave(SESSION, { exitsDuringSpawn: { diagnostic: DIAGNOSTIC, at } })
-      await expect(attempt(host, 'hello?')).resolves.toMatchObject({
-        ok: false,
-        refusal: { code: 'agent_session_owner_restart_failed' }
-      })
+      const sent = await send(host, 'hello?')
+      await eventually(async () =>
+        expect(await submission(host, sent)).toMatchObject({
+          dispatchState: 'rejected',
+          reason: STARTUP_TEXT,
+          rejection: { kind: 'providerStartFailed' }
+        })
+      )
       await waitForStructuredAgentSessionRecovery()
 
-      expect(statusRows(host)).toEqual([
-        `The provider stopped before it finished starting: ${DIAGNOSTIC}.`,
-        `The provider stopped before it finished starting: ${DIAGNOSTIC}.`
-      ])
+      expect(await statusRows(host)).toEqual([STARTUP_TEXT, STARTUP_TEXT])
     }
   )
 
@@ -233,7 +199,7 @@ describe('a send whose restarted Claude child dies before the dispatch reaches t
       ok: true
     })
     const events: AgentSessionSubscribeEvent[] = []
-    const unsubscribe = host.subscribe({
+    const unsubscribe = await host.subscribe({
       id: 'pane',
       sessionId: SESSION,
       emit: (event) => {
@@ -242,19 +208,13 @@ describe('a send whose restarted Claude child dies before the dispatch reaches t
     })
     try {
       await failLatestStart(host, 1)
-      killChildAtDispatch(host)
       const sent = await send(host, 'hello?')
-      await waitForStructuredAgentSessionRecovery()
-      await vi.waitFor(() =>
-        expect(host.deps.store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
-      )
+      await failLatestStart(host, 2)
 
-      await vi.waitFor(() => {
+      await eventually(() => {
         const seen = received(events)
         expect(seen.submissions.get(sent)).toBe('rejected')
-        expect(seen.statusTexts).toContainEqual(
-          expect.stringMatching(/stopped before it finished starting: .*not signed in \(rig\)/)
-        )
+        expect(seen.statusTexts).toContainEqual(STARTUP_TEXT)
         // The subscriber ended up on the fence the exit published, not the one the restart did.
         expect(seen.fences.at(-1)).toBe(fence(host))
       })
@@ -265,8 +225,8 @@ describe('a send whose restarted Claude child dies before the dispatch reaches t
 })
 
 describe('a chat whose Claude CLI keeps failing to start, seen by a subscriber open throughout', () => {
-  const STARTUP_FAILURE =
-    'The provider stopped before it finished starting: claude stream-json exited (code 1): claude: not signed in (rig).'
+  // The stderr rides beside the sentence as a log detail; the sentence is the same every time.
+  const STARTUP_FAILURE = STARTUP_TEXT
 
   /** Status rows a subscriber has been shown, one per row whatever frame carried it. */
   function shownRows(events: AgentSessionSubscribeEvent[]): Map<string, string> {
@@ -285,14 +245,14 @@ describe('a chat whose Claude CLI keeps failing to start, seen by a subscriber o
     return rows
   }
 
-  it('shows one row naming the cause per failed attempt, admitted or refused, and none once the CLI is fixed', async () => {
+  it('shows one row naming the cause per failed attempt, however the start died, and none once the CLI is fixed', async () => {
     claude.behave(SESSION, { initHangs: true })
     const host = await claude.install()
     const events: AgentSessionSubscribeEvent[] = []
     await expect(host.attach(CALLER, claude.attachParams(SESSION, null))).resolves.toMatchObject({
       ok: true
     })
-    const unsubscribe = host.subscribe({
+    const unsubscribe = await host.subscribe({
       id: 'pane',
       sessionId: SESSION,
       emit: (event) => {
@@ -301,37 +261,38 @@ describe('a chat whose Claude CLI keeps failing to start, seen by a subscriber o
     })
     try {
       await failLatestStart(host, 1)
-      await vi.waitFor(() => expect([...shownRows(events).values()]).toEqual([STARTUP_FAILURE]))
+      await eventually(() => expect([...shownRows(events).values()]).toEqual([STARTUP_FAILURE]))
 
-      // Send: admitted against the restarted child, which dies before starting.
-      killChildAtDispatch(host)
-      const sent = await attempt(host, 'hello?')
-      await waitForStructuredAgentSessionRecovery()
-      expect(sent).toMatchObject({
-        ok: true,
-        value: { submission: { dispatchState: 'rejected', reason: STARTUP_FAILURE } }
-      })
-      await vi.waitFor(() =>
+      // Send: accepted, and its delivery restarts the child, which dies before starting.
+      const sent = await send(host, 'hello?')
+      await failLatestStart(host, 2)
+      await eventually(async () =>
+        expect(await submission(host, sent)).toMatchObject({
+          dispatchState: 'rejected',
+          reason: STARTUP_FAILURE
+        })
+      )
+      await eventually(() =>
         expect([...shownRows(events).values()]).toEqual([STARTUP_FAILURE, STARTUP_FAILURE])
       )
 
-      // Retry while still broken: this restart dies before its child is handed over, so the send
-      // is refused before admission. Still one row, saying the same thing.
+      // Retry while still broken: this restart dies before its child is handed over, so the
+      // delivery's start is refused. Still one row, saying the same thing, on the rejected message.
       claude.behave(SESSION, {
         exitsDuringSpawn: {
           diagnostic: 'claude stream-json exited (code 1): claude: not signed in (rig)',
           at: 'start-time-read'
         }
       })
-      await expect(attempt(host, 'hello?')).resolves.toMatchObject({
-        ok: false,
-        refusal: {
-          code: 'agent_session_owner_restart_failed',
-          message: expect.stringMatching(/couldn't restart: .*not signed in \(rig\)/)
-        }
-      })
+      const retried = await send(host, 'hello?')
+      await eventually(async () =>
+        expect(await submission(host, retried)).toMatchObject({
+          dispatchState: 'rejected',
+          reason: STARTUP_FAILURE
+        })
+      )
       await waitForStructuredAgentSessionRecovery()
-      await vi.waitFor(() =>
+      await eventually(() =>
         expect([...shownRows(events).values()]).toEqual([
           STARTUP_FAILURE,
           STARTUP_FAILURE,
@@ -342,7 +303,7 @@ describe('a chat whose Claude CLI keeps failing to start, seen by a subscriber o
       // The CLI is fixed: Retry delivers and adds no row.
       claude.behave(SESSION, {})
       await expect(attempt(host, 'hello?')).resolves.toMatchObject({ ok: true })
-      await vi.waitFor(() => expect(claude.child(SESSION).calls).toContain('send'))
+      await eventually(() => expect(claude.child(SESSION).calls).toContain('send'))
       expect(shownRows(events).size).toBe(3)
     } finally {
       unsubscribe()
diff --git a/src/main/runtime/claude-structured-session-integration.test.ts b/src/main/runtime/claude-structured-session-integration.test.ts
index 186f4e0f30d1..82db5d6c5425 100644
--- a/src/main/runtime/claude-structured-session-integration.test.ts
+++ b/src/main/runtime/claude-structured-session-integration.test.ts
@@ -364,9 +364,28 @@ describe('a structured Claude session over agentSession.*', () => {
     claudeAuthPolicy = { stripAuthEnv: true }
     // The default overlay carries ANTHROPIC_AUTH_TOKEN, which the terminal path
     // refuses at spawn-env.ts:25 rather than letting it beat the pinned account.
-    const refused = await call('agentSession.create', createIntentParams())
-
-    expect(JSON.stringify(refused)).toContain('explicit Anthropic auth environment')
+    const params = createIntentParams()
+    const sentence =
+      'This Claude launch sets its own Anthropic sign-in variables. Remove them to use a managed Claude account.'
+    const refused = await call('agentSession.create', params)
+
+    // The thrown answer keeps its wire code; only its words are the ones its replay reads.
+    expect(refused).toMatchObject({
+      ok: false,
+      error: { code: 'runtime_error', message: sentence }
+    })
+    // Its replay reads the same sentence, beside the situation it names.
+    expect(await call('agentSession.create', params)).toMatchObject({
+      ok: true,
+      result: {
+        ok: false,
+        refusal: {
+          code: 'agent_session_operation_invalid',
+          details: { reason: 'managedAccountEnvOverride' },
+          message: sentence
+        }
+      }
+    })
     // Refused before spawn: no provider child was ever opened.
     expect(claude.connections).toHaveLength(0)
   })
@@ -379,11 +398,11 @@ describe('a structured Claude session over agentSession.*', () => {
     await waitForStructuredAgentSessionRecovery()
 
     const guidance = itemsOf(await subscribe()).find((item) => item.body?.kind === 'status')
+    // The adapter typed the refusal, so the row names the situation rather than quoting Orca.
     expect(guidance?.body).toMatchObject({
       kind: 'status',
-      text: expect.stringMatching(
-        /stopped before it finished starting: .*not signed in.*Claude CLI.*CLAUDE_CONFIG_DIR/s
-      )
+      text: 'Claude is not signed in for the selected account. Sign in, then send your message again.',
+      failure: { kind: 'notSignedIn' }
     })
     expect(leaseOf(SESSION)).toMatchObject({ claimStatus: 'released', handoffStage: null })
     // A failed start is not auto-resumed into the same failure.
@@ -393,7 +412,7 @@ describe('a structured Claude session over agentSession.*', () => {
   // The root's death is first-hand. Its descendants were never snapshottable, or one was seen
   // alive; either way the lease follows the root, so the reservation goes with it.
   it.each(['unverifiable', 'live'] as const)(
-    'releases a session whose CLI self-exited during create with its tree %s, with its diagnostic intact',
+    'releases a session whose CLI self-exited during create with its tree %s, refused in a sentence',
     async (tree) => {
       claude.setSelfExit({
         message: 'claude stream-json exited (code 1): claude: not signed in',
@@ -409,7 +428,8 @@ describe('a structured Claude session over agentSession.*', () => {
           ok: false,
           refusal: {
             code: 'agent_session_operation_invalid',
-            message: expect.stringContaining('claude: not signed in'),
+            // The CLI's stderr is log text; the person reads what the chat's start failure says.
+            message: 'Claude stopped before it finished starting. Send your message to try again.',
             ownerVerdict: 'exited'
           }
         }
@@ -444,7 +464,7 @@ describe('a structured Claude session over agentSession.*', () => {
         ok: false,
         refusal: {
           code: 'agent_session_operation_invalid',
-          message: expect.stringContaining('claude: not signed in'),
+          message: 'Claude stopped before it finished starting. Send your message to try again.',
           ownerVerdict: 'exited'
         }
       }
@@ -473,7 +493,7 @@ describe('a structured Claude session over agentSession.*', () => {
   })
 
   it.each(['unverifiable', 'live'] as const)(
-    'reopens a chat whose stop saw the Claude root exit with its tree %s',
+    'restarts a chat whose stop saw the Claude root exit with its tree %s',
     async (tree) => {
       await ok('agentSession.create', createIntentParams())
       const first = claude.live()
@@ -483,14 +503,19 @@ describe('a structured Claude session over agentSession.*', () => {
         return false
       }
       const host = getStructuredAgentSessionHost()
-      // The idle release clock's eviction: the lease follows the root, so the host lets go.
+      // The lease follows the root, so the host lets go.
       await host?.close(SESSION)
       expect(host?.hasSession(SESSION)).toBe(false)
 
-      // What the chat surface's `agentSession.hold` does when the user comes back to it.
-      await host?.hold(SESSION, 'desktop-chat:reopen')
+      // The user comes back and sends: that send is what starts Claude again.
+      const body = { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'back' }] }
+      await ok('agentSession.send', {
+        envelope: envelope('agentSession.send', { body }, leaseOf(SESSION).runtimeFence),
+        body
+      })
 
-      expect(claude.connections).toHaveLength(2)
+      await vi.waitFor(() => expect(claude.connections).toHaveLength(2))
+      await vi.waitFor(() => expect(claude.live().sent).toHaveLength(1))
       expect(host?.hasSession(SESSION)).toBe(true)
     }
   )
@@ -510,11 +535,9 @@ describe('a structured Claude session over agentSession.*', () => {
   // A descendant seen alive is one that survived the close ladder, such as an MCP server that
   // ignores SIGTERM; it no longer holds the chat.
   it.each(['unverifiable', 'live'] as const)(
-    'restarts an open chat after a Claude crash whose tree was %s',
+    'restarts a chat on its next send after a Claude crash whose tree was %s',
     async (tree) => {
       const created = await ok<{ fence: number }>('agentSession.create', createIntentParams())
-      // The open chat surface is what asks the host to bring Claude back.
-      await getStructuredAgentSessionHost()?.hold(SESSION, 'desktop-chat:open')
       const connection = claude.live()
       connection.exitVerdict = { root: 'exited', tree }
       connection.close = async () => {
@@ -537,19 +560,19 @@ describe('a structured Claude session over agentSession.*', () => {
         dispatchState: 'unknown',
         reason: 'provider_exited_before_acknowledgement'
       })
-      // Held back, sends failed with the crash until the idle clock stopped the chat.
+      // The crash releases the lease; nothing restarts Claude until the chat has work for it.
       await waitForStructuredAgentSessionRecovery()
-      expect(claude.connections).toHaveLength(2)
-      expect(claude.live().launch.options).toMatchObject({ resume: PROVIDER_SESSION })
-      const lease = leaseOf(SESSION)
-      expect(lease).toMatchObject({ claimStatus: 'live', handoffStage: null })
+      expect(claude.connections).toHaveLength(1)
+      expect(leaseOf(SESSION)).toMatchObject({ claimStatus: 'released', handoffStage: null })
       const next = { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'after' }] }
-      const sent = await ok<{ submission: { dispatchState: string } }>('agentSession.send', {
-        envelope: envelope('agentSession.send', { body: next }, lease.runtimeFence),
+      await ok('agentSession.send', {
+        envelope: envelope('agentSession.send', { body: next }, leaseOf(SESSION).runtimeFence),
         body: next
       })
-      expect(sent.submission.dispatchState).toBe('accepted')
-      expect(claude.live().sent).toHaveLength(1)
+      await vi.waitFor(() => expect(claude.connections).toHaveLength(2))
+      expect(claude.live().launch.options).toMatchObject({ resume: PROVIDER_SESSION })
+      await vi.waitFor(() => expect(claude.live().sent).toHaveLength(1))
+      expect(leaseOf(SESSION)).toMatchObject({ claimStatus: 'live', handoffStage: null })
     }
   )
 
diff --git a/src/main/runtime/claude-structured-startup-fault-is-not-an-exit.test.ts b/src/main/runtime/claude-structured-startup-fault-is-not-an-exit.test.ts
new file mode 100644
index 000000000000..863cbaeaebf9
--- /dev/null
+++ b/src/main/runtime/claude-structured-startup-fault-is-not-an-exit.test.ts
@@ -0,0 +1,139 @@
+// A Claude start can fail on Orca's side while the CLI is still running: a saved option it can't
+// restore, or an init frame naming another session. Orca ends that child itself, so the chat must
+// not say Claude stopped on its own; only an exit Orca saw says that. Against the production
+// runtime, adapter, record store and host, with only the CLI process scripted.
+
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
+import { hostTestMessage } from '../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
+import { waitForStructuredAgentSessionRecovery } from './structured-agent-session-runtime'
+import {
+  createScriptedClaudeRuntime,
+  scriptedClaudeExitError
+} from './structured-claude-scripted-runtime-test-support'
+
+const SESSION = 'claude-startup-fault'
+const CALLER = { callerKey: 'client-1' }
+const DIAGNOSTIC = 'claude stream-json exited (code 1): claude: not signed in (rig)'
+const STOPPED_TEXT = 'Claude stopped before it finished starting. Send your message to try again.'
+
+let claude = createScriptedClaudeRuntime([SESSION])
+let operations = 0
+
+afterEach(async () => {
+  vi.restoreAllMocks()
+  await claude.dispose()
+  claude = createScriptedClaudeRuntime([SESSION])
+})
+
+function fence(host: StructuredAgentSessionHost): number {
+  return host.deps.store.getRecord(SESSION)?.lease.runtimeFence ?? 0
+}
+
+async function send(host: StructuredAgentSessionHost, text: string): Promise<string> {
+  const body = hostTestMessage(text)
+  const sent = await host.send(CALLER, {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: `${Date.now()}-${(++operations).toString(16).padStart(32, '0')}`,
+      expectedRuntimeFence: fence(host),
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.send',
+        sessionId: SESSION,
+        fields: { body }
+      })
+    },
+    body
+  })
+  expect(sent, JSON.stringify(sent)).toMatchObject({
+    ok: true,
+    value: { submission: { dispatchState: 'pending' } }
+  })
+  return sent.ok ? sent.value.clientMessageId : ''
+}
+
+async function failureRows(host: StructuredAgentSessionHost) {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.body.kind === 'status' && item.body.failure
+      ? [{ text: item.body.text, kind: item.body.failure.kind }]
+      : []
+  )
+}
+
+async function submission(host: StructuredAgentSessionHost, clientMessageId: string) {
+  return (await host.journalSnapshot(SESSION)).submissions.find(
+    (entry) => entry.clientMessageId === clientMessageId
+  )
+}
+
+async function released(host: StructuredAgentSessionHost): Promise<void> {
+  await waitForStructuredAgentSessionRecovery()
+  await vi.waitFor(() =>
+    expect(host.deps.store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
+  )
+}
+
+describe('a Claude start that Orca fails while the CLI is still running', () => {
+  it('reads as a start that could not happen when a saved option cannot be restored', async () => {
+    claude.behave(SESSION, { optionWritesFail: true })
+    const host = await claude.install()
+    await expect(
+      host.attach(
+        CALLER,
+        claude.attachParams(SESSION, null, { options: { permissionMode: 'plan' } })
+      )
+    ).resolves.toMatchObject({ ok: true })
+    await released(host)
+
+    expect(claude.child(SESSION).calls).toContain('set_permission_mode')
+    expect(await failureRows(host)).toEqual([
+      { text: expect.stringMatching(/^Claude couldn't start\./), kind: 'startFailed' }
+    ])
+  })
+
+  it('rejects a held message as a start that could not happen when init names another session', async () => {
+    claude.behave(SESSION, { initHangs: true, initNamesForeignSession: true })
+    const host = await claude.install()
+    await expect(host.attach(CALLER, claude.attachParams(SESSION, null))).resolves.toMatchObject({
+      ok: true
+    })
+    const held = await send(host, 'hello')
+
+    claude.child(SESSION).answerInit()
+    await released(host)
+
+    await vi.waitFor(async () =>
+      expect(await submission(host, held)).toMatchObject({
+        dispatchState: 'rejected',
+        reason: expect.stringMatching(/^Claude couldn't start\./),
+        rejection: { kind: 'startFailed' }
+      })
+    )
+    expect(await failureRows(host)).toEqual([
+      { text: expect.stringMatching(/^Claude couldn't start\./), kind: 'startFailed' }
+    ])
+    expect(claude.child(SESSION).calls).not.toContain('send')
+  })
+
+  it('still says Claude stopped when the CLI exits on its own before its start lands', async () => {
+    claude.behave(SESSION, { initHangs: true })
+    const host = await claude.install()
+    await expect(host.attach(CALLER, claude.attachParams(SESSION, null))).resolves.toMatchObject({
+      ok: true
+    })
+    const held = await send(host, 'hello')
+
+    claude.child(SESSION).exit(scriptedClaudeExitError(DIAGNOSTIC))
+    await released(host)
+
+    await vi.waitFor(async () =>
+      expect(await submission(host, held)).toMatchObject({
+        dispatchState: 'rejected',
+        reason: STOPPED_TEXT,
+        rejection: { kind: 'providerStartFailed' }
+      })
+    )
+    expect(await failureRows(host)).toEqual([{ text: STOPPED_TEXT, kind: 'providerStartFailed' }])
+  })
+})
diff --git a/src/main/runtime/claude-structured-startup-unanswered-control-request.test.ts b/src/main/runtime/claude-structured-startup-unanswered-control-request.test.ts
index 38d0de314d26..ce26647ae85f 100644
--- a/src/main/runtime/claude-structured-startup-unanswered-control-request.test.ts
+++ b/src/main/runtime/claude-structured-startup-unanswered-control-request.test.ts
@@ -72,10 +72,10 @@ function turnReportsModel(model: string): void {
   })
 }
 
-function statusRows(host: StructuredAgentSessionHost): string[] {
-  return host
-    .journalSnapshot(SESSION)
-    .items.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : []))
+async function statusRows(host: StructuredAgentSessionHost): Promise<string[]> {
+  return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+    item.body.kind === 'status' ? [item.body.text] : []
+  )
 }
 
 async function send(host: StructuredAgentSessionHost, text: string): Promise<void> {
@@ -119,7 +119,7 @@ describe('a Claude start whose CLI answers initialize but not a control request'
       timeout: DEADLINE_MS * 40
     })
     expect(host.deps.adapter.readOptionRestoreFailures?.(SESSION)).toEqual([])
-    expect(statusRows(host)).toEqual([])
+    expect(await statusRows(host)).toEqual([])
     expect(claude.children(SESSION)).toHaveLength(1)
 
     // The proven child takes the next message.
@@ -245,7 +245,7 @@ describe('a Claude start whose CLI answers initialize but not a control request'
       timeout: DEADLINE_MS * 40
     })
     expect(record(host)?.lease.claimStatus).toBe('live')
-    expect(statusRows(host)).toEqual([])
+    expect(await statusRows(host)).toEqual([])
     expect(claude.children(SESSION)).toHaveLength(1)
   })
 })
diff --git a/src/main/runtime/claude-trust-dialog-transcript.test.ts b/src/main/runtime/claude-trust-dialog-transcript.test.ts
new file mode 100644
index 000000000000..5913c54b0199
--- /dev/null
+++ b/src/main/runtime/claude-trust-dialog-transcript.test.ts
@@ -0,0 +1,252 @@
+/**
+ * Claude Code's first-launch trust dialog, replayed byte for byte from captured transcripts
+ * (`__fixtures__/claude-dialog-trust-workspace*.txt`).
+ *
+ * The dialog parks the cursor on its highlighted option with a cursor-up, and the host's line tail
+ * drops every row below the cursor — "Yes, I trust this folder" and "Enter to confirm". The
+ * tui-idle poll therefore reads the runtime's rendered screen, which still shows them.
+ */
+
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { createTranscriptPane, TRANSCRIPT_PANE_PTY_ID } from './agent-transcript-pane-test-harness'
+
+function readCapture(name: string): { data: string; size: { cols: number; rows: number } } {
+  const base = join(__dirname, '__fixtures__', name)
+  const meta: { cols: number; rows: number } = JSON.parse(readFileSync(`${base}.meta.json`, 'utf8'))
+  return { data: readFileSync(`${base}.txt`, 'utf8'), size: { cols: meta.cols, rows: meta.rows } }
+}
+
+async function waitOnReplay(
+  name: string,
+  readSize: number | null,
+  options: { after?: string; timeoutMs?: number } = {}
+) {
+  const { data, size } = readCapture(name)
+  const { runtime, handle } = await createTranscriptPane({
+    paneTitle: 'Claude Code',
+    foregroundProcess: 'claude',
+    launchAgent: 'claude',
+    size,
+    data: ''
+  })
+  // Pane creation awaits real timers; replay and polling use the virtual clock.
+  vi.useFakeTimers()
+  const bytes = Buffer.from(data, 'utf8')
+  const step = readSize ?? bytes.length
+  // Why a streaming decoder: a PTY read can end inside a multi-byte character, as a real one does.
+  const decoder = new TextDecoder()
+  for (let offset = 0; offset < bytes.length; offset += step) {
+    const read = decoder.decode(bytes.subarray(offset, offset + step), { stream: true })
+    runtime.onPtyData(TRANSCRIPT_PANE_PTY_ID, read, Date.now())
+  }
+  if (options.after) {
+    runtime.onPtyData(TRANSCRIPT_PANE_PTY_ID, options.after, Date.now())
+  }
+  const timeoutMs = options.timeoutMs ?? 15_000
+  const promise = runtime.waitForTerminal(handle, {
+    condition: 'tui-idle',
+    timeoutMs
+  })
+  // Attach before advancing so the expected timeout is never an unhandled rejection.
+  promise.catch(() => {})
+  await vi.advanceTimersByTimeAsync(timeoutMs)
+  return promise
+}
+
+describe("Claude's workspace trust dialog, from captured transcripts", () => {
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('reports the dialog as a blocking prompt instead of waiting out the whole budget', async () => {
+    await expect(waitOnReplay('claude-dialog-trust-workspace', null)).resolves.toMatchObject({
+      satisfied: false,
+      blockedReason: 'agent-trust-workspace'
+    })
+  })
+
+  it('still reports it when the dialog arrives in the 1024-byte reads a live Claude produced', async () => {
+    // Why: the tail's plain path blanks each `text\r\r\n` line of a read that carries no
+    // cursor-up, so the opening question never survives there; the screen is unaffected.
+    await expect(waitOnReplay('claude-dialog-trust-workspace', 1024)).resolves.toMatchObject({
+      satisfied: false,
+      blockedReason: 'agent-trust-workspace'
+    })
+  })
+
+  it('reports it on a narrow pane, where Claude wraps the question across lines', async () => {
+    await expect(waitOnReplay('claude-dialog-trust-workspace-narrow', null)).resolves.toMatchObject(
+      { satisfied: false, blockedReason: 'agent-trust-workspace' }
+    )
+  })
+
+  it('reports the agent ready, not blocked, once the user has answered "Yes"', async () => {
+    const wait = await waitOnReplay('claude-dialog-trust-workspace-answered', 1024)
+    expect(wait).toMatchObject({ satisfied: true })
+    expect(wait).not.toHaveProperty('blockedReason')
+  })
+
+  it('does not report a working Claude blocked for quoting the dialog in its own output', async () => {
+    // Synthetic turn painted over the answered capture: a working title, then a diff of this
+    // dialog's wording just above the status line, where the rendered screen shows it.
+    const quotedDiff = [
+      '⏺ Update(src/main/runtime/claude-trust-dialog-transcript.test.ts)',
+      '  ⎿  Added 3 lines',
+      "      12 +    '❯ No, exit',",
+      "      13 +    '  Yes, I trust this folder',",
+      "      14 +    'Enter to confirm · Esc to cancel'",
+      '✻ Working… (esc to interrupt)'
+    ]
+      .map((line, index) => `\x1b[${27 + index};1H\x1b[2K${line}`)
+      .join('')
+    // Why a timeout proves it: three poll ticks pass, and a working agent has nothing else to settle on.
+    await expect(
+      waitOnReplay('claude-dialog-trust-workspace-answered', 1024, {
+        after: `\x1b]0;⠂ Claude Code\x07${quotedDiff}`,
+        timeoutMs: 6_500
+      })
+    ).rejects.toThrow('timeout')
+  })
+})
+
+// A shell auto-title names Claude before Claude paints anything: oh-my-zsh sends the command
+// line as OSC 2 and then `claude` as OSC 1; fish's default is `claude <cwd>`. That bare name is
+// not a rest signal, so it must never let a launch type into the dialog below it.
+const OH_MY_ZSH_TITLES = ['\x1b]2;claude --dangerously-skip-permissions\x07', '\x1b]1;claude\x07']
+const FISH_TITLE = '\x1b]0;claude ~/p/repo\x07'
+// eslint-disable-next-line no-control-regex -- OSC title sequences are control characters
+const OSC_0_TITLE = /\x1b\]0;[^\x07]*\x07/g
+const POLL_INTERVAL_MS = 2_000
+const QUIESCENCE_MS = 3_000
+
+describe("Claude's trust dialog under a shell auto-title", () => {
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  async function createPane(name = 'claude-dialog-trust-workspace') {
+    const { data, size } = readCapture(name)
+    const pane = await createTranscriptPane({
+      paneTitle: 'claude',
+      foregroundProcess: 'claude',
+      launchAgent: 'claude',
+      size,
+      data: ''
+    })
+    // Why after creation: the pane's own set-up awaits real timers.
+    vi.useFakeTimers()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: both resolvers are protected methods on the runtime; the spies only count calls.
+    const internals = pane.runtime as unknown as {
+      resolveTuiIdleWaiters: (...args: unknown[]) => void
+      resolvePtyTuiIdleWaiters: (...args: unknown[]) => void
+    }
+    const titleResolves = [
+      vi.spyOn(internals, 'resolveTuiIdleWaiters'),
+      vi.spyOn(internals, 'resolvePtyTuiIdleWaiters')
+    ]
+    const write = (chunk: string) =>
+      pane.runtime.onPtyData(TRANSCRIPT_PANE_PTY_ID, chunk, Date.now())
+    const paint = (bytes = data) => {
+      const encoded = Buffer.from(bytes, 'utf8')
+      const decoder = new TextDecoder()
+      for (let offset = 0; offset < encoded.length; offset += 1024) {
+        write(decoder.decode(encoded.subarray(offset, offset + 1024), { stream: true }))
+      }
+    }
+    const wait = () => {
+      const settled = vi.fn()
+      const promise = pane.runtime.waitForTerminal(pane.handle, {
+        condition: 'tui-idle',
+        timeoutMs: 60_000
+      })
+      promise.then(settled, () => {})
+      return { promise, settled }
+    }
+    const titleResolveCount = () =>
+      titleResolves.reduce((sum, spy) => sum + spy.mock.calls.length, 0)
+    return { data, write, paint, wait, titleResolveCount }
+  }
+
+  it('reports the dialog to a wait registered after the pane has gone quiet', async () => {
+    const pane = await createPane()
+    OH_MY_ZSH_TITLES.forEach(pane.write)
+    pane.paint()
+    await vi.advanceTimersByTimeAsync(QUIESCENCE_MS + 500)
+
+    const { promise } = pane.wait()
+    await vi.advanceTimersByTimeAsync(0)
+    await expect(promise).resolves.toMatchObject({
+      satisfied: false,
+      blockedReason: 'agent-trust-workspace'
+    })
+  })
+
+  // Why the resolver differs: the command-line title reads as `permission`, and a
+  // permission-to-idle step is not offered to waiters, so oh-my-zsh reaches the poll instead.
+  it.each([
+    ['oh-my-zsh', OH_MY_ZSH_TITLES, false],
+    ['fish', [FISH_TITLE], true]
+  ])(
+    'does not settle ready when the %s title arrives before the dialog paints',
+    async (_, titles, offered) => {
+      const pane = await createPane()
+      const { promise, settled } = pane.wait()
+      titles.forEach(pane.write)
+      expect(pane.titleResolveCount() > 0).toBe(offered)
+      await vi.advanceTimersByTimeAsync(POLL_INTERVAL_MS)
+      expect(settled).not.toHaveBeenCalled()
+
+      pane.paint()
+      await vi.advanceTimersByTimeAsync(POLL_INTERVAL_MS)
+      await expect(promise).resolves.toMatchObject({
+        satisfied: false,
+        blockedReason: 'agent-trust-workspace'
+      })
+    }
+  )
+
+  it('does not settle ready when the exit probe restores the name-only title', async () => {
+    const pane = await createPane()
+    const { promise, settled } = pane.wait()
+    pane.write('\x1b]1;claude\x07')
+    const resolvesBeforeRestore = pane.titleResolveCount()
+    // A neutral title reads as the agent exiting; the probe finds `claude` still in front and
+    // restores the idle status, offering it to the waiters again.
+    pane.write('\x1b]0;~/p/repo\x07')
+    await vi.advanceTimersByTimeAsync(0)
+    expect(pane.titleResolveCount()).toBeGreaterThan(resolvesBeforeRestore)
+    expect(settled).not.toHaveBeenCalled()
+
+    pane.paint()
+    await vi.advanceTimersByTimeAsync(POLL_INTERVAL_MS)
+    await expect(promise).resolves.toMatchObject({
+      satisfied: false,
+      blockedReason: 'agent-trust-workspace'
+    })
+  })
+
+  it("reports ready at once when Claude's own idle title follows the answer", async () => {
+    const pane = await createPane('claude-dialog-trust-workspace-answered')
+    OH_MY_ZSH_TITLES.forEach(pane.write)
+    pane.paint()
+    const { promise } = pane.wait()
+    await vi.advanceTimersByTimeAsync(0)
+    await expect(promise).resolves.toMatchObject({ satisfied: true })
+  })
+
+  it('reports ready after the quiet window when Claude paints no title of its own', async () => {
+    const pane = await createPane('claude-dialog-trust-workspace-answered')
+    OH_MY_ZSH_TITLES.forEach(pane.write)
+    pane.paint(pane.data.replace(OSC_0_TITLE, ''))
+    const { promise, settled } = pane.wait()
+    await vi.advanceTimersByTimeAsync(QUIESCENCE_MS - 500)
+    expect(settled).not.toHaveBeenCalled()
+
+    await vi.advanceTimersByTimeAsync(POLL_INTERVAL_MS * 2)
+    const wait = await promise
+    expect(wait).toMatchObject({ satisfied: true })
+    expect(wait).not.toHaveProperty('blockedReason')
+  })
+})
diff --git a/src/main/runtime/client-hosted-browser-row-hydration-census.test.ts b/src/main/runtime/client-hosted-browser-row-hydration-census.test.ts
deleted file mode 100644
index e50e066a5445..000000000000
--- a/src/main/runtime/client-hosted-browser-row-hydration-census.test.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import { glob } from 'tinyglobby'
-
-const REPO_ROOT = join(import.meta.dirname, '../../..')
-const CENSUS_FILE = 'src/main/runtime/client-hosted-browser-row-hydration-census.test.ts'
-
-/**
- * `deliverHydrationSnapshot` reads like a getter and is not one: it replaces the publisher's record
- * of which workspaces the renderer holds rows for. A second caller that reasonably treats it as a
- * peek — a status panel, a diagnostic dump, a second window's look-ahead — would clear that record
- * out from under the live renderer, and the rows it is showing become unretractable. That is the
- * exact defect this round shipped a fix for, so the single-caller shape is pinned rather than
- * trusted to the name.
- */
-async function countCallSites(pattern: RegExp): Promise<Record<string, number>> {
-  const files = await glob(['src/**/*.ts', 'src/**/*.tsx'], {
-    cwd: REPO_ROOT,
-    ignore: ['**/node_modules/**', '**/*.test.ts', '**/*.test.tsx', CENSUS_FILE]
-  })
-  const counts: Record<string, number> = {}
-  for (const file of files) {
-    // Counted per file, not merely detected: two call sites in one file mask each other.
-    const hits = readFileSync(join(REPO_ROOT, file), 'utf8').match(pattern)?.length ?? 0
-    if (hits > 0) {
-      counts[file] = hits
-    }
-  }
-  return counts
-}
-
-// Anchored on the member-call shape rather than the bare name, so the declaration does not count
-// itself and prose about the method does not have to be kept out of the file.
-const DELIVER_CALL = /\.deliverHydrationSnapshot\(/g
-const LIST_CALL = /\.listClientHostedBrowserRows\(/g
-
-describe('client-hosted row hydration caller census', () => {
-  it('keeps the hydration delivery to its one runtime caller', async () => {
-    expect(await countCallSites(DELIVER_CALL)).toEqual({
-      'src/main/runtime/orca-runtime-stored-mobile-snapshot-has-stale-preserved-tab.ts': 1
-    })
-  })
-
-  // The IPC handler is the other half of the same invariant: it is what turns one renderer's
-  // hydration request into one delivery, so a second production reader would arrive through here.
-  it('keeps the runtime accessor to its one IPC caller', async () => {
-    expect(await countCallSites(LIST_CALL)).toEqual({
-      'src/main/ipc/runtime.ts': 1
-    })
-  })
-
-  // Why: the two censuses above pass by finding what is already there, so a matcher that had
-  // stopped matching would read the same as a clean repo. Prove it counts a second caller.
-  it('counts a second caller rather than reporting the same single site', () => {
-    const source = `
-      const a = runtime.deliverHydrationSnapshot()
-      const b = other.deliverHydrationSnapshot()
-    `
-    expect(source.match(DELIVER_CALL)?.length).toBe(2)
-    expect('runtime.listClientHostedBrowserRows()'.match(LIST_CALL)?.length).toBe(1)
-  })
-})
diff --git a/src/main/runtime/codex-header-readiness-transcripts.test.ts b/src/main/runtime/codex-header-readiness-transcripts.test.ts
new file mode 100644
index 000000000000..ea1cfe3b7f0e
--- /dev/null
+++ b/src/main/runtime/codex-header-readiness-transcripts.test.ts
@@ -0,0 +1,317 @@
+import { describe, expect, it, vi } from 'vitest'
+import { createTranscriptPane, TRANSCRIPT_PANE_PTY_ID } from './agent-transcript-pane-test-harness'
+import {
+  readRuntimeFixture,
+  replayTranscript,
+  type TranscriptReplayFrame
+} from './agent-transcript-replay-test-harness'
+import {
+  isKnownReadyPromptBody,
+  isKnownReadyPromptPreview,
+  isKnownReadyPromptSettled,
+  isQuietReadyScreenBody
+} from './terminal-wait-detection'
+
+vi.mock('electron', () => ({
+  BrowserWindow: { fromId: vi.fn(() => null) },
+  webContents: { fromId: vi.fn(() => null) },
+  ipcMain: { on: vi.fn(), removeListener: vi.fn() },
+  app: { getPath: vi.fn(() => '/tmp') }
+}))
+
+// codex-cli 0.157.1 recordings at 120x40 (see each .meta.json); STA-8628.
+const PLAIN = 'codex-0157-plain-ready'
+const EFFORT_OVERRIDE = 'codex-0157-effort-override-embedded-warning'
+const CONFIG_OVERRIDE = 'codex-0157-config-override-embedded-warning'
+const NO_DAEMON = 'codex-0157-no-daemon-effort-override'
+// Fresh CODEX_HOME: the provisional header stays up while Codex installs and starts its daemon.
+const FRESH_HOME = 'codex-0157-fresh-home-daemon-install'
+const ALL_FIXTURES = [PLAIN, EFFORT_OVERRIDE, CONFIG_OVERRIDE, NO_DAEMON, FRESH_HOME]
+
+async function finalFrame(
+  name: string,
+  cols: number,
+  rows: number
+): Promise<TranscriptReplayFrame> {
+  let last: TranscriptReplayFrame | null = null
+  for await (const frame of replayTranscript(readRuntimeFixture(name), cols, rows)) {
+    last = frame
+  }
+  if (!last) {
+    throw new Error(`empty fixture ${name}`)
+  }
+  return last
+}
+
+function screenShowsLoadingHeader(screenLines: string[]): boolean {
+  const screen = screenLines.join('\n').toLowerCase()
+  return screen.includes('openai codex') && /(?:model|directory):\s+loading/.test(screen)
+}
+
+// Codex's default status row opens with `<model> <effort> ·`; only the live chat paints it.
+const LIVE_STATUS_ROW_RE = /\b(?:default|minimal|low|medium|high|xhigh) ·/
+
+function screenShowsProvisionalStartup(screenLines: string[]): boolean {
+  return (
+    screenShowsLoadingHeader(screenLines) &&
+    !screenLines.some((line) => LIVE_STATUS_ROW_RE.test(line.toLowerCase()))
+  )
+}
+
+describe('Codex 0.157 header readiness from captured bytes', () => {
+  it.each([EFFORT_OVERRIDE, CONFIG_OVERRIDE])(
+    '%s: the line-folded wait text never shows a ready header',
+    async (name) => {
+      const { waitText } = await finalFrame(name, 120, 40)
+      // Why: the cell-diff repaint folds to `dirctory:` — the STA-8628 timeout.
+      expect(waitText.toLowerCase()).toContain('dirctory:')
+      expect(isKnownReadyPromptPreview(waitText)).toBe(false)
+    }
+  )
+
+  it.each(ALL_FIXTURES)(
+    '%s: the screen never adds readiness while loading, and is ready at the final screen',
+    async (name) => {
+      let sawLoadingHeader = false
+      let last: TranscriptReplayFrame | null = null
+      for await (const frame of replayTranscript(readRuntimeFixture(name), 120, 40)) {
+        if (screenShowsLoadingHeader(frame.screenLines)) {
+          sawLoadingHeader = true
+          expect(isQuietReadyScreenBody('', 'codex', () => frame.screenLines)).toBe(false)
+        }
+        last = frame
+      }
+      // Presence precondition: a loading frame was actually exercised.
+      expect(sawLoadingHeader).toBe(true)
+      expect(last).not.toBeNull()
+      expect(isQuietReadyScreenBody(last!.waitText, 'codex', () => last!.screenLines)).toBe(true)
+    }
+  )
+
+  // Why: 0.157 discards input typed during its daemon start, behind the provisional header.
+  it.each(ALL_FIXTURES)(
+    '%s: never ready while the screen shows the provisional `model: loading` startup screen',
+    async (name) => {
+      let sawTextOnlyReadiness = false
+      for await (const frame of replayTranscript(readRuntimeFixture(name), 120, 40)) {
+        if (screenShowsProvisionalStartup(frame.screenLines)) {
+          sawTextOnlyReadiness ||= isKnownReadyPromptPreview(frame.waitText)
+          expect(isQuietReadyScreenBody(frame.waitText, 'codex', () => frame.screenLines)).toBe(
+            false
+          )
+          expect(isKnownReadyPromptBody(frame.waitText, null, () => frame.screenLines, true)).toBe(
+            false
+          )
+        }
+      }
+      // Presence precondition for the text-copy fixtures: the text rules alone would say ready here.
+      if (name === PLAIN || name === FRESH_HOME) {
+        expect(sawTextOnlyReadiness).toBe(true)
+      }
+    }
+  )
+
+  // Why these sizes: grids out of step with the 120x40 recording garble the header (review of #23475).
+  describe.each([
+    [120, 40],
+    [80, 24],
+    [30, 50],
+    [108, 30],
+    [60, 5]
+  ])('at %ix%i the screen never takes a settled header away from the text rules', (cols, rows) => {
+    it.each(ALL_FIXTURES)('%s', async (name) => {
+      let settledFrames = 0
+      for await (const frame of replayTranscript(readRuntimeFixture(name), cols, rows)) {
+        if (isKnownReadyPromptSettled(frame.waitText)) {
+          settledFrames += 1
+          expect(isQuietReadyScreenBody(frame.waitText, 'codex', () => frame.screenLines)).toBe(
+            true
+          )
+        }
+      }
+      // Presence precondition: the text-copy fixtures reach a settled header.
+      if (name === PLAIN || name === FRESH_HOME || name === NO_DAEMON) {
+        expect(settledFrames).toBeGreaterThan(0)
+      }
+    })
+  })
+
+  it('keeps the text rules when there is no live screen', async () => {
+    const { waitText } = await finalFrame(PLAIN, 120, 40)
+    expect(isQuietReadyScreenBody(waitText, 'codex', () => null)).toBe(
+      isKnownReadyPromptPreview(waitText)
+    )
+    expect(isQuietReadyScreenBody(waitText, 'codex', () => null)).toBe(true)
+  })
+
+  it('does not read a mid-turn composer as ready', () => {
+    const screenLines = [
+      '› Summarize the repository layout',
+      '• Working (12s • esc to interrupt)',
+      '› Ask Codex to do anything',
+      '  GPT-6-Sol high · ~/repo/app'
+    ]
+    expect(isQuietReadyScreenBody(screenLines.join('\n'), 'codex', () => screenLines)).toBe(false)
+  })
+
+  it('does not settle when a blocking dialog is painted below the header', () => {
+    const screenLines = [
+      '│ >_ OpenAI Codex (v0.157.1)                               │',
+      '│ model:       GPT-6-Sol high   /model to change           │',
+      '│ directory:   ~/repo/app                                  │',
+      'Do you trust the contents of this directory?',
+      'Press enter to continue'
+    ]
+    expect(isQuietReadyScreenBody('', 'codex', () => screenLines)).toBe(false)
+  })
+
+  it('reads only the header box, not chat below it that mentions Codex', () => {
+    const screenLines = [
+      '╭──────────────────────────────────────────────────────────╮',
+      '│ >_ OpenAI Codex (v0.157.1)                               │',
+      '│ model:       GPT-6-Sol high   /model to change           │',
+      '│ directory:   ~/repo/app                                  │',
+      '╰──────────────────────────────────────────────────────────╯',
+      '› Why does OpenAI Codex print model: loading at startup?'
+    ]
+    expect(isQuietReadyScreenBody('', 'codex', () => screenLines)).toBe(true)
+  })
+
+  it('never reads a non-codex screen, even one showing the Codex header', () => {
+    const screenLines = [
+      '│ >_ OpenAI Codex (v0.157.1)                               │',
+      '│ model:       GPT-6-Sol high   /model to change           │',
+      '│ directory:   ~/repo/app                                  │'
+    ]
+    const readScreenLines = vi.fn(() => screenLines)
+    expect(isQuietReadyScreenBody('', 'claude', readScreenLines)).toBe(false)
+    expect(readScreenLines).not.toHaveBeenCalled()
+    expect(isQuietReadyScreenBody('', 'codex', readScreenLines)).toBe(true)
+  })
+
+  describe('at the 80x24 default grid the header garbles and today’s answer stands', () => {
+    it.each(ALL_FIXTURES)('%s', async (name) => {
+      const { screenLines, waitText } = await finalFrame(name, 80, 24)
+      expect(isQuietReadyScreenBody(waitText, 'codex', () => screenLines)).toBe(
+        isKnownReadyPromptPreview(waitText)
+      )
+    })
+  })
+
+  describe('through the runtime', () => {
+    async function codexPane(name: string, size?: { cols: number; rows: number }) {
+      return createTranscriptPane({
+        paneTitle: 'Terminal',
+        foregroundProcess: 'codex',
+        launchAgent: 'codex',
+        data: readRuntimeFixture(name),
+        size
+      })
+    }
+
+    it.each(ALL_FIXTURES)(
+      '%s: a tui-idle wait settles from the live screen',
+      async (name) => {
+        const { runtime, handle } = await codexPane(name, { cols: 120, rows: 40 })
+        // Why 8s: quiescence (3s) plus the 2s poll re-reading the grid.
+        await expect(
+          runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 8_000 })
+        ).resolves.toMatchObject({ condition: 'tui-idle', satisfied: true })
+      },
+      15_000
+    )
+
+    it('does not settle while Codex is still installing its daemon behind the provisional screen', async () => {
+      const data = readRuntimeFixture(FRESH_HOME)
+      const install = data.indexOf('Installing daemon')
+      // Presence precondition: the cut keeps the provisional header and stops before the live chat.
+      expect(install).toBeGreaterThan(0)
+      const provisional = data.slice(0, data.indexOf('\n', install) + 1)
+      expect(provisional).toMatch(/model:.*loading/)
+      const { runtime, handle } = await createTranscriptPane({
+        paneTitle: 'Terminal',
+        foregroundProcess: 'codex',
+        launchAgent: 'codex',
+        data: provisional,
+        size: { cols: 120, rows: 40 }
+      })
+      // Why 6s: past the 3s quiescence, so the quiet lane's provisional veto is what holds.
+      await expect(
+        runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 6_000 })
+      ).rejects.toThrow(/timeout/)
+    }, 15_000)
+
+    // Why no bytes: worker-start waits on a pane that has printed nothing yet, which is when the
+    // runtime asks for a visible-screen read instead of its own text copy.
+    it('does not settle from a visible-screen read of the provisional screen', async () => {
+      const { runtime, handle } = await createTranscriptPane({
+        paneTitle: 'Terminal',
+        foregroundProcess: 'codex',
+        launchAgent: 'codex',
+        data: '',
+        size: { cols: 120, rows: 40 }
+      })
+      const readVisibleScreen = vi.spyOn(runtime, 'readTerminal').mockResolvedValue({
+        handle,
+        status: 'running',
+        tail: [
+          '╭──────────────────────────────────────────╮',
+          '│ >_ OpenAI Codex (v0.157.0)               │',
+          '│ model:       loading   /model to change  │',
+          '│ directory:   ~/repo/app                  │',
+          '╰──────────────────────────────────────────╯',
+          '› Ask Codex to do anything',
+          '  ? for shortcuts'
+        ],
+        truncated: false,
+        nextCursor: null,
+        source: 'screen'
+      })
+      await expect(
+        runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 2_500 })
+      ).rejects.toThrow(/timeout/)
+      // Presence precondition: the visible-screen probe actually ran.
+      expect(readVisibleScreen).toHaveBeenCalled()
+    }, 15_000)
+
+    // Why: restored bytes set no lastOutputAt, so the quiet lane has no clock to wait out.
+    it('settles a restored Codex pane from its header, as main did', async () => {
+      const { runtime, handle } = await createTranscriptPane({
+        paneTitle: 'Terminal',
+        foregroundProcess: 'codex',
+        launchAgent: 'codex',
+        data: ''
+      })
+      runtime.seedTerminalRestoreTail(TRANSCRIPT_PANE_PTY_ID, {
+        text: [
+          '╭──────────────────────────────────────────╮',
+          '│ >_ OpenAI Codex (v0.157.1)               │',
+          '│ model:       gpt-6-sol high   /model to change │',
+          '│ directory:   ~/repo/app                  │',
+          '╰──────────────────────────────────────────╯',
+          '› Ask Codex to do anything',
+          '  gpt-6-sol high · ~/repo/app'
+        ].join('\r\n')
+      })
+      // Why no screen: the visible-screen probe must not be what settles the wait.
+      vi.spyOn(runtime, 'readTerminal').mockResolvedValue({
+        handle,
+        status: 'running',
+        tail: [],
+        truncated: false,
+        nextCursor: null,
+        source: 'screen-unavailable'
+      })
+      await expect(
+        runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 2_500 })
+      ).resolves.toMatchObject({ condition: 'tui-idle', satisfied: true })
+    }, 15_000)
+
+    it('keeps timing out on the garbled 80x24 default grid, as before', async () => {
+      const { runtime, handle } = await codexPane(EFFORT_OVERRIDE)
+      await expect(
+        runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 6_000 })
+      ).rejects.toThrow(/timeout/)
+    }, 15_000)
+  })
+})
diff --git a/src/main/runtime/codex-quiet-ready-screen.test.ts b/src/main/runtime/codex-quiet-ready-screen.test.ts
new file mode 100644
index 000000000000..223eef2d858e
--- /dev/null
+++ b/src/main/runtime/codex-quiet-ready-screen.test.ts
@@ -0,0 +1,460 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { TuiAgent } from '../../shared/tui-agent'
+import { createTranscriptPane } from './agent-transcript-pane-test-harness'
+import {
+  readRuntimeFixture,
+  replayTranscript,
+  type TranscriptReplayFrame
+} from './agent-transcript-replay-test-harness'
+import { isCodexComposerReadyScreen } from './codex-terminal-readiness'
+import {
+  detectTerminalWaitBlockedReason,
+  isKnownReadyPromptBody,
+  isKnownReadyPromptPreview,
+  isQuietReadyScreenBody
+} from './terminal-wait-detection'
+import {
+  evaluateTuiIdle,
+  hasQuietReadyScreen,
+  isTuiIdleReadyVerdict,
+  type TuiIdleEvaluationInput
+} from './tui-idle-evidence'
+
+vi.mock('electron', () => ({
+  BrowserWindow: { fromId: vi.fn(() => null) },
+  webContents: { fromId: vi.fn(() => null) },
+  ipcMain: { on: vi.fn(), removeListener: vi.fn() },
+  app: { getPath: vi.fn(() => '/tmp') }
+}))
+
+const QUIESCENCE_MS = 3000
+
+// codex-cli recordings at 120x40 (see each .meta.json); STA-8834. Each launches, runs a turn,
+// and ends idle; the timed ones also replay as plain strings here. 0.157 idles via STA-8628's.
+const TIMED_FIXTURES = ['codex-0-155-1-timed-turn', 'codex-0-158-0-timed-turn']
+const SETTLED_IDLE_FIXTURES = ['codex-0-150-1-turn', ...TIMED_FIXTURES]
+const DIALOG_FIXTURES = [
+  'codex-0-157-1-update-dialog',
+  'codex-0-158-0-approval',
+  'codex-0-158-0-trustprompt'
+]
+const STA_8628_FIXTURES = [
+  'codex-0157-plain-ready',
+  'codex-0157-effort-override-embedded-warning',
+  'codex-0157-config-override-embedded-warning',
+  'codex-0157-no-daemon-effort-override'
+]
+
+const BUSY_STATUS_RE = /to interrupt\)/
+const EMPTY_COMPOSER_RE = /^› ask codex to do anything\s*$/m
+const HEADER_LOADING_RE = /(?:model|directory):\s+loading|^\s*loading\s*$/m
+const DIALOG_RE =
+  /update available|do you trust|trust this folder|would you like to run|press enter to confirm|enter continue/
+
+function screenOf(frame: TranscriptReplayFrame): string {
+  return frame.screenLines.join('\n').toLowerCase()
+}
+
+async function collectFrames(
+  data: string | readonly string[],
+  cols = 120,
+  rows = 40
+): Promise<TranscriptReplayFrame[]> {
+  const frames: TranscriptReplayFrame[] = []
+  for await (const frame of replayTranscript(data, cols, rows)) {
+    frames.push(frame)
+  }
+  return frames
+}
+
+describe('Codex composer ready screen, frame by frame', () => {
+  it.each([...SETTLED_IDLE_FIXTURES, ...DIALOG_FIXTURES])(
+    '%s: never ready while loading, mid-turn, or under a drawn dialog',
+    async (name) => {
+      const seen = { loading: 0, busy: 0, dialog: 0 }
+      for (const frame of await collectFrames(readRuntimeFixture(name))) {
+        const screen = screenOf(frame)
+        // Why only once the composer is gone: a half-drawn dialog keeps it for a few frames,
+        // which quiescence absorbs; a drawn dialog replaces it.
+        const kind = HEADER_LOADING_RE.test(screen)
+          ? 'loading'
+          : BUSY_STATUS_RE.test(screen)
+            ? 'busy'
+            : DIALOG_RE.test(screen) && !EMPTY_COMPOSER_RE.test(screen)
+              ? 'dialog'
+              : null
+        if (kind) {
+          seen[kind] += 1
+          expect({ kind, ready: isCodexComposerReadyScreen(screenOf(frame)) }).toEqual({
+            kind,
+            ready: false
+          })
+        }
+      }
+      // Presence preconditions: each fixture exercises the states it was recorded for.
+      expect(seen.loading).toBeGreaterThan(0)
+      if (DIALOG_FIXTURES.includes(name)) {
+        expect(seen.dialog).toBeGreaterThan(0)
+      } else {
+        expect(seen.busy).toBeGreaterThan(0)
+      }
+    },
+    30_000
+  )
+
+  it.each([...SETTLED_IDLE_FIXTURES, ...STA_8628_FIXTURES])(
+    '%s: ready on the final idle screen',
+    async (name) => {
+      const frames = await collectFrames(readRuntimeFixture(name))
+      expect(isCodexComposerReadyScreen(screenOf(frames.at(-1)!))).toBe(true)
+    }
+  )
+
+  it.each(DIALOG_FIXTURES)('%s: not ready while the dialog owns the screen', async (name) => {
+    const frames = await collectFrames(readRuntimeFixture(name))
+    expect(isCodexComposerReadyScreen(screenOf(frames.at(-1)!))).toBe(false)
+  })
+
+  it('is not ready without a live screen', () => {
+    expect(isQuietReadyScreenBody('', 'codex', () => null)).toBe(false)
+  })
+
+  it('reads the placeholder only as the composer line, not quoted mid-line', () => {
+    const quoted = ['$ grep placeholder notes.txt', 'the box says › Ask Codex to do anything', '$']
+    expect(isQuietReadyScreenBody('', 'codex', () => quoted)).toBe(false)
+  })
+
+  it('reads the busy row only above the composer, not a status row quoted in the answer', () => {
+    const screenLines = [
+      '>_ OpenAI Codex (v0.158.0)',
+      '   ~/repo',
+      '',
+      '› what does the status row look like mid-turn?',
+      '',
+      '• It reads like this:',
+      '',
+      '  • Working (0s • esc to interrupt)',
+      '',
+      '  The timer counts up until the turn ends, and the row',
+      '  disappears once the answer is complete.',
+      '',
+      '› Ask Codex to do anything',
+      '',
+      '  gpt-5.6-sol medium · ~/repo',
+      '  ? for shortcuts'
+    ]
+    expect(isQuietReadyScreenBody('', 'codex', () => screenLines)).toBe(true)
+    const composer = screenLines.indexOf('› Ask Codex to do anything')
+    const busy = [
+      ...screenLines.slice(0, composer),
+      '• Working (3s • esc to interrupt)',
+      '  └ Tip: start a fresh idea with /new',
+      '',
+      ...screenLines.slice(composer)
+    ]
+    expect(isQuietReadyScreenBody('', 'codex', () => busy)).toBe(false)
+  })
+
+  it("reads 0.158's turn timestamp above the composer as the end of a quoted status row", () => {
+    // Live 0.158 screen after a worker answered with a status row verbatim (STA-8834).
+    const screenLines = [
+      '  === TASK ===',
+      '  Reply with exactly this line and nothing else: • Working (0s • esc to interrupt) — then call worker_done.',
+      '• • Working (0s • esc to interrupt)',
+      '• Ran orca-dev orchestration send --from term_f496fcd2-a874-4fa6-a9bd-550a515ac928 --dispatch-capability dcap_PTgPpvf-B…',
+      '  └ Sent msg_ff7be3f25d7e',
+      '    + Show details',
+      '• • Working (0s • esc to interrupt)',
+      '  11:15 PM',
+      '› Ask Codex to do anything',
+      '  GPT-6-Sol medium · ~/orca-lanes/sta8834/live3/scratch · Report task outcome',
+      '  ? for shortcuts'
+    ]
+    expect(isQuietReadyScreenBody('', 'codex', () => screenLines)).toBe(true)
+  })
+
+  it('settles a quiet composer under an answer asking "Would you like to proceed?"', () => {
+    const screenLines = [
+      '>_ OpenAI Codex (v0.158.0)',
+      '   ~/repo',
+      '',
+      '› tidy the README',
+      '',
+      '• Done. Would you like to proceed with the changelog too?',
+      '',
+      '› Ask Codex to do anything',
+      '',
+      '  ? for shortcuts'
+    ]
+    const waitText = screenLines.join('\n')
+    const verdict = evaluateTuiIdle({
+      record: { lastAgentStatus: null, lastOutputAt: 0, lastOscTitle: null },
+      readTailBlockedReason: () => detectTerminalWaitBlockedReason(waitText),
+      readPositiveBodyEvidence: () =>
+        isKnownReadyPromptBody(waitText, 'codex', () => screenLines, true),
+      readQuietReadyBodyEvidence: () =>
+        isQuietReadyScreenBody(waitText, 'codex', () => screenLines),
+      agent: 'codex',
+      firstPartyStatus: null,
+      quiescenceMs: QUIESCENCE_MS
+    })
+    expect(verdict.kind).toBe('ready-strong')
+  })
+})
+
+type Timing = { promptSentAtMs: number; chunks: [number, number][] }
+
+function readTimedFixture(name: string): { chunks: string[]; times: number[]; promptAt: number } {
+  const data = readRuntimeFixture(name)
+  const timing: Timing = JSON.parse(
+    readFileSync(join(__dirname, '__fixtures__', `${name}.timing.json`), 'utf8')
+  )
+  const chunks: string[] = []
+  let offset = 0
+  for (const [, length] of timing.chunks) {
+    chunks.push(data.slice(offset, offset + length))
+    offset += length
+  }
+  expect(offset).toBe(data.length)
+  return { chunks, times: timing.chunks.map(([at]) => at), promptAt: timing.promptSentAtMs }
+}
+
+describe('the quiet lane over recorded chunk timing (default animations)', () => {
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it.each(TIMED_FIXTURES)(
+    '%s: never settles mid-turn, and settles once the finished turn is quiet',
+    async (name) => {
+      const { chunks, times, promptAt } = readTimedFixture(name)
+      const frames = await collectFrames(chunks)
+      // Why after the replay: the emulator's write flush runs on real timers.
+      vi.useFakeTimers()
+      const lastBusy = frames.findLastIndex((frame) => BUSY_STATUS_RE.test(screenOf(frame)))
+      const firstTurnChunk = times.findIndex((at) => at >= promptAt)
+      expect(lastBusy).toBeGreaterThan(firstTurnChunk)
+      // The latest moment each frame stays on screen: just before the next chunk lands.
+      const settlesAt = (index: number, now: number): boolean => {
+        vi.setSystemTime(now)
+        return hasQuietReadyScreen(
+          { lastAgentStatus: null, lastOutputAt: times[index]!, lastOscTitle: null },
+          'codex',
+          () =>
+            isQuietReadyScreenBody(
+              frames[index]!.waitText,
+              'codex',
+              () => frames[index]!.screenLines
+            ),
+          QUIESCENCE_MS
+        )
+      }
+      let readyBodyMidTurn = 0
+      for (let index = firstTurnChunk; index <= lastBusy; index += 1) {
+        if (isCodexComposerReadyScreen(screenOf(frames[index]!))) {
+          readyBodyMidTurn += 1
+        }
+        expect({ index, settles: settlesAt(index, times[index + 1]! - 1) }).toEqual({
+          index,
+          settles: false
+        })
+      }
+      // Presence precondition: the body alone does show mid-turn, so quiescence is load-bearing.
+      expect(readyBodyMidTurn).toBeGreaterThan(0)
+      const last = frames.length - 1
+      // Why +1: the fake clock keeps whole milliseconds; the recorded times do not.
+      expect(settlesAt(last, times[last]! + QUIESCENCE_MS + 1)).toBe(true)
+    },
+    120_000
+  )
+})
+
+describe('a busy 0.150-0.157 pane whose header stays in the tail', () => {
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it.each(['codex-0-155-1-timed-turn', 'codex-0-157-1-timed-sleep-turn'])(
+    '%s: never settles tui-idle mid-turn, and settles once the finished turn is quiet',
+    async (name) => {
+      const { chunks, times, promptAt } = readTimedFixture(name)
+      const frames = await collectFrames(chunks)
+      vi.useFakeTimers()
+      const verdictAt = (index: number, now: number) => {
+        vi.setSystemTime(now)
+        const { waitText, screenLines } = frames[index]!
+        return evaluateTuiIdle({
+          record: { lastAgentStatus: null, lastOutputAt: times[index]!, lastOscTitle: null },
+          readTailBlockedReason: () => detectTerminalWaitBlockedReason(waitText),
+          readPositiveBodyEvidence: () =>
+            isKnownReadyPromptBody(waitText, 'codex', () => screenLines, true),
+          readQuietReadyBodyEvidence: () =>
+            isQuietReadyScreenBody(waitText, 'codex', () => screenLines),
+          agent: 'codex',
+          firstPartyStatus: null,
+          quiescenceMs: QUIESCENCE_MS
+        })
+      }
+      const lastBusy = frames.findLastIndex((frame) => BUSY_STATUS_RE.test(screenOf(frame)))
+      const firstTurnChunk = times.findIndex((at) => at >= promptAt)
+      let headerMidTurn = 0
+      for (let index = firstTurnChunk; index <= lastBusy; index += 1) {
+        if (isKnownReadyPromptPreview(frames[index]!.waitText)) {
+          headerMidTurn += 1
+        }
+        const settles = isTuiIdleReadyVerdict(verdictAt(index, times[index + 1]! - 1))
+        expect({ index, settles }).toEqual({ index, settles: false })
+      }
+      // Presence precondition: the ready header is in the tail mid-turn, so the fix is load-bearing.
+      expect(headerMidTurn).toBeGreaterThan(0)
+      const last = frames.length - 1
+      expect(verdictAt(last, times[last]!).kind).toBe('pending')
+      expect(verdictAt(last, times[last]! + QUIESCENCE_MS + 1).kind).toBe('ready-strong')
+    },
+    120_000
+  )
+
+  const header = [
+    '│ >_ OpenAI Codex (v0.157.1)                               │',
+    '│ model:       GPT-6-Sol high   /model to change           │',
+    '│ directory:   ~/repo/app                                  │'
+  ]
+
+  it('reads the header as tier-1 evidence only for a pane with no output clock', () => {
+    const waitText = header.join('\n')
+    expect(isKnownReadyPromptBody(waitText, 'codex', () => header, true)).toBe(false)
+    expect(isKnownReadyPromptBody(waitText, 'codex', () => header, false)).toBe(true)
+    expect(isKnownReadyPromptBody(waitText, null, () => header, true)).toBe(true)
+  })
+
+  // Why: a restored or reattached pane has no lastOutputAt, so the quiet lane can never fire.
+  const NOW = 60_000
+  it.each([
+    [null, 'ready-strong'],
+    [0, 'ready-strong'],
+    [NOW - 1_000, 'pending']
+  ] as const)(
+    'a codex pane whose lastOutputAt is %s reads its header as %s',
+    (lastOutputAt, kind) => {
+      vi.useFakeTimers()
+      vi.setSystemTime(NOW)
+      const waitText = header.join('\n')
+      const record = { lastAgentStatus: null, lastOutputAt, lastOscTitle: null }
+      const verdict = evaluateTuiIdle({
+        record,
+        readTailBlockedReason: () => detectTerminalWaitBlockedReason(waitText),
+        readPositiveBodyEvidence: () =>
+          isKnownReadyPromptBody(waitText, 'codex', () => header, record.lastOutputAt !== null),
+        readQuietReadyBodyEvidence: () => isQuietReadyScreenBody(waitText, 'codex', () => header),
+        agent: 'codex',
+        firstPartyStatus: null,
+        quiescenceMs: QUIESCENCE_MS
+      })
+      expect(verdict.kind).toBe(kind)
+    }
+  )
+})
+
+describe('reading the live screen never removes quiet-lane readiness', () => {
+  const records = [
+    { lastAgentStatus: null, lastOutputAt: 0, lastOscTitle: null },
+    { lastAgentStatus: 'idle' as const, lastOutputAt: 0, lastOscTitle: 'codex' },
+    { lastAgentStatus: 'working' as const, lastOutputAt: 0, lastOscTitle: '⠋ repo' }
+  ]
+  describe.each([
+    [120, 40],
+    [80, 24]
+  ])('at %ix%i', (cols, rows) => {
+    it.each([...SETTLED_IDLE_FIXTURES, ...DIALOG_FIXTURES, ...STA_8628_FIXTURES])(
+      '%s',
+      async (name) => {
+        for (const frame of await collectFrames(readRuntimeFixture(name), cols, rows)) {
+          for (const agent of ['codex', null] as const) {
+            const base = {
+              readTailBlockedReason: () => detectTerminalWaitBlockedReason(frame.waitText),
+              readPositiveBodyEvidence: () =>
+                isKnownReadyPromptBody(frame.waitText, agent, () => frame.screenLines, true),
+              agent,
+              firstPartyStatus: null,
+              quiescenceMs: QUIESCENCE_MS
+            } satisfies Omit<TuiIdleEvaluationInput, 'record' | 'readQuietReadyBodyEvidence'>
+            for (const record of records) {
+              const before = evaluateTuiIdle({
+                ...base,
+                record,
+                // Why a withheld screen: isolates what the live screen adds to the quiet lane.
+                readQuietReadyBodyEvidence: () =>
+                  isQuietReadyScreenBody(frame.waitText, agent, () => null)
+              })
+              const after = evaluateTuiIdle({
+                ...base,
+                record,
+                readQuietReadyBodyEvidence: () =>
+                  isQuietReadyScreenBody(frame.waitText, agent, () => frame.screenLines)
+              })
+              if (isTuiIdleReadyVerdict(before)) {
+                expect(isTuiIdleReadyVerdict(after)).toBe(true)
+              }
+            }
+          }
+        }
+      },
+      60_000
+    )
+  })
+})
+
+describe('agent gate', () => {
+  const placeholderScreen = ['› Ask Codex to do anything', '  ? for shortcuts']
+
+  it("never reads another agent's screen, even one showing Codex's placeholder", () => {
+    const readScreenLines = vi.fn(() => placeholderScreen)
+    for (const agent of ['claude', 'muse', 'gemini'] as const) {
+      expect(isQuietReadyScreenBody('', agent, readScreenLines)).toBe(false)
+    }
+    expect(readScreenLines).not.toHaveBeenCalled()
+    expect(isQuietReadyScreenBody('', 'codex', readScreenLines)).toBe(true)
+  })
+
+  it('leaves an agent-unknown pane showing a cat-ed Codex transcript pending', () => {
+    const catted = ['$ cat session.log', '› Ask Codex to do anything', '  ? for shortcuts', '$ ']
+    const readScreenLines = vi.fn(() => catted)
+    expect(isQuietReadyScreenBody(catted.join('\n'), null, readScreenLines)).toBe(false)
+    expect(readScreenLines).not.toHaveBeenCalled()
+    expect(isQuietReadyScreenBody('', 'codex', readScreenLines)).toBe(true)
+  })
+})
+
+describe('through the runtime', () => {
+  // Why 0.158 alone: its header carries no `model:`, so only this lane settles it.
+  const CODEX_0158 = 'codex-0-158-0-timed-turn'
+  async function pane(name: string, launchAgent: TuiAgent, size?: { cols: number; rows: number }) {
+    return createTranscriptPane({
+      paneTitle: 'Terminal',
+      foregroundProcess: launchAgent,
+      launchAgent,
+      data: readRuntimeFixture(name),
+      size
+    })
+  }
+
+  // Why 8s: quiescence (3s) plus the 2s poll re-reading the grid.
+  it('codex 0.158: a tui-idle wait settles once the composer is quiet', async () => {
+    const { runtime, handle } = await pane(CODEX_0158, 'codex', { cols: 120, rows: 40 })
+    await expect(
+      runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 8_000 })
+    ).resolves.toMatchObject({ condition: 'tui-idle', satisfied: true })
+  }, 15_000)
+
+  it('keeps a Claude pane showing the same screen pending', async () => {
+    const { runtime, handle } = await pane(CODEX_0158, 'claude', {
+      cols: 120,
+      rows: 40
+    })
+    await expect(
+      runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 6_000 })
+    ).rejects.toThrow(/timeout/)
+  }, 15_000)
+})
diff --git a/src/main/runtime/codex-startup-dialog-transcripts.test.ts b/src/main/runtime/codex-startup-dialog-transcripts.test.ts
new file mode 100644
index 000000000000..ac636eb8a052
--- /dev/null
+++ b/src/main/runtime/codex-startup-dialog-transcripts.test.ts
@@ -0,0 +1,205 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { RuntimeTerminalWaitBlockedReason } from '../../shared/runtime-types'
+import { createTranscriptPane } from './agent-transcript-pane-test-harness'
+import {
+  readRuntimeFixture,
+  replayTranscript,
+  type TranscriptReplayFrame
+} from './agent-transcript-replay-test-harness'
+import {
+  detectTerminalWaitBlockedReason,
+  isKnownReadyPromptBody,
+  isQuietReadyScreenBody
+} from './terminal-wait-detection'
+
+vi.mock('electron', () => ({
+  BrowserWindow: { fromId: vi.fn(() => null) },
+  webContents: { fromId: vi.fn(() => null) },
+  ipcMain: { on: vi.fn(), removeListener: vi.fn() },
+  app: { getPath: vi.fn(() => '/tmp') }
+}))
+
+type StartupDialog = {
+  name: string
+  reason: RuntimeTerminalWaitBlockedReason
+  heading: string
+  keyRow: string
+}
+
+// codex-cli 0.157.0 / 0.158.0 recordings at 120x40 on a fresh CODEX_HOME (see each .meta.json).
+// Each dialog owns Enter, and none prints the `Press enter to …` wording older builds did.
+const DIALOGS: StartupDialog[] = [
+  {
+    // Recorded separately on 0.157.1 (STA-8834).
+    name: 'codex-0-157-1-update-dialog',
+    reason: 'agent-update-prompt',
+    heading: 'Update available ·',
+    keyRow: 'enter continue · esc skip'
+  },
+  {
+    name: 'codex-0157-update-available-dialog',
+    reason: 'agent-update-prompt',
+    heading: 'Update available ·',
+    keyRow: 'enter continue · esc skip'
+  },
+  {
+    name: 'codex-0158-update-available-dialog',
+    reason: 'agent-update-prompt',
+    heading: 'Update available ·',
+    keyRow: 'enter continue · esc skip'
+  },
+  {
+    name: 'codex-0157-hooks-review-dialog',
+    reason: 'agent-hooks-review-prompt',
+    heading: 'Hooks need review',
+    keyRow: 'enter confirm · esc skip'
+  },
+  {
+    name: 'codex-0158-hooks-review-dialog',
+    reason: 'agent-hooks-review-prompt',
+    heading: 'Hooks need review',
+    keyRow: 'enter confirm · esc skip'
+  },
+  {
+    name: 'codex-0157-model-retired-dialog',
+    reason: 'codex-model-migration-prompt',
+    heading: 'is no longer available',
+    keyRow: 'enter/esc continue · ctrl+c quit'
+  },
+  {
+    name: 'codex-0158-model-retired-dialog',
+    reason: 'codex-model-migration-prompt',
+    heading: 'is no longer offered',
+    keyRow: 'enter/esc continue · ctrl+c quit'
+  },
+  {
+    name: 'codex-0158-model-announcement-dialog',
+    reason: 'codex-model-migration-prompt',
+    heading: 'Try new model',
+    keyRow: 'enter/esc confirm · ctrl+c quit'
+  }
+]
+const DIALOGS_0158 = DIALOGS.filter((dialog) => dialog.name.startsWith('codex-0158-'))
+const LIVE_CHAT_FIXTURES = [
+  'codex-0157-plain-ready',
+  'codex-0157-effort-override-embedded-warning',
+  'codex-0157-config-override-embedded-warning',
+  'codex-0157-no-daemon-effort-override',
+  'codex-0157-fresh-home-daemon-install',
+  'codex-0158-fresh-home-greeting'
+]
+
+function screenText(frame: TranscriptReplayFrame): string {
+  return frame.screenLines.join('\n')
+}
+
+async function lastFrame(data: string): Promise<TranscriptReplayFrame | null> {
+  let last: TranscriptReplayFrame | null = null
+  for await (const frame of replayTranscript(data, 120, 40)) {
+    last = frame
+  }
+  return last
+}
+
+// Why stitched: no capture spans answering a dialog. Codex repaints every cell once a startup
+// dialog closes, so the 0.158 greeting capture's paints stand in for that repaint.
+function answered(name: string): string {
+  const greeting = readRuntimeFixture('codex-0158-fresh-home-greeting')
+  return readRuntimeFixture(name) + greeting.slice(greeting.indexOf('\x1b[?2026h'))
+}
+
+describe('Codex 0.157/0.158 startup dialogs from captured bytes', () => {
+  it.each(DIALOGS)(
+    '$name: reports $reason from its key row on, and never reads ready while it is up',
+    async ({ name, reason, heading, keyRow }) => {
+      let headingFrames = 0
+      let keyRowFrames = 0
+      for await (const frame of replayTranscript(readRuntimeFixture(name), 120, 40)) {
+        const screen = screenText(frame)
+        if (screen.includes(heading)) {
+          headingFrames += 1
+          expect(isQuietReadyScreenBody(frame.waitText, 'codex', () => frame.screenLines)).toBe(
+            false
+          )
+          expect(isKnownReadyPromptBody(frame.waitText, null, () => frame.screenLines, true)).toBe(
+            false
+          )
+        }
+        if (keyRowFrames > 0 || screen.includes(keyRow)) {
+          keyRowFrames += 1
+          expect(detectTerminalWaitBlockedReason(frame.waitText)).toBe(reason)
+        }
+      }
+      // Presence precondition: the dialog and its key row were painted, not just parsed.
+      expect(headingFrames).toBeGreaterThan(0)
+      expect(keyRowFrames).toBeGreaterThan(0)
+    }
+  )
+
+  it.each(DIALOGS_0158)(
+    '$name: stops reporting once Codex repaints its chat after it',
+    async ({ name, heading }) => {
+      const last = await lastFrame(answered(name))
+      // Presence precondition: the answered dialog is still in the text copy.
+      expect(last?.waitText).toContain(heading.replace(' ·', ''))
+      expect(detectTerminalWaitBlockedReason(last?.waitText ?? '')).toBeNull()
+    }
+  )
+
+  it.each(DIALOGS)(
+    '$name: still reports $reason when Codex is relaunched in the same pane and shows it again',
+    async ({ name, reason }) => {
+      // Why: quitting Codex from a dialog leaves that copy in the text copy ahead of the relaunch.
+      const dialog = readRuntimeFixture(name)
+      const last = await lastFrame(`${dialog}\x1b[?1049l\r\n% codex\r\n${dialog}`)
+      expect(detectTerminalWaitBlockedReason(last?.waitText ?? '')).toBe(reason)
+      expect(
+        isQuietReadyScreenBody(last?.waitText ?? '', 'codex', () => last?.screenLines ?? null)
+      ).toBe(false)
+    }
+  )
+
+  it.each(LIVE_CHAT_FIXTURES)('%s: a live chat reports no dialog', async (name) => {
+    const waitText = (await lastFrame(readRuntimeFixture(name)))?.waitText ?? ''
+    expect(detectTerminalWaitBlockedReason(waitText)).toBeNull()
+    // Why these lines: chat can name a dialog, and Codex's own update notice and footer draw `·`.
+    const chat = [
+      '› is there an update available, and do my hooks need review?',
+      '✨ Update available! 0.158.0 -> 0.159.0',
+      'Run npm install -g @openai/codex to update.',
+      '  gpt-6-astra default · ~/repo',
+      '  ← for agents · ? for shortcuts'
+    ].join('\n')
+    expect(detectTerminalWaitBlockedReason(`${waitText}\n${chat}`)).toBeNull()
+  })
+
+  it('does not name a mid-session Codex popup a hooks review', () => {
+    // Why: Codex's rate-limit reset popup (and other pickers) ends `enter confirm · esc back`.
+    const popup = [
+      '  Use this reset?',
+      '  1. Yes, use reset  Reset your weekly and 5-hour usage limits.',
+      '› 2. No, go back     Choose a different reset',
+      '  enter confirm · esc back'
+    ].join('\n')
+    expect(detectTerminalWaitBlockedReason(popup)).not.toBe('agent-hooks-review-prompt')
+  })
+
+  describe('through the runtime', () => {
+    it.each(DIALOGS)(
+      '$name: stops a tui-idle wait as $reason instead of typing into it',
+      async ({ name, reason }) => {
+        const { runtime, handle } = await createTranscriptPane({
+          paneTitle: 'Terminal',
+          foregroundProcess: 'codex',
+          launchAgent: 'codex',
+          data: readRuntimeFixture(name),
+          size: { cols: 120, rows: 40 }
+        })
+        await expect(
+          runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 2_500 })
+        ).resolves.toMatchObject({ satisfied: false, blockedReason: reason })
+      },
+      15_000
+    )
+  })
+})
diff --git a/src/main/runtime/codex-terminal-readiness.ts b/src/main/runtime/codex-terminal-readiness.ts
new file mode 100644
index 000000000000..7ce60fa9933c
--- /dev/null
+++ b/src/main/runtime/codex-terminal-readiness.ts
@@ -0,0 +1,84 @@
+// Why both shapes: 0.150-0.157 paint `model: loading` in a box, 0.158 a bare `loading` under the title.
+const CODEX_HEADER_LOADING_RE = /(?:model|directory):\s+loading|^\s*loading\s*$/m
+// Why a line cap: 0.158 draws no box, so nothing else ends its header before the chat.
+const CODEX_HEADER_LINES = 6
+// Why the whole line: a pager, a `cat`ed transcript, or chat can quote the placeholder mid-line.
+const CODEX_EMPTY_COMPOSER_RE = /^› ask codex to do anything\s*$/
+// Why not "working": reasoning summaries replace it, and a remapped key still ends this way.
+const CODEX_BUSY_STATUS_MARKER = 'to interrupt)'
+// Why only a tip: it is the one line Codex draws between its status row and the composer (120x40 corpus).
+const CODEX_STATUS_TIP_PREFIX = '└ tip:'
+
+// Why the header only: chat below it can mention "OpenAI Codex" or `model: loading`.
+function findCodexHeader(screen: string): { index: number; text: string } | null {
+  const index = screen.indexOf('openai codex')
+  if (index === -1) {
+    return null
+  }
+  const boxEnd = screen.indexOf('╰', index)
+  const text = screen
+    .slice(index, boxEnd === -1 ? undefined : boxEnd)
+    .split('\n', CODEX_HEADER_LINES)
+    .join('\n')
+  return { index, text }
+}
+
+/** The 0.150-0.157 header, which only a grid reassembles (see isCodexScreenHeaderReady). */
+export function findCodexScreenReadyPromptIndex(screen: string): number | null {
+  const header = findCodexHeader(screen)
+  return header !== null &&
+    header.text.includes('model:') &&
+    header.text.includes('directory:') &&
+    !CODEX_HEADER_LOADING_RE.test(header.text)
+    ? header.index
+    : null
+}
+
+// Why the text copy: 0.157 leaves its alternate screen while it starts its daemon, so the live
+// screen shows no header then, while the text copy keeps the provisional one until the live chat
+// paints its footer after it (a later model repaint rewrites only the value, never the label).
+// Why `·`: every live footer row draws one (status row, `← for agents · ?`, `⚠ N warning · f2`);
+// startup dialogs draw one too, which is why startup-dialog-blocked-signals.ts matches them first.
+export function isCodexProvisionalStartupText(normalized: string): boolean {
+  const headerIndex = normalized.lastIndexOf('openai codex')
+  if (headerIndex === -1) {
+    return false
+  }
+  const loading = /model:\s+loading/.exec(normalized.slice(headerIndex))
+  return loading !== null && !normalized.includes('·', headerIndex + loading.index)
+}
+
+// Why: Codex repaints its whole screen, header included, once a startup dialog closes, and the
+// dialog never draws the header; 0.158's header has no labels, so the header alone marks it answered.
+export function findCodexHeaderIndex(normalized: string): number | null {
+  const index = normalized.lastIndexOf('openai codex (v')
+  return index === -1 ? null : index
+}
+
+/**
+ * Tier 1b, codex panes only: the empty composer with no busy status row just above it and no
+ * header load. Codex 0.158 dropped `model:`/`directory:`, and a long session scrolls the header
+ * away, so this is its only version-stable rest body. No dialog check: every Codex dialog
+ * replaces the composer, while an answer ending "Would you like to…?" must not block the lane.
+ * The mid-turn guard is the caller's quiescence, fed by the ~100 ms title spinner and status
+ * timer; `tui.animations=false` (set by a screen reader), `tui.effects.progress=false`, or a
+ * `tui.terminal_title` without activity/spinner removes it.
+ */
+export function isCodexComposerReadyScreen(screen: string): boolean {
+  const lines = screen.split('\n')
+  const composer = lines.findLastIndex((line) => CODEX_EMPTY_COMPOSER_RE.test(line))
+  if (composer === -1 || hasBusyStatusRowAbove(lines, composer)) {
+    return false
+  }
+  const header = findCodexHeader(screen)
+  return header === null || !CODEX_HEADER_LOADING_RE.test(header.text)
+}
+
+// Why only the row above the composer: a finished answer (or one above 0.158's timestamp) can quote it.
+function hasBusyStatusRowAbove(lines: readonly string[], composer: number): boolean {
+  const above = lines.slice(0, composer).filter((line) => line.trim() !== '')
+  const row = above.at(-1)?.trimStart().startsWith(CODEX_STATUS_TIP_PREFIX)
+    ? above.at(-2)
+    : above.at(-1)
+  return row?.includes(CODEX_BUSY_STATUS_MARKER) ?? false
+}
diff --git a/src/main/runtime/created-mobile-session-tab-caller-selection.test.ts b/src/main/runtime/created-mobile-session-tab-caller-selection.test.ts
new file mode 100644
index 000000000000..65fc065a5a36
--- /dev/null
+++ b/src/main/runtime/created-mobile-session-tab-caller-selection.test.ts
@@ -0,0 +1,114 @@
+/**
+ * A tab a create just published becomes one paired client's selection: the shared snapshot the host
+ * and unselected clients follow stays put, and no PTY work runs — unlike a tap, which may respawn.
+ */
+import { expect, it, vi } from 'vitest'
+import { parsePaneKey } from '../../shared/stable-pane-id'
+import type { RuntimeMobileSessionTabsResult } from '../../shared/runtime-types'
+
+// Fragments stay side-effect ordered: mocks, then lifecycle, then fixtures.
+const { OrcaRuntimeService } = await import('./orca-runtime-test-mocks.spec')
+await import('./orca-runtime-test-lifecycle.spec')
+const { store, TEST_WORKTREE_ID, HEADLESS_LEAF_ID } =
+  await import('./orca-runtime-test-fixtures.spec')
+const { makePendingAgentTabActivationRuntime } =
+  await import('./orca-runtime-test-scenario-builders.spec')
+
+const WT = TEST_WORKTREE_ID
+
+function pairedRuntime() {
+  let next = 0
+  const spawn = vi.fn(async () => ({ id: `pty-${++next}` }))
+  const runtime = new OrcaRuntimeService(store)
+  runtime.setPtyController({
+    spawn,
+    write: () => true,
+    kill: () => true,
+    getForegroundProcess: async () => null
+  })
+  const caller: RuntimeMobileSessionTabsResult[] = []
+  runtime.onMobileSessionTabsChanged((snapshot) => caller.push(snapshot), 'device-caller')
+  // A subscribed second device: selection that fans out to live clients would move it too.
+  runtime.onMobileSessionTabsChanged(() => {}, 'device-bystander')
+  return { runtime, spawn, caller }
+}
+
+async function createPane(runtime: InstanceType<typeof OrcaRuntimeService>) {
+  const created = await runtime.createTerminal(`id:${WT}`)
+  const pane = parsePaneKey(created.paneKey ?? '')
+  if (!pane) {
+    throw new Error(`createTerminal returned no pane key: ${created.paneKey}`)
+  }
+  return { tabId: pane.tabId, leafId: pane.leafId, id: `${pane.tabId}::${pane.leafId}` }
+}
+
+it('selects a launched terminal for the caller only, without spawning again', async () => {
+  const { runtime, spawn, caller } = pairedRuntime()
+  const first = await createPane(runtime)
+  const launched = await createPane(runtime)
+  expect((await runtime.listMobileSessionTabs(`id:${WT}`)).activeTabId).toBe(first.id)
+
+  expect(runtime.selectCreatedMobileSessionTabForClient(WT, launched, 'device-caller')).toBe(true)
+
+  expect(caller.at(-1)?.activeTabId).toBe(launched.id)
+  expect((await runtime.listMobileSessionTabs(`id:${WT}`, 'device-caller')).activeTabId).toBe(
+    launched.id
+  )
+  expect((await runtime.listMobileSessionTabs(`id:${WT}`)).activeTabId).toBe(first.id)
+  expect((await runtime.listMobileSessionTabs(`id:${WT}`, 'device-bystander')).activeTabId).toBe(
+    first.id
+  )
+  expect(spawn).toHaveBeenCalledTimes(2)
+})
+
+it('selects a launched chat by its session for the caller only', async () => {
+  const { runtime, caller } = pairedRuntime()
+  const first = await createPane(runtime)
+  await runtime.publishStructuredAgentSessionTab({
+    workspaceId: WT,
+    sessionId: 'sess-1',
+    agent: 'claude',
+    activate: false
+  })
+
+  expect(
+    runtime.selectCreatedMobileSessionTabForClient(WT, { sessionId: 'sess-1' }, 'device-caller')
+  ).toBe(true)
+
+  expect(caller.at(-1)?.activeTabId).toBe('agent-session:sess-1')
+  expect((await runtime.listMobileSessionTabs(`id:${WT}`)).activeTabId).toBe(first.id)
+  expect((await runtime.listMobileSessionTabs(`id:${WT}`, 'device-bystander')).activeTabId).toBe(
+    first.id
+  )
+})
+
+it('reports a tab that is not published instead of selecting something else', async () => {
+  const { runtime, caller } = pairedRuntime()
+  await createPane(runtime)
+  const before = caller.length
+
+  expect(
+    runtime.selectCreatedMobileSessionTabForClient(WT, { sessionId: 'missing' }, 'device-caller')
+  ).toBe(false)
+  expect(caller).toHaveLength(before)
+})
+
+it('never materializes a pane that is not ready, as a tap would', async () => {
+  const { runtime, spawn } = makePendingAgentTabActivationRuntime()
+  const listed = await runtime.listMobileSessionTabs(`id:${WT}`)
+  expect(listed.tabs[0]).toMatchObject({ launchAgent: 'claude', status: 'pending-handle' })
+
+  expect(
+    runtime.selectCreatedMobileSessionTabForClient(
+      WT,
+      { tabId: 'host-tab', leafId: HEADLESS_LEAF_ID },
+      'device-caller'
+    )
+  ).toBe(true)
+
+  const selected = await runtime.listMobileSessionTabs(`id:${WT}`, 'device-caller')
+  expect(selected.activeTabId).toBe(`host-tab::${HEADLESS_LEAF_ID}`)
+  // Why wait: a tap's respawn lands several awaits later, so an immediate check cannot see one.
+  await new Promise((resolve) => setTimeout(resolve, 200))
+  expect(spawn).not.toHaveBeenCalled()
+})
diff --git a/src/main/runtime/dsh-readiness-transcript.test.ts b/src/main/runtime/dsh-readiness-transcript.test.ts
new file mode 100644
index 000000000000..36608b987b0c
--- /dev/null
+++ b/src/main/runtime/dsh-readiness-transcript.test.ts
@@ -0,0 +1,71 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { createDraftPasteReadyScanner } from '../../shared/draft-paste-ready-scanner'
+import {
+  getAgentLabel,
+  isGeminiTerminalTitle,
+  resolveExplicitTerminalTitleAgentType
+} from '../../shared/terminal-title-agent-type'
+
+// The committed capture of a real `dsh-tui` 0.10.2 launch on @deepseek-ai/dsh 0.1.5-rc.1.
+// Every rule below is written against these bytes rather than a remembered screen; see
+// docs/reference/agent-pty-transcript-capture.md.
+const TRANSCRIPT = readFileSync(join(__dirname, '__fixtures__', 'dsh-tui-ready-no-key.txt'), 'utf8')
+
+const ESC = String.fromCharCode(27)
+const BEL = String.fromCharCode(7)
+
+/** The OSC 0 title DSH-TUI sets, read back out of the capture. */
+function readFirstOscTitle(data: string): string {
+  // Indexed scan rather than a regex: the delimiters are control characters.
+  const open = data.indexOf(`${ESC}]0;`)
+  const bodyStart = open === -1 ? -1 : open + 4
+  const terminator = bodyStart === -1 ? -1 : data.indexOf(BEL, bodyStart)
+  if (terminator === -1) {
+    throw new Error('the captured transcript carries no BEL-terminated OSC 0 title')
+  }
+  return data.slice(bodyStart, terminator)
+}
+
+describe('DSH-TUI readiness from captured terminal bytes', () => {
+  it('fires the composer-ready signal well before the transcript ends', () => {
+    const scanner = createDraftPasteReadyScanner('dsh-composer-prompt')
+    let readyAt = -1
+    // Feed it in PTY-sized chunks so a marker split across chunk boundaries is exercised.
+    for (let offset = 0; offset < TRANSCRIPT.length; offset += 1024) {
+      const chunk = TRANSCRIPT.slice(offset, offset + 1024)
+      if (scanner.observe(chunk).ready && readyAt === -1) {
+        readyAt = offset + chunk.length
+      }
+    }
+    // The composer glyph lands at byte 5910 of ~70KB: readiness must not wait out the
+    // whale intro that keeps painting behind it (the grok failure mode this signal fixes).
+    expect(readyAt).toBeGreaterThan(0)
+    expect(readyAt).toBeLessThan(8192)
+  })
+
+  it('arms the quiet-window fallback from DECSET 2004 as well', () => {
+    const scanner = createDraftPasteReadyScanner('dsh-composer-prompt')
+    expect(scanner.observe(TRANSCRIPT.slice(0, 40)).armQuietTimer).toBe(true)
+  })
+
+  it('identifies the pane from DSH’s own title, not Gemini’s', () => {
+    const title = readFirstOscTitle(TRANSCRIPT)
+    // DSH-TUI's idle prefix is `✦`, which is Gemini CLI's WORKING glyph.
+    expect(title).toContain('✦')
+    expect(title).toContain('\u{1F40B}')
+    expect(isGeminiTerminalTitle(title)).toBe(false)
+    expect(getAgentLabel(title)).toBe('DeepSeek Harness')
+    expect(resolveExplicitTerminalTitleAgentType(title)).toBe('dsh')
+  })
+
+  it('keeps a working DSH title out of Claude’s braille-spinner lane', () => {
+    // `titlePrefix` cycles through `⠂`/`⠐` while a turn runs (Chat.js
+    // TITLE_SPINNER_FRAMES), both of which are in the braille block Claude claims.
+    for (const frame of ['⠂', '⠐']) {
+      const working = `${frame} \u{1F40B} fix the flaky test`
+      expect(getAgentLabel(working)).toBe('DeepSeek Harness')
+    }
+  })
+})
diff --git a/src/main/runtime/freebuff-status-transcript.test.ts b/src/main/runtime/freebuff-status-transcript.test.ts
new file mode 100644
index 000000000000..04aa1e0a2abd
--- /dev/null
+++ b/src/main/runtime/freebuff-status-transcript.test.ts
@@ -0,0 +1,146 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { describe, expect, it, vi } from 'vitest'
+import { createTranscriptPane, TRANSCRIPT_PANE_PTY_ID } from './agent-transcript-pane-test-harness'
+import { makeAgentStatusStoreWiring } from './agent-status-store-wiring.test-fixture'
+
+vi.mock('electron', () => ({
+  BrowserWindow: { fromId: vi.fn(() => null) },
+  webContents: { fromId: vi.fn(() => null) },
+  ipcMain: { on: vi.fn(), removeListener: vi.fn() },
+  app: { getPath: vi.fn(() => '/tmp') }
+}))
+
+const transcript = readFileSync(
+  join(import.meta.dirname, '__fixtures__/freebuff-lifecycle.txt'),
+  'utf8'
+)
+
+describe('Freebuff execution-host status', () => {
+  it('publishes real running, question, and settled screens into the canonical store', async () => {
+    const wiring = makeAgentStatusStoreWiring()
+    const { runtime } = await createTranscriptPane(
+      {
+        data: '',
+        paneTitle: 'Freebuff',
+        foregroundProcess: 'freebuff',
+        launchAgent: 'freebuff',
+        size: { cols: 120, rows: 40 }
+      },
+      wiring.deps
+    )
+    const states: string[] = []
+    const questions: string[] = []
+    try {
+      // oxlint-disable-next-line no-control-regex -- Terminal protocol delimiters contain ESC and BEL.
+      for (const frame of transcript.split(/(?<=\x1b\[\?2026l)/)) {
+        runtime.onPtyData(TRANSCRIPT_PANE_PTY_ID, frame, Date.now())
+        await runtime.serializeMainTerminalBuffer(TRANSCRIPT_PANE_PTY_ID)
+        const row = wiring.statusStore.getStatusSnapshot()[0]
+        if (row && states.at(-1) !== row.state) {
+          states.push(row.state)
+        }
+        if (row?.interactivePrompt) {
+          questions.push(row.interactivePrompt)
+        }
+      }
+      expect(states).toContain('working')
+      expect(states).toContain('waiting')
+      expect(states.at(-1)).toBe('done')
+      expect(questions.join('\n')).toMatch(/blue|green/i)
+    } finally {
+      runtime.onPtyExit(TRANSCRIPT_PANE_PTY_ID, 0)
+    }
+  })
+  it.each([
+    { name: 'login', cols: 100, rows: 32, input: 'Sign in to Freebuff' },
+    { name: 'trust', cols: 120, rows: 40, input: 'Trust repository agent files? [y/N]' }
+  ])('publishes captured $name startup as blocked', async ({ name, cols, rows, input }) => {
+    const wiring = makeAgentStatusStoreWiring()
+    const { runtime } = await createTranscriptPane(
+      {
+        data: '',
+        paneTitle: 'Freebuff',
+        foregroundProcess: 'freebuff',
+        launchAgent: 'freebuff',
+        size: { cols, rows }
+      },
+      wiring.deps
+    )
+    try {
+      runtime.onPtyData(
+        TRANSCRIPT_PANE_PTY_ID,
+        readFileSync(join(import.meta.dirname, `__fixtures__/freebuff-${name}.txt`), 'utf8'),
+        Date.now()
+      )
+      await runtime.serializeMainTerminalBuffer(TRANSCRIPT_PANE_PTY_ID)
+      expect(wiring.statusStore.getStatusSnapshot()[0]).toMatchObject({
+        state: 'blocked',
+        toolInput: input,
+        agentType: 'freebuff'
+      })
+    } finally {
+      runtime.onPtyExit(TRANSCRIPT_PANE_PTY_ID, 0)
+    }
+  })
+
+  it('clears startup blocks and starts a fresh session after an earlier completed turn', async () => {
+    const wiring = makeAgentStatusStoreWiring()
+    const { runtime } = await createTranscriptPane(
+      {
+        data: '',
+        paneTitle: 'Freebuff',
+        foregroundProcess: 'freebuff',
+        launchAgent: 'freebuff',
+        size: { cols: 120, rows: 40 }
+      },
+      wiring.deps
+    )
+    try {
+      for (const name of ['trust', 'ready', 'lifecycle', 'ready']) {
+        runtime.onPtyData(
+          TRANSCRIPT_PANE_PTY_ID,
+          readFileSync(join(import.meta.dirname, `__fixtures__/freebuff-${name}.txt`), 'utf8'),
+          Date.now()
+        )
+        await runtime.serializeMainTerminalBuffer(TRANSCRIPT_PANE_PTY_ID)
+        expect(wiring.statusStore.getStatusSnapshot()[0]?.state).toBe(
+          name === 'trust' ? 'blocked' : 'done'
+        )
+        if (name === 'ready') {
+          expect(wiring.statusStore.getStatusSnapshot()[0]).toMatchObject({
+            sessionBoundary: true,
+            prompt: ''
+          })
+        }
+        if (name === 'lifecycle') {
+          expect(wiring.statusStore.getStatusSnapshot()[0]?.sessionBoundary).not.toBe(true)
+        }
+      }
+      expect(wiring.statusStore.getStatusSnapshot()[0]?.toolInput).toBeUndefined()
+    } finally {
+      runtime.onPtyExit(TRANSCRIPT_PANE_PTY_ID, 0)
+    }
+  })
+
+  it('does not infer remote status from the client screen', async () => {
+    const wiring = makeAgentStatusStoreWiring()
+    const { runtime } = await createTranscriptPane(
+      {
+        data: '',
+        paneTitle: 'Freebuff',
+        foregroundProcess: 'freebuff',
+        connectionId: 'ssh-test',
+        size: { cols: 120, rows: 40 }
+      },
+      wiring.deps
+    )
+    try {
+      runtime.onPtyData(TRANSCRIPT_PANE_PTY_ID, transcript, Date.now())
+      await runtime.serializeMainTerminalBuffer(TRANSCRIPT_PANE_PTY_ID)
+      expect(wiring.statusStore.getStatusSnapshot()).toEqual([])
+    } finally {
+      runtime.onPtyExit(TRANSCRIPT_PANE_PTY_ID, 0)
+    }
+  })
+})
diff --git a/src/main/runtime/freebuff-terminal-status.ts b/src/main/runtime/freebuff-terminal-status.ts
new file mode 100644
index 000000000000..09ffee3d50d0
--- /dev/null
+++ b/src/main/runtime/freebuff-terminal-status.ts
@@ -0,0 +1,25 @@
+import { FreebuffScreenStatusTracker } from '../../shared/freebuff-screen-status'
+import { recognizeAgentProcessFromCommandLine } from '../../shared/agent-process-recognition'
+import type { HeadlessEmulator } from '../daemon/headless-emulator'
+
+const trackers = new WeakMap<HeadlessEmulator, FreebuffScreenStatusTracker>()
+
+export function observeFreebuffTerminalStatus(
+  emulator: HeadlessEmulator,
+  data: string,
+  startupCommand: string | undefined,
+  launchAgent?: string | null
+) {
+  let tracker = trackers.get(emulator)
+  if (!tracker) {
+    const identified =
+      launchAgent === 'freebuff' ||
+      recognizeAgentProcessFromCommandLine(startupCommand)?.agent === 'freebuff'
+    tracker = new FreebuffScreenStatusTracker(identified)
+    trackers.set(emulator, tracker)
+  }
+  return tracker.observe(data, () => ({
+    lines: emulator.getVisibleLines(),
+    alternate: emulator.isAlternateScreen
+  }))
+}
diff --git a/src/main/runtime/headless-seed-ownership.test.ts b/src/main/runtime/headless-seed-ownership.test.ts
index 39963e531d27..42fe9c91660d 100644
--- a/src/main/runtime/headless-seed-ownership.test.ts
+++ b/src/main/runtime/headless-seed-ownership.test.ts
@@ -184,13 +184,15 @@ it.each([false, true])(
     const started = makeDeferred()
     const release = makeDeferred()
     const original = HeadlessEmulator.prototype.write
-    vi.spyOn(HeadlessEmulator.prototype, 'write').mockImplementationOnce(
-      async function (this: HeadlessEmulator, data, options) {
-        started.resolve()
-        await release.promise
-        return original.call(this, data, options)
-      }
-    )
+    vi.spyOn(HeadlessEmulator.prototype, 'write').mockImplementationOnce(async function (
+      this: HeadlessEmulator,
+      data,
+      options
+    ) {
+      started.resolve()
+      await release.promise
+      return original.call(this, data, options)
+    })
     const read = runtime.providerTail(visibleOnly)
     snapshot.resolve(PROVIDER_SNAPSHOT)
     await started.promise
diff --git a/src/main/runtime/headless-terminal-dispose-write-ordering.test.ts b/src/main/runtime/headless-terminal-dispose-write-ordering.test.ts
index b26c7bfb62c2..13efbb1e80ae 100644
--- a/src/main/runtime/headless-terminal-dispose-write-ordering.test.ts
+++ b/src/main/runtime/headless-terminal-dispose-write-ordering.test.ts
@@ -71,12 +71,12 @@ describe('disposeHeadlessTerminal write ordering', () => {
       events.push(`write:${emulators.indexOf(this)}:${data.trim()}`)
       return write.call(this, data, opts)
     })
-    vi.spyOn(HeadlessEmulator.prototype, 'dispose').mockImplementation(
-      function (this: HeadlessEmulator) {
-        events.push(`dispose:${emulators.indexOf(this)}`)
-        return dispose.call(this)
-      }
-    )
+    vi.spyOn(HeadlessEmulator.prototype, 'dispose').mockImplementation(function (
+      this: HeadlessEmulator
+    ) {
+      events.push(`dispose:${emulators.indexOf(this)}`)
+      return dispose.call(this)
+    })
 
     const runtime = createRuntime()
     // Queued but not yet parsed: the chain link is still pending here.
diff --git a/src/main/runtime/orca-runtime-activate-managed-worktree.ts b/src/main/runtime/orca-runtime-activate-managed-worktree.ts
index 4802df66bc4a..c36b9af1eb5a 100644
--- a/src/main/runtime/orca-runtime-activate-managed-worktree.ts
+++ b/src/main/runtime/orca-runtime-activate-managed-worktree.ts
@@ -32,7 +32,8 @@ import type {
 import { recordCreatedWorktreeLineage as recordCreatedWorktreeLineageState } from './runtime-worktree-lineage-recording'
 import {
   pasteWorktreeStartupDraftWhenReady,
-  sendWorktreeStartupFollowupWhenReady
+  sendWorktreeStartupFollowupWhenReady,
+  waitForWorktreeStartupDraft
 } from './runtime-worktree-startup-readiness'
 import type { CreateWorktreeResult } from '../../shared/worktree/create-types'
 import { provisionWorktreeTerminals } from './runtime-worktree-terminal-provisioning'
@@ -122,7 +123,8 @@ export class OrcaRuntimeWithActivateManagedWorktree extends OrcaRuntimeWithListM
   protected async buildStartupForDraft(
     repo: Repo,
     draft: string,
-    requestedAgent?: TuiAgent
+    requestedAgent?: TuiAgent,
+    launchSource?: string
   ): Promise<{
     agent: TuiAgent
     startup: WorktreeStartupLaunch
@@ -135,6 +137,7 @@ export class OrcaRuntimeWithActivateManagedWorktree extends OrcaRuntimeWithListM
       repo,
       draft,
       ...(requestedAgent ? { requestedAgent } : {}),
+      ...(launchSource ? { launchSource } : {}),
       settings: this.store.getSettings(),
       getLaunchPlatform: () => this.getAgentLaunchPlatformForRepo(repo)
     })
@@ -230,6 +233,29 @@ export class OrcaRuntimeWithActivateManagedWorktree extends OrcaRuntimeWithListM
     pasteWorktreeStartupDraftWhenReady(this.getWorktreeStartupReadinessHost(), handle, draft)
   }
 
+  /** Only for a newly launched worker, before its first dispatch input. */
+  async waitForFreshWorkerComposer(
+    handle: string,
+    agent: TuiAgent,
+    timeoutMs: number
+  ): Promise<void> {
+    const initialPtyId =
+      this.getLivePtyForHandle(handle)?.pty.ptyId ?? this.getLiveLeafForHandle(handle).leaf.ptyId
+    const ptyId = await waitForWorktreeStartupDraft(
+      { ...this.getWorktreeStartupReadinessHost(), getPtyId: () => initialPtyId },
+      handle,
+      agent,
+      { timeoutMs, requireComposerMarker: true }
+    )
+    if (!ptyId) {
+      throw new Error('timeout')
+    }
+    this.assertLiveTerminalHandleTargetsPty(handle, ptyId)
+    if (!this.ptysById.get(ptyId)?.connected) {
+      throw new Error('terminal_handle_stale')
+    }
+  }
+
   protected sendStartupFollowupWhenReady(handle: string, followup: WorktreeStartupFollowup): void {
     sendWorktreeStartupFollowupWhenReady(this.getWorktreeStartupReadinessHost(), handle, followup)
   }
diff --git a/src/main/runtime/orca-runtime-adopt-terminal-orphans-from-inventory.ts b/src/main/runtime/orca-runtime-adopt-terminal-orphans-from-inventory.ts
index 5dd2908413b3..3bc5b570704a 100644
--- a/src/main/runtime/orca-runtime-adopt-terminal-orphans-from-inventory.ts
+++ b/src/main/runtime/orca-runtime-adopt-terminal-orphans-from-inventory.ts
@@ -4,10 +4,7 @@ import {
   spawnSurfaceClaimSequence,
   SURFACE_CLAIM_WITHOUT_STANDING
 } from './pty-recorded-surface-topology'
-import {
-  observeStructuredWorker,
-  resolveStructuredWorkerAuthority
-} from './structured-worker-authority'
+import { resolveStructuredWorkerAuthority } from './structured-worker-authority'
 import type { RuntimeLeafRecord } from './runtime-terminal-state-records'
 import { OrcaRuntimeWithSubscribeToTerminalResize } from './orca-runtime-subscribe-to-terminal-resize'
 import type {
@@ -210,12 +207,10 @@ export class OrcaRuntimeWithAdoptTerminalOrphansFromInventory extends OrcaRuntim
       this.getOrchestrationDbIfAvailable?.() ?? null
     )
     if (structured) {
-      // `resolveBareOrchestrationRecipient` routes direct mail through this, not through
-      // getTerminalPaneKey. The connected-gate below exists so mail is never routed to a corpse,
-      // so the structured answer needs a real liveness proof too, not just a registry hit.
-      return observeStructuredWorker(structured.identity).status === 'live'
-        ? structured.identity.paneKey
-        : null
+      // `resolveBareOrchestrationRecipient` routes direct mail through this. A structured worker is
+      // a recipient while this runtime owns it, running or at rest: mail to one at rest is a send,
+      // and the send starts its agent.
+      return structured.identity.paneKey
     }
     const runtimePty = this.getLivePtyForHandle(handle)
     if (runtimePty) {
diff --git a/src/main/runtime/orca-runtime-apply-mobile-session-tab-navigation.ts b/src/main/runtime/orca-runtime-apply-mobile-session-tab-navigation.ts
index a2552ef12c3c..68101c809609 100644
--- a/src/main/runtime/orca-runtime-apply-mobile-session-tab-navigation.ts
+++ b/src/main/runtime/orca-runtime-apply-mobile-session-tab-navigation.ts
@@ -72,6 +72,31 @@ export class OrcaRuntimeWithApplyMobileSessionTabNavigation extends OrcaRuntimeW
     return snapshot
   }
 
+  /**
+   * Records a tab a create just published as one paired client's selection, as a create does for
+   * its own tab. Not the tap path: a tap is a wake gesture that may respawn a non-ready pane.
+   * Returns false when the tab is not in the snapshot.
+   */
+  selectCreatedMobileSessionTabForClient(
+    worktreeId: string,
+    surface: { tabId: string; leafId: string } | { sessionId: string },
+    clientNavigationId: string
+  ): boolean {
+    const snapshot = this.getMobileSessionTabsForWorktree(worktreeId)
+    const tab = snapshot.tabs.find((candidate) =>
+      'sessionId' in surface
+        ? candidate.type === 'agent-session' && candidate.sessionId === surface.sessionId
+        : candidate.type === 'terminal' &&
+          candidate.parentTabId === surface.tabId &&
+          candidate.leafId === surface.leafId
+    )
+    if (!tab) {
+      return false
+    }
+    this.applyMobileSessionTabNavigation(snapshot, tab.id, 'caller', clientNavigationId)
+    return true
+  }
+
   /**
    * Whether persistence proves this pane's PTY was deliberately taken down and parked
    * (workspace sleep or completed-agent hibernation) rather than lost and awaiting reconnect.
diff --git a/src/main/runtime/orca-runtime-apply-tracked-pty-title.ts b/src/main/runtime/orca-runtime-apply-tracked-pty-title.ts
index 3459c7c8b6e4..f4f8826e6e78 100644
--- a/src/main/runtime/orca-runtime-apply-tracked-pty-title.ts
+++ b/src/main/runtime/orca-runtime-apply-tracked-pty-title.ts
@@ -62,10 +62,9 @@ export class OrcaRuntimeWithApplyTrackedPtyTitle extends OrcaRuntimeWithGetUnper
       // parked on its poll, so the later explicit idle is an idle→idle step that still has
       // to be offered. The resolve helper re-ranks and returns early when it is not yet
       // satisfying evidence, which is what the old edge guard was really protecting.
-      // Why also gated on a change: re-ranking an unchanged idle title cannot reach a
-      // different verdict. Tier 1 and 2 depend only on the title and the status; tier 3
-      // needs the stream to go quiet, which cannot happen on the frame that just wrote to
-      // it. Repainted frames would otherwise re-scan the pane tail for nothing.
+      // Why also gated on a change: the resolver settles only a blocked tail or strong
+      // ready, and the poll catches either between title changes; repainted frames would
+      // otherwise re-scan the pane tail for nothing.
       if (agentStatus === 'idle' && prevStatus !== 'permission' && ptyRecordChanged) {
         this.resolvePtyTuiIdleWaiters(pty, ptyId)
       }
@@ -123,8 +122,7 @@ export class OrcaRuntimeWithApplyTrackedPtyTitle extends OrcaRuntimeWithGetUnper
       // which isn't a task-completion signal.
       // Why not `prevStatus !== 'idle'`: see the pty branch — the resolve helper re-ranks,
       // so an idle→idle step that upgrades weak evidence to explicit must still be offered.
-      // Why the change gate: see the pty branch — an unchanged idle title re-ranks to the
-      // same verdict, so repainted frames must not re-scan the tail.
+      // Why the change gate: see the pty branch — repainted frames must not re-scan the tail.
       if (
         agentStatus === 'idle' &&
         prevStatus !== 'permission' &&
@@ -193,6 +191,7 @@ export class OrcaRuntimeWithApplyTrackedPtyTitle extends OrcaRuntimeWithGetUnper
       pty.managementTitleAt = null
       pty.waitBlockedAt = null
       pty.tailWaitState = undefined
+      pty.commandPaint = undefined
     }
     for (const leaf of this.getLeavesForPty(ptyId)) {
       leaf.lastOscTitle = null
diff --git a/src/main/runtime/orca-runtime-attach-remote-terminal-source-range-consumer.ts b/src/main/runtime/orca-runtime-attach-remote-terminal-source-range-consumer.ts
index f433c75793db..7cb440b4bacf 100644
--- a/src/main/runtime/orca-runtime-attach-remote-terminal-source-range-consumer.ts
+++ b/src/main/runtime/orca-runtime-attach-remote-terminal-source-range-consumer.ts
@@ -182,6 +182,7 @@ export class OrcaRuntimeWithAttachRemoteTerminalSourceRangeConsumer extends Orca
     try {
       await assertTerminalInputWithinLimitWithYield(data)
       await this.writeTerminalInputChunks(ptyId, data, {
+        inputKind: 'driving',
         // Why: a phone can claim the floor while a paste yields between chunks.
         beforeWrite: () => {
           if (this.getDriver(ptyId).kind === 'mobile') {
diff --git a/src/main/runtime/orca-runtime-automation-operations.ts b/src/main/runtime/orca-runtime-automation-operations.ts
index 662ea04c3da0..5064944215ba 100644
--- a/src/main/runtime/orca-runtime-automation-operations.ts
+++ b/src/main/runtime/orca-runtime-automation-operations.ts
@@ -17,6 +17,7 @@ import {
 } from '../../shared/automation-list-scope'
 import { OrchestrationDb } from './orchestration/db'
 import { join } from 'node:path'
+import { existsSync } from 'node:fs'
 import { getAppEnvironment } from '../../shared/app-environment'
 import type { LegacyWorkerTerminalRecoveryPlan } from './orchestration/orchestration-legacy-worker-terminal-recovery'
 import type { LegacyWorkerTerminalRecoveryResult } from './runtime-legacy-worker-terminal-recovery-types'
@@ -152,14 +153,24 @@ export class OrcaRuntimeWithAutomationOperations extends OrcaRuntimeWithPtyForeg
   // to inject an in-memory DB without touching the filesystem.
   getOrchestrationDb(): OrchestrationDb {
     if (!this._orchestrationDb) {
-      const dbPath = join(getAppEnvironment().getPath('userData'), 'orchestration.db')
-      this._orchestrationDb = new OrchestrationDb(dbPath)
+      this._orchestrationDb = new OrchestrationDb(this.orchestrationDbPath())
       this.ensureOrchestrationFederationRelay()
       this.scheduleRestoredMessageRepoints()
     }
     return this._orchestrationDb
   }
 
+  /** The database, opened only if it already exists: a profile without one has no mail to redrive. */
+  getExistingOrchestrationDb(): OrchestrationDb | null {
+    return this._orchestrationDb || existsSync(this.orchestrationDbPath())
+      ? this.getOrchestrationDb()
+      : null
+  }
+
+  private orchestrationDbPath(): string {
+    return join(getAppEnvironment().getPath('userData'), 'orchestration.db')
+  }
+
   setOrchestrationDb(db: OrchestrationDb): void {
     this.orchestrationFederation.resetForDatabaseChange()
     this.mailPointerRepointScheduler.clear()
diff --git a/src/main/runtime/orca-runtime-build-headless-mobile-session-browser-tabs.ts b/src/main/runtime/orca-runtime-build-headless-mobile-session-browser-tabs.ts
index dda3caa7cff8..73d0e44499fd 100644
--- a/src/main/runtime/orca-runtime-build-headless-mobile-session-browser-tabs.ts
+++ b/src/main/runtime/orca-runtime-build-headless-mobile-session-browser-tabs.ts
@@ -3,17 +3,27 @@ import { OrcaRuntimeWithPersistTerminalSurfaceRetirements } from './orca-runtime
 import type {
   RuntimeMobileSessionBrowserTab,
   RuntimeMobileSessionTabsResult,
-  RuntimeMobileSessionTabsSnapshot
+  RuntimeMobileSessionTabsSnapshot,
+  RuntimeMobileSessionTerminalTab
 } from '../../shared/runtime-types'
+import { parseAppSshPtyId } from '../../shared/ssh-pty-id'
 import { getRuntimeBrowserPageRegistry } from './runtime-browser-page-registry'
 import type { Tab } from '../../shared/tab-types'
-import { closeTerminalTabInWorkspaceSession } from '../../shared/workspace-session-terminal-tab-close'
-import { advanceTerminalTopologyRevision } from './workspace-session-terminal-membership-authority'
+import {
+  resolveTerminalCloseTarget,
+  terminalSurfaceCloseMutation,
+  type PaneCloseResolution,
+  type RendererTerminalClose,
+  type TerminalSurfaceCloseOptions
+} from './terminal-surface-close'
+import type {
+  TerminalPaneCloseTarget,
+  TerminalSurfaceCloseTarget
+} from '../../shared/terminal-surface-close-target'
+import { retireTerminalSurfacesFromSnapshot } from './mobile-session-terminal-retirement'
 import type { PtyControllerInventory } from './runtime-pty-controller-contract'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../shared/constants'
 import { captureAcknowledgedTerminalTabRetirement } from './workspace-session-terminal-tab-retirement-identity'
-import { cloneWorkspaceSessionState } from '../persistence/restoring-sessions/session-owner-fields'
-import { rollbackWorkspaceSessionAfterFailedAsyncWrite } from '../persistence/restoring-sessions/workspace-session-write-rollback'
 
 export class OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs extends OrcaRuntimeWithPersistTerminalSurfaceRetirements {
   // Why: headless serve backs browser panes with offscreen WebContents that live
@@ -98,60 +108,148 @@ export class OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs extends OrcaRu
     })
   }
 
-  protected async commitHeadlessTerminalTabRetirement(
+  /**
+   * The one close transaction every explicit terminal close reaches: durably commits the membership
+   * removal in the owning host's partition. Callers publish and kill afterwards.
+   */
+  protected async closeTerminalSurface(
     worktreeId: string,
-    parentTabId: string,
-    options: { allowMissing?: boolean; force?: boolean } = {}
+    target: TerminalSurfaceCloseTarget,
+    options: TerminalSurfaceCloseOptions = {}
   ): Promise<string[]> {
-    if (!this.store?.setWorkspaceSession || !this.store.runDurableMutation) {
+    const store = this.store
+    if (!store?.getWorkspaceSession || !store.setWorkspaceSession || !store.runDurableMutation) {
       throw new Error('workspace_session_unavailable')
     }
-    const acknowledgeRetirement = this.captureTerminalTabRetirement(worktreeId, parentTabId)
-    const committed = await this.store.runDurableMutation<string[] | Error>(() => {
-      if (!acknowledgeRetirement().matches) {
-        return { value: new Error('terminal_pane_owner_changed'), persist: false }
-      }
-      const hostId = this.getWorkspaceSessionHostIdForWorktree(worktreeId)
-      const currentSession = this.store.getWorkspaceSession(hostId)
-      if (!currentSession) {
-        return { value: new Error('workspace_session_unavailable'), persist: false }
-      }
-      const session = cloneWorkspaceSessionState(currentSession)
-      const result = closeTerminalTabInWorkspaceSession(session, worktreeId, parentTabId, {
-        force: options.force
-      })
-      if (result.pinned) {
-        return { value: new Error('terminal_tab_pinned'), persist: false }
-      }
-      if (!result.closed && !options.allowMissing) {
-        return { value: new Error('tab_not_found'), persist: false }
-      }
-      const persisted = result.closed
-        ? advanceTerminalTopologyRevision(result.session, worktreeId)
-        : session
-      this.store.setWorkspaceSession(persisted, hostId)
-      const staged = cloneWorkspaceSessionState(this.store.getWorkspaceSession(hostId))
-      return {
-        value: result.ptyIdsToKill,
-        rollback: () => {
-          const current = this.store.getWorkspaceSession(hostId)
-          if (current) {
-            const rolledBack = rollbackWorkspaceSessionAfterFailedAsyncWrite(
-              session,
-              staged,
-              current
-            )
-            if (rolledBack !== current) {
-              this.store.setWorkspaceSession(rolledBack, hostId)
-            }
+    // Why: a tab its layout owner already removed has no newer owner; refusing would only strand it.
+    const acknowledgeTabRetirement =
+      target.kind === 'tab' && !options.closedByLayoutOwner
+        ? this.captureTerminalTabRetirement(worktreeId, target.tabId)
+        : null
+    let ptyIdsToKill: string[] = []
+    let refusal: Error | undefined
+    try {
+      refusal = await store.runDurableMutation(
+        terminalSurfaceCloseMutation({
+          worktreeId,
+          target,
+          options,
+          requestedSession: this.getWorkspaceSessionForWorktree(worktreeId),
+          ownerMatches: () => !acknowledgeTabRetirement || acknowledgeTabRetirement().matches,
+          hostId: () => this.getWorkspaceSessionHostIdForWorktree(worktreeId),
+          getSession: (hostId) => store.getWorkspaceSession(hostId),
+          setSession: (session, hostId) => store.setWorkspaceSession(session, hostId),
+          onClosed: (closedPtyIds) => {
+            ptyIdsToKill = closedPtyIds
           }
-        }
+        })
+      )
+    } catch (error) {
+      console.error('[runtime] failed to persist terminal close:', error)
+    }
+    if (refusal) {
+      throw refusal
+    }
+    return ptyIdsToKill
+  }
+
+  /** The desktop renderer's close intent: it already guarded, removed and killed; this only reports. */
+  async closeTerminalSurfaceFromRenderer({ worktreeId, target, reason }: RendererTerminalClose) {
+    const options = { allowMissing: true, force: true, closedByLayoutOwner: true, reason }
+    await this.closeTerminalSurface(worktreeId, target, options)
+  }
+
+  /** Resolves a close main started against the copy of the tab's panes its layout owner holds. */
+  protected resolveTerminalCloseTarget(
+    worktreeId: string,
+    target: TerminalSurfaceCloseTarget
+  ): PaneCloseResolution | 'tab' {
+    const graphLeafIds: string[] = []
+    for (const leaf of this.leaves.values()) {
+      if (leaf.tabId === target.tabId) {
+        graphLeafIds.push(leaf.leafId)
+      }
+    }
+    return resolveTerminalCloseTarget(target, {
+      rendererListsTab: this.tabs.has(target.tabId),
+      snapshotRows: (this.mobileSessionTabsByWorktree.get(worktreeId)?.tabs ?? []).filter(
+        (row) => row.type === 'terminal' && row.parentTabId === target.tabId
+      ),
+      graphLeafIds,
+      sessionLayout:
+        this.getWorkspaceSessionForWorktree(worktreeId)?.terminalLayoutsByTabId?.[target.tabId]
+    })
+  }
+
+  /**
+   * Commits a split pane's close that main started, then tells the desktop renderer to drop that
+   * pane. Never touches the tab: a pane the session no longer lists commits nothing.
+   */
+  protected async closeTerminalPane(
+    worktreeId: string,
+    target: TerminalPaneCloseTarget
+  ): Promise<void> {
+    try {
+      await this.closeTerminalSurface(worktreeId, target, { allowMissing: true })
+    } catch (error) {
+      if (!(error instanceof Error) || error.message !== 'workspace_session_unavailable') {
+        throw error
       }
+    }
+    // Why: no exit may ever arrive to remove the pane. The notice is leaf-addressed, so it and the
+    // renderer's exit handling are each a no-op after the other.
+    this.retireClosedTerminalLeafFromMobileSnapshot(worktreeId, target.tabId, target.leafId)
+    this.notifier?.closeTerminalPane?.(target.tabId, target.leafId)
+  }
+
+  /** A paired client's close of one pane: stops only that pane's process, commits only that pane. */
+  protected async closeMobileSessionTerminalPane(
+    worktreeId: string,
+    tab: RuntimeMobileSessionTerminalTab
+  ): Promise<void> {
+    // Why best-effort, as for a tab: a failed kill must not keep a pane the user closed.
+    const pty = this.findPtyForMobileTerminalTab(worktreeId, tab)
+    if (pty) {
+      this.ptyController?.kill(pty.ptyId)
+    } else if (!this.tabs.has(tab.parentTabId) && tab.ptyId && parseAppSshPtyId(tab.ptyId)) {
+      // Why: with no renderer to own the kill, a dormant SSH pane's durable id is its stop order.
+      this.ptyController?.kill(tab.ptyId)
+    }
+    await this.closeTerminalPane(worktreeId, {
+      kind: 'pane',
+      tabId: tab.parentTabId,
+      leafId: tab.leafId
+    })
+  }
+
+  private retireClosedTerminalLeafFromMobileSnapshot(
+    worktreeId: string,
+    tabId: string,
+    leafId: string
+  ): void {
+    const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
+    const tab = snapshot?.tabs.find(
+      (candidate) =>
+        candidate.type === 'terminal' &&
+        candidate.parentTabId === tabId &&
+        candidate.leafId === leafId
+    )
+    // Why: a renderer that lists the tab republishes its own snapshot once it drops the pane.
+    if (!snapshot || !tab || this.tabs.has(tabId)) {
+      return
+    }
+    const proof = this.getMobileSessionTerminalRetirementProof(worktreeId, tab)
+    const retired = retireTerminalSurfacesFromSnapshot({
+      snapshot,
+      ptyId: tab.ptyId ?? tab.parentLayout?.ptyIdsByLeafId?.[leafId] ?? '',
+      exactSurfaces: [{ parentTabId: tabId, leafId }],
+      exactOnly: true,
+      ...(proof ? { retirementProofs: [proof] } : {})
     })
-    if (committed instanceof Error) {
-      throw committed
+    if (retired) {
+      this.storeMobileSessionSnapshot(worktreeId, retired.snapshot)
+      this.notifyMobileSessionTabsChanged(worktreeId)
     }
-    return committed
   }
 
   protected persistHeadlessTerminalTabOrder(worktreeId: string, tabOrder: readonly string[]): void {
diff --git a/src/main/runtime/orca-runtime-close-headless-mobile-terminal-tab.ts b/src/main/runtime/orca-runtime-close-headless-mobile-terminal-tab.ts
index d24d5212efc5..889ccd9701c9 100644
--- a/src/main/runtime/orca-runtime-close-headless-mobile-terminal-tab.ts
+++ b/src/main/runtime/orca-runtime-close-headless-mobile-terminal-tab.ts
@@ -12,6 +12,7 @@ import { appendRetiredTerminalSurfaceProofs } from './mobile-session-terminal-re
 import type { RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
 import type { TerminalPaneLayoutNode } from '../../shared/terminal-tab-types'
 import type { TerminalDockPropsPatch } from './fork-terminal-dock/terminal-dock-session-tab-props'
+import type { RuntimeSessionTabCloseReason } from '../../shared/runtime-session-contracts'
 
 export class OrcaRuntimeWithCloseHeadlessMobileTerminalTab extends OrcaRuntimeWithCloseStructuredAgentSessionTab {
   protected async closeHeadlessMobileTerminalTab(
@@ -23,6 +24,7 @@ export class OrcaRuntimeWithCloseHeadlessMobileTerminalTab extends OrcaRuntimeWi
       killPtys?: boolean
       authorizedPty?: RuntimePtyWorktreeRecord
       force?: boolean
+      reason?: RuntimeSessionTabCloseReason
     } = {}
   ): Promise<void> {
     const closedParentTabId = tab.parentTabId
@@ -38,10 +40,14 @@ export class OrcaRuntimeWithCloseHeadlessMobileTerminalTab extends OrcaRuntimeWi
       return proof ? [proof] : []
     })
     const acknowledgeRetirement = this.captureTerminalTabRetirement(worktreeId, closedParentTabId)
-    const projectedPtyIds = await this.commitHeadlessTerminalTabRetirement(
+    const projectedPtyIds = await this.closeTerminalSurface(
       worktreeId,
-      closedParentTabId,
-      { allowMissing: options.allowMissingPersistedTab, force: options.force }
+      { kind: 'tab', tabId: closedParentTabId },
+      {
+        allowMissing: options.allowMissingPersistedTab,
+        force: options.force,
+        reason: options.reason
+      }
     )
     if (!acknowledgeRetirement().matches) {
       throw new Error('terminal_pane_owner_changed')
diff --git a/src/main/runtime/orca-runtime-close-mobile-session-tab.ts b/src/main/runtime/orca-runtime-close-mobile-session-tab.ts
index fa624d6f3ce3..3f7047c64876 100644
--- a/src/main/runtime/orca-runtime-close-mobile-session-tab.ts
+++ b/src/main/runtime/orca-runtime-close-mobile-session-tab.ts
@@ -18,7 +18,6 @@ import {
 } from './mobile-session-tab-close-outcome'
 import { getRuntimeBrowserPageRegistry } from './runtime-browser-page-registry'
 import type { RuntimeCommandSurfaceHost } from './orca-runtime-core'
-import { structuredAgentSessionTabId } from '../../shared/structured-agent-session-projection'
 import { SESSION_TAB_NOT_FOUND_ERROR } from '../../shared/session-tab-close'
 import { rendererPublicationThrottle } from '../window/renderer-publication-throttle'
 
@@ -119,10 +118,14 @@ export class OrcaRuntimeWithCloseMobileSessionTab extends OrcaRuntimeWithRefuseU
         closedSelectionTabIds
       )
     if (tab.type === 'terminal') {
-      const parentLeafCount = snapshot.tabs.filter(
-        (candidate) => candidate.type === 'terminal' && candidate.parentTabId === tab.parentTabId
-      ).length
-      const closingWholeParent = tab.id !== tabId || parentLeafCount <= 1
+      // Why: the wire id carries the intent — `parent::leaf` names a pane, `parent` its tab.
+      const resolution = this.resolveTerminalCloseTarget(
+        worktreeId,
+        tab.id === tabId
+          ? { kind: 'pane', tabId: tab.parentTabId, leafId: tab.leafId }
+          : { kind: 'tab', tabId: tab.parentTabId }
+      )
+      const closingWholeParent = resolution === 'tab' || resolution === 'last-pane'
       if (closingWholeParent) {
         closedSelectionTabIds = snapshot.tabs.flatMap((candidate) =>
           candidate.type === 'terminal' && candidate.parentTabId === tab.parentTabId
@@ -169,6 +172,7 @@ export class OrcaRuntimeWithCloseMobileSessionTab extends OrcaRuntimeWithRefuseU
         await this.closeHeadlessMobileTerminalTab(worktreeId, snapshot, tab, {
           allowMissingPersistedTab: Boolean(ptyCloseAuthority),
           force: options.force,
+          reason: options.reason,
           killPtys:
             options.localPtyTeardownOwnedExternally !== true &&
             (options.reason === undefined || options.reason === 'user'),
@@ -228,9 +232,14 @@ export class OrcaRuntimeWithCloseMobileSessionTab extends OrcaRuntimeWithRefuseU
           })
           this.notifyRendererOfHeadlessTerminalClose(tab.parentTabId)
         } else if (retirement.hasPersistedTab) {
-          await this.commitHeadlessTerminalTabRetirement(worktreeId, tab.parentTabId, {
-            force: options.force
-          })
+          // Why: the renderer's close normally commits this through its own intent; this covers
+          // a renderer that acknowledged a tab it no longer listed. Missing is fine: that intent's
+          // durable write can land between this check and this commit.
+          await this.closeTerminalSurface(
+            worktreeId,
+            { kind: 'tab', tabId: tab.parentTabId },
+            { allowMissing: true, force: options.force }
+          )
         }
         if (!acknowledgeRetirement().matches) {
           this.republishMobileSessionTabsSnapshot(worktreeId)
@@ -239,40 +248,26 @@ export class OrcaRuntimeWithCloseMobileSessionTab extends OrcaRuntimeWithRefuseU
         this.clearRuntimeSessionOwnershipForMobileTab(worktreeId, snapshot, tab.parentTabId)
         return finishCommittedClose()
       }
-      // Why: notifier implementations without the acknowledged relay may expose
-      // only raw pane close. Runtime-owned parents still need de-persist + kill.
-      if (closingWholeParent && this.isRuntimeOwnedHeadlessMobileTab(worktreeId, tab)) {
-        await this.closeHeadlessMobileTerminalTab(worktreeId, snapshot, tab, {
-          force: options.force,
-          ...(ptyCloseAuthority ? { authorizedPty: ptyCloseAuthority.pty } : {})
-        })
-        this.notifyRendererOfHeadlessTerminalClose(tab.parentTabId)
-        return finishCommittedClose()
-      }
-      if (!this.notifier?.closeTerminal) {
-        await this.closeHeadlessMobileTerminalTab(worktreeId, snapshot, tab, {
-          force: options.force,
-          ...(ptyCloseAuthority ? { authorizedPty: ptyCloseAuthority.pty } : {})
-        })
-        return finishCommittedClose()
-      }
-      if (tab.id === tabId) {
-        const pty = this.findPtyForMobileTerminalTab(worktreeId, tab)
-        if (pty) {
-          if (this.ptyController?.kill(pty.ptyId) !== true) {
-            throw new Error('terminal_close_failed')
-          }
+      if (closingWholeParent) {
+        // Why: notifier implementations without the acknowledged relay may expose
+        // only raw pane close. Runtime-owned parents still need de-persist + kill.
+        if (
+          !this.notifier?.closeTerminal ||
+          this.isRuntimeOwnedHeadlessMobileTab(worktreeId, tab)
+        ) {
+          await this.closeHeadlessMobileTerminalTab(worktreeId, snapshot, tab, {
+            force: options.force,
+            ...(ptyCloseAuthority ? { authorizedPty: ptyCloseAuthority.pty } : {})
+          })
+          this.notifyRendererOfHeadlessTerminalClose(tab.parentTabId)
           return finishCommittedClose()
         }
         this.notifier.closeTerminal(tab.parentTabId)
+        this.clearRuntimeSessionOwnershipForMobileTab(worktreeId, snapshot, tab.parentTabId)
         return delegatedMobileSessionTabClose()
       }
-      // Why: paired web tab bars represent a split terminal with one local
-      // parent tab id. Closing that parent should close the desktop tab, not
-      // just whichever leaf happened to be first in the session snapshot.
-      this.notifier.closeTerminal(tab.parentTabId)
-      this.clearRuntimeSessionOwnershipForMobileTab(worktreeId, snapshot, tab.parentTabId)
-      return delegatedMobileSessionTabClose()
+      await this.closeMobileSessionTerminalPane(worktreeId, tab)
+      return finishCommittedClose()
     } else if (tab.type === 'browser') {
       // Why: a browser tab can be hosted by a client, by the offscreen backend,
       // or by the renderer; each surface owns a different retirement path.
@@ -296,10 +291,8 @@ export class OrcaRuntimeWithCloseMobileSessionTab extends OrcaRuntimeWithRefuseU
     } else if (tab.type === 'agent-session') {
       if (this.notifier?.closeSessionTab) {
         try {
-          await this.notifier.closeSessionTab(
-            structuredAgentSessionTabId(tab.sessionId),
-            worktreeId
-          )
+          // Why: a reopened chat's window tab id is not derivable from its session; the window maps ours.
+          await this.notifier.closeSessionTab(tab.id, worktreeId)
         } catch (error) {
           // The renderer already having removed the tab is an idempotent close, not a veto.
           if (!(error instanceof Error && error.message === SESSION_TAB_NOT_FOUND_ERROR)) {
diff --git a/src/main/runtime/orca-runtime-cold-restore-terminal-membership.test.ts b/src/main/runtime/orca-runtime-cold-restore-terminal-membership.test.ts
new file mode 100644
index 000000000000..321f4d40ae62
--- /dev/null
+++ b/src/main/runtime/orca-runtime-cold-restore-terminal-membership.test.ts
@@ -0,0 +1,577 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { getDefaultWorkspaceSession } from '../../shared/constants'
+import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../shared/execution-host'
+import type {
+  RuntimeMobileSessionSnapshotTab,
+  RuntimeMobileSessionTabsResult,
+  RuntimeMobileSessionTabsSnapshot
+} from '../../shared/runtime-types'
+import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
+import { OrcaRuntimeService } from './orca-runtime'
+import { setRuntimeDesktopSurface } from './runtime-desktop-surface'
+import { withDurableRuntimeStore } from './runtime-durable-store-fixture'
+
+const WORKTREE_ID = 'repo::/worktree'
+const REPO_ID = 'repo'
+const LEFT = '11111111-1111-4111-8111-111111111111'
+const RIGHT = '22222222-2222-4222-8222-222222222222'
+const SPLIT_ROOT = {
+  type: 'split' as const,
+  direction: 'vertical' as const,
+  first: { type: 'leaf' as const, leafId: LEFT },
+  second: { type: 'leaf' as const, leafId: RIGHT }
+}
+
+type RestoreHost = {
+  repo: {
+    id: string
+    path: string
+    displayName: string
+    badgeColor: string
+    addedAt: number
+    connectionId?: string
+    executionHostId?: ExecutionHostId
+  }
+  hostId: ExecutionHostId
+  connectionId: string | null
+  ptyIds: { left: string; right: string }
+  /** An SSH relaunch has not bound its PTY into the saved session yet. */
+  persistsPtyBindings: boolean
+}
+
+const LOCAL_HOST: RestoreHost = {
+  repo: { id: REPO_ID, path: '/worktree', displayName: 'repo', badgeColor: 'blue', addedAt: 1 },
+  hostId: LOCAL_EXECUTION_HOST_ID,
+  connectionId: null,
+  ptyIds: { left: 'pty-left', right: 'pty-right' },
+  persistsPtyBindings: true
+}
+const SSH_HOST: RestoreHost = {
+  repo: { ...LOCAL_HOST.repo, connectionId: 'ssh-1' },
+  hostId: 'ssh:ssh-1',
+  connectionId: 'ssh-1',
+  ptyIds: { left: 'ssh:ssh-1@@pty-left', right: 'ssh:ssh-1@@pty-right' },
+  persistsPtyBindings: false
+}
+const RUNTIME_HOST: RestoreHost = {
+  ...LOCAL_HOST,
+  repo: { ...LOCAL_HOST.repo, executionHostId: 'runtime:env-1' },
+  hostId: 'runtime:env-1'
+}
+
+// A cold restore: the saved split survives, and an earlier incarnation change left the repo's
+// terminal membership host-authoritative, but no PTY has registered yet.
+function makeColdRestoredSession(host: RestoreHost): WorkspaceSessionState {
+  return {
+    ...getDefaultWorkspaceSession(),
+    tabsByWorktree: {
+      [WORKTREE_ID]: [
+        {
+          id: 'tab',
+          ptyId: host.persistsPtyBindings ? host.ptyIds.left : null,
+          worktreeId: WORKTREE_ID,
+          title: 'Terminal',
+          customTitle: null,
+          color: null,
+          sortOrder: 0,
+          createdAt: 1
+        }
+      ]
+    },
+    terminalLayoutsByTabId: {
+      tab: {
+        root: SPLIT_ROOT,
+        activeLeafId: LEFT,
+        expandedLeafId: null,
+        ptyIdsByLeafId: host.persistsPtyBindings
+          ? { [LEFT]: host.ptyIds.left, [RIGHT]: host.ptyIds.right }
+          : {}
+      }
+    },
+    terminalTopologyRevisionByRepoId: { [REPO_ID]: 2 }
+  }
+}
+
+function makeRendererFrame(
+  host: RestoreHost,
+  options: {
+    version?: number
+    leaves?: readonly string[]
+    extraTabs?: readonly RuntimeMobileSessionSnapshotTab[]
+  } = {}
+): RuntimeMobileSessionTabsSnapshot {
+  const leaves = options.leaves ?? [LEFT, RIGHT]
+  const ptyIdByLeaf: Record<string, string> = {
+    [LEFT]: host.ptyIds.left,
+    [RIGHT]: host.ptyIds.right
+  }
+  const parentLayout = {
+    root: leaves.length === 2 ? SPLIT_ROOT : { type: 'leaf' as const, leafId: leaves[0] },
+    activeLeafId: leaves[0],
+    expandedLeafId: leaves[0],
+    ptyIdsByLeafId: Object.fromEntries(leaves.map((leafId) => [leafId, ptyIdByLeaf[leafId]]))
+  }
+  const extraTabs = options.extraTabs ?? []
+  return {
+    worktree: WORKTREE_ID,
+    publicationEpoch: 'renderer',
+    snapshotVersion: options.version ?? 1,
+    activeGroupId: 'group',
+    activeTabId: `tab::${leaves[0]}`,
+    activeTabType: 'terminal',
+    tabGroups: [
+      { id: 'group', activeTabId: 'tab', tabOrder: ['tab', ...extraTabs.map((tab) => tab.id)] }
+    ],
+    tabs: [
+      ...leaves.map((leafId, index) => ({
+        type: 'terminal' as const,
+        id: `tab::${leafId}`,
+        parentTabId: 'tab',
+        leafId,
+        ptyId: ptyIdByLeaf[leafId],
+        title: leafId === LEFT ? 'Left' : 'Right',
+        parentLayout,
+        isActive: index === 0
+      })),
+      ...extraTabs
+    ]
+  }
+}
+
+const RENDERER_TABS = [
+  {
+    tabId: 'tab',
+    worktreeId: WORKTREE_ID,
+    title: 'Terminal',
+    activeLeafId: LEFT,
+    layout: SPLIT_ROOT
+  }
+]
+
+function publishRendererFrame(
+  runtime: OrcaRuntimeService,
+  frame: RuntimeMobileSessionTabsSnapshot
+): ReturnType<OrcaRuntimeService['syncWindowGraph']> {
+  return runtime.syncWindowGraph(1, { tabs: RENDERER_TABS, leaves: [], mobileSessionTabs: [frame] })
+}
+
+function coldRestoredRuntime(host: RestoreHost = LOCAL_HOST): {
+  runtime: OrcaRuntimeService
+  sessions: Map<ExecutionHostId, WorkspaceSessionState>
+} {
+  const sessions = new Map<ExecutionHostId, WorkspaceSessionState>([
+    [host.hostId, makeColdRestoredSession(host)]
+  ])
+  // The desktop window is live, so main must not rebuild the list from the saved session.
+  const liveWindow = {
+    isDestroyed: () => false,
+    webContents: { isDestroyed: () => false, send: () => {} }
+  }
+  setRuntimeDesktopSurface({
+    showNotification: () => false,
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the runtime reads only liveness and send off its authoritative window on these paths.
+    findWindowById: () => liveWindow as never,
+    onIpc: () => {},
+    removeIpcListener: () => {}
+  })
+  const runtime = new OrcaRuntimeService(
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the list, fence, exit and close paths read only repos and the workspace session; the rest of Store is unreached.
+    withDurableRuntimeStore({
+      getRepos: () => [host.repo],
+      getRepo: (id: string) => (id === REPO_ID ? host.repo : undefined),
+      getAllWorktreeMeta: () => ({}),
+      getWorktreeMeta: () => undefined,
+      getSettings: () => ({ workspaceDir: '/tmp/workspaces' }),
+      getProjects: () => [],
+      getWorkspaceSessionHostIds: () => [...sessions.keys()],
+      getWorkspaceSession: (hostId?: ExecutionHostId) =>
+        sessions.get(hostId ?? LOCAL_EXECUTION_HOST_ID) ?? getDefaultWorkspaceSession(),
+      setWorkspaceSession: (next: WorkspaceSessionState, hostId?: ExecutionHostId) => {
+        sessions.set(hostId ?? LOCAL_EXECUTION_HOST_ID, next)
+      },
+      flushPendingOrThrowAsync: async () => {},
+      // The production store commits asynchronously; a synchronous flush on these paths is a bug.
+      flushOrThrow: () => {
+        throw new Error('synchronous flush')
+      }
+    }) as never
+  )
+  runtime.attachWindow(1)
+  return { runtime, sessions }
+}
+
+function registerLeaf(runtime: OrcaRuntimeService, host: RestoreHost, leaf: 'left' | 'right') {
+  runtime.registerPty(host.ptyIds[leaf], WORKTREE_ID, host.connectionId, {
+    tabId: 'tab',
+    leafId: leaf === 'left' ? LEFT : RIGHT,
+    incarnationId: `incarnation-${leaf}`
+  })
+}
+
+function surfaces(result: RuntimeMobileSessionTabsResult | undefined): string[] {
+  return (result?.tabs ?? []).map((tab) => `${tab.id}:${'status' in tab ? tab.status : ''}`)
+}
+
+async function listedSurfaces(runtime: OrcaRuntimeService): Promise<string[]> {
+  return surfaces(await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`))
+}
+
+// The session-tabs notify coalescer's max wait (mobile-session-tabs-notify-coalescer.ts).
+const COALESCED_PUSH_MS = 250
+
+describe('a restored terminal published before its PTY registers', () => {
+  afterEach(() => {
+    setRuntimeDesktopSurface(null)
+    vi.useRealTimers()
+  })
+
+  it.each([
+    ['local', LOCAL_HOST],
+    ['SSH without a saved PTY binding', SSH_HOST],
+    ['runtime host', RUNTIME_HOST]
+  ])('%s: is listed pending, then pushed ready when its PTY registers', async (_label, host) => {
+    vi.useFakeTimers()
+    const { runtime } = coldRestoredRuntime(host)
+    publishRendererFrame(runtime, makeRendererFrame(host))
+    expect(await listedSurfaces(runtime)).toEqual([
+      `tab::${LEFT}:pending-handle`,
+      `tab::${RIGHT}:pending-handle`
+    ])
+    vi.advanceTimersByTime(COALESCED_PUSH_MS)
+    const published: RuntimeMobileSessionTabsResult[] = []
+    const unsubscribe = runtime.onMobileSessionTabsChanged((event) => published.push(event))
+
+    registerLeaf(runtime, host, 'left')
+    vi.advanceTimersByTime(COALESCED_PUSH_MS)
+
+    // Registration alone reaches clients: no renderer frame or graph change follows it here.
+    expect(surfaces(published.at(-1))).toEqual([
+      `tab::${LEFT}:ready`,
+      `tab::${RIGHT}:pending-handle`
+    ])
+    const pushes = published.length
+    expect(
+      runtime.syncWindowGraph(1, {
+        tabs: RENDERER_TABS,
+        leaves: [],
+        mobileSessionTabs: [],
+        unchangedMobileSessionWorktrees: [WORKTREE_ID]
+      }).mobileSessionResyncWorktrees
+    ).toBeUndefined()
+    publishRendererFrame(runtime, makeRendererFrame(host))
+    vi.advanceTimersByTime(COALESCED_PUSH_MS)
+    expect(published).toHaveLength(pushes)
+    expect(await listedSurfaces(runtime)).toEqual([
+      `tab::${LEFT}:ready`,
+      `tab::${RIGHT}:pending-handle`
+    ])
+
+    registerLeaf(runtime, host, 'right')
+    vi.advanceTimersByTime(COALESCED_PUSH_MS)
+
+    expect(surfaces(published.at(-1))).toEqual([`tab::${LEFT}:ready`, `tab::${RIGHT}:ready`])
+    unsubscribe()
+  })
+
+  it('pushes a restore of several panes once, not once per registering pane', () => {
+    vi.useFakeTimers()
+    const { runtime } = coldRestoredRuntime()
+    publishRendererFrame(runtime, makeRendererFrame(LOCAL_HOST))
+    vi.advanceTimersByTime(COALESCED_PUSH_MS)
+    const published: RuntimeMobileSessionTabsResult[] = []
+    const unsubscribe = runtime.onMobileSessionTabsChanged((event) => published.push(event))
+
+    registerLeaf(runtime, LOCAL_HOST, 'left')
+    registerLeaf(runtime, LOCAL_HOST, 'right')
+    vi.advanceTimersByTime(COALESCED_PUSH_MS)
+
+    expect(published.map(surfaces)).toEqual([[`tab::${LEFT}:ready`, `tab::${RIGHT}:ready`]])
+    unsubscribe()
+  })
+
+  it('keeps listing a restored pane whose PTY never returns as pending', async () => {
+    const { runtime } = coldRestoredRuntime()
+    publishRendererFrame(runtime, makeRendererFrame(LOCAL_HOST))
+
+    registerLeaf(runtime, LOCAL_HOST, 'left')
+    runtime.registerPty('pty-other', WORKTREE_ID, null, {
+      tabId: 'tab-other',
+      leafId: RIGHT,
+      incarnationId: 'incarnation-other'
+    })
+
+    expect(await listedSurfaces(runtime)).toEqual([
+      `tab::${LEFT}:ready`,
+      `tab::${RIGHT}:pending-handle`
+    ])
+  })
+})
+
+describe('a retired restored terminal stays out of a later renderer frame', () => {
+  afterEach(() => setRuntimeDesktopSurface(null))
+
+  it('after its process exits and the retirement is saved', async () => {
+    const { runtime, sessions } = coldRestoredRuntime()
+    registerLeaf(runtime, LOCAL_HOST, 'left')
+    publishRendererFrame(runtime, makeRendererFrame(LOCAL_HOST))
+    expect(await listedSurfaces(runtime)).toContain(`tab::${LEFT}:ready`)
+
+    await runtime.onPtyExit('pty-left', 0, 'incarnation-left')
+
+    expect(sessions.get(LOCAL_EXECUTION_HOST_ID)?.terminalLayoutsByTabId.tab?.root).toEqual({
+      type: 'leaf',
+      leafId: RIGHT
+    })
+    // A lagging renderer still lists the exited pane, at a newer version.
+    publishRendererFrame(runtime, makeRendererFrame(LOCAL_HOST, { version: 2 }))
+    expect(await listedSurfaces(runtime)).not.toContain(`tab::${LEFT}:ready`)
+    expect(await listedSurfaces(runtime)).not.toContain(`tab::${LEFT}:pending-handle`)
+  })
+
+  it('after its last pane exits from a runtime-host partition an older copy still lists', async () => {
+    const { runtime, sessions } = coldRestoredRuntime(RUNTIME_HOST)
+    // Left behind in another partition before the catalog owner rotated.
+    sessions.set(LOCAL_EXECUTION_HOST_ID, makeColdRestoredSession(RUNTIME_HOST))
+    registerLeaf(runtime, RUNTIME_HOST, 'left')
+    registerLeaf(runtime, RUNTIME_HOST, 'right')
+    publishRendererFrame(runtime, makeRendererFrame(RUNTIME_HOST))
+
+    await runtime.onPtyExit('pty-left', 0, 'incarnation-left')
+    await runtime.onPtyExit('pty-right', 0, 'incarnation-right')
+    // Emptying the owner's partition re-routes reads to the older copy.
+    expect(sessions.get(RUNTIME_HOST.hostId)?.tabsByWorktree[WORKTREE_ID]).toEqual([])
+
+    publishRendererFrame(runtime, makeRendererFrame(RUNTIME_HOST, { version: 2 }))
+    expect(await listedSurfaces(runtime)).toEqual([])
+  })
+
+  it('after the user closes it on the desktop', async () => {
+    const { runtime, sessions } = coldRestoredRuntime()
+    registerLeaf(runtime, LOCAL_HOST, 'left')
+    registerLeaf(runtime, LOCAL_HOST, 'right')
+    publishRendererFrame(runtime, makeRendererFrame(LOCAL_HOST))
+    expect(await listedSurfaces(runtime)).toEqual([`tab::${LEFT}:ready`, `tab::${RIGHT}:ready`])
+
+    publishRendererFrame(runtime, makeRendererFrame(LOCAL_HOST, { version: 2, leaves: [LEFT] }))
+    await runtime.onPtyExit('pty-right', 0, 'incarnation-right')
+    expect(sessions.get(LOCAL_EXECUTION_HOST_ID)?.terminalLayoutsByTabId.tab?.root).toEqual({
+      type: 'leaf',
+      leafId: LEFT
+    })
+
+    publishRendererFrame(runtime, makeRendererFrame(LOCAL_HOST, { version: 3 }))
+    expect(await listedSurfaces(runtime)).toEqual([`tab::${LEFT}:ready`])
+  })
+})
+
+// An SSH worktree: the phone closes a tab while a relaunched sibling tab has not registered yet.
+const SSH_PTY_X = 'ssh:ssh-1@@pty-x'
+const SSH_PTY_Y = 'ssh:ssh-1@@pty-y'
+
+function makeSshSession(tabIds: readonly ('tab-x' | 'tab-y')[]): WorkspaceSessionState {
+  // tab-x's relaunched PTY has not bound yet, so only tab-y saves a relay binding.
+  const specs = {
+    'tab-x': { leafId: LEFT, ptyId: null },
+    'tab-y': { leafId: RIGHT, ptyId: SSH_PTY_Y }
+  }
+  return {
+    ...getDefaultWorkspaceSession(),
+    tabsByWorktree: {
+      [WORKTREE_ID]: tabIds.map((id, index) => ({
+        id,
+        ptyId: specs[id].ptyId,
+        worktreeId: WORKTREE_ID,
+        title: id,
+        customTitle: null,
+        color: null,
+        sortOrder: index,
+        createdAt: index + 1
+      }))
+    },
+    terminalLayoutsByTabId: Object.fromEntries(
+      tabIds.map((id) => [
+        id,
+        {
+          root: { type: 'leaf' as const, leafId: specs[id].leafId },
+          activeLeafId: specs[id].leafId,
+          expandedLeafId: null,
+          ptyIdsByLeafId: specs[id].ptyId ? { [specs[id].leafId]: specs[id].ptyId } : {}
+        }
+      ])
+    ),
+    terminalTopologyRevisionByRepoId: { [REPO_ID]: 2 }
+  }
+}
+
+function publishSshRendererFrame(runtime: OrcaRuntimeService): void {
+  const tabs = [
+    { tabId: 'tab-x', leafId: LEFT, ptyId: SSH_PTY_X },
+    { tabId: 'tab-y', leafId: RIGHT, ptyId: SSH_PTY_Y }
+  ]
+  runtime.syncWindowGraph(1, {
+    tabs: tabs.map(({ tabId, leafId }) => ({
+      tabId,
+      worktreeId: WORKTREE_ID,
+      title: tabId,
+      activeLeafId: leafId,
+      layout: { type: 'leaf' as const, leafId }
+    })),
+    leaves: [],
+    mobileSessionTabs: [
+      {
+        worktree: WORKTREE_ID,
+        publicationEpoch: 'renderer',
+        snapshotVersion: 1,
+        activeGroupId: 'group',
+        activeTabId: `tab-y::${RIGHT}`,
+        activeTabType: 'terminal',
+        tabGroups: [{ id: 'group', activeTabId: 'tab-y', tabOrder: ['tab-x', 'tab-y'] }],
+        tabs: tabs.map(({ tabId, leafId, ptyId }) => ({
+          type: 'terminal' as const,
+          id: `${tabId}::${leafId}`,
+          parentTabId: tabId,
+          leafId,
+          ptyId,
+          title: tabId,
+          isActive: tabId === 'tab-y'
+        }))
+      }
+    ]
+  })
+}
+
+describe('a surface the host retired stays retired when a restored sibling registers', () => {
+  afterEach(() => setRuntimeDesktopSurface(null))
+
+  it('keeps a phone-closed SSH terminal closed while its remote PTY is still exiting', async () => {
+    const { runtime, sessions } = coldRestoredRuntime(SSH_HOST)
+    sessions.set(SSH_HOST.hostId, makeSshSession(['tab-x', 'tab-y']))
+    const kill = vi.fn(() => true)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the close path uses only these two relays.
+    runtime.setNotifier({
+      closeTerminal: vi.fn(),
+      // The renderer durably retires the tab and acks; its pruned frame is still in flight.
+      closeTerminalTab: vi.fn(async () => {
+        sessions.set(SSH_HOST.hostId, makeSshSession(['tab-x']))
+      })
+    } as never)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the close path kills and inventories only; the remote kill lands asynchronously.
+    runtime.setPtyController({
+      write: () => true,
+      kill,
+      listProcesses: vi.fn(async () =>
+        [SSH_PTY_X, SSH_PTY_Y].map((id) => ({ id, cwd: '/worktree', title: 'shell' }))
+      ),
+      getForegroundProcess: async () => null
+    } as never)
+    publishSshRendererFrame(runtime)
+    runtime.registerPty(SSH_PTY_Y, WORKTREE_ID, 'ssh-1', {
+      tabId: 'tab-y',
+      leafId: RIGHT,
+      incarnationId: 'incarnation-y'
+    })
+    expect(await listedSurfaces(runtime)).toContain(`tab-y::${RIGHT}:ready`)
+
+    await runtime.closeMobileSessionTab(`id:${WORKTREE_ID}`, 'tab-y', { reason: 'user' })
+    expect(kill).toHaveBeenCalledWith(SSH_PTY_Y)
+    runtime.registerPty(SSH_PTY_X, WORKTREE_ID, 'ssh-1', {
+      tabId: 'tab-x',
+      leafId: LEFT,
+      incarnationId: 'incarnation-x'
+    })
+
+    expect(await listedSurfaces(runtime)).not.toContain(`tab-y::${RIGHT}:ready`)
+  })
+
+  it('keeps a phone-closed chat tab closed', async () => {
+    const { runtime } = coldRestoredRuntime()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the chat close path uses only this relay.
+    runtime.setNotifier({ closeSessionTab: vi.fn(async () => {}) } as never)
+    publishRendererFrame(
+      runtime,
+      makeRendererFrame(LOCAL_HOST, {
+        extraTabs: [
+          {
+            type: 'agent-session',
+            id: 'chat',
+            title: 'Chat',
+            sessionId: 'session-chat',
+            agent: 'claude',
+            isActive: false
+          }
+        ]
+      })
+    )
+    expect(await listedSurfaces(runtime)).toContain('chat:')
+
+    await runtime.closeMobileSessionTab(`id:${WORKTREE_ID}`, 'chat', { reason: 'user' })
+    registerLeaf(runtime, LOCAL_HOST, 'left')
+
+    expect(await listedSurfaces(runtime)).not.toContain('chat:')
+  })
+})
+
+// A phone creates a terminal while the desktop's frame still lacks it: the spawn registered and the
+// host published the tab itself, as it does for a create the desktop has not published yet.
+const PHONE_LEAF = '33333333-3333-4333-8333-333333333333'
+
+async function runtimeWithUnpublishedPhoneCreate(): Promise<OrcaRuntimeService> {
+  const { runtime } = coldRestoredRuntime()
+  const handlers = new Map<string, (event: unknown, reply: unknown) => void>()
+  const webContents = {
+    isDestroyed: () => false,
+    setBackgroundThrottling: () => {},
+    send: (channel: string, payload: { requestId: string }) => {
+      if (channel !== 'terminal:requestTabCreate') {
+        return
+      }
+      runtime.registerPty('pty-phone', WORKTREE_ID, null, {
+        tabId: 'tab-phone',
+        leafId: PHONE_LEAF,
+        incarnationId: 'incarnation-phone'
+      })
+      handlers.get('terminal:tabCreateReply')?.(
+        { sender: webContents },
+        { requestId: payload.requestId, tabId: 'tab-phone', title: 'Terminal' }
+      )
+    }
+  }
+  setRuntimeDesktopSurface({
+    showNotification: () => false,
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the create path reads only liveness and these webContents members off its authoritative window.
+    findWindowById: () => ({ isDestroyed: () => false, webContents }) as never,
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only the tab-create reply channel is registered on this path.
+    onIpc: (channel, listener) => handlers.set(channel, listener as never),
+    removeIpcListener: (channel) => handlers.delete(channel)
+  })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the create path focuses only when activating, which this create does not.
+  runtime.setNotifier({ focusTerminal: vi.fn() } as never)
+  Object.assign(runtime, {
+    resolveTerminalWorkspaceLaunchScope: vi.fn(async () => ({
+      id: WORKTREE_ID,
+      path: '/worktree',
+      connectionId: null,
+      repo: LOCAL_HOST.repo,
+      folderWorkspace: null
+    }))
+  })
+  publishRendererFrame(runtime, makeRendererFrame(LOCAL_HOST))
+  await runtime.createMobileSessionTerminal(`id:${WORKTREE_ID}`, {
+    activate: false,
+    clientNavigationId: 'phone'
+  })
+  return runtime
+}
+
+describe('a surface the host added stays listed when a restored sibling registers', () => {
+  afterEach(() => setRuntimeDesktopSurface(null))
+
+  it('keeps a phone-created terminal listed', async () => {
+    const runtime = await runtimeWithUnpublishedPhoneCreate()
+    expect(await listedSurfaces(runtime)).toContain(`tab-phone::${PHONE_LEAF}:ready`)
+
+    registerLeaf(runtime, LOCAL_HOST, 'left')
+
+    expect(await listedSurfaces(runtime)).toContain(`tab-phone::${PHONE_LEAF}:ready`)
+  })
+})
diff --git a/src/main/runtime/orca-runtime-controller-knows-pty-is-live.ts b/src/main/runtime/orca-runtime-controller-knows-pty-is-live.ts
index 391b55ac5b02..3c9c8b7eab94 100644
--- a/src/main/runtime/orca-runtime-controller-knows-pty-is-live.ts
+++ b/src/main/runtime/orca-runtime-controller-knows-pty-is-live.ts
@@ -3,6 +3,7 @@ import { OrcaRuntimeWithResolveTerminalPane } from './orca-runtime-resolve-termi
 import { PROVEN_ABSENT_LEAF_PTY_TTL_MS } from './orca-runtime-core'
 import { pruneExpiredProvenAbsentLeafPtyVerdicts } from './proven-absent-leaf-pty-verdicts'
 import type { RuntimeTerminalSend } from '../../shared/runtime-types'
+import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 import type { RuntimeAgentPromptWriteOptions } from './runtime-terminal-contracts'
 import {
   assertTerminalInputWithinLimitWithYield,
@@ -103,7 +104,8 @@ export class OrcaRuntimeWithControllerKnowsPtyIsLive extends OrcaRuntimeWithReso
       reserveWrite?: (ptyId: string) => void
       afterWrite?: (ptyId: string) => void | Promise<void>
       suffixFailureError?: string
-    } = {}
+      inputKind: TerminalInputKind
+    }
   ): Promise<RuntimeTerminalSend> {
     const pty = this.getLivePtyForHandle(handle)
     if (pty) {
@@ -152,7 +154,7 @@ export class OrcaRuntimeWithControllerKnowsPtyIsLive extends OrcaRuntimeWithReso
   async sendTerminalAgentPrompt(
     handle: string,
     prompt: string,
-    options: RuntimeAgentPromptWriteOptions = {}
+    options: RuntimeAgentPromptWriteOptions
   ): Promise<RuntimeTerminalSend> {
     // Why the consuming agent: the foreground process reads the bytes; launchAgent covers startup.
     const payloadFor = (ptyId: string): string => {
diff --git a/src/main/runtime/orca-runtime-create-agent-session.ts b/src/main/runtime/orca-runtime-create-agent-session.ts
index 9baf4f76026f..8dc61a9db43e 100644
--- a/src/main/runtime/orca-runtime-create-agent-session.ts
+++ b/src/main/runtime/orca-runtime-create-agent-session.ts
@@ -27,6 +27,7 @@ import {
   deterministicAgentSessionUuid,
   isAgentSessionOperationOutcomeUnknown
 } from './runtime-agent-launch-resolution'
+import { agentStartedTelemetry } from '../agent-launch/agent-started-telemetry'
 
 export class OrcaRuntimeWithCreateAgentSession extends OrcaRuntimeWithGetAgentSessionExecutionNamespace {
   async createAgentSession(
@@ -211,6 +212,8 @@ export class OrcaRuntimeWithCreateAgentSession extends OrcaRuntimeWithGetAgentSe
           launchAgent: request.agent,
           terminalKittyKeyboardProtocol: request.terminalKittyKeyboardProtocol,
           startupCommandDelivery: startup.startupCommandDelivery,
+          // A fresh agent this host built; the request has no surface field, so it counts as `unknown`.
+          telemetry: agentStartedTelemetry(request.agent, undefined),
           cwd: startupCwd,
           presentation: request.presentation ?? 'background',
           tabId: operationTabId,
diff --git a/src/main/runtime/orca-runtime-create-managed-worktree.ts b/src/main/runtime/orca-runtime-create-managed-worktree.ts
index ba006e0dbf01..d39d5691d913 100644
--- a/src/main/runtime/orca-runtime-create-managed-worktree.ts
+++ b/src/main/runtime/orca-runtime-create-managed-worktree.ts
@@ -71,7 +71,12 @@ export class OrcaRuntimeWithCreateManagedWorktree extends OrcaRuntimeWithGetWork
         : null
     const draftStartup =
       !args.startup && !agentStartup && args.startupDraft
-        ? await this.buildStartupForDraft(repo, args.startupDraft, requestedAgent)
+        ? await this.buildStartupForDraft(
+            repo,
+            args.startupDraft,
+            requestedAgent,
+            args.startupLaunchSource
+          )
         : null
     const effectiveStartup = args.startup ?? agentStartup?.startup ?? draftStartup?.startup
     const effectiveStartupFollowup = agentStartup?.followup
diff --git a/src/main/runtime/orca-runtime-create-pty-headless-terminal-state.ts b/src/main/runtime/orca-runtime-create-pty-headless-terminal-state.ts
index b9f35478505b..4ebeed55f903 100644
--- a/src/main/runtime/orca-runtime-create-pty-headless-terminal-state.ts
+++ b/src/main/runtime/orca-runtime-create-pty-headless-terminal-state.ts
@@ -6,6 +6,7 @@ import { shouldForwardHeadlessTerminalQueryReply } from './headless-terminal-que
 import { isNativeWindowsConptyPty } from './terminal-model-query-authority'
 import { getTerminalViewAttributes } from './terminal-view-attribute-store'
 import { PtyShellOwnershipMirror } from './pty-shell-ownership-mirror'
+import { PROCESS_BOUNDARY_GROUND } from '../../shared/terminal-mode-reset-profiles'
 
 export class OrcaRuntimeWithCreatePtyHeadlessTerminalState extends OrcaRuntimeWithMaybeHydrateHeadlessFromRenderer {
   /** Shared factory for the per-PTY runtime emulators (seed, hydration, and
@@ -45,7 +46,7 @@ export class OrcaRuntimeWithCreatePtyHeadlessTerminalState extends OrcaRuntimeWi
           // pending and flushes at the ready marker or the 15s
           // SHELL_READY_TIMEOUT_MS bound (session.ts) — a spawn-time query
           // reply is delayed at most that bound, not lost.
-          this.ptyController?.write(ptyId, reply)
+          this.ptyController?.write(ptyId, reply, 'query-reply')
         }
       }
     })
@@ -195,4 +196,21 @@ export class OrcaRuntimeWithCreatePtyHeadlessTerminalState extends OrcaRuntimeWi
     state.writeChain = state.writeChain.then(() => state.emulator.clearScrollback())
     await state.writeChain
   }
+
+  // Public: Reset Terminal must ground this model too; park/reveal and mobile restore from it.
+  async resetHeadlessTerminalInputModes(ptyId: string): Promise<void> {
+    // Why now, not on the chain: onPtyData scans live bytes into these on arrival.
+    // Focus is outside their model, so the plain ground is exact.
+    this.scanProviderModeTrackers(ptyId, PROCESS_BOUNDARY_GROUND)
+    const state = this.headlessTerminals.get(ptyId)
+    if (!state) {
+      return
+    }
+    // Why on the chain: the ground must land after every PTY chunk already queued.
+    const completion = state.writeChain.then(async () => {
+      await state.emulator.write(state.ownership.groundInputModes())
+    })
+    state.writeChain = completion.catch(() => {})
+    await completion
+  }
 }
diff --git a/src/main/runtime/orca-runtime-create-terminal.ts b/src/main/runtime/orca-runtime-create-terminal.ts
index 6df4eceba762..f770ade810af 100644
--- a/src/main/runtime/orca-runtime-create-terminal.ts
+++ b/src/main/runtime/orca-runtime-create-terminal.ts
@@ -124,6 +124,7 @@ export class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTerminalCreate
         }
         let result: Awaited<ReturnType<NonNullable<dependencies.RuntimePtyController['spawn']>>>
         try {
+          launchOpts.onPtySpawnDispatched?.()
           result = await this.ptyController.spawn({
             cols: 120,
             rows: 40,
@@ -293,6 +294,8 @@ export class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTerminalCreate
         releaseStablePaneCreate()
       }
     }
+    // The renderer owns this spawn, so this process cannot see when it is requested.
+    opts.onPtySpawnDispatched?.()
     return createDesktopTerminal(this, worktreeSelector, opts, presentation, rendererWindow)
   }
 }
diff --git a/src/main/runtime/orca-runtime-deliver-pending-messages.ts b/src/main/runtime/orca-runtime-deliver-pending-messages.ts
index 55c6a8dad5e1..2cd1cc69c003 100644
--- a/src/main/runtime/orca-runtime-deliver-pending-messages.ts
+++ b/src/main/runtime/orca-runtime-deliver-pending-messages.ts
@@ -137,7 +137,7 @@ export class OrcaRuntimeWithDeliverPendingMessages extends OrcaRuntimeWithResolv
     let settlesInEnterCallback = false
     try {
       const payload = formatMessagePointer(unread.length, mailboxHandle)
-      const wrote = this.ptyController?.write(deliveryPtyId, payload) ?? false
+      const wrote = this.ptyController?.write(deliveryPtyId, payload, 'driving') ?? false
       if (!wrote) {
         return
       }
@@ -171,7 +171,7 @@ export class OrcaRuntimeWithDeliverPendingMessages extends OrcaRuntimeWithResolv
           if (!currentLeaf || currentLeaf.ptyId !== deliveryPtyId || !currentLeaf.writable) {
             return
           }
-          this.ptyController?.write(deliveryPtyId, '\r')
+          this.ptyController?.write(deliveryPtyId, '\r', 'driving')
         } catch {
           // Terminal may have closed during the delay; mail remains queued for check.
         } finally {
diff --git a/src/main/runtime/orca-runtime-emit-daemon-pty-transient-fact.ts b/src/main/runtime/orca-runtime-emit-daemon-pty-transient-fact.ts
index 635d14e60d3c..cc112a78ade7 100644
--- a/src/main/runtime/orca-runtime-emit-daemon-pty-transient-fact.ts
+++ b/src/main/runtime/orca-runtime-emit-daemon-pty-transient-fact.ts
@@ -51,6 +51,7 @@ export class OrcaRuntimeWithEmitDaemonPtyTransientFact extends OrcaRuntimeWithSc
     const pty = this.getOrCreatePtyWorktreeRecord(ptyId)
     if (pty) {
       pty.tailPendingAnsi = ''
+      pty.commandPaint = undefined
     }
     for (const leaf of this.getLeavesForPty(ptyId)) {
       leaf.tailPendingAnsi = ''
diff --git a/src/main/runtime/orca-runtime-fit-override-listeners.ts b/src/main/runtime/orca-runtime-fit-override-listeners.ts
index 6d4242d77587..5ef17ce4c2ea 100644
--- a/src/main/runtime/orca-runtime-fit-override-listeners.ts
+++ b/src/main/runtime/orca-runtime-fit-override-listeners.ts
@@ -74,7 +74,6 @@ export class OrcaRuntimeWithFitOverrideListeners extends OrcaRuntimeWithStopRequ
   protected providerSnapshotsWithLiveModeTransition = new WeakSet<PtyProviderBufferSnapshot>()
 
   protected ptyLifecycleGenerationById = new Map<string, number>()
-  protected pendingPtySurfaceRetirementsByPtyId = new Map<string, object>()
 
   protected nextPtyLifecycleGeneration = 1
 
diff --git a/src/main/runtime/orca-runtime-get-orchestration-dispatch-authority.ts b/src/main/runtime/orca-runtime-get-orchestration-dispatch-authority.ts
index d61374c34665..2e52e6f07483 100644
--- a/src/main/runtime/orca-runtime-get-orchestration-dispatch-authority.ts
+++ b/src/main/runtime/orca-runtime-get-orchestration-dispatch-authority.ts
@@ -16,12 +16,13 @@ import { resolveLocalProjectRuntimeForWorktreeId } from '../local-project-runtim
 import type { RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
 import {
   resolveTerminalOrchestrationCliCommand,
+  runtimeOrchestrationCliCommand,
   type OrchestrationCliCommand
 } from './orchestration/cli-command'
-import { getAppEnvironment } from '../../shared/app-environment'
 import type { FleetAgentStatusEvidence } from '../../shared/orchestration-fleet-agent-status-evidence'
 import { readOrchestrationFleetAgentStatusSnapshot } from './orchestration-fleet-agent-status-snapshot'
 import { resolveStructuredWorkerAuthority } from './structured-worker-authority'
+import { matchesProcessIncarnation } from './orchestration/worker-terminal-process-liveness'
 
 export class OrcaRuntimeWithGetOrchestrationDispatchAuthority extends OrcaRuntimeWithVerifyOrchestrationCompatibilityCaller {
   /** Every pane key this PTY could be addressed by, including restored receipts. */
@@ -263,11 +264,44 @@ export class OrcaRuntimeWithGetOrchestrationDispatchAuthority extends OrcaRuntim
       connectionId: pty.connectionId,
       isWsl: pty.isWsl,
       worktreeId: pty.worktreeId,
-      // Dev builds run the CLI as `orca-dev`; a packaged app must not advertise it.
-      runtimeCliCommand: getAppEnvironment().isPackaged() ? undefined : 'orca-dev',
+      runtimeCliCommand: runtimeOrchestrationCliCommand(),
       projectRuntime: this.store
         ? resolveLocalProjectRuntimeForWorktreeId(this.requireStore(), pty.worktreeId)
         : undefined
     })
   }
+  /**
+   * Recover a live terminal handle for a worker whose durable handle stopped resolving
+   * (renderer graph epoch bump / handle invalidation) while its PTY is still tracked. Fences on
+   * the recorded process incarnation EXACTLY — never a bare ptyId, worktree, or pane — so a
+   * reused ptyId belonging to a different process can never be closed, and fails closed on an
+   * unknown host scope (this is also consumed by workerShow, which does no lease re-check).
+   * Returns a freshly minted live handle, or null when no live PTY carries that exact incarnation.
+   */
+  resolveTerminalHandleByProcessIncarnation(
+    processIncarnation: string,
+    serializedHostScope: string | null
+  ): string | null {
+    if (!processIncarnation || !serializedHostScope) {
+      return null
+    }
+    // Scan by the incarnation itself (startsWith + exact equality, mirroring
+    // classifyWorkerTerminalProcessIncarnation) rather than splitting on a colon, so relay/SSH
+    // ptyIds and colon-bearing incarnationIds still match. A pty with no incarnationId can never
+    // match, so the legacy `${runtimeId}:${ptyId}:${ptyGeneration}` fence stays fail-closed.
+    for (const [ptyId, pty] of this.ptysById) {
+      if (!matchesProcessIncarnation(ptyId, pty.incarnationId, processIncarnation)) {
+        continue
+      }
+      const hostScope = this.getOrchestrationCompatibilityHostScope(pty)
+      if (!hostScope || JSON.stringify(hostScope) !== serializedHostScope) {
+        // Keep scanning: a colon-ambiguous decoy pty in a different host scope that this
+        // incarnation string happens to prefix-match must not suppress the genuine same-scope
+        // pty later in ptysById. The scope check still fences the real match below.
+        continue
+      }
+      return this.issuePtyHandle(pty)
+    }
+    return null
+  }
 }
diff --git a/src/main/runtime/orca-runtime-get-pty-record-for-pane-key.ts b/src/main/runtime/orca-runtime-get-pty-record-for-pane-key.ts
index e26301e379a2..5906ee91866c 100644
--- a/src/main/runtime/orca-runtime-get-pty-record-for-pane-key.ts
+++ b/src/main/runtime/orca-runtime-get-pty-record-for-pane-key.ts
@@ -7,6 +7,13 @@ import { recognizeAgentProcess } from '../../shared/agent-process-recognition'
 import { resolveStructuredWorkerAuthority } from './structured-worker-authority'
 import { structuredWorkerIdentities } from './structured-worker-identity'
 import type { StructuredPointerTarget } from './orchestration/structured-mailbox-pointer-delivery'
+import {
+  handleLessCoordinatorSessionId,
+  structuredSessionAddressTarget,
+  structuredSessionMailTarget,
+  structuredSessionIdleEdgeMailboxes,
+  structuredWorkerMailSessionId
+} from './orchestration/structured-session-mail-target'
 import {
   resolveTerminalIdentityFromProbes,
   type RuntimeTerminalIdentity
@@ -187,6 +194,32 @@ export class OrcaRuntimeWithGetPtyRecordForPaneKey extends OrcaRuntimeWithPruneM
     this.orchestrationStructuredMailboxPointerDelivery.onJournalActivity(sessionId)
   }
 
+  /**
+   * Every structured session's status change reaches here. At its idle edge, retry what is parked
+   * on it and re-derive the mailboxes it owns, so mail it could not take earlier (mid-turn, closed)
+   * is pointed again. Workers and chats alike: this is not per-dispatch.
+   */
+  onStructuredSessionStatusForMail(summary: {
+    sessionId: string
+    status: 'working' | 'attention' | 'idle' | null
+  }): void {
+    if (summary.status === 'working' || summary.status === 'attention') {
+      return
+    }
+    // Logged, never thrown: the same status callback goes on to the first-turn workspace rename.
+    try {
+      this.notifyStructuredSessionJournalActivity(summary.sessionId)
+      const openDb = () => this.getExistingOrchestrationDb()
+      const deliver = (mailbox: string) => this.deliverPendingMessagesForHandle(mailbox)
+      structuredSessionIdleEdgeMailboxes(summary.sessionId, openDb).forEach(deliver)
+    } catch (error) {
+      console.warn('[orchestration] structured session mail redrive failed', {
+        sessionId: summary.sessionId,
+        error: error instanceof Error ? error.message : String(error)
+      })
+    }
+  }
+
   /** Settlement drops anything parked for the session; nothing will ever redrive it again. */
   forgetStructuredSessionMail(sessionId: string): void {
     this.orchestrationStructuredMailboxPointerDelivery.forgetSession(sessionId)
@@ -205,6 +238,10 @@ export class OrcaRuntimeWithGetPtyRecordForPaneKey extends OrcaRuntimeWithPruneM
     if (mailboxHandle.startsWith('run:')) {
       return this.resolveStructuredCoordinatorMailboxTarget(mailboxHandle.slice('run:'.length))
     }
+    const addressed = structuredSessionAddressTarget(mailboxHandle, this._orchestrationDb)
+    if (addressed !== undefined) {
+      return addressed
+    }
     if (!mailboxHandle.startsWith('dispatch:')) {
       return this.resolveStructuredWorkerDirectMailboxTarget(mailboxHandle)
     }
@@ -213,8 +250,8 @@ export class OrcaRuntimeWithGetPtyRecordForPaneKey extends OrcaRuntimeWithPruneM
     if (!assignee) {
       return null
     }
-    const identity = resolveStructuredWorkerAuthority(assignee, this._orchestrationDb)?.identity
-    return identity ? { sessionId: identity.sessionId, dispatchId } : null
+    const sessionId = this.liveStructuredWorkerSessionId(assignee)
+    return sessionId ? { sessionId, dispatchId } : null
   }
 
   /**
@@ -228,12 +265,17 @@ export class OrcaRuntimeWithGetPtyRecordForPaneKey extends OrcaRuntimeWithPruneM
   protected resolveStructuredCoordinatorMailboxTarget(
     runId: string
   ): StructuredPointerTarget | null {
-    const coordinator = this._orchestrationDb?.getRun?.(runId)?.coordinator_handle
+    const run = this._orchestrationDb?.getRun?.(runId)
+    const sessionId = run ? handleLessCoordinatorSessionId(run) : null
+    if (sessionId) {
+      return structuredSessionMailTarget(sessionId, this._orchestrationDb)
+    }
+    const coordinator = run?.coordinator_handle
     if (!coordinator) {
       return null
     }
-    const identity = resolveStructuredWorkerAuthority(coordinator, this._orchestrationDb)?.identity
-    return identity ? { sessionId: identity.sessionId, dispatchId: null } : null
+    const workerSessionId = this.liveStructuredWorkerSessionId(coordinator)
+    return workerSessionId ? { sessionId: workerSessionId, dispatchId: null } : null
   }
 
   /**
@@ -255,11 +297,19 @@ export class OrcaRuntimeWithGetPtyRecordForPaneKey extends OrcaRuntimeWithPruneM
     // Answers null for anything that is not a live structured worker of THIS runtime, so `run:`
     // and PTY handles fall through to the PTY lane exactly as before.
     const identity = resolveStructuredWorkerAuthority(handle, db)?.identity
-    if (!identity) {
+    const sessionId = identity ? structuredWorkerMailSessionId(identity.sessionId) : null
+    if (!identity || !sessionId) {
       return null
     }
     const dispatchId = db?.findActiveDispatchForAssignee?.(handle, identity.paneKey)?.id ?? null
-    return { sessionId: identity.sessionId, dispatchId }
+    return { sessionId, dispatchId }
+  }
+
+  /** The live session behind a structured worker handle of this runtime; see
+   *  `structuredWorkerMailSessionId`. */
+  private liveStructuredWorkerSessionId(handle: string): string | null {
+    const identity = resolveStructuredWorkerAuthority(handle, this._orchestrationDb)?.identity
+    return identity ? structuredWorkerMailSessionId(identity.sessionId) : null
   }
 
   protected scheduleRestoredMessageRepoints(): void {
diff --git a/src/main/runtime/orca-runtime-get-runtime-id.ts b/src/main/runtime/orca-runtime-get-runtime-id.ts
index a56825a4a851..ee7fe60e85e4 100644
--- a/src/main/runtime/orca-runtime-get-runtime-id.ts
+++ b/src/main/runtime/orca-runtime-get-runtime-id.ts
@@ -180,6 +180,10 @@ export class OrcaRuntimeWithGetRuntimeId extends OrcaRuntimeWithHasExactPersiste
     return this.workspaceSessions.get(worktreeId)
   }
 
+  protected getOwnWorkspaceSessionForWorktree(worktreeId: string): WorkspaceSessionState | null {
+    return this.workspaceSessions.getOwnPartition(worktreeId)
+  }
+
   protected setWorkspaceSessionForWorktree(
     worktreeId: string,
     session: WorkspaceSessionState
diff --git a/src/main/runtime/orca-runtime-get-structured-agent-session-create-support.ts b/src/main/runtime/orca-runtime-get-structured-agent-session-create-support.ts
index f2143b9772c0..ce2cf31b9ced 100644
--- a/src/main/runtime/orca-runtime-get-structured-agent-session-create-support.ts
+++ b/src/main/runtime/orca-runtime-get-structured-agent-session-create-support.ts
@@ -1,4 +1,5 @@
 // @ts-nocheck -- mechanically split from OrcaRuntimeService; behavior is covered by AST equivalence and characterization tests.
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import { OrcaRuntimeWithGetWorktreePs } from './orca-runtime-get-worktree-ps'
 import { supportsCodexStructuredLocation } from '../codex/codex-structured-location-support'
 import { supportsClaudeStructuredLocation } from '../claude/claude-structured-location-support'
@@ -156,7 +157,9 @@ export class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport extends OrcaR
   ): Promise<AgentSessionAttachParams> {
     const support = await this.getStructuredAgentSessionCreateSupport(input.worktree, input.agent)
     if (!support.supported) {
-      throw new Error('structured_agent_session_unsupported')
+      throw agentSessionRefusalError('structured_agent_session_unsupported', {
+        reason: 'hostUnsupported'
+      })
     }
     const settings = this.requireStore().getSettings()
     const launchEnv = resolveTuiAgentLaunchEnv(input.agent, settings.agentDefaultEnv)
diff --git a/src/main/runtime/orca-runtime-get-worktree-ps.ts b/src/main/runtime/orca-runtime-get-worktree-ps.ts
index cf7e8e56db1b..adcd47baad30 100644
--- a/src/main/runtime/orca-runtime-get-worktree-ps.ts
+++ b/src/main/runtime/orca-runtime-get-worktree-ps.ts
@@ -19,6 +19,7 @@ import { firstWorkRenameDeps } from '../agent-hooks/first-work-rename-runtime'
 import { getProfileUserDataPath } from '../orca-profiles/profile-storage-paths'
 import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
 import { buildWorktreeListingPage } from './worktree-listing-host-scope'
+import { structuredWorkerOwesWork } from './structured-worker-custody'
 import { resolveTuiAgentLaunchEnv } from '../../shared/tui-agent-launch-defaults'
 import { nativeChatShellEnvironmentPolicy } from '../../shared/native-chat-shell-environment'
 import { claudeStructuredPermissionModeForSettings } from '../claude/claude-structured-permission-mode'
@@ -165,13 +166,18 @@ export class OrcaRuntimeWithGetWorktreePs extends OrcaRuntimeWithStartTuiIdleVis
       // Structured chat has no agent CLI hooks, so this projection is what the first-work
       // workspace rename listens to instead of `agentStatus:set`.
       onSessionStatusChanged: (summary, options) => {
+        this.onStructuredSessionStatusForMail(summary)
         void maybeAutoRenameWorkspaceOnFirstStructuredTurn(
           summary,
           options,
           firstWorkRenameDeps(this.requireStore(), this)
         )
       },
-      ...(this.structuredAgentStatusSinkFn ? { statusSink: this.structuredAgentStatusSinkFn } : {})
+      ...(this.structuredAgentStatusSinkFn ? { statusSink: this.structuredAgentStatusSinkFn } : {}),
+      // Read per sweep tick from the orchestration database: a worker whose dispatch is open keeps
+      // its agent running. No database answers no.
+      hasOpenDispatch: (record) =>
+        structuredWorkerOwesWork(this.getOrchestrationDbIfAvailable?.() ?? null, record)
     })
   }
 }
diff --git a/src/main/runtime/orca-runtime-get-worktree-terminal-provisioning-host.ts b/src/main/runtime/orca-runtime-get-worktree-terminal-provisioning-host.ts
index d9d6b2acfb93..7f42304eb8b9 100644
--- a/src/main/runtime/orca-runtime-get-worktree-terminal-provisioning-host.ts
+++ b/src/main/runtime/orca-runtime-get-worktree-terminal-provisioning-host.ts
@@ -36,7 +36,7 @@ export class OrcaRuntimeWithGetWorktreeTerminalProvisioningHost extends OrcaRunt
         this.ptyController!.hasChildProcesses?.(ptyId) ?? Promise.resolve(false),
       subscribeToData: (ptyId, listener) => this.subscribeToTerminalData(ptyId, listener),
       readRecentOutput: (ptyId) => this.recentPtyOutputById.get(ptyId)?.read(),
-      write: (ptyId, data) => this.ptyController?.write(ptyId, data)
+      write: (ptyId, data, inputKind) => this.ptyController?.write(ptyId, data, inputKind)
     }
   }
 
diff --git a/src/main/runtime/orca-runtime-has-exact-persisted-terminal-surface-identity.ts b/src/main/runtime/orca-runtime-has-exact-persisted-terminal-surface-identity.ts
index b2c87e5e4e01..0a50520b0510 100644
--- a/src/main/runtime/orca-runtime-has-exact-persisted-terminal-surface-identity.ts
+++ b/src/main/runtime/orca-runtime-has-exact-persisted-terminal-surface-identity.ts
@@ -5,6 +5,8 @@ import {
   runtimeWorktreeIdsEqual
 } from './runtime-worktree-path-identity'
 import { makePaneKey } from '../../shared/stable-pane-id'
+import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
+import { layoutContainsLeafId } from '../persistence/restoring-sessions/terminal-layout-normalization'
 import type { LegacyWorkerTerminalRecoveryPlan } from './orchestration/orchestration-legacy-worker-terminal-recovery'
 import { retireTerminalSurfacesFromSnapshot } from './mobile-session-terminal-retirement'
 import type {
@@ -27,6 +29,35 @@ import type {
 } from '../../shared/artifacts'
 
 export class OrcaRuntimeWithHasExactPersistedTerminalSurfaceIdentity extends OrcaRuntimeWithAutomationOperations {
+  /** The host's saved session, when it still lists `tabId` under this worktree. */
+  protected getPersistedSessionListingTerminalTab(
+    worktreeId: string,
+    tabId: string,
+    session = this.getWorkspaceSessionForWorktree(worktreeId)
+  ): WorkspaceSessionState | null {
+    const sessionWorktreeId = session ? resolveTerminalSessionWorktreeId(session, worktreeId) : null
+    return session &&
+      sessionWorktreeId &&
+      session.tabsByWorktree[sessionWorktreeId]?.some((candidate) => candidate.id === tabId)
+      ? session
+      : null
+  }
+
+  protected hasPersistedTerminalSurfaceMembership(
+    worktreeId: string,
+    tabId: string,
+    leafId: string
+  ): boolean {
+    // Why own partition: emptying a rotated runtime partition re-routes reads to an older copy
+    // that can still list a surface retirement just removed.
+    const layout = this.getPersistedSessionListingTerminalTab(
+      worktreeId,
+      tabId,
+      this.getOwnWorkspaceSessionForWorktree(worktreeId)
+    )?.terminalLayoutsByTabId[tabId]
+    return Boolean(layout && layoutContainsLeafId(layout.root, leafId))
+  }
+
   protected hasExactPersistedTerminalSurfaceIdentity(expected: {
     worktreeId: string
     tabId: string
@@ -34,19 +65,10 @@ export class OrcaRuntimeWithHasExactPersistedTerminalSurfaceIdentity extends Orc
     ptyId: string
     incarnationId: string
   }): boolean {
-    const session = this.getWorkspaceSessionForWorktree(expected.worktreeId)
-    const sessionWorktreeId = session
-      ? resolveTerminalSessionWorktreeId(session, expected.worktreeId)
-      : null
-    if (!session || !sessionWorktreeId) {
-      return false
-    }
-    const tab = session.tabsByWorktree[sessionWorktreeId]?.find(
-      (candidate) => candidate.id === expected.tabId
-    )
+    const session = this.getPersistedSessionListingTerminalTab(expected.worktreeId, expected.tabId)
     const paneKey = makePaneKey(expected.tabId, expected.leafId)
     return Boolean(
-      tab &&
+      session &&
       session.terminalLayoutsByTabId[expected.tabId]?.ptyIdsByLeafId?.[expected.leafId] ===
         expected.ptyId &&
       session.terminalPtyIncarnationsByPaneKey?.[paneKey] === expected.incarnationId
diff --git a/src/main/runtime/orca-runtime-invalidate-all-handles-for-pty.ts b/src/main/runtime/orca-runtime-invalidate-all-handles-for-pty.ts
index a348309a5689..9d6e5d56ca4b 100644
--- a/src/main/runtime/orca-runtime-invalidate-all-handles-for-pty.ts
+++ b/src/main/runtime/orca-runtime-invalidate-all-handles-for-pty.ts
@@ -140,7 +140,6 @@ export class OrcaRuntimeWithInvalidateAllHandlesForPty extends OrcaRuntimeWithRe
     options: { awaitsRegistration?: boolean } = {}
   ): void {
     this.invalidatePtyControllerInventoryForLifecycle(ptyId)
-    this.pendingPtySurfaceRetirementsByPtyId.delete(ptyId)
     const existingPty = this.ptysById.get(ptyId)
     if (
       existingPty &&
diff --git a/src/main/runtime/orca-runtime-maybe-hydrate-headless-from-renderer.ts b/src/main/runtime/orca-runtime-maybe-hydrate-headless-from-renderer.ts
index 63135f261b78..3e8d618e8a40 100644
--- a/src/main/runtime/orca-runtime-maybe-hydrate-headless-from-renderer.ts
+++ b/src/main/runtime/orca-runtime-maybe-hydrate-headless-from-renderer.ts
@@ -1,5 +1,7 @@
 // @ts-nocheck -- mechanically split from OrcaRuntimeService; behavior is covered by AST equivalence and characterization tests.
+import { splitFreebuffScreenUpdates } from '../../shared/freebuff-screen-status'
 import { OrcaRuntimeWithSerializeMainTerminalBuffer } from './orca-runtime-serialize-main-terminal-buffer'
+import { observeFreebuffTerminalStatus } from './freebuff-terminal-status'
 import { MOBILE_SUBSCRIBE_SCROLLBACK_ROWS } from './scrollback-limits'
 import { detectAgentStatusFromTitle, normalizeTerminalTitle } from '../../shared/agent-detection'
 import { shouldModelAnswerHiddenPtyQueries } from './terminal-model-query-authority'
@@ -171,7 +173,26 @@ export class OrcaRuntimeWithMaybeHydrateHeadlessFromRenderer extends OrcaRuntime
       // Why inside the chain: the ownership mirror must observe live bytes in
       // the same total order as seeds (seedOwner also runs on this chain).
       state.ownership.scan(data)
-      await state.emulator.write(data, { forwardQueryReplies })
+      for (const chunk of splitFreebuffScreenUpdates(data, state.emulator.partialEscapeTailAnsi)) {
+        await state.emulator.write(chunk, { forwardQueryReplies })
+        const pty = this.ptysById.get(ptyId)
+        if (pty && !pty.connectionId && this.headlessTerminals.get(ptyId) === state) {
+          const payload = observeFreebuffTerminalStatus(
+            state.emulator,
+            chunk,
+            this.terminalSpawnCommandsByPtyId.get(ptyId),
+            pty.launchAgent
+          )
+          if (payload) {
+            pty.lastExplicitAgentStatus = { state: payload.state, updatedAt: Date.now() }
+            this.emitTerminalAgentStatusEvents(ptyId, {
+              cleanData: '',
+              payloads: [payload],
+              lastPayloadCleanOffset: null
+            })
+          }
+        }
+      }
       state.outputSequence = outputSequence
     })
     // Legacy callers remain best-effort; bounded SSH admission observes the raw receipt.
diff --git a/src/main/runtime/orca-runtime-on-pty-data.ts b/src/main/runtime/orca-runtime-on-pty-data.ts
index 160c99f20717..52c1fb32551e 100644
--- a/src/main/runtime/orca-runtime-on-pty-data.ts
+++ b/src/main/runtime/orca-runtime-on-pty-data.ts
@@ -4,6 +4,7 @@ import type { TerminalOutputSourceRange } from '../../shared/terminal-output-sou
 import { advertisedUrlWatcher } from '../ports/advertised-url-watcher'
 import { appendNormalizedToTailBuffer } from './terminal-tail-buffer'
 import { normalizeTerminalChunk } from './terminal-ansi-normalization'
+import { observeTerminalCommandPaint } from './terminal-command-paint'
 import {
   appendCompletedTerminalTranscript,
   buildPreview,
@@ -16,6 +17,14 @@ import {
 import { extractOscTitleScanTail } from '../../shared/osc-title-scan-tail'
 
 export class OrcaRuntimeWithOnPtyData extends OrcaRuntimeWithPreparePtyExecutionContext {
+  /** Arrival-order mode scan: the settled tracker plus any in-flight snapshot capture's. */
+  protected scanProviderModeTrackers(ptyId: string, data: string): void {
+    this.providerModeTrackersByPtyId.get(ptyId)?.scan(data)
+    for (const tracker of this.providerModeSnapshotScansByPtyId.get(ptyId) ?? []) {
+      tracker.scan(data)
+    }
+  }
+
   onPtyData(
     ptyId: string,
     data: string,
@@ -27,10 +36,7 @@ export class OrcaRuntimeWithOnPtyData extends OrcaRuntimeWithPreparePtyExecution
   ): number {
     const outputSequence = (this.ptyOutputSequenceById.get(ptyId) ?? 0) + sequenceChars
     this.ptyOutputSequenceById.set(ptyId, outputSequence)
-    this.providerModeTrackersByPtyId.get(ptyId)?.scan(data)
-    for (const tracker of this.providerModeSnapshotScansByPtyId.get(ptyId) ?? []) {
-      tracker.scan(data)
-    }
+    this.scanProviderModeTrackers(ptyId, data)
     const osc7Metadata = this.recordOsc7MetadataForPty(ptyId, data)
     const cwd = osc7Metadata.cwd
     const cwdChanged = osc7Metadata.cwdChanged
@@ -86,6 +92,7 @@ export class OrcaRuntimeWithOnPtyData extends OrcaRuntimeWithPreparePtyExecution
       pty.lastOutputAt = at
       const normalized = normalizeTerminalChunk(data, pty.tailPendingAnsi)
       pty.tailPendingAnsi = normalized.pendingAnsi
+      observeTerminalCommandPaint(pty, data, normalized.text)
       const nextTail = appendNormalizedToTailBuffer(
         pty.tailBuffer,
         pty.tailPartialLine,
diff --git a/src/main/runtime/orca-runtime-on-pty-exit.ts b/src/main/runtime/orca-runtime-on-pty-exit.ts
index c8c9aacc1fa7..16c3048fdb19 100644
--- a/src/main/runtime/orca-runtime-on-pty-exit.ts
+++ b/src/main/runtime/orca-runtime-on-pty-exit.ts
@@ -70,172 +70,172 @@ export class OrcaRuntimeWithOnPtyExit extends OrcaRuntimeWithOnClientDisconnecte
       pty?.incarnationId ??
       `runtime:${this.runtimeId}:${this.getPtyLifecycleGeneration(ptyId)}`
     this.advancePtyLifecycleGeneration(ptyId)
-    this.notifyPtyExitListeners(ptyId)
-    const exactSurfaceByKey = new Map<
-      string,
-      Pick<RetiredTerminalSurface, 'worktreeId' | 'parentTabId' | 'leafId'>
-    >()
-    for (const [worktreeId, snapshot] of this.mobileSessionTabsByWorktree) {
-      for (const tab of snapshot.tabs) {
-        if (
-          tab.type === 'terminal' &&
-          (tab.ptyId === ptyId || tab.parentLayout?.ptyIdsByLeafId?.[tab.leafId] === ptyId)
-        ) {
-          exactSurfaceByKey.set(`${worktreeId}\0${tab.parentTabId}\0${tab.leafId}`, {
-            worktreeId,
-            parentTabId: tab.parentTabId,
-            leafId: tab.leafId
-          })
+    let retirement: Promise<void> | undefined
+    try {
+      const exactSurfaceByKey = new Map<
+        string,
+        Pick<RetiredTerminalSurface, 'worktreeId' | 'parentTabId' | 'leafId'>
+      >()
+      for (const [worktreeId, snapshot] of this.mobileSessionTabsByWorktree) {
+        for (const tab of snapshot.tabs) {
+          if (
+            tab.type === 'terminal' &&
+            (tab.ptyId === ptyId || tab.parentLayout?.ptyIdsByLeafId?.[tab.leafId] === ptyId)
+          ) {
+            exactSurfaceByKey.set(`${worktreeId}\0${tab.parentTabId}\0${tab.leafId}`, {
+              worktreeId,
+              parentTabId: tab.parentTabId,
+              leafId: tab.leafId
+            })
+          }
         }
       }
-    }
-    for (const leaf of this.getLeavesForPty(ptyId)) {
-      exactSurfaceByKey.set(`${leaf.worktreeId}\0${leaf.tabId}\0${leaf.leafId}`, {
-        worktreeId: leaf.worktreeId,
-        parentTabId: leaf.tabId,
-        leafId: leaf.leafId
-      })
-    }
-    const parsedPaneKey = parsePaneKey(pty?.paneKey ?? '')
-    if (pty?.tabId && parsedPaneKey) {
-      exactSurfaceByKey.set(`${pty.worktreeId}\0${pty.tabId}\0${parsedPaneKey.leafId}`, {
-        worktreeId: pty.worktreeId,
-        parentTabId: pty.tabId,
-        leafId: parsedPaneKey.leafId
-      })
-    }
-    const exactSurfaces = [...exactSurfaceByKey.values()]
-    const pendingIncarnation = this.pendingPtyRegistrationIncarnations.get(ptyId)
-    const exitMatchesPendingRegistration =
-      this.pendingPtyRegistrationIncarnations.has(ptyId) &&
-      (pendingIncarnation === null ||
-        exitIncarnationId === null ||
-        exitIncarnationId === undefined ||
-        pendingIncarnation === exitIncarnationId)
-    if (exitMatchesPendingRegistration) {
-      // Why: reused surfaces can look registered while their replacement incarnation still awaits admission.
-      this.earlyExitedPtyIncarnations.set(
-        ptyId,
-        exitIncarnationId ?? pendingIncarnation ?? pty?.incarnationId ?? null
-      )
-    }
-    const intentionalStopIncarnation = this.intentionalHandlelessPtyStops.get(ptyId)
-    const preservesIntentionalHandlelessSurface =
-      this.intentionalHandlelessPtyStops.has(ptyId) &&
-      (intentionalStopIncarnation === null || intentionalStopIncarnation === incarnationId)
-    advertisedUrlWatcher.unbindPty(ptyId)
-    // Clean up new mobile state for this PTY
-    this.mobileSubscribers.delete(ptyId)
-    this.terminalViewSubscribers.clearSubscribers(ptyId)
-    this.mobileDisplayModes.delete(ptyId)
-    this.resizeListeners.delete(ptyId)
-    this.lastRendererSizes.delete(ptyId)
-    this.recentPtyOutputById.delete(ptyId)
-    this.setupCompletionTokenByPtyId.delete(ptyId)
-    this.clearWaitBlockedCheckState(ptyId)
-    this.recentPtyPathCandidatesById.delete(ptyId)
-    this.ptyOutputSequenceById.delete(ptyId)
-    this.providerSequenceInitializedPtys.delete(ptyId)
-    this.providerSequenceOffsetByPtyId.delete(ptyId)
-    this.providerSnapshotPreferredPtys.delete(ptyId)
-    this.providerModeTrackersByPtyId.delete(ptyId)
-    this.providerModeSnapshotScansByPtyId.delete(ptyId)
-    this.providerBufferAcquisitionsByPtyId.delete(ptyId)
-    this.providerVisibleStateByPtyId.delete(ptyId)
-    this.providerVisibleRetryAtByPtyId.delete(ptyId)
-    this.agentPromptExplicitStatusFloorByPtyId.delete(ptyId)
-    this.ptyLifecycleGenerationById.delete(ptyId)
-    this.pendingPtySurfaceRetirementsByPtyId.delete(ptyId)
-    this.agentStatusOscProcessorsByPtyId.delete(ptyId)
-    this.terminalSpawnCommandsByPtyId.delete(ptyId)
-    this.disposePtyTitleTracker(ptyId)
-    this.oscTitleScanTailByPtyId.delete(ptyId)
-    this.osc7ScanTailByPtyId.delete(ptyId)
-    this.terminalCwdByPtyId.delete(ptyId)
-    this.terminalFileUriHostnameByPtyId.delete(ptyId)
-    this.wslDistroByPtyId.delete(ptyId)
-    // Why: a Claude agent-team leader whose PTY exits naturally (agent finished,
-    // process died, renderer reload) must release its team + nested panes map.
-    // Previously only explicit closeTerminal evicted it, so natural exits leaked
-    // one team per never-reused teamId for the runtime's lifetime.
-    const exitedTeamLeaderHandle = this.handleByPtyId.get(ptyId)
-    if (exitedTeamLeaderHandle) {
-      this.claudeAgentTeams.removeTeamForLeaderHandle(exitedTeamLeaderHandle)
-    }
-    // Layout state machine: clear `layouts` and `layoutQueues`. Any
-    // already-queued applyLayout work for this ptyId will run, but every
-    // applyLayout re-checks `layouts.has(ptyId)` (or fresh-subscribe) and
-    // short-circuits with `pty-exited`.
-    this.layouts.delete(ptyId)
-    this.layoutQueues.delete(ptyId)
-    this.freshSubscribeGuard.delete(ptyId)
-    this.cancelPendingDriverMutations(ptyId)
-    // Why: a cold restore can respawn under the same session id within the
-    // delayed-Enter window; the armed Enter would inject \r into the
-    // replacement and stamp rows it never received.
-    this.orchestrationMailboxNotifications.retirePty(ptyId)
-    // Why: the dead pty's terminal handle and any run bound to its panes still carry mailbox
-    // pointers; schedule a debounced repoint so they do not stay aimed at a retired session.
-    for (const leaf of this.getLeavesForPty(ptyId)) {
-      const mailboxHandle = this.handleByLeafKey.get(this.getLeafKey(leaf.tabId, leaf.leafId))
-      if (mailboxHandle) {
-        this.mailPointerRepointScheduler.schedule(mailboxHandle)
+      for (const leaf of this.getLeavesForPty(ptyId)) {
+        exactSurfaceByKey.set(`${leaf.worktreeId}\0${leaf.tabId}\0${leaf.leafId}`, {
+          worktreeId: leaf.worktreeId,
+          parentTabId: leaf.tabId,
+          leafId: leaf.leafId
+        })
       }
-      const boundRun = this._orchestrationDb?.getCurrentRunForPane?.(`${leaf.tabId}:${leaf.leafId}`)
-      if (boundRun) {
-        this.mailPointerRepointScheduler.schedule(`run:${boundRun.id}`)
+      const parsedPaneKey = parsePaneKey(pty?.paneKey ?? '')
+      if (pty?.tabId && parsedPaneKey) {
+        exactSurfaceByKey.set(`${pty.worktreeId}\0${pty.tabId}\0${parsedPaneKey.leafId}`, {
+          worktreeId: pty.worktreeId,
+          parentTabId: pty.tabId,
+          leafId: parsedPaneKey.leafId
+        })
+      }
+      const exactSurfaces = [...exactSurfaceByKey.values()]
+      const pendingIncarnation = this.pendingPtyRegistrationIncarnations.get(ptyId)
+      const exitMatchesPendingRegistration =
+        this.pendingPtyRegistrationIncarnations.has(ptyId) &&
+        (pendingIncarnation === null ||
+          exitIncarnationId === null ||
+          exitIncarnationId === undefined ||
+          pendingIncarnation === exitIncarnationId)
+      if (exitMatchesPendingRegistration) {
+        // Why: reused surfaces can look registered while their replacement incarnation still awaits admission.
+        this.earlyExitedPtyIncarnations.set(
+          ptyId,
+          exitIncarnationId ?? pendingIncarnation ?? pty?.incarnationId ?? null
+        )
+      }
+      // Why both kinds: a sleep keeps its wake hint, and a restart's replacement takes the pane.
+      const preservesIntentionallyStoppedSurface =
+        this.intentionalPtyStops.claimExit(ptyId, exitIncarnationId ?? pty?.incarnationId).length >
+        0
+      advertisedUrlWatcher.unbindPty(ptyId)
+      // Clean up new mobile state for this PTY
+      this.mobileSubscribers.delete(ptyId)
+      this.terminalViewSubscribers.clearSubscribers(ptyId)
+      this.mobileDisplayModes.delete(ptyId)
+      this.resizeListeners.delete(ptyId)
+      this.lastRendererSizes.delete(ptyId)
+      this.recentPtyOutputById.delete(ptyId)
+      this.setupCompletionTokenByPtyId.delete(ptyId)
+      this.clearWaitBlockedCheckState(ptyId)
+      this.recentPtyPathCandidatesById.delete(ptyId)
+      this.ptyOutputSequenceById.delete(ptyId)
+      this.providerSequenceInitializedPtys.delete(ptyId)
+      this.providerSequenceOffsetByPtyId.delete(ptyId)
+      this.providerSnapshotPreferredPtys.delete(ptyId)
+      this.providerModeTrackersByPtyId.delete(ptyId)
+      this.providerModeSnapshotScansByPtyId.delete(ptyId)
+      this.providerBufferAcquisitionsByPtyId.delete(ptyId)
+      this.providerVisibleStateByPtyId.delete(ptyId)
+      this.providerVisibleRetryAtByPtyId.delete(ptyId)
+      this.agentPromptExplicitStatusFloorByPtyId.delete(ptyId)
+      this.ptyLifecycleGenerationById.delete(ptyId)
+      this.agentStatusOscProcessorsByPtyId.delete(ptyId)
+      this.terminalSpawnCommandsByPtyId.delete(ptyId)
+      this.disposePtyTitleTracker(ptyId)
+      this.oscTitleScanTailByPtyId.delete(ptyId)
+      this.osc7ScanTailByPtyId.delete(ptyId)
+      this.terminalCwdByPtyId.delete(ptyId)
+      this.terminalFileUriHostnameByPtyId.delete(ptyId)
+      this.wslDistroByPtyId.delete(ptyId)
+      // Why: a Claude agent-team leader whose PTY exits naturally (agent finished,
+      // process died, renderer reload) must release its team + nested panes map.
+      // Previously only explicit closeTerminal evicted it, so natural exits leaked
+      // one team per never-reused teamId for the runtime's lifetime.
+      const exitedTeamLeaderHandle = this.handleByPtyId.get(ptyId)
+      if (exitedTeamLeaderHandle) {
+        this.claudeAgentTeams.removeTeamForLeaderHandle(exitedTeamLeaderHandle)
+      }
+      // Layout state machine: clear `layouts` and `layoutQueues`. Any
+      // already-queued applyLayout work for this ptyId will run, but every
+      // applyLayout re-checks `layouts.has(ptyId)` (or fresh-subscribe) and
+      // short-circuits with `pty-exited`.
+      this.layouts.delete(ptyId)
+      this.layoutQueues.delete(ptyId)
+      this.freshSubscribeGuard.delete(ptyId)
+      this.cancelPendingDriverMutations(ptyId)
+      // Why: a cold restore can respawn under the same session id within the
+      // delayed-Enter window; the armed Enter would inject \r into the
+      // replacement and stamp rows it never received.
+      this.orchestrationMailboxNotifications.retirePty(ptyId)
+      // Why: the dead pty's terminal handle and any run bound to its panes still carry mailbox
+      // pointers; schedule a debounced repoint so they do not stay aimed at a retired session.
+      for (const leaf of this.getLeavesForPty(ptyId)) {
+        const mailboxHandle = this.handleByLeafKey.get(this.getLeafKey(leaf.tabId, leaf.leafId))
+        if (mailboxHandle) {
+          this.mailPointerRepointScheduler.schedule(mailboxHandle)
+        }
+        const boundRun = this._orchestrationDb?.getCurrentRunForPane?.(
+          `${leaf.tabId}:${leaf.leafId}`
+        )
+        if (boundRun) {
+          this.mailPointerRepointScheduler.schedule(`run:${boundRun.id}`)
+        }
       }
-    }
 
-    if (this.terminalFitOverrides.has(ptyId)) {
-      this.terminalFitOverrides.delete(ptyId)
-      this.notifier?.terminalFitOverrideChanged(ptyId, 'desktop-fit', 0, 0)
-      this.notifyFitOverrideListeners(ptyId, 'desktop-fit', 0, 0)
-    }
-    // Why: clear driver state and notify the renderer so any lock banner on
-    // this dead pane unmounts. Without this, the pane shows a stuck banner
-    // until tab teardown, and `getDriver(deadPtyId)` would keep returning a
-    // stale `mobile{X}` to any caller that hasn't yet seen the exit IPC.
-    this.terminalDrivers.clear(ptyId)
-    this.remoteDesktopFloor.clearPty(ptyId)
-    this.disposeHeadlessTerminal(ptyId)
-    if (processDeathCertified) {
-      // The bounded verdict register also fences late graphs after the PTY record was pruned.
-      this.rememberPtyLivenessVerdict(ptyId, { status: 'exited' })
-    }
-    if (pty) {
-      pty.connected = false
-      pty.runtimeSessionOwned = false
-      this.setPairedRendererSessionOwnership(pty.ptyId, false)
-      pty.disconnectedAt = Date.now()
-      pty.lastExitCode = exitCode
-      pty.lastExitCause = exitCause
-      // Why: the exited process's live frames say nothing about a replacement.
-      // A same-id respawn makes the leaf writable again before any new title,
-      // so leaving this true would let push delivery type into the new process
-      // on the dead one's idle. lastAgentStatus itself stays for `ps` display.
-      pty.lastAgentStatusObservedLive = false
-      this.resolvePtyExitWaiters(pty, ptyId)
-      this.pruneDisconnectedPtyTranscript(pty)
-    }
-    let retirement: Promise<void> | undefined
-    if (preservesIntentionalHandlelessSurface || preservesAbnormalSshSurface) {
-      // Why: relay loss is recoverable; keep the HUB-owned pane addressable through the bounded reconnect grace.
-      this.touchMobileSessionSnapshotsForPty(ptyId, { immediate: true })
-    } else {
-      // Why: permanent process exit is absence, not a starting/sleeping tab.
-      // Retire before publishing so paired clients never persist a ghost.
-      const pendingRetirement = {}
-      this.pendingPtySurfaceRetirementsByPtyId.set(ptyId, pendingRetirement)
-      retirement = this.retireMobileSessionSurfacesForPty(ptyId, incarnationId, exactSurfaces)
-        .catch((error) => {
+      if (this.terminalFitOverrides.has(ptyId)) {
+        this.terminalFitOverrides.delete(ptyId)
+        this.notifier?.terminalFitOverrideChanged(ptyId, 'desktop-fit', 0, 0)
+        this.notifyFitOverrideListeners(ptyId, 'desktop-fit', 0, 0)
+      }
+      // Why: clear driver state and notify the renderer so any lock banner on
+      // this dead pane unmounts. Without this, the pane shows a stuck banner
+      // until tab teardown, and `getDriver(deadPtyId)` would keep returning a
+      // stale `mobile{X}` to any caller that hasn't yet seen the exit IPC.
+      this.terminalDrivers.clear(ptyId)
+      this.remoteDesktopFloor.clearPty(ptyId)
+      this.disposeHeadlessTerminal(ptyId)
+      if (processDeathCertified) {
+        // The bounded verdict register also fences late graphs after the PTY record was pruned.
+        this.rememberPtyLivenessVerdict(ptyId, { status: 'exited' })
+      }
+      if (pty) {
+        pty.connected = false
+        pty.runtimeSessionOwned = false
+        this.setPairedRendererSessionOwnership(pty.ptyId, false)
+        pty.disconnectedAt = Date.now()
+        pty.lastExitCode = exitCode
+        pty.lastExitCause = exitCause
+        // Why: the exited process's live frames say nothing about a replacement.
+        // A same-id respawn makes the leaf writable again before any new title,
+        // so leaving this true would let push delivery type into the new process
+        // on the dead one's idle. lastAgentStatus itself stays for `ps` display.
+        pty.lastAgentStatusObservedLive = false
+        this.resolvePtyExitWaiters(pty, ptyId)
+        this.pruneDisconnectedPtyTranscript(pty)
+      }
+      if (preservesIntentionallyStoppedSurface || preservesAbnormalSshSurface) {
+        // Why: relay loss is recoverable; keep the HUB-owned pane addressable through the bounded reconnect grace.
+        this.touchMobileSessionSnapshotsForPty(ptyId, { immediate: true })
+      } else {
+        // Why: permanent process exit is absence, not a starting/sleeping tab.
+        // Retire before publishing so paired clients never persist a ghost.
+        try {
+          retirement = this.retireMobileSessionSurfacesForPty(ptyId, incarnationId, exactSurfaces)
+        } catch (error) {
           console.error('[runtime] failed to publish terminal retirement:', error)
-        })
-        .finally(() => {
-          if (this.pendingPtySurfaceRetirementsByPtyId.get(ptyId) === pendingRetirement) {
-            this.pendingPtySurfaceRetirementsByPtyId.delete(ptyId)
-          }
-        })
+        }
+      }
+    } finally {
+      // Why last: a stream end cues clients to re-activate the pane it ended, so the retirement
+      // must precede it; a cleanup fault must still end the stream.
+      this.notifyPtyExitListeners(ptyId)
     }
 
     const exitedSurfaces: { handle: string; paneKey: string | null }[] = []
diff --git a/src/main/runtime/orca-runtime-persist-terminal-surface-retirements.ts b/src/main/runtime/orca-runtime-persist-terminal-surface-retirements.ts
index bafc280d9574..5458543815ad 100644
--- a/src/main/runtime/orca-runtime-persist-terminal-surface-retirements.ts
+++ b/src/main/runtime/orca-runtime-persist-terminal-surface-retirements.ts
@@ -1,95 +1,69 @@
 // @ts-nocheck -- mechanically split from OrcaRuntimeService; behavior is covered by AST equivalence and characterization tests.
 import { OrcaRuntimeWithTouchMobileSessionTabsForWorktree } from './orca-runtime-touch-mobile-session-tabs-for-worktree'
 import type { RetiredTerminalSurface } from './mobile-session-terminal-retirement'
-import type { ExecutionHostId } from '../../shared/execution-host'
 import type { RuntimeMobileSessionRetiredTerminalSurface } from '../../shared/runtime-types'
 import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
-import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
 import { retireTerminalSurfaceFromPersistence } from './mobile-session-terminal-persistence-retirement'
 import { retireTerminalSurfacesFromSnapshot } from './mobile-session-terminal-retirement'
 import { attachRetirementProofsToSnapshot } from './mobile-session-terminal-retirement-proof'
-import { cloneWorkspaceSessionState } from '../persistence/restoring-sessions/session-owner-fields'
-import { rollbackWorkspaceSessionAfterFailedAsyncWrite } from '../persistence/restoring-sessions/workspace-session-write-rollback'
 import { getRepoIdFromWorktreeId } from '../../shared/worktree/id'
 
 export class OrcaRuntimeWithPersistTerminalSurfaceRetirements extends OrcaRuntimeWithTouchMobileSessionTabsForWorktree {
   /**
-   * Retires each surface in the session partition of the host that owns its worktree.
+   * Retires each surface in the in-memory session partition of the host that owns its worktree.
    * Why: an SSH pane's durable surface lives in that connection's partition; retiring it
    * against the local partition strands the real ghost and bumps a foreign host's epoch.
-   * Returns null when nothing may be published because persistence is unavailable or failed.
+   * `accepted` held the surface; `unpersisted` had no partition to hold it (or refused the write).
    */
-  protected async persistTerminalSurfaceRetirements(
-    retiredSurfaces: readonly RetiredTerminalSurface[]
-  ): Promise<{ accepted: RetiredTerminalSurface[]; unpersisted: RetiredTerminalSurface[] } | null> {
+  protected stageTerminalSurfaceRetirements(retiredSurfaces: readonly RetiredTerminalSurface[]): {
+    accepted: RetiredTerminalSurface[]
+    unpersisted: RetiredTerminalSurface[]
+  } {
+    const accepted: RetiredTerminalSurface[] = []
+    const unpersisted: RetiredTerminalSurface[] = []
+    for (const surface of retiredSurfaces) {
+      const hostId =
+        this.tryGetWorkspaceSessionHostIdForWorktree(surface.worktreeId) ?? LOCAL_EXECUTION_HOST_ID
+      const current = this.store?.getWorkspaceSession?.(hostId)
+      if (!current) {
+        unpersisted.push(surface)
+        continue
+      }
+      const next = retireTerminalSurfaceFromPersistence(current, surface)
+      if (next === current) {
+        continue
+      }
+      try {
+        this.store.setWorkspaceSession(next, hostId)
+        accepted.push(surface)
+      } catch (error) {
+        // Why: the process is gone whether or not the profile admits the write (quit, maintenance).
+        console.error('[runtime] could not stage terminal retirement:', error)
+        unpersisted.push(surface)
+      }
+    }
+    return { accepted, unpersisted }
+  }
+
+  // Why no rollback: the process is gone, so a failed write leaves the retirement for the next one.
+  protected async persistStagedTerminalSurfaceRetirements(): Promise<void> {
     if (!this.store?.runDurableMutation) {
-      const hasPersistedSession = retiredSurfaces.some((surface) =>
-        this.store?.getWorkspaceSession?.(
-          this.tryGetWorkspaceSessionHostIdForWorktree(surface.worktreeId) ??
-            LOCAL_EXECUTION_HOST_ID
-        )
-      )
-      return hasPersistedSession ? null : { accepted: [], unpersisted: [...retiredSurfaces] }
+      return
     }
     try {
-      return await this.store.runDurableMutation(() => {
-        const accepted: RetiredTerminalSurface[] = []
-        const unpersisted: RetiredTerminalSurface[] = []
-        const originals = new Map<ExecutionHostId, WorkspaceSessionState>()
-        const staged = new Map<ExecutionHostId, WorkspaceSessionState>()
-        for (const surface of retiredSurfaces) {
-          const hostId =
-            this.tryGetWorkspaceSessionHostIdForWorktree(surface.worktreeId) ??
-            LOCAL_EXECUTION_HOST_ID
-          const current = this.store.getWorkspaceSession?.(hostId)
-          if (!current) {
-            unpersisted.push(surface)
-            continue
-          }
-          if (!this.store.setWorkspaceSession) {
-            throw new Error('workspace_session_unavailable')
-          }
-          if (!originals.has(hostId)) {
-            originals.set(hostId, cloneWorkspaceSessionState(current))
-          }
-          const next = retireTerminalSurfaceFromPersistence(current, surface)
-          if (next !== current) {
-            this.store.setWorkspaceSession(next, hostId)
-            staged.set(hostId, cloneWorkspaceSessionState(this.store.getWorkspaceSession(hostId)))
-            accepted.push(surface)
-          }
-        }
-        return {
-          value: { accepted, unpersisted },
-          persist: staged.size > 0,
-          rollback: () => {
-            for (const [hostId, stagedSession] of staged) {
-              const current = this.store.getWorkspaceSession(hostId)
-              const rolledBack = rollbackWorkspaceSessionAfterFailedAsyncWrite(
-                originals.get(hostId),
-                stagedSession,
-                current
-              )
-              if (rolledBack !== current) {
-                this.store.setWorkspaceSession(rolledBack, hostId)
-              }
-            }
-          }
-        }
-      })
+      // Why if-dirty: an earlier write, or another exit's, may already carry this retirement.
+      await this.store.runDurableMutation(() => ({ value: undefined, persist: 'if-dirty' }))
     } catch (error) {
-      console.error('[runtime] failed to persist terminal retirement:', error)
-      return null
+      console.error('[runtime] terminal retirement is not yet durable:', error)
     }
   }
 
-  protected async retireMobileSessionSurfacesForPty(
+  // Why synchronous: the exit's stream end cues clients to re-activate, which must find the leaf gone.
+  protected retireMobileSessionSurfacesForPty(
     ptyId: string,
     incarnationId: string,
     exactSurfaces: readonly Pick<RetiredTerminalSurface, 'worktreeId' | 'parentTabId' | 'leafId'>[]
-  ): Promise<void> {
-    // Reads can mint a new frame generation while this independent retirement waits for disk.
-    const pendingRetirement = this.pendingPtySurfaceRetirementsByPtyId.get(ptyId)
+  ): Promise<void> | undefined {
     const terminalHandle =
       this.handleByPtyId.get(ptyId) ?? this.findHandleForPtyRecord(ptyId) ?? undefined
     const retiredSurfaceByKey = new Map<string, RetiredTerminalSurface>()
@@ -119,26 +93,18 @@ export class OrcaRuntimeWithPersistTerminalSurfaceRetirements extends OrcaRuntim
     }
     const retiredSurfaces = [...retiredSurfaceByKey.values()]
     if (retiredSurfaces.length === 0) {
-      return
-    }
-    const persisted = await this.persistTerminalSurfaceRetirements(retiredSurfaces)
-    const currentIncarnation = this.ptysById.get(ptyId)?.incarnationId
-    if (
-      !persisted ||
-      this.pendingPtySurfaceRetirementsByPtyId.get(ptyId) !== pendingRetirement ||
-      (currentIncarnation && currentIncarnation !== incarnationId)
-    ) {
-      return
+      return undefined
     }
-    for (const surface of persisted.unpersisted) {
+    const staged = this.stageTerminalSurfaceRetirements(retiredSurfaces)
+    for (const surface of staged.unpersisted) {
       const repoId = getRepoIdFromWorktreeId(surface.worktreeId)
       this.terminalTopologyRevisionByRepoId.set(
         repoId,
         (this.terminalTopologyRevisionByRepoId.get(repoId) ?? 0) + 1
       )
     }
-    // Why: one repo epoch can cover multiple exits, but only surfaces individually accepted by persistence may disappear.
-    const removableRetiredSurfaces = [...persisted.accepted, ...persisted.unpersisted]
+    // Why: one repo epoch can cover multiple exits; a surface the session binds to another PTY or incarnation stays.
+    const removableRetiredSurfaces = [...staged.accepted, ...staged.unpersisted]
     for (const [worktreeId, snapshot] of this.mobileSessionTabsByWorktree) {
       // Why proofs aren't gated on `removable`: the exit is the attestation, and a surface the
       // renderer already de-persisted leaves persistence nothing to accept. Withholding the proof
@@ -163,7 +129,7 @@ export class OrcaRuntimeWithPersistTerminalSurfaceRetirements extends OrcaRuntim
               snapshot,
               ptyId,
               exactSurfaces: removableSurfaces,
-              // Why: discovery is broad by PTY id, but publication may remove only surfaces whose durable retirement was accepted.
+              // Why: discovery is broad by PTY id, but publication may remove only surfaces the session retired.
               exactOnly: true,
               ...(retirementProofs.length > 0 ? { retirementProofs } : {})
             })
@@ -175,6 +141,7 @@ export class OrcaRuntimeWithPersistTerminalSurfaceRetirements extends OrcaRuntim
       }
       this.publishRetiredTerminalSurfaceProofs(worktreeId, retirementProofs)
     }
+    return staged.accepted.length > 0 ? this.persistStagedTerminalSurfaceRetirements() : undefined
   }
 
   /** Ships durable retirement proofs on their own frame when no surface removal carries them. */
diff --git a/src/main/runtime/orca-runtime-prune-mobile-session-tab-group-layout.ts b/src/main/runtime/orca-runtime-prune-mobile-session-tab-group-layout.ts
index 50b1f52d238a..75005726c2db 100644
--- a/src/main/runtime/orca-runtime-prune-mobile-session-tab-group-layout.ts
+++ b/src/main/runtime/orca-runtime-prune-mobile-session-tab-group-layout.ts
@@ -216,9 +216,10 @@ export class OrcaRuntimeWithPruneMobileSessionTabGroupLayout extends OrcaRuntime
   }
 
   // Why: group address resolution (Section 4.5) queries per-handle status and must not throw on stale handles; return null on any error.
-  getAgentStatusForHandle(handle: string): string | null {
+  async getAgentStatusForHandle(handle: string): Promise<string | null> {
     // A structured worker has no pane and no title, so every PTY probe below answers null and
-    // `@idle` would enumerate it and then silently drop it. Its status is the journal's.
+    // `@idle` would enumerate it and then silently drop it. Its status is the journal's, read
+    // through a conversation the idle sweep may have closed.
     const structured = resolveStructuredWorkerAuthority(handle, this._orchestrationDb)
     if (structured) {
       return structuredWorkerAgentStatus(structured.identity.sessionId)
diff --git a/src/main/runtime/orca-runtime-refresh-floating-workspace-pty-liveness.ts b/src/main/runtime/orca-runtime-refresh-floating-workspace-pty-liveness.ts
index 01014e225b08..c0ca5a8685d8 100644
--- a/src/main/runtime/orca-runtime-refresh-floating-workspace-pty-liveness.ts
+++ b/src/main/runtime/orca-runtime-refresh-floating-workspace-pty-liveness.ts
@@ -147,6 +147,7 @@ export class OrcaRuntimeWithRefreshFloatingWorkspacePtyLiveness extends OrcaRunt
     this.providerVisibleRetryAtByPtyId.delete(ptyId)
     this.agentStatusOscProcessorsByPtyId.delete(ptyId)
     this.terminalSpawnCommandsByPtyId.delete(ptyId)
+    this.terminalRunFacts.delete(ptyId)
     this.disposePtyTitleTracker(ptyId)
     this.invalidatePtyIncarnationHandle(ptyId)
     this.oscTitleScanTailByPtyId.delete(ptyId)
diff --git a/src/main/runtime/orca-runtime-register-pty.ts b/src/main/runtime/orca-runtime-register-pty.ts
index 31c1bc386279..bd9c96a5c0fa 100644
--- a/src/main/runtime/orca-runtime-register-pty.ts
+++ b/src/main/runtime/orca-runtime-register-pty.ts
@@ -27,7 +27,6 @@ export class OrcaRuntimeWithRegisterPty extends OrcaRuntimeWithInvalidateAllHand
     isWsl?: boolean
   ): void {
     this.assertPtyDidNotExitBeforeRegistration(ptyId, binding?.incarnationId)
-    this.pendingPtySurfaceRetirementsByPtyId.delete(ptyId)
     this.invalidatePtyControllerInventoryForLifecycle(ptyId, connectionId)
     const existingPty = this.ptysById.get(ptyId)
     const replacementHandle = binding?.terminalHandle?.trim()
@@ -141,6 +140,8 @@ export class OrcaRuntimeWithRegisterPty extends OrcaRuntimeWithInvalidateAllHand
         currentFence.pendingRegistration = false
       }
     }
+    // Why: a listed surface's pending-handle → ready flip must not wait on a later renderer graph change.
+    this.touchMobileSessionSnapshotsForPty(ptyId)
     // Why: the renderer's own PTY spawn is the reliable signal that the pending
     // mobile create's tab is live; publish its surface main-side (#7587).
     if (binding && paneKey) {
diff --git a/src/main/runtime/orca-runtime-resolve-authoritative-terminal-wait-permission.ts b/src/main/runtime/orca-runtime-resolve-authoritative-terminal-wait-permission.ts
index 3b81911ca64d..4472ac7176d1 100644
--- a/src/main/runtime/orca-runtime-resolve-authoritative-terminal-wait-permission.ts
+++ b/src/main/runtime/orca-runtime-resolve-authoritative-terminal-wait-permission.ts
@@ -61,7 +61,7 @@ export class OrcaRuntimeWithResolveAuthoritativeTerminalWaitPermission extends O
     ptyId: string,
     action: { text?: string; enter?: boolean; interrupt?: boolean },
     payload: string,
-    options: RuntimeTerminalWriteOptions = {}
+    options: RuntimeTerminalWriteOptions
   ): Promise<void> {
     return this.terminalWriter.writeAction(ptyId, action, payload, options)
   }
@@ -69,7 +69,7 @@ export class OrcaRuntimeWithResolveAuthoritativeTerminalWaitPermission extends O
   protected writeTerminalInputChunks(
     ptyId: string,
     text: string,
-    options: RuntimeTerminalWriteOptions = {}
+    options: RuntimeTerminalWriteOptions
   ): Promise<void> {
     return this.terminalWriter.writeChunks(ptyId, text, options)
   }
diff --git a/src/main/runtime/orca-runtime-resolve-exit-waiters.ts b/src/main/runtime/orca-runtime-resolve-exit-waiters.ts
index 9d2ea33a6b81..f7ead603e022 100644
--- a/src/main/runtime/orca-runtime-resolve-exit-waiters.ts
+++ b/src/main/runtime/orca-runtime-resolve-exit-waiters.ts
@@ -2,15 +2,22 @@
 // @ts-nocheck -- mechanically split from OrcaRuntimeService; behavior is covered by AST equivalence and characterization tests.
 import { OrcaRuntimeWithBindPtyIncarnationHandle } from './orca-runtime-bind-pty-incarnation-handle'
 import type { RuntimeLeafRecord, RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
-import { buildPtyTerminalWaitResult, buildTerminalWaitResult } from './terminal-wait-results'
-import type { AgentStatus } from '../../shared/agent-detection'
 import {
-  detectExplicitIdleStatusFromTitle,
-  isKnownReadyPromptPreview,
-  isMuseReadyPromptPreview
-} from './terminal-wait-detection'
+  buildPtyTerminalWaitBlockedResult,
+  buildPtyTerminalWaitResult,
+  buildTerminalWaitBlockedResult,
+  buildTerminalWaitResult
+} from './terminal-wait-results'
+import type { AgentStatus } from '../../shared/agent-detection'
+import { detectExplicitIdleStatusFromTitle } from './terminal-wait-detection'
 import { buildTerminalWaitText } from './terminal-wait-tail-state'
-import { isTuiIdleSatisfied } from './tui-idle-evidence'
+import {
+  evaluateTuiIdle,
+  isTuiIdleReadyVerdict,
+  leafTuiIdleEvidence,
+  ptyTuiIdleEvidence,
+  type TuiIdleVerdict
+} from './tui-idle-evidence'
 import { TUI_IDLE_QUIESCENCE_MS } from './orca-runtime-postlude'
 
 export class OrcaRuntimeWithResolveExitWaiters extends OrcaRuntimeWithBindPtyIncarnationHandle {
@@ -50,14 +57,20 @@ export class OrcaRuntimeWithResolveExitWaiters extends OrcaRuntimeWithBindPtyInc
     if (!waiters || waiters.size === 0) {
       return
     }
-    // Why re-rank rather than resolve outright: the transition that brought us here is
-    // only a title sample, and a name-only title arriving mid-turn is the weakest tier
-    // there is (#6011). Leave such a waiter on its poll to be corroborated instead.
-    if (!this.isTuiIdleSatisfiedForLeaf(leaf)) {
-      return
-    }
+    // Why re-rank rather than resolve outright: the transition that brought us here is only a
+    // title sample. Weak ready (a name-only title, #6011) cannot see a dialog the tail lost,
+    // so it is left to the poll, which settles it only after a rendered-screen read.
+    const verdict = this.evaluateTuiIdleForLeaf(leaf)
     for (const waiter of [...waiters]) {
-      if (waiter.condition === 'tui-idle') {
+      if (waiter.condition !== 'tui-idle') {
+        continue
+      }
+      if (verdict.kind === 'blocked') {
+        this.resolveWaiter(
+          waiter,
+          buildTerminalWaitBlockedResult(handle, 'tui-idle', leaf, verdict.reason)
+        )
+      } else if (verdict.kind === 'ready-strong') {
         this.resolveWaiter(waiter, buildTerminalWaitResult(handle, 'tui-idle', leaf))
       }
     }
@@ -92,34 +105,28 @@ export class OrcaRuntimeWithResolveExitWaiters extends OrcaRuntimeWithBindPtyInc
       return
     }
     // Why: same re-ranking as resolveTuiIdleWaiters above.
-    if (!this.isTuiIdleSatisfiedForPty(pty)) {
-      return
-    }
+    const verdict = this.evaluateTuiIdleForPty(pty)
     for (const waiter of [...waiters]) {
-      if (waiter.condition === 'tui-idle') {
+      if (waiter.condition !== 'tui-idle') {
+        continue
+      }
+      if (verdict.kind === 'blocked') {
+        this.resolveWaiter(
+          waiter,
+          buildPtyTerminalWaitBlockedResult(handle, 'tui-idle', pty, verdict.reason)
+        )
+      } else if (verdict.kind === 'ready-strong') {
         this.resolveWaiter(waiter, buildPtyTerminalWaitResult(handle, 'tui-idle', pty))
       }
     }
   }
 
-  // Why: the primary OSC-title signal can't fire for daemon-hosted terminals (no PTY data through the runtime), so this fallback polls the renderer-synced tab title + foreground-process quiescence; self-cancels when the OSC path fires.
-  protected isTuiIdleSatisfiedForLeaf(leaf: RuntimeLeafRecord): boolean {
-    return isTuiIdleSatisfied({
-      record: leaf,
-      rendererTitle: leaf.paneTitle ?? this.tabs.get(leaf.tabId)?.title ?? null,
-      readPositiveBodyEvidence: () =>
-        isKnownReadyPromptPreview(
-          buildTerminalWaitText(leaf.tailBuffer, leaf.tailPartialLine, leaf.preview)
-        ),
-      readMuseReadyBodyEvidence: () =>
-        isMuseReadyPromptPreview(
-          buildTerminalWaitText(leaf.tailBuffer, leaf.tailPartialLine, leaf.preview)
-        ),
-      agent: this.getPaneAgentForTuiIdle(leaf.ptyId),
-      firstPartyStatus:
-        (leaf.ptyId ? this.ptysById.get(leaf.ptyId)?.lastExplicitAgentStatus : null) ?? null,
-      quiescenceMs: TUI_IDLE_QUIESCENCE_MS
-    })
+  protected evaluateTuiIdleForLeaf(leaf: RuntimeLeafRecord): TuiIdleVerdict {
+    return evaluateTuiIdle(
+      leafTuiIdleEvidence(this.tuiIdleEvidenceSource, leaf, () =>
+        buildTerminalWaitText(leaf.tailBuffer, leaf.tailPartialLine, leaf.preview)
+      )
+    )
   }
 
   /**
@@ -189,25 +196,25 @@ export class OrcaRuntimeWithResolveExitWaiters extends OrcaRuntimeWithBindPtyInc
    */
   protected isAgentSettledForDelivery(leaf: { tabId: string; leafId: string }): boolean {
     const live = this.leaves.get(this.getLeafKey(leaf.tabId, leaf.leafId))
-    return live ? this.isTuiIdleSatisfiedForLeaf(live) : false
+    if (!live) {
+      return false
+    }
+    const evidence = leafTuiIdleEvidence(this.tuiIdleEvidenceSource, live, () =>
+      buildTerminalWaitText(live.tailBuffer, live.tailPartialLine, live.preview)
+    )
+    // Why no blocked reader: a refusal here re-arms a recheck that a lingering tail prompt
+    // would spin, so delivery keeps its own, blocked-blind, reading of the same ranking.
+    return isTuiIdleReadyVerdict(
+      evaluateTuiIdle({ ...evidence, readTailBlockedReason: () => null })
+    )
   }
 
-  protected isTuiIdleSatisfiedForPty(pty: RuntimePtyWorktreeRecord): boolean {
-    return isTuiIdleSatisfied({
-      record: pty,
-      readPositiveBodyEvidence: () =>
-        this.getAdoptedPtyExplicitIdleStatus(pty) === 'idle' ||
-        isKnownReadyPromptPreview(
-          buildTerminalWaitText(pty.tailBuffer, pty.tailPartialLine, pty.preview)
-        ),
-      readMuseReadyBodyEvidence: () =>
-        isMuseReadyPromptPreview(
-          buildTerminalWaitText(pty.tailBuffer, pty.tailPartialLine, pty.preview)
-        ),
-      agent: this.getPaneAgentForTuiIdle(pty.ptyId),
-      firstPartyStatus: pty.lastExplicitAgentStatus ?? null,
-      quiescenceMs: TUI_IDLE_QUIESCENCE_MS
-    })
+  protected evaluateTuiIdleForPty(pty: RuntimePtyWorktreeRecord): TuiIdleVerdict {
+    return evaluateTuiIdle(
+      ptyTuiIdleEvidence(this.tuiIdleEvidenceSource, pty, () =>
+        buildTerminalWaitText(pty.tailBuffer, pty.tailPartialLine, pty.preview)
+      )
+    )
   }
 
   protected getAdoptedPtyExplicitIdleStatus(pty: RuntimePtyWorktreeRecord): AgentStatus | null {
diff --git a/src/main/runtime/orca-runtime-resolve-terminal-pane.ts b/src/main/runtime/orca-runtime-resolve-terminal-pane.ts
index 1093319783a6..60047604e438 100644
--- a/src/main/runtime/orca-runtime-resolve-terminal-pane.ts
+++ b/src/main/runtime/orca-runtime-resolve-terminal-pane.ts
@@ -184,7 +184,7 @@ export class OrcaRuntimeWithResolveTerminalPane extends OrcaRuntimeWithGetTermin
   ): Promise<RuntimeTerminalRead> {
     // Before the PTY lookup, because a structured worker has no PTY and no leaf: without this the
     // only peer read verb answers `terminal_handle_stale` for a perfectly live worker.
-    const structured = readStructuredWorkerTerminal({
+    const structured = await readStructuredWorkerTerminal({
       handle,
       db: this.getOrchestrationDbIfAvailable?.() ?? null,
       ...(opts.cursor === undefined ? {} : { cursor: opts.cursor }),
diff --git a/src/main/runtime/orca-runtime-resolve-terminal-split-source-authority.ts b/src/main/runtime/orca-runtime-resolve-terminal-split-source-authority.ts
index 49d55d96c17e..167aee3e21b8 100644
--- a/src/main/runtime/orca-runtime-resolve-terminal-split-source-authority.ts
+++ b/src/main/runtime/orca-runtime-resolve-terminal-split-source-authority.ts
@@ -54,12 +54,13 @@ export class OrcaRuntimeWithResolveTerminalSplitSourceAuthority extends OrcaRunt
     )
     const rendererTab = this.tabs.get(tabId)
     const rendererLeaf = this.leaves.get(this.getLeafKey(tabId, leafId))
+    // A mounted pane can publish before its PTY binds; persisted identity fences that gap.
     const rendererMounted = Boolean(
       rendererTab &&
       rendererLeaf &&
       runtimeWorktreeIdsEqual(rendererTab.worktreeId, worktreeId) &&
       runtimeWorktreeIdsEqual(rendererLeaf.worktreeId, worktreeId) &&
-      rendererLeaf.ptyId === ptyId
+      (rendererLeaf.ptyId === ptyId || (persisted && rendererLeaf.ptyId === null))
     )
     if (persisted && persistedLayout) {
       return {
@@ -100,7 +101,7 @@ export class OrcaRuntimeWithResolveTerminalSplitSourceAuthority extends OrcaRunt
     return await this.claudeAgentTeams.handleTmuxCompat(request, {
       splitTerminal: (handle, opts) => this.splitTerminal(handle, opts),
       readTerminal: (handle, opts) => this.readTerminal(handle, opts),
-      sendTerminal: (handle, action) => this.sendTerminal(handle, action),
+      sendTerminal: (handle, action, options) => this.sendTerminal(handle, action, options),
       focusTerminal: (handle) => this.focusTerminal(handle),
       closeTerminal: (handle) => this.closeTerminal(handle),
       showTerminal: (handle) => this.showTerminal(handle)
diff --git a/src/main/runtime/orca-runtime-resolve-worktree-removal-target.ts b/src/main/runtime/orca-runtime-resolve-worktree-removal-target.ts
index 94dba6bdc833..eeac6dd9a78f 100644
--- a/src/main/runtime/orca-runtime-resolve-worktree-removal-target.ts
+++ b/src/main/runtime/orca-runtime-resolve-worktree-removal-target.ts
@@ -21,6 +21,7 @@ import { resolveLocalProjectRuntimeForWorktreeId } from '../local-project-runtim
 import { resolveBareAgentLaunchCommand } from './runtime-agent-launch-resolution'
 import { buildAgentStartupPlan } from '../../shared/tui-agent-startup'
 import { resolveAgentStartupPlanInputs } from '../../shared/agent-startup-plan-inputs'
+import { agentStartedTelemetry } from '../agent-launch/agent-started-telemetry'
 
 export class OrcaRuntimeWithResolveWorktreeRemovalTarget extends OrcaRuntimeWithRemoveManagedWorktree {
   protected async resolveWorktreeRemovalTarget(
@@ -250,7 +251,9 @@ export class OrcaRuntimeWithResolveWorktreeRemovalTarget extends OrcaRuntimeWith
       ...(startupPlan.env ? { env: startupPlan.env } : {}),
       launchConfig: startupPlan.launchConfig,
       launchAgent: agent,
-      startupCommandDelivery: startupPlan.startupCommandDelivery
+      startupCommandDelivery: startupPlan.startupCommandDelivery,
+      // A bare command the user typed stays out of launch accounting, as before.
+      ...(opts.startupAgent ? { telemetry: agentStartedTelemetry(agent, opts.launchSource) } : {})
     }
   }
 }
diff --git a/src/main/runtime/orca-runtime-restore-live-paired-renderer-session-owned-mobile-terminals.ts b/src/main/runtime/orca-runtime-restore-live-paired-renderer-session-owned-mobile-terminals.ts
index bfab8f0ba9a8..8e9ad65dc328 100644
--- a/src/main/runtime/orca-runtime-restore-live-paired-renderer-session-owned-mobile-terminals.ts
+++ b/src/main/runtime/orca-runtime-restore-live-paired-renderer-session-owned-mobile-terminals.ts
@@ -123,9 +123,9 @@ export class OrcaRuntimeWithRestoreLivePairedRendererSessionOwnedMobileTerminals
     if (!pty || this.terminalSpawnCommandsByPtyId.has(pty.ptyId)) {
       return
     }
-    if (this.ptyController?.write(pty.ptyId, command)) {
+    if (this.ptyController?.write(pty.ptyId, command, 'launch')) {
       // Why: Enter rides its own write so a long command cannot swallow it.
-      this.ptyController.write(pty.ptyId, '\r')
+      this.ptyController.write(pty.ptyId, '\r', 'launch')
       this.noteTerminalSpawnCommand(pty.ptyId, command)
     }
   }
diff --git a/src/main/runtime/orca-runtime-runtime-id.ts b/src/main/runtime/orca-runtime-runtime-id.ts
index 48d935f43967..842ac1380358 100644
--- a/src/main/runtime/orca-runtime-runtime-id.ts
+++ b/src/main/runtime/orca-runtime-runtime-id.ts
@@ -45,6 +45,10 @@ import { MailPointerRepointScheduler } from './orchestration/mail-pointer-repoin
 import { RuntimeTerminalWaiterRegistry } from './runtime-terminal-waiter-registry'
 import { RuntimeTerminalWriter } from './runtime-terminal-writer'
 import { RuntimeTerminalIdlePolls } from './runtime-terminal-idle-polls'
+import { TerminalIntentionalStops } from './terminal-intentional-stops'
+import { TerminalRunFactsRegister, type TerminalSpawnCommit } from './terminal-run-facts'
+import type { TuiIdleEvidenceSource } from './tui-idle-evidence'
+import { hasTerminalCommandPainted } from './terminal-command-paint'
 import {
   TUI_IDLE_DEFAULT_TIMEOUT_MS,
   TUI_IDLE_POLL_INTERVAL_MS,
@@ -240,9 +244,16 @@ export class OrcaRuntimeWithRuntimeId {
 
   protected pendingPtyRegistrationIncarnations = new Map<string, PtyIncarnationId | null>()
 
-  // Why: exact-stop is the current sleep transaction boundary; its exit must
-  // leave the renderer's intentional sleeping surface available for wake.
-  protected intentionalHandlelessPtyStops = new Map<string, string | null>()
+  // Why public: the PTY IPC layer's stop paths write it and its exit delivery reads it.
+  readonly intentionalPtyStops = new TerminalIntentionalStops()
+
+  readonly terminalRunFacts = new TerminalRunFactsRegister()
+
+  /** Both spawn-commit funnels report each committed process here, once. */
+  noteTerminalSpawnCommit(commit: TerminalSpawnCommit, expectedSourceBinding?: unknown): void {
+    this.terminalRunFacts.recordSpawnCommit(commit, expectedSourceBinding)
+    this.intentionalPtyStops.noteSpawnCommit(commit.id)
+  }
 
   // Why: coalesces title/status-driven session.tabs emits so spinner churn
   // doesn't fan out (and per-client JSON.stringify) a snapshot several times a
@@ -329,35 +340,47 @@ export class OrcaRuntimeWithRuntimeId {
   protected readonly terminalWaiters = new RuntimeTerminalWaiterRegistry()
 
   protected readonly terminalWriter = new RuntimeTerminalWriter(
-    (ptyId, data) => this.ptyController?.write(ptyId, data) ?? false,
+    (ptyId, data, inputKind) => this.ptyController?.write(ptyId, data, inputKind) ?? false,
     (ptyId) => this.getPtyWriteHostPlatform(ptyId),
     (ptyId) => this.getPtyAgent(ptyId)
   )
 
-  protected readonly terminalIdlePolls = new RuntimeTerminalIdlePolls({
-    intervalMs: TUI_IDLE_POLL_INTERVAL_MS,
+  // Why one source: every tui-idle site must read the same evidence, or they rank one pane differently.
+  protected readonly tuiIdleEvidenceSource: TuiIdleEvidenceSource = {
     quiescenceMs: TUI_IDLE_QUIESCENCE_MS,
     getTabTitle: (tabId) => this.tabs.get(tabId)?.title ?? null,
-    getForegroundProcess: (ptyId) => this.ptyController?.getForegroundProcess(ptyId) ?? null,
     getAdoptedPtyIdleStatus: (pty) => this.getAdoptedPtyExplicitIdleStatus(pty),
     getPaneAgent: (ptyId) => this.getPaneAgentForTuiIdle(ptyId),
     getFirstPartyAgentStatus: (ptyId) =>
       (ptyId ? this.ptysById.get(ptyId)?.lastExplicitAgentStatus : null) ?? null,
+    readScreenLines: (ptyId) => this.readLiveTerminalScreenLines(ptyId)
+  }
+
+  protected readonly terminalIdlePolls = new RuntimeTerminalIdlePolls({
+    ...this.tuiIdleEvidenceSource,
+    intervalMs: TUI_IDLE_POLL_INTERVAL_MS,
+    getForegroundProcess: (ptyId) => this.ptyController?.getForegroundProcess(ptyId) ?? null,
+    hasCommandPainted: (ptyId) => {
+      const pty = this.ptysById.get(ptyId)
+      return pty === undefined || hasTerminalCommandPainted(pty)
+    },
+    // Why the runtime's own emulator: a provider snapshot would be a host round trip per tick.
+    readVisibleScreen: (ptyId) =>
+      this.headlessTerminals.has(ptyId)
+        ? this.readHeadlessVisibleTerminalState(ptyId).then(
+            (screen) => screen?.lines.join('\n') ?? null
+          )
+        : null,
     getLiveLeaf: (leaf) => this.leaves.get(this.getLeafKey(leaf.tabId, leaf.leafId)) ?? leaf,
     resolve: (waiter, result) => this.terminalWaiters.resolve(waiter, result)
   })
 
   protected readonly terminalWait = new RuntimeTerminalWaitController(
     {
+      ...this.tuiIdleEvidenceSource,
       defaultTimeoutMs: TUI_IDLE_DEFAULT_TIMEOUT_MS,
       getLivePty: (handle) => this.getLivePtyForHandle(handle),
       getLiveLeaf: (handle) => this.getLiveLeafForHandle(handle),
-      getAdoptedPtyIdleStatus: (pty) => this.getAdoptedPtyExplicitIdleStatus(pty),
-      getTabTitle: (tabId) => this.tabs.get(tabId)?.title ?? null,
-      quiescenceMs: TUI_IDLE_QUIESCENCE_MS,
-      getPaneAgent: (ptyId) => this.getPaneAgentForTuiIdle(ptyId),
-      getFirstPartyAgentStatus: (ptyId) =>
-        (ptyId ? this.ptysById.get(ptyId)?.lastExplicitAgentStatus : null) ?? null,
       startVisibleReadProbe: (waiter, waiterTimeoutMs, agent) =>
         this.startTuiIdleVisibleReadProbe(waiter, waiterTimeoutMs, agent)
     },
diff --git a/src/main/runtime/orca-runtime-serialize-main-terminal-buffer.ts b/src/main/runtime/orca-runtime-serialize-main-terminal-buffer.ts
index 7994f7d8857d..53a9b4ffc59c 100644
--- a/src/main/runtime/orca-runtime-serialize-main-terminal-buffer.ts
+++ b/src/main/runtime/orca-runtime-serialize-main-terminal-buffer.ts
@@ -80,6 +80,16 @@ export class OrcaRuntimeWithSerializeMainTerminalBuffer extends OrcaRuntimeWithA
     return { handle, cleared: true }
   }
 
+  async resetTerminalInputModes(handle: string): Promise<{ handle: string; reset: boolean }> {
+    const leaf = this.resolveLeafForHandle(handle)
+    if (!leaf?.ptyId) {
+      throw new Error('terminal_not_found')
+    }
+    await this.ptyController?.resetInputModes?.(leaf.ptyId)
+    await this.resetHeadlessTerminalInputModes(leaf.ptyId)
+    return { handle, reset: true }
+  }
+
   getTerminalSize(ptyId: string): { cols: number; rows: number } | null {
     return this.ptyController?.getSize?.(ptyId) ?? null
   }
diff --git a/src/main/runtime/orca-runtime-sleep-resolved-worktree-terminals.ts b/src/main/runtime/orca-runtime-sleep-resolved-worktree-terminals.ts
index 7d3645473bc7..0f0a856bda24 100644
--- a/src/main/runtime/orca-runtime-sleep-resolved-worktree-terminals.ts
+++ b/src/main/runtime/orca-runtime-sleep-resolved-worktree-terminals.ts
@@ -64,7 +64,7 @@ export class OrcaRuntimeWithSleepResolvedWorktreeTerminals extends OrcaRuntimeWi
     const pendingPtyIds = new Set<string>()
     let generation = 0
     let fullyCommitted = false
-    let releaseReversibleRendererStops = (): void => {}
+    const settleReversibleStops = new Map<string, (stopped: boolean) => void>()
     try {
       const resolvedWorktrees = includeTargetResolvedWorktree(
         [...(await this.getResolvedWorktreeMap()).values()],
@@ -148,16 +148,25 @@ export class OrcaRuntimeWithSleepResolvedWorktreeTerminals extends OrcaRuntimeWi
       const stopAndWait = ptyController.stopAndWait.bind(ptyController)
 
       const orderedLivePtyIds = [...livePtyIds].sort()
-      releaseReversibleRendererStops =
-        ptyController.markReversibleStops?.(orderedLivePtyIds) ?? (() => {})
-      const stopResults = await Promise.allSettled(
-        orderedLivePtyIds.map(async (ptyId) => ({
+      for (const ptyId of orderedLivePtyIds) {
+        settleReversibleStops.set(
           ptyId,
-          stopped: await stopAndWait(ptyId, {
+          this.intentionalPtyStops.mark(
+            ptyId,
+            'reversible',
+            this.ptysById.get(ptyId)?.incarnationId ?? null
+          )
+        )
+      }
+      const stopResults = await Promise.allSettled(
+        orderedLivePtyIds.map(async (ptyId) => {
+          const stopped = await stopAndWait(ptyId, {
             keepHistory: true,
             deadlineMs: teardownRpcDeadline(sleepDeadline)
           })
-        }))
+          settleReversibleStops.get(ptyId)?.(stopped)
+          return { ptyId, stopped }
+        })
       )
       const successfulStopPtyIds = orderedLivePtyIds.filter((_, index) => {
         const result = stopResults[index]
@@ -251,7 +260,9 @@ export class OrcaRuntimeWithSleepResolvedWorktreeTerminals extends OrcaRuntimeWi
         postStopVerified: true
       }
     } finally {
-      releaseReversibleRendererStops()
+      for (const settleStop of settleReversibleStops.values()) {
+        settleStop(false)
+      }
       if (!fullyCommitted && generation > 0) {
         const cancelledPtyIds = [...pendingPtyIds].sort()
         if (cancelledPtyIds.length > 0) {
diff --git a/src/main/runtime/orca-runtime-start-tui-idle-visible-read-probe.ts b/src/main/runtime/orca-runtime-start-tui-idle-visible-read-probe.ts
index aa7c984f7952..50522893adda 100644
--- a/src/main/runtime/orca-runtime-start-tui-idle-visible-read-probe.ts
+++ b/src/main/runtime/orca-runtime-start-tui-idle-visible-read-probe.ts
@@ -11,7 +11,7 @@ import {
 import { withTimeout } from './runtime-async-boundaries'
 import {
   detectTerminalWaitBlockedReason,
-  isKnownReadyPromptPreview,
+  isKnownReadyPromptSettled,
   tuiIdleNeedsVisibleScreenProbe
 } from './terminal-wait-detection'
 import type {
@@ -89,7 +89,7 @@ export class OrcaRuntimeWithStartTuiIdleVisibleReadProbe extends OrcaRuntimeWith
         const ready =
           agent === 'antigravity'
             ? isAntigravityReadyPromptSnapshot(snapshotText)
-            : isKnownReadyPromptPreview(snapshotText)
+            : isKnownReadyPromptSettled(snapshotText)
         if (!blockedReason && !ready) {
           this.rearmTuiIdleVisibleReadProbe(waiter, deadlineMs, agent)
           return
diff --git a/src/main/runtime/orca-runtime-stop-exact-terminals-for-worktree.ts b/src/main/runtime/orca-runtime-stop-exact-terminals-for-worktree.ts
index a96ae64e5966..d854be6ec682 100644
--- a/src/main/runtime/orca-runtime-stop-exact-terminals-for-worktree.ts
+++ b/src/main/runtime/orca-runtime-stop-exact-terminals-for-worktree.ts
@@ -47,18 +47,22 @@ export class OrcaRuntimeWithStopExactTerminalsForWorktree extends OrcaRuntimeWit
 
     const stoppedPtyIds: string[] = []
     for (const ptyId of [...expected].sort()) {
-      if (opts.keepHistory) {
-        this.intentionalHandlelessPtyStops.set(
-          ptyId,
-          this.ptysById.get(ptyId)?.incarnationId ?? null
-        )
-      }
+      // Why: exact-stop is the sleep transaction boundary; its exit must leave the sleeping surface for wake.
+      const settleStop = opts.keepHistory
+        ? this.intentionalPtyStops.mark(
+            ptyId,
+            'reversible',
+            this.ptysById.get(ptyId)?.incarnationId ?? null
+          )
+        : null
+      let stopped = false
       try {
-        if (!(await this.ptyController.stopAndWait(ptyId, { keepHistory: opts.keepHistory }))) {
-          throw Object.assign(new Error('terminal_exact_stop_failed'), { ptyId })
-        }
+        stopped = await this.ptyController.stopAndWait(ptyId, { keepHistory: opts.keepHistory })
       } finally {
-        this.intentionalHandlelessPtyStops.delete(ptyId)
+        settleStop?.(stopped)
+      }
+      if (!stopped) {
+        throw Object.assign(new Error('terminal_exact_stop_failed'), { ptyId })
       }
       stoppedPtyIds.push(ptyId)
     }
diff --git a/src/main/runtime/orca-runtime-stop-explicitly-closed-tab-ptys.ts b/src/main/runtime/orca-runtime-stop-explicitly-closed-tab-ptys.ts
index 196845d09ef9..a243d5ea0a6d 100644
--- a/src/main/runtime/orca-runtime-stop-explicitly-closed-tab-ptys.ts
+++ b/src/main/runtime/orca-runtime-stop-explicitly-closed-tab-ptys.ts
@@ -3,20 +3,26 @@ import { OrcaRuntimeWithFocusTerminal } from './orca-runtime-focus-terminal'
 import { EXPLICIT_TERMINAL_CLOSE_STOP_TIMEOUT_MS } from './orca-runtime-core'
 import { SSH_PROVIDER_UNREGISTERED_REASON } from '../../shared/pty-liveness-verdict'
 import type { RuntimeTerminalClose } from '../../shared/runtime-types'
-import { countTerminalLayoutLeaves } from './headless-terminal-split-layout'
 import type { RuntimePtyTabCloseAuthority } from './runtime-terminal-state-records'
+import { parsePaneKey } from '../../shared/stable-pane-id'
+
+/** How an explicit close's stop of its addressed PTY ended. */
+type ExplicitCloseStop = { stopped: boolean; pendingKillRecorded: boolean }
+
+const NO_STOP: ExplicitCloseStop = { stopped: false, pendingKillRecorded: false }
 
 export class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRuntimeWithFocusTerminal {
   protected async stopExplicitlyClosedTabPtys(
     ptyIds: readonly string[],
     addressedPtyId: string
-  ): Promise<boolean> {
-    let addressedPtyStopped = false
+  ): Promise<ExplicitCloseStop> {
+    let addressedPtyStop = NO_STOP
     const deadlineMs = Date.now() + EXPLICIT_TERMINAL_CLOSE_STOP_TIMEOUT_MS
     for (const ptyId of ptyIds) {
       this.markPtyStopRequested(ptyId)
       const expectedIncarnationId = this.ptysById.get(ptyId)?.incarnationId
       let stopped = false
+      let pendingKillRecorded = false
       if (this.ptyController?.stopAndWait) {
         try {
           stopped = await this.ptyController.stopAndWait(ptyId, { deadlineMs })
@@ -41,6 +47,8 @@ export class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRuntimeWithF
             verdict?.status === 'unverifiable' &&
             verdict.reason === SSH_PROVIDER_UNREGISTERED_REASON
           if (!providerAlreadyRetiredPty) {
+            // Why before the kill: its own failure is recorded only once its RPC settles.
+            pendingKillRecorded = this.ptyController.recordUnconfirmedStop?.(ptyId) === true
             this.ptyController.kill(ptyId)
             if (!verdict || verdict.status === 'live') {
               this.markPtyLivenessUnverifiable(
@@ -54,35 +62,35 @@ export class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRuntimeWithF
         stopped = this.ptyController?.kill(ptyId) ?? false
       }
       if (ptyId === addressedPtyId) {
-        addressedPtyStopped = stopped
+        addressedPtyStop = { stopped, pendingKillRecorded }
       }
     }
-    return addressedPtyStopped
+    return addressedPtyStop
   }
 
   protected describeTerminalClose(
     handle: string,
     tabId: string,
     ptyId: string | null,
-    ptyKilled: boolean
+    stop: ExplicitCloseStop
   ): RuntimeTerminalClose {
-    if (ptyKilled || !ptyId) {
-      return { handle, tabId, ptyKilled }
+    const close: RuntimeTerminalClose = {
+      handle,
+      tabId,
+      ptyKilled: stop.stopped,
+      ...(stop.pendingKillRecorded ? { pendingKillRecorded: true as const } : {})
+    }
+    if (stop.stopped || !ptyId) {
+      return close
     }
     const verdict = this.getPtyLivenessVerdict(ptyId)
     if (verdict?.status === 'unverifiable') {
-      return {
-        handle,
-        tabId,
-        ptyKilled,
-        ptyStopVerdict: 'unverifiable',
-        ptyStopReason: verdict.reason
-      }
+      return { ...close, ptyStopVerdict: 'unverifiable', ptyStopReason: verdict.reason }
     }
     if (verdict?.status === 'live') {
-      return { handle, tabId, ptyKilled, ptyStopVerdict: 'live' }
+      return { ...close, ptyStopVerdict: 'live' }
     }
-    return { handle, tabId, ptyKilled }
+    return close
   }
 
   async closeTerminal(handle: string): Promise<RuntimeTerminalClose> {
@@ -106,11 +114,13 @@ export class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRuntimeWithF
           ? spawnSurface
           : null)
       const tabId = surface?.tab.parentTabId ?? pty.pty.tabId ?? pty.record.tabId
-      // Why: relay recovery can leave stale renderer leaves; the persisted HUB layout defines whether closing this PTY closes the whole surface.
-      const siblingCount = surface?.tab.parentLayout
-        ? countTerminalLayoutLeaves(surface.tab.parentLayout.root)
-        : this.countLeavesInTab(tabId)
-      if (siblingCount <= 1 && surface && this.tabs.has(tabId) && this.notifier?.closeTerminalTab) {
+      const leafId = surface?.tab.leafId ?? parsePaneKey(pty.pty.paneKey ?? '')?.leafId
+      const paneTarget = leafId ? { kind: 'pane' as const, tabId, leafId } : null
+      // Why: a PTY with no pane identity cannot be placed in any tab's layout, so it closes nothing.
+      const closesTab =
+        paneTarget !== null &&
+        this.resolveTerminalCloseTarget(pty.pty.worktreeId, paneTarget) === 'last-pane'
+      if (closesTab && surface && this.tabs.has(tabId) && this.notifier?.closeTerminalTab) {
         const ptyIdsToKill = this.getPtyIdsForExplicitTabClose(pty.pty.worktreeId, tabId)
         try {
           await this.closeMobileSessionTab(`id:${pty.pty.worktreeId}`, tabId, {
@@ -122,15 +132,10 @@ export class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRuntimeWithF
           }
           this.notifier.closeTerminal?.(tabId)
         }
-        const ptyKilled = await this.stopExplicitlyClosedTabPtys(ptyIdsToKill, pty.pty.ptyId)
-        return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, ptyKilled)
+        const stop = await this.stopExplicitlyClosedTabPtys(ptyIdsToKill, pty.pty.ptyId)
+        return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
       }
-      if (
-        siblingCount <= 1 &&
-        surface &&
-        ptyCloseAuthority &&
-        !this.tabs.has(surface.tab.parentTabId)
-      ) {
+      if (closesTab && surface && ptyCloseAuthority && !this.tabs.has(surface.tab.parentTabId)) {
         try {
           await this.closeMobileSessionTab(`id:${pty.pty.worktreeId}`, tabId, {
             reason: 'user',
@@ -141,59 +146,64 @@ export class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRuntimeWithF
           if (!(error instanceof Error) || error.message !== 'workspace_session_unavailable') {
             throw error
           }
-          const ptyKilled = await this.stopExplicitlyClosedTabPtys([pty.pty.ptyId], pty.pty.ptyId)
+          const stop = await this.stopExplicitlyClosedTabPtys([pty.pty.ptyId], pty.pty.ptyId)
           this.notifier?.closeTerminal(tabId)
-          return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, ptyKilled)
+          return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
         }
-        const ptyKilled = await this.stopExplicitlyClosedTabPtys([pty.pty.ptyId], pty.pty.ptyId)
-        return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, ptyKilled)
+        const stop = await this.stopExplicitlyClosedTabPtys([pty.pty.ptyId], pty.pty.ptyId)
+        return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
       }
-      if (siblingCount <= 1 && !surface && pty.pty.tabId && this.notifier?.closeTerminalTab) {
+      if (closesTab && !surface && pty.pty.tabId && this.notifier?.closeTerminalTab) {
         const ptyIdsToKill = this.getPtyIdsForExplicitTabClose(pty.pty.worktreeId, tabId)
         await this.notifier.closeTerminalTab(tabId, { localPtyTeardownOwnedExternally: true })
-        const ptyKilled = await this.stopExplicitlyClosedTabPtys(ptyIdsToKill, pty.pty.ptyId)
-        return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, ptyKilled)
+        const stop = await this.stopExplicitlyClosedTabPtys(ptyIdsToKill, pty.pty.ptyId)
+        return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
       }
-      const ptyKilled = await this.stopExplicitlyClosedTabPtys([pty.pty.ptyId], pty.pty.ptyId)
-      if (!ptyKilled || siblingCount <= 1) {
-        if (surface) {
-          // Why: paired viewers keep ended streams mounted until the HUB publishes removal, so explicit close uses the durable host-tab transaction instead of viewer-local exit handling.
-          try {
-            await this.closeMobileSessionTab(`id:${pty.pty.worktreeId}`, tabId, {
-              localPtyTeardownOwnedExternally: true
-            })
-          } catch (error) {
-            if (!(error instanceof Error) || error.message !== 'workspace_session_unavailable') {
-              throw error
-            }
-            this.notifier?.closeTerminal(tabId)
+      const stop = await this.stopExplicitlyClosedTabPtys([pty.pty.ptyId], pty.pty.ptyId)
+      if (!closesTab) {
+        // Why: the pane's removal is this close's own commit, not a side effect of its exit. An
+        // unconfirmed stop is unverifiable, never a reason to close the live siblings with it.
+        if (paneTarget) {
+          await this.closeTerminalPane(pty.pty.worktreeId, paneTarget)
+        }
+      } else if (surface) {
+        // Why: paired viewers keep ended streams mounted until the HUB publishes removal, so explicit close uses the durable host-tab transaction instead of viewer-local exit handling.
+        try {
+          await this.closeMobileSessionTab(`id:${pty.pty.worktreeId}`, tabId, {
+            localPtyTeardownOwnedExternally: true
+          })
+        } catch (error) {
+          if (!(error instanceof Error) || error.message !== 'workspace_session_unavailable') {
+            throw error
           }
-        } else {
           this.notifier?.closeTerminal(tabId)
         }
+      } else {
+        this.notifier?.closeTerminal(tabId)
       }
-      return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, ptyKilled)
+      return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
     }
     this.assertGraphReady()
     const { leaf } = this.getLiveLeafForHandle(handle)
-    // Why: in a multi-pane tab, killing the PTY is enough (renderer's exit handler closes the pane); an extra IPC close would race it and close the whole tab.
-    const siblingCount = this.countLeavesInTab(leaf.tabId)
-    const ptyIdsToKill =
-      siblingCount <= 1
-        ? this.getPtyIdsForExplicitTabClose(leaf.worktreeId, leaf.tabId)
-        : leaf.ptyId
-          ? [leaf.ptyId]
-          : []
-    if (siblingCount <= 1 && this.notifier?.closeTerminalTab) {
+    const paneTarget = { kind: 'pane' as const, tabId: leaf.tabId, leafId: leaf.leafId }
+    const closesTab = this.resolveTerminalCloseTarget(leaf.worktreeId, paneTarget) === 'last-pane'
+    const ptyIdsToKill = closesTab
+      ? this.getPtyIdsForExplicitTabClose(leaf.worktreeId, leaf.tabId)
+      : leaf.ptyId
+        ? [leaf.ptyId]
+        : []
+    if (closesTab && this.notifier?.closeTerminalTab) {
       await this.notifier.closeTerminalTab(leaf.tabId, { localPtyTeardownOwnedExternally: true })
     }
-    const ptyKilled = leaf.ptyId
+    const stop = leaf.ptyId
       ? await this.stopExplicitlyClosedTabPtys(ptyIdsToKill, leaf.ptyId)
-      : false
-    if (siblingCount > 1 ? !ptyKilled : !this.notifier?.closeTerminalTab) {
-      this.notifier?.closeTerminal(leaf.tabId, leaf.paneRuntimeId)
+      : NO_STOP
+    if (!closesTab) {
+      await this.closeTerminalPane(leaf.worktreeId, paneTarget)
+    } else if (!this.notifier?.closeTerminalTab) {
+      this.notifier?.closeTerminal(leaf.tabId)
     }
-    return this.describeTerminalClose(handle, leaf.tabId, leaf.ptyId ?? null, ptyKilled)
+    return this.describeTerminalClose(handle, leaf.tabId, leaf.ptyId ?? null, stop)
   }
 
   async closeTerminalTab(handle: string): Promise<RuntimeTerminalClose> {
diff --git a/src/main/runtime/orca-runtime-stop-requested-pty-ids.ts b/src/main/runtime/orca-runtime-stop-requested-pty-ids.ts
index 4989245fdf6a..a7175383df0d 100644
--- a/src/main/runtime/orca-runtime-stop-requested-pty-ids.ts
+++ b/src/main/runtime/orca-runtime-stop-requested-pty-ids.ts
@@ -1,6 +1,7 @@
 // @ts-nocheck -- mechanically split from OrcaRuntimeService; behavior is covered by AST equivalence and characterization tests.
 import { OrchestrationStructuredMailboxPointerDelivery } from './orchestration/structured-mailbox-pointer-delivery'
 import { createStructuredMailboxPointerHost } from './orchestration/structured-mailbox-pointer-host'
+import { localOrchestrationCliCommand } from './orchestration/cli-command'
 import { isStructuredWorkerHandle } from './structured-worker-identity'
 import { resolveStructuredWorkerAuthority } from './structured-worker-authority'
 import { OrcaRuntimeWithRuntimeId } from './orca-runtime-runtime-id'
@@ -221,6 +222,7 @@ export class OrcaRuntimeWithStopRequestedPtyIds extends OrcaRuntimeWithRuntimeId
       getMessageWaiters: (mailboxHandle) => this.messageWaiters.get(mailboxHandle),
       resolveStructuredTarget: (mailboxHandle) =>
         this.resolveStructuredMailboxTarget(mailboxHandle),
+      getCliCommand: localOrchestrationCliCommand,
       host: createStructuredMailboxPointerHost()
     })
 
diff --git a/src/main/runtime/orca-runtime-structured-session-restore.test.ts b/src/main/runtime/orca-runtime-structured-session-restore.test.ts
index d6ec1e22782c..1d8105d07f81 100644
--- a/src/main/runtime/orca-runtime-structured-session-restore.test.ts
+++ b/src/main/runtime/orca-runtime-structured-session-restore.test.ts
@@ -307,10 +307,7 @@ describe('structured session cold restoration', () => {
       reason: 'user'
     })
 
-    expect(closeSessionTab).toHaveBeenCalledWith(
-      'structured-agent-session-restored-session',
-      'workspace-1'
-    )
+    expect(closeSessionTab).toHaveBeenCalledWith('agent-session:restored-session', 'workspace-1')
     expect(closeStructuredSession).toHaveBeenCalledWith('restored-session')
     expect(setSessionTabVisibility).toHaveBeenCalledWith('restored-session', false)
     expect(setSessionTabVisibility.mock.invocationCallOrder[0]).toBeLessThan(
diff --git a/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts b/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
index ef24301c7cf5..5e100dd4dbd0 100644
--- a/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
+++ b/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
@@ -72,25 +72,27 @@ describe('terminal close and handle incarnation continuity', () => {
     unsubscribe()
   })
 
-  it('publishes no retirement or absence when the durable headless close fails', async () => {
+  it('still kills and keeps the removal when the durable headless close fails to flush', async () => {
     const harness = await createStaleTabCloseHarness({ headless: true })
-    const published = vi.fn()
-    const unsubscribe = harness.runtime.onMobileSessionTabsChanged(published)
+    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined)
     harness.rejectPersistenceFlush(new Error('disk-full'))
 
-    await expect(harness.runtime.closeTerminalTab(harness.terminal.handle)).rejects.toThrow(
-      'disk-full'
-    )
+    await expect(harness.runtime.closeTerminalTab(harness.terminal.handle)).resolves.toMatchObject({
+      tabId: TAB_ID,
+      closeMode: 'tab'
+    })
 
-    expect(harness.kill).not.toHaveBeenCalled()
-    expect(published).not.toHaveBeenCalled()
-    expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toHaveLength(1)
+    // Why: a failed flush is bookkeeping; the user's close still stops its process and the
+    // in-memory removal stays for the next flush to write.
+    expect(harness.kill).toHaveBeenCalledWith(RUNTIME_OWNED_PTY_ID)
+    expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
     const snapshot = await harness.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
-    expect(snapshot).toMatchObject({
-      tabs: [expect.objectContaining({ parentTabId: TAB_ID, leafId: LEAF_ID })]
-    })
-    expect(snapshot.retiredTerminalSurfaces).toBeUndefined()
-    unsubscribe()
+    expect(snapshot.tabs).toEqual([])
+    expect(errorSpy).toHaveBeenCalledWith(
+      '[runtime] failed to persist terminal close:',
+      expect.any(Error)
+    )
+    errorSpy.mockRestore()
   })
 
   it('publishes each split leaf retirement with its own terminal handle', async () => {
@@ -366,6 +368,36 @@ describe('terminal close and handle incarnation continuity', () => {
     expect(harness.kill).toHaveBeenCalledWith(PTY_ID)
   })
 
+  it.each([true, false])(
+    'promises a retry only when the stop recorded a replayable kill (recorded: %s)',
+    async (recorded) => {
+      const harness = createHarness()
+      const [{ handle }] = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals
+      harness.setVerifiedStopResult(false)
+      const recordUnconfirmedStop = vi.fn(() => {
+        // The order must exist before the follow-up kill, whose own failure lands only later.
+        expect(harness.kill).not.toHaveBeenCalled()
+        return recorded
+      })
+      const controller = harness.runtime['ptyController']
+      if (!controller) {
+        throw new Error('fixture has no PTY controller')
+      }
+      Object.assign(controller, { recordUnconfirmedStop })
+
+      const closing = harness.runtime.closeTerminal(handle)
+      await vi.waitFor(() => expect(harness.closeTerminalTab).toHaveBeenCalled())
+      harness.retirePersistedTab()
+      harness.acknowledged.resolve()
+
+      const close = await closing
+      expect(recordUnconfirmedStop).toHaveBeenCalledWith(PTY_ID)
+      expect(harness.kill).toHaveBeenCalledWith(PTY_ID)
+      expect(close.ptyStopVerdict).toBe('unverifiable')
+      expect(close.pendingKillRecorded).toBe(recorded ? true : undefined)
+    }
+  )
+
   it('leaves a confirmed kill receipt free of any stop verdict', async () => {
     const harness = createHarness()
     const [{ handle }] = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals
diff --git a/src/main/runtime/orca-runtime-terminal-close-no-widening.test.ts b/src/main/runtime/orca-runtime-terminal-close-no-widening.test.ts
new file mode 100644
index 000000000000..1b98c67b8be1
--- /dev/null
+++ b/src/main/runtime/orca-runtime-terminal-close-no-widening.test.ts
@@ -0,0 +1,335 @@
+import { describe, expect, it } from 'vitest'
+import {
+  LEAF_ID,
+  PTY_ID,
+  SIBLING_LEAF_ID,
+  SIBLING_PTY_ID,
+  TAB_ID,
+  WORKTREE_ID,
+  createHarness,
+  type CloseContinuityHarness
+} from './__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
+import { retireTerminalSurfaceFromPersistence } from './mobile-session-terminal-persistence-retirement'
+
+const emptyLayout = { root: null, activeLeafId: null, expandedLeafId: null }
+
+/**
+ * Every explicit close of one pane, from every entry point, under every condition that has ever
+ * widened one into a whole-tab close: the live sibling survives and no tab-level close goes out.
+ */
+
+type Entry = 'renderer' | 'cli-graph' | 'cli-pty' | 'phone-desktop' | 'phone-headless'
+type Condition =
+  | 'normal'
+  | 'stop-unconfirmed'
+  | 'stop-throws'
+  | 'leaf-already-retired'
+  | 'unbound-sibling'
+  | 'pinned'
+  | 'no-saved-layout'
+  | 'no-live-pty'
+  | 'kill-fails'
+  | 'nothing-published'
+
+/** The desktop renderer's split tab as it publishes it, with the given PTY bindings. */
+function syncRendererSplit(
+  harness: CloseContinuityHarness,
+  ptyIdsByLeafId: Record<string, string>,
+  livePtyIdsByLeafId = ptyIdsByLeafId
+): void {
+  const parentLayout = {
+    root: {
+      type: 'split' as const,
+      direction: 'horizontal' as const,
+      first: { type: 'leaf' as const, leafId: LEAF_ID },
+      second: { type: 'leaf' as const, leafId: SIBLING_LEAF_ID }
+    },
+    activeLeafId: LEAF_ID,
+    expandedLeafId: null,
+    ptyIdsByLeafId
+  }
+  const leaves = [LEAF_ID, SIBLING_LEAF_ID].map((leafId, index) => ({
+    tabId: TAB_ID,
+    worktreeId: WORKTREE_ID,
+    leafId,
+    paneRuntimeId: 7 + index,
+    ptyId: livePtyIdsByLeafId[leafId] ?? null
+  }))
+  harness.runtime.syncWindowGraph(1, {
+    tabs: [
+      {
+        tabId: TAB_ID,
+        worktreeId: WORKTREE_ID,
+        title: 'Fixture shell',
+        activeLeafId: LEAF_ID,
+        layout: parentLayout.root
+      }
+    ],
+    leaves,
+    mobileSessionTabs: [
+      {
+        worktree: WORKTREE_ID,
+        publicationEpoch: 'renderer:unbound-pane',
+        snapshotVersion: 3,
+        activeGroupId: null,
+        activeTabId: `${TAB_ID}::${LEAF_ID}`,
+        activeTabType: 'terminal' as const,
+        tabs: leaves.map((leaf) => ({
+          type: 'terminal' as const,
+          id: `${TAB_ID}::${leaf.leafId}`,
+          parentTabId: TAB_ID,
+          leafId: leaf.leafId,
+          ...(ptyIdsByLeafId[leaf.leafId] ? { ptyId: ptyIdsByLeafId[leaf.leafId] } : {}),
+          title: 'Fixture shell',
+          parentLayout,
+          isActive: leaf.leafId === LEAF_ID
+        }))
+      }
+    ]
+  })
+}
+
+function arrange(entry: Entry, condition: Condition): CloseContinuityHarness {
+  const usesPtyRecord = entry !== 'cli-graph' && entry !== 'renderer' && condition !== 'no-live-pty'
+  const harness = createHarness({ publishMobileSurface: true, registerPtyBacked: usesPtyRecord })
+  if (condition === 'unbound-sibling') {
+    // A pane the renderer just split: no PTY bound yet, so main's saved layout lacks it.
+    syncRendererSplit(harness, { [LEAF_ID]: PTY_ID })
+  } else {
+    harness.syncSplitFixtureGraph()
+  }
+  if (condition === 'no-live-pty') {
+    // The closed pane's process already exited, so main holds no record of its PTY.
+    syncRendererSplit(
+      harness,
+      { [LEAF_ID]: 'pty-exited', [SIBLING_LEAF_ID]: SIBLING_PTY_ID },
+      { [SIBLING_LEAF_ID]: SIBLING_PTY_ID }
+    )
+  }
+  if (entry === 'cli-pty') {
+    // Graph without the leaf: the handle resolves through the PTY, as for a runtime-owned pane.
+    harness.syncFixtureTabWithoutLeaf()
+  }
+  if (condition === 'nothing-published') {
+    // The renderer lists the tab before its panes register and before it publishes any row.
+    harness.runtime.syncWindowGraph(1, {
+      tabs: [
+        {
+          tabId: TAB_ID,
+          worktreeId: WORKTREE_ID,
+          title: 'Fixture shell',
+          activeLeafId: null,
+          layout: null
+        }
+      ],
+      leaves: [],
+      mobileSessionTabs: [
+        {
+          worktree: WORKTREE_ID,
+          publicationEpoch: 'renderer:nothing-published',
+          snapshotVersion: 4,
+          activeGroupId: null,
+          activeTabId: null,
+          activeTabType: null,
+          tabs: []
+        }
+      ]
+    })
+  }
+  if (condition === 'kill-fails') {
+    harness.kill.mockReturnValue(false)
+  }
+  if (condition === 'stop-unconfirmed') {
+    harness.setVerifiedStopResult(false)
+  } else if (condition === 'stop-throws') {
+    harness.setVerifiedStopResult(new Error('ssh_host_unreachable'))
+  } else {
+    harness.setVerifiedStopResult(true)
+  }
+  if (condition === 'leaf-already-retired') {
+    harness.editSession((session) =>
+      retireTerminalSurfaceFromPersistence(session, {
+        worktreeId: WORKTREE_ID,
+        parentTabId: TAB_ID,
+        leafId: LEAF_ID,
+        ptyId: PTY_ID
+      })
+    )
+  } else if (condition === 'pinned') {
+    harness.editSession((session) => ({
+      ...session,
+      tabsByWorktree: {
+        [WORKTREE_ID]: (session.tabsByWorktree[WORKTREE_ID] ?? []).map((tab) => ({
+          ...tab,
+          isPinned: true
+        }))
+      }
+    }))
+  } else if (condition === 'no-saved-layout') {
+    harness.editSession((session) => ({ ...session, terminalLayoutsByTabId: {} }))
+  }
+  // A renderer that honours a whole-tab close, so a widened close shows as the lost sibling.
+  harness.setCloseTerminalTabAction(() => harness.retirePersistedTab())
+  return harness
+}
+
+async function closePane(entry: Entry, harness: CloseContinuityHarness): Promise<void> {
+  if (entry === 'renderer') {
+    await harness.runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: WORKTREE_ID,
+      target: {
+        kind: 'pane',
+        tabId: TAB_ID,
+        leafId: LEAF_ID
+      }
+    })
+    return
+  }
+  if (entry === 'cli-graph' || entry === 'cli-pty') {
+    const terminal = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals.find(
+      (candidate) => candidate.ptyId === PTY_ID
+    )
+    if (!terminal) {
+      throw new Error('fixture pane has no terminal handle')
+    }
+    await harness.runtime.closeTerminal(terminal.handle)
+    return
+  }
+  if (entry === 'phone-headless') {
+    harness.runtime.setNotifier(null)
+    harness.syncEmptyGraph()
+  }
+  await harness.runtime.closeMobileSessionTab(`id:${WORKTREE_ID}`, `${TAB_ID}::${LEAF_ID}`, {
+    reason: 'user'
+  })
+}
+
+const rows: [Entry, Condition][] = [
+  // e.g. the exited-pane overlay's Close after main's exit handling retired that pane (fc5cac5c32).
+  ['renderer', 'leaf-already-retired'],
+  ['renderer', 'unbound-sibling'],
+  ['renderer', 'pinned'],
+  ['renderer', 'no-saved-layout'],
+  ['cli-graph', 'normal'],
+  ['cli-graph', 'stop-unconfirmed'],
+  ['cli-graph', 'leaf-already-retired'],
+  ['cli-graph', 'unbound-sibling'],
+  ['cli-pty', 'normal'],
+  // An unconfirmed stop once chose the tab close (bc8bbd7abf).
+  ['cli-pty', 'stop-unconfirmed'],
+  ['cli-pty', 'stop-throws'],
+  ['cli-pty', 'unbound-sibling'],
+  // An owner copy with no panes once read as "one pane", so the close took the whole tab.
+  ['cli-pty', 'nothing-published'],
+  ['phone-desktop', 'normal'],
+  ['phone-desktop', 'pinned'],
+  ['phone-desktop', 'unbound-sibling'],
+  ['phone-desktop', 'no-saved-layout'],
+  // A pane with no live process record once sent a tab-level close notice.
+  ['phone-desktop', 'no-live-pty'],
+  ['phone-desktop', 'kill-fails'],
+  // A host with no desktop window once closed the whole tab for one pane.
+  ['phone-headless', 'normal'],
+  ['phone-headless', 'kill-fails'],
+  ['phone-headless', 'leaf-already-retired'],
+  ['phone-headless', 'pinned'],
+  ['phone-headless', 'no-saved-layout']
+]
+
+describe('an explicit close of one pane never widens into its tab', () => {
+  it.each(rows)('%s close, %s', async (entry, condition) => {
+    const harness = arrange(entry, condition)
+    const siblingWasPersisted = Boolean(
+      harness.getSession().terminalLayoutsByTabId[TAB_ID]?.ptyIdsByLeafId?.[SIBLING_LEAF_ID]
+    )
+
+    await closePane(entry, harness)
+
+    const session = harness.getSession()
+    expect(session.tabsByWorktree[WORKTREE_ID]).toEqual([expect.objectContaining({ id: TAB_ID })])
+    if (siblingWasPersisted) {
+      expect(session.terminalLayoutsByTabId[TAB_ID]?.root).toEqual({
+        type: 'leaf',
+        leafId: SIBLING_LEAF_ID
+      })
+    }
+    expect(harness.closeTerminalTab).not.toHaveBeenCalled()
+    expect(harness.closeTerminal).not.toHaveBeenCalled()
+    expect(harness.kill).not.toHaveBeenCalledWith(SIBLING_PTY_ID)
+    if (entry === 'renderer') {
+      return
+    }
+    if (entry === 'phone-headless') {
+      const snapshot = await harness.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+      expect(snapshot.tabs.map((tab) => tab.id)).toEqual([`${TAB_ID}::${SIBLING_LEAF_ID}`])
+      expect(harness.kill).toHaveBeenCalledWith(PTY_ID)
+      return
+    }
+    expect(harness.closeTerminalPane).toHaveBeenCalledExactlyOnceWith(TAB_ID, LEAF_ID)
+  })
+})
+
+describe("a close of a tab's last pane still closes the tab", () => {
+  it('on a host with no desktop window, closes the whole tab in main and for paired clients', async () => {
+    const harness = createHarness({ publishMobileSurface: true, registerPtyBacked: true })
+    harness.runtime.setNotifier(null)
+    harness.syncEmptyGraph()
+
+    await harness.runtime.closeMobileSessionTab(`id:${WORKTREE_ID}`, `${TAB_ID}::${LEAF_ID}`, {
+      reason: 'user'
+    })
+
+    expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
+    expect((await harness.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).tabs).toEqual([])
+    expect(harness.kill).toHaveBeenCalledWith(PTY_ID)
+  })
+
+  it.each([
+    ['no saved layout', () => ({})],
+    ['a layout saved before its pane mounted', () => ({ [TAB_ID]: emptyLayout })]
+  ] as const)(
+    'on a host with no desktop window, closes an unsplit tab with %s',
+    async (_name, layouts) => {
+      const harness = createHarness({ publishMobileSurface: true, registerPtyBacked: true })
+      harness.runtime.setNotifier(null)
+      harness.syncEmptyGraph()
+      harness.editSession((session) => ({ ...session, terminalLayoutsByTabId: layouts() }))
+
+      await harness.runtime.closeMobileSessionTab(`id:${WORKTREE_ID}`, `${TAB_ID}::${LEAF_ID}`, {
+        reason: 'user'
+      })
+
+      expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
+      expect(harness.kill).toHaveBeenCalledWith(PTY_ID)
+    }
+  )
+
+  it('from the CLI by PTY, closes an unsplit tab whose renderer graph lists no panes yet', async () => {
+    const harness = createHarness({ publishMobileSurface: true, registerPtyBacked: true })
+    harness.syncFixtureTabWithoutLeaf()
+    harness.setVerifiedStopResult(true)
+    harness.setCloseTerminalTabAction(() => harness.retirePersistedTab())
+
+    await closePane('cli-pty', harness)
+
+    expect(harness.closeTerminalTab.mock.calls.map((call) => call[0])).toEqual([TAB_ID])
+    expect(harness.closeTerminalPane).not.toHaveBeenCalled()
+  })
+
+  it.each(['phone-desktop', 'cli-graph'] as const)(
+    'from %s, goes through the renderer tab close so its pin guard still runs',
+    async (entry) => {
+      const harness = createHarness({
+        publishMobileSurface: true,
+        registerPtyBacked: entry === 'phone-desktop'
+      })
+      harness.setVerifiedStopResult(true)
+      harness.setCloseTerminalTabAction(() => harness.retirePersistedTab())
+
+      await closePane(entry, harness)
+
+      expect(harness.closeTerminalTab.mock.calls.map((call) => call[0])).toEqual([TAB_ID])
+      expect(harness.closeTerminalPane).not.toHaveBeenCalled()
+    }
+  )
+})
diff --git a/src/main/runtime/orca-runtime-terminal-close-records.test.ts b/src/main/runtime/orca-runtime-terminal-close-records.test.ts
new file mode 100644
index 000000000000..f05ac78957ac
--- /dev/null
+++ b/src/main/runtime/orca-runtime-terminal-close-records.test.ts
@@ -0,0 +1,309 @@
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import { getDefaultWorkspaceSession } from '../../shared/constants'
+import {
+  CLOSED_TERMINAL_TAB_TOMBSTONE_TTL_MS,
+  MAX_CLOSED_TERMINAL_TAB_TOMBSTONES
+} from '../../shared/closed-terminal-tab-tombstones'
+import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
+import { Store } from '../persistence/loading-store/store'
+import { closeTestStores, createSqliteTestStore } from '../persistence-test-harness'
+import { OrcaRuntimeService } from './orca-runtime'
+import {
+  LEAF_ID,
+  REPO_ID,
+  TAB_ID,
+  WORKTREE_ID,
+  WORKTREE_PATH,
+  makeSession
+} from './__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
+import { advanceTerminalTopologyRevision } from './workspace-session-terminal-membership-authority'
+
+const SSH_REPO_ID = 'ssh-repo'
+const SSH_HOST_ID = 'ssh:target-1'
+const SSH_WORKTREE_ID = `${SSH_REPO_ID}::/srv/app`
+const LATE_TAB_ID = '6f0a5c8e-2b1d-4c3e-9f7a-1d2e3f4a5b6c'
+
+const directories: string[] = []
+afterEach(async () => {
+  await closeTestStores()
+  for (const directory of directories.splice(0)) {
+    rmSync(directory, { recursive: true, force: true })
+  }
+})
+
+function createPersistedRuntime(session: WorkspaceSessionState = makeSession()) {
+  const directory = mkdtempSync(join(tmpdir(), 'orca-close-records-'))
+  directories.push(directory)
+  const dataFile = join(directory, 'orca-data.json')
+  const store = createSqliteTestStore(Store, { dataFile })
+  store.addRepo({
+    id: REPO_ID,
+    path: WORKTREE_PATH,
+    displayName: 'Fixture',
+    badgeColor: 'gray',
+    addedAt: 1
+  })
+  store.addRepo({
+    id: SSH_REPO_ID,
+    path: '/srv/app',
+    displayName: 'Remote',
+    badgeColor: 'gray',
+    addedAt: 1,
+    connectionId: 'target-1'
+  })
+  store.setWorkspaceSession(advanceTerminalTopologyRevision(session, WORKTREE_ID))
+  store.flushOrThrow()
+  return {
+    store,
+    runtime: new OrcaRuntimeService(store),
+    reload: async () => {
+      store.flush()
+      store.freezeWrites()
+      await store.waitForPendingWrite()
+      return createSqliteTestStore(Store, { dataFile })
+    }
+  }
+}
+
+/** A renderer save: membership as the renderer holds it, and no close records, which it never sends. */
+function rendererSave(session: WorkspaceSessionState): WorkspaceSessionState {
+  const {
+    terminalTopologyRevisionByRepoId: _hostPrivate,
+    closedTerminalTabTombstonesByTabId: _mainOwned,
+    ...rendererView
+  } = session
+  return { ...rendererView, tabsByWorktree: { [WORKTREE_ID]: [] }, terminalLayoutsByTabId: {} }
+}
+
+describe('close records', () => {
+  it.each(['user', 'cleanup'] as const)(
+    'records a %s close in main and keeps it across a renderer save and a reload',
+    async (reason) => {
+      const { store, runtime, reload } = createPersistedRuntime()
+
+      await runtime.closeTerminalSurfaceFromRenderer({
+        worktreeId: WORKTREE_ID,
+        target: { kind: 'tab', tabId: TAB_ID },
+        reason
+      })
+      store.setWorkspaceSession(rendererSave(store.getWorkspaceSession()))
+
+      const reloaded = (await reload()).getWorkspaceSession()
+      expect(reloaded.tabsByWorktree[WORKTREE_ID]).toEqual([])
+      expect(reloaded.closedTerminalTabTombstonesByTabId?.[TAB_ID]).toEqual({
+        closedAt: expect.any(Number),
+        worktreeId: WORKTREE_ID,
+        reason
+      })
+    }
+  )
+
+  // The store keeps main's map only when a write omits it; main's own writes carry it and win.
+  it("keeps main's own record writes across later store writes", async () => {
+    const { store, runtime } = createPersistedRuntime()
+
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: WORKTREE_ID,
+      target: { kind: 'tab', tabId: TAB_ID }
+    })
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: WORKTREE_ID,
+      target: { kind: 'tab', tabId: LATE_TAB_ID }
+    })
+    store.setWorkspaceSession(rendererSave(store.getWorkspaceSession()))
+
+    expect(
+      Object.keys(store.getWorkspaceSession().closedTerminalTabTombstonesByTabId ?? {}).sort()
+    ).toEqual([LATE_TAB_ID, TAB_ID].sort())
+  })
+
+  it("keeps a close's first reason when the renderer's echo closes the same tab again", async () => {
+    const { store, runtime } = createPersistedRuntime()
+
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: WORKTREE_ID,
+      target: { kind: 'tab', tabId: LATE_TAB_ID },
+      reason: 'cleanup'
+    })
+    const first = store.getWorkspaceSession().closedTerminalTabTombstonesByTabId?.[LATE_TAB_ID]
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: WORKTREE_ID,
+      target: { kind: 'tab', tabId: LATE_TAB_ID },
+      reason: 'user'
+    })
+
+    expect(first?.reason).toBe('cleanup')
+    expect(store.getWorkspaceSession().closedTerminalTabTombstonesByTabId?.[LATE_TAB_ID]).toEqual(
+      first
+    )
+  })
+
+  it('lets a close that removes a listed tab replace a record that tab already had', async () => {
+    const earlier = Date.now() - 24 * 60 * 60 * 1000
+    const { store, runtime } = createPersistedRuntime({
+      ...makeSession(),
+      closedTerminalTabTombstonesByTabId: {
+        [TAB_ID]: { closedAt: earlier, worktreeId: WORKTREE_ID, reason: 'cleanup' }
+      }
+    })
+
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: WORKTREE_ID,
+      target: { kind: 'tab', tabId: TAB_ID },
+      reason: 'user'
+    })
+
+    const record = store.getWorkspaceSession().closedTerminalTabTombstonesByTabId?.[TAB_ID]
+    expect(store.getWorkspaceSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
+    expect(record?.reason).toBe('user')
+    expect(record?.closedAt).toBeGreaterThan(earlier)
+  })
+
+  it('admits a late spawn for a tab whose close record is past the TTL', async () => {
+    const expired = {
+      [LATE_TAB_ID]: {
+        closedAt: Date.now() - CLOSED_TERMINAL_TAB_TOMBSTONE_TTL_MS - 60_000,
+        worktreeId: WORKTREE_ID,
+        reason: 'user' as const
+      }
+    }
+    const { store } = createPersistedRuntime({
+      ...makeSession(),
+      closedTerminalTabTombstonesByTabId: expired
+    })
+
+    expect(
+      await store.persistPtyBinding({
+        worktreeId: WORKTREE_ID,
+        tabId: LATE_TAB_ID,
+        leafId: LEAF_ID,
+        ptyId: 'late-pty',
+        incarnationId: 'late-incarnation'
+      })
+    ).toBe(true)
+  })
+
+  it('records nothing for a split pane close, which leaves its tab open', async () => {
+    const { store, runtime } = createPersistedRuntime()
+
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: WORKTREE_ID,
+      target: {
+        kind: 'pane',
+        tabId: 'unknown-tab',
+        leafId: LEAF_ID
+      }
+    })
+
+    expect(store.getWorkspaceSession().closedTerminalTabTombstonesByTabId).toBeUndefined()
+  })
+
+  // Why: only a resolved tab close records; a pane target never widens here, even on the last pane.
+  it("records nothing for a pane close aimed at its tab's only pane", async () => {
+    const { store, runtime } = createPersistedRuntime()
+
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: WORKTREE_ID,
+      target: {
+        kind: 'pane',
+        tabId: TAB_ID,
+        leafId: LEAF_ID
+      }
+    })
+
+    expect(store.getWorkspaceSession().closedTerminalTabTombstonesByTabId).toBeUndefined()
+    expect(store.getWorkspaceSession().tabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)).toEqual([
+      TAB_ID
+    ])
+  })
+
+  // The durable half of refusing a late graft: the close lands while the tab's spawn is in
+  // flight, so main has never listed the tab, and the spawn commits only after a relaunch.
+  it('refuses a closed tab whose spawn commits after a crash and reload', async () => {
+    const { runtime, reload } = createPersistedRuntime()
+
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: WORKTREE_ID,
+      target: { kind: 'tab', tabId: LATE_TAB_ID }
+    })
+    const relaunched = await reload()
+
+    expect(
+      await relaunched.persistPtyBinding({
+        worktreeId: WORKTREE_ID,
+        tabId: LATE_TAB_ID,
+        leafId: LEAF_ID,
+        ptyId: 'late-pty',
+        incarnationId: 'late-incarnation'
+      })
+    ).toBe(false)
+    expect(
+      relaunched.getWorkspaceSession().tabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)
+    ).not.toContain(LATE_TAB_ID)
+  })
+
+  it('refuses the graft when the close was recorded in another host partition', async () => {
+    const { store, runtime } = createPersistedRuntime()
+    store.setWorkspaceSession(
+      { ...getDefaultWorkspaceSession(), tabsByWorktree: { [SSH_WORKTREE_ID]: [] } },
+      SSH_HOST_ID
+    )
+
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: SSH_WORKTREE_ID,
+      target: {
+        kind: 'tab',
+        tabId: LATE_TAB_ID
+      }
+    })
+
+    expect(
+      store.getWorkspaceSession(SSH_HOST_ID).closedTerminalTabTombstonesByTabId?.[LATE_TAB_ID]
+    ).toBeDefined()
+    // A relay reattach binds into `local`, not the partition the close was recorded in.
+    expect(
+      await store.persistPtyBinding({
+        worktreeId: SSH_WORKTREE_ID,
+        tabId: LATE_TAB_ID,
+        leafId: LEAF_ID,
+        ptyId: 'ssh:target-1@@pty2:epoch:1',
+        incarnationId: 'relay-incarnation'
+      })
+    ).toBe(false)
+  })
+
+  it('prunes each host partition alone, so local churn evicts no SSH record', async () => {
+    const { store, runtime } = createPersistedRuntime()
+    store.setWorkspaceSession(
+      { ...getDefaultWorkspaceSession(), tabsByWorktree: { [SSH_WORKTREE_ID]: [] } },
+      SSH_HOST_ID
+    )
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: SSH_WORKTREE_ID,
+      target: {
+        kind: 'tab',
+        tabId: 'ssh-tab'
+      }
+    })
+
+    for (let index = 0; index <= MAX_CLOSED_TERMINAL_TAB_TOMBSTONES; index += 1) {
+      await runtime.closeTerminalSurfaceFromRenderer({
+        worktreeId: WORKTREE_ID,
+        target: {
+          kind: 'tab',
+          tabId: `local-${index}`
+        }
+      })
+    }
+
+    expect(
+      Object.keys(store.getWorkspaceSession().closedTerminalTabTombstonesByTabId ?? {})
+    ).toHaveLength(MAX_CLOSED_TERMINAL_TAB_TOMBSTONES)
+    expect(
+      store.getWorkspaceSession(SSH_HOST_ID).closedTerminalTabTombstonesByTabId?.['ssh-tab']
+    ).toBeDefined()
+  })
+})
diff --git a/src/main/runtime/orca-runtime-terminal-handle-incarnation.test.ts b/src/main/runtime/orca-runtime-terminal-handle-incarnation.test.ts
index bac59e614b29..101ad7d4e4e4 100644
--- a/src/main/runtime/orca-runtime-terminal-handle-incarnation.test.ts
+++ b/src/main/runtime/orca-runtime-terminal-handle-incarnation.test.ts
@@ -1,11 +1,13 @@
 import { describe, expect, it, vi } from 'vitest'
 import { OrcaRuntimeService } from './orca-runtime'
+import { makePaneKey } from '../../shared/stable-pane-id'
 
 const PTY_ID = 'ssh:target@@relay-pty'
 const WORKTREE_ID = 'repo::/worktree'
 const TAB_ID = 'tab-terminal'
 const LEAF_ID = '11111111-1111-4111-8111-111111111111'
 
+/** A runtime whose pty controller captures every write for assertion. */
 function makeRuntime(): { runtime: OrcaRuntimeService; writes: string[] } {
   const writes: string[] = []
   const runtime = new OrcaRuntimeService(null)
@@ -20,6 +22,7 @@ function makeRuntime(): { runtime: OrcaRuntimeService; writes: string[] } {
   return { runtime, writes }
 }
 
+/** Attach a window and publish a one-tab, one-leaf terminal graph. */
 function syncGraph(runtime: OrcaRuntimeService): void {
   runtime.attachWindow(1)
   runtime.syncWindowGraph(1, {
@@ -44,6 +47,7 @@ function syncGraph(runtime: OrcaRuntimeService): void {
   })
 }
 
+/** (Re)register the fixture pty leaf under the given incarnation id. */
 function register(runtime: OrcaRuntimeService, incarnationId: string): void {
   runtime.registerPty(PTY_ID, WORKTREE_ID, 'target', {
     tabId: TAB_ID,
@@ -66,6 +70,8 @@ describe('runtime terminal handle incarnation fencing', () => {
       inspectProcess
     })
     expect(runtime.markRendererReloading(1)).not.toBeNull()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
     expect((runtime as unknown as { handles: Map<string, unknown> }).handles.has(handle)).toBe(
       false
     )
@@ -89,6 +95,8 @@ describe('runtime terminal handle incarnation fencing', () => {
     })
   })
 
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
   it('treats a null-to-known incarnation as the same un-fenced PTY', async () => {
     const { runtime } = makeRuntime()
     const handle = runtime.preAllocateHandleForPty(PTY_ID)
@@ -132,6 +140,8 @@ describe('runtime terminal handle incarnation fencing', () => {
 
     // Rotate the record directly so reconcile is the only fence exercised.
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: test reaches the runtime's protected pty record map to bypass the registerPty fence.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
     const internals = runtime as unknown as {
       ptysById: Map<string, { incarnationId: string | null }>
     }
@@ -159,12 +169,16 @@ describe('runtime terminal handle incarnation fencing', () => {
     })
     expect(replacement?.handle).not.toBe(staleHandle)
     await expect(runtime.readTerminal(staleHandle)).rejects.toThrow('terminal_handle_stale')
-    await expect(runtime.sendTerminal(staleHandle, { text: 'stale input' })).rejects.toThrow(
-      'terminal_handle_stale'
-    )
+    await expect(
+      runtime.sendTerminal(staleHandle, { text: 'stale input' }, { inputKind: 'driving' })
+    ).rejects.toThrow('terminal_handle_stale')
 
     await expect(
-      runtime.sendTerminal(replacement!.handle, { text: 'replacement input' })
+      runtime.sendTerminal(
+        replacement!.handle,
+        { text: 'replacement input' },
+        { inputKind: 'driving' }
+      )
     ).resolves.toMatchObject({
       accepted: true,
       handle: replacement!.handle
@@ -215,6 +229,8 @@ describe('runtime terminal handle incarnation fencing', () => {
     runtime.registerPreAllocatedHandleForPty(PTY_ID, replacementHandle)
     syncGraph(runtime)
 
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
     const internals = runtime as unknown as {
       handles: Map<string, unknown>
       handleByLeafKey: Map<string, string>
@@ -237,3 +253,130 @@ describe('runtime terminal handle incarnation fencing', () => {
     })
   })
 })
+
+describe('resolveTerminalHandleByProcessIncarnation direct fencing', () => {
+  const LOCAL_SCOPE = JSON.stringify({ kind: 'local', hostId: 'local' })
+  // PTY_ID ('ssh:target@@relay-pty') derives connectionId 'target' via parseAppSshPtyId, so its
+  // host scope is ssh:target rather than local.
+  const SSH_TARGET_SCOPE = JSON.stringify({ kind: 'ssh', targetId: 'target' })
+
+  /** Register a pty leaf directly, optionally under a connection and incarnation. */
+  function seedPty(
+    runtime: OrcaRuntimeService,
+    ptyId: string,
+    incarnationId: string | null,
+    connectionId: string | null = null
+  ): void {
+    runtime.registerPty(ptyId, WORKTREE_ID, connectionId, {
+      tabId: TAB_ID,
+      leafId: LEAF_ID,
+      ...(incarnationId ? { incarnationId } : {})
+    })
+  }
+
+  function resolve(
+    runtime: OrcaRuntimeService,
+    processIncarnation: string,
+    serializedHostScope: string | null
+  ): string | null {
+    return runtime.resolveTerminalHandleByProcessIncarnation(
+      processIncarnation,
+      serializedHostScope
+    )
+  }
+
+  it('mints a live handle for a pty whose exact incarnation and host scope match', () => {
+    const { runtime } = makeRuntime()
+    seedPty(runtime, PTY_ID, 'incarnation-1')
+    const handle = resolve(runtime, `${PTY_ID}:incarnation-1`, SSH_TARGET_SCOPE)
+    expect(handle).toMatch(/^term_/)
+    // Re-minting the same live pty is idempotent.
+    expect(resolve(runtime, `${PTY_ID}:incarnation-1`, SSH_TARGET_SCOPE)).toBe(handle)
+  })
+
+  it('returns null when the recorded incarnationId no longer matches the live pty', () => {
+    const { runtime } = makeRuntime()
+    seedPty(runtime, PTY_ID, 'incarnation-1')
+    expect(resolve(runtime, `${PTY_ID}:incarnation-2`, LOCAL_SCOPE)).toBeNull()
+  })
+
+  it('returns null when the live pty has no incarnationId (legacy runtimeId:ptyId:gen never reaps)', () => {
+    const { runtime } = makeRuntime()
+    seedPty(runtime, PTY_ID, null)
+    // A modern-shaped probe cannot match a pty that carries no incarnationId...
+    expect(resolve(runtime, `${PTY_ID}:incarnation-1`, LOCAL_SCOPE)).toBeNull()
+    // ...and the legacy `${runtimeId}:${ptyId}:${ptyGeneration}` shape stays fail-closed rather
+    // than reap on a ptyGeneration guess.
+    expect(resolve(runtime, `runtime_test:${PTY_ID}:0`, LOCAL_SCOPE)).toBeNull()
+  })
+
+  it('returns null when the host scope does not match', () => {
+    const { runtime } = makeRuntime()
+    seedPty(runtime, PTY_ID, 'incarnation-1')
+    expect(
+      resolve(runtime, `${PTY_ID}:incarnation-1`, JSON.stringify({ kind: 'ssh', targetId: 'nope' }))
+    ).toBeNull()
+  })
+
+  it('returns null when no host scope is supplied (fails closed)', () => {
+    const { runtime } = makeRuntime()
+    seedPty(runtime, PTY_ID, 'incarnation-1')
+    expect(resolve(runtime, `${PTY_ID}:incarnation-1`, null)).toBeNull()
+  })
+
+  it('resolves a colon-bearing SSH/relay incarnationId that lastIndexOf would mis-split', () => {
+    const { runtime } = makeRuntime()
+    // PTY_ID already carries ':' and '@@'; the incarnationId itself also carries colons.
+    seedPty(runtime, PTY_ID, 'relay:conn-3:incarnation-9', 'target')
+    const handle = resolve(
+      runtime,
+      `${PTY_ID}:relay:conn-3:incarnation-9`,
+      JSON.stringify({ kind: 'ssh', targetId: 'target' })
+    )
+    expect(handle).toMatch(/^term_/)
+  })
+
+  it('resolves a Windows repo::C:\\path@@1 ptyId', () => {
+    const { runtime } = makeRuntime()
+    const windowsPtyId = 'repo::C:\\path@@1'
+    seedPty(runtime, windowsPtyId, 'incarnation-win')
+    const handle = resolve(runtime, `${windowsPtyId}:incarnation-win`, LOCAL_SCOPE)
+    expect(handle).toMatch(/^term_/)
+  })
+
+  it('keeps scanning past a colon-ambiguous decoy in another host scope to the genuine match', () => {
+    const { runtime } = makeRuntime()
+    // One process-incarnation string, two colon-ambiguous pty ids that both satisfy the exact
+    // matcher: 'relay' + 'conn:incarnation-1' AND 'relay:conn' + 'incarnation-1' both stringify to
+    // 'relay:conn:incarnation-1'. The decoy is registered FIRST and lives in a different host scope
+    // (ssh:decoy); the genuine pty is local and registered later.
+    const processIncarnation = 'relay:conn:incarnation-1'
+    const DECOY_TAB_ID = 'tab-decoy'
+    const DECOY_LEAF_ID = '22222222-2222-4222-8222-222222222222'
+    const GENUINE_TAB_ID = 'tab-genuine'
+    const GENUINE_LEAF_ID = '33333333-3333-4333-8333-333333333333'
+    runtime.registerPty('relay', WORKTREE_ID, 'decoy', {
+      tabId: DECOY_TAB_ID,
+      leafId: DECOY_LEAF_ID,
+      incarnationId: 'conn:incarnation-1'
+    })
+    runtime.registerPty('relay:conn', WORKTREE_ID, null, {
+      tabId: GENUINE_TAB_ID,
+      leafId: GENUINE_LEAF_ID,
+      incarnationId: 'incarnation-1'
+    })
+
+    // Before the fix, the earlier decoy's host-scope mismatch returned null and suppressed the
+    // genuine same-scope pty entirely. `continue` lets the scan reach it.
+    const handle = resolve(runtime, processIncarnation, LOCAL_SCOPE)
+    expect(handle).toMatch(/^term_/)
+    // getTerminalProcessIncarnation cannot separate the two (both stringify to
+    // 'relay:conn:incarnation-1'), so pin the remint to the GENUINE pane. The paneKey is the only
+    // terminal-specific observable that distinguishes the genuine leaf from the same-incarnation
+    // decoy; this fails if the resolver ever mints the decoy's handle instead of the genuine pty's.
+    const genuinePaneKey = makePaneKey(GENUINE_TAB_ID, GENUINE_LEAF_ID)
+    const decoyPaneKey = makePaneKey(DECOY_TAB_ID, DECOY_LEAF_ID)
+    expect(runtime.getTerminalPaneKey(handle!)).toBe(genuinePaneKey)
+    expect(runtime.getTerminalPaneKey(handle!)).not.toBe(decoyPaneKey)
+  })
+})
diff --git a/src/main/runtime/orca-runtime-terminal-retirement-host-partition.test.ts b/src/main/runtime/orca-runtime-terminal-retirement-host-partition.test.ts
index 063866c83c5a..3a91794f441f 100644
--- a/src/main/runtime/orca-runtime-terminal-retirement-host-partition.test.ts
+++ b/src/main/runtime/orca-runtime-terminal-retirement-host-partition.test.ts
@@ -413,6 +413,62 @@ describe('OrcaRuntimeService terminal retirement host partitioning (STA-3463)',
     expect(targets.get(folderWorktreeId)).toBe(localSession)
   })
 
+  it.each<[string, string, Record<string, unknown>, ExecutionHostId]>([
+    ['local repo', 'repo::/wt', { id: 'repo' }, LOCAL_EXECUTION_HOST_ID],
+    ['SSH repo', 'repo::/wt', { id: 'repo', connectionId: 'c1' }, 'ssh:c1'],
+    ['runtime repo', 'repo::/wt', { id: 'repo', executionHostId: 'runtime:e1' }, 'runtime:e1'],
+    ['local folder', 'folder:f1', { folderId: 'f1' }, LOCAL_EXECUTION_HOST_ID],
+    ['SSH folder', 'folder:f1', { folderId: 'f1', connectionId: 'c1' }, 'ssh:c1'],
+    ['explicit SSH folder', 'folder:f1', { folderId: 'f1', executionHostId: 'ssh:c2' }, 'ssh:c2'],
+    ['runtime folder', 'folder:f1', { folderId: 'f1', executionHostId: 'runtime:e1' }, 'runtime:e1']
+  ])('reads a %s own saved partition', (_label, worktreeId, owner, ownerHostId) => {
+    const listing = (id: string) => ({
+      ...getDefaultWorkspaceSession(),
+      tabsByWorktree: {
+        [worktreeId]: [
+          {
+            id,
+            ptyId: null,
+            worktreeId,
+            title: id,
+            customTitle: null,
+            color: null,
+            sortOrder: 0,
+            createdAt: 1
+          }
+        ]
+      }
+    })
+    const sessions = new Map<ExecutionHostId, WorkspaceSessionState>([
+      [ownerHostId, listing('own')],
+      ['runtime:e0', listing('rotated')]
+    ])
+    const { folderId, ...repoOrFolder } = owner
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the controller reads only repos, folder workspaces and workspace sessions.
+    const store = {
+      getRepos: () => (folderId ? [] : [repoOrFolder]),
+      getRepo: () => (folderId ? undefined : repoOrFolder),
+      getFolderWorkspaces: () => (folderId ? [{ ...repoOrFolder, id: folderId }] : []),
+      getWorkspaceSessionHostIds: () => [...sessions.keys()],
+      getWorkspaceSession: (hostId: ExecutionHostId) =>
+        sessions.get(hostId) ?? getDefaultWorkspaceSession()
+    } as never
+    const controller = new RuntimeWorkspaceSessionController({
+      getStore: () => store,
+      resolveFolderConnectionId: (workspace) => workspace.connectionId ?? null,
+      hasRuntimeOwnedPtyCandidate: () => false
+    })
+
+    expect(controller.getOwnPartition(worktreeId)).toBe(sessions.get(ownerHostId))
+    expect(controller.get(worktreeId)).toBe(sessions.get(ownerHostId))
+
+    sessions.set(ownerHostId, getDefaultWorkspaceSession())
+    const fellBack = controller.get(worktreeId) === sessions.get('runtime:e0')
+    // Only a runtime owner rotates onto another copy; that copy is never read as its own.
+    expect(fellBack).toBe(ownerHostId.startsWith('runtime:'))
+    expect(controller.getOwnPartition(worktreeId)?.tabsByWorktree[worktreeId]).toBeUndefined()
+  })
+
   it('waits for provider retirement on a direct worktree stop', async () => {
     const harness = partitionedStore()
     const runtime = new OrcaRuntimeService(harness.store)
diff --git a/src/main/runtime/orca-runtime-terminal-retirement.test.ts b/src/main/runtime/orca-runtime-terminal-retirement.test.ts
index 4422dc2a1e64..d6f70fd4c6e0 100644
--- a/src/main/runtime/orca-runtime-terminal-retirement.test.ts
+++ b/src/main/runtime/orca-runtime-terminal-retirement.test.ts
@@ -691,7 +691,7 @@ describe('OrcaRuntimeService terminal surface retirement', () => {
     expect(flushOrThrow).toHaveBeenCalledOnce()
   })
 
-  it('does not publish absence when the durable retirement flush fails', async () => {
+  it('publishes absence and reports when the durable retirement flush fails', async () => {
     const session = makePersistedSplitSession()
     const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined)
     const runtime = new OrcaRuntimeService(
@@ -717,20 +717,20 @@ describe('OrcaRuntimeService terminal surface retirement', () => {
 
     await runtime.onPtyExit('pty-left', 0, 'incarnation-a')
 
+    // Why: the process is gone either way; a failed write is reported, not reinstated.
     expect((await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).tabs).toEqual([
-      expect.objectContaining({ id: 'tab::left' }),
       expect.objectContaining({ id: 'tab::right' })
     ])
-    expect(events).toEqual([])
+    expect(events).not.toEqual([])
     expect(errorSpy).toHaveBeenCalledWith(
-      '[runtime] failed to persist terminal retirement:',
+      '[runtime] terminal retirement is not yet durable:',
       expect.any(Error)
     )
     unsubscribe()
     errorSpy.mockRestore()
   })
 
-  it('rolls back an in-memory retirement when the durable flush fails', async () => {
+  it('keeps the in-memory retirement when the durable flush fails', async () => {
     let session = makePersistedSplitSession()
     const original = structuredClone(session)
     const setWorkspaceSession = vi.fn((next: WorkspaceSessionState) => {
@@ -755,10 +755,14 @@ describe('OrcaRuntimeService terminal surface retirement', () => {
       incarnationId: 'incarnation-a'
     })
 
+    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined)
+
     await runtime.onPtyExit('pty-left', 0, 'incarnation-a')
 
-    expect(session).toEqual(original)
-    expect(setWorkspaceSession).toHaveBeenLastCalledWith(original, LOCAL_EXECUTION_HOST_ID)
-    expect(setWorkspaceSession).toHaveBeenCalledTimes(2)
+    // Why: the next profile write carries the staged retirement; nothing may reinstate the leaf.
+    expect(session).not.toEqual(original)
+    expect(session.terminalLayoutsByTabId.tab?.ptyIdsByLeafId).toEqual({ right: 'pty-right' })
+    expect(setWorkspaceSession).toHaveBeenCalledOnce()
+    errorSpy.mockRestore()
   })
 })
diff --git a/src/main/runtime/orca-runtime-terminal-split-authority.test.ts b/src/main/runtime/orca-runtime-terminal-split-authority.test.ts
index 9da61e59072f..8369a219331e 100644
--- a/src/main/runtime/orca-runtime-terminal-split-authority.test.ts
+++ b/src/main/runtime/orca-runtime-terminal-split-authority.test.ts
@@ -78,6 +78,7 @@ function createHarness(
     deferSpawn?: boolean
     includePairedSnapshot?: boolean
     rendererMounted?: boolean
+    rendererPtyId?: string | null
     graphOnlySource?: boolean
     sourceIncarnationId?: string
     stopAndWaitResult?: boolean
@@ -169,7 +170,7 @@ function createHarness(
               worktreeId: WORKTREE_ID,
               leafId: SOURCE_LEAF_ID,
               paneRuntimeId: 1,
-              ptyId: SOURCE_PTY_ID
+              ptyId: options.rendererPtyId === undefined ? SOURCE_PTY_ID : options.rendererPtyId
             }
           ]
         : [],
@@ -283,6 +284,19 @@ describe('remote runtime terminal split authority', () => {
     })
   })
 
+  it('reveals a persisted split while its mounted source is still publishing its PTY binding', async () => {
+    const harness = createHarness(true, { rendererMounted: true, rendererPtyId: null })
+    await harness.runtime.splitTerminal(harness.handle, { direction: 'vertical' })
+    expect(harness.revealTerminalSession).toHaveBeenCalledOnce()
+    expect(harness.getSession().terminalLayoutsByTabId[TAB_ID]?.root?.type).toBe('split')
+  })
+
+  it('does not reveal a persisted split into a renderer bound to a different PTY', async () => {
+    const harness = createHarness(true, { rendererMounted: true, rendererPtyId: 'replacement' })
+    await harness.runtime.splitTerminal(harness.handle, { direction: 'vertical' })
+    expect(harness.revealTerminalSession).not.toHaveBeenCalled()
+  })
+
   it('splits a persisted tab without consulting an unmounted host renderer', async () => {
     const harness = createHarness()
 
diff --git a/src/main/runtime/orca-runtime-terminal-surface-close.test.ts b/src/main/runtime/orca-runtime-terminal-surface-close.test.ts
new file mode 100644
index 000000000000..c9bd30b7199b
--- /dev/null
+++ b/src/main/runtime/orca-runtime-terminal-surface-close.test.ts
@@ -0,0 +1,353 @@
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import { makePaneKey } from '../../shared/stable-pane-id'
+import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
+import { Store } from '../persistence/loading-store/store'
+import { closeTestStores, createSqliteTestStore } from '../persistence-test-harness'
+import { OrcaRuntimeService } from './orca-runtime'
+import {
+  LEAF_ID,
+  PTY_ID,
+  REPO_ID,
+  SIBLING_LEAF_ID,
+  SIBLING_PTY_ID,
+  TAB_ID,
+  WORKTREE_ID,
+  WORKTREE_PATH,
+  createHarness,
+  makeSession
+} from './__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
+import {
+  retireTerminalSurfaceFromPersistence,
+  sanitizeWorkspaceSessionTerminalRetirements
+} from './mobile-session-terminal-persistence-retirement'
+import { advanceTerminalTopologyRevision } from './workspace-session-terminal-membership-authority'
+
+const splitLayout = {
+  root: {
+    type: 'split' as const,
+    direction: 'horizontal' as const,
+    first: { type: 'leaf' as const, leafId: LEAF_ID },
+    second: { type: 'leaf' as const, leafId: SIBLING_LEAF_ID }
+  },
+  activeLeafId: LEAF_ID,
+  expandedLeafId: null,
+  ptyIdsByLeafId: { [LEAF_ID]: PTY_ID, [SIBLING_LEAF_ID]: SIBLING_PTY_ID }
+}
+
+function splitSession(): WorkspaceSessionState {
+  return { ...makeSession(), terminalLayoutsByTabId: { [TAB_ID]: splitLayout } }
+}
+
+function splitSessionAfterExitRetired(): WorkspaceSessionState {
+  return retireTerminalSurfaceFromPersistence(splitSession(), {
+    worktreeId: WORKTREE_ID,
+    parentTabId: TAB_ID,
+    leafId: LEAF_ID,
+    ptyId: PTY_ID
+  })
+}
+
+function withPinnedTab(session: WorkspaceSessionState): WorkspaceSessionState {
+  return {
+    ...session,
+    tabsByWorktree: {
+      [WORKTREE_ID]: (session.tabsByWorktree[WORKTREE_ID] ?? []).map((tab) => ({
+        ...tab,
+        isPinned: true
+      }))
+    }
+  }
+}
+
+const directories: string[] = []
+afterEach(async () => {
+  await closeTestStores()
+  for (const directory of directories.splice(0)) {
+    rmSync(directory, { recursive: true, force: true })
+  }
+})
+
+/** A real store whose repo already has host-authoritative membership, as any repo with an exit does. */
+function createPersistedRuntime(session: WorkspaceSessionState) {
+  const directory = mkdtempSync(join(tmpdir(), 'orca-surface-close-'))
+  directories.push(directory)
+  const dataFile = join(directory, 'orca-data.json')
+  const store = createSqliteTestStore(Store, { dataFile })
+  store.addRepo({
+    id: REPO_ID,
+    path: WORKTREE_PATH,
+    displayName: 'Fixture',
+    badgeColor: 'gray',
+    addedAt: 1
+  })
+  store.setWorkspaceSession(advanceTerminalTopologyRevision(session, WORKTREE_ID))
+  store.flushOrThrow()
+  return {
+    store,
+    runtime: new OrcaRuntimeService(store),
+    reload: async () => {
+      store.flush()
+      store.freezeWrites()
+      await store.waitForPendingWrite()
+      return createSqliteTestStore(Store, { dataFile }).getWorkspaceSession()
+    }
+  }
+}
+
+/** What a renderer save carries after its own close: membership without the closed surface. */
+function rendererSaveWithout(
+  session: WorkspaceSessionState,
+  leafId?: string
+): WorkspaceSessionState {
+  const { terminalTopologyRevisionByRepoId: _hostPrivate, ...rendererView } = session
+  if (!leafId) {
+    return { ...rendererView, tabsByWorktree: { [WORKTREE_ID]: [] }, terminalLayoutsByTabId: {} }
+  }
+  return {
+    ...rendererView,
+    terminalLayoutsByTabId: {
+      [TAB_ID]: {
+        root: { type: 'leaf', leafId: SIBLING_LEAF_ID },
+        activeLeafId: SIBLING_LEAF_ID,
+        expandedLeafId: null,
+        ptyIdsByLeafId: { [SIBLING_LEAF_ID]: SIBLING_PTY_ID }
+      }
+    }
+  }
+}
+
+describe('renderer close intents', () => {
+  it('keeps a closed tab closed across a renderer save and a reload', async () => {
+    const { store, runtime, reload } = createPersistedRuntime(makeSession())
+
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: WORKTREE_ID,
+      target: { kind: 'tab', tabId: TAB_ID }
+    })
+    store.setWorkspaceSession(rendererSaveWithout(store.getWorkspaceSession()))
+
+    expect((await reload()).tabsByWorktree[WORKTREE_ID]).toEqual([])
+  })
+
+  it('keeps a closed split pane closed across a renderer save and a reload', async () => {
+    const { store, runtime, reload } = createPersistedRuntime(splitSession())
+
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: WORKTREE_ID,
+      target: {
+        kind: 'pane',
+        tabId: TAB_ID,
+        leafId: LEAF_ID
+      }
+    })
+    store.setWorkspaceSession(rendererSaveWithout(store.getWorkspaceSession(), LEAF_ID))
+
+    const reloaded = await reload()
+    expect(reloaded.tabsByWorktree[WORKTREE_ID]).toEqual([expect.objectContaining({ id: TAB_ID })])
+    expect(reloaded.terminalLayoutsByTabId[TAB_ID]?.root).toEqual({
+      type: 'leaf',
+      leafId: SIBLING_LEAF_ID
+    })
+    expect(reloaded.terminalPtyIncarnationsByPaneKey?.[makePaneKey(TAB_ID, LEAF_ID)]).toBe(
+      undefined
+    )
+  })
+
+  // e.g. the exited-pane overlay's Close, after main's exit handling already retired that leaf.
+  it.each([
+    ['its exit already retired the pane', () => splitSessionAfterExitRetired()],
+    ['the tab is pinned', () => withPinnedTab(splitSessionAfterExitRetired())],
+    ['the tab has no saved layout', () => ({ ...makeSession(), terminalLayoutsByTabId: {} })]
+  ])('never widens a pane close into a tab close when %s', async (_case, session) => {
+    const { runtime, reload } = createPersistedRuntime(session())
+
+    await runtime.closeTerminalSurfaceFromRenderer({
+      worktreeId: WORKTREE_ID,
+      target: {
+        kind: 'pane',
+        tabId: TAB_ID,
+        leafId: LEAF_ID
+      }
+    })
+
+    expect((await reload()).tabsByWorktree[WORKTREE_ID]).toEqual([
+      expect.objectContaining({ id: TAB_ID })
+    ])
+  })
+})
+
+describe('CLI close of one pane in a split tab', () => {
+  it('commits the pane removal without waiting for its process exit', async () => {
+    const harness = createHarness()
+    harness.syncSplitFixtureGraph()
+    // A verified stop that never reports an exit: membership must not ride on one.
+    harness.setVerifiedStopResult(true)
+    const terminal = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals.find(
+      (candidate) => candidate.ptyId === PTY_ID
+    )!
+
+    await expect(harness.runtime.closeTerminal(terminal.handle)).resolves.toMatchObject({
+      tabId: TAB_ID,
+      ptyKilled: true
+    })
+
+    const session = harness.getSession()
+    expect(session.tabsByWorktree[WORKTREE_ID]).toEqual([expect.objectContaining({ id: TAB_ID })])
+    expect(session.terminalLayoutsByTabId[TAB_ID]).toMatchObject({
+      root: { type: 'leaf', leafId: SIBLING_LEAF_ID },
+      ptyIdsByLeafId: { [SIBLING_LEAF_ID]: SIBLING_PTY_ID }
+    })
+    // No exit arrives to remove the pane, so the desktop renderer is told to drop that leaf.
+    expect(harness.closeTerminalPane).toHaveBeenCalledExactlyOnceWith(TAB_ID, LEAF_ID)
+    expect(harness.closeTerminalTab).not.toHaveBeenCalled()
+  })
+
+  it('commits the pane removal when the handle names a live PTY', async () => {
+    const harness = createHarness({ publishMobileSurface: true, registerPtyBacked: true })
+    harness.syncSplitFixtureGraph()
+    // Graph without the leaf: the handle resolves through the PTY, as for a runtime-owned pane.
+    harness.syncFixtureTabWithoutLeaf()
+    harness.setVerifiedStopResult(true)
+    const terminal = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals.find(
+      (candidate) => candidate.ptyId === PTY_ID
+    )!
+
+    await expect(harness.runtime.closeTerminal(terminal.handle)).resolves.toMatchObject({
+      tabId: TAB_ID,
+      ptyKilled: true
+    })
+
+    expect(harness.getSession().terminalLayoutsByTabId[TAB_ID]?.root).toEqual({
+      type: 'leaf',
+      leafId: SIBLING_LEAF_ID
+    })
+    expect(harness.closeTerminalPane).toHaveBeenCalledExactlyOnceWith(TAB_ID, LEAF_ID)
+    expect(harness.closeTerminalTab).not.toHaveBeenCalled()
+  })
+
+  it.each([
+    ['reports no exit', false],
+    ['throws, as an unreachable SSH host does', new Error('ssh_host_unreachable')]
+  ] as const)(
+    'closes only that pane, never the live sibling, when its stop %s',
+    async (_case, stopResult) => {
+      const harness = createHarness({ publishMobileSurface: true, registerPtyBacked: true })
+      harness.syncSplitFixtureGraph()
+      harness.syncFixtureTabWithoutLeaf()
+      harness.setVerifiedStopResult(stopResult)
+      // A renderer that honours a whole-tab close, so a widened close shows as the lost sibling.
+      harness.setCloseTerminalTabAction(() => harness.retirePersistedTab())
+      const terminal = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals.find(
+        (candidate) => candidate.ptyId === PTY_ID
+      )!
+
+      const receipt = await harness.runtime.closeTerminal(terminal.handle)
+
+      // A stale renderer save that still lists the pane can neither restore it nor drop the sibling.
+      const saved = sanitizeWorkspaceSessionTerminalRetirements(
+        { ...harness.getSession(), terminalLayoutsByTabId: { [TAB_ID]: splitLayout } },
+        harness.getSession()
+      )
+      expect(saved.tabsByWorktree[WORKTREE_ID]).toEqual([expect.objectContaining({ id: TAB_ID })])
+      expect(saved.terminalLayoutsByTabId[TAB_ID]?.root).toEqual({
+        type: 'leaf',
+        leafId: SIBLING_LEAF_ID
+      })
+      expect(harness.closeTerminalPane).toHaveBeenCalledExactlyOnceWith(TAB_ID, LEAF_ID)
+      expect(harness.closeTerminalTab).not.toHaveBeenCalled()
+      // The owed stop still goes out through the controller's kill, which records SSH pending kills.
+      expect(harness.kill).toHaveBeenCalledWith(PTY_ID)
+      expect(harness.kill).not.toHaveBeenCalledWith(SIBLING_PTY_ID)
+      expect(receipt).toMatchObject({
+        tabId: TAB_ID,
+        ptyKilled: false,
+        ptyStopVerdict: 'unverifiable'
+      })
+    }
+  )
+
+  it('drops only that pane from paired clients on a host with no renderer listing the tab', async () => {
+    const harness = createHarness({ publishMobileSurface: true, registerPtyBacked: true })
+    harness.syncSplitFixtureGraph()
+    harness.syncFixtureTabWithoutLeaf()
+    const terminal = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals.find(
+      (candidate) => candidate.ptyId === PTY_ID
+    )!
+    harness.syncEmptyGraph()
+    // No exit arrives to retire the pane from the published snapshot.
+    harness.setVerifiedStopResult(new Error('ssh_host_unreachable'))
+
+    await harness.runtime.closeTerminal(terminal.handle)
+
+    const snapshot = await harness.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+    expect(snapshot.tabs).toEqual([
+      expect.objectContaining({ parentTabId: TAB_ID, leafId: SIBLING_LEAF_ID })
+    ])
+    expect(snapshot.retiredTerminalSurfaces).toEqual([
+      expect.objectContaining({ parentTabId: TAB_ID, leafId: LEAF_ID, ptyId: PTY_ID })
+    ])
+    expect(harness.getSession().terminalLayoutsByTabId[TAB_ID]?.root).toEqual({
+      type: 'leaf',
+      leafId: SIBLING_LEAF_ID
+    })
+  })
+
+  it('keeps the sibling when the stop delivers the exit before the pane commit', async () => {
+    const harness = createHarness()
+    harness.syncSplitFixtureGraph()
+    harness.setStopAndWaitAction((stoppingPtyId) => harness.runtime.onPtyExit(stoppingPtyId, 0))
+    harness.setVerifiedStopResult(true)
+    const terminal = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals.find(
+      (candidate) => candidate.ptyId === PTY_ID
+    )!
+
+    await harness.runtime.closeTerminal(terminal.handle)
+
+    const session = harness.getSession()
+    expect(session.tabsByWorktree[WORKTREE_ID]).toEqual([expect.objectContaining({ id: TAB_ID })])
+    expect(session.terminalLayoutsByTabId[TAB_ID]?.root).toEqual({
+      type: 'leaf',
+      leafId: SIBLING_LEAF_ID
+    })
+  })
+})
+
+describe('mobile close of one pane in a split tab', () => {
+  it('commits the pane removal alongside its kill', async () => {
+    const harness = createHarness({ publishMobileSurface: true, registerPtyBacked: true })
+    harness.syncSplitFixtureGraph()
+
+    await expect(
+      harness.runtime.closeMobileSessionTab(`id:${WORKTREE_ID}`, `${TAB_ID}::${LEAF_ID}`, {
+        reason: 'user'
+      })
+    ).resolves.toMatchObject({ closed: true })
+
+    expect(harness.kill).toHaveBeenCalledWith(PTY_ID)
+    expect(harness.getSession().terminalLayoutsByTabId[TAB_ID]).toMatchObject({
+      root: { type: 'leaf', leafId: SIBLING_LEAF_ID }
+    })
+    expect(harness.closeTerminalPane).toHaveBeenCalledExactlyOnceWith(TAB_ID, LEAF_ID)
+  })
+})
+
+describe('mobile close of a tab the desktop renderer lists', () => {
+  // Pins are renderer presentation that main's session can lag, so only the renderer can refuse.
+  it('still asks the renderer, whose pin guard can refuse it', async () => {
+    const harness = createHarness({ publishMobileSurface: true, registerPtyBacked: true })
+    harness.rejectTerminalTabClose(new Error('terminal_tab_pinned'))
+
+    await expect(
+      harness.runtime.closeMobileSessionTab(`id:${WORKTREE_ID}`, TAB_ID, { reason: 'user' })
+    ).rejects.toThrow('terminal_tab_pinned')
+
+    expect(harness.closeTerminalTab).toHaveBeenCalledWith(TAB_ID)
+    expect(harness.kill).not.toHaveBeenCalled()
+    expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([
+      expect.objectContaining({ id: TAB_ID })
+    ])
+  })
+})
diff --git a/src/main/runtime/orca-runtime-test-mocks/setup.spec.ts b/src/main/runtime/orca-runtime-test-mocks/setup.spec.ts
index f85c353575ec..c25dc33df879 100644
--- a/src/main/runtime/orca-runtime-test-mocks/setup.spec.ts
+++ b/src/main/runtime/orca-runtime-test-mocks/setup.spec.ts
@@ -1,6 +1,7 @@
 import { expect, vi } from 'vitest'
 import type { Mock } from 'vitest'
 import type * as GitUsernameModule from '../../git/git-username'
+import type * as FilesystemPathContainmentModule from '../../ipc/filesystem-path-containment'
 import { reviewHeadRemoteRefComponent } from '../../../shared/review-head-tracking-ref'
 
 // Why: durable review-head refs are scoped by remote identity (name + URL hash).
@@ -420,10 +421,13 @@ vi.mock('../../ipc/registered-worktree-roots-cache', () => ({
   invalidateAuthorizedRootsCache: invalidateAuthorizedRootsCacheMock
 }))
 
-vi.mock('../../ipc/filesystem-path-containment', () => ({
-  isENOENT: (error: unknown) =>
-    Boolean(error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT')
-}))
+// Why: the real check also matches relay-rebuilt errors, which carry only the ENOENT message.
+vi.mock('../../ipc/filesystem-path-containment', async () => {
+  const actual = await vi.importActual<typeof FilesystemPathContainmentModule>(
+    '../../ipc/filesystem-path-containment'
+  )
+  return { isENOENT: actual.isENOENT }
+})
 
 vi.mock('../../worktree-root-preparation', () => ({
   prepareLocalWorktreeRootForRepo: prepareLocalWorktreeRootForRepoMock
diff --git a/src/main/runtime/orca-runtime-test-scenario-builders.spec.ts b/src/main/runtime/orca-runtime-test-scenario-builders.spec.ts
index 63dc6d8c94e2..1d63e09c4c7f 100644
--- a/src/main/runtime/orca-runtime-test-scenario-builders.spec.ts
+++ b/src/main/runtime/orca-runtime-test-scenario-builders.spec.ts
@@ -35,7 +35,7 @@ type MobileCreateTestNotifier = {
   revealTerminalSession: TestMock
   splitTerminal: TestMock
   renameTerminal: TestMock
-  closeTerminal: (tabId: string, paneRuntimeId?: number) => void
+  closeTerminal: (tabId: string, leafId?: string) => void
   closeSessionTab: TestMock
   sleepWorktree: TestMock
   terminalFitOverrideChanged: TestMock
@@ -327,7 +327,7 @@ function makePendingAgentTabActivationRuntime(opts: { disabledTuiAgents?: string
 
 // Why: the five #7587 mobile-create tests share one notifier factory so interface changes live in one place.
 function createMobileCreateTestNotifier(
-  closeTerminal: (tabId: string, paneRuntimeId?: number) => void
+  closeTerminal: (tabId: string, leafId?: string) => void
 ): MobileCreateTestNotifier {
   return {
     focusTerminal: vi.fn(),
diff --git a/src/main/runtime/orca-runtime-tests/agent-status-and-waits-part-02.spec.ts b/src/main/runtime/orca-runtime-tests/agent-status-and-waits-part-02.spec.ts
index 1fafc4f7a9d1..b7a784e62828 100644
--- a/src/main/runtime/orca-runtime-tests/agent-status-and-waits-part-02.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/agent-status-and-waits-part-02.spec.ts
@@ -357,11 +357,11 @@ describe('OrcaRuntimeService', () => {
 
   it('calls foreground confirmation with its controller receiver', async () => {
     const getForegroundProcess = vi.fn(async () => 'powershell.exe')
-    const confirmForegroundProcess = vi.fn(
-      async function (this: { getForegroundProcess: typeof getForegroundProcess }) {
-        return this.getForegroundProcess === getForegroundProcess ? 'codex' : null
-      }
-    )
+    const confirmForegroundProcess = vi.fn(async function (this: {
+      getForegroundProcess: typeof getForegroundProcess
+    }) {
+      return this.getForegroundProcess === getForegroundProcess ? 'codex' : null
+    })
     const { runtime, handle } = await createExplicitAgentStatusHarness({
       getForegroundProcess,
       confirmForegroundProcess
diff --git a/src/main/runtime/orca-runtime-tests/agent-status-and-waits-part-03.spec.ts b/src/main/runtime/orca-runtime-tests/agent-status-and-waits-part-03.spec.ts
index 2501d0141dda..a1bcdf4b2873 100644
--- a/src/main/runtime/orca-runtime-tests/agent-status-and-waits-part-03.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/agent-status-and-waits-part-03.spec.ts
@@ -85,7 +85,7 @@ describe('OrcaRuntimeService', () => {
       runtime.sendTerminal(
         terminal.handle,
         { text: 'notes', enter: true },
-        { beforeWrite, afterWrite }
+        { inputKind: 'driving', beforeWrite, afterWrite }
       )
     ).rejects.toThrow('terminal_not_writable')
     expect(writes).toEqual(['notes', '\r'])
diff --git a/src/main/runtime/orca-runtime-tests/agent-status-and-waits.spec.ts b/src/main/runtime/orca-runtime-tests/agent-status-and-waits.spec.ts
index 23312f494201..310a1e12c819 100644
--- a/src/main/runtime/orca-runtime-tests/agent-status-and-waits.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/agent-status-and-waits.spec.ts
@@ -150,10 +150,14 @@ describe('OrcaRuntimeService', () => {
       nextCursor: expect.any(String)
     })
 
-    const send = await runtime.sendTerminal(terminal.handle, {
-      text: 'continue',
-      enter: true
-    })
+    const send = await runtime.sendTerminal(
+      terminal.handle,
+      {
+        text: 'continue',
+        enter: true
+      },
+      { inputKind: 'driving' }
+    )
     expect(send).toMatchObject({
       handle: terminal.handle,
       accepted: true
diff --git a/src/main/runtime/orca-runtime-tests/exit-retirement-activation.spec.ts b/src/main/runtime/orca-runtime-tests/exit-retirement-activation.spec.ts
new file mode 100644
index 000000000000..7da878ca2f7c
--- /dev/null
+++ b/src/main/runtime/orca-runtime-tests/exit-retirement-activation.spec.ts
@@ -0,0 +1,148 @@
+import { describe, expect, it, vi } from 'vitest'
+import { OrcaRuntimeService } from '../orca-runtime-test-mocks.spec'
+import {
+  HEADLESS_LEAF_ID,
+  HEADLESS_SECOND_LEAF_ID,
+  TEST_WORKTREE_ID,
+  makeDeferred,
+  makeHeadlessTerminalLayout,
+  makeRuntimeStoreWithWorkspaceSession,
+  makeWorkspaceSessionWithHeadlessTerminal
+} from '../orca-runtime-test-fixtures.spec'
+
+async function startSplitHost() {
+  const { runtimeStore, getSession } = makeRuntimeStoreWithWorkspaceSession(
+    makeWorkspaceSessionWithHeadlessTerminal({
+      tabsByWorktree: {
+        [TEST_WORKTREE_ID]: [
+          {
+            id: 'host-tab',
+            ptyId: 'pty-a',
+            worktreeId: TEST_WORKTREE_ID,
+            title: 'Split Terminal',
+            customTitle: null,
+            color: null,
+            sortOrder: 0,
+            createdAt: 1
+          }
+        ]
+      },
+      terminalLayoutsByTabId: {
+        'host-tab': makeHeadlessTerminalLayout({
+          [HEADLESS_LEAF_ID]: 'pty-a',
+          [HEADLESS_SECOND_LEAF_ID]: 'pty-b'
+        })
+      }
+    })
+  )
+  const spawn = vi.fn(async (options: { sessionId?: string }) => ({
+    id: options.sessionId ?? 'fresh-pty'
+  }))
+  const adoptStablePane = vi.fn(async () => null)
+  const runtime = new OrcaRuntimeService(runtimeStore)
+  runtime.setPtyController({
+    spawn,
+    adoptStablePane,
+    write: () => true,
+    kill: () => true,
+    getForegroundProcess: async () => null,
+    listProcesses: async () => []
+  })
+  runtime.syncWindowGraph(0, { tabs: [], leaves: [] })
+  const activate = (leafId: string, intent: 'user' | 'automatic') =>
+    runtime.activateMobileSessionTab(`id:${TEST_WORKTREE_ID}`, 'host-tab', leafId, {
+      notifyClients: false,
+      navigation: 'caller',
+      intent
+    })
+  const terminalLeafIds = async (): Promise<string[]> =>
+    (await runtime.listMobileSessionTabs(`id:${TEST_WORKTREE_ID}`)).tabs.flatMap((tab) =>
+      tab.type === 'terminal' ? [tab.leafId] : []
+    )
+  await activate(HEADLESS_LEAF_ID, 'user')
+  await activate(HEADLESS_SECOND_LEAF_ID, 'user')
+  expect(spawn).toHaveBeenCalledTimes(2)
+  expect(adoptStablePane).toHaveBeenCalledTimes(2)
+  return { runtime, runtimeStore, getSession, spawn, adoptStablePane, activate, terminalLeafIds }
+}
+
+describe('OrcaRuntimeService', () => {
+  // Why: a paired mirror answers an exit's stream end by re-activating its pane. An activation
+  // that still finds the leaf respawns the exited session, and the retirement never publishes.
+  it('retires an exited split leaf before its stream end, while the durable write is pending', async () => {
+    const { runtime, runtimeStore, getSession, spawn, adoptStablePane, activate, terminalLeafIds } =
+      await startSplitHost()
+
+    const disk = makeDeferred()
+    Object.assign(runtimeStore, { flushPendingOrThrowAsync: () => disk.promise })
+    const published = vi.fn()
+    runtime.onMobileSessionTabsChanged(published)
+    // The stream end: the mirror's re-activation starts the moment the host releases it.
+    let reactivation: Promise<unknown> | undefined
+    let observedAtStreamEnd: { binding?: string; publications: number } | undefined
+    runtime.subscribeToPtyExit('pty-b', () => {
+      observedAtStreamEnd = {
+        binding:
+          getSession().terminalLayoutsByTabId['host-tab']?.ptyIdsByLeafId?.[
+            HEADLESS_SECOND_LEAF_ID
+          ],
+        publications: published.mock.calls.length
+      }
+      reactivation = activate(HEADLESS_SECOND_LEAF_ID, 'automatic').catch((error) => error)
+    })
+    const exiting = runtime.onPtyExit('pty-b', 0, undefined, { providerExitObserved: true })
+
+    // Why: whatever answers the stream end, over any transport, must already see the leaf retired.
+    expect(observedAtStreamEnd).toEqual({ binding: undefined, publications: 1 })
+    expect(reactivation).toBeDefined()
+    // Why: the refusal must come from the lookup, before any stable-pane adoption can revive it.
+    expect(await reactivation).toEqual(new Error('tab_not_found'))
+    expect(adoptStablePane).toHaveBeenCalledTimes(2)
+    expect(spawn).toHaveBeenCalledTimes(2)
+    expect(await terminalLeafIds()).toEqual([HEADLESS_LEAF_ID])
+    expect(
+      getSession().terminalLayoutsByTabId['host-tab']?.ptyIdsByLeafId?.[HEADLESS_SECOND_LEAF_ID]
+    ).toBeUndefined()
+
+    disk.resolve()
+    await exiting
+    expect(await terminalLeafIds()).toEqual([HEADLESS_LEAF_ID])
+  })
+
+  // Why: the process is gone whether or not the profile admits the write (quit, maintenance).
+  it('retires the pane and ends the stream when the profile refuses the staging write', async () => {
+    const { runtime, runtimeStore, activate, terminalLeafIds } = await startSplitHost()
+    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined)
+    runtimeStore.setWorkspaceSession.mockImplementation(() => {
+      throw new Error('Profile maintenance or finalization is blocking new terminal snapshot work')
+    })
+    const streamEnd = vi.fn()
+    runtime.subscribeToPtyExit('pty-b', streamEnd)
+
+    await runtime.onPtyExit('pty-b', 0, undefined, { providerExitObserved: true })
+
+    expect(streamEnd).toHaveBeenCalledOnce()
+    expect(await terminalLeafIds()).toEqual([HEADLESS_LEAF_ID])
+    await expect(activate(HEADLESS_SECOND_LEAF_ID, 'automatic')).rejects.toThrow('tab_not_found')
+    expect(errorSpy).toHaveBeenCalledWith(
+      '[runtime] could not stage terminal retirement:',
+      expect.any(Error)
+    )
+    errorSpy.mockRestore()
+  })
+
+  // Why: the stream end now waits behind the exit cleanup; a cleanup fault must not strand it.
+  it('still ends the stream when exit cleanup throws before the retirement', () => {
+    const runtime = new OrcaRuntimeService()
+    Object.assign(runtime, {
+      disposeHeadlessTerminal: () => {
+        throw new Error('dispose_failed')
+      }
+    })
+    const streamEnd = vi.fn()
+    runtime.subscribeToPtyExit('pty-a', streamEnd)
+
+    expect(() => runtime.onPtyExit('pty-a', 0)).toThrow('dispose_failed')
+    expect(streamEnd).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts
index b37fa4963d4d..6974a6f7f8f2 100644
--- a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts
@@ -478,6 +478,7 @@ describe('OrcaRuntimeService', () => {
     )
     const kill = vi.fn(() => true)
     const closeTerminal = vi.fn()
+    const closeTerminalPane = vi.fn()
     const runtime = new OrcaRuntimeService(runtimeStore as never)
     runtime.setPtyController({
       write: () => true,
@@ -485,7 +486,8 @@ describe('OrcaRuntimeService', () => {
       getForegroundProcess: async () => null,
       listProcesses: async () => []
     })
-    runtime.setNotifier({ closeTerminal } as never)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: these close paths call only the listed notifier methods.
+    runtime.setNotifier({ closeTerminal, closeTerminalPane } as never)
     runtime.syncWindowGraph(1, {
       tabs: [
         {
@@ -524,8 +526,13 @@ describe('OrcaRuntimeService', () => {
     // Exact split leaf: kill only that leaf's PTY, keep the sibling, don't tear down the parent.
     expect(kill).toHaveBeenCalledWith('serve-right')
     expect(kill).not.toHaveBeenCalledWith('serve-left')
+    // Only the leaf-addressed notice for the closed pane; never a whole-tab close.
+    expect(closeTerminalPane).toHaveBeenCalledExactlyOnceWith('host-tab', HEADLESS_SECOND_LEAF_ID)
     expect(closeTerminal).not.toHaveBeenCalled()
     expect(getSession().tabsByWorktree[TEST_WORKTREE_ID]).toHaveLength(1)
-    expect(getSession().terminalLayoutsByTabId['host-tab']).toBeDefined()
+    expect(getSession().terminalLayoutsByTabId['host-tab']?.root).toEqual({
+      type: 'leaf',
+      leafId: HEADLESS_LEAF_ID
+    })
   })
 })
diff --git a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts
index 27421489abac..a47f037d40e8 100644
--- a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts
@@ -602,7 +602,7 @@ describe('OrcaRuntimeService', () => {
       expect(write).toHaveBeenCalledTimes(2)
       expect(write.mock.calls[0][0]).toBe('pty-bare')
       expect(String(write.mock.calls[0][1])).toMatch(/codex/)
-      expect(write.mock.calls[1]).toEqual(['pty-bare', '\r'])
+      expect(write.mock.calls[1]).toEqual(['pty-bare', '\r', 'launch'])
     } finally {
       vi.useRealTimers()
     }
diff --git a/src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts b/src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts
index c3000e90bd29..fe8f7e08fab4 100644
--- a/src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts
@@ -235,6 +235,7 @@ describe('OrcaRuntimeService', () => {
 
   it('closes the matching mobile terminal UUID leaf without closing the whole tab', async () => {
     const closeTerminal = vi.fn()
+    const closeTerminalPane = vi.fn()
     const kill = vi.fn(() => true)
     const runtime = new OrcaRuntimeService(store)
     runtime.setPtyController({
@@ -253,6 +254,7 @@ describe('OrcaRuntimeService', () => {
       renameTerminal: vi.fn(),
       focusTerminal: vi.fn(),
       closeTerminal,
+      closeTerminalPane,
       sleepWorktree: vi.fn(),
       terminalFitOverrideChanged: vi.fn(),
       terminalDriverChanged: vi.fn()
@@ -313,6 +315,8 @@ describe('OrcaRuntimeService', () => {
     await runtime.closeMobileSessionTab(`id:${TEST_WORKTREE_ID}`, `tab-1::${rightLeafId}`)
 
     expect(kill).toHaveBeenCalledWith('pty-right')
+    // Only the leaf-addressed notice for the closed pane; never a whole-tab close.
+    expect(closeTerminalPane).toHaveBeenCalledExactlyOnceWith('tab-1', rightLeafId)
     expect(closeTerminal).not.toHaveBeenCalled()
   })
 
diff --git a/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts b/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts
index 9145bea46f60..d90dc63031b2 100644
--- a/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts
@@ -467,7 +467,7 @@ describe('OrcaRuntimeService', () => {
     })
     const { handle } = await runtime.createTerminal(`path:${TEST_WORKTREE_PATH}`)
 
-    await runtime.sendTerminal(handle, { text: 'continue', enter: true })
+    await runtime.sendTerminal(handle, { text: 'continue', enter: true }, { inputKind: 'driving' })
 
     expect(writes).toEqual(['continue', '\r'])
   })
@@ -490,7 +490,7 @@ describe('OrcaRuntimeService', () => {
       const { handle } = await runtime.createTerminal(`path:${TEST_WORKTREE_PATH}`)
       const prompt = 'line one\nline two\x1b[201~'
 
-      const sendPromise = runtime.sendTerminalAgentPrompt(handle, prompt)
+      const sendPromise = runtime.sendTerminalAgentPrompt(handle, prompt, { inputKind: 'driving' })
       await vi.runAllTimersAsync()
       const result = await sendPromise
 
@@ -535,6 +535,7 @@ describe('OrcaRuntimeService', () => {
       )
 
       const sendPromise = runtime.sendTerminalAgentPrompt(handle, 'the brief', {
+        inputKind: 'driving',
         leadLine: ORCA_DISPATCH_PROMPT_LEAD_LINE
       })
       await vi.runAllTimersAsync()
@@ -601,6 +602,7 @@ describe('OrcaRuntimeService', () => {
         const assertAuthority = vi.fn()
 
         const sendPromise = runtime.sendTerminalAgentPrompt(handle, 'review this change', {
+          inputKind: 'driving',
           beforeWrite: assertAuthority
         })
         await vi.advanceTimersByTimeAsync(500)
@@ -659,7 +661,9 @@ describe('OrcaRuntimeService', () => {
         'review this change',
         agent
       )
-      const sendPromise = runtime.sendTerminalAgentPrompt(handle, 'review this change')
+      const sendPromise = runtime.sendTerminalAgentPrompt(handle, 'review this change', {
+        inputKind: 'driving'
+      })
       if (agent === 'omp') {
         await sendPromise
         expect(writes).toEqual([`${buildAgentPromptPasteBytes('review this change')}\r`])
diff --git a/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts b/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts
index 8b27ce9bb5da..fe3687aab0a7 100644
--- a/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts
@@ -44,7 +44,9 @@ describe('OrcaRuntimeService', () => {
       const { handle } = await runtime.createTerminal(`path:${TEST_WORKTREE_PATH}`)
 
       await expect(runtime.isTerminalRunningSettledPromptAgent(handle)).resolves.toBe(true)
-      const sendPromise = runtime.sendTerminalAgentPrompt(handle, 'review this change')
+      const sendPromise = runtime.sendTerminalAgentPrompt(handle, 'review this change', {
+        inputKind: 'driving'
+      })
       await vi.advanceTimersByTimeAsync(1_199)
       expect(writes).not.toContain('\r')
       await vi.advanceTimersByTimeAsync(1_500)
@@ -78,7 +80,9 @@ describe('OrcaRuntimeService', () => {
         launchAgent: 'claude'
       })
 
-      const sendPromise = runtime.sendTerminalAgentPrompt(handle, 'review this change')
+      const sendPromise = runtime.sendTerminalAgentPrompt(handle, 'review this change', {
+        inputKind: 'driving'
+      })
       await vi.advanceTimersByTimeAsync(renderGateCapMs('review this change') - 1)
       expect(writes).not.toContain('\r')
 
@@ -117,7 +121,9 @@ describe('OrcaRuntimeService', () => {
         launchAgent: 'codex'
       })
 
-      const sendPromise = runtime.sendTerminalAgentPrompt(handle, 'review this change')
+      const sendPromise = runtime.sendTerminalAgentPrompt(handle, 'review this change', {
+        inputKind: 'driving'
+      })
       await vi.advanceTimersByTimeAsync(8_000)
       expect(writes).not.toContain('\r')
       await vi.advanceTimersByTimeAsync(1_599)
@@ -159,7 +165,9 @@ describe('OrcaRuntimeService', () => {
         launchAgent: 'claude'
       })
 
-      const sendPromise = runtime.sendTerminalAgentPrompt(handle, 'review this change')
+      const sendPromise = runtime.sendTerminalAgentPrompt(handle, 'review this change', {
+        inputKind: 'driving'
+      })
       // The marker at 100 ms re-arms the cap, but the ingest term is absolute: a prompt this
       // small is already ingested by then, so the fallback is one flat render timeout later.
       await vi.advanceTimersByTimeAsync(100 + 8_000 - 1)
@@ -193,7 +201,7 @@ describe('OrcaRuntimeService', () => {
       })
       const prompt = `${'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES)}\ntail`
 
-      const sendPromise = runtime.sendTerminalAgentPrompt(handle, prompt)
+      const sendPromise = runtime.sendTerminalAgentPrompt(handle, prompt, { inputKind: 'driving' })
       await vi.runAllTimersAsync()
       const result = await sendPromise
 
@@ -230,7 +238,7 @@ describe('OrcaRuntimeService', () => {
       })
       const prompt = 'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES + 1)
 
-      const sendPromise = runtime.sendTerminalAgentPrompt(handle, prompt)
+      const sendPromise = runtime.sendTerminalAgentPrompt(handle, prompt, { inputKind: 'driving' })
       const sendRejection = expect(sendPromise).rejects.toThrow('terminal_not_writable')
       await vi.runAllTimersAsync()
 
@@ -258,7 +266,7 @@ describe('OrcaRuntimeService', () => {
     const { handle } = await runtime.createTerminal(`path:${TEST_WORKTREE_PATH}`)
     const text = ['x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES), 'tail'].join('')
 
-    const result = await runtime.sendTerminal(handle, { text })
+    const result = await runtime.sendTerminal(handle, { text }, { inputKind: 'driving' })
 
     expect(result).toMatchObject({
       handle,
@@ -285,7 +293,7 @@ describe('OrcaRuntimeService', () => {
       const { handle } = await runtime.createTerminal(`path:${TEST_WORKTREE_PATH}`)
 
       const text = `${'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES)}\nline two\nline three`
-      await runtime.sendTerminal(handle, { text, enter: true })
+      await runtime.sendTerminal(handle, { text, enter: true }, { inputKind: 'driving' })
 
       expect(writes.at(-1)).toBe('\r')
       expect(writes.slice(0, -1).join('')).toBe(text)
@@ -312,7 +320,7 @@ describe('OrcaRuntimeService', () => {
 
     vi.useFakeTimers()
     try {
-      const sendPromise = runtime.sendTerminal(handle, { text })
+      const sendPromise = runtime.sendTerminal(handle, { text }, { inputKind: 'driving' })
 
       expect(writes).toEqual([])
 
@@ -346,7 +354,11 @@ describe('OrcaRuntimeService', () => {
     const { handle } = await runtime.createTerminal(`path:${TEST_WORKTREE_PATH}`)
 
     await expect(
-      runtime.sendTerminal(handle, { text: 'x'.repeat(TERMINAL_INPUT_MAX_BYTES + 1) })
+      runtime.sendTerminal(
+        handle,
+        { text: 'x'.repeat(TERMINAL_INPUT_MAX_BYTES + 1) },
+        { inputKind: 'driving' }
+      )
     ).rejects.toThrow(TERMINAL_INPUT_TOO_LARGE_ERROR)
     expect(writes).toEqual([])
   })
diff --git a/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts b/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts
index ef0a1a96de53..ef895661c106 100644
--- a/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts
@@ -1,5 +1,7 @@
 import { describe, expect, it, vi } from 'vitest'
 import { OrcaRuntimeService } from '../orca-runtime-test-mocks.spec'
+import type { PtyProviderBufferSnapshot } from '../../providers/pty-provider-contract'
+import { TerminalKittyKeyboardModeTracker } from '../../../shared/terminal-kitty-keyboard-mode-tracker'
 import {
   HEADLESS_LEAF_ID,
   TEST_WORKTREE_ID,
@@ -199,6 +201,79 @@ describe('OrcaRuntimeService', () => {
     expect(snapshot?.data).not.toContain('line-0')
   })
 
+  it('resets input modes through the PTY controller and the headless model', async () => {
+    const resetInputModes = vi.fn().mockResolvedValue(undefined)
+    const runtime = new OrcaRuntimeService(store)
+    runtime.setPtyController({
+      write: () => true,
+      kill: () => true,
+      getForegroundProcess: async () => null,
+      resetInputModes
+    })
+    syncSinglePty(runtime, 'pty-1')
+    // An app armed these and crashed with no command end.
+    runtime.onPtyData('pty-1', 'prompt$ app\r\n\x1b[>31u\x1b[?1000h\x1b[?2004h', 123)
+    const [terminal] = (await runtime.listTerminals()).terminals
+    const armed = await runtime.serializeTerminalBuffer('pty-1')
+    expect(armed?.kittyKeyboardFlags).toBe(31)
+
+    await expect(runtime.resetTerminalInputModes(terminal.handle)).resolves.toEqual({
+      handle: terminal.handle,
+      reset: true
+    })
+
+    expect(resetInputModes).toHaveBeenCalledWith('pty-1')
+    const snapshot = await runtime.serializeTerminalBuffer('pty-1')
+    expect(snapshot?.kittyKeyboardFlags).toBe(0)
+    expect(snapshot?.data).not.toContain('\x1b[?1000h')
+    expect(snapshot?.data).not.toContain('\x1b[?2004h')
+  })
+
+  it('grounds the provider mode tracker before a later chunk, in the emulator order', async () => {
+    const runtime = new OrcaRuntimeService(store)
+    syncSinglePty(runtime, 'pty-1')
+    runtime.onPtyData('pty-1', 'prompt$ ', 123)
+    const tracker = new TerminalKittyKeyboardModeTracker()
+    runtime['providerModeTrackersByPtyId'].set('pty-1', tracker)
+
+    // A TUI starts while the reset still waits on the headless write chain.
+    const reset = runtime.resetHeadlessTerminalInputModes('pty-1')
+    runtime.onPtyData('pty-1', '\x1b[?1049h', 124)
+    await reset
+    await runtime['headlessTerminals'].get('pty-1')?.writeChain
+
+    expect(runtime['headlessTerminals'].get('pty-1')?.emulator.isAlternateScreen).toBe(true)
+    expect(tracker.isAlternateScreen).toBe(true)
+  })
+
+  it('grounds an in-flight provider snapshot capture so it cannot publish the pre-reset screen', async () => {
+    let resolveSnapshot: (snapshot: PtyProviderBufferSnapshot) => void = () => {}
+    const runtime = new OrcaRuntimeService(store)
+    runtime.setPtyController({
+      write: () => true,
+      kill: () => true,
+      getForegroundProcess: async () => null,
+      serializeProviderBuffer: () => new Promise((resolve) => (resolveSnapshot = resolve))
+    })
+    syncSinglePty(runtime, 'pty-1')
+    const generation = runtime['getPtyLifecycleGeneration']('pty-1')
+
+    // The capture's daemon request left before the reset; its answer predates the ground.
+    const capture = runtime['captureProviderTerminalBuffer']('pty-1', {}, generation)
+    await runtime.resetHeadlessTerminalInputModes('pty-1')
+    resolveSnapshot({
+      data: '',
+      cols: 80,
+      rows: 24,
+      seq: 1,
+      source: 'headless',
+      alternateScreen: true
+    })
+    await capture
+
+    expect(runtime['providerModeTrackersByPtyId'].get('pty-1')?.isAlternateScreen).toBe(false)
+  })
+
   it('waits for terminal exit and resolves with the exit status', async () => {
     const runtime = new OrcaRuntimeService(store)
 
diff --git a/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts b/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts
index 6aa0c6bd70f9..92612c2e7633 100644
--- a/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts
@@ -223,4 +223,74 @@ describe('OrcaRuntimeService', () => {
 
     expect(spawn.mock.calls[0]?.[0]?.command).not.toMatch(/--model/)
   })
+
+  // Every agent the runtime builds is attributed, so a launch whose caller named no surface still
+  // counts; only the caller's surface is taken, the rest is derived from the agent it resolved.
+  it.each([
+    ['orchestration', 'orchestration'],
+    [undefined, 'unknown'],
+    ['a_surface_added_later', 'unknown']
+  ])('attributes a startup-agent launch named %s as %s', async (launchSource, expected) => {
+    const spawn = vi.fn().mockResolvedValue({ id: 'pty-attributed' })
+    const runtime = new OrcaRuntimeService(store)
+    runtime.setPtyController({
+      spawn,
+      write: () => true,
+      kill: () => true,
+      getForegroundProcess: async () => null
+    })
+
+    await runtime.createTerminal(`path:${TEST_WORKTREE_PATH}`, {
+      startupAgent: 'claude',
+      ...(launchSource ? { launchSource } : {})
+    })
+
+    expect(spawn.mock.calls[0]?.[0]?.telemetry).toEqual({
+      agent_kind: 'claude-code',
+      launch_source: expected,
+      request_kind: 'new'
+    })
+  })
+
+  it('attributes a fresh agent session the host builds as unknown', async () => {
+    const spawn = vi.fn().mockResolvedValue({ id: 'pty-session' })
+    const runtime = new OrcaRuntimeService(store)
+    runtime.setPtyController({
+      spawn,
+      write: () => true,
+      kill: () => true,
+      getForegroundProcess: async () => null
+    })
+
+    await runtime.createAgentSession(
+      {
+        clientOperationId: `${Date.now()}-${'cd'.repeat(16)}`,
+        worktree: `id:${TEST_WORKTREE_ID}`,
+        agent: 'claude'
+      },
+      { clientId: 'remote-desktop', clientKind: 'runtime' }
+    )
+
+    expect(spawn.mock.calls[0]?.[0]?.telemetry).toEqual({
+      agent_kind: 'claude-code',
+      launch_source: 'unknown',
+      request_kind: 'new'
+    })
+  })
+
+  it('leaves a bare agent command the user typed out of launch attribution', async () => {
+    const spawn = vi.fn().mockResolvedValue({ id: 'pty-bare' })
+    const runtime = new OrcaRuntimeService(store)
+    runtime.setPtyController({
+      spawn,
+      write: () => true,
+      kill: () => true,
+      getForegroundProcess: async () => null
+    })
+
+    await runtime.createTerminal(`path:${TEST_WORKTREE_PATH}`, { command: 'claude' })
+
+    expect(spawn.mock.calls[0]?.[0]?.launchAgent).toBe('claude')
+    expect(spawn.mock.calls[0]?.[0]?.telemetry).toBeUndefined()
+  })
 })
diff --git a/src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts b/src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts
index 237afc57bc96..be454a5bde84 100644
--- a/src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts
@@ -142,7 +142,7 @@ describe('OrcaRuntimeService', () => {
     syncSinglePty(runtime, 'pty-1', { paneTitle: 'claude agents' })
     const [terminal] = (await runtime.listTerminals()).terminals
 
-    expect(runtime.getAgentStatusForHandle(terminal.handle)).toBeNull()
+    await expect(runtime.getAgentStatusForHandle(terminal.handle)).resolves.toBeNull()
   })
 
   it('lists live terminals with fresh pane titles over stale tab titles', async () => {
diff --git a/src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts b/src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts
index 65757797f70f..e122effd17dd 100644
--- a/src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts
@@ -230,7 +230,7 @@ describe('OrcaRuntimeService', () => {
     expect(new Set(handles).size).toBe(handles.length)
 
     await expect(
-      runtime.sendTerminal('term_victim', { text: 'for victim' })
+      runtime.sendTerminal('term_victim', { text: 'for victim' }, { inputKind: 'driving' })
     ).resolves.toMatchObject({ accepted: true })
     expect(writesByPty.get('pty-victim')).toEqual(['for victim'])
     expect(writesByPty.has('pty-imposter')).toBe(false)
@@ -260,7 +260,7 @@ describe('OrcaRuntimeService', () => {
     const listed = await runtime.listTerminals()
     expect(listed.terminals[0]?.handle).toBe('term_already_bound')
     await expect(
-      runtime.sendTerminal('term_already_bound', { text: 'still routed' })
+      runtime.sendTerminal('term_already_bound', { text: 'still routed' }, { inputKind: 'driving' })
     ).resolves.toMatchObject({ accepted: true })
     expect(writes).toEqual(['still routed'])
     // the reported-but-not-adopted handle must not resolve to the live pty
@@ -347,7 +347,9 @@ describe('OrcaRuntimeService', () => {
       handle,
       tail: ['after unavailable']
     })
-    await expect(runtime.sendTerminal(handle, { text: 'still writable' })).resolves.toMatchObject({
+    await expect(
+      runtime.sendTerminal(handle, { text: 'still writable' }, { inputKind: 'driving' })
+    ).resolves.toMatchObject({
       handle,
       accepted: true
     })
diff --git a/src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts b/src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts
index 1ebf15cbc24f..dffd6e971eb7 100644
--- a/src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts
@@ -54,7 +54,7 @@ describe('OrcaRuntimeService', () => {
       tail: ['after restart']
     })
     await expect(
-      runtime.sendTerminal('term_exported', { text: 'still writable' })
+      runtime.sendTerminal('term_exported', { text: 'still writable' }, { inputKind: 'driving' })
     ).resolves.toMatchObject({
       handle: 'term_exported',
       accepted: true
@@ -179,7 +179,7 @@ describe('OrcaRuntimeService', () => {
     ])
     expect(getSession().terminalTopologyRevisionByRepoId?.[TEST_REPO_ID]).toBe(1)
 
-    await runtime.sendTerminal('term_agent', { text: 'input' })
+    await runtime.sendTerminal('term_agent', { text: 'input' }, { inputKind: 'driving' })
     await runtime.updateRemoteDesktopViewer('pty-agent', 'viewer', 'client', 132, 41)
     expect(writes).toEqual([['pty-agent', 'input']])
     expect(resize).toHaveBeenCalledWith('pty-agent', 132, 41)
@@ -609,7 +609,10 @@ describe('OrcaRuntimeService', () => {
       condition: 'tui-idle',
       timeoutMs: 50
     })
-    await vi.waitFor(() => expect(serializeProviderBuffer).toHaveBeenCalledTimes(4))
+    // The probe's read starts a microtask late; a 50 ms poll would race the wait's 50 ms timeout.
+    await vi.waitFor(() => expect(serializeProviderBuffer).toHaveBeenCalledTimes(4), {
+      interval: 1
+    })
     runtime.onPtyData('pty-legacy', '\x1b[H', Date.now())
     lateReadySnapshot.resolve({
       data: READY_SCREEN,
diff --git a/src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts b/src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts
index 8980dc53f854..b9f605ccf910 100644
--- a/src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts
@@ -65,7 +65,7 @@ describe('OrcaRuntimeService', () => {
     const afterRestart = await restarted.listMobileSessionTabs(`id:${TEST_WORKTREE_ID}`)
     const listed = await restarted.listTerminals(`id:${TEST_WORKTREE_ID}`)
     restarted.onPtyData('persisted-pty', 'after restart\n', 1)
-    await restarted.sendTerminal('term_current', { text: 'input' })
+    await restarted.sendTerminal('term_current', { text: 'input' }, { inputKind: 'driving' })
     await restarted.updateRemoteDesktopViewer('persisted-pty', 'viewer', 'client', 132, 41)
 
     expect(beforeRestart.tabs[0]).toMatchObject({
@@ -146,6 +146,58 @@ describe('OrcaRuntimeService', () => {
     ).rejects.toThrow('terminal_topology_conflict')
   })
 
+  // The client's retirement proofs die with a host restart; the close record does not.
+  it('refuses to adopt an orphan under a tab the user closed', async () => {
+    const session = {
+      ...getDefaultWorkspaceSession(),
+      tabsByWorktree: { [TEST_WORKTREE_ID]: [] },
+      terminalTopologyRevisionByRepoId: { [TEST_REPO_ID]: 7 },
+      closedTerminalTabTombstonesByTabId: {
+        'tab-closed': {
+          closedAt: Date.now(),
+          worktreeId: TEST_WORKTREE_ID,
+          reason: 'user' as const
+        }
+      }
+    }
+    const { runtimeStore } = makeRuntimeStoreWithWorkspaceSession(session)
+    const runtime = new OrcaRuntimeService(
+      withDurableRuntimeStore({ ...runtimeStore, flushOrThrow: vi.fn() })
+    )
+    runtime.setPtyController({
+      write: () => true,
+      kill: () => true,
+      getForegroundProcess: async () => null,
+      listProcesses: async () => [
+        {
+          id: 'pty-closed',
+          incarnationId: 'inc-closed',
+          terminalHandle: 'term_closed',
+          title: 'shell',
+          cwd: TEST_WORKTREE_PATH,
+          worktreeId: TEST_WORKTREE_ID,
+          wslDistro: null
+        }
+      ]
+    })
+
+    await expect(
+      runtime.adoptTerminalOrphans({
+        worktree: `id:${TEST_WORKTREE_ID}`,
+        expectedTopologyRevision: 7,
+        claims: [
+          {
+            terminal: 'term_closed',
+            ptyId: 'pty-closed',
+            incarnationId: 'inc-closed',
+            tabId: 'tab-closed',
+            leafId: HEADLESS_LEAF_ID
+          }
+        ]
+      })
+    ).rejects.toThrow('terminal_orphan_surface_retired')
+  })
+
   it('keeps orphaned list and show writability aligned with the send gate', async () => {
     const { runtimeStore } = makeRuntimeStoreWithWorkspaceSession({
       ...getDefaultWorkspaceSession(),
@@ -183,7 +235,9 @@ describe('OrcaRuntimeService', () => {
 
     const shown = await runtime.showTerminal(entry!.handle)
     expect(shown.writable).toBe(true)
-    await expect(runtime.sendTerminal(entry!.handle, { text: 'hi' })).resolves.toMatchObject({
+    await expect(
+      runtime.sendTerminal(entry!.handle, { text: 'hi' }, { inputKind: 'driving' })
+    ).resolves.toMatchObject({
       accepted: true
     })
     expect(writes).toEqual([['pty-orphan', 'hi']])
diff --git a/src/main/runtime/orca-runtime-tests/terminal-spawn-dispatch.spec.ts b/src/main/runtime/orca-runtime-tests/terminal-spawn-dispatch.spec.ts
new file mode 100644
index 000000000000..ff3401997705
--- /dev/null
+++ b/src/main/runtime/orca-runtime-tests/terminal-spawn-dispatch.spec.ts
@@ -0,0 +1,70 @@
+import { describe, expect, it, vi } from 'vitest'
+import { OrcaRuntimeService } from '../orca-runtime-test-mocks.spec'
+import { TEST_WORKTREE_PATH, store } from '../orca-runtime-test-fixtures.spec'
+
+// `agent.launch` settles a launch as failed only when its create threw before this hook ran.
+describe('OrcaRuntimeService createTerminal spawn dispatch', () => {
+  it('reports the spawn request before it leaves for the pty controller', async () => {
+    const dispatched = vi.fn()
+    const spawn = vi.fn(async () => {
+      expect(dispatched).toHaveBeenCalledOnce()
+      return { id: 'pty-dispatch' }
+    })
+    const runtime = new OrcaRuntimeService(store)
+    runtime.setPtyController({
+      spawn,
+      write: () => true,
+      kill: () => true,
+      getForegroundProcess: async () => null
+    })
+
+    await runtime.createTerminal(`path:${TEST_WORKTREE_PATH}`, {
+      command: 'codex',
+      onPtySpawnDispatched: dispatched
+    })
+
+    expect(spawn).toHaveBeenCalledOnce()
+  })
+
+  it('reports it even when the spawn itself then fails', async () => {
+    const dispatched = vi.fn()
+    const runtime = new OrcaRuntimeService(store)
+    runtime.setPtyController({
+      spawn: vi.fn(async () => {
+        throw new Error('ssh_channel_closed')
+      }),
+      write: () => true,
+      kill: () => true,
+      getForegroundProcess: async () => null
+    })
+
+    await expect(
+      runtime.createTerminal(`path:${TEST_WORKTREE_PATH}`, {
+        command: 'codex',
+        onPtySpawnDispatched: dispatched
+      })
+    ).rejects.toThrow('ssh_channel_closed')
+    expect(dispatched).toHaveBeenCalledOnce()
+  })
+
+  it('does not report it when the create fails before any spawn request', async () => {
+    const dispatched = vi.fn()
+    const spawn = vi.fn()
+    const runtime = new OrcaRuntimeService(store)
+    runtime.setPtyController({
+      spawn,
+      write: () => true,
+      kill: () => true,
+      getForegroundProcess: async () => null
+    })
+
+    await expect(
+      runtime.createTerminal('path:/no/such/workspace', {
+        command: 'codex',
+        onPtySpawnDispatched: dispatched
+      })
+    ).rejects.toThrow()
+    expect(spawn).not.toHaveBeenCalled()
+    expect(dispatched).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts b/src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts
index cc73ffa27180..5a5c95214031 100644
--- a/src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts
@@ -418,7 +418,11 @@ describe('OrcaRuntimeService', () => {
     await Promise.resolve()
     await Promise.resolve()
 
-    expect(write).toHaveBeenCalledWith('pty-startup-draft', `\x1b[200~${draftUrl}\x1b[201~`)
+    expect(write).toHaveBeenCalledWith(
+      'pty-startup-draft',
+      `\x1b[200~${draftUrl}\x1b[201~`,
+      'launch'
+    )
   })
 
   it('keeps the 8s main-runtime startup readiness budget for agents without an override', async () => {
@@ -554,7 +558,11 @@ describe('OrcaRuntimeService', () => {
     await Promise.resolve()
     await Promise.resolve()
 
-    expect(write).toHaveBeenCalledWith('pty-opencode-draft-budget', `\x1b[200~${draftUrl}\x1b[201~`)
+    expect(write).toHaveBeenCalledWith(
+      'pty-opencode-draft-budget',
+      `\x1b[200~${draftUrl}\x1b[201~`,
+      'launch'
+    )
   })
 
   it('rejects explicit startup commands for disabled selected agents', async () => {
diff --git a/src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-04.spec.ts b/src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-04.spec.ts
index 2ec8e73f8000..d3d2ee8b44a5 100644
--- a/src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-04.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-04.spec.ts
@@ -83,7 +83,7 @@ describe('OrcaRuntimeService', () => {
       })
     )
     await vi.waitFor(() => {
-      expect(write).toHaveBeenCalledWith('pty-cli-aider-startup', 'fix it\r')
+      expect(write).toHaveBeenCalledWith('pty-cli-aider-startup', 'fix it\r', 'launch')
     })
   })
 
@@ -509,6 +509,7 @@ describe('OrcaRuntimeService', () => {
       repoSelector: 'id:repo-1',
       name: 'runtime-explicit-draft',
       startupDraft: draftUrl,
+      startupLaunchSource: 'cli',
       createdWithAgent: 'codex',
       activate: true
     })
@@ -519,14 +520,20 @@ describe('OrcaRuntimeService', () => {
       expect.objectContaining({
         cwd: '/tmp/workspaces/runtime-explicit-draft',
         command: "codex '--dangerously-bypass-approvals-and-sandbox'",
-        worktreeId: result.worktree.id
+        worktreeId: result.worktree.id,
+        // The host picked and launched this agent, so it carries the caller's surface too.
+        telemetry: { agent_kind: 'codex', launch_source: 'cli', request_kind: 'new' }
       })
     )
     expect(metaById[result.worktree.id]).toMatchObject({ createdWithAgent: 'codex' })
 
     runtime.onPtyData('pty-explicit-draft', '\x1b[?2004h›', Date.now())
     await vi.waitFor(() => {
-      expect(write).toHaveBeenCalledWith('pty-explicit-draft', `\x1b[200~${draftUrl}\x1b[201~`)
+      expect(write).toHaveBeenCalledWith(
+        'pty-explicit-draft',
+        `\x1b[200~${draftUrl}\x1b[201~`,
+        'launch'
+      )
     })
   })
 
diff --git a/src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-05.spec.ts b/src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-05.spec.ts
index c4ac5ea9a84b..d341496786e0 100644
--- a/src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-05.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-05.spec.ts
@@ -189,7 +189,11 @@ describe('OrcaRuntimeService', () => {
     }
     const fsProvider = {
       realpath: vi.fn().mockResolvedValue('/remote/mobile-codex-draft'),
-      readFile: vi.fn().mockRejectedValue(new Error('missing config')),
+      readFile: vi
+        .fn()
+        .mockRejectedValue(
+          new Error("ENOENT: no such file or directory, stat '/home/dev/.codex/config.toml'")
+        ),
       createDir: vi.fn().mockResolvedValue(undefined),
       writeFile: vi.fn().mockResolvedValue(undefined)
     }
@@ -302,7 +306,11 @@ describe('OrcaRuntimeService', () => {
     }
     const fsProvider = {
       realpath: vi.fn().mockResolvedValue('/remote/mobile-codex-command'),
-      readFile: vi.fn().mockRejectedValue(new Error('missing config')),
+      readFile: vi
+        .fn()
+        .mockRejectedValue(
+          new Error("ENOENT: no such file or directory, stat '/home/dev/.codex/config.toml'")
+        ),
       createDir: vi.fn().mockResolvedValue(undefined),
       writeFile: vi.fn().mockResolvedValue(undefined)
     }
diff --git a/src/main/runtime/orca-runtime-touch-mobile-session-tabs-for-worktree.ts b/src/main/runtime/orca-runtime-touch-mobile-session-tabs-for-worktree.ts
index 7a08f8f3bacf..3c18eb68def3 100644
--- a/src/main/runtime/orca-runtime-touch-mobile-session-tabs-for-worktree.ts
+++ b/src/main/runtime/orca-runtime-touch-mobile-session-tabs-for-worktree.ts
@@ -27,8 +27,8 @@ export class OrcaRuntimeWithTouchMobileSessionTabsForWorktree extends OrcaRuntim
       snapshotVersion: snapshot.snapshotVersion + 1
     })
     if (options.immediate) {
-      // Why: readiness/lifecycle changes are structural and must not wait
-      // behind the title/status coalescing window.
+      // Why: an exit is structural and must not wait behind the title/status window. A
+      // registration's ready flip coalesces so it merges with the spawn's graph update.
       this.notifyMobileSessionTabsChanged(worktreeId)
       return
     }
@@ -126,7 +126,11 @@ export class OrcaRuntimeWithTouchMobileSessionTabsForWorktree extends OrcaRuntim
           tab.parentTabId,
           tab.leafId,
           tab.ptyId
-        )
+        ) ||
+        // Why: after a cold restore the saved session is the only membership record until the PTY
+        // registers. Frame-only; once listed, the surface's graph leaves pass the shared predicate
+        // like any listed surface's. Host-side single-writer membership absorbs this.
+        this.hasPersistedTerminalSurfaceMembership(snapshot.worktree, tab.parentTabId, tab.leafId)
       ) {
         continue
       }
diff --git a/src/main/runtime/orca-runtime-visible-snapshot-preview.ts b/src/main/runtime/orca-runtime-visible-snapshot-preview.ts
index ac9eb99a67bd..be14a92c3193 100644
--- a/src/main/runtime/orca-runtime-visible-snapshot-preview.ts
+++ b/src/main/runtime/orca-runtime-visible-snapshot-preview.ts
@@ -140,6 +140,24 @@ export class OrcaRuntimeWithVisibleSnapshotPreview extends OrcaRuntimeWithCaptur
     }
   }
 
+  /** Synchronous visible grid of the live emulator, for tui-idle body evidence. Null when the
+   *  model is not the whole screen: a provider-restored partial suffix or a pending hydration. */
+  protected readLiveTerminalScreenLines(ptyId: string | null | undefined): string[] | null {
+    if (!ptyId) {
+      return null
+    }
+    const state = this.headlessTerminals.get(ptyId)
+    if (
+      !state ||
+      this.providerSnapshotPreferredPtys.has(ptyId) ||
+      this.headlessHydrationState.get(ptyId) === 'pending'
+    ) {
+      return null
+    }
+    // Why unawaited writeChain: callers are synchronous; a grid one chunk behind is re-read next poll.
+    return projectTerminalVisibleLines(state.emulator).lines
+  }
+
   protected async parseVisibleSnapshot(snapshot: {
     data: string
     cols: number
diff --git a/src/main/runtime/orca-runtime-wait-for-leaf-pty-id.ts b/src/main/runtime/orca-runtime-wait-for-leaf-pty-id.ts
index 37ac8c5a8394..b3749ec6dba7 100644
--- a/src/main/runtime/orca-runtime-wait-for-leaf-pty-id.ts
+++ b/src/main/runtime/orca-runtime-wait-for-leaf-pty-id.ts
@@ -142,16 +142,6 @@ export class OrcaRuntimeWithWaitForLeafPtyId extends OrcaRuntimeWithRestoreLiveP
   }
 
   // Why: a leaf exists before its PTY spawns; a handle issued while ptyId is null gets invalidated on the next sync, so wait for a connected PTY.
-  protected countLeavesInTab(tabId: string): number {
-    let count = 0
-    for (const leaf of this.leaves.values()) {
-      if (leaf.tabId === tabId) {
-        count++
-      }
-    }
-    return count
-  }
-
   protected resolveHandleForTab(tabId: string): string | null {
     for (const leaf of this.leaves.values()) {
       if (leaf.tabId === tabId && leaf.ptyId !== null) {
diff --git a/src/main/runtime/orca-runtime-write-terminal-agent-prompt.ts b/src/main/runtime/orca-runtime-write-terminal-agent-prompt.ts
index d5fbff1619ad..e1f29315e816 100644
--- a/src/main/runtime/orca-runtime-write-terminal-agent-prompt.ts
+++ b/src/main/runtime/orca-runtime-write-terminal-agent-prompt.ts
@@ -27,7 +27,7 @@ export class OrcaRuntimeWithWriteTerminalAgentPrompt extends OrcaRuntimeWithReso
     ptyId: string,
     generation: number,
     pastePayload: string,
-    options: RuntimeAgentPromptWriteOptions = {}
+    options: RuntimeAgentPromptWriteOptions
   ): Promise<{ submits: number; prompt?: RuntimeTerminalPromptDelivery }> {
     assertAgentPromptRequestActive(options.signal)
     this.assertAgentPromptGeneration(ptyId, generation)
@@ -63,7 +63,7 @@ export class OrcaRuntimeWithWriteTerminalAgentPrompt extends OrcaRuntimeWithReso
       // beginning when a large frame is split into independently processed chunks.
       renderGate?.arm()
       const initialWrite = submitWithPaste ? pastePayload + AGENT_PROMPT_SUBMIT : pastePayload
-      if (!this.ptyController?.write(ptyId, initialWrite)) {
+      if (!this.ptyController?.write(ptyId, initialWrite, options.inputKind)) {
         throw new Error('terminal_not_writable')
       }
     } catch (error) {
@@ -104,7 +104,7 @@ export class OrcaRuntimeWithWriteTerminalAgentPrompt extends OrcaRuntimeWithReso
     const baseline = preSubmitBaseline ?? this.getAgentPromptActivity(handle, ptyId, waitTextCache)
     this.assertAgentPromptPermissionSafe(permissionBaseline, baseline)
     if (!submitWithPaste) {
-      if (!this.ptyController?.write(ptyId, AGENT_PROMPT_SUBMIT)) {
+      if (!this.ptyController?.write(ptyId, AGENT_PROMPT_SUBMIT, options.inputKind)) {
         throw new Error(options.suffixFailureError ?? 'terminal_not_writable')
       }
     }
diff --git a/src/main/runtime/orca-runtime.test.ts b/src/main/runtime/orca-runtime.test.ts
index 13796169be0a..070363fdb3fb 100644
--- a/src/main/runtime/orca-runtime.test.ts
+++ b/src/main/runtime/orca-runtime.test.ts
@@ -51,6 +51,7 @@ await import('./orca-runtime-tests/terminal-creation-and-readiness-part-09.spec'
 await import('./orca-runtime-tests/terminal-creation-and-readiness-part-10.spec')
 await import('./orca-runtime-tests/terminal-creation-and-readiness-part-11.spec')
 await import('./orca-runtime-tests/terminal-creation-and-readiness-part-12.spec')
+await import('./orca-runtime-tests/terminal-spawn-dispatch.spec')
 await import('./orca-runtime-tests/terminal-output-and-worker-recovery.spec')
 await import('./orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec')
 await import('./orca-runtime-tests/terminal-output-and-worker-recovery-part-03.spec')
@@ -78,6 +79,7 @@ await import('./orca-runtime-tests/mobile-session-tabs-part-10.spec')
 await import('./orca-runtime-tests/mobile-session-tabs-part-11.spec')
 await import('./orca-runtime-tests/mobile-session-tabs-part-12.spec')
 await import('./orca-runtime-tests/mobile-session-tabs-part-13.spec')
+await import('./orca-runtime-tests/exit-retirement-activation.spec')
 await import('./orca-runtime-tests/mobile-creation-and-orchestration.spec')
 await import('./orca-runtime-tests/mobile-creation-and-orchestration-part-02.spec')
 await import('./orca-runtime-tests/mobile-creation-and-orchestration-part-03.spec')
diff --git a/src/main/runtime/orchestration/canonical-orca-session-id.ts b/src/main/runtime/orchestration/canonical-orca-session-id.ts
index 7889e257f482..4aee8cbea156 100644
--- a/src/main/runtime/orchestration/canonical-orca-session-id.ts
+++ b/src/main/runtime/orchestration/canonical-orca-session-id.ts
@@ -1,7 +1,38 @@
-import type { OrcaSessionId } from '../../../shared/orca-session-address'
+import { isOrcaSessionId, type OrcaSessionId } from '../../../shared/orca-session-address'
+import {
+  clearedInto,
+  readAgentSessionRecordStore,
+  type AgentSessionRecordReader
+} from './structured-session-lineage'
 
-/** The Orca session id orchestration addresses a session by; every session-to-party step calls this. */
-export function canonicalOrcaSessionId(orcaSessionId: OrcaSessionId): OrcaSessionId {
-  // Later lineage canonicalization (a `/clear`ed session to its lineage root) plugs in here.
-  return orcaSessionId
+/**
+ * The Orca session id orchestration addresses a session by: the first session of its `/clear`
+ * lineage, so a cleared chat keeps the address, Runs and mail it had. Every session-to-party step
+ * calls this. Without a record store there is no lineage to read, and the id stands for itself.
+ */
+export function canonicalOrcaSessionId(
+  orcaSessionId: OrcaSessionId,
+  store: AgentSessionRecordReader | null = readAgentSessionRecordStore()
+): OrcaSessionId {
+  if (!store) {
+    return orcaSessionId
+  }
+  const clearedFrom = new Map<string, string>()
+  for (const record of store.listRecords()) {
+    const next = clearedInto(record)
+    if (next) {
+      clearedFrom.set(next, record.sessionId)
+    }
+  }
+  // A clear chain is acyclic by construction; the visited set only bounds a corrupt store.
+  let root: string = orcaSessionId
+  const earlier = new Set([root])
+  let prior = clearedFrom.get(root)
+  while (prior && !earlier.has(prior)) {
+    earlier.add(prior)
+    root = prior
+    prior = clearedFrom.get(root)
+  }
+  // Record ids are minted as Orca session ids; one that is not cannot name the conversation.
+  return isOrcaSessionId(root) ? root : orcaSessionId
 }
diff --git a/src/main/runtime/orchestration/cli-command.ts b/src/main/runtime/orchestration/cli-command.ts
index 809be9a4b887..af38b95a3508 100644
--- a/src/main/runtime/orchestration/cli-command.ts
+++ b/src/main/runtime/orchestration/cli-command.ts
@@ -1,9 +1,20 @@
 import type { ProjectExecutionRuntimeResolution } from '../../../shared/project-execution-runtime'
 import { isWslUncPath } from '../../../shared/wsl-paths'
 import { splitWorktreeIdForFilesystem } from '../../../shared/worktree/id'
+import { getAppEnvironment, hasAppEnvironment } from '../../../shared/app-environment'
 
 export type OrchestrationCliCommand = 'orca' | 'orca-dev' | 'orca-ide'
 
+/** Dev builds run the CLI as `orca-dev`; a packaged app, or a process with no app, must not advertise it. */
+export function runtimeOrchestrationCliCommand(): OrchestrationCliCommand | undefined {
+  return hasAppEnvironment() && !getAppEnvironment().isPackaged() ? 'orca-dev' : undefined
+}
+
+/** What a local, non-WSL terminal is told to run; a structured session is always one. */
+export function localOrchestrationCliCommand(): OrchestrationCliCommand {
+  return runtimeOrchestrationCliCommand() ?? 'orca'
+}
+
 export function resolveTerminalOrchestrationCliCommand(args: {
   connectionId: string | null
   isWsl: boolean | null | undefined
diff --git a/src/main/runtime/orchestration/coordinator-runtime-contract.ts b/src/main/runtime/orchestration/coordinator-runtime-contract.ts
index 2f4f5bf9b5ae..3c98fa302008 100644
--- a/src/main/runtime/orchestration/coordinator-runtime-contract.ts
+++ b/src/main/runtime/orchestration/coordinator-runtime-contract.ts
@@ -11,7 +11,7 @@ export type CoordinatorRuntime = {
   sendTerminalAgentPrompt(
     handle: string,
     prompt: string,
-    options?: DispatchPreambleSendOptions
+    options: DispatchPreambleSendOptions
   ): Promise<unknown>
   listTerminals(
     worktreeSelector?: string,
diff --git a/src/main/runtime/orchestration/db/dispatch-context/dispatch-context-store.ts b/src/main/runtime/orchestration/db/dispatch-context/dispatch-context-store.ts
index 67be16e6cf26..b51e5b4a8aa2 100644
--- a/src/main/runtime/orchestration/db/dispatch-context/dispatch-context-store.ts
+++ b/src/main/runtime/orchestration/db/dispatch-context/dispatch-context-store.ts
@@ -9,7 +9,7 @@ import { recordedCreatorIdentity, type DispatchCreator } from '../dispatch-depth
 import type { OrchestrationDb } from '../orchestration-db'
 import { transitionLifecycleWithDb } from '../lifecycle-transition'
 import { taskNotFoundError, taskNotStartableError } from '../../task-dispatch-refusal'
-import { structuredWorkerOrcaSessionIdForIncarnation } from '../../../structured-worker-identity'
+import { dispatchAssigneeOrcaSessionId } from '../../dispatch-assignee-orca-session-id'
 
 export function createDispatchContext(
   this: OrchestrationDb,
@@ -66,7 +66,7 @@ export function createDispatchContext(
       launchTokenHash: launchTokenHash ?? null,
       assigneeHandle,
       assigneePaneKey: assigneePaneKey ?? null,
-      assigneeOrcaSessionId: structuredWorkerOrcaSessionIdForIncarnation(processIncarnation),
+      assigneeOrcaSessionId: dispatchAssigneeOrcaSessionId(processIncarnation),
       processIncarnation: processIncarnation ?? null,
       creatorDispatchId,
       ...recordedCreatorIdentity(params.creator),
diff --git a/src/main/runtime/orchestration/db/worker-dispatch/worker-dispatch-authority.ts b/src/main/runtime/orchestration/db/worker-dispatch/worker-dispatch-authority.ts
index bc7b2c0cc0c0..733833c9acab 100644
--- a/src/main/runtime/orchestration/db/worker-dispatch/worker-dispatch-authority.ts
+++ b/src/main/runtime/orchestration/db/worker-dispatch/worker-dispatch-authority.ts
@@ -2,7 +2,7 @@ import { randomBytes } from 'node:crypto'
 import { OrchestrationError } from '../../orchestration-error'
 import { hashDispatchCapability } from '../dispatch-capability-hash'
 import type { OrchestrationDb } from '../orchestration-db'
-import { structuredWorkerOrcaSessionIdForIncarnation } from '../../../structured-worker-identity'
+import { dispatchAssigneeOrcaSessionId } from '../../dispatch-assignee-orca-session-id'
 
 export function prepareStartingWorkerAuthority(
   this: OrchestrationDb,
@@ -64,7 +64,7 @@ export function prepareStartingWorkerAuthority(
       .run(
         params.handle,
         params.paneKey,
-        structuredWorkerOrcaSessionIdForIncarnation(params.processIncarnation),
+        dispatchAssigneeOrcaSessionId(params.processIncarnation),
         params.processIncarnation,
         params.hostScope ?? null,
         hashDispatchCapability(capability),
diff --git a/src/main/runtime/orchestration/db/worker-terminal/failed-start-dispatch-identity.ts b/src/main/runtime/orchestration/db/worker-terminal/failed-start-dispatch-identity.ts
index 490cfbb11384..3d45c9a86304 100644
--- a/src/main/runtime/orchestration/db/worker-terminal/failed-start-dispatch-identity.ts
+++ b/src/main/runtime/orchestration/db/worker-terminal/failed-start-dispatch-identity.ts
@@ -1,6 +1,6 @@
 import type { WorkerDispatchRow } from '../../types'
 import type { OrchestrationDb } from '../orchestration-db'
-import { structuredWorkerOrcaSessionIdForIncarnation } from '../../../structured-worker-identity'
+import { dispatchAssigneeOrcaSessionId } from '../../dispatch-assignee-orca-session-id'
 
 /**
  * A start that dies before `prepareStartingWorkerAuthority` never filled the Dispatch context in,
@@ -29,7 +29,7 @@ export function recordFailedStartDispatchIdentity(
     .run(
       resource.terminal_handle,
       resource.pane_key,
-      structuredWorkerOrcaSessionIdForIncarnation(resource.process_incarnation),
+      dispatchAssigneeOrcaSessionId(resource.process_incarnation),
       resource.process_incarnation,
       resource.host_scope,
       worker.dispatch_id
diff --git a/src/main/runtime/orchestration/db/worker-terminal/worker-terminal-transfer.ts b/src/main/runtime/orchestration/db/worker-terminal/worker-terminal-transfer.ts
index 439aca59b017..064ae577e0f1 100644
--- a/src/main/runtime/orchestration/db/worker-terminal/worker-terminal-transfer.ts
+++ b/src/main/runtime/orchestration/db/worker-terminal/worker-terminal-transfer.ts
@@ -81,14 +81,30 @@ export function workerTerminalResourceHasIdentityConflict(
   )
 }
 
+/** Every resource whose process incarnation starts with `prefix`, newest first. */
+export function listWorkerTerminalResourcesByIncarnationPrefix(
+  this: OrchestrationDb,
+  prefix: string
+): WorkerTerminalResourceRow[] {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: SELECT * over this table is exactly its row shape.
+  return this.db
+    .prepare(
+      `SELECT * FROM worker_terminal_resources
+        WHERE substr(process_incarnation, 1, ?) = ? ORDER BY updated_at DESC`
+    )
+    .all(prefix.length, prefix) as WorkerTerminalResourceRow[]
+}
+
 export type WorkerTerminalTransferMethods = {
   findTransferableWorkerTerminalResource: typeof findTransferableWorkerTerminalResource
   workerTerminalResourceHasIdentityConflict: typeof workerTerminalResourceHasIdentityConflict
+  listWorkerTerminalResourcesByIncarnationPrefix: typeof listWorkerTerminalResourcesByIncarnationPrefix
 }
 
 export function attachWorkerTerminalTransfer(ctor: { prototype: object }): void {
   Object.assign(ctor.prototype, {
     findTransferableWorkerTerminalResource,
-    workerTerminalResourceHasIdentityConflict
+    workerTerminalResourceHasIdentityConflict,
+    listWorkerTerminalResourcesByIncarnationPrefix
   })
 }
diff --git a/src/main/runtime/orchestration/dispatch-assignee-orca-session-id.ts b/src/main/runtime/orchestration/dispatch-assignee-orca-session-id.ts
new file mode 100644
index 000000000000..52c75ece7329
--- /dev/null
+++ b/src/main/runtime/orchestration/dispatch-assignee-orca-session-id.ts
@@ -0,0 +1,11 @@
+import type { OrcaSessionId } from '../../../shared/orca-session-address'
+import { structuredWorkerOrcaSessionIdForIncarnation } from '../structured-worker-identity'
+import { canonicalOrcaSessionId } from './canonical-orca-session-id'
+
+/** The Orca session id a Dispatch row stores for the structured worker a process incarnation names. */
+export function dispatchAssigneeOrcaSessionId(
+  processIncarnation: string | null | undefined
+): OrcaSessionId | null {
+  const orcaSessionId = structuredWorkerOrcaSessionIdForIncarnation(processIncarnation)
+  return orcaSessionId === null ? null : canonicalOrcaSessionId(orcaSessionId)
+}
diff --git a/src/main/runtime/orchestration/mailbox-pointer-pty-write.ts b/src/main/runtime/orchestration/mailbox-pointer-pty-write.ts
index 8dbedc9b33cf..52016aa1465b 100644
--- a/src/main/runtime/orchestration/mailbox-pointer-pty-write.ts
+++ b/src/main/runtime/orchestration/mailbox-pointer-pty-write.ts
@@ -24,7 +24,8 @@ export function writeOrchestrationPointerWithSettlement(
     return writeRefused('provider_cannot_settle')
   }
   try {
-    return settledWrite.call(args.controller, args.ptyId, args.data)
+    // Why driving: a pointer is input that tells a running agent to read its mail.
+    return settledWrite.call(args.controller, args.ptyId, args.data, 'driving')
   } catch {
     // A partial write that then threw cannot prove the transport took nothing.
     return writeUnverifiable('provider_threw_after_handoff', true)
diff --git a/src/main/runtime/orchestration/orchestration-party-cli-address.test.ts b/src/main/runtime/orchestration/orchestration-party-cli-address.test.ts
new file mode 100644
index 000000000000..f6f1c1e25745
--- /dev/null
+++ b/src/main/runtime/orchestration/orchestration-party-cli-address.test.ts
@@ -0,0 +1,50 @@
+import { afterEach, describe, expect, it } from 'vitest'
+import { injectedSessionAddress } from '../../../shared/agent-session-caller-env'
+import { testOrcaSessionId } from '../../../shared/orca-session-address-test-fixture'
+import {
+  mintStructuredWorkerHandle,
+  mintStructuredWorkerPaneKey,
+  structuredWorkerIdentities,
+  structuredWorkerProcessIncarnation
+} from '../structured-worker-identity'
+import { resolveOrcaSessionParty } from './orchestration-party'
+
+// The CLI spells its own address without the host resolver (it runs before the codec's module
+// graph), so it must land on the one mailbox address the resolver gives the same session.
+const CHAT = testOrcaSessionId('f7a1c0de-1111-4222-8333-444455556666')
+const WORKER = testOrcaSessionId('a0b1c2d3-0000-4000-8000-00000000abcd')
+
+afterEach(() => {
+  structuredWorkerIdentities.clear()
+})
+
+describe("the CLI's own address", () => {
+  it("is a chat's session address, even beside a pane handle it inherited", () => {
+    const hostAddress = resolveOrcaSessionParty(CHAT, null).address
+    expect(injectedSessionAddress({ ORCA_AGENT_SESSION_ID: CHAT })).toBe(hostAddress)
+    expect(
+      injectedSessionAddress({
+        ORCA_AGENT_SESSION_ID: CHAT,
+        ORCA_TERMINAL_HANDLE: 'term_inherited'
+      })
+    ).toBe(hostAddress)
+  })
+
+  it("is a structured worker's minted handle, as the host resolves it", () => {
+    const handle = mintStructuredWorkerHandle()
+    structuredWorkerIdentities.register({
+      handle,
+      sessionId: WORKER,
+      agent: 'claude',
+      paneKey: mintStructuredWorkerPaneKey(WORKER),
+      processIncarnation: structuredWorkerProcessIncarnation(WORKER),
+      worktreeId: 'wt_1',
+      hostScope: { kind: 'local', hostId: 'local' }
+    })
+    const hostAddress = resolveOrcaSessionParty(WORKER, null).address
+    expect(hostAddress).toBe(handle)
+    expect(
+      injectedSessionAddress({ ORCA_AGENT_SESSION_ID: WORKER, ORCA_TERMINAL_HANDLE: handle })
+    ).toBe(hostAddress)
+  })
+})
diff --git a/src/main/runtime/orchestration/preamble.ts b/src/main/runtime/orchestration/preamble.ts
index 208868ce45ba..a9fbb528939f 100644
--- a/src/main/runtime/orchestration/preamble.ts
+++ b/src/main/runtime/orchestration/preamble.ts
@@ -147,12 +147,13 @@ ${params.taskSpec}`
 
 export type DispatchPreambleSendOptions = Pick<
   RuntimeAgentPromptWriteOptions,
-  'leadLine' | 'acceptQueued' | 'observationTimeoutMs' | 'requestId'
+  'leadLine' | 'acceptQueued' | 'observationTimeoutMs' | 'requestId' | 'inputKind'
 >
 
 export function dispatchPreambleSendOptions(requestId: string): DispatchPreambleSendOptions {
   // Why: a delayed provider hook must not revoke an accepted Dispatch.
   return {
+    inputKind: 'driving',
     leadLine: ORCA_DISPATCH_PROMPT_LEAD_LINE,
     acceptQueued: true,
     observationTimeoutMs: 0,
diff --git a/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts b/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts
index 048fc7732e40..9b40bc08b0d7 100644
--- a/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts
+++ b/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts
@@ -4,6 +4,11 @@ import {
   OrchestrationStructuredMailboxPointerDelivery,
   type StructuredMailboxPointerHost
 } from './structured-mailbox-pointer-delivery'
+import type { StructuredPointerOperationRow } from './db/messages/structured-pointer-operation-store'
+import {
+  structuredPointerBatchFingerprint,
+  type StructuredPointerSubmission
+} from './structured-pointer-operation-id'
 import { structuredSessionGateFacts } from './structured-session-pointer-delivery'
 import type { StructuredWorkerIdentity } from '../structured-worker-identity'
 
@@ -84,13 +89,15 @@ function harness(options: {
   const mailbox = options.mailbox ?? 'dispatch:d1'
   const dispatchId = options.dispatchId === undefined ? 'd1' : options.dispatchId
   let journal = options.journal
+  // The session's recorded sends, as its journal reports them.
+  let submissions: StructuredPointerSubmission[] = []
   const markAsDelivered = vi.fn()
   const send: StructuredMailboxPointerHost['send'] = vi.fn(async () => ({
     kind: 'sent' as const,
     state: options.dispatchState ?? ('accepted' as const)
   }))
   const sendMock = vi.mocked(send)
-  const stored = new Map<string, unknown>()
+  const stored = new Map<string, StructuredPointerOperationRow>()
   const db = {
     getDispatchContextById: () => ({ run_id: 'run_1' }),
     hasOutstandingMailboxDelivery: (handle: string) =>
@@ -99,7 +106,7 @@ function harness(options: {
     getUndeliveredUnreadMessages: () => [{ id: 'm1', type: 'status', sequence: 3 }],
     markAsDelivered,
     getStructuredPointerOperation: (key: string) => stored.get(key),
-    putStructuredPointerOperation: (row: { mailbox_handle: string }) =>
+    putStructuredPointerOperation: (row: StructuredPointerOperationRow) =>
       stored.set(row.mailbox_handle, row),
     deleteStructuredPointerOperation: (key: string) => stored.delete(key)
   }
@@ -108,8 +115,10 @@ function harness(options: {
     getMessageWaiters: () => undefined,
     resolveStructuredTarget: (mailboxHandle) =>
       mailboxHandle === mailbox ? { sessionId: IDENTITY.sessionId, dispatchId } : null,
+    getCliCommand: () => 'orca-dev',
     host: {
-      readGateFacts: () => (journal === null ? null : structuredSessionGateFacts(journal)),
+      readGateFacts: async () =>
+        journal === null ? null : { ...structuredSessionGateFacts(journal), submissions },
       currentFence: () => 4,
       send
     }
@@ -121,6 +130,9 @@ function harness(options: {
     stored,
     setJournal: (next: AgentJournalRenderItem[] | null) => {
       journal = next
+    },
+    setSubmissions: (next: StructuredPointerSubmission[]) => {
+      submissions = next
     }
   }
 }
@@ -261,9 +273,10 @@ describe('structured mailbox pointer delivery', () => {
     expect(send).not.toHaveBeenCalled()
   })
 
-  it('retries a rejected nudge on the next journal edge', async () => {
+  it('retries a rejected nudge on the next journal edge, under the same id', async () => {
     // A rejection consumes no mail and nothing else redrives this mailbox, so leaving it unparked
-    // stranded the worker until unrelated mail happened to arrive.
+    // stranded the worker until unrelated mail happened to arrive. The retry keeps the id: the host
+    // replays a recorded refusal rather than starting the agent again.
     const { delivery, send, markAsDelivered } = harness({
       journal: idleJournal(),
       dispatchState: 'rejected'
@@ -276,9 +289,143 @@ describe('structured mailbox pointer delivery', () => {
     delivery.onJournalActivity('session-1')
     await flush()
     expect(send).toHaveBeenCalledTimes(2)
+    expect(send.mock.calls[1]![0].operationId).toBe(first)
+  })
+
+  it('points again under a new id once a later send ran', async () => {
+    const { delivery, send, setSubmissions } = harness({
+      journal: idleJournal(),
+      dispatchState: 'unknown'
+    })
+    delivery.deliverForHandle('dispatch:d1')
+    await flush()
+    const first = send.mock.calls[0]![0].operationId
+    setSubmissions([
+      { clientMessageId: first, dispatchState: 'unknown', submittedAt: Date.now() },
+      { clientMessageId: 'user-turn', dispatchState: 'accepted', submittedAt: Date.now() + 1 }
+    ])
+    delivery.onJournalActivity('session-1')
+    await flush()
+    expect(send).toHaveBeenCalledTimes(2)
     expect(send.mock.calls[1]![0].operationId).not.toBe(first)
   })
 
+  it('points once more under a new id for a send an earlier process left in doubt', async () => {
+    const { delivery, send, stored, setSubmissions } = harness({
+      journal: idleJournal(),
+      dispatchState: 'unknown'
+    })
+    stored.set('dispatch:d1', {
+      mailbox_handle: 'dispatch:d1',
+      session_id: 'session-1',
+      operation_id: 'earlier-process-op',
+      batch_fingerprint: structuredPointerBatchFingerprint('session-1', ['m1']),
+      minted_at_ms: 0
+    })
+    setSubmissions([
+      { clientMessageId: 'earlier-process-op', dispatchState: 'unknown', submittedAt: Date.now() }
+    ])
+    delivery.deliverForHandle('dispatch:d1')
+    await flush()
+    expect(send).toHaveBeenCalledTimes(1)
+    const reminted = send.mock.calls[0]![0].operationId
+    expect(reminted).not.toBe('earlier-process-op')
+    // Minted by this process, the new id replays from here on.
+    setSubmissions([
+      { clientMessageId: 'earlier-process-op', dispatchState: 'unknown', submittedAt: Date.now() },
+      { clientMessageId: reminted, dispatchState: 'unknown', submittedAt: Date.now() }
+    ])
+    delivery.onJournalActivity('session-1')
+    await flush()
+    expect(send.mock.calls[1]![0].operationId).toBe(reminted)
+  })
+
+  it('keeps replaying its own send across a clock step, and re-mints only for a rewind that ran a turn', async () => {
+    vi.useFakeTimers({ toFake: ['Date'] })
+    try {
+      const { delivery, send, setSubmissions } = harness({
+        journal: idleJournal(),
+        dispatchState: 'unknown'
+      })
+      // The wall clock steps back an hour after the lane started: its own row is still its own.
+      vi.setSystemTime(Date.now() - 60 * 60 * 1000)
+      delivery.deliverForHandle('dispatch:d1')
+      await flush()
+      const first = send.mock.calls[0]![0].operationId
+      setSubmissions([
+        { clientMessageId: first, dispatchState: 'unknown', submittedAt: Date.now() }
+      ])
+      delivery.onJournalActivity('session-1')
+      await flush()
+      expect(send.mock.calls[1]![0].operationId).toBe(first)
+      // A rewind dropped that send from the journal, and the person's turn ran after it.
+      setSubmissions([
+        { clientMessageId: 'user-turn', dispatchState: 'accepted', submittedAt: Date.now() + 1 }
+      ])
+      delivery.onJournalActivity('session-1')
+      await flush()
+      expect(send.mock.calls[2]![0].operationId).not.toBe(first)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('does not read a turn from before a backward clock step as one that ran after its pointer', async () => {
+    vi.useFakeTimers({ toFake: ['Date'] })
+    try {
+      const { delivery, send, setSubmissions } = harness({
+        journal: idleJournal(),
+        dispatchState: 'unknown'
+      })
+      const personTurn = {
+        clientMessageId: 'user-turn',
+        dispatchState: 'accepted' as const,
+        submittedAt: Date.now()
+      }
+      setSubmissions([personTurn])
+      vi.setSystemTime(Date.now() - 2 * 60 * 1000)
+      delivery.deliverForHandle('dispatch:d1')
+      await flush()
+      const first = send.mock.calls[0]![0].operationId
+      setSubmissions([
+        personTurn,
+        { clientMessageId: first, dispatchState: 'unknown', submittedAt: Date.now() }
+      ])
+      for (let edge = 0; edge < 3; edge++) {
+        delivery.onJournalActivity('session-1')
+        await flush()
+      }
+      expect(send.mock.calls.map(([input]) => input.operationId)).toEqual([
+        first,
+        first,
+        first,
+        first
+      ])
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('stamps a pointer whose echo arrived after the lane stopped waiting, sending nothing more', async () => {
+    const { delivery, send, markAsDelivered, stored, setSubmissions } = harness({
+      journal: idleJournal(),
+      dispatchState: 'unknown'
+    })
+    delivery.deliverForHandle('dispatch:d1')
+    await flush()
+    const first = send.mock.calls[0]![0].operationId
+    setSubmissions([{ clientMessageId: first, dispatchState: 'pending', submittedAt: Date.now() }])
+    delivery.onJournalActivity('session-1')
+    await flush()
+    expect(send).toHaveBeenCalledTimes(1)
+    setSubmissions([{ clientMessageId: first, dispatchState: 'accepted', submittedAt: Date.now() }])
+    delivery.onJournalActivity('session-1')
+    await flush()
+    expect(send).toHaveBeenCalledTimes(1)
+    expect(markAsDelivered).toHaveBeenCalledWith(['m1'])
+    expect(stored.has('dispatch:d1')).toBe(false)
+  })
+
   it('reuses one operation id for the same batch and re-mints when it grows', async () => {
     const { delivery, send, stored } = harness({
       journal: idleJournal(),
@@ -328,8 +475,9 @@ describe('forgetting one settled worker', () => {
           ? { sessionId, dispatchId: mailboxHandle.slice('dispatch:'.length) }
           : null
       },
+      getCliCommand: () => 'orca',
       host: {
-        readGateFacts: () => structuredSessionGateFacts(journal),
+        readGateFacts: async () => ({ ...structuredSessionGateFacts(journal), submissions: [] }),
         currentFence: () => 4,
         send
       }
diff --git a/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.ts b/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.ts
index 62a555d41191..2a5e75a4ef84 100644
--- a/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.ts
+++ b/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.ts
@@ -9,17 +9,21 @@
  *
  * Coordinators are in scope here, unlike the PTY lane's reasoning: a PTY coordinator blocks in
  * `check --wait`, where a waiter preempts pointer delivery, but a structured coordinator is a chat
- * session whose turn ends — so nothing else would ever wake it for its own `run:` mail.
+ * session whose turn ends — so nothing else would ever prompt it for its own `run:` mail.
  */
 
 import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
 import type { OrchestrationDb } from './db'
 import { formatMessagePointer } from './formatter'
+import type { OrchestrationCliCommand } from './cli-command'
 import {
   selectOrchestrationPointerBatch,
   type OrchestrationMessageWaiter
 } from './mailbox-pointer-eligibility'
-import { resolveStructuredPointerOperation } from './structured-pointer-operation-id'
+import {
+  resolveStructuredPointerOperation,
+  type StructuredPointerSubmission
+} from './structured-pointer-operation-id'
 import {
   decideStructuredSessionPointerDelivery,
   retainReasonForDispatch,
@@ -48,9 +52,14 @@ export type StructuredPointerSendOutcome =
   | { kind: 'sent'; state: StructuredDispatchState }
   | { kind: 'unattached' }
 
+export type StructuredPointerGateFacts = StructuredSessionGateFacts & {
+  /** Every send the session recorded, oldest first: what the lane's own sends settled as. */
+  submissions: readonly StructuredPointerSubmission[]
+}
+
 export type StructuredMailboxPointerHost = {
-  /** The idle gate, read off the session's full reduced timeline; `null` when it is not attached. */
-  readGateFacts: (sessionId: string) => StructuredSessionGateFacts | null
+  /** The idle gate, read off the session's full reduced timeline; `null` when it cannot be read. */
+  readGateFacts: (sessionId: string) => Promise<StructuredPointerGateFacts | null>
   send: (input: {
     sessionId: string
     dispatchId: string | null
@@ -73,6 +82,8 @@ type StructuredPointerDeliveryDependencies<TWaiter extends OrchestrationMessageW
    * agents mail each other outside a dispatch, and no other lane can serve it.
    */
   resolveStructuredTarget: (mailboxHandle: string) => StructuredPointerTarget | null
+  /** The CLI name the PTY lane types for a local agent, so both lanes send the same pointer. */
+  getCliCommand: () => OrchestrationCliCommand
   host: StructuredMailboxPointerHost
   onRetain?: (input: {
     mailboxHandle: string
@@ -95,6 +106,9 @@ export class OrchestrationStructuredMailboxPointerDelivery<
    * edge until the next explicit check.
    */
   private readonly parkedUntilJournalEdge = new Map<string, ParkedPointerDelivery>()
+  /** The operation id this lane last sent per mailbox: a row holding any other id outlived the
+   *  process that minted it. A fact, not a clock reading, so no clock step can fake it. */
+  private readonly sentOperationIds = new Map<string, string>()
 
   constructor(private readonly deps: StructuredPointerDeliveryDependencies<TWaiter>) {}
 
@@ -176,6 +190,7 @@ export class OrchestrationStructuredMailboxPointerDelivery<
     }
   }
 
+  // A session whose agent is not running needs nothing first: an accepted send starts it.
   private async attempt(
     db: OrchestrationDb,
     mailboxHandle: string,
@@ -184,7 +199,7 @@ export class OrchestrationStructuredMailboxPointerDelivery<
     reservedTypes: ReadonlySet<string> | undefined
   ): Promise<void> {
     const sessionId = target.sessionId
-    const session = this.deps.host.readGateFacts(sessionId)
+    const session = await this.deps.host.readGateFacts(sessionId)
     const decision = decideStructuredSessionPointerDelivery({ session })
     if (!decision.deliver) {
       this.retain(mailboxHandle, sessionId, decision.retain, reservedTypes)
@@ -198,7 +213,12 @@ export class OrchestrationStructuredMailboxPointerDelivery<
     const body: AgentJournalMessageItem = {
       kind: 'message',
       role: 'user',
-      blocks: [{ type: 'text', text: formatMessagePointer(unread.length, mailboxHandle).trim() }]
+      blocks: [
+        {
+          type: 'text',
+          text: formatMessagePointer(unread.length, mailboxHandle, this.deps.getCliCommand()).trim()
+        }
+      ]
     }
     const staged = unread.map((message) => message.id)
     const operation = resolveStructuredPointerOperation({
@@ -206,8 +226,22 @@ export class OrchestrationStructuredMailboxPointerDelivery<
       mailboxHandle,
       sessionId,
       body,
-      messageIds: staged
+      messageIds: staged,
+      submissions: session?.submissions ?? [],
+      sentByThisProcess: this.sentOperationIds.get(mailboxHandle)
     })
+    if (operation.kind === 'stamp') {
+      // A send this lane gave up waiting on ran after all.
+      db.markAsDelivered(staged)
+      db.deleteStructuredPointerOperation(mailboxHandle)
+      this.sentOperationIds.delete(mailboxHandle)
+      return
+    }
+    if (operation.kind === 'park') {
+      this.retain(mailboxHandle, sessionId, 'turn-unsettled', reservedTypes)
+      return
+    }
+    this.sentOperationIds.set(mailboxHandle, operation.operationId)
     const outcome = await this.deps.host.send({
       sessionId,
       dispatchId: target.dispatchId,
@@ -221,21 +255,15 @@ export class OrchestrationStructuredMailboxPointerDelivery<
       return
     }
     if (!structuredDispatchDelivered(outcome.state)) {
-      if (outcome.state === 'rejected') {
-        db.deleteStructuredPointerOperation(mailboxHandle)
-      }
-      this.retain(
-        mailboxHandle,
-        sessionId,
-        retainReasonForDispatch(outcome.state as Exclude<StructuredDispatchState, 'accepted'>),
-        reservedTypes
-      )
+      // The row stays: resending under its id replays this verdict and starts nothing.
+      this.retain(mailboxHandle, sessionId, retainReasonForDispatch(outcome.state), reservedTypes)
       return
     }
     db.markAsDelivered(staged)
     // The nudge landed as its own turn, so the next settle edge is the natural retry point for
     // anything that arrives while it runs.
     db.deleteStructuredPointerOperation(mailboxHandle)
+    this.sentOperationIds.delete(mailboxHandle)
   }
 
   /**
diff --git a/src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts b/src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts
index 91bf1158e077..fee8909a4458 100644
--- a/src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts
+++ b/src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts
@@ -38,30 +38,33 @@ describe('structured mailbox pointer host', () => {
     hostRef.current = null
   })
 
-  it('reads the gate facts from the FULL timeline, never a bounded tail', () => {
+  it('reads the gate facts from the FULL timeline, never a bounded tail', async () => {
     // The defect this pins: a running turn is announced by ONE lifecycle item, and settlement
     // tombstones it rather than rewriting it. A long tool-calling turn pushes that item arbitrarily
     // far from the tail, so any page-sized read reports a busy worker as idle — and the pointer is
-    // then delivered mid-turn, which Codex coalesces into the running turn and Claude queues behind
+    // then delivered mid-turn, which Codex coalesces into the running turn and Claude folds into
     // it -- either way folded into work already in flight rather than read as a new instruction.
     const items = [runningTurn(), ...transcript(500)]
-    hostRef.current = { journalSnapshot: () => ({ items }) }
-    expect(createStructuredMailboxPointerHost().readGateFacts('s1')).toEqual({
+    const submissions = [{ clientMessageId: 'op1', dispatchState: 'unknown' }]
+    hostRef.current = { journalSnapshot: () => ({ items, submissions }) }
+    // The recorded sends ride along: the lane reads what its own operation id settled as.
+    expect(await createStructuredMailboxPointerHost().readGateFacts('s1')).toEqual({
       turnRunning: true,
-      awaitingHuman: false
+      awaitingHuman: false,
+      submissions
     })
   })
 
-  it('answers null rather than idle when the session cannot be read', () => {
+  it('answers null rather than idle when the session cannot be read', async () => {
     // Null retains the pointer; `{turnRunning:false}` would deliver a nudge into a session this
     // runtime cannot see at all.
-    expect(createStructuredMailboxPointerHost().readGateFacts('s1')).toBeNull()
+    expect(await createStructuredMailboxPointerHost().readGateFacts('s1')).toBeNull()
     hostRef.current = {
       journalSnapshot: () => {
         throw new Error('agent_session_ownership_unknown')
       }
     }
-    expect(createStructuredMailboxPointerHost().readGateFacts('s1')).toBeNull()
+    expect(await createStructuredMailboxPointerHost().readGateFacts('s1')).toBeNull()
   })
 
   it('reports an unattached host rather than a rejection when nothing can be sent', async () => {
@@ -91,7 +94,7 @@ describe('structured mailbox pointer host', () => {
         value: { submission: { dispatchState } }
       })
     )
-    hostRef.current = { send }
+    hostRef.current = { send, waitForSendSettlement: async () => undefined }
     await expect(
       createStructuredMailboxPointerHost().send({
         sessionId: 's1',
@@ -107,6 +110,28 @@ describe('structured mailbox pointer host', () => {
     expect(send.mock.calls[0]![1]!.retryUnknown).toBeUndefined()
   })
 
+  it('consumes mail once an accepted nudge is delivered while the worker starts (W10)', async () => {
+    hostRef.current = {
+      send: async () => ({
+        ok: true,
+        value: { clientMessageId: 'op1', submission: { dispatchState: 'pending' } }
+      }),
+      waitForSendSettlement: async () => ({
+        value: { clientMessageId: 'op1', submission: { dispatchState: 'accepted' } }
+      })
+    }
+    await expect(
+      createStructuredMailboxPointerHost().send({
+        sessionId: 's1',
+        dispatchId: 'd1',
+        operationId: 'op1',
+        expectedRuntimeFence: 1,
+        payloadFingerprint: 'fp',
+        body: { kind: 'message', role: 'user', blocks: [] }
+      } as never)
+    ).resolves.toEqual({ kind: 'sent', state: 'accepted' })
+  })
+
   it('scopes direct peer mail to the session when there is no dispatch to scope to', async () => {
     // Direct mail is addressed to the worker's own handle, so there may be no dispatch at all.
     // The ledger is keyed on (callerKey, operationId): a key derived from the session keeps that
diff --git a/src/main/runtime/orchestration/structured-mailbox-pointer-host.ts b/src/main/runtime/orchestration/structured-mailbox-pointer-host.ts
index b722952df92f..c85fcf6fc205 100644
--- a/src/main/runtime/orchestration/structured-mailbox-pointer-host.ts
+++ b/src/main/runtime/orchestration/structured-mailbox-pointer-host.ts
@@ -6,9 +6,14 @@
  * the send and reports what the host said.
  */
 
+import { ORCHESTRATION_READINESS_TIMEOUT_MS } from '../../../shared/orchestration-timing-budgets'
 import { AGENT_SESSION_NOT_ATTACHED } from '../../native-chat/agent-session-wire/structured-agent-session-mutation-admission'
 import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
-import type { StructuredMailboxPointerHost } from './structured-mailbox-pointer-delivery'
+import type {
+  StructuredMailboxPointerHost,
+  StructuredPointerGateFacts
+} from './structured-mailbox-pointer-delivery'
+import type { AgentJournalSnapshot } from '../../../shared/agent-session-journal-types'
 import {
   structuredSessionGateFacts,
   type StructuredSessionGateFacts
@@ -38,15 +43,29 @@ export function structuredSessionPointerCallerKey(sessionId: string): string {
  * idle-with-history is the normal steady state of a working agent. Shared so the pointer lane and
  * group addressing cannot disagree about it.
  */
-export function readStructuredSessionGateFacts(
+export async function readStructuredSessionGateFacts(
   sessionId: string
-): StructuredSessionGateFacts | null {
+): Promise<StructuredSessionGateFacts | null> {
+  const snapshot = await readSessionJournal(sessionId)
+  return snapshot ? structuredSessionGateFacts(snapshot.items) : null
+}
+
+/** The pointer lane's gate: the shared idle facts, plus what each recorded send settled as. */
+async function readPointerGateFacts(sessionId: string): Promise<StructuredPointerGateFacts | null> {
+  const snapshot = await readSessionJournal(sessionId)
+  return snapshot
+    ? { ...structuredSessionGateFacts(snapshot.items), submissions: snapshot.submissions }
+    : null
+}
+
+async function readSessionJournal(sessionId: string): Promise<AgentJournalSnapshot | null> {
   const host = getStructuredAgentSessionHost()
   if (!host) {
     return null
   }
   try {
-    return structuredSessionGateFacts(host.journalSnapshot(sessionId).items)
+    // Opens a conversation the idle sweep closed; that starts no agent.
+    return await host.journalSnapshot(sessionId)
   } catch (error) {
     // Not attached is a retain reason, not a failure; anything else is still unreadable.
     if ((error as Error)?.message !== AGENT_SESSION_NOT_ATTACHED.code) {
@@ -59,7 +78,7 @@ export function readStructuredSessionGateFacts(
 export function createStructuredMailboxPointerHost(): StructuredMailboxPointerHost {
   return {
     readGateFacts(sessionId) {
-      return readStructuredSessionGateFacts(sessionId)
+      return readPointerGateFacts(sessionId)
     },
 
     currentFence(sessionId) {
@@ -94,8 +113,19 @@ export function createStructuredMailboxPointerHost(): StructuredMailboxPointerHo
           ? { kind: 'unattached' }
           : { kind: 'sent', state: 'rejected' }
       }
-      // `pending` is not yet an acknowledgement; only `accepted` may consume mail.
-      const state = result.value.submission.dispatchState
+      // `pending` is not yet an acknowledgement; only `accepted` may consume mail. Accepted is not
+      // delivered, so wait out a start; a wait that runs out parks for the next journal edge.
+      const submission =
+        result.value.submission.dispatchState === 'pending'
+          ? ((
+              await host
+                .waitForSendSettlement(input.sessionId, result.value.clientMessageId, {
+                  budgetMs: ORCHESTRATION_READINESS_TIMEOUT_MS
+                })
+                .catch(() => undefined)
+            )?.value.submission ?? result.value.submission)
+          : result.value.submission
+      const state = submission.dispatchState
       return {
         kind: 'sent',
         state: state === 'accepted' ? 'accepted' : state === 'rejected' ? 'rejected' : 'unknown'
diff --git a/src/main/runtime/orchestration/structured-pointer-operation-id.test.ts b/src/main/runtime/orchestration/structured-pointer-operation-id.test.ts
index 35e75c865bc8..fe891ef48ba8 100644
--- a/src/main/runtime/orchestration/structured-pointer-operation-id.test.ts
+++ b/src/main/runtime/orchestration/structured-pointer-operation-id.test.ts
@@ -1,9 +1,14 @@
 import { describe, expect, it } from 'vitest'
-import { AGENT_SESSION_MAX_OPERATION_REPLAY_AGE_MS } from '../../../shared/agent-session-host-authority'
+import {
+  AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS,
+  AGENT_SESSION_MAX_OPERATION_REPLAY_AGE_MS
+} from '../../../shared/agent-session-host-authority'
 import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
 import {
+  decideStructuredPointerAttempt,
   mintAgentSessionOperationId,
-  resolveStructuredPointerOperation
+  resolveStructuredPointerOperation,
+  type StructuredPointerSubmission
 } from './structured-pointer-operation-id'
 
 const OPERATION_ID_PATTERN = /^\d{13}-[0-9a-f]{32}$/
@@ -12,6 +17,27 @@ function body(text: string): AgentJournalMessageItem {
   return { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] }
 }
 
+/** The id this batch resolves to, as this process sends it; unrecorded unless `submissions` say. */
+function resolveId(
+  args: Omit<
+    Parameters<typeof resolveStructuredPointerOperation>[0],
+    'submissions' | 'sentByThisProcess'
+  > & { submissions?: StructuredPointerSubmission[] }
+): {
+  operationId: string
+  payloadFingerprint: string
+} {
+  const resolved = resolveStructuredPointerOperation({
+    ...args,
+    submissions: args.submissions ?? [],
+    sentByThisProcess: args.db.getStructuredPointerOperation(args.mailboxHandle)?.operation_id
+  })
+  if (resolved.kind !== 'send') {
+    throw new Error(`expected a send, got ${resolved.kind}`)
+  }
+  return resolved
+}
+
 function fakeDb() {
   const rows = new Map<string, { mailbox_handle: string; operation_id: string }>()
   return {
@@ -30,7 +56,7 @@ describe('structured pointer operation id', () => {
 
   it('reuses one id for the same batch', () => {
     const db = fakeDb()
-    const first = resolveStructuredPointerOperation({
+    const first = resolveId({
       db,
       mailboxHandle: 'dispatch:d1',
       sessionId: 's1',
@@ -38,7 +64,7 @@ describe('structured pointer operation id', () => {
       messageIds: ['m1', 'm2'],
       now: 1_000
     })
-    const second = resolveStructuredPointerOperation({
+    const second = resolveId({
       db,
       mailboxHandle: 'dispatch:d1',
       sessionId: 's1',
@@ -52,7 +78,7 @@ describe('structured pointer operation id', () => {
 
   it('re-mints when the batch grows', () => {
     const db = fakeDb()
-    const first = resolveStructuredPointerOperation({
+    const first = resolveId({
       db,
       mailboxHandle: 'dispatch:d1',
       sessionId: 's1',
@@ -60,7 +86,7 @@ describe('structured pointer operation id', () => {
       messageIds: ['m1', 'm2'],
       now: 1_000
     })
-    const grown = resolveStructuredPointerOperation({
+    const grown = resolveId({
       db,
       mailboxHandle: 'dispatch:d1',
       sessionId: 's1',
@@ -72,8 +98,9 @@ describe('structured pointer operation id', () => {
   })
 
   it('never re-mints an ambiguous batch after the host replay window expires', () => {
+    // The host recorded the send `unknown`: whether the nudge landed is still open, however old.
     const db = fakeDb()
-    const first = resolveStructuredPointerOperation({
+    const first = resolveId({
       db,
       mailboxHandle: 'dispatch:d1',
       sessionId: 's1',
@@ -81,12 +108,15 @@ describe('structured pointer operation id', () => {
       messageIds: ['m1', 'm2'],
       now: 1_000
     })
-    const aged = resolveStructuredPointerOperation({
+    const aged = resolveId({
       db,
       mailboxHandle: 'dispatch:d1',
       sessionId: 's1',
       body: body('2 messages'),
       messageIds: ['m1', 'm2'],
+      submissions: [
+        { clientMessageId: first.operationId, dispatchState: 'unknown', submittedAt: 1_000 }
+      ],
       now: 1_000 + AGENT_SESSION_MAX_OPERATION_REPLAY_AGE_MS + 1
     })
     expect(aged.operationId).toBe(first.operationId)
@@ -98,7 +128,7 @@ describe('structured pointer operation id', () => {
     // its ledger answer — `accepted`, with no turn sent — and the lane then marks the NEW mail
     // delivered. The worker is never told, and the mail is gone.
     const db = fakeDb()
-    const first = resolveStructuredPointerOperation({
+    const first = resolveId({
       db,
       mailboxHandle: 'dispatch:d1',
       sessionId: 's1',
@@ -106,7 +136,7 @@ describe('structured pointer operation id', () => {
       messageIds: ['m1', 'm2'],
       now: 1_000
     })
-    const different = resolveStructuredPointerOperation({
+    const different = resolveId({
       db,
       mailboxHandle: 'dispatch:d1',
       sessionId: 's1',
@@ -120,7 +150,7 @@ describe('structured pointer operation id', () => {
 
   it('re-mints when a retained batch is reordered or partly consumed', () => {
     const db = fakeDb()
-    const first = resolveStructuredPointerOperation({
+    const first = resolveId({
       db,
       mailboxHandle: 'dispatch:d1',
       sessionId: 's1',
@@ -128,7 +158,7 @@ describe('structured pointer operation id', () => {
       messageIds: ['m1', 'm2'],
       now: 1_000
     })
-    const shifted = resolveStructuredPointerOperation({
+    const shifted = resolveId({
       db,
       mailboxHandle: 'dispatch:d1',
       sessionId: 's1',
@@ -141,7 +171,7 @@ describe('structured pointer operation id', () => {
 
   it('re-mints when the mailbox moves to a different session', () => {
     const db = fakeDb()
-    const first = resolveStructuredPointerOperation({
+    const first = resolveId({
       db,
       mailboxHandle: 'dispatch:d1',
       sessionId: 's1',
@@ -149,7 +179,7 @@ describe('structured pointer operation id', () => {
       messageIds: ['m1', 'm2'],
       now: 1_000
     })
-    const moved = resolveStructuredPointerOperation({
+    const moved = resolveId({
       db,
       mailboxHandle: 'dispatch:d1',
       sessionId: 's2',
@@ -160,3 +190,99 @@ describe('structured pointer operation id', () => {
     expect(moved.operationId).not.toBe(first.operationId)
   })
 })
+
+describe('what a pointer attempt does with its operation row', () => {
+  const row = {
+    mailbox_handle: 'run:r1',
+    session_id: 's1',
+    operation_id: 'op1',
+    batch_fingerprint: 'batch-1',
+    minted_at_ms: 2_000
+  }
+
+  function decide(
+    submissions: StructuredPointerSubmission[],
+    overrides: {
+      batchFingerprint?: string
+      sessionId?: string
+      mintedByThisProcess?: boolean
+      now?: number
+    } = {}
+  ) {
+    return decideStructuredPointerAttempt({
+      row,
+      sessionId: overrides.sessionId ?? 's1',
+      batchFingerprint: overrides.batchFingerprint ?? 'batch-1',
+      submissions,
+      mintedByThisProcess: overrides.mintedByThisProcess ?? true,
+      now: overrides.now ?? 3_000
+    })
+  }
+
+  const sent = (dispatchState: StructuredPointerSubmission['dispatchState']) => ({
+    clientMessageId: 'op1',
+    dispatchState,
+    submittedAt: 2_000
+  })
+  const userTurn = (dispatchState: StructuredPointerSubmission['dispatchState'], at = 2_500) => ({
+    clientMessageId: 'user-1',
+    dispatchState,
+    submittedAt: at
+  })
+
+  it('mints for a new batch, a new session, or no row at all', () => {
+    expect(decide([], { batchFingerprint: 'batch-2' })).toBe('mint')
+    expect(decide([], { sessionId: 's2' })).toBe('mint')
+    expect(
+      decideStructuredPointerAttempt({
+        row: undefined,
+        sessionId: 's1',
+        batchFingerprint: 'batch-1',
+        submissions: [],
+        mintedByThisProcess: false,
+        now: 0
+      })
+    ).toBe('mint')
+  })
+
+  it('sends under the same id when the host never recorded it', () => {
+    expect(decide([])).toBe('reuse')
+    // A turn that ran before the row was minted is no news.
+    expect(decide([userTurn('accepted', 1_500)])).toBe('reuse')
+  })
+
+  it('stamps a send that ran, and parks one still in flight', () => {
+    expect(decide([sent('accepted')])).toBe('stamp')
+    expect(decide([sent('pending')])).toBe('park')
+  })
+
+  it.each([
+    ['in doubt', sent('unknown')],
+    ['refused', sent('rejected')]
+  ])('replays a send that was %s instead of starting the agent again', (_label, failed) => {
+    expect(decide([failed])).toBe('reuse')
+    // A later send that has not run yet is no evidence the agent works again.
+    expect(decide([failed, userTurn('pending')])).toBe('reuse')
+    // Age never re-mints a recorded send.
+    expect(decide([failed], { now: 2_000 + AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS + 1 })).toBe(
+      'reuse'
+    )
+  })
+
+  it('mints once the agent ran a turn after the row was minted, recorded send or not', () => {
+    expect(decide([sent('unknown'), userTurn('accepted')])).toBe('mint')
+    expect(decide([sent('rejected'), userTurn('accepted')])).toBe('mint')
+    // A rewind dropped the row's own send from the journal.
+    expect(decide([userTurn('accepted')])).toBe('mint')
+  })
+
+  it('mints a row an earlier process left behind, recorded send or not', () => {
+    expect(decide([sent('unknown')], { mintedByThisProcess: false })).toBe('mint')
+    expect(decide([], { mintedByThisProcess: false })).toBe('mint')
+  })
+
+  it('mints an unrecorded send once the host would refuse it as too old to admit', () => {
+    expect(decide([], { now: 2_000 + AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS })).toBe('reuse')
+    expect(decide([], { now: 2_000 + AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS + 1 })).toBe('mint')
+  })
+})
diff --git a/src/main/runtime/orchestration/structured-pointer-operation-id.ts b/src/main/runtime/orchestration/structured-pointer-operation-id.ts
index 0f258ba325fd..66710b3b4f49 100644
--- a/src/main/runtime/orchestration/structured-pointer-operation-id.ts
+++ b/src/main/runtime/orchestration/structured-pointer-operation-id.ts
@@ -4,8 +4,11 @@
  * Orchestration's own `msg_<hex>` ids do not match the host's `^\d{13}-[0-9a-f]{32}$` shape and are
  * refused before the first send, so the id is minted here instead. It is durable and reused across
  * retries, because the id IS the send's idempotency key: a fresh id for the same nudge would land
- * as a second turn. It is re-minted only when the send is genuinely a different call — a different
- * batch of mail, or a different session. Age cannot resolve delivery ambiguity.
+ * as a second turn, and the host replays a recorded id's verdict without reaching the provider, so
+ * a retry after a failed send starts nothing. It is re-minted only when the send is genuinely a
+ * different call: a different batch of mail or session, or one the journal shows is owed again
+ * (see `decideStructuredPointerAttempt`). Age never re-mints a send the host recorded: its verdict
+ * is the only evidence of whether the nudge landed.
  *
  * Reuse is keyed on the MESSAGE IDS in the batch, never on the pointer body: the body names only
  * how many messages are waiting, so two unrelated same-size batches share a fingerprint. Reusing a
@@ -14,9 +17,67 @@
  */
 
 import { createHash, randomBytes } from 'node:crypto'
-import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import type {
+  AgentJournalMessageItem,
+  AgentJournalSubmission
+} from '../../../shared/agent-session-journal-types'
+import { AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS } from '../../../shared/agent-session-host-authority'
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
 import type { OrchestrationDb } from './db'
+import type { StructuredPointerOperationRow } from './db/messages/structured-pointer-operation-store'
+
+/** What the pointer lane reads off a session's journal for its own sends. */
+export type StructuredPointerSubmission = Pick<
+  AgentJournalSubmission,
+  'clientMessageId' | 'dispatchState' | 'submittedAt'
+>
+
+/**
+ * What to do with a mailbox's pointer, given its operation row and the session's recorded sends.
+ *
+ * - `stamp`: the row's send ran; the batch is pointed.
+ * - `park`: the row's send is still in flight; its settlement is the next edge.
+ * - `mint`: a new send. The batch or session changed; the agent ran a turn after the row was
+ *   minted; an earlier process minted it, so its attempt died with that process; or the host never
+ *   recorded it and would now refuse it as too old to admit.
+ * - `reuse`: resend under the row's id. Unrecorded, it is a first delivery; recorded as failed, the
+ *   host replays that verdict and starts nothing, so a provider that dies on every turn is not
+ *   restarted by every status edge, and a user's Stop stays stopped.
+ */
+export type StructuredPointerAttempt = 'mint' | 'reuse' | 'stamp' | 'park'
+
+export function decideStructuredPointerAttempt(input: {
+  row: StructuredPointerOperationRow | undefined
+  sessionId: string
+  batchFingerprint: string
+  /** The session's recorded sends; a rewind may have dropped the row's. */
+  submissions: readonly StructuredPointerSubmission[]
+  /** Whether this process minted the row's id. */
+  mintedByThisProcess: boolean
+  now: number
+}): StructuredPointerAttempt {
+  const { row, submissions } = input
+  if (
+    !row ||
+    row.session_id !== input.sessionId ||
+    row.batch_fingerprint !== input.batchFingerprint
+  ) {
+    return 'mint'
+  }
+  const sent = submissions.find((entry) => entry.clientMessageId === row.operation_id)
+  if (sent?.dispatchState === 'accepted') {
+    return 'stamp'
+  }
+  if (sent?.dispatchState === 'pending') {
+    return 'park'
+  }
+  const ranSince = submissions.some(
+    (entry) => entry.dispatchState === 'accepted' && entry.submittedAt > row.minted_at_ms
+  )
+  const tooOldToAdmit =
+    !sent && input.now - row.minted_at_ms > AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS
+  return ranSince || !input.mintedByThisProcess || tooOldToAdmit ? 'mint' : 'reuse'
+}
 
 export function mintAgentSessionOperationId(now: number): string {
   return `${String(now).padStart(13, '0')}-${randomBytes(16).toString('hex')}`
@@ -43,6 +104,11 @@ export function structuredPointerPayloadFingerprint(
   })
 }
 
+export type StructuredPointerOperation =
+  | { kind: 'send'; operationId: string; payloadFingerprint: string }
+  | { kind: 'stamp' }
+  | { kind: 'park' }
+
 export function resolveStructuredPointerOperation(args: {
   db: OrchestrationDb
   mailboxHandle: string
@@ -50,18 +116,28 @@ export function resolveStructuredPointerOperation(args: {
   body: AgentJournalMessageItem
   /** The rows this nudge stands for; batch identity, not the body, decides reuse. */
   messageIds: readonly string[]
+  submissions: readonly StructuredPointerSubmission[]
+  /** The operation id this process last sent for this mailbox, if any. */
+  sentByThisProcess: string | undefined
   now?: number
-}): { operationId: string; payloadFingerprint: string } {
+}): StructuredPointerOperation {
   const now = args.now ?? Date.now()
   const payloadFingerprint = structuredPointerPayloadFingerprint(args.sessionId, args.body)
   const batchFingerprint = structuredPointerBatchFingerprint(args.sessionId, args.messageIds)
   const stored = args.db.getStructuredPointerOperation(args.mailboxHandle)
-  if (
-    stored &&
-    stored.session_id === args.sessionId &&
-    stored.batch_fingerprint === batchFingerprint
-  ) {
-    return { operationId: stored.operation_id, payloadFingerprint }
+  const attempt = decideStructuredPointerAttempt({
+    row: stored,
+    sessionId: args.sessionId,
+    batchFingerprint,
+    submissions: args.submissions,
+    mintedByThisProcess: stored?.operation_id === args.sentByThisProcess,
+    now
+  })
+  if (attempt === 'stamp' || attempt === 'park') {
+    return { kind: attempt }
+  }
+  if (attempt === 'reuse' && stored) {
+    return { kind: 'send', operationId: stored.operation_id, payloadFingerprint }
   }
   const operationId = mintAgentSessionOperationId(now)
   args.db.putStructuredPointerOperation({
@@ -69,7 +145,11 @@ export function resolveStructuredPointerOperation(args: {
     session_id: args.sessionId,
     operation_id: operationId,
     batch_fingerprint: batchFingerprint,
-    minted_at_ms: now
+    // On the journal's clock too, so a backward clock step cannot date an earlier turn after it.
+    minted_at_ms: args.submissions.reduce(
+      (latest, entry) => Math.max(latest, entry.submittedAt),
+      now
+    )
   })
-  return { operationId, payloadFingerprint }
+  return { kind: 'send', operationId, payloadFingerprint }
 }
diff --git a/src/main/runtime/orchestration/structured-session-lineage.ts b/src/main/runtime/orchestration/structured-session-lineage.ts
new file mode 100644
index 000000000000..8cf6e94f12d8
--- /dev/null
+++ b/src/main/runtime/orchestration/structured-session-lineage.ts
@@ -0,0 +1,44 @@
+/**
+ * A structured session's `/clear` lineage, read off the durable session records. `/clear` continues
+ * a chat in a new session; the committed clear on the old record names the session that replaced it.
+ * Derived from the records every time; nothing is rewritten at a clear.
+ */
+
+import type { AgentSessionRecord } from '../../../shared/agent-session-record'
+import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
+
+export type AgentSessionRecordReader = {
+  getRecord: (sessionId: string) => AgentSessionRecord | null
+  listRecords: () => AgentSessionRecord[]
+  /** Absent on a store that predates tab visibility; every session then counts as open. */
+  getVisibleSessionTabIndex?: () => { present: boolean; sessionIds: string[] }
+}
+
+/** Null until the agent-session host is installed; callers that must see records ensure it first. */
+export function readAgentSessionRecordStore(): AgentSessionRecordReader | null {
+  return getStructuredAgentSessionHost()?.deps.store ?? null
+}
+
+/** The session a committed `/clear` continued this one in, if any. */
+export function clearedInto(record: AgentSessionRecord): string | null {
+  const command = record.conversationCommand
+  return command?.command === 'clear' && command.phase === 'committed'
+    ? (command.replacementSessionId ?? null)
+    : null
+}
+
+/** The session running the lineage now; null when the chain names a session with no record. */
+export function lineageLiveSession(
+  store: AgentSessionRecordReader,
+  sessionId: string
+): AgentSessionRecord | null {
+  let live = store.getRecord(sessionId)
+  const later = new Set([sessionId])
+  let next = live ? clearedInto(live) : null
+  while (live && next && !later.has(next)) {
+    later.add(next)
+    live = store.getRecord(next)
+    next = live ? clearedInto(live) : null
+  }
+  return live
+}
diff --git a/src/main/runtime/orchestration/structured-session-mail-address.ts b/src/main/runtime/orchestration/structured-session-mail-address.ts
new file mode 100644
index 000000000000..19a2a56a0ee7
--- /dev/null
+++ b/src/main/runtime/orchestration/structured-session-mail-address.ts
@@ -0,0 +1,93 @@
+/**
+ * A structured agent session as a mail address: `session:<id>`, the Orca-minted id every agent is
+ * told is its public address. Recipient routing and pointer delivery both read these rules off the
+ * durable session record, so the two can never disagree about which sessions mail can reach.
+ *
+ * The address names a conversation, not one session of it: any session of a `/clear` lineage names
+ * the lineage root's address (`canonicalOrcaSessionId`), and mail reaches the lineage's live session.
+ *
+ * A released lease does not end a session: the host stops an idle chat's agent, and the send that
+ * points its mail starts it again. For mail, a conversation has ended only when its chat was closed.
+ */
+
+import type { AgentSessionRecord } from '../../../shared/agent-session-record'
+import { isOrcaSessionId, type OrcaSessionId } from '../../../shared/orca-session-address'
+import { ORCHESTRATION_SESSION_CALLER_ERROR_CODES as CODES } from '../../../shared/orchestration-session-caller-codes'
+import { structuredWorkerHostScope } from '../structured-worker-identity'
+import type { OrchestrationDb } from './db'
+import { OrchestrationError } from './orchestration-error'
+import { resolveOrcaSessionParty, type OrchestrationSessionParty } from './orchestration-party'
+import { lineageLiveSession, type AgentSessionRecordReader } from './structured-session-lineage'
+
+export type OrcaAgentSessionLookup =
+  | { kind: 'found'; record: AgentSessionRecord }
+  /** The id is a provider's own session id, which rotates on `/clear`; this names the Orca id. */
+  | { kind: 'provider-id'; orcaSessionId: string }
+  | { kind: 'unknown' }
+
+export function lookupOrcaAgentSession(
+  store: AgentSessionRecordReader,
+  id: string
+): OrcaAgentSessionLookup {
+  const record = store.getRecord(id)
+  if (record) {
+    return { kind: 'found', record }
+  }
+  const owner = store
+    .listRecords()
+    .find((candidate) =>
+      candidate.providerHandleChain.some(({ handle }) =>
+        handle.provider === 'claude' ? handle.sessionId === id : handle.threadId === id
+      )
+    )
+  return owner ? { kind: 'provider-id', orcaSessionId: owner.sessionId } : { kind: 'unknown' }
+}
+
+export type StructuredSessionMailReach =
+  /** `session` is the conversation's live session, the one its mail reaches now. */
+  | { kind: 'reachable'; session: AgentSessionRecord }
+  | { kind: 'other-host' }
+  | { kind: 'ended'; reason: 'closed' | 'worker-identity-lost' | 'continuation-missing' }
+
+/** Whether mail to `record`'s conversation can reach the session that runs it now. */
+export function structuredSessionMailReach(
+  store: AgentSessionRecordReader,
+  record: AgentSessionRecord,
+  db: OrchestrationDb | null | undefined
+): StructuredSessionMailReach {
+  const live = lineageLiveSession(store, record.sessionId)
+  if (!live) {
+    return { kind: 'ended', reason: 'continuation-missing' }
+  }
+  if (!structuredWorkerHostScope(live.location)) {
+    return { kind: 'other-host' }
+  }
+  if (isOrcaSessionId(live.sessionId) && !addressableSessionParty(live.sessionId, db)) {
+    // Why: it can no longer act (the caller resolver refuses it), so mail to it could never be read.
+    return { kind: 'ended', reason: 'worker-identity-lost' }
+  }
+  const visible = store.getVisibleSessionTabIndex?.()
+  if (visible?.present && !visible.sessionIds.includes(live.sessionId)) {
+    // Why: reviving a chat the user closed would run turns nobody can see; its mail waits instead.
+    return { kind: 'ended', reason: 'closed' }
+  }
+  return { kind: 'reachable', session: live }
+}
+
+/**
+ * The party a session resolves to, or null for a worker whose identity this host lost: the party
+ * resolver refuses it in every role, so it can never read mail and none is owed to it.
+ */
+export function addressableSessionParty(
+  sessionId: OrcaSessionId,
+  db: OrchestrationDb | null | undefined
+): OrchestrationSessionParty | null {
+  try {
+    return resolveOrcaSessionParty(sessionId, db)
+  } catch (error) {
+    if (error instanceof OrchestrationError && error.code === CODES.notLive) {
+      return null
+    }
+    throw error
+  }
+}
diff --git a/src/main/runtime/orchestration/structured-session-mail-target.test.ts b/src/main/runtime/orchestration/structured-session-mail-target.test.ts
new file mode 100644
index 000000000000..5ed9c1ce26f4
--- /dev/null
+++ b/src/main/runtime/orchestration/structured-session-mail-target.test.ts
@@ -0,0 +1,531 @@
+import { existsSync, 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 {
+  getAppEnvironment,
+  hasAppEnvironment,
+  setAppEnvironment,
+  type AppEnvironment
+} from '../../../shared/app-environment'
+import type { AgentSessionLease, AgentSessionRecord } from '../../../shared/agent-session-record'
+import {
+  agentSessionLeaseFixture,
+  agentSessionRecordFixture
+} from '../../../shared/agent-session-record.test-fixture'
+import { formatOrcaSessionAddress, type OrcaSessionId } from '../../../shared/orca-session-address'
+import { testOrcaSessionId } from '../../../shared/orca-session-address-test-fixture'
+
+const hostRef: { current: unknown } = { current: null }
+
+vi.mock('../../native-chat/agent-session-wire/structured-agent-session-registry', () => ({
+  getStructuredAgentSessionHost: () => hostRef.current
+}))
+
+const { OrcaRuntimeWithGetPtyRecordForPaneKey } =
+  await import('../orca-runtime-get-pty-record-for-pane-key')
+const { OrchestrationDb } = await import('./db')
+const { resolveOrcaSessionParty } = await import('./orchestration-party')
+const {
+  mintStructuredWorkerHandle,
+  mintStructuredWorkerPaneKey,
+  structuredWorkerIdentities,
+  structuredWorkerProcessIncarnation
+} = await import('../structured-worker-identity')
+
+const CHAT = testOrcaSessionId('4a1f6c2e-8b3d-4e7a-9c15-0d2b6e8f1a37')
+const CHAT_ADDRESS = formatOrcaSessionAddress(CHAT)
+
+/** The real methods through the real prototype chain; a re-declared copy would pin nothing. */
+class MailTargetProbe extends OrcaRuntimeWithGetPtyRecordForPaneKey {
+  target(mailboxHandle: string): unknown {
+    return this.resolveStructuredMailboxTarget(mailboxHandle)
+  }
+}
+
+type Store = {
+  records: Map<string, AgentSessionRecord>
+  visible: { present: boolean; sessionIds: string[] }
+}
+
+function chatRecord(
+  lease: Partial<AgentSessionLease> = {},
+  extra: Partial<AgentSessionRecord> = {}
+): AgentSessionRecord {
+  return {
+    ...agentSessionRecordFixture(
+      agentSessionLeaseFixture({ sessionId: CHAT, runtimeKind: 'native', ...lease })
+    ),
+    ...extra
+  }
+}
+
+function installStore(record: AgentSessionRecord | null, visible = true): Store {
+  const store: Store = {
+    records: new Map(record ? [[record.sessionId, record]] : []),
+    visible: { present: true, sessionIds: visible && record ? [record.sessionId] : [] }
+  }
+  hostRef.current = {
+    deps: {
+      store: {
+        getRecord: (sessionId: string) => store.records.get(sessionId) ?? null,
+        listRecords: () => [...store.records.values()],
+        getVisibleSessionTabIndex: () => store.visible
+      }
+    }
+  }
+  return store
+}
+
+let db: InstanceType<typeof OrchestrationDb>
+
+function probe(extra: Record<string, unknown> = {}): MailTargetProbe {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a prototype-only probe; every field the methods read is assigned below.
+  return Object.assign(Object.create(MailTargetProbe.prototype), {
+    _orchestrationDb: db,
+    ptysById: new Map(),
+    ...extra
+  }) as MailTargetProbe
+}
+
+function chatCoordinatedRun(): string {
+  return db.createRun({
+    objective: 'o',
+    coordinatorHandle: null,
+    coordinatorPaneKey: null,
+    coordinatorOrcaSessionId: CHAT
+  }).id
+}
+
+beforeEach(() => {
+  db = new OrchestrationDb(':memory:')
+  hostRef.current = null
+})
+
+afterEach(() => {
+  db.close()
+})
+
+describe('a Run whose coordinator is a chat (an Orca session id, no handle)', () => {
+  it('delivers its mailbox to that session', () => {
+    // The defect this pins: the resolver read only `coordinator_handle`, which a chat never has, so
+    // neither lane claimed the Run mailbox and a worker's result never reached the chat.
+    installStore(chatRecord())
+    const runId = chatCoordinatedRun()
+    expect(probe().target(`run:${runId}`)).toEqual({ sessionId: CHAT, dispatchId: null })
+  })
+
+  it('still delivers once the host has evicted the chat, so the delivery can wake it', () => {
+    installStore(chatRecord({ claimStatus: 'released', ownerProcess: null }))
+    const runId = chatCoordinatedRun()
+    expect(probe().target(`run:${runId}`)).toEqual({ sessionId: CHAT, dispatchId: null })
+  })
+
+  it('does not deliver to a chat that was closed, cleared into no known session, or runs on another host', () => {
+    const runId = chatCoordinatedRun()
+    installStore(chatRecord(), false)
+    expect(probe().target(`run:${runId}`)).toBeNull()
+
+    installStore(
+      chatRecord(
+        {},
+        {
+          conversationCommand: {
+            command: 'clear',
+            state: 'completed',
+            replacementSessionId: '7e3b9d15-2c4a-4f86-a0b1-5c9e2d7f3b64',
+            operationId: 'op',
+            callerKey: 'caller',
+            phase: 'committed'
+          }
+        }
+      )
+    )
+    expect(probe().target(`run:${runId}`)).toBeNull()
+
+    const remote = chatRecord()
+    installStore({ ...remote, location: { ...remote.location, executionHostId: 'ssh:box' } })
+    expect(probe().target(`run:${runId}`)).toBeNull()
+  })
+
+  it('does not deliver to an Orca session id written at an earlier generation of the Run', () => {
+    // An older binary's rebind or unbind bumps the generation and leaves the id behind.
+    installStore(chatRecord())
+    const runId = chatCoordinatedRun()
+    db.db
+      .prepare('UPDATE runs SET consumer_generation = consumer_generation + 1 WHERE id = ?')
+      .run(runId)
+    expect(probe().target(`run:${runId}`)).toBeNull()
+  })
+
+  it('ignores an Orca session id left beside a PTY handle; the handle owns the Run', () => {
+    installStore(chatRecord())
+    const runId = db.createRun({
+      objective: 'o',
+      coordinatorHandle: 'term_coord',
+      coordinatorPaneKey: 'tab_c:11111111-1111-4111-8111-111111111111',
+      coordinatorOrcaSessionId: CHAT
+    }).id
+    expect(probe().target(`run:${runId}`)).toBeNull()
+  })
+})
+
+describe('a session addressed directly', () => {
+  it('owns its `session:<id>` mailbox', () => {
+    installStore(chatRecord())
+    expect(probe().target(CHAT_ADDRESS)).toEqual({ sessionId: CHAT, dispatchId: null })
+  })
+
+  it('claims nothing for a malformed session address', () => {
+    installStore(chatRecord())
+    expect(probe().target('session:term_abc')).toBeNull()
+  })
+})
+
+describe('the idle edge of a structured session', () => {
+  it('re-derives and delivers the mailboxes the session owns, and nothing while it works', () => {
+    installStore(chatRecord())
+    const runId = chatCoordinatedRun()
+    db.insertMessage({
+      from: 'term_worker',
+      to: `run:${runId}`,
+      subject: 'done',
+      runId,
+      type: 'status'
+    })
+    const delivered: string[] = []
+    const runtime = probe({
+      deliverPendingMessagesForHandle: (handle: string) => delivered.push(handle),
+      notifyStructuredSessionJournalActivity: vi.fn(),
+      cancelMessageWaiters: vi.fn()
+    })
+    runtime.onStructuredSessionStatusForMail({ sessionId: CHAT, status: 'working' })
+    expect(delivered).toEqual([])
+    runtime.onStructuredSessionStatusForMail({ sessionId: CHAT, status: 'idle' })
+    expect(delivered).toEqual([`run:${runId}`])
+  })
+
+  it('points direct mail at a session that coordinates nothing', () => {
+    installStore(chatRecord())
+    db.insertMessage({ from: 'term_peer', to: CHAT_ADDRESS, subject: 'hi', type: 'status' })
+    const delivered: string[] = []
+    probe({
+      deliverPendingMessagesForHandle: (handle: string) => delivered.push(handle),
+      notifyStructuredSessionJournalActivity: vi.fn(),
+      cancelMessageWaiters: vi.fn()
+    }).onStructuredSessionStatusForMail({ sessionId: CHAT, status: 'idle' })
+    expect(delivered).toEqual([CHAT_ADDRESS])
+  })
+})
+
+describe('the idle edge after a restart, before any orchestration call', () => {
+  let userData: string
+  let previousEnvironment: AppEnvironment | null
+
+  beforeEach(() => {
+    userData = mkdtempSync(join(tmpdir(), 'orca-idle-edge-db-'))
+    previousEnvironment = hasAppEnvironment() ? getAppEnvironment() : null
+    setAppEnvironment({
+      getPath: () => userData,
+      getAppPath: () => userData,
+      getVersion: () => '0.0.0-test',
+      isPackaged: () => false,
+      onWillQuit: () => {},
+      exit: () => {},
+      getAppMetrics: () => []
+    })
+  })
+
+  afterEach(() => {
+    if (previousEnvironment) {
+      setAppEnvironment(previousEnvironment)
+    }
+    rmSync(userData, { recursive: true, force: true })
+  })
+
+  /** A runtime whose database has not been opened in this process yet. */
+  function restarted(delivered: string[]): MailTargetProbe {
+    return probe({
+      _orchestrationDb: null,
+      ensureOrchestrationFederationRelay: vi.fn(),
+      scheduleRestoredMessageRepoints: vi.fn(),
+      deliverPendingMessagesForHandle: (handle: string) => delivered.push(handle),
+      notifyStructuredSessionJournalActivity: vi.fn()
+    })
+  }
+
+  it('opens an existing orchestration database itself, so mail stored before the restart is redriven', () => {
+    // The strand this pins: the edge read the raw database field, null until the first
+    // orchestration RPC opened it, so a restarted chat's idle edges silently redrove nothing.
+    installStore(chatRecord())
+    const stored = new OrchestrationDb(join(userData, 'orchestration.db'))
+    const runId = stored.createRun({
+      objective: 'o',
+      coordinatorHandle: null,
+      coordinatorPaneKey: null,
+      coordinatorOrcaSessionId: CHAT
+    }).id
+    stored.close()
+    const delivered: string[] = []
+    const runtime = restarted(delivered)
+
+    runtime.onStructuredSessionStatusForMail({ sessionId: CHAT, status: 'idle' })
+
+    expect(delivered).toEqual([`run:${runId}`])
+    runtime.getOrchestrationDb().close()
+  })
+
+  it('creates no database for a profile that never orchestrated, and says nothing', () => {
+    installStore(chatRecord())
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const delivered: string[] = []
+
+    restarted(delivered).onStructuredSessionStatusForMail({ sessionId: CHAT, status: 'idle' })
+
+    expect(delivered).toEqual([])
+    expect(existsSync(join(userData, 'orchestration.db'))).toBe(false)
+    expect(warn).not.toHaveBeenCalled()
+    warn.mockRestore()
+  })
+
+  it('says so when the database cannot be opened, instead of skipping silently', () => {
+    installStore(chatRecord())
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const deliver = vi.fn()
+    probe({
+      _orchestrationDb: null,
+      getExistingOrchestrationDb: () => {
+        throw new Error('userData unavailable')
+      },
+      deliverPendingMessagesForHandle: deliver,
+      notifyStructuredSessionJournalActivity: vi.fn()
+    }).onStructuredSessionStatusForMail({ sessionId: CHAT, status: 'idle' })
+    expect(deliver).not.toHaveBeenCalled()
+    expect(warn).toHaveBeenCalledWith(
+      '[orchestration] skipped a structured session mail edge: no database',
+      { sessionId: CHAT, error: 'userData unavailable' }
+    )
+    warn.mockRestore()
+  })
+})
+
+describe('a coordinator chat continued by /clear', () => {
+  const MIDDLE = testOrcaSessionId('clear-fedcba9876543210fedcba9876543210fedcba98')
+  const SUCCESSOR = testOrcaSessionId('clear-0123456789abcdef0123456789abcdef01234567')
+
+  function sessionRecord(sessionId: string, clearedInto?: string): AgentSessionRecord {
+    const record = agentSessionRecordFixture(
+      agentSessionLeaseFixture({
+        sessionId,
+        runtimeKind: 'native',
+        ...(clearedInto ? { claimStatus: 'released' as const, ownerProcess: null } : {})
+      })
+    )
+    return clearedInto
+      ? {
+          ...record,
+          conversationCommand: {
+            command: 'clear',
+            state: 'completed',
+            replacementSessionId: clearedInto,
+            operationId: `op-${sessionId}`,
+            callerKey: 'caller',
+            phase: 'committed'
+          }
+        }
+      : record
+  }
+
+  /** CHAT cleared into each of `chain` in turn; the last one is live and its tab is open. */
+  function installLineage(...chain: string[]): void {
+    const lineage = [CHAT, ...chain]
+    const store = installStore(null)
+    lineage.forEach((sessionId, index) =>
+      store.records.set(sessionId, sessionRecord(sessionId, lineage[index + 1]))
+    )
+    store.visible.sessionIds.push(lineage.at(-1)!)
+  }
+
+  function idleEdge(sessionId: string): string[] {
+    const delivered: string[] = []
+    probe({
+      deliverPendingMessagesForHandle: (handle: string) => delivered.push(handle),
+      notifyStructuredSessionJournalActivity: vi.fn()
+    }).onStructuredSessionStatusForMail({ sessionId, status: 'idle' })
+    return delivered
+  }
+
+  function runCreatedBy(sessionId: OrcaSessionId): string {
+    return db.createRun({
+      objective: 'o',
+      coordinatorHandle: null,
+      coordinatorPaneKey: null,
+      coordinatorOrcaSessionId: resolveOrcaSessionParty(sessionId, db).orcaSessionId
+    }).id
+  }
+
+  it('stores a Dispatch assignee by the lineage root of the session its incarnation names', () => {
+    installLineage(SUCCESSOR)
+    const dispatch = db.createDispatchContext({
+      taskId: db.createTask({ runId: chatCoordinatedRun(), spec: 'work' }).id,
+      assigneeHandle: mintStructuredWorkerHandle(),
+      assigneePaneKey: mintStructuredWorkerPaneKey(SUCCESSOR),
+      processIncarnation: structuredWorkerProcessIncarnation(SUCCESSOR),
+      creator: { kind: 'system' },
+      maxDepth: Number.MAX_SAFE_INTEGER
+    })
+    expect(db.getDispatchContextById(dispatch.id)?.assignee_orca_session_id).toBe(CHAT)
+  })
+
+  it("never unbinds the successor's own Run", () => {
+    // The strand this pins: the successor's own run-create, then its idle edge rebinding the
+    // predecessor's Run through an exclusive bind, which unbound the Run the successor created.
+    installLineage(SUCCESSOR)
+    chatCoordinatedRun()
+    const ownRun = runCreatedBy(SUCCESSOR)
+    const generation = db.getRunRaw(ownRun)!.consumer_generation
+
+    expect(idleEdge(SUCCESSOR)).toContain(`run:${ownRun}`)
+    idleEdge(SUCCESSOR)
+
+    const successor = resolveOrcaSessionParty(SUCCESSOR, db)
+    expect(db.getRunRaw(ownRun)).toMatchObject({
+      coordinator_orca_session_id: successor.orcaSessionId,
+      consumer_generation: generation
+    })
+    expect(db.getCurrentRunForCoordinator(successor)?.id).toBe(ownRun)
+  })
+
+  it('keeps a Run bound, unrewritten, across a chain of clears, and delivers it to the live end', () => {
+    installLineage(MIDDLE)
+    const runId = chatCoordinatedRun()
+    const generation = db.getRunRaw(runId)!.consumer_generation
+    idleEdge(MIDDLE)
+    installLineage(MIDDLE, SUCCESSOR)
+    expect(idleEdge(SUCCESSOR)).toContain(`run:${runId}`)
+
+    expect(db.getRunRaw(runId)).toMatchObject({
+      coordinator_orca_session_id: CHAT,
+      consumer_generation: generation
+    })
+    for (const member of [CHAT, MIDDLE, SUCCESSOR]) {
+      expect(db.getCurrentRunForCoordinator(resolveOrcaSessionParty(member, db))?.id).toBe(runId)
+    }
+    expect(probe().target(`run:${runId}`)).toEqual({ sessionId: SUCCESSOR, dispatchId: null })
+  })
+
+  it('keeps the Run a middle session created bound after the next clear', () => {
+    // The chain strand: adopting each predecessor's Run in turn unbound all but the last adopted.
+    installLineage(MIDDLE)
+    runCreatedBy(CHAT)
+    const middleRun = runCreatedBy(MIDDLE)
+    const generation = db.getRunRaw(middleRun)!.consumer_generation
+    installLineage(MIDDLE, SUCCESSOR)
+    idleEdge(SUCCESSOR)
+
+    const successor = resolveOrcaSessionParty(SUCCESSOR, db)
+    expect(db.getRunRaw(middleRun)).toMatchObject({
+      coordinator_orca_session_id: successor.orcaSessionId,
+      consumer_generation: generation
+    })
+    expect(db.getCurrentRunForCoordinator(successor)?.id).toBe(middleRun)
+  })
+
+  it('reaches the live session through any spelling of the conversation, and stores one', () => {
+    installLineage(MIDDLE, SUCCESSOR)
+    for (const member of [CHAT, MIDDLE, SUCCESSOR]) {
+      expect(resolveOrcaSessionParty(member, db)).toMatchObject({
+        orcaSessionId: CHAT,
+        address: CHAT_ADDRESS
+      })
+      expect(probe().target(`session:${member}`)).toEqual({
+        sessionId: SUCCESSOR,
+        dispatchId: null
+      })
+    }
+    const direct = db.insertMessage({
+      from: 'term_peer',
+      to: CHAT_ADDRESS,
+      subject: 'hi',
+      type: 'status'
+    })
+    expect(idleEdge(SUCCESSOR)).toEqual([CHAT_ADDRESS])
+    expect(db.getMessageById(direct.id)).toMatchObject({ to_handle: CHAT_ADDRESS, read: 0 })
+  })
+})
+
+describe('a structured worker continued by /clear', () => {
+  const WORKER = testOrcaSessionId('9c2e4a61-3f7b-4d8e-b105-6a2d8e4f1c93')
+  const WORKER_SUCCESSOR = testOrcaSessionId('clear-a1b2c3d4e5f60718293a4b5c6d7e8f9012345678')
+
+  afterEach(() => {
+    structuredWorkerIdentities.clear()
+  })
+
+  /** A worker minted for WORKER, whose conversation `/clear` continued in WORKER_SUCCESSOR. */
+  function clearedWorker(): { handle: string; paneKey: string } {
+    const store = installStore(null)
+    const minted = agentSessionRecordFixture(
+      agentSessionLeaseFixture({ sessionId: WORKER, runtimeKind: 'native' })
+    )
+    store.records.set(WORKER, {
+      ...minted,
+      conversationCommand: {
+        command: 'clear',
+        state: 'completed',
+        replacementSessionId: WORKER_SUCCESSOR,
+        operationId: 'op-worker',
+        callerKey: 'caller',
+        phase: 'committed'
+      }
+    })
+    store.records.set(
+      WORKER_SUCCESSOR,
+      agentSessionRecordFixture(
+        agentSessionLeaseFixture({ sessionId: WORKER_SUCCESSOR, runtimeKind: 'native' })
+      )
+    )
+    const identity = structuredWorkerIdentities.register({
+      handle: mintStructuredWorkerHandle(),
+      sessionId: WORKER,
+      agent: 'codex',
+      paneKey: mintStructuredWorkerPaneKey(WORKER),
+      processIncarnation: structuredWorkerProcessIncarnation(WORKER),
+      worktreeId: 'wt_1',
+      hostScope: { kind: 'local', hostId: 'local' }
+    })
+    return { handle: identity.handle, paneKey: identity.paneKey }
+  }
+
+  it("delivers mail at the worker's handle to the live successor, as a terminal keeps its handle", () => {
+    // The strand this pins: the handle resolved to the session minted for it, which `/clear`
+    // replaced, so the worker's own mail was pointed at a session that no longer runs its turns.
+    const { handle } = clearedWorker()
+    expect(probe().target(handle)).toEqual({ sessionId: WORKER_SUCCESSOR, dispatchId: null })
+  })
+
+  it("delivers the worker's dispatch mailbox and a Run it coordinates to the live successor", () => {
+    const { handle, paneKey } = clearedWorker()
+    const dispatch = db.createDispatchContext({
+      taskId: db.createTask({ runId: chatCoordinatedRun(), spec: 'work' }).id,
+      assigneeHandle: handle,
+      assigneePaneKey: paneKey,
+      processIncarnation: structuredWorkerProcessIncarnation(WORKER),
+      creator: { kind: 'system' },
+      maxDepth: Number.MAX_SAFE_INTEGER
+    })
+    expect(probe().target(`dispatch:${dispatch.id}`)).toEqual({
+      sessionId: WORKER_SUCCESSOR,
+      dispatchId: dispatch.id
+    })
+    const workerRun = db.createRun({
+      objective: 'o',
+      coordinatorHandle: handle,
+      coordinatorPaneKey: paneKey
+    }).id
+    expect(probe().target(`run:${workerRun}`)).toEqual({
+      sessionId: WORKER_SUCCESSOR,
+      dispatchId: null
+    })
+  })
+})
diff --git a/src/main/runtime/orchestration/structured-session-mail-target.ts b/src/main/runtime/orchestration/structured-session-mail-target.ts
new file mode 100644
index 000000000000..e71c08c512e4
--- /dev/null
+++ b/src/main/runtime/orchestration/structured-session-mail-target.ts
@@ -0,0 +1,128 @@
+/**
+ * Where a mailbox owned by a structured session is delivered: a chat that coordinates a Run
+ * (`run:<id>` with no coordinator handle), a session addressed directly at `session:<id>`, and the
+ * live session behind a structured worker's handle. The session is resolved here, never a pane, and
+ * takes the pointer as a session turn.
+ */
+
+import {
+  ORCA_SESSION_ADDRESS_PREFIX,
+  isOrcaSessionId,
+  parseOrcaSessionAddress,
+  type OrcaSessionId
+} from '../../../shared/orca-session-address'
+import type { OrchestrationDb } from './db'
+import { currentRunCoordinatorOrcaSessionId } from './db/runs/run-coordinator-orca-session'
+import { structuredWorkerHostScope } from '../structured-worker-identity'
+import type { StructuredPointerTarget } from './structured-mailbox-pointer-delivery'
+import {
+  addressableSessionParty,
+  structuredSessionMailReach
+} from './structured-session-mail-address'
+import {
+  lineageLiveSession,
+  readAgentSessionRecordStore,
+  type AgentSessionRecordReader
+} from './structured-session-lineage'
+import type { RunRow } from './types'
+
+/**
+ * The session a Run's coordinator binding names when that binding has no handle. A structured
+ * worker coordinates by its own handle and resolves through it, so only a handle-less binding names
+ * a session here, and only by an Orca session id that still counts (see
+ * `currentRunCoordinatorOrcaSessionId`).
+ */
+export function handleLessCoordinatorSessionId(
+  run: Pick<
+    RunRow,
+    | 'coordinator_handle'
+    | 'coordinator_orca_session_id'
+    | 'coordinator_orca_session_id_generation'
+    | 'consumer_generation'
+  >
+): OrcaSessionId | null {
+  if (run.coordinator_handle !== null) {
+    return null
+  }
+  return currentRunCoordinatorOrcaSessionId(run)
+}
+
+/**
+ * The structured-lane target for `sessionId`'s conversation: its live session, whichever session of
+ * the lineage was named; null when mail cannot reach it here.
+ */
+export function structuredSessionMailTarget(
+  sessionId: string,
+  db: OrchestrationDb | null | undefined,
+  store: AgentSessionRecordReader | null = readAgentSessionRecordStore()
+): StructuredPointerTarget | null {
+  const record = store?.getRecord(sessionId)
+  const reach = store && record ? structuredSessionMailReach(store, record, db) : null
+  return reach?.kind === 'reachable'
+    ? { sessionId: reach.session.sessionId, dispatchId: null }
+    : null
+}
+
+/**
+ * The session a structured worker's mail reaches: the one minted for it, or that session's live
+ * `/clear` successor, which carries on as the worker the way a terminal keeps its handle.
+ */
+export function structuredWorkerMailSessionId(
+  mintedSessionId: string,
+  store: AgentSessionRecordReader | null = readAgentSessionRecordStore()
+): string | null {
+  const live = store ? lineageLiveSession(store, mintedSessionId) : null
+  return live && structuredWorkerHostScope(live.location) ? live.sessionId : null
+}
+
+/**
+ * The target of a `session:<id>` mailbox; `undefined` when the handle is not a session address at
+ * all, so other address forms keep their own resolution.
+ */
+export function structuredSessionAddressTarget(
+  mailboxHandle: string,
+  db: OrchestrationDb | null | undefined
+): StructuredPointerTarget | null | undefined {
+  if (!mailboxHandle.startsWith(ORCA_SESSION_ADDRESS_PREFIX)) {
+    return undefined
+  }
+  const sessionId = parseOrcaSessionAddress(mailboxHandle)
+  return sessionId ? structuredSessionMailTarget(sessionId, db) : null
+}
+
+/**
+ * Every mailbox a session reads for itself: the Runs it coordinates and its own direct mail.
+ * Re-derived from the database on each idle edge rather than remembered, so mail that arrived
+ * while the session could not take it (mid-turn, closed) is found again.
+ */
+export function structuredSessionOwnedMailboxes(sessionId: string, db: OrchestrationDb): string[] {
+  const party = isOrcaSessionId(sessionId) ? addressableSessionParty(sessionId, db) : null
+  if (!party) {
+    return []
+  }
+  const mailboxes = db.runsBoundToCoordinator(party).map((run) => `run:${run.id}`)
+  if (db.getUnreadDirectMessageTypes(party.address).length > 0) {
+    mailboxes.push(party.address)
+  }
+  return mailboxes
+}
+
+/** The mailboxes a session's idle edge re-derives, opening an existing database if nothing has
+ *  yet: after a restart this edge is what redrives mail stored before it. No database file means
+ *  no mail, so `openDb` answers null and nothing is created. */
+export function structuredSessionIdleEdgeMailboxes(
+  sessionId: string,
+  openDb: () => OrchestrationDb | null
+): string[] {
+  let db: OrchestrationDb | null
+  try {
+    db = openDb()
+  } catch (error) {
+    console.warn('[orchestration] skipped a structured session mail edge: no database', {
+      sessionId,
+      error: error instanceof Error ? error.message : String(error)
+    })
+    return []
+  }
+  return db ? structuredSessionOwnedMailboxes(sessionId, db) : []
+}
diff --git a/src/main/runtime/orchestration/structured-session-pointer-delivery.ts b/src/main/runtime/orchestration/structured-session-pointer-delivery.ts
index 4071d17a0733..4e838e313f84 100644
--- a/src/main/runtime/orchestration/structured-session-pointer-delivery.ts
+++ b/src/main/runtime/orchestration/structured-session-pointer-delivery.ts
@@ -68,7 +68,8 @@ export function structuredSessionGateFacts(
  * them. Neither refuses the frame: Codex COALESCES a mid-turn `turn/start` into
  * the running turn -- measured on codex-cli 0.147.0, 0.150.1 and 0.153.4, none
  * of which refuse it and none of which fire a second `turn/started` -- and
- * Claude queues it behind the turn. Both therefore
+ * Claude folds it into the running turn (or runs it as the next turn when the
+ * turn ends first). Both therefore
  * fold the nudge into work already in flight, where it reads as part of the
  * running turn rather than a new instruction. Waiting for the turn to settle is
  * the one contract that holds for both, and it preserves orchestration's
@@ -98,7 +99,7 @@ export function decideStructuredSessionPointerDelivery(input: {
  * adapters cannot tell them apart — so it must retain. Treating it as delivered
  * would drop mail whenever a child died mid-send.
  */
-export function structuredDispatchDelivered(state: StructuredDispatchState): boolean {
+export function structuredDispatchDelivered(state: StructuredDispatchState): state is 'accepted' {
   return state === 'accepted'
 }
 
diff --git a/src/main/runtime/orchestration/structured-worker-group-addressing.test.ts b/src/main/runtime/orchestration/structured-worker-group-addressing.test.ts
index 31ee011193ae..43b7fe2be459 100644
--- a/src/main/runtime/orchestration/structured-worker-group-addressing.test.ts
+++ b/src/main/runtime/orchestration/structured-worker-group-addressing.test.ts
@@ -50,11 +50,14 @@ function installHost(options: {
   items?: AgentJournalRenderItem[]
   lease?: { runtimeKind: string; claimStatus: string }
   hasSession?: boolean
+  tabListed?: boolean
 }): void {
   const lease = options.lease ?? { runtimeKind: 'native', claimStatus: 'live' }
   hostRef.current = {
     deps: {
       store: {
+        // No committed /clear: each session is its own lineage's root.
+        listRecords: () => [],
         getRecord: (sessionId: string) =>
           ({
             sessionId,
@@ -65,21 +68,45 @@ function installHost(options: {
       }
     },
     hasSession: () => options.hasSession ?? true,
-    journalSnapshot: () => ({ items: options.items ?? [idleTurn()] })
+    getPersistedVisibleSessionTabIndex: () => ({
+      present: true,
+      sessionIds: options.tabListed ? [SESSION_ID] : []
+    }),
+    journalSnapshot: async () => ({ items: options.items ?? [idleTurn()] })
   }
 }
 
+/** The durable worker-terminal rows group addressing enumerates. */
+const rows: {
+  terminal_handle: string
+  pane_key: string
+  process_incarnation: string
+  worktree_id: string
+  host_scope: string
+}[] = []
+
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: group addressing reads only this one query off the database.
+const workerDb = { listWorkerTerminalResourcesByIncarnationPrefix: () => rows } as never
+
 function registerWorker(worktreeId = 'wt_1'): string {
   const handle = mintStructuredWorkerHandle()
+  const paneKey = mintStructuredWorkerPaneKey(SESSION_ID)
   structuredWorkerIdentities.register({
     handle,
     sessionId: SESSION_ID,
     agent: 'codex',
-    paneKey: mintStructuredWorkerPaneKey(SESSION_ID),
+    paneKey,
     processIncarnation: structuredWorkerProcessIncarnation(SESSION_ID),
     worktreeId,
     hostScope: { kind: 'local', hostId: 'local' }
   })
+  rows.push({
+    terminal_handle: handle,
+    pane_key: paneKey,
+    process_incarnation: structuredWorkerProcessIncarnation(SESSION_ID),
+    worktree_id: worktreeId,
+    host_scope: JSON.stringify({ kind: 'local', hostId: 'local' })
+  })
   return handle
 }
 
@@ -88,22 +115,28 @@ const PTY_TERMINAL = { handle: 'term_a', worktreeId: 'wt_1', agentIdentity: 'cla
 describe('group addressing and structured workers', () => {
   beforeEach(() => {
     structuredWorkerIdentities.clear()
+    rows.length = 0
     hostRef.current = null
   })
 
   it('enumerates a live structured worker as a candidate', () => {
     const handle = registerWorker()
     installHost({})
-    expect(listAddressableStructuredWorkers()).toEqual([
+    expect(listAddressableStructuredWorkers(workerDb)).toEqual([
       { handle, worktreeId: 'wt_1', agentIdentity: 'codex' }
     ])
   })
 
-  it('leaves out a worker whose session is not proven live', () => {
-    // Addressing a settled worker would store mail no lane will ever deliver.
-    registerWorker()
-    installHost({ lease: { runtimeKind: 'native', claimStatus: 'live' }, hasSession: false })
-    expect(listAddressableStructuredWorkers()).toEqual([])
+  it('keeps a worker at rest and leaves out a retired one', () => {
+    // At rest: its agent was stopped while idle, its chat tab still lists it, and mail starts it.
+    const handle = registerWorker()
+    installHost({ lease: { runtimeKind: 'native', claimStatus: 'released' }, tabListed: true })
+    expect(listAddressableStructuredWorkers(workerDb)).toEqual([
+      { handle, worktreeId: 'wt_1', agentIdentity: 'codex' }
+    ])
+    // Retired: released with its tab gone. Addressing it would store mail no lane delivers.
+    installHost({ lease: { runtimeKind: 'native', claimStatus: 'released' }, tabListed: false })
+    expect(listAddressableStructuredWorkers(workerDb)).toEqual([])
   })
 
   it('reaches a structured worker through @all', () => {
@@ -112,14 +145,14 @@ describe('group addressing and structured workers', () => {
     // machinery never ran and the sender got exit 0 with a receipt naming only who did resolve.
     const handle = registerWorker()
     installHost({})
-    const recipients = [PTY_TERMINAL, ...listAddressableStructuredWorkers()]
+    const recipients = [PTY_TERMINAL, ...listAddressableStructuredWorkers(workerDb)]
     expect(resolveGroupAddress('@all', 'term_sender', recipients, () => 'idle')).toContain(handle)
   })
 
   it('reaches a structured worker through @worktree: and @codex, but not @claude', () => {
     const handle = registerWorker('wt_2')
     installHost({})
-    const recipients = [PTY_TERMINAL, ...listAddressableStructuredWorkers()]
+    const recipients = [PTY_TERMINAL, ...listAddressableStructuredWorkers(workerDb)]
     expect(resolveGroupAddress('@worktree:wt_2', 'term_sender', recipients, () => 'idle')).toEqual([
       handle
     ])
@@ -129,20 +162,20 @@ describe('group addressing and structured workers', () => {
     ])
   })
 
-  it('reads @idle status off the FULL timeline, never a bounded tail', () => {
+  it('reads @idle status off the FULL timeline, never a bounded tail', async () => {
     // The same trap that already cost this branch once: settlement tombstones the lifecycle item
     // rather than rewriting it, so a long tool-calling turn pushes it arbitrarily far from the
     // tail and any page-sized read reports a BUSY worker as idle — then `@idle` broadcasts into a
-    // running turn, which Codex refuses outright and Claude queues behind.
+    // running turn, which Codex refuses outright and Claude folds into it.
     registerWorker()
     installHost({ items: [runningTurn(), ...transcript(500)] })
-    expect(structuredWorkerAgentStatus(SESSION_ID)).toBe('working')
+    expect(await structuredWorkerAgentStatus(SESSION_ID)).toBe('working')
   })
 
-  it('answers idle only when no turn is running and no human is awaited', () => {
+  it('answers idle only when no turn is running and no human is awaited', async () => {
     registerWorker()
     installHost({ items: [idleTurn()] })
-    expect(structuredWorkerAgentStatus(SESSION_ID)).toBe('idle')
+    expect(await structuredWorkerAgentStatus(SESSION_ID)).toBe('idle')
     installHost({
       items: [
         {
@@ -156,26 +189,27 @@ describe('group addressing and structured workers', () => {
         } as unknown as AgentJournalRenderItem
       ]
     })
-    expect(structuredWorkerAgentStatus(SESSION_ID)).toBe('attention')
+    expect(await structuredWorkerAgentStatus(SESSION_ID)).toBe('attention')
   })
 
-  it('answers null rather than idle when the session cannot be read', () => {
+  it('answers null rather than idle when the session cannot be read', async () => {
     // Unknown must never read as idle, or `@idle` wakes a worker mid-turn.
     hostRef.current = null
-    expect(structuredWorkerAgentStatus(SESSION_ID)).toBeNull()
+    expect(await structuredWorkerAgentStatus(SESSION_ID)).toBeNull()
   })
 })
 
 describe('sendGroupMessage actually composes structured workers in', () => {
   beforeEach(() => {
     structuredWorkerIdentities.clear()
+    rows.length = 0
     hostRef.current = null
   })
 
   /**
    * Drives the real `sendGroupMessage`, not `resolveGroupAddress`.
    *
-   * The suite above hand-composed `[PTY_TERMINAL, ...listAddressableStructuredWorkers()]` itself,
+   * The suite above hand-composed `[PTY_TERMINAL, ...listAddressableStructuredWorkers(workerDb)]` itself,
    * so deleting the composition at the call site left it green — the exact regression the fix
    * describes could come straight back. This test owns that seam.
    */
@@ -189,6 +223,7 @@ describe('sendGroupMessage actually composes structured workers in', () => {
       getCurrentRunForCoordinator: () => undefined,
       getActiveDispatchMailboxOwners: () => [],
       getRunMailboxOwnerIdsForHandle: () => [],
+      listWorkerTerminalResourcesByIncarnationPrefix: () => rows,
       insertMessages: (rows: { to: string }[]) => {
         inserted.push(...rows)
         return rows.map((row, index) => ({ id: `m${index}`, to_handle: row.to, type: 'status' }))
@@ -198,7 +233,7 @@ describe('sendGroupMessage actually composes structured workers in', () => {
       // No PTY terminals at all: if the call site does not compose structured workers in, the
       // group resolves empty and this throws instead of delivering.
       listTerminals: async () => ({ terminals: [] }),
-      getAgentStatusForHandle: () => 'idle',
+      getAgentStatusForHandle: async () => 'idle',
       getLiveTerminalPaneKey: () => structuredWorkerIdentities.get(handle)!.paneKey,
       notifyMessageArrived: () => {}
     }
@@ -232,6 +267,7 @@ describe('sendGroupMessage actually composes structured workers in', () => {
       getActiveDispatchForIdentity: () => ({ run_id: 'run_1' }),
       getActiveDispatchMailboxOwners: () => [],
       getRunMailboxOwnerIdsForHandle: () => [],
+      listWorkerTerminalResourcesByIncarnationPrefix: () => rows,
       listWorkerTerminalResources: () => [
         {
           dispatchId: 'ctx_structured',
@@ -259,7 +295,7 @@ describe('sendGroupMessage actually composes structured workers in', () => {
       listTerminals: async () => ({
         terminals: [{ handle: 'term_claude', worktreeId: 'wt_1', agentIdentity: 'claude' }]
       }),
-      getAgentStatusForHandle: () => 'idle',
+      getAgentStatusForHandle: async () => 'idle',
       getLiveTerminalPaneKey: () => null,
       getOrchestrationDb: () => db,
       notifyMessageArrived: () => {}
diff --git a/src/main/runtime/orchestration/structured-worker-group-addressing.ts b/src/main/runtime/orchestration/structured-worker-group-addressing.ts
index 168bd8701188..3a6161f81872 100644
--- a/src/main/runtime/orchestration/structured-worker-group-addressing.ts
+++ b/src/main/runtime/orchestration/structured-worker-group-addressing.ts
@@ -16,8 +16,13 @@
  */
 
 import type { TuiAgent } from '../../../shared/tui-agent'
-import { observeStructuredWorker, structuredWorkerAgent } from '../structured-worker-authority'
-import { structuredWorkerIdentities } from '../structured-worker-identity'
+import { structuredWorkerAgent } from '../structured-worker-authority'
+import { structuredWorkerAddressable } from '../structured-worker-custody'
+import {
+  STRUCTURED_WORKER_INCARNATION_PREFIX,
+  structuredWorkerIdentityFromRow
+} from '../structured-worker-identity'
+import type { OrchestrationDb } from './db'
 import { readStructuredSessionGateFacts } from './structured-mailbox-pointer-host'
 
 /** The only facts group addressing reads off a recipient. */
@@ -29,15 +34,29 @@ export type OrchestrationAddressableAgent = {
 }
 
 /**
- * Live structured workers of this runtime, as group-address candidates.
+ * Structured workers this runtime owns, as group-address candidates.
  *
- * Liveness-gated on the same observation the rest of the structured surface uses: a settled or
- * handed-off worker is not a recipient, and addressing one would store mail no lane will deliver.
+ * Read from the durable worker-terminal rows, which outlive a settled dispatch and a restart, and
+ * gated on ownership and on the orchestration not having released it — the same answer direct mail
+ * routes on — never on liveness: a worker at rest is a recipient, and the mail starts it. A retired
+ * or released one is not.
  */
-export function listAddressableStructuredWorkers(): OrchestrationAddressableAgent[] {
-  return structuredWorkerIdentities
-    .list()
-    .filter((identity) => observeStructuredWorker(identity).status === 'live')
+export function listAddressableStructuredWorkers(
+  db: OrchestrationDb | null
+): OrchestrationAddressableAgent[] {
+  const seen = new Set<string>()
+  return (
+    db?.listWorkerTerminalResourcesByIncarnationPrefix(STRUCTURED_WORKER_INCARNATION_PREFIX) ?? []
+  )
+    .flatMap((row) => {
+      const identity = structuredWorkerIdentityFromRow(row)
+      // Newest row first: a session is one recipient, under its latest handle.
+      if (!identity || seen.has(identity.sessionId)) {
+        return []
+      }
+      seen.add(identity.sessionId)
+      return structuredWorkerAddressable(db, identity.sessionId, row) === true ? [identity] : []
+    })
     .map((identity) => ({
       handle: identity.handle,
       worktreeId: identity.worktreeId,
@@ -49,11 +68,11 @@ export function listAddressableStructuredWorkers(): OrchestrationAddressableAgen
  * A structured worker's agent status, in the vocabulary `@idle` already matches on.
  *
  * Null when the session cannot be read: unknown must not read as idle, or a broadcast to `@idle`
- * would wake a worker mid-turn — which Codex coalesces into the running turn and Claude queues
- * behind it.
+ * would wake a worker mid-turn — which Codex coalesces into the running turn and Claude folds
+ * into it.
  */
-export function structuredWorkerAgentStatus(sessionId: string): string | null {
-  const facts = readStructuredSessionGateFacts(sessionId)
+export async function structuredWorkerAgentStatus(sessionId: string): Promise<string | null> {
+  const facts = await readStructuredSessionGateFacts(sessionId)
   if (!facts) {
     return null
   }
diff --git a/src/main/runtime/orchestration/structured-worker-journal-page.ts b/src/main/runtime/orchestration/structured-worker-journal-page.ts
index 35676aaf52cc..8d260339fa6f 100644
--- a/src/main/runtime/orchestration/structured-worker-journal-page.ts
+++ b/src/main/runtime/orchestration/structured-worker-journal-page.ts
@@ -16,14 +16,17 @@ export type StructuredJournalPage = {
   hasOlder: boolean
 }
 
-/** The newest page of a session's journal, or null when this runtime cannot read it. */
-export function readStructuredJournalPage(sessionId: string): StructuredJournalPage | null {
+/** The newest page of a session's journal, or null when this runtime cannot read it. A closed
+ *  conversation is opened for the read; that starts no agent. */
+export async function readStructuredJournalPage(
+  sessionId: string
+): Promise<StructuredJournalPage | null> {
   const host = getStructuredAgentSessionHost()
   if (!host) {
     return null
   }
   try {
-    const result = host.history({
+    const result = await host.history({
       sessionId,
       direction: 'tail',
       limit: STRUCTURED_JOURNAL_PAGE_LIMIT
diff --git a/src/main/runtime/orchestration/worker-output-archive.ts b/src/main/runtime/orchestration/worker-output-archive.ts
index d7e894cf54c1..ddae515a7f2c 100644
--- a/src/main/runtime/orchestration/worker-output-archive.ts
+++ b/src/main/runtime/orchestration/worker-output-archive.ts
@@ -91,7 +91,7 @@ export async function captureWorkerOutputArchive(args: {
   structuredWorker?: StructuredWorkerIdentity | null
 }): Promise<WorkerOutputArchiveCapture> {
   if (args.structuredWorker) {
-    const content = captureStructuredWorkerArchive(
+    const content = await captureStructuredWorkerArchive(
       args.structuredWorker,
       structuredWorkerAgent(args.structuredWorker)
     )
diff --git a/src/main/runtime/orchestration/worker-terminal-process-liveness.test.ts b/src/main/runtime/orchestration/worker-terminal-process-liveness.test.ts
new file mode 100644
index 000000000000..e2bc2cc7d639
--- /dev/null
+++ b/src/main/runtime/orchestration/worker-terminal-process-liveness.test.ts
@@ -0,0 +1,70 @@
+import { describe, expect, it } from 'vitest'
+import { matchesProcessIncarnation } from './worker-terminal-process-liveness'
+
+describe('matchesProcessIncarnation', () => {
+  it.each([
+    {
+      name: 'an exact ptyId:incarnation match',
+      ptyId: 'pty-1',
+      incarnationId: 'incarnation-1',
+      processIncarnation: 'pty-1:incarnation-1',
+      expected: true
+    },
+    {
+      name: 'a Windows repo::C:\\path@@1 ptyId whose incarnation matches',
+      ptyId: 'repo::C:\\path@@1',
+      incarnationId: 'incarnation-win',
+      processIncarnation: 'repo::C:\\path@@1:incarnation-win',
+      expected: true
+    },
+    {
+      name: 'a colon-bearing relay incarnationId that a lastIndexOf split would mangle',
+      ptyId: 'relay-pty',
+      incarnationId: 'relay:conn-3:incarnation-9',
+      processIncarnation: 'relay-pty:relay:conn-3:incarnation-9',
+      expected: true
+    },
+    {
+      name: 'a whitespace-dirty incarnationId (lost contact is never a match)',
+      ptyId: 'pty-1',
+      incarnationId: ' incarnation-1',
+      processIncarnation: 'pty-1: incarnation-1',
+      expected: false
+    },
+    {
+      name: 'an empty-string incarnationId',
+      ptyId: 'pty-1',
+      incarnationId: '',
+      processIncarnation: 'pty-1:',
+      expected: false
+    },
+    {
+      name: 'an absent (null) incarnationId',
+      ptyId: 'pty-1',
+      incarnationId: null,
+      processIncarnation: 'pty-1:incarnation-1',
+      expected: false
+    },
+    {
+      name: 'an absent (undefined) incarnationId',
+      ptyId: 'pty-1',
+      incarnationId: undefined,
+      processIncarnation: 'pty-1:incarnation-1',
+      expected: false
+    },
+    {
+      name: 'a prefix-decoy ptyId (@@1) against a longer live pty (@@10)',
+      ptyId: 'repo::C:\\path@@1',
+      incarnationId: 'inc-1',
+      processIncarnation: 'repo::C:\\path@@10:inc-1',
+      expected: false
+    }
+  ])('returns $expected for $name', ({ ptyId, incarnationId, processIncarnation, expected }) => {
+    expect(matchesProcessIncarnation(ptyId, incarnationId, processIncarnation)).toBe(expected)
+  })
+
+  it('rejects a partial prefix that is not colon-delimited', () => {
+    // 'pty-10' is not the pty 'pty-1'; the `${ptyId}:` fence keeps them distinct.
+    expect(matchesProcessIncarnation('pty-1', 'inc', 'pty-10:inc')).toBe(false)
+  })
+})
diff --git a/src/main/runtime/orchestration/worker-terminal-process-liveness.ts b/src/main/runtime/orchestration/worker-terminal-process-liveness.ts
index 72c5ce076669..4e652d6286af 100644
--- a/src/main/runtime/orchestration/worker-terminal-process-liveness.ts
+++ b/src/main/runtime/orchestration/worker-terminal-process-liveness.ts
@@ -5,6 +5,24 @@ import type { PtyProcessInfo } from '../../providers/pty-process-info'
 export type { WorkerTerminalHostScope } from '../../../shared/worker-terminal-host-scope'
 export { parseWorkerTerminalHostScope } from '../../../shared/worker-terminal-host-scope'
 
+/**
+ * Does `processIncarnation` name exactly this pty's live incarnation? Requires exact
+ * `${ptyId}:${incarnationId}` equality, so it is immune to colons on either side (relay/SSH
+ * ptyIds, colon-bearing relay incarnationIds). A pty with no (or a whitespace-dirty)
+ * incarnationId can never match — the exact-incarnation fence stays intact.
+ */
+export function matchesProcessIncarnation(
+  ptyId: string,
+  incarnationId: string | null | undefined,
+  processIncarnation: string
+): boolean {
+  if (!incarnationId || incarnationId !== incarnationId.trim()) {
+    return false
+  }
+  return `${ptyId}:${incarnationId}` === processIncarnation
+}
+
+/** Classify a recorded incarnation against live sessions: live on exact match, unverifiable when a candidate pty has a dirty or absent incarnationId (lost contact is never a death certificate), else exited. */
 export function classifyWorkerTerminalProcessIncarnation(
   processIncarnation: string,
   sessions: readonly PtyProcessInfo[]
@@ -13,13 +31,9 @@ export function classifyWorkerTerminalProcessIncarnation(
     processIncarnation.startsWith(`${session.id}:`)
   )
   if (
-    possibleMatches.some((session) => {
-      const incarnationId = session.incarnationId
-      if (!incarnationId || incarnationId !== incarnationId.trim()) {
-        return false
-      }
-      return `${session.id}:${incarnationId}` === processIncarnation
-    })
+    possibleMatches.some((session) =>
+      matchesProcessIncarnation(session.id, session.incarnationId, processIncarnation)
+    )
   ) {
     return 'live'
   }
diff --git a/src/main/runtime/orchestration/worker-transcript-payload.test.ts b/src/main/runtime/orchestration/worker-transcript-payload.test.ts
index c843fe1cfa72..d0b4ce231272 100644
--- a/src/main/runtime/orchestration/worker-transcript-payload.test.ts
+++ b/src/main/runtime/orchestration/worker-transcript-payload.test.ts
@@ -1,7 +1,9 @@
 import { describe, expect, it } from 'vitest'
 import { MAX_CODEX_SUBAGENTS_PER_GROUP } from '../../codex/codex-structured-journal-limits'
+import { projectStructuredItemsToNativeChat } from '../../../shared/structured-agent-session-projection'
 import {
   boundWorkerTranscriptMessages,
+  boundWorkerTranscriptTail,
   redactWorkerTerminalLines
 } from './worker-transcript-payload'
 
@@ -177,6 +179,28 @@ describe('worker transcript wire bounds', () => {
     expect(result).toMatchObject({ limited: false, warnings: [] })
   })
 
+  it("serves a structured worker's journal rows without their list position", () => {
+    const [message] = projectStructuredItemsToNativeChat([
+      {
+        itemId: 'reply',
+        revision: 1,
+        sequence: 7,
+        sequenceIndex: 1,
+        observedAt: 1,
+        body: { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'done' }] }
+      }
+    ])
+    // Anti-vacuous: the projection itself does position the row.
+    expect(message?.journalPosition).toEqual({ sequence: 7, index: 1 })
+    for (const served of [
+      boundWorkerTranscriptMessages([message!]).messages,
+      boundWorkerTranscriptTail([message!], 262_144).messages
+    ]) {
+      expect(served).toHaveLength(1)
+      expect(served[0]).not.toHaveProperty('journalPosition')
+    }
+  })
+
   it('keeps two roster ids sharing a 512-char prefix distinct', () => {
     // The id is the roster key: a plain prefix clip would merge the two children.
     const head = 'a'.repeat(512)
@@ -275,3 +299,48 @@ describe('worker transcript wire bounds', () => {
     )
   })
 })
+
+describe("worker transcript wire bounds — a subagent's line names its agent and nothing more", () => {
+  it('serves the producing agent id, bounded like the roster key, and drops provenance', () => {
+    const longId = `task-${'x'.repeat(2_000)}`
+    const result = boundWorkerTranscriptMessages([
+      {
+        id: 'child-line',
+        role: 'assistant',
+        timestamp: null,
+        source: 'transcript',
+        blocks: [{ type: 'text', text: 'The PR is CLEAN.' }],
+        agentId: longId,
+        parentAgentId: 'task-parent',
+        providerParentRef: 'toolu_provider_call',
+        producerKind: 'agent',
+        attempt: 2
+      },
+      {
+        id: 'roster',
+        role: 'system',
+        timestamp: null,
+        source: 'transcript',
+        blocks: [
+          {
+            type: 'subagent-group',
+            groupId: 'group-1',
+            agents: [{ id: longId, label: 'review the PR', state: 'working' }]
+          }
+        ]
+      }
+    ])
+    const [child, roster] = result.messages
+    expect(child).not.toHaveProperty('providerParentRef')
+    expect(child).not.toHaveProperty('parentAgentId')
+    expect(child).not.toHaveProperty('producerKind')
+    expect(child).not.toHaveProperty('attempt')
+    // The line's agent id and the roster entry that names it bound to the same key,
+    // so the reader can still put a name to the line.
+    const rosterBlock = roster?.blocks[0]
+    expect(rosterBlock?.type).toBe('subagent-group')
+    const entryId = rosterBlock?.type === 'subagent-group' ? rosterBlock.agents[0]?.id : undefined
+    expect(child?.agentId).toBeDefined()
+    expect(child?.agentId).toBe(entryId)
+  })
+})
diff --git a/src/main/runtime/orchestration/worker-transcript-payload.ts b/src/main/runtime/orchestration/worker-transcript-payload.ts
index b4365e259c21..b62687bd8138 100644
--- a/src/main/runtime/orchestration/worker-transcript-payload.ts
+++ b/src/main/runtime/orchestration/worker-transcript-payload.ts
@@ -1,5 +1,6 @@
 import { createHash } from 'node:crypto'
 import type { NativeChatBlock, NativeChatMessage } from '../../../shared/native-chat-types'
+import { agentJournalItemSubagentId } from '../../../shared/agent-session-journal-producer'
 import { boundSubagentEntryId } from '../../native-chat/subagent-entry-id-bounds'
 import { boundWorkerTranscriptActivityBlock } from './worker-transcript-activity-block-bounds'
 
@@ -108,10 +109,25 @@ function boundMessage(
   if (blocks.length < message.blocks.length) {
     markClipped(state, 'Some transcript blocks were omitted from oversized messages.')
   }
+  // The journal position only orders a live list; a worker read is already in order.
+  // Of the producer linkage only the agent's id is served, so a reader can say whose
+  // line it is; the rest is provenance.
+  const {
+    journalPosition: _journalPosition,
+    agentId: _agentId,
+    parentAgentId: _parentAgentId,
+    providerParentRef: _providerParentRef,
+    producerKind: _producerKind,
+    attempt: _attempt,
+    ...served
+  } = message
+  const subagentId = agentJournalItemSubagentId(message)
   return {
-    ...message,
+    ...served,
     id: boundIdentifier(message.id, transcriptPath, state),
     ...(message.turnId ? { turnId: boundIdentifier(message.turnId, transcriptPath, state) } : {}),
+    // Same key as the roster entry that names it, so it is bounded the same way.
+    ...(subagentId === null ? {} : { agentId: boundEntryId(subagentId, state) }),
     blocks: blocks.map((block) => boundBlock(block, state))
   }
 }
diff --git a/src/main/runtime/pty-shell-ownership-mirror.test.ts b/src/main/runtime/pty-shell-ownership-mirror.test.ts
index 20468a194cd6..b0525940a864 100644
--- a/src/main/runtime/pty-shell-ownership-mirror.test.ts
+++ b/src/main/runtime/pty-shell-ownership-mirror.test.ts
@@ -16,6 +16,24 @@ describe('PtyShellOwnershipMirror', () => {
     expect(mirror.owner).toBe('shell')
   })
 
+  it('asks at the real D after refuted stray Ds, in lockstep with the host barrier', async () => {
+    let hostGrounded = false
+    const confirm = vi.fn(async () => hostGrounded)
+    const mirror = new PtyShellOwnershipMirror(confirm)
+    mirror.scan('\x1b]133;C\x07\x1b[>1u\x1b[?1049hAGENT')
+
+    for (let index = 1; index <= 5; index += 1) {
+      mirror.scan('\x1b]133;C\x07nested\x1b]133;D;0\x07')
+      await vi.waitFor(() => expect(confirm).toHaveBeenCalledTimes(index))
+      await mirror.settle()
+    }
+    hostGrounded = true
+    mirror.scan('\x1b]133;D;137\x07')
+
+    await vi.waitFor(() => expect(mirror.owner).toBe('shell'))
+    expect(confirm).toHaveBeenCalledTimes(6)
+  })
+
   it('does not arm from a seed on the normal buffer', async () => {
     const confirm = vi.fn(async () => true)
     const mirror = new PtyShellOwnershipMirror(confirm)
diff --git a/src/main/runtime/pty-shell-ownership-mirror.ts b/src/main/runtime/pty-shell-ownership-mirror.ts
index 5c54465be756..45a7d8e8422b 100644
--- a/src/main/runtime/pty-shell-ownership-mirror.ts
+++ b/src/main/runtime/pty-shell-ownership-mirror.ts
@@ -42,6 +42,11 @@ export class PtyShellOwnershipMirror {
     }
   }
 
+  /** Reset Terminal: the ground for this mirror's view of mode ownership, already scanned. */
+  groundInputModes(): string {
+    return this.scanner.groundProcessBoundary()
+  }
+
   get owner(): TerminalOwner | undefined {
     return this.scanner.owner
   }
diff --git a/src/main/runtime/qoder-terminal-readiness.ts b/src/main/runtime/qoder-terminal-readiness.ts
new file mode 100644
index 000000000000..781da3341c08
--- /dev/null
+++ b/src/main/runtime/qoder-terminal-readiness.ts
@@ -0,0 +1,11 @@
+// Captured Qoder 1.1.64 paints its idle OSC title even while the trust menu owns input.
+export function isQoderComposerReady(screenLines: readonly string[] | null): boolean {
+  if (!screenLines) {
+    return false
+  }
+  const screen = screenLines.join('\n').toLowerCase()
+  return (
+    screen.includes('type your message or @path/to/file') &&
+    !screen.includes("don't trust and exit")
+  )
+}
diff --git a/src/main/runtime/qoder-transcripts.test.ts b/src/main/runtime/qoder-transcripts.test.ts
new file mode 100644
index 000000000000..89c5881382ad
--- /dev/null
+++ b/src/main/runtime/qoder-transcripts.test.ts
@@ -0,0 +1,50 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { describe, expect, it, vi } from 'vitest'
+import { createTranscriptPane } from './agent-transcript-pane-test-harness'
+import { extractLastOscTitle } from '../../shared/osc-title-extraction'
+import { getAgentLabel, normalizeTerminalTitle } from '../../shared/agent-detection'
+
+vi.mock('electron', () => ({
+  BrowserWindow: { fromId: vi.fn(() => null) },
+  webContents: { fromId: vi.fn(() => null) },
+  ipcMain: { on: vi.fn(), removeListener: vi.fn() },
+  app: { getPath: vi.fn(() => '/tmp') }
+}))
+
+describe('captured Qoder 1.1.64 startup', () => {
+  it.each(['qoder-trust-dialog', 'qoder-no-account', 'qoder-ready'])(
+    'preserves Qoder identity in %s',
+    async (fixture) => {
+      const data = readFileSync(join(__dirname, '__fixtures__', `${fixture}.txt`), 'utf8')
+      // The recorder's shutdown clears the OSC title; inspect the live capture before that reset.
+      const title = extractLastOscTitle(
+        data.replaceAll(`${String.fromCharCode(27)}]0;${String.fromCharCode(7)}`, '')
+      )
+      expect(title).toContain(' | Ready')
+      expect(getAgentLabel(normalizeTerminalTitle(title ?? ''))).toBe('Qoder CLI')
+      const { runtime, handle } = await createTranscriptPane({
+        paneTitle: title ?? '',
+        foregroundProcess: 'qodercli-1.1.64',
+        launchAgent: 'qoder',
+        data,
+        size: { cols: 100, rows: 32 }
+      })
+      const shown = await runtime.showTerminal(handle)
+      expect(shown.agentIdentity).toBe('qoder')
+      if (fixture === 'qoder-trust-dialog') {
+        const readiness = await runtime
+          .waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 600 })
+          .catch(() => null)
+        expect(readiness?.satisfied ?? false).toBe(false)
+      }
+      if (fixture === 'qoder-ready') {
+        const readiness = await runtime.waitForTerminal(handle, {
+          condition: 'tui-idle',
+          timeoutMs: 1500
+        })
+        expect(readiness.satisfied).toBe(true)
+      }
+    }
+  )
+})
diff --git a/src/main/runtime/rpc/core.ts b/src/main/runtime/rpc/core.ts
index e2243c210532..fe0e300242fe 100644
--- a/src/main/runtime/rpc/core.ts
+++ b/src/main/runtime/rpc/core.ts
@@ -233,6 +233,11 @@ export function eraseRpcMethods(
   return methods as readonly RpcAnyMethod[]
 }
 
+// Unsubscribes that must not retire a registration created after their dispatch began.
+export function isRegistrationFencedUnsubscribe(method: string): boolean {
+  return method === 'terminal.unsubscribe' || method === 'session.tabs.unsubscribe'
+}
+
 export function isStreamingMethod(method: RpcAnyMethod): method is RpcStreamingMethod {
   return 'stream' in method && method.stream === true
 }
diff --git a/src/main/runtime/rpc/dispatcher.ts b/src/main/runtime/rpc/dispatcher.ts
index 1b9978c4d996..b27c1ae98ba1 100644
--- a/src/main/runtime/rpc/dispatcher.ts
+++ b/src/main/runtime/rpc/dispatcher.ts
@@ -1,5 +1,6 @@
 import {
   buildRegistry,
+  isRegistrationFencedUnsubscribe,
   isStreamingMethod,
   type RpcAnyMethodDeclaration,
   type RpcEnvelopeMeta,
@@ -109,10 +110,10 @@ export class RpcDispatcher {
           runtime: this.runtime,
           signal: options?.signal,
           connectionId: options?.connectionId,
-          subscriptionRegistrationVersion:
-            request.method === 'terminal.unsubscribe'
-              ? this.runtime.getSubscriptionRegistrationVersion()
-              : undefined,
+          // Session tabs always need this fence. COMPAT(terminal request-addressed unsubscribe): terminal only for phones without `requestId`.
+          subscriptionRegistrationVersion: isRegistrationFencedUnsubscribe(request.method)
+            ? this.runtime.getSubscriptionRegistrationVersion()
+            : undefined,
           requestId: request.id,
           clientId: options?.clientId,
           clientKind: options?.clientKind,
diff --git a/src/main/runtime/rpc/errors.test.ts b/src/main/runtime/rpc/errors.test.ts
index 02ae6a335f22..624557c1f7f4 100644
--- a/src/main/runtime/rpc/errors.test.ts
+++ b/src/main/runtime/rpc/errors.test.ts
@@ -15,6 +15,11 @@ import {
   nestedWorkerDepthExceededMessage
 } from '../../../shared/nested-worker-depth'
 import { OrchestrationError } from '../orchestration/orchestration-error'
+import {
+  AgentSessionRefusalError,
+  agentSessionRefusalError,
+  refuseUnclassified
+} from '../../../shared/agent-session-wire-refusals'
 
 class LineageError extends Error {
   code = 'LINEAGE_PARENT_NOT_FOUND'
@@ -297,3 +302,63 @@ describe('structured worker dispatch preamble errors', () => {
     })
   })
 })
+
+describe('thrown agent-session refusals', () => {
+  const meta = { runtimeId: 'runtime-1' }
+
+  // Released clients classify a thrown refusal by its wire code and message; both must read
+  // exactly as the bare `Error(code)` this replaced.
+  it.each([
+    [
+      'agent_session_ownership_unknown',
+      'agent_session_ownership_unknown',
+      agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'noLiveOwner' })
+    ],
+    [
+      'structured_agent_session_unsupported',
+      'runtime_error',
+      agentSessionRefusalError('structured_agent_session_unsupported', { reason: 'hostDisabled' })
+    ],
+    [
+      'agent_session_checkpoint_stale',
+      'agent_session_checkpoint_stale',
+      agentSessionRefusalError('agent_session_checkpoint_stale', {
+        reason: 'fenceStale',
+        currentFence: 4
+      })
+    ]
+  ] as const)(
+    'keeps %s on the wire as it was, and adds its details in data',
+    (code, wire, error) => {
+      const before = mapRuntimeError('req_1', meta, new Error(code))
+      const after = mapRuntimeError('req_1', meta, error)
+      expect(after.error.code).toBe(before.error.code)
+      expect(after.error.code).toBe(wire)
+      expect(after.error.message).toBe(before.error.message)
+      expect(after.error.message).toBe(code)
+      expect(after.error.data).toEqual({ refusal: { code, details: error.refusal.details } })
+      expect(error.refusal.details?.reason).toBeDefined()
+    }
+  )
+
+  it('carries no details in data when the refusal named none', () => {
+    const response = mapRuntimeError(
+      'req_1',
+      meta,
+      new AgentSessionRefusalError(
+        refuseUnclassified('agent_session_conflict', 'Another process claims this session.')
+      )
+    )
+    expect(response.error).toEqual({
+      code: 'agent_session_conflict',
+      message: 'agent_session_conflict',
+      data: { refusal: { code: 'agent_session_conflict' } }
+    })
+  })
+
+  it('exposes no code property another passthrough could claim', () => {
+    expect(
+      'code' in agentSessionRefusalError('agent_session_conflict', { reason: 'claimConflicted' })
+    ).toBe(false)
+  })
+})
diff --git a/src/main/runtime/rpc/errors.ts b/src/main/runtime/rpc/errors.ts
index 3fbb6cbfb47e..8b92c731d462 100644
--- a/src/main/runtime/rpc/errors.ts
+++ b/src/main/runtime/rpc/errors.ts
@@ -2,6 +2,11 @@
 // runtime/browser error allowlists define the contract the CLI relies on to
 // format human-facing messages. Centralizing this mapping keeps the allowlist
 // auditable in one place instead of spread across per-method branches.
+import {
+  agentSessionRefusalReference,
+  isAgentSessionRefusalError,
+  type AgentSessionRefusalError
+} from '../../../shared/agent-session-wire-refusals'
 import type { RpcEnvelopeMeta, RpcFailure, RpcSuccess } from './core'
 import { ORCHESTRATION_SESSION_CALLER_ERROR_CODES } from '../../../shared/orchestration-session-caller-codes'
 import { computerUseErrorRecoveryData } from '../../../shared/computer-use-error-recovery'
@@ -171,6 +176,9 @@ export function mapRuntimeError(id: string, meta: RpcEnvelopeMeta, error: unknow
   if (error instanceof LedgerError) {
     return errorResponse(id, meta, error.code, message, error.details)
   }
+  if (isAgentSessionRefusalError(error)) {
+    return agentSessionRefusalErrorResponse(id, meta, error)
+  }
   if (
     error instanceof Error &&
     'code' in error &&
@@ -241,6 +249,27 @@ export function mapRuntimeError(id: string, meta: RpcEnvelopeMeta, error: unknow
   return errorResponse(id, meta, 'runtime_error', message)
 }
 
+/**
+ * A thrown agent-session refusal, mapped before any `'code' in error` passthrough so no other
+ * subsystem's code set can claim it. Wire code and message are exactly what the bare `Error(code)`
+ * it replaced produced — released clients classify both — and the refusal's details ride only in
+ * `data`, which they ignore.
+ */
+function agentSessionRefusalErrorResponse(
+  id: string,
+  meta: RpcEnvelopeMeta,
+  error: AgentSessionRefusalError
+): RpcFailure {
+  const { code } = error.refusal
+  return errorResponse(
+    id,
+    meta,
+    RUNTIME_PASSTHROUGH_CODES.has(code) ? code : 'runtime_error',
+    code,
+    { refusal: agentSessionRefusalReference(error.refusal) }
+  )
+}
+
 export const computerErrorData = computerUseErrorRecoveryData
 
 // Why: browser errors carry a structured .code property (BrowserError from
diff --git a/src/main/runtime/rpc/methods/agent-hooks.ts b/src/main/runtime/rpc/methods/agent-hooks.ts
index 4d9f4a7706c9..59273cf87154 100644
--- a/src/main/runtime/rpc/methods/agent-hooks.ts
+++ b/src/main/runtime/rpc/methods/agent-hooks.ts
@@ -1,3 +1,4 @@
+import { isAgentStatusHooksEnabledForAgent } from '../../../../shared/agent-status-hooks-setting'
 import { prepareManagedWslCodexHomeBeforeShellLaunch } from '../../../codex/managed-wsl-home-shell-preflight'
 import { defineMethod } from '../core'
 import { PrepareCodexForWslPaneParams } from '../../../../shared/rpc-contract/agent-hooks-params'
@@ -10,15 +11,13 @@ export const AGENT_HOOK_METHODS = [
       if (clientKind !== undefined) {
         throw new Error('Codex hook preparation is only available to the local Orca CLI.')
       }
-      const settings = runtime.getClientSettings()
       return await prepareManagedWslCodexHomeBeforeShellLaunch({
         env: {
           CODEX_HOME: params.codexHome,
           ORCA_CODEX_HOME: params.orcaCodexHome,
           WSL_DISTRO_NAME: params.wslDistro
         },
-        hooksEnabled:
-          settings.agentStatusHooksEnabled && !settings.disabledTuiAgents.includes('codex')
+        hooksEnabled: isAgentStatusHooksEnabledForAgent(runtime.getClientSettings(), 'codex')
       })
     }
   })
diff --git a/src/main/runtime/rpc/methods/agent-launch-caller-selection.test.ts b/src/main/runtime/rpc/methods/agent-launch-caller-selection.test.ts
new file mode 100644
index 000000000000..8ef0f2c904dd
--- /dev/null
+++ b/src/main/runtime/rpc/methods/agent-launch-caller-selection.test.ts
@@ -0,0 +1,181 @@
+/**
+ * A launch from a paired client moves that client's view to the new tab and nobody else's: the view
+ * intent belongs to the connection that asked. In-process callers and workspace-creating launches
+ * keep today's behaviour.
+ */
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { AgentSessionRecordStore } from '../../agent-session-record-store'
+import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
+import type { RpcContext } from '../core'
+import {
+  CAPABLE_CLIENT,
+  STRUCTURED_PREFERENCE,
+  methodNamed,
+  rpcContext,
+  runtimeStub,
+  type AgentLaunchRuntimeStub
+} from './agent-launch.test-fixture'
+
+const createStructuredSession = vi.hoisted(() => vi.fn())
+vi.mock('./structured-agent-session-create', () => ({
+  createStructuredAgentSessionForWorktree: createStructuredSession
+}))
+
+const { AGENT_LAUNCH_METHODS } = await import('./agent-launch')
+const AGENT_LAUNCH = methodNamed(AGENT_LAUNCH_METHODS, 'agent.launch')
+const AGENT_LAUNCH_REPLAY = methodNamed(AGENT_LAUNCH_METHODS, 'agent.launchReplay')
+
+const TAB_ID = '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d'
+const LEAF_ID = '3f2504e0-4f89-41d3-9a0c-0305e82c3301'
+const PANE_KEY = `${TAB_ID}:${LEAF_ID}`
+const EXISTING_LAUNCH = { agent: 'claude', target: { kind: 'existing', worktree: 'id:wt-7' } }
+const CREATE_LAUNCH = {
+  agent: 'claude',
+  target: { kind: 'create-worktree', create: { repo: 'id:repo-1', name: 'task' } }
+}
+const CALLER = 'device-1'
+
+function selectionRuntime(options: Parameters<typeof runtimeStub>[0]) {
+  return Object.assign(runtimeStub(options), {
+    selectCreatedMobileSessionTabForClient: vi.fn(() => true)
+  })
+}
+
+async function launch(
+  params: unknown,
+  runtime: AgentLaunchRuntimeStub,
+  context: Partial<RpcContext> = CAPABLE_CLIENT
+) {
+  return AGENT_LAUNCH.handler(AGENT_LAUNCH.params.parse(params), rpcContext(runtime, context))
+}
+
+function chatActivation(): unknown {
+  return createStructuredSession.mock.calls[0]?.[0]?.activate
+}
+
+beforeEach(() => {
+  createStructuredSession
+    .mockReset()
+    .mockResolvedValue({ ok: true, value: { sessionId: 'sess-1' } })
+})
+
+describe('a paired client launching into an existing workspace', () => {
+  it("selects the new terminal as that client's tab only", async () => {
+    const runtime = selectionRuntime({ settings: {}, terminalPaneKey: PANE_KEY })
+
+    await launch(EXISTING_LAUNCH, runtime)
+
+    expect(runtime.selectCreatedMobileSessionTabForClient).toHaveBeenCalledExactlyOnceWith(
+      'wt-7',
+      expect.objectContaining({ tabId: TAB_ID, leafId: LEAF_ID }),
+      CALLER
+    )
+  })
+
+  it('publishes the chat without activating it for everyone, then selects it by session for the caller', async () => {
+    const runtime = selectionRuntime({ settings: STRUCTURED_PREFERENCE })
+
+    const result = await launch(EXISTING_LAUNCH, runtime)
+
+    expect(result.outcome.kind).toBe('structured')
+    expect(chatActivation()).toBe(false)
+    expect(runtime.selectCreatedMobileSessionTabForClient).toHaveBeenCalledExactlyOnceWith(
+      'wt-7',
+      { sessionId: 'sess-1' },
+      CALLER
+    )
+  })
+
+  it('still reports the launch when selecting its tab fails', async () => {
+    const runtime = selectionRuntime({ settings: {}, terminalPaneKey: PANE_KEY })
+    runtime.selectCreatedMobileSessionTabForClient.mockImplementationOnce(() => {
+      throw new Error('selection store unavailable')
+    })
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    const result = await launch(EXISTING_LAUNCH, runtime)
+
+    expect(result.outcome).toMatchObject({ kind: 'terminal', handle: 'term_1' })
+    warn.mockRestore()
+  })
+
+  it('selects nothing when the runtime reported no pane for the terminal', async () => {
+    const runtime = selectionRuntime({ settings: {} })
+
+    await launch(EXISTING_LAUNCH, runtime)
+
+    expect(runtime.selectCreatedMobileSessionTabForClient).not.toHaveBeenCalled()
+  })
+})
+
+describe('launches that keep the host-wide behaviour', () => {
+  it('an in-process caller activates the chat and selects nothing per client', async () => {
+    const runtime = selectionRuntime({ settings: STRUCTURED_PREFERENCE })
+
+    await launch(EXISTING_LAUNCH, runtime, {})
+
+    expect(chatActivation()).toBe(true)
+    expect(runtime.selectCreatedMobileSessionTabForClient).not.toHaveBeenCalled()
+  })
+
+  it("the host's own desktop window, a runtime client with no paired device, still activates the chat", async () => {
+    const runtime = selectionRuntime({ settings: STRUCTURED_PREFERENCE })
+
+    await launch(EXISTING_LAUNCH, runtime, {
+      ...CAPABLE_CLIENT,
+      clientKind: 'runtime',
+      pairedDeviceId: undefined
+    })
+
+    expect(chatActivation()).toBe(true)
+    expect(runtime.selectCreatedMobileSessionTabForClient).not.toHaveBeenCalled()
+  })
+
+  it('a workspace-creating launch from a paired client keeps the create navigation', async () => {
+    const runtime = selectionRuntime({ settings: STRUCTURED_PREFERENCE })
+
+    await launch(CREATE_LAUNCH, runtime)
+
+    expect(chatActivation()).toBe(true)
+    expect(runtime.selectCreatedMobileSessionTabForClient).not.toHaveBeenCalled()
+  })
+})
+
+describe('a replayed launch', () => {
+  // The ledger admits against `Date.now()`, so the id must be dated now.
+  const OPERATION_ID = `${Date.now()}-000000000000000000000000000000dd`
+  let directory: string
+
+  beforeEach(async () => {
+    directory = await mkdtemp(join(tmpdir(), 'orca-agent-launch-caller-'))
+    const store = await AgentSessionRecordStore.open({ directory, hostId: 'local' })
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: `deps.store` is the only member `agent.launch` reads, and a member it omits throws on call.
+    setStructuredAgentSessionHost({ deps: { store } } as unknown as StructuredAgentSessionHost)
+  })
+
+  afterEach(async () => {
+    setStructuredAgentSessionHost(null)
+    await rm(directory, { recursive: true, force: true })
+  })
+
+  it('answers from the record without moving the caller again', async () => {
+    const params = AGENT_LAUNCH_REPLAY.params.parse({
+      ...EXISTING_LAUNCH,
+      operationId: OPERATION_ID
+    })
+    const first = selectionRuntime({ settings: {}, terminalPaneKey: PANE_KEY })
+    await AGENT_LAUNCH_REPLAY.handler(params, rpcContext(first, CAPABLE_CLIENT))
+    expect(first.selectCreatedMobileSessionTabForClient).toHaveBeenCalledOnce()
+
+    const replay = selectionRuntime({ settings: {}, terminalPaneKey: PANE_KEY })
+    await AGENT_LAUNCH_REPLAY.handler(params, rpcContext(replay, CAPABLE_CLIENT))
+
+    expect(replay.createTerminal).not.toHaveBeenCalled()
+    expect(replay.selectCreatedMobileSessionTabForClient).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/runtime/rpc/methods/agent-launch-caller-selection.ts b/src/main/runtime/rpc/methods/agent-launch-caller-selection.ts
new file mode 100644
index 000000000000..b5fe4fe31f4c
--- /dev/null
+++ b/src/main/runtime/rpc/methods/agent-launch-caller-selection.ts
@@ -0,0 +1,57 @@
+/**
+ * Which view a launch moves: the requesting connection's, never the host's or another client's.
+ *
+ * A paired client (a phone, or a desktop client of a remote server) that launches into an existing
+ * workspace gets the new tab as its own selection, recorded the way `session.tabs.createTerminal`
+ * selects the tab it creates for its caller. In-process callers keep today's behaviour, and a
+ * launch that creates its workspace keeps `worktree.create`'s navigation, whose host activation is
+ * what runs the new workspace's setup.
+ */
+
+import type { AgentLaunchResult, AgentLaunchTarget } from '../../../../shared/agent-launch-intent'
+import { parsePaneKey } from '../../../../shared/stable-pane-id'
+import type { OrcaRuntimeService } from '../../orca-runtime'
+import type { RpcContext } from '../core'
+
+/** The paired client whose view this launch should move, or null when it moves the host's. */
+export function agentLaunchCallerNavigationId(
+  target: AgentLaunchTarget,
+  context: Pick<RpcContext, 'clientKind' | 'pairedDeviceId'>
+): string | null {
+  if (target.kind !== 'existing' || context.clientKind === undefined) {
+    return null
+  }
+  return context.pairedDeviceId?.trim() || null
+}
+
+/** Bookkeeping, never a gate: the agent already runs, so a failure here only leaves the view as it was. */
+export function selectAgentLaunchTabForCaller(
+  runtime: Pick<OrcaRuntimeService, 'selectCreatedMobileSessionTabForClient'>,
+  result: AgentLaunchResult,
+  clientNavigationId: string
+): void {
+  const { outcome } = result
+  // Found by pane or session, never by a predicted tab id.
+  const surface =
+    outcome.kind === 'terminal'
+      ? outcome.paneKey
+        ? parsePaneKey(outcome.paneKey)
+        : null
+      : { sessionId: outcome.sessionId }
+  if (!surface) {
+    return
+  }
+  try {
+    if (
+      !runtime.selectCreatedMobileSessionTabForClient(
+        result.worktreeId,
+        surface,
+        clientNavigationId
+      )
+    ) {
+      console.warn('[agent-launch] the launch ran; its tab was not published to select')
+    }
+  } catch (error) {
+    console.warn('[agent-launch] the launch ran; selecting its tab for the caller did not', error)
+  }
+}
diff --git a/src/main/runtime/rpc/methods/agent-launch-failure-code.ts b/src/main/runtime/rpc/methods/agent-launch-failure-code.ts
new file mode 100644
index 000000000000..eac21c7c00e9
--- /dev/null
+++ b/src/main/runtime/rpc/methods/agent-launch-failure-code.ts
@@ -0,0 +1,57 @@
+import type { AgentLaunchTarget } from '../../../../shared/agent-launch-intent'
+import {
+  WorktreeCreateCollisionError,
+  WORKTREE_CREATE_COLLISION_CODE
+} from '../../../../shared/new-workspace/worktree-create-collision'
+import {
+  AgentLaunchPaneAlreadyLiveError,
+  AGENT_LAUNCH_PANE_ALREADY_LIVE_CODE
+} from '../../../../shared/agent-launch-pane-already-live'
+import {
+  AgentLaunchSessionAlreadyExistsError,
+  AGENT_LAUNCH_SESSION_ALREADY_EXISTS_CODE
+} from '../../../../shared/agent-launch-session-already-exists'
+import type { TerminalSpawnDispatch } from '../../../agent-launch/agent-launch-not-started'
+
+/** Long enough for every code this path raises, with room for one a later guard adds. */
+const LAUNCH_FAILURE_CODE_MAX_LENGTH = 128
+
+/**
+ * This path raises its refusals as the thrown code, the way the method's own guards do — and the
+ * recorded code is what a replay answers with, so it is worth keeping.
+ *
+ * Bounded because a code is an identifier but `error.message` is free text: an errno sentence
+ * carrying an absolute path arrives here as one, and it would be written into a ledger file that is
+ * re-serialized whole on every subsequent operation. Bounded on the way IN only. A length check in
+ * `isAgentSessionOperationRow` would reject rows this same build wrote, and one rejected row costs
+ * the entire store.
+ */
+export function agentLaunchFailureCode(error: unknown): string {
+  const code = error instanceof Error ? error.message : ''
+  return code.length > 0 ? code.slice(0, LAUNCH_FAILURE_CODE_MAX_LENGTH) : 'agent_launch_failed'
+}
+
+/**
+ * Only a typed refusal raised before anything was created proves the claimed launch had no effects.
+ * A live reserved pane or an existing reserved session proves it only for an existing workspace; on
+ * create-worktree the workspace already exists by the time the surface is refused.
+ */
+export function launchFailureWithoutEffectsCode(
+  error: unknown,
+  targetKind: AgentLaunchTarget['kind'],
+  terminalSpawn: TerminalSpawnDispatch
+): string | null {
+  if (error instanceof WorktreeCreateCollisionError) {
+    return WORKTREE_CREATE_COLLISION_CODE
+  }
+  if (error instanceof AgentLaunchPaneAlreadyLiveError && targetKind === 'existing') {
+    return AGENT_LAUNCH_PANE_ALREADY_LIVE_CODE
+  }
+  if (error instanceof AgentLaunchSessionAlreadyExistsError && targetKind === 'existing') {
+    return AGENT_LAUNCH_SESSION_ALREADY_EXISTS_CODE
+  }
+  if (terminalSpawn.failedBeforeDispatch(error) && targetKind === 'existing') {
+    return agentLaunchFailureCode(error)
+  }
+  return null
+}
diff --git a/src/main/runtime/rpc/methods/agent-launch-floating-workspace.test.ts b/src/main/runtime/rpc/methods/agent-launch-floating-workspace.test.ts
index 5551c4de354e..1df2c1f7433a 100644
--- a/src/main/runtime/rpc/methods/agent-launch-floating-workspace.test.ts
+++ b/src/main/runtime/rpc/methods/agent-launch-floating-workspace.test.ts
@@ -64,7 +64,7 @@ describe('agent.launch with the real floating workspace resolver', () => {
       expect(structuredHost).not.toHaveBeenCalled()
       expect(createTerminal).toHaveBeenCalledExactlyOnceWith(
         `id:${FLOATING_TERMINAL_WORKTREE_ID}`,
-        { startupAgent: 'claude' }
+        { startupAgent: 'claude', onPtySpawnDispatched: expect.any(Function) }
       )
       expect(result).toMatchObject({
         worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
diff --git a/src/main/runtime/rpc/methods/agent-launch-prestart-failure.test.ts b/src/main/runtime/rpc/methods/agent-launch-prestart-failure.test.ts
new file mode 100644
index 000000000000..6b7adb8dbfc7
--- /dev/null
+++ b/src/main/runtime/rpc/methods/agent-launch-prestart-failure.test.ts
@@ -0,0 +1,171 @@
+/**
+ * A terminal launch that fails before its spawn is requested — no launch command, runtime
+ * unavailable — created nothing, so a named operation settles as failed with its real cause.
+ * Once the request has left, a failure proves nothing and the outcome stays unknown.
+ */
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { AgentSessionRecordStore } from '../../agent-session-record-store'
+import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
+import type { OrcaRuntimeService } from '../../orca-runtime'
+import { RpcDispatcher } from '../dispatcher'
+import { methodNamed, runtimeStub, type AgentLaunchRuntimeStub } from './agent-launch.test-fixture'
+
+vi.mock('./structured-agent-session-create', () => ({
+  createStructuredAgentSessionForWorktree: async () => ({
+    ok: true,
+    value: { sessionId: 'sess-1' }
+  })
+}))
+
+const { AGENT_LAUNCH_METHODS } = await import('./agent-launch')
+const AGENT_LAUNCH_REPLAY = methodNamed(AGENT_LAUNCH_METHODS, 'agent.launchReplay')
+
+const EXISTING_LAUNCH = { agent: 'claude', target: { kind: 'existing', worktree: 'id:wt-7' } }
+const CREATE_LAUNCH = {
+  agent: 'claude',
+  target: { kind: 'create-worktree', create: { repo: 'id:repo-1', name: 'task' } }
+}
+const NO_LAUNCH_COMMAND = 'Could not build launch command for claude.'
+type Launch = typeof EXISTING_LAUNCH | typeof CREATE_LAUNCH
+
+/** The create throws; `afterDispatch` says whether the spawn request had already left. */
+function failingCreate(runtime: AgentLaunchRuntimeStub, error: Error, afterDispatch: boolean) {
+  runtime.createTerminal.mockImplementation(
+    async (_selector: string, options?: Record<string, unknown>) => {
+      const dispatched = options?.onPtySpawnDispatched
+      if (afterDispatch && typeof dispatched === 'function') {
+        dispatched()
+      }
+      throw error
+    }
+  )
+}
+
+describe('a launch whose terminal fails', () => {
+  // The ledger admits against `Date.now()`, so the ids must be dated now.
+  const OPERATION_ID = `${Date.now()}-000000000000000000000000000000cc`
+  const OTHER_OPERATION_ID = `${Date.now()}-000000000000000000000000000000dd`
+  let directory: string
+  let store: AgentSessionRecordStore
+
+  beforeEach(async () => {
+    directory = await mkdtemp(join(tmpdir(), 'orca-agent-launch-prestart-'))
+    store = await AgentSessionRecordStore.open({ directory, hostId: 'local' })
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: `deps.store` is the only member `agent.launch` reads, and a member it omits throws on call.
+    setStructuredAgentSessionHost({ deps: { store } } as unknown as StructuredAgentSessionHost)
+  })
+
+  afterEach(async () => {
+    setStructuredAgentSessionHost(null)
+    await rm(directory, { recursive: true, force: true })
+  })
+
+  function outcomeOf(operationId: string) {
+    return store.listOperationRows().find((row) => row.operationId === operationId)?.outcome
+  }
+
+  async function replay(
+    runtime: AgentLaunchRuntimeStub,
+    launch: Launch,
+    operationId: string = OPERATION_ID
+  ) {
+    const dispatcher = new RpcDispatcher({
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture implements every runtime method reached by agent.launch and dispatcher metadata.
+      runtime: { ...runtime, getRuntimeId: () => 'runtime-1' } as unknown as OrcaRuntimeService,
+      methods: AGENT_LAUNCH_METHODS
+    })
+    return dispatcher.dispatch({
+      id: 'request-1',
+      authToken: 'token',
+      method: 'agent.launchReplay',
+      params: AGENT_LAUNCH_REPLAY.params.parse({ ...launch, operationId })
+    })
+  }
+
+  it('reports a failure before the spawn request with its real cause and records it', async () => {
+    const runtime = runtimeStub({ settings: {} })
+    failingCreate(runtime, new Error(NO_LAUNCH_COMMAND), false)
+
+    const response = await replay(runtime, EXISTING_LAUNCH)
+
+    expect(response).toMatchObject({ ok: false, error: { message: NO_LAUNCH_COMMAND } })
+    expect(outcomeOf(OPERATION_ID)).toMatchObject({ status: 'failed', code: NO_LAUNCH_COMMAND })
+  })
+
+  it('keeps a stable runtime code such as runtime_unavailable', async () => {
+    const runtime = runtimeStub({ settings: {} })
+    failingCreate(runtime, new Error('runtime_unavailable'), false)
+
+    const response = await replay(runtime, EXISTING_LAUNCH)
+
+    expect(response).toMatchObject({ ok: false, error: { code: 'runtime_unavailable' } })
+  })
+
+  it('answers a retry of the same operation from the record instead of launching again', async () => {
+    const first = runtimeStub({ settings: {} })
+    failingCreate(first, new Error(NO_LAUNCH_COMMAND), false)
+    await replay(first, EXISTING_LAUNCH)
+
+    const retry = runtimeStub({ settings: {} })
+    const response = await replay(retry, EXISTING_LAUNCH)
+
+    expect(retry.createTerminal).not.toHaveBeenCalled()
+    expect(response).toMatchObject({ ok: false, error: { message: NO_LAUNCH_COMMAND } })
+  })
+
+  it('stays unknown when the failure came after the spawn request left', async () => {
+    // An SSH or daemon spawn whose reply was lost may still have started an agent.
+    const runtime = runtimeStub({ settings: {} })
+    failingCreate(runtime, new Error('ssh_channel_closed'), true)
+
+    const response = await replay(runtime, EXISTING_LAUNCH)
+
+    expect(response).toMatchObject({
+      ok: false,
+      error: { code: 'agent_session_operation_unknown' }
+    })
+    expect(outcomeOf(OPERATION_ID)?.status).toBe('unknown')
+  })
+
+  it('stays unknown when another launch saw the same error before its own spawn request', async () => {
+    // A failed pane spawn rejects one error into the spawner and into a create waiting on that pane.
+    const shared = new Error('ssh_channel_closed')
+    const waiting = runtimeStub({ settings: {} })
+    failingCreate(waiting, shared, false)
+    await replay(waiting, EXISTING_LAUNCH, OTHER_OPERATION_ID)
+    expect(outcomeOf(OTHER_OPERATION_ID)?.status).toBe('failed')
+
+    const spawner = runtimeStub({ settings: {} })
+    failingCreate(spawner, shared, true)
+    const response = await replay(spawner, EXISTING_LAUNCH)
+
+    expect(response).toMatchObject({
+      ok: false,
+      error: { code: 'agent_session_operation_unknown' }
+    })
+    expect(outcomeOf(OPERATION_ID)?.status).toBe('unknown')
+  })
+
+  it('stays unknown for a launch that created its workspace first', async () => {
+    const runtime = runtimeStub({ settings: {} })
+    // No startup terminal came back, so the launch builds its own in the new workspace.
+    runtime.createManagedWorktree.mockResolvedValueOnce({
+      worktree: { id: 'wt-new' },
+      startupTerminal: undefined
+    })
+    failingCreate(runtime, new Error(NO_LAUNCH_COMMAND), false)
+
+    const response = await replay(runtime, CREATE_LAUNCH)
+
+    expect(runtime.createTerminal).toHaveBeenCalledTimes(1)
+    expect(response).toMatchObject({
+      ok: false,
+      error: { code: 'agent_session_operation_unknown' }
+    })
+  })
+})
diff --git a/src/main/runtime/rpc/methods/agent-launch-replay.test.ts b/src/main/runtime/rpc/methods/agent-launch-replay.test.ts
index 3d6981ed4a16..336cd4c212b5 100644
--- a/src/main/runtime/rpc/methods/agent-launch-replay.test.ts
+++ b/src/main/runtime/rpc/methods/agent-launch-replay.test.ts
@@ -585,7 +585,8 @@ describe('the inner attach reserves under its own id', () => {
     })
     expect(forwarded).toEqual({
       decision: 'refused',
-      code: 'agent_session_operation_conflict'
+      code: 'agent_session_operation_conflict',
+      details: { reason: 'operationIdReused' }
     })
 
     const derived = deriveAgentLaunchChildOperationId(OPERATION_ID)
diff --git a/src/main/runtime/rpc/methods/agent-launch-structured-prompt.ts b/src/main/runtime/rpc/methods/agent-launch-structured-prompt.ts
index 0037d6fc35e9..11762137ba2f 100644
--- a/src/main/runtime/rpc/methods/agent-launch-structured-prompt.ts
+++ b/src/main/runtime/rpc/methods/agent-launch-structured-prompt.ts
@@ -63,9 +63,9 @@ export async function commitStructuredAgentSessionLaunchPrompt(args: {
     // Settlement can fail after the journal append. Re-read the authoritative row before asking
     // the caller to resend, otherwise a retry creates a duplicate turn.
     try {
-      const committed = args.host
-        .journalSnapshot(args.sessionId)
-        .submissions.find((submission) => submission.clientMessageId === clientMessageId)
+      const committed = (await args.host.journalSnapshot(args.sessionId)).submissions.find(
+        (submission) => submission.clientMessageId === clientMessageId
+      )
       if (committed) {
         return clientMessageId
       }
diff --git a/src/main/runtime/rpc/methods/agent-launch-surfaces.ts b/src/main/runtime/rpc/methods/agent-launch-surfaces.ts
index 412d947d441a..3f184cd50b5c 100644
--- a/src/main/runtime/rpc/methods/agent-launch-surfaces.ts
+++ b/src/main/runtime/rpc/methods/agent-launch-surfaces.ts
@@ -4,8 +4,8 @@
  * Both halves are deliberately the plain, user-facing forms: a structured session created for the
  * worktree exactly as `agentSession.create` creates one, and a terminal agent created exactly as a
  * new agent tab is. Orchestration's own factories are NOT reusable here — a worker's session
- * carries a dispatch hold, a mailbox and a background tab that a launch the user asked for must
- * not take — which is why the executor injects this rather than branching.
+ * carries a redrive subscription, a mailbox and a background tab that a launch the user asked for
+ * must not take — which is why the executor injects this rather than branching.
  *
  * Delivering the launch text is here for the same reason: it is the wire-shaped half. Each surface
  * takes it differently — a structured session commits it to a transcript, a terminal agent takes it
@@ -14,10 +14,6 @@
  */
 
 import { randomUUID } from 'node:crypto'
-import { tuiAgentToAgentKind } from '../../../../shared/agent-kind'
-import { launchSourceSchema } from '../../../../shared/telemetry-property-schemas'
-import type { TuiAgent } from '../../../../shared/tui-agent'
-import type { TerminalCreateOptions } from '../../runtime-terminal-contracts'
 import { narrowStructuredLaunchSeedOptions } from '../../../../shared/native-chat-session-option-defaults'
 import { createStructuredAgentSessionOperationId } from '../../../../shared/structured-agent-session-mutation'
 import { structuredAgentSessionTabId } from '../../../../shared/structured-agent-session-projection'
@@ -36,12 +32,19 @@ import { AgentLaunchSessionAlreadyExistsError } from '../../../../shared/agent-l
 import { createStructuredAgentSessionId } from '../../../../shared/structured-agent-session-create'
 import { toAgentLaunchPreferences } from '../../../../shared/agent-launch-preferences'
 import { paneIdentity } from '../../runtime-terminal-pane-identity'
+import {
+  trackTerminalSpawnDispatch,
+  type TerminalSpawnDispatch
+} from '../../../agent-launch/agent-launch-not-started'
 
 /** Replay-safe launches keep the nested attach in the same stable caller namespace as the launch. */
 export function agentLaunchSurfaceFactory(
   context: RpcContext,
   attachOperationId?: string,
-  operationCallerKey?: string
+  operationCallerKey?: string,
+  // False when the launch selects the chat for its paired caller instead of for everyone.
+  activateChat = true,
+  terminalSpawn: TerminalSpawnDispatch = trackTerminalSpawnDispatch()
 ): AgentLaunchSurfaceFactory {
   return {
     createStructuredSession: async ({
@@ -77,7 +80,7 @@ export function agentLaunchSurfaceFactory(
         ...(seeded ? { options: seeded } : {}),
         ...(tabId ? { tabId } : {}),
         // The user asked for this chat, so it takes the surface — unlike a dispatched worker.
-        activate: true
+        activate: activateChat
       })
       if (!created.ok) {
         // The caller named this session, so a taken id is its answer, not an opaque refusal; and not
@@ -118,7 +121,7 @@ export function agentLaunchSurfaceFactory(
       options
     }) => {
       const launchPreferences = toAgentLaunchPreferences(options)
-      const terminal = await context.runtime.createTerminal(`id:${worktreeId}`, {
+      const created = context.runtime.createTerminal(`id:${worktreeId}`, {
         // The agent id is not a shell command — `cursor` is the desktop app, its CLI is
         // `cursor-agent` — so the runtime builds the configured launcher.
         startupAgent: agent,
@@ -131,8 +134,10 @@ export function agentLaunchSurfaceFactory(
         ...(launchPreferences ? { launchPreferences } : {}),
         // A live reserved pane would be attached, not launched into, so the runtime refuses it.
         ...(paneKey ? { ...paneIdentity(paneKey), requireFreshPane: true } : {}),
-        ...agentLaunchTelemetry(agent, launchSource)
+        ...(launchSource ? { launchSource } : {}),
+        onPtySpawnDispatched: terminalSpawn.onPtySpawnDispatched
       })
+      const terminal = await created.catch(terminalSpawn.rethrow)
       return {
         handle: terminal.handle,
         // The runtime already minted this pane and baked it into the PTY's env and its own reveal;
@@ -150,34 +155,6 @@ export function agentLaunchSurfaceFactory(
   }
 }
 
-/**
- * The `agent_started` triple, of which only `launch_source` came from the caller.
- *
- * `agent_kind` and `request_kind` are derived rather than accepted — the host already knows both,
- * and a value it derives is a value a caller cannot misreport. `request_kind` is always `new`
- * because a launch reusing a terminal returns before any surface is created.
- *
- * An unrecognized `launch_source` drops the telemetry and starts the agent anyway. The wire keeps
- * the arm set open so an older host cannot refuse a newer client's launch over a label, which is
- * only honoured if the refusal does not reappear here: attribution is bookkeeping, and bookkeeping
- * must not gate the user's launch.
- */
-function agentLaunchTelemetry(
-  agent: TuiAgent,
-  launchSource: string | undefined
-): Pick<TerminalCreateOptions, 'telemetry'> {
-  const parsed = launchSourceSchema.safeParse(launchSource)
-  return parsed.success
-    ? {
-        telemetry: {
-          agent_kind: tuiAgentToAgentKind(agent),
-          launch_source: parsed.data,
-          request_kind: 'new'
-        }
-      }
-    : {}
-}
-
 function requireInstalledHost(): StructuredAgentSessionHost {
   const host = getStructuredAgentSessionHost()
   if (!host) {
diff --git a/src/main/runtime/rpc/methods/agent-launch-terminal-prompt.ts b/src/main/runtime/rpc/methods/agent-launch-terminal-prompt.ts
index 41081daeb99d..ac66912e7475 100644
--- a/src/main/runtime/rpc/methods/agent-launch-terminal-prompt.ts
+++ b/src/main/runtime/rpc/methods/agent-launch-terminal-prompt.ts
@@ -66,6 +66,7 @@ export async function deliverTerminalAgentLaunchPrompt(args: {
       return false
     }
     const sent = await args.runtime.sendTerminalAgentPrompt(args.handle, args.text, {
+      inputKind: 'launch',
       // Paired: together these take the queued path, which settles an unobserved turn start into
       // an `input_accepted` receipt rather than raising it. Without the id the write is verified
       // strictly and a slow first turn throws.
diff --git a/src/main/runtime/rpc/methods/agent-launch.test.ts b/src/main/runtime/rpc/methods/agent-launch.test.ts
index f44ddb4978b7..75045cf74c48 100644
--- a/src/main/runtime/rpc/methods/agent-launch.test.ts
+++ b/src/main/runtime/rpc/methods/agent-launch.test.ts
@@ -331,6 +331,23 @@ describe('the worktree factory', () => {
     })
   })
 
+  it("attributes a create by the launch's own source, never a copy inside the create payload", async () => {
+    const createWithSource = {
+      ...CREATE_LAUNCH,
+      target: {
+        kind: 'create-worktree',
+        create: { ...CREATE_LAUNCH.target.create, launchSource: 'cli' }
+      }
+    }
+    const named = runtimeStub({ settings: {} })
+    await launch({ ...createWithSource, launchSource: 'onboarding' }, named)
+    expect(createArgs(named)).toMatchObject({ startupLaunchSource: 'onboarding' })
+
+    const unnamed = runtimeStub({ settings: {} })
+    await launch(createWithSource, unnamed)
+    expect(createArgs(unnamed)).not.toHaveProperty('startupLaunchSource')
+  })
+
   it('preserves an explicit no-arguments value for an agent-first worktree create', async () => {
     const runtime = runtimeStub({ settings: {} })
     await launch({ ...CREATE_LAUNCH, agentArgs: null }, runtime)
@@ -461,7 +478,10 @@ describe('the terminal factory', () => {
     const runtime = runtimeStub({ createSupport: { supported: false, reason: 'wsl' } })
     const result = await launch(CREATE_LAUNCH, runtime)
 
-    expect(runtime.createTerminal).toHaveBeenCalledWith('id:wt-new', { startupAgent: 'claude' })
+    expect(runtime.createTerminal).toHaveBeenCalledWith('id:wt-new', {
+      startupAgent: 'claude',
+      onPtySpawnDispatched: expect.any(Function)
+    })
     expect(createStructuredSession).not.toHaveBeenCalled()
     expect(result.outcome).toEqual({ kind: 'terminal', handle: 'term_1' })
     // Never a failed launch, and never a silent downgrade.
@@ -481,7 +501,10 @@ describe('the terminal factory', () => {
     expect(runtime.showManagedTerminalWorkspace).not.toHaveBeenCalled()
     // Resolved to an id first: everything below re-prefixes it, so a raw selector reaches the
     // runtime as `id:id:wt-7`.
-    expect(runtime.createTerminal).toHaveBeenCalledWith('id:wt-7', { startupAgent: 'grok' })
+    expect(runtime.createTerminal).toHaveBeenCalledWith('id:wt-7', {
+      startupAgent: 'grok',
+      onPtySpawnDispatched: expect.any(Function)
+    })
     expect(result.worktreeId).toBe('wt-7')
   })
 })
@@ -548,15 +571,14 @@ describe('launch inputs that cross the wire', () => {
     })
   })
 
-  it('derives agent_kind and request_kind, taking only launch_source from the caller', async () => {
+  it("hands the caller's launch_source to the runtime, which attributes the launch", async () => {
     const runtime = runtimeStub({ settings: {} })
     await launch({ ...EXISTING_LAUNCH, launchSource: 'source_control_recovery' }, runtime)
 
-    expect(terminalOptions(runtime).telemetry).toEqual({
-      agent_kind: 'claude-code',
-      launch_source: 'source_control_recovery',
-      request_kind: 'new'
-    })
+    // The runtime derives agent_kind and request_kind from the agent it builds, so the handler
+    // forwards only the one member it cannot know, and never a prebuilt triple.
+    expect(terminalOptions(runtime)).toMatchObject({ launchSource: 'source_control_recovery' })
+    expect(terminalOptions(runtime)).not.toHaveProperty('telemetry')
   })
 
   it('starts the agent anyway when launch_source is one this build has never heard of', async () => {
@@ -567,16 +589,16 @@ describe('launch inputs that cross the wire', () => {
     )
 
     // The whole point of the open arm set: attribution is bookkeeping, and bookkeeping must never
-    // gate a user action. The row is dropped; the launch is not.
+    // gate a user action. The runtime records it as `unknown`; the launch still starts.
     expect(result.outcome).toEqual({ kind: 'terminal', handle: 'term_1' })
-    expect(terminalOptions(runtime)).not.toHaveProperty('telemetry')
+    expect(terminalOptions(runtime)).toMatchObject({ launchSource: 'a_surface_added_later' })
   })
 
-  it('sends no telemetry at all when the caller named no launch source', async () => {
+  it('names no launch source when the caller named none', async () => {
     const runtime = runtimeStub({ settings: {} })
     await launch(EXISTING_LAUNCH, runtime)
 
-    expect(terminalOptions(runtime)).not.toHaveProperty('telemetry')
+    expect(terminalOptions(runtime)).not.toHaveProperty('launchSource')
   })
 
   it('keeps a structured preference when the cwd names the workspace root', async () => {
diff --git a/src/main/runtime/rpc/methods/agent-launch.ts b/src/main/runtime/rpc/methods/agent-launch.ts
index eee9f2a48c1d..1c7448e5ca2e 100644
--- a/src/main/runtime/rpc/methods/agent-launch.ts
+++ b/src/main/runtime/rpc/methods/agent-launch.ts
@@ -31,20 +31,24 @@ import {
   WorktreeCreateCollisionError,
   WORKTREE_CREATE_COLLISION_CODE
 } from '../../../../shared/new-workspace/worktree-create-collision'
-import {
-  AgentLaunchPaneAlreadyLiveError,
-  AGENT_LAUNCH_PANE_ALREADY_LIVE_CODE
-} from '../../../../shared/agent-launch-pane-already-live'
-import {
-  AgentLaunchSessionAlreadyExistsError,
-  AGENT_LAUNCH_SESSION_ALREADY_EXISTS_CODE
-} from '../../../../shared/agent-launch-session-already-exists'
 import { executeAgentLaunch } from '../../../agent-launch/agent-launch-executor'
+import {
+  trackTerminalSpawnDispatch,
+  type TerminalSpawnDispatch
+} from '../../../agent-launch/agent-launch-not-started'
 import type { OrcaRuntimeService } from '../../orca-runtime'
 import { defineMethod, type RpcContext } from '../core'
 import { admitAgentLaunchOperation, agentLaunchOperationCallerKey } from './agent-launch-replay'
 import { AgentLaunch, AgentLaunchReplay, type AgentLaunchParams } from './agent-launch-schemas'
 import { agentLaunchSurfaceFactory } from './agent-launch-surfaces'
+import {
+  agentLaunchFailureCode,
+  launchFailureWithoutEffectsCode
+} from './agent-launch-failure-code'
+import {
+  agentLaunchCallerNavigationId,
+  selectAgentLaunchTabForCaller
+} from './agent-launch-caller-selection'
 import { agentLaunchWorkspaceFactory } from './agent-launch-worktree-creation'
 
 /**
@@ -138,18 +142,30 @@ async function resolveUnlaunchedIntent(
   return intent
 }
 
-function runAgentLaunch(
+async function runAgentLaunch(
   intent: AgentLaunchIntent,
   context: RpcContext,
   attachOperationId?: string,
-  operationCallerKey?: string
+  operationCallerKey?: string,
+  terminalSpawn?: TerminalSpawnDispatch
 ): Promise<AgentLaunchResult> {
-  return executeAgentLaunch({
+  const callerNavigationId = agentLaunchCallerNavigationId(intent.target, context)
+  const result = await executeAgentLaunch({
     runtime: context.runtime,
     intent,
-    surfaces: agentLaunchSurfaceFactory(context, attachOperationId, operationCallerKey),
+    surfaces: agentLaunchSurfaceFactory(
+      context,
+      attachOperationId,
+      operationCallerKey,
+      callerNavigationId === null,
+      terminalSpawn
+    ),
     workspaces: agentLaunchWorkspaceFactory(context, intent.agent)
   })
+  if (callerNavigationId !== null) {
+    selectAgentLaunchTabForCaller(context.runtime, result, callerNavigationId)
+  }
+  return result
 }
 
 /**
@@ -184,52 +200,17 @@ function settleQuietly(settlement: Promise<void>): Promise<void> {
   })
 }
 
-/** Long enough for every code this path raises, with room for one a later guard adds. */
-const LAUNCH_FAILURE_CODE_MAX_LENGTH = 128
-
-/**
- * This path raises its refusals as the thrown code, the way the method's own guards do — and the
- * recorded code is what a replay answers with, so it is worth keeping.
- *
- * Bounded because a code is an identifier but `error.message` is free text: an errno sentence
- * carrying an absolute path arrives here as one, and it would be written into a ledger file that is
- * re-serialized whole on every subsequent operation. Bounded on the way IN only. A length check in
- * `isAgentSessionOperationRow` would reject rows this same build wrote, and one rejected row costs
- * the entire store.
- */
-function agentLaunchFailureCode(error: unknown): string {
-  const code = error instanceof Error ? error.message : ''
-  return code.length > 0 ? code.slice(0, LAUNCH_FAILURE_CODE_MAX_LENGTH) : 'agent_launch_failed'
-}
-
-/**
- * Only a typed refusal raised before anything was created proves the claimed launch had no effects.
- * A live reserved pane or an existing reserved session proves it only for an existing workspace; on
- * create-worktree the workspace already exists by the time the surface is refused.
- */
-function launchFailureWithoutEffectsCode(
-  error: unknown,
-  targetKind: AgentLaunchTarget['kind']
-): string | null {
-  if (error instanceof WorktreeCreateCollisionError) {
-    return WORKTREE_CREATE_COLLISION_CODE
-  }
-  if (error instanceof AgentLaunchPaneAlreadyLiveError && targetKind === 'existing') {
-    return AGENT_LAUNCH_PANE_ALREADY_LIVE_CODE
-  }
-  if (error instanceof AgentLaunchSessionAlreadyExistsError && targetKind === 'existing') {
-    return AGENT_LAUNCH_SESSION_ALREADY_EXISTS_CODE
-  }
-  return null
-}
-
 type ActiveAgentLaunch = {
   fingerprint: string
   promise: Promise<AgentLaunchResult>
 }
 
 class AgentLaunchExecutionError extends Error {
-  constructor(cause: unknown) {
+  constructor(
+    cause: unknown,
+    /** Decided once, by the launch that ran; a later reader cannot re-derive it from the error. */
+    readonly failedWithoutEffects: boolean
+  ) {
     super('agent_session_operation_unknown', { cause })
   }
 }
@@ -268,15 +249,26 @@ async function executeReplaySafeAgentLaunch(
     await settleQuietly(admission.fail(agentLaunchFailureCode(error)))
     throw error
   }
+  const terminalSpawn = trackTerminalSpawnDispatch()
   let result: AgentLaunchResult
   try {
-    result = await runAgentLaunch(intent, context, admission.attachOperationId, admission.callerKey)
+    result = await runAgentLaunch(
+      intent,
+      context,
+      admission.attachOperationId,
+      admission.callerKey,
+      terminalSpawn
+    )
   } catch (error) {
-    const failedWithoutEffects = launchFailureWithoutEffectsCode(error, intent.target.kind)
+    const failedWithoutEffects = launchFailureWithoutEffectsCode(
+      error,
+      intent.target.kind,
+      terminalSpawn
+    )
     if (failedWithoutEffects) {
       await settleQuietly(admission.fail(failedWithoutEffects))
     }
-    throw new AgentLaunchExecutionError(error)
+    throw new AgentLaunchExecutionError(error, failedWithoutEffects !== null)
   }
   // Settlement is bookkeeping; failure leaves the truthful `unknown` refusal for later retries.
   await settleQuietly(admission.settle(result))
@@ -327,7 +319,7 @@ export const AGENT_LAUNCH_METHODS = [
               code: WORKTREE_CREATE_COLLISION_CODE
             })
           }
-          if (launchFailureWithoutEffectsCode(error.cause, params.target.kind)) {
+          if (error.failedWithoutEffects) {
             throw error.cause
           }
           throw new Error('agent_session_operation_unknown', { cause: error.cause })
diff --git a/src/main/runtime/rpc/methods/orchestration-structured-worker-abandon.test.ts b/src/main/runtime/rpc/methods/orchestration-structured-worker-abandon.test.ts
index 983bd20ad955..cf6075246748 100644
--- a/src/main/runtime/rpc/methods/orchestration-structured-worker-abandon.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration-structured-worker-abandon.test.ts
@@ -7,13 +7,12 @@ const released: string[] = []
 vi.mock('./orchestration-structured-worker-session', () => ({
   releaseStructuredWorkerSession: (dispatchId: string) => released.push(dispatchId),
   createStructuredWorkerSession: vi.fn(),
-  sendStructuredWorkerPreamble: vi.fn(),
-  structuredWorkerHoldId: (dispatchId: string) => `orchestration:dispatch:${dispatchId}`
+  sendStructuredWorkerPreamble: vi.fn()
 }))
 
 const harness = createOrchestrationRpcHarness()
 
-describe('workerAbandon settles the structured hold', () => {
+describe('workerAbandon settles the structured worker session', () => {
   let state: OrchestrationRpcState
 
   beforeEach(() => {
@@ -37,10 +36,10 @@ describe('workerAbandon settles the structured hold', () => {
     return started.dispatch.id
   }
 
-  it('releases the hold when the dispatch actually settles', async () => {
+  it('releases the worker session when the dispatch actually settles', async () => {
     const dispatchId = await startedDispatch()
-    // Without this, the resume-capable hold outlives settlement: the provider child can never be
-    // evicted and host crash recovery keeps respawning an abandoned worker.
+    // Without this, the redrive subscription outlives settlement and keeps nudging a session no
+    // dispatch owns.
     await harness.call('orchestration.workerAbandon', { dispatch: dispatchId }, state.ctx)
     expect(released).toEqual([dispatchId])
   })
diff --git a/src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.test.ts b/src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.test.ts
index a0d0426509b7..b669233c31fb 100644
--- a/src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.test.ts
@@ -47,6 +47,7 @@ function installHost(options: {
   close?: () => Promise<void>
   setSessionTabVisibility?: () => Promise<void>
   historyThrows?: boolean
+  tabListed?: boolean
 }) {
   const record =
     options.record === undefined
@@ -63,6 +64,10 @@ function installHost(options: {
   let closed = false
   hostRef.current = {
     deps: { store: { getRecord: () => record } },
+    getPersistedVisibleSessionTabIndex: () => ({
+      present: true,
+      sessionIds: options.tabListed ? [IDENTITY.sessionId] : []
+    }),
     hasSession: () => (closed ? false : (options.hasSession ?? true)),
     setSessionTabVisibility: options.setSessionTabVisibility ?? (async () => {}),
     close:
@@ -84,7 +89,7 @@ describe('structured worker observation', () => {
     hostRef.current = null
   })
 
-  it('is unverifiable, never exited, when the host is not installed', () => {
+  it('is unverifiable, never exited, when the host is not installed', async () => {
     // Not being able to look is not a death certificate.
     expect(observeStructuredWorker(IDENTITY)).toEqual({
       status: 'unverifiable',
@@ -92,12 +97,12 @@ describe('structured worker observation', () => {
     })
   })
 
-  it('is live when the host holds the session under a live native lease', () => {
+  it('is live when the host holds the session under a live native lease', async () => {
     installHost({})
     expect(observeStructuredWorker(IDENTITY).status).toBe('live')
   })
 
-  it('is exited only on a released lease with death evidence', () => {
+  it('is exited only on a released lease with death evidence', async () => {
     installHost({
       claimStatus: 'released',
       deathEvidence: { kind: 'exit-observed', detail: 'x', observedAt: 1 }
@@ -105,7 +110,7 @@ describe('structured worker observation', () => {
     expect(observeStructuredWorker(IDENTITY).status).toBe('exited')
   })
 
-  it('is unverifiable when a terminal an older build recorded holds the lease', () => {
+  it('is unverifiable when a terminal an older build recorded holds the lease', async () => {
     installHost({ claimStatus: 'conflicted' })
     expect(observeStructuredWorker(IDENTITY).status).toBe('unverifiable')
   })
@@ -127,22 +132,30 @@ describe('structured worker stop', () => {
     })
   })
 
-  it.each([
-    { hasSession: false },
-    { claimStatus: 'conflicted' },
-    { claimStatus: 'released' },
-    { record: null }
-  ])('retains without positive exit evidence: %j', async (options) => {
-    installHost({ ...options, close: async () => {} })
-    const retireStructuredAgentSessionTabFromSnapshot = vi.fn()
-    const result = await stopStructuredWorker(IDENTITY, 'd1', {
-      forgetStructuredSessionMail: vi.fn(),
-      retireStructuredAgentSessionTabFromSnapshot
+  it('settles a released lease whose stop was unproven: nothing is left running to close', async () => {
+    // A release that could not prove its stop sent no signal and left the verdict `unverifiable`;
+    // closing the chat is the user's action, so that bookkeeping does not refuse it.
+    installHost({ claimStatus: 'released', close: async () => {} })
+    await expect(stopStructuredWorker(IDENTITY, 'd1')).resolves.toEqual({
+      stopped: true,
+      closeAttempted: true
     })
-    expect(result).toMatchObject({ stopped: false, closeAttempted: true })
-    expect(retireStructuredAgentSessionTabFromSnapshot).not.toHaveBeenCalled()
   })
 
+  it.each([{ hasSession: false }, { claimStatus: 'conflicted' }, { record: null }])(
+    'retains without positive exit evidence: %j',
+    async (options) => {
+      installHost({ ...options, close: async () => {} })
+      const retireStructuredAgentSessionTabFromSnapshot = vi.fn()
+      const result = await stopStructuredWorker(IDENTITY, 'd1', {
+        forgetStructuredSessionMail: vi.fn(),
+        retireStructuredAgentSessionTabFromSnapshot
+      })
+      expect(result).toMatchObject({ stopped: false, closeAttempted: true })
+      expect(retireStructuredAgentSessionTabFromSnapshot).not.toHaveBeenCalled()
+    }
+  )
+
   it('retains when the close throws, and admits the close was issued', async () => {
     installHost({
       close: async () => {
@@ -191,9 +204,9 @@ describe('structured worker output', () => {
     hostRef.current = null
   })
 
-  it('round-trips the journal through the archive and back out of a released read', () => {
+  it('round-trips the journal through the archive and back out of a released read', async () => {
     installHost({})
-    const live = readStructuredWorkerJournal({
+    const live = await readStructuredWorkerJournal({
       identity: IDENTITY,
       dispatchId: 'd1',
       workerState: 'ready',
@@ -201,7 +214,7 @@ describe('structured worker output', () => {
       agent: 'claude'
     })
     expect(live.source).toBe('transcript')
-    const archive = captureStructuredWorkerArchive(IDENTITY, 'claude')
+    const archive = await captureStructuredWorkerArchive(IDENTITY, 'claude')
     hostRef.current = null
     const archived = readArchivedStructuredJournal({
       dispatchId: 'd1',
@@ -219,7 +232,7 @@ describe('structured worker output', () => {
     expect(archived.sourceIdentity).not.toBe(live.sourceIdentity)
   })
 
-  it('redacts dispatch capabilities from the archived journal', () => {
+  it('redacts dispatch capabilities from the archived journal', async () => {
     installHost({
       items: [
         {
@@ -233,13 +246,13 @@ describe('structured worker output', () => {
         } as unknown as AgentJournalRenderItem
       ]
     })
-    const archive = captureStructuredWorkerArchive(IDENTITY, 'claude')
+    const archive = await captureStructuredWorkerArchive(IDENTITY, 'claude')
     expect(JSON.stringify(archive)).not.toContain('dcap_aaa')
     expect(JSON.stringify(archive)).toContain('[dispatch capability redacted]')
   })
 
-  it('refuses to read a session the host no longer holds', () => {
-    expect(() =>
+  it('refuses to read a session the host no longer holds', async () => {
+    await expect(
       readStructuredWorkerJournal({
         identity: IDENTITY,
         dispatchId: 'd1',
@@ -247,15 +260,15 @@ describe('structured worker output', () => {
         liveness: 'live',
         agent: 'claude'
       })
-    ).toThrow(/not attached/)
+    ).rejects.toThrow(/not attached/)
   })
 
-  it('reports an unverifiable worker as unknown, never as running', () => {
+  it('reports an unverifiable worker as unknown, never as running', async () => {
     // The `could not look, therefore it is alive` inversion. After a restart the runtime observes
     // `unverifiable` — no attached provider child in this generation — while the journal is still
     // readable, and a coordinator reading `running` waits on a worker that may already be gone.
     installHost({})
-    const read = readStructuredWorkerJournal({
+    const read = await readStructuredWorkerJournal({
       identity: IDENTITY,
       dispatchId: 'd1',
       workerState: 'ready',
@@ -266,9 +279,9 @@ describe('structured worker output', () => {
     expect(read.status.liveness).toBe('unverifiable')
   })
 
-  it('carries each proven verdict through unchanged', () => {
+  it('carries each proven verdict through unchanged', async () => {
     installHost({})
-    const live = readStructuredWorkerJournal({
+    const live = await readStructuredWorkerJournal({
       identity: IDENTITY,
       dispatchId: 'd1',
       workerState: 'ready',
@@ -276,7 +289,7 @@ describe('structured worker output', () => {
       agent: 'claude'
     })
     expect(live.status).toMatchObject({ terminal: 'running', liveness: 'live' })
-    const exited = readStructuredWorkerJournal({
+    const exited = await readStructuredWorkerJournal({
       identity: IDENTITY,
       dispatchId: 'd1',
       workerState: 'succeeded',
@@ -286,9 +299,9 @@ describe('structured worker output', () => {
     expect(exited.status).toMatchObject({ terminal: 'exited', liveness: 'exited' })
   })
 
-  it('states that a settled release is exited', () => {
+  it('states that a settled release is exited', async () => {
     installHost({})
-    const archive = captureStructuredWorkerArchive(IDENTITY, 'claude')
+    const archive = await captureStructuredWorkerArchive(IDENTITY, 'claude')
     const archived = readArchivedStructuredJournal({
       dispatchId: 'd1',
       workerState: 'succeeded',
@@ -300,12 +313,12 @@ describe('structured worker output', () => {
     expect(archived.status).toMatchObject({ terminal: 'exited', liveness: 'exited' })
   })
 
-  it('never calls an unproven release exited', () => {
+  it('never calls an unproven release exited', async () => {
     // The archive is frozen BEFORE the close. `release_unknown` is the state that records a close
     // that did NOT land, and a coordinator reading `exited` there starts a replacement worker over
     // the same worktree while the original provider child may still be attached.
     installHost({})
-    const archive = captureStructuredWorkerArchive(IDENTITY, 'claude')
+    const archive = await captureStructuredWorkerArchive(IDENTITY, 'claude')
     for (const releaseState of ['unknown', 'releasing'] as const) {
       const archived = readArchivedStructuredJournal({
         dispatchId: 'd1',
@@ -324,7 +337,7 @@ describe('structured worker output', () => {
     // `readArchivedWorkerOutput`, and the resource row it already holds is the only thing that
     // knows whether the close landed.
     installHost({})
-    const archive = captureStructuredWorkerArchive(IDENTITY, 'claude')
+    const archive = await captureStructuredWorkerArchive(IDENTITY, 'claude')
     const db = {
       getWorkerTerminalArchive: () => ({
         dispatch_id: 'd1',
@@ -355,12 +368,12 @@ describe('structured worker output', () => {
     })
   })
 
-  it('refuses a cursor once the tail window has slid past it', () => {
+  it('refuses a cursor once the tail window has slid past it', async () => {
     // The cursor is an index into the bounded tail, and `sourceIdentity` was constant for the
     // worker's life, so a coordinator paging a growing journal resumed at the newest items and
     // skipped the middle without a word.
     installHost({ items: ITEMS })
-    const first = readStructuredWorkerJournal({
+    const first = await readStructuredWorkerJournal({
       identity: IDENTITY,
       dispatchId: 'd1',
       workerState: 'ready',
@@ -376,7 +389,7 @@ describe('structured worker output', () => {
         } as unknown as AgentJournalRenderItem
       ]
     })
-    expect(() =>
+    await expect(
       readStructuredWorkerJournal({
         identity: IDENTITY,
         dispatchId: 'd1',
@@ -385,7 +398,7 @@ describe('structured worker output', () => {
         agent: 'claude',
         cursor: first.cursor
       })
-    ).toThrow(/source changed/i)
+    ).rejects.toThrow(/source changed/i)
   })
 })
 
@@ -394,7 +407,7 @@ describe('archiving a structured worker whose journal cannot be read', () => {
     hostRef.current = null
   })
 
-  it('settles with an empty, warned archive once the session is PROVEN gone', () => {
+  it('settles with an empty, warned archive once the session is PROVEN gone', async () => {
     // Closing the worker's chat tab is a routine user action: it evicts the child and detaches the
     // journal permanently. Throwing archive_failed there wedged release on evidence that could
     // never arrive, leaving worker-abandon as the only way out.
@@ -403,7 +416,7 @@ describe('archiving a structured worker whose journal cannot be read', () => {
       claimStatus: 'released',
       deathEvidence: { kind: 'exit-observed', detail: 'surface released', observedAt: 1 }
     })
-    const archive = captureStructuredWorkerArchive(IDENTITY, 'claude')
+    const archive = await captureStructuredWorkerArchive(IDENTITY, 'claude')
     expect(archive.messages).toEqual([])
     expect(archive.processIncarnation).toBe(IDENTITY.processIncarnation)
     expect(archive.warnings).toContain(
@@ -411,12 +424,24 @@ describe('archiving a structured worker whose journal cannot be read', () => {
     )
   })
 
-  it('still retains when the journal is unreadable but nothing proves the child is gone', () => {
+  it('retains a worker at rest: released, but its chat tab still lists it', async () => {
+    // Released is not retired now — the idle sweep releases a quiet worker's lease — so an owned
+    // worker whose journal cannot be read keeps its evidence for a later archive.
+    installHost({
+      historyThrows: true,
+      claimStatus: 'released',
+      deathEvidence: { kind: 'exit-observed', detail: 'idle stop', observedAt: 1 },
+      tabListed: true
+    })
+    await expect(captureStructuredWorkerArchive(IDENTITY, 'claude')).rejects.toThrow(/retained/)
+  })
+
+  it('still retains when the journal is unreadable but nothing proves the child is gone', async () => {
     installHost({ historyThrows: true })
-    expect(() => captureStructuredWorkerArchive(IDENTITY, 'claude')).toThrow(/retained/)
+    await expect(captureStructuredWorkerArchive(IDENTITY, 'claude')).rejects.toThrow(/retained/)
   })
 
-  it('still retains when there is no host to look with', () => {
-    expect(() => captureStructuredWorkerArchive(IDENTITY, 'claude')).toThrow(/retained/)
+  it('still retains when there is no host to look with', async () => {
+    await expect(captureStructuredWorkerArchive(IDENTITY, 'claude')).rejects.toThrow(/retained/)
   })
 })
diff --git a/src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.ts b/src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.ts
index 13d3ce1dbce1..bec15537c49d 100644
--- a/src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.ts
+++ b/src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.ts
@@ -40,12 +40,13 @@ import {
   structuredWorkerTerminalState,
   type StructuredWorkerObservation
 } from '../../structured-worker-authority'
+import { structuredWorkerOwned } from '../../structured-worker-custody'
 import type { StructuredWorkerIdentity } from '../../structured-worker-identity'
 import type { WorkerTerminalReleaseState } from '../../orchestration/worker-terminal-ownership'
 import { releaseStructuredWorkerSession } from './orchestration-structured-worker-session'
 import { closeStructuredAgentSessionChild } from '../../structured-agent-session-close'
 
-export { observeStructuredWorker, type StructuredWorkerObservation }
+export { observeStructuredWorker, structuredWorkerOwned, type StructuredWorkerObservation }
 
 /** The structured worker behind a dispatch, or null when a PTY worker owns it. */
 export function resolveStructuredWorkerForDispatch(
@@ -83,13 +84,13 @@ export async function stopStructuredWorker(
   return closeStructuredAgentSessionChild(identity.sessionId, {
     ...(runtime ? { runtime } : {}),
     // Between the close and the proof, never after: an unsettled close returns early, and a
-    // surviving hold keeps the provider child un-evictable for the life of the app.
+    // surviving redrive subscription keeps nudging a session no dispatch owns.
     afterClose: () => releaseStructuredWorkerSession(dispatchId, runtime)
   })
 }
 
 /** The structured half of `worker-read`, or null when a PTY worker owns the dispatch. */
-export function readStructuredWorkerOutput(args: {
+export async function readStructuredWorkerOutput(args: {
   db: OrchestrationDb
   dispatchId: string
   workerState: string
@@ -98,7 +99,7 @@ export function readStructuredWorkerOutput(args: {
   source?: 'auto' | 'transcript' | 'terminal'
   cursor?: string | number
   limit?: number
-}): OrchestrationWorkerReadTranscriptResult | null {
+}): Promise<OrchestrationWorkerReadTranscriptResult | null> {
   const identity = resolveStructuredWorkerForDispatch(args.db, args.dispatchId)
   if (!identity) {
     return null
@@ -123,7 +124,7 @@ export function readStructuredWorkerOutput(args: {
 }
 
 /** Journal page in the shape `worker-read --source transcript` already serves. */
-export function readStructuredWorkerJournal(args: {
+export async function readStructuredWorkerJournal(args: {
   identity: StructuredWorkerIdentity
   dispatchId: string
   workerState: string
@@ -131,8 +132,8 @@ export function readStructuredWorkerJournal(args: {
   agent: AgentType
   cursor?: string | number
   limit?: number
-}): OrchestrationWorkerReadTranscriptResult {
-  const page = readStructuredJournalPage(args.identity.sessionId)
+}): Promise<OrchestrationWorkerReadTranscriptResult> {
+  const page = await readStructuredJournalPage(args.identity.sessionId)
   if (!page) {
     throw new OrchestrationError(
       'transcript_required',
@@ -213,11 +214,13 @@ function structuredJournalPrefixIdentity(args: {
 }
 
 /** Freezes the journal before the session is closed, so a released worker is still readable. */
-export function captureStructuredWorkerArchive(
+export async function captureStructuredWorkerArchive(
   identity: StructuredWorkerIdentity,
   agent: AgentType
-): WorkerStructuredJournalArchive {
-  const page = readStructuredJournalPage(identity.sessionId)
+): Promise<WorkerStructuredJournalArchive> {
+  // Opens a conversation at rest or one the idle sweep closed, so a resting worker's journal is
+  // still preserved.
+  const page = await readStructuredJournalPage(identity.sessionId)
   if (page) {
     return buildStructuredJournalArchive({
       agent,
@@ -232,10 +235,9 @@ export function captureStructuredWorkerArchive(
   // the worker's chat tab is a routine user action that does exactly that, so throwing there wedges
   // release on evidence that can never come and leaves `worker-abandon` as the only exit.
   //
-  // `exited` is the only verdict that qualifies: it needs a released lease WITH death evidence.
-  // `unverifiable` — no host installed, a lease handed to a TUI owner — means we could not look,
-  // and retaining is still right.
-  if (observeStructuredWorker(identity).status !== 'exited') {
+  // Only a worker this runtime no longer owns qualifies — released with its chat tab gone. An owned
+  // one, running or at rest, keeps its journal, and so does one we could not look at.
+  if (structuredWorkerOwned(identity.sessionId) !== false) {
     throw new OrchestrationError(
       'archive_failed',
       'Output could not be preserved for this structured worker; the session was retained.'
diff --git a/src/main/runtime/rpc/methods/orchestration-structured-worker-session.test.ts b/src/main/runtime/rpc/methods/orchestration-structured-worker-session.test.ts
index 5ba5c69b329f..c3c69dc15fd2 100644
--- a/src/main/runtime/rpc/methods/orchestration-structured-worker-session.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration-structured-worker-session.test.ts
@@ -1,5 +1,8 @@
+import { join } from 'node:path'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { dispatchWriteFailureReason } from '../../../../shared/structured-agent-session-dispatch-rejection'
+import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
+import { getAppEnvironment } from '../../../../shared/app-environment'
+import { DISPATCH_REJECTED_WRITE_FAILED } from '../../../../shared/structured-agent-session-dispatch-rejection'
 
 const hostRef: { current: unknown } = { current: null }
 const createSpy = vi.fn()
@@ -14,37 +17,34 @@ vi.mock('./structured-agent-session-create', () => ({
 const {
   createStructuredWorkerSession,
   releaseStructuredWorkerSession,
-  sendStructuredWorkerPreamble,
-  structuredWorkerHoldId
+  sendStructuredWorkerPreamble
 } = await import('./orchestration-structured-worker-session')
 const { isUnknownWorkerStartOutcome } = await import('./orchestration/worker/worker-topology')
 const { structuredWorkerIdentities } = await import('../../structured-worker-identity')
-const { structuredWorkerChildIdentityEnv } =
-  await import('../../structured-worker-child-identity-env')
+const { structuredSessionChildIdentityEnv } =
+  await import('../../structured-session-child-identity-env')
 
-function installHost() {
-  const hold = vi.fn(async () => {})
-  const release = vi.fn()
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a host stub carrying only the members the worker start reaches.
+function installHost(location = { executionHostId: 'local', wslDistro: null as string | null }) {
   const dispose = vi.fn()
+  const subscribe = vi.fn(async () => dispose)
   hostRef.current = {
     setSessionTabVisibility: async () => {},
     close: async () => {},
     deps: {
       store: {
         getRecord: () => ({
-          location: { executionHostId: 'local', wslDistro: null },
+          location,
           lease: { runtimeFence: 2, runtimeKind: 'native', claimStatus: 'live' }
         })
       }
     },
-    hold,
-    release,
-    subscribe: () => dispose
+    subscribe
   }
-  return { hold, release, dispose }
+  return { subscribe, dispose }
 }
 
-describe('structured worker session hold', () => {
+describe('structured worker session', () => {
   beforeEach(() => {
     structuredWorkerIdentities.clear()
     createSpy.mockReset()
@@ -54,8 +54,8 @@ describe('structured worker session hold', () => {
     }))
   })
 
-  it('takes a resume-capable hold at start and releases it only on settlement', async () => {
-    const { hold, release, dispose } = installHost()
+  it('binds only a redrive subscription at start, and settlement drops it', async () => {
+    const { subscribe, dispose } = installHost()
     const created = await createStructuredWorkerSession({
       runtime: { ensureStructuredAgentSessionHost: async () => {} } as never,
       worktreeId: 'wt_1',
@@ -63,18 +63,19 @@ describe('structured worker session hold', () => {
       dispatchId: 'd1',
       onJournalActivity: () => {}
     })
-    // Without the hold, the release clock evicts the provider child 15s after a user closes the
-    // worker's chat tab, killing an idle worker mid-dispatch.
-    expect(hold).toHaveBeenCalledWith(created.identity.sessionId, structuredWorkerHoldId('d1'))
-    expect(release).not.toHaveBeenCalled()
+    // No hold: while the dispatch is open the idle sweep reads it from the orchestration database.
+    expect(hostRef.current).not.toHaveProperty('hold')
+    expect(subscribe).toHaveBeenCalledWith(
+      expect.objectContaining({ sessionId: created.identity.sessionId })
+    )
+    expect(dispose).not.toHaveBeenCalled()
 
     releaseStructuredWorkerSession('d1')
-    expect(release).toHaveBeenCalledWith(created.identity.sessionId, structuredWorkerHoldId('d1'))
     expect(dispose).toHaveBeenCalledTimes(1)
     expect(structuredWorkerIdentities.get(created.identity.handle)).toBeNull()
-    // A second settlement is a no-op rather than a second release of the same holder.
+    // A second settlement is a no-op.
     releaseStructuredWorkerSession('d1')
-    expect(release).toHaveBeenCalledTimes(1)
+    expect(dispose).toHaveBeenCalledTimes(1)
   })
 
   it('registers the identity BEFORE the session is created, so the child gets the handle', async () => {
@@ -83,7 +84,7 @@ describe('structured worker session hold', () => {
     createSpy.mockImplementation(async (args: { envelope: { sessionId: string } }) => {
       // `attach` is what spawns the provider child, and the child's env is read from the registry
       // at spawn time. Registering afterwards ships a worker with no ORCA_TERMINAL_HANDLE.
-      envAtSpawn = structuredWorkerChildIdentityEnv(args.envelope.sessionId, {})
+      envAtSpawn = structuredSessionChildIdentityEnv(args.envelope.sessionId, {})
       return { ok: true, value: { sessionId: args.envelope.sessionId } }
     })
     const created = await createStructuredWorkerSession({
@@ -94,14 +95,22 @@ describe('structured worker session hold', () => {
       onJournalActivity: () => {}
     })
     expect(envAtSpawn?.ORCA_TERMINAL_HANDLE).toBe(created.identity.handle)
-    expect(envAtSpawn?.ORCA_CLI_COMMAND).toBe('orca')
+    // This app's own launcher by absolute path, so a login shell's profile cannot swap in a global.
+    expect(envAtSpawn?.ORCA_CLI_COMMAND).toBe(
+      join(
+        getAppEnvironment().getPath('userData'),
+        'cli',
+        'bin',
+        process.platform === 'win32' ? 'orca-dev.cmd' : 'orca-dev'
+      )
+    )
     expect(envAtSpawn?.ORCA_PANE_KEY).toBeUndefined()
     releaseStructuredWorkerSession('d_spawn')
   })
 
   it('forgets the identity and discards the session when the start fails', async () => {
-    const { hold } = installHost()
-    hold.mockRejectedValueOnce(new Error('hold refused'))
+    // A session that resolves outside the local host is not a worker this runtime can own.
+    installHost({ executionHostId: 'local', wslDistro: 'Ubuntu' })
     const closed: string[] = []
     ;(hostRef.current as { close: (id: string) => Promise<void> }).close = async (id) => {
       closed.push(id)
@@ -114,7 +123,7 @@ describe('structured worker session hold', () => {
         dispatchId: 'd_fail',
         onJournalActivity: () => {}
       })
-    ).rejects.toThrow('hold refused')
+    ).rejects.toThrow(/local execution host outside WSL/)
     // Neither a live provider child nor a registry entry may outlive the failed start.
     expect(closed).toHaveLength(1)
     expect(structuredWorkerIdentities.getBySessionId(closed[0]!)).toBeNull()
@@ -128,7 +137,7 @@ describe('structured worker session hold', () => {
     }
     // `commit` answers this after `attach` SUCCEEDED and only the tab publish failed, so the
     // provider child is live. Reading it as "refused, nothing created" strands that child with no
-    // hold and no binding, and nothing else in the runtime ever retires it.
+    // binding, and nothing else in the runtime ever retires it.
     createSpy.mockImplementation(async () => ({
       ok: false,
       refusal: {
@@ -224,33 +233,69 @@ describe('structured worker session hold', () => {
 })
 
 describe('structured worker dispatch preamble', () => {
-  function hostWithSubmission(
-    submission: Record<string, unknown>,
-    settled?: Record<string, unknown> | Error
-  ) {
-    const waitForSendSettlement = vi.fn(async () => {
-      if (settled instanceof Error) {
-        throw settled
-      }
-      return settled
-        ? { cursor: 1, value: { clientMessageId: 'c1', submission: settled } }
-        : undefined
-    })
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: partial host double; the preamble reads only deps.store, send, and waitForSendSettlement.
+  type PreambleHost = Parameters<typeof sendStructuredWorkerPreamble>[0]['host']
+  type Settled = Pick<AgentJournalSubmission, 'dispatchState' | 'reason'>
+
+  function submissionOf(settled: Settled): AgentJournalSubmission {
+    return {
+      clientMessageId: 'c1',
+      fence: 7,
+      payloadFingerprint: 'fingerprint',
+      providerItemId: null,
+      submittedAt: 1,
+      resolvedAt: null,
+      ...settled
+    }
+  }
+
+  function hostWithSubmission(submission: Settled, delivered?: Settled): PreambleHost {
     return {
       deps: { store: { getRecord: () => ({ lease: { runtimeFence: 7 } }) } },
-      send: async () => ({ ok: true, value: { clientMessageId: 'c1', submission } }),
-      waitForSendSettlement
-    } as never
+      send: async () => ({
+        ok: true,
+        replayed: false,
+        fence: 7,
+        cursor: { epoch: 'epoch-1', sequence: 1 },
+        value: { clientMessageId: 'c1', submission: submissionOf(submission) }
+      }),
+      // What the submission settled as while the worker's agent started; undefined when the
+      // start outlasted the wait.
+      waitForSendSettlement: async () =>
+        delivered
+          ? {
+              cursor: { epoch: 'epoch-1', sequence: 2 },
+              value: { clientMessageId: 'c1', submission: submissionOf(delivered) }
+            }
+          : undefined
+    }
   }
 
-  const send = (host: never) =>
+  const send = (host: PreambleHost) =>
     sendStructuredWorkerPreamble({ host, sessionId: 's1', dispatchId: 'd1', preamble: 'spec' })
 
   it('reports the preamble delivered only on an accepted submission', async () => {
     await expect(
       send(hostWithSubmission({ dispatchState: 'accepted', reason: null }))
-    ).resolves.toBeUndefined()
+    ).resolves.toBe('accepted')
+  })
+
+  it('waits for an accepted preamble to be delivered, and reports that delivery (W10)', async () => {
+    await expect(
+      send(
+        hostWithSubmission(
+          { dispatchState: 'pending', reason: null },
+          { dispatchState: 'accepted', reason: null }
+        )
+      )
+    ).resolves.toBe('accepted')
+  })
+
+  it('reports a preamble still held for an agent that outlasted the wait, without failing the start (W10)', async () => {
+    // Held, not lost: the host delivers it when the agent starts. Throwing here tore the worker
+    // down, which rejected the preamble the start was about to deliver.
+    await expect(
+      send(hostWithSubmission({ dispatchState: 'pending', reason: null }))
+    ).resolves.toBe('pending')
   })
 
   it('never claims delivery for a submission the provider never acknowledged', async () => {
@@ -258,49 +303,13 @@ describe('structured worker dispatch preamble', () => {
     // into `unknown`, and `performSend` still returns ok. Reporting that as `dispatch_input:
     // accepted` marks the worker ready with no task, and the coordinator blocks in
     // `check --wait --types worker_done` until it times out.
-    for (const dispatchState of ['unknown', 'pending'] as const) {
-      const error = await send(
-        hostWithSubmission({ dispatchState, reason: 'provider child exited' })
-      ).catch((thrown: unknown) => thrown)
-      expect((error as { code?: string }).code).toBe('operation_unknown')
-      // The wiring, not just the throw: this is the code that makes the start receipt
-      // `outcome_unknown` with the worker-show / worker-abandon recovery commands.
-      expect(isUnknownWorkerStartOutcome(error, 'dispatch_input')).toBe(true)
-    }
-  })
-
-  it('waits for an admitted preamble to settle before judging it', async () => {
-    // Claude settles a send on admission: the write returns while the submission is still
-    // pending, and the provider echo promotes it to accepted moments later.
-    const host = hostWithSubmission(
-      { dispatchState: 'pending', reason: null },
-      { dispatchState: 'accepted', reason: null }
-    )
-    await expect(send(host)).resolves.toBeUndefined()
-    expect(
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: host is the double built above, whose waitForSendSettlement is a vi.fn spy.
-      (host as unknown as { waitForSendSettlement: ReturnType<typeof vi.fn> }).waitForSendSettlement
-    ).toHaveBeenCalledWith('s1', 'c1')
-  })
-
-  it('keeps an admitted preamble that settles rejected a proven failure', async () => {
-    const error = await send(
-      hostWithSubmission(
-        { dispatchState: 'pending', reason: null },
-        { dispatchState: 'rejected', reason: 'fence moved' }
-      )
-    ).catch((thrown: unknown) => thrown)
-    expect((error as { code?: string }).code).toBe('dispatch_preamble_undelivered')
-  })
-
-  it('reports an admitted preamble whose settlement wait fails as unknown', async () => {
     const error = await send(
-      hostWithSubmission(
-        { dispatchState: 'pending', reason: null },
-        new Error('agent session send disappeared before settlement')
-      )
+      hostWithSubmission({ dispatchState: 'unknown', reason: 'provider child exited' })
     ).catch((thrown: unknown) => thrown)
     expect((error as { code?: string }).code).toBe('operation_unknown')
+    // The wiring, not just the throw: this is the code that makes the start receipt
+    // `outcome_unknown` with the worker-show / worker-abandon recovery commands.
+    expect(isUnknownWorkerStartOutcome(error, 'dispatch_input')).toBe(true)
   })
 
   it('keeps a rejected preamble a proven failure under a code of its own', async () => {
@@ -315,13 +324,33 @@ describe('structured worker dispatch preamble', () => {
     expect(isUnknownWorkerStartOutcome(error, 'dispatch_input')).toBe(false)
   })
 
+  it('ends the message with one period whether the reason is a sentence or a marker', async () => {
+    const sentence = await send(
+      hostWithSubmission({
+        dispatchState: 'rejected',
+        reason: 'The provider stopped before this message was sent.'
+      })
+    ).catch((thrown: unknown) => thrown)
+    expect(sentence).toMatchObject({
+      message:
+        'The dispatch preamble was not delivered: The provider stopped before this message was sent.'
+    })
+    const marker = await send(
+      hostWithSubmission({ dispatchState: 'unknown', reason: 'provider child exited' })
+    ).catch((thrown: unknown) => thrown)
+    expect(marker).toMatchObject({
+      message:
+        'The dispatch preamble was submitted but not acknowledged (unknown): provider child exited.'
+    })
+  })
+
   it('reports a refused transport write as undelivered, never as unknown', async () => {
     // The state a provably-unwritten frame now settles. Nothing reached the provider,
     // so there is no running turn for a coordinator to go and look at.
     const error = await send(
       hostWithSubmission({
         dispatchState: 'rejected',
-        reason: dispatchWriteFailureReason(new Error('broken pipe'))
+        reason: DISPATCH_REJECTED_WRITE_FAILED
       })
     ).catch((thrown: unknown) => thrown)
     expect((error as { code?: string }).code).toBe('dispatch_preamble_undelivered')
diff --git a/src/main/runtime/rpc/methods/orchestration-structured-worker-session.ts b/src/main/runtime/rpc/methods/orchestration-structured-worker-session.ts
index 5a06f34c9539..dad93face828 100644
--- a/src/main/runtime/rpc/methods/orchestration-structured-worker-session.ts
+++ b/src/main/runtime/rpc/methods/orchestration-structured-worker-session.ts
@@ -1,19 +1,20 @@
 /**
- * Starting, holding and retiring a worker that IS a structured agent session.
+ * Starting and retiring a worker that IS a structured agent session.
  *
  * Three things make this different from the PTY worker path, and all three live here:
  *
  * - The session is created directly as structured, so readiness is the attach returning ok. There
  *   is no boot-to-idle gap to wait on and no `tui-idle` edge to read.
- * - A structured session's provider child is evicted 15s after its last HOLDER leaves, and holds
- *   come only from bound surfaces. A dispatched worker parked on mail is exactly that state, so
- *   the dispatch takes its own resume-capable hold and keeps it until the worker settles.
+ * - Nothing here keeps its agent running. The idle sweep leaves it running while its dispatch is
+ *   open, reading that from the orchestration database; once the dispatch settles the agent rests
+ *   like any chat's, and the next mail starts it.
  * - The dispatch preamble is a turn, not keystrokes.
  */
 
 import { randomUUID } from 'node:crypto'
 import { isDefinitiveAgentSessionCreateRefusal } from '../../../../shared/agent-session-definitive-refusal'
 import type { AgentJournalMessageItem } from '../../../../shared/agent-session-journal-types'
+import { ORCHESTRATION_READINESS_TIMEOUT_MS } from '../../../../shared/orchestration-timing-budgets'
 import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
 import { getStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
 import type { OrcaRuntimeService } from '../../orca-runtime'
@@ -38,23 +39,16 @@ import { createStructuredAgentSessionForWorktree } from './structured-agent-sess
 type StructuredWorkerBinding = {
   sessionId: string
   handle: string
-  holderId: string
   disposeSubscription: () => void
 }
 
 const bindingsByDispatchId = new Map<string, StructuredWorkerBinding>()
 
-export function structuredWorkerHoldId(dispatchId: string): string {
-  return `orchestration:dispatch:${dispatchId}`
-}
-
 /**
- * Drops the dispatch's hold, its redrive subscription and its parked mail; the release clock takes
- * it from here.
+ * Drops the dispatch's redrive subscription, its registry entry and its parked mail.
  *
- * EVERY settlement has to reach this — stop, release AND abandon. A surviving hold does not just
- * leak: it keeps the provider child un-evictable for the life of the app, and makes host crash
- * recovery respawn a child for a worker that was settled long ago.
+ * EVERY settlement has to reach this — stop, release AND abandon. A surviving subscription keeps
+ * nudging a session no dispatch owns.
  */
 export function releaseStructuredWorkerSession(
   dispatchId: string,
@@ -68,11 +62,6 @@ export function releaseStructuredWorkerSession(
   binding.disposeSubscription()
   structuredWorkerIdentities.forget(binding.handle)
   runtime?.forgetStructuredSessionMail?.(binding.sessionId)
-  try {
-    getStructuredAgentSessionHost()?.release(binding.sessionId, binding.holderId)
-  } catch (error) {
-    console.warn('[orchestration] structured worker hold release failed', dispatchId, error)
-  }
 }
 
 export async function createStructuredWorkerSession(args: {
@@ -92,7 +81,7 @@ export async function createStructuredWorkerSession(args: {
   // resolves to whatever single leaf sits in the worktree — by default the COORDINATOR's pane.
   //
   // The scope is provisionally local; the record's own location is asserted local below, and a
-  // session that resolves anywhere else never reaches a hold.
+  // session that resolves anywhere else is discarded.
   const identity = structuredWorkerIdentities.register({
     handle: mintStructuredWorkerHandle(),
     sessionId,
@@ -141,13 +130,10 @@ export async function createStructuredWorkerSession(args: {
         'A structured worker must run on the local execution host outside WSL.'
       )
     }
-    const holderId = structuredWorkerHoldId(args.dispatchId)
-    await host.hold(sessionId, holderId)
-    const disposeSubscription = subscribeForRedrive(host, sessionId, args.onJournalActivity)
+    const disposeSubscription = await subscribeForRedrive(host, sessionId, args.onJournalActivity)
     bindingsByDispatchId.set(args.dispatchId, {
       sessionId,
       handle: identity.handle,
-      holderId,
       disposeSubscription
     })
     return { identity, host }
@@ -167,8 +153,8 @@ export async function createStructuredWorkerSession(args: {
  *
  * `ok` is not the test. `commit` answers `agent_session_operation_unknown` when `attach` SUCCEEDED
  * and only the tab publish failed, and a throw out of the commit half is past `attach` too — the
- * pre-commit half never throws, it refuses. Both leave a live provider child that took no hold and
- * has no binding, so nothing else in the runtime will ever retire it. Only a DEFINITIVE refusal
+ * pre-commit half never throws, it refuses. Both leave a session with a published tab and no
+ * binding, so nothing else in the runtime will ever retire it. Only a DEFINITIVE refusal
  * proves there is nothing to discard; everything else gets the best-effort close.
  */
 function structuredCreateMayHaveCommitted(
@@ -213,13 +199,27 @@ export async function discardStructuredWorkerSession(
   retireSettledStructuredWorkerTab(sessionId, runtime)
 }
 
-/** Delivers the dispatch preamble as the worker's first turn. */
+/** A submission reason as a clause: host sentences end in a period, legacy markers do not. */
+function reasonClause(reason: string | null | undefined): string {
+  return (reason ?? 'no reason given').replace(/[.\s]+$/, '')
+}
+
+/** What a preamble send reads of the host. */
+type StructuredWorkerPreambleHost = Pick<
+  StructuredAgentSessionHost,
+  'send' | 'waitForSendSettlement'
+> & {
+  deps: { store: { getRecord: (sessionId: string) => { lease: { runtimeFence: number } } | null } }
+}
+
+/** Delivers the dispatch preamble as the worker's first turn. `pending`: the worker's agent had
+ *  not taken it within the wait; the host still holds it for that agent, and never re-sends it. */
 export async function sendStructuredWorkerPreamble(args: {
-  host: StructuredAgentSessionHost
+  host: StructuredWorkerPreambleHost
   sessionId: string
   dispatchId: string
   preamble: string
-}): Promise<void> {
+}): Promise<'accepted' | 'pending'> {
   const body: AgentJournalMessageItem = {
     kind: 'message',
     role: 'user',
@@ -244,17 +244,19 @@ export async function sendStructuredWorkerPreamble(args: {
   if (!result.ok) {
     throw new Error(`The dispatch preamble was refused: ${result.refusal.message}`)
   }
-  // claude settles a send on admission, so a fresh preamble is pending until the provider echo
+  // Accepted is not delivered: the worker's agent may still be starting.
   const submission =
     result.value.submission.dispatchState === 'pending'
       ? ((
           await args.host
-            .waitForSendSettlement(args.sessionId, result.value.clientMessageId)
+            .waitForSendSettlement(args.sessionId, result.value.clientMessageId, {
+              budgetMs: ORCHESTRATION_READINESS_TIMEOUT_MS
+            })
             .catch(() => undefined)
         )?.value.submission ?? result.value.submission)
       : result.value.submission
-  if (submission.dispatchState === 'accepted') {
-    return
+  if (submission.dispatchState === 'accepted' || submission.dispatchState === 'pending') {
+    return submission.dispatchState
   }
   if (submission.dispatchState === 'rejected') {
     // A rejection is a verdict, not a mystery: the preamble provably did not happen.
@@ -264,7 +266,9 @@ export async function sendStructuredWorkerPreamble(args: {
     // pending receipt; only this one lets the caller retry knowing nothing landed.
     throw new OrchestrationError(
       'dispatch_preamble_undelivered',
-      `The dispatch preamble was not delivered: ${submission.reason ?? 'no reason given'}.`
+      `The dispatch preamble was not delivered${
+        submission.rejection ? ` (${submission.rejection.kind})` : ''
+      }: ${reasonClause(submission.reason)}.`
     )
   }
   // Only `accepted` is an acknowledgement — the same rule the mail lane already applies. A thrown
@@ -273,7 +277,7 @@ export async function sendStructuredWorkerPreamble(args: {
   // `outcome_unknown` receipt whose nextCommands send the coordinator to look.
   throw new OrchestrationError(
     'operation_unknown',
-    `The dispatch preamble was submitted but not acknowledged (${submission.dispatchState}): ${submission.reason ?? 'no reason given'}.`
+    `The dispatch preamble was submitted but not acknowledged (${submission.dispatchState}): ${reasonClause(submission.reason)}.`
   )
 }
 
@@ -312,17 +316,17 @@ const REDRIVE_MAX_WAIT_MS = 2_000
  * idle worker — that is `deliverForHandle`, called when the message is enqueued and untouched
  * here. This is only the retry for mail already parked because the worker was busy.
  */
-function subscribeForRedrive(
+async function subscribeForRedrive(
   host: StructuredAgentSessionHost,
   sessionId: string,
   onJournalActivity: (sessionId: string) => void
-): () => void {
+): Promise<() => void> {
   const coalescer = createKeyedTrailingEdgeCoalescer(onJournalActivity, {
     flushMs: REDRIVE_FLUSH_MS,
     maxWaitMs: REDRIVE_MAX_WAIT_MS
   })
   try {
-    const unsubscribe = host.subscribe({
+    const unsubscribe = await host.subscribe({
       id: `orchestration:redrive:${sessionId}`,
       sessionId,
       emit: (event) => {
@@ -332,7 +336,7 @@ function subscribeForRedrive(
       }
     })
     // Disposal drops the pending timer rather than flushing it: every settlement reaches here, and
-    // a redrive that fires after the hold is gone would nudge a session no dispatch owns.
+    // a redrive that fires after it would nudge a session no dispatch owns.
     return () => {
       coalescer.dispose()
       unsubscribe()
diff --git a/src/main/runtime/rpc/methods/orchestration-worker-mode-opacity.test.ts b/src/main/runtime/rpc/methods/orchestration-worker-mode-opacity.test.ts
index aa8c7c58574f..9531e0f468b2 100644
--- a/src/main/runtime/rpc/methods/orchestration-worker-mode-opacity.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration-worker-mode-opacity.test.ts
@@ -12,7 +12,6 @@
  */
 
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
 import { OrcaRuntimeService } from '../../orca-runtime'
 import { OrchestrationDb } from '../../orchestration/db'
 import {
@@ -29,6 +28,12 @@ const STRUCTURED_HANDLE = 'structworker_worker'
 const TERMINAL_HANDLE = 'term_worker'
 
 const structuredPreambles: string[] = []
+// The session host the code under test reads; a structural fake, so no host type is claimed.
+const hostRef = vi.hoisted((): { current: unknown } => ({ current: null }))
+
+vi.mock('../../../native-chat/agent-session-wire/structured-agent-session-registry', () => ({
+  getStructuredAgentSessionHost: () => hostRef.current
+}))
 
 vi.mock('./orchestration/worker/worker-topology', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
@@ -42,6 +47,7 @@ vi.mock('./orchestration-structured-worker-session', async (importOriginal) => (
   ...(await importOriginal<Record<string, unknown>>()),
   sendStructuredWorkerPreamble: async (args: { preamble: string }) => {
     structuredPreambles.push(args.preamble)
+    return 'accepted'
   },
   releaseStructuredWorkerSession: () => {},
   discardStructuredWorkerSession: async () => {}
@@ -69,7 +75,7 @@ function installStructuredCoordinator(handle: string, sessionId: string): string
     worktreeId: WORKTREE,
     hostScope: { kind: 'local', hostId: 'local' }
   })
-  setStructuredAgentSessionHost({
+  hostRef.current = {
     hasSession: () => true,
     deps: {
       store: {
@@ -82,10 +88,12 @@ function installStructuredCoordinator(handle: string, sessionId: string): string
             deathEvidence: null,
             runtimeFence: 1
           }
-        })
+        }),
+        // No committed /clear: each session is its own lineage's root.
+        listRecords: () => []
       }
     }
-  } as never)
+  }
   return paneKey
 }
 
@@ -149,7 +157,7 @@ describe('a worker cannot tell which mode it is running in', () => {
 
   afterEach(() => {
     db.close()
-    setStructuredAgentSessionHost(null)
+    hostRef.current = null
     structuredWorkerIdentities.clear()
     vi.restoreAllMocks()
   })
@@ -253,10 +261,14 @@ describe('a worker cannot tell which mode it is running in', () => {
         source: 'terminal'
       })
 
-    expect(read).toThrow(/has no terminal output/)
+    const refusal = await read().then(
+      () => '',
+      (error: unknown) => (error instanceof Error ? error.message : String(error))
+    )
+    expect(refusal).toMatch(/has no terminal output/)
     // The refusal names a source that works instead of naming the worker's kind.
-    expect(read).toThrow(/--source auto or --source transcript/)
-    expect(read).not.toThrow(/structured/i)
+    expect(refusal).toMatch(/--source auto or --source transcript/)
+    expect(refusal).not.toMatch(/structured/i)
   })
 
   it('never claims a structured worker was checked for a human-answerable prompt', async () => {
diff --git a/src/main/runtime/rpc/methods/orchestration-worker-release-incarnation-fallback.test.ts b/src/main/runtime/rpc/methods/orchestration-worker-release-incarnation-fallback.test.ts
new file mode 100644
index 000000000000..e839c2e017d0
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration-worker-release-incarnation-fallback.test.ts
@@ -0,0 +1,534 @@
+import { afterEach, describe, expect, it, vi, type MockInstance } from 'vitest'
+import { ORCHESTRATION_METHODS } from './orchestration'
+import { eraseRpcMethods, type RpcContext } from '../core'
+import { OrchestrationDb } from '../../orchestration/db'
+import { OrcaRuntimeService } from '../../orca-runtime'
+import { completeWorkerTerminalRelease } from './orchestration/worker/worker-release-completion'
+
+describe('orchestration worker release incarnation fallback', () => {
+  let db: OrchestrationDb
+  let dbOpen = false
+  let runtime: OrcaRuntimeService
+  let ctx: RpcContext
+  let activeRunId: string
+  let inspectProcessLiveness: MockInstance<
+    OrcaRuntimeService['inspectTerminalProcessIncarnationLiveness']
+  >
+
+  const coordinatorPaneKey = 'tab_coord:aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa'
+  const workerPaneKey = 'tab_worker:bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb'
+
+  /** Fresh in-memory db and a fully-stubbed runtime for one worker-release scenario. */
+  function setup(): void {
+    db = new OrchestrationDb(':memory:')
+    dbOpen = true
+    runtime = new OrcaRuntimeService()
+    runtime.setOrchestrationDb(db)
+    inspectProcessLiveness = vi
+      .spyOn(runtime, 'inspectTerminalProcessIncarnationLiveness')
+      .mockResolvedValue('live')
+    vi.spyOn(runtime, 'getTerminalPaneKey').mockImplementation((handle) =>
+      handle === 'term_coord'
+        ? coordinatorPaneKey
+        : handle === 'term_worker' || handle === 'term_reminted'
+          ? workerPaneKey
+          : null
+    )
+    vi.spyOn(runtime, 'getTerminalProcessIncarnation').mockImplementation((handle) =>
+      handle === 'term_worker' || handle === 'term_reminted' ? 'runtime_test:term_worker:1' : null
+    )
+    vi.spyOn(runtime, 'getOrchestrationDispatchAuthority').mockImplementation((handle) =>
+      handle === 'term_worker' || handle === 'term_reminted'
+        ? // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This test fixture is deliberately shaped to exercise the private/runtime boundary.
+          ({
+            terminalHandle: handle,
+            paneKey: workerPaneKey,
+            processIncarnation: 'runtime_test:term_worker:1',
+            hostScope: { kind: 'local', hostId: 'local' }
+            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+          } as never)
+        : null
+    )
+    vi.spyOn(runtime, 'validateOrchestrationAgentLauncher').mockImplementation(() => {})
+    vi.spyOn(runtime, 'showTerminal').mockImplementation(
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+      async (handle) => ({ handle, worktreeId: 'repo::worktree', status: 'running' }) as never
+    )
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    vi.spyOn(runtime, 'showManagedTerminalWorkspace').mockResolvedValue({
+      id: 'repo::worktree'
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    } as never)
+    vi.spyOn(runtime, 'createTerminal').mockResolvedValue({
+      handle: 'term_worker',
+      worktreeId: 'repo::worktree',
+      title: 'worker'
+    })
+    vi.spyOn(runtime, 'waitForTerminal').mockResolvedValue({
+      handle: 'term_worker',
+      condition: 'tui-idle',
+      satisfied: true,
+      status: 'running',
+      exitCode: null
+    })
+    vi.spyOn(runtime, 'getTerminalOrchestrationCliCommand').mockReturnValue('orca')
+    vi.spyOn(runtime, 'sendTerminalAgentPrompt').mockResolvedValue({
+      handle: 'term_worker',
+      accepted: true,
+      bytesWritten: 1
+    })
+    vi.spyOn(runtime, 'isTerminalRunningAgent').mockResolvedValue(true)
+    vi.spyOn(runtime, 'getExactWorkerProviderSession').mockReturnValue(null)
+    vi.spyOn(runtime, 'readTerminal').mockResolvedValue({
+      handle: 'term_worker',
+      status: 'running',
+      tail: ['worker output line 1', 'worker output line 2'],
+      truncated: false,
+      nextCursor: '2'
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    })
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    vi.spyOn(runtime, 'closeTerminal').mockResolvedValue({
+      handle: 'term_worker',
+      tabId: 'tab-worker',
+      ptyKilled: true
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    } as never)
+    vi.spyOn(runtime, 'notifyMessageArrived').mockImplementation(() => {})
+    activeRunId = db.createRun({
+      objective: 'Release test Run',
+      coordinatorHandle: 'term_coord',
+      coordinatorPaneKey
+    }).id
+    ctx = { runtime }
+  }
+
+  afterEach(() => {
+    if (dbOpen) {
+      dbOpen = false
+      db.close()
+    }
+    vi.restoreAllMocks()
+  })
+
+  /** Look up a registered orchestration RPC method by name. */
+  function findMethod(name: string) {
+    const method = eraseRpcMethods(ORCHESTRATION_METHODS).find((m) => m.name === name)
+    if (!method) {
+      throw new Error(`Method not found: ${name}`)
+    }
+    return method
+  }
+
+  /** Parse a method's params and invoke its handler against the shared ctx. */
+  async function call(name: string, params: Record<string, unknown>) {
+    const method = findMethod(name)
+    const parsed = method.params ? method.params.parse(params) : undefined
+    return method.handler(parsed, ctx)
+  }
+
+  /** Start a ready worker on a fresh task off the coordinator terminal. */
+  async function startWorker(options: { terminal?: string } = {}): Promise<{
+    taskId: string
+    dispatchId: string
+  }> {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const task = db.createTask({ spec: 'release fixture task', runId: activeRunId })
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const result = (await call('orchestration.workerStart', {
+      task: task.id,
+      from: 'term_coord',
+      ...(options.terminal ? { terminal: options.terminal } : { agent: 'codex' })
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    })) as { dispatchId: string; state: string }
+    expect(result.state).toBe('ready')
+    return { taskId: task.id, dispatchId: result.dispatchId }
+  }
+
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+  /** Record the worker's report as settled — the precondition for release. */
+  function settle(taskId: string, dispatchId: string, outcome: 'succeeded' | 'failed'): void {
+    const settlement = db.settleWorkerReport({
+      taskId,
+      dispatchId,
+      outcome,
+      result: `worker ${outcome}`
+    })
+    expect(settlement.action).toBe('settled')
+  }
+
+  /** Start a worker and settle its report, the state a release acts on. */
+  async function startSettledWorker(
+    outcome: 'succeeded' | 'failed' = 'succeeded',
+    options: { terminal?: string } = {}
+  ): Promise<{ taskId: string; dispatchId: string }> {
+    const worker = await startWorker(options)
+    settle(worker.taskId, worker.dispatchId, outcome)
+    return worker
+  }
+
+  it('closes a live worker terminal whose durable handle no longer resolves but whose process incarnation still matches', async () => {
+    setup()
+    const { dispatchId } = await startSettledWorker()
+    // The durable handle stops resolving (renderer graph epoch bump / handle invalidation)...
+    vi.mocked(runtime.showTerminal).mockImplementation(async (handle) =>
+      handle === 'term_worker'
+        ? Promise.reject(new Error('terminal_handle_stale'))
+        : // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This test fixture is deliberately shaped to exercise the private/runtime boundary.
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+          ({ handle, worktreeId: 'repo::worktree', status: 'running' } as never)
+    )
+    // ...but the recorded process incarnation still names a live PTY, re-minted to a fresh handle.
+    const resolveByIncarnation = vi.fn().mockReturnValue('term_reminted')
+    vi.spyOn(runtime, 'resolveTerminalHandleByProcessIncarnation').mockImplementation(
+      resolveByIncarnation
+    )
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const receipt = (await call('orchestration.workerRelease', { dispatch: dispatchId })) as {
+      state: string
+      processAction: string
+    }
+
+    expect(receipt).toMatchObject({ state: 'released', processAction: 'closed_agent_terminal' })
+    expect(resolveByIncarnation).toHaveBeenCalledWith(
+      'runtime_test:term_worker:1',
+      JSON.stringify({ kind: 'local', hostId: 'local' })
+    )
+    // The close targeted exactly the re-minted live handle for that PTY, never the stale one.
+    expect(runtime.closeTerminal).toHaveBeenCalledTimes(1)
+    expect(runtime.closeTerminal).toHaveBeenCalledWith('term_reminted')
+    expect(db.getWorkerTerminalResourceByOwner(dispatchId)).toMatchObject({
+      ownership_state: 'released',
+      release_state: 'released'
+    })
+  })
+
+  it('stays release_unknown and closes nothing when the recorded incarnation no longer matches a live pty', async () => {
+    setup()
+    const { dispatchId } = await startSettledWorker()
+    vi.mocked(runtime.showTerminal).mockRejectedValue(new Error('terminal_handle_stale'))
+    // A reused ptyId now belongs to a different process: the incarnation mismatch refuses a close.
+    const resolveByIncarnation = vi.fn().mockReturnValue(null)
+    vi.spyOn(runtime, 'resolveTerminalHandleByProcessIncarnation').mockImplementation(
+      resolveByIncarnation
+    )
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const receipt = (await call('orchestration.workerRelease', { dispatch: dispatchId })) as {
+      state: string
+    }
+
+    expect(receipt.state).toBe('release_unknown')
+    expect(resolveByIncarnation).toHaveBeenCalledWith(
+      'runtime_test:term_worker:1',
+      JSON.stringify({ kind: 'local', hostId: 'local' })
+    )
+    expect(runtime.closeTerminal).not.toHaveBeenCalled()
+    expect(db.getWorkerTerminalResourceByOwner(dispatchId)?.release_state).toBe('unknown')
+  })
+
+  it('does not plain-settle an exited missing worker when the archive was never committed', async () => {
+    setup()
+    const { dispatchId } = await startSettledWorker()
+    vi.mocked(runtime.showTerminal).mockRejectedValue(new Error('terminal_handle_stale'))
+    const resolveByIncarnation = vi.fn().mockReturnValue(null)
+    vi.spyOn(runtime, 'resolveTerminalHandleByProcessIncarnation').mockImplementation(
+      resolveByIncarnation
+    )
+    inspectProcessLiveness.mockResolvedValue('exited')
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const receipt = (await call('orchestration.workerRelease', { dispatch: dispatchId })) as {
+      state: string
+      processAction: string
+    }
+
+    expect(receipt).toMatchObject({ state: 'release_unknown', processAction: 'none' })
+    expect(inspectProcessLiveness).toHaveBeenCalled()
+    expect(runtime.closeTerminal).not.toHaveBeenCalled()
+    expect(db.getWorkerTerminalResourceByOwner(dispatchId)).toMatchObject({
+      ownership_state: 'owned',
+      release_state: 'unknown'
+    })
+  })
+
+  it('settles released without a close when exited missing and an archive is already committed', async () => {
+    setup()
+    const { dispatchId } = await startSettledWorker()
+    const requested = db.requestWorkerTerminalRelease(dispatchId)
+    if (requested.disposition !== 'requested') {
+      throw new Error(`expected requested, got ${requested.disposition}`)
+    }
+    db.commitWorkerTerminalArchiveForRelease({
+      dispatchId,
+      resourceId: requested.resource.id,
+      kind: 'terminal_tail',
+      content: JSON.stringify({ lines: [] }),
+      archiveSource: 'terminal',
+      archiveStatus: 'empty'
+    })
+    vi.mocked(runtime.showTerminal).mockRejectedValue(new Error('terminal_handle_stale'))
+    const resolveByIncarnation = vi.fn().mockReturnValue(null)
+    vi.spyOn(runtime, 'resolveTerminalHandleByProcessIncarnation').mockImplementation(
+      resolveByIncarnation
+    )
+    inspectProcessLiveness.mockResolvedValue('exited')
+
+    const receipt = await completeWorkerTerminalRelease({
+      runtime,
+      db,
+      dispatchId,
+      resource: db.getWorkerTerminalResource(requested.resource.id)!,
+      mode: 'interactive'
+    })
+
+    expect(receipt).toMatchObject({ state: 'released', processAction: 'none' })
+    expect(runtime.closeTerminal).not.toHaveBeenCalled()
+    expect(db.getWorkerTerminalResourceByOwner(dispatchId)).toMatchObject({
+      ownership_state: 'released',
+      release_state: 'released'
+    })
+  })
+
+  it('reaches settleDead before the lease check when a gone worker is exited with no live authority', async () => {
+    // Without a committed archive settleDead retains; lease must not run first and force
+    // retained/identity_unproven. Disposition is release_unknown (interactive) after the retain.
+    setup()
+    const { dispatchId } = await startSettledWorker()
+    vi.mocked(runtime.showTerminal).mockRejectedValue(new Error('terminal_handle_stale'))
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const resolveByIncarnation = vi.fn().mockReturnValue(null)
+    vi.spyOn(runtime, 'resolveTerminalHandleByProcessIncarnation').mockImplementation(
+      resolveByIncarnation
+    )
+    vi.mocked(runtime.getOrchestrationDispatchAuthority).mockReturnValue(null)
+    inspectProcessLiveness.mockResolvedValue('exited')
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const receipt = (await call('orchestration.workerRelease', { dispatch: dispatchId })) as {
+      state: string
+      processAction: string
+    }
+
+    expect(receipt).toMatchObject({ state: 'release_unknown', processAction: 'none' })
+    expect(receipt.state).not.toBe('retained')
+    expect(inspectProcessLiveness).toHaveBeenCalled()
+    expect(runtime.closeTerminal).not.toHaveBeenCalled()
+  })
+
+  it('concedes release_unknown before the lease check when a gone worker has no live authority and liveness is unproven', async () => {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    setup()
+    const { dispatchId } = await startSettledWorker()
+    vi.mocked(runtime.showTerminal).mockRejectedValue(new Error('terminal_handle_stale'))
+    const resolveByIncarnation = vi.fn().mockReturnValue(null)
+    vi.spyOn(runtime, 'resolveTerminalHandleByProcessIncarnation').mockImplementation(
+      resolveByIncarnation
+    )
+    vi.mocked(runtime.getOrchestrationDispatchAuthority).mockReturnValue(null)
+    // Liveness is unresolvable/not-exited: the process may have been re-homed, so concede rather
+    // than retain or guess at a live process.
+    inspectProcessLiveness.mockResolvedValue('live')
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const receipt = (await call('orchestration.workerRelease', { dispatch: dispatchId })) as {
+      state: string
+    }
+
+    expect(receipt.state).toBe('release_unknown')
+    expect(receipt.state).not.toBe('retained')
+    expect(runtime.closeTerminal).not.toHaveBeenCalled()
+    expect(db.getWorkerTerminalResourceByOwner(dispatchId)?.release_state).toBe('unknown')
+  })
+
+  it('workerStop closes a live worker via the reminted handle when the durable handle is stale', async () => {
+    setup()
+    const { dispatchId } = await startWorker()
+    // The durable handle stops resolving, but the recorded incarnation still names a live PTY.
+    vi.mocked(runtime.showTerminal).mockImplementation(async (handle) =>
+      handle === 'term_worker'
+        ? Promise.reject(new Error('terminal_handle_stale'))
+        : // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This test fixture is deliberately shaped to exercise the private/runtime boundary.
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+          ({ handle, worktreeId: 'repo::worktree', status: 'running' } as never)
+    )
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const resolveByIncarnation = vi.fn().mockReturnValue('term_reminted')
+    vi.spyOn(runtime, 'resolveTerminalHandleByProcessIncarnation').mockImplementation(
+      resolveByIncarnation
+    )
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const receipt = (await call('orchestration.workerStop', { dispatch: dispatchId })) as {
+      processAction: string
+    }
+
+    expect(receipt.processAction).toBe('closed_agent_terminal')
+    // The kill targeted exactly the reminted live handle, never the stale durable one — closing
+    // the stale handle would throw terminal_handle_stale and leak the PTY.
+    expect(runtime.closeTerminal).toHaveBeenCalledTimes(1)
+    expect(runtime.closeTerminal).toHaveBeenCalledWith('term_reminted')
+  })
+
+  it('workerRead reads a live worker via the reminted handle when the durable handle is stale', async () => {
+    setup()
+    const { dispatchId } = await startWorker()
+    vi.mocked(runtime.showTerminal).mockImplementation(
+      async (handle) =>
+        handle === 'term_worker'
+          ? Promise.reject(new Error('terminal_handle_stale'))
+          : // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This test fixture is deliberately shaped to exercise the private/runtime boundary.
+            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+            ({ handle, worktreeId: 'repo::worktree', status: 'running' } as never)
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    )
+    const resolveByIncarnation = vi.fn().mockReturnValue('term_reminted')
+    vi.spyOn(runtime, 'resolveTerminalHandleByProcessIncarnation').mockImplementation(
+      resolveByIncarnation
+    )
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const output = (await call('orchestration.workerRead', { dispatch: dispatchId })) as {
+      terminal?: { tail: string[] }
+    }
+
+    // Both the exact-session probe and the terminal read addressed the reminted handle.
+    expect(runtime.getExactWorkerProviderSession).toHaveBeenCalledWith(
+      'term_reminted',
+      expect.any(Number)
+    )
+    expect(runtime.readTerminal).toHaveBeenCalledWith('term_reminted', expect.anything())
+    expect(output.terminal?.tail).toEqual(['worker output line 1', 'worker output line 2'])
+  })
+
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+  it('recovery-mode: defers when exited missing has no archive rather than plain-settling', async () => {
+    // Proof of death still runs settleDead first; when it retains (no archive), recovery must
+    // stay release_pending — not plain-settle, not unknown.
+    setup()
+    const { dispatchId } = await startSettledWorker()
+    vi.mocked(runtime.showTerminal).mockRejectedValue(new Error('terminal_handle_stale'))
+    const resolveByIncarnation = vi.fn().mockReturnValue(null)
+    vi.spyOn(runtime, 'resolveTerminalHandleByProcessIncarnation').mockImplementation(
+      resolveByIncarnation
+    )
+    inspectProcessLiveness.mockResolvedValue('exited')
+    const requested = db.requestWorkerTerminalRelease(dispatchId)
+    if (requested.disposition !== 'requested') {
+      throw new Error(`expected a requested release, got ${requested.disposition}`)
+    }
+
+    const receipt = await completeWorkerTerminalRelease({
+      runtime,
+      db,
+      dispatchId,
+      resource: requested.resource,
+      mode: 'recovery'
+    })
+
+    expect(receipt).toMatchObject({ state: 'release_pending', processAction: 'none' })
+    expect(runtime.closeTerminal).not.toHaveBeenCalled()
+    expect(db.getWorkerTerminalResourceByOwner(dispatchId)).toMatchObject({
+      ownership_state: 'owned',
+      release_state: 'requested'
+    })
+  })
+
+  it('recovery-mode: settles released before the defer when exited missing already has an archive', async () => {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    setup()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const { dispatchId } = await startSettledWorker()
+    vi.mocked(runtime.showTerminal).mockRejectedValue(new Error('terminal_handle_stale'))
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const resolveByIncarnation = vi.fn().mockReturnValue(null)
+    vi.spyOn(runtime, 'resolveTerminalHandleByProcessIncarnation').mockImplementation(
+      resolveByIncarnation
+    )
+    inspectProcessLiveness.mockResolvedValue('exited')
+    const requested = db.requestWorkerTerminalRelease(dispatchId)
+    if (requested.disposition !== 'requested') {
+      throw new Error(`expected a requested release, got ${requested.disposition}`)
+    }
+    db.commitWorkerTerminalArchiveForRelease({
+      dispatchId,
+      resourceId: requested.resource.id,
+      kind: 'terminal_tail',
+      content: JSON.stringify({ lines: [] }),
+      archiveSource: 'terminal',
+      archiveStatus: 'empty'
+    })
+
+    const receipt = await completeWorkerTerminalRelease({
+      runtime,
+      db,
+      dispatchId,
+      resource: db.getWorkerTerminalResource(requested.resource.id)!,
+      mode: 'recovery'
+    })
+
+    expect(receipt).toMatchObject({ state: 'released', processAction: 'none' })
+    expect(runtime.closeTerminal).not.toHaveBeenCalled()
+    expect(db.getWorkerTerminalResourceByOwner(dispatchId)).toMatchObject({
+      ownership_state: 'released',
+      release_state: 'released'
+    })
+  })
+
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+  it('recovery-mode: defers release_pending when liveness is unverifiable rather than provably exited', async () => {
+    setup()
+    const { dispatchId } = await startSettledWorker()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    vi.mocked(runtime.showTerminal).mockRejectedValue(new Error('terminal_handle_stale'))
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const resolveByIncarnation = vi.fn().mockReturnValue(null)
+    vi.spyOn(runtime, 'resolveTerminalHandleByProcessIncarnation').mockImplementation(
+      resolveByIncarnation
+    )
+    // Not a death certificate: inventory may still be incomplete, so recovery must defer.
+    inspectProcessLiveness.mockResolvedValue('unverifiable')
+    const requested = db.requestWorkerTerminalRelease(dispatchId)
+    if (requested.disposition !== 'requested') {
+      throw new Error(`expected a requested release, got ${requested.disposition}`)
+    }
+
+    const receipt = await completeWorkerTerminalRelease({
+      runtime,
+      db,
+      dispatchId,
+      resource: requested.resource,
+      mode: 'recovery'
+    })
+
+    expect(receipt.state).toBe('release_pending')
+    expect(runtime.closeTerminal).not.toHaveBeenCalled()
+    expect(db.getWorkerTerminalResourceByOwner(dispatchId)?.release_state).not.toBe('released')
+  })
+})
diff --git a/src/main/runtime/rpc/methods/orchestration-worker-release-reap-fixed.func.test.ts b/src/main/runtime/rpc/methods/orchestration-worker-release-reap-fixed.func.test.ts
new file mode 100644
index 000000000000..579f37eaf9e3
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration-worker-release-reap-fixed.func.test.ts
@@ -0,0 +1,358 @@
+// PRB-0219 / upstream #18737 — FUNCTIONAL (integration) reproduction of the steady-state
+// worker-release reap LEAK.
+//
+// This is the "functional/integration" tier of the PRB-0219 test strategy. It wires the REAL
+// orchestration RPC surface (orchestration.workerStart / workerRelease / workerList), the REAL
+// OrchestrationDb, and the REAL release completion + observation modules against a fake runtime
+// that faithfully models the two identity planes involved in the bug:
+//
+//   * VOLATILE, epoch-fenced handle table  — `handleTable` keyed by terminal handle, each entry
+//     stamped with the `rendererGraphEpoch` at which it was issued. `showTerminal` resolves a
+//     handle ONLY while its stamped epoch matches the current epoch (mirrors getLiveLeafForHandle
+//     throwing 'terminal_handle_stale' on a rendererGraphEpoch bump). A relay reconnect / renderer
+//     remount on headless serve bumps the epoch.
+//   * DURABLE, incarnation-addressed process table — `ptysById` keyed by the ptyId embedded in the
+//     worker's persisted process_incarnation (`${ptyId}:${incarnationId}`). The pty stays LIVE
+//     across an epoch bump; nothing about the graph epoch kills the process.
+//
+// The bug (mechanism): when the epoch bumps, the durable db handle stops resolving through
+// showTerminal WHILE THE PTY IS STILL ALIVE. inspectWorkerTerminal swallows the throw and reports
+// `missing`; completeWorkerTerminalRelease then commits `release_unknown` and returns WITHOUT ever
+// calling runtime.closeTerminal — so the process/PTY leaks. On mtl-02 those orphans accumulate in
+// the orca-serve@factory cgroup until TasksMax=4096 is hit and Bun/omp abort() on EAGAIN.
+//
+// The observable leak signal asserted here: state 'release_unknown' + processAction 'none' +
+// closeTerminal NEVER called + the pty STILL alive in ptysById + worker-list terminalState stuck
+// on 'release_unknown' (never 'released').
+
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { ORCHESTRATION_METHODS } from './orchestration'
+import { eraseRpcMethods, type RpcContext } from '../core'
+import { OrchestrationDb } from '../../orchestration/db'
+import { OrcaRuntimeService } from '../../orca-runtime'
+
+describe('PRB-0219 worker-release reap FIX (functional verification)', () => {
+  let db: OrchestrationDb
+  let dbOpen = false
+  let runtime: OrcaRuntimeService
+  let ctx: RpcContext
+  let activeRunId: string
+
+  const coordinatorPaneKey = 'tab_coord:aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa'
+  const workerPaneKey = 'tab_worker:bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb'
+
+  // Dispatch/automation ptyId shape: `${repoId}::${worktreePath}@@${suffix}` (executionHostId:null).
+  const PTY_ID = 'repo-7f3a::/data/wt/factory-task-1@@a1b2c3d4'
+  const INCARNATION_ID = 1
+  const PROCESS_INCARNATION = `${PTY_ID}:${INCARNATION_ID}`
+
+  // ---- fake runtime process/handle planes (module-level so spies can mutate them) ----
+  let ptysById: Map<string, { incarnationId: number; alive: boolean }>
+  let handleTable: Map<string, { ptyId: string; epoch: number }>
+  let rendererGraphEpoch: number
+  let closedPtyIds: string[]
+
+  /** Resolve a handle to its live pty only while its stamped graph epoch is current. */
+  function resolveHandleToLivePty(
+    handle: string
+  ): { ptyId: string; pty: { incarnationId: number; alive: boolean } } | null {
+    const entry = handleTable.get(handle)
+    if (!entry) {
+      return null
+    }
+    if (entry.epoch !== rendererGraphEpoch) {
+      // rendererGraphEpoch fence: the durable handle no longer resolves to a live leaf.
+      return null
+    }
+    const pty = ptysById.get(entry.ptyId)
+    if (!pty || !pty.alive) {
+      return null
+    }
+    return { ptyId: entry.ptyId, pty }
+  }
+
+  /** Wire the real RPC surface and db against the two-plane fake runtime. */
+  function setup(): void {
+    ptysById = new Map([
+      ['coord-pty', { incarnationId: 1, alive: true }],
+      [PTY_ID, { incarnationId: INCARNATION_ID, alive: true }]
+    ])
+    handleTable = new Map([
+      ['term_coord', { ptyId: 'coord-pty', epoch: 0 }],
+      ['term_worker', { ptyId: PTY_ID, epoch: 0 }]
+    ])
+    rendererGraphEpoch = 0
+    closedPtyIds = []
+
+    db = new OrchestrationDb(':memory:')
+    dbOpen = true
+    runtime = new OrcaRuntimeService()
+    runtime.setOrchestrationDb(db)
+
+    // Incarnation-addressed liveness probe: reads the DURABLE plane, so it stays 'live' across the
+    // epoch bump (the process really is still running). Matches the real asymmetry.
+    vi.spyOn(runtime, 'inspectTerminalProcessIncarnationLiveness').mockImplementation(
+      async (incarnation: string) => {
+        const idx = incarnation.lastIndexOf(':')
+        const ptyId = incarnation.slice(0, idx)
+        const pty = ptysById.get(ptyId)
+        return pty?.alive ? 'live' : 'exited'
+      }
+    )
+
+    // The incarnation-addressed re-resolution primitive the fix adds. Present here as a spy so the
+    // same harness proves BOTH tiers: pre-fix completion never calls it (leak); post-fix completion
+    // calls it to remint a live handle (reap). Fence: EXACT incarnationId match only.
+    vi.spyOn(runtime, 'resolveTerminalHandleByProcessIncarnation').mockImplementation(
+      (incarnation: string): string | null => {
+        const idx = incarnation.lastIndexOf(':')
+        const ptyId = incarnation.slice(0, idx)
+        const inc = Number(incarnation.slice(idx + 1))
+        const pty = ptysById.get(ptyId)
+        if (!pty || !pty.alive) {
+          return null
+        }
+        if (pty.incarnationId !== inc) {
+          // Fence: a reused ptyId with a different incarnation must NOT resolve.
+          return null
+        }
+        // Remint a live handle at the current graph epoch.
+        handleTable.set('term_reminted', { ptyId, epoch: rendererGraphEpoch })
+        return 'term_reminted'
+      }
+    )
+
+    // Identity plane (durable) — answers for the original AND any reminted handle. Independent of
+    // the graph epoch, exactly like the real getTerminal* accessors that read dispatch authority.
+    const knownWorkerHandle = (handle: string): boolean =>
+      handle === 'term_worker' || handle === 'term_reminted'
+    vi.spyOn(runtime, 'getTerminalPaneKey').mockImplementation((handle) =>
+      handle === 'term_coord'
+        ? coordinatorPaneKey
+        : knownWorkerHandle(handle)
+          ? workerPaneKey
+          : null
+    )
+    vi.spyOn(runtime, 'getTerminalProcessIncarnation').mockImplementation((handle) =>
+      knownWorkerHandle(handle) ? PROCESS_INCARNATION : null
+    )
+    vi.spyOn(runtime, 'getOrchestrationDispatchAuthority').mockImplementation((handle) =>
+      knownWorkerHandle(handle)
+        ? // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This test fixture is deliberately shaped to exercise the private/runtime boundary.
+          ({
+            terminalHandle: handle,
+            paneKey: workerPaneKey,
+            processIncarnation: PROCESS_INCARNATION,
+            hostScope: { kind: 'local', hostId: 'local' }
+            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+          } as never)
+        : null
+    )
+    vi.spyOn(runtime, 'validateOrchestrationAgentLauncher').mockImplementation(() => {})
+
+    // Volatile handle resolution — epoch-fenced. Throws 'terminal_handle_stale' once the epoch
+    // moves past the epoch at which the handle was issued.
+    vi.spyOn(runtime, 'showTerminal').mockImplementation(async (handle) => {
+      if (!resolveHandleToLivePty(handle)) {
+        throw new Error('terminal_handle_stale')
+      }
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+      return { handle, worktreeId: 'repo::worktree', status: 'running' } as never
+    })
+
+    // The reap: closing a handle kills exactly the pty it resolves to.
+    vi.spyOn(runtime, 'closeTerminal').mockImplementation(async (handle) => {
+      const live = resolveHandleToLivePty(handle)
+      if (!live) {
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+        return { handle, tabId: null, ptyKilled: false } as never
+      }
+      live.pty.alive = false
+      ptysById.delete(live.ptyId)
+      closedPtyIds.push(live.ptyId)
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+      return { handle, tabId: `tab:${live.ptyId}`, ptyKilled: true } as never
+    })
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // Remaining runtime surface required to start + settle a worker (mirrors the unit harness).
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    vi.spyOn(runtime, 'showManagedTerminalWorkspace').mockResolvedValue({
+      id: 'repo::worktree'
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    } as never)
+    vi.spyOn(runtime, 'createTerminal').mockResolvedValue({
+      handle: 'term_worker',
+      worktreeId: 'repo::worktree',
+      title: 'worker'
+    })
+    vi.spyOn(runtime, 'waitForTerminal').mockResolvedValue({
+      handle: 'term_worker',
+      condition: 'tui-idle',
+      satisfied: true,
+      status: 'running',
+      exitCode: null
+    })
+    vi.spyOn(runtime, 'getTerminalOrchestrationCliCommand').mockReturnValue('orca')
+    vi.spyOn(runtime, 'sendTerminalAgentPrompt').mockResolvedValue({
+      handle: 'term_worker',
+      accepted: true,
+      bytesWritten: 1
+    })
+    vi.spyOn(runtime, 'isTerminalRunningAgent').mockResolvedValue(true)
+    vi.spyOn(runtime, 'getExactWorkerProviderSession').mockReturnValue(null)
+    vi.spyOn(runtime, 'readTerminal').mockResolvedValue({
+      handle: 'term_worker',
+      status: 'running',
+      tail: ['worker output line 1', 'worker output line 2'],
+      truncated: false,
+      nextCursor: '2'
+    })
+    vi.spyOn(runtime, 'notifyMessageArrived').mockImplementation(() => {})
+
+    activeRunId = db.createRun({
+      objective: 'PRB-0219 reap leak fixture',
+      coordinatorHandle: 'term_coord',
+      coordinatorPaneKey
+    }).id
+    ctx = { runtime }
+  }
+
+  afterEach(() => {
+    if (dbOpen) {
+      dbOpen = false
+      db.close()
+    }
+    vi.restoreAllMocks()
+  })
+
+  /** Look up a registered orchestration RPC method by name. */
+  function findMethod(name: string) {
+    const method = eraseRpcMethods(ORCHESTRATION_METHODS).find((m) => m.name === name)
+    if (!method) {
+      throw new Error(`Method not found: ${name}`)
+    }
+    return method
+  }
+
+  /** Parse a method's params and invoke its handler against the shared ctx. */
+  async function call(name: string, params: Record<string, unknown>) {
+    const method = findMethod(name)
+    const parsed = method.params ? method.params.parse(params) : undefined
+    return method.handler(parsed, ctx)
+  }
+
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+  /** Start a worker and settle its report, the state a release acts on. */
+  async function startSettledWorker(): Promise<{ taskId: string; dispatchId: string }> {
+    const task = db.createTask({ spec: 'reap-leak fixture task', runId: activeRunId })
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const result = (await call('orchestration.workerStart', {
+      task: task.id,
+      from: 'term_coord',
+      agent: 'codex'
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    })) as { dispatchId: string; state: string }
+    expect(result.state).toBe('ready')
+    const settlement = db.settleWorkerReport({
+      taskId: task.id,
+      dispatchId: result.dispatchId,
+      outcome: 'succeeded',
+      result: 'worker succeeded'
+    })
+    expect(settlement.action).toBe('settled')
+    return { taskId: task.id, dispatchId: result.dispatchId }
+  }
+
+  /** The terminalState workerList projects for a dispatch, or null. */
+  async function workerTerminalState(dispatchId: string): Promise<string | null> {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const listed = (await call('orchestration.workerList', { run: activeRunId })) as {
+      workers: { dispatchId: string; terminalState: string | null }[]
+    }
+    return listed.workers.find((w) => w.dispatchId === dispatchId)?.terminalState ?? null
+  }
+
+  it('REAP (fixed): a rendererGraphEpoch bump strands the durable handle, but the incarnation fallback remints a live handle and reaps the process', async () => {
+    setup()
+    const { dispatchId } = await startSettledWorker()
+    const resource = db.getWorkerTerminalResourceByOwner(dispatchId)
+    expect(resource?.process_incarnation).toBe(PROCESS_INCARNATION)
+
+    // Relay reconnect / renderer remount bumps the graph epoch: the durable handle goes stale
+    // while the PTY stays alive.
+    rendererGraphEpoch = 1
+    await expect(runtime.showTerminal('term_worker')).rejects.toThrow('terminal_handle_stale')
+    expect(ptysById.get(PTY_ID)?.alive).toBe(true)
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const receipt = (await call('orchestration.workerRelease', { dispatch: dispatchId })) as {
+      state: string
+      processAction: string
+    }
+
+    // The fix: inspectWorkerTerminal re-resolved the live PTY by process incarnation, reminted a
+    // handle, and completion closed THAT handle — the process is actually reaped.
+    expect(receipt.state).toBe('released')
+    expect(receipt.processAction).toBe('closed_agent_terminal')
+    expect(runtime.closeTerminal).toHaveBeenCalledWith('term_reminted')
+    expect(closedPtyIds).toEqual([PTY_ID])
+    expect(ptysById.has(PTY_ID)).toBe(false)
+    expect(await workerTerminalState(dispatchId)).toBe('released')
+  })
+
+  it('CONTROL: with the graph epoch intact the same release reaps exactly that PTY', async () => {
+    setup()
+    const { dispatchId } = await startSettledWorker()
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const receipt = (await call('orchestration.workerRelease', { dispatch: dispatchId })) as {
+      state: string
+      processAction: string
+    }
+
+    expect(receipt.state).toBe('released')
+    expect(receipt.processAction).toBe('closed_agent_terminal')
+    expect(closedPtyIds).toEqual([PTY_ID])
+    expect(ptysById.has(PTY_ID)).toBe(false)
+    expect(await workerTerminalState(dispatchId)).toBe('released')
+  })
+
+  it('FENCE (fixed): a reused ptyId carrying a different incarnation must NOT remint or close — stays release_unknown', async () => {
+    setup()
+    const { dispatchId } = await startSettledWorker()
+
+    // The graph epoch bumps AND the ptyId has been reused by a different process (incarnation 2),
+    // while the worker's recorded incarnation is still 1. The exact-incarnation fence must refuse.
+    rendererGraphEpoch = 1
+    const reused = ptysById.get(PTY_ID)
+    if (reused) {
+      reused.incarnationId = 2
+    }
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Test fixture crosses a private/runtime boundary with a verified shape.
+    const receipt = (await call('orchestration.workerRelease', { dispatch: dispatchId })) as {
+      state: string
+      processAction: string
+    }
+
+    expect(receipt.state).toBe('release_unknown')
+    expect(receipt.processAction).toBe('none')
+    expect(runtime.closeTerminal).not.toHaveBeenCalled()
+    // The other lane's live process is left untouched (never reaped by an over-broad match).
+    expect(ptysById.get(PTY_ID)?.alive).toBe(true)
+    expect(await workerTerminalState(dispatchId)).toBe('release_unknown')
+  })
+})
diff --git a/src/main/runtime/rpc/methods/orchestration-worker-start-mode-selection.test.ts b/src/main/runtime/rpc/methods/orchestration-worker-start-mode-selection.test.ts
index 52cf3579016c..a2beea9ea05c 100644
--- a/src/main/runtime/rpc/methods/orchestration-worker-start-mode-selection.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration-worker-start-mode-selection.test.ts
@@ -30,7 +30,7 @@ vi.mock('./orchestration/federation/federated-worker-start', () => ({
 }))
 vi.mock('./orchestration-structured-worker-session', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
-  sendStructuredWorkerPreamble: async () => {},
+  sendStructuredWorkerPreamble: async () => 'accepted',
   releaseStructuredWorkerSession: () => {},
   discardStructuredWorkerSession: async () => {}
 }))
diff --git a/src/main/runtime/rpc/methods/orchestration/federation/federation.ts b/src/main/runtime/rpc/methods/orchestration/federation/federation.ts
index 6f7a1bba0779..067f583e37b4 100644
--- a/src/main/runtime/rpc/methods/orchestration/federation/federation.ts
+++ b/src/main/runtime/rpc/methods/orchestration/federation/federation.ts
@@ -114,6 +114,7 @@ export const ORCHESTRATION_FEDERATION_ATTACH_METHODS = [
             observeSetupCompletion: true,
             createdWithAgent: agent as TuiAgent,
             startupAgent: agent as TuiAgent,
+            startupLaunchSource: 'orchestration',
             ...(launch.preferences ? { startupLaunchPreferences: launch.preferences } : {}),
             activate: false,
             lineage: { noParent: true }
@@ -185,6 +186,7 @@ export const ORCHESTRATION_FEDERATION_ATTACH_METHODS = [
               // Why: agent ids are not shell commands (`cursor` is the desktop app,
               // its CLI is `cursor-agent`); resolve through the TUI agent config.
               startupAgent: agent as TuiAgent,
+              launchSource: 'orchestration',
               ...(launch.preferences ? { launchPreferences: launch.preferences } : {}),
               title: `worker-${params.taskId}`,
               presentation: 'background'
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/check-methods.ts b/src/main/runtime/rpc/methods/orchestration/messaging/check-methods.ts
index ee52efed6b93..b9aa437e1794 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/check-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/check-methods.ts
@@ -89,7 +89,8 @@ export const ORCHESTRATION_CHECK_METHODS = [
           typeFilter,
           signal,
           activeDispatch,
-          remoteAttachment
+          remoteAttachment,
+          recordMutationReceipt
         })
       }
       const consumingCheck = params.peek !== true && params.all !== true && params.unread !== false
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/check-run-pending-mail.ts b/src/main/runtime/rpc/methods/orchestration/messaging/check-run-pending-mail.ts
new file mode 100644
index 000000000000..5d453616f355
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/check-run-pending-mail.ts
@@ -0,0 +1,140 @@
+import type { MessageType, OrchestrationDb, RunRow } from '../../../../orchestration/db'
+import type { OrcaRuntimeService } from '../../../../orca-runtime'
+import { interruptedAcknowledgedCheck } from '../routing'
+import { checkWorkerMailbox } from './check-worker'
+import { currentDispatchAssigneeRun } from './recipient-routing'
+import { callerHoldsDispatchPane, dispatchFenced } from './dispatch-mailbox-fence'
+import { orchestrationCallerIdentity } from '../runs/run-scope'
+import type { OrchestrationSessionCaller } from '../../../../orchestration/orchestration-caller-identity'
+import type { CheckParams } from '../schemas'
+import type { z } from 'zod'
+
+export async function checkRunPendingMail(args: {
+  params: z.infer<typeof CheckParams>
+  runtime: OrcaRuntimeService
+  db: OrchestrationDb
+  run: RunRow
+  handle: string
+  paneKey: string | undefined
+  callerSession: OrchestrationSessionCaller | undefined
+  typeFilter: MessageType[] | undefined
+  signal: AbortSignal | undefined
+  revalidateConsumer: () => void
+  recordMutationReceipt: ((receipt: unknown) => void) | undefined
+}): Promise<{ acknowledged?: string; result?: unknown }> {
+  const {
+    params,
+    runtime,
+    db,
+    run,
+    handle,
+    paneKey,
+    typeFilter,
+    signal,
+    revalidateConsumer,
+    recordMutationReceipt
+  } = args
+  const generation = run.consumer_generation
+  const address = `run:${run.id}`
+  // Drain pre-bind mail through its original Dispatch owner, never by changing its Run.
+  const residual = !params.run ? db.getActiveDispatchForIdentity(handle, paneKey) : undefined
+  const caller = orchestrationCallerIdentity(runtime, {
+    handle,
+    paneKey,
+    session: args.callerSession
+  })
+  const residualAck =
+    params.ack &&
+    residual &&
+    db.getDeliveryRaw(params.ack)?.mailbox_handle === `dispatch:${residual.id}`
+      ? params.ack
+      : undefined
+  const acknowledgeRun = () =>
+    params.ack
+      ? db.acknowledgeRunDelivery({
+          runId: run.id,
+          consumerGeneration: generation,
+          deliveryId: params.ack
+        })
+      : undefined
+  let acknowledged: { delivery: { id: string } } | undefined = residualAck
+    ? undefined
+    : acknowledgeRun()
+  const recordAcknowledged = () => {
+    if (acknowledged) {
+      recordMutationReceipt?.(
+        interruptedAcknowledgedCheck(run.id, acknowledged.delivery.id, 'outcome_unknown')
+      )
+    }
+  }
+  recordAcknowledged()
+  if (
+    residual &&
+    residual.run_id !== run.id &&
+    (residual.assignee_orca_session_id === null ||
+      residual.assignee_orca_session_id === caller.orcaSessionId) &&
+    callerHoldsDispatchPane(residual, paneKey) &&
+    currentDispatchAssigneeRun(runtime, db, residual)?.id === run.id &&
+    (residualAck || !db.hasOutstandingMailboxDelivery(address))
+  ) {
+    const result = await checkWorkerMailbox({
+      params: { ...params, ack: residualAck, wait: false },
+      runtime,
+      db,
+      handle,
+      paneKey,
+      typeFilter,
+      signal,
+      activeDispatch: residual,
+      remoteAttachment: undefined,
+      wakeTypes: params.wait ? typeFilter : undefined,
+      // Accept the original owner's ack without creating a batch ahead of Run replay.
+      deferDelivery: () => db.hasOutstandingMailboxDelivery(address),
+      revalidateConsumer: () => {
+        revalidateConsumer()
+        const current = db.getActiveDispatchForIdentity(handle, paneKey)
+        if (
+          !current ||
+          current.id !== residual.id ||
+          currentDispatchAssigneeRun(runtime, db, current)?.id !== run.id
+        ) {
+          throw dispatchFenced()
+        }
+      },
+      recordMutationReceipt
+    })
+    if (result?.acknowledged) {
+      acknowledged = { delivery: { id: result.acknowledged } }
+    }
+    recordAcknowledged()
+    try {
+      revalidateConsumer()
+    } catch (error) {
+      if (acknowledged) {
+        return {
+          acknowledged: acknowledged.delivery.id,
+          result: interruptedAcknowledgedCheck(run.id, acknowledged.delivery.id, 'consumer_fenced')
+        }
+      }
+      throw error
+    }
+    const inspectingHistory =
+      params.all === true || (params.unread === false && params.peek !== true)
+    if (
+      result &&
+      result.count > 0 &&
+      (!inspectingHistory || db.getUnreadMessages(`dispatch:${residual.id}`).length > 0)
+    ) {
+      return {
+        acknowledged: acknowledged?.delivery.id,
+        result: { ...result, acknowledged: acknowledged?.delivery.id ?? null }
+      }
+    }
+  }
+
+  // A supplied Delivery outside this caller's current Dispatch must still fail acknowledgment.
+  if (params.ack && !acknowledged) {
+    acknowledgeRun()
+  }
+  return { acknowledged: acknowledged?.delivery.id }
+}
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/check-run.ts b/src/main/runtime/rpc/methods/orchestration/messaging/check-run.ts
index 248d79ea68e1..c48141cf7ddb 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/check-run.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/check-run.ts
@@ -10,6 +10,7 @@ import { resolveRunScope } from '../runs/run-scope'
 import type { CheckParams } from '../schemas'
 import type { z } from 'zod'
 import type { OrchestrationSessionCaller } from '../../../../orchestration/orchestration-caller-identity'
+import { checkRunPendingMail } from './check-run-pending-mail'
 
 type CheckParamsInput = z.infer<typeof CheckParams>
 
@@ -38,8 +39,7 @@ export async function checkRunMailbox(args: {
     signal,
     legacyCoordinatorRunId,
     revalidateLegacyCoordinator,
-    orchestrationCompatibilityEvidence,
-    recordMutationReceipt
+    orchestrationCompatibilityEvidence
   } = args
   const routeDirectSnapshot = async (
     runId: string,
@@ -72,41 +72,45 @@ export async function checkRunMailbox(args: {
       db.routeUnreadDirectMessagesToRunMailbox(run.id, coordinatorHandle, throughSequence)
     )
   }
-  revalidateLegacyCoordinator?.()
-  const currentRun = resolveRunScope(runtime, {
-    runId: run.id,
-    callerTerminalHandle: handle,
-    callerPaneKey: paneKey,
-    callerSession,
-    requireCurrentConsumer: true,
-    legacyCoordinatorRunId,
-    callerEvidence: orchestrationCompatibilityEvidence
-  })
-  if (currentRun.consumer_generation !== generation) {
-    throw new OrchestrationError(
-      'consumer_fenced',
-      'This mailbox consumer was replaced while routing pending mail.'
-    )
+  const revalidateConsumer = (): void => {
+    revalidateLegacyCoordinator?.()
+    const currentRun = resolveRunScope(runtime, {
+      runId: run.id,
+      callerTerminalHandle: handle,
+      callerPaneKey: paneKey,
+      callerSession,
+      requireCurrentConsumer: true,
+      legacyCoordinatorRunId,
+      callerEvidence: orchestrationCompatibilityEvidence
+    })
+    if (currentRun.consumer_generation !== generation) {
+      throw new OrchestrationError(
+        'consumer_fenced',
+        'This mailbox consumer was replaced while routing pending mail.'
+      )
+    }
   }
+  revalidateConsumer()
 
-  const acknowledged = params.ack
-    ? db.acknowledgeRunDelivery({
-        runId: run.id,
-        consumerGeneration: generation,
-        deliveryId: params.ack
-      })
-    : undefined
-  if (acknowledged) {
-    recordMutationReceipt?.(
-      interruptedAcknowledgedCheck(run.id, acknowledged.delivery.id, 'outcome_unknown')
-    )
+  const pending = await checkRunPendingMail({ ...args, run, revalidateConsumer })
+  try {
+    revalidateConsumer()
+  } catch (error) {
+    if (pending.acknowledged) {
+      return interruptedAcknowledgedCheck(run.id, pending.acknowledged, 'consumer_fenced')
+    }
+    throw error
   }
+  if (pending.result) {
+    return pending.result
+  }
+  const acknowledged = pending.acknowledged
   if (params.all || (params.unread === false && !params.peek)) {
     const messages = db.getRunMailboxHistory(run.id, 100, typeFilter)
     const result = {
       messages: exposeMessages(messages),
       count: messages.length,
-      acknowledged: acknowledged?.delivery.id ?? null
+      acknowledged: acknowledged ?? null
     }
     if (params.format || params.inject) {
       return {
@@ -122,7 +126,7 @@ export async function checkRunMailbox(args: {
     runId: run.id,
     messages: exposeMessages(messages),
     count: messages.length,
-    acknowledged: acknowledged?.delivery.id ?? null,
+    acknowledged: acknowledged ?? null,
     ...(params.format || params.inject
       ? { formatted: messages.map(formatMessageBanner).join('\n\n') }
       : {})
@@ -142,7 +146,7 @@ export async function checkRunMailbox(args: {
       messages: exposeMessages(current.messages),
       count: current.messages.length,
       replayed: current.replayed,
-      acknowledged: acknowledged?.delivery.id ?? null,
+      acknowledged: acknowledged ?? null,
       timedOut: false,
       cancelled: false,
       connectionLost: false,
@@ -160,7 +164,7 @@ export async function checkRunMailbox(args: {
       deliveryId: null,
       messages: [],
       count: 0,
-      acknowledged: acknowledged?.delivery.id ?? null,
+      acknowledged: acknowledged ?? null,
       timedOut: false,
       cancelled: false,
       connectionLost: false
@@ -174,17 +178,17 @@ export async function checkRunMailbox(args: {
     exclusive: true
   })
   try {
-    revalidateLegacyCoordinator?.()
+    revalidateConsumer()
   } catch (error) {
     if (!acknowledged) {
       throw error
     }
-    return interruptedAcknowledgedCheck(run.id, acknowledged.delivery.id, 'consumer_fenced')
+    return interruptedAcknowledgedCheck(run.id, acknowledged, 'consumer_fenced')
   }
   const latestRun = db.getRun(run.id)
   if (!latestRun || latestRun.consumer_generation !== generation) {
     if (acknowledged) {
-      return interruptedAcknowledgedCheck(run.id, acknowledged.delivery.id, 'consumer_fenced')
+      return interruptedAcknowledgedCheck(run.id, acknowledged, 'consumer_fenced')
     }
     throw new OrchestrationError(
       'consumer_fenced',
@@ -193,7 +197,7 @@ export async function checkRunMailbox(args: {
   }
   if (waitResult === 'waiter_exists') {
     if (acknowledged) {
-      return interruptedAcknowledgedCheck(run.id, acknowledged.delivery.id, 'waiter_exists')
+      return interruptedAcknowledgedCheck(run.id, acknowledged, 'waiter_exists')
     }
     throw new OrchestrationError(
       'waiter_exists',
@@ -209,7 +213,7 @@ export async function checkRunMailbox(args: {
       deliveryId: null,
       messages: [],
       count: 0,
-      acknowledged: acknowledged?.delivery.id ?? null,
+      acknowledged: acknowledged ?? null,
       timedOut: true,
       cancelled: false,
       connectionLost: false
@@ -229,7 +233,7 @@ export async function checkRunMailbox(args: {
       deliveryId: null,
       messages: [],
       count: 0,
-      acknowledged: acknowledged?.delivery.id ?? null,
+      acknowledged: acknowledged ?? null,
       timedOut: false,
       cancelled: true,
       connectionLost: signal?.aborted === true
@@ -246,7 +250,7 @@ export async function checkRunMailbox(args: {
     messages: exposeMessages(current?.messages ?? []),
     count: current?.messages.length ?? 0,
     replayed: current?.replayed ?? false,
-    acknowledged: acknowledged?.delivery.id ?? null,
+    acknowledged: acknowledged ?? null,
     timedOut: false,
     cancelled: false,
     connectionLost: false,
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/check-worker.ts b/src/main/runtime/rpc/methods/orchestration/messaging/check-worker.ts
index fc9fa6b04e9d..7616f3e5cc10 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/check-worker.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/check-worker.ts
@@ -5,6 +5,8 @@ import { formatMessageBanner } from '../../../../orchestration/formatter'
 import { exposeMessages } from './mailbox-message-receipt'
 import { routeAllMailboxPages } from '../schemas'
 import { asDispatchFence, callerHoldsDispatchPane, dispatchFenced } from './dispatch-mailbox-fence'
+import { interruptedAcknowledgedCheck } from '../routing'
+import { currentDispatchAssigneeRun } from './recipient-routing'
 import type { CheckParams } from '../schemas'
 import type { z } from 'zod'
 
@@ -24,7 +26,11 @@ export async function checkWorkerMailbox(args: {
   signal: AbortSignal | undefined
   activeDispatch: ActiveDispatch | undefined
   remoteAttachment: RemoteAttachment | undefined
-}): Promise<unknown> {
+  wakeTypes?: MessageType[]
+  revalidateConsumer?: () => void
+  deferDelivery?: () => boolean
+  recordMutationReceipt?: (receipt: unknown) => void
+}) {
   const {
     params,
     runtime,
@@ -54,6 +60,7 @@ export async function checkWorkerMailbox(args: {
   }
   const deliveryRunId = workerMailbox.runId
   db.requireRun(deliveryRunId)
+  const mailboxIdentity = { runId: deliveryRunId, dispatchId: workerMailbox.dispatchId }
   const address = `dispatch:${workerMailbox.dispatchId}`
   // Why: a federated worker host has no dispatch_contexts row, so its generation lives on the
   // remote_dispatch_attachments row instead.
@@ -165,6 +172,7 @@ export async function checkWorkerMailbox(args: {
     }
   }
   await revalidateWorkerMailbox()
+  args.revalidateConsumer?.()
   let acknowledged
   try {
     acknowledged = params.ack
@@ -179,9 +187,17 @@ export async function checkWorkerMailbox(args: {
   } catch (error) {
     throw asDispatchFence(error)
   }
+  if (acknowledged) {
+    args.recordMutationReceipt?.(
+      interruptedAcknowledgedCheck(deliveryRunId, acknowledged.delivery.id, 'outcome_unknown')
+    )
+  }
   const showAll = params.all === true || (params.unread === false && params.peek !== true)
   const readPeek = () => db.getUnreadMessages(address, typeFilter)
   const readDelivery = (wakeTypes?: MessageType[]) => {
+    if (args.deferDelivery?.()) {
+      return undefined
+    }
     try {
       return db.getOrCreateMailboxDelivery({
         runId: deliveryRunId,
@@ -197,8 +213,7 @@ export async function checkWorkerMailbox(args: {
   if (showAll) {
     const messages = db.getAllMessagesForHandle(address, 100, typeFilter)
     return {
-      ...(workerMailbox.runId ? { runId: workerMailbox.runId } : {}),
-      dispatchId: workerMailbox.dispatchId,
+      ...mailboxIdentity,
       messages: exposeMessages(messages),
       count: messages.length,
       acknowledged: acknowledged?.delivery.id ?? null,
@@ -211,8 +226,7 @@ export async function checkWorkerMailbox(args: {
     const messages = readPeek()
     if (messages.length > 0 || !params.wait) {
       return {
-        ...(workerMailbox.runId ? { runId: workerMailbox.runId } : {}),
-        dispatchId: workerMailbox.dispatchId,
+        ...mailboxIdentity,
         messages: exposeMessages(messages),
         count: messages.length,
         acknowledged: acknowledged?.delivery.id ?? null,
@@ -222,11 +236,10 @@ export async function checkWorkerMailbox(args: {
       }
     }
   } else {
-    const current = readDelivery(params.wait ? typeFilter : undefined)
+    const current = readDelivery(params.wait ? typeFilter : args.wakeTypes)
     if (current || !params.wait) {
       return {
-        ...(workerMailbox.runId ? { runId: workerMailbox.runId } : {}),
-        dispatchId: workerMailbox.dispatchId,
+        ...mailboxIdentity,
         deliveryId: current?.delivery.id ?? null,
         messages: exposeMessages(current?.messages ?? []),
         count: current?.messages.length ?? 0,
@@ -241,19 +254,22 @@ export async function checkWorkerMailbox(args: {
       }
     }
   }
-  const waitResult = await runtime.waitForMessage(address, {
-    typeFilter: typeFilter as string[] | undefined,
-    timeoutMs: params.timeoutMs ?? undefined,
-    signal
-  })
+  // Binding can happen during recovery, before run-create/run-use can cancel this wait.
+  const waitResult =
+    activeDispatch && currentDispatchAssigneeRun(runtime, db, activeDispatch)
+      ? 'cancelled'
+      : await runtime.waitForMessage(address, {
+          typeFilter: typeFilter as string[] | undefined,
+          timeoutMs: params.timeoutMs ?? undefined,
+          signal
+        })
   await revalidateWorkerMailbox()
   if (readCurrentGeneration() !== workerMailbox.generation) {
     throw dispatchFenced()
   }
   if (waitResult === 'timed_out' || waitResult === 'cancelled') {
     return {
-      ...(workerMailbox.runId ? { runId: workerMailbox.runId } : {}),
-      dispatchId: workerMailbox.dispatchId,
+      ...mailboxIdentity,
       messages: [],
       count: 0,
       acknowledged: acknowledged?.delivery.id ?? null,
@@ -265,8 +281,7 @@ export async function checkWorkerMailbox(args: {
   if (params.peek) {
     const arrived = readPeek()
     return {
-      ...(workerMailbox.runId ? { runId: workerMailbox.runId } : {}),
-      dispatchId: workerMailbox.dispatchId,
+      ...mailboxIdentity,
       messages: exposeMessages(arrived),
       count: arrived.length,
       acknowledged: acknowledged?.delivery.id ?? null,
@@ -277,8 +292,7 @@ export async function checkWorkerMailbox(args: {
   }
   const arrived = readDelivery(typeFilter)
   return {
-    ...(workerMailbox.runId ? { runId: workerMailbox.runId } : {}),
-    dispatchId: workerMailbox.dispatchId,
+    ...mailboxIdentity,
     deliveryId: arrived?.delivery.id ?? null,
     messages: exposeMessages(arrived?.messages ?? []),
     count: arrived?.messages.length ?? 0,
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/dispatch-recipient-identity.test.ts b/src/main/runtime/rpc/methods/orchestration/messaging/dispatch-recipient-identity.test.ts
new file mode 100644
index 000000000000..4ab4b6555a09
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/dispatch-recipient-identity.test.ts
@@ -0,0 +1,137 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { testOrcaSessionId } from '../../../../../../shared/orca-session-address-test-fixture'
+import { createRootDispatch } from '../../../../orchestration/db/root-dispatch-test-fixture'
+import { createOrchestrationRpcHarness } from '../rpc-test-harness'
+
+const PANE = 'tab_lead:22222222-2222-4222-9222-222222222222'
+const OTHER = 'tab_other:33333333-3333-4333-8333-333333333333'
+const SESSION = testOrcaSessionId('4bd46b4a-035b-41dd-a122-a9c29122ff11')
+
+describe.each([false, true])('Dispatch recipient identity (settled=%s)', (settled) => {
+  const h = createOrchestrationRpcHarness()
+  let state: ReturnType<typeof h.setup>
+  let dispatch: ReturnType<typeof createRootDispatch>
+
+  beforeEach(() => {
+    state = h.setup()
+    const task = state.db.createTask({ spec: 'lead' })
+    dispatch = createRootDispatch(state.db, task.id, 'term_lead', PANE)
+    if (settled) {
+      state.db.completeDispatch(dispatch.id)
+    }
+    vi.spyOn(state.runtime, 'getLiveTerminalPaneKey').mockImplementation((handle) =>
+      handle === 'term_lead' ? PANE : h.coordinatorPaneKey
+    )
+  })
+  afterEach(() => h.cleanup())
+
+  function send() {
+    return h.call(
+      'orchestration.send',
+      { from: 'term_coord', to: `dispatch:${dispatch.id}`, subject: 'follow up' },
+      state.ctx
+    )
+  }
+  function sessionRun() {
+    state.db.db
+      .prepare('UPDATE dispatch_contexts SET assignee_orca_session_id = ? WHERE id = ?')
+      .run(SESSION, dispatch.id)
+    return state.db.createRun({
+      objective: 'session lead',
+      coordinatorHandle: 'term_lead',
+      coordinatorPaneKey: null,
+      coordinatorOrcaSessionId: SESSION
+    })
+  }
+  async function expectRun(runId: string) {
+    if (settled) {
+      await expect(send()).rejects.toMatchObject({
+        code: 'dispatch_inactive',
+        message: expect.stringContaining(`Send to run:${runId} instead`)
+      })
+      expect(state.db.getInbox()).toEqual([])
+    } else {
+      expect(await send()).toMatchObject({ message: { to_handle: `run:${runId}`, run_id: runId } })
+    }
+  }
+  async function expectNoRedirect(unrelatedRun: string) {
+    if (settled) {
+      await expect(send()).rejects.toMatchObject({
+        code: 'dispatch_inactive',
+        message: expect.not.stringContaining(unrelatedRun)
+      })
+      expect(state.db.getInbox()).toEqual([])
+    } else {
+      expect(await send()).toMatchObject({
+        message: { to_handle: `dispatch:${dispatch.id}`, run_id: dispatch.run_id }
+      })
+    }
+  }
+
+  it('uses a durable session binding without a live pane', async () => {
+    const run = sessionRun()
+    vi.mocked(state.runtime.getLiveTerminalPaneKey).mockReturnValue(null)
+    await expectRun(run.id)
+  })
+
+  it('uses the recorded session instead of an unrelated Run now occupying the saved pane', async () => {
+    const run = sessionRun()
+    state.db.createRun({
+      objective: 'new occupant',
+      coordinatorHandle: 'term_other',
+      coordinatorPaneKey: PANE
+    })
+    await expectRun(run.id)
+  })
+
+  it('ignores an old session column left behind by an older binary rebind', async () => {
+    const run = sessionRun()
+    state.db.db
+      .prepare(
+        'UPDATE runs SET coordinator_handle = ?, coordinator_pane_key = ?, consumer_generation = consumer_generation + 1 WHERE id = ?'
+      )
+      .run('term_other', OTHER, run.id)
+    await expectNoRedirect(run.id)
+  })
+
+  it('does not follow a closed handle to another occupant of its old pane', async () => {
+    const run = state.db.createRun({
+      objective: 'new occupant',
+      coordinatorHandle: 'term_other',
+      coordinatorPaneKey: PANE
+    })
+    vi.mocked(state.runtime.getLiveTerminalPaneKey).mockReturnValue(null)
+    await expectNoRedirect(run.id)
+  })
+
+  it.each(['replacement:pty:2', null])(
+    'does not redirect with a replaced or unverifiable process: %s',
+    async (process) => {
+      const run = state.db.createRun({
+        objective: 'pane run',
+        coordinatorHandle: 'term_lead',
+        coordinatorPaneKey: PANE
+      })
+      state.db.db
+        .prepare('UPDATE dispatch_contexts SET process_incarnation = ? WHERE id = ?')
+        .run('original:pty:1', dispatch.id)
+      vi.mocked(state.runtime.getTerminalProcessIncarnation).mockReturnValue(process)
+      await expectNoRedirect(run.id)
+      expect(state.db.getDispatchContextById(dispatch.id)?.status).toBe(
+        settled ? 'completed' : dispatch.status
+      )
+    }
+  )
+
+  it('accepts a reminted tab half with the same pane leaf and process', async () => {
+    const run = state.db.createRun({
+      objective: 'same pane',
+      coordinatorHandle: 'term_lead',
+      coordinatorPaneKey: PANE
+    })
+    vi.mocked(state.runtime.getLiveTerminalPaneKey).mockReturnValue(
+      PANE.replace('tab_lead', 'tab_restored')
+    )
+    await expectRun(run.id)
+  })
+})
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/message-methods.ts b/src/main/runtime/rpc/methods/orchestration/messaging/message-methods.ts
index 3e59073349b2..e079596f80d0 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/message-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/message-methods.ts
@@ -12,6 +12,7 @@ import {
 import { exposeMessage } from './mailbox-message-receipt'
 import { resolveOrchestrationParty } from '../../../../orchestration/orchestration-party'
 import { recordReceiptBeforeNudge, replayMutationNudge } from './mutation-replay-nudge'
+import { resolveReplyRecipient } from './recipient-routing'
 import {
   ReplyParams,
   InboxParams,
@@ -113,15 +114,20 @@ export const ORCHESTRATION_MESSAGE_METHODS = [
         )
       }
 
+      const recipient = resolveReplyRecipient({
+        runtime,
+        db,
+        originalFrom: original.from_handle,
+        originalRunId: original.run_id
+      })
       db.markAsRead([original.id])
-
       const reply = db.insertMessage({
         from: params.from ?? original.to_handle,
-        to: original.from_handle,
+        to: recipient.to,
         subject: `Re: ${original.subject}`,
         body: params.body,
         threadId: original.thread_id ?? original.id,
-        runId: original.run_id
+        runId: recipient.runId
       })
 
       const receipt = { message: exposeMessage(reply) }
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/recipient-routing.ts b/src/main/runtime/rpc/methods/orchestration/messaging/recipient-routing.ts
index 861cfadeac6b..8828c7718765 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/recipient-routing.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/recipient-routing.ts
@@ -2,9 +2,15 @@ import type { LegacyAdoptedMailboxOwner, OrchestrationDb } from '../../../../orc
 import { OrchestrationError } from '../../../../orchestration/orchestration-error'
 import type { DispatchContextRow, DispatchStatus } from '../../../../orchestration/types'
 import type { OrcaRuntimeService } from '../../../../orca-runtime'
-import { readStructuredAgentSessionRecord } from '../../../../structured-worker-authority'
-import { structuredWorkerHostScope } from '../../../../structured-worker-identity'
 import { resolveOrchestrationParty } from '../../../../orchestration/orchestration-party'
+import { isEquivalentPaneKey } from '../../../../orchestration/db/pane-key-match'
+import { CURRENT_CONTRACT_VERSION } from '../../../../orchestration/db/contract-constants'
+import { readAgentSessionRecordStore } from '../../../../orchestration/structured-session-lineage'
+import {
+  readSessionRecipient,
+  refuseUndeliverableSessionRecipient,
+  type SessionRecipientRefusal
+} from './session-recipient'
 
 const ACTIVE_DISPATCH_STATUSES: readonly DispatchStatus[] = ['pending', 'dispatched']
 
@@ -15,20 +21,123 @@ const ACTIVE_DISPATCH_STATUSES: readonly DispatchStatus[] = ['pending', 'dispatc
  * mailbox, so accepting the message reports success for a delivery that cannot
  * happen. Federated targets keep their own liveness check.
  */
-export function assertDispatchMailboxDeliverable(db: OrchestrationDb, dispatchId: string): void {
+export function assertDispatchMailboxDeliverable(
+  runtime: OrcaRuntimeService,
+  db: OrchestrationDb,
+  dispatchId: string
+): void {
   const dispatch = db.getDispatchContextById(dispatchId)
   if (!dispatch || ACTIVE_DISPATCH_STATUSES.includes(dispatch.status)) {
     return
   }
+  const recipientRun = currentDispatchAssigneeRun(runtime, db, dispatch)?.id ?? dispatch.run_id
   throw new OrchestrationError(
     'dispatch_inactive',
-    `Dispatch ${dispatchId} is ${dispatch.status}; its worker will never read that mailbox. Send to run:${dispatch.run_id} instead, or start a new Dispatch for follow-up work.`
+    `Dispatch ${dispatchId} is ${dispatch.status}; its worker will never read that mailbox. Send to run:${recipientRun} instead, or start a new Dispatch for follow-up work.`
   )
 }
 
+// A saved pane alone cannot identify its occupant after reuse.
+export function currentDispatchAssigneeRun(
+  runtime: OrcaRuntimeService,
+  db: OrchestrationDb,
+  dispatch: DispatchContextRow
+) {
+  if (
+    dispatch.contract_version !== CURRENT_CONTRACT_VERSION ||
+    db.getFederatedDispatch(dispatch.id)
+  ) {
+    return undefined
+  }
+  if (dispatch.assignee_orca_session_id !== null) {
+    return db.getCurrentRunForCoordinator({
+      terminalHandle: dispatch.assignee_handle,
+      paneKey: null,
+      orcaSessionId: dispatch.assignee_orca_session_id
+    })
+  }
+  if (dispatch.assignee_handle === null) {
+    return undefined
+  }
+  const paneKey = runtime.getLiveTerminalPaneKey(dispatch.assignee_handle)
+  if (
+    !paneKey ||
+    (dispatch.assignee_pane_key && !isEquivalentPaneKey(dispatch.assignee_pane_key, paneKey)) ||
+    (dispatch.process_incarnation !== null &&
+      runtime.getTerminalProcessIncarnation(dispatch.assignee_handle) !==
+        dispatch.process_incarnation)
+  ) {
+    return undefined
+  }
+  return db.getCurrentRunForPane(paneKey)
+}
+
+// Nested coordinators receive new mail where their current Run check waits.
+export function resolveRunBoundDispatchRecipient(
+  runtime: OrcaRuntimeService,
+  db: OrchestrationDb,
+  dispatchId: string,
+  explicitRunId?: string
+): { to: string; runId: string; warning: SendRecipientWarning } | undefined {
+  const dispatch = db.getDispatchContextById(dispatchId)
+  if (!dispatch || !ACTIVE_DISPATCH_STATUSES.includes(dispatch.status)) {
+    return undefined
+  }
+  const boundRun = currentDispatchAssigneeRun(runtime, db, dispatch)
+  if (!boundRun || boundRun.id === dispatch.run_id) {
+    return undefined
+  }
+  const recipient = `dispatch:${dispatchId}`
+  const mismatch = runMismatch(recipient, boundRun.id, explicitRunId)
+  if (mismatch && !mismatch.ok) {
+    throw new OrchestrationError(mismatch.code, mismatch.message)
+  }
+  return {
+    to: `run:${boundRun.id}`,
+    runId: boundRun.id,
+    warning: {
+      code: 'recipient_run_bound_redirect',
+      recipient,
+      message: `${recipient} is assigned to a terminal that now coordinates Run ${boundRun.id}; queued for run:${boundRun.id}, the mailbox that terminal reads.`
+    }
+  }
+}
+
+// Replies share send routing; unresolved historical senders keep their original address.
+export function resolveReplyRecipient(params: {
+  runtime: OrcaRuntimeService
+  db: OrchestrationDb
+  originalFrom: string
+  originalRunId: string | undefined
+}): { to: string; runId: string | undefined } {
+  const { runtime, db, originalFrom, originalRunId } = params
+  const unchanged = { to: originalFrom, runId: originalRunId }
+  if (originalFrom.startsWith('run:')) {
+    return { to: originalFrom, runId: originalFrom.slice('run:'.length) }
+  }
+  if (originalFrom.startsWith('dispatch:')) {
+    const dispatchId = originalFrom.slice('dispatch:'.length)
+    // Federation owns its own recipient and liveness checks.
+    if (db.getFederatedDispatch(dispatchId)) {
+      return unchanged
+    }
+    assertDispatchMailboxDeliverable(runtime, db, dispatchId)
+    const runBound = resolveRunBoundDispatchRecipient(runtime, db, dispatchId)
+    return runBound ?? unchanged
+  }
+  const recipient = resolveBareOrchestrationRecipient({
+    runtime,
+    db,
+    handle: originalFrom,
+    senderRunId: originalRunId
+  })
+  return recipient.ok ? { to: recipient.to, runId: recipient.runId ?? originalRunId } : unchanged
+}
+
 export type SendRecipientWarning = {
   code:
     | 'legacy_terminal_recipient'
+    | 'recipient_run_bound_redirect'
     | 'recipient_unreachable'
     | 'recipient_ambiguous'
     | 'recipient_run_mismatch'
@@ -45,7 +154,11 @@ export type BareRecipientResolution =
     }
   | {
       ok: false
-      code: 'terminal_not_found' | 'recipient_ambiguous' | 'recipient_run_mismatch'
+      code:
+        | 'terminal_not_found'
+        | 'recipient_ambiguous'
+        | 'recipient_run_mismatch'
+        | SessionRecipientRefusal['code']
       message: string
       warning: SendRecipientWarning
     }
@@ -59,7 +172,12 @@ export function resolveBareOrchestrationRecipient(params: {
   legacyAdoptedMailboxOwner?: LegacyAdoptedMailboxOwner | null
 }): BareRecipientResolution {
   const { runtime, db } = params
-  const party = resolveOrchestrationParty(params.handle, db)
+  const sessionStore = readAgentSessionRecordStore()
+  const session = readSessionRecipient(params.handle, sessionStore)
+  if (session && 'code' in session) {
+    return refused(params.handle, session)
+  }
+  const party = resolveOrchestrationParty(session?.address ?? params.handle, db)
   const handle = party.address
   const paneKey =
     party.terminalHandle === null
@@ -103,6 +221,13 @@ export function resolveBareOrchestrationRecipient(params: {
     return mismatch ?? { ok: true, to: `run:${selectedRunId}`, runId: selectedRunId }
   }
 
+  if (session) {
+    const refusal = refuseUndeliverableSessionRecipient(session, sessionStore, db)
+    return refusal
+      ? refused(params.handle, refusal)
+      : { ok: true, to: handle, runId: params.senderRunId }
+  }
+
   if (paneKey) {
     return {
       ok: true,
@@ -116,19 +241,7 @@ export function resolveBareOrchestrationRecipient(params: {
     }
   }
 
-  const chatSessionId = party.terminalHandle === null ? party.orcaSessionId : null
-  if (chatSessionId !== null) {
-    const record = readStructuredAgentSessionRecord(chatSessionId)
-    // Unlike a terminal handle, a session address outlives its process, so its direct mail is durable.
-    if (record && structuredWorkerHostScope(record.location)) {
-      return { ok: true, to: handle, runId: params.senderRunId }
-    }
-  }
-
-  const message =
-    chatSessionId !== null
-      ? `Agent session ${chatSessionId} does not run on this host and has no durable Run/Dispatch mailbox.`
-      : `Terminal ${handle} has no live pane or durable Run/Dispatch mailbox.`
+  const message = `Terminal ${handle} has no live pane or durable Run/Dispatch mailbox.`
   return {
     ok: false,
     code: 'terminal_not_found',
@@ -137,6 +250,15 @@ export function resolveBareOrchestrationRecipient(params: {
   }
 }
 
+function refused(recipient: string, refusal: SessionRecipientRefusal): BareRecipientResolution {
+  return {
+    ok: false,
+    code: refusal.code,
+    message: refusal.message,
+    warning: { code: 'recipient_unreachable', recipient, message: refusal.message }
+  }
+}
+
 function selectDispatch(
   dispatches: DispatchContextRow[],
   explicitRunId: string | undefined
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/run-bound-mailbox-history.test.ts b/src/main/runtime/rpc/methods/orchestration/messaging/run-bound-mailbox-history.test.ts
new file mode 100644
index 000000000000..fba01d0d4556
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/run-bound-mailbox-history.test.ts
@@ -0,0 +1,69 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createRootDispatch } from '../../../../orchestration/db/root-dispatch-test-fixture'
+import { createOrchestrationRpcHarness } from '../rpc-test-harness'
+
+const LEAD = 'tab_lead:22222222-2222-4222-9222-222222222222'
+function deliveryId(result: unknown): string {
+  if (
+    typeof result === 'object' &&
+    result &&
+    'deliveryId' in result &&
+    typeof result.deliveryId === 'string'
+  ) {
+    return result.deliveryId
+  }
+  throw new Error('Expected a Delivery')
+}
+
+describe('Run history after residual Dispatch acknowledgment', () => {
+  const h = createOrchestrationRpcHarness()
+  let state: ReturnType<typeof h.setup>
+  beforeEach(() => {
+    state = h.setup()
+    vi.mocked(state.runtime.getTerminalPaneKey).mockImplementation((handle) =>
+      handle === 'term_lead' ? LEAD : h.coordinatorPaneKey
+    )
+  })
+  afterEach(() => h.cleanup())
+  it.each([
+    { mode: { all: true }, acknowledgeTogether: false },
+    { mode: { all: true }, acknowledgeTogether: true },
+    { mode: { unread: false }, acknowledgeTogether: false },
+    { mode: { unread: false }, acknowledgeTogether: true }
+  ])('shows Run history after old mail is read: %j', async ({ mode, acknowledgeTogether }) => {
+    const task = state.db.createTask({ spec: 'nested lead' })
+    const dispatch = createRootDispatch(state.db, task.id, 'term_lead', LEAD)
+    const run = state.db.createRun({
+      objective: 'child Run',
+      coordinatorHandle: 'term_lead',
+      coordinatorPaneKey: LEAD
+    })
+    const old = state.db.insertMessage({
+      from: 'term_coord',
+      to: `dispatch:${dispatch.id}`,
+      runId: dispatch.run_id,
+      subject: 'old mail'
+    })
+    const check = (params = {}) =>
+      h.call('orchestration.check', { terminal: 'term_lead', ...params }, state.ctx)
+    expect(await check(mode)).toMatchObject({ runId: dispatch.run_id, messages: [{ id: old.id }] })
+    expect(state.db.hasOutstandingMailboxDelivery(`dispatch:${dispatch.id}`)).toBe(false)
+    const delivery = deliveryId(await check())
+    if (!acknowledgeTogether) {
+      await check({ ack: delivery })
+    }
+    const fresh = state.db.insertMessage({
+      from: 'term_child',
+      to: `run:${run.id}`,
+      runId: run.id,
+      subject: 'new mail'
+    })
+    expect(
+      await check({ ...mode, ...(acknowledgeTogether ? { ack: delivery } : {}) })
+    ).toMatchObject({ runId: run.id, messages: [{ id: fresh.id }] })
+    expect(state.db.getMessageById(old.id)?.read).toBe(1)
+    expect(state.db.getMessageById(fresh.id)?.read).toBe(0)
+    expect(state.db.hasOutstandingMailboxDelivery(`dispatch:${dispatch.id}`)).toBe(false)
+    expect(state.db.hasOutstandingMailboxDelivery(`run:${run.id}`)).toBe(false)
+  })
+})
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/run-bound-mailbox-interleavings.test.ts b/src/main/runtime/rpc/methods/orchestration/messaging/run-bound-mailbox-interleavings.test.ts
new file mode 100644
index 000000000000..4e92d7c35c16
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/run-bound-mailbox-interleavings.test.ts
@@ -0,0 +1,175 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createRootDispatch } from '../../../../orchestration/db/root-dispatch-test-fixture'
+import { ORCHESTRATION_DELIVERY_BATCH_LIMIT } from '../../../../orchestration/db/messages/mailbox-routing-page'
+import { createOrchestrationRpcHarness } from '../rpc-test-harness'
+
+const LEAD = 'tab_lead:22222222-2222-4222-9222-222222222222'
+const OTHER = 'tab_other:33333333-3333-4333-8333-333333333333'
+
+function deliveryId(result: unknown): string {
+  if (
+    typeof result === 'object' &&
+    result !== null &&
+    'deliveryId' in result &&
+    typeof result.deliveryId === 'string'
+  ) {
+    return result.deliveryId
+  }
+  throw new Error('Expected a Delivery')
+}
+
+describe('Run binding during Dispatch checks', () => {
+  const h = createOrchestrationRpcHarness()
+  let state: ReturnType<typeof h.setup>
+  let dispatch: ReturnType<typeof createRootDispatch>
+
+  beforeEach(() => {
+    state = h.setup()
+    vi.mocked(state.runtime.getTerminalPaneKey).mockImplementation((handle) =>
+      handle === 'term_lead' ? LEAD : handle === 'term_coord' ? h.coordinatorPaneKey : OTHER
+    )
+    dispatch = createRootDispatch(
+      state.db,
+      state.db.createTask({ spec: 'lead' }).id,
+      'term_lead',
+      LEAD
+    )
+  })
+  afterEach(() => {
+    state.runtime.cancelMessageWaiters(`dispatch:${dispatch.id}`)
+    h.cleanup()
+    vi.restoreAllMocks()
+  })
+
+  function check(params: Record<string, unknown> = {}) {
+    return h.call('orchestration.check', { terminal: 'term_lead', ...params }, state.ctx)
+  }
+  function residual(subject: string) {
+    return state.db.insertMessage({
+      from: 'term_coord',
+      to: `dispatch:${dispatch.id}`,
+      runId: dispatch.run_id,
+      subject
+    })
+  }
+  async function bind(method: 'runCreate' | 'runUse') {
+    const params =
+      method === 'runCreate'
+        ? { objective: 'child' }
+        : {
+            id: state.db.createRun({
+              objective: 'adopt',
+              coordinatorHandle: 'term_other',
+              coordinatorPaneKey: OTHER
+            }).id
+          }
+    await h.call(`orchestration.${method}`, { from: 'term_lead', ...params }, state.ctx)
+    const run = state.db.getCurrentRunForPane(LEAD)
+    if (!run) {
+      throw new Error('Expected bound Run')
+    }
+    return run
+  }
+
+  describe.each(['runCreate', 'runUse'] as const)('%s', (method) => {
+    it.each(['parked', 'recovering'] as const)(
+      'cancels a %s Dispatch wait and preserves its ack',
+      async (phase) => {
+        const old = residual('before bind')
+        const ack = deliveryId(await check())
+        const record = vi.fn()
+        state.ctx.recordMutationReceipt = record
+        const wait = vi.spyOn(state.runtime, 'waitForMessage')
+        const waiting = check({ ack, wait: true, timeoutMs: 500 })
+        if (phase === 'parked') {
+          await vi.waitFor(() =>
+            expect(wait).toHaveBeenCalledWith(`dispatch:${dispatch.id}`, expect.anything())
+          )
+        }
+        const run = await bind(method)
+        await h.call(
+          'orchestration.send',
+          {
+            from: 'term_coord',
+            to: `dispatch:${dispatch.id}`,
+            subject: 'after bind'
+          },
+          state.ctx
+        )
+        expect(await waiting).toMatchObject({ acknowledged: ack, cancelled: true, timedOut: false })
+        expect(record).toHaveBeenCalledWith(expect.objectContaining({ acknowledged: ack }))
+        expect(state.db.getMessageById(old.id)).toMatchObject({ run_id: dispatch.run_id, read: 1 })
+        expect(await check()).toMatchObject({
+          runId: run.id,
+          messages: [{ subject: 'after bind' }]
+        })
+        if (phase === 'recovering') {
+          expect(wait).not.toHaveBeenCalled()
+        }
+      }
+    )
+  })
+
+  it.each(['before', 'during recovery'] as const)(
+    'replays Run delivery created %s residual acknowledgment',
+    async (phase) => {
+      const ids = Array.from(
+        { length: ORCHESTRATION_DELIVERY_BATCH_LIMIT + 1 },
+        (_, i) => residual(`old ${i}`).id
+      )
+      const last = ids.at(-1)
+      if (!last) {
+        throw new Error('Expected residual tail')
+      }
+      const ack = deliveryId(await check())
+      const run = await bind('runCreate')
+      state.db.insertMessage({
+        from: 'term_child',
+        to: `run:${run.id}`,
+        runId: run.id,
+        subject: 'Run batch'
+      })
+      let runDelivery: string | undefined
+      const readRun = () => {
+        const result = state.db.getOrCreateRunDelivery({
+          runId: run.id,
+          consumerGeneration: run.consumer_generation
+        })
+        if (!result) {
+          throw new Error('Expected Run delivery')
+        }
+        runDelivery = result.delivery.id
+      }
+      if (phase === 'before') {
+        runDelivery = deliveryId(await check({ run: run.id }))
+      } else {
+        state.db.db.prepare('UPDATE messages SET to_handle = ? WHERE id = ?').run('term_lead', last)
+        const route = state.db.routeUnreadDirectMessagesToDispatchMailbox.bind(state.db)
+        vi.spyOn(state.db, 'routeUnreadDirectMessagesToDispatchMailbox').mockImplementationOnce(
+          (...args) => {
+            const result = route(...args)
+            readRun()
+            return result
+          }
+        )
+      }
+      const result = await check({ ack })
+      expect(result).toMatchObject({
+        runId: run.id,
+        deliveryId: runDelivery,
+        acknowledged: ack,
+        replayed: true
+      })
+      expect(state.db.hasOutstandingMailboxDelivery(`dispatch:${dispatch.id}`)).toBe(false)
+      for (const id of ids.slice(0, -1)) {
+        expect(state.db.getMessageById(id)).toMatchObject({ read: 1, run_id: dispatch.run_id })
+      }
+      expect(state.db.getMessageById(last)).toMatchObject({ read: 0, run_id: dispatch.run_id })
+      expect(await check({ ack })).toMatchObject({ deliveryId: runDelivery, replayed: true })
+      const tail = await check({ ack: runDelivery })
+      expect(tail).toMatchObject({ runId: dispatch.run_id, messages: [{ id: last }], count: 1 })
+      expect(await check({ ack: deliveryId(tail) })).toMatchObject({ count: 0 })
+      expect(state.db.getMessageById(last)?.read).toBe(1)
+    }
+  )
+})
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/run-bound-mailbox-safety.test.ts b/src/main/runtime/rpc/methods/orchestration/messaging/run-bound-mailbox-safety.test.ts
new file mode 100644
index 000000000000..f5f2c57575f5
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/run-bound-mailbox-safety.test.ts
@@ -0,0 +1,290 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createRootDispatch } from '../../../../orchestration/db/root-dispatch-test-fixture'
+import { createOrchestrationRpcHarness } from '../rpc-test-harness'
+
+const LEAD = 'tab_lead:22222222-2222-4222-9222-222222222222'
+const OTHER = 'tab_other:33333333-3333-4333-8333-333333333333'
+
+function deliveryId(result: unknown): string {
+  if (
+    typeof result === 'object' &&
+    result &&
+    'deliveryId' in result &&
+    typeof result.deliveryId === 'string'
+  ) {
+    return result.deliveryId
+  }
+  throw new Error('Expected a Delivery')
+}
+
+describe('Run-bound lead mailbox boundaries', () => {
+  const h = createOrchestrationRpcHarness()
+  let state: ReturnType<typeof h.setup>
+  let dispatch: ReturnType<typeof createRootDispatch>
+  let leadRun: ReturnType<typeof state.db.createRun>
+
+  beforeEach(() => {
+    state = h.setup()
+    vi.mocked(state.runtime.getTerminalPaneKey).mockImplementation((handle) =>
+      handle === 'term_lead' ? LEAD : handle === 'term_coord' ? h.coordinatorPaneKey : OTHER
+    )
+    const task = state.db.createTask({ spec: 'nested lead' })
+    dispatch = createRootDispatch(state.db, task.id, 'term_lead', LEAD)
+    leadRun = state.db.createRun({
+      objective: 'child Run',
+      coordinatorHandle: 'term_lead',
+      coordinatorPaneKey: LEAD
+    })
+  })
+  afterEach(() => h.cleanup())
+
+  function check(params: Record<string, unknown> = {}) {
+    return h.call('orchestration.check', { terminal: 'term_lead', ...params }, state.ctx)
+  }
+  function residual(subject: string, type: 'status' | 'question' = 'status') {
+    return state.db.insertMessage({
+      from: 'term_coord',
+      to: `dispatch:${dispatch.id}`,
+      runId: dispatch.run_id,
+      subject,
+      type
+    })
+  }
+  function runMail(subject = 'Run report') {
+    return state.db.insertMessage({
+      from: 'term_child',
+      to: `run:${leadRun.id}`,
+      runId: leadRun.id,
+      subject,
+      type: 'question'
+    })
+  }
+  function handoff() {
+    state.db.bindRun({
+      runId: leadRun.id,
+      coordinatorHandle: 'term_other',
+      coordinatorPaneKey: OTHER
+    })
+  }
+
+  it('recovers old raw-handle replies only from the active Dispatch Run', async () => {
+    const old = residual('old reply')
+    state.db.db.prepare('UPDATE messages SET to_handle = ? WHERE id = ?').run('term_lead', old.id)
+    const foreign = state.db.createRun({
+      objective: 'unrelated',
+      coordinatorHandle: 'term_other',
+      coordinatorPaneKey: OTHER
+    })
+    const privateMail = state.db.insertMessage({
+      from: 'term_other',
+      to: 'term_lead',
+      runId: foreign.id,
+      subject: 'foreign'
+    })
+    runMail()
+    const first = await check()
+    expect(first).toMatchObject({ runId: dispatch.run_id, messages: [{ id: old.id }] })
+    expect(await check({ ack: deliveryId(first) })).toMatchObject({
+      runId: leadRun.id,
+      messages: [{ subject: 'Run report' }]
+    })
+    expect(state.db.getMessageById(privateMail.id)).toMatchObject({ read: 0, run_id: foreign.id })
+  })
+
+  it('treats types as a wake condition and replays the entire residual FIFO batch', async () => {
+    residual('older status')
+    residual('decision needed', 'question')
+    runMail()
+    const first = await check({ wait: true, types: 'question' })
+    expect(first).toMatchObject({
+      messages: [{ subject: 'older status' }, { subject: 'decision needed' }]
+    })
+    expect(await check({ wait: true, types: 'worker_done' })).toMatchObject({
+      deliveryId: deliveryId(first),
+      replayed: true
+    })
+    expect(await check({ ack: deliveryId(first) })).toMatchObject({
+      runId: leadRun.id,
+      acknowledged: deliveryId(first),
+      messages: [{ subject: 'Run report' }]
+    })
+  })
+
+  it('does not filter a non-waiting consuming residual check', async () => {
+    residual('status')
+    expect(await check({ types: 'question' })).toMatchObject({ messages: [{ subject: 'status' }] })
+  })
+
+  it.each([{ peek: true }, { all: true }])(
+    'filters residual inspection without consuming it: %j',
+    async (mode) => {
+      const status = residual('status')
+      residual('question', 'question')
+      expect(await check({ ...mode, types: 'question' })).toMatchObject({
+        messages: [{ subject: 'question' }]
+      })
+      expect(state.db.getMessageById(status.id)?.read).toBe(0)
+      expect(state.db.hasOutstandingMailboxDelivery(`dispatch:${dispatch.id}`)).toBe(false)
+    }
+  )
+
+  it('replays an outstanding Run batch before exposing older nonmatching residual mail', async () => {
+    residual('status')
+    runMail()
+    const first = await check({ wait: true, types: 'question' })
+    expect(first).toMatchObject({ runId: leadRun.id })
+    expect(await check()).toMatchObject({ deliveryId: deliveryId(first), replayed: true })
+    expect(await check({ ack: deliveryId(first) })).toMatchObject({
+      acknowledged: deliveryId(first),
+      messages: [{ subject: 'status' }]
+    })
+  })
+
+  it('keeps explicit Run checks scoped and refuses the parent Run', async () => {
+    const pending = residual('parent mail')
+    runMail()
+    expect(await check({ run: leadRun.id })).toMatchObject({
+      runId: leadRun.id,
+      messages: [{ subject: 'Run report' }]
+    })
+    await expect(check({ run: dispatch.run_id })).rejects.toMatchObject({ code: 'consumer_fenced' })
+    expect(state.db.getMessageById(pending.id)?.read).toBe(0)
+  })
+
+  it('fences a Run handoff during residual direct-mail recovery before delivery or ack', async () => {
+    const pending = residual('raw before bind')
+    state.db.db
+      .prepare('UPDATE messages SET to_handle = ? WHERE id = ?')
+      .run('term_lead', pending.id)
+    const route = state.db.routeUnreadDirectMessagesToDispatchMailbox.bind(state.db)
+    vi.spyOn(state.db, 'routeUnreadDirectMessagesToDispatchMailbox').mockImplementationOnce(
+      (...args) => {
+        const result = route(...args)
+        handoff()
+        return result
+      }
+    )
+    await expect(check()).rejects.toMatchObject({ code: 'consumer_fenced' })
+    expect(state.db.hasOutstandingMailboxDelivery(`dispatch:${dispatch.id}`)).toBe(false)
+    expect(state.db.getMessageById(pending.id)?.read).toBe(0)
+  })
+
+  it('records a residual acknowledgment before a Run handoff interrupts the following wait', async () => {
+    residual('ack me')
+    const first = await check()
+    const record = vi.fn()
+    state.ctx.recordMutationReceipt = record
+    vi.spyOn(state.runtime, 'waitForMessage').mockImplementationOnce(async () => {
+      expect(record).toHaveBeenCalledWith(
+        expect.objectContaining({ acknowledged: deliveryId(first) })
+      )
+      handoff()
+      return 'cancelled'
+    })
+    expect(await check({ ack: deliveryId(first), wait: true })).toMatchObject({
+      acknowledged: deliveryId(first),
+      waitInterrupted: 'consumer_fenced',
+      messages: []
+    })
+    expect(state.db.getUnreadMessages(`dispatch:${dispatch.id}`)).toEqual([])
+  })
+
+  it('retains the acknowledged receipt if the wait transport throws', async () => {
+    residual('ack me')
+    const first = await check()
+    const record = vi.fn()
+    state.ctx.recordMutationReceipt = record
+    vi.spyOn(state.runtime, 'waitForMessage').mockRejectedValueOnce(
+      new Error('connection interrupted')
+    )
+    await expect(check({ ack: deliveryId(first), wait: true })).rejects.toThrow(
+      'connection interrupted'
+    )
+    expect(record).toHaveBeenCalledWith(
+      expect.objectContaining({ acknowledged: deliveryId(first) })
+    )
+    expect(state.db.getUnreadMessages(`dispatch:${dispatch.id}`)).toEqual([])
+  })
+
+  it('does not give a reused process the previous assignee mail', async () => {
+    state.db.mintDispatchCapability({
+      dispatchId: dispatch.id,
+      paneKey: LEAD,
+      processIncarnation: 'old:pty:1'
+    })
+    const pending = residual('old process mail')
+    runMail()
+    expect(await check()).toMatchObject({
+      runId: leadRun.id,
+      messages: [{ subject: 'Run report' }]
+    })
+    expect(state.db.getMessageById(pending.id)?.read).toBe(0)
+    expect(state.db.hasOutstandingMailboxDelivery(`dispatch:${dispatch.id}`)).toBe(false)
+  })
+
+  it('refuses an explicit sender Run that would silently redirect into another Run', async () => {
+    await expect(
+      h.call(
+        'orchestration.send',
+        {
+          from: 'term_coord',
+          to: `dispatch:${dispatch.id}`,
+          run: dispatch.run_id,
+          subject: 'wrong scope'
+        },
+        state.ctx
+      )
+    ).rejects.toMatchObject({ code: 'recipient_run_mismatch' })
+    expect(state.db.getInbox()).toEqual([])
+  })
+
+  it('wakes a parked Run check for Dispatch mail sent after binding', async () => {
+    const waiter = vi.spyOn(state.runtime, 'waitForMessage')
+    const waiting = check({ wait: true, timeoutMs: 1_000 })
+    await vi.waitFor(() =>
+      expect(waiter).toHaveBeenCalledWith(`run:${leadRun.id}`, expect.anything())
+    )
+    await h.call(
+      'orchestration.send',
+      { from: 'term_coord', to: `dispatch:${dispatch.id}`, subject: 'wake up' },
+      state.ctx
+    )
+    expect(await waiting).toMatchObject({ timedOut: false, messages: [{ subject: 'wake up' }] })
+  })
+
+  it('keeps a canonical Run reply in the recipient Run even across an original thread Run', async () => {
+    const note = state.db.insertMessage({
+      from: `run:${leadRun.id}`,
+      to: `run:${dispatch.run_id}`,
+      runId: dispatch.run_id,
+      subject: 'report'
+    })
+    expect(
+      await h.call(
+        'orchestration.reply',
+        { from: 'term_coord', id: note.id, body: 'decision' },
+        state.ctx
+      )
+    ).toMatchObject({ message: { to_handle: `run:${leadRun.id}`, run_id: leadRun.id } })
+    expect(await check()).toMatchObject({ messages: [{ subject: 'Re: report' }] })
+  })
+
+  it('refuses replies to an inactive canonical Dispatch before reading or inserting mail', async () => {
+    const note = state.db.insertMessage({
+      from: `dispatch:${dispatch.id}`,
+      to: `run:${dispatch.run_id}`,
+      runId: dispatch.run_id,
+      subject: 'old report'
+    })
+    state.db.completeDispatch(dispatch.id)
+    await expect(
+      h.call(
+        'orchestration.reply',
+        { from: 'term_coord', id: note.id, body: 'too late' },
+        state.ctx
+      )
+    ).rejects.toMatchObject({ code: 'dispatch_inactive' })
+    expect(state.db.getMessageById(note.id)?.read).toBe(0)
+    expect(state.db.getInbox()).toHaveLength(1)
+  })
+})
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/run-bound-recipient-mail.test.ts b/src/main/runtime/rpc/methods/orchestration/messaging/run-bound-recipient-mail.test.ts
new file mode 100644
index 000000000000..bb6c7041cee6
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/run-bound-recipient-mail.test.ts
@@ -0,0 +1,189 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { RpcContext } from '../../../core'
+import type { OrchestrationDb, RunRow } from '../../../../orchestration/db'
+import type { OrcaRuntimeService } from '../../../../orca-runtime'
+import type { DispatchContextRow } from '../../../../orchestration/types'
+import { createRootDispatch } from '../../../../orchestration/db/root-dispatch-test-fixture'
+import { createOrchestrationRpcHarness } from '../rpc-test-harness'
+
+// A lead is dispatched by a root coordinator and then coordinates its own Run from the same pane.
+// That pane's `check` reads its own Run mailbox, so mail meant for it must land there.
+describe('mail for a lead whose pane coordinates its own Run', () => {
+  const h = createOrchestrationRpcHarness()
+  const coordPane = 'tab_coord:11111111-1111-4111-8111-111111111111'
+  const leadPane = 'tab_lead:22222222-2222-4222-9222-222222222222'
+  let db: OrchestrationDb
+  let runtime: OrcaRuntimeService
+  let ctx: RpcContext
+  let rootRun: RunRow
+  let dispatch: DispatchContextRow
+
+  afterEach(() => {
+    h.cleanup()
+  })
+
+  function setup(): void {
+    ;({ db, runtime, ctx } = h.setup(false))
+    vi.spyOn(runtime, 'getTerminalPaneKey').mockImplementation((handle) =>
+      handle === 'term_coord' ? coordPane : handle === 'term_lead' ? leadPane : null
+    )
+    rootRun = db.createRun({
+      objective: 'root',
+      coordinatorHandle: 'term_coord',
+      coordinatorPaneKey: coordPane
+    })
+    const task = db.createTask({ spec: 'lead the sub-project', runId: rootRun.id })
+    dispatch = createRootDispatch(db, task.id, 'term_lead', leadPane)
+  }
+
+  function bindLeadRun(): RunRow {
+    return db.createRun({
+      objective: 'lead',
+      coordinatorHandle: 'term_lead',
+      coordinatorPaneKey: leadPane
+    })
+  }
+
+  async function call(name: string, params: Record<string, unknown>) {
+    return h.call(name, params, ctx)
+  }
+
+  async function leadInbox(params: Record<string, unknown> = {}): Promise<unknown> {
+    return call('orchestration.check', { terminal: 'term_lead', ...params })
+  }
+
+  function deliveryIdOf(result: unknown): string {
+    if (
+      typeof result === 'object' &&
+      result !== null &&
+      'deliveryId' in result &&
+      typeof result.deliveryId === 'string'
+    ) {
+      return result.deliveryId
+    }
+    throw new Error('check returned no delivery')
+  }
+
+  it('routes dispatch:<id> mail to the Run the assignee pane now coordinates', async () => {
+    setup()
+    const leadRun = bindLeadRun()
+
+    const result = await call('orchestration.send', {
+      from: 'term_coord',
+      to: `dispatch:${dispatch.id}`,
+      subject: 'Follow-up for the lead'
+    })
+
+    expect(result).toMatchObject({
+      message: { to_handle: `run:${leadRun.id}`, run_id: leadRun.id },
+      warnings: [{ code: 'recipient_run_bound_redirect' }]
+    })
+    expect(await leadInbox()).toMatchObject({ messages: [{ subject: 'Follow-up for the lead' }] })
+  })
+
+  it('still reads dispatch mail that arrived before the pane bound its own Run', async () => {
+    setup()
+    db.insertMessage({
+      from: 'term_coord',
+      to: `dispatch:${dispatch.id}`,
+      subject: 'Sent before the lead bound a Run',
+      runId: rootRun.id
+    })
+    const leadRun = bindLeadRun()
+    db.insertMessage({
+      from: 'term_worker',
+      to: `run:${leadRun.id}`,
+      subject: 'Sub-worker report',
+      runId: leadRun.id
+    })
+
+    const first = await leadInbox()
+    expect(first).toMatchObject({ messages: [{ subject: 'Sent before the lead bound a Run' }] })
+
+    const second = await leadInbox({ ack: deliveryIdOf(first) })
+    expect(second).toMatchObject({ messages: [{ subject: 'Sub-worker report' }] })
+  })
+
+  it('keeps the --types wake condition when older Dispatch mail does not match it', async () => {
+    setup()
+    db.insertMessage({
+      from: 'term_coord',
+      to: `dispatch:${dispatch.id}`,
+      subject: 'Older status note',
+      type: 'status',
+      runId: rootRun.id
+    })
+    const leadRun = bindLeadRun()
+    db.insertMessage({
+      from: 'term_worker',
+      to: `run:${leadRun.id}`,
+      subject: 'Sub-worker finished',
+      type: 'worker_done',
+      runId: leadRun.id
+    })
+
+    const woke = await leadInbox({ wait: true, types: 'worker_done', timeoutMs: 500 })
+
+    expect(woke).toMatchObject({
+      runId: leadRun.id,
+      messages: [{ subject: 'Sub-worker finished' }]
+    })
+  })
+
+  it('delivers a reply to a Run-bound sender and wakes its waiting check', async () => {
+    setup()
+    const leadRun = bindLeadRun()
+    const report = db.insertMessage({
+      from: 'term_lead',
+      to: `run:${rootRun.id}`,
+      subject: 'Lead report',
+      runId: rootRun.id
+    })
+
+    const waiting = leadInbox({ wait: true, timeoutMs: 2_000 })
+    const reply = await call('orchestration.reply', {
+      id: report.id,
+      from: 'term_coord',
+      body: 'Decision'
+    })
+
+    expect(reply).toMatchObject({
+      message: { to_handle: `run:${leadRun.id}`, run_id: leadRun.id }
+    })
+    expect(await waiting).toMatchObject({
+      timedOut: false,
+      messages: [{ subject: 'Re: Lead report' }]
+    })
+  })
+
+  it('keeps dispatch:<id> mail on the Dispatch mailbox while the assignee has no Run', async () => {
+    setup()
+
+    const result = await call('orchestration.send', {
+      from: 'term_coord',
+      to: `dispatch:${dispatch.id}`,
+      subject: 'Plain worker follow-up'
+    })
+
+    expect(result).toMatchObject({ message: { to_handle: `dispatch:${dispatch.id}` } })
+    expect(result).not.toHaveProperty('warnings')
+  })
+
+  it('keeps a reply on the raw handle when the sender has no Run or live pane', async () => {
+    setup()
+    const note = db.insertMessage({
+      from: 'term_offline',
+      to: `run:${rootRun.id}`,
+      subject: 'Offline note',
+      runId: rootRun.id
+    })
+
+    const reply = await call('orchestration.reply', {
+      id: note.id,
+      from: 'term_coord',
+      body: 'Ack'
+    })
+
+    expect(reply).toMatchObject({ message: { to_handle: 'term_offline', run_id: rootRun.id } })
+  })
+})
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/send-group.test.ts b/src/main/runtime/rpc/methods/orchestration/messaging/send-group.test.ts
index b076be065931..62d2b5da4950 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/send-group.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/send-group.test.ts
@@ -69,7 +69,7 @@ describe('orchestration.send group addresses', () => {
       return terminal ? `${terminal.tabId}:${terminal.leafId}` : null
     })
     vi.spyOn(runtime, 'getAgentStatusForHandle').mockImplementation(
-      (handle: string) => agentStatuses?.[handle] ?? null
+      async (handle: string) => agentStatuses?.[handle] ?? null
     )
   }
 
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/send-group.ts b/src/main/runtime/rpc/methods/orchestration/messaging/send-group.ts
index cb75bca27054..ebcff6c284e5 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/send-group.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/send-group.ts
@@ -148,7 +148,7 @@ export async function sendGroupMessage(args: {
     const { terminals } = await runtime.listTerminals(undefined, undefined, {
       includeVisualLayouts: false
     })
-    agents = [...terminals, ...listAddressableStructuredWorkers()]
+    agents = [...terminals, ...listAddressableStructuredWorkers(db)]
   }
   // Revalidate after discovery before selecting recipients or writing mail.
   revalidateLegacyCoordinator?.()
@@ -167,8 +167,23 @@ export async function sendGroupMessage(args: {
           agents,
           warnings: groupWarnings
         })
-  const handles = resolveGroupAddress(groupAddress, from, candidates, (handle: string) =>
-    runtime.getAgentStatusForHandle(handle)
+  // Read up front: a structured worker's status comes from its journal, which may need opening.
+  const statuses =
+    groupAddress.toLowerCase() === '@idle'
+      ? new Map(
+          await Promise.all(
+            candidates.map(
+              async (candidate) =>
+                [candidate.handle, await runtime.getAgentStatusForHandle(candidate.handle)] as const
+            )
+          )
+        )
+      : new Map<string, string | null>()
+  const handles = resolveGroupAddress(
+    groupAddress,
+    from,
+    candidates,
+    (handle: string) => statuses.get(handle) ?? null
   )
   if (handles.length === 0) {
     // Preserve the recovery addresses even when every worker was skipped.
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/send-methods.ts b/src/main/runtime/rpc/methods/orchestration/messaging/send-methods.ts
index da0089953f02..1186fe017587 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/send-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/send-methods.ts
@@ -7,6 +7,7 @@ import { resolveMessageRun } from '../routing'
 import {
   assertDispatchMailboxDeliverable,
   resolveBareOrchestrationRecipient,
+  resolveRunBoundDispatchRecipient,
   type SendRecipientWarning
 } from './recipient-routing'
 import {
@@ -16,6 +17,7 @@ import {
 } from '../../../orchestration-mutation-executor'
 import { replayMutationNudge } from './mutation-replay-nudge'
 import { sendRemoteMessage } from './send-remote'
+import { mayNameSession } from './session-recipient'
 import { sendPointToPointMessage } from '../../../../../fork-heimdall/orchestration/send-point-to-point'
 import { sendGroupMessage } from './send-group'
 import { sendFederatedControlMail } from './send-control-mail'
@@ -131,6 +133,10 @@ export const ORCHESTRATION_SEND_METHODS = [
       const sendWarnings: SendRecipientWarning[] = []
       let messageRunId = routing.run?.id
       if (!isGroupAddress(to) && !to.startsWith('run:') && !to.startsWith('dispatch:')) {
+        if (mayNameSession(to)) {
+          // Recipient routing reads the session record store, which the host opens lazily.
+          await runtime.ensureStructuredAgentSessionHost().catch(() => undefined)
+        }
         const recipient = resolveBareOrchestrationRecipient({
           runtime,
           db,
@@ -162,7 +168,18 @@ export const ORCHESTRATION_SEND_METHODS = [
             : undefined
         // Federated targets perform their own liveness check before relaying.
         if (addressedDispatchId && !federatedTarget) {
-          assertDispatchMailboxDeliverable(db, addressedDispatchId)
+          assertDispatchMailboxDeliverable(runtime, db, addressedDispatchId)
+          const runBound = resolveRunBoundDispatchRecipient(
+            runtime,
+            db,
+            addressedDispatchId,
+            params.run
+          )
+          if (runBound) {
+            to = runBound.to
+            messageRunId = runBound.runId
+            sendWarnings.push(runBound.warning)
+          }
         }
         const federatedControl = sendFederatedControlMail({
           params,
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/session-recipient.ts b/src/main/runtime/rpc/methods/orchestration/messaging/session-recipient.ts
new file mode 100644
index 000000000000..a22975c04548
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/session-recipient.ts
@@ -0,0 +1,118 @@
+/**
+ * An agent session named as a recipient: `session:<id>`, or a bare Orca session id. Any session on
+ * this host can be addressed, not only one that coordinates a Run: an agent's id is its public
+ * address, and a user telling one agent to message another's id is a supported workflow.
+ *
+ * Mail that no Run or Dispatch owns is stored at the conversation's `session:<root id>` and pointed
+ * at its live session as a turn, so any session of a `/clear` lineage is a valid spelling. A
+ * released lease is not a refusal (the pointer's send starts its agent); a closed chat, another host,
+ * and an unknown id are, before anything is stored.
+ */
+
+import {
+  ORCA_SESSION_ADDRESS_PREFIX,
+  formatOrcaSessionAddress,
+  isOrcaSessionId,
+  parseOrcaSessionAddress,
+  type OrcaSessionAddress,
+  type OrcaSessionId
+} from '../../../../../../shared/orca-session-address'
+// The caller codes, reused: each names the same fact about a session, whichever side of the mail it is on.
+import { ORCHESTRATION_SESSION_CALLER_ERROR_CODES as CODES } from '../../../../../../shared/orchestration-session-caller-codes'
+import {
+  lookupOrcaAgentSession,
+  structuredSessionMailReach
+} from '../../../../orchestration/structured-session-mail-address'
+import type { AgentSessionRecordReader } from '../../../../orchestration/structured-session-lineage'
+import type { OrchestrationDb } from '../../../../orchestration/db'
+
+/** `address` is the named session's own spelling; the mailbox mail lands in is its identity address. */
+export type SessionRecipient = { sessionId: OrcaSessionId; address: OrcaSessionAddress }
+
+export type SessionRecipientRefusal = {
+  code: (typeof CODES)[keyof typeof CODES]
+  message: string
+}
+
+/** Whether a recipient may name a session, so the caller can install the session host first. */
+export function mayNameSession(recipient: string): boolean {
+  return recipient.startsWith(ORCA_SESSION_ADDRESS_PREFIX) || isOrcaSessionId(recipient)
+}
+
+/**
+ * The session a recipient names. A bare string names a session only when it is an Orca session id
+ * this host has a record for; anything else stays a terminal handle, exactly as before.
+ */
+export function readSessionRecipient(
+  recipient: string,
+  store: AgentSessionRecordReader | null
+): SessionRecipient | SessionRecipientRefusal | null {
+  if (recipient.startsWith(ORCA_SESSION_ADDRESS_PREFIX)) {
+    const sessionId = parseOrcaSessionAddress(recipient)
+    return sessionId
+      ? { sessionId, address: formatOrcaSessionAddress(sessionId) }
+      : {
+          code: CODES.unknown,
+          message: `${recipient} does not name an Orca agent session id. No message was sent.`
+        }
+  }
+  const sessionId = isOrcaSessionId(recipient) ? recipient : null
+  const found = sessionId && store ? lookupOrcaAgentSession(store, sessionId) : null
+  if (found?.kind === 'provider-id') {
+    return providerIdRefusal(recipient, found.orcaSessionId)
+  }
+  return sessionId && found?.kind === 'found'
+    ? { sessionId, address: formatOrcaSessionAddress(sessionId) }
+    : null
+}
+
+/** Null when mail to this session can be stored and delivered here; otherwise why not. */
+export function refuseUndeliverableSessionRecipient(
+  recipient: SessionRecipient,
+  store: AgentSessionRecordReader | null,
+  db: OrchestrationDb
+): SessionRecipientRefusal | null {
+  const { sessionId } = recipient
+  if (!store) {
+    return {
+      code: CODES.unknown,
+      message: `Agent session ${sessionId} cannot be verified: this Orca is not running its agent-session host. No message was sent.`
+    }
+  }
+  const found = lookupOrcaAgentSession(store, sessionId)
+  if (found.kind === 'provider-id') {
+    return providerIdRefusal(sessionId, found.orcaSessionId)
+  }
+  if (found.kind === 'unknown') {
+    return {
+      code: CODES.unknown,
+      message: `No Orca agent session ${sessionId} exists on this host. No message was sent.`
+    }
+  }
+  const reach = structuredSessionMailReach(store, found.record, db)
+  if (reach.kind === 'other-host') {
+    return {
+      code: CODES.hostBoundary,
+      message: `Agent session ${sessionId} runs on another host; mail reaches a session only on the host that runs it. Send from that host. No message was sent.`
+    }
+  }
+  if (reach.kind === 'ended') {
+    return {
+      code: CODES.notLive,
+      message:
+        reach.reason === 'continuation-missing'
+          ? `Agent session ${sessionId} was cleared, and this host has no record of the session that continues it. No message was sent.`
+          : reach.reason === 'worker-identity-lost'
+            ? `Agent session ${sessionId} is a structured worker whose worker identity this host no longer has, so it can never read that mail. No message was sent.`
+            : `Agent session ${sessionId} has ended: its chat was closed. No message was sent.`
+    }
+  }
+  return null
+}
+
+function providerIdRefusal(id: string, orcaSessionId: string): SessionRecipientRefusal {
+  return {
+    code: CODES.providerId,
+    message: `${id} is the provider's own session id, which changes on /clear. This session's Orca address is ${ORCA_SESSION_ADDRESS_PREFIX}${orcaSessionId}; use that instead. No message was sent.`
+  }
+}
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/settled-dispatch-mail.test.ts b/src/main/runtime/rpc/methods/orchestration/messaging/settled-dispatch-mail.test.ts
index e91614061ea5..ddffed468900 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/settled-dispatch-mail.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/settled-dispatch-mail.test.ts
@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, it } from 'vitest'
+import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { RpcContext } from '../../../core'
 import type { OrchestrationDb } from '../../../../orchestration/db'
 import { createRootDispatch } from '../../../../orchestration/db/root-dispatch-test-fixture'
@@ -58,6 +58,38 @@ describe('orchestration.send to a settled Dispatch mailbox', () => {
     ).rejects.toThrow(new RegExp(`run:${dispatch.run_id}`))
   })
 
+  it('names the Run a settled assignee now coordinates, not the sender Run', async () => {
+    setup()
+    const leadPane = 'tab_lead:22222222-2222-4222-9222-222222222222'
+    vi.spyOn(ctx.runtime, 'getLiveTerminalPaneKey').mockReturnValue(leadPane)
+    const task = db.createTask({ spec: 'lead that settled and kept coordinating' })
+    const dispatch = createRootDispatch(db, task.id, 'term_lead', leadPane)
+    db.completeDispatch(dispatch.id)
+    const leadRun = db.createRun({
+      objective: 'lead',
+      coordinatorHandle: 'term_lead',
+      coordinatorPaneKey: leadPane
+    })
+
+    const rejection = call('orchestration.send', {
+      from: 'term_coord',
+      to: `dispatch:${dispatch.id}`,
+      subject: 'One more thing'
+    })
+
+    await expect(rejection).rejects.toMatchObject({ code: 'dispatch_inactive' })
+    await expect(rejection).rejects.toThrow(new RegExp(`run:${leadRun.id}`))
+    await expect(rejection).rejects.not.toThrow(new RegExp(`run:${dispatch.run_id}`))
+    expect(db.getInbox()).toEqual([])
+    await expect(
+      call('orchestration.check', { terminal: 'term_coord', run: leadRun.id })
+    ).rejects.toMatchObject({ code: 'consumer_fenced' })
+    // Run addresses are already visible to callers; a hint grants no consuming authority.
+    expect(await call('orchestration.runShow', { id: leadRun.id })).toMatchObject({
+      run: { id: leadRun.id }
+    })
+  })
+
   it('does not write an undeliverable message row', async () => {
     setup()
     const task = db.createTask({ spec: 'worker that already reported' })
diff --git a/src/main/runtime/rpc/methods/orchestration/runs/runs.ts b/src/main/runtime/rpc/methods/orchestration/runs/runs.ts
index f074b5eba03e..88653af8ecdb 100644
--- a/src/main/runtime/rpc/methods/orchestration/runs/runs.ts
+++ b/src/main/runtime/rpc/methods/orchestration/runs/runs.ts
@@ -2,6 +2,9 @@ import { defineMethod } from '../../../core'
 import { OrchestrationError } from '../../../../orchestration/orchestration-error'
 import { assertCallerHandleMatchesEvidence, resolveOrchestrationCaller } from './run-scope'
 import { exposeRun } from './run-receipt'
+import type { OrcaRuntimeService } from '../../../../orca-runtime'
+import type { OrchestrationCallerIdentity } from '../../../../orchestration/orchestration-caller-identity'
+import { currentDispatchAssigneeRun } from '../messaging/recipient-routing'
 import {
   RunCreateParams,
   RunCurrentParams,
@@ -10,6 +13,18 @@ import {
   RunUseParams
 } from '../../../../../../shared/rpc-contract/orchestration-runs-params'
 
+function cancelBoundDispatchWaiters(
+  runtime: OrcaRuntimeService,
+  caller: OrchestrationCallerIdentity,
+  runId: string
+): void {
+  const db = runtime.getOrchestrationDb()
+  const dispatch = db.getActiveDispatchForIdentity(caller.address, caller.paneKey ?? undefined)
+  if (dispatch && currentDispatchAssigneeRun(runtime, db, dispatch)?.id === runId) {
+    runtime.cancelMessageWaiters(`dispatch:${dispatch.id}`)
+  }
+}
+
 export const ORCHESTRATION_RUN_METHODS = [
   defineMethod({
     name: 'orchestration.runCreate',
@@ -30,6 +45,7 @@ export const ORCHESTRATION_RUN_METHODS = [
         coordinatorOrcaSessionId: caller.orcaSessionId
       })
       runtime.cancelMessageWaiters(params.from)
+      cancelBoundDispatchWaiters(runtime, caller, run.id)
       if (priorRun) {
         runtime.cancelMessageWaiters(`run:${priorRun.id}`)
       }
@@ -86,6 +102,7 @@ export const ORCHESTRATION_RUN_METHODS = [
         )
       }
       runtime.cancelMessageWaiters(params.from)
+      cancelBoundDispatchWaiters(runtime, caller, run.id)
       runtime.cancelMessageWaiters(`run:${params.id}`)
       if (priorRun && priorRun.id !== params.id) {
         runtime.cancelMessageWaiters(`run:${priorRun.id}`)
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/agent-status-producer-census.test.ts b/src/main/runtime/rpc/methods/orchestration/worker/agent-status-producer-census.test.ts
index cef9e7dd8c13..e939d8a05f7a 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/agent-status-producer-census.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/agent-status-producer-census.test.ts
@@ -1,4 +1,3 @@
-import { resolve } from 'node:path'
 import { describe, expect, it, vi } from 'vitest'
 
 const { ipcHandlers } = vi.hoisted(() => ({
@@ -31,10 +30,6 @@ vi.mock('@electron-toolkit/utils', () => ({
 }))
 
 import type Database from '../../../../../sqlite/sync-database'
-import {
-  scanSourceTree,
-  stripComments
-} from '../../../../../../shared/source-scan/source-tree-scan'
 import type { AgentStatusIpcPayload } from '../../../../../../shared/agent-status-ipc-payload'
 import { toAgentStatusIpcPayload } from '../../../../../agent-hooks/server/server-status-identity'
 import type { EnrichedAgentHookEventPayload } from '../../../../../agent-hooks/server/server-types'
@@ -47,119 +42,6 @@ import { OrcaRuntimeService } from '../../../../orca-runtime'
 import { ORCHESTRATION_WORKER_LIST_METHOD } from './worker-list-method'
 import { projectFleetWorkerPage } from './worker-observation'
 
-/**
- * Census of every production site in `src/main` that turns hook-server agent-status rows into
- * something a consumer reads.
- *
- * Why a census and not a single seam test: the false-liveness bug (rework failure table L-1) was
- * one such site publishing rows that carry a pane key and nothing else, into a consumer that
- * matches on terminal identity. Fixing that site fixes nothing if a fifth one is added beside it,
- * so the list is pinned and the identity-bearing paths are each driven end to end.
- */
-type CensusRow = {
-  path: string
-  /** `produces` = mints payloads a consumer reads; `consumes` = reads them; `wiring` = neither. */
-  kind: 'produces' | 'consumes' | 'wiring'
-  role: string
-}
-
-const CENSUS: readonly CensusRow[] = [
-  {
-    path: 'main/ipc/agent-hooks.ts',
-    kind: 'produces',
-    role: 'agentStatus:getSnapshot — renderer pull, enriched (driven below)'
-  },
-  {
-    path: 'main/ipc/agent-status-ipc-boundary.ts',
-    kind: 'produces',
-    role: 'resolveAgentStatusBinding — the one identity lookup the pull and fleet paths share'
-  },
-  {
-    path: 'main/runtime/agent-status-observed-pane-identity.ts',
-    kind: 'produces',
-    role: 'captures the identity a hook row was observed under (fleet-status-observed-identity)'
-  },
-  {
-    path: 'main/runtime/orchestration-fleet-agent-status-snapshot.ts',
-    kind: 'produces',
-    role: 'readOrchestrationFleetAgentStatusSnapshot — the minted fleet evidence (driven below)'
-  },
-  {
-    path: 'main/startup/main-window-agent-status.ts',
-    kind: 'produces',
-    role: 'agentStatus:set — renderer live push, enriched inline (driven below)'
-  },
-  {
-    path: 'main/startup/main-process-runtime-service.ts',
-    kind: 'wiring',
-    role: 'binds the hook server snapshot into the runtime deps'
-  },
-  {
-    path: 'main/orcad/orcad-entry.ts',
-    kind: 'wiring',
-    role: 'binds the same snapshot, OSC producer and structured sink into the headless orcad runtime deps'
-  },
-  {
-    path: 'main/runtime/orca-runtime-state-fields.ts',
-    kind: 'wiring',
-    role: 'stores the snapshot deps on the runtime'
-  },
-  {
-    path: 'main/runtime/orca-runtime-preserved-branch-cleanup.ts',
-    kind: 'wiring',
-    role: 'declares the snapshot dep fields'
-  },
-  {
-    path: 'main/runtime/orca-runtime-get-orchestration-dispatch-authority.ts',
-    kind: 'produces',
-    role: 'getOrchestrationFleetAgentStatusSnapshot — delegates to the checked snapshot module'
-  },
-  {
-    path: 'main/runtime/orca-runtime-stop-requested-pty-ids.ts',
-    kind: 'wiring',
-    role: 'feeds the enriched fleet rows to the orchestration projection'
-  },
-  {
-    path: 'main/runtime/runtime-agent-orchestration-projection.ts',
-    kind: 'consumes',
-    role: 'indexes rows by pane key to attach dispatch context'
-  },
-  {
-    path: 'main/runtime/rpc/methods/orchestration/worker/worker-list-method.ts',
-    kind: 'consumes',
-    role: 'worker-list fleet verdict (driven below)'
-  },
-  {
-    path: 'main/runtime/rpc/methods/orchestration/worker/worker-observation.ts',
-    kind: 'consumes',
-    role: 'worker-show fleet verdict (driven below)'
-  },
-  {
-    path: 'main/runtime/orca-runtime-get-worktree-ps.ts',
-    kind: 'consumes',
-    role: 'worktree.ps inline agent rows (driven below)'
-  },
-  {
-    path: 'main/runtime/orca-runtime-get-terminal-interactive-wait.ts',
-    kind: 'consumes',
-    role: 'exact-worker provider session selection, matched on pane key'
-  },
-  {
-    path: 'main/runtime/orca-runtime-serialize-agent-prompt-submission.ts',
-    kind: 'consumes',
-    role: 'prompt-submission serialization, matched on pane key'
-  },
-  {
-    path: 'main/runtime/orca-runtime-prune-mobile-session-tab-group-layout.ts',
-    kind: 'consumes',
-    role: 'mobile tab-group pruning and its live agent row, plus the pane identity accessors'
-  }
-]
-
-/** The names a hook row travels under. A new producer has to use one of them to reach a consumer. */
-const PRODUCER_TOKENS =
-  /getAgentStatusSnapshot|getAgentProviderSessionSnapshot|enrichAgentStatusIpcPayload|mintAgentStatusFleetEvidence|resolveAgentStatusBinding|getOrchestrationFleetAgentStatusSnapshot|agentStatus:set/
-
 const PANE_KEY = 'tab-census:leaf-census'
 const TERMINAL_HANDLE = 'term_census'
 const PROCESS_INCARNATION = 'pty-census:inc-1'
@@ -258,17 +140,7 @@ function censusStore() {
   }
 }
 
-describe('agent status producer census', () => {
-  it('pins every production site that hands hook rows to a consumer', () => {
-    const root = resolve(import.meta.dirname, '../../../../../..')
-    const scanned = scanSourceTree(resolve(root, 'main'))
-      .filter((file) => PRODUCER_TOKENS.test(stripComments(file.source)))
-      .map((file) => `main/${file.relativePath}`)
-      .sort()
-
-    expect(scanned).toEqual(CENSUS.map((row) => row.path).sort())
-  })
-
+describe('agent status identity across every producer and consumer path', () => {
   it('reads live on worker-list from a hook row that carries only a pane key', async () => {
     const db = new OrchestrationDb(':memory:')
     try {
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/composed-workers.test.ts b/src/main/runtime/rpc/methods/orchestration/worker/composed-workers.test.ts
index 8459a9886e49..d265858b0243 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/composed-workers.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/composed-workers.test.ts
@@ -155,6 +155,7 @@ describe('orchestration RPC methods', () => {
       // the tab without scrolling the sidebar to the worker's workspace.
       expect(runtime.createTerminal).toHaveBeenCalledWith('id:repo::worktree', {
         startupAgent: 'codex',
+        launchSource: 'orchestration',
         title: `worker-${task.id}`,
         surfaceOwner: false
       })
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/deliver-worker-dispatch-preamble.ts b/src/main/runtime/rpc/methods/orchestration/worker/deliver-worker-dispatch-preamble.ts
index ecb3270874e4..bc2b9601cebc 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/deliver-worker-dispatch-preamble.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/deliver-worker-dispatch-preamble.ts
@@ -5,6 +5,7 @@ import {
   dispatchPreambleSendOptions
 } from '../../../../orchestration/preamble'
 import { sendStructuredWorkerPreamble } from '../../orchestration-structured-worker-session'
+import type { WorkerTurnStartObservation } from './worker-start-turn-observation'
 import type { createStructuredWorkerSessionForWorktree } from './worker-topology'
 
 type StructuredSession = Awaited<ReturnType<typeof createStructuredWorkerSessionForWorktree>> | null
@@ -14,7 +15,8 @@ type StructuredSession = Awaited<ReturnType<typeof createStructuredWorkerSession
  *
  * The preamble itself is identical for both: a worker is taught the same verbs whichever mode it
  * runs in, and only the delivery differs — a PTY write returns a queued/accepted receipt, while a
- * structured turn either is acknowledged or throws.
+ * structured turn is acknowledged, still held for an agent that has not started, or throws. Held is
+ * a turn start nobody observed yet: the start is left unknown, not torn down.
  */
 export async function deliverWorkerDispatchPreamble(args: {
   runtime: OrcaRuntimeService
@@ -28,7 +30,10 @@ export async function deliverWorkerDispatchPreamble(args: {
   dispatchCapability: string
   devMode: boolean | undefined
   requestId: string
-}): Promise<RuntimeTerminalSend['prompt']> {
+}): Promise<{
+  prompt?: RuntimeTerminalSend['prompt']
+  structuredTurnStart?: WorkerTurnStartObservation
+}> {
   const { runtime, structuredSession, terminalHandle } = args
   const preamble = buildDispatchPreamble({
     // Depth only. A worker is taught the same verbs whichever mode it runs in, so this must not
@@ -45,19 +50,32 @@ export async function deliverWorkerDispatchPreamble(args: {
     cliCommand: runtime.getTerminalOrchestrationCliCommand(terminalHandle)
   })
   if (structuredSession) {
-    await sendStructuredWorkerPreamble({
+    const delivery = await sendStructuredWorkerPreamble({
       host: structuredSession.host,
       sessionId: structuredSession.identity.sessionId,
       dispatchId: args.dispatchId,
       preamble
     })
-    return undefined
+    return {
+      structuredTurnStart:
+        delivery === 'accepted'
+          ? { verdict: 'observed' }
+          : {
+              verdict: 'unobserved',
+              reason:
+                'The dispatch preamble was accepted, but the agent had not started to take it. It ' +
+                'is delivered when the agent starts; if the worker then reports, this Dispatch ' +
+                'settles normally.'
+            }
+    }
+  }
+  return {
+    prompt: (
+      await runtime.sendTerminalAgentPrompt(
+        terminalHandle,
+        preamble,
+        dispatchPreambleSendOptions(args.requestId)
+      )
+    ).prompt
   }
-  return (
-    await runtime.sendTerminalAgentPrompt(
-      terminalHandle,
-      preamble,
-      dispatchPreambleSendOptions(args.requestId)
-    )
-  ).prompt
 }
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/failed-worker-start-teardown.ts b/src/main/runtime/rpc/methods/orchestration/worker/failed-worker-start-teardown.ts
index 250b639fc603..758bc3397cb7 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/failed-worker-start-teardown.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/failed-worker-start-teardown.ts
@@ -8,10 +8,10 @@ import type { createStructuredWorkerSessionForWorktree } from './worker-topology
 /**
  * Undoes what a start created before it failed.
  *
- * A start that never reached ready leaves no settlement to release the hold later, and its session
- * was already published as a chat tab — without the discard, a failed start strands a dead chat tab
- * that the durable restore index republishes on every app launch. Both halves are best-effort by
- * construction, so neither can replace the real error.
+ * A start that never reached ready leaves no settlement to release its binding later, and its
+ * session was already published as a chat tab — without the discard, a failed start strands a dead
+ * chat tab that the durable restore index republishes on every app launch. Both halves are
+ * best-effort by construction, so neither can replace the real error.
  *
  * A created PTY terminal is deliberately NOT torn down: its custody row was written at creation, so
  * `worker-release` on the failed Dispatch owns that cleanup and the coordinator decides when.
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/local-worker-start.ts b/src/main/runtime/rpc/methods/orchestration/worker/local-worker-start.ts
index d32232f84478..d6b265c41a97 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/local-worker-start.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/local-worker-start.ts
@@ -188,10 +188,17 @@ export async function startLocalWorker(args: {
           effects,
           timeoutMs: params.timeoutMs ?? 60_000
         })
-      : await runtime.waitForTerminal(terminalHandle, {
-          condition: 'tui-idle',
-          timeoutMs: params.timeoutMs ?? 60_000
-        })
+      : // ZCode emits SessionStart only after input; its first dispatch must wait for the composer.
+        agent === 'zcode' && !params.terminal
+        ? await runtime.waitForFreshWorkerComposer(
+            terminalHandle,
+            agent,
+            params.timeoutMs ?? 60_000
+          )
+        : await runtime.waitForTerminal(terminalHandle, {
+            condition: 'tui-idle',
+            timeoutMs: params.timeoutMs ?? 60_000
+          })
     if (wait) {
       persistWorkerSetupWaitOutcome({ ...setupStage, wait })
       if (!wait.satisfied) {
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/structured-worker-release-stop.ts b/src/main/runtime/rpc/methods/orchestration/worker/structured-worker-release-stop.ts
index 4a32147d1a68..91e524e4bf17 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/structured-worker-release-stop.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/structured-worker-release-stop.ts
@@ -4,15 +4,15 @@ import type { WorkerTerminalResourceRow } from '../../../../orchestration/worker
 import { stopStructuredWorker } from '../../orchestration-structured-worker-lifecycle'
 import type { StructuredWorkerIdentity } from '../../../../structured-worker-identity'
 import { archiveSummary } from './worker-terminal-resource-presentation'
-import type { WorkerReleaseReceipt } from './worker-release-completion'
+import { releaseUnknownRecovery, type WorkerReleaseReceipt } from './worker-release-completion'
 
 /**
  * The close half of a release for a worker that IS a structured session.
  *
  * Separate from the PTY close for the same reason the delivery lane is: there is no terminal to
  * close and no exit to observe, so the host's own settlement is the only proof available. Only a
- * proven close may settle; an unproven one reports `release_unknown` and stays retryable under the
- * same request id.
+ * proven close may settle; an unproven one reports `release_unknown` and stays retryable, but only
+ * under a fresh request id — replaying the prior one just returns this same receipt.
  */
 export async function stopStructuredWorkerForRelease(args: {
   structured: StructuredWorkerIdentity
@@ -36,7 +36,7 @@ export async function stopStructuredWorkerForRelease(args: {
       processAction: stop.closeAttempted ? 'closed_agent_terminal' : 'none',
       archive: { source: args.archiveSource, status: args.archiveStatus },
       lastError: unknown.release_error ?? stop.reason,
-      recovery: `Inspect with: orca orchestration worker-show --dispatch ${dispatchId} --json — then repeat worker-release with the same --retry-request.`
+      recovery: releaseUnknownRecovery(dispatchId)
     }
   }
   const settled = db.settleWorkerTerminalRelease(resource.id)
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-control.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-control.ts
index 5e8babf3c5e1..a9211532626a 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-control.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-control.ts
@@ -143,7 +143,10 @@ export const ORCHESTRATION_WORKER_CONTROL_METHODS = [
           `Worker Dispatch ${params.dispatch} no longer resolves to its exact process.`
         )
       }
-      const structured = readStructuredWorkerOutput({
+      // Read via the handle inspectWorkerTerminal proved live: the durable one, or a handle
+      // re-minted from the recorded incarnation after the durable handle went stale.
+      const liveHandle = observation.terminalHandle ?? terminalHandle
+      const structured = await readStructuredWorkerOutput({
         db,
         dispatchId: params.dispatch,
         workerState: worker?.state ?? 'unsupervised',
@@ -163,7 +166,7 @@ export const ORCHESTRATION_WORKER_CONTROL_METHODS = [
       const output = await readExactWorkerOutput({
         runtime,
         dispatchId: params.dispatch,
-        terminalHandle,
+        terminalHandle: liveHandle,
         workerState: worker?.state ?? 'unsupervised',
         terminalStatus:
           observation.status === 'exited'
@@ -200,9 +203,8 @@ export const ORCHESTRATION_WORKER_CONTROL_METHODS = [
       const abandoned = runtime.getOrchestrationDb().abandonWorkerDispatch(params.dispatch)
       if (abandoned.disposition === 'context_only') {
         if (!abandoned.alreadySettled) {
-          // Abandon settles the Dispatch, so it owes the same hold release stop and release do.
-          // A surviving hold pins the provider child for the life of the app and makes host crash
-          // recovery respawn a worker nobody is waiting on.
+          // Abandon settles the Dispatch, so it owes the same binding release stop and release do:
+          // a surviving redrive subscription keeps nudging a worker nobody is waiting on.
           releaseStructuredWorkerSession(params.dispatch, runtime)
           runtime.notifyMessageArrived(`dispatch:${params.dispatch}`, 'status')
         }
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-observation.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-observation.ts
index 83b3d020f4ca..f1202c6e7cfe 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-observation.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-observation.ts
@@ -9,12 +9,14 @@ import {
   observeStructuredWorker,
   resolveStructuredWorkerForDispatch
 } from '../../orchestration-structured-worker-lifecycle'
+import { structuredWorkerAddressable } from '../../../../structured-worker-custody'
 import type {
   DispatchContextRow,
   FederatedDispatchRow,
   WorkerDispatchRow
 } from '../../../../orchestration/types'
 
+/** Observe a worker terminal, re-minting a live handle from the recorded process incarnation when the durable handle went stale, so a still-running worker is never reported missing and leaked. */
 export async function inspectWorkerTerminal(
   runtime: OrcaRuntimeService,
   db: OrchestrationDb,
@@ -27,12 +29,18 @@ export async function inspectWorkerTerminal(
   reason?: string
   /** Set only on a proven-exact worker parked on a prompt that needs a human. */
   agentWait?: RuntimeTerminalInteractiveWait | null
+  /** Structured workers only: whether mail still reaches it — at rest included, since the mail
+   *  starts it. Absent when ownership cannot be read. `status` stays the process verdict. */
+  addressable?: boolean
+  /** The handle that actually resolved: the durable one, or a live handle re-minted from the
+   *  recorded process incarnation after the durable handle went stale. Null when none resolved. */
+  terminalHandle: string | null
 }> {
   const worker = db.getWorkerDispatch(dispatchId)
   const terminalHandle =
     worker?.agent_terminal_handle ?? db.getDispatchContextById(dispatchId)?.assignee_handle
   if (!terminalHandle) {
-    return { terminal: null, exact: false, status: 'unattached' }
+    return { terminal: null, exact: false, status: 'unattached', terminalHandle: null }
   }
   const structured = resolveStructuredWorkerForDispatch(db, dispatchId)
   if (structured) {
@@ -49,24 +57,54 @@ export async function inspectWorkerTerminal(
       processIncarnation: structured.processIncarnation
     })
     const observation = observeStructuredWorker(structured)
+    const addressable = structuredWorkerAddressable(
+      db,
+      structured.sessionId,
+      db.getWorkerTerminalResourceByHandle?.(structured.handle)
+    )
     return {
       terminal: null,
       exact,
       status: exact ? observation.status : 'identity_changed',
-      ...(exact && observation.reason ? { reason: observation.reason } : {})
+      ...(exact && observation.reason ? { reason: observation.reason } : {}),
+      ...(exact && addressable !== null ? { addressable } : {}),
+      terminalHandle: null
+    }
+  }
+  let effectiveHandle = terminalHandle
+  let terminal = await runtime.showTerminal(effectiveHandle).catch(() => null)
+  if (!terminal) {
+    // Why: the durable handle resolves nowhere after a renderer graph epoch bump or handle
+    // invalidation, yet the recorded process incarnation may still name a live PTY. Re-mint a
+    // live handle (incarnation-fenced) so worker-show and release act on the still-running
+    // process instead of reporting it missing — which would leak the agent process tree.
+    // (workerList is a pure DB projection and never calls inspectWorkerTerminal.)
+    const resource = db.getWorkerTerminalResourceByOwner(dispatchId)
+    const reminted = resource?.process_incarnation
+      ? runtime.resolveTerminalHandleByProcessIncarnation(
+          resource.process_incarnation,
+          resource.host_scope
+        )
+      : null
+    if (reminted) {
+      const remintedTerminal = await runtime.showTerminal(reminted).catch(() => null)
+      if (remintedTerminal) {
+        effectiveHandle = reminted
+        terminal = remintedTerminal
+      }
     }
   }
-  const terminal = await runtime.showTerminal(terminalHandle).catch(() => null)
   if (!terminal) {
-    return { terminal: null, exact: false, status: 'missing' }
+    // The re-mint above failed, so no live handle resolved; report the durable handle unresolved.
+    return { terminal: null, exact: false, status: 'missing', terminalHandle: null }
   }
   const exact = db.isDispatchProcessCurrent({
     dispatchId,
-    paneKey: runtime.getTerminalPaneKey(terminalHandle),
-    processIncarnation: runtime.getTerminalProcessIncarnation(terminalHandle)
+    paneKey: runtime.getTerminalPaneKey(effectiveHandle),
+    processIncarnation: runtime.getTerminalProcessIncarnation(effectiveHandle)
   })
   if (!exact) {
-    return { terminal, exact, status: 'identity_changed' }
+    return { terminal, exact, status: 'identity_changed', terminalHandle: effectiveHandle }
   }
   // Why: the aggregate inventory only iterates registered providers, so a dropped
   // relay clears `connected` for every remote PTY at once. Lost contact is not a
@@ -76,38 +114,48 @@ export async function inspectWorkerTerminal(
   // Exact-gated by the early return above: a replaced process's prompt would attribute another
   // lane's blocker to this worker.
   const agentWait = terminal.agentWait
-  const verdict = runtime.getTerminalLivenessVerdict?.(terminalHandle) ?? null
+  const verdict = runtime.getTerminalLivenessVerdict?.(effectiveHandle) ?? null
   if (verdict?.status === 'unverifiable') {
-    return { terminal, exact, status: 'unverifiable', reason: verdict.reason, agentWait }
+    return {
+      terminal,
+      exact,
+      status: 'unverifiable',
+      reason: verdict.reason,
+      agentWait,
+      terminalHandle: effectiveHandle
+    }
   }
   if (verdict?.status === 'live') {
-    return { terminal, exact, status: 'live', agentWait }
+    return { terminal, exact, status: 'live', agentWait, terminalHandle: effectiveHandle }
   }
   if (!verdict) {
     const dispatch = db.getDispatchContextById?.(dispatchId)
     const persistedHostScope = parseWorkerTerminalHostScope(dispatch?.host_scope ?? null)
-    const currentHostScope = runtime.getOrchestrationDispatchAuthority?.(terminalHandle)?.hostScope
+    const currentHostScope = runtime.getOrchestrationDispatchAuthority?.(effectiveHandle)?.hostScope
     if (persistedHostScope?.kind === 'ssh' || currentHostScope?.kind === 'ssh') {
       return {
         terminal,
         exact,
         status: 'unverifiable',
         reason: 'missing_liveness_verdict',
-        agentWait
+        agentWait,
+        terminalHandle: effectiveHandle
       }
     }
     return {
       terminal,
       exact,
       status: terminal.connected === false ? 'exited' : 'live',
-      agentWait
+      agentWait,
+      terminalHandle: effectiveHandle
     }
   }
   return {
     terminal,
     exact,
     status: 'exited',
-    agentWait
+    agentWait,
+    terminalHandle: effectiveHandle
   }
 }
 
@@ -119,7 +167,8 @@ export function exposeObservation(observation: Awaited<ReturnType<typeof inspect
     status: observation.status,
     exactWorker: observation.exact,
     ...(observation.reason ? { reason: observation.reason } : {}),
-    ...(observation.agentWait !== undefined ? { agentWait: observation.agentWait } : {})
+    ...(observation.agentWait !== undefined ? { agentWait: observation.agentWait } : {}),
+    ...(observation.addressable !== undefined ? { addressable: observation.addressable } : {})
   }
 }
 
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-release-completion.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-release-completion.ts
index b686cdfe6cd4..4aca4d0420a0 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-release-completion.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-release-completion.ts
@@ -98,9 +98,8 @@ async function completeWorkerTerminalReleaseOnce(
     // here is what lets the release see the session instead of reporting it unreadable.
     //
     // NOT yet handled, and deliberately follow-up: rebinding a restarted runtime to a structured
-    // worker's hold and redrive subscription. Until that exists, a worker that survives a restart
-    // keeps no hold, so its child is evictable and its parked mail waits for the next arrival
-    // rather than a settle edge.
+    // worker's redrive subscription. Until that exists, a worker that survives a restart has its
+    // parked mail wait for the next arrival rather than a settle edge.
     await runtime.ensureStructuredAgentSessionHost().catch((error: unknown) => {
       console.warn(
         '[orchestration] structured host install failed before release',
@@ -121,6 +120,9 @@ async function completeWorkerTerminalReleaseOnce(
     }
   }
   const observation = await inspectWorkerTerminal(runtime, db, dispatchId)
+  // The live handle to act on: the durable one, or a handle re-minted from the recorded process
+  // incarnation when the durable handle went stale (inspectWorkerTerminal proved it live).
+  const terminalHandle = observation.terminalHandle ?? resource.terminal_handle
   if (observation.status === 'identity_changed') {
     const retained = db.revertWorkerTerminalReleaseToRetained(resource.id, 'identity_unproven')
     return {
@@ -132,33 +134,39 @@ async function completeWorkerTerminalReleaseOnce(
     }
   }
   if (observation.status === 'missing' || observation.status === 'unattached') {
-    if (args.mode === 'recovery') {
-      // A close can succeed before the process crashes, leaving `releasing` durable state while
-      // terminal inventory no longer resolves the handle. Only a positive host liveness verdict
-      // may settle that exact incarnation; contact loss remains pending/unverifiable.
-      if (resource.process_incarnation) {
-        const processLiveness = await runtime.inspectTerminalProcessIncarnationLiveness(
-          resource.process_incarnation,
-          resource.host_scope
-        )
-        if (processLiveness === 'exited') {
-          const reconciled = db.settleDeadWorkerTerminalRelease({
-            requestingDispatchId: dispatchId,
-            resourceId: resource.id,
-            processIncarnation: resource.process_incarnation
-          })
-          if (reconciled.disposition === 'released') {
-            runtime.notifyMessageArrived(`dispatch:${dispatchId}`, 'status')
-            return {
-              dispatchId,
-              state: 'released',
-              processAction: 'closed_exited_terminal',
-              archive: archiveSummary(reconciled.resource)
-            }
+    // Re-resolution by process incarnation (inspectWorkerTerminal) already failed, so no live PTY
+    // carries this worker's exact incarnation. If that incarnation is provably gone, settle
+    // released BEFORE the recovery defer: proof of death outranks deferral, so a provably-exited
+    // worker never languishes in release_pending across recovery passes.
+    if (resource.process_incarnation) {
+      const processLiveness = await runtime.inspectTerminalProcessIncarnationLiveness(
+        resource.process_incarnation,
+        resource.host_scope
+      )
+      if (processLiveness === 'exited') {
+        // Prefer incarnation-fenced settle (dispatch relation + process_incarnation CAS).
+        const reconciled = db.settleDeadWorkerTerminalRelease({
+          requestingDispatchId: dispatchId,
+          resourceId: resource.id,
+          processIncarnation: resource.process_incarnation
+        })
+        if (reconciled.disposition === 'released') {
+          runtime.notifyMessageArrived(`dispatch:${dispatchId}`, 'status')
+          return {
+            dispatchId,
+            state: 'released',
+            processAction: 'none',
+            archive: archiveSummary(reconciled.resource)
           }
         }
+        // settleDead retains when the archive is still mandatory and missing (e.g. requested but
+        // never committed). Do NOT plain-settle: that would discard output and break recovery's
+        // "archive is mandatory" invariant. Fall through to recovery pending / unknown instead.
       }
-      // Inventory may still be incomplete during startup/reconnect discovery; defer.
+    }
+    if (args.mode === 'recovery') {
+      // No death certificate yet: inventory may still be incomplete during startup/reconnect
+      // discovery, so defer instead of guessing.
       return {
         dispatchId,
         state: 'release_pending',
@@ -184,7 +192,7 @@ async function completeWorkerTerminalReleaseOnce(
     }
   }
 
-  if (!workerTerminalLeaseIsCurrent(runtime, db, dispatchId, resource)) {
+  if (!workerTerminalLeaseIsCurrent(runtime, db, dispatchId, resource, terminalHandle)) {
     const retained = db.revertWorkerTerminalReleaseToRetained(resource.id, 'identity_unproven')
     return {
       dispatchId,
@@ -203,7 +211,7 @@ async function completeWorkerTerminalReleaseOnce(
     const captured = await captureWorkerOutputArchive({
       runtime,
       dispatchId,
-      terminalHandle: resource.terminal_handle,
+      terminalHandle,
       attachedAtMs: orchestrationTimestampToMs(worker.created_at),
       structuredWorker: structured
     })
@@ -231,7 +239,7 @@ async function completeWorkerTerminalReleaseOnce(
       archive: archiveSummary(releasing)
     }
   }
-  if (!workerTerminalLeaseIsCurrent(runtime, db, dispatchId, releasing)) {
+  if (!workerTerminalLeaseIsCurrent(runtime, db, dispatchId, releasing, terminalHandle)) {
     const retained = db.revertWorkerTerminalReleaseToRetained(resource.id, 'identity_unproven')
     return {
       dispatchId,
@@ -254,7 +262,7 @@ async function completeWorkerTerminalReleaseOnce(
         archiveStatus
       })
     }
-    const close = await runtime.closeTerminal(resource.terminal_handle)
+    const close = await runtime.closeTerminal(terminalHandle)
     if (!close.ptyKilled) {
       const reason = describeUnconfirmedAgentStop(close)
       const unknown = db.markWorkerTerminalReleaseUnknown(resource.id, reason)
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-release-mobile-report.test.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-release-mobile-report.test.ts
index dd4ce2522ea2..d9798a47372a 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-release-mobile-report.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-release-mobile-report.test.ts
@@ -100,7 +100,7 @@ it.each(['unary', 'stream'])('mobile %s bytes do no orchestration database work'
       method.handler(method.params!.parse(params) as never, { runtime } as never)
     ).resolves.toMatchObject({ send: { accepted: true } })
   }
-  expect(write).toHaveBeenCalledWith('pty-worker', 'x')
+  expect(write).toHaveBeenCalledWith('pty-worker', 'x', 'driving')
   expect(commit).toHaveBeenCalledTimes(1)
   expect(dbAccess).not.toHaveBeenCalled()
   expect(takeover).not.toHaveBeenCalled()
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-release-runtime-incarnation.test.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-release-runtime-incarnation.test.ts
new file mode 100644
index 000000000000..4caac62f5da0
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-release-runtime-incarnation.test.ts
@@ -0,0 +1,79 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { inspectWorkerTerminal } from './worker-observation'
+import { createOrchestrationWorkerReleaseHarness } from './worker-release.test-support'
+import { makePaneKey } from '../../../../../../shared/stable-pane-id'
+
+const PTY_ID = 'runtime_test:term_worker'
+const LEAF_ID = 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb'
+
+describe('worker release through runtime incarnation recovery', () => {
+  const harness = createOrchestrationWorkerReleaseHarness()
+  afterEach(() => harness.cleanup())
+
+  it.each(['release', 'stop', 'read', 'replacement', 'disconnected'] as const)(
+    '%s uses runtime identity and close paths',
+    async (scenario) => {
+      harness.setup()
+      const { dispatchId } =
+        scenario === 'stop' ? await harness.startWorker() : await harness.startSettledWorker()
+      const runtime = harness.runtime
+      vi.mocked(runtime.showTerminal).mockRestore()
+      vi.mocked(runtime.getTerminalPaneKey).mockRestore()
+      vi.mocked(runtime.getTerminalProcessIncarnation).mockRestore()
+      vi.mocked(runtime.getOrchestrationDispatchAuthority).mockRestore()
+      vi.mocked(runtime.readTerminal).mockRestore()
+      vi.mocked(runtime.closeTerminal).mockRestore()
+      const kill = vi.fn(() => true)
+      runtime.setPtyController({ write: () => true, kill, getForegroundProcess: async () => null })
+      runtime.registerPty(PTY_ID, 'repo::worktree', null, {
+        tabId: 'tab_worker',
+        leafId: LEAF_ID,
+        incarnationId: scenario === 'replacement' ? '2' : '1'
+      })
+      await expect(runtime.showTerminal('term_worker')).rejects.toThrow()
+      if (scenario === 'disconnected') {
+        vi.spyOn(runtime, 'getTerminalLivenessVerdict').mockReturnValue({
+          status: 'unverifiable',
+          reason: 'transport unavailable'
+        })
+        const observed = await inspectWorkerTerminal(runtime, harness.db, dispatchId)
+        expect(observed).toMatchObject({ exact: true, status: 'unverifiable' })
+        expect(kill).not.toHaveBeenCalled()
+        return
+      }
+      if (scenario === 'stop') {
+        const receipt = await harness.call('orchestration.workerStop', { dispatch: dispatchId })
+        expect(receipt).toMatchObject({ state: 'stopped', processAction: 'closed_agent_terminal' })
+        expect(kill).toHaveBeenCalledExactlyOnceWith(PTY_ID)
+        return
+      }
+      if (scenario === 'read') {
+        const readTerminal = vi.spyOn(runtime, 'readTerminal')
+        const output = await harness.call('orchestration.workerRead', { dispatch: dispatchId })
+        // Pins the read to the reminted terminal: the handle it reached must resolve to the
+        // registered pane and incarnation, which the stale durable handle never does.
+        const [[readHandle]] = readTerminal.mock.calls
+        expect(runtime.getTerminalPaneKey(readHandle)).toBe(makePaneKey('tab_worker', LEAF_ID))
+        expect(runtime.getTerminalProcessIncarnation(readHandle)).toBe(`${PTY_ID}:1`)
+        expect(output).toMatchObject({
+          source: 'terminal',
+          fallbackReason: 'session_not_reported'
+        })
+        expect(kill).not.toHaveBeenCalled()
+        return
+      }
+      const receipt = await harness.call('orchestration.workerRelease', { dispatch: dispatchId })
+      if (scenario === 'replacement') {
+        expect(receipt).toMatchObject({ state: 'release_unknown', processAction: 'none' })
+        expect(kill).not.toHaveBeenCalled()
+        return
+      }
+      expect(receipt).toMatchObject({ state: 'released', processAction: 'closed_agent_terminal' })
+      expect(kill).toHaveBeenCalledExactlyOnceWith(PTY_ID)
+      expect(harness.db.getWorkerTerminalResourceByOwner(dispatchId)).toMatchObject({
+        ownership_state: 'released',
+        release_state: 'released'
+      })
+    }
+  )
+})
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-start-prompt-contract.test.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-start-prompt-contract.test.ts
index 593d097580fd..526b09a6320c 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-start-prompt-contract.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-start-prompt-contract.test.ts
@@ -381,6 +381,7 @@ describe('orchestration worker-start prompt contract', () => {
     const { runtime, handle } = await createAgentPromptSubmissionRuntime(() => undefined, 'codex')
     runtime.onPtyData('pty-prompt', '\x1b]0;Codex working\x07', Date.now())
     const pending = runtime.sendTerminalAgentPrompt(handle, 'queued prompt', {
+      inputKind: 'driving',
       acceptQueued: true,
       requestId: 'busy-swallowed',
       observationTimeoutMs: 0
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-start-readiness-settlement.test.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-start-readiness-settlement.test.ts
new file mode 100644
index 000000000000..e39a06110dcd
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-start-readiness-settlement.test.ts
@@ -0,0 +1,90 @@
+import { describe, expect, it, vi } from 'vitest'
+
+vi.mock('../../../../orchestration/preamble', () => ({ buildDispatchPreamble: () => 'preamble' }))
+vi.mock('./worker-topology', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  monitorWorkerSetup: () => {}
+}))
+
+const { deliverAndSettleWorkerStartReadiness } = await import('./worker-start-readiness-settlement')
+
+function settle(delivered: 'accepted' | undefined) {
+  const db = {
+    getWorkerDispatch: () => ({ state: 'starting' }),
+    markWorkerStartUnknown: vi.fn(() => ({
+      stage: 'turn_start_unobserved',
+      residual_resources: '[]'
+    })),
+    markWorkerDispatchReady: vi.fn(() => ({ state: 'ready', stage: 'ready' }))
+  }
+  const host = {
+    deps: { store: { getRecord: () => ({ lease: { runtimeFence: 1 } }) } },
+    send: async () => ({
+      ok: true,
+      value: { clientMessageId: 'c1', submission: { dispatchState: 'pending', reason: null } }
+    }),
+    // undefined: the worker's agent was still starting when the wait ran out.
+    waitForSendSettlement: async () =>
+      delivered
+        ? { value: { clientMessageId: 'c1', submission: { dispatchState: delivered } } }
+        : undefined
+  }
+  const args = {
+    runtime: {
+      getNestedWorkerMaxDepth: () => 3,
+      getTerminalOrchestrationCliCommand: () => 'orca'
+    },
+    db,
+    run: { id: 'run_1' },
+    task: { id: 't1', spec: 'do the thing' },
+    dispatchId: 'd1',
+    dispatchDepth: 0,
+    structuredSession: { host, identity: { sessionId: 's1' } },
+    terminalHandle: 'structured_worker_1',
+    coordinatorHandle: 'term_c',
+    dispatchCapability: 'capability',
+    devMode: undefined,
+    requestId: 'r1',
+    agent: 'claude',
+    setupReceipt: {},
+    launchReceipt: {},
+    mode: {},
+    timeoutMs: 60_000,
+    effects: [],
+    terminalRevealWarning: undefined,
+    onStage: () => {}
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fakes implement exactly the runtime, db and host members this settlement reaches.
+  const receipt = deliverAndSettleWorkerStartReadiness(args as never)
+  return { db, receipt }
+}
+
+describe('a structured worker whose agent outlasts the preamble wait', () => {
+  it('parks as start-unknown instead of failing the start, and never names a screen to read', async () => {
+    const { db, receipt } = settle(undefined)
+
+    // Resolving, not throwing, is what keeps the worker's session: a throw tears it down.
+    await expect(receipt).resolves.toMatchObject({
+      state: 'outcome_unknown',
+      turnStart: 'unobserved',
+      nextCommands: [
+        'orca orchestration worker-show --dispatch d1 --json',
+        'orca orchestration worker-abandon --dispatch d1 --json'
+      ]
+    })
+    expect(db.markWorkerStartUnknown).toHaveBeenCalledWith(
+      'd1',
+      'turn_start_unobserved',
+      expect.stringContaining('delivered when the agent starts'),
+      expect.anything()
+    )
+    expect(db.markWorkerDispatchReady).not.toHaveBeenCalled()
+  })
+
+  it('is ready once the agent took the preamble within the wait', async () => {
+    const { db, receipt } = settle('accepted')
+
+    await expect(receipt).resolves.toMatchObject({ state: 'ready', turnStart: 'observed' })
+    expect(db.markWorkerStartUnknown).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-start-readiness-settlement.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-start-readiness-settlement.ts
index a3c57a357d27..7e9118daffb5 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-start-readiness-settlement.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-start-readiness-settlement.ts
@@ -47,7 +47,7 @@ export async function deliverAndSettleWorkerStartReadiness(args: {
   const { runtime, db, run, task, structuredSession, terminalHandle, effects } = args
 
   args.onStage('dispatch_input')
-  const promptDelivery = await deliverWorkerDispatchPreamble({
+  const delivery = await deliverWorkerDispatchPreamble({
     runtime,
     structuredSession,
     terminalHandle,
@@ -71,11 +71,11 @@ export async function deliverAndSettleWorkerStartReadiness(args: {
   // The write above was accepted without waiting on provider hooks; now demand the positive
   // evidence the receipt claims is observable. A worker whose turn never starts must not be
   // reported ready — a wedged agent and a working one looked identical before this gate.
-  // A structured preamble send is acknowledged by the provider or throws, so it is already
-  // positive evidence.
-  const turnStart: WorkerTurnStartObservation = structuredSession
-    ? { verdict: 'observed' }
-    : await observeWorkerTurnStart({ runtime, terminalHandle, prompt: promptDelivery })
+  // A structured preamble send is its own evidence: acknowledged, or still held for its agent.
+  const promptDelivery = delivery.prompt
+  const turnStart: WorkerTurnStartObservation =
+    delivery.structuredTurnStart ??
+    (await observeWorkerTurnStart({ runtime, terminalHandle, prompt: promptDelivery }))
   const deliveredPrompt = turnStart.prompt ?? promptDelivery
   monitorWorkerSetup({
     runtime,
@@ -98,7 +98,7 @@ export async function deliverAndSettleWorkerStartReadiness(args: {
       id: terminalHandle,
       state: 'turn_unobserved'
     })
-    const reason = describeUnobservedWorkerTurnStart(args.agent)
+    const reason = turnStart.reason ?? describeUnobservedWorkerTurnStart(args.agent)
     const worker = db.markWorkerStartUnknown(
       args.dispatchId,
       'turn_start_unobserved',
@@ -122,7 +122,8 @@ export async function deliverAndSettleWorkerStartReadiness(args: {
       residualResources: JSON.parse(worker.residual_resources) as unknown[],
       nextCommands: [
         `orca orchestration worker-show --dispatch ${args.dispatchId} --json`,
-        `orca terminal read --terminal ${terminalHandle} --screen`,
+        // A structured worker has no screen to read.
+        ...(structuredSession ? [] : [`orca terminal read --terminal ${terminalHandle} --screen`]),
         `orca orchestration worker-abandon --dispatch ${args.dispatchId} --json`
       ],
       ...(args.terminalRevealWarning ? { warning: args.terminalRevealWarning } : {})
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-start-turn-observation.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-start-turn-observation.ts
index d1c9e59adfa5..cc648ee7ddeb 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-start-turn-observation.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-start-turn-observation.ts
@@ -19,6 +19,8 @@ export type WorkerTurnStartVerdict = 'observed' | 'permission' | 'unsupported' |
 export type WorkerTurnStartObservation = {
   verdict: WorkerTurnStartVerdict
   prompt?: RuntimeTerminalPromptDelivery
+  /** Why an `unobserved` start is unknown, when the default PTY wording does not fit. */
+  reason?: string
 }
 
 function classifyPromptDelivery(prompt: RuntimeTerminalPromptDelivery): WorkerTurnStartVerdict {
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-stop.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-stop.ts
index 98d3c376f61f..ee0e73c904f8 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-stop.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-stop.ts
@@ -141,6 +141,7 @@ export const ORCHESTRATION_WORKER_STOP_METHODS = [
           })
         }
         const observation = await inspectWorkerTerminal(runtime, db, params.dispatch)
+        const liveHandle = observation.terminalHandle ?? handle
         // The host exit can settle this stop while terminal inspection is awaiting inventory.
         if (db.getWorkerDispatch(params.dispatch)?.state === 'stopped') {
           runtime.notifyMessageArrived(`dispatch:${params.dispatch}`, 'status')
@@ -201,7 +202,7 @@ export const ORCHESTRATION_WORKER_STOP_METHODS = [
           }
         }
         const closed = await runtime
-          .closeTerminal(handle)
+          .closeTerminal(liveHandle)
           .then((close) => ({ close }) as const)
           .catch(
             (error: unknown) =>
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-terminal-release-lease.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-terminal-release-lease.ts
index 50a97c9de4be..cad0ceb41280 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-terminal-release-lease.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-terminal-release-lease.ts
@@ -9,23 +9,27 @@ export function workerTerminalLeaseIsCurrent(
   runtime: OrcaRuntimeService,
   db: OrchestrationDb,
   dispatchId: string,
-  resource: WorkerTerminalResourceRow
+  resource: WorkerTerminalResourceRow,
+  // Live (possibly reminted) handle for runtime probes. Durable identity still compares
+  // worker.agent_terminal_handle to resource.terminal_handle; after beginGraphReload the durable
+  // string is absent from the handle table, so authority/pane/incarnation must use the live one.
+  liveTerminalHandle: string
 ): boolean {
   const worker = db.getWorkerDispatch(dispatchId)
   if (isStructuredWorkerHandle(resource.terminal_handle)) {
     return structuredWorkerTerminalLeaseIsCurrent(db, dispatchId, worker, resource)
   }
-  const authority = runtime.getOrchestrationDispatchAuthority(resource.terminal_handle)
+  const authority = runtime.getOrchestrationDispatchAuthority(liveTerminalHandle)
   // Exited PTYs retain identity and host evidence but no longer mint launch authority.
   return Boolean(
     worker?.agent_terminal_handle === resource.terminal_handle &&
     (authority
       ? resource.host_scope === JSON.stringify(authority.hostScope)
-      : runtime.getTerminalLivenessVerdict(resource.terminal_handle)?.status === 'exited') &&
+      : runtime.getTerminalLivenessVerdict(liveTerminalHandle)?.status === 'exited') &&
     db.isDispatchProcessCurrent({
       dispatchId,
-      paneKey: runtime.getTerminalPaneKey(resource.terminal_handle),
-      processIncarnation: runtime.getTerminalProcessIncarnation(resource.terminal_handle)
+      paneKey: runtime.getTerminalPaneKey(liveTerminalHandle),
+      processIncarnation: runtime.getTerminalProcessIncarnation(liveTerminalHandle)
     }) &&
     !db.workerTerminalResourceHasIdentityConflict(resource.id)
   )
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-topology.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-topology.ts
index b18eb9ee6c25..3e86dea3e28d 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-topology.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-topology.ts
@@ -69,6 +69,7 @@ export async function createExistingWorktreeWorkerTerminal(args: {
     // desktop app while its CLI is `cursor-agent`. Let the runtime build the
     // configured launcher instead of executing the raw id.
     startupAgent: args.agent,
+    launchSource: 'orchestration',
     ...(args.launchPreferences ? { launchPreferences: args.launchPreferences } : {}),
     title: `worker-${args.taskId}`,
     // Why: dispatching a worker is background work; it must not pull the sidebar
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-worktree-creation.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-worktree-creation.ts
index fe0c11e374d8..cbdab8d1f940 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-worktree-creation.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-worktree-creation.ts
@@ -61,6 +61,7 @@ export async function createWorkerWorktree(args: {
     ...(args.withAgentTerminal
       ? {
           startupAgent: args.agent,
+          startupLaunchSource: 'orchestration',
           ...(args.launchPreferences ? { startupLaunchPreferences: args.launchPreferences } : {})
         }
       : {}),
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/workers-new-worktree.test.ts b/src/main/runtime/rpc/methods/orchestration/worker/workers-new-worktree.test.ts
index 5164ac0b22f3..cda3354e8165 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/workers-new-worktree.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/workers-new-worktree.test.ts
@@ -140,6 +140,7 @@ describe('orchestration new-worktree workers', () => {
     expect(runtime.createManagedWorktree).toHaveBeenCalledWith(
       expect.objectContaining({
         startupAgent: 'codex',
+        startupLaunchSource: 'orchestration',
         awaitTerminalProvisioning: true,
         observeSetupCompletion: true,
         lineage: expect.objectContaining({ noParent: true, parentWorktree: undefined })
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/zcode-worker-readiness.test.ts b/src/main/runtime/rpc/methods/orchestration/worker/zcode-worker-readiness.test.ts
new file mode 100644
index 000000000000..30d32c2ede83
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/worker/zcode-worker-readiness.test.ts
@@ -0,0 +1,44 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { createOrchestrationWorkerReleaseHarness } from './worker-release.test-support'
+
+describe('ZCode first dispatch readiness', () => {
+  const h = createOrchestrationWorkerReleaseHarness()
+  afterEach(() => h.cleanup())
+
+  it('waits for the new composer before delivering exactly one dispatch', async () => {
+    h.setup()
+    const gate = h.deferred<void>()
+    vi.spyOn(h.runtime, 'waitForFreshWorkerComposer').mockReturnValue(gate.promise)
+    const pending = h.startWorker({ agent: 'zcode' })
+    await vi.waitFor(() =>
+      expect(h.runtime.waitForFreshWorkerComposer).toHaveBeenCalledWith(
+        'term_worker',
+        'zcode',
+        60_000
+      )
+    )
+    expect(h.runtime.waitForTerminal).not.toHaveBeenCalled()
+    expect(h.runtime.sendTerminalAgentPrompt).not.toHaveBeenCalled()
+    gate.resolve()
+    await pending
+    expect(h.runtime.sendTerminalAgentPrompt).toHaveBeenCalledOnce()
+  })
+
+  it('keeps reused terminals on the normal idle wait', async () => {
+    h.setup()
+    vi.spyOn(h.runtime, 'waitForFreshWorkerComposer')
+    await h.startWorker({ terminal: 'term_worker' })
+    expect(h.runtime.waitForFreshWorkerComposer).not.toHaveBeenCalled()
+    expect(h.runtime.waitForTerminal).toHaveBeenCalledWith(
+      'term_worker',
+      expect.objectContaining({ condition: 'tui-idle' })
+    )
+  })
+
+  it('never delivers a task after a startup timeout', async () => {
+    h.setup()
+    vi.spyOn(h.runtime, 'waitForFreshWorkerComposer').mockRejectedValue(new Error('timeout'))
+    await expect(h.startWorker({ agent: 'zcode' })).rejects.toThrow('Expected worker-start')
+    expect(h.runtime.sendTerminalAgentPrompt).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/runtime/rpc/methods/session-tabs-inventory.ts b/src/main/runtime/rpc/methods/session-tabs-inventory.ts
index d63868844a6e..3ab06a298fc6 100644
--- a/src/main/runtime/rpc/methods/session-tabs-inventory.ts
+++ b/src/main/runtime/rpc/methods/session-tabs-inventory.ts
@@ -6,6 +6,7 @@ import { projectSessionTabAgentStatus } from './session-tab-agent-status-project
 import { projectSessionTabBrowserPlacements } from './session-tab-browser-placement-projection'
 import { createSessionTabsRetirementProofDelta } from './session-tabs-retirement-proof-delta'
 import { isStructuredNativeChatEnabled } from './structured-agent-session-policy'
+import { restoreStructuredTabsIfSupported } from './structured-session-tab-restore'
 
 type SessionTabsInventory = {
   snapshots: RuntimeMobileSessionTabsResult[]
@@ -241,6 +242,14 @@ export async function subscribeSessionTabsInventory(
   }
   let collected: Awaited<ReturnType<typeof collectSessionTabsInventory>> | undefined
   try {
+    // Why: restore after registering, so an unsubscribe or socket close while it runs still finds the stream.
+    const restoring = restoreStructuredTabsIfSupported(context)
+    if (restoring) {
+      await restoring
+      if (closed) {
+        return
+      }
+    }
     for (let attempt = 1; !collected; attempt += 1) {
       censusInvalidated = false
       const candidate = await collectSessionTabsInventory(
diff --git a/src/main/runtime/rpc/methods/session-tabs-subscribe-admission.test.ts b/src/main/runtime/rpc/methods/session-tabs-subscribe-admission.test.ts
new file mode 100644
index 000000000000..2652cdf12fd5
--- /dev/null
+++ b/src/main/runtime/rpc/methods/session-tabs-subscribe-admission.test.ts
@@ -0,0 +1,342 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { OrcaRuntimeService } from '../../orca-runtime'
+import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
+import { RuntimeSubscriptionRegistry } from '../../runtime-subscription-registry'
+import { RpcDispatcher } from '../dispatcher'
+import type { RpcRequest } from '../core'
+import { SESSION_TAB_METHODS } from './session-tabs'
+import { visibleSnapshot } from './session-tabs-snapshot.test-fixture'
+
+const CONNECTION = 'conn-1'
+const KEY = (requestId: string): string => `session.tabs:${CONNECTION}:wt-1:${requestId}`
+const ALL_KEY = (requestId: string): string => `session.tabs:${CONNECTION}:*:${requestId}`
+
+type Deferred<T> = { promise: Promise<T>; resolve: (value: T) => void; reject: (e: Error) => void }
+
+function deferred<T>(): Deferred<T> {
+  let resolve!: (value: T) => void
+  let reject!: (e: Error) => void
+  const promise = new Promise<T>((settle, fail) => {
+    resolve = settle
+    reject = fail
+  })
+  return { promise, resolve, reject }
+}
+
+function makeHost(options: { structuredChat?: boolean } = {}) {
+  const registry = new RuntimeSubscriptionRegistry()
+  const stopListening = vi.fn()
+  const tabListeners: ((snapshot: RuntimeMobileSessionTabsResult, sequence: number) => void)[] = []
+  const restore = vi.fn(() => Promise.resolve())
+  const listMobileSessionTabs = vi.fn(async (): Promise<RuntimeMobileSessionTabsResult> =>
+    visibleSnapshot()
+  )
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the session tab methods reach only these members; a missing one throws and fails the test.
+  const runtime = {
+    getRuntimeId: () => 'test-runtime',
+    getClientSettings: () => ({
+      experimentalStructuredNativeChat: options.structuredChat === true
+    }),
+    restoreStructuredAgentSessionTabs: restore,
+    listMobileSessionTabs,
+    supportsAuthoritativeSessionTabsInventory: () => false,
+    listAllMobileSessionTabsWithChangeSequence: async () => ({
+      snapshots: [visibleSnapshot()],
+      changeSequence: 0
+    }),
+    onMobileSessionTabsChanged: vi.fn(
+      (listener: (snapshot: RuntimeMobileSessionTabsResult, sequence: number) => void) => {
+        tabListeners.push(listener)
+        return stopListening
+      }
+    ),
+    registerSubscriptionCleanup: registry.register.bind(registry),
+    cleanupSubscription: registry.cleanup.bind(registry),
+    cleanupSubscriptionsByPrefix: registry.cleanupByPrefix.bind(registry),
+    cleanupSubscriptionsForConnection: registry.cleanupForConnection.bind(registry),
+    getSubscriptionRegistrationVersion: registry.getRegistrationVersion.bind(registry)
+  } as unknown as OrcaRuntimeService
+  const dispatcher = new RpcDispatcher({ runtime, methods: SESSION_TAB_METHODS })
+  return {
+    runtime,
+    registry,
+    restore,
+    listMobileSessionTabs,
+    stopListening,
+    tabListeners,
+    // A foreign connection never owns the entry, so this probe reads presence without releasing it.
+    isRegistered: (id: string): boolean => !registry.cleanupIfOwnedByConnection(id, 'probe'),
+    dispatch: (
+      request: RpcRequest,
+      messages: Frame[] = [],
+      extra: { signal?: AbortSignal } = {}
+    ): Promise<void> =>
+      dispatcher.dispatchStreaming(request, (message) => messages.push(JSON.parse(message)), {
+        connectionId: CONNECTION,
+        clientKind: 'mobile',
+        ...extra
+      })
+  }
+}
+
+function request(id: string, method: string, params?: unknown): RpcRequest {
+  return { id, authToken: 'tok', method, params }
+}
+
+type Frame = { ok: boolean; result?: { type?: string } }
+
+function frames(messages: Frame[]): (string | undefined)[] {
+  return messages.map((reply) => (reply.ok ? reply.result?.type : 'error'))
+}
+
+async function settle(): Promise<void> {
+  for (let index = 0; index < 10; index += 1) {
+    await Promise.resolve()
+  }
+}
+
+describe('session.tabs.subscribe registers when the request arrives', () => {
+  it.each([
+    { stage: 'restore', unsubscribe: { worktree: 'id:wt-1', subscriptionId: 'sub-1' } },
+    { stage: 'list', unsubscribe: { worktree: 'id:wt-1', subscriptionId: 'sub-1' } },
+    { stage: 'list', unsubscribe: { worktree: 'id:wt-1' } }
+  ])(
+    'an unsubscribe ($unsubscribe) during the $stage await ends the stream and leaves nothing',
+    async ({ stage, unsubscribe }) => {
+      const host = makeHost({ structuredChat: true })
+      const gate = deferred<void>()
+      const listing = deferred<RuntimeMobileSessionTabsResult>()
+      if (stage === 'restore') {
+        host.restore.mockReturnValueOnce(gate.promise)
+      } else {
+        host.listMobileSessionTabs.mockReturnValueOnce(listing.promise)
+      }
+      const messages: Frame[] = []
+      const pending = host.dispatch(
+        request('sub-1', 'session.tabs.subscribe', { worktree: 'id:wt-1' }),
+        messages
+      )
+
+      await host.dispatch(request('unsub-1', 'session.tabs.unsubscribe', unsubscribe))
+      gate.resolve()
+      listing.resolve(visibleSnapshot())
+      await pending
+      await settle()
+
+      expect(host.isRegistered(KEY('sub-1'))).toBe(false)
+      expect(host.runtime.onMobileSessionTabsChanged).not.toHaveBeenCalled()
+      expect(frames(messages)).toEqual(['end'])
+    }
+  )
+
+  it('a socket close during setup leaves no registration and no listener', async () => {
+    const host = makeHost()
+    const listing = deferred<RuntimeMobileSessionTabsResult>()
+    host.listMobileSessionTabs.mockReturnValueOnce(listing.promise)
+    const messages: Frame[] = []
+    const pending = host.dispatch(
+      request('sub-1', 'session.tabs.subscribe', { worktree: 'id:wt-1' }),
+      messages
+    )
+
+    host.runtime.cleanupSubscriptionsForConnection(CONNECTION)
+    listing.resolve(visibleSnapshot())
+    await pending
+    await settle()
+
+    expect(host.isRegistered(KEY('sub-1'))).toBe(false)
+    expect(host.runtime.onMobileSessionTabsChanged).not.toHaveBeenCalled()
+    expect(frames(messages)).toEqual(['end'])
+  })
+
+  it('a request abort during setup ends the stream and leaves nothing', async () => {
+    const host = makeHost()
+    const listing = deferred<RuntimeMobileSessionTabsResult>()
+    host.listMobileSessionTabs.mockReturnValueOnce(listing.promise)
+    const controller = new AbortController()
+    const messages: Frame[] = []
+    const pending = host.dispatch(
+      request('sub-1', 'session.tabs.subscribe', { worktree: 'id:wt-1' }),
+      messages,
+      { signal: controller.signal }
+    )
+
+    controller.abort()
+    listing.resolve(visibleSnapshot())
+    await pending
+    await settle()
+
+    expect(host.isRegistered(KEY('sub-1'))).toBe(false)
+    expect(host.runtime.onMobileSessionTabsChanged).not.toHaveBeenCalled()
+    expect(frames(messages)).toEqual(['end'])
+  })
+
+  it('a request whose socket already closed attaches nothing', async () => {
+    const host = makeHost()
+    const controller = new AbortController()
+    controller.abort()
+
+    await host.dispatch(request('sub-1', 'session.tabs.subscribe', { worktree: 'id:wt-1' }), [], {
+      signal: controller.signal
+    })
+    await settle()
+
+    expect(host.isRegistered(KEY('sub-1'))).toBe(false)
+    expect(host.runtime.onMobileSessionTabsChanged).not.toHaveBeenCalled()
+  })
+
+  it('a stream released during setup reports no error when the await then rejects', async () => {
+    const host = makeHost()
+    const listing = deferred<RuntimeMobileSessionTabsResult>()
+    host.listMobileSessionTabs.mockReturnValueOnce(listing.promise)
+    const messages: Frame[] = []
+    const pending = host.dispatch(
+      request('sub-1', 'session.tabs.subscribe', { worktree: 'id:wt-1' }),
+      messages
+    )
+
+    await host.dispatch(
+      request('unsub-1', 'session.tabs.unsubscribe', {
+        worktree: 'id:wt-1',
+        subscriptionId: 'sub-1'
+      })
+    )
+    listing.reject(new Error('list failed'))
+    await pending
+
+    expect(frames(messages)).toEqual(['end'])
+  })
+
+  it('a failed setup reports only the error and leaves no registration', async () => {
+    const host = makeHost()
+    host.listMobileSessionTabs.mockRejectedValueOnce(new Error('list failed'))
+    const messages: Frame[] = []
+
+    await host.dispatch(
+      request('sub-1', 'session.tabs.subscribe', { worktree: 'id:wt-1' }),
+      messages
+    )
+    await settle()
+
+    expect(host.isRegistered(KEY('sub-1'))).toBe(false)
+    expect(frames(messages)).toEqual(['error'])
+  })
+
+  it('streams snapshot and updates, then ends once on unsubscribe', async () => {
+    const host = makeHost()
+    const messages: Frame[] = []
+
+    await host.dispatch(
+      request('sub-1', 'session.tabs.subscribe', { worktree: 'id:wt-1' }),
+      messages
+    )
+    expect(host.isRegistered(KEY('sub-1'))).toBe(true)
+    host.tabListeners[0]?.({ ...visibleSnapshot(), snapshotVersion: 2 }, 1)
+    await host.dispatch(
+      request('unsub-1', 'session.tabs.unsubscribe', {
+        worktree: 'id:wt-1',
+        subscriptionId: 'sub-1'
+      })
+    )
+    host.runtime.cleanupSubscriptionsForConnection(CONNECTION)
+    await settle()
+
+    expect(frames(messages)).toEqual(['snapshot', 'updated', 'end'])
+    expect(host.stopListening).toHaveBeenCalledTimes(1)
+    expect(host.isRegistered(KEY('sub-1'))).toBe(false)
+  })
+
+  it('keys a non-id selector by the resolved worktree once it is known', async () => {
+    const host = makeHost()
+    const messages: Frame[] = []
+
+    await host.dispatch(
+      request('sub-1', 'session.tabs.subscribe', { worktree: 'path:/repo/wt-1' }),
+      messages
+    )
+
+    expect(host.isRegistered(KEY('sub-1'))).toBe(true)
+    expect(frames(messages)).toEqual(['snapshot'])
+  })
+
+  it('a worktree-wide unsubscribe spares a subscribe that arrives while it resolves', async () => {
+    const host = makeHost()
+    const first: Frame[] = []
+    const second: Frame[] = []
+    await host.dispatch(request('sub-1', 'session.tabs.subscribe', { worktree: 'id:wt-1' }), first)
+    const listing = deferred<RuntimeMobileSessionTabsResult>()
+    host.listMobileSessionTabs.mockReturnValueOnce(listing.promise)
+
+    // Old phones send no request id, so the host sweeps every stream for the worktree.
+    const unsubscribing = host.dispatch(
+      request('unsub-1', 'session.tabs.unsubscribe', { worktree: 'id:wt-1' })
+    )
+    await settle()
+    await host.dispatch(request('sub-2', 'session.tabs.subscribe', { worktree: 'id:wt-1' }), second)
+    listing.resolve(visibleSnapshot())
+    await unsubscribing
+    await settle()
+
+    expect(frames(first)).toEqual(['snapshot', 'end'])
+    expect(frames(second)).toEqual(['snapshot'])
+    expect(host.isRegistered(KEY('sub-1'))).toBe(false)
+    expect(host.isRegistered(KEY('sub-2'))).toBe(true)
+  })
+
+  it('a request-id unsubscribe ends only its own stream', async () => {
+    const host = makeHost()
+    const first: Frame[] = []
+    const second: Frame[] = []
+
+    await host.dispatch(request('sub-1', 'session.tabs.subscribe', { worktree: 'id:wt-1' }), first)
+    await host.dispatch(request('sub-2', 'session.tabs.subscribe', { worktree: 'id:wt-1' }), second)
+    await host.dispatch(
+      request('unsub-1', 'session.tabs.unsubscribe', {
+        worktree: 'id:wt-1',
+        subscriptionId: 'sub-1'
+      })
+    )
+    await settle()
+
+    expect(frames(first)).toEqual(['snapshot', 'end'])
+    expect(frames(second)).toEqual(['snapshot'])
+    expect(host.isRegistered(KEY('sub-1'))).toBe(false)
+    expect(host.isRegistered(KEY('sub-2'))).toBe(true)
+    expect(host.stopListening).toHaveBeenCalledTimes(1)
+  })
+})
+
+describe('session.tabs.subscribeAll registers before restoring structured tabs', () => {
+  it.each([
+    {
+      release: 'unsubscribeAll',
+      act: (host: ReturnType<typeof makeHost>) =>
+        host.dispatch(
+          request('unsub-1', 'session.tabs.unsubscribeAll', { subscriptionId: 'sub-1' })
+        )
+    },
+    {
+      release: 'socket close',
+      act: async (host: ReturnType<typeof makeHost>) =>
+        host.runtime.cleanupSubscriptionsForConnection(CONNECTION)
+    }
+  ])('a $release during the restore leaves no stream behind', async ({ act }) => {
+    const host = makeHost({ structuredChat: true })
+    const gate = deferred<void>()
+    host.restore.mockReturnValueOnce(gate.promise)
+    const messages: Frame[] = []
+    const pending = host.dispatch(request('sub-1', 'session.tabs.subscribeAll'), messages)
+
+    await act(host)
+    gate.resolve()
+    await pending
+    await settle()
+
+    expect(host.isRegistered(ALL_KEY('sub-1'))).toBe(false)
+    expect(frames(messages)).not.toContain('snapshots')
+    expect(
+      vi.mocked(host.runtime.onMobileSessionTabsChanged).mock.calls.length -
+        host.stopListening.mock.calls.length
+    ).toBe(0)
+  })
+})
diff --git a/src/main/runtime/rpc/methods/session-tabs-unsubscribe.test.ts b/src/main/runtime/rpc/methods/session-tabs-unsubscribe.test.ts
index efd353a7c913..021224bd6497 100644
--- a/src/main/runtime/rpc/methods/session-tabs-unsubscribe.test.ts
+++ b/src/main/runtime/rpc/methods/session-tabs-unsubscribe.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
 import type { OrcaRuntimeService } from '../../orca-runtime'
+import { RuntimeSubscriptionRegistry } from '../../runtime-subscription-registry'
 import { RpcDispatcher } from '../dispatcher'
 import { SESSION_TAB_METHODS } from './session-tabs'
 
@@ -61,12 +62,63 @@ describe('session tab unsubscribe RPC methods', () => {
     expect(cleanupSubscription).toHaveBeenCalledWith('session.tabs:conn-1:*:sub-all-1')
     expect(cleanupSubscriptionsByPrefix).not.toHaveBeenCalled()
   })
+
+  it('ends only the named stream when a newer one watches the same worktree', async () => {
+    const { dispatcher, ends } = await subscribeTwiceToOneWorktree()
+
+    await dispatcher.dispatchStreaming(
+      request('session.tabs.unsubscribe', { worktree: 'id:wt-1', subscriptionId: 'sub-old' }),
+      vi.fn(),
+      { connectionId: 'conn-1' }
+    )
+
+    await vi.waitFor(() => expect(ends['sub-old']).toBe(1))
+    expect(ends['sub-new']).toBe(0)
+  })
+
+  it('ends every stream for the worktree when the unsubscribe names no request', async () => {
+    const { dispatcher, ends } = await subscribeTwiceToOneWorktree()
+
+    await dispatcher.dispatchStreaming(
+      request('session.tabs.unsubscribe', { worktree: 'id:wt-1' }),
+      vi.fn(),
+      { connectionId: 'conn-1' }
+    )
+
+    await vi.waitFor(() => expect(ends).toEqual({ 'sub-old': 1, 'sub-new': 1 }))
+  })
 })
 
+async function subscribeTwiceToOneWorktree() {
+  const registry = new RuntimeSubscriptionRegistry()
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Partial runtime backed by the real subscription registry; it supplies every member session.tabs subscribe/unsubscribe call.
+  const runtime = {
+    ...runtimeWithCleanup(registry.cleanup.bind(registry), registry.cleanupByPrefix.bind(registry)),
+    registerSubscriptionCleanup: registry.register.bind(registry),
+    getSubscriptionRegistrationVersion: registry.getRegistrationVersion.bind(registry),
+    onMobileSessionTabsChanged: () => () => {}
+  } as unknown as OrcaRuntimeService
+  const dispatcher = new RpcDispatcher({ runtime, methods: SESSION_TAB_METHODS })
+  const ends: Record<string, number> = { 'sub-old': 0, 'sub-new': 0 }
+  for (const id of ['sub-old', 'sub-new']) {
+    await dispatcher.dispatchStreaming(
+      { ...request('session.tabs.subscribe', { worktree: 'id:wt-1' }), id },
+      (message) => {
+        if (JSON.parse(message).result?.type === 'end') {
+          ends[id]! += 1
+        }
+      },
+      { connectionId: 'conn-1' }
+    )
+  }
+  return { dispatcher, ends }
+}
+
 function runtimeWithCleanup(
-  cleanupSubscription: ReturnType<typeof vi.fn>,
-  cleanupSubscriptionsByPrefix = vi.fn()
+  cleanupSubscription: (id: string) => void,
+  cleanupSubscriptionsByPrefix: (prefix: string, throughVersion?: number) => void = vi.fn()
 ): OrcaRuntimeService {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the unsubscribe methods reach only these members; a missing one throws and fails the test.
   return {
     getRuntimeId: () => 'test-runtime',
     listMobileSessionTabs: vi.fn().mockResolvedValue({
@@ -79,7 +131,8 @@ function runtimeWithCleanup(
       tabs: []
     }),
     cleanupSubscription,
-    cleanupSubscriptionsByPrefix
+    cleanupSubscriptionsByPrefix,
+    getSubscriptionRegistrationVersion: () => 0
   } as unknown as OrcaRuntimeService
 }
 
diff --git a/src/main/runtime/rpc/methods/session-tabs.ts b/src/main/runtime/rpc/methods/session-tabs.ts
index 40e1525f1486..8d3d1af33bf2 100644
--- a/src/main/runtime/rpc/methods/session-tabs.ts
+++ b/src/main/runtime/rpc/methods/session-tabs.ts
@@ -1,4 +1,5 @@
 import { resolveRuntimeNavigationTarget } from '../../../../shared/runtime-navigation'
+import { getExplicitWorktreeIdSelector } from '../../runtime-worktree-selection'
 import { defineMethod, defineStreamingMethod } from '../core'
 import {
   CreateTerminalTab,
@@ -97,78 +98,115 @@ export const SESSION_TAB_METHODS = [
     params: WorktreeTabSelector,
     handler: async (
       params,
-      { runtime, connectionId, requestId, pairedDeviceId, clientKind, clientCapabilities },
+      { runtime, connectionId, requestId, pairedDeviceId, clientKind, clientCapabilities, signal },
       emit
     ) => {
-      let subscribedWorktree: string | null = null
-      let unsubscribe = (): void => {}
-      let closed = false
-      let initialized = false
-      await restoreStructuredTabsIfSupported({ runtime, clientKind, clientCapabilities })
-      const initial = await runtime.listMobileSessionTabs(params.worktree, pairedDeviceId)
-      if (closed) {
-        return
-      }
-      subscribedWorktree = initial.worktree
-      const cleanupPrefix = `session.tabs:${connectionId ?? 'local'}:${subscribedWorktree}`
-      const subscriptionId = requestId ? `${cleanupPrefix}:${requestId}` : cleanupPrefix
-      // Why: shared-control can carry multiple subscribers for one worktree on
-      // one socket; include the RPC id so one subscriber cannot evict another.
-      runtime.registerSubscriptionCleanup(
-        subscriptionId,
-        () => {
-          closed = true
-          unsubscribe()
-          if (initialized) {
-            emit({ type: 'end' })
-          }
-        },
-        connectionId
-      )
-      if (closed) {
-        return
+      let subscriptionId: string | null = null
+      let released = false
+      let endOnRelease = true
+      let stopListening = (): void => {}
+      // Safe without a version check: any other release of this key runs our cleanup first, which latches `released`.
+      const release = (): void => {
+        if (!released && subscriptionId) {
+          runtime.cleanupSubscription(subscriptionId)
+        }
       }
-      const withProofDelta = createSessionTabsRetirementProofDelta(clientCapabilities)
-      emit({
-        type: 'snapshot',
-        ...withProofDelta(
-          projectSessionTabsForClient(
-            initial,
-            clientKind,
-            clientCapabilities,
-            isStructuredNativeChatEnabled(runtime)
-          )
+      const register = (worktreeId: string): void => {
+        const cleanupPrefix = `session.tabs:${connectionId ?? 'local'}:${worktreeId}`
+        // Why: shared-control can carry multiple subscribers for one worktree on
+        // one socket; include the RPC id so one subscriber cannot evict another.
+        subscriptionId = requestId ? `${cleanupPrefix}:${requestId}` : cleanupPrefix
+        runtime.registerSubscriptionCleanup(
+          subscriptionId,
+          () => {
+            if (released) {
+              return
+            }
+            released = true
+            signal?.removeEventListener('abort', release)
+            stopListening()
+            if (endOnRelease) {
+              emit({ type: 'end' })
+            }
+          },
+          connectionId
         )
-      })
-      initialized = true
-      if (closed) {
-        return
+        if (signal?.aborted) {
+          release()
+        } else {
+          signal?.addEventListener('abort', release, { once: true })
+        }
       }
-
-      unsubscribe = runtime.onMobileSessionTabsChanged((snapshot) => {
-        if (snapshot.worktree === subscribedWorktree) {
-          emit({
-            type: 'updated',
-            ...withProofDelta(
-              projectSessionTabsForClient(
-                snapshot,
-                clientKind,
-                clientCapabilities,
-                isStructuredNativeChatEnabled(runtime)
-              )
+      // Why: register before any await so an unsubscribe or socket close during setup
+      // finds the stream; only an `id:` selector (every phone and web client) names it up front.
+      const explicitWorktreeId = getExplicitWorktreeIdSelector(params.worktree)
+      if (explicitWorktreeId) {
+        register(explicitWorktreeId)
+      }
+      try {
+        await restoreStructuredTabsIfSupported({ runtime, clientKind, clientCapabilities })
+        if (released) {
+          return
+        }
+        const initial = await runtime.listMobileSessionTabs(params.worktree, pairedDeviceId)
+        if (released) {
+          return
+        }
+        if (!subscriptionId) {
+          register(initial.worktree)
+          if (released) {
+            return
+          }
+        }
+        const subscribedWorktree = initial.worktree
+        const withProofDelta = createSessionTabsRetirementProofDelta(clientCapabilities)
+        emit({
+          type: 'snapshot',
+          ...withProofDelta(
+            projectSessionTabsForClient(
+              initial,
+              clientKind,
+              clientCapabilities,
+              isStructuredNativeChatEnabled(runtime)
             )
-          })
+          )
+        })
+        if (released) {
+          return
+        }
+        stopListening = runtime.onMobileSessionTabsChanged((snapshot) => {
+          if (snapshot.worktree === subscribedWorktree) {
+            emit({
+              type: 'updated',
+              ...withProofDelta(
+                projectSessionTabsForClient(
+                  snapshot,
+                  clientKind,
+                  clientCapabilities,
+                  isStructuredNativeChatEnabled(runtime)
+                )
+              )
+            })
+          }
+        }, pairedDeviceId)
+      } catch (error) {
+        // A stream already ended by its release must not also report an error.
+        if (released) {
+          return
         }
-      }, pairedDeviceId)
-      if (closed) {
-        unsubscribe()
+        endOnRelease = false
+        release()
+        throw error
       }
     }
   }),
   defineMethod({
     name: 'session.tabs.unsubscribe',
     params: SessionTabsUnsubscribe,
-    handler: async (params, { runtime, connectionId, pairedDeviceId }) => {
+    handler: async (
+      params,
+      { runtime, connectionId, pairedDeviceId, subscriptionRegistrationVersion }
+    ) => {
       const snapshot = await runtime.listMobileSessionTabs(params.worktree, pairedDeviceId)
       const connection = connectionId ?? 'local'
       if (params.subscriptionId) {
@@ -179,17 +217,18 @@ export const SESSION_TAB_METHODS = [
       }
       runtime.cleanupSubscription(`session.tabs:${connection}:${params.worktree}`)
       runtime.cleanupSubscription(`session.tabs:${connection}:${snapshot.worktree}`)
-      runtime.cleanupSubscriptionsByPrefix(`session.tabs:${connection}:${snapshot.worktree}:`)
+      // Why: subscribes register on arrival, so spare any that arrived after this unsubscribe.
+      runtime.cleanupSubscriptionsByPrefix(
+        `session.tabs:${connection}:${snapshot.worktree}:`,
+        subscriptionRegistrationVersion
+      )
       return { unsubscribed: true }
     }
   }),
   defineStreamingMethod({
     name: 'session.tabs.subscribeAll',
     params: null,
-    handler: async (_params, context, emit) => {
-      await restoreStructuredTabsIfSupported(context)
-      return subscribeSessionTabsInventory(context, emit)
-    }
+    handler: (_params, context, emit) => subscribeSessionTabsInventory(context, emit)
   }),
   defineMethod({
     name: 'session.tabs.unsubscribeAll',
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-admission.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-admission.test.ts
index de62b6b5b528..554c0912ff03 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-admission.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-admission.test.ts
@@ -32,16 +32,16 @@ describe('admission revoked while a session is still open', () => {
 
   it.each(CLEANUP_METHODS)(
     'still serves $method after the host setting is turned off',
-    async ({ method, params, hostCall }) => {
-      const response = await call(method, params, STRUCTURED_CLIENT, SETTING_OFF)
+    async (entry) => {
+      const response = await call(entry.method, entry.params, STRUCTURED_CLIENT, SETTING_OFF)
 
       expect(response).toMatchObject({ ok: true })
-      // `unsubscribe` retires runtime-owned subscriptions rather than calling the host, so its
-      // result payload is the observable effect.
-      if (hostCall === 'unsubscribe') {
-        expect(response).toMatchObject({ result: { unsubscribed: true } })
+      // `unsubscribe` retires runtime-owned subscriptions and `release` is a no-op, so neither
+      // calls the host: the result payload is the observable effect.
+      if (entry.hostCall === null) {
+        expect(response).toMatchObject({ result: entry.result })
       } else {
-        expect(hostCalls[hostCall]).toHaveBeenCalled()
+        expect(hostCalls[entry.hostCall]).toHaveBeenCalled()
       }
     }
   )
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-at-rest.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-at-rest.test.ts
new file mode 100644
index 000000000000..1cc5050d8031
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-at-rest.test.ts
@@ -0,0 +1,503 @@
+// A chat at rest, through the RPC surface a client actually calls: opening it starts nothing, what
+// it can answer without an agent it answers, and the first send is what starts one.
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../../shared/agent-session-mutation-envelope'
+import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
+import { activeStructuredAgentSessionTurnId } from '../../../../shared/structured-agent-session-projection'
+import { openJournalDatabase } from '../../../native-chat/agent-session-journal/journal-database'
+import {
+  journalDatabaseFile,
+  journalDirectoryFor
+} from '../../../native-chat/agent-session-journal/journal-paths'
+import {
+  HOST_TEST_LOCATION,
+  hostTestAttachParams,
+  hostTestMessage,
+  hostTestOperationId
+} from '../../../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import {
+  createRestTestRig,
+  foundRestTestChat,
+  REST_TEST_CALLER as CALLER,
+  REST_TEST_SESSION as SESSION,
+  REST_TEST_THREAD,
+  restTestSend,
+  type RestTestRig
+} from '../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import * as providerSupport from '../../../native-chat/agent-session-wire/structured-agent-session-provider-support'
+import { OrcaRuntimeService } from '../../orca-runtime'
+import type { RpcResponse } from '../core'
+import { RpcDispatcher } from '../dispatcher'
+import { closeStructuredAgentSessionChild } from '../../structured-agent-session-close'
+import { discardStructuredWorkerSession } from './orchestration-structured-worker-session'
+import { STRUCTURED_AGENT_SESSION_METHODS } from './structured-agent-session'
+
+const CLIENT = {
+  clientId: 'device-1',
+  clientKind: 'runtime' as const,
+  clientCapabilities: [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY],
+  connectionId: 'connection-1'
+}
+
+let rig: RestTestRig
+let dispatcher: RpcDispatcher
+let requests = 0
+
+async function call(method: string, params: unknown): Promise<RpcResponse[]> {
+  const replies: RpcResponse[] = []
+  requests += 1
+  await dispatcher.dispatchStreaming(
+    { id: `request-${requests}`, authToken: 'token', method, params },
+    (raw) => replies.push(JSON.parse(raw) as RpcResponse),
+    CLIENT
+  )
+  return replies
+}
+
+/** A chat that once ran, reopened by a fresh host: nothing of it is in memory. */
+async function restingChat(): Promise<void> {
+  await foundRestTestChat(rig)
+  await rig.store.replaceSessionOptions({
+    sessionId: SESSION,
+    fence: rig.store.getRecord(SESSION)!.lease.runtimeFence,
+    options: { model: 'gpt-saved', effort: 'high' },
+    now: rig.clock.now
+  })
+  await rig.restart()
+  setStructuredAgentSessionHost(rig.host)
+  rig.adapter.acquire.mockClear()
+  rig.adapter.dispatch.mockClear()
+  rig.adapter.readOptions.mockClear()
+}
+
+beforeEach(async () => {
+  requests = 0
+  rig = await createRestTestRig({ idleSweep: { intervalMs: 3_600_000 } })
+  setStructuredAgentSessionHost(rig.host)
+  const runtime = new OrcaRuntimeService()
+  vi.spyOn(runtime, 'getClientSettings').mockImplementation(
+    () =>
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the RPC gate reads only this one setting.
+      ({ experimentalStructuredNativeChat: true }) as ReturnType<
+        OrcaRuntimeService['getClientSettings']
+      >
+  )
+  dispatcher = new RpcDispatcher({ runtime, methods: STRUCTURED_AGENT_SESSION_METHODS })
+})
+
+afterEach(async () => {
+  vi.restoreAllMocks()
+  setStructuredAgentSessionHost(null)
+  await rig.dispose()
+})
+
+describe('opening a chat at rest (P2-01)', () => {
+  it('reads, subscribes and answers everything without starting an agent', async () => {
+    await restingChat()
+    expect(rig.host.hasSession(SESSION)).toBe(false)
+
+    const [history] = await call('agentSession.history', { sessionId: SESSION, direction: 'tail' })
+    const frames = await call('agentSession.subscribe', { sessionId: SESSION })
+    const [options] = await call('agentSession.options', { sessionId: SESSION })
+    const [commands] = await call('agentSession.commands', { sessionId: SESSION })
+    const [outline] = await call('agentSession.conversationOutline', { sessionId: SESSION })
+    const [status] = await call('agentSession.handoffStatus', { sessionId: SESSION })
+    const [held] = await call('agentSession.hold', { sessionId: SESSION, holderId: 'pane' })
+
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+    expect(history).toMatchObject({ ok: true, result: { ok: true } })
+    const snapshot = frames.find((frame) => frame.ok && 'result' in frame)
+    expect(snapshot).toMatchObject({ result: { type: 'snapshot', commands: null } })
+    expect(options).toMatchObject({
+      ok: true,
+      result: { current: { model: 'gpt-saved', effort: 'high' } }
+    })
+    // Absent, never an empty list: the composer keeps its own menu.
+    expect(commands).toMatchObject({ ok: true, result: {} })
+    expect(commands?.ok && 'result' in commands && commands.result).not.toHaveProperty(
+      'commands',
+      []
+    )
+    expect(outline).toMatchObject({ ok: true })
+    expect(status).toMatchObject({ ok: true })
+    expect(held).toMatchObject({ ok: true, result: { held: true } })
+  })
+
+  // Worktree activation asks this for every chat tab in the worktree.
+  it('answers the owner check from the record without opening the chat', async () => {
+    await restingChat()
+
+    const [status] = await call('agentSession.handoffStatus', { sessionId: SESSION })
+
+    expect(status).toMatchObject({ ok: true, result: { owner: expect.any(String) } })
+    expect(rig.host.hasSession(SESSION)).toBe(false)
+  })
+
+  it('starts the agent on the first send (P2-01)', async () => {
+    await restingChat()
+    const fence = rig.store.getRecord(SESSION)!.lease.runtimeFence
+    const sent = await rig.host.send(CALLER, restTestSend('wake up', fence))
+    if (!sent.ok) {
+      throw new Error(`send refused: ${sent.refusal.code}`)
+    }
+    // Awaits the provider's answer itself rather than polling for it, however slow the start.
+    await rig.host.waitForSendSettlement(SESSION, sent.value.clientMessageId)
+    expect(rig.adapter.acquire).toHaveBeenCalledOnce()
+    expect(rig.adapter.dispatch).toHaveBeenCalledOnce()
+  })
+})
+
+describe('the accessor', () => {
+  it('opens a closed conversation once, however many readers arrive together (P2-02)', async () => {
+    // Written by the provider alone, so nothing but the readers below ever opens it here.
+    const attached = await rig.host.attach(CALLER, hostTestAttachParams(null))
+    expect(attached.ok).toBe(true)
+    rig.adapter.acquire.mock.calls
+      .at(-1)?.[0]
+      .events?.appendItem(
+        { provider: 'codex', threadId: REST_TEST_THREAD, turnId: 'turn-1', ordinal: 1 },
+        hostTestMessage('from the provider')
+      )
+    await rig.host.flushStreamedEvents(SESSION)
+    await rig.restart()
+    setStructuredAgentSessionHost(rig.host)
+    rig.adapter.acquire.mockClear()
+    const open = vi.spyOn(rig.host.collaboratorsForTests().conversationDelivery, 'open')
+    await Promise.all([
+      ...Array.from({ length: 5 }, () =>
+        call('agentSession.history', { sessionId: SESSION, direction: 'tail' })
+      ),
+      call('agentSession.subscribe', { sessionId: SESSION })
+    ])
+    const openedJournals = new Set(
+      await Promise.all(open.mock.results.map((result) => result.value))
+    )
+    expect(openedJournals.size).toBe(1)
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+  })
+
+  it('opens nothing once quit began, for a read that was already waiting on the lock', async () => {
+    await restingChat()
+    // The host's per-session queue, held so the read waits behind it.
+    const { serialize, lifetime } = rig.host.collaboratorsForTests()
+    let release = (): void => undefined
+    const held = new Promise<void>((started) => {
+      void serialize(SESSION, () => {
+        started()
+        return new Promise<void>((resolve) => (release = resolve))
+      })
+    })
+    await held
+    const read = rig.host.history({ sessionId: SESSION, direction: 'tail' })
+
+    // Disposed as quit's first teardown step does.
+    lifetime.dispose()
+    release()
+
+    await expect(read).rejects.toThrow()
+    expect(rig.host.hasSession(SESSION)).toBe(false)
+  })
+
+  it('refuses a read it cannot open with the reason, under the same code and message', async () => {
+    const [missing] = await call('agentSession.history', {
+      sessionId: 'session-never-created',
+      direction: 'tail'
+    })
+    expect(missing).toMatchObject({
+      ok: false,
+      error: {
+        code: 'agent_session_identity_required',
+        message: 'agent_session_identity_required',
+        data: {
+          refusal: {
+            code: 'agent_session_identity_required',
+            details: { reason: 'recordMissing' }
+          }
+        }
+      }
+    })
+
+    await restingChat()
+    vi.spyOn(providerSupport, 'adapterSupportsRecord').mockReturnValue(false)
+    const [unsupported] = await call('agentSession.history', {
+      sessionId: SESSION,
+      direction: 'tail'
+    })
+    expect(unsupported).toMatchObject({
+      ok: false,
+      error: {
+        // Not a passthrough code: released clients match the message, as before.
+        code: 'runtime_error',
+        message: 'structured_agent_session_unsupported',
+        data: { refusal: { details: { reason: 'hostUnsupported' } } }
+      }
+    })
+  })
+
+  it('refuses a read whose journal will not open with the classified reason, never the storage text', async () => {
+    await restingChat()
+    const open = vi.spyOn(rig.host.collaboratorsForTests().conversationDelivery, 'open')
+    vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+    const storagePath = '/Users/someone/.orca/journals/session-1/journal.sqlite'
+    const failWith = (error: Error): void => {
+      open.mockRejectedValue(error)
+    }
+    const failures = async (): Promise<RpcResponse[]> =>
+      [
+        ...(await call('agentSession.history', { sessionId: SESSION, direction: 'tail' })),
+        ...(await call('agentSession.subscribe', { sessionId: SESSION })),
+        ...(await call('agentSession.options', { sessionId: SESSION }))
+      ].filter((reply) => !reply.ok)
+
+    failWith(
+      Object.assign(new Error(`file is not a database: ${storagePath}`), {
+        code: 'ERR_SQLITE_ERROR',
+        errcode: 26
+      })
+    )
+    const corrupt = await failures()
+    failWith(Object.assign(new Error(`EACCES: permission denied, open '${storagePath}'`), {}))
+    const unavailable = await failures()
+
+    for (const [replies, reason] of [
+      [corrupt, 'journalCorrupt'],
+      [unavailable, 'journalUnavailable']
+    ] as const) {
+      expect(replies).toHaveLength(3)
+      for (const reply of replies) {
+        expect(reply).toMatchObject({
+          ok: false,
+          error: {
+            // Not a passthrough code: released clients read the message, which stays the code.
+            code: 'runtime_error',
+            message: 'agent_session_journal_unreadable',
+            data: { refusal: { code: 'agent_session_journal_unreadable', details: { reason } } }
+          }
+        })
+        expect(JSON.stringify(reply)).not.toContain(storagePath)
+      }
+    }
+  })
+
+  it('logs a reader reconnecting to a journal that will not open once per failure', async () => {
+    await restingChat()
+    const open = vi.spyOn(rig.host.collaboratorsForTests().conversationDelivery, 'open')
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+    const logged = (): unknown[] =>
+      warn.mock.calls
+        .filter(([line]) => line === '[agent-session] opening the conversation for a read failed:')
+        .map(([, error]) => error)
+    const reconnect = async (): Promise<RpcResponse[]> => [
+      ...(await call('agentSession.subscribe', { sessionId: SESSION })),
+      ...(await call('agentSession.history', { sessionId: SESSION, direction: 'tail' }))
+    ]
+    const denied = new Error('EACCES: permission denied')
+    const exhausted = new Error('EMFILE: too many open files')
+
+    open.mockRejectedValue(denied)
+    for (let attempt = 0; attempt < 4; attempt += 1) {
+      // Every attempt is still refused with its reason; only the log is quiet.
+      expect((await reconnect()).filter((reply) => !reply.ok)).toHaveLength(2)
+    }
+    expect(logged()).toEqual([denied])
+    open.mockRejectedValue(exhausted)
+    await reconnect()
+    await reconnect()
+    expect(logged()).toEqual([denied, exhausted])
+  })
+
+  it('opens a corrupt journal through the recovering open and still accepts a send (P2-03)', async () => {
+    await foundRestTestChat(rig)
+    await rig.host.flushAllStreamedEvents()
+    const directory = journalDirectoryFor(rig.root, {
+      workspaceId: HOST_TEST_LOCATION.workspaceId,
+      sessionId: SESSION
+    })
+    // A row that no longer parses: the recovering open keeps the readable prefix and rebuilds.
+    const opened = openJournalDatabase(journalDatabaseFile(directory))
+    try {
+      opened.db.prepare('UPDATE journal_rows SET row_json = ? WHERE seq = ?').run('}{', 2)
+    } finally {
+      opened.db.close()
+    }
+    await rig.restart()
+    setStructuredAgentSessionHost(rig.host)
+
+    const frames = await call('agentSession.subscribe', { sessionId: SESSION })
+    expect(frames.some((frame) => !frame.ok)).toBe(false)
+    expect(frames.find((frame) => frame.ok)).toMatchObject({ result: { type: 'snapshot' } })
+    const fence = rig.store.getRecord(SESSION)!.lease.runtimeFence
+    expect((await rig.host.send(CALLER, restTestSend('after the repair', fence))).ok).toBe(true)
+  })
+
+  it('subscribes an old mobile client that holds first even when no agent can start (P2-06)', async () => {
+    await restingChat()
+    rig.adapter.acquire.mockRejectedValue(new Error('auth expired'))
+
+    const [held] = await call('agentSession.hold', { sessionId: SESSION, holderId: 'mobile' })
+    const frames = await call('agentSession.subscribe', { sessionId: SESSION })
+    expect(held).toMatchObject({ ok: true })
+    expect(frames.find((frame) => frame.ok)).toMatchObject({ result: { type: 'snapshot' } })
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+  })
+})
+
+describe('options at rest', () => {
+  it('records a pick as intent and replays it at the next start (P2-16)', async () => {
+    await restingChat()
+    const fields = { key: 'model', value: 'gpt-picked' }
+    const [picked] = await call('agentSession.setOption', {
+      envelope: {
+        sessionId: SESSION,
+        clientOperationId: hostTestOperationId(),
+        expectedRuntimeFence: rig.store.getRecord(SESSION)!.lease.runtimeFence,
+        payloadFingerprint: computeAgentSessionPayloadFingerprint({
+          method: 'agentSession.setOption',
+          sessionId: SESSION,
+          fields
+        })
+      },
+      ...fields
+    })
+    expect(picked).toMatchObject({ ok: true, result: { ok: true } })
+    expect(rig.store.getRecord(SESSION)?.options).toMatchObject({ model: 'gpt-picked' })
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+
+    const fence = rig.store.getRecord(SESSION)!.lease.runtimeFence
+    await rig.host.send(CALLER, restTestSend('use the new model', fence))
+    await vi.waitFor(() => expect(rig.adapter.acquire).toHaveBeenCalledOnce())
+    expect(rig.adapter.acquire.mock.calls[0]?.[0]).toMatchObject({
+      options: expect.objectContaining({ model: 'gpt-picked' })
+    })
+  })
+
+  it('answers the provider-level features of a chat at rest (P2-17)', async () => {
+    await restingChat()
+    Object.assign(rig.host.deps.adapter, {
+      supportsThreadGoal: (_id: string, agent?: string) => agent === 'codex',
+      recordsContextUsage: (_id: string, agent?: string) => agent === 'claude',
+      rewindSupport: (_id: string, agent?: string) =>
+        agent === 'codex' ? { supported: true } : { supported: false, reason: 'unsupported' }
+    })
+    const [options] = await call('agentSession.options', { sessionId: SESSION })
+    expect(options).toMatchObject({
+      ok: true,
+      result: { threadGoal: { current: null }, rewind: { supported: true } }
+    })
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+    expect(rig.adapter.readOptions).not.toHaveBeenCalled()
+  })
+})
+
+describe('an agent exit', () => {
+  it('is shown, not respawned; the next send starts the agent (P2-18)', async () => {
+    await foundRestTestChat(rig)
+    const running = rig.host.collaboratorsForTests().sessions.get(SESSION)!.child!
+    await rig.host.handleAdapterEvent({
+      type: 'ended',
+      sessionId: SESSION,
+      reason: 'killed',
+      cause: 'unexpected-exit',
+      fence: running.fence,
+      acquisitionGeneration: running.generation!
+    })
+    await new Promise((resolve) => setTimeout(resolve, 50))
+    expect(rig.adapter.acquire).toHaveBeenCalledOnce()
+
+    const fence = rig.store.getRecord(SESSION)!.lease.runtimeFence
+    expect(rig.store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
+    await rig.host.send(CALLER, restTestSend('again', fence))
+    await vi.waitFor(() => expect(rig.adapter.acquire).toHaveBeenCalledTimes(2))
+  })
+
+  it('whose settlement write failed is settled by the next send, which is delivered', async () => {
+    await foundRestTestChat(rig)
+    const open = rig.host.collaboratorsForTests().sessions.get(SESSION)!
+    const running = open.child!
+    // A turn in flight, so the exit has something to settle.
+    rig.adapter.acquire.mock.calls
+      .at(-1)?.[0]
+      .events?.appendItem(
+        { provider: 'codex', threadId: REST_TEST_THREAD, turnId: 'working', ordinal: 50 },
+        { kind: 'turn', turnId: 'working', state: 'running' }
+      )
+    await rig.host.flushStreamedEvents(SESSION)
+    // The exit's own write and the retry recording the exit queues are both refused.
+    vi.spyOn(open.journal, 'appendLifecycleBatch')
+      .mockRejectedValueOnce(new Error('disk full'))
+      .mockRejectedValueOnce(new Error('disk full'))
+    await rig.host.handleAdapterEvent({
+      type: 'ended',
+      sessionId: SESSION,
+      reason: 'killed',
+      cause: 'unexpected-exit',
+      fence: running.fence,
+      acquisitionGeneration: running.generation!
+    })
+    // Released with its death evidence, not latched: the next acquire settles from that evidence.
+    await vi.waitFor(() =>
+      expect(rig.store.getRecord(SESSION)?.lease).toMatchObject({
+        claimStatus: 'released',
+        deathEvidence: { kind: 'exit-observed' }
+      })
+    )
+    await rig.host.collaboratorsForTests().serialize(SESSION, async () => {})
+
+    const sent = await rig.host.send(
+      CALLER,
+      restTestSend('again', rig.store.getRecord(SESSION)!.lease.runtimeFence)
+    )
+
+    if (!sent.ok) {
+      throw new Error(`send refused: ${sent.refusal.code}`)
+    }
+    await rig.host.waitForSendSettlement(SESSION, sent.value.clientMessageId)
+    expect(rig.adapter.dispatch).toHaveBeenCalledTimes(2)
+    expect(
+      activeStructuredAgentSessionTurnId((await rig.host.journalSnapshot(SESSION)).items)
+    ).not.toBe('working')
+  })
+})
+
+describe('every close withdraws what is queued (P2-29)', () => {
+  it.each([
+    ['the close RPC', async () => void (await call('agentSession.close', { sessionId: SESSION }))],
+    ['the runtime chat close', async () => void (await closeStructuredAgentSessionChild(SESSION))],
+    [
+      'a discarded worker',
+      () =>
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the discard reads only this runtime member.
+        discardStructuredWorkerSession(SESSION, {
+          retireStructuredAgentSessionTabFromSnapshot: () => undefined
+        } as never)
+    ]
+  ])('%s rejects a message accepted before any start, and starts nothing', async (_, close) => {
+    await restingChat()
+    // The delivery loop has not reached its first start yet.
+    const { loop } = rig.host.collaboratorsForTests().conversationDelivery
+    vi.spyOn(loop, 'wake').mockImplementation(() => undefined)
+    const reader: unknown[] = []
+    await rig.host.subscribe({
+      id: 'reader',
+      sessionId: SESSION,
+      emit: (event) => reader.push(event)
+    })
+    const fence = rig.store.getRecord(SESSION)!.lease.runtimeFence
+    expect((await rig.host.send(CALLER, restTestSend('closed before it went', fence))).ok).toBe(
+      true
+    )
+
+    await close()
+    // A close's rejection is a sentence with its fact beside it, never a marker.
+    await vi.waitFor(() =>
+      expect(JSON.stringify(reader)).toContain(
+        '"reason":"The chat closed before this message was sent.","submittedAt"'
+      )
+    )
+    expect(JSON.stringify(reader)).toContain('"rejection":{"kind":"chatClosed"}')
+    expect(rig.host.hasSession(SESSION)).toBe(false)
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-background-task-capability.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-background-task-capability.test.ts
index 2b62b00525e8..8a9e2267a5a8 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-background-task-capability.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-background-task-capability.test.ts
@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import type { AgentSessionBackgroundTaskState } from '../../../../shared/agent-session-wire'
 import {
   AGENT_SESSION_BACKGROUND_TASK_ROW_STOP_CAPABILITY,
@@ -63,7 +63,6 @@ describe('background-task stop capability at the RPC boundary', () => {
   it.each(['snapshot', 'batch', 'reset'] as const)(
     'gates the %s stream without changing the provider state',
     async (type) => {
-      hostCalls.hold = vi.fn(async () => undefined)
       hostCalls.subscribe.mockImplementation((input: AgentSessionSubscribeInput) => {
         const base = { sessionId: SESSION, fence: 1, backgroundTasks: TASKS }
         if (type === 'batch') {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-conversation-outline.ts b/src/main/runtime/rpc/methods/structured-agent-session-conversation-outline.ts
index 99bf60da727d..08ecc212ec1b 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-conversation-outline.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-conversation-outline.ts
@@ -7,7 +7,7 @@
 
 import { readAgentSessionConversationOutline } from '../../../native-chat/agent-session-wire/agent-session-conversation-outline'
 import { defineMethod } from '../core'
-import { requireStructuredHost as requireHost } from './structured-agent-session-gate'
+import { requireInstalledStructuredHost } from './structured-agent-session-gate'
 import { OptionsParams } from './structured-agent-session-schemas'
 
 export const STRUCTURED_AGENT_SESSION_CONVERSATION_OUTLINE_METHODS = [
@@ -15,6 +15,8 @@ export const STRUCTURED_AGENT_SESSION_CONVERSATION_OUTLINE_METHODS = [
     name: 'agentSession.conversationOutline',
     params: OptionsParams,
     handler: async (params, ctx) =>
-      readAgentSessionConversationOutline(requireHost(ctx).journalSnapshot(params.sessionId))
+      readAgentSessionConversationOutline(
+        await (await requireInstalledStructuredHost(ctx)).journalSnapshot(params.sessionId)
+      )
   })
 ]
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-create.ts b/src/main/runtime/rpc/methods/structured-agent-session-create.ts
index 1a385922d2a4..0c3b7b087133 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-create.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-create.ts
@@ -12,6 +12,7 @@
  * in. Both callers run the same two halves, so orchestration gets that guarantee too.
  */
 
+import { refuse } from '../../../../shared/agent-session-wire-refusals'
 import { computeAgentSessionPayloadFingerprint } from '../../../../shared/agent-session-mutation-envelope'
 import type {
   AgentSessionAttachResult,
@@ -144,10 +145,11 @@ export async function commitStructuredAgentSessionCreate(args: {
     console.warn('[agent-session] create committed before tab publication failed', error)
     return {
       ok: false,
-      refusal: {
-        code: 'agent_session_operation_unknown',
-        message: 'The chat may have been created, but its tab could not be confirmed.'
-      }
+      refusal: refuse(
+        'agent_session_operation_unknown',
+        { reason: 'tabUnconfirmed' },
+        'The chat may have been created, but its tab could not be confirmed.'
+      )
     }
   }
   // Read after publishing, which is what gives the chat its tab.
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-gate-classification.test-fixture.ts b/src/main/runtime/rpc/methods/structured-agent-session-gate-classification.test-fixture.ts
index 72c52c888fd3..7b388f5eca22 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-gate-classification.test-fixture.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-gate-classification.test-fixture.ts
@@ -21,15 +21,18 @@ export const CLEANUP_METHODS = [
     params: { envelope: envelope(), turnId: 'turn-1' },
     hostCall: 'cancel'
   },
+  // A no-op kept for older clients: it answers without reaching the host.
   {
     method: 'agentSession.release',
     params: { sessionId: SESSION, holderId: 'surface-1' },
-    hostCall: 'release'
+    hostCall: null,
+    result: { released: true }
   },
   {
     method: 'agentSession.unsubscribe',
     params: { sessionId: SESSION },
-    hostCall: 'unsubscribe'
+    hostCall: null,
+    result: { unsubscribed: true }
   }
 ] as const
 
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-gate.ts b/src/main/runtime/rpc/methods/structured-agent-session-gate.ts
index 95e3e3d6eee7..e4ff861d1ac7 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-gate.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-gate.ts
@@ -8,6 +8,7 @@
 // for old mobile clients while structured chat is enabled so they receive a fallback row, and that
 // path constructs the host. `agentSession.*` stays refused either way, which is what this gate is for.
 
+import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
 import { getStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
 import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
 import type { StructuredAgentSessionCaller } from '../../../native-chat/agent-session-wire/structured-agent-session-host-types'
@@ -27,7 +28,9 @@ export function supportsStructuredSessions(ctx: RpcContext): boolean {
 
 export function requireStructuredCapability(ctx: RpcContext): void {
   if (!supportsStructuredSessions(ctx)) {
-    throw new Error('structured_agent_session_unsupported')
+    throw agentSessionRefusalError('structured_agent_session_unsupported', {
+      reason: 'clientCapabilityMissing'
+    })
   }
 }
 
@@ -35,7 +38,9 @@ export function requireStructuredHost(ctx: RpcContext): StructuredAgentSessionHo
   requireStructuredCapability(ctx)
   const host = getStructuredAgentSessionHost()
   if (!host) {
-    throw new Error('structured_agent_session_unsupported')
+    throw agentSessionRefusalError('structured_agent_session_unsupported', {
+      reason: 'hostDisabled'
+    })
   }
   return host
 }
@@ -64,19 +69,22 @@ export function requireStructuredHost(ctx: RpcContext): StructuredAgentSessionHo
  */
 export function requireStructuredCleanupHost(ctx: RpcContext): StructuredAgentSessionHost {
   if (!supportsStructuredAgentSessionCapability(ctx)) {
-    throw new Error('structured_agent_session_unsupported')
+    throw agentSessionRefusalError('structured_agent_session_unsupported', {
+      reason: 'clientCapabilityMissing'
+    })
   }
   const host = getStructuredAgentSessionHost()
   if (!host) {
-    throw new Error('structured_agent_session_unsupported')
+    throw agentSessionRefusalError('structured_agent_session_unsupported', {
+      reason: 'hostDisabled'
+    })
   }
   return host
 }
 
-/** Builds the host for the calls that address a session by durable record rather than by live
- *  state: attach, which is the only way a session comes into being, plus hold and reveal, which
- *  each reach for a record on disk this process may not have opened yet. Every other method
- *  addresses a session that must already be attached, and correctly reports absent when none is. */
+/** Builds the host for a call that may be the first this process sees. Every session is addressed
+ *  by its durable record — a read opens a conversation at rest — so each call that reaches for one
+ *  may meet a host nothing has built yet. */
 export async function ensureStructuredHostInstalled(ctx: RpcContext): Promise<void> {
   // Gated first: a client that cannot read structured sessions must not be able
   // to make the host exist, which is an observable side effect of the surface.
@@ -89,6 +97,14 @@ export async function ensureStructuredHostInstalled(ctx: RpcContext): Promise<vo
   await ctx.runtime.ensureStructuredAgentSessionHost()
 }
 
+/** The host for a read, built first when this process has none: the read RPCs share this one. */
+export async function requireInstalledStructuredHost(
+  ctx: RpcContext
+): Promise<StructuredAgentSessionHost> {
+  await ensureStructuredHostInstalled(ctx)
+  return requireStructuredHost(ctx)
+}
+
 /** Mirrors the existing agent-session host-authority derivation so one client
  *  gets one operation namespace across both surfaces. */
 export function structuredCallerFor(ctx: RpcContext): StructuredAgentSessionCaller {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-hold.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-hold.test.ts
index c3099d843ced..140be5e1c39b 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-hold.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-hold.test.ts
@@ -1,8 +1,8 @@
-// The wire half of a session's lifetime: who takes a hold, and what happens when they vanish.
+// `agentSession.hold` / `release` are kept answering for clients that still send them, and do
+// nothing else: a view never starts or keeps an agent.
 //
-// Run against the REAL subscription registry rather than a stub, because the backstop being tested
-// IS that registry's connection sweep — a stubbed `registerSubscriptionCleanup` would prove that
-// the handler called a function, which is not the claim.
+// Run against the REAL subscription registry rather than a stub, because the claim includes that a
+// connection closing runs nothing hold-related — a stubbed registry could not show that.
 
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -24,9 +24,10 @@ import { OrcaRuntimeService } from '../../orca-runtime'
 import type { RpcResponse } from '../core'
 import { RpcDispatcher } from '../dispatcher'
 import { STRUCTURED_AGENT_SESSION_METHODS } from './structured-agent-session'
+import { agentSessionFailureFact } from '../../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words'
 
 const CONNECTION = 'connection-1'
-const GRACE_MS = 5
 const CLIENT = {
   clientId: 'device-1',
   clientKind: 'runtime' as const,
@@ -82,7 +83,12 @@ beforeEach(async () => {
       // acquire that throws leaves an unverifiable owner nothing may replace.
       releaseAcquisition: vi.fn(async () => true),
       closeSession,
-      dispatch: async () => ({ state: 'rejected', reason: 'unused' }),
+      dispatch: async () => ({
+        state: 'rejected',
+        ...agentSessionFailureWords(agentSessionFailureFact('providerRejected'), {
+          surface: 'rejection'
+        })
+      }),
       cancelTurn: async () => ({ cancelled: false }),
       answerPrompt: async () => undefined,
       setOption: async () => undefined
@@ -90,7 +96,6 @@ beforeEach(async () => {
     journalRoot: root,
     claimKeyId: 'key-1',
     mintSpawnToken: () => 'spawn-a',
-    releaseGraceMs: GRACE_MS,
     now: () => NOW
   })
   setStructuredAgentSessionHost(host)
@@ -114,186 +119,85 @@ afterEach(async () => {
   await rm(root, { recursive: true, force: true })
 })
 
-describe('a client that holds a session', () => {
-  it('keeps the provider child while the hold stands', async () => {
+describe('the hold surface, for clients that still call it', () => {
+  it('answers a hold without starting an agent or registering a cleanup', async () => {
+    await host.close(SESSION)
+    expect(host.hasSession(SESSION)).toBe(false)
+    const registered = vi.spyOn(runtime, 'registerOwnedSubscriptionCleanup')
+    const acquiresBefore = acquire.mock.calls.length
+
     expect(
       await call('agentSession.hold', { sessionId: SESSION, holderId: 'chat-1' })
-    ).toMatchObject({ ok: true })
+    ).toMatchObject({ ok: true, result: { held: true } })
 
-    await new Promise((resolve) => setTimeout(resolve, GRACE_MS * 20))
-
-    expect(closeSession).not.toHaveBeenCalled()
-    expect(host.hasSession(SESSION)).toBe(true)
+    expect(acquire.mock.calls.length).toBe(acquiresBefore)
+    expect(registered).not.toHaveBeenCalled()
+    expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
   })
 
-  it('releases it when the client says so', async () => {
+  it('answers a release without stopping anything, and a connection close runs nothing', async () => {
     await call('agentSession.hold', { sessionId: SESSION, holderId: 'chat-1' })
 
     expect(
       await call('agentSession.release', { sessionId: SESSION, holderId: 'chat-1' })
-    ).toMatchObject({ ok: true })
+    ).toMatchObject({ ok: true, result: { released: true } })
+    runtime.cleanupSubscriptionsForConnection(CONNECTION)
+    await new Promise((resolve) => setTimeout(resolve, 20))
 
-    await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
-    expect(closeSession).toHaveBeenCalledWith(SESSION)
+    expect(closeSession).not.toHaveBeenCalled()
+    expect(host.hasSession(SESSION)).toBe(true)
   })
 
-  it('releases its hold and cleanup after the setting is disabled', async () => {
-    const release = vi.spyOn(host, 'release')
-    await call('agentSession.hold', { sessionId: SESSION, holderId: 'chat-1' })
+  it('refuses a hold once the setting is off, and still answers a release', async () => {
     structuredNativeChatEnabled = false
 
+    expect(
+      await call('agentSession.hold', { sessionId: SESSION, holderId: 'chat-1' })
+    ).toMatchObject({ ok: false })
     expect(
       await call('agentSession.release', { sessionId: SESSION, holderId: 'chat-1' })
-    ).toMatchObject({ ok: true })
-    const releaseCallsAfterRpc = release.mock.calls.length
-    runtime.cleanupSubscriptionsForConnection(CONNECTION)
-
-    expect(releaseCallsAfterRpc).toBe(2)
-    expect(release).toHaveBeenCalledTimes(releaseCallsAfterRpc)
-    await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
-    expect(closeSession).toHaveBeenCalledWith(SESSION)
-  })
-
-  it('does not report success when no provider child can be acquired', async () => {
-    const response = await call('agentSession.hold', {
-      sessionId: 'session-missing',
-      holderId: 'chat-missing'
-    })
-
-    expect(response).toMatchObject({
-      ok: false,
-      error: { code: 'agent_session_identity_required' }
-    })
-    expect(host.isHeld('session-missing')).toBe(false)
+    ).toMatchObject({ ok: true, result: { released: true } })
+    expect(closeSession).not.toHaveBeenCalled()
   })
-})
 
-describe('a client that disappears without cleanup', () => {
-  it('shares one child with a same-ID replacement that arrives while the first hold resumes', async () => {
+  it('answers a hold even when no agent could be started', async () => {
     await host.close(SESSION)
-    await host.restoreReadableSessions()
-    closeSession.mockClear()
-    acquire.mockClear()
-    const entered = Promise.withResolvers<void>()
-    const gate = Promise.withResolvers<void>()
-    const spawnChild = acquire.getMockImplementation()!
-    acquire.mockImplementationOnce(async (input) => {
-      entered.resolve()
-      await gate.promise
-      return spawnChild(input)
-    })
-    try {
-      const params = { sessionId: SESSION, holderId: 'same-chat' }
-      const first = call('agentSession.hold', params)
-      await entered.promise
-      // Re-registering the cleanup id released the first hold; the replacement waits its turn
-      // behind the first hold's attach and finds the child it made.
-      const replacement = call('agentSession.hold', params)
-      gate.resolve()
-
-      expect(await first).toMatchObject({ ok: true })
-      expect(await replacement).toMatchObject({ ok: true })
-      expect(acquire).toHaveBeenCalledOnce()
-      expect(host.isHeld(SESSION)).toBe(true)
-      await new Promise((resolve) => setTimeout(resolve, GRACE_MS * 4))
-      expect(closeSession).not.toHaveBeenCalled()
+    acquire.mockRejectedValue(new Error('provider unavailable'))
+    const acquiresBefore = acquire.mock.calls.length
 
-      runtime.cleanupSubscriptionsForConnection(CONNECTION)
-      await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
-      expect(closeSession).toHaveBeenCalledExactlyOnceWith(SESSION)
-    } finally {
-      gate.resolve()
-    }
+    expect(
+      await call('agentSession.hold', { sessionId: SESSION, holderId: 'chat-1' })
+    ).toMatchObject({ ok: true, result: { held: true } })
+    expect(acquire.mock.calls.length).toBe(acquiresBefore)
   })
+})
 
-  it('lets a same-ID replacement make its own attempt when the first hold fails to acquire', async () => {
+describe('a stream', () => {
+  it('reads a closed conversation without starting its agent', async () => {
     await host.close(SESSION)
-    await host.restoreReadableSessions()
-    closeSession.mockClear()
-    acquire.mockClear()
-    const entered = Promise.withResolvers<void>()
-    const gate = Promise.withResolvers<void>()
-    acquire.mockImplementationOnce(async () => {
-      entered.resolve()
-      await gate.promise
-      throw new Error('acquisition failed')
-    })
-    try {
-      const params = { sessionId: SESSION, holderId: 'same-chat' }
-      const first = call('agentSession.hold', params)
-      await entered.promise
-      const replacement = call('agentSession.hold', params)
-      gate.resolve()
-
-      expect(await first).toMatchObject({ ok: false })
-      // One attempt per hold: the replacement's own succeeds, and the holder it re-took stands.
-      const replaced = await replacement
-      expect(replaced, JSON.stringify(replaced)).toMatchObject({ ok: true })
-      expect(acquire).toHaveBeenCalledTimes(2)
-      expect(host.isHeld(SESSION)).toBe(true)
-      expect(closeSession).not.toHaveBeenCalled()
-
-      runtime.cleanupSubscriptionsForConnection(CONNECTION)
-      await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
-      expect(closeSession).toHaveBeenCalledExactlyOnceWith(SESSION)
-    } finally {
-      gate.resolve()
-    }
-  })
-
-  it('still releases the session when its transport closes', async () => {
-    await call('agentSession.hold', { sessionId: SESSION, holderId: 'chat-1' })
-
-    runtime.cleanupSubscriptionsForConnection(CONNECTION)
-
-    await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
-    expect(closeSession).toHaveBeenCalledWith(SESSION)
-  })
+    expect(host.hasSession(SESSION)).toBe(false)
+    const acquiresBefore = acquire.mock.calls.length
+    const frames: unknown[] = []
 
-  it('does not release a hold another connection is still holding', async () => {
-    await call('agentSession.hold', { sessionId: SESSION, holderId: 'chat-1' })
     await dispatcher.dispatchStreaming(
       {
-        id: 'request-other',
+        id: 'request-subscribe',
         authToken: 'token',
-        method: 'agentSession.hold',
-        params: { sessionId: SESSION, holderId: 'chat-1' }
+        method: 'agentSession.subscribe',
+        params: { sessionId: SESSION }
       },
-      () => {},
-      { ...CLIENT, clientId: 'device-2', connectionId: 'connection-2' }
+      (raw) => frames.push(JSON.parse(raw)),
+      CLIENT
     )
 
-    runtime.cleanupSubscriptionsForConnection(CONNECTION)
-    await new Promise((resolve) => setTimeout(resolve, GRACE_MS * 20))
-
-    expect(closeSession).not.toHaveBeenCalled()
-    expect(host.hasSession(SESSION)).toBe(true)
-  })
-
-  it('does not let an old connection sweep release its same-document replacement', async () => {
-    await call('agentSession.hold', { sessionId: SESSION, holderId: 'chat-1' })
-    await dispatcher.dispatchStreaming(
-      {
-        id: 'request-replacement',
-        authToken: 'token',
-        method: 'agentSession.hold',
-        params: { sessionId: SESSION, holderId: 'chat-1' }
-      },
-      () => {},
-      { ...CLIENT, connectionId: 'connection-2' }
+    expect(frames).toContainEqual(
+      expect.objectContaining({ result: expect.objectContaining({ type: 'snapshot' }) })
     )
-
-    runtime.cleanupSubscriptionsForConnection(CONNECTION)
-    await new Promise((resolve) => setTimeout(resolve, GRACE_MS * 20))
-
-    expect(closeSession).not.toHaveBeenCalled()
-    expect(host.hasSession(SESSION)).toBe(true)
-
-    runtime.cleanupSubscriptionsForConnection('connection-2')
-    await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
+    expect(acquire.mock.calls.length).toBe(acquiresBefore)
+    expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
   })
 
-  it('releases a desktop subscription when its renderer transport dies', async () => {
+  it('keeps nothing alive when its transport dies', async () => {
     const transport = new AbortController()
     await dispatcher.dispatchStreaming(
       {
@@ -310,56 +214,12 @@ describe('a client that disappears without cleanup', () => {
         clientCapabilities: CLIENT.clientCapabilities
       }
     )
-    expect(host.isHeld(SESSION)).toBe(true)
 
     transport.abort()
+    await new Promise((resolve) => setTimeout(resolve, 20))
 
-    await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
-    expect(closeSession).toHaveBeenCalledWith(SESSION)
-  })
-
-  it('unsubscribes and releases stream retention after the setting is disabled', async () => {
-    await dispatcher.dispatchStreaming(
-      {
-        id: 'stream-disabled-cleanup',
-        authToken: 'token',
-        method: 'agentSession.subscribe',
-        params: { sessionId: SESSION }
-      },
-      () => {},
-      CLIENT
-    )
-    expect(host.isHeld(SESSION)).toBe(true)
-    structuredNativeChatEnabled = false
-
-    expect(
-      await call('agentSession.unsubscribe', {
-        sessionId: SESSION,
-        subscriptionId: 'stream-disabled-cleanup'
-      })
-    ).toMatchObject({ ok: true })
-
-    await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
-    expect(closeSession).toHaveBeenCalledWith(SESSION)
-  })
-
-  it('does not let a stream alone resume a released session', async () => {
-    await host.close(SESSION)
-    expect(host.hasSession(SESSION)).toBe(false)
-    await host.restoreReadableSessions()
-    expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
-
-    await dispatcher.dispatchStreaming(
-      {
-        id: 'request-subscribe',
-        authToken: 'token',
-        method: 'agentSession.subscribe',
-        params: { sessionId: SESSION }
-      },
-      () => {},
-      CLIENT
-    )
-
-    expect(store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
+    // The idle sweep, not a departing reader, is what stops an agent.
+    expect(closeSession).not.toHaveBeenCalled()
+    expect(host.hasSession(SESSION)).toBe(true)
   })
 })
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-hold.ts b/src/main/runtime/rpc/methods/structured-agent-session-hold.ts
index 54753fcb8894..e1975f1c7255 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-hold.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-hold.ts
@@ -1,64 +1,31 @@
-// `agentSession.hold` / `agentSession.release` — a surface saying it is bound to a session.
+// `agentSession.hold` / `agentSession.release` — kept answering for clients that still send them.
 //
-// The holder identity is scoped to the CONNECTION, not taken from the client verbatim: two clients
-// are free to name their surfaces the same thing, and a hold that collides is one that a stranger
-// can release.
-//
-// The registered cleanup is the backstop, and the ONLY thing that covers a client which vanishes —
-// a paired client that disconnects mid-turn never gets to send its release. Registering it before taking
-// the hold is deliberate: re-registering an id runs the previous cleanup synchronously, so the
-// stale release lands before this hold rather than after it.
+// A view no longer decides whether an agent runs: a send starts one, and the idle sweep stops it.
+// So both are no-ops. `hold` still builds the host, because shipped mobile builds build it through
+// `hold` before they subscribe. Delete both, and their allowlist entries, once
+// MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION passes every client that still calls them.
 
-import { defineMethod, type RpcContext } from '../core'
+import { defineMethod } from '../core'
 import {
-  ensureStructuredHostInstalled,
-  requireStructuredCleanupHost,
-  requireStructuredHost
+  requireInstalledStructuredHost,
+  requireStructuredCleanupHost
 } from './structured-agent-session-gate'
 import { HoldParams } from './structured-agent-session-schemas'
 
-const HOLD_CLEANUP_PREFIX = 'agentSession.hold'
-
-function holderKeyFor(ctx: RpcContext, holderId: string): string {
-  const client = ctx.clientId?.trim() || (ctx.clientKind ?? 'runtime')
-  return `${ctx.connectionId ?? 'local'}:${client}:${holderId}`
-}
-
-function holdCleanupIdFor(sessionId: string, holderKey: string): string {
-  return `${HOLD_CLEANUP_PREFIX}:${holderKey}:${sessionId}`
-}
-
 export const STRUCTURED_AGENT_SESSION_HOLD_METHODS = [
   defineMethod({
     name: 'agentSession.hold',
     params: HoldParams,
-    handler: async (params, ctx) => {
-      await ensureStructuredHostInstalled(ctx)
-      const host = requireStructuredHost(ctx)
-      const holderKey = holderKeyFor(ctx, params.holderId)
-      const registration = ctx.runtime.registerOwnedSubscriptionCleanup(
-        holdCleanupIdFor(params.sessionId, holderKey),
-        () => host.release(params.sessionId, holderKey),
-        ctx.connectionId
-      )
-      try {
-        await host.hold(params.sessionId, holderKey)
-      } catch (error) {
-        registration.releaseIfCurrent()
-        throw error
-      }
+    handler: async (_params, ctx) => {
+      await requireInstalledStructuredHost(ctx)
       return { held: true as const }
     }
   }),
   defineMethod({
     name: 'agentSession.release',
     params: HoldParams,
-    handler: async (params, ctx) => {
-      const host = requireStructuredCleanupHost(ctx)
-      const holderKey = holderKeyFor(ctx, params.holderId)
-      host.release(params.sessionId, holderKey)
-      // Retires the backstop too; its release is a no-op against a holder already gone.
-      ctx.runtime.cleanupSubscription(holdCleanupIdFor(params.sessionId, holderKey))
+    handler: async (_params, ctx) => {
+      requireStructuredCleanupHost(ctx)
       return { released: true as const }
     }
   })
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-options-read.ts b/src/main/runtime/rpc/methods/structured-agent-session-options-read.ts
index b74b9cacfa66..19e936895771 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-options-read.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-options-read.ts
@@ -1,22 +1,26 @@
 // The options read surface: what a session reports about itself, and the
 // host's stored model catalog behind the picker.
 //
-// `agentSession.options` serializes on the session because it asks the live
-// provider what is selected. `agentSession.modelCatalog` deliberately does
+// `agentSession.options` answers at rest from the record and the catalog, and
+// asks the live provider only when one runs. `agentSession.modelCatalog` deliberately does
 // neither — answering from the host store is what lets a picker render while
 // an attach is still running. It is additive: an older host answers
 // `method_not_found` (or `forbidden` through the mobile allowlist gate), and
 // the client keeps its static seed.
 
 import { defineMethod } from '../core'
-import { requireStructuredHost as requireHost } from './structured-agent-session-gate'
+import {
+  requireInstalledStructuredHost,
+  requireStructuredHost as requireHost
+} from './structured-agent-session-gate'
 import { ModelCatalogParams, OptionsParams } from './structured-agent-session-schemas'
 
 export const STRUCTURED_AGENT_SESSION_OPTIONS_READ_METHODS = [
   defineMethod({
     name: 'agentSession.options',
     params: OptionsParams,
-    handler: async (params, ctx) => requireHost(ctx).readOptions(params.sessionId)
+    handler: async (params, ctx) =>
+      (await requireInstalledStructuredHost(ctx)).readOptions(params.sessionId)
   }),
   defineMethod({
     name: 'agentSession.modelCatalog',
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.ts b/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.ts
index 24d9fa2aec4b..4038fe9e40d2 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.ts
@@ -12,6 +12,9 @@
 
 import {
   AGENT_SESSION_WIRE_REFUSAL_CODES,
+  agentSessionRefusalFromReference,
+  isAgentSessionRefusalError,
+  refuseUnclassified,
   type AgentSessionWireRefusal,
   type AgentSessionWireRefusalCode
 } from '../../../../shared/agent-session-wire'
@@ -40,19 +43,25 @@ function wireRefusalCode(error: unknown): AgentSessionWireRefusalCode | null {
   return null
 }
 
+const PRECOMMIT_REFUSAL_MESSAGE = 'Orca cannot open a structured agent chat for this workspace.'
+
 function precommitRefusal(error: unknown): AgentSessionWireRefusal {
+  // A refusal the host raised keeps its situation; a bare code names none.
+  if (isAgentSessionRefusalError(error)) {
+    return agentSessionRefusalFromReference(error.refusal, PRECOMMIT_REFUSAL_MESSAGE)
+  }
   const code = wireRefusalCode(error)
   if (code) {
-    return { code, message: 'Orca cannot open a structured agent chat for this workspace.' }
+    return refuseUnclassified(code, PRECOMMIT_REFUSAL_MESSAGE)
   }
   const message = error instanceof Error ? error.message : String(error)
   // A code-less failure here is often a defect, not a policy answer; the refusal keeps the user
-  // moving, the log keeps the cause findable.
+  // moving, the log keeps the cause findable. Nothing names its situation, so it carries no reason.
   console.warn('[agent-session] create refused before it committed anything', error)
-  return {
-    code: UNCODED_PRECOMMIT_REFUSAL_CODE,
-    message: `Orca could not prepare a structured agent chat for this workspace: ${message}`
-  }
+  return refuseUnclassified(
+    UNCODED_PRECOMMIT_REFUSAL_CODE,
+    `Orca could not prepare a structured agent chat for this workspace: ${message}`
+  )
 }
 
 /**
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-restart-resume.ts b/src/main/runtime/rpc/methods/structured-agent-session-restart-resume.ts
index b3a70334f409..a48f897a005e 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-restart-resume.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-restart-resume.ts
@@ -64,20 +64,15 @@ export const STRUCTURED_AGENT_SESSION_RESTART_RESUME_METHODS = [
     }
   }),
   defineMethod({
-    // Reattach only, no send. No Orca surface calls it now — the desktop prompt's single action is
-    // resume-and-continue — but it is a PUBLISHED wire method, so dropping it is a wire removal an
-    // older or non-desktop client would meet as an unknown method.
+    // Reattach only, no send. Reattaching is nothing now — an agent starts only for work — so this
+    // answers that nothing was resumed. No Orca surface calls it, but it is a PUBLISHED wire
+    // method, so dropping it is a wire removal an older client would meet as an unknown method.
     name: 'agentSession.restartResume',
     params: RestartResumeParams,
-    handler: async (params, ctx) => {
+    handler: async (_params, ctx) => {
       await ensureStructuredHostInstalled(ctx)
-      const host = requireStructuredHost(ctx)
-      return {
-        results: await host.restartResume.resume(
-          params.sessionIds,
-          structuredCallerFor(ctx).callerKey
-        )
-      }
+      requireStructuredHost(ctx)
+      return { results: [] }
     }
   })
 ]
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-reveal.ts b/src/main/runtime/rpc/methods/structured-agent-session-reveal.ts
index 47f30a5030dc..903f8d440afb 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-reveal.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-reveal.ts
@@ -9,7 +9,11 @@
 // reads its own record and answers with that record's workspace and provider, so a client knowing
 // only a session id cannot aim the publication somewhere else.
 
-import { isAgentSessionWireRefusalCode } from '../../../../shared/agent-session-wire'
+import {
+  agentSessionRefusalFromReference,
+  isAgentSessionRefusalError,
+  isAgentSessionWireRefusalCode
+} from '../../../../shared/agent-session-wire'
 import type { StructuredAgentSessionReveal } from '../../../native-chat/agent-session-wire/structured-agent-session-host-types'
 import { refuseAgentSessionMutation } from '../../../native-chat/agent-session-wire/structured-agent-session-mutation-admission'
 import { defineMethod } from '../core'
@@ -37,13 +41,14 @@ export const STRUCTURED_AGENT_SESSION_REVEAL_METHODS = [
         if (!isAgentSessionWireRefusalCode(code)) {
           throw error
         }
-        return refuseAgentSessionMutation({
-          code,
-          message:
+        return refuseAgentSessionMutation(
+          agentSessionRefusalFromReference(
+            isAgentSessionRefusalError(error) ? error.refusal : { code },
             code === 'structured_agent_session_unsupported'
               ? 'This host cannot open that chat.'
               : 'This chat is no longer on this host.'
-        })
+          )
+        )
       }
       await ctx.runtime.publishStructuredAgentSessionTab({
         workspaceId: revealed.workspaceId,
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-rpc.test-fixture.ts b/src/main/runtime/rpc/methods/structured-agent-session-rpc.test-fixture.ts
index a9cf5cd79576..9a0f3902496b 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-rpc.test-fixture.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-rpc.test-fixture.ts
@@ -203,8 +203,7 @@ export function hostStub(): StructuredAgentSessionHost {
     subscribeStatus: vi.fn((subscriber: StructuredAgentSessionStatusSubscriber) =>
       statusFeed().subscribe(subscriber)
     ),
-    unsubscribe: vi.fn(),
-    release: vi.fn()
+    unsubscribe: vi.fn()
   })
   return hostCalls as unknown as StructuredAgentSessionHost
 }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-send-compatibility.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-send-compatibility.test.ts
new file mode 100644
index 000000000000..9ae846df6fc0
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-send-compatibility.test.ts
@@ -0,0 +1,84 @@
+// Which clients get a send answered at acceptance, and which have their reply held until the
+// message is handed over: a client that cannot show a rejection after `pending` must not see one.
+
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import {
+  ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES,
+  STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
+} from '../../../../shared/protocol-version'
+import { DESKTOP_RENDERER_RUNTIME_CLIENT_CAPABILITIES } from '../../../ipc/desktop-renderer-runtime-capabilities'
+import { STRUCTURED_AGENT_SESSION_START_WAIT_MS } from '../../../native-chat/agent-session-wire/structured-agent-session-send-settlement'
+import {
+  call,
+  clearStructuredHostStub,
+  hostCalls,
+  installStructuredHostStub,
+  SESSION,
+  sendParams,
+  STRUCTURED_CLIENT
+} from './structured-agent-session-rpc.test-fixture'
+
+beforeEach(() => {
+  installStructuredHostStub()
+})
+
+afterEach(() => {
+  clearStructuredHostStub()
+})
+
+describe('agentSession.send reply timing', () => {
+  it('holds a pending reply until handover for a client that cannot show a later rejection', async () => {
+    hostCalls.send.mockResolvedValueOnce(pendingSendResult())
+    hostCalls.waitForSendSettlement.mockResolvedValueOnce(undefined)
+
+    await call('agentSession.send', sendParams(), STRUCTURED_CLIENT)
+
+    expect(hostCalls.waitForSendSettlement).toHaveBeenCalledWith(SESSION, 'client-1', {
+      until: 'handed-over',
+      budgetMs: STRUCTURED_AGENT_SESSION_START_WAIT_MS
+    })
+  })
+
+  it('answers at acceptance for the local desktop and paired desktop clients (W2)', async () => {
+    for (const clientCapabilities of [
+      DESKTOP_RENDERER_RUNTIME_CLIENT_CAPABILITIES,
+      // A paired desktop gains the structured surface as its own capability; the reply rule rides
+      // on the list it already sends.
+      [...ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES, STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY]
+    ]) {
+      hostCalls.send.mockResolvedValueOnce(pendingSendResult())
+      const response = await call('agentSession.send', sendParams(), {
+        clientKind: 'runtime',
+        clientCapabilities: [...clientCapabilities]
+      })
+      expect(response).toMatchObject({
+        ok: true,
+        result: { value: { submission: { dispatchState: 'pending' } } }
+      })
+    }
+    expect(hostCalls.waitForSendSettlement).not.toHaveBeenCalled()
+  })
+})
+
+function pendingSendResult() {
+  return {
+    ok: true,
+    replayed: false,
+    fence: 1,
+    cursor: { epoch: 'epoch-a', sequence: 1 },
+    value: {
+      clientMessageId: 'client-1',
+      submission: {
+        clientMessageId: 'client-1',
+        fence: 1,
+        payloadFingerprint: 'fingerprint',
+        dispatchState: 'pending' as const,
+        providerItemId: null,
+        reason: null,
+        submittedAt: 1,
+        resolvedAt: null,
+        handoverRecorded: true as const
+      }
+    }
+  }
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-send-compatibility.ts b/src/main/runtime/rpc/methods/structured-agent-session-send-compatibility.ts
index 8b9488699904..5fde5e0f6e49 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-send-compatibility.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-send-compatibility.ts
@@ -1,26 +1,43 @@
-import { AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
+import {
+  AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
+  AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY
+} from '../../../../shared/protocol-version'
 import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
+import { STRUCTURED_AGENT_SESSION_START_WAIT_MS } from '../../../native-chat/agent-session-wire/structured-agent-session-send-settlement'
 import type { RpcContext } from '../core'
 import { requireStructuredHost, structuredCallerFor } from './structured-agent-session-gate'
 
+/**
+ * A send answers once the host accepts it. A client that predates that answer cannot show a
+ * message rejected after it, so its reply is held until the message is handed over or rejected;
+ * one that predates pending replies at all waits, as before, for the provider's answer.
+ */
 export async function sendStructuredAgentSessionForClient(
   params: Parameters<StructuredAgentSessionHost['send']>[1],
   context: RpcContext
 ) {
   const host = requireStructuredHost(context)
   const result = await host.send(structuredCallerFor(context), params)
+  const capabilities = context.clientCapabilities ?? []
   if (
     !result.ok ||
     result.value.submission.dispatchState !== 'pending' ||
     context.clientKind === undefined ||
-    context.clientCapabilities?.includes(AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY)
+    capabilities.includes(AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY)
   ) {
     return result
   }
+  // The start that used to run before the reply now runs after acceptance, so both waits cover it.
   const settled = await host.waitForSendSettlement(
     params.envelope.sessionId,
     result.value.clientMessageId,
-    context.signal
+    {
+      until: capabilities.includes(AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY)
+        ? 'handed-over'
+        : 'answered',
+      budgetMs: STRUCTURED_AGENT_SESSION_START_WAIT_MS,
+      ...(context.signal ? { signal: context.signal } : {})
+    }
   )
   return settled ? { ...result, ...settled } : result
 }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.test.ts
index 0393cf216c84..473f63313729 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.test.ts
@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
 import type {
   AgentSessionHistoryPage,
@@ -87,7 +87,6 @@ describe('turn item capability at the RPC boundary', () => {
   it.each(['snapshot', 'batch', 'reset'] as const)(
     'downgrades the %s stream only for a legacy reader',
     async (type) => {
-      hostCalls.hold = vi.fn(async () => undefined)
       hostCalls.subscribe.mockImplementation((input: AgentSessionSubscribeInput) => {
         const base = { sessionId: SESSION, fence: 1 }
         if (type === 'batch') {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-unsubscribe.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-unsubscribe.test.ts
new file mode 100644
index 000000000000..a31a8bc8d186
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-unsubscribe.test.ts
@@ -0,0 +1,91 @@
+// A transcript stream ends when its client says so: the host drops that subscriber, so nothing is
+// derived or sent for it any more, and a sibling stream of the same session keeps going.
+
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
+import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import {
+  createRestTestRig,
+  foundRestTestChat,
+  REST_TEST_CALLER as CALLER,
+  REST_TEST_SESSION as SESSION,
+  restTestSend,
+  type RestTestRig
+} from '../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import { OrcaRuntimeService } from '../../orca-runtime'
+import type { RpcResponse } from '../core'
+import { RpcDispatcher } from '../dispatcher'
+import { STRUCTURED_AGENT_SESSION_METHODS } from './structured-agent-session'
+
+const CLIENT = {
+  clientId: 'device-1',
+  clientKind: 'runtime' as const,
+  clientCapabilities: [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY],
+  connectionId: 'connection-1'
+}
+
+let rig: RestTestRig
+let dispatcher: RpcDispatcher
+
+function subscriberCount(): number {
+  return rig.host.collaboratorsForTests().subscribers.subscriberCountForTests(SESSION)
+}
+
+async function stream(id: string, frames: RpcResponse[]): Promise<void> {
+  await dispatcher.dispatchStreaming(
+    { id, authToken: 'token', method: 'agentSession.subscribe', params: { sessionId: SESSION } },
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the dispatcher writes RpcResponse JSON.
+    (raw) => frames.push(JSON.parse(raw) as RpcResponse),
+    CLIENT
+  )
+}
+
+beforeEach(async () => {
+  rig = await createRestTestRig({ idleSweep: { intervalMs: 3_600_000 } })
+  setStructuredAgentSessionHost(rig.host)
+  const runtime = new OrcaRuntimeService()
+  vi.spyOn(runtime, 'getClientSettings').mockImplementation(
+    () =>
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the RPC gate reads only this one setting.
+      ({ experimentalStructuredNativeChat: true }) as ReturnType<
+        OrcaRuntimeService['getClientSettings']
+      >
+  )
+  dispatcher = new RpcDispatcher({ runtime, methods: STRUCTURED_AGENT_SESSION_METHODS })
+})
+
+afterEach(async () => {
+  setStructuredAgentSessionHost(null)
+  await rig.dispose()
+})
+
+it('drops the subscriber a client unsubscribes, and keeps its sibling (U-02)', async () => {
+  await foundRestTestChat(rig)
+  const ended: RpcResponse[] = []
+  const kept: RpcResponse[] = []
+  await stream('frame-a', ended)
+  await stream('frame-b', kept)
+  expect(subscriberCount()).toBe(2)
+
+  const replies: RpcResponse[] = []
+  await dispatcher.dispatchStreaming(
+    {
+      id: 'frame-c',
+      authToken: 'token',
+      method: 'agentSession.unsubscribe',
+      params: { sessionId: SESSION, subscriptionId: 'frame-a' }
+    },
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the dispatcher writes RpcResponse JSON.
+    (raw) => replies.push(JSON.parse(raw) as RpcResponse),
+    CLIENT
+  )
+  expect(replies[0]).toMatchObject({ ok: true })
+  expect(subscriberCount()).toBe(1)
+
+  const before = ended.length
+  const fence = rig.store.getRecord(SESSION)!.lease.runtimeFence
+  await rig.host.send(CALLER, restTestSend('after the unsubscribe', fence))
+  await vi.waitFor(() => expect(kept.length).toBeGreaterThan(1))
+  // The ended stream's own `end` frame is all it gets.
+  expect(ended.slice(before).every((frame) => JSON.stringify(frame).includes('"end"'))).toBe(true)
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session.test.ts b/src/main/runtime/rpc/methods/structured-agent-session.test.ts
index 38b55fd70ebd..f1e27aec3def 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session.test.ts
@@ -4,6 +4,8 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
 import {
+  AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
+  AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY,
   AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY,
   RUNTIME_CAPABILITIES,
   RUNTIME_PROTOCOL_VERSION,
@@ -12,6 +14,7 @@ import {
   STRUCTURED_AGENT_SESSION_REVEAL_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
 } from '../../../../shared/protocol-version'
+import { STRUCTURED_AGENT_SESSION_START_WAIT_MS } from '../../../native-chat/agent-session-wire/structured-agent-session-send-settlement'
 import { computeAgentSessionPayloadFingerprint } from '../../../../shared/agent-session-mutation-envelope'
 import { ALL_RPC_METHODS } from './index'
 import { STRUCTURED_AGENT_SESSION_METHODS } from './structured-agent-session'
@@ -149,6 +152,10 @@ describe('capability gating', () => {
   it('advertises the capability without bumping the protocol version', () => {
     expect(RUNTIME_CAPABILITIES).toContain(STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY)
     expect(RUNTIME_CAPABILITIES).toContain(AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY)
+    // A client tells a host that accepts first, and admits a writer-free Stop before a turn, by it.
+    expect(RUNTIME_CAPABILITIES).toContain(AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY)
+    // And a cancel naming no turn, which a host that only accepts first still refuses as invalid.
+    expect(RUNTIME_CAPABILITIES).toContain(AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY)
     expect(RUNTIME_CAPABILITIES).toContain(STRUCTURED_AGENT_SESSION_HOLD_RUNTIME_CAPABILITY)
     expect(RUNTIME_CAPABILITIES).toContain(STRUCTURED_AGENT_SESSION_REVEAL_RUNTIME_CAPABILITY)
     // Separate from the structured capability on purpose: a host can serve the rest of the
@@ -252,11 +259,11 @@ describe('capability gating', () => {
       signal: controller.signal
     })
 
-    expect(hostCalls.waitForSendSettlement).toHaveBeenCalledWith(
-      SESSION,
-      'client-1',
-      controller.signal
-    )
+    expect(hostCalls.waitForSendSettlement).toHaveBeenCalledWith(SESSION, 'client-1', {
+      until: 'answered',
+      budgetMs: STRUCTURED_AGENT_SESSION_START_WAIT_MS,
+      signal: controller.signal
+    })
     expect(response).toMatchObject({
       ok: true,
       result: {
@@ -302,36 +309,6 @@ describe('capability gating', () => {
     })
   })
 
-  it('returns durable pending immediately to clients that understand admission', async () => {
-    hostCalls.send.mockResolvedValueOnce({
-      ok: true,
-      replayed: false,
-      fence: 1,
-      cursor: { epoch: 'epoch-a', sequence: 1 },
-      value: {
-        clientMessageId: 'client-1',
-        submission: {
-          clientMessageId: 'client-1',
-          fence: 1,
-          payloadFingerprint: 'fingerprint',
-          dispatchState: 'pending',
-          providerItemId: null,
-          reason: null,
-          submittedAt: 1,
-          resolvedAt: null
-        }
-      }
-    })
-
-    const response = await call('agentSession.send', sendParams(), STRUCTURED_CLIENT)
-
-    expect(hostCalls.waitForSendSettlement).not.toHaveBeenCalled()
-    expect(response).toMatchObject({
-      ok: true,
-      result: { value: { submission: { dispatchState: 'pending' } } }
-    })
-  })
-
   it('requires the host structured-chat setting for mobile clients', async () => {
     const response = await call('agentSession.send', sendParams(), STRUCTURED_MOBILE_CLIENT, {
       getClientSettings: () => ({ experimentalStructuredNativeChat: false })
@@ -363,7 +340,9 @@ describe('capability gating', () => {
         ok: false,
         error: { message: expect.stringContaining('structured_agent_session_unsupported') }
       })
-      expect(hostCalls[hostCall]).not.toHaveBeenCalled()
+      if (hostCall !== null) {
+        expect(hostCalls[hostCall]).not.toHaveBeenCalled()
+      }
     }
   )
 
diff --git a/src/main/runtime/rpc/methods/structured-agent-session.ts b/src/main/runtime/rpc/methods/structured-agent-session.ts
index ebff420cb002..dc01a2fee8f1 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session.ts
@@ -5,6 +5,7 @@
 // not exist rather than receiving the journal or mutation surface. Session-tab
 // inventory may expose only a metadata placeholder for an incapable mobile client.
 
+import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
 import { agentSessionFingerprintConflict } from '../../../../shared/agent-session-mutation-envelope'
 import type { z } from 'zod'
 import {
@@ -18,6 +19,7 @@ import {
 import { defineMethod, defineStreamingMethod, type RpcContext } from '../core'
 import {
   ensureStructuredHostInstalled as ensureHostInstalled,
+  requireInstalledStructuredHost as requireInstalledHost,
   requireStructuredCapability,
   requireStructuredCleanupHost,
   requireStructuredHost as requireHost,
@@ -75,7 +77,9 @@ async function resolveClientSuppliedAttach(params: z.infer<typeof AttachParams>,
   await ensureHostInstalled(ctx)
   const host = requireHost(ctx)
   if (!host.supportsCreate(params.location, params.agent)) {
-    throw new Error('structured_agent_session_unsupported')
+    throw agentSessionRefusalError('structured_agent_session_unsupported', {
+      reason: 'hostUnsupported'
+    })
   }
   const { agent: _attachAgent, provider: _attachProvider, ...attachWithoutAgent } = params
   const attachParams = {
@@ -130,7 +134,9 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
     params: CreateSupportParams,
     handler: async (params, ctx) => {
       if (!supportsStructuredSessions(ctx)) {
-        throw new Error('structured_agent_session_unsupported')
+        throw agentSessionRefusalError('structured_agent_session_unsupported', {
+          reason: 'clientCapabilityMissing'
+        })
       }
       return ctx.runtime.getStructuredAgentSessionCreateSupport(params.worktree, params.agent)
     }
@@ -141,7 +147,9 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
     handler: async (params, ctx) => {
       requireStructuredCapability(ctx)
       if (params.envelope.expectedRuntimeFence !== null) {
-        throw new Error('agent_session_operation_invalid')
+        throw agentSessionRefusalError('agent_session_operation_invalid', {
+          reason: 'requestMalformed'
+        })
       }
       // Everything up to `attach` is pre-commit, and answers with a refusal rather than a throw so
       // a client can tell "nothing was created" from "the outcome is unknown".
@@ -235,19 +243,20 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
   defineMethod({
     name: 'agentSession.handoffStatus',
     params: HandoffStatusParams,
-    handler: async (params, ctx) => requireHost(ctx).handoffStatus(params.sessionId)
+    handler: async (params, ctx) =>
+      (await requireInstalledHost(ctx)).handoffStatus(params.sessionId)
   }),
   defineMethod({
     name: 'agentSession.commands',
     params: OptionsParams,
-    handler: async (params, ctx) => requireHost(ctx).readCommands(params.sessionId)
+    handler: async (params, ctx) => (await requireInstalledHost(ctx)).readCommands(params.sessionId)
   }),
   defineMethod({
     name: 'agentSession.history',
     params: HistoryParams,
     handler: async (params, ctx) =>
       projectTurnItemHistory(
-        projectBackgroundTaskHistory(requireHost(ctx).history(params), ctx),
+        projectBackgroundTaskHistory(await (await requireInstalledHost(ctx)).history(params), ctx),
         ctx
       )
   }),
@@ -255,25 +264,17 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
     name: 'agentSession.subscribe',
     params: SubscribeParams,
     handler: async (params, ctx, emit) => {
-      const host = requireHost(ctx)
+      const host = await requireInstalledHost(ctx)
       const subscriptionId = subscriptionIdFor(ctx, params.sessionId)
-      // A live stream is a surface too: it keeps a session from being evicted while it is read and
-      // releases that retention when the transport dies without a word.
-      //
-      // Retain-only: reading history must never be what starts a provider process. Current clients
-      // explicitly hold every open surface before subscribing.
-      const streamHolder = `subscription:${subscriptionId}`
+      // A stream reads; it never keeps an agent alive or starts one.
       let dispose = (): void => {}
-      const stream = bindStructuredAgentSessionStream(ctx, subscriptionId, () => {
-        dispose()
-        host.release(params.sessionId, streamHolder)
-      })
+      const stream = bindStructuredAgentSessionStream(ctx, subscriptionId, () => dispose())
       if (stream.isClosed()) {
         return
       }
-      // The host emits the opening snapshot (or the missed batch) synchronously
-      // inside open(), so nothing between here and there can interleave.
-      dispose = host.subscribe({
+      // Resolves once the conversation is open and the opening snapshot (or the missed batch) is
+      // emitted; a close that raced the open disposes what it bound.
+      dispose = await host.subscribe({
         id: subscriptionId,
         sessionId: params.sessionId,
         emit: (event) => emit(projectTurnItemEvent(projectBackgroundTaskEvent(event, ctx), ctx)),
@@ -281,14 +282,6 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
       })
       if (stream.isClosed()) {
         dispose()
-      } else {
-        // Fire-and-forget, but never unhandled: a resume that refuses leaves the stream holding a
-        // readable session, which is exactly what the client sees anyway.
-        void host
-          .hold(params.sessionId, streamHolder, { resume: false })
-          .catch((error: unknown) =>
-            console.warn('[agent-session] stream hold failed', params.sessionId, error)
-          )
       }
     }
   }),
diff --git a/src/main/runtime/rpc/methods/structured-session-tab-restore.ts b/src/main/runtime/rpc/methods/structured-session-tab-restore.ts
index f9efa46d16d8..6ec962414229 100644
--- a/src/main/runtime/rpc/methods/structured-session-tab-restore.ts
+++ b/src/main/runtime/rpc/methods/structured-session-tab-restore.ts
@@ -11,14 +11,16 @@ import {
  *  project after a desktop restart — no chat and no prompt. The setting still gates it, because
  *  with structured chat off there is nothing for any mobile client to reach. Restoring spawns no
  *  provider child for a cleanly closed session. */
-export async function restoreStructuredTabsIfSupported(
+export function restoreStructuredTabsIfSupported(
   context: Pick<RpcContext, 'runtime' | 'clientKind' | 'clientCapabilities'>
-): Promise<void> {
+): Promise<void> | undefined {
   const shouldRestore =
     context.clientKind === 'mobile'
       ? isStructuredNativeChatEnabled(context.runtime)
       : supportsStructuredAgentSessions(context)
   if (shouldRestore && typeof context.runtime.restoreStructuredAgentSessionTabs === 'function') {
-    await context.runtime.restoreStructuredAgentSessionTabs()
+    return context.runtime.restoreStructuredAgentSessionTabs()
   }
+  // Nothing to restore: callers skip the await, so a stream's setup keeps its timing.
+  return undefined
 }
diff --git a/src/main/runtime/rpc/methods/structured-worker-read-cursor.test.ts b/src/main/runtime/rpc/methods/structured-worker-read-cursor.test.ts
index 1a97223bc395..b376f2c80d9e 100644
--- a/src/main/runtime/rpc/methods/structured-worker-read-cursor.test.ts
+++ b/src/main/runtime/rpc/methods/structured-worker-read-cursor.test.ts
@@ -79,7 +79,7 @@ function read(cursor?: string, limit?: number) {
   })
 }
 
-function textsOf(result: ReturnType<typeof read>): string[] {
+function textsOf(result: Awaited<ReturnType<typeof read>>): string[] {
   return result.transcript.messages.map((entry) =>
     entry.blocks.map((block) => ('text' in block ? block.text : '')).join('')
   )
@@ -90,57 +90,57 @@ describe('the structured worker-read cursor over a mutating journal', () => {
     hostRef.current = null
   })
 
-  it('refuses to resume when an already-delivered item was revised in place', () => {
+  it('refuses to resume when an already-delivered item was revised in place', async () => {
     // The `"hel"` / `"hello"` defect. The caller is handed a coalesced snapshot, resumes past it,
     // and the item is later revised at its original sequence — under the old anchor the resume was
     // accepted and that revision was never delivered to anyone.
     installJournal([message('i1', 'hel'), message('i2', 'second')])
-    const first = read(undefined, 1)
+    const first = await read(undefined, 1)
     expect(textsOf(first)).toEqual(['hel'])
 
     installJournal([message('i1', 'hello world', 2), message('i2', 'second')])
-    expect(() => read(first.cursor)).toThrow(/source changed/i)
+    await expect(read(first.cursor)).rejects.toThrow(/source changed/i)
   })
 
-  it('refuses to resume when a resolved prompt inserts ahead of the caller position', () => {
+  it('refuses to resume when a resolved prompt inserts ahead of the caller position', async () => {
     // Duplication. A pending approval projects to null, so resolving it inserts a message in the
     // MIDDLE; the oldest item never moved, so the old anchor accepted a now-stale index and the
     // caller re-read content it already had.
     installJournal([message('i1', 'first'), approval('i2', false), message('i3', 'second')])
-    const first = read(undefined, 2)
+    const first = await read(undefined, 2)
     expect(textsOf(first)).toEqual(['first', 'second'])
 
     installJournal([message('i1', 'first'), approval('i2', true, 2), message('i3', 'second')])
-    expect(() => read(first.cursor)).toThrow(/source changed/i)
+    await expect(read(first.cursor)).rejects.toThrow(/source changed/i)
   })
 
-  it('still resumes across a page boundary when only unread tail items change', () => {
+  it('still resumes across a page boundary when only unread tail items change', async () => {
     // The reason this is prefix-scoped and not whole-page: during an active turn the coalescer
     // revises the streaming item every 60ms. Fingerprinting the whole page would invalidate the
     // cursor continuously — a useless verb — while the worker is working.
     installJournal([message('i1', 'first'), message('i2', 'streaming')])
-    const first = read(undefined, 1)
+    const first = await read(undefined, 1)
     expect(textsOf(first)).toEqual(['first'])
 
     installJournal([message('i1', 'first'), message('i2', 'streaming more', 7)])
-    const second = read(first.cursor)
+    const second = await read(first.cursor)
     expect(textsOf(second)).toEqual(['streaming more'])
   })
 
-  it('delivers every message exactly once when nothing below the cursor changes', () => {
+  it('delivers every message exactly once when nothing below the cursor changes', async () => {
     // The property the two refusals above protect: no omission, no duplication.
     installJournal([message('i1', 'a'), message('i2', 'b'), message('i3', 'c')])
-    const first = read(undefined, 2)
-    const second = read(first.cursor, 2)
+    const first = await read(undefined, 2)
+    const second = await read(first.cursor, 2)
     expect([...textsOf(first), ...textsOf(second)]).toEqual(['a', 'b', 'c'])
   })
 
-  it('still refuses when the window slides off the front', () => {
+  it('still refuses when the window slides off the front', async () => {
     // The case the old anchor DID catch, and which the prefix scoping must not lose: a slide
     // shifts every index.
     installJournal([message('i1', 'a'), message('i2', 'b')])
-    const first = read(undefined, 1)
+    const first = await read(undefined, 1)
     installJournal([message('i2', 'b'), message('i3', 'c')])
-    expect(() => read(first.cursor)).toThrow(/source changed/i)
+    await expect(read(first.cursor)).rejects.toThrow(/source changed/i)
   })
 })
diff --git a/src/main/runtime/rpc/methods/terminal-manifest-characterization.test.ts b/src/main/runtime/rpc/methods/terminal-manifest-characterization.test.ts
index e26788d5d467..59370934057e 100644
--- a/src/main/runtime/rpc/methods/terminal-manifest-characterization.test.ts
+++ b/src/main/runtime/rpc/methods/terminal-manifest-characterization.test.ts
@@ -21,6 +21,7 @@ const METHOD_CASES: readonly (readonly [string, unknown, boolean])[] = [
   ['terminal.agentStatus', { terminal: 'term' }, false],
   ['terminal.rename', { terminal: 'term', title: null }, false],
   ['terminal.clearBuffer', { terminal: 'term' }, false],
+  ['terminal.resetInputModes', { terminal: 'term' }, false],
   ['terminal.send', { terminal: 'term', text: 'x' }, false],
   ['terminal.wait', { terminal: 'term', for: 'exit' }, false],
   ['terminal.create', {}, false],
@@ -67,11 +68,11 @@ async function invoke(name: string, params: unknown, runtime: Partial<OrcaRuntim
 
 describe('terminal RPC manifest characterization', () => {
   it('preserves all method names, order, streaming flags, and parseable minimum inputs', () => {
-    expect(TERMINAL_METHODS).toHaveLength(35)
+    expect(TERMINAL_METHODS).toHaveLength(36)
     expect(TERMINAL_METHODS.map((method) => [method.name, 'stream' in method])).toEqual(
       METHOD_CASES.map(([name, _params, stream]) => [name, stream])
     )
-    expect(new Set(TERMINAL_METHODS.map((method) => method.name)).size).toBe(35)
+    expect(new Set(TERMINAL_METHODS.map((method) => method.name)).size).toBe(36)
     for (const [name, params] of METHOD_CASES) {
       expect(() => schemaFor(name).parse(params), name).not.toThrow()
     }
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-input-delivery.ts b/src/main/runtime/rpc/methods/terminal/terminal-input-delivery.ts
index 7313eb82b944..59fd827f0ce1 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-input-delivery.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-input-delivery.ts
@@ -1,9 +1,5 @@
 import { InvalidArgumentError } from '../../core'
-import type {
-  DriverState,
-  OrcaRuntimeService,
-  SubscriptionRegistration
-} from '../../../orca-runtime'
+import type { DriverState, OrcaRuntimeService } from '../../../orca-runtime'
 import {
   TERMINAL_INPUT_MAX_BYTES,
   TERMINAL_INPUT_TOO_LARGE_ERROR,
@@ -51,45 +47,6 @@ export function resolveMobileFloorClientId(
 
 export type TerminalStreamInputOutcome = 'delivered' | 'rejected' | 'failed'
 
-export function watchSubscriptionLifetime(
-  runtime: OrcaRuntimeService,
-  ptyId: string,
-  signal: AbortSignal | undefined,
-  registration: SubscriptionRegistration
-): () => void {
-  let unsubscribeExit: (() => void) | null = null
-  let removeAbort: (() => void) | null = null
-  let stopped = false
-  const stop = (): void => {
-    stopped = true
-    unsubscribeExit?.()
-    removeAbort?.()
-  }
-  const release = (): void => {
-    registration.releaseIfCurrent()
-    stop()
-  }
-  unsubscribeExit = runtime.subscribeToPtyExit(ptyId, release)
-  if (stopped) {
-    unsubscribeExit()
-    return stop
-  }
-  if (!signal) {
-    return stop
-  }
-  if (signal.aborted) {
-    release()
-    return stop
-  }
-  const onAbort = (): void => release()
-  removeAbort = () => signal.removeEventListener('abort', onAbort)
-  signal.addEventListener('abort', onAbort, { once: true })
-  if (stopped) {
-    removeAbort()
-  }
-  return stop
-}
-
 export function isTerminalStreamInputRejection(error: unknown): boolean {
   const message = error instanceof Error ? error.message : String(error)
   return message.includes('terminal_not_writable') || message.includes('terminal_handle_stale')
@@ -109,10 +66,11 @@ export async function sendTerminalStreamInput(
   const floorClaim: MobileInputFloorClaimHolder = { current: null }
   try {
     if (!clientId) {
-      const result = await runtime.sendTerminal(args.terminal, action)
+      const result = await runtime.sendTerminal(args.terminal, action, { inputKind: 'driving' })
       return result.accepted ? 'delivered' : 'rejected'
     }
     const result = await runtime.sendTerminal(args.terminal, action, {
+      inputKind: 'driving',
       reserveWrite: (writePtyId) => {
         const claim = runtime.beginMobileInputFloor(writePtyId, clientId)
         if (!claim) {
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-legacy-simple-subscriptions.ts b/src/main/runtime/rpc/methods/terminal/terminal-legacy-simple-subscriptions.ts
index 25257c45a3dd..a9bcf1af6957 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-legacy-simple-subscriptions.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-legacy-simple-subscriptions.ts
@@ -3,185 +3,115 @@ import type { TerminalOutputBatcher } from './terminal-output-batcher'
 import { isTerminalReadPayloadIncomplete } from './terminal-stream-replay'
 import { serializeBudgetedMobileSnapshot } from './terminal-snapshot-publication'
 import { updateViewportForClient } from './terminal-viewport-update'
-import { watchSubscriptionLifetime } from './terminal-input-delivery'
 import type { TerminalSubscriptionArgs } from './terminal-legacy-subscription-types'
 import { allocateTerminalSubscriptionStreamId } from './terminal-subscription-stream-id'
-import { untrackAskSurfacePaneSubscription } from '../../../../fork-ask-question-tool/ask-attached-surface-roster'
 
 export async function runTerminalLeaseSubscription(args: TerminalSubscriptionArgs): Promise<void> {
-  const { params, runtime, connectionId, signal, emit, ptyId, clientId } = args
+  const { registration, emit, ptyId, clientId } = args
   if (!clientId) {
     return
   }
-  let closed = false
-  let stopWatchingLifetime = (): void => {}
   let resolveStream = (): void => {}
   const streamClosed = new Promise<void>((resolve) => {
     resolveStream = resolve
   })
-  const subscriptionId = `${params.terminal}:${clientId}`
+  registration.setTeardown(resolveStream)
   // Why: chat needs the input-floor ack without registering a view subscriber or transporting duplicate PTY output.
-  const registration = runtime.registerOwnedSubscriptionCleanup(
-    subscriptionId,
-    () => {
-      stopWatchingLifetime()
-      closed = true
-      untrackAskSurfacePaneSubscription(runtime, connectionId, params.terminal)
-      runtime.handleMobileUnsubscribe(ptyId, clientId)
-      emit({ type: 'end' })
-      resolveStream()
-    },
-    connectionId
-  )
-  stopWatchingLifetime = watchSubscriptionLifetime(runtime, ptyId, signal, registration)
-  if (closed) {
-    // Why: an already-exited pty releases synchronously, so cleanup ran before this setup registers anything.
+  // A lease-only subscriber has no terminal view, so its cached viewport must never phone-fit the PTY.
+  await registration.addMobilePresence(ptyId, clientId, undefined)
+  if (registration.released) {
     return
   }
-  try {
-    // Why: a lease-only subscriber has no terminal view, so its cached viewport must never phone-fit the PTY.
-    await runtime.handleMobileSubscribe(ptyId, clientId, undefined)
-    if (closed || signal?.aborted) {
-      // Why: a disconnect can win the awaited subscribe and resurrect mobile presence after cleanup already released it.
-      // Unguarded on purpose: this must still fire when our own cleanup already ran.
-      // Safe only because lease-only passes no viewport and both !viewport paths in
-      // handleMobileSubscribeInternal return with no await, so no rebind can land
-      // first. Adding an await there — or passing a viewport here — makes a
-      // superseded handler delete the replacement's (ptyId, clientId) presence.
-      runtime.handleMobileUnsubscribe(ptyId, clientId)
-      if (!closed) {
-        registration.releaseIfCurrent()
-      }
-      return
-    }
-    emit({ type: 'subscribed', streamId: null, lines: [], truncated: false })
-    await streamClosed
-  } catch (error) {
-    registration.releaseIfCurrent()
-    throw error
-  }
+  emit({ type: 'subscribed', streamId: null, lines: [], truncated: false })
+  await streamClosed
 }
 
 export async function runTerminalJsonSubscription(args: TerminalSubscriptionArgs): Promise<void> {
-  const {
-    params,
-    runtime,
-    connectionId,
-    signal,
-    emit,
-    ptyId,
-    clientId,
-    supportsDesktopViewportClaims
-  } = args
+  const { params, runtime, registration, emit, ptyId, clientId, supportsDesktopViewportClaims } =
+    args
   // Why: only unregister the width floor this subscription took (see the multiplex stream's registeredRemoteDesktopDriver note).
   let registeredRemoteDesktopDriver = false
-
-  // Why: a hidden watcher and a visible pane can subscribe to one terminal, so key by client so neither stream evicts the other.
-  const subscriptionId = clientId ? `${params.terminal}:${clientId}` : params.terminal
   const remoteDesktopSubscriptionKey = `json:${allocateTerminalSubscriptionStreamId()}`
-  let closed = false
   let outputBatcher: TerminalOutputBatcher | null = null
   let unsubscribeData = (): void => {}
   let unsubscribeFit = (): void => {}
-  let stopWatchingLifetime = (): void => {}
   let resolveStream = (): void => {}
   const streamClosed = new Promise<void>((resolve) => {
     resolveStream = resolve
   })
-  // Why: register before viewport/snapshot awaits so a socket close can't orphan the stream listeners or its remote-desktop width floor.
-  const registration = runtime.registerOwnedSubscriptionCleanup(
-    subscriptionId,
-    () => {
-      stopWatchingLifetime()
-      closed = true
-      untrackAskSurfacePaneSubscription(runtime, connectionId, params.terminal)
-      outputBatcher?.flush()
-      outputBatcher?.dispose()
-      unsubscribeData()
-      unsubscribeFit()
-      if (registeredRemoteDesktopDriver && clientId) {
-        runtime.unregisterRemoteDesktopViewer(ptyId, remoteDesktopSubscriptionKey)
-      }
-      emit({ type: 'end' })
-      resolveStream()
-    },
-    connectionId
-  )
-  stopWatchingLifetime = watchSubscriptionLifetime(runtime, ptyId, signal, registration)
-  if (closed) {
-    // Why: an already-exited pty releases synchronously, so cleanup ran before this setup registers anything.
+  registration.setTeardown(() => {
+    outputBatcher?.flush()
+    outputBatcher?.dispose()
+    unsubscribeData()
+    unsubscribeFit()
+    if (registeredRemoteDesktopDriver && clientId) {
+      runtime.unregisterRemoteDesktopViewer(ptyId, remoteDesktopSubscriptionKey)
+    }
+    resolveStream()
+  })
+  if (clientId && params.client && params.viewport) {
+    registeredRemoteDesktopDriver = true
+    await updateViewportForClient(
+      runtime,
+      ptyId,
+      remoteDesktopSubscriptionKey,
+      params.client,
+      params.viewport,
+      'desktop',
+      'register',
+      !supportsDesktopViewportClaims
+    )
+  }
+  if (registration.released) {
     return
   }
-  try {
-    if (clientId && params.client && params.viewport) {
-      registeredRemoteDesktopDriver = true
-      await updateViewportForClient(
-        runtime,
-        ptyId,
-        remoteDesktopSubscriptionKey,
-        params.client,
-        params.viewport,
-        'desktop',
-        'register',
-        !supportsDesktopViewportClaims
-      )
-    }
-    if (closed || signal?.aborted) {
-      registration.releaseIfCurrent()
-      return
-    }
-    const read = await runtime.readTerminal(params.terminal)
-    const serialized = await serializeBudgetedMobileSnapshot(runtime, ptyId, false)
-    if (closed || signal?.aborted) {
-      registration.releaseIfCurrent()
-      return
-    }
-    const size = runtime.getTerminalSize(ptyId)
-    const displayMode = runtime.getMobileDisplayMode(ptyId)
-    const seq = runtime.getLayout(ptyId)?.seq
+  const read = await runtime.readTerminal(params.terminal)
+  const serialized = await serializeBudgetedMobileSnapshot(runtime, ptyId, false)
+  if (registration.released) {
+    return
+  }
+  const size = runtime.getTerminalSize(ptyId)
+  const displayMode = runtime.getMobileDisplayMode(ptyId)
+  const seq = runtime.getLayout(ptyId)?.seq
+  emit({
+    type: 'scrollback',
+    lines: read.tail,
+    truncated: isTerminalReadPayloadIncomplete(read),
+    serialized: serialized?.data,
+    oscLinks: serialized?.oscLinks,
+    cwd: serialized?.cwd,
+    // Why: an empty snapshot with no PTY size must still report the dims the fit
+    // will produce — dimless frames re-armed the mobile fit loop (STA-3337).
+    cols: serialized?.cols ?? size?.cols ?? params.viewport?.cols,
+    rows: serialized?.rows ?? size?.rows ?? params.viewport?.rows,
+    displayMode,
+    seq
+  })
+  outputBatcher = createTerminalOutputBatcher((chunk) => {
+    emit({ type: 'data', chunk })
+  })
+  const unsubscribeStreamData = runtime.subscribeToTerminalData(ptyId, (data) => {
+    outputBatcher?.push(data)
+  })
+  // Why: the legacy JSON stream can feed a live xterm view, so register as a view subscriber; worst case is a withheld model reply, safer than a double reply.
+  const releaseViewSubscriber = runtime.registerRemoteTerminalViewSubscriber(ptyId)
+  unsubscribeData = () => {
+    releaseViewSubscriber()
+    unsubscribeStreamData()
+  }
+  unsubscribeFit = runtime.subscribeToFitOverrideChanges(ptyId, (event) => {
+    outputBatcher?.flush()
+    const mode =
+      event.mode === 'mobile-fit'
+        ? event.mode
+        : (runtime.getRemoteDesktopFitHold?.(ptyId, remoteDesktopSubscriptionKey).mode ??
+          'desktop-fit')
     emit({
-      type: 'scrollback',
-      lines: read.tail,
-      truncated: isTerminalReadPayloadIncomplete(read),
-      serialized: serialized?.data,
-      oscLinks: serialized?.oscLinks,
-      cwd: serialized?.cwd,
-      // Why: an empty snapshot with no PTY size must still report the dims the fit
-      // will produce — dimless frames re-armed the mobile fit loop (STA-3337).
-      cols: serialized?.cols ?? size?.cols ?? params.viewport?.cols,
-      rows: serialized?.rows ?? size?.rows ?? params.viewport?.rows,
-      displayMode,
-      seq
-    })
-    outputBatcher = createTerminalOutputBatcher((chunk) => {
-      emit({ type: 'data', chunk })
+      type: 'fit-override-changed',
+      mode,
+      cols: event.cols,
+      rows: event.rows
     })
-    const unsubscribeStreamData = runtime.subscribeToTerminalData(ptyId, (data) => {
-      outputBatcher?.push(data)
-    })
-    // Why: the legacy JSON stream can feed a live xterm view, so register as a view subscriber; worst case is a withheld model reply, safer than a double reply.
-    const releaseViewSubscriber = runtime.registerRemoteTerminalViewSubscriber(ptyId)
-    unsubscribeData = () => {
-      releaseViewSubscriber()
-      unsubscribeStreamData()
-    }
-    unsubscribeFit = runtime.subscribeToFitOverrideChanges(ptyId, (event) => {
-      outputBatcher?.flush()
-      const mode =
-        event.mode === 'mobile-fit'
-          ? event.mode
-          : (runtime.getRemoteDesktopFitHold?.(ptyId, remoteDesktopSubscriptionKey).mode ??
-            'desktop-fit')
-      emit({
-        type: 'fit-override-changed',
-        mode,
-        cols: event.cols,
-        rows: event.rows
-      })
-    })
-    await streamClosed
-  } catch (error) {
-    registration.releaseIfCurrent()
-    throw error
-  }
+  })
+  await streamClosed
 }
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-legacy-subscribe-binary.ts b/src/main/runtime/rpc/methods/terminal/terminal-legacy-subscribe-binary.ts
index 8b9feb088d8c..35d40a2d9485 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-legacy-subscribe-binary.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-legacy-subscribe-binary.ts
@@ -13,7 +13,6 @@ import {
 import { TERMINAL_MULTIPLEX_PENDING_MAX_BYTES } from '../../../../../shared/terminal-multiplex-flow-control'
 import { measureTerminalStreamByteLength } from '../../terminal-stream-byte-length'
 import { createTerminalOutputBatcher, type TerminalOutputBatcher } from './terminal-output-batcher'
-import { watchSubscriptionLifetime } from './terminal-input-delivery'
 import { trimPendingOutputToBudget } from './terminal-stream-replay'
 import { allocateTerminalSubscriptionStreamId } from './terminal-subscription-stream-id'
 import type {
@@ -24,11 +23,9 @@ import type { TerminalOutputChunk } from './terminal-stream-types'
 import { publishLegacyBinaryInitialSnapshot } from './terminal-legacy-subscribe-snapshot'
 import { activateLegacyBinarySubscription } from './terminal-legacy-subscribe-live'
 import { registerLegacyBinaryControlFrames } from './terminal-legacy-binary-control-frames'
-import { untrackAskSurfacePaneSubscription } from '../../../../fork-ask-question-tool/ask-attached-surface-roster'
 const TERMINAL_QUERY_REPLAY_MAX_CHARS = 16 * 1024
 export async function runTerminalBinarySubscription(args: TerminalSubscriptionArgs): Promise<void> {
-  const { params, runtime, connectionId, sendBinary, signal, emit, ptyId, clientId, isMobile } =
-    args
+  const { runtime, registration, sendBinary, ptyId, clientId, isMobile } = args
   if (!sendBinary) {
     throw new Error('binary_terminal_stream_required')
   }
@@ -54,41 +51,28 @@ export async function runTerminalBinarySubscription(args: TerminalSubscriptionAr
   let unsubscribeFit = (): void => {}
   let unregisterBinaryHandler = (): void => {}
   let abortRendererMountWait = (): void => {}
-  let stopWatchingLifetime = (): void => {}
   let lateRendererReadyPromise: Promise<boolean> | null = null
   let outputBatcher: TerminalOutputBatcher | null = null
   let resolveStream = (): void => {}
   const streamClosed = new Promise<void>((resolve) => {
     resolveStream = resolve
   })
-  // Why: register cleanup before any await so a mid-subscribe disconnect still removes mobile presence; client-scoped ids also allow parallel desktop subscribers.
-  const subscriptionId = clientId ? `${params.terminal}:${clientId}` : params.terminal
-  const registration = runtime.registerOwnedSubscriptionCleanup(
-    subscriptionId,
-    () => {
-      stopWatchingLifetime()
-      outputBatcher?.flush()
-      outputBatcher?.dispose()
-      closed = true
-      untrackAskSurfacePaneSubscription(runtime, connectionId, params.terminal)
-      unsubscribeData()
-      unsubscribeResize()
-      unsubscribeFit()
-      unregisterBinaryHandler()
-      abortRendererMountWait()
-      if (isMobile && clientId) {
-        runtime.handleMobileUnsubscribe(ptyId, clientId)
-      } else if (registeredRemoteDesktopDriver && clientId) {
-        runtime.unregisterRemoteDesktopViewer(ptyId, remoteDesktopSubscriptionKey)
-      }
-      emit({ type: 'end' })
-      resolveStream()
-    },
-    connectionId
-  )
-  stopWatchingLifetime = watchSubscriptionLifetime(runtime, ptyId, signal, registration)
-  if (closed) {
-    // Why: an already-exited pty releases synchronously, so cleanup ran before this setup registers anything.
+  registration.setTeardown(() => {
+    outputBatcher?.flush()
+    outputBatcher?.dispose()
+    closed = true
+    unsubscribeData()
+    unsubscribeResize()
+    unsubscribeFit()
+    unregisterBinaryHandler()
+    abortRendererMountWait()
+    // Why: phone presence belongs to the registration; only a desktop viewer owns a width floor here.
+    if (!isMobile && registeredRemoteDesktopDriver && clientId) {
+      runtime.unregisterRemoteDesktopViewer(ptyId, remoteDesktopSubscriptionKey)
+    }
+    resolveStream()
+  })
+  if (registration.released) {
     return
   }
   const sendFrame = (
@@ -270,19 +254,13 @@ export async function runTerminalBinarySubscription(args: TerminalSubscriptionAr
       registeredRemoteDesktopDriver = value
     },
     displayMode: 'auto',
-    registration,
     streamClosed,
     sendFrame
   }
-  try {
-    await publishLegacyBinaryInitialSnapshot(args, state)
-    if (state.closed || signal?.aborted) {
-      return
-    }
-    activateLegacyBinarySubscription(args, state)
-  } catch (error) {
-    registration.releaseIfCurrent()
-    throw error
+  await publishLegacyBinaryInitialSnapshot(args, state)
+  if (registration.released) {
+    return
   }
+  activateLegacyBinarySubscription(args, state)
   await streamClosed
 }
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-legacy-subscribe-snapshot.ts b/src/main/runtime/rpc/methods/terminal/terminal-legacy-subscribe-snapshot.ts
index 7b9d45d144ca..5202804c0d5e 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-legacy-subscribe-snapshot.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-legacy-subscribe-snapshot.ts
@@ -24,7 +24,7 @@ export async function publishLegacyBinaryInitialSnapshot(
   const {
     params,
     runtime,
-    signal,
+    registration,
     sendBinary,
     emit,
     ptyId,
@@ -34,8 +34,9 @@ export async function publishLegacyBinaryInitialSnapshot(
     rendererMountRequestedBeforePty,
     serializerGenerationBeforeMobileFit
   } = args
+  const { signal } = registration
   if (isMobile && clientId) {
-    await runtime.handleMobileSubscribe(ptyId, clientId, params.viewport)
+    await registration.addMobilePresence(ptyId, clientId, params.viewport)
   } else if (clientId && params.viewport) {
     // Why: legacy subscribe records geometry without taking ownership; only an explicit activity/claim frame may suppress the host.
     state.registeredRemoteDesktopDriver = true
@@ -60,20 +61,28 @@ export async function publishLegacyBinaryInitialSnapshot(
   if (state.closed) {
     return
   }
-  // Why: missing model state (not blank snapshot text) signals a never-attached PTY; a renderer-sourced snapshot already proves attachment, so skip the remount.
+  // Why: missing model state (not blank snapshot text) signals a never-attached PTY; any renderer answer proves a pane, and the answer is null when the host's flag is unset or stale after a pane closed over a live PTY, which falls back to the mount wait.
+  const needsRendererScreen =
+    missingHeadlessStateBeforeMobileFit && serialized?.source !== 'renderer'
+  let rendererReady =
+    needsRendererScreen &&
+    (await runtime.serializeRendererTerminalBuffer(ptyId, { scrollbackRows: 0 })) !== null
+  if (state.closed) {
+    return
+  }
   const mountRequested =
-    missingHeadlessStateBeforeMobileFit &&
-    serialized?.source !== 'renderer' &&
+    needsRendererScreen &&
+    !rendererReady &&
     (rendererMountRequestedBeforePty || runtime.requestRendererTerminalTabMount(params.terminal))
-  if (missingHeadlessStateBeforeMobileFit && mountRequested) {
+  if (mountRequested) {
     // Why: an idle legacy PTY emits no later byte, so wait for a settle proving this remount completed before replaying its screen.
     const mountWaitController = new AbortController()
     const abortMountWait = (): void => mountWaitController.abort()
     state.abortRendererMountWait = abortMountWait
-    if (signal?.aborted) {
+    if (signal.aborted) {
       abortMountWait()
     } else {
-      signal?.addEventListener('abort', abortMountWait, { once: true })
+      signal.addEventListener('abort', abortMountWait, { once: true })
     }
     const rendererReadyPromise = runtime
       .waitForRendererTerminalSerializer(
@@ -84,7 +93,7 @@ export async function publishLegacyBinaryInitialSnapshot(
       )
       .catch(() => false)
     const finishMountWait = (): void => {
-      signal?.removeEventListener('abort', abortMountWait)
+      signal.removeEventListener('abort', abortMountWait)
       if (state.abortRendererMountWait === abortMountWait) {
         state.abortRendererMountWait = () => {}
       }
@@ -97,43 +106,49 @@ export async function publishLegacyBinaryInitialSnapshot(
         deadlineTimer.unref()
       }
     })
-    const rendererReady = await Promise.race([rendererReadyPromise, initialDeadline])
+    rendererReady = await Promise.race([rendererReadyPromise, initialDeadline])
     if (deadlineTimer) {
       clearTimeout(deadlineTimer)
     }
-    if (state.closed || signal?.aborted) {
+    if (state.closed || signal.aborted) {
       return
     }
-    if (rendererReady) {
-      read = await runtime.readTerminal(params.terminal)
-      const stableRendererSnapshot = await serializeStableMobileRendererSnapshot(
-        runtime,
-        ptyId,
-        // The same frame, because this snapshot is published by the scrollback send below rather
-        // than by one of its own: the `resized` it used to name is a frame nothing here sends.
-        mobileSnapshotByteBudget(params.snapshotByteBudget, state.streamId, scrollbackFrame)
-      )
-      if (state.closed) {
-        return
-      }
-      if (stableRendererSnapshot?.data.length) {
-        serialized = stableRendererSnapshot
-        const trailingOutput = state.pendingOutput.flatMap((item) => {
-          const output = getOutputAfterSnapshotSeq(item, stableRendererSnapshot.seq)
-          const seq = item.meta?.seq
-          return output && typeof seq === 'number' ? [{ data: output.data, seq }] : []
-        })
-        runtime.replaceHeadlessTerminalFromRendererSnapshotForRecovery(
-          ptyId,
-          stableRendererSnapshot,
-          trailingOutput
-        )
-      }
-    } else {
+    if (!rendererReady) {
       // Why: a renderer can settle after the bounded initial response; keep observing so an idle PTY self-heals without bytes.
       state.lateRendererReadyPromise = rendererReadyPromise
     }
   }
+  if (rendererReady) {
+    read = await runtime.readTerminal(params.terminal)
+    const stableRendererSnapshot = await serializeStableMobileRendererSnapshot(
+      runtime,
+      ptyId,
+      // The same frame, because this snapshot is published by the scrollback send below rather
+      // than by one of its own: the `resized` it used to name is a frame nothing here sends.
+      mobileSnapshotByteBudget(params.snapshotByteBudget, state.streamId, scrollbackFrame)
+    )
+    if (state.closed) {
+      return
+    }
+    // Why: a blank screen may be a parked pane that has not hydrated, and a seq-less screen has no
+    // seam against buffered output, so it is safe only when nothing is pending to replay twice.
+    if (
+      stableRendererSnapshot?.data.length &&
+      (typeof stableRendererSnapshot.seq === 'number' || state.pendingOutput.length === 0)
+    ) {
+      serialized = stableRendererSnapshot
+      const trailingOutput = state.pendingOutput.flatMap((item) => {
+        const output = getOutputAfterSnapshotSeq(item, stableRendererSnapshot.seq)
+        const seq = item.meta?.seq
+        return output && typeof seq === 'number' ? [{ data: output.data, seq }] : []
+      })
+      runtime.replaceHeadlessTerminalFromRendererSnapshotForRecovery(
+        ptyId,
+        stableRendererSnapshot,
+        trailingOutput
+      )
+    }
+  }
   let initialOutputOverflowed = false
   if (state.pendingOutputOverflowed) {
     state.pendingOutput.splice(0)
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-legacy-subscription-types.ts b/src/main/runtime/rpc/methods/terminal/terminal-legacy-subscription-types.ts
index d9eb624f0e16..595a65a5eeb4 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-legacy-subscription-types.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-legacy-subscription-types.ts
@@ -1,11 +1,11 @@
 import type { z } from 'zod'
 import type { RpcContext } from '../../core'
-import type { SubscriptionRegistration } from '../../../orca-runtime'
 import type { TerminalReplyQuerySequence } from '../../../../../shared/terminal-reply-query-scan'
 import type { TerminalOutputChunk } from './terminal-stream-types'
 import type { TerminalSubscribe } from './stream-schemas'
 import type { TerminalOutputBatcher } from './terminal-output-batcher'
 import type { TerminalStreamOpcode } from '../../../../../shared/terminal-stream-protocol'
+import type { TerminalSubscriptionRegistration } from './terminal-subscription-registration'
 
 export type TerminalSubscribeParams = z.infer<typeof TerminalSubscribe>
 export type TerminalSubscriptionEmit = (result: unknown) => void
@@ -13,10 +13,9 @@ export type TerminalSubscriptionEmit = (result: unknown) => void
 export type TerminalSubscriptionArgs = {
   params: TerminalSubscribeParams
   runtime: RpcContext['runtime']
-  connectionId: RpcContext['connectionId']
+  registration: TerminalSubscriptionRegistration
   sendBinary: RpcContext['sendBinary']
   registerBinaryStreamHandler: RpcContext['registerBinaryStreamHandler']
-  signal: RpcContext['signal']
   emit: TerminalSubscriptionEmit
   ptyId: string
   clientId: string | undefined
@@ -48,7 +47,6 @@ export type LegacyBinarySubscriptionState = {
   unsubscribeFit: () => void
   registeredRemoteDesktopDriver: boolean
   displayMode: string
-  readonly registration: SubscriptionRegistration
   readonly streamClosed: Promise<void>
   readonly sendFrame: (
     opcode: TerminalStreamOpcode,
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-query-methods.ts b/src/main/runtime/rpc/methods/terminal/terminal-query-methods.ts
index 52c1063b0cc7..68afc1e8d196 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-query-methods.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-query-methods.ts
@@ -121,5 +121,12 @@ export const TERMINAL_QUERY_METHODS = [
     handler: async (params, { runtime }) => ({
       clear: await runtime.clearTerminalBuffer(params.terminal)
     })
+  }),
+  defineMethod({
+    name: 'terminal.resetInputModes',
+    params: TerminalHandle,
+    handler: async (params, { runtime }) => ({
+      reset: await runtime.resetTerminalInputModes(params.terminal)
+    })
   })
 ]
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts b/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts
index 99c01d902a42..ca7ac0aeb759 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts
@@ -210,6 +210,7 @@ export const TERMINAL_SEND_METHODS = [
       try {
         result = useSettledAgentPrompt
           ? await runtime.sendTerminalAgentPrompt(params.terminal, params.text!, {
+              inputKind: 'driving',
               beforeWrite,
               signal,
               ...(orchestrationMutation
@@ -234,6 +235,8 @@ export const TERMINAL_SEND_METHODS = [
               {
                 beforeWrite,
                 signal,
+                // Why: a wire write carries no provenance beyond a client's own query reply.
+                inputKind: params.inputKind === 'query-reply' ? 'query-reply' : 'driving',
                 ...(reserveWrite ? { reserveWrite } : {}),
                 ...(params.inputKind !== 'query-reply' && mobileFloorClientId
                   ? { afterWrite: () => commitMobileInputFloorClaim(mobileFloorClaim) }
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-subscribe-method.ts b/src/main/runtime/rpc/methods/terminal/terminal-subscribe-method.ts
index 406911e16224..00b012d4b45d 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-subscribe-method.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-subscribe-method.ts
@@ -7,7 +7,11 @@ import {
   runTerminalLeaseSubscription
 } from './terminal-legacy-simple-subscriptions'
 import type { TerminalSubscriptionArgs } from './terminal-legacy-subscription-types'
-import { trackAskSurfacePaneSubscription } from '../../../../fork-ask-question-tool/ask-attached-surface-roster'
+import {
+  trackAskSurfacePaneSubscription,
+  untrackAskSurfacePaneSubscription
+} from '../../../../fork-ask-question-tool/ask-attached-surface-roster'
+import { registerTerminalSubscription } from './terminal-subscription-registration'
 
 export const TERMINAL_SUBSCRIBE_METHODS = [
   // Streams live terminal output over WebSocket; mobile clients pass client+viewport for server-side auto-fit.
@@ -16,82 +20,112 @@ export const TERMINAL_SUBSCRIBE_METHODS = [
     params: TerminalSubscribe,
     handler: async (
       params,
-      { runtime, connectionId, sendBinary, registerBinaryStreamHandler, signal },
+      { runtime, connectionId, requestId, sendBinary, registerBinaryStreamHandler, signal },
       emit
     ) => {
-      let leaf = runtime.resolveLeafForHandle(params.terminal)
       const isMobile = params.client?.type === 'mobile'
-      const serializerGenerationBeforeAnyMount = isMobile
-        ? (runtime.getRendererTerminalSerializerGenerationForHandle?.(params.terminal) ?? 0)
-        : 0
-      let rendererMountRequestedBeforePty = false
       const useBinaryStream = params.capabilities?.terminalBinaryStream === 1 && Boolean(sendBinary)
+      // Why: validated before registering, so a request that can never stream can't evict the slot's live stream.
+      if (isMobile && !useBinaryStream) {
+        throw new Error('binary_terminal_stream_required')
+      }
       if (signal?.aborted) {
         return
       }
-
-      if (!leaf?.ptyId && params.client) {
-        rendererMountRequestedBeforePty = runtime.requestRendererTerminalTabMount(params.terminal)
-        try {
-          const ptyId = await runtime.waitForLeafPtyId(params.terminal, 10_000, signal)
+      let leaf = runtime.resolveLeafForHandle(params.terminal)
+      const serializerGenerationBeforeAnyMount = isMobile
+        ? (runtime.getRendererTerminalSerializerGenerationForHandle?.(params.terminal) ?? 0)
+        : 0
+      let rendererMountRequestedBeforePty = false
+      const clientId = params.client?.id
+      // Why: register before the pty wait so an unsubscribe, a same-slot replacement or a closed socket can end a pending stream.
+      // Client-scoped keys also let a hidden watcher and a visible pane subscribe to one terminal.
+      const registration = registerTerminalSubscription({
+        runtime,
+        subscriptionId: clientId ? `${params.terminal}:${clientId}` : params.terminal,
+        connectionId,
+        requestId,
+        requestSignal: signal,
+        emit
+      })
+      try {
+        if (!leaf?.ptyId && params.client) {
+          rendererMountRequestedBeforePty = runtime.requestRendererTerminalTabMount(params.terminal)
+          const ptyId = await runtime
+            .waitForLeafPtyId(params.terminal, 10_000, registration.signal)
+            .catch(() => null)
+          if (registration.released) {
+            return
+          }
           leaf = { ptyId }
-        } catch {
-          if (signal?.aborted) {
+        }
+        if (!leaf?.ptyId) {
+          const read = await runtime.readTerminal(params.terminal)
+          if (registration.released) {
             return
           }
+          emit({
+            type: 'subscribed',
+            streamId: null,
+            lines: read.tail,
+            truncated: isTerminalReadPayloadIncomplete(read)
+          })
+          return
         }
-      }
-      if (!leaf?.ptyId) {
-        const read = await runtime.readTerminal(params.terminal)
-        emit({
-          type: 'subscribed',
-          streamId: null,
-          lines: read.tail,
-          truncated: isTerminalReadPayloadIncomplete(read)
-        })
-        emit({ type: 'end' })
-        return
-      }
-      if (isMobile && (!useBinaryStream || !sendBinary)) {
-        throw new Error('binary_terminal_stream_required')
-      }
 
-      const ptyId = leaf.ptyId
-      trackAskSurfacePaneSubscription(runtime, connectionId, params.terminal)
-      const clientId = params.client?.id
-      const missingHeadlessStateBeforeMobileFit =
-        isMobile &&
-        (rendererMountRequestedBeforePty || runtime.hasHeadlessTerminalState?.(ptyId) === false)
-      const args: TerminalSubscriptionArgs = {
-        params,
-        runtime,
-        connectionId,
-        sendBinary,
-        registerBinaryStreamHandler,
-        signal,
-        emit,
-        ptyId,
-        clientId,
-        isMobile,
-        supportsDesktopViewportClaims: params.capabilities?.desktopViewportClaims === 1,
-        supportsWriteUnavailable: params.capabilities?.writeUnavailable === 1,
-        rendererMountRequestedBeforePty,
-        missingHeadlessStateBeforeMobileFit,
-        serializerGenerationBeforeMobileFit: missingHeadlessStateBeforeMobileFit
-          ? rendererMountRequestedBeforePty
-            ? serializerGenerationBeforeAnyMount
-            : runtime.getRendererTerminalSerializerGeneration(ptyId)
-          : 0
-      }
-      if (isMobile && params.capabilities?.mobileInputLeaseOnly === 1 && Boolean(clientId)) {
-        await runTerminalLeaseSubscription(args)
-        return
-      }
-      if (!useBinaryStream) {
-        await runTerminalJsonSubscription(args)
-        return
+        const ptyId = leaf.ptyId
+        registration.releaseOnPtyExit(ptyId)
+        if (registration.released) {
+          return
+        }
+        trackAskSurfacePaneSubscription(runtime, connectionId, params.terminal)
+        registration.signal.addEventListener(
+          'abort',
+          () => untrackAskSurfacePaneSubscription(runtime, connectionId, params.terminal),
+          { once: true }
+        )
+        const missingHeadlessStateBeforeMobileFit =
+          isMobile &&
+          (rendererMountRequestedBeforePty || runtime.hasHeadlessTerminalState?.(ptyId) === false)
+        const args: TerminalSubscriptionArgs = {
+          params,
+          runtime,
+          registration,
+          sendBinary,
+          registerBinaryStreamHandler,
+          emit,
+          ptyId,
+          clientId,
+          isMobile,
+          supportsDesktopViewportClaims: params.capabilities?.desktopViewportClaims === 1,
+          supportsWriteUnavailable: params.capabilities?.writeUnavailable === 1,
+          rendererMountRequestedBeforePty,
+          missingHeadlessStateBeforeMobileFit,
+          serializerGenerationBeforeMobileFit: missingHeadlessStateBeforeMobileFit
+            ? rendererMountRequestedBeforePty
+              ? serializerGenerationBeforeAnyMount
+              : runtime.getRendererTerminalSerializerGeneration(ptyId)
+            : 0
+        }
+        if (isMobile && params.capabilities?.mobileInputLeaseOnly === 1 && Boolean(clientId)) {
+          await runTerminalLeaseSubscription(args)
+          return
+        }
+        if (!useBinaryStream) {
+          await runTerminalJsonSubscription(args)
+          return
+        }
+        await runTerminalBinarySubscription(args)
+      } catch (error) {
+        // Why: a released stream already sent `end`; an error frame after it would contradict it.
+        if (registration.released) {
+          return
+        }
+        registration.releaseSilently()
+        throw error
+      } finally {
+        registration.release()
       }
-      await runTerminalBinarySubscription(args)
     }
   })
 ]
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-subscription-registration.test.ts b/src/main/runtime/rpc/methods/terminal/terminal-subscription-registration.test.ts
new file mode 100644
index 000000000000..1af456dfdd4a
--- /dev/null
+++ b/src/main/runtime/rpc/methods/terminal/terminal-subscription-registration.test.ts
@@ -0,0 +1,123 @@
+import { describe, expect, it, vi } from 'vitest'
+import { RuntimeSubscriptionRegistry } from '../../../runtime-subscription-registry'
+import { registerTerminalSubscription } from './terminal-subscription-registration'
+
+const SUBSCRIPTION_ID = 'terminal-1:phone-1'
+
+function createRegistration(
+  requestSignal?: AbortSignal,
+  registry = new RuntimeSubscriptionRegistry()
+) {
+  const runtime = {
+    registerOwnedSubscriptionCleanup: registry.registerOwned.bind(registry),
+    subscribeToPtyExit: vi.fn((_ptyId: string, _listener: () => void) => vi.fn()),
+    handleMobileSubscribe: vi.fn().mockResolvedValue(true),
+    handleMobileUnsubscribe: vi.fn()
+  }
+  const emit = vi.fn()
+  const registration = registerTerminalSubscription({
+    runtime,
+    subscriptionId: SUBSCRIPTION_ID,
+    connectionId: 'conn-a',
+    requestId: 'req-1',
+    requestSignal,
+    emit
+  })
+  return { registry, runtime, emit, registration }
+}
+
+describe('terminal subscription registration', () => {
+  it('runs its teardown once when the teardown re-enters release', () => {
+    const { registry, emit, registration } = createRegistration()
+    const teardown = vi.fn(() => {
+      registration.release()
+      registry.cleanup(SUBSCRIPTION_ID)
+    })
+    registration.setTeardown(teardown)
+
+    registration.release()
+
+    expect(teardown).toHaveBeenCalledOnce()
+    expect(emit.mock.calls).toEqual([[{ type: 'end' }]])
+    expect(registration.signal.aborted).toBe(true)
+  })
+
+  it('runs a teardown set after release immediately', () => {
+    const { registration } = createRegistration()
+    registration.release()
+    const teardown = vi.fn()
+
+    registration.setTeardown(teardown)
+
+    expect(teardown).toHaveBeenCalledOnce()
+  })
+
+  it('is released on arrival, without taking the slot, when the request signal is already aborted', () => {
+    const registry = new RuntimeSubscriptionRegistry()
+    const liveCleanup = vi.fn()
+    registry.registerOwned(SUBSCRIPTION_ID, liveCleanup, 'conn-a')
+    const request = new AbortController()
+    request.abort()
+    const { emit, registration } = createRegistration(request.signal, registry)
+
+    expect(registration.released).toBe(true)
+    expect(registration.signal.aborted).toBe(true)
+    expect(emit).not.toHaveBeenCalled()
+    expect(liveCleanup).not.toHaveBeenCalled()
+    expect(registry.cleanupIfOwnedByConnection(SUBSCRIPTION_ID, 'conn-a')).toBe(true)
+    expect(liveCleanup).toHaveBeenCalledOnce()
+  })
+
+  it('removes phone presence and aborts even when the teardown throws', async () => {
+    const { runtime, registration } = createRegistration()
+    void registration.addMobilePresence('pty-1', 'phone-1', undefined)
+    registration.setTeardown(() => {
+      throw new Error('flush_failed')
+    })
+    const error = vi.spyOn(console, 'error').mockImplementation(() => {})
+
+    registration.release()
+
+    expect(runtime.handleMobileUnsubscribe).toHaveBeenCalledWith('pty-1', 'phone-1')
+    expect(registration.signal.aborted).toBe(true)
+    await vi.waitFor(() => expect(error).toHaveBeenCalled())
+    error.mockRestore()
+  })
+
+  it('adds no presence after release', async () => {
+    const { runtime, registration } = createRegistration()
+    registration.release()
+
+    await registration.addMobilePresence('pty-1', 'phone-1', undefined)
+
+    expect(runtime.handleMobileSubscribe).not.toHaveBeenCalled()
+    expect(runtime.handleMobileUnsubscribe).not.toHaveBeenCalled()
+  })
+
+  it('releases silently without end', () => {
+    const { emit, registration } = createRegistration()
+
+    registration.releaseSilently()
+    registration.release()
+
+    expect(registration.released).toBe(true)
+    expect(emit).not.toHaveBeenCalled()
+  })
+
+  it('stops watching for pty exit when released, and releases on exit', () => {
+    const { runtime, emit, registration } = createRegistration()
+    let onExit = (): void => {}
+    const stopWatching = vi.fn()
+    runtime.subscribeToPtyExit.mockImplementation((_ptyId: string, listener: () => void) => {
+      onExit = listener
+      return stopWatching
+    })
+    registration.releaseOnPtyExit('pty-1')
+
+    onExit()
+
+    expect(registration.released).toBe(true)
+    expect(stopWatching).toHaveBeenCalledOnce()
+    expect(emit.mock.calls).toEqual([[{ type: 'end' }]])
+  })
+})
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-subscription-registration.ts b/src/main/runtime/rpc/methods/terminal/terminal-subscription-registration.ts
new file mode 100644
index 000000000000..235088b20482
--- /dev/null
+++ b/src/main/runtime/rpc/methods/terminal/terminal-subscription-registration.ts
@@ -0,0 +1,141 @@
+import type { OrcaRuntimeService } from '../../../orca-runtime'
+
+type RegistrationRuntime = Pick<
+  OrcaRuntimeService,
+  | 'registerOwnedSubscriptionCleanup'
+  | 'subscribeToPtyExit'
+  | 'handleMobileSubscribe'
+  | 'handleMobileUnsubscribe'
+>
+
+/** One `terminal.subscribe` request, addressable from admission until it is released. */
+export type TerminalSubscriptionRegistration = {
+  readonly released: boolean
+  /** Aborted once release has torn everything down. */
+  readonly signal: AbortSignal
+  /** Runs the stream's teardown on release, or now if the registration was already released. */
+  setTeardown(teardown: () => void): void
+  releaseOnPtyExit(ptyId: string): void
+  addMobilePresence(
+    ptyId: string,
+    clientId: string,
+    viewport: { cols: number; rows: number } | undefined
+  ): Promise<void>
+  /** Releases and ends the stream. */
+  release(): void
+  /** Releases without `end`, for a handler about to fail the request instead. */
+  releaseSilently(): void
+}
+
+export function registerTerminalSubscription({
+  runtime,
+  subscriptionId,
+  connectionId,
+  requestId,
+  requestSignal,
+  emit
+}: {
+  runtime: RegistrationRuntime
+  subscriptionId: string
+  connectionId: string | undefined
+  /** With `connectionId`, lets `terminal.unsubscribe{requestId}` address this exact request. */
+  requestId: string | undefined
+  requestSignal: AbortSignal | undefined
+  emit: (result: unknown) => void
+}): TerminalSubscriptionRegistration {
+  const controller = new AbortController()
+  let released = false
+  let ended = false
+  let teardown: (() => void) | null = null
+  let stopWatchingExit = (): void => {}
+  let presence: { ptyId: string; clientId: string } | null = null
+
+  const end = (): void => {
+    if (ended) {
+      return
+    }
+    ended = true
+    emit({ type: 'end' })
+  }
+  const releaseOnce = (): void => {
+    // Why: the registry calls cleanup before recording it as in flight, so a re-entrant release must be a no-op.
+    if (released) {
+      return
+    }
+    released = true
+    requestSignal?.removeEventListener('abort', onRequestAbort)
+    try {
+      try {
+        stopWatchingExit()
+        teardown?.()
+      } finally {
+        // Why: the latch makes any retry a no-op, so a throwing teardown must not strand phone presence.
+        if (presence) {
+          runtime.handleMobileUnsubscribe(presence.ptyId, presence.clientId)
+        }
+      }
+    } finally {
+      controller.abort()
+    }
+  }
+  // Why: a closed socket hands out a pre-aborted signal; registering would evict the slot's live stream for a dead request.
+  const registryEntry = requestSignal?.aborted
+    ? null
+    : runtime.registerOwnedSubscriptionCleanup(
+        subscriptionId,
+        () => {
+          try {
+            releaseOnce()
+          } finally {
+            end()
+          }
+        },
+        connectionId,
+        requestId
+      )
+  // Why: route through the registry so the entry leaves with the release and a teardown error is contained there.
+  const release = (): void => registryEntry?.releaseIfCurrent()
+  const onRequestAbort = (): void => release()
+
+  const registration: TerminalSubscriptionRegistration = {
+    get released() {
+      return released
+    },
+    signal: controller.signal,
+    setTeardown(nextTeardown) {
+      if (released) {
+        nextTeardown()
+        return
+      }
+      teardown = nextTeardown
+    },
+    releaseOnPtyExit(ptyId) {
+      const unsubscribe = runtime.subscribeToPtyExit(ptyId, release)
+      if (released) {
+        // Why: an already-exited pty releases synchronously, before the unsubscribe exists to stop.
+        unsubscribe()
+        return
+      }
+      stopWatchingExit = unsubscribe
+    },
+    async addMobilePresence(ptyId, clientId, viewport) {
+      if (released) {
+        return
+      }
+      // Why: presence and the driver are set before the layout await, so a release during it must remove them.
+      presence = { ptyId, clientId }
+      await runtime.handleMobileSubscribe(ptyId, clientId, viewport)
+    },
+    release,
+    releaseSilently() {
+      ended = true
+      release()
+    }
+  }
+  if (registryEntry) {
+    requestSignal?.addEventListener('abort', onRequestAbort, { once: true })
+  } else {
+    releaseOnce()
+  }
+  return registration
+}
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-viewport-methods.ts b/src/main/runtime/rpc/methods/terminal/terminal-viewport-methods.ts
index da1121c89df2..b977c1136681 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-viewport-methods.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-viewport-methods.ts
@@ -83,6 +83,12 @@ export const TERMINAL_VIEWPORT_METHODS_AFTER_STREAMS = [
     name: 'terminal.unsubscribe',
     params: TerminalUnsubscribe,
     handler: async (params, { runtime, connectionId, subscriptionRegistrationVersion }) => {
+      if (params.requestId !== undefined) {
+        // Why: an unknown request already ended or never registered; falling back to the slot could end a newer stream.
+        runtime.releaseSubscriptionByRequest(connectionId, params.requestId)
+        return { unsubscribed: true }
+      }
+      // COMPAT(terminal request-addressed unsubscribe): slot path for phones that predate `requestId`.
       // Fence both socket replacement and a newer subscription on the same socket.
       let unsubscribed = runtime.cleanupSubscriptionIfOwnedByConnection(
         params.subscriptionId,
diff --git a/src/main/runtime/rpc/methods/worktree-create-args.ts b/src/main/runtime/rpc/methods/worktree-create-args.ts
index 932659758bb5..c05dc906f40d 100644
--- a/src/main/runtime/rpc/methods/worktree-create-args.ts
+++ b/src/main/runtime/rpc/methods/worktree-create-args.ts
@@ -78,6 +78,7 @@ export function buildManagedWorktreeCreateArgs(
       : undefined,
     ...(params.startupAgent ? { startupAgent: params.startupAgent } : {}),
     ...(params.startupPrompt !== undefined ? { startupPrompt: params.startupPrompt } : {}),
+    ...(params.launchSource ? { startupLaunchSource: params.launchSource } : {}),
     startupDraft: params.startupDraft,
     lineage: {
       parentWorkspace: params.parentWorkspace,
diff --git a/src/main/runtime/rpc/methods/worktree-create-launch-source.test.ts b/src/main/runtime/rpc/methods/worktree-create-launch-source.test.ts
new file mode 100644
index 000000000000..2cfd6c3de920
--- /dev/null
+++ b/src/main/runtime/rpc/methods/worktree-create-launch-source.test.ts
@@ -0,0 +1,41 @@
+import { describe, expect, it, vi } from 'vitest'
+import { RpcDispatcher } from '../dispatcher'
+import type { OrcaRuntimeService } from '../../orca-runtime'
+import { WORKTREE_METHODS } from './worktree'
+
+const repo = {
+  id: 'repo-1',
+  path: '/workspace/repo',
+  displayName: 'repo',
+  badgeColor: '#000',
+  addedAt: 1,
+  kind: 'git' as const
+}
+
+describe('worktree.create launch source', () => {
+  it('hands the surface that asked for a startup agent to the runtime', async () => {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture implements every runtime method worktree.create reaches for a create with no provenance request.
+    const runtime = {
+      getRuntimeId: () => 'test-runtime',
+      dedupeWorktreeCreate: <T>(_repo: string, _id: string | undefined, run: () => Promise<T>) =>
+        run(),
+      showRepo: vi.fn().mockResolvedValue(repo),
+      createManagedWorktree: vi.fn().mockResolvedValue({ worktree: { id: 'wt-1' } })
+    } as unknown as OrcaRuntimeService
+    const dispatcher = new RpcDispatcher({ runtime, methods: WORKTREE_METHODS })
+
+    // An open label: a surface this host has never heard of must not refuse the create.
+    for (const launchSource of ['cli', 'a_surface_added_later']) {
+      const response = await dispatcher.dispatch({
+        id: 'req-1',
+        authToken: 'tok',
+        method: 'worktree.create',
+        params: { repo: 'repo-1', name: 'agent-startup', startupAgent: 'codex', launchSource }
+      })
+      expect(response).toMatchObject({ ok: true })
+      expect(runtime.createManagedWorktree).toHaveBeenLastCalledWith(
+        expect.objectContaining({ startupAgent: 'codex', startupLaunchSource: launchSource })
+      )
+    }
+  })
+})
diff --git a/src/main/runtime/rpc/orchestration-session-caller.test.ts b/src/main/runtime/rpc/orchestration-session-caller.test.ts
index d96e214d4421..d6ab1ba3ccb6 100644
--- a/src/main/runtime/rpc/orchestration-session-caller.test.ts
+++ b/src/main/runtime/rpc/orchestration-session-caller.test.ts
@@ -376,6 +376,80 @@ describe('orchestration session callers at the dispatch entry', () => {
       expect(response).toMatchObject({ ok: false, error: { code: 'consumer_fenced' } })
     })
 
+    it('accepts a /clear successor naming the address it had before the clear, and no other', async () => {
+      // Y continued X after a /clear, so X's address is Y's: the lineage root names the chat.
+      h.records.set(SESSION_X, {
+        ...sessionRecord(SESSION_X),
+        conversationCommand: {
+          command: 'clear',
+          state: 'completed',
+          replacementSessionId: SESSION_Y,
+          operationId: 'op',
+          callerKey: 'caller',
+          phase: 'committed'
+        }
+      })
+      const run = resultOf(
+        await h.dispatch(
+          orchestrationRequest(
+            'orchestration.runCreate',
+            { objective: 'o', from: ADDRESS_X },
+            { sessionId: SESSION_Y }
+          )
+        )
+      ).run
+      expect(h.db.getRunRaw(idOf(run))?.coordinator_orca_session_id).toBe(SESSION_X)
+
+      const stranger = 'session:0b5e2d7c-9a41-4c3e-8f62-7d1a3e5b9c08'
+      const refused = await h.dispatch(
+        orchestrationRequest(
+          'orchestration.runCreate',
+          { objective: 'o', from: stranger },
+          { sessionId: SESSION_Y }
+        )
+      )
+      expect(refused).toMatchObject({ ok: false, error: { code: 'consumer_fenced' } })
+    })
+
+    it.each(['orchestration.gateList', 'orchestration.taskList'])(
+      'checks a caller %s names beside --run: the /clear root is the chat, a stranger is refused',
+      async (method) => {
+        h.records.set(SESSION_X, {
+          ...sessionRecord(SESSION_X),
+          conversationCommand: {
+            command: 'clear',
+            state: 'completed',
+            replacementSessionId: SESSION_Y,
+            operationId: 'op',
+            callerKey: 'caller',
+            phase: 'committed'
+          }
+        })
+        const runId = idOf(
+          resultOf(
+            await h.dispatch(
+              orchestrationRequest(
+                'orchestration.runCreate',
+                { objective: 'o' },
+                { sessionId: SESSION_Y }
+              )
+            )
+          ).run
+        )
+        const param = ORCHESTRATION_CALLER_PARAM[method]!
+        const listed = await h.dispatch(
+          orchestrationRequest(method, { run: runId, [param]: ADDRESS_X }, { sessionId: SESSION_Y })
+        )
+        expect(resultOf(listed)).toMatchObject({ runId })
+
+        const stranger = 'session:0b5e2d7c-9a41-4c3e-8f62-7d1a3e5b9c08'
+        const refused = await h.dispatch(
+          orchestrationRequest(method, { run: runId, [param]: stranger }, { sessionId: SESSION_Y })
+        )
+        expect(refused).toMatchObject({ ok: false, error: { code: 'consumer_fenced' } })
+      }
+    )
+
     it.each([ADDRESS_X, SESSION_X])('accepts the session named as %s', async (declared) => {
       const run = resultOf(
         await h.dispatch(
diff --git a/src/main/runtime/rpc/orchestration-session-caller.ts b/src/main/runtime/rpc/orchestration-session-caller.ts
index e4bd09f2619f..0d2253481b44 100644
--- a/src/main/runtime/rpc/orchestration-session-caller.ts
+++ b/src/main/runtime/rpc/orchestration-session-caller.ts
@@ -19,7 +19,6 @@ import { agentSessionLeaseAdmitsWriter } from '../../../shared/agent-session-lea
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import { isOrcaSessionId, parseOrcaSessionAddress } from '../../../shared/orca-session-address'
 import { ORCHESTRATION_SESSION_CALLER_ERROR_CODES as CODES } from '../../../shared/orchestration-session-caller-codes'
-import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
 import type { OrcaRuntimeService } from '../orca-runtime'
 import type { OrchestrationSessionCaller } from '../orchestration/orchestration-caller-identity'
 import { OrchestrationError } from '../orchestration/orchestration-error'
@@ -30,6 +29,8 @@ import {
   resolveOrcaSessionParty,
   resolveOrchestrationParty
 } from '../orchestration/orchestration-party'
+import { lookupOrcaAgentSession } from '../orchestration/structured-session-mail-address'
+import { readAgentSessionRecordStore } from '../orchestration/structured-session-lineage'
 import { structuredWorkerHostScope } from '../structured-worker-identity'
 import type { RpcRequest } from './core'
 
@@ -149,10 +150,10 @@ async function readSessionRecord(
   runtime: OrcaRuntimeService,
   sessionId: string
 ): Promise<AgentSessionRecord> {
-  let store: ReturnType<typeof sessionRecordStore>
+  let store: ReturnType<typeof readAgentSessionRecordStore>
   try {
     await runtime.ensureStructuredAgentSessionHost()
-    store = sessionRecordStore()
+    store = readAgentSessionRecordStore()
   } catch {
     store = null
   }
@@ -163,16 +164,15 @@ async function readSessionRecord(
       NO_EFFECTS
     )
   }
-  const record = store.getRecord(sessionId)
-  if (record) {
-    return record
+  const found = lookupOrcaAgentSession(store, sessionId)
+  if (found.kind === 'found') {
+    return found.record
   }
-  const owner = store.listRecords().find((candidate) => namesProviderSession(candidate, sessionId))
-  if (owner) {
+  if (found.kind === 'provider-id') {
     throw new OrchestrationError(
       CODES.providerId,
-      `${sessionId} is the provider's own session id, which changes on /clear. This session's Orca id is ${owner.sessionId}; use that instead. No effects were applied.`,
-      { ...NO_EFFECTS, orcaSessionId: owner.sessionId }
+      `${sessionId} is the provider's own session id, which changes on /clear. This session's Orca id is ${found.orcaSessionId}; use that instead. No effects were applied.`,
+      { ...NO_EFFECTS, orcaSessionId: found.orcaSessionId }
     )
   }
   throw new OrchestrationError(
@@ -182,19 +182,6 @@ async function readSessionRecord(
   )
 }
 
-function sessionRecordStore(): {
-  getRecord: (sessionId: string) => AgentSessionRecord | null
-  listRecords: () => AgentSessionRecord[]
-} | null {
-  return getStructuredAgentSessionHost()?.deps.store ?? null
-}
-
-function namesProviderSession(record: AgentSessionRecord, id: string): boolean {
-  return record.providerHandleChain.some(({ handle }) =>
-    handle.provider === 'claude' ? handle.sessionId === id : handle.threadId === id
-  )
-}
-
 function assertSessionCanAct(sessionId: string, record: AgentSessionRecord): void {
   if (!structuredWorkerHostScope(record.location)) {
     throw hostBoundary(
diff --git a/src/main/runtime/rpc/orchestration-session-coordinator.test.ts b/src/main/runtime/rpc/orchestration-session-coordinator.test.ts
index 1a3312f2013b..a60c3a169168 100644
--- a/src/main/runtime/rpc/orchestration-session-coordinator.test.ts
+++ b/src/main/runtime/rpc/orchestration-session-coordinator.test.ts
@@ -91,13 +91,30 @@ describe('a structured chat coordinates through the same verbs as a terminal', (
       to: WORKER_HANDLE,
       subject: 'more'
     })
-    expect(outbound).toMatchObject({ from_handle: ADDRESS_X, run_id: runId })
+    expect(outbound).toMatchObject({
+      from_handle: ADDRESS_X,
+      to_handle: `dispatch:${idOf(dispatch)}`,
+      run_id: runId
+    })
 
     const replied = await as(SESSION_X, 'orchestration.reply', {
       id: idOf(inbound),
       body: 'ack'
     })
-    expect(replied).toMatchObject({ message: { from_handle: ADDRESS_X, to_handle: WORKER_HANDLE } })
+    expect(replied).toMatchObject({
+      message: {
+        from_handle: ADDRESS_X,
+        to_handle: `dispatch:${idOf(dispatch)}`,
+        run_id: runId,
+        thread_id: idOf(inbound)
+      }
+    })
+    expect(await as(undefined, 'orchestration.check', { terminal: WORKER_HANDLE })).toMatchObject({
+      runId,
+      dispatchId: idOf(dispatch),
+      count: 2,
+      messages: [{ id: idOf(outbound) }, { id: idOf(replied.message) }]
+    })
 
     const { gate } = await as(SESSION_X, 'orchestration.gateCreate', {
       task: taskId,
@@ -255,16 +272,55 @@ describe('a structured chat coordinates through the same verbs as a terminal', (
       )
     )
     await vi.waitFor(() => expect(waiter).toHaveBeenCalledWith(`run:${runId}`, expect.anything()))
+    const deliver = vi.spyOn(h.db, 'getOrCreateRunDelivery')
+    const acknowledge = vi.spyOn(h.db, 'acknowledgeRunDelivery')
 
     await as(SESSION_Y, 'orchestration.runUse', { id: runId })
 
-    expect(await waiting).toMatchObject({
-      ok: false,
-      error: {
-        code: 'consumer_fenced',
-        message: 'This mailbox consumer was replaced while waiting.'
-      }
+    const fenced = await waiting
+    expect(fenced).toMatchObject({ ok: false, error: { code: 'consumer_fenced' } })
+    expect(fenced).not.toHaveProperty('result')
+
+    const { message } = await as(undefined, 'orchestration.send', {
+      from: WORKER_HANDLE,
+      to: ADDRESS_Y,
+      subject: 'after takeover',
+      run: runId
+    })
+    expect(
+      await h.dispatch(
+        orchestrationRequest('orchestration.check', { run: runId }, { sessionId: SESSION_X })
+      )
+    ).toMatchObject({ ok: false, error: { code: 'consumer_fenced' } })
+    expect(deliver).not.toHaveBeenCalled()
+
+    const replacement = await as(SESSION_Y, 'orchestration.check', {})
+    expect(replacement).toMatchObject({
+      runId,
+      count: 1,
+      messages: [{ id: idOf(message), to_handle: `run:${runId}`, run_id: runId }]
+    })
+    const ack = replacement.deliveryId
+    if (typeof ack !== 'string') {
+      throw new Error('Expected a Run Delivery')
+    }
+    expect(
+      await h.dispatch(
+        orchestrationRequest('orchestration.check', { run: runId, ack }, { sessionId: SESSION_X })
+      )
+    ).toMatchObject({ ok: false, error: { code: 'consumer_fenced' } })
+    expect(acknowledge).not.toHaveBeenCalled()
+    expect(h.db.getDeliveryRaw(ack)?.acknowledged_at).toBeNull()
+    expect(await as(SESSION_Y, 'orchestration.check', {})).toMatchObject({
+      deliveryId: ack,
+      replayed: true,
+      messages: [{ id: idOf(message) }]
+    })
+    expect(await as(SESSION_Y, 'orchestration.check', { ack })).toMatchObject({
+      acknowledged: ack,
+      count: 0
     })
+    expect(h.db.getDeliveryRaw(ack)?.status).toBe('acknowledged')
   })
 
   it('stops counting a coordinator Orca session id once an older binary rebinds the Run to a terminal', async () => {
diff --git a/src/main/runtime/rpc/orchestration-session-recipient.test.ts b/src/main/runtime/rpc/orchestration-session-recipient.test.ts
index bbf199e7f50d..f8f2de266d48 100644
--- a/src/main/runtime/rpc/orchestration-session-recipient.test.ts
+++ b/src/main/runtime/rpc/orchestration-session-recipient.test.ts
@@ -9,9 +9,11 @@ import {
   ADDRESS_X,
   ADDRESS_Y,
   createSessionCallerHarness,
-  orchestrationRequest,
   idOf,
+  isRecord,
+  orchestrationRequest,
   resultOf,
+  PROVIDER_ID_X,
   SESSION_X,
   SESSION_Y,
   sessionRecord,
@@ -26,6 +28,198 @@ vi.mock('../../native-chat/agent-session-wire/structured-agent-session-registry'
 
 type Row = Record<string, unknown>
 
+describe('a send addressed to an agent session', () => {
+  let h: SessionCallerHarness
+  let visible: string[]
+
+  beforeEach(() => {
+    h = createSessionCallerHarness(hostRef)
+    visible = [SESSION_X, SESSION_Y]
+    hostRef.current = {
+      deps: {
+        store: {
+          getRecord: (sessionId: string) => h.records.get(sessionId) ?? null,
+          listRecords: () => [...h.records.values()],
+          getVisibleSessionTabIndex: () => ({ present: true, sessionIds: visible })
+        }
+      }
+    }
+  })
+
+  afterEach(() => {
+    h.close()
+    vi.restoreAllMocks()
+  })
+
+  async function send(to: string): Promise<Row> {
+    const response: unknown = await h.dispatch(
+      orchestrationRequest('orchestration.send', { from: 'term_worker', to, subject: 'hello' })
+    )
+    if (!isRecord(response)) {
+      throw new Error('expected an RPC response object')
+    }
+    return response
+  }
+
+  function errorMessage(response: Row): string {
+    return isRecord(response.error) ? String(response.error.message) : ''
+  }
+
+  it('stores mail to a live session that coordinates nothing at its own address, and points it', async () => {
+    // The refusal this replaces: "Terminal session:<id> has no live pane or durable Run/Dispatch
+    // mailbox." An agent's id is its public address, coordinator or not.
+    const deliver = vi.spyOn(h.runtime, 'deliverPendingMessagesForHandle')
+    const sent = await send(ADDRESS_X)
+    expect(sent).toMatchObject({ ok: true, result: { message: { to_handle: ADDRESS_X } } })
+    await vi.waitFor(() => expect(deliver).toHaveBeenCalledWith(ADDRESS_X, expect.anything()))
+  })
+
+  it('accepts a bare Orca session id and normalizes it', async () => {
+    expect(await send(SESSION_X)).toMatchObject({
+      ok: true,
+      result: { message: { to_handle: ADDRESS_X } }
+    })
+  })
+
+  it('keeps routing a coordinating session to its Run mailbox', async () => {
+    const created = await h.dispatch(
+      orchestrationRequest('orchestration.runCreate', { objective: 'o' }, { sessionId: SESSION_X })
+    )
+    const runId = idOf(resultOf(created).run)
+    expect(await send(ADDRESS_X)).toMatchObject({
+      ok: true,
+      result: { message: { to_handle: `run:${runId}` } }
+    })
+  })
+
+  it.each([
+    [
+      'an unknown session',
+      () => `session:0b0b0b0b-1111-4222-8333-444444444444`,
+      'session_caller_unknown'
+    ],
+    ['a malformed session address', () => 'session:term_abc', 'session_caller_unknown'],
+    ['a provider id', () => `session:${PROVIDER_ID_X}`, 'session_caller_provider_id'],
+    ['a bare provider id', () => PROVIDER_ID_X, 'session_caller_provider_id']
+  ])('refuses %s before storing anything', async (_label, to, code) => {
+    const sent = await send(to())
+    expect(sent).toMatchObject({ ok: false, error: { code } })
+    expect(h.db.getInbox(100)).toEqual([])
+  })
+
+  it('refuses a session on another host', async () => {
+    h.records.set(SESSION_Y, sessionRecord(SESSION_Y, { location: { executionHostId: 'ssh:box' } }))
+    expect(await send(`session:${SESSION_Y}`)).toMatchObject({
+      ok: false,
+      error: { code: 'session_caller_host_boundary' }
+    })
+    expect(h.db.getInbox(100)).toEqual([])
+  })
+
+  it('refuses a session whose chat was closed, naming why', async () => {
+    visible = [SESSION_X]
+    const sent = await send(`session:${SESSION_Y}`)
+    expect(sent).toMatchObject({ ok: false, error: { code: 'session_caller_not_live' } })
+    expect(errorMessage(sent)).toContain('its chat was closed')
+    expect(h.db.getInbox(100)).toEqual([])
+  })
+
+  it('refuses a structured worker whose worker identity is gone: nothing could ever read it', async () => {
+    // A Dispatch recorded the session as a worker; no registry entry or custody row maps it now.
+    const run = h.db.createRun({
+      objective: 'pty',
+      coordinatorHandle: 'term_c',
+      coordinatorPaneKey: 'tab_c:13131313-1313-4313-8313-131313131313'
+    })
+    h.db.createDispatchContext({
+      taskId: h.db.createTask({ runId: run.id, spec: 'work' }).id,
+      assigneeHandle: mintStructuredWorkerHandle(),
+      assigneePaneKey: mintStructuredWorkerPaneKey(SESSION_Y),
+      processIncarnation: structuredWorkerProcessIncarnation(SESSION_Y),
+      creator: { kind: 'system' },
+      maxDepth: Number.MAX_SAFE_INTEGER
+    })
+    structuredWorkerIdentities.clear()
+    const sent = await send(`session:${SESSION_Y}`)
+    expect(sent).toMatchObject({ ok: false, error: { code: 'session_caller_not_live' } })
+    expect(errorMessage(sent)).toContain('worker identity')
+  })
+
+  it('leaves a bare string that is no session a terminal handle, as before', async () => {
+    expect(await send('0b0b0b0b-1111-4222-8333-444444444444')).toMatchObject({
+      ok: false,
+      error: { code: 'terminal_not_found' }
+    })
+  })
+})
+
+describe('a live structured worker addressed by its session id', () => {
+  let h: SessionCallerHarness
+  const handle = mintStructuredWorkerHandle()
+  const paneKey = mintStructuredWorkerPaneKey(SESSION_Y)
+
+  beforeEach(() => {
+    h = createSessionCallerHarness(hostRef)
+    structuredWorkerIdentities.register({
+      handle,
+      sessionId: SESSION_Y,
+      agent: 'claude',
+      paneKey,
+      processIncarnation: structuredWorkerProcessIncarnation(SESSION_Y),
+      worktreeId: 'wt_1',
+      hostScope: { kind: 'local', hostId: 'local' }
+    })
+  })
+
+  afterEach(() => {
+    h.close()
+    vi.restoreAllMocks()
+  })
+
+  async function sendTo(to: string): Promise<Row> {
+    return resultOf(
+      await h.dispatch(
+        orchestrationRequest('orchestration.send', { from: 'term_worker', to, subject: 'hello' })
+      )
+    )
+  }
+
+  async function flaglessCheck(): Promise<Row> {
+    return resultOf(
+      await h.dispatch(
+        orchestrationRequest('orchestration.check', { peek: true }, { sessionId: SESSION_Y })
+      )
+    )
+  }
+
+  it('lands in its Dispatch mailbox, which its flagless check reads', async () => {
+    // The defect this pins: the mail was stored at `session:<id>`, pointed at the worker, and its
+    // `check` — which reads the worker's handle and Dispatch mailboxes — returned nothing.
+    const run = h.db.createRun({
+      objective: 'pty coordinator',
+      coordinatorHandle: 'term_coord',
+      coordinatorPaneKey: 'tab_coord:12121212-1212-4212-8212-121212121212'
+    })
+    const dispatch = h.db.createDispatchContext({
+      taskId: h.db.createTask({ runId: run.id, spec: 'work' }).id,
+      assigneeHandle: handle,
+      assigneePaneKey: paneKey,
+      processIncarnation: structuredWorkerProcessIncarnation(SESSION_Y),
+      creator: { kind: 'system' },
+      maxDepth: Number.MAX_SAFE_INTEGER
+    })
+    expect(await sendTo(`session:${SESSION_Y}`)).toMatchObject({
+      message: { to_handle: `dispatch:${dispatch.id}` }
+    })
+    expect(await flaglessCheck()).toMatchObject({ messages: [{ subject: 'hello' }] })
+  })
+
+  it('lands in its own handle mailbox between Dispatches, which its flagless check reads', async () => {
+    expect(await sendTo(SESSION_Y)).toMatchObject({ message: { to_handle: handle } })
+    expect(await flaglessCheck()).toMatchObject({ messages: [{ subject: 'hello' }] })
+  })
+})
+
 describe('mail sent to a session address reaches the mailbox that session reads', () => {
   let h: SessionCallerHarness
 
@@ -70,18 +264,35 @@ describe('mail sent to a session address reaches the mailbox that session reads'
     })
   })
 
-  it('refuses an Orca session this host does not run', async () => {
+  it('reaches a chat with no Run after a restart, once the send has started the session host', async () => {
+    // After an app restart the agent-session host starts lazily; routing reads the session record
+    // synchronously, so the send must start the host before it resolves the recipient.
+    const store = hostRef.current
+    hostRef.current = null
+    vi.mocked(h.runtime.ensureStructuredAgentSessionHost).mockImplementation(async () => {
+      hostRef.current = store
+    })
+
+    const { message } = await sendFromTerminal(ADDRESS_X)
+
+    expect(message).toMatchObject({ to_handle: ADDRESS_X })
+  })
+
+  it('refuses an Orca session this host does not run, or has no record of', async () => {
     h.records.set(
       SESSION_X,
       sessionRecord(SESSION_X, { location: { executionHostId: 'ssh:devbox' } })
     )
     h.records.delete(SESSION_Y)
 
-    for (const to of [ADDRESS_X, ADDRESS_Y]) {
+    for (const [to, code] of [
+      [ADDRESS_X, 'session_caller_host_boundary'],
+      [ADDRESS_Y, 'session_caller_unknown']
+    ]) {
       const response = await h.dispatch(
         orchestrationRequest('orchestration.send', { from: WORKER_HANDLE, to, subject: 's' })
       )
-      expect(response).toMatchObject({ ok: false, error: { code: 'terminal_not_found' } })
+      expect(response).toMatchObject({ ok: false, error: { code } })
     }
   })
 
diff --git a/src/main/runtime/rpc/orchestration-session-run-binding.test.ts b/src/main/runtime/rpc/orchestration-session-run-binding.test.ts
new file mode 100644
index 000000000000..0f6b65d6571d
--- /dev/null
+++ b/src/main/runtime/rpc/orchestration-session-run-binding.test.ts
@@ -0,0 +1,138 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  mintStructuredWorkerHandle,
+  mintStructuredWorkerPaneKey,
+  structuredWorkerIdentities,
+  structuredWorkerProcessIncarnation
+} from '../structured-worker-identity'
+import {
+  createSessionCallerHarness,
+  orchestrationRequest,
+  resultOf,
+  idOf,
+  SESSION_X,
+  SESSION_Y,
+  type SessionCallerHarness
+} from './orchestration-session-caller-test-fixture'
+
+const hostRef = vi.hoisted((): { current: unknown } => ({ current: null }))
+vi.mock('../../native-chat/agent-session-wire/structured-agent-session-registry', () => ({
+  getStructuredAgentSessionHost: () => hostRef.current
+}))
+
+function deliveryId(result: Record<string, unknown>): string {
+  if (typeof result.deliveryId === 'string') {
+    return result.deliveryId
+  }
+  throw new Error('Expected a Delivery')
+}
+
+describe('structured lead Run binding through the RPC dispatcher', () => {
+  let h: SessionCallerHarness
+  let dispatchId: string
+
+  function call(sessionId: string, method: string, params: Record<string, unknown> = {}) {
+    return h
+      .dispatch(orchestrationRequest(`orchestration.${method}`, params, { sessionId }))
+      .then(resultOf)
+  }
+
+  beforeEach(async () => {
+    h = createSessionCallerHarness(hostRef)
+    const handle = mintStructuredWorkerHandle()
+    const paneKey = mintStructuredWorkerPaneKey(SESSION_Y)
+    structuredWorkerIdentities.register({
+      handle,
+      sessionId: SESSION_Y,
+      agent: 'claude',
+      paneKey,
+      processIncarnation: structuredWorkerProcessIncarnation(SESSION_Y),
+      worktreeId: 'folder-workspace',
+      hostScope: { kind: 'local', hostId: 'local' }
+    })
+    const runId = idOf((await call(SESSION_X, 'runCreate', { objective: 'parent' })).run)
+    dispatchId = h.db.createDispatchContext({
+      taskId: h.db.createTask({ runId, spec: 'structured lead' }).id,
+      assigneeHandle: handle,
+      assigneePaneKey: paneKey,
+      processIncarnation: structuredWorkerProcessIncarnation(SESSION_Y),
+      creator: { kind: 'session', orcaSessionId: SESSION_X },
+      maxDepth: Number.MAX_SAFE_INTEGER
+    }).id
+  })
+  afterEach(() => {
+    h.runtime.cancelMessageWaiters(`dispatch:${dispatchId}`)
+    h.close()
+    vi.restoreAllMocks()
+  })
+
+  it.each(['runCreate', 'runUse'] as const)(
+    'cancels a parked session Dispatch check on %s',
+    async (method) => {
+      const params =
+        method === 'runCreate'
+          ? { objective: 'child' }
+          : {
+              id: h.db.createRun({
+                objective: 'unbound',
+                coordinatorHandle: null,
+                coordinatorPaneKey: null
+              }).id
+            }
+      const wait = vi.spyOn(h.runtime, 'waitForMessage')
+      const waiting = call(SESSION_Y, 'check', { wait: true, timeoutMs: 500 })
+      await vi.waitFor(() =>
+        expect(wait).toHaveBeenCalledWith(`dispatch:${dispatchId}`, expect.anything())
+      )
+      const child = idOf((await call(SESSION_Y, method, params)).run)
+      expect(await waiting).toMatchObject({ cancelled: true, timedOut: false })
+      const sent = await call(SESSION_X, 'send', {
+        to: `dispatch:${dispatchId}`,
+        subject: 'after bind'
+      })
+      expect(sent.message).toMatchObject({ to_handle: `run:${child}`, run_id: child })
+      expect(await call(SESSION_Y, 'check')).toMatchObject({
+        messages: [{ subject: 'after bind' }]
+      })
+      expect(h.db.getInbox()).toHaveLength(1)
+    }
+  )
+
+  it.each(['cancel', 'throw'] as const)(
+    'replays a pre-bind ack receipt after the following wait ends by %s',
+    async (ending) => {
+      await call(SESSION_X, 'send', { to: `dispatch:${dispatchId}`, subject: 'ack me' })
+      const ack = deliveryId(await call(SESSION_Y, 'check'))
+      const acknowledge = vi.spyOn(h.db, 'acknowledgeMailboxDelivery')
+      const wait = vi.spyOn(h.runtime, 'waitForMessage').mockImplementationOnce(async () => {
+        await call(SESSION_Y, 'runCreate', { objective: 'child' })
+        if (ending === 'throw') {
+          throw new Error('wait transport interrupted')
+        }
+        return 'cancelled'
+      })
+      const request = orchestrationRequest(
+        'orchestration.check',
+        { ack, wait: true, timeoutMs: 500 },
+        {
+          sessionId: SESSION_Y,
+          requestId: `bind-during-ack-${ending}`
+        }
+      )
+      const first = await h.dispatch(request)
+      if (ending === 'throw') {
+        expect(first).toMatchObject({ ok: false, error: { code: 'runtime_error' } })
+      } else {
+        expect(resultOf(first)).toMatchObject({ acknowledged: ack, count: 0, cancelled: true })
+      }
+      const replay = resultOf(await h.dispatch(request))
+      expect(replay).toMatchObject({ acknowledged: ack, count: 0, mutation: { replayed: true } })
+      if (ending === 'throw') {
+        expect(replay.waitInterrupted).toBe('outcome_unknown')
+      }
+      expect(acknowledge).toHaveBeenCalledTimes(1)
+      expect(wait).toHaveBeenCalledTimes(1)
+      expect(h.db.getDeliveryRaw(ack)?.status).toBe('acknowledged')
+    }
+  )
+})
diff --git a/src/main/runtime/rpc/rpc-streaming-dispatcher.ts b/src/main/runtime/rpc/rpc-streaming-dispatcher.ts
index f69ca1bf1e8f..d43986f02ec2 100644
--- a/src/main/runtime/rpc/rpc-streaming-dispatcher.ts
+++ b/src/main/runtime/rpc/rpc-streaming-dispatcher.ts
@@ -1,4 +1,10 @@
-import { isStreamingMethod, type RpcEnvelopeMeta, type RpcRegistry, type RpcRequest } from './core'
+import {
+  isRegistrationFencedUnsubscribe,
+  isStreamingMethod,
+  type RpcEnvelopeMeta,
+  type RpcRegistry,
+  type RpcRequest
+} from './core'
 
 import { errorResponse, successResponse } from './errors'
 import type { OrcaRuntimeService } from '../orca-runtime'
@@ -84,11 +90,11 @@ export class RpcStreamingDispatcher {
 
     if (!isStreamingMethod(method)) {
       try {
+        // Session tabs always need this fence. COMPAT(terminal request-addressed unsubscribe): terminal only for phones without `requestId`.
         // Capture before middleware yields to a replacement subscribe on the same connection.
-        const subscriptionRegistrationVersion =
-          request.method === 'terminal.unsubscribe'
-            ? runtime.getSubscriptionRegistrationVersion()
-            : undefined
+        const subscriptionRegistrationVersion = isRegistrationFencedUnsubscribe(request.method)
+          ? runtime.getSubscriptionRegistrationVersion()
+          : undefined
         const clientHostedBrowser = await routeDispatcherClientHostedBrowserRpc(
           runtime,
           request.method,
diff --git a/src/main/runtime/rpc/static-web-client-handler-stream.test.ts b/src/main/runtime/rpc/static-web-client-handler-stream.test.ts
new file mode 100644
index 000000000000..91bd0f52053b
--- /dev/null
+++ b/src/main/runtime/rpc/static-web-client-handler-stream.test.ts
@@ -0,0 +1,255 @@
+import { once } from 'node:events'
+import type * as fs from 'node:fs'
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync, type ReadStream } from 'node:fs'
+import type * as fsPromises from 'node:fs/promises'
+import { createServer, type IncomingMessage, type Server, type ServerResponse } from 'node:http'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { PassThrough } from 'node:stream'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { createStaticWebClientHandler } from './static-web-client-handler'
+
+const observed = vi.hoisted(() => {
+  const streams: ReadStream[] = []
+  const state: {
+    statWait: Promise<void>
+    statError?: Error
+    missingPath?: string
+    onSource?: () => void
+  } = {
+    statWait: Promise.resolve()
+  }
+  return { streams, state, statCalls: 0, completedStats: 0 }
+})
+vi.mock('node:fs', async (importOriginal) => {
+  const original = await importOriginal<typeof fs>()
+  return {
+    ...original,
+    createReadStream: (...args: Parameters<typeof original.createReadStream>) => {
+      const stream = original.createReadStream(observed.state.missingPath ?? args[0], args[1])
+      observed.streams.push(stream)
+      observed.state.onSource?.()
+      return stream
+    }
+  }
+})
+vi.mock('node:fs/promises', async (importOriginal) => {
+  const original = await importOriginal<typeof fsPromises>()
+  return {
+    ...original,
+    stat: async (...args: Parameters<typeof original.stat>) => {
+      observed.statCalls++
+      const value = await original.stat(...args)
+      await observed.state.statWait
+      observed.completedStats++
+      if (observed.state.statError) {
+        throw observed.state.statError
+      }
+      return value
+    }
+  }
+})
+
+let root: string
+const servers: Server[] = []
+beforeEach(() => {
+  root = mkdtempSync(join(tmpdir(), 'orca-static-web-stream-'))
+  mkdirSync(join(root, 'assets'))
+  writeFileSync(join(root, 'assets', 'fixture.js'), Buffer.alloc(1024 * 1024, 1))
+  writeFileSync(join(root, 'web-index.html'), '<html>web</html>')
+  observed.state.statWait = Promise.resolve()
+  observed.state.statError = undefined
+  observed.state.missingPath = undefined
+  observed.state.onSource = undefined
+  observed.statCalls = 0
+  observed.completedStats = 0
+})
+afterEach(async () => {
+  await Promise.all(
+    servers.splice(0).map(async (server) => {
+      server.closeAllConnections()
+      await new Promise<void>((resolve) => server.close(() => resolve()))
+    })
+  )
+  await Promise.all(
+    observed.streams.splice(0).map(async (stream) => {
+      if (!stream.closed) {
+        const closed = new Promise<void>((resolve) => stream.once('close', resolve))
+        stream.destroy()
+        await closed
+      }
+    })
+  )
+  rmSync(root, { recursive: true, force: true })
+})
+
+function fakeResponse() {
+  return Object.assign(new PassThrough({ highWaterMark: 16 }), {
+    setHeader: vi.fn(),
+    statusCode: 0,
+    headersSent: false
+  })
+}
+function fileDescriptor(stream: ReadStream): number | null {
+  if ('fd' in stream && (typeof stream.fd === 'number' || stream.fd === null)) {
+    return stream.fd
+  }
+  throw new Error('Missing file descriptor')
+}
+function request(response = fakeResponse()) {
+  const handler = createStaticWebClientHandler(root)
+  handler(
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This handler reads only these method/url fields.
+    { method: 'GET', url: '/assets/fixture.js' } as IncomingMessage,
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The fixture implements the writable response surface used by this handler.
+    response as unknown as ServerResponse
+  )
+  return response
+}
+async function latestSource(count: number): Promise<ReadStream> {
+  await expect.poll(() => observed.streams.length).toBe(count)
+  const source = observed.streams.at(-1)
+  if (!source) {
+    throw new Error('Missing file stream')
+  }
+  return source
+}
+async function startServer(): Promise<string> {
+  const server = createServer(createStaticWebClientHandler(root))
+  servers.push(server)
+  server.listen(0, '127.0.0.1')
+  await once(server, 'listening')
+  const address = server.address()
+  if (!address || typeof address === 'string') {
+    throw new Error('Missing HTTP address')
+  }
+  return `http://127.0.0.1:${address.port}`
+}
+
+it('closes 25 abandoned file readers and removes only owned response listeners', async () => {
+  const responses: ReturnType<typeof fakeResponse>[] = []
+  const otherClose = vi.fn()
+  const otherError = vi.fn()
+  for (let index = 0; index < 25; index++) {
+    const response = fakeResponse()
+    response.on('close', otherClose)
+    response.on('error', otherError)
+    request(response)
+    responses.push(response)
+    const source = await latestSource(index + 1)
+    await expect.poll(() => source.isPaused()).toBe(true)
+    const closed = once(response, 'close')
+    response.destroy()
+    await closed
+  }
+  await expect.poll(() => observed.streams.filter((stream) => !stream.closed).length).toBe(0)
+  expect(observed.streams.every((stream) => fileDescriptor(stream) === null)).toBe(true)
+  expect(responses.every((response) => response.listeners('close').length === 1)).toBe(true)
+  expect(responses.every((response) => response.listeners('error').length === 1)).toBe(true)
+  expect(otherClose).toHaveBeenCalledTimes(25)
+  expect(otherError).not.toHaveBeenCalled()
+})
+
+it('does not stat or open assets for an already closed response', async () => {
+  const response = fakeResponse()
+  const closed = once(response, 'close')
+  response.destroy()
+  await closed
+  request(response)
+  expect(observed.statCalls).toBe(0)
+  expect(observed.streams).toHaveLength(0)
+  expect(response.setHeader).not.toHaveBeenCalled()
+})
+
+it.each(['success', 'failure'])(
+  'does not revive a response closed during stat %s',
+  async (outcome) => {
+    let releaseStat = (): void => {}
+    observed.state.statWait = new Promise<void>((resolve) => {
+      releaseStat = resolve
+    })
+    if (outcome === 'failure') {
+      observed.state.statError = new Error('stat failed after abandonment')
+    }
+    const response = request()
+    expect(observed.statCalls).toBe(1)
+    const ended = vi.spyOn(response, 'end')
+    const closed = once(response, 'close')
+    response.destroy()
+    await closed
+    releaseStat()
+    await expect.poll(() => observed.completedStats).toBe(1)
+    expect(observed.streams).toHaveLength(0)
+    expect(response.setHeader).not.toHaveBeenCalled()
+    expect(ended).not.toHaveBeenCalled()
+  }
+)
+
+it('closes a file that is still opening when its response is destroyed', async () => {
+  const response = fakeResponse()
+  observed.state.onSource = () => {
+    const source = observed.streams.at(-1)
+    expect(source && fileDescriptor(source)).toBe(null)
+    response.destroy()
+  }
+  request(response)
+  const source = await latestSource(1)
+  await expect.poll(() => source.closed).toBe(true)
+  expect(fileDescriptor(source)).toBe(null)
+  expect(response.listenerCount('close')).toBe(0)
+  expect(response.listenerCount('error')).toBe(0)
+})
+
+it('closes its file reader when the response errors', async () => {
+  const response = request()
+  const source = await latestSource(1)
+  await expect.poll(() => source.isPaused()).toBe(true)
+  response.destroy(new Error('downstream failed'))
+  await expect.poll(() => source.closed).toBe(true)
+  expect(fileDescriptor(source)).toBe(null)
+  expect(response.listenerCount('close')).toBe(0)
+  expect(response.listenerCount('error')).toBe(0)
+})
+
+it('disconnects a response when its source fails after headers', async () => {
+  const response = request()
+  const source = await latestSource(1)
+  response.headersSent = true
+  const closed = once(response, 'close')
+  source.destroy(new Error('read failed after headers'))
+  await closed
+  await expect.poll(() => source.closed).toBe(true)
+  expect(response.statusCode).toBe(200)
+  expect(response.destroyed).toBe(true)
+  expect(response.listenerCount('close')).toBe(0)
+  expect(response.listenerCount('error')).toBe(0)
+})
+
+it('preserves actual HTTP GET bytes, cache headers and HEAD without a reader', async () => {
+  const url = await startServer()
+  const head = await fetch(`${url}/assets/fixture.js`, { method: 'HEAD' })
+  expect(head.status).toBe(200)
+  expect(head.headers.get('content-length')).toBe(String(1024 * 1024))
+  expect(await head.text()).toBe('')
+  expect(observed.streams).toHaveLength(0)
+  const get = await fetch(`${url}/assets/fixture.js`)
+  expect(get.status).toBe(200)
+  expect(get.headers.get('cache-control')).toBe('public, max-age=31536000, immutable')
+  expect(get.headers.get('content-type')).toBe('text/javascript; charset=utf-8')
+  expect(Buffer.from(await get.arrayBuffer())).toEqual(Buffer.alloc(1024 * 1024, 1))
+  await expect.poll(() => observed.streams.every((source) => source.closed)).toBe(true)
+  const index = await fetch(`${url}/`)
+  expect(index.headers.get('cache-control')).toBe('no-cache')
+  expect(await index.text()).toBe('<html>web</html>')
+})
+
+it('answers an actual file-open error with an empty 500 instead of the asset length', async () => {
+  observed.state.missingPath = join(root, 'missing-after-stat.js')
+  const url = await startServer()
+  const response = await fetch(`${url}/assets/fixture.js`)
+  expect(response.status).toBe(500)
+  expect(response.headers.get('content-length')).toBe('0')
+  expect(response.headers.get('cache-control')).toBe('no-store')
+  expect(await response.text()).toBe('')
+  await expect.poll(() => observed.streams.every((source) => source.closed)).toBe(true)
+})
diff --git a/src/main/runtime/rpc/static-web-client-handler.ts b/src/main/runtime/rpc/static-web-client-handler.ts
index 53ecd85c73fc..3ec8ed83919a 100644
--- a/src/main/runtime/rpc/static-web-client-handler.ts
+++ b/src/main/runtime/rpc/static-web-client-handler.ts
@@ -29,6 +29,9 @@ async function handleStaticRequest(
   request: IncomingMessage,
   response: ServerResponse
 ): Promise<void> {
+  if (response.destroyed) {
+    return
+  }
   if (request.method !== 'GET' && request.method !== 'HEAD') {
     response.setHeader('Allow', 'GET, HEAD')
     writeHttpStatus(response, 405)
@@ -59,6 +62,9 @@ async function handleStaticRequest(
     writeHttpStatus(response, 404)
     return
   }
+  if (response.destroyed) {
+    return
+  }
   if (!fileStat.isFile()) {
     writeHttpStatus(response, 404)
     return
@@ -80,8 +86,22 @@ async function handleStaticRequest(
   }
 
   const stream = createReadStream(absolutePath)
+  const stopReading = (): void => {
+    stream.destroy()
+  }
+  response.once('close', stopReading)
+  response.once('error', stopReading)
+  stream.once('close', () => {
+    response.off('close', stopReading)
+    response.off('error', stopReading)
+  })
   stream.on('error', () => {
+    if (response.destroyed) {
+      return
+    }
     if (!response.headersSent) {
+      response.setHeader('Content-Length', 0)
+      response.setHeader('Cache-Control', 'no-store')
       writeHttpStatus(response, 500)
       return
     }
@@ -136,6 +156,9 @@ function isAllowedStaticWebPath(pathname: string): boolean {
 }
 
 function writeHttpStatus(response: ServerResponse, statusCode: number): void {
+  if (response.destroyed) {
+    return
+  }
   response.statusCode = statusCode
   response.end()
 }
diff --git a/src/main/runtime/rpc/subscription-registry-test-double.ts b/src/main/runtime/rpc/subscription-registry-test-double.ts
index d74e8bc329fe..0ee0fc799602 100644
--- a/src/main/runtime/rpc/subscription-registry-test-double.ts
+++ b/src/main/runtime/rpc/subscription-registry-test-double.ts
@@ -1,14 +1,19 @@
 import type { SubscriptionRegistration } from '../orca-runtime'
 
 type Cleanup = () => void | Promise<void>
-type Entry = { cleanup: Cleanup; version: number }
+type Entry = {
+  cleanup: Cleanup
+  version: number
+  request?: { connectionId: string; requestId: string }
+}
 
 export type SubscriptionRegistryDouble = {
   registerSubscriptionCleanup: (id: string, cleanup: Cleanup, connectionId?: string) => void
   registerOwnedSubscriptionCleanup: (
     id: string,
     cleanup: Cleanup,
-    connectionId?: string
+    connectionId?: string,
+    requestId?: string
   ) => SubscriptionRegistration
   cleanupSubscription: (id: string) => void
   cleanupSubscriptionIfOwnedByConnection: (
@@ -17,14 +22,18 @@ export type SubscriptionRegistryDouble = {
     throughVersion?: number
   ) => boolean
   getSubscriptionRegistrationVersion: () => number
+  releaseSubscriptionByRequest: (connectionId: string | undefined, requestId: string) => void
   cleanupSubscriptionsForConnection: (connectionId: string) => void
   /** Test-only inspection; the runtime deliberately exposes no such accessor. */
   peekCleanup: (id: string) => Cleanup | undefined
+  /** Test-only inspection of the request-address index size. */
+  requestAddressCount: () => number
 }
 
 /**
  * Faithful double of the runtime subscription registry (`OrcaRuntimeService`,
- * `registerSubscriptionCleanup` through `cleanupSubscriptionsForConnection`).
+ * `registerSubscriptionCleanup` through `cleanupSubscriptionsForConnection`, plus
+ * `releaseSubscriptionByRequest`).
  *
  * This mirrors production line-for-line, so it can drift. If you change
  * `registerSubscriptionCleanup`, `cleanupSubscriptionAndWait`,
@@ -43,6 +52,20 @@ export function createSubscriptionRegistryDouble(): SubscriptionRegistryDouble {
   let registrationVersion = 0
   const byConnection = new Map<string, Set<string>>()
   const connectionByEntry = new Map<string, string>()
+  const byRequest = new Map<string, { id: string; entry: Entry }>()
+  const requestKey = (connectionId: string, requestId: string): string =>
+    JSON.stringify([connectionId, requestId])
+
+  // Mirrors removeRequestIndex: compare-and-delete, so a reused request id keeps its newer owner.
+  const removeRequestIndex = (entry: Entry): void => {
+    if (!entry.request) {
+      return
+    }
+    const key = requestKey(entry.request.connectionId, entry.request.requestId)
+    if (byRequest.get(key)?.entry === entry) {
+      byRequest.delete(key)
+    }
+  }
 
   const removeIndex = (id: string): void => {
     const connectionId = connectionByEntry.get(id)
@@ -84,6 +107,7 @@ export function createSubscriptionRegistryDouble(): SubscriptionRegistryDouble {
         }
         cleanups.delete(id)
         removeIndex(id)
+        removeRequestIndex(entry)
       })
       .finally(() => {
         if (inFlight.get(id)?.promise === promise) {
@@ -109,15 +133,21 @@ export function createSubscriptionRegistryDouble(): SubscriptionRegistryDouble {
   const registerSubscriptionCleanup = (
     id: string,
     cleanup: Cleanup,
-    connectionId?: string
+    connectionId?: string,
+    requestId?: string
   ): Entry => {
     const existing = cleanups.get(id)
     if (existing) {
       removeIndex(id)
+      removeRequestIndex(existing)
       cleanupOwned(id, existing)
     }
-    const entry = { cleanup, version: ++registrationVersion }
+    const request = connectionId && requestId ? { connectionId, requestId } : undefined
+    const entry: Entry = { cleanup, version: ++registrationVersion, request }
     cleanups.set(id, entry)
+    if (request) {
+      byRequest.set(requestKey(request.connectionId, request.requestId), { id, entry })
+    }
     if (!connectionId) {
       return entry
     }
@@ -133,14 +163,23 @@ export function createSubscriptionRegistryDouble(): SubscriptionRegistryDouble {
 
   return {
     registerSubscriptionCleanup,
-    registerOwnedSubscriptionCleanup: (id, cleanup, connectionId) => {
-      const entry = registerSubscriptionCleanup(id, cleanup, connectionId)
+    registerOwnedSubscriptionCleanup: (id, cleanup, connectionId, requestId) => {
+      const entry = registerSubscriptionCleanup(id, cleanup, connectionId, requestId)
       return {
         releaseIfCurrent: () => cleanupOwned(id, entry)
       }
     },
     cleanupSubscription,
     getSubscriptionRegistrationVersion: () => registrationVersion,
+    releaseSubscriptionByRequest: (connectionId, requestId) => {
+      if (!connectionId) {
+        return
+      }
+      const target = byRequest.get(requestKey(connectionId, requestId))
+      if (target) {
+        cleanupOwned(target.id, target.entry)
+      }
+    },
     cleanupSubscriptionIfOwnedByConnection: (id, connectionId, throughVersion) => {
       const entry = cleanups.get(id)
       // Mirrors the production early-out: an unregistered id is already gone, not refused.
@@ -173,6 +212,7 @@ export function createSubscriptionRegistryDouble(): SubscriptionRegistryDouble {
         byConnection.delete(connectionId)
       }
     },
-    peekCleanup: (id) => cleanups.get(id)?.cleanup
+    peekCleanup: (id) => cleanups.get(id)?.cleanup,
+    requestAddressCount: () => byRequest.size
   }
 }
diff --git a/src/main/runtime/rpc/terminal-agent-prompt-send.test.ts b/src/main/runtime/rpc/terminal-agent-prompt-send.test.ts
index 29254fbcf3ad..824513dd9993 100644
--- a/src/main/runtime/rpc/terminal-agent-prompt-send.test.ts
+++ b/src/main/runtime/rpc/terminal-agent-prompt-send.test.ts
@@ -45,6 +45,7 @@ describe('terminal agent prompt send RPC', () => {
     expect(response.ok).toBe(true)
     expect(runtime.isTerminalRunningSettledPromptAgent).toHaveBeenCalledWith('terminal-1')
     expect(sendTerminalAgentPrompt).toHaveBeenCalledWith('terminal-1', 'review this change', {
+      inputKind: 'driving',
       beforeWrite: undefined,
       signal: undefined
     })
@@ -81,7 +82,7 @@ describe('terminal agent prompt send RPC', () => {
     expect(sendTerminal).toHaveBeenCalledWith(
       'terminal-1',
       { text: 'echo x', enter: true, interrupt: false },
-      { beforeWrite: undefined, signal: undefined }
+      { inputKind: 'driving', beforeWrite: undefined, signal: undefined }
     )
     expect(sendTerminalAgentPrompt).not.toHaveBeenCalled()
   })
diff --git a/src/main/runtime/rpc/terminal-multiplex-ack-output-budget.test.ts b/src/main/runtime/rpc/terminal-multiplex-ack-output-budget.test.ts
index 3dc1f6b29181..f93b772994e5 100644
--- a/src/main/runtime/rpc/terminal-multiplex-ack-output-budget.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-ack-output-budget.test.ts
@@ -241,11 +241,15 @@ describe('terminal multiplex RPC', () => {
       )!
     )
     await vi.waitFor(() =>
-      expect(runtime.sendTerminal).toHaveBeenCalledWith('terminal-1', {
-        text: 'still interactive\r',
-        enter: false,
-        interrupt: false
-      })
+      expect(runtime.sendTerminal).toHaveBeenCalledWith(
+        'terminal-1',
+        {
+          text: 'still interactive\r',
+          enter: false,
+          interrupt: false
+        },
+        { inputKind: 'driving' }
+      )
     )
 
     handlers.get(16)?.(
@@ -434,11 +438,15 @@ describe('terminal multiplex RPC', () => {
       )!
     )
     await vi.waitFor(() =>
-      expect(runtime.sendTerminal).toHaveBeenCalledWith('terminal-8', {
-        text: 'remote-still-interactive\r',
-        enter: false,
-        interrupt: false
-      })
+      expect(runtime.sendTerminal).toHaveBeenCalledWith(
+        'terminal-8',
+        {
+          text: 'remote-still-interactive\r',
+          enter: false,
+          interrupt: false
+        },
+        { inputKind: 'driving' }
+      )
     )
 
     const frameCountBeforeAck = binaryFrames.length
diff --git a/src/main/runtime/rpc/terminal-multiplex-ack-overflow-recovery.test.ts b/src/main/runtime/rpc/terminal-multiplex-ack-overflow-recovery.test.ts
index 03327859c621..57abea846ae4 100644
--- a/src/main/runtime/rpc/terminal-multiplex-ack-overflow-recovery.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-ack-overflow-recovery.test.ts
@@ -413,11 +413,15 @@ describe('terminal multiplex RPC', () => {
       )!
     )
     await vi.waitFor(() =>
-      expect(runtime.sendTerminal).toHaveBeenCalledWith('terminal-1', {
-        text: 'still interactive\r',
-        enter: false,
-        interrupt: false
-      })
+      expect(runtime.sendTerminal).toHaveBeenCalledWith(
+        'terminal-1',
+        {
+          text: 'still interactive\r',
+          enter: false,
+          interrupt: false
+        },
+        { inputKind: 'driving' }
+      )
     )
 
     binaryFrames.splice(0)
diff --git a/src/main/runtime/rpc/terminal-multiplex-desktop-resize-routing.test.ts b/src/main/runtime/rpc/terminal-multiplex-desktop-resize-routing.test.ts
index 45ff2d77b8cd..562181b2752d 100644
--- a/src/main/runtime/rpc/terminal-multiplex-desktop-resize-routing.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-desktop-resize-routing.test.ts
@@ -206,11 +206,15 @@ describe('terminal multiplex RPC', () => {
         )
       )
       await vi.waitFor(() =>
-        expect(runtime.sendTerminal).toHaveBeenCalledWith('terminal-1', {
-          text: 'ls\r',
-          enter: false,
-          interrupt: false
-        })
+        expect(runtime.sendTerminal).toHaveBeenCalledWith(
+          'terminal-1',
+          {
+            text: 'ls\r',
+            enter: false,
+            interrupt: false
+          },
+          { inputKind: 'driving' }
+        )
       )
       const sentAfterSuccessfulClaim = vi.mocked(runtime.sendTerminal).mock.calls.length
       vi.mocked(runtime.updateRemoteDesktopViewer).mockResolvedValueOnce(false)
@@ -248,11 +252,15 @@ describe('terminal multiplex RPC', () => {
         )
       }
       await vi.waitFor(() =>
-        expect(runtime.sendTerminal).toHaveBeenLastCalledWith('terminal-1', {
-          text: 'retry',
-          enter: false,
-          interrupt: false
-        })
+        expect(runtime.sendTerminal).toHaveBeenLastCalledWith(
+          'terminal-1',
+          {
+            text: 'retry',
+            enter: false,
+            interrupt: false
+          },
+          { inputKind: 'driving' }
+        )
       )
 
       dataListenerRef.current?.('a')
diff --git a/src/main/runtime/rpc/terminal-multiplex-input-write-rejection.test.ts b/src/main/runtime/rpc/terminal-multiplex-input-write-rejection.test.ts
index b7fb20b2f73f..ae2298a20dc8 100644
--- a/src/main/runtime/rpc/terminal-multiplex-input-write-rejection.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-input-write-rejection.test.ts
@@ -327,11 +327,15 @@ describe('terminal multiplex RPC', () => {
     )
 
     await vi.waitFor(() =>
-      expect(runtime.sendTerminal).toHaveBeenCalledWith('terminal-1', {
-        text: 'echo one\necho two\r\n',
-        enter: false,
-        interrupt: false
-      })
+      expect(runtime.sendTerminal).toHaveBeenCalledWith(
+        'terminal-1',
+        {
+          text: 'echo one\necho two\r\n',
+          enter: false,
+          interrupt: false
+        },
+        { inputKind: 'driving' }
+      )
     )
 
     runtime.cleanupSubscription('terminal-multiplex:conn-byte-preserving')
@@ -403,11 +407,15 @@ describe('terminal multiplex RPC', () => {
     )
 
     await vi.waitFor(() =>
-      expect(runtime.sendTerminal).toHaveBeenCalledWith('terminal-1', {
-        text: 'printf a\nprintf b\r\n',
-        enter: false,
-        interrupt: false
-      })
+      expect(runtime.sendTerminal).toHaveBeenCalledWith(
+        'terminal-1',
+        {
+          text: 'printf a\nprintf b\r\n',
+          enter: false,
+          interrupt: false
+        },
+        { inputKind: 'driving' }
+      )
     )
 
     runtime.cleanupSubscription('terminal-1:desktop-1')
diff --git a/src/main/runtime/rpc/terminal-multiplex-output-pause-and-viewport.test.ts b/src/main/runtime/rpc/terminal-multiplex-output-pause-and-viewport.test.ts
index ef6087923bb3..eecd7b038591 100644
--- a/src/main/runtime/rpc/terminal-multiplex-output-pause-and-viewport.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-output-pause-and-viewport.test.ts
@@ -309,7 +309,11 @@ describe('terminal multiplex RPC', () => {
       expect(runtime.sendTerminal).toHaveBeenCalledWith(
         'terminal-1',
         { text: 'x', enter: false, interrupt: false },
-        { reserveWrite: expect.any(Function), afterWrite: expect.any(Function) }
+        {
+          inputKind: 'driving',
+          reserveWrite: expect.any(Function),
+          afterWrite: expect.any(Function)
+        }
       )
     )
     expect(beginMobileInputFloor.mock.invocationCallOrder[0]).toBeLessThan(
diff --git a/src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts b/src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts
index 778cd0220681..a5b40b2f1eb2 100644
--- a/src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts
@@ -595,7 +595,11 @@ describe('terminal multiplex RPC', () => {
     // Widened gate: a desktop client must mount + await its late PTY, not skip
     // straight to the bare scrollback path the way it did under the mobile-only gate.
     expect(runtime.requestRendererTerminalTabMount).toHaveBeenCalledWith('terminal-1')
-    expect(runtime.waitForLeafPtyId).toHaveBeenCalledWith('terminal-1', 10_000, undefined)
+    expect(runtime.waitForLeafPtyId).toHaveBeenCalledWith(
+      'terminal-1',
+      10_000,
+      expect.any(AbortSignal)
+    )
     expect(messages.map((msg) => JSON.parse(msg).result?.type)).toEqual(['subscribed', 'end'])
   })
 })
diff --git a/src/main/runtime/rpc/terminal-multiplex-test-harness.ts b/src/main/runtime/rpc/terminal-multiplex-test-harness.ts
index 13368bd680d3..c85e962d198a 100644
--- a/src/main/runtime/rpc/terminal-multiplex-test-harness.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-test-harness.ts
@@ -16,10 +16,13 @@ export const SET_OUTPUT_PAUSED_OPCODE = 16 as TerminalStreamOpcode
 export const WRITE_UNAVAILABLE_OPCODE = 17 as TerminalStreamOpcode
 
 export function stubRuntime(overrides: Partial<OrcaRuntimeService> = {}): OrcaRuntimeService {
+  // Why: every terminal subscription registers at admission, even one that never reaches a pty.
+  const registry = createSubscriptionRegistryDouble()
   const serializeAuthoritativeTerminalBuffer =
     overrides.serializeAuthoritativeTerminalBuffer ??
     ((ptyId: string, opts?: { scrollbackRows?: number }) =>
       overrides.serializeTerminalBuffer?.(ptyId, opts))
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This partial runtime supplies the terminal RPC methods these tests invoke.
   return {
     getRuntimeId: () => 'test-runtime',
     subscribeToPtyExit: vi.fn(() => vi.fn()),
@@ -40,6 +43,7 @@ export function stubRuntime(overrides: Partial<OrcaRuntimeService> = {}): OrcaRu
     isRemoteDesktopViewerOwner: vi.fn().mockReturnValue(false),
     serializeAuthoritativeTerminalBuffer,
     getPtyOutputSequence: vi.fn().mockReturnValue(0),
+    registerOwnedSubscriptionCleanup: registry.registerOwnedSubscriptionCleanup,
     ...overrides
   } as OrcaRuntimeService
 }
diff --git a/src/main/runtime/rpc/terminal-output-batching.test.ts b/src/main/runtime/rpc/terminal-output-batching.test.ts
index e597f5e5b137..214a5a2814e9 100644
--- a/src/main/runtime/rpc/terminal-output-batching.test.ts
+++ b/src/main/runtime/rpc/terminal-output-batching.test.ts
@@ -347,7 +347,11 @@ describe('terminal output batching', () => {
       expect(runtime.sendTerminal).toHaveBeenCalledWith(
         'terminal-1',
         { text: 'ls\r', enter: false, interrupt: false },
-        { reserveWrite: expect.any(Function), afterWrite: expect.any(Function) }
+        {
+          inputKind: 'driving',
+          reserveWrite: expect.any(Function),
+          afterWrite: expect.any(Function)
+        }
       )
     )
     expect(beginMobileInputFloor).toHaveBeenCalledWith('pty-1', 'mobile-1')
diff --git a/src/main/runtime/rpc/terminal-send.test.ts b/src/main/runtime/rpc/terminal-send.test.ts
index e9fb481aae06..9aa55eb823ea 100644
--- a/src/main/runtime/rpc/terminal-send.test.ts
+++ b/src/main/runtime/rpc/terminal-send.test.ts
@@ -232,6 +232,7 @@ describe('terminal send RPC', () => {
         interrupt: false
       },
       {
+        inputKind: 'driving',
         beforeWrite: undefined,
         reserveWrite: expect.any(Function),
         afterWrite: expect.any(Function)
@@ -370,7 +371,7 @@ describe('terminal send RPC', () => {
     expect(runtime.sendTerminal).toHaveBeenCalledWith(
       'terminal-1',
       { text: '\x1b[3;4R', enter: false, interrupt: false },
-      { beforeWrite: undefined }
+      { beforeWrite: undefined, inputKind: 'query-reply' }
     )
     expect(runtime.mobileTookFloor).not.toHaveBeenCalled()
   })
@@ -570,7 +571,7 @@ describe('terminal send RPC', () => {
         enter: false,
         interrupt: false
       },
-      { beforeWrite: undefined }
+      { inputKind: 'driving', beforeWrite: undefined }
     )
   })
 
@@ -653,7 +654,7 @@ describe('terminal send RPC', () => {
         enter: true,
         interrupt: false
       },
-      { beforeWrite: expect.any(Function) }
+      { inputKind: 'driving', beforeWrite: expect.any(Function) }
     )
   })
 
diff --git a/src/main/runtime/rpc/terminal-stream-byte-length.test.ts b/src/main/runtime/rpc/terminal-stream-byte-length.test.ts
index 60c4c86fe445..1c0f08cf33f3 100644
--- a/src/main/runtime/rpc/terminal-stream-byte-length.test.ts
+++ b/src/main/runtime/rpc/terminal-stream-byte-length.test.ts
@@ -5,7 +5,6 @@ import {
   terminalStreamByteLength,
   terminalStreamByteLengthExceeds
 } from './terminal-stream-byte-length'
-import { TERMINAL_OUTPUT_BATCH_MAX_BYTES } from '../../../shared/terminal-multiplex-flow-control'
 
 // Copy of the pre-change implementation (shared/clipboard-text.ts
 // measureClipboardTextByteLength), kept here so equivalence is checked against the
@@ -323,92 +322,6 @@ describe('terminal stream byte length equivalence with the legacy code-point sca
         }
       }
     }
-    expect(MIN_NATIVE_BYTE_LENGTH_CODE_UNITS).toBeGreaterThan(0)
-  })
-})
-
-// Reproduces createTerminalOutputBatcher's byte accounting exactly, under both the
-// legacy scan and the new measurement, and asserts IDENTICAL flush boundaries. This is
-// what makes the partial-count behaviour provably unobservable at that call site.
-function simulateBatcherFlushes(
-  chunks: string[],
-  measure: (
-    data: string,
-    options: { stopAfterBytes?: number }
-  ) => { byteLength: number; exceededLimit: boolean }
-): string[] {
-  const flushes: string[] = []
-  let pending: string[] = []
-  let bytes = 0
-  const flush = (): void => {
-    if (pending.length === 0) {
-      return
-    }
-    flushes.push(pending.join(''))
-    pending = []
-    bytes = 0
-  }
-  for (const data of chunks) {
-    if (!data) {
-      continue
-    }
-    pending.push(data)
-    const remainingBudget = Math.max(1, TERMINAL_OUTPUT_BATCH_MAX_BYTES - bytes)
-    const measurement = measure(data, { stopAfterBytes: remainingBudget })
-    bytes += measurement.byteLength
-    if (measurement.exceededLimit || bytes >= TERMINAL_OUTPUT_BATCH_MAX_BYTES) {
-      flush()
-    }
-  }
-  flush()
-  return flushes
-}
-
-describe('terminal output batcher flush boundaries are unchanged', () => {
-  it(
-    'produces identical flush boundaries over randomized multi-chunk runs',
-    { timeout: 60000 },
-    () => {
-      const random = mulberry32(0x1337)
-      for (let run = 0; run < 300; run += 1) {
-        const chunks: string[] = []
-        const chunkCount = 1 + Math.floor(random() * 40)
-        for (let index = 0; index < chunkCount; index += 1) {
-          // Sizes straddle the 64KiB batch cap so single chunks both fit and blow the budget.
-          // Sizes straddle the native-call floor too, so runs mix scan-branch and
-          // native-branch measurements inside one batcher's byte accounting.
-          const scale = random()
-          const maxUnits =
-            scale < 0.25
-              ? MIN_NATIVE_BYTE_LENGTH_CODE_UNITS * 2
-              : scale < 0.5
-                ? 64
-                : scale < 0.85
-                  ? 20000
-                  : 90000
-          chunks.push(random() < 0.5 ? randomString(random, maxUnits) : rawUtf16(random, maxUnits))
-        }
-        const legacyFlushes = simulateBatcherFlushes(chunks, legacyMeasure)
-        const actualFlushes = simulateBatcherFlushes(chunks, measureTerminalStreamByteLength)
-        if (legacyFlushes.length !== actualFlushes.length) {
-          throw new Error(`flush count diverged on run ${run}`)
-        }
-        for (let index = 0; index < legacyFlushes.length; index += 1) {
-          if (legacyFlushes[index] !== actualFlushes[index]) {
-            throw new Error(`flush ${index} diverged on run ${run}`)
-          }
-        }
-      }
-      expect(true).toBe(true)
-    }
-  )
-
-  it('exercises runs that actually cross the batch budget', () => {
-    const oversized = '\u{1f600}'.repeat(TERMINAL_OUTPUT_BATCH_MAX_BYTES)
-    const chunks = ['a'.repeat(10), oversized, 'b'.repeat(10), oversized, 'c']
-    const legacyFlushes = simulateBatcherFlushes(chunks, legacyMeasure)
-    expect(legacyFlushes.length).toBeGreaterThan(1)
-    expect(simulateBatcherFlushes(chunks, measureTerminalStreamByteLength)).toEqual(legacyFlushes)
   })
 })
 
@@ -419,23 +332,8 @@ describe('resync trim byte accounting for a snapshot-sliced chunk', () => {
   it('re-measures a sliced chunk in UTF-8 bytes, not UTF-16 code units', () => {
     const data = '\u{1f600}é走a'
     const sliced = data.slice(2)
-    expect(terminalStreamByteLength(sliced)).toBe(legacyByteLength(sliced))
     // Guards the mutant: code-unit length would be 4 here, UTF-8 is 6.
     expect(terminalStreamByteLength(sliced)).toBe(6)
     expect(terminalStreamByteLength(sliced)).not.toBe(sliced.length)
   })
-
-  it('matches the legacy byte length for every suffix slice of multi-byte terminal text', () => {
-    const random = mulberry32(0x51ced)
-    for (let iteration = 0; iteration < 2000; iteration += 1) {
-      const data = iteration % 2 === 0 ? randomString(random, 24) : rawUtf16(random, 24)
-      for (let offset = 0; offset <= data.length; offset += 1) {
-        const sliced = data.slice(offset)
-        if (terminalStreamByteLength(sliced) !== legacyByteLength(sliced)) {
-          throw new Error(`sliced byte length diverged for ${JSON.stringify(data)} at ${offset}`)
-        }
-      }
-    }
-    expect(true).toBe(true)
-  })
 })
diff --git a/src/main/runtime/rpc/terminal-subscribe-admission.test.ts b/src/main/runtime/rpc/terminal-subscribe-admission.test.ts
new file mode 100644
index 000000000000..75df605d1c8a
--- /dev/null
+++ b/src/main/runtime/rpc/terminal-subscribe-admission.test.ts
@@ -0,0 +1,670 @@
+import { describe, expect, it, vi } from 'vitest'
+import { OrcaRuntimeService } from '../orca-runtime'
+import type { RpcRequest } from './core'
+import { RpcDispatcher } from './dispatcher'
+import { TERMINAL_METHODS } from './methods/terminal'
+import { TerminalUnsubscribe } from '../../../shared/rpc-contract/terminal-viewport-schemas-params'
+import { createSubscriptionRegistryDouble } from './subscription-registry-test-double'
+
+const PTY_ID = 'pty-1'
+const SUBSCRIPTION_ID = 'terminal-1:phone-1'
+
+const binaryParams = {
+  terminal: 'terminal-1',
+  client: { id: 'phone-1', type: 'mobile' },
+  viewport: { cols: 40, rows: 20 },
+  capabilities: { terminalBinaryStream: 1 }
+}
+
+const leaseOnlyParams = {
+  terminal: 'terminal-1',
+  client: { id: 'phone-1', type: 'mobile' },
+  capabilities: { terminalBinaryStream: 1, mobileInputLeaseOnly: 1 }
+}
+
+let nextRequestId = 0
+const subscribeRequest = (params: unknown): RpcRequest => ({
+  id: `req-${++nextRequestId}`,
+  authToken: 'tok',
+  method: 'terminal.subscribe',
+  params
+})
+const unsubscribeRequest = (): RpcRequest => ({
+  id: `req-${++nextRequestId}`,
+  authToken: 'tok',
+  method: 'terminal.unsubscribe',
+  params: { subscriptionId: SUBSCRIPTION_ID }
+})
+
+/** What a phone that addresses its request sends; the slot fields stay for older hosts. */
+const phoneUnsubscribeParams = (requestId: string) => ({
+  subscriptionId: SUBSCRIPTION_ID,
+  client: { id: 'phone-1' },
+  requestId
+})
+const requestUnsubscribe = (requestId: string): RpcRequest => ({
+  id: `req-${++nextRequestId}`,
+  authToken: 'tok',
+  method: 'terminal.unsubscribe',
+  params: phoneUnsubscribeParams(requestId)
+})
+
+const phoneConnection = (connectionId: string, signal?: AbortSignal) => ({
+  connectionId,
+  signal,
+  sendBinary: vi.fn(),
+  registerBinaryStreamHandler: vi.fn(() => vi.fn())
+})
+
+const resultTypes = (messages: string[]): unknown[] =>
+  messages.map((message) => JSON.parse(message).result?.type)
+
+const flush = (ms = 20): Promise<unknown> => new Promise((resolve) => setTimeout(resolve, ms))
+
+/** Resolves pending `waitForLeafPtyId` calls on demand and rejects them when their signal aborts, like the runtime. */
+function createPtyWaits() {
+  const waits: { resolve: (ptyId: string) => void }[] = []
+  return {
+    waits,
+    waitForLeafPtyId: vi.fn(
+      (_handle: string, _timeoutMs?: number, signal?: AbortSignal) =>
+        new Promise<string>((resolve, reject) => {
+          if (signal?.aborted) {
+            reject(new Error('request_aborted'))
+            return
+          }
+          signal?.addEventListener('abort', () => reject(new Error('request_aborted')), {
+            once: true
+          })
+          waits.push({ resolve })
+        })
+    ),
+    spawn: () => {
+      for (const wait of waits.splice(0)) {
+        wait.resolve(PTY_ID)
+      }
+    }
+  }
+}
+
+function stubRuntime(overrides: Record<string, unknown> = {}) {
+  const registry = createSubscriptionRegistryDouble()
+  const ptyWaits = createPtyWaits()
+  let ptyReady = false
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This partial runtime supplies the terminal RPC methods these tests invoke.
+  const runtime = {
+    getRuntimeId: () => 'test-runtime',
+    registerRemoteTerminalViewSubscriber: () => () => {},
+    requestRendererTerminalTabMount: vi.fn(() => false),
+    resolveLeafForHandle: vi.fn(() => ({ ptyId: ptyReady ? PTY_ID : null })),
+    waitForLeafPtyId: ptyWaits.waitForLeafPtyId,
+    handleMobileSubscribe: vi.fn().mockResolvedValue(true),
+    handleMobileUnsubscribe: vi.fn(),
+    subscribeToTerminalData: vi.fn(() => vi.fn()),
+    readTerminal: vi.fn().mockResolvedValue({ tail: ['scrollback'], truncated: false }),
+    serializeTerminalBuffer: vi
+      .fn()
+      .mockResolvedValue({ data: 'snapshot', cols: 40, rows: 20, seq: 4 }),
+    getTerminalSize: vi.fn().mockReturnValue({ cols: 40, rows: 20 }),
+    getMobileDisplayMode: vi.fn().mockReturnValue('auto'),
+    getLayout: vi.fn().mockReturnValue({ seq: 1 }),
+    isTerminalAlternateScreen: vi.fn().mockReturnValue(false),
+    subscribeToTerminalResize: vi.fn(() => vi.fn()),
+    subscribeToFitOverrideChanges: vi.fn(() => vi.fn()),
+    subscribeToPtyExit: vi.fn(() => vi.fn()),
+    registerOwnedSubscriptionCleanup: registry.registerOwnedSubscriptionCleanup,
+    cleanupSubscriptionIfOwnedByConnection: registry.cleanupSubscriptionIfOwnedByConnection,
+    getSubscriptionRegistrationVersion: registry.getSubscriptionRegistrationVersion,
+    releaseSubscriptionByRequest: registry.releaseSubscriptionByRequest,
+    ...overrides
+  } as unknown as OrcaRuntimeService
+  const spawn = (): void => {
+    ptyReady = true
+    ptyWaits.spawn()
+  }
+  return { runtime, registry, ptyWaits, spawn }
+}
+
+/** The real runtime, with only handle resolution, the pty wait, the scrollback read and tab mounting doubled. */
+function createRealRuntime() {
+  const runtime = new OrcaRuntimeService()
+  const sizes = new Map<string, { cols: number; rows: number }>([[PTY_ID, { cols: 120, rows: 40 }]])
+  runtime.setPtyController({
+    write: () => true,
+    kill: () => true,
+    getForegroundProcess: async () => null,
+    resize: (ptyId, cols, rows) => {
+      sizes.set(ptyId, { cols, rows })
+      return true
+    },
+    getSize: (ptyId) => sizes.get(ptyId) ?? null
+  })
+  const ptyWaits = createPtyWaits()
+  let ptyReady = false
+  vi.spyOn(runtime, 'resolveLeafForHandle').mockImplementation(() => ({
+    ptyId: ptyReady ? PTY_ID : null
+  }))
+  vi.spyOn(runtime, 'waitForLeafPtyId').mockImplementation(ptyWaits.waitForLeafPtyId)
+  vi.spyOn(runtime, 'readTerminal').mockResolvedValue({
+    handle: 'terminal-1',
+    status: 'running',
+    tail: [],
+    truncated: false,
+    nextCursor: null
+  })
+  vi.spyOn(runtime, 'requestRendererTerminalTabMount').mockReturnValue(false)
+  const spawn = (): void => {
+    ptyReady = true
+    ptyWaits.spawn()
+  }
+  return { runtime, ptyWaits, spawn, sizes }
+}
+
+describe('terminal.subscribe registers at admission', () => {
+  it('lets an unsubscribe end a subscribe that is still waiting for its pty', async () => {
+    const { runtime, registry, ptyWaits, spawn } = stubRuntime()
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const messages: string[] = []
+    const subscribe = dispatcher.dispatchStreaming(
+      subscribeRequest(binaryParams),
+      (message) => messages.push(message),
+      phoneConnection('conn-a')
+    )
+    await vi.waitFor(() => expect(ptyWaits.waitForLeafPtyId).toHaveBeenCalled())
+
+    const replies: string[] = []
+    await dispatcher.dispatchStreaming(unsubscribeRequest(), (reply) => replies.push(reply), {
+      connectionId: 'conn-a'
+    })
+    spawn()
+    await flush()
+
+    try {
+      expect(JSON.parse(replies[0]!).result).toEqual({ unsubscribed: true })
+      expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBeUndefined()
+      expect(runtime.handleMobileSubscribe).not.toHaveBeenCalled()
+      expect(resultTypes(messages)).toEqual(['end'])
+    } finally {
+      registry.cleanupSubscriptionsForConnection('conn-a')
+      await subscribe
+    }
+  })
+
+  it('leaves the desktop driver idle when the phone leaves before the pty is ready', async () => {
+    const { runtime, ptyWaits, spawn } = createRealRuntime()
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const messages: string[] = []
+    const subscribe = dispatcher.dispatchStreaming(
+      subscribeRequest(binaryParams),
+      (message) => messages.push(message),
+      phoneConnection('conn-a')
+    )
+    await vi.waitFor(() => expect(ptyWaits.waitForLeafPtyId).toHaveBeenCalled())
+
+    await dispatcher.dispatchStreaming(unsubscribeRequest(), vi.fn(), { connectionId: 'conn-a' })
+    spawn()
+    await flush()
+
+    try {
+      expect(runtime.getDriver(PTY_ID).kind).toBe('idle')
+      expect(runtime.getTerminalFitOverride(PTY_ID)).toBeNull()
+      expect(resultTypes(messages)).toEqual(['end'])
+    } finally {
+      runtime.cleanupSubscriptionsForConnection('conn-a')
+      await subscribe
+    }
+  })
+
+  it('ends a pending subscribe replaced by the same slot without adding its presence', async () => {
+    const { runtime, registry, ptyWaits, spawn } = stubRuntime()
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const firstMessages: string[] = []
+    const first = dispatcher.dispatchStreaming(
+      subscribeRequest(binaryParams),
+      (message) => firstMessages.push(message),
+      phoneConnection('conn-a')
+    )
+    await vi.waitFor(() => expect(ptyWaits.waitForLeafPtyId).toHaveBeenCalledTimes(1))
+
+    const second = dispatcher.dispatchStreaming(
+      subscribeRequest(binaryParams),
+      vi.fn(),
+      phoneConnection('conn-b')
+    )
+    await vi.waitFor(() => expect(ptyWaits.waitForLeafPtyId).toHaveBeenCalledTimes(2))
+    const replacement = registry.peekCleanup(SUBSCRIPTION_ID)
+    spawn()
+    await first
+    await vi.waitFor(() => expect(runtime.handleMobileSubscribe).toHaveBeenCalled())
+    await flush()
+
+    try {
+      expect(resultTypes(firstMessages)).toEqual(['end'])
+      // Only the replacement joins; the evicted request never adds presence behind it.
+      expect(runtime.handleMobileSubscribe).toHaveBeenCalledOnce()
+      expect(runtime.handleMobileUnsubscribe).not.toHaveBeenCalled()
+      expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBe(replacement)
+    } finally {
+      registry.cleanupSubscriptionsForConnection('conn-b')
+      await second
+    }
+  })
+
+  it('leaves the desktop driver idle when the phone leaves during the phone-fit layout', async () => {
+    const { runtime, sizes } = createRealRuntime()
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    let leaveDuringLayout = true
+    runtime.setPtyController({
+      write: () => true,
+      kill: () => true,
+      getForegroundProcess: async () => null,
+      resize: (ptyId, cols, rows) => {
+        sizes.set(ptyId, { cols, rows })
+        // The phone's unsubscribe lands while handleMobileSubscribe awaits its layout.
+        if (leaveDuringLayout) {
+          leaveDuringLayout = false
+          runtime.cleanupSubscriptionIfOwnedByConnection(SUBSCRIPTION_ID, 'conn-a')
+        }
+        return true
+      },
+      getSize: (ptyId) => sizes.get(ptyId) ?? null
+    })
+    vi.spyOn(runtime, 'resolveLeafForHandle').mockReturnValue({ ptyId: PTY_ID })
+    const messages: string[] = []
+
+    const subscribe = dispatcher.dispatchStreaming(
+      subscribeRequest(binaryParams),
+      (message) => messages.push(message),
+      phoneConnection('conn-a')
+    )
+    await vi.waitFor(() => expect(leaveDuringLayout).toBe(false))
+    await subscribe
+
+    await vi.waitFor(() => expect(runtime.getDriver(PTY_ID).kind).toBe('idle'), {
+      timeout: 2_000
+    })
+    expect(resultTypes(messages)).toEqual(['end'])
+  })
+
+  it('leaves no registration when the request aborts while the pty is pending', async () => {
+    const { runtime, registry, ptyWaits, spawn } = stubRuntime()
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const request = new AbortController()
+    const messages: string[] = []
+    const subscribe = dispatcher.dispatchStreaming(
+      subscribeRequest(binaryParams),
+      (message) => messages.push(message),
+      phoneConnection('conn-a', request.signal)
+    )
+    await vi.waitFor(() => expect(ptyWaits.waitForLeafPtyId).toHaveBeenCalled())
+
+    request.abort()
+    spawn()
+    await subscribe
+    await flush()
+
+    expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBeUndefined()
+    expect(runtime.handleMobileSubscribe).not.toHaveBeenCalled()
+    expect(runtime.subscribeToTerminalData).not.toHaveBeenCalled()
+    expect(resultTypes(messages)).toEqual(['end'])
+  })
+
+  it('does not follow a released stream end with an error', async () => {
+    let rejectSubscribe = (_error: Error): void => {}
+    const { runtime, registry } = stubRuntime({
+      resolveLeafForHandle: vi.fn(() => ({ ptyId: PTY_ID })),
+      handleMobileSubscribe: vi.fn(
+        () =>
+          new Promise<boolean>((_resolve, reject) => {
+            rejectSubscribe = reject
+          })
+      )
+    })
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const messages: string[] = []
+    const subscribe = dispatcher.dispatchStreaming(
+      subscribeRequest(leaseOnlyParams),
+      (message) => messages.push(message),
+      phoneConnection('conn-a')
+    )
+    await vi.waitFor(() => expect(runtime.handleMobileSubscribe).toHaveBeenCalled())
+
+    registry.cleanupSubscriptionIfOwnedByConnection(SUBSCRIPTION_ID, 'conn-a')
+    rejectSubscribe(new Error('subscribe_failed'))
+    await subscribe
+
+    expect(messages.map((message) => JSON.parse(message))).toEqual([
+      expect.objectContaining({ ok: true, result: { type: 'end' } })
+    ])
+  })
+
+  it('fails without end when the stream errors before anything released it', async () => {
+    const { runtime, registry } = stubRuntime({
+      resolveLeafForHandle: vi.fn(() => ({ ptyId: PTY_ID })),
+      handleMobileSubscribe: vi.fn().mockRejectedValue(new Error('subscribe_failed'))
+    })
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const messages: string[] = []
+
+    await dispatcher.dispatchStreaming(
+      subscribeRequest(leaseOnlyParams),
+      (message) => messages.push(message),
+      phoneConnection('conn-a')
+    )
+
+    expect(messages.map((message) => JSON.parse(message).ok)).toEqual([false])
+    expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBeUndefined()
+    // Presence was added before the await, so the failed request still removes it.
+    expect(runtime.handleMobileUnsubscribe).toHaveBeenCalledWith(PTY_ID, 'phone-1')
+  })
+})
+
+describe('terminal.subscribe characterization', () => {
+  it('answers a dead pty with a scrollback preview, then one end, and keeps no registration', async () => {
+    const { runtime, registry } = stubRuntime({
+      waitForLeafPtyId: vi.fn().mockRejectedValue(new Error('Timed out waiting for PTY to spawn'))
+    })
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const messages: string[] = []
+
+    await dispatcher.dispatchStreaming(
+      subscribeRequest(binaryParams),
+      (message) => messages.push(message),
+      phoneConnection('conn-a')
+    )
+
+    expect(runtime.waitForLeafPtyId).toHaveBeenCalled()
+    expect(messages.map((message) => JSON.parse(message).result)).toEqual([
+      { type: 'subscribed', streamId: null, lines: ['scrollback'], truncated: false },
+      { type: 'end' }
+    ])
+    expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBeUndefined()
+  })
+
+  it('stops listening to a long-lived IPC signal once the stream is released', async () => {
+    const { runtime, registry } = stubRuntime({
+      resolveLeafForHandle: vi.fn(() => ({ ptyId: PTY_ID }))
+    })
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    // IPC keeps one controller per subscription id and it outlives the dispatch.
+    const ipcSubscription = new AbortController()
+    const addAbort = vi.spyOn(ipcSubscription.signal, 'addEventListener')
+    const removeAbort = vi.spyOn(ipcSubscription.signal, 'removeEventListener')
+    const messages: string[] = []
+    const subscribe = dispatcher.dispatchStreaming(
+      subscribeRequest(binaryParams),
+      (message) => messages.push(message),
+      { ...phoneConnection('ipc-a'), signal: ipcSubscription.signal }
+    )
+    await vi.waitFor(() => expect(runtime.handleMobileSubscribe).toHaveBeenCalled())
+    expect(addAbort).toHaveBeenCalledWith('abort', expect.any(Function), { once: true })
+
+    registry.cleanupSubscriptionIfOwnedByConnection(SUBSCRIPTION_ID, 'ipc-a')
+    await subscribe
+    expect(removeAbort).toHaveBeenCalledWith('abort', addAbort.mock.calls[0]![1])
+
+    ipcSubscription.abort()
+    await flush()
+    expect(runtime.handleMobileUnsubscribe).toHaveBeenCalledOnce()
+    expect(resultTypes(messages).filter((type) => type === 'end')).toHaveLength(1)
+  })
+
+  it('ends a stream when its IPC subscription is aborted', async () => {
+    const { runtime, registry } = stubRuntime({
+      resolveLeafForHandle: vi.fn(() => ({ ptyId: PTY_ID }))
+    })
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const ipcSubscription = new AbortController()
+    const messages: string[] = []
+    const subscribe = dispatcher.dispatchStreaming(
+      subscribeRequest(binaryParams),
+      (message) => messages.push(message),
+      { ...phoneConnection('ipc-a'), signal: ipcSubscription.signal }
+    )
+    await vi.waitFor(() => expect(runtime.handleMobileSubscribe).toHaveBeenCalled())
+
+    ipcSubscription.abort()
+    await subscribe
+
+    expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBeUndefined()
+    expect(runtime.handleMobileUnsubscribe).toHaveBeenCalledWith(PTY_ID, 'phone-1')
+    expect(resultTypes(messages).at(-1)).toBe('end')
+  })
+
+  it('rejects a phone without binary streaming before it can replace the live stream', async () => {
+    const { runtime, registry } = stubRuntime({
+      waitForLeafPtyId: vi.fn().mockRejectedValue(new Error('Timed out waiting for PTY to spawn'))
+    })
+    const live = vi.fn()
+    registry.registerOwnedSubscriptionCleanup(SUBSCRIPTION_ID, live, 'conn-a')
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const messages: string[] = []
+
+    // A pre-binary phone subscribing to a pty that never spawned: this used to get a preview and end.
+    await dispatcher.dispatchStreaming(
+      subscribeRequest({ terminal: 'terminal-1', client: { id: 'phone-1', type: 'mobile' } }),
+      (message) => messages.push(message),
+      { connectionId: 'conn-b' }
+    )
+
+    expect(JSON.parse(messages[0]!)).toMatchObject({
+      ok: false,
+      error: { message: 'binary_terminal_stream_required' }
+    })
+    expect(messages).toHaveLength(1)
+    expect(runtime.waitForLeafPtyId).not.toHaveBeenCalled()
+    expect(live).not.toHaveBeenCalled()
+    expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBe(live)
+  })
+})
+
+describe('terminal.unsubscribe addressed by request', () => {
+  const liveStub = () => stubRuntime({ resolveLeafForHandle: vi.fn(() => ({ ptyId: PTY_ID })) })
+
+  it('does not let a replaced request end the newer stream on the same slot', async () => {
+    const { runtime, registry } = liveStub()
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const older = subscribeRequest(binaryParams)
+    const first = dispatcher.dispatchStreaming(older, vi.fn(), phoneConnection('conn-a'))
+    await vi.waitFor(() => expect(runtime.handleMobileSubscribe).toHaveBeenCalledTimes(1))
+    const newerMessages: string[] = []
+    const second = dispatcher.dispatchStreaming(
+      subscribeRequest(binaryParams),
+      (message) => newerMessages.push(message),
+      phoneConnection('conn-a')
+    )
+    await vi.waitFor(() => expect(runtime.handleMobileSubscribe).toHaveBeenCalledTimes(2))
+    const replacement = registry.peekCleanup(SUBSCRIPTION_ID)
+
+    // The phone disposes the older stream only after the newer one registered.
+    await dispatcher.dispatchStreaming(requestUnsubscribe(older.id), vi.fn(), {
+      connectionId: 'conn-a'
+    })
+    await flush()
+
+    try {
+      expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBe(replacement)
+      expect(resultTypes(newerMessages)).not.toContain('end')
+    } finally {
+      registry.cleanupSubscriptionsForConnection('conn-a')
+      await Promise.all([first, second])
+    }
+  })
+
+  it('ends a subscribe still waiting for its pty, addressed by its request id', async () => {
+    const { runtime, ptyWaits, spawn } = createRealRuntime()
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const pending = subscribeRequest(binaryParams)
+    const messages: string[] = []
+    const subscribe = dispatcher.dispatchStreaming(
+      pending,
+      (message) => messages.push(message),
+      phoneConnection('conn-a')
+    )
+    await vi.waitFor(() => expect(ptyWaits.waitForLeafPtyId).toHaveBeenCalled())
+
+    await dispatcher.dispatchStreaming(requestUnsubscribe(pending.id), vi.fn(), {
+      connectionId: 'conn-a'
+    })
+    spawn()
+    await flush()
+
+    try {
+      expect(runtime.getDriver(PTY_ID).kind).toBe('idle')
+      expect(runtime.getTerminalFitOverride(PTY_ID)).toBeNull()
+      expect(resultTypes(messages)).toEqual(['end'])
+    } finally {
+      runtime.cleanupSubscriptionsForConnection('conn-a')
+      await subscribe
+    }
+  })
+
+  it.each([
+    ['an unknown request', () => 'req-unknown'],
+    ['the unsubscribe itself', (unsubscribeId: string) => unsubscribeId],
+    ['a non-terminal stream', () => 'req-tabs']
+  ])('treats %s as a no-op without touching the slot', async (_label, target) => {
+    const { runtime, registry } = liveStub()
+    const tabsCleanup = vi.fn()
+    registry.registerSubscriptionCleanup('session.tabs:conn-a:wt:req-tabs', tabsCleanup, 'conn-a')
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const messages: string[] = []
+    const subscribe = dispatcher.dispatchStreaming(
+      subscribeRequest(binaryParams),
+      (message) => messages.push(message),
+      phoneConnection('conn-a')
+    )
+    await vi.waitFor(() => expect(runtime.handleMobileSubscribe).toHaveBeenCalled())
+    const live = registry.peekCleanup(SUBSCRIPTION_ID)
+
+    const unsubscribeId = `req-${++nextRequestId}`
+    const replies: string[] = []
+    await dispatcher.dispatchStreaming(
+      {
+        id: unsubscribeId,
+        authToken: 'tok',
+        method: 'terminal.unsubscribe',
+        params: phoneUnsubscribeParams(target(unsubscribeId))
+      },
+      (reply) => replies.push(reply),
+      { connectionId: 'conn-a' }
+    )
+    await flush()
+
+    try {
+      expect(JSON.parse(replies[0]!).result).toEqual({ unsubscribed: true })
+      expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBe(live)
+      expect(resultTypes(messages)).not.toContain('end')
+      expect(tabsCleanup).not.toHaveBeenCalled()
+    } finally {
+      registry.cleanupSubscriptionsForConnection('conn-a')
+      await subscribe
+    }
+  })
+
+  it('is a no-op on a socket without a connection id', async () => {
+    const { runtime, registry } = liveStub()
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const live = subscribeRequest(binaryParams)
+    const subscribe = dispatcher.dispatchStreaming(live, vi.fn(), phoneConnection('conn-a'))
+    await vi.waitFor(() => expect(runtime.handleMobileSubscribe).toHaveBeenCalled())
+    const liveCleanup = registry.peekCleanup(SUBSCRIPTION_ID)
+
+    await dispatcher.dispatchStreaming(requestUnsubscribe(live.id), vi.fn())
+    await flush()
+
+    try {
+      expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBe(liveCleanup)
+    } finally {
+      registry.cleanupSubscriptionsForConnection('conn-a')
+      await subscribe
+    }
+  })
+
+  it('lets a host without the field strip it and end the slot, as before', async () => {
+    // The shape every earlier host validates `terminal.unsubscribe` with; it is not strict.
+    const legacySchema = TerminalUnsubscribe.omit({ requestId: true })
+    const legacyParams = legacySchema.parse(phoneUnsubscribeParams('req-any'))
+    expect(legacyParams).toEqual({ subscriptionId: SUBSCRIPTION_ID, client: { id: 'phone-1' } })
+
+    const { runtime, registry } = liveStub()
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const messages: string[] = []
+    const subscribe = dispatcher.dispatchStreaming(
+      subscribeRequest(binaryParams),
+      (message) => messages.push(message),
+      phoneConnection('conn-a')
+    )
+    await vi.waitFor(() => expect(runtime.handleMobileSubscribe).toHaveBeenCalled())
+
+    await dispatcher.dispatchStreaming(
+      {
+        id: `req-${++nextRequestId}`,
+        authToken: 'tok',
+        method: 'terminal.unsubscribe',
+        params: legacyParams
+      },
+      vi.fn(),
+      { connectionId: 'conn-a' }
+    )
+    await subscribe
+
+    expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBeUndefined()
+    expect(resultTypes(messages).at(-1)).toBe('end')
+  })
+
+  it('never lets a back-to-back unsubscribe overtake the subscribe it names', async () => {
+    const { runtime, registry } = liveStub()
+    const register = vi.spyOn(runtime, 'registerOwnedSubscriptionCleanup')
+    const release = vi.spyOn(runtime, 'releaseSubscriptionByRequest')
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    const subscribe = subscribeRequest(binaryParams)
+    const messages: string[] = []
+
+    const streaming = dispatcher.dispatchStreaming(
+      subscribe,
+      (message) => messages.push(message),
+      phoneConnection('conn-a')
+    )
+    const unsubscribing = dispatcher.dispatchStreaming(requestUnsubscribe(subscribe.id), vi.fn(), {
+      connectionId: 'conn-a'
+    })
+    await Promise.all([streaming, unsubscribing])
+    await flush()
+
+    expect(register.mock.invocationCallOrder[0]).toBeLessThan(release.mock.invocationCallOrder[0]!)
+    expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBeUndefined()
+    expect(registry.requestAddressCount()).toBe(0)
+    expect(resultTypes(messages).filter((type) => type === 'end')).toHaveLength(1)
+  })
+
+  it('heals a half-open socket: the replay on a new socket is what the leave ends', async () => {
+    const { runtime, spawn } = createRealRuntime()
+    spawn()
+    const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
+    // Replay after a reconnect resends the same request id on the new socket.
+    const replayed = subscribeRequest(binaryParams)
+    const halfOpenMessages: string[] = []
+    const halfOpen = dispatcher.dispatchStreaming(
+      replayed,
+      (message) => halfOpenMessages.push(message),
+      phoneConnection('conn-1')
+    )
+    await vi.waitFor(() => expect(runtime.getDriver(PTY_ID).kind).toBe('mobile'))
+    const replay = dispatcher.dispatchStreaming(replayed, vi.fn(), phoneConnection('conn-2'))
+    await halfOpen
+    expect(resultTypes(halfOpenMessages).at(-1)).toBe('end')
+
+    await dispatcher.dispatchStreaming(requestUnsubscribe(replayed.id), vi.fn(), {
+      connectionId: 'conn-2'
+    })
+    await replay
+
+    await vi.waitFor(() => expect(runtime.getDriver(PTY_ID).kind).toBe('idle'), {
+      timeout: 2_000
+    })
+    // The half-open socket's eventual close finds nothing of its own left.
+    runtime.cleanupSubscriptionsForConnection('conn-1')
+    expect(runtime.getDriver(PTY_ID).kind).toBe('idle')
+  })
+})
diff --git a/src/main/runtime/rpc/terminal-subscribe-buffer.test.ts b/src/main/runtime/rpc/terminal-subscribe-buffer.test.ts
index b6c53668f2d7..a08458d8be53 100644
--- a/src/main/runtime/rpc/terminal-subscribe-buffer.test.ts
+++ b/src/main/runtime/rpc/terminal-subscribe-buffer.test.ts
@@ -13,8 +13,11 @@ import {
 } from '../../../shared/terminal-stream-protocol'
 
 function stubRuntime(overrides: Partial<OrcaRuntimeService> = {}): OrcaRuntimeService {
+  const registry = createSubscriptionRegistryDouble()
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This partial runtime supplies the terminal RPC methods these tests invoke.
   return {
     getRuntimeId: () => 'test-runtime',
+    registerOwnedSubscriptionCleanup: registry.registerOwnedSubscriptionCleanup,
     subscribeToPtyExit: vi.fn(() => vi.fn()),
     // Why: subscribe streams register as remote view subscribers for Phase-5
     // query-authority suppression (terminal-query-authority.md).
@@ -76,7 +79,8 @@ describe('terminal subscribe buffering', () => {
 
       expect(await outcomePromise).toBe('settled')
       expect(runtime.readTerminal).not.toHaveBeenCalled()
-      expect(messages).toEqual([])
+      // The pending stream was registered, so its release ends it like any other.
+      expect(messages.map((msg) => JSON.parse(msg).result?.type)).toEqual(['end'])
     } finally {
       vi.useRealTimers()
     }
@@ -302,7 +306,8 @@ describe('terminal subscribe buffering', () => {
       expect(runtime.registerOwnedSubscriptionCleanup).toHaveBeenCalledWith(
         'terminal-1:desktop-1',
         expect.any(Function),
-        'conn-legacy-json'
+        'conn-legacy-json',
+        'req-1'
       )
       expect(registry.peekCleanup('terminal-1:desktop-1')).toBeUndefined()
       expect(runtime.waitForTerminal).not.toHaveBeenCalled()
diff --git a/src/main/runtime/rpc/terminal-subscribe-mount-replay.test.ts b/src/main/runtime/rpc/terminal-subscribe-mount-replay.test.ts
index c64747616cff..6dd443f14026 100644
--- a/src/main/runtime/rpc/terminal-subscribe-mount-replay.test.ts
+++ b/src/main/runtime/rpc/terminal-subscribe-mount-replay.test.ts
@@ -11,6 +11,11 @@ import { RpcDispatcher } from './dispatcher'
 import { TERMINAL_METHODS } from './methods/terminal'
 import { createSubscriptionRegistryDouble } from './subscription-registry-test-double'
 
+function asRuntime(double: Record<string, unknown>): OrcaRuntimeService {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: terminal.subscribe reads only the members the double provides.
+  return double as unknown as OrcaRuntimeService
+}
+
 const request: RpcRequest = {
   id: 'req-1',
   authToken: 'tok',
@@ -97,7 +102,7 @@ describe('terminal subscribe mount replay', () => {
     let generation = 1
     let headlessPresent = false
     let serializeCalls = 0
-    const runtime = {
+    const runtime = asRuntime({
       getRuntimeId: () => 'test-runtime',
       subscribeToPtyExit: vi.fn(() => vi.fn()),
       resolveLeafForHandle: vi.fn().mockReturnValue({ ptyId: 'pty-1' }),
@@ -110,9 +115,9 @@ describe('terminal subscribe mount replay', () => {
       waitForRendererTerminalSerializer: vi.fn(async (_ptyId, afterGeneration) => {
         return generation > afterGeneration
       }),
+      // The phone fit's redraw creates suffix-only headless state.
       handleMobileSubscribe: vi.fn(async () => {
         headlessPresent = true
-        generation = 2
         return true
       }),
       handleMobileUnsubscribe: vi.fn(),
@@ -126,12 +131,15 @@ describe('terminal subscribe mount replay', () => {
         }
         return { data: 'raced idle prompt $ ', cols: 80, rows: 24, seq: 5 }
       }),
-      serializeRendererTerminalBuffer: vi.fn(async () => ({
-        data: 'raced idle prompt $ ',
-        cols: 80,
-        rows: 24,
-        seq: 5
-      })),
+      // Baseline race: the pane settles between the attachment answer and the wait, so the wait
+      // must still count that settle against the pre-fit generation.
+      serializeRendererTerminalBuffer: vi
+        .fn()
+        .mockImplementationOnce(async () => {
+          generation = 2
+          return null
+        })
+        .mockResolvedValue({ data: 'raced idle prompt $ ', cols: 80, rows: 24, seq: 5 }),
       getTerminalSize: vi.fn().mockReturnValue({ cols: 80, rows: 24 }),
       getMobileDisplayMode: vi.fn().mockReturnValue('auto'),
       getLayout: vi.fn().mockReturnValue({ seq: 1 }),
@@ -142,7 +150,7 @@ describe('terminal subscribe mount replay', () => {
       registerOwnedSubscriptionCleanup: vi.fn(registry.registerOwnedSubscriptionCleanup),
       cleanupSubscription: vi.fn(registry.cleanupSubscription),
       waitForTerminal: vi.fn(() => new Promise<RuntimeTerminalWait>(() => {}))
-    } as unknown as OrcaRuntimeService
+    })
     const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
 
     const dispatchPromise = dispatcher.dispatchStreaming(request, vi.fn(), {
@@ -286,11 +294,8 @@ describe('terminal subscribe mount replay', () => {
     const registry = createSubscriptionRegistryDouble()
     let generation = 0
     let headlessPresent = false
-    const requestRendererTerminalTabMount = vi.fn(() => {
-      generation = 1
-      return true
-    })
-    const runtime = {
+    const requestRendererTerminalTabMount = vi.fn(() => true)
+    const runtime = asRuntime({
       getRuntimeId: () => 'test-runtime',
       subscribeToPtyExit: vi.fn(() => vi.fn()),
       resolveLeafForHandle: vi.fn().mockReturnValue(null),
@@ -320,11 +325,15 @@ describe('terminal subscribe mount replay', () => {
         rows: 24,
         seq: 1
       }),
-      serializeRendererTerminalBuffer: vi.fn().mockResolvedValue({
-        data: 'late leaf prompt $ ',
-        cols: 80,
-        rows: 24
-      }),
+      // Baseline race: the pre-PTY mount settles between the attachment answer and the wait, so the
+      // wait must still count that settle against the pre-mount generation.
+      serializeRendererTerminalBuffer: vi
+        .fn()
+        .mockImplementationOnce(async () => {
+          generation = 1
+          return null
+        })
+        .mockResolvedValue({ data: 'late leaf prompt $ ', cols: 80, rows: 24 }),
       getTerminalSize: vi.fn().mockReturnValue({ cols: 80, rows: 24 }),
       getMobileDisplayMode: vi.fn().mockReturnValue('auto'),
       getLayout: vi.fn().mockReturnValue({ seq: 1 }),
@@ -335,7 +344,7 @@ describe('terminal subscribe mount replay', () => {
       registerOwnedSubscriptionCleanup: vi.fn(registry.registerOwnedSubscriptionCleanup),
       cleanupSubscription: vi.fn(registry.cleanupSubscription),
       waitForTerminal: vi.fn(() => new Promise<RuntimeTerminalWait>(() => {}))
-    } as unknown as OrcaRuntimeService
+    })
     const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
 
     const dispatchPromise = dispatcher.dispatchStreaming(request, vi.fn(), {
diff --git a/src/main/runtime/rpc/terminal-subscribe-mounted-pane.test.ts b/src/main/runtime/rpc/terminal-subscribe-mounted-pane.test.ts
new file mode 100644
index 000000000000..56720ff5d483
--- /dev/null
+++ b/src/main/runtime/rpc/terminal-subscribe-mounted-pane.test.ts
@@ -0,0 +1,370 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { RuntimeTerminalWait } from '../../../shared/runtime-types'
+import {
+  TerminalStreamOpcode,
+  decodeTerminalStreamFrame,
+  decodeTerminalStreamText
+} from '../../../shared/terminal-stream-protocol'
+import type { OrcaRuntimeService } from '../orca-runtime'
+import type { RpcRequest } from './core'
+import { RpcDispatcher } from './dispatcher'
+import { TERMINAL_METHODS } from './methods/terminal'
+import { createSubscriptionRegistryDouble } from './subscription-registry-test-double'
+
+const request: RpcRequest = {
+  id: 'req-1',
+  authToken: 'tok',
+  method: 'terminal.subscribe',
+  params: {
+    terminal: 'terminal-1',
+    client: { id: 'phone-1', type: 'mobile' },
+    capabilities: { terminalBinaryStream: 1 }
+  }
+}
+
+function asRuntime(double: Record<string, unknown>): OrcaRuntimeService {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: terminal.subscribe reads only the members the double provides.
+  return double as unknown as OrcaRuntimeService
+}
+
+type PaneDouble = {
+  /** What the desktop renderer's serializer answers; null when no pane is registered. */
+  rendererScreen: () => string | null
+  /** How long each renderer serialize takes; the IPC answers null after 750 ms when no pane replies. */
+  rendererAnswerDelayMs?: number
+  /** PTY output high-water; a pane printing continuously advances it on every read. */
+  outputSequence?: () => number
+  /** Renderer-ordered seq; null when the pane does not order output itself. */
+  rendererSeq?: number | null
+  /** What the preference order serves before any renderer probe. */
+  chosenScreen?: string
+  /** Live output that arrives while the subscription is still buffering. */
+  pendingOutput?: string
+  /** Output offset at the end of the pending chunk. */
+  pendingOutputSeq?: number
+  waitForRendererTerminalSerializer: OrcaRuntimeService['waitForRendererTerminalSerializer']
+}
+
+function subscribeMobile(pane: PaneDouble) {
+  const binaryFrames: Uint8Array<ArrayBufferLike>[] = []
+  const registry = createSubscriptionRegistryDouble()
+  let emitData: (data: string, meta: { seq: number; rawLength: number }) => void = () => {}
+  const runtime = {
+    getRuntimeId: () => 'test-runtime',
+    subscribeToPtyExit: vi.fn(() => vi.fn()),
+    resolveLeafForHandle: vi.fn().mockReturnValue({ ptyId: 'pty-1' }),
+    // A daemon PTY reattached after a desktop restart has no headless model yet.
+    hasHeadlessTerminalState: vi.fn(() => false),
+    requestRendererTerminalTabMount: vi.fn(() => true),
+    getRendererTerminalSerializerGenerationForHandle: vi.fn(() => 1),
+    getRendererTerminalSerializerGeneration: vi.fn(() => 1),
+    getPtyOutputSequence: vi.fn(pane.outputSequence ?? (() => 4)),
+    replaceHeadlessTerminalFromRendererSnapshotForRecovery: vi.fn(),
+    waitForRendererTerminalSerializer: vi.fn(pane.waitForRendererTerminalSerializer),
+    handleMobileSubscribe: vi.fn().mockResolvedValue(true),
+    handleMobileUnsubscribe: vi.fn(),
+    subscribeToTerminalData: vi.fn((_ptyId: string, listener: typeof emitData) => {
+      emitData = listener
+      return vi.fn()
+    }),
+    registerRemoteTerminalViewSubscriber: vi.fn(() => vi.fn()),
+    readTerminal: vi.fn().mockResolvedValue({ tail: [], truncated: false }),
+    // The restored provider snapshot wins the preference order over the live renderer.
+    serializeTerminalBuffer: vi.fn(async () => {
+      if (pane.pendingOutput) {
+        emitData(pane.pendingOutput, {
+          seq: pane.pendingOutputSeq ?? 3,
+          rawLength: pane.pendingOutput.length
+        })
+      }
+      return {
+        data: pane.chosenScreen ?? 'restored provider history',
+        cols: 80,
+        rows: 24,
+        seq: 2
+      }
+    }),
+    serializeRendererTerminalBuffer: vi.fn(async () => {
+      if (pane.rendererAnswerDelayMs) {
+        await new Promise((resolve) => setTimeout(resolve, pane.rendererAnswerDelayMs))
+      }
+      const screen = pane.rendererScreen()
+      const seq = pane.rendererSeq === undefined ? 4 : pane.rendererSeq
+      return screen === null
+        ? null
+        : {
+            data: screen,
+            cols: 80,
+            rows: 24,
+            ...(seq === null ? {} : { seq }),
+            source: 'renderer' as const
+          }
+    }),
+    getTerminalSize: vi.fn().mockReturnValue({ cols: 80, rows: 24 }),
+    getMobileDisplayMode: vi.fn().mockReturnValue('auto'),
+    getLayout: vi.fn().mockReturnValue({ seq: 1 }),
+    isTerminalAlternateScreen: vi.fn().mockReturnValue(false),
+    subscribeToTerminalResize: vi.fn().mockReturnValue(vi.fn()),
+    subscribeToFitOverrideChanges: vi.fn().mockReturnValue(vi.fn()),
+    registerSubscriptionCleanup: vi.fn(registry.registerSubscriptionCleanup),
+    registerOwnedSubscriptionCleanup: vi.fn(registry.registerOwnedSubscriptionCleanup),
+    cleanupSubscription: vi.fn(registry.cleanupSubscription),
+    waitForTerminal: vi.fn(() => new Promise<RuntimeTerminalWait>(() => {}))
+  }
+  const dispatcher = new RpcDispatcher({ runtime: asRuntime(runtime), methods: TERMINAL_METHODS })
+  const done = dispatcher.dispatchStreaming(request, vi.fn(), {
+    connectionId: 'conn-phone',
+    sendBinary: (bytes) => {
+      binaryFrames.push(bytes)
+    },
+    registerBinaryStreamHandler: vi.fn(() => vi.fn())
+  })
+  const snapshotText = (): string =>
+    binaryFrames
+      .map((bytes) => decodeTerminalStreamFrame(bytes))
+      .filter((frame) => frame?.opcode === TerminalStreamOpcode.SnapshotChunk)
+      .map((frame) => decodeTerminalStreamText(frame!.payload))
+      .join('')
+  const outputText = (): string =>
+    binaryFrames
+      .map((bytes) => decodeTerminalStreamFrame(bytes))
+      .filter((frame) => frame?.opcode === TerminalStreamOpcode.Output)
+      .map((frame) => decodeTerminalStreamText(frame!.payload))
+      .join('')
+  const close = async (): Promise<void> => {
+    runtime.cleanupSubscription('terminal-1:phone-1')
+    await done
+  }
+  return { runtime, snapshotText, outputText, close }
+}
+
+describe('terminal subscribe for a pane the desktop already has mounted', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+  })
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('adopts the live renderer screen over the chosen snapshot without waiting out the mount deadline', async () => {
+    // The renderer drops a mount request for a mounted tab, so no newer serializer settle ever arrives.
+    const subscription = subscribeMobile({
+      chosenScreen: 'suffix-only redraw',
+      rendererScreen: () => 'live desktop prompt $ ',
+      waitForRendererTerminalSerializer: (_ptyId, _after, _timeout, signal) =>
+        new Promise<boolean>((resolve) => {
+          signal?.addEventListener('abort', () => resolve(false), { once: true })
+        })
+    })
+
+    await vi.advanceTimersByTimeAsync(100)
+
+    expect(subscription.snapshotText()).toContain('live desktop prompt $ ')
+    expect(subscription.snapshotText()).not.toContain('suffix-only redraw')
+    expect(subscription.runtime.requestRendererTerminalTabMount).not.toHaveBeenCalled()
+    expect(subscription.runtime.waitForRendererTerminalSerializer).not.toHaveBeenCalled()
+    expect(
+      subscription.runtime.replaceHeadlessTerminalFromRendererSnapshotForRecovery
+    ).toHaveBeenCalledWith('pty-1', expect.objectContaining({ data: 'live desktop prompt $ ' }), [])
+    await subscription.close()
+  })
+
+  it('adopts a renderer-ordered screen even while output is pending', async () => {
+    // The screen's seq (4) is an exact seam inside the pending chunk (offsets 3..5), so only `z` replays.
+    const subscription = subscribeMobile({
+      rendererScreen: () => 'ordered desktop prompt $ ',
+      pendingOutput: 'Xz',
+      pendingOutputSeq: 5,
+      waitForRendererTerminalSerializer: (_ptyId, _after, _timeout, signal) =>
+        new Promise<boolean>((resolve) => {
+          signal?.addEventListener('abort', () => resolve(false), { once: true })
+        })
+    })
+
+    await vi.advanceTimersByTimeAsync(100)
+
+    expect(subscription.runtime.requestRendererTerminalTabMount).not.toHaveBeenCalled()
+    expect(subscription.snapshotText()).toContain('ordered desktop prompt $ ')
+    expect(subscription.snapshotText()).not.toContain('restored provider history')
+    expect(
+      subscription.runtime.replaceHeadlessTerminalFromRendererSnapshotForRecovery
+    ).toHaveBeenCalledWith(
+      'pty-1',
+      expect.objectContaining({ data: 'ordered desktop prompt $ ', seq: 4 }),
+      [{ data: 'z', seq: 5 }]
+    )
+    expect(subscription.outputText()).toBe('z')
+    await subscription.close()
+  })
+
+  it('answers at once for a mounted pane whose screen is still empty', async () => {
+    // A fresh shell that has printed nothing: the serializer is registered but its screen is blank.
+    const subscription = subscribeMobile({
+      rendererScreen: () => '',
+      waitForRendererTerminalSerializer: (_ptyId, _after, _timeout, signal) =>
+        new Promise<boolean>((resolve) => {
+          signal?.addEventListener('abort', () => resolve(false), { once: true })
+        })
+    })
+
+    await vi.advanceTimersByTimeAsync(100)
+
+    expect(subscription.runtime.requestRendererTerminalTabMount).not.toHaveBeenCalled()
+    // A blank renderer must not erase history the chosen snapshot already carries.
+    expect(subscription.snapshotText()).toContain('restored provider history')
+    expect(
+      subscription.runtime.replaceHeadlessTerminalFromRendererSnapshotForRecovery
+    ).not.toHaveBeenCalled()
+    await subscription.close()
+  })
+
+  it('answers at once for a mounted pane whose output never settles', async () => {
+    // A desktop agent printing continuously: every renderer serialize races a new byte.
+    let sequence = 4
+    const subscription = subscribeMobile({
+      rendererScreen: () => `agent frame ${sequence}`,
+      outputSequence: () => (sequence += 1),
+      waitForRendererTerminalSerializer: (_ptyId, _after, _timeout, signal) =>
+        new Promise<boolean>((resolve) => {
+          signal?.addEventListener('abort', () => resolve(false), { once: true })
+        })
+    })
+
+    await vi.advanceTimersByTimeAsync(100)
+
+    expect(subscription.runtime.requestRendererTerminalTabMount).not.toHaveBeenCalled()
+    expect(subscription.runtime.waitForRendererTerminalSerializer).not.toHaveBeenCalled()
+    // An unsettled screen has no exact seam against buffered output, so the chosen snapshot goes out.
+    expect(subscription.snapshotText()).toContain('restored provider history')
+    expect(
+      subscription.runtime.replaceHeadlessTerminalFromRendererSnapshotForRecovery
+    ).not.toHaveBeenCalled()
+    await subscription.close()
+  })
+
+  it('keeps the chosen snapshot for a seq-less mounted screen while output is pending', async () => {
+    // Without a seq, the buffered chunk would replay on top of a screen that already holds it.
+    const subscription = subscribeMobile({
+      rendererScreen: () => 'unordered desktop prompt $ ',
+      rendererSeq: null,
+      pendingOutput: 'pending byte',
+      waitForRendererTerminalSerializer: (_ptyId, _after, _timeout, signal) =>
+        new Promise<boolean>((resolve) => {
+          signal?.addEventListener('abort', () => resolve(false), { once: true })
+        })
+    })
+
+    await vi.advanceTimersByTimeAsync(100)
+
+    expect(subscription.runtime.requestRendererTerminalTabMount).not.toHaveBeenCalled()
+    expect(subscription.snapshotText()).toContain('restored provider history')
+    expect(subscription.snapshotText()).not.toContain('unordered desktop prompt $ ')
+    expect(
+      subscription.runtime.replaceHeadlessTerminalFromRendererSnapshotForRecovery
+    ).not.toHaveBeenCalled()
+    await subscription.close()
+  })
+
+  it('adopts a seq-less mounted screen when no output is pending', async () => {
+    // Right after a deferred cold restore the pane is not renderer-ordered yet; nothing can replay twice.
+    const subscription = subscribeMobile({
+      rendererScreen: () => 'unordered desktop prompt $ ',
+      rendererSeq: null,
+      waitForRendererTerminalSerializer: (_ptyId, _after, _timeout, signal) =>
+        new Promise<boolean>((resolve) => {
+          signal?.addEventListener('abort', () => resolve(false), { once: true })
+        })
+    })
+
+    await vi.advanceTimersByTimeAsync(100)
+
+    expect(subscription.runtime.requestRendererTerminalTabMount).not.toHaveBeenCalled()
+    expect(subscription.snapshotText()).toContain('unordered desktop prompt $ ')
+    expect(
+      subscription.runtime.replaceHeadlessTerminalFromRendererSnapshotForRecovery
+    ).toHaveBeenCalledWith(
+      'pty-1',
+      expect.objectContaining({ data: 'unordered desktop prompt $ ' }),
+      []
+    )
+    await subscription.close()
+  })
+
+  it('still requests the mount and waits for its settle when no pane is registered', async () => {
+    let mounted = false
+    const subscription = subscribeMobile({
+      rendererScreen: () => (mounted ? 'mounted idle prompt $ ' : null),
+      waitForRendererTerminalSerializer: (_ptyId, afterGeneration) => {
+        expect(afterGeneration).toBe(1)
+        return new Promise<boolean>((resolve) => {
+          setTimeout(() => {
+            mounted = true
+            resolve(true)
+          }, 500)
+        })
+      }
+    })
+
+    await vi.advanceTimersByTimeAsync(100)
+    expect(subscription.runtime.requestRendererTerminalTabMount).toHaveBeenCalledWith('terminal-1')
+    expect(subscription.snapshotText()).toBe('')
+    // No pane is registered, so nothing may spend a terminal read (which can reach the provider) before the settle.
+    expect(subscription.runtime.readTerminal).toHaveBeenCalledTimes(1)
+
+    await vi.advanceTimersByTimeAsync(400)
+    expect(subscription.snapshotText()).toContain('mounted idle prompt $ ')
+    expect(subscription.snapshotText()).not.toContain('restored provider history')
+    await subscription.close()
+  })
+
+  it('keeps the chosen snapshot after the mount wait when a seq-less screen meets pending output', async () => {
+    let mounted = false
+    const subscription = subscribeMobile({
+      rendererScreen: () => (mounted ? 'unordered mounted prompt $ ' : null),
+      rendererSeq: null,
+      pendingOutput: 'pending byte',
+      waitForRendererTerminalSerializer: () =>
+        new Promise<boolean>((resolve) => {
+          setTimeout(() => {
+            mounted = true
+            resolve(true)
+          }, 500)
+        })
+    })
+
+    await vi.advanceTimersByTimeAsync(500)
+
+    expect(subscription.runtime.requestRendererTerminalTabMount).toHaveBeenCalledWith('terminal-1')
+    expect(subscription.snapshotText()).toContain('restored provider history')
+    expect(
+      subscription.runtime.replaceHeadlessTerminalFromRendererSnapshotForRecovery
+    ).not.toHaveBeenCalled()
+    await subscription.close()
+  })
+
+  it('falls back to the mount wait within one serialize when the flag outlives its pane', async () => {
+    // Nothing clears the flag when a tab closes over a live PTY; the IPC then answers null at its
+    // 750 ms deadline while a busy PTY moves output under every attempt.
+    let sequence = 4
+    const subscription = subscribeMobile({
+      rendererScreen: () => null,
+      rendererAnswerDelayMs: 750,
+      outputSequence: () => (sequence += 1),
+      waitForRendererTerminalSerializer: (_ptyId, _after, _timeout, signal) =>
+        new Promise<boolean>((resolve) => {
+          signal?.addEventListener('abort', () => resolve(false), { once: true })
+        })
+    })
+
+    await vi.advanceTimersByTimeAsync(750)
+    expect(subscription.runtime.requestRendererTerminalTabMount).toHaveBeenCalledWith('terminal-1')
+    await vi.advanceTimersByTimeAsync(2_999)
+    expect(subscription.snapshotText()).toBe('')
+
+    // Worst case: one serialize plus the 3 s mount deadline.
+    await vi.advanceTimersByTimeAsync(1)
+    expect(subscription.snapshotText()).toContain('restored provider history')
+    expect(subscription.runtime.serializeRendererTerminalBuffer).toHaveBeenCalledTimes(1)
+    await subscription.close()
+  })
+})
diff --git a/src/main/runtime/rpc/terminal-subscribe-ownership.test.ts b/src/main/runtime/rpc/terminal-subscribe-ownership.test.ts
index d59287639b6a..fefe8efb28d3 100644
--- a/src/main/runtime/rpc/terminal-subscribe-ownership.test.ts
+++ b/src/main/runtime/rpc/terminal-subscribe-ownership.test.ts
@@ -119,7 +119,7 @@ describe('terminal.subscribe teardown ownership', () => {
     expect(registry.peekCleanup(SUBSCRIPTION_ID)).toBeUndefined()
   })
 
-  it('disposes an already-exited PTY observer before binding socket abort', async () => {
+  it('disposes an already-exited PTY observer and the request-abort listener', async () => {
     const registry = createSubscriptionRegistryDouble()
     const unsubscribeExit = vi.fn()
     const runtime = stubRuntime(registry, [], {
@@ -131,12 +131,14 @@ describe('terminal.subscribe teardown ownership', () => {
     const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_METHODS })
     const conn = new AbortController()
     const addAbort = vi.spyOn(conn.signal, 'addEventListener')
+    const removeAbort = vi.spyOn(conn.signal, 'removeEventListener')
     const options = streamOptions('conn-a', conn.signal)
 
     await dispatcher.dispatchStreaming(makeRequest(binaryParams), vi.fn(), options)
 
     expect(unsubscribeExit).toHaveBeenCalledOnce()
-    expect(addAbort).not.toHaveBeenCalled()
+    expect(addAbort).toHaveBeenCalledOnce()
+    expect(removeAbort).toHaveBeenCalledWith('abort', addAbort.mock.calls[0]![1])
   })
 
   // Why: the synchronous release runs cleanup before setup, so anything registered after it never gets torn down.
diff --git a/src/main/runtime/rpc/ws-transport.test.ts b/src/main/runtime/rpc/ws-transport.test.ts
index f1ac250bdc3c..45798a89528b 100644
--- a/src/main/runtime/rpc/ws-transport.test.ts
+++ b/src/main/runtime/rpc/ws-transport.test.ts
@@ -88,13 +88,6 @@ describe('WebSocketTransport', () => {
     })
   }
 
-  it('starts and stops cleanly', async () => {
-    const { transport } = await createTransport()
-
-    await transport.start()
-    await transport.stop()
-  })
-
   it('arms heartbeat only while accepted connections exist', async () => {
     const { transport } = await createTransport()
     await transport.start()
diff --git a/src/main/runtime/runtime-client-settings-source-control-projection.test.ts b/src/main/runtime/runtime-client-settings-source-control-projection.test.ts
new file mode 100644
index 000000000000..c1868df74bd5
--- /dev/null
+++ b/src/main/runtime/runtime-client-settings-source-control-projection.test.ts
@@ -0,0 +1,53 @@
+import { describe, expect, it } from 'vitest'
+import { RuntimeClientSettingsController } from './runtime-client-settings'
+import { createGlobalSettingsFixture } from '../../shared/global-settings-test-fixture'
+import type { GlobalSettings } from '../../shared/global-settings-types'
+import { getDefaultSourceControlAiSettings } from '../../shared/source-control-ai'
+
+// Why: `settings.get` is an explicit allowlist. A paired client's AI buttons resolve their agent
+// from the saved per-action recipe, and a recipe missing here reads as "none saved" on the client.
+function projectionOf(settings: Partial<GlobalSettings>) {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: get() reads nothing but store.getSettings(); every other RuntimeStore member is unreachable from that path.
+  return new RuntimeClientSettingsController({ getSettings: () => settings } as never).get()
+}
+
+function hostSettings(sourceControlAi: GlobalSettings['sourceControlAi']): Partial<GlobalSettings> {
+  return { ...createGlobalSettingsFixture({ workspaceDir: '/w' }), sourceControlAi }
+}
+
+describe('RuntimeClientSettingsController source control launch recipes', () => {
+  it('publishes the recipe saved for a launch action', () => {
+    const projected = projectionOf(
+      hostSettings({
+        ...getDefaultSourceControlAiSettings(),
+        actions: { fixChecks: { agentId: 'codex', agentArgs: '--fast' } }
+      })
+    )
+    expect(projected.sourceControlAi.actions.fixChecks).toMatchObject({
+      agentId: 'codex',
+      agentArgs: '--fast'
+    })
+  })
+
+  it('publishes a recipe saved under the legacy launch defaults key', () => {
+    const projected = projectionOf(
+      hostSettings({
+        ...getDefaultSourceControlAiSettings(),
+        actions: undefined,
+        launchActionDefaults: { resolveConflicts: { agentId: 'claude' } }
+      })
+    )
+    expect(projected.sourceControlAi.actions.resolveConflicts).toMatchObject({ agentId: 'claude' })
+  })
+
+  it('publishes launch actions only, not the text generation recipes', () => {
+    const projected = projectionOf(hostSettings(getDefaultSourceControlAiSettings()))
+    expect(Object.keys(projected.sourceControlAi.actions).sort()).toEqual([
+      'fixChecks',
+      'fixCommitFailure',
+      'fixPushFailure',
+      'resolveComments',
+      'resolveConflicts'
+    ])
+  })
+})
diff --git a/src/main/runtime/runtime-client-settings.ts b/src/main/runtime/runtime-client-settings.ts
index 76c7e772e5ce..d29b9afea1ee 100644
--- a/src/main/runtime/runtime-client-settings.ts
+++ b/src/main/runtime/runtime-client-settings.ts
@@ -9,6 +9,11 @@ import {
   type TerminalQuickCommandMutation
 } from '../../shared/terminal-quick-commands'
 import { haveSameDisabledTuiAgents } from '../../shared/tui-agent-selection'
+import { normalizeSourceControlAiSettings } from '../../shared/source-control-ai'
+import {
+  SOURCE_CONTROL_LAUNCH_ACTION_IDS,
+  type SourceControlAiActionDefaults
+} from '../../shared/source-control-ai-actions'
 import type { GlobalSettings } from '../../shared/global-settings-types'
 import { applyNativeChatSessionOptionSettingsMutation } from '../../shared/native-chat-session-option-defaults'
 import type { NativeChatSessionOptionSettingsMutation } from '../../shared/native-chat-session-options'
@@ -17,6 +22,7 @@ import type { ExecutionHostId } from '../../shared/execution-host'
 import type { TerminalQuickCommand } from '../../shared/terminal-quick-command-types'
 import { recordManagedHookInstallFailure } from '../agent-hooks/install-telemetry'
 import { applyAgentStatusHooksEnabled } from '../agent-hooks/managed-agent-hook-controls'
+import { isAgentStatusHooksEnabledForAgent } from '../../shared/agent-status-hooks-setting'
 import type { RuntimeStore } from './runtime-store-contract'
 
 export type RuntimeClientSettings = Pick<
@@ -49,8 +55,12 @@ export type RuntimeClientSettings = Pick<
   | 'machineName'
 > & {
   hostSettingOverrides: RuntimeHostDisplayLabelOverrides
+  sourceControlAi: RuntimeClientSourceControlAi
 }
 
+/** The saved per-action launch recipes (agent, prompt template, agent args), already migrated. */
+export type RuntimeClientSourceControlAi = { actions: SourceControlAiActionDefaults }
+
 /** Safe paired projection: host labels only; filesystem defaults stay host-private. */
 export type RuntimeHostDisplayLabelOverrides = Partial<
   Record<ExecutionHostId, { displayLabel: string }>
@@ -127,6 +137,9 @@ export class RuntimeClientSettingsController {
       worktreeVisibilityDefaults: settings.worktreeVisibilityDefaults ?? { external: 'hide' },
       agentSkillSharingEnabled: isAgentSkillSharingEnabled(settings),
       machineName: settings.machineName ?? '',
+      // Why projected: a paired client's AI buttons start these actions' agents, and must honour
+      // the agent saved for each one as the desktop does. Absent on older hosts.
+      sourceControlAi: projectSourceControlLaunchRecipes(settings),
       hostSettingOverrides: Object.fromEntries(
         [
           ...getHostDisplayLabelOverrides({ hostSettingOverrides: settings.hostSettingOverrides })
@@ -221,11 +234,7 @@ export class RuntimeClientSettingsController {
         onInstallError: recordManagedHookInstallFailure,
         shouldContinue: (agent) => {
           const current = this.store?.getSettings()
-          return (
-            current !== undefined &&
-            current.agentStatusHooksEnabled !== false &&
-            !current.disabledTuiAgents?.includes(agent)
-          )
+          return current !== undefined && isAgentStatusHooksEnabledForAgent(current, agent)
         }
       })
     })
@@ -233,3 +242,20 @@ export class RuntimeClientSettingsController {
     return reconciliation
   }
 }
+
+function projectSourceControlLaunchRecipes(
+  settings: Partial<Pick<GlobalSettings, 'sourceControlAi' | 'commitMessageAi'>>
+): RuntimeClientSourceControlAi {
+  const { actions } = normalizeSourceControlAiSettings(
+    settings.sourceControlAi,
+    settings.commitMessageAi
+  )
+  return {
+    actions: Object.fromEntries(
+      SOURCE_CONTROL_LAUNCH_ACTION_IDS.flatMap((actionId) => {
+        const recipe = actions?.[actionId]
+        return recipe ? [[actionId, recipe]] : []
+      })
+    )
+  }
+}
diff --git a/src/main/runtime/runtime-file-commands-search-runtime-files.ts b/src/main/runtime/runtime-file-commands-search-runtime-files.ts
index fd79941c1aea..5a192c4e50d4 100644
--- a/src/main/runtime/runtime-file-commands-search-runtime-files.ts
+++ b/src/main/runtime/runtime-file-commands-search-runtime-files.ts
@@ -13,6 +13,7 @@ import {
   listMarkdownDocuments,
   markdownDocumentsFromRelativePaths
 } from '../ipc/markdown-documents'
+import { getLocalGitOptionsForRegisteredWorktree } from '../ipc/local-worktree-runtime-options'
 import {
   validatePathExistenceBatch,
   type PathExistenceResult
@@ -82,7 +83,14 @@ export class RuntimeFileCommandsWithSearchRuntimeFiles extends RuntimeFileComman
       const relativePaths = await provider.listFiles(target.worktree.path)
       return markdownDocumentsFromRelativePaths(target.worktree.path, relativePaths)
     }
-    return listMarkdownDocuments(target.worktree.path)
+    return listMarkdownDocuments(
+      target.worktree.path,
+      getLocalGitOptionsForRegisteredWorktree(
+        this.host.requireStore(),
+        target.worktree.path,
+        target.worktree.path
+      )
+    )
   }
 
   async pathsExistRuntimeFiles(
diff --git a/src/main/runtime/runtime-file-target-execution-host.test.ts b/src/main/runtime/runtime-file-target-execution-host.test.ts
index d9770b182df1..40729da528cc 100644
--- a/src/main/runtime/runtime-file-target-execution-host.test.ts
+++ b/src/main/runtime/runtime-file-target-execution-host.test.ts
@@ -141,7 +141,7 @@ describe('runtime file target execution host', () => {
     await runtime.listRuntimeMarkdownDocuments(`id:${WORKTREE_ID}`)
 
     expect(m4air.listFiles).not.toHaveBeenCalled()
-    expect(mocks.listMarkdownDocuments).toHaveBeenCalledWith(REMOTE_PATH)
+    expect(mocks.listMarkdownDocuments).toHaveBeenCalledWith(REMOTE_PATH, {})
   })
 
   // A `runtime:` row's `connectionId` names a target in the *server's* namespace. Reading it here
diff --git a/src/main/runtime/runtime-git-generation-admission.test.ts b/src/main/runtime/runtime-git-generation-admission.test.ts
index 6631930082da..8e8391c10f3f 100644
--- a/src/main/runtime/runtime-git-generation-admission.test.ts
+++ b/src/main/runtime/runtime-git-generation-admission.test.ts
@@ -1,3 +1,4 @@
+import { setImmediate as nextTurn } from 'node:timers/promises'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { GlobalSettings } from '../../shared/global-settings-types'
 import type { RuntimeGitCommandHost, RuntimeGitTarget } from './runtime-git-command-target'
@@ -14,13 +15,19 @@ const mocks = vi.hoisted(() => ({
   resolveHostedReviewBodyForGeneration: vi.fn()
 }))
 
+const linkedLookup = vi.hoisted(() => ({ run: (): Promise<null> => Promise.resolve(null) }))
+
 vi.mock('../git/status', () => ({ getStagedCommitContext: mocks.getStagedCommitContext }))
 vi.mock('../git/runner', () => ({ gitExecFileAsync: mocks.gitExecFileAsync }))
 vi.mock('../text-generation/pull-request-context', () => ({
   getPullRequestDraftContext: mocks.getPullRequestDraftContext
 }))
 vi.mock('../source-control/pull-request-linked-issue', () => ({
-  loadPullRequestLinkedIssue: mocks.loadPullRequestLinkedIssue
+  loadPullRequestLinkedIssue: (...args: unknown[]) => {
+    mocks.loadPullRequestLinkedIssue(...args)
+    // A mock return observer would handle the rejection being tested.
+    return linkedLookup.run()
+  }
 }))
 vi.mock('../providers/ssh-git-dispatch', () => ({
   getSshGitProvider: mocks.getSshGitProvider,
@@ -77,7 +84,7 @@ describe('RuntimeGitGenerationCommands admission', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     mocks.gitExecFileAsync.mockResolvedValue({ stdout: '', stderr: '' })
-    mocks.loadPullRequestLinkedIssue.mockResolvedValue(null)
+    linkedLookup.run = () => Promise.resolve(null)
     mocks.resolveHostedReviewBodyForGeneration.mockImplementation(async ({ body }) => body)
     mocks.prepareLocalCommitMessageAgentEnv.mockResolvedValue({ ok: true, env: {} })
     mocks.generateCommitMessageFromContext.mockResolvedValue({ success: true, message: 'feat' })
@@ -167,4 +174,103 @@ describe('RuntimeGitGenerationCommands admission', () => {
       expect.objectContaining({ connectionId: 'conn-1', localGitOptions: {} })
     )
   })
+
+  describe.each(['local', 'SSH'])('linked-issue lifetime on %s', (host) => {
+    function commands(): RuntimeGitGenerationCommands {
+      mocks.getSshGitProvider.mockReturnValue({ exec: vi.fn(), executeCommitMessagePlan: vi.fn() })
+      return makeCommands(
+        makeTarget('/repo', {
+          executionHostId: host === 'SSH' ? 'ssh:conn-1' : 'local'
+        })
+      )
+    }
+
+    const input = { base: 'main', title: '', body: '', draft: false, provider: 'gitlab' as const }
+
+    it.each(['no changes', 'context error', 'template error'])(
+      'observes a late lookup rejection after %s',
+      async (outcome) => {
+        const issue = Promise.withResolvers<null>()
+        linkedLookup.run = () => issue.promise
+        const preparationError = new Error('preparation failed')
+        mocks.getPullRequestDraftContext.mockResolvedValue(pullRequestContext)
+        if (outcome === 'no changes') {
+          mocks.getPullRequestDraftContext.mockResolvedValue(null)
+        } else if (outcome === 'context error') {
+          mocks.getPullRequestDraftContext.mockRejectedValue(preparationError)
+        } else {
+          mocks.resolveHostedReviewBodyForGeneration.mockRejectedValue(preparationError)
+        }
+        const unhandled = vi.fn()
+        process.on('unhandledRejection', unhandled)
+        try {
+          await expect(
+            commands().generateRuntimePullRequestFields('id:wt-1', input, settingsOverride)
+          ).resolves.toEqual({
+            success: false,
+            error:
+              outcome === 'no changes'
+                ? 'No branch changes to summarize.'
+                : preparationError.message
+          })
+          expect(mocks.loadPullRequestLinkedIssue).toHaveBeenCalledOnce()
+          issue.reject(new Error('Timed out waiting for a GitLab operation slot.'))
+          await nextTurn()
+          expect(unhandled).not.toHaveBeenCalled()
+          expect(mocks.generatePullRequestFieldsFromContext).not.toHaveBeenCalled()
+        } finally {
+          issue.resolve(null)
+          void issue.promise.catch(() => undefined)
+          process.off('unhandledRejection', unhandled)
+        }
+      }
+    )
+
+    it('observes rejection during preparation and preserves the later caller error', async () => {
+      const issue = Promise.withResolvers<null>()
+      const preparation = Promise.withResolvers<typeof pullRequestContext>()
+      const failure = new Error('lookup admission failed')
+      linkedLookup.run = () => issue.promise
+      mocks.getPullRequestDraftContext.mockReturnValue(preparation.promise)
+      const unhandled = vi.fn()
+      process.on('unhandledRejection', unhandled)
+      const result = commands()
+        .generateRuntimePullRequestFields('id:wt-1', input, settingsOverride)
+        .catch((error: unknown) => error)
+      try {
+        await nextTurn()
+        expect(mocks.getPullRequestDraftContext).toHaveBeenCalledOnce()
+        issue.reject(failure)
+        await nextTurn()
+        expect(unhandled).not.toHaveBeenCalled()
+        preparation.resolve(pullRequestContext)
+        expect(await result).toBe(failure)
+        expect(mocks.generatePullRequestFieldsFromContext).not.toHaveBeenCalled()
+      } finally {
+        issue.resolve(null)
+        preparation.resolve(pullRequestContext)
+        await result
+        process.off('unhandledRejection', unhandled)
+      }
+    })
+
+    it('still rejects the caller after successful preparation when the lookup fails', async () => {
+      const issue = Promise.withResolvers<null>()
+      const failure = new Error('lookup failed')
+      linkedLookup.run = () => issue.promise
+      mocks.getPullRequestDraftContext.mockResolvedValue(pullRequestContext)
+      const result = commands()
+        .generateRuntimePullRequestFields('id:wt-1', input, settingsOverride)
+        .catch((error: unknown) => error)
+      try {
+        await nextTurn()
+        issue.reject(failure)
+        expect(await result).toBe(failure)
+        expect(mocks.generatePullRequestFieldsFromContext).not.toHaveBeenCalled()
+      } finally {
+        issue.resolve(null)
+        await result
+      }
+    })
+  })
 })
diff --git a/src/main/runtime/runtime-git-generation-commands.ts b/src/main/runtime/runtime-git-generation-commands.ts
index bea10b2ef7d5..988e2ee096fe 100644
--- a/src/main/runtime/runtime-git-generation-commands.ts
+++ b/src/main/runtime/runtime-git-generation-commands.ts
@@ -182,6 +182,7 @@ export class RuntimeGitGenerationCommands {
               admissionTier: 'interactive'
             }
     })
+    void linkedIssueDetailsPromise.catch(() => undefined)
     let context: Awaited<ReturnType<typeof getPullRequestDraftContext>>
     try {
       const currentBody = await resolveHostedReviewBodyForGeneration({
diff --git a/src/main/runtime/runtime-managed-worktree-create-types.ts b/src/main/runtime/runtime-managed-worktree-create-types.ts
index 69099ca89bfa..ea20c3e6d0f3 100644
--- a/src/main/runtime/runtime-managed-worktree-create-types.ts
+++ b/src/main/runtime/runtime-managed-worktree-create-types.ts
@@ -56,6 +56,7 @@ export type RuntimeManagedWorktreeCreateArgs = {
   /** Per-launch inputs used when `startupAgent` is the created terminal surface. */
   startupAgentArgs?: string | null
   startupCwd?: string
+  /** The surface behind a host-built startup agent (`startupAgent` or `startupDraft`). */
   startupLaunchSource?: string
   /** A caller-minted `tabId:leafId` for the startup terminal's pane. */
   startupPaneKey?: string
diff --git a/src/main/runtime/runtime-notifier-contract.ts b/src/main/runtime/runtime-notifier-contract.ts
index 9cdc365e1ba9..fa87d839cd5c 100644
--- a/src/main/runtime/runtime-notifier-contract.ts
+++ b/src/main/runtime/runtime-notifier-contract.ts
@@ -117,7 +117,10 @@ export type RuntimeNotifier = {
     baseVersion: string,
     content: string
   ): Promise<RuntimeMarkdownSaveTabResult>
-  closeTerminal(tabId: string, paneRuntimeId?: number): void
+  /** Closes the whole tab. */
+  closeTerminal(tabId: string): void
+  /** Drops one split pane main already closed; never closes its tab. */
+  closeTerminalPane?(tabId: string, leafId: string): void
   closeTerminalTab?(
     tabId: string,
     options?: { localPtyTeardownOwnedExternally?: boolean; force?: boolean }
diff --git a/src/main/runtime/runtime-pty-controller-contract.ts b/src/main/runtime/runtime-pty-controller-contract.ts
index bb23548ae6f5..60c1e18cf10a 100644
--- a/src/main/runtime/runtime-pty-controller-contract.ts
+++ b/src/main/runtime/runtime-pty-controller-contract.ts
@@ -12,6 +12,7 @@ import type { ExecutionHostId } from '../../shared/execution-host'
 import type { PtyProviderBufferSnapshot, PtyProcessInfo, PtySpawnResult } from '../providers/types'
 import type { PtyProcessInspection } from '../providers/pty-process-inspection'
 import type { WriteSettlement } from '../../shared/pty-write-settlement'
+import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 
 export type RuntimePtyController = {
   claimStablePaneCreate?(args: {
@@ -93,9 +94,13 @@ export type RuntimePtyController = {
     stablePaneOwner?: { handle: string; tabId: string; leafId: string }
     agentSessionEnsure?: AgentSessionClaimedSpawnResult
   }>
-  write(ptyId: string, data: string): boolean
+  write(ptyId: string, data: string, inputKind: TerminalInputKind): boolean
   /** Three-valued settlement; local providers settle synchronously. */
-  writeWithSettlement?(ptyId: string, data: string): WriteSettlement | Promise<WriteSettlement>
+  writeWithSettlement?(
+    ptyId: string,
+    data: string,
+    inputKind: TerminalInputKind
+  ): WriteSettlement | Promise<WriteSettlement>
   /** Attach-only adoption of a live local daemon session so its output streams
    *  to main without a renderer pane; never creates, resizes, or focuses.
    *  False on doubt (absent session, SSH-scoped id, non-daemon provider). */
@@ -106,7 +111,9 @@ export type RuntimePtyController = {
     ptyId: string,
     opts?: { keepHistory?: boolean; deadlineMs?: number }
   ): Promise<boolean>
-  markReversibleStops?(ptyIds: readonly string[]): () => void
+  /** Durably records a kill order for an explicit close's unconfirmed stop, replayed when its SSH
+   *  host reconnects. True only when an order was written; local PTYs have no later host to ask. */
+  recordUnconfirmedStop?(ptyId: string): boolean
   getCwd?(ptyId: string): Promise<string | null>
   getForegroundProcess(ptyId: string): Promise<string | null>
   inspectProcess?(
@@ -117,6 +124,7 @@ export type RuntimePtyController = {
   confirmShellForeground?(ptyId: string): Promise<boolean>
   hasChildProcesses?(ptyId: string): Promise<boolean>
   clearBuffer?(ptyId: string): Promise<void>
+  resetInputModes?(ptyId: string): Promise<void>
   resize?(ptyId: string, cols: number, rows: number): boolean
   // Why: exact-id mobile polls should not enumerate every local and SSH PTY.
   hasPty?(ptyId: string): boolean | null
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-mobile-method-allowlist.ts b/src/main/runtime/runtime-rpc/runtime-rpc-mobile-method-allowlist.ts
index ce67fb94aff7..a543a8da45d0 100644
--- a/src/main/runtime/runtime-rpc/runtime-rpc-mobile-method-allowlist.ts
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-mobile-method-allowlist.ts
@@ -230,6 +230,8 @@ export const MOBILE_RPC_METHOD_ALLOWLIST = new Set([
   'agentSession.history',
   'agentSession.subscribe',
   'agentSession.unsubscribe',
+  // No-ops on a current host; kept until MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION passes the
+  // mobile builds that still call them.
   'agentSession.hold',
   'agentSession.release',
   'nativeChat.readSession',
diff --git a/src/main/runtime/runtime-service-command-surface.ts b/src/main/runtime/runtime-service-command-surface.ts
index 27a5ebdbdf9d..82b3204da522 100644
--- a/src/main/runtime/runtime-service-command-surface.ts
+++ b/src/main/runtime/runtime-service-command-surface.ts
@@ -26,6 +26,7 @@ export type RuntimeServiceCommandSurface = {
   cleanupSubscriptionsForConnection: RuntimeSubscriptionRegistry['cleanupForConnection']
   cleanupSubscriptionIfOwnedByConnection: RuntimeSubscriptionRegistry['cleanupIfOwnedByConnection']
   getSubscriptionRegistrationVersion: RuntimeSubscriptionRegistry['getRegistrationVersion']
+  releaseSubscriptionByRequest: RuntimeSubscriptionRegistry['releaseByRequest']
   onNotificationDispatched: RuntimeMobileNotificationController['onDispatched']
   getMobileNotificationListenerCount: RuntimeMobileNotificationController['getListenerCount']
   dispatchMobileNotification: RuntimeMobileNotificationController['dispatch']
@@ -116,6 +117,7 @@ export function installRuntimeServiceCommandSurface(
     cleanupSubscriptionIfOwnedByConnection:
       subscriptions.cleanupIfOwnedByConnection.bind(subscriptions),
     getSubscriptionRegistrationVersion: subscriptions.getRegistrationVersion.bind(subscriptions),
+    releaseSubscriptionByRequest: subscriptions.releaseByRequest.bind(subscriptions),
     onNotificationDispatched: notifications.onDispatched.bind(notifications),
     getMobileNotificationListenerCount: notifications.getListenerCount.bind(notifications),
     dispatchMobileNotification: notifications.dispatch.bind(notifications),
diff --git a/src/main/runtime/runtime-store-contract.ts b/src/main/runtime/runtime-store-contract.ts
index b7dbbd089702..cacaa2aa397c 100644
--- a/src/main/runtime/runtime-store-contract.ts
+++ b/src/main/runtime/runtime-store-contract.ts
@@ -126,6 +126,8 @@ export type RuntimeStore = {
     nativeChatInheritShellEnvironment?: GlobalSettings['nativeChatInheritShellEnvironment']
     nativeChatShellEnvironmentVariables?: GlobalSettings['nativeChatShellEnvironmentVariables']
     aiVaultSearch?: GlobalSettings['aiVaultSearch']
+    sourceControlAi?: GlobalSettings['sourceControlAi']
+    commitMessageAi?: GlobalSettings['commitMessageAi']
   }
   // Why: narrow to `unknown` return so test mocks can return void without
   // a cast. The runtime never reads the return value — the persisted value
diff --git a/src/main/runtime/runtime-subscription-registry.test.ts b/src/main/runtime/runtime-subscription-registry.test.ts
index 093b855d483d..0d3a3e3f4d8a 100644
--- a/src/main/runtime/runtime-subscription-registry.test.ts
+++ b/src/main/runtime/runtime-subscription-registry.test.ts
@@ -123,3 +123,106 @@ describe('subscription registration versions', () => {
     expect(cleanup).toHaveBeenCalledTimes(2)
   })
 })
+
+describe('request-addressed release', () => {
+  const requestAddresses = (registry: RuntimeSubscriptionRegistry): number =>
+    registry['subscriptionsByRequest'].size
+  // Never `cleanupAndWait` here: it would run the cleanup itself and hide a missed release.
+  const settle = (): Promise<void> => new Promise((resolve) => setTimeout(resolve, 0))
+
+  it('releases the registration a request created, and forgets the address', async () => {
+    const registry = new RuntimeSubscriptionRegistry()
+    const cleanup = vi.fn()
+    registry.registerOwned('terminal:slot', cleanup, 'conn-a', 'req-1')
+    expect(requestAddresses(registry)).toBe(1)
+
+    registry.releaseByRequest('conn-a', 'req-1')
+    await settle()
+
+    expect(cleanup).toHaveBeenCalledOnce()
+    expect(requestAddresses(registry)).toBe(0)
+  })
+
+  it('ignores the request a same-slot replacement superseded', async () => {
+    const registry = new RuntimeSubscriptionRegistry()
+    const replacement = vi.fn()
+    registry.registerOwned('terminal:slot', vi.fn(), 'conn-a', 'req-old')
+    registry.registerOwned('terminal:slot', replacement, 'conn-a', 'req-new')
+    expect(requestAddresses(registry)).toBe(1)
+
+    registry.releaseByRequest('conn-a', 'req-old')
+    await settle()
+    expect(replacement).not.toHaveBeenCalled()
+
+    registry.releaseByRequest('conn-a', 'req-new')
+    await settle()
+    expect(replacement).toHaveBeenCalledOnce()
+  })
+
+  it('does not grow across replace and release cycles', async () => {
+    const registry = new RuntimeSubscriptionRegistry()
+    const cleanup = vi.fn()
+    for (let i = 0; i < 50; i++) {
+      registry.registerOwned('terminal:slot', cleanup, 'conn-a', `req-${2 * i}`)
+      registry.registerOwned('terminal:slot', cleanup, 'conn-a', `req-${2 * i + 1}`)
+      expect(requestAddresses(registry)).toBe(1)
+      registry.releaseByRequest('conn-a', `req-${2 * i + 1}`)
+      await settle()
+    }
+    expect(cleanup).toHaveBeenCalledTimes(100)
+    expect(requestAddresses(registry)).toBe(0)
+  })
+
+  it('keeps the newer owner when a reused request id outlives the old release', async () => {
+    const registry = new RuntimeSubscriptionRegistry()
+    const gate = Promise.withResolvers<void>()
+    const newer = vi.fn()
+    // IPC aborts a subscription and reuses its id before the old teardown settles.
+    const old = registry.registerOwned('terminal:old', () => gate.promise, 'ipc', 'sub-1')
+    old.releaseIfCurrent()
+    registry.registerOwned('terminal:new', newer, 'ipc', 'sub-1')
+    gate.resolve()
+    await settle()
+
+    registry.releaseByRequest('ipc', 'sub-1')
+    await settle()
+    expect(newer).toHaveBeenCalledOnce()
+    expect(requestAddresses(registry)).toBe(0)
+  })
+
+  it('keeps the address of a registration whose cleanup failed, so a retry still reaches it', async () => {
+    const registry = new RuntimeSubscriptionRegistry()
+    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {})
+    const cleanup = vi.fn().mockRejectedValueOnce(new Error('teardown failed'))
+    registry.registerOwned('terminal:slot', cleanup, 'conn-a', 'req-1')
+
+    registry.releaseByRequest('conn-a', 'req-1')
+    await settle()
+    expect(cleanup).toHaveBeenCalledOnce()
+    expect(requestAddresses(registry)).toBe(1)
+
+    registry.releaseByRequest('conn-a', 'req-1')
+    await settle()
+    expect(cleanup).toHaveBeenCalledTimes(2)
+    expect(requestAddresses(registry)).toBe(0)
+    consoleError.mockRestore()
+  })
+
+  it('addresses nothing without both a connection and a request id', async () => {
+    const registry = new RuntimeSubscriptionRegistry()
+    const unaddressed = vi.fn()
+    const addressed = vi.fn()
+    registry.registerOwned('terminal:no-conn', unaddressed, undefined, 'req-1')
+    registry.registerOwned('terminal:no-req', vi.fn(), 'conn-a')
+    registry.registerOwned('terminal:addressed', addressed, 'conn-a', 'req-1')
+    expect(requestAddresses(registry)).toBe(1)
+
+    registry.releaseByRequest(undefined, 'req-1')
+    registry.releaseByRequest('conn-b', 'req-1')
+    await settle()
+
+    expect(unaddressed).not.toHaveBeenCalled()
+    expect(addressed).not.toHaveBeenCalled()
+    await registry.cleanupAndWait('terminal:addressed')
+  })
+})
diff --git a/src/main/runtime/runtime-subscription-registry.ts b/src/main/runtime/runtime-subscription-registry.ts
index 93e046196186..eaa41dba1aff 100644
--- a/src/main/runtime/runtime-subscription-registry.ts
+++ b/src/main/runtime/runtime-subscription-registry.ts
@@ -1,6 +1,15 @@
 type SubscriptionCleanup = () => void | Promise<void>
 
-type SubscriptionEntry = { cleanup: SubscriptionCleanup; version: number }
+type RequestAddress = { connectionId: string; requestId: string }
+
+const requestKey = ({ connectionId, requestId }: RequestAddress): string =>
+  JSON.stringify([connectionId, requestId])
+
+type SubscriptionEntry = {
+  cleanup: SubscriptionCleanup
+  version: number
+  request?: RequestAddress
+}
 
 export type SubscriptionRegistration = {
   releaseIfCurrent(): void
@@ -14,19 +23,35 @@ export class RuntimeSubscriptionRegistry {
   >()
   private readonly subscriptionsByConnection = new Map<string, Set<string>>()
   private readonly connectionBySubscription = new Map<string, string>()
+  private readonly subscriptionsByRequest = new Map<
+    string,
+    { subscriptionId: string; version: number }
+  >()
   private registrationVersion = 0
 
   getRegistrationVersion(): number {
     return this.registrationVersion
   }
 
-  register(subscriptionId: string, cleanup: SubscriptionCleanup, connectionId?: string): void {
+  register(
+    subscriptionId: string,
+    cleanup: SubscriptionCleanup,
+    connectionId?: string,
+    requestId?: string
+  ): void {
     const existing = this.cleanups.get(subscriptionId)
     if (existing) {
       this.removeConnectionIndex(subscriptionId)
+      this.removeRequestIndex(existing)
       this.cleanup(subscriptionId)
     }
-    this.cleanups.set(subscriptionId, { cleanup, version: ++this.registrationVersion })
+    const version = ++this.registrationVersion
+    const request = connectionId && requestId ? { connectionId, requestId } : undefined
+    this.cleanups.set(subscriptionId, { cleanup, version, request })
+    if (request) {
+      // Why: IPC reuses a request id after aborting its previous subscription, so the newer one owns the address.
+      this.subscriptionsByRequest.set(requestKey(request), { subscriptionId, version })
+    }
     if (!connectionId) {
       return
     }
@@ -42,13 +67,26 @@ export class RuntimeSubscriptionRegistry {
   registerOwned(
     subscriptionId: string,
     cleanup: SubscriptionCleanup,
-    connectionId?: string
+    connectionId?: string,
+    requestId?: string
   ): SubscriptionRegistration {
-    this.register(subscriptionId, cleanup, connectionId)
+    this.register(subscriptionId, cleanup, connectionId, requestId)
     const version = this.registrationVersion
     return { releaseIfCurrent: () => this.cleanupOwned(subscriptionId, version) }
   }
 
+  /** Releases the registration a request created; an unknown, ended or replaced request is a no-op. */
+  releaseByRequest(connectionId: string | undefined, requestId: string): void {
+    // Why: some non-phone sockets carry no connection id, and a bare request id is not unique across sockets.
+    if (!connectionId) {
+      return
+    }
+    const target = this.subscriptionsByRequest.get(requestKey({ connectionId, requestId }))
+    if (target) {
+      this.cleanupOwned(target.subscriptionId, target.version)
+    }
+  }
+
   cleanupIfOwnedByConnection(
     subscriptionId: string,
     connectionId?: string,
@@ -121,6 +159,7 @@ export class RuntimeSubscriptionRegistry {
         }
         this.cleanups.delete(subscriptionId)
         this.removeConnectionIndex(subscriptionId)
+        this.removeRequestIndex(entry)
       })
       .finally(() => {
         if (this.cleanupPromises.get(subscriptionId)?.promise === promise) {
@@ -131,8 +170,13 @@ export class RuntimeSubscriptionRegistry {
     return promise
   }
 
-  cleanupByPrefix(prefix: string): void {
-    const ids = Array.from(this.cleanups.keys()).filter((id) => id.startsWith(prefix))
+  cleanupByPrefix(prefix: string, throughVersion?: number): void {
+    const ids = Array.from(this.cleanups.entries())
+      .filter(
+        ([id, entry]) =>
+          id.startsWith(prefix) && (throughVersion === undefined || entry.version <= throughVersion)
+      )
+      .map(([id]) => id)
     for (const id of ids) {
       this.cleanup(id)
     }
@@ -162,6 +206,17 @@ export class RuntimeSubscriptionRegistry {
     this.cleanup(subscriptionId)
   }
 
+  /** Compare-and-delete: a newer registration that reused the request id keeps its address. */
+  private removeRequestIndex(entry: SubscriptionEntry): void {
+    if (!entry.request) {
+      return
+    }
+    const key = requestKey(entry.request)
+    if (this.subscriptionsByRequest.get(key)?.version === entry.version) {
+      this.subscriptionsByRequest.delete(key)
+    }
+  }
+
   private removeConnectionIndex(subscriptionId: string): void {
     const connectionId = this.connectionBySubscription.get(subscriptionId)
     if (!connectionId) {
diff --git a/src/main/runtime/runtime-terminal-contracts.ts b/src/main/runtime/runtime-terminal-contracts.ts
index 5ee2cc8e7fcd..e08fffa273cf 100644
--- a/src/main/runtime/runtime-terminal-contracts.ts
+++ b/src/main/runtime/runtime-terminal-contracts.ts
@@ -16,6 +16,7 @@ import type { TuiAgent } from '../../shared/tui-agent'
 import type { WorktreeStartupLaunch } from '../../shared/worktree/launch-types'
 import type { RuntimeTerminalSend } from '../../shared/runtime-terminal-contracts'
 import type { RuntimeTerminalWriteOptions } from './runtime-terminal-writer'
+import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 import type { RuntimePtyController } from './runtime-pty-controller-contract'
 import type { RuntimeAgentRowSnapshot } from './runtime-worktree-agent-rows'
 import type { WorkerTerminalHostScope } from './orchestration/worker-terminal-process-liveness'
@@ -61,6 +62,9 @@ export type TerminalCreateOptions = {
   viewMode?: 'terminal' | 'chat'
   startupCommandDelivery?: WorktreeStartupLaunch['startupCommandDelivery']
   telemetry?: WorktreeStartupLaunch['telemetry']
+  /** The surface that asked for this `startupAgent` launch; the runtime attributes every one it
+   *  builds, as `unknown` when this is absent or unrecognized. Ignored without `startupAgent`. */
+  launchSource?: string
   title?: string
   focus?: boolean
   rendererBacked?: boolean
@@ -79,6 +83,8 @@ export type TerminalCreateOptions = {
   agentSessionCreateOperationId?: string
   signal?: AbortSignal
   onPtySpawnCommitted?: () => void
+  /** Called before the spawn request leaves this process; a throw before it proves nothing spawned. */
+  onPtySpawnDispatched?: () => void
   deferMobileSessionPublish?: boolean
 }
 
@@ -201,7 +207,9 @@ export type RuntimeProviderSnapshotReadOptions = {
 }
 
 /** Agent-prompt writes add the correlation inputs a queued-acceptance receipt needs. */
-export type RuntimeAgentPromptWriteOptions = RuntimeTerminalWriteOptions & {
+export type RuntimeAgentPromptWriteOptions = Omit<RuntimeTerminalWriteOptions, 'inputKind'> & {
+  /** `launch` for the prompt an agent starts with; `driving` for any prompt sent to a running one. */
+  inputKind: Exclude<TerminalInputKind, 'query-reply'>
   /** Raw prompt text for submit scheduling; not written, only used for line-aware delays. */
   promptForSchedule?: string
   /** See buildAgentPromptPasteBytes. */
diff --git a/src/main/runtime/runtime-terminal-idle-polls.test.ts b/src/main/runtime/runtime-terminal-idle-polls.test.ts
index 99622ce42df6..5149c63da223 100644
--- a/src/main/runtime/runtime-terminal-idle-polls.test.ts
+++ b/src/main/runtime/runtime-terminal-idle-polls.test.ts
@@ -3,6 +3,8 @@ import { RuntimeTerminalIdlePolls } from './runtime-terminal-idle-polls'
 import type { TerminalWaiter } from './runtime-terminal-contracts'
 import type { RuntimeLeafRecord, RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
 import type { RuntimeTerminalWait } from '../../shared/runtime-types'
+import type { TuiAgent } from '../../shared/tui-agent'
+import { TUI_AGENT_CONFIG } from '../../shared/tui-agent-config'
 
 const INTERVAL_MS = 2000
 
@@ -70,9 +72,12 @@ describe('RuntimeTerminalIdlePolls timer budget', () => {
       quiescenceMs: 1500,
       getTabTitle: () => null,
       getForegroundProcess: () => null,
+      hasCommandPainted: () => true,
       getAdoptedPtyIdleStatus: () => null,
       getPaneAgent: () => null,
       getFirstPartyAgentStatus: () => null,
+      readScreenLines: () => null,
+      readVisibleScreen: () => null,
       getLiveLeaf: (leaf) => leaf,
       resolve: (waiter, result) => resolved.push({ handle: waiter.handle, result })
     })
@@ -105,9 +110,12 @@ describe('RuntimeTerminalIdlePolls timer budget', () => {
       quiescenceMs: 1500,
       getTabTitle: () => null,
       getForegroundProcess: () => null,
+      hasCommandPainted: () => true,
       getAdoptedPtyIdleStatus: () => null,
       getPaneAgent: () => null,
       getFirstPartyAgentStatus: () => null,
+      readScreenLines: () => null,
+      readVisibleScreen: () => null,
       getLiveLeaf: (leaf) => leaf,
       resolve: () => {}
     })
@@ -130,9 +138,12 @@ describe('RuntimeTerminalIdlePolls timer budget', () => {
       quiescenceMs: 1500,
       getTabTitle: () => null,
       getForegroundProcess: () => null,
+      hasCommandPainted: () => true,
       getAdoptedPtyIdleStatus: () => null,
       getPaneAgent: () => null,
       getFirstPartyAgentStatus: () => null,
+      readScreenLines: () => null,
+      readVisibleScreen: () => null,
       getLiveLeaf: (leaf) => leaf,
       resolve: () => {}
     })
@@ -160,9 +171,12 @@ describe('RuntimeTerminalIdlePolls timer budget', () => {
         new Promise<string | null>((resolve) => {
           gates.push(resolve)
         }),
+      hasCommandPainted: () => true,
       getAdoptedPtyIdleStatus: () => null,
       getPaneAgent: () => null,
       getFirstPartyAgentStatus: () => null,
+      readScreenLines: () => null,
+      readVisibleScreen: () => null,
       getLiveLeaf: (leaf) => leaf,
       resolve: (waiter) => resolved.push(waiter.handle)
     })
@@ -185,3 +199,238 @@ describe('RuntimeTerminalIdlePolls timer budget', () => {
     expect(polls.activeTimerCount).toBe(0)
   })
 })
+
+describe('RuntimeTerminalIdlePolls rendered-screen blocked prompts', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  const TRUST_SCREEN = [
+    'Accessing workspace:',
+    '/repo/app',
+    'Quick safety check: Is this a project you created or one you trust?',
+    '❯ No, exit',
+    '  Yes, I trust this folder',
+    'Enter to confirm · Esc to cancel'
+  ].join('\n')
+
+  function createPolls(
+    readVisibleScreen: (ptyId: string) => Promise<string | null> | null,
+    resolved: RuntimeTerminalWait[],
+    foreground: string | null = 'claude',
+    agent: TuiAgent | null = null
+  ): RuntimeTerminalIdlePolls {
+    return new RuntimeTerminalIdlePolls({
+      intervalMs: INTERVAL_MS,
+      quiescenceMs: 1500,
+      getTabTitle: () => null,
+      // Unknown agent + quiet pane: without the screen check this would settle idle.
+      getForegroundProcess: () => (foreground ? Promise.resolve(foreground) : null),
+      hasCommandPainted: () => true,
+      getAdoptedPtyIdleStatus: () => null,
+      getPaneAgent: () => agent,
+      getFirstPartyAgentStatus: () => null,
+      readScreenLines: () => null,
+      readVisibleScreen,
+      getLiveLeaf: (leaf) => leaf,
+      resolve: (_waiter, result) => resolved.push(result)
+    })
+  }
+
+  it('reports a dialog the tail lost but the screen still shows, ahead of a quiet-pane idle', async () => {
+    const resolved: RuntimeTerminalWait[] = []
+    const polls = createPolls(() => Promise.resolve(TRUST_SCREEN), resolved)
+    polls.startPty(makeWaiter('pty'), makePty('pty-1', { lastOutputAt: Date.now() - 10_000 }))
+    polls.startLeaf(makeWaiter('leaf'), makeLeaf('tab-1', { lastOutputAt: Date.now() - 10_000 }))
+
+    await vi.advanceTimersByTimeAsync(INTERVAL_MS)
+
+    expect(resolved).toHaveLength(2)
+    expect(resolved).toEqual([
+      expect.objectContaining({ satisfied: false, blockedReason: 'agent-trust-workspace' }),
+      expect.objectContaining({ satisfied: false, blockedReason: 'agent-trust-workspace' })
+    ])
+    expect(polls.activeTimerCount).toBe(0)
+  })
+
+  it('does not read the screen of an agent whose title says it is working', async () => {
+    const resolved: RuntimeTerminalWait[] = []
+    const reads: string[] = []
+    const polls = createPolls((ptyId) => {
+      reads.push(ptyId)
+      return Promise.resolve(TRUST_SCREEN)
+    }, resolved)
+    polls.startPty(makeWaiter('pty'), makePty('pty-1', { lastAgentStatus: 'working' }))
+    polls.startLeaf(makeWaiter('leaf'), makeLeaf('tab-1', { lastAgentStatus: 'working' }))
+
+    await vi.advanceTimersByTimeAsync(INTERVAL_MS * 3)
+
+    expect(reads).toEqual([])
+    expect(resolved).toEqual([])
+    expect(polls.activeTimerCount).toBe(1)
+  })
+
+  it('does not resolve a waiter that was cancelled while its screen read was pending', async () => {
+    const resolved: RuntimeTerminalWait[] = []
+    const finishRead = new Map<string, (screen: string) => void>()
+    const reads: string[] = []
+    const polls = createPolls(
+      (ptyId) => {
+        reads.push(ptyId)
+        return new Promise<string>((resolve) => {
+          finishRead.set(ptyId, resolve)
+        })
+      },
+      resolved,
+      null
+    )
+    const waiter = makeWaiter('pty')
+    polls.startPty(waiter, makePty('pty-1'))
+    polls.startPty(makeWaiter('other'), makePty('pty-2'))
+
+    await vi.advanceTimersByTimeAsync(INTERVAL_MS * 2)
+    // One read per waiter: the second sweep must not stack reads behind a pending one.
+    expect(reads).toEqual(['pty-1', 'pty-2'])
+
+    waiter.cancelIdlePoll?.()
+    finishRead.get('pty-1')?.(TRUST_SCREEN)
+    await vi.advanceTimersByTimeAsync(0)
+    expect(resolved).toEqual([])
+  })
+
+  // Why: a name-only title is the only rest signal these agents emit, but it cannot see a
+  // dialog the tail lost, so it settles only once the screen read comes back clear.
+  it.each(['grok', 'copilot', 'aider'] as const)(
+    "settles %s's name-only title only after its screen read",
+    async (agent) => {
+      const resolved: RuntimeTerminalWait[] = []
+      const screens: ((screen: string) => void)[] = []
+      const polls = createPolls(
+        () => new Promise<string>((resolve) => screens.push(resolve)),
+        resolved,
+        null,
+        agent
+      )
+      const pty = makePty('pty-1', { lastAgentStatus: 'idle', lastOscTitle: agent })
+      polls.startPty(makeWaiter('pty'), pty, { kind: 'ready-weak' })
+
+      await vi.advanceTimersByTimeAsync(0)
+      expect(screens).toHaveLength(1)
+      expect(resolved).toEqual([])
+
+      screens[0](`${agent} ready for input`)
+      await vi.advanceTimersByTimeAsync(0)
+      expect(resolved).toEqual([expect.objectContaining({ satisfied: true })])
+    }
+  )
+
+  it('reports a dialog on screen under a name-only title instead of settling ready', async () => {
+    const resolved: RuntimeTerminalWait[] = []
+    const polls = createPolls(() => Promise.resolve(TRUST_SCREEN), resolved, null, 'grok')
+    const pty = makePty('pty-1', { lastAgentStatus: 'idle', lastOscTitle: 'grok' })
+    polls.startPty(makeWaiter('pty'), pty, { kind: 'ready-weak' })
+
+    await vi.advanceTimersByTimeAsync(0)
+    expect(resolved).toEqual([
+      expect.objectContaining({ satisfied: false, blockedReason: 'agent-trust-workspace' })
+    ])
+  })
+
+  it("lets an agent's own idle title outrank dialog wording on its screen", async () => {
+    const resolved: RuntimeTerminalWait[] = []
+    const reads: string[] = []
+    const polls = createPolls(
+      (ptyId) => {
+        reads.push(ptyId)
+        return Promise.resolve(TRUST_SCREEN)
+      },
+      resolved,
+      null,
+      'claude'
+    )
+    const pty = makePty('pty-1', { lastAgentStatus: 'idle', lastOscTitle: '✳ Claude Code' })
+    polls.startPty(makeWaiter('pty'), pty)
+
+    await vi.advanceTimersByTimeAsync(INTERVAL_MS)
+    expect(reads).toEqual([])
+    expect(resolved).toEqual([expect.objectContaining({ satisfied: true })])
+  })
+})
+
+describe('RuntimeTerminalIdlePolls quiet foreground for a launched agent', () => {
+  const QUIESCENCE_MS = 1500
+
+  beforeEach(() => {
+    vi.useFakeTimers()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  function createPolls(
+    agent: TuiAgent,
+    resolved: string[],
+    foregroundReads: string[] = []
+  ): RuntimeTerminalIdlePolls {
+    return new RuntimeTerminalIdlePolls({
+      intervalMs: INTERVAL_MS,
+      quiescenceMs: QUIESCENCE_MS,
+      getTabTitle: () => null,
+      getForegroundProcess: (ptyId) => {
+        foregroundReads.push(ptyId)
+        return Promise.resolve(TUI_AGENT_CONFIG[agent].expectedProcess)
+      },
+      hasCommandPainted: () => true,
+      getAdoptedPtyIdleStatus: () => null,
+      getPaneAgent: () => agent,
+      getFirstPartyAgentStatus: () => null,
+      readScreenLines: () => null,
+      readVisibleScreen: () => null,
+      getLiveLeaf: (leaf) => leaf,
+      resolve: (waiter) => resolved.push(waiter.handle)
+    })
+  }
+
+  // Why: amp's title never classifies, so this lane is its only rest signal; closing it for
+  // every launched agent failed `worker start` at agent_readiness after 60s (STA-7440).
+  it('settles an agent with no other rest signal once it has painted and gone quiet', async () => {
+    const resolved: string[] = []
+    const foregroundReads: string[] = []
+    const polls = createPolls('amp', resolved, foregroundReads)
+    const pty = makePty('pty-amp')
+    const leaf = makeLeaf('tab-amp')
+    polls.startPty(makeWaiter('pty'), pty)
+    polls.startLeaf(makeWaiter('leaf'), leaf)
+
+    // Booting: the agent owns the foreground but has painted nothing (#9976).
+    await vi.advanceTimersByTimeAsync(INTERVAL_MS * 5)
+    expect(resolved).toEqual([])
+
+    await vi.advanceTimersByTimeAsync(INTERVAL_MS / 2)
+    pty.lastOutputAt = Date.now()
+    leaf.lastOutputAt = Date.now()
+    // The next sweep lands inside the quiet window measured from that paint.
+    await vi.advanceTimersByTimeAsync(INTERVAL_MS / 2)
+    expect(resolved).toEqual([])
+    // A pane that cannot settle yet costs no process inspection.
+    expect(foregroundReads).toEqual([])
+
+    await vi.advanceTimersByTimeAsync(INTERVAL_MS)
+    expect(resolved).toEqual(['pty', 'leaf'])
+    expect(polls.activeTimerCount).toBe(0)
+  })
+
+  it('does not settle an agent that will announce rest itself on a quiet foreground', async () => {
+    const resolved: string[] = []
+    const polls = createPolls('claude', resolved)
+    polls.startPty(makeWaiter('pty'), makePty('pty-claude', { lastOutputAt: Date.now() }))
+
+    await vi.advanceTimersByTimeAsync(INTERVAL_MS * 5)
+    expect(resolved).toEqual([])
+  })
+})
diff --git a/src/main/runtime/runtime-terminal-idle-polls.ts b/src/main/runtime/runtime-terminal-idle-polls.ts
index 8960dc79d268..d63b59974ee5 100644
--- a/src/main/runtime/runtime-terminal-idle-polls.ts
+++ b/src/main/runtime/runtime-terminal-idle-polls.ts
@@ -1,10 +1,9 @@
-import { isShellProcess, type AgentStatus } from '../../shared/agent-detection'
-import type { RuntimeTerminalWait } from '../../shared/runtime-types'
-import {
-  detectTerminalWaitBlockedReason,
-  isKnownReadyPromptPreview,
-  isMuseReadyPromptPreview
-} from './terminal-wait-detection'
+import { isShellProcess } from '../../shared/agent-detection'
+import type {
+  RuntimeTerminalWait,
+  RuntimeTerminalWaitBlockedReason
+} from '../../shared/runtime-types'
+import { detectTerminalWaitBlockedReason } from './terminal-wait-detection'
 import {
   buildPtyTerminalWaitBlockedResult,
   buildPtyTerminalWaitResult,
@@ -13,53 +12,71 @@ import {
 } from './terminal-wait-results'
 import { buildTerminalWaitText } from './terminal-wait-tail-state'
 import {
-  isTuiIdleSatisfied,
-  quietForegroundProcessProvesTuiIdle,
-  type FirstPartyAgentStatus
+  evaluateTuiIdle,
+  leafTuiIdleEvidence,
+  ptyTuiIdleEvidence,
+  type QuietForegroundLane,
+  type TuiIdleEvidenceSource,
+  type TuiIdleVerdict
 } from './tui-idle-evidence'
-import type { TuiAgent } from '../../shared/tui-agent'
 
 /**
- * Why null counts as quiet: a record with no output timestamp has produced nothing the
- * RUNTIME OBSERVED since it was created. That is not the same as silence — the reachable
- * case is a daemon-hosted pane whose bytes never reach the runtime, which may still be
- * streaming. The trade is deliberate: "never settles" becomes "settles uncorroborated",
+ * Why null counts as quiet on an `open` lane: a record with no output timestamp has produced
+ * nothing the RUNTIME OBSERVED since it was created. That is not the same as silence — the
+ * reachable case is a daemon-hosted pane whose bytes never reach the runtime, which may still
+ * be streaming. The trade is deliberate: "never settles" becomes "settles uncorroborated",
  * the caller keeps its timeout, and delivery cannot reach this lane. Reading it as `0ms since output`
  * inverted that — `0 >= quiescenceMs` is false forever, so an adopted pane that never
  * emitted could not settle no matter how long the caller waited.
+ * Why not on `after-paint`: that pane runs a known agent, whose TUI must paint before it can
+ * take input, so until the command has painted it is still booting. The shell's prompt and
+ * echoed command line are not the agent's paint (see terminal-command-paint.ts).
  */
-function isQuietForQuiescence(lastOutputAt: number | null, quiescenceMs: number): boolean {
-  return lastOutputAt === null ? true : Date.now() - lastOutputAt >= quiescenceMs
+function isQuietForQuiescence(
+  lastOutputAt: number | null,
+  quiescenceMs: number,
+  lane: QuietForegroundLane,
+  commandPainted: () => boolean
+): boolean {
+  if (lane === 'after-paint' && !commandPainted()) {
+    return false
+  }
+  if (lastOutputAt === null) {
+    return lane === 'open'
+  }
+  return Date.now() - lastOutputAt >= quiescenceMs
 }
 import type { TerminalWaiter } from './runtime-terminal-contracts'
 import type { RuntimeLeafRecord, RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
 
-type RuntimeTerminalIdlePollDependencies = {
+type RuntimeTerminalIdlePollDependencies = TuiIdleEvidenceSource & {
   intervalMs: number
-  quiescenceMs: number
-  getTabTitle(tabId: string): string | null
   getForegroundProcess(ptyId: string): Promise<string | null> | null
-  getAdoptedPtyIdleStatus(pty: RuntimePtyWorktreeRecord): AgentStatus | null
-  getPaneAgent(ptyId: string | null | undefined): TuiAgent | null
-  getFirstPartyAgentStatus(ptyId: string | null | undefined): FirstPartyAgentStatus
-  /** Re-read the record the waiter registered against; see `liveLeaf` below. */
+  /** Whether the pane's running command has painted anything of its own. */
+  hasCommandPainted(ptyId: string): boolean
+  /** The pane's rendered viewport, or null when the runtime holds no screen model for it. */
+  readVisibleScreen(ptyId: string): Promise<string | null> | null
+  /** Re-read the record the waiter registered against; see `sample` below. */
   getLiveLeaf(leaf: RuntimeLeafRecord): RuntimeLeafRecord
   resolve(waiter: TerminalWaiter, result: RuntimeTerminalWait): void
 }
 
-type IdlePollEntry =
-  | {
-      kind: 'leaf'
-      waiter: TerminalWaiter
-      leaf: RuntimeLeafRecord
-      foregroundPollInFlight: boolean
-    }
-  | {
-      kind: 'pty'
-      waiter: TerminalWaiter
-      pty: RuntimePtyWorktreeRecord
-      foregroundPollInFlight: boolean
-    }
+type IdlePollEntry = {
+  waiter: TerminalWaiter
+  foregroundPollInFlight: boolean
+  screenReadInFlight: boolean
+} & ({ kind: 'leaf'; leaf: RuntimeLeafRecord } | { kind: 'pty'; pty: RuntimePtyWorktreeRecord })
+
+/** One reading of a waiter's pane, and the results it would settle with. */
+type IdlePollSample = {
+  verdict: TuiIdleVerdict
+  ptyId: string | null
+  ready(): RuntimeTerminalWait
+  blocked(reason: RuntimeTerminalWaitBlockedReason): RuntimeTerminalWait
+  isQuiet(lane: QuietForegroundLane): boolean
+}
+
+const IDLE_ENTRY_FLAGS = { foregroundPollInFlight: false, screenReadInFlight: false }
 
 export class RuntimeTerminalIdlePolls {
   private readonly entries = new Set<IdlePollEntry>()
@@ -67,12 +84,13 @@ export class RuntimeTerminalIdlePolls {
 
   constructor(private readonly deps: RuntimeTerminalIdlePollDependencies) {}
 
-  startLeaf(waiter: TerminalWaiter, leaf: RuntimeLeafRecord): void {
-    this.start({ kind: 'leaf', waiter, leaf, foregroundPollInFlight: false })
+  /** `verdict` is what the caller just evaluated; weak ready is checked at once, not a sweep later. */
+  startLeaf(waiter: TerminalWaiter, leaf: RuntimeLeafRecord, verdict?: TuiIdleVerdict): void {
+    this.start({ kind: 'leaf', waiter, leaf, ...IDLE_ENTRY_FLAGS }, verdict)
   }
 
-  startPty(waiter: TerminalWaiter, pty: RuntimePtyWorktreeRecord): void {
-    this.start({ kind: 'pty', waiter, pty, foregroundPollInFlight: false })
+  startPty(waiter: TerminalWaiter, pty: RuntimePtyWorktreeRecord, verdict?: TuiIdleVerdict): void {
+    this.start({ kind: 'pty', waiter, pty, ...IDLE_ENTRY_FLAGS }, verdict)
   }
 
   /** Test/diagnostic seam: live sweep handles, which must stay at most one. */
@@ -80,7 +98,7 @@ export class RuntimeTerminalIdlePolls {
     return this.sweepTimer ? 1 : 0
   }
 
-  private start(entry: IdlePollEntry): void {
+  private start(entry: IdlePollEntry, verdict: TuiIdleVerdict | undefined): void {
     this.entries.add(entry)
     entry.waiter.cancelIdlePoll = () => this.stop(entry)
     // Why one shared timer for every waiter: a per-waiter interval multiplied idle
@@ -89,6 +107,11 @@ export class RuntimeTerminalIdlePolls {
     if (!this.sweepTimer) {
       this.sweepTimer = setInterval(() => this.sweep(), this.deps.intervalMs)
     }
+    // Why: the evidence is already in hand and only needs its screen read; a probe that
+    // times out under one interval (the automation start probe) would otherwise never see it.
+    if (verdict?.kind === 'ready-weak') {
+      void this.tick(entry)
+    }
   }
 
   private sweep(): void {
@@ -97,135 +120,102 @@ export class RuntimeTerminalIdlePolls {
     // slow `ps` must never delay another waiter's checks, and a waiter registered by a
     // resolve inside this sweep must wait for the next tick, as a fresh interval would.
     for (const entry of Array.from(this.entries)) {
-      void (entry.kind === 'leaf' ? this.tickLeaf(entry) : this.tickPty(entry))
+      void this.tick(entry)
     }
   }
 
-  private async tickLeaf(entry: IdlePollEntry & { kind: 'leaf' }): Promise<void> {
-    if (!this.entries.has(entry)) {
-      return
+  private sample(entry: IdlePollEntry): IdlePollSample {
+    const { handle } = entry.waiter
+    if (entry.kind === 'pty') {
+      // Why no re-read here: `ptysById` has a single create-once `set` site, so PTY
+      // records are mutated in place rather than swapped, and a capture stays live.
+      const { pty } = entry
+      const readWaitText = () =>
+        buildTerminalWaitText(pty.tailBuffer, pty.tailPartialLine, pty.preview)
+      return {
+        verdict: evaluateTuiIdle(ptyTuiIdleEvidence(this.deps, pty, readWaitText)),
+        ptyId: pty.ptyId,
+        ready: () => buildPtyTerminalWaitResult(handle, 'tui-idle', pty),
+        blocked: (reason) => buildPtyTerminalWaitBlockedResult(handle, 'tui-idle', pty, reason),
+        isQuiet: (lane) =>
+          isQuietForQuiescence(pty.lastOutputAt, this.deps.quiescenceMs, lane, () =>
+            this.deps.hasCommandPainted(pty.ptyId)
+          )
+      }
     }
-    const { waiter } = entry
     // Why re-read: `syncWindowGraph` rebuilds `this.leaves` with fresh objects on every
     // renderer publish, so the record captured at registration stops advancing. Its
-    // `lastOutputAt` freezes, the quiescence gate below then reads an ever-growing
-    // elapsed time, and the waiter settles while the pane is in fact still streaming.
+    // `lastOutputAt` freezes, the quiescence gate then reads an ever-growing elapsed
+    // time, and the waiter settles while the pane is in fact still streaming.
     const leaf = this.deps.getLiveLeaf(entry.leaf)
-    const agent = this.deps.getPaneAgent(leaf.ptyId)
-    let startedForegroundPoll = false
-    try {
-      const waitText = buildTerminalWaitText(leaf.tailBuffer, leaf.tailPartialLine, leaf.preview)
-      const blockedReason = detectTerminalWaitBlockedReason(waitText)
-      if (blockedReason) {
-        this.stop(entry)
-        this.deps.resolve(
-          waiter,
-          buildTerminalWaitBlockedResult(waiter.handle, 'tui-idle', leaf, blockedReason)
+    const readWaitText = () =>
+      buildTerminalWaitText(leaf.tailBuffer, leaf.tailPartialLine, leaf.preview)
+    const live = () => this.deps.getLiveLeaf(entry.leaf)
+    return {
+      verdict: evaluateTuiIdle(leafTuiIdleEvidence(this.deps, leaf, readWaitText)),
+      ptyId: leaf.ptyId,
+      ready: () => buildTerminalWaitResult(handle, 'tui-idle', live()),
+      blocked: (reason) => buildTerminalWaitBlockedResult(handle, 'tui-idle', live(), reason),
+      isQuiet: (lane) =>
+        isQuietForQuiescence(
+          live().lastOutputAt,
+          this.deps.quiescenceMs,
+          lane,
+          () => !leaf.ptyId || this.deps.hasCommandPainted(leaf.ptyId)
         )
-        return
-      }
-      if (
-        isTuiIdleSatisfied({
-          record: leaf,
-          rendererTitle: leaf.paneTitle ?? this.deps.getTabTitle(leaf.tabId),
-          readPositiveBodyEvidence: () => isKnownReadyPromptPreview(waitText),
-          readMuseReadyBodyEvidence: () => isMuseReadyPromptPreview(waitText),
-          agent,
-          firstPartyStatus: this.deps.getFirstPartyAgentStatus(leaf.ptyId),
-          quiescenceMs: this.deps.quiescenceMs
-        })
-      ) {
-        this.stop(entry)
-        this.deps.resolve(waiter, buildTerminalWaitResult(waiter.handle, 'tui-idle', leaf))
-        return
-      }
-      if (
-        leaf.lastAgentStatus === null &&
-        quietForegroundProcessProvesTuiIdle(agent) &&
-        leaf.ptyId &&
-        !entry.foregroundPollInFlight
-      ) {
-        const foregroundRead = this.deps.getForegroundProcess(leaf.ptyId)
-        if (!foregroundRead) {
-          return
-        }
-        entry.foregroundPollInFlight = true
-        startedForegroundPoll = true
-        const foreground = await foregroundRead
-        const live = this.deps.getLiveLeaf(entry.leaf)
-        if (
-          foreground &&
-          !isShellProcess(foreground) &&
-          isQuietForQuiescence(live.lastOutputAt, this.deps.quiescenceMs)
-        ) {
-          this.stop(entry)
-          this.deps.resolve(waiter, buildTerminalWaitResult(waiter.handle, 'tui-idle', live))
-        }
-      }
-    } catch {
-      // Transient process inspection errors do not retire the waiter.
-    } finally {
-      if (startedForegroundPoll) {
-        entry.foregroundPollInFlight = false
-      }
     }
   }
 
-  private async tickPty(entry: IdlePollEntry & { kind: 'pty' }): Promise<void> {
+  private async tick(entry: IdlePollEntry): Promise<void> {
     if (!this.entries.has(entry)) {
       return
     }
-    const { waiter, pty } = entry
-    // Why no re-read here: `ptysById` has a single create-once `set` site, so PTY
-    // records are mutated in place rather than swapped, and a capture stays live.
-    const agent = this.deps.getPaneAgent(pty.ptyId)
     let startedForegroundPoll = false
     try {
-      const waitText = buildTerminalWaitText(pty.tailBuffer, pty.tailPartialLine, pty.preview)
-      const blockedReason = detectTerminalWaitBlockedReason(waitText)
-      if (blockedReason) {
-        this.stop(entry)
-        this.deps.resolve(
-          waiter,
-          buildPtyTerminalWaitBlockedResult(waiter.handle, 'tui-idle', pty, blockedReason)
-        )
+      const sample = this.sample(entry)
+      const { verdict, ptyId } = sample
+      if (verdict.kind === 'blocked') {
+        this.settle(entry, sample.blocked(verdict.reason))
+        return
+      }
+      // Why strong ready outranks the screen: the detector is not scoped to a region, so dialog
+      // wording anywhere on a finished agent's screen would otherwise read as blocked.
+      if (verdict.kind === 'ready-strong') {
+        this.settle(entry, sample.ready())
         return
       }
-      if (
-        isTuiIdleSatisfied({
-          record: pty,
-          readPositiveBodyEvidence: () =>
-            this.deps.getAdoptedPtyIdleStatus(pty) === 'idle' ||
-            isKnownReadyPromptPreview(waitText),
-          readMuseReadyBodyEvidence: () => isMuseReadyPromptPreview(waitText),
-          agent,
-          firstPartyStatus: this.deps.getFirstPartyAgentStatus(pty.ptyId),
-          quiescenceMs: this.deps.quiescenceMs
-        })
-      ) {
-        this.stop(entry)
-        this.deps.resolve(waiter, buildPtyTerminalWaitResult(waiter.handle, 'tui-idle', pty))
+      // Why no screen read while working: its output can quote dialog wording (a diff of this
+      // detector), and the dialogs only the screen shows are start-up ones, painted before any title.
+      if (verdict.kind === 'working' || entry.screenReadInFlight) {
         return
       }
-      if (
-        pty.lastAgentStatus === null &&
-        quietForegroundProcessProvesTuiIdle(agent) &&
-        !entry.foregroundPollInFlight
-      ) {
-        const foregroundRead = this.deps.getForegroundProcess(pty.ptyId)
+      const screenRead = ptyId ? this.readScreenBlockedReason(entry, ptyId) : null
+      // Why await only a real read: a pane with no screen model keeps its tick synchronous.
+      const screenBlockedReason = screenRead ? await screenRead : null
+      if (!this.entries.has(entry)) {
+        return
+      }
+      if (screenBlockedReason) {
+        this.settle(entry, sample.blocked(screenBlockedReason))
+        return
+      }
+      if (verdict.kind === 'ready-weak') {
+        this.settle(entry, sample.ready())
+        return
+      }
+      const lane = verdict.quietForeground
+      // Why quiet before the read too: a streaming or not-yet-painted pane cannot settle, so it
+      // must not pay a process inspection every tick for a whole turn.
+      if (lane !== 'closed' && ptyId && !entry.foregroundPollInFlight && sample.isQuiet(lane)) {
+        const foregroundRead = this.deps.getForegroundProcess(ptyId)
         if (!foregroundRead) {
           return
         }
         entry.foregroundPollInFlight = true
         startedForegroundPoll = true
         const foreground = await foregroundRead
-        if (
-          foreground &&
-          !isShellProcess(foreground) &&
-          isQuietForQuiescence(pty.lastOutputAt, this.deps.quiescenceMs)
-        ) {
-          this.stop(entry)
-          this.deps.resolve(waiter, buildPtyTerminalWaitResult(waiter.handle, 'tui-idle', pty))
+        if (foreground && !isShellProcess(foreground) && sample.isQuiet(lane)) {
+          this.settle(entry, sample.ready())
         }
       }
     } catch {
@@ -237,6 +227,29 @@ export class RuntimeTerminalIdlePolls {
     }
   }
 
+  /** Why the screen too: a dialog that parks the cursor above its own options (Claude's
+   *  workspace trust) loses those rows from the line tail; the rendered screen still has them. */
+  private readScreenBlockedReason(
+    entry: IdlePollEntry,
+    ptyId: string
+  ): Promise<RuntimeTerminalWaitBlockedReason | null> | null {
+    const screenRead = this.deps.readVisibleScreen(ptyId)
+    if (!screenRead) {
+      return null
+    }
+    entry.screenReadInFlight = true
+    return screenRead
+      .then((screen) => (screen ? detectTerminalWaitBlockedReason(screen) : null))
+      .finally(() => {
+        entry.screenReadInFlight = false
+      })
+  }
+
+  private settle(entry: IdlePollEntry, result: RuntimeTerminalWait): void {
+    this.stop(entry)
+    this.deps.resolve(entry.waiter, result)
+  }
+
   private stop(entry: IdlePollEntry): void {
     if (!this.entries.delete(entry)) {
       return
diff --git a/src/main/runtime/runtime-terminal-orphan-adoption.ts b/src/main/runtime/runtime-terminal-orphan-adoption.ts
index 24df1cc1cbfb..51e56d0b5086 100644
--- a/src/main/runtime/runtime-terminal-orphan-adoption.ts
+++ b/src/main/runtime/runtime-terminal-orphan-adoption.ts
@@ -5,6 +5,7 @@ import type {
   RuntimeTerminalOrphanAdoptionResult
 } from '../../shared/runtime-types'
 import { makePaneKey } from '../../shared/stable-pane-id'
+import { hasClosedTerminalTabRecord } from '../../shared/closed-terminal-tab-tombstones'
 import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
 import { terminalOrphanExecutionOwnersEqual } from './terminal-orphan-owner'
 import type { TerminalWorkspaceLaunchScope } from './runtime-legacy-worker-terminal-recovery-types'
@@ -185,7 +186,11 @@ export async function adoptRuntimeTerminalOrphansFromInventory(args: {
     ) {
       throw new Error('terminal_orphan_surface_occupied')
     }
-    if (session.terminalSurfaceTombstonesByPaneKey?.[paneKey]) {
+    // Why the close record too: it outlives a host restart, which the client's retirement proofs do not.
+    if (
+      session.terminalSurfaceTombstonesByPaneKey?.[paneKey] ||
+      hasClosedTerminalTabRecord(session.closedTerminalTabTombstonesByTabId, claim.tabId)
+    ) {
       throw new Error('terminal_orphan_surface_retired')
     }
     for (const snapshot of ports.getMobileSnapshots()) {
diff --git a/src/main/runtime/runtime-terminal-state-records.ts b/src/main/runtime/runtime-terminal-state-records.ts
index 6c9ac89539af..4f27df976dfd 100644
--- a/src/main/runtime/runtime-terminal-state-records.ts
+++ b/src/main/runtime/runtime-terminal-state-records.ts
@@ -11,6 +11,7 @@ import type { HeadlessEmulator } from '../daemon/headless-emulator'
 import type { PtyProviderBufferSnapshot } from '../providers/types'
 import type { RetainedTailRedrawCursor } from './terminal-tail-redraw-buffer'
 import type { TerminalTailWaitState } from './terminal-wait-tail-state'
+import type { TerminalCommandPaint } from './terminal-command-paint'
 import type { PtyShellOwnershipMirror } from './pty-shell-ownership-mirror'
 import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
 import type { AgentSessionOwnerBinding } from '../../shared/agent-session-host-authority'
@@ -90,6 +91,8 @@ export type RuntimePtyWorktreeRecord = RuntimeTerminalTailState & {
   title: string | null
   titleUpdatedAt: number | null
   lastOutputAt: number | null
+  /** See terminal-command-paint.ts; absent until the pane's first output, and again after a gap or a new process. */
+  commandPaint?: TerminalCommandPaint
 }
 
 export type RuntimePtyTabCloseAuthority = {
diff --git a/src/main/runtime/runtime-terminal-wait.ts b/src/main/runtime/runtime-terminal-wait.ts
index ce1117ec49c3..a19199e59f6e 100644
--- a/src/main/runtime/runtime-terminal-wait.ts
+++ b/src/main/runtime/runtime-terminal-wait.ts
@@ -3,12 +3,7 @@ import type {
   RuntimeTerminalWaitCondition
 } from '../../shared/runtime-types'
 import { hasAntigravityTerminalHeader } from './antigravity-terminal-readiness'
-import {
-  detectTerminalWaitBlockedReason,
-  isKnownReadyPromptPreview,
-  isMuseReadyPromptPreview,
-  tuiIdleNeedsVisibleScreenProbe
-} from './terminal-wait-detection'
+import { tuiIdleNeedsVisibleScreenProbe } from './terminal-wait-detection'
 import {
   buildPtyTerminalWaitBlockedResult,
   buildPtyTerminalWaitResult,
@@ -17,23 +12,23 @@ import {
   getTerminalState
 } from './terminal-wait-results'
 import { buildTerminalWaitText } from './terminal-wait-tail-state'
-import { isTuiIdleSatisfied, type FirstPartyAgentStatus } from './tui-idle-evidence'
+import {
+  evaluateTuiIdle,
+  leafTuiIdleEvidence,
+  ptyTuiIdleEvidence,
+  type TuiIdleEvidenceSource,
+  type TuiIdleVerdict
+} from './tui-idle-evidence'
 import type { TuiAgent } from '../../shared/tui-agent'
 import type { TerminalWaiter } from './runtime-terminal-contracts'
 import type { RuntimeLeafRecord, RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
-import type { AgentStatus } from '../../shared/agent-detection'
 import type { RuntimeTerminalIdlePolls } from './runtime-terminal-idle-polls'
 import type { RuntimeTerminalWaiterRegistry } from './runtime-terminal-waiter-registry'
 
-type RuntimeTerminalWaitDependencies = {
+type RuntimeTerminalWaitDependencies = TuiIdleEvidenceSource & {
   defaultTimeoutMs: number
   getLivePty(handle: string): { pty: RuntimePtyWorktreeRecord } | null
   getLiveLeaf(handle: string): { leaf: RuntimeLeafRecord }
-  getAdoptedPtyIdleStatus(pty: RuntimePtyWorktreeRecord): AgentStatus | null
-  getTabTitle(tabId: string): string | null
-  quiescenceMs: number
-  getPaneAgent(ptyId: string | null | undefined): TuiAgent | null
-  getFirstPartyAgentStatus(ptyId: string | null | undefined): FirstPartyAgentStatus
   startVisibleReadProbe(
     waiter: TerminalWaiter,
     waiterTimeoutMs: number,
@@ -50,28 +45,12 @@ export class RuntimeTerminalWait {
 
   /** Why one helper per record kind: every satisfaction site must rank the same way,
    *  or the immediate check and the poll disagree about the same pane. */
-  private ptySatisfied(pty: RuntimePtyWorktreeRecord, waitText: string): boolean {
-    return isTuiIdleSatisfied({
-      record: pty,
-      readPositiveBodyEvidence: () =>
-        this.deps.getAdoptedPtyIdleStatus(pty) === 'idle' || isKnownReadyPromptPreview(waitText),
-      readMuseReadyBodyEvidence: () => isMuseReadyPromptPreview(waitText),
-      agent: this.deps.getPaneAgent(pty.ptyId),
-      firstPartyStatus: this.deps.getFirstPartyAgentStatus(pty.ptyId),
-      quiescenceMs: this.deps.quiescenceMs
-    })
+  private evaluatePty(pty: RuntimePtyWorktreeRecord, waitText: string): TuiIdleVerdict {
+    return evaluateTuiIdle(ptyTuiIdleEvidence(this.deps, pty, () => waitText))
   }
 
-  private leafSatisfied(leaf: RuntimeLeafRecord, waitText: string): boolean {
-    return isTuiIdleSatisfied({
-      record: leaf,
-      rendererTitle: leaf.paneTitle ?? this.deps.getTabTitle(leaf.tabId),
-      readPositiveBodyEvidence: () => isKnownReadyPromptPreview(waitText),
-      readMuseReadyBodyEvidence: () => isMuseReadyPromptPreview(waitText),
-      agent: this.deps.getPaneAgent(leaf.ptyId),
-      firstPartyStatus: this.deps.getFirstPartyAgentStatus(leaf.ptyId),
-      quiescenceMs: this.deps.quiescenceMs
-    })
+  private evaluateLeaf(leaf: RuntimeLeafRecord, waitText: string): TuiIdleVerdict {
+    return evaluateTuiIdle(leafTuiIdleEvidence(this.deps, leaf, () => waitText))
   }
 
   async wait(
@@ -93,11 +72,13 @@ export class RuntimeTerminalWait {
         pty.pty.tailPartialLine,
         pty.pty.preview
       )
-      const ptyBlockedReason = detectTerminalWaitBlockedReason(ptyWaitText)
-      if (condition === 'tui-idle' && ptyBlockedReason) {
-        return buildPtyTerminalWaitBlockedResult(handle, condition, pty.pty, ptyBlockedReason)
+      // Why strong verdicts only, here and at every other synchronous site: weak evidence
+      // cannot see a dialog the tail lost, so it settles only on the poll, after a screen read.
+      const ptyVerdict = condition === 'tui-idle' ? this.evaluatePty(pty.pty, ptyWaitText) : null
+      if (ptyVerdict?.kind === 'blocked') {
+        return buildPtyTerminalWaitBlockedResult(handle, condition, pty.pty, ptyVerdict.reason)
       }
-      if (condition === 'tui-idle' && this.ptySatisfied(pty.pty, ptyWaitText)) {
+      if (ptyVerdict?.kind === 'ready-strong') {
         return buildPtyTerminalWaitResult(handle, condition, pty.pty)
       }
       return await new Promise<RuntimeTerminalWaitResult>((resolve, reject) => {
@@ -139,16 +120,16 @@ export class RuntimeTerminalWait {
             live.pty.tailPartialLine,
             live.pty.preview
           )
-          const blockedReason = detectTerminalWaitBlockedReason(livePtyWaitText)
-          if (blockedReason) {
+          const verdict = this.evaluatePty(live.pty, livePtyWaitText)
+          if (verdict.kind === 'blocked') {
             this.waiters.resolve(
               waiter,
-              buildPtyTerminalWaitBlockedResult(handle, condition, live.pty, blockedReason)
+              buildPtyTerminalWaitBlockedResult(handle, condition, live.pty, verdict.reason)
             )
-          } else if (this.ptySatisfied(live.pty, livePtyWaitText)) {
+          } else if (verdict.kind === 'ready-strong') {
             this.waiters.resolve(waiter, buildPtyTerminalWaitResult(handle, condition, live.pty))
           } else {
-            this.polls.startPty(waiter, live.pty)
+            this.polls.startPty(waiter, live.pty, verdict)
             const paneAgent = this.deps.getPaneAgent(live.pty.ptyId)
             if (
               // AGY can retain a stale working/blocked status after a trust dialog was
@@ -175,17 +156,15 @@ export class RuntimeTerminalWait {
     }
 
     const leafWaitText = buildTerminalWaitText(leaf.tailBuffer, leaf.tailPartialLine, leaf.preview)
-    const leafBlockedReason = detectTerminalWaitBlockedReason(leafWaitText)
-    if (condition === 'tui-idle' && leafBlockedReason) {
-      return buildTerminalWaitBlockedResult(handle, condition, leaf, leafBlockedReason)
+    const leafVerdict = condition === 'tui-idle' ? this.evaluateLeaf(leaf, leafWaitText) : null
+    if (leafVerdict?.kind === 'blocked') {
+      return buildTerminalWaitBlockedResult(handle, condition, leaf, leafVerdict.reason)
     }
 
-    // Why: if the agent already transitioned to idle (or permission) before the
-    // waiter was registered, resolve immediately. This uses the same OSC title
-    // detection that powers the renderer's "Task complete" notifications.
-    // Why: only 'idle' satisfies tui-idle, not 'permission'. Permission means the
+    // Why: if the agent already announced rest before the waiter was registered, resolve
+    // immediately. Only 'idle' satisfies tui-idle, not 'permission'. Permission means the
     // agent is blocked on user approval, not finished with its task.
-    if (condition === 'tui-idle' && this.leafSatisfied(leaf, leafWaitText)) {
+    if (leafVerdict?.kind === 'ready-strong') {
       return buildTerminalWaitResult(handle, condition, leaf)
     }
 
@@ -237,13 +216,13 @@ export class RuntimeTerminalWait {
             live.leaf.tailPartialLine,
             live.leaf.preview
           )
-          const blockedReason = detectTerminalWaitBlockedReason(liveLeafWaitText)
-          if (blockedReason) {
+          const verdict = this.evaluateLeaf(live.leaf, liveLeafWaitText)
+          if (verdict.kind === 'blocked') {
             this.waiters.resolve(
               waiter,
-              buildTerminalWaitBlockedResult(handle, condition, live.leaf, blockedReason)
+              buildTerminalWaitBlockedResult(handle, condition, live.leaf, verdict.reason)
             )
-          } else if (this.leafSatisfied(live.leaf, liveLeafWaitText)) {
+          } else if (verdict.kind === 'ready-strong') {
             // Why: don't clear lastAgentStatus here. It's a factual record of the
             // last detected OSC state, not a one-shot signal. Clearing it causes
             // subsequent tui-idle waiters to hang even though the agent is idle —
@@ -253,7 +232,7 @@ export class RuntimeTerminalWait {
             // Why: renderer-synced previews can show a known ready prompt even
             // while the last OSC title is still "working"; keep polling the
             // preview/title until the waiter resolves or hits its timeout.
-            this.polls.startLeaf(waiter, live.leaf)
+            this.polls.startLeaf(waiter, live.leaf, verdict)
             const paneAgent = this.deps.getPaneAgent(live.leaf.ptyId)
             if (
               ((paneAgent === 'antigravity' ||
diff --git a/src/main/runtime/runtime-terminal-writer.ts b/src/main/runtime/runtime-terminal-writer.ts
index 7ff6ba4a7f34..10e94f3747f7 100644
--- a/src/main/runtime/runtime-terminal-writer.ts
+++ b/src/main/runtime/runtime-terminal-writer.ts
@@ -1,8 +1,10 @@
 import { resolveAgentPromptSubmitDelayForAgent } from '../../shared/agent-prompt-injection'
 import type { TuiAgent } from '../../shared/tui-agent'
 import { iterateTerminalInputChunks } from '../../shared/terminal-input'
+import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 
 export type RuntimeTerminalWriteOptions = {
+  inputKind: TerminalInputKind
   signal?: AbortSignal
   beforeWrite?: (ptyId: string) => void | Promise<void>
   reserveWrite?: (ptyId: string) => void
@@ -12,7 +14,7 @@ export type RuntimeTerminalWriteOptions = {
 
 export class RuntimeTerminalWriter {
   constructor(
-    private readonly write: (ptyId: string, data: string) => boolean,
+    private readonly write: (ptyId: string, data: string, inputKind: TerminalInputKind) => boolean,
     private readonly getWriteHostPlatform: (ptyId: string) => NodeJS.Platform = () =>
       process.platform,
     private readonly getAgent: (ptyId: string) => TuiAgent | null = () => null
@@ -22,7 +24,7 @@ export class RuntimeTerminalWriter {
     ptyId: string,
     action: { text?: string; enter?: boolean; interrupt?: boolean },
     payload: string,
-    options: RuntimeTerminalWriteOptions = {}
+    options: RuntimeTerminalWriteOptions
   ): Promise<void> {
     // Why: direct terminal.send can carry paste-sized text from RPC/mobile
     // clients; chunk text before PTY/ConPTY while preserving suffix separation.
@@ -54,7 +56,7 @@ export class RuntimeTerminalWriter {
         throw error
       }
       options.reserveWrite?.(ptyId)
-      if (!this.write(ptyId, suffix)) {
+      if (!this.write(ptyId, suffix, options.inputKind)) {
         throw new Error(options.suffixFailureError ?? 'terminal_not_writable')
       }
       await options.afterWrite?.(ptyId)
@@ -65,7 +67,7 @@ export class RuntimeTerminalWriter {
     }
     await options.beforeWrite?.(ptyId)
     options.reserveWrite?.(ptyId)
-    if (!this.write(ptyId, payload)) {
+    if (!this.write(ptyId, payload, options.inputKind)) {
       throw new Error('terminal_not_writable')
     }
     await options.afterWrite?.(ptyId)
@@ -74,14 +76,14 @@ export class RuntimeTerminalWriter {
   async writeChunks(
     ptyId: string,
     text: string,
-    options: RuntimeTerminalWriteOptions = {}
+    options: RuntimeTerminalWriteOptions
   ): Promise<void> {
     const chunks = iterateTerminalInputChunks(text)
     let chunk = chunks.next()
     while (!chunk.done) {
       await options.beforeWrite?.(ptyId)
       options.reserveWrite?.(ptyId)
-      if (!this.write(ptyId, chunk.value)) {
+      if (!this.write(ptyId, chunk.value, options.inputKind)) {
         throw new Error('terminal_not_writable')
       }
       await options.afterWrite?.(ptyId)
diff --git a/src/main/runtime/runtime-workspace-session-controller.ts b/src/main/runtime/runtime-workspace-session-controller.ts
index c7472b914d2d..e45425b8dd3e 100644
--- a/src/main/runtime/runtime-workspace-session-controller.ts
+++ b/src/main/runtime/runtime-workspace-session-controller.ts
@@ -107,6 +107,15 @@ export class RuntimeWorkspaceSessionController {
     return hostId ? (this.deps.getStore()?.getWorkspaceSession?.(hostId) ?? null) : null
   }
 
+  /** The session only when the worktree's own host partition owns it, not a rotated-owner fallback. */
+  getOwnPartition(worktreeId: string): WorkspaceSessionState | null {
+    const store = this.deps.getStore()
+    const hostId = store ? this.getPreferredHostId(worktreeId, store) : null
+    return hostId && hostId === this.tryGetHostId(worktreeId)
+      ? (store?.getWorkspaceSession?.(hostId) ?? null)
+      : null
+  }
+
   set(worktreeId: string, session: WorkspaceSessionState): void {
     this.deps.getStore()?.setWorkspaceSession?.(session, this.getHostId(worktreeId))
   }
diff --git a/src/main/runtime/runtime-worktree-agent-rows-verdict.test.ts b/src/main/runtime/runtime-worktree-agent-rows-verdict.test.ts
new file mode 100644
index 000000000000..7b22a45d09d5
--- /dev/null
+++ b/src/main/runtime/runtime-worktree-agent-rows-verdict.test.ts
@@ -0,0 +1,224 @@
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { agentSessionFailureFact } from '../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../shared/agent-session-failure-words'
+import { makeStructuredAgentStatusSubject } from '../../shared/agent-status-subject'
+import { agentSessionRecordFixture } from '../../shared/agent-session-record.test-fixture'
+import type {
+  AgentSessionStatusEvent,
+  AgentSessionStatusSummary
+} from '../../shared/agent-session-wire'
+import type { RuntimeWorktreePsSummary } from '../../shared/runtime-types'
+import { AgentHookServer, _internals } from '../agent-hooks/server'
+import { createTrackedJournalOpener } from '../native-chat/agent-session-journal/journal-store-test-open'
+import type { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store'
+import { StructuredAgentSessionStatusFeed } from '../native-chat/agent-session-wire/structured-agent-session-status-feed'
+import { indexedStatusFeedSession } from '../native-chat/agent-session-wire/structured-agent-session-status-feed-test-session'
+import { attachRuntimeWorktreeAgentRows } from './runtime-worktree-agent-rows'
+import { collectRuntimeWorktreeAgentSources } from './runtime-worktree-agent-sources'
+
+vi.mock('../telemetry/client', () => ({ track: vi.fn() }))
+vi.mock('../telemetry/cohort-classifier', () => ({
+  getCohortAtEmit: vi.fn(() => ({ nth_repo_added: 2 }))
+}))
+
+// A request that failed reads as failed on every surface the host feeds: the journal's verdict
+// travels the real feed, the status-store ingest and `worktree ps`, never just the projection.
+const SESSION = 'verdict-session'
+const WORKSPACE_ID = 'workspace-1'
+const SUBJECT = makeStructuredAgentStatusSubject(
+  {
+    executionHostId: 'local',
+    wslDistro: null,
+    workspaceId: WORKSPACE_ID,
+    workspaceKind: 'git-worktree'
+  },
+  SESSION
+)
+const TURN_IDENTITY = {
+  provider: 'codex',
+  threadId: 'thread-1',
+  turnId: 'turn-1',
+  ordinal: 0
+} as const
+
+let root: string
+const journals = createTrackedJournalOpener()
+
+beforeEach(async () => {
+  _internals.resetCachesForTests()
+  root = await mkdtemp(join(tmpdir(), 'orca-verdict-rows-'))
+})
+
+afterEach(async () => {
+  await journals.closeAll()
+  await rm(root, { recursive: true, force: true })
+})
+
+async function openJournal(): Promise<AgentSessionJournal> {
+  return journals.open({
+    identity: {
+      sessionId: SESSION,
+      workspaceId: WORKSPACE_ID,
+      hostId: 'local',
+      agent: 'codex',
+      providerHandle: { kind: 'codex', threadId: 'thread-1' }
+    },
+    journalDir: join(root, SESSION)
+  })
+}
+
+/** What the host's real feed publishes for this journal. */
+function publishedSummary(journal: AgentSessionJournal): AgentSessionStatusSummary {
+  const session = indexedStatusFeedSession({ journal })
+  const feed = new StructuredAgentSessionStatusFeed({
+    sessions: new Map([[SESSION, session]]),
+    getRecord: () => agentSessionRecordFixture(),
+    now: () => 1_000
+  })
+  const events: AgentSessionStatusEvent[] = []
+  feed.subscribe({ id: 'list', emit: (event) => events.push(event) })
+  const snapshot = events.find((event) => event.type === 'snapshot')
+  const summary = snapshot?.type === 'snapshot' ? snapshot.sessions[0] : undefined
+  if (!summary) {
+    throw new Error('the feed published no session')
+  }
+  return summary
+}
+
+function ingest(summary: AgentSessionStatusSummary) {
+  const store = new AgentHookServer()
+  store.ingestStructuredStatus(summary, SUBJECT)
+  const hookSnapshots = store.getStatusSnapshot()
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: attaching agent rows reads and writes only `worktreeId`, `status`, `hasHostSidebarActivity` and `agents`.
+  const row = {
+    worktreeId: WORKSPACE_ID,
+    status: 'inactive',
+    hasHostSidebarActivity: false,
+    agents: []
+  } as unknown as RuntimeWorktreePsSummary
+  attachRuntimeWorktreeAgentRows({
+    summaries: new Map([[WORKSPACE_ID, row]]),
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: `getSummary` below resolves every row by id, so the path index is never read.
+    pathIndex: { byPath: new Map(), byRealPath: new Map() } as never,
+    missingWorktreeIds: new Set(),
+    workingTerminalEvidenceByWorktreeId: new Map(),
+    rowSources: collectRuntimeWorktreeAgentSources({
+      mirroredWorktreeIdByTabId: new Map(),
+      connectedPtyEvidence: {
+        tabIds: new Set(),
+        paneKeys: new Set(),
+        ptyIdByTerminalHandle: new Map()
+      },
+      hookSnapshots
+    }),
+    orchestrationByPaneKey: null,
+    getSummary: (map, _p, _m, id) => map.get(id) ?? null
+  })
+  return { status: hookSnapshots[0], ps: row.agents[0] }
+}
+
+describe('a request that failed reads as failed through the feed, the ingest and worktree ps', () => {
+  it('reads a chat whose only send the agent start refused as failed, not interrupted', async () => {
+    const journal = await openJournal()
+    await journal.appendSubmission({
+      clientMessageId: 'first',
+      payloadFingerprint: 'fp',
+      body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hello' }] },
+      fence: 1,
+      handoverRecorded: true
+    })
+    await journal.rejectQueuedSubmissions(
+      1,
+      agentSessionFailureWords(agentSessionFailureFact('notSignedIn'), {
+        surface: 'rejection',
+        agentName: 'Claude'
+      })
+    )
+
+    const summary = publishedSummary(journal)
+    expect(summary).toMatchObject({ status: 'idle', turnOutcome: 'failure', latestPrompt: 'hello' })
+    const { status, ps } = ingest(summary)
+    expect(status).toMatchObject({
+      state: 'done',
+      mainAgent: { state: 'done', outcome: 'failure' }
+    })
+    expect(status?.interrupted).not.toBe(true)
+    expect(ps).toMatchObject({
+      state: 'done',
+      mainAgent: { state: 'done', outcome: 'failure' },
+      interrupted: false
+    })
+  })
+
+  it('reads a cancelled structured turn as interrupted for readers that predate the verdict', async () => {
+    const journal = await openJournal()
+    await journal.appendItem(
+      TURN_IDENTITY,
+      {
+        kind: 'turn',
+        turnId: 'turn-1',
+        state: 'interrupted',
+        outcome: 'cancellation',
+        completedAt: 5
+      },
+      { fence: 1 }
+    )
+
+    const { status, ps } = ingest(publishedSummary(journal))
+    expect(status).toMatchObject({ state: 'done', interrupted: true })
+    expect(ps).toMatchObject({
+      mainAgent: { state: 'done', outcome: 'cancellation' },
+      interrupted: true
+    })
+  })
+
+  it('publishes a main agent that failed while its subagent runs, on the row that still works', async () => {
+    const journal = await openJournal()
+    await journal.appendItem(
+      TURN_IDENTITY,
+      { kind: 'turn', turnId: 'turn-1', state: 'completed', outcome: 'failure', completedAt: 5 },
+      { fence: 1 }
+    )
+    const summary: AgentSessionStatusSummary = {
+      ...publishedSummary(journal),
+      backgroundTasks: [{ id: 'child-1', kind: 'agent', state: 'working' }]
+    }
+
+    const { status, ps } = ingest(summary)
+    expect(status).toMatchObject({
+      state: 'working',
+      mainAgent: { state: 'done', outcome: 'failure' }
+    })
+    // The row carries the main agent's own clock, which dates the failure apart from the working row.
+    expect(ps).toMatchObject({
+      state: 'working',
+      mainAgent: {
+        state: 'done',
+        outcome: 'failure',
+        stateStartedAt: status?.mainAgent?.stateStartedAt
+      },
+      interrupted: false
+    })
+  })
+
+  it('lists nothing for a chat whose only send the user withdrew', async () => {
+    const journal = await openJournal()
+    await journal.appendSubmission({
+      clientMessageId: 'first',
+      payloadFingerprint: 'fp',
+      body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hello' }] },
+      fence: 1,
+      handoverRecorded: true
+    })
+    await journal.rejectQueuedSubmissions(
+      1,
+      agentSessionFailureWords(agentSessionFailureFact('cancelled'), { surface: 'rejection' })
+    )
+
+    expect(publishedSummary(journal)).toMatchObject({ status: null })
+    expect(ingest(publishedSummary(journal)).ps).toBeUndefined()
+  })
+})
diff --git a/src/main/runtime/runtime-worktree-agent-rows.ts b/src/main/runtime/runtime-worktree-agent-rows.ts
index 20c17f9b01a3..310b0f6bc524 100644
--- a/src/main/runtime/runtime-worktree-agent-rows.ts
+++ b/src/main/runtime/runtime-worktree-agent-rows.ts
@@ -60,6 +60,7 @@ export function attachRuntimeWorktreeAgentRows(args: {
       toolName: source.toolName,
       toolInput: source.toolInput,
       interrupted: source.interrupted,
+      ...(source.mainAgent ? { mainAgent: source.mainAgent } : {}),
       stateStartedAt: source.stateStartedAt,
       updatedAt: source.updatedAt,
       ...(source.structuredHost === 'owned' ? { structuredHostOwned: true as const } : {})
diff --git a/src/main/runtime/runtime-worktree-agent-source.ts b/src/main/runtime/runtime-worktree-agent-source.ts
index 984f20e09553..fd98d7914b1d 100644
--- a/src/main/runtime/runtime-worktree-agent-source.ts
+++ b/src/main/runtime/runtime-worktree-agent-source.ts
@@ -1,5 +1,6 @@
 import type { StructuredHostStatus } from '../../shared/agent-hook-listener/listener-event'
 import type { ParsedAgentStatusPayload } from '../../shared/agent-status-types'
+import type { AgentMainAgentStatus } from '../../shared/main-agent-status'
 
 export type RuntimeWorktreeAgentSource = {
   paneKey: string
@@ -15,6 +16,7 @@ export type RuntimeWorktreeAgentSource = {
   toolName: string | null
   toolInput: string | null
   interrupted: boolean
+  mainAgent?: AgentMainAgentStatus
   stateStartedAt: number
   updatedAt: number
   /** Projected by the structured session host; `owned` rows stay fresh past the staleness window. */
diff --git a/src/main/runtime/runtime-worktree-agent-startup.test.ts b/src/main/runtime/runtime-worktree-agent-startup.test.ts
index e901555fa07d..ba2c57b78545 100644
--- a/src/main/runtime/runtime-worktree-agent-startup.test.ts
+++ b/src/main/runtime/runtime-worktree-agent-startup.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
 import type { Repo } from '../../shared/repo-types'
+import { tuiAgentToAgentKind } from '../../shared/agent-kind'
 
 const mocks = vi.hoisted(() => ({
   markAntigravityWorkspaceTrusted: vi.fn(),
@@ -22,6 +23,7 @@ vi.mock('../preflight/agent-detection', () => ({
   detectInstalledAgentsWithShellPathHydration: mocks.detectInstalledAgentsWithShellPathHydration
 }))
 
+import { AGENT_TRUST_WRITE_DEADLINE_MS } from '../agent-trust-write-deadline'
 import {
   buildWorktreeStartupForAgent,
   buildWorktreeStartupForDraft,
@@ -101,6 +103,22 @@ describe('buildWorktreeStartupForAgent host resolution', () => {
       request_kind: 'new'
     })
   })
+
+  it('attributes a startup agent whose caller named no surface as unknown', () => {
+    const result = buildWorktreeStartupForAgent({
+      repo: makeRepo({}),
+      settings,
+      agent: 'claude',
+      getLaunchPlatform: () => 'linux',
+      toSessionOptions: () => undefined
+    })
+
+    expect(result.startup.telemetry).toEqual({
+      agent_kind: 'claude-code',
+      launch_source: 'unknown',
+      request_kind: 'new'
+    })
+  })
 })
 
 describe('buildWorktreeStartupForDraft agent detection', () => {
@@ -134,6 +152,34 @@ describe('buildWorktreeStartupForDraft agent detection', () => {
     expect(mocks.detectRemoteAgents).not.toHaveBeenCalled()
     expect(result?.agent).toBe('claude')
   })
+
+  // The host picks and launches this agent itself, so it is attributed like any other it builds,
+  // whether the draft rides the launch command or is pasted once the agent is up.
+  it.each([
+    ['claude', 'cli', 'cli', false],
+    ['claude', undefined, 'unknown', false],
+    ['claude-agent-teams', 'orchestration', 'orchestration', true],
+    ['claude-agent-teams', undefined, 'unknown', true]
+  ] as const)(
+    'attributes a %s draft launch named %s as %s',
+    async (agent, launchSource, expected, pasted) => {
+      const result = await buildWorktreeStartupForDraft({
+        repo: makeRepo({}),
+        settings,
+        draft: 'ship it',
+        requestedAgent: agent,
+        getLaunchPlatform: () => 'linux',
+        ...(launchSource ? { launchSource } : {})
+      })
+
+      expect(result?.draftPaste !== undefined).toBe(pasted)
+      expect(result?.startup.telemetry).toEqual({
+        agent_kind: tuiAgentToAgentKind(agent),
+        launch_source: expected,
+        request_kind: 'new'
+      })
+    }
+  )
 })
 
 describe('markLocalWorktreeTrusted', () => {
@@ -186,4 +232,41 @@ describe('markLocalWorktreeTrusted', () => {
 
     await expect(markLocalWorktreeTrusted('antigravity', '/workspace/app')).resolves.toBeUndefined()
   })
+
+  it('bounds a never-settling Codex trust write instead of holding the launch open', async () => {
+    vi.useFakeTimers()
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    let release!: () => void
+    const write = new Promise<void>((resolve) => {
+      release = resolve
+    })
+    mocks.markCodexProjectTrusted.mockClear()
+    mocks.markCursorWorkspaceTrusted.mockClear()
+    mocks.markCopilotFolderTrusted.mockClear()
+    mocks.markAntigravityWorkspaceTrusted.mockClear()
+    mocks.markCodexProjectTrusted.mockReturnValueOnce(write)
+    let settled = false
+    const marking = markLocalWorktreeTrusted('codex', '/workspace/app').then(() => {
+      settled = true
+    })
+    try {
+      await vi.advanceTimersByTimeAsync(AGENT_TRUST_WRITE_DEADLINE_MS - 1)
+      expect(settled).toBe(false)
+      await vi.advanceTimersByTimeAsync(2)
+      await marking
+      expect(settled).toBe(true)
+      expect(String(warn.mock.calls[0]?.[0])).toContain('did not settle')
+      expect(vi.getTimerCount()).toBe(0)
+      // Fails closed: giving up writes nothing, retries nothing and never
+      // substitutes another preset's artifact, so Codex still prompts.
+      expect(mocks.markCodexProjectTrusted).toHaveBeenCalledTimes(1)
+      expect(mocks.markCursorWorkspaceTrusted).not.toHaveBeenCalled()
+      expect(mocks.markCopilotFolderTrusted).not.toHaveBeenCalled()
+      expect(mocks.markAntigravityWorkspaceTrusted).not.toHaveBeenCalled()
+    } finally {
+      warn.mockRestore()
+      release()
+      vi.useRealTimers()
+    }
+  })
 })
diff --git a/src/main/runtime/runtime-worktree-agent-startup.ts b/src/main/runtime/runtime-worktree-agent-startup.ts
index e2ba6f71917a..827ad5c6b57c 100644
--- a/src/main/runtime/runtime-worktree-agent-startup.ts
+++ b/src/main/runtime/runtime-worktree-agent-startup.ts
@@ -1,13 +1,13 @@
+import { markQoderWorkspaceTrusted } from '../qoder/workspace-trust'
+import { agentStartedTelemetry } from '../agent-launch/agent-started-telemetry'
 import type { AgentLaunchPreferences } from '../../shared/agent-session-host-authority'
 import {
   agentLaunchOverridesToSessionOptionValues,
   type AgentLaunchOverrides
 } from '../../shared/fork-automation-launch-settings/agent-launch-overrides'
-import { tuiAgentToAgentKind } from '../../shared/agent-kind'
 import type { Repo } from '../../shared/repo-types'
 import type { TuiAgent } from '../../shared/tui-agent'
 import type { WorktreeStartupLaunch } from '../../shared/worktree/launch-types'
-import { launchSourceSchema } from '../../shared/telemetry-property-schemas'
 import { repoIsRemote } from '../../shared/agent-launch-remote'
 import { getRepoSshConnectionId } from '../../shared/execution-host'
 import { isTuiAgent, TUI_AGENT_CONFIG } from '../../shared/tui-agent-config'
@@ -20,6 +20,7 @@ import {
   markCopilotFolderTrusted,
   markCursorWorkspaceTrusted
 } from '../agent-trust-presets'
+import { awaitAgentTrustWriteWithinDeadline } from '../agent-trust-write-deadline'
 import {
   detectInstalledAgentsWithShellPathHydration,
   detectRemoteAgents
@@ -30,6 +31,11 @@ import type { RuntimeStore } from './runtime-store-contract'
 export type WorktreeStartupDraftPaste = { agent: TuiAgent; content: string }
 export type WorktreeStartupFollowup = { expectedProcess: string; prompt: string }
 
+/** A fresh agent the host builds always carries its `agent_started` record; dropping it fails to compile. */
+type AttributedWorktreeStartupLaunch = WorktreeStartupLaunch & {
+  telemetry: NonNullable<WorktreeStartupLaunch['telemetry']>
+}
+
 type StartupEnvironment = {
   repo: Repo
   settings: ReturnType<RuntimeStore['getSettings']>
@@ -44,7 +50,7 @@ export async function buildWorktreeStartupForDraft(
   environment: StartupEnvironment & { draft: string; requestedAgent?: TuiAgent }
 ): Promise<{
   agent: TuiAgent
-  startup: WorktreeStartupLaunch
+  startup: AttributedWorktreeStartupLaunch
   draftPaste?: WorktreeStartupDraftPaste
 } | null> {
   const content = environment.draft.trim()
@@ -87,6 +93,7 @@ export async function buildWorktreeStartupForDraft(
     isRemote: repoIsRemote(repo),
     ...(environment.agentArgs !== undefined ? { agentArgs: environment.agentArgs } : {})
   })
+  const telemetry = agentStartedTelemetry(agent, environment.launchSource)
   const draftPlan = buildAgentDraftLaunchPlan({ ...launchArgs, draft: content })
   if (draftPlan) {
     return {
@@ -97,7 +104,8 @@ export async function buildWorktreeStartupForDraft(
         ...(draftPlan.startupCommandDelivery
           ? { startupCommandDelivery: draftPlan.startupCommandDelivery }
           : {}),
-        ...(draftPlan.env ? { env: draftPlan.env } : {})
+        ...(draftPlan.env ? { env: draftPlan.env } : {}),
+        telemetry
       }
     }
   }
@@ -117,7 +125,8 @@ export async function buildWorktreeStartupForDraft(
       ...(startupPlan.startupCommandDelivery
         ? { startupCommandDelivery: startupPlan.startupCommandDelivery }
         : {}),
-      ...(startupPlan.env ? { env: startupPlan.env } : {})
+      ...(startupPlan.env ? { env: startupPlan.env } : {}),
+      telemetry
     },
     draftPaste: { agent, content }
   }
@@ -133,7 +142,11 @@ export function buildWorktreeStartupForAgent(
       preferences?: AgentLaunchPreferences
     ) => Parameters<typeof buildAgentStartupPlan>[0]['sessionOptions'] | undefined
   }
-): { agent: TuiAgent; startup: WorktreeStartupLaunch; followup?: WorktreeStartupFollowup } {
+): {
+  agent: TuiAgent
+  startup: AttributedWorktreeStartupLaunch
+  followup?: WorktreeStartupFollowup
+} {
   const { agent, repo, settings, launchOverrides } = environment
   if (!isTuiAgentEnabled(agent, settings.disabledTuiAgents)) {
     throw new Error('Selected agent is disabled. Choose an enabled agent before creating.')
@@ -160,7 +173,6 @@ export function buildWorktreeStartupForAgent(
   if (!startupPlan) {
     throw new Error(`Could not build launch command for ${agent}.`)
   }
-  const telemetry = agentLaunchTelemetry(agent, environment.launchSource)
   return {
     agent,
     startup: {
@@ -170,7 +182,7 @@ export function buildWorktreeStartupForAgent(
         ? { startupCommandDelivery: startupPlan.startupCommandDelivery }
         : {}),
       ...(startupPlan.env ? { env: startupPlan.env } : {}),
-      ...(telemetry ? { telemetry } : {})
+      telemetry: agentStartedTelemetry(agent, environment.launchSource)
     },
     ...(startupPlan.followupPrompt
       ? {
@@ -183,20 +195,6 @@ export function buildWorktreeStartupForAgent(
   }
 }
 
-function agentLaunchTelemetry(
-  agent: TuiAgent,
-  launchSource: string | undefined
-): WorktreeStartupLaunch['telemetry'] | undefined {
-  const parsed = launchSourceSchema.safeParse(launchSource)
-  return parsed.success
-    ? {
-        agent_kind: tuiAgentToAgentKind(agent),
-        launch_source: parsed.data,
-        request_kind: 'new'
-      }
-    : undefined
-}
-
 export async function markLocalWorktreeTrusted(
   agent: TuiAgent,
   workspacePath: string
@@ -206,13 +204,18 @@ export async function markLocalWorktreeTrusted(
     return
   }
   try {
-    if (preset === 'cursor') {
+    if (preset === 'qoder') {
+      markQoderWorkspaceTrusted(workspacePath)
+    } else if (preset === 'cursor') {
       markCursorWorkspaceTrusted(workspacePath)
     } else if (preset === 'copilot') {
       markCopilotFolderTrusted(workspacePath)
     } else if (preset === 'codex') {
-      // Why: the Codex write queues behind any in-flight hook grant, so the agent must not launch until it lands.
-      await markCodexProjectTrusted(workspacePath)
+      // Why: the Codex write queues behind any in-flight hook grant, so the agent must not launch until it lands. Bounded so a wedged lane degrades to the agent's own prompt instead of stalling the launch.
+      await awaitAgentTrustWriteWithinDeadline(markCodexProjectTrusted(workspacePath), {
+        preset,
+        workspacePath
+      })
     } else if (preset === 'antigravity') {
       markAntigravityWorkspaceTrusted(workspacePath)
     }
diff --git a/src/main/runtime/runtime-worktree-pty-agent-sources.ts b/src/main/runtime/runtime-worktree-pty-agent-sources.ts
index 058d378df111..e03f458134f2 100644
--- a/src/main/runtime/runtime-worktree-pty-agent-sources.ts
+++ b/src/main/runtime/runtime-worktree-pty-agent-sources.ts
@@ -4,6 +4,7 @@ import {
   type ParsedAgentStatusPayload
 } from '../../shared/agent-status-types'
 import { parseLegacyNumericPaneKey, parsePaneKey } from '../../shared/stable-pane-id'
+import { agentVerdictFields } from '../../shared/agent-main-agent-verdict'
 import { isWslHookRelayConnectionId } from '../../shared/wsl-hook-relay-contract'
 import type { RuntimeWorktreeAgentSource } from './runtime-worktree-agent-source'
 
@@ -47,7 +48,8 @@ export function collectRuntimeWorktreePtyAgentSources(args: {
       lastAssistantMessage: entry.lastAssistantMessage ?? null,
       toolName: entry.toolName ?? null,
       toolInput: entry.toolInput ?? null,
-      interrupted: entry.interrupted ?? false,
+      interrupted: false,
+      ...agentVerdictFields(entry),
       stateStartedAt: entry.stateStartedAt,
       // A replay advances delivery order, not the age of the evidence shown by worktree.ps.
       updatedAt: entry.evidenceObservedAt ?? entry.receivedAt,
diff --git a/src/main/runtime/runtime-worktree-startup-readiness.test.ts b/src/main/runtime/runtime-worktree-startup-readiness.test.ts
new file mode 100644
index 000000000000..e96a072f7ed2
--- /dev/null
+++ b/src/main/runtime/runtime-worktree-startup-readiness.test.ts
@@ -0,0 +1,71 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import {
+  waitForWorktreeStartupDraft,
+  type WorktreeStartupReadinessHost
+} from './runtime-worktree-startup-readiness'
+
+describe('fresh worker composer readiness', () => {
+  afterEach(() => vi.useRealTimers())
+
+  function fixture(replay?: string) {
+    let listener = (_data: string): void => {}
+    const unsubscribe = vi.fn()
+    const host: WorktreeStartupReadinessHost = {
+      getPtyId: () => 'pty-1',
+      getForegroundProcess: async () => 'zcode',
+      subscribeToData: (_ptyId, onData) => {
+        listener = onData
+        return unsubscribe
+      },
+      readRecentOutput: () => replay,
+      write: vi.fn()
+    }
+    return { host, emit: (data: string) => listener(data), unsubscribe }
+  }
+
+  it('accepts the captured composer while the banner continues repainting', async () => {
+    vi.useFakeTimers()
+    const h = fixture()
+    const pending = waitForWorktreeStartupDraft(h.host, 'term-1', 'zcode', {
+      timeoutMs: 45_000,
+      requireComposerMarker: true
+    })
+    const data = readFileSync(join(__dirname, '__fixtures__', 'zcode-composer-ready.txt'), 'utf8')
+    for (let offset = 0; offset < data.length; offset += 4096) {
+      h.emit(data.slice(offset, offset + 4096))
+    }
+    await expect(pending).resolves.toBe('pty-1')
+    expect(h.unsubscribe).toHaveBeenCalledOnce()
+    expect(h.host.write).not.toHaveBeenCalled()
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('cleans up the deadline when the composer was already captured', async () => {
+    vi.useFakeTimers()
+    const h = fixture('\x1b[?1049h╭')
+    await expect(
+      waitForWorktreeStartupDraft(h.host, 'term-1', 'zcode', {
+        timeoutMs: 45_000,
+        requireComposerMarker: true
+      })
+    ).resolves.toBe('pty-1')
+    expect(h.unsubscribe).toHaveBeenCalledOnce()
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('does not accept shell decoration or a square startup dialog', async () => {
+    vi.useFakeTimers()
+    const h = fixture('╭ shell\n\x1b[?1049h\x1b[?2004h┌ Sign in ┐')
+    const pending = waitForWorktreeStartupDraft(h.host, 'term-1', 'zcode', {
+      timeoutMs: 45_000,
+      requireComposerMarker: true
+    })
+    await vi.advanceTimersByTimeAsync(44_999)
+    expect(h.unsubscribe).not.toHaveBeenCalled()
+    await vi.advanceTimersByTimeAsync(1)
+    await expect(pending).resolves.toBeNull()
+    expect(h.unsubscribe).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/main/runtime/runtime-worktree-startup-readiness.ts b/src/main/runtime/runtime-worktree-startup-readiness.ts
index 77b4e1315db7..779f16ec6a40 100644
--- a/src/main/runtime/runtime-worktree-startup-readiness.ts
+++ b/src/main/runtime/runtime-worktree-startup-readiness.ts
@@ -4,6 +4,7 @@ import { createDraftPasteReadyScanner } from '../../shared/draft-paste-ready-sca
 import { resolveDraftPasteReadyTimeoutMs } from '../../shared/draft-paste-ready-timeout'
 import { TUI_AGENT_CONFIG } from '../../shared/tui-agent-config'
 import type { TuiAgent } from '../../shared/tui-agent'
+import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 import type {
   WorktreeStartupDraftPaste,
   WorktreeStartupFollowup
@@ -19,7 +20,7 @@ export type WorktreeStartupReadinessHost = {
   hasChildProcesses?: (ptyId: string) => Promise<boolean>
   subscribeToData: (ptyId: string, listener: (data: string) => void) => () => void
   readRecentOutput: (ptyId: string) => string | undefined
-  write: (ptyId: string, data: string) => void
+  write: (ptyId: string, data: string, inputKind: TerminalInputKind) => void
 }
 
 export function pasteWorktreeStartupDraftWhenReady(
@@ -33,7 +34,7 @@ export function pasteWorktreeStartupDraftWhenReady(
         console.warn('[worktree-create] agent did not become ready for draft paste')
         return
       }
-      host.write(ptyId, `${BRACKETED_PASTE_BEGIN}${draft.content}${BRACKETED_PASTE_END}`)
+      host.write(ptyId, `${BRACKETED_PASTE_BEGIN}${draft.content}${BRACKETED_PASTE_END}`, 'launch')
     })
     .catch((error) => console.warn('[worktree-create] failed to paste startup draft:', error))
 }
@@ -49,7 +50,7 @@ export function sendWorktreeStartupFollowupWhenReady(
         console.warn('[worktree-create] agent did not become ready for follow-up prompt')
         return
       }
-      host.write(ptyId, `${followup.prompt}\r`)
+      host.write(ptyId, `${followup.prompt}\r`, 'launch')
     })
     .catch((error) =>
       console.warn('[worktree-create] failed to send startup follow-up prompt:', error)
@@ -89,7 +90,8 @@ export async function waitForWorktreeStartupFollowup(
 export function waitForWorktreeStartupDraft(
   host: WorktreeStartupReadinessHost,
   handle: string,
-  agent: TuiAgent
+  agent: TuiAgent,
+  options: { timeoutMs?: number; requireComposerMarker?: boolean } = {}
 ): Promise<string | null> {
   const ptyId = host.getPtyId(handle)
   if (!ptyId) {
@@ -118,11 +120,14 @@ export function waitForWorktreeStartupDraft(
       resolve(value)
     }
     const observe = (data: string): void => {
+      if (settled) {
+        return
+      }
       const result = scanner.observe(data)
       if (result.ready) {
         return finish(ptyId)
       }
-      if (result.armQuietTimer) {
+      if (result.armQuietTimer && !options.requireComposerMarker) {
         if (quietTimer) {
           clearTimeout(quietTimer)
         }
@@ -130,10 +135,13 @@ export function waitForWorktreeStartupDraft(
       }
     }
     unsubscribe = host.subscribeToData(ptyId, observe)
+    hardTimer = setTimeout(
+      () => finish(null),
+      options.timeoutMs ?? resolveDraftPasteReadyTimeoutMs(agent)
+    )
     const replay = host.readRecentOutput(ptyId)
     if (replay) {
       observe(replay)
     }
-    hardTimer = setTimeout(() => finish(null), resolveDraftPasteReadyTimeoutMs(agent))
   })
 }
diff --git a/src/main/runtime/runtime-worktree-structured-agent-rows-liveness.test.ts b/src/main/runtime/runtime-worktree-structured-agent-rows-liveness.test.ts
index b1e43a9025d2..a1373f43c718 100644
--- a/src/main/runtime/runtime-worktree-structured-agent-rows-liveness.test.ts
+++ b/src/main/runtime/runtime-worktree-structured-agent-rows-liveness.test.ts
@@ -89,7 +89,7 @@ async function awaitingApproval() {
       SESSION,
       {
         journal,
-        hasProviderChild: true,
+        child: { phase: 'ready' as const, generation: 'child-1', fence: 1 },
         params: {
           location: {
             executionHostId: 'local' as const,
diff --git a/src/main/runtime/startup-dialog-blocked-signals.ts b/src/main/runtime/startup-dialog-blocked-signals.ts
new file mode 100644
index 000000000000..e964205a9ccc
--- /dev/null
+++ b/src/main/runtime/startup-dialog-blocked-signals.ts
@@ -0,0 +1,76 @@
+import type { RuntimeTerminalWaitBlockedReason } from '../../shared/runtime-types'
+
+// Why rows, from each dialog's first `·` on: codex-terminal-readiness.ts takes a `·` after the
+// startup header for the live chat's footer, so each dialog must be matched by the time that `·`
+// lands. Why not headings: Codex 0.157+ paints them by cell diff over its startup screen, so the
+// text copy can lose letters and spaces (`updat available`); these rows are fixed literals.
+// Update: `Update available · 0.157.1 → 0.158.0`, then `enter continue · esc skip`.
+const CODEX_UPDATE_ROW_RE = /available\s*·\s*\d+\.\d+|enter\s*continue\s*·\s*esc\s*skip/g
+// Why not `esc back`: Codex's mid-session pickers end `enter confirm · esc back`.
+const CODEX_HOOKS_REVIEW_KEY_ROW_RE = /enter\s*confirm\s*·(?!\s*esc\s*back)/g
+// Why both verbs: the retired-model notice says `continue`, the new-model announcement `confirm`.
+const CODEX_MODEL_MIGRATION_KEY_ROW_RE = /enter\/esc\s*(?:continue|confirm)\s*·/g
+
+function lastMatchIndex(text: string, row: RegExp): number {
+  let index = -1
+  for (const match of text.matchAll(row)) {
+    index = match.index
+  }
+  return index
+}
+
+// Why the last match, and the legacy wording too: an answered dialog stays in the text copy, and
+// builds before 0.157 wrote `Press enter to continue/confirm`.
+function findDialogIndex(
+  normalized: string,
+  legacyHeading: string,
+  legacyKeys: string,
+  row: RegExp
+): number {
+  const rowIndex = lastMatchIndex(normalized, row)
+  const headingIndex = normalized.lastIndexOf(legacyHeading)
+  const legacyIndex =
+    headingIndex !== -1 && normalized.includes(legacyKeys, headingIndex) ? headingIndex : -1
+  return Math.max(rowIndex, legacyIndex)
+}
+
+// Why together: each startup dialog owns Enter before the chat exists, so a brief typed into one
+// answers it (Codex's update dialog defaults to `Update now`).
+export function findStartupDialogBlockedSignals(
+  normalized: string
+): { reason: RuntimeTerminalWaitBlockedReason; index: number }[] {
+  const candidates: { reason: RuntimeTerminalWaitBlockedReason; index: number }[] = []
+  const updateIndex = findDialogIndex(
+    normalized,
+    'update available',
+    'press enter to continue',
+    CODEX_UPDATE_ROW_RE
+  )
+  if (updateIndex !== -1) {
+    candidates.push({ reason: 'agent-update-prompt', index: updateIndex })
+  }
+  const cwdIndex = normalized.lastIndexOf('choose working directory to')
+  if (cwdIndex !== -1 && normalized.includes('press enter to continue', cwdIndex)) {
+    candidates.push({ reason: 'agent-cwd-prompt', index: cwdIndex })
+  }
+  const modelMigrationIndex = findDialogIndex(
+    normalized,
+    'codex just got an upgrade',
+    'press enter to continue',
+    CODEX_MODEL_MIGRATION_KEY_ROW_RE
+  )
+  if (modelMigrationIndex !== -1) {
+    candidates.push({ reason: 'codex-model-migration-prompt', index: modelMigrationIndex })
+  }
+  const hooksIndex = findDialogIndex(
+    normalized,
+    'hooks need review',
+    'press enter to confirm',
+    CODEX_HOOKS_REVIEW_KEY_ROW_RE
+  )
+  if (hooksIndex !== -1) {
+    // Why neutral: this matcher never inspects the agent -- 'hooks need review' is not Codex-only wording.
+    candidates.push({ reason: 'agent-hooks-review-prompt', index: hooksIndex })
+  }
+  return candidates
+}
diff --git a/src/main/runtime/structured-agent-session-close.ts b/src/main/runtime/structured-agent-session-close.ts
index 9afb2723a882..668b7f218903 100644
--- a/src/main/runtime/structured-agent-session-close.ts
+++ b/src/main/runtime/structured-agent-session-close.ts
@@ -3,8 +3,8 @@
  *
  * Extracted from `stopStructuredWorker` so that orchestration settlement and worktree teardown
  * close a session the SAME way rather than one of them inventing a shorter version. Everything
- * dispatch-shaped — dropping the hold, the redrive subscription and the parked mail — stays with
- * the caller that has a dispatch; this is only the child.
+ * dispatch-shaped — dropping the redrive subscription, the registry entry and the parked mail —
+ * stays with the caller that has a dispatch; this is only the child.
  *
  * `host.close` returns void and keeps a failed close indexed for retry, so the only settlement
  * evidence is the observation AFTER it: a session the host no longer holds and whose lease is no
@@ -15,7 +15,10 @@ import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wi
 import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-registry'
 import type { OrcaRuntimeService } from './orca-runtime'
 import { retireSettledStructuredWorkerTab } from './structured-agent-session-tab-retirement'
-import { observeStructuredWorker } from './structured-worker-authority'
+import {
+  observeStructuredWorker,
+  structuredSessionCloseSettled
+} from './structured-worker-authority'
 
 export type StructuredAgentSessionCloseOutcome = {
   stopped: boolean
@@ -32,8 +35,8 @@ export type StructuredAgentSessionCloseOptions = {
   /**
    * Runs after the close is issued and BEFORE the proof is read.
    *
-   * Not after: an unsettled close returns early, so a dispatch that released its hold there would
-   * keep the child un-evictable for the life of the app. Every settlement has to reach it.
+   * Not after: an unsettled close returns early, so a dispatch released there would keep its
+   * redrive subscription nudging a session no dispatch owns. Every settlement has to reach it.
    */
   afterClose?: () => void
   /**
@@ -86,8 +89,8 @@ export async function closeStructuredAgentSessionChild(
     }
   }
   options.afterClose?.()
-  const observation = observeStructuredWorker({ sessionId })
-  if (observation.status !== 'exited') {
+  if (!structuredSessionCloseSettled(sessionId)) {
+    const observation = observeStructuredWorker({ sessionId })
     await restorePersistedTabVisibility(host, sessionId, restoreTabIfCloseFails)
     return {
       stopped: false,
@@ -137,7 +140,7 @@ async function restorePersistedTabVisibility(
   sessionId: string,
   tabId: string | null
 ): Promise<void> {
-  if (tabId === null || observeStructuredWorker({ sessionId }).status === 'exited') {
+  if (tabId === null || structuredSessionCloseSettled(sessionId)) {
     return
   }
   try {
diff --git a/src/main/runtime/structured-agent-session-codex-turn-end-settlement.test.ts b/src/main/runtime/structured-agent-session-codex-turn-end-settlement.test.ts
new file mode 100644
index 000000000000..c86f7c852420
--- /dev/null
+++ b/src/main/runtime/structured-agent-session-codex-turn-end-settlement.test.ts
@@ -0,0 +1,324 @@
+// A Codex send the turn it went into never took: the Stop that interrupts that turn
+// withdraws it, and nothing reads as working after. A Stop sent before Codex opens that
+// turn waits for it to open, since Codex refuses an interrupt until then. Driven through the shipped host,
+// journal and Codex adapter; only the Codex child is fake, keeping Codex 0.157's
+// turn bookkeeping.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type {
+  CodexAppServerConnection,
+  CodexAppServerConnectionHandlers,
+  openCodexAppServerConnection
+} from '../codex/codex-app-server-connection'
+import { codexTurnLifecycleFake } from '../codex/codex-turn-lifecycle-fake'
+import { settledWithin } from '../codex/codex-structured-dispatch-test-support'
+import { CODEX_STOP_TURN_OPEN_WAIT_MS } from '../codex/codex-structured-prompt-ownership'
+import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
+import type { AgentJournalSubmission } from '../../shared/agent-session-journal-types'
+import { classifyDispatchRejection } from '../../shared/structured-agent-session-dispatch-rejection'
+import { owesStructuredAgentSessionWork } from '../../shared/structured-agent-session-owed-work'
+import {
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
+  hostTestMessage
+} from '../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
+import { CHILD_EVICTION_TIMEOUT_MS } from '../native-chat/agent-session-wire/structured-agent-session-host-teardown'
+import {
+  ensureStructuredAgentSessionHost,
+  stopStructuredAgentSessionRuntime
+} from './structured-agent-session-runtime'
+
+// A Stop must never reach for real processes on this machine under a made-up pid.
+vi.mock('../codex/codex-structured-turn-processes', () => ({
+  captureCodexTurnProcesses: async () => null,
+  terminateCodexTurnProcesses: async () => true
+}))
+
+const CALLER = { callerKey: 'codex-turn-end-test' }
+const MODEL = {
+  model: 'gpt-test',
+  displayName: 'GPT Test',
+  hidden: false,
+  supportedReasoningEfforts: [],
+  defaultReasoningEffort: null,
+  isDefault: true
+}
+
+let root: string
+let host: StructuredAgentSessionHost
+let fence: number
+let handlers: CodexAppServerConnectionHandlers | undefined
+let answers: number
+let interrupts: number
+let childCloses: number
+let turns: ReturnType<typeof codexTurnLifecycleFake>
+let operations = 0
+
+/** The durable ledger stamps its own clock and refuses an id far from it. */
+const operationId = (): string => `${Date.now()}-${(++operations).toString(16).padStart(32, '0')}`
+
+function envelope(method: string, fields: Record<string, unknown>) {
+  return {
+    sessionId: SESSION,
+    clientOperationId: operationId(),
+    expectedRuntimeFence: fence,
+    payloadFingerprint: computeAgentSessionPayloadFingerprint({
+      method,
+      sessionId: SESSION,
+      fields
+    })
+  }
+}
+
+async function send(text: string): Promise<string> {
+  const body = hostTestMessage(text)
+  const sent = await host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
+  if (!sent.ok) {
+    throw new Error(JSON.stringify(sent.refusal))
+  }
+  return sent.value.clientMessageId
+}
+
+async function stop(turnId?: string): Promise<void> {
+  const stopped = await host.cancel(CALLER, {
+    envelope: envelope('agentSession.cancel', turnId === undefined ? {} : { turnId }),
+    ...(turnId === undefined ? {} : { turnId })
+  })
+  if (!stopped.ok) {
+    throw new Error(JSON.stringify(stopped.refusal))
+  }
+}
+
+async function settled(): Promise<{
+  submissions: readonly AgentJournalSubmission[]
+  owesWork: boolean
+}> {
+  await host.flushStreamedEvents(SESSION)
+  const snapshot = await host.journalSnapshot(SESSION)
+  return {
+    submissions: snapshot.submissions,
+    // The shared rule every surface reads "working" from.
+    owesWork: owesStructuredAgentSessionWork(snapshot.items, snapshot.submissions, fence)
+  }
+}
+
+function verdictOf(submissions: readonly AgentJournalSubmission[], clientMessageId: string) {
+  const submission = submissions.find((entry) => entry.clientMessageId === clientMessageId)
+  return submission?.dispatchState === 'rejected'
+    ? classifyDispatchRejection(submission).category
+    : submission?.dispatchState
+}
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-codex-turn-end-'))
+  answers = 0
+  interrupts = 0
+  childCloses = 0
+  turns = codexTurnLifecycleFake(
+    THREAD,
+    () => (method, params) => handlers?.onNotification?.(method, params)
+  )
+  const openConnection: typeof openCodexAppServerConnection = async (
+    _launch,
+    connectionHandlers = {}
+  ) => {
+    handlers = connectionHandlers
+    const connection: CodexAppServerConnection = {
+      pid: 4321,
+      closed: false,
+      request: async (method, params) => {
+        if (method === 'thread/start' || method === 'thread/resume') {
+          return { thread: { id: THREAD } }
+        }
+        if (method === 'model/list') {
+          return { data: [MODEL], nextCursor: null }
+        }
+        if (method === 'turn/start') {
+          answers += 1
+          return turns.routes['turn/start']()
+        }
+        if (method === 'turn/interrupt') {
+          interrupts += 1
+          return turns.routes['turn/interrupt'](params)
+        }
+        return {}
+      },
+      notify: () => {},
+      respond: () => {},
+      respondWithError: () => {},
+      close: async () => {
+        childCloses += 1
+        return true
+      }
+    }
+    return connection
+  }
+  host = await ensureStructuredAgentSessionHost({
+    stateDirectory: root,
+    hostId: 'local',
+    claimKeyId: 'key-1',
+    resolveWorkspacePath: async () => root,
+    resolveClaudeAuthPolicy: () => ({ stripAuthEnv: true }),
+    resolveCodexCommand: () => 'codex',
+    resolveEnvironment: async () => ({ PATH: process.env.PATH }),
+    openCodexConnection: openConnection,
+    readProcessStartTime: async () => 1_700_000_000_000
+  })
+  const attachParams = hostTestAttachParams(null, { providerHandle: undefined })
+  attachParams.envelope.clientOperationId = operationId()
+  const attached = await host.attach(CALLER, attachParams)
+  if (!attached.ok) {
+    throw new Error(JSON.stringify(attached.refusal))
+  }
+  fence = attached.value.fence
+})
+
+afterEach(async () => {
+  await stopStructuredAgentSessionRuntime()
+  await rm(root, { recursive: true, force: true })
+})
+
+describe('a Codex send its turn ended without taking it', () => {
+  it('is withdrawn by a Stop before any echo, and nothing reads as working after', async () => {
+    const sent = await send('look around')
+    await vi.waitFor(() => expect(answers).toBe(1))
+    turns.start()
+
+    await stop('turn-1')
+
+    await vi.waitFor(async () =>
+      expect(verdictOf((await settled()).submissions, sent)).not.toBe('pending')
+    )
+    const after = await settled()
+    expect(verdictOf(after.submissions, sent)).toBe('withdrawn')
+    expect(after.owesWork).toBe(false)
+
+    // Codex echoing it late changes nothing: a settled answer stands.
+    await host.settleLateDispatch({
+      sessionId: SESSION,
+      clientMessageId: sent,
+      providerIdentity: { provider: 'codex', threadId: THREAD, turnId: 'turn-1', ordinal: 0 }
+    })
+    expect(verdictOf((await settled()).submissions, sent)).toBe('withdrawn')
+  })
+
+  it('withdraws a follow-up Codex steered into the turn a Stop ends, with no working latch', async () => {
+    const opening = await send('look around')
+    await vi.waitFor(() => expect(answers).toBe(1))
+    turns.start()
+    turns.echo(opening)
+    const followUp = await send('and check the tests')
+    // Steered: Codex answers with the running turn, and fires no second turn/started.
+    await vi.waitFor(() => expect(answers).toBe(2))
+
+    await stop('turn-1')
+
+    await vi.waitFor(async () =>
+      expect(verdictOf((await settled()).submissions, followUp)).not.toBe('pending')
+    )
+    const after = await settled()
+    expect(verdictOf(after.submissions, opening)).toBe('accepted')
+    expect(verdictOf(after.submissions, followUp)).toBe('withdrawn')
+    expect(after.owesWork).toBe(false)
+  })
+})
+
+describe('a Stop sent after Codex answered a cold send, before it opened the turn', () => {
+  it('waits for the turn to open, then stops it and withdraws the send', async () => {
+    const sent = await send('look around')
+    await vi.waitFor(() => expect(answers).toBe(1))
+
+    const stopping = stop()
+    // Without the wait, it would reach Codex now, which would refuse it, and be done.
+    expect(await settledWithin(stopping, 1_000)).toBe('held')
+    expect(interrupts).toBe(0)
+    turns.start()
+    await stopping
+
+    expect(interrupts).toBe(1)
+    expect(turns.turnId).toBeNull()
+    await vi.waitFor(async () =>
+      expect(verdictOf((await settled()).submissions, sent)).toBe('withdrawn')
+    )
+    expect((await settled()).owesWork).toBe(false)
+  })
+})
+
+describe('a Stop in that window that the turn never opens for', () => {
+  async function statusRows(): Promise<string[]> {
+    return (await host.journalSnapshot(SESSION)).items.flatMap((item) =>
+      item.body.kind === 'status' ? [item.body.text] : []
+    )
+  }
+
+  async function waitingStop(): Promise<{ stopping: Promise<void> }> {
+    await send('look around')
+    await vi.waitFor(() => expect(answers).toBe(1))
+    const stopping = stop()
+    expect(await settledWithin(stopping, 200)).toBe('held')
+    return { stopping }
+  }
+
+  it('says Codex had no turn running when that turn ends first', async () => {
+    const { stopping } = await waitingStop()
+
+    turns.end('interrupted')
+    await stopping
+
+    expect(interrupts).toBe(0)
+    expect(await statusRows()).toContain('Codex had no turn running to stop.')
+  })
+
+  it('lets a chat closed behind it close within its bound and one eviction', async () => {
+    const { stopping } = await waitingStop()
+
+    const closing = host.close(SESSION)
+
+    expect(
+      await settledWithin(closing, CODEX_STOP_TURN_OPEN_WAIT_MS + CHILD_EVICTION_TIMEOUT_MS)
+    ).not.toBe('held')
+    expect(await settledWithin(stopping, 0)).not.toBe('held')
+    expect(childCloses).toBe(1)
+    expect(interrupts).toBe(0)
+    expect(await statusRows()).toContain('Codex had no turn running to stop.')
+  })
+
+  it('lets the app quit behind it within the eviction budget, and still close the child', async () => {
+    await waitingStop()
+
+    expect(
+      await settledWithin(stopStructuredAgentSessionRuntime(), CHILD_EVICTION_TIMEOUT_MS)
+    ).not.toBe('held')
+    expect(childCloses).toBe(1)
+  })
+})
+
+describe('a cold send with no Stop behind it', () => {
+  /** Well inside one eviction step's budget, and far inside the bound a Stop waits. */
+  const PROMPTLY_MS = 1_000
+
+  async function answeredColdSend(): Promise<void> {
+    await send('look around')
+    await vi.waitFor(() => expect(answers).toBe(1))
+    expect(turns.turnId).toBe('turn-1')
+  }
+
+  it('never delays closing the chat', async () => {
+    await answeredColdSend()
+
+    expect(await settledWithin(host.close(SESSION), PROMPTLY_MS)).not.toBe('held')
+    expect(childCloses).toBe(1)
+  })
+
+  it('never delays quitting the app', async () => {
+    await answeredColdSend()
+
+    expect(await settledWithin(stopStructuredAgentSessionRuntime(), PROMPTLY_MS)).not.toBe('held')
+    expect(childCloses).toBe(1)
+  })
+})
diff --git a/src/main/runtime/structured-agent-session-integration-replay.test.ts b/src/main/runtime/structured-agent-session-integration-replay.test.ts
index 4fa390be0fb9..a4e2500ffc46 100644
--- a/src/main/runtime/structured-agent-session-integration-replay.test.ts
+++ b/src/main/runtime/structured-agent-session-integration-replay.test.ts
@@ -317,11 +317,14 @@ describe('a structured codex session over agentSession.*', () => {
       body
     }
 
+    const turnStarts = () => codex.live().calls.filter((entry) => entry.method === 'turn/start')
     await ok('agentSession.send', params)
+    // Accepted first; the delivery loop hands it over once.
+    await vi.waitFor(() => expect(turnStarts()).toHaveLength(1))
     const replay = await call('agentSession.send', params)
 
     expect(replay).toMatchObject({ ok: true, result: { ok: true, replayed: true } })
-    expect(codex.live().calls.filter((entry) => entry.method === 'turn/start')).toHaveLength(1)
+    expect(turnStarts()).toHaveLength(1)
   })
 
   it('joins an acquired attach through journal bind before draining final rows', async () => {
diff --git a/src/main/runtime/structured-agent-session-integration.test.ts b/src/main/runtime/structured-agent-session-integration.test.ts
index fb00c625f433..f22184a28b89 100644
--- a/src/main/runtime/structured-agent-session-integration.test.ts
+++ b/src/main/runtime/structured-agent-session-integration.test.ts
@@ -218,6 +218,11 @@ function createIntentParams() {
 }
 
 let codex: CodexScript
+/** Accepted first; the delivery loop hands the send over as `turn/start` after the reply. */
+const handedOverAs = (params: Record<string, unknown>) =>
+  vi.waitFor(() =>
+    expect(codex.live().calls.at(-1)).toMatchObject({ method: 'turn/start', params })
+  )
 let root: string
 let dispatcher: RpcDispatcher
 let bootEnvironmentReads: number
@@ -284,10 +289,10 @@ function textOf(item: AgentJournalRenderItem): string {
 }
 
 /** The durable submission row, which settlement rewrites after the send returns. */
-function submissionOf(clientMessageId: string): AgentJournalSubmission | undefined {
-  return getStructuredAgentSessionHost()
-    ?.journalSnapshot(SESSION)
-    .submissions.find((entry) => entry.clientMessageId === clientMessageId)
+async function submissionOf(clientMessageId: string): Promise<AgentJournalSubmission | undefined> {
+  return (await getStructuredAgentSessionHost()?.journalSnapshot(SESSION))?.submissions.find(
+    (entry) => entry.clientMessageId === clientMessageId
+  )
 }
 
 async function historyPage(
@@ -466,10 +471,7 @@ describe('a structured codex session over agentSession.*', () => {
     // send coalesced into a running turn is answered with that turn's id, so
     // which message landed where is knowable only from the echo.
     expect(sent.submission).toMatchObject({ dispatchState: 'pending', providerItemId: null })
-    expect(codex.live().calls.at(-1)).toMatchObject({
-      method: 'turn/start',
-      params: { threadId: THREAD, clientUserMessageId: sent.clientMessageId }
-    })
+    await handedOverAs({ threadId: THREAD, clientUserMessageId: sent.clientMessageId })
 
     codex.notify('turn/started', { turn: { id: TURN } })
     // Codex echoes the message back carrying the `clientId` it was sent under,
@@ -493,8 +495,8 @@ describe('a structured codex session over agentSession.*', () => {
     // The echo is the first item of this turn, so the settled key is ordinal 0 —
     // minted by the same `identityFor` a history replay computes with, rather
     // than guessed from the turn/start response.
-    await vi.waitFor(() =>
-      expect(submissionOf(sent.clientMessageId)).toMatchObject({
+    await vi.waitFor(async () =>
+      expect(await submissionOf(sent.clientMessageId)).toMatchObject({
         dispatchState: 'accepted',
         providerItemId: `codex:${THREAD}:${TURN}:0`
       })
@@ -557,14 +559,11 @@ describe('a structured codex session over agentSession.*', () => {
     // "delivery unconfirmed" — it carries no identity yet, because the response
     // to a coalesced send names the running turn rather than this message.
     expect(sent.submission).toMatchObject({ dispatchState: 'pending', providerItemId: null })
-    expect(codex.live().calls.at(-1)).toMatchObject({
-      method: 'turn/start',
-      params: {
-        threadId: THREAD,
-        clientUserMessageId: sent.clientMessageId,
-        model: 'gpt-live',
-        effort: 'high'
-      }
+    await handedOverAs({
+      threadId: THREAD,
+      clientUserMessageId: sent.clientMessageId,
+      model: 'gpt-live',
+      effort: 'high'
     })
 
     // ── stream ──────────────────────────────────────────────────────────────
@@ -585,8 +584,8 @@ describe('a structured codex session over agentSession.*', () => {
     expect(itemsOf(stream).filter((item) => textOf(item) === 'list files')).toHaveLength(1)
     // Settled from the echo's own journal identity, so it is by construction the
     // key a replay recomputes for this row.
-    await vi.waitFor(() =>
-      expect(submissionOf(sent.clientMessageId)).toMatchObject({
+    await vi.waitFor(async () =>
+      expect(await submissionOf(sent.clientMessageId)).toMatchObject({
         dispatchState: 'accepted',
         providerItemId: `codex:${THREAD}:${TURN}:0`
       })
diff --git a/src/main/runtime/structured-agent-session-runtime-exit.test.ts b/src/main/runtime/structured-agent-session-runtime-exit.test.ts
index 7a3736b9009b..3da0c6f203d2 100644
--- a/src/main/runtime/structured-agent-session-runtime-exit.test.ts
+++ b/src/main/runtime/structured-agent-session-runtime-exit.test.ts
@@ -32,7 +32,7 @@ describe('structured session runtime provider-exit wiring', () => {
     }
   })
 
-  it('reacquires through the production callback and accepts a distinct next message', async () => {
+  it('does not respawn after a provider exit, and the next message starts a new child', async () => {
     root = await mkdtemp(join(tmpdir(), 'orca-runtime-provider-exit-'))
     operations = 0
     const connections: {
@@ -98,16 +98,17 @@ describe('structured session runtime provider-exit wiring', () => {
         JSON.stringify({ refusal: attached.refusal, connections: connections.length })
       )
     }
-    await host.hold(SESSION, 'desktop-chat:1')
-    const exitedFence = host.deps.store.getRecord(SESSION)?.lease.runtimeFence ?? 0
     const exited = connections[0]
     exited?.handlers.onExit?.(new Error('scripted provider exit'))
-
-    await vi.waitFor(() => expect(connections).toHaveLength(2))
+    await vi.waitFor(() =>
+      expect(host.deps.store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
+    )
+    // Nothing restarts the child on its own; the exit is shown and the chat waits for a send.
+    await new Promise<void>((resolve) => setTimeout(resolve, 50))
+    expect(connections).toHaveLength(1)
     const recoveredFence = host.deps.store.getRecord(SESSION)?.lease.runtimeFence
-    expect(recoveredFence).toBeGreaterThan(exitedFence)
     if (recoveredFence === undefined) {
-      throw new Error('recovered lease omitted its fence')
+      throw new Error('released lease omitted its fence')
     }
     const body = hostTestMessage('continue with a distinct message')
     const envelope = {
@@ -128,7 +129,9 @@ describe('structured session runtime provider-exit wiring', () => {
     await expect(
       host.send({ callerKey: 'runtime-test' }, { envelope, body })
     ).resolves.toMatchObject({ ok: true, value: { submission: { dispatchState: 'pending' } } })
-    expect(turn).toBe(1)
+    // The send answers at acceptance; the delivery loop starts a new child and hands it over.
+    await vi.waitFor(() => expect(connections).toHaveLength(2))
+    await vi.waitFor(() => expect(turn).toBe(1))
   })
 
   it('does not reacquire when the production exit callback comes from a requested close', async () => {
@@ -199,7 +202,6 @@ describe('structured session runtime provider-exit wiring', () => {
         JSON.stringify({ refusal: attached.refusal, connections: connections.length })
       )
     }
-    await host.hold(SESSION, 'desktop-chat:requested-close')
 
     await stopStructuredAgentSessionRuntime()
     await new Promise<void>((resolve) => setImmediate(resolve))
@@ -223,7 +225,7 @@ describe('structured session runtime provider-exit wiring', () => {
       readProcessStartTime: async () => 1_700_000_000_000
     })
     await restarted.restoreReadableSessions()
-    const history = restarted.history({ sessionId: SESSION, direction: 'tail' })
+    const history = await restarted.history({ sessionId: SESSION, direction: 'tail' })
     expect(history.ok && history.page.items.some((item) => item.body.kind === 'status')).toBe(false)
     expect(restarted.deps.store.getRecord(SESSION)?.providerHandleChain.at(-1)?.handle).toEqual({
       provider: 'codex',
@@ -231,7 +233,7 @@ describe('structured session runtime provider-exit wiring', () => {
     })
   })
 
-  it('waits for an in-flight recovery before tearing down the runtime', async () => {
+  it('waits for a start a send began before tearing down the runtime', async () => {
     root = await mkdtemp(join(tmpdir(), 'orca-runtime-recovery-shutdown-'))
     let releaseRecovery!: () => void
     const recoveryReleased = new Promise<void>((resolve) => {
@@ -300,8 +302,28 @@ describe('structured session runtime provider-exit wiring', () => {
     attachParams.envelope.clientOperationId = operationId()
     const attached = await host.attach({ callerKey: 'runtime-test' }, attachParams)
     expect(attached.ok).toBe(true)
-    await host.hold(SESSION, 'desktop-chat:shutdown-race')
-    connections[0]?.handlers.onExit?.(new Error('recovery is still opening'))
+    connections[0]?.handlers.onExit?.(new Error('the first child exited'))
+    await vi.waitFor(() =>
+      expect(host.deps.store.getRecord(SESSION)?.lease.claimStatus).toBe('released')
+    )
+    const body = hostTestMessage('start again')
+    await host.send(
+      { callerKey: 'runtime-test' },
+      {
+        envelope: {
+          sessionId: SESSION,
+          clientOperationId: operationId(),
+          expectedRuntimeFence: host.deps.store.getRecord(SESSION)?.lease.runtimeFence ?? 0,
+          payloadFingerprint: computeAgentSessionPayloadFingerprint({
+            method: 'agentSession.send',
+            sessionId: SESSION,
+            fields: { body }
+          })
+        },
+        body
+      }
+    )
+    // The send's start is still opening its connection when the quit begins.
     await vi.waitFor(() => expect(opens).toBe(2))
 
     let stopped = false
@@ -387,7 +409,6 @@ describe('structured session runtime provider-exit wiring', () => {
     expect(await host.attach({ callerKey: 'runtime-test' }, attachParams)).toMatchObject({
       ok: true
     })
-    await host.hold(SESSION, 'desktop-chat:backstop')
 
     await expect(stopStructuredAgentSessionRuntime()).rejects.toThrow()
     await new Promise<void>((resolve) => setImmediate(resolve))
@@ -396,7 +417,7 @@ describe('structured session runtime provider-exit wiring', () => {
     expect(closeAttempts).toBeGreaterThanOrEqual(2)
     // The callback it delivered neither reacquired nor wrote a technical row.
     expect(connections).toHaveLength(1)
-    const history = host.history({ sessionId: SESSION, direction: 'tail' })
+    const history = await host.history({ sessionId: SESSION, direction: 'tail' })
     expect(history.ok && history.page.items.some((item) => item.body.kind === 'status')).toBe(false)
 
     // The aborted eviction left the session reachable, so the next teardown is a real retry.
diff --git a/src/main/runtime/structured-agent-session-runtime-provider-started.test.ts b/src/main/runtime/structured-agent-session-runtime-provider-started.test.ts
index 602507ef4d7e..91bf91738b5b 100644
--- a/src/main/runtime/structured-agent-session-runtime-provider-started.test.ts
+++ b/src/main/runtime/structured-agent-session-runtime-provider-started.test.ts
@@ -1,5 +1,5 @@
-// A Claude child proving its start must not wait on another session's exit recovery, and must
-// not make that recovery, or the session's own serialized operations, wait on the CLI: the host
+// A Claude child proving its start must not wait on another session's start, and must not make
+// that start, or the session's own serialized operations, wait on the CLI: the host
 // records what the child proved from what the adapter already holds.
 
 import { afterEach, describe, expect, it, vi } from 'vitest'
@@ -18,7 +18,7 @@ afterEach(async () => {
 })
 
 describe('a Claude child proving its start', () => {
-  it("never holds another session's exit recovery, or its own close, on a CLI read", async () => {
+  it("never holds another session's start, or its own close, on a CLI read", async () => {
     claude.behave(STALLED, { stallsControlReads: true })
     const host = await claude.install()
 
@@ -56,23 +56,15 @@ describe('a Claude child proving its start', () => {
     await vi.waitFor(() => expect(closed).toBe(true))
   })
 
-  it("flips to ready while another session's exit recovery is still acquiring", async () => {
+  it("flips to ready while another session's start is still acquiring", async () => {
     const host = await claude.install()
-    await expect(host.attach(CALLER, claude.attachParams(HEALTHY, null))).resolves.toMatchObject({
-      ok: true
-    })
-    await host.hold(HEALTHY, 'surface-1')
-    await waitForStructuredAgentSessionRecovery()
-
-    // Its exit recovery reacquires, and that spawn never returns. The exit hands the lease back
-    // and the restart queued behind it reserves it again at once, so `released` is not a state a
-    // poll can count on seeing; `reserved` with the spawn hanging is what "still acquiring" is.
+    // This start never returns from its spawn, so its lease stays reserved with no child.
     claude.behave(HEALTHY, { spawnHangs: true })
-    claude.child(HEALTHY).exit(new Error('claude stream-json exited (code 1): crashed'))
+    void host.attach(CALLER, claude.attachParams(HEALTHY, null)).catch(() => undefined)
     await vi.waitFor(() =>
       expect(host.deps.store.getRecord(HEALTHY)?.lease.claimStatus).toBe('reserved')
     )
-    expect(claude.children(HEALTHY)).toHaveLength(1)
+    const childrenWhileHung = claude.children(HEALTHY).length
 
     await expect(host.attach(CALLER, claude.attachParams(STALLED, null))).resolves.toMatchObject({
       ok: true
@@ -83,9 +75,9 @@ describe('a Claude child proving its start', () => {
         effort: 'high'
       })
     )
-    // The other recovery is still where it was: reserved, with no child yet.
+    // The other start is still where it was: reserved, with no new child.
     expect(host.deps.store.getRecord(HEALTHY)?.lease.claimStatus).toBe('reserved')
-    expect(claude.children(HEALTHY)).toHaveLength(1)
+    expect(claude.children(HEALTHY)).toHaveLength(childrenWhileHung)
   })
 
   it('is drained by the runtime before teardown proceeds', async () => {
diff --git a/src/main/runtime/structured-agent-session-runtime.test.ts b/src/main/runtime/structured-agent-session-runtime.test.ts
index 7749fc3c25b0..9f4f4e2474de 100644
--- a/src/main/runtime/structured-agent-session-runtime.test.ts
+++ b/src/main/runtime/structured-agent-session-runtime.test.ts
@@ -205,36 +205,6 @@ describe('structured agent-session runtime install', () => {
     vi.restoreAllMocks()
   })
 
-  it('starts orphan reaping and reports failures without failing installation', async () => {
-    stateDirectory = await mkdtemp(join(tmpdir(), 'orca-structured-runtime-'))
-    const failure = new Error('scan failed')
-    const reapOrphanChildren = vi.fn(async () => {
-      throw failure
-    })
-    const onError = vi.fn()
-
-    await expect(
-      ensureStructuredAgentSessionHost({
-        stateDirectory,
-        hostId: HOST_ID,
-        claimKeyId: 'key-1',
-        resolveWorkspacePath: async () => stateDirectory!,
-        resolveClaudeAuthPolicy: () => ({ stripAuthEnv: true }),
-        resolveEnvironment: async () => ({}),
-        reapOrphanChildren,
-        onError
-      })
-    ).resolves.toBeDefined()
-
-    await vi.waitFor(() =>
-      expect(onError).toHaveBeenCalledWith({
-        scope: 'agent-session-orphan-child-reaper',
-        error: failure
-      })
-    )
-    expect(reapOrphanChildren).toHaveBeenCalledWith({ store: expect.anything() })
-  })
-
   it('holds stop until the model catalog has written its coalesced save', async () => {
     stateDirectory = await mkdtemp(join(tmpdir(), 'orca-structured-runtime-'))
     await ensureStructuredAgentSessionHost({
@@ -243,8 +213,7 @@ describe('structured agent-session runtime install', () => {
       claimKeyId: 'key-1',
       resolveWorkspacePath: async () => stateDirectory!,
       resolveClaudeAuthPolicy: () => ({ stripAuthEnv: true }),
-      resolveEnvironment: async () => ({}),
-      reapOrphanChildren: async () => []
+      resolveEnvironment: async () => ({})
     })
     let finishWrite = (): void => {}
     vi.spyOn(agentModelCatalogStore, 'flushPersistence').mockReturnValue(
@@ -265,33 +234,6 @@ describe('structured agent-session runtime install', () => {
     expect(stopped).toBe(true)
   })
 
-  it('logs an orphan-reaper failure when no reporter is configured', async () => {
-    stateDirectory = await mkdtemp(join(tmpdir(), 'orca-structured-runtime-'))
-    const failure = new Error('scan failed')
-    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {})
-
-    await expect(
-      ensureStructuredAgentSessionHost({
-        stateDirectory,
-        hostId: HOST_ID,
-        claimKeyId: 'key-1',
-        resolveWorkspacePath: async () => stateDirectory!,
-        resolveClaudeAuthPolicy: () => ({ stripAuthEnv: true }),
-        resolveEnvironment: async () => ({}),
-        reapOrphanChildren: async () => {
-          throw failure
-        }
-      })
-    ).resolves.toBeDefined()
-
-    await vi.waitFor(() =>
-      expect(consoleError).toHaveBeenCalledWith(
-        '[structured-agent-session] orphan reaper failed',
-        failure
-      )
-    )
-  })
-
   it('does not infer Windows process identity support from an injected reader', async () => {
     stateDirectory = await mkdtemp(join(tmpdir(), 'orca-structured-runtime-'))
     const originalPlatform = process.platform
@@ -355,7 +297,6 @@ describe('a teardown that fails is retried by the next stop', () => {
       claimKeyId: 'key-1',
       resolveWorkspacePath: async () => directory!,
       resolveEnvironment: async () => ({}),
-      reapOrphanChildren: async () => [],
       resolveClaudeAuthPolicy: () => ({ stripAuthEnv: true })
     })
 
diff --git a/src/main/runtime/structured-agent-session-runtime.ts b/src/main/runtime/structured-agent-session-runtime.ts
index a51da3f1c3c6..1659fcd512ea 100644
--- a/src/main/runtime/structured-agent-session-runtime.ts
+++ b/src/main/runtime/structured-agent-session-runtime.ts
@@ -38,7 +38,6 @@ import {
 } from '../native-chat/claude-structured-managed-account-support'
 import { AgentSessionRecordStore } from './agent-session-record-store'
 import { agentSessionStorePath } from './agent-session-record-store-file'
-import { stopOrphanAgentSessionChildren } from './agent-session-orphan-child-reaper'
 import {
   createStructuredAgentSessionOwnerProbe,
   createStructuredAgentSessionOwnerProbes
@@ -104,7 +103,8 @@ export type StructuredAgentSessionRuntimeDeps = {
   onSessionStatusChanged?: StructuredAgentSessionHostDeps['onSessionStatusChanged']
   /** The agent-status store; see `StructuredAgentSessionHostDeps.statusSink`. */
   statusSink?: StructuredAgentSessionHostDeps['statusSink']
-  reapOrphanChildren?: typeof stopOrphanAgentSessionChildren
+  /** See `StructuredAgentSessionHostDeps.hasOpenDispatch`. */
+  hasOpenDispatch?: StructuredAgentSessionHostDeps['hasOpenDispatch']
   /** The account home a structured launch would pin right now, for catalog
    *  reads with no session record. Absent disables the catalog surface. */
   resolveAgentAccountHome?: RuntimeAgentAccountHomeResolver
@@ -197,21 +197,6 @@ async function install(deps: StructuredAgentSessionRuntimeDeps): Promise<Install
     directory: join(deps.stateDirectory, RECORD_STORE_DIR_NAME),
     hostId: deps.hostId
   })
-  // Why: only the durable store can identify a provider child lost before record publication.
-  void (deps.reapOrphanChildren ?? stopOrphanAgentSessionChildren)({ store }).catch((error) => {
-    try {
-      if (deps.onError) {
-        deps.onError({ scope: 'agent-session-orphan-child-reaper', error })
-      } else {
-        console.error('[structured-agent-session] orphan reaper failed', error)
-      }
-    } catch (reportingError) {
-      console.error(
-        '[structured-agent-session] orphan reaper error reporting failed',
-        reportingError
-      )
-    }
-  })
   let host: StructuredAgentSessionHost | null = null
   const lifecycle = createStructuredAgentSessionLifecycleDelivery({
     handle: (event) => host?.handleAdapterEvent(event),
@@ -245,6 +230,8 @@ async function install(deps: StructuredAgentSessionRuntimeDeps): Promise<Install
     modelCatalog: agentModelCatalogStore,
     onBackgroundTasksChanged: (sessionId, state) =>
       host?.publishBackgroundTaskState(sessionId, state),
+    onChildWorkEvidence: (sessionId, evidence) =>
+      host?.publishChildWorkEvidence(sessionId, evidence),
     onDispatchSettledLate,
     onPrimaryThreadStoppedRunning: ({ sessionId }) => {
       void host
@@ -312,6 +299,7 @@ async function install(deps: StructuredAgentSessionRuntimeDeps): Promise<Install
       deps.onError?.({ scope: `structured-agent-session-journal:${sessionId}`, error }),
     ...(deps.onSessionStatusChanged ? { onSessionStatusChanged: deps.onSessionStatusChanged } : {}),
     ...(deps.statusSink ? { statusSink: deps.statusSink } : {}),
+    ...(deps.hasOpenDispatch ? { hasOpenDispatch: deps.hasOpenDispatch } : {}),
     ...(await modelCatalogHostDeps({ store, deps, envResolvers }))
   })
   setStructuredAgentSessionHost(host)
diff --git a/src/main/runtime/structured-agent-session-spawn-token-descendants.test.ts b/src/main/runtime/structured-agent-session-spawn-token-descendants.test.ts
new file mode 100644
index 000000000000..d0650d94f495
--- /dev/null
+++ b/src/main/runtime/structured-agent-session-spawn-token-descendants.test.ts
@@ -0,0 +1,191 @@
+// The spawn token is an environment variable, so every descendant of a provider child inherits it:
+// an editor the agent opened with `code .`, a tmux server, a detached dev server. Carrying the token
+// proves descent, not being the provider child, so the host never signals a process on the token
+// alone. The token scan still answers one question soundly: whether a reservation ever spawned.
+
+import type * as NodeFsPromises from 'node:fs/promises'
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { CODEX_SPAWN_TOKEN_ENV } from '../codex/codex-structured-owner-identity'
+import { AgentSessionRecordStore } from './agent-session-record-store'
+import type { AgentSessionReserveRequest } from './agent-session-reservation-admission'
+import { createStructuredAgentSessionOwnerProbe } from './structured-agent-session-owner-probe'
+import {
+  ensureStructuredAgentSessionHost,
+  stopStructuredAgentSessionRuntime
+} from './structured-agent-session-runtime'
+
+/** pid -> the NUL-separated environment block `/proc/<pid>/environ` serves. */
+const fakeProc = vi.hoisted(() => ({ environs: new Map<number, string>() }))
+
+vi.mock('node:fs/promises', async (importOriginal) => {
+  const fsp = await importOriginal<typeof NodeFsPromises>()
+  const enoent = (path: string) => Object.assign(new Error(`ENOENT: ${path}`), { code: 'ENOENT' })
+  return {
+    ...fsp,
+    readdir: async (...args: Parameters<typeof fsp.readdir>) =>
+      args[0] === '/proc' ? [...fakeProc.environs.keys()].map(String) : fsp.readdir(...args),
+    readFile: async (...args: Parameters<typeof fsp.readFile>) => {
+      const path = String(args[0])
+      if (!path.startsWith('/proc/')) {
+        return fsp.readFile(...args)
+      }
+      const environ = fakeProc.environs.get(Number(path.split('/')[2]))
+      if (environ === undefined || !path.endsWith('/environ')) {
+        throw enoent(path)
+      }
+      return environ
+    }
+  }
+})
+
+const HOST_ID = 'local'
+const NOW = 1_800_000_000_000
+const SESSION = 'session-alpha'
+const MINTED_TOKEN = 'spawn-minted-by-this-store'
+
+function environ(token: string | null): string {
+  return ['PATH=/usr/bin', ...(token ? [`${CODEX_SPAWN_TOKEN_ENV}=${token}`] : [])].join('\0')
+}
+
+function reserveRequest(): AgentSessionReserveRequest {
+  const operationId = `${NOW}-${'1'.padStart(32, '0')}`
+  return {
+    sessionId: SESSION,
+    location: {
+      executionHostId: HOST_ID,
+      wslDistro: null,
+      workspaceId: 'workspace-1',
+      workspaceKind: 'git-worktree'
+    },
+    provider: 'codex',
+    accountHome: { variable: 'CODEX_HOME', path: '/home/dev/.codex' },
+    expectedFence: null,
+    spawnToken: MINTED_TOKEN,
+    claimKeyId: 'key-1',
+    handoffOperationId: null,
+    probe: { outcome: 'indeterminate', reason: 'no previous owner' },
+    operation: { callerKey: 'client-1', operationId, fingerprint: 'fp-1' },
+    now: NOW
+  }
+}
+
+const originalPlatform = process.platform
+let stateDirectory: string
+
+beforeEach(async () => {
+  stateDirectory = await mkdtemp(join(tmpdir(), 'orca-spawn-token-descendants-'))
+  Object.defineProperty(process, 'platform', { configurable: true, value: 'linux' })
+})
+
+afterEach(async () => {
+  await stopStructuredAgentSessionRuntime()
+  Object.defineProperty(process, 'platform', { configurable: true, value: originalPlatform })
+  fakeProc.environs.clear()
+  vi.restoreAllMocks()
+  await rm(stateDirectory, { recursive: true, force: true })
+})
+
+function openStore(): Promise<AgentSessionRecordStore> {
+  return AgentSessionRecordStore.open({
+    directory: join(stateDirectory, 'agent-sessions'),
+    hostId: HOST_ID
+  })
+}
+
+describe('a process that inherited a spawn token', () => {
+  it('is never signalled when the host installs and reconciles, even when this store minted the token', async () => {
+    // A chat ran and ended: its root exited and the lease was released, clearing the token.
+    const seed = await openStore()
+    const reserved = await seed.reserveOwner(reserveRequest())
+    const fence = reserved.record.lease.runtimeFence
+    await seed.commitProcessIdentity({
+      sessionId: SESSION,
+      fence,
+      process: { hostId: HOST_ID, pid: 4242, processStartTimeMs: NOW, spawnToken: MINTED_TOKEN },
+      now: NOW
+    })
+    await seed.proveOwner({
+      sessionId: SESSION,
+      fence,
+      link: {
+        linkId: 'link-1',
+        handle: { provider: 'codex', threadId: 'thread-1' },
+        origin: 'created',
+        mintedAtFence: fence,
+        observedAt: NOW
+      },
+      now: NOW
+    })
+    const released = await seed.evictProvenDeadOwner({
+      sessionId: SESSION,
+      expectedFence: fence,
+      probe: { outcome: 'pid-absent' },
+      now: NOW
+    })
+    expect(released.lease).toMatchObject({ claimStatus: 'released', reservedSpawnToken: null })
+
+    // The editor the agent opened detached into its own group and outlived the chat, still
+    // carrying the token; another descendant carries a token no store here ever minted.
+    fakeProc.environs.set(1, environ(null))
+    fakeProc.environs.set(5151, environ(MINTED_TOKEN))
+    fakeProc.environs.set(6161, environ('spawn-foreign'))
+    const kill = vi.spyOn(process, 'kill').mockImplementation(() => true)
+
+    const host = await ensureStructuredAgentSessionHost({
+      stateDirectory,
+      hostId: HOST_ID,
+      claimKeyId: 'key-1',
+      resolveWorkspacePath: async () => stateDirectory,
+      resolveClaudeAuthPolicy: () => ({ stripAuthEnv: true }),
+      resolveEnvironment: async () => ({})
+    })
+    await host.reconcileRestartLeases()
+    // Install work that is not awaited would have run by now; nothing here waits on a timer.
+    await new Promise((resolve) => setTimeout(resolve, 50))
+
+    expect(kill.mock.calls.filter(([, signal]) => signal !== 0)).toEqual([])
+  })
+})
+
+describe('the reservation owner probe', () => {
+  async function reconcileReservation(): Promise<AgentSessionRecordStore> {
+    const crashed = await openStore()
+    await crashed.reserveOwner(reserveRequest())
+    // The restart after a crash between reservation and recorded identity.
+    const store = await openStore()
+    await store.reconcileOnRestart({
+      probe: createStructuredAgentSessionOwnerProbe(HOST_ID),
+      now: NOW
+    })
+    return store
+  }
+
+  it('proves a reservation never spawned when the host scan finds no process carrying its token', async () => {
+    fakeProc.environs.set(1, environ(null))
+    fakeProc.environs.set(6161, environ('spawn-foreign'))
+
+    const store = await reconcileReservation()
+
+    expect(store.getRecord(SESSION)?.lease).toMatchObject({
+      claimStatus: 'released',
+      deathEvidence: { kind: 'pid-absent', detail: 'reservation never spawned' }
+    })
+  })
+
+  it('claims no absence when the host scan finds a process carrying the token', async () => {
+    fakeProc.environs.set(5151, environ(MINTED_TOKEN))
+    const kill = vi.spyOn(process, 'kill').mockImplementation(() => true)
+
+    const store = await reconcileReservation()
+
+    // Released without evidence, and the process carrying the token is left alone.
+    expect(store.getRecord(SESSION)?.lease).toMatchObject({
+      claimStatus: 'released',
+      deathEvidence: null
+    })
+    expect(kill.mock.calls.filter(([, signal]) => signal !== 0)).toEqual([])
+  })
+})
diff --git a/src/main/runtime/structured-agent-session-support-probe.test.ts b/src/main/runtime/structured-agent-session-support-probe.test.ts
index 07a2b671f0a7..ea0ab3298d9b 100644
--- a/src/main/runtime/structured-agent-session-support-probe.test.ts
+++ b/src/main/runtime/structured-agent-session-support-probe.test.ts
@@ -22,19 +22,15 @@ function setPlatform(platform: NodeJS.Platform): void {
 
 type InstallEffects = {
   storeOpened: boolean
-  reaperStarted: boolean
 }
 
-/** Stands in for `install()` by performing the two effects it performs, so a probe that
+/** Stands in for `install()` by performing the effect it performs, so a probe that
  *  reinstalls the host is caught by what the install *does*, not by a call count alone. */
 function stubStructuredHostInstall(runtime: OrcaRuntimeService): {
   effects: InstallEffects
   ensure: ReturnType<typeof vi.fn>
 } {
-  const effects: InstallEffects = {
-    storeOpened: false,
-    reaperStarted: false
-  }
+  const effects: InstallEffects = { storeOpened: false }
   // `supportsCreate` answers as the real Codex adapter would, so a probe that reinstalls the host
   // still returns the right answer and fails on the install effects alone.
   const host = {
@@ -44,7 +40,6 @@ function stubStructuredHostInstall(runtime: OrcaRuntimeService): {
   }
   const ensure = vi.fn(async () => {
     effects.storeOpened = true
-    effects.reaperStarted = true
     setStructuredAgentSessionHost(host as never)
   })
   vi.spyOn(runtime, 'ensureStructuredAgentSessionHost').mockImplementation(ensure)
@@ -94,10 +89,7 @@ async function expectSupportWithoutInstall(input: {
 
   expect(answers).toEqual(Array(input.repetitions ?? 1).fill(input.expected))
   expect(ensure).not.toHaveBeenCalled()
-  expect(effects).toEqual({
-    storeOpened: false,
-    reaperStarted: false
-  })
+  expect(effects).toEqual({ storeOpened: false })
   expect(getStructuredAgentSessionHost()).toBeNull()
 }
 
@@ -193,10 +185,7 @@ describe('structured agent-session create-support probe', () => {
     await runtime.prepareStructuredAgentSessionStartupRestoration()
 
     expect(ensure).toHaveBeenCalledTimes(1)
-    expect(effects).toEqual({
-      storeOpened: true,
-      reaperStarted: true
-    })
+    expect(effects).toEqual({ storeOpened: true })
     expect(
       (getStructuredAgentSessionHost() as unknown as { reconcileRestartLeases: () => void })
         .reconcileRestartLeases
diff --git a/src/main/runtime/structured-chat-coordinator-fake-codex-fixture.ts b/src/main/runtime/structured-chat-coordinator-fake-codex-fixture.ts
new file mode 100644
index 000000000000..687569631931
--- /dev/null
+++ b/src/main/runtime/structured-chat-coordinator-fake-codex-fixture.ts
@@ -0,0 +1,175 @@
+// A fake Codex app-server for the structured chat coordinator mail tests: it answers the JSON-RPC
+// calls the adapter makes, and misbehaves on the knobs in `providerFaults`.
+
+import type {
+  CodexAppServerConnection,
+  CodexAppServerConnectionHandlers,
+  openCodexAppServerConnection
+} from '../codex/codex-app-server-connection'
+import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
+import { attachFingerprintFields } from '../native-chat/agent-session-wire/structured-agent-session-attach'
+import { isRecord } from './rpc/orchestration-session-caller-test-fixture'
+
+const WORKSPACE = 'workspace-1'
+
+export type FakeConnection = Omit<CodexAppServerConnection, 'closed'> & {
+  closed: boolean
+  handlers: CodexAppServerConnectionHandlers
+  threadId: string | null
+  turns: { clientUserMessageId: string; text: string }[]
+}
+
+/** How the fake provider misbehaves; reset before each test. */
+export const providerFaults: {
+  dieBeforeEveryEcho: boolean
+  refuseTurnStarts: number
+  /** Refuses every start with this error while set. */
+  refuseStart: (() => Error) | null
+  /** How long a start takes before it answers. */
+  startDelayMs: number
+  /** Kills the app-server while it takes a turn: its exit and the failed call, in either order. */
+  crashOnTurnStart: 'off' | 'exit-then-throw' | 'throw-then-exit'
+  starts: number
+  turnStarts: number
+} = {
+  dieBeforeEveryEcho: false,
+  refuseTurnStarts: 0,
+  refuseStart: null,
+  startDelayMs: 0,
+  crashOnTurnStart: 'off',
+  starts: 0,
+  turnStarts: 0
+}
+
+export function fakeCodex() {
+  const connections: FakeConnection[] = []
+  let turnCounter = 0
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a fake answering the JSON-RPC calls the adapter makes, as the shipped integration test does.
+  const openConnection = (async (_launch, handlers = {}) => {
+    providerFaults.starts += 1
+    if (providerFaults.startDelayMs) {
+      await new Promise((resolve) => setTimeout(resolve, providerFaults.startDelayMs))
+    }
+    if (providerFaults.refuseStart) {
+      throw providerFaults.refuseStart()
+    }
+    const connection: FakeConnection = {
+      handlers,
+      threadId: null,
+      turns: [],
+      pid: 4321,
+      closed: false,
+      request: async (method, params) => {
+        const input = isRecord(params) ? params : {}
+        if (method === 'thread/start') {
+          connection.threadId = `thread-${connections.length}`
+          return { thread: { id: connection.threadId } }
+        }
+        if (method === 'thread/resume') {
+          connection.threadId = String(input.threadId)
+          return { thread: { id: connection.threadId } }
+        }
+        if (method === 'turn/start') {
+          providerFaults.turnStarts += 1
+          if (providerFaults.crashOnTurnStart === 'exit-then-throw') {
+            connection.handlers.onExit?.(new Error('app-server crashed'))
+            throw new Error('connection closed')
+          }
+          if (providerFaults.crashOnTurnStart === 'throw-then-exit') {
+            setTimeout(() => connection.handlers.onExit?.(new Error('app-server crashed')), 0)
+            throw new Error('connection closed')
+          }
+          if (providerFaults.refuseTurnStarts > 0) {
+            providerFaults.refuseTurnStarts -= 1
+            throw new Error('turn/start refused')
+          }
+          turnCounter += 1
+          connection.turns.push({
+            clientUserMessageId: String(input.clientUserMessageId),
+            text: JSON.stringify(input.input)
+          })
+          if (providerFaults.dieBeforeEveryEcho) {
+            setTimeout(() => connection.handlers.onExit?.(new Error('provider died')), 0)
+          }
+          return { turn: { id: `turn-${turnCounter}` } }
+        }
+        if (method === 'model/list') {
+          return {
+            data: [
+              {
+                model: 'gpt-live',
+                displayName: 'GPT Live',
+                hidden: false,
+                supportedReasoningEfforts: [{ reasoningEffort: 'medium', description: 'Balanced' }],
+                defaultReasoningEffort: 'medium',
+                isDefault: true
+              }
+            ],
+            nextCursor: null
+          }
+        }
+        return {}
+      },
+      notify: () => {},
+      respond: () => {},
+      respondWithError: () => {},
+      close: async () => {
+        connection.closed = true
+        return true
+      }
+    }
+    connections.push(connection)
+    return connection
+  }) as typeof openCodexAppServerConnection
+  return { connections, openConnection }
+}
+
+let operations = 0
+export function operationId(): string {
+  operations += 1
+  return `${Date.now()}-${operations.toString(16).padStart(32, '0')}`
+}
+
+export function attachParams(sessionId: string) {
+  const params = {
+    location: {
+      executionHostId: 'local' as const,
+      wslDistro: null,
+      workspaceId: WORKSPACE,
+      workspaceKind: 'git-worktree' as const
+    },
+    provider: 'codex' as const,
+    agent: 'codex' as const,
+    accountHome: { variable: 'CODEX_HOME' as const, path: '/home/dev/.codex' },
+    runtimeKind: 'native' as const
+  }
+  const envelope = {
+    sessionId,
+    clientOperationId: operationId(),
+    expectedRuntimeFence: null,
+    payloadFingerprint: ''
+  }
+  return {
+    ...params,
+    envelope: {
+      ...envelope,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.attach',
+        sessionId,
+        fields: attachFingerprintFields({ ...params, envelope })
+      })
+    }
+  }
+}
+
+/** A healthy provider and a fresh id sequence, before each test. */
+export function resetProviderFaults(): void {
+  operations = 0
+  providerFaults.dieBeforeEveryEcho = false
+  providerFaults.refuseTurnStarts = 0
+  providerFaults.refuseStart = null
+  providerFaults.startDelayMs = 0
+  providerFaults.crashOnTurnStart = 'off'
+  providerFaults.starts = 0
+  providerFaults.turnStarts = 0
+}
diff --git a/src/main/runtime/structured-chat-coordinator-mail.test.ts b/src/main/runtime/structured-chat-coordinator-mail.test.ts
new file mode 100644
index 000000000000..a36912fae955
--- /dev/null
+++ b/src/main/runtime/structured-chat-coordinator-mail.test.ts
@@ -0,0 +1,884 @@
+// A worker's result reaching the structured chat that coordinates it, end to end in one process.
+//
+// Real: the structured agent-session host, its record store, journal, lease and Codex adapter; the
+// orchestration database, RPC dispatcher and methods; the runtime's pointer lanes. Fake: only the
+// Codex app-server child, which answers the JSON-RPC calls the real one does.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types'
+import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key'
+import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
+import { ORCHESTRATION_CONTRACT_VERSION } from '../../shared/protocol-version'
+import {
+  AgentSessionAcquisitionRefusal,
+  AgentSessionPreSpawnError
+} from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
+import type { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store'
+import { AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS } from '../../shared/agent-session-host-authority'
+import { refuse } from '../../shared/agent-session-wire-refusals'
+import { OrcaRuntimeService } from './orca-runtime'
+import { OrchestrationDb } from './orchestration/db'
+import { localOrchestrationCliCommand } from './orchestration/cli-command'
+import { formatMessagePointer } from './orchestration/formatter'
+import { currentRunCoordinatorOrcaSessionId } from './orchestration/db/runs/run-coordinator-orca-session'
+import type { RpcRequest } from './rpc/core'
+import { RpcDispatcher } from './rpc/dispatcher'
+import { ORCHESTRATION_METHODS } from './rpc/methods/orchestration'
+import { idOf, isRecord, resultOf } from './rpc/orchestration-session-caller-test-fixture'
+import {
+  ensureStructuredAgentSessionHost,
+  stopStructuredAgentSessionRuntime
+} from './structured-agent-session-runtime'
+import {
+  attachParams,
+  fakeCodex,
+  operationId,
+  providerFaults,
+  resetProviderFaults,
+  type FakeConnection
+} from './structured-chat-coordinator-fake-codex-fixture'
+
+const COORDINATOR = '4a1f6c2e-8b3d-4e7a-9c15-0d2b6e8f1a37'
+const PEER_CHAT = '7e3b9d15-2c4a-4f86-a0b1-5c9e2d7f3b64'
+const WORKER_PANE = 'tab_worker:bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb'
+const WORKER_2_PANE = 'tab_worker2:cccccccc-cccc-4ccc-8ccc-cccccccccccc'
+
+let codex: ReturnType<typeof fakeCodex>
+let root: string
+let runtime: OrcaRuntimeService
+let db: OrchestrationDb
+let host: StructuredAgentSessionHost
+let dispatcher: RpcDispatcher
+let requests = 0
+
+function request(
+  method: string,
+  params: Record<string, unknown>,
+  options: { sessionId?: string; capability?: string } = {}
+): RpcRequest {
+  requests += 1
+  return {
+    id: `rpc-${requests}`,
+    authToken: 'test',
+    method,
+    params,
+    orchestrationContractVersion: ORCHESTRATION_CONTRACT_VERSION,
+    orchestrationRequestId: `req-${requests}`,
+    ...(options.sessionId
+      ? { orchestrationCompatibilityEvidence: { agentSessionId: options.sessionId } }
+      : {}),
+    ...(options.capability ? { orchestrationCapability: options.capability } : {})
+  }
+}
+
+async function call(
+  method: string,
+  params: Record<string, unknown>,
+  options?: { sessionId?: string; capability?: string }
+): Promise<Record<string, unknown>> {
+  const response = await dispatcher.dispatch(request(method, params, options))
+  if (!response.ok) {
+    throw new Error(`${method} failed: ${JSON.stringify(response)}`)
+  }
+  return resultOf(response)
+}
+
+async function openChat(sessionId: string): Promise<FakeConnection> {
+  const attached = await host.attach({ callerKey: 'test-surface' }, attachParams(sessionId))
+  expect(attached, JSON.stringify(attached)).toMatchObject({ ok: true })
+  await host.setSessionTabVisibility(sessionId, true)
+  threadBySession.set(sessionId, codex.connections.at(-1)!.threadId!)
+  return connectionFor(sessionId)
+}
+
+const threadBySession = new Map<string, string>()
+
+function connectionFor(sessionId: string): FakeConnection {
+  const connection = codex.connections.findLast(
+    (candidate) => candidate.threadId === threadBySession.get(sessionId)
+  )
+  if (!connection) {
+    throw new Error(`no app-server for ${sessionId}`)
+  }
+  return connection
+}
+
+/** Codex's own sequence for a turn: it starts, echoes the user message, and completes. */
+async function settleTurn(sessionId: string, turnIndex: number): Promise<void> {
+  const connection = connectionFor(sessionId)
+  const turn = connection.turns[turnIndex]!
+  const turnId = `turn-${turnIndex + 1}`
+  const notify = (method: string, params: unknown) =>
+    connection.handlers.onNotification?.(method, params)
+  notify('turn/started', { turn: { id: turnId } })
+  notify('item/completed', {
+    item: {
+      type: 'userMessage',
+      id: `echo-${turn.clientUserMessageId}`,
+      clientId: turn.clientUserMessageId,
+      content: [{ type: 'text', text: 'pointer' }]
+    }
+  })
+  notify('turn/completed', { turn: { id: turnId } })
+  await host.flushStreamedEvents(sessionId)
+}
+
+/** A user message typed into the chat, as the chat surface sends it. */
+function sendUserMessage(sessionId: string, text: string) {
+  const body = {
+    kind: 'message' as const,
+    role: 'user' as const,
+    blocks: [{ type: 'text' as const, text }]
+  }
+  return host.send(
+    { callerKey: 'test-surface' },
+    {
+      envelope: {
+        sessionId,
+        clientOperationId: operationId(),
+        expectedRuntimeFence: host.deps.store.getRecord(sessionId)!.lease.runtimeFence,
+        payloadFingerprint: computeAgentSessionPayloadFingerprint({
+          method: 'agentSession.send',
+          sessionId,
+          fields: { body }
+        })
+      },
+      body
+    }
+  )
+}
+
+async function userTexts(sessionId: string): Promise<string[]> {
+  return (await host.journalSnapshot(sessionId)).items.flatMap((item: AgentJournalRenderItem) =>
+    item.body?.kind === 'message' && item.body.role === 'user'
+      ? item.body.blocks.map((block) => (block.type === 'text' ? block.text : ''))
+      : []
+  )
+}
+
+/** A capability-backed terminal worker under the coordinator's Run, and its worker_done. */
+async function finishWorker(
+  taskId: string,
+  worker: { handle: string; paneKey: string } = { handle: 'term_worker', paneKey: WORKER_PANE }
+): Promise<void> {
+  const started = db.createStartingWorkerDispatch({
+    creator: { kind: 'system' },
+    maxDepth: Number.MAX_SAFE_INTEGER,
+    taskId,
+    startOptions: {}
+  })
+  const capability = db.prepareStartingWorkerAuthority({
+    dispatchId: started.dispatch.id,
+    handle: worker.handle,
+    paneKey: worker.paneKey,
+    processIncarnation: `runtime_test:${worker.handle}:1`,
+    worktreeId: 'repo::worker',
+    effects: [],
+    setupState: 'not_applicable'
+  })
+  db.markWorkerDispatchReady(started.dispatch.id)
+  await call(
+    'orchestration.send',
+    {
+      from: worker.handle,
+      subject: 'Done',
+      type: 'worker_done',
+      payload: JSON.stringify({ taskId, dispatchId: started.dispatch.id, outcome: 'succeeded' })
+    },
+    { capability }
+  )
+}
+
+async function coordinatorRunAndTask(): Promise<{ runId: string; taskId: string }> {
+  const created = await call(
+    'orchestration.runCreate',
+    { objective: 'ship' },
+    {
+      sessionId: COORDINATOR
+    }
+  )
+  const runId = idOf(created.run)
+  const task = await call(
+    'orchestration.taskCreate',
+    { spec: 'build it' },
+    {
+      sessionId: COORDINATOR
+    }
+  )
+  return { runId, taskId: idOf(task.task) }
+}
+
+/** `/clear` as the chat surface runs it: the conversation continues in a new session. */
+async function clearChat(sessionId: string): Promise<string> {
+  const command = 'clear' as const
+  const cleared = await host.conversationCommand(
+    { callerKey: 'test-surface' },
+    {
+      command,
+      envelope: {
+        sessionId,
+        clientOperationId: operationId(),
+        expectedRuntimeFence: host.deps.store.getRecord(sessionId)!.lease.runtimeFence,
+        payloadFingerprint: computeAgentSessionPayloadFingerprint({
+          method: 'agentSession.conversationCommand',
+          sessionId,
+          fields: { command }
+        })
+      }
+    }
+  )
+  const successor = cleared.ok ? cleared.value.replacementSessionId : undefined
+  if (!successor) {
+    throw new Error(`clear failed: ${JSON.stringify(cleared)}`)
+  }
+  // The surface swaps the tab over to the session that continues the chat.
+  await host.setSessionTabVisibility(sessionId, false)
+  await host.setSessionTabVisibility(successor, true)
+  threadBySession.set(successor, codex.connections.at(-1)!.threadId!)
+  return successor
+}
+
+beforeEach(async () => {
+  resetProviderFaults()
+  root = await mkdtemp(join(tmpdir(), 'orca-structured-coordinator-mail-'))
+  codex = fakeCodex()
+  db = new OrchestrationDb(':memory:')
+  runtime = startRuntime()
+  host = await ensureStructuredAgentSessionHost({
+    stateDirectory: root,
+    hostId: 'local',
+    claimKeyId: 'key-1',
+    resolveWorkspacePath: async (workspaceId) => `/repos/${workspaceId}`,
+    resolveCodexCommand: () => '/usr/local/bin/codex',
+    resolveClaudeAuthPolicy: () => ({ stripAuthEnv: true }),
+    resolveEnvironment: async () => ({ PATH: '/usr/bin' }),
+    openCodexConnection: codex.openConnection,
+    readProcessStartTime: async () => 1_700_000_000_000,
+    // The same call the runtime's own host install makes on every status change.
+    onSessionStatusChanged: (summary) => runtime.onStructuredSessionStatusForMail(summary)
+  })
+  dispatcher = new RpcDispatcher({ runtime, methods: ORCHESTRATION_METHODS })
+})
+
+/** The runtime over the shared database; a second call is what an Orca restart leaves behind. */
+function startRuntime(): OrcaRuntimeService {
+  const started = new OrcaRuntimeService()
+  started.setOrchestrationDb(db)
+  vi.spyOn(started, 'ensureStructuredAgentSessionHost').mockResolvedValue()
+  vi.spyOn(started, 'getTerminalPaneKey').mockImplementation((handle) =>
+    handle === 'term_worker' ? WORKER_PANE : handle === 'term_worker_2' ? WORKER_2_PANE : null
+  )
+  return started
+}
+
+afterEach(async () => {
+  await stopStructuredAgentSessionRuntime()
+  db.close()
+  vi.restoreAllMocks()
+  await rm(root, { recursive: true, force: true })
+})
+
+// Pointers are sent on asynchronous edges; the default 1s wait is too tight under a loaded parallel run.
+const WAIT = { timeout: 10_000 }
+
+const POINTER =
+  /You have 1 orchestration message\. Run `orca(-dev)? orchestration check --run run_\w+`\./
+
+/** The text the PTY lane types into a local terminal for this mailbox, byte for byte. */
+function ptyPointer(mailboxHandle: string): string {
+  return formatMessagePointer(1, mailboxHandle, localOrchestrationCliCommand()).trim()
+}
+
+/** The text of a turn the fake provider received. */
+function turnText(turn: { text: string }): string {
+  const input: unknown = JSON.parse(turn.text)
+  return Array.isArray(input)
+    ? input.map((item: unknown) => (isRecord(item) ? String(item.text) : '')).join('')
+    : ''
+}
+
+describe('a worker result reaches the structured chat that coordinates it', () => {
+  it('lands as a turn in the coordinator journal, and a flagless check returns the worker_done', async () => {
+    const chat = await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+
+    await finishWorker(taskId)
+
+    // No user action: the result itself sends the chat a turn through the host's send.
+    await vi.waitFor(() => expect(chat.turns).toHaveLength(1), WAIT)
+    expect(turnText(chat.turns[0]!)).toBe(ptyPointer(`run:${runId}`))
+    await settleTurn(COORDINATOR, 0)
+    expect(await userTexts(COORDINATOR)).toEqual([expect.stringMatching(POINTER)])
+
+    const checked = await call('orchestration.check', {}, { sessionId: COORDINATOR })
+    expect(checked).toMatchObject({
+      runId,
+      count: 1,
+      messages: [{ type: 'worker_done', from_handle: 'term_worker' }]
+    })
+  })
+
+  it('does not send a second pointer when the delivery is retried', async () => {
+    const chat = await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    await finishWorker(taskId)
+    await vi.waitFor(() => expect(chat.turns).toHaveLength(1), WAIT)
+
+    // A pending send is not an acknowledgement, so the mail is retained and retried on every edge
+    // until the host confirms it: before the echo, and again at the turn's idle edge.
+    runtime.deliverPendingMessagesForHandle(`run:${runId}`)
+    await settleTurn(COORDINATOR, 0)
+    runtime.deliverPendingMessagesForHandle(`run:${runId}`)
+    await vi.waitFor(
+      () => expect(db.getUndeliveredUnreadMessages(`run:${runId}`, undefined, {})).toEqual([]),
+      WAIT
+    )
+    expect(chat.turns).toHaveLength(1)
+    expect(await userTexts(COORDINATOR)).toHaveLength(1)
+  })
+
+  /** Fires both edges and waits until every gate read they started has answered. */
+  async function edgesAnswered(): Promise<void> {
+    const reads = vi.spyOn(host, 'journalSnapshot')
+    runtime.onStructuredSessionStatusForMail({ sessionId: COORDINATOR, status: null })
+    runtime.onStructuredSessionStatusForMail({ sessionId: COORDINATOR, status: 'idle' })
+    await vi.waitFor(() => expect(reads).toHaveBeenCalled(), WAIT)
+    await Promise.all(reads.mock.results.map((read) => read.value))
+    await new Promise((resolve) => setImmediate(resolve))
+    reads.mockRestore()
+  }
+
+  /** The operation ids the coordinator's journal recorded for its pointer turns. */
+  async function pointerSends(): Promise<string[]> {
+    const snapshot = await host.journalSnapshot(COORDINATOR)
+    return snapshot.submissions
+      .filter((submission) =>
+        snapshot.items.some(
+          (item) =>
+            item.itemId === agentJournalSubmissionKey(submission.clientMessageId) &&
+            item.body?.kind === 'message' &&
+            item.body.blocks.some((block) => block.type === 'text' && POINTER.test(block.text))
+        )
+      )
+      .map((submission) => submission.clientMessageId)
+  }
+
+  it('keeps a pointer whose provider died before the echo, and points it after the next turn that runs', async () => {
+    // A provider that dies before echoing never ran the pointer: the mail stays unpointed, and
+    // neither the death's own edge nor an idle one starts the provider again for it.
+    const chat = await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    await finishWorker(taskId)
+    await vi.waitFor(() => expect(chat.turns).toHaveLength(1), WAIT)
+
+    chat.handlers.onExit?.(new Error('provider died before the echo'))
+    const before = codex.connections.length
+    await edgesAnswered()
+    await edgesAnswered()
+    expect(codex.connections.length).toBe(before)
+    expect(db.getUndeliveredUnreadMessages(`run:${runId}`, undefined, {})).toHaveLength(1)
+
+    // The user's next message starts the agent; once its turn runs, the pointer follows it.
+    expect(await sendUserMessage(COORDINATOR, 'again')).toMatchObject({ ok: true })
+    await vi.waitFor(() => expect(codex.connections.length).toBe(before + 1), WAIT)
+    const revived = connectionFor(COORDINATOR)
+    await vi.waitFor(() => expect(revived.turns).toHaveLength(1), WAIT)
+    expect(revived.turns[0]!.text).toContain('again')
+    await settleTurn(COORDINATOR, 0)
+    await vi.waitFor(() => expect(revived.turns).toHaveLength(2), WAIT)
+    expect(revived.turns[1]!.text).toMatch(POINTER)
+    await settleTurn(COORDINATOR, 1)
+    await vi.waitFor(
+      () => expect(db.getUndeliveredUnreadMessages(`run:${runId}`, undefined, {})).toEqual([]),
+      WAIT
+    )
+  })
+
+  it('does not restart a provider that dies before every echo, however many edges follow', async () => {
+    // What this pins: each death's own status edge used to re-point the mail, and that send started
+    // the provider again, about once a second for as long as the mail was unread.
+    await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    providerFaults.dieBeforeEveryEcho = true
+    const before = codex.connections.length
+    await finishWorker(taskId)
+    await vi.waitFor(() => expect(providerFaults.turnStarts).toBe(1), WAIT)
+    // A fixed window, not a poll: a respawn loop would restart it several times in it.
+    await new Promise((resolve) => setTimeout(resolve, 1_500))
+    await edgesAnswered()
+    expect(codex.connections.length - before).toBe(0)
+    expect(providerFaults.turnStarts).toBe(1)
+    expect(db.getUndeliveredUnreadMessages(`run:${runId}`, undefined, {})).toHaveLength(1)
+  })
+
+  it.each(['exit-then-throw', 'throw-then-exit'] as const)(
+    'does not restart a provider that crashed while taking the pointer turn (%s)',
+    async (crash) => {
+      // The crash settles the send `unknown` with the connection's own error, not as a provider
+      // exit; every status edge after it re-pointed the mail and started the provider again.
+      await openChat(COORDINATOR)
+      const { runId, taskId } = await coordinatorRunAndTask()
+      providerFaults.crashOnTurnStart = crash
+      const before = providerFaults.starts
+      await finishWorker(taskId)
+      await vi.waitFor(() => expect(providerFaults.turnStarts).toBe(1), WAIT)
+      await new Promise((resolve) => setTimeout(resolve, 1_500))
+      await edgesAnswered()
+      expect(providerFaults.starts - before).toBe(0)
+      expect(providerFaults.turnStarts).toBe(1)
+      expect(await pointerSends()).toHaveLength(1)
+      expect(db.getUndeliveredUnreadMessages(`run:${runId}`, undefined, {})).toHaveLength(1)
+    }
+  )
+
+  it('points the next result once after a transient death, then holds nothing', async () => {
+    await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    const second = await call(
+      'orchestration.taskCreate',
+      { spec: 'more' },
+      { sessionId: COORDINATOR }
+    )
+    providerFaults.dieBeforeEveryEcho = true
+    await finishWorker(taskId)
+    await vi.waitFor(() => expect(providerFaults.turnStarts).toBe(1), WAIT)
+    await edgesAnswered()
+    // The death was transient. A new result is new mail: one pointer for both, one start.
+    providerFaults.dieBeforeEveryEcho = false
+    const before = providerFaults.starts
+    await finishWorker(idOf(second.task), { handle: 'term_worker_2', paneKey: WORKER_2_PANE })
+    await vi.waitFor(() => expect(providerFaults.turnStarts).toBe(2), WAIT)
+    const revived = connectionFor(COORDINATOR)
+    expect(turnText(revived.turns.at(-1)!)).toBe(
+      formatMessagePointer(2, `run:${runId}`, localOrchestrationCliCommand()).trim()
+    )
+    await settleTurn(COORDINATOR, revived.turns.length - 1)
+    await vi.waitFor(
+      () => expect(db.getUndeliveredUnreadMessages(`run:${runId}`, undefined, {})).toEqual([]),
+      WAIT
+    )
+    expect(providerFaults.starts - before).toBe(1)
+    expect(providerFaults.turnStarts).toBe(2)
+  })
+
+  it('leaves a pointer the person stopped while its agent was starting stopped', async () => {
+    await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    await host.close(COORDINATOR)
+    providerFaults.startDelayMs = 400
+    const before = providerFaults.starts
+    await finishWorker(taskId)
+    await vi.waitFor(() => expect(providerFaults.starts).toBe(before + 1), WAIT)
+    // The person presses Stop while the agent is still starting.
+    const cancelled = await host.cancel(
+      { callerKey: 'test-surface' },
+      {
+        envelope: {
+          sessionId: COORDINATOR,
+          clientOperationId: operationId(),
+          expectedRuntimeFence: host.deps.store.getRecord(COORDINATOR)!.lease.runtimeFence,
+          payloadFingerprint: computeAgentSessionPayloadFingerprint({
+            method: 'agentSession.cancel',
+            sessionId: COORDINATOR,
+            fields: { turnId: 'turn-x' }
+          })
+        },
+        turnId: 'turn-x'
+      }
+    )
+    expect(cancelled).toMatchObject({ ok: true })
+    providerFaults.startDelayMs = 0
+    // A fixed window, not a poll: a re-point would start the agent again in it.
+    await new Promise((resolve) => setTimeout(resolve, 1_500))
+    expect(providerFaults.starts - before).toBe(1)
+    expect(await pointerSends()).toHaveLength(1)
+    await edgesAnswered()
+    expect(providerFaults.starts - before).toBe(1)
+    expect(providerFaults.turnStarts).toBe(0)
+    expect(db.getUndeliveredUnreadMessages(`run:${runId}`, undefined, {})).toHaveLength(1)
+  })
+
+  it('points a held pointer once more after Orca restarts, under a new id', async () => {
+    await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    providerFaults.dieBeforeEveryEcho = true
+    await finishWorker(taskId)
+    await vi.waitFor(() => expect(providerFaults.turnStarts).toBe(1), WAIT)
+    await edgesAnswered()
+    const [held] = await pointerSends()
+
+    // The next process: a fresh runtime over the same database redrives restored mail. The
+    // provider still dies, so exactly one start proves it is pointed once, not in a loop.
+    runtime = startRuntime()
+    dispatcher = new RpcDispatcher({ runtime, methods: ORCHESTRATION_METHODS })
+    const before = providerFaults.starts
+    await vi.waitFor(() => expect(providerFaults.turnStarts).toBe(2), WAIT)
+    await new Promise((resolve) => setTimeout(resolve, 1_500))
+    await edgesAnswered()
+    expect(providerFaults.starts - before).toBe(1)
+    expect(providerFaults.turnStarts).toBe(2)
+    const sends = await pointerSends()
+    expect(sends).toHaveLength(2)
+    expect(sends[0]).toBe(held)
+    expect(db.getUndeliveredUnreadMessages(`run:${runId}`, undefined, {})).toHaveLength(1)
+  })
+
+  /** Mail for a chat whose agent is stopped and whose every start is refused; resolves after it. */
+  async function refusedStartsFor(
+    refusal: () => Error
+  ): Promise<{ runId: string; starts: number }> {
+    await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    await host.close(COORDINATOR)
+    providerFaults.refuseStart = refusal
+    const before = providerFaults.starts
+    await finishWorker(taskId)
+    await vi.waitFor(() => expect(providerFaults.starts).toBe(before + 1), WAIT)
+    await vi.waitFor(
+      () => expect(db.getUndeliveredUnreadMessages(`run:${runId}`, undefined, {})).toHaveLength(1),
+      WAIT
+    )
+    // A fixed window, not a poll: a retry loop would start it several times in it.
+    await new Promise((resolve) => setTimeout(resolve, 1_500))
+    return { runId, starts: providerFaults.starts - before }
+  }
+
+  it.each([
+    [
+      'one the person must fix',
+      () => new AgentSessionAcquisitionRefusal('no login', 'notSignedIn')
+    ],
+    [
+      'an account switch in progress',
+      () =>
+        new AgentSessionPreSpawnError(new Error('switching accounts'), {
+          reason: 'accountSwitchInProgress'
+        })
+    ]
+  ])(
+    'holds mail after a start refused as %s until a turn runs, adding nothing on later edges',
+    async (_label, refusal) => {
+      const { runId, starts } = await refusedStartsFor(refusal)
+      expect(starts).toBe(1)
+      // Later edges replay the refusal: no start, and no new pointer and failure rows in the chat.
+      const before = providerFaults.starts
+      for (let edge = 0; edge < 5; edge += 1) {
+        runtime.onStructuredSessionStatusForMail({ sessionId: COORDINATOR, status: 'idle' })
+        await new Promise((resolve) => setTimeout(resolve, 100))
+      }
+      await edgesAnswered()
+      expect(providerFaults.starts).toBe(before)
+      expect(await pointerSends()).toHaveLength(1)
+      expect(db.getUndeliveredUnreadMessages(`run:${runId}`, undefined, {})).toHaveLength(1)
+
+      // Fixed, the person's next message starts the agent, and the pointer follows its turn.
+      providerFaults.refuseStart = null
+      expect(await sendUserMessage(COORDINATOR, 'again')).toMatchObject({ ok: true })
+      await vi.waitFor(() => expect(providerFaults.starts).toBe(before + 1), WAIT)
+      const revived = connectionFor(COORDINATOR)
+      await vi.waitFor(() => expect(revived.turns.length).toBeGreaterThanOrEqual(1), WAIT)
+      expect(revived.turns[0]!.text).toContain('again')
+      await settleTurn(COORDINATOR, 0)
+      await vi.waitFor(() => expect(revived.turns).toHaveLength(2), WAIT)
+      expect(revived.turns[1]!.text).toMatch(POINTER)
+    }
+  )
+
+  it('points held mail after the next turn that runs, even once a rewind dropped its send', async () => {
+    const chat = await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    providerFaults.crashOnTurnStart = 'exit-then-throw'
+    await finishWorker(taskId)
+    await vi.waitFor(() => expect(providerFaults.turnStarts).toBe(1), WAIT)
+    await edgesAnswered()
+    // What a rewind's recovery does: the journal is rebuilt, and no send is on record any more.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the host keeps its conversations private; this is the one journal call rewind recovery makes.
+    const open = (host as unknown as { sessions: Map<string, { journal: AgentSessionJournal }> })
+      .sessions
+    const fence = host.deps.store.getRecord(COORDINATOR)!.lease.runtimeFence
+    await open.get(COORDINATOR)!.journal.replaceEpochItems('handle_forked', fence, [])
+    expect(await pointerSends()).toEqual([])
+
+    providerFaults.crashOnTurnStart = 'off'
+    expect(await sendUserMessage(COORDINATOR, 'again')).toMatchObject({ ok: true })
+    await vi.waitFor(() => expect(providerFaults.turnStarts).toBe(2), WAIT)
+    const revived = connectionFor(COORDINATOR)
+    expect(revived).not.toBe(chat)
+    await settleTurn(COORDINATOR, revived.turns.length - 1)
+    await vi.waitFor(() => expect(turnText(revived.turns.at(-1)!)).toMatch(POINTER), WAIT)
+    await settleTurn(COORDINATOR, revived.turns.length - 1)
+    await vi.waitFor(
+      () => expect(db.getUndeliveredUnreadMessages(`run:${runId}`, undefined, {})).toEqual([]),
+      WAIT
+    )
+  })
+
+  it('points again under a new id once a send the host never recorded is too old to admit', async () => {
+    const chat = await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    // The first pointer is refused before the host records it, so the journal holds no verdict.
+    const realSend = host.send
+    const refused = vi.spyOn(host, 'send').mockImplementationOnce(async () => ({
+      ok: false as const,
+      refusal: refuse(
+        'agent_session_operation_invalid',
+        { reason: 'conversationCommandInFlight' },
+        'busy'
+      )
+    }))
+    refused.mockImplementation((caller, params) => realSend(caller, params))
+    await finishWorker(taskId)
+    await vi.waitFor(() => expect(refused).toHaveBeenCalledTimes(1), WAIT)
+    const held = db.getStructuredPointerOperation(`run:${runId}`)?.operation_id
+
+    // No edge for a day: the host would now refuse that id as expired, on every retry.
+    vi.useFakeTimers({ toFake: ['Date'] })
+    try {
+      vi.setSystemTime(Date.now() + AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS + 60_000)
+      await edgesAnswered()
+      await new Promise((resolve) => setTimeout(resolve, 300))
+      expect(chat.turns.map(turnText)).toEqual([ptyPointer(`run:${runId}`)])
+      expect(db.getStructuredPointerOperation(`run:${runId}`)?.operation_id).not.toBe(held)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('holds mail a refused turn left in doubt until the next result, then points it once', async () => {
+    // A failed turn/start cannot prove the turn never started, so the host records it `unknown`
+    // and a resend under its id replays that; new mail is a new send.
+    const chat = await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    const second = await call(
+      'orchestration.taskCreate',
+      { spec: 'more' },
+      { sessionId: COORDINATOR }
+    )
+    providerFaults.refuseTurnStarts = 1
+    const before = codex.connections.length
+    await finishWorker(taskId)
+    await vi.waitFor(() => expect(providerFaults.turnStarts).toBe(1), WAIT)
+    await edgesAnswered()
+    expect(chat.turns).toHaveLength(0)
+
+    await finishWorker(idOf(second.task), { handle: 'term_worker_2', paneKey: WORKER_2_PANE })
+    await vi.waitFor(() => expect(chat.turns).toHaveLength(1), WAIT)
+    expect(turnText(chat.turns[0]!)).toBe(
+      formatMessagePointer(2, `run:${runId}`, localOrchestrationCliCommand()).trim()
+    )
+    expect(codex.connections.length).toBe(before)
+  })
+
+  it('points a coordinator whose agent is not running through the send alone, which starts it', async () => {
+    await openChat(COORDINATOR)
+    const { taskId } = await coordinatorRunAndTask()
+    // What the idle sweep leaves of a chat nobody is looking at: agent stopped, no map entry.
+    await host.close(COORDINATOR)
+    expect(host.hasSession(COORDINATOR)).toBe(false)
+    const before = codex.connections.length
+
+    await finishWorker(taskId)
+
+    // Nothing holds or wakes the session first: the pointer's accepted send starts its agent.
+    await vi.waitFor(() => expect(codex.connections.length).toBe(before + 1), WAIT)
+    const revived = connectionFor(COORDINATOR)
+    await vi.waitFor(() => expect(revived.turns).toHaveLength(1), WAIT)
+    expect(revived.turns[0]!.text).toMatch(POINTER)
+    await settleTurn(COORDINATOR, 0)
+    expect(await userTexts(COORDINATOR)).toEqual([expect.stringMatching(POINTER)])
+  })
+
+  it('points mail at the idle edge when it arrived mid-turn', async () => {
+    const chat = await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    const first = await host.send(
+      { callerKey: 'test-surface' },
+      {
+        envelope: {
+          sessionId: COORDINATOR,
+          clientOperationId: operationId(),
+          expectedRuntimeFence: host.deps.store.getRecord(COORDINATOR)!.lease.runtimeFence,
+          payloadFingerprint: computeAgentSessionPayloadFingerprint({
+            method: 'agentSession.send',
+            sessionId: COORDINATOR,
+            fields: {
+              body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'go' }] }
+            }
+          })
+        },
+        body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'go' }] }
+      }
+    )
+    expect(first).toMatchObject({ ok: true })
+    // Accepted, then delivered: the provider sees the turn once the host hands it over.
+    await vi.waitFor(() => expect(chat.turns).toHaveLength(1), WAIT)
+    const notify = (method: string, params: unknown) =>
+      chat.handlers.onNotification?.(method, params)
+    notify('turn/started', { turn: { id: 'turn-1' } })
+    notify('item/completed', {
+      item: {
+        type: 'userMessage',
+        id: 'echo-go',
+        clientId: chat.turns[0]!.clientUserMessageId,
+        content: [{ type: 'text', text: 'go' }]
+      }
+    })
+    await host.flushStreamedEvents(COORDINATOR)
+
+    await finishWorker(taskId)
+    await new Promise((resolve) => setTimeout(resolve, 20))
+    // The coordinator is mid-turn, so nothing is folded into that turn.
+    expect(chat.turns).toHaveLength(1)
+
+    notify('turn/completed', { turn: { id: 'turn-1' } })
+    await host.flushStreamedEvents(COORDINATOR)
+    await vi.waitFor(() => expect(chat.turns).toHaveLength(2), WAIT)
+    expect(chat.turns[1]!.text).toMatch(POINTER)
+    expect(chat.turns[1]!.text).toContain(runId)
+  })
+})
+
+describe('a /clear keeps the chat its orchestration address', () => {
+  it("delivers the conversation's Run to the session that continues it, and acts as it", async () => {
+    await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    const generation = db.getRunRaw(runId)!.consumer_generation
+    const successor = await clearChat(COORDINATOR)
+    const next = connectionFor(successor)
+
+    await expect(
+      call('orchestration.runCurrent', {}, { sessionId: successor })
+    ).resolves.toMatchObject({ run: { id: runId } })
+    await finishWorker(taskId)
+    await vi.waitFor(() => expect(next.turns).toHaveLength(1), WAIT)
+    expect(next.turns[0]!.text).toMatch(POINTER)
+    await settleTurn(successor, 0)
+    await expect(call('orchestration.check', {}, { sessionId: successor })).resolves.toMatchObject({
+      runId,
+      count: 1,
+      messages: [{ type: 'worker_done' }]
+    })
+    // Nothing was rewritten: the Run is bound exactly as the first session bound it.
+    expect(db.getRunRaw(runId)).toMatchObject({
+      coordinator_orca_session_id: COORDINATOR,
+      consumer_generation: generation
+    })
+  })
+
+  it("stores the successor's own Run under the conversation's address, through a chain of clears", async () => {
+    await openChat(COORDINATOR)
+    const middle = await clearChat(COORDINATOR)
+    const created = await call(
+      'orchestration.runCreate',
+      { objective: 'next' },
+      { sessionId: middle }
+    )
+    const runId = idOf(created.run)
+    expect(db.getRunRaw(runId)!.coordinator_orca_session_id).toBe(COORDINATOR)
+    const successor = await clearChat(middle)
+    runtime.onStructuredSessionStatusForMail({ sessionId: successor, status: 'idle' })
+
+    await expect(
+      call('orchestration.runCurrent', {}, { sessionId: successor })
+    ).resolves.toMatchObject({ run: { id: runId } })
+    expect(db.getRunRaw(runId)!.coordinator_orca_session_id).toBe(COORDINATOR)
+    // What it sends carries the same address.
+    await openChat(PEER_CHAT)
+    await expect(
+      call(
+        'orchestration.send',
+        { to: `session:${PEER_CHAT}`, subject: 'hi' },
+        { sessionId: successor }
+      )
+    ).resolves.toMatchObject({ message: { from_handle: `session:${COORDINATOR}` } })
+  })
+
+  it("binds a Run a cleared chat creates or uses to the conversation's root, at the Run's current generation", async () => {
+    const root = COORDINATOR
+    const boundOrcaSessionId = (runId: string): string | null =>
+      currentRunCoordinatorOrcaSessionId(db.getRunRaw(runId)!)
+    await openChat(COORDINATOR)
+    const middle = await clearChat(COORDINATOR)
+    const first = idOf(
+      (await call('orchestration.runCreate', { objective: 'first' }, { sessionId: middle })).run
+    )
+    expect(db.getRunRaw(first)).toMatchObject({
+      coordinator_orca_session_id: root,
+      coordinator_orca_session_id_generation: db.getRunRaw(first)!.consumer_generation
+    })
+    expect(boundOrcaSessionId(first)).toBe(root)
+    const second = idOf(
+      (await call('orchestration.runCreate', { objective: 'second' }, { sessionId: middle })).run
+    )
+    expect(boundOrcaSessionId(first)).toBeNull()
+
+    const successor = await clearChat(middle)
+    await call('orchestration.runUse', { id: first }, { sessionId: successor })
+    const rebound = db.getRunRaw(first)!
+    expect(rebound.coordinator_orca_session_id).toBe(root)
+    expect(rebound.coordinator_orca_session_id_generation).toBe(rebound.consumer_generation)
+    expect(boundOrcaSessionId(second)).toBeNull()
+    await expect(
+      call('orchestration.runCurrent', {}, { sessionId: successor })
+    ).resolves.toMatchObject({ run: { id: first } })
+  })
+
+  it('lands mail sent to any session of the conversation in the live one', async () => {
+    await openChat(PEER_CHAT)
+    const middle = await clearChat(PEER_CHAT)
+    const successor = await clearChat(middle)
+    const next = connectionFor(successor)
+
+    for (const [index, spelling] of [PEER_CHAT, middle, successor].entries()) {
+      const sent = await call('orchestration.send', {
+        from: 'term_worker',
+        to: `session:${spelling}`,
+        subject: `ping ${index}`
+      })
+      expect(sent).toMatchObject({ message: { to_handle: `session:${PEER_CHAT}` } })
+      await vi.waitFor(() => expect(next.turns).toHaveLength(index + 1), WAIT)
+      await settleTurn(successor, index)
+    }
+    await expect(call('orchestration.check', {}, { sessionId: successor })).resolves.toMatchObject({
+      count: 3
+    })
+  })
+})
+
+describe('any live session is addressable by its id', () => {
+  it('lands mail sent to `session:<id>` as a turn in that chat, which a flagless check reads', async () => {
+    const peer = await openChat(PEER_CHAT)
+
+    const sent = await call('orchestration.send', {
+      from: 'term_worker',
+      to: `session:${PEER_CHAT}`,
+      subject: 'ping'
+    })
+    expect(sent).toMatchObject({ message: { to_handle: `session:${PEER_CHAT}` } })
+
+    await vi.waitFor(() => expect(peer.turns).toHaveLength(1), WAIT)
+    // Direct mail is not in a Run, so the pointer names no `--run`.
+    expect(turnText(peer.turns[0]!)).toBe(ptyPointer(`session:${PEER_CHAT}`))
+    await settleTurn(PEER_CHAT, 0)
+    const checked = await call('orchestration.check', {}, { sessionId: PEER_CHAT })
+    expect(checked).toMatchObject({ count: 1, messages: [{ subject: 'ping' }] })
+  })
+
+  it('refuses mail to a chat that was closed, before storing it', async () => {
+    await openChat(PEER_CHAT)
+    await host.setSessionTabVisibility(PEER_CHAT, false)
+    const response = await dispatcher.dispatch(
+      request('orchestration.send', {
+        from: 'term_worker',
+        to: `session:${PEER_CHAT}`,
+        subject: 'ping'
+      })
+    )
+    expect(response).toMatchObject({ ok: false, error: { code: 'session_caller_not_live' } })
+    expect(db.getInbox(100)).toEqual([])
+  })
+})
diff --git a/src/main/runtime/structured-claude-auth-policy-wiring.test.ts b/src/main/runtime/structured-claude-auth-policy-wiring.test.ts
index f018dfd30da4..cc2b5c3b1640 100644
--- a/src/main/runtime/structured-claude-auth-policy-wiring.test.ts
+++ b/src/main/runtime/structured-claude-auth-policy-wiring.test.ts
@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -10,28 +9,11 @@ import {
 } from './structured-agent-session-runtime'
 
 /**
- * The structured host's Claude auth policy has exactly one production wiring, and it
- * lives in `orca-runtime-get-worktree-ps.ts` — a `@ts-nocheck` file, so neither the
- * compiler nor a type test can see the field disappear. Deleting that wiring used to
- * leave ~1000 tests green while every `ANTHROPIC_*` variable in the shell reached the
- * child, because `stripAuthEnv` silently fell back to `false`.
- *
- * Two independent guards replace that silence, and this file pins both.
+ * The structured host's Claude auth policy has exactly one production wiring. Deleting it
+ * used to leave ~1000 tests green while every `ANTHROPIC_*` variable in the shell reached
+ * the child, because `stripAuthEnv` silently fell back to `false`.
  */
 describe('structured Claude auth policy wiring', () => {
-  // The behavioural version of this assertion — importing the runtime class and
-  // capturing the installed deps — costs 35s of module transform for the whole
-  // OrcaRuntime chain (measured), so the wiring itself is pinned by source and the
-  // policy's meaning by claude-structured-auth-policy.test.ts.
-  it('passes a settings-derived Claude auth policy to the host installer', () => {
-    const source = readFileSync(join(__dirname, 'orca-runtime-get-worktree-ps.ts'), 'utf8')
-
-    expect(source).toContain('claudeStructuredAuthPolicyForSettings')
-    expect(source).toMatch(
-      /resolveClaudeAuthPolicy:\s*\(\)\s*=>\s*\n?\s*claudeStructuredAuthPolicyForSettings\(/
-    )
-  })
-
   describe('installing without one', () => {
     let stateDirectory: string | null = null
 
diff --git a/src/main/runtime/structured-claude-runtime-adapter.ts b/src/main/runtime/structured-claude-runtime-adapter.ts
index 71854f903cd3..4160b81c4dea 100644
--- a/src/main/runtime/structured-claude-runtime-adapter.ts
+++ b/src/main/runtime/structured-claude-runtime-adapter.ts
@@ -60,6 +60,7 @@ export function structuredClaudeLifecycleEvent(
       type: 'ended',
       sessionId: event.sessionId,
       reason: event.reason,
+      ...(event.failure ? { failure: event.failure } : {}),
       cause: event.cause,
       fence: event.fence,
       acquisitionGeneration: event.acquisitionGeneration,
diff --git a/src/main/runtime/structured-claude-scripted-runtime-test-support.ts b/src/main/runtime/structured-claude-scripted-runtime-test-support.ts
index af1bc9a4af71..07de5e58761a 100644
--- a/src/main/runtime/structured-claude-scripted-runtime-test-support.ts
+++ b/src/main/runtime/structured-claude-scripted-runtime-test-support.ts
@@ -1,6 +1,7 @@
 // A structured-session runtime whose Claude children are scripted: the production runtime,
 // adapter, record store and host, with only the CLI process replaced.
 
+import { providerDiagnostic, withProviderDiagnostic } from '../../shared/agent-session-failure'
 import { mkdir, mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -20,6 +21,10 @@ import {
   stopStructuredAgentSessionRuntime
 } from './structured-agent-session-runtime'
 
+/** The error a real CLI's exit reaches the adapter as: Orca's message, the stderr as a log detail. */
+export function scriptedClaudeExitError(diagnostic: string): Error {
+  return withProviderDiagnostic(new Error(diagnostic), providerDiagnostic(diagnostic, 'log'))
+}
 export type ScriptedClaudeBehavior = {
   /** Initialize never answers; only the child's exit settles it. */
   initHangs?: boolean
@@ -37,6 +42,11 @@ export type ScriptedClaudeBehavior = {
   optionWritesHang?: boolean
   /** Startup's own settings read goes unanswered. */
   startupSettingsReadHangs?: boolean
+  /** Every option write loses its answer while the CLI keeps running (not a refusal), so a
+   *  start that restores one faults. */
+  optionWritesFail?: boolean
+  /** The init frame names another provider session than the one launched. */
+  initNamesForeignSession?: boolean
 }
 
 export type ScriptedClaudeChild = {
@@ -86,7 +96,13 @@ export function createScriptedClaudeRuntime(sessionIds: readonly string[]) {
     const never = <T>(): Promise<T> => new Promise<T>(() => {})
     const optionWrite = (subtype: string): Promise<void> => {
       child.calls.push(subtype)
-      return control(subtype, () => (behavior.optionWritesHang ? never() : Promise.resolve()))
+      return control(subtype, () =>
+        behavior.optionWritesFail
+          ? Promise.reject(new Error('Query closed before response received'))
+          : behavior.optionWritesHang
+            ? never()
+            : Promise.resolve()
+      )
     }
     let settingsReads = 0
     const child: ScriptedClaudeChild = {
@@ -110,7 +126,7 @@ export function createScriptedClaudeRuntime(sessionIds: readonly string[]) {
             handlers.onMessage?.({
               type: 'system',
               subtype: 'init',
-              session_id: providerSessionId,
+              session_id: behavior.initNamesForeignSession ? 'foreign-session' : providerSessionId,
               model: 'claude-sonnet-5',
               apiKeySource: 'none'
             })
@@ -156,7 +172,7 @@ export function createScriptedClaudeRuntime(sessionIds: readonly string[]) {
         setPermissionMode: () => optionWrite('set_permission_mode'),
         applyFlagSettings: () => optionWrite('apply_flag_settings'),
         interrupt: async () => undefined,
-        cancelAsyncMessage: async () => {},
+        cancelAsyncMessage: async () => false,
         stopTask: async () => {},
         send: async () => {
           child.calls.push('send')
@@ -175,7 +191,7 @@ export function createScriptedClaudeRuntime(sessionIds: readonly string[]) {
   }
   const exitAtSpawn = (child: ScriptedClaudeChild, diagnostic: string): void => {
     child.connection.closed = true
-    child.exit(new Error(diagnostic))
+    child.exit(scriptedClaudeExitError(diagnostic))
   }
   /** A pid whose process is gone has no start time to read. */
   const readProcessStartTime = async (pid: number): Promise<number | null> => {
diff --git a/src/main/runtime/structured-codex-child-work-runtime.test.ts b/src/main/runtime/structured-codex-child-work-runtime.test.ts
new file mode 100644
index 000000000000..d03ab6f1be5d
--- /dev/null
+++ b/src/main/runtime/structured-codex-child-work-runtime.test.ts
@@ -0,0 +1,133 @@
+// The production runtime hands a Codex session's child work to the status sink, under the address
+// the session's own row landed under, and ends it with the provider.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import type {
+  CodexAppServerConnection,
+  CodexAppServerConnectionHandlers,
+  openCodexAppServerConnection
+} from '../codex/codex-app-server-connection'
+import {
+  HOST_TEST_SESSION as SESSION,
+  hostTestAttachParams
+} from '../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import type { StructuredAgentSessionStatusSink } from '../native-chat/agent-session-wire/structured-agent-session-status-feed'
+import {
+  ensureStructuredAgentSessionHost,
+  stopStructuredAgentSessionRuntime
+} from './structured-agent-session-runtime'
+
+const THREAD = 'thread-runtime-child-work'
+const CHILD = 'thread-runtime-reviewer'
+const ROUTES: Record<string, unknown> = {
+  'thread/start': { thread: { id: THREAD } },
+  'model/list': {
+    data: [
+      {
+        model: 'gpt-test',
+        displayName: 'GPT Test',
+        hidden: false,
+        supportedReasoningEfforts: [],
+        defaultReasoningEffort: null,
+        isDefault: true
+      }
+    ],
+    nextCursor: null
+  }
+}
+
+describe('structured Codex child work through the production runtime', () => {
+  let root: string | null = null
+
+  afterEach(async () => {
+    await stopStructuredAgentSessionRuntime()
+    if (root) {
+      await rm(root, { recursive: true, force: true })
+      root = null
+    }
+  })
+
+  it("hands its subagents to the status sink under the session's own address", async () => {
+    root = await mkdtemp(join(tmpdir(), 'orca-runtime-codex-child-work-'))
+    const connections: CodexAppServerConnectionHandlers[] = []
+    const openConnection: typeof openCodexAppServerConnection = async (_launch, handlers = {}) => {
+      connections.push(handlers)
+      const connection: CodexAppServerConnection = {
+        pid: 4321,
+        closed: false,
+        request: async (method) => (method in ROUTES ? ROUTES[method] : {}),
+        notify: () => {},
+        respond: () => {},
+        respondWithError: () => {},
+        close: async () => true
+      }
+      return connection
+    }
+    const childWork: Parameters<
+      NonNullable<StructuredAgentSessionStatusSink['publishChildWork']>
+    >[] = []
+    const host = await ensureStructuredAgentSessionHost({
+      stateDirectory: root,
+      hostId: 'local',
+      claimKeyId: 'key-1',
+      resolveWorkspacePath: async () => root!,
+      resolveClaudeAuthPolicy: () => ({ stripAuthEnv: true }),
+      resolveCodexCommand: () => 'codex',
+      resolveEnvironment: async () => ({ PATH: process.env.PATH }),
+      openCodexConnection: openConnection,
+      readProcessStartTime: async () => 1_700_000_000_000,
+      statusSink: {
+        publish: () => {},
+        forget: () => {},
+        publishChildWork: (...args) => childWork.push(args)
+      }
+    })
+    const attachParams = hostTestAttachParams(null, { providerHandle: undefined })
+    attachParams.envelope.clientOperationId = `${Date.now()}-${'1'.padStart(32, '0')}`
+    const attached = await host.attach({ callerKey: 'runtime-test' }, attachParams)
+    expect(attached).toMatchObject({ ok: true })
+    // Creating the session starts its child; nothing else has to keep it running.
+    expect(connections).toHaveLength(1)
+    const notify = (method: string, params: Record<string, unknown>) =>
+      connections[0]?.onNotification?.(method, params)
+    notify('turn/started', { threadId: THREAD, turn: { id: 'turn-1' } })
+    notify('turn/started', { threadId: CHILD, turn: { id: 'child-turn-1' } })
+    notify('item/started', {
+      threadId: THREAD,
+      turnId: 'turn-1',
+      item: {
+        type: 'subAgentActivity',
+        id: 'spawn-1',
+        kind: 'started',
+        agentThreadId: CHILD,
+        agentPath: '/root/review'
+      }
+    })
+    const subject = expect.objectContaining({ kind: 'structured-session', sessionId: SESSION })
+    expect(childWork).toEqual([
+      [
+        subject,
+        [
+          expect.objectContaining({
+            type: 'live',
+            child: expect.objectContaining({
+              handle: { idKind: 'thread_id', id: CHILD, runId: 'child-turn-1' },
+              description: 'review'
+            })
+          })
+        ],
+        'codex'
+      ]
+    ])
+    // The provider dies: its session's end is reported under the same address.
+    connections[0]?.onExit?.(new Error('scripted provider exit'))
+    expect(childWork.at(-1)).toEqual([
+      subject,
+      [expect.objectContaining({ type: 'session-ended' })],
+      'codex'
+    ])
+  })
+})
diff --git a/src/main/runtime/structured-session-child-identity-env.test.ts b/src/main/runtime/structured-session-child-identity-env.test.ts
new file mode 100644
index 000000000000..1289e979ad63
--- /dev/null
+++ b/src/main/runtime/structured-session-child-identity-env.test.ts
@@ -0,0 +1,193 @@
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { installFakeAppEnvironment } from '../../../config/scripts/vitest-host-ports-setup'
+
+const shim = vi.hoisted(() => ({ ensureLinuxTerminalOrcaCliShimDir: vi.fn() }))
+vi.mock('../cli/linux-terminal-orca-cli-shim', () => shim)
+
+import { structuredSessionChildIdentityEnv } from './structured-session-child-identity-env'
+import {
+  mintStructuredWorkerHandle,
+  mintStructuredWorkerPaneKey,
+  structuredWorkerHostScope,
+  structuredWorkerIdentities,
+  structuredWorkerProcessIncarnation
+} from './structured-worker-identity'
+
+const SESSION_ID = 'f7a1c0de-1111-4222-8333-444455556666'
+const USER_DATA = '/data/orca'
+const RESOURCES = '/app/Resources'
+const SHIM_DIR = join(USER_DATA, 'linux-orca-cli-shim')
+
+const platformDescriptor = Object.getOwnPropertyDescriptor(process, 'platform')!
+const resourcesDescriptor = Object.getOwnPropertyDescriptor(process, 'resourcesPath')
+
+function pinPlatform(platform: NodeJS.Platform): void {
+  Object.defineProperty(process, 'platform', { configurable: true, value: platform })
+}
+
+function registerWorker(): string {
+  const handle = mintStructuredWorkerHandle()
+  structuredWorkerIdentities.register({
+    handle,
+    sessionId: SESSION_ID,
+    agent: 'claude',
+    paneKey: mintStructuredWorkerPaneKey(SESSION_ID),
+    processIncarnation: structuredWorkerProcessIncarnation(SESSION_ID),
+    worktreeId: 'wt_1',
+    hostScope: { kind: 'local', hostId: 'local' }
+  })
+  return handle
+}
+
+beforeEach(() => {
+  shim.ensureLinuxTerminalOrcaCliShimDir.mockReset()
+  shim.ensureLinuxTerminalOrcaCliShimDir.mockReturnValue(SHIM_DIR)
+  Object.defineProperty(process, 'resourcesPath', { configurable: true, value: RESOURCES })
+})
+
+afterEach(() => {
+  structuredWorkerIdentities.clear()
+  Object.defineProperty(process, 'platform', platformDescriptor)
+  if (resourcesDescriptor) {
+    Object.defineProperty(process, 'resourcesPath', resourcesDescriptor)
+  } else {
+    Reflect.deleteProperty(process, 'resourcesPath')
+  }
+})
+
+describe('structuredSessionChildIdentityEnv', () => {
+  it("gives an ordinary chat session its own id and this app's CLI, and no terminal identity", () => {
+    // The id names the caller, so a bare `orca orchestration check` acts as this session instead of
+    // guessing a terminal — every guess landed on a sibling pane, and `check` consumed its mail.
+    pinPlatform('linux')
+    installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
+    const childEnv = { PATH: '/usr/bin' }
+    const env = structuredSessionChildIdentityEnv(SESSION_ID, childEnv)
+    expect(env).toEqual({
+      PATH: `${SHIM_DIR}:/usr/bin`,
+      ORCA_AGENT_SESSION_ID: SESSION_ID,
+      // For a CLI that predates the id, which refuses on it instead of guessing a sibling.
+      ORCA_STRUCTURED_SESSION: '1',
+      ORCA_CLI_COMMAND: join(SHIM_DIR, 'orca'),
+      // The instance that minted the id, so any current CLI dials it rather than the default.
+      ORCA_USER_DATA_PATH: USER_DATA
+    })
+    // A chat names itself by its id alone: no handle, no pane key.
+    expect(env.ORCA_TERMINAL_HANDLE).toBeUndefined()
+    expect(env.ORCA_PANE_KEY).toBeUndefined()
+    expect(childEnv).toEqual({ PATH: '/usr/bin' })
+  })
+
+  it('replaces an id inherited from an Orca launched inside another session', () => {
+    installFakeAppEnvironment({ isPackaged: () => false, getPath: () => USER_DATA })
+    const env = structuredSessionChildIdentityEnv(SESSION_ID, {
+      ORCA_AGENT_SESSION_ID: 'a0b1c2d3-0000-4000-8000-00000000abcd',
+      PATH: '/usr/bin'
+    })
+    expect(env.ORCA_AGENT_SESSION_ID).toBe(SESSION_ID)
+  })
+
+  it('gives a structured worker its id and keeps the handle it was minted', () => {
+    // For orchestration the id wins and the host maps it back to this handle, so the worker keeps
+    // one identity; the handle stays for the handle-based surfaces outside orchestration.
+    installFakeAppEnvironment({ isPackaged: () => false, getPath: () => USER_DATA })
+    const handle = registerWorker()
+    const env = structuredSessionChildIdentityEnv(SESSION_ID, { PATH: '/usr/bin' })
+    expect(env.ORCA_AGENT_SESSION_ID).toBe(SESSION_ID)
+    expect(env.ORCA_TERMINAL_HANDLE).toBe(handle)
+  })
+
+  describe.each(['chat', 'worker'] as const)("reaches this app's CLI as a %s", (kind) => {
+    beforeEach(() => {
+      if (kind === 'worker') {
+        registerWorker()
+      }
+    })
+
+    it('on packaged Linux, through the bare-orca shim, named by absolute path', () => {
+      // Without this the child's first `orca orchestration check` execs GNOME Orca — the CLI
+      // installs as `orca-ide` on Linux (stablyai/orca#7904) — and the dispatch hangs to timeout.
+      pinPlatform('linux')
+      installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
+      const env = structuredSessionChildIdentityEnv(SESSION_ID, { PATH: '/usr/bin:/bin' })
+      expect(env.ORCA_CLI_COMMAND).toBe(join(SHIM_DIR, 'orca'))
+      expect(env.PATH).toBe(`${SHIM_DIR}:/usr/bin:/bin`)
+    })
+
+    it('on packaged macOS, through the bundled CLI dir', () => {
+      pinPlatform('darwin')
+      installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
+      const env = structuredSessionChildIdentityEnv(SESSION_ID, { PATH: '/usr/bin' })
+      expect(env.PATH).toBe(`${join(RESOURCES, 'bin')}:/usr/bin`)
+      expect(env.ORCA_CLI_COMMAND).toBe(join(RESOURCES, 'bin', 'orca'))
+    })
+
+    it('on packaged Windows, through the bundled CLI dir under the env block spelling', () => {
+      pinPlatform('win32')
+      installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
+      const env = structuredSessionChildIdentityEnv(SESSION_ID, { Path: 'C:\\Windows' })
+      expect(env.Path).toBe(`${join(RESOURCES, 'bin')};C:\\Windows`)
+      expect(env.PATH).toBeUndefined()
+      // The native launcher: `orca.cmd` refuses message bodies cmd.exe would mangle.
+      expect(env.ORCA_CLI_COMMAND).toBe(join(RESOURCES, 'bin', 'orca.exe'))
+    })
+
+    it('unpackaged, through the dev launcher dir', () => {
+      pinPlatform('darwin')
+      installFakeAppEnvironment({ isPackaged: () => false, getPath: () => USER_DATA })
+      const env = structuredSessionChildIdentityEnv(SESSION_ID, { PATH: '/usr/bin' })
+      expect(env.PATH).toBe(`${join(USER_DATA, 'cli', 'bin')}:/usr/bin`)
+      expect(env.ORCA_CLI_COMMAND).toBe(join(USER_DATA, 'cli', 'bin', 'orca-dev'))
+    })
+  })
+
+  it('omits the CLI command when no launcher resolves, never naming a bare `orca`', () => {
+    // On packaged Linux the shim can fail to resolve (no bundled launcher, an unverified AppImage);
+    // a bare `orca` there is GNOME's screen reader, and an inherited value names another app's CLI.
+    pinPlatform('linux')
+    installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
+    shim.ensureLinuxTerminalOrcaCliShimDir.mockReturnValue(null)
+    vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const env = structuredSessionChildIdentityEnv(SESSION_ID, {
+      PATH: '/usr/bin',
+      ORCA_CLI_COMMAND: '/Applications/Other Orca.app/Contents/Resources/bin/orca',
+      ORCA_USER_DATA_PATH: '/data/other-orca'
+    })
+    expect(env).not.toHaveProperty('ORCA_CLI_COMMAND')
+    expect(env.PATH).toBe('/usr/bin')
+    expect(env.ORCA_USER_DATA_PATH).toBe(USER_DATA)
+    expect(console.warn).toHaveBeenCalledOnce()
+  })
+
+  it('never puts a pane key in the child environment', () => {
+    // A pane key here flows into hook-emitted agent statuses and the attestation, agent-row and
+    // mobile-projection pipelines, all of which assume it names a live PTY leaf.
+    pinPlatform('linux')
+    installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
+    registerWorker()
+    const env = structuredSessionChildIdentityEnv(SESSION_ID, { PATH: '/usr/bin' })
+    expect(env.ORCA_PANE_KEY).toBeUndefined()
+    expect(Object.keys(env).filter((key) => key.includes('PANE'))).toEqual([])
+  })
+
+  it('never names the WSL-scoped launcher, because a structured worker cannot run in WSL', () => {
+    // `orca-ide` is the literal the PTY lane exports for WSL only. A structured session that
+    // resolves to a WSL distro is refused a host scope, so it never becomes a worker at all —
+    // which is why the bare-`orca` shim, not the literal, is the right fix on Linux.
+    expect(
+      structuredWorkerHostScope({
+        executionHostId: 'local',
+        workspaceId: 'wt_1',
+        workspaceKind: 'git-worktree',
+        wslDistro: 'Ubuntu'
+      })
+    ).toBeNull()
+    pinPlatform('linux')
+    installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
+    registerWorker()
+    expect(
+      structuredSessionChildIdentityEnv(SESSION_ID, { PATH: '/usr/bin' }).ORCA_CLI_COMMAND
+    ).not.toBe('orca-ide')
+  })
+})
diff --git a/src/main/runtime/structured-session-child-identity-env.ts b/src/main/runtime/structured-session-child-identity-env.ts
new file mode 100644
index 000000000000..4d3e85c34140
--- /dev/null
+++ b/src/main/runtime/structured-session-child-identity-env.ts
@@ -0,0 +1,93 @@
+/**
+ * The orchestration identity — and the CLI reachability — a structured session's own child needs to
+ * speak for itself. Both providers' native launches (Claude, Codex) build their child env here.
+ *
+ * Every structured session carries `ORCA_AGENT_SESSION_ID`, the id Orca minted for it — never the
+ * provider's, which rotates on `/clear`. The CLI sends it as the caller, so a bare
+ * `orca orchestration check` acts as this session instead of guessing a terminal: with no pane of
+ * its own, every guess landed on a sibling, and a destructive `check` consumed that sibling's mail.
+ * Identity by session id assumes one machine and one user; crossing a host boundary (SSH, a paired
+ * peer) re-opens that decision, and the host refuses a session claim from across one.
+ *
+ * A dispatched structured worker also keeps the `structworker_` handle it was minted, for the
+ * handle-based surfaces outside orchestration; for orchestration the id wins and the host maps it
+ * back to that handle, so the worker keeps one identity.
+ *
+ * The PATH prepend below makes bare `orca` this app's CLI, the SAME function `buildPtyHostEnv`
+ * applies, rather than a second, drifting copy of the rule. Orca's Linux CLI installs as `orca-ide`
+ * so it never claims GNOME Orca's /usr/bin/orca (stablyai/orca#7904), and on packaged macOS/Windows
+ * the bundled launcher is reachable only from the app's own resources dir.
+ *
+ * `ORCA_CLI_COMMAND` names that same launcher by absolute path, because a provider can run each
+ * command in a login shell (Codex runs `zsh -lc`) whose profile rebuilds PATH and puts a global
+ * install ahead of this app's. A bare `orca` that reaches another install still acts as this
+ * session: any current CLI sends the injected id and dials the instance `ORCA_USER_DATA_PATH` pins
+ * below, and a CLI that predates the id refuses on the marker. When no launcher resolves the key
+ * is omitted rather than naming a bare `orca`: on Linux that is GNOME's screen reader, and an
+ * inherited value names another app.
+ *
+ * `ORCA_USER_DATA_PATH` pins this instance beside the identity, so any current CLI — the session's
+ * own or a global one — dials the Orca that minted the id instead of the production default.
+ *
+ * Deliberately NOT `ORCA_PANE_KEY`. Claude structured sessions run hooks, and a pane key in their
+ * environment starts flowing into hook-emitted agent-status payloads and the hook-attestation,
+ * agent-row and mobile-projection pipelines, every one of which assumes a pane key names a live
+ * PTY leaf. It would also open `selectExactWorkerProviderSession`, which is fail-closed today
+ * precisely because a structured session emits no hook agent status.
+ *
+ * `ORCA_STRUCTURED_SESSION` stays beside the id for a CLI that predates it — one reached through a
+ * global install when a shell rc resets PATH — which would otherwise guess a sibling's terminal;
+ * such a CLI refuses on the marker. A current CLI checks the id first, so the marker never makes a
+ * session with an id identity-less.
+ *
+ * The handle is read from the registry at spawn time, so an in-host recovery respawn re-bakes the
+ * SAME handle rather than a stale or fresh one.
+ */
+
+import { getAppEnvironment, hasAppEnvironment } from '../../shared/app-environment'
+import { ORCA_AGENT_SESSION_ID_ENV } from '../../shared/agent-session-caller-env'
+import { ORCA_STRUCTURED_SESSION_ENV } from '../../shared/structured-session-marker'
+import { prependOrcaCliDirToChildPath } from '../cli/orca-cli-child-path'
+import { structuredWorkerIdentities } from './structured-worker-identity'
+
+export function structuredSessionChildIdentityEnv(
+  sessionId: string,
+  childEnv: Record<string, string>
+): Record<string, string> {
+  const identity = structuredWorkerIdentities.getBySessionId(sessionId)
+  const env: Record<string, string> = {
+    ...childEnv,
+    ...(identity ? { ORCA_TERMINAL_HANDLE: identity.handle } : {}),
+    [ORCA_AGENT_SESSION_ID_ENV]: sessionId,
+    [ORCA_STRUCTURED_SESSION_ENV]: '1'
+  }
+  applyThisAppCli(env)
+  return env
+}
+
+/**
+ * A host with no app environment installed — a plain-Node fork, or a unit test — has no userData
+ * root to resolve, and inventing one would write a shim into the wrong directory.
+ */
+function applyThisAppCli(env: Record<string, string>): void {
+  delete env.ORCA_CLI_COMMAND
+  if (!hasAppEnvironment()) {
+    return
+  }
+  const app = getAppEnvironment()
+  const userDataPath = app.getPath('userData')
+  const isPackaged = app.isPackaged()
+  env.ORCA_USER_DATA_PATH = userDataPath
+  const launcher = prependOrcaCliDirToChildPath(env, {
+    isPackaged,
+    userDataPath,
+    resourcesPath: process.resourcesPath ?? null
+  })
+  if (launcher) {
+    env.ORCA_CLI_COMMAND = launcher
+  } else {
+    console.warn(
+      "[structured-session] This app's CLI launcher did not resolve; the session's child has no ORCA_CLI_COMMAND."
+    )
+  }
+}
diff --git a/src/main/runtime/structured-session-cli-login-shell.live-shell.test.ts b/src/main/runtime/structured-session-cli-login-shell.live-shell.test.ts
new file mode 100644
index 000000000000..c5a9eb769f1e
--- /dev/null
+++ b/src/main/runtime/structured-session-cli-login-shell.live-shell.test.ts
@@ -0,0 +1,34 @@
+/**
+ * The zsh arm of `structured-session-cli-login-shell.test.ts`: Codex's own shell on macOS. Runs in
+ * the real-shell lane, which installs zsh; the ordinary unit lane has none.
+ */
+
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import {
+  createLoginShellHarness,
+  type LoginShellHarness
+} from './structured-session-login-shell-test-harness'
+
+describe.runIf(process.platform !== 'win32')('a structured session in a zsh login shell', () => {
+  let harness: LoginShellHarness
+
+  beforeEach(() => {
+    harness = createLoginShellHarness()
+  })
+
+  afterEach(() => {
+    harness.dispose()
+  })
+
+  it("resolves this app's CLI through ORCA_CLI_COMMAND in `zsh -lc`", async () => {
+    // Positive control: the profile really does put the global install first for a bare name.
+    expect(await harness.run({ program: '/bin/zsh', args: ['-lc', 'orca'] })).toBe('global')
+    expect(await harness.run({ program: '/bin/zsh', args: ['-lc', '"$ORCA_CLI_COMMAND"'] })).toBe(
+      'app'
+    )
+  })
+
+  it("keeps bare `orca` this app's CLI in a zsh that reads no login profile", async () => {
+    expect(await harness.run({ program: '/bin/zsh', args: ['-c', 'orca'] })).toBe('app')
+  })
+})
diff --git a/src/main/runtime/structured-session-cli-login-shell.test.ts b/src/main/runtime/structured-session-cli-login-shell.test.ts
new file mode 100644
index 000000000000..2079dc44eb66
--- /dev/null
+++ b/src/main/runtime/structured-session-cli-login-shell.test.ts
@@ -0,0 +1,38 @@
+/**
+ * A provider can run every command in a login shell: Codex runs `<shell> -lc <command>`. The login
+ * profile rebuilds PATH — macOS's path_helper, a user's profile — so the directory Orca prepended
+ * ends up behind a global install, and bare `orca` becomes that install, possibly an older Orca.
+ * `ORCA_CLI_COMMAND` names this app's launcher by absolute path, which no startup file can reorder.
+ * The zsh arm lives in `structured-session-cli-login-shell.live-shell.test.ts`, in the real-shell
+ * lane that installs zsh.
+ */
+
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import {
+  createLoginShellHarness,
+  type LoginShellHarness
+} from './structured-session-login-shell-test-harness'
+
+describe.runIf(process.platform !== 'win32')('a structured session in a bash login shell', () => {
+  let harness: LoginShellHarness
+
+  beforeEach(() => {
+    harness = createLoginShellHarness()
+  })
+
+  afterEach(() => {
+    harness.dispose()
+  })
+
+  it("resolves this app's CLI through ORCA_CLI_COMMAND in `bash -lc`", async () => {
+    // Positive control: the profile really does put the global install first for a bare name.
+    expect(await harness.run({ program: '/bin/bash', args: ['-lc', 'orca'] })).toBe('global')
+    expect(await harness.run({ program: '/bin/bash', args: ['-lc', '"$ORCA_CLI_COMMAND"'] })).toBe(
+      'app'
+    )
+  })
+
+  it("keeps bare `orca` this app's CLI in a shell that reads no login profile", async () => {
+    expect(await harness.run({ program: '/bin/bash', args: ['-c', 'orca'] })).toBe('app')
+  })
+})
diff --git a/src/main/runtime/structured-session-login-shell-test-harness.ts b/src/main/runtime/structured-session-login-shell-test-harness.ts
new file mode 100644
index 000000000000..943dfe0f4d3d
--- /dev/null
+++ b/src/main/runtime/structured-session-login-shell-test-harness.ts
@@ -0,0 +1,48 @@
+/**
+ * A structured session's child env beside a HOME whose login profiles put a stand-in global `orca`
+ * first, as `/usr/local/bin` often is. Shared by the bash suite (every lane) and the zsh suite
+ * (the real-shell lane, which installs zsh).
+ */
+
+import { chmodSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { installFakeAppEnvironment } from '../../../config/scripts/vitest-host-ports-setup'
+import { runProcess } from '../../shared/child-process/run-process'
+import { structuredSessionChildIdentityEnv } from './structured-session-child-identity-env'
+
+const SESSION_ID = 'f7a1c0de-1111-4222-8333-444455556666'
+
+export type LoginShellHarness = {
+  /** Runs a shell with the structured session's env and returns its stdout. */
+  run: (spec: { program: string; args: [flag: '-lc' | '-c', script: string] }) => Promise<string>
+  dispose: () => void
+}
+
+function writeStub(path: string, says: string): void {
+  writeFileSync(path, `#!/bin/sh\nprintf '%s' '${says}'\n`)
+  chmodSync(path, 0o755)
+}
+
+export function createLoginShellHarness(): LoginShellHarness {
+  const root = mkdtempSync(join(tmpdir(), 'orca-login-shell-cli-'))
+  const home = join(root, 'home')
+  const globalBin = join(root, 'global-bin')
+  const userData = join(root, 'user-data')
+  const appCliBin = join(userData, 'cli', 'bin')
+  for (const dir of [home, globalBin, appCliBin]) {
+    mkdirSync(dir, { recursive: true })
+  }
+  writeStub(join(globalBin, 'orca'), 'global')
+  writeStub(join(appCliBin, 'orca'), 'app')
+  writeStub(join(appCliBin, 'orca-dev'), 'app')
+  const prependGlobal = `export PATH="${globalBin}:$PATH"\n`
+  writeFileSync(join(home, '.zprofile'), prependGlobal)
+  writeFileSync(join(home, '.bash_profile'), prependGlobal)
+  installFakeAppEnvironment({ isPackaged: () => false, getPath: () => userData })
+  const env = structuredSessionChildIdentityEnv(SESSION_ID, { HOME: home, PATH: '/usr/bin:/bin' })
+  return {
+    run: async (spec) => (await runProcess({ ...spec, env })).stdout,
+    dispose: () => rmSync(root, { recursive: true, force: true })
+  }
+}
diff --git a/src/main/runtime/structured-session-mail-redrive-wiring.test.ts b/src/main/runtime/structured-session-mail-redrive-wiring.test.ts
new file mode 100644
index 000000000000..d7779112cc63
--- /dev/null
+++ b/src/main/runtime/structured-session-mail-redrive-wiring.test.ts
@@ -0,0 +1,65 @@
+// The production wiring of the idle-edge mail redrive: the host the runtime installs must report
+// every status change to the runtime's mail redrive. The integration test installs its own callback,
+// so without this nothing pins the line that connects the two in the real app.
+
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentSessionStatusSummary } from '../../shared/agent-session-wire'
+import type * as StructuredAgentSessionRuntime from './structured-agent-session-runtime'
+import type { StructuredAgentSessionRuntimeDeps } from './structured-agent-session-runtime'
+
+const installed = vi.hoisted((): { deps: StructuredAgentSessionRuntimeDeps | null } => ({
+  deps: null
+}))
+
+vi.mock('./structured-agent-session-runtime', async (importOriginal) => ({
+  ...(await importOriginal<typeof StructuredAgentSessionRuntime>()),
+  ensureStructuredAgentSessionHost: vi.fn(async (deps: StructuredAgentSessionRuntimeDeps) => {
+    installed.deps = deps
+    return {}
+  })
+}))
+
+const { OrcaRuntimeService } = await import('./orca-runtime')
+const { OrchestrationDb } = await import('./orchestration/db')
+
+describe("the runtime's own structured host install", () => {
+  it('reports every session status change to the mail redrive', async () => {
+    const runtime = new OrcaRuntimeService()
+    const redrive = vi
+      .spyOn(runtime, 'onStructuredSessionStatusForMail')
+      .mockImplementation(() => {})
+    await runtime.ensureStructuredAgentSessionHost()
+    const summary: AgentSessionStatusSummary = {
+      sessionId: 'claude_1234abcd',
+      workspaceId: 'workspace-1',
+      agent: 'claude',
+      status: 'idle',
+      latestPrompt: '',
+      updatedAt: 0
+    }
+    try {
+      installed.deps?.onSessionStatusChanged?.(summary, { replay: false })
+    } catch {
+      // The same callback's rename half needs a store this bare runtime does not have.
+    }
+    expect(redrive).toHaveBeenCalledWith(summary)
+  })
+
+  it('logs a redrive the database fails, so the status callback goes on to the workspace rename', () => {
+    const runtime = new OrcaRuntimeService()
+    const closed = new OrchestrationDb(':memory:')
+    closed.close()
+    vi.spyOn(runtime, 'getExistingOrchestrationDb').mockReturnValue(closed)
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    expect(() =>
+      runtime.onStructuredSessionStatusForMail({
+        sessionId: '4a1f6c2e-8b3d-4e7a-9c15-0d2b6e8f1a37',
+        status: 'idle'
+      })
+    ).not.toThrow()
+    expect(warn).toHaveBeenCalledWith(
+      '[orchestration] structured session mail redrive failed',
+      expect.objectContaining({ sessionId: '4a1f6c2e-8b3d-4e7a-9c15-0d2b6e8f1a37' })
+    )
+  })
+})
diff --git a/src/main/runtime/structured-session-worktree-teardown.test.ts b/src/main/runtime/structured-session-worktree-teardown.test.ts
index 602aaa3d3aa0..f33d7889b31f 100644
--- a/src/main/runtime/structured-session-worktree-teardown.test.ts
+++ b/src/main/runtime/structured-session-worktree-teardown.test.ts
@@ -62,8 +62,8 @@ function installHost(options: {
   /**
    * Sessions this host is not holding, so they observe `unverifiable` rather than `live`.
    *
-   * The everyday shape, not an edge case: the provider child belongs to the VISIBLE pane, so any
-   * chat outside the active workspace has already been evicted by the release clock.
+   * The everyday shape, not an edge case: the idle sweep has already put to rest any chat quiet for
+   * its window, on screen or not.
    */
   detached?: Set<string>
   /**
diff --git a/src/main/runtime/structured-session-worktree-teardown.ts b/src/main/runtime/structured-session-worktree-teardown.ts
index f79d5d128128..3f8ab31b3ec7 100644
--- a/src/main/runtime/structured-session-worktree-teardown.ts
+++ b/src/main/runtime/structured-session-worktree-teardown.ts
@@ -27,7 +27,10 @@ import {
 } from '../../shared/execution-host'
 import { STILL_LIVE_DETAIL_PREFIX } from '../../shared/worktree/removal'
 import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-registry'
-import { observeStructuredWorker } from './structured-worker-authority'
+import {
+  observeStructuredWorker,
+  structuredSessionCloseSettled
+} from './structured-worker-authority'
 import { closeStructuredAgentSessionChild } from './structured-agent-session-close'
 import { retireSettledStructuredWorkerTab } from './structured-agent-session-tab-retirement'
 import type { WorktreePtyHostFence } from './worktree-pty-host-fence'
@@ -86,12 +89,9 @@ export function structuredSessionTeardownHostId(
  * The workspace's structured sessions, split into what belongs to it and what is attached.
  *
  * MEMBERSHIP and LIVENESS answer different questions, and folding them into one list is what let
- * a chat tab outlive its workspace. A provider child is scoped to a VISIBLE pane — the hold that
- * keeps one is `enabled: isVisible && isWorktreeActive`, and dropping the last hold evicts the
- * child after the release grace — so `live` really means "this chat is the visible pane in the
- * active workspace, or was moments ago". Deleting a workspace from the sidebar while a different
- * one is active makes every chat in the target non-live. Those are exactly the sessions a
- * liveness-only list never saw.
+ * a chat tab outlive its workspace. A provider child runs from a send until the idle sweep rests
+ * it, so `live` only means "this chat's agent worked recently", and every chat at rest in the
+ * target is non-live. Those are exactly the sessions a liveness-only list never saw.
  */
 export type StructuredSessionsForWorktree = {
   /** Every session bound to this workspace on the fenced host, attached or not. */
@@ -256,11 +256,10 @@ export async function closeStructuredSessionsForWorktree(
   } = {}
 ): Promise<void> {
   const { runtime, mayRefuse } = options
-  // No `afterClose` for a dispatched worker: `host.close` drops the holds, so nothing keeps a
-  // provider child un-evictable, but the dispatch's redrive subscription and registry entry do
-  // survive until it settles by another verb. That is a bounded leak, not a hazard — and passing
-  // one here would mean resolving a dispatch id per session on a teardown path that must stay
-  // inside the sweep deadline.
+  // No `afterClose` for a dispatched worker: `host.close` stops the child, but the dispatch's
+  // redrive subscription and registry entry survive until it settles by another verb. That is a
+  // bounded leak, not a hazard — and passing one here would mean resolving a dispatch id per
+  // session on a teardown path that must stay inside the sweep deadline.
   for (const session of progress.sessions) {
     // Stops ISSUING new closes once the budget is spent; an in-flight one is left to finish, since
     // nothing here can cancel a provider round trip. Without this, one slow round trip starved
@@ -279,7 +278,7 @@ export async function closeStructuredSessionsForWorktree(
       // Re-observed rather than reusing the close's own reason string: what the user is asked to
       // waive is the state AFTER the attempt, and a close that threw never reached an observation.
       const status = observeStructuredWorker({ sessionId: session.sessionId }).status
-      if (status === 'exited') {
+      if (status === 'exited' || structuredSessionCloseSettled(session.sessionId)) {
         // The re-read can PROVE the exit a failed close could not — it threw past its own
         // observation, or the record's death evidence landed after it read. Refusing on a child
         // that is demonstrably gone is the defect this sweep exists to remove, so take the proof
diff --git a/src/main/runtime/structured-worker-at-rest.test.ts b/src/main/runtime/structured-worker-at-rest.test.ts
new file mode 100644
index 000000000000..28317e4da884
--- /dev/null
+++ b/src/main/runtime/structured-worker-at-rest.test.ts
@@ -0,0 +1,347 @@
+// A structured worker whose agent is at rest: its dispatch keeps it running while open, and once it
+// rests it is still this runtime's worker — mail reaches it — until its chat tab is gone. Whether
+// its process runs is a separate answer, and a close counts a released lease as done.
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentSessionRecord } from '../../shared/agent-session-record'
+import { OrchestrationDb } from './orchestration/db'
+
+const hostRef: { current: unknown } = { current: null }
+
+vi.mock('../native-chat/agent-session-wire/structured-agent-session-registry', () => ({
+  getStructuredAgentSessionHost: () => hostRef.current
+}))
+
+const { observeStructuredWorker, resolveStructuredWorkerAuthority, structuredSessionCloseSettled } =
+  await import('./structured-worker-authority')
+const { structuredWorkerOwesWork, structuredWorkerOwned } =
+  await import('./structured-worker-custody')
+const {
+  mintStructuredWorkerHandle,
+  mintStructuredWorkerPaneKey,
+  structuredWorkerIdentities,
+  structuredWorkerProcessIncarnation
+} = await import('./structured-worker-identity')
+const { listAddressableStructuredWorkers } =
+  await import('./orchestration/structured-worker-group-addressing')
+const { closeStructuredAgentSessionChild } = await import('./structured-agent-session-close')
+const { resolveGroupAddress } = await import('./orchestration/groups')
+const { createRestTestRig, foundRestTestChat, IDLE_MS, REST_TEST_SESSION, sweepTicks } =
+  await import('../native-chat/agent-session-wire/structured-agent-session-rest-test-rig')
+
+const SESSION = 'a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d'
+const LOCAL = JSON.stringify({ kind: 'local', hostId: 'local' })
+
+function record(lease: Partial<AgentSessionRecord['lease']>): AgentSessionRecord {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a partial record; the ownership and liveness reads touch only lease, location and provider.
+  return {
+    sessionId: SESSION,
+    provider: 'codex',
+    location: {
+      executionHostId: 'local',
+      wslDistro: null,
+      workspaceId: 'wt_1',
+      workspaceKind: 'git-worktree'
+    },
+    lease: { claimStatus: 'live', deathEvidence: null, runtimeFence: 3, ...lease }
+  } as AgentSessionRecord
+}
+
+function installHost(current: AgentSessionRecord | null, tabs: string[]) {
+  const host = {
+    deps: { store: { getRecord: () => current } },
+    hasSession: () => false,
+    getPersistedVisibleSessionTabIndex: () => ({ present: true, sessionIds: tabs }),
+    setSessionTabVisibility: vi.fn(async (_id: string, visible: boolean) => {
+      tabs.splice(0, tabs.length, ...(visible ? [SESSION] : []))
+    }),
+    close: vi.fn(async () => undefined)
+  }
+  hostRef.current = host
+  return host
+}
+
+let paneKey = ''
+
+function registerWorker(): string {
+  const handle = mintStructuredWorkerHandle()
+  paneKey = mintStructuredWorkerPaneKey(SESSION)
+  structuredWorkerIdentities.register({
+    handle,
+    sessionId: SESSION,
+    agent: 'codex',
+    paneKey,
+    processIncarnation: structuredWorkerProcessIncarnation(SESSION),
+    worktreeId: 'wt_1',
+    hostScope: { kind: 'local', hostId: 'local' }
+  })
+  return handle
+}
+
+beforeEach(() => {
+  structuredWorkerIdentities.clear()
+  hostRef.current = null
+})
+
+describe('an open dispatch keeps its worker running (P2-19 i)', () => {
+  let db: OrchestrationDb
+  beforeEach(() => {
+    db = new OrchestrationDb(':memory:')
+  })
+  afterEach(() => db.close())
+
+  function dispatchWorker(hostScope = LOCAL) {
+    const task = db.createTask({ runId: 'run_legacy_local', spec: 'structured work' })
+    const { dispatch } = db.createStartingWorkerDispatch({
+      taskId: task.id,
+      startOptions: {},
+      creator: { kind: 'system' },
+      maxDepth: 9
+    })
+    db.prepareStartingWorkerAuthority({
+      dispatchId: dispatch.id,
+      handle: mintStructuredWorkerHandle(),
+      paneKey: mintStructuredWorkerPaneKey(SESSION),
+      processIncarnation: structuredWorkerProcessIncarnation(SESSION),
+      worktreeId: 'wt_1',
+      effects: [],
+      setupState: 'not_configured',
+      hostScope,
+      terminalOwnership: 'created'
+    })
+    return dispatch
+  }
+
+  it('answers open while the dispatch starts, runs or stops, and closed once it settles', () => {
+    const dispatch = dispatchWorker()
+    expect(structuredWorkerOwesWork(db, record({}))).toBe(true)
+    db.markWorkerDispatchReady(dispatch.id)
+    expect(structuredWorkerOwesWork(db, record({}))).toBe(true)
+    db.beginWorkerStop(dispatch.id, 'epoch_home')
+    expect(structuredWorkerOwesWork(db, record({}))).toBe(true)
+    db.settleWorkerStop(dispatch.id)
+    expect(structuredWorkerOwesWork(db, record({}))).toBe(false)
+  })
+
+  // Custody is the list state coordinators see: `active` owes work, `reclaimable` does not.
+  it('lets a worker awaiting its coordinator rest, and keeps one whose stop is in doubt', () => {
+    const done = dispatchWorker()
+    db.markWorkerDispatchReady(done.id)
+    db.settleWorkerReport({
+      taskId: done.task_id,
+      dispatchId: done.id,
+      outcome: 'succeeded',
+      result: 'done'
+    })
+    expect(structuredWorkerOwesWork(db, record({}))).toBe(false)
+
+    const doubted = dispatchWorker()
+    db.markWorkerDispatchReady(doubted.id)
+    db.beginWorkerStop(doubted.id, 'epoch_home')
+    db.markWorkerStopUnknown(doubted.id, 'the close was not proven')
+    expect(structuredWorkerOwesWork(db, record({}))).toBe(true)
+  })
+
+  it('keeps a worker at rest after its dispatch settles a group recipient, until its tab goes (P2-19 ii)', () => {
+    const dispatch = dispatchWorker()
+    db.markWorkerDispatchReady(dispatch.id)
+    db.beginWorkerStop(dispatch.id, 'epoch_home')
+    db.settleWorkerStop(dispatch.id)
+    // Settlement forgets the in-memory entry; only the durable row and the record remain.
+    structuredWorkerIdentities.clear()
+    const tabs = [SESSION]
+    installHost(
+      record({
+        claimStatus: 'released',
+        deathEvidence: { kind: 'exit-observed', detail: 'stopped by the sweep', observedAt: 1 }
+      }),
+      tabs
+    )
+    const handle = db.getWorkerTerminalResourceByOwner(dispatch.id)!.terminal_handle
+    const recipients = () => listAddressableStructuredWorkers(db)
+
+    expect(recipients()).toEqual([{ handle, worktreeId: 'wt_1', agentIdentity: 'codex' }])
+    expect(resolveGroupAddress('@codex', 'term_sender', recipients(), () => 'idle')).toEqual([
+      handle
+    ])
+    expect(resolveGroupAddress('@claude', 'term_sender', recipients(), () => 'idle')).toEqual([])
+    // Direct mail resolves the same worker through the same ownership answer.
+    expect(resolveStructuredWorkerAuthority(handle, db)?.identity.handle).toBe(handle)
+
+    tabs.length = 0
+    expect(recipients()).toEqual([])
+    expect(resolveStructuredWorkerAuthority(handle, db)).toBeNull()
+  })
+
+  it('stops routing to a worker its coordinator abandoned and then released, and keeps its tab', () => {
+    const dispatch = dispatchWorker()
+    db.markWorkerDispatchReady(dispatch.id)
+    structuredWorkerIdentities.clear()
+    const tabs = [SESSION]
+    installHost(
+      record({
+        claimStatus: 'released',
+        deathEvidence: { kind: 'exit-observed', detail: 'stopped by the sweep', observedAt: 1 }
+      }),
+      tabs
+    )
+    const resource = db.getWorkerTerminalResourceByOwner(dispatch.id)!
+    const handle = resource.terminal_handle
+    const recipients = () => listAddressableStructuredWorkers(db)
+    // At rest, its dispatch abandoned: still a recipient, as a terminal worker left running is.
+    db.abandonWorkerDispatch(dispatch.id)
+    const worktreeGroup = () =>
+      resolveGroupAddress('@worktree:wt_1', 'term_sender', recipients(), () => 'idle')
+    expect(worktreeGroup()).toEqual([handle])
+    expect(resolveStructuredWorkerAuthority(handle, db)).not.toBeNull()
+
+    // The release finds the agent at rest, so it settles as released.
+    expect(db.requestWorkerTerminalRelease(dispatch.id)).toMatchObject({ disposition: 'retained' })
+    expect(
+      db.settleDeadWorkerTerminalRelease({
+        requestingDispatchId: dispatch.id,
+        resourceId: resource.id,
+        processIncarnation: resource.process_incarnation!
+      })
+    ).toMatchObject({ disposition: 'released' })
+
+    expect(tabs).toEqual([SESSION])
+    expect(worktreeGroup()).toEqual([])
+    // Direct mail routes through the same answer.
+    expect(resolveStructuredWorkerAuthority(handle, db)).toBeNull()
+  })
+
+  it('reads only this host scope, and no database answers no', () => {
+    dispatchWorker(JSON.stringify({ kind: 'ssh', targetId: 'elsewhere' }))
+    expect(structuredWorkerOwesWork(db, record({}))).toBe(false)
+    expect(structuredWorkerOwesWork(null, record({}))).toBe(false)
+  })
+})
+
+describe('ownership, not liveness (P2-19 ii-iv, P2-26)', () => {
+  it('owns a worker at rest while its tab is listed, and routes mail to it', () => {
+    const handle = registerWorker()
+    installHost(
+      record({
+        claimStatus: 'released',
+        deathEvidence: { kind: 'exit-observed', detail: 'stopped', observedAt: 1 }
+      }),
+      [SESSION]
+    )
+
+    expect(structuredWorkerOwned(SESSION)).toBe(true)
+    expect(observeStructuredWorker({ sessionId: SESSION }).status).toBe('exited')
+    expect(resolveStructuredWorkerAuthority(handle, null)?.identity.paneKey).toBe(paneKey)
+  })
+
+  it('retires a released worker whose tab is gone', () => {
+    const handle = registerWorker()
+    installHost(record({ claimStatus: 'released' }), [])
+
+    expect(structuredWorkerOwned(SESSION)).toBe(false)
+    expect(resolveStructuredWorkerAuthority(handle, null)).toBeNull()
+  })
+
+  it('keeps authority for a live session that has no tab', () => {
+    const handle = registerWorker()
+    installHost(record({ claimStatus: 'live' }), [])
+
+    expect(structuredWorkerOwned(SESSION)).toBe(true)
+    expect(resolveStructuredWorkerAuthority(handle, null)).not.toBeNull()
+  })
+
+  it('cannot answer without a host', () => {
+    expect(structuredWorkerOwned(SESSION)).toBeNull()
+  })
+})
+
+describe('a close whose stop could not be proven (P2-30)', () => {
+  it('closes on the first attempt, keeps the tab retired and leaves the verdict alone', async () => {
+    const released = record({ claimStatus: 'released', deathEvidence: null })
+    const tabs = [SESSION]
+    const host = installHost(released, tabs)
+    expect(observeStructuredWorker({ sessionId: SESSION }).status).toBe('unverifiable')
+
+    const outcome = await closeStructuredAgentSessionChild(SESSION)
+    expect(outcome).toMatchObject({ stopped: true, closeAttempted: true })
+    expect(host.close).toHaveBeenCalledOnce()
+    expect(tabs).toEqual([])
+    expect(host.setSessionTabVisibility).not.toHaveBeenCalledWith(SESSION, true)
+    expect(released.lease.deathEvidence).toBeNull()
+    expect(structuredSessionCloseSettled(SESSION)).toBe(true)
+  })
+
+  it('still refuses a close that left the lease live', () => {
+    installHost(record({ claimStatus: 'live' }), [SESSION])
+    expect(structuredSessionCloseSettled(SESSION)).toBe(false)
+  })
+})
+
+describe('a task dispatched into a worker whose own dispatch settled', () => {
+  it('keeps the worker running while that task is open, and lets it rest once the task settles', async () => {
+    const db = new OrchestrationDb(':memory:')
+    const rig = await createRestTestRig({
+      hasOpenDispatch: (current) => structuredWorkerOwesWork(db, current)
+    })
+    try {
+      hostRef.current = rig.host
+      await foundRestTestChat(rig)
+      const incarnation = structuredWorkerProcessIncarnation(REST_TEST_SESSION)
+      const handle = mintStructuredWorkerHandle()
+      const workerPane = mintStructuredWorkerPaneKey(REST_TEST_SESSION)
+      const first = db.createTask({ runId: 'run_legacy_local', spec: 'first task' })
+      const { dispatch: started } = db.createStartingWorkerDispatch({
+        taskId: first.id,
+        startOptions: {},
+        creator: { kind: 'system' },
+        maxDepth: 9
+      })
+      db.prepareStartingWorkerAuthority({
+        dispatchId: started.id,
+        handle,
+        paneKey: workerPane,
+        processIncarnation: incarnation,
+        worktreeId: 'wt_1',
+        effects: [],
+        setupState: 'not_configured',
+        hostScope: LOCAL,
+        terminalOwnership: 'created'
+      })
+      db.markWorkerDispatchReady(started.id)
+      expect(
+        db.settleWorkerReport({
+          taskId: first.id,
+          dispatchId: started.id,
+          outcome: 'succeeded',
+          result: 'done'
+        })
+      ).toMatchObject({ action: 'settled' })
+      // The coordinator hands the same worker its next task: a dispatch with no worker row.
+      const second = db.createTask({ runId: 'run_legacy_local', spec: 'second task' })
+      const handedOn = db.createDispatchContext({
+        taskId: second.id,
+        assigneeHandle: handle,
+        assigneePaneKey: workerPane,
+        processIncarnation: incarnation,
+        creator: { kind: 'system' },
+        maxDepth: 9
+      })
+      rig.clock.now += 2 * IDLE_MS
+
+      await sweepTicks(12)
+      expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+      expect(observeStructuredWorker({ sessionId: REST_TEST_SESSION }).status).toBe('live')
+
+      db.completeDispatch(handedOn.id)
+      rig.clock.now += IDLE_MS + 1
+      await vi.waitFor(() =>
+        expect(observeStructuredWorker({ sessionId: REST_TEST_SESSION }).status).toBe('exited')
+      )
+      expect(rig.adapter.closeSession).toHaveBeenCalledWith(REST_TEST_SESSION)
+    } finally {
+      hostRef.current = null
+      await rig.dispose()
+      db.close()
+    }
+  })
+})
diff --git a/src/main/runtime/structured-worker-authority.ts b/src/main/runtime/structured-worker-authority.ts
index 96d013c2ed3f..24fda6b1456e 100644
--- a/src/main/runtime/structured-worker-authority.ts
+++ b/src/main/runtime/structured-worker-authority.ts
@@ -3,8 +3,10 @@
  *
  * The registry holds the handle→session mapping for this process; the durable worker-terminal
  * resource row is what survives a restart, so a miss falls back to rehydrating from it. The
- * durable agent-session record is the liveness half: a session whose claim is conflicted or
- * released, or pinned to another execution host, is no longer this runtime's structured worker.
+ * durable agent-session record, the chat's tab and the orchestration's own resource row decide
+ * custody: see `structured-worker-custody`.
+ * Whether its provider process runs is a separate fact, `observeStructuredWorker`, and routing
+ * never reads it — an agent at rest still receives mail, which starts it.
  */
 
 import type { AgentSessionRecord } from '../../shared/agent-session-record'
@@ -12,11 +14,11 @@ import type { OrcaSessionId } from '../../shared/orca-session-address'
 import type { RuntimeTerminalState } from '../../shared/runtime-types'
 import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-registry'
 import type { OrchestrationDb } from './orchestration/db'
+import { structuredWorkerAddressable } from './structured-worker-custody'
 import {
   isStructuredWorkerHandle,
   structuredWorkerIdentities,
   structuredWorkerProcessIncarnation,
-  structuredWorkerRecordIsCurrent,
   type StructuredWorkerIdentity
 } from './structured-worker-identity'
 
@@ -82,7 +84,8 @@ export function isRecordedStructuredWorkerSession(
   )
 }
 
-/** Identity plus a record that still proves this runtime owns the session. */
+/** Identity plus a record that still proves this runtime owns the session, for a worker its
+ *  orchestration has not released. */
 export function resolveStructuredWorkerAuthority(
   handle: string,
   db: OrchestrationDb | null | undefined
@@ -92,7 +95,14 @@ export function resolveStructuredWorkerAuthority(
     return null
   }
   const record = readStructuredAgentSessionRecord(identity.sessionId)
-  return record && structuredWorkerRecordIsCurrent(record) ? { identity, record } : null
+  return record &&
+    structuredWorkerAddressable(
+      db,
+      identity.sessionId,
+      db?.getWorkerTerminalResourceByHandle?.(identity.handle)
+    )
+    ? { identity, record }
+    : null
 }
 
 /**
@@ -115,6 +125,20 @@ export type StructuredWorkerObservation = {
   reason?: string
 }
 
+/**
+ * Whether a close left nothing running: `exited`, or `unverifiable` on a released lease — a release
+ * whose stop could not be proven, which sent no signal and is left as it is. Closing a chat is the
+ * user's action, and bookkeeping about a process already released must not refuse it.
+ */
+export function structuredSessionCloseSettled(sessionId: string): boolean {
+  const status = observeStructuredWorker({ sessionId }).status
+  return (
+    status === 'exited' ||
+    (status === 'unverifiable' &&
+      readStructuredAgentSessionRecord(sessionId)?.lease.claimStatus === 'released')
+  )
+}
+
 /**
  * The observation as the terminal state every read result reports.
  *
diff --git a/src/main/runtime/structured-worker-child-identity-env.test.ts b/src/main/runtime/structured-worker-child-identity-env.test.ts
deleted file mode 100644
index e966dd558240..000000000000
--- a/src/main/runtime/structured-worker-child-identity-env.test.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { installFakeAppEnvironment } from '../../../config/scripts/vitest-host-ports-setup'
-
-const shim = vi.hoisted(() => ({ ensureLinuxTerminalOrcaCliShimDir: vi.fn() }))
-vi.mock('../cli/linux-terminal-orca-cli-shim', () => shim)
-
-import { structuredWorkerChildIdentityEnv } from './structured-worker-child-identity-env'
-import {
-  mintStructuredWorkerHandle,
-  mintStructuredWorkerPaneKey,
-  structuredWorkerHostScope,
-  structuredWorkerIdentities,
-  structuredWorkerProcessIncarnation
-} from './structured-worker-identity'
-
-const SESSION_ID = 'f7a1c0de-1111-4222-8333-444455556666'
-const USER_DATA = '/data/orca'
-const RESOURCES = '/app/Resources'
-const SHIM_DIR = join(USER_DATA, 'linux-orca-cli-shim')
-
-const platformDescriptor = Object.getOwnPropertyDescriptor(process, 'platform')!
-const resourcesDescriptor = Object.getOwnPropertyDescriptor(process, 'resourcesPath')
-
-function pinPlatform(platform: NodeJS.Platform): void {
-  Object.defineProperty(process, 'platform', { configurable: true, value: platform })
-}
-
-function registerWorker(): string {
-  const handle = mintStructuredWorkerHandle()
-  structuredWorkerIdentities.register({
-    handle,
-    sessionId: SESSION_ID,
-    agent: 'claude',
-    paneKey: mintStructuredWorkerPaneKey(SESSION_ID),
-    processIncarnation: structuredWorkerProcessIncarnation(SESSION_ID),
-    worktreeId: 'wt_1',
-    hostScope: { kind: 'local', hostId: 'local' }
-  })
-  return handle
-}
-
-beforeEach(() => {
-  shim.ensureLinuxTerminalOrcaCliShimDir.mockReset()
-  shim.ensureLinuxTerminalOrcaCliShimDir.mockReturnValue(SHIM_DIR)
-  Object.defineProperty(process, 'resourcesPath', { configurable: true, value: RESOURCES })
-})
-
-afterEach(() => {
-  structuredWorkerIdentities.clear()
-  Object.defineProperty(process, 'platform', platformDescriptor)
-  if (resourcesDescriptor) {
-    Object.defineProperty(process, 'resourcesPath', resourcesDescriptor)
-  } else {
-    Reflect.deleteProperty(process, 'resourcesPath')
-  }
-})
-
-describe('structuredWorkerChildIdentityEnv', () => {
-  it('marks an ordinary chat session as having NO identity, and grants it nothing', () => {
-    // The marker names nothing — no handle, no pane key, no session id, no token — so it cannot be
-    // replayed or impersonated, and it does not reach the hook, agent-row or mobile-projection
-    // pipelines a pane key would. Its only job is to let the CLI REFUSE instead of guessing: this
-    // session has no pane, so every implicit-terminal guess resolved to a sibling, and a
-    // destructive `check` then consumed that sibling's mail.
-    pinPlatform('linux')
-    installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
-    const childEnv = { PATH: '/usr/bin' }
-    const env = structuredWorkerChildIdentityEnv(SESSION_ID, childEnv)
-    expect(env).toEqual({ PATH: '/usr/bin', ORCA_STRUCTURED_SESSION: '1' })
-    expect(env.ORCA_TERMINAL_HANDLE).toBeUndefined()
-    expect(env.ORCA_PANE_KEY).toBeUndefined()
-    expect(env.ORCA_CLI_COMMAND).toBeUndefined()
-    // Still no CLI reachability granted, so packaged builds keep today's exposure.
-    expect(childEnv.PATH).toBe('/usr/bin')
-    expect(shim.ensureLinuxTerminalOrcaCliShimDir).not.toHaveBeenCalled()
-  })
-
-  it('gives a packaged-Linux worker the bare-orca shim its ORCA_CLI_COMMAND assumes', () => {
-    // Without this the child's first `orca orchestration check` execs GNOME Orca — the CLI
-    // installs as `orca-ide` on Linux (stablyai/orca#7904) — and the dispatch hangs to timeout.
-    pinPlatform('linux')
-    installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
-    const handle = registerWorker()
-    const env = structuredWorkerChildIdentityEnv(SESSION_ID, { PATH: '/usr/bin:/bin' })
-    expect(env.ORCA_TERMINAL_HANDLE).toBe(handle)
-    expect(env.ORCA_CLI_COMMAND).toBe('orca')
-    expect(env.PATH).toBe(`${SHIM_DIR}:/usr/bin:/bin`)
-  })
-
-  it('gives a packaged-macOS worker the bundled CLI dir', () => {
-    pinPlatform('darwin')
-    installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
-    registerWorker()
-    const env = structuredWorkerChildIdentityEnv(SESSION_ID, { PATH: '/usr/bin' })
-    expect(env.PATH).toBe(`${join(RESOURCES, 'bin')}:/usr/bin`)
-  })
-
-  it('gives a packaged-Windows worker the bundled CLI dir under the env block spelling', () => {
-    pinPlatform('win32')
-    installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
-    registerWorker()
-    const env = structuredWorkerChildIdentityEnv(SESSION_ID, { Path: 'C:\\Windows' })
-    expect(env.Path).toBe(`${join(RESOURCES, 'bin')};C:\\Windows`)
-    expect(env.PATH).toBeUndefined()
-  })
-
-  it('gives an unpackaged worker the dev launcher dir', () => {
-    pinPlatform('darwin')
-    installFakeAppEnvironment({ isPackaged: () => false, getPath: () => USER_DATA })
-    registerWorker()
-    const env = structuredWorkerChildIdentityEnv(SESSION_ID, { PATH: '/usr/bin' })
-    expect(env.PATH).toBe(`${join(USER_DATA, 'cli', 'bin')}:/usr/bin`)
-  })
-
-  it('never puts a pane key in the child environment', () => {
-    // A pane key here flows into hook-emitted agent statuses and the attestation, agent-row and
-    // mobile-projection pipelines, all of which assume it names a live PTY leaf.
-    pinPlatform('linux')
-    installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
-    registerWorker()
-    const env = structuredWorkerChildIdentityEnv(SESSION_ID, { PATH: '/usr/bin' })
-    expect(env.ORCA_PANE_KEY).toBeUndefined()
-    expect(Object.keys(env).filter((key) => key.includes('PANE'))).toEqual([])
-  })
-
-  it('never names the WSL-scoped launcher, because a structured worker cannot run in WSL', () => {
-    // `orca-ide` is the literal the PTY lane exports for WSL only. A structured session that
-    // resolves to a WSL distro is refused a host scope, so it never becomes a worker at all —
-    // which is why the bare-`orca` shim, not the literal, is the right fix on Linux.
-    expect(
-      structuredWorkerHostScope({
-        executionHostId: 'local',
-        workspaceId: 'wt_1',
-        workspaceKind: 'git-worktree',
-        wslDistro: 'Ubuntu'
-      })
-    ).toBeNull()
-    pinPlatform('linux')
-    installFakeAppEnvironment({ isPackaged: () => true, getPath: () => USER_DATA })
-    registerWorker()
-    expect(
-      structuredWorkerChildIdentityEnv(SESSION_ID, { PATH: '/usr/bin' }).ORCA_CLI_COMMAND
-    ).not.toBe('orca-ide')
-  })
-})
diff --git a/src/main/runtime/structured-worker-child-identity-env.ts b/src/main/runtime/structured-worker-child-identity-env.ts
deleted file mode 100644
index 6cf9f46e910c..000000000000
--- a/src/main/runtime/structured-worker-child-identity-env.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * The orchestration identity — and the CLI reachability — a structured worker's own child needs
- * to speak for itself.
- *
- * Without `ORCA_TERMINAL_HANDLE` the worker's Bash tool has nothing to pass as `--from`, and
- * `resolveOrchestrationTerminalHandle` falls back to a cwd lookup that returns whichever leaf in
- * the worktree comes first. Two attacks follow from that: a bare `check` reads and consumes a
- * SIBLING's dispatch mailbox, and a bare `send --type worker_done` can settle a sibling's
- * context-only dispatch, a tier that has no capability token to reject on.
- *
- * `ORCA_CLI_COMMAND: 'orca'` is honest ONLY because of the PATH prepend below. Orca's Linux CLI
- * installs as `orca-ide` so it never claims GNOME Orca's /usr/bin/orca (stablyai/orca#7904), and
- * on packaged macOS/Windows the bundled launcher is reachable only from the app's own resources
- * dir. A PTY worker gets that treatment from `buildPtyHostEnv`; a structured worker has no PTY,
- * so it applies the SAME function here rather than a second, drifting copy of the rule.
- *
- * Deliberately NOT `ORCA_PANE_KEY`. Claude structured sessions run hooks, and a pane key in their
- * environment starts flowing into hook-emitted agent-status payloads and the hook-attestation,
- * agent-row and mobile-projection pipelines, every one of which assumes a pane key names a live
- * PTY leaf. It would also open `selectExactWorkerProviderSession`, which is fail-closed today
- * precisely because a structured session emits no hook agent status. The CLI needs none of it once
- * the handle is present.
- *
- * A session that is not a dispatched worker gets ONE variable, `ORCA_STRUCTURED_SESSION`, and it
- * names nothing: no handle, no pane key, no session id, no token. Its only meaning is "this child
- * is a structured session with no orchestration identity", which is what a verb needs in order to
- * REFUSE rather than guess one. Because it names nothing it cannot be replayed, cannot impersonate,
- * and cannot flow into the hook, agent-row or mobile-projection pipelines the way a pane key would
- * — which is why it is a different decision from withholding `ORCA_PANE_KEY`, not a reversal of it.
- * Without it, `check` fell through to the active-terminal guess and destructively consumed a
- * SIBLING pane's oldest unread batch; `requireUnambiguous` only narrows that, because with exactly
- * one terminal pane in the worktree the guess still resolves — to a sibling.
- *
- * The handle is read from the registry at spawn time, so an in-host recovery respawn re-bakes the
- * SAME handle rather than a stale or fresh one.
- */
-
-import { getAppEnvironment, hasAppEnvironment } from '../../shared/app-environment'
-import { prependOrcaCliDirToChildPath } from '../cli/orca-cli-child-path'
-import { ORCA_STRUCTURED_SESSION_ENV } from '../../shared/structured-session-marker'
-import { structuredWorkerIdentities } from './structured-worker-identity'
-
-export function structuredWorkerChildIdentityEnv(
-  sessionId: string,
-  childEnv: Record<string, string>
-): Record<string, string> {
-  const identity = structuredWorkerIdentities.getBySessionId(sessionId)
-  if (!identity) {
-    return { ...childEnv, [ORCA_STRUCTURED_SESSION_ENV]: '1' }
-  }
-  const env: Record<string, string> = {
-    ...childEnv,
-    ORCA_TERMINAL_HANDLE: identity.handle,
-    ORCA_CLI_COMMAND: 'orca'
-  }
-  applyOrcaCliPath(env)
-  return env
-}
-
-/**
- * A host with no app environment installed — a plain-Node fork, or a unit test — has no userData
- * root to resolve, and inventing one would write a shim into the wrong directory.
- */
-function applyOrcaCliPath(env: Record<string, string>): void {
-  if (!hasAppEnvironment()) {
-    return
-  }
-  const app = getAppEnvironment()
-  prependOrcaCliDirToChildPath(env, {
-    isPackaged: app.isPackaged(),
-    userDataPath: app.getPath('userData'),
-    resourcesPath: process.resourcesPath ?? null
-  })
-}
diff --git a/src/main/runtime/structured-worker-custody.ts b/src/main/runtime/structured-worker-custody.ts
new file mode 100644
index 000000000000..54e42b24d800
--- /dev/null
+++ b/src/main/runtime/structured-worker-custody.ts
@@ -0,0 +1,133 @@
+/**
+ * Whether orchestration still holds a structured worker, the one answer every reader derives from.
+ *
+ * Custody is the orchestration's own worker-terminal state, the list state `worker-list` shows
+ * coordinators, never whether the worker's process runs: a worker at rest is still held, and mail
+ * starts it. Routing, group addressing and `worker-show` ask whether it is addressable; the idle
+ * sweep asks whether it still owes work.
+ *
+ * Two policy decisions live here and nowhere else: only `released` ends addressability (a release
+ * pending or in doubt still routes, as for a terminal worker), and a settled worker awaiting its
+ * coordinator's decision (`reclaimable`) owes no work, so it may rest.
+ */
+
+import type { AgentSessionRecord } from '../../shared/agent-session-record'
+import type { OrchestrationDb } from './orchestration/db'
+import type { WorkerDispatchState } from './orchestration/types'
+import {
+  deriveWorkerTerminalListState,
+  type WorkerTerminalResourceRow
+} from './orchestration/worker-terminal-ownership'
+import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-registry'
+import {
+  structuredWorkerHostScope,
+  structuredWorkerProcessIncarnation,
+  structuredWorkerRecordIsCurrent
+} from './structured-worker-identity'
+
+/**
+ * Whether this runtime still owns the worker's session: routing, addressing and authority ask
+ * this, never whether its process runs. Null when the host is not installed, because reading the
+ * record store would install it — not being able to look is not an answer.
+ */
+export function structuredWorkerOwned(sessionId: string): boolean | null {
+  const host = getStructuredAgentSessionHost()
+  if (!host) {
+    return null
+  }
+  let record: AgentSessionRecord | null
+  try {
+    record = host.deps.store.getRecord(sessionId)
+  } catch {
+    record = null
+  }
+  return structuredWorkerRecordIsCurrent(
+    record,
+    record?.lease.claimStatus === 'released' && structuredWorkerTabListed(host, sessionId)
+  )
+}
+
+/** Retirement is the tab index: every path that ends a chat for good hides its tab. */
+function structuredWorkerTabListed(
+  host: NonNullable<ReturnType<typeof getStructuredAgentSessionHost>>,
+  sessionId: string
+): boolean {
+  try {
+    return host.getPersistedVisibleSessionTabIndex?.().sessionIds.includes(sessionId) ?? false
+  } catch {
+    return false
+  }
+}
+
+type CustodyRow = Pick<
+  WorkerTerminalResourceRow,
+  'owner_dispatch_id' | 'terminal_handle' | 'ownership_state' | 'release_state'
+>
+
+function ownerState(
+  db: OrchestrationDb | null | undefined,
+  row: CustodyRow
+): WorkerDispatchState | undefined {
+  return (
+    db?.getWorkerDispatch?.(row.owner_dispatch_id)?.state ??
+    db?.getRemoteDispatchAttachment?.(row.owner_dispatch_id)?.state
+  )
+}
+
+/**
+ * The user still owns the chat and orchestration has not released the worker, as with a terminal
+ * worker whose terminal closed. Null when ownership cannot be read. A released worker's chat stays
+ * the user's; nothing routes to it.
+ */
+export function structuredWorkerAddressable(
+  db: OrchestrationDb | null | undefined,
+  sessionId: string,
+  row: CustodyRow | undefined
+): boolean | null {
+  const owned = structuredWorkerOwned(sessionId)
+  if (owned === null) {
+    return null
+  }
+  // Release is read off the row alone, so an owner whose state is unreadable still answers.
+  const custody = row
+    ? deriveWorkerTerminalListState({
+        workerState: ownerState(db, row) ?? 'unsupervised',
+        agentTerminalHandle: row.terminal_handle,
+        resource: row
+      })
+    : null
+  return owned && custody !== 'released'
+}
+
+/**
+ * Work orchestration still owes on this worker, read per sweep tick: any unsettled dispatch
+ * addressed to its incarnation, on a process this host owns a terminal for. That covers its own
+ * worker-start dispatch (whose context stays open while the worker is active, a stop in doubt
+ * included, because a supervised worker's context settles only with it) and any task later
+ * dispatched to it. A `reclaimable` worker's dispatch has settled, so it owes nothing.
+ */
+export function structuredWorkerOwesWork(
+  db: OrchestrationDb | null,
+  record: AgentSessionRecord
+): boolean {
+  const hostScope = structuredWorkerHostScope(record.location)
+  if (!db || !hostScope) {
+    return false
+  }
+  const incarnation = structuredWorkerProcessIncarnation(record.sessionId)
+  const owned = db.db
+    .prepare(
+      `SELECT 1 FROM worker_terminal_resources
+        WHERE process_incarnation = ? AND host_scope IS ? AND ownership_state = 'owned' LIMIT 1`
+    )
+    .get(incarnation, JSON.stringify(hostScope))
+  return (
+    owned !== undefined &&
+    db.db
+      .prepare(
+        `SELECT 1 FROM dispatch_contexts
+          WHERE process_incarnation = ? AND status IN ('pending', 'dispatched') LIMIT 1`
+      )
+      .get(incarnation) !== undefined
+  )
+}
diff --git a/src/main/runtime/structured-worker-identity.test.ts b/src/main/runtime/structured-worker-identity.test.ts
index 98989a85891c..17ba897de479 100644
--- a/src/main/runtime/structured-worker-identity.test.ts
+++ b/src/main/runtime/structured-worker-identity.test.ts
@@ -5,7 +5,7 @@ import {
   structuredAgentSessionTabId
 } from '../../shared/structured-agent-session-projection'
 import { selectExactWorkerProviderSession } from './orchestration/worker-provider-session'
-import { structuredWorkerChildIdentityEnv } from './structured-worker-child-identity-env'
+import { structuredSessionChildIdentityEnv } from './structured-session-child-identity-env'
 import {
   StructuredWorkerIdentityRegistry,
   isStructuredWorkerHandle,
@@ -176,18 +176,24 @@ describe('structured worker identity', () => {
   it('keeps a recovered session current across a fence bump', () => {
     // The host bumps the fence on its own transparent crash recovery; fencing identity on it
     // would wedge the SAME worker as identity_unproven forever.
-    expect(structuredWorkerRecordIsCurrent(record({ runtimeFence: 1 }))).toBe(true)
-    expect(structuredWorkerRecordIsCurrent(record({ runtimeFence: 9 }))).toBe(true)
+    expect(structuredWorkerRecordIsCurrent(record({ runtimeFence: 1 }), false)).toBe(true)
+    expect(structuredWorkerRecordIsCurrent(record({ runtimeFence: 9 }), false)).toBe(true)
     expect(structuredWorkerProcessIncarnation(SESSION_ID)).toBe(
       structuredWorkerProcessIncarnation(SESSION_ID)
     )
   })
 
-  it('refuses a conflicted or released session', () => {
+  it('refuses a conflicted session, and a released one whose chat tab is gone', () => {
     // A terminal owner an older build recorded loads conflicted; it is not this worker.
-    expect(structuredWorkerRecordIsCurrent(record({ claimStatus: 'conflicted' }))).toBe(false)
-    expect(structuredWorkerRecordIsCurrent(record({ claimStatus: 'released' }))).toBe(false)
-    expect(structuredWorkerRecordIsCurrent(null)).toBe(false)
+    expect(structuredWorkerRecordIsCurrent(record({ claimStatus: 'conflicted' }), true)).toBe(false)
+    expect(structuredWorkerRecordIsCurrent(record({ claimStatus: 'released' }), false)).toBe(false)
+    expect(structuredWorkerRecordIsCurrent(null, true)).toBe(false)
+  })
+
+  it('keeps a released session with a listed tab: that worker is at rest, not gone', () => {
+    expect(structuredWorkerRecordIsCurrent(record({ claimStatus: 'released' }), true)).toBe(true)
+    // A live lease is owned whether or not a tab shows it.
+    expect(structuredWorkerRecordIsCurrent(record({ claimStatus: 'live' }), false)).toBe(true)
   })
 })
 
@@ -294,9 +300,9 @@ describe('structured workers stay outside the PTY-only fail-closed paths', () =>
       hostScope: { kind: 'local', hostId: 'local' }
     })
     try {
-      const env = structuredWorkerChildIdentityEnv(SESSION_ID, {})
-      // Registered, so this is a populated env — not the empty one an unregistered session gets,
-      // which would satisfy the pane-key assertion for the wrong reason.
+      const env = structuredSessionChildIdentityEnv(SESSION_ID, {})
+      // Registered, so the worker's handle is present; without it the pane-key assertion would pass
+      // for the wrong reason.
       expect(env.ORCA_TERMINAL_HANDLE).toBe(handle)
       expect(Object.keys(env)).not.toContain('ORCA_PANE_KEY')
     } finally {
diff --git a/src/main/runtime/structured-worker-identity.ts b/src/main/runtime/structured-worker-identity.ts
index c32d6c37f156..22a49e11abb2 100644
--- a/src/main/runtime/structured-worker-identity.ts
+++ b/src/main/runtime/structured-worker-identity.ts
@@ -26,14 +26,19 @@ import {
 } from '../../shared/structured-agent-session-projection'
 import { isTerminalLeafId, makePaneKey, parsePaneKey } from '../../shared/stable-pane-id'
 import { isOrcaSessionId, type OrcaSessionId } from '../../shared/orca-session-address'
+import {
+  STRUCTURED_WORKER_HANDLE_PREFIX,
+  isStructuredWorkerHandle
+} from '../../shared/structured-worker-handle'
 import {
   parseWorkerTerminalHostScope,
   type WorkerTerminalHostScope
 } from './orchestration/worker-terminal-process-liveness'
 
-// Deliberately not `term_`: `issueHandle` revalidates the renderer graph epoch against the
-// renderer-driven leaves map, so a main-minted `term_` leaf evaporates on the next window reload.
-export const STRUCTURED_WORKER_HANDLE_PREFIX = 'structworker_'
+export {
+  STRUCTURED_WORKER_HANDLE_PREFIX,
+  isStructuredWorkerHandle
+} from '../../shared/structured-worker-handle'
 export const STRUCTURED_WORKER_INCARNATION_PREFIX = 'structured:'
 
 export type StructuredWorkerIdentity = {
@@ -47,10 +52,6 @@ export type StructuredWorkerIdentity = {
   hostScope: WorkerTerminalHostScope
 }
 
-export function isStructuredWorkerHandle(handle: string | null | undefined): boolean {
-  return typeof handle === 'string' && handle.startsWith(STRUCTURED_WORKER_HANDLE_PREFIX)
-}
-
 export function mintStructuredWorkerHandle(): string {
   return `${STRUCTURED_WORKER_HANDLE_PREFIX}${randomUUID()}`
 }
@@ -141,19 +142,62 @@ export function structuredWorkerHostScope(
     : null
 }
 
-/** Whether the durable record still describes THIS worker under this host. */
+/**
+ * Whether the durable record still describes THIS worker under this host — ownership, not whether
+ * its process runs. A released lease is a worker at rest while its chat tab is listed; released
+ * with the tab gone is retired. `tabListed` is the persisted tab index's answer.
+ */
 export function structuredWorkerRecordIsCurrent(
-  record: AgentSessionRecord | null | undefined
+  record: AgentSessionRecord | null | undefined,
+  tabListed: boolean
 ): boolean {
   return Boolean(
     record &&
     // Why: a conflicted claim may name a terminal an older build recorded as owner, not this worker.
     record.lease.claimStatus !== 'conflicted' &&
-    record.lease.claimStatus !== 'released' &&
+    (record.lease.claimStatus !== 'released' || tabListed) &&
     structuredWorkerHostScope(record.location)
   )
 }
 
+type StructuredWorkerResourceRow = {
+  terminal_handle: string
+  pane_key: string | null
+  process_incarnation: string | null
+  worktree_id: string | null
+  host_scope: string | null
+}
+
+/** A worker's identity as its durable worker-terminal resource row records it, or null for a row
+ *  that is not a structured worker's or whose pane key does not belong to its own session. */
+export function structuredWorkerIdentityFromRow(
+  row: StructuredWorkerResourceRow
+): StructuredWorkerIdentity | null {
+  const sessionId = sessionIdFromStructuredWorkerIncarnation(row.process_incarnation)
+  const hostScope = parseWorkerTerminalHostScope(row.host_scope)
+  const paneKey = row.pane_key
+  if (
+    !sessionId ||
+    !hostScope ||
+    !row.worktree_id ||
+    !paneKey ||
+    !isStructuredWorkerHandle(row.terminal_handle) ||
+    !persistedStructuredWorkerPaneKeyIsValid(paneKey, sessionId)
+  ) {
+    return null
+  }
+  return {
+    handle: row.terminal_handle,
+    sessionId,
+    // The row does not carry the provider; callers that need it read the durable record.
+    agent: null,
+    paneKey,
+    processIncarnation: structuredWorkerProcessIncarnation(sessionId),
+    worktreeId: row.worktree_id,
+    hostScope
+  }
+}
+
 export class StructuredWorkerIdentityRegistry {
   private readonly byHandle = new Map<string, StructuredWorkerIdentity>()
   private readonly bySessionId = new Map<string, StructuredWorkerIdentity>()
@@ -193,35 +237,9 @@ export class StructuredWorkerIdentityRegistry {
    * only place a structured worker's pane key and host scope outlive this process. A row whose
    * pane key does not belong to its own recorded session is refused rather than trusted.
    */
-  rehydrate(row: {
-    terminal_handle: string
-    pane_key: string | null
-    process_incarnation: string | null
-    worktree_id: string | null
-    host_scope: string | null
-  }): StructuredWorkerIdentity | null {
-    const sessionId = sessionIdFromStructuredWorkerIncarnation(row.process_incarnation)
-    const hostScope = parseWorkerTerminalHostScope(row.host_scope)
-    if (
-      !sessionId ||
-      !hostScope ||
-      !row.worktree_id ||
-      !isStructuredWorkerHandle(row.terminal_handle) ||
-      // The durable row bootstraps the registry after restart, so validate it before registration.
-      !persistedStructuredWorkerPaneKeyIsValid(row.pane_key, sessionId)
-    ) {
-      return null
-    }
-    return this.register({
-      handle: row.terminal_handle,
-      sessionId,
-      // The row does not carry the provider; callers that need it read the durable record.
-      agent: null,
-      paneKey: row.pane_key,
-      processIncarnation: structuredWorkerProcessIncarnation(sessionId),
-      worktreeId: row.worktree_id,
-      hostScope
-    })
+  rehydrate(row: StructuredWorkerResourceRow): StructuredWorkerIdentity | null {
+    const identity = structuredWorkerIdentityFromRow(row)
+    return identity ? this.register(identity) : null
   }
 
   clear(): void {
diff --git a/src/main/runtime/structured-worker-mail-routing.test.ts b/src/main/runtime/structured-worker-mail-routing.test.ts
index c426132b8485..0413c7b6fa64 100644
--- a/src/main/runtime/structured-worker-mail-routing.test.ts
+++ b/src/main/runtime/structured-worker-mail-routing.test.ts
@@ -20,9 +20,16 @@ const prototype = OrcaRuntimeWithAdoptTerminalOrphansFromInventory.prototype
 const getLivePaneKey = prototype.getLiveTerminalPaneKey
 const resolveActiveTerminal = prototype.resolveActiveTerminal
 
-function installRecord(lease: { runtimeKind: string; claimStatus: string } | null): void {
+function installRecord(
+  lease: { runtimeKind: string; claimStatus: string } | null,
+  tabListed = false
+): void {
   hostRef.current = lease
     ? {
+        getPersistedVisibleSessionTabIndex: () => ({
+          present: true,
+          sessionIds: tabListed ? [SESSION_ID] : []
+        }),
         deps: {
           store: {
             getRecord: () => ({
@@ -73,10 +80,19 @@ describe('bare-handle direct mail to a structured session', () => {
     )
   })
 
-  it('withholds the pane key when the session is not proven live', () => {
-    // The PTY branch is connected-gated so mail is never routed to a corpse; so is this one.
+  it('routes to a worker at rest, whose agent the mail starts', () => {
+    // Released by the idle sweep with its chat tab still listed: owned, so mail reaches it.
     const handle = registerWorker()
-    installRecord({ runtimeKind: 'native', claimStatus: 'reserved' })
+    installRecord({ runtimeKind: 'native', claimStatus: 'released' }, true)
+    expect(getLivePaneKey.call(paneKeyStub, handle)).toBe(
+      structuredWorkerIdentities.get(handle)!.paneKey
+    )
+  })
+
+  it('withholds the pane key from a retired worker: released, with its tab gone', () => {
+    // Mail is never routed to a worker this runtime no longer owns.
+    const handle = registerWorker()
+    installRecord({ runtimeKind: 'native', claimStatus: 'released' }, false)
     expect(getLivePaneKey.call(paneKeyStub, handle)).toBeNull()
   })
 
diff --git a/src/main/runtime/structured-worker-terminal-read.test.ts b/src/main/runtime/structured-worker-terminal-read.test.ts
index 802b23733bca..e49f24ba1a15 100644
--- a/src/main/runtime/structured-worker-terminal-read.test.ts
+++ b/src/main/runtime/structured-worker-terminal-read.test.ts
@@ -75,22 +75,22 @@ describe('reading a structured worker through the terminal-read path', () => {
     hostRef.current = null
   })
 
-  it('serves the journal as terminal lines, with no dispatch and no capability', () => {
+  it('serves the journal as terminal lines, with no dispatch and no capability', async () => {
     // The defect this pins: a peer has no dispatch id and no coordinator standing, so `worker-read`
     // is closed to it, and `terminal read` threw `terminal_handle_stale` for a perfectly live
     // worker. A peer could not see a structured agent's recent output at all.
     const handle = registerWorker()
     installHost({ items: [message('i1', 'first line\nsecond line'), message('i2', 'done')] })
-    const read = readStructuredWorkerTerminal({ handle, db: null })
+    const read = await readStructuredWorkerTerminal({ handle, db: null })
     expect(read?.tail).toEqual(['[assistant] first line', 'second line', '[assistant] done'])
     expect(read?.status).toBe('running')
     expect(read?.truncated).toBe(false)
   })
 
-  it('honours limit, and claims no cursor space it cannot honour', () => {
+  it('honours limit, and claims no cursor space it cannot honour', async () => {
     const handle = registerWorker()
     installHost({ items: [message('i1', 'a'), message('i2', 'b'), message('i3', 'c')] })
-    const read = readStructuredWorkerTerminal({ handle, db: null, limit: 2 })
+    const read = await readStructuredWorkerTerminal({ handle, db: null, limit: 2 })
     expect(read?.tail).toEqual(['[assistant] b', '[assistant] c'])
     // No index is advertised: the next read re-projects a sliding window, so 0/length would name
     // positions that address different lines by then.
@@ -99,7 +99,7 @@ describe('reading a structured worker through the terminal-read path', () => {
     expect(read?.latestCursor).toBeUndefined()
   })
 
-  it('refuses a cursor read rather than silently misdelivering lines', () => {
+  it('refuses a cursor read rather than silently misdelivering lines', async () => {
     // The PTY cursor indexes an append-only completed-line buffer with a monotone count. This
     // window is a bounded tail re-projected every read, so a saved index addresses different lines
     // as the journal grows — and `truncated` could never fire to say so, because it tests
@@ -107,14 +107,10 @@ describe('reading a structured worker through the terminal-read path', () => {
     // duplicated lines with `truncated:false`.
     const handle = registerWorker()
     installHost({ items: [message('i1', 'a')] })
-    const refusal = (() => {
-      try {
-        readStructuredWorkerTerminal({ handle, db: null, cursor: 0 })
-        return ''
-      } catch (error) {
-        return (error as Error).message
-      }
-    })()
+    const refusal = await readStructuredWorkerTerminal({ handle, db: null, cursor: 0 }).then(
+      () => '',
+      (error: unknown) => (error instanceof Error ? error.message : String(error))
+    )
     expect(refusal).toMatch(/not line-addressable/)
     // Tells the caller what DOES work here. Polling a bounded newest-last tail and diffing fails
     // safe — a harmless re-read — where a broken cursor fails unsafe, as a silent hole.
@@ -125,35 +121,35 @@ describe('reading a structured worker through the terminal-read path', () => {
     expect(refusal).not.toContain('worker-read')
   })
 
-  it('reports dropped history as truncated rather than pretending the page is whole', () => {
+  it('reports dropped history as truncated rather than pretending the page is whole', async () => {
     const handle = registerWorker()
     installHost({ items: [message('i1', 'tail only')], hasOlder: true })
-    expect(readStructuredWorkerTerminal({ handle, db: null })?.truncated).toBe(true)
+    expect((await readStructuredWorkerTerminal({ handle, db: null }))?.truncated).toBe(true)
   })
 
-  it('redacts dispatch capability tokens the same way the archive path does', () => {
+  it('redacts dispatch capability tokens the same way the archive path does', async () => {
     const handle = registerWorker()
     const token = `dcap_${'a'.repeat(32)}`
     installHost({ items: [message('i1', `token is ${token} here`)] })
-    const tail = readStructuredWorkerTerminal({ handle, db: null })?.tail.join('\n') ?? ''
+    const tail = (await readStructuredWorkerTerminal({ handle, db: null }))?.tail.join('\n') ?? ''
     expect(tail).not.toContain(token)
     expect(tail).toContain('[dispatch capability redacted]')
   })
 
-  it('refuses when the session is not attached rather than answering an empty tail', () => {
+  it('refuses when the session is not attached rather than answering an empty tail', async () => {
     // An empty tail is the claim "this worker has produced no output", which is a different and
     // false statement — and the one a caller cannot tell apart from a real silence.
     const handle = registerWorker()
     installHost({ items: 'unreadable' })
-    expect(() => readStructuredWorkerTerminal({ handle, db: null })).toThrow(
+    await expect(readStructuredWorkerTerminal({ handle, db: null })).rejects.toThrow(
       'agent_session_ownership_unknown'
     )
   })
 
-  it('reports a session it cannot verify as unknown, never as running', () => {
+  it('reports a session it cannot verify as unknown, never as running', async () => {
     const handle = registerWorker()
     installHost({ items: [message('i1', 'said something')], hasSession: false })
-    expect(readStructuredWorkerTerminal({ handle, db: null })?.status).toBe('unknown')
+    expect((await readStructuredWorkerTerminal({ handle, db: null }))?.status).toBe('unknown')
   })
 
   it('is what `terminal read` answers with, ahead of the PTY lookup', async () => {
@@ -182,15 +178,15 @@ describe('reading a structured worker through the terminal-read path', () => {
     })
   })
 
-  it('leaves every handle that is not a live structured worker to the PTY path', () => {
+  it('leaves every handle that is not a live structured worker to the PTY path', async () => {
     const handle = registerWorker()
     installHost({ items: [message('i1', 'x')] })
-    expect(readStructuredWorkerTerminal({ handle: 'term_abc', db: null })).toBeNull()
+    expect(await readStructuredWorkerTerminal({ handle: 'term_abc', db: null })).toBeNull()
     // A terminal owner an older build recorded loads conflicted: not this runtime's worker.
     installHost({
       items: [message('i1', 'x')],
       lease: { runtimeKind: 'native', claimStatus: 'conflicted' }
     })
-    expect(readStructuredWorkerTerminal({ handle, db: null })).toBeNull()
+    expect(await readStructuredWorkerTerminal({ handle, db: null })).toBeNull()
   })
 })
diff --git a/src/main/runtime/structured-worker-terminal-read.ts b/src/main/runtime/structured-worker-terminal-read.ts
index 9b4a118b8ae4..60dd11260670 100644
--- a/src/main/runtime/structured-worker-terminal-read.ts
+++ b/src/main/runtime/structured-worker-terminal-read.ts
@@ -29,7 +29,7 @@
  */
 
 import type { RuntimeTerminalRead } from '../../shared/runtime-types'
-import { formatWorkerTranscriptMessage } from '../../shared/worker-transcript-text'
+import { formatWorkerTranscriptMessages } from '../../shared/worker-transcript-text'
 import { AGENT_SESSION_NOT_ATTACHED } from '../native-chat/agent-session-wire/structured-agent-session-mutation-admission'
 import type { OrchestrationDb } from './orchestration/db'
 import { boundStructuredJournalTail } from './orchestration/structured-worker-journal-archive'
@@ -48,12 +48,12 @@ import { readTerminalTail } from './terminal-tail-read'
  * IS a structured worker never falls through: an unreadable journal refuses rather than answering
  * an empty tail, which a caller cannot tell from a worker that has said nothing.
  */
-export function readStructuredWorkerTerminal(args: {
+export async function readStructuredWorkerTerminal(args: {
   handle: string
   db: OrchestrationDb | null
   cursor?: number
   limit?: number
-}): RuntimeTerminalRead | null {
+}): Promise<RuntimeTerminalRead | null> {
   const identity = resolveStructuredWorkerAuthority(args.handle, args.db)?.identity
   if (!identity) {
     return null
@@ -76,7 +76,7 @@ export function readStructuredWorkerTerminal(args: {
         'A structured session has no durable line anchor to page from — nothing else does either.'
     )
   }
-  const page = readStructuredJournalPage(identity.sessionId)
+  const page = await readStructuredJournalPage(identity.sessionId)
   if (!page) {
     // Honest refusal, and the same one the send lane reports: an empty tail would read as "this
     // worker has produced no output", which is a different and false claim.
@@ -84,9 +84,7 @@ export function readStructuredWorkerTerminal(args: {
   }
   // Redacts dispatch capabilities and clips oversized blocks under the archive path's byte bound.
   const bounded = boundStructuredJournalTail(page.items)
-  const lines = bounded.messages.flatMap((message) =>
-    formatWorkerTranscriptMessage(message).split('\n')
-  )
+  const lines = formatWorkerTranscriptMessages(bounded.messages).flatMap((text) => text.split('\n'))
   const read = readTerminalTail({
     handle: args.handle,
     status: structuredWorkerTerminalState(observeStructuredWorker(identity).status),
diff --git a/src/main/runtime/terminal-close-observed-exit-test-fixture.ts b/src/main/runtime/terminal-close-observed-exit-test-fixture.ts
index 468508f896dd..81287bafc596 100644
--- a/src/main/runtime/terminal-close-observed-exit-test-fixture.ts
+++ b/src/main/runtime/terminal-close-observed-exit-test-fixture.ts
@@ -37,8 +37,7 @@ export async function runObservedExitSocketScenario(scenario: ObservedExitSocket
       rememberSyntheticKillExit: harness.session.rememberSyntheticKillExit,
       sendPtyExitToRenderer: harness.session.sendPtyExitToRenderer,
       finishPtyShutdown,
-      retiredRejectedPtyIds: new Map<string, NodeJS.Timeout>(),
-      reversibleStopOwnersByPtyId: new Map<string, number>()
+      retiredRejectedPtyIds: new Map<string, NodeJS.Timeout>()
     }
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: stop/kill read only these controller ports and optional store; spawn ports are unused.
     const deps = ports as unknown as PtyRuntimeControllerDeps
@@ -103,8 +102,8 @@ const BINDING = {
 }
 
 class ObservedExitRuntime extends OrcaRuntimeService {
-  closeControl(): Promise<boolean> {
-    return this.stopExplicitlyClosedTabPtys([CONTROL_PTY_ID], CONTROL_PTY_ID)
+  async closeControl(): Promise<boolean> {
+    return (await this.stopExplicitlyClosedTabPtys([CONTROL_PTY_ID], CONTROL_PTY_ID)).stopped
   }
 }
 
diff --git a/src/main/runtime/terminal-command-paint.test.ts b/src/main/runtime/terminal-command-paint.test.ts
new file mode 100644
index 000000000000..54493da686fb
--- /dev/null
+++ b/src/main/runtime/terminal-command-paint.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it } from 'vitest'
+import {
+  hasTerminalCommandPainted,
+  observeTerminalCommandPaint,
+  type TerminalCommandPaintRecord
+} from './terminal-command-paint'
+import { normalizeTerminalChunk } from './terminal-ansi-normalization'
+
+function observe(record: TerminalCommandPaintRecord, data: string): void {
+  observeTerminalCommandPaint(record, data, normalizeTerminalChunk(data).text)
+}
+
+describe('terminal command paint', () => {
+  it('reads a pane with no command-start marker as painted', () => {
+    const record: TerminalCommandPaintRecord = {}
+    observe(record, '~/repo % ')
+    expect(hasTerminalCommandPainted(record)).toBe(true)
+  })
+
+  it('does not count the prompt, the echoed command, or a title set after the marker', () => {
+    const record: TerminalCommandPaintRecord = {}
+    observe(record, '\x1b]133;A\x07~/repo % amp\r\n\x1b]133;C\x07\x1b]0;amp\x07')
+    expect(hasTerminalCommandPainted(record)).toBe(false)
+    observe(record, '\x1b[?1049h\x1b[?25l\r\n')
+    expect(hasTerminalCommandPainted(record)).toBe(false)
+    observe(record, '\x1b[2;3H╭─ Amp')
+    expect(hasTerminalCommandPainted(record)).toBe(true)
+  })
+
+  it('counts a paint that arrives in the same chunk as the marker', () => {
+    const record: TerminalCommandPaintRecord = {}
+    observe(record, '\x1b]133;C\x1b\\\x1b[?1049hLIVE-TUI')
+    expect(hasTerminalCommandPainted(record)).toBe(true)
+  })
+
+  it('finds a marker split across chunks, and counts only output after it', () => {
+    const record: TerminalCommandPaintRecord = {}
+    observe(record, '~/repo % amp\r\n\x1b]13')
+    observe(record, '3;C\x07')
+    expect(hasTerminalCommandPainted(record)).toBe(false)
+    observe(record, '\x1b]133;C;cmdline_url=')
+    observe(record, 'amp\x07╭─ Amp')
+    expect(hasTerminalCommandPainted(record)).toBe(true)
+  })
+
+  it('starts over at the next command', () => {
+    const record: TerminalCommandPaintRecord = {}
+    observe(record, '\x1b]133;C\x07goose> ')
+    observe(record, '\x1b]133;D;0\x07\x1b]133;A\x07% goose\r\n\x1b]133;C\x07')
+    expect(hasTerminalCommandPainted(record)).toBe(false)
+  })
+})
diff --git a/src/main/runtime/terminal-command-paint.ts b/src/main/runtime/terminal-command-paint.ts
new file mode 100644
index 000000000000..d415d52dae7d
--- /dev/null
+++ b/src/main/runtime/terminal-command-paint.ts
@@ -0,0 +1,66 @@
+import { stripAnsiEscapeSequences } from '../../shared/ansi-escape-sequences'
+import { createOsc133CommandFinishedScanner } from '../../shared/terminal-osc133-command-finished'
+import { normalizeTerminalChunk } from './terminal-ansi-normalization'
+
+// eslint-disable-next-line no-control-regex -- control bytes are exactly what is not visible.
+const VISIBLE_CHARACTER_RE = /[^\s\u0000-\u001f\u007f-\u009f]/
+
+function hasVisibleText(normalizedText: string): boolean {
+  return VISIBLE_CHARACTER_RE.test(stripAnsiEscapeSequences(normalizedText))
+}
+
+/**
+ * Where the running command's own output begins. Orca's shell integration prints OSC 133;C
+ * after the prompt and the echoed command line, right before the command runs, so only
+ * visible output after it can be the command's.
+ */
+export class TerminalCommandPaint {
+  private awaitingPaint = false
+  private markerEndInChunk = -1
+  private readonly scanner = createOsc133CommandFinishedScanner(
+    () => {},
+    (endInChunk) => {
+      this.markerEndInChunk = endInChunk
+    }
+  )
+
+  observe(data: string, normalizedText: string): void {
+    this.markerEndInChunk = -1
+    this.scanner.scan(data)
+    if (this.markerEndInChunk !== -1) {
+      // Why the rest of this chunk counts: a fast binary can paint in the same read as the marker.
+      this.awaitingPaint = !hasVisibleText(
+        normalizeTerminalChunk(data.slice(this.markerEndInChunk)).text
+      )
+      return
+    }
+    if (this.awaitingPaint && hasVisibleText(normalizedText)) {
+      this.awaitingPaint = false
+    }
+  }
+
+  hasPainted(): boolean {
+    return !this.awaitingPaint
+  }
+}
+
+export type TerminalCommandPaintRecord = { commandPaint?: TerminalCommandPaint }
+
+/** `normalizedText` is the chunk as the tail buffer received it (pending escapes resolved). */
+export function observeTerminalCommandPaint(
+  record: TerminalCommandPaintRecord,
+  data: string,
+  normalizedText: string
+): void {
+  record.commandPaint ??= new TerminalCommandPaint()
+  record.commandPaint.observe(data, normalizedText)
+}
+
+/**
+ * Why no marker reads as painted: some launches get no command boundary (older fish, SSH relay
+ * zsh, shells Orca could not wrap, and Windows launches that pass the command in shell args), so
+ * any output is all the evidence there is.
+ */
+export function hasTerminalCommandPainted(record: TerminalCommandPaintRecord): boolean {
+  return record.commandPaint?.hasPainted() ?? true
+}
diff --git a/src/main/runtime/terminal-input-kind-unchecked-call-sites.test.ts b/src/main/runtime/terminal-input-kind-unchecked-call-sites.test.ts
new file mode 100644
index 000000000000..e806e88320cc
--- /dev/null
+++ b/src/main/runtime/terminal-input-kind-unchecked-call-sites.test.ts
@@ -0,0 +1,80 @@
+import { resolve } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { scanSourceTree } from '../../shared/source-scan/source-tree-scan'
+import {
+  findCallsMissingArgument,
+  type RequiredCallArgument
+} from '../../shared/source-scan/call-argument-scan'
+
+/**
+ * Every PTY write names its input kind, and the compiler enforces that everywhere except the
+ * runtime files split out with `@ts-nocheck`. There a missing kind would compile and silently
+ * record nothing, so this scan is the ratchet for them.
+ */
+const MAIN_ROOT = resolve(__dirname, '..')
+
+const namesInputKind = (literal: string): boolean => /\binputKind\b|\.\.\./.test(literal)
+const kindAt = (index: number, receiver?: RegExp): RequiredCallArgument => ({
+  index,
+  ...(receiver ? { receiver } : {}),
+  acceptsObjectLiteral: namesInputKind
+})
+const CONTROLLER = /[Cc]ontroller\??\s*$/
+
+const KIND_ARGUMENT_BY_METHOD: Record<string, RequiredCallArgument> = {
+  write: kindAt(2, CONTROLLER),
+  writeWithSettlement: kindAt(2, CONTROLLER),
+  sendTerminal: kindAt(2),
+  sendTerminalAgentPrompt: kindAt(2),
+  writeTerminalAction: kindAt(3),
+  writeTerminalInputChunks: kindAt(2),
+  writeTerminalAgentPrompt: kindAt(4),
+  writeAction: kindAt(3),
+  writeChunks: kindAt(2)
+}
+
+// Why multiline: some unchecked files open with a lint directive before `@ts-nocheck`.
+const uncheckedSources = scanSourceTree(MAIN_ROOT).filter((file) =>
+  /^\/\/ @ts-nocheck\b/m.test(file.source)
+)
+
+describe('PTY write call sites the compiler cannot check', () => {
+  it('scans the unchecked runtime files that write to a PTY', () => {
+    expect(uncheckedSources.map((file) => file.relativePath)).toEqual(
+      expect.arrayContaining([
+        'runtime/orca-runtime-deliver-pending-messages.ts',
+        'runtime/orca-runtime-create-pty-headless-terminal-state.ts',
+        'runtime/orca-runtime-write-terminal-agent-prompt.ts',
+        'runtime/orca-runtime-sync-window-graph.ts'
+      ])
+    )
+  })
+
+  it('finds a write, prompt or send that leaves out its kind', () => {
+    const planted = [
+      '',
+      'this.ptyController?.write(ptyId, reply)',
+      "this.ptyController.write(ptyId, '\\r', 'launch')",
+      "await this.sendTerminal(handle, { text: 'a, b' }, { beforeWrite })",
+      'await this.sendTerminalAgentPrompt(handle, prompt, { ...options })',
+      'other.write(ptyId, data)',
+      'const controller = this.ptyController; controller.write(ptyId, data)'
+    ].join('\n')
+
+    expect(findCallsMissingArgument(planted, KIND_ARGUMENT_BY_METHOD)).toEqual([
+      '2: .write(ptyId, reply)',
+      "4: .sendTerminal(handle, { text: 'a, b' }, { beforeWrite })",
+      '7: .write(ptyId, data)'
+    ])
+  })
+
+  it('passes an input kind at every write', () => {
+    const missing = uncheckedSources.flatMap((file) =>
+      findCallsMissingArgument(file.source, KIND_ARGUMENT_BY_METHOD).map(
+        (site) => `${file.relativePath}:${site}`
+      )
+    )
+
+    expect(missing).toEqual([])
+  })
+})
diff --git a/src/main/runtime/terminal-intentional-stop-exit.test.ts b/src/main/runtime/terminal-intentional-stop-exit.test.ts
new file mode 100644
index 000000000000..0c3f996153f4
--- /dev/null
+++ b/src/main/runtime/terminal-intentional-stop-exit.test.ts
@@ -0,0 +1,288 @@
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import type { BrowserWindow } from 'electron'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { makePaneKey } from '../../shared/stable-pane-id'
+import { Store } from '../persistence/loading-store/store'
+import { ProfileStateSqliteAuthority } from '../persistence/profile-state/profile-state-sqlite-authority'
+import { wirePtyIpcSession } from '../ipc/pty/delivery/wire-session'
+import { SYNTHETIC_KILL_EXIT_DUPLICATE_WINDOW_MS } from '../ipc/pty/delivery/visibility-state'
+import { bindProviderListeners } from '../ipc/pty/provider/bind-listeners'
+import {
+  stopRendererOwnedPty,
+  stopReplacedPanePty,
+  type PtyKillIpcDeps
+} from '../ipc/pty/ipc/renderer-kill'
+import { ptyIncarnationById, ptyOwnership } from '../ipc/pty/provider/ownership-state'
+import { getLocalPtyProvider, setLocalPtyProvider } from '../ipc/pty/provider/registry'
+import { createPtyIpcSession } from '../ipc/pty/session'
+import type { IPtyProvider } from '../providers/types'
+import { OrcaRuntimeService } from './orca-runtime'
+import {
+  INCARNATION_ID,
+  LEAF_ID,
+  PTY_ID,
+  REPO_ID,
+  TAB_ID,
+  WORKTREE_ID,
+  WORKTREE_PATH,
+  makeSession
+} from './__fixtures__/orca-runtime-terminal-close-continuity-state-fixture'
+import { advanceTerminalTopologyRevision } from './workspace-session-terminal-membership-authority'
+
+const REPLACEMENT_PTY_ID = 'pty-close-continuity-replacement'
+const REPLACEMENT_INCARNATION_ID = '77777777-7777-4777-8777-777777777777'
+const LATER_INCARNATION_ID = '88888888-8888-4888-8888-888888888888'
+
+const directories: string[] = []
+const stores: Store[] = []
+const priorProvider = getLocalPtyProvider()
+afterEach(() => {
+  vi.useRealTimers()
+  setLocalPtyProvider(priorProvider)
+  ptyOwnership.delete(PTY_ID)
+  ptyIncarnationById.delete(PTY_ID)
+  for (const store of stores.splice(0)) {
+    store.freezeWrites()
+  }
+  for (const directory of directories.splice(0)) {
+    rmSync(directory, { recursive: true, force: true })
+  }
+})
+
+/** A real store and runtime with one bound pane, and main's exit delivery to a renderer stub.
+ *  `lateProviderExit`: the kill's reply overtakes the exit, so main synthesizes one and the
+ *  provider's own exit arrives later through its listener. */
+function createHarness(opts: { lateProviderExit?: boolean; folder?: boolean } = {}) {
+  const directory = mkdtempSync(join(tmpdir(), 'orca-intentional-stop-'))
+  directories.push(directory)
+  const store = new Store({
+    dataFile: join(directory, 'orca-data.json'),
+    profileStateAuthority: new ProfileStateSqliteAuthority(
+      join(directory, 'profile-state.db'),
+      'intentional-stop'
+    )
+  })
+  stores.push(store)
+  store.addRepo({
+    id: REPO_ID,
+    path: WORKTREE_PATH,
+    displayName: 'Fixture',
+    badgeColor: 'gray',
+    addedAt: 1,
+    // Why: a folder workspace resolves without git, which the sleep transaction needs.
+    ...(opts.folder ? { kind: 'folder' as const } : {})
+  })
+  store.setWorkspaceSession(advanceTerminalTopologyRevision(makeSession(), WORKTREE_ID))
+  store.flushOrThrow()
+  const runtime = new OrcaRuntimeService(store)
+  runtime.registerPty(PTY_ID, WORKTREE_ID, null, {
+    tabId: TAB_ID,
+    leafId: LEAF_ID,
+    incarnationId: INCARNATION_ID
+  })
+  ptyOwnership.set(PTY_ID, null)
+  ptyIncarnationById.set(PTY_ID, INCARNATION_ID)
+  let emitProviderExit:
+    | ((payload: { id: string; code: number; incarnationId?: string }) => void)
+    | undefined
+  const provider = {
+    onData: () => () => {},
+    onExit: (listener: typeof emitProviderExit) => {
+      emitProviderExit = listener
+      return () => {}
+    }
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the listeners bind only onData and onExit, and the renderer kill hands the provider to the shutdown port below.
+  setLocalPtyProvider(provider as unknown as IPtyProvider)
+  const rendererSend = vi.fn()
+  const window = { isDestroyed: () => false, webContents: { send: rendererSend } }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: exit delivery reads only isDestroyed and webContents.send.
+  const session = createPtyIpcSession({ mainWindow: window as unknown as BrowserWindow, runtime })
+  wirePtyIpcSession(session)
+  bindProviderListeners(session)
+  const deps: PtyKillIpcDeps = {
+    store,
+    runtime,
+    getLocalPtyProviderStartupPromise: () => undefined,
+    // The provider's own exit, delivered the way its listener delivers it.
+    shutdownProviderAndDetectExit: async (_provider, id) => {
+      if (opts.lateProviderExit) {
+        return false
+      }
+      runtime.onPtyExit(id, 0, INCARNATION_ID, { providerExitObserved: true })
+      session.sendPtyExitToRenderer({ id, code: 0, incarnationId: INCARNATION_ID })
+      return true
+    },
+    rememberSyntheticKillExit: session.rememberSyntheticKillExit,
+    sendPtyExitToRenderer: session.sendPtyExitToRenderer
+  }
+  return {
+    store,
+    runtime,
+    deps,
+    emitProviderExit: (incarnationId: string) =>
+      emitProviderExit?.({ id: PTY_ID, code: 0, incarnationId }),
+    boundPtyId: () =>
+      store.getWorkspaceSession().terminalLayoutsByTabId[TAB_ID]?.ptyIdsByLeafId?.[LEAF_ID] ?? null,
+    tabIds: () => (store.getWorkspaceSession().tabsByWorktree[WORKTREE_ID] ?? []).map((t) => t.id),
+    rendererExits: () =>
+      rendererSend.mock.calls.filter(([channel]) => channel === 'pty:exit').map(([, p]) => p)
+  }
+}
+
+describe('intentional stops keep the pane through the exit', () => {
+  it('retires the pane when an ordinary close ends the process', async () => {
+    const harness = createHarness()
+
+    await stopRendererOwnedPty(harness.deps, { id: PTY_ID })
+
+    expect(harness.boundPtyId()).toBeNull()
+    expect(harness.rendererExits()).toEqual([
+      { id: PTY_ID, code: 0, incarnationId: INCARNATION_ID }
+    ])
+  })
+
+  it('keeps the tab and its wake binding when the renderer hibernates the pane', async () => {
+    const harness = createHarness()
+
+    await stopRendererOwnedPty(harness.deps, { id: PTY_ID, keepHistory: true })
+
+    expect(harness.tabIds()).toEqual([TAB_ID])
+    expect(harness.boundPtyId()).toBe(PTY_ID)
+    expect(harness.rendererExits()).toEqual([
+      { id: PTY_ID, code: 0, incarnationId: INCARNATION_ID, preserveRendererBinding: true }
+    ])
+  })
+
+  it('keeps a typed pane that a restart replaces, and binds the replacement', async () => {
+    const harness = createHarness()
+    harness.runtime.terminalRunFacts.recordSpawnCommit({
+      id: PTY_ID,
+      incarnationId: INCARNATION_ID
+    })
+    harness.runtime.terminalRunFacts.recordInput(PTY_ID, 'driving', 'ls\r')
+
+    await stopReplacedPanePty(harness.deps, PTY_ID)
+    expect(harness.boundPtyId()).toBe(PTY_ID)
+    await harness.store.persistPtyBinding({
+      worktreeId: WORKTREE_ID,
+      tabId: TAB_ID,
+      leafId: LEAF_ID,
+      ptyId: REPLACEMENT_PTY_ID,
+      incarnationId: REPLACEMENT_INCARNATION_ID,
+      origin: 'spawn'
+    })
+
+    expect(harness.tabIds()).toEqual([TAB_ID])
+    expect(harness.boundPtyId()).toBe(REPLACEMENT_PTY_ID)
+    expect(
+      harness.store.getWorkspaceSession().terminalPtyIncarnationsByPaneKey?.[
+        makePaneKey(TAB_ID, LEAF_ID)
+      ]
+    ).toBe(REPLACEMENT_INCARNATION_ID)
+    expect(harness.rendererExits()).toEqual([
+      { id: PTY_ID, code: 0, incarnationId: INCARNATION_ID, replacedByRestart: true }
+    ])
+  })
+
+  it('labels the exit for both a sleep and a restart that stop the same process', async () => {
+    const harness = createHarness()
+    const settleSleep = harness.runtime.intentionalPtyStops.mark(
+      PTY_ID,
+      'reversible',
+      INCARNATION_ID
+    )
+
+    await stopReplacedPanePty(harness.deps, PTY_ID)
+    settleSleep(true)
+
+    expect(harness.boundPtyId()).toBe(PTY_ID)
+    expect(harness.rendererExits()).toEqual([
+      {
+        id: PTY_ID,
+        code: 0,
+        incarnationId: INCARNATION_ID,
+        preserveRendererBinding: true,
+        replacedByRestart: true
+      }
+    ])
+  })
+
+  it('keeps the pane through the synthetic exit and the provider exit that follows it', async () => {
+    const harness = createHarness({ lateProviderExit: true })
+
+    await stopRendererOwnedPty(harness.deps, { id: PTY_ID, keepHistory: true })
+    harness.emitProviderExit(INCARNATION_ID)
+
+    expect(harness.tabIds()).toEqual([TAB_ID])
+    expect(harness.boundPtyId()).toBe(PTY_ID)
+    expect(harness.rendererExits()).toEqual([
+      { id: PTY_ID, code: -1, incarnationId: INCARNATION_ID, preserveRendererBinding: true }
+    ])
+  })
+
+  it('never reads the exit of a later process on the same id as the stop', async () => {
+    const harness = createHarness({ lateProviderExit: true })
+    await stopRendererOwnedPty(harness.deps, { id: PTY_ID, keepHistory: true })
+    harness.runtime.registerPty(PTY_ID, WORKTREE_ID, null, {
+      tabId: TAB_ID,
+      leafId: LEAF_ID,
+      incarnationId: LATER_INCARNATION_ID
+    })
+    ptyIncarnationById.set(PTY_ID, LATER_INCARNATION_ID)
+    await harness.store.persistPtyBinding({
+      worktreeId: WORKTREE_ID,
+      tabId: TAB_ID,
+      leafId: LEAF_ID,
+      ptyId: PTY_ID,
+      incarnationId: LATER_INCARNATION_ID,
+      origin: 'reattach'
+    })
+
+    harness.emitProviderExit(LATER_INCARNATION_ID)
+
+    // Why wait: an unstopped exit retires the pane through an async durable save.
+    await vi.waitFor(() => expect(harness.boundPtyId()).toBeNull())
+    expect(harness.rendererExits().at(-1)).toEqual({
+      id: PTY_ID,
+      code: 0,
+      incarnationId: LATER_INCARNATION_ID
+    })
+  })
+
+  it('forgets the stop once the duplicate-exit window after it closes', async () => {
+    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+    const harness = createHarness({ lateProviderExit: true })
+    await stopRendererOwnedPty(harness.deps, { id: PTY_ID, keepHistory: true })
+
+    vi.advanceTimersByTime(SYNTHETIC_KILL_EXIT_DUPLICATE_WINDOW_MS - 1)
+    expect(harness.runtime.intentionalPtyStops.claimExit(PTY_ID, INCARNATION_ID)).toEqual([
+      'reversible'
+    ])
+    vi.advanceTimersByTime(1)
+
+    expect(harness.runtime.intentionalPtyStops.claimExit(PTY_ID, INCARNATION_ID)).toEqual([])
+  })
+
+  it('keeps the tab and its wake binding when the runtime puts the worktree to sleep', async () => {
+    const harness = createHarness({ folder: true })
+    const inventories = [[{ id: PTY_ID, worktreeId: WORKTREE_ID, cwd: WORKTREE_PATH, title: 'a' }]]
+    harness.runtime.setPtyController({
+      write: () => true,
+      kill: () => true,
+      stopAndWait: async (ptyId) => {
+        harness.runtime.onPtyExit(ptyId, -1, INCARNATION_ID, { providerExitObserved: true })
+        return true
+      },
+      getForegroundProcess: async () => null,
+      listProcesses: async () => inventories.shift() ?? []
+    })
+
+    await harness.runtime.sleepTerminalsForWorktree(`id:${WORKTREE_ID}`)
+
+    expect(harness.tabIds()).toEqual([TAB_ID])
+    expect(harness.boundPtyId()).toBe(PTY_ID)
+  })
+})
diff --git a/src/main/runtime/terminal-intentional-stops.test.ts b/src/main/runtime/terminal-intentional-stops.test.ts
new file mode 100644
index 000000000000..d37fc4147e8b
--- /dev/null
+++ b/src/main/runtime/terminal-intentional-stops.test.ts
@@ -0,0 +1,112 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { SYNTHETIC_KILL_EXIT_DUPLICATE_WINDOW_MS } from '../ipc/pty/delivery/visibility-state'
+import { TerminalIntentionalStops } from './terminal-intentional-stops'
+
+afterEach(() => {
+  vi.useRealTimers()
+})
+
+describe('terminal intentional stops', () => {
+  it('keeps the mark while a second overlapping owner still holds it', () => {
+    const stops = new TerminalIntentionalStops()
+    const settleFirst = stops.mark('pty-1', 'reversible', 'inc-1')
+    const settleSecond = stops.mark('pty-1', 'reversible', 'inc-1')
+
+    settleFirst(false)
+
+    expect(stops.isReversibleStopInFlight('pty-1')).toBe(true)
+    expect(stops.claimExit('pty-1', 'inc-1')).toEqual(['reversible'])
+    settleSecond(false)
+    expect(stops.claimExit('pty-1', 'inc-1')).toEqual([])
+  })
+
+  it('still reads an exit that lands after the stop settled, until the window closes', () => {
+    vi.useFakeTimers()
+    const stops = new TerminalIntentionalStops()
+    const settle = stops.mark('pty-ssh', 'reversible', 'inc-1')
+
+    settle(true)
+    vi.advanceTimersByTime(SYNTHETIC_KILL_EXIT_DUPLICATE_WINDOW_MS - 1)
+
+    expect(stops.isReversibleStopInFlight('pty-ssh')).toBe(false)
+    expect(stops.claimExit('pty-ssh', 'inc-1')).toEqual(['reversible'])
+    vi.advanceTimersByTime(1)
+    expect(stops.claimExit('pty-ssh', 'inc-1')).toEqual([])
+  })
+
+  it('drops the mark at once when the stop fails', () => {
+    const stops = new TerminalIntentionalStops()
+
+    stops.mark('pty-1', 'replaced', 'inc-1')(false)
+
+    expect(stops.claimExit('pty-1', 'inc-1')).toEqual([])
+  })
+
+  it('reads the synthetic exit and the provider exit of the same process alike', () => {
+    const stops = new TerminalIntentionalStops()
+    const settle = stops.mark('pty-1', 'replaced', null)
+
+    expect(stops.claimExit('pty-1', 'inc-1')).toEqual(['replaced'])
+    settle(true)
+
+    expect(stops.claimExit('pty-1', 'inc-1')).toEqual(['replaced'])
+    expect(stops.claimExit('pty-1', 'inc-2')).toEqual([])
+  })
+
+  it('never marks the exit of another process that reuses the id', () => {
+    const stops = new TerminalIntentionalStops()
+    stops.mark('pty-1', 'reversible', 'inc-1')
+
+    expect(stops.claimExit('pty-1', 'inc-2')).toEqual([])
+  })
+
+  it('starts a new stop of the same id fresh once the prior one settled', () => {
+    const stops = new TerminalIntentionalStops()
+    stops.mark('pty-1', 'reversible', 'inc-1')(true)
+
+    const settle = stops.mark('pty-1', 'replaced', 'inc-2')
+
+    expect(stops.claimExit('pty-1', 'inc-1')).toEqual([])
+    expect(stops.claimExit('pty-1', 'inc-2')).toEqual(['replaced'])
+    settle(false)
+    expect(stops.claimExit('pty-1', 'inc-2')).toEqual([])
+  })
+
+  it('labels one exit with every kind of stop that overlapped on it', () => {
+    const stops = new TerminalIntentionalStops()
+    const settleSleep = stops.mark('pty-1', 'reversible', 'inc-1')
+    const settleRestart = stops.mark('pty-1', 'replaced', 'inc-1')
+
+    expect(stops.isReversibleStopInFlight('pty-1')).toBe(true)
+    expect(stops.claimExit('pty-1', 'inc-1')).toEqual(['reversible', 'replaced'])
+
+    settleSleep(true)
+    expect(stops.isReversibleStopInFlight('pty-1')).toBe(false)
+    settleRestart(false)
+    expect(stops.claimExit('pty-1', 'inc-1')).toEqual(['reversible'])
+  })
+
+  it('keeps a landed stop when a later stop of the same process fails', () => {
+    const stops = new TerminalIntentionalStops()
+    stops.mark('pty-1', 'reversible', 'inc-1')(true)
+
+    stops.mark('pty-1', 'reversible', 'inc-1')(false)
+
+    expect(stops.claimExit('pty-1', 'inc-1')).toEqual(['reversible'])
+  })
+
+  it('lets a new process on the id supersede a landed stop no exit pinned', () => {
+    const stops = new TerminalIntentionalStops()
+    stops.mark('pty-unpinned', 'reversible', null)(true)
+    stops.mark('pty-pinned', 'reversible', 'inc-1')(true)
+    stops.mark('pty-in-flight', 'replaced', null)
+
+    for (const ptyId of ['pty-unpinned', 'pty-pinned', 'pty-in-flight']) {
+      stops.noteSpawnCommit(ptyId)
+    }
+
+    expect(stops.claimExit('pty-unpinned', null)).toEqual([])
+    expect(stops.claimExit('pty-pinned', 'inc-1')).toEqual(['reversible'])
+    expect(stops.claimExit('pty-in-flight', null)).toEqual(['replaced'])
+  })
+})
diff --git a/src/main/runtime/terminal-intentional-stops.ts b/src/main/runtime/terminal-intentional-stops.ts
new file mode 100644
index 000000000000..b89bc709e5f2
--- /dev/null
+++ b/src/main/runtime/terminal-intentional-stops.ts
@@ -0,0 +1,122 @@
+import { SYNTHETIC_KILL_EXIT_DUPLICATE_WINDOW_MS } from '../ipc/pty/delivery/visibility-state'
+
+/**
+ * Why main stopped a PTY on purpose. Both kinds keep the pane's binding through the exit:
+ * - `reversible`: sleep or hibernation; the binding is the wake hint.
+ * - `replaced`: a restart stops the old process so a new one can take the pane.
+ */
+export type TerminalIntentionalStopKind = 'reversible' | 'replaced'
+
+type IntentionalStopOwners = { inFlight: number; stopped: boolean }
+
+type IntentionalStop = {
+  /** Null until known; the first exit that claims the stop pins it to that process. */
+  incarnationId: string | null
+  /** Why per kind: overlapping stops of different kinds each hold their own label on the exit. */
+  ownersByKind: Map<TerminalIntentionalStopKind, IntentionalStopOwners>
+  expiryTimer?: ReturnType<typeof setTimeout>
+}
+
+const NO_INTENTIONAL_STOP: readonly TerminalIntentionalStopKind[] = []
+
+function hasInFlightOwners(stop: IntentionalStop): boolean {
+  return [...stop.ownersByKind.values()].some((owners) => owners.inFlight > 0)
+}
+
+/** The one register of PTY stops main made on purpose, read by every exit path. */
+export class TerminalIntentionalStops {
+  private readonly stopsByPtyId = new Map<string, IntentionalStop>()
+
+  /** Registers one owner's stop; call the result once with whether the stop landed. */
+  mark(
+    ptyId: string,
+    kind: TerminalIntentionalStopKind,
+    incarnationId: string | null
+  ): (stopped: boolean) => void {
+    let stop = this.stopsByPtyId.get(ptyId)
+    if (stop && this.joins(stop, incarnationId)) {
+      clearTimeout(stop.expiryTimer)
+      stop.expiryTimer = undefined
+      stop.incarnationId ??= incarnationId
+    } else {
+      clearTimeout(stop?.expiryTimer)
+      stop = { incarnationId, ownersByKind: new Map() }
+      this.stopsByPtyId.set(ptyId, stop)
+    }
+    const owners = stop.ownersByKind.get(kind) ?? { inFlight: 0, stopped: false }
+    owners.inFlight += 1
+    stop.ownersByKind.set(kind, owners)
+    const owned = stop
+    let settled = false
+    return (stopped) => {
+      if (settled || this.stopsByPtyId.get(ptyId) !== owned) {
+        return
+      }
+      settled = true
+      owners.stopped ||= stopped
+      owners.inFlight -= 1
+      if (owners.inFlight === 0 && !owners.stopped) {
+        owned.ownersByKind.delete(kind)
+      }
+      this.settleIfIdle(ptyId, owned)
+    }
+  }
+
+  /** The kinds of stop this exit ends; empty when the process was not stopped on purpose. */
+  claimExit(
+    ptyId: string,
+    exitIncarnationId: string | null | undefined
+  ): readonly TerminalIntentionalStopKind[] {
+    const stop = this.stopsByPtyId.get(ptyId)
+    if (!stop) {
+      return NO_INTENTIONAL_STOP
+    }
+    if (stop.incarnationId && exitIncarnationId && stop.incarnationId !== exitIncarnationId) {
+      return NO_INTENTIONAL_STOP
+    }
+    stop.incarnationId ??= exitIncarnationId ?? null
+    return [...stop.ownersByKind.keys()]
+  }
+
+  /** Whether a stop of this PTY that may still be undone is in flight. */
+  isReversibleStopInFlight(ptyId: string): boolean {
+    return (this.stopsByPtyId.get(ptyId)?.ownersByKind.get('reversible')?.inFlight ?? 0) > 0
+  }
+
+  /** A process committed on this id. A landed stop's process is dead, so an entry no exit ever
+   *  pinned could otherwise claim the new process's exit as the stop. */
+  noteSpawnCommit(ptyId: string): void {
+    const stop = this.stopsByPtyId.get(ptyId)
+    if (stop && stop.incarnationId === null && !hasInFlightOwners(stop)) {
+      clearTimeout(stop.expiryTimer)
+      this.stopsByPtyId.delete(ptyId)
+    }
+  }
+
+  // Why: a settled entry joins only its own known process, so an id reused by a process whose
+  // incarnation is not yet known never inherits the old stop.
+  private joins(stop: IntentionalStop, incarnationId: string | null): boolean {
+    if (stop.incarnationId !== null && stop.incarnationId === incarnationId) {
+      return true
+    }
+    return hasInFlightOwners(stop) && (stop.incarnationId === null || incarnationId === null)
+  }
+
+  private settleIfIdle(ptyId: string, stop: IntentionalStop): void {
+    if (hasInFlightOwners(stop)) {
+      return
+    }
+    if (stop.ownersByKind.size === 0) {
+      this.stopsByPtyId.delete(ptyId)
+      return
+    }
+    // Why a window: an SSH exit can arrive after the stop settles, and a synthetic exit can be
+    // followed by the provider's own; both describe the same stopped process.
+    stop.expiryTimer = setTimeout(() => {
+      if (this.stopsByPtyId.get(ptyId) === stop) {
+        this.stopsByPtyId.delete(ptyId)
+      }
+    }, SYNTHETIC_KILL_EXIT_DUPLICATE_WINDOW_MS)
+    stop.expiryTimer.unref?.()
+  }
+}
diff --git a/src/main/runtime/terminal-interactive-wait-visibility.test.ts b/src/main/runtime/terminal-interactive-wait-visibility.test.ts
index 3a6470b41f9d..b79ea7a3270a 100644
--- a/src/main/runtime/terminal-interactive-wait-visibility.test.ts
+++ b/src/main/runtime/terminal-interactive-wait-visibility.test.ts
@@ -92,9 +92,9 @@ describe('terminal interactive-wait visibility (STA-4513, STA-3714)', () => {
       await expect(
         assertTerminalAgentSendable({ runtime, handle, assertWritable: () => {} })
       ).rejects.toThrow('terminal_guard_permission')
-      await expect(runtime.sendTerminalAgentPrompt(handle, 'coordinator preamble')).rejects.toThrow(
-        'agent_prompt_blocked'
-      )
+      await expect(
+        runtime.sendTerminalAgentPrompt(handle, 'coordinator preamble', { inputKind: 'driving' })
+      ).rejects.toThrow('agent_prompt_blocked')
     })
 
     it('lets a dispatch preamble through once the same lane is working', async () => {
diff --git a/src/main/runtime/terminal-query-responder.test.ts b/src/main/runtime/terminal-query-responder.test.ts
index 9db883529a00..f479be9e47ae 100644
--- a/src/main/runtime/terminal-query-responder.test.ts
+++ b/src/main/runtime/terminal-query-responder.test.ts
@@ -21,6 +21,7 @@ import {
   setTerminalViewAttributes
 } from './terminal-view-attribute-store'
 import type { TerminalViewAttributes, TerminalViewRgb } from '../../shared/terminal-view-attributes'
+import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 
 const settingsState = {
   terminalMainSideEffectAuthority: true as boolean,
@@ -58,9 +59,11 @@ type RendererBufferStub = { data: string; cols: number; rows: number }
 function createResponderRuntime(opts: { rendererBuffer?: RendererBufferStub } = {}) {
   const runtime = new OrcaRuntimeService(store)
   const replies: { ptyId: string; data: string }[] = []
+  const inputKinds: TerminalInputKind[] = []
   runtime.setPtyController({
-    write: (ptyId, data) => {
+    write: (ptyId, data, inputKind) => {
       replies.push({ ptyId, data })
+      inputKinds.push(inputKind)
       return true
     },
     kill: () => true,
@@ -74,7 +77,7 @@ function createResponderRuntime(opts: { rendererBuffer?: RendererBufferStub } =
         }
       : {})
   })
-  return { runtime, replies }
+  return { runtime, replies, inputKinds }
 }
 
 /** Awaits the per-PTY emulator writeChain so queued chunk links (and the
@@ -146,7 +149,7 @@ describe('reply parity for hidden-dropped chunks', () => {
     ['kitty CSI ? u default flags', '\x1b[?u', ['\x1b[?0u']],
     ['kitty CSI ? u reports pushed flags', '\x1b[=5;1u\x1b[?u', ['\x1b[?5u']]
   ])('%s', async (_label, chunk, expectedReplies) => {
-    const { runtime, replies } = createResponderRuntime()
+    const { runtime, replies, inputKinds } = createResponderRuntime()
     markHiddenRendererPty('pty-q')
 
     runtime.onPtyData('pty-q', chunk, Date.now())
@@ -154,6 +157,8 @@ describe('reply parity for hidden-dropped chunks', () => {
 
     expect(replies.map((reply) => reply.data)).toEqual(expectedReplies)
     expect(replies.every((reply) => reply.ptyId === 'pty-q')).toBe(true)
+    // Why: a reply written as driving input would read the untouched run as typed.
+    expect(inputKinds).toEqual(expectedReplies.map(() => 'query-reply'))
   })
 
   it.each([
diff --git a/src/main/runtime/terminal-retirement-async-durability.test.ts b/src/main/runtime/terminal-retirement-async-durability.test.ts
index 038832782d7b..28d2f1603a91 100644
--- a/src/main/runtime/terminal-retirement-async-durability.test.ts
+++ b/src/main/runtime/terminal-retirement-async-durability.test.ts
@@ -2,6 +2,7 @@ import { afterEach, expect, it, vi } from 'vitest'
 import {
   ACK_INCARNATION,
   ACK_LEAF,
+  ACK_SECOND_LEAF,
   ACK_TAB,
   createAcknowledgedTabRetirementFixture
 } from './acknowledged-terminal-tab-retirement-fixture'
@@ -35,7 +36,7 @@ it('withholds the acknowledged close until its host retirement is durable', asyn
   expect(f.hasTab()).toBe(false)
 })
 
-it('publishes physical-exit retirement only after durability', async () => {
+it('publishes physical-exit retirement before its durable write completes', async () => {
   const f = fixture()
   await f.store.flushPendingOrThrowAsync()
   const published = vi.fn()
@@ -43,7 +44,8 @@ it('publishes physical-exit retirement only after durability', async () => {
   const gate = f.authority.pause()
   const exiting = f.runtime.onPtyExit('pty-a', 0, ACK_INCARNATION, { providerExitObserved: true })
   await gate.started.promise
-  expect(published).not.toHaveBeenCalled()
+  // Why: a client re-activating the exited pane in this window must already find it retired.
+  expect(published).toHaveBeenCalled()
   gate.finish.resolve()
   await exiting
   expect(published).toHaveBeenCalled()
@@ -53,7 +55,7 @@ it('publishes physical-exit retirement only after durability', async () => {
   unsubscribe()
 })
 
-it('does not publish a delayed exit over a newly admitted incarnation', async () => {
+it('publishes nothing when the exit write lands after a replacement is admitted', async () => {
   const f = fixture()
   await f.store.flushPendingOrThrowAsync()
   const published = vi.fn()
@@ -68,3 +70,58 @@ it('does not publish a delayed exit over a newly admitted incarnation', async ()
   expect(published).not.toHaveBeenCalled()
   unsubscribe()
 })
+
+async function exitWithFailedDurableWrite(f: ReturnType<typeof fixture>): Promise<void> {
+  await f.store.flushPendingOrThrowAsync()
+  const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined)
+  f.authority.failNextWrite()
+  await f.runtime.onPtyExit('pty-a', 0, ACK_INCARNATION, { providerExitObserved: true })
+  expect(errorSpy).toHaveBeenCalledWith(
+    '[runtime] terminal retirement is not yet durable:',
+    expect.any(Error)
+  )
+  errorSpy.mockRestore()
+  // The failed write left disk untouched, so a relaunch would still load the exited leaf.
+  expect(f.readDisk().workspaceSession.terminalLayoutsByTabId[ACK_TAB]?.ptyIdsByLeafId).toEqual({
+    [ACK_LEAF]: 'pty-a',
+    [ACK_SECOND_LEAF]: 'pty-b'
+  })
+}
+
+it('persists a failed exit retirement with the next unrelated profile write', async () => {
+  const f = fixture()
+  await exitWithFailedDurableWrite(f)
+  f.store.addRepo({
+    id: 'repo2',
+    path: '/tmp/other',
+    displayName: 'Other',
+    badgeColor: 'gray',
+    addedAt: 2
+  })
+  await f.store.flushPendingOrThrowAsync()
+  expect(f.readDisk().workspaceSession.terminalLayoutsByTabId[ACK_TAB]?.ptyIdsByLeafId).toEqual({
+    [ACK_SECOND_LEAF]: 'pty-b'
+  })
+})
+
+it('persists a failed exit retirement with the final quit flush', async () => {
+  const f = fixture()
+  await exitWithFailedDurableWrite(f)
+  await f.quit()
+  expect(f.readDisk().workspaceSession.terminalLayoutsByTabId[ACK_TAB]?.ptyIdsByLeafId).toEqual({
+    [ACK_SECOND_LEAF]: 'pty-b'
+  })
+})
+
+it('writes exits retired in the same tick once', async () => {
+  const f = fixture()
+  await f.store.flushPendingOrThrowAsync()
+  const writes = f.authority.captures.length
+  await Promise.all([
+    f.runtime.onPtyExit('pty-a', 0, ACK_INCARNATION, { providerExitObserved: true }),
+    f.runtime.onPtyExit('pty-b', 0, undefined, { providerExitObserved: true })
+  ])
+  // Why: the first write already carries both retirements; the second has nothing left to fence.
+  expect(f.authority.captures.length - writes).toBe(1)
+  expect(f.readDisk().workspaceSession.terminalLayoutsByTabId[ACK_TAB]).toBeUndefined()
+})
diff --git a/src/main/runtime/terminal-run-facts-input.test.ts b/src/main/runtime/terminal-run-facts-input.test.ts
new file mode 100644
index 000000000000..a1f26d9b6861
--- /dev/null
+++ b/src/main/runtime/terminal-run-facts-input.test.ts
@@ -0,0 +1,244 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { TerminalInputKind } from '../../shared/terminal-input-kind'
+import { writePtyFromRuntimeController } from '../ipc/pty/runtime/operations'
+import { getLocalPtyProvider, setLocalPtyProvider } from '../ipc/pty/provider/registry'
+import type { IPtyProvider } from '../providers/types'
+import { settledWriteStub } from '../providers/settled-pty-write-stub'
+import { OrcaRuntimeService } from './orca-runtime'
+import type { RuntimePtyController } from './runtime-pty-controller-contract'
+import { writeOrchestrationPointerWithSettlement } from './orchestration/mailbox-pointer-pty-write'
+import { sendTerminalStreamInput } from './rpc/methods/terminal/terminal-input-delivery'
+import { makeStore } from './runtime-rpc-worktree-store-fixtures'
+import {
+  pasteWorktreeStartupDraftWhenReady,
+  sendWorktreeStartupFollowupWhenReady,
+  type WorktreeStartupReadinessHost
+} from './runtime-worktree-startup-readiness'
+
+vi.mock('../git/worktree', () => {
+  const worktrees = [
+    {
+      path: '/tmp/worktree-a',
+      head: 'abc',
+      branch: 'feature/run-facts',
+      isBare: false,
+      isMainWorktree: false
+    }
+  ]
+  return {
+    listWorktrees: vi.fn().mockResolvedValue(worktrees),
+    listWorktreesStrict: vi.fn().mockResolvedValue(worktrees)
+  }
+})
+
+const PTY_ID = 'pty-run-facts-input'
+const priorProvider = getLocalPtyProvider()
+
+type FreshRun = {
+  runtime: OrcaRuntimeService
+  controller: RuntimePtyController
+  handle: string
+  /** The kind each provider write was sent with, and whether input was recorded by then. */
+  writes: { data: string; inputRecorded: boolean }[]
+  kinds: TerminalInputKind[]
+  firstUserInputAt: () => number | null
+}
+
+/** A fresh shell whose controller writes go through main's real write funnel to a fake provider. */
+async function createFreshRun(): Promise<FreshRun> {
+  const runtime = new OrcaRuntimeService(makeStore() as never)
+  const firstUserInputAt = (): number | null =>
+    runtime.terminalRunFacts.read(PTY_ID, null).firstUserInputAt
+  const writes: FreshRun['writes'] = []
+  const kinds: TerminalInputKind[] = []
+  const write = (_id: string, data: string): boolean => {
+    writes.push({ data, inputRecorded: firstUserInputAt() !== null })
+    if (data.endsWith('\r')) {
+      runtime.onPtyData(PTY_ID, '\x1b]0;Codex working\x07', Date.now())
+    }
+    return true
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the write funnel calls only write and writeWithSettlement on the provider.
+  setLocalPtyProvider({
+    write,
+    writeWithSettlement: settledWriteStub(write)
+  } as unknown as IPtyProvider)
+  const controller: RuntimePtyController = {
+    spawn: async () => ({ id: PTY_ID }),
+    write: (id, data, inputKind) => {
+      kinds.push(inputKind)
+      return writePtyFromRuntimeController({ runtime }, id, data, inputKind)
+    },
+    writeWithSettlement: (id, data, inputKind) => {
+      kinds.push(inputKind)
+      return writePtyFromRuntimeController({ runtime }, id, data, inputKind, {
+        waitForSettlement: true
+      })
+    },
+    kill: () => true,
+    getForegroundProcess: async () => null
+  }
+  runtime.setPtyController(controller)
+  const terminal = await runtime.createTerminal('path:/tmp/worktree-a', { launchAgent: 'aider' })
+  runtime.terminalRunFacts.recordSpawnCommit({ id: PTY_ID })
+  return { runtime, controller, handle: terminal.handle, writes, kinds, firstUserInputAt }
+}
+
+afterEach(() => {
+  vi.useRealTimers()
+  setLocalPtyProvider(priorProvider)
+})
+
+describe('run facts: the controller write funnel', () => {
+  it('records terminal.send input before the write that could end the process', async () => {
+    const run = await createFreshRun()
+
+    await run.runtime.sendTerminal(
+      run.handle,
+      { text: 'exit', enter: true },
+      { inputKind: 'driving' }
+    )
+
+    expect(run.firstUserInputAt()).not.toBeNull()
+    expect(run.writes.map((write) => write.inputRecorded)).toEqual([true, true])
+  })
+
+  it('records stream input from a client', async () => {
+    const run = await createFreshRun()
+
+    await sendTerminalStreamInput(run.runtime, {
+      terminal: run.handle,
+      text: 'l',
+      client: undefined,
+      isMobile: false
+    })
+
+    expect(run.firstUserInputAt()).not.toBeNull()
+  })
+
+  it('records a dispatched agent prompt before its first write', async () => {
+    vi.useFakeTimers()
+    const run = await createFreshRun()
+
+    const submission = run.runtime.sendTerminalAgentPrompt(run.handle, 'review this', {
+      inputKind: 'driving'
+    })
+    await vi.runAllTimersAsync()
+    await submission.catch(() => undefined)
+
+    expect(run.firstUserInputAt()).not.toBeNull()
+    expect(run.writes[0]?.inputRecorded).toBe(true)
+  })
+
+  it('reads a run launched with a prompt as untyped until someone drives it', async () => {
+    vi.useFakeTimers()
+    const run = await createFreshRun()
+
+    const submission = run.runtime.sendTerminalAgentPrompt(run.handle, 'start here', {
+      inputKind: 'launch'
+    })
+    await vi.runAllTimersAsync()
+    await submission.catch(() => undefined)
+
+    expect(run.writes.length).toBeGreaterThan(0)
+    expect(run.firstUserInputAt()).toBeNull()
+
+    await run.runtime.sendTerminal(run.handle, { text: 'y' }, { inputKind: 'driving' })
+    expect(run.firstUserInputAt()).not.toBeNull()
+  })
+
+  it('records a mailbox pointer, which drives the running agent', async () => {
+    const run = await createFreshRun()
+
+    await writeOrchestrationPointerWithSettlement({
+      ptyId: PTY_ID,
+      data: 'You have 1 unread message.',
+      controller: run.controller
+    })
+
+    expect(run.kinds).toEqual(['driving'])
+    expect(run.firstUserInputAt()).not.toBeNull()
+  })
+
+  it('records nothing for a client query reply', async () => {
+    const run = await createFreshRun()
+
+    await run.runtime.sendTerminal(run.handle, { text: 'y' }, { inputKind: 'query-reply' })
+
+    expect(run.firstUserInputAt()).toBeNull()
+  })
+
+  it.each([
+    ['a terminal reply', '\x1b[3;4R'],
+    ['focus reports', '\x1b[I\x1b[O'],
+    ['the focus-in a desktop sends on reattaching a remote pane', '\x1b[I']
+  ])('records nothing for stream input that is only %s', async (_label, text) => {
+    const run = await createFreshRun()
+
+    await sendTerminalStreamInput(run.runtime, {
+      terminal: run.handle,
+      text,
+      client: undefined,
+      isMobile: false
+    })
+
+    expect(run.writes).toHaveLength(1)
+    expect(run.firstUserInputAt()).toBeNull()
+  })
+
+  it('records a reply mixed with a keystroke', async () => {
+    const run = await createFreshRun()
+
+    await run.runtime.sendTerminal(run.handle, { text: '\x1b[3;4Rx' }, { inputKind: 'driving' })
+
+    expect(run.firstUserInputAt()).not.toBeNull()
+  })
+
+  it('records dashboard preview typing before the write that could end the process', async () => {
+    const run = await createFreshRun()
+
+    await expect(run.runtime.writeTerminalPreviewInput(PTY_ID, 'exit\r')).resolves.toBe(true)
+
+    expect(run.writes.map((write) => write.inputRecorded)).toEqual([true])
+  })
+
+  it('records nothing for dashboard preview bytes that are only a reply or focus reports', async () => {
+    const run = await createFreshRun()
+
+    await run.runtime.writeTerminalPreviewInput(PTY_ID, '\x1b[3;4R')
+    await run.runtime.writeTerminalPreviewInput(PTY_ID, '\x1b[O\x1b[I')
+
+    expect(run.writes).toHaveLength(2)
+    expect(run.firstUserInputAt()).toBeNull()
+  })
+})
+
+describe('run facts: a created worktree’s startup writes', () => {
+  function readinessHost(run: FreshRun): WorktreeStartupReadinessHost {
+    return {
+      getPtyId: () => PTY_ID,
+      getForegroundProcess: async () => 'aider',
+      subscribeToData: () => () => {},
+      // Why: bracketed paste enabled, then quiet, is the default draft-ready signal.
+      readRecentOutput: () => '\x1b[?2004h',
+      write: (ptyId, data, inputKind) => run.controller.write(ptyId, data, inputKind)
+    }
+  }
+
+  it('reads a run whose only input was its create-time draft and follow-up as untyped', async () => {
+    vi.useFakeTimers()
+    const run = await createFreshRun()
+    const host = readinessHost(run)
+
+    pasteWorktreeStartupDraftWhenReady(host, run.handle, { agent: 'aider', content: 'plan it' })
+    sendWorktreeStartupFollowupWhenReady(host, run.handle, {
+      expectedProcess: 'aider',
+      prompt: 'and ship it'
+    })
+    await vi.runAllTimersAsync()
+
+    expect(run.kinds).toEqual(['launch', 'launch'])
+    expect(run.writes).toHaveLength(2)
+    expect(run.firstUserInputAt()).toBeNull()
+  })
+})
diff --git a/src/main/runtime/terminal-run-facts.test.ts b/src/main/runtime/terminal-run-facts.test.ts
new file mode 100644
index 000000000000..e1982ebc968b
--- /dev/null
+++ b/src/main/runtime/terminal-run-facts.test.ts
@@ -0,0 +1,65 @@
+import { describe, expect, it } from 'vitest'
+import { TerminalRunFactsRegister } from './terminal-run-facts'
+
+describe('terminal run facts', () => {
+  it('reads a run main never saw committed as not fresh', () => {
+    expect(new TerminalRunFactsRegister().read('pty-1', 'inc-1')).toEqual({
+      freshSpawn: false,
+      firstUserInputAt: null
+    })
+  })
+
+  it('keeps the first user input across later input and a re-registration of the same process', () => {
+    const facts = new TerminalRunFactsRegister()
+    facts.recordSpawnCommit({ id: 'pty-1', incarnationId: 'inc-1' })
+    facts.recordInput('pty-1', 'driving', 'ls\r', 100)
+    facts.recordInput('pty-1', 'driving', 'ls\r', 200)
+
+    facts.recordSpawnCommit({ id: 'pty-1', incarnationId: 'inc-1', isReattach: true })
+
+    expect(facts.read('pty-1', 'inc-1')).toEqual({ freshSpawn: true, firstUserInputAt: 100 })
+  })
+
+  it('starts a new process clean', () => {
+    const facts = new TerminalRunFactsRegister()
+    facts.recordSpawnCommit({ id: 'pty-1', incarnationId: 'inc-1' })
+    facts.recordInput('pty-1', 'driving', 'ls\r', 100)
+
+    facts.recordSpawnCommit({ id: 'pty-1', incarnationId: 'inc-2' }, { tabId: 'source-tab' })
+
+    expect(facts.read('pty-1', 'inc-2')).toEqual({ freshSpawn: true, firstUserInputAt: null })
+    expect(facts.read('pty-1', 'inc-1')).toEqual({ freshSpawn: false, firstUserInputAt: null })
+  })
+
+  it('never reads a reattached process as fresh', () => {
+    const facts = new TerminalRunFactsRegister()
+
+    facts.recordSpawnCommit({ id: 'pty-1', incarnationId: 'inc-1', isReattach: true })
+
+    expect(facts.read('pty-1', 'inc-1').freshSpawn).toBe(false)
+  })
+
+  it('starts clean when a commit carries no incarnation to tell it from a new process', () => {
+    const facts = new TerminalRunFactsRegister()
+    facts.recordSpawnCommit({ id: 'pty-1' })
+    facts.recordInput('pty-1', 'driving', 'ls\r', 100)
+
+    facts.recordSpawnCommit({ id: 'pty-1', isReattach: true })
+
+    expect(facts.read('pty-1', null)).toEqual({ freshSpawn: false, firstUserInputAt: null })
+  })
+
+  it.each([
+    ['a launch write', 'launch', 'echo startup\r'],
+    ['a query reply', 'query-reply', '\x1b[1;1R'],
+    ['driving bytes that are only a terminal reply', 'driving', '\x1b[1;1R'],
+    ['driving bytes that are only focus reports', 'driving', '\x1b[I\x1b[O']
+  ] as const)('records nothing for %s', (_label, inputKind, data) => {
+    const facts = new TerminalRunFactsRegister()
+    facts.recordSpawnCommit({ id: 'pty-1', incarnationId: 'inc-1' })
+
+    facts.recordInput('pty-1', inputKind, data, 100)
+
+    expect(facts.read('pty-1', 'inc-1').firstUserInputAt).toBeNull()
+  })
+})
diff --git a/src/main/runtime/terminal-run-facts.ts b/src/main/runtime/terminal-run-facts.ts
new file mode 100644
index 000000000000..1fb3e411b6c4
--- /dev/null
+++ b/src/main/runtime/terminal-run-facts.ts
@@ -0,0 +1,90 @@
+import {
+  spawnCommitBindingOrigin,
+  type PtySpawnCommitOrigin
+} from '../persistence/loading-store/pty-binding-span'
+import { isTerminalQueryReply } from '../../shared/terminal-query-reply'
+import type { TerminalInputKind } from '../../shared/terminal-input-kind'
+
+export type TerminalRunFacts = {
+  /** This process was started for its pane, not reattached, adopted or cold-restored. */
+  freshSpawn: boolean
+  /** When input first drove this process, from any client or driver; null if none has. */
+  firstUserInputAt: number | null
+}
+
+// Why: a paired client's xterm answers focus changes (CSI I / CSI O) through input that carries no
+// provenance; the desktop renderer already excludes them via xterm's user-input signal.
+// oxlint-disable-next-line no-control-regex -- focus reports are ESC-framed sequences by definition.
+const TERMINAL_FOCUS_REPORTS_ONLY_RE = new RegExp('^(?:\\u001b\\[[IO])+$')
+
+/** Input with no provenance that no person typed: a whole terminal reply or only focus reports. */
+function isUntypedTerminalInput(payload: string): boolean {
+  return isTerminalQueryReply(payload) || TERMINAL_FOCUS_REPORTS_ONLY_RE.test(payload)
+}
+
+export type TerminalSpawnCommit = Parameters<typeof spawnCommitBindingOrigin>[0] & {
+  id: string
+  incarnationId?: string
+  coldRestore?: object
+}
+
+/** A cold restore starts a new process for a pane that had one, so it is never fresh. */
+type TerminalRunSpawnOrigin = PtySpawnCommitOrigin | 'cold-restore'
+
+type TerminalRunRecord = {
+  incarnationId: string | null
+  spawnOrigin: TerminalRunSpawnOrigin
+  firstUserInputAt: number | null
+}
+
+/** Main's per-process facts about one PTY run, keyed by the incarnation they describe. */
+export class TerminalRunFactsRegister {
+  private readonly runsByPtyId = new Map<string, TerminalRunRecord>()
+
+  /** Once per process: a re-registration of the same incarnation keeps its facts. Without an
+   *  incarnation a commit cannot be told from a new process, so it starts clean. */
+  recordSpawnCommit(commit: TerminalSpawnCommit, expectedSourceBinding?: unknown): void {
+    const incarnationId = commit.incarnationId ?? null
+    if (
+      incarnationId !== null &&
+      this.runsByPtyId.get(commit.id)?.incarnationId === incarnationId
+    ) {
+      return
+    }
+    const origin = spawnCommitBindingOrigin(commit, expectedSourceBinding)
+    this.runsByPtyId.set(commit.id, {
+      incarnationId,
+      spawnOrigin: origin === 'spawn' && commit.coldRestore !== undefined ? 'cold-restore' : origin,
+      firstUserInputAt: null
+    })
+  }
+
+  /** The one record point both write funnels call just before the provider write, because input
+   *  such as `exit` can end the process before the write returns. The payload check backs up a
+   *  writer that labels a reply or focus report as driving. */
+  recordInput(ptyId: string, inputKind: TerminalInputKind, data: string, now = Date.now()): void {
+    if (inputKind !== 'driving') {
+      return
+    }
+    const run = this.runsByPtyId.get(ptyId)
+    if (run && run.firstUserInputAt === null && !isUntypedTerminalInput(data)) {
+      run.firstUserInputAt = now
+    }
+  }
+
+  /** A run main never saw committed reads as not fresh, which keeps today's close-on-exit. */
+  read(ptyId: string, incarnationId: string | null | undefined): TerminalRunFacts {
+    const run = this.runsByPtyId.get(ptyId)
+    if (!run || (run.incarnationId && incarnationId && run.incarnationId !== incarnationId)) {
+      return { freshSpawn: false, firstUserInputAt: null }
+    }
+    return {
+      freshSpawn: run.spawnOrigin === 'spawn' || run.spawnOrigin === 'split',
+      firstUserInputAt: run.firstUserInputAt
+    }
+  }
+
+  delete(ptyId: string): void {
+    this.runsByPtyId.delete(ptyId)
+  }
+}
diff --git a/src/main/runtime/terminal-send-stale-leaf-liveness.test.ts b/src/main/runtime/terminal-send-stale-leaf-liveness.test.ts
index b7c5ed950683..a25ed9817fb5 100644
--- a/src/main/runtime/terminal-send-stale-leaf-liveness.test.ts
+++ b/src/main/runtime/terminal-send-stale-leaf-liveness.test.ts
@@ -96,9 +96,9 @@ describe('sendTerminal absence gate for leaf-branch writes', () => {
     const probe = vi.fn(async () => false)
     const { runtime, handle, write } = await makeRuntimeWithLeafHandle({ probePtyLiveness: probe })
 
-    await expect(runtime.sendTerminal(handle, { text: 'ping' })).rejects.toThrow(
-      'terminal_not_writable'
-    )
+    await expect(
+      runtime.sendTerminal(handle, { text: 'ping' }, { inputKind: 'driving' })
+    ).rejects.toThrow('terminal_not_writable')
 
     expect(probe).toHaveBeenCalledWith(STALE_PTY_ID)
     expect(write).not.toHaveBeenCalled()
@@ -108,9 +108,9 @@ describe('sendTerminal absence gate for leaf-branch writes', () => {
     const probe = vi.fn(async () => false)
     const { runtime, handle, write } = await makeRuntimeWithLeafHandle({ probePtyLiveness: probe })
 
-    await expect(runtime.sendTerminalAgentPrompt(handle, 'do the thing')).rejects.toThrow(
-      'terminal_not_writable'
-    )
+    await expect(
+      runtime.sendTerminalAgentPrompt(handle, 'do the thing', { inputKind: 'driving' })
+    ).rejects.toThrow('terminal_not_writable')
 
     expect(write).not.toHaveBeenCalled()
   })
@@ -120,12 +120,14 @@ describe('sendTerminal absence gate for leaf-branch writes', () => {
       probePtyLiveness: async () => null
     })
 
-    await expect(runtime.sendTerminal(handle, { text: 'ping' })).resolves.toMatchObject({
+    await expect(
+      runtime.sendTerminal(handle, { text: 'ping' }, { inputKind: 'driving' })
+    ).resolves.toMatchObject({
       handle,
       accepted: true
     })
 
-    expect(write).toHaveBeenCalledWith(STALE_PTY_ID, 'ping')
+    expect(write).toHaveBeenCalledWith(STALE_PTY_ID, 'ping', 'driving')
   })
 
   it('treats a throwing probe as unknown and proceeds', async () => {
@@ -135,11 +137,13 @@ describe('sendTerminal absence gate for leaf-branch writes', () => {
       }
     })
 
-    await expect(runtime.sendTerminal(handle, { text: 'ping' })).resolves.toMatchObject({
+    await expect(
+      runtime.sendTerminal(handle, { text: 'ping' }, { inputKind: 'driving' })
+    ).resolves.toMatchObject({
       accepted: true
     })
 
-    expect(write).toHaveBeenCalledWith(STALE_PTY_ID, 'ping')
+    expect(write).toHaveBeenCalledWith(STALE_PTY_ID, 'ping', 'driving')
   })
 
   it('proceeds when the probe answers live (restored session before its pane remounts)', async () => {
@@ -147,21 +151,25 @@ describe('sendTerminal absence gate for leaf-branch writes', () => {
       probePtyLiveness: async () => true
     })
 
-    await expect(runtime.sendTerminal(handle, { text: 'ping' })).resolves.toMatchObject({
+    await expect(
+      runtime.sendTerminal(handle, { text: 'ping' }, { inputKind: 'driving' })
+    ).resolves.toMatchObject({
       accepted: true
     })
 
-    expect(write).toHaveBeenCalledWith(STALE_PTY_ID, 'ping')
+    expect(write).toHaveBeenCalledWith(STALE_PTY_ID, 'ping', 'driving')
   })
 
   it('proceeds unchanged when the controller exposes no probe', async () => {
     const { runtime, handle, write } = await makeRuntimeWithLeafHandle({})
 
-    await expect(runtime.sendTerminal(handle, { text: 'ping' })).resolves.toMatchObject({
+    await expect(
+      runtime.sendTerminal(handle, { text: 'ping' }, { inputKind: 'driving' })
+    ).resolves.toMatchObject({
       accepted: true
     })
 
-    expect(write).toHaveBeenCalledWith(STALE_PTY_ID, 'ping')
+    expect(write).toHaveBeenCalledWith(STALE_PTY_ID, 'ping', 'driving')
   })
 
   it('never probes when the provider synchronously knows the id (live pty)', async () => {
@@ -171,24 +179,26 @@ describe('sendTerminal absence gate for leaf-branch writes', () => {
       hasPty: (ptyId) => ptyId === STALE_PTY_ID
     })
 
-    await expect(runtime.sendTerminal(handle, { text: 'ping' })).resolves.toMatchObject({
+    await expect(
+      runtime.sendTerminal(handle, { text: 'ping' }, { inputKind: 'driving' })
+    ).resolves.toMatchObject({
       accepted: true
     })
 
     expect(probe).not.toHaveBeenCalled()
-    expect(write).toHaveBeenCalledWith(STALE_PTY_ID, 'ping')
+    expect(write).toHaveBeenCalledWith(STALE_PTY_ID, 'ping', 'driving')
   })
 
   it('reuses a proven-absent verdict across repeated sends instead of re-probing', async () => {
     const probe = vi.fn(async () => false)
     const { runtime, handle } = await makeRuntimeWithLeafHandle({ probePtyLiveness: probe })
 
-    await expect(runtime.sendTerminal(handle, { text: 'a' })).rejects.toThrow(
-      'terminal_not_writable'
-    )
-    await expect(runtime.sendTerminal(handle, { text: 'b' })).rejects.toThrow(
-      'terminal_not_writable'
-    )
+    await expect(
+      runtime.sendTerminal(handle, { text: 'a' }, { inputKind: 'driving' })
+    ).rejects.toThrow('terminal_not_writable')
+    await expect(
+      runtime.sendTerminal(handle, { text: 'b' }, { inputKind: 'driving' })
+    ).rejects.toThrow('terminal_not_writable')
 
     expect(probe).toHaveBeenCalledTimes(1)
   })
@@ -201,17 +211,19 @@ describe('sendTerminal absence gate for leaf-branch writes', () => {
       hasPty: (ptyId) => livePtyIds.has(ptyId)
     })
 
-    await expect(runtime.sendTerminal(handle, { text: 'a' })).rejects.toThrow(
-      'terminal_not_writable'
-    )
+    await expect(
+      runtime.sendTerminal(handle, { text: 'a' }, { inputKind: 'driving' })
+    ).rejects.toThrow('terminal_not_writable')
     // Same id recreated by a fresh spawn: provider knowledge must beat the verdict.
     livePtyIds.add(STALE_PTY_ID)
 
-    await expect(runtime.sendTerminal(handle, { text: 'b' })).resolves.toMatchObject({
+    await expect(
+      runtime.sendTerminal(handle, { text: 'b' }, { inputKind: 'driving' })
+    ).resolves.toMatchObject({
       accepted: true
     })
     expect(probe).toHaveBeenCalledTimes(1)
-    expect(write).toHaveBeenCalledWith(STALE_PTY_ID, 'b')
+    expect(write).toHaveBeenCalledWith(STALE_PTY_ID, 'b', 'driving')
   })
 })
 
diff --git a/src/main/runtime/terminal-surface-close.test.ts b/src/main/runtime/terminal-surface-close.test.ts
new file mode 100644
index 000000000000..e149958ff340
--- /dev/null
+++ b/src/main/runtime/terminal-surface-close.test.ts
@@ -0,0 +1,85 @@
+import { describe, expect, it } from 'vitest'
+import type { TerminalLayoutSnapshot } from '../../shared/terminal-tab-types'
+import {
+  resolveTerminalCloseTarget,
+  type TerminalCloseLayoutCopies
+} from './terminal-surface-close'
+
+const PANE = { kind: 'pane', tabId: 'tab-1', leafId: 'leaf-a' } as const
+
+function layout(...leafIds: string[]): TerminalLayoutSnapshot {
+  const [first, second] = leafIds
+  return {
+    root:
+      first === undefined
+        ? null
+        : second === undefined
+          ? { type: 'leaf', leafId: first }
+          : {
+              type: 'split',
+              direction: 'horizontal',
+              first: { type: 'leaf', leafId: first },
+              second: { type: 'leaf', leafId: second }
+            },
+    activeLeafId: first ?? null,
+    expandedLeafId: null
+  }
+}
+
+function copies(overrides: Partial<TerminalCloseLayoutCopies>): TerminalCloseLayoutCopies {
+  return {
+    rendererListsTab: false,
+    snapshotRows: [],
+    graphLeafIds: [],
+    sessionLayout: undefined,
+    ...overrides
+  }
+}
+
+describe('resolveTerminalCloseTarget', () => {
+  it('never widens a pane close when the owner copy records no panes', () => {
+    // A renderer tab registered before its panes, with nothing published for it yet.
+    expect(resolveTerminalCloseTarget(PANE, copies({ rendererListsTab: true }))).toBe('absent')
+    // A main-owned tab whose layout was saved before its pane mounted, and no other copy.
+    expect(resolveTerminalCloseTarget(PANE, copies({ sessionLayout: layout() }))).toBe('absent')
+  })
+
+  it("closes the tab only when a copy positively shows this pane as the tab's one pane", () => {
+    const cases: [string, Partial<TerminalCloseLayoutCopies>][] = [
+      ['renderer graph', { rendererListsTab: true, graphLeafIds: ['leaf-a'] }],
+      [
+        'renderer rows with no layout or graph panes',
+        { rendererListsTab: true, snapshotRows: [{ leafId: 'leaf-a' }] }
+      ],
+      ['main session layout', { sessionLayout: layout('leaf-a') }],
+      [
+        'rows published for a main-owned tab whose saved layout is empty',
+        { sessionLayout: layout(), snapshotRows: [{ leafId: 'leaf-a', parentLayout: layout() }] }
+      ]
+    ]
+    for (const [name, overrides] of cases) {
+      expect([name, resolveTerminalCloseTarget(PANE, copies(overrides))]).toEqual([
+        name,
+        'last-pane'
+      ])
+    }
+  })
+
+  it('reads past an empty copy to one that records the split', () => {
+    expect(
+      resolveTerminalCloseTarget(
+        PANE,
+        copies({
+          sessionLayout: layout(),
+          snapshotRows: [{ leafId: 'leaf-a', parentLayout: layout('leaf-a', 'leaf-b') }]
+        })
+      )
+    ).toBe('pane')
+  })
+
+  it('treats a pane the owner copy lacks as absent', () => {
+    expect(
+      resolveTerminalCloseTarget(PANE, copies({ rendererListsTab: true, graphLeafIds: ['leaf-b'] }))
+    ).toBe('absent')
+  })
+})
diff --git a/src/main/runtime/terminal-surface-close.ts b/src/main/runtime/terminal-surface-close.ts
new file mode 100644
index 000000000000..0feee12402c6
--- /dev/null
+++ b/src/main/runtime/terminal-surface-close.ts
@@ -0,0 +1,245 @@
+import type { RuntimeSessionTabCloseReason } from '../../shared/runtime-session-contracts'
+import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
+import {
+  hasClosedTerminalTabRecord,
+  recordClosedTerminalTabTombstone
+} from '../../shared/closed-terminal-tab-tombstones'
+import type {
+  TerminalLayoutSnapshot,
+  TerminalPaneLayoutNode
+} from '../../shared/terminal-tab-types'
+import type { TerminalSurfaceCloseTarget } from '../../shared/terminal-surface-close-target'
+import {
+  closeTerminalTabInWorkspaceSession,
+  type WorkspaceSessionTerminalTabCloseResult
+} from '../../shared/workspace-session-terminal-tab-close'
+import { retireTerminalSurfaceFromPersistence } from './mobile-session-terminal-persistence-retirement'
+import { advanceTerminalTopologyRevision } from './workspace-session-terminal-membership-authority'
+import type { DurableProfileStateMutation } from '../persistence/loading-store/store-runtime-state'
+import type { ExecutionHostId } from '../../shared/execution-host'
+
+/** Where a pane close lands: its own removal, its tab's last pane, or a pane the copy lacks. */
+export type PaneCloseResolution = 'pane' | 'last-pane' | 'absent'
+
+export function collectTerminalLayoutLeafIds(
+  node: TerminalPaneLayoutNode | null | undefined
+): string[] {
+  if (!node) {
+    return []
+  }
+  if (node.type === 'leaf') {
+    return [node.leafId]
+  }
+  return [...collectTerminalLayoutLeafIds(node.first), ...collectTerminalLayoutLeafIds(node.second)]
+}
+
+/**
+ * Resolves a pane close against the panes one copy records. Only a copy that positively shows this
+ * pane as its tab's one pane widens the close; a copy recording no panes knows nothing about it.
+ */
+export function resolvePaneClose(
+  leafIds: readonly string[] | null,
+  leafId: string
+): PaneCloseResolution {
+  if (!leafIds?.includes(leafId)) {
+    return 'absent'
+  }
+  return leafIds.length === 1 ? 'last-pane' : 'pane'
+}
+
+/** Every copy of a tab's panes main can read when it resolves a close it started. */
+export type TerminalCloseLayoutCopies = {
+  /** The desktop renderer lists the tab, so it owns the tab's panes. */
+  rendererListsTab: boolean
+  /** The tab's rows in the published session snapshot. */
+  snapshotRows: readonly { leafId: string; parentLayout?: TerminalLayoutSnapshot }[]
+  /** The tab's panes in the renderer-published runtime graph. */
+  graphLeafIds: readonly string[]
+  sessionLayout: TerminalLayoutSnapshot | undefined
+}
+
+/** Reads the panes from whoever owns the tab's layout; `null` means no copy records any. */
+function readLayoutOwnerLeafIds(copies: TerminalCloseLayoutCopies): readonly string[] | null {
+  const published =
+    copies.snapshotRows
+      .map((row) => collectTerminalLayoutLeafIds(row.parentLayout?.root))
+      .find((leafIds) => leafIds.length > 0) ?? []
+  const rows = copies.snapshotRows.map((row) => row.leafId)
+  // Why: main's saved layout lacks a renderer split whose PTY binding has not committed yet;
+  // the published layout outranks the graph, which relay recovery can leave with stale panes.
+  const ownerCopies = copies.rendererListsTab
+    ? [published, copies.graphLeafIds, rows]
+    : [collectTerminalLayoutLeafIds(copies.sessionLayout?.root), published, rows]
+  // Why: a layout saved before its pane mounted (or a graph before its panes register) is empty.
+  return ownerCopies.find((leafIds) => leafIds.length > 0) ?? null
+}
+
+/**
+ * The only place main turns a pane close into its tab's close: `last-pane` sends callers down
+ * the tab path (and its renderer pin guard); anything else closes that pane or nothing.
+ * D1 (main as the single layout writer) collapses the owner read to main's session layout alone.
+ */
+export function resolveTerminalCloseTarget(
+  target: TerminalSurfaceCloseTarget,
+  copies: TerminalCloseLayoutCopies
+): PaneCloseResolution | 'tab' {
+  return target.kind === 'tab'
+    ? 'tab'
+    : resolvePaneClose(readLayoutOwnerLeafIds(copies), target.leafId)
+}
+
+export type TerminalSurfaceCloseResult = WorkspaceSessionTerminalTabCloseResult & {
+  resolution: PaneCloseResolution | 'tab'
+}
+
+/**
+ * The membership half of every explicit terminal close: removes a tab, or one pane of a split
+ * tab, and advances the repo's topology revision so a stale renderer save cannot restore it.
+ * A pane close only ever removes that pane; the resolution says why anything else was a no-op.
+ * Every tab close is recorded in the session it was removed from, the owning host's partition.
+ */
+export function closeTerminalSurfaceInWorkspaceSession(
+  session: WorkspaceSessionState,
+  worktreeId: string,
+  target: TerminalSurfaceCloseTarget,
+  options: {
+    force?: boolean
+    paneIncarnationId?: string
+    reason: RuntimeSessionTabCloseReason
+    now?: number
+  }
+): TerminalSurfaceCloseResult {
+  if (target.kind === 'pane') {
+    const layout = session.terminalLayoutsByTabId[target.tabId]
+    const resolution = resolvePaneClose(
+      layout ? collectTerminalLayoutLeafIds(layout.root) : null,
+      target.leafId
+    )
+    // Why: the exit may already have retired this pane, leaving only live siblings to lose.
+    if (!layout || resolution !== 'pane') {
+      return { session, ptyIdsToKill: [], closed: false, pinned: false, resolution }
+    }
+    // The pane's own binding is passed so the retirement's stale-binding fence always admits it;
+    // the incarnation seen when the close was asked refuses a pane restarted since.
+    const retired = retireTerminalSurfaceFromPersistence(session, {
+      worktreeId,
+      parentTabId: target.tabId,
+      leafId: target.leafId,
+      ptyId: layout.ptyIdsByLeafId?.[target.leafId] ?? '',
+      ...(options.paneIncarnationId ? { incarnationId: options.paneIncarnationId } : {})
+    })
+    return {
+      session: retired,
+      ptyIdsToKill: [],
+      closed: retired !== session,
+      pinned: false,
+      resolution
+    }
+  }
+  const result = closeTerminalTabInWorkspaceSession(session, worktreeId, target.tabId, {
+    force: options.force
+  })
+  if (result.pinned) {
+    return { ...result, resolution: 'tab' }
+  }
+  // Why a tab this session never listed is still recorded: its spawn may commit later and graft it.
+  const recorded: WorkspaceSessionState = {
+    ...result.session,
+    closedTerminalTabTombstonesByTabId: recordClosedTerminalTabTombstone(
+      result.session.closedTerminalTabTombstonesByTabId,
+      target.tabId,
+      { worktreeId, reason: options.reason },
+      options.now ?? Date.now()
+    )
+  }
+  return {
+    ...result,
+    session: result.closed ? advanceTerminalTopologyRevision(recorded, worktreeId) : recorded,
+    resolution: 'tab'
+  }
+}
+
+/** How one close commits; `reason` is recorded only when the close resolves to the whole tab. */
+export type TerminalSurfaceCloseOptions = {
+  allowMissing?: boolean
+  force?: boolean
+  reason?: RuntimeSessionTabCloseReason
+  /** The desktop renderer's own close: its layout owner already removed the tab. Goes away with
+   *  D1, once main owns the terminal layout. */
+  closedByLayoutOwner?: boolean
+}
+
+/** The desktop renderer's close intent as its IPC delivers it; main alone passes 'pty-exit'. */
+export type RendererTerminalClose = {
+  worktreeId: string
+  target: TerminalSurfaceCloseTarget
+  reason?: 'user' | 'cleanup'
+}
+
+/** What one close's durable mutation reads and writes, resolved when the writer admits it. */
+export type TerminalSurfaceCloseCommit = {
+  worktreeId: string
+  target: TerminalSurfaceCloseTarget
+  options: TerminalSurfaceCloseOptions
+  /** The session as it was when the close was asked, before the writer admitted it. */
+  requestedSession: WorkspaceSessionState | null | undefined
+  /** The tab's owner identity still matches the one the close was asked against. */
+  ownerMatches: () => boolean
+  hostId: () => ExecutionHostId
+  getSession: (hostId: ExecutionHostId) => WorkspaceSessionState | null | undefined
+  setSession: (session: WorkspaceSessionState, hostId: ExecutionHostId) => void
+  onClosed: (ptyIdsToKill: string[]) => void
+}
+
+/** Builds the close's durable mutation: a refusal persists nothing and is its value. */
+export function terminalSurfaceCloseMutation(
+  commit: TerminalSurfaceCloseCommit
+): () => DurableProfileStateMutation<Error | undefined> {
+  const { target } = commit
+  // Why: a pane is fenced by its own binding, so a sibling split during the write cannot refuse it.
+  const paneIncarnationId =
+    target.kind === 'pane'
+      ? commit.requestedSession?.terminalPtyIncarnationsByPaneKey?.[
+          `${target.tabId}:${target.leafId}`
+        ]
+      : undefined
+  return () => {
+    if (!commit.ownerMatches()) {
+      return { value: new Error('terminal_pane_owner_changed'), persist: false }
+    }
+    const hostId = commit.hostId()
+    const session = commit.getSession(hostId)
+    if (!session) {
+      return { value: new Error('workspace_session_unavailable'), persist: false }
+    }
+    const result = closeTerminalSurfaceInWorkspaceSession(session, commit.worktreeId, target, {
+      force: commit.options.force,
+      paneIncarnationId,
+      reason: commit.options.reason ?? 'user'
+    })
+    if (result.pinned) {
+      return { value: new Error('terminal_tab_pinned'), persist: false }
+    }
+    if (!result.closed) {
+      // Why: a tab this session never listed still records its close, so its late spawn is refused;
+      // an existing record (an echo of that close) needs no second write.
+      if (
+        commit.options.allowMissing &&
+        target.kind === 'tab' &&
+        !hasClosedTerminalTabRecord(session.closedTerminalTabTombstonesByTabId, target.tabId)
+      ) {
+        commit.setSession(result.session, hostId)
+        return { value: undefined }
+      }
+      return {
+        value: commit.options.allowMissing ? undefined : new Error('tab_not_found'),
+        persist: false
+      }
+    }
+    commit.setSession(result.session, hostId)
+    commit.onClosed(result.ptyIdsToKill)
+    // Why no rollback: bookkeeping must not undo a user's close or skip its kill; a failed write
+    // keeps the removal dirty in memory, so the next write persists it.
+    return { value: undefined }
+  }
+}
diff --git a/src/main/runtime/terminal-wait-detection.ts b/src/main/runtime/terminal-wait-detection.ts
index 6674b6a18eb0..4083e828bd3d 100644
--- a/src/main/runtime/terminal-wait-detection.ts
+++ b/src/main/runtime/terminal-wait-detection.ts
@@ -1,3 +1,4 @@
+import { isQoderComposerReady } from './qoder-terminal-readiness'
 import { memoizeTitleClassification } from '../../shared/terminal-title-classification-memo'
 import {
   detectAgentStatusFromTitle,
@@ -5,7 +6,15 @@ import {
   type AgentStatus
 } from '../../shared/agent-detection'
 import type { RuntimeTerminalWaitBlockedReason } from '../../shared/runtime-types'
+import type { TuiAgent } from '../../shared/tui-agent'
 import { findAntigravityReadyPromptIndex } from './antigravity-terminal-readiness'
+import {
+  findCodexHeaderIndex,
+  findCodexScreenReadyPromptIndex,
+  isCodexComposerReadyScreen,
+  isCodexProvisionalStartupText
+} from './codex-terminal-readiness'
+import { findStartupDialogBlockedSignals } from './startup-dialog-blocked-signals'
 import {
   isTerminalWaitWhitespace,
   startOfLastLines,
@@ -47,22 +56,96 @@ export const detectExplicitIdleStatusFromTitle: (title: string) => AgentStatus |
 
 export function isKnownReadyPromptPreview(preview: string): boolean {
   const normalized = preview.toLowerCase()
-  const readyIndex = findKnownReadyPromptIndex(normalized)
-  if (readyIndex === null) {
+  return isReadyPromptUnblocked(normalized, findKnownReadyPromptIndex(normalized))
+}
+
+/**
+ * The ready-prompt text rules for a pane about to take input. Unlike isKnownReadyPromptPreview
+ * (agent presence), Codex's provisional startup header does not count: 0.157 discards input typed
+ * behind it while its daemon starts.
+ */
+export function isKnownReadyPromptSettled(preview: string): boolean {
+  const normalized = preview.toLowerCase()
+  return isReadyPromptSettled(normalized, findKnownReadyPromptIndex(normalized))
+}
+
+function isReadyPromptSettled(normalized: string, readyIndex: number | null): boolean {
+  return (
+    isReadyPromptUnblocked(normalized, readyIndex) && !isCodexProvisionalStartupText(normalized)
+  )
+}
+
+/**
+ * Tier 1 body evidence for every tui-idle site. `readScreenLines` yields the live emulator's
+ * visible grid, or null when the runtime has no trustworthy one.
+ *
+ * Why not for a clocked Codex pane: its header stays up through every turn, so it proves only
+ * that Codex started; isQuietReadyScreenBody holds it to quiescence instead.
+ * Why a clockless pane keeps it: quiescence needs an output clock, which a restored pane lacks.
+ */
+export function isKnownReadyPromptBody(
+  waitText: string,
+  agent: TuiAgent | null,
+  readScreenLines: () => readonly string[] | null,
+  hasOutputClock: boolean
+): boolean {
+  if (agent === 'qoder') {
+    return isQoderComposerReady(readScreenLines())
+  }
+  if (agent === 'codex' && hasOutputClock) {
     return false
   }
-  const blockedSignal = findTerminalWaitBlockedSignal(normalized)
-  if (blockedSignal !== null && blockedSignal.index > readyIndex) {
+  if (isKnownReadyPromptSettled(waitText)) {
+    return true
+  }
+  // Why the agent gate: another agent's screen can merely mention "OpenAI Codex".
+  if (agent !== null && agent !== 'codex') {
     return false
   }
-  return true
+  const screen = readScreen(readScreenLines)
+  return screen !== null && isCodexScreenHeaderReady(screen)
 }
 
-// Why separate from isKnownReadyPromptPreview: that one settles tier 1 immediately, while
-// a Muse ready screen only proves the TUI is up — the ranking holds it to quiescence.
-export function isMuseReadyPromptPreview(preview: string): boolean {
-  const normalized = preview.toLowerCase()
-  const readyIndex = findMuseReadyPromptIndex(normalized)
+/**
+ * Tier 1b body evidence: a ready screen from an agent with no title rest signal. Unlike tier 1
+ * it only proves the TUI is up, so the ranking holds it to quiescence.
+ * Why codex panes only: a `cat`ed transcript or pager in an unknown pane can show the composer.
+ */
+export function isQuietReadyScreenBody(
+  waitText: string,
+  agent: TuiAgent | null,
+  readScreenLines: () => readonly string[] | null
+): boolean {
+  if (agent === 'codex') {
+    const screen = readScreen(readScreenLines)
+    if (
+      screen !== null &&
+      (isCodexComposerReadyScreen(screen) || isCodexScreenHeaderReady(screen))
+    ) {
+      return true
+    }
+    // Why the provisional veto here too: a daemon start can stay quiet past the quiescence window.
+    const normalized = waitText.toLowerCase()
+    return isReadyPromptSettled(normalized, findCodexReadyPromptIndex(normalized))
+  }
+  return (agent === null || agent === 'muse') && isMuseReadyPromptPreview(waitText)
+}
+
+/**
+ * Why the screen: Codex repaints its 0.150-0.157 header by cell diff (`ESC[5;3Hdir
+ * ESC[5;7Hctory:`), which only a grid reassembles — the line-folded wait text reads `dirctory:`.
+ * Why it can only add readiness: a grid out of step with the PTY (size mismatch, resize
+ * mid-paint) garbles the header, so the text rule keeps every verdict it gives on its own.
+ */
+function isCodexScreenHeaderReady(screen: string): boolean {
+  return isReadyPromptUnblocked(screen, findCodexScreenReadyPromptIndex(screen))
+}
+
+function readScreen(readScreenLines: () => readonly string[] | null): string | null {
+  return readScreenLines()?.join('\n').toLowerCase() ?? null
+}
+
+function isReadyPromptUnblocked(normalized: string, readyIndex: number | null): boolean {
   if (readyIndex === null) {
     return false
   }
@@ -70,6 +153,11 @@ export function isMuseReadyPromptPreview(preview: string): boolean {
   return blockedSignal === null || blockedSignal.index <= readyIndex
 }
 
+export function isMuseReadyPromptPreview(preview: string): boolean {
+  const normalized = preview.toLowerCase()
+  return isReadyPromptUnblocked(normalized, findMuseReadyPromptIndex(normalized))
+}
+
 export function detectTerminalWaitBlockedReason(
   preview: string
 ): RuntimeTerminalWaitBlockedReason | null {
@@ -95,6 +183,7 @@ export function findActionableTerminalWaitBlockedSignal(
 function findDismissedStartupModalIndex(normalized: string): number | null {
   const indexes = [
     findCodexReadyPromptIndex(normalized),
+    findCodexHeaderIndex(normalized),
     findAntigravityReadyPromptIndex(normalized),
     findCursorActivePromptIndex(normalized),
     findMuseReadyPromptIndex(normalized)
@@ -224,7 +313,7 @@ function findCodexReadyPromptIndex(normalized: string): number | null {
 }
 
 export const TERMINAL_WAIT_BLOCKED_SENTINEL_RE =
-  /update available|choose working directory to|codex just got an upgrade|hooks need review|do you trust|trust this|trusted workspace|press enter to (?:confirm|continue|view|insert)|press t to trust|permission required|requires permission|allow once|allow always|run this command\?/i
+  /update available|choose working directory to|codex just got an upgrade|available\s*·|esc\s*skip|enter\s*confirm\s*·|enter\/esc\s*(?:continue|confirm)|hooks need review|do you trust|trust this|trusted workspace|press enter to (?:confirm|continue|view|insert)|press t to trust|permission required|requires permission|allow once|allow always|run this command\?/i
 
 // Why text at all: cursor-agent has no approval hook, so the key-bound menu is the only authority.
 const CURSOR_APPROVAL_CHOICE_MARKERS = [
@@ -293,27 +382,7 @@ function findTerminalWaitBlockedSignal(
 function findBlockedSignalInLiveWindow(
   normalized: string
 ): { reason: RuntimeTerminalWaitBlockedReason; index: number } | null {
-  const candidates: { reason: RuntimeTerminalWaitBlockedReason; index: number }[] = []
-  const updateIndex = normalized.lastIndexOf('update available')
-  if (updateIndex !== -1 && normalized.includes('press enter to continue', updateIndex)) {
-    candidates.push({ reason: 'agent-update-prompt', index: updateIndex })
-  }
-  const cwdIndex = normalized.lastIndexOf('choose working directory to')
-  if (cwdIndex !== -1 && normalized.includes('press enter to continue', cwdIndex)) {
-    candidates.push({ reason: 'agent-cwd-prompt', index: cwdIndex })
-  }
-  const modelMigrationIndex = normalized.lastIndexOf('codex just got an upgrade')
-  if (
-    modelMigrationIndex !== -1 &&
-    normalized.includes('press enter to continue', modelMigrationIndex)
-  ) {
-    candidates.push({ reason: 'codex-model-migration-prompt', index: modelMigrationIndex })
-  }
-  const hooksIndex = normalized.lastIndexOf('hooks need review')
-  if (hooksIndex !== -1 && normalized.includes('press enter to confirm', hooksIndex)) {
-    // Why neutral: this matcher never inspects the agent -- 'hooks need review' is not Codex-only wording.
-    candidates.push({ reason: 'agent-hooks-review-prompt', index: hooksIndex })
-  }
+  const candidates = findStartupDialogBlockedSignals(normalized)
   const trustIndex = Math.max(
     normalized.lastIndexOf('do you trust'),
     normalized.lastIndexOf('trust this'),
diff --git a/src/main/runtime/terminal-wait-name-only-idle.test.ts b/src/main/runtime/terminal-wait-name-only-idle.test.ts
index 95cfa54be56e..cf4648bf3539 100644
--- a/src/main/runtime/terminal-wait-name-only-idle.test.ts
+++ b/src/main/runtime/terminal-wait-name-only-idle.test.ts
@@ -51,12 +51,15 @@ function createWait(options: {
     getAdoptedPtyIdleStatus: () => options.adoptedIdleStatus ?? null,
     getPaneAgent: () => options.agent ?? null,
     getFirstPartyAgentStatus: () => options.firstPartyStatus ?? null,
+    readScreenLines: () => null,
+    readVisibleScreen: () => null,
     quiescenceMs: QUIESCENCE_MS
   }
   const polls = new RuntimeTerminalIdlePolls({
     ...shared,
     intervalMs: POLL_INTERVAL_MS,
     getForegroundProcess: () => Promise.resolve(options.foreground ?? null),
+    hasCommandPainted: () => true,
     getLiveLeaf: (leaf) => options.liveLeaf?.() ?? leaf,
     resolve: (waiter, result) => waiters.resolve(waiter, result)
   })
diff --git a/src/main/runtime/tui-idle-command-paint.test.ts b/src/main/runtime/tui-idle-command-paint.test.ts
new file mode 100644
index 000000000000..fda31e06ebbe
--- /dev/null
+++ b/src/main/runtime/tui-idle-command-paint.test.ts
@@ -0,0 +1,57 @@
+/**
+ * An agent with no rest signal of its own (amp) settles only on a quiet foreground, and only
+ * once it has painted. The shell's prompt and the echoed launch command land first, so the
+ * runtime must tell them apart from the agent's paint by the shell's command-start marker.
+ */
+
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { createTranscriptPane, TRANSCRIPT_PANE_PTY_ID } from './agent-transcript-pane-test-harness'
+
+const POLL_INTERVAL_MS = 2_000
+
+describe('tui-idle on an agent with no rest signal', () => {
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('waits through a silent boot after the shell echoed the command, then settles on the paint', async () => {
+    const { runtime, handle } = await createTranscriptPane({
+      paneTitle: 'Terminal',
+      foregroundProcess: 'amp',
+      launchAgent: 'amp',
+      data: ''
+    })
+    vi.useFakeTimers()
+    const write = (chunk: string) => runtime.onPtyData(TRANSCRIPT_PANE_PTY_ID, chunk, Date.now())
+    write('\x1b]133;A\x07~/repo % amp\r\n\x1b]133;C\x07\x1b]0;amp\x07')
+    const settled = vi.fn()
+    const wait = runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 60_000 })
+    wait.then(settled, () => {})
+
+    await vi.advanceTimersByTimeAsync(POLL_INTERVAL_MS * 5)
+    expect(settled).not.toHaveBeenCalled()
+
+    write('\x1b[?1049h\x1b[H╭─ Amp ─╮\r\n│ > │')
+    await vi.advanceTimersByTimeAsync(POLL_INTERVAL_MS * 3)
+    await expect(wait).resolves.toMatchObject({ satisfied: true })
+  })
+
+  it('does not finish a command-start marker cut off by dropped output', async () => {
+    const { runtime, handle } = await createTranscriptPane({
+      paneTitle: 'Terminal',
+      foregroundProcess: 'amp',
+      launchAgent: 'amp',
+      data: ''
+    })
+    vi.useFakeTimers()
+    const write = (chunk: string) => runtime.onPtyData(TRANSCRIPT_PANE_PTY_ID, chunk, Date.now())
+    // Fish's marker carries the command line, so a cut-off one can terminate on unrelated output.
+    write('~/repo % amp\r\n\x1b]133;C;cmdline_url=am')
+    runtime.notePtyDataGap(TRANSCRIPT_PANE_PTY_ID, 4096)
+    write('╭─ Amp ─╮\r\n│ > │\x1b]0;amp\x07')
+    const wait = runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 60_000 })
+
+    await vi.advanceTimersByTimeAsync(POLL_INTERVAL_MS * 3)
+    await expect(wait).resolves.toMatchObject({ satisfied: true })
+  })
+})
diff --git a/src/main/runtime/tui-idle-evidence.test.ts b/src/main/runtime/tui-idle-evidence.test.ts
index d4c9adfa6fb1..818d96545106 100644
--- a/src/main/runtime/tui-idle-evidence.test.ts
+++ b/src/main/runtime/tui-idle-evidence.test.ts
@@ -1,9 +1,17 @@
 import { describe, expect, it } from 'vitest'
+import { detectAgentStatusFromTitle } from '../../shared/agent-title-status'
+import { getSyntheticAgentTerminalTitle } from '../../shared/synthetic-agent-title'
+import { isTuiAgent, TUI_AGENT_CONFIG } from '../../shared/tui-agent-config'
+import { getTuiAgentRestSignal } from '../../shared/tui-agent-rest-signal'
+import { isKnownReadyPromptBody } from './terminal-wait-detection'
 import {
-  hasQuietMuseReadyPrompt,
-  isTuiIdleSatisfied,
-  type TuiIdleEvidenceRecord,
-  type TuiIdleSatisfactionInput
+  evaluateTuiIdle,
+  hasFreshDoneFirstPartyStatus,
+  hasQuietReadyScreen,
+  isTuiIdleReadyVerdict,
+  nameOnlyIdleNeedsCorroboration,
+  type TuiIdleEvaluationInput,
+  type TuiIdleEvidenceRecord
 } from './tui-idle-evidence'
 
 const QUIESCENCE_MS = 3000
@@ -17,11 +25,12 @@ function record(overrides: Partial<TuiIdleEvidenceRecord> = {}): TuiIdleEvidence
   }
 }
 
-function input(overrides: Partial<TuiIdleSatisfactionInput> = {}): TuiIdleSatisfactionInput {
+function input(overrides: Partial<TuiIdleEvaluationInput> = {}): TuiIdleEvaluationInput {
   return {
     record: record(),
+    readTailBlockedReason: () => null,
     readPositiveBodyEvidence: () => false,
-    readMuseReadyBodyEvidence: () => true,
+    readQuietReadyBodyEvidence: () => true,
     agent: 'muse',
     firstPartyStatus: null,
     quiescenceMs: QUIESCENCE_MS,
@@ -29,50 +38,243 @@ function input(overrides: Partial<TuiIdleSatisfactionInput> = {}): TuiIdleSatisf
   }
 }
 
-describe('hasQuietMuseReadyPrompt', () => {
+describe('hasQuietReadyScreen', () => {
   it('settles a Muse ready screen once the stream has gone quiet', () => {
-    expect(hasQuietMuseReadyPrompt(record(), 'muse', () => true, QUIESCENCE_MS)).toBe(true)
+    expect(hasQuietReadyScreen(record(), 'muse', () => true, QUIESCENCE_MS)).toBe(true)
   })
 
   it('refuses while the pane is still streaming', () => {
     expect(
-      hasQuietMuseReadyPrompt(
-        record({ lastOutputAt: Date.now() }),
-        'muse',
-        () => true,
-        QUIESCENCE_MS
-      )
+      hasQuietReadyScreen(record({ lastOutputAt: Date.now() }), 'muse', () => true, QUIESCENCE_MS)
     ).toBe(false)
   })
 
   it('refuses without an output clock, like the tier-3 lane', () => {
     expect(
-      hasQuietMuseReadyPrompt(record({ lastOutputAt: null }), 'muse', () => true, QUIESCENCE_MS)
+      hasQuietReadyScreen(record({ lastOutputAt: null }), 'muse', () => true, QUIESCENCE_MS)
     ).toBe(false)
   })
 
   it('refuses without a ready screen', () => {
-    expect(hasQuietMuseReadyPrompt(record(), 'muse', () => false, QUIESCENCE_MS)).toBe(false)
+    expect(hasQuietReadyScreen(record(), 'muse', () => false, QUIESCENCE_MS)).toBe(false)
   })
 
   it('covers adopted panes that carry no launch metadata', () => {
-    expect(hasQuietMuseReadyPrompt(record(), null, () => true, QUIESCENCE_MS)).toBe(true)
-    expect(hasQuietMuseReadyPrompt(record(), undefined, () => true, QUIESCENCE_MS)).toBe(true)
+    expect(hasQuietReadyScreen(record(), null, () => true, QUIESCENCE_MS)).toBe(true)
+    expect(hasQuietReadyScreen(record(), undefined, () => true, QUIESCENCE_MS)).toBe(true)
   })
 
-  it('refuses another agent quoting Muse in its scrollback', () => {
-    expect(hasQuietMuseReadyPrompt(record(), 'codex', () => true, QUIESCENCE_MS)).toBe(false)
+  it('covers Codex, whose title carries no rest signal once idle', () => {
+    expect(hasQuietReadyScreen(record(), 'codex', () => true, QUIESCENCE_MS)).toBe(true)
+  })
+
+  it('refuses another agent quoting Muse or Codex in its scrollback', () => {
+    expect(hasQuietReadyScreen(record(), 'claude', () => true, QUIESCENCE_MS)).toBe(false)
   })
 })
 
-describe('isTuiIdleSatisfied muse lane', () => {
+describe('evaluateTuiIdle muse lane', () => {
   it('settles a quiet Muse pane with no title signal at all', () => {
-    expect(isTuiIdleSatisfied(input())).toBe(true)
+    expect(evaluateTuiIdle(input())).toEqual({ kind: 'ready-strong' })
   })
 
   it('lets a fresh first-party working status veto the Muse body', () => {
     expect(
-      isTuiIdleSatisfied(input({ firstPartyStatus: { state: 'working', updatedAt: Date.now() } }))
+      evaluateTuiIdle(input({ firstPartyStatus: { state: 'working', updatedAt: Date.now() } }))
+    ).toEqual({ kind: 'working' })
+  })
+})
+
+describe('evaluateTuiIdle ranking', () => {
+  const noMuse = { readQuietReadyBodyEvidence: () => false }
+
+  it('ranks a blocking prompt in the tail above an explicit idle title', () => {
+    const verdict = evaluateTuiIdle(
+      input({
+        ...noMuse,
+        agent: 'claude',
+        record: record({ lastAgentStatus: 'idle', lastOscTitle: '✳ Claude Code' }),
+        readTailBlockedReason: () => 'agent-trust-workspace'
+      })
+    )
+    expect(verdict).toEqual({ kind: 'blocked', reason: 'agent-trust-workspace' })
+  })
+
+  it("calls an agent's own idle title strong", () => {
+    const verdict = evaluateTuiIdle(
+      input({
+        ...noMuse,
+        agent: 'claude',
+        record: record({ lastAgentStatus: 'idle', lastOscTitle: '✳ Claude Code' })
+      })
+    )
+    expect(verdict).toEqual({ kind: 'ready-strong' })
+  })
+
+  it('calls a name-only title weak, even for an agent it is the only rest signal of', () => {
+    const verdict = evaluateTuiIdle(
+      input({ ...noMuse, agent: 'grok', record: record({ lastAgentStatus: 'idle' }) })
+    )
+    expect(verdict).toEqual({ kind: 'ready-weak' })
+  })
+
+  it("holds Claude's bare name to the quiet window, as an agent that announces rest itself", () => {
+    const streaming = record({
+      lastAgentStatus: 'idle',
+      lastOscTitle: 'claude',
+      lastOutputAt: Date.now()
+    })
+    expect(evaluateTuiIdle(input({ ...noMuse, agent: 'claude', record: streaming }))).toEqual({
+      kind: 'pending',
+      quietForeground: 'closed'
+    })
+    const quiet = record({ lastAgentStatus: 'idle', lastOscTitle: 'claude' })
+    expect(evaluateTuiIdle(input({ ...noMuse, agent: 'claude', record: quiet }))).toEqual({
+      kind: 'ready-weak'
+    })
+  })
+
+  it('reads working, which suppresses the screen read, from a working title', () => {
+    const verdict = evaluateTuiIdle(
+      input({ ...noMuse, agent: 'claude', record: record({ lastAgentStatus: 'working' }) })
+    )
+    expect(verdict).toEqual({ kind: 'working' })
+  })
+
+  it('keeps a first-party blocked status pending, so the screen is still read', () => {
+    const verdict = evaluateTuiIdle(
+      input({
+        ...noMuse,
+        agent: null,
+        record: record({ lastAgentStatus: 'idle', lastOscTitle: 'claude' }),
+        firstPartyStatus: { state: 'blocked', updatedAt: Date.now() }
+      })
+    )
+    expect(verdict).toEqual({ kind: 'pending', quietForeground: 'closed' })
+  })
+
+  it('leaves the quiet-foreground lane open for an unidentified pane with no title status', () => {
+    expect(evaluateTuiIdle(input({ ...noMuse, agent: null }))).toEqual({
+      kind: 'pending',
+      quietForeground: 'open'
+    })
+  })
+
+  it('closes the quiet-foreground lane for an agent with a stronger rest signal still to come', () => {
+    for (const agent of ['claude', 'codex', 'grok', 'dsh'] as const) {
+      expect(evaluateTuiIdle(input({ ...noMuse, agent }))).toEqual({
+        kind: 'pending',
+        quietForeground: 'closed'
+      })
+    }
+  })
+
+  // Why: a launched agent whose title Orca cannot classify has no other lane; closing this
+  // one for every known agent left `worker start` failing at agent_readiness (STA-7440).
+  it('keeps the quiet-foreground lane for an agent with no other rest signal, after it paints', () => {
+    for (const agent of ['amp', 'goose', 'crush', 'kimi', 'qwen-code', 'rovo', 'aug'] as const) {
+      expect(evaluateTuiIdle(input({ ...noMuse, agent }))).toEqual({
+        kind: 'pending',
+        quietForeground: 'after-paint'
+      })
+    }
+  })
+
+  it('closes the lane once any title has classified, so a title that does arrive outranks it', () => {
+    const verdict = evaluateTuiIdle(
+      input({ ...noMuse, agent: 'amp', record: record({ lastAgentStatus: 'permission' }) })
+    )
+    expect(verdict).toEqual({ kind: 'pending', quietForeground: 'closed' })
+  })
+})
+
+// Why: `none` reopens the quiet-foreground lane, which is only safe where no stronger lane
+// could have settled the wait; the identity-keyed lanes must agree with the declared signal.
+describe('rest signal agrees with the lanes that can settle a wait', () => {
+  it.each(Object.keys(TUI_AGENT_CONFIG).filter(isTuiAgent))('%s', (agent) => {
+    const signal = getTuiAgentRestSignal(agent)
+    const hookDone = hasFreshDoneFirstPartyStatus(agent, { state: 'done', updatedAt: Date.now() })
+    expect(hookDone).toBe(signal === 'hook-done')
+    let screenRead = false
+    isKnownReadyPromptBody(
+      '',
+      agent,
+      () => {
+        screenRead = true
+        return null
+      },
+      false
+    )
+    const quietScreenBody = hasQuietReadyScreen(record(), agent, () => true, QUIESCENCE_MS)
+    // Why not only ready-body: Codex keeps its stronger hook-driven title beside this lane.
+    if (quietScreenBody) {
+      expect(signal).not.toBe('none')
+    }
+    // Why a screen read also counts: Qoder's ready body is its composer, read by identity.
+    if (signal === 'ready-body') {
+      expect(quietScreenBody || screenRead).toBe(true)
+    }
+    if (signal !== 'none') {
+      return
+    }
+    expect({
+      screenRead,
+      syntheticTitle: getSyntheticAgentTerminalTitle(agent, 'done'),
+      processTitle: detectAgentStatusFromTitle(TUI_AGENT_CONFIG[agent].expectedProcess)
+    }).toEqual({ screenRead: false, syntheticTitle: null, processTitle: null })
+  })
+})
+
+describe('nameOnlyIdleNeedsCorroboration', () => {
+  it('holds agents that announce rest with an explicit title, native or synthesized', () => {
+    expect(nameOnlyIdleNeedsCorroboration('claude')).toBe(true)
+    expect(nameOnlyIdleNeedsCorroboration('codex')).toBe(true)
+  })
+
+  it('exempts agents whose name is their only rest signal', () => {
+    expect(nameOnlyIdleNeedsCorroboration('grok')).toBe(false)
+  })
+
+  it("names an adopted pane's agent from a shell auto-title", () => {
+    expect(nameOnlyIdleNeedsCorroboration(null, 'claude')).toBe(true)
+    expect(nameOnlyIdleNeedsCorroboration(null, 'claude ~/p/repo')).toBe(true)
+  })
+})
+
+describe('a DSH pane settles tui-idle on its own hook', () => {
+  const base = {
+    record: { lastAgentStatus: null, lastOutputAt: null, lastOscTitle: '\u2726 \u{1F40B} repo' },
+    rendererTitle: undefined,
+    readPositiveBodyEvidence: () => false,
+    readQuietReadyBodyEvidence: () => false,
+    readTailBlockedReason: () => null,
+    agent: 'dsh' as const,
+    firstPartyStatus: { state: 'done' as const, updatedAt: Date.now() },
+    quiescenceMs: 1_000
+  } satisfies TuiIdleEvaluationInput
+
+  const ready = (over: Partial<TuiIdleEvaluationInput> = {}) =>
+    isTuiIdleReadyVerdict(evaluateTuiIdle({ ...base, ...over }))
+
+  it('settles on a fresh first-party done', () => {
+    // The regression: DSH's title carries no idle (its rest glyph is Gemini's working one),
+    // so every title-reading tier failed and `terminal wait --for tui-idle` ran to timeout
+    // against an already-ready composer.
+    expect(ready()).toBe(true)
+  })
+
+  it('does not settle while the same pane reports working', () => {
+    expect(ready({ firstPartyStatus: { state: 'working', updatedAt: Date.now() } })).toBe(false)
+  })
+
+  it('does not settle on a stale done', () => {
+    expect(
+      ready({ firstPartyStatus: { state: 'done', updatedAt: Date.now() - 31 * 60 * 1000 } })
     ).toBe(false)
   })
+
+  it('leaves other agents on the title lanes', () => {
+    // Scoped on purpose: an agent whose hooks report child turns can emit `done` mid-turn.
+    expect(ready({ agent: 'claude' })).toBe(false)
+  })
 })
diff --git a/src/main/runtime/tui-idle-evidence.ts b/src/main/runtime/tui-idle-evidence.ts
index 0ca43b15a6cd..064477ae71c5 100644
--- a/src/main/runtime/tui-idle-evidence.ts
+++ b/src/main/runtime/tui-idle-evidence.ts
@@ -1,10 +1,21 @@
 import type { AgentStatus } from '../../shared/agent-detection'
-import { isFreshNonDoneAgentStatus } from '../../shared/agent-status-freshness'
+import {
+  AGENT_STATUS_STALE_AFTER_MS,
+  isFreshNonDoneAgentStatus
+} from '../../shared/agent-status-freshness'
 import type { AgentStatusState } from '../../shared/agent-status-types'
+import type { RuntimeTerminalWaitBlockedReason } from '../../shared/runtime-types'
 import { getSyntheticAgentTerminalTitle } from '../../shared/synthetic-agent-title'
 import { resolveExplicitTerminalTitleAgentType } from '../../shared/terminal-title-agent-type'
 import type { TuiAgent } from '../../shared/tui-agent'
-import { detectExplicitIdleStatusFromTitle } from './terminal-wait-detection'
+import { getTuiAgentRestSignal } from '../../shared/tui-agent-rest-signal'
+import type { RuntimeLeafRecord, RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
+import {
+  detectExplicitIdleStatusFromTitle,
+  detectTerminalWaitBlockedReason,
+  isKnownReadyPromptBody,
+  isQuietReadyScreenBody
+} from './terminal-wait-detection'
 
 /**
  * Ranking the evidence that a `tui-idle` wait may settle on.
@@ -15,15 +26,21 @@ import { detectExplicitIdleStatusFromTitle } from './terminal-wait-detection'
  * stale spinner (#1437) — so a busy Codex/Devin pane is routinely titled idle, and
  * accepting it satisfied a wait in ~0s mid-turn (#6011).
  *
- *   1. POSITIVE — the agent states it is ready: an explicit idle marker in its own
+ *   0. BLOCKED — the tail shows a prompt waiting on the user.
+ *   1. STRONG READY — the agent states it is ready: an explicit idle marker in its own
  *      title, or a known ready-prompt body.
- *   1b. MUSE — Muse emits no title signal at all, so its ready-screen body stands in
- *      for the positive evidence, believed only once the stream has gone quiet.
- *   2. VETO — a fresh first-party agent status (OSC 9999) saying working/blocked/
- *      waiting. The agent's own account of itself outranks anything inferred.
- *   3. ABSENCE — a name-only title, or a quiet non-shell foreground process. A last
+ *   1b. QUIET READY SCREEN — Muse and an idle Codex title no rest signal, so their
+ *      ready-screen body stands in for the strong evidence, believed only once quiet.
+ *   2. WORKING — a fresh first-party agent status (OSC 9999) saying working/blocked/
+ *      waiting, or a working title. The agent's own account of itself outranks anything
+ *      inferred.
+ *   3. WEAK READY — a name-only title, or a quiet non-shell foreground process. A last
  *      resort, and only once sustained.
  *
+ * Why weak ready is a verdict class rather than a per-evidence flag: none of it can see a
+ * start-up dialog the line tail lost (Claude's workspace trust), so ONLY the poll may settle
+ * on it, after the rendered screen shows no blocker. Synchronous sites settle on tiers 0-1b.
+ *
  * Why derived here rather than stamped onto the record at write time: `syncWindowGraph`
  * rebuilds every leaf from an explicit field list, so a bespoke provenance field is
  * silently dropped on any renderer publish and the verdict silently flips. `lastOscTitle`
@@ -55,19 +72,53 @@ export function hasExplicitIdleTitle(
   return false
 }
 
+/**
+ * Tier 1, first-party: the agent's own hook says the turn ENDED.
+ *
+ * Why DSH needs its own lane: the other tiers all read the title, and DSH cannot carry idle
+ * there. Its rest prefix is `✦`, which is Gemini's WORKING glyph, so the title detector
+ * deliberately reports no status for a DSH pane at all (see agent-title-status.ts) — which
+ * left `tui-idle` with nothing to settle on, and a supervised worker waiting on a ready
+ * composer until its timeout.
+ *
+ * Why a hook `done` is trustworthy here where a title would not be: it is the agent's own
+ * account of its own turn, and `normalizeDshEvent` drops SubagentStart/SubagentStop, so a
+ * `done` row for a DSH pane is the LEAD's, never a child's finishing early.
+ *
+ * Scoped rather than general: for agents whose hooks do report child turns, a `done` row
+ * can arrive mid-turn, and settling on it is exactly the #6011 class this file exists to
+ * prevent.
+ */
+export function hasFreshDoneFirstPartyStatus(
+  agent: TuiAgent | null | undefined,
+  status: FirstPartyAgentStatus,
+  staleAfterMs = AGENT_STATUS_STALE_AFTER_MS
+): boolean {
+  if (agent !== 'dsh' || status?.state !== 'done') {
+    return false
+  }
+  return Date.now() - status.updatedAt <= staleAfterMs
+}
+
 /** Tier 2: the agent's own status stream says this turn is still open. */
 export function hasFreshWorkingFirstPartyStatus(status: FirstPartyAgentStatus): boolean {
   return isFreshNonDoneAgentStatus(status ?? undefined)
 }
 
+/** Agents that paint their own explicit rest title (Claude's `✳`). Gemini's `◇` would qualify
+ *  but is not yet held to it. */
+const NATIVE_EXPLICIT_IDLE_TITLE_AGENTS: ReadonlySet<TuiAgent> = new Set(['claude'])
+
 /**
- * Whether a name-only title from `agent` may be held to the tier-3 quiescence demand.
+ * Whether a name-only title from `agent` must be corroborated by a quiet stream.
  *
- * Only for agents that go on to announce rest with an explicit title of their own (the
- * hook-driven `Codex ready` / `Devin ready`). Grok, Copilot, Aider, Mimo, agy and
- * OpenCode emit their NAME and nothing more at rest, so holding them to it leaves no
- * settle signal at all: a real idle Grok pane repaints its banner about four times a
- * second forever, so the stream never quiesces and the wait runs to timeout.
+ * Only for agents that announce rest with an explicit title of their own: the hook-driven
+ * `Codex ready` / `Devin ready`, or Claude's `✳`. For them the bare name is not a rest signal —
+ * a shell auto-title (`claude`, `claude ~/repo`) names the agent from the moment it starts, over
+ * a start-up dialog or a busy turn alike. Grok, Copilot, Aider, Mimo, agy and OpenCode emit
+ * their NAME and nothing more at rest, so holding them to it leaves no settle signal at all:
+ * a real idle Grok pane repaints its banner about four times a second forever, so the stream
+ * never quiesces and the wait runs to timeout.
  */
 export function nameOnlyIdleNeedsCorroboration(
   agent: TuiAgent | null | undefined,
@@ -76,7 +127,11 @@ export function nameOnlyIdleNeedsCorroboration(
   // Why the title fallback: an adopted pane carries no launch metadata, but its
   // name-only title is exactly the thing that names the agent.
   const resolved = agent ?? (title ? resolveExplicitTerminalTitleAgentType(title) : null)
-  return getSyntheticAgentTerminalTitle(resolved, 'done') !== null
+  return (
+    resolved !== null &&
+    (NATIVE_EXPLICIT_IDLE_TITLE_AGENTS.has(resolved) ||
+      getSyntheticAgentTerminalTitle(resolved, 'done') !== null)
+  )
 }
 
 /** Tier 3: a title-derived idle, usable only once the stream has also gone quiet. */
@@ -103,17 +158,28 @@ export function hasSustainedTitleIdle(
 }
 
 /**
- * Tier 3, cold start: Orca launched a known agent on this PTY, so a quiet non-shell
- * foreground process is an agent still booting, not one sitting at its prompt. Resolving
- * on it is what let `dispatch --inject` write into a TUI that had not yet attached its
- * reader and silently lose the prompt (#9976).
+ * When a quiet non-shell foreground process may settle a pending wait.
+ * - `closed`: the agent has a stronger rest signal, so its silence is boot, not rest.
+ *   Resolving on it let `dispatch --inject` write into a TUI that had not yet attached
+ *   its reader and silently lose the prompt (#9976).
+ * - `after-paint`: Orca knows an agent runs here but it has no other rest signal, so this
+ *   lane is its only one. A TUI that has painted nothing yet is still booting.
+ * - `open`: nothing is known about the pane, so a missing output clock also counts as quiet
+ *   (see isQuietForQuiescence).
  */
-export function quietForegroundProcessProvesTuiIdle(agent: TuiAgent | null | undefined): boolean {
-  return !agent
+export type QuietForegroundLane = 'closed' | 'after-paint' | 'open'
+
+function quietForegroundLane(agent: TuiAgent | null | undefined): QuietForegroundLane {
+  if (!agent) {
+    return 'open'
+  }
+  return getTuiAgentRestSignal(agent) === 'none' ? 'after-paint' : 'closed'
 }
 
-export type TuiIdleSatisfactionInput = {
+export type TuiIdleEvaluationInput = {
   record: TuiIdleEvidenceRecord
+  /** Tier 0: a blocking prompt in the line tail. */
+  readTailBlockedReason: () => RuntimeTerminalWaitBlockedReason | null
   /** Renderer-synced pane/tab title, when one exists. */
   rendererTitle?: string | null
   /** Tier 1 body evidence: a known ready prompt, or an adopted pane's explicit title.
@@ -121,63 +187,184 @@ export type TuiIdleSatisfactionInput = {
    *  (~11us and a multi-KB string on a full tail); the title check below usually answers
    *  first, and then none of that has to happen at all. */
   readPositiveBodyEvidence: () => boolean
-  /** Tier 1b body evidence: a Muse ready screen. Thunk for the same reason as above. */
-  readMuseReadyBodyEvidence: () => boolean
+  /** Tier 1b body evidence: a Muse or Codex ready screen. Thunk for the same reason as above. */
+  readQuietReadyBodyEvidence: () => boolean
   agent: TuiAgent | null | undefined
   firstPartyStatus: FirstPartyAgentStatus
   quiescenceMs: number
 }
 
+export type TuiIdleVerdict =
+  | { kind: 'blocked'; reason: RuntimeTerminalWaitBlockedReason }
+  | { kind: 'ready-strong' }
+  /** Settles only on the poll, after a rendered-screen read finds no blocker. */
+  | { kind: 'ready-weak' }
+  /** The agent says it is mid-turn: nothing may settle, and its screen is not read. */
+  | { kind: 'working' }
+  | { kind: 'pending'; quietForeground: QuietForegroundLane }
+
+const READY_STRONG: TuiIdleVerdict = { kind: 'ready-strong' }
+const READY_WEAK: TuiIdleVerdict = { kind: 'ready-weak' }
+const WORKING: TuiIdleVerdict = { kind: 'working' }
+
+const QUIET_READY_SCREEN_AGENTS: ReadonlySet<TuiAgent> = new Set(['muse', 'codex'])
+
 /**
- * Tier 1b: a Muse ready screen in the body, believed only once the stream has gone quiet.
+ * Tier 1b: a ready screen in the body, believed only once the stream has gone quiet.
  *
- * Muse is the one agent with no title signal at all — its OSC title is the bare cwd and
- * never changes — so neither the explicit-idle nor the sustained-title lane can fire.
- * The ready screen proves the TUI is up; the quiescence demand keeps a mid-turn
- * streaming pane from satisfying, mirroring the codex tier-3 lane's
- * positive-evidence-plus-quiet shape. Scoped to Muse and agent-unknown panes: another
- * agent's scrollback quoting Muse must not settle its wait.
+ * Muse's OSC title is the bare cwd and never changes, and an idle Codex titles its pane with
+ * the cwd (plus a thread name) and no agent name, so neither the explicit-idle nor the
+ * sustained-title lane can fire. The ready screen proves the TUI is up; the quiescence
+ * demand keeps a mid-turn streaming pane from satisfying, mirroring the tier-3 lane's
+ * positive-evidence-plus-quiet shape. Scoped to those agents and agent-unknown panes (which
+ * read only Muse's screen): another agent's scrollback quoting them must not settle its wait.
  */
-export function hasQuietMuseReadyPrompt(
+export function hasQuietReadyScreen(
   record: TuiIdleEvidenceRecord,
   agent: TuiAgent | null | undefined,
   readBodyEvidence: () => boolean,
   quiescenceMs: number
 ): boolean {
-  if (agent !== null && agent !== undefined && agent !== 'muse') {
-    return false
-  }
-  if (!readBodyEvidence()) {
+  if (agent && !QUIET_READY_SCREEN_AGENTS.has(agent)) {
     return false
   }
   // Why: same rule as the tier-3 lane — without an output clock there is no
   // corroboration available, so hold out instead of settling.
-  if (record.lastOutputAt === null) {
+  if (record.lastOutputAt === null || Date.now() - record.lastOutputAt < quiescenceMs) {
     return false
   }
-  return Date.now() - record.lastOutputAt >= quiescenceMs
+  // Why last: a streaming pane never pays for the screen projection.
+  return readBodyEvidence()
 }
 
-/** The one place the tiers are combined; every satisfaction site routes here. */
-export function isTuiIdleSatisfied(input: TuiIdleSatisfactionInput): boolean {
+/** The one place the tiers are combined; every settle site branches only on the verdict. */
+export function evaluateTuiIdle(input: TuiIdleEvaluationInput): TuiIdleVerdict {
+  const blockedReason = input.readTailBlockedReason()
+  if (blockedReason) {
+    return { kind: 'blocked', reason: blockedReason }
+  }
+  // Qoder publishes "Ready" before its trust dialog is dismissed; only its composer proves input is live.
+  if (input.agent === 'qoder') {
+    if (
+      hasFreshWorkingFirstPartyStatus(input.firstPartyStatus) ||
+      input.record.lastAgentStatus === 'working'
+    ) {
+      return WORKING
+    }
+    return input.readPositiveBodyEvidence()
+      ? READY_STRONG
+      : { kind: 'pending', quietForeground: 'closed' }
+  }
   // Why the title before the body: both are tier 1, so either settles, but the title is a
   // memoized lookup and the body is a fresh multi-KB scan. Same verdict, cheaper order.
   if (hasExplicitIdleTitle(input.record, input.rendererTitle) || input.readPositiveBodyEvidence()) {
-    return true
+    return READY_STRONG
+  }
+  // Why beside the title lane, not after the veto: both are tier 1, and a first-party `done`
+  // and a fresh `working` cannot both hold — the same row carries one state.
+  if (hasFreshDoneFirstPartyStatus(input.agent, input.firstPartyStatus)) {
+    return READY_STRONG
   }
   if (hasFreshWorkingFirstPartyStatus(input.firstPartyStatus)) {
-    return false
+    // Why blocked/waiting stays pending: the agent says it is waiting on the user, which is
+    // when a dialog is on screen, so the screen read must still run.
+    return input.firstPartyStatus?.state === 'working'
+      ? WORKING
+      : { kind: 'pending', quietForeground: 'closed' }
   }
   // Why after the veto: a first-party working account outranks inferred body evidence.
+  // Why before the working title: Codex can leave a stale spinner title after a turn, and a
+  // live spinner emits output every ~100 ms, so a spinning pane is never quiet here.
   if (
-    hasQuietMuseReadyPrompt(
+    hasQuietReadyScreen(
       input.record,
       input.agent,
-      input.readMuseReadyBodyEvidence,
+      input.readQuietReadyBodyEvidence,
       input.quiescenceMs
     )
   ) {
-    return true
+    return READY_STRONG
+  }
+  if (input.record.lastAgentStatus === 'working') {
+    return WORKING
+  }
+  if (hasSustainedTitleIdle(input.record, input.agent, input.quiescenceMs)) {
+    return READY_WEAK
+  }
+  return {
+    kind: 'pending',
+    quietForeground:
+      input.record.lastAgentStatus === null ? quietForegroundLane(input.agent) : 'closed'
+  }
+}
+
+export function isTuiIdleReadyVerdict(verdict: TuiIdleVerdict): boolean {
+  return verdict.kind === 'ready-strong' || verdict.kind === 'ready-weak'
+}
+
+/** The runtime state every tui-idle site reads its evidence from. */
+export type TuiIdleEvidenceSource = {
+  quiescenceMs: number
+  getTabTitle(tabId: string): string | null
+  getAdoptedPtyIdleStatus(pty: RuntimePtyWorktreeRecord): AgentStatus | null
+  getPaneAgent(ptyId: string | null | undefined): TuiAgent | null
+  getFirstPartyAgentStatus(ptyId: string | null | undefined): FirstPartyAgentStatus
+  readScreenLines(ptyId: string | null | undefined): readonly string[] | null
+}
+
+function lazyWaitText(readWaitText: () => string): () => string {
+  let waitText: string | null = null
+  return () => (waitText ??= readWaitText())
+}
+
+export function leafTuiIdleEvidence(
+  source: TuiIdleEvidenceSource,
+  leaf: RuntimeLeafRecord,
+  readWaitText: () => string
+): TuiIdleEvaluationInput {
+  const waitText = lazyWaitText(readWaitText)
+  const agent = source.getPaneAgent(leaf.ptyId)
+  return {
+    record: leaf,
+    readTailBlockedReason: () => detectTerminalWaitBlockedReason(waitText()),
+    rendererTitle: leaf.paneTitle ?? source.getTabTitle(leaf.tabId),
+    readPositiveBodyEvidence: () =>
+      isKnownReadyPromptBody(
+        waitText(),
+        agent,
+        () => source.readScreenLines(leaf.ptyId),
+        leaf.lastOutputAt !== null
+      ),
+    readQuietReadyBodyEvidence: () =>
+      isQuietReadyScreenBody(waitText(), agent, () => source.readScreenLines(leaf.ptyId)),
+    agent,
+    firstPartyStatus: source.getFirstPartyAgentStatus(leaf.ptyId),
+    quiescenceMs: source.quiescenceMs
+  }
+}
+
+export function ptyTuiIdleEvidence(
+  source: TuiIdleEvidenceSource,
+  pty: RuntimePtyWorktreeRecord,
+  readWaitText: () => string
+): TuiIdleEvaluationInput {
+  const waitText = lazyWaitText(readWaitText)
+  const agent = source.getPaneAgent(pty.ptyId)
+  return {
+    record: pty,
+    readTailBlockedReason: () => detectTerminalWaitBlockedReason(waitText()),
+    readPositiveBodyEvidence: () =>
+      (agent !== 'qoder' && source.getAdoptedPtyIdleStatus(pty) === 'idle') ||
+      isKnownReadyPromptBody(
+        waitText(),
+        agent,
+        () => source.readScreenLines(pty.ptyId),
+        pty.lastOutputAt !== null
+      ),
+    readQuietReadyBodyEvidence: () =>
+      isQuietReadyScreenBody(waitText(), agent, () => source.readScreenLines(pty.ptyId)),
+    agent,
+    firstPartyStatus: source.getFirstPartyAgentStatus(pty.ptyId),
+    quiescenceMs: source.quiescenceMs
   }
-  return hasSustainedTitleIdle(input.record, input.agent, input.quiescenceMs)
 }
diff --git a/src/main/runtime/tui-idle-weak-evidence-seam.test.ts b/src/main/runtime/tui-idle-weak-evidence-seam.test.ts
new file mode 100644
index 000000000000..d608666fbdcd
--- /dev/null
+++ b/src/main/runtime/tui-idle-weak-evidence-seam.test.ts
@@ -0,0 +1,107 @@
+/**
+ * The seam a new weak-ready rank plugs into. Weak ready is a verdict class, not a per-evidence
+ * flag: no settle site may act on it before a rendered-screen read, whatever evidence produced
+ * it. The stand-in below fires over Claude's trust dialog itself, as a composer-ready signal
+ * such as bracketed paste would, and the dialog must still win.
+ */
+
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { createTranscriptPane, TRANSCRIPT_PANE_PTY_ID } from './agent-transcript-pane-test-harness'
+import type * as TuiIdleEvidence from './tui-idle-evidence'
+
+const syntheticWeakEvidence = vi.hoisted(() => ({ fires: false }))
+
+vi.mock('./tui-idle-evidence', async (importOriginal) => {
+  const actual = await importOriginal<typeof TuiIdleEvidence>()
+  return {
+    ...actual,
+    evaluateTuiIdle: (
+      ...args: Parameters<typeof actual.evaluateTuiIdle>
+    ): TuiIdleEvidence.TuiIdleVerdict => {
+      const verdict = actual.evaluateTuiIdle(...args)
+      return syntheticWeakEvidence.fires && verdict.kind === 'pending'
+        ? { kind: 'ready-weak' }
+        : verdict
+    }
+  }
+})
+
+const POLL_INTERVAL_MS = 2_000
+
+function readDialog(): { data: string; size: { cols: number; rows: number } } {
+  const base = join(__dirname, '__fixtures__', 'claude-dialog-trust-workspace')
+  const meta: { cols: number; rows: number } = JSON.parse(readFileSync(`${base}.meta.json`, 'utf8'))
+  return { data: readFileSync(`${base}.txt`, 'utf8'), size: { cols: meta.cols, rows: meta.rows } }
+}
+
+async function createPane() {
+  const { data, size } = readDialog()
+  const { runtime, handle } = await createTranscriptPane({
+    paneTitle: 'Terminal',
+    foregroundProcess: 'claude',
+    launchAgent: 'claude',
+    size,
+    data: ''
+  })
+  vi.useFakeTimers()
+  const write = (chunk: string) => runtime.onPtyData(TRANSCRIPT_PANE_PTY_ID, chunk, Date.now())
+  const paintDialog = () => {
+    const bytes = Buffer.from(data, 'utf8')
+    const decoder = new TextDecoder()
+    for (let offset = 0; offset < bytes.length; offset += 1024) {
+      write(decoder.decode(bytes.subarray(offset, offset + 1024), { stream: true }))
+    }
+  }
+  const wait = () => {
+    const settled = vi.fn()
+    const promise = runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 60_000 })
+    promise.then(settled, () => {})
+    return { promise, settled }
+  }
+  return { write, paintDialog, wait }
+}
+
+describe('a new weak-ready rank', () => {
+  afterEach(() => {
+    syntheticWeakEvidence.fires = false
+    vi.useRealTimers()
+  })
+
+  it('settles a pane with nothing on screen, so the stand-in reaches the settle sites', async () => {
+    const pane = await createPane()
+    pane.write('starting\r\n')
+    syntheticWeakEvidence.fires = true
+    const { promise } = pane.wait()
+    await vi.advanceTimersByTimeAsync(0)
+    await expect(promise).resolves.toMatchObject({ satisfied: true })
+  })
+
+  it('reports the dialog to a wait registered after it painted', async () => {
+    const pane = await createPane()
+    pane.paintDialog()
+    syntheticWeakEvidence.fires = true
+    const { promise } = pane.wait()
+    await vi.advanceTimersByTimeAsync(0)
+    await expect(promise).resolves.toMatchObject({
+      satisfied: false,
+      blockedReason: 'agent-trust-workspace'
+    })
+  })
+
+  it('reports the dialog when a title change offers the evidence before it painted', async () => {
+    const pane = await createPane()
+    const { promise, settled } = pane.wait()
+    syntheticWeakEvidence.fires = true
+    pane.write('\x1b]0;claude ~/p/repo\x07')
+    await vi.advanceTimersByTimeAsync(0)
+    expect(settled).not.toHaveBeenCalled()
+    pane.paintDialog()
+    await vi.advanceTimersByTimeAsync(POLL_INTERVAL_MS)
+    await expect(promise).resolves.toMatchObject({
+      satisfied: false,
+      blockedReason: 'agent-trust-workspace'
+    })
+  })
+})
diff --git a/src/main/runtime/zcode-readiness-transcript.test.ts b/src/main/runtime/zcode-readiness-transcript.test.ts
index 2319915ab681..bd9909f89de7 100644
--- a/src/main/runtime/zcode-readiness-transcript.test.ts
+++ b/src/main/runtime/zcode-readiness-transcript.test.ts
@@ -21,6 +21,18 @@ function readTranscript(): string {
 }
 
 describe('ZCode readiness from captured terminal bytes', () => {
+  it('accepts a fresh composer after the renderer adopts the terminal handle', async () => {
+    const { runtime, handle } = await createTranscriptPane({
+      paneTitle: 'worker-zcode',
+      foregroundProcess: 'zcode',
+      launchAgent: 'zcode',
+      data: '\x1b[?1049h╭'
+    })
+    await expect(
+      runtime.waitForFreshWorkerComposer(handle, 'zcode', 1_000)
+    ).resolves.toBeUndefined()
+  })
+
   it('never emits an OSC title, so no title lane can settle its wait', () => {
     const data = readTranscript()
     expect(data).toContain(String.fromCharCode(27))
diff --git a/src/main/skills/discovery-filter-sharing.test.ts b/src/main/skills/discovery-filter-sharing.test.ts
index 14f755d01009..14fe9faf580c 100644
--- a/src/main/skills/discovery-filter-sharing.test.ts
+++ b/src/main/skills/discovery-filter-sharing.test.ts
@@ -86,17 +86,20 @@ it('retains a newly requested name when its previously observed root becomes una
     const args = { homeDir: root, repos: [], includeCwd: false, sourceKinds: ['home' as const] }
     await repair.discoverSkills({ ...args, names: ['skill-0'] })
     const original = SkillScanCoalescer.prototype.run
-    vi.spyOn(SkillScanCoalescer.prototype, 'run').mockImplementation(
-      function (this: SkillScanCoalescer<unknown>, key, options, task) {
-        if (
-          key === `home\0${join(root, '.agents', 'skills')}` ||
-          key.startsWith(`home\0${join(root, '.agents', 'skills')}\0`)
-        ) {
-          return Promise.reject(new SkillScanShedError())
-        }
-        return original.call(this, key, options, task)
+    vi.spyOn(SkillScanCoalescer.prototype, 'run').mockImplementation(function (
+      this: SkillScanCoalescer<unknown>,
+      key,
+      options,
+      task
+    ) {
+      if (
+        key === `home\0${join(root, '.agents', 'skills')}` ||
+        key.startsWith(`home\0${join(root, '.agents', 'skills')}\0`)
+      ) {
+        return Promise.reject(new SkillScanShedError())
       }
-    )
+      return original.call(this, key, options, task)
+    })
     const next = await repair.discoverSkills({ ...args, names: ['skill-47'] })
     expect(next.skills.map((skill) => skill.name)).toEqual(['skill-47'])
     expect(next.sources.find((source) => source.id === 'home-agents')?.skippedReason).toBe(
diff --git a/src/main/source-control/hosted-review-branch-cache.ts b/src/main/source-control/hosted-review-branch-cache.ts
index 0e6f207ab9c5..7a9f02e50c8a 100644
--- a/src/main/source-control/hosted-review-branch-cache.ts
+++ b/src/main/source-control/hosted-review-branch-cache.ts
@@ -13,6 +13,15 @@ import {
   settleDetachedLookup,
   settleLookup
 } from './hosted-review-unsettled-lookups'
+import {
+  __resetHostedReviewInflightLookupsForTests,
+  expireOverdueInflight,
+  getInflightLookup,
+  releaseInflight,
+  retireInflightWithPrefix,
+  trackInflight,
+  type InflightToken
+} from './hosted-review-inflight-lookups'
 import {
   __resetHostedReviewScopeGenerationsForTests,
   bumpScopeGeneration,
@@ -29,7 +38,6 @@ import {
   ACTIVE_REFRESH_INTERVAL_MS,
   HOSTED_REVIEW_LOOKUP_DEADLINE_MS,
   MAX_BRANCH_MAP_ENTRIES,
-  MAX_INFLIGHT_LOOKUPS,
   NO_REVIEW_REFRESH_INTERVAL_MS
 } from './hosted-review-refresh-pacing'
 
@@ -59,22 +67,7 @@ type CacheEntry = {
   startedAt: number
 }
 
-declare const inflightTokenBrand: unique symbol
-
-/** Identity token for one lookup; only ever compared by reference. */
-type InflightToken = { readonly [inflightTokenBrand]?: never }
-
-type InflightRecord = {
-  /** Identity, so a detached lookup can only ever clear its own entry. */
-  token: InflightToken
-  startedAt: number
-  promise: Promise<HostedReviewInfo | null>
-  /** Releases the callers and unpins the branch; idempotent. */
-  expire: () => void
-}
-
 const entries = new Map<string, CacheEntry>()
-const inflight = new Map<string, InflightRecord>()
 // Why: NUL is the one byte a repo path or branch name cannot contain, so a
 // scope prefix cannot straddle a component boundary — invalidating `/a/b` must
 // not also flush the unrelated repo at `/a/b c`.
@@ -158,53 +151,6 @@ function storeEntry(key: string, entry: CacheEntry): void {
   }
 }
 
-/** Clears the key's in-flight record only if it is still this lookup's. */
-function releaseInflight(key: string, token: InflightToken): boolean {
-  if (inflight.get(key)?.token !== token) {
-    return false
-  }
-  inflight.delete(key)
-  return true
-}
-
-/**
- * Expires records that outlived the deadline without their timer firing. Main's
- * timers are suspended across a system sleep, so wall-clock age — not
- * `setTimeout` alone — is what actually bounds how long a branch stays pinned.
- *
- * The guarantee covers tracked records only: one the size cap evicted is no
- * longer reachable here and falls back to its own suspended timer.
- */
-function expireOverdueInflight(now: number): void {
-  let overdue: InflightRecord[] | undefined
-  for (const record of inflight.values()) {
-    if (now - record.startedAt >= HOSTED_REVIEW_LOOKUP_DEADLINE_MS) {
-      overdue ??= []
-      overdue.push(record)
-    }
-  }
-  // Expire after the walk: each one deletes its own entry from the map.
-  for (const record of overdue ?? []) {
-    record.expire()
-  }
-}
-
-function trackInflight(key: string, record: InflightRecord): void {
-  inflight.set(key, record)
-  while (inflight.size > MAX_INFLIGHT_LOOKUPS) {
-    const oldest = inflight.keys().next().value
-    if (oldest === undefined) {
-      break
-    }
-    // Why: drop the record without expiring it — its own deadline still
-    // releases its callers, and evicting is about memory, not about failing.
-    // It does forfeit the sweep's wall-clock release, so the cap must stay far
-    // above realistic concurrency: below it, sleep-suspended timers are all an
-    // evicted record's callers have left.
-    inflight.delete(oldest)
-  }
-}
-
 /**
  * Drops every cached answer for a repo. Called when Orca itself opens a review,
  * so the new one is visible immediately instead of after the no-review interval.
@@ -221,13 +167,14 @@ export function invalidateHostedReviewBranchCache(
       entries.delete(key)
     }
   }
+  retireInflightWithPrefix(prefix)
   dropFailuresWithPrefix(prefix)
 }
 
 /** @internal - exposed for tests only */
 export function __resetHostedReviewBranchCacheForTests(): void {
   entries.clear()
-  inflight.clear()
+  __resetHostedReviewInflightLookupsForTests()
   __resetHostedReviewLookupBackoffForTests()
   __resetHostedReviewActiveClaimsForTests()
   __resetUnsettledHostedReviewLookupsForTests()
@@ -244,7 +191,7 @@ export function __resetHostedReviewBranchCacheForTests(): void {
  * was about to give the real one.
  */
 function canAdoptDetachedAnswer(key: string, startedAt: number): boolean {
-  if (inflight.has(key)) {
+  if (getInflightLookup(key) !== undefined) {
     return false
   }
   const current = entries.get(key)
@@ -341,7 +288,7 @@ function startLookup(
       // straggler and has to prove it still outranks what is there.
       const stored =
         generation === scopeGeneration(scope) &&
-        (inflight.get(key)?.token === token || canAdoptDetachedAnswer(key, startedAt))
+        (getInflightLookup(key)?.token === token || canAdoptDetachedAnswer(key, startedAt))
       if (stored) {
         storeEntry(key, { review, fetchedAt: Date.now(), headOid, startedAt })
       }
@@ -360,7 +307,7 @@ function startLookup(
       }
       // Why: a record the size cap dropped has a live successor, and backing the
       // branch off would slow the retry that is already running.
-      if (inflight.get(key)?.token === token) {
+      if (getInflightLookup(key)?.token === token) {
         noteFailure(key)
       }
       // Why: the last good review beats an error card here just as it does on
@@ -417,7 +364,7 @@ export async function withHostedReviewBranchCache(
     return cached.review
   }
 
-  const pending = inflight.get(key)
+  const pending = getInflightLookup(key)
   if (pending) {
     return pending.promise
   }
diff --git a/src/main/source-control/hosted-review-inflight-invalidation.test.ts b/src/main/source-control/hosted-review-inflight-invalidation.test.ts
new file mode 100644
index 000000000000..6d8653ba76bc
--- /dev/null
+++ b/src/main/source-control/hosted-review-inflight-invalidation.test.ts
@@ -0,0 +1,271 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { HostedReviewInfo } from '../../shared/hosted-review'
+import {
+  __resetHostedReviewBranchCacheForTests,
+  invalidateHostedReviewBranchCache,
+  withHostedReviewBranchCache
+} from './hosted-review-branch-cache'
+import {
+  HOSTED_REVIEW_LOOKUP_DEADLINE_MS,
+  MAX_UNSETTLED_LOOKUP_KEYS,
+  MAX_UNSETTLED_LOOKUPS_PER_KEY
+} from './hosted-review-refresh-pacing'
+
+const identity = {
+  repoPath: '/repo',
+  executionHostId: 'ssh:host-a' as const,
+  branch: 'feature/review',
+  localGitExecOptions: { admissionTier: 'background' }
+}
+const options = { headOid: null }
+const review: HostedReviewInfo = {
+  provider: 'gitlab',
+  number: 7,
+  title: 'Created review',
+  state: 'open',
+  url: 'https://git.example/team/repo/merge_requests/7',
+  status: 'neutral',
+  updatedAt: '',
+  mergeable: 'UNKNOWN'
+}
+
+beforeEach(() => {
+  __resetHostedReviewBranchCacheForTests()
+  vi.useFakeTimers()
+  vi.setSystemTime(1_000_000)
+})
+
+afterEach(() => {
+  __resetHostedReviewBranchCacheForTests()
+  vi.useRealTimers()
+})
+
+describe('hosted review in-flight invalidation', () => {
+  it.each(['before', 'after'] as const)(
+    'refreshes post-create readers when the old request finishes %s its replacement',
+    async (completionOrder) => {
+      const oldResponse = Promise.withResolvers<HostedReviewInfo | null>()
+      const freshResponse = Promise.withResolvers<HostedReviewInfo | null>()
+      const oldLookup = vi.fn(() => oldResponse.promise)
+      const freshLookup = vi.fn(() => freshResponse.promise)
+      const admitted = withHostedReviewBranchCache(identity, options, oldLookup)
+      expect(
+        await withHostedReviewBranchCache(
+          { ...identity, localGitExecOptions: { admissionTier: 'interactive' } },
+          options,
+          async () => null
+        )
+      ).toBeNull()
+
+      invalidateHostedReviewBranchCache(identity.repoPath, identity.executionHostId)
+      const next = withHostedReviewBranchCache(identity, options, freshLookup)
+      const concurrent = withHostedReviewBranchCache(identity, options, freshLookup)
+      try {
+        expect(freshLookup).toHaveBeenCalledTimes(1)
+        if (completionOrder === 'before') {
+          oldResponse.resolve(null)
+          expect(await admitted).toBeNull()
+        }
+        freshResponse.resolve(review)
+        expect(await next).toEqual(review)
+        expect(await concurrent).toEqual(review)
+        if (completionOrder === 'after') {
+          oldResponse.resolve(null)
+          expect(await admitted).toBeNull()
+        }
+        expect(await withHostedReviewBranchCache(identity, options, freshLookup)).toEqual(review)
+        expect(oldLookup).toHaveBeenCalledTimes(1)
+        expect(freshLookup).toHaveBeenCalledTimes(1)
+      } finally {
+        oldResponse.resolve(null)
+        freshResponse.resolve(review)
+        await Promise.all([admitted, next, concurrent])
+      }
+    }
+  )
+
+  it('does not make a post-create reader wait for a stale request deadline', async () => {
+    const oldResponse = Promise.withResolvers<HostedReviewInfo | null>()
+    const admitted = withHostedReviewBranchCache(identity, options, () => oldResponse.promise)
+    const admittedResult = admitted.catch(() => null)
+    await vi.advanceTimersByTimeAsync(10_000)
+    invalidateHostedReviewBranchCache(identity.repoPath, identity.executionHostId)
+    const freshLookup = vi.fn(async () => review)
+    let settled = false
+    const next = withHostedReviewBranchCache(identity, options, freshLookup).then((value) => {
+      settled = true
+      return value
+    })
+    try {
+      await vi.advanceTimersByTimeAsync(0)
+      expect(settled).toBe(true)
+      expect(await next).toEqual(review)
+      expect(freshLookup).toHaveBeenCalledTimes(1)
+      await vi.advanceTimersByTimeAsync(HOSTED_REVIEW_LOOKUP_DEADLINE_MS - 10_000)
+      expect(await admittedResult).toEqual(review)
+      expect(await withHostedReviewBranchCache(identity, options, freshLookup)).toEqual(review)
+      expect(freshLookup).toHaveBeenCalledTimes(2)
+    } finally {
+      oldResponse.resolve(null)
+      await Promise.all([admittedResult, next])
+    }
+  })
+
+  it('discards a retired answer that landed with no replacement to outrank it', async () => {
+    const oldResponse = Promise.withResolvers<HostedReviewInfo | null>()
+    const admitted = withHostedReviewBranchCache(identity, options, () => oldResponse.promise)
+    invalidateHostedReviewBranchCache(identity.repoPath, identity.executionHostId)
+    // Nothing replaced it, so only the scope generation stands between this
+    // pre-invalidation "no review" and the key it no longer owns. Adopting it
+    // would read as fresh and short-circuit the lookup for the review Orca just
+    // opened.
+    oldResponse.resolve(null)
+    expect(await admitted).toBeNull()
+    const freshLookup = vi.fn(async () => review)
+    expect(await withHostedReviewBranchCache(identity, options, freshLookup)).toEqual(review)
+    expect(freshLookup).toHaveBeenCalledTimes(1)
+  })
+
+  it('keeps other hosts, paths and their pending promises isolated', async () => {
+    const others = [
+      { ...identity, executionHostId: 'local' as const },
+      { ...identity, executionHostId: 'ssh:host-b' as const },
+      { ...identity, repoPath: '/repo-other' }
+    ].map((key) => {
+      const response = Promise.withResolvers<HostedReviewInfo | null>()
+      const lookup = vi.fn(() => response.promise)
+      return { key, response, lookup, admitted: withHostedReviewBranchCache(key, options, lookup) }
+    })
+    invalidateHostedReviewBranchCache(identity.repoPath, identity.executionHostId)
+    const readers = others.map(({ key, lookup }) =>
+      withHostedReviewBranchCache(key, options, lookup)
+    )
+    for (const other of others) {
+      expect(other.lookup).toHaveBeenCalledTimes(1)
+      other.response.resolve(review)
+    }
+    expect(await Promise.all(readers)).toEqual([review, review, review])
+    await Promise.all(others.map((other) => other.admitted))
+  })
+
+  it('sweeps invalidated readers after sleep without expiring their replacement', async () => {
+    const oldResponse = Promise.withResolvers<HostedReviewInfo | null>()
+    const freshResponse = Promise.withResolvers<HostedReviewInfo | null>()
+    const admitted = withHostedReviewBranchCache(identity, options, () => oldResponse.promise)
+    const admittedResult = admitted.catch((error: unknown) => error)
+    invalidateHostedReviewBranchCache(identity.repoPath, identity.executionHostId)
+    vi.setSystemTime(Date.now() + 90_000)
+    const freshLookup = vi.fn(() => freshResponse.promise)
+    const replacement = withHostedReviewBranchCache(identity, options, freshLookup).catch(
+      (error: unknown) => error
+    )
+    vi.setSystemTime(Date.now() + 40_000)
+    const joined = withHostedReviewBranchCache(identity, options, freshLookup).catch(
+      (error: unknown) => error
+    )
+    try {
+      await vi.advanceTimersByTimeAsync(0)
+      expect(await admittedResult).toMatchObject({
+        message: expect.stringContaining('timed out')
+      })
+      expect(freshLookup).toHaveBeenCalledTimes(1)
+      freshResponse.resolve(review)
+      expect(await replacement).toEqual(review)
+      expect(await joined).toEqual(review)
+      oldResponse.resolve(null)
+      expect(await withHostedReviewBranchCache(identity, options, freshLookup)).toEqual(review)
+      expect(freshLookup).toHaveBeenCalledTimes(1)
+    } finally {
+      oldResponse.resolve(null)
+      freshResponse.resolve(review)
+      await Promise.all([admittedResult, replacement, joined])
+    }
+  })
+
+  it('keeps the two-unsettled-request cap across repeated invalidation', async () => {
+    const first = Promise.withResolvers<HostedReviewInfo | null>()
+    const second = Promise.withResolvers<HostedReviewInfo | null>()
+    const firstRead = withHostedReviewBranchCache(identity, options, () => first.promise)
+    invalidateHostedReviewBranchCache(identity.repoPath, identity.executionHostId)
+    const secondRead = withHostedReviewBranchCache(identity, options, () => second.promise)
+    invalidateHostedReviewBranchCache(identity.repoPath, identity.executionHostId)
+    const thirdLookup = vi.fn(async () => review)
+    const third = withHostedReviewBranchCache(identity, options, thirdLookup)
+    const thirdResult = third.catch((error: unknown) => error)
+    try {
+      await vi.advanceTimersByTimeAsync(0)
+      expect(thirdLookup).not.toHaveBeenCalled()
+      first.resolve(null)
+      second.resolve(null)
+      await Promise.all([firstRead, secondRead])
+      expect(await thirdResult).toMatchObject({
+        message: expect.stringContaining('never answered')
+      })
+      expect(await withHostedReviewBranchCache(identity, options, thirdLookup)).toEqual(review)
+      expect(thirdLookup).toHaveBeenCalledTimes(1)
+    } finally {
+      first.resolve(null)
+      second.resolve(null)
+      await Promise.all([firstRead, secondRead, thirdResult])
+    }
+  })
+
+  it('does not let an invalidated rejection penalize the replacement', async () => {
+    const oldResponse = Promise.withResolvers<HostedReviewInfo | null>()
+    const freshResponse = Promise.withResolvers<HostedReviewInfo | null>()
+    const admitted = withHostedReviewBranchCache(identity, options, () => oldResponse.promise)
+    const rejected = expect(admitted).rejects.toThrow('old lookup failed')
+    invalidateHostedReviewBranchCache(identity.repoPath, identity.executionHostId)
+    const fresh = withHostedReviewBranchCache(identity, options, () => freshResponse.promise)
+    oldResponse.reject(new Error('old lookup failed'))
+    await rejected
+    freshResponse.resolve(review)
+    expect(await fresh).toEqual(review)
+    await vi.advanceTimersByTimeAsync(60_001)
+    const next = vi.fn(async () => review)
+    expect(await withHostedReviewBranchCache(identity, options, next)).toEqual(review)
+    expect(next).toHaveBeenCalledTimes(1)
+  })
+
+  it('bounds retired owners by admission and sweeps all of them after sleep', async () => {
+    const requests: ReturnType<typeof Promise.withResolvers<HostedReviewInfo | null>>[] = []
+    const readers: Promise<unknown>[] = []
+    for (let index = 0; index < MAX_UNSETTLED_LOOKUP_KEYS; index += 1) {
+      for (let attempt = 0; attempt < MAX_UNSETTLED_LOOKUPS_PER_KEY; attempt += 1) {
+        const response = Promise.withResolvers<HostedReviewInfo | null>()
+        requests.push(response)
+        readers.push(
+          withHostedReviewBranchCache(
+            { ...identity, branch: `branch-${index}` },
+            options,
+            () => response.promise
+          ).catch((error: unknown) => error)
+        )
+        invalidateHostedReviewBranchCache(identity.repoPath, identity.executionHostId)
+      }
+    }
+    const freshLookup = vi.fn(async () => review)
+    try {
+      await expect(withHostedReviewBranchCache(identity, options, freshLookup)).rejects.toThrow(
+        'Too many hosted review lookups are already in progress'
+      )
+      expect(freshLookup).not.toHaveBeenCalled()
+      expect(vi.getTimerCount()).toBe(MAX_UNSETTLED_LOOKUP_KEYS * MAX_UNSETTLED_LOOKUPS_PER_KEY)
+      vi.setSystemTime(Date.now() + HOSTED_REVIEW_LOOKUP_DEADLINE_MS)
+      await expect(withHostedReviewBranchCache(identity, options, freshLookup)).rejects.toThrow()
+      expect(vi.getTimerCount()).toBe(0)
+      expect(await Promise.all(readers)).toEqual(
+        requests.map(() =>
+          expect.objectContaining({ message: expect.stringContaining('timed out') })
+        )
+      )
+    } finally {
+      for (const response of requests) {
+        response.resolve(null)
+      }
+      await Promise.all(readers)
+    }
+    expect(await withHostedReviewBranchCache(identity, options, freshLookup)).toEqual(review)
+    expect(freshLookup).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/main/source-control/hosted-review-inflight-lookups.test.ts b/src/main/source-control/hosted-review-inflight-lookups.test.ts
new file mode 100644
index 000000000000..149de43c097d
--- /dev/null
+++ b/src/main/source-control/hosted-review-inflight-lookups.test.ts
@@ -0,0 +1,44 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import {
+  __resetHostedReviewInflightLookupsForTests,
+  expireOverdueInflight,
+  getInflightLookup,
+  releaseInflight,
+  retireInflightWithPrefix,
+  trackInflight
+} from './hosted-review-inflight-lookups'
+import { HOSTED_REVIEW_LOOKUP_DEADLINE_MS } from './hosted-review-refresh-pacing'
+
+afterEach(__resetHostedReviewInflightLookupsForTests)
+
+it.each(['completion', 'deadline'])(
+  'releases a retired owner on %s while preserving its successor',
+  (outcome) => {
+    const oldToken = {}
+    const oldExpire = vi.fn(() => releaseInflight('repo\0branch', oldToken))
+    trackInflight('repo\0branch', {
+      token: oldToken,
+      startedAt: 0,
+      promise: Promise.resolve(null),
+      expire: oldExpire
+    })
+    retireInflightWithPrefix('repo\0')
+    const replacement = {
+      token: {},
+      startedAt: HOSTED_REVIEW_LOOKUP_DEADLINE_MS,
+      promise: Promise.resolve(null),
+      expire: vi.fn()
+    }
+    trackInflight('repo\0branch', replacement)
+    if (outcome === 'completion') {
+      expect(releaseInflight('repo\0branch', oldToken)).toBe(false)
+    }
+    expireOverdueInflight(HOSTED_REVIEW_LOOKUP_DEADLINE_MS)
+    expect(oldExpire).toHaveBeenCalledTimes(outcome === 'deadline' ? 1 : 0)
+    expect(replacement.expire).not.toHaveBeenCalled()
+    expect(getInflightLookup('repo\0branch')).toBe(replacement)
+    expireOverdueInflight(HOSTED_REVIEW_LOOKUP_DEADLINE_MS + 1)
+    expect(oldExpire).toHaveBeenCalledTimes(outcome === 'deadline' ? 1 : 0)
+    expect(releaseInflight('repo\0branch', replacement.token)).toBe(true)
+  }
+)
diff --git a/src/main/source-control/hosted-review-inflight-lookups.ts b/src/main/source-control/hosted-review-inflight-lookups.ts
new file mode 100644
index 000000000000..79d4f12ba13b
--- /dev/null
+++ b/src/main/source-control/hosted-review-inflight-lookups.ts
@@ -0,0 +1,101 @@
+import type { HostedReviewInfo } from '../../shared/hosted-review'
+import {
+  HOSTED_REVIEW_LOOKUP_DEADLINE_MS,
+  MAX_INFLIGHT_LOOKUPS
+} from './hosted-review-refresh-pacing'
+
+declare const inflightTokenBrand: unique symbol
+
+/** Identity token for one lookup; only ever compared by reference. */
+export type InflightToken = { readonly [inflightTokenBrand]?: never }
+
+export type InflightRecord = {
+  /** Identity, so a detached lookup can only ever clear its own entry. */
+  token: InflightToken
+  startedAt: number
+  promise: Promise<HostedReviewInfo | null>
+  /** Releases the callers and unpins the branch; idempotent. */
+  expire: () => void
+}
+
+const inflight = new Map<string, InflightRecord>()
+/**
+ * Owners an invalidation took off their key. They keep running — nothing here
+ * can cancel a lookup — but no new reader may join them, which is what stops a
+ * post-invalidation read from waiting out a stale request's deadline.
+ *
+ * Admission bounds these to two per key across at most 1,000 unsettled keys, so
+ * this map cannot outgrow the lookups already counted as in progress.
+ */
+const retired = new Map<InflightToken, InflightRecord>()
+
+export function getInflightLookup(key: string): InflightRecord | undefined {
+  return inflight.get(key)
+}
+
+/** Clears only this owner's records; the return value identifies the current owner. */
+export function releaseInflight(key: string, token: InflightToken): boolean {
+  retired.delete(token)
+  if (inflight.get(key)?.token !== token) {
+    return false
+  }
+  inflight.delete(key)
+  return true
+}
+
+/** Takes every owner under `prefix` off its key, without failing it. */
+export function retireInflightWithPrefix(prefix: string): void {
+  for (const [key, record] of inflight) {
+    if (key.startsWith(prefix)) {
+      retired.set(record.token, record)
+      inflight.delete(key)
+    }
+  }
+}
+
+/**
+ * Expires records that outlived the deadline without their timer firing. Main's
+ * timers are suspended across a system sleep, so wall-clock age — not
+ * `setTimeout` alone — is what actually bounds how long a branch stays pinned.
+ * Retired owners are swept too: their readers are gone, but their own callers
+ * still need releasing.
+ *
+ * The guarantee covers tracked records only: one the size cap evicted is in
+ * neither map and falls back to its own suspended timer.
+ */
+export function expireOverdueInflight(now: number): void {
+  let overdue: InflightRecord[] | undefined
+  for (const records of [inflight, retired]) {
+    for (const record of records.values()) {
+      if (now - record.startedAt >= HOSTED_REVIEW_LOOKUP_DEADLINE_MS) {
+        overdue ??= []
+        overdue.push(record)
+      }
+    }
+  }
+  for (const record of overdue ?? []) {
+    record.expire()
+  }
+}
+
+export function trackInflight(key: string, record: InflightRecord): void {
+  inflight.set(key, record)
+  while (inflight.size > MAX_INFLIGHT_LOOKUPS) {
+    const oldest = inflight.keys().next().value
+    if (oldest === undefined) {
+      break
+    }
+    // Why: drop the record without expiring it — its own deadline still releases
+    // its callers, and evicting is about memory, not about failing. It does
+    // forfeit the sweep above, so the cap must stay far above realistic
+    // concurrency: below it, sleep-suspended timers are all an evicted record's
+    // callers have left.
+    inflight.delete(oldest)
+  }
+}
+
+/** @internal - exposed for tests only */
+export function __resetHostedReviewInflightLookupsForTests(): void {
+  inflight.clear()
+  retired.clear()
+}
diff --git a/src/main/speech/stt-session-start.ts b/src/main/speech/stt-session-start.ts
index 5377699b3820..eb42418cd0be 100644
--- a/src/main/speech/stt-session-start.ts
+++ b/src/main/speech/stt-session-start.ts
@@ -138,7 +138,11 @@ async function startSttSession(
     isCurrent: () => state.worker === worker,
     onMessage: (event) => state.eventSink?.(event),
     onError: (error) => handleSttWorkerFailure(state, error),
-    onExit: () => handleSttWorkerFailure(state)
+    onExit: () => {
+      const stoppedSink = state.stopInFlight?.worker === worker ? null : state.eventSink
+      handleSttWorkerFailure(state)
+      stoppedSink?.({ type: 'stopped' })
+    }
   })
   initializeSttWorker(worker, {
     modelDir: state.modelManager.getModelDir(modelId),
diff --git a/src/main/sqlite/sqlite-read-failure.ts b/src/main/sqlite/sqlite-read-failure.ts
index 6cdb75f343a3..6919bf9e9cbf 100644
--- a/src/main/sqlite/sqlite-read-failure.ts
+++ b/src/main/sqlite/sqlite-read-failure.ts
@@ -6,7 +6,9 @@
 /** Primary result codes; extended codes pack the primary code in the low byte. */
 const SQLITE_BUSY = 5
 const SQLITE_LOCKED = 6
+const SQLITE_CORRUPT = 11
 const SQLITE_CANTOPEN = 14
+const SQLITE_NOTADB = 26
 
 // Shared with the Codex index-heal pass, which only ever sees a relayed message
 // string (app-server RPC drops `errcode`), so message matching is not optional.
@@ -20,6 +22,23 @@ function primaryErrcode(error: unknown): number | null {
   return typeof errcode === 'number' && Number.isFinite(errcode) ? errcode & 0xff : null
 }
 
+/** node:sqlite marks its errors `ERR_SQLITE_ERROR`; Bun names its class `SQLiteError`. */
+function isSqliteDriverError(error: unknown): boolean {
+  return (
+    error instanceof Error &&
+    (('code' in error && error.code === 'ERR_SQLITE_ERROR') || error.name === 'SQLiteError')
+  )
+}
+
+/** True only when SQLite itself reports the database damaged or not a database at all. */
+export function isSqliteCorruption(error: unknown): boolean {
+  if (!isSqliteDriverError(error)) {
+    return false
+  }
+  const errcode = primaryErrcode(error)
+  return errcode === SQLITE_CORRUPT || errcode === SQLITE_NOTADB
+}
+
 function errorText(error: unknown): string {
   return error instanceof Error ? error.message : String(error)
 }
diff --git a/src/main/ssh/__tests__/ssh-connection-test-client.ts b/src/main/ssh/__tests__/ssh-connection-test-client.ts
index 5e57dea39363..46276f90c435 100644
--- a/src/main/ssh/__tests__/ssh-connection-test-client.ts
+++ b/src/main/ssh/__tests__/ssh-connection-test-client.ts
@@ -38,18 +38,32 @@ export const VALID_ED25519_HOST_KEY = Buffer.from(
 )
 
 // Knobs tests assign to; grouped because imported bindings cannot be reassigned.
-export const ssh2Mock = {
-  presentedHostKey: undefined as Buffer | undefined,
+export const ssh2Mock: {
+  presentedHostKey: Buffer | undefined
+  lastHostKeyAccepted: boolean | undefined
+  connectBehavior: 'ready' | 'error' | 'pending'
+  connectErrorMessage: string
+  connectErrorCode: string
+  destroyErrorMessage: string
+  connectSequence: ('ready' | 'silent' | Error)[]
+  execBehavior: 'callback' | 'pending'
+  sftpBehavior: 'callback' | 'pending'
+  notifyClientCreated: (() => void) | undefined
+} = {
+  presentedHostKey: undefined,
   /** What the verifier decided about the presented key on the most recent connect. */
-  lastHostKeyAccepted: undefined as boolean | undefined,
-  connectBehavior: 'ready' as 'ready' | 'error' | 'pending',
+  lastHostKeyAccepted: undefined,
+  connectBehavior: 'ready',
   connectErrorMessage: '',
   connectErrorCode: '',
   destroyErrorMessage: '',
-  connectSequence: [] as ('ready' | Error)[],
-  execBehavior: 'callback' as 'callback' | 'pending',
-  sftpBehavior: 'callback' as 'callback' | 'pending',
-  notifyClientCreated: undefined as (() => void) | undefined
+  // Why 'silent': leaves the connect attempt pending (no ready/error emitted)
+  // so a test can drive auth events (e.g. keyboard-interactive prompts)
+  // through emitSshEvent itself.
+  connectSequence: [],
+  execBehavior: 'callback',
+  sftpBehavior: 'callback',
+  notifyClientCreated: undefined
 }
 
 export const emitSshEvent = (event: string, ...args: unknown[]): void =>
@@ -137,6 +151,9 @@ export function createSsh2Module(): Ssh2ModuleMock {
           this.emit('ready')
           return
         }
+        if (next === 'silent') {
+          return
+        }
         if (ssh2Mock.connectBehavior === 'pending') {
           const configValue = this.lastConnectConfig
           const readyTimeout =
diff --git a/src/main/ssh/orcad-bun-runtime-materializer.test.ts b/src/main/ssh/orcad-bun-runtime-materializer.test.ts
index 52963e98304f..de9ab5d939c4 100644
--- a/src/main/ssh/orcad-bun-runtime-materializer.test.ts
+++ b/src/main/ssh/orcad-bun-runtime-materializer.test.ts
@@ -6,6 +6,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { ORCAD_BUN_RUNTIME_FILENAME } from '../../shared/orcad-artifacts'
 import { ORCAD_BUN_RELEASE_ASSETS, ORCAD_BUN_VERSION } from '../../shared/orcad-bun-runtime'
 import { setMainHttpClient } from '../network/http-client'
+import { runProcess } from '../../shared/child-process/run-process'
 import { materializeCachedOrcadBunRuntime } from './orcad-bun-runtime-materializer'
 
 const extraction = vi.hoisted(() => ({ executable: new Uint8Array(), executableName: 'bun' }))
@@ -45,6 +46,7 @@ beforeEach(async () => {
 
 afterEach(async () => {
   vi.useRealTimers()
+  vi.unstubAllEnvs()
   setMainHttpClient(null)
   Object.assign(ORCAD_BUN_RELEASE_ASSETS[TARGET], originalAsset)
   await rm(cacheRoot, { recursive: true, force: true })
@@ -150,6 +152,28 @@ describe('materializeCachedOrcadBunRuntime', () => {
     expect(await readdir(join(cacheRoot, 'bun', `v${ORCAD_BUN_VERSION}`, TARGET))).toEqual([])
   })
 
+  // Both cases spawn for real, so the assertion is against the errno Node actually reports:
+  // a missing program rejects asynchronously with ENOENT, while a program path whose parent is a
+  // regular file throws ENOTDIR synchronously out of `spawn` itself.
+  it.each([
+    ['absent', (): string => join(cacheRoot, 'absent-extractor')],
+    ['unreachable through a file', (): string => join(cacheRoot, 'plain-file', 'unzip')]
+  ])('names the %s extractor and the override when it cannot be launched', async (_label, path) => {
+    const archive = new TextEncoder().encode('unextractable archive')
+    ORCAD_BUN_RELEASE_ASSETS[TARGET].sha256 = sha256(archive)
+    await writeFile(join(cacheRoot, 'plain-file'), 'not a directory')
+    const { runProcess: spawnForReal } = await vi.importActual<{
+      runProcess: typeof runProcess
+    }>('../../shared/child-process/run-process')
+    vi.mocked(runProcess).mockImplementationOnce(spawnForReal)
+    vi.stubEnv('ORCA_UNZIP_BIN', path())
+
+    await expect(
+      materializeCachedOrcadBunRuntime(TARGET, cacheRoot, { fetcher: responseFetcher(archive) })
+    ).rejects.toThrow(/install unzip, or set ORCA_UNZIP_BIN/)
+    expect(await readdir(join(cacheRoot, 'bun', `v${ORCAD_BUN_VERSION}`, TARGET))).toEqual([])
+  })
+
   it('cleans an aborted download before publishing any executable', async () => {
     const controller = new AbortController()
     controller.abort(new Error('deployment cancelled'))
diff --git a/src/main/ssh/orcad-bun-runtime-materializer.ts b/src/main/ssh/orcad-bun-runtime-materializer.ts
index 9ed65ecdb022..e52a87534eb1 100644
--- a/src/main/ssh/orcad-bun-runtime-materializer.ts
+++ b/src/main/ssh/orcad-bun-runtime-materializer.ts
@@ -2,8 +2,9 @@ import { createHash, randomUUID } from 'node:crypto'
 import { createReadStream, readdirSync } from 'node:fs'
 import { chmod, link, mkdir, open, rm } from 'node:fs/promises'
 import { basename, join } from 'node:path'
-import { runProcess } from '../../shared/child-process/run-process'
+import { runProcess, type ProcessResult } from '../../shared/child-process/run-process'
 import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason'
+import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence'
 import { getZipExtractorCommand } from '../../shared/zip-extractor-command'
 import { getMainHttpClient, type MainHttpClient } from '../network/http-client'
 import { findOrcadCachePath } from './orcad-cache-path'
@@ -57,13 +58,7 @@ export async function materializeCachedOrcadBunRuntime(
     options.signal?.throwIfAborted()
     const extractedDir = join(temporaryDir, 'extracted')
     await mkdir(extractedDir)
-    const command = getZipExtractorCommand(archivePath, extractedDir)
-    const result = await runProcess({
-      program: command.file,
-      args: command.args,
-      timeoutMs: 120_000,
-      signal: options.signal
-    })
+    const result = await extractArchive(archivePath, extractedDir, options.signal)
     options.signal?.throwIfAborted()
     if (result.code !== 0) {
       throw new Error(`Bun archive extraction failed: ${result.stderr || result.stdout}`)
@@ -90,6 +85,40 @@ export async function materializeCachedOrcadBunRuntime(
   }
 }
 
+/**
+ * Why the extractor needs a message of its own: `unzip` is absent from a minimal POSIX install,
+ * and a bare `spawn unzip ENOENT` names neither the missing tool nor the override. A misconfigured
+ * `ORCA_UNZIP_BIN` whose parent is a file reports ENOTDIR instead, which is the same verdict.
+ *
+ * The errno is the program path's, not the caller's: `runProcess` leaves cwd unset, so the child
+ * inherits the parent's without resolving it. Measured on macOS, Linux and Windows — spawn still
+ * succeeds from a deleted cwd, even though `process.cwd()` itself throws ENOENT there.
+ */
+async function extractArchive(
+  archivePath: string,
+  extractDir: string,
+  signal?: AbortSignal
+): Promise<ProcessResult> {
+  const command = getZipExtractorCommand(archivePath, extractDir)
+  try {
+    return await runProcess({
+      program: command.file,
+      args: command.args,
+      timeoutMs: 120_000,
+      signal
+    })
+  } catch (error) {
+    if (isDefinitiveAbsence(error)) {
+      throw new Error(
+        `Bun archive extraction could not run ${command.file}: install ${command.label}, ` +
+          'or set ORCA_UNZIP_BIN to an unzip-compatible extractor.',
+        { cause: error }
+      )
+    }
+    throw error
+  }
+}
+
 async function downloadVerifiedArchive(
   url: string,
   destination: string,
diff --git a/src/main/ssh/orcad-remote-gc.test.ts b/src/main/ssh/orcad-remote-gc.test.ts
index b25e3bb6b6d1..9d365c631ef4 100644
--- a/src/main/ssh/orcad-remote-gc.test.ts
+++ b/src/main/ssh/orcad-remote-gc.test.ts
@@ -35,7 +35,7 @@ const mockExec = vi.mocked(execCommand)
  */
 function scriptHost(options: {
   listing: string[]
-  liveness?: Record<string, 'LIVE' | 'DEAD' | 'UNKNOWN'>
+  liveness?: Record<string, 'LIVE' | 'DEAD' | 'UNKNOWN' | Error>
   removed: string[]
 }): void {
   mockExec.mockImplementation(async (_conn, command: string) => {
@@ -50,7 +50,11 @@ function scriptHost(options: {
     }
     if (command.includes('.orcad-pid')) {
       const dir = Object.keys(options.liveness ?? {}).find((name) => command.includes(name))
-      return dir ? (options.liveness?.[dir] ?? 'DEAD') : 'DEAD'
+      const result = dir ? (options.liveness?.[dir] ?? 'DEAD') : 'DEAD'
+      if (result instanceof Error) {
+        throw result
+      }
+      return result
     }
     if (command.startsWith('mv ')) {
       const match = command.match(/'([^']*)'/)
@@ -152,4 +156,49 @@ describe('orcad GC', () => {
     })
     expect(removed).toEqual(['orcad-0.0.9+dead'])
   })
+
+  it('stops before later versions when liveness probe termination is unconfirmed', async () => {
+    const removed: string[] = []
+    const error = Object.assign(new Error('Liveness probe termination is unconfirmed'), {
+      sshChannelCloseConfirmed: false
+    })
+    scriptHost({
+      listing: ['orcad-0.1.0+bb0', 'orcad-0.0.9+dead'],
+      liveness: { 'orcad-0.1.0+bb0': error },
+      removed
+    })
+
+    await expect(
+      gcOldOrcadVersions({
+        conn,
+        host,
+        remoteHome: '/home/u',
+        currentDirAbsPath: '/home/u/.orca-remote/orcad-0.3.0+cc0',
+        record: emptyOrcadActivationRecord()
+      })
+    ).rejects.toBe(error)
+
+    expect(removed).toEqual([])
+    expect(mockExec).toHaveBeenCalledTimes(4)
+    expect(mockExec.mock.calls.at(-1)?.[1]).toContain('.orcad-pid')
+  })
+
+  it('keeps a version after an ordinary probe failure and checks later versions', async () => {
+    const removed: string[] = []
+    scriptHost({
+      listing: ['orcad-0.1.0+bb0', 'orcad-0.0.9+dead'],
+      liveness: { 'orcad-0.1.0+bb0': new Error('Probe failed') },
+      removed
+    })
+
+    await gcOldOrcadVersions({
+      conn,
+      host,
+      remoteHome: '/home/u',
+      currentDirAbsPath: '/home/u/.orca-remote/orcad-0.3.0+cc0',
+      record: emptyOrcadActivationRecord()
+    })
+
+    expect(removed).toEqual(['orcad-0.0.9+dead'])
+  })
 })
diff --git a/src/main/ssh/orcad-remote-gc.ts b/src/main/ssh/orcad-remote-gc.ts
index a96b386fc1bb..09997dc40d35 100644
--- a/src/main/ssh/orcad-remote-gc.ts
+++ b/src/main/ssh/orcad-remote-gc.ts
@@ -15,6 +15,7 @@
  */
 import type { SshConnection } from './ssh-connection'
 import { execCommand } from './ssh-relay-deploy-helpers'
+import { isUnconfirmedSshCommandTermination } from './ssh-relay-exec-command'
 import { ORCAD_INSTALL_MODEL } from './remote-install-model'
 import { gcOldRemoteInstallVersions } from './ssh-relay-versioned-install'
 import { orcadGcPinnedDirNames, type OrcadActivationRecord } from './orcad-activation-record'
@@ -63,7 +64,10 @@ export async function gcOldOrcadVersions(options: OrcadGcOptions): Promise<void>
             }
           )
           return orcadLivenessBlocksGc(parseOrcadLiveness(probe))
-        } catch {
+        } catch (error) {
+          if (isUnconfirmedSshCommandTermination(error)) {
+            throw error
+          }
           // Why true: an unanswered probe is not evidence a tree is idle. Same rule the
           // relay's socket probe applies, for the same reason.
           return true
diff --git a/src/main/ssh/orcad-remote-install-termination.test.ts b/src/main/ssh/orcad-remote-install-termination.test.ts
new file mode 100644
index 000000000000..fbc0dcb156c1
--- /dev/null
+++ b/src/main/ssh/orcad-remote-install-termination.test.ts
@@ -0,0 +1,158 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('./ssh-relay-deploy-helpers', () => ({ execCommand: vi.fn() }))
+vi.mock('./ssh-relay-install-lock', () => ({
+  acquireInstallLock: vi.fn().mockResolvedValue(undefined),
+  RELAY_INSTALL_LOCK_NAME: '.install-lock'
+}))
+vi.mock('./ssh-relay-install-transfers', () => ({
+  uploadRelayDirectory: vi.fn(),
+  writeRelayFile: vi.fn()
+}))
+
+import type { SshConnection } from './ssh-connection'
+import { execCommand } from './ssh-relay-deploy-helpers'
+import { uploadRelayDirectory, writeRelayFile } from './ssh-relay-install-transfers'
+import { installOrcadBundle } from './orcad-remote-install'
+import { getRemoteHostPlatform } from './ssh-remote-platform'
+import { decodeRemotePowerShellScript } from './ssh-remote-powershell'
+
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: All connection operations are mocked.
+const conn = {} as SshConnection
+const mockExec = vi.mocked(execCommand)
+const mockUpload = vi.mocked(uploadRelayDirectory)
+const mockWrite = vi.mocked(writeRelayFile)
+const fullVersion = '0.2.0+abcdef123456'
+
+function issuedCommands(): string[] {
+  return mockExec.mock.calls.map(([, command]) => decodeRemotePowerShellScript(command))
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  mockExec.mockReset().mockResolvedValue('')
+  mockUpload.mockReset().mockResolvedValue(undefined)
+  mockWrite.mockReset().mockResolvedValue(undefined)
+})
+
+describe.each([
+  { platform: 'linux-x64' as const, remoteDir: '/home/u/.orca-remote/orcad-version' },
+  { platform: 'win32-x64' as const, remoteDir: 'C:/Users/u/.orca-remote/orcad-version' }
+])('orcad install termination on $platform', ({ platform, remoteDir }) => {
+  const host = getRemoteHostPlatform(platform)
+  const completionCommandNumber = host.os === 'win32' ? 3 : 4
+  const stages = [
+    { stage: 'locked recheck', commands: 2 },
+    { stage: 'upload', commands: 2 },
+    { stage: 'version write', commands: completionCommandNumber - 1 },
+    { stage: 'completion marker', commands: completionCommandNumber }
+  ]
+  const install = (signal?: AbortSignal): Promise<void> =>
+    installOrcadBundle(
+      { conn, host, localOrcadDir: '/local/orcad', signal },
+      fullVersion,
+      remoteDir
+    )
+
+  function failStage(stage: string, commandNumber: number, error: Error): void {
+    if (stage === 'upload') {
+      mockUpload.mockRejectedValueOnce(error)
+    } else if (stage === 'version write') {
+      mockWrite.mockRejectedValueOnce(error)
+    } else {
+      let calls = 0
+      mockExec.mockImplementation(async () => {
+        if (++calls === commandNumber) {
+          throw error
+        }
+        return ''
+      })
+    }
+  }
+
+  it.each(stages)('retains its lock after unconfirmed $stage', async ({ stage, commands }) => {
+    const error = Object.assign(new Error('SSH teardown not confirmed'), {
+      sshChannelCloseConfirmed: false
+    })
+    failStage(stage, commands, error)
+
+    await expect(install()).rejects.toBe(error)
+
+    expect(mockExec).toHaveBeenCalledTimes(commands)
+    expect(mockUpload).toHaveBeenCalledTimes(stage === 'locked recheck' ? 0 : 1)
+    expect(mockWrite).toHaveBeenCalledTimes(
+      stage === 'locked recheck' || stage === 'upload' ? 0 : 1
+    )
+    expect(issuedCommands().some((command) => command.includes('.install-lock'))).toBe(false)
+  })
+
+  it.each(stages)(
+    'still releases its lock after confirmed $stage failure',
+    async ({ stage, commands }) => {
+      const error = Object.assign(new Error('SSH command failed after closing'), {
+        sshChannelCloseConfirmed: true
+      })
+      failStage(stage, commands, error)
+
+      if (stage === 'locked recheck') {
+        await expect(install()).resolves.toBeUndefined()
+        expect(mockExec).toHaveBeenCalledTimes(completionCommandNumber + 1)
+      } else {
+        await expect(install()).rejects.toBe(error)
+        expect(mockExec).toHaveBeenCalledTimes(commands + 1)
+      }
+      expect(issuedCommands().at(-1)).toContain('.install-lock')
+    }
+  )
+
+  it('releases its lock once after successful completion', async () => {
+    await expect(install()).resolves.toBeUndefined()
+
+    expect(mockExec).toHaveBeenCalledTimes(completionCommandNumber + 1)
+    expect(issuedCommands()[completionCommandNumber - 1]).toContain('.install-complete')
+    expect(issuedCommands().at(-1)).toContain('.install-lock')
+    expect(mockUpload).toHaveBeenCalledOnce()
+    expect(mockWrite).toHaveBeenCalledOnce()
+  })
+
+  it('preserves an uncertain locked recheck when the caller also aborts', async () => {
+    const controller = new AbortController()
+    const error = Object.assign(new Error('SSH teardown not confirmed'), {
+      sshChannelCloseConfirmed: false
+    })
+    mockExec.mockResolvedValueOnce('').mockImplementationOnce(async () => {
+      controller.abort(new Error('deploy aborted'))
+      throw error
+    })
+
+    await expect(install(controller.signal)).rejects.toBe(error)
+    expect(mockExec).toHaveBeenCalledTimes(2)
+    expect(mockUpload).not.toHaveBeenCalled()
+  })
+
+  it('propagates an uncertain final lock release without retrying it', async () => {
+    const error = Object.assign(new Error('SSH teardown not confirmed'), {
+      sshChannelCloseConfirmed: false
+    })
+    failStage('release', completionCommandNumber + 1, error)
+
+    await expect(install()).rejects.toBe(error)
+    expect(mockExec).toHaveBeenCalledTimes(completionCommandNumber + 1)
+    expect(issuedCommands().at(-1)).toContain('.install-lock')
+  })
+
+  it.skipIf(host.os === 'win32')(
+    'retains its lock after unconfirmed executable permissions',
+    async () => {
+      const error = Object.assign(new Error('SSH teardown not confirmed'), {
+        sshChannelCloseConfirmed: false
+      })
+      failStage('permissions', 3, error)
+
+      await expect(install()).rejects.toBe(error)
+      expect(mockExec).toHaveBeenCalledTimes(3)
+      expect(issuedCommands().at(-1)).toContain('chmod')
+      expect(mockWrite).not.toHaveBeenCalled()
+    }
+  )
+})
diff --git a/src/main/ssh/orcad-remote-install.ts b/src/main/ssh/orcad-remote-install.ts
index f473e22c78c2..9866f6666438 100644
--- a/src/main/ssh/orcad-remote-install.ts
+++ b/src/main/ssh/orcad-remote-install.ts
@@ -1,6 +1,7 @@
 import { orcadBunRuntimeFilename } from '../../shared/orcad-artifacts'
 import { orcadAgentBrowserNativeName } from '../../shared/orcad-agent-browser-name'
 import { execCommand } from './ssh-relay-deploy-helpers'
+import { isUnconfirmedSshCommandTermination } from './ssh-relay-exec-command'
 import { shellEscape } from './ssh-connection-utils'
 import type { SshConnection } from './ssh-connection'
 import { joinRemotePath, type RemoteHostPlatform } from './ssh-remote-platform'
@@ -32,6 +33,7 @@ export async function installOrcadBundle(
     return
   }
   await acquireInstallLock(options.conn, remoteDir, options.host, { signal: options.signal })
+  let preserveInstallLock = false
   try {
     // Re-probe under the lock: a sibling deploy may have finished while we waited.
     if (
@@ -61,8 +63,13 @@ export async function installOrcadBundle(
       signal: options.signal,
       releaseLock: false
     })
+  } catch (error) {
+    preserveInstallLock = isUnconfirmedSshCommandTermination(error)
+    throw error
   } finally {
-    await abandonInstall(options.conn, remoteDir, options.host)
+    if (!preserveInstallLock) {
+      await abandonInstall(options.conn, remoteDir, options.host)
+    }
   }
 }
 
diff --git a/src/main/ssh/relay-protocol-backpressure.test.ts b/src/main/ssh/relay-protocol-backpressure.test.ts
deleted file mode 100644
index 45a869af16ed..000000000000
--- a/src/main/ssh/relay-protocol-backpressure.test.ts
+++ /dev/null
@@ -1,297 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import {
-  FrameDecoder,
-  FrameDecoderContinuationError,
-  FRAME_DECODER_MAX_RETAINED_BYTES,
-  HEADER_LENGTH,
-  MAX_MESSAGE_SIZE,
-  MessageType,
-  encodeFrame,
-  type DecodedFrame
-} from './relay-protocol'
-
-function createScheduler(): {
-  schedule: (callback: () => void) => number
-  cancel: (handle: unknown) => void
-  runNext: () => void
-  pending: () => number
-} {
-  let nextHandle = 1
-  const callbacks = new Map<number, () => void>()
-  return {
-    schedule: (callback) => {
-      const handle = nextHandle++
-      callbacks.set(handle, callback)
-      return handle
-    },
-    cancel: (handle) => callbacks.delete(handle as number),
-    runNext: () => {
-      const entry = callbacks.entries().next().value as [number, () => void] | undefined
-      if (!entry) {
-        throw new Error('No decoder continuation scheduled')
-      }
-      callbacks.delete(entry[0])
-      entry[1]()
-    },
-    pending: () => callbacks.size
-  }
-}
-
-function frame(id: number, payload = `${id}`): Buffer {
-  return encodeFrame(MessageType.Regular, id, 0, Buffer.from(payload))
-}
-
-describe('FrameDecoder bounded turns', () => {
-  it('retains at most one maximum frame plus one MiB of partial input', () => {
-    expect(FRAME_DECODER_MAX_RETAINED_BYTES).toBe(MAX_MESSAGE_SIZE + HEADER_LENGTH + 1024 * 1024)
-    const maximumFrame = encodeFrame(MessageType.Regular, 1, 0, Buffer.alloc(MAX_MESSAGE_SIZE))
-    const acceptedError = vi.fn()
-    const accepted = new FrameDecoder(vi.fn(), acceptedError)
-
-    accepted.feed(Buffer.concat([maximumFrame, Buffer.alloc(1024 * 1024)]))
-
-    expect(acceptedError).not.toHaveBeenCalled()
-    expect(accepted.drain()).toHaveLength(1024 * 1024)
-
-    const excessError = vi.fn()
-    const excess = new FrameDecoder(vi.fn(), excessError)
-    excess.feed(Buffer.concat([maximumFrame, Buffer.alloc(1024 * 1024 + 1)]))
-
-    expect(excessError).toHaveBeenCalledWith(
-      expect.objectContaining({ message: expect.stringContaining('retained-input') })
-    )
-    expect(excess.drain()).toHaveLength(0)
-  })
-
-  it('fails closed when one delivered chunk exceeds retained-input capacity', () => {
-    const onError = vi.fn()
-    const decoder = new FrameDecoder(vi.fn(), onError)
-
-    decoder.feed(Buffer.alloc(FRAME_DECODER_MAX_RETAINED_BYTES + 1))
-
-    expect(onError).toHaveBeenCalledWith(
-      expect.objectContaining({ message: expect.stringContaining('retained-input') })
-    )
-    expect(decoder.drain()).toHaveLength(0)
-  })
-
-  it('emits the first frame synchronously and preserves order through self-pause', () => {
-    const scheduler = createScheduler()
-    const seen: number[] = []
-    let decoder: FrameDecoder
-    const pause = vi.fn(() => decoder.feed(frame(4)))
-    const resume = vi.fn()
-    decoder = new FrameDecoder((decoded) => seen.push(decoded.id), undefined, {
-      maxFramesPerTurn: 1,
-      schedule: scheduler.schedule,
-      cancelScheduled: scheduler.cancel,
-      pause,
-      resume
-    })
-
-    decoder.feed(Buffer.concat([frame(1), frame(2), frame(3)]))
-
-    expect(seen).toEqual([1])
-    expect(pause).toHaveBeenCalledTimes(1)
-    expect(scheduler.pending()).toBe(1)
-
-    scheduler.runNext()
-    scheduler.runNext()
-    scheduler.runNext()
-
-    expect(seen).toEqual([1, 2, 3, 4])
-    expect(pause).toHaveBeenCalledTimes(1)
-    expect(resume).toHaveBeenCalledTimes(1)
-    expect(scheduler.pending()).toBe(0)
-  })
-
-  it('bounds decoded bytes and time independently from the frame count', () => {
-    const byteScheduler = createScheduler()
-    const byteSeen: number[] = []
-    const first = frame(1, 'one')
-    const second = frame(2, 'two')
-    const byteDecoder = new FrameDecoder((decoded) => byteSeen.push(decoded.id), undefined, {
-      maxFramesPerTurn: 64,
-      maxBytesPerTurn: first.length,
-      schedule: byteScheduler.schedule,
-      cancelScheduled: byteScheduler.cancel
-    })
-
-    byteDecoder.feed(Buffer.concat([first, second]))
-    expect(byteSeen).toEqual([1])
-    byteScheduler.runNext()
-    expect(byteSeen).toEqual([1, 2])
-
-    const timeScheduler = createScheduler()
-    const timeSeen: number[] = []
-    let nowCalls = 0
-    const timeDecoder = new FrameDecoder((decoded) => timeSeen.push(decoded.id), undefined, {
-      maxFramesPerTurn: 64,
-      maxBytesPerTurn: MAX_MESSAGE_SIZE + HEADER_LENGTH,
-      maxTurnMs: 4,
-      now: () => (nowCalls++ === 0 ? 0 : 5),
-      schedule: timeScheduler.schedule,
-      cancelScheduled: timeScheduler.cancel
-    })
-
-    timeDecoder.feed(Buffer.concat([frame(3), frame(4)]))
-    expect(timeSeen).toEqual([3])
-    timeScheduler.runNext()
-    expect(timeSeen).toEqual([3, 4])
-  })
-
-  it('releases its pause epoch when continuation scheduling throws', () => {
-    const pause = vi.fn()
-    const resume = vi.fn()
-    const decoder = new FrameDecoder(() => {}, undefined, {
-      maxFramesPerTurn: 1,
-      pause,
-      resume,
-      schedule: () => {
-        throw new Error('scheduler unavailable')
-      }
-    })
-
-    expect(() => decoder.feed(Buffer.concat([frame(1), frame(2)]))).toThrow('scheduler unavailable')
-    expect(pause).toHaveBeenCalledTimes(1)
-    expect(resume).toHaveBeenCalledTimes(1)
-    decoder.reset()
-    expect(resume).toHaveBeenCalledTimes(1)
-  })
-
-  it('contains a throwing continuation, resets residue, and reports one typed error', () => {
-    const scheduler = createScheduler()
-    const seen: number[] = []
-    const onError = vi.fn()
-    const pause = vi.fn()
-    const resume = vi.fn()
-    const decoder = new FrameDecoder(
-      (decoded) => {
-        if (decoded.id === 2) {
-          throw new Error('frame owner failed')
-        }
-        seen.push(decoded.id)
-      },
-      onError,
-      {
-        maxFramesPerTurn: 1,
-        schedule: scheduler.schedule,
-        cancelScheduled: scheduler.cancel,
-        pause,
-        resume
-      }
-    )
-
-    decoder.feed(Buffer.concat([frame(1), frame(2), frame(3)]))
-    expect(() => scheduler.runNext()).not.toThrow()
-
-    expect(seen).toEqual([1])
-    expect(onError).toHaveBeenCalledExactlyOnceWith(expect.any(FrameDecoderContinuationError))
-    expect(onError.mock.calls[0]?.[0]).toMatchObject({
-      name: 'FrameDecoderContinuationError',
-      cause: expect.objectContaining({ message: 'frame owner failed' })
-    })
-    expect(pause).toHaveBeenCalledTimes(1)
-    expect(resume).toHaveBeenCalledTimes(1)
-    expect(scheduler.pending()).toBe(0)
-    expect(decoder.drain()).toHaveLength(0)
-
-    decoder.feed(frame(4))
-    expect(seen).toEqual([1, 4])
-  })
-
-  // feed() runs straight from a transport data handler. A frame owner that threw on the first
-  // turn used to escape feed() and reach uncaughtException. The continuation path was already
-  // contained; the synchronous path must match it.
-  it('contains a frame owner that throws on the synchronous turn and reports one typed error', () => {
-    const seen: number[] = []
-    const onError = vi.fn()
-    const pause = vi.fn()
-    const resume = vi.fn()
-    const decoder = new FrameDecoder(
-      (decoded) => {
-        if (decoded.id === 2) {
-          throw new Error('frame owner failed')
-        }
-        seen.push(decoded.id)
-      },
-      onError,
-      { pause, resume }
-    )
-
-    expect(() => decoder.feed(Buffer.concat([frame(1), frame(2), frame(3)]))).not.toThrow()
-
-    expect(seen).toEqual([1])
-    expect(onError).toHaveBeenCalledExactlyOnceWith(expect.any(FrameDecoderContinuationError))
-    expect(onError.mock.calls[0]?.[0]).toMatchObject({
-      cause: expect.objectContaining({ message: 'frame owner failed' })
-    })
-    expect(decoder.drain()).toHaveLength(0)
-    expect(pause).not.toHaveBeenCalled()
-    expect(resume).not.toHaveBeenCalled()
-
-    decoder.feed(frame(4))
-    expect(seen).toEqual([1, 4])
-  })
-
-  it('keeps reads active for partial frames and incrementally discards oversized payloads', () => {
-    const errors: Error[] = []
-    const seen: DecodedFrame[] = []
-    const pause = vi.fn()
-    const decoder = new FrameDecoder(
-      (decoded) => seen.push(decoded),
-      (error) => errors.push(error),
-      { pause }
-    )
-    const valid = frame(2, 'complete')
-
-    decoder.feed(valid.subarray(0, HEADER_LENGTH + 2))
-    expect(seen).toHaveLength(0)
-    expect(pause).not.toHaveBeenCalled()
-    decoder.feed(valid.subarray(HEADER_LENGTH + 2))
-    expect(seen.map(({ id }) => id)).toEqual([2])
-
-    const oversizedHeader = Buffer.alloc(HEADER_LENGTH)
-    oversizedHeader[0] = MessageType.Regular
-    oversizedHeader.writeUInt32BE(3, 1)
-    oversizedHeader.writeUInt32BE(MAX_MESSAGE_SIZE + 1, 9)
-    decoder.feed(Buffer.concat([oversizedHeader, Buffer.alloc(32)]))
-
-    expect(errors).toHaveLength(1)
-    expect(pause).not.toHaveBeenCalled()
-    decoder.reset()
-    decoder.feed(frame(4, 'after-reset'))
-    expect(seen.map(({ id }) => id)).toEqual([2, 4])
-  })
-
-  it('drain and reset cancel continuation ownership without replaying residue', () => {
-    const scheduler = createScheduler()
-    const seen: number[] = []
-    const resume = vi.fn()
-    const cancel = vi.fn(scheduler.cancel)
-    const decoder = new FrameDecoder((decoded) => seen.push(decoded.id), undefined, {
-      maxFramesPerTurn: 1,
-      schedule: scheduler.schedule,
-      cancelScheduled: cancel,
-      resume
-    })
-    const second = frame(2, 'residue')
-
-    decoder.feed(Buffer.concat([frame(1), second]))
-    const residue = decoder.drain()
-
-    expect(seen).toEqual([1])
-    expect(residue.equals(second)).toBe(true)
-    expect(cancel).toHaveBeenCalledTimes(1)
-    expect(resume).toHaveBeenCalledTimes(1)
-    expect(scheduler.pending()).toBe(0)
-
-    decoder.feed(Buffer.concat([frame(3), frame(4)]))
-    decoder.reset()
-    expect(cancel).toHaveBeenCalledTimes(2)
-    expect(scheduler.pending()).toBe(0)
-
-    decoder.feed(frame(5))
-    expect(seen).toEqual([1, 3, 5])
-  })
-})
diff --git a/src/main/ssh/remote-install-gc-termination.test.ts b/src/main/ssh/remote-install-gc-termination.test.ts
new file mode 100644
index 000000000000..73b50e7b6f1f
--- /dev/null
+++ b/src/main/ssh/remote-install-gc-termination.test.ts
@@ -0,0 +1,183 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type * as DeployHelpers from './ssh-relay-deploy-helpers'
+
+vi.mock('./ssh-relay-deploy-helpers', async (importOriginal) => ({
+  ...(await importOriginal<typeof DeployHelpers>()),
+  execCommand: vi.fn()
+}))
+
+import type { SshConnection } from './ssh-connection'
+import { gcOldRelayVersions } from './remote-install-gc'
+import { execCommand } from './ssh-relay-deploy-helpers'
+import { gcRelayNativeDepsCache } from './ssh-relay-native-deps-cache-gc'
+import { gcRemoteRipgrepCache } from './ssh-relay-ripgrep-cache-gc'
+import { getRemoteHostPlatform } from './ssh-remote-platform'
+
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: all connection access is replaced by execCommand's mock.
+const conn = {} as SshConnection
+const host = getRemoteHostPlatform('linux-x64')
+const home = '/home/u'
+const currentDir = `${home}/.orca-remote/relay-0.1.0+bbb`
+const nativeKey = 'linux-x64-0123456789abcdef'
+const mockExec = vi.mocked(execCommand)
+
+beforeEach(() => {
+  mockExec.mockReset()
+  mockExec.mockResolvedValue('')
+})
+
+function failAfter(replies: readonly string[], confirmed = false): Error {
+  for (const reply of replies) {
+    mockExec.mockResolvedValueOnce(reply)
+  }
+  const error = Object.assign(new Error('SSH command timed out'), {
+    sshChannelCloseConfirmed: confirmed
+  })
+  mockExec.mockRejectedValueOnce(error)
+  return error
+}
+
+function collectRelayVersions(): Promise<void> {
+  return gcOldRelayVersions(conn, home, currentDir, host, { nativeDepsCacheKeys: [nativeKey] })
+}
+
+const versionSteps = [
+  ['listing', 'relay-0.1.0+aaa\nrelay-0.1.0+ccc'],
+  ['install lock probe', 'OPEN'],
+  ['completion probe', 'COMPLETE'],
+  ['liveness probe', 'DEAD'],
+  ['claim acquisition', 'OK'],
+  ['claim owner write', ''],
+  ['claimed install lock probe', 'OPEN'],
+  ['claimed completion probe', 'COMPLETE'],
+  ['claimed liveness probe', 'DEAD'],
+  ['claim ownership probe', 'OWNED'],
+  ['rename', 'MOVED'],
+  ['claim release', 'RELEASED'],
+  ['tombstone deletion', '']
+] as const
+
+describe('version GC termination', () => {
+  it.each(versionSteps.map(([phase], index) => ({ phase, index })))(
+    'stops all cleanup after unconfirmed $phase termination',
+    async ({ index }) => {
+      const error = failAfter(versionSteps.slice(0, index).map(([, reply]) => reply))
+
+      await expect(collectRelayVersions()).rejects.toBe(error)
+
+      expect(mockExec).toHaveBeenCalledTimes(index + 1)
+    }
+  )
+
+  it.each([false, true])(
+    'stops after an unconfirmed stale lock probe with claim held: %s',
+    async (claimed) => {
+      const replies = claimed
+        ? versionSteps.slice(0, 6).map(([, reply]) => String(reply))
+        : [versionSteps[0][1]]
+      const error = failAfter([...replies, 'LOCKED'])
+
+      await expect(collectRelayVersions()).rejects.toBe(error)
+
+      expect(mockExec).toHaveBeenCalledTimes(replies.length + 2)
+    }
+  )
+
+  it('stops after unconfirmed abandoned tombstone deletion', async () => {
+    const error = failAfter([
+      'relay-0.1.0+aaa.gc-tombstone.1.1\nrelay-0.1.0+ccc.gc-tombstone.1.1\nrelay-0.1.0+ddd'
+    ])
+
+    await expect(collectRelayVersions()).rejects.toBe(error)
+
+    expect(mockExec).toHaveBeenCalledTimes(2)
+  })
+
+  it('preserves an unconfirmed native cache cleanup error for its caller', async () => {
+    const error = failAfter([''])
+
+    await expect(collectRelayVersions()).rejects.toBe(error)
+
+    expect(mockExec).toHaveBeenCalledTimes(2)
+  })
+})
+
+const caches = [
+  {
+    name: 'native dependencies',
+    collect: () => gcRelayNativeDepsCache(conn, host, home),
+    listing: `ENTRY ${nativeKey}\nENTRY linux-x64-fedcba9876543210\n__ORCA_NATIVE_CACHE__LIST_OK`,
+    references: '__ORCA_NATIVE_CACHE__REFS_OK'
+  },
+  {
+    name: 'ripgrep',
+    collect: () => gcRemoteRipgrepCache(conn, host, home),
+    listing:
+      'ENTRY 0123456789abcdef-linux-x64\nENTRY fedcba9876543210-linux-x64\n__ORCA_RG_CACHE__LIST_OK',
+    references: '__ORCA_RG_CACHE__REFS_OK'
+  }
+]
+
+describe.each(caches)('$name cache GC termination', ({ collect, listing, references }) => {
+  const steps = [
+    ['listing', listing],
+    ['reference scan', references],
+    ['rename', 'MOVED'],
+    ['reference recheck', references],
+    ['tombstone deletion', '']
+  ] as const
+
+  it.each(steps.map(([phase], index) => ({ phase, index })))(
+    'preserves unconfirmed $phase termination and stops collection',
+    async ({ index, phase }) => {
+      const error = failAfter(steps.slice(0, index).map(([, reply]) => reply))
+
+      await expect(collect()).rejects.toBe(error)
+
+      expect(mockExec).toHaveBeenCalledTimes(index + (phase === 'reference recheck' ? 2 : 1))
+      if (phase === 'reference recheck') {
+        expect(mockExec.mock.calls.at(-1)?.[1]).toContain('[ ! -e ')
+      }
+    }
+  )
+
+  it.each(steps.map(([phase], index) => ({ phase, index })))(
+    'keeps a confirmed $phase failure nonfatal',
+    async ({ index }) => {
+      failAfter(
+        steps.slice(0, index).map(([, reply]) => reply),
+        true
+      )
+
+      await expect(collect()).resolves.toBeUndefined()
+    }
+  )
+
+  it('stops when restoring a tombstone has unconfirmed termination', async () => {
+    const error = failAfter([listing, references, 'MOVED', 'unreadable references'])
+
+    await expect(collect()).rejects.toBe(error)
+
+    expect(mockExec).toHaveBeenCalledTimes(5)
+  })
+
+  it.each([false, true])(
+    'does not retry a failed restoration after an unconfirmed recheck: %s',
+    async (confirmed) => {
+      const error = failAfter([listing, references, 'MOVED'])
+      mockExec.mockRejectedValueOnce(
+        Object.assign(new Error('restore failed'), { sshChannelCloseConfirmed: confirmed })
+      )
+
+      await expect(collect()).rejects.toBe(error)
+
+      expect(mockExec).toHaveBeenCalledTimes(5)
+    }
+  )
+
+  it('keeps a confirmed restore failure nonfatal', async () => {
+    failAfter([listing, references, 'MOVED', 'unreadable references'], true)
+
+    await expect(collect()).resolves.toBeUndefined()
+  })
+})
diff --git a/src/main/ssh/remote-install-gc.ts b/src/main/ssh/remote-install-gc.ts
index a76d119cf8a4..986154e356e6 100644
--- a/src/main/ssh/remote-install-gc.ts
+++ b/src/main/ssh/remote-install-gc.ts
@@ -95,7 +95,10 @@ export async function gcOldRemoteInstallVersions(
       host,
       listRemoteInstallBaseDirsCommand(host, baseDir, model)
     )
-  } catch {
+  } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
     return
   }
   const entries = listing
@@ -169,6 +172,9 @@ export async function gcOldRemoteInstallVersions(
       }
       removed.push(name)
     } catch (err) {
+      if (isUnconfirmedSshCommandTermination(err)) {
+        throw err
+      }
       console.warn(
         `[${model.id}] GC failed for ${dir}: ${err instanceof Error ? err.message : String(err)}`
       )
@@ -198,7 +204,10 @@ async function isCandidateSafeToRemove(
   let lockProbe: string
   try {
     lockProbe = await execHostCommand(conn, host, probeInstallLockExistsCommand(host, lockDir))
-  } catch {
+  } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
     return false
   }
   const lockState = lockProbe.trim()
@@ -224,7 +233,12 @@ async function isCandidateSafeToRemove(
       conn,
       host,
       probeFileExistsCommand(host, completePath)
-    ).catch(() => 'PARTIAL')
+    ).catch((err) => {
+      if (isUnconfirmedSshCommandTermination(err)) {
+        throw err
+      }
+      return 'PARTIAL'
+    })
     if (completeProbe.trim() !== 'COMPLETE') {
       // Crashed-install partial; leave for the next deploy to recover.
       return false
@@ -263,7 +277,11 @@ export async function gcOldRelayVersions(
   if (options?.nativeDepsCacheKeys?.length) {
     await gcRelayNativeDepsCache(conn, host, remoteHome, {
       pinnedKeys: options.nativeDepsCacheKeys
-    }).catch(() => {})
+    }).catch((err) => {
+      if (isUnconfirmedSshCommandTermination(err)) {
+        throw err
+      }
+    })
   }
 }
 
@@ -294,7 +312,10 @@ async function hasLiveRelaySocket(
     )
     const state = out.trim()
     return state !== 'DEAD' && state !== 'WAITING'
-  } catch {
+  } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
     // Why: an inconclusive liveness probe must never authorize deletion.
     return true
   }
diff --git a/src/main/ssh/ssh-connection-auth-fallback.test.ts b/src/main/ssh/ssh-connection-auth-fallback.test.ts
index 9e3760616c2e..20c973e1b2cf 100644
--- a/src/main/ssh/ssh-connection-auth-fallback.test.ts
+++ b/src/main/ssh/ssh-connection-auth-fallback.test.ts
@@ -179,6 +179,7 @@ describe('SshConnection', () => {
       'target-1',
       'password',
       'example.com',
+      undefined,
       expect.any(AbortSignal)
     )
   })
@@ -244,7 +245,7 @@ describe('SshConnection', () => {
         ],
         finish
       )
-      for (let turn = 0; turn < 8 && finish.mock.calls.length === 0; turn += 1) {
+      for (let turn = 0; turn < 20 && finish.mock.calls.length === 0; turn += 1) {
         await Promise.resolve()
       }
 
@@ -254,6 +255,7 @@ describe('SshConnection', () => {
         'target-1',
         'keyboard-interactive',
         'Duo two-factor login\nSelect push or enter a passcode.\nOption:',
+        false,
         expect.any(AbortSignal)
       )
       expect(onCredentialRequest).toHaveBeenNthCalledWith(
@@ -261,6 +263,7 @@ describe('SshConnection', () => {
         'target-1',
         'keyboard-interactive',
         'Duo two-factor login\nSelect push or enter a passcode.\nPasscode:',
+        false,
         expect.any(AbortSignal)
       )
       expect(finish).toHaveBeenCalledWith(['1', '123456'])
@@ -311,7 +314,7 @@ describe('SshConnection', () => {
 
       await vi.advanceTimersByTimeAsync(100_000)
       firstResponse.resolve('1')
-      for (let turn = 0; turn < 4 && onCredentialRequest.mock.calls.length < 2; turn += 1) {
+      for (let turn = 0; turn < 20 && onCredentialRequest.mock.calls.length < 2; turn += 1) {
         await Promise.resolve()
       }
       expect(onCredentialRequest).toHaveBeenCalledTimes(2)
@@ -321,7 +324,7 @@ describe('SshConnection', () => {
       expect(finish).not.toHaveBeenCalled()
 
       secondResponse.resolve('123456')
-      for (let turn = 0; turn < 4 && finish.mock.calls.length === 0; turn += 1) {
+      for (let turn = 0; turn < 20 && finish.mock.calls.length === 0; turn += 1) {
         await Promise.resolve()
       }
       expect(finish).toHaveBeenCalledWith(['1', '123456'])
@@ -337,7 +340,13 @@ describe('SshConnection', () => {
     ssh2Mock.connectBehavior = 'pending'
     let credentialSignal: AbortSignal | undefined
     const onCredentialRequest = vi.fn(
-      (_targetId: string, _kind: string, _detail: string, signal?: AbortSignal) => {
+      (
+        _targetId: string,
+        _kind: string,
+        _detail: string,
+        _echo?: boolean,
+        signal?: AbortSignal
+      ) => {
         credentialSignal = signal
         const response = Promise.withResolvers<string | null>()
         if (signal?.aborted) {
@@ -405,6 +414,7 @@ describe('SshConnection', () => {
         'target-1',
         'passphrase',
         keyPath,
+        undefined,
         expect.any(AbortSignal)
       )
     } finally {
diff --git a/src/main/ssh/ssh-connection-gssapi-fallback.test.ts b/src/main/ssh/ssh-connection-gssapi-fallback.test.ts
index 7dcc25410a8e..8eeb6994a501 100644
--- a/src/main/ssh/ssh-connection-gssapi-fallback.test.ts
+++ b/src/main/ssh/ssh-connection-gssapi-fallback.test.ts
@@ -204,6 +204,7 @@ describe('SshConnection', () => {
       'target-1',
       'password',
       'example.com',
+      undefined,
       expect.any(AbortSignal)
     )
   })
diff --git a/src/main/ssh/ssh-connection-utils.test.ts b/src/main/ssh/ssh-connection-utils.test.ts
index 53cdbf07dd66..00abeeb2052f 100644
--- a/src/main/ssh/ssh-connection-utils.test.ts
+++ b/src/main/ssh/ssh-connection-utils.test.ts
@@ -514,6 +514,11 @@ describe('buildConnectConfig', () => {
     expect(config.keepaliveInterval).toBe(15_000)
   })
 
+  it('enables keyboard-interactive auth so MFA challenges can be answered', () => {
+    const config = buildConnectConfig(makeTarget(), null)
+    expect(config.tryKeyboard).toBe(true)
+  })
+
   it('uses agent auth when no explicit key and SSH_AUTH_SOCK is set', () => {
     const config = buildConnectConfig(makeTarget(), null)
     expect(config.agent).toBe('/tmp/agent.sock')
diff --git a/src/main/ssh/ssh-connection-utils.ts b/src/main/ssh/ssh-connection-utils.ts
index 216e23e62034..48057b9c0884 100644
--- a/src/main/ssh/ssh-connection-utils.ts
+++ b/src/main/ssh/ssh-connection-utils.ts
@@ -17,10 +17,13 @@ export type SshCredentialKind = 'passphrase' | 'password' | 'keyboard-interactiv
 
 export type SshConnectionCallbacks = {
   onStateChange: (targetId: string, state: SshConnectionState) => void
+  // Why: echo carries the server's RFC 4256 echo flag for keyboard-interactive
+  // prompts so the UI knows whether the typed response may be shown.
   onCredentialRequest?: (
     targetId: string,
     kind: SshCredentialKind,
     detail: string,
+    echo?: boolean,
     signal?: AbortSignal
   ) => Promise<string | null>
 }
@@ -202,6 +205,9 @@ export function buildConnectConfig(
     username: effectiveUser,
     readyTimeout: CONNECT_TIMEOUT_MS,
     keepaliveInterval: 15_000,
+    // Why: lets servers deliver keyboard-interactive challenges (RFC 4256,
+    // commonly MFA after a partial password success). SshConnection answers
+    // them through the credential prompt callback.
     tryKeyboard: true
   }
 
diff --git a/src/main/ssh/ssh-connection.test.ts b/src/main/ssh/ssh-connection.test.ts
index a20167c2f4ae..5535c5e7e8e4 100644
--- a/src/main/ssh/ssh-connection.test.ts
+++ b/src/main/ssh/ssh-connection.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it, vi, beforeEach } from 'vitest'
 import {
   clientInstances,
   createSsh2Module,
+  emitSshEvent,
   eventHandlers,
   resetSshConnectionMocks,
   VALID_ED25519_HOST_KEY,
@@ -277,4 +278,322 @@ describe('SshConnection', () => {
 
     await expect(conn.connect()).rejects.toThrow('Connection disposed')
   })
+
+  describe('keyboard-interactive MFA', () => {
+    it('completes password + keyboard-interactive MFA auth and forwards the prompt', async () => {
+      vi.stubEnv('SSH_AUTH_SOCK', '')
+      ssh2Mock.connectSequence = [
+        new Error('All configured authentication methods failed'),
+        'silent'
+      ]
+      const onCredentialRequest = vi.fn(async (_targetId: string, kind: string) =>
+        kind === 'password' ? 'password-123' : '1'
+      )
+      const conn = new SshConnection(createTarget(), createCallbacks({ onCredentialRequest }))
+
+      const connectPromise = conn.connect()
+      await vi.waitFor(() => {
+        expect(eventHandlers.get('keyboard-interactive')?.size ?? 0).toBeGreaterThan(0)
+        expect(clientInstances).toHaveLength(2)
+      })
+      const finish = vi.fn()
+      emitSshEvent(
+        'keyboard-interactive',
+        '',
+        'Choose a verification method:',
+        '',
+        [{ prompt: 'Passcode or option (1-2):', echo: true }],
+        finish
+      )
+      await vi.waitFor(() => expect(finish).toHaveBeenCalledWith(['1']))
+      emitSshEvent('ready')
+      await connectPromise
+
+      expect(conn.getState().status).toBe('connected')
+      expect(clientInstances[1].lastConnectConfig).toMatchObject({
+        tryKeyboard: true,
+        password: 'password-123'
+      })
+      expect(onCredentialRequest).toHaveBeenCalledWith(
+        'target-1',
+        'password',
+        'example.com',
+        undefined,
+        expect.any(AbortSignal)
+      )
+      expect(onCredentialRequest).toHaveBeenCalledWith(
+        'target-1',
+        'keyboard-interactive',
+        'Choose a verification method:\nPasscode or option (1-2):',
+        true,
+        expect.any(AbortSignal)
+      )
+    })
+
+    it('auto-answers a keyboard-interactive password prompt with the cached password (echo=false)', async () => {
+      vi.stubEnv('SSH_AUTH_SOCK', '')
+      ssh2Mock.connectSequence = [
+        new Error('All configured authentication methods failed'),
+        'silent'
+      ]
+      const onCredentialRequest = vi.fn(async () => 'password-123')
+      const conn = new SshConnection(createTarget(), createCallbacks({ onCredentialRequest }))
+
+      const connectPromise = conn.connect()
+      await vi.waitFor(() => {
+        expect(eventHandlers.get('keyboard-interactive')?.size ?? 0).toBeGreaterThan(0)
+        expect(clientInstances).toHaveLength(2)
+      })
+      const finish = vi.fn()
+      emitSshEvent(
+        'keyboard-interactive',
+        '',
+        '',
+        '',
+        [{ prompt: 'Password: ', echo: false }],
+        finish
+      )
+      await vi.waitFor(() => expect(finish).toHaveBeenCalledWith(['password-123']))
+      emitSshEvent('ready')
+      await connectPromise
+
+      expect(conn.getState().status).toBe('connected')
+      expect(onCredentialRequest).toHaveBeenCalledTimes(1)
+    })
+
+    it('caches a password collected through a keyboard-interactive prompt, but never caches an OTP', async () => {
+      vi.stubEnv('SSH_AUTH_SOCK', '')
+      ssh2Mock.connectSequence = ['silent']
+      const onCredentialRequest = vi.fn(async (_targetId: string, kind: string) =>
+        kind === 'password' ? 'password-123' : '654321'
+      )
+      const conn = new SshConnection(createTarget(), createCallbacks({ onCredentialRequest }))
+
+      const connectPromise = conn.connect()
+      await vi.waitFor(() =>
+        expect(eventHandlers.get('keyboard-interactive')?.size ?? 0).toBeGreaterThan(0)
+      )
+      const finish = vi.fn()
+      emitSshEvent(
+        'keyboard-interactive',
+        '',
+        '',
+        '',
+        [
+          { prompt: 'Password: ', echo: false },
+          { prompt: 'One-time password:', echo: false }
+        ],
+        finish
+      )
+      await vi.waitFor(() => expect(finish).toHaveBeenCalledWith(['password-123', '654321']))
+      emitSshEvent('ready')
+      await connectPromise
+
+      expect(onCredentialRequest).toHaveBeenCalledWith(
+        'target-1',
+        'password',
+        'example.com',
+        undefined,
+        expect.any(AbortSignal)
+      )
+      expect(onCredentialRequest).toHaveBeenCalledWith(
+        'target-1',
+        'keyboard-interactive',
+        'One-time password:',
+        false,
+        expect.any(AbortSignal)
+      )
+      expect(conn.hasCachedCredential()).toBe(true)
+
+      // Reconnect: the OTP prompt must be asked again (never auto-answered from a cache).
+      onCredentialRequest.mockClear()
+      ssh2Mock.connectSequence = ['silent']
+      const privateConn = conn as unknown as { attemptConnect: () => Promise<void> }
+      const reconnectPromise = privateConn.attemptConnect()
+      await vi.waitFor(() =>
+        expect(eventHandlers.get('keyboard-interactive')?.size ?? 0).toBeGreaterThan(0)
+      )
+      const finish2 = vi.fn()
+      emitSshEvent(
+        'keyboard-interactive',
+        '',
+        '',
+        '',
+        [{ prompt: 'One-time password:', echo: false }],
+        finish2
+      )
+      await vi.waitFor(() => expect(finish2).toHaveBeenCalledWith(['654321']))
+      // Why not answered from the password cache: this round only sends the
+      // OTP prompt (no password-looking prompt), so it must reach the user
+      // as a fresh 'keyboard-interactive' request every time.
+      expect(onCredentialRequest).toHaveBeenCalledWith(
+        'target-1',
+        'keyboard-interactive',
+        'One-time password:',
+        false,
+        expect.any(AbortSignal)
+      )
+      emitSshEvent('ready')
+      await reconnectPromise
+    })
+
+    it('re-prompts instead of replaying the cached password on a second keyboard-interactive round', async () => {
+      vi.stubEnv('SSH_AUTH_SOCK', '')
+      ssh2Mock.connectSequence = ['silent']
+      const onCredentialRequest = vi.fn(async () => 'password-123')
+      const conn = new SshConnection(createTarget(), createCallbacks({ onCredentialRequest }))
+
+      const connectPromise = conn.connect()
+      await vi.waitFor(() =>
+        expect(eventHandlers.get('keyboard-interactive')?.size ?? 0).toBeGreaterThan(0)
+      )
+      const finish = vi.fn()
+      emitSshEvent(
+        'keyboard-interactive',
+        '',
+        '',
+        '',
+        [{ prompt: 'Password: ', echo: false }],
+        finish
+      )
+      await vi.waitFor(() => expect(finish).toHaveBeenCalledWith(['password-123']))
+      expect(onCredentialRequest).toHaveBeenCalledTimes(1)
+
+      // The server rejected that password and opened a new round for it. Auto-answering from the
+      // cache again would replay the rejected value up to the round cap without asking the user.
+      onCredentialRequest.mockClear()
+      const finish2 = vi.fn()
+      emitSshEvent(
+        'keyboard-interactive',
+        '',
+        '',
+        '',
+        [{ prompt: 'Password: ', echo: false }],
+        finish2
+      )
+      await vi.waitFor(() => expect(finish2).toHaveBeenCalledWith(['password-123']))
+      expect(onCredentialRequest).toHaveBeenCalledWith(
+        'target-1',
+        'password',
+        'example.com',
+        undefined,
+        expect.any(AbortSignal)
+      )
+
+      emitSshEvent('ready')
+      await connectPromise
+    })
+
+    it('does not fall back to the password prompt after a cancelled keyboard-interactive prompt', async () => {
+      vi.stubEnv('SSH_AUTH_SOCK', '')
+      ssh2Mock.connectSequence = ['silent']
+      const onCredentialRequest = vi.fn(async () => null)
+      const conn = new SshConnection(createTarget(), createCallbacks({ onCredentialRequest }))
+
+      const connectPromise = conn.connect()
+      connectPromise.catch(() => {})
+      await vi.waitFor(() =>
+        expect(eventHandlers.get('keyboard-interactive')?.size ?? 0).toBeGreaterThan(0)
+      )
+      const finish = vi.fn()
+      emitSshEvent(
+        'keyboard-interactive',
+        '',
+        '',
+        '',
+        [{ prompt: 'Duo passcode:', echo: false }],
+        finish
+      )
+      await vi.waitFor(() => expect(finish).toHaveBeenCalledWith([]))
+
+      // Why no server error event: a cancelled prompt now fails the attempt
+      // immediately instead of waiting on a server round-trip that will
+      // never come from a user decision.
+      await expect(connectPromise).rejects.toThrow('Keyboard-interactive authentication cancelled')
+      expect(onCredentialRequest).toHaveBeenCalledTimes(1)
+      expect(conn.getState().status).toBe('auth-failed')
+    })
+
+    it('does not restore the password cache when a prompt resolves after disconnect', async () => {
+      vi.stubEnv('SSH_AUTH_SOCK', '')
+      ssh2Mock.connectSequence = ['silent']
+      let answer: (value: string) => void = () => {}
+      const onCredentialRequest = vi.fn(
+        () =>
+          new Promise<string>((resolve) => {
+            answer = resolve
+          })
+      )
+      const conn = new SshConnection(createTarget(), createCallbacks({ onCredentialRequest }))
+      const connecting = conn.connect()
+      connecting.catch(() => {})
+      await vi.waitFor(() => expect(eventHandlers.has('keyboard-interactive')).toBe(true))
+      const finish = vi.fn()
+      emitSshEvent(
+        'keyboard-interactive',
+        '',
+        '',
+        '',
+        [{ prompt: 'Password:', echo: false }],
+        finish
+      )
+      await vi.waitFor(() => expect(onCredentialRequest).toHaveBeenCalledOnce())
+      await conn.disconnect()
+      answer('obsolete-password')
+      await vi.waitFor(() => expect(finish).toHaveBeenCalledWith([]))
+      expect(conn.hasCachedCredential()).toBe(false)
+      expect(conn.getState().status).toBe('disconnected')
+      await expect(connecting).rejects.toThrow()
+    })
+
+    it('does not treat a missing credential callback as user cancellation', async () => {
+      vi.stubEnv('SSH_AUTH_SOCK', '')
+      ssh2Mock.connectSequence = ['silent']
+      const conn = new SshConnection(createTarget(), createCallbacks())
+      const connecting = conn.connect()
+      connecting.catch(() => {})
+      await vi.waitFor(() => expect(eventHandlers.has('keyboard-interactive')).toBe(true))
+      const finish = vi.fn()
+      emitSshEvent('keyboard-interactive', '', '', '', [{ prompt: 'Code:', echo: false }], finish)
+      await vi.waitFor(() => expect(finish).toHaveBeenCalledWith([]))
+      emitSshEvent('error', new Error('All configured authentication methods failed'))
+      await expect(connecting).rejects.toThrow('All configured authentication methods failed')
+      conn.disconnect()
+    })
+
+    it('fails auth (not cancellation) when the server rejects an incorrect MFA answer', async () => {
+      vi.stubEnv('SSH_AUTH_SOCK', '')
+      ssh2Mock.connectSequence = [
+        'silent',
+        new Error('All configured authentication methods failed')
+      ]
+      const onCredentialRequest = vi.fn(async () => '000000')
+      const conn = new SshConnection(createTarget(), createCallbacks({ onCredentialRequest }))
+
+      const connectPromise = conn.connect()
+      connectPromise.catch(() => {})
+      await vi.waitFor(() =>
+        expect(eventHandlers.get('keyboard-interactive')?.size ?? 0).toBeGreaterThan(0)
+      )
+      const finish = vi.fn()
+      emitSshEvent(
+        'keyboard-interactive',
+        '',
+        '',
+        '',
+        [{ prompt: 'Verification code:', echo: false }],
+        finish
+      )
+      await vi.waitFor(() => expect(finish).toHaveBeenCalledWith(['000000']))
+      // Why the second connectSequence entry is a plain error rather than
+      // another keyboard-interactive round: an incorrect OTP is a distinct
+      // case from cancellation — the user DID answer, the server rejected
+      // it — so this must not go through the keyboardInteractiveCancelled
+      // short-circuit at all.
+      emitSshEvent('error', new Error('All configured authentication methods failed'))
+
+      await expect(connectPromise).rejects.toThrow('All configured authentication methods failed')
+      expect(conn.getState().status).toBe('auth-failed')
+    })
+  })
 })
diff --git a/src/main/ssh/ssh-connection.ts b/src/main/ssh/ssh-connection.ts
index afc3ed6240ba..448efe0ad388 100644
--- a/src/main/ssh/ssh-connection.ts
+++ b/src/main/ssh/ssh-connection.ts
@@ -45,6 +45,7 @@ import {
   type SshConnectionCallbacks,
   type SshCredentialKind
 } from './ssh-connection-utils'
+import { collectKeyboardInteractiveResponses } from './ssh-keyboard-interactive'
 import { resolveEffectiveProxy, spawnProxyCommand } from './ssh-proxy-command'
 import {
   createHostKeyVerifier,
@@ -114,7 +115,6 @@ const HOST_KEY_SOURCE_READ_TIMEOUT_MS = 5_000
 const SSH_KEYBOARD_INTERACTIVE_MAX_ROUNDS = 8
 const SSH_KEYBOARD_INTERACTIVE_READY_TIMEOUT_MS = SSH_CREDENTIAL_TIMEOUT_MS + 5_000
 const SSH_KEYBOARD_INTERACTIVE_MAX_PROMPTS = 8
-const SSH_KEYBOARD_INTERACTIVE_TEXT_MAX = 4_096
 
 // Upper bound on waiting for an aborted channel's open/close to settle before rejecting anyway.
 const ABORTED_CHANNEL_CLOSE_GRACE_MS = 5_000
@@ -206,6 +206,9 @@ export class SshConnection {
   private disposed = false
   private cachedPassphrase: string | null = null
   private cachedPassword: string | null = null
+  private keyboardInteractiveCancelled = false
+  // A rejected cached password must reach the user on the next round.
+  private keyboardInteractivePasswordState = { passwordAutoAnswered: false }
   private hostKeyFingerprint: string | undefined
   private connectGeneration = 0
 
@@ -736,7 +739,8 @@ export class SshConnection {
   private async requestCredential(
     kind: SshCredentialKind,
     detail: string,
-    connectGeneration: number
+    connectGeneration: number,
+    echo?: boolean
   ): Promise<string | null | undefined> {
     if (this.disposed || connectGeneration !== this.connectGeneration) {
       return undefined
@@ -745,14 +749,16 @@ export class SshConnection {
       this.target.id,
       kind,
       detail,
+      echo,
       this.credentialAbortController.signal
     )
   }
 
   private async answerKeyboardInteractive(
+    hostDetail: string,
     name: string,
     instructions: string,
-    prompts: readonly Prompt[],
+    prompts: Prompt[],
     connectGeneration: number,
     onPromptStart: () => void
   ): Promise<string[] | null> {
@@ -760,25 +766,36 @@ export class SshConnection {
       return null
     }
     const heading = [name.trim(), instructions.trim()].filter(Boolean).join('\n')
-    const responses: string[] = []
-    for (const prompt of prompts) {
-      onPromptStart()
-      const promptText = prompt.prompt.trim() || 'Verification response'
-      const detail = [heading, promptText]
-        .filter(Boolean)
-        .join('\n')
-        .slice(0, SSH_KEYBOARD_INTERACTIVE_TEXT_MAX)
-      const response = await this.requestCredential(
-        'keyboard-interactive',
-        detail,
-        connectGeneration
-      )
-      if (response === null || response === undefined) {
-        return null
-      }
-      responses.push(response)
-    }
-    return this.disposed || connectGeneration !== this.connectGeneration ? null : responses
+    const isCurrent = (): boolean => !this.disposed && connectGeneration === this.connectGeneration
+    const responses = await collectKeyboardInteractiveResponses(
+      {
+        targetId: this.target.id,
+        hostDetail,
+        // Preserve a missing prompter as a capability gap, not a cancellation.
+        requestCredential: this.callbacks.onCredentialRequest
+          ? async (_targetId, kind, detail, echo) =>
+              (await this.requestCredential(kind, detail, connectGeneration, echo)) ?? null
+          : undefined,
+        getCachedPassword: () => this.cachedPassword,
+        setCachedPassword: (value) => {
+          if (isCurrent()) {
+            this.cachedPassword = value
+          }
+        },
+        markCancelled: () => {
+          // A stale prompt must not cancel the current attempt.
+          if (isCurrent()) {
+            this.keyboardInteractiveCancelled = true
+          }
+        },
+        isCancelled: () => !isCurrent() || this.keyboardInteractiveCancelled,
+        state: this.keyboardInteractivePasswordState
+      },
+      heading,
+      prompts,
+      onPromptStart
+    )
+    return isCurrent() ? responses : null
   }
 
   private async attemptConnect(connectGeneration = ++this.connectGeneration): Promise<void> {
@@ -787,6 +804,8 @@ export class SshConnection {
     this.setState('connecting')
     this.proxyProcess?.kill()
     this.proxyProcess = null
+    this.keyboardInteractiveCancelled = false
+    this.keyboardInteractivePasswordState = { passwordAutoAnswered: false }
 
     const resolved = await resolveWithSshG(this.target.configHost || this.target.label).catch(
       () => null
@@ -874,6 +893,13 @@ export class SshConnection {
         throw err
       }
 
+      // Cancellation must stop the credential and transport fallback chain.
+      if (this.keyboardInteractiveCancelled) {
+        this.proxyProcess?.kill()
+        this.proxyProcess = null
+        throw err
+      }
+
       if (isSystemSshFallbackError(err)) {
         this.proxyProcess?.kill()
         this.proxyProcess = null
@@ -921,6 +947,12 @@ export class SshConnection {
               this.proxyProcess = null
               throw keyErr
             }
+            // Key fallback must honor the same cancellation boundary.
+            if (this.keyboardInteractiveCancelled) {
+              this.proxyProcess?.kill()
+              this.proxyProcess = null
+              throw keyErr
+            }
             authError = keyErr
             const passphraseKeyPath = getPassphrasePrivateKeyPath(keyConfig)
             // Why: with GSSAPI enabled, let the reactive system-ssh probe try a Kerberos ticket before prompting for the passphrase; the prompt still runs if it fails.
@@ -1529,10 +1561,33 @@ export class SshConnection {
           return
         }
         rearmStartupTimer(SSH_KEYBOARD_INTERACTIVE_READY_TIMEOUT_MS)
-        void this.answerKeyboardInteractive(name, instructions, prompts, connectGeneration, () =>
-          rearmStartupTimer(SSH_KEYBOARD_INTERACTIVE_READY_TIMEOUT_MS)
+        void this.answerKeyboardInteractive(
+          config.host || this.target.label,
+          name,
+          instructions,
+          prompts,
+          connectGeneration,
+          () => rearmStartupTimer(SSH_KEYBOARD_INTERACTIVE_READY_TIMEOUT_MS)
         ).then(
           (responses) => {
+            // Settle cancellation immediately, but still answer ssh2’s pending callback.
+            if (
+              responses === null &&
+              (connectGeneration !== this.connectGeneration || this.keyboardInteractiveCancelled)
+            ) {
+              finish([])
+              if (!settled) {
+                // Preserve the auth-failed state for explicit cancellation.
+                const cancelledError = Object.assign(
+                  new Error(
+                    `Keyboard-interactive authentication cancelled for ${this.target.label}`
+                  ),
+                  { level: 'client-authentication' }
+                )
+                onStartupError(cancelledError)
+              }
+              return
+            }
             const attemptIsCurrent =
               !settled && !this.disposed && connectGeneration === this.connectGeneration
             finish(attemptIsCurrent ? (responses ?? []) : [])
diff --git a/src/main/ssh/ssh-keyboard-interactive-wire.test.ts b/src/main/ssh/ssh-keyboard-interactive-wire.test.ts
new file mode 100644
index 000000000000..5f45f27a52d1
--- /dev/null
+++ b/src/main/ssh/ssh-keyboard-interactive-wire.test.ts
@@ -0,0 +1,118 @@
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { Server, utils, type Connection } from 'ssh2'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { SshConnection } from './ssh-connection'
+import { createCallbacks, createResolvedConfig, createTarget } from './ssh-connection-test-fixtures'
+import { initSshHostKeyStoreFile } from './ssh-host-key-store'
+import { resolveWithSshG } from './ssh-config-parser'
+import type * as SshConfigParser from './ssh-config-parser'
+
+vi.mock('./ssh-config-parser', async (importOriginal) => ({
+  ...(await importOriginal<typeof SshConfigParser>()),
+  resolveWithSshG: vi.fn()
+}))
+
+describe('keyboard-interactive over a real SSH socket', () => {
+  let profile: string
+  let server: Server
+  let conn: SshConnection | undefined
+  const sockets = new Set<Connection>()
+
+  beforeEach(() => {
+    profile = mkdtempSync(join(tmpdir(), 'orca-keyboard-wire-'))
+    initSshHostKeyStoreFile(join(profile, 'host-keys.json'))
+    vi.stubEnv('SSH_AUTH_SOCK', '')
+    vi.mocked(resolveWithSshG).mockResolvedValue(
+      createResolvedConfig({
+        hostname: '127.0.0.1',
+        identitiesOnly: true,
+        identityAgent: 'none',
+        proxyUseFdpass: false,
+        strictHostKeyChecking: 'no'
+      })
+    )
+  })
+
+  afterEach(async () => {
+    await conn?.disconnect()
+    for (const socket of sockets) {
+      socket.end()
+    }
+    sockets.clear()
+    if (server) {
+      await new Promise<void>((resolve) => server.close(() => resolve()))
+    }
+    vi.unstubAllEnvs()
+    rmSync(profile, { recursive: true, force: true })
+  })
+
+  it.each([false, true])(
+    'completes password then MFA with empty push response=%s',
+    async (empty) => {
+      const received: string[][] = []
+      const methods: string[] = []
+      server = new Server(
+        { hostKeys: [utils.generateKeyPairSync('ecdsa', { bits: 256 }).private] },
+        (socket) => {
+          sockets.add(socket)
+          socket.on('error', () => {})
+          socket.on('close', () => sockets.delete(socket))
+          let passwordAccepted = false
+          socket.on('authentication', (context) => {
+            methods.push(context.method)
+            if (context.method === 'password' && context.password === 'fixture-password') {
+              passwordAccepted = true
+              context.reject(['keyboard-interactive'], true)
+            } else if (context.method === 'keyboard-interactive' && passwordAccepted) {
+              context.prompt(
+                [
+                  {
+                    prompt: empty ? 'Press Enter for push:' : 'Passcode or option (1-2):',
+                    echo: true
+                  }
+                ],
+                'MFA',
+                'Choose verification:',
+                (answers) => {
+                  received.push(answers)
+                  if (answers[0] === (empty ? '' : '1')) {
+                    context.accept()
+                  } else {
+                    context.reject(['keyboard-interactive'])
+                  }
+                }
+              )
+            } else {
+              context.reject(['password'])
+            }
+          })
+        }
+      )
+      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 did not bind')
+      }
+      const onCredentialRequest = vi.fn(async (_id: string, kind: string) =>
+        kind === 'password' ? 'fixture-password' : empty ? '' : '1'
+      )
+      conn = new SshConnection(
+        createTarget({ host: '127.0.0.1', port: address.port }),
+        createCallbacks({ onCredentialRequest })
+      )
+      await conn.connect()
+      expect(conn.getState().status).toBe('connected')
+      expect(received).toEqual([[empty ? '' : '1']])
+      expect(methods).toContain('password')
+      expect(onCredentialRequest).toHaveBeenLastCalledWith(
+        'target-1',
+        'keyboard-interactive',
+        `MFA\nChoose verification:\n${empty ? 'Press Enter for push:' : 'Passcode or option (1-2):'}`,
+        true,
+        expect.any(AbortSignal)
+      )
+    }
+  )
+})
diff --git a/src/main/ssh/ssh-keyboard-interactive.test.ts b/src/main/ssh/ssh-keyboard-interactive.test.ts
new file mode 100644
index 000000000000..0c426fbdb5f2
--- /dev/null
+++ b/src/main/ssh/ssh-keyboard-interactive.test.ts
@@ -0,0 +1,215 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+  collectKeyboardInteractiveResponses,
+  formatKeyboardInteractivePromptDetail,
+  isKeyboardInteractivePasswordPrompt,
+  type KeyboardInteractiveSession
+} from './ssh-keyboard-interactive'
+
+function createSession(
+  overrides: Partial<KeyboardInteractiveSession> = {}
+): KeyboardInteractiveSession & { cancelled: { value: boolean } } {
+  const cancelled = { value: false }
+  return {
+    targetId: 'target-1',
+    hostDetail: 'example.com',
+    requestCredential: vi.fn(async () => 'answer'),
+    getCachedPassword: () => null,
+    setCachedPassword: vi.fn(),
+    markCancelled: () => {
+      cancelled.value = true
+    },
+    isCancelled: () => cancelled.value,
+    state: { passwordAutoAnswered: false },
+    cancelled,
+    ...overrides
+  }
+}
+
+describe('isKeyboardInteractivePasswordPrompt', () => {
+  it('matches masked password prompts', () => {
+    expect(isKeyboardInteractivePasswordPrompt({ prompt: 'Password: ', echo: false })).toBe(true)
+    expect(isKeyboardInteractivePasswordPrompt({ prompt: "user@host's PASSWORD:" })).toBe(true)
+  })
+
+  it('rejects echoed prompts even when they mention a password', () => {
+    expect(isKeyboardInteractivePasswordPrompt({ prompt: 'Password: ', echo: true })).toBe(false)
+  })
+
+  it('rejects one-time password and OTP prompts', () => {
+    expect(isKeyboardInteractivePasswordPrompt({ prompt: 'One-time password:', echo: false })).toBe(
+      false
+    )
+    expect(isKeyboardInteractivePasswordPrompt({ prompt: 'OTP password code:', echo: false })).toBe(
+      false
+    )
+  })
+
+  it('rejects verification prompts that never mention a password', () => {
+    expect(isKeyboardInteractivePasswordPrompt({ prompt: 'Passcode:', echo: false })).toBe(false)
+    expect(isKeyboardInteractivePasswordPrompt({ prompt: 'Duo push sent', echo: false })).toBe(
+      false
+    )
+  })
+})
+
+describe('formatKeyboardInteractivePromptDetail', () => {
+  it('joins instructions and prompt on separate lines', () => {
+    expect(formatKeyboardInteractivePromptDetail('Pick an option:', 'Passcode: ')).toBe(
+      'Pick an option:\nPasscode:'
+    )
+  })
+
+  it('drops the missing half', () => {
+    expect(formatKeyboardInteractivePromptDetail('', 'Passcode: ')).toBe('Passcode:')
+    expect(formatKeyboardInteractivePromptDetail('Approve the push. ', '')).toBe(
+      'Approve the push.'
+    )
+  })
+})
+
+describe('collectKeyboardInteractiveResponses', () => {
+  it('forwards verification prompts with instructions and the echo flag', async () => {
+    const requestCredential = vi.fn(async () => '1')
+    const session = createSession({ requestCredential })
+
+    const responses = await collectKeyboardInteractiveResponses(session, 'Choose an option:', [
+      { prompt: 'Passcode or option (1-2):', echo: true }
+    ])
+
+    expect(responses).toEqual(['1'])
+    expect(requestCredential).toHaveBeenCalledWith(
+      'target-1',
+      'keyboard-interactive',
+      'Choose an option:\nPasscode or option (1-2):',
+      true
+    )
+  })
+
+  it('answers a password prompt from the cache without prompting', async () => {
+    const requestCredential = vi.fn(async () => 'unused')
+    const session = createSession({
+      requestCredential,
+      getCachedPassword: () => 'password-123'
+    })
+
+    const responses = await collectKeyboardInteractiveResponses(session, '', [
+      { prompt: 'Password: ', echo: false }
+    ])
+
+    expect(responses).toEqual(['password-123'])
+    expect(requestCredential).not.toHaveBeenCalled()
+    expect(session.state.passwordAutoAnswered).toBe(true)
+  })
+
+  it('re-prompts when the server rejects the auto-answered cached password', async () => {
+    const requestCredential = vi.fn(async () => 'corrected-password')
+    const setCachedPassword = vi.fn()
+    const session = createSession({
+      requestCredential,
+      getCachedPassword: () => 'stale-password',
+      setCachedPassword,
+      state: { passwordAutoAnswered: true }
+    })
+
+    const responses = await collectKeyboardInteractiveResponses(session, '', [
+      { prompt: 'Password: ', echo: false }
+    ])
+
+    expect(responses).toEqual(['corrected-password'])
+    expect(requestCredential).toHaveBeenCalledWith('target-1', 'password', 'example.com')
+    expect(setCachedPassword).toHaveBeenCalledWith('corrected-password')
+  })
+
+  it('collects and caches the password when nothing is cached yet', async () => {
+    const requestCredential = vi.fn(async () => 'password-123')
+    const setCachedPassword = vi.fn()
+    const session = createSession({ requestCredential, setCachedPassword })
+
+    const responses = await collectKeyboardInteractiveResponses(session, '', [
+      { prompt: 'Password: ', echo: false },
+      { prompt: 'Duo push approval', echo: false }
+    ])
+
+    expect(responses).toEqual(['password-123', 'password-123'])
+    expect(requestCredential).toHaveBeenNthCalledWith(1, 'target-1', 'password', 'example.com')
+    expect(requestCredential).toHaveBeenNthCalledWith(
+      2,
+      'target-1',
+      'keyboard-interactive',
+      'Duo push approval',
+      false
+    )
+    expect(setCachedPassword).toHaveBeenCalledWith('password-123')
+  })
+
+  it('returns null and marks the session cancelled when the user dismisses a prompt', async () => {
+    const session = createSession({ requestCredential: vi.fn(async () => null) })
+
+    const responses = await collectKeyboardInteractiveResponses(session, '', [
+      { prompt: 'Duo passcode:', echo: false }
+    ])
+
+    expect(responses).toBeNull()
+    expect(session.isCancelled()).toBe(true)
+  })
+
+  it('short-circuits every later round once cancelled', async () => {
+    const requestCredential = vi.fn(async () => 'answer')
+    const session = createSession({ requestCredential })
+    session.markCancelled()
+
+    const responses = await collectKeyboardInteractiveResponses(session, '', [
+      { prompt: 'Duo passcode:', echo: false }
+    ])
+
+    expect(responses).toBeNull()
+    expect(requestCredential).not.toHaveBeenCalled()
+  })
+
+  it('returns null when no credential prompter is available', async () => {
+    const session = createSession({ requestCredential: undefined })
+
+    const responses = await collectKeyboardInteractiveResponses(session, '', [
+      { prompt: 'Password: ', echo: false }
+    ])
+
+    expect(responses).toBeNull()
+  })
+
+  it('discards a password resolved after the attempt is cancelled', async () => {
+    let answer: (value: string) => void = () => {}
+    const requestCredential = vi
+      .fn(async () => 'code')
+      .mockImplementationOnce(
+        () =>
+          new Promise<string>((resolve) => {
+            answer = resolve
+          })
+      )
+    const setCachedPassword = vi.fn()
+    const session = createSession({ requestCredential, setCachedPassword })
+    const collecting = collectKeyboardInteractiveResponses(session, '', [
+      { prompt: 'Password:', echo: false },
+      { prompt: 'Code:', echo: false }
+    ])
+    session.markCancelled()
+    answer('obsolete-password')
+    expect(await collecting).toBeNull()
+    expect(setCachedPassword).not.toHaveBeenCalled()
+    expect(requestCredential).toHaveBeenCalledTimes(1)
+  })
+
+  it('accepts an empty response without caching it as a password', async () => {
+    const requestCredential = vi.fn(async () => '')
+    const setCachedPassword = vi.fn()
+    const session = createSession({ requestCredential, setCachedPassword })
+
+    const responses = await collectKeyboardInteractiveResponses(session, '', [
+      { prompt: 'Password: ', echo: false }
+    ])
+
+    expect(responses).toEqual([''])
+    expect(setCachedPassword).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/ssh/ssh-keyboard-interactive.ts b/src/main/ssh/ssh-keyboard-interactive.ts
new file mode 100644
index 000000000000..fae202878486
--- /dev/null
+++ b/src/main/ssh/ssh-keyboard-interactive.ts
@@ -0,0 +1,111 @@
+import type { Prompt } from 'ssh2'
+import type { SshConnectionCallbacks } from './ssh-connection-utils'
+
+// Why: servers commonly reuse keyboard-interactive (RFC 4256) to collect the
+// login password itself before issuing MFA challenges. Password-looking
+// prompts route through the password credential flow (and its cache) so
+// reconnects stay silent; every other prompt needs a fresh human answer.
+const PASSWORD_PROMPT = /password/i
+// Why: a one-time code answered with the cached login password would burn MFA
+// attempts (and can lock the account) on every reconnect.
+const ONE_TIME_PROMPT = /one.?time|otp/i
+// Why: bounds a malicious/misbehaving server's prompt text before it reaches the credential dialog.
+const PROMPT_DETAIL_MAX = 4_096
+
+export function isKeyboardInteractivePasswordPrompt(prompt: Prompt): boolean {
+  return (
+    prompt.echo !== true &&
+    PASSWORD_PROMPT.test(prompt.prompt) &&
+    !ONE_TIME_PROMPT.test(prompt.prompt)
+  )
+}
+
+export function formatKeyboardInteractivePromptDetail(
+  instructions: string,
+  promptText: string
+): string {
+  const trimmedInstructions = instructions.trim()
+  const trimmedPrompt = promptText.trim()
+  const detail =
+    !trimmedInstructions || !trimmedPrompt
+      ? trimmedInstructions || trimmedPrompt
+      : `${trimmedInstructions}\n${trimmedPrompt}`
+  return detail.slice(0, PROMPT_DETAIL_MAX)
+}
+
+export type KeyboardInteractiveSession = {
+  targetId: string
+  hostDetail: string
+  requestCredential: SshConnectionCallbacks['onCredentialRequest']
+  getCachedPassword: () => string | null
+  setCachedPassword: (value: string) => void
+  markCancelled: () => void
+  isCancelled: () => boolean
+  // Why: one cached-password auto-answer per connection attempt — a second
+  // password prompt in the same attempt means the server rejected the cached
+  // value, so the user must be asked again instead of looping a bad password.
+  state: { passwordAutoAnswered: boolean }
+}
+
+// Answers one keyboard-interactive round. Returns null when the user
+// cancelled (or no prompter is available); callers respond with no answers so
+// the server fails the round and the regular auth-error flow takes over.
+export async function collectKeyboardInteractiveResponses(
+  session: KeyboardInteractiveSession,
+  instructions: string,
+  prompts: Prompt[],
+  onPromptStart?: () => void
+): Promise<string[] | null> {
+  if (session.isCancelled()) {
+    return null
+  }
+  // Why: a missing prompter is a capability gap, not a user decision — it
+  // must return null WITHOUT calling markCancelled(), or SshConnection would
+  // treat it as an explicit decline and skip its passphrase/password rungs.
+  if (!session.requestCredential) {
+    return null
+  }
+  const responses: string[] = []
+  for (const prompt of prompts) {
+    onPromptStart?.()
+    const value = isKeyboardInteractivePasswordPrompt(prompt)
+      ? await answerPasswordPrompt(session)
+      : await session.requestCredential(
+          session.targetId,
+          'keyboard-interactive',
+          formatKeyboardInteractivePromptDetail(instructions, prompt.prompt),
+          prompt.echo
+        )
+    if (session.isCancelled()) {
+      return null
+    }
+    if (value == null) {
+      session.markCancelled()
+      return null
+    }
+    responses.push(value)
+  }
+  return responses
+}
+
+async function answerPasswordPrompt(
+  session: KeyboardInteractiveSession
+): Promise<string | null | undefined> {
+  const cached = session.getCachedPassword()
+  if (cached != null && !session.state.passwordAutoAnswered) {
+    session.state.passwordAutoAnswered = true
+    return cached
+  }
+  const value = await session.requestCredential?.(session.targetId, 'password', session.hostDetail)
+  if (session.isCancelled()) {
+    return null
+  }
+  if (value == null) {
+    return value
+  }
+  session.state.passwordAutoAnswered = true
+  if (value) {
+    session.setCachedPassword(value)
+  }
+  return value
+}
diff --git a/src/main/ssh/ssh-pending-pty-kill-replay.test.ts b/src/main/ssh/ssh-pending-pty-kill-replay.test.ts
index 7f682c6c1b65..95296aa6434b 100644
--- a/src/main/ssh/ssh-pending-pty-kill-replay.test.ts
+++ b/src/main/ssh/ssh-pending-pty-kill-replay.test.ts
@@ -134,6 +134,28 @@ describe('replayPendingSshPtyKills', () => {
     expect(terminated).toEqual(['pty-1'])
   })
 
+  // An offline close across a relaunch never learned the incarnation; the epoch-scoped id is the fence.
+  it('replays an epoch-scoped stop that carries no incarnation', async () => {
+    const relayPtyId = 'pty2:epoch-a:4'
+    const { store, cleared, terminated } = createStoreStub([
+      { ptyId: relayPtyId, intent: { requestedAt: NOW, attempts: 0 } }
+    ])
+    const { provider, shutdown } = createProviderStub([{ relayPtyId, incarnationId: 'inc-live' }])
+    await replayPendingSshPtyKills({
+      targetId: TARGET,
+      store,
+      provider,
+      shouldContinue: () => true,
+      now: () => NOW
+    })
+    expect(shutdown).toHaveBeenCalledWith(`ssh:ssh-1@@${relayPtyId}`, {
+      immediate: true,
+      expectedIncarnationId: undefined
+    })
+    expect(cleared).toEqual([relayPtyId])
+    expect(terminated).toEqual([relayPtyId])
+  })
+
   // #16970: a redeployed relay renumbers from pty-1, so this id now names someone else's shell.
   it('refuses to kill a recycled relay id and expires the lease that named it', async () => {
     const { store, cleared, terminated, expired, recycled } = createStoreStub([
diff --git a/src/main/ssh/ssh-relay-deploy-staged-upload.test.ts b/src/main/ssh/ssh-relay-deploy-staged-upload.test.ts
index 09ebb1354794..26ba5a2d9906 100644
--- a/src/main/ssh/ssh-relay-deploy-staged-upload.test.ts
+++ b/src/main/ssh/ssh-relay-deploy-staged-upload.test.ts
@@ -323,6 +323,70 @@ describe('deployAndLaunchRelay staged uploads', () => {
     expect(uploadStageRemovals[0]).toContain('/.orca-remote/.upload-stages/claim-0')
   })
 
+  it.each(['lock acquisition', 'locked recheck'])(
+    'preserves the stage after uncertain %s termination',
+    async (phase) => {
+      const conn = makeMockConnection()
+      const error = Object.assign(new Error('install command still running'), {
+        sshChannelCloseConfirmed: false
+      })
+      vi.mocked(isRelayAlreadyInstalled).mockResolvedValueOnce(false)
+      if (phase === 'lock acquisition') {
+        vi.mocked(acquireInstallLock).mockRejectedValueOnce(error)
+      } else {
+        vi.mocked(isRelayAlreadyInstalled).mockRejectedValueOnce(error)
+      }
+      vi.mocked(execCommand).mockImplementation(async (_conn, command) => {
+        if (command.includes('uname')) {
+          return '__ORCA_REMOTE_PLATFORM__ Linux x86_64'
+        }
+        if (command === 'echo $HOME') {
+          return '/home/user'
+        }
+        return stageCommandResponse(command) ?? ''
+      })
+      conn.writeFile = vi.fn().mockResolvedValue(undefined)
+      conn.uploadDirectory = vi.fn().mockResolvedValue(undefined)
+
+      await expect(deployAndLaunchRelay(conn)).rejects.toBe(error)
+      expect(
+        vi
+          .mocked(execCommand)
+          .mock.calls.some(
+            ([, command]) =>
+              /\.sftp-namespace-[0-9a-f]{32}/u.test(command) && command.includes('rm -rf')
+          )
+      ).toBe(false)
+      expect(conn.exec).not.toHaveBeenCalled()
+    }
+  )
+
+  it('stops before launch when owned-stage cleanup cannot confirm termination', async () => {
+    const conn = makeMockConnection()
+    const error = Object.assign(new Error('stage removal still running'), {
+      sshChannelCloseConfirmed: false
+    })
+    vi.mocked(isRelayAlreadyInstalled).mockResolvedValueOnce(false).mockResolvedValueOnce(true)
+    vi.mocked(execCommand).mockImplementation(async (_conn, command) => {
+      if (/\.sftp-namespace-[0-9a-f]{32}/u.test(command) && command.includes('rm -rf')) {
+        throw error
+      }
+      if (command.includes('uname')) {
+        return '__ORCA_REMOTE_PLATFORM__ Linux x86_64'
+      }
+      if (command === 'echo $HOME') {
+        return '/home/user'
+      }
+      return stageCommandResponse(command) ?? ''
+    })
+    conn.writeFile = vi.fn().mockResolvedValue(undefined)
+    conn.uploadDirectory = vi.fn().mockResolvedValue(undefined)
+
+    await expect(deployAndLaunchRelay(conn)).rejects.toBe(error)
+    expect(conn.exec).not.toHaveBeenCalled()
+    expect(ensureRemoteBundledRipgrep).not.toHaveBeenCalled()
+  })
+
   it('runs bounded fixed-path recovery before a fresh upload', async () => {
     const conn = makeMockConnection()
     const events: string[] = []
@@ -402,6 +466,7 @@ describe('deployAndLaunchRelay staged uploads', () => {
       await deployAndLaunchRelay(conn)
     }
 
+    await vi.waitFor(() => expect(events).toHaveLength(24))
     expect(events).toEqual(Array.from({ length: 12 }, () => ['launch-ready', 'recover']).flat())
     const commands = vi.mocked(execCommand).mock.calls.map(([, command]) => command)
     const recoveryCommands = commands.filter((command) => command.includes('deleting_old='))
@@ -578,12 +643,15 @@ describe('deployAndLaunchRelay staged uploads', () => {
     await deployAndLaunchRelay(conn)
     expect(conn.uploadDirectory).toHaveBeenCalledTimes(2)
   })
-  // Why: a cold host's rg upload is a multi-MB transfer. While the cleanup sweep was chained
-  // behind it, stale upload stages and superseded version dirs sat on the remote for that whole
-  // duration. A never-settling install stands in for that transfer.
-  it('sweeps stale upload stages without waiting for the ripgrep upload', async () => {
+  it('returns the relay before ripgrep finishes but defers stale-stage cleanup', async () => {
     const conn = makeMockConnection()
-    vi.mocked(ensureRemoteBundledRipgrep).mockReturnValueOnce(new Promise(() => {}))
+    let finishUpload = (): void => {}
+    vi.mocked(ensureRemoteBundledRipgrep).mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          finishUpload = () => resolve('present')
+        })
+    )
     let socketProbe = 0
     vi.mocked(execCommand).mockImplementation((_conn, command) => {
       if (command.includes('uname')) {
@@ -598,7 +666,15 @@ describe('deployAndLaunchRelay staged uploads', () => {
       return Promise.resolve('')
     })
 
-    await deployAndLaunchRelay(conn)
+    const deployed = await deployAndLaunchRelay(conn)
+    expect(deployed.transport).toBeDefined()
+    await new Promise<void>((resolve) => setImmediate(resolve))
+    expect(
+      vi
+        .mocked(execCommand)
+        .mock.calls.some(([, command]) => command.includes(RELAY_UPLOAD_STAGE_POOL_NAME))
+    ).toBe(false)
+    finishUpload()
 
     await vi.waitFor(() => {
       const commands = vi.mocked(execCommand).mock.calls.map(([, command]) => command)
diff --git a/src/main/ssh/ssh-relay-deploy-windows-pipe.test.ts b/src/main/ssh/ssh-relay-deploy-windows-pipe.test.ts
index fa800097bd74..1a49ec115901 100644
--- a/src/main/ssh/ssh-relay-deploy-windows-pipe.test.ts
+++ b/src/main/ssh/ssh-relay-deploy-windows-pipe.test.ts
@@ -313,6 +313,7 @@ describe('deployAndLaunchRelay on Windows remotes', () => {
       .mockResolvedValueOnce('')
       .mockResolvedValueOnce('READY')
       .mockResolvedValueOnce('') // persist active pipe A
+      .mockResolvedValueOnce('') // deferred stale-stage cleanup A
       .mockRejectedValueOnce(new Error('uname not found')) // tagged POSIX platform probe B
       .mockResolvedValueOnce('__ORCA_REMOTE_PLATFORM__ Windows X64')
       .mockResolvedValueOnce('C:\\Users\\me user')
@@ -324,6 +325,7 @@ describe('deployAndLaunchRelay on Windows remotes', () => {
       .mockResolvedValueOnce('') // persist active pipe B
 
     await deployAndLaunchRelay(connA, undefined, 300, 'target-a')
+    await new Promise<void>((resolve) => setImmediate(resolve))
     await deployAndLaunchRelay(connB, undefined, 300, 'target-b')
 
     const markerPaths = mockExecCommand.mock.calls
diff --git a/src/main/ssh/ssh-relay-deploy.test.ts b/src/main/ssh/ssh-relay-deploy.test.ts
index e8eb862848ef..27a70f60fdb7 100644
--- a/src/main/ssh/ssh-relay-deploy.test.ts
+++ b/src/main/ssh/ssh-relay-deploy.test.ts
@@ -167,6 +167,7 @@ function detachedLaunchCommand(conn: SshConnection): string | undefined {
 describe('deployAndLaunchRelay', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    vi.mocked(ensureRemoteOpenCodeRuntime).mockReset().mockResolvedValue('ready')
     vi.mocked(execCommand).mockReset().mockResolvedValue('__ORCA_REMOTE_PLATFORM__ Linux x86_64')
     vi.mocked(waitForSentinel).mockReset().mockResolvedValue({
       write: vi.fn(),
@@ -450,24 +451,35 @@ describe('deployAndLaunchRelay', () => {
     expect(resolveRemoteNodePath).toHaveBeenCalledTimes(1)
   })
 
-  it('does not retry when a session-limit failure races with a real install-state failure', async () => {
-    const conn = makeMockConnection()
-    const mockExecCommand = vi.mocked(execCommand)
-    const sessionLimitError = Object.assign(new Error('(SSH) Channel open failure: open failed'), {
-      reason: 4
-    })
-    const installError = new Error('permission denied while checking relay install')
-    vi.mocked(resolveRemoteNodePath).mockRejectedValueOnce(sessionLimitError)
-    vi.mocked(isRelayAlreadyInstalled).mockRejectedValueOnce(installError)
-    mockExecCommand.mockResolvedValueOnce('__ORCA_REMOTE_PLATFORM__ Linux x86_64') // tagged POSIX platform probe
-    mockExecCommand.mockResolvedValueOnce('/home/user') // concurrent install-state $HOME
-
-    await expect(deployAndLaunchRelay(conn)).rejects.toBe(installError)
-    expect(isRelayAlreadyInstalled).toHaveBeenCalledTimes(1)
-    expect(resolveRemoteNodePath).toHaveBeenCalledTimes(1)
-  })
+  it.each([false, true])(
+    'does not retry after a sibling failure (unconfirmed abort: %s)',
+    async (unconfirmed) => {
+      const conn = makeMockConnection()
+      const mockExecCommand = vi.mocked(execCommand)
+      const sessionLimitError = Object.assign(
+        new Error('(SSH) Channel open failure: open failed'),
+        {
+          reason: 4
+        }
+      )
+      const installError = unconfirmed
+        ? Object.assign(new Error('probe still running'), {
+            name: 'AbortError',
+            sshChannelCloseConfirmed: false
+          })
+        : new Error('permission denied while checking relay install')
+      vi.mocked(resolveRemoteNodePath).mockRejectedValueOnce(sessionLimitError)
+      vi.mocked(isRelayAlreadyInstalled).mockRejectedValueOnce(installError)
+      mockExecCommand.mockResolvedValueOnce('__ORCA_REMOTE_PLATFORM__ Linux x86_64') // tagged POSIX platform probe
+      mockExecCommand.mockResolvedValueOnce('/home/user') // concurrent install-state $HOME
+
+      await expect(deployAndLaunchRelay(conn)).rejects.toBe(installError)
+      expect(isRelayAlreadyInstalled).toHaveBeenCalledTimes(1)
+      expect(resolveRemoteNodePath).toHaveBeenCalledTimes(1)
+    }
+  )
 
-  it('does not retry until the surviving first-attempt probe settles', async () => {
+  it('lets the surviving probe finish before retrying a refused SSH session', async () => {
     const conn = makeMockConnection()
     const mockExecCommand = vi.mocked(execCommand)
     const sessionLimitError = Object.assign(new Error('(SSH) Channel open failure: open failed'), {
@@ -476,13 +488,19 @@ describe('deployAndLaunchRelay', () => {
     mockExecCommand.mockResolvedValueOnce('__ORCA_REMOTE_PLATFORM__ Linux x86_64') // tagged POSIX platform probe
     let releaseRemoteHome: (home: string) => void = () => {}
     let remoteHomeSettled = false
-    mockExecCommand.mockReturnValueOnce(
-      new Promise<string>((resolve) => {
-        releaseRemoteHome = (home: string) => {
-          remoteHomeSettled = true
-          resolve(home)
-        }
-      })
+    const cancelledProbe = Object.assign(new Error('system SSH probe cancellation unconfirmed'), {
+      name: 'AbortError',
+      sshChannelCloseConfirmed: false
+    })
+    mockExecCommand.mockImplementationOnce(
+      (_conn, _command, options) =>
+        new Promise<string>((resolve, reject) => {
+          options?.signal?.addEventListener('abort', () => reject(cancelledProbe), { once: true })
+          releaseRemoteHome = (home: string) => {
+            remoteHomeSettled = true
+            resolve(home)
+          }
+        })
     )
     vi.mocked(resolveRemoteNodePath).mockImplementationOnce(() => Promise.reject(sessionLimitError))
     vi.mocked(resolveRemoteNodePath).mockImplementationOnce(() => {
@@ -492,7 +510,7 @@ describe('deployAndLaunchRelay', () => {
       return Promise.resolve('/usr/bin/node')
     })
 
-    const deployPromise = deployAndLaunchRelay(conn)
+    const deployPromise = deployAndLaunchRelay(conn).catch((error: unknown) => error)
     await vi.waitFor(() => expect(resolveRemoteNodePath).toHaveBeenCalledTimes(1))
     await new Promise<void>((resolve) => setImmediate(resolve))
     expect(resolveRemoteNodePath).toHaveBeenCalledTimes(1)
@@ -502,7 +520,7 @@ describe('deployAndLaunchRelay', () => {
     queueLaunchNamespaceAndDeadSocketProbe()
     mockExecCommand.mockResolvedValueOnce('READY') // socket poll
     releaseRemoteHome('/home/user')
-    await deployPromise
+    await expect(deployPromise).resolves.toHaveProperty('transport')
     expect(resolveRemoteNodePath).toHaveBeenCalledTimes(2)
   })
 
@@ -530,11 +548,16 @@ describe('deployAndLaunchRelay', () => {
     expect(launchCommand).not.toContain('.pty-source-credit-policy')
   })
 
-  it.each([false, true])(
-    'waits for the ripgrep upload before cleanup (upload failure: %s)',
-    async (fails) => {
+  it.each([
+    [false, false],
+    [false, true],
+    [true, false],
+    [true, true]
+  ])(
+    'waits for ripgrep before cleanup (concurrent exec: %s, upload failure: %s)',
+    async (concurrent, fails) => {
       const conn = makeMockConnection()
-      vi.mocked(conn.canRunConcurrentExecCommands).mockReturnValue(false)
+      vi.mocked(conn.canRunConcurrentExecCommands).mockReturnValue(concurrent)
       queueFreshLinuxDeploy()
       let finishUpload = (): void => {}
       vi.mocked(ensureRemoteBundledRipgrep).mockImplementationOnce(
@@ -549,32 +572,35 @@ describe('deployAndLaunchRelay', () => {
       await new Promise<void>((resolve) => setImmediate(resolve))
       expect(execCommand).toHaveBeenCalledTimes(execCount)
       expect(gcOldRelayVersions).not.toHaveBeenCalled()
-      expect(ensureRemoteOpenCodeRuntime).not.toHaveBeenCalled()
+      expect(ensureRemoteOpenCodeRuntime).toHaveBeenCalledTimes(concurrent ? 1 : 0)
       finishUpload()
       await vi.waitFor(() => expect(gcOldRelayVersions).toHaveBeenCalledOnce())
     }
   )
 
-  it('waits for SQLite runtime setup before cleanup on single-exec transports', async () => {
-    const conn = makeMockConnection()
-    vi.mocked(conn.canRunConcurrentExecCommands).mockReturnValue(false)
-    queueFreshLinuxDeploy()
-    let finishSetup!: () => void
-    vi.mocked(ensureRemoteOpenCodeRuntime).mockImplementationOnce(
-      () =>
-        new Promise((resolve) => {
-          finishSetup = () => resolve('failed')
-        })
-    )
-    await deployAndLaunchRelay(conn)
-    await vi.waitFor(() => expect(ensureRemoteOpenCodeRuntime).toHaveBeenCalledOnce())
-    const execCount = vi.mocked(execCommand).mock.calls.length
-    await new Promise<void>((resolve) => setImmediate(resolve))
-    expect(execCommand).toHaveBeenCalledTimes(execCount)
-    expect(gcOldRelayVersions).not.toHaveBeenCalled()
-    finishSetup()
-    await vi.waitFor(() => expect(gcOldRelayVersions).toHaveBeenCalledOnce())
-  })
+  it.each([false, true])(
+    'waits for SQLite setup before cleanup (concurrent exec: %s)',
+    async (concurrent) => {
+      const conn = makeMockConnection()
+      vi.mocked(conn.canRunConcurrentExecCommands).mockReturnValue(concurrent)
+      queueFreshLinuxDeploy()
+      let finishSetup!: () => void
+      vi.mocked(ensureRemoteOpenCodeRuntime).mockImplementationOnce(
+        () =>
+          new Promise((resolve) => {
+            finishSetup = () => resolve('failed')
+          })
+      )
+      await deployAndLaunchRelay(conn)
+      await vi.waitFor(() => expect(ensureRemoteOpenCodeRuntime).toHaveBeenCalledOnce())
+      const execCount = vi.mocked(execCommand).mock.calls.length
+      await new Promise<void>((resolve) => setImmediate(resolve))
+      expect(execCommand).toHaveBeenCalledTimes(execCount)
+      expect(gcOldRelayVersions).not.toHaveBeenCalled()
+      finishSetup()
+      await vi.waitFor(() => expect(gcOldRelayVersions).toHaveBeenCalledOnce())
+    }
+  )
 
   it('does not launch or upload an unprotected binary when recording its reference fails', async () => {
     const conn = makeMockConnection()
@@ -585,20 +611,84 @@ describe('deployAndLaunchRelay', () => {
     expect(ensureRemoteBundledRipgrep).not.toHaveBeenCalled()
   })
 
-  it('skips cleanup when SQLite setup cannot confirm command teardown on a single-exec transport', async () => {
+  it.each([false, true])(
+    'skips cleanup after unconfirmed SQLite teardown (concurrent exec: %s)',
+    async (concurrent) => {
+      const conn = makeMockConnection()
+      vi.mocked(conn.canRunConcurrentExecCommands).mockReturnValue(concurrent)
+      queueFreshLinuxDeploy()
+      vi.mocked(ensureRemoteOpenCodeRuntime).mockResolvedValueOnce('teardown-unconfirmed')
+      await deployAndLaunchRelay(conn)
+      await vi.waitFor(() => expect(ensureRemoteOpenCodeRuntime).toHaveBeenCalledOnce())
+      const execCount = vi.mocked(execCommand).mock.calls.length
+      await new Promise<void>((resolve) => setImmediate(resolve))
+      expect(execCommand).toHaveBeenCalledTimes(execCount)
+      expect(gcOldRelayVersions).not.toHaveBeenCalled()
+      expect(gcRemoteRipgrepCache).not.toHaveBeenCalled()
+    }
+  )
+
+  it('does not launch after an unconfirmed ripgrep reference write', async () => {
     const conn = makeMockConnection()
-    vi.mocked(conn.canRunConcurrentExecCommands).mockReturnValue(false)
     queueFreshLinuxDeploy()
-    vi.mocked(ensureRemoteOpenCodeRuntime).mockResolvedValueOnce('teardown-unconfirmed')
-    await deployAndLaunchRelay(conn)
-    await vi.waitFor(() => expect(ensureRemoteOpenCodeRuntime).toHaveBeenCalledOnce())
-    const execCount = vi.mocked(execCommand).mock.calls.length
-    await new Promise<void>((resolve) => setImmediate(resolve))
-    expect(execCommand).toHaveBeenCalledTimes(execCount)
-    expect(gcOldRelayVersions).not.toHaveBeenCalled()
-    expect(gcRemoteRipgrepCache).not.toHaveBeenCalled()
+    const error = Object.assign(new Error('reference write still running'), {
+      sshChannelCloseConfirmed: false
+    })
+    vi.mocked(recordRemoteRipgrepReference).mockRejectedValueOnce(error)
+
+    await expect(deployAndLaunchRelay(conn)).rejects.toBe(error)
+    expect(detachedLaunchCommand(conn)).toBeUndefined()
+    expect(ensureRemoteBundledRipgrep).not.toHaveBeenCalled()
   })
 
+  it.each([false, true])(
+    'blocks cleanup and runtime retry after uncertain ripgrep teardown (concurrent exec: %s)',
+    async (concurrent) => {
+      const conn = makeMockConnection()
+      vi.mocked(conn.canRunConcurrentExecCommands).mockReturnValue(concurrent)
+      queueFreshLinuxDeploy()
+      vi.mocked(ensureRemoteBundledRipgrep).mockRejectedValueOnce(
+        Object.assign(new Error('upload still running'), { sshChannelCloseConfirmed: false })
+      )
+      vi.mocked(ensureRemoteOpenCodeRuntime).mockResolvedValue('failed')
+      const deployed = await deployAndLaunchRelay(conn)
+      await new Promise<void>((resolve) => setImmediate(resolve))
+      expect(gcOldRelayVersions).not.toHaveBeenCalled()
+      expect(gcRemoteRipgrepCache).not.toHaveBeenCalled()
+      const execCount = vi.mocked(execCommand).mock.calls.length
+      const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 60_001)
+      try {
+        await deployed.prepareOpenCodeRuntime?.(new AbortController().signal)
+        expect(ensureRemoteOpenCodeRuntime).toHaveBeenCalledTimes(concurrent ? 1 : 0)
+        expect(execCommand).toHaveBeenCalledTimes(execCount)
+      } finally {
+        clock.mockRestore()
+      }
+    }
+  )
+
+  it.each([false, true])(
+    'gates later cache cleanup and runtime retry on GC termination (confirmed: %s)',
+    async (confirmed) => {
+      const conn = makeMockConnection()
+      queueFreshLinuxDeploy()
+      vi.mocked(ensureRemoteOpenCodeRuntime).mockResolvedValueOnce('failed')
+      vi.mocked(gcOldRelayVersions).mockRejectedValueOnce(
+        Object.assign(new Error('GC interrupted'), { sshChannelCloseConfirmed: confirmed })
+      )
+      const deployed = await deployAndLaunchRelay(conn)
+      await vi.waitFor(() => expect(gcOldRelayVersions).toHaveBeenCalledOnce())
+      expect(gcRemoteRipgrepCache).not.toHaveBeenCalled()
+      const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 60_001)
+      try {
+        await deployed.prepareOpenCodeRuntime?.(new AbortController().signal)
+        expect(ensureRemoteOpenCodeRuntime).toHaveBeenCalledTimes(confirmed ? 2 : 1)
+      } finally {
+        clock.mockRestore()
+      }
+    }
+  )
+
   it('allows an unlimited SSH disconnect grace window', async () => {
     const conn = makeMockConnection()
     queueFreshLinuxDeploy()
diff --git a/src/main/ssh/ssh-relay-deploy.ts b/src/main/ssh/ssh-relay-deploy.ts
index f1e8377025e1..4424adc0c011 100644
--- a/src/main/ssh/ssh-relay-deploy.ts
+++ b/src/main/ssh/ssh-relay-deploy.ts
@@ -328,8 +328,17 @@ async function resolveRelayBootstrapState(
     signal?.throwIfAborted()
     return { ...installState, nodePath }
   } catch (err) {
-    abortController.abort()
+    // Let an admitted probe finish before retrying a refused parallel session.
+    if (!isSshSessionLimitError(err)) {
+      abortController.abort()
+    }
     const settled = await Promise.allSettled([installStatePromise, nodePathPromise])
+    const unconfirmed = settled.find(
+      (result) => result.status === 'rejected' && isUnconfirmedSshCommandTermination(result.reason)
+    )
+    if (unconfirmed?.status === 'rejected') {
+      throw unconfirmed.reason
+    }
     signal?.throwIfAborted()
     if (!isSshSessionLimitError(err)) {
       throw err
@@ -483,32 +492,18 @@ async function deployAndLaunchRelayAttempt(
     onProgress?.('Uploading relay...')
     console.log('[ssh-relay] Uploading relay...')
     try {
-      try {
-        await uploadRelay(
-          conn,
-          platform,
-          uploadStagePayloadDir,
-          fullVersion,
-          hostPlatform,
-          deploySignal,
-          { rootDir: uploadStage.slotDir, namespace: uploadStageSftpNamespace }
-        )
-      } catch (err) {
-        if (isUnconfirmedSshCommandTermination(err)) {
-          uploadStageCleanupAllowed = false
-        }
-        throw err
-      }
+      await uploadRelay(
+        conn,
+        platform,
+        uploadStagePayloadDir,
+        fullVersion,
+        hostPlatform,
+        deploySignal,
+        { rootDir: uploadStage.slotDir, namespace: uploadStageSftpNamespace }
+      )
 
-      try {
-        await acquireInstallLock(conn, remoteRelayDir, hostPlatform, { signal: deploySignal })
-        ownsInstallLock = true
-      } catch (err) {
-        if (isUnconfirmedSshCommandTermination(err)) {
-          ownsInstallLock = true
-        }
-        throw err
-      }
+      await acquireInstallLock(conn, remoteRelayDir, hostPlatform, { signal: deploySignal })
+      ownsInstallLock = true
       try {
         // Re-probe after acquiring the lock — a sibling installer may have finished while we waited.
         if (
@@ -523,26 +518,19 @@ async function deployAndLaunchRelayAttempt(
             homeRelativeRelayDir,
             deploySignal
           )
-          try {
-            const promotion = await execHostCommand(
-              conn,
+          const promotion = await execHostCommand(
+            conn,
+            hostPlatform,
+            promoteOwnedRelayUploadStageCommand(
               hostPlatform,
-              promoteOwnedRelayUploadStageCommand(
-                hostPlatform,
-                uploadStage,
-                uploadStageOwner,
-                remoteRelayDir
-              ),
-              { signal: deploySignal }
-            )
-            if (!relayUploadStagePromotionConfirmed(uploadStageOwner, promotion)) {
-              throw new Error('Relay upload stage ownership was lost before promotion')
-            }
-          } catch (err) {
-            if (isUnconfirmedSshCommandTermination(err)) {
-              uploadStageCleanupAllowed = false
-            }
-            throw err
+              uploadStage,
+              uploadStageOwner,
+              remoteRelayDir
+            ),
+            { signal: deploySignal }
+          )
+          if (!relayUploadStagePromotionConfirmed(uploadStageOwner, promotion)) {
+            throw new Error('Relay upload stage ownership was lost before promotion')
           }
           console.log('[ssh-relay] Upload complete')
 
@@ -574,13 +562,20 @@ async function deployAndLaunchRelayAttempt(
         }
         throw err
       }
+    } catch (error) {
+      uploadStageCleanupAllowed = !isUnconfirmedSshCommandTermination(error)
+      throw error
     } finally {
       if (uploadStageCleanupAllowed) {
         await execHostCommand(
           conn,
           hostPlatform,
           cleanupOwnedRelayUploadStageCommand(hostPlatform, uploadStage, uploadStageOwner)
-        ).catch(() => {})
+        ).catch((error) => {
+          if (isUnconfirmedSshCommandTermination(error)) {
+            throw error
+          }
+        })
       }
     }
   }
@@ -594,55 +589,65 @@ async function deployAndLaunchRelayAttempt(
       remoteRelayDir,
       ripgrepLayout.entryName
     ))
-  let launched: Awaited<ReturnType<typeof launchRelay>>
-  let launchLivenessObserved = false
+  deploySignal?.throwIfAborted()
+  onProgress?.('Starting relay...')
+  console.log('[ssh-relay] Launching relay...')
+  // A failed launch retains its fences until stale recovery can establish liveness.
+  const launched = await launchRelay(
+    conn,
+    remoteRelayDir,
+    hostPlatform,
+    nodePath,
+    graceTimeSeconds,
+    relayInstanceId,
+    deploySignal,
+    ripgrepReferenced ? ripgrepLayout.binaryPath : undefined
+  )
+  let launchCleanupSettled = true
   try {
-    deploySignal?.throwIfAborted()
-    onProgress?.('Starting relay...')
-    console.log('[ssh-relay] Launching relay...')
-    launched = await launchRelay(
-      conn,
-      remoteRelayDir,
-      hostPlatform,
-      nodePath,
-      graceTimeSeconds,
-      relayInstanceId,
-      deploySignal,
-      ripgrepReferenced ? ripgrepLayout.binaryPath : undefined
-    )
-    launchLivenessObserved = true
-  } finally {
-    // Why: older clients understand only the install lock; if launch never goes live, keep it so their GC can't race a caller waiting behind this owner.
-    if (ownsInstallLock && launchLivenessObserved) {
+    if (ownsInstallLock) {
       await abandonInstall(conn, remoteRelayDir, hostPlatform)
     }
-    // The detached start may outlive a timed-out SSH command; keep the fence on failed launch until stale recovery proves the handoff ended.
-    if (launchGcClaimToken && launchLivenessObserved) {
+    if (launchGcClaimToken) {
       await releaseRelayGcClaimWithRetry(conn, remoteRelayDir, launchGcClaimToken, hostPlatform)
     }
+  } catch (error) {
+    // Keep the connected transport, but stop optional commands after uncertain fence release.
+    launchCleanupSettled = !isUnconfirmedSshCommandTermination(error)
+    console.warn('[ssh-relay] Launch fence release failed:', error)
   }
   console.log('[ssh-relay] Relay started successfully')
 
   // Keep background commands serial for SSH transports that allow only one exec at a time.
   const ripgrepEntry = ripgrepLayout?.entryName
   const ripgrepInstall = (
-    ripgrepReferenced
+    ripgrepReferenced && launchCleanupSettled
       ? ensureRemoteBundledRipgrep(conn, hostPlatform, remoteHome, { signal: deploySignal })
       : Promise.resolve()
-  ).catch(() => {})
-  const runtimeInstall = (conn.canRunConcurrentExecCommands() ? Promise.resolve() : ripgrepInstall)
-    .then(() =>
-      ensureRemoteOpenCodeRuntime(conn, hostPlatform, remoteHome, {
-        nodePath: launched.nodePath,
-        relayDir: remoteRelayDir,
-        signal: deploySignal
-      })
+  ).then(
+    () => launchCleanupSettled,
+    (error) => !isUnconfirmedSshCommandTermination(error)
+  )
+  const runtimeInstall = (
+    conn.canRunConcurrentExecCommands() ? Promise.resolve(launchCleanupSettled) : ripgrepInstall
+  )
+    .then((ripgrepSettled) =>
+      ripgrepSettled
+        ? ensureRemoteOpenCodeRuntime(conn, hostPlatform, remoteHome, {
+            nodePath: launched.nodePath,
+            relayDir: remoteRelayDir,
+            signal: deploySignal
+          })
+        : ('teardown-unconfirmed' as const)
     )
     .catch(() => 'teardown-unconfirmed' as const)
-  const cleanupReady = conn.canRunConcurrentExecCommands() ? Promise.resolve() : runtimeInstall
 
-  const backgroundCleanup = cleanupReady.then((runtimeOutcome) => {
-    if (runtimeOutcome === 'teardown-unconfirmed') {
+  const cleanupReady = Promise.all([ripgrepInstall, runtimeInstall]).then(
+    ([ripgrepSettled, runtimeOutcome]) =>
+      ripgrepSettled && runtimeOutcome !== 'teardown-unconfirmed'
+  )
+  const backgroundCleanup = cleanupReady.then((ready) => {
+    if (!ready) {
       return false
     }
     return (
@@ -1010,7 +1015,9 @@ async function repairInstalledNativeDeps(
         signal
       })
     } catch (err) {
-      await abandonInstall(conn, remoteDir, hostPlatform)
+      if (!isUnconfirmedSshCommandTermination(err)) {
+        await abandonInstall(conn, remoteDir, hostPlatform)
+      }
       throw err
     }
     if (!stillInstalled) {
@@ -1157,7 +1164,9 @@ async function acquireRelayLaunchGcFence(
     // Why: a caller without the install lock still needs its own durable fence; never borrow another connection's lock through launch.
     return token
   } catch (err) {
-    await releaseRelayGcClaimWithRetry(conn, remoteDir, token, hostPlatform)
+    if (!isUnconfirmedSshCommandTermination(err)) {
+      await releaseRelayGcClaimWithRetry(conn, remoteDir, token, hostPlatform)
+    }
     throw err
   }
 }
diff --git a/src/main/ssh/ssh-relay-gc-claim-termination.test.ts b/src/main/ssh/ssh-relay-gc-claim-termination.test.ts
new file mode 100644
index 000000000000..d460e3e94b92
--- /dev/null
+++ b/src/main/ssh/ssh-relay-gc-claim-termination.test.ts
@@ -0,0 +1,216 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('./ssh-relay-deploy-helpers', () => ({ execCommand: vi.fn() }))
+
+import type { SshConnection } from './ssh-connection'
+import { execCommand } from './ssh-relay-deploy-helpers'
+import {
+  isRelayGcClaimOwned,
+  releaseRelayGcClaim,
+  releaseRelayGcClaimWithRetry,
+  tryAcquireRelayGcClaim,
+  waitForRelayGcClaimRelease
+} from './ssh-relay-gc-claim'
+import { getRemoteHostPlatform } from './ssh-remote-platform'
+
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The mocked execCommand never reads the connection.
+const conn = {} as SshConnection
+const mockExec = vi.mocked(execCommand)
+const token = 'claim-owner'
+
+function unconfirmedTermination(): Error {
+  return Object.assign(new Error('SSH teardown not confirmed'), {
+    sshChannelCloseConfirmed: false
+  })
+}
+
+function confirmedFailure(): Error {
+  return Object.assign(new Error('SSH command failed after closing'), {
+    sshChannelCloseConfirmed: true
+  })
+}
+
+beforeEach(() => {
+  mockExec.mockReset()
+  mockExec.mockResolvedValue('OPEN')
+})
+
+afterEach(() => {
+  vi.useRealTimers()
+})
+
+describe.each([
+  { platform: 'linux-x64' as const, remoteDir: '/relay/version' },
+  { platform: 'win32-x64' as const, remoteDir: 'C:/relay/version' }
+])('relay GC claim termination on $platform', ({ platform, remoteDir }) => {
+  const host = getRemoteHostPlatform(platform)
+
+  it.each([
+    { stage: 'claim creation', replies: [] },
+    { stage: 'stale claim takeover', replies: ['BUSY'] },
+    { stage: 'new claim owner write', replies: ['OK'] },
+    { stage: 'recovered claim owner write', replies: ['BUSY', 'OK'] }
+  ])('preserves uncertainty during $stage without releasing or retrying', async ({ replies }) => {
+    const error = unconfirmedTermination()
+    for (const reply of replies) {
+      mockExec.mockResolvedValueOnce(reply)
+    }
+    mockExec.mockRejectedValueOnce(error)
+
+    await expect(tryAcquireRelayGcClaim(conn, remoteDir, host)).rejects.toBe(error)
+
+    expect(mockExec).toHaveBeenCalledTimes(replies.length + 1)
+  })
+
+  it('preserves acquisition uncertainty when the caller also aborts', async () => {
+    const controller = new AbortController()
+    const error = unconfirmedTermination()
+    mockExec.mockImplementationOnce(async () => {
+      controller.abort(new Error('deploy aborted'))
+      throw error
+    })
+
+    await expect(tryAcquireRelayGcClaim(conn, remoteDir, host, controller.signal)).rejects.toBe(
+      error
+    )
+    expect(mockExec).toHaveBeenCalledTimes(1)
+  })
+
+  it('preserves ownership probe uncertainty', async () => {
+    const error = unconfirmedTermination()
+    mockExec.mockRejectedValueOnce(error)
+
+    await expect(isRelayGcClaimOwned(conn, remoteDir, token, host)).rejects.toBe(error)
+    expect(mockExec).toHaveBeenCalledTimes(1)
+  })
+
+  it('preserves release uncertainty', async () => {
+    const error = unconfirmedTermination()
+    mockExec.mockRejectedValueOnce(error)
+
+    await expect(releaseRelayGcClaim(conn, remoteDir, token, host)).rejects.toBe(error)
+    expect(mockExec).toHaveBeenCalledTimes(1)
+  })
+
+  it.each([0, 1])(
+    'stops release retries after %i confirmed failures then uncertainty',
+    async (n) => {
+      const error = unconfirmedTermination()
+      for (let attempt = 0; attempt < n; attempt++) {
+        mockExec.mockRejectedValueOnce(confirmedFailure())
+      }
+      mockExec.mockRejectedValueOnce(error)
+
+      await expect(releaseRelayGcClaimWithRetry(conn, remoteDir, token, host)).rejects.toBe(error)
+      expect(mockExec).toHaveBeenCalledTimes(n + 1)
+    }
+  )
+
+  it.each([
+    { stage: 'claim probe', replies: [] },
+    { stage: 'stale claim takeover', replies: ['LOCKED'] },
+    { stage: 'owner write', replies: ['LOCKED', 'OK'] },
+    { stage: 'release', replies: ['LOCKED', 'OK', ''] }
+  ])('stops the claim waiter after an unconfirmed $stage', async ({ replies }) => {
+    const error = unconfirmedTermination()
+    for (const reply of replies) {
+      mockExec.mockResolvedValueOnce(reply)
+    }
+    mockExec.mockRejectedValueOnce(error)
+
+    await expect(waitForRelayGcClaimRelease(conn, remoteDir, host)).rejects.toBe(error)
+    expect(mockExec).toHaveBeenCalledTimes(replies.length + 1)
+  })
+
+  it('preserves claim probe uncertainty when the caller also aborts', async () => {
+    const controller = new AbortController()
+    const error = unconfirmedTermination()
+    mockExec.mockImplementationOnce(async () => {
+      controller.abort(new Error('deploy aborted'))
+      throw error
+    })
+
+    await expect(waitForRelayGcClaimRelease(conn, remoteDir, host, controller.signal)).rejects.toBe(
+      error
+    )
+    expect(mockExec).toHaveBeenCalledTimes(1)
+  })
+
+  it('stops when cleanup after a confirmed owner write failure is unconfirmed', async () => {
+    const error = unconfirmedTermination()
+    mockExec
+      .mockResolvedValueOnce('OK')
+      .mockRejectedValueOnce(confirmedFailure())
+      .mockRejectedValueOnce(error)
+
+    await expect(tryAcquireRelayGcClaim(conn, remoteDir, host)).rejects.toBe(error)
+    expect(mockExec).toHaveBeenCalledTimes(3)
+  })
+
+  it('keeps a confirmed acquisition failure as contention', async () => {
+    mockExec.mockRejectedValueOnce(confirmedFailure())
+
+    await expect(tryAcquireRelayGcClaim(conn, remoteDir, host)).resolves.toBeNull()
+    expect(mockExec).toHaveBeenCalledTimes(1)
+  })
+
+  it('conditionally releases after a confirmed owner write failure', async () => {
+    mockExec
+      .mockResolvedValueOnce('OK')
+      .mockRejectedValueOnce(confirmedFailure())
+      .mockResolvedValueOnce('RELEASED')
+
+    await expect(tryAcquireRelayGcClaim(conn, remoteDir, host)).resolves.toBeNull()
+    expect(mockExec).toHaveBeenCalledTimes(3)
+  })
+
+  it('keeps a confirmed ownership probe failure as lost ownership', async () => {
+    mockExec.mockRejectedValueOnce(confirmedFailure())
+
+    await expect(isRelayGcClaimOwned(conn, remoteDir, token, host)).resolves.toBe(false)
+    expect(mockExec).toHaveBeenCalledTimes(1)
+  })
+
+  it('retains bounded retries for confirmed release failures', async () => {
+    mockExec.mockRejectedValue(confirmedFailure())
+
+    await expect(releaseRelayGcClaimWithRetry(conn, remoteDir, token, host)).resolves.toBe(
+      'unknown'
+    )
+    expect(mockExec).toHaveBeenCalledTimes(3)
+  })
+
+  it('retries confirmed release failures until release succeeds', async () => {
+    mockExec.mockRejectedValueOnce(confirmedFailure()).mockResolvedValueOnce('RELEASED')
+
+    await expect(releaseRelayGcClaimWithRetry(conn, remoteDir, token, host)).resolves.toBe(
+      'released'
+    )
+    expect(mockExec).toHaveBeenCalledTimes(2)
+  })
+
+  it('still recovers a claim after a confirmed probe failure', async () => {
+    mockExec
+      .mockRejectedValueOnce(confirmedFailure())
+      .mockResolvedValueOnce('OK')
+      .mockResolvedValueOnce('')
+      .mockResolvedValueOnce('RELEASED')
+
+    await expect(waitForRelayGcClaimRelease(conn, remoteDir, host)).resolves.toBeUndefined()
+    expect(mockExec).toHaveBeenCalledTimes(4)
+  })
+
+  it('still polls after a confirmed stale takeover failure', async () => {
+    vi.useFakeTimers()
+    mockExec
+      .mockResolvedValueOnce('LOCKED')
+      .mockRejectedValueOnce(confirmedFailure())
+      .mockResolvedValueOnce('OPEN')
+
+    const waiting = waitForRelayGcClaimRelease(conn, remoteDir, host)
+    await vi.advanceTimersByTimeAsync(1_000)
+
+    await expect(waiting).resolves.toBeUndefined()
+    expect(mockExec).toHaveBeenCalledTimes(3)
+  })
+})
diff --git a/src/main/ssh/ssh-relay-gc-claim.ts b/src/main/ssh/ssh-relay-gc-claim.ts
index d0c8cc1221f6..3ce807fcabb0 100644
--- a/src/main/ssh/ssh-relay-gc-claim.ts
+++ b/src/main/ssh/ssh-relay-gc-claim.ts
@@ -2,6 +2,7 @@ import { randomUUID } from 'node:crypto'
 import type { SshConnection } from './ssh-connection'
 import { shellEscape } from './ssh-connection-utils'
 import { execCommand } from './ssh-relay-deploy-helpers'
+import { isUnconfirmedSshCommandTermination } from './ssh-relay-exec-command'
 import {
   probeInstallLockExistsCommand,
   tryCreateInstallLockCommand,
@@ -91,7 +92,10 @@ export async function tryAcquireRelayGcClaim(
       return null
     }
     return writeRelayGcClaimOwner(conn, remoteRelayDir, host, signal)
-  } catch {
+  } catch (error) {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
     signal?.throwIfAborted()
     return null
   }
@@ -114,7 +118,10 @@ async function writeRelayGcClaimOwner(
   try {
     await execHostCommand(conn, host, command, signal)
     return token
-  } catch {
+  } catch (error) {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
     // Why: the write may have succeeded remotely before SSH lost its reply.
     // A conditional release removes only the claim generation with our token.
     await releaseRelayGcClaim(conn, remoteRelayDir, token, host)
@@ -134,7 +141,12 @@ export async function isRelayGcClaimOwned(
         `if ((Get-Content -LiteralPath ${powerShellLiteral(ownerPath)} -Raw -ErrorAction SilentlyContinue) -ceq ${powerShellLiteral(token)}) { 'OWNED' } else { 'LOST' }`
       )
     : `test "$(cat ${shellEscape(ownerPath)} 2>/dev/null)" = ${shellEscape(token)} && echo OWNED || echo LOST`
-  const output = await execHostCommand(conn, host, command).catch(() => 'LOST')
+  const output = await execHostCommand(conn, host, command).catch((error) => {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
+    return 'LOST'
+  })
   return output.trim() === 'OWNED'
 }
 
@@ -162,7 +174,12 @@ export async function releaseRelayGcClaim(
         `else ${removeRemoteTreeCommand(host, claimPath)} 2>/dev/null;`,
         `if test -e ${shellEscape(claimPath)}; then echo UNKNOWN; else echo RELEASED; fi; fi`
       ].join(' ')
-  const output = await execHostCommand(conn, host, command).catch(() => 'UNKNOWN')
+  const output = await execHostCommand(conn, host, command).catch((error) => {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
+    return 'UNKNOWN'
+  })
   switch (output.trim()) {
     case 'RELEASED':
       return 'released'
@@ -193,7 +210,12 @@ export async function waitForRelayGcClaimRelease(
   signal?: AbortSignal
 ): Promise<void> {
   while (true) {
-    const claimed = await isRelayGcClaimed(conn, remoteRelayDir, host, signal).catch(() => true)
+    const claimed = await isRelayGcClaimed(conn, remoteRelayDir, host, signal).catch((error) => {
+      if (isUnconfirmedSshCommandTermination(error)) {
+        throw error
+      }
+      return true
+    })
     signal?.throwIfAborted()
     if (!claimed) {
       return
@@ -204,7 +226,12 @@ export async function waitForRelayGcClaimRelease(
       host,
       tryStealInstallLockCommand(host, claimPath, RELAY_GC_CLAIM_STALE_SECONDS),
       signal
-    ).catch(() => 'BUSY')
+    ).catch((error) => {
+      if (isUnconfirmedSshCommandTermination(error)) {
+        throw error
+      }
+      return 'BUSY'
+    })
     signal?.throwIfAborted()
     if (recovered.trim().endsWith('OK')) {
       const token = await writeRelayGcClaimOwner(conn, remoteRelayDir, host, signal)
diff --git a/src/main/ssh/ssh-relay-gc-retry.test.ts b/src/main/ssh/ssh-relay-gc-retry.test.ts
index ae70ff68fa64..18d99a926a9e 100644
--- a/src/main/ssh/ssh-relay-gc-retry.test.ts
+++ b/src/main/ssh/ssh-relay-gc-retry.test.ts
@@ -19,7 +19,10 @@ vi.mock('./ssh-relay-deploy-helpers', () => ({
     onData: vi.fn(),
     onClose: vi.fn()
   }),
-  isUnconfirmedSshCommandTermination: () => false,
+  isUnconfirmedSshCommandTermination: (error: unknown) =>
+    error instanceof Error &&
+    'sshChannelCloseConfirmed' in error &&
+    error.sshChannelCloseConfirmed === false,
   execCommand: vi.fn()
 }))
 vi.mock('./ssh-remote-node-resolution', () => ({
@@ -244,6 +247,72 @@ describe('relay GC deploy retry', () => {
     expect(releaseRelayGcClaimWithRetry).not.toHaveBeenCalled()
   })
 
+  it.each(['acquired', 'busy'] as const)(
+    'keeps the connected relay but stops setup after uncertain %s fence release',
+    async (lockResult) => {
+      const conn = makeConnection()
+      const error = Object.assign(new Error('release still running'), {
+        sshChannelCloseConfirmed: false
+      })
+      vi.mocked(tryAcquireRelayRepairLock).mockResolvedValueOnce(lockResult)
+      const release =
+        lockResult === 'acquired'
+          ? vi.mocked(abandonInstall)
+          : vi.mocked(releaseRelayGcClaimWithRetry)
+      release.mockRejectedValueOnce(error)
+      vi.mocked(execCommand).mockImplementation(async (_conn, command) => {
+        if (command.includes('__ORCA_REMOTE_PLATFORM__')) {
+          return '__ORCA_REMOTE_PLATFORM__ Linux x86_64'
+        }
+        if (command === 'echo $HOME') {
+          return '/home/user'
+        }
+        if (command.includes('node-pty')) {
+          return 'ORCA-NATIVE-DEPS-OK'
+        }
+        if (command.includes('var s=require("net").connect')) {
+          return 'READY'
+        }
+        return command.includes('test -S') ? 'DEAD' : ''
+      })
+
+      const deployed = await deployAndLaunchRelay(conn)
+      expect(deployed.transport).toBeDefined()
+      expect(release).toHaveBeenCalledOnce()
+      const execCount = vi.mocked(execCommand).mock.calls.length
+      await deployed.prepareOpenCodeRuntime?.(new AbortController().signal)
+      await new Promise<void>((resolve) => setImmediate(resolve))
+      expect(execCommand).toHaveBeenCalledTimes(execCount)
+    }
+  )
+
+  it.each(['acquired', 'busy'] as const)(
+    'preserves the %s fence after an unconfirmed installed-state recheck',
+    async (lockResult) => {
+      const conn = makeConnection()
+      const error = Object.assign(new Error('recheck still running'), {
+        sshChannelCloseConfirmed: false
+      })
+      vi.mocked(tryAcquireRelayRepairLock).mockResolvedValueOnce(lockResult)
+      vi.mocked(isRelayAlreadyInstalled).mockResolvedValueOnce(true).mockRejectedValueOnce(error)
+      vi.mocked(execCommand).mockImplementation(async (_conn, command) => {
+        if (command.includes('__ORCA_REMOTE_PLATFORM__')) {
+          return '__ORCA_REMOTE_PLATFORM__ Linux x86_64'
+        }
+        if (command === 'echo $HOME') {
+          return '/home/user'
+        }
+        return 'ORCA-NATIVE-DEPS-OK'
+      })
+
+      await expect(deployAndLaunchRelay(conn)).rejects.toBe(error)
+      expect(abandonInstall).not.toHaveBeenCalled()
+      expect(releaseRelayGcClaimWithRetry).not.toHaveBeenCalled()
+      expect(waitForRelayGcClaimRelease).not.toHaveBeenCalled()
+      expect(conn.exec).not.toHaveBeenCalled()
+    }
+  )
+
   it('keeps retrying repeated launch-claim contention within the deploy bound', async () => {
     const conn = makeConnection()
     vi.mocked(tryAcquireRelayRepairLock).mockResolvedValue('busy')
diff --git a/src/main/ssh/ssh-relay-gc-tombstone.ts b/src/main/ssh/ssh-relay-gc-tombstone.ts
index 95684d4d20e3..cc117981eadb 100644
--- a/src/main/ssh/ssh-relay-gc-tombstone.ts
+++ b/src/main/ssh/ssh-relay-gc-tombstone.ts
@@ -1,5 +1,6 @@
 import type { SshConnection } from './ssh-connection'
 import { execCommand } from './ssh-relay-deploy-helpers'
+import { isUnconfirmedSshCommandTermination } from './ssh-relay-exec-command'
 import { removeRemoteTreeCommand } from './ssh-remote-commands'
 import {
   getRemoteHostPlatform,
@@ -25,6 +26,9 @@ export async function cleanupRelayGcTombstones(
     await execCommand(conn, removeRemoteTreeCommand(host, tombstone), {
       wrapCommand: !isWindowsRemoteHost(host)
     }).catch((err) => {
+      if (isUnconfirmedSshCommandTermination(err)) {
+        throw err
+      }
       console.warn(
         `[ssh-relay] GC failed to remove tombstone ${tombstone}: ${err instanceof Error ? err.message : String(err)}`
       )
diff --git a/src/main/ssh/ssh-relay-install-lock-termination.test.ts b/src/main/ssh/ssh-relay-install-lock-termination.test.ts
new file mode 100644
index 000000000000..de4c57a49776
--- /dev/null
+++ b/src/main/ssh/ssh-relay-install-lock-termination.test.ts
@@ -0,0 +1,138 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('./ssh-relay-deploy-helpers', () => ({ execCommand: vi.fn() }))
+
+import type { SshConnection } from './ssh-connection'
+import { execCommand } from './ssh-relay-deploy-helpers'
+import { acquireInstallLock, isRelayInstallLockStale } from './ssh-relay-install-lock'
+import { getRemoteHostPlatform } from './ssh-remote-platform'
+
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The mocked execCommand never reads the connection.
+const conn = {} as SshConnection
+const mockExec = vi.mocked(execCommand)
+const nextAcquisition = ['OPEN', '', 'OK', 'OPEN']
+
+const lockFailureStages = [
+  {
+    stage: 'claim probe after acquisition',
+    replies: ['OPEN', '', 'OK'],
+    recovery: ['', 'OK', 'OPEN']
+  },
+  {
+    stage: 'release after acquisition',
+    replies: ['OPEN', '', 'OK', 'LOCKED'],
+    recovery: ['OK', 'OPEN']
+  },
+  {
+    stage: 'stale lock takeover',
+    replies: ['OPEN', '', 'BUSY'],
+    recovery: nextAcquisition
+  },
+  {
+    stage: 'claim probe after stale takeover',
+    replies: ['OPEN', '', 'BUSY', 'OK'],
+    recovery: ['', ...nextAcquisition]
+  },
+  {
+    stage: 'release after stale takeover',
+    replies: ['OPEN', '', 'BUSY', 'OK', 'LOCKED'],
+    recovery: nextAcquisition
+  }
+]
+
+beforeEach(() => {
+  mockExec.mockReset()
+  mockExec.mockResolvedValue('OPEN')
+  vi.spyOn(console, 'warn').mockImplementation(() => {})
+  vi.spyOn(console, 'info').mockImplementation(() => {})
+})
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  vi.useRealTimers()
+})
+
+describe.each([
+  { platform: 'linux-x64' as const, remoteDir: '/relay/version' },
+  { platform: 'win32-x64' as const, remoteDir: 'C:/relay/version' }
+])('install lock termination on $platform', ({ platform, remoteDir }) => {
+  const host = getRemoteHostPlatform(platform)
+
+  it.each(lockFailureStages)('stops after unconfirmed $stage', async ({ replies }) => {
+    const error = Object.assign(new Error('SSH teardown not confirmed'), {
+      sshChannelCloseConfirmed: false
+    })
+    for (const reply of replies) {
+      mockExec.mockResolvedValueOnce(reply)
+    }
+    mockExec.mockRejectedValueOnce(error)
+
+    await expect(acquireInstallLock(conn, remoteDir, host)).rejects.toBe(error)
+    expect(mockExec).toHaveBeenCalledTimes(replies.length + 1)
+  })
+
+  it.each(lockFailureStages)(
+    'keeps recovery after confirmed $stage failure',
+    async ({ replies, recovery }) => {
+      vi.useFakeTimers()
+      for (const reply of replies) {
+        mockExec.mockResolvedValueOnce(reply)
+      }
+      mockExec.mockRejectedValueOnce(
+        Object.assign(new Error('SSH command failed after closing'), {
+          sshChannelCloseConfirmed: true
+        })
+      )
+      for (const reply of recovery) {
+        mockExec.mockResolvedValueOnce(reply)
+      }
+
+      const acquiring = acquireInstallLock(conn, remoteDir, host)
+      await vi.advanceTimersByTimeAsync(1_000)
+
+      await expect(acquiring).resolves.toBeUndefined()
+      expect(mockExec).toHaveBeenCalledTimes(replies.length + recovery.length + 1)
+    }
+  )
+
+  it('preserves takeover uncertainty when the caller also aborts', async () => {
+    const controller = new AbortController()
+    const error = Object.assign(new Error('SSH teardown not confirmed'), {
+      sshChannelCloseConfirmed: false
+    })
+    mockExec
+      .mockResolvedValueOnce('OPEN')
+      .mockResolvedValueOnce('')
+      .mockResolvedValueOnce('BUSY')
+      .mockImplementationOnce(async () => {
+        controller.abort(new Error('deploy aborted'))
+        throw error
+      })
+
+    await expect(
+      acquireInstallLock(conn, remoteDir, host, { signal: controller.signal })
+    ).rejects.toBe(error)
+    expect(mockExec).toHaveBeenCalledTimes(4)
+  })
+
+  it('preserves uncertainty from the stale lock age probe', async () => {
+    const error = Object.assign(new Error('SSH teardown not confirmed'), {
+      sshChannelCloseConfirmed: false
+    })
+    mockExec.mockRejectedValueOnce(error)
+
+    await expect(isRelayInstallLockStale(conn, remoteDir, host)).rejects.toBe(error)
+    expect(mockExec).toHaveBeenCalledTimes(1)
+  })
+
+  it('keeps a confirmed stale age probe failure as not stale', async () => {
+    mockExec.mockRejectedValueOnce(
+      Object.assign(new Error('SSH command failed after closing'), {
+        sshChannelCloseConfirmed: true
+      })
+    )
+
+    await expect(isRelayInstallLockStale(conn, remoteDir, host)).resolves.toBe(false)
+    expect(mockExec).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/main/ssh/ssh-relay-install-lock.ts b/src/main/ssh/ssh-relay-install-lock.ts
index 7d5b26fdfaed..3831851cbe93 100644
--- a/src/main/ssh/ssh-relay-install-lock.ts
+++ b/src/main/ssh/ssh-relay-install-lock.ts
@@ -1,6 +1,7 @@
 import type { SshConnection } from './ssh-connection'
-import { execCommand, isUnconfirmedSshCommandTermination } from './ssh-relay-deploy-helpers'
+import { execCommand } from './ssh-relay-deploy-helpers'
 import { RELAY_DEPLOY_TIMEOUT_MS } from './ssh-relay-deploy-timing'
+import { isUnconfirmedSshCommandTermination } from './ssh-relay-exec-command'
 import { isRelayGcClaimed, waitForRelayGcClaimRelease } from './ssh-relay-gc-claim'
 import {
   acquireInstallLockParentCommand,
@@ -54,7 +55,10 @@ export async function isRelayInstallLockStale(
     const out = await execHostCommand(conn, host, lockAgeSecondsCommand(host, lockDir))
     const ageSec = Number.parseInt(out.trim(), 10)
     return Number.isFinite(ageSec) && ageSec >= 0 && ageSec * 1000 > INSTALL_LOCK_STALE_MS
-  } catch {
+  } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
     return false
   }
 }
@@ -95,11 +99,20 @@ export async function acquireInstallLock(
           remoteRelayDir,
           host,
           options?.signal
-        ).catch(() => true)
+        ).catch((err) => {
+          if (isUnconfirmedSshCommandTermination(err)) {
+            throw err
+          }
+          return true
+        })
         if (!claimedAfterAcquire && !options?.signal?.aborted) {
           return
         }
-        await execHostCommand(conn, host, removeRemoteTreeCommand(host, lockDir)).catch(() => {})
+        await execHostCommand(conn, host, removeRemoteTreeCommand(host, lockDir)).catch((err) => {
+          if (isUnconfirmedSshCommandTermination(err)) {
+            throw err
+          }
+        })
         options?.signal?.throwIfAborted()
       }
     } catch (err) {
@@ -119,7 +132,12 @@ export async function acquireInstallLock(
         host,
         tryStealInstallLockCommand(host, lockDir, INSTALL_LOCK_STALE_SECONDS),
         { signal: options?.signal }
-      ).catch(() => 'BUSY')
+      ).catch((err) => {
+        if (isUnconfirmedSshCommandTermination(err)) {
+          throw err
+        }
+        return 'BUSY'
+      })
       options?.signal?.throwIfAborted()
       if (steal.trim().endsWith('OK')) {
         const reason = steal.trim().endsWith('REBOOT_OK') ? 'previous-boot' : 'stale'
@@ -129,11 +147,20 @@ export async function acquireInstallLock(
           remoteRelayDir,
           host,
           options?.signal
-        ).catch(() => true)
+        ).catch((err) => {
+          if (isUnconfirmedSshCommandTermination(err)) {
+            throw err
+          }
+          return true
+        })
         if (!claimedAfterSteal && !options?.signal?.aborted) {
           return
         }
-        await execHostCommand(conn, host, removeRemoteTreeCommand(host, lockDir)).catch(() => {})
+        await execHostCommand(conn, host, removeRemoteTreeCommand(host, lockDir)).catch((err) => {
+          if (isUnconfirmedSshCommandTermination(err)) {
+            throw err
+          }
+        })
         options?.signal?.throwIfAborted()
       }
     }
diff --git a/src/main/ssh/ssh-relay-native-deps-cache-commands.ts b/src/main/ssh/ssh-relay-native-deps-cache-commands.ts
index 52d09de1b193..f2ce32a2222a 100644
--- a/src/main/ssh/ssh-relay-native-deps-cache-commands.ts
+++ b/src/main/ssh/ssh-relay-native-deps-cache-commands.ts
@@ -10,6 +10,7 @@ import { shellEscape } from './ssh-connection-utils'
 import {
   RELAY_NATIVE_DEPS_CACHE_COMPLETE_NAME,
   RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX,
+  LEGACY_RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX,
   relayNativeDepsCacheBaseDir,
   relayNativeDepsCacheEntryDir,
   relayNativeDepsCacheNodeModulesPath,
@@ -34,9 +35,6 @@ export const RELAY_NATIVE_CACHE_REFS_ERR = '__ORCA_NATIVE_CACHE__REFS_ERR'
  */
 const CACHE_TAKEOVER_MINUTES = 120
 
-/** A crashed GC pass leaves a tombstone; it drains once no in-flight pass could still own it. */
-const CACHE_TOMBSTONE_SWEEP_MINUTES = 30
-
 /** Bounds every listing, matching `MAX_RELAY_GC_LISTING_ENTRIES`' role for version dirs. */
 export const MAX_RELAY_NATIVE_CACHE_LISTING_ENTRIES = 64
 
@@ -157,7 +155,7 @@ export function promoteRelayNativeDepsCacheCommand(paths: RelayNativeDepsCachePa
   ].join('\n')
 }
 
-/** Complete entries only; an incomplete one belongs to an installer, not to GC. */
+/** Complete entries and tombstones; deletion requires a separate reference scan. */
 export function listRelayNativeDepsCacheEntriesCommand(
   host: RemoteHostPlatform,
   remoteHome: string
@@ -166,13 +164,12 @@ export function listRelayNativeDepsCacheEntriesCommand(
   return [
     `base=${shellEscape(base)}`,
     `[ -d "$base" ] || { printf '%s\\n' ${RELAY_NATIVE_CACHE_LIST_OK}; exit 0; }`,
-    `find "$base" -maxdepth 1 -name ${shellEscape(`${RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX}*`)} -mmin +${CACHE_TOMBSTONE_SWEEP_MINUTES} -exec rm -rf {} + 2>/dev/null || true`,
     'n=0',
-    'for d in "$base"/*/; do',
+    `for d in "$base"/*/ "$base"/${RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX}*/ "$base"/${LEGACY_RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX}*/; do`,
     '  [ -d "$d" ] || continue',
-    `  [ -f "$d${RELAY_NATIVE_DEPS_CACHE_COMPLETE_NAME}" ] || continue`,
     '  name=${d%/}',
     '  name=${name##*/}',
+    `  case "$name" in ${RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX}*|${LEGACY_RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX}*) ;; *) [ -f "$d${RELAY_NATIVE_DEPS_CACHE_COMPLETE_NAME}" ] || continue ;; esac`,
     `  printf 'ENTRY %s\\n' "$name"`,
     '  n=$((n+1))',
     `  if [ "$n" -ge ${MAX_RELAY_NATIVE_CACHE_LISTING_ENTRIES} ]; then break; fi`,
@@ -196,8 +193,12 @@ export function listRelayNativeDepsCacheReferencesCommand(
   return [
     `root=${shellEscape(root)}`,
     `[ -d "$root" ] || { printf '%s\\n' ${RELAY_NATIVE_CACHE_REFS_OK}; exit 0; }`,
+    `[ -r "$root" ] && [ -x "$root" ] && ls -A "$root" >/dev/null 2>&1 || { printf '%s\\n' ${RELAY_NATIVE_CACHE_REFS_ERR}; exit 0; }`,
     'n=0',
-    'for d in "$root"/*/node_modules; do',
+    'for d in "$root"/*/; do',
+    '  [ -d "$d" ] || continue',
+    `  [ -r "$d" ] && [ -x "$d" ] || { printf '%s\\n' ${RELAY_NATIVE_CACHE_REFS_ERR}; exit 0; }`,
+    '  d="${d}node_modules"',
     '  [ -L "$d" ] || continue',
     '  t=$(readlink "$d" 2>/dev/null) || t=""',
     `  if [ -z "$t" ]; then printf '%s\\n' ${RELAY_NATIVE_CACHE_REFS_ERR}; exit 0; fi`,
@@ -208,3 +209,24 @@ export function listRelayNativeDepsCacheReferencesCommand(
     `printf '%s\\n' ${RELAY_NATIVE_CACHE_REFS_OK}`
   ].join('\n')
 }
+
+/** A missing completion marker means deletion began; leave that tree for later cleanup. */
+export function restoreRelayNativeDepsCacheTombstoneCommand(
+  tombstone: string,
+  entryDir: string
+): string {
+  const source = shellEscape(tombstone)
+  const destination = shellEscape(entryDir)
+  return `if [ -f ${source}/${RELAY_NATIVE_DEPS_CACHE_COMPLETE_NAME} ] && [ ! -e ${destination} ] && [ ! -L ${destination} ]; then mv ${source} ${destination} && echo MOVED; else echo BUSY; fi`
+}
+
+/** A symlinked tombstone is never followed, so only its own marker can be dropped. */
+export function dropRelayNativeDepsCacheCompletionMarkerCommand(tombstone: string): string {
+  const source = shellEscape(tombstone)
+  return `{ [ -L ${source} ] || rm -f ${source}/${RELAY_NATIVE_DEPS_CACHE_COMPLETE_NAME}; }`
+}
+
+/** Drops the completion marker first so an interrupted deletion can never be restored as complete. */
+export function removeRelayNativeDepsCacheTombstoneCommand(tombstone: string): string {
+  return `${dropRelayNativeDepsCacheCompletionMarkerCommand(tombstone)} && rm -rf ${shellEscape(tombstone)}`
+}
diff --git a/src/main/ssh/ssh-relay-native-deps-cache-gc-real.test.ts b/src/main/ssh/ssh-relay-native-deps-cache-gc-real.test.ts
new file mode 100644
index 000000000000..e04d4bcf6bde
--- /dev/null
+++ b/src/main/ssh/ssh-relay-native-deps-cache-gc-real.test.ts
@@ -0,0 +1,415 @@
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  readdirSync,
+  readlinkSync,
+  renameSync,
+  rmSync,
+  symlinkSync,
+  utimesSync,
+  writeFileSync
+} from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { runProcessSync } from '../../shared/child-process/run-process'
+
+const { execMock } = vi.hoisted(() => ({ execMock: vi.fn() }))
+vi.mock('./ssh-relay-deploy-helpers', () => ({ execCommand: execMock }))
+
+import type { SshConnection } from './ssh-connection'
+import { shellEscape } from './ssh-connection-utils'
+import { getRemoteHostPlatform } from './ssh-remote-platform'
+import { gcRelayNativeDepsCache } from './ssh-relay-native-deps-cache-gc'
+import { listRelayNativeDepsCacheEntriesCommand } from './ssh-relay-native-deps-cache-commands'
+import {
+  relayNativeDepsCacheBaseDir,
+  relayNativeDepsCacheEntryDir,
+  LEGACY_RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX,
+  RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX
+} from './ssh-relay-native-deps-cache'
+
+const host = getRemoteHostPlatform('linux-x64')
+const key = 'linux-x64-0123456789abcdef'
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: execCommand is replaced by a local shell for every connection access.
+const conn = {} as SshConnection
+const shells = ['/bin/sh', '/bin/dash'].filter(existsSync)
+
+describe.runIf(process.platform !== 'win32').each(shells)(
+  'native cache GC recovery (%s)',
+  (shell) => {
+    let home: string
+    let cache: string
+    let entry: string
+    let relay: string
+
+    function runShell(command: string): string {
+      const result = runProcessSync({ program: shell, args: ['-c', command], timeoutMs: 15_000 })
+      if (result.code !== 0) {
+        throw new Error(result.stderr || `Shell exited ${result.code}`)
+      }
+      return result.stdout
+    }
+
+    function tombstone(
+      timestamp = Date.now() - 60 * 60_000,
+      prefix = RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX
+    ): string {
+      const path = join(cache, `${prefix}${key}.123.${timestamp}`)
+      renameSync(entry, path)
+      return path
+    }
+
+    function referenceEntry(): void {
+      symlinkSync(join(entry, 'node_modules'), join(relay, 'node_modules'))
+    }
+
+    beforeEach(() => {
+      home = mkdtempSync(join(tmpdir(), 'orca native gc '))
+      cache = relayNativeDepsCacheBaseDir(host, home)
+      entry = relayNativeDepsCacheEntryDir(host, home, key)
+      relay = join(home, '.orca-remote', 'relay-0.1.0+abc')
+      mkdirSync(relay, { recursive: true })
+      mkdirSync(join(entry, 'node_modules'), { recursive: true })
+      writeFileSync(join(entry, 'node_modules', 'addon.node'), 'original')
+      writeFileSync(join(entry, '.deps-complete'), '')
+      utimesSync(entry, new Date(0), new Date(0))
+      execMock
+        .mockReset()
+        .mockImplementation(async (_conn: unknown, command: string) => runShell(command))
+    })
+
+    afterEach(() => {
+      chmodSync(join(home, '.orca-remote'), 0o755)
+      chmodSync(relay, 0o755)
+      rmSync(home, { recursive: true, force: true })
+    })
+
+    function tombstones(): string[] {
+      return readdirSync(cache).filter((name) =>
+        name.startsWith(RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX)
+      )
+    }
+
+    it('lists an ancient-mtime tombstone without deleting it and restores its live reference', async () => {
+      referenceEntry()
+      const path = tombstone()
+
+      expect(runShell(listRelayNativeDepsCacheEntriesCommand(host, home))).toContain(
+        `ENTRY ${RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX}`
+      )
+      expect(existsSync(join(path, 'node_modules', 'addon.node'))).toBe(true)
+
+      await gcRelayNativeDepsCache(conn, host, home)
+
+      expect(readFileSync(join(relay, 'node_modules', 'addon.node'), 'utf8')).toBe('original')
+      expect(readdirSync(cache)).toEqual([key])
+    })
+
+    async function runLaterPass(): Promise<void> {
+      const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 31 * 60_000)
+      try {
+        await gcRelayNativeDepsCache(conn, host, home)
+      } finally {
+        clock.mockRestore()
+      }
+    }
+
+    it('claims a referenced legacy tombstone out of old sweeps but never restores it', async () => {
+      referenceEntry()
+      const path = tombstone(
+        Date.now() - 60 * 60_000,
+        LEGACY_RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX
+      )
+
+      await gcRelayNativeDepsCache(conn, host, home)
+
+      expect(existsSync(path)).toBe(false)
+      const [claimed] = tombstones()
+      expect(existsSync(join(cache, claimed, 'node_modules', 'addon.node'))).toBe(true)
+      expect(existsSync(join(cache, claimed, '.deps-complete'))).toBe(false)
+
+      await runLaterPass()
+
+      expect(existsSync(entry)).toBe(false)
+      expect(tombstones()).toHaveLength(1)
+    })
+
+    it('keeps a legacy tree unrestorable when its claim is interrupted after unmarking', async () => {
+      referenceEntry()
+      const path = tombstone(
+        Date.now() - 60 * 60_000,
+        LEGACY_RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX
+      )
+      execMock.mockImplementation(async (_conn: unknown, command: string) => {
+        if (command.startsWith(`mv ${shellEscape(path)}`)) {
+          throw new Error('claim interrupted')
+        }
+        return runShell(command)
+      })
+
+      await gcRelayNativeDepsCache(conn, host, home)
+
+      expect(existsSync(join(path, 'node_modules', 'addon.node'))).toBe(true)
+      expect(existsSync(join(path, '.deps-complete'))).toBe(false)
+
+      execMock.mockImplementation(async (_conn: unknown, command: string) => runShell(command))
+      await runLaterPass()
+      await runLaterPass()
+
+      expect(existsSync(entry)).toBe(false)
+    })
+
+    it('collects an unreferenced legacy tombstone', async () => {
+      tombstone(Date.now() - 60 * 60_000, LEGACY_RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX)
+
+      await gcRelayNativeDepsCache(conn, host, home)
+
+      expect(readdirSync(cache)).toEqual([])
+    })
+
+    it('lets exactly one of two passes claim the same abandoned tombstone', async () => {
+      const path = tombstone()
+      let releaseClaim!: () => void
+      const claimHeld = new Promise<void>((resolve) => {
+        releaseClaim = resolve
+      })
+      let heldPassReachedClaim!: () => void
+      const reachedClaim = new Promise<void>((resolve) => {
+        heldPassReachedClaim = resolve
+      })
+      let held = false
+      execMock.mockImplementation(async (_conn: unknown, command: string) => {
+        if (!held && command.startsWith(`mv ${shellEscape(path)}`)) {
+          held = true
+          heldPassReachedClaim()
+          await claimHeld
+        }
+        return runShell(command)
+      })
+
+      // The held pass sees the tree as unreferenced; the other pins its key and restores it.
+      const heldPass = gcRelayNativeDepsCache(conn, host, home)
+      await reachedClaim
+      await gcRelayNativeDepsCache(conn, host, home, { pinnedKeys: [key] })
+      releaseClaim()
+      await heldPass
+
+      expect(readdirSync(cache)).toEqual([key])
+      expect(readFileSync(join(entry, 'node_modules', 'addon.node'), 'utf8')).toBe('original')
+      expect(execMock.mock.calls.some(([, command]) => String(command).includes('rm -rf'))).toBe(
+        false
+      )
+    })
+
+    it('does not let another pass resurrect a tombstone while its owner deletes it', async () => {
+      tombstone()
+      let otherPass: Promise<void> | undefined
+      execMock.mockImplementation(async (_conn: unknown, command: string) => {
+        if (!otherPass && command.includes('rm -rf')) {
+          // Simulate the owner's deletion being midway: marker and one file already gone.
+          const [owned] = tombstones()
+          rmSync(join(cache, owned, '.deps-complete'))
+          rmSync(join(cache, owned, 'node_modules', 'addon.node'))
+          referenceEntry()
+          // A later pass on another client sees the owned name as stale and wants the key back.
+          const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 31 * 60_000)
+          try {
+            otherPass = gcRelayNativeDepsCache(conn, host, home, { pinnedKeys: [key] })
+            await otherPass
+          } finally {
+            clock.mockRestore()
+          }
+        }
+        return runShell(command)
+      })
+
+      await gcRelayNativeDepsCache(conn, host, home)
+
+      expect(otherPass).toBeDefined()
+      expect(existsSync(entry)).toBe(false)
+      expect(
+        tombstones().filter((name) => existsSync(join(cache, name, '.deps-complete')))
+      ).toEqual([])
+    })
+
+    it('never restores a tree whose deletion was interrupted, even once its name is stale', async () => {
+      tombstone()
+      const interrupted = new Error('rm interrupted')
+      execMock.mockImplementation(async (_conn: unknown, command: string) => {
+        if (command.includes('rm -rf')) {
+          runShell(command.slice(0, command.indexOf(' && ')))
+          const [owned] = tombstones()
+          rmSync(join(cache, owned, 'node_modules', 'addon.node'))
+          throw interrupted
+        }
+        return runShell(command)
+      })
+      await gcRelayNativeDepsCache(conn, host, home)
+      const [owned] = tombstones()
+      expect(existsSync(join(cache, owned, 'node_modules'))).toBe(true)
+
+      referenceEntry()
+      execMock.mockImplementation(async (_conn: unknown, command: string) => runShell(command))
+      await runLaterPass()
+
+      expect(existsSync(entry)).toBe(false)
+      expect(tombstones()).toHaveLength(1)
+      expect(existsSync(join(cache, tombstones()[0], '.deps-complete'))).toBe(false)
+    })
+
+    it('preserves a referenced tombstone when the clock moves backward during the reference scan', async () => {
+      referenceEntry()
+      const now = Date.now()
+      const path = tombstone(now - 30 * 60_000 - 1)
+      const clock = vi.spyOn(Date, 'now').mockReturnValue(now)
+      execMock.mockImplementation(async (_conn: unknown, command: string) => {
+        if (command.includes('readlink')) {
+          clock.mockReturnValue(now - 60_000)
+        }
+        return runShell(command)
+      })
+      try {
+        await gcRelayNativeDepsCache(conn, host, home)
+        expect(readFileSync(join(relay, 'node_modules', 'addon.node'), 'utf8')).toBe('original')
+        expect(existsSync(path)).toBe(false)
+      } finally {
+        clock.mockRestore()
+      }
+    })
+
+    it('keeps new tombstones outside an old client mtime-only deletion sweep', () => {
+      const path = tombstone()
+      const legacy = join(cache, `${LEGACY_RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX}${key}.123.1`)
+      mkdirSync(legacy)
+      utimesSync(legacy, new Date(0), new Date(0))
+
+      runShell(
+        `find ${shellEscape(cache)} -maxdepth 1 -name '.gc-tombstone.*' -mmin +30 -exec rm -rf {} +`
+      )
+
+      expect(existsSync(join(path, 'node_modules', 'addon.node'))).toBe(true)
+      expect(existsSync(legacy)).toBe(false)
+    })
+
+    it.skipIf(process.getuid?.() === 0).each(['root', 'relay'])(
+      'preserves tombstones when the %s listing is unreadable',
+      async (scope) => {
+        const path = tombstone()
+        referenceEntry()
+        chmodSync(scope === 'root' ? join(home, '.orca-remote') : relay, 0o111)
+
+        await gcRelayNativeDepsCache(conn, host, home)
+
+        expect(existsSync(join(path, 'node_modules', 'addon.node'))).toBe(true)
+        expect(execMock.mock.calls.some(([, command]) => String(command).includes('rm -rf'))).toBe(
+          false
+        )
+      }
+    )
+
+    it('preserves tombstones when a reference cannot be attributed', async () => {
+      const path = tombstone()
+      symlinkSync('../unknown/node_modules', join(relay, 'node_modules'))
+
+      await gcRelayNativeDepsCache(conn, host, home)
+
+      expect(existsSync(join(path, 'node_modules', 'addon.node'))).toBe(true)
+      expect(execMock).toHaveBeenCalledTimes(2)
+    })
+
+    it('collects a stale tombstone only after two complete reference scans', async () => {
+      const path = tombstone()
+
+      await gcRelayNativeDepsCache(conn, host, home)
+
+      expect(existsSync(path)).toBe(false)
+      expect(
+        execMock.mock.calls.filter(([, command]) => String(command).includes('readlink'))
+      ).toHaveLength(2)
+    })
+
+    it('collects an interrupted tombstone deletion after its completion marker is gone', async () => {
+      const path = tombstone()
+      rmSync(join(path, '.deps-complete'))
+
+      await gcRelayNativeDepsCache(conn, host, home)
+
+      expect(existsSync(path)).toBe(false)
+    })
+
+    it('leaves incomplete ordinary entries owned by installers alone', async () => {
+      rmSync(join(entry, '.deps-complete'))
+
+      await gcRelayNativeDepsCache(conn, host, home)
+
+      expect(readFileSync(join(entry, 'node_modules', 'addon.node'), 'utf8')).toBe('original')
+      expect(execMock).toHaveBeenCalledTimes(1)
+    })
+
+    it.each([() => Date.now(), () => Date.now() + 60 * 60_000, () => Number.MAX_SAFE_INTEGER + 1])(
+      'keeps tombstones with a recent, future, or unsafe name timestamp despite ancient mtime',
+      async (timestamp) => {
+        const path = tombstone(timestamp())
+
+        await gcRelayNativeDepsCache(conn, host, home)
+
+        expect(existsSync(join(path, 'node_modules', 'addon.node'))).toBe(true)
+        expect(execMock).toHaveBeenCalledTimes(1)
+      }
+    )
+
+    it('restores a link created during rename when the recheck termination is unconfirmed', async () => {
+      const error = Object.assign(new Error('read-only recheck timed out'), {
+        sshChannelCloseConfirmed: false
+      })
+      let scans = 0
+      execMock.mockImplementation(async (_conn: unknown, command: string) => {
+        if (command.includes('readlink') && ++scans === 2) {
+          throw error
+        }
+        const output = runShell(command)
+        if (command.startsWith('mv ')) {
+          referenceEntry()
+        }
+        return output
+      })
+
+      await expect(gcRelayNativeDepsCache(conn, host, home)).rejects.toBe(error)
+
+      expect(readFileSync(join(relay, 'node_modules', 'addon.node'), 'utf8')).toBe('original')
+      expect(readdirSync(cache)).toEqual([key])
+      expect(execMock).toHaveBeenCalledTimes(5)
+    })
+
+    it.each(['directory', 'dangling symlink'])(
+      'does not overwrite or nest inside a recreated %s',
+      async (kind) => {
+        referenceEntry()
+        const path = tombstone()
+        if (kind === 'directory') {
+          mkdirSync(entry)
+          writeFileSync(join(entry, 'replacement'), 'new')
+        } else {
+          symlinkSync(join(cache, 'missing'), entry)
+        }
+
+        await gcRelayNativeDepsCache(conn, host, home)
+
+        expect(existsSync(path)).toBe(false)
+        const [claimed] = tombstones()
+        expect(readFileSync(join(cache, claimed, 'node_modules', 'addon.node'), 'utf8')).toBe(
+          'original'
+        )
+        if (kind === 'directory') {
+          expect(readdirSync(entry)).toEqual(['replacement'])
+        } else {
+          expect(readlinkSync(entry)).toBe(join(cache, 'missing'))
+        }
+      }
+    )
+  }
+)
diff --git a/src/main/ssh/ssh-relay-native-deps-cache-gc.ts b/src/main/ssh/ssh-relay-native-deps-cache-gc.ts
index e2349ad1bbf5..0febd709cd6f 100644
--- a/src/main/ssh/ssh-relay-native-deps-cache-gc.ts
+++ b/src/main/ssh/ssh-relay-native-deps-cache-gc.ts
@@ -14,23 +14,29 @@
  * linked the entry between the first listing and the rename shows up in the recheck, and its tree
  * is moved back.
  */
+import { randomInt } from 'node:crypto'
 import type { SshConnection } from './ssh-connection'
 import { execCommand } from './ssh-relay-deploy-helpers'
+import { isUnconfirmedSshCommandTermination } from './ssh-relay-exec-command'
 import {
   isRelayNativeDepsCacheEntryName,
   relayNativeDepsCacheBaseDir,
   relayNativeDepsCacheNodeModulesPath,
   supportsRelayNativeDepsCache,
-  RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX
+  RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX,
+  LEGACY_RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX
 } from './ssh-relay-native-deps-cache'
 import {
   listRelayNativeDepsCacheEntriesCommand,
   listRelayNativeDepsCacheReferencesCommand,
   MAX_RELAY_NATIVE_CACHE_LISTING_ENTRIES,
   RELAY_NATIVE_CACHE_LIST_OK,
-  RELAY_NATIVE_CACHE_REFS_OK
+  RELAY_NATIVE_CACHE_REFS_OK,
+  dropRelayNativeDepsCacheCompletionMarkerCommand,
+  removeRelayNativeDepsCacheTombstoneCommand,
+  restoreRelayNativeDepsCacheTombstoneCommand
 } from './ssh-relay-native-deps-cache-commands'
-import { moveRemoteTreeCommand, removeRemoteTreeCommand } from './ssh-remote-commands'
+import { moveRemoteTreeCommand } from './ssh-remote-commands'
 import { joinRemotePath, type RemoteHostPlatform } from './ssh-remote-platform'
 
 type ReferenceScan =
@@ -38,12 +44,34 @@ type ReferenceScan =
   /** Anything this client could not fully account for. No entry may be deleted on it. */
   | { readable: false }
 
+function staleTombstoneKey(name: string): string | null {
+  const prefix = [
+    RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX,
+    LEGACY_RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX
+  ].find((value) => name.startsWith(value))
+  if (!prefix) {
+    return null
+  }
+  const match = /^(.*)\.(\d+)\.(\d+)$/.exec(name.slice(prefix.length))
+  if (
+    !match ||
+    !isRelayNativeDepsCacheEntryName(match[1]) ||
+    !Number.isSafeInteger(Number(match[3])) ||
+    Date.now() - Number(match[3]) < 30 * 60_000
+  ) {
+    return null
+  }
+  return match[1]
+}
+
 function execHostCommand(
   conn: SshConnection,
   host: RemoteHostPlatform,
   command: string
 ): Promise<string> {
-  return execCommand(conn, command, { wrapCommand: host.commandDialect !== 'powershell' })
+  return execCommand(conn, command, {
+    wrapCommand: host.commandDialect !== 'powershell'
+  })
 }
 
 /**
@@ -64,12 +92,15 @@ export async function gcRelayNativeDepsCache(
     return
   }
   const base = relayNativeDepsCacheBaseDir(host, remoteHome)
-  let entries: string[]
+  let entries: CacheEntry[]
   try {
     entries = parseCacheEntryListing(
       await execHostCommand(conn, host, listRelayNativeDepsCacheEntriesCommand(host, remoteHome))
     )
-  } catch {
+  } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
     return
   }
   if (entries.length === 0) {
@@ -80,10 +111,14 @@ export async function gcRelayNativeDepsCache(
     return
   }
   const pinned = new Set(options?.pinnedKeys ?? [])
-  const candidates = entries.filter((key) => !scan.referencedKeys.has(key) && !pinned.has(key))
   const removed: string[] = []
-  for (const key of candidates) {
-    if (await removeUnreferencedCacheEntry(conn, host, remoteHome, base, key)) {
+  for (const { name, key } of entries) {
+    const keep = scan.referencedKeys.has(key) || pinned.has(key)
+    const collected =
+      name === key
+        ? !keep && (await removeUnreferencedCacheEntry(conn, host, remoteHome, base, key))
+        : await recoverAbandonedTombstone(conn, host, remoteHome, base, name, key, keep)
+    if (collected) {
       removed.push(key)
     }
   }
@@ -94,55 +129,139 @@ export async function gcRelayNativeDepsCache(
   }
 }
 
-async function removeUnreferencedCacheEntry(
+// Why random rather than pid + clock: passes on different clients must never rename into one path.
+function ownedTombstonePath(host: RemoteHostPlatform, base: string, key: string): string {
+  const name = `${RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX}${key}.${randomInt(1, 2 ** 47)}.${Date.now()}`
+  return joinRemotePath(host, base, name)
+}
+
+async function moveTree(
   conn: SshConnection,
   host: RemoteHostPlatform,
-  remoteHome: string,
-  base: string,
-  key: string
+  source: string,
+  destination: string
 ): Promise<boolean> {
-  const entryDir = joinRemotePath(host, base, key)
-  const tombstone = joinRemotePath(
-    host,
-    base,
-    `${RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX}${key}.${process.pid}.${Date.now()}`
-  )
   try {
     const moved = await execHostCommand(
       conn,
       host,
-      moveRemoteTreeCommand(host, entryDir, tombstone)
+      moveRemoteTreeCommand(host, source, destination)
     )
-    if (moved.trim() !== 'MOVED') {
-      return false
+    return moved.trim() === 'MOVED'
+  } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
     }
-  } catch {
     return false
   }
+}
+
+async function removeUnreferencedCacheEntry(
+  conn: SshConnection,
+  host: RemoteHostPlatform,
+  remoteHome: string,
+  base: string,
+  key: string
+): Promise<boolean> {
+  const entryDir = joinRemotePath(host, base, key)
+  const tombstone = ownedTombstonePath(host, base, key)
+  if (!(await moveTree(conn, host, entryDir, tombstone))) {
+    return false
+  }
+  return collectOwnedTombstone(conn, host, remoteHome, key, tombstone, entryDir)
+}
+
+/**
+ * Another pass may list the same abandoned tombstone, so only the pass whose rename wins may
+ * restore or delete it; the fresh name keeps every other pass off it for the stale window.
+ */
+async function recoverAbandonedTombstone(
+  conn: SshConnection,
+  host: RemoteHostPlatform,
+  remoteHome: string,
+  base: string,
+  name: string,
+  key: string,
+  keep: boolean
+): Promise<boolean> {
+  const source = joinRemotePath(host, base, name)
+  // Why unmark legacy trees before claiming them: an old client's mtime sweep may have left a
+  // partial tree with its marker, and the marker is all a later pass checks before restoring.
+  if (
+    name.startsWith(LEGACY_RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX) &&
+    !(await runOrDecline(conn, host, dropRelayNativeDepsCacheCompletionMarkerCommand(source)))
+  ) {
+    return false
+  }
+  const tombstone = ownedTombstonePath(host, base, key)
+  if (!(await moveTree(conn, host, source, tombstone))) {
+    return false
+  }
+  const entryDir = joinRemotePath(host, base, key)
+  if (keep) {
+    await restoreCacheEntry(conn, host, tombstone, entryDir)
+    return false
+  }
+  return collectOwnedTombstone(conn, host, remoteHome, key, tombstone, entryDir)
+}
+
+async function collectOwnedTombstone(
+  conn: SshConnection,
+  host: RemoteHostPlatform,
+  remoteHome: string,
+  key: string,
+  tombstone: string,
+  entryDir: string
+): Promise<boolean> {
   // Why recheck under the rename: a deploy that read `.deps-complete` before it moved can still
   // be creating its symlink. Its reference now names a path that no longer exists, so restoring
   // the tree is the only outcome that leaves that relay with working native deps.
-  let recheck: ReferenceScan
-  try {
-    recheck = await scanCacheReferences(conn, host, remoteHome)
-  } catch {
-    recheck = { readable: false }
-  }
+  const recheck = await scanCacheReferences(conn, host, remoteHome).catch(async (err: unknown) => {
+    // A read-only scan cannot conflict with restoring this pass's renamed tree.
+    await restoreCacheEntry(conn, host, tombstone, entryDir).catch(() => {})
+    throw err
+  })
   if (!recheck.readable || recheck.referencedKeys.has(key)) {
-    await execHostCommand(conn, host, moveRemoteTreeCommand(host, tombstone, entryDir)).catch(
-      () => {}
-    )
+    await restoreCacheEntry(conn, host, tombstone, entryDir)
     return false
   }
+  // A failed removal is retried by a later pass after its own recheck.
+  return runOrDecline(conn, host, removeRelayNativeDepsCacheTombstoneCommand(tombstone))
+}
+
+async function runOrDecline(
+  conn: SshConnection,
+  host: RemoteHostPlatform,
+  command: string
+): Promise<boolean> {
   try {
-    await execHostCommand(conn, host, removeRemoteTreeCommand(host, tombstone))
+    await execHostCommand(conn, host, command)
     return true
-  } catch {
-    // The sweep in the entry listing drains a tombstone this pass could not remove.
+  } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
     return false
   }
 }
 
+async function restoreCacheEntry(
+  conn: SshConnection,
+  host: RemoteHostPlatform,
+  tombstone: string,
+  entryDir: string
+): Promise<void> {
+  await execHostCommand(
+    conn,
+    host,
+    restoreRelayNativeDepsCacheTombstoneCommand(tombstone, entryDir)
+  ).catch((err) => {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
+  })
+}
+
 async function scanCacheReferences(
   conn: SshConnection,
   host: RemoteHostPlatform,
@@ -155,7 +274,10 @@ async function scanCacheReferences(
       host,
       listRelayNativeDepsCacheReferencesCommand(host, remoteHome)
     )
-  } catch {
+  } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
     return { readable: false }
   }
   const lines = output.split(/\r?\n/).map((line) => line.trim())
@@ -219,12 +341,14 @@ function attributeReference(
     : { kind: 'unattributable' }
 }
 
-function parseCacheEntryListing(output: string): string[] {
+type CacheEntry = { name: string; key: string }
+
+function parseCacheEntryListing(output: string): CacheEntry[] {
   const lines = output.split(/\r?\n/).map((line) => line.trim())
   if (!lines.includes(RELAY_NATIVE_CACHE_LIST_OK)) {
     return []
   }
-  const entries: string[] = []
+  const entries: CacheEntry[] = []
   for (const line of lines) {
     if (!line.startsWith('ENTRY ')) {
       continue
@@ -232,11 +356,9 @@ function parseCacheEntryListing(output: string): string[] {
     const name = line.slice('ENTRY '.length)
     // Why re-validate a name the host produced: it is about to be interpolated into `mv` and
     // `rm -rf`. Only names this client could itself have minted are eligible.
-    if (
-      isRelayNativeDepsCacheEntryName(name) &&
-      entries.length < MAX_RELAY_NATIVE_CACHE_LISTING_ENTRIES
-    ) {
-      entries.push(name)
+    const key = isRelayNativeDepsCacheEntryName(name) ? name : staleTombstoneKey(name)
+    if (key && entries.length < MAX_RELAY_NATIVE_CACHE_LISTING_ENTRIES) {
+      entries.push({ name, key })
     }
   }
   return entries
diff --git a/src/main/ssh/ssh-relay-native-deps-cache.test.ts b/src/main/ssh/ssh-relay-native-deps-cache.test.ts
index bfe0c4819836..7fee587b3ec6 100644
--- a/src/main/ssh/ssh-relay-native-deps-cache.test.ts
+++ b/src/main/ssh/ssh-relay-native-deps-cache.test.ts
@@ -168,7 +168,7 @@ describe('gcRelayNativeDepsCache', () => {
 
     const last = mockExec.mock.calls.at(-1)?.[1] ?? ''
     expect(last).toContain('rm -rf')
-    expect(last).toContain('.gc-tombstone.')
+    expect(last).toContain('.native-gc-')
   })
 
   it('keeps an entry a live relay depends on', async () => {
@@ -179,7 +179,7 @@ describe('gcRelayNativeDepsCache', () => {
     await gcRelayNativeDepsCache(conn, POSIX, HOME)
 
     expect(mockExec).toHaveBeenCalledTimes(2)
-    expect(mockExec.mock.calls.some(([, c]) => c.startsWith('rm -rf'))).toBe(false)
+    expect(mockExec.mock.calls.some(([, c]) => c.includes('rm -rf'))).toBe(false)
   })
 
   it('keeps every entry when the reference listing never answers', async () => {
@@ -219,7 +219,7 @@ describe('gcRelayNativeDepsCache', () => {
 
     await gcRelayNativeDepsCache(conn, POSIX, HOME)
 
-    expect(mockExec.mock.calls.some(([, c]) => c.startsWith('rm -rf'))).toBe(true)
+    expect(mockExec.mock.calls.some(([, c]) => c.includes('rm -rf'))).toBe(true)
   })
 
   it('restores the tree when a deploy links the entry after the tombstone rename', async () => {
@@ -235,7 +235,7 @@ describe('gcRelayNativeDepsCache', () => {
     const last = mockExec.mock.calls.at(-1)?.[1] ?? ''
     expect(last).toContain('mv ')
     expect(last).toContain(relayNativeDepsCacheEntryDir(POSIX, HOME, KEY))
-    expect(mockExec.mock.calls.some(([, c]) => c.startsWith('rm -rf'))).toBe(false)
+    expect(mockExec.mock.calls.some(([, c]) => c.includes('rm -rf'))).toBe(false)
   })
 
   it('restores the tree when the recheck itself cannot answer', async () => {
@@ -248,7 +248,7 @@ describe('gcRelayNativeDepsCache', () => {
 
     await gcRelayNativeDepsCache(conn, POSIX, HOME)
 
-    expect(mockExec.mock.calls.some(([, c]) => c.startsWith('rm -rf'))).toBe(false)
+    expect(mockExec.mock.calls.some(([, c]) => c.includes('rm -rf'))).toBe(false)
   })
 
   it('never removes a pinned key', async () => {
diff --git a/src/main/ssh/ssh-relay-native-deps-cache.ts b/src/main/ssh/ssh-relay-native-deps-cache.ts
index 8400a467a913..79f04221c010 100644
--- a/src/main/ssh/ssh-relay-native-deps-cache.ts
+++ b/src/main/ssh/ssh-relay-native-deps-cache.ts
@@ -41,8 +41,9 @@ export const RELAY_NATIVE_DEPS_CACHE_DIR_NAME = 'native'
 /** Written last. Its presence is the only thing that makes an entry linkable. */
 export const RELAY_NATIVE_DEPS_CACHE_COMPLETE_NAME = '.deps-complete'
 
-/** Hidden so the entry listing skips it, and swept by age so a crashed pass drains. */
-export const RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX = '.gc-tombstone.'
+/** Older clients sweep the legacy prefix by mtime without checking references. */
+export const RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX = '.native-gc-'
+export const LEGACY_RELAY_NATIVE_DEPS_CACHE_TOMBSTONE_PREFIX = '.gc-tombstone.'
 
 /**
  * Bump when the remote install starts mutating the installed tree in a way the hashed inputs
diff --git a/src/main/ssh/ssh-relay-repair-lock-termination.test.ts b/src/main/ssh/ssh-relay-repair-lock-termination.test.ts
new file mode 100644
index 000000000000..db73b92e2393
--- /dev/null
+++ b/src/main/ssh/ssh-relay-repair-lock-termination.test.ts
@@ -0,0 +1,137 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('./ssh-relay-deploy-helpers', () => ({ execCommand: vi.fn() }))
+
+import type { SshConnection } from './ssh-connection'
+import { execCommand } from './ssh-relay-deploy-helpers'
+import { tryAcquireRelayRepairLock } from './ssh-relay-repair-lock'
+import { getRemoteHostPlatform } from './ssh-remote-platform'
+
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The mocked execCommand never reads the connection.
+const conn = {} as SshConnection
+const mockExec = vi.mocked(execCommand)
+const freshLockReplies = ['OPEN', 'LOCKED', '0']
+const contentionReplies = ['OPEN', '', 'BUSY', 'BUSY']
+
+const failureStages = [
+  { stage: 'initial claim probe', replies: [], recovery: [], result: 'error' },
+  { stage: 'parent creation', replies: ['OPEN'], recovery: freshLockReplies, result: 'busy' },
+  { stage: 'lock creation', replies: ['OPEN', ''], recovery: freshLockReplies, result: 'busy' },
+  {
+    stage: 'stale takeover',
+    replies: ['OPEN', '', 'BUSY'],
+    recovery: freshLockReplies,
+    result: 'busy'
+  },
+  {
+    stage: 'claim probe after creation',
+    replies: ['OPEN', '', 'OK'],
+    recovery: [''],
+    result: 'error'
+  },
+  {
+    stage: 'release after creation',
+    replies: ['OPEN', '', 'OK', 'LOCKED'],
+    recovery: [],
+    result: 'gc'
+  },
+  {
+    stage: 'claim probe after takeover',
+    replies: ['OPEN', '', 'BUSY', 'OK'],
+    recovery: [''],
+    result: 'error'
+  },
+  {
+    stage: 'release after takeover',
+    replies: ['OPEN', '', 'BUSY', 'OK', 'LOCKED'],
+    recovery: [],
+    result: 'gc'
+  },
+  { stage: 'contention claim probe', replies: contentionReplies, recovery: [], result: 'error' },
+  {
+    stage: 'contention lock probe',
+    replies: [...contentionReplies, 'OPEN'],
+    recovery: [],
+    result: 'error'
+  },
+  {
+    stage: 'contention lock age probe',
+    replies: [...contentionReplies, 'OPEN', 'LOCKED'],
+    recovery: [],
+    result: 'error'
+  }
+]
+
+beforeEach(() => {
+  mockExec.mockReset()
+  mockExec.mockResolvedValue('OPEN')
+  vi.spyOn(console, 'warn').mockImplementation(() => {})
+})
+
+afterEach(() => {
+  vi.restoreAllMocks()
+})
+
+describe.each([
+  { platform: 'linux-x64' as const, remoteDir: '/relay/version' },
+  { platform: 'win32-x64' as const, remoteDir: 'C:/relay/version' }
+])('repair lock termination on $platform', ({ platform, remoteDir }) => {
+  const host = getRemoteHostPlatform(platform)
+
+  describe.each([false, true])('with caller aborted = %s', (aborted) => {
+    it.each(failureStages)('stops after unconfirmed $stage', async ({ replies }) => {
+      const controller = new AbortController()
+      const error = Object.assign(new Error('SSH teardown not confirmed'), {
+        sshChannelCloseConfirmed: false
+      })
+      for (const reply of replies) {
+        mockExec.mockResolvedValueOnce(reply)
+      }
+      mockExec.mockImplementationOnce(async () => {
+        if (aborted) {
+          controller.abort(new Error('deploy aborted'))
+        }
+        throw error
+      })
+
+      await expect(
+        tryAcquireRelayRepairLock(conn, remoteDir, host, { signal: controller.signal })
+      ).rejects.toBe(error)
+      expect(mockExec).toHaveBeenCalledTimes(replies.length + 1)
+    })
+  })
+
+  it.each(failureStages)(
+    'keeps recovery after confirmed $stage failure',
+    async ({ replies, recovery, result }) => {
+      for (const reply of replies) {
+        mockExec.mockResolvedValueOnce(reply)
+      }
+      mockExec.mockRejectedValueOnce(
+        Object.assign(new Error('SSH command failed after closing'), {
+          sshChannelCloseConfirmed: true
+        })
+      )
+      for (const reply of recovery) {
+        mockExec.mockResolvedValueOnce(reply)
+      }
+
+      await expect(tryAcquireRelayRepairLock(conn, remoteDir, host)).resolves.toBe(result)
+      expect(mockExec).toHaveBeenCalledTimes(replies.length + recovery.length + 1)
+    }
+  )
+
+  it('stops when a contention probe after a confirmed acquisition failure is unconfirmed', async () => {
+    const error = Object.assign(new Error('SSH teardown not confirmed'), {
+      sshChannelCloseConfirmed: false
+    })
+    mockExec
+      .mockResolvedValueOnce('OPEN')
+      .mockResolvedValueOnce('')
+      .mockRejectedValueOnce(new Error('lock creation failed'))
+      .mockRejectedValueOnce(error)
+
+    await expect(tryAcquireRelayRepairLock(conn, remoteDir, host)).rejects.toBe(error)
+    expect(mockExec).toHaveBeenCalledTimes(4)
+  })
+})
diff --git a/src/main/ssh/ssh-relay-repair-lock.ts b/src/main/ssh/ssh-relay-repair-lock.ts
index 01d58e390e11..1e2b8b7a9d53 100644
--- a/src/main/ssh/ssh-relay-repair-lock.ts
+++ b/src/main/ssh/ssh-relay-repair-lock.ts
@@ -1,5 +1,6 @@
 import type { SshConnection } from './ssh-connection'
 import { execCommand } from './ssh-relay-deploy-helpers'
+import { isUnconfirmedSshCommandTermination } from './ssh-relay-exec-command'
 import {
   acquireInstallLockParentCommand,
   lockAgeSecondsCommand,
@@ -49,7 +50,12 @@ export async function tryAcquireRelayRepairLock(
       remoteRelayDir,
       host,
       options?.signal
-    ).catch(() => undefined)
+    ).catch((error) => {
+      if (isUnconfirmedSshCommandTermination(error)) {
+        throw error
+      }
+      return undefined
+    })
     options?.signal?.throwIfAborted()
     if (gcClaimedBeforeAcquire === true) {
       return 'gc'
@@ -83,7 +89,10 @@ export async function tryAcquireRelayRepairLock(
       return finishRepairLockAcquire(conn, remoteRelayDir, lockDir, host, options?.signal)
     }
     return classifyRepairLockContention(conn, remoteRelayDir, lockDir, host, options?.signal)
-  } catch {
+  } catch (error) {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
     options?.signal?.throwIfAborted()
     return classifyRepairLockContention(conn, remoteRelayDir, lockDir, host, options?.signal)
   }
@@ -96,9 +105,12 @@ async function classifyRepairLockContention(
   host: RemoteHostPlatform,
   signal?: AbortSignal
 ): Promise<RelayRepairLockResult> {
-  const gcClaimed = await isRelayGcClaimed(conn, remoteRelayDir, host, signal).catch(
-    () => undefined
-  )
+  const gcClaimed = await isRelayGcClaimed(conn, remoteRelayDir, host, signal).catch((error) => {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
+    return undefined
+  })
   signal?.throwIfAborted()
   if (gcClaimed === true) {
     return 'gc'
@@ -112,7 +124,12 @@ async function classifyRepairLockContention(
     host,
     probeInstallLockExistsCommand(host, lockDir),
     signal
-  ).catch(() => '')
+  ).catch((error) => {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
+    return ''
+  })
   signal?.throwIfAborted()
   if (lockProbe.trim() !== 'LOCKED') {
     return 'error'
@@ -122,7 +139,12 @@ async function classifyRepairLockContention(
     host,
     lockAgeSecondsCommand(host, lockDir),
     signal
-  ).catch(() => '')
+  ).catch((error) => {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
+    return ''
+  })
   signal?.throwIfAborted()
   const ageSeconds = Number.parseInt(ageOutput.trim(), 10)
   // Why: GC may remove stale locks, so only a positively observed fresh lock
@@ -139,15 +161,22 @@ async function finishRepairLockAcquire(
   host: RemoteHostPlatform,
   signal?: AbortSignal
 ): Promise<RelayRepairLockResult> {
-  const gcClaimed = await isRelayGcClaimed(conn, remoteRelayDir, host, signal).catch(
-    () => undefined
-  )
+  const gcClaimed = await isRelayGcClaimed(conn, remoteRelayDir, host, signal).catch((error) => {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
+    return undefined
+  })
   if (gcClaimed === false && !signal?.aborted) {
     return 'acquired'
   }
   // Why: GC may win its stable sibling claim while this command creates the
   // in-tree lock. Back out before npm can mutate a directory being renamed.
-  await execHostCommand(conn, host, removeRemoteTreeCommand(host, lockDir)).catch(() => {})
+  await execHostCommand(conn, host, removeRemoteTreeCommand(host, lockDir)).catch((error) => {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
+  })
   signal?.throwIfAborted()
   return gcClaimed ? 'gc' : 'error'
 }
diff --git a/src/main/ssh/ssh-relay-ripgrep-cache-gc-commands.ts b/src/main/ssh/ssh-relay-ripgrep-cache-gc-commands.ts
index 509ba9a0ebd9..9e0358fa4ca2 100644
--- a/src/main/ssh/ssh-relay-ripgrep-cache-gc-commands.ts
+++ b/src/main/ssh/ssh-relay-ripgrep-cache-gc-commands.ts
@@ -97,17 +97,3 @@ export function listReferencesCommand(host: RemoteHostPlatform, remoteHome: stri
     `printf '%s\\n' ${REFS_OK}`
   ].join('\n')
 }
-
-// A concurrent installer may already have recreated the original directory.
-export function restoreEntryCommand(
-  host: RemoteHostPlatform,
-  source: string,
-  destination: string
-): string {
-  if (isWindowsRemoteHost(host)) {
-    return powerShellCommand(
-      `if (-not (Test-Path -LiteralPath ${powerShellLiteral(destination)})) { Move-Item -LiteralPath ${powerShellLiteral(source)} -Destination ${powerShellLiteral(destination)} -ErrorAction Stop; 'MOVED' } else { 'BUSY' }`
-    )
-  }
-  return `if [ ! -e ${shellEscape(destination)} ]; then mv ${shellEscape(source)} ${shellEscape(destination)} && echo MOVED; else echo BUSY; fi`
-}
diff --git a/src/main/ssh/ssh-relay-ripgrep-cache-gc-real.test.ts b/src/main/ssh/ssh-relay-ripgrep-cache-gc-real.test.ts
index 8b3e657e523e..f29a9c52638d 100644
--- a/src/main/ssh/ssh-relay-ripgrep-cache-gc-real.test.ts
+++ b/src/main/ssh/ssh-relay-ripgrep-cache-gc-real.test.ts
@@ -5,6 +5,7 @@ import {
   mkdirSync,
   mkdtempSync,
   readdirSync,
+  renameSync,
   rmSync,
   writeFileSync
 } from 'node:fs'
@@ -112,6 +113,75 @@ describe('ripgrep cache shell transactions', () => {
     expect(readdirSync(cache)).toEqual([FIRST])
   })
 
+  it('restores an abandoned tombstone that a relay still references', async () => {
+    await recordRemoteRipgrepReference(conn, host, relay, FIRST)
+    await recordRemoteRipgrepReference(conn, host, relay, SECOND)
+    const tombstone = `.rg-gc-${SECOND}.123.${Date.now() - 60 * 60_000}`
+    renameSync(join(cache, SECOND), join(cache, tombstone))
+
+    await gcRemoteRipgrepCache(conn, host, home)
+
+    expect(readdirSync(cache).sort()).toEqual([FIRST, SECOND])
+    expect(existsSync(join(cache, SECOND, 'rg'))).toBe(true)
+  })
+
+  it('preserves a referenced tombstone when the clock moves backward during the reference scan', async () => {
+    await recordRemoteRipgrepReference(conn, host, relay, FIRST)
+    await recordRemoteRipgrepReference(conn, host, relay, SECOND)
+    const now = Date.now()
+    const tombstone = `.rg-gc-${SECOND}.123.${now - 30 * 60_000 - 1}`
+    renameSync(join(cache, SECOND), join(cache, tombstone))
+    const clock = vi.spyOn(Date, 'now').mockReturnValue(now)
+    let calls = 0
+    execMock.mockImplementation(async (_conn: unknown, command: string) => {
+      if (++calls === 2) {
+        clock.mockReturnValue(now - 60_000)
+      }
+      return runShell(command)
+    })
+    try {
+      await gcRemoteRipgrepCache(conn, host, home)
+      expect(readdirSync(cache).sort()).toEqual([FIRST, SECOND])
+      expect(existsSync(join(cache, SECOND, 'rg'))).toBe(true)
+    } finally {
+      clock.mockRestore()
+    }
+  })
+
+  it('lets exactly one of two passes claim the same abandoned tombstone', async () => {
+    await recordRemoteRipgrepReference(conn, host, relay, FIRST)
+    const tombstone = `.rg-gc-${SECOND}.123.${Date.now() - 60 * 60_000}`
+    renameSync(join(cache, SECOND), join(cache, tombstone))
+    let releaseClaim!: () => void
+    const claimHeld = new Promise<void>((resolve) => {
+      releaseClaim = resolve
+    })
+    let heldPassReachedClaim!: () => void
+    const reachedClaim = new Promise<void>((resolve) => {
+      heldPassReachedClaim = resolve
+    })
+    let held = false
+    execMock.mockImplementation(async (_conn: unknown, command: string) => {
+      const script = process.platform === 'win32' ? decodeRemotePowerShellScript(command) : command
+      if (!held && script.includes(tombstone)) {
+        held = true
+        heldPassReachedClaim()
+        await claimHeld
+      }
+      return runShell(command)
+    })
+
+    // The held pass sees SECOND as unreferenced; the other pins it and restores it.
+    const heldPass = gcRemoteRipgrepCache(conn, host, home)
+    await reachedClaim
+    await gcRemoteRipgrepCache(conn, host, home, { pinnedEntry: SECOND })
+    releaseClaim()
+    await heldPass
+
+    expect(readdirSync(cache).sort()).toEqual([FIRST, SECOND])
+    expect(existsSync(join(cache, SECOND, 'rg'))).toBe(true)
+  })
+
   it('does not nest a tombstone inside a directory recreated by a concurrent installer', async () => {
     await recordRemoteRipgrepReference(conn, host, relay, FIRST)
     let raced = false
diff --git a/src/main/ssh/ssh-relay-ripgrep-cache-gc.ts b/src/main/ssh/ssh-relay-ripgrep-cache-gc.ts
index 18cca2c4f5f8..0f479548499e 100644
--- a/src/main/ssh/ssh-relay-ripgrep-cache-gc.ts
+++ b/src/main/ssh/ssh-relay-ripgrep-cache-gc.ts
@@ -6,15 +6,20 @@ import {
   MAX_LISTING_ENTRIES,
   cacheDir,
   listEntriesCommand,
-  listReferencesCommand,
-  restoreEntryCommand
+  listReferencesCommand
 } from './ssh-relay-ripgrep-cache-gc-commands'
 // Relay installation references protect binaries until version GC removes their owners.
 // Unknown references block deletion; tombstones are rechecked before removal.
+import { randomInt } from 'node:crypto'
 import type { SshConnection } from './ssh-connection'
 import { execCommand } from './ssh-relay-deploy-helpers'
+import { isUnconfirmedSshCommandTermination } from './ssh-relay-exec-command'
 import { BUNDLED_RIPGREP_PLATFORMS } from '../../shared/bundled-ripgrep'
-import { moveRemoteTreeCommand, removeRemoteTreeCommand } from './ssh-remote-commands'
+import {
+  moveRemoteTreeCommand,
+  removeRemoteTreeCommand,
+  restoreRemoteTreeCommand
+} from './ssh-remote-commands'
 import { isWindowsRemoteHost, joinRemotePath, type RemoteHostPlatform } from './ssh-remote-platform'
 
 function entryNamePattern(): RegExp {
@@ -32,24 +37,33 @@ function staleTombstoneEntry(name: string): string | null {
     return null
   }
   const match = /^(.*)\.(\d+)\.(\d+)$/.exec(name.slice(TOMBSTONE_PREFIX.length))
-  if (!match || !ENTRY_NAME.test(match[1]) || Date.now() - Number(match[3]) < 30 * 60_000) {
+  if (
+    !match ||
+    !ENTRY_NAME.test(match[1]) ||
+    !Number.isSafeInteger(Number(match[3])) ||
+    Date.now() - Number(match[3]) < 30 * 60_000
+  ) {
     return null
   }
   return match[1]
 }
 
 function exec(conn: SshConnection, host: RemoteHostPlatform, command: string): Promise<string> {
-  return execCommand(conn, command, { wrapCommand: !isWindowsRemoteHost(host) })
+  return execCommand(conn, command, {
+    wrapCommand: !isWindowsRemoteHost(host)
+  })
 }
 
 type ReferenceScan = { readable: true; referenced: Set<string> } | { readable: false }
 
-function parseEntries(output: string): string[] {
+type CacheEntry = { name: string; entry: string }
+
+function parseEntries(output: string): CacheEntry[] {
   const lines = output.split(/\r?\n/).map((line) => line.trim())
   if (!lines.includes(LIST_OK)) {
     return []
   }
-  const entries: string[] = []
+  const entries: CacheEntry[] = []
   for (const line of lines) {
     if (!line.startsWith('ENTRY ')) {
       continue
@@ -57,11 +71,9 @@ function parseEntries(output: string): string[] {
     const name = line.slice('ENTRY '.length)
     // Why re-validate a name the host produced: it is about to be interpolated into `mv` and
     // `rm -rf`. Only names this client could itself have minted are eligible.
-    if (
-      (ENTRY_NAME.test(name) || staleTombstoneEntry(name)) &&
-      entries.length < MAX_LISTING_ENTRIES
-    ) {
-      entries.push(name)
+    const entry = ENTRY_NAME.test(name) ? name : staleTombstoneEntry(name)
+    if (entry && entries.length < MAX_LISTING_ENTRIES) {
+      entries.push({ name, entry })
     }
   }
   return entries
@@ -75,7 +87,10 @@ async function scanReferences(
   let output: string
   try {
     output = await exec(conn, host, listReferencesCommand(host, remoteHome))
-  } catch {
+  } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
     return { readable: false }
   }
   const lines = output.split(/\r?\n/).map((line) => line.trim())
@@ -99,7 +114,7 @@ async function scanReferences(
   return { readable: true, referenced }
 }
 
-/** Collect ripgrep builds that no relay installation references. Never throws. */
+/** Collect unreferenced ripgrep builds; unconfirmed termination stops the caller's cleanup. */
 export async function gcRemoteRipgrepCache(
   conn: SshConnection,
   host: RemoteHostPlatform,
@@ -116,28 +131,51 @@ export async function gcRemoteRipgrepCache(
       return
     }
     const removed: string[] = []
-    for (const name of entries) {
-      const entry = staleTombstoneEntry(name) ?? name
-      if (scan.referenced.has(entry) || entry === options.pinnedEntry) {
-        continue
-      }
-      if (
-        await removeUnreferencedEntry(
-          conn,
-          host,
-          remoteHome,
-          entry,
-          name === entry ? undefined : name
-        )
-      ) {
+    for (const { name, entry } of entries) {
+      const keep = scan.referenced.has(entry) || entry === options.pinnedEntry
+      const collected =
+        name === entry
+          ? !keep && (await removeUnreferencedEntry(conn, host, remoteHome, entry))
+          : await recoverAbandonedTombstone(conn, host, remoteHome, name, entry, keep)
+      if (collected) {
         removed.push(entry)
       }
     }
     if (removed.length > 0) {
       console.log(`[ssh-relay] ripgrep cache GC: removed ${removed.length}: ${removed.join(', ')}`)
     }
-  } catch {
-    /* Never fails a deploy; the next connect tries again. */
+  } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
+    // Confirmed cleanup failures are optional; the next connect tries again.
+  }
+}
+
+// Why random rather than pid + clock: passes on different clients must never rename into one path.
+function ownedTombstonePath(host: RemoteHostPlatform, base: string, entry: string): string {
+  return joinRemotePath(
+    host,
+    base,
+    `${TOMBSTONE_PREFIX}${entry}.${randomInt(1, 2 ** 47)}.${Date.now()}`
+  )
+}
+
+async function moveTree(
+  conn: SshConnection,
+  host: RemoteHostPlatform,
+  source: string,
+  destination: string
+): Promise<boolean> {
+  try {
+    return (
+      (await exec(conn, host, moveRemoteTreeCommand(host, source, destination))).trim() === 'MOVED'
+    )
+  } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
+    return false
   }
 }
 
@@ -145,39 +183,80 @@ async function removeUnreferencedEntry(
   conn: SshConnection,
   host: RemoteHostPlatform,
   remoteHome: string,
+  entry: string
+): Promise<boolean> {
+  const base = cacheDir(host, remoteHome)
+  const entryDir = joinRemotePath(host, base, entry)
+  const tombstone = ownedTombstonePath(host, base, entry)
+  if (!(await moveTree(conn, host, entryDir, tombstone))) {
+    return false
+  }
+  return collectOwnedTombstone(conn, host, remoteHome, entry, tombstone, entryDir)
+}
+
+// Only the pass whose rename wins may restore or delete a tombstone other passes can also list.
+async function recoverAbandonedTombstone(
+  conn: SshConnection,
+  host: RemoteHostPlatform,
+  remoteHome: string,
+  name: string,
   entry: string,
-  abandonedTombstone?: string
+  keep: boolean
 ): Promise<boolean> {
   const base = cacheDir(host, remoteHome)
+  const tombstone = ownedTombstonePath(host, base, entry)
+  if (!(await moveTree(conn, host, joinRemotePath(host, base, name), tombstone))) {
+    return false
+  }
   const entryDir = joinRemotePath(host, base, entry)
-  const tombstone = joinRemotePath(
-    host,
-    base,
-    abandonedTombstone ?? `${TOMBSTONE_PREFIX}${entry}.${process.pid}.${Date.now()}`
-  )
-  try {
-    if (
-      !abandonedTombstone &&
-      (await exec(conn, host, moveRemoteTreeCommand(host, entryDir, tombstone))).trim() !== 'MOVED'
-    ) {
-      return false
-    }
-  } catch {
+  if (keep) {
+    await restoreCacheEntry(conn, host, tombstone, entryDir)
     return false
   }
+  return collectOwnedTombstone(conn, host, remoteHome, entry, tombstone, entryDir)
+}
+
+async function collectOwnedTombstone(
+  conn: SshConnection,
+  host: RemoteHostPlatform,
+  remoteHome: string,
+  entry: string,
+  tombstone: string,
+  entryDir: string
+): Promise<boolean> {
   // Why recheck under the rename: a deploy that read this entry as present can still be writing
   // its marker. Its reference now names a path that no longer exists, so restoring the tree is
   // the only outcome that leaves that relay with a working ripgrep.
-  const recheck = await scanReferences(conn, host, remoteHome)
+  const recheck = await scanReferences(conn, host, remoteHome).catch(async (err: unknown) => {
+    // A read-only scan cannot conflict with restoring this pass's renamed tree.
+    await restoreCacheEntry(conn, host, tombstone, entryDir).catch(() => {})
+    throw err
+  })
   if (!recheck.readable || recheck.referenced.has(entry)) {
-    await exec(conn, host, restoreEntryCommand(host, tombstone, entryDir)).catch(() => {})
+    await restoreCacheEntry(conn, host, tombstone, entryDir)
     return false
   }
   try {
     await exec(conn, host, removeRemoteTreeCommand(host, tombstone))
     return true
-  } catch {
+  } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
     // A later pass retries after verifying references again.
     return false
   }
 }
+
+async function restoreCacheEntry(
+  conn: SshConnection,
+  host: RemoteHostPlatform,
+  tombstone: string,
+  entryDir: string
+): Promise<void> {
+  await exec(conn, host, restoreRemoteTreeCommand(host, tombstone, entryDir)).catch((err) => {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
+  })
+}
diff --git a/src/main/ssh/ssh-relay-ripgrep-install.test.ts b/src/main/ssh/ssh-relay-ripgrep-install.test.ts
index dc41c281db2c..990e0ec0d54e 100644
--- a/src/main/ssh/ssh-relay-ripgrep-install.test.ts
+++ b/src/main/ssh/ssh-relay-ripgrep-install.test.ts
@@ -30,7 +30,7 @@ vi.mock('../ripgrep/bundled-ripgrep-path', () => ({
 }))
 
 import type { SshConnection } from './ssh-connection'
-import { getRemoteHostPlatform } from './ssh-remote-platform'
+import { getRemoteHostPlatform, joinRemotePath } from './ssh-remote-platform'
 import { decodeRemotePowerShellScript } from './ssh-remote-powershell'
 import { ensureRemoteBundledRipgrep, remoteRipgrepLayout } from './ssh-relay-ripgrep-install'
 
@@ -176,6 +176,85 @@ describe('ensureRemoteBundledRipgrep', () => {
     expect(execScripts()[1]).toMatch(/^rm -rf '\/home\/me\/\.orca-remote\/ripgrep\/\.upload-/)
   })
 
+  describe.each([
+    { platform: 'Linux', host: LINUX, home: '/home/me' },
+    { platform: 'Windows', host: WINDOWS, home: 'C:/Users/me user' }
+  ])('interrupted install on $platform', ({ host, home }) => {
+    it.each([
+      ['reference', 1, 0],
+      ['probe', 1, 0],
+      ['upload', 1, 1],
+      ['promotion', 2, 1],
+      ['cleanup', 2, 1]
+    ] as const)(
+      'preserves unconfirmed %s termination and starts no further operation',
+      async (phase, commands, uploads) => {
+        const error = Object.assign(new Error('Remote termination is unconfirmed'), {
+          sshChannelCloseConfirmed: false
+        })
+        if (phase === 'reference' || phase === 'probe') {
+          execCommandMock.mockRejectedValueOnce(error)
+        } else {
+          execCommandMock.mockResolvedValueOnce('ORCA-RG-STAGED\n')
+          if (phase === 'upload') {
+            uploadRelayDirectoryMock.mockRejectedValueOnce(error)
+          } else {
+            execCommandMock.mockRejectedValueOnce(error)
+            if (phase === 'cleanup') {
+              uploadRelayDirectoryMock.mockRejectedValueOnce(new Error('Upload failed'))
+            }
+          }
+        }
+
+        await expect(
+          ensureRemoteBundledRipgrep(connection(), host, home, {
+            relayDir:
+              phase === 'reference'
+                ? joinRemotePath(host, home, '.orca-remote', 'relay-1.2.3')
+                : undefined
+          })
+        ).rejects.toBe(error)
+
+        expect(execCommandMock).toHaveBeenCalledTimes(commands)
+        expect(uploadRelayDirectoryMock).toHaveBeenCalledTimes(uploads)
+      }
+    )
+
+    it.each(['upload', 'promotion'] as const)(
+      'removes the stage after confirmed %s termination and remains nonfatal',
+      async (phase) => {
+        const error = Object.assign(new Error('Remote operation stopped'), {
+          sshChannelCloseConfirmed: true
+        })
+        execCommandMock.mockResolvedValueOnce('ORCA-RG-STAGED\n')
+        if (phase === 'upload') {
+          uploadRelayDirectoryMock.mockRejectedValueOnce(error)
+        } else {
+          execCommandMock.mockRejectedValueOnce(error)
+        }
+        execCommandMock.mockResolvedValueOnce('')
+
+        await expect(ensureRemoteBundledRipgrep(connection(), host, home)).resolves.toBe('failed')
+
+        expect(execCommandMock).toHaveBeenCalledTimes(phase === 'upload' ? 2 : 3)
+        expect(execScripts().at(-1)).toContain(
+          host === WINDOWS ? 'Remove-Item -LiteralPath' : 'rm -rf'
+        )
+      }
+    )
+
+    it('keeps an ordinary stage cleanup failure nonfatal', async () => {
+      execCommandMock
+        .mockResolvedValueOnce('ORCA-RG-STAGED\n')
+        .mockRejectedValueOnce(new Error('Cleanup failed'))
+      uploadRelayDirectoryMock.mockRejectedValueOnce(new Error('Upload failed'))
+
+      await expect(ensureRemoteBundledRipgrep(connection(), host, home)).resolves.toBe('failed')
+
+      expect(execCommandMock).toHaveBeenCalledTimes(2)
+    })
+  })
+
   it('reports a failed size verification', async () => {
     execCommandMock
       .mockResolvedValueOnce('ORCA-RG-STAGED\n')
diff --git a/src/main/ssh/ssh-relay-ripgrep-install.ts b/src/main/ssh/ssh-relay-ripgrep-install.ts
index 02992ac811b1..333a21801bba 100644
--- a/src/main/ssh/ssh-relay-ripgrep-install.ts
+++ b/src/main/ssh/ssh-relay-ripgrep-install.ts
@@ -6,8 +6,8 @@
  *
  * Uploads land in a private `.upload-<token>` stage and are renamed into place only after a size
  * check, so an interrupted or concurrent deploy never leaves a truncated binary at the final path.
- * Every failure is reported, never thrown: the relay falls back to PATH `rg` and its git/readdir
- * chain, which is exactly what it did before this binary existed.
+ * Ordinary failures use the relay's PATH `rg` and git/readdir fallback; unconfirmed remote stops
+ * propagate so deployment cannot start more work while the previous operation may still run.
  */
 import { randomBytes } from 'node:crypto'
 import { statSync } from 'node:fs'
@@ -15,6 +15,7 @@ import { dirname } from 'node:path'
 import type { SshConnection } from './ssh-connection'
 import { RELAY_REMOTE_DIR } from './relay-protocol'
 import { execCommand } from './ssh-relay-deploy-helpers'
+import { isUnconfirmedSshCommandTermination } from './ssh-relay-exec-command'
 import { uploadRelayDirectory } from './ssh-relay-install-transfers'
 import {
   createRelayUploadStageNamespace,
@@ -52,7 +53,7 @@ export function remoteRipgrepRefFileName(entryName: string): string {
   return `${REMOTE_RIPGREP_REF_PREFIX}${entryName}`
 }
 
-/** Record which ripgrep build a relay directory runs against. Best-effort: never fails a deploy. */
+/** Record the relay's ripgrep build; only an unconfirmed remote stop rejects. */
 export async function recordRemoteRipgrepReference(
   conn: SshConnection,
   host: RemoteHostPlatform,
@@ -73,6 +74,9 @@ export async function recordRemoteRipgrepReference(
     )
     return true
   } catch (error) {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
     console.warn(
       '[ssh-relay] Could not record the ripgrep reference; skipping the bundled binary:',
       error instanceof Error ? error.message : String(error)
@@ -117,7 +121,7 @@ export function remoteRipgrepLayout(
   }
 }
 
-/** Make sure the host has Orca's ripgrep at `remoteRipgrepLayout().binaryPath`; never throws. */
+/** Ensure the host has Orca's ripgrep; only an unconfirmed remote stop rejects. */
 export async function ensureRemoteBundledRipgrep(
   conn: SshConnection,
   host: RemoteHostPlatform,
@@ -150,6 +154,9 @@ async function installOrReport(
     }
     return await installRemoteRipgrep(conn, host, layout, localBinary, options.signal)
   } catch (error) {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
     console.warn(
       '[ssh-relay] Bundled ripgrep install failed; the relay will use rg from PATH:',
       error instanceof Error ? error.message : String(error)
@@ -184,6 +191,7 @@ async function installRemoteRipgrep(
   }
 
   let promoted = false
+  let cleanupAllowed = true
   try {
     await uploadRelayDirectory(
       conn,
@@ -204,12 +212,19 @@ async function installRemoteRipgrep(
     }
     console.log(`[ssh-relay] Installed bundled ripgrep at ${layout.binaryPath} (${size} bytes)`)
     return 'installed'
+  } catch (error) {
+    cleanupAllowed = !isUnconfirmedSshCommandTermination(error)
+    throw error
   } finally {
-    if (!promoted) {
+    if (!promoted && cleanupAllowed) {
       // Why best-effort: the next deploy's probe also sweeps stale stages.
       await execCommand(conn, removeRemoteTreeCommand(host, stageDir), {
         wrapCommand: !isWindowsRemoteHost(host)
-      }).catch(() => {})
+      }).catch((error) => {
+        if (isUnconfirmedSshCommandTermination(error)) {
+          throw error
+        }
+      })
     }
   }
 }
diff --git a/src/main/ssh/ssh-relay-session-managed-hooks.test.ts b/src/main/ssh/ssh-relay-session-managed-hooks.test.ts
index 67351e081023..da10d8841a18 100644
--- a/src/main/ssh/ssh-relay-session-managed-hooks.test.ts
+++ b/src/main/ssh/ssh-relay-session-managed-hooks.test.ts
@@ -3,6 +3,8 @@ import {
   AGENT_HOOK_INSTALL_MANAGED_HOOKS_METHOD,
   AGENT_HOOK_INSTALL_PLUGINS_METHOD
 } from '../../shared/agent-hook-relay'
+import { getDefaultSettings } from '../../shared/constants'
+import type { Store } from '../persistence'
 import { SshRelaySession } from './ssh-relay-session'
 import type { SshConnection } from './ssh-connection'
 import { createMockDeps, mockDeploySuccess } from './ssh-relay-session-test-fixtures'
@@ -159,4 +161,45 @@ describe('SshRelaySession managed hooks', () => {
       })
     )
   })
+  it('refreshes OpenCode sources on settings changes and releases its subscription', async () => {
+    muxRequestMock.mockResolvedValue({ agents: [] })
+    const { mockStore, mockConn, mockPortForward, getMainWindow } = createMockDeps()
+    const settings = getDefaultSettings('/synthetic-home')
+    settings.disabledTuiAgents = ['opencode']
+    mockStore.getSettings = () => settings
+    let listener: Parameters<Store['onSettingsChanged']>[0] | undefined
+    const cleanup = vi.fn(() => {
+      listener = undefined
+    })
+    mockStore.onSettingsChanged = (callback) => {
+      listener = callback
+      return cleanup
+    }
+    const session = new SshRelaySession(
+      'target-settings',
+      getMainWindow,
+      mockStore,
+      mockPortForward
+    )
+    await session.establish(mockConn)
+    const lastSources = () =>
+      muxRequestMock.mock.calls.findLast(
+        ([method]) => method === AGENT_HOOK_INSTALL_PLUGINS_METHOD
+      )?.[1]
+    expect(lastSources()).toMatchObject({
+      opencodePluginSource: '',
+      opencode2PluginSource: expect.stringContaining('/hook/opencode2')
+    })
+    settings.disabledTuiAgents = ['opencode2']
+    listener?.({ disabledTuiAgents: settings.disabledTuiAgents }, settings)
+    expect(lastSources()).toMatchObject({
+      opencodePluginSource: expect.stringContaining('/hook/opencode'),
+      opencode2PluginSource: ''
+    })
+    settings.agentStatusHooksEnabled = false
+    listener?.({ agentStatusHooksEnabled: false }, settings)
+    expect(lastSources()).toMatchObject({ opencodePluginSource: '', opencode2PluginSource: '' })
+    session.dispose()
+    expect(cleanup).toHaveBeenCalledOnce()
+  })
 })
diff --git a/src/main/ssh/ssh-relay-session-reconnect-incarnation.test.ts b/src/main/ssh/ssh-relay-session-reconnect-incarnation.test.ts
index 3c405cd5dff9..ce223ae0b9c8 100644
--- a/src/main/ssh/ssh-relay-session-reconnect-incarnation.test.ts
+++ b/src/main/ssh/ssh-relay-session-reconnect-incarnation.test.ts
@@ -458,13 +458,21 @@ describe('SshRelaySession reconnect incarnation ordering', () => {
   })
 
   it.each([
-    { relay: 'current', incarnationId: 'inc-1', tombstonePartition: 'local' },
-    { relay: 'current', incarnationId: 'inc-1', tombstonePartition: 'host' },
-    { relay: 'legacy', incarnationId: undefined, tombstonePartition: 'local' },
-    { relay: 'legacy', incarnationId: undefined, tombstonePartition: 'host' }
+    { relay: 'current', incarnationId: 'inc-1', tombstonePartition: 'local', retiredBy: 'surface' },
+    { relay: 'current', incarnationId: 'inc-1', tombstonePartition: 'host', retiredBy: 'surface' },
+    {
+      relay: 'legacy',
+      incarnationId: undefined,
+      tombstonePartition: 'local',
+      retiredBy: 'surface'
+    },
+    { relay: 'legacy', incarnationId: undefined, tombstonePartition: 'host', retiredBy: 'surface' },
+    // A closed tab whose pane is in no tab: the close record is the backstop.
+    { relay: 'current', incarnationId: 'inc-1', tombstonePartition: 'local', retiredBy: 'close' },
+    { relay: 'current', incarnationId: 'inc-1', tombstonePartition: 'host', retiredBy: 'close' }
   ])(
-    'suppresses a $tombstonePartition-partition retired surface from a $relay relay',
-    async ({ incarnationId, tombstonePartition }) => {
+    'suppresses a $tombstonePartition-partition $retiredBy retirement from a $relay relay',
+    async ({ incarnationId, tombstonePartition, retiredBy }) => {
       const { mockConn, mockStore, mockPortForward, getMainWindow, mockWindow } = createMockDeps()
       const attachForReconnect = vi.fn().mockResolvedValue({
         ...(incarnationId ? { incarnationId } : {}),
@@ -514,10 +522,16 @@ describe('SshRelaySession reconnect incarnation ordering', () => {
           }
         }
       }
+      const closedTab: ReturnType<typeof getDefaultWorkspaceSession> = {
+        ...getDefaultWorkspaceSession(),
+        closedTerminalTabTombstonesByTabId: { [tabId]: { closedAt: Date.now(), worktreeId } }
+      }
       vi.mocked(mockStore.getWorkspaceSession).mockImplementation((hostId) =>
-        (hostId ? 'host' : 'local') === tombstonePartition
-          ? sessionWithTombstone
-          : getDefaultWorkspaceSession()
+        (hostId ? 'host' : 'local') !== tombstonePartition
+          ? getDefaultWorkspaceSession()
+          : retiredBy === 'close'
+            ? closedTab
+            : sessionWithTombstone
       )
       const runtime = { registerPty: vi.fn(), onPtySpawned: vi.fn() }
       const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
diff --git a/src/main/ssh/ssh-relay-session.ts b/src/main/ssh/ssh-relay-session.ts
index 28f40ce714f3..c87a1365584b 100644
--- a/src/main/ssh/ssh-relay-session.ts
+++ b/src/main/ssh/ssh-relay-session.ts
@@ -23,6 +23,7 @@ import { toAppSshPtyId, toRelaySshPtyId } from '../providers/ssh-pty-id'
 import { SshFilesystemProvider } from '../providers/ssh-filesystem-provider'
 import { isMethodNotFoundError } from './ssh-filesystem-stream-reader'
 import { SshGitProvider } from '../providers/ssh-git-provider'
+import { selectOpenCodePluginSources } from '../agent-hooks/opencode-plugin-settings'
 import { agentHookServer } from '../agent-hooks/server'
 import { isAgentStatusHooksEnabled } from '../agent-hooks/managed-agent-hook-controls'
 import {
@@ -118,6 +119,7 @@ import {
 } from '../../shared/ssh-ai-vault-relay'
 import { isTerminalLeafId, makePaneKey } from '../../shared/stable-pane-id'
 import { isValidTerminalTabId } from '../../shared/terminal-tab-id'
+import { hasClosedTerminalTabRecord } from '../../shared/closed-terminal-tab-tombstones'
 import {
   NATIVE_CHAT_CHANGED_METHOD,
   NATIVE_CHAT_RELAY_REQUEST_TIMEOUT_MS,
@@ -324,6 +326,7 @@ export class SshRelaySession {
   private muxDisposeCleanup: (() => void) | null = null
   // Why: hold the notification-handler disposer so teardownProviders can release it on reconnect/shutdown (symmetric with muxDisposeCleanup).
   private muxNotificationCleanup: (() => void) | null = null
+  private pluginSettingsCleanup: (() => void) | null = null
   // Why: onStateChange never fires when the relay channel closes but SSH stays up; this callback lets ssh.ts drive relay-level reconnect.
   private _onRelayLost: ((targetId: string) => void) | null = null
   // Why: a version mismatch or a blocked owner admission is terminal, so it needs a separate callback
@@ -1125,6 +1128,13 @@ export class SshRelaySession {
       return false
     }
 
+    this.pluginSettingsCleanup?.()
+    this.pluginSettingsCleanup =
+      this.store.onSettingsChanged?.((updates) => {
+        if ('disabledTuiAgents' in updates || 'agentStatusHooksEnabled' in updates) {
+          void this.installPluginsOnRelay(mux)
+        }
+      }) ?? null
     await this.installPluginsOnRelay(mux)
     if (shouldContinue && !shouldContinue()) {
       return false
@@ -1577,17 +1587,28 @@ export class SshRelaySession {
 
   // Why: ship plugin/extension source from Orca so agent-event changes don't force a relay redeploy — the relay is versioned independently. Best-effort: failure only costs agent status on this host.
   private async installPluginsOnRelay(mux: SshChannelMultiplexer): Promise<void> {
-    if (!isRemoteAgentHooksEnabled() || !this.areAgentStatusHooksEnabled()) {
+    if (!isRemoteAgentHooksEnabled()) {
       return
     }
     try {
-      await mux.request(AGENT_HOOK_INSTALL_PLUGINS_METHOD, {
-        opencodePluginSource: openCodeInternals.getOpenCodePluginSource(),
-        opencode2PluginSource: openCodeInternals.getOpenCode2PluginSource(),
-        piExtensionSource: getPiAgentStatusExtensionSource('pi'),
-        ompExtensionSource: getPiAgentStatusExtensionSource('omp'),
-        primeAgentExtensionSource: getPiAgentStatusExtensionSource('prime-agent')
-      })
+      const hooksEnabled = this.areAgentStatusHooksEnabled()
+      await mux.request(
+        AGENT_HOOK_INSTALL_PLUGINS_METHOD,
+        selectOpenCodePluginSources(
+          {
+            opencodePluginSource: openCodeInternals.getOpenCodePluginSource(),
+            opencode2PluginSource: openCodeInternals.getOpenCode2PluginSource(),
+            ...(hooksEnabled
+              ? {
+                  piExtensionSource: getPiAgentStatusExtensionSource('pi'),
+                  ompExtensionSource: getPiAgentStatusExtensionSource('omp'),
+                  primeAgentExtensionSource: getPiAgentStatusExtensionSource('prime-agent')
+                }
+              : {})
+          },
+          this.store.getSettings?.() ?? null
+        )
+      )
     } catch (err) {
       // Why: -32601 = older relay without the handler; CONNECTION_LOST/DISPOSED = routine mid-flight teardown — swallow both.
       const code = (err as { code?: unknown })?.code
@@ -1713,6 +1734,8 @@ export class SshRelaySession {
     this.openCodeRuntimePreparation?.controller.abort()
     this.openCodeRuntimePreparation = null
     this.releaseRelayLossWatcher()
+    this.pluginSettingsCleanup?.()
+    this.pluginSettingsCleanup = null
     this.muxNotificationCleanup?.()
     this.muxNotificationCleanup = null
     for (const cleanup of this.ptyRecoveryNotificationCleanups) {
@@ -2768,9 +2791,19 @@ export class SshRelaySession {
     if (hasLiveCurrentBinding) {
       return false
     }
-    return [lease.tabId, ...currentTabIds]
-      .filter((tabId) => isValidTerminalTabId(tabId))
-      .some(tombstoneMatches)
+    // Why only when no tab holds the leaf: a pane moved out of the tab before it closed lives on.
+    const leaseTabId = lease.tabId
+    const closedByRecord =
+      currentTabIds.length === 0 &&
+      candidates.some((candidate) =>
+        hasClosedTerminalTabRecord(candidate?.closedTerminalTabTombstonesByTabId, leaseTabId)
+      )
+    return (
+      closedByRecord ||
+      [lease.tabId, ...currentTabIds]
+        .filter((tabId) => isValidTerminalTabId(tabId))
+        .some(tombstoneMatches)
+    )
   }
 
   private async suppressRetiredReattachedPty(
diff --git a/src/main/ssh/ssh-relay-superseded-endpoints.test.ts b/src/main/ssh/ssh-relay-superseded-endpoints.test.ts
index dc091b677623..63d5ec29ca12 100644
--- a/src/main/ssh/ssh-relay-superseded-endpoints.test.ts
+++ b/src/main/ssh/ssh-relay-superseded-endpoints.test.ts
@@ -107,6 +107,60 @@ describe('classifySupersededRelay', () => {
 })
 
 describe('sweepSupersededRelayEndpoints', () => {
+  it.each(['listing', 'reap', 'removal'] as const)(
+    'stops after unconfirmed %s termination without examining another endpoint',
+    async (phase) => {
+      const secondSock = `${HOME}/.orca-remote/relay-0.1.0+cafebabe1234/${SOCK_NAME}`
+      const error = Object.assign(new Error('Remote termination is unconfirmed'), {
+        sshChannelCloseConfirmed: false
+      })
+      if (phase !== 'listing') {
+        execCommand
+          .mockResolvedValueOnce(`${OLD_SOCK}\n${secondSock}\n`)
+          .mockResolvedValueOnce(
+            probe(
+              phase === 'reap'
+                ? ['PRESENT=yes', 'LISTEN=accepted', 'HOLDERS_SOURCE=lsof', 'HOLDER=80583 yes 2 0']
+                : ['PRESENT=yes', 'LISTEN=refused', 'HOLDERS_SOURCE=lsof']
+            )
+          )
+      }
+      execCommand.mockRejectedValueOnce(error)
+
+      await expect(sweepSupersededRelayEndpoints(CONN, HOST, SWEEP)).rejects.toBe(error)
+
+      expect(issuedCommands()).toHaveLength(phase === 'listing' ? 1 : 3)
+    }
+  )
+
+  it.each(['reap', 'removal'] as const)(
+    'keeps an ordinary %s failure nonfatal and examines later endpoints',
+    async (phase) => {
+      const secondSock = `${HOME}/.orca-remote/relay-0.1.0+cafebabe1234/${SOCK_NAME}`
+      execCommand
+        .mockResolvedValueOnce(`${OLD_SOCK}\n${secondSock}\n`)
+        .mockResolvedValueOnce(
+          probe(
+            phase === 'reap'
+              ? ['PRESENT=yes', 'LISTEN=accepted', 'HOLDERS_SOURCE=lsof', 'HOLDER=80583 yes 2 0']
+              : ['PRESENT=yes', 'LISTEN=refused', 'HOLDERS_SOURCE=lsof']
+          )
+        )
+        .mockRejectedValueOnce(new Error('Operation failed'))
+        .mockResolvedValueOnce(
+          probe(['PRESENT=yes', 'LISTEN=unknown', 'HOLDERS_SOURCE=unavailable'])
+        )
+
+      const findings = await sweepSupersededRelayEndpoints(CONN, HOST, SWEEP)
+
+      expect(findings.map((finding) => finding.outcome)).toEqual([
+        phase === 'reap' ? 'reap-unconfirmed' : 'unverifiable',
+        'unverifiable'
+      ])
+      expect(issuedCommands()).toHaveLength(4)
+    }
+  )
+
   it('stops the sweep before cleanup when probe group termination is unconfirmed', async () => {
     execCommand
       .mockResolvedValueOnce(OLD_SOCK)
diff --git a/src/main/ssh/ssh-relay-superseded-endpoints.ts b/src/main/ssh/ssh-relay-superseded-endpoints.ts
index ade50943c320..c538988f11b4 100644
--- a/src/main/ssh/ssh-relay-superseded-endpoints.ts
+++ b/src/main/ssh/ssh-relay-superseded-endpoints.ts
@@ -21,6 +21,7 @@ import { shellEscape } from './ssh-connection-utils'
 import { RELAY_REMOTE_DIR } from './relay-protocol'
 import { SHORT_RELAY_SOCKET_DIR_PREFIX } from './relay-socket-path-limit'
 import { execCommand } from './ssh-relay-deploy-helpers'
+import { isUnconfirmedSshCommandTermination } from './ssh-relay-exec-command'
 import {
   describeRelayEndpointIncumbent,
   isReapableRelayHusk,
@@ -138,6 +139,9 @@ export async function sweepSupersededRelayEndpoints(
       signal: options.signal
     })
   } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
     // Same reason the Windows arm logs: an abandoned pass and an empty host are the same return
     // value, and only the log tells them apart.
     console.warn(
@@ -201,7 +205,10 @@ async function applySupersededRelayDecision(
         signal: options.signal
       })
       return 'stale-endpoint-removed'
-    } catch {
+    } catch (error) {
+      if (isUnconfirmedSshCommandTermination(error)) {
+        throw error
+      }
       return 'unverifiable'
     }
   }
diff --git a/src/main/ssh/ssh-relay-upload-stage-commands.test.ts b/src/main/ssh/ssh-relay-upload-stage-commands.test.ts
index a311dfcf908a..0b5d0a741493 100644
--- a/src/main/ssh/ssh-relay-upload-stage-commands.test.ts
+++ b/src/main/ssh/ssh-relay-upload-stage-commands.test.ts
@@ -74,24 +74,10 @@ function runCommand(host: RemoteHostPlatform, command: string, prefix = '') {
   return spawnSync('/bin/sh', ['-c', `${prefix}\n${command}`], { encoding: 'utf8' })
 }
 
-function createStage(
-  host: RemoteHostPlatform,
-  pool: string,
-  index: number,
-  stageOwner = owner,
-  stale = false,
-  state: 'slot' | 'claim' | 'delete' = 'slot'
-): string {
-  const reservedOwner = /^\.sftp-namespace-[0-9a-f]{32}$/u.test(stageOwner) ? stageOwner : owner
-  const reservation = runCommand(host, reserveRelayUploadStageCommand(host, pool, reservedOwner))
+function createStage(host: RemoteHostPlatform, pool: string, index: number): string {
+  const reservation = runCommand(host, reserveRelayUploadStageCommand(host, pool, owner))
   expect(reservation.status, reservation.stderr).toBe(0)
-  return populateReservedStage(
-    pool,
-    index,
-    stageOwner === reservedOwner ? undefined : stageOwner,
-    stale,
-    state
-  )
+  return populateReservedStage(pool, index)
 }
 
 function populateReservedStage(
@@ -119,7 +105,7 @@ function populateReservedStage(
   return stage
 }
 
-function createQuotaStages(host: RemoteHostPlatform, pool: string, count: number): void {
+function createStages(host: RemoteHostPlatform, pool: string, count: number): void {
   if (host.commandDialect !== 'powershell' || count < 2) {
     for (let index = 0; index < count; index += 1) {
       createStage(host, pool, index)
@@ -175,7 +161,7 @@ describe.each([
   (_label, host) => {
     it.each([0, 1, 7, 8, 9])('bounds reservation with %i occupied entries', (count) => {
       const pool = createPool()
-      createQuotaStages(host, pool, Math.min(count, RELAY_UPLOAD_STAGE_SLOT_COUNT))
+      createStages(host, pool, Math.min(count, RELAY_UPLOAD_STAGE_SLOT_COUNT))
       if (count > RELAY_UPLOAD_STAGE_SLOT_COUNT) {
         mkdirSync(join(pool, 'foreign-extra'))
       }
@@ -251,9 +237,9 @@ describe.each([
 
     it('reclaims one stale owned stage but preserves fresh and foreign stages', () => {
       const pool = createPool()
-      createStage(host, pool, 0, owner, false)
-      createStage(host, pool, 1, '.foreign-owner', true)
-      createStage(host, pool, 2, owner, true)
+      createStages(host, pool, 3)
+      populateReservedStage(pool, 1, '.foreign-owner', true)
+      populateReservedStage(pool, 2, undefined, true)
 
       const result = runCommand(host, recoverOneStaleRelayUploadStageCommand(host, pool, 60))
 
@@ -265,8 +251,9 @@ describe.each([
 
     it('drains fixed stale claim and delete states across repeated deployments', () => {
       const pool = createPool()
-      createStage(host, pool, 0, owner, true, 'claim')
-      createStage(host, pool, 1, owner, true, 'delete')
+      createStages(host, pool, 2)
+      populateReservedStage(pool, 0, undefined, true, 'claim')
+      populateReservedStage(pool, 1, undefined, true, 'delete')
 
       for (let attempt = 0; attempt < 2; attempt += 1) {
         const result = runCommand(host, recoverOneStaleRelayUploadStageCommand(host, pool, 60))
diff --git a/src/main/ssh/ssh-relay-versioned-install-termination.test.ts b/src/main/ssh/ssh-relay-versioned-install-termination.test.ts
new file mode 100644
index 000000000000..7c5501751332
--- /dev/null
+++ b/src/main/ssh/ssh-relay-versioned-install-termination.test.ts
@@ -0,0 +1,114 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('./ssh-relay-deploy-helpers', () => ({ execCommand: vi.fn() }))
+
+import type { SshConnection } from './ssh-connection'
+import { REMOTE_INSTALL_MODELS } from './remote-install-model'
+import { execCommand } from './ssh-relay-deploy-helpers'
+import {
+  abandonInstall,
+  finalizeInstall,
+  isRemoteInstallComplete
+} from './ssh-relay-versioned-install'
+import { getRemoteHostPlatform } from './ssh-remote-platform'
+
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The mocked execCommand never reads the connection.
+const conn = {} as SshConnection
+const mockExec = vi.mocked(execCommand)
+
+beforeEach(() => {
+  mockExec.mockReset()
+})
+
+describe.each([
+  { platform: 'linux-x64' as const, remoteDir: '/relay/version' },
+  { platform: 'win32-x64' as const, remoteDir: 'C:/relay/version' }
+])('install-complete probe termination on $platform', ({ platform, remoteDir }) => {
+  const host = getRemoteHostPlatform(platform)
+
+  it.each([abandonInstall, finalizeInstall])(
+    'preserves uncertainty from lock release by %s',
+    async (release) => {
+      const error = Object.assign(new Error('release still running'), {
+        sshChannelCloseConfirmed: false
+      })
+      mockExec.mockResolvedValue('')
+      if (release === finalizeInstall) {
+        mockExec.mockResolvedValueOnce('')
+      }
+      mockExec.mockRejectedValueOnce(error)
+      await expect(release(conn, remoteDir, host)).rejects.toBe(error)
+    }
+  )
+
+  it.each([abandonInstall, finalizeInstall])(
+    'keeps confirmed release failures nonfatal in %s',
+    async (release) => {
+      if (release === finalizeInstall) {
+        mockExec.mockResolvedValueOnce('')
+      }
+      mockExec.mockRejectedValueOnce(
+        Object.assign(new Error('release failed'), {
+          sshChannelCloseConfirmed: true
+        })
+      )
+      await expect(release(conn, remoteDir, host)).resolves.toBeUndefined()
+    }
+  )
+
+  describe.each(REMOTE_INSTALL_MODELS)('$id installs', (model) => {
+    it.each([
+      { aborted: false, rethrowSessionLimitErrors: false },
+      { aborted: false, rethrowSessionLimitErrors: true },
+      { aborted: true, rethrowSessionLimitErrors: false },
+      { aborted: true, rethrowSessionLimitErrors: true }
+    ])(
+      'preserves uncertainty with aborted=$aborted and strict=$rethrowSessionLimitErrors',
+      async ({ aborted, rethrowSessionLimitErrors }) => {
+        const controller = new AbortController()
+        const error = Object.assign(new Error('SSH teardown not confirmed'), {
+          sshChannelCloseConfirmed: false
+        })
+        mockExec.mockImplementationOnce(async () => {
+          if (aborted) {
+            controller.abort(new Error('deploy aborted'))
+          }
+          throw error
+        })
+
+        await expect(
+          isRemoteInstallComplete(conn, model, remoteDir, host, {
+            signal: controller.signal,
+            rethrowSessionLimitErrors
+          })
+        ).rejects.toBe(error)
+        expect(mockExec).toHaveBeenCalledTimes(1)
+      }
+    )
+
+    it('keeps a confirmed command failure as an incomplete install', async () => {
+      mockExec.mockRejectedValueOnce(
+        Object.assign(new Error('SSH command failed after closing'), {
+          sshChannelCloseConfirmed: true
+        })
+      )
+
+      await expect(isRemoteInstallComplete(conn, model, remoteDir, host)).resolves.toBe(false)
+    })
+
+    it('keeps caller cancellation after a confirmed command failure', async () => {
+      const controller = new AbortController()
+      const abortError = new Error('deploy aborted')
+      mockExec.mockImplementationOnce(async () => {
+        controller.abort(abortError)
+        throw Object.assign(new Error('SSH command failed after closing'), {
+          sshChannelCloseConfirmed: true
+        })
+      })
+
+      await expect(
+        isRemoteInstallComplete(conn, model, remoteDir, host, { signal: controller.signal })
+      ).rejects.toBe(abortError)
+    })
+  })
+})
diff --git a/src/main/ssh/ssh-relay-versioned-install.test.ts b/src/main/ssh/ssh-relay-versioned-install.test.ts
index 482b0e8b1133..1778ac1affc3 100644
--- a/src/main/ssh/ssh-relay-versioned-install.test.ts
+++ b/src/main/ssh/ssh-relay-versioned-install.test.ts
@@ -1,11 +1,13 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type * as DeployHelpers from './ssh-relay-deploy-helpers'
 
 vi.mock('fs', () => ({
   existsSync: vi.fn(),
   readFileSync: vi.fn()
 }))
 
-vi.mock('./ssh-relay-deploy-helpers', () => ({
+vi.mock('./ssh-relay-deploy-helpers', async (importOriginal) => ({
+  ...(await importOriginal<typeof DeployHelpers>()),
   execCommand: vi.fn()
 }))
 
@@ -909,7 +911,9 @@ describe('gcOldRelayVersions', () => {
       .mockResolvedValueOnce('OWNED')
       .mockRejectedValueOnce(unconfirmed)
 
-    await gcOldRelayVersions(conn, '/home/u', '/home/u/.orca-remote/relay-0.1.0+bbb')
+    await expect(
+      gcOldRelayVersions(conn, '/home/u', '/home/u/.orca-remote/relay-0.1.0+bbb')
+    ).rejects.toBe(unconfirmed)
 
     const releaseCommands = mockExec.mock.calls
       .map(([, command]) => command)
diff --git a/src/main/ssh/ssh-relay-versioned-install.ts b/src/main/ssh/ssh-relay-versioned-install.ts
index 5bd111bdec16..ee62c3402b28 100644
--- a/src/main/ssh/ssh-relay-versioned-install.ts
+++ b/src/main/ssh/ssh-relay-versioned-install.ts
@@ -8,6 +8,7 @@ import { join } from 'node:path'
 import { existsSync, readFileSync } from 'node:fs'
 import type { SshConnection } from './ssh-connection'
 import { execCommand } from './ssh-relay-deploy-helpers'
+import { isUnconfirmedSshCommandTermination } from './ssh-relay-exec-command'
 import { RELAY_INSTALL_LOCK_NAME } from './ssh-relay-install-lock'
 import { remoteInstallDirSegments } from './ssh-relay-install-namespace'
 import { RELAY_INSTALL_MODEL, type RemoteInstallModel } from './remote-install-model'
@@ -133,6 +134,9 @@ export async function isRemoteInstallComplete(
     )
     return probe.trim() === 'OK'
   } catch (err) {
+    if (isUnconfirmedSshCommandTermination(err)) {
+      throw err
+    }
     options?.signal?.throwIfAborted()
     if (options?.rethrowSessionLimitErrors && isSshSessionLimitError(err)) {
       throw err
@@ -160,7 +164,11 @@ export async function finalizeInstall(
   if (options?.releaseLock !== false) {
     await execHostCommand(conn, host, removeRemoteTreeCommand(host, lock), {
       signal: options?.signal
-    }).catch(() => {})
+    }).catch((error) => {
+      if (isUnconfirmedSshCommandTermination(error)) {
+        throw error
+      }
+    })
   }
   options?.signal?.throwIfAborted()
 }
@@ -175,13 +183,17 @@ export async function abandonInstall(
   host: RemoteHostPlatform = DEFAULT_REMOTE_HOST
 ): Promise<void> {
   const lock = joinRemotePath(host, remoteRelayDir, RELAY_INSTALL_LOCK_NAME)
-  await execHostCommand(conn, host, removeRemoteTreeCommand(host, lock)).catch(() => {})
+  await execHostCommand(conn, host, removeRemoteTreeCommand(host, lock)).catch((error) => {
+    if (isUnconfirmedSshCommandTermination(error)) {
+      throw error
+    }
+  })
 }
 
 /**
  * Garbage-collect old version directories: remove an idle, fully-installed,
- * unlocked sibling version dir (never the current one). Best-effort — errors
- * are swallowed so GC never blocks the user from connecting.
+ * unlocked sibling version dir (never the current one). Confirmed failures are
+ * best-effort; unconfirmed command termination stops later deployment commands.
  */
 // Why re-exported rather than moved outright: deploy and the relay tests import the whole
 // versioned-install surface from here, and the split exists for file size, not to redraw an API.
diff --git a/src/main/ssh/ssh-remote-cli-host-passthrough.test.ts b/src/main/ssh/ssh-remote-cli-host-passthrough.test.ts
index 53334e3cd125..811917cf7152 100644
--- a/src/main/ssh/ssh-remote-cli-host-passthrough.test.ts
+++ b/src/main/ssh/ssh-remote-cli-host-passthrough.test.ts
@@ -129,6 +129,28 @@ describe('buildHostCliEnv', () => {
     expect(env.ORCA_CLI_COMMAND).toBe('orca')
   })
 
+  it('never lets a remote command claim a local agent session', () => {
+    // The host's env carries a session id when Orca was launched inside a structured session; the
+    // remote shell's own is from another machine. Session identity is same-host only.
+    const env = buildHostCliEnv({
+      hostEnv: {
+        ORCA_AGENT_SESSION_ID: 'f7a1c0de-1111-4222-8333-444455556666',
+        ORCA_STRUCTURED_SESSION: '1'
+      },
+      remoteEnv: {
+        ORCA_TERMINAL_HANDLE: 'term_remote',
+        ORCA_AGENT_SESSION_ID: 'a0b1c2d3-0000-4000-8000-00000000abcd'
+      },
+      userDataPath: '/host/user-data',
+      remoteCwd: '/srv/repo'
+    })
+
+    expect(env.ORCA_AGENT_SESSION_ID).toBeUndefined()
+    expect(env.ORCA_STRUCTURED_SESSION).toBeUndefined()
+    // The remote command still speaks as its own terminal.
+    expect(env.ORCA_TERMINAL_HANDLE).toBe('term_remote')
+  })
+
   it('namespaces identical remote artifact paths by stable SSH target', () => {
     const artifactInput = {
       sourceKey: '/srv/repo/report.html',
diff --git a/src/main/ssh/ssh-remote-cli-host-passthrough.ts b/src/main/ssh/ssh-remote-cli-host-passthrough.ts
index d62a23d8e304..4490343504ff 100644
--- a/src/main/ssh/ssh-remote-cli-host-passthrough.ts
+++ b/src/main/ssh/ssh-remote-cli-host-passthrough.ts
@@ -13,6 +13,8 @@ import {
   ORCHESTRATION_COMPATIBILITY_HOST_INCARNATION_ENV,
   ORCHESTRATION_COMPATIBILITY_HOST_KIND_ENV
 } from '../../shared/orchestration-compatibility-evidence'
+import { ORCA_AGENT_SESSION_ID_ENV } from '../../shared/agent-session-caller-env'
+import { ORCA_STRUCTURED_SESSION_ENV } from '../../shared/structured-session-marker'
 import {
   REMOTE_ARTIFACT_INPUT_ENV,
   sshArtifactSourceKey,
@@ -131,6 +133,10 @@ export function buildHostCliEnv(args: {
   delete env[ORCHESTRATION_COMPATIBILITY_HOST_INCARNATION_ENV]
   delete env[ORCHESTRATION_COMPATIBILITY_ATTACHMENT_ENV]
   delete env[REMOTE_ARTIFACT_INPUT_ENV]
+  // Why: a remote command must never claim a local agent session. The host's env carries one only
+  // when Orca was launched inside a session, and identity by session id is same-host only.
+  delete env[ORCA_AGENT_SESSION_ID_ENV]
+  delete env[ORCA_STRUCTURED_SESSION_ENV]
   if (args.runtimeAuthority) {
     env[ORCHESTRATION_COMPATIBILITY_HOST_KIND_ENV] = 'ssh'
     env[ORCHESTRATION_COMPATIBILITY_HOST_ID_ENV] = args.runtimeAuthority.targetId
diff --git a/src/main/ssh/ssh-remote-commands.ts b/src/main/ssh/ssh-remote-commands.ts
index fc3e965193ed..f23a7c4c689e 100644
--- a/src/main/ssh/ssh-remote-commands.ts
+++ b/src/main/ssh/ssh-remote-commands.ts
@@ -72,6 +72,20 @@ export function moveRemoteTreeCommand(
   )
 }
 
+// A concurrent installer may already have recreated the original directory.
+export function restoreRemoteTreeCommand(
+  host: RemoteHostPlatform,
+  source: string,
+  destination: string
+): string {
+  if (isWindowsRemoteHost(host)) {
+    return powerShellCommand(
+      `if (-not (Test-Path -LiteralPath ${powerShellLiteral(destination)})) { Move-Item -LiteralPath ${powerShellLiteral(source)} -Destination ${powerShellLiteral(destination)} -ErrorAction Stop; 'MOVED' } else { 'BUSY' }`
+    )
+  }
+  return `if [ ! -e ${shellEscape(destination)} ] && [ ! -L ${shellEscape(destination)} ]; then mv ${shellEscape(source)} ${shellEscape(destination)} && echo MOVED; else echo BUSY; fi`
+}
+
 export function promoteRemoteTreeContentsCommand(
   host: RemoteHostPlatform,
   sourcePath: string,
diff --git a/src/main/ssh/ssh-system-fallback.test.ts b/src/main/ssh/ssh-system-fallback.test.ts
index b477ad682ef0..3212a44b6fb6 100644
--- a/src/main/ssh/ssh-system-fallback.test.ts
+++ b/src/main/ssh/ssh-system-fallback.test.ts
@@ -880,14 +880,6 @@ describe('spawnSystemSsh', () => {
     vi.stubEnv('PATH', '')
     expect(() => spawnSystemSsh(createTarget())).toThrow('No system ssh binary found')
   })
-
-  it('returns a process wrapper with kill and onExit', () => {
-    const result = spawnSystemSsh(createTarget())
-
-    expect(result.pid).toBe(12345)
-    expect(typeof result.kill).toBe('function')
-    expect(typeof result.onExit).toBe('function')
-  })
 })
 
 describe('system SSH operation aborts', () => {
diff --git a/src/main/startup/codex-launch-per-agent-hook-opt-out.test.ts b/src/main/startup/codex-launch-per-agent-hook-opt-out.test.ts
new file mode 100644
index 000000000000..9191fb1666b7
--- /dev/null
+++ b/src/main/startup/codex-launch-per-agent-hook-opt-out.test.ts
@@ -0,0 +1,189 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { GlobalSettings } from '../../shared/global-settings-types'
+import type { VerifiedCodexResumeSource } from '../codex/codex-session-resume-preparation'
+
+/**
+ * Turning Codex off in the per-agent hook settings removes Orca's Codex hook
+ * entry. Launch prep and session resume must read that same opt-out, or the
+ * next Codex launch writes the entry straight back.
+ */
+const SYSTEM_HOME = '/home/user/.codex'
+const ACCOUNT_HOME = '/accounts/one/.codex'
+
+const mocks = vi.hoisted(() => {
+  const settings: Partial<GlobalSettings> = {}
+  return {
+    settings,
+    prepareForCodexLaunchAsync: vi.fn(async (): Promise<string | null> => null),
+    isHostSystemDefaultRealHomeSelected: vi.fn(() => false),
+    prepareRuntimeHomeForLaunch: vi.fn(async () => ({ state: 'ok' as const })),
+    installForLaunchPrep: vi.fn(async () => {}),
+    refreshRuntimeUserHooksForLaunchPrep: vi.fn(async () => {}),
+    ensureRealHomeCodexHookState: vi.fn(async () => 'installed' as const),
+    prepareCodexSessionResume: vi.fn()
+  }
+})
+
+vi.mock('electron', () => ({ app: { getPath: vi.fn(() => '/tmp/orca-user-data') } }))
+vi.mock('../agent-trust-presets', () => ({ markCodexProjectTrusted: vi.fn(async () => {}) }))
+vi.mock('../codex/hook-service', () => ({
+  codexHookService: {
+    prepareRuntimeHomeForLaunch: mocks.prepareRuntimeHomeForLaunch,
+    installForLaunchPrep: mocks.installForLaunchPrep,
+    refreshRuntimeUserHooksForLaunchPrep: mocks.refreshRuntimeUserHooksForLaunchPrep
+  }
+}))
+vi.mock('../codex/codex-real-home-hook-install', () => ({
+  ensureRealHomeCodexHookState: mocks.ensureRealHomeCodexHookState
+}))
+// Why: the real predicate, without loading every agent's hook service.
+vi.mock(
+  '../agent-hooks/managed-agent-hook-controls',
+  async () => await import('../../shared/agent-status-hooks-setting')
+)
+vi.mock('../wsl', () => ({ getDefaultWslDistro: () => 'Ubuntu' }))
+vi.mock('../codex/codex-home-paths', () => ({
+  getSystemCodexHomePath: () => SYSTEM_HOME,
+  getOrcaManagedCodexHomePath: () => '/managed/.codex'
+}))
+vi.mock('../codex/codex-session-resume-preparation', () => ({
+  prepareCodexSessionResume: mocks.prepareCodexSessionResume
+}))
+vi.mock('../codex/codex-legacy-session-resume', () => ({
+  prepareLegacySharedCodexSessionResume: vi.fn(async () => ({ useRealCodexHome: false }))
+}))
+vi.mock('./main-process-state', () => ({
+  mainProcessState: {
+    codexRuntimeHome: {
+      prepareForCodexLaunchAsync: mocks.prepareForCodexLaunchAsync,
+      isHostSystemDefaultRealHomeSelected: mocks.isHostSystemDefaultRealHomeSelected,
+      isHostSystemDefaultRealHome: () => false,
+      getHostCodexHomePathsForSessionDiscovery: () => [],
+      resolveSelectedHostAccountCodexHomePathForResume: () => null
+    },
+    store: { getSettings: () => mocks.settings }
+  }
+}))
+
+import { prepareCodexRuntimeHomeForLaunch } from './codex-launch-preparation'
+import { prepareCodexSessionResumeForLaunch } from './codex-session-resume-launch'
+
+const HOOK_SETTINGS: readonly {
+  name: string
+  settings: Partial<GlobalSettings>
+  codexHooksOn: boolean
+}[] = [
+  {
+    name: 'Codex turned off per agent',
+    settings: { agentStatusHooksEnabled: true, disabledTuiAgents: ['codex'] },
+    codexHooksOn: false
+  },
+  {
+    name: 'every agent on',
+    settings: { agentStatusHooksEnabled: true, disabledTuiAgents: [] },
+    codexHooksOn: true
+  },
+  {
+    name: 'another agent turned off',
+    settings: { agentStatusHooksEnabled: true, disabledTuiAgents: ['claude'] },
+    codexHooksOn: true
+  },
+  {
+    name: 'the global switch off',
+    settings: { agentStatusHooksEnabled: false, disabledTuiAgents: [] },
+    codexHooksOn: false
+  }
+]
+
+function resumeFrom(homePath: string): Promise<unknown> {
+  mocks.prepareCodexSessionResume.mockImplementation(
+    async (args: {
+      resolveVerifiedResumeHome: (source: VerifiedCodexResumeSource) => Promise<string>
+    }) => {
+      const codexHomePath = await args.resolveVerifiedResumeHome({
+        homePath,
+        transcriptPath: `${homePath}/sessions/abc.jsonl`
+      })
+      return { outcome: 'resume' as const, codexHomePath, sessionId: 'abc' }
+    }
+  )
+  return prepareCodexSessionResumeForLaunch({
+    providerSession: { key: 'session_id', id: 'abc' },
+    target: { runtime: 'host' }
+  })
+}
+
+describe('Codex launch prep honours the per-agent hook opt-out', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mocks.isHostSystemDefaultRealHomeSelected.mockReturnValue(false)
+    mocks.prepareForCodexLaunchAsync.mockResolvedValue(null)
+  })
+
+  it.each(HOOK_SETTINGS)(
+    'real ~/.codex launch with $name: hooks on = $codexHooksOn',
+    async ({ settings, codexHooksOn }) => {
+      mocks.settings = settings
+      mocks.isHostSystemDefaultRealHomeSelected.mockReturnValue(true)
+
+      await expect(prepareCodexRuntimeHomeForLaunch()).resolves.toBeNull()
+
+      expect(mocks.ensureRealHomeCodexHookState).toHaveBeenCalledTimes(1)
+      expect(mocks.ensureRealHomeCodexHookState).toHaveBeenCalledWith(
+        expect.objectContaining({ hooksEnabled: codexHooksOn })
+      )
+      expect(mocks.prepareRuntimeHomeForLaunch).not.toHaveBeenCalled()
+    }
+  )
+
+  it.each(HOOK_SETTINGS)(
+    'managed account home launch with $name: hooks on = $codexHooksOn',
+    async ({ settings, codexHooksOn }) => {
+      mocks.settings = settings
+      mocks.prepareForCodexLaunchAsync.mockResolvedValue(ACCOUNT_HOME)
+
+      await expect(prepareCodexRuntimeHomeForLaunch()).resolves.toBe(ACCOUNT_HOME)
+
+      expect(mocks.ensureRealHomeCodexHookState).not.toHaveBeenCalled()
+      expect(mocks.prepareRuntimeHomeForLaunch).toHaveBeenCalledWith(
+        ACCOUNT_HOME,
+        undefined,
+        codexHooksOn
+      )
+    }
+  )
+
+  it.each(HOOK_SETTINGS)(
+    'resume into the real ~/.codex with $name: hooks on = $codexHooksOn',
+    async ({ settings, codexHooksOn }) => {
+      mocks.settings = settings
+
+      await resumeFrom(SYSTEM_HOME)
+
+      expect(mocks.ensureRealHomeCodexHookState).toHaveBeenCalledTimes(1)
+      expect(mocks.ensureRealHomeCodexHookState).toHaveBeenCalledWith(
+        expect.objectContaining({ hooksEnabled: codexHooksOn })
+      )
+      expect(mocks.installForLaunchPrep).not.toHaveBeenCalled()
+      expect(mocks.refreshRuntimeUserHooksForLaunchPrep).not.toHaveBeenCalled()
+    }
+  )
+
+  it.each(HOOK_SETTINGS)(
+    'resume into a managed account home with $name: hooks on = $codexHooksOn',
+    async ({ settings, codexHooksOn }) => {
+      mocks.settings = settings
+
+      await resumeFrom(ACCOUNT_HOME)
+
+      expect(mocks.ensureRealHomeCodexHookState).not.toHaveBeenCalled()
+      if (codexHooksOn) {
+        expect(mocks.installForLaunchPrep).toHaveBeenCalledWith(ACCOUNT_HOME)
+        expect(mocks.refreshRuntimeUserHooksForLaunchPrep).not.toHaveBeenCalled()
+      } else {
+        expect(mocks.installForLaunchPrep).not.toHaveBeenCalled()
+        expect(mocks.refreshRuntimeUserHooksForLaunchPrep).toHaveBeenCalledWith(ACCOUNT_HOME)
+      }
+    }
+  )
+})
diff --git a/src/main/startup/codex-launch-preparation.ts b/src/main/startup/codex-launch-preparation.ts
index 3b94c00b11d7..e01ce2c287ad 100644
--- a/src/main/startup/codex-launch-preparation.ts
+++ b/src/main/startup/codex-launch-preparation.ts
@@ -2,9 +2,10 @@ import { app } from 'electron'
 import type { CodexHomeLaunchContext } from '../ipc/pty'
 import type { CodexAccountSelectionTarget } from '../codex-accounts/runtime-selection'
 import { markCodexProjectTrusted } from '../agent-trust-presets'
+import { awaitAgentTrustWriteWithinDeadline } from '../agent-trust-write-deadline'
 import { codexHookService } from '../codex/hook-service'
 import { getDefaultWslDistro } from '../wsl'
-import { isAgentStatusHooksEnabled } from '../agent-hooks/managed-agent-hook-controls'
+import { isAgentStatusHooksEnabledForAgent } from '../agent-hooks/managed-agent-hook-controls'
 import { ensureRealHomeCodexHookState } from '../codex/codex-real-home-hook-install'
 import { mainProcessState as state } from './main-process-state'
 
@@ -23,8 +24,14 @@ export async function prepareCodexRuntimeHomeForLaunch(
     launchContext.workspacePath
   ) {
     try {
-      // Why: renderer quick-launch cannot await trust IPC before its PTY mounts; launch prep runs before every recognized Codex spawn.
-      await markCodexProjectTrusted(launchContext.workspacePath)
+      // Why: renderer quick-launch cannot await trust IPC before its PTY mounts; launch prep runs before every recognized Codex spawn. Bounded so a wedged config lane cannot hang the spawn that waits on this prep.
+      await awaitAgentTrustWriteWithinDeadline(
+        markCodexProjectTrusted(launchContext.workspacePath),
+        {
+          preset: 'codex',
+          workspacePath: launchContext.workspacePath
+        }
+      )
     } catch (error) {
       console.warn('[codex-project-trust] failed to pre-mark launch workspace:', error)
     }
@@ -38,7 +45,7 @@ export async function prepareCodexRuntimeHomeForLaunch(
     // the pane spawns. An incapable grant flips the lane gate so the launch
     // below falls back to the managed home instead of a status-blind pane.
     await ensureRealHomeCodexHookState({
-      hooksEnabled: isAgentStatusHooksEnabled(state.store?.getSettings()),
+      hooksEnabled: isAgentStatusHooksEnabledForAgent(state.store?.getSettings(), 'codex'),
       userDataPath: app.getPath('userData')
     })
     return true
@@ -70,7 +77,7 @@ export async function prepareCodexRuntimeHomeForLaunch(
     target?.runtime === 'wsl'
       ? { runtime: 'wsl' as const, wslDistro: target.wslDistro?.trim() || getDefaultWslDistro() }
       : target
-  const hooksEnabled = isAgentStatusHooksEnabled(state.store?.getSettings())
+  const hooksEnabled = isAgentStatusHooksEnabledForAgent(state.store?.getSettings(), 'codex')
   try {
     // Why: honor the persisted off switch so post-startup launches can't reinstall removed hooks.
     const status = await codexHookService.prepareRuntimeHomeForLaunch(
diff --git a/src/main/startup/codex-launch-trust-write-deadline.test.ts b/src/main/startup/codex-launch-trust-write-deadline.test.ts
new file mode 100644
index 000000000000..c445c9157471
--- /dev/null
+++ b/src/main/startup/codex-launch-trust-write-deadline.test.ts
@@ -0,0 +1,207 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { VerifiedCodexResumeSource } from '../codex/codex-session-resume-preparation'
+
+/**
+ * Why this file exists: both Codex launch-prep entry points await the trust
+ * write, and the PTY spawn awaits them, so an unbounded write turns a stuck
+ * per-`config.toml` lane into a launch that never starts. These cases pin the
+ * bound and the fail-closed consequence: giving up writes nothing, so the
+ * workspace stays untrusted and Codex raises its own trust menu.
+ */
+const mocks = vi.hoisted(() => ({
+  markCodexProjectTrusted: vi.fn(),
+  prepareForCodexLaunchAsync: vi.fn(),
+  isHostSystemDefaultRealHomeSelected: vi.fn(() => false),
+  isHostSystemDefaultRealHome: vi.fn(() => false),
+  getHostCodexHomePathsForSessionDiscovery: vi.fn((): string[] => []),
+  resolveSelectedHostAccountCodexHomePathForResume: vi.fn(() => null),
+  prepareRuntimeHomeForLaunch: vi.fn(async () => ({ state: 'ok' as const })),
+  installForLaunchPrep: vi.fn(async () => {}),
+  refreshRuntimeUserHooksForLaunchPrep: vi.fn(async () => {}),
+  ensureRealHomeCodexHookState: vi.fn(async () => {}),
+  prepareCodexSessionResume: vi.fn(),
+  prepareLegacySharedCodexSessionResume: vi.fn(async () => ({ useRealCodexHome: false }))
+}))
+
+vi.mock('electron', () => ({ app: { getPath: vi.fn(() => '/tmp/orca-user-data') } }))
+vi.mock('../agent-trust-presets', () => ({
+  markCodexProjectTrusted: mocks.markCodexProjectTrusted
+}))
+vi.mock('../codex/hook-service', () => ({
+  codexHookService: {
+    prepareRuntimeHomeForLaunch: mocks.prepareRuntimeHomeForLaunch,
+    installForLaunchPrep: mocks.installForLaunchPrep,
+    refreshRuntimeUserHooksForLaunchPrep: mocks.refreshRuntimeUserHooksForLaunchPrep
+  }
+}))
+vi.mock('../codex/codex-real-home-hook-install', () => ({
+  ensureRealHomeCodexHookState: mocks.ensureRealHomeCodexHookState
+}))
+vi.mock('../agent-hooks/managed-agent-hook-controls', () => ({
+  isAgentStatusHooksEnabledForAgent: () => false
+}))
+vi.mock('../wsl', () => ({ getDefaultWslDistro: () => 'Ubuntu' }))
+vi.mock('../codex/codex-home-paths', () => ({
+  getSystemCodexHomePath: () => '/home/user/.codex',
+  getOrcaManagedCodexHomePath: () => '/managed/.codex'
+}))
+vi.mock('../codex/codex-session-resume-preparation', () => ({
+  prepareCodexSessionResume: mocks.prepareCodexSessionResume
+}))
+vi.mock('../codex/codex-legacy-session-resume', () => ({
+  prepareLegacySharedCodexSessionResume: mocks.prepareLegacySharedCodexSessionResume
+}))
+vi.mock('./main-process-state', () => ({
+  mainProcessState: {
+    codexRuntimeHome: {
+      prepareForCodexLaunchAsync: mocks.prepareForCodexLaunchAsync,
+      isHostSystemDefaultRealHomeSelected: mocks.isHostSystemDefaultRealHomeSelected,
+      isHostSystemDefaultRealHome: mocks.isHostSystemDefaultRealHome,
+      getHostCodexHomePathsForSessionDiscovery: mocks.getHostCodexHomePathsForSessionDiscovery,
+      resolveSelectedHostAccountCodexHomePathForResume:
+        mocks.resolveSelectedHostAccountCodexHomePathForResume
+    },
+    store: { getSettings: () => ({}) }
+  }
+}))
+
+import { AGENT_TRUST_WRITE_DEADLINE_MS } from '../agent-trust-write-deadline'
+import { prepareCodexRuntimeHomeForLaunch } from './codex-launch-preparation'
+import { prepareCodexSessionResumeForLaunch } from './codex-session-resume-launch'
+
+const WORKSPACE = '/workspace/app'
+const RESUME_HOME = '/accounts/one/.codex'
+
+function neverSettlingWrite(): { promise: Promise<void>; release: () => void } {
+  let release!: () => void
+  const promise = new Promise<void>((resolve) => {
+    release = resolve
+  })
+  return { promise, release }
+}
+
+describe('Codex launch-prep trust writes', () => {
+  let warn: ReturnType<typeof vi.spyOn>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mocks.isHostSystemDefaultRealHomeSelected.mockReturnValue(false)
+    mocks.getHostCodexHomePathsForSessionDiscovery.mockReturnValue([])
+    mocks.resolveSelectedHostAccountCodexHomePathForResume.mockReturnValue(null)
+    mocks.prepareForCodexLaunchAsync.mockResolvedValue(RESUME_HOME)
+    mocks.prepareRuntimeHomeForLaunch.mockResolvedValue({ state: 'ok' as const })
+    mocks.prepareLegacySharedCodexSessionResume.mockResolvedValue({ useRealCodexHome: false })
+    mocks.prepareCodexSessionResume.mockImplementation(
+      async (args: {
+        resolveVerifiedResumeHome: (source: VerifiedCodexResumeSource) => Promise<string>
+      }) => {
+        const codexHomePath = await args.resolveVerifiedResumeHome({
+          homePath: RESUME_HOME,
+          transcriptPath: `${RESUME_HOME}/sessions/abc.jsonl`
+        })
+        return { outcome: 'resume' as const, codexHomePath, sessionId: 'abc' }
+      }
+    )
+    warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+  })
+
+  afterEach(() => {
+    warn.mockRestore()
+    vi.useRealTimers()
+  })
+
+  it('bounds a never-settling write in quick-launch prep and still returns the launch home', async () => {
+    vi.useFakeTimers()
+    const write = neverSettlingWrite()
+    mocks.markCodexProjectTrusted.mockReturnValue(write.promise)
+    let settled = false
+    const prep = prepareCodexRuntimeHomeForLaunch(
+      undefined,
+      {},
+      {
+        launchAgent: 'codex',
+        workspacePath: WORKSPACE
+      }
+    ).then((home) => {
+      settled = true
+      return home
+    })
+
+    await vi.advanceTimersByTimeAsync(AGENT_TRUST_WRITE_DEADLINE_MS - 1)
+    expect(settled).toBe(false)
+    await vi.advanceTimersByTimeAsync(2)
+    await expect(prep).resolves.toBe(RESUME_HOME)
+    expect(settled).toBe(true)
+    expect(String(warn.mock.calls[0]?.[0])).toContain('did not settle')
+    expect(vi.getTimerCount()).toBe(0)
+    // Fails closed: one abandoned write, no retry and no second trust path, so
+    // nothing in this prep can report the workspace as trusted.
+    expect(mocks.markCodexProjectTrusted).toHaveBeenCalledTimes(1)
+    expect(mocks.markCodexProjectTrusted).toHaveBeenCalledWith(WORKSPACE)
+    write.release()
+  })
+
+  it('keeps the quick-launch trust write ahead of the home the spawn waits on', async () => {
+    mocks.markCodexProjectTrusted.mockResolvedValue(undefined)
+    await prepareCodexRuntimeHomeForLaunch(
+      undefined,
+      {},
+      {
+        launchAgent: 'codex',
+        workspacePath: WORKSPACE
+      }
+    )
+    expect(mocks.markCodexProjectTrusted.mock.invocationCallOrder[0]).toBeLessThan(
+      mocks.prepareForCodexLaunchAsync.mock.invocationCallOrder[0] ?? Infinity
+    )
+  })
+
+  it('bounds a never-settling write in resume prep and still resolves the resume home', async () => {
+    vi.useFakeTimers()
+    const write = neverSettlingWrite()
+    mocks.markCodexProjectTrusted.mockReturnValue(write.promise)
+    let settled = false
+    const prep = prepareCodexSessionResumeForLaunch({
+      providerSession: { key: 'session_id', id: 'abc' },
+      target: { runtime: 'host' },
+      workspacePath: WORKSPACE
+    }).then((preparation) => {
+      settled = true
+      return preparation
+    })
+
+    await vi.advanceTimersByTimeAsync(AGENT_TRUST_WRITE_DEADLINE_MS - 1)
+    expect(settled).toBe(false)
+    await vi.advanceTimersByTimeAsync(2)
+    const preparation = await prep
+    expect(preparation?.outcome).toBe('resume')
+    expect(String(warn.mock.calls[0]?.[0])).toContain('did not settle')
+    expect(vi.getTimerCount()).toBe(0)
+    expect(mocks.markCodexProjectTrusted).toHaveBeenCalledTimes(1)
+    expect(mocks.markCodexProjectTrusted).toHaveBeenCalledWith(WORKSPACE)
+    write.release()
+  })
+
+  it('keeps the resume trust write ahead of the hook repair that precedes the spawn', async () => {
+    mocks.markCodexProjectTrusted.mockResolvedValue(undefined)
+    await prepareCodexSessionResumeForLaunch({
+      providerSession: { key: 'session_id', id: 'abc' },
+      target: { runtime: 'host' },
+      workspacePath: WORKSPACE
+    })
+    expect(mocks.markCodexProjectTrusted.mock.invocationCallOrder[0]).toBeLessThan(
+      mocks.refreshRuntimeUserHooksForLaunchPrep.mock.invocationCallOrder[0] ?? Infinity
+    )
+  })
+
+  it('contains a rejected resume trust write without trusting the workspace elsewhere', async () => {
+    mocks.markCodexProjectTrusted.mockRejectedValue(new Error('mock EACCES'))
+    const preparation = await prepareCodexSessionResumeForLaunch({
+      providerSession: { key: 'session_id', id: 'abc' },
+      target: { runtime: 'host' },
+      workspacePath: WORKSPACE
+    })
+    expect(preparation?.outcome).toBe('resume')
+    expect(mocks.markCodexProjectTrusted).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/main/startup/codex-session-resume-daemon-guard.test.ts b/src/main/startup/codex-session-resume-daemon-guard.test.ts
new file mode 100644
index 000000000000..1369215fc1f5
--- /dev/null
+++ b/src/main/startup/codex-session-resume-daemon-guard.test.ts
@@ -0,0 +1,145 @@
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { VerifiedCodexResumeSource } from '../codex/codex-session-resume-preparation'
+import {
+  CODEX_DAEMON_OVERRIDE_MARKER,
+  codexDaemonSocketPathExceedsLimit
+} from '../codex/codex-daemon-socket-path-guard'
+
+const mocks = vi.hoisted(() => ({
+  hooksEnabled: false,
+  systemHomePath: '',
+  sharedHomePath: '',
+  installForLaunchPrep: vi.fn(),
+  refreshRuntimeUserHooksForLaunchPrep: vi.fn(),
+  ensureRealHomeCodexHookState: vi.fn(async () => {}),
+  prepareCodexSessionResume: vi.fn(),
+  prepareLegacySharedCodexSessionResume: vi.fn()
+}))
+
+vi.mock('electron', () => ({ app: { getPath: vi.fn(() => '/tmp/orca-user-data') } }))
+vi.mock('../agent-trust-presets', () => ({ markCodexProjectTrusted: async () => {} }))
+vi.mock('../codex/hook-service', () => ({
+  codexHookService: {
+    installForLaunchPrep: mocks.installForLaunchPrep,
+    refreshRuntimeUserHooksForLaunchPrep: mocks.refreshRuntimeUserHooksForLaunchPrep
+  }
+}))
+vi.mock('../codex/codex-real-home-hook-install', () => ({
+  ensureRealHomeCodexHookState: mocks.ensureRealHomeCodexHookState
+}))
+vi.mock('../agent-hooks/managed-agent-hook-controls', () => ({
+  isAgentStatusHooksEnabledForAgent: () => mocks.hooksEnabled
+}))
+vi.mock('../codex/codex-home-paths', async (importOriginal) => ({
+  ...(await importOriginal<object>()),
+  getSystemCodexHomePath: () => mocks.systemHomePath,
+  getOrcaManagedCodexHomePath: () => mocks.sharedHomePath
+}))
+vi.mock('../codex/codex-session-resume-preparation', () => ({
+  prepareCodexSessionResume: mocks.prepareCodexSessionResume
+}))
+vi.mock('../codex/codex-legacy-session-resume', () => ({
+  prepareLegacySharedCodexSessionResume: mocks.prepareLegacySharedCodexSessionResume
+}))
+vi.mock('./main-process-state', () => ({
+  mainProcessState: {
+    codexRuntimeHome: {
+      isHostSystemDefaultRealHome: () => false,
+      getHostCodexHomePathsForSessionDiscovery: () => [],
+      resolveSelectedHostAccountCodexHomePathForResume: () => null
+    },
+    store: { getSettings: () => ({}) }
+  }
+}))
+
+import { prepareCodexSessionResumeForLaunch } from './codex-session-resume-launch'
+
+// Why: long enough that the daemon socket overflows sun_path on every host OS.
+const LONG_SEGMENT = 'a'.repeat(60)
+
+describe('Codex session resume daemon socket guard', () => {
+  let root: string
+  let accountHome: string
+  let warn: ReturnType<typeof vi.spyOn>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    root = mkdtempSync(join(tmpdir(), 'orca-resume-guard-'))
+    accountHome = join(root, 'codex-accounts', LONG_SEGMENT, 'home')
+    mocks.systemHomePath = join(root, 'system', LONG_SEGMENT, '.codex')
+    mocks.sharedHomePath = join(root, 'codex-runtime-home', 'home')
+    for (const home of [accountHome, mocks.systemHomePath, mocks.sharedHomePath]) {
+      mkdirSync(home, { recursive: true })
+    }
+    mocks.hooksEnabled = false
+    mocks.prepareLegacySharedCodexSessionResume.mockResolvedValue({ useRealCodexHome: false })
+    mocks.prepareCodexSessionResume.mockImplementation(
+      async (args: {
+        resolveVerifiedResumeHome: (source: VerifiedCodexResumeSource) => Promise<string>
+      }) => ({
+        outcome: 'resume' as const,
+        codexHomePath: await args.resolveVerifiedResumeHome({
+          homePath: accountHome,
+          transcriptPath: join(accountHome, 'sessions', 'abc.jsonl')
+        })
+      })
+    )
+    warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+  })
+
+  afterEach(() => {
+    warn.mockRestore()
+    rmSync(root, { recursive: true, force: true })
+  })
+
+  function resume(): ReturnType<typeof prepareCodexSessionResumeForLaunch> {
+    return prepareCodexSessionResumeForLaunch({
+      providerSession: { key: 'session_id', id: 'abc' },
+      target: { runtime: 'host' },
+      workspacePath: join(root, 'workspace')
+    })
+  }
+
+  it('guards the resumed account home when hook repair fails before mirroring config', async () => {
+    expect(codexDaemonSocketPathExceedsLimit(accountHome)).toBe(true)
+    writeFileSync(join(accountHome, 'config.toml'), 'model = "gpt-5"\n', 'utf-8')
+    mocks.hooksEnabled = true
+    mocks.installForLaunchPrep.mockRejectedValue(new Error('Could not parse Codex hooks.json'))
+
+    const preparation = await resume()
+
+    expect(preparation).toMatchObject({ outcome: 'resume', codexHomePath: accountHome })
+    const config = readFileSync(join(accountHome, 'config.toml'), 'utf-8')
+    expect(config).toContain('model = "gpt-5"')
+    expect(config).toContain(`daemon_auto_start = false ${CODEX_DAEMON_OVERRIDE_MARKER}`)
+  })
+
+  it('guards the resumed account home when hooks are off and the refresh returns early', async () => {
+    mocks.refreshRuntimeUserHooksForLaunchPrep.mockResolvedValue({
+      agent: 'codex',
+      state: 'error',
+      detail: 'Could not read system Codex hooks.json'
+    })
+
+    await resume()
+
+    expect(mocks.refreshRuntimeUserHooksForLaunchPrep).toHaveBeenCalledWith(accountHome)
+    expect(readFileSync(join(accountHome, 'config.toml'), 'utf-8')).toContain(
+      `daemon_auto_start = false ${CODEX_DAEMON_OVERRIDE_MARKER}`
+    )
+  })
+
+  it('never writes the guard into the real Codex home a migrated resume runs in', async () => {
+    expect(codexDaemonSocketPathExceedsLimit(mocks.systemHomePath)).toBe(true)
+    mocks.prepareLegacySharedCodexSessionResume.mockResolvedValue({ useRealCodexHome: true })
+
+    const preparation = await resume()
+
+    expect(preparation).toMatchObject({ codexHomePath: mocks.systemHomePath })
+    expect(mocks.ensureRealHomeCodexHookState).toHaveBeenCalledTimes(1)
+    expect(existsSync(join(mocks.systemHomePath, 'config.toml'))).toBe(false)
+  })
+})
diff --git a/src/main/startup/codex-session-resume-launch.ts b/src/main/startup/codex-session-resume-launch.ts
index c537c4f75ef9..4da4e7ef052f 100644
--- a/src/main/startup/codex-session-resume-launch.ts
+++ b/src/main/startup/codex-session-resume-launch.ts
@@ -7,8 +7,10 @@ import { prepareLegacySharedCodexSessionResume } from '../codex/codex-legacy-ses
 import { ManagedCodexHomeTemporarilyUnavailableError } from '../codex-accounts/host-codex-managed-home-ownership'
 import { codexHookService } from '../codex/hook-service'
 import { ensureRealHomeCodexHookState } from '../codex/codex-real-home-hook-install'
-import { isAgentStatusHooksEnabled } from '../agent-hooks/managed-agent-hook-controls'
+import { ensureCodexDaemonSocketGuard } from '../codex/codex-config-mirror'
+import { isAgentStatusHooksEnabledForAgent } from '../agent-hooks/managed-agent-hook-controls'
 import { markCodexProjectTrusted } from '../agent-trust-presets'
+import { awaitAgentTrustWriteWithinDeadline } from '../agent-trust-write-deadline'
 import { getOrcaManagedCodexHomePath, getSystemCodexHomePath } from '../codex/codex-home-paths'
 import { normalizeRuntimePathForComparison } from '../../shared/cross-platform-path'
 import { mainProcessState as state } from './main-process-state'
@@ -82,7 +84,11 @@ export async function prepareCodexSessionResumeForLaunch(args: {
       const resumeHome = migrated.useRealCodexHome ? systemHomePath : sessionSource.homePath
       if (args.workspacePath) {
         try {
-          await markCodexProjectTrusted(args.workspacePath)
+          // Why: the PTY spawn waits on the home this resolver returns, so the write stays ahead of the agent's trust menu — bounded so a wedged lane cannot hang the resume.
+          await awaitAgentTrustWriteWithinDeadline(markCodexProjectTrusted(args.workspacePath), {
+            preset: 'codex',
+            workspacePath: args.workspacePath
+          })
         } catch (error) {
           console.warn('[codex-project-trust] failed to pre-mark resumed workspace:', error)
         }
@@ -90,7 +96,7 @@ export async function prepareCodexSessionResumeForLaunch(args: {
       const isSystemHome =
         normalizeRuntimePathForComparison(resumeHome) ===
         normalizeRuntimePathForComparison(systemHomePath)
-      const hooksEnabled = isAgentStatusHooksEnabled(store.getSettings())
+      const hooksEnabled = isAgentStatusHooksEnabledForAgent(store.getSettings(), 'codex')
       try {
         if (isSystemHome) {
           await ensureRealHomeCodexHookState({
@@ -106,6 +112,10 @@ export async function prepareCodexSessionResumeForLaunch(args: {
         // Why: hook repair is best-effort; session provenance must still win over the currently selected home.
         console.warn('[codex-hook-service] failed to prepare automatic resume home:', error)
       }
+      if (!isSystemHome) {
+        // Why: this pins the resumed pane's CODEX_HOME, and hook repair above can skip or fail before its config mirror applies the daemon guard.
+        ensureCodexDaemonSocketGuard(resumeHome)
+      }
       return resumeHome
     }
   })
diff --git a/src/main/startup/configure-process.test.ts b/src/main/startup/configure-process.test.ts
index fd4379354c41..70747c926f48 100644
--- a/src/main/startup/configure-process.test.ts
+++ b/src/main/startup/configure-process.test.ts
@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { homedir, tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, expect, it, vi } from 'vitest'
@@ -942,39 +942,6 @@ describe('safe graphics mode startup switches', () => {
     )
   })
 
-  // Why: the defect was the call site, not the switch — a win32 safe-graphics launch runs
-  // `if (!gpuFallbackActiveThisLaunch) enableMainProcessGpuFeatures()` and skips everything
-  // parked inside it, so only an unconditional call site reaches the users a GPU crash already hit.
-  it('calls the throttling opt-out outside the GPU-fallback gate in preflight', () => {
-    const mainSource = readFileSync(join(__dirname, 'main-process-preflight.ts'), 'utf8')
-    const gateStart = mainSource.indexOf('if (!state.gpuFallbackActiveThisLaunch) {')
-    expect(gateStart).toBeGreaterThanOrEqual(0)
-    const gateEnd = mainSource.indexOf('\n  }', gateStart)
-    expect(gateEnd).toBeGreaterThan(gateStart)
-
-    expect(mainSource.match(/\boptOutOfHiddenPageWakeUpThrottling\(\)/g)).toHaveLength(1)
-    expect(mainSource.slice(gateStart, gateEnd)).not.toContain('optOutOfHiddenPageWakeUpThrottling')
-  })
-
-  // Why: Chromium consumes the command line at ready, so this must stay in the pre-ready
-  // top-level block and never move into the whenReady callback, where appendSwitch is a silent
-  // no-op — the same invisible failure as parking it behind the GPU gate.
-  it('appends the throttling opt-out before app ready in preflight', () => {
-    const mainSource = readFileSync(join(__dirname, 'main-process-preflight.ts'), 'utf8')
-    const entrySource = readFileSync(join(__dirname, '..', 'index.ts'), 'utf8')
-    const preflightEnd = mainSource.indexOf('\n  return true')
-    const readyStart = entrySource.indexOf('void app.whenReady()')
-    const preflightCall = entrySource.indexOf('runMainProcessPreflight({')
-    expect(preflightEnd).toBeGreaterThan(0)
-    expect(readyStart).toBeGreaterThan(0)
-    expect(preflightCall).toBeGreaterThanOrEqual(0)
-    expect(preflightCall).toBeLessThan(readyStart)
-
-    const callIndex = mainSource.indexOf('optOutOfHiddenPageWakeUpThrottling()')
-    expect(callIndex).toBeGreaterThan(0)
-    expect(callIndex).toBeLessThan(preflightEnd)
-  })
-
   // Why: Chromium enables IntensiveWakeUpThrottling on every desktop platform, so the opt-out
   // must never become reachable only through the GPU-feature path again.
   it('does not couple the throttling opt-out to GPU feature setup', async () => {
diff --git a/src/main/startup/main-process-account-services.ts b/src/main/startup/main-process-account-services.ts
index f37435d06d22..7d2ea38b314f 100644
--- a/src/main/startup/main-process-account-services.ts
+++ b/src/main/startup/main-process-account-services.ts
@@ -18,9 +18,9 @@ import { readMiniMaxApiKey } from '../minimax/minimax-api-key-store'
 import { createAccountRuntimeTargetSettingsSync } from '../rate-limits/account-runtime-target-sync'
 import { normalizeCodexRuntimeSelection } from '../codex-accounts/runtime-selection'
 import { normalizeClaudeRuntimeSelection } from '../claude-accounts/runtime-selection'
-import { isAgentStatusHooksEnabled } from '../agent-hooks/managed-agent-hook-controls'
 import { agentHookServer } from '../agent-hooks/server'
 import { setSystemCodexHomeHookSweepSuppressed } from '../codex/hook-service'
+import { shouldSuppressSystemCodexHomeHookSweep } from '../codex/codex-hook-legacy-cleanup'
 import { isRealHomeCodexHookLaneUsable } from '../codex/codex-real-home-hook-install'
 import { resolveHostCodexSessionSourceHome } from '../codex/codex-session-source-home'
 import { browserManager } from '../browser/browser-manager'
@@ -46,13 +46,13 @@ export function initializeMainProcessAccountServices(): void {
   state.codexRuntimeHome.setRealHomeLaneGate(() => isRealHomeCodexHookLaneUsable())
   // Why: while the real-home lane owns ~/.codex/hooks.json, the legacy
   // system-home sweep inside managed installs would delete the entry the
-  // real-home installer just appended. Flag OFF, hooks off, or an incapable
-  // trust lane re-arms the sweep so downgrade, opt-out, and rollback converge.
-  setSystemCodexHomeHookSweepSuppressed(
-    () =>
-      state.codexRuntimeHome !== null &&
-      state.codexRuntimeHome.isHostSystemDefaultRealHome() &&
-      isAgentStatusHooksEnabled(state.store?.getSettings())
+  // real-home installer just appended. Flag OFF, hooks off (all or Codex), or an
+  // incapable trust lane re-arms the sweep so downgrade, opt-out, and rollback converge.
+  setSystemCodexHomeHookSweepSuppressed(() =>
+    shouldSuppressSystemCodexHomeHookSweep({
+      isHostSystemDefaultRealHome: state.codexRuntimeHome?.isHostSystemDefaultRealHome() === true,
+      settings: state.store?.getSettings()
+    })
   )
   state.codexSessionMigration = createCodexSessionMigrationScheduler({
     isEligible: () =>
diff --git a/src/main/startup/main-process-pty-startup.ts b/src/main/startup/main-process-pty-startup.ts
index 162faf66b2f4..648db87a3b61 100644
--- a/src/main/startup/main-process-pty-startup.ts
+++ b/src/main/startup/main-process-pty-startup.ts
@@ -17,7 +17,10 @@ import {
 } from '../codex/codex-pane-account-registry'
 import { reconcileRetainedCodexHookHomes } from '../codex/retained-codex-hook-state'
 import { codexHookService } from '../codex/hook-service'
-import { isAgentStatusHooksEnabled } from '../agent-hooks/managed-agent-hook-controls'
+import {
+  isAgentStatusHooksEnabled,
+  isAgentStatusHooksEnabledForAgent
+} from '../agent-hooks/managed-agent-hook-controls'
 import { agentHookServer } from '../agent-hooks/server'
 import {
   indexPersistedPaneKeyPtyIds,
@@ -146,9 +149,7 @@ export function startTerminalRuntimeStartupServices(): WindowsDesktopStartupServ
           if (hasRetainedManagedHostPane) {
             void reconcileRetainedCodexHookHomes({
               hookService: codexHookService,
-              hooksEnabled:
-                isAgentStatusHooksEnabled(settings) &&
-                settings?.disabledTuiAgents.includes('codex') !== true,
+              hooksEnabled: isAgentStatusHooksEnabledForAgent(settings, 'codex'),
               runtimeHomePaths: state.codexRuntimeHome.getRetainedHostCodexHookHomePaths(livePtyIds)
             }).catch((error) =>
               console.warn('[codex-hook-service] retained Codex home reconcile failed:', error)
diff --git a/src/main/startup/main-process-quit.ts b/src/main/startup/main-process-quit.ts
index def52fc2b158..30f23791e874 100644
--- a/src/main/startup/main-process-quit.ts
+++ b/src/main/startup/main-process-quit.ts
@@ -16,6 +16,7 @@ import { clearRuntimeMetadataIfOwned } from '../runtime/runtime-metadata'
 import { shutdownPairedRuntimeBrowserClientHosts } from '../browser/paired-runtime-browser-client-host-runtime'
 import { browserManager } from '../browser/browser-manager'
 import { stopCodexStateDbBackfillRecoveries } from '../codex/codex-state-db-backfill-recovery'
+import { stopCodexAccountSessionBridges } from '../codex/codex-account-session-bridge'
 import { awaitPackedRefsLockRelease } from '../git/local-repo-ref-maintenance'
 import { settleTeardownWithinDeadline, settleWithinMs } from '../quit-teardown-deadline'
 import { quitTeardownStartGate } from '../quit-teardown-start-gate'
@@ -136,6 +137,7 @@ function installWillQuitHandler(): void {
     state.pluginMarketplaceInstaller = null
     const pluginHostShutdown = state.pluginService?.dispose() ?? Promise.resolve()
     const codexBackfillRecoveryShutdown = stopCodexStateDbBackfillRecoveries()
+    stopCodexAccountSessionBridges()
     // Why before the stop: teardown stamps each working session's resume marker with why the app
     // went away, and an update install is a restart the user never chose.
     setStructuredAgentSessionTeardownTrigger(updateQuitInProgress ? 'update' : 'quit')
diff --git a/src/main/startup/main-process-runtime-launch.ts b/src/main/startup/main-process-runtime-launch.ts
index bb7c81d4ddd9..4392914bdbef 100644
--- a/src/main/startup/main-process-runtime-launch.ts
+++ b/src/main/startup/main-process-runtime-launch.ts
@@ -209,7 +209,7 @@ async function launchServeMode(
   state.heimdall?.start()
   // Why: serve deletes worktrees too, and the history GC that normally drains delete tombstones is
   // armed from the main window — without this, a quit mid-removal leaks the tree until a desktop launch.
-  scheduleAllPendingHistoryTreeRemovals()
+  void scheduleAllPendingHistoryTreeRemovals()
   emitServeBrowserIdentityActionLine(getBrowserIdentityModeStatus())
   await printServeReady(serveOptions)
 }
diff --git a/src/main/startup/main-window-agent-status.ts b/src/main/startup/main-window-agent-status.ts
index 5899b2fe6bdd..38bb380d7247 100644
--- a/src/main/startup/main-window-agent-status.ts
+++ b/src/main/startup/main-window-agent-status.ts
@@ -35,6 +35,7 @@ export function installMainWindowAgentStatusListeners(options: MainWindowAgentSt
       receivedAt,
       evidenceObservedAt,
       stateStartedAt,
+      turnStartedAt,
       launchToken,
       providerSession,
       providerSessionOnly,
@@ -89,6 +90,7 @@ export function installMainWindowAgentStatusListeners(options: MainWindowAgentSt
         receivedAt,
         ...(evidenceObservedAt !== undefined ? { evidenceObservedAt } : {}),
         stateStartedAt,
+        ...(turnStartedAt !== undefined ? { turnStartedAt } : {}),
         ...(providerSession ? { providerSession } : {}),
         ...(promptInteractionKey ? { promptInteractionKey } : {}),
         ...(restoredUnconfirmed ? { restoredUnconfirmed: true } : {}),
diff --git a/src/main/startup/main-window-structured-status-filter.test.ts b/src/main/startup/main-window-structured-status-filter.test.ts
index c7fe55da626d..da26a593d00f 100644
--- a/src/main/startup/main-window-structured-status-filter.test.ts
+++ b/src/main/startup/main-window-structured-status-filter.test.ts
@@ -94,3 +94,11 @@ it('forwards retirement acknowledgement only on live status delivery', () => {
   expect(sent[0].event).toHaveProperty('authorityRestartId', 'retirement-id')
   expect(sent[1].event).not.toHaveProperty('authorityRestartId')
 })
+
+// The live push picks fields one by one; the host's turn start must be one of them.
+it("forwards the host's turn start, and nothing when the host stamped none", () => {
+  hooks.listener!(statusPayload({ turnStartedAt: 1 }))
+  hooks.listener!(statusPayload({}))
+  expect(sent[0].event).toHaveProperty('turnStartedAt', 1)
+  expect(sent[1].event).not.toHaveProperty('turnStartedAt')
+})
diff --git a/src/main/startup/secure-dns-census.test.ts b/src/main/startup/secure-dns-census.test.ts
index 6393ac3f3a47..72177fc04d41 100644
--- a/src/main/startup/secure-dns-census.test.ts
+++ b/src/main/startup/secure-dns-census.test.ts
@@ -33,14 +33,4 @@ describe('secure DNS census', () => {
 
     expect(offenders).toEqual([])
   })
-
-  it('detects a DoH mode when one is present', () => {
-    // Why: the census reads real sources, so it passes vacuously today; prove the matcher on a known offender.
-    const offending = "app.configureHostResolver({ secureDnsMode: 'automatic' })"
-    const modes = [...offending.matchAll(/secureDnsMode\s*:\s*'([^']*)'/g)].map((match) => match[1])
-
-    expect(offending.includes('configureHostResolver')).toBe(true)
-    expect(modes).toEqual(['automatic'])
-    expect(modes.every((mode) => mode === 'off')).toBe(false)
-  })
 })
diff --git a/src/main/telemetry/client.ts b/src/main/telemetry/client.ts
index 9b9a7fa828a0..49ddcc96a33e 100644
--- a/src/main/telemetry/client.ts
+++ b/src/main/telemetry/client.ts
@@ -161,35 +161,47 @@ function waitForCaptureEnqueue(client: PostHog, event: EventName, uuid: string):
   })
 }
 
+/** Lets producers avoid preparing usage payloads when transmission is disabled. */
+export function isTelemetryEnabled(): boolean {
+  return (
+    (testTransportEnabled || (IS_OFFICIAL_BUILD && TELEMETRY_ENABLED)) &&
+    !shuttingDown &&
+    posthog !== null &&
+    commonProps !== null &&
+    storeRef !== null &&
+    resolveConsent(storeRef.getSettings()).effective === 'enabled'
+  )
+}
+
 // No-op in contributor / non-official builds; only official stable/rc builds (CI-injected `ORCA_BUILD_IDENTITY` + `ORCA_POSTHOG_WRITE_KEY`) transmit.
-export function track<N extends EventName>(name: N, props: EventProps<N>): void {
+export function track<N extends EventName>(name: N, props: EventProps<N>): boolean {
   if (!testTransportEnabled && (!IS_OFFICIAL_BUILD || !TELEMETRY_ENABLED)) {
-    return
+    return false
   }
 
   // (1) Shutdown gate: late IPC arrivals must not enqueue against a flushing client.
   if (shuttingDown) {
-    return
+    return false
   }
   if (!posthog || !commonProps || !storeRef) {
-    return
+    return false
   }
 
   // (2) Burst cap before consent: the O(1) cap drops floods before the costly settings read, so a compromised opted-out renderer can't burn CPU.
   if (!consumeBurstToken(name)) {
-    return
+    return false
   }
 
   // (3) Consent resolve — reads live settings every call so it can't drift from persisted state / env-var precedence.
   const consent = resolveConsent(storeRef.getSettings())
   if (consent.effective !== 'enabled') {
-    return
+    return false
   }
 
   // (4) Validator — single enforcement point for schema, enum, key set, and length caps.
   const result = validate(name, props)
   if (!result.ok) {
-    return
+    return false
   }
 
   // (5) Capture. `$process_person_profile: false` stops posthog-node creating a person per install_id (no init-time equivalent).
@@ -202,6 +214,7 @@ export function track<N extends EventName>(name: N, props: EventProps<N>): void
       $process_person_profile: false
     }
   })
+  return true
 }
 
 export async function setOptIn(via: OptInVia, optedIn: boolean): Promise<void> {
diff --git a/src/main/terminal-history-deletion.ts b/src/main/terminal-history-deletion.ts
index 1fea1128ebe9..97650a78ac34 100644
--- a/src/main/terminal-history-deletion.ts
+++ b/src/main/terminal-history-deletion.ts
@@ -1,5 +1,6 @@
 import { basename, dirname, join } from 'node:path'
-import { existsSync, mkdirSync, readdirSync, renameSync } from 'node:fs'
+import { existsSync, mkdirSync, renameSync } from 'node:fs'
+import { readdir } from 'node:fs/promises'
 import { removeHostTree } from './host-tree-removal'
 import { deleteFishHistoryFile, resolveFishHistoryDir } from './fish-history-session'
 import { readHistoryMeta } from './terminal-history'
@@ -20,6 +21,112 @@ const historyTreeRemovalAttempts = new Map<string, number>()
 const historyTreeRemovalRetryTimers = new Map<string, ReturnType<typeof setTimeout>>()
 const wslDistroByTombstone = new Map<string, string>()
 
+/** One root's undrained tombstone names from the last enumeration, plus its in-flight re-read. */
+type HistoryRemovalQueue = { names: string[]; refill: Promise<void> | null }
+// Why hold the names instead of re-reading per completion: one `readdir` already materialises every
+// name, so keeping it until it runs out makes a backlog of N tombstones cost a handful of reads, not N.
+const historyRemovalQueues = new Map<string, HistoryRemovalQueue>()
+
+function historyRemovalQueueFor(historyRoot: string): HistoryRemovalQueue {
+  const existing = historyRemovalQueues.get(historyRoot)
+  if (existing) {
+    return existing
+  }
+  const queue: HistoryRemovalQueue = { names: [], refill: null }
+  historyRemovalQueues.set(historyRoot, queue)
+  return queue
+}
+
+function historyTreeRemovalsAtCapacity(): boolean {
+  return (
+    pendingHistoryTreeRemovals.size + historyTreeRemovalRetryTimers.size >=
+    MAX_PENDING_HISTORY_TREE_REMOVALS
+  )
+}
+
+function isHistoryTreeRemovalTracked(dir: string): boolean {
+  return pendingHistoryTreeRemovals.has(dir) || historyTreeRemovalRetryTimers.has(dir)
+}
+
+/** Admit already-enumerated tombstones up to the admission cap; the rest stay queued for a later slot. */
+function admitQueuedHistoryTreeRemovals(historyRoot: string, queue: HistoryRemovalQueue): void {
+  const pendingRoot = getPendingDeleteRoot(historyRoot)
+  const wslDistro = wslDistroForHistoryRoot(historyRoot)
+  while (!historyTreeRemovalsAtCapacity()) {
+    const name = queue.names.pop()
+    if (name === undefined) {
+      return
+    }
+    // Safe to re-admit a name removed since enumeration: `removeHostTree` forces the rm.
+    scheduleHistoryTreeRemoval(join(pendingRoot, name), wslDistro)
+  }
+}
+
+/** Re-read one root's tombstone directory, coalescing concurrent requests onto a single readdir. */
+function refillHistoryRemovalQueue(historyRoot: string, queue: HistoryRemovalQueue): Promise<void> {
+  if (queue.refill) {
+    return queue.refill
+  }
+  const pendingRoot = getPendingDeleteRoot(historyRoot)
+  // Why snapshot rather than only test tracking when the read lands: a removal under way now can
+  // still show up in the read and also finish before it resolves, which would look admissible again.
+  const removalsUnderWay = new Set(pendingHistoryTreeRemovals.keys())
+  queue.refill = readTombstoneNames(historyRoot).then((names) => {
+    // A teardown that dropped this queue must not resurrect its removals.
+    if (historyRemovalQueues.get(historyRoot) !== queue) {
+      return
+    }
+    queue.refill = null
+    try {
+      // Dropping names already handled keeps the read that confirms a drained directory from
+      // re-queueing work, so the tail of a backlog does not cost one read per completion.
+      queue.names = names.filter((name) => {
+        const dir = join(pendingRoot, name)
+        return !removalsUnderWay.has(dir) && !isHistoryTreeRemovalTracked(dir)
+      })
+      admitQueuedHistoryTreeRemovals(historyRoot, queue)
+    } catch (err) {
+      // Non-fatal, and never a rejection: callers fire this off without awaiting it.
+      console.warn(
+        `[pty:history] Failed to queue pending history removals: ${err instanceof Error ? err.message : String(err)}`
+      )
+    }
+  })
+  return queue.refill
+}
+
+async function readTombstoneNames(historyRoot: string): Promise<string[]> {
+  try {
+    return await readdir(getPendingDeleteRoot(historyRoot))
+  } catch (err) {
+    // An absent root is the normal steady state; anything else means tombstones may linger until a
+    // later completion re-reads, so it is worth a line.
+    const code = err && typeof err === 'object' && 'code' in err ? String(err.code) : ''
+    if (code !== 'ENOENT') {
+      console.warn(
+        `[pty:history] Failed to read pending history removals for ${historyRoot}: ${err instanceof Error ? err.message : String(err)}`
+      )
+    }
+    return []
+  }
+}
+
+/** Reopen the admission window after a completion — from the queues, or one read once they empty. */
+function replenishHistoryTreeRemovals(historyRoot: string): void {
+  const queue = historyRemovalQueueFor(historyRoot)
+  admitQueuedHistoryTreeRemovals(historyRoot, queue)
+  // Why other roots too: a slot this root cannot fill is the only thing a sibling root displaced at
+  // the cap is waiting for, and nothing else would offer it one before the next startup.
+  for (const [otherRoot, otherQueue] of historyRemovalQueues) {
+    if (otherQueue !== queue) {
+      admitQueuedHistoryTreeRemovals(otherRoot, otherQueue)
+    }
+  }
+  if (queue.names.length === 0 && !historyTreeRemovalsAtCapacity()) {
+    void refillHistoryRemovalQueue(historyRoot, queue)
+  }
+}
+
 function wslDistroForHistoryRoot(historyRoot: string): string | undefined {
   return basename(dirname(historyRoot)) === 'terminal-history-wsl'
     ? basename(historyRoot)
@@ -83,10 +190,7 @@ function scheduleHistoryTreeRemoval(dir: string, wslDistro?: string): void {
     return
   }
   // Leave excess tombstones on disk; admission is intentionally bounded.
-  if (
-    pendingHistoryTreeRemovals.size + historyTreeRemovalRetryTimers.size >=
-    MAX_PENDING_HISTORY_TREE_REMOVALS
-  ) {
+  if (historyTreeRemovalsAtCapacity()) {
     return
   }
   // A rescan must not cancel a delayed retry for a real failure.
@@ -130,7 +234,7 @@ function scheduleHistoryTreeRemoval(dir: string, wslDistro?: string): void {
         pendingHistoryTreeRemovals.delete(dir)
       }
       if (removalSucceeded) {
-        schedulePendingHistoryTreeRemovals(historyRootForTombstone(dir))
+        replenishHistoryTreeRemovals(historyRootForTombstone(dir))
       }
     })
   pendingHistoryTreeRemovals.set(dir, removal)
@@ -159,31 +263,26 @@ export function scheduleWorktreeHistoryTreeDeletion(dir: string, historyRoot: st
   return true
 }
 
-/** Schedule tombstoned trees under one history root for async removal — the retry after a quit mid-rm. */
-export function schedulePendingHistoryTreeRemovals(historyRoot: string): void {
-  const pendingRoot = getPendingDeleteRoot(historyRoot)
-  if (!existsSync(pendingRoot)) {
-    return
-  }
-  try {
-    for (const entry of readdirSync(pendingRoot)) {
-      scheduleHistoryTreeRemoval(join(pendingRoot, entry), wslDistroForHistoryRoot(historyRoot))
-    }
-  } catch {
-    // Non-fatal.
-  }
+/** Schedule tombstoned trees under one history root for async removal — the retry after a quit mid-rm.
+ *  Resolves once the enumeration landed; the removals it admitted keep draining in the background. */
+export function schedulePendingHistoryTreeRemovals(historyRoot: string): Promise<void> {
+  return refillHistoryRemovalQueue(historyRoot, historyRemovalQueueFor(historyRoot))
 }
 
 /** Schedule tombstoned trees under every history root, native and WSL. */
-export function scheduleAllPendingHistoryTreeRemovals(): void {
-  schedulePendingHistoryTreeRemovals(getHistoryRoot())
-  for (const distroRoot of listWslHistoryRoots()) {
-    schedulePendingHistoryTreeRemovals(distroRoot)
-  }
+export async function scheduleAllPendingHistoryTreeRemovals(): Promise<void> {
+  await Promise.all([
+    schedulePendingHistoryTreeRemovals(getHistoryRoot()),
+    ...listWslHistoryRoots().map((distroRoot) => schedulePendingHistoryTreeRemovals(distroRoot))
+  ])
 }
 
-/** Drop every armed retry timer so a fixture teardown cannot resurrect a removal. Tests only. */
+/** Drop queued tombstone names and retries so fixture teardown cannot resurrect a removal. Tests only. */
 export function cancelPendingHistoryTreeRemovalRetries(): void {
+  historyRemovalQueues.clear()
+  // Why also the in-flight map: a fixture that never settles a held removal would otherwise leave it
+  // for the next test's flush to wait on forever.
+  pendingHistoryTreeRemovals.clear()
   for (const timer of historyTreeRemovalRetryTimers.values()) {
     clearTimeout(timer)
   }
@@ -195,11 +294,22 @@ export function cancelPendingHistoryTreeRemovalRetries(): void {
 /** Drain every history root's tombstones and await the in-flight removals. Tests only: production
  *  schedules the same drain from startup GC and headless serve without ever blocking on it. */
 export async function flushPendingWorktreeHistoryDeletions(): Promise<void> {
-  scheduleAllPendingHistoryTreeRemovals()
+  await scheduleAllPendingHistoryTreeRemovals()
   // Why loop: awaiting one snapshot of the map would return with a removal scheduled mid-batch still
-  // in flight. Each pass settles its batch and drains whatever was added while it ran.
-  while (pendingHistoryTreeRemovals.size > 0) {
-    await Promise.all(pendingHistoryTreeRemovals.values())
+  // in flight. Each pass admits every queued name the cap allows, then settles what is outstanding.
+  while (true) {
+    for (const [root, queue] of historyRemovalQueues) {
+      admitQueuedHistoryTreeRemovals(root, queue)
+    }
+    const outstanding = [
+      ...pendingHistoryTreeRemovals.values(),
+      ...[...historyRemovalQueues.values()].flatMap((queue) => (queue.refill ? [queue.refill] : []))
+    ]
+    if (outstanding.length === 0) {
+      // Nothing in flight and nothing admissible: only delayed retries can still make progress.
+      return
+    }
+    await Promise.all(outstanding)
   }
 }
 
diff --git a/src/main/terminal-history-gc-fs-call-count.test.ts b/src/main/terminal-history-gc-fs-call-count.test.ts
index d6c10b579515..4ed0cb816cd8 100644
--- a/src/main/terminal-history-gc-fs-call-count.test.ts
+++ b/src/main/terminal-history-gc-fs-call-count.test.ts
@@ -167,15 +167,20 @@ describe('history GC filesystem request count', () => {
 
     await runHistoryGc(live)
 
+    const tombstoneLists = fsCalls.readdir.filter((p) => p.endsWith(PENDING_DELETE_DIR_NAME))
+    const scanLists = fsCalls.readdir.filter((p) => !p.endsWith(PENDING_DELETE_DIR_NAME))
     // The size estimation walked into every directory; the pass now only lists the root.
-    expect(fsCalls.readdir).toEqual([historyRoot])
+    expect(scanLists).toEqual([historyRoot])
+    // The tombstone drain (formerly a blocking readdirSync per completion) lists pending-delete a
+    // bounded number of times, never once per entry it removes.
+    expect(tombstoneLists.length).toBeLessThanOrEqual(12)
     // No stat on the entries themselves: the root dirent already carries the type.
     expect(statsOnEntries()).toEqual([])
     // The one surviving stat per directory is readHistoryMetaAsync enforcing its size cap.
     expect(statsInsideEntries().sort()).toEqual(
       Array.from({ length: DIR_COUNT }, (_, i) => join(historyRoot, `wt-${i}`, 'meta.json')).sort()
     )
-    expect(fsCalls.readdir.length + fsCalls.stat.length).toBe(1 + DIR_COUNT)
+    expect(scanLists.length + fsCalls.stat.length).toBe(1 + DIR_COUNT)
 
     const after = survivingDirs()
     expect(expected.size).toBe(DIR_COUNT / ORPHAN_EVERY)
diff --git a/src/main/terminal-history-gc.ts b/src/main/terminal-history-gc.ts
index f62ebab9ee50..7882ec963a46 100644
--- a/src/main/terminal-history-gc.ts
+++ b/src/main/terminal-history-gc.ts
@@ -148,7 +148,7 @@ async function executeHistoryGc(liveWorktreeIds: Set<string>, signal: AbortSigna
     // Why: finish tombstones left by quit mid-rm before scanning live worktree hashes.
     // Safe ahead of the guard below: these entries were already condemned by a
     // completed GC, and leaving them renamed-but-present strands disk forever.
-    schedulePendingHistoryTreeRemovals(getHistoryRoot())
+    await schedulePendingHistoryTreeRemovals(getHistoryRoot())
     // Why refuse rather than treat every entry as orphaned: an empty live set is
     // what a store that fell back to default state looks like, and it cannot be
     // told apart from a user who genuinely has no worktrees — who also has no
@@ -169,7 +169,7 @@ async function executeHistoryGc(liveWorktreeIds: Set<string>, signal: AbortSigna
       if (signal.aborted) {
         break
       }
-      schedulePendingHistoryTreeRemovals(distroRoot)
+      await schedulePendingHistoryTreeRemovals(distroRoot)
       const r = await gcScanRoot(distroRoot, liveWorktreeIds, signal)
       wslTotals.totalDirs += r.totalDirs
       wslTotals.orphaned += r.orphaned
diff --git a/src/main/terminal-history-tombstone-retry.test.ts b/src/main/terminal-history-tombstone-retry.test.ts
index 1d7a606206a0..cbfb10cc2b75 100644
--- a/src/main/terminal-history-tombstone-retry.test.ts
+++ b/src/main/terminal-history-tombstone-retry.test.ts
@@ -30,6 +30,16 @@ import {
   schedulePendingHistoryTreeRemovals
 } from './terminal-history-deletion'
 
+// Captured before any fake clock replaces the global: refilling the removal queue reads the
+// tombstone directory for real, and only a turn of the actual event loop can land that read.
+const realSetImmediate = setImmediate
+
+async function settleTombstoneDirectoryReads(): Promise<void> {
+  for (let index = 0; index < 10; index++) {
+    await new Promise((resolve) => realSetImmediate(resolve))
+  }
+}
+
 /** A tombstone whose rm fails once used to sit on disk for the rest of the session — only the next
  *  process start re-queued it. Prove the failure re-arms in-process, and that it stays bounded. */
 describe('tombstoned history removal retries', () => {
@@ -124,9 +134,11 @@ describe('tombstoned history removal retries', () => {
     expect(deleteWslFishHistoryFileMock).toHaveBeenCalledTimes(64)
     expect(releases).toHaveLength(64)
 
-    while (releases.length > 0) {
+    for (let pass = 0; removeHostTreeMock.mock.calls.length < 1_000; pass++) {
+      expect(pass).toBeLessThan(200)
       releases.splice(0).forEach((release) => release())
       await vi.advanceTimersByTimeAsync(0)
+      await settleTombstoneDirectoryReads()
     }
     expect(removeHostTreeMock).toHaveBeenCalledTimes(1_000)
     expect(deleteWslFishHistoryFileMock).toHaveBeenCalledTimes(1_000)
diff --git a/src/main/terminal-history-tombstone-scan-cost.test.ts b/src/main/terminal-history-tombstone-scan-cost.test.ts
new file mode 100644
index 000000000000..002763750d67
--- /dev/null
+++ b/src/main/terminal-history-tombstone-scan-cost.test.ts
@@ -0,0 +1,280 @@
+import { mkdirSync, mkdtempSync, readdirSync, rmSync } from 'node:fs'
+import type * as NodeFsPromises from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { installFakeAppEnvironment } from '../../config/scripts/vitest-host-ports-setup'
+
+const reads = vi.hoisted(() => ({ count: 0, names: 0, failNext: 0 }))
+const { removeHostTreeMock } = vi.hoisted(() => ({
+  removeHostTreeMock: vi.fn<(dir: string) => Promise<void>>()
+}))
+
+vi.mock('node:fs/promises', async (importOriginal) => {
+  const fsp = await importOriginal<typeof NodeFsPromises>()
+  return {
+    ...fsp,
+    readdir: async (...args: Parameters<typeof fsp.readdir>) => {
+      if (!String(args[0]).endsWith('.pending-delete')) {
+        return fsp.readdir(...args)
+      }
+      reads.count++
+      if (reads.failNext > 0) {
+        reads.failNext--
+        throw new Error('EACCES: permission denied, scandir')
+      }
+      const result = await fsp.readdir(...args)
+      reads.names += Array.isArray(result) ? result.length : 0
+      return result
+    }
+  }
+})
+
+vi.mock('./host-tree-removal', () => ({ removeHostTree: removeHostTreeMock }))
+
+import {
+  cancelPendingHistoryTreeRemovalRetries,
+  flushPendingWorktreeHistoryDeletions,
+  HISTORY_TREE_REMOVAL_RETRY_DELAYS_MS,
+  MAX_PENDING_HISTORY_TREE_REMOVALS,
+  schedulePendingHistoryTreeRemovals
+} from './terminal-history-deletion'
+
+describe('terminal history tombstone scan cost', () => {
+  let userDataDir: string
+
+  beforeEach(() => {
+    userDataDir = mkdtempSync(join(tmpdir(), 'orca-history-scan-cost-'))
+    installFakeAppEnvironment({ getPath: () => userDataDir })
+    reads.count = 0
+    reads.names = 0
+    reads.failNext = 0
+    removeHostTreeMock.mockReset()
+  })
+
+  afterEach(() => {
+    cancelPendingHistoryTreeRemovalRetries()
+    vi.useRealTimers()
+    rmSync(userDataDir, { recursive: true, force: true })
+  })
+
+  function seedTombstones(root: string, count: number): void {
+    for (let index = 0; index < count; index++) {
+      mkdirSync(join(root, '.pending-delete', `old-session-${index}`), {
+        recursive: true
+      })
+    }
+  }
+
+  function holdRemovals(): (() => void)[] {
+    const releases: (() => void)[] = []
+    removeHostTreeMock.mockImplementation(
+      (dir) =>
+        new Promise<void>((resolve) =>
+          releases.push(() => {
+            rmSync(dir, { recursive: true, force: true })
+            resolve()
+          })
+        )
+    )
+    return releases
+  }
+
+  /** Drain only the microtask queue, so no queued directory read can land yet. */
+  async function settleRemovalPromises(): Promise<void> {
+    for (let index = 0; index < 8; index++) {
+      await Promise.resolve()
+    }
+  }
+
+  /** Let real filesystem reads land. Callers using fake timers must drive the clock instead. */
+  async function waitFor(label: string, condition: () => boolean): Promise<void> {
+    for (let index = 0; index < 500; index++) {
+      if (condition()) {
+        return
+      }
+      await new Promise((resolve) => setTimeout(resolve, 2))
+    }
+    throw new Error(`Timed out waiting for ${label}`)
+  }
+
+  it('drains 1024 tombstones without re-reading the directory per completion', async () => {
+    const root = join(userDataDir, 'terminal-history')
+    const pendingRoot = join(root, '.pending-delete')
+    seedTombstones(root, 1024)
+    const releases = holdRemovals()
+
+    await schedulePendingHistoryTreeRemovals(root)
+    expect(reads.count).toBe(1)
+    expect(removeHostTreeMock).toHaveBeenCalledTimes(MAX_PENDING_HISTORY_TREE_REMOVALS)
+    while (releases.length > 0) {
+      expect(releases.length).toBeLessThanOrEqual(MAX_PENDING_HISTORY_TREE_REMOVALS)
+      releases.splice(0).forEach((release) => release())
+      await settleRemovalPromises()
+    }
+
+    expect(removeHostTreeMock).toHaveBeenCalledTimes(1024)
+    expect(readdirSync(pendingRoot)).toEqual([])
+    // One read fills the queue; the handful after it only confirm the directory drained, so the
+    // count must stay flat in the backlog size rather than tracking completion batches.
+    expect(reads.count).toBeLessThanOrEqual(8)
+    expect(reads.names).toBeLessThanOrEqual(1024 + MAX_PENDING_HISTORY_TREE_REMOVALS)
+  })
+
+  it('picks up a tombstone created after the queued names were read', async () => {
+    const root = join(userDataDir, 'terminal-history')
+    const pendingRoot = join(root, '.pending-delete')
+    seedTombstones(root, 1)
+    const releases = holdRemovals()
+
+    await schedulePendingHistoryTreeRemovals(root)
+    mkdirSync(join(pendingRoot, 'late-session'))
+    releases.splice(0).forEach((release) => release())
+
+    // The completion exhausted the queue, so its refill read discovers the late arrival.
+    await waitFor('late tombstone admission', () => removeHostTreeMock.mock.calls.length === 2)
+    releases.splice(0).forEach((release) => release())
+    await flushPendingWorktreeHistoryDeletions()
+    expect(readdirSync(pendingRoot)).toEqual([])
+  })
+
+  it('drains both roots within the shared admission cap without per-completion reads', async () => {
+    const nativeRoot = join(userDataDir, 'terminal-history')
+    const wslRoot = join(userDataDir, 'terminal-history-wsl', 'Ubuntu')
+    seedTombstones(nativeRoot, 160)
+    seedTombstones(wslRoot, 160)
+    let inFlight = 0
+    let peakInFlight = 0
+    removeHostTreeMock.mockImplementation(async (dir) => {
+      inFlight++
+      peakInFlight = Math.max(peakInFlight, inFlight)
+      await new Promise((resolve) => setTimeout(resolve, 0))
+      rmSync(dir, { recursive: true, force: true })
+      inFlight--
+    })
+
+    await flushPendingWorktreeHistoryDeletions()
+
+    expect(removeHostTreeMock).toHaveBeenCalledTimes(320)
+    expect(peakInFlight).toBeLessThanOrEqual(MAX_PENDING_HISTORY_TREE_REMOVALS)
+    expect(readdirSync(join(nativeRoot, '.pending-delete'))).toEqual([])
+    expect(readdirSync(join(wslRoot, '.pending-delete'))).toEqual([])
+    // Two roots, so a couple of reads each rather than one per completion.
+    expect(reads.count).toBeLessThanOrEqual(12)
+  })
+
+  it('keeps draining after a directory read fails mid-drain', async () => {
+    const root = join(userDataDir, 'terminal-history')
+    const pendingRoot = join(root, '.pending-delete')
+    seedTombstones(root, MAX_PENDING_HISTORY_TREE_REMOVALS + 1)
+    const releases = holdRemovals()
+
+    await schedulePendingHistoryTreeRemovals(root)
+    expect(removeHostTreeMock).toHaveBeenCalledTimes(MAX_PENDING_HISTORY_TREE_REMOVALS)
+
+    // The refill these completions request is the one that fails.
+    reads.failNext = 1
+    releases.splice(0).forEach((release) => release())
+    await settleRemovalPromises()
+    // The queued 65th still came from memory, so the failed read cost no progress.
+    expect(removeHostTreeMock).toHaveBeenCalledTimes(MAX_PENDING_HISTORY_TREE_REMOVALS + 1)
+
+    mkdirSync(join(pendingRoot, 'late-after-failed-read'))
+    releases.splice(0).forEach((release) => release())
+    // A later completion must be able to read again rather than stay wedged on the failure.
+    await waitFor(
+      'recovery after failed read',
+      () => removeHostTreeMock.mock.calls.length === MAX_PENDING_HISTORY_TREE_REMOVALS + 2
+    )
+    releases.splice(0).forEach((release) => release())
+    await flushPendingWorktreeHistoryDeletions()
+    expect(readdirSync(pendingRoot)).toEqual([])
+  })
+
+  it('drops an in-flight refill during fixture cleanup', async () => {
+    const root = join(userDataDir, 'terminal-history')
+    seedTombstones(root, MAX_PENDING_HISTORY_TREE_REMOVALS + 1)
+    const releases = holdRemovals()
+
+    await schedulePendingHistoryTreeRemovals(root)
+    mkdirSync(join(root, '.pending-delete', 'late-session'))
+    releases.splice(0).forEach((release) => release())
+    await settleRemovalPromises()
+    const admittedBeforeCleanup = removeHostTreeMock.mock.calls.length
+
+    cancelPendingHistoryTreeRemovalRetries()
+    await waitFor('the dropped refill to land', () => reads.count >= 2)
+    await new Promise((resolve) => setTimeout(resolve, 10))
+    expect(removeHostTreeMock).toHaveBeenCalledTimes(admittedBeforeCleanup)
+  })
+
+  it('preserves delayed failure retries while successful removals replenish the queue', async () => {
+    // Fake timers must be armed before the failure so its retry lands on the test clock.
+    vi.useFakeTimers()
+    const root = join(userDataDir, 'terminal-history')
+    seedTombstones(root, 130)
+    const failedDir = join(root, '.pending-delete', 'old-session-0')
+    removeHostTreeMock.mockImplementation(async (dir) => {
+      if (dir === failedDir) {
+        throw new Error('EBUSY')
+      }
+      rmSync(dir, { recursive: true, force: true })
+    })
+    await flushPendingWorktreeHistoryDeletions()
+    expect(removeHostTreeMock).toHaveBeenCalledTimes(130)
+    expect(readdirSync(join(root, '.pending-delete'))).toEqual(['old-session-0'])
+
+    await vi.advanceTimersByTimeAsync(HISTORY_TREE_REMOVAL_RETRY_DELAYS_MS[0] - 1)
+    expect(removeHostTreeMock).toHaveBeenCalledTimes(130)
+    await vi.advanceTimersByTimeAsync(1)
+    expect(removeHostTreeMock).toHaveBeenCalledTimes(131)
+    await vi.advanceTimersByTimeAsync(HISTORY_TREE_REMOVAL_RETRY_DELAYS_MS[1])
+    expect(removeHostTreeMock).toHaveBeenCalledTimes(132)
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('does not retry a tombstone past its attempt budget when another root frees slots', async () => {
+    vi.useFakeTimers()
+    const nativeRoot = join(userDataDir, 'terminal-history')
+    const wslRoot = join(userDataDir, 'terminal-history-wsl', 'Ubuntu')
+    seedTombstones(nativeRoot, 32)
+    seedTombstones(wslRoot, 130)
+    const releases: (() => void)[] = []
+    const attemptsByDir = new Map<string, number>()
+    removeHostTreeMock.mockImplementation((dir) => {
+      attemptsByDir.set(dir, (attemptsByDir.get(dir) ?? 0) + 1)
+      if (dir.startsWith(wslRoot)) {
+        return Promise.reject(new Error('EBUSY'))
+      }
+      return new Promise<void>((resolve) =>
+        releases.push(() => {
+          rmSync(dir, { recursive: true, force: true })
+          resolve()
+        })
+      )
+    })
+    await schedulePendingHistoryTreeRemovals(nativeRoot)
+    await schedulePendingHistoryTreeRemovals(wslRoot)
+
+    // Every WSL tombstone that was admitted exhausts its retries while native removals stay in flight.
+    for (const delay of HISTORY_TREE_REMOVAL_RETRY_DELAYS_MS) {
+      await vi.advanceTimersByTimeAsync(delay)
+    }
+    expect(vi.getTimerCount()).toBe(0)
+    const maxAttempts = 1 + HISTORY_TREE_REMOVAL_RETRY_DELAYS_MS.length
+    const exhausted = [...attemptsByDir.entries()].filter(([, count]) => count === maxAttempts)
+    expect(exhausted.length).toBeGreaterThan(0)
+
+    releases.splice(0).forEach((release) => release())
+    await vi.advanceTimersByTimeAsync(0)
+    await vi.advanceTimersByTimeAsync(0)
+    // Freeing another root's slots may give untried tombstones a first attempt, but must never hand
+    // an exhausted one a fresh attempt.
+    for (const count of attemptsByDir.values()) {
+      expect(count).toBeLessThanOrEqual(maxAttempts)
+    }
+    for (const [dir] of exhausted) {
+      expect(attemptsByDir.get(dir)).toBe(maxAttempts)
+    }
+  })
+})
diff --git a/src/main/terminal-history.test.ts b/src/main/terminal-history.test.ts
index 8dd25ea7ddf7..c5ce990f32ca 100644
--- a/src/main/terminal-history.test.ts
+++ b/src/main/terminal-history.test.ts
@@ -62,7 +62,9 @@ vi.mock('fs', () => ({
 // transitive readFile/mkdir would otherwise resolve to undefined.
 vi.mock('node:fs/promises', async () => ({
   ...(await vi.importActual<typeof FsPromises>('node:fs/promises')),
-  rm: rmAsyncMock
+  rm: rmAsyncMock,
+  // The tombstone drain lists pending-delete asynchronously; same fixture as the sync reads.
+  readdir: async (path: string) => readdirSyncMock(path) ?? []
 }))
 
 const { parseWslPathMock, toLinuxPathMock } = vi.hoisted(() => ({
diff --git a/src/main/updater-test-harness.leaked-timers.test.ts b/src/main/updater-test-harness.leaked-timers.test.ts
deleted file mode 100644
index 6857852c0e2b..000000000000
--- a/src/main/updater-test-harness.leaked-timers.test.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import { setTimeout as sleep } from 'node:timers/promises'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Mock } from 'vitest'
-import { loadUpdaterModule, warmUpdaterModule } from './updater-test-module-loader'
-
-const { autoUpdaterMock, fetchNewerReleaseTagsMock, moduleFactories, resetUpdaterMocks } =
-  await vi.hoisted(async () => (await import('./updater-test-harness')).createUpdaterMocks())
-
-vi.mock('electron', () => moduleFactories.electron())
-vi.mock('electron-updater', () => moduleFactories.electronUpdater())
-vi.mock('./electron-updater-loader', () => moduleFactories.electronUpdaterLoader())
-vi.mock('@electron-toolkit/utils', () => moduleFactories.electronToolkitUtils())
-vi.mock('./ipc/pty', () => moduleFactories.ipcPty())
-vi.mock('./linux-update-package-type', () => moduleFactories.linuxUpdatePackageType())
-vi.mock('./updater-lifecycle-diagnostics', () => moduleFactories.updaterLifecycleDiagnostics())
-vi.mock('./updater-changelog', () => moduleFactories.updaterChangelog())
-vi.mock('./updater-nudge', () => moduleFactories.updaterNudge())
-vi.mock('./update-install-exit-watchdog', () => moduleFactories.updateInstallExitWatchdog())
-vi.mock('./updater-prerelease-feed', () => moduleFactories.updaterPrereleaseFeed())
-vi.mock('./local-builds/local-build-switch', () => moduleFactories.localBuildSwitch())
-vi.mock('./local-builds/local-build-feed-server', () => moduleFactories.localBuildFeedServer())
-
-const SILENT_SETTLE_DELAY_MS = 1_000
-const AUTO_UPDATE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000
-
-warmUpdaterModule()
-
-describe('updater test harness real-timer tracking', () => {
-  beforeEach(() => {
-    resetUpdaterMocks()
-  })
-
-  it('cancels a real timer armed before the reset', async () => {
-    let fired = false
-    setTimeout(() => {
-      fired = true
-    }, 20)
-
-    resetUpdaterMocks()
-
-    await sleep(150)
-    expect(fired).toBe(false)
-  })
-
-  it('still arms real timers after the reset', async () => {
-    let fired = false
-    setTimeout(() => {
-      fired = true
-    }, 10)
-
-    await sleep(150)
-    expect(fired).toBe(true)
-  })
-
-  it('hands back the untouched Node timeout handle', () => {
-    const handle = setTimeout(() => {}, 60_000)
-
-    // Why: production code calls unref() on these; the tracker must not swap in a plain id.
-    expect(typeof handle.unref).toBe('function')
-    handle.unref()
-    clearTimeout(handle)
-  })
-})
-
-// Why: this pair reproduces the cross-test leak, so it depends on running in file order — the first
-// test arms the timer and the second one is the later test it used to fire into.
-describe('abandoned updater instance', () => {
-  let leakedStatusSend: Mock = vi.fn()
-
-  beforeEach(() => {
-    resetUpdaterMocks()
-  })
-
-  it('leaves a silent-settle timer armed when its module instance is abandoned', async () => {
-    let resolveCheck: (value: unknown) => void = () => {}
-    autoUpdaterMock.checkForUpdates.mockImplementation(() => {
-      // Why: the checking status is what makes the silent settle publish 'not-available' later.
-      autoUpdaterMock.emit('checking-for-update')
-      return new Promise((resolve) => {
-        resolveCheck = resolve
-      })
-    })
-    leakedStatusSend = vi.fn()
-
-    const { setupAutoUpdater } = await loadUpdaterModule()
-
-    setupAutoUpdater({ webContents: { send: leakedStatusSend } } as never, {
-      getLastUpdateCheckAt: () => Date.now() - 25 * 60 * 60 * 1000
-    })
-
-    await vi.waitFor(() => {
-      expect(autoUpdaterMock.checkForUpdates).toHaveBeenCalledTimes(1)
-    })
-
-    // Why: resolving without a terminal event is what arms the 1s silent settle; do it here so the
-    // full delay is still ahead of us and the timer is guaranteed to be pending when this test ends.
-    resolveCheck(undefined)
-    await sleep(0)
-
-    expect(leakedStatusSend).not.toHaveBeenCalledWith(
-      'updater:status',
-      expect.objectContaining({ state: 'not-available' })
-    )
-  })
-
-  it('never reaches the shared spies once the next test owns the clock', async () => {
-    vi.useFakeTimers()
-
-    // Why: real time past the settle delay — the abandoned instance would settle here and re-arm its
-    // 24h auto check on this test's fake clock at its epoch.
-    await sleep(SILENT_SETTLE_DELAY_MS + 300)
-    await vi.advanceTimersByTimeAsync(AUTO_UPDATE_CHECK_INTERVAL_MS)
-
-    expect(leakedStatusSend).not.toHaveBeenCalledWith(
-      'updater:status',
-      expect.objectContaining({ state: 'not-available' })
-    )
-    // Why: the generation fence stops at the autoUpdater spies; this one sits past it on the
-    // pinDefaultReleaseFeed chain that the stale instance's re-armed background check still reached.
-    expect(fetchNewerReleaseTagsMock).not.toHaveBeenCalled()
-    expect(autoUpdaterMock.checkForUpdates).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/main/usage/agent-token-usage-reporter.test.ts b/src/main/usage/agent-token-usage-reporter.test.ts
new file mode 100644
index 000000000000..8ecf487838c5
--- /dev/null
+++ b/src/main/usage/agent-token-usage-reporter.test.ts
@@ -0,0 +1,168 @@
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { agentTokenUsageSchema } from '../../shared/telemetry-agent-token-usage-schema'
+import { _enableTransportForTests, _setShuttingDownForTests } from '../telemetry/client'
+import {
+  cleanupTelemetryClientTest,
+  setupTelemetryClientTest,
+  type TelemetryClientTestState
+} from '../telemetry/client-test-harness'
+import { resetBurstCapsForSession } from '../telemetry/burst-cap'
+import { UsageCacheSnapshotWriter } from '../usage-cache-snapshot-writer'
+import { AgentTokenUsageReporter } from './agent-token-usage-reporter'
+
+const ID = '00000000-0000-4000-8000-000000000001'
+const row = {
+  providerSessionId: 'private-provider-session',
+  input_tokens: 100,
+  output_tokens: 20,
+  cached_input_tokens: 50,
+  cache_write_input_tokens: 10
+}
+let directory: string
+let file: string
+let telemetry: TelemetryClientTestState
+let reporters: AgentTokenUsageReporter[]
+const identity = vi.fn(async (ids: readonly string[]) => ids.map(() => ID))
+function reporter(): AgentTokenUsageReporter {
+  const instance = new AgentTokenUsageReporter(file, 'claude', identity)
+  reporters.push(instance)
+  return instance
+}
+function captures() {
+  return telemetry.mock.capture.mock.calls.map(([message]) => message.properties)
+}
+beforeEach(() => {
+  directory = mkdtempSync(join(tmpdir(), 'orca-token-usage-'))
+  file = join(directory, 'tokens.json')
+  telemetry = setupTelemetryClientTest()
+  reporters = []
+  identity.mockReset().mockImplementation(async (ids) => ids.map(() => ID))
+})
+afterEach(async () => {
+  await Promise.all(reporters.map((instance) => instance.flush()))
+  cleanupTelemetryClientTest(telemetry.envStash)
+  vi.restoreAllMocks()
+  rmSync(directory, { recursive: true, force: true })
+})
+
+describe('agent token usage', () => {
+  it('persists before capture, omits provider IDs, and retains revisions across restarts', async () => {
+    telemetry.mock.capture.mockImplementation(() => {
+      expect(JSON.parse(readFileSync(file, 'utf8')).snapshots[0].revision).toBeGreaterThan(0)
+    })
+    const original = reporter()
+    await original.report([row])
+    await original.report([row])
+    expect(captures()).toHaveLength(1)
+    expect(captures()[0]).toMatchObject({
+      analytics_session_id: ID,
+      revision: 1,
+      input_tokens: 100
+    })
+    expect(JSON.stringify(captures())).not.toContain(row.providerSessionId)
+    await original.report([{ ...row, input_tokens: 150 }])
+    expect(captures()[1]).toMatchObject({ revision: 2, input_tokens: 150 })
+    await reporter().report([{ ...row, input_tokens: 150 }])
+    expect(captures()[2]).toMatchObject({ revision: 2, input_tokens: 150 })
+    await reporter().report([{ ...row, input_tokens: 90 }])
+    expect(captures()[3]).toMatchObject({ revision: 3, input_tokens: 90 })
+  })
+
+  it.each(['opt-out', 'pending', 'environment', 'build', 'shutdown'])(
+    'does no identity or disk work for %s',
+    async (gate) => {
+      if (gate === 'opt-out' && telemetry.settings.telemetry) {
+        telemetry.settings.telemetry.optedIn = false
+      }
+      if (gate === 'pending' && telemetry.settings.telemetry) {
+        telemetry.settings.telemetry.optedIn = null
+      }
+      if (gate === 'environment') {
+        process.env.DO_NOT_TRACK = '1'
+      }
+      if (gate === 'build') {
+        _enableTransportForTests(false)
+      }
+      if (gate === 'shutdown') {
+        _setShuttingDownForTests(true)
+      }
+      await reporter().report([row])
+      expect(identity).not.toHaveBeenCalled()
+      expect(existsSync(file)).toBe(false)
+      expect(captures()).toEqual([])
+    }
+  )
+
+  it('rechecks consent after asynchronous identity persistence', async () => {
+    identity.mockImplementation(async (ids) => {
+      if (telemetry.settings.telemetry) {
+        telemetry.settings.telemetry.optedIn = false
+      }
+      return ids.map(() => ID)
+    })
+    await reporter().report([row])
+    expect(captures()).toEqual([])
+  })
+
+  it('resolves every session identity in one batch', async () => {
+    const second = '00000000-0000-4000-8000-000000000002'
+    identity.mockImplementation(async (ids) =>
+      ids.map((id) => (id === 'second-session' ? second : ID))
+    )
+    await reporter().report([
+      row,
+      { ...row, providerSessionId: 'invalid-session', input_tokens: -1 },
+      { ...row, providerSessionId: 'second-session', input_tokens: 7 }
+    ])
+    expect(identity).toHaveBeenCalledOnce()
+    expect(identity).toHaveBeenCalledWith([row.providerSessionId, 'second-session'])
+    expect(captures()).toEqual([
+      expect.objectContaining({ analytics_session_id: ID, input_tokens: 100 }),
+      expect.objectContaining({ analytics_session_id: second, input_tokens: 7 })
+    ])
+  })
+
+  it('does not publish a revision whose write failed and retries it', async () => {
+    const instance = reporter()
+    const write = vi
+      .spyOn(UsageCacheSnapshotWriter.prototype, 'write')
+      .mockRejectedValueOnce(new Error('disk full'))
+    await expect(instance.report([row])).rejects.toThrow('disk full')
+    expect(captures()).toEqual([])
+    write.mockRestore()
+    await instance.report([row])
+    expect(captures()[0]).toMatchObject({ revision: 1 })
+  })
+
+  it('retries rate-limited snapshots without incrementing their revision', async () => {
+    const instance = reporter()
+    for (let count = 1; count <= 31; count++) {
+      await instance.report([{ ...row, input_tokens: count }])
+    }
+    expect(captures()).toHaveLength(30)
+    resetBurstCapsForSession()
+    await instance.report([{ ...row, input_tokens: 31 }])
+    expect(captures().at(-1)).toMatchObject({ revision: 31, input_tokens: 31 })
+  })
+
+  it('rejects corrupt saved revisions without replacing them', async () => {
+    writeFileSync(file, '{broken')
+    await expect(reporter().report([row])).rejects.toThrow()
+    expect(readFileSync(file, 'utf8')).toBe('{broken')
+    expect(captures()).toEqual([])
+  })
+
+  it('rejects invalid counts and unexpected content fields', async () => {
+    await reporter().report([{ ...row, input_tokens: -1 }])
+    const payload = { ...row, analytics_session_id: ID, revision: 1, provider: 'claude' }
+    expect(agentTokenUsageSchema.safeParse(payload).success).toBe(false)
+    const { providerSessionId: _, ...valid } = payload
+    expect(agentTokenUsageSchema.safeParse(valid).success).toBe(true)
+    for (const field of ['prompt', 'path', 'model', 'activity_timestamp', 'estimated_cost']) {
+      expect(agentTokenUsageSchema.safeParse({ ...valid, [field]: 'private' }).success).toBe(false)
+    }
+  })
+})
diff --git a/src/main/usage/agent-token-usage-reporter.ts b/src/main/usage/agent-token-usage-reporter.ts
new file mode 100644
index 000000000000..12322f4eb552
--- /dev/null
+++ b/src/main/usage/agent-token-usage-reporter.ts
@@ -0,0 +1,123 @@
+import { readFile } from 'node:fs/promises'
+import { z } from 'zod'
+import {
+  agentTokenCountsSchema,
+  agentTokenUsageSchema,
+  type AgentTokenUsage
+} from '../../shared/telemetry-agent-token-usage-schema'
+import { isTelemetryEnabled, track } from '../telemetry/client'
+import { UsageCacheSnapshotWriter } from '../usage-cache-snapshot-writer'
+import type { AgentTokenSession } from './agent-token-usage'
+
+const stateSchema = z
+  .object({
+    schemaVersion: z.literal(1),
+    snapshots: z.array(agentTokenUsageSchema)
+  })
+  .strict()
+
+/** Cumulative snapshots: consumers select the highest revision per provider/session, never sum retries. */
+export class AgentTokenUsageReporter {
+  private snapshots: Map<string, AgentTokenUsage> | null = null
+  private readonly sent = new Map<string, number>()
+  private readonly writer: UsageCacheSnapshotWriter
+  private pending: Promise<void> = Promise.resolve()
+
+  constructor(
+    private readonly file: string,
+    private readonly provider: AgentTokenUsage['provider'],
+    private readonly getSessionIds: (providerSessionIds: readonly string[]) => Promise<string[]>
+  ) {
+    this.writer = new UsageCacheSnapshotWriter('[agent-token-usage]', () => file)
+  }
+
+  report(sessions: AgentTokenSession[]): Promise<void> {
+    const operation = this.pending.then(() => this.publish(sessions))
+    this.pending = operation.catch(() => {})
+    return operation
+  }
+
+  async flush(): Promise<void> {
+    await this.pending
+    await this.writer.flush()
+  }
+
+  private async publish(sessions: AgentTokenSession[]): Promise<void> {
+    if (!isTelemetryEnabled()) {
+      return
+    }
+    const rows = sessions.flatMap(({ providerSessionId, ...counts }) => {
+      const parsed = agentTokenCountsSchema.safeParse(counts)
+      return parsed.success ? [{ providerSessionId, counts: parsed.data }] : []
+    })
+    const ids = await this.getSessionIds(rows.map((row) => row.providerSessionId))
+    if (!isTelemetryEnabled()) {
+      return
+    }
+    const previous = this.snapshots ?? (await this.load())
+    const next = new Map(previous)
+    let changed = false
+    for (const [index, { counts }] of rows.entries()) {
+      const id = ids[index]
+      const existing = next.get(id)
+      if (
+        existing &&
+        existing.input_tokens === counts.input_tokens &&
+        existing.output_tokens === counts.output_tokens &&
+        existing.cached_input_tokens === counts.cached_input_tokens &&
+        existing.cache_write_input_tokens === counts.cache_write_input_tokens
+      ) {
+        continue
+      }
+      next.set(
+        id,
+        agentTokenUsageSchema.parse({
+          ...counts,
+          provider: this.provider,
+          analytics_session_id: id,
+          revision: (existing?.revision ?? 0) + 1
+        })
+      )
+      changed = true
+    }
+    // Persist revisions before capture so a restart can only retry the same snapshot or a newer one.
+    if (changed) {
+      await this.writer.write(() =>
+        JSON.stringify({ schemaVersion: 1, snapshots: [...next.values()] })
+      )
+    }
+    this.snapshots = next
+    for (const snapshot of next.values()) {
+      if (this.sent.get(snapshot.analytics_session_id) === snapshot.revision) {
+        continue
+      }
+      if (!track('agent_token_usage', snapshot)) {
+        break
+      }
+      this.sent.set(snapshot.analytics_session_id, snapshot.revision)
+    }
+  }
+
+  private async load(): Promise<Map<string, AgentTokenUsage>> {
+    let content: string
+    try {
+      content = await readFile(this.file, 'utf8')
+    } catch (error) {
+      if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
+        return new Map()
+      }
+      throw error
+    }
+    const state = stateSchema.parse(JSON.parse(content))
+    const snapshots = new Map(
+      state.snapshots.map((snapshot) => [snapshot.analytics_session_id, snapshot])
+    )
+    if (
+      snapshots.size !== state.snapshots.length ||
+      state.snapshots.some((snapshot) => snapshot.provider !== this.provider)
+    ) {
+      throw new Error('Invalid agent token usage state')
+    }
+    return snapshots
+  }
+}
diff --git a/src/main/usage/agent-token-usage.test.ts b/src/main/usage/agent-token-usage.test.ts
new file mode 100644
index 000000000000..e18c825212a6
--- /dev/null
+++ b/src/main/usage/agent-token-usage.test.ts
@@ -0,0 +1,117 @@
+import { describe, expect, it } from 'vitest'
+import type { ClaudeUsageSession } from '../claude-usage/types'
+import type { CodexUsageSession } from '../codex-usage/types'
+import type { OpenCodeUsageSession } from '../opencode-usage/types'
+import { claudeTokenSessions, codexOpenCodeTokenSessions } from './agent-token-usage'
+
+const claudeLocation = {
+  locationKey: '/private/path',
+  projectLabel: 'private-repo',
+  repoId: 'repo',
+  worktreeId: 'folder',
+  turnCount: 1,
+  inputTokens: 100,
+  outputTokens: 20,
+  cacheReadTokens: 30,
+  cacheWriteTokens: 10,
+  cacheWrite1hTokens: 5
+}
+const claude: ClaudeUsageSession = {
+  sessionId: 'session',
+  firstTimestamp: 'private-start',
+  lastTimestamp: 'private-end',
+  model: 'private-model',
+  lastCwd: '/private/path',
+  lastGitBranch: 'private-branch',
+  primaryWorktreeId: 'folder',
+  primaryRepoId: 'repo',
+  turnCount: 2,
+  totalInputTokens: 200,
+  totalOutputTokens: 40,
+  totalCacheReadTokens: 60,
+  totalCacheWriteTokens: 20,
+  totalCacheWrite1hTokens: 10,
+  locationBreakdown: [claudeLocation, { ...claudeLocation, worktreeId: null }]
+}
+const codexLocation = {
+  locationKey: '/private/path',
+  projectLabel: 'private-repo',
+  repoId: 'repo',
+  worktreeId: 'folder',
+  eventCount: 1,
+  inputTokens: 100,
+  cachedInputTokens: 30,
+  outputTokens: 20,
+  reasoningOutputTokens: 5,
+  totalTokens: 120,
+  hasInferredPricing: false,
+  longContextInputTokens: 0,
+  longContextCachedInputTokens: 0,
+  longContextOutputTokens: 0,
+  estimatedCostUsd: 1
+}
+const codex: CodexUsageSession = {
+  sessionId: 'session',
+  firstTimestamp: 'private-start',
+  lastTimestamp: 'private-end',
+  primaryModel: 'private-model',
+  hasMixedModels: false,
+  primaryProjectLabel: 'private-repo',
+  hasMixedLocations: true,
+  primaryWorktreeId: 'folder',
+  primaryRepoId: 'repo',
+  eventCount: 2,
+  totalInputTokens: 200,
+  totalCachedInputTokens: 60,
+  totalOutputTokens: 40,
+  totalReasoningOutputTokens: 10,
+  totalTokens: 240,
+  hasInferredPricing: false,
+  longContextInputTokens: 0,
+  longContextCachedInputTokens: 0,
+  longContextOutputTokens: 0,
+  locationBreakdown: [codexLocation, { ...codexLocation, worktreeId: null }],
+  modelBreakdown: [],
+  locationModelBreakdown: []
+}
+const opencode: OpenCodeUsageSession = {
+  ...codex,
+  estimatedCostUsd: 2,
+  locationBreakdown: [codexLocation, { ...codexLocation, worktreeId: null }],
+  modelBreakdown: [],
+  locationModelBreakdown: []
+}
+
+describe('Orca token projections', () => {
+  it('counts Claude cache writes once including the 1-hour subset and excludes outside usage', () => {
+    expect(claudeTokenSessions([claude])).toEqual([
+      {
+        providerSessionId: 'session',
+        input_tokens: 100,
+        output_tokens: 20,
+        cached_input_tokens: 30,
+        cache_write_input_tokens: 10
+      }
+    ])
+  })
+  it.each([codex, opencode])('separates cache reads from inclusive input counts', (session) => {
+    expect(codexOpenCodeTokenSessions([session])).toEqual([
+      {
+        providerSessionId: 'session',
+        input_tokens: 70,
+        output_tokens: 20,
+        cached_input_tokens: 30,
+        cache_write_input_tokens: 0
+      }
+    ])
+  })
+  it('does not fall back to unscoped session totals when attribution is missing', () => {
+    expect(claudeTokenSessions([{ ...claude, locationBreakdown: [] }])).toEqual([])
+    expect(codexOpenCodeTokenSessions([{ ...codex, locationBreakdown: [] }])).toEqual([])
+    expect(
+      codexOpenCodeTokenSessions([
+        { ...codex, locationBreakdown: [{ ...codexLocation, worktreeId: null }] }
+      ])
+    ).toEqual([])
+  })
+})
diff --git a/src/main/usage/agent-token-usage.ts b/src/main/usage/agent-token-usage.ts
new file mode 100644
index 000000000000..36cada6cf01f
--- /dev/null
+++ b/src/main/usage/agent-token-usage.ts
@@ -0,0 +1,48 @@
+import type { AgentTokenCounts } from '../../shared/telemetry-agent-token-usage-schema'
+import type { ClaudeUsageSession } from '../claude-usage/types'
+import type { CodexUsageSession } from '../codex-usage/types'
+import type { OpenCodeUsageSession } from '../opencode-usage/types'
+
+export type AgentTokenSession = AgentTokenCounts & { providerSessionId: string }
+
+export function claudeTokenSessions(sessions: ClaudeUsageSession[]): AgentTokenSession[] {
+  return sessions.flatMap((session) => {
+    const locations = session.locationBreakdown.filter((entry) => entry.worktreeId !== null)
+    if (locations.length === 0) {
+      return []
+    }
+    return [
+      {
+        providerSessionId: session.sessionId,
+        input_tokens: locations.reduce((sum, entry) => sum + entry.inputTokens, 0),
+        output_tokens: locations.reduce((sum, entry) => sum + entry.outputTokens, 0),
+        cached_input_tokens: locations.reduce((sum, entry) => sum + entry.cacheReadTokens, 0),
+        cache_write_input_tokens: locations.reduce((sum, entry) => sum + entry.cacheWriteTokens, 0)
+      }
+    ]
+  })
+}
+
+export function codexOpenCodeTokenSessions(
+  sessions: (CodexUsageSession | OpenCodeUsageSession)[]
+): AgentTokenSession[] {
+  return sessions.flatMap((session) => {
+    const locations = session.locationBreakdown.filter((entry) => entry.worktreeId !== null)
+    if (locations.length === 0) {
+      return []
+    }
+    return [
+      {
+        providerSessionId: session.sessionId,
+        // Codex/OpenCode include cache hits in input; Claude records them separately.
+        input_tokens: locations.reduce(
+          (sum, entry) => sum + entry.inputTokens - entry.cachedInputTokens,
+          0
+        ),
+        output_tokens: locations.reduce((sum, entry) => sum + entry.outputTokens, 0),
+        cached_input_tokens: locations.reduce((sum, entry) => sum + entry.cachedInputTokens, 0),
+        cache_write_input_tokens: 0
+      }
+    ]
+  })
+}
diff --git a/src/main/usage/analytics-session-id-store.test.ts b/src/main/usage/analytics-session-id-store.test.ts
new file mode 100644
index 000000000000..02cd747104aa
--- /dev/null
+++ b/src/main/usage/analytics-session-id-store.test.ts
@@ -0,0 +1,218 @@
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import type * as FsPromises from 'node:fs/promises'
+import { join } from 'node:path'
+import { tmpdir } from 'node:os'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { UsageCacheSnapshotWriter } from '../usage-cache-snapshot-writer'
+import { AnalyticsSessionIdStore } from './analytics-session-id-store'
+
+type WriteGate = { entered: (() => void) | null; wait: Promise<void> | null; fail: boolean }
+
+const { writeGate } = vi.hoisted((): { writeGate: WriteGate } => ({
+  writeGate: {
+    entered: null,
+    wait: null,
+    fail: false
+  }
+}))
+vi.mock('node:fs/promises', async () => {
+  const actual = await vi.importActual<typeof FsPromises>('node:fs/promises')
+  return {
+    ...actual,
+    open: async (...args: Parameters<typeof actual.open>) => {
+      if (args[1] === 'w') {
+        writeGate.entered?.()
+        if (writeGate.wait) {
+          await writeGate.wait
+        }
+        if (writeGate.fail) {
+          throw new Error('simulated disk failure')
+        }
+      }
+      return actual.open(...args)
+    }
+  }
+})
+
+const UUID_V4 = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/
+let directory: string
+let file: string
+let stores: AnalyticsSessionIdStore[]
+/** Registers every instance for flush-before-cleanup, including simulated restarts. */
+function createStore(path = file): AnalyticsSessionIdStore {
+  const store = new AnalyticsSessionIdStore(path)
+  stores.push(store)
+  return store
+}
+async function idFor(store: AnalyticsSessionIdStore, key: string) {
+  const [id] = await store.getOrCreate([key])
+  return id
+}
+beforeEach(() => {
+  directory = mkdtempSync(join(tmpdir(), 'orca-analytics-session-id-'))
+  file = join(directory, 'identities.json')
+  stores = []
+  writeGate.entered = null
+  writeGate.wait = null
+  writeGate.fail = false
+})
+afterEach(async () => {
+  await Promise.all(stores.map((store) => store.flush()))
+  rmSync(directory, { recursive: true, force: true })
+  vi.restoreAllMocks()
+})
+
+describe('AnalyticsSessionIdStore', () => {
+  it('is lazy and persists a random ID before returning it', async () => {
+    const store = createStore()
+    expect(existsSync(file)).toBe(false)
+    const id = await idFor(store, 'provider-session-123')
+    expect(id).toMatch(UUID_V4)
+    expect(id).not.toContain('provider-session')
+    expect(JSON.parse(readFileSync(file, 'utf8'))).toEqual({
+      schemaVersion: 1,
+      entries: [['provider-session-123', id]]
+    })
+    expect(await idFor(store, 'provider-session-123')).toBe(id)
+  })
+
+  it('persists a batch with one durable write and returns IDs in input order', async () => {
+    const store = createStore()
+    const [known] = await store.getOrCreate(['known'])
+    const write = vi.spyOn(UsageCacheSnapshotWriter.prototype, 'write')
+    const ids = await store.getOrCreate(['a', 'known', 'b', 'a'])
+    expect(write).toHaveBeenCalledOnce()
+    expect(ids[1]).toBe(known)
+    expect(ids[3]).toBe(ids[0])
+    expect(new Set(ids).size).toBe(3)
+    expect(await createStore().getOrCreate(['b', 'a', 'known'])).toEqual([ids[2], ids[0], known])
+    await store.getOrCreate(['known', 'a', 'b'])
+    expect(write).toHaveBeenCalledOnce()
+  })
+
+  it('restores the ID after a restart or session resume', async () => {
+    const original = createStore()
+    const id = await idFor(original, 'resumed-session')
+    await original.flush()
+    expect(await idFor(createStore(), 'resumed-session')).toBe(id)
+  })
+
+  it('handles concurrent requests for the same and different sessions without lost writes', async () => {
+    const store = createStore()
+    const ids = await Promise.all(
+      Array.from({ length: 20 }, (_, index) => idFor(store, `session-${index % 10}`))
+    )
+    expect(new Set(ids).size).toBe(10)
+    expect(ids.slice(0, 10)).toEqual(ids.slice(10))
+    const restored = createStore()
+    for (let index = 0; index < 10; index++) {
+      expect(await idFor(restored, `session-${index}`)).toBe(ids[index])
+    }
+  })
+
+  it('isolates identical provider session IDs across provider and host/profile files', async () => {
+    const ids = await Promise.all([
+      idFor(createStore(join(directory, 'host-a', 'claude.json')), 'same-session'),
+      idFor(createStore(join(directory, 'host-a', 'codex.json')), 'same-session'),
+      idFor(createStore(join(directory, 'host-b', 'claude.json')), 'same-session')
+    ])
+    expect(new Set(ids).size).toBe(3)
+  })
+
+  it.each(['', '   ', 'x'.repeat(1025)])(
+    'rejects a batch with an invalid key without minting any ID',
+    async (key) => {
+      await expect(createStore().getOrCreate(['valid', key])).rejects.toThrow(
+        'Invalid provider session ID'
+      )
+      expect(existsSync(file)).toBe(false)
+    }
+  )
+
+  it('handles prototype names and delimiter characters as ordinary opaque keys', async () => {
+    const store = createStore()
+    const keys = ['__proto__', 'constructor', 'a::b/c', 'a/b::c']
+    const ids = await Promise.all(keys.map((key) => idFor(store, key)))
+    expect(new Set(ids).size).toBe(keys.length)
+    const restored = createStore()
+    expect(await Promise.all(keys.map((key) => idFor(restored, key)))).toEqual(ids)
+  })
+
+  it.each([
+    '{broken',
+    JSON.stringify({ schemaVersion: 2, entries: [] }),
+    JSON.stringify({ schemaVersion: 1, entries: [['session', 'provider-id']] }),
+    JSON.stringify({ schemaVersion: 1, entries: [], extra: 'secret' })
+  ])('fails closed on invalid persisted state without overwriting it', async (content) => {
+    writeFileSync(file, content)
+    await expect(idFor(createStore(), 'new-session')).rejects.toThrow(
+      'Invalid analytics session identity file'
+    )
+    expect(readFileSync(file, 'utf8')).toBe(content)
+  })
+
+  it('rejects conflicting provider keys and analytics IDs', async () => {
+    const first = '00000000-0000-4000-8000-000000000001'
+    const second = '00000000-0000-4000-8000-000000000002'
+    for (const entries of [
+      [
+        ['a', first],
+        ['a', second]
+      ],
+      [
+        ['a', first],
+        ['b', first]
+      ]
+    ]) {
+      writeFileSync(file, JSON.stringify({ schemaVersion: 1, entries }))
+      await expect(idFor(createStore(), 'new-session')).rejects.toThrow(
+        'Duplicate analytics session identity'
+      )
+    }
+  })
+
+  it('keeps all callers and shutdown waiting until the ID write completes', async () => {
+    let release!: () => void
+    let entered!: () => void
+    writeGate.wait = new Promise<void>((resolve) => {
+      release = resolve
+    })
+    const writing = new Promise<void>((resolve) => {
+      entered = resolve
+    })
+    writeGate.entered = entered
+    const store = createStore()
+    let resolved = false
+    let flushed = false
+    const first = idFor(store, 'session').then((id) => {
+      resolved = true
+      return id
+    })
+    await writing
+    const second = idFor(store, 'session')
+    const flush = store.flush().then(() => {
+      flushed = true
+    })
+    try {
+      await Promise.resolve()
+      expect(resolved).toBe(false)
+      expect(flushed).toBe(false)
+    } finally {
+      release()
+    }
+    expect(await first).toBe(await second)
+    await flush
+    expect(flushed).toBe(true)
+  })
+
+  it('does not return an unpersisted ID on write failure and allows retry', async () => {
+    vi.spyOn(console, 'error').mockImplementation(() => {})
+    const store = createStore()
+    writeGate.fail = true
+    await expect(idFor(store, 'session')).rejects.toThrow('simulated disk failure')
+    expect(existsSync(file)).toBe(false)
+    writeGate.fail = false
+    const id = await idFor(store, 'session')
+    expect(await idFor(createStore(), 'session')).toBe(id)
+  })
+})
diff --git a/src/main/usage/analytics-session-id-store.ts b/src/main/usage/analytics-session-id-store.ts
new file mode 100644
index 000000000000..1624732b131b
--- /dev/null
+++ b/src/main/usage/analytics-session-id-store.ts
@@ -0,0 +1,94 @@
+import { randomUUID } from 'node:crypto'
+import { readFile } from 'node:fs/promises'
+import { z } from 'zod'
+import { UsageCacheSnapshotWriter } from '../usage-cache-snapshot-writer'
+
+const providerSessionIdSchema = z
+  .string()
+  .min(1)
+  .max(1024)
+  .refine((id) => id.trim().length > 0)
+const analyticsSessionIdSchema = z.uuidv4().brand<'AnalyticsSessionId'>()
+export type AnalyticsSessionId = z.infer<typeof analyticsSessionIdSchema>
+const identityFileSchema = z
+  .object({
+    schemaVersion: z.literal(1),
+    entries: z.array(z.tuple([providerSessionIdSchema, analyticsSessionIdSchema]))
+  })
+  .strict()
+
+/** One owner per file, scoped to a provider's usage store on its execution host. */
+export class AnalyticsSessionIdStore {
+  private identities: Map<string, AnalyticsSessionId> | null = null
+  private pending: Promise<void> = Promise.resolve()
+  private writer: UsageCacheSnapshotWriter | null = null
+
+  constructor(private readonly file: string) {}
+
+  /** IDs in input order; resolves only after persistence succeeds, so an uploaded ID survives a restart. */
+  async getOrCreate(providerSessionIds: readonly string[]): Promise<AnalyticsSessionId[]> {
+    if (providerSessionIds.some((id) => !providerSessionIdSchema.safeParse(id).success)) {
+      throw new Error('Invalid provider session ID')
+    }
+    if (providerSessionIds.length === 0) {
+      return []
+    }
+    // Serialize reads as well as writes so no caller sees an ID before it is durable.
+    const operation = this.pending.then(async () => {
+      const identities = this.identities ?? (await this.load())
+      this.identities = identities
+      const updated = new Map(identities)
+      const ids = providerSessionIds.map((providerSessionId) => {
+        const id = updated.get(providerSessionId) ?? analyticsSessionIdSchema.parse(randomUUID())
+        updated.set(providerSessionId, id)
+        return id
+      })
+      // One durable write per batch: a first scan of N sessions must not rewrite the file N times.
+      if (updated.size > identities.size) {
+        this.writer ??= new UsageCacheSnapshotWriter('[analytics-session-id]', () => this.file)
+        await this.writer.write(() => JSON.stringify({ schemaVersion: 1, entries: [...updated] }))
+        this.identities = updated
+      }
+      return ids
+    })
+    this.pending = operation.then(
+      () => {},
+      () => {}
+    )
+    return operation
+  }
+
+  /** Includes queued lookups that have not reached the durable writer yet. */
+  async flush(): Promise<void> {
+    await this.pending
+    await this.writer?.flush()
+  }
+
+  private async load(): Promise<Map<string, AnalyticsSessionId>> {
+    let content: string
+    try {
+      content = await readFile(this.file, 'utf8')
+    } catch (error) {
+      if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
+        return new Map()
+      }
+      throw error
+    }
+    let raw: unknown
+    try {
+      raw = JSON.parse(content)
+    } catch {
+      throw new Error('Invalid analytics session identity file')
+    }
+    const parsed = identityFileSchema.safeParse(raw)
+    if (!parsed.success) {
+      throw new Error('Invalid analytics session identity file')
+    }
+    const identities = new Map(parsed.data.entries)
+    const analyticsIds = new Set(parsed.data.entries.map(([, id]) => id))
+    if (identities.size !== parsed.data.entries.length || analyticsIds.size !== identities.size) {
+      throw new Error('Duplicate analytics session identity')
+    }
+    return identities
+  }
+}
diff --git a/src/main/usage/usage-provider-store-lifecycle.test.ts b/src/main/usage/usage-provider-store-lifecycle.test.ts
index 02a5571363dc..cef33bf6d896 100644
--- a/src/main/usage/usage-provider-store-lifecycle.test.ts
+++ b/src/main/usage/usage-provider-store-lifecycle.test.ts
@@ -1,3 +1,7 @@
+import {
+  setupTelemetryClientTest,
+  cleanupTelemetryClientTest
+} from '../telemetry/client-test-harness'
 import { existsSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs'
 import type * as FsPromises from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -106,6 +110,17 @@ class TestUsageStore extends UsageProviderStoreLifecycle<
         getAllWorktreeMeta: () => ({})
       },
       {
+        tokenUsage: {
+          provider: 'claude',
+          selectSessions: (state) =>
+            state.sessions.map((session) => ({
+              providerSessionId: session.id,
+              input_tokens: 10,
+              output_tokens: 2,
+              cached_input_tokens: 3,
+              cache_write_input_tokens: 1
+            }))
+        },
         logTag: '[test-usage]',
         resolveCacheFile: () => cacheFile,
         createDefaultState: makeState,
@@ -156,6 +171,77 @@ describe('UsageProviderStoreLifecycle', () => {
     vi.restoreAllMocks()
   })
 
+  it('reports enabled scans and preserves revisions when the usage cache is rebuilt', async () => {
+    const telemetry = setupTelemetryClientTest()
+    try {
+      const cacheFile = join(tempDirectory, 'provider.json')
+      scan.mockResolvedValue({ ...emptyScanResult(), sessions: [{ id: 'provider-session' }] })
+      const original = createStore(cacheFile)
+      await original.refresh(true)
+      expect(telemetry.mock.capture).not.toHaveBeenCalled()
+      await original.setEnabled(true)
+      await original.refresh(true)
+      const first = telemetry.mock.capture.mock.calls[0]?.[0]
+      expect(first).toMatchObject({
+        event: 'agent_token_usage',
+        properties: { revision: 1, input_tokens: 10 }
+      })
+      await original.flush()
+      rmSync(cacheFile)
+      const rebuilt = createStore(cacheFile)
+      await rebuilt.setEnabled(true)
+      await rebuilt.refresh(true)
+      expect(telemetry.mock.capture.mock.calls[1]?.[0]).toEqual(first)
+    } finally {
+      cleanupTelemetryClientTest(telemetry.envStash)
+    }
+  })
+
+  it('persists identities for a whole first scan with one write', async () => {
+    const telemetry = setupTelemetryClientTest()
+    try {
+      const sessions = Array.from({ length: 20 }, (_, index) => ({ id: `session-${index}` }))
+      scan.mockResolvedValue({ ...emptyScanResult(), sessions })
+      const store = createStore(join(tempDirectory, 'provider.json'))
+      await store.setEnabled(true)
+      writeProbe.opens = 0
+      await store.refresh(true)
+      // Usage cache, identity file, and token-usage snapshot: one write each.
+      expect(writeProbe.opens).toBe(3)
+      expect(telemetry.mock.capture).toHaveBeenCalledTimes(sessions.length)
+    } finally {
+      cleanupTelemetryClientTest(telemetry.envStash)
+    }
+  })
+
+  it('keeps analytics identity separate from usage cache rebuilds and never puts it in snapshots', async () => {
+    const cacheFile = join(tempDirectory, 'provider.json')
+    const identityFile = join(tempDirectory, 'provider-analytics-session-ids.json')
+    const original = createStore(cacheFile)
+    expect(existsSync(identityFile)).toBe(false)
+    const [id] = await original.getAnalyticsSessionIds(['provider-session'])
+    expect(existsSync(identityFile)).toBe(true)
+    await original.setEnabled(true)
+    await original.refresh(true)
+    await original.flush()
+    expect(JSON.stringify(original.getState())).not.toContain(id)
+    expect(readFileSync(cacheFile, 'utf8')).not.toContain(id)
+    rmSync(cacheFile)
+    const rebuilt = createStore(cacheFile)
+    expect(await rebuilt.getAnalyticsSessionIds(['provider-session'])).toEqual([id])
+    expect(await createStore().getAnalyticsSessionIds(['provider-session'])).not.toEqual([id])
+  })
+
+  it('flush waits for queued analytics identity creation', async () => {
+    const store = createStore()
+    const identity = store.getAnalyticsSessionIds(['session'])
+    await store.flush()
+    const [id] = await identity
+    expect(
+      readFileSync(join(tempDirectory, 'usage-0-analytics-session-ids.json'), 'utf8')
+    ).toContain(id)
+  })
+
   it('skips disabled and fresh matching states', async () => {
     const store = createStore()
 
diff --git a/src/main/usage/usage-provider-store-lifecycle.ts b/src/main/usage/usage-provider-store-lifecycle.ts
index 850d9e61bda9..550f79e3ce58 100644
--- a/src/main/usage/usage-provider-store-lifecycle.ts
+++ b/src/main/usage/usage-provider-store-lifecycle.ts
@@ -1,4 +1,10 @@
 import { existsSync, readFileSync } from 'node:fs'
+import { AgentTokenUsageReporter } from './agent-token-usage-reporter'
+import type { AgentTokenSession } from './agent-token-usage'
+import type { AgentTokenUsage } from '../../shared/telemetry-agent-token-usage-schema'
+import { isTelemetryEnabled } from '../telemetry/client'
+import { join, parse } from 'node:path'
+import { AnalyticsSessionIdStore, type AnalyticsSessionId } from './analytics-session-id-store'
 import type { Store } from '../persistence'
 import { UsageCacheSnapshotWriter } from '../usage-cache-snapshot-writer'
 import { loadKnownUsageWorktreesByRepo } from '../usage-worktree-metadata'
@@ -38,6 +44,10 @@ type UsageProviderStoreLifecycleConfig<
   sourceKey: SourceKey
   dataPresenceKey: DataPresenceKey
   jsonIndent?: number
+  tokenUsage?: {
+    provider: AgentTokenUsage['provider']
+    selectSessions: (state: State) => AgentTokenSession[]
+  }
   scan: (
     worktrees: UsageScanWorktreeRef[],
     previous: State[SourceKey]
@@ -55,6 +65,8 @@ export abstract class UsageProviderStoreLifecycle<
 > {
   protected state: State
   private scanPromise: Promise<void> | null = null
+  private tokenReporter: AgentTokenUsageReporter | null = null
+  private analyticsSessionIds: AnalyticsSessionIdStore | null = null
   private readonly writer: UsageCacheSnapshotWriter
 
   constructor(
@@ -74,9 +86,21 @@ export abstract class UsageProviderStoreLifecycle<
     } as PublicUsageProviderScanState<DataPresenceKey>
   }
 
+  /** Local identity only; callers must use the usage store on the execution host. */
+  getAnalyticsSessionIds(providerSessionIds: readonly string[]): Promise<AnalyticsSessionId[]> {
+    if (!this.analyticsSessionIds) {
+      const { dir, name } = parse(this.config.resolveCacheFile())
+      this.analyticsSessionIds = new AnalyticsSessionIdStore(
+        join(dir, `${name}-analytics-session-ids.json`)
+      )
+    }
+    return this.analyticsSessionIds.getOrCreate(providerSessionIds)
+  }
+
   /** Await queued cache writes so quit does not drop the final snapshot. */
-  flush(): Promise<void> {
-    return this.writer.flush()
+  async flush(): Promise<void> {
+    await this.tokenReporter?.flush()
+    await Promise.all([this.writer.flush(), this.analyticsSessionIds?.flush()])
   }
 
   async setEnabled(enabled: boolean): Promise<PublicUsageProviderScanState<DataPresenceKey>> {
@@ -152,6 +176,7 @@ export abstract class UsageProviderStoreLifecycle<
         this.state.scanState.lastScanError = null
         // Persistence failures do not turn a successful source scan into a scan failure.
         await this.writeToDisk().catch(() => {})
+        await this.reportTokenUsage()
       } catch (error) {
         this.state.scanState.lastScanError = error instanceof Error ? error.message : String(error)
         await this.writeToDisk().catch(() => {})
@@ -163,6 +188,29 @@ export abstract class UsageProviderStoreLifecycle<
     await this.scanPromise
   }
 
+  private async reportTokenUsage(): Promise<void> {
+    const config = this.config.tokenUsage
+    if (!config || !isTelemetryEnabled() || !this.state.scanState.enabled) {
+      return
+    }
+    try {
+      if (!this.tokenReporter) {
+        const { dir, name } = parse(this.config.resolveCacheFile())
+        this.tokenReporter = new AgentTokenUsageReporter(
+          join(dir, `${name}-token-usage.json`),
+          config.provider,
+          (ids) => this.getAnalyticsSessionIds(ids)
+        )
+      }
+      await this.tokenReporter.report(config.selectSessions(this.state))
+    } catch {
+      // Reporting failures must not invalidate a successful local usage scan.
+      console.warn(
+        '[agent-token-usage] Could not report token usage; will retry after the next scan'
+      )
+    }
+  }
+
   private async getCurrentWorktreeFingerprint(): Promise<string> {
     const repos = this.store.getRepos()
     return getUsageWorktreeFingerprint(loadKnownUsageWorktreesByRepo(this.store, repos))
diff --git a/src/main/usage/usage-scan-worker-client.test.ts b/src/main/usage/usage-scan-worker-client.test.ts
index 7b34b5a80f4e..09c6f378f007 100644
--- a/src/main/usage/usage-scan-worker-client.test.ts
+++ b/src/main/usage/usage-scan-worker-client.test.ts
@@ -1,4 +1,3 @@
-import { readFileSync } from 'node:fs'
 import { join, sep } from 'node:path'
 import { describe, expect, it, vi } from 'vitest'
 import { resolveWorkerThreadEntryPath } from '../worker-thread-entry-path'
@@ -235,16 +234,4 @@ describe('usage scan worker entry path', () => {
       USAGE_SCAN_WORKER_ENTRY_FILENAME
     ])
   })
-
-  // A rename in the build config would leave both branches pointing at a file
-  // that is never emitted, and only the packaged one fails silently.
-  it('names the entry the main build actually emits', () => {
-    const config = readFileSync(
-      join(import.meta.dirname, '..', '..', '..', 'electron.vite.config.ts'),
-      'utf8'
-    )
-
-    expect(USAGE_SCAN_WORKER_ENTRY_FILENAME).toBe('usage-scan-worker-entry.js')
-    expect(config).toContain("'usage-scan-worker-entry': resolve(")
-  })
 })
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
index 78c5f2ec4263..142389099c0f 100644
--- a/src/main/window/runtime-window-lifecycle.ts
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -198,7 +198,8 @@ export function registerRuntimeWindowLifecycle(
         baseVersion,
         content
       }) as Promise<RuntimeMarkdownSaveTabResult>,
-    closeTerminal: (tabId, paneRuntimeId) => send('ui:closeTerminal', { tabId, paneRuntimeId }),
+    closeTerminal: (tabId) => send('ui:closeTerminal', { kind: 'tab', tabId }),
+    closeTerminalPane: (tabId, leafId) => send('ui:closeTerminal', { kind: 'pane', tabId, leafId }),
     closeTerminalTab: (tabId, options) =>
       requestTerminalTabCloseFromRenderer(mainWindow, tabId, options),
     sleepWorktree: (worktreeId) => send('ui:sleepWorktree', { worktreeId }),
diff --git a/src/main/windows/windows-msys-job.win32.test.ts b/src/main/windows/windows-msys-job.win32.test.ts
index e7e0bee950a0..9bf5485102e9 100644
--- a/src/main/windows/windows-msys-job.win32.test.ts
+++ b/src/main/windows/windows-msys-job.win32.test.ts
@@ -37,8 +37,12 @@ describeOnWindows('MSYS terminal job ownership', () => {
     })
     let output = ''
     let childPid: number | undefined
+    let exit: { exitCode: number; signal?: number } | undefined
+    proc.onExit((event) => {
+      exit = event
+    })
     proc.onData((chunk) => {
-      output += chunk
+      output = (output + chunk).slice(-32_768)
       const match = /MSYS_OWNED_CHILD=(\d+)/.exec(output)
       if (match) {
         childPid = Number(match[1])
@@ -48,7 +52,14 @@ describeOnWindows('MSYS terminal job ownership', () => {
       proc.write(
         `${quotePosixShell(process.execPath.replace(/\\/g, '/'))} ${quotePosixShell(script.replace(/\\/g, '/'))}\r`
       )
-      await vi.waitFor(() => expect(childPid).toBeDefined(), { timeout: 15_000 })
+      try {
+        await vi.waitFor(() => expect(childPid).toBeDefined(), { timeout: 15_000 })
+      } catch (cause) {
+        throw new Error(
+          JSON.stringify({ shellPid: proc.pid, exit, jobPids: listPtyJobProcessIds(proc), output }),
+          { cause }
+        )
+      }
       expect(isAlive(childPid!)).toBe(true)
       expect(listPtyJobProcessIds(proc)).toContain(childPid)
       expect(terminatePtyJob(proc)).toBe('terminated')
diff --git a/src/main/windows/windows-process-table.test.ts b/src/main/windows/windows-process-table.test.ts
index 16c411ceb717..959a0092ff05 100644
--- a/src/main/windows/windows-process-table.test.ts
+++ b/src/main/windows/windows-process-table.test.ts
@@ -481,6 +481,29 @@ describe('PowerShell fallback when the native binding is absent', () => {
     expect(cimScan).not.toHaveBeenCalled()
   })
 
+  it('says so in the log, once, rather than falling back silently', async () => {
+    // #16905 was this path running as the daemon's steady state with nothing to
+    // notice it. Absence is legitimate on a relay; being quiet about it is not.
+    const fallbackWarnings = (): number =>
+      warn.mock.calls.filter((call) =>
+        String(call[0]).includes('falling back to a powershell.exe CIM scan')
+      ).length
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    __setWindowsProcessTreeLoaderForTests(() => null)
+
+    await readWindowsProcessTableFresh()
+    await readWindowsProcessTableFresh()
+    expect(fallbackWarnings()).toBe(1)
+
+    // Re-injecting resets the reader, so the next process-equivalent warns again.
+    // Asserting only the first count passes even with that reset removed, as long
+    // as an earlier test in this file happened to trip the fallback first.
+    __setWindowsProcessTreeLoaderForTests(() => null)
+    await readWindowsProcessTableFresh()
+    expect(fallbackWarnings()).toBe(2)
+    warn.mockRestore()
+  })
+
   it('rejects a scan missing our own pid instead of reporting an idle machine', async () => {
     __setWindowsProcessTreeLoaderForTests(() => null)
     cimScan.mockResolvedValue([{ pid: 200, ppid: 4, name: 'claude.exe', command: 'claude' }])
diff --git a/src/main/windows/windows-process-table.ts b/src/main/windows/windows-process-table.ts
index 30d9bc8ee7b9..20f1ca000c24 100644
--- a/src/main/windows/windows-process-table.ts
+++ b/src/main/windows/windows-process-table.ts
@@ -170,6 +170,13 @@ function stagedRelayAddonIsUnpatched(): boolean {
   }
 }
 
+/**
+ * Once per process, for the main and relay processes whose console is real. The
+ * daemon's stderr is destroyed once it reports ready, so it logs this capability
+ * to daemonLog at startup instead (daemon-entry.ts).
+ */
+let warnedAboutCimFallback = false
+
 let cachedModule: WindowsProcessTreeModule | null | undefined
 let moduleLoader: () => WindowsProcessTreeModule | null = loadWindowsProcessTree
 let cimScan: () => Promise<WindowsProcessRow[]> = readWindowsProcessRowsWithCim
@@ -296,6 +303,7 @@ let nativeReadGate: Promise<unknown> = Promise.resolve()
 
 function resetNativeReaderState(): void {
   nativeReaderEpoch += 1
+  warnedAboutCimFallback = false
   unreturnedReads.clear()
   // Chain, never replace. Dropping the old chain lets a waiter still holding it
   // run against a read queued on the new one -- two concurrent calls into one
@@ -370,6 +378,12 @@ function readOneSnapshot<Row>(projection: ProcessRowProjection<Row>): Promise<Ro
       // never silently start forking shells at the caller's poll rate. Absence
       // is the one condition that can never resolve itself — see
       // docs/reference/windows-process-enumeration.md.
+      if (!warnedAboutCimFallback) {
+        warnedAboutCimFallback = true
+        console.warn(
+          '[windows-process-table] no native binding; falling back to a powershell.exe CIM scan at each caller poll. See docs/reference/windows-process-enumeration.md.'
+        )
+      }
       return projection.cimFallback()
     }
     // Reject rather than resolve empty: an empty table is a claim that nothing
diff --git a/src/main/windows/windows-pty-job.win32.test.ts b/src/main/windows/windows-pty-job.win32.test.ts
index c5f408f73115..cb15463bff85 100644
--- a/src/main/windows/windows-pty-job.win32.test.ts
+++ b/src/main/windows/windows-pty-job.win32.test.ts
@@ -3,6 +3,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { IPty } from 'node-pty'
+import { runProcess } from '../../shared/child-process/run-process'
 import {
   isPtyJobOwnershipAvailable,
   listPtyJobProcessIds,
@@ -102,6 +103,21 @@ describeOnWindows('ConPTY job ownership', () => {
     expect(isPtyJobOwnershipAvailable()).toBe(true)
   })
 
+  it('keeps the native table intact while shell cleanup overlaps new terminals', async () => {
+    const result = await runProcess({
+      program: process.execPath,
+      args: [join(process.cwd(), 'config', 'scripts', 'windows-pty-table-stress.cjs')],
+      env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' },
+      timeoutMs: 90_000
+    })
+    const status = result.code === null ? 'null' : `0x${(result.code >>> 0).toString(16)}`
+    expect(
+      result,
+      `Native host exited ${status} (${result.signal}); timedOut=${result.timedOut}\n${result.stdout}\n${result.stderr}`
+    ).toMatchObject({ code: 0, timedOut: false })
+    expect(result.stdout).toContain('"phase":"complete"')
+  }, 100_000)
+
   it('counts a detached grandchild as part of the pane tree', async () => {
     const { proc, grandchildPid } = await spawnShellWithDetachedGrandchild()
 
diff --git a/src/main/zsh-startup-wrapper-builder.ts b/src/main/zsh-startup-wrapper-builder.ts
index 49f706e57417..4fb4f8d01cf2 100644
--- a/src/main/zsh-startup-wrapper-builder.ts
+++ b/src/main/zsh-startup-wrapper-builder.ts
@@ -28,7 +28,7 @@
  */
 import { getPosixOmpShellWrapper } from './pty/omp-shell-wrapper'
 import { WSL_MANAGED_CLI_PATH_RESTORE } from './wsl-managed-cli-path-restore'
-import { getPosixCodexShellLaunchPreflight } from './pty/codex-shell-launch-preflight'
+import { getPosixCodexShellLaunchPreflight } from '../shared/codex-shell-function'
 import {
   getZshShellReadyMarkerRegistrationBlock,
   SHELL_STARTUP_IDENTITY_MARKER_BLOCK,
@@ -47,8 +47,6 @@ export type ZshWrapperRestoreSpec = {
   remoteCliBinDir: boolean
   /** Orca's runtime CODEX_HOME. */
   codexHome: boolean
-  /** The `codex()` wrapper that runs Orca's launch preflight. */
-  codexLaunchPreflight: boolean
 }
 
 export type ZshStartupHookSpec = {
@@ -127,8 +125,7 @@ function getOverlayRestoreBlocks(spec: ZshStartupHookSpec): (string | null)[] {
     MIMOCODE_HOME_RESTORE,
     spec.restores.remoteCliBinDir ? REMOTE_CLI_BIN_DIR_RESTORE : null,
     getPosixOmpShellWrapper(),
-    spec.restores.codexHome ? CODEX_HOME_RESTORE : null,
-    spec.restores.codexLaunchPreflight ? getPosixCodexShellLaunchPreflight() : null
+    spec.restores.codexHome ? CODEX_HOME_RESTORE : null
   ]
 }
 
@@ -175,6 +172,8 @@ ${permanentPrecmd}
 ${joinBlocks([
   spec.restores.managedWslCli ? indentBlock(WSL_MANAGED_CLI_PATH_RESTORE, '  ') : null,
   featureGuard('overlay', getOverlayRestoreBlocks(spec)),
+  // Why outside the overlay guard: a system-default Codex home carries no overlay key.
+  indentBlock(getPosixCodexShellLaunchPreflight(), '  ').replace(/\n$/, ''),
   // Why no /etc/zshrc repair branch: ZDOTDIR was handed back before that file
   // ran, so the value it derives is the user's own path. #11044 is unreachable.
   `  if [[ -n "\${_orca_histfile:-}" ]]; then
diff --git a/src/preload/api/agent-status-api.ts b/src/preload/api/agent-status-api.ts
index 7c538a990f14..8cd8fb6a2517 100644
--- a/src/preload/api/agent-status-api.ts
+++ b/src/preload/api/agent-status-api.ts
@@ -50,7 +50,7 @@ export type AgentStatusApi = {
 
 export type AgentTrustApi = {
   markTrusted: (args: {
-    preset: 'cursor' | 'copilot' | 'codex' | 'antigravity'
+    preset: 'cursor' | 'copilot' | 'codex' | 'antigravity' | 'qoder'
     workspacePath: string
     connectionId?: string
   }) => Promise<void>
diff --git a/src/preload/api/agent-trust-bridge.ts b/src/preload/api/agent-trust-bridge.ts
index a9afa9c363df..9d87c62eb491 100644
--- a/src/preload/api/agent-trust-bridge.ts
+++ b/src/preload/api/agent-trust-bridge.ts
@@ -3,7 +3,7 @@ import type { PreloadApi } from '../api-types'
 
 export const agentTrustApi = {
   markTrusted: (args: {
-    preset: 'cursor' | 'copilot' | 'codex' | 'antigravity'
+    preset: 'cursor' | 'copilot' | 'codex' | 'antigravity' | 'qoder'
     workspacePath: string
     connectionId?: string
   }): Promise<void> => ipcRenderer.invoke('agentTrust:markTrusted', args)
diff --git a/src/preload/api/pty-api.ts b/src/preload/api/pty-api.ts
index 80bcd7b2c401..6574aedbced1 100644
--- a/src/preload/api/pty-api.ts
+++ b/src/preload/api/pty-api.ts
@@ -3,6 +3,7 @@ import type {
   SleepingAgentLaunchConfig
 } from '../../shared/agent-session-resume'
 import type { StartupCommandDelivery } from '../../shared/codex-startup-delivery'
+import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 import type { ProjectExecutionRuntimeResolution } from '../../shared/project-execution-runtime'
 import type { PtyListedSession, PtySessionListScope } from '../../shared/pty-listed-session'
 import type { PtyMainDeliveryDiagnostics } from '../../shared/pty-delivery-diagnostics'
@@ -75,15 +76,16 @@ export type PtyApi = {
     /** Host verdict on the shell-ready marker; absent when the execution host predates the field. */
     shellReadyArmed?: boolean
   }>
-  write: (id: string, data: string) => void
-  writeAccepted: (id: string, data: string) => Promise<boolean>
-  writeInputAccepted: (id: string, data: string) => Promise<boolean>
+  write: (id: string, data: string, inputKind: TerminalInputKind) => void
+  writeAccepted: (id: string, data: string, inputKind: TerminalInputKind) => Promise<boolean>
+  writeInputAccepted: (id: string, data: string, inputKind: TerminalInputKind) => Promise<boolean>
   onWriteUnavailable?: (callback: (payload: { id: string }) => void) => () => void
   resize: (id: string, cols: number, rows: number) => void
   claimViewport: (id: string, cols: number, rows: number) => void
   reportGeometry: (id: string, cols: number, rows: number) => void
   signal: (id: string, signal: string) => void
   clearBuffer: (id: string) => void
+  resetInputModes: (id: string) => void
   kill: (id: string, opts?: { keepHistory?: boolean }) => Promise<void>
   ackColdRestore: (id: string) => void
   ackData: (id: string, charCount: number, processedChars?: number) => void
@@ -229,6 +231,7 @@ export type PtyApi = {
     }) => void
   ) => () => void
   onClearBufferRequest: (callback: (data: { ptyId: string }) => void) => () => void
+  onResetInputModesRequest: (callback: (data: { ptyId: string }) => void) => () => void
   sendSerializedBuffer: (
     requestId: string,
     snapshot: {
diff --git a/src/preload/api/pty-bridge-session-control.ts b/src/preload/api/pty-bridge-session-control.ts
index 8129561b998a..f6f9bef0c2de 100644
--- a/src/preload/api/pty-bridge-session-control.ts
+++ b/src/preload/api/pty-bridge-session-control.ts
@@ -1,6 +1,7 @@
 import { ipcRenderer } from 'electron'
 import type { ProjectExecutionRuntimeResolution } from '../../shared/project-execution-runtime'
 import type { StartupCommandDelivery } from '../../shared/codex-startup-delivery'
+import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 import type {
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
@@ -71,13 +72,13 @@ export const ptySessionControlApi = {
     /** Host verdict on the shell-ready marker; absent when the execution host predates the field. */
     shellReadyArmed?: boolean
   }> => ipcRenderer.invoke('pty:spawn', opts),
-  write: (id: string, data: string): void => {
-    ipcRenderer.send('pty:write', { id, data })
+  write: (id: string, data: string, inputKind: TerminalInputKind): void => {
+    ipcRenderer.send('pty:write', { id, data, inputKind })
   },
-  writeAccepted: (id: string, data: string): Promise<boolean> =>
-    ipcRenderer.invoke('pty:writeAccepted', { id, data }),
-  writeInputAccepted: (id: string, data: string): Promise<boolean> =>
-    ipcRenderer.invoke('pty:writeInputAccepted', { id, data }),
+  writeAccepted: (id: string, data: string, inputKind: TerminalInputKind): Promise<boolean> =>
+    ipcRenderer.invoke('pty:writeAccepted', { id, data, inputKind }),
+  writeInputAccepted: (id: string, data: string, inputKind: TerminalInputKind): Promise<boolean> =>
+    ipcRenderer.invoke('pty:writeInputAccepted', { id, data, inputKind }),
   onWriteUnavailable: (callback: (payload: { id: string }) => void): (() => void) => {
     const handler = (_event: Electron.IpcRendererEvent, payload: { id: string }): void =>
       callback(payload)
@@ -99,6 +100,9 @@ export const ptySessionControlApi = {
   clearBuffer: (id: string): void => {
     ipcRenderer.send('pty:clearBuffer', { id })
   },
+  resetInputModes: (id: string): void => {
+    ipcRenderer.send('pty:resetInputModes', { id })
+  },
   ackColdRestore: (id: string): void => {
     ipcRenderer.send('pty:ackColdRestore', { id })
   },
diff --git a/src/preload/api/pty-bridge-stream-and-serialization.ts b/src/preload/api/pty-bridge-stream-and-serialization.ts
index 49e2189fd537..557570c8eab6 100644
--- a/src/preload/api/pty-bridge-stream-and-serialization.ts
+++ b/src/preload/api/pty-bridge-stream-and-serialization.ts
@@ -120,6 +120,11 @@ export const ptyStreamAndSerializationApi = {
     ipcRenderer.on('pty:clearBuffer:request', listener)
     return () => ipcRenderer.removeListener('pty:clearBuffer:request', listener)
   },
+  onResetInputModesRequest: (callback: (data: { ptyId: string }) => void): (() => void) => {
+    const listener = (_event: Electron.IpcRendererEvent, data: { ptyId: string }) => callback(data)
+    ipcRenderer.on('pty:resetInputModes:request', listener)
+    return () => ipcRenderer.removeListener('pty:resetInputModes:request', listener)
+  },
   sendSerializedBuffer: (
     requestId: string,
     snapshot: {
diff --git a/src/preload/api/session-bridge.ts b/src/preload/api/session-bridge.ts
index 22d342cd2c1f..537e15179ddd 100644
--- a/src/preload/api/session-bridge.ts
+++ b/src/preload/api/session-bridge.ts
@@ -7,6 +7,7 @@ export const sessionApi = {
   listHostIds: () => ipcRenderer.invoke('session:list-host-ids'),
   set: (args, hostId) => ipcRenderer.invoke('session:set', args, hostId),
   patch: (args, hostId) => ipcRenderer.invoke('session:patch', args, hostId),
+  closeTerminalSurface: (args) => ipcRenderer.invoke('session:close-terminal-surface', args),
   flush: () => ipcRenderer.invoke('session:flush'),
   readTerminalScrollback: (args) =>
     ipcRenderer.sendSync('session:read-terminal-scrollback-sync', args),
diff --git a/src/preload/api/ssh-api.ts b/src/preload/api/ssh-api.ts
index af198ad1080e..5fc64c030e5d 100644
--- a/src/preload/api/ssh-api.ts
+++ b/src/preload/api/ssh-api.ts
@@ -71,6 +71,7 @@ export type SshApi = {
       targetId: string
       kind: 'passphrase' | 'password' | 'keyboard-interactive'
       detail: string
+      echo?: boolean
     }) => void
   ) => () => void
   onCredentialResolved: (callback: (data: { requestId: string }) => void) => () => void
diff --git a/src/preload/api/ssh-bridge.ts b/src/preload/api/ssh-bridge.ts
index 03c10f9bc07b..240da3c95080 100644
--- a/src/preload/api/ssh-bridge.ts
+++ b/src/preload/api/ssh-bridge.ts
@@ -158,6 +158,7 @@ export const sshApi = {
       targetId: string
       kind: 'passphrase' | 'password' | 'keyboard-interactive'
       detail: string
+      echo?: boolean
     }) => void
   ): (() => void) => {
     const listener = (
@@ -167,6 +168,7 @@ export const sshApi = {
         targetId: string
         kind: 'passphrase' | 'password' | 'keyboard-interactive'
         detail: string
+        echo?: boolean
       }
     ) => callback(data)
     ipcRenderer.on('ssh:credential-request', listener)
diff --git a/src/preload/api/ui-bridge-clipboard-and-window-controls.ts b/src/preload/api/ui-bridge-clipboard-and-window-controls.ts
index 1738cb46d2a5..80f2c2dd3830 100644
--- a/src/preload/api/ui-bridge-clipboard-and-window-controls.ts
+++ b/src/preload/api/ui-bridge-clipboard-and-window-controls.ts
@@ -10,6 +10,7 @@ import {
   type RichMarkdownContextMenuTableTarget
 } from '../../shared/rich-markdown-context-menu'
 import type { NativeFileDropPayload } from '../../shared/native-file-drop'
+import type { TerminalSurfaceCloseTarget } from '../../shared/terminal-surface-close-target'
 import type { ClipboardImageThumbnail } from '../../shared/clipboard-image'
 import type { ReadClipboardTextOptions } from '../../shared/clipboard-text'
 import { subscribeNativeFileDrop } from '../preload-runtime-support'
@@ -49,13 +50,9 @@ export const uiClipboardAndWindowControlsApi = {
   respondMobileMarkdownRequest: (response: RuntimeMobileMarkdownResponse): void => {
     ipcRenderer.send('ui:mobileMarkdownResponse', response)
   },
-  onCloseTerminal: (
-    callback: (data: { tabId: string; paneRuntimeId?: number }) => void
-  ): (() => void) => {
-    const listener = (
-      _event: Electron.IpcRendererEvent,
-      data: { tabId: string; paneRuntimeId?: number }
-    ) => callback(data)
+  onCloseTerminal: (callback: (target: TerminalSurfaceCloseTarget) => void): (() => void) => {
+    const listener = (_event: Electron.IpcRendererEvent, target: TerminalSurfaceCloseTarget) =>
+      callback(target)
     ipcRenderer.on('ui:closeTerminal', listener)
     return () => ipcRenderer.removeListener('ui:closeTerminal', listener)
   },
diff --git a/src/preload/api/ui-command-event-api.ts b/src/preload/api/ui-command-event-api.ts
index aad950dcbdb1..8fd42d46ff1b 100644
--- a/src/preload/api/ui-command-event-api.ts
+++ b/src/preload/api/ui-command-event-api.ts
@@ -2,6 +2,7 @@ import type { MarkdownDocument } from '../../shared/filesystem-entry-types'
 import type { PersistedUIState } from '../../shared/persisted-ui-state-types'
 import type { TerminalDockPaneState } from '../../shared/fork-terminal-dock/terminal-dock-pane-state'
 import type { TuiAgent } from '../../shared/tui-agent'
+import type { TerminalSurfaceCloseTarget } from '../../shared/terminal-surface-close-target'
 import type {
   WorktreeDefaultTabsLaunch,
   WorktreeSetupLaunch,
@@ -238,9 +239,7 @@ export type UiCommandEventApi = {
   ) => () => void
   onMobileMarkdownRequest: (callback: (request: RuntimeMobileMarkdownRequest) => void) => () => void
   respondMobileMarkdownRequest: (response: RuntimeMobileMarkdownResponse) => void
-  onCloseTerminal: (
-    callback: (data: { tabId: string; paneRuntimeId?: number }) => void
-  ) => () => void
+  onCloseTerminal: (callback: (target: TerminalSurfaceCloseTarget) => void) => () => void
   onTerminalTabCloseRequest: (callback: (request: TerminalTabCloseRequest) => void) => () => void
   respondTerminalTabClose: (response: TerminalTabCloseResponse) => void
   onSleepWorktree: (callback: (data: { worktreeId: string }) => void) => () => void
diff --git a/src/preload/api/workspace-session-api.ts b/src/preload/api/workspace-session-api.ts
index 4c31b6e5db87..d621e5dc7db6 100644
--- a/src/preload/api/workspace-session-api.ts
+++ b/src/preload/api/workspace-session-api.ts
@@ -4,6 +4,7 @@ import type {
   WorkspaceSessionState
 } from '../../shared/workspace-session-state-types'
 import type { ExecutionHostId } from '../../shared/execution-host'
+import type { TerminalSurfaceCloseTarget } from '../../shared/terminal-surface-close-target'
 import type {
   RemoteWorkspaceChangedEvent,
   RemoteWorkspaceConnectedClient,
@@ -19,6 +20,12 @@ export type WorkspaceSessionApi = {
     listHostIds: () => Promise<ExecutionHostId[]>
     set: (args: WorkspaceSessionState, hostId?: ExecutionHostId) => Promise<void>
     patch: (args: WorkspaceSessionPatch, hostId?: ExecutionHostId) => Promise<void>
+    /** Commits a terminal tab or split-pane close into main's membership. */
+    closeTerminalSurface: (args: {
+      worktreeId: string
+      target: TerminalSurfaceCloseTarget
+      reason?: 'user' | 'cleanup'
+    }) => Promise<void>
     flush: () => Promise<void>
     readTerminalScrollback: (args: { ref: string }) => string | null
     setSync: (args: WorkspaceSessionState, hostId?: ExecutionHostId) => void
diff --git a/src/relay/ai-vault-opencode-reader.test.ts b/src/relay/ai-vault-opencode-reader.test.ts
index 981ade1fd128..3d082205d5d4 100644
--- a/src/relay/ai-vault-opencode-reader.test.ts
+++ b/src/relay/ai-vault-opencode-reader.test.ts
@@ -223,11 +223,11 @@ describe('relay OpenCode reader', () => {
       list: (args) =>
         args.agent === 'opencode2'
           ? listOpenCode2SqliteSessions(args)
-          : listOpenCodeSqliteSessions(args),
+          : listOpenCodeSqliteSessions({ ...args, agent: 'opencode' }),
       parse: async (args) =>
         args.agent === 'opencode2'
           ? parseOpenCode2SqliteSession(args)
-          : parseOpenCodeSqliteSession(args),
+          : parseOpenCodeSqliteSession({ ...args, agent: 'opencode' }),
       dispose() {}
     })
     const provider = createRelayAiVaultFilesystemProvider({
diff --git a/src/relay/ai-vault-service-client-state.ts b/src/relay/ai-vault-service-client-state.ts
index de623d19b07a..11cab3763d77 100644
--- a/src/relay/ai-vault-service-client-state.ts
+++ b/src/relay/ai-vault-service-client-state.ts
@@ -28,6 +28,18 @@ export function relayAiVaultError(error: unknown): Error {
   return error instanceof Error ? error : new Error(String(error))
 }
 
+export function armRelayAiVaultCallTimeout(
+  call: RelayAiVaultServiceCall,
+  onExpired: (timeout: number) => void
+): void {
+  const timeout =
+    call.request.operation === 'list'
+      ? RELAY_AI_VAULT_SCAN_TIMEOUT_MS
+      : RELAY_AI_VAULT_TITLE_TIMEOUT_MS
+  call.timer = setTimeout(() => onExpired(timeout), timeout)
+  call.timer.unref?.()
+}
+
 export function armRelayAiVaultCancellationTimeout(
   call: RelayAiVaultServiceCall,
   onExpired: () => void
@@ -53,7 +65,8 @@ export function createRelayAiVaultServiceCall(args: {
     onAbort: null,
     settled: false,
     sent: false,
-    startRetried: false
+    startRetried: false,
+    startAttempt: 0
   }
 }
 
@@ -110,6 +123,7 @@ export type RelayAiVaultServiceCall = {
   /** Whether the sidecar received the request; an unsent call gets no reply. */
   sent: boolean
   startRetried: boolean
+  startAttempt: number
 }
 
 export type RelayAiVaultServiceApi = {
diff --git a/src/relay/ai-vault-service-client.ts b/src/relay/ai-vault-service-client.ts
index c873c3805067..9197bce10807 100644
--- a/src/relay/ai-vault-service-client.ts
+++ b/src/relay/ai-vault-service-client.ts
@@ -1,4 +1,5 @@
 import type { ChildProcess } from 'node:child_process'
+import { PromiseSettlementWaiters } from '../shared/promise-settlement-waiters'
 import type { AiVaultListResult } from '../shared/ai-vault-types'
 import type {
   AiVaultSessionTitleRequest,
@@ -9,8 +10,7 @@ import {
   RELAY_AI_VAULT_MAX_CALLS,
   RELAY_AI_VAULT_IDLE_TIMEOUT_MS,
   RELAY_AI_VAULT_READY_TIMEOUT_MS,
-  RELAY_AI_VAULT_SCAN_TIMEOUT_MS,
-  RELAY_AI_VAULT_TITLE_TIMEOUT_MS,
+  armRelayAiVaultCallTimeout,
   armRelayAiVaultCancellationTimeout,
   createRelayAiVaultServiceCall,
   relayAiVaultAbortError,
@@ -37,7 +37,7 @@ import { relayLogLine } from './relay-diagnostic-log'
 
 export class RelayAiVaultServiceClient implements RelayAiVaultServiceApi {
   private child: ChildProcess | null = null
-  private ready: Promise<ChildProcess> | null = null
+  private ready: PromiseSettlementWaiters<ChildProcess> | null = null
   private readyReject: ((error: Error) => void) | null = null
   private readyTimer: NodeJS.Timeout | null = null
   private readonly active = new Map<RelayAiVaultServiceLane, RelayAiVaultServiceCall>()
@@ -74,6 +74,9 @@ export class RelayAiVaultServiceClient implements RelayAiVaultServiceApi {
     this.clearReadyTimer()
     this.restartPolicy.dispose()
     const error = new Error('Relay AI Vault service was disposed.')
+    this.readyReject?.(error)
+    this.readyReject = null
+    this.ready = null
     for (const call of [...this.active.values(), ...this.queue.splice(0)]) {
       settleRelayAiVaultServiceCall(call, error)
     }
@@ -128,17 +131,22 @@ export class RelayAiVaultServiceClient implements RelayAiVaultServiceApi {
       }
       const call = this.queue.splice(index, 1)[0]!
       this.active.set(lane, call)
-      void this.ensureChild(call.forceStart).then(
-        (child) => this.sendCall(child, call),
-        (error: Error) => {
-          if (this.active.get(lane) !== call) {
+      const attempt = ++call.startAttempt
+      const readiness = this.ensureChild(call.forceStart)
+      void readiness
+        .wait({
+          signal: call.signal,
+          createAbortError: relayAiVaultAbortError,
+          onFulfilled: (child) => this.sendCall(child, call)
+        })
+        .catch((error: Error) => {
+          if (this.active.get(lane) !== call || call.startAttempt !== attempt) {
             return
           }
           this.active.delete(lane)
           this.retryStartOrSettle(call, error)
           this.pump()
-        }
-      )
+        })
     }
     this.scheduleIdleIfNeeded()
   }
@@ -147,15 +155,9 @@ export class RelayAiVaultServiceClient implements RelayAiVaultServiceApi {
     if (this.active.get(call.lane) !== call || call.settled) {
       return
     }
-    const timeout =
-      call.request.operation === 'list'
-        ? RELAY_AI_VAULT_SCAN_TIMEOUT_MS
-        : RELAY_AI_VAULT_TITLE_TIMEOUT_MS
-    call.timer = setTimeout(
-      () => this.onFault(new Error(`Relay AI Vault service timed out after ${timeout}ms.`)),
-      timeout
+    armRelayAiVaultCallTimeout(call, (timeout) =>
+      this.onFault(new Error(`Relay AI Vault service timed out after ${timeout}ms.`))
     )
-    call.timer.unref?.()
     call.sent = true
     child.send(call.request)
   }
@@ -166,44 +168,46 @@ export class RelayAiVaultServiceClient implements RelayAiVaultServiceApi {
     }
   }
 
-  private ensureChild(forceStart: boolean): Promise<ChildProcess> {
+  private ensureChild(forceStart: boolean): PromiseSettlementWaiters<ChildProcess> {
     if (this.child && !this.ready) {
-      return Promise.resolve(this.child)
+      return new PromiseSettlementWaiters(Promise.resolve(this.child))
     }
     if (this.ready) {
       return this.ready
     }
     const startError = this.restartPolicy.startError(forceStart)
     if (startError) {
-      return Promise.reject(startError)
+      return new PromiseSettlementWaiters(Promise.reject(startError))
     }
     let child: ChildProcess
     try {
       child = this.options.processFactory()
     } catch (error) {
-      return Promise.reject(relayAiVaultError(error))
+      return new PromiseSettlementWaiters(Promise.reject(relayAiVaultError(error)))
     }
     this.child = child
-    this.ready = new Promise<ChildProcess>((resolve, reject) => {
-      this.readyReject = reject
-      // Why: held on the instance so a crash before ready cannot leave the deadline
-      // armed, where it would later fault the healthy replacement sidecar.
-      this.readyTimer = setTimeout(
-        () => this.onFault(new Error('Relay AI Vault service did not become ready.')),
-        RELAY_AI_VAULT_READY_TIMEOUT_MS
-      )
-      this.readyTimer.unref?.()
-      child.on('message', (message) => {
-        if (isRelayAiVaultServiceChildMessage(message) && message.type === 'ready') {
-          this.clearReadyTimer()
-          this.ready = null
-          this.readyReject = null
-          resolve(child)
-          return
-        }
-        this.onMessage(message)
+    this.ready = new PromiseSettlementWaiters(
+      new Promise<ChildProcess>((resolve, reject) => {
+        this.readyReject = reject
+        // Why: held on the instance so a crash before ready cannot leave the deadline
+        // armed, where it would later fault the healthy replacement sidecar.
+        this.readyTimer = setTimeout(
+          () => this.onFault(new Error('Relay AI Vault service did not become ready.')),
+          RELAY_AI_VAULT_READY_TIMEOUT_MS
+        )
+        this.readyTimer.unref?.()
+        child.on('message', (message) => {
+          if (isRelayAiVaultServiceChildMessage(message) && message.type === 'ready') {
+            this.clearReadyTimer()
+            this.ready = null
+            this.readyReject = null
+            resolve(child)
+            return
+          }
+          this.onMessage(message)
+        })
       })
-    })
+    )
     child.on('error', (error) => this.onFault(error))
     child.on('disconnect', () => this.onFault(new Error('Relay AI Vault service disconnected.')))
     child.on('exit', (code) => this.onFault(new Error(`Relay AI Vault service exited (${code}).`)))
diff --git a/src/relay/ai-vault-service-ready-retention.test.ts b/src/relay/ai-vault-service-ready-retention.test.ts
new file mode 100644
index 000000000000..53f845a4e903
--- /dev/null
+++ b/src/relay/ai-vault-service-ready-retention.test.ts
@@ -0,0 +1,202 @@
+import { setImmediate } from 'node:timers/promises'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { getRemoteHostPlatform } from '../main/ssh/ssh-remote-platform'
+import {
+  AiVaultServiceTestChild,
+  readyAiVaultServiceChild
+} from '../main/ai-vault/session-scanner-service-test-child'
+import type { AiVaultSessionTitleRequest } from '../shared/ai-vault-session-title'
+import { RelayAiVaultServiceClient } from './ai-vault-service-client'
+
+function fixture() {
+  const child = new AiVaultServiceTestChild()
+  const processFactory = vi.fn(() => child.asChildProcess())
+  const client = new RelayAiVaultServiceClient({
+    processFactory,
+    init: { remoteHome: '/home/ada', hostPlatform: getRemoteHostPlatform('linux-x64') }
+  })
+  return { client, child, processFactory }
+}
+
+async function collect(): Promise<void> {
+  if (!global.gc) {
+    throw new Error('This regression requires --expose-gc')
+  }
+  for (let turn = 0; turn < 3; turn++) {
+    await setImmediate()
+    global.gc()
+  }
+}
+
+function titleRequests(): AiVaultSessionTitleRequest[] {
+  return [{ agent: 'claude', sessionId: 'session', transcriptPath: '/home/ada/session.jsonl' }]
+}
+
+beforeEach(() => vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] }))
+afterEach(() => {
+  vi.clearAllTimers()
+  vi.useRealTimers()
+})
+
+describe('AI Vault readiness ownership', () => {
+  it('releases canceled request payloads while readiness remains pending', async () => {
+    const { client, child, processFactory } = fixture()
+    const canceled = await (async () => {
+      const refs: WeakRef<AiVaultSessionTitleRequest[]>[] = []
+      for (let index = 0; index < 1000; index++) {
+        const requests = titleRequests()
+        refs.push(new WeakRef(requests))
+        const controller = new AbortController()
+        const result = client.resolveSessionTitles(requests, controller.signal)
+        controller.abort()
+        const error = await result.catch((reason: unknown) => reason)
+        if (!(error instanceof Error) || error.name !== 'AbortError') {
+          throw new Error('Canceled title request did not reject with AbortError')
+        }
+      }
+      return refs
+    })()
+    await collect()
+    expect(canceled.filter((ref) => ref.deref() !== undefined)).toHaveLength(0)
+    expect(child.sent).toHaveLength(1)
+    expect(processFactory).toHaveBeenCalledOnce()
+
+    const live = client.resolveSessionTitles(titleRequests())
+    readyAiVaultServiceChild(child)
+    await Promise.resolve()
+    expect(child.sent.at(-1)).toMatchObject({ type: 'request', id: 1001, operation: 'titles' })
+    child.emit('message', { type: 'result', id: 1001, operation: 'titles', value: { titles: [] } })
+    await expect(live).resolves.toEqual({ titles: [] })
+    const disposed = client.dispose()
+    child.emit('exit', 0)
+    await disposed
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('releases uncanceled readiness payloads when the client is disposed', async () => {
+    const { client, child } = fixture()
+    const discarded = await (async () => {
+      const requests = titleRequests()
+      const ref = new WeakRef(requests)
+      const result = client.resolveSessionTitles(requests)
+      const rejection = expect(result).rejects.toThrow('disposed')
+      const disposed = client.dispose()
+      child.emit('exit', 0)
+      await disposed
+      await rejection
+      return ref
+    })()
+    await collect()
+    expect(discarded.deref() === undefined).toBe(true)
+    expect(child.sent).toEqual([expect.objectContaining({ type: 'init' }), { type: 'shutdown' }])
+    expect(vi.getTimerCount()).toBe(0)
+    await expect(client.resolveSessionTitles([])).rejects.toThrow('disposed')
+  })
+
+  it('does not send a call canceled in the turn that readiness arrives', async () => {
+    const { client, child } = fixture()
+    const controller = new AbortController()
+    const canceled = client.resolveSessionTitles(titleRequests(), controller.signal)
+    readyAiVaultServiceChild(child)
+    controller.abort()
+    const live = client.resolveSessionTitles([])
+    await expect(canceled).rejects.toMatchObject({ name: 'AbortError' })
+    expect(child.sent).toEqual([
+      expect.objectContaining({ type: 'init' }),
+      { type: 'request', id: 2, operation: 'titles', requests: [] }
+    ])
+    child.emit('message', { type: 'result', id: 2, operation: 'titles', value: { titles: [] } })
+    await expect(live).resolves.toEqual({ titles: [] })
+    const disposed = client.dispose()
+    child.emit('exit', 0)
+    await disposed
+  })
+})
+
+it('retries an unsent lane after spawn fails while the other lane starts a child', async () => {
+  const child = new AiVaultServiceTestChild()
+  const processFactory = vi.fn(() => child.asChildProcess())
+  processFactory.mockImplementationOnce(() => {
+    throw new Error('temporary spawn failure')
+  })
+  const client = new RelayAiVaultServiceClient({
+    processFactory,
+    init: { remoteHome: '/home/ada', hostPlatform: getRemoteHostPlatform('linux-x64') }
+  })
+  const list = client.listSessions({})
+  const titles = client.resolveSessionTitles([])
+  void list.catch(() => undefined)
+  void titles.catch(() => undefined)
+  try {
+    readyAiVaultServiceChild(child)
+    await vi.waitFor(() => {
+      expect(child.sent).toContainEqual({ type: 'request', id: 1, operation: 'list', params: {} })
+    })
+    expect(processFactory).toHaveBeenCalledTimes(2)
+    expect(child.sent).toContainEqual({ type: 'request', id: 1, operation: 'list', params: {} })
+    expect(child.sent).toContainEqual({ type: 'request', id: 2, operation: 'titles', requests: [] })
+    child.emit('message', {
+      type: 'result',
+      id: 1,
+      operation: 'list',
+      value: { sessions: [], issues: [], scannedAt: '2026-09-25T00:00:00.000Z' }
+    })
+    child.emit('message', { type: 'result', id: 2, operation: 'titles', value: { titles: [] } })
+    await expect(list).resolves.toMatchObject({ sessions: [] })
+    await expect(titles).resolves.toEqual({ titles: [] })
+  } finally {
+    const disposed = client.dispose()
+    child.emit('exit', 0)
+    await disposed
+  }
+})
+
+it('ignores an earlier readiness rejection after a replacement startup begins', async () => {
+  const first = new AiVaultServiceTestChild()
+  const replacement = new AiVaultServiceTestChild()
+  const processFactory = vi.fn(() => replacement.asChildProcess())
+  processFactory.mockImplementationOnce(() => first.asChildProcess())
+  const client = new RelayAiVaultServiceClient({
+    processFactory,
+    init: { remoteHome: '/home/ada', hostPlatform: getRemoteHostPlatform('linux-x64') }
+  })
+  const list = client.listSessions({})
+  void list.catch(() => undefined)
+  try {
+    first.emit('exit', 1)
+    // Start the replacement before the old readiness rejection's microtasks run.
+    vi.advanceTimersByTime(250)
+    const titles = client.resolveSessionTitles([])
+    void titles.catch(() => undefined)
+    readyAiVaultServiceChild(replacement)
+    await setImmediate()
+
+    expect(processFactory).toHaveBeenCalledTimes(2)
+    expect(first.sent).toEqual([expect.objectContaining({ type: 'init' })])
+    expect(replacement.sent).toEqual([
+      expect.objectContaining({ type: 'init' }),
+      { type: 'request', id: 1, operation: 'list', params: {} },
+      { type: 'request', id: 2, operation: 'titles', requests: [] }
+    ])
+    replacement.emit('message', {
+      type: 'result',
+      id: 1,
+      operation: 'list',
+      value: { sessions: [], issues: [], scannedAt: '2026-09-25T00:00:00.000Z' }
+    })
+    replacement.emit('message', {
+      type: 'result',
+      id: 2,
+      operation: 'titles',
+      value: { titles: [] }
+    })
+    await expect(list).resolves.toMatchObject({ sessions: [] })
+    await expect(titles).resolves.toEqual({ titles: [] })
+    expect(processFactory).toHaveBeenCalledTimes(2)
+  } finally {
+    const disposed = client.dispose()
+    replacement.emit('exit', 0)
+    await disposed
+  }
+  expect(vi.getTimerCount()).toBe(0)
+})
diff --git a/src/relay/freebuff-status-projection.test.ts b/src/relay/freebuff-status-projection.test.ts
new file mode 100644
index 000000000000..b10214ef8010
--- /dev/null
+++ b/src/relay/freebuff-status-projection.test.ts
@@ -0,0 +1,43 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { FreebuffStatusProjection } from './freebuff-status-projection'
+import { createAgentStatusOscProcessor } from '../shared/agent-status-osc'
+
+const transcript = readFileSync(
+  join(import.meta.dirname, '../main/runtime/__fixtures__/freebuff-lifecycle.txt'),
+  'utf8'
+)
+
+describe('Freebuff relay status projection', () => {
+  it.each([1, 137, 4096, transcript.length])(
+    'publishes host-observed states with %i-character PTY chunks',
+    (size) => {
+      const projection = new FreebuffStatusProjection(120, 40)
+      const parse = createAgentStatusOscProcessor()
+      const states: string[] = []
+      try {
+        for (let index = 0; index < transcript.length; index += size) {
+          const raw = transcript.slice(index, index + size)
+          const projected = projection.project(raw)
+          // oxlint-disable-next-line no-control-regex -- Terminal protocol delimiters contain ESC and BEL.
+          expect(projected.replace(/\x1b\]9999;[^\x07]*\x07/g, '')).toBe(raw)
+          for (const payload of parse(projected).payloads) {
+            expect(payload.agentType).toBe('freebuff')
+            if (states.at(-1) !== payload.state) {
+              states.push(payload.state)
+            }
+          }
+        }
+        expect(states).toContain('working')
+        expect(states).toContain('waiting')
+        expect(states.at(-1)).toBe('done')
+        projection.resize(90, 30)
+        projection.dispose()
+        expect(projection.project('later output')).toBe('later output')
+      } finally {
+        projection.dispose()
+      }
+    }
+  )
+})
diff --git a/src/relay/freebuff-status-projection.ts b/src/relay/freebuff-status-projection.ts
new file mode 100644
index 000000000000..6e8ea7d9de32
--- /dev/null
+++ b/src/relay/freebuff-status-projection.ts
@@ -0,0 +1,45 @@
+import { HeadlessEmulator } from '../main/daemon/headless-emulator'
+import {
+  FreebuffScreenStatusTracker,
+  splitFreebuffScreenUpdates
+} from '../shared/freebuff-screen-status'
+
+/** Emits the existing status OSC on the execution host, preserving the PTY's raw byte credit. */
+export class FreebuffStatusProjection {
+  private readonly emulator: HeadlessEmulator
+  private readonly tracker = new FreebuffScreenStatusTracker(true)
+  private disposed = false
+
+  constructor(cols: number, rows: number) {
+    this.emulator = new HeadlessEmulator({ cols, rows, scrollback: 0 })
+  }
+
+  project(data: string): string {
+    if (this.disposed) {
+      return data
+    }
+    return splitFreebuffScreenUpdates(data, this.emulator.partialEscapeTailAnsi)
+      .map((chunk) => {
+        if (!this.emulator.writeSync(chunk)) {
+          return chunk
+        }
+        const status = this.tracker.observe(chunk, () => ({
+          lines: this.emulator.getVisibleLines(),
+          alternate: this.emulator.isAlternateScreen
+        }))
+        return status ? `${chunk}\x1b]9999;${JSON.stringify(status)}\x07` : chunk
+      })
+      .join('')
+  }
+
+  resize(cols: number, rows: number): void {
+    if (!this.disposed) {
+      this.emulator.resize(cols, rows)
+    }
+  }
+
+  dispose(): void {
+    this.disposed = true
+    this.emulator.dispose()
+  }
+}
diff --git a/src/relay/fs-handler-git-fallback.ts b/src/relay/fs-handler-git-fallback.ts
index 6e1144cdf4ff..3298f369c9ec 100644
--- a/src/relay/fs-handler-git-fallback.ts
+++ b/src/relay/fs-handler-git-fallback.ts
@@ -6,10 +6,8 @@
  * and git grep as universal fallbacks — git is always available since this is
  * a git-focused app.
  */
-import { SearchSubprocessLineAccumulator } from '../shared/search-subprocess-lines'
 import { spawn } from 'node:child_process'
 import { fileListingCancellationError } from '../shared/file-listing-cancellation'
-import type { SearchOptions, SearchResult } from './fs-handler-utils'
 import {
   buildGitLsFilesArgsForQuickOpen,
   shouldExcludeQuickOpenRelPath,
@@ -19,14 +17,6 @@ import {
   expandQuickOpenGitFileListing,
   parseQuickOpenGitLsFilesEntry
 } from '../shared/quick-open-readdir-walk'
-import {
-  buildGitGrepArgs,
-  buildSubmatchRegex,
-  createAccumulator,
-  finalize,
-  ingestGitGrepLine,
-  SEARCH_TIMEOUT_MS
-} from '../shared/text-search'
 import { buildRelayGitEnv } from './relay-command-env'
 
 /**
@@ -266,81 +256,4 @@ export function listFilesWithGit(
     })
 }
 
-/**
- * Text search using `git grep`. Fallback when rg is not installed.
- */
-export function searchWithGitGrep(
-  rootPath: string,
-  query: string,
-  opts: SearchOptions
-): Promise<SearchResult> {
-  return new Promise((resolve) => {
-    const gitArgs = buildGitGrepArgs(query, opts)
-    const matchRegex = buildSubmatchRegex(query, opts)
-    const acc = createAccumulator()
-    const lines = new SearchSubprocessLineAccumulator(Number.MAX_SAFE_INTEGER)
-    let done = false
-
-    const child = spawn('git', gitArgs, {
-      cwd: rootPath,
-      env: buildRelayGitEnv(),
-      stdio: ['ignore', 'pipe', 'pipe']
-    })
-    let killTimeout: ReturnType<typeof setTimeout>
-
-    function resolveOnce(): void {
-      if (done) {
-        return
-      }
-      done = true
-      lines.clear()
-      clearTimeout(killTimeout)
-      // Why: child.kill() is advisory. If git ignores it, detach our
-      // closures so repeated relay searches do not retain old scans.
-      child.stdout!.off('data', handleStdoutData)
-      child.stderr!.off('data', handleStderrData)
-      child.off('error', handleError)
-      child.off('close', handleClose)
-      resolve(finalize(acc))
-    }
-
-    function processLine(line: string): void {
-      const verdict = ingestGitGrepLine(line, rootPath, matchRegex, acc, opts.maxResults)
-      if (verdict === 'stop') {
-        child.kill()
-      }
-    }
-
-    function handleStdoutData(chunk: string): void {
-      lines.push(chunk, processLine)
-    }
-
-    function handleStderrData(): void {
-      /* drain */
-    }
-
-    function handleError(): void {
-      resolveOnce()
-    }
-
-    function handleClose(): void {
-      const tail = lines.finish()
-      if (tail !== null) {
-        processLine(tail)
-      }
-      resolveOnce()
-    }
-
-    child.stdout!.setEncoding('utf-8')
-    child.stdout!.on('data', handleStdoutData)
-    child.stderr!.on('data', handleStderrData)
-    child.once('error', handleError)
-    child.once('close', handleClose)
-
-    killTimeout = setTimeout(() => {
-      acc.truncated = true
-      child.kill()
-      resolveOnce()
-    }, SEARCH_TIMEOUT_MS)
-  })
-}
+export { searchWithGitGrep } from './fs-handler-git-search'
diff --git a/src/relay/fs-handler-git-search.ts b/src/relay/fs-handler-git-search.ts
new file mode 100644
index 000000000000..c448c17d4769
--- /dev/null
+++ b/src/relay/fs-handler-git-search.ts
@@ -0,0 +1,130 @@
+import { SearchSubprocessLineAccumulator } from '../shared/search-subprocess-lines'
+import { spawnProcess } from '../shared/child-process/run-process'
+import { abortSignalReason } from '../shared/abort-signal-reason'
+import type { SearchOptions, SearchResult } from './fs-handler-utils'
+import {
+  buildGitGrepArgs,
+  buildSubmatchRegex,
+  createAccumulator,
+  finalize,
+  ingestGitGrepLine,
+  SEARCH_TIMEOUT_MS
+} from '../shared/text-search'
+import {
+  absorbPendingRipgrepSpawnError,
+  killSpawnedRipgrepProcess
+} from '../shared/ripgrep-process-availability'
+import { buildRelayGitEnv } from './relay-command-env'
+
+/**
+ * Text search using `git grep`. Fallback when rg is not installed.
+ */
+export function searchWithGitGrep(
+  rootPath: string,
+  query: string,
+  opts: SearchOptions
+): Promise<SearchResult> {
+  const { signal } = opts
+  if (signal?.aborted) {
+    return Promise.reject(abortSignalReason(signal))
+  }
+  return new Promise((resolve, reject) => {
+    const gitArgs = buildGitGrepArgs(query, opts)
+    const matchRegex = buildSubmatchRegex(query, opts)
+    const acc = createAccumulator()
+    const lines = new SearchSubprocessLineAccumulator(Number.MAX_SAFE_INTEGER)
+    let done = false
+    let processErrorObserved = false
+
+    const child = spawnProcess({
+      program: 'git',
+      args: gitArgs,
+      cwd: rootPath,
+      env: buildRelayGitEnv(),
+      stdio: ['ignore', 'pipe', 'pipe']
+    })
+    let killTimeout: ReturnType<typeof setTimeout>
+
+    function settle(): boolean {
+      if (done) {
+        return false
+      }
+      done = true
+      signal?.removeEventListener('abort', onAbort)
+      lines.clear()
+      clearTimeout(killTimeout)
+      // Why: child.kill() is advisory. If git ignores it, detach our
+      // closures so repeated relay searches do not retain old scans.
+      child.stdout!.off('data', handleStdoutData)
+      child.stderr!.off('data', handleStderrData)
+      child.off('error', handleError)
+      child.off('close', handleClose)
+      absorbPendingRipgrepSpawnError(child, {
+        errorObserved: processErrorObserved,
+        unavailableExitObserved: false
+      })
+      return true
+    }
+
+    function resolveOnce(): void {
+      if (settle()) {
+        resolve(finalize(acc))
+      }
+    }
+
+    function onAbort(): void {
+      if (signal && settle()) {
+        try {
+          killSpawnedRipgrepProcess(child)
+        } catch {
+          // A refused kill must still release the canceled request.
+        }
+        reject(abortSignalReason(signal))
+      }
+    }
+
+    function processLine(line: string): void {
+      const verdict = ingestGitGrepLine(line, rootPath, matchRegex, acc, opts.maxResults)
+      if (verdict === 'stop') {
+        child.kill()
+      }
+    }
+
+    function handleStdoutData(chunk: string): void {
+      lines.push(chunk, processLine)
+    }
+
+    function handleStderrData(): void {
+      /* drain */
+    }
+
+    function handleError(): void {
+      processErrorObserved = true
+      resolveOnce()
+    }
+
+    function handleClose(): void {
+      const tail = lines.finish()
+      if (tail !== null) {
+        processLine(tail)
+      }
+      resolveOnce()
+    }
+
+    child.stdout!.setEncoding('utf-8')
+    child.stdout!.on('data', handleStdoutData)
+    child.stderr!.on('data', handleStderrData)
+    child.once('error', handleError)
+    child.once('close', handleClose)
+
+    killTimeout = setTimeout(() => {
+      acc.truncated = true
+      child.kill()
+      resolveOnce()
+    }, SEARCH_TIMEOUT_MS)
+    signal?.addEventListener('abort', onAbort, { once: true })
+    if (signal?.aborted) {
+      onAbort()
+    }
+  })
+}
diff --git a/src/relay/fs-handler-list-files-ignored.test.ts b/src/relay/fs-handler-list-files-ignored.test.ts
index 3123d35241a1..483afec1c4cd 100644
--- a/src/relay/fs-handler-list-files-ignored.test.ts
+++ b/src/relay/fs-handler-list-files-ignored.test.ts
@@ -670,7 +670,12 @@ describe('relay quick open ignored file listing', () => {
       'rg',
       ['--version'],
       // windowsHide: the probe must never flash a console window on Windows.
-      { env: buildRelayCommandEnv(), stdio: 'ignore', windowsHide: true }
+      expect.objectContaining({
+        env: buildRelayCommandEnv(),
+        stdio: 'ignore',
+        windowsHide: true,
+        shell: false
+      })
     ])
     listProbe.emit('close', 0, null)
     await expect(listing).rejects.toThrow(`Search root is not reachable: ${missingRoot}`)
diff --git a/src/relay/fs-handler-utils.ts b/src/relay/fs-handler-utils.ts
index 8b93c6ac82e7..a3b2234ced04 100644
--- a/src/relay/fs-handler-utils.ts
+++ b/src/relay/fs-handler-utils.ts
@@ -6,7 +6,8 @@
  * so they are straightforward to test independently.
  */
 import { SearchSubprocessLineAccumulator } from '../shared/search-subprocess-lines'
-import { spawn } from 'node:child_process'
+import { spawnProcess } from '../shared/child-process/run-process'
+import { abortSignalReason } from '../shared/abort-signal-reason'
 import { open } from 'node:fs/promises'
 import {
   buildRgArgs,
@@ -83,6 +84,7 @@ export type SearchOptions = {
   includePattern?: string
   excludePattern?: string
   maxResults: number
+  signal?: AbortSignal
 }
 
 export type SearchResult = SharedSearchResult
@@ -104,6 +106,10 @@ export function searchWithRg(
   query: string,
   opts: SearchOptions
 ): Promise<SearchResult> {
+  const { signal } = opts
+  if (signal?.aborted) {
+    return Promise.reject(abortSignalReason(signal))
+  }
   return new Promise((resolve, reject) => {
     const rgArgs = buildRgArgs(query, rootPath, opts)
     const acc = createAccumulator()
@@ -127,13 +133,14 @@ export function searchWithRg(
     // Why a second binding: the closures below capture it, and narrowing does not reach them.
     const command: string = resolvedRgCommand
     const env = buildRelayCommandEnv()
-    let child: ReturnType<typeof spawn>
+    let child: ReturnType<typeof spawnProcess>
     try {
-      child = spawn(command, rgArgs, {
+      child = spawnProcess({
+        program: command,
+        args: rgArgs,
         cwd: rootPath,
         env,
-        stdio: ['ignore', 'pipe', 'pipe'],
-        windowsHide: true
+        stdio: ['ignore', 'pipe', 'pipe']
       })
     } catch {
       resolve(finalize(acc))
@@ -147,6 +154,7 @@ export function searchWithRg(
         return false
       }
       resolved = true
+      signal?.removeEventListener('abort', onAbort)
       lines.clear()
       clearTimeout(killTimeout)
       // Why: child.kill() is advisory over SSH; detach listeners if the
@@ -162,6 +170,17 @@ export function searchWithRg(
       return true
     }
 
+    function onAbort(): void {
+      if (signal && settle()) {
+        try {
+          killSpawnedRipgrepProcess(child)
+        } catch {
+          // A refused kill must still release the canceled request.
+        }
+        reject(abortSignalReason(signal))
+      }
+    }
+
     function resolveOnce(): void {
       if (settle()) {
         resolve(finalize(acc))
@@ -172,8 +191,11 @@ export function searchWithRg(
       if (launchFailureCheck) {
         return
       }
-      launchFailureCheck = retryRipgrepOnPathAfterLaunchFailure(command, rootPath, error).then(
-        async (retryOnPath) => {
+      launchFailureCheck = retryRipgrepOnPathAfterLaunchFailure(command, rootPath, error)
+        .then(async (retryOnPath) => {
+          if (resolved) {
+            return
+          }
           if (retryOnPath) {
             // Why: a launch failure produced no output, so rerunning on PATH rg loses nothing.
             if (settle()) {
@@ -184,19 +206,25 @@ export function searchWithRg(
           // Why not resolveOnce() on an unreachable root: an empty result reads as "no matches"
           // and the git/readdir chain never engages, because it only triggers on an unavailable
           // ripgrep. The workspace moving would otherwise look like a successful empty scan.
+          const failure = await classifyRipgrepLaunchFailure(
+            rootPath,
+            [command, pathRipgrepCommand()],
+            env,
+            signal
+          )
           if (settle()) {
             reject(
-              (await classifyRipgrepLaunchFailure(
-                rootPath,
-                [command, pathRipgrepCommand()],
-                env
-              )) === 'cwd-unreachable'
+              failure === 'cwd-unreachable'
                 ? ripgrepMissingCwdError(rootPath)
                 : new RipgrepUnavailableError()
             )
           }
-        }
-      )
+        })
+        .catch((error: unknown) => {
+          if (settle()) {
+            reject(error)
+          }
+        })
     }
 
     function processLine(line: string): void {
@@ -251,6 +279,10 @@ export function searchWithRg(
       killSpawnedRipgrepProcess(child)
       resolveOnce()
     }, SEARCH_TIMEOUT_MS)
+    signal?.addEventListener('abort', onAbort, { once: true })
+    if (signal?.aborted) {
+      onAbort()
+    }
   })
 }
 
diff --git a/src/relay/fs-handler.ts b/src/relay/fs-handler.ts
index 6286c71941e9..36765721ef33 100644
--- a/src/relay/fs-handler.ts
+++ b/src/relay/fs-handler.ts
@@ -101,7 +101,7 @@ export class FsHandler {
     this.dispatcher.onRequest('fs.renameNoClobber', (p) => renameRelayPathNoClobber(p))
     this.dispatcher.onRequest('fs.copy', (p) => copyRelayPath(p))
     this.dispatcher.onRequest('fs.realpath', (p) => realpathRelayPath(p))
-    this.dispatcher.onRequest('fs.search', (p) => this.search(p))
+    this.dispatcher.onRequest('fs.search', (p, context) => this.search(p, context))
     this.dispatcher.onRequest('fs.getCapabilities', async () => ({
       quickOpenSearchVersion: 1,
       rangedReadVersion: 1,
@@ -185,7 +185,7 @@ export class FsHandler {
     })
   }
 
-  private async search(params: Record<string, unknown>) {
+  private async search(params: Record<string, unknown>, context?: RequestContext) {
     const query = params.query as string
     const rootPath = expandTilde(params.rootPath as string)
     const caseSensitive = params.caseSensitive as boolean | undefined
@@ -204,7 +204,8 @@ export class FsHandler {
       useRegex,
       includePattern,
       excludePattern,
-      maxResults
+      maxResults,
+      signal: context?.signal
     }
     try {
       return await searchWithRg(rootPath, query, options)
diff --git a/src/relay/fs-search-cancellation.test.ts b/src/relay/fs-search-cancellation.test.ts
new file mode 100644
index 000000000000..329c74f07b4f
--- /dev/null
+++ b/src/relay/fs-search-cancellation.test.ts
@@ -0,0 +1,239 @@
+import { ChildProcess } from 'node:child_process'
+import type * as ChildProcessModule from 'node:child_process'
+import type * as RipgrepAvailability from '../shared/ripgrep-process-availability'
+import { getEventListeners } from 'node:events'
+import { PassThrough } from 'node:stream'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { spawnMock, resolveCommand, retryOnPath, classifyFailure } = vi.hoisted(() => ({
+  spawnMock: vi.fn(),
+  resolveCommand: vi.fn((): string | null => '/tools/rg'),
+  retryOnPath: vi.fn(async () => false),
+  classifyFailure: vi.fn(
+    async (): Promise<'cwd-unreachable' | 'ripgrep-unavailable'> => 'ripgrep-unavailable'
+  )
+}))
+vi.mock('node:child_process', async (importOriginal) => ({
+  ...(await importOriginal<typeof ChildProcessModule>()),
+  spawn: spawnMock
+}))
+vi.mock('../shared/ripgrep-process-availability', async (importOriginal) => ({
+  ...(await importOriginal<typeof RipgrepAvailability>()),
+  classifyRipgrepLaunchFailure: classifyFailure
+}))
+vi.mock('./relay-bundled-ripgrep', () => ({
+  resolveRelayRipgrepCommand: resolveCommand,
+  pathRipgrepCommand: () => '/tools/rg',
+  retryRipgrepOnPathAfterLaunchFailure: retryOnPath
+}))
+
+import { searchWithRg } from './fs-handler-utils'
+import { searchWithGitGrep } from './fs-handler-git-fallback'
+import { RelayDispatcher } from './dispatcher'
+import { FsHandler } from './fs-handler'
+import { RelayContext } from './context'
+import { encodeJsonRpcFrame } from './protocol'
+
+function createProcess(spawned = true) {
+  const child = new ChildProcess()
+  child.stdout = new PassThrough()
+  child.stderr = new PassThrough()
+  Object.defineProperty(child, 'pid', { value: spawned ? 4321 : undefined })
+  child.kill = vi.fn(() => true)
+  return child
+}
+
+beforeEach(() => {
+  vi.useFakeTimers()
+  spawnMock.mockReset()
+  resolveCommand.mockReturnValue('/tools/rg')
+  retryOnPath.mockResolvedValue(false)
+  classifyFailure.mockResolvedValue('ripgrep-unavailable')
+})
+afterEach(() => {
+  vi.restoreAllMocks()
+  vi.useRealTimers()
+})
+
+describe.each([
+  { name: 'ripgrep', search: searchWithRg },
+  { name: 'git grep', search: searchWithGitGrep }
+])('relay $name search cancellation', ({ search }) => {
+  it('does not start a child for an already canceled request', async () => {
+    const controller = new AbortController()
+    controller.abort()
+    await expect(
+      search('/remote/root', 'needle', { maxResults: 100, signal: controller.signal })
+    ).rejects.toMatchObject({ name: 'AbortError' })
+    expect(spawnMock).not.toHaveBeenCalled()
+  })
+
+  it('releases a canceled search even when its child never reports an exit', async () => {
+    const child = createProcess()
+    spawnMock.mockReturnValue(child)
+    const controller = new AbortController()
+    const result = search('/remote/root', 'needle', { maxResults: 100, signal: controller.signal })
+    const rejected = expect(result).rejects.toMatchObject({ name: 'AbortError' })
+    child.stdout?.emit('data', 'unfinished output')
+
+    controller.abort()
+    await rejected
+
+    expect(child.kill).toHaveBeenCalledOnce()
+    expect(child.stdout?.listenerCount('data')).toBe(0)
+    expect(child.stderr?.listenerCount('data')).toBe(0)
+    expect(child.listenerCount('close')).toBe(0)
+    expect(child.listenerCount('error')).toBe(0)
+    expect(getEventListeners(controller.signal, 'abort')).toHaveLength(0)
+    expect(vi.getTimerCount()).toBe(0)
+    child.emit('close', 0, null)
+    expect(spawnMock).toHaveBeenCalledOnce()
+  })
+
+  it('removes the abort listener after normal completion', async () => {
+    const child = createProcess()
+    spawnMock.mockReturnValue(child)
+    const controller = new AbortController()
+    const result = search('/remote/root', 'needle', { maxResults: 100, signal: controller.signal })
+    child.emit('close', 0, null)
+    await expect(result).resolves.toEqual({ files: [], totalMatches: 0, truncated: false })
+    expect(getEventListeners(controller.signal, 'abort')).toHaveLength(0)
+    controller.abort()
+    expect(child.kill).not.toHaveBeenCalled()
+  })
+
+  it('absorbs a queued spawn error after cancellation without signaling a missing PID', async () => {
+    const child = createProcess(false)
+    spawnMock.mockReturnValue(child)
+    const controller = new AbortController()
+    const result = search('/remote/root', 'needle', { maxResults: 100, signal: controller.signal })
+    const rejected = expect(result).rejects.toMatchObject({ name: 'AbortError' })
+    controller.abort()
+    await rejected
+    expect(child.kill).not.toHaveBeenCalled()
+    expect(() => child.emit('error', new Error('spawn ENOENT'))).not.toThrow()
+    expect(child.listenerCount('error')).toBe(0)
+  })
+})
+
+it('does not retry on PATH after cancellation during launch-failure diagnosis', async () => {
+  let finishRetry: (retry: boolean) => void = () => undefined
+  retryOnPath.mockReturnValueOnce(
+    new Promise<boolean>((resolve) => {
+      finishRetry = resolve
+    })
+  )
+  const child = createProcess(false)
+  spawnMock.mockReturnValue(child)
+  const controller = new AbortController()
+  const result = searchWithRg('/remote/root', 'needle', {
+    maxResults: 100,
+    signal: controller.signal
+  })
+  const rejected = expect(result).rejects.toMatchObject({ name: 'AbortError' })
+  child.emit('error', new Error('spawn ENOENT'))
+  controller.abort()
+  await rejected
+  finishRetry(true)
+  await Promise.resolve()
+  expect(spawnMock).toHaveBeenCalledOnce()
+})
+
+it('settles cancellation while launch-failure classification is still pending', async () => {
+  let finishClassification: (failure: 'ripgrep-unavailable') => void = () => undefined
+  classifyFailure.mockReturnValueOnce(
+    new Promise((resolve) => {
+      finishClassification = resolve
+    })
+  )
+  const child = createProcess(false)
+  spawnMock.mockReturnValue(child)
+  const controller = new AbortController()
+  const result = searchWithRg('/remote/root', 'needle', {
+    maxResults: 100,
+    signal: controller.signal
+  })
+  const rejected = expect(result).rejects.toMatchObject({ name: 'AbortError' })
+  child.emit('error', new Error('spawn ENOENT'))
+  await Promise.resolve()
+  controller.abort()
+  await rejected
+  finishClassification('ripgrep-unavailable')
+  await Promise.resolve()
+  expect(spawnMock).toHaveBeenCalledOnce()
+  expect(getEventListeners(controller.signal, 'abort')).toHaveLength(0)
+  expect(vi.getTimerCount()).toBe(0)
+})
+
+describe.each(['ripgrep', 'git grep'])('relay dispatcher cancels %s', (backend) => {
+  it.each(['detach', 'rpc.cancel', 'dispose'])(
+    'removes every search child and listener on %s',
+    async (cause) => {
+      if (backend === 'git grep') {
+        resolveCommand.mockReturnValue(null)
+      }
+      const children: ReturnType<typeof createProcess>[] = []
+      spawnMock.mockImplementation(() => {
+        const child = createProcess()
+        children.push(child)
+        return child
+      })
+      const dispatcher = new RelayDispatcher(() => true)
+      const handler = new FsHandler(dispatcher, new RelayContext(), {
+        dispose: vi.fn(),
+        forgetRoot: vi.fn(),
+        subscribe: vi.fn()
+      })
+      try {
+        const client = dispatcher.attachClient(() => true)
+        for (let id = 1; id <= 25; id++) {
+          dispatcher.feedClient(
+            client,
+            encodeJsonRpcFrame(
+              {
+                jsonrpc: '2.0',
+                id,
+                method: 'fs.search',
+                params: { rootPath: '/remote/root', query: 'needle' }
+              },
+              id,
+              0
+            )
+          )
+        }
+        await Promise.resolve()
+        expect(children).toHaveLength(25)
+        if (cause === 'detach') {
+          dispatcher.detachClient(client)
+        } else if (cause === 'dispose') {
+          dispatcher.dispose()
+        } else {
+          for (let id = 1; id <= 25; id++) {
+            dispatcher.feedClient(
+              client,
+              encodeJsonRpcFrame(
+                { jsonrpc: '2.0', method: 'rpc.cancel', params: { id } },
+                id + 25,
+                0
+              )
+            )
+          }
+        }
+        await Promise.resolve()
+        for (const child of children) {
+          expect(child.kill).toHaveBeenCalledOnce()
+          expect(child.stdout?.listenerCount('data')).toBe(0)
+          expect(child.listenerCount('close')).toBe(0)
+        }
+        expect(spawnMock).toHaveBeenCalledTimes(25)
+      } finally {
+        handler.dispose()
+        dispatcher.dispose()
+        for (const child of children) {
+          child.emit('close', 0, null)
+        }
+      }
+      expect(vi.getTimerCount()).toBe(0)
+    }
+  )
+})
diff --git a/src/relay/fs-search-diagnosis-cancellation.test.ts b/src/relay/fs-search-diagnosis-cancellation.test.ts
new file mode 100644
index 000000000000..e545c68485ab
--- /dev/null
+++ b/src/relay/fs-search-diagnosis-cancellation.test.ts
@@ -0,0 +1,190 @@
+import { ChildProcess } from 'node:child_process'
+import type * as ChildProcessModule from 'node:child_process'
+import type * as FsPromises from 'node:fs/promises'
+import { PassThrough } from 'node:stream'
+import { getEventListeners } from 'node:events'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+
+const { spawnMock, statMock } = vi.hoisted(() => ({ spawnMock: vi.fn(), statMock: vi.fn() }))
+vi.mock('node:child_process', async (importOriginal) => ({
+  ...(await importOriginal<typeof ChildProcessModule>()),
+  spawn: spawnMock
+}))
+vi.mock('node:fs/promises', async (importOriginal) => ({
+  ...(await importOriginal<typeof FsPromises>()),
+  stat: statMock,
+  access: vi.fn(async () => undefined)
+}))
+vi.mock('./relay-bundled-ripgrep', () => ({
+  resolveRelayRipgrepCommand: () => '/tools/rg',
+  pathRipgrepCommand: () => '/tools/rg',
+  retryRipgrepOnPathAfterLaunchFailure: async () => false
+}))
+import { searchWithRg } from './fs-handler-utils'
+import { classifyRipgrepLaunchFailure } from '../shared/ripgrep-process-availability'
+import { searchWithGitGrep } from './fs-handler-git-search'
+
+function child(spawned: boolean) {
+  const result = new ChildProcess()
+  result.stdout = new PassThrough()
+  result.stderr = new PassThrough()
+  Object.defineProperty(result, 'pid', { value: spawned ? 4321 : undefined })
+  result.kill = vi.fn(() => true)
+  return result
+}
+beforeEach(() => {
+  vi.useFakeTimers()
+  spawnMock.mockReset()
+  statMock.mockReset().mockResolvedValue({ isDirectory: () => false })
+})
+afterEach(() => vi.useRealTimers())
+it('does not start a version probe after canceled launch diagnosis resumes', async () => {
+  vi.useFakeTimers()
+  let completeStat: (value: { isDirectory: () => boolean }) => void = () => undefined
+  statMock.mockReturnValue(
+    new Promise((resolve) => {
+      completeStat = resolve
+    })
+  )
+  const failed = child(false)
+  const probe = child(true)
+  spawnMock.mockReturnValueOnce(failed).mockReturnValue(probe)
+  const controller = new AbortController()
+  const search = searchWithRg('/missing/root', 'needle', {
+    maxResults: 100,
+    signal: controller.signal
+  })
+  const canceled = expect(search).rejects.toMatchObject({ name: 'AbortError' })
+  failed.emit('error', new Error('spawn ENOENT'))
+  for (let tick = 0; tick < 5; tick += 1) {
+    await Promise.resolve()
+  }
+  expect(statMock).toHaveBeenCalledOnce()
+  controller.abort()
+  await canceled
+  completeStat({ isDirectory: () => false })
+  for (let tick = 0; tick < 10; tick += 1) {
+    await Promise.resolve()
+  }
+  const observed = spawnMock.mock.calls.map((args) => [args[0], args[1]])
+  probe.emit('close', 0)
+  expect(observed).toEqual([['/tools/rg', expect.not.arrayContaining(['--version'])]])
+})
+
+for (const [name, search] of [
+  ['rg', searchWithRg],
+  ['git', searchWithGitGrep]
+] as const) {
+  it.each(['emit', 'throw'])(
+    `settles ${name} cancellation when kill fails via %s`,
+    async (mode) => {
+      const process = child(true)
+      process.kill = vi.fn(() => {
+        const error = Object.assign(new Error('kill EPERM'), { code: 'EPERM' })
+        if (mode === 'throw') {
+          throw error
+        }
+        process.emit('error', error)
+        return false
+      })
+      spawnMock.mockReturnValue(process)
+      const controller = new AbortController()
+      const result = search('/root', 'needle', { maxResults: 100, signal: controller.signal })
+      const canceled = expect(result).rejects.toMatchObject({ name: 'AbortError' })
+      expect(() => controller.abort()).not.toThrow()
+      await canceled
+      expect(process.kill).toHaveBeenCalledOnce()
+      expect(process.stdout?.listenerCount('data')).toBe(0)
+      expect(getEventListeners(controller.signal, 'abort')).toHaveLength(0)
+      expect(vi.getTimerCount()).toBe(0)
+    }
+  )
+}
+
+it('terminates an active version probe and skips remaining candidates on abort', async () => {
+  const probe = child(true)
+  spawnMock.mockReturnValue(probe)
+  const controller = new AbortController()
+  const diagnosis = classifyRipgrepLaunchFailure(
+    '/missing/root',
+    ['/tools/rg', '/fallback/rg'],
+    {},
+    controller.signal
+  )
+  const canceled = expect(diagnosis).rejects.toMatchObject({ name: 'AbortError' })
+  for (let tick = 0; tick < 5; tick += 1) {
+    await Promise.resolve()
+  }
+  expect(spawnMock).toHaveBeenCalledOnce()
+  controller.abort()
+  await canceled
+  expect(probe.kill).toHaveBeenCalledOnce()
+  expect(probe.listenerCount('close')).toBe(0)
+  expect(getEventListeners(controller.signal, 'abort')).toHaveLength(0)
+  expect(vi.getTimerCount()).toBe(0)
+  probe.emit('close', 0)
+  expect(spawnMock).toHaveBeenCalledOnce()
+})
+
+it('preserves candidate fallback and cwd classification for a live caller', async () => {
+  const missing = child(true)
+  const available = child(true)
+  spawnMock.mockReturnValueOnce(missing).mockReturnValueOnce(available)
+  const controller = new AbortController()
+  const diagnosis = classifyRipgrepLaunchFailure(
+    '/missing/root',
+    ['/tools/rg', '/fallback/rg'],
+    {},
+    controller.signal
+  )
+  for (let tick = 0; tick < 5; tick += 1) {
+    await Promise.resolve()
+  }
+  missing.emit('close', 1)
+  for (let tick = 0; tick < 5; tick += 1) {
+    await Promise.resolve()
+  }
+  available.emit('close', 0)
+  await expect(diagnosis).resolves.toBe('cwd-unreachable')
+  expect(spawnMock.mock.calls.map(([program, args]) => [program, args])).toEqual([
+    ['/tools/rg', ['--version']],
+    ['/fallback/rg', ['--version']]
+  ])
+  expect(getEventListeners(controller.signal, 'abort')).toHaveLength(0)
+  expect(vi.getTimerCount()).toBe(0)
+  expect(missing.kill).not.toHaveBeenCalled()
+  expect(available.kill).not.toHaveBeenCalled()
+})
+
+it.each(['emit', 'throw'])(
+  'settles version-probe cancellation when kill fails via %s',
+  async (mode) => {
+    const probe = child(true)
+    probe.kill = vi.fn(() => {
+      const error = Object.assign(new Error('kill EPERM'), { code: 'EPERM' })
+      if (mode === 'throw') {
+        throw error
+      }
+      probe.emit('error', error)
+      return false
+    })
+    spawnMock.mockReturnValue(probe)
+    const controller = new AbortController()
+    const diagnosis = classifyRipgrepLaunchFailure(
+      '/missing/root',
+      ['/tools/rg', '/fallback/rg'],
+      {},
+      controller.signal
+    )
+    const canceled = expect(diagnosis).rejects.toMatchObject({ name: 'AbortError' })
+    for (let tick = 0; tick < 5; tick += 1) {
+      await Promise.resolve()
+    }
+    expect(() => controller.abort()).not.toThrow()
+    await canceled
+    expect(probe.kill).toHaveBeenCalledOnce()
+    expect(spawnMock).toHaveBeenCalledOnce()
+    expect(getEventListeners(controller.signal, 'abort')).toHaveLength(0)
+    expect(vi.getTimerCount()).toBe(0)
+  }
+)
diff --git a/src/relay/managed-hook-installer.ts b/src/relay/managed-hook-installer.ts
index 3fa57dd5ed84..e88089f486ad 100644
--- a/src/relay/managed-hook-installer.ts
+++ b/src/relay/managed-hook-installer.ts
@@ -6,7 +6,7 @@ import {
 import type { RelayDispatcher, RequestContext } from './dispatcher'
 import type { AgentHookTarget } from '../shared/agent-hook-types'
 import { isManagedAgentHookTarget } from '../shared/managed-agent-hook-targets'
-import { parseClaudeCliVersion } from '../main/claude/claude-session-end-hook-capability'
+import { parseClaudeCliVersion } from '../main/claude/claude-hook-event-versions'
 
 export type ManagedHookInstallSummary = {
   installers: number
diff --git a/src/relay/omp-fresh-launch-environment.test.ts b/src/relay/omp-fresh-launch-environment.test.ts
index 5f7cd57681f5..8697368567f2 100644
--- a/src/relay/omp-fresh-launch-environment.test.ts
+++ b/src/relay/omp-fresh-launch-environment.test.ts
@@ -91,7 +91,7 @@ it('prepares the execution host OMP config and status extension for a guarded la
     source.mockReturnValue(false)
     expect(
       await augment.mock.calls[1][0]({ id: 'other', shell: '/bin/bash', env: {}, command: 'codex' })
-    ).toEqual({ ORCA_OPENCODE_AGENT: 'opencode' })
+    ).toEqual({})
   } finally {
     runtime.stop()
     dispatcher.dispose()
diff --git a/src/relay/opencode-canonical-config.ts b/src/relay/opencode-canonical-config.ts
index 4bcb9f3e151a..38682d3f2746 100644
--- a/src/relay/opencode-canonical-config.ts
+++ b/src/relay/opencode-canonical-config.ts
@@ -1,6 +1,7 @@
 import { mkdirSync, unlinkSync, writeFileSync } from 'node:fs'
 import { isAbsolute, join, relative, resolve } from 'node:path'
 import { resolveOpenCodeConfigDirectory } from '../shared/opencode-config-directory'
+import { isInstalledOpenCodePluginCurrent } from '../shared/opencode-installed-plugin'
 
 const RELAY_HOOKS_DIR = '.orca-relay'
 
@@ -18,12 +19,14 @@ export function installOpenCodePluginInCanonicalConfig(
       agent === 'opencode2' ? 'orca-opencode2-status.js' : 'orca-opencode-status.js'
     const pluginPath = join(configDir, 'plugins', pluginFileName)
     mkdirSync(join(configDir, 'plugins'), { recursive: true })
-    try {
-      unlinkSync(pluginPath)
-    } catch {
-      // The file may not exist on the first install.
+    if (!isInstalledOpenCodePluginCurrent(pluginPath, source)) {
+      try {
+        unlinkSync(pluginPath)
+      } catch {
+        // The file may not exist on the first install.
+      }
+      writeFileSync(pluginPath, source)
     }
-    writeFileSync(pluginPath, source)
     return true
   } catch (err) {
     process.stderr.write(
diff --git a/src/relay/opencode-hook-selection.test.ts b/src/relay/opencode-hook-selection.test.ts
new file mode 100644
index 000000000000..336db284a476
--- /dev/null
+++ b/src/relay/opencode-hook-selection.test.ts
@@ -0,0 +1,188 @@
+import './mock-descendant-sweep'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { beginPtyHandlerTest, endPtyHandlerTest } from './pty-handler-test-harness'
+import { RelayAgentHookRuntime } from './relay-agent-hook-runtime'
+import type { RelayDispatcher } from './dispatcher'
+import { AGENT_HOOK_INSTALL_PLUGINS_METHOD } from '../shared/agent-hook-relay'
+
+const mocks = vi.hoisted(() => ({
+  mockPtySpawn: vi.fn(),
+  mockCreateShellPromptReadinessProbe: vi.fn(),
+  mockPtyInstance: {
+    pid: process.pid,
+    onData: vi.fn(),
+    onExit: vi.fn(),
+    write: vi.fn(),
+    resize: vi.fn(),
+    kill: vi.fn(),
+    clear: vi.fn(),
+    pause: vi.fn(),
+    resume: vi.fn()
+  }
+}))
+vi.mock('node-pty', () => ({ spawn: mocks.mockPtySpawn }))
+vi.mock('../main/shell-prompt-readiness-probe', () => ({
+  createShellPromptReadinessProbe: mocks.mockCreateShellPromptReadinessProbe
+}))
+vi.mock('../main/pty/posix-pty-process-groups', () => ({
+  forceKillPosixPtyProcessGroups: vi.fn((_pid: number, fallback: () => void) => fallback())
+}))
+vi.mock('./agent-hook-server', () => ({
+  RelayAgentHookServer: class {
+    start = async () => {}
+    stop = () => {}
+    buildPtyEnv = () => ({ ORCA_AGENT_HOOK_PORT: '12345' })
+    clearPaneState = () => {}
+  }
+}))
+let root: string
+let harness: ReturnType<typeof beginPtyHandlerTest>
+let runtime: RelayAgentHookRuntime
+let custom: string
+const plugin = (dir: string, agent: string) => join(dir, 'plugins', `orca-${agent}-status.js`)
+
+beforeEach(async () => {
+  root = mkdtempSync(join(tmpdir(), 'orca-relay-disabled-'))
+  custom = join(root, 'custom')
+  mkdirSync(custom)
+  writeFileSync(join(custom, 'opencode.json'), '{"model":"fixture"}')
+  vi.stubEnv('HOME', root)
+  vi.stubEnv('XDG_CONFIG_HOME', join(root, 'xdg'))
+  for (const key of [
+    'OPENCODE_CONFIG_DIR',
+    'ORCA_OPENCODE_CONFIG_DIR',
+    'ORCA_OPENCODE_SOURCE_CONFIG_DIR',
+    'ORCA_OPENCODE_AGENT',
+    'ZDOTDIR'
+  ]) {
+    vi.stubEnv(key, undefined)
+  }
+  harness = beginPtyHandlerTest(mocks)
+  runtime = new RelayAgentHookRuntime(
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this harness implements the request registration used by the runtime; PTY and disk paths are real.
+    harness.dispatcher as unknown as RelayDispatcher,
+    harness.handler,
+    join(root, 'relay.sock')
+  )
+  await runtime.start()
+})
+afterEach(async () => {
+  runtime.stop()
+  await endPtyHandlerTest(harness.handler, harness.originalPlatform)
+  vi.unstubAllEnvs()
+  rmSync(root, { recursive: true, force: true })
+})
+async function install(v1: string, v2: string): Promise<void> {
+  await harness.dispatcher.callRequest(AGENT_HOOK_INSTALL_PLUGINS_METHOD, {
+    opencodePluginSource: v1,
+    opencode2PluginSource: v2
+  })
+}
+async function spawn(params: Record<string, unknown> = {}): Promise<Record<string, string>> {
+  await harness.dispatcher.callRequest('pty.spawn', {
+    cwd: root,
+    shell: '/bin/bash',
+    cols: 80,
+    rows: 24,
+    command: 'echo fixture',
+    ...params
+  })
+  return mocks.mockPtySpawn.mock.calls.at(-1)?.[2].env
+}
+
+describe('relay OpenCode source selection on real fixture files', () => {
+  it('leaves a standalone relay without supplied sources unconfigured', async () => {
+    const env = await spawn()
+    expect(env.ORCA_OPENCODE_AGENT).toBeUndefined()
+    expect(existsSync(join(root, 'xdg', 'opencode'))).toBe(false)
+  })
+  it.each([
+    { v1: '// v1', v2: '// v2', selected: 'opencode' },
+    { v1: '', v2: '// v2', selected: 'opencode2' },
+    { v1: '// v1', v2: '', selected: 'opencode' },
+    { v1: '', v2: '', selected: undefined }
+  ])('ordinary terminal with sources $v1 / $v2', async ({ v1, v2, selected }) => {
+    await install(v1, v2)
+    const env = await spawn()
+    expect(env.ORCA_OPENCODE_AGENT).toBe(selected)
+    for (const agent of ['opencode', 'opencode2']) {
+      expect(existsSync(plugin(join(root, 'xdg', 'opencode'), agent))).toBe(agent === selected)
+    }
+  })
+  it.each(['opencode', 'opencode2'] as const)(
+    'does not substitute another plugin for disabled explicit %s',
+    async (agent) => {
+      await install(agent === 'opencode' ? '' : '// v1', agent === 'opencode2' ? '' : '// v2')
+      for (const params of [{ command: `${agent} --session fixture` }, { launchAgent: agent }]) {
+        const env = await spawn(params)
+        expect(env.ORCA_OPENCODE_AGENT).toBeUndefined()
+        expect(existsSync(join(root, 'xdg', 'opencode'))).toBe(false)
+      }
+    }
+  )
+  it('updates cached sources on one runtime and leaves old plugin files intact', async () => {
+    await install('// v1', '// v2')
+    await spawn()
+    const original = plugin(join(root, 'xdg', 'opencode'), 'opencode')
+    writeFileSync(original, '// sentinel')
+    await install('', '// v2')
+    expect((await spawn()).ORCA_OPENCODE_AGENT).toBe('opencode2')
+    expect(readFileSync(original, 'utf8')).toBe('// sentinel')
+    await install('// refreshed v1', '// v2')
+    expect((await spawn()).ORCA_OPENCODE_AGENT).toBe('opencode')
+    expect(readFileSync(original, 'utf8')).toBe('// refreshed v1')
+  })
+  it('restores the real custom source when all OpenCode sources are revoked', async () => {
+    await install('// v1', '// v2')
+    const first = await spawn({ env: { OPENCODE_CONFIG_DIR: custom } })
+    const path = plugin(first.OPENCODE_CONFIG_DIR, 'opencode')
+    expect(readFileSync(path, 'utf8')).toBe('// v1')
+    await install('', '')
+    const env = await spawn({ env: first })
+    expect(env.OPENCODE_CONFIG_DIR).toBe(custom)
+    expect(env.ORCA_OPENCODE_AGENT).toBeUndefined()
+    expect(env.ORCA_OPENCODE_CONFIG_DIR).toBeUndefined()
+    expect(env.ORCA_OPENCODE_SOURCE_CONFIG_DIR).toBeUndefined()
+    expect(readFileSync(path, 'utf8')).toBe('// v1')
+    expect(env.ORCA_AGENT_HOOK_PORT).toBe('12345')
+  })
+})
+
+it.each([true, false])(
+  'preserves explicit config over inherited relay markers with hooks %s',
+  async (enabled) => {
+    await install(enabled ? '// v1' : '', '')
+    const stale = join(root, 'stale-source')
+    mkdirSync(stale)
+    writeFileSync(join(stale, 'opencode.json'), '{"model":"stale"}')
+    vi.stubEnv('ORCA_OPENCODE_CONFIG_DIR', join(root, 'old-overlay'))
+    vi.stubEnv('ORCA_OPENCODE_SOURCE_CONFIG_DIR', stale)
+    const env = await spawn({ env: { OPENCODE_CONFIG_DIR: custom } })
+    expect(readFileSync(join(env.OPENCODE_CONFIG_DIR, 'opencode.json'), 'utf8')).toBe(
+      '{"model":"fixture"}'
+    )
+    expect(env.ORCA_OPENCODE_SOURCE_CONFIG_DIR).toBe(enabled ? custom : undefined)
+    expect(existsSync(plugin(stale, 'opencode'))).toBe(false)
+  }
+)
+
+it.each([true, false])(
+  'restores legacy source-only overlay markers with hooks %s',
+  async (enabled) => {
+    await install('// v1', '')
+    const parent = await spawn({ env: { OPENCODE_CONFIG_DIR: custom } })
+    delete parent.ORCA_OPENCODE_CONFIG_DIR
+    if (!enabled) {
+      await install('', '')
+    }
+    const env = await spawn({ env: parent })
+    expect(env.OPENCODE_CONFIG_DIR).toEqual(enabled ? expect.any(String) : custom)
+    expect(readFileSync(join(env.OPENCODE_CONFIG_DIR, 'opencode.json'), 'utf8')).toBe(
+      '{"model":"fixture"}'
+    )
+    expect(env.ORCA_OPENCODE_SOURCE_CONFIG_DIR).toBe(enabled ? custom : undefined)
+  }
+)
diff --git a/src/relay/plugin-overlay.test.ts b/src/relay/plugin-overlay.test.ts
index 14feb631876c..d4d38a31fba5 100644
--- a/src/relay/plugin-overlay.test.ts
+++ b/src/relay/plugin-overlay.test.ts
@@ -1,12 +1,15 @@
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import {
   existsSync,
+  lstatSync,
   mkdirSync,
   mkdtempSync,
   readFileSync,
   readdirSync,
   rmSync,
+  statSync,
   symlinkSync,
+  utimesSync,
   writeFileSync
 } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -74,6 +77,50 @@ describe('PluginOverlayManager', () => {
     ).toBe('v2 plugin')
   })
 
+  // Why: OpenCode 2 reloads a plugin whose file mtime changed, even with unchanged bytes.
+  it('leaves a current canonical plugin untouched and replaces a stale one', () => {
+    const env = { XDG_CONFIG_HOME: join(homeDir, 'xdg') }
+    const pluginPath = join(homeDir, 'xdg', 'opencode', 'plugins', 'orca-opencode2-status.js')
+    manager.setSources({ opencode2PluginSource: 'v2 plugin' })
+    manager.installOpenCodePlugin('opencode2', env)
+    const past = new Date('2020-01-01T00:00:00Z')
+    utimesSync(pluginPath, past, past)
+
+    expect(manager.installOpenCodePlugin('opencode2', env)).toBe(true)
+    expect(statSync(pluginPath).mtimeMs).toBe(past.getTime())
+
+    manager.setSources({ opencode2PluginSource: 'v2 plugin, next release' })
+    expect(manager.installOpenCodePlugin('opencode2', env)).toBe(true)
+    expect(readFileSync(pluginPath, 'utf8')).toBe('v2 plugin, next release')
+  })
+
+  // Why: OpenCode 2 loads through a file-level symlink (dotfile managers) and stats its target.
+  it.skipIf(process.platform === 'win32')(
+    'leaves a symlinked canonical plugin with current bytes untouched',
+    () => {
+      const env = { XDG_CONFIG_HOME: join(homeDir, 'xdg') }
+      const pluginsDir = join(homeDir, 'xdg', 'opencode', 'plugins')
+      const pluginPath = join(pluginsDir, 'orca-opencode2-status.js')
+      const targetPath = join(homeDir, 'dotfiles-orca-opencode2-status.js')
+      mkdirSync(pluginsDir, { recursive: true })
+      writeFileSync(targetPath, 'v2 plugin')
+      symlinkSync(targetPath, pluginPath)
+      const past = new Date('2020-01-01T00:00:00Z')
+      utimesSync(targetPath, past, past)
+      manager.setSources({ opencode2PluginSource: 'v2 plugin' })
+
+      expect(manager.installOpenCodePlugin('opencode2', env)).toBe(true)
+      expect(lstatSync(pluginPath).isSymbolicLink()).toBe(true)
+      expect(statSync(targetPath).mtimeMs).toBe(past.getTime())
+
+      manager.setSources({ opencode2PluginSource: 'v2 plugin, next release' })
+      expect(manager.installOpenCodePlugin('opencode2', env)).toBe(true)
+      expect(lstatSync(pluginPath).isFile()).toBe(true)
+      expect(readFileSync(pluginPath, 'utf8')).toBe('v2 plugin, next release')
+      expect(readFileSync(targetPath, 'utf8')).toBe('v2 plugin')
+    }
+  )
+
   it('mirrors a preexisting remote OpenCode config dir before adding Orca plugin', () => {
     const userConfigDir = join(homeDir, 'company-opencode')
     mkdirSync(join(userConfigDir, 'plugins'), { recursive: true })
diff --git a/src/relay/plugin-overlay.ts b/src/relay/plugin-overlay.ts
index 1c1c52000336..001309c1f931 100644
--- a/src/relay/plugin-overlay.ts
+++ b/src/relay/plugin-overlay.ts
@@ -79,7 +79,7 @@ function isUsableId(id: string): boolean {
   return typeof id === 'string' && id.length > 0 && id.length <= 1024
 }
 export type PluginSources = {
-  /** Source body of `orca-opencode-status.js` to drop into <overlay>/plugins/. */
+  /** Empty string revokes future installs; omission preserves the cached source. */
   opencodePluginSource?: string
   /** Source body of OpenCode 2's status plugin. */
   opencode2PluginSource?: string
@@ -158,7 +158,7 @@ export class PluginOverlayManager {
     }
   }
   hasOpenCodeSource(agent: 'opencode' | 'opencode2' = 'opencode'): boolean {
-    return (agent === 'opencode2' ? this.opencode2PluginSource : this.opencodePluginSource) !== null
+    return Boolean(agent === 'opencode2' ? this.opencode2PluginSource : this.opencodePluginSource)
   }
   hasPiSource(kind?: PiAgentKind): boolean {
     if (kind) {
diff --git a/src/relay/pty-handler-output-streaming.test.ts b/src/relay/pty-handler-output-streaming.test.ts
index af0a4cbdfaa5..1030d98ca42b 100644
--- a/src/relay/pty-handler-output-streaming.test.ts
+++ b/src/relay/pty-handler-output-streaming.test.ts
@@ -1,3 +1,5 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
 import './mock-descendant-sweep'
 import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest'
 import { PTY_STARTUP_INGRESS_VERSION } from '../shared/pty-startup-ingress'
@@ -150,6 +152,34 @@ describe('PtyHandler', () => {
     expect(dispatcher.notify).toHaveBeenCalledWith('pty.data', { id: PTY_1, data: 'hello world' })
   })
 
+  it('publishes Freebuff host status without charging synthetic OSC bytes to the PTY', async () => {
+    let onData: ((data: string) => void) | undefined
+    mockPtySpawn.mockReturnValue({
+      ...mockPtyInstance,
+      onData: vi.fn((callback: (data: string) => void) => {
+        onData = callback
+      })
+    })
+    await dispatcher.callRequest('pty.spawn', { launchAgent: 'freebuff', cols: 120, rows: 40 })
+    const raw = readFileSync(
+      join(import.meta.dirname, '../main/runtime/__fixtures__/freebuff-trust.txt'),
+      'utf8'
+    )
+    onData!(raw)
+    vi.advanceTimersByTime(8)
+    expect(dispatcher.notify).toHaveBeenCalledWith('pty.data', {
+      id: PTY_1,
+      data: expect.stringContaining('"state":"blocked"'),
+      rawLength: raw.length,
+      seq: raw.length,
+      transformed: true
+    })
+    dispatcher.notify.mockClear()
+    onData!('more output')
+    vi.advanceTimersByTime(8)
+    expect(dispatcher.notify).toHaveBeenCalledWith('pty.data', { id: PTY_1, data: 'more output' })
+  })
+
   it('consumes capable startup queries before relay replay and fanout', async () => {
     let dataCallback: ((data: string) => void) | undefined
     const term = {
diff --git a/src/relay/pty-handler-shell-recovery.test.ts b/src/relay/pty-handler-shell-recovery.test.ts
new file mode 100644
index 000000000000..54497cd1763b
--- /dev/null
+++ b/src/relay/pty-handler-shell-recovery.test.ts
@@ -0,0 +1,209 @@
+import './mock-descendant-sweep'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { PROCESS_BOUNDARY_GROUND } from '../shared/terminal-mode-reset-profiles'
+import { RelayDispatcher, type RelayClientSessionIdentity } from './dispatcher'
+import { encodeJsonRpcFrame, MessageType } from './protocol'
+import { PtyHandler } from './pty-handler'
+import { TEST_PTY_ID_MINT_EPOCH } from './pty-handler-test-harness'
+import { RelayPtySourcePublication } from './relay-pty-source-publication'
+import { SshPtyConsumerSessionAdapter } from './ssh-pty-consumer-session-adapter'
+
+const { mockPtySpawn, mockConfirmShellForeground } = vi.hoisted(() => ({
+  mockPtySpawn: vi.fn(),
+  mockConfirmShellForeground: vi.fn()
+}))
+
+vi.mock('node-pty', () => ({ spawn: mockPtySpawn }))
+vi.mock('../main/daemon/pty-subprocess/pty-shell-foreground-confirmation', () => ({
+  confirmPtyShellForeground: mockConfirmShellForeground
+}))
+
+const endpointIdentity: RelayClientSessionIdentity = {
+  principal: 'endpoint-principal',
+  authenticated: true,
+  allowSessionOwner: true,
+  authenticationKind: 'endpoint-credential'
+}
+
+// A command that pushed kitty keyboard flags and died without popping them.
+const DYING_COMMAND = '\x1b]133;C\x07\x1b[>1u'
+const COMMAND_DONE = '\x1b]133;D;130\x07'
+const PROMPT = '$ '
+
+type Frame = {
+  method?: string
+  id?: number
+  params?: Record<string, unknown>
+  result?: Record<string, unknown>
+}
+
+function requestFrame(id: number, method: string, params: Record<string, unknown>): Buffer {
+  return encodeJsonRpcFrame({ jsonrpc: '2.0', id, method, params }, id, 0)
+}
+
+function decode(buffer: Buffer): Frame | null {
+  if (buffer[0] !== MessageType.Regular) {
+    return null
+  }
+  const length = buffer.readUInt32BE(9)
+  return JSON.parse(buffer.subarray(13, 13 + length).toString('utf8'))
+}
+
+describe.each([
+  ['source-credit delivery', true],
+  ['legacy delivery', false]
+])('PtyHandler shell recovery over %s', (_, sourceCredit) => {
+  let dispatcher: RelayDispatcher
+  let handler: PtyHandler
+  let writes: Buffer[]
+  let emitData: (data: string) => void
+  let emitExit: (event: { exitCode: number }) => void
+  let ptyId: string
+  let originalPlatform: PropertyDescriptor | undefined
+
+  beforeEach(async () => {
+    vi.useFakeTimers()
+    originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
+    Object.defineProperty(process, 'platform', { configurable: true, value: 'linux' })
+    writes = []
+    mockConfirmShellForeground.mockReset()
+    mockPtySpawn.mockReset()
+    mockPtySpawn.mockReturnValue({
+      pid: process.pid,
+      onData: vi.fn((callback: (data: string) => void) => (emitData = callback)),
+      onExit: vi.fn((callback: (event: { exitCode: number }) => void) => (emitExit = callback)),
+      write: vi.fn(),
+      resize: vi.fn(),
+      kill: vi.fn(),
+      clear: vi.fn(),
+      pause: vi.fn(),
+      resume: vi.fn(),
+      destroy: vi.fn()
+    })
+    dispatcher = new RelayDispatcher(
+      (data, settle) => {
+        writes.push(Buffer.from(data))
+        queueMicrotask(() => settle({ ok: true }))
+        return true
+      },
+      { supportsWriteCallback: true, writableHighWaterMark: () => 0 },
+      endpointIdentity
+    )
+    handler = new PtyHandler(dispatcher, undefined, TEST_PTY_ID_MINT_EPOCH)
+    if (sourceCredit) {
+      let publication: RelayPtySourcePublication | undefined
+      const adapter = new SshPtyConsumerSessionAdapter(dispatcher, 'build-a', undefined, (id) =>
+        publication?.onCreditAvailable(id)
+      )
+      publication = new RelayPtySourcePublication(dispatcher, adapter, (id) =>
+        handler.handleSourcePublicationCapacity(id)
+      )
+      handler.setSourcePublication(publication)
+      dispatcher.feed(
+        requestFrame(1, 'pty.openClient', {
+          protocolVersion: 1,
+          clientInstanceId: 'client-1',
+          requestedRole: 'session-owner',
+          capabilities: { outputFlowControl: { versions: [1], requestedWindowSu: 256 * 1024 } }
+        })
+      )
+      await vi.advanceTimersByTimeAsync(0)
+    }
+    dispatcher.feed(requestFrame(2, 'pty.spawn', {}))
+    await vi.advanceTimersByTimeAsync(0)
+    ptyId = String(response(2)?.id)
+  })
+
+  afterEach(async () => {
+    await handler.dispose({ waitForPhysicalExit: false }).catch(() => {})
+    dispatcher.dispose()
+    if (originalPlatform) {
+      Object.defineProperty(process, 'platform', originalPlatform)
+    }
+    vi.useRealTimers()
+  })
+
+  function response(id: number): Record<string, unknown> | undefined {
+    return writes.map(decode).find((frame) => frame?.id === id)?.result
+  }
+
+  function published(): string {
+    const frames = writes.map(decode).filter((frame) => frame?.method === 'pty.data')
+    if (sourceCredit) {
+      expect(frames.every((frame) => frame?.params?.sourceLengthSu !== undefined)).toBe(true)
+    }
+    return frames.map((frame) => frame?.params?.data).join('')
+  }
+
+  async function replay(): Promise<string> {
+    dispatcher.feed(
+      requestFrame(3, 'pty.attach', {
+        id: ptyId,
+        requireReplay: true,
+        suppressReplayNotification: true
+      })
+    )
+    await vi.advanceTimersByTimeAsync(0)
+    return String(response(3)?.replay ?? '')
+  }
+
+  async function stream(...chunks: string[]): Promise<void> {
+    for (const chunk of chunks) {
+      emitData(chunk)
+    }
+    await vi.advanceTimersByTimeAsync(50)
+  }
+
+  it('grounds a dead command before the prompt, live and in replay alike', async () => {
+    mockConfirmShellForeground.mockResolvedValue(true)
+    await stream(DYING_COMMAND, `${COMMAND_DONE}${PROMPT}`)
+
+    const expected = `${DYING_COMMAND}${COMMAND_DONE}${PROCESS_BOUNDARY_GROUND}${PROMPT}`
+    expect(mockConfirmShellForeground).toHaveBeenCalledOnce()
+    expect(published()).toBe(expected)
+    expect(await replay()).toBe(expected)
+  })
+
+  it('leaves the bytes unchanged when the shell does not own the foreground', async () => {
+    mockConfirmShellForeground.mockResolvedValue(false)
+    await stream(DYING_COMMAND, `${COMMAND_DONE}${PROMPT}`)
+
+    const expected = `${DYING_COMMAND}${COMMAND_DONE}${PROMPT}`
+    expect(published()).toBe(expected)
+    expect(await replay()).toBe(expected)
+  })
+
+  it('delivers a dying app’s oversized final frame and the ground behind it', async () => {
+    mockConfirmShellForeground.mockResolvedValue(true)
+    const finalFrame = 'x'.repeat(20 * 1024)
+    await stream(DYING_COMMAND, `${finalFrame}${COMMAND_DONE}${PROMPT}`)
+
+    const expected = `${DYING_COMMAND}${finalFrame}${COMMAND_DONE}${PROCESS_BOUNDARY_GROUND}${PROMPT}`
+    expect(published()).toBe(expected)
+    expect(await replay()).toBe(expected)
+  })
+
+  it('flushes the held prompt when the shell exits mid-proof', async () => {
+    mockConfirmShellForeground.mockReturnValue(new Promise(() => {}))
+    await stream(DYING_COMMAND, `${COMMAND_DONE}${PROMPT}`)
+    expect(published()).not.toContain(PROMPT)
+
+    emitExit({ exitCode: 0 })
+    await vi.advanceTimersByTimeAsync(50)
+
+    expect(published()).toBe(`${DYING_COMMAND}${COMMAND_DONE}${PROMPT}`)
+  })
+
+  it('grounds replay, not the live stream, on Reset Terminal after an unhooked crash', async () => {
+    // Armed with no command end: nothing the host barrier could ground at.
+    const unhookedCrash = '\x1b[>1u\x1b[?1000h'
+    await stream(unhookedCrash, PROMPT)
+
+    dispatcher.feed(requestFrame(4, 'pty.resetInputModes', { id: ptyId }))
+    await vi.advanceTimersByTimeAsync(50)
+
+    // The client grounds its own view; a zero-raw span would not cross the credit window.
+    expect(published()).toBe(`${unhookedCrash}${PROMPT}`)
+    expect(await replay()).toBe(`${unhookedCrash}${PROMPT}${PROCESS_BOUNDARY_GROUND}`)
+  })
+})
diff --git a/src/relay/pty-handler-spawn-environment.test.ts b/src/relay/pty-handler-spawn-environment.test.ts
index eff0f68f2fac..659d9fbc6278 100644
--- a/src/relay/pty-handler-spawn-environment.test.ts
+++ b/src/relay/pty-handler-spawn-environment.test.ts
@@ -336,6 +336,44 @@ describe('PtyHandler', () => {
       }
     )
 
+    it.each(['process', 'client'])(
+      'drops an ORCA_CODEX_LAUNCH_PREFLIGHT from the relay %s env',
+      async (source) => {
+        const inherited = '/opt/orca/bin/orca'
+        const previous = process.env.ORCA_CODEX_LAUNCH_PREFLIGHT
+        if (source === 'process') {
+          process.env.ORCA_CODEX_LAUNCH_PREFLIGHT = inherited
+        }
+        try {
+          await dispatcher.callRequest('pty.spawn', {
+            cols: 80,
+            rows: 24,
+            ...(source === 'client' ? { env: { ORCA_CODEX_LAUNCH_PREFLIGHT: inherited } } : {})
+          })
+        } finally {
+          if (previous === undefined) {
+            delete process.env.ORCA_CODEX_LAUNCH_PREFLIGHT
+          } else {
+            process.env.ORCA_CODEX_LAUNCH_PREFLIGHT = previous
+          }
+        }
+
+        const spawnEnv = mockPtySpawn.mock.calls.at(-1)?.[2]?.env as Record<string, string>
+        expect(spawnEnv.ORCA_CODEX_LAUNCH_PREFLIGHT).toBeUndefined()
+      }
+    )
+
+    it('keeps the Codex server opt-out the client asked for', async () => {
+      await dispatcher.callRequest('pty.spawn', {
+        cols: 80,
+        rows: 24,
+        env: { ORCA_CODEX_ISOLATE: '0' }
+      })
+
+      const spawnEnv = mockPtySpawn.mock.calls.at(-1)?.[2]?.env as Record<string, string>
+      expect(spawnEnv.ORCA_CODEX_ISOLATE).toBe('0')
+    })
+
     it('drops an ORCA_HISTFILE handed over in the client env', async () => {
       await dispatcher.callRequest('pty.spawn', {
         cols: 80,
@@ -606,6 +644,54 @@ describe('PtyHandler', () => {
     expect(callArgs.env.ORCA_TAB_ID).toBe('tab-1')
   })
 
+  it('mirrors pane identity onto its scrub-safe aliases for a remote spawn', async () => {
+    // Why the relay and not just the shared helper: a remote pane's env is built here, and an
+    // agent whose harness drops KEY/TOKEN names (DSH) has nothing to attribute its hooks to.
+    await dispatcher.callRequest('pty.spawn', {
+      cols: 80,
+      rows: 24,
+      env: { ORCA_PANE_KEY: 'tab-1:0', ORCA_AGENT_LAUNCH_TOKEN: 't' }
+    })
+
+    const callArgs = mockPtySpawn.mock.calls[0][2] as { env: Record<string, string> }
+    expect(callArgs.env.ORCA_AGENT_PANE).toBe('tab-1:0')
+    expect(callArgs.env.ORCA_AGENT_LAUNCH).toBe('t')
+    expect(callArgs.env.ORCA_PANE_KEY).toBe('tab-1:0')
+  })
+
+  it("drops an alias the relay's own env carries when the spawn claims no identity", async () => {
+    // Why: the relay is itself startable from an Orca pane, so inheriting either name would
+    // attribute this pane's hooks to whichever row started the relay.
+    const previous = {
+      pane: process.env.ORCA_PANE_KEY,
+      launch: process.env.ORCA_AGENT_LAUNCH_TOKEN,
+      paneAlias: process.env.ORCA_AGENT_PANE
+    }
+    process.env.ORCA_PANE_KEY = 'relays-own-pane'
+    process.env.ORCA_AGENT_LAUNCH_TOKEN = 'relays-own-launch'
+    process.env.ORCA_AGENT_PANE = 'stale-alias'
+    try {
+      await dispatcher.callRequest('pty.spawn', { cols: 80, rows: 24 })
+    } finally {
+      for (const [key, value] of [
+        ['ORCA_PANE_KEY', previous.pane],
+        ['ORCA_AGENT_LAUNCH_TOKEN', previous.launch],
+        ['ORCA_AGENT_PANE', previous.paneAlias]
+      ] as const) {
+        if (value === undefined) {
+          delete process.env[key]
+        } else {
+          process.env[key] = value
+        }
+      }
+    }
+
+    const callArgs = mockPtySpawn.mock.calls[0][2] as { env: Record<string, string> }
+    expect(callArgs.env.ORCA_PANE_KEY).toBeUndefined()
+    expect(callArgs.env.ORCA_AGENT_PANE).toBeUndefined()
+    expect(callArgs.env.ORCA_AGENT_LAUNCH).toBeUndefined()
+  })
+
   it('passes PTY and explicit launch identity to env augmenters', async () => {
     const seenContexts: {
       id: string
diff --git a/src/relay/pty-handler.ts b/src/relay/pty-handler.ts
index 2daa4311234f..d739bcd97eee 100644
--- a/src/relay/pty-handler.ts
+++ b/src/relay/pty-handler.ts
@@ -1,3 +1,4 @@
+import { FreebuffStatusProjection } from './freebuff-status-projection'
 /* oxlint-disable max-lines */
 import type { IPty } from 'node-pty'
 import { killWithDescendantSweep } from '../main/pty-descendant-termination'
@@ -18,6 +19,7 @@ import {
 import { inspectPtyChildProcesses, processHasChildren } from './pty-child-process-inspection'
 import { getRelayShellLaunchConfig, isRelayWslShell } from './pty-shell-launch'
 import { RetiredPaneSurfaceRegistry } from './retired-pane-surfaces'
+import { applyScrubSafeAgentEnvAliases } from '../shared/agent-hook-scrub-safe-env'
 import { addWslEnvKeys } from '../shared/wsl-env'
 import {
   ORCA_IMAGE_PROTOCOL_ENV,
@@ -76,6 +78,8 @@ import {
 } from '../shared/pty-startup-ingress'
 import { resolvePtyOwnerBackend, type PtyOwnerBackend } from '../shared/pty-owner-backend'
 import { RecentPtyOutputBuffer } from '../main/runtime/recent-pty-output-buffer'
+import { TerminalShellRecoveryBarrier } from '../main/daemon/terminal-shell-recovery-barrier'
+import { confirmPtyShellForeground } from '../main/daemon/pty-subprocess/pty-shell-foreground-confirmation'
 import {
   resolveAgentForegroundProcessesBatch,
   resolveRemoteForegroundEvidence,
@@ -202,6 +206,7 @@ function parseSourceRecoveryRequest(value: unknown): PtySourceRecoveryRequest |
 }
 
 type ManagedPty = {
+  freebuffStatus?: FreebuffStatusProjection
   id: string
   incarnationId: string
   pty: IPty
@@ -246,6 +251,7 @@ type ManagedPty = {
   forceKillSent?: boolean
   gracefulKillSent?: boolean
   startupIngress?: PtyStartupIngress
+  recoveryBarrier?: TerminalShellRecoveryBarrier
   startupIngressIntent?: ReturnType<typeof parsePtyStartupIngressIntent>
   ownerBackend: PtyOwnerBackend
   agentSessionOwners?: AgentSessionOwnerBinding[]
@@ -839,6 +845,8 @@ export class PtyHandler {
     // pane to another worktree's history file — and wrapping a zsh pane that
     // nothing asked to wrap, since `history` is selected on its presence.
     delete result.ORCA_HISTFILE
+    // Why: the codex wrapper runs this path as hook prep, and a relay pane never gets one of its own.
+    delete result.ORCA_CODEX_LAUNCH_PREFLIGHT
     // Why: match local/daemon precedence so defaults/augmenters can't resurrect explicitly-removed values.
     for (const key of envToDelete) {
       delete result[key]
@@ -850,6 +858,22 @@ export class PtyHandler {
     if (!result.TERM) {
       result.TERM = 'xterm-256color'
     }
+    // Why: the relay's own process env can carry pane identity (it is itself startable from
+    // an Orca pane), and unlike the local and daemon builders this one never dropped it. A
+    // spawn that specified no identity would then inherit someone else's, and every agent's
+    // hook would report against that pane. Drop it before mirroring, so an alias can only
+    // ever carry identity this spawn actually asked for.
+    for (const key of ['ORCA_PANE_KEY', 'ORCA_AGENT_LAUNCH_TOKEN'] as const) {
+      if (!rendererEnv || !Object.hasOwn(rendererEnv, key)) {
+        delete result[key]
+      }
+    }
+    // Why here and not only in the local/daemon builders: a remote pane's env is built HERE,
+    // and the client forwards only the canonical pane-identity names. An agent whose harness
+    // scrubs those names (DSH drops any env var whose name contains KEY or TOKEN) would find
+    // nothing to attribute its hooks to, so remote status would silently never appear even
+    // with the remote hook installed.
+    applyScrubSafeAgentEnvAliases(result)
     // Why last, not beside the scrubbers above: the relay runs those BEFORE envToDelete,
     // so an envToDelete of CONDA_PREFIX would otherwise re-create the broken pair.
     dropIncoherentCondaActivationEnv(result, process.platform)
@@ -951,20 +975,29 @@ export class PtyHandler {
     this.notifyPoolListener(this.ptyPoolActiveListener, 'pty-pool-active')
     const emitIngressData = (emission: PtyIngressEmission): void => {
       const rawLength = emission.rawEndSeq - emission.rawStartSeq
-      this.appendReplayBuffer(managed, emission.data)
+      const data = managed.freebuffStatus?.project(emission.data) ?? emission.data
+      this.appendReplayBuffer(managed, data)
       this.enqueuePtyOutput(
         managed.id,
-        emission.data,
-        emission.transformed || rawLength !== emission.data.length
+        data,
+        emission.transformed || rawLength !== data.length
           ? { rawLength, seq: emission.rawEndSeq, transformed: true }
           : {}
       )
     }
-    managed.startupIngress ??= new PtyStartupIngress({
+    const isDead = (): boolean => managed.disposed === true
+    const recoveryBarrier = new TerminalShellRecoveryBarrier({
+      confirmShellForeground: () =>
+        confirmPtyShellForeground({ process: managed.pty, shellPath: managed.shellPath, isDead }),
+      release: emitIngressData,
+      isAlive: () => !isDead()
+    })
+    managed.recoveryBarrier = recoveryBarrier
+    managed.startupIngress = new PtyStartupIngress({
       ...(managed.startupIngressIntent ? { intent: managed.startupIngressIntent } : {}),
       ownerBackend: managed.ownerBackend,
       write: (data) => managed.pty.write(data),
-      onEmission: emitIngressData
+      onEmission: (emission) => recoveryBarrier.accept(emission)
     })
     const startup = managed.startupCommand
     if (startup?.waitForShellReady) {
@@ -1054,6 +1087,11 @@ export class PtyHandler {
       managed.startupCommand = undefined
     }
     managed.startupIngress?.drainAndClose()
+    // Why after drainAndClose: drained ingress bytes re-enter the barrier; a
+    // teardown mid-proof must still deliver the held prompt before exit.
+    managed.recoveryBarrier?.flushPending()
+    managed.recoveryBarrier?.dispose()
+    managed.freebuffStatus?.dispose()
   }
 
   private notifyExitListener(managed: ManagedPty): void {
@@ -1082,6 +1120,7 @@ export class PtyHandler {
     this.dispatcher.onRequest('pty.getInitialCwd', (p) => this.getInitialCwd(p))
     this.dispatcher.onRequest('pty.getSize', (p) => this.getSize(p))
     this.dispatcher.onRequest('pty.clearBuffer', (p) => this.clearBuffer(p))
+    this.dispatcher.onRequest('pty.resetInputModes', (p) => this.resetInputModes(p))
     this.dispatcher.onRequest('pty.hasChildProcesses', (p) => this.hasChildProcesses(p))
     this.dispatcher.onRequest('pty.getForegroundProcess', (p) => this.getForegroundProcess(p))
     this.dispatcher.onRequest('pty.inspectProcess', (p) => this.inspectProcess(p))
@@ -1979,6 +2018,9 @@ export class PtyHandler {
     const ownerClientInstanceId =
       context === undefined ? null : (this.consumerIdentityResolver?.(context.clientId) ?? null)
     const managed: ManagedPty = {
+      ...(launchAgent === 'freebuff'
+        ? { freebuffStatus: new FreebuffStatusProjection(cols, rows) }
+        : {}),
       id,
       incarnationId: randomUUID(),
       pty: term,
@@ -2225,6 +2267,7 @@ export class PtyHandler {
     // npm, where the patch is not applied. So the catch below stays.
     try {
       managed.pty.resize(cols, rows)
+      managed.freebuffStatus?.resize(cols, rows)
     } catch (err) {
       // A failed ioctl observed the handle, not the host's process table, so on
       // its own it is `unverifiable`. Re-probe: a now-absent pid retires the
@@ -2646,6 +2689,15 @@ export class PtyHandler {
     }
   }
 
+  // Why the replay buffer and not the stream: a zero-raw span never crosses the
+  // credit window, and the client grounds its own view; reattach replays this.
+  private async resetInputModes(params: Record<string, unknown>): Promise<void> {
+    const managed = this.ptys.get(params.id as string)
+    if (managed?.recoveryBarrier && !managed.disposed) {
+      this.appendReplayBuffer(managed, managed.recoveryBarrier.groundInputModes())
+    }
+  }
+
   private async hasChildProcesses(params: Record<string, unknown>): Promise<boolean> {
     const id = params.id as string
     const managed = this.ptys.get(id)
diff --git a/src/relay/pty-shell-overlay-wrappers.ts b/src/relay/pty-shell-overlay-wrappers.ts
index 2231fc2b29b9..c8d699f36bee 100644
--- a/src/relay/pty-shell-overlay-wrappers.ts
+++ b/src/relay/pty-shell-overlay-wrappers.ts
@@ -1,6 +1,7 @@
 import { readFileSync, statSync } from 'node:fs'
 import { join } from 'node:path'
 import { getPosixOmpShellWrapper } from '../main/pty/omp-shell-wrapper'
+import { getPosixCodexShellLaunchPreflight } from '../shared/codex-shell-function'
 import {
   BASH_FEATURE_CHANNEL_BLOCK,
   BASH_PROMPT_COMMAND_COMPOSITION_BLOCK,
@@ -35,8 +36,7 @@ function getRelayZshWrapperSpec(): ZshStartupHookSpec {
       managedWslCli: false,
       agentTeamsPath: false,
       remoteCliBinDir: true,
-      codexHome: false,
-      codexLaunchPreflight: false
+      codexHome: false
     }
   }
 }
@@ -74,7 +74,7 @@ fi
 [[ -n "\${ORCA_MIMOCODE_HOME:-}" ]] && export MIMOCODE_HOME="\${ORCA_MIMOCODE_HOME}"
 [[ -n "\${ORCA_REMOTE_CLI_BIN_DIR:-}" ]] && case ":$PATH:" in *:"\${ORCA_REMOTE_CLI_BIN_DIR}":*) ;; *) export PATH="\${ORCA_REMOTE_CLI_BIN_DIR}:$PATH" ;; esac
 ${getPosixOmpShellWrapper()}
-${BASH_HISTFILE_RESTORE_BLOCK}
+${getPosixCodexShellLaunchPreflight()}${BASH_HISTFILE_RESTORE_BLOCK}
 # Why: SSH bash sessions need the same command lifecycle markers as local
 # bash so agent rows stop showing "working" when the foreground command exits.
 __orca_initializing_wrapper=1
diff --git a/src/relay/relay-agent-hook-runtime.ts b/src/relay/relay-agent-hook-runtime.ts
index 7ab4bf01162d..bc1cef971370 100644
--- a/src/relay/relay-agent-hook-runtime.ts
+++ b/src/relay/relay-agent-hook-runtime.ts
@@ -19,8 +19,9 @@ import {
   isPiCompatibleAgentType
 } from '../shared/pi-agent-kind'
 import { resolveSetupAgentSequenceLaunchCommand } from '../shared/setup-agent-sequencing'
-import { isOpenCode2LaunchCommand } from '../shared/opencode-launch-command'
+import { selectOpenCodeHookAgent } from '../shared/opencode-launch-command'
 import { relayLogLine } from './relay-diagnostic-log'
+import { restoreOrStripOverlayEnv } from '../shared/agent-overlay-env'
 import { registerManagedHookInstaller } from './managed-hook-installer'
 
 export class RelayAgentHookRuntime {
@@ -85,12 +86,22 @@ export class RelayAgentHookRuntime {
     const env: Record<string, string> = {}
     const overlayId = context.paneKey ?? context.id
     const launchCommandHint = resolveSetupAgentSequenceLaunchCommand(context.env, context.command)
-    const opencodeAgent =
-      context.launchAgent === 'opencode2' || isOpenCode2LaunchCommand(launchCommandHint)
-        ? 'opencode2'
-        : 'opencode'
-    env.ORCA_OPENCODE_AGENT = opencodeAgent
-    if (this.pluginOverlay.hasOpenCodeSource(opencodeAgent)) {
+    const opencodeAgent = selectOpenCodeHookAgent(context.launchAgent, launchCommandHint, (agent) =>
+      this.pluginOverlay.hasOpenCodeSource(agent)
+    )
+    restoreOrStripOverlayEnv(
+      context.env,
+      {
+        primary: 'OPENCODE_CONFIG_DIR',
+        overlay: 'ORCA_OPENCODE_CONFIG_DIR',
+        source: 'ORCA_OPENCODE_SOURCE_CONFIG_DIR',
+        preserveExplicitPrimary: true
+      },
+      {}
+    )
+    delete context.env.ORCA_OPENCODE_AGENT
+    if (opencodeAgent) {
+      env.ORCA_OPENCODE_AGENT = opencodeAgent
       const sourceDir = resolveOpenCodeSourceConfigDir(context.env, context.shell)
       const inheritedRelayOverlay = sourceDir
         ? this.pluginOverlay.isRelayOverlayPath(sourceDir)
diff --git a/src/relay/relay-watch-root-capacity-gate.ts b/src/relay/relay-watch-root-capacity-gate.ts
index 4e430332be22..c275e3035077 100644
--- a/src/relay/relay-watch-root-capacity-gate.ts
+++ b/src/relay/relay-watch-root-capacity-gate.ts
@@ -63,11 +63,19 @@ export class RelayWatchRootCapacityGate {
     this.waiting.add(rootKey)
     // Once, and never past the caller: a genuinely full cap must still reach the refusal that sends
     // the client dormant, and an unsubscribe that never settles must not park the request with it.
-    return (signal ? Promise.race([released, abortSignalSettled(signal)]) : released).finally(
-      () => {
-        this.waiting.delete(rootKey)
+    let onAbort = (): void => {}
+    const abandoned = new Promise<void>((resolve) => {
+      onAbort = () => resolve()
+      if (signal?.aborted) {
+        resolve()
+      } else {
+        signal?.addEventListener('abort', onAbort, { once: true })
       }
-    )
+    })
+    return (signal ? Promise.race([released, abandoned]) : released).finally(() => {
+      signal?.removeEventListener('abort', onAbort)
+      this.waiting.delete(rootKey)
+    })
   }
 
   /** Setup roots that currently hold a slot — a parked capacity waiter holds none. */
@@ -75,12 +83,3 @@ export class RelayWatchRootCapacityGate {
     return [...this.setupRoots.keys()].filter((key) => key === rootKey || !this.waiting.has(key))
   }
 }
-
-/** Resolves (never rejects) when the request is abandoned, so a race can drop out of a wait. */
-function abortSignalSettled(signal: AbortSignal): Promise<void> {
-  return signal.aborted
-    ? Promise.resolve()
-    : new Promise<void>((resolve) =>
-        signal.addEventListener('abort', () => resolve(), { once: true })
-      )
-}
diff --git a/src/relay/relay-watch-root-capacity.test.ts b/src/relay/relay-watch-root-capacity.test.ts
index de5a5fc2b4b0..12f70234c1d0 100644
--- a/src/relay/relay-watch-root-capacity.test.ts
+++ b/src/relay/relay-watch-root-capacity.test.ts
@@ -8,6 +8,7 @@ import type { RelayDispatcher } from './dispatcher'
 import { FsHandler } from './fs-handler'
 import { subscribeWithInProcessWatcher } from '../main/ipc/parcel-watcher-in-process-fallback'
 import { createMockDispatcher } from './relay-fs-test-dispatcher'
+import { RelayWatchRootCapacityGate } from './relay-watch-root-capacity-gate'
 
 const { mockSubscribe } = vi.hoisted(() => ({
   mockSubscribe: vi.fn()
@@ -39,6 +40,50 @@ describe('relay watch-root capacity', () => {
     await fs.rm(tmpDir, { recursive: true, force: true })
   })
 
+  it('removes an abort listener after capacity teardown settles', async () => {
+    const activeRoots = new Map(Array.from({ length: 20 }, (_, index) => [`active-${index}`, {}]))
+    let resolveTeardown!: () => void
+    const teardown = new Promise<void>((resolve) => {
+      resolveTeardown = resolve
+    })
+    const gate = new RelayWatchRootCapacityGate(activeRoots, new Map(), () => ({
+      rootPaths: () => ['retiring'],
+      settlePending: () => teardown
+    }))
+    const controller = new AbortController()
+    const addListener = vi.spyOn(controller.signal, 'addEventListener')
+    const removeListener = vi.spyOn(controller.signal, 'removeEventListener')
+
+    const waiting = gate.release('new-root', controller.signal)
+    expect(waiting).toBeDefined()
+    expect(addListener).toHaveBeenCalledTimes(1)
+    resolveTeardown()
+    await waiting
+
+    expect(removeListener).toHaveBeenCalledTimes(1)
+  })
+
+  it.each([false, true])(
+    'resolves abandoned capacity waits (already aborted=%s)',
+    async (alreadyAborted) => {
+      const activeRoots = new Map(Array.from({ length: 20 }, (_, index) => [`active-${index}`, {}]))
+      const gate = new RelayWatchRootCapacityGate(activeRoots, new Map(), () => ({
+        rootPaths: () => ['retiring'],
+        settlePending: () => new Promise<void>(() => {})
+      }))
+      const controller = new AbortController()
+      if (alreadyAborted) {
+        controller.abort()
+      }
+      const removeListener = vi.spyOn(controller.signal, 'removeEventListener')
+      const waiting = gate.release('new-root', controller.signal)
+      expect(waiting).toBeDefined()
+      controller.abort()
+      await expect(waiting).resolves.toBeUndefined()
+      expect(removeListener).toHaveBeenCalledTimes(1)
+    }
+  )
+
   it('blocks replacement watches behind physical unsubscribe and counts the pending slot', async () => {
     let resolveUnsubscribe: () => void = () => {}
     const unsubscribe = vi.fn(
diff --git a/src/relay/relay-watcher-event-emitter.test.ts b/src/relay/relay-watcher-event-emitter.test.ts
index 0f0991e5c012..82b10e2fdf3a 100644
--- a/src/relay/relay-watcher-event-emitter.test.ts
+++ b/src/relay/relay-watcher-event-emitter.test.ts
@@ -1,5 +1,3 @@
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
 import { describe, expect, it, vi } from 'vitest'
 import type { WatcherProcessEvent } from '../main/ipc/parcel-watcher-process-protocol'
 import { RelayDispatcher } from './dispatcher'
@@ -200,13 +198,6 @@ describe('relay watcher writer admission', () => {
 })
 
 describe('relay watcher overflow suppression key', () => {
-  it('keeps the source free of NUL bytes so git and grep still see text', () => {
-    const source = readFileSync(
-      fileURLToPath(new URL('./relay-watcher-event-emitter.ts', import.meta.url))
-    )
-    expect(source.includes(0)).toBe(false)
-  })
-
   it('scopes the outstanding marker per client as well as per root', () => {
     const primary = createRecordingSink(65536)
     const secondary = createRecordingSink(65536)
diff --git a/src/renderer/src/app-shell/use-app-shell-services.ts b/src/renderer/src/app-shell/use-app-shell-services.ts
index 47c846040a73..89dcbe673d14 100644
--- a/src/renderer/src/app-shell/use-app-shell-services.ts
+++ b/src/renderer/src/app-shell/use-app-shell-services.ts
@@ -19,6 +19,7 @@ import { useWebSessionTabsSync } from '../runtime/web-session-tabs-sync'
 import { useLocalStructuredSessionTabsSync } from '../runtime/local-structured-session-tabs-sync'
 import { useRemoteRuntimeRecoveryTriggers } from '../runtime/use-remote-runtime-recovery-triggers'
 import { useBrowserIdentityMigrationNotice } from '../components/browser-pane/browser-user-agent-migration-notice'
+import { useCodexTerminalServerIsolationNotice } from '../components/terminal-pane/codex-terminal-server-isolation-notice'
 
 /**
  * App-level subscriptions that must outlive any individual surface. Each one is here because
@@ -52,4 +53,5 @@ export function useAppShellServices(options: { floatingPanelVisible: boolean }):
   usePrimarySelectionPaste(primarySelectionMiddleClickPaste)
   useOsc52ClipboardDefaultOnNotice(persistedUIReady)
   useBrowserIdentityMigrationNotice()
+  useCodexTerminalServerIsolationNotice()
 }
diff --git a/src/renderer/src/app-shell/use-floating-workspace-panel.ts b/src/renderer/src/app-shell/use-floating-workspace-panel.ts
index 49daaec55d80..7cd3763e4010 100644
--- a/src/renderer/src/app-shell/use-floating-workspace-panel.ts
+++ b/src/renderer/src/app-shell/use-floating-workspace-panel.ts
@@ -1,4 +1,11 @@
-import { useCallback, useEffect, useRef, useState, type SetStateAction } from 'react'
+import {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  useState,
+  type SetStateAction
+} from 'react'
 import {
   TOGGLE_FLOATING_TERMINAL_EVENT,
   requestFloatingTerminalOpenMaximized
@@ -111,7 +118,8 @@ export function useFloatingWorkspacePanel() {
     setOpenWithFocus(true)
   }, [setOpenWithFocus])
 
-  useEffect(() => {
+  // Why layout: enable-then-toggle callers dispatch a frame later, which a passive rebind can miss.
+  useLayoutEffect(() => {
     const toggleFloatingTerminal = (): void => {
       if (enabled) {
         setOpenWithFocus((current) => !current)
diff --git a/src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx b/src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx
index 314977a17aaa..f5d404b4e104 100644
--- a/src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx
+++ b/src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx
@@ -6,16 +6,11 @@
 //   authority (main)  = real updatePersistedUI/getPersistedUI merge
 //   broadcast         = controlled queue modeling the async ui:stateChanged IPC send
 //   mobile client     = mobile/src/worktree/workspace-view-settings mapping; the ui.set
-//                       payload uses the shipping buildWorkspaceViewSettingsUpdate when
-//                       exported, else the legacy whole-snapshot shape — the source-pin
-//                       test asserts use-host-view-settings.ts matches whichever path is
-//                       active, so the model stays tethered to shipping code.
+//                       payload mirrors the shipping buildWorkspaceViewSettingsUpdate.
 //
 // Invariant: when two independently identified clients change DISJOINT workspace-view
 // fields concurrently or across stale-mirror windows, both changes survive and all
 // mirrors converge; no client may restore a stale sibling field.
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { StrictMode, act, createElement } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -84,8 +79,7 @@ function createAuthority() {
 type Authority = ReturnType<typeof createAuthority>
 
 // Local model of mobile/src/worktree/workspace-view-settings.ts (the desktop test
-// runner cannot transform Expo-configured sources). The source-pin test at the
-// bottom fails if the shipping module stops matching this model.
+// runner cannot transform Expo-configured sources).
 type MobileViewState = {
   groupMode: 'none' | 'workspaceStatus' | 'repo' | 'prStatus'
   sortMode: 'smart' | 'name' | 'recent' | 'repo' | 'manual'
@@ -96,10 +90,6 @@ type MobileViewState = {
   collapsedGroups: string[]
 }
 
-function mobileHasPatchOnlyBuilder(): boolean {
-  return readMobileViewSettingsSource().includes('export function buildWorkspaceViewSettingsUpdate')
-}
-
 /** Mirrors buildWorkspaceViewSettingsUpdate (candidate) — only touched fields. */
 function patchOnlyUpdate(
   patch: Partial<MobileViewState>,
@@ -127,18 +117,6 @@ function patchOnlyUpdate(
   return update
 }
 
-/** Mirrors the pre-fix persistViewSettings payload — the full snapshot on every tap. */
-function legacyWholeSnapshotUpdate(next: MobileViewState): Partial<PersistedUIState> {
-  return {
-    groupBy: next.groupMode === 'workspaceStatus' ? 'workspace-status' : 'repo',
-    sortBy: next.sortMode,
-    hideSleepingWorkspaces: next.hideSleeping,
-    hideDefaultBranchWorkspace: next.hideDefaultBranch,
-    filterRepoIds: next.filterRepoIds,
-    collapsedGroups: next.collapsedGroups
-  }
-}
-
 /** Model of the mobile host screen's view-settings client (persistViewSettings et al.). */
 function createMobileClient(authority: Authority) {
   let view: MobileViewState = {
@@ -171,28 +149,12 @@ function createMobileClient(authority: Authority) {
     /** A user tap: apply locally, then push through the shipping payload shape. */
     tap(patch: Partial<MobileViewState>) {
       view = { ...view, ...patch }
-      const payload = mobileHasPatchOnlyBuilder()
-        ? patchOnlyUpdate(patch, view)
-        : legacyWholeSnapshotUpdate(view)
+      const payload = patchOnlyUpdate(patch, view)
       authority.set(omitPairingLocalUiFields(payload) as Partial<PersistedUIState>)
     }
   }
 }
 
-function readMobileViewSettingsHookSource(): string {
-  return readFileSync(
-    join(__dirname, '../../../../mobile/src/host-screen/use-host-view-settings.ts'),
-    'utf-8'
-  )
-}
-
-function readMobileViewSettingsSource(): string {
-  return readFileSync(
-    join(__dirname, '../../../../mobile/src/worktree/workspace-view-settings.ts'),
-    'utf-8'
-  )
-}
-
 describe('workspace view preferences: cross-client persistence (STA-5781)', () => {
   let authority: Authority
   let store: StoreApi<AppState>
@@ -710,35 +672,4 @@ describe('workspace view preferences: cross-client persistence (STA-5781)', () =
     expect(authority.get().hideDefaultBranchWorkspace).toBe(false)
     expect(store.getState().hideDefaultBranchWorkspace).toBe(false)
   })
-
-  it('pins the modeled mobile ui.set payload to the shipping source', async () => {
-    const source = readMobileViewSettingsHookSource()
-    if (mobileHasPatchOnlyBuilder()) {
-      // Candidate: the persistence hook must push through the patch-only builder this model uses.
-      expect(source).toContain('buildWorkspaceViewSettingsUpdate(patch, next)')
-      const builderSource = readMobileViewSettingsSource()
-      for (const guard of [
-        "if ('groupMode' in patch)",
-        "if ('sortMode' in patch)",
-        "if ('hideSleeping' in patch)",
-        "if ('hideDefaultBranch' in patch)",
-        "if ('filterRepoIds' in patch)",
-        "if ('collapsedGroups' in patch)"
-      ]) {
-        expect(builderSource).toContain(guard)
-      }
-    } else {
-      // Baseline: persistViewSettings pushes exactly this whole-snapshot payload.
-      for (const key of [
-        'groupBy: groupModeToDesktop(next.groupMode)',
-        'sortBy: next.sortMode',
-        'hideSleepingWorkspaces: next.hideSleeping',
-        'hideDefaultBranchWorkspace: next.hideDefaultBranch',
-        'filterRepoIds: next.filterRepoIds',
-        'collapsedGroups: next.collapsedGroups'
-      ]) {
-        expect(source).toContain(key)
-      }
-    }
-  })
 })
diff --git a/src/renderer/src/assets/diff-comment-draft-card-shadow-style.test.ts b/src/renderer/src/assets/diff-comment-draft-card-shadow-style.test.ts
new file mode 100644
index 000000000000..3a28acf95c6f
--- /dev/null
+++ b/src/renderer/src/assets/diff-comment-draft-card-shadow-style.test.ts
@@ -0,0 +1,39 @@
+import fs from 'node:fs'
+import { describe, expect, it } from 'vitest'
+
+const mainCss = fs.readFileSync(new URL('./main.css', import.meta.url), 'utf8')
+
+function getCssRuleBody(selector: string): string {
+  const ruleMarker = mainCss.indexOf(`\n${selector} {`)
+  expect(ruleMarker).toBeGreaterThanOrEqual(0)
+
+  const ruleStart = ruleMarker + 1
+  const bodyStart = mainCss.indexOf('{', ruleStart) + 1
+  const bodyEnd = mainCss.indexOf('}', bodyStart)
+  return mainCss.slice(bodyStart, bodyEnd)
+}
+
+describe('diff comment draft card shadow', () => {
+  it('uses the documented shadow-xs tier instead of a hand-rolled fourth tier', () => {
+    const draftCard = getCssRuleBody('.orca-diff-comment-inline > .orca-diff-comment-draft-card')
+
+    // STYLEGUIDE.md caps elevation at border / shadow-xs / shadow-floating —
+    // no invented per-component shadow values.
+    expect(draftCard).toContain('shadow-xs')
+    expect(draftCard).not.toMatch(/box-shadow:\s*\n?\s*0/)
+    expect(draftCard).not.toContain('rgba(0, 0, 0,')
+  })
+
+  it('keeps the dark override at shadow-xs, not a hand-rolled or missing shadow', () => {
+    const darkDraftCard = getCssRuleBody(
+      '.dark .orca-diff-comment-inline > .orca-diff-comment-draft-card'
+    )
+
+    // Same selector specificity as `.dark .orca-diff-comment-popover` (its
+    // ancestor via the shared draft-card component), which sits later in the
+    // file — dropping this rule lets that popover's much larger floating
+    // shadow win the cascade in dark mode instead of shadow-xs.
+    expect(darkDraftCard).toContain('shadow-xs')
+    expect(darkDraftCard).not.toContain('rgba(0, 0, 0,')
+  })
+})
diff --git a/src/renderer/src/assets/main.css b/src/renderer/src/assets/main.css
index 145dee972b83..5503e940294f 100644
--- a/src/renderer/src/assets/main.css
+++ b/src/renderer/src/assets/main.css
@@ -413,12 +413,14 @@
 
 [data-sonner-toaster] {
   font-family: var(--font-sans);
-  z-index: 40 !important;
+  z-index: var(--toaster-z-index, 40) !important;
 }
 
-/* Keep errors above standard modal backdrops at the existing popover tier. */
-body:has([data-slot='dialog-overlay'], [data-slot='sheet-overlay']) [data-sonner-toaster] {
-  z-index: 60 !important;
+/* Keep errors above standard modal backdrops at the existing popover tier.
+   Why: overlays portal straight into body, and `>` plus a :has() on body alone (not in the toaster's
+   selector) keeps unrelated DOM changes from rescanning the page; the old form froze large diffs. */
+body:has(> [data-slot='dialog-overlay'], > [data-slot='sheet-overlay']) {
+  --toaster-z-index: 60;
 }
 
 [data-sonner-toaster] [data-sonner-toast][data-styled='true'] {
@@ -728,7 +730,9 @@ body:has([data-slot='dialog-overlay'], [data-slot='sheet-overlay']) [data-sonner
   mask-image: linear-gradient(to right, transparent, #000 1.5rem, #000 100%);
 }
 
-.terminal-tab-strip--fade-end:not(.terminal-tab-strip--fade-start) {
+/* Why: the status bar's usage cluster reuses the end fade so a clipped cluster never cuts a glyph. */
+.terminal-tab-strip--fade-end:not(.terminal-tab-strip--fade-start),
+.status-bar-usage-cluster[data-overflowing='true'] {
   -webkit-mask-image: linear-gradient(to right, #000 0, #000 calc(100% - 1.5rem), transparent);
   mask-image: linear-gradient(to right, #000 0, #000 calc(100% - 1.5rem), transparent);
 }
@@ -1628,6 +1632,31 @@ html.native-shell .app-layout {
   animation: compact-agent-expansion-reveal 180ms cubic-bezier(0.16, 1, 0.3, 1) both;
 }
 
+/* Keep the disclosure in the timestamp slot without moving adjacent content. */
+.agent-child-disclosure-time {
+  visibility: hidden;
+}
+
+@media (hover: hover) {
+  .agent-child-disclosure[data-expanded='false'] .agent-child-disclosure-time {
+    visibility: visible;
+  }
+
+  .agent-child-disclosure[data-expanded='false'] [data-agent-child-disclosure-button] {
+    opacity: 0;
+  }
+
+  .agent-disclosure-row:hover .agent-child-disclosure-time,
+  .agent-disclosure-row:focus-within .agent-child-disclosure-time {
+    visibility: hidden;
+  }
+
+  .agent-disclosure-row:hover [data-agent-child-disclosure-button],
+  .agent-disclosure-row:focus-within [data-agent-child-disclosure-button] {
+    opacity: 1;
+  }
+}
+
 /* Why: the collapsed summary still uses pill spacing, while expanded compact
    agents read as a quiet tree inside the existing worktree card. */
 .compact-agent-summary-panel {
@@ -2867,6 +2896,10 @@ html.native-shell .app-layout {
   max-width: 420px;
 }
 
+/* Why: embedded card in the diff flow, not a floating popup — use the
+   documented "subtle lift" tier (shadow-xs) rather than a hand-rolled shadow.
+   Restated under `.dark` (same value) so this still outranks the base
+   `.orca-diff-comment-popover` dark shadow at equal selector specificity. */
 .orca-diff-comment-inline > .orca-diff-comment-draft-card {
   position: relative;
   left: auto;
@@ -2874,15 +2907,11 @@ html.native-shell .app-layout {
   width: 100%;
   max-width: 420px;
   z-index: 1;
-  box-shadow:
-    0 2px 6px rgba(0, 0, 0, 0.08),
-    0 4px 12px rgba(0, 0, 0, 0.08);
+  @apply shadow-xs;
 }
 
 .dark .orca-diff-comment-inline > .orca-diff-comment-draft-card {
-  box-shadow:
-    0 2px 6px rgba(0, 0, 0, 0.35),
-    0 4px 14px rgba(0, 0, 0, 0.28);
+  @apply shadow-xs;
 }
 
 .orca-diff-comment-draft-margin {
diff --git a/src/renderer/src/components/AgentChildRowContent.tsx b/src/renderer/src/components/AgentChildRowContent.tsx
new file mode 100644
index 000000000000..717b8438a0b8
--- /dev/null
+++ b/src/renderer/src/components/AgentChildRowContent.tsx
@@ -0,0 +1,58 @@
+import React from 'react'
+import type { AgentChildRowModel } from '../../../shared/agent-child-row-model'
+import { AgentStateDot } from '@/components/AgentStateDot'
+import type { StateIndicatorTooltipSide } from '@/components/StateIndicatorTooltip'
+import { agentChildRowText } from './agent-child-row-text'
+
+type AgentChildRowContentProps = {
+  row: AgentChildRowModel
+  now: number
+  /** Surface tone for the name and the detail; the words themselves are the row's. */
+  leadClassName: string
+  trailClassName: string
+  separator: string
+  /** Overrides the dot's hover label; null suppresses it for an existing tooltip. */
+  dotTitle?: string | null
+  tooltipSide?: StateIndicatorTooltipSide
+  /** Name the whole line on hover, for surfaces that truncate it tightly. */
+  lineTitle?: boolean
+}
+
+/**
+ * A child row's state dot, name and detail: the one piece the sidebar's child rows and the chat
+ * strip's rows both render, so the same child reads the same on both.
+ */
+export const AgentChildRowContent = React.memo(function AgentChildRowContent({
+  row,
+  now,
+  leadClassName,
+  trailClassName,
+  separator,
+  dotTitle,
+  tooltipSide,
+  lineTitle = false
+}: AgentChildRowContentProps): React.JSX.Element {
+  const { lead, trail } = agentChildRowText(row, now)
+  return (
+    <>
+      <AgentStateDot
+        state={row.displayState}
+        size="sm"
+        title={dotTitle}
+        tooltipSide={tooltipSide}
+      />
+      <span
+        className="min-w-0 flex-1 truncate"
+        title={lineTitle ? `${lead}${trail ? `${separator}${trail}` : ''}` : undefined}
+      >
+        <span className={leadClassName}>{lead}</span>
+        {trail ? (
+          <span className={trailClassName}>
+            {separator}
+            {trail}
+          </span>
+        ) : null}
+      </span>
+    </>
+  )
+})
diff --git a/src/renderer/src/components/AgentStateDot.test.ts b/src/renderer/src/components/AgentStateDot.test.ts
index 33642542d79f..a767a61ccf4b 100644
--- a/src/renderer/src/components/AgentStateDot.test.ts
+++ b/src/renderer/src/components/AgentStateDot.test.ts
@@ -47,15 +47,9 @@ describe('AgentStateDot', () => {
   it('renders working as a yellow spinner', () => {
     const markup = renderMarkup('working')
 
-    expect(markup).toContain('border-yellow-500')
-    expect(markup).toContain('border-t-transparent')
-    // Why: rotation must come from the compositor-driven CSS animation, not a
-    // JS clock writing per-element styles on the input thread (STA-3328).
-    expect(markup).toContain('agent-working-spinner')
+    // The spinner's own classes and animation contract belong to AgentWorkingSpinner.test.tsx;
+    // this pins only that 'working' reaches for it.
     expect(markup).toContain('data-agent-spinner')
-    // Why: under reduced motion the top border is filled so the static ring
-    // reads as a complete marker, not a broken partial spinner (#9515).
-    expect(markup).toContain('motion-reduce:border-t-yellow-500')
   })
 
   it('renders monitoring as a static yellow heartbeat glyph', () => {
diff --git a/src/renderer/src/components/TerminalLegacyTerminalPanes.tsx b/src/renderer/src/components/TerminalLegacyTerminalPanes.tsx
index f095b77e0e17..b054a05b7172 100644
--- a/src/renderer/src/components/TerminalLegacyTerminalPanes.tsx
+++ b/src/renderer/src/components/TerminalLegacyTerminalPanes.tsx
@@ -1,5 +1,6 @@
 import { createPortal } from 'react-dom'
 import TerminalPane from './terminal-pane/TerminalPane'
+import { TerminalRestoringPlaceholder } from './terminal-pane/TerminalRestoringPlaceholder'
 import { findActivityTerminalPortal } from './activity/activity-terminal-portal'
 import { shouldMountBackgroundWorktreeTab } from './terminal/background-terminal-worktree-mount'
 import type { TerminalController } from './use-terminal-controller'
@@ -59,51 +60,54 @@ export function TerminalLegacyTerminalPanes({
               }
               aria-hidden={!isVisible}
             >
-              {(tabsByWorktree[workspace.id] ?? [])
-                .filter((tab) =>
-                  shouldMountBackgroundWorktreeTab(
+              {(tabsByWorktree[workspace.id] ?? []).map((tab) => {
+                const isActiveTerminalTab =
+                  isVisible && tab.id === activeTabId && activeTabType === 'terminal'
+                if (
+                  !shouldMountBackgroundWorktreeTab(
                     backgroundMountTabIdsByWorktreeRef.current.get(workspace.id) ?? null,
                     tab.id
                   )
+                ) {
+                  // Why only the startup hold lands here visible: reveal admits every other
+                  // visible deferred tab in the same render pass.
+                  return isActiveTerminalTab ? <TerminalRestoringPlaceholder key={tab.id} /> : null
+                }
+                const activityTerminalPortal = findActivityTerminalPortal(activityTerminalPortals, {
+                  worktreeId: workspace.id,
+                  tabId: tab.id
+                })
+                const isActivityPortalTab = activityTerminalPortal !== null
+                if (
+                  shouldColdParkTerminalPanes &&
+                  !isActivityPortalTab &&
+                  !evictionExemptTerminalTabIds.has(tab.id)
+                ) {
+                  return null
+                }
+                const terminalPane = (
+                  <TerminalPane
+                    key={`${tab.id}-${tab.generation ?? 0}`}
+                    tabId={tab.id}
+                    worktreeId={workspace.id}
+                    cwd={tab.startupCwd ?? workspace.path}
+                    isActive={isActiveTerminalTab || activityTerminalPortal?.active === true}
+                    isVisible={isActiveTerminalTab || isActivityPortalTab}
+                    isWorktreeActive={isVisible || isActivityPortalTab}
+                    isolatedPaneKey={activityTerminalPortal?.paneKey ?? null}
+                    onPtyExit={(ptyId, exitCode) => handlePtyExit(tab.id, ptyId, exitCode)}
+                    onCloseTab={() => handleCloseTab(tab.id)}
+                  />
                 )
-                .map((tab) => {
-                  const activityTerminalPortal = findActivityTerminalPortal(
-                    activityTerminalPortals,
-                    { worktreeId: workspace.id, tabId: tab.id }
+                if (activityTerminalPortal) {
+                  return createPortal(
+                    terminalPane,
+                    activityTerminalPortal.target,
+                    `activity-terminal-${tab.id}`
                   )
-                  const isActivityPortalTab = activityTerminalPortal !== null
-                  const isActiveTerminalTab =
-                    isVisible && tab.id === activeTabId && activeTabType === 'terminal'
-                  if (
-                    shouldColdParkTerminalPanes &&
-                    !isActivityPortalTab &&
-                    !evictionExemptTerminalTabIds.has(tab.id)
-                  ) {
-                    return null
-                  }
-                  const terminalPane = (
-                    <TerminalPane
-                      key={`${tab.id}-${tab.generation ?? 0}`}
-                      tabId={tab.id}
-                      worktreeId={workspace.id}
-                      cwd={tab.startupCwd ?? workspace.path}
-                      isActive={isActiveTerminalTab || activityTerminalPortal?.active === true}
-                      isVisible={isActiveTerminalTab || isActivityPortalTab}
-                      isWorktreeActive={isVisible || isActivityPortalTab}
-                      isolatedPaneKey={activityTerminalPortal?.paneKey ?? null}
-                      onPtyExit={(ptyId, exitCode) => handlePtyExit(tab.id, ptyId, exitCode)}
-                      onCloseTab={() => handleCloseTab(tab.id)}
-                    />
-                  )
-                  if (activityTerminalPortal) {
-                    return createPortal(
-                      terminalPane,
-                      activityTerminalPortal.target,
-                      `activity-terminal-${tab.id}`
-                    )
-                  }
-                  return terminalPane
-                })}
+                }
+                return terminalPane
+              })}
             </div>
           )
         })}
diff --git a/src/renderer/src/components/TerminalSplitWorkspaceSurfaces.tsx b/src/renderer/src/components/TerminalSplitWorkspaceSurfaces.tsx
index 5c3145360f65..cfe381ccce9f 100644
--- a/src/renderer/src/components/TerminalSplitWorkspaceSurfaces.tsx
+++ b/src/renderer/src/components/TerminalSplitWorkspaceSurfaces.tsx
@@ -1,5 +1,6 @@
 import { useAnyBrowserGuestNeedsPaint } from './browser-pane/host-guest/browser-guest-paint-retention'
 import { WorktreeSplitSurface } from './TerminalWorktreeSplitSurface'
+import { selectParkedEquivalentMountTabIds } from './terminal/startup-terminal-tab-hold'
 import type { TerminalController } from './use-terminal-controller'
 
 export function TerminalSplitWorkspaceSurfaces({
@@ -21,6 +22,7 @@ export function TerminalSplitWorkspaceSurfaces({
     measurableBackgroundWorktreeIdsRef,
     mountedWorktreeIdsRef,
     renderedActiveWorktreeId,
+    startupTerminalTabHold,
     workspaceSurfaces
   } = controller
   // Why: this and TerminalSurface are both strict ancestors of every browser <webview>, so a
@@ -69,9 +71,11 @@ export function TerminalSplitWorkspaceSurfaces({
               backgroundMountTabIds={
                 backgroundMountTabIdsByWorktreeRef.current.get(workspace.id) ?? null
               }
-              activationDeferredMountTabIds={
-                activationDeferredMountTabIdsByWorktreeRef.current.get(workspace.id) ?? null
-              }
+              activationDeferredMountTabIds={selectParkedEquivalentMountTabIds(
+                activationDeferredMountTabIdsByWorktreeRef.current.get(workspace.id),
+                startupTerminalTabHold,
+                workspace.id
+              )}
             />
           )
         })}
diff --git a/src/renderer/src/components/WorktreeJumpPalette.test.tsx b/src/renderer/src/components/WorktreeJumpPalette.test.tsx
index 0881dd10d783..cfe5de958320 100644
--- a/src/renderer/src/components/WorktreeJumpPalette.test.tsx
+++ b/src/renderer/src/components/WorktreeJumpPalette.test.tsx
@@ -421,6 +421,7 @@ describe('WorktreeJumpPalette', () => {
     // The first row names ITS OWN host — the wrong-host open is gone.
     await act(async () => fireEvent.click(rows[0]!))
     expect(activateAndRevealWorktree).toHaveBeenLastCalledWith('shared', {
+      navigationIntent: 'user-open',
       executionHostId: 'local'
     })
   })
@@ -443,6 +444,7 @@ describe('WorktreeJumpPalette', () => {
 
     await act(async () => fireEvent.click(rows[1]!))
     expect(activateAndRevealWorktree).toHaveBeenLastCalledWith('shared', {
+      navigationIntent: 'user-open',
       executionHostId: 'ssh:box'
     })
   })
@@ -487,6 +489,7 @@ describe('WorktreeJumpPalette', () => {
 
     await act(async () => fireEvent.click(hubARow!))
     expect(activateAndRevealWorktree).toHaveBeenLastCalledWith('shared-runtime', {
+      navigationIntent: 'user-open',
       executionHostId: 'runtime:hub-a'
     })
   })
diff --git a/src/renderer/src/components/activity/activity-clear-completed.test.ts b/src/renderer/src/components/activity/activity-clear-completed.test.ts
index e0cee5aa9d89..79191ce32520 100644
--- a/src/renderer/src/components/activity/activity-clear-completed.test.ts
+++ b/src/renderer/src/components/activity/activity-clear-completed.test.ts
@@ -61,6 +61,7 @@ import {
   isClearableActivityThread,
   planClearCompletedActivity
 } from './activity-clear-completed'
+import { activityThreadStatusId } from './activity-thread-presentation'
 
 function makeThread(paneKey: string, overrides: Partial<AgentPaneThread> = {}): AgentPaneThread {
   return {
@@ -81,7 +82,7 @@ function makeThread(paneKey: string, overrides: Partial<AgentPaneThread> = {}):
   }
 }
 
-function doneEvent(interrupted: boolean): ActivityEvent {
+function doneEvent(interrupted: boolean, outcome?: 'failure'): ActivityEvent {
   return {
     id: 'evt',
     state: 'done',
@@ -89,7 +90,16 @@ function doneEvent(interrupted: boolean): ActivityEvent {
     observedAt: 5_000,
     worktree: makeWorktree(),
     repo: null,
-    entry: { interrupted } as ActivityEvent['entry'],
+    entry: {
+      paneKey: 'evt-pane',
+      state: 'done',
+      prompt: '',
+      updatedAt: 5_000,
+      stateStartedAt: 5_000,
+      stateHistory: [],
+      interrupted,
+      ...(outcome ? { mainAgent: { state: 'done', outcome, stateStartedAt: 5_000 } } : {})
+    },
     tab: makeTab(),
     agentType: 'claude',
     agentAlive: false,
@@ -102,6 +112,7 @@ const blockedThread = makeThread('t-blocked:1', { currentAgentState: 'blocked' }
 const waitingThread = makeThread('t-waiting:1', { currentAgentState: 'waiting' })
 const doneThread = makeThread('t-done:1', { latestEvent: doneEvent(false) })
 const interruptedThread = makeThread('t-interrupted:1', { latestEvent: doneEvent(true) })
+const failedThread = makeThread('t-failed:1', { latestEvent: doneEvent(false, 'failure') })
 
 function makeRetained(paneKey: string): RetainedAgentEntry {
   return {
@@ -125,10 +136,34 @@ describe('isClearableActivityThread', () => {
   it('clears only completed and interrupted threads', () => {
     expect(isClearableActivityThread(doneThread)).toBe(true)
     expect(isClearableActivityThread(interruptedThread)).toBe(true)
+    expect(activityThreadStatusId(failedThread)).toBe('failed')
+    expect(isClearableActivityThread(failedThread)).toBe(true)
     expect(isClearableActivityThread(workingThread)).toBe(false)
     expect(isClearableActivityThread(blockedThread)).toBe(false)
     expect(isClearableActivityThread(waitingThread)).toBe(false)
   })
+
+  it('reads a live thread whose main agent failed as failed, but keeps it while subagents run', () => {
+    const heldEntry = {
+      ...doneEvent(false).entry,
+      state: 'working' as const,
+      mainAgent: { state: 'done' as const, outcome: 'failure' as const, stateStartedAt: 5_000 }
+    }
+    const held = makeThread('t-held:1', {
+      currentAgentState: 'working',
+      currentAgentEntry: heldEntry
+    })
+    expect(activityThreadStatusId(held)).toBe('failed')
+    expect(isClearableActivityThread(held)).toBe(false)
+    const succeeded = makeThread('t-ok:1', {
+      currentAgentState: 'working',
+      currentAgentEntry: {
+        ...heldEntry,
+        mainAgent: { state: 'done', outcome: 'success', stateStartedAt: 5_000 }
+      }
+    })
+    expect(activityThreadStatusId(succeeded)).toBe('working')
+  })
 })
 
 describe('clearCompletedActivity', () => {
diff --git a/src/renderer/src/components/activity/activity-clear-completed.ts b/src/renderer/src/components/activity/activity-clear-completed.ts
index 2bb39fdff430..e365152c9bbe 100644
--- a/src/renderer/src/components/activity/activity-clear-completed.ts
+++ b/src/renderer/src/components/activity/activity-clear-completed.ts
@@ -18,11 +18,15 @@ export type ClearCompletedActivityPlan = {
   clearedThreadCount: number
 }
 
-/** A thread is clearable when it needs nothing from the user: completed or interrupted,
+/** A thread is clearable when it needs nothing from the user: completed, failed or interrupted,
  *  with no fresh live working/monitoring/blocked/waiting state. */
 export function isClearableActivityThread(thread: AgentPaneThread): boolean {
   const id = activityThreadStatusId(thread)
-  return id === 'done' || id === 'interrupted'
+  // Why: a failed main agent reads failed while its subagents still run; that thread is still live.
+  if (thread.currentAgentState) {
+    return false
+  }
+  return id === 'done' || id === 'failed' || id === 'interrupted'
 }
 
 export function planClearCompletedActivity(
diff --git a/src/renderer/src/components/activity/activity-pane-events.ts b/src/renderer/src/components/activity/activity-pane-events.ts
index 6a147beac816..0ee287af1878 100644
--- a/src/renderer/src/components/activity/activity-pane-events.ts
+++ b/src/renderer/src/components/activity/activity-pane-events.ts
@@ -27,7 +27,9 @@ function historyEntrySnapshot(
     toolName: undefined,
     toolInput: undefined,
     lastAssistantMessage: undefined,
-    interrupted: history.interrupted
+    interrupted: history.interrupted,
+    // The live row's main agent belongs to its current state, not to this snapshot.
+    mainAgent: history.mainAgent
   }
 }
 
diff --git a/src/renderer/src/components/activity/activity-thread-actions.test.ts b/src/renderer/src/components/activity/activity-thread-actions.test.ts
index 07f50bce92d8..ce546f036970 100644
--- a/src/renderer/src/components/activity/activity-thread-actions.test.ts
+++ b/src/renderer/src/components/activity/activity-thread-actions.test.ts
@@ -1,4 +1,6 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
+import { TOGGLE_FLOATING_TERMINAL_EVENT } from '@/lib/floating-terminal'
 import { makeRepo, makeTab, makeWorktree } from './ActivityPrototypePage-test-fixtures'
 import type { AgentPaneThread } from './activity-thread-types'
 
@@ -6,7 +8,9 @@ const mocks = vi.hoisted(() => ({
   getState: vi.fn(),
   activateTabAndFocusPane: vi.fn(),
   activateStructuredAgentSessionTab: vi.fn(),
-  activateAndRevealWorkspace: vi.fn()
+  activateAndRevealWorkspace: vi.fn(),
+  isFloatingWorkspacePanelVisible: vi.fn(),
+  dispatchEvent: vi.fn()
 }))
 
 vi.mock('@/store', () => ({ useAppStore: { getState: mocks.getState } }))
@@ -19,6 +23,9 @@ vi.mock('@/lib/structured-agent-session-tab-activation', () => ({
 vi.mock('@/lib/worktree-activation', () => ({
   activateAndRevealWorkspace: mocks.activateAndRevealWorkspace
 }))
+vi.mock('@/lib/floating-workspace-terminal-actions', () => ({
+  isFloatingWorkspacePanelVisible: mocks.isFloatingWorkspacePanelVisible
+}))
 
 import { createActivityThreadActions, hasActivityThreadWorkspace } from './activity-thread-actions'
 
@@ -62,6 +69,8 @@ describe('activity thread host routing', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
+    vi.stubGlobal('window', { dispatchEvent: mocks.dispatchEvent })
+    mocks.isFloatingWorkspacePanelVisible.mockReturnValue(false)
     mocks.activateStructuredAgentSessionTab.mockReturnValue(false)
     mocks.activateAndRevealWorkspace.mockReturnValue({ primaryTabId: null })
     getKnownWorktreeById.mockReturnValue(thread.worktree)
@@ -92,6 +101,76 @@ describe('activity thread host routing', () => {
     mocks.getState.mockImplementation(() => state)
   })
 
+  afterEach(() => vi.unstubAllGlobals())
+
+  function makeFloatingThread(): AgentPaneThread {
+    return {
+      ...thread,
+      worktree: { ...thread.worktree, id: FLOATING_TERMINAL_WORKTREE_ID },
+      repo: null,
+      tab: { ...thread.tab, worktreeId: FLOATING_TERMINAL_WORKTREE_ID }
+    }
+  }
+
+  it.each([false, true])(
+    'reveals the floating agent pane when the panel is open=%s without switching workspace',
+    (open) => {
+      const floatingThread = makeFloatingThread()
+      state.settings = { floatingTerminalEnabled: true }
+      state.tabsByWorktree = { [FLOATING_TERMINAL_WORKTREE_ID]: [floatingThread.tab] }
+      mocks.activateAndRevealWorkspace.mockReturnValue(false)
+      mocks.isFloatingWorkspacePanelVisible.mockReturnValue(open)
+
+      makeActions().selectThread(floatingThread)
+
+      expect(setSelectedPaneKey).toHaveBeenCalledWith(floatingThread.paneKey)
+      expect(mocks.activateAndRevealWorkspace).not.toHaveBeenCalled()
+      expect(setActiveWorktree).not.toHaveBeenCalled()
+      expect(mocks.dispatchEvent).toHaveBeenCalledTimes(open ? 0 : 1)
+      if (!open) {
+        expect(mocks.dispatchEvent).toHaveBeenCalledWith(
+          expect.objectContaining({ type: TOGGLE_FLOATING_TERMINAL_EVENT })
+        )
+      }
+      expect(mocks.activateTabAndFocusPane).toHaveBeenCalledWith(
+        floatingThread.tab.id,
+        '11111111-1111-4111-8111-111111111111',
+        { flashFocusedPane: true, scrollToBottomIfOutputSinceLastView: true }
+      )
+    }
+  )
+
+  it('enables a disabled floating workspace before revealing its agent pane', async () => {
+    const floatingThread = makeFloatingThread()
+    const updateSettings = vi.fn().mockResolvedValue(undefined)
+    const requestAnimationFrame = vi.fn((callback: FrameRequestCallback) => {
+      callback(0)
+      return 1
+    })
+    vi.stubGlobal('requestAnimationFrame', requestAnimationFrame)
+    state.settings = { floatingTerminalEnabled: false }
+    state.updateSettings = updateSettings
+    state.tabsByWorktree = { [FLOATING_TERMINAL_WORKTREE_ID]: [floatingThread.tab] }
+
+    makeActions().selectThread(floatingThread)
+
+    expect(updateSettings).toHaveBeenCalledWith({ floatingTerminalEnabled: true })
+    expect(mocks.dispatchEvent).not.toHaveBeenCalled()
+    expect(mocks.activateTabAndFocusPane).toHaveBeenCalled()
+    await vi.waitFor(() => expect(requestAnimationFrame).toHaveBeenCalledTimes(1))
+    expect(mocks.dispatchEvent).toHaveBeenCalledWith(
+      expect.objectContaining({ type: TOGGLE_FLOATING_TERMINAL_EVENT })
+    )
+  })
+
+  it('does not open the floating panel for a retained thread whose tab was closed', () => {
+    makeActions().selectThread(makeFloatingThread())
+
+    expect(mocks.activateAndRevealWorkspace).not.toHaveBeenCalled()
+    expect(mocks.dispatchEvent).not.toHaveBeenCalled()
+    expect(mocks.activateTabAndFocusPane).not.toHaveBeenCalled()
+  })
+
   it('routes the row click through the full activation sequence for the matching host', () => {
     makeActions().selectThread(thread)
 
@@ -179,6 +258,7 @@ describe('activity thread host routing', () => {
 
     expect(acknowledgeAgents).toHaveBeenCalledWith([thread.paneKey])
     expect(mocks.activateAndRevealWorkspace).toHaveBeenCalledWith(thread.worktree.id, {
+      navigationIntent: 'user-open',
       executionHostId: REMOTE_HOST
     })
   })
diff --git a/src/renderer/src/components/activity/activity-thread-actions.ts b/src/renderer/src/components/activity/activity-thread-actions.ts
index 6e0d167a5a37..c2d99c23fc29 100644
--- a/src/renderer/src/components/activity/activity-thread-actions.ts
+++ b/src/renderer/src/components/activity/activity-thread-actions.ts
@@ -1,8 +1,11 @@
 import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane'
+import { TOGGLE_FLOATING_TERMINAL_EVENT } from '@/lib/floating-terminal'
+import { isFloatingWorkspacePanelVisible } from '@/lib/floating-workspace-terminal-actions'
 import { activateStructuredAgentSessionTab } from '@/lib/structured-agent-session-tab-activation'
 import { activateAndRevealWorkspace } from '@/lib/worktree-activation'
 import { jumpToWorktreeFromSidebar } from '@/lib/worktree-jump-navigation'
 import { useAppStore } from '@/store'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 import {
   getSettingsFocusedExecutionHostId,
   getWorktreeExecutionHostId,
@@ -45,6 +48,25 @@ export function hasActivityThreadWorkspace(
   )
 }
 
+function toggleFloatingWorkspacePanelIfHidden(): void {
+  if (!isFloatingWorkspacePanelVisible()) {
+    window.dispatchEvent(new Event(TOGGLE_FLOATING_TERMINAL_EVENT))
+  }
+}
+
+// Why enable first: floating tabs outlive a feature disable, and the panel ignores the toggle
+// while disabled, so a live floating agent row would otherwise be a silent no-op.
+function revealFloatingWorkspacePanel(state: AppState): void {
+  if (state.settings?.floatingTerminalEnabled === true) {
+    toggleFloatingWorkspacePanelIfHidden()
+    return
+  }
+  void state.updateSettings({ floatingTerminalEnabled: true }).then(() => {
+    // Why deferred a frame: the panel only honors the toggle once the enabled flag has reached React.
+    requestAnimationFrame(toggleFloatingWorkspacePanelIfHidden)
+  })
+}
+
 export function createActivityThreadActions({
   getMarkAllReadThreads,
   acknowledgeAgents,
@@ -75,6 +97,7 @@ export function createActivityThreadActions({
   }
 
   const activateThreadTarget = (thread: AgentPaneThread): void => {
+    const isFloatingTerminal = thread.worktree.id === FLOATING_TERMINAL_WORKTREE_ID
     const executionHostId = getActivityThreadExecutionHostId(
       thread,
       getSettingsFocusedExecutionHostId(useAppStore.getState().settings)
@@ -84,6 +107,7 @@ export function createActivityThreadActions({
     // resumeSleepingAgentSessionsForWorktree/ensureWorktreeHasInitialTerminal run inside here.
     // Probing tab residency first is what made a remote row click a silent no-op (#16731).
     if (
+      !isFloatingTerminal &&
       activateAndRevealWorkspace(thread.worktree.id, {
         executionHostId,
         revealInSidebar: false,
@@ -105,6 +129,10 @@ export function createActivityThreadActions({
       // no pane to focus and focusing a sibling would be worse than focusing nothing.
       return
     }
+    // Floating tabs have no catalog workspace; reveal their panel without changing the main workspace.
+    if (isFloatingTerminal) {
+      revealFloatingWorkspacePanel(activated)
+    }
     activated.setActiveTabType('terminal', thread.worktree.id)
     const parsed = parsePaneKey(thread.paneKey)
     activateTabAndFocusPane(
diff --git a/src/renderer/src/components/activity/activity-thread-grouping.ts b/src/renderer/src/components/activity/activity-thread-grouping.ts
index cab4fbcf8c34..9bf99cc67cf3 100644
--- a/src/renderer/src/components/activity/activity-thread-grouping.ts
+++ b/src/renderer/src/components/activity/activity-thread-grouping.ts
@@ -21,11 +21,11 @@ const ACTIVITY_STATUS_GROUP_RANK: Record<ActivityThreadStatusId, number> = {
   waiting: 0,
   blocked: 1,
   permission: 2,
-  interrupted: 3,
-  working: 4,
-  monitoring: 5,
-  unverifiable: 6,
-  failed: 7,
+  failed: 3,
+  interrupted: 4,
+  working: 5,
+  monitoring: 6,
+  unverifiable: 7,
   done: 8,
   idle: 9
 }
diff --git a/src/renderer/src/components/activity/activity-thread-presentation.ts b/src/renderer/src/components/activity/activity-thread-presentation.ts
index 5541b3da493a..e38c802f867a 100644
--- a/src/renderer/src/components/activity/activity-thread-presentation.ts
+++ b/src/renderer/src/components/activity/activity-thread-presentation.ts
@@ -2,6 +2,10 @@ import type { AgentDotState } from '@/components/AgentStateDot'
 import { formatAgentTypeLabel } from '@/lib/agent-status'
 import { getAgentRowPrimaryText } from '@/lib/agent-row-primary-text'
 import { showsAgentToolPreview } from '@/lib/agent-row-tool-preview'
+import {
+  agentMainAgentVerdict,
+  agentVerdictDisplayMark
+} from '../../../../shared/agent-main-agent-verdict'
 import {
   getActivityThreadTaskTitle,
   getActivityThreadWorkspaceTitle,
@@ -68,7 +72,12 @@ export function agentTitle(event: ActivityEvent): string {
     return 'Agent working'
   }
   if (event.state === 'done') {
-    return event.entry.interrupted ? 'Agent interrupted' : 'Agent finished'
+    const verdict = agentMainAgentVerdict(event.entry)
+    return verdict === 'failure'
+      ? 'Agent failed'
+      : verdict === 'cancellation'
+        ? 'Agent interrupted'
+        : 'Agent finished'
   }
   return event.state === 'waiting' ? 'Agent waiting for input' : 'Agent needs input'
 }
@@ -91,7 +100,12 @@ export function agentMeta(event: ActivityEvent): string {
     return `${agent} ${event.state}`
   }
   if (event.state === 'done') {
-    return event.entry.interrupted ? `${agent} interrupted` : `${agent} completed`
+    const verdict = agentMainAgentVerdict(event.entry)
+    return verdict === 'failure'
+      ? `${agent} failed`
+      : verdict === 'cancellation'
+        ? `${agent} interrupted`
+        : `${agent} completed`
   }
   return event.state === 'waiting' ? `${agent} waiting` : `${agent} blocked`
 }
@@ -120,13 +134,18 @@ export function statusPreviewForEntry(
 export type ActivityThreadStatusId = AgentDotState
 
 /** Single classifier behind grouping, labels, and clear-completed; the only place the
- *  interrupted predicate is spelled. */
+ *  verdict predicate is spelled. */
 export function activityThreadStatusId(thread: AgentPaneThread): ActivityThreadStatusId {
+  // Why: a failed main agent outranks the subagent work still holding its row live.
+  if (thread.currentAgentEntry && agentVerdictDisplayMark(thread.currentAgentEntry) === 'failed') {
+    return 'failed'
+  }
   const paneEntry = paneActivityEntry(thread)
   const state = threadCurrentState(thread) ?? 'done'
-  const interrupted = paneEntry ? paneEntry.interrupted : thread.latestEvent?.entry.interrupted
-  if (!thread.currentAgentState && state === 'done' && interrupted) {
-    return 'interrupted'
+  const verdictEntry = paneEntry ?? thread.latestEvent?.entry
+  const verdictDot = verdictEntry ? agentVerdictDisplayMark(verdictEntry) : null
+  if (!thread.currentAgentState && state === 'done' && verdictDot) {
+    return verdictDot
   }
   return state
 }
@@ -149,7 +168,7 @@ function threadCurrentState(
   )
 }
 
-// Interrupted rows deliberately keep the done glyph (#2569).
+// Interrupted rows deliberately keep the done glyph (#2569); a failure is a fault and does not.
 export function threadAgentState(thread: AgentPaneThread): AgentDotState {
   const id = activityThreadStatusId(thread)
   return id === 'interrupted' ? 'done' : id
diff --git a/src/renderer/src/components/agent-child-row-parity.test.tsx b/src/renderer/src/components/agent-child-row-parity.test.tsx
new file mode 100644
index 000000000000..c8e3b4bd1900
--- /dev/null
+++ b/src/renderer/src/components/agent-child-row-parity.test.tsx
@@ -0,0 +1,631 @@
+/** @vitest-environment happy-dom */
+import { renderToStaticMarkup } from 'react-dom/server'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  agentChildRowContextForParent,
+  type AgentChildRowContext
+} from '../../../shared/agent-child-row-model'
+import type { AgentSessionBackgroundTask } from '../../../shared/agent-session-wire'
+import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view'
+import type { AgentStatusEntry } from '../../../shared/agent-status-types'
+import type { TerminalTab } from '../../../shared/terminal-tab-types'
+import DashboardAgentRow from '@/components/dashboard/DashboardAgentRow'
+import { NativeChatBackgroundTasksStatus } from '@/components/native-chat/NativeChatBackgroundTasksStatus'
+import { buildBackgroundTaskGroupsFromViews } from '@/components/native-chat/background-task-roster'
+import { CompactAgentRow } from '@/components/sidebar/worktree-card-compact-agent-row'
+import { buildSubagentChildRows } from '@/components/sidebar/worktree-subagent-child-rows'
+import { TooltipProvider } from '@/components/ui/tooltip'
+
+vi.mock('@/components/dashboard/use-agent-row-conversation-name', () => ({
+  useAgentRowConversationName: () => null
+}))
+
+vi.mock('@/components/sidebar/CacheTimer', () => ({
+  default: () => null,
+  usePromptCacheCountdownForPane: () => null
+}))
+
+const NOW = 1_000_000
+const MINUTE = 60_000
+
+beforeEach(() => {
+  vi.useFakeTimers()
+  vi.setSystemTime(NOW)
+})
+
+afterEach(() => {
+  vi.useRealTimers()
+})
+
+const tab: TerminalTab = {
+  id: 'parent-tab',
+  ptyId: null,
+  worktreeId: 'wt-1',
+  title: 'Parent',
+  customTitle: null,
+  color: null,
+  sortOrder: 0,
+  createdAt: 1
+}
+
+function view(id: string, overrides: Partial<AgentChildWorkView> = {}): AgentChildWorkView {
+  return {
+    id,
+    providerId: `task-${id}`,
+    kind: 'agent',
+    description: 'Audit the parser',
+    agentType: 'general-purpose',
+    state: 'working',
+    membership: 'live',
+    firstObservedAt: NOW - 5 * MINUTE,
+    observedAt: NOW - 2 * MINUTE,
+    stoppable: true,
+    invocation: { invocationId: `spawn-${id}`, generation: 1 },
+    ...overrides
+  }
+}
+
+function settled(
+  outcome: NonNullable<AgentChildWorkView['outcome']>,
+  overrides: Partial<AgentChildWorkView> = {}
+): AgentChildWorkView {
+  return view('child', {
+    state: 'done',
+    membership: 'settled',
+    outcome,
+    settledAt: NOW - 3 * MINUTE,
+    ...overrides
+  })
+}
+
+const OWNED_SHELL = view('shell', {
+  kind: 'command',
+  description: 'npm run dev',
+  agentType: undefined,
+  state: 'monitoring',
+  parentChildWorkId: 'child'
+})
+
+function parentWith(children: AgentChildWorkView[], updatedAt = NOW): AgentStatusEntry {
+  return {
+    paneKey: 'parent-tab:leaf-1',
+    tabId: tab.id,
+    worktreeId: tab.worktreeId,
+    state: 'done',
+    prompt: 'parent prompt',
+    updatedAt,
+    stateStartedAt: NOW - 20 * MINUTE,
+    stateHistory: [],
+    children
+  }
+}
+
+type RenderedRow = { dot: string; lead: string; trail: string }
+
+function readRow(root: Element, separator: string): RenderedRow {
+  const text = root.querySelector('span.truncate')
+  const [lead, trail] = [...(text?.children ?? [])].map((span) => span.textContent ?? '')
+  return {
+    dot: root.querySelector('[aria-label]')?.getAttribute('aria-label') ?? '',
+    lead: lead ?? '',
+    trail: trail?.startsWith(separator) ? trail.slice(separator.length) : (trail ?? '')
+  }
+}
+
+function mount(markup: string): HTMLElement {
+  const container = document.createElement('div')
+  container.innerHTML = markup
+  return container
+}
+
+function sidebarRows(parent: AgentStatusEntry, parentIsFresh = true): RenderedRow[] {
+  return buildSubagentChildRows({ parentEntry: parent, tab, parentIsFresh }).map((agent) =>
+    readRow(
+      mount(
+        renderToStaticMarkup(
+          <TooltipProvider>
+            <CompactAgentRow agent={agent} now={NOW} onActivate={() => {}} />
+          </TooltipProvider>
+        )
+      ),
+      ' - '
+    )
+  )
+}
+
+function stripRows(
+  children: AgentChildWorkView[] | undefined,
+  childRowContext?: AgentChildRowContext,
+  tasks: AgentSessionBackgroundTask[] = []
+): RenderedRow[] {
+  const root = mount(
+    renderToStaticMarkup(
+      <NativeChatBackgroundTasksStatus
+        tasks={tasks}
+        settledTasks={[]}
+        childViews={children}
+        childRowContext={childRowContext}
+        supportsTaskStop
+        supportsStopAll
+        stoppingTaskIds={new Set()}
+        stoppingAll={false}
+        indicatorActive
+        isVisible
+        expanded
+        onExpandedChange={() => {}}
+        onStop={() => {}}
+      />
+    )
+  )
+  return [...root.querySelectorAll('li')]
+    .filter((row) => row.querySelector(':scope > span.truncate'))
+    .map((row) => readRow(row, ' · '))
+}
+
+/** The full sidebar row: every dot label it carries, and its whole text. */
+function fullRow(parent: AgentStatusEntry): { labels: string[]; text: string } {
+  const [agent] = buildSubagentChildRows({ parentEntry: parent, tab, parentIsFresh: true })
+  const root = mount(
+    renderToStaticMarkup(
+      <TooltipProvider>
+        <DashboardAgentRow
+          agent={agent}
+          now={NOW}
+          onActivate={() => {}}
+          onDismiss={() => {}}
+          stateDotSize="sm"
+          hideExpand
+        />
+      </TooltipProvider>
+    )
+  )
+  return {
+    labels: [...root.querySelectorAll('[aria-label]')].map(
+      (element) => element.getAttribute('aria-label') ?? ''
+    ),
+    text: root.textContent ?? ''
+  }
+}
+
+const SCENARIOS: [string, AgentChildWorkView[], RenderedRow][] = [
+  [
+    'working, no known operation',
+    [view('child')],
+    { dot: 'Working', lead: 'Audit the parser', trail: 'general-purpose' }
+  ],
+  [
+    'working with a tool',
+    [
+      view('child', {
+        operation: { toolName: 'Read', input: 'src/parser.ts', basis: 'open', observedAt: NOW }
+      })
+    ],
+    { dot: 'Working', lead: 'Audit the parser', trail: 'Read: src/parser.ts' }
+  ],
+  [
+    'running a shell in the foreground',
+    [
+      view('child', {
+        operation: { toolName: 'Bash', input: 'npm test', basis: 'open', observedAt: NOW }
+      })
+    ],
+    { dot: 'Working', lead: 'Audit the parser', trail: 'Bash: npm test' }
+  ],
+  [
+    'finished, while a shell it launched still runs',
+    [settled('succeeded', { lastMessage: 'All green' }), OWNED_SHELL],
+    {
+      dot: 'Monitoring background tasks',
+      lead: 'Monitoring background tasks',
+      trail: 'Audit the parser'
+    }
+  ],
+  [
+    'waiting on an approval',
+    [
+      view('child', {
+        state: 'waiting',
+        operation: { toolName: 'Edit', input: 'src/parser.ts', basis: 'open', observedAt: NOW }
+      })
+    ],
+    { dot: 'Waiting for input', lead: 'Audit the parser', trail: 'Edit: src/parser.ts' }
+  ],
+  [
+    'blocked',
+    [view('child', { state: 'blocked', lastMessage: 'Rate limited, retrying' })],
+    { dot: 'Blocked', lead: 'Audit the parser', trail: 'Rate limited, retrying' }
+  ],
+  [
+    'finished',
+    [settled('succeeded', { lastMessage: 'Found 3 call sites' })],
+    { dot: 'Done', lead: 'Audit the parser', trail: 'Found 3 call sites' }
+  ],
+  [
+    'failed',
+    [settled('failed', { lastMessage: 'Exit code 1' })],
+    { dot: 'Failed', lead: 'Audit the parser', trail: 'Exit code 1' }
+  ],
+  [
+    'cancelled',
+    [settled('cancelled')],
+    { dot: 'Interrupted', lead: 'Audit the parser', trail: 'general-purpose' }
+  ],
+  [
+    'ended, outcome unknown',
+    [settled('unknown')],
+    { dot: 'Idle', lead: 'Audit the parser', trail: 'Ended' }
+  ],
+  [
+    'unverifiable',
+    [view('child', { state: 'unverifiable' })],
+    { dot: 'No recent update', lead: 'Audit the parser', trail: 'No update in 2m' }
+  ],
+  [
+    'parked, still live',
+    [view('child', { state: 'idle' })],
+    { dot: 'Idle', lead: 'Audit the parser', trail: 'general-purpose' }
+  ]
+]
+
+/** What the full sidebar row, the CLI row's own layout, shows of the same detail. */
+const FULL_ROW_DETAIL: Record<string, { shows: string[]; hides?: string[] }> = {
+  'working, no known operation': { shows: [] },
+  'working with a tool': { shows: ['Read', 'src/parser.ts'] },
+  'running a shell in the foreground': { shows: ['Bash', 'npm test'] },
+  'finished, while a shell it launched still runs': { shows: [], hides: ['All green'] },
+  'waiting on an approval': { shows: ['Edit', 'src/parser.ts'] },
+  blocked: { shows: ['Rate limited, retrying'] },
+  finished: { shows: ['Found 3 call sites'] },
+  failed: { shows: ['Exit code 1'] },
+  cancelled: { shows: [] },
+  'ended, outcome unknown': { shows: ['Ended'] },
+  unverifiable: { shows: ['No update in 2m'] },
+  'parked, still live': { shows: [] }
+}
+
+describe('a child reads the same in the sidebar and the chat strip', () => {
+  it.each(SCENARIOS)('%s', (name, children, expected) => {
+    const [sidebar] = sidebarRows(parentWith(children))
+    const [strip] = stripRows(children)
+    expect(sidebar).toEqual(expected)
+    expect(strip).toEqual(expected)
+    const full = fullRow(parentWith(children))
+    expect(full.labels).toContain(expected.dot)
+    expect(full.text).toContain(expected.lead === expected.dot ? expected.trail : expected.lead)
+    for (const text of FULL_ROW_DETAIL[name].shows) {
+      expect(full.text).toContain(text)
+    }
+    for (const text of FULL_ROW_DETAIL[name].hides ?? []) {
+      expect(full.text).not.toContain(text)
+    }
+  })
+
+  it('names an unlabeled child by the same state on every surface', () => {
+    const children = [
+      settled('failed', { description: undefined, agentType: undefined, lastMessage: 'Exit 2' })
+    ]
+    const [sidebar] = sidebarRows(parentWith(children))
+    const [strip] = stripRows(children)
+    expect(sidebar.lead).toBe('Failed')
+    expect(strip.lead).toBe('Failed')
+    expect(fullRow(parentWith(children)).text).toContain('Failed')
+  })
+
+  it('shows the monitoring icon on the full sidebar row too', () => {
+    const [agent] = buildSubagentChildRows({
+      parentEntry: parentWith([settled('succeeded'), OWNED_SHELL]),
+      tab,
+      parentIsFresh: true
+    })
+    const root = mount(
+      renderToStaticMarkup(
+        <TooltipProvider>
+          <DashboardAgentRow
+            agent={agent}
+            now={NOW}
+            onActivate={() => {}}
+            onDismiss={() => {}}
+            stateDotSize="sm"
+            hideExpand
+          />
+        </TooltipProvider>
+      )
+    )
+    expect(root.querySelector('[aria-label]')?.getAttribute('aria-label')).toBe(
+      'Monitoring background tasks'
+    )
+    // The finished child's last tool line is stale; neither row names it.
+    expect(root.textContent).not.toContain('Bash')
+  })
+
+  it('never shows a monitoring child tool text on either surface', () => {
+    const children = [
+      settled('succeeded', { lastMessage: 'Bash: npm test finished' }),
+      { ...OWNED_SHELL, description: 'tail -f server.log' }
+    ]
+    const [sidebar] = sidebarRows(parentWith(children))
+    const [strip] = stripRows(children)
+    for (const row of [sidebar, strip]) {
+      expect(row.dot).toBe('Monitoring background tasks')
+      expect(`${row.lead} ${row.trail}`).not.toContain('npm test')
+    }
+  })
+})
+
+describe('a child running a shell in its turn', () => {
+  // The host records the running shell both as the child's operation and as a live command it owns.
+  const children = [
+    view('child', {
+      operation: { toolName: 'Bash', input: 'npm run dev', basis: 'open', observedAt: NOW }
+    }),
+    {
+      ...OWNED_SHELL,
+      state: 'working' as const,
+      stoppable: false,
+      firstObservedAt: NOW - MINUTE
+    }
+  ]
+  const childRow: RenderedRow = {
+    dot: 'Working',
+    lead: 'Audit the parser',
+    trail: 'Bash: npm run dev'
+  }
+
+  it('reads as the child working its shell, with the shell nested beneath it in the strip', () => {
+    const groups = buildBackgroundTaskGroupsFromViews(children)
+    expect(groups.map((group) => group.kind)).toEqual(['agent'])
+    expect(groups[0].tasks.map((entry) => entry.row.owned.map((owned) => owned.id))).toEqual([
+      ['shell']
+    ])
+    expect(stripRows(children)).toEqual([
+      childRow,
+      { dot: 'Working', lead: 'npm run dev', trail: '' }
+    ])
+  })
+
+  it('shows the sidebar only the child, saying what the strip says of it', () => {
+    expect(sidebarRows(parentWith(children))).toEqual([childRow])
+  })
+})
+
+describe('one child reads the same from every shape a host publishes', () => {
+  it('names and details it identically from views, the subagents snapshot and the task roster', () => {
+    // A placeholder description falls through to the child's real label on every path.
+    const children = [view('child', { description: 'task', agentType: 'Explore' })]
+    const snapshotParent: AgentStatusEntry = {
+      ...parentWith([]),
+      children: undefined,
+      subagents: [
+        {
+          id: 'child',
+          state: 'working',
+          startedAt: NOW - 5 * MINUTE,
+          description: 'task',
+          agentType: 'Explore'
+        }
+      ]
+    }
+    const roster: AgentSessionBackgroundTask[] = [
+      { id: 'child', kind: 'agent', description: 'task', name: 'Explore', state: 'working' }
+    ]
+    const expected: RenderedRow = { dot: 'Working', lead: 'Explore', trail: '' }
+    expect(sidebarRows(parentWith(children))).toEqual([expected])
+    expect(sidebarRows(snapshotParent)).toEqual([expected])
+    expect(stripRows(children)).toEqual([expected])
+    expect(stripRows(undefined, undefined, roster)).toEqual([expected])
+  })
+})
+
+describe('a mirrored parent and its children read one silence', () => {
+  const SKEW = 20 * MINUTE
+  // The host's clock runs 20 minutes ahead; this machine received its last word 3 minutes ago.
+  function mirroredParent(overrides: Partial<AgentStatusEntry>): AgentStatusEntry {
+    return {
+      ...parentWith([]),
+      state: 'working',
+      updatedAt: NOW - 3 * MINUTE + SKEW,
+      mirroredEvidenceReceivedAt: NOW - 3 * MINUTE,
+      ...overrides
+    }
+  }
+
+  it('times a snapshot child on the receipt clock the parent decays on', () => {
+    const parent = mirroredParent({
+      children: undefined,
+      subagents: [
+        { id: 'child', state: 'working', startedAt: NOW - 9 * MINUTE, description: 'Audit' }
+      ]
+    })
+    expect(sidebarRows(parent, false)[0].trail).toBe('No update in 3m')
+  })
+
+  it('times a view child by its own host-clock age, never across machines', () => {
+    const children = [view('child', { observedAt: NOW - 5 * MINUTE + SKEW })]
+    const parent = mirroredParent({ children })
+    expect(sidebarRows(parent, false)[0].trail).toBe('No update in 5m')
+    expect(stripRows(children, agentChildRowContextForParent(parent, false))[0].trail).toBe(
+      'No update in 5m'
+    )
+    const [agent] = buildSubagentChildRows({ parentEntry: parent, tab, parentIsFresh: false })
+    const full = mount(
+      renderToStaticMarkup(
+        <TooltipProvider>
+          <DashboardAgentRow
+            agent={agent}
+            now={NOW}
+            onActivate={() => {}}
+            onDismiss={() => {}}
+            stateDotSize="sm"
+            hideExpand
+          />
+        </TooltipProvider>
+      )
+    )
+    expect(full.textContent).toContain('No update in 5m')
+  })
+})
+
+describe('a lost or stale parent reads the same on both surfaces', () => {
+  const children = [
+    view('child', {
+      operation: { toolName: 'Bash', input: 'npm test', basis: 'open', observedAt: NOW }
+    })
+  ]
+  const lost: RenderedRow = {
+    dot: 'No recent update',
+    lead: 'Audit the parser',
+    trail: 'No update in 2m'
+  }
+
+  it('when the transport to the host is lost', () => {
+    const parent = { ...parentWith(children), subagentObservation: 'unverifiable' as const }
+    const [sidebar] = sidebarRows(parent)
+    const [strip] = stripRows(children, agentChildRowContextForParent(parent, true))
+    expect(sidebar).toEqual(lost)
+    expect(strip).toEqual(lost)
+  })
+
+  it('when the parent row has gone stale', () => {
+    const parent = parentWith([settled('succeeded'), OWNED_SHELL], NOW - 40 * MINUTE)
+    const [sidebar] = sidebarRows(parent, false)
+    const [strip] = stripRows(parent.children ?? [], agentChildRowContextForParent(parent, false))
+    const stale = { dot: 'No recent update', lead: 'Audit the parser', trail: 'No update in 2m' }
+    expect(sidebar).toEqual(stale)
+    expect(strip).toEqual(stale)
+  })
+
+  it('without a context the strip reports what the host last said', () => {
+    expect(stripRows(children)[0].dot).toBe('Working')
+  })
+})
+
+describe('sibling child rows keep their own clocks', () => {
+  it('reads each sibling from its own evidence, not the parent clock', () => {
+    const parent = parentWith(
+      [
+        view('busy', { description: 'Busy child', observedAt: NOW - 30_000 }),
+        view('quiet', {
+          description: 'Quiet child',
+          firstObservedAt: NOW - 15 * MINUTE,
+          observedAt: NOW - 10 * MINUTE
+        })
+      ],
+      NOW - 40 * MINUTE
+    )
+    const rows = buildSubagentChildRows({ parentEntry: parent, tab, parentIsFresh: false })
+    expect(rows.map((row) => row.entry.evidenceObservedAt)).toEqual([
+      NOW - 30_000,
+      NOW - 10 * MINUTE
+    ])
+    expect(rows.map((row) => row.startedAt)).toEqual([NOW - 5 * MINUTE, NOW - 15 * MINUTE])
+    expect(sidebarRows(parent, false).map((row) => row.trail)).toEqual([
+      'No update in 0m',
+      'No update in 10m'
+    ])
+  })
+
+  it('times a settled child from when it ended in the sidebar, and freezes its run in the strip', () => {
+    const [agent] = buildSubagentChildRows({
+      parentEntry: parentWith([settled('succeeded')]),
+      tab,
+      parentIsFresh: true
+    })
+    const text = mount(
+      renderToStaticMarkup(
+        <TooltipProvider>
+          <CompactAgentRow agent={agent} now={NOW} onActivate={() => {}} />
+        </TooltipProvider>
+      )
+    ).textContent
+    expect(text?.endsWith('3m')).toBe(true)
+    const strip = mount(
+      renderToStaticMarkup(
+        <NativeChatBackgroundTasksStatus
+          tasks={[]}
+          settledTasks={[]}
+          childViews={[settled('succeeded')]}
+          supportsTaskStop
+          supportsStopAll
+          stoppingTaskIds={new Set()}
+          stoppingAll={false}
+          indicatorActive
+          isVisible
+          expanded
+          onExpandedChange={() => {}}
+          onStop={() => {}}
+        />
+      )
+    )
+    // Ran from 5m ago until it settled 3m ago; a finished row never ticks.
+    expect(strip.querySelector('li')?.textContent).toMatch(/2m 0s$/)
+  })
+})
+
+describe('the chat strip from views', () => {
+  it('nests a child-owned shell under its owner and stops by the provider id', () => {
+    const children = [
+      view('child', { description: 'Dev server owner' }),
+      view('shell', {
+        kind: 'command',
+        description: 'npm run dev',
+        agentType: undefined,
+        state: 'monitoring',
+        parentChildWorkId: 'child'
+      }),
+      view('main-shell', {
+        kind: 'command',
+        description: 'tail -f log',
+        agentType: undefined,
+        state: 'monitoring'
+      })
+    ]
+    const root = mount(
+      renderToStaticMarkup(
+        <NativeChatBackgroundTasksStatus
+          tasks={[]}
+          settledTasks={[]}
+          childViews={children}
+          supportsTaskStop
+          supportsStopAll
+          stoppingTaskIds={new Set(['task-shell'])}
+          stoppingAll={false}
+          indicatorActive
+          isVisible
+          expanded
+          onExpandedChange={() => {}}
+          onStop={() => {}}
+        />
+      )
+    )
+    const groups = [...root.querySelectorAll('ul[aria-label]')].map((list) =>
+      list.getAttribute('aria-label')
+    )
+    expect(groups).toEqual(['Agents', 'Shell'])
+    const nested = root.querySelector('ul[aria-label="Agents"] ul')
+    expect(nested?.textContent).toContain('npm run dev')
+    expect(root.querySelector('ul[aria-label="Shell"]')?.textContent).not.toContain('npm run dev')
+    const stopShell = root.querySelector('button[aria-label="Stop npm run dev"]')
+    expect(stopShell?.hasAttribute('disabled')).toBe(true)
+  })
+})
+
+describe('one lifecycle word for a child, on the sidebar row and the strip header', () => {
+  it.each<[string, AgentChildWorkView[], string, string]>([
+    ['failed', [settled('failed')], 'blocked', 'blocked'],
+    ['cancelled', [settled('cancelled')], 'idle', 'idle'],
+    ['ended, outcome unknown', [settled('unknown')], 'idle', 'idle'],
+    ['finished', [settled('succeeded')], 'done', 'done'],
+    ['monitoring its own shell', [settled('succeeded'), OWNED_SHELL], 'working', 'monitoring'],
+    ['waiting', [view('child', { state: 'waiting' })], 'waiting', 'waiting']
+  ])('%s', (_name, children, sidebarState, headerState) => {
+    const [sidebar] = buildSubagentChildRows({
+      parentEntry: parentWith(children),
+      tab,
+      parentIsFresh: true
+    })
+    const [group] = buildBackgroundTaskGroupsFromViews(children)
+    // A CLI row carries monitoring as `working` plus its working mode; every other word is shared.
+    expect(sidebar.state).toBe(sidebarState)
+    expect(group.tasks[0].state).toBe(headerState)
+  })
+})
diff --git a/src/renderer/src/components/agent-child-row-text.ts b/src/renderer/src/components/agent-child-row-text.ts
new file mode 100644
index 000000000000..96ef7d1d5c72
--- /dev/null
+++ b/src/renderer/src/components/agent-child-row-text.ts
@@ -0,0 +1,69 @@
+import type { AgentChildRowModel } from '../../../shared/agent-child-row-model'
+import { formatAgentTypeLabel } from '../../../shared/agent-type-label'
+import { agentStateLabel } from '@/components/AgentStateDot'
+import { backgroundTaskStateReason } from '@/components/native-chat/background-task-roster'
+import { translate } from '@/i18n/i18n'
+import { agentNoUpdateLabel } from '@/lib/agent-row-decay-state'
+import { formatAgentToolPreview } from '@/lib/agent-row-tool-preview'
+
+export type AgentChildRowText = {
+  /** Leads the line; kept when the row truncates. */
+  lead: string
+  /** Follows the separator; '' when there is nothing more to say. */
+  trail: string
+}
+
+/** How long this child has been silent, on the reader's clock the model measured it on. */
+export function agentChildRowNoUpdateLabel(row: AgentChildRowModel, now: number): string {
+  return agentNoUpdateLabel({ updatedAt: row.recencyAt }, now)
+}
+
+/** The words for a row's detail, reusing the phrasing a CLI agent row uses for the same fact. */
+export function agentChildRowDetailText(row: AgentChildRowModel, now: number): string {
+  const detail = row.detail
+  if (!detail) {
+    return ''
+  }
+  switch (detail.kind) {
+    case 'operation':
+      return formatAgentToolPreview(
+        { toolName: detail.toolName, toolInput: detail.input },
+        'working'
+      )
+    case 'monitoring':
+      return agentStateLabel('monitoring')
+    case 'message':
+      return detail.text
+    case 'ended':
+      return translate('components.agentChildRow.ended', 'Ended')
+    case 'no-update':
+      return agentChildRowNoUpdateLabel(row, now)
+    case 'role':
+      return formatAgentTypeLabel(detail.agentType)
+    case 'reason':
+      return backgroundTaskStateReason(detail.state) ?? ''
+  }
+}
+
+/** The line beneath a full-width row: what the child said, or that it ended; '' otherwise. */
+export function agentChildRowMessageLine(row: AgentChildRowModel): string {
+  if (row.detail?.kind === 'message') {
+    return row.detail.text
+  }
+  return row.detail?.kind === 'ended' ? translate('components.agentChildRow.ended', 'Ended') : ''
+}
+
+/** The row's name, or its state when the child reported none. */
+export function agentChildRowName(row: AgentChildRowModel): string {
+  return row.name.trim() || agentStateLabel(row.displayState)
+}
+
+export function agentChildRowText(row: AgentChildRowModel, now: number): AgentChildRowText {
+  const name = agentChildRowName(row)
+  const detail = agentChildRowDetailText(row, now)
+  // Why: a monitoring row leads with its state so truncation keeps passive distinct from active.
+  if (row.displayState === 'monitoring' && detail) {
+    return { lead: detail, trail: detail === name ? '' : name }
+  }
+  return { lead: name, trail: detail }
+}
diff --git a/src/renderer/src/components/artifacts/ArtifactCollection.test.tsx b/src/renderer/src/components/artifacts/ArtifactCollection.test.tsx
index 7a2754418857..7639cf82f9de 100644
--- a/src/renderer/src/components/artifacts/ArtifactCollection.test.tsx
+++ b/src/renderer/src/components/artifacts/ArtifactCollection.test.tsx
@@ -185,11 +185,11 @@ describe('ArtifactCollection', () => {
   // Why: happy-dom has no layout, and the virtualizer sizes its window from the scroller's
   // offsetHeight — left at 0 it mounts no rows at all and the assertions below would be vacuous.
   function stubScrollerViewport(): void {
-    vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(
-      function (this: HTMLElement) {
-        return this.classList.contains('overflow-auto') ? 600 : 53
-      }
-    )
+    vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(function (
+      this: HTMLElement
+    ) {
+      return this.classList.contains('overflow-auto') ? 600 : 53
+    })
   }
 
   function announcedSetSizes(container: HTMLElement): string[] {
diff --git a/src/renderer/src/components/artifacts/ArtifactPublishButton.test.tsx b/src/renderer/src/components/artifacts/ArtifactPublishButton.test.tsx
index 77f64b0217cc..2b79aa81d31e 100644
--- a/src/renderer/src/components/artifacts/ArtifactPublishButton.test.tsx
+++ b/src/renderer/src/components/artifacts/ArtifactPublishButton.test.tsx
@@ -1,12 +1,28 @@
 // @vitest-environment happy-dom
 
 import '@testing-library/jest-dom/vitest'
-import type { ReactNode } from 'react'
+import { createRef, type ReactNode } from 'react'
 import { cleanup, render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-const mocks = vi.hoisted(() => ({
+type ArtifactPublishButtonMocks = {
+  connect: ReturnType<typeof vi.fn>
+  openSettingsPage: ReturnType<typeof vi.fn>
+  openSettingsTarget: ReturnType<typeof vi.fn>
+  getPublishedLink: ReturnType<typeof vi.fn>
+  copyLink: ReturnType<typeof vi.fn>
+  openLink: ReturnType<typeof vi.fn>
+  publish: ReturnType<typeof vi.fn>
+  openPopover: ((open: boolean) => void) | null
+  closePopover: ((event: Event) => void) | null
+  state: {
+    orcaProfileAuthStatus: Record<string, unknown>
+    settings: { artifactSharingEnabled: boolean }
+  }
+}
+
+const mocks = vi.hoisted<ArtifactPublishButtonMocks>(() => ({
   connect: vi.fn(),
   openSettingsPage: vi.fn(),
   openSettingsTarget: vi.fn(),
@@ -14,9 +30,10 @@ const mocks = vi.hoisted(() => ({
   copyLink: vi.fn(),
   openLink: vi.fn(),
   publish: vi.fn(),
-  openPopover: null as ((open: boolean) => void) | null,
+  openPopover: null,
+  closePopover: null,
   state: {
-    orcaProfileAuthStatus: { configured: true, state: 'connected' } as Record<string, unknown>,
+    orcaProfileAuthStatus: { configured: true, state: 'connected' },
     settings: { artifactSharingEnabled: true }
   }
 }))
@@ -42,7 +59,17 @@ vi.mock('@/components/ui/popover', () => ({
     mocks.openPopover = onOpenChange ?? null
     return <>{children}</>
   },
-  PopoverContent: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+  PopoverAnchor: ({ children }: { children?: ReactNode }) => <>{children}</>,
+  PopoverContent: ({
+    children,
+    onCloseAutoFocus
+  }: {
+    children: ReactNode
+    onCloseAutoFocus?: (event: Event) => void
+  }) => {
+    mocks.closePopover = onCloseAutoFocus ?? null
+    return <div>{children}</div>
+  },
   PopoverTrigger: ({ children }: { children: ReactNode }) => (
     <span onClick={() => mocks.openPopover?.(true)}>{children}</span>
   )
@@ -81,6 +108,7 @@ describe('ArtifactPublishButton', () => {
     mocks.getPublishedLink.mockResolvedValue(null)
     mocks.copyLink.mockResolvedValue(true)
     mocks.openPopover = null
+    mocks.closePopover = null
     mocks.state.orcaProfileAuthStatus = { configured: true, state: 'connected' }
     mocks.state.settings = { artifactSharingEnabled: true }
   })
@@ -101,6 +129,31 @@ describe('ArtifactPublishButton', () => {
     expect(screen.getByRole('button', { name: 'Update shared content' })).toBeInTheDocument()
   })
 
+  it('supports a controlled virtual anchor without rendering a second trigger', async () => {
+    const anchorRef = createRef<HTMLButtonElement>()
+    render(
+      <>
+        <button ref={anchorRef}>Overflow</button>
+        <ArtifactPublishButton
+          sourceKey="/repo/report.md"
+          createRequest={vi.fn()}
+          anchorRef={anchorRef}
+          open
+          onOpenChange={vi.fn()}
+        />
+      </>
+    )
+
+    expect(screen.queryByRole('button', { name: 'Share as artifact' })).toBeNull()
+    expect(await screen.findByRole('button', { name: 'Generate link' })).toBeInTheDocument()
+
+    const focus = vi.spyOn(anchorRef.current!, 'focus')
+    const closeEvent = new Event('close', { cancelable: true })
+    mocks.closePopover?.(closeEvent)
+    expect(closeEvent.defaultPrevented).toBe(true)
+    expect(focus).toHaveBeenCalledWith({ preventScroll: true })
+  })
+
   it('offers sign-in and blocks confirmation while signed out', async () => {
     const user = userEvent.setup()
     mocks.state.orcaProfileAuthStatus = { configured: true, state: 'local' }
diff --git a/src/renderer/src/components/artifacts/ArtifactPublishButton.tsx b/src/renderer/src/components/artifacts/ArtifactPublishButton.tsx
index bf6fb2360033..a90c1c037a9e 100644
--- a/src/renderer/src/components/artifacts/ArtifactPublishButton.tsx
+++ b/src/renderer/src/components/artifacts/ArtifactPublishButton.tsx
@@ -1,8 +1,8 @@
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useRef, useState, type RefObject } from 'react'
 import { ArrowRight, Loader2, Share2 } from 'lucide-react'
 import type { ArtifactWriteRequest } from '../../../../shared/artifacts'
 import { Button } from '@/components/ui/button'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+import { Popover, PopoverAnchor, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
 import { cn } from '@/lib/utils'
@@ -21,14 +21,26 @@ export function ArtifactPublishButton({
   sourceKey,
   createRequest,
   className,
-  disabled
+  disabled,
+  anchorRef,
+  open: controlledOpen,
+  onOpenChange
 }: {
   sourceKey: string
   createRequest: () => Promise<ArtifactWriteRequest>
   className?: string
   disabled?: boolean
-}): React.JSX.Element {
-  const [open, setOpen] = useState(false)
+} & (
+  | { anchorRef?: never; open?: never; onOpenChange?: never }
+  | {
+      anchorRef?: RefObject<HTMLButtonElement | null>
+      open: boolean
+      onOpenChange: (open: boolean) => void
+    }
+)): React.JSX.Element {
+  const [ownOpen, setOwnOpen] = useState(false)
+  const open = controlledOpen ?? ownOpen
+  const setOpen = onOpenChange ?? setOwnOpen
   const [publishing, setPublishing] = useState(false)
   const [lookupRevision, setLookupRevision] = useState(0)
   const [linkLookup, setLinkLookup] = useState<PublishedLinkLookup | null>(null)
@@ -111,25 +123,32 @@ export function ArtifactPublishButton({
   )
   return (
     <Popover open={open} onOpenChange={(nextOpen) => !busy && setOpen(nextOpen)}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <PopoverTrigger asChild>
-            <Button
-              type="button"
-              variant="ghost"
-              size="icon-sm"
-              className={cn('shrink-0', className)}
-              disabled={blocked}
-              aria-label={label}
-            >
-              {publishing ? <Loader2 className="animate-spin" /> : <Share2 />}
-            </Button>
-          </PopoverTrigger>
-        </TooltipTrigger>
-        <TooltipContent side="bottom" sideOffset={4}>
-          {label}
-        </TooltipContent>
-      </Tooltip>
+      {anchorRef ? (
+        <PopoverAnchor
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: DOM refs are transiently null before mount, though Radix's virtualRef type omits that lifecycle state.
+          virtualRef={anchorRef as RefObject<HTMLButtonElement>}
+        />
+      ) : (
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <PopoverTrigger asChild>
+              <Button
+                type="button"
+                variant="ghost"
+                size="icon-sm"
+                className={cn('shrink-0', className)}
+                disabled={blocked}
+                aria-label={label}
+              >
+                {publishing ? <Loader2 className="animate-spin" /> : <Share2 />}
+              </Button>
+            </PopoverTrigger>
+          </TooltipTrigger>
+          <TooltipContent side="bottom" sideOffset={4}>
+            {label}
+          </TooltipContent>
+        </Tooltip>
+      )}
 
       <PopoverContent
         ref={popoverContentRef}
@@ -141,6 +160,13 @@ export function ArtifactPublishButton({
           event.preventDefault()
           popoverContentRef.current?.focus({ preventScroll: true })
         }}
+        onCloseAutoFocus={(event) => {
+          if (!anchorRef) {
+            return
+          }
+          event.preventDefault()
+          anchorRef.current?.focus({ preventScroll: true })
+        }}
       >
         <div className="space-y-1 border-b border-border/60 px-4 py-3.5">
           <h3 className="text-sm font-semibold">
diff --git a/src/renderer/src/components/artifacts/artifact-list-windowing.test.tsx b/src/renderer/src/components/artifacts/artifact-list-windowing.test.tsx
index 4723af3d0155..ca8a4a916c0c 100644
--- a/src/renderer/src/components/artifacts/artifact-list-windowing.test.tsx
+++ b/src/renderer/src/components/artifacts/artifact-list-windowing.test.tsx
@@ -303,11 +303,11 @@ beforeEach(() => {
   root = createRoot(host)
 
   vi.stubGlobal('ResizeObserver', MockResizeObserver)
-  vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(
-    function (this: HTMLElement) {
-      return elementHeight(this)
-    }
-  )
+  vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(function (
+    this: HTMLElement
+  ) {
+    return elementHeight(this)
+  })
   vi.spyOn(Element.prototype, 'getBoundingClientRect').mockImplementation(function (this: Element) {
     const top = topsByElement.get(this) ?? 0
     const height = elementHeight(this)
diff --git a/src/renderer/src/components/automations/AutomationPromptDisclosure.test.tsx b/src/renderer/src/components/automations/AutomationPromptDisclosure.test.tsx
index 6ac693aea826..e47619cf81fe 100644
--- a/src/renderer/src/components/automations/AutomationPromptDisclosure.test.tsx
+++ b/src/renderer/src/components/automations/AutomationPromptDisclosure.test.tsx
@@ -70,21 +70,21 @@ describe('AutomationPromptDisclosure', () => {
   beforeEach(async () => {
     await i18n.changeLanguage('en')
     vi.stubGlobal('ResizeObserver', PromptResizeObserver)
-    vi.spyOn(HTMLElement.prototype, 'clientHeight', 'get').mockImplementation(
-      function (this: HTMLElement) {
-        if (this.tagName !== 'P') {
-          return 0
-        }
-        return this.classList.contains('line-clamp-4')
-          ? Math.min(promptNaturalHeight, 80)
-          : promptNaturalHeight
+    vi.spyOn(HTMLElement.prototype, 'clientHeight', 'get').mockImplementation(function (
+      this: HTMLElement
+    ) {
+      if (this.tagName !== 'P') {
+        return 0
       }
-    )
-    vi.spyOn(HTMLElement.prototype, 'scrollHeight', 'get').mockImplementation(
-      function (this: HTMLElement) {
-        return this.tagName === 'P' ? promptNaturalHeight : 0
-      }
-    )
+      return this.classList.contains('line-clamp-4')
+        ? Math.min(promptNaturalHeight, 80)
+        : promptNaturalHeight
+    })
+    vi.spyOn(HTMLElement.prototype, 'scrollHeight', 'get').mockImplementation(function (
+      this: HTMLElement
+    ) {
+      return this.tagName === 'P' ? promptNaturalHeight : 0
+    })
   })
 
   afterEach(async () => {
diff --git a/src/renderer/src/components/automations/automation-scoped-list-client.test.ts b/src/renderer/src/components/automations/automation-scoped-list-client.test.ts
index e07399319fb3..43319886180a 100644
--- a/src/renderer/src/components/automations/automation-scoped-list-client.test.ts
+++ b/src/renderer/src/components/automations/automation-scoped-list-client.test.ts
@@ -288,7 +288,7 @@ describe('owner-fenced mutations', () => {
   })
 
   it('fences a desktop mutation over the local runtime target with the same precondition', async () => {
-    const { deleteAutomationForOwner, updateAutomationForOwner } = await client()
+    const { updateAutomationForOwner } = await client()
     callRuntimeRpc.mockResolvedValue({ automation: { id: 'a1' } })
     await updateAutomationForOwner({ authority: DESKTOP, selector: { kind: 'self' } }, 'a1', {
       enabled: true
@@ -300,7 +300,6 @@ describe('owner-fenced mutations', () => {
       expect.anything()
     )
     expect(getRuntimeEnvironmentStatus).not.toHaveBeenCalled()
-    expect(typeof deleteAutomationForOwner).toBe('function')
   })
 })
 
diff --git a/src/renderer/src/components/browser-cookie-import-google-disclosure.test.tsx b/src/renderer/src/components/browser-cookie-import-google-disclosure.test.tsx
index b7c210c3818b..ed8cc04c31f8 100644
--- a/src/renderer/src/components/browser-cookie-import-google-disclosure.test.tsx
+++ b/src/renderer/src/components/browser-cookie-import-google-disclosure.test.tsx
@@ -4,7 +4,7 @@
  * STA-3811: imports never touch the Google cookie family, so every import menu must disclose it
  * at the moment of decision.
  */
-import { act, type ReactNode } from 'react'
+import { act, createRef, type ReactNode } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import en from '@/i18n/locales/en.json'
@@ -67,6 +67,12 @@ describe('cookie-import Google disclosure footer', () => {
           onImportFromFile={vi.fn()}
           viewportPresetId={null}
           onApplyViewportPreset={vi.fn()}
+          overflow={{
+            triggerRef: createRef<HTMLButtonElement>(),
+            tools: [],
+            deferUntilClose: vi.fn(),
+            onMenuCloseAutoFocus: vi.fn()
+          }}
         />
       )
     ],
diff --git a/src/renderer/src/components/browser-pane/annotate/BrowserAnnotationSendMenuContent.test.tsx b/src/renderer/src/components/browser-pane/annotate/BrowserAnnotationSendMenuContent.test.tsx
index 4eb4174211b8..24524a10dc7d 100644
--- a/src/renderer/src/components/browser-pane/annotate/BrowserAnnotationSendMenuContent.test.tsx
+++ b/src/renderer/src/components/browser-pane/annotate/BrowserAnnotationSendMenuContent.test.tsx
@@ -1,6 +1,4 @@
 import React from 'react'
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
 import { describe, expect, it, vi } from 'vitest'
 import { BrowserAnnotationSendMenuContent } from './BrowserAnnotationSendMenuContent'
 
@@ -92,19 +90,4 @@ describe('BrowserAnnotationSendMenuContent', () => {
       onPromptDelivered
     })
   })
-
-  it('is wired into both browser annotation send surfaces', () => {
-    const bannerSource = readFileSync(
-      fileURLToPath(new URL('../assemble-chrome/browser-page-chrome-banners.tsx', import.meta.url)),
-      'utf8'
-    )
-    const traySource = readFileSync(
-      fileURLToPath(new URL('./browser-page-annotation-tray.tsx', import.meta.url)),
-      'utf8'
-    )
-    const sendSurfaces = `${bannerSource}\n${traySource}`
-
-    expect(sendSurfaces.match(/<BrowserAnnotationSendMenuContent\b/g)).toHaveLength(2)
-    expect(sendSurfaces).not.toContain('<QuickLaunchAgentMenuItems')
-  })
 })
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserImportHintButton.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserImportHintButton.tsx
index 8e606c8a0e12..701430e19718 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserImportHintButton.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserImportHintButton.tsx
@@ -26,10 +26,12 @@ import { translate } from '@/i18n/i18n'
 
 type BrowserImportHintButtonProps = {
   profileId: string | null
+  compact?: boolean
 }
 
 export function BrowserImportHintButton({
-  profileId
+  profileId,
+  compact = false
 }: BrowserImportHintButtonProps): React.JSX.Element | null {
   const [open, setOpen] = useState(false)
   const [importMenuOpen, setImportMenuOpen] = useState(false)
@@ -178,7 +180,12 @@ export function BrowserImportHintButton({
           data-contextual-tour-target="browser-import-hint"
         >
           <Import className="size-3.5" />
-          {translate('auto.components.browser.pane.BrowserImportHintButton.b24fef25be', 'Import')}
+          {compact
+            ? null
+            : translate(
+                'auto.components.browser.pane.BrowserImportHintButton.b24fef25be',
+                'Import'
+              )}
         </Button>
       </PopoverTrigger>
       <PopoverContent align="end" side="bottom" sideOffset={6} className="w-80 p-3">
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.remote-link-routing.test.ts b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.remote-link-routing.test.ts
deleted file mode 100644
index 856ac24c725a..000000000000
--- a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.remote-link-routing.test.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-
-describe('remote browser link routing', () => {
-  it('pins context-menu opens to the runtime that owns the pane', () => {
-    const source = readFileSync(
-      fileURLToPath(new URL('../stream-remote/remote-browser-page-pane.tsx', import.meta.url)),
-      'utf8'
-    )
-    const paneStart = source.indexOf('function RemoteBrowserPagePane')
-    const actionStart = source.indexOf('void openWorkspaceBrowserTab({', paneStart)
-    const actionEnd = source.indexOf('}).catch((error) => {', actionStart)
-    const openRequest = source.slice(actionStart, actionEnd)
-
-    expect(openRequest).toContain('workspaceId: worktreeId')
-    expect(openRequest).toContain('expectedRuntimeEnvironmentId: runtimeEnvironmentId')
-    expect(openRequest).toContain("placementPreference: 'server'")
-  })
-})
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.render-ipc.test.ts b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.render-ipc.test.ts
deleted file mode 100644
index 9e42075283c8..000000000000
--- a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.render-ipc.test.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-
-describe('BrowserPagePane render IPC boundary', () => {
-  it('derives toolbar URLs without querying the webview', () => {
-    const source = readFileSync(
-      fileURLToPath(new URL('./browser-page-pane.tsx', import.meta.url)),
-      'utf8'
-    )
-    const start = source.indexOf('const isBlankTab =', source.indexOf('function BrowserPagePane'))
-    const end = source.indexOf('useEffect(() => {', start)
-    const renderUrlDerivation = source.slice(start, end)
-
-    expect(renderUrlDerivation).toContain('getLiveBrowserUrl(browserTab.id)')
-    expect(renderUrlDerivation).not.toContain('webviewRef')
-    expect(renderUrlDerivation).not.toContain('.getURL(')
-  })
-})
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserToolbarMenu.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserToolbarMenu.tsx
index 026931d2554f..c964a3fb6f35 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserToolbarMenu.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserToolbarMenu.tsx
@@ -12,6 +12,7 @@ import {
 import { BrowserToolbarMenuDropdown } from './browser-toolbar-menu-dropdown'
 import { BrowserToolbarProfileDialogs } from './browser-toolbar-profile-dialogs'
 import { translate } from '@/i18n/i18n'
+import type { BrowserChromeOverflowMenuProps } from './browser-chrome-folded-tools'
 
 type BrowserToolbarMenuProps = {
   currentProfileId: string | null
@@ -20,6 +21,7 @@ type BrowserToolbarMenuProps = {
   viewportPresetId: BrowserViewportPresetId | null
   onDestroyWebview: () => void
   isActive: boolean
+  overflow: BrowserChromeOverflowMenuProps
 }
 
 export function BrowserToolbarMenu({
@@ -28,7 +30,8 @@ export function BrowserToolbarMenu({
   browserPageId,
   viewportPresetId,
   onDestroyWebview,
-  isActive
+  isActive,
+  overflow
 }: BrowserToolbarMenuProps): React.JSX.Element {
   const browserSessionProfiles = useAppStore((s) => s.browserSessionProfiles)
   const detectedBrowsers = useAppStore((s) => s.detectedBrowsers)
@@ -241,6 +244,7 @@ export function BrowserToolbarMenu({
         onImportFromFile={() => void handleImportFromFile()}
         viewportPresetId={viewportPresetId}
         onApplyViewportPreset={applyViewportPreset}
+        overflow={overflow}
       />
 
       <BrowserToolbarProfileDialogs
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-element-tool-buttons.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-element-tool-buttons.tsx
new file mode 100644
index 000000000000..b8c9bd5132d1
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-element-tool-buttons.tsx
@@ -0,0 +1,109 @@
+import { Crosshair, MessageSquarePlus } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { translate } from '@/i18n/i18n'
+import { cn } from '@/lib/utils'
+import type { GrabIntent } from '../describe-page/browser-page-types'
+
+/** The in-guest element picker, driving both Grab (copy) and Annotate (comment). */
+export type BrowserChromeElementTools = {
+  /** The intent the picker is armed for right now, or null when it is idle. */
+  activeIntent: GrabIntent | null
+  onStartIntent: (intent: GrabIntent) => void
+  disabled: boolean
+  grabShortcutLabel: string
+  annotationCount: number
+}
+
+export function BrowserChromeElementToolButtons({
+  tools,
+  showGrab,
+  showAnnotate,
+  showTourAnchors
+}: {
+  tools: BrowserChromeElementTools
+  showGrab: boolean
+  showAnnotate: boolean
+  showTourAnchors: boolean
+}): React.JSX.Element {
+  return (
+    <>
+      {showGrab ? (
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <span className="inline-flex">
+              <Button
+                size="icon"
+                variant={tools.activeIntent === 'copy' ? 'default' : 'ghost'}
+                className={cn(
+                  'h-8 w-8',
+                  tools.activeIntent === 'copy' &&
+                    'bg-foreground/80 text-background hover:bg-foreground/90'
+                )}
+                onClick={() => tools.onStartIntent('copy')}
+                disabled={tools.disabled}
+                aria-label={translate(
+                  'auto.components.browser.pane.BrowserPane.fdfc7fe0ef',
+                  'Grab page element'
+                )}
+                {...(showTourAnchors
+                  ? { 'data-contextual-tour-target': 'browser-grab-control' }
+                  : {})}
+              >
+                <Crosshair className="size-4" />
+              </Button>
+            </span>
+          </TooltipTrigger>
+          <TooltipContent side="bottom" sideOffset={4}>
+            {translate(
+              'auto.components.browser.pane.BrowserPane.acbe79fd01',
+              'Grab page element ({{value0}})',
+              { value0: tools.grabShortcutLabel }
+            )}
+          </TooltipContent>
+        </Tooltip>
+      ) : null}
+
+      {showAnnotate ? (
+        <Tooltip>
+          <TooltipTrigger asChild>
+            {/* Why: disabled buttons drop hover events, so the tooltip needs an enabled wrapper. */}
+            <span className="inline-flex">
+              <Button
+                size="icon"
+                variant={tools.activeIntent === 'annotate' ? 'default' : 'ghost'}
+                className={cn(
+                  'relative h-8 w-8',
+                  tools.activeIntent === 'annotate' &&
+                    'bg-foreground/80 text-background hover:bg-foreground/90'
+                )}
+                onClick={() => tools.onStartIntent('annotate')}
+                disabled={tools.disabled}
+                aria-label={translate(
+                  'auto.components.browser.pane.BrowserPane.fc9be38f6f',
+                  'Annotate page element'
+                )}
+                {...(showTourAnchors
+                  ? { 'data-contextual-tour-target': 'browser-annotation-control' }
+                  : {})}
+              >
+                <MessageSquarePlus className="size-4" />
+                {tools.annotationCount > 0 ? (
+                  <span className="absolute -top-1 -right-1 flex min-w-4 items-center justify-center rounded-full bg-primary px-1 text-[10px] leading-4 text-primary-foreground">
+                    {tools.annotationCount}
+                  </span>
+                ) : null}
+              </Button>
+            </span>
+          </TooltipTrigger>
+          <TooltipContent side="bottom" sideOffset={4}>
+            {translate(
+              'auto.components.browser.pane.BrowserPane.fc9be38f6f',
+              'Annotate page element'
+            )}
+          </TooltipContent>
+        </Tooltip>
+      ) : null}
+    </>
+  )
+}
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-folded-tools.test.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-folded-tools.test.tsx
new file mode 100644
index 000000000000..0247f46509ba
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-folded-tools.test.tsx
@@ -0,0 +1,107 @@
+// @vitest-environment happy-dom
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { Share2 } from 'lucide-react'
+
+vi.mock('@/components/ui/dropdown-menu', () => ({
+  DropdownMenuItem: ({
+    children,
+    onSelect,
+    role,
+    'aria-checked': ariaChecked
+  }: {
+    children: React.ReactNode
+    onSelect: () => void
+    role?: string
+    'aria-checked'?: boolean
+  }) => (
+    <button role={role} aria-checked={ariaChecked} onClick={onSelect}>
+      {children}
+    </button>
+  ),
+  DropdownMenuSeparator: () => <hr />,
+  DropdownMenuShortcut: ({ children }: { children: React.ReactNode }) => <span>{children}</span>
+}))
+
+import { BrowserChromeFoldedMenuItems } from './browser-chrome-folded-tools'
+
+afterEach(cleanup)
+
+describe('BrowserChromeFoldedMenuItems', () => {
+  it('runs ordinary actions directly', () => {
+    const onSelect = vi.fn()
+    render(
+      <BrowserChromeFoldedMenuItems
+        tools={[{ stage: 'share', label: 'Share', icon: Share2, onSelect }]}
+        deferUntilClose={vi.fn()}
+      />
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Share' }))
+    expect(onSelect).toHaveBeenCalledOnce()
+  })
+
+  it('defers popover actions until the menu closes', () => {
+    const onSelect = vi.fn()
+    const deferUntilClose = vi.fn()
+    render(
+      <BrowserChromeFoldedMenuItems
+        tools={[
+          {
+            stage: 'share',
+            label: 'Share',
+            icon: Share2,
+            onSelect,
+            deferUntilMenuClose: true
+          }
+        ]}
+        deferUntilClose={deferUntilClose}
+      />
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Share' }))
+    expect(onSelect).not.toHaveBeenCalled()
+    expect(deferUntilClose).toHaveBeenCalledWith(onSelect)
+  })
+
+  it('preserves active state for folded toggle tools', () => {
+    render(
+      <BrowserChromeFoldedMenuItems
+        tools={[
+          {
+            stage: 'draw',
+            label: 'Draw',
+            icon: Share2,
+            onSelect: vi.fn(),
+            active: true
+          }
+        ]}
+        deferUntilClose={vi.fn()}
+      />
+    )
+
+    expect(
+      screen.getByRole('menuitemcheckbox', { name: 'Draw' }).getAttribute('aria-checked')
+    ).toBe('true')
+  })
+
+  it('gives toggle tools their own section, split from the actions by a divider', () => {
+    const { container } = render(
+      <BrowserChromeFoldedMenuItems
+        tools={[
+          { stage: 'draw', label: 'Draw', icon: Share2, onSelect: vi.fn(), active: false },
+          { stage: 'share', label: 'Share', icon: Share2, onSelect: vi.fn() }
+        ]}
+        deferUntilClose={vi.fn()}
+      />
+    )
+
+    // Rendered order: Draw, divider, Share, closing divider.
+    expect(Array.from(container.querySelectorAll('button, hr')).map((el) => el.tagName)).toEqual([
+      'BUTTON',
+      'HR',
+      'BUTTON',
+      'HR'
+    ])
+  })
+})
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-folded-tools.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-folded-tools.tsx
new file mode 100644
index 000000000000..3b6c4fd55e0c
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-folded-tools.tsx
@@ -0,0 +1,106 @@
+import { Check } from 'lucide-react'
+import type { LucideIcon } from 'lucide-react'
+import {
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuShortcut
+} from '@/components/ui/dropdown-menu'
+import type { BrowserChromeFoldStage } from './use-browser-chrome-tool-fold'
+
+export type BrowserChromeFoldedTool = {
+  stage: BrowserChromeFoldStage
+  label: string
+  icon: LucideIcon
+  onSelect: () => void
+  disabled?: boolean
+  shortcut?: string
+  count?: number
+  /** Present for toggle tools, including false, so the menu preserves their pressed state. */
+  active?: boolean
+  /**
+   * Run only after the menu has closed and skip its focus return. A tool that opens its own
+   * popover needs this: focus landing back on the ⋯ trigger would dismiss that popover at once.
+   */
+  deferUntilMenuClose?: boolean
+}
+
+export type BrowserChromeOverflowMenuProps = {
+  triggerRef: React.RefObject<HTMLButtonElement | null>
+  tools: readonly BrowserChromeFoldedTool[]
+  deferUntilClose: (action: () => void) => void
+  onMenuCloseAutoFocus: (event: Event) => void
+}
+
+function FoldedToolContent({ tool }: { tool: BrowserChromeFoldedTool }): React.JSX.Element {
+  const showActiveCheck = tool.active === true
+  const showTrailing = showActiveCheck || Boolean(tool.count) || Boolean(tool.shortcut)
+  return (
+    <>
+      <tool.icon className="size-3.5" />
+      {tool.label}
+      {showTrailing ? (
+        // Why: a leading check column would push these icon rows out of line with the plain rows.
+        <span className="ml-auto flex items-center gap-2">
+          {showActiveCheck ? <Check className="size-3.5 text-foreground" /> : null}
+          {tool.count ? (
+            <span className="flex min-w-4 items-center justify-center rounded-full bg-primary px-1 text-[10px] leading-4 text-primary-foreground">
+              {tool.count}
+            </span>
+          ) : tool.shortcut ? (
+            <DropdownMenuShortcut>{tool.shortcut}</DropdownMenuShortcut>
+          ) : null}
+        </span>
+      ) : null}
+    </>
+  )
+}
+
+function FoldedToolRow({
+  tool,
+  deferUntilClose
+}: {
+  tool: BrowserChromeFoldedTool
+  deferUntilClose: (action: () => void) => void
+}): React.JSX.Element {
+  const onSelect = (): void =>
+    tool.deferUntilMenuClose ? deferUntilClose(tool.onSelect) : tool.onSelect()
+  return (
+    <DropdownMenuItem
+      disabled={tool.disabled}
+      onSelect={onSelect}
+      // Why: keeps toggle semantics without the checkbox item's reserved leading column,
+      // which would misalign this row's icon against the plain rows in the same menu.
+      {...(tool.active === undefined
+        ? {}
+        : { role: 'menuitemcheckbox', 'aria-checked': tool.active })}
+    >
+      <FoldedToolContent tool={tool} />
+    </DropdownMenuItem>
+  )
+}
+
+/** The toolbar tools that no longer fit, rendered at the top of a surface's ⋯ menu. */
+export function BrowserChromeFoldedMenuItems({
+  tools,
+  deferUntilClose
+}: Pick<BrowserChromeOverflowMenuProps, 'tools' | 'deferUntilClose'>): React.JSX.Element | null {
+  if (tools.length === 0) {
+    return null
+  }
+  // Why: the element/markup toggles fold first and carry on/off state, so they read as their own
+  // section ahead of the one-shot actions below rather than as one flat tool list.
+  const toggleTools = tools.filter((tool) => tool.active !== undefined)
+  const actionTools = tools.filter((tool) => tool.active === undefined)
+  return (
+    <>
+      {toggleTools.map((tool) => (
+        <FoldedToolRow key={tool.stage} tool={tool} deferUntilClose={deferUntilClose} />
+      ))}
+      {toggleTools.length > 0 && actionTools.length > 0 ? <DropdownMenuSeparator /> : null}
+      {actionTools.map((tool) => (
+        <FoldedToolRow key={tool.stage} tool={tool} deferUntilClose={deferUntilClose} />
+      ))}
+      <DropdownMenuSeparator />
+    </>
+  )
+}
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-toolbar.test.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-toolbar.test.tsx
new file mode 100644
index 000000000000..5e014d3a8bfe
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-toolbar.test.tsx
@@ -0,0 +1,158 @@
+// @vitest-environment happy-dom
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { useState } from 'react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { BrowserChromeFoldStage } from './use-browser-chrome-tool-fold'
+import type { BrowserChromeFoldedTool } from './browser-chrome-folded-tools'
+
+const mocks = vi.hoisted(() => {
+  const stages: readonly BrowserChromeFoldStage[] = []
+  return { folded: new Set<BrowserChromeFoldStage>(), stages }
+})
+
+vi.mock('./use-browser-chrome-tool-fold', () => ({
+  BROWSER_CHROME_FOLD_ORDER: [
+    'import-label',
+    'external',
+    'devtools',
+    'share',
+    'import',
+    'draw',
+    'grab',
+    'annotate'
+  ],
+  useBrowserChromeToolFold: (_rowRef: unknown, stages: readonly BrowserChromeFoldStage[]) => {
+    mocks.stages = stages
+    return mocks.folded
+  }
+}))
+
+vi.mock('./browser-navigation-control-row', () => ({
+  BrowserNavigationControlRow: ({ children }: { children: React.ReactNode }) => (
+    <div>{children}</div>
+  )
+}))
+
+vi.mock('../annotate/MarkupDrawButton', () => ({
+  MarkupDrawButton: () => <button>Draw</button>
+}))
+
+vi.mock('./browser-chrome-element-tool-buttons', () => ({
+  BrowserChromeElementToolButtons: () => null
+}))
+
+import { BrowserChromeToolbar } from './browser-chrome-toolbar'
+
+const controls = {
+  canGoBack: false,
+  canGoForward: false,
+  loading: false,
+  goBack: vi.fn(),
+  goForward: vi.fn(),
+  reload: vi.fn(),
+  navigate: vi.fn()
+}
+const emptyOverflowMenu = (): null => null
+
+beforeEach(() => {
+  mocks.folded = new Set()
+  mocks.stages = []
+})
+
+afterEach(cleanup)
+
+describe('BrowserChromeToolbar', () => {
+  it('does not duplicate an action already provided by the surface menu', () => {
+    mocks.folded = new Set(['devtools', 'external'])
+    let foldedTools: readonly BrowserChromeFoldedTool[] = []
+
+    render(
+      <BrowserChromeToolbar
+        controls={controls}
+        addressSlot={null}
+        elementTools={null}
+        markup={{ active: false, disabled: false, onToggle: vi.fn(), canShowDiscoveryHint: false }}
+        viewSource={{
+          label: 'Open source file',
+          onSelect: vi.fn(),
+          alreadyInOverflowMenu: true
+        }}
+        openExternal={{ label: 'Open with default app', onSelect: vi.fn() }}
+        overflowMenu={(overflow) => {
+          foldedTools = overflow.tools
+          return null
+        }}
+      />
+    )
+
+    expect(foldedTools.map((tool) => tool.stage)).toEqual(['external'])
+  })
+
+  it('compacts the import hint before removing it', () => {
+    mocks.folded = new Set(['import-label'])
+    const importControl = vi.fn(() => null)
+
+    render(
+      <BrowserChromeToolbar
+        controls={controls}
+        addressSlot={null}
+        importControl={importControl}
+        elementTools={null}
+        markup={{ active: false, disabled: false, onToggle: vi.fn(), canShowDiscoveryHint: false }}
+        viewSource={null}
+        openExternal={null}
+        overflowMenu={emptyOverflowMenu}
+      />
+    )
+
+    expect(importControl).toHaveBeenCalledWith(true)
+  })
+
+  it('keeps the active tour control out of the fold sequence', () => {
+    render(
+      <BrowserChromeToolbar
+        controls={controls}
+        addressSlot={null}
+        pinnedStage="grab"
+        elementTools={{
+          activeIntent: null,
+          onStartIntent: vi.fn(),
+          disabled: false,
+          grabShortcutLabel: 'Cmd+Shift+C',
+          annotationCount: 0
+        }}
+        markup={{ active: false, disabled: false, onToggle: vi.fn(), canShowDiscoveryHint: false }}
+        viewSource={null}
+        openExternal={null}
+        overflowMenu={emptyOverflowMenu}
+      />
+    )
+
+    expect(mocks.stages).not.toContain('grab')
+    expect(mocks.stages).toContain('annotate')
+  })
+
+  it('keeps the same share control mounted when it moves into overflow', () => {
+    function StatefulShare(): React.JSX.Element {
+      const [clicks, setClicks] = useState(0)
+      return <button onClick={() => setClicks((count) => count + 1)}>Share state {clicks}</button>
+    }
+    const props = {
+      controls,
+      addressSlot: null,
+      elementTools: null,
+      markup: { active: false, disabled: false, onToggle: vi.fn(), canShowDiscoveryHint: false },
+      shareControl: () => <StatefulShare />,
+      viewSource: null,
+      openExternal: null,
+      overflowMenu: emptyOverflowMenu
+    }
+    const view = render(<BrowserChromeToolbar {...props} />)
+    fireEvent.click(screen.getByRole('button', { name: 'Share state 0' }))
+
+    mocks.folded = new Set(['share'])
+    view.rerender(<BrowserChromeToolbar {...props} />)
+
+    expect(screen.getByRole('button', { name: 'Share state 1' })).not.toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-toolbar.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-toolbar.tsx
index a314ed692159..59db797397d2 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-toolbar.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-chrome-toolbar.tsx
@@ -1,24 +1,35 @@
-import { cn } from '@/lib/utils'
-import { Crosshair, ExternalLink, MessageSquarePlus, SquareCode } from 'lucide-react'
+import { useRef, useState } from 'react'
+import {
+  Crosshair,
+  ExternalLink,
+  MessageSquarePlus,
+  PenTool,
+  Share2,
+  SquareCode
+} from 'lucide-react'
+import type { LucideIcon } from 'lucide-react'
 import { Button } from '@/components/ui/button'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
 import {
   BrowserNavigationControlRow,
   type BrowserNavigationControls
 } from './browser-navigation-control-row'
 import { MarkupDrawButton } from '../annotate/MarkupDrawButton'
-import type { GrabIntent } from '../describe-page/browser-page-types'
+import type {
+  BrowserChromeFoldedTool,
+  BrowserChromeOverflowMenuProps
+} from './browser-chrome-folded-tools'
+import {
+  BROWSER_CHROME_FOLD_ORDER,
+  useBrowserChromeToolFold,
+  type BrowserChromeFoldStage
+} from './use-browser-chrome-tool-fold'
+import {
+  BrowserChromeElementToolButtons,
+  type BrowserChromeElementTools
+} from './browser-chrome-element-tool-buttons'
 
-/** The in-guest element picker, driving both Grab (copy) and Annotate (comment). */
-export type BrowserChromeElementTools = {
-  /** The intent the picker is armed for right now, or null when it is idle. */
-  activeIntent: GrabIntent | null
-  onStartIntent: (intent: GrabIntent) => void
-  disabled: boolean
-  grabShortcutLabel: string
-  annotationCount: number
-}
+export type { BrowserChromeElementTools } from './browser-chrome-element-tool-buttons'
 
 export type BrowserChromeMarkupTool = {
   active: boolean
@@ -33,10 +44,40 @@ export type BrowserChromeMarkupTool = {
   canShowDiscoveryHint: boolean
 }
 
+export type BrowserChromeShareControl = {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  anchorRef?: React.RefObject<HTMLButtonElement | null>
+}
+
 export type BrowserChromeToolAction = {
   onSelect: () => void
   label: string
   disabled?: boolean
+  /** True when the surface's overflow menu already exposes this action. */
+  alreadyInOverflowMenu?: boolean
+}
+
+function BrowserChromeActionButton({
+  action,
+  icon: Icon
+}: {
+  action: BrowserChromeToolAction
+  icon: LucideIcon
+}): React.JSX.Element {
+  return (
+    <Button
+      size="icon"
+      variant="ghost"
+      className="h-7 w-7"
+      onClick={action.onSelect}
+      title={action.label}
+      aria-label={action.label}
+      disabled={action.disabled}
+    >
+      <Icon className="size-4" />
+    </Button>
+  )
 }
 
 /**
@@ -59,148 +100,170 @@ export function BrowserChromeToolbar({
   viewSource,
   openExternal,
   overflowMenu,
-  showTourAnchors = false
+  showTourAnchors = false,
+  pinnedStage
 }: {
   controls: BrowserNavigationControls
   addressSlot: React.ReactNode
   reloadControl?: React.ReactNode
   reloadLabel?: string
   /** Cookie import — a browsing session concept; null where there is no session to import into. */
-  importControl?: React.ReactNode
+  importControl?: ((compact: boolean) => React.ReactNode) | null
   elementTools: BrowserChromeElementTools | null
   markup: BrowserChromeMarkupTool
-  shareControl?: React.ReactNode
+  shareControl?: (control: BrowserChromeShareControl) => React.ReactNode
   viewSource: BrowserChromeToolAction | null
   openExternal: BrowserChromeToolAction | null
-  overflowMenu?: React.ReactNode
+  overflowMenu: (props: BrowserChromeOverflowMenuProps) => React.ReactNode
   /** Only the browsing pane anchors the contextual tour; a second anchor would steal its steps. */
   showTourAnchors?: boolean
+  /** Keeps the active contextual-tour control measurable while the remaining tools still fold. */
+  pinnedStage?: BrowserChromeFoldStage
 }): React.JSX.Element {
+  const rowRef = useRef<HTMLDivElement>(null)
+  const overflowTriggerRef = useRef<HTMLButtonElement>(null)
+  const present: Record<BrowserChromeFoldStage, boolean> = {
+    'import-label': importControl != null,
+    import: importControl != null,
+    external: openExternal !== null,
+    devtools: viewSource !== null,
+    share: shareControl != null,
+    draw: true,
+    grab: elementTools !== null,
+    annotate: elementTools !== null
+  }
+  const stages = BROWSER_CHROME_FOLD_ORDER.filter(
+    (stage) => present[stage] && stage !== pinnedStage
+  )
+  const folded = useBrowserChromeToolFold(rowRef, stages)
+
+  const [sharePopoverOpen, setSharePopoverOpen] = useState(false)
+  const afterMenuCloseRef = useRef<(() => void) | null>(null)
+
+  const foldedTools: BrowserChromeFoldedTool[] = []
+  if (elementTools && folded.has('grab')) {
+    foldedTools.push({
+      stage: 'grab',
+      label: translate('auto.components.browser.pane.BrowserPane.fdfc7fe0ef', 'Grab page element'),
+      icon: Crosshair,
+      onSelect: () => elementTools.onStartIntent('copy'),
+      disabled: elementTools.disabled,
+      shortcut: elementTools.grabShortcutLabel,
+      active: elementTools.activeIntent === 'copy'
+    })
+  }
+  if (elementTools && folded.has('annotate')) {
+    foldedTools.push({
+      stage: 'annotate',
+      label: translate(
+        'auto.components.browser.pane.BrowserPane.fc9be38f6f',
+        'Annotate page element'
+      ),
+      icon: MessageSquarePlus,
+      onSelect: () => elementTools.onStartIntent('annotate'),
+      disabled: elementTools.disabled,
+      count: elementTools.annotationCount,
+      active: elementTools.activeIntent === 'annotate'
+    })
+  }
+  if (folded.has('draw')) {
+    foldedTools.push({
+      stage: 'draw',
+      label: translate('auto.components.browser-pane.markup.drawButton', 'Draw on screenshot'),
+      icon: PenTool,
+      onSelect: markup.onToggle,
+      disabled: markup.disabled,
+      active: markup.active
+    })
+  }
+  if (shareControl && folded.has('share')) {
+    foldedTools.push({
+      stage: 'share',
+      label: translate(
+        'auto.components.artifacts.ArtifactPublishButton.a4a49da6af',
+        'Share as artifact'
+      ),
+      icon: Share2,
+      onSelect: () => setSharePopoverOpen(true),
+      deferUntilMenuClose: true
+    })
+  }
+  if (viewSource && folded.has('devtools') && !viewSource.alreadyInOverflowMenu) {
+    foldedTools.push({ stage: 'devtools', icon: SquareCode, ...viewSource })
+  }
+  if (openExternal && folded.has('external') && !openExternal.alreadyInOverflowMenu) {
+    foldedTools.push({ stage: 'external', icon: ExternalLink, ...openExternal })
+  }
+
+  const runAfterMenuClose = (action: () => void): void => {
+    afterMenuCloseRef.current = action
+  }
+  const onMenuCloseAutoFocus = (event: Event): void => {
+    const action = afterMenuCloseRef.current
+    if (!action) {
+      return
+    }
+    afterMenuCloseRef.current = null
+    event.preventDefault()
+    action()
+  }
+  const showFoldedAnnotationDot = folded.has('annotate') && (elementTools?.annotationCount ?? 0) > 0
+
   return (
     <BrowserNavigationControlRow
+      rowRef={rowRef}
       controls={controls}
       addressSlot={addressSlot}
       reloadControl={reloadControl}
       reloadLabel={reloadLabel}
       showTourAnchors={showTourAnchors}
     >
-      {importControl}
+      {folded.has('import') ? null : importControl?.(folded.has('import-label'))}
 
       {elementTools ? (
-        <>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <span className="inline-flex">
-                <Button
-                  size="icon"
-                  variant={elementTools.activeIntent === 'copy' ? 'default' : 'ghost'}
-                  className={cn(
-                    'h-8 w-8',
-                    elementTools.activeIntent === 'copy' &&
-                      'bg-foreground/80 text-background hover:bg-foreground/90'
-                  )}
-                  onClick={() => elementTools.onStartIntent('copy')}
-                  disabled={elementTools.disabled}
-                  aria-label={translate(
-                    'auto.components.browser.pane.BrowserPane.fdfc7fe0ef',
-                    'Grab page element'
-                  )}
-                  {...(showTourAnchors
-                    ? { 'data-contextual-tour-target': 'browser-grab-control' }
-                    : {})}
-                >
-                  <Crosshair className="size-4" />
-                </Button>
-              </span>
-            </TooltipTrigger>
-            <TooltipContent side="bottom" sideOffset={4}>
-              {translate(
-                'auto.components.browser.pane.BrowserPane.acbe79fd01',
-                'Grab page element ({{value0}})',
-                { value0: elementTools.grabShortcutLabel }
-              )}
-            </TooltipContent>
-          </Tooltip>
-
-          <Tooltip>
-            <TooltipTrigger asChild>
-              {/* Why: disabled <button> drops hover events, so wrap in a span so the tooltip trigger still fires. */}
-              <span className="inline-flex">
-                <Button
-                  size="icon"
-                  variant={elementTools.activeIntent === 'annotate' ? 'default' : 'ghost'}
-                  className={cn(
-                    'relative h-8 w-8',
-                    elementTools.activeIntent === 'annotate' &&
-                      'bg-foreground/80 text-background hover:bg-foreground/90'
-                  )}
-                  onClick={() => elementTools.onStartIntent('annotate')}
-                  disabled={elementTools.disabled}
-                  aria-label={translate(
-                    'auto.components.browser.pane.BrowserPane.fc9be38f6f',
-                    'Annotate page element'
-                  )}
-                  {...(showTourAnchors
-                    ? { 'data-contextual-tour-target': 'browser-annotation-control' }
-                    : {})}
-                >
-                  <MessageSquarePlus className="size-4" />
-                  {elementTools.annotationCount > 0 ? (
-                    <span className="absolute -top-1 -right-1 flex min-w-4 items-center justify-center rounded-full bg-primary px-1 text-[10px] leading-4 text-primary-foreground">
-                      {elementTools.annotationCount}
-                    </span>
-                  ) : null}
-                </Button>
-              </span>
-            </TooltipTrigger>
-            <TooltipContent side="bottom" sideOffset={4}>
-              {translate(
-                'auto.components.browser.pane.BrowserPane.fc9be38f6f',
-                'Annotate page element'
-              )}
-            </TooltipContent>
-          </Tooltip>
-        </>
+        <BrowserChromeElementToolButtons
+          tools={elementTools}
+          showGrab={!folded.has('grab')}
+          showAnnotate={!folded.has('annotate')}
+          showTourAnchors={showTourAnchors}
+        />
       ) : null}
 
-      <MarkupDrawButton
-        onClick={markup.onToggle}
-        disabled={markup.disabled}
-        active={markup.active}
-        surfaceActive={markup.canShowDiscoveryHint}
-      />
-
-      {shareControl}
-
-      {viewSource ? (
-        <Button
-          size="icon"
-          variant="ghost"
-          className="h-7 w-7"
-          onClick={viewSource.onSelect}
-          title={viewSource.label}
-          aria-label={viewSource.label}
-          disabled={viewSource.disabled}
-        >
-          <SquareCode className="size-4" />
-        </Button>
+      {folded.has('draw') ? null : (
+        <MarkupDrawButton
+          onClick={markup.onToggle}
+          disabled={markup.disabled}
+          active={markup.active}
+          surfaceActive={markup.canShowDiscoveryHint}
+        />
+      )}
+
+      {shareControl?.({
+        open: sharePopoverOpen,
+        onOpenChange: setSharePopoverOpen,
+        anchorRef: folded.has('share') ? overflowTriggerRef : undefined
+      })}
+
+      {viewSource && !folded.has('devtools') ? (
+        <BrowserChromeActionButton action={viewSource} icon={SquareCode} />
       ) : null}
 
-      {openExternal ? (
-        <Button
-          size="icon"
-          variant="ghost"
-          className="h-7 w-7"
-          onClick={openExternal.onSelect}
-          title={openExternal.label}
-          aria-label={openExternal.label}
-          disabled={openExternal.disabled}
-        >
-          <ExternalLink className="size-4" />
-        </Button>
+      {openExternal && !folded.has('external') ? (
+        <BrowserChromeActionButton action={openExternal} icon={ExternalLink} />
       ) : null}
 
-      {overflowMenu}
+      <span className="relative inline-flex">
+        {overflowMenu({
+          triggerRef: overflowTriggerRef,
+          tools: foldedTools,
+          deferUntilClose: runAfterMenuClose,
+          onMenuCloseAutoFocus
+        })}
+        {/* Why: keeps pending annotations visible once the annotate button has folded into ⋯. */}
+        {showFoldedAnnotationDot ? (
+          <span className="pointer-events-none absolute top-1 right-1 size-1.5 rounded-full bg-primary ring-2 ring-background" />
+        ) : null}
+      </span>
     </BrowserNavigationControlRow>
   )
 }
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-navigation-control-row.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-navigation-control-row.tsx
index 236251c64ef5..999f890a37ff 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-navigation-control-row.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-navigation-control-row.tsx
@@ -36,6 +36,7 @@ export function BrowserNavigationControlRow({
   reloadControl,
   reloadLabel,
   showTourAnchors = true,
+  rowRef,
   children
 }: {
   controls: BrowserNavigationControls
@@ -46,10 +47,12 @@ export function BrowserNavigationControlRow({
   reloadLabel?: string
   /** Off for surfaces the browsing tour does not cover — a second anchor would steal its steps. */
   showTourAnchors?: boolean
+  rowRef?: React.Ref<HTMLDivElement>
   children?: React.ReactNode
 }): React.JSX.Element {
   return (
     <div
+      ref={rowRef}
       className="relative z-10 flex shrink-0 items-center gap-2 border-b border-border/70 bg-background/95 px-3 py-1.5"
       {...(showTourAnchors ? { 'data-contextual-tour-target': 'browser-toolbar' } : {})}
     >
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-context-menu.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-context-menu.tsx
index fb1830bd41f5..22f12bfea4e4 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-context-menu.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-context-menu.tsx
@@ -11,6 +11,7 @@ import { createPortal } from 'react-dom'
 import { useAppStore } from '@/store'
 import { translate } from '@/i18n/i18n'
 import { normalizeExternalBrowserUrl } from '../../../../../shared/browser-url'
+import { resolveBrowserSourceUnifiedTab } from '@/lib/browser-workspace-source-resolution'
 import type { BrowserPageContextMenuState } from '../describe-page/browser-page-types'
 
 // `focus:` rather than `focus-visible:` — items are only ever focused programmatically
@@ -186,9 +187,18 @@ export function BrowserPageContextMenu({
               role="menuitem"
               className={MENU_ITEM_CLASS}
               onClick={() => {
+                const sourceUnifiedTab = resolveBrowserSourceUnifiedTab(
+                  useAppStore.getState(),
+                  browserPageId,
+                  worktreeId
+                )
                 createBrowserTab(worktreeId, contextMenu.linkUrl!, {
                   title: contextMenu.linkUrl!,
-                  activate: false
+                  activate: false,
+                  ...(sourceUnifiedTab ? { afterTabId: sourceUnifiedTab.id } : {}),
+                  ...(sourceUnifiedTab?.executionHostId
+                    ? { executionHostId: sourceUnifiedTab.executionHostId }
+                    : {})
                 })
                 closeMenu()
               }}
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-toolbar.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-toolbar.tsx
index 73dae100fd63..6fe8154de37a 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-toolbar.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-toolbar.tsx
@@ -1,6 +1,7 @@
 import type { Dispatch, RefObject, SetStateAction } from 'react'
 import { ArtifactPublishButton } from '@/components/artifacts/fork-artifact-passwords/ArtifactPublishButton'
 import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
 import type { BrowserReloadTrigger } from '../navigate/browser-reload-action'
 import BrowserAddressBar from './BrowserAddressBar'
 import { BrowserChromeToolbar } from './browser-chrome-toolbar'
@@ -102,9 +103,20 @@ export function BrowserPageToolbar({
   currentBrowserUrl: string
   externalUrl: string | null
 }): React.JSX.Element {
+  const browserTourStep = useAppStore((state) =>
+    state.activeContextualTourId === 'browser' ? state.activeContextualTourStepIndex : null
+  )
+  const pinnedStage =
+    browserTourStep === 0
+      ? ('grab' as const)
+      : browserTourStep === 1
+        ? ('annotate' as const)
+        : undefined
+
   return (
     <BrowserChromeToolbar
       showTourAnchors
+      pinnedStage={pinnedStage}
       controls={{
         canGoBack: canGoBack || Boolean(convertedFrom),
         canGoForward: canGoForward || Boolean(convertedTo),
@@ -161,7 +173,9 @@ export function BrowserPageToolbar({
           onHardReload={() => runReloadTrigger('hard-reload')}
         />
       }
-      importControl={<BrowserImportHintButton profileId={sessionProfileId} />}
+      importControl={(compact) => (
+        <BrowserImportHintButton profileId={sessionProfileId} compact={compact} />
+      )}
       elementTools={{
         activeIntent: grab.state !== 'idle' ? grabIntent : null,
         onStartIntent: startGrabIntent,
@@ -176,13 +190,16 @@ export function BrowserPageToolbar({
         canShowDiscoveryHint: isActive
       }}
       shareControl={
-        shareableArtifactFile ? (
-          <ArtifactPublishButton
-            sourceKey={shareableArtifactFile.filePath}
-            className="h-7 w-7"
-            createRequest={() => readBrowserHtmlArtifactRequest(currentBrowserUrl)}
-          />
-        ) : null
+        shareableArtifactFile
+          ? (control) => {
+              const props = {
+                sourceKey: shareableArtifactFile.filePath,
+                className: 'h-7 w-7',
+                createRequest: () => readBrowserHtmlArtifactRequest(currentBrowserUrl)
+              }
+              return <ArtifactPublishButton {...props} {...control} />
+            }
+          : undefined
       }
       viewSource={{
         onSelect: () => void window.api.browser.openDevTools({ browserPageId }),
@@ -204,7 +221,7 @@ export function BrowserPageToolbar({
         ),
         disabled: !externalUrl
       }}
-      overflowMenu={
+      overflowMenu={(overflow) => (
         <BrowserToolbarMenu
           currentProfileId={sessionProfileId}
           workspaceId={workspaceId}
@@ -212,8 +229,9 @@ export function BrowserPageToolbar({
           viewportPresetId={viewportPresetId}
           onDestroyWebview={() => destroyPersistentWebview(browserPageId)}
           isActive={isActive}
+          overflow={overflow}
         />
-      }
+      )}
     />
   )
 }
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-toolbar-menu-dropdown.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-toolbar-menu-dropdown.tsx
index 0d088a44edd8..63098b9b2b48 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-toolbar-menu-dropdown.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-toolbar-menu-dropdown.tsx
@@ -30,6 +30,10 @@ type DetectedBrowserEntry = {
 }
 import { BROWSER_VIEWPORT_PRESETS } from '../../../../../shared/browser-viewport-presets'
 import { translate } from '@/i18n/i18n'
+import {
+  BrowserChromeFoldedMenuItems,
+  type BrowserChromeOverflowMenuProps
+} from './browser-chrome-folded-tools'
 
 type BrowserToolbarMenuDropdownProps = {
   menuOpen: boolean
@@ -45,6 +49,7 @@ type BrowserToolbarMenuDropdownProps = {
   onImportFromFile: () => void
   viewportPresetId: BrowserViewportPresetId | null
   onApplyViewportPreset: (nextId: BrowserViewportPresetId | null) => void
+  overflow: BrowserChromeOverflowMenuProps
 }
 
 export function BrowserToolbarMenuDropdown({
@@ -60,12 +65,14 @@ export function BrowserToolbarMenuDropdown({
   onImportFromBrowser,
   onImportFromFile,
   viewportPresetId,
-  onApplyViewportPreset
+  onApplyViewportPreset,
+  overflow
 }: BrowserToolbarMenuDropdownProps): React.JSX.Element {
   return (
     <DropdownMenu modal={false} open={menuOpen} onOpenChange={onMenuOpenChange}>
       <DropdownMenuTrigger asChild>
         <Button
+          ref={overflow.triggerRef}
           size="icon"
           variant="ghost"
           className="h-8 w-8"
@@ -77,7 +84,15 @@ export function BrowserToolbarMenuDropdown({
           <Ellipsis className="size-4" />
         </Button>
       </DropdownMenuTrigger>
-      <DropdownMenuContent align="end" className="w-56">
+      <DropdownMenuContent
+        align="end"
+        className="w-56"
+        onCloseAutoFocus={overflow.onMenuCloseAutoFocus}
+      >
+        <BrowserChromeFoldedMenuItems
+          tools={overflow.tools}
+          deferUntilClose={overflow.deferUntilClose}
+        />
         {allProfiles.map((profile) => {
           const isSelectedProfile = profile.id === effectiveProfileId
           return (
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-chrome-tool-fold.test.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-chrome-tool-fold.test.tsx
new file mode 100644
index 000000000000..6edb0570a8cf
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-chrome-tool-fold.test.tsx
@@ -0,0 +1,159 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useRef } from 'react'
+import { BROWSER_CHROME_ADDRESS_SLOT_ATTRIBUTE } from './browser-chrome-address-slot'
+import {
+  BROWSER_CHROME_ADDRESS_MIN_WIDTH_PX,
+  BROWSER_CHROME_FOLD_ORDER,
+  useBrowserChromeToolFold
+} from './use-browser-chrome-tool-fold'
+
+const FIXED_WIDTH = 100
+const TOOL_WIDTH = 30
+
+// A flex row where the address takes whatever the fixed controls and visible tools leave over.
+const layout = { rowWidth: 600, visibleTools: BROWSER_CHROME_FOLD_ORDER.length }
+let resizeCallbacks: (() => void)[] = []
+
+function Host({
+  onFolded,
+  stages = BROWSER_CHROME_FOLD_ORDER
+}: {
+  onFolded: (count: number) => void
+  stages?: readonly (typeof BROWSER_CHROME_FOLD_ORDER)[number][]
+}): React.JSX.Element {
+  const rowRef = useRef<HTMLDivElement>(null)
+  const folded = useBrowserChromeToolFold(rowRef, stages)
+  layout.visibleTools = stages.length - folded.size
+  onFolded(folded.size)
+  return (
+    <div ref={rowRef} data-testid="row">
+      <div {...{ [BROWSER_CHROME_ADDRESS_SLOT_ATTRIBUTE]: 'true' }} />
+    </div>
+  )
+}
+
+function contentWidth(): number {
+  return FIXED_WIDTH + TOOL_WIDTH * layout.visibleTools
+}
+
+beforeEach(() => {
+  resizeCallbacks = []
+  vi.stubGlobal(
+    'ResizeObserver',
+    class {
+      constructor(callback: () => void) {
+        resizeCallbacks.push(callback)
+      }
+      observe(): void {}
+      disconnect(): void {}
+    }
+  )
+  vi.spyOn(HTMLElement.prototype, 'clientWidth', 'get').mockImplementation(() => layout.rowWidth)
+  vi.spyOn(HTMLElement.prototype, 'scrollWidth', 'get').mockImplementation(() =>
+    Math.max(layout.rowWidth, contentWidth())
+  )
+  vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(() =>
+    DOMRect.fromRect({ width: Math.max(0, layout.rowWidth - contentWidth()) })
+  )
+})
+
+afterEach(() => {
+  cleanup()
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+})
+
+function resizeTo(width: number): void {
+  layout.rowWidth = width
+  act(() => resizeCallbacks.forEach((callback) => callback()))
+}
+
+function expectedFolded(width: number): number {
+  const room = width - FIXED_WIDTH - BROWSER_CHROME_ADDRESS_MIN_WIDTH_PX
+  const fits = Math.max(0, Math.floor(room / TOOL_WIDTH))
+  return Math.max(0, BROWSER_CHROME_FOLD_ORDER.length - fits)
+}
+
+describe('useBrowserChromeToolFold', () => {
+  it('keeps every tool inline when the address has its minimum width', () => {
+    let folded = -1
+    layout.rowWidth = 600
+    render(<Host onFolded={(count) => (folded = count)} />)
+    expect(folded).toBe(0)
+  })
+
+  it('folds just enough tools to give the address its minimum width', () => {
+    let folded = -1
+    layout.rowWidth = 300
+    render(<Host onFolded={(count) => (folded = count)} />)
+    expect(folded).toBe(expectedFolded(300))
+    expect(folded).toBeGreaterThan(0)
+  })
+
+  it('unfolds as the row widens and refolds as it narrows', () => {
+    let folded = -1
+    layout.rowWidth = 600
+    render(<Host onFolded={(count) => (folded = count)} />)
+
+    resizeTo(260)
+    expect(folded).toBe(expectedFolded(260))
+
+    resizeTo(400)
+    expect(folded).toBe(expectedFolded(400))
+
+    resizeTo(700)
+    expect(folded).toBe(0)
+  })
+
+  it('folds everything but lets the address shrink once no tool is left', () => {
+    let folded = -1
+    layout.rowWidth = 150
+    render(<Host onFolded={(count) => (folded = count)} />)
+    expect(folded).toBe(BROWSER_CHROME_FOLD_ORDER.length)
+  })
+
+  it('leaves a hidden (zero-width) row alone', () => {
+    let folded = -1
+    layout.rowWidth = 0
+    render(<Host onFolded={(count) => (folded = count)} />)
+    expect(folded).toBe(0)
+  })
+
+  it('measures when a hidden row becomes visible', () => {
+    let folded = -1
+    layout.rowWidth = 0
+    render(<Host onFolded={(count) => (folded = count)} />)
+
+    resizeTo(300)
+    expect(folded).toBe(expectedFolded(300))
+  })
+
+  it('discards measurements when the available tools change', () => {
+    let folded = -1
+    layout.rowWidth = 300
+    const view = render(<Host onFolded={(count) => (folded = count)} />)
+    expect(folded).toBeGreaterThan(0)
+
+    view.rerender(<Host onFolded={(count) => (folded = count)} stages={['grab', 'annotate']} />)
+    expect(folded).toBe(0)
+
+    resizeTo(150)
+    expect(folded).toBe(2)
+  })
+
+  it('does not restore an obsolete fold level when a tool set returns', () => {
+    let folded = -1
+    layout.rowWidth = 300
+    const view = render(<Host onFolded={(count) => (folded = count)} />)
+    expect(folded).toBeGreaterThan(0)
+
+    layout.rowWidth = 600
+    view.rerender(<Host onFolded={(count) => (folded = count)} stages={['grab']} />)
+    expect(folded).toBe(0)
+
+    view.rerender(<Host onFolded={(count) => (folded = count)} />)
+    expect(folded).toBe(0)
+  })
+})
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-chrome-tool-fold.ts b/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-chrome-tool-fold.ts
new file mode 100644
index 000000000000..02b1fa7e9ec7
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-chrome-tool-fold.ts
@@ -0,0 +1,115 @@
+import { useLayoutEffect, useRef, useState, type RefObject } from 'react'
+import { BROWSER_CHROME_ADDRESS_SLOT_ATTRIBUTE } from './browser-chrome-address-slot'
+
+/**
+ * One step of toolbar compaction. Steps apply in this order as the row narrows, so the least-used
+ * tools leave first and the page tools the chrome exists for (grab, annotate) leave last.
+ */
+export type BrowserChromeFoldStage =
+  | 'import-label'
+  | 'external'
+  | 'devtools'
+  | 'share'
+  | 'import'
+  | 'draw'
+  | 'grab'
+  | 'annotate'
+
+export const BROWSER_CHROME_FOLD_ORDER: readonly BrowserChromeFoldStage[] = [
+  'import-label',
+  'external',
+  'devtools',
+  'share',
+  'import',
+  'draw',
+  'grab',
+  'annotate'
+]
+
+/** Below this the URL stops being readable, so tools fold before the address shrinks further. */
+export const BROWSER_CHROME_ADDRESS_MIN_WIDTH_PX = 120
+
+type RowMeasure = { address: number; overflow: number }
+
+function measureRow(row: HTMLElement | null): RowMeasure | null {
+  const slot = row?.querySelector(`[${BROWSER_CHROME_ADDRESS_SLOT_ATTRIBUTE}]`)
+  // Why: a hidden pane measures zero; folding everything there would flash on reveal.
+  if (!row || !slot || row.clientWidth === 0) {
+    return null
+  }
+  return {
+    address: slot.getBoundingClientRect().width,
+    overflow: Math.max(0, row.scrollWidth - row.clientWidth)
+  }
+}
+
+/**
+ * Folds `stages` one at a time until the address slot keeps its minimum width and the row stops
+ * overflowing, and unfolds as room returns.
+ *
+ * Why record the width each fold freed instead of re-measuring from zero on every resize: resetting
+ * would re-render the toolbar once per stage per resize frame. A fold is undone only when the
+ * address has that much slack, so an unfold can never immediately re-trigger its own fold.
+ */
+export function useBrowserChromeToolFold(
+  rowRef: RefObject<HTMLElement | null>,
+  stages: readonly BrowserChromeFoldStage[]
+): ReadonlySet<BrowserChromeFoldStage> {
+  const stagesKey = stages.join(',')
+  const [foldedCount, setFoldedCount] = useState(0)
+  const level = Math.min(foldedCount, stages.length)
+  const freedRef = useRef<{ stagesKey: string; widths: number[] }>({ stagesKey, widths: [] })
+  const pendingRef = useRef<(RowMeasure & { level: number }) | null>(null)
+
+  const checkRef = useRef<() => void>(() => {})
+  checkRef.current = () => {
+    if (freedRef.current.stagesKey !== stagesKey) {
+      freedRef.current = { stagesKey, widths: [] }
+      pendingRef.current = null
+    }
+    const measure = measureRow(rowRef.current)
+    if (!measure) {
+      return
+    }
+    const freed = freedRef.current.widths
+    const pending = pendingRef.current
+    if (pending && pending.level === level) {
+      freed[level - 1] = measure.address - pending.address + (pending.overflow - measure.overflow)
+      pendingRef.current = null
+    }
+    const shortfall =
+      Math.max(0, BROWSER_CHROME_ADDRESS_MIN_WIDTH_PX - measure.address) + measure.overflow
+    if (shortfall > 0.5 && level < stages.length) {
+      pendingRef.current = { ...measure, level: level + 1 }
+      setFoldedCount(level + 1)
+      return
+    }
+    const slack = measure.address - BROWSER_CHROME_ADDRESS_MIN_WIDTH_PX
+    if (shortfall <= 0.5 && level > 0 && slack >= (freed[level - 1] ?? 0)) {
+      setFoldedCount(level - 1)
+    }
+  }
+
+  // Why layout effect: each fold step re-measures before paint, so a squeeze never flashes clipped.
+  useLayoutEffect(() => {
+    checkRef.current()
+  }, [level, stagesKey])
+
+  useLayoutEffect(() => {
+    const row = rowRef.current
+    const slot = row?.querySelector(`[${BROWSER_CHROME_ADDRESS_SLOT_ATTRIBUTE}]`)
+    if (!row || typeof ResizeObserver === 'undefined') {
+      return
+    }
+    // Why both: the slot resizes when a sibling tool appears or hides, but stops resizing once it
+    // hits zero while the row keeps overflowing.
+    const observer = new ResizeObserver(() => checkRef.current())
+    observer.observe(row)
+    if (slot) {
+      observer.observe(slot)
+    }
+    return () => observer.disconnect()
+  }, [rowRef])
+
+  return new Set(stages.slice(0, level))
+}
diff --git a/src/renderer/src/components/browser-pane/browser-client-page-metadata-route-census.test.ts b/src/renderer/src/components/browser-pane/browser-client-page-metadata-route-census.test.ts
deleted file mode 100644
index 6937de9e6e46..000000000000
--- a/src/renderer/src/components/browser-pane/browser-client-page-metadata-route-census.test.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-
-/**
- * Page metadata has exactly one way out of this renderer: main, which owns the browser-host lease.
- *
- * Why a census and not a behavioural test: the failure this guards is silent. The runtime accepts
- * page traffic only on the connection its lease attached on, so a publish sent as an ordinary
- * runtime call is refused as a stale lease and simply never lands — the pane keeps working, the
- * guest keeps navigating, and only the runtime's copy of the URL stays frozen at the create URL.
- * Nothing in the rendered result changes, so only the route itself can be asserted.
- */
-const ROUTE_PATH = fileURLToPath(
-  new URL('./browser-client-page-metadata-reporting.ts', import.meta.url)
-)
-const PANE_PATH = fileURLToPath(new URL('./ClientHostedBrowserPagePane.tsx', import.meta.url))
-
-describe('client-hosted page metadata route', () => {
-  const route = readFileSync(ROUTE_PATH, 'utf8')
-  const pane = readFileSync(PANE_PATH, 'utf8')
-
-  it('publishes through main and never through a plain runtime call', () => {
-    expect(occurrences(route, 'window.api.browser.publishClientPageMetadata')).toBe(1)
-    expect(occurrences(route, 'runtimeEnvironments.call')).toBe(0)
-    expect(occurrences(pane, 'runtimeEnvironments.call')).toBe(0)
-  })
-
-  it('reports a publish that did not land', () => {
-    expect(occurrences(route, 'onUnpublished:')).toBe(1)
-  })
-
-  // The pane must not build its own publisher around the route: a second construction site is a
-  // second chance to wire the transport wrongly, and it would not be covered by the counts above.
-  it('leaves the pane one way to start publishing', () => {
-    expect(occurrences(pane, 'createBrowserClientPageMetadataPublisher(')).toBe(0)
-    expect(occurrences(pane, 'startBrowserClientPageMetadataPublisher(')).toBe(1)
-  })
-})
-
-function occurrences(source: string, needle: string): number {
-  return source.split(needle).length - 1
-}
diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-guest-paint-retention.ts b/src/renderer/src/components/browser-pane/host-guest/browser-guest-paint-retention.ts
index 0d1364c139ba..941c527b38f0 100644
--- a/src/renderer/src/components/browser-pane/host-guest/browser-guest-paint-retention.ts
+++ b/src/renderer/src/components/browser-pane/host-guest/browser-guest-paint-retention.ts
@@ -61,7 +61,6 @@ export function useBrowserGuestPaintRetention(browserPageIds: readonly string[])
 // Why one exported predicate rather than the same OR-list at each site: a hand-rolled copy stays
 // green when a term is added — nothing typechecks a site that never names the new signal — and the
 // remote-viewer term reached the panes while four copies in Terminal.tsx still had three terms.
-// browser-guest-retention-site-census.test.ts holds the sites to this function.
 export function browserPageNeedsPaintRetention(browserPageId: string): boolean {
   return (
     isBrowserAutomationVisible(browserPageId) ||
diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-guest-retention-site-census.test.ts b/src/renderer/src/components/browser-pane/host-guest/browser-guest-retention-site-census.test.ts
deleted file mode 100644
index 5d8c60283293..000000000000
--- a/src/renderer/src/components/browser-pane/host-guest/browser-guest-retention-site-census.test.ts
+++ /dev/null
@@ -1,223 +0,0 @@
-import { readdirSync, readFileSync } from 'node:fs'
-import { join, relative, sep } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-// Guest retention is an OR over several independent signals, and every container from the app
-// shell down to the guest has to agree on the list — Chromium stops painting inside a display:none
-// subtree, so the *most* pinched ancestor wins. Adding a term (the remote-viewer signal, STA-4150)
-// reached the panes while four hand-rolled copies still listed three: nothing typechecks a site
-// that never names the new symbol. So the terms live behind one helper, and this census holds the
-// sites to it — the classification is enforced here, not by review.
-
-const RENDERER_SRC = join(__dirname, '..', '..', '..')
-
-// The three term stores.
-const RETENTION_TERM_STORES = [
-  'components/browser-pane/host-guest/browser-automation-visibility.ts',
-  'lib/pane-manager/browser-mobile-driver-state.ts',
-  'lib/pane-manager/browser-remote-viewer-state.ts'
-]
-
-// ...plus the single module allowed to OR their terms together.
-const RETENTION_TERM_OWNERS = [
-  ...RETENTION_TERM_STORES,
-  'components/browser-pane/host-guest/browser-guest-paint-retention.ts'
-]
-
-// Every way a term store lets a caller read one term. A site that hand-rolls the OR-list from
-// readers missing here would pass the census, so the last check holds this list to the exports.
-const RETENTION_TERM_SYMBOLS = [
-  'isBrowserAutomationVisible',
-  'useBrowserAutomationVisibilityForAny',
-  'getBrowserAutomationVisiblePageIds',
-  'onBrowserAutomationVisibilityChange',
-  'isBrowserPageMobileDriven',
-  'hasMobileDriverForAnyBrowserPage',
-  'useBrowserMobileDriverForAny',
-  'getBrowserMobileDrivenPageIds',
-  'getDriverForBrowserPage',
-  'useBrowserDriverForPage',
-  'onBrowserDriverChange',
-  'isBrowserPageRemotelyViewed',
-  'hasRemoteViewerForAnyBrowserPage',
-  'useBrowserRemoteViewerForAny',
-  'getBrowserRemotelyViewedPageIds',
-  'onBrowserRemoteViewerChange'
-]
-
-const RETENTION_HELPER_SYMBOLS = [
-  'useAnyBrowserGuestNeedsPaint',
-  'useBrowserGuestPaintRetention',
-  'browserPageNeedsPaintRetention',
-  'onBrowserGuestPaintRetentionChange',
-  'browserTabsVetoGuestEviction'
-]
-
-// Every place that decides whether a browser guest keeps painting, and the helper it must use.
-const RETENTION_SITES = new Map<string, readonly string[]>([
-  ['components/TerminalWorkbenchContainer.tsx', ['useAnyBrowserGuestNeedsPaint']],
-  // The two outermost workbench wrappers: strict ancestors of every guest, so the per-worktree
-  // surface hatch below cannot rescue a guest either one parked with `hidden`.
-  ['components/TerminalSurface.tsx', ['useAnyBrowserGuestNeedsPaint']],
-  ['components/TerminalSplitWorkspaceSurfaces.tsx', ['useAnyBrowserGuestNeedsPaint']],
-  ['components/TerminalWorktreeSplitSurface.tsx', ['useBrowserGuestPaintRetention']],
-  [
-    'components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx',
-    ['useBrowserGuestPaintRetention']
-  ],
-  [
-    'components/browser-pane/host-guest/browser-guest-worktree-retention.ts',
-    ['browserPageNeedsPaintRetention']
-  ],
-  [
-    'components/use-terminal-browser-retention.ts',
-    ['browserTabsVetoGuestEviction', 'onBrowserGuestPaintRetentionChange']
-  ]
-])
-
-// The per-page threading hooks are the carve-out: they hand one boolean per page to
-// browser-page-paintability's required fields, so a missing term IS a typecheck error there. They
-// still travel as a set — a caller that reads two of the three is the same omission bug.
-const PER_PAGE_RETENTION_HOOKS = [
-  'useBrowserAutomationVisiblePageIds',
-  'useBrowserMobileDrivenPageIds',
-  'useBrowserRemotelyViewedPageIds'
-]
-
-// One production read of a term is not a retention decision: the pane reads *who* drives the active
-// page to label the overlay and lock input. Naming the exception per file rather than dropping the
-// symbol keeps every other file that reads it a census failure.
-const NON_RETENTION_TERM_READERS = new Map<string, readonly string[]>([
-  [
-    'components/browser-pane/assemble-chrome/browser-workspace-pane.tsx',
-    ['useBrowserDriverForPage']
-  ]
-])
-
-// Writers, hydrators and the idle sentinel: they set or seed a term rather
-// than read it, so naming one is not a retention decision.
-const NON_READER_TERM_EXPORTS = [
-  'acquireBrowserAutomationVisibility',
-  'releaseBrowserAutomationVisibility',
-  'setDriverForBrowserPage',
-  'hydrateBrowserDrivers',
-  'IDLE_BROWSER_DRIVER',
-  'setRemoteViewersForBrowserPage',
-  'hydrateBrowserRemoteViewerPages'
-]
-
-function productionSources(): Map<string, string> {
-  const sources = new Map<string, string>()
-  for (const entry of readdirSync(RENDERER_SRC, { recursive: true, withFileTypes: true })) {
-    if (!entry.isFile() || !/\.tsx?$/.test(entry.name) || entry.name.endsWith('.d.ts')) {
-      continue
-    }
-    if (/\.test\.tsx?$/.test(entry.name) || /test-(harness|rig|fixtures)/.test(entry.name)) {
-      continue
-    }
-    const filePath = join(entry.parentPath, entry.name)
-    sources.set(
-      relative(RENDERER_SRC, filePath).split(sep).join('/'),
-      readFileSync(filePath, 'utf8')
-    )
-  }
-  return sources
-}
-
-function namedSymbols(source: string, symbols: readonly string[]): string[] {
-  return symbols.filter((symbol) => new RegExp(`\\b${symbol}\\b`).test(source))
-}
-
-describe('browser guest retention site census', () => {
-  const sources = productionSources()
-
-  it('keeps every individual retention term behind the shared helper', () => {
-    const offenders = [...sources]
-      .filter(([file]) => !RETENTION_TERM_OWNERS.includes(file))
-      .map(([file, source]) => ({
-        file,
-        terms: namedSymbols(source, RETENTION_TERM_SYMBOLS).filter(
-          (term) => !(NON_RETENTION_TERM_READERS.get(file) ?? []).includes(term)
-        )
-      }))
-      .filter(({ terms }) => terms.length > 0)
-      .map(({ file, terms }) => `${file}: ${terms.join(', ')}`)
-      .sort()
-
-    expect(
-      offenders,
-      'A retention site that names terms one by one silently keeps its old list when a new signal ' +
-        'is added. Call useBrowserGuestPaintRetention / browserPageNeedsPaintRetention instead, ' +
-        'and register the site in RETENTION_SITES.'
-    ).toEqual([])
-  })
-
-  it('registers every consumer of the shared retention helper', () => {
-    const consumers = [...sources]
-      .filter(
-        ([file]) => file !== 'components/browser-pane/host-guest/browser-guest-paint-retention.ts'
-      )
-      .filter(([, source]) => namedSymbols(source, RETENTION_HELPER_SYMBOLS).length > 0)
-      .map(([file]) => file)
-      .sort()
-
-    expect(consumers, 'New retention sites must be listed in RETENTION_SITES.').toEqual(
-      [...RETENTION_SITES.keys()].sort()
-    )
-  })
-
-  it('keeps each registered site consulting retention through its helper', () => {
-    const missing: string[] = []
-    for (const [file, requiredSymbols] of RETENTION_SITES) {
-      const source = sources.get(file)
-      expect(source, `${file} is registered as a retention site but no longer exists`).toBeDefined()
-      for (const symbol of requiredSymbols) {
-        if (!new RegExp(`\\b${symbol}\\b`).test(source ?? '')) {
-          missing.push(`${file}: ${symbol}`)
-        }
-      }
-    }
-    expect(missing, 'A registered retention site stopped consulting retention.').toEqual([])
-  })
-
-  it('keeps the per-page threading hooks travelling as a full set', () => {
-    const partial = [...sources]
-      .filter(([file]) => !RETENTION_TERM_OWNERS.includes(file))
-      .map(([file, source]) => ({ file, hooks: namedSymbols(source, PER_PAGE_RETENTION_HOOKS) }))
-      .filter(({ hooks }) => hooks.length > 0 && hooks.length < PER_PAGE_RETENTION_HOOKS.length)
-      .map(({ file, hooks }) => `${file}: only ${hooks.join(', ')}`)
-      .sort()
-
-    expect(
-      partial,
-      'A pane that threads some retention terms per page must thread all of them.'
-    ).toEqual([])
-  })
-
-  // Keeps the symbol lists above from going stale: a term store that grows a new reader nobody
-  // classified would otherwise be a free way to hand-roll the OR-list.
-  it('classifies every value a term store exports', () => {
-    const classified = new Set([
-      ...RETENTION_TERM_SYMBOLS,
-      ...PER_PAGE_RETENTION_HOOKS,
-      ...NON_READER_TERM_EXPORTS
-    ])
-    const unclassified: string[] = []
-    for (const file of RETENTION_TERM_STORES) {
-      const source = sources.get(file)
-      expect(source, `${file} is registered as a term store but no longer exists`).toBeDefined()
-      for (const [, name] of (source ?? '').matchAll(/^export (?:function|const|let) (\w+)/gm)) {
-        if (!classified.has(name)) {
-          unclassified.push(`${file}: ${name}`)
-        }
-      }
-    }
-
-    expect(
-      unclassified,
-      'A term store exports something this census does not classify. Add a reader to ' +
-        'RETENTION_TERM_SYMBOLS (or PER_PAGE_RETENTION_HOOKS, for the per-page hooks typecheck ' +
-        'already covers) so hand-rolled sites keep failing, and a writer to NON_READER_TERM_EXPORTS.'
-    ).toEqual([])
-  })
-})
diff --git a/src/renderer/src/components/browser-pane/navigate/browser-address-bar-navigation.test.ts b/src/renderer/src/components/browser-pane/navigate/browser-address-bar-navigation.test.ts
index a2f4cdc38ccb..2faf06e4929d 100644
--- a/src/renderer/src/components/browser-pane/navigate/browser-address-bar-navigation.test.ts
+++ b/src/renderer/src/components/browser-pane/navigate/browser-address-bar-navigation.test.ts
@@ -16,6 +16,17 @@ vi.mock('@/i18n/i18n', () => ({
 import { resolveBrowserAddressBarSubmission } from './browser-address-bar-navigation'
 
 describe('resolveBrowserAddressBarSubmission', () => {
+  it.each([
+    ['example.com:8443/docs', 'https://example.com:8443/docs'],
+    ['app.localhost:3000', 'http://app.localhost:3000/']
+  ])('submits %s as a navigation for local and client-hosted panes', (input, url) => {
+    expect(resolveBrowserAddressBarSubmission(input)).toEqual({ status: 'navigate', url })
+    expect(resolveBrowserAddressBarSubmission(input, { allowFileUrls: false })).toEqual({
+      status: 'navigate',
+      url
+    })
+  })
+
   it('falls back to the configured search engine instead of parsing a query as a host', () => {
     storeState.browserDefaultSearchEngine = 'google'
     expect(resolveBrowserAddressBarSubmission('google maps')).toEqual({
diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.tsx b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.tsx
index fb563f4c54b2..f447b5432d1b 100644
--- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.tsx
+++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.tsx
@@ -5,6 +5,7 @@ import type { BrowserPage as BrowserPageState } from '../../../../../shared/brow
 import { runtimeEnvironmentSupportsCapability } from '@/runtime/runtime-rpc-client'
 import { convertBrowserPageToWorkspaceDoc } from '@/lib/file-preview'
 import { openWorkspaceBrowserTab } from '@/lib/workspace-browser-tab-open'
+import { resolveBrowserSourceUnifiedTab } from '@/lib/browser-workspace-source-resolution'
 import { useBrowserPageChromeFocus } from '../assemble-chrome/use-browser-page-chrome-focus'
 import { useBrowserAddressBarEditSession } from '../assemble-chrome/use-browser-address-bar-edit-session'
 import { useElementGuestFocus } from '../assemble-chrome/browser-page-guest-focus'
@@ -354,10 +355,17 @@ export function RemoteBrowserPagePane({
           onOpenLinkInOrcaBrowser={() => {
             const linkUrl = contextMenu.linkUrl!
             setContextMenu(null)
+            const sourceUnifiedTab = resolveBrowserSourceUnifiedTab(
+              useAppStore.getState(),
+              browserTab.id,
+              worktreeId
+            )
             void openWorkspaceBrowserTab({
               workspaceId: worktreeId,
               url: linkUrl,
+              ...(sourceUnifiedTab ? { afterTabId: sourceUnifiedTab.id } : {}),
               focusOnCreate: false,
+              selectWorktree: false,
               intent: { kind: 'url' },
               expectedRuntimeEnvironmentId: runtimeEnvironmentId,
               placementPreference: 'server'
diff --git a/src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.host-connection.test.tsx b/src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.host-connection.test.tsx
new file mode 100644
index 000000000000..26ee11c77ce8
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.host-connection.test.tsx
@@ -0,0 +1,225 @@
+// @vitest-environment happy-dom
+import { act, cleanup, renderHook } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { WorktreeHostConnection } from '@/lib/worktree-host-connection-phase'
+import type { SshConnectionStatus } from '../../../../shared/ssh-types'
+
+const mocks = vi.hoisted(() => {
+  const hostConnection: WorktreeHostConnection = {
+    phase: 'connecting',
+    targetId: 'target-a',
+    environmentId: null,
+    publishedStatus: 'connecting',
+    connectedEpoch: null
+  }
+  const route: { executionHostId: string | null } = { executionHostId: 'ssh:target-a' }
+  return { hostConnection, ...route, prepare: vi.fn() }
+})
+
+vi.mock('@/lib/worktree-runtime-owner', () => ({
+  getExecutionHostIdForWorktree: () => mocks.executionHostId
+}))
+vi.mock('@/lib/worktree-host-connection-phase', () => ({
+  selectWorktreeHostConnectionPhase: () => mocks.hostConnection,
+  useWorktreeHostConnection: () => mocks.hostConnection
+}))
+
+import { useSshWorkspaceBrowserRoute } from './use-ssh-workspace-browser-route'
+
+const READY_PARTITION = 'persist:orca-browser-v1-routed'
+
+const settle = () =>
+  act(async () => {
+    await new Promise((resolve) => setTimeout(resolve, 0))
+  })
+
+const STATUS_BY_PHASE: Record<WorktreeHostConnection['phase'], SshConnectionStatus | null> = {
+  local: null,
+  connecting: 'connecting',
+  connected: 'connected',
+  unavailable: 'disconnected',
+  unverifiable: null
+}
+
+function setHost(
+  phase: WorktreeHostConnection['phase'],
+  connectionGeneration: number | null = null
+): void {
+  mocks.hostConnection = {
+    phase,
+    targetId: 'target-a',
+    environmentId: null,
+    publishedStatus: STATUS_BY_PHASE[phase],
+    connectedEpoch: phase === 'connected' ? `target-a:${connectionGeneration}` : null
+  }
+}
+
+describe('useSshWorkspaceBrowserRoute under a reconnecting SSH host', () => {
+  beforeEach(() => {
+    mocks.prepare.mockReset()
+    mocks.executionHostId = 'ssh:target-a'
+    Object.defineProperty(window, 'api', {
+      configurable: true,
+      value: { browser: { prepareSshWorkspacePartition: mocks.prepare } }
+    })
+  })
+  afterEach(() => cleanup())
+
+  it('waits while the host connects, then prepares exactly once when it connects', async () => {
+    setHost('connecting')
+    mocks.prepare.mockResolvedValue({ partition: READY_PARTITION })
+    const { result, rerender } = renderHook(() => useSshWorkspaceBrowserRoute('wt-1', null))
+    await settle()
+    expect(result.current.state).toEqual({ kind: 'preparing' })
+    expect(mocks.prepare).not.toHaveBeenCalled()
+
+    setHost('connected', 1)
+    rerender()
+    await settle()
+    expect(mocks.prepare).toHaveBeenCalledOnce()
+    expect(result.current.state).toEqual({
+      kind: 'ready',
+      partition: READY_PARTITION,
+      targetId: 'target-a'
+    })
+  })
+
+  it('re-derives an ssh-unavailable error without Retry once the host connects', async () => {
+    setHost('unavailable')
+    mocks.prepare.mockRejectedValueOnce(new Error('browser_local_route_ssh_unavailable'))
+    mocks.prepare.mockResolvedValueOnce({ partition: READY_PARTITION })
+    const { result, rerender } = renderHook(() => useSshWorkspaceBrowserRoute('wt-1', null))
+    await settle()
+    expect(result.current.state.kind).toBe('error')
+
+    setHost('connecting')
+    rerender()
+    await settle()
+    // Why: a dial is a transient; the classified card stays until the host actually connects.
+    expect(result.current.state.kind).toBe('error')
+    expect(mocks.prepare).toHaveBeenCalledOnce()
+
+    setHost('connected', 1)
+    rerender()
+    await settle()
+    expect(mocks.prepare).toHaveBeenCalledTimes(2)
+    expect(result.current.state.kind).toBe('ready')
+  })
+
+  it('re-prepares a failed route when the host reconnects under a new generation', async () => {
+    setHost('connected', 1)
+    mocks.prepare.mockRejectedValueOnce(new Error('browser_local_route_ssh_unavailable'))
+    mocks.prepare.mockResolvedValueOnce({ partition: READY_PARTITION })
+    const { result, rerender } = renderHook(() => useSshWorkspaceBrowserRoute('wt-1', null))
+    await settle()
+    expect(result.current.state.kind).toBe('error')
+
+    setHost('connected', 2)
+    rerender()
+    await settle()
+    expect(mocks.prepare).toHaveBeenCalledTimes(2)
+    expect(result.current.state.kind).toBe('ready')
+  })
+
+  it('prepares once while connected and keeps a ready page mounted across a reconnect', async () => {
+    setHost('connected', 1)
+    mocks.prepare.mockResolvedValue({ partition: READY_PARTITION })
+    const { result, rerender } = renderHook(() => useSshWorkspaceBrowserRoute('wt-1', null))
+    await settle()
+    rerender()
+    rerender()
+    await settle()
+    expect(mocks.prepare).toHaveBeenCalledOnce()
+
+    setHost('connecting', 1)
+    rerender()
+    await settle()
+    expect(result.current.state.kind).toBe('ready')
+
+    setHost('connected', 2)
+    rerender()
+    await settle()
+    expect(mocks.prepare).toHaveBeenCalledOnce()
+    expect(result.current.state.kind).toBe('ready')
+  })
+
+  it('keeps a failed route on its card while another pane redials the host, then recovers on connect', async () => {
+    // The e2e sequence: the user disconnects, a browser tab classifies the dead host, and the
+    // workspace's terminal redials it. Dial transients must not swap the card for "preparing".
+    setHost('unavailable')
+    mocks.prepare.mockRejectedValueOnce(new Error('browser_local_route_ssh_unavailable'))
+    mocks.prepare.mockResolvedValueOnce({ partition: READY_PARTITION })
+    const { result, rerender } = renderHook(() => useSshWorkspaceBrowserRoute('wt-1', null))
+    await settle()
+    const card = result.current.state
+    expect(card).toMatchObject({ kind: 'error', errorKind: 'ssh-unavailable' })
+
+    for (const phase of ['connecting', 'unavailable', 'connecting', 'unavailable'] as const) {
+      setHost(phase)
+      rerender()
+      await settle()
+      expect(result.current.state).toEqual(card)
+    }
+    expect(mocks.prepare).toHaveBeenCalledOnce()
+
+    setHost('connected', 2)
+    rerender()
+    await settle()
+    expect(mocks.prepare).toHaveBeenCalledTimes(2)
+    expect(result.current.state.kind).toBe('ready')
+  })
+
+  it('waits for the connect when Retry is pressed while the host dials', async () => {
+    setHost('unavailable')
+    mocks.prepare.mockRejectedValueOnce(new Error('browser_local_route_ssh_unavailable'))
+    mocks.prepare.mockResolvedValueOnce({ partition: READY_PARTITION })
+    const { result, rerender } = renderHook(() => useSshWorkspaceBrowserRoute('wt-1', null))
+    await settle()
+    expect(result.current.state.kind).toBe('error')
+
+    setHost('connecting')
+    rerender()
+    await settle()
+    act(() => result.current.retry())
+    await settle()
+    expect(result.current.state).toEqual({ kind: 'preparing' })
+    expect(mocks.prepare).toHaveBeenCalledOnce()
+
+    setHost('connected', 1)
+    rerender()
+    await settle()
+    expect(mocks.prepare).toHaveBeenCalledTimes(2)
+    expect(result.current.state.kind).toBe('ready')
+  })
+
+  it('waits for a dialing host when the route becomes routed mid-dial', async () => {
+    // Why: an unrouted route is not an answer for the target it just gained.
+    mocks.executionHostId = null
+    setHost('connecting')
+    mocks.prepare.mockResolvedValue({ partition: READY_PARTITION })
+    const { result, rerender } = renderHook(() => useSshWorkspaceBrowserRoute('wt-1', null))
+    await settle()
+    expect(result.current.state).toEqual({ kind: 'unrouted' })
+
+    mocks.executionHostId = 'ssh:target-a'
+    rerender()
+    await settle()
+    expect(result.current.state).toEqual({ kind: 'preparing' })
+    expect(mocks.prepare).not.toHaveBeenCalled()
+
+    setHost('connected', 1)
+    rerender()
+    await settle()
+    expect(mocks.prepare).toHaveBeenCalledOnce()
+    expect(result.current.state.kind).toBe('ready')
+  })
+
+  it('prepares normally for a host it cannot verify instead of waiting on it', async () => {
+    setHost('unverifiable')
+    mocks.prepare.mockResolvedValue({ partition: READY_PARTITION })
+    const { result } = renderHook(() => useSshWorkspaceBrowserRoute('wt-1', null))
+    await settle()
+    expect(mocks.prepare).toHaveBeenCalledOnce()
+    expect(result.current.state.kind).toBe('ready')
+  })
+})
diff --git a/src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.ts b/src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.ts
index b7a1e432664f..6af3275c14c5 100644
--- a/src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.ts
+++ b/src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.ts
@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react'
 import { useAppStore } from '@/store'
 import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
+import { useWorktreeHostConnection } from '@/lib/worktree-host-connection-phase'
 import { resolveSshWorkspaceBrowserRouteEligibility } from '@/lib/ssh-workspace-browser-route-eligibility'
 
 export type SshWorkspaceBrowserRouteErrorKind = 'forwarding-blocked' | 'ssh-unavailable' | 'unknown'
@@ -64,6 +65,24 @@ export function useSshWorkspaceBrowserRoute(
   const [state, setState] = useState<SshWorkspaceBrowserRouteState>(
     targetId ? { kind: 'preparing' } : { kind: 'unrouted' }
   )
+  const hostConnection = useWorktreeHostConnection(worktreeId)
+  const routeHost =
+    targetId !== null && hostConnection.targetId === targetId ? hostConnection : null
+  // Why only an unsettled route waits: a dial is a transient, so it must not unmount a ready
+  // page or swap a failed route's card for "preparing". A connect (below) re-derives a failed one.
+  // Unrouted and another target's page are unsettled too: neither answers for this target.
+  const routeReady = state.kind === 'ready' && state.targetId === targetId
+  const awaitingHost = routeHost?.phase === 'connecting' && state.kind !== 'error' && !routeReady
+  const connectedHostEpoch = routeHost?.connectedEpoch ?? null
+  const [seenConnectedHostEpoch, setSeenConnectedHostEpoch] = useState(connectedHostEpoch)
+  if (connectedHostEpoch !== seenConnectedHostEpoch) {
+    setSeenConnectedHostEpoch(connectedHostEpoch)
+    // Why: a host that connects — or reconnects under a new generation — re-derives a route
+    // it failed or held, the same as Retry, but keeps the user's probe choice.
+    if (connectedHostEpoch !== null && !routeReady) {
+      setAttempt((current) => ({ ...current, count: current.count + 1 }))
+    }
+  }
 
   // Why: a persisted "Try anyway" means the user vouched for this host once
   // (e.g. PermitOpen allows their sites while the loopback probe is refused);
@@ -74,8 +93,13 @@ export function useSshWorkspaceBrowserRoute(
       setState({ kind: 'unrouted' })
       return
     }
-    let cancelled = false
     setState({ kind: 'preparing' })
+    // Why: the SSH connection is still being established, so prepare could only fail with
+    // ssh-unavailable; the connected transition above restarts it.
+    if (awaitingHost) {
+      return
+    }
+    let cancelled = false
     window.api.browser
       .prepareSshWorkspacePartition({
         targetId,
@@ -100,7 +124,7 @@ export function useSshWorkspaceBrowserRoute(
     return () => {
       cancelled = true
     }
-  }, [targetId, browserProfileId, attempt, skipProbe])
+  }, [targetId, browserProfileId, attempt, skipProbe, awaitingHost])
 
   // Why (review P1-1): `state` lags one commit behind a targetId transition on
   // an already-mounted instance; returning stale 'unrouted' (or a stale
@@ -109,13 +133,21 @@ export function useSshWorkspaceBrowserRoute(
   // routed/unrouted decision must be derived from targetId in-render.
   const effectiveState: SshWorkspaceBrowserRouteState = !targetId
     ? { kind: 'unrouted' }
-    : state.kind === 'unrouted' || (state.kind === 'ready' && state.targetId !== targetId)
+    : awaitingHost ||
+        state.kind === 'unrouted' ||
+        (state.kind === 'ready' && state.targetId !== targetId)
       ? { kind: 'preparing' }
       : state
+  const rederive = (nextSkipProbe: boolean): void => {
+    // Why: landing on preparing with the new attempt lets the effect's first run see a dialing
+    // host and wait, instead of starting a prepare that its own preparing write then cancels.
+    setState({ kind: 'preparing' })
+    setAttempt((current) => ({ count: current.count + 1, skipProbe: nextSkipProbe }))
+  }
   return {
     state: effectiveState,
     targetId: sshTargetId,
-    retry: () => setAttempt((current) => ({ count: current.count + 1, skipProbe: false })),
+    retry: () => rederive(false),
     tryWithoutProbe: () => {
       // Persist the override so this host isn't re-nagged on every launch.
       if (sshTargetId && probeSkippedTargetIds?.includes(sshTargetId) !== true) {
@@ -126,7 +158,7 @@ export function useSshWorkspaceBrowserRoute(
           ]
         })
       }
-      setAttempt((current) => ({ count: current.count + 1, skipProbe: true }))
+      rederive(true)
     },
     browseFromThisDevice: () => {
       if (!sshTargetId) {
diff --git a/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx b/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx
index aaee9c6243f8..602581dc16d8 100644
--- a/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx
+++ b/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx
@@ -621,11 +621,11 @@ describe('HtmlDocPreview guest focus', () => {
 
   beforeEach(() => {
     focused = []
-    focusSpy = vi
-      .spyOn(HTMLElement.prototype, 'focus')
-      .mockImplementation(function (this: HTMLElement) {
-        focused.push(this)
-      })
+    focusSpy = vi.spyOn(HTMLElement.prototype, 'focus').mockImplementation(function (
+      this: HTMLElement
+    ) {
+      focused.push(this)
+    })
     container = document.createElement('div')
     document.body.appendChild(container)
     root = createRoot(container)
diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-overflow-menu.tsx b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-overflow-menu.tsx
index 801d153b28bf..29e35d8f87e3 100644
--- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-overflow-menu.tsx
+++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-overflow-menu.tsx
@@ -8,6 +8,10 @@ import {
   DropdownMenuTrigger
 } from '@/components/ui/dropdown-menu'
 import { translate } from '@/i18n/i18n'
+import {
+  BrowserChromeFoldedMenuItems,
+  type BrowserChromeOverflowMenuProps
+} from '../assemble-chrome/browser-chrome-folded-tools'
 
 /**
  * The preview's overflow menu. It carries the document actions rather than the browsing pane's
@@ -18,7 +22,8 @@ export function DocPreviewOverflowMenu({
   onHardReload,
   onOpenSource,
   onCopyPath,
-  onCopyRelativePath
+  onCopyRelativePath,
+  overflow
 }: {
   onReload: () => void
   onHardReload: () => void
@@ -26,11 +31,13 @@ export function DocPreviewOverflowMenu({
   onCopyPath: () => void
   /** Why it lives here: the preview hides the editor's path header, which was the only way to copy it. */
   onCopyRelativePath: () => void
+  overflow: BrowserChromeOverflowMenuProps
 }): React.JSX.Element {
   return (
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
         <Button
+          ref={overflow.triggerRef}
           size="icon"
           variant="ghost"
           className="h-7 w-7"
@@ -42,7 +49,11 @@ export function DocPreviewOverflowMenu({
           <MoreHorizontal className="size-4" />
         </Button>
       </DropdownMenuTrigger>
-      <DropdownMenuContent align="end">
+      <DropdownMenuContent align="end" onCloseAutoFocus={overflow.onMenuCloseAutoFocus}>
+        <BrowserChromeFoldedMenuItems
+          tools={overflow.tools}
+          deferUntilClose={overflow.deferUntilClose}
+        />
         <DropdownMenuItem onSelect={onReload}>
           <RefreshCw className="size-3.5" />
           {translate('auto.components.browser.pane.BrowserPane.0e080d820e', 'Reload')}
diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-toolbar.tsx b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-toolbar.tsx
index df8f9116ca23..871323a9aef1 100644
--- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-toolbar.tsx
+++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-toolbar.tsx
@@ -102,7 +102,8 @@ export function DocPreviewToolbar({
         label: translate(
           'auto.components.editor.HtmlDocPreview.openSourceControl',
           'Open source file'
-        )
+        ),
+        alreadyInOverflowMenu: true
       }}
       openExternal={{
         onSelect: onOpenExternally,
@@ -111,15 +112,16 @@ export function DocPreviewToolbar({
           'Open with default app'
         )
       }}
-      overflowMenu={
+      overflowMenu={(overflow) => (
         <DocPreviewOverflowMenu
           onReload={onReload}
           onHardReload={onHardReload}
           onOpenSource={onOpenSource}
           onCopyPath={onCopyPath}
           onCopyRelativePath={onCopyRelativePath}
+          overflow={overflow}
         />
-      }
+      )}
     />
   )
 }
diff --git a/src/renderer/src/components/confirmation-dialog-refresh-boundary.test.ts b/src/renderer/src/components/confirmation-dialog-refresh-boundary.test.ts
index 952cb21e23dc..b2f1db2de1f1 100644
--- a/src/renderer/src/components/confirmation-dialog-refresh-boundary.test.ts
+++ b/src/renderer/src/components/confirmation-dialog-refresh-boundary.test.ts
@@ -1,33 +1,11 @@
 // @vitest-environment happy-dom
-import { createRequire } from 'node:module'
 import { createElement, type ReactNode } from 'react'
 import { renderHook } from '@testing-library/react'
 import { describe, expect, it } from 'vitest'
-import * as contextModule from '@/components/confirmation-dialog-context'
-import * as providerModule from '@/components/confirmation-dialog'
 import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 
-// react-refresh ships no types; take the one binding this needs.
-const { isLikelyComponentType } = createRequire(import.meta.url)('react-refresh/runtime') as {
-  isLikelyComponentType: (value: unknown) => boolean
-}
-
 describe('confirmation dialog Fast Refresh boundary', () => {
-  it('exports nothing from the provider module that invalidates the refresh boundary', () => {
-    expect(Object.keys(providerModule)).toEqual(['ConfirmationDialogProvider'])
-    expect(isLikelyComponentType(providerModule.ConfirmationDialogProvider)).toBe(true)
-  })
-
-  it('keeps the context and hook in a component-free module', () => {
-    const components = Object.entries(contextModule)
-      .filter(([, value]) => isLikelyComponentType(value))
-      .map(([name]) => name)
-
-    expect(components).toEqual([])
-    expect(typeof contextModule.useConfirmationDialog).toBe('function')
-  })
-
   it('resolves the hook against the context the provider publishes', () => {
     const wrapper = ({ children }: { children: ReactNode }) =>
       createElement(ConfirmationDialogProvider, null, children)
diff --git a/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.clipboard-routes.test.tsx b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.clipboard-routes.test.tsx
index f95815b2552e..06e2cb38721b 100644
--- a/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.clipboard-routes.test.tsx
+++ b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.clipboard-routes.test.tsx
@@ -88,6 +88,7 @@ vi.mock('@xterm/xterm', () => ({
     scrollToBottom = vi.fn()
     selectAll = vi.fn()
     getSelection = vi.fn(() => this.selectionText)
+    hasSelection = vi.fn(() => this.selectionText !== '')
     attachCustomKeyEventHandler = vi.fn((handler: (event: KeyboardEvent) => boolean) => {
       this.customKeyHandler = handler
     })
diff --git a/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.option-dead-key.test.tsx b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.option-dead-key.test.tsx
index 62f5b5b2a1d5..65e7026291b0 100644
--- a/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.option-dead-key.test.tsx
+++ b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.option-dead-key.test.tsx
@@ -37,6 +37,7 @@ vi.mock('@xterm/xterm', () => ({
     scrollToBottom = vi.fn()
     selectAll = vi.fn()
     getSelection = vi.fn(() => '')
+    hasSelection = vi.fn(() => false)
     attachCustomKeyEventHandler = vi.fn((handler: (event: KeyboardEvent) => boolean) => {
       this.customKeyHandler = handler
     })
diff --git a/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-geometry.test.tsx b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-geometry.test.tsx
new file mode 100644
index 000000000000..8ddb8a8ae757
--- /dev/null
+++ b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-geometry.test.tsx
@@ -0,0 +1,254 @@
+// @vitest-environment happy-dom
+
+import { act, cleanup, render } from '@testing-library/react'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type { ITerminalOptions } from '@xterm/xterm'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type { TerminalPreviewConnectResult } from '../../../../shared/terminal-preview'
+import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
+import { useAppStore } from '@/store'
+import { AgentTerminalPreview } from './AgentTerminalPreview'
+
+type PreviewInstance = {
+  options: ITerminalOptions
+  container: HTMLElement | null
+  dispose: ReturnType<typeof vi.fn>
+}
+const harness = vi.hoisted(() => ({ instances: new Array<PreviewInstance>() }))
+
+vi.mock('@xterm/xterm', () => ({
+  Terminal: class {
+    cols = 80
+    rows = 24
+    buffer = { active: { cursorY: 14 } }
+    container: HTMLElement | null = null
+    screen = document.createElement('div')
+    write = vi.fn((_data: string, callback?: () => void) => callback?.())
+    focus = vi.fn()
+    resize = vi.fn()
+    reset = vi.fn()
+    onData = vi.fn(() => ({ dispose: vi.fn() }))
+    dispose = vi.fn(() => this.screen.remove())
+    constructor(public options: ITerminalOptions) {
+      harness.instances.push(this)
+    }
+    open(container: HTMLElement): void {
+      this.container = container
+      this.screen.className = 'xterm-screen'
+      Object.defineProperties(this.screen, {
+        offsetWidth: {
+          get: () =>
+            this.cols *
+            (this.options.fontSize === 18 ||
+            this.options.fontFamily?.includes('Fira Code') ||
+            this.options.fontWeight === 900 ||
+            this.options.fontWeightBold === 900
+              ? 12
+              : 10)
+        },
+        offsetHeight: { get: () => this.rows * 16 * (this.options.lineHeight ?? 1) }
+      })
+      const box = container.parentElement
+      if (!box) {
+        throw new Error('Missing preview box')
+      }
+      Object.defineProperties(box, {
+        clientWidth: { configurable: true, value: 600 },
+        clientHeight: { configurable: true, value: 240 }
+      })
+      container.append(this.screen)
+    }
+  }
+}))
+vi.mock('@/components/terminal-pane/terminal-user-input-signal', () => ({
+  subscribeToTerminalUserInput: () => ({ dispose: vi.fn() })
+}))
+vi.mock('@/components/terminal-pane/use-system-prefers-dark', () => ({
+  useSystemPrefersDark: () => false
+}))
+vi.mock('@/lib/keyboard-layout/use-effective-mac-option-as-alt', () => ({
+  useEffectiveMacOptionAsAlt: (value: string) => value
+}))
+vi.mock('./preview-terminal-ligatures', () => ({ syncPreviewTerminalLigatures: vi.fn() }))
+vi.mock('./preview-terminal-compatibility', () => ({
+  installPreviewTerminalCompatibility: () => vi.fn()
+}))
+vi.mock('./preview-terminal-ime-bridge', () => ({
+  installPreviewImeBridge: () => ({ claimKeyEvent: () => false, dispose: vi.fn() })
+}))
+vi.mock('./preview-terminal-key-handler', () => ({
+  installPreviewTerminalKeyHandler: () => vi.fn()
+}))
+vi.mock('@/components/terminal-pane/terminal-native-copy-gutter', () => ({
+  installTerminalNativeCopyGutterTrim: () => ({ dispose: vi.fn() })
+}))
+vi.mock('./preview-terminal-app-menu-clipboard', () => ({
+  installPreviewTerminalAppMenuClipboard: () => vi.fn()
+}))
+vi.mock('./preview-terminal-right-click-paste', () => ({
+  installPreviewTerminalRightClickPaste: () => vi.fn()
+}))
+
+const initial = useAppStore.getInitialState()
+const connect = vi.fn<Window['api']['terminalPreview']['connect']>()
+const fit = vi.fn(async (_ptyId: string, cols: number, rows: number) => ({ cols, rows }))
+const unsubscribe = vi.fn(async () => {})
+let settings: GlobalSettings
+let originalApi: PropertyDescriptor | undefined
+
+beforeEach(() => {
+  vi.useFakeTimers()
+  vi.clearAllMocks()
+  harness.instances.length = 0
+  // No resize notification or later output: replay must perform its own fit and grid claim.
+  vi.stubGlobal(
+    'ResizeObserver',
+    class {
+      observe = vi.fn()
+      disconnect = vi.fn()
+    }
+  )
+  settings = createGlobalSettingsFixture({
+    theme: 'dark',
+    activeRuntimeEnvironmentId: null,
+    terminalFontSize: 14,
+    terminalFontFamily: 'JetBrains Mono',
+    terminalFontWeight: 500,
+    terminalFontWeightBold: 700,
+    terminalLineHeight: 1,
+    terminalLigatures: 'off'
+  })
+  connect
+    .mockReset()
+    .mockResolvedValue({ snapshot: { data: '', cols: 80, rows: 24, seq: 1 }, replay: [] })
+  originalApi = Object.getOwnPropertyDescriptor(window, 'api')
+  Object.defineProperty(window, 'api', {
+    configurable: true,
+    value: {
+      settings: {
+        set: async (updates: Partial<GlobalSettings>) => {
+          settings = structuredClone({ ...settings, ...updates })
+          return settings
+        }
+      },
+      terminalPreview: { connect, fit, unsubscribe, onData: () => vi.fn() }
+    }
+  })
+  useAppStore.setState({ ...initial, settings }, true)
+})
+
+afterEach(() => {
+  cleanup()
+  for (const instance of harness.instances) {
+    expect(instance.dispose).toHaveBeenCalledOnce()
+  }
+  useAppStore.setState(initial, true)
+  if (originalApi) {
+    Object.defineProperty(window, 'api', originalApi)
+  } else {
+    Reflect.deleteProperty(window, 'api')
+  }
+  vi.unstubAllGlobals()
+  vi.useRealTimers()
+})
+
+async function settleGeometry(): Promise<void> {
+  await act(async () => {
+    await vi.advanceTimersByTimeAsync(250)
+  })
+}
+
+it.each([
+  {
+    updates: { terminalFontSize: 18 },
+    cols: 50,
+    rows: 15,
+    scale: 'scale(0.625)',
+    anchor: 'top left'
+  },
+  {
+    updates: { terminalFontFamily: 'Fira Code' },
+    cols: 50,
+    rows: 15,
+    scale: 'scale(0.625)',
+    anchor: 'top left'
+  },
+  {
+    updates: { terminalFontWeight: 900 },
+    cols: 50,
+    rows: 15,
+    scale: 'scale(0.625)',
+    anchor: 'top left'
+  },
+  {
+    updates: { terminalFontWeightBold: 900 },
+    cols: 50,
+    rows: 15,
+    scale: 'scale(0.625)',
+    anchor: 'top left'
+  },
+  {
+    updates: { terminalLineHeight: 1.5 },
+    cols: 60,
+    rows: 10,
+    scale: 'scale(0.75)',
+    anchor: 'bottom left'
+  },
+  {
+    updates: { terminalLigatures: 'on' },
+    cols: 60,
+    rows: 15,
+    scale: 'scale(0.75)',
+    anchor: 'top left'
+  }
+] satisfies {
+  updates: Partial<GlobalSettings>
+  cols: number
+  rows: number
+  scale: string
+  anchor: string
+}[])(
+  'recreates the owner and fits the new geometry for $updates',
+  async ({ updates, cols, rows, scale, anchor }) => {
+    render(<AgentTerminalPreview ptyId="pty-1" />)
+    await settleGeometry()
+    expect(fit).toHaveBeenLastCalledWith('pty-1', 60, 15)
+    await act(async () => useAppStore.getState().updateSettings(updates))
+    await settleGeometry()
+
+    expect(fit).toHaveBeenCalledTimes(2)
+    expect(fit).toHaveBeenLastCalledWith('pty-1', cols, rows)
+    expect(harness.instances).toHaveLength(2)
+    expect(connect).toHaveBeenCalledTimes(2)
+    expect(unsubscribe).toHaveBeenCalledExactlyOnceWith('pty-1')
+    expect(harness.instances[1]?.container?.style.transform).toBe(scale)
+    expect(harness.instances[1]?.container?.style.transformOrigin).toBe(anchor)
+  }
+)
+
+it('ignores a pending connection retired by a metric change', async () => {
+  const gate = Promise.withResolvers<TerminalPreviewConnectResult>()
+  connect.mockReturnValueOnce(gate.promise)
+  render(<AgentTerminalPreview ptyId="pty-1" />)
+  await act(async () => useAppStore.getState().updateSettings({ terminalFontSize: 18 }))
+  await settleGeometry()
+  await act(async () =>
+    gate.resolve({ snapshot: { data: '', cols: 80, rows: 24, seq: 1 }, replay: [] })
+  )
+  await settleGeometry()
+  expect(connect).toHaveBeenCalledTimes(2)
+  expect(harness.instances).toHaveLength(1)
+  expect(harness.instances[0]?.options.fontSize).toBe(18)
+  expect(fit).toHaveBeenCalledExactlyOnceWith('pty-1', 50, 15)
+})
+
+it('cancels an obsolete metric owner grid claim before the next change', async () => {
+  render(<AgentTerminalPreview ptyId="pty-1" />)
+  await settleGeometry()
+  await act(async () => useAppStore.getState().updateSettings({ terminalFontSize: 18 }))
+  await act(async () => useAppStore.getState().updateSettings({ terminalLineHeight: 1.5 }))
+  await settleGeometry()
+  expect(harness.instances).toHaveLength(3)
+  expect(fit).toHaveBeenCalledTimes(2)
+  expect(fit).toHaveBeenLastCalledWith('pty-1', 50, 10)
+})
diff --git a/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-lifetime.test.tsx b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-lifetime.test.tsx
new file mode 100644
index 000000000000..84c0242e186c
--- /dev/null
+++ b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.settings-lifetime.test.tsx
@@ -0,0 +1,292 @@
+// @vitest-environment happy-dom
+
+import { act, cleanup, render } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { ITerminalOptions } from '@xterm/xterm'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type { TerminalPreviewConnectResult } from '../../../../shared/terminal-preview'
+import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
+import { makeCustomTerminalThemeSelection } from '../../../../shared/terminal-custom-themes'
+import { useAppStore } from '@/store'
+import { AgentTerminalPreview } from './AgentTerminalPreview'
+
+type PreviewInstance = {
+  options: ITerminalOptions
+  dispose: ReturnType<typeof vi.fn>
+  reset: ReturnType<typeof vi.fn>
+}
+
+const harness = vi.hoisted(() => ({
+  instances: new Array<PreviewInstance>(),
+  systemPrefersDark: false
+}))
+
+vi.mock('@xterm/xterm', () => ({
+  Terminal: class {
+    cols = 80
+    rows = 24
+    buffer = { active: { cursorY: 0 } }
+    options: ITerminalOptions
+    write = vi.fn((_data: string, callback?: () => void) => callback?.())
+    open = vi.fn()
+    focus = vi.fn()
+    dispose = vi.fn()
+    resize = vi.fn()
+    reset = vi.fn()
+    onData = vi.fn(() => ({ dispose: vi.fn() }))
+    constructor(options: ITerminalOptions) {
+      this.options = options
+      harness.instances.push(this)
+    }
+  }
+}))
+vi.mock('@/components/terminal-pane/terminal-user-input-signal', () => ({
+  subscribeToTerminalUserInput: () => ({ dispose: vi.fn() })
+}))
+vi.mock('@/components/terminal-pane/use-system-prefers-dark', () => ({
+  useSystemPrefersDark: () => harness.systemPrefersDark
+}))
+vi.mock('@/lib/keyboard-layout/use-effective-mac-option-as-alt', () => ({
+  useEffectiveMacOptionAsAlt: (value: string) => value
+}))
+vi.mock('./preview-grid-claim', () => ({
+  createPreviewGridClaim: () => ({ schedule: vi.fn(), dispose: vi.fn() })
+}))
+vi.mock('./preview-terminal-box-fit', () => ({
+  createPreviewBoxFit: () => ({ schedule: vi.fn() })
+}))
+vi.mock('./preview-terminal-ligatures', () => ({ syncPreviewTerminalLigatures: vi.fn() }))
+vi.mock('./preview-terminal-compatibility', () => ({
+  installPreviewTerminalCompatibility: () => vi.fn()
+}))
+vi.mock('./preview-terminal-ime-bridge', () => ({
+  installPreviewImeBridge: () => ({ claimKeyEvent: () => false, dispose: vi.fn() })
+}))
+vi.mock('./preview-terminal-key-handler', () => ({
+  installPreviewTerminalKeyHandler: () => vi.fn()
+}))
+vi.mock('@/components/terminal-pane/terminal-native-copy-gutter', () => ({
+  installTerminalNativeCopyGutterTrim: () => ({ dispose: vi.fn() })
+}))
+vi.mock('./preview-terminal-app-menu-clipboard', () => ({
+  installPreviewTerminalAppMenuClipboard: () => vi.fn()
+}))
+vi.mock('./preview-terminal-right-click-paste', () => ({
+  installPreviewTerminalRightClickPaste: () => vi.fn()
+}))
+
+const initial = useAppStore.getInitialState()
+const connect = vi.fn<Window['api']['terminalPreview']['connect']>()
+const unsubscribe = vi.fn(async () => {})
+const offData = vi.fn()
+const onData = vi.fn((listener: Parameters<Window['api']['terminalPreview']['onData']>[0]) => {
+  emitData = listener
+  return offData
+})
+const connection: TerminalPreviewConnectResult = {
+  snapshot: { data: 'agent prompt', cols: 80, rows: 24, seq: 1 },
+  replay: []
+}
+let settings: GlobalSettings
+let originalApi: PropertyDescriptor | undefined
+let emitData: Parameters<Window['api']['terminalPreview']['onData']>[0] | undefined
+
+async function updateSettings(updates: Partial<GlobalSettings>): Promise<void> {
+  await act(async () => useAppStore.getState().updateSettings(updates))
+}
+
+function terminal(index = 0): PreviewInstance {
+  const instance = harness.instances[index]
+  if (!instance) {
+    throw new Error(`Missing terminal ${index}`)
+  }
+  return instance
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  harness.instances.length = 0
+  harness.systemPrefersDark = false
+  emitData = undefined
+  settings = createGlobalSettingsFixture({ theme: 'dark', activeRuntimeEnvironmentId: null })
+  connect.mockReset().mockResolvedValue(connection)
+  originalApi = Object.getOwnPropertyDescriptor(window, 'api')
+  Object.defineProperty(window, 'api', {
+    configurable: true,
+    value: {
+      settings: {
+        set: async (updates: Partial<GlobalSettings>) => {
+          settings = structuredClone({ ...settings, ...updates })
+          return settings
+        }
+      },
+      terminalPreview: {
+        connect,
+        unsubscribe,
+        onData
+      }
+    }
+  })
+  useAppStore.setState({ ...initial, settings }, true)
+})
+
+afterEach(() => {
+  cleanup()
+  for (const instance of harness.instances) {
+    expect(instance.dispose).toHaveBeenCalledOnce()
+  }
+  expect(offData).toHaveBeenCalledTimes(onData.mock.calls.length)
+  useAppStore.setState(initial, true)
+  if (originalApi) {
+    Object.defineProperty(window, 'api', originalApi)
+  } else {
+    Reflect.deleteProperty(window, 'api')
+  }
+})
+
+describe('preview terminal settings lifetime', () => {
+  it('keeps one preview connection across ten unrelated settings snapshots', async () => {
+    render(<AgentTerminalPreview ptyId="pty-1" />)
+    await act(async () => {})
+    const theme = terminal().options.theme
+    for (let index = 1; index <= 10; index += 1) {
+      await updateSettings({ editorAutoSaveDelayMs: 1000 + index })
+    }
+    expect(connect).toHaveBeenCalledExactlyOnceWith('pty-1', { scrollbackRows: 24 })
+    expect(harness.instances).toHaveLength(1)
+    expect(terminal().options.theme).toBe(theme)
+    expect(unsubscribe).not.toHaveBeenCalled()
+  })
+
+  it('updates cursor options on the existing terminal', async () => {
+    render(<AgentTerminalPreview ptyId="pty-1" />)
+    await act(async () => {})
+    await updateSettings({
+      terminalCursorStyle: 'bar',
+      terminalCursorBlink: false
+    })
+    expect(connect).toHaveBeenCalledOnce()
+    expect(terminal().options).toMatchObject({
+      cursorStyle: 'bar',
+      cursorBlink: false
+    })
+  })
+
+  it.each([
+    { terminalThemeDark: 'Builtin Tango Light' },
+    { terminalColorOverrides: { background: '#123456' } },
+    { terminalBackgroundOpacity: 0.5 },
+    { terminalCursorOpacity: 0.5 },
+    { terminalMinimumContrastRatio: 7 }
+  ] satisfies Partial<GlobalSettings>[])(
+    'replaces the terminal when theme or contrast changes: %o',
+    async (updates) => {
+      render(<AgentTerminalPreview ptyId="pty-1" />)
+      await act(async () => {})
+      await updateSettings(updates)
+      expect(connect).toHaveBeenCalledTimes(2)
+      expect(unsubscribe).toHaveBeenCalledExactlyOnceWith('pty-1')
+      expect(terminal().dispose).toHaveBeenCalledOnce()
+      expect(harness.instances).toHaveLength(2)
+      if ('terminalMinimumContrastRatio' in updates) {
+        expect(terminal(1).options.minimumContrastRatio).toBe(7)
+      } else {
+        expect(terminal(1).options.theme).not.toEqual(terminal().options.theme)
+      }
+    }
+  )
+
+  it('keeps a cloned imported theme but reconnects when its selected colors change', async () => {
+    const custom = {
+      id: 'manual:preview',
+      name: 'Preview',
+      source: 'manual' as const,
+      mode: 'dark' as const,
+      terminal: { background: '#123456', foreground: '#eeeeee', red: '#ff0000' },
+      importedAt: '2026-09-25'
+    }
+    await updateSettings({
+      terminalCustomThemes: [custom],
+      terminalThemeDark: makeCustomTerminalThemeSelection(custom.id)
+    })
+    render(<AgentTerminalPreview ptyId="pty-1" />)
+    await act(async () => {})
+    expect(terminal().options.theme?.background).toBe('#123456')
+    await updateSettings({ editorAutoSaveDelayMs: 1234 })
+    expect(connect).toHaveBeenCalledOnce()
+    await updateSettings({
+      terminalCustomThemes: [{ ...custom, terminal: { ...custom.terminal, background: '#654321' } }]
+    })
+    expect(connect).toHaveBeenCalledTimes(2)
+    expect(terminal(1).options.theme?.background).toBe('#654321')
+  })
+
+  it('reconnects when the effective OS theme changes', async () => {
+    await updateSettings({ theme: 'system' })
+    const view = render(<AgentTerminalPreview ptyId="pty-1" />)
+    await act(async () => {})
+    harness.systemPrefersDark = true
+    view.rerender(<AgentTerminalPreview ptyId="pty-1" />)
+    await act(async () => {})
+    expect(connect).toHaveBeenCalledTimes(2)
+    expect(terminal(1).options.theme).not.toEqual(terminal().options.theme)
+  })
+
+  it('uses current live options when an unrelated update arrives during connect', async () => {
+    const gate = Promise.withResolvers<TerminalPreviewConnectResult>()
+    connect.mockReturnValueOnce(gate.promise)
+    render(<AgentTerminalPreview ptyId="pty-1" />)
+    await updateSettings({ terminalCursorStyle: 'bar' })
+    expect(connect).toHaveBeenCalledOnce()
+    await act(async () => gate.resolve(connection))
+    expect(harness.instances).toHaveLength(1)
+    expect(terminal().options.cursorStyle).toBe('bar')
+  })
+
+  it('ignores an old pending connection after a relevant theme change', async () => {
+    const gate = Promise.withResolvers<TerminalPreviewConnectResult>()
+    connect.mockReturnValueOnce(gate.promise)
+    render(<AgentTerminalPreview ptyId="pty-1" />)
+    await updateSettings({ terminalMinimumContrastRatio: 7 })
+    expect(connect).toHaveBeenCalledTimes(2)
+    expect(harness.instances).toHaveLength(1)
+    await act(async () => gate.resolve(connection))
+    expect(harness.instances).toHaveLength(1)
+    expect(terminal().options.minimumContrastRatio).toBe(7)
+  })
+
+  it('does not install a terminal after unmounting a pending connection', async () => {
+    const gate = Promise.withResolvers<TerminalPreviewConnectResult>()
+    connect.mockReturnValueOnce(gate.promise)
+    const view = render(<AgentTerminalPreview ptyId="ssh:host@@pty-1" />)
+    await updateSettings({ editorAutoSaveDelayMs: 1234 })
+    view.unmount()
+    await act(async () => gate.resolve(connection))
+    expect(harness.instances).toHaveLength(0)
+    expect(connect).toHaveBeenCalledOnce()
+    expect(unsubscribe).toHaveBeenCalledExactlyOnceWith('ssh:host@@pty-1')
+  })
+
+  it('keeps a hidden mounted preview connected through unrelated settings updates', async () => {
+    render(
+      <div hidden>
+        <AgentTerminalPreview ptyId="pty-1" />
+      </div>
+    )
+    await act(async () => {})
+    await updateSettings({ editorAutoSaveDelayMs: 1234 })
+    expect(connect).toHaveBeenCalledOnce()
+    expect(unsubscribe).not.toHaveBeenCalled()
+  })
+
+  it('still resyncs the same terminal after unrelated settings updates', async () => {
+    render(<AgentTerminalPreview ptyId="pty-1" />)
+    await act(async () => {})
+    await updateSettings({ editorAutoSaveDelayMs: 1234 })
+    await act(async () => emitData?.({ type: 'resync', ptyId: 'pty-1' }))
+    expect(connect).toHaveBeenCalledTimes(2)
+    expect(harness.instances).toHaveLength(1)
+    expect(terminal().reset).toHaveBeenCalledOnce()
+    expect(unsubscribe).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx
index 4a63a2895515..d31f7293e76c 100644
--- a/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx
+++ b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx
@@ -80,6 +80,7 @@ vi.mock('@xterm/xterm', () => ({
     scrollToBottom = vi.fn()
     selectAll = vi.fn()
     getSelection = vi.fn(() => this.selectionText)
+    hasSelection = vi.fn(() => this.selectionText !== '')
     attachCustomKeyEventHandler = vi.fn((handler: (event: KeyboardEvent) => boolean) => {
       this.customKeyHandler = handler
     })
@@ -213,7 +214,8 @@ describe('AgentTerminalPreview', () => {
     expect(input).toHaveBeenCalledTimes(1)
     expect(input).toHaveBeenCalledWith('pty-1', 'k')
 
-    act(() => terminal.writeCallbacks.shift()?.())
+    // Why drain all: the connection's kitty restore write queues ahead of the live chunk.
+    act(() => terminal.writeCallbacks.splice(0).forEach((callback) => callback()))
     expect(ack).toHaveBeenCalledWith('pty-1', 4)
   })
 
@@ -271,6 +273,11 @@ describe('AgentTerminalPreview', () => {
     render(<AgentTerminalPreview ptyId="pty-1" />)
     await waitFor(() => expect(imeHarness.forwarders).toHaveLength(1))
     await waitFor(() => expect(imeHarness.forwarders[0]!.getKittyKeyboardFlags()).toBe(8))
+    // The popout xterm gets the same flags, so its encoder agrees with the mirror.
+    expect(terminalHarness.instances[0]!.write).toHaveBeenCalledWith(
+      '\x1b[<99u\x1b[=8u',
+      expect.any(Function)
+    )
 
     // Live output keeps advancing the same mirror the forwarder reads.
     act(() => {
@@ -358,6 +365,37 @@ describe('AgentTerminalPreview', () => {
     expect(writeTerminalClipboardText).not.toHaveBeenCalled()
   })
 
+  it('hands unselected Cmd+C to a kitty app and copies a selection instead', async () => {
+    platformState.value = 'darwin'
+    render(<AgentTerminalPreview ptyId="pty-1" />)
+    await waitFor(() => expect(terminalHarness.instances).toHaveLength(1))
+    const terminal = terminalHarness.instances[0]!
+    await waitFor(() => expect(terminal.customKeyHandler).not.toBeNull())
+    const cmdC = (type: string): KeyboardEvent =>
+      new KeyboardEvent(type, { key: 'c', code: 'KeyC', metaKey: true, cancelable: true })
+
+    // A plain shell's unselected Cmd+C sends nothing.
+    expect(terminal.customKeyHandler!(cmdC('keydown'))).toBe(false)
+    expect(terminal.customKeyHandler!(cmdC('keyup'))).toBe(false)
+
+    act(() => {
+      emitData?.({ type: 'data', ptyId: 'pty-1', data: '\x1b[>1u', bytes: 5 })
+    })
+    expect(terminal.customKeyHandler!(cmdC('keydown'))).toBe(true)
+    expect(terminal.customKeyHandler!(cmdC('keyup'))).toBe(true)
+
+    // A highlight of blank cells copies no text but is still Orca's selection, as in the pane.
+    Object.assign(terminal, { hasSelection: () => true })
+    expect(terminal.customKeyHandler!(cmdC('keydown'))).toBe(false)
+    expect(terminal.customKeyHandler!(cmdC('keyup'))).toBe(false)
+    expect(writeTerminalClipboardText).not.toHaveBeenCalled()
+
+    terminal.selectionText = 'selected text'
+    expect(terminal.customKeyHandler!(cmdC('keydown'))).toBe(false)
+    expect(terminal.customKeyHandler!(cmdC('keyup'))).toBe(false)
+    expect(writeTerminalClipboardText).toHaveBeenCalledWith('selected text')
+  })
+
   it('selects all terminal text on Cmd+A and blocks xterm handling', async () => {
     platformState.value = 'darwin'
     render(<AgentTerminalPreview ptyId="pty-1" />)
diff --git a/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.tsx b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.tsx
index f0360d2b795b..875f13a96f4e 100644
--- a/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.tsx
+++ b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.tsx
@@ -1,5 +1,6 @@
 import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
-import { Terminal } from '@xterm/xterm'
+import { Terminal, type ITheme } from '@xterm/xterm'
+import { useShallow } from 'zustand/react/shallow'
 import '@xterm/xterm/css/xterm.css'
 import { getShortcutPlatform } from '@/lib/shortcut-platform'
 import { subscribeToTerminalUserInput } from '@/components/terminal-pane/terminal-user-input-signal'
@@ -10,7 +11,8 @@ import { replayPreviewConnectionSnapshot } from './preview-terminal-snapshot-rep
 import { useEffectiveMacOptionAsAlt } from '@/lib/keyboard-layout/use-effective-mac-option-as-alt'
 import {
   buildPreviewAppearanceOptions,
-  buildPreviewTerminalOptions
+  buildPreviewTerminalOptions,
+  previewAdvertisesKittyKeyboard
 } from './preview-terminal-options'
 import { syncPreviewTerminalLigatures } from './preview-terminal-ligatures'
 import { installPreviewTerminalCompatibility } from './preview-terminal-compatibility'
@@ -71,7 +73,7 @@ export function AgentTerminalPreview({
   const settingsRef = useRef(settings)
   const macOptionAsAltRef = useRef(macOptionAsAlt)
   const terminalInputRef = useRef(terminalInput)
-  const { terminalTheme, terminalMode } = useMemo(() => {
+  const { terminalTheme: composedTheme, terminalMode } = useMemo(() => {
     if (!settings) {
       return { terminalTheme: null, terminalMode: 'dark' as const }
     }
@@ -82,6 +84,10 @@ export function AgentTerminalPreview({
     )
     return { terminalTheme: theme, terminalMode: appearance.mode }
   }, [settings, systemPrefersDark])
+  // Settings arrive as cloned snapshots; compare theme values before reconnecting.
+  const retainTheme = useShallow((theme: ITheme | null) => theme)
+  const terminalTheme = retainTheme(composedTheme)
+  const terminalMinimumContrastRatio = settings?.terminalMinimumContrastRatio
   // A null snapshot means no serializer knows this pty (it died or was never
   // spawned this session) — say so instead of painting a silent blank terminal.
   const [ptyGone, setPtyGone] = useState(false)
@@ -96,6 +102,7 @@ export function AgentTerminalPreview({
     terminalInputRef.current = terminalInput
   }, [settings, macOptionAsAlt, terminalInput])
 
+  // Font changes retain the replay-driven fit, grid claim and input-owner reset.
   useEffect(() => {
     setPtyGone(false)
     const container = containerRef.current
@@ -110,9 +117,13 @@ export function AgentTerminalPreview({
     let disposeKeyHandler: (() => void) | null = null
     let disposeNativeCopyGutterTrim: (() => void) | null = null
     let disposeTerminalCompatibility: (() => void) | null = null
+    // Why one read: the xterm's advertisement and its mirror must never disagree.
+    const mountTerminalInput = terminalInputRef.current
     // Why: mirrors the pane's tracker — the policy needs the flags the TUI
     // negotiated, and this preview parses the same output stream the pane does.
-    const kittyKeyboardModes = new TerminalKittyKeyboardModeTracker()
+    const kittyKeyboardModes = new TerminalKittyKeyboardModeTracker({
+      kittyKeyboard: previewAdvertisesKittyKeyboard(mountTerminalInput)
+    })
     let refreshInFlight = false
     let refreshAgain = false
     let retryTimer: ReturnType<typeof setTimeout> | null = null
@@ -217,22 +228,6 @@ export function AgentTerminalPreview({
       })
     }
 
-    const installNativeCopyGutterTrim = (): void => {
-      if (!terminal) {
-        return
-      }
-      disposeNativeCopyGutterTrim = installTerminalNativeCopyGutterTrim(terminal).dispose
-    }
-
-    const installTerminalCompatibility = (): void => {
-      if (!terminal) {
-        return
-      }
-      disposeTerminalCompatibility = installPreviewTerminalCompatibility(terminal, {
-        getSettings: () => settingsRef.current
-      })
-    }
-
     const installInputRouting = (): void => {
       if (!terminal) {
         return
@@ -264,7 +259,7 @@ export function AgentTerminalPreview({
         terminal = new Terminal(
           buildPreviewTerminalOptions({
             settings: settingsRef.current,
-            terminalInput: terminalInputRef.current,
+            terminalInput: mountTerminalInput,
             macOptionIsMeta: macOptionAsAltRef.current === 'true',
             theme: terminalTheme,
             themeMode: terminalMode,
@@ -281,8 +276,10 @@ export function AgentTerminalPreview({
           return
         }
         terminalRef.current = terminal
-        installTerminalCompatibility()
-        installNativeCopyGutterTrim()
+        disposeTerminalCompatibility = installPreviewTerminalCompatibility(terminal, {
+          getSettings: () => settingsRef.current
+        })
+        disposeNativeCopyGutterTrim = installTerminalNativeCopyGutterTrim(terminal).dispose
         installInputRouting()
         installImeNativeTextBridge()
         installKeyHandler()
@@ -412,7 +409,18 @@ export function AgentTerminalPreview({
       terminal?.dispose()
       terminalRef.current = null
     }
-  }, [ptyId, terminalTheme, terminalMode])
+  }, [
+    ptyId,
+    terminalTheme,
+    terminalMode,
+    terminalMinimumContrastRatio,
+    settings?.terminalFontSize,
+    settings?.terminalFontFamily,
+    settings?.terminalFontWeight,
+    settings?.terminalFontWeightBold,
+    settings?.terminalLineHeight,
+    settings?.terminalLigatures
+  ])
 
   // Why: appearance settings must land on the open terminal, and the OS input
   // source can flip Option-as-Alt with no settings change at all. A remount
diff --git a/src/renderer/src/components/dashboard-popout/preview-terminal-key-handler.ts b/src/renderer/src/components/dashboard-popout/preview-terminal-key-handler.ts
index 1b263144a537..faaeb0048dca 100644
--- a/src/renderer/src/components/dashboard-popout/preview-terminal-key-handler.ts
+++ b/src/renderer/src/components/dashboard-popout/preview-terminal-key-handler.ts
@@ -14,6 +14,7 @@ import {
   type PreviewShortcutContext
 } from './preview-terminal-shortcuts'
 import { readTerminalClipboardSelection } from '@/components/terminal-pane/terminal-clipboard-selection-text'
+import { isAppOwnedCopyChord } from '@/components/terminal-pane/xterm-bypass-policy'
 
 /**
  * Installs the preview terminal's ONE custom key handler (xterm allows a single
@@ -110,6 +111,15 @@ export function installPreviewTerminalKeyHandler(args: {
     nativeOnlyShortcutTracker.prepareKeyDown(event)
     const keybindings = useAppStore.getState().keybindings
     if (keybindingMatchesAction('terminal.copySelection', event, platform, keybindings)) {
+      if (
+        isAppOwnedCopyChord(event, {
+          isMac: platform === 'darwin',
+          hasSelection: terminal.hasSelection(),
+          kittyKeyboardFlags: args.getShortcutContext().getKittyKeyboardFlags()
+        })
+      ) {
+        return true
+      }
       const selection = readTerminalClipboardSelection(terminal)
       if (
         !selection &&
diff --git a/src/renderer/src/components/dashboard-popout/preview-terminal-options.ts b/src/renderer/src/components/dashboard-popout/preview-terminal-options.ts
index c27f085029db..3bf324e385da 100644
--- a/src/renderer/src/components/dashboard-popout/preview-terminal-options.ts
+++ b/src/renderer/src/components/dashboard-popout/preview-terminal-options.ts
@@ -45,6 +45,13 @@ export function buildPreviewAppearanceOptions(
   }
 }
 
+// Why: local ConPTY CLIs read the advertisement but can't decode CSI-u (#2434); mirror the pane's withhold.
+export function previewAdvertisesKittyKeyboard(
+  terminalInput: DashboardCardTerminalInput | null
+): boolean {
+  return !terminalInput || terminalInput.kittyKeyboardAdvertised
+}
+
 /**
  * Full option set for the preview's xterm: the same defaults, user appearance,
  * and host compatibility flags a pane resolves, so the agent's TUI negotiates
@@ -65,10 +72,9 @@ export function buildPreviewTerminalOptions(args: {
     ...(args.terminalInput?.localWindowsConpty
       ? buildLocalConptyTerminalOptions(args.terminalInput.osRelease)
       : {}),
-    // Why: local ConPTY CLIs read the advertisement but can't decode CSI-u (#2434); mirror the pane's withhold.
-    ...(args.terminalInput && !args.terminalInput.kittyKeyboardAdvertised
-      ? { vtExtensions: { kittyKeyboard: false } }
-      : {})
+    ...(previewAdvertisesKittyKeyboard(args.terminalInput)
+      ? {}
+      : { vtExtensions: { kittyKeyboard: false } })
   }
   return {
     ...buildDefaultTerminalOptions(),
diff --git a/src/renderer/src/components/dashboard-popout/preview-terminal-snapshot-replay.test.ts b/src/renderer/src/components/dashboard-popout/preview-terminal-snapshot-replay.test.ts
index 3e288626259d..f3b3ed4f800c 100644
--- a/src/renderer/src/components/dashboard-popout/preview-terminal-snapshot-replay.test.ts
+++ b/src/renderer/src/components/dashboard-popout/preview-terminal-snapshot-replay.test.ts
@@ -110,7 +110,7 @@ describe('replayPreviewConnectionSnapshot', () => {
     expect(modes.snapshotFlags).toBe(0)
   })
 
-  it('writes scrollback, frame, escape tail, then replay, in that order', () => {
+  it('writes scrollback, frame, kitty restore, escape tail, then replay, in that order', () => {
     const { written } = apply(
       {
         scrollbackAnsi: 'history',
@@ -119,6 +119,6 @@ describe('replayPreviewConnectionSnapshot', () => {
       },
       [{ data: 'tail', mode: 'live' }]
     )
-    expect(written).toEqual(['history', 'frame', '\x1b[', 'tail'])
+    expect(written).toEqual(['history', 'frame', '\x1b[<99u', '\x1b[', 'tail'])
   })
 })
diff --git a/src/renderer/src/components/dashboard-popout/preview-terminal-snapshot-replay.ts b/src/renderer/src/components/dashboard-popout/preview-terminal-snapshot-replay.ts
index 43d4333cc172..9e684353eb73 100644
--- a/src/renderer/src/components/dashboard-popout/preview-terminal-snapshot-replay.ts
+++ b/src/renderer/src/components/dashboard-popout/preview-terminal-snapshot-replay.ts
@@ -1,5 +1,6 @@
 import type { TerminalKittyKeyboardModeTracker } from '../../../../shared/terminal-kitty-keyboard-mode-tracker'
 import { parseTerminalKittyKeyboardFlags } from '../../../../shared/terminal-kitty-keyboard-flags'
+import { buildKittyKeyboardRestore } from '../../../../shared/terminal-mode-reset-profiles'
 import type {
   TerminalPreviewReplayChunk,
   TerminalPreviewSnapshot
@@ -7,7 +8,7 @@ import type {
 
 /**
  * Apply snapshot + buffered replay, restoring proven kitty flags after the
- * snapshot scan (snapshot ANSI omits kitty pushes). Synchronous so no browser
+ * snapshot bytes (snapshot ANSI omits kitty pushes). Synchronous so no browser
  * event observes the temporary reset.
  */
 export function replayPreviewConnectionSnapshot(args: {
@@ -29,12 +30,11 @@ export function replayPreviewConnectionSnapshot(args: {
   if (snapshot.data) {
     args.write(snapshot.data, false)
   }
+  // Why as bytes: the popout xterm must parse the same restore its mirror scans.
+  args.write(buildKittyKeyboardRestore(provenFlags), false)
   if (snapshot.pendingEscapeTailAnsi) {
     args.write(snapshot.pendingEscapeTailAnsi, false)
   }
-  if (provenFlags !== undefined) {
-    kittyKeyboardModes.restoreSnapshotFlags(provenFlags)
-  }
   for (const chunk of args.replay) {
     args.write(chunk.data, chunk.mode === 'live')
   }
diff --git a/src/renderer/src/components/dashboard/DashboardAgentChildDisclosure.test.tsx b/src/renderer/src/components/dashboard/DashboardAgentChildDisclosure.test.tsx
new file mode 100644
index 000000000000..6d0994eb7604
--- /dev/null
+++ b/src/renderer/src/components/dashboard/DashboardAgentChildDisclosure.test.tsx
@@ -0,0 +1,157 @@
+/** @vitest-environment happy-dom */
+import { fireEvent, render, screen, cleanup } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { CompactAgentRow } from '../sidebar/worktree-card-compact-agent-row'
+import { TooltipProvider } from '../ui/tooltip'
+import DashboardAgentRow from './DashboardAgentRow'
+import type { DashboardAgentRow as AgentRow } from './useDashboardData'
+import { DashboardAgentChildDisclosure } from './DashboardAgentChildDisclosure'
+
+vi.mock('./use-agent-row-conversation-name', () => ({ useAgentRowConversationName: () => null }))
+vi.mock('../sidebar/CacheTimer', () => ({
+  default: () => null,
+  usePromptCacheCountdownForPane: () => null
+}))
+
+afterEach(cleanup)
+
+const agent: AgentRow = {
+  paneKey: 'tab:leaf',
+  agentType: 'claude',
+  state: 'working',
+  startedAt: 60000,
+  entry: {
+    paneKey: 'tab:leaf',
+    state: 'working',
+    prompt: 'Review the change',
+    updatedAt: 60000,
+    stateStartedAt: 60000,
+    stateHistory: []
+  },
+  tab: {
+    id: 'tab',
+    ptyId: null,
+    worktreeId: 'workspace',
+    title: 'Agent',
+    customTitle: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 1
+  }
+}
+
+describe('agent child disclosure', () => {
+  it('toggles children without activating the surrounding agent or workspace', () => {
+    const activate = vi.fn()
+    const toggle = vi.fn()
+    const pointerDown = vi.fn()
+    const keyDown = vi.fn()
+    render(
+      <div onClick={activate} onPointerDown={pointerDown} onKeyDown={keyDown}>
+        <DashboardAgentChildDisclosure
+          childAgentCount={2}
+          childAgentsExpanded={false}
+          onToggleChildAgents={toggle}
+          timestamp="5m"
+        />
+      </div>
+    )
+    const button = screen.getByRole('button', { name: 'Show 2 child agents' })
+    fireEvent.pointerDown(button)
+    fireEvent.keyDown(button, { key: 'Enter' })
+    fireEvent.keyDown(button, { key: ' ' })
+    fireEvent.click(button)
+    expect(toggle).toHaveBeenCalledTimes(1)
+    expect(activate).not.toHaveBeenCalled()
+    expect(pointerDown).not.toHaveBeenCalled()
+    expect(keyDown).not.toHaveBeenCalled()
+  })
+
+  it('updates the accessible action and retains the timestamp when expanded', () => {
+    const toggle = vi.fn()
+    const { rerender } = render(
+      <DashboardAgentChildDisclosure
+        childAgentCount={1}
+        childAgentsExpanded={false}
+        onToggleChildAgents={toggle}
+        timestamp="5m"
+      />
+    )
+    expect(
+      screen.getByRole('button', { name: 'Show 1 child agent' }).getAttribute('aria-expanded')
+    ).toBe('false')
+    rerender(
+      <DashboardAgentChildDisclosure
+        childAgentCount={1}
+        childAgentsExpanded
+        onToggleChildAgents={toggle}
+        timestamp="5m"
+      />
+    )
+    expect(
+      screen.getByRole('button', { name: 'Hide 1 child agent' }).getAttribute('aria-expanded')
+    ).toBe('true')
+    expect(screen.getByText('5m')).toBeTruthy()
+  })
+
+  it('does not offer a disclosure without children or a toggle action', () => {
+    const { rerender } = render(
+      <DashboardAgentChildDisclosure
+        childAgentCount={0}
+        childAgentsExpanded={false}
+        onToggleChildAgents={vi.fn()}
+      />
+    )
+    expect(screen.queryByRole('button')).toBeNull()
+    rerender(<DashboardAgentChildDisclosure childAgentCount={2} childAgentsExpanded={false} />)
+    expect(screen.queryByRole('button')).toBeNull()
+  })
+})
+
+describe.each(['compact', 'full'] as const)('%s row disclosure actions', (mode) => {
+  it.each([undefined, 'eligible'] as const)(
+    'keeps child expansion separate from row actions in %s send mode',
+    (sendTargetStatus) => {
+      const onActivate = vi.fn(),
+        onSendTargetClick = vi.fn(),
+        onDismiss = vi.fn(),
+        onToggleChildAgents = vi.fn()
+      const props = {
+        agent,
+        now: 120000,
+        childAgentCount: 2,
+        childAgentsExpanded: false,
+        onToggleChildAgents,
+        onActivate,
+        sendTargetStatus,
+        onSendTargetClick
+      }
+      render(
+        <TooltipProvider>
+          {mode === 'compact' ? (
+            <CompactAgentRow {...props} />
+          ) : (
+            <DashboardAgentRow {...props} onDismiss={onDismiss} hideExpand />
+          )}
+        </TooltipProvider>
+      )
+      fireEvent.click(screen.getByRole('button', { name: 'Show 2 child agents' }))
+      expect(onToggleChildAgents).toHaveBeenCalledTimes(1)
+      expect(onActivate).not.toHaveBeenCalled()
+      expect(onSendTargetClick).not.toHaveBeenCalled()
+      expect(onDismiss).not.toHaveBeenCalled()
+      fireEvent.click(screen.getByText('Review the change'))
+      if (sendTargetStatus) {
+        expect(onSendTargetClick).toHaveBeenCalledWith(agent.paneKey)
+        expect(onActivate).not.toHaveBeenCalled()
+      } else {
+        expect(onActivate).toHaveBeenCalledWith(agent.tab.id, agent.paneKey)
+        if (mode === 'full') {
+          fireEvent.click(screen.getByRole('button', { name: 'Dismiss agent' }))
+          expect(onDismiss).toHaveBeenCalledWith(agent.paneKey)
+          expect(onActivate).toHaveBeenCalledTimes(1)
+        }
+      }
+    }
+  )
+})
diff --git a/src/renderer/src/components/dashboard/DashboardAgentChildDisclosure.tsx b/src/renderer/src/components/dashboard/DashboardAgentChildDisclosure.tsx
index fb8e45b42168..4e225a287dda 100644
--- a/src/renderer/src/components/dashboard/DashboardAgentChildDisclosure.tsx
+++ b/src/renderer/src/components/dashboard/DashboardAgentChildDisclosure.tsx
@@ -1,18 +1,21 @@
 import React, { useCallback } from 'react'
-import { ChevronRight } from 'lucide-react'
+import { ChevronDown } from 'lucide-react'
 import { cn } from '@/lib/utils'
+import { Button } from '@/components/ui/button'
 import { translate } from '@/i18n/i18n'
 
 type Props = {
   childAgentCount?: number
   childAgentsExpanded: boolean
   onToggleChildAgents?: () => void
+  timestamp?: React.ReactNode
 }
 
 export function DashboardAgentChildDisclosure({
   childAgentCount,
   childAgentsExpanded,
-  onToggleChildAgents
+  onToggleChildAgents,
+  timestamp
 }: Props) {
   const hasChildDisclosure =
     typeof childAgentCount === 'number' &&
@@ -40,29 +43,46 @@ export function DashboardAgentChildDisclosure({
   }
 
   return (
-    <button
-      type="button"
-      onClick={handleToggleChildren}
-      onMouseDown={stopMouseDown}
-      onKeyDown={stopKeyDown}
-      className="-ml-0.5 inline-flex size-4 shrink-0 items-center justify-center rounded-sm border border-sidebar-border/80 bg-sidebar text-foreground/80 shadow-xs hover:bg-sidebar-accent hover:text-foreground"
-      aria-label={translate(
-        'auto.components.dashboard.DashboardAgentChildDisclosure.1b57ce9fa4',
-        '{{value0}} {{value1}} child {{value2}}',
-        {
-          value0: childAgentsExpanded ? 'Hide' : 'Show',
-          value1: childAgentCount,
-          value2: childAgentCount === 1 ? 'agent' : 'agents'
-        }
-      )}
-      aria-expanded={childAgentsExpanded}
+    <span
+      className="agent-child-disclosure relative inline-grid h-5 min-w-5 shrink-0 items-center justify-items-end"
+      data-expanded={childAgentsExpanded}
     >
-      <ChevronRight
-        className={cn(
-          'size-3 transition-transform duration-150',
-          childAgentsExpanded && 'rotate-90'
+      <span
+        className="agent-child-disclosure-time col-start-1 row-start-1 pointer-events-none"
+        aria-hidden
+      >
+        {timestamp}
+      </span>
+      {/* Why: align the 12px icon with adjacent row icons while keeping its 24px hit target. */}
+      <Button
+        variant="ghost"
+        size="icon-xs"
+        type="button"
+        onClick={handleToggleChildren}
+        onMouseDown={stopMouseDown}
+        onPointerDown={(event) => event.stopPropagation()}
+        onKeyDown={stopKeyDown}
+        data-agent-child-disclosure-button=""
+        className="col-start-1 row-start-1 -mr-1.5"
+        aria-label={translate(
+          'auto.components.dashboard.DashboardAgentChildDisclosure.1b57ce9fa4',
+          '{{value0}} {{value1}} child {{value2}}',
+          {
+            value0: childAgentsExpanded ? 'Hide' : 'Show',
+            value1: childAgentCount,
+            value2: childAgentCount === 1 ? 'agent' : 'agents'
+          }
         )}
-      />
-    </button>
+        aria-expanded={childAgentsExpanded}
+      >
+        <ChevronDown
+          className={cn(
+            'size-3 transition-transform duration-150',
+            childAgentsExpanded && 'rotate-180'
+          )}
+          aria-hidden
+        />
+      </Button>
+    </span>
   )
 }
diff --git a/src/renderer/src/components/dashboard/DashboardAgentRow.tsx b/src/renderer/src/components/dashboard/DashboardAgentRow.tsx
index ea48b8c06737..aba128972b5d 100644
--- a/src/renderer/src/components/dashboard/DashboardAgentRow.tsx
+++ b/src/renderer/src/components/dashboard/DashboardAgentRow.tsx
@@ -4,18 +4,22 @@ import { AgentStateDot, agentStateLabel, type AgentDotState } from '@/components
 import { AgentIcon } from '@/lib/agent-catalog'
 import { agentTypeToIconAgent, formatAgentTypeLabel } from '@/lib/agent-status'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { DashboardAgentChildDisclosure } from './DashboardAgentChildDisclosure'
 import { DashboardAgentRowMessage } from './DashboardAgentRowMessage'
 import { DashboardAgentRowTrailingControls } from './DashboardAgentRowTrailingControls'
 import { DashboardAgentRowToolStep } from './DashboardAgentRowToolStep'
 import { showsAgentToolPreview } from '@/lib/agent-row-tool-preview'
 import { agentNoUpdateLabel, formatCompactDuration } from '@/lib/agent-row-decay-state'
-import { agentRowDotState as asDotState } from '@/lib/agent-row-dot-state'
+import { agentRowDisplayDotState, agentRowDotState as asDotState } from '@/lib/agent-row-dot-state'
+import { agentVerdictDisplayMark } from '../../../../shared/agent-main-agent-verdict'
 import type { DashboardAgentRow as DashboardAgentRowData } from './useDashboardData'
 import { getAgentRowPrimaryText } from '@/lib/agent-row-primary-text'
 import { useAgentRowConversationName } from './use-agent-row-conversation-name'
 import { lastEnteredDoneAt } from './agent-finished-timestamp'
 import { SessionHandoffLineageBadge } from '@/components/agent-session-continuation/fork-session-handoff/SessionHandoffLineageBadge'
+import {
+  agentChildRowMessageLine,
+  agentChildRowNoUpdateLabel
+} from '@/components/agent-child-row-text'
 
 function formatTimeAgo(ts: number, now: number): string {
   const delta = now - ts
@@ -25,19 +29,24 @@ function formatTimeAgo(ts: number, now: number): string {
   return `${formatCompactDuration(delta)} ago`
 }
 
+// A child row's silence is the model's, on the clock its compact row and the strip read.
+function rowNoUpdateLabel(agent: DashboardAgentRowData, now: number): string {
+  return agent.childRow
+    ? agentChildRowNoUpdateLabel(agent.childRow, now)
+    : agentNoUpdateLabel(agent.entry, now)
+}
+
 function stateDotTooltipLabel(
   agent: DashboardAgentRowData,
   dotState: AgentDotState,
   now: number
 ): string {
-  if (agent.entry.interrupted === true) {
+  if (dotState === 'interrupted') {
     return 'Interrupted by user'
   }
   // Why: report the observation, not a verdict on the agent — the elapsed gap is what
   // lets the user apply context Orca has no way to know (a long build, a slow download).
-  return dotState === 'unverifiable'
-    ? agentNoUpdateLabel(agent.entry, now)
-    : agentStateLabel(dotState)
+  return dotState === 'unverifiable' ? rowNoUpdateLabel(agent, now) : agentStateLabel(dotState)
 }
 
 type Props = {
@@ -56,12 +65,10 @@ type Props = {
   hideExpand?: boolean
   /** Reuse the row's hover tint to show the focused terminal pane's agent. */
   isFocusedPane?: boolean
-  // Why: inline-card orchestration rows fold children under a leading chevron.
+  // Why: inline-card orchestration rows can fold their child agents.
   childAgentCount?: number
   childAgentsExpanded?: boolean
   onToggleChildAgents?: () => void
-  // Why: a top-level chevron hangs in the card gutter so the state dot keeps the column of chevron-less rows.
-  disclosureInGutter?: boolean
   // Why: chevron indentation replaces fixed-offset lineage connector art.
   hideLineageConnectors?: boolean
   // Why: send-popover target mode makes row clicks send/no-op instead of navigating.
@@ -83,7 +90,6 @@ const DashboardAgentRow = React.memo(function DashboardAgentRow({
   childAgentCount,
   childAgentsExpanded = false,
   onToggleChildAgents,
-  disclosureInGutter = false,
   hideLineageConnectors = false,
   sendTargetStatus,
   sendTargetDisabledReason,
@@ -131,7 +137,11 @@ const DashboardAgentRow = React.memo(function DashboardAgentRow({
   const conversationName = useAgentRowConversationName(agent)
   const prompt = conversationName ?? getAgentRowPrimaryText(agent.entry)
   // Why: prompt is '' when unknown, so fall back to the state label to keep the row labeled.
-  const displayLabel = prompt || agentStateLabel(asDotState(agent.state, agent.entry.workingMode))
+  const displayLabel =
+    prompt ||
+    agentStateLabel(
+      agent.childRow?.displayState ?? asDotState(agent.state, agent.entry.workingMode)
+    )
   const model = agent.entry.model?.trim() ?? ''
   const isMonitoring = agent.state === 'working' && agent.entry.workingMode === 'monitoring'
   const isWorking = agent.state === 'working' && !isMonitoring
@@ -141,8 +151,11 @@ const DashboardAgentRow = React.memo(function DashboardAgentRow({
   const showsTool = showsAgentToolPreview(agent.state) && !isMonitoring
   const toolName = showsTool ? (agent.entry.toolName?.trim() ?? '') : ''
   const toolInput = showsTool ? (agent.entry.toolInput?.trim() ?? '') : ''
-  const lastAssistantMessage = agent.entry.lastAssistantMessage?.trim() ?? ''
-  const isInterrupted = agent.entry.interrupted === true
+  // Why: a child row's message line is the model's, so a child that ended without an outcome says so.
+  const lastAssistantMessage = agent.childRow
+    ? agentChildRowMessageLine(agent.childRow)
+    : (agent.entry.lastAssistantMessage?.trim() ?? '')
+  const isInterrupted = agentVerdictDisplayMark(agent.entry) === 'interrupted'
   const lineage = agent.lineage
   const isLineageChild = lineage?.depth === 1
   const lineageChildCount = lineage?.childCount ?? 0
@@ -153,14 +166,13 @@ const DashboardAgentRow = React.memo(function DashboardAgentRow({
           lineageChildCount === 1 ? 'agent' : 'agents'
         }`
       : [formatAgentTypeLabel(agent.agentType), model].filter(Boolean).join(' · ')
-  // Why: interrupted is a terminal outcome, so surface it in the leading state dot.
-  const dotState: AgentDotState = isInterrupted
-    ? 'interrupted'
-    : asDotState(agent.state, agent.entry.workingMode)
+  // Why: a stop or a failure is a terminal outcome, so surface it in the leading state dot; a
+  // failure does so even while subagents still run.
+  const dotState: AgentDotState = agentRowDisplayDotState(agent)
   const dotTooltipLabel = stateDotTooltipLabel(agent, dotState, now)
   // Why: the elapsed gap is the whole content of an `unverifiable` row, so it rides the
   // row's own timestamp slot rather than hiding in a hover tooltip.
-  const noUpdateLabel = dotState === 'unverifiable' ? agentNoUpdateLabel(agent.entry, now) : null
+  const noUpdateLabel = dotState === 'unverifiable' ? rowNoUpdateLabel(agent, now) : null
 
   // Why: always show the chevron so the row's right edge doesn't flicker as content grows/shrinks.
 
@@ -184,8 +196,7 @@ const DashboardAgentRow = React.memo(function DashboardAgentRow({
       onClick={handleActivate}
       className={cn(
         // Why: named group scopes the X-reveal to this row, not every row in the card.
-        'group/agent-row relative flex flex-col py-1',
-        hasChildDisclosure && disclosureInGutter ? '-ml-7' : '-ml-2',
+        'agent-disclosure-row group/agent-row relative -ml-2 flex flex-col py-1',
         isLineageChild ? 'pl-5 pr-2' : 'px-2',
         // Why: hover wash stays softer than the enclosing card's highlight.
         'cursor-pointer rounded-sm worktree-agent-row-hover',
@@ -228,11 +239,6 @@ const DashboardAgentRow = React.memo(function DashboardAgentRow({
         </span>
       ) : null}
       <div className="flex items-center gap-1.5">
-        <DashboardAgentChildDisclosure
-          childAgentCount={childAgentCount}
-          childAgentsExpanded={childAgentsExpanded}
-          onToggleChildAgents={onToggleChildAgents}
-        />
         {/* Why: state dot sits in the leading gutter so the eye can scan one column for row state. */}
         <Tooltip>
           <TooltipTrigger asChild>
@@ -288,6 +294,9 @@ const DashboardAgentRow = React.memo(function DashboardAgentRow({
         <DashboardAgentRowTrailingControls
           paneKey={agent.paneKey}
           relativeTimestamp={relativeTimestamp}
+          childAgentCount={childAgentCount}
+          childAgentsExpanded={childAgentsExpanded}
+          onToggleChildAgents={onToggleChildAgents}
           expanded={expanded}
           hideExpand={hideExpand}
           hideDismiss={agent.rowSource === 'subagent'}
diff --git a/src/renderer/src/components/dashboard/DashboardAgentRowTrailingControls.tsx b/src/renderer/src/components/dashboard/DashboardAgentRowTrailingControls.tsx
index f194abbe5086..62b6ff2589de 100644
--- a/src/renderer/src/components/dashboard/DashboardAgentRowTrailingControls.tsx
+++ b/src/renderer/src/components/dashboard/DashboardAgentRowTrailingControls.tsx
@@ -2,8 +2,12 @@ import React, { useCallback } from 'react'
 import { ChevronDown, Send, X } from 'lucide-react'
 import { translate } from '@/i18n/i18n'
 import { cn } from '@/lib/utils'
+import { DashboardAgentChildDisclosure } from './DashboardAgentChildDisclosure'
 
 type DashboardAgentRowTrailingControlsProps = {
+  childAgentCount?: number
+  childAgentsExpanded?: boolean
+  onToggleChildAgents?: () => void
   paneKey: string
   relativeTimestamp: string | null
   expanded: boolean
@@ -18,6 +22,9 @@ type DashboardAgentRowTrailingControlsProps = {
 }
 
 export function DashboardAgentRowTrailingControls({
+  childAgentCount,
+  childAgentsExpanded = false,
+  onToggleChildAgents,
   paneKey,
   relativeTimestamp,
   expanded,
@@ -64,8 +71,15 @@ export function DashboardAgentRowTrailingControls({
     [onSendTargetClick, paneKey, sendTargetStatus]
   )
 
+  const hasChildDisclosure = Boolean(childAgentCount && onToggleChildAgents)
+
   return (
-    <span className="relative ml-auto flex h-3.5 w-12 shrink-0 items-center justify-end">
+    <span
+      className={cn(
+        'relative ml-auto flex shrink-0 items-center justify-end',
+        hasChildDisclosure ? 'h-5 gap-1' : 'h-3.5 w-12'
+      )}
+    >
       {(sendTargetStatus === 'eligible' || sendTargetStatus === 'sending') && (
         <button
           type="button"
@@ -75,6 +89,7 @@ export function DashboardAgentRowTrailingControls({
           disabled={sendTargetStatus === 'sending'}
           className={cn(
             'worktree-agent-send-target-button absolute right-0 top-1/2 z-10 inline-flex h-5 -translate-y-1/2 items-center gap-1 rounded-md border px-1.5 text-[10px] font-medium leading-none transition-[background-color,border-color,color,opacity]',
+            hasChildDisclosure && 'static translate-y-0',
             sendTargetStatus === 'sending' && 'cursor-progress opacity-75'
           )}
           aria-label={translate(
@@ -90,7 +105,7 @@ export function DashboardAgentRowTrailingControls({
           <span>{translate('auto.components.dashboard.DashboardAgentRow.912e136cd9', 'Send')}</span>
         </button>
       )}
-      {!sendTargetStatus && hideDismiss && relativeTimestamp !== null && (
+      {!hasChildDisclosure && !sendTargetStatus && hideDismiss && relativeTimestamp !== null && (
         <span
           className="pointer-events-none shrink-0 text-[10px] leading-none text-muted-foreground/60"
           aria-hidden
@@ -100,7 +115,7 @@ export function DashboardAgentRowTrailingControls({
       )}
       {/* Why: timestamp and dismiss-X share one slot. On no-hover devices the X
           is visible by default, so the timestamp must yield there too. */}
-      {!sendTargetStatus && !hideDismiss && relativeTimestamp !== null && (
+      {!hasChildDisclosure && !sendTargetStatus && !hideDismiss && relativeTimestamp !== null && (
         <span className="relative grid grid-cols-1 grid-rows-1 shrink-0 items-center justify-items-end">
           <span
             className={cn(
@@ -132,7 +147,7 @@ export function DashboardAgentRowTrailingControls({
           </button>
         </span>
       )}
-      {!sendTargetStatus && !hideDismiss && relativeTimestamp === null && (
+      {!sendTargetStatus && !hideDismiss && (hasChildDisclosure || relativeTimestamp === null) && (
         <button
           type="button"
           onClick={handleDismiss}
@@ -152,6 +167,18 @@ export function DashboardAgentRowTrailingControls({
           <X className="size-3.5" />
         </button>
       )}
+      {hasChildDisclosure && (
+        <DashboardAgentChildDisclosure
+          childAgentCount={childAgentCount}
+          childAgentsExpanded={childAgentsExpanded}
+          onToggleChildAgents={onToggleChildAgents}
+          timestamp={
+            <span className="text-[10px] leading-none text-muted-foreground/60">
+              {relativeTimestamp}
+            </span>
+          }
+        />
+      )}
       {!hideExpand && (
         <button
           type="button"
diff --git a/src/renderer/src/components/dashboard/agent-finished-timestamp.test.ts b/src/renderer/src/components/dashboard/agent-finished-timestamp.test.ts
index 91b445dd78f9..b5ee4ae239cf 100644
--- a/src/renderer/src/components/dashboard/agent-finished-timestamp.test.ts
+++ b/src/renderer/src/components/dashboard/agent-finished-timestamp.test.ts
@@ -51,6 +51,47 @@ describe('lastEnteredDoneAt shares the Smart Sort completion clock', () => {
     expect(lastEnteredDoneAt(row(entry))).toBe(2_000)
     expect(agentEntryCompletionAt(entry)).toBeNull()
   })
+
+  it('dates a failed turn as a completion, and a stopped one only for display', () => {
+    const verdictDone = (outcome: 'failure' | 'cancellation') =>
+      doneEntry({
+        stateStartedAt: 2_000,
+        mainAgent: { state: 'done', outcome, stateStartedAt: 2_000 }
+      })
+    expect(agentEntryCompletionAt(verdictDone('failure'))).toBe(2_000)
+    expect(lastEnteredDoneAt(row(verdictDone('failure')))).toBe(2_000)
+    expect(agentEntryCompletionAt(verdictDone('cancellation'))).toBeNull()
+    expect(lastEnteredDoneAt(row(verdictDone('cancellation')))).toBe(2_000)
+  })
+
+  it('dates a main agent that failed while its subagents run by when it failed', () => {
+    const held = (outcome: 'failure' | 'cancellation') =>
+      doneEntry({
+        state: 'working',
+        stateStartedAt: 3_000,
+        mainAgent: { state: 'done', outcome, stateStartedAt: 2_500 }
+      })
+    expect(agentEntryCompletionAt(held('failure'))).toBeNull()
+    expect(lastEnteredDoneAt(row(held('failure')))).toBe(2_500)
+    expect(lastEnteredDoneAt(row(held('cancellation')))).toBeNull()
+  })
+
+  it('reads the verdict history carries when a boundary displaced the completion', () => {
+    const history = { state: 'done' as const, prompt: '', startedAt: 1_500 }
+    const boundary = (outcome?: 'failure' | 'cancellation') =>
+      doneEntry({
+        sessionBoundary: true,
+        stateHistory: [
+          {
+            ...history,
+            ...(outcome ? { mainAgent: { state: 'done', outcome, stateStartedAt: 1_500 } } : {})
+          }
+        ]
+      })
+    expect(agentEntryCompletionAt(boundary())).toBe(1_500)
+    expect(agentEntryCompletionAt(boundary('failure'))).toBe(1_500)
+    expect(agentEntryCompletionAt(boundary('cancellation'))).toBeNull()
+  })
 })
 
 describe('lastEnteredDoneAt subagent rows', () => {
diff --git a/src/renderer/src/components/dashboard/agent-finished-timestamp.ts b/src/renderer/src/components/dashboard/agent-finished-timestamp.ts
index fe1018629579..d176ae0a879b 100644
--- a/src/renderer/src/components/dashboard/agent-finished-timestamp.ts
+++ b/src/renderer/src/components/dashboard/agent-finished-timestamp.ts
@@ -1,4 +1,8 @@
 import { agentEntryCompletionAt } from '../../../../shared/agent-completion-time'
+import {
+  agentTurnStoppedByUser,
+  agentVerdictDisplayMark
+} from '../../../../shared/agent-main-agent-verdict'
 import type { DashboardAgentRow } from './useDashboardData'
 
 /**
@@ -8,11 +12,11 @@ import type { DashboardAgentRow } from './useDashboardData'
  * agent reads "N since it finished", an active one falls through to its start.
  */
 export function lastEnteredDoneAt(
-  agent: Pick<DashboardAgentRow, 'rowSource' | 'state' | 'entry'>
+  agent: Pick<DashboardAgentRow, 'rowSource' | 'state' | 'entry' | 'childRow'>
 ): number | null {
-  // Why: a subagent's synthetic entry may say done while its row is idle or unverifiable.
-  if (agent.rowSource === 'subagent' && agent.state !== 'done') {
-    return null
+  // Why: a subagent has no turns; it ended when its host settled it, if it has.
+  if (agent.rowSource === 'subagent') {
+    return agent.childRow?.settledAt ?? null
   }
   const entry = agent.entry
   // Why: same primitive Smart Sort ranks on, so the displayed age and Done eligibility share a clock.
@@ -22,10 +26,14 @@ export function lastEnteredDoneAt(
   if (completedAt !== null) {
     return completedAt
   }
-  // Why: display is looser than ranking — an interrupted turn still shows when it stopped.
-  if (entry.state === 'done' && entry.interrupted === true && entry.sessionBoundary !== true) {
+  // Why: display is looser than ranking — a stopped turn still shows when it ended.
+  if (entry.state === 'done' && agentTurnStoppedByUser(entry) && entry.sessionBoundary !== true) {
     return entry.stateStartedAt
   }
+  // Why: a failed main agent reads failed while its subagents run, so it shows when it failed.
+  if (entry.state !== 'done' && entry.mainAgent && agentVerdictDisplayMark(entry) === 'failed') {
+    return entry.mainAgent.stateStartedAt
+  }
   for (let i = (entry.stateHistory?.length ?? 0) - 1; i >= 0; i--) {
     if (entry.stateHistory[i].state === 'done') {
       return entry.stateHistory[i].startedAt
diff --git a/src/renderer/src/components/dashboard/agent-row-lineage-model.test.ts b/src/renderer/src/components/dashboard/agent-row-lineage-model.test.ts
index 016d1503e76e..15a3c4a8d83d 100644
--- a/src/renderer/src/components/dashboard/agent-row-lineage-model.test.ts
+++ b/src/renderer/src/components/dashboard/agent-row-lineage-model.test.ts
@@ -162,20 +162,20 @@ describe('buildAgentRowLineageTree', () => {
     )
     const iterate = Set.prototype[Symbol.iterator]
     let visitedSetEntries = 0
-    const spy = vi
-      .spyOn(Set.prototype, Symbol.iterator)
-      .mockImplementation(function (this: Set<unknown>) {
-        const iterator = iterate.call(this)
-        const next = iterator.next.bind(iterator)
-        iterator.next = () => {
-          const result = next()
-          if (!result.done) {
-            visitedSetEntries += 1
-          }
-          return result
+    const spy = vi.spyOn(Set.prototype, Symbol.iterator).mockImplementation(function (
+      this: Set<unknown>
+    ) {
+      const iterator = iterate.call(this)
+      const next = iterator.next.bind(iterator)
+      iterator.next = () => {
+        const result = next()
+        if (!result.done) {
+          visitedSetEntries += 1
         }
-        return iterator
-      })
+        return result
+      }
+      return iterator
+    })
     let tree: ReturnType<typeof buildAgentRowLineageTree>
     try {
       tree = buildAgentRowLineageTree(rows)
diff --git a/src/renderer/src/components/dashboard/useDashboardData.ts b/src/renderer/src/components/dashboard/useDashboardData.ts
index 02d4010edcdf..7ca391ef2346 100644
--- a/src/renderer/src/components/dashboard/useDashboardData.ts
+++ b/src/renderer/src/components/dashboard/useDashboardData.ts
@@ -1,6 +1,7 @@
 import type { AgentStatusEntry, AgentType } from '../../../../shared/agent-status-types'
 import type { AgentRowState } from '@/lib/agent-row-decay-state'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
+import type { AgentChildRowModel } from '../../../../shared/agent-child-row-model'
 
 export type DashboardAgentRow = {
   /** Row identity. For 'subagent' rows this is a synthetic key (the child has
@@ -18,6 +19,8 @@ export type DashboardAgentRow = {
    *  stateHistory entry, falling back to updatedAt when no history exists yet.
    *  Used to sort agents by when they started. */
   startedAt: number
+  /** Subagent rows only: what the row shows, decided once for every surface. */
+  childRow?: AgentChildRowModel
   lineage?: {
     depth: 0 | 1
     parentPaneKey?: string
diff --git a/src/renderer/src/components/dashboard/useRetainedAgents.test.ts b/src/renderer/src/components/dashboard/useRetainedAgents.test.ts
index d1440f4e5ef0..97640f2c2ae5 100644
--- a/src/renderer/src/components/dashboard/useRetainedAgents.test.ts
+++ b/src/renderer/src/components/dashboard/useRetainedAgents.test.ts
@@ -68,7 +68,12 @@ function makeTab(overrides: Partial<TerminalTab> & { id: string }): TerminalTab
   }
 }
 
-function makeAgentRow(args: { paneKey: string; state: AgentStatusState; interrupted?: boolean }) {
+function makeAgentRow(args: {
+  paneKey: string
+  state: AgentStatusState
+  interrupted?: boolean
+  mainAgent?: AgentStatusEntry['mainAgent']
+}) {
   const entry: AgentStatusEntry = {
     state: args.state,
     prompt: 'Fix it',
@@ -78,7 +83,8 @@ function makeAgentRow(args: { paneKey: string; state: AgentStatusState; interrup
     terminalTitle: 'Claude',
     stateHistory: [],
     agentType: 'claude',
-    interrupted: args.interrupted
+    interrupted: args.interrupted,
+    mainAgent: args.mainAgent
   }
 
   return {
@@ -134,6 +140,34 @@ describe('collectRetainedAgentsOnDisappear', () => {
     expect(result.toRetain).toEqual([])
   })
 
+  it('retains a failed done row so the failure stays visible, but not a cancelled one', () => {
+    const retainedFor = (outcome: 'failure' | 'cancellation') =>
+      collectRetainedAgentsOnDisappear({
+        previousAgents: new Map([
+          [
+            'tab-1:1',
+            {
+              row: makeAgentRow({
+                paneKey: 'tab-1:1',
+                state: 'done',
+                mainAgent: { state: 'done', outcome, stateStartedAt: 100 }
+              }),
+              worktreeId: 'wt-1'
+            }
+          ]
+        ]),
+        currentAgents: new Map(),
+        retainedAgentsByPaneKey: {},
+        retentionSuppressedPaneKeys: {},
+        recentlyClosedAgentStatusTabIds: {},
+        recentlyRetiredAgentStatusPaneKeys: {}
+      }).toRetain
+
+    expect(retainedFor('failure')).toHaveLength(1)
+    expect(retainedFor('failure')[0]?.entry.mainAgent?.outcome).toBe('failure')
+    expect(retainedFor('cancellation')).toEqual([])
+  })
+
   it('refreshes the retained snapshot when a reused paneKey starts a newer run', () => {
     // Why: a reused paneKey (same tab+pane, fresh agent start after a prior
     // retained run) produces a newer startedAt. Without the freshness check
diff --git a/src/renderer/src/components/dashboard/useRetainedAgents.ts b/src/renderer/src/components/dashboard/useRetainedAgents.ts
index f0ab639e2ba0..f26baaafc37d 100644
--- a/src/renderer/src/components/dashboard/useRetainedAgents.ts
+++ b/src/renderer/src/components/dashboard/useRetainedAgents.ts
@@ -15,6 +15,7 @@ import {
   type AgentStatusEntry
 } from '../../../../shared/agent-status-types'
 import { parsePaneKey } from '../../../../shared/stable-pane-id'
+import { agentTurnStoppedByUser } from '../../../../shared/agent-main-agent-verdict'
 
 import {
   createWorktreeTabBucketProjection,
@@ -299,13 +300,12 @@ export function collectRetainedAgentsOnDisappear(args: {
     if (args.recentlyClosedAgentStatusTabIds[ownerTabId]) {
       continue
     }
-    // Why: only keep a sticky snapshot when the agent finished cleanly
-    // (state === 'done' and not interrupted). Explicit teardown paths mark
+    // Why: only keep a sticky snapshot when the agent finished and the user did not
+    // stop it; a failure is kept so it stays visible. Explicit teardown paths mark
     // pane keys as suppression candidates, so a close/quit/crash cannot
     // resurrect a stale `done` row on the next sync.
     const lastState = prev.row.state
-    const wasInterrupted = prev.row.entry.interrupted === true
-    if (lastState !== 'done' || wasInterrupted) {
+    if (lastState !== 'done' || agentTurnStoppedByUser(prev.row.entry)) {
       continue
     }
     toRetain.push({
diff --git a/src/renderer/src/components/editor/CheckRunDetailsPanel.copy.test.tsx b/src/renderer/src/components/editor/CheckRunDetailsPanel.copy.test.tsx
index 23bc3d51c593..826b63ef4af7 100644
--- a/src/renderer/src/components/editor/CheckRunDetailsPanel.copy.test.tsx
+++ b/src/renderer/src/components/editor/CheckRunDetailsPanel.copy.test.tsx
@@ -9,6 +9,7 @@ import { CheckRunDetailsPanel } from './CheckRunDetailsPanel'
 const writeClipboardText = vi.fn<(text: string) => Promise<void>>()
 
 vi.mock('@/i18n/i18n', () => ({
+  i18n: { language: 'en' },
   translate: (_key: string, fallback: string) => fallback
 }))
 
diff --git a/src/renderer/src/components/editor/DiffSectionBody.tsx b/src/renderer/src/components/editor/DiffSectionBody.tsx
index 869d0de5a730..5ac46e175388 100644
--- a/src/renderer/src/components/editor/DiffSectionBody.tsx
+++ b/src/renderer/src/components/editor/DiffSectionBody.tsx
@@ -166,6 +166,8 @@ export function DiffSectionBody({
           keepCurrentOriginalModel
           keepCurrentModifiedModel
           options={{
+            // Native EditContext focus scrolls its hidden input into the combined viewport.
+            editContext: false,
             readOnly: !isEditable,
             originalEditable: false,
             renderSideBySide: sideBySide,
diff --git a/src/renderer/src/components/editor/IpynbRendering.test.tsx b/src/renderer/src/components/editor/IpynbRendering.test.tsx
index 2086e6b1878b..593104e23005 100644
--- a/src/renderer/src/components/editor/IpynbRendering.test.tsx
+++ b/src/renderer/src/components/editor/IpynbRendering.test.tsx
@@ -7,7 +7,10 @@ import { IpynbRunPrompt } from './IpynbCellToolbar'
 import { TooltipProvider } from '@/components/ui/tooltip'
 import type { IpynbCell, IpynbOutput } from './ipynb-parse'
 
-vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+vi.mock('@/i18n/i18n', () => ({
+  i18n: { language: 'en' },
+  translate: (_key: string, fallback: string) => fallback
+}))
 vi.mock('./use-document-dark-theme', () => ({ useDocumentDarkTheme: () => true }))
 vi.mock('@/lib/monaco-setup', () => ({ monaco: {} }))
 vi.mock('./MonacoCodeExcerpt', () => ({
diff --git a/src/renderer/src/components/editor/MarkdownPreview.link-routing.interaction.test.tsx b/src/renderer/src/components/editor/MarkdownPreview.link-routing.interaction.test.tsx
index 9be38fdb1d23..e244a50865a3 100644
--- a/src/renderer/src/components/editor/MarkdownPreview.link-routing.interaction.test.tsx
+++ b/src/renderer/src/components/editor/MarkdownPreview.link-routing.interaction.test.tsx
@@ -71,7 +71,10 @@ vi.mock('@/lib/connection-context', () => ({
 vi.mock('@/lib/connection-owner-resolution', () => ({
   createConnectionIdForFileSelector: () => () => connectionOwner.value
 }))
-vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+vi.mock('@/i18n/i18n', () => ({
+  i18n: { language: 'en' },
+  translate: (_key: string, fallback: string) => fallback
+}))
 vi.mock('./useLocalImageSrc', () => ({ useLocalImageSrc: (src?: string) => src }))
 vi.mock('./MermaidBlock', () => ({ default: () => null }))
 vi.mock('./CodeBlockCopyButton', () => ({
diff --git a/src/renderer/src/components/editor/MarkdownPreview.toc-visibility-gate.test.tsx b/src/renderer/src/components/editor/MarkdownPreview.toc-visibility-gate.test.tsx
index 23f66fa9ee52..645d1f556d60 100644
--- a/src/renderer/src/components/editor/MarkdownPreview.toc-visibility-gate.test.tsx
+++ b/src/renderer/src/components/editor/MarkdownPreview.toc-visibility-gate.test.tsx
@@ -55,7 +55,10 @@ vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => null
 vi.mock('@/lib/connection-owner-resolution', () => ({
   createConnectionIdForFileSelector: () => () => null
 }))
-vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+vi.mock('@/i18n/i18n', () => ({
+  i18n: { language: 'en' },
+  translate: (_key: string, fallback: string) => fallback
+}))
 vi.mock('./useLocalImageSrc', () => ({ useLocalImageSrc: (src?: string) => src }))
 vi.mock('./MermaidBlock', () => ({ default: () => null }))
 vi.mock('./CodeBlockCopyButton', () => ({
diff --git a/src/renderer/src/components/editor/check-run-details-fix-with-ai.ts b/src/renderer/src/components/editor/check-run-details-fix-with-ai.ts
index 9ff944aa2f95..ac82e3eb5503 100644
--- a/src/renderer/src/components/editor/check-run-details-fix-with-ai.ts
+++ b/src/renderer/src/components/editor/check-run-details-fix-with-ai.ts
@@ -11,7 +11,7 @@ import {
 import { openSourceControlAiSettingsTarget } from '@/components/right-sidebar/source-control-ai-settings-navigation'
 import { getConnectionId } from '@/lib/connection-context'
 import { startFixChecksAgent } from '@/fork-hosted-review-sitter/fix-checks-agent-launch'
-import { readSourceControlLaunchRecipeAgentId } from '@/lib/source-control-launch-agent-selection'
+import { readSourceControlLaunchRecipeAgentId } from '../../../../shared/source-control-launch-agent-selection'
 import { resolveSourceControlLaunchPlatform } from '@/lib/source-control-launch-platform'
 import { useAppStore } from '@/store'
 import { findWorktreeById } from '@/store/slices/worktree-helpers'
diff --git a/src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-windowing.test.tsx b/src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-windowing.test.tsx
index ba5848e3f67c..e913d6bde35e 100644
--- a/src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-windowing.test.tsx
+++ b/src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-windowing.test.tsx
@@ -57,11 +57,11 @@ beforeEach(() => {
   document.body.appendChild(host)
   root = createRoot(host)
   vi.stubGlobal('ResizeObserver', NoopResizeObserver)
-  vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(
-    function (this: HTMLElement) {
-      return this.classList.contains('overflow-auto') ? VIEWPORT_HEIGHT_PX : TREE_ROW_HEIGHT_PX
-    }
-  )
+  vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(function (
+    this: HTMLElement
+  ) {
+    return this.classList.contains('overflow-auto') ? VIEWPORT_HEIGHT_PX : TREE_ROW_HEIGHT_PX
+  })
   vi.spyOn(Element.prototype, 'getBoundingClientRect').mockImplementation(function (this: Element) {
     const height = this.classList.contains('overflow-auto')
       ? VIEWPORT_HEIGHT_PX
diff --git a/src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-render-range.test.ts b/src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-render-range.test.ts
new file mode 100644
index 000000000000..7f58e7c2a37f
--- /dev/null
+++ b/src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-render-range.test.ts
@@ -0,0 +1,55 @@
+import { describe, expect, it } from 'vitest'
+import { getCombinedDiffRenderRange } from './combined-diff-render-range'
+
+describe('combined diff render range', () => {
+  it('keeps visible large sections without mounting their large neighbors', () => {
+    expect(
+      getCombinedDiffRenderRange(
+        { startIndex: 2, endIndex: 3, count: 8, overscan: 5 },
+        () => 230_000,
+        800
+      )
+    ).toEqual([2, 3])
+  })
+
+  it('pre-renders at most one viewport of small sections on each side', () => {
+    expect(
+      getCombinedDiffRenderRange(
+        { startIndex: 4, endIndex: 5, count: 10, overscan: 5 },
+        () => 200,
+        400
+      )
+    ).toEqual([2, 3, 4, 5, 6, 7])
+  })
+
+  it('stops at a large neighboring section instead of skipping across it', () => {
+    const heights = [100, 230_000, 100, 100, 230_000, 100]
+    expect(
+      getCombinedDiffRenderRange(
+        { startIndex: 2, endIndex: 2, count: heights.length, overscan: 5 },
+        (index) => heights[index],
+        800
+      )
+    ).toEqual([2, 3])
+  })
+
+  it('retains the row-count cap and list boundaries for short sections', () => {
+    expect(
+      getCombinedDiffRenderRange(
+        { startIndex: 1, endIndex: 2, count: 100, overscan: 5 },
+        () => 28,
+        800
+      )
+    ).toEqual([0, 1, 2, 3, 4, 5, 6, 7])
+  })
+
+  it('renders only visible sections before the viewport is measured', () => {
+    expect(
+      getCombinedDiffRenderRange(
+        { startIndex: 1, endIndex: 2, count: 10, overscan: 5 },
+        () => 88,
+        0
+      )
+    ).toEqual([1, 2])
+  })
+})
diff --git a/src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-render-range.ts b/src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-render-range.ts
new file mode 100644
index 000000000000..0e57d785e864
--- /dev/null
+++ b/src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-render-range.ts
@@ -0,0 +1,28 @@
+import type { Range } from '@tanstack/react-virtual'
+
+export function getCombinedDiffRenderRange(
+  range: Range,
+  estimateHeight: (index: number) => number,
+  viewportHeight: number
+): number[] {
+  let start = range.startIndex
+  let end = range.endIndex
+  const budget = Math.max(0, viewportHeight)
+  let height = 0
+  while (start > 0 && range.startIndex - start < range.overscan) {
+    height += estimateHeight(start - 1)
+    if (height > budget) {
+      break
+    }
+    start -= 1
+  }
+  height = 0
+  while (end + 1 < range.count && end - range.endIndex < range.overscan) {
+    height += estimateHeight(end + 1)
+    if (height > budget) {
+      break
+    }
+    end += 1
+  }
+  return Array.from({ length: end - start + 1 }, (_, offset) => start + offset)
+}
diff --git a/src/renderer/src/components/editor/combined-diff/scroll-viewport/use-combined-diff-virtualizer.ts b/src/renderer/src/components/editor/combined-diff/scroll-viewport/use-combined-diff-virtualizer.ts
index d9874ea9265c..4cca1137afff 100644
--- a/src/renderer/src/components/editor/combined-diff/scroll-viewport/use-combined-diff-virtualizer.ts
+++ b/src/renderer/src/components/editor/combined-diff/scroll-viewport/use-combined-diff-virtualizer.ts
@@ -4,6 +4,7 @@ import { elementScroll, useVirtualizer, type Virtualizer } from '@tanstack/react
 import type { ProgrammaticScrollMarks } from '@/hooks/programmatic-scroll-marks'
 import type { DiffSection } from '../../diff-section-types'
 import { getDiffSectionRowEstimatedHeight } from '../../diff-section-layout'
+import { getCombinedDiffRenderRange } from './combined-diff-render-range'
 
 const COMBINED_DIFF_OVERSCAN = 5
 
@@ -28,17 +29,21 @@ export function useCombinedDiffVirtualizer({
   sections: DiffSection[]
   sideBySide: boolean
 }): Virtualizer<HTMLDivElement, Element> {
+  const estimateSize = (index: number): number => {
+    const section = sections[index]
+    return section ? getDiffSectionRowEstimatedHeight(section, sectionHeights[index]) : 88
+  }
   const virtualizer = useVirtualizer({
     count: sections.length,
     getScrollElement: () => scrollContainerRef.current,
-    estimateSize: (index) => {
-      const section = sections[index]
-      if (!section) {
-        return 88
-      }
-
-      return getDiffSectionRowEstimatedHeight(section, sectionHeights[index])
-    },
+    estimateSize,
+    // Offscreen Monaco sections render their full height; bound that work by pixels, too.
+    rangeExtractor: (range) =>
+      getCombinedDiffRenderRange(
+        range,
+        estimateSize,
+        scrollContainerRef.current?.clientHeight ?? 0
+      ),
     overscan: COMBINED_DIFF_OVERSCAN,
     initialOffset: () => scrollOffsetRef.current,
     // Why: mark every virtualizer-issued scroll so events are attributed to the user only when this code didn't cause them.
diff --git a/src/renderer/src/components/editor/conflict-review-file-tree-windowing.test.tsx b/src/renderer/src/components/editor/conflict-review-file-tree-windowing.test.tsx
index e7612a30a39d..596a148db9f8 100644
--- a/src/renderer/src/components/editor/conflict-review-file-tree-windowing.test.tsx
+++ b/src/renderer/src/components/editor/conflict-review-file-tree-windowing.test.tsx
@@ -51,13 +51,13 @@ beforeEach(() => {
   document.body.appendChild(host)
   root = createRoot(host)
   vi.stubGlobal('ResizeObserver', NoopResizeObserver)
-  vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(
-    function (this: HTMLElement) {
-      return this.classList.contains('overflow-auto')
-        ? VIEWPORT_HEIGHT_PX
-        : CONFLICT_REVIEW_ROW_HEIGHT_PX
-    }
-  )
+  vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(function (
+    this: HTMLElement
+  ) {
+    return this.classList.contains('overflow-auto')
+      ? VIEWPORT_HEIGHT_PX
+      : CONFLICT_REVIEW_ROW_HEIGHT_PX
+  })
   vi.spyOn(Element.prototype, 'getBoundingClientRect').mockImplementation(function (this: Element) {
     const top = synthesizedTop(this)
     const height = this.classList.contains('overflow-auto')
diff --git a/src/renderer/src/components/editor/local-host-test-fixture.ts b/src/renderer/src/components/editor/local-host-test-fixture.ts
new file mode 100644
index 000000000000..d6ef4f7128a4
--- /dev/null
+++ b/src/renderer/src/components/editor/local-host-test-fixture.ts
@@ -0,0 +1,18 @@
+import type { WorktreeHostConnection } from '@/lib/worktree-host-connection-phase'
+
+/** Stands in for the host-connection module in suites that mock the store: every worktree is local. */
+const LOCAL_HOST_CONNECTION: WorktreeHostConnection = {
+  phase: 'local',
+  targetId: null,
+  environmentId: null,
+  publishedStatus: null,
+  connectedEpoch: null
+}
+
+export function selectWorktreeHostConnectionPhase(): WorktreeHostConnection {
+  return LOCAL_HOST_CONNECTION
+}
+
+export function useWorktreeHostConnection(): WorktreeHostConnection {
+  return LOCAL_HOST_CONNECTION
+}
diff --git a/src/renderer/src/components/editor/markdown-directive-tokenizer.ts b/src/renderer/src/components/editor/markdown-directive-tokenizer.ts
new file mode 100644
index 000000000000..7356d99eddf3
--- /dev/null
+++ b/src/renderer/src/components/editor/markdown-directive-tokenizer.ts
@@ -0,0 +1,19 @@
+import type { NodeConfig } from '@tiptap/core'
+import { createMarkdownTokenizerStart } from './markdown-tokenizer-start'
+
+export function guardMarkdownDirectiveTokenizer(
+  tokenizer: NodeConfig['markdownTokenizer'],
+  name: string
+): NodeConfig['markdownTokenizer'] {
+  if (!tokenizer || typeof tokenizer === 'function') {
+    return tokenizer
+  }
+  const marker = `:::${name}`
+  return {
+    ...tokenizer,
+    start: createMarkdownTokenizerStart(marker, true),
+    tokenize(source, tokens, lexer) {
+      return source.startsWith(marker) ? tokenizer.tokenize(source, tokens, lexer) : undefined
+    }
+  }
+}
diff --git a/src/renderer/src/components/editor/markdown-tokenizer-start.test.ts b/src/renderer/src/components/editor/markdown-tokenizer-start.test.ts
new file mode 100644
index 000000000000..c190b3b7e5af
--- /dev/null
+++ b/src/renderer/src/components/editor/markdown-tokenizer-start.test.ts
@@ -0,0 +1,96 @@
+import { expect, it, vi } from 'vitest'
+import { createTiptapMarkedFacade } from './tiptap-marked-facade'
+import {
+  createMarkdownTokenizerStart,
+  registerMarkdownTokenizerStart
+} from './markdown-tokenizer-start'
+
+it.each([
+  'x\n:::detailsSummary',
+  'x\r:::detailsSummary',
+  'x\u2028:::detailsSummary',
+  'x\u2029:::detailsSummary',
+  'x:::detailsSummary\n:::detailsSummary',
+  'ordinary text'
+])('matches the upstream multiline directive start: %j', (source) => {
+  expect(createMarkdownTokenizerStart(':::detailsSummary', true)(source)).toBe(
+    source.match(/^:::detailsSummary/m)?.index ?? -1
+  )
+})
+
+it('does not search each remaining suffix for an absent marker', () => {
+  const marked = createTiptapMarkedFacade()
+  const start = createMarkdownTokenizerStart('MARKER')
+  marked.use({
+    extensions: [{ name: 'marker', level: 'block', start, tokenizer: () => undefined }]
+  })
+  const includes = vi.spyOn(String.prototype, 'includes')
+  const indexOf = vi.spyOn(String.prototype, 'indexOf')
+  try {
+    marked.lexer('Prose\n\n'.repeat(1000))
+    expect(includes.mock.calls.filter(([value]) => value === 'MARKER')).toHaveLength(1)
+    expect(indexOf.mock.calls.filter(([value]) => value === 'MARKER')).toHaveLength(0)
+  } finally {
+    includes.mockRestore()
+    indexOf.mockRestore()
+  }
+})
+
+it('restores searches for nested generated input and later parses', () => {
+  const marked = createTiptapMarkedFacade()
+  const start = createMarkdownTokenizerStart('MARKER')
+  marked.use({
+    extensions: [
+      {
+        name: 'marker',
+        level: 'block',
+        start,
+        tokenizer(source) {
+          return source.startsWith('MARKER')
+            ? { type: 'marker', raw: 'MARKER', text: 'found' }
+            : undefined
+        }
+      },
+      {
+        name: 'wrapper',
+        level: 'block',
+        tokenizer(source) {
+          if (!source.startsWith('WRAPPER')) {
+            return undefined
+          }
+          return {
+            type: 'wrapper',
+            raw: 'WRAPPER',
+            tokens: this.lexer.blockTokens('prose\nMARKER')
+          }
+        }
+      }
+    ]
+  })
+  const nested = marked.lexer('WRAPPER')
+  expect(nested[0]).toMatchObject({
+    type: 'wrapper',
+    tokens: [{ type: 'paragraph' }, { type: 'marker' }]
+  })
+  expect(marked.lexer('prose\nMARKER').map((token) => token.type)).toEqual(['paragraph', 'marker'])
+  expect(createTiptapMarkedFacade().lexer('MARKER')[0].type).toBe('paragraph')
+})
+
+it('skips custom searches when their required marker is absent', () => {
+  const marked = createTiptapMarkedFacade()
+  const search = vi.fn((source: string) => source.search(/<details\b/i))
+  marked.use({
+    extensions: [
+      {
+        name: 'details',
+        level: 'block',
+        start: registerMarkdownTokenizerStart('<', search),
+        tokenizer: () => undefined
+      }
+    ]
+  })
+  marked.lexer('Prose\n\n'.repeat(1000))
+  expect(search).not.toHaveBeenCalled()
+  marked.lexer('Prose\n<DETAILS>')
+  expect(search).toHaveReturnedWith(5)
+})
diff --git a/src/renderer/src/components/editor/markdown-tokenizer-start.ts b/src/renderer/src/components/editor/markdown-tokenizer-start.ts
new file mode 100644
index 000000000000..b32a4539facc
--- /dev/null
+++ b/src/renderer/src/components/editor/markdown-tokenizer-start.ts
@@ -0,0 +1,22 @@
+const startMarkers = new WeakMap<(source: string) => number | void, string>()
+
+export function registerMarkdownTokenizerStart(marker: string, start: (source: string) => number) {
+  startMarkers.set(start, marker)
+  return start
+}
+
+/** Let a lexer skip suffix searches for markers absent from its entire input. */
+export function createMarkdownTokenizerStart(marker: string, lineStart = false) {
+  const start = (source: string): number => {
+    let position = source.indexOf(marker)
+    while (lineStart && position > 0 && !'\n\r\u2028\u2029'.includes(source[position - 1])) {
+      position = source.indexOf(marker, position + marker.length)
+    }
+    return position
+  }
+  return registerMarkdownTokenizerStart(marker, start)
+}
+
+export function getMarkdownTokenizerStartMarker(start: (source: string) => number | void) {
+  return startMarkers.get(start)
+}
diff --git a/src/renderer/src/components/editor/raw-markdown-html.ts b/src/renderer/src/components/editor/raw-markdown-html.ts
index edcf87158087..226979b030c7 100644
--- a/src/renderer/src/components/editor/raw-markdown-html.ts
+++ b/src/renderer/src/components/editor/raw-markdown-html.ts
@@ -1,3 +1,4 @@
+import { createMarkdownTokenizerStart } from './markdown-tokenizer-start'
 import { Node, mergeAttributes } from '@tiptap/core'
 import { isEditableDetailsHtmlBlock, matchDetailsHtmlBlock } from './details-markdown-html'
 import { formatMarkdownDocLinkBody, parseMarkdownDocLink } from './markdown-doc-links'
@@ -44,11 +45,7 @@ function isLineOnlyHtml(line: string): boolean {
 function matchBlockHtml(content: string, start: number): string | null {
   const lineEnd = findLineEnd(content, start)
   const line = content.slice(start, lineEnd)
-  if (!isLineOnlyHtml(line)) {
-    return null
-  }
-
-  return line
+  return isLineOnlyHtml(line) ? line : null
 }
 
 export function encodeRawMarkdownHtmlForRichEditor(
@@ -282,7 +279,9 @@ function createRawSourceNode({
     markdownTokenizer: {
       name,
       level: inline ? 'inline' : 'block',
-      start: inline ? skipInlineTransportStartScan : transport.startFor(kind),
+      start: inline
+        ? skipInlineTransportStartScan
+        : createMarkdownTokenizerStart(transport.startFor(kind)),
       tokenize(src) {
         const matched = transport.match(src, kind)
         if (!matched) {
diff --git a/src/renderer/src/components/editor/rich-markdown-block-source-work.test.ts b/src/renderer/src/components/editor/rich-markdown-block-source-work.test.ts
new file mode 100644
index 000000000000..ef8d64b0a2f3
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-block-source-work.test.ts
@@ -0,0 +1,52 @@
+import { Editor } from '@tiptap/core'
+import { expect, it, vi } from 'vitest'
+import { createRichMarkdownEditorCodec } from './rich-markdown-source-transport'
+import { createRichMarkdownExtensions } from './rich-markdown-extensions'
+import { commitRichMarkdownSerialization } from './rich-markdown-serialization-commit'
+
+function create(source: string) {
+  return new Editor({
+    element: null,
+    extensions: createRichMarkdownExtensions({ codec: createRichMarkdownEditorCodec() }),
+    content: source,
+    contentType: 'markdown'
+  })
+}
+
+it('proves the assembled document without reparsing every unchanged source block', () => {
+  const source = `${Array.from(
+    { length: 1000 },
+    (_, index) => `Paragraph ${index} with _emphasis_.\n\n> [!NOTE]\n> - Callout ${index}\n\n`
+  ).join('')}End\n`
+  const editor = create(source)
+  const refs = {
+    originalSourceRef: { current: source },
+    baseCanonicalRef: { current: editor.getMarkdown() },
+    lastCommittedMarkdownRef: { current: source }
+  }
+  const parse = vi.spyOn(editor.markdown!, 'parse')
+  let expected = source
+  try {
+    for (let edit = 0; edit < 3; edit++) {
+      parse.mockClear()
+      editor.commands.insertContentAt(1, { type: 'text', text: 'x' })
+      expected = `x${expected}`
+      const result = commitRichMarkdownSerialization(editor, refs, (markdown) => {
+        const reopened = create(markdown)
+        try {
+          return reopened.getMarkdown()
+        } finally {
+          reopened.destroy()
+        }
+      })
+      expect(result.markdown).toBe(expected)
+      expect(parse.mock.calls.filter(([markdown]) => markdown.length > 50_000)).toHaveLength(
+        edit === 0 ? 2 : 1
+      )
+      expect(parse.mock.calls.length).toBeLessThanOrEqual(3)
+    }
+  } finally {
+    parse.mockRestore()
+    editor.destroy()
+  }
+})
diff --git a/src/renderer/src/components/editor/rich-markdown-block-source.ts b/src/renderer/src/components/editor/rich-markdown-block-source.ts
new file mode 100644
index 000000000000..514e40d486e3
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-block-source.ts
@@ -0,0 +1,208 @@
+import type { Editor } from '@tiptap/core'
+import { getRichMarkdownSerializationDocument } from './rich-markdown-trailing-paragraph'
+import type { Node as ProseMirrorNode } from '@tiptap/pm/model'
+import { diffArrays } from 'diff'
+import { extractAbsorbedBlankLines } from '@tiptap/markdown'
+import { encodeRawMarkdownHtmlForRichEditor } from './raw-markdown-html'
+import type { RichMarkdownEditorCodec } from './rich-markdown-source-transport'
+import {
+  reconcileSerializedMarkdown,
+  restoreMarkdownSourceEol
+} from './rich-markdown-source-reconcile'
+
+type SourceBlock = { node: ProseMirrorNode; source: string; separator: string }
+type SourceDocument = { source: string; leading: string; blocks: SourceBlock[] }
+type SourceContext = {
+  codec: RichMarkdownEditorCodec
+  htmlSuperscriptLinks: boolean
+  baseline?: SourceDocument
+}
+
+const contexts = new WeakMap<Editor, SourceContext>()
+
+export function registerRichMarkdownBlockSource(
+  editor: Editor,
+  codec: RichMarkdownEditorCodec,
+  htmlSuperscriptLinks: boolean
+): void {
+  contexts.set(editor, { codec, htmlSuperscriptLinks })
+}
+
+function parse(editor: Editor, context: SourceContext, source: string): ProseMirrorNode {
+  return editor.schema.nodeFromJSON(
+    editor.markdown!.parse(encodeRawMarkdownHtmlForRichEditor(source, context.codec, context))
+  )
+}
+
+function readSourceDocument(
+  editor: Editor,
+  context: SourceContext,
+  source: string,
+  expected?: ProseMirrorNode
+): SourceDocument | null {
+  const normalized = source.replace(/\r\n/g, '\n')
+  const document = expected ?? parse(editor, context, normalized)
+  const tokens = extractAbsorbedBlankLines(context.codec.marked.lexer(normalized))
+  // Definitions and custom source owners may cross token boundaries; never guess their spans.
+  if (tokens.map((token) => token.raw).join('') !== normalized) {
+    return null
+  }
+  const blocks: SourceBlock[] = []
+  let leading = ''
+  const lastContentIndex = tokens.findLastIndex((token) => token.type !== 'space')
+  for (const [tokenIndex, token] of tokens.entries()) {
+    const raw = token.raw
+    if (raw === undefined) {
+      return null
+    }
+    if (token.type === 'space') {
+      const pieces: string[] = []
+      let offset = 0
+      for (const match of raw.matchAll(/\n\n/g)) {
+        pieces.push(raw.slice(offset, match.index + 2))
+        offset = match.index + 2
+      }
+      const remainder = raw.slice(offset)
+      const previous = blocks.at(-1)
+      if (pieces.length === 0) {
+        if (previous) {
+          previous.separator += remainder
+        } else {
+          leading += remainder
+        }
+        continue
+      }
+      const atEnd = tokenIndex > lastContentIndex
+      if (previous) {
+        previous.separator += pieces.shift()!
+      }
+      // Match the parser's implicit paragraphs, including leading/trailing blank runs.
+      for (const separator of pieces) {
+        blocks.push({ node: editor.schema.nodes.paragraph.create(), source: '', separator })
+      }
+      if (previous && atEnd) {
+        blocks.push({
+          node: editor.schema.nodes.paragraph.create(),
+          source: '',
+          separator: remainder
+        })
+      } else {
+        blocks.at(-1)!.separator += remainder
+      }
+      continue
+    }
+    const text = raw.replace(/\n+$/, '')
+    if (blocks.length >= document.childCount) {
+      return null
+    }
+    // These spans are provisional; the assembled document must pass the full parse proof below.
+    blocks.push({
+      node: document.child(blocks.length),
+      source: text,
+      separator: raw.slice(text.length)
+    })
+  }
+  if (
+    document.childCount !== blocks.length ||
+    blocks.some((block, index) => !block.node.eq(document.child(index)))
+  ) {
+    return null
+  }
+  return { source, leading, blocks }
+}
+
+/** Reuse exact source for equal blocks, even when character-level reconciliation cannot match. */
+export function reconcileRichMarkdownBlockSource(
+  editor: Editor,
+  originalSource: string,
+  edited: string,
+  roundTrip: (source: string) => string | null
+): string | null {
+  const context = contexts.get(editor)
+  if (!context) {
+    return null
+  }
+  try {
+    const baseline =
+      context.baseline?.source === originalSource
+        ? context.baseline
+        : readSourceDocument(editor, context, originalSource)
+    if (!baseline) {
+      return null
+    }
+    context.baseline = baseline
+    const document = getRichMarkdownSerializationDocument(editor)
+    const current = readSourceDocument(editor, context, edited, document)
+    if (!current) {
+      return null
+    }
+    // Bound replacement-heavy diffs; ordinary single-block edits remain linear in document size.
+    const changes = diffArrays(baseline.blocks, current.blocks, {
+      comparator: (before, after) => before.node.eq(after.node),
+      maxEditLength: 256
+    })
+    if (!changes) {
+      return null
+    }
+    const blocks: SourceBlock[] = []
+    let originalIndex = 0
+    let removed: SourceBlock[] = []
+    for (const change of changes) {
+      if (change.added) {
+        for (const [index, block] of change.value.entries()) {
+          const previous = removed.length === change.count ? removed[index] : undefined
+          const canonical = previous ? roundTrip(previous.source) : null
+          const source =
+            previous && canonical !== null
+              ? reconcileSerializedMarkdown({
+                  originalSource: previous.source,
+                  baseCanonical: canonical,
+                  edited: block.source,
+                  roundTrip
+                })
+              : block.source
+          blocks.push({ ...block, source, separator: previous?.separator ?? block.separator })
+        }
+        removed = []
+      } else if (change.removed) {
+        removed = baseline.blocks.slice(originalIndex, originalIndex + change.count)
+        originalIndex += change.count
+      } else {
+        removed = []
+        blocks.push(...baseline.blocks.slice(originalIndex, originalIndex + change.count))
+        originalIndex += change.count
+      }
+    }
+    // A moved EOF block needs a separator before the next block.
+    for (let index = 0; index < blocks.length - 1; index++) {
+      if (!blocks[index].separator) {
+        blocks[index] = { ...blocks[index], separator: '\n\n' }
+      }
+    }
+    const assemble = () =>
+      baseline.leading + blocks.map((block) => block.source + block.separator).join('')
+    let candidate = assemble()
+    // Validate the assembled document, including cross-block reference and delimiter interactions.
+    if (!parse(editor, context, candidate).eq(document)) {
+      const originalIndices = new Map(baseline.blocks.map((block, index) => [block, index]))
+      for (let index = 0; index < blocks.length - 1; index++) {
+        const originalIndex = originalIndices.get(blocks[index])
+        const unchangedBoundary =
+          originalIndex !== undefined &&
+          originalIndices.get(blocks[index + 1]) === originalIndex + 1
+        if (!unchangedBoundary && !blocks[index].separator.includes('\n\n')) {
+          blocks[index] = { ...blocks[index], separator: '\n\n' }
+        }
+      }
+      candidate = assemble()
+      if (!parse(editor, context, candidate).eq(document)) {
+        return null
+      }
+    }
+    const result = restoreMarkdownSourceEol(candidate, originalSource)
+    context.baseline = { source: result, leading: baseline.leading, blocks }
+    return result
+  } catch {
+    return null
+  }
+}
diff --git a/src/renderer/src/components/editor/rich-markdown-details-case.test.ts b/src/renderer/src/components/editor/rich-markdown-details-case.test.ts
new file mode 100644
index 000000000000..caf92d90a049
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-details-case.test.ts
@@ -0,0 +1,25 @@
+import { Editor } from '@tiptap/core'
+import { expect, it } from 'vitest'
+import { createRichMarkdownExtensions } from './rich-markdown-extensions'
+import { createRichMarkdownEditorCodec } from './rich-markdown-source-transport'
+
+it.each(['details', 'Details', 'DETAILS', 'dEtAiLs'])(
+  'opens %s after prose as an editable toggle',
+  (tag) => {
+    const editor = new Editor({
+      element: null,
+      extensions: createRichMarkdownExtensions({ codec: createRichMarkdownEditorCodec() }),
+      content: `Before\n<${tag}><summary>Title</summary>\n\nBody\n\n</${tag}>`,
+      contentType: 'markdown'
+    })
+    try {
+      expect(editor.state.doc.child(0).textContent).toBe('Before')
+      const toggle = editor.state.doc.child(1)
+      expect(toggle.type.name).toBe('details')
+      expect(toggle.child(0).textContent).toBe('Title')
+      expect(toggle.child(1).textContent).toBe('Body')
+    } finally {
+      editor.destroy()
+    }
+  }
+)
diff --git a/src/renderer/src/components/editor/rich-markdown-details-extension.ts b/src/renderer/src/components/editor/rich-markdown-details-extension.ts
index 1bfcfc09a15d..f7e28fd16c27 100644
--- a/src/renderer/src/components/editor/rich-markdown-details-extension.ts
+++ b/src/renderer/src/components/editor/rich-markdown-details-extension.ts
@@ -1,3 +1,5 @@
+import { registerMarkdownTokenizerStart } from './markdown-tokenizer-start'
+import { guardMarkdownDirectiveTokenizer } from './markdown-directive-tokenizer'
 import { decodeHtmlEntities, type AnyExtension, type Editor } from '@tiptap/core'
 import { Details, DetailsContent, DetailsSummary } from '@tiptap/extension-details'
 import type { PlaceholderOptions } from '@tiptap/extension-placeholder'
@@ -228,7 +230,7 @@ const OrcaDetails = Details.extend({
   markdownTokenizer: {
     name: 'details',
     level: 'block',
-    start: '<details',
+    start: registerMarkdownTokenizerStart('<', (source) => source.search(/<details\b/i)),
     tokenize(src, _tokens, lexer) {
       const detailsBlock = matchDetailsHtmlBlock(src, 0)
       if (!detailsBlock || !isEditableDetailsHtmlBlock(detailsBlock)) {
@@ -287,6 +289,10 @@ const OrcaDetails = Details.extend({
 })
 
 const OrcaDetailsSummary = DetailsSummary.extend({
+  markdownTokenizer: guardMarkdownDirectiveTokenizer(
+    DetailsSummary.config.markdownTokenizer,
+    'detailsSummary'
+  ),
   // Why: the summary parser runs parseInline, which emits image/math nodes that
   // upstream's text*-only summary rejects, so the doc is schema-invalid until the
   // first edit reassembles the summary and ProseMirror throws.
@@ -294,6 +300,10 @@ const OrcaDetailsSummary = DetailsSummary.extend({
 })
 
 const OrcaDetailsContent = DetailsContent.extend({
+  markdownTokenizer: guardMarkdownDirectiveTokenizer(
+    DetailsContent.config.markdownTokenizer,
+    'detailsContent'
+  ),
   // Why: detailsContent's double-Enter escape must run before StarterKit's
   // generic paragraph split, otherwise users can get stuck inside a toggle.
   priority: 1000,
diff --git a/src/renderer/src/components/editor/rich-markdown-document-fidelity.test.ts b/src/renderer/src/components/editor/rich-markdown-document-fidelity.test.ts
new file mode 100644
index 000000000000..974a32f4d74a
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-document-fidelity.test.ts
@@ -0,0 +1,147 @@
+import { reconcileRichMarkdownBlockSource } from './rich-markdown-block-source'
+import { Editor } from '@tiptap/core'
+import { describe, expect, it } from 'vitest'
+import { createRichMarkdownExtensions } from './rich-markdown-extensions'
+import { createRichMarkdownEditorCodec } from './rich-markdown-source-transport'
+import { encodeRawMarkdownHtmlForRichEditor } from './raw-markdown-html'
+import { normalizeEmptyListItems } from './rich-markdown-normalize'
+import { commitRichMarkdownSerialization } from './rich-markdown-serialization-commit'
+
+function createEditor(source: string) {
+  const codec = createRichMarkdownEditorCodec()
+  const editor = new Editor({
+    element: null,
+    extensions: createRichMarkdownExtensions({ codec }),
+    content: encodeRawMarkdownHtmlForRichEditor(source, codec),
+    contentType: 'markdown'
+  })
+  normalizeEmptyListItems(editor)
+  return editor
+}
+
+function serialize(source: string) {
+  const editor = createEditor(source)
+  try {
+    return editor.getMarkdown()
+  } finally {
+    editor.destroy()
+  }
+}
+
+const article = [
+  '# Der Turing-Test',
+  '',
+  'Der Turing-Test ist ein Gedankenexperiment aus dem Jahr 1950.',
+  '',
+  '> [!wissenswert] Das Original war ein Ratespiel um Mann und Frau',
+  '> In Turings Aufsatz heißt der Test "Imitation Game".',
+  '',
+  'Ein zweiter Absatz mit user_name_field, feature~2 und [^1].',
+  '',
+  '> [!zeitstrahl] 75 Jahre Imitation Game',
+  '> - 1950 · Alan Turing veröffentlicht seinen Aufsatz.',
+  '> - 1980 · John Searle widerspricht.',
+  '',
+  'Ein dritter Absatz mit *echter Betonung*.',
+  '',
+  '> [!achtung] Heißt „bestanden“, dass die Maschine denkt?',
+  '> Nein, und das ist der Einwand von John Searle.',
+  '',
+  '> [!selbsttest]',
+  '> - Was hat Turing mit dem Test erreichen wollen?',
+  '> - Was bedeutet Intelligenz?',
+  ''
+].join('\n')
+
+describe('rich Markdown document source fidelity', () => {
+  it.each([article, article.repeat(100), article.replaceAll('\n\n', '\n\n\n\n').repeat(60)])(
+    'only changes edited prose across successive commits (%#)',
+    (source) => {
+      const editor = createEditor(source)
+      const refs = {
+        originalSourceRef: { current: source },
+        baseCanonicalRef: { current: editor.getMarkdown() },
+        lastCommittedMarkdownRef: { current: source }
+      }
+      let expected = source
+      try {
+        for (const text of ['1950.', '[^1].', '*echter Betonung*.']) {
+          const needle = text.replace(/\*/g, '')
+          let position = -1
+          editor.state.doc.descendants((node, pos) => {
+            if (position === -1 && node.isText && node.text?.includes(needle)) {
+              position = pos + node.text.indexOf(needle) + needle.length
+            }
+          })
+          // The final period is a separate text node after the italic mark.
+          if (position === -1) {
+            editor.state.doc.descendants((node, pos) => {
+              if (
+                position === -1 &&
+                node.type.name === 'paragraph' &&
+                node.textContent.includes('Ein dritter')
+              ) {
+                position = pos + node.nodeSize - 1
+              }
+            })
+          }
+          expect(position).toBeGreaterThan(0)
+          editor.commands.insertContentAt(position, { type: 'text', text: ' rgffggf' })
+          expected = expected.replace(text, `${text} rgffggf`)
+          const result = commitRichMarkdownSerialization(editor, refs, serialize)
+          expect(result.markdown).toBe(expected)
+          const reopened = createEditor(result.markdown)
+          try {
+            expect(reopened.getJSON()).toEqual(editor.getJSON())
+          } finally {
+            reopened.destroy()
+          }
+        }
+      } finally {
+        editor.destroy()
+      }
+    }
+  )
+})
+
+describe('block source reconciliation when a whole-document patch cannot be applied', () => {
+  it.each([
+    ['\n\n_Keep_\n\n\n\nEnd\n\n', '\n\n_Keep_\n\n\n\nChanged\n\n', '\n\n_Keep_\n\n\n\nChanged\n\n'],
+    [
+      '_Keep_\n\n> [!NOTE]\n> - a\n',
+      '_Keep_\n\n> [!NOTE]\n> - a\n\nAdded paragraph\n',
+      '_Keep_\n\n> [!NOTE]\n> - a\n\nAdded paragraph'
+    ],
+    ['_Keep_\n', '_Keep_\n\nAdded paragraph', '_Keep_\n\nAdded paragraph'],
+    [
+      '_Keep_\n\nRemove this\n\n> [!NOTE]\n> - a\n',
+      '_Keep_\n\n> [!NOTE]\n> - a\n',
+      '_Keep_\n\n> [!NOTE]\n> - a\n'
+    ],
+    [
+      '_Keep_\n\nRepeat\n\nRepeat\n\nEnd\n',
+      '_Keep_\n\nRepeat\n\nChanged\n\nEnd\n',
+      '_Keep_\n\nRepeat\n\nChanged\n\nEnd\n'
+    ],
+    ['_Keep_\r\n\r\nEnd\r\n', '_Keep_\n\nChanged', '_Keep_\r\n\r\nChanged\r\n'],
+    [
+      '_Keep_\n\n```text\n[] \\_ ~ ` *\n```\n\nEnd\n',
+      '_Keep_\n\n```text\n[] \\_ ~ ` *\n```\n\nChanged\n',
+      '_Keep_\n\n```text\n[] \\_ ~ ` *\n```\n\nChanged\n'
+    ]
+  ])('preserves source through structural changes (%#)', (source, changed, expected) => {
+    const editor = createEditor(changed)
+    try {
+      const result = reconcileRichMarkdownBlockSource(
+        editor,
+        source,
+        editor.getMarkdown(),
+        serialize
+      )
+      expect(result).toBe(expected)
+      expect(serialize(result!)).toBe(editor.getMarkdown())
+    } finally {
+      editor.destroy()
+    }
+  })
+})
diff --git a/src/renderer/src/components/editor/rich-markdown-escape-fidelity.test.ts b/src/renderer/src/components/editor/rich-markdown-escape-fidelity.test.ts
new file mode 100644
index 000000000000..5f2584495e4b
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-escape-fidelity.test.ts
@@ -0,0 +1,212 @@
+import { Editor, type JSONContent } from '@tiptap/core'
+import StarterKit from '@tiptap/starter-kit'
+import { describe, expect, it, vi } from 'vitest'
+import { encodeRawMarkdownHtmlForRichEditor } from './raw-markdown-html'
+import { createRichMarkdownExtensions } from './rich-markdown-extensions'
+import { createRichMarkdownEditorCodec } from './rich-markdown-source-transport'
+import { createIsolatedMarkdownExtensionForTests } from './isolated-markdown-extension-for-tests'
+
+function createEditor(content: JSONContent | string) {
+  return new Editor({
+    element: null,
+    extensions: [StarterKit, createIsolatedMarkdownExtensionForTests()],
+    content,
+    ...(typeof content === 'string' ? { contentType: 'markdown' as const } : {})
+  })
+}
+
+function paragraph(text: string): JSONContent {
+  return { type: 'paragraph', content: [{ type: 'text', text }] }
+}
+
+function expectReopens(editor: Editor, reopen = createEditor): void {
+  const reopened = reopen(editor.getMarkdown())
+  try {
+    expect(reopened.getJSON()).toEqual(editor.getJSON())
+  } finally {
+    reopened.destroy()
+  }
+}
+
+function createRichEditor(content: JSONContent | string) {
+  const codec = createRichMarkdownEditorCodec()
+  return new Editor({
+    element: null,
+    extensions: createRichMarkdownExtensions({ codec }),
+    content:
+      typeof content === 'string' ? encodeRawMarkdownHtmlForRichEditor(content, codec) : content,
+    ...(typeof content === 'string' ? { contentType: 'markdown' as const } : {})
+  })
+}
+
+describe('optional Markdown escapes', () => {
+  it.each(['user_name_field', 'a_2_b', 'a__b', 'пристаням_стремятся', '𐐀_𐐁', 'é_value'])(
+    'preserves intraword underscores in %s',
+    (text) => {
+      const editor = createEditor({ type: 'doc', content: [paragraph(text)] })
+      try {
+        expect(editor.getMarkdown()).toBe(text)
+        expectReopens(editor)
+      } finally {
+        editor.destroy()
+      }
+    }
+  )
+
+  it.each(['__init__', '___init___', '_word_', 'see a. __b__c', 'a\\_b', 'a\\\\_b'])(
+    'keeps literal delimiter runs and backslashes safe: %s',
+    (text) => {
+      const editor = createEditor({ type: 'doc', content: [paragraph(text)] })
+      try {
+        expectReopens(editor)
+      } finally {
+        editor.destroy()
+      }
+    }
+  )
+
+  it.each(['feature~2', 'an unmatched ` tick', 'a single * marker', 'a~b_c*d`e'])(
+    'omits optional escapes only when the parser proves the literal survives: %s',
+    (text) => {
+      const editor = createEditor({ type: 'doc', content: [paragraph(text)] })
+      try {
+        expect(editor.getMarkdown()).toBe(text)
+        expectReopens(editor)
+      } finally {
+        editor.destroy()
+      }
+    }
+  )
+
+  it.each([
+    '~5 dollars, see v2~beta',
+    '~~deleted~~',
+    '*italic*',
+    '**bold**',
+    '`code`',
+    '[label](url)',
+    '[literal] *bold* feature~2'
+  ])('retains escapes that prevent new Markdown syntax: %s', (text) => {
+    const editor = createEditor({ type: 'doc', content: [paragraph(text)] })
+    try {
+      expectReopens(editor)
+      if (text.includes('feature~2')) {
+        expect(editor.getMarkdown()).toContain('feature~2')
+      }
+    } finally {
+      editor.destroy()
+    }
+  })
+
+  it('preserves identifiers alongside emphasis-like literals', () => {
+    const editor = createEditor({ type: 'doc', content: [paragraph('__init__ user_name')] })
+    try {
+      expect(editor.getMarkdown()).toContain('user_name')
+      expectReopens(editor)
+    } finally {
+      editor.destroy()
+    }
+  })
+
+  it('preserves callouts and identifiers in nested containers', () => {
+    const source = '> [!NOTE] user_name\n>\n> - [literal] a__b\n\n- outer_name\n  - inner_name'
+    const editor = createEditor(source)
+    try {
+      expect(editor.getMarkdown()).toContain('> [!NOTE] user_name')
+      expect(editor.getMarkdown()).toContain('[literal] a__b')
+      expect(editor.getMarkdown()).toContain('inner_name')
+      expectReopens(editor)
+    } finally {
+      editor.destroy()
+    }
+  })
+
+  it('validates marks across adjacent text nodes', () => {
+    const editor = createEditor({
+      type: 'doc',
+      content: [
+        {
+          type: 'paragraph',
+          content: [
+            { type: 'text', text: 'a_' },
+            { type: 'text', text: '_b_', marks: [{ type: 'bold' }] },
+            { type: 'text', text: '_c user_name' }
+          ]
+        }
+      ]
+    })
+    try {
+      expect(editor.getMarkdown()).toContain('user_name')
+      expectReopens(editor)
+    } finally {
+      editor.destroy()
+    }
+  })
+
+  it('does not activate definitions nested in another block', () => {
+    const editor = createEditor({
+      type: 'doc',
+      content: [paragraph('[ref]'), { type: 'blockquote', content: [paragraph('[ref]: /target')] }]
+    })
+    try {
+      expectReopens(editor)
+    } finally {
+      editor.destroy()
+    }
+  })
+})
+
+describe('literal escape validation boundaries', () => {
+  it('validates a nested container once and caches unchanged blocks', () => {
+    const editor = createEditor('> [!NOTE] user_name\n>\n> - inner_value')
+    const parse = vi.spyOn(editor.markdown!, 'parse')
+    try {
+      expect(editor.getMarkdown()).toContain('[!NOTE] user_name')
+      expect(parse).toHaveBeenCalledTimes(1)
+      editor.getMarkdown()
+      expect(parse).toHaveBeenCalledTimes(1)
+      editor.commands.insertContentAt(3, { type: 'text', text: 'edit ' })
+      editor.getMarkdown()
+      expect(parse).toHaveBeenCalledTimes(2)
+      expectReopens(editor)
+    } finally {
+      parse.mockRestore()
+      editor.destroy()
+    }
+  })
+
+  it('skips optional validation for an oversized block', () => {
+    const editor = createEditor({ type: 'doc', content: [paragraph(`${'a_'.repeat(25_001)}b`)] })
+    const parse = vi.spyOn(editor.markdown!, 'parse')
+    try {
+      expect(editor.getMarkdown()).toContain('a\\_')
+      expect(parse).not.toHaveBeenCalled()
+    } finally {
+      parse.mockRestore()
+      editor.destroy()
+    }
+  })
+
+  it.each([
+    '> [!TIP] user_name\n>\n> - [x] inner_value',
+    '> user_name <span data-value="literal_[]">raw\\_value</span>',
+    '<div>literal\\_[]</div>\n\nuser_name',
+    '> user_name `literal\\_[]`',
+    '```text\nliteral\\_[]\n```\n\nuser_name',
+    '[ref]\n\n> [ref]: /target\n>\n> tail',
+    '> [ref]\n\n[ref]: /target'
+  ])('preserves source ownership and reopen semantics: %s', (source) => {
+    const editor = createRichEditor(source)
+    try {
+      expectReopens(editor, createRichEditor)
+      if (source.includes('<div>')) {
+        expect(editor.getMarkdown()).toContain('<div>literal\\_[]</div>')
+      }
+      if (source.includes('<span')) {
+        expect(editor.getMarkdown()).toContain('<span data-value="literal_[]">')
+      }
+    } finally {
+      editor.destroy()
+    }
+  })
+})
diff --git a/src/renderer/src/components/editor/rich-markdown-extension.ts b/src/renderer/src/components/editor/rich-markdown-extension.ts
index c36c692b4b95..06d93579abf0 100644
--- a/src/renderer/src/components/editor/rich-markdown-extension.ts
+++ b/src/renderer/src/components/editor/rich-markdown-extension.ts
@@ -1,4 +1,5 @@
 import { Markdown } from '@tiptap/markdown'
+import { registerRichMarkdownBlockSource } from './rich-markdown-block-source'
 import { preserveLiteralMarkdownSource } from './rich-markdown-literal-serialization'
 import type { RichMarkdownEditorCodec } from './rich-markdown-source-transport'
 
@@ -23,6 +24,7 @@ export function createRichMarkdownExtension(
     onBeforeCreate(event) {
       this.parent?.(event)
       preserveLiteralMarkdownSource(this.editor, codec, htmlSuperscriptLinks)
+      registerRichMarkdownBlockSource(this.editor, codec, htmlSuperscriptLinks)
     }
   })
 }
diff --git a/src/renderer/src/components/editor/rich-markdown-extensions.ts b/src/renderer/src/components/editor/rich-markdown-extensions.ts
index 9a4f292f0425..c7e69917c253 100644
--- a/src/renderer/src/components/editor/rich-markdown-extensions.ts
+++ b/src/renderer/src/components/editor/rich-markdown-extensions.ts
@@ -1,11 +1,13 @@
+import { createMarkdownTokenizerStart } from './markdown-tokenizer-start'
 import type { AnyExtension } from '@tiptap/core'
 import StarterKit from '@tiptap/starter-kit'
+import { RichMarkdownTrailingParagraph } from './rich-markdown-trailing-paragraph'
 import Link from '@tiptap/extension-link'
 import { Code } from '@tiptap/extension-code'
 import Image from '@tiptap/extension-image'
 import Placeholder from '@tiptap/extension-placeholder'
 import TaskItem from '@tiptap/extension-task-item'
-import { Table } from '@tiptap/extension-table'
+import { RichMarkdownTable } from './rich-markdown-table'
 import { TableCell } from '@tiptap/extension-table-cell'
 import { TableHeader } from '@tiptap/extension-table-header'
 import { TableRow } from '@tiptap/extension-table-row'
@@ -73,9 +75,11 @@ export function createRichMarkdownExtensions({
       code: false,
       codeBlock: false,
       orderedList: false,
-      paragraph: false
+      paragraph: false,
+      trailingNode: false
     }),
     RichMarkdownParagraph,
+    RichMarkdownTrailingParagraph,
     RichMarkdownCode,
     RichMarkdownCodeBlockLowlight.extend({
       addNodeView() {
@@ -218,7 +222,7 @@ export function createRichMarkdownExtensions({
       nested: true
     }),
     ...createOrcaDetailsExtensions(),
-    Table.configure({
+    RichMarkdownTable.configure({
       resizable: false
     }),
     TableRow,
@@ -229,7 +233,16 @@ export function createRichMarkdownExtensions({
         throwOnError: false
       }
     }),
-    BlockMath.configure({
+    BlockMath.extend({
+      markdownTokenizer:
+        BlockMath.config.markdownTokenizer &&
+        typeof BlockMath.config.markdownTokenizer !== 'function'
+          ? {
+              ...BlockMath.config.markdownTokenizer,
+              start: createMarkdownTokenizerStart('$$')
+            }
+          : BlockMath.config.markdownTokenizer
+    }).configure({
       katexOptions: {
         displayMode: true,
         throwOnError: false
diff --git a/src/renderer/src/components/editor/rich-markdown-literal-serialization.ts b/src/renderer/src/components/editor/rich-markdown-literal-serialization.ts
index d294bec3e069..3a998fe04952 100644
--- a/src/renderer/src/components/editor/rich-markdown-literal-serialization.ts
+++ b/src/renderer/src/components/editor/rich-markdown-literal-serialization.ts
@@ -1,11 +1,24 @@
 import type { Editor, JSONContent } from '@tiptap/core'
+import { getRichMarkdownSerializationDocument } from './rich-markdown-trailing-paragraph'
 import type { Node as ProseMirrorNode } from '@tiptap/pm/model'
 import { encodeRawMarkdownHtmlForRichEditor } from './raw-markdown-html'
 import type { RichMarkdownEditorCodec } from './rich-markdown-source-transport'
 
+const MAX_LITERAL_BLOCK_CODE_UNITS = 50_000
+const LITERAL_BLOCK_TYPES = new Set([
+  'paragraph',
+  'heading',
+  'blockquote',
+  'bulletList',
+  'orderedList',
+  'taskList'
+])
+
 function withoutOptionalEscapes(markdown: string): string {
-  return markdown.replace(/\\([\\_[\]])/g, (escaped, character) =>
-    character === '\\' ? escaped : character
+  // Consume escaped backslashes first; underscore runs must be wholly inside a word.
+  return markdown.replace(
+    /\\\\|(?<=[\p{L}\p{N}\p{M}])(?:\\_)+(?=[\p{L}\p{N}\p{M}])|\\[[\]]/gu,
+    (escaped) => (escaped === '\\\\' ? escaped : escaped.replace(/\\/g, ''))
   )
 }
 
@@ -16,51 +29,74 @@ export function preserveLiteralMarkdownSource(
 ): void {
   const manager = editor.markdown!
   const render = manager.renderNodeToMarkdown.bind(manager)
-  const serialize = editor.getMarkdown.bind(editor)
   const cache = new WeakMap<ProseMirrorNode, { markdown: string; result: string }>()
   let blocks: Map<JSONContent, ProseMirrorNode> | undefined
 
   manager.renderNodeToMarkdown = (node, ...args) => {
     const markdown = render(node, ...args)
     const block = blocks?.get(node)
-    if (!block || !/\\[[\]]/.test(markdown)) {
+    if (!block || !/\\[_[\]~`*]/.test(markdown)) {
+      return markdown
+    }
+    // Retain existing large paragraph/heading fidelity; cap only the expanded validation.
+    const preservesBrackets =
+      (node.type === 'paragraph' || node.type === 'heading') && /\\[[\]]/.test(markdown)
+    if (markdown.length > MAX_LITERAL_BLOCK_CODE_UNITS && !preservesBrackets) {
       return markdown
     }
     const cached = cache.get(block)
     if (cached?.markdown === markdown) {
       return cached.result
     }
-    const candidate = withoutOptionalEscapes(markdown)
     let result = markdown
-    try {
-      const parsed = manager.parse(
-        encodeRawMarkdownHtmlForRichEditor(candidate, codec, { htmlSuperscriptLinks })
+    const candidates = [
+      withoutOptionalEscapes,
+      ...['~', '`', '*'].map(
+        (character) => (source: string) =>
+          source.replace(/\\([\\_~`*])/g, (escaped, value) =>
+            value === character ? value : escaped
+          )
       )
-      // Every mark, attribute and text position must survive reopening this block.
-      if (parsed.content?.length === 1 && editor.schema.nodeFromJSON(parsed.content[0]).eq(block)) {
-        result = candidate
+    ]
+    for (const unescape of candidates) {
+      const candidate = unescape(result)
+      if (candidate === result) {
+        continue
+      }
+      try {
+        const parsed = manager.parse(
+          encodeRawMarkdownHtmlForRichEditor(candidate, codec, { htmlSuperscriptLinks })
+        )
+        // Every mark, attribute and text position must survive reopening this block.
+        if (
+          parsed.content?.length === 1 &&
+          editor.schema.nodeFromJSON(parsed.content[0]).eq(block)
+        ) {
+          result = candidate
+        }
+      } catch {
+        // Keep escapes when a custom parser cannot prove equivalence.
       }
-    } catch {
-      // Keep the upstream escaped output when a custom parser cannot prove equivalence.
     }
     cache.set(block, { markdown, result })
     return result
   }
 
   editor.getMarkdown = () => {
-    const markdown = serialize()
-    if (!/\\[[\]]/.test(markdown)) {
+    const document = getRichMarkdownSerializationDocument(editor)
+    const json = document.toJSON()
+    const markdown = manager.serialize(json)
+    if (!/\\[_[\]~`*]/.test(markdown)) {
       return markdown
     }
     // Reference definitions can change inline meaning across block boundaries.
-    if (/^ {0,3}\[[^\n]*\]:/m.test(withoutOptionalEscapes(markdown))) {
+    if (/\][ \t]*:/.test(withoutOptionalEscapes(markdown))) {
       return markdown
     }
-    const json = editor.getJSON()
     blocks = new Map()
     json.content?.forEach((node, index) => {
-      if (node.type === 'paragraph' || node.type === 'heading') {
-        blocks!.set(node, editor.state.doc.child(index))
+      if (node.type && LITERAL_BLOCK_TYPES.has(node.type)) {
+        blocks!.set(node, document.child(index))
       }
     })
     try {
diff --git a/src/renderer/src/components/editor/rich-markdown-save-benchmark.test.ts b/src/renderer/src/components/editor/rich-markdown-save-benchmark.test.ts
new file mode 100644
index 000000000000..4051a8e9b912
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-save-benchmark.test.ts
@@ -0,0 +1,54 @@
+import { Editor } from '@tiptap/core'
+import { it, expect } from 'vitest'
+import { createRichMarkdownEditorCodec } from './rich-markdown-source-transport'
+import { createRichMarkdownExtensions } from './rich-markdown-extensions'
+import { commitRichMarkdownSerialization } from './rich-markdown-serialization-commit'
+function create(source: string) {
+  return new Editor({
+    element: null,
+    extensions: createRichMarkdownExtensions({ codec: createRichMarkdownEditorCodec() }),
+    content: source,
+    contentType: 'markdown'
+  })
+}
+// Run with ORCA_MARKDOWN_SAVE_BENCHMARK=1; timings are evidence, not a machine-dependent CI gate.
+it.skipIf(process.env.ORCA_MARKDOWN_SAVE_BENCHMARK !== '1')(
+  'measures source preservation at supported document sizes',
+  () => {
+    for (const count of [100, 500, 1500, 6000]) {
+      const source = `${Array.from(
+        { length: count },
+        (_, i) => `Paragraph ${i} with _emphasis_ and user_name.\n\n> [!NOTE]\n> - Callout ${i}\n\n`
+      ).join('')}End\n`
+      const editor = create(source)
+      const refs = {
+        originalSourceRef: { current: source },
+        baseCanonicalRef: { current: editor.getMarkdown() },
+        lastCommittedMarkdownRef: { current: source }
+      }
+      const times: number[] = []
+      for (let j = 0; j < 3; j++) {
+        editor.commands.insertContentAt(2, { type: 'text', text: 'x' })
+        const start = performance.now()
+        const result = commitRichMarkdownSerialization(editor, refs, (text) => {
+          const round = create(text)
+          try {
+            return round.getMarkdown()
+          } finally {
+            round.destroy()
+          }
+        })
+        times.push(Math.round(performance.now() - start))
+        expect(result.markdown).toContain('> [!NOTE]\n> - Callout 0')
+      }
+      process.stdout.write(
+        `${JSON.stringify({
+          bytes: source.length,
+          blocks: editor.state.doc.childCount,
+          milliseconds: times
+        })}\n`
+      )
+      editor.destroy()
+    }
+  }
+)
diff --git a/src/renderer/src/components/editor/rich-markdown-serialization-commit.ts b/src/renderer/src/components/editor/rich-markdown-serialization-commit.ts
index dcebdf60dbd6..e21089a0a2e7 100644
--- a/src/renderer/src/components/editor/rich-markdown-serialization-commit.ts
+++ b/src/renderer/src/components/editor/rich-markdown-serialization-commit.ts
@@ -1,5 +1,6 @@
 import type { MutableRefObject } from 'react'
 import type { Editor } from '@tiptap/react'
+import { reconcileRichMarkdownBlockSource } from './rich-markdown-block-source'
 import {
   reconcileSerializedMarkdown,
   restoreMarkdownSourceEol
@@ -58,6 +59,22 @@ export function commitRichMarkdownSerialization(
     reconciled = restoreMarkdownSourceEol(edited, refs.originalSourceRef.current)
   }
 
+  if (
+    editor &&
+    edited !== refs.baseCanonicalRef.current &&
+    reconciled === restoreMarkdownSourceEol(edited, refs.originalSourceRef.current)
+  ) {
+    const preserved = reconcileRichMarkdownBlockSource(
+      editor,
+      refs.originalSourceRef.current,
+      edited,
+      roundTrip
+    )
+    if (preserved !== null) {
+      reconciled = preserved
+    }
+  }
+
   refs.originalSourceRef.current = reconciled
   // Why: reconciled ≡ edited semantically, so its canonical form is `edited`
   // (also correct in every fallback branch, which returns `edited` verbatim).
diff --git a/src/renderer/src/components/editor/rich-markdown-table.test.ts b/src/renderer/src/components/editor/rich-markdown-table.test.ts
new file mode 100644
index 000000000000..b3c79eee9616
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-table.test.ts
@@ -0,0 +1,56 @@
+import { Table } from '@tiptap/extension-table'
+import { afterEach, expect, it, vi } from 'vitest'
+import { RichMarkdownTable } from './rich-markdown-table'
+
+afterEach(() => vi.restoreAllMocks())
+
+it.each([
+  '',
+  'prose',
+  '| A | B |\n| --- | :---: |\n| a | b |',
+  'A | B\n--- | ---\na | b',
+  '| A |\nnot a separator\n',
+  'one\n\n| A |\n| --- |',
+  '| A |\r\n| --- |\r\n',
+  '| A |\n| - |',
+  '| A |\n| : |',
+  `| A |\n| - |\n${'prose\n'.repeat(10_000)}`
+])('matches the upstream table detector: %j', (source) => {
+  const base = Table.config.markdownTokenizer
+  const guarded = RichMarkdownTable.config.markdownTokenizer
+  if (
+    !base ||
+    typeof base === 'function' ||
+    typeof base.start !== 'function' ||
+    !guarded ||
+    typeof guarded === 'function' ||
+    typeof guarded.start !== 'function'
+  ) {
+    throw new Error('Table tokenizer contract changed')
+  }
+  expect(guarded.start(source)).toBe(base.start(source))
+})
+
+it('only passes the first two lines to the upstream detector', () => {
+  const base = Table.config.markdownTokenizer
+  const guarded = RichMarkdownTable.config.markdownTokenizer
+  if (
+    !base ||
+    typeof base === 'function' ||
+    typeof base.start !== 'function' ||
+    !guarded ||
+    typeof guarded === 'function' ||
+    typeof guarded.start !== 'function'
+  ) {
+    throw new Error('Table tokenizer contract changed')
+  }
+  const original = base.start
+  const start = vi.fn(original)
+  base.start = start
+  try {
+    guarded.start(`first\nsecond\n${'rest\n'.repeat(10_000)}`)
+    expect(start).toHaveBeenCalledExactlyOnceWith('first\nsecond')
+  } finally {
+    base.start = original
+  }
+})
diff --git a/src/renderer/src/components/editor/rich-markdown-table.ts b/src/renderer/src/components/editor/rich-markdown-table.ts
new file mode 100644
index 000000000000..4e2855313907
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-table.ts
@@ -0,0 +1,22 @@
+import { Table } from '@tiptap/extension-table'
+
+const tokenizer = Table.config.markdownTokenizer
+
+export const RichMarkdownTable = Table.extend({
+  markdownTokenizer:
+    tokenizer && typeof tokenizer !== 'function'
+      ? {
+          ...tokenizer,
+          start(source) {
+            const firstEnd = source.indexOf('\n')
+            if (firstEnd === -1) {
+              return -1
+            }
+            const secondEnd = source.indexOf('\n', firstEnd + 1)
+            // Upstream tests only two lines, but splits the entire remaining document.
+            const prefix = secondEnd === -1 ? source : source.slice(0, secondEnd)
+            return typeof tokenizer.start === 'function' ? tokenizer.start(prefix) : -1
+          }
+        }
+      : tokenizer
+})
diff --git a/src/renderer/src/components/editor/rich-markdown-trailing-paragraph.test.ts b/src/renderer/src/components/editor/rich-markdown-trailing-paragraph.test.ts
new file mode 100644
index 000000000000..042c1d25a72e
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-trailing-paragraph.test.ts
@@ -0,0 +1,77 @@
+// @vitest-environment happy-dom
+import { Editor } from '@tiptap/core'
+import { afterEach, describe, expect, it } from 'vitest'
+import { createRichMarkdownExtensions } from './rich-markdown-extensions'
+import { createRichMarkdownEditorCodec } from './rich-markdown-source-transport'
+import { commitRichMarkdownSerialization } from './rich-markdown-serialization-commit'
+
+const editors: Editor[] = []
+function createEditor(content: string) {
+  const editor = new Editor({
+    element: document.createElement('div'),
+    extensions: createRichMarkdownExtensions({ codec: createRichMarkdownEditorCodec() }),
+    content,
+    contentType: 'markdown'
+  })
+  editors.push(editor)
+  return editor
+}
+function serialize(source: string) {
+  return createEditor(source).getMarkdown()
+}
+afterEach(() => editors.splice(0).forEach((editor) => editor.destroy()))
+
+describe('the synthetic trailing paragraph', () => {
+  it.each(['> [!NOTE]\n> - A list item', '# Heading', '- List item', '```text\ncode\n```'])(
+    'does not change serialization on selection or an unrelated edit: %s',
+    (ending) => {
+      const source = `\nProse to edit.\n\n${ending}\n`
+      const editor = createEditor(source)
+      const refs = {
+        originalSourceRef: { current: source },
+        baseCanonicalRef: { current: editor.getMarkdown() },
+        lastCommittedMarkdownRef: { current: source }
+      }
+      editor.commands.setTextSelection(2)
+      expect(editor.state.doc.lastChild?.type.name).toBe('paragraph')
+      expect(editor.getMarkdown()).toBe(refs.baseCanonicalRef.current)
+      editor.commands.insertContentAt(1, { type: 'text', text: 'Edited ' })
+      expect(commitRichMarkdownSerialization(editor, refs, serialize).markdown).toBe(
+        source.replace('Prose', 'Edited Prose')
+      )
+    }
+  )
+
+  it('saves text typed into the trailing paragraph and survives undo/redo', () => {
+    const editor = createEditor('> Quote')
+    editor.commands.setTextSelection(2)
+    editor.commands.insertContentAt(editor.state.doc.content.size - 1, {
+      type: 'text',
+      text: 'New paragraph'
+    })
+    expect(editor.getMarkdown()).toBe('> Quote\n\nNew paragraph')
+    editor.commands.undo()
+    expect(editor.getMarkdown()).toBe('> Quote\n\n')
+    editor.commands.redo()
+    expect(editor.getMarkdown()).toBe('> Quote\n\nNew paragraph')
+  })
+
+  it('keeps an intentionally added blank paragraph', () => {
+    const editor = createEditor('> Quote')
+    editor.commands.setTextSelection(2)
+    editor.commands.setTextSelection(editor.state.doc.content.size - 1)
+    editor.commands.splitBlock()
+    expect(createEditor(editor.getMarkdown()).getJSON()).toEqual(editor.getJSON())
+    expect(editor.state.doc.childCount).toBe(3)
+  })
+
+  it('keeps authored trailing blank paragraphs after loading and replacing content', () => {
+    const editor = createEditor('> Quote\n\n')
+    editor.commands.setTextSelection(2)
+    expect(editor.getMarkdown()).toBe('> Quote\n\n')
+    editor.commands.setContent('# Heading', { contentType: 'markdown' })
+    expect(editor.getMarkdown()).toBe('# Heading')
+    editor.commands.setContent('# Heading\n\n', { contentType: 'markdown' })
+    expect(editor.getMarkdown()).toBe('# Heading\n\n')
+  })
+})
diff --git a/src/renderer/src/components/editor/rich-markdown-trailing-paragraph.ts b/src/renderer/src/components/editor/rich-markdown-trailing-paragraph.ts
new file mode 100644
index 000000000000..614f3ddace7a
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-trailing-paragraph.ts
@@ -0,0 +1,65 @@
+import type { Editor } from '@tiptap/core'
+import { TrailingNode } from '@tiptap/extensions'
+import type { Node as ProseMirrorNode } from '@tiptap/pm/model'
+import { Plugin, PluginKey } from '@tiptap/pm/state'
+
+const trailingParagraph = new PluginKey<ProseMirrorNode | null>('richMarkdownTrailingParagraph')
+
+// The click target below a final quote/list is UI scaffolding until the user edits it.
+export const RichMarkdownTrailingParagraph = TrailingNode.extend({
+  addProseMirrorPlugins() {
+    const plugins = (this.parent?.() ?? []).map((plugin) => {
+      const append = plugin.spec.appendTransaction
+      if (!append) {
+        return plugin
+      }
+      return new Plugin({
+        ...plugin.spec,
+        appendTransaction(transactions, oldState, state) {
+          const transaction = append.call(plugin, transactions, oldState, state)
+          if (transaction) {
+            transaction.setMeta(trailingParagraph, transaction.doc.lastChild)
+          }
+          return transaction
+        }
+      })
+    })
+    return [
+      ...plugins,
+      new Plugin<ProseMirrorNode | null>({
+        key: trailingParagraph,
+        state: {
+          init: () => null,
+          apply(transaction, previous, oldState) {
+            const inserted: unknown = transaction.getMeta(trailingParagraph)
+            if (inserted === transaction.doc.lastChild && transaction.doc.lastChild) {
+              return transaction.doc.lastChild
+            }
+            if (!previous || !transaction.docChanged) {
+              return previous
+            }
+            let start = oldState.doc.content.size - previous.nodeSize
+            let touched = false
+            for (const map of transaction.mapping.maps) {
+              map.forEach((from, to) => {
+                if (from <= start + previous.nodeSize && to > start) {
+                  touched = true
+                }
+              })
+              start = map.map(start, 1)
+            }
+            return !touched && transaction.doc.lastChild === previous ? previous : null
+          }
+        }
+      })
+    ]
+  }
+})
+
+export function getRichMarkdownSerializationDocument(editor: Editor): ProseMirrorNode {
+  const document = editor.state.doc
+  const synthetic = trailingParagraph.getState(editor.state)
+  return synthetic && document.lastChild === synthetic
+    ? document.copy(document.content.cut(0, document.content.size - synthetic.nodeSize))
+    : document
+}
diff --git a/src/renderer/src/components/editor/tiptap-marked-facade.ts b/src/renderer/src/components/editor/tiptap-marked-facade.ts
index 80cadb343f90..196bb8e16c8b 100644
--- a/src/renderer/src/components/editor/tiptap-marked-facade.ts
+++ b/src/renderer/src/components/editor/tiptap-marked-facade.ts
@@ -1,3 +1,4 @@
+import { getMarkdownTokenizerStartMarker } from './markdown-tokenizer-start'
 import {
   Hooks,
   Lexer,
@@ -19,6 +20,27 @@ export function createTiptapMarkedFacade(): typeof marked {
   // Why: Tiptap 3.22.5 registers on the injected instance but parses with
   // `new instance.Lexer()`, so the constructor must retain the private registry.
   class RegistryLexer extends Lexer {
+    private readonly registeredExtensions = this.options.extensions
+    blockTokens(source: string, tokens?: TokensList, lastParagraphClipped?: boolean): TokensList
+    blockTokens(source: string, tokens?: Token[], lastParagraphClipped?: boolean): Token[]
+    blockTokens(source: string, tokens?: Token[], lastParagraphClipped?: boolean): Token[] {
+      const previousExtensions = this.options.extensions
+      const extensions = this.registeredExtensions
+      if (!extensions?.startBlock) {
+        return super.blockTokens(source, tokens, lastParagraphClipped)
+      }
+      const startBlock = extensions.startBlock.filter((start) => {
+        const marker = getMarkdownTokenizerStartMarker(start)
+        return !marker || source.includes(marker)
+      })
+      this.options.extensions = { ...extensions, startBlock }
+      try {
+        return super.blockTokens(source, tokens, lastParagraphClipped)
+      } finally {
+        this.options.extensions = previousExtensions
+      }
+    }
+
     constructor(options?: MarkedOptions) {
       super({
         ...registry.defaults,
diff --git a/src/renderer/src/components/editor/useEditorPanelContentState.test.tsx b/src/renderer/src/components/editor/useEditorPanelContentState.test.tsx
index 14b704650873..6df420f6abca 100644
--- a/src/renderer/src/components/editor/useEditorPanelContentState.test.tsx
+++ b/src/renderer/src/components/editor/useEditorPanelContentState.test.tsx
@@ -41,6 +41,8 @@ vi.mock('@/lib/connection-context', () => ({
   isWorktreeConnectionResolved: mocks.isWorktreeConnectionResolved
 }))
 
+vi.mock('@/lib/worktree-host-connection-phase', () => import('./local-host-test-fixture'))
+
 vi.mock('@/lib/runtime-workspace-file-route', () => ({
   findWorkspaceFileRoute: vi.fn(() => null)
 }))
diff --git a/src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts b/src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts
index 005887aca11e..e7fdfc88754e 100644
--- a/src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts
+++ b/src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts
@@ -6,6 +6,7 @@ import { getDiskBaselineSignature } from './diff-content-signature'
 import { getRuntimeFileReadScope, readRuntimeFileContent } from '@/runtime/runtime-file-client'
 import { RuntimeRpcCallError, settingsForRuntimeOwner } from '@/runtime/runtime-rpc-client'
 import { findWorkspaceFileRoute } from '@/lib/runtime-workspace-file-route'
+import { selectWorktreeHostConnectionPhase } from '@/lib/worktree-host-connection-phase'
 import {
   LOCAL_EXECUTION_HOST_ID,
   toRuntimeExecutionHostId,
@@ -81,6 +82,7 @@ export function useEditorPanelFileContentLoader({
       fileReadGenerationCounterRef.current = generation
       fileReadGenerationRef.current[id] = generation
       outstandingFileReadsRef.current[id] = generation
+      let readConnectionId: string | undefined
       try {
         const resolvedConnectionId = getConnectionIdForFile(worktreeId ?? null, filePath)
         const connectionId = resolvedConnectionId ?? undefined
@@ -94,7 +96,7 @@ export function useEditorPanelFileContentLoader({
         // worktree's SSH owner must never be inferred for them (a stamp still routes).
         const isLiveTailLogTab =
           restoredOpenFile?.readOnly === true && restoredOpenFile.liveTail === true
-        let readConnectionId = connectionId
+        readConnectionId = connectionId
         let readWorktreeId = worktreeId
         let readRelativePath = restoredOpenFile?.relativePath ?? relativePath
         if (
@@ -204,10 +206,25 @@ export function useEditorPanelFileContentLoader({
         if (fileReadGenerationRef.current[id] !== generation) {
           return
         }
-        const message = err instanceof Error ? err.message : String(err)
+        const hostConnection = selectWorktreeHostConnectionPhase(
+          useAppStore.getState(),
+          worktreeId ?? null
+        )
+        // Why: a read through an SSH host that is still connecting failed on the connection,
+        // not the file; the retry gate waits for it rather than showing "connection dropped".
+        const hostConnecting =
+          hostConnection.phase === 'connecting' &&
+          readConnectionId !== undefined &&
+          readConnectionId === hostConnection.targetId
+        const message = hostConnecting
+          ? WORKTREE_OWNER_NOT_READY_ERROR
+          : err instanceof Error
+            ? err.message
+            : String(err)
         // Why: a host may put prose on the message and the machine token on `.code`;
         // classifiers downstream must see the token, not only its rendering (#21041).
-        const loadErrorCode = err instanceof RuntimeRpcCallError ? err.code : undefined
+        const loadErrorCode =
+          !hostConnecting && err instanceof RuntimeRpcCallError ? err.code : undefined
         setFileContents((prev) => ({
           ...prev,
           [id]: {
diff --git a/src/renderer/src/components/editor/useEditorPanelFileLoadRetry.host-connection.test.tsx b/src/renderer/src/components/editor/useEditorPanelFileLoadRetry.host-connection.test.tsx
new file mode 100644
index 000000000000..ad6b4cb012a0
--- /dev/null
+++ b/src/renderer/src/components/editor/useEditorPanelFileLoadRetry.host-connection.test.tsx
@@ -0,0 +1,257 @@
+// @vitest-environment happy-dom
+
+import { act, type Dispatch, type SetStateAction } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { OpenFile } from '@/store/slices/editor'
+import type { WorktreeHostConnection } from '@/lib/worktree-host-connection-phase'
+import type { SshConnectionStatus } from '../../../../shared/ssh-types'
+import {
+  WORKTREE_OWNER_NOT_READY_ERROR,
+  WORKTREE_OWNER_UNREACHABLE_ERROR,
+  type FileContent
+} from './editor-panel-content-types'
+
+const mocks = vi.hoisted(() => {
+  const hostConnection: WorktreeHostConnection = {
+    phase: 'connecting',
+    targetId: 'ssh-a',
+    environmentId: null,
+    publishedStatus: 'connecting',
+    connectedEpoch: null
+  }
+  return { hostConnection, readRuntimeFileContent: vi.fn() }
+})
+
+vi.mock('@/lib/worktree-host-connection-phase', () => ({
+  selectWorktreeHostConnectionPhase: () => mocks.hostConnection,
+  useWorktreeHostConnection: () => mocks.hostConnection
+}))
+vi.mock('@/lib/connection-context', () => ({
+  getConnectionIdForFile: () => 'ssh-a',
+  isWorktreeConnectionResolved: () => true
+}))
+vi.mock('@/runtime/runtime-file-client', () => ({
+  getRuntimeFileReadScope: (_settings: unknown, connectionId: string | undefined) =>
+    connectionId ?? 'local',
+  readRuntimeFileContent: mocks.readRuntimeFileContent
+}))
+
+import {
+  OWNER_NOT_READY_RETRY_DELAY_MS,
+  useEditorPanelFileLoadRetry
+} from './useEditorPanelFileLoadRetry'
+import {
+  useEditorPanelFileContentLoader,
+  type EditorPanelFileContentLoader
+} from './useEditorPanelFileContentLoader'
+
+const SSH_PROVIDER_UNAVAILABLE =
+  'Remote connection dropped. Click Reconnect on the SSH target before retrying.'
+
+const STATUS_BY_PHASE: Record<WorktreeHostConnection['phase'], SshConnectionStatus | null> = {
+  local: null,
+  connecting: 'connecting',
+  connected: 'connected',
+  unavailable: 'disconnected',
+  unverifiable: null
+}
+
+function setHost(
+  phase: WorktreeHostConnection['phase'],
+  connectionGeneration: number | null = null
+): void {
+  mocks.hostConnection = {
+    phase,
+    targetId: 'ssh-a',
+    environmentId: null,
+    publishedStatus: STATUS_BY_PHASE[phase],
+    connectedEpoch: phase === 'connected' ? `ssh-a:${connectionGeneration}` : null
+  }
+}
+
+const file: OpenFile = {
+  id: 'tab-1',
+  filePath: '/home/user/project/src/index.ts',
+  relativePath: 'src/index.ts',
+  worktreeId: 'repo-ssh::/home/user/project',
+  language: 'typescript',
+  isDirty: false,
+  mode: 'edit'
+}
+const OPEN_FILES_REF = { current: [file] }
+
+function RetryHarness({
+  fileContents,
+  attemptsRef,
+  loadFileContent,
+  setFileContents
+}: {
+  fileContents: Record<string, FileContent>
+  attemptsRef: { current: Record<string, number> }
+  loadFileContent: () => Promise<void>
+  setFileContents: Dispatch<SetStateAction<Record<string, FileContent>>>
+}): null {
+  useEditorPanelFileLoadRetry({
+    activeFile: file,
+    fileContents,
+    fileLoadRetryAttemptsRef: attemptsRef,
+    loadFileContent,
+    openFilesRef: OPEN_FILES_REF,
+    setFileContents
+  })
+  return null
+}
+
+describe('editor file loads while the SSH host connects', () => {
+  let container: HTMLDivElement
+  let root: Root
+
+  beforeEach(() => {
+    vi.useFakeTimers()
+    mocks.readRuntimeFileContent.mockReset()
+    container = document.createElement('div')
+    document.body.appendChild(container)
+    root = createRoot(container)
+  })
+
+  afterEach(() => {
+    act(() => root.unmount())
+    container.remove()
+    vi.useRealTimers()
+  })
+
+  it('shows the connecting copy, not "connection dropped", for a read that failed mid-connect', async () => {
+    setHost('connecting')
+    mocks.readRuntimeFileContent.mockRejectedValue(new Error(SSH_PROVIDER_UNAVAILABLE))
+    let fileContents: Record<string, FileContent> = {}
+    let load: EditorPanelFileContentLoader | null = null
+    function LoaderHarness(): null {
+      load = useEditorPanelFileContentLoader({
+        fileLoadRetryAttemptsRef: { current: {} },
+        fileReadGenerationCounterRef: { current: 0 },
+        fileReadGenerationRef: { current: {} },
+        openFilesRef: OPEN_FILES_REF,
+        outstandingFileReadsRef: { current: {} },
+        setFileContents: (updater) => {
+          fileContents = typeof updater === 'function' ? updater(fileContents) : updater
+        }
+      })
+      return null
+    }
+    act(() => root.render(<LoaderHarness />))
+    await act(async () => load?.(file.filePath, file.id, file.worktreeId, file.relativePath))
+    expect(fileContents[file.id]?.loadError).toBe(WORKTREE_OWNER_NOT_READY_ERROR)
+
+    setHost('unavailable')
+    await act(async () => load?.(file.filePath, file.id, file.worktreeId, file.relativePath))
+    expect(fileContents[file.id]?.loadError).toBe(SSH_PROVIDER_UNAVAILABLE)
+  })
+
+  it('spends no retry budget while connecting, then reloads exactly once when the host connects', () => {
+    setHost('connecting')
+    const attemptsRef: { current: Record<string, number> } = { current: {} }
+    let fileContents: Record<string, FileContent> = {
+      [file.id]: { content: '', isBinary: false, loadError: WORKTREE_OWNER_NOT_READY_ERROR }
+    }
+    const setFileContents: Dispatch<SetStateAction<Record<string, FileContent>>> = (updater) => {
+      fileContents = typeof updater === 'function' ? updater(fileContents) : updater
+    }
+    const loadFileContent = vi.fn(async () => undefined)
+    const render = (): void =>
+      act(() =>
+        root.render(
+          <RetryHarness
+            fileContents={fileContents}
+            attemptsRef={attemptsRef}
+            loadFileContent={loadFileContent}
+            setFileContents={setFileContents}
+          />
+        )
+      )
+
+    render()
+    act(() => vi.advanceTimersByTime(OWNER_NOT_READY_RETRY_DELAY_MS * 10))
+    expect(loadFileContent).not.toHaveBeenCalled()
+    expect(attemptsRef.current[file.id]).toBeUndefined()
+
+    setHost('connected', 1)
+    render()
+    expect(loadFileContent).toHaveBeenCalledOnce()
+    expect(attemptsRef.current[file.id]).toBe(0)
+    expect(fileContents[file.id]).toBeUndefined()
+
+    render()
+    act(() => vi.advanceTimersByTime(OWNER_NOT_READY_RETRY_DELAY_MS * 10))
+    expect(loadFileContent).toHaveBeenCalledOnce()
+  })
+
+  it('re-arms an exhausted budget when the host reconnects under a new generation', () => {
+    setHost('connected', 1)
+    const attemptsRef: { current: Record<string, number> } = { current: { [file.id]: 3 } }
+    let fileContents: Record<string, FileContent> = {
+      [file.id]: { content: '', isBinary: false, loadError: WORKTREE_OWNER_UNREACHABLE_ERROR }
+    }
+    const setFileContents: Dispatch<SetStateAction<Record<string, FileContent>>> = (updater) => {
+      fileContents = typeof updater === 'function' ? updater(fileContents) : updater
+    }
+    const loadFileContent = vi.fn(async () => undefined)
+    const render = (): void =>
+      act(() =>
+        root.render(
+          <RetryHarness
+            fileContents={fileContents}
+            attemptsRef={attemptsRef}
+            loadFileContent={loadFileContent}
+            setFileContents={setFileContents}
+          />
+        )
+      )
+
+    render()
+    expect(loadFileContent).not.toHaveBeenCalled()
+
+    setHost('connected', 2)
+    render()
+    expect(loadFileContent).toHaveBeenCalledOnce()
+    expect(attemptsRef.current[file.id]).toBe(0)
+  })
+
+  it('keeps retrying for a host it cannot verify, then reloads once it connects', () => {
+    setHost('unverifiable')
+    const attemptsRef: { current: Record<string, number> } = { current: {} }
+    let fileContents: Record<string, FileContent> = {
+      [file.id]: { content: '', isBinary: false, loadError: WORKTREE_OWNER_NOT_READY_ERROR }
+    }
+    const setFileContents: Dispatch<SetStateAction<Record<string, FileContent>>> = (updater) => {
+      fileContents = typeof updater === 'function' ? updater(fileContents) : updater
+    }
+    const loadFileContent = vi.fn(async () => {
+      fileContents = {
+        [file.id]: { content: '', isBinary: false, loadError: WORKTREE_OWNER_NOT_READY_ERROR }
+      }
+    })
+    const render = (): void =>
+      act(() =>
+        root.render(
+          <RetryHarness
+            fileContents={fileContents}
+            attemptsRef={attemptsRef}
+            loadFileContent={loadFileContent}
+            setFileContents={setFileContents}
+          />
+        )
+      )
+
+    // Unverifiable is not "connecting": the ordinary owner-not-ready poll keeps running.
+    render()
+    act(() => vi.advanceTimersByTime(OWNER_NOT_READY_RETRY_DELAY_MS))
+    expect(loadFileContent).toHaveBeenCalledOnce()
+    expect(attemptsRef.current[file.id]).toBe(1)
+
+    setHost('connected', 1)
+    render()
+    expect(loadFileContent).toHaveBeenCalledTimes(2)
+    expect(attemptsRef.current[file.id]).toBe(0)
+  })
+})
diff --git a/src/renderer/src/components/editor/useEditorPanelFileLoadRetry.ts b/src/renderer/src/components/editor/useEditorPanelFileLoadRetry.ts
index 571ccf548c05..4f3057e7b1ad 100644
--- a/src/renderer/src/components/editor/useEditorPanelFileLoadRetry.ts
+++ b/src/renderer/src/components/editor/useEditorPanelFileLoadRetry.ts
@@ -1,5 +1,6 @@
-import { useEffect, type Dispatch, type MutableRefObject, type SetStateAction } from 'react'
+import { useEffect, useRef, type Dispatch, type MutableRefObject, type SetStateAction } from 'react'
 import type { OpenFile } from '@/store/slices/editor'
+import { useWorktreeHostConnection } from '@/lib/worktree-host-connection-phase'
 import { hasRuntimeRpcErrorCode } from '../../../../shared/runtime-rpc-error-code'
 import {
   WORKTREE_HOST_SELECTOR_NOT_FOUND_CODE,
@@ -79,13 +80,61 @@ export function useEditorPanelFileLoadRetry({
   const activeFileLoadErrorCode = activeFileLoadRetryId
     ? fileContents[activeFileLoadRetryId]?.loadErrorCode
     : undefined
+  const hostConnection = useWorktreeHostConnection(activeFile?.worktreeId ?? null)
+  const hostTargetId = hostConnection.targetId
+  const hostConnecting = hostConnection.phase === 'connecting'
+  const connectedHostEpoch = hostConnection.connectedEpoch
+  const seenHostRef = useRef({ targetId: hostTargetId, connectedEpoch: connectedHostEpoch })
 
   useEffect(() => {
+    // Why the same target: switching to a file on another host is not that host connecting.
+    const hostJustConnected =
+      connectedHostEpoch !== null &&
+      seenHostRef.current.targetId === hostTargetId &&
+      seenHostRef.current.connectedEpoch !== connectedHostEpoch
+    seenHostRef.current = { targetId: hostTargetId, connectedEpoch: connectedHostEpoch }
+    if (!activeFileLoadRetryId || !activeFileLoadError) {
+      return
+    }
+    const reload = (nextRetryCount: number): void => {
+      const currentFile = openFilesRef.current.find((file) => file.id === activeFileLoadRetryId)
+      if (
+        !currentFile ||
+        (currentFile.mode !== 'edit' && currentFile.mode !== 'markdown-preview')
+      ) {
+        return
+      }
+      fileLoadRetryAttemptsRef.current[activeFileLoadRetryId] = nextRetryCount
+      setFileContents((prev) => {
+        if (prev[currentFile.id]?.loadError !== activeFileLoadError) {
+          return prev
+        }
+        const next = { ...prev }
+        delete next[currentFile.id]
+        return next
+      })
+      void loadFileContent(
+        currentFile.filePath,
+        currentFile.id,
+        currentFile.worktreeId,
+        currentFile.relativePath
+      )
+    }
+    // Why: the connected transition below re-arms the read, so waiting spends no budget.
+    if (hostConnecting) {
+      return
+    }
+    // Why: a host that just connected (or reconnected) can serve a read a lost connection
+    // failed — including one whose budget already ran out — so reload once on a fresh budget.
     if (
-      !activeFileLoadRetryId ||
-      !activeFileLoadError ||
-      !shouldRetryFileLoadError(activeFileLoadError, activeFileLoadErrorCode)
+      hostJustConnected &&
+      (activeFileLoadError === WORKTREE_OWNER_UNREACHABLE_ERROR ||
+        shouldRetryFileLoadError(activeFileLoadError, activeFileLoadErrorCode))
     ) {
+      reload(0)
+      return
+    }
+    if (!shouldRetryFileLoadError(activeFileLoadError, activeFileLoadErrorCode)) {
       return
     }
     const ownerNotReady = isOwnerNotReadyError(activeFileLoadError)
@@ -127,35 +176,15 @@ export function useEditorPanelFileLoadRetry({
     const delayMs = ownerNotReady
       ? OWNER_NOT_READY_RETRY_DELAY_MS
       : (FILE_LOAD_RETRY_DELAYS_MS[retryCount] ?? FILE_LOAD_RETRY_DELAYS_MS[0])
-    const timeoutId = window.setTimeout(() => {
-      const currentFile = openFilesRef.current.find((file) => file.id === activeFileLoadRetryId)
-      if (
-        !currentFile ||
-        (currentFile.mode !== 'edit' && currentFile.mode !== 'markdown-preview')
-      ) {
-        return
-      }
-      fileLoadRetryAttemptsRef.current[activeFileLoadRetryId] = retryCount + 1
-      setFileContents((prev) => {
-        if (prev[currentFile.id]?.loadError !== activeFileLoadError) {
-          return prev
-        }
-        const next = { ...prev }
-        delete next[currentFile.id]
-        return next
-      })
-      void loadFileContent(
-        currentFile.filePath,
-        currentFile.id,
-        currentFile.worktreeId,
-        currentFile.relativePath
-      )
-    }, delayMs)
+    const timeoutId = window.setTimeout(() => reload(retryCount + 1), delayMs)
     return () => window.clearTimeout(timeoutId)
   }, [
     activeFileLoadRetryId,
     activeFileLoadError,
     activeFileLoadErrorCode,
+    connectedHostEpoch,
+    hostConnecting,
+    hostTargetId,
     fileLoadRetryAttemptsRef,
     loadFileContent,
     openFilesRef,
diff --git a/src/renderer/src/components/editor/useEditorPanelHostUnresolvedContentState.test.tsx b/src/renderer/src/components/editor/useEditorPanelHostUnresolvedContentState.test.tsx
index ddd9938c42e8..c6ff09f8c97a 100644
--- a/src/renderer/src/components/editor/useEditorPanelHostUnresolvedContentState.test.tsx
+++ b/src/renderer/src/components/editor/useEditorPanelHostUnresolvedContentState.test.tsx
@@ -33,6 +33,8 @@ vi.mock('@/lib/connection-context', () => ({
   isWorktreeConnectionResolved: vi.fn(() => true)
 }))
 
+vi.mock('@/lib/worktree-host-connection-phase', () => import('./local-host-test-fixture'))
+
 vi.mock('@/lib/runtime-workspace-file-route', () => ({
   findWorkspaceFileRoute: vi.fn(() => null)
 }))
diff --git a/src/renderer/src/components/editor/useEditorPanelRemoteSiblingContentState.test.tsx b/src/renderer/src/components/editor/useEditorPanelRemoteSiblingContentState.test.tsx
index 6666302d0a9d..08fcc4df79a3 100644
--- a/src/renderer/src/components/editor/useEditorPanelRemoteSiblingContentState.test.tsx
+++ b/src/renderer/src/components/editor/useEditorPanelRemoteSiblingContentState.test.tsx
@@ -37,6 +37,8 @@ vi.mock('@/lib/connection-context', () => ({
   isWorktreeConnectionResolved: vi.fn(() => true)
 }))
 
+vi.mock('@/lib/worktree-host-connection-phase', () => import('./local-host-test-fixture'))
+
 vi.mock('@/lib/runtime-workspace-file-route', () => ({
   findWorkspaceFileRoute: mocks.findWorkspaceFileRoute
 }))
diff --git a/src/renderer/src/components/editor/useEditorPanelVisibilityContentState.test.tsx b/src/renderer/src/components/editor/useEditorPanelVisibilityContentState.test.tsx
index 317fa6257793..818f50107beb 100644
--- a/src/renderer/src/components/editor/useEditorPanelVisibilityContentState.test.tsx
+++ b/src/renderer/src/components/editor/useEditorPanelVisibilityContentState.test.tsx
@@ -32,6 +32,8 @@ vi.mock('@/lib/connection-context', () => ({
   isWorktreeConnectionResolved: vi.fn(() => true)
 }))
 
+vi.mock('@/lib/worktree-host-connection-phase', () => import('./local-host-test-fixture'))
+
 vi.mock('@/lib/runtime-workspace-file-route', () => ({
   findWorkspaceFileRoute: vi.fn(() => null)
 }))
diff --git a/src/renderer/src/components/feature-interaction-writer-boundaries.test.ts b/src/renderer/src/components/feature-interaction-writer-boundaries.test.ts
deleted file mode 100644
index 4a02840098e6..000000000000
--- a/src/renderer/src/components/feature-interaction-writer-boundaries.test.ts
+++ /dev/null
@@ -1,323 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const COMPONENT_ROOT = __dirname
-
-function componentSource(relativePath: string): string {
-  return readFileSync(join(COMPONENT_ROOT, relativePath), 'utf8')
-}
-
-function sourceBetween(source: string, startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start + startPattern.length)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('feature interaction writer boundaries', () => {
-  it('keeps Cmd+J feature writers in open/selection handlers, not query or navigation rendering', () => {
-    // Selection and create callbacks now live in focused hooks; the surface only renders them.
-    const selectionSource = componentSource('use-worktree-jump-palette-selection-actions.ts')
-    const lifecycleSource = componentSource('use-worktree-jump-palette-selection-lifecycle.ts')
-    const createSource = componentSource('use-worktree-jump-palette-create-action.ts')
-    const handlerSection = [selectionSource, lifecycleSource, createSource].join('\n')
-    const renderSection = componentSource('worktree-jump-palette-surface.tsx')
-
-    const cmdJWriterPattern = /recordFeatureInteraction\('cmd-j/g
-    const allCmdJWriterCount = handlerSection.match(cmdJWriterPattern)?.length ?? 0
-    expect(allCmdJWriterCount).toBeGreaterThanOrEqual(6)
-    expect(handlerSection.match(cmdJWriterPattern)?.length ?? 0).toBe(allCmdJWriterCount)
-    expect(renderSection).not.toContain("recordFeatureInteraction('cmd-j")
-    expect(
-      sourceBetween(lifecycleSource, 'const handleQueryChange', 'const cancelFallbackFocusFrames')
-    ).not.toContain("recordFeatureInteraction('cmd-j")
-  })
-
-  it('keeps task-provider writers off filters, tab switches, query edits, refresh, and pagination', () => {
-    const providerWriter = /recordFeatureInteraction\('(github|gitlab|linear)-tasks'\)/
-    const refreshSource = componentSource('use-task-page-github-cache-reconciliation.ts')
-    const paginationSource = componentSource('use-task-page-github-search-pagination.ts')
-    const searchSource = componentSource('use-task-page-search-actions.ts')
-
-    const passiveSections = [
-      sourceBetween(refreshSource, 'const handleRefreshGithubTasks', 'const nextModel'),
-      sourceBetween(paginationSource, 'const handleLoadNextPage', 'const commitTaskSearch'),
-      sourceBetween(searchSource, 'const applyPRFilterChange', 'const handleApplyTaskSearch'),
-      sourceBetween(searchSource, 'const handleApplyTaskSearch', 'const handleTaskSearchChange'),
-      sourceBetween(
-        searchSource,
-        'const handleTaskSearchChange',
-        'const handleSetDefaultTaskPreset'
-      ),
-      sourceBetween(
-        searchSource,
-        'const handleSelectGithubTaskKind',
-        'const handleResetGithubTaskSearch'
-      )
-    ]
-    for (const section of passiveSections) {
-      expect(section).not.toMatch(providerWriter)
-    }
-  })
-
-  it('records GitHub provider-depth for inline item mutation success paths', () => {
-    const githubWriter = "recordFeatureInteraction('github-tasks')"
-    // Why: table cells route success telemetry through the optimistic mutation
-    // hook so provider-depth recording stays on one confirm path.
-    const hookSource = readFileSync(
-      join(COMPONENT_ROOT, '../hooks/useTaskPageGitHubWorkItemMutation.ts'),
-      'utf8'
-    )
-    expect(
-      sourceBetween(hookSource, "if (confirmed === 'confirmed')", 'return confirmed')
-    ).toContain(githubWriter)
-    expect(
-      sourceBetween(
-        componentSource('use-task-page-workspace-actions.ts'),
-        'const handleOpenOrUseGitHubWorkItem',
-        'const openComposerForGitLabItem'
-      )
-    ).toContain(githubWriter)
-  })
-
-  it('threads GitHub task source context through inline task mutations', () => {
-    const sections = [
-      componentSource('task-page/github/StatusCell.tsx'),
-      componentSource('task-page/github/AssigneesCell.tsx'),
-      componentSource('task-page/github/ReviewCell.tsx'),
-      componentSource('task-page/github/MergeCell.tsx'),
-      sourceBetween(
-        componentSource('use-task-page-github-issue-creation.ts'),
-        'const handleCreateNewIssue',
-        'const nextModel'
-      )
-    ]
-
-    for (const section of sections) {
-      expect(section).toContain('sourceContext')
-    }
-    const rowSource = componentSource('task-page/github/Rows.tsx')
-    // Rows inline the repo lookup per cell rather than hoisting one const.
-    expect(
-      rowSource.match(/sourceContext=\{getTaskPageRepoSourceContext\(itemRepo, 'github'\)\}/g)
-    ).toHaveLength(4)
-  })
-
-  it('suppresses Tasks surface telemetry for in-page provider switches and detail opens', () => {
-    const suppression = 'recordTasksInteraction: false'
-    const githubDetailSection = sourceBetween(
-      componentSource('use-task-page-github-detail.ts'),
-      'const openGitHubDetailPage',
-      'const nextModel'
-    )
-
-    const inPageNavigationSections = [
-      sourceBetween(
-        componentSource('use-task-page-detail-routing.ts'),
-        'const openLinearDetailPage',
-        'const openRelatedLinearIssue'
-      ),
-      sourceBetween(
-        componentSource('task-page/SourceBar.tsx'),
-        'taskSourceManuallyChangedRef.current = true',
-        'void updateSettings'
-      )
-    ]
-
-    expect(githubDetailSection).toContain('openGitHubSourceContext')
-    expect(githubDetailSection).toContain('openTaskPage')
-    expect(githubDetailSection).toContain(suppression)
-
-    for (const section of inPageNavigationSections) {
-      expect(section).toContain(suppression)
-    }
-  })
-
-  it('records Cmd+J create-workspace as its own destination, not a generic quick action', () => {
-    const source = componentSource('use-worktree-jump-palette-selection-actions.ts')
-    const section = sourceBetween(
-      source,
-      'const handleSelectQuickAction',
-      'const handleSelectProjectTarget'
-    )
-
-    expect(section).toContain("recordFeatureInteraction('cmd-j-create-workspace')")
-    expect(section).toContain("recordFeatureInteraction('cmd-j-quick-action')")
-    expect(section.indexOf("recordFeatureInteraction('cmd-j-create-workspace')")).toBeLessThan(
-      section.indexOf("recordFeatureInteraction('cmd-j-quick-action')")
-    )
-    expect(
-      sourceBetween(
-        section,
-        "if (action.id === 'create-workspace')",
-        "recordFeatureInteraction('cmd-j-quick-action')"
-      )
-    ).toContain('return')
-  })
-
-  it('records GitLab provider-depth for detail opens, workspace use, and dialog mutations', () => {
-    const detailsSource = componentSource('gitlab-item-dialog/use-gitlab-details-editing.ts')
-    const primarySource = componentSource('gitlab-item-dialog/use-gitlab-primary-actions.ts')
-    const reviewSource = componentSource('gitlab-item-dialog/use-gitlab-review-actions.ts')
-    const gitlabWriter = "recordFeatureInteraction('gitlab-tasks')"
-
-    expect(
-      sourceBetween(
-        componentSource('task-page/gitlab/ItemList.tsx'),
-        '{displayedGitLabItems.map((item) => (',
-        'handleUseGitLabItem(item)'
-      ).match(/recordFeatureInteraction\('gitlab-tasks'\)/g)
-    ).toHaveLength(2)
-    expect(
-      sourceBetween(
-        componentSource('use-task-page-workspace-actions.ts'),
-        'const handleUseGitLabItem',
-        'const nextModel'
-      )
-    ).toContain(gitlabWriter)
-
-    const mutationSections = [
-      sourceBetween(detailsSource, 'const handleSaveDetails', 'return {'),
-      sourceBetween(reviewSource, 'const handleSetReviewers', 'const handleSubmitInlineComment'),
-      sourceBetween(
-        reviewSource,
-        'const handleSubmitInlineComment',
-        'const handleResolveDiscussion'
-      ),
-      sourceBetween(primarySource, 'const handleClose', 'const handleReopen'),
-      sourceBetween(primarySource, 'const handleReopen', 'const handleMerge'),
-      sourceBetween(primarySource, 'const handleMerge', 'const handleSubmitComment'),
-      sourceBetween(primarySource, 'const handleSubmitComment', 'return {'),
-      sourceBetween(reviewSource, 'const handleResolveDiscussion', 'return {')
-    ]
-    for (const section of mutationSections) {
-      expect(section).toContain(gitlabWriter)
-      expect(section).toContain('showGitLabMutationError')
-    }
-  })
-
-  it('keeps nested GitLab row actions from also opening task details by keyboard', () => {
-    const rowSection = sourceBetween(
-      componentSource('task-page/gitlab/ItemList.tsx'),
-      'onKeyDown={(e) => {',
-      'className="grid w-full cursor-pointer'
-    )
-    expect(rowSection).toContain('e.target !== e.currentTarget')
-    expect(rowSection.indexOf('e.target !== e.currentTarget')).toBeLessThan(
-      rowSection.indexOf("e.key === 'Enter'")
-    )
-  })
-
-  it('keys GitLab rows by repository and item identity across hosts', () => {
-    expect(componentSource('task-page/gitlab/ItemList.tsx')).toContain(
-      'key={`${item.repoId}:${item.id}`}'
-    )
-  })
-
-  it('records Linear provider-depth for inline edits, board drops, creation, and workspace use', () => {
-    const drawerSource = [
-      componentSource('linear-item-drawer-edit-controller.tsx'),
-      componentSource('linear-item-drawer-comment-footer.tsx')
-    ].join('\n')
-    const linearWriter = "recordFeatureInteraction('linear-tasks')"
-
-    const taskPageSections = [
-      sourceBetween(
-        componentSource('task-page-linear-issue-model.tsx'),
-        'export function LinearStateCell',
-        'return ('
-      ),
-      sourceBetween(
-        componentSource('use-task-page-linear-board.ts'),
-        'const handleLinearBoardDrop',
-        'const toggleLinearDisplayProperty'
-      ),
-      sourceBetween(
-        componentSource('use-task-page-linear-issue-creation.ts'),
-        'const handleCreateNewLinearIssue',
-        'const nextModel'
-      ),
-      sourceBetween(
-        componentSource('use-task-page-composer-actions.ts'),
-        'const handleUseLinearItem',
-        'const handleLinearWorkspaceChange'
-      )
-    ]
-    for (const section of taskPageSections) {
-      expect(section).toContain(linearWriter)
-    }
-
-    const drawerMutationSections = [
-      sourceBetween(drawerSource, 'const handleStateChange', 'const handlePriorityChange'),
-      sourceBetween(drawerSource, 'const handlePriorityChange', 'const handleEstimateChange'),
-      sourceBetween(drawerSource, 'const handleEstimateChange', 'const handleEstimateSubmit'),
-      sourceBetween(drawerSource, 'const handleAssigneeChange', 'const handleLabelToggle'),
-      sourceBetween(drawerSource, 'const handleLabelToggle', 'return {'),
-      sourceBetween(drawerSource, 'const handleSubmit = useCallback(async () => {', 'return (')
-    ]
-    for (const section of drawerMutationSections) {
-      expect(section).toContain(linearWriter)
-    }
-  })
-
-  it('records Jira provider-depth for workspace use', () => {
-    const jiraWriter = "recordFeatureInteraction('jira-tasks')"
-
-    // End boundary is the declaration after the handler: the Jira connect flow
-    // now lives in the shared JiraConnectDialog, so handleJiraConnect (the prior
-    // marker) no longer exists in TaskPage.
-    expect(
-      sourceBetween(
-        componentSource('use-task-page-composer-actions.ts'),
-        'const handleUseJiraItem',
-        'const nextModel'
-      )
-    ).toContain(jiraWriter)
-  })
-
-  it('records browser annotation agent handoff only from the prompt-delivered callback', () => {
-    const source = componentSource('browser-pane/annotate/use-browser-page-annotation-send.ts')
-    expect(
-      source.match(/recordFeatureInteraction\('browser-annotations-sent-to-agent'\)/g)
-    ).toHaveLength(1)
-    expect(
-      sourceBetween(
-        source,
-        'const handleBrowserAnnotationsSentToAgent',
-        'const handleClearBrowserAnnotations'
-      )
-    ).toContain("recordFeatureInteraction('browser-annotations-sent-to-agent')")
-    expect(
-      sourceBetween(
-        source,
-        'const handleCopyBrowserAnnotations',
-        'const handleBrowserAnnotationsSentToAgent'
-      )
-    ).not.toContain("recordFeatureInteraction('browser-annotations-sent-to-agent')")
-    expect(
-      sourceBetween(
-        source,
-        'const handleClearBrowserAnnotations',
-        'const handleDeleteBrowserAnnotation'
-      )
-    ).not.toContain("recordFeatureInteraction('browser-annotations-sent-to-agent')")
-  })
-
-  it('records floating workspace hide only from explicit disable or hide actions', () => {
-    const allowedSources = [
-      componentSource('settings/FloatingWorkspacePane.tsx'),
-      componentSource('floating-terminal/FloatingTerminalIconContextMenu.tsx')
-    ].join('\n')
-    const passiveSources = [
-      componentSource('../App.tsx'),
-      componentSource('floating-terminal/FloatingTerminalPanel.tsx')
-    ].join('\n')
-
-    expect(
-      allowedSources.match(/recordFeatureInteraction\('floating-workspace-hidden'\)/g) ?? []
-    ).toHaveLength(2)
-    expect(passiveSources).not.toContain("recordFeatureInteraction('floating-workspace-hidden')")
-  })
-})
diff --git a/src/renderer/src/components/floating-terminal/FloatingTerminalPanel.tab-lifecycle.test.tsx b/src/renderer/src/components/floating-terminal/FloatingTerminalPanel.tab-lifecycle.test.tsx
index a4c58f7ad049..1d8624ba4356 100644
--- a/src/renderer/src/components/floating-terminal/FloatingTerminalPanel.tab-lifecycle.test.tsx
+++ b/src/renderer/src/components/floating-terminal/FloatingTerminalPanel.tab-lifecycle.test.tsx
@@ -209,7 +209,11 @@ describe('FloatingTerminalPanel close behavior', () => {
     const element = await renderPanel(true)
     const tabBar = findByTypeName(element, 'TabBar')
     ;(tabBar.props.onNewBrowserTab as () => void)()
-    ;(tabBar.props.onDuplicateBrowserTab as (browserTabId: string) => void)('browser-1')
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: TabBarProps types this callback; the test tree erases it.
+    ;(tabBar.props.onDuplicateBrowserTab as (browserTabId: string, unifiedTabId: string) => void)(
+      'browser-1',
+      'browser-unified-1'
+    )
 
     expect(mocks.createWebRuntimeSessionBrowserTab).not.toHaveBeenCalled()
     expect(mocks.createBrowserTab).toHaveBeenNthCalledWith(
@@ -231,7 +235,7 @@ describe('FloatingTerminalPanel close behavior', () => {
         title: 'Example',
         sessionProfileId: 'profile-1',
         sessionPartition: 'persist:orca-browser-session-profile-1',
-        targetGroupId: 'floating-group',
+        afterTabId: 'browser-unified-1',
         browserRuntimeEnvironmentId: null
       }
     )
diff --git a/src/renderer/src/components/floating-terminal/FloatingTerminalPanelSurface.tsx b/src/renderer/src/components/floating-terminal/FloatingTerminalPanelSurface.tsx
index e3a57fb0c41e..bd2311e7ada3 100644
--- a/src/renderer/src/components/floating-terminal/FloatingTerminalPanelSurface.tsx
+++ b/src/renderer/src/components/floating-terminal/FloatingTerminalPanelSurface.tsx
@@ -60,7 +60,6 @@ export function renderFloatingTerminalPanelSurface({
   activeTabType,
   browserTabs,
   createBrowserTab,
-  activeGroup,
   closeAllFiles,
   makePreviewFilePermanent,
   pinFile,
@@ -177,14 +176,14 @@ export function renderFloatingTerminalPanelSurface({
               onCloseFile={closeFloatingItemConfirmed}
               onActivateBrowserTab={activateFloatingItem}
               onCloseBrowserTab={closeFloatingItemConfirmed}
-              onDuplicateBrowserTab={(browserTabId) => {
+              onDuplicateBrowserTab={(browserTabId, sourceUnifiedTabId) => {
                 const source = browserTabs.find((tab) => tab.id === browserTabId)
                 if (!source) {
                   return
                 }
                 createBrowserTab(FLOATING_TERMINAL_WORKTREE_ID, source.url, {
                   ...buildDuplicatedBrowserTabOptions(source),
-                  targetGroupId: activeGroup?.id,
+                  afterTabId: sourceUnifiedTabId,
                   browserRuntimeEnvironmentId: null
                 })
               }}
diff --git a/src/renderer/src/components/github-item-dialog-source-boundary.test.ts b/src/renderer/src/components/github-item-dialog-source-boundary.test.ts
deleted file mode 100644
index 630ae68a7a07..000000000000
--- a/src/renderer/src/components/github-item-dialog-source-boundary.test.ts
+++ /dev/null
@@ -1,310 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const COMPONENT_ROOT = __dirname
-
-function componentSource(relativePath: string): string {
-  // Why: CRLF checkouts would otherwise break every multi-line source assertion.
-  return readFileSync(join(COMPONENT_ROOT, relativePath), 'utf8').replace(/\r\n?/g, '\n')
-}
-
-function destSources(...relativePaths: string[]): string {
-  return relativePaths.map((relativePath) => componentSource(relativePath)).join('\n')
-}
-
-function sourceBetween(source: string, startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start + startPattern.length)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('GitHubItemDialog source host boundaries', () => {
-  it('does not keep the stale right-side sheet owner', () => {
-    const source = destSources(
-      'GitHubItemDialog.tsx',
-      'github-item-dialog/open-dialog/github-item-dialog.tsx'
-    )
-
-    expect(source).not.toContain('@/components/ui/sheet')
-    expect(source).not.toContain('<Sheet')
-    expect(source).not.toContain('<SheetContent')
-    expect(source).not.toContain("variant?: 'sheet'")
-  })
-
-  it('routes reviewer metadata and reviewer mutations through the task source context', () => {
-    const source = destSources(
-      'github-item-dialog/land-pull-request/pr-reviewers-panel.tsx',
-      'github-item-dialog/land-pull-request/pr-reviewers-request-actions.ts'
-    )
-    const section = source
-
-    expect(section).toContain('getTaskSourceRuntimeSettings(sourceContext)')
-    expect(section).toContain('useRepoAssigneesBySlug(')
-    expect(section).toContain('sourceSettings')
-    expect(section).toContain('useRepoAssignees(')
-    expect(section).toContain('sourceSettings')
-    expect(section).toContain('getActiveRuntimeTarget(sourceSettings)')
-    expect(section).toContain(
-      'const runtimeRepo = getGitHubRuntimeRepoId(sourceContext, item.repoId)'
-    )
-    expect(section).toContain("'github.requestPRReviewers'")
-    expect(section).toContain("'github.removePRReviewers'")
-    expect(section).toContain('resolvePullRequestRepo(item, projectOrigin)')
-    expect(section.match(/prRepo: reviewRepo/g)).toHaveLength(4)
-    expect(section).toContain('notifyWorkItemDetailsMutation(')
-    expect(section).toContain('{ local: false }')
-  })
-
-  it('routes edit metadata through the same task source as issue mutations', () => {
-    const source = destSources(
-      'github-item-dialog/edit-item-fields/gh-edit-section.tsx',
-      'github-item-dialog/edit-item-fields/gh-edit-section-mutations.ts'
-    )
-    const section = source
-    const helperSection = componentSource('github/github-work-item-edit-mutations.ts')
-
-    expect(section).toContain('getTaskSourceRuntimeSettings(sourceContext)')
-    expect(section).toContain('useRepoLabels(')
-    expect(section).toContain('useRepoLabelsBySlug(')
-    expect(section).toContain('projectOrigin?.host')
-    expect(section).toContain('useRepoAssignees(')
-    expect(section).toContain('useRepoAssigneesBySlug(')
-    expect(section).toContain('sourceSettings')
-    expect(helperSection).toContain("'github.updateIssue'")
-    expect(helperSection).toContain("'github.updatePRState'")
-    expect(helperSection).toContain("'github.project.updateIssueBySlug'")
-    expect(helperSection).toContain("'github.project.updatePullRequestBySlug'")
-    expect(helperSection).toContain("args.sourceContext?.provider === 'github'")
-    expect(helperSection).toContain('getTaskSourceRuntimeSettings(args.sourceContext)')
-    expect(helperSection).toContain(
-      'getGitHubMutationRoutingSettings(useAppStore.getState(), args.repoId, args.sourceContext)'
-    )
-    expect(helperSection).toContain('notifyWorkItemDetailsMutation(')
-    expect(helperSection).toContain(
-      "repo: getGitHubRuntimeRepoId(args.sourceContext, args.repoId ?? '')"
-    )
-    expect(helperSection).toContain('{ local: false }')
-  })
-
-  it('uses source-aware details routing and cache identity', () => {
-    const source = destSources(
-      'github-item-dialog/load-item-details/work-item-details-cache.ts',
-      'github-item-dialog/load-item-details/use-github-item-dialog-details.ts'
-    )
-    const cacheKeySection = sourceBetween(
-      source,
-      'function getWorkItemDetailsCacheKey',
-      'function touchWorkItemDetailsCache'
-    )
-    const matchInvalidationSection = sourceBetween(
-      source,
-      'function invalidateWorkItemDetailsCacheByMatch',
-      'function patchCachedPRFileViewedState'
-    )
-
-    expect(source).toContain('lookupGitHubWorkItemDetailsForSource({')
-    expect(source).toContain('sourceContext,')
-    expect(cacheKeySection).toContain('sourceCacheScope')
-    expect(source).toContain('getTaskSourceCacheScope(sourceContext)')
-    expect(matchInvalidationSection).toContain(
-      'if (removed) {\n    workItemDetailsCacheGeneration += 1'
-    )
-  })
-
-  it('treats null details as unavailable while preserving empty detail payloads', () => {
-    const source = destSources(
-      'github-item-dialog/load-item-details/use-github-item-dialog-details.ts',
-      'github-item-dialog/load-item-details/work-item-details-fetch-settle.ts'
-    )
-    const loadedSection = sourceBetween(
-      source,
-      'const loading = !!cachedEntry?.pending && !cachedEntry?.details',
-      '// Why: if a cross-window mutation invalidates'
-    )
-    const resultSection = sourceBetween(source, 'inflight', '.catch((err) => {')
-
-    expect(loadedSection).toContain('const detailsLoaded = Boolean(cachedEntry?.details)')
-    expect(loadedSection).not.toContain('fetchedAt > 0')
-    expect(resultSection).toContain('} else if (result === null) {')
-    expect(resultSection).toContain('error: WORK_ITEM_DETAILS_UNAVAILABLE_MESSAGE')
-    expect(resultSection).toContain('details: result')
-  })
-
-  it('routes PR file viewed mutations through the task source context', () => {
-    const changeSection = destSources(
-      'github-item-dialog/load-item-details/use-github-item-dialog-details.ts',
-      'github-item-dialog/load-item-details/pr-file-viewed-change.ts'
-    )
-    const helperSection = componentSource('github/github-work-item-comment-mutations.ts')
-
-    expect(helperSection).toContain('getGitHubSourceRuntimeHost(args.sourceContext)')
-    expect(helperSection).toContain("'github.setPRFileViewed'")
-    expect(helperSection).toContain('repo: getGitHubRuntimeRepoId(args.sourceContext, args.repoId)')
-    expect(helperSection).toContain('sourceContext: args.sourceContext')
-    expect(helperSection).toContain('{ local: false }')
-    expect(changeSection).toContain('canUseDetailsRepoContext')
-    expect(changeSection).toContain('repoPath: repoPath ??')
-    expect(changeSection).toContain('sourceContext,')
-  })
-
-  it('routes comment mutations through runtime source context when needed', () => {
-    const helperSource = componentSource('github/github-work-item-comment-mutations.ts')
-    const helperSection = sourceBetween(
-      helperSource,
-      'function addIssueCommentForRepo',
-      'function setPRFileViewedForRepo'
-    )
-
-    expect(helperSection).toContain('getGitHubSourceRuntimeHost(args.sourceContext)')
-    expect(helperSection).toContain("'github.addIssueComment'")
-    expect(helperSection).toContain("'github.addPRReviewComment'")
-    expect(helperSection).toContain("'github.addPRReviewCommentReply'")
-    expect(helperSection).toContain('repo: getGitHubRuntimeRepoId(args.sourceContext, args.repoId)')
-    expect(helperSection).toContain('sourceContext: args.sourceContext')
-    expect(helperSection).toContain('notifyWorkItemDetailsMutation(')
-    expect(helperSection).toContain('{ local: false }')
-  })
-
-  it('routes PR file contents and runtime viewed invalidations through the task source context', () => {
-    const source = destSources(
-      'github-item-dialog/load-item-details/work-item-details-cache.ts',
-      'github-item-dialog/load-item-details/pr-file-content-cache.ts'
-    )
-    const commentMutations = componentSource('github/github-work-item-comment-mutations.ts')
-    const fileContentsSection = sourceBetween(
-      source,
-      'function loadPRFileContents',
-      'touchPRFileContentCache(cacheKey, request)'
-    )
-    const fileContentsCacheKeySection = sourceBetween(
-      source,
-      'function getPRFileContentCacheKey',
-      'function loadPRFileContents'
-    )
-    const listenerSection = sourceBetween(source, 'let workItemMutatedUnsub', '// Why: bounded LRU')
-
-    expect(fileContentsCacheKeySection).toContain(
-      'source:${getTaskSourceCacheScope(args.sourceContext)}'
-    )
-    expect(fileContentsSection).toContain("'github.prFileContents'")
-    expect(fileContentsSection).toContain(
-      'repo: getGitHubRuntimeRepoId(args.sourceContext, args.repoId)'
-    )
-    expect(fileContentsSection).toContain('sourceContext: args.sourceContext')
-    expect(fileContentsSection).toContain('sourceContext,')
-    expect(listenerSection).toContain('onGitHubWorkItemDetailsCacheMutation')
-    expect(commentMutations).toContain('emitGitHubWorkItemDetailsCacheMutation(args)')
-    expect(commentMutations).toContain('options.local !== false')
-    expect(commentMutations).toContain('notifyWorkItemMutated({')
-  })
-
-  it('routes merge actions through the repo owner host (#6957)', () => {
-    const actionsSection = componentSource(
-      'github-item-dialog/land-pull-request/pr-actions-panel.tsx'
-    )
-
-    expect(actionsSection).toContain(
-      'getGitHubMutationRoutingSettings(s, item.repoId ?? repoId ?? null, sourceContext)'
-    )
-    expect(actionsSection).toContain('getActiveRuntimeTarget(sourceSettings)')
-    expect(actionsSection).toContain(
-      'const canMergeWithRepoContext = !!repoPath || mergeTarget.kind ==='
-    )
-    expect(actionsSection).toContain("'github.mergePR'")
-    expect(actionsSection).toContain("'github.setPRAutoMerge'")
-    expect(actionsSection).toContain('const prRepo = resolvePullRequestRepo(item, projectOrigin)')
-    expect(actionsSection).not.toContain('prRepo: item.prRepo ?? null')
-    expect(actionsSection).toContain(
-      'repo: getGitHubRuntimeRepoId(sourceContext, repoId ?? item.repoId)'
-    )
-    expect(actionsSection).toContain('sourceContext,')
-    expect(actionsSection).toContain('notifyWorkItemDetailsMutation(')
-    expect(actionsSection).toContain('{ local: false }')
-  })
-
-  it('routes check actions through the task source context', () => {
-    const checksSection = destSources(
-      'github-item-dialog/inspect-pull-request/checks-tab.tsx',
-      'github-item-dialog/inspect-pull-request/checks-tab-actions.ts',
-      'github-item-dialog/inspect-pull-request/checks-tab-request-details.ts'
-    )
-
-    expect(checksSection).toContain('sourceContext?: TaskSourceContext | null')
-    expect(checksSection).toContain('sourceContext,')
-    expect(checksSection).toContain("'github.prChecks'")
-    expect(checksSection).toContain("'github.rerunPRChecks'")
-    expect(checksSection).toContain("'github.prCheckDetails'")
-    expect(checksSection).toContain(
-      'repo: getGitHubRuntimeRepoId(ctx.sourceContext, ctx.repoId ?? ctx.itemRepoId)'
-    )
-    expect(checksSection).toContain('window.api.gh.prChecks({')
-    expect(checksSection).toContain('window.api.gh.rerunPRChecks({')
-    expect(checksSection).toContain('prCheckDetails({')
-    expect(checksSection).toMatch(
-      /withGitHubCheckDetailsTimeout\(\(signal\) =>\s*ctx\.runtimeHost\s*\?\s*callRuntimeRpc[\s\S]*:\s*window\.api\.gh\.prCheckDetails\(\{/
-    )
-    expect(checksSection).toContain('{ timeoutMs: 30_000, signal }')
-  })
-
-  it('makes failed check detail loads retryable and fences stale responses', () => {
-    const checksSection = destSources(
-      'github-item-dialog/inspect-pull-request/checks-tab.tsx',
-      'github-item-dialog/inspect-pull-request/checks-tab-actions.ts',
-      'github-item-dialog/inspect-pull-request/checks-tab-request-details.ts',
-      'github-item-dialog/inspect-pull-request/checks-tab-check-details.tsx'
-    )
-
-    expect(checksSection).toContain('createGitHubChecksTabState(checks, checkDetailsContextKey)')
-    expect(checksSection).toContain('checksState,\n    checks,\n    checkDetailsContextKey')
-    expect(checksSection).toContain('resetGitHubChecksTabForSource(current)')
-    expect(checksSection).toContain(
-      'committedChecksContextOwnerRef.current !== refreshContextOwner'
-    )
-    expect(checksSection).toContain('activeChecksRefreshRequestIdRef.current !== refreshRequestId')
-    expect(checksSection).toContain('current.contextOwner === refreshContextOwner')
-    expect(checksSection).toContain(
-      'const rerunContextOwner = ctx.committedChecksContextOwnerRef.current'
-    )
-    expect(checksSection).toContain(
-      'ctx.committedChecksContextOwnerRef.current !== rerunContextOwner'
-    )
-    expect(checksSection).toContain('await refreshGitHubChecksTab(ctx, rerunContextOwner)')
-    expect(checksSection).toContain('!ctx.mountedRef.current ||')
-    expect(checksSection).toContain('settleGitHubChecksTabDetails(current, key, requestId, next)')
-    expect(checksSection).toContain('onClick={() => onRetry(check, getCheckDetailsKey(check))}')
-    expect(checksSection).toContain('disabled={state.loading}')
-    expect(checksSection).toContain('aria-busy={state.loading}')
-    expect(checksSection).toContain("translate('githubChecks.retrying', 'Retrying…')")
-    expect(checksSection).toContain("'Retry'")
-  })
-
-  it('uses hydrated work item details for the page checks tab', () => {
-    const source = componentSource('github-item-dialog/open-dialog/github-item-dialog-pr-tabs.tsx')
-    const checksTab = sourceBetween(
-      source,
-      '<TabsContent value="checks"',
-      '<TabsContent value="files"'
-    )
-
-    expect(checksTab).toContain('item={displayWorkItem ?? workItem}')
-  })
-
-  it('records state authority for dialog state mutations so stale list refetches cannot revert them (STA-3343)', () => {
-    const editSection = destSources(
-      'github-item-dialog/edit-item-fields/gh-edit-section.tsx',
-      'github-item-dialog/edit-item-fields/gh-edit-section-mutations.ts'
-    )
-    expect(editSection).toContain('assertTaskPageGitHubDialogStateAuthority({')
-    expect(editSection).toContain('if (authority?.revert())')
-
-    const actionsSection = componentSource(
-      'github-item-dialog/land-pull-request/pr-actions-panel.tsx'
-    )
-    expect(actionsSection.match(/assertTaskPageGitHubDialogStateAuthority\(\{/g)).toHaveLength(2)
-    expect(actionsSection).toContain('if (authority.revert())')
-    expect(actionsSection).toContain("state: 'merged'")
-  })
-})
diff --git a/src/renderer/src/components/github-item-dialog/open-dialog/github-item-dialog.tsx b/src/renderer/src/components/github-item-dialog/open-dialog/github-item-dialog.tsx
index 71e580a21d51..f07fe236c70d 100644
--- a/src/renderer/src/components/github-item-dialog/open-dialog/github-item-dialog.tsx
+++ b/src/renderer/src/components/github-item-dialog/open-dialog/github-item-dialog.tsx
@@ -58,7 +58,9 @@ export default function GitHubItemDialog({
         return
       }
 
-      const result = activateAndRevealWorktree(currentAttached.id)
+      const result = activateAndRevealWorktree(currentAttached.id, {
+        navigationIntent: 'user-open'
+      })
       if (result === false) {
         toast.error(
           translate(
diff --git a/src/renderer/src/components/github/repro-8784-ghe-avatar-fallback.test.ts b/src/renderer/src/components/github/repro-8784-ghe-avatar-fallback.test.ts
index 8b33b3dc40c8..ddf7fb92cfff 100644
--- a/src/renderer/src/components/github/repro-8784-ghe-avatar-fallback.test.ts
+++ b/src/renderer/src/components/github/repro-8784-ghe-avatar-fallback.test.ts
@@ -4,15 +4,12 @@
  * Regression guard (was a repro that documented the broken path). After the fix:
  * - resolveGitHubUserAvatarSrc prefers API URLs
  * - PullRequestPage author uses authorAvatarUrl via GitHubUserAvatar
- * - TaskPage ReviewChipAvatar no longer hardcodes github.com login.png
  *
  * Re-run:
  *   pnpm exec vitest run --config config/vitest.config.ts \
  *     src/renderer/src/components/github/repro-8784-ghe-avatar-fallback.test.ts
  */
 import { describe, expect, it } from 'vitest'
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { githubAvatarUrl, resolveGitHubUserAvatarSrc } from './github-user-avatar'
 
 describe('issue #8784 GHE avatar fallback (regression)', () => {
@@ -38,86 +35,4 @@ describe('issue #8784 GHE avatar fallback (regression)', () => {
     // enrichment + image onError → initials when this 404s.
     expect(githubAvatarUrl('corp-user')).toBe('https://github.com/corp-user.png?size=64')
   })
-
-  it('source routes PR author/reviewer avatars through GitHubUserAvatar + authorAvatarUrl', () => {
-    const prPage = readFileSync(join(__dirname, '../pull-request-page/page/header.tsx'), 'utf8')
-    expect(prPage).toMatch(/GitHubUserAvatar/)
-    expect(prPage).toMatch(/authorAvatarUrl/)
-    // Why: author chip must not ignore API avatar_url and only pass login.
-    expect(prPage).not.toMatch(/githubAvatarUrl\(workItem\.author\)/)
-
-    const reviewChip = readFileSync(join(__dirname, '../task-page/github/Avatars.tsx'), 'utf8')
-    expect(reviewChip).toMatch(/GitHubUserAvatar/)
-    // Why: list chip must not hardcode github.com/{login}.png.
-    expect(reviewChip).not.toMatch(/github\.com\/\$\{reviewer\.login\}\.png/)
-  })
-
-  // GHES URLs can exist but fail unauthenticated; target slots need onError fallbacks.
-  // Scope checks because TaskPage also renders non-GitHub provider avatars.
-  const GITHUB_AVATAR_SLOTS = [
-    {
-      file: 'pull-request-page/reviewers/picker-row.tsx',
-      fn: 'ReviewerPickerRow',
-      login: 'reviewer.login',
-      displayName: 'reviewer.name'
-    },
-    {
-      file: 'pull-request-page/conversation/comment-card.tsx',
-      fn: 'ConversationCommentCard',
-      login: 'comment.author',
-      displayName: null
-    },
-    {
-      file: 'pull-request-page/mentions/textarea.tsx',
-      fn: 'MentionTextarea',
-      login: 'option.login',
-      displayName: 'option.name'
-    },
-    {
-      file: 'task-page/github/Avatars.tsx',
-      fn: 'GitHubAssigneeAvatar',
-      login: 'assignee.login',
-      displayName: 'assignee.name'
-    },
-    {
-      file: 'task-page/github/AssigneesCell.tsx',
-      fn: 'GHAssigneesCell',
-      login: 'user.login',
-      displayName: 'user.name'
-    },
-    {
-      file: 'task-page/github/ReviewerPicker.tsx',
-      fn: 'TaskPageGitHubReviewerPicker',
-      login: 'reviewer.login',
-      displayName: 'reviewer.name'
-    }
-  ] as const
-
-  function componentBody(file: string, fn: string): string {
-    const source = readFileSync(join(__dirname, '..', file), 'utf8')
-    const start = source.indexOf(`function ${fn}`)
-    expect(start, `${file}: function ${fn} not found`).toBeGreaterThanOrEqual(0)
-    const next = source.indexOf('\nfunction ', start + 1)
-    return source.slice(start, next === -1 ? undefined : next)
-  }
-
-  it.each(GITHUB_AVATAR_SLOTS)(
-    'renders the $fn avatar through GitHubUserAvatar (#13976)',
-    ({ file, fn, login }) => {
-      const body = componentBody(file, fn)
-
-      // Reject aliases and resolver expressions as well as direct avatarUrl fields.
-      expect(body, `${fn} still renders a bare img`).not.toMatch(/<img[\s>]/)
-      expect(body, `${fn} does not use GitHubUserAvatar`).toContain('<GitHubUserAvatar')
-      expect(body, `${fn} does not pass its login`).toContain(`login={${login}}`)
-    }
-  )
-
-  // Preserve two-letter initials when the fallback renders.
-  it.each(GITHUB_AVATAR_SLOTS.filter((slot) => slot.displayName !== null))(
-    'passes the $fn display name so initials are not reduced to one letter (#13976)',
-    ({ file, fn, displayName }) => {
-      expect(componentBody(file, fn)).toContain(`name={${displayName}}`)
-    }
-  )
 })
diff --git a/src/renderer/src/components/linear-issue-workspace-api-parity.test.ts b/src/renderer/src/components/linear-issue-workspace-api-parity.test.ts
deleted file mode 100644
index 91310627cf71..000000000000
--- a/src/renderer/src/components/linear-issue-workspace-api-parity.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-function componentSource(file: string): string {
-  return readFileSync(join(__dirname, file), 'utf8')
-}
-
-describe('Linear issue workspace provider API parity', () => {
-  it('keeps detail and comments on the selected source and workspace', () => {
-    const source = componentSource('linear-issue-workspace-detail-state.ts')
-    expect(source).toContain('initialRequest.providerSettings,')
-    expect(source).toContain('initialRequest.issue.id,')
-    expect(source).toContain('initialRequest.issue.workspaceId')
-    expect(source).toContain('targetProviderSettings,')
-    expect(source).toContain('targetIssue.id,')
-    expect(source).toContain('targetIssue.workspaceId')
-  })
-
-  it('keeps project search and assignment source-scoped', () => {
-    const source = componentSource('linear-issue-project-selector.tsx')
-    expect(source).toContain(
-      'linearListProjects(providerSettings, requestQuery, 20, issue.workspaceId)'
-    )
-    expect(source).toMatch(
-      /linearUpdateIssue\(\s*providerSettings,\s*issue\.id,\s*\{ projectId: project\.id \},\s*issue\.workspaceId/
-    )
-    expect(source).toContain('patchLinearIssue(issue.id, { project }, { sourceContext })')
-  })
-
-  it('keeps sub-issue create and open payloads source-scoped', () => {
-    const source = componentSource('linear-issue-sub-issues.tsx')
-    expect(source).toContain('parentIssueId: issue.id')
-    expect(source).toContain('teamId: issue.team.id')
-    expect(source).toContain('workspaceId: issue.workspaceId')
-    expect(source).toContain('projectId: issue.project?.id ?? null')
-    expect(source).toMatch(
-      /fetchLinearIssue\(subIssue\.id, issue\.workspaceId, \{\s*sourceContext\s*\}\)/
-    )
-  })
-
-  it('keeps git and folder workspace attachments in the same lookup', () => {
-    const source = componentSource('LinearIssueWorkspace.tsx')
-    expect(source).toContain('...allWorktrees')
-    expect(source).toContain('...folderWorkspaces.map(folderWorkspaceToWorktree)')
-    expect(source).toContain('findLinearIssueWorkspaceAttachment(attachmentWorkspaces')
-    expect(source).toContain('openLinearIssueWorkspaceOrStart(detail.displayed')
-  })
-})
diff --git a/src/renderer/src/components/linear-issue-workspace-header.test.ts b/src/renderer/src/components/linear-issue-workspace-header.test.ts
deleted file mode 100644
index 4fd36b23bf45..000000000000
--- a/src/renderer/src/components/linear-issue-workspace-header.test.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const source = readFileSync(join(__dirname, 'linear-issue-workspace-header.tsx'), 'utf8')
-
-function headerSource(): string {
-  const start = source.indexOf('<header className="flex h-[61px]')
-  const end = source.indexOf('</header>', start)
-  expect(start).toBeGreaterThanOrEqual(0)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('LinearIssueWorkspace header actions', () => {
-  it('exposes copy, open-on-Linear, and a labeled start-workspace control', () => {
-    const header = headerSource()
-
-    expect(header).toContain("copyLinearIssueText(issue.url, 'URL')")
-    expect(header).toContain('window.api.shell.openUrl(issue.url)')
-    expect(header).toContain("'Open on Linear'")
-    expect(header).toContain('<Copy className="size-4" />')
-    expect(header).toContain('<ExternalLink className="size-4" />')
-    expect(header).toContain("'Start workspace'")
-    expect(header).toContain("'Start workspace from issue'")
-    expect(header).not.toContain("'Copy issue identifier'")
-    expect(header).toMatch(/size="sm"[\s\S]*onClick=\{onOpenOrUseIssue\}/)
-    expect(header).not.toMatch(/size="icon-sm"\s+onClick=\{onOpenOrUseIssue\}/)
-  })
-})
diff --git a/src/renderer/src/components/native-chat-resume-failed-chat-watch.test.ts b/src/renderer/src/components/native-chat-resume-failed-chat-watch.test.ts
index 308e7b878e89..7dfc8938373e 100644
--- a/src/renderer/src/components/native-chat-resume-failed-chat-watch.test.ts
+++ b/src/renderer/src/components/native-chat-resume-failed-chat-watch.test.ts
@@ -25,8 +25,8 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
 }))
 vi.mock('sonner', () => ({ toast: vi.fn() }))
 
-// After a restart action leaves a chat failed, the user's reply in that chat must retire the status
-// bar entry without the user reopening anything, and nothing may run while nothing failed.
+// When the user sends in an offered or failed chat, its status bar entry must retire without the
+// user reopening anything, and nothing may run while nothing is offered or failed.
 
 const failure = {
   sessionId: 'a',
@@ -91,7 +91,26 @@ afterEach(() => {
   vi.useRealTimers()
 })
 
-it('opens no status stream while nothing failed', async () => {
+// The host withdraws a pending offer once the chat moves on; the status bar must not keep counting it.
+it('re-reads once when the user sends in an offered chat, and the count drops', async () => {
+  const { failedAt: _failedAt, outcome: _outcome, reason: _reason, ...candidate } = failure
+  mocks.rpc
+    .mockResolvedValueOnce({ sessions: [candidate], failed: [] })
+    .mockResolvedValue({ sessions: [], failed: [] })
+  await refreshNativeChatRestartOffer()
+  await vi.advanceTimersByTimeAsync(0)
+  expect(getNativeChatRestartOffer().candidates).toHaveLength(1)
+  expect(mocks.subscribeStatus).toHaveBeenCalledOnce()
+
+  hostEmit()({ type: 'status', session: summary('working', 'Something else', Date.now() + 10_000) })
+  await vi.advanceTimersByTimeAsync(500)
+
+  expect(offerReads()).toBe(2)
+  expect(getNativeChatRestartOffer().candidates).toEqual([])
+  expect(mocks.unsubscribe).toHaveBeenCalledOnce()
+})
+
+it('opens no status stream while nothing is offered or failed', async () => {
   mocks.rpc.mockResolvedValue({ sessions: [], failed: [] })
   await refreshNativeChatRestartOffer()
   await vi.advanceTimersByTimeAsync(0)
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-store.ts b/src/renderer/src/components/native-chat-resume-on-restart-store.ts
index a3012495a3c4..78c5fa207b67 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-store.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-store.ts
@@ -58,42 +58,47 @@ const LAUNCH_READ_RETRY_DELAYS_MS = [100, 250, 500] as const
  *  actually moves the offer. */
 function publish(next: NativeChatRestartOffer): void {
   offer = next
-  syncFailedChatWatch()
+  syncOfferedChatWatch()
   for (const listener of listeners) {
     listener()
   }
 }
 
 /**
- * Re-reads the host once a failed chat shows new activity, so a reply the user sent there retires
- * its entry here too. The host stays the judge; this only asks again.
+ * Re-reads the host once an offered or failed chat shows new activity, so a message the user sent
+ * there, or its agent starting, retires its entry here too. The host stays the judge; this only
+ * asks again.
  *
- * Held only while something failed. Keyed on status and prompt rather than every summary, so an
- * agent streaming in a failed chat costs one re-read, not one per tool call.
+ * Held only while something is offered or failed. Keyed on status and prompt rather than every
+ * summary, so an agent streaming in such a chat costs one re-read, not one per tool call.
  */
-const FAILED_CHAT_REFRESH_DELAY_MS = 500
-let failedChatWatch: {
+const OFFERED_CHAT_REFRESH_DELAY_MS = 500
+let offeredChatWatch: {
   feed: StructuredAgentSessionStatusFeedOwner
   seen: Map<string, string>
   release: () => void
 } | null = null
-let failedChatRefresh: ReturnType<typeof setTimeout> | null = null
+let offeredChatRefresh: ReturnType<typeof setTimeout> | null = null
 
-function failedChatActivityKey(summary: AgentSessionStatusSummary): string {
+function offeredChatIds(): Set<string> {
+  return new Set([...offer.candidates, ...offer.failed].map((entry) => entry.sessionId))
+}
+
+function offeredChatActivityKey(summary: AgentSessionStatusSummary): string {
   return `${summary.status ?? ''}\u0000${summary.latestPrompt}`
 }
 
-function syncFailedChatWatch(): void {
-  const failedIds = new Set(offer.failed.map((failure) => failure.sessionId))
-  if (failedIds.size === 0) {
-    releaseFailedChatWatch()
+function syncOfferedChatWatch(): void {
+  const offeredIds = offeredChatIds()
+  if (offeredIds.size === 0) {
+    releaseOfferedChatWatch()
     return
   }
-  if (!failedChatWatch) {
+  if (!offeredChatWatch) {
     const feed = getStructuredAgentSessionStatusFeed(LOCAL)
-    const unsubscribe = feed.subscribe(noticeFailedChatActivity)
+    const unsubscribe = feed.subscribe(noticeOfferedChatActivity)
     const deactivate = feed.activate()
-    failedChatWatch = {
+    offeredChatWatch = {
       feed,
       seen: new Map(),
       release: () => {
@@ -102,60 +107,60 @@ function syncFailedChatWatch(): void {
       }
     }
   }
-  const { feed, seen } = failedChatWatch
+  const { feed, seen } = offeredChatWatch
   for (const sessionId of seen.keys()) {
-    if (!failedIds.has(sessionId)) {
+    if (!offeredIds.has(sessionId)) {
       seen.delete(sessionId)
     }
   }
   // What the feed already holds is what this listing answered.
-  for (const sessionId of failedIds) {
+  for (const sessionId of offeredIds) {
     const summary = feed.getSnapshot().get(sessionId)
     if (summary && !seen.has(sessionId)) {
-      seen.set(sessionId, failedChatActivityKey(summary))
+      seen.set(sessionId, offeredChatActivityKey(summary))
     }
   }
 }
 
-function noticeFailedChatActivity(): void {
-  if (!failedChatWatch) {
+function noticeOfferedChatActivity(): void {
+  if (!offeredChatWatch) {
     return
   }
-  const { feed, seen } = failedChatWatch
+  const { feed, seen } = offeredChatWatch
   const snapshot = feed.getSnapshot()
   let changed = false
-  for (const failure of offer.failed) {
-    const summary = snapshot.get(failure.sessionId)
+  for (const sessionId of offeredChatIds()) {
+    const summary = snapshot.get(sessionId)
     if (!summary) {
       continue
     }
-    const key = failedChatActivityKey(summary)
-    const previous = seen.get(failure.sessionId)
+    const key = offeredChatActivityKey(summary)
+    const previous = seen.get(sessionId)
     if (previous !== key) {
-      seen.set(failure.sessionId, key)
+      seen.set(sessionId, key)
       // A first sighting is news only if newer than the list; a change to a known chat always is,
       // since the host may have answered the list just before the change was delivered here.
       changed ||= previous !== undefined || summary.updatedAt > offer.listedAt
     }
   }
-  if (changed && failedChatRefresh === null) {
-    failedChatRefresh = setTimeout(() => {
-      failedChatRefresh = null
+  if (changed && offeredChatRefresh === null) {
+    offeredChatRefresh = setTimeout(() => {
+      offeredChatRefresh = null
       if (actionsBegun === actionsSettled) {
         const issued = actionsBegun
         void readNativeChatRestartOffer(() => actionsBegun === issued)
       }
-    }, FAILED_CHAT_REFRESH_DELAY_MS)
+    }, OFFERED_CHAT_REFRESH_DELAY_MS)
   }
 }
 
-function releaseFailedChatWatch(): void {
-  if (failedChatRefresh !== null) {
-    clearTimeout(failedChatRefresh)
-    failedChatRefresh = null
+function releaseOfferedChatWatch(): void {
+  if (offeredChatRefresh !== null) {
+    clearTimeout(offeredChatRefresh)
+    offeredChatRefresh = null
   }
-  failedChatWatch?.release()
-  failedChatWatch = null
+  offeredChatWatch?.release()
+  offeredChatWatch = null
 }
 
 export function getNativeChatRestartOffer(): NativeChatRestartOffer {
@@ -358,7 +363,7 @@ export function useNativeChatRestartOffer(enabled: boolean): NativeChatRestartOf
 
 /** @internal - tests need a clean module between cases. */
 export function _resetNativeChatRestartOffer(): void {
-  releaseFailedChatWatch()
+  releaseOfferedChatWatch()
   offer = EMPTY
   actionsBegun = 0
   actionsSettled = 0
diff --git a/src/renderer/src/components/native-chat/NativeChatAwaitingInputRow.tsx b/src/renderer/src/components/native-chat/NativeChatAwaitingInputRow.tsx
index 0f9dab5720b0..9549fc933e73 100644
--- a/src/renderer/src/components/native-chat/NativeChatAwaitingInputRow.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatAwaitingInputRow.tsx
@@ -1,11 +1,17 @@
+import { useCallback, useRef, useState } from 'react'
+import { ChevronRight } from 'lucide-react'
 import { cn } from '@/lib/utils'
 import { translate } from '@/i18n/i18n'
 import {
   NATIVE_CHAT_ASK_ROW_COPY,
   type NativeChatAskRowSubject
 } from '../../../../shared/native-chat-ask-row'
+import { useNativeChatDisclosure } from './native-chat-disclosure-store'
 import { NativeChatToolRunIcon } from './NativeChatToolIcon'
 
+const ROW_CLASS_NAME =
+  'flex min-h-6 w-full items-center gap-1.5 py-0.5 text-left text-sm leading-relaxed text-muted-foreground'
+
 /**
  * The row a question tool call draws in place of its raw input. The agent is
  * blocked on the reader, so the row says that in plain words and names what was
@@ -13,19 +19,68 @@ import { NativeChatToolRunIcon } from './NativeChatToolIcon'
  *
  * Only the label breathes: the question is the part worth reading, and animating
  * it would make the one line the reader has to act on the hardest one to read.
+ *
+ * A question too long for the line becomes a disclosure, and so does a grouped
+ * prompt, whose line names only a count. Once answered, this row may be the only
+ * place the questions are still shown, so the full text opens below the toggle,
+ * outside it, where it can be selected and copied like any other prose.
  */
 export function NativeChatAwaitingInputRow({
   subject,
-  pending
+  pending,
+  disclosureKey,
+  listsQuestions = true
 }: {
   /** Null when the payload named no question; the label carries the row alone. */
   subject: NativeChatAskRowSubject | null
   /** Still waiting on an answer; a settled prompt reports what was asked. */
   pending: boolean
+  /** Identity the opened question is remembered under while the row is unmounted. */
+  disclosureKey?: string
+  /** False when the caller already shows each question of a grouped prompt in full. */
+  listsQuestions?: boolean
 }): React.JSX.Element {
-  const label = pending
-    ? translate('components.native-chat.ask.awaiting', NATIVE_CHAT_ASK_ROW_COPY.awaiting)
-    : translate('components.native-chat.ask.asked', NATIVE_CHAT_ASK_ROW_COPY.asked)
+  // The list and a lone question are separate disclosures: a pending Codex group is
+  // keyed by its first question, which becomes its own row once answered.
+  const { open, setOpen } = useNativeChatDisclosure(
+    disclosureKey !== undefined && subject?.kind === 'questions'
+      ? `${disclosureKey}:questions`
+      : disclosureKey,
+    false
+  )
+  // Seeded from `open`: a row remounted open was clipped when the reader opened
+  // it, and dropping the toggle as it folds would drop keyboard focus with it.
+  const [clipped, setClipped] = useState(open)
+  const observerRef = useRef<ResizeObserver | null>(null)
+  // Attached to the question only while it sits on the line; an open row keeps its verdict.
+  const measureLine = useCallback((line: HTMLSpanElement | null) => {
+    observerRef.current?.disconnect()
+    observerRef.current = null
+    if (!line) {
+      return
+    }
+    const measure = (): void => setClipped(line.scrollWidth > line.clientWidth)
+    measure()
+    if (typeof ResizeObserver === 'undefined') {
+      return
+    }
+    observerRef.current = new ResizeObserver(measure)
+    observerRef.current.observe(line)
+  }, [])
+
+  const question = subject?.kind === 'question' ? subject.text : null
+  const questions = subject?.kind === 'questions' && listsQuestions ? subject.questions : null
+  // A count always hides its questions, so the list needs no clipping measurement.
+  const toggles = questions !== null || (question !== null && (open || clipped))
+  // With nothing to name, the label must read as a whole phrase, not end on a colon.
+  const label = !pending
+    ? translate('components.native-chat.ask.asked', NATIVE_CHAT_ASK_ROW_COPY.asked)
+    : subject === null
+      ? translate(
+          'components.native-chat.ask.awaitingUnnamed',
+          NATIVE_CHAT_ASK_ROW_COPY.awaitingUnnamed
+        )
+      : translate('components.native-chat.ask.awaiting', NATIVE_CHAT_ASK_ROW_COPY.awaiting)
   const text =
     subject === null
       ? null
@@ -34,20 +89,72 @@ export function NativeChatAwaitingInputRow({
         : translate(
             'components.native-chat.ask.questionCount',
             NATIVE_CHAT_ASK_ROW_COPY.questionCount,
-            { value0: subject.count }
+            { value0: subject.questions.length }
           )
+  const header = (
+    <>
+      <NativeChatToolRunIcon iconName="message-square-more" className="text-muted-foreground" />
+      <span className={cn('shrink-0', pending && 'animate-pulse motion-reduce:animate-none')}>
+        {label}
+      </span>
+      {question !== null && toggles && open ? null : (
+        <span
+          ref={question === null ? undefined : measureLine}
+          className="min-w-0 truncate text-foreground/85"
+        >
+          {text}
+        </span>
+      )}
+      {toggles ? (
+        <ChevronRight
+          aria-hidden
+          className={cn(
+            'size-3.5 shrink-0 text-muted-foreground transition-all',
+            open
+              ? 'rotate-90'
+              : 'can-hover:opacity-0 group-hover/ask-row:opacity-100 group-focus-visible/ask-row:opacity-100'
+          )}
+        />
+      ) : null}
+    </>
+  )
 
   return (
     <div
-      className="flex min-h-6 w-full items-center gap-1.5 py-0.5 text-sm leading-relaxed text-muted-foreground"
       data-native-chat-ask-row={pending ? 'awaiting' : 'asked'}
       aria-live={pending ? 'polite' : undefined}
     >
-      <NativeChatToolRunIcon iconName="message-square-more" className="text-muted-foreground" />
-      <span className={cn('shrink-0', pending && 'animate-pulse motion-reduce:animate-none')}>
-        {label}
-      </span>
-      <span className="min-w-0 truncate text-foreground/85">{text}</span>
+      {toggles ? (
+        <button
+          type="button"
+          onClick={() => setOpen(!open)}
+          className={cn(
+            ROW_CLASS_NAME,
+            'group/ask-row rounded-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70'
+          )}
+          aria-expanded={open}
+        >
+          {header}
+        </button>
+      ) : (
+        <div className={ROW_CLASS_NAME}>{header}</div>
+      )}
+      {toggles && open && question !== null ? (
+        // Indented to the label, past the icon slot and its gap.
+        <p className="whitespace-pre-wrap break-words pl-5.5 text-sm leading-relaxed text-foreground/85">
+          {question}
+        </p>
+      ) : null}
+      {open && questions !== null ? (
+        // Numbers hang in the icon slot so each question starts under the label.
+        <ol className="list-decimal space-y-1 pl-5.5 text-sm leading-relaxed text-foreground/85 marker:text-muted-foreground">
+          {questions.map((entry) => (
+            <li key={entry} className="whitespace-pre-wrap break-words">
+              {entry}
+            </li>
+          ))}
+        </ol>
+      ) : null}
     </div>
   )
 }
diff --git a/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.test.tsx b/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.test.tsx
index 365be31cc476..e37bfa0f9dad 100644
--- a/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.test.tsx
@@ -335,3 +335,47 @@ it('stops elapsed renders in a hidden pane and catches up on reveal', () => {
   unmount()
   expect(vi.getTimerCount()).toBe(0)
 })
+
+it('lets the 1 Hz tick sleep while every row has settled, with each run frozen', () => {
+  vi.useFakeTimers()
+  vi.setSystemTime(1_000_000)
+  const committed = vi.fn()
+  const finished = (id: string, firstObservedAt: number, settledAt: number) => ({
+    id,
+    providerId: `task-${id}`,
+    kind: 'agent' as const,
+    description: `child ${id}`,
+    state: 'done' as const,
+    membership: 'settled' as const,
+    outcome: 'succeeded' as const,
+    firstObservedAt,
+    observedAt: settledAt,
+    settledAt,
+    stoppable: false,
+    invocation: { invocationId: `spawn-${id}`, generation: 1 }
+  })
+  render(
+    <Profiler id="strip" onRender={committed}>
+      <NativeChatBackgroundTasksStatus
+        expanded
+        onExpandedChange={() => {}}
+        isVisible
+        tasks={[]}
+        settledTasks={[]}
+        childViews={[finished('a', 400_000, 520_000), finished('b', 700_000, 760_000)]}
+        indicatorActive
+        supportsTaskStop
+        supportsStopAll
+        stoppingTaskIds={new Set()}
+        stoppingAll={false}
+        onStop={() => {}}
+      />
+    </Profiler>
+  )
+  const rows = screen.getAllByRole('listitem').map((row) => row.textContent)
+  expect(rows).toEqual(['child a · Agent2m 0s', 'child b · Agent1m 0s'])
+  committed.mockClear()
+  act(() => vi.advanceTimersByTime(5_000))
+  expect(committed).not.toHaveBeenCalled()
+  expect(vi.getTimerCount()).toBe(0)
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.tsx b/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.tsx
index 2e8cf51f18ff..a0ff61a78c85 100644
--- a/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.tsx
@@ -1,18 +1,25 @@
 import { useEffect, useId, useMemo, useRef, useState } from 'react'
 import { Activity, Bot, ChevronDown, CircleHelp, SquareTerminal, Workflow } from 'lucide-react'
 import type { AgentSessionBackgroundTask } from '../../../../shared/agent-session-wire'
-import { AgentStateDot } from '@/components/AgentStateDot'
+import type {
+  AgentChildRowContext,
+  AgentChildRowModel
+} from '../../../../shared/agent-child-row-model'
+import type { AgentChildWorkView } from '../../../../shared/agent-status-child-work-view'
+import { AgentChildRowContent } from '@/components/AgentChildRowContent'
+import { agentChildRowName } from '@/components/agent-child-row-text'
 import { Button } from '@/components/ui/button'
 import { useNow } from '@/hooks/use-now'
 import { translate } from '@/i18n/i18n'
 import { backgroundTasksHeaderContent } from './background-task-header-content'
 import {
-  backgroundTaskElapsedLabel,
   backgroundTaskGroupLabel,
-  backgroundTaskStateReason,
+  backgroundTaskRowElapsedLabel,
+  backgroundTaskRowTicks,
   buildBackgroundTaskGroups,
+  buildBackgroundTaskGroupsFromViews,
   formatBackgroundTaskTokens,
-  type BackgroundRosterTask
+  type BackgroundTaskGroup
 } from './background-task-roster'
 
 /** Below this strip width (border-box, live root font size) the header drops
@@ -64,78 +71,95 @@ function kindIconTone(kind: AgentSessionBackgroundTask['kind'], dimmed: boolean)
   return dimmed ? `${tone}/40` : tone
 }
 
-/** Absent means stoppable: a host predating the field published only rows its
- *  stop could act on, so reading absence as "not stoppable" would hide a
- *  working control. Only an explicit `false` withholds the button — Claude
- *  marks its in-turn foreground rows that way, and a Stop on one of those
- *  resolves to an empty target list and silently reports nothing cancelled. */
-function backgroundTaskStoppable(task: AgentSessionBackgroundTask): boolean {
-  return task.stoppable !== false
-}
-
 function BackgroundTaskRow(props: {
-  entry: BackgroundRosterTask
+  row: AgentChildRowModel
   now: number
   supportsTaskStop: boolean
-  stopping: boolean
+  stoppingTaskIds: ReadonlySet<string>
   onStop: (taskId: string) => void
 }): React.JSX.Element {
-  const { entry, now } = props
-  const Icon = KIND_ICONS[entry.task.kind]
-  // Every attention state states its reason on the row, the same ones the collapsed
-  // header names; `unverifiable` ("no contact") must never be silently dropped.
-  const reason = backgroundTaskStateReason(entry.state)
-  // Settled rows keep their final usage but no elapsed — a still-growing clock
-  // on finished work would lie.
+  const { row, now } = props
+  const Icon = KIND_ICONS[row.kind]
   const meta = [
-    entry.task.totalTokens !== undefined
-      ? formatBackgroundTaskTokens(entry.task.totalTokens)
-      : null,
-    entry.settled ? null : backgroundTaskElapsedLabel(entry.task, now)
+    row.totalTokens !== undefined ? formatBackgroundTaskTokens(row.totalTokens) : null,
+    backgroundTaskRowElapsedLabel(row, now)
   ]
     .filter((part): part is string => part !== null)
     .join(' · ')
+  // Only an explicit `false` withholds the button: a Stop on a row the host cannot target
+  // resolves to an empty list and silently reports nothing cancelled.
+  const stopId =
+    !row.settled && props.supportsTaskStop && row.canStop ? (row.providerId ?? null) : null
   return (
-    <li className="flex h-6 min-w-0 items-center gap-2 text-foreground/80">
-      <Icon
-        aria-hidden="true"
-        className={`size-3.5 shrink-0 ${kindIconTone(entry.task.kind, false)}`}
-      />
-      <AgentStateDot state={entry.state} size="sm" title={null} />
-      <span className="min-w-0 flex-1 truncate">
-        <span className="font-medium text-foreground">{entry.name}</span>
-        {reason ? <span className="text-muted-foreground"> · {reason}</span> : null}
-      </span>
-      {meta ? (
-        <span className="shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">
-          {meta}
-        </span>
-      ) : null}
-      {!entry.settled && props.supportsTaskStop && backgroundTaskStoppable(entry.task) ? (
-        <Button
-          type="button"
-          variant="ghost"
-          size="xs"
-          aria-label={translate(
-            'components.native-chat.backgroundTasks.stopTask',
-            'Stop {{value0}}',
-            {
-              value0: entry.name
-            }
-          )}
-          disabled={props.stopping}
-          onClick={() => props.onStop(entry.task.id)}
-        >
-          {translate('components.native-chat.backgroundTasks.stop', 'Stop')}
-        </Button>
+    <>
+      <li className="flex h-6 min-w-0 items-center gap-2 text-foreground/80">
+        <Icon aria-hidden="true" className={`size-3.5 shrink-0 ${kindIconTone(row.kind, false)}`} />
+        {/* Every attention state states its reason on the row; `unverifiable` is never dropped. */}
+        <AgentChildRowContent
+          row={row}
+          now={now}
+          leadClassName="font-medium text-foreground"
+          trailClassName="text-muted-foreground"
+          separator=" · "
+          dotTitle={null}
+        />
+        {meta ? (
+          <span className="shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">
+            {meta}
+          </span>
+        ) : null}
+        {stopId !== null ? (
+          <Button
+            type="button"
+            variant="ghost"
+            size="xs"
+            aria-label={translate(
+              'components.native-chat.backgroundTasks.stopTask',
+              'Stop {{value0}}',
+              {
+                value0: agentChildRowName(row)
+              }
+            )}
+            disabled={props.stoppingTaskIds.has(stopId)}
+            onClick={() => props.onStop(stopId)}
+          >
+            {translate('components.native-chat.backgroundTasks.stop', 'Stop')}
+          </Button>
+        ) : null}
+      </li>
+      {row.owned.length > 0 ? (
+        // Work a child owns (its shell, a nested agent) reads beneath it, not in its kind's group.
+        <li>
+          <ul role="list" className="ml-5 space-y-0.5">
+            {row.owned.map((owned) => (
+              <BackgroundTaskRow
+                key={owned.id}
+                row={owned}
+                now={now}
+                supportsTaskStop={props.supportsTaskStop}
+                stoppingTaskIds={props.stoppingTaskIds}
+                onStop={props.onStop}
+              />
+            ))}
+          </ul>
+        </li>
       ) : null}
-    </li>
+    </>
   )
 }
 
+function rowsTick(rows: readonly AgentChildRowModel[]): boolean {
+  return rows.some((row) => backgroundTaskRowTicks(row) || rowsTick(row.owned))
+}
+
 export function NativeChatBackgroundTasksStatus(props: {
   tasks: readonly AgentSessionBackgroundTask[]
   settledTasks: readonly AgentSessionBackgroundTask[]
+  /** The host's child views, when it publishes them; rows then read these instead of the tasks. */
+  childViews?: readonly AgentChildWorkView[]
+  /** The session's parent-row context for those views, the one its sidebar rows read; without
+   *  it every live claim stands as reported. */
+  childRowContext?: AgentChildRowContext
   supportsTaskStop: boolean
   /** False when the provider exposes no honest stop at all; the fallback
    *  control is hidden rather than offering a button that cannot act. */
@@ -160,16 +184,18 @@ export function NativeChatBackgroundTasksStatus(props: {
   const stripRef = useRef<HTMLDivElement>(null)
   const narrow = useNarrowStrip(stripRef)
   // The 1 Hz elapsed tick must not re-group, re-sort and re-translate the whole roster.
-  const groups = useMemo(
-    () => buildBackgroundTaskGroups(props.tasks, props.settledTasks),
-    [props.tasks, props.settledTasks]
+  const groups: BackgroundTaskGroup[] = useMemo(
+    () =>
+      props.childViews !== undefined
+        ? buildBackgroundTaskGroupsFromViews(props.childViews, props.childRowContext)
+        : buildBackgroundTaskGroups(props.tasks, props.settledTasks),
+    [props.childViews, props.childRowContext, props.tasks, props.settledTasks]
   )
   const singleLiveCommand =
     groups.length === 1 && groups[0].kind === 'command' && groups[0].tasks.length === 1
-  const hasElapsed = groups.some((group) =>
-    group.tasks.some((entry) => !entry.settled && (entry.task.startedAt ?? 0) > 0)
-  )
-  const now = useNow(1_000, props.isVisible && hasElapsed && (expanded || singleLiveCommand))
+  // Settled rows are frozen, so a strip of only finished work never wakes the 1 Hz tick.
+  const ticks = groups.some((group) => rowsTick(group.tasks.map((entry) => entry.row)))
+  const now = useNow(1_000, props.isVisible && ticks && (expanded || singleLiveCommand))
   const header = backgroundTasksHeaderContent(groups, { narrow, now })
   const headerText = `${header.segments.map((segment) => segment.text).join(' · ')}${header.detail ? `${header.segments.length > 0 ? ' — ' : ''}${header.detail}` : ''}`
   return (
@@ -178,10 +204,10 @@ export function NativeChatBackgroundTasksStatus(props: {
       className="group/tasks shrink-0 bg-background px-3 pt-2 sm:px-4"
     >
       {/* When the goal tab is the next sibling, take its width and share its top edge. */}
-      <div className="mx-auto w-full max-w-4xl group-has-[+[data-native-chat-thread-goal]]/tasks:px-2">
+      <div className="mx-auto w-full max-w-4xl [[data-native-chat-background-tasks]:has(+[data-native-chat-thread-goal])_&]:px-2">
         <div
           ref={stripRef}
-          className="overflow-hidden rounded-lg border border-border bg-muted/50 text-xs text-muted-foreground shadow-xs group-has-[+[data-native-chat-thread-goal]]/tasks:rounded-b-none group-has-[+[data-native-chat-thread-goal]]/tasks:shadow-none"
+          className="overflow-hidden rounded-lg border border-border bg-muted/50 text-xs text-muted-foreground shadow-xs [[data-native-chat-background-tasks]:has(+[data-native-chat-thread-goal])_&]:rounded-b-none [[data-native-chat-background-tasks]:has(+[data-native-chat-thread-goal])_&]:shadow-none"
         >
           <div className="flex h-8 items-center px-1.5">
             <button
@@ -250,11 +276,11 @@ export function NativeChatBackgroundTasksStatus(props: {
                     >
                       {group.tasks.map((entry) => (
                         <BackgroundTaskRow
-                          key={entry.task.id}
-                          entry={entry}
+                          key={entry.row.id}
+                          row={entry.row}
                           now={now}
                           supportsTaskStop={props.supportsTaskStop}
-                          stopping={props.stoppingTaskIds.has(entry.task.id)}
+                          stoppingTaskIds={props.stoppingTaskIds}
                           onStop={props.onStop}
                         />
                       ))}
diff --git a/src/renderer/src/components/native-chat/NativeChatCodeBlock.tsx b/src/renderer/src/components/native-chat/NativeChatCodeBlock.tsx
index 7965668d2dc4..0e7d106c85d4 100644
--- a/src/renderer/src/components/native-chat/NativeChatCodeBlock.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatCodeBlock.tsx
@@ -47,7 +47,7 @@ export function NativeChatCodeBlock({
         <NativeChatCopyButton
           text={code}
           label={translate('components.native-chat.copyCode', 'Copy code')}
-          className="absolute right-2 top-2 opacity-100 transition-opacity can-hover:pointer-events-none can-hover:opacity-0 group-hover/code:pointer-events-auto group-hover/code:opacity-100 group-has-[:focus-visible]/code:pointer-events-auto group-has-[:focus-visible]/code:opacity-100"
+          className="absolute right-2 top-2 opacity-100 transition-opacity can-hover:pointer-events-none can-hover:opacity-0 group-hover/code:pointer-events-auto group-hover/code:opacity-100 [[class~='group/code']:has(:focus-visible)_&]:pointer-events-auto [[class~='group/code']:has(:focus-visible)_&]:opacity-100"
         />
       ) : null}
     </div>
diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
index 4992efd0fc50..5b29cf33b2a5 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
@@ -97,7 +97,7 @@ vi.mock('@/lib/native-chat-telemetry', () => ({
 vi.mock('./fork-agent-composer/use-agent-composer-draft', () => ({
   useAgentComposerDraft: (scopeKey: string) => {
     mocks.draftScopeKeys.push(scopeKey)
-    return { draft: mocks.draft, setDraft: mocks.setDraft }
+    return { draft: mocks.draft, setDraft: mocks.setDraft, flushDraftAppends: () => {} }
   }
 }))
 vi.mock('./fork-agent-composer/agent-composer-draft-cache', () => ({
diff --git a/src/renderer/src/components/native-chat/NativeChatDeliveryRetry.tsx b/src/renderer/src/components/native-chat/NativeChatDeliveryRetry.tsx
deleted file mode 100644
index 5958e2a8d543..000000000000
--- a/src/renderer/src/components/native-chat/NativeChatDeliveryRetry.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { RotateCcw } from 'lucide-react'
-import {
-  admitStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
-import { Button } from '@/components/ui/button'
-import { translate } from '@/i18n/i18n'
-
-export function NativeChatDeliveryRetry({
-  outbox,
-  blockedClientMessageId,
-  retry
-}: {
-  outbox: readonly StructuredAgentSessionOutboxEntry[]
-  blockedClientMessageId: string | null
-  retry: (clientMessageId: string) => void
-}): React.JSX.Element | null {
-  // Why: read through the drain's own rule, so Retry can never name an entry other than the one
-  // the queue actually stopped on -- which is no longer always the head.
-  const admission = admitStructuredAgentSessionOutboxEntry(outbox, blockedClientMessageId)
-  const retryable = admission.state === 'blocked' ? admission.entry : null
-  if (!retryable) {
-    return null
-  }
-  return (
-    <div className="mx-auto flex w-full max-w-4xl items-center justify-between gap-3 px-4 py-1 text-xs text-muted-foreground">
-      <span>
-        {retryable.state === 'unconfirmed'
-          ? translate(
-              'auto.components.native.chat.NativeChatStructuredSession.1f772bb5d0',
-              'Message delivery is unconfirmed.'
-            )
-          : translate(
-              'auto.components.native.chat.NativeChatStructuredSession.93ef441197',
-              'Message was not sent.'
-            )}
-      </span>
-      <Button
-        type="button"
-        variant="ghost"
-        size="xs"
-        onClick={() => retry(retryable.clientMessageId)}
-      >
-        <RotateCcw className="size-3" />
-        {translate('auto.components.native.chat.NativeChatStructuredSession.a5e7f14068', 'Retry')}
-      </Button>
-    </div>
-  )
-}
diff --git a/src/renderer/src/components/native-chat/NativeChatEmptyState.test.tsx b/src/renderer/src/components/native-chat/NativeChatEmptyState.test.tsx
new file mode 100644
index 000000000000..dccfaba728c8
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatEmptyState.test.tsx
@@ -0,0 +1,56 @@
+// @vitest-environment happy-dom
+
+import '@testing-library/jest-dom/vitest'
+
+import { cleanup, render, screen } from '@testing-library/react'
+import { afterEach, expect, it } from 'vitest'
+import { NativeChatEmptyState } from './NativeChatEmptyState'
+
+afterEach(cleanup)
+
+it('keeps pointing the terminal-backed chat back to its terminal when a read fails', () => {
+  render(<NativeChatEmptyState kind="error" />)
+  expect(
+    screen.getByText(
+      'The transcript could not be read. Toggle back to the terminal to keep working.'
+    )
+  ).toBeInTheDocument()
+})
+
+it('tells the structured chat its read keeps retrying', () => {
+  render(<NativeChatEmptyState kind="error" retrying />)
+  expect(
+    screen.getByText('The transcript could not be read. Orca keeps trying to load it.')
+  ).toBeInTheDocument()
+})
+
+it('shows the host message in place of the terminal-backed default', () => {
+  render(<NativeChatEmptyState kind="error" message="disk full" />)
+  expect(screen.getByText('disk full')).toBeInTheDocument()
+  expect(screen.queryByText(/Toggle back to the terminal/)).toBeNull()
+})
+
+// The structured chat passes words only from the notice table, never the host's.
+it("says the structured chat's own words for the failure once, as the title, above its retrying line", () => {
+  render(
+    <NativeChatEmptyState
+      kind="error"
+      retrying
+      headline="Orca couldn't open this chat's history right now."
+    />
+  )
+  expect(screen.getByText("Orca couldn't open this chat's history right now.")).toHaveClass(
+    'font-medium'
+  )
+  expect(screen.queryByText('Could not load conversation')).toBeNull()
+  expect(
+    screen.getByText('The transcript could not be read. Orca keeps trying to load it.')
+  ).toBeInTheDocument()
+})
+
+it('says a failure no retry gets past in its one line, with nothing of trying again', () => {
+  render(<NativeChatEmptyState kind="error" headline="Unable to load this chat." />)
+  expect(screen.getByText('Unable to load this chat.')).toHaveClass('font-medium')
+  expect(screen.queryByText('Could not load conversation')).toBeNull()
+  expect(screen.queryByText(/keeps trying|Toggle back/)).toBeNull()
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatEmptyState.tsx b/src/renderer/src/components/native-chat/NativeChatEmptyState.tsx
index f7c20ef51f45..ec84f554cd76 100644
--- a/src/renderer/src/components/native-chat/NativeChatEmptyState.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatEmptyState.tsx
@@ -7,13 +7,20 @@ import type { NativeChatSession } from '../../../../shared/native-chat-types'
 export function NativeChatEmptyState({
   kind,
   message,
-  agent
+  headline,
+  agent,
+  retrying = false
 }: {
   kind: 'loading' | 'empty' | 'error' | 'not-agent'
   message?: string
+  /** The chat's own sentence for the failure, said once: it takes the generic title's place. */
+  headline?: string
   agent?: NativeChatSession['agent']
+  /** The read retries on its own (structured chat), so the error says so instead of pointing
+   *  back to the terminal. */
+  retrying?: boolean
 }): React.JSX.Element {
-  const copy = emptyStateCopy(kind, message, agent)
+  const copy = emptyStateCopy(kind, { message, headline }, agent, retrying)
   return (
     <div className="flex h-full w-full flex-col items-center justify-center gap-3 p-6 text-center">
       <div
@@ -39,8 +46,9 @@ export function NativeChatEmptyState({
 
 function emptyStateCopy(
   kind: 'loading' | 'empty' | 'error' | 'not-agent',
-  message?: string,
-  agent?: NativeChatSession['agent']
+  words: { message?: string; headline?: string },
+  agent?: NativeChatSession['agent'],
+  retrying = false
 ): { title: string; subtitle: string | null } {
   switch (kind) {
     case 'loading':
@@ -54,19 +62,30 @@ function emptyStateCopy(
           NATIVE_CHAT_EMPTY_STATE_COPY.loading.subtitle
         )
       }
-    case 'error':
+    case 'error': {
+      const retryingLine = retrying
+        ? translate(
+            'components.native-chat.state.error.retryingSubtitle',
+            NATIVE_CHAT_EMPTY_STATE_COPY.retryingError.subtitle
+          )
+        : null
+      if (words.headline) {
+        return { title: words.headline, subtitle: retryingLine }
+      }
       return {
         title: translate(
           'components.native-chat.state.error.title',
           NATIVE_CHAT_EMPTY_STATE_COPY.error.title
         ),
         subtitle:
-          message ??
+          retryingLine ??
+          words.message ??
           translate(
             'components.native-chat.state.error.subtitle',
             NATIVE_CHAT_EMPTY_STATE_COPY.error.subtitle
           )
       }
+    }
     case 'not-agent':
       return {
         title: translate(
diff --git a/src/renderer/src/components/native-chat/NativeChatInteractiveCard.test.tsx b/src/renderer/src/components/native-chat/NativeChatInteractiveCard.test.tsx
index 9612a70516d7..401ac2948681 100644
--- a/src/renderer/src/components/native-chat/NativeChatInteractiveCard.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatInteractiveCard.test.tsx
@@ -33,6 +33,7 @@ vi.mock('../../store', () => ({
 }))
 
 import { NativeChatInteractiveCard } from './NativeChatInteractiveCard'
+import { useNativeChatInteractivePromptCard } from './use-native-chat-interactive-prompt-card'
 
 const mocks = {
   sendAnswer: vi.fn<NativeChatInteractiveSend['sendAnswer']>(),
@@ -45,6 +46,8 @@ function renderCard(canSend = true): ReturnType<typeof render> {
   return render(cardElement(canSend))
 }
 
+const NO_MESSAGES: readonly NativeChatMessage[] = []
+
 function cardElement(
   canSend = true,
   messages?: readonly NativeChatMessage[],
@@ -52,11 +55,36 @@ function cardElement(
   transcriptSettled = true
 ): React.JSX.Element {
   return (
-    <NativeChatInteractiveCard
-      paneKey="tab-1:leaf-1"
+    <CardHarness
       canSend={canSend}
       messages={messages}
+      onShowingQuestionChange={onShowingQuestionChange}
       transcriptSettled={transcriptSettled}
+    />
+  )
+}
+
+// The view derives the card and hands it over; this stands in for that view.
+function CardHarness({
+  canSend,
+  messages,
+  onShowingQuestionChange,
+  transcriptSettled
+}: {
+  canSend: boolean
+  messages?: readonly NativeChatMessage[]
+  onShowingQuestionChange?: (showing: boolean) => void
+  transcriptSettled: boolean
+}): React.JSX.Element | null {
+  const card = useNativeChatInteractivePromptCard({
+    paneKey: 'tab-1:leaf-1',
+    messages: messages ?? NO_MESSAGES,
+    transcriptSettled: transcriptSettled && messages !== undefined
+  })
+  return (
+    <NativeChatInteractiveCard
+      card={card}
+      canSend={canSend}
       onShowingQuestionChange={onShowingQuestionChange}
       send={{
         sendAnswer: mocks.sendAnswer,
diff --git a/src/renderer/src/components/native-chat/NativeChatInteractiveCard.tsx b/src/renderer/src/components/native-chat/NativeChatInteractiveCard.tsx
index 3bdf138b0fd4..1a0a6b102626 100644
--- a/src/renderer/src/components/native-chat/NativeChatInteractiveCard.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatInteractiveCard.tsx
@@ -1,19 +1,16 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
-import { useAppStore } from '../../store'
-import { resolveNativeChatAsk } from '../../../../shared/native-chat-ask'
-import type { NativeChatMessage } from '../../../../shared/native-chat-types'
-import { parseInteractivePrompt } from './native-chat-interactive-prompt'
+import type { InteractivePromptCard } from './native-chat-interactive-prompt'
 import { nativeChatCardDismissKey } from './native-chat-dismiss-key'
 import { NativeChatQuestionCard } from './NativeChatQuestionCard'
 import { NativeChatApprovalCard } from './NativeChatApprovalCard'
 import type { NativeChatInteractiveSend } from './use-native-chat-interactive-send'
 
 /**
- * Render the live interactive card for the pane while the agent's
- * `interactivePrompt` is present: a question wizard (precedence) or a tool
- * approval. Cleared by the host once the agent moves on, so it disappears
- * automatically. Sends through the composer's verified runtime path (R8/R6):
- * answers via agent-specific paste or selector keystrokes; cancel/deny as ESC.
+ * Render the pane's interactive card (see useNativeChatInteractivePromptCard): a
+ * question wizard or a tool approval. Cleared by the host once the agent moves
+ * on, so it disappears automatically. Sends through the composer's verified
+ * runtime path (R8/R6): answers via agent-specific paste or selector
+ * keystrokes; cancel/deny as ESC.
  * Guarded by `canSend` so a mobile presence-lock blocks desktop sends too.
  *
  * Dismiss-on-answer (mobile parity): the live status lingers after answering —
@@ -21,30 +18,18 @@ import type { NativeChatInteractiveSend } from './use-native-chat-interactive-se
  * answered prompt by content key and hide the card until a genuinely different
  * prompt arrives. The dismissal resets once the prompt clears, so a later
  * (even identical) prompt shows again instead of staying hidden.
- *
- * The transcript is the second source (mobile parity again): a question that the
- * live status never delivered — headless host, relay gap, replay, reconnect —
- * still has its unresolved tool call in the messages we already parsed. Without
- * it the composer stays mounted over a pane parked on a selector, and the next
- * send commits the highlighted option instead of the typed message (#11761).
  */
 export function NativeChatInteractiveCard({
-  paneKey,
+  card,
   send,
   canSend,
-  messages,
-  transcriptSettled,
   onShowingQuestionChange,
   onShowingCardChange,
   answerInputRef
 }: {
-  paneKey: string
+  card: InteractivePromptCard
   send: NativeChatInteractiveSend
   canSend: boolean
-  /** Transcript to fall back on when live status carries no prompt. Pass the
-   *  command-boundary-trimmed messages so an ask abandoned via `/clear` stays gone. */
-  messages?: readonly NativeChatMessage[]
-  transcriptSettled: boolean
   /** Reports whether a question card is on screen so the view can replace the
    *  composer with it (the card's free-text row is the answer input). */
   onShowingQuestionChange?: (showing: boolean) => void
@@ -54,26 +39,7 @@ export function NativeChatInteractiveCard({
    *  a target while the composer is unmounted. */
   answerInputRef?: React.RefObject<HTMLInputElement | null>
 }): React.JSX.Element | null {
-  const interactivePrompt = useAppStore(
-    (s) => s.agentStatusByPaneKey[paneKey]?.interactivePrompt ?? null
-  )
-  // Thread the sibling `toolName` from the same status entry so the question
-  // parser can dispatch through the tool's registered parser (mobile parity).
-  const interactiveToolName = useAppStore((s) => s.agentStatusByPaneKey[paneKey]?.toolName ?? null)
   const { sendAnswer, sendRaw, cancelPending, cancel } = send
-
-  const card = useMemo(() => {
-    const statusCard = parseInteractivePrompt(interactivePrompt, interactiveToolName ?? undefined)
-    if (statusCard?.kind === 'approval') {
-      return statusCard
-    }
-    const prompt = resolveNativeChatAsk({
-      liveAsk: statusCard?.prompt ?? null,
-      messages: messages ?? [],
-      transcriptSettled: transcriptSettled && messages != null
-    })
-    return prompt ? { kind: 'question' as const, prompt } : null
-  }, [interactivePrompt, interactiveToolName, messages, transcriptSettled])
   const cardKey = useMemo(() => nativeChatCardDismissKey(card), [card])
   const [dismissedKey, setDismissedKey] = useState<string | null>(null)
   // A question answer is a paced multi-step write (body→Enter per question); keep
diff --git a/src/renderer/src/components/native-chat/NativeChatLaunchRetry.tsx b/src/renderer/src/components/native-chat/NativeChatLaunchRetry.tsx
index 1a4204a326fa..b186bbc4e344 100644
--- a/src/renderer/src/components/native-chat/NativeChatLaunchRetry.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatLaunchRetry.tsx
@@ -2,14 +2,21 @@ import { RotateCcw } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { translate } from '@/i18n/i18n'
 import type { StructuredAgentSessionLaunchLifecycle } from '@/lib/structured-agent-session-launch'
+import { agentSessionRefusalCauseParts } from '../../../../shared/agent-session-refusal-notice'
+import type { AgentSessionWriteRefusal } from '../../../../shared/agent-session-write-failure'
+import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
 
 export function NativeChatLaunchRetry({
   lifecycle,
-  failureReason = null,
+  failure = null,
+  agentLabel,
   onRetry
 }: {
   lifecycle: StructuredAgentSessionLaunchLifecycle | null
-  failureReason?: string | null
+  /** Names the agent in a start failure's words. */
+  agentLabel?: string
+  /** The host's refusal behind the failed start; its message is never shown. */
+  failure?: AgentSessionWriteRefusal | null
   onRetry: () => void
 }): React.JSX.Element | null {
   if (lifecycle !== 'failed' && lifecycle !== 'visibility-unknown') {
@@ -25,11 +32,17 @@ export function NativeChatLaunchRetry({
           'auto.components.native.chat.NativeChatLaunchRetry.unknown',
           'Chat connection could not be confirmed.'
         )
+  const cause =
+    lifecycle === 'failed' && failure
+      ? agentSessionWriteNoticeText(
+          agentSessionRefusalCauseParts(failure, agentLabel ? { agentName: agentLabel } : {})
+        )
+      : ''
   return (
     <div className="mx-auto flex w-full max-w-4xl items-center justify-between gap-3 px-4 py-1 text-xs text-destructive">
       <span className="min-w-0 break-words">
         {message}
-        {lifecycle === 'failed' && failureReason ? ` ${failureReason}` : null}
+        {cause ? ` ${cause}` : null}
       </span>
       <Button type="button" variant="ghost" size="xs" onClick={onRetry}>
         <RotateCcw className="size-3" />
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.task-list-frames.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.task-list-frames.test.tsx
index 1408342336a0..82b2c43d4681 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.task-list-frames.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.task-list-frames.test.tsx
@@ -70,7 +70,6 @@ function transcript(messages: NativeChatMessage[], sessionId = 'live-codex') {
       isWorking={false}
       expandSignal
       fontScale={1}
-      showTurnStatus={false}
     />
   )
 }
@@ -113,6 +112,8 @@ describe('live Codex checklist frames', () => {
       role: 'assistant',
       timestamp: 1,
       source: 'transcript',
+      // Journalled like the frames it sits between.
+      journalPosition: { sequence: 1, index: 0 },
       blocks: [
         {
           type: 'tool-call',
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.tool-stream-cost.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.tool-stream-cost.test.tsx
index 2a2401bea52d..a77d2907b6a2 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.tool-stream-cost.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.tool-stream-cost.test.tsx
@@ -44,15 +44,7 @@ function Transcript({ items }: { items: AgentJournalRenderItem[] }) {
     loadEarlier,
     readPhase: 'ready'
   }
-  return (
-    <NativeChatMessageList
-      session={session}
-      isWorking
-      expandSignal
-      fontScale={1}
-      showTurnStatus={false}
-    />
-  )
+  return <NativeChatMessageList session={session} isWorking expandSignal fontScale={1} />
 }
 
 function row(index: number, body: AgentJournalRenderItem['body']): AgentJournalRenderItem {
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.tsx
index df9d46ffcf8f..1c6c848347c0 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.tsx
@@ -10,9 +10,8 @@ import { nativeChatTaskListPredecessors } from './native-chat-task-list-history'
 import { NativeChatTaskList } from './NativeChatTaskList'
 import { projectNativeChatTaskListFrames } from './native-chat-task-list-frames'
 import { omitNativeChatThreadGoalRows } from './native-chat-thread-goal-rows'
-import { shouldShowNativeChatTypingIndicator } from './native-chat-typing-indicator'
 import { useNativeChatTurnStatus } from './use-native-chat-turn-status'
-import { NativeChatTypingIndicatorRow } from './NativeChatTypingIndicatorRow'
+import { NativeChatAwaitingInputRow } from './NativeChatAwaitingInputRow'
 import type { RuntimeFileOperationArgs } from '@/runtime/runtime-file-client'
 import type { NativeChatTurnActivity } from '../../../../shared/native-chat-turn-activity'
 import { NativeChatTurnActivityLine } from './NativeChatTurnActivityLine'
@@ -22,6 +21,7 @@ import {
 } from './native-chat-disclosure-store'
 import { NativeChatTranscriptItems } from './NativeChatTranscriptItems'
 import type { NativeChatTranscriptRowContext } from './NativeChatTranscriptRow'
+import type { NativeChatDeliveryNotice } from './NativeChatMessageRow'
 import {
   buildNativeChatTranscriptSlots,
   nativeChatSlotIndexOf
@@ -41,7 +41,12 @@ import { nativeChatReaderScrollInputHandlers } from './native-chat-reader-scroll
 
 import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
 import { isStructuredAgentSessionThinking } from '../../../../shared/structured-agent-session-live-turn'
-import type { NativeChatSettledTurns } from '../../../../shared/native-chat-turn-status'
+import { nativeChatSubagentLabels } from '../../../../shared/native-chat-subagent-attribution'
+import {
+  selectNativeChatActiveTurnKey,
+  type NativeChatSettledTurns
+} from '../../../../shared/native-chat-turn-status'
+import { nativeChatRowTurnKeys } from '../../../../shared/native-chat-turn-grouping'
 import {
   nativeChatTurnDiffs,
   type NativeChatDiffReveal,
@@ -55,6 +60,10 @@ export { ProviderFrameRow } from './NativeChatTranscriptChrome'
 
 const MAX_EXPANDED_TURNS = 128
 
+/** The turn is blocked on the reader. `shown`: the pane draws the prompt itself, as a card;
+ *  `unshown`: it cannot (the prompt is only in the agent's terminal). */
+export type NativeChatAwaitingInput = 'shown' | 'unshown'
+
 type NativeChatNavigationRequest =
   | { kind: 'diff'; target: NativeChatDiffReveal }
   | { kind: 'rail'; messageId: string; requestId: number }
@@ -71,9 +80,10 @@ export function NativeChatMessageList({
   allowFileUriLinks = false,
   workingStartedAt,
   settledTurns,
-  failedDeliveryMessageIds,
-  showTurnStatus = true,
-  showLiveTurnActivity = true,
+  activeTurnOpenedBy,
+  turnKeysByItemId = null,
+  deliveryNotices,
+  awaitingInput = null,
   turnActivity,
   runtimeContext
 }: {
@@ -88,15 +98,19 @@ export function NativeChatMessageList({
   /** Chat-only text multiplier (1 = default), driven by the zoom shortcuts. */
   fontScale: number
   workingStartedAt?: number | null
-  /** Host-recorded turn durations keyed by user message id (structured lane). */
+  /** Recorded turn durations keyed by user message id (the host's, or the transcript's).
+   *  A turn missing here shows the duration this list observed, if it saw the turn run. */
   settledTurns?: NativeChatSettledTurns
+  /** The key the host says anchors the running turn's bar (structured lane). */
+  activeTurnOpenedBy?: string | null
+  /** Host-attributed turn ownership per journal item id (structured lane).
+   *  Rows it does not name keep positional preceding-user grouping. */
+  turnKeysByItemId?: ReadonlyMap<string, string> | null
   onLinkClick?: CommentMarkdownLinkClickHandler
   allowFileUriLinks?: boolean
-  failedDeliveryMessageIds?: ReadonlySet<string>
-  /** Turn timing and disclosure are available on structured agent sessions. */
-  showTurnStatus?: boolean
-  /** Whether the active turn's foreground activity row should be visible. */
-  showLiveTurnActivity?: boolean
+  deliveryNotices?: ReadonlyMap<string, NativeChatDeliveryNotice>
+  /** Set while the turn waits on the reader; the live activity line yields to it. */
+  awaitingInput?: NativeChatAwaitingInput | null
   turnActivity?: NativeChatTurnActivity | null
   runtimeContext?: RuntimeFileOperationArgs | null
 }): React.JSX.Element {
@@ -149,25 +163,15 @@ export function NativeChatMessageList({
     // Structured sessions show goal state in the banner above the composer.
     return journalItems ? omitNativeChatThreadGoalRows(projected) : projected
   }, [journalItems, projectMessages, session.messages])
+  const subagentLabels = useMemo(() => nativeChatSubagentLabels(messages), [messages])
   const taskListPredecessors = useMemo(() => nativeChatTaskListPredecessors(messages), [messages])
   const taskListState = useMemo(() => nativeChatTaskListState(messages), [messages])
-  const showTypingIndicator = showTurnStatus
-    ? isWorking
-    : shouldShowNativeChatTypingIndicator({ messages, isWorking })
-  const latestUserIndex = messages.findLastIndex((message) => message.role === 'user')
-  const currentTurnKey =
-    latestUserIndex === -1 ? undefined : (messages[latestUserIndex]?.id ?? undefined)
-  // Resolve each row's turn boundary once. Prefix slice/findLast in the render
+  // Resolve each row's owning turn once. Prefix slice/findLast in the render
   // loop becomes quadratic for long transcripts.
-  const turnKeys = useMemo(() => {
-    let currentTurnKey: string | undefined
-    return messages.map((message) => {
-      if (message.role === 'user') {
-        currentTurnKey = message.id
-      }
-      return currentTurnKey
-    })
-  }, [messages])
+  const turnKeys = useMemo(
+    () => nativeChatRowTurnKeys(messages, turnKeysByItemId),
+    [messages, turnKeysByItemId]
+  )
   const turnDiffs = useMemo(
     () =>
       journalItems
@@ -181,39 +185,46 @@ export function NativeChatMessageList({
     () => (journalItems ? isStructuredAgentSessionThinking(journalItems) : false),
     [journalItems]
   )
+  const activeTurnKey = selectNativeChatActiveTurnKey(messages, activeTurnOpenedBy)
   const turnStatuses = useNativeChatTurnStatus({
     messages,
-    latestUserIndex,
-    isWorking: showTurnStatus && isWorking,
-    workingStartedAt: showTurnStatus ? workingStartedAt : null,
-    settledTurns: showTurnStatus ? settledTurns : null,
+    activeTurnKey,
+    isWorking,
+    workingStartedAt,
+    settledTurns,
     thinking
   })
+  // The transcript tail: what the running turn is doing, or that it waits on a
+  // prompt nothing else on screen shows. A prompt card says so itself.
+  const tailRow =
+    awaitingInput === 'unshown'
+      ? 'awaiting-input'
+      : isWorking && awaitingInput === null
+        ? 'activity'
+        : null
   const lifecycleWorking = session.transcriptLifecycle?.state === 'working'
   const slots = useMemo(
     () =>
       buildNativeChatTranscriptSlots({
         messages,
         turnKeys,
-        latestUserIndex,
-        currentTurnKey,
+        activeTurnKey,
         receipts,
         turnStatuses,
         turnDiffs,
-        showTurnStatus,
         expandedTurnKeys: expandedTurnIds,
         isWorking,
-        lifecycleWorking
+        lifecycleWorking,
+        subagentLabels
       }),
     [
-      currentTurnKey,
+      activeTurnKey,
       expandedTurnIds,
       isWorking,
-      latestUserIndex,
       lifecycleWorking,
       messages,
       receipts,
-      showTurnStatus,
+      subagentLabels,
       turnDiffs,
       turnKeys,
       turnStatuses
@@ -232,7 +243,7 @@ export function NativeChatMessageList({
     contentRef,
     itemCount: slots.length,
     isWorking,
-    showTypingIndicator,
+    showsTailRow: tailRow !== null,
     isVisible,
     alignToViewportTop: transcriptWindow.alignToViewportTop,
     scrollToEnd: transcriptWindow.scrollToEnd,
@@ -327,11 +338,10 @@ export function NativeChatMessageList({
   const rowContext = useMemo<NativeChatTranscriptRowContext>(
     () => ({
       expandSignal,
-      showTurnStatus,
       revealedDiff,
       taskListPredecessors,
       expandedTurnIds,
-      failedDeliveryMessageIds,
+      deliveryNotices,
       allowFileUriLinks,
       runtimeContext,
       onLinkClick,
@@ -343,13 +353,12 @@ export function NativeChatMessageList({
       allowFileUriLinks,
       expandSignal,
       expandedTurnIds,
-      failedDeliveryMessageIds,
+      deliveryNotices,
       onLinkClick,
       revealDiff,
       revealedDiff,
       runtimeContext,
       scrollMessageToTop,
-      showTurnStatus,
       taskListPredecessors,
       toggleExpandedTurn
     ]
@@ -394,13 +403,14 @@ export function NativeChatMessageList({
                   context={rowContext}
                   window={transcriptWindow}
                 />
-                {showTurnStatus && showLiveTurnActivity && isWorking ? (
+                {tailRow === 'activity' ? (
                   <NativeChatTurnActivityLine
                     activity={turnActivity}
-                    status={turnStatuses.active}
+                    thinking={turnStatuses.active?.thinking === true}
                   />
+                ) : tailRow === 'awaiting-input' ? (
+                  <NativeChatAwaitingInputRow subject={null} pending />
                 ) : null}
-                {!showTurnStatus && showTypingIndicator ? <NativeChatTypingIndicatorRow /> : null}
               </div>
             </div>
           </div>
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-fold.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-fold.test.tsx
index b80d963bb252..635eef94c35d 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-fold.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-fold.test.tsx
@@ -140,6 +140,44 @@ describe('NativeChatMessageList settled turn fold', () => {
     expect(screen.queryByRole('button', { name: 'Toggle turn details' })).toBeNull()
   })
 
+  // The #23621 shape: the host folded a mid-turn send into the running turn, so
+  // the rows after it are still the opener's. One bar under the opener folds
+  // them all; the steered bubble stays visible and never grows a bar or group.
+  it("folds the rows after a mid-turn send behind the opener's bar", () => {
+    const startedAt = Date.now() - 3000
+    const base = session(startedAt)
+    const steer: (typeof base.messages)[number] = {
+      id: 'mid-b',
+      role: 'user',
+      blocks: [{ type: 'text', text: 'Also check the tests.' }],
+      timestamp: startedAt + 2,
+      source: 'transcript'
+    }
+    const messages = [...base.messages.slice(0, 3), steer, ...base.messages.slice(3)]
+    const turnKeysByItemId = new Map(messages.map((message) => [message.id, 'user-1']))
+    render(
+      <NativeChatMessageList
+        session={{ ...base, messages }}
+        isWorking={false}
+        workingStartedAt={null}
+        settledTurns={new Map([['user-1', { startedAt, workedSeconds: 70 }]])}
+        turnKeysByItemId={turnKeysByItemId}
+        expandSignal={false}
+        fontScale={1}
+      />
+    )
+
+    expect(screen.getByText('Also check the tests.')).toBeInTheDocument()
+    expect(screen.queryByText(NARRATION)).toBeNull()
+    expect(screen.queryByText(MORE_NARRATION)).toBeNull()
+    const toggles = screen.getAllByRole('button', { name: 'Toggle turn details' })
+    expect(toggles).toHaveLength(1)
+
+    fireEvent.click(toggles[0]!)
+    expect(screen.getByText(NARRATION)).toBeInTheDocument()
+    expect(screen.getByText(MORE_NARRATION)).toBeInTheDocument()
+  })
+
   // The answer is the LAST prose the agent produced. A turn whose final output
   // is a tool run still answers with the prose before it.
   it('keeps the last prose row when the turn ends on tool activity', () => {
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-indicator.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-indicator.test.tsx
index 4c72c96a194b..e8d714fad1aa 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-indicator.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-indicator.test.tsx
@@ -56,7 +56,8 @@ const session: NativeChatLiveSession = {
   readPhase: 'ready'
 }
 
-// The live turn renders exactly one indicator row; a settled turn keeps its own.
+// The live turn has two rows: the clock bar under the prompt, and a tail line that
+// says what the turn is doing. A settled turn keeps only the bar.
 describe('NativeChatMessageList turn indicator', () => {
   it('keeps a reduced-motion-safe spinner on the live row of a no-tool Codex turn', () => {
     render(
@@ -87,7 +88,7 @@ describe('NativeChatMessageList turn indicator', () => {
       />
     )
 
-    const activity = screen.getByText('Working for 0s')
+    const activity = screen.getByText('Working…')
     const row = activity.closest('[data-native-chat-turn-activity]')
     const spinner = row?.querySelector('svg')
     expect(activity).not.toHaveClass('animate-pulse', 'animate-spin')
@@ -131,7 +132,7 @@ describe('NativeChatMessageList turn indicator', () => {
     expect(toolLabel).toHaveClass('animate-pulse')
     expect(screen.getAllByText('Running 1 command')).toHaveLength(1)
     expect(screen.getByText('pnpm test')).toBeInTheDocument()
-    const activity = screen.getByText('Working for 0s')
+    const activity = screen.getByText('Working…')
     expect(activity.textContent).not.toBe(toolLabel.textContent)
     expect(activity).not.toHaveTextContent('shell')
     expect(activity).not.toHaveTextContent('pnpm test')
@@ -165,7 +166,7 @@ describe('NativeChatMessageList turn indicator', () => {
         }}
         journalItems={[journalItem(1, turnItem), journalItem(2, reasoningRow)]}
         isWorking
-        showLiveTurnActivity={false}
+        awaitingInput="shown"
         expandSignal={false}
         fontScale={1}
       />
@@ -177,6 +178,38 @@ describe('NativeChatMessageList turn indicator', () => {
     expect(screen.getByText('Running 1 command')).toHaveClass('animate-pulse')
   })
 
+  // A terminal-backed pane can learn its agent is waiting without being handed
+  // the prompt; the tail then says so, in the row a question uses.
+  it('says the turn waits on the reader when no card shows the prompt', () => {
+    const { container } = render(
+      <NativeChatMessageList
+        session={{
+          ...session,
+          messages: [
+            {
+              id: 'user-wait',
+              role: 'user',
+              blocks: [{ type: 'text', text: 'Deploy it' }],
+              timestamp: 1,
+              source: 'transcript'
+            }
+          ]
+        }}
+        isWorking
+        workingStartedAt={Date.now() - 5000}
+        awaitingInput="unshown"
+        expandSignal={false}
+        fontScale={1}
+      />
+    )
+
+    expect(container.querySelector('[data-native-chat-ask-row="awaiting"]')).toHaveTextContent(
+      /^Awaiting user input$/
+    )
+    expect(container.querySelector('[data-native-chat-turn-activity]')).toBeNull()
+    expect(screen.getByText('Working for 5s')).toBeInTheDocument()
+  })
+
   it('keeps the live row up after a tool settles', () => {
     render(
       <NativeChatMessageList
@@ -209,7 +242,7 @@ describe('NativeChatMessageList turn indicator', () => {
 
     // The settled run heads with the command it ran; the live row is separate.
     const settledTool = screen.getByText('pnpm test')
-    const activity = screen.getByText('Working for 0s')
+    const activity = screen.getByText('Working…')
     expect(activity.textContent).not.toBe(settledTool.textContent)
     expect(activity).not.toHaveTextContent('shell')
     expect(activity).not.toHaveTextContent('pnpm test')
@@ -285,42 +318,6 @@ describe('NativeChatMessageList turn indicator', () => {
     expect(liveRun?.querySelector('.lucide-check')).toBeInTheDocument()
   })
 
-  it('keeps bridge chats on the legacy activity chrome', () => {
-    render(
-      <NativeChatMessageList
-        session={{
-          ...session,
-          status: 'working',
-          messages: [
-            {
-              id: 'bridge-tool',
-              role: 'assistant',
-              blocks: [
-                {
-                  type: 'tool-call',
-                  name: 'shell',
-                  input: { command: 'sleep 5' },
-                  state: 'running'
-                }
-              ],
-              timestamp: 1,
-              source: 'transcript'
-            }
-          ]
-        }}
-        isWorking
-        expandSignal={false}
-        fontScale={1}
-        showTurnStatus={false}
-      />
-    )
-
-    expect(screen.queryByText('Thinking')).toBeNull()
-    expect(screen.queryByRole('button', { name: 'Toggle turn details' })).toBeNull()
-    expect(screen.queryByText('Running sleep 5')).toBeNull()
-    expect(document.querySelectorAll('.animate-bounce')).toHaveLength(3)
-  })
-
   it('replaces a bridge ask row and settles it from the FIFO tool result', () => {
     const user = {
       id: 'bridge-user',
@@ -354,7 +351,6 @@ describe('NativeChatMessageList turn indicator', () => {
         isWorking={false}
         expandSignal={false}
         fontScale={1}
-        showTurnStatus={false}
       />
     )
 
@@ -381,7 +377,6 @@ describe('NativeChatMessageList turn indicator', () => {
         isWorking={false}
         expandSignal={false}
         fontScale={1}
-        showTurnStatus={false}
       />
     )
 
@@ -390,7 +385,7 @@ describe('NativeChatMessageList turn indicator', () => {
     expect(screen.queryByText(/AskUserQuestion/)).toBeNull()
   })
 
-  it('reads "Thinking" on the one live row while the turn is reasoning', () => {
+  it('reads "Thinking" on the tail line while the bar keeps the clock', () => {
     const { container } = render(
       <NativeChatMessageList
         session={{
@@ -414,10 +409,12 @@ describe('NativeChatMessageList turn indicator', () => {
     )
 
     const user = screen.getByText('Start the task')
+    const bar = screen.getByText('Working for 0s')
     const thinking = screen.getByText('Thinking')
-    expect(user.compareDocumentPosition(thinking)).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
-    // One indicator, not a "Thinking" row stacked above a spinning "Working…" row.
-    expect(container.querySelectorAll('[data-native-chat-turn-status]')).toHaveLength(1)
+    expect(user.compareDocumentPosition(bar)).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
+    expect(bar.compareDocumentPosition(thinking)).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
+    expect(screen.getAllByText('Thinking')).toHaveLength(1)
+    expect(screen.queryByText('Working…')).toBeNull()
     expect(thinking.closest('[data-native-chat-turn-activity]')?.querySelector('svg')).toHaveClass(
       'animate-spin'
     )
@@ -451,10 +448,10 @@ describe('NativeChatMessageList turn indicator', () => {
     )
 
     expect(screen.queryByText('Thinking')).toBeNull()
-    expect(screen.getByText('Working for 0s')).toBeInTheDocument()
+    expect(screen.getByText('Working…')).toBeInTheDocument()
   })
 
-  it('lets provider activity text beat the reasoning label on the same single row', () => {
+  it('lets provider activity text beat the reasoning label on the tail line', () => {
     const { container } = render(
       <NativeChatMessageList
         session={{
@@ -480,10 +477,11 @@ describe('NativeChatMessageList turn indicator', () => {
 
     expect(screen.getByText('Exploring the repo layout')).toBeInTheDocument()
     expect(screen.queryByText('Thinking')).toBeNull()
+    expect(container.querySelectorAll('[data-native-chat-turn-activity]')).toHaveLength(1)
     expect(container.querySelectorAll('[data-native-chat-turn-status]')).toHaveLength(1)
   })
 
-  it('places the one live row after the newest content in the turn', () => {
+  it('puts the clock bar under the prompt and the tail line after the newest content', () => {
     render(
       <NativeChatMessageList
         session={{
@@ -512,20 +510,35 @@ describe('NativeChatMessageList turn indicator', () => {
       />
     )
 
-    const status = screen.getByText('Working for 0s')
+    const user = screen.getByText('Run the checks')
+    const bar = screen.getByText('Working for 0s')
     const assistant = screen.getByText('I am checking now.')
-    // The live row trails the newest content instead of sitting under the prompt.
-    expect(assistant.compareDocumentPosition(status)).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
-    expect(document.querySelectorAll('[data-native-chat-turn-status]')).toHaveLength(1)
+    const tail = screen.getByText('Working…')
+    expect(user.compareDocumentPosition(bar)).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
+    expect(bar.compareDocumentPosition(assistant)).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
+    expect(assistant.compareDocumentPosition(tail)).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
+    expect(bar.closest('[data-native-chat-turn-status]')).toHaveAttribute(
+      'data-native-chat-turn-status',
+      'active'
+    )
+    // The clock is said once, on the bar.
+    expect(screen.getAllByText(/Working for/)).toHaveLength(1)
   })
 
-  it('shows elapsed working time once tool activity starts', () => {
+  it('shows elapsed working time on the bar while a tool runs', () => {
     render(
       <NativeChatMessageList
         session={{
           ...session,
           status: 'working',
           messages: [
+            {
+              id: 'user-tool',
+              role: 'user',
+              blocks: [{ type: 'text', text: 'Wait a bit' }],
+              timestamp: 1,
+              source: 'transcript'
+            },
             {
               id: 'tool-1',
               role: 'assistant',
@@ -583,6 +596,11 @@ describe('NativeChatMessageList turn indicator', () => {
         fontScale={1}
       />
     )
+    // The live bar sits where the settled one will, so settling never moves it.
+    const liveBar = screen.getByText('Working for 3s')
+    expect(screen.getByText('Complete this task').compareDocumentPosition(liveBar)).toBe(
+      Node.DOCUMENT_POSITION_FOLLOWING
+    )
 
     rerender(
       <NativeChatMessageList
@@ -596,6 +614,10 @@ describe('NativeChatMessageList turn indicator', () => {
 
     const user = screen.getByText('Complete this task')
     const status = screen.getByText('Worked for 3s')
+    // Settled in place: the same bar, not a remount.
+    expect(status.closest('[data-native-chat-turn-status]')).toBe(
+      liveBar.closest('[data-native-chat-turn-status]')
+    )
     const assistant = screen.getByText('Task complete.')
     expect(user.compareDocumentPosition(status)).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
     expect(status.compareDocumentPosition(assistant)).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
@@ -627,6 +649,93 @@ describe('NativeChatMessageList turn indicator', () => {
     expect(screen.getByText('Working for 0s')).toBeInTheDocument()
   })
 
+  it('keeps the live bar under the prompt that opened the running turn, not a message sent mid-turn', () => {
+    const prompt = (id: string, text: string): NativeChatLiveSession['messages'][number] => ({
+      id,
+      role: 'user',
+      blocks: [{ type: 'text', text }],
+      timestamp: 1,
+      source: 'transcript'
+    })
+    const messages = [
+      prompt('user-a', 'Run four sleeps'),
+      {
+        id: 'tool-a',
+        role: 'assistant' as const,
+        blocks: [
+          {
+            type: 'tool-call' as const,
+            name: 'Bash',
+            input: { command: 'sleep 15' },
+            state: 'running' as const
+          }
+        ],
+        timestamp: 2,
+        source: 'transcript' as const
+      },
+      prompt('user-b', 'Also say banana')
+    ]
+    const list = (props: Partial<React.ComponentProps<typeof NativeChatMessageList>>) => (
+      <NativeChatMessageList
+        session={{ ...session, status: 'working', messages }}
+        isWorking
+        expandSignal={false}
+        fontScale={1}
+        {...props}
+      />
+    )
+    // B was sent while A's turn runs: the host still names A as the running turn's opener.
+    const { rerender } = render(
+      list({
+        workingStartedAt: Date.now() - 5000,
+        settledTurns: new Map(),
+        activeTurnOpenedBy: 'user-a'
+      })
+    )
+    const barA = screen.getByText('Working for 5s').closest('[data-native-chat-turn-status]')
+    expect(screen.getAllByText(/Working for/)).toHaveLength(1)
+    expect(screen.getByText('Run four sleeps').compareDocumentPosition(barA!)).toBe(
+      Node.DOCUMENT_POSITION_FOLLOWING
+    )
+    expect(barA!.compareDocumentPosition(screen.getByText('Also say banana'))).toBe(
+      Node.DOCUMENT_POSITION_FOLLOWING
+    )
+
+    // B's own turn opens: A settles in place and B counts from A's end.
+    rerender(
+      list({
+        workingStartedAt: Date.now() - 1000,
+        settledTurns: new Map([['user-a', { startedAt: 1, workedSeconds: 17 }]]),
+        activeTurnOpenedBy: 'user-b'
+      })
+    )
+    expect(screen.getByText('Worked for 17s').closest('[data-native-chat-turn-status]')).toBe(barA)
+    const barB = screen.getByText('Working for 1s').closest('[data-native-chat-turn-status]')
+    expect(screen.getByText('Also say banana').compareDocumentPosition(barB!)).toBe(
+      Node.DOCUMENT_POSITION_FOLLOWING
+    )
+
+    rerender(
+      list({
+        isWorking: false,
+        session: { ...session, status: 'ready', messages },
+        workingStartedAt: null,
+        settledTurns: new Map([
+          ['user-a', { startedAt: 1, workedSeconds: 17 }],
+          ['user-b', { startedAt: 2, workedSeconds: 51 }]
+        ]),
+        activeTurnOpenedBy: null
+      })
+    )
+    expect(screen.getByText('Worked for 17s').closest('[data-native-chat-turn-status]')).toBe(barA)
+    expect(
+      screen
+        .getByText('Also say banana')
+        .compareDocumentPosition(screen.getByText('Worked for 51s'))
+    ).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
+    expect(screen.queryByText(/Working for/)).toBeNull()
+  })
+
   it("uses the completed caret to expand that turn's tool details", () => {
     const startedAt = Date.now() - 3000
     render(
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageRow.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageRow.test.tsx
index 4b29ebf57c50..7097cb87aa4b 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageRow.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageRow.test.tsx
@@ -60,9 +60,9 @@ describe('MessageRow control visibility', () => {
       'can-hover:opacity-0',
       'can-hover:pointer-events-none',
       'group-hover:opacity-100',
-      'group-has-[:focus-visible]:opacity-100',
+      '[.group:has(:focus-visible)_&]:opacity-100',
       'group-hover:pointer-events-auto',
-      'group-has-[:focus-visible]:pointer-events-auto'
+      '[.group:has(:focus-visible)_&]:pointer-events-auto'
     )
     expect(copy.parentElement).not.toHaveClass('opacity-0', 'pointer-events-none')
     expect(time).not.toHaveAttribute('tabindex')
@@ -79,9 +79,9 @@ describe('MessageRow control visibility', () => {
       'can-hover:opacity-0',
       'can-hover:pointer-events-none',
       'group-hover:opacity-100',
-      'group-has-[:focus-visible]:opacity-100',
+      '[.group:has(:focus-visible)_&]:opacity-100',
       'group-hover:pointer-events-auto',
-      'group-has-[:focus-visible]:pointer-events-auto'
+      '[.group:has(:focus-visible)_&]:pointer-events-auto'
     )
     expect(copy.parentElement).not.toHaveClass('opacity-0', 'pointer-events-none')
     expect(copy.parentElement!.parentElement).toHaveClass('group')
@@ -162,3 +162,83 @@ describe('MessageRow send mode', () => {
     expect(screen.queryByText('Sent as goal')).not.toBeInTheDocument()
   })
 })
+
+describe('a user message that did not go through', () => {
+  function renderUser(deliveryNotice?: { text: string; onRetry?: () => void }) {
+    return render(
+      <MessageRow
+        message={{
+          id: 'message',
+          role: 'user',
+          timestamp: 0,
+          source: 'transcript',
+          blocks: [{ type: 'text', text: 'Message text' }]
+        }}
+        expandSignal={false}
+        onScrollMessageToTop={vi.fn()}
+        deliveryNotice={deliveryNotice}
+      />
+    )
+  }
+
+  it('says why under the message, with a Retry that sends this one', () => {
+    const onRetry = vi.fn()
+    renderUser({ text: "The agent couldn't restart. Your message was not sent.", onRetry })
+
+    expect(
+      screen.getByText("The agent couldn't restart. Your message was not sent.")
+    ).toBeInTheDocument()
+    fireEvent.click(screen.getByRole('button', { name: 'Retry' }))
+    expect(onRetry).toHaveBeenCalledOnce()
+  })
+
+  it('offers no Retry where the surface cannot send it again', () => {
+    renderUser({ text: 'Not delivered — check the terminal' })
+
+    expect(screen.getByText('Not delivered — check the terminal')).toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'Retry' })).toBeNull()
+  })
+
+  it('says nothing when it went through', () => {
+    renderUser()
+    expect(screen.queryByRole('button', { name: 'Retry' })).toBeNull()
+  })
+})
+
+describe("MessageRow — a subagent's row speaks as that subagent", () => {
+  function renderAgentRow(agentId: string | undefined, subagentLabel?: string) {
+    return render(
+      <MessageRow
+        message={{
+          id: 'message',
+          role: 'assistant',
+          timestamp: 0,
+          source: 'transcript',
+          blocks: [{ type: 'text', text: 'The PR is CLEAN.' }],
+          ...(agentId === undefined ? {} : { agentId })
+        }}
+        expandSignal={false}
+        onScrollMessageToTop={vi.fn()}
+        subagentLabel={subagentLabel}
+      />
+    )
+  }
+
+  it('names the subagent that wrote the row', () => {
+    renderAgentRow('task-1', 'explore the lane')
+    expect(
+      screen.getByRole('note', { name: 'Written by subagent explore the lane' })
+    ).toBeInTheDocument()
+    expect(screen.getByText('The PR is CLEAN.')).toBeInTheDocument()
+  })
+
+  it('still marks the row as a subagent when no loaded roster names it', () => {
+    renderAgentRow('task-9')
+    expect(screen.getByRole('note', { name: 'Subagent' })).toBeInTheDocument()
+  })
+
+  it("adds nothing to the session's own row", () => {
+    renderAgentRow(undefined, 'explore the lane')
+    expect(screen.queryByRole('note')).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageRow.tsx b/src/renderer/src/components/native-chat/NativeChatMessageRow.tsx
index 054147cdc533..cab0db7ec9d6 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageRow.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageRow.tsx
@@ -1,5 +1,6 @@
 import { memo, useCallback, useRef } from 'react'
-import { Goal } from 'lucide-react'
+import { Bot, Goal, RotateCcw } from 'lucide-react'
+import { Button } from '@/components/ui/button'
 import CommentMarkdown, {
   type CommentMarkdownLinkClickHandler
 } from '@/components/sidebar/CommentMarkdown'
@@ -10,6 +11,8 @@ import type {
   NativeChatToolCallBlock
 } from '../../../../shared/native-chat-types'
 import { deriveNativeChatRowContent } from '../../../../shared/native-chat-row-content'
+import { agentJournalItemSubagentId } from '../../../../shared/agent-session-journal-producer'
+import { NATIVE_CHAT_SUBAGENT_ATTRIBUTION_COPY } from '../../../../shared/native-chat-subagent-attribution'
 import { NativeChatToolRun } from './NativeChatToolRun'
 import { NativeChatCodeBlock } from './NativeChatCodeBlock'
 import { NativeChatNoticeRow } from './NativeChatNoticeRow'
@@ -27,6 +30,10 @@ import {
   nativeChatUserMessageClassName
 } from './fork-native-chat-coloring/native-chat-message-coloring'
 
+/** What a user message says under it when it did not go through, with its own Retry when the
+ *  surface can send it again. */
+export type NativeChatDeliveryNotice = { text: string; onRetry?: () => void }
+
 /** One message: its prose first, then a collapsible run folding all of the
  *  turn's tool activity. Monochrome per STYLEGUIDE: user prompts read as a
  *  lifted card, assistant prose as body copy, reasoning de-emphasized.
@@ -43,9 +50,9 @@ export const MessageRow = memo(function MessageRow({
   onScrollMessageToTop,
   onLinkClick,
   allowFileUriLinks = false,
-  deliveryFailed = false,
-  structuredActivityUi = true,
+  deliveryNotice,
   folded = false,
+  subagentLabel,
   runtimeContext
 }: {
   message: NativeChatMessage
@@ -60,10 +67,11 @@ export const MessageRow = memo(function MessageRow({
   onScrollMessageToTop: (el: HTMLElement) => void
   onLinkClick?: CommentMarkdownLinkClickHandler
   allowFileUriLinks?: boolean
-  deliveryFailed?: boolean
-  structuredActivityUi?: boolean
+  deliveryNotice?: NativeChatDeliveryNotice
   /** Behind a folded turn: the row keeps only what outlives the turn. */
   folded?: boolean
+  /** The roster's name for the subagent that wrote this row, when one names it. */
+  subagentLabel?: string
   runtimeContext?: RuntimeFileOperationArgs | null
 }): React.JSX.Element | null {
   const rowRef = useRef<HTMLDivElement | null>(null)
@@ -167,17 +175,23 @@ export const MessageRow = memo(function MessageRow({
         {/* Copy + timestamp reveal together, mirroring the agent controls row.
             Image-only prompts have no text to copy, so the button is omitted. */}
         {markdown || message.timestamp !== null ? (
-          <div className="flex select-none items-center gap-1 transition-opacity can-hover:pointer-events-none can-hover:opacity-0 group-hover:pointer-events-auto group-hover:opacity-100 group-has-[:focus-visible]:pointer-events-auto group-has-[:focus-visible]:opacity-100">
+          <div className="flex select-none items-center gap-1 transition-opacity can-hover:pointer-events-none can-hover:opacity-0 group-hover:pointer-events-auto group-hover:opacity-100 [.group:has(:focus-visible)_&]:pointer-events-auto [.group:has(:focus-visible)_&]:opacity-100">
             {markdown ? <NativeChatCopyButton text={markdown} /> : null}
             <NativeChatMessageTimestamp timestamp={message.timestamp} focusable />
           </div>
         ) : null}
-        {deliveryFailed ? (
-          <div className="max-w-[85%] text-[11px] text-destructive/80">
-            {translate(
-              'components.native-chat.launchPromptNotDelivered',
-              'Not delivered — check the terminal'
-            )}
+        {deliveryNotice ? (
+          <div className="flex max-w-[85%] items-center gap-2 text-[11px] text-destructive/80">
+            <span className="min-w-0 break-words">{deliveryNotice.text}</span>
+            {deliveryNotice.onRetry ? (
+              <Button type="button" variant="ghost" size="xs" onClick={deliveryNotice.onRetry}>
+                <RotateCcw className="size-3" />
+                {translate(
+                  'auto.components.native.chat.NativeChatStructuredSession.a5e7f14068',
+                  'Retry'
+                )}
+              </Button>
+            ) : null}
           </div>
         ) : null}
       </div>
@@ -187,6 +201,24 @@ export const MessageRow = memo(function MessageRow({
   // Plain assistant prose is the copyable unit; reasoning/system asides stay
   // chrome-free. Controls reveal on hover/keyboard focus and stay visible on touch.
   const showControls = !isReasoning && !isSystem && markdown.length > 0
+  // A subagent's row sits where it happened but speaks as that subagent, never as
+  // the agent the reader is talking to.
+  const subagentName =
+    agentJournalItemSubagentId(message) === null
+      ? null
+      : (subagentLabel ??
+        translate(
+          'components.native-chat.subagents.unnamed',
+          NATIVE_CHAT_SUBAGENT_ATTRIBUTION_COPY.unnamed
+        ))
+  const subagentCaption =
+    subagentLabel === undefined
+      ? subagentName
+      : translate(
+          'components.native-chat.subagents.writtenBy',
+          NATIVE_CHAT_SUBAGENT_ATTRIBUTION_COPY.writtenBy,
+          { value0: subagentLabel }
+        )
 
   return (
     <div
@@ -195,9 +227,22 @@ export const MessageRow = memo(function MessageRow({
         'group relative max-w-full select-text text-sm leading-relaxed text-foreground',
         // Reasoning is the agent thinking aloud — quieter, italic, like an aside.
         isReasoning && nativeChatReasoningClassName(),
+        subagentName !== null && !isReasoning && 'border-l-2 border-border/60 pl-3',
         isSystem && 'text-xs text-muted-foreground'
       )}
     >
+      {subagentName !== null ? (
+        <div
+          role="note"
+          aria-label={subagentCaption ?? undefined}
+          className="mb-1 flex min-h-5 items-center gap-1.5 not-italic text-muted-foreground"
+        >
+          <Bot aria-hidden className="size-3.5 shrink-0" />
+          <code aria-hidden className="min-w-0 truncate font-mono text-[11px]">
+            {subagentName}
+          </code>
+        </div>
+      ) : null}
       <NativeChatImageAttachments
         blocks={prose}
         runtimeContext={runtimeContext}
@@ -228,7 +273,6 @@ export const MessageRow = memo(function MessageRow({
           expandSignal={expandSignal}
           activeTurnIsWorking={activeTurnIsWorking}
           trailing={trailingRun}
-          structuredActivityUi={structuredActivityUi}
           disclosureId={message.id}
         />
       ) : null}
@@ -237,7 +281,7 @@ export const MessageRow = memo(function MessageRow({
           markdown={markdown}
           timestamp={message.timestamp}
           onScrollToTop={scrollToTop}
-          className="mt-1 -mb-5 w-fit select-none transition-opacity can-hover:pointer-events-none can-hover:opacity-0 group-hover:pointer-events-auto group-hover:opacity-100 group-has-[:focus-visible]:pointer-events-auto group-has-[:focus-visible]:opacity-100"
+          className="mt-1 -mb-5 w-fit select-none transition-opacity can-hover:pointer-events-none can-hover:opacity-0 group-hover:pointer-events-auto group-hover:opacity-100 [.group:has(:focus-visible)_&]:pointer-events-auto [.group:has(:focus-visible)_&]:opacity-100"
         />
       ) : null}
     </div>
diff --git a/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.test.tsx b/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.test.tsx
index fcf13956b9ca..72f1f62c21d3 100644
--- a/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.test.tsx
@@ -1,11 +1,19 @@
 // @vitest-environment happy-dom
 import '@testing-library/jest-dom/vitest'
-import { act, cleanup, render, screen } from '@testing-library/react'
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, describe, expect, it } from 'vitest'
 import { i18n } from '@/i18n/i18n'
-import type { AgentJournalQuestionItem } from '../../../../shared/agent-session-journal-types'
+import type {
+  AgentJournalQuestionItem,
+  AgentJournalRenderItem
+} from '../../../../shared/agent-session-journal-types'
 import { encodeAgentSessionQuestionAnswers } from '../../../../shared/agent-session-question-answer'
 import { NativeChatResolutionReceipt } from './NativeChatResolutionReceipt'
+import { structuredQuestionTranscript } from './structured-agent-question-projection'
+import {
+  NativeChatDisclosureContext,
+  useNativeChatDisclosures
+} from './native-chat-disclosure-store'
 import {
   nativeChatReceiptAnswers,
   type NativeChatResolvedPrompt
@@ -210,6 +218,203 @@ describe('resolution receipts', () => {
     expect(screen.queryByText('1 grouped question from Claude')).toBeNull()
   })
 
+  it('keeps an opened question open once it is answered', () => {
+    const scrollWidth = Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'scrollWidth')
+    Object.defineProperty(HTMLElement.prototype, 'scrollWidth', {
+      configurable: true,
+      get: () => 400
+    })
+    const pendingBody: AgentJournalQuestionItem = {
+      kind: 'question',
+      question: 'Which of the three migration strategies should I use?',
+      options: [{ id: 'a', label: 'Strategy A' }],
+      resolution: { ...approval.resolution, state: 'pending', selectedOptionId: null }
+    }
+    function Harness({ body }: { body: AgentJournalQuestionItem }): React.JSX.Element {
+      const disclosures = useNativeChatDisclosures()
+      return (
+        <NativeChatDisclosureContext.Provider value={disclosures}>
+          <NativeChatResolutionReceipt body={body} disclosureId="message-1" />
+        </NativeChatDisclosureContext.Provider>
+      )
+    }
+    try {
+      const { rerender } = render(<Harness body={pendingBody} />)
+      fireEvent.click(screen.getByRole('button', { name: /Awaiting user input:/ }))
+
+      rerender(
+        <Harness
+          body={{ ...pendingBody, resolution: { ...approval.resolution, selectedOptionId: 'a' } }}
+        />
+      )
+      expect(screen.getByRole('button', { name: /Asked:/ })).toHaveAttribute(
+        'aria-expanded',
+        'true'
+      )
+    } finally {
+      if (scrollWidth) {
+        Object.defineProperty(HTMLElement.prototype, 'scrollWidth', scrollWidth)
+      } else {
+        Reflect.deleteProperty(HTMLElement.prototype, 'scrollWidth')
+      }
+    }
+  })
+
+  describe('a grouped question', () => {
+    const FIRST = 'Which of the three migration strategies should I use for the orders table?'
+    const SECOND = 'Should the old columns be dropped in the same release?'
+    const grouped: AgentJournalQuestionItem = {
+      kind: 'question',
+      question: '2 grouped questions from Claude',
+      options: [],
+      questions: [
+        { id: 'q1', question: FIRST, multiSelect: false, options: [{ id: 'a', label: 'A' }] },
+        { id: 'q2', question: SECOND, multiSelect: false, options: [{ id: 'y', label: 'Yes' }] }
+      ],
+      resolution: { state: 'cancelled', selectedOptionId: null, resolvedBy: null, resolvedAt: null }
+    }
+
+    function Harness({
+      body,
+      mounted = true
+    }: {
+      body: AgentJournalQuestionItem
+      mounted?: boolean
+    }): React.JSX.Element {
+      const disclosures = useNativeChatDisclosures()
+      return (
+        <NativeChatDisclosureContext.Provider value={disclosures}>
+          {mounted ? <NativeChatResolutionReceipt body={body} disclosureId="message-1" /> : null}
+        </NativeChatDisclosureContext.Provider>
+      )
+    }
+
+    it('lists every question of a cancelled prompt below its toggle', () => {
+      const { rerender } = render(<Harness body={grouped} />)
+      const toggle = screen.getByRole('button', { name: /Asked:\s*2 questions/ })
+      expect(toggle).toHaveAttribute('aria-expanded', 'false')
+      expect(screen.queryByText(FIRST)).toBeNull()
+
+      fireEvent.click(toggle)
+      expect(toggle).toHaveAttribute('aria-expanded', 'true')
+      // The count stays on the line; the list opens outside the button, as prose.
+      expect(toggle).toHaveTextContent('2 questions')
+      const items = screen.getAllByRole('listitem')
+      expect(items.map((item) => item.textContent)).toEqual([FIRST, SECOND])
+      expect(items[0]?.closest('button')).toBeNull()
+      fireEvent.click(items[0]!)
+      expect(toggle).toHaveAttribute('aria-expanded', 'true')
+
+      rerender(<Harness body={grouped} mounted={false} />)
+      rerender(<Harness body={grouped} />)
+      const remounted = screen.getByRole('button', { name: /Asked:/ })
+      expect(remounted).toHaveAttribute('aria-expanded', 'true')
+      expect(screen.getByText(SECOND)).toBeInTheDocument()
+
+      // Folding keeps the same control, so keyboard focus is not dropped.
+      remounted.focus()
+      fireEvent.click(remounted)
+      expect(document.activeElement).toBe(remounted)
+      expect(remounted).toHaveAttribute('aria-expanded', 'false')
+      expect(screen.queryByRole('list')).toBeNull()
+    })
+
+    it('lists the questions of a pending group the card may not be showing', () => {
+      render(
+        <Harness body={{ ...grouped, resolution: { ...grouped.resolution, state: 'pending' } }} />
+      )
+      fireEvent.click(screen.getByRole('button', { name: /Awaiting user input:\s*2 questions/ }))
+      expect(screen.getAllByRole('listitem').map((item) => item.textContent)).toEqual([
+        FIRST,
+        SECOND
+      ])
+    })
+
+    it('does not carry an opened Codex group onto its first question once answered', () => {
+      const codexQuestion = (
+        itemId: string,
+        question: string,
+        resolution: AgentJournalQuestionItem['resolution'] = {
+          state: 'pending',
+          selectedOptionId: null,
+          resolvedBy: null,
+          resolvedAt: null
+        }
+      ): AgentJournalRenderItem => ({
+        itemId,
+        sequence: 1,
+        revision: 1,
+        observedAt: 1,
+        body: {
+          kind: 'question',
+          question,
+          options: [{ id: `${itemId}-a`, label: 'A' }],
+          resolution
+        }
+      })
+      const receiptFor = (items: AgentJournalRenderItem[]): AgentJournalQuestionItem => {
+        const body = structuredQuestionTranscript(items).receipts.get('message-1')
+        if (body?.kind !== 'question') {
+          throw new Error('expected a question receipt')
+        }
+        return body
+      }
+      const second = codexQuestion('message-2', SECOND)
+      const { rerender } = render(
+        <Harness body={receiptFor([codexQuestion('message-1', 'Branch?'), second])} />
+      )
+      fireEvent.click(screen.getByRole('button', { name: /Awaiting user input:\s*2 questions/ }))
+      expect(screen.getByText('Branch?')).toBeInTheDocument()
+
+      // Answering the first question gives it its own row under the group's id.
+      const answered = codexQuestion('message-1', 'Branch?', {
+        state: 'resolved',
+        selectedOptionId: 'message-1-a',
+        resolvedBy: null,
+        resolvedAt: 1000
+      })
+      rerender(<Harness body={receiptFor([answered, second])} />)
+      expect(screen.getByText('Branch?')).toHaveClass('truncate')
+      expect(screen.queryByRole('button')).toBeNull()
+    })
+
+    it('stays plain once answered, since each question is listed with its answer', () => {
+      render(
+        <Harness
+          body={{
+            ...grouped,
+            resolution: {
+              state: 'resolved',
+              selectedOptionId: null,
+              answers: [
+                { questionId: 'q1', optionIds: ['a'] },
+                { questionId: 'q2', optionIds: ['y'] }
+              ],
+              resolvedBy: null,
+              resolvedAt: 1000
+            }
+          }}
+        />
+      )
+      expect(screen.getByText('2 questions')).toBeInTheDocument()
+      expect(screen.queryByRole('button')).toBeNull()
+      expect(screen.getAllByText(FIRST)).toHaveLength(1)
+      expect(screen.getAllByText(SECOND)).toHaveLength(1)
+      expect(screen.getByText('Yes')).toBeInTheDocument()
+    })
+
+    it('leaves a cancelled single question that fits its line as plain text', () => {
+      render(
+        <Harness
+          body={{ ...grouped, question: FIRST, questions: grouped.questions?.slice(0, 1) }}
+        />
+      )
+      expect(screen.getByText(FIRST)).toHaveClass('truncate')
+      expect(screen.queryByRole('button')).toBeNull()
+      expect(screen.queryByRole('list')).toBeNull()
+    })
+  })
+
   it('decodes single free-text answers only for the declared question', () => {
     const body: AgentJournalQuestionItem = {
       kind: 'question',
diff --git a/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.tsx b/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.tsx
index d6587fe9f001..a1906a27197b 100644
--- a/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.tsx
@@ -8,15 +8,19 @@ import {
 } from './native-chat-resolution-receipt'
 
 export function NativeChatResolutionReceipt({
-  body
+  body,
+  disclosureId
 }: {
   body: NativeChatResolvedPrompt
+  /** Message this receipt stands in for; keys the question row's disclosure. */
+  disclosureId?: string
 }): React.JSX.Element | null {
+  const askDisclosureKey = disclosureId === undefined ? undefined : `ask:${disclosureId}`
   const subject: NativeChatAskRowSubject | null =
     body.kind !== 'question'
       ? null
       : body.questions && body.questions.length > 1
-        ? { kind: 'count', count: body.questions.length }
+        ? { kind: 'questions', questions: body.questions.map((entry) => entry.question) }
         : {
             kind: 'question',
             // Claude keeps a generic grouped label for a single multi-select
@@ -31,11 +35,12 @@ export function NativeChatResolutionReceipt({
           }
   if (body.resolution.state === 'pending') {
     return body.kind === 'question' ? (
-      <NativeChatAwaitingInputRow subject={subject} pending />
+      <NativeChatAwaitingInputRow subject={subject} pending disclosureKey={askDisclosureKey} />
     ) : null
   }
   const { resolution } = body
   const title = body.kind === 'approval' ? (body.displayName ?? body.title) : body.question
+  // Non-empty only once resolved, and then each question is listed with its answer.
   const answers = nativeChatReceiptAnswers(body)
   return (
     <div
@@ -43,7 +48,12 @@ export function NativeChatResolutionReceipt({
       data-native-chat-receipt={body.kind}
     >
       {body.kind === 'question' ? (
-        <NativeChatAwaitingInputRow pending={false} subject={subject} />
+        <NativeChatAwaitingInputRow
+          pending={false}
+          subject={subject}
+          disclosureKey={askDisclosureKey}
+          listsQuestions={answers.length === 0}
+        />
       ) : (
         <div className="font-medium">{title}</div>
       )}
diff --git a/src/renderer/src/components/native-chat/NativeChatResolvedView.tsx b/src/renderer/src/components/native-chat/NativeChatResolvedView.tsx
index 2618da6f2a25..16c17cee1bd2 100644
--- a/src/renderer/src/components/native-chat/NativeChatResolvedView.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatResolvedView.tsx
@@ -7,16 +7,17 @@ import { isNativeChatTranscriptUnsettled } from './fork-native-chat-relay/use-na
 import { selectNativeChatViewState } from './fork-native-chat-relay/native-chat-view-state'
 import { NativeChatConversation } from './fork-native-chat-relay/NativeChatConversation'
 import { useNativeChatLaunchPromptOverlay } from './fork-native-chat-relay/use-native-chat-launch-prompt-overlay'
+import { useNativeChatLaunchPromptDeliveryNotice } from './use-native-chat-launch-prompt-delivery-notice'
 import { NativeChatComposer, type NativeChatComposerHandle } from './NativeChatComposer'
 import { useNativeChatFontScale } from './use-native-chat-font-scale'
 import { useNativeChatCanSend } from './use-native-chat-can-send'
 import { NativeChatInteractiveCard } from './NativeChatInteractiveCard'
+import { useNativeChatInteractivePromptCard } from './use-native-chat-interactive-prompt-card'
 import { NativeChatEmptyState } from './NativeChatEmptyState'
 import { useNativeChatInteractiveSend } from './use-native-chat-interactive-send'
-import {
-  shouldClearNativeChatWorkingSuppression,
-  shouldShowNativeChatWorking
-} from './native-chat-working-suppression'
+import { shouldClearNativeChatWorkingSuppression } from './native-chat-working-suppression'
+import { resolveNativeChatTerminalTurn } from './native-chat-terminal-turn'
+import { useNativeChatTerminalTurnTiming } from './use-native-chat-terminal-turn-timing'
 import {
   appendPendingSendCache,
   pendingSendsAsMessages,
@@ -244,13 +245,15 @@ export function NativeChatResolvedView({
       ? sessionWithLaunchPrompt
       : { ...sessionWithLaunchPrompt, messages }
   }, [sessionWithLaunchPrompt, commandMarkers])
-  const failedLaunchPromptMessageIds = useMemo(() => {
-    const id = paneLaunchPrompt?.failed ? launchPromptMessage?.id : null
-    if (!id || !sessionAfterCommandBoundaries.messages.some((message) => message.id === id)) {
-      return undefined
-    }
-    return new Set([id])
-  }, [paneLaunchPrompt?.failed, launchPromptMessage?.id, sessionAfterCommandBoundaries.messages])
+  const launchPromptDeliveryNotices = useNativeChatLaunchPromptDeliveryNotice(
+    paneLaunchPrompt?.failed ? launchPromptMessage?.id : null,
+    sessionAfterCommandBoundaries.messages
+  )
+  const promptCard = useNativeChatInteractivePromptCard({
+    paneKey,
+    messages: sessionAfterCommandBoundaries.messages,
+    transcriptSettled: session.readPhase === 'ready'
+  })
 
   // The streaming preview bubble (if any) sits after the transcript but before
   // the optimistic user echoes — same order mobile uses.
@@ -313,11 +316,14 @@ export function NativeChatResolvedView({
       previousWorkingEpochRef.current = null
     }
   }, [liveWorking, workingInterrupted, hookWorkingEpoch])
-  const isWorking = shouldShowNativeChatWorking({
+  const { isWorking, turnActive, awaitingInput } = resolveNativeChatTerminalTurn({
     isConversation,
     working: liveWorking,
-    interrupted: workingInterrupted
+    hookAwaitingInput: session.hookAwaitingInput === true,
+    interrupted: workingInterrupted,
+    hasPromptCard: promptCard !== null
   })
+  const turnTiming = useNativeChatTerminalTurnTiming(paneKey, session.messages, turnActive)
 
   const stopAgent = useCallback(() => {
     setWorkingInterrupted(true)
@@ -399,13 +405,13 @@ export function NativeChatResolvedView({
           <NativeChatConversation
             session={sessionWithPending}
             isVisible={isVisible}
-            isWorking={isWorking}
+            isWorking={turnActive}
             fontScale={fontScale.scale}
-            workingStartedAt={hookWorkingEpoch}
-            showTurnStatus={false}
+            {...turnTiming}
+            awaitingInput={awaitingInput}
             onLinkClick={onLinkClick}
             allowFileUriLinks={fileLinkContext !== null}
-            failedDeliveryMessageIds={failedLaunchPromptMessageIds}
+            deliveryNotices={launchPromptDeliveryNotices}
             readError={viewState.error}
           />
         )}
@@ -414,11 +420,9 @@ export function NativeChatResolvedView({
           (mobile parity). A question card supplies its own answer input, so it
           fully replaces the composer while active — no stray "Send a message". */}
       <NativeChatInteractiveCard
-        paneKey={paneKey}
+        card={promptCard}
         send={interactiveSend}
         canSend={canSend}
-        messages={sessionAfterCommandBoundaries.messages}
-        transcriptSettled={session.readPhase === 'ready'}
         onShowingQuestionChange={setQuestionActive}
         answerInputRef={questionAnswerInputRef}
       />
diff --git a/src/renderer/src/components/native-chat/NativeChatResolvedView.turn-status.test.tsx b/src/renderer/src/components/native-chat/NativeChatResolvedView.turn-status.test.tsx
new file mode 100644
index 000000000000..ba2a7c00de20
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatResolvedView.turn-status.test.tsx
@@ -0,0 +1,401 @@
+// @vitest-environment happy-dom
+
+import '@testing-library/jest-dom/vitest'
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { act, cleanup, render, screen } from '@testing-library/react'
+import type { AgentStatusEntry, AgentStatusPayload } from '../../../../shared/agent-status-types'
+import type { NativeChatMessage } from '../../../../shared/native-chat-types'
+import type { NativeChatLiveSession } from './use-native-chat-live-session'
+
+// The transcript source and the composer are stubbed; the wire under test is
+// store status -> resolved view -> the shared message list and prompt card.
+const retained = vi.hoisted((): { session: NativeChatLiveSession | null } => ({ session: null }))
+vi.mock('./use-native-chat-retained-session', () => ({
+  useNativeChatRetainedSession: () => retained.session
+}))
+vi.mock('./NativeChatComposer', () => ({ NativeChatComposer: () => null }))
+
+const { NativeChatResolvedView } = await import('./NativeChatResolvedView')
+const { useAppStore } = await import('../../store')
+const { installNativeChatMessageListTestViewport } =
+  await import('./native-chat-message-list-test-viewport')
+
+const paneKey = 'tab-state:leaf-state'
+let restoreViewport = (): void => {}
+
+const userTurn: NativeChatMessage = {
+  id: 'user-1',
+  role: 'user',
+  blocks: [{ type: 'text', text: 'Rename the module' }],
+  timestamp: 1,
+  source: 'transcript'
+}
+
+const askCall: NativeChatMessage = {
+  id: 'ask-1',
+  role: 'assistant',
+  blocks: [
+    {
+      type: 'tool-call',
+      name: 'AskUserQuestion',
+      input: {
+        questions: [
+          {
+            question: 'Which name?',
+            multiSelect: false,
+            options: [{ label: 'core' }, { label: 'base' }]
+          }
+        ]
+      }
+    }
+  ],
+  timestamp: 2,
+  source: 'transcript'
+}
+
+const stepCall: NativeChatMessage = {
+  id: 'step-1',
+  role: 'assistant',
+  blocks: [{ type: 'tool-call', name: 'Bash', input: { command: 'pnpm build' } }],
+  timestamp: 3,
+  source: 'transcript'
+}
+
+// `status` and `hookAwaitingInput` are what the live session reconciles from the
+// same hook row; the test states both so the view is fed a consistent session.
+function transcript(
+  status: NativeChatLiveSession['status'],
+  hookAwaitingInput: boolean,
+  messages: NativeChatMessage[] = [userTurn]
+): NativeChatLiveSession {
+  return {
+    messages,
+    status,
+    sessionId: 'session-state',
+    agent: 'claude',
+    hookAwaitingInput,
+    hasMore: false,
+    loadingEarlier: false,
+    olderHistoryGeneration: 0,
+    loadEarlier: vi.fn(),
+    readPhase: 'ready'
+  }
+}
+
+function setStatus(payload: Omit<AgentStatusPayload, 'prompt' | 'agentType'>, age = 0): void {
+  useAppStore
+    .getState()
+    .setAgentStatus(paneKey, { prompt: 'Rename the module', agentType: 'claude', ...payload })
+  const live = useAppStore.getState().agentStatusByPaneKey[paneKey]
+  if (!live) {
+    throw new Error('the store dropped the status row this test depends on')
+  }
+  useAppStore.setState((store) => ({
+    agentStatusByPaneKey: {
+      ...store.agentStatusByPaneKey,
+      [paneKey]: { ...live, stateStartedAt: Date.now() - age }
+    }
+  }))
+}
+
+function patchStatus(fields: Partial<AgentStatusEntry>): void {
+  useAppStore.setState((store) => ({
+    agentStatusByPaneKey: {
+      ...store.agentStatusByPaneKey,
+      [paneKey]: { ...store.agentStatusByPaneKey[paneKey]!, ...fields }
+    }
+  }))
+}
+
+function renderPane(): void {
+  render(
+    <NativeChatResolvedView
+      paneKey={paneKey}
+      agent="claude"
+      sessionId="session-state"
+      transcriptPath={null}
+      isVisible
+      isFocusedGroup={false}
+      targetPtyId="pty-state"
+      terminalTabId="tab-state"
+      ownsTabWideLaunchDraft={false}
+    />
+  )
+}
+
+function liveActivityLine(): Element | null {
+  return document.querySelector('[data-native-chat-turn-activity]')
+}
+
+beforeEach(() => {
+  restoreViewport = installNativeChatMessageListTestViewport()
+  useAppStore.setState({ agentStatusByPaneKey: {}, nativeChatLaunchPromptByTabId: {} })
+})
+
+afterEach(() => {
+  cleanup()
+  restoreViewport()
+  useAppStore.setState({ agentStatusByPaneKey: {}, nativeChatLaunchPromptByTabId: {} })
+})
+
+// A terminal-backed pane renders through the structured chat's own turn-status
+// UI: the clock bar under the prompt, the live line at the tail, and the row a
+// question uses when the agent waits on the reader.
+describe('NativeChatResolvedView turn status', () => {
+  it('counts the working turn from the host-stamped epoch, with the live line at the tail', () => {
+    retained.session = transcript('working', false)
+    setStatus({ state: 'working' }, 75_000)
+
+    renderPane()
+
+    expect(screen.getByText('Working for 1m 15s')).toBeInTheDocument()
+    expect(liveActivityLine()).toHaveTextContent('Working…')
+    expect(document.querySelectorAll('.animate-bounce')).toHaveLength(0)
+  })
+
+  it.each(['waiting', 'blocked'] as const)(
+    'says a %s agent waits on the reader when only its terminal shows the prompt',
+    (state) => {
+      retained.session = transcript('ready', true)
+      setStatus({ state }, 20_000)
+
+      renderPane()
+
+      // A whole phrase: there is no question to name after a colon.
+      expect(screen.getByText('Awaiting user input')).toBeInTheDocument()
+      expect(liveActivityLine()).toBeNull()
+      // The turn runs on behind the wait, as a structured turn does behind its card.
+      expect(screen.getByText('Working for 20s')).toBeInTheDocument()
+    }
+  )
+
+  it('lets the approval card speak for the wait', () => {
+    retained.session = transcript('ready', true)
+    setStatus({
+      state: 'waiting',
+      interactivePrompt: JSON.stringify({ approval: { tool: 'Bash', summary: 'rm -rf dist' } })
+    })
+
+    renderPane()
+
+    expect(screen.getByText('Allow Bash?')).toBeInTheDocument()
+    expect(screen.queryByText(/Awaiting user input/)).toBeNull()
+    expect(liveActivityLine()).toBeNull()
+    expect(screen.getByText('Working for 0s')).toBeInTheDocument()
+  })
+
+  it("keeps a pending question's transcript row awaiting while the agent waits", () => {
+    retained.session = transcript('ready', true, [userTurn, askCall])
+    setStatus({ state: 'waiting' })
+
+    renderPane()
+
+    // One row says it: the question's own, not a second one at the tail.
+    expect(document.querySelectorAll('[data-native-chat-ask-row="awaiting"]')).toHaveLength(1)
+    expect(screen.getByText('Awaiting user input:')).toBeInTheDocument()
+    expect(screen.getAllByText('Which name?').length).toBeGreaterThan(0)
+    expect(screen.queryByText('Asked:')).toBeNull()
+  })
+
+  // Answering a terminal-only prompt means leaving the chat, which remounts it on return; a reload
+  // also starts the store with no state history. The host's stamp covers both.
+  it("counts a turn it first sees after a wait from the host's turn start, not the last state", () => {
+    retained.session = transcript('working', false)
+    setStatus({ state: 'working' }, 5_000)
+    patchStatus({ turnStartedAt: Date.now() - 90_000, stateHistory: [] })
+
+    renderPane()
+
+    expect(screen.getByText('Working for 1m 30s')).toBeInTheDocument()
+  })
+
+  // A background task holds the row 'working' past the last turn's end, so the row's own epoch is
+  // that turn's; the host stamps the new turn from the main agent's own prompt.
+  it('counts a new turn from its stamp, not a row held open by background work', () => {
+    retained.session = transcript('working', false)
+    setStatus({ state: 'working' })
+    const now = Date.now()
+    patchStatus({
+      stateStartedAt: now - 45 * 60_000,
+      turnStartedAt: now - 5_000,
+      mainAgent: { state: 'working', stateStartedAt: now - 5_000 },
+      stateHistory: []
+    })
+
+    renderPane()
+
+    expect(screen.getByText('Working for 5s')).toBeInTheDocument()
+  })
+
+  it("falls back to the main agent's own clock on a host that stamps no turn", () => {
+    retained.session = transcript('working', false)
+    setStatus({ state: 'working' })
+    const now = Date.now()
+    patchStatus({
+      stateStartedAt: now - 45 * 60_000,
+      mainAgent: { state: 'working', stateStartedAt: now - 5_000 },
+      stateHistory: []
+    })
+
+    renderPane()
+
+    expect(screen.getByText('Working for 5s')).toBeInTheDocument()
+  })
+
+  // An Esc at a permission prompt fires no hook, then the same text is sent again: a new turn.
+  it('counts the same prompt sent again as a new turn', () => {
+    retained.session = transcript('working', false)
+    setStatus({ state: 'working' }, 5_000)
+    const now = Date.now()
+    patchStatus({
+      turnStartedAt: now - 5_000,
+      stateHistory: [
+        { state: 'working', prompt: 'Rename the module', startedAt: now - 600_000 },
+        { state: 'waiting', prompt: 'Rename the module', startedAt: now - 500_000 }
+      ]
+    })
+
+    renderPane()
+
+    expect(screen.getByText('Working for 5s')).toBeInTheDocument()
+  })
+
+  // The reader no longer rebuilds a turn from the history, so an old host reads the state's start.
+  it('falls back to the current state start on a host that stamps no turn', () => {
+    retained.session = transcript('working', false)
+    setStatus({ state: 'working' }, 20_000)
+    const now = Date.now()
+    patchStatus({
+      stateHistory: [
+        { state: 'working', prompt: 'Rename the module', startedAt: now - 90_000 },
+        { state: 'waiting', prompt: 'Rename the module', startedAt: now - 40_000 }
+      ]
+    })
+
+    renderPane()
+
+    expect(screen.getByText('Working for 20s')).toBeInTheDocument()
+  })
+
+  // The host recorded the turn's end, so a pane mounted after it (a switch to the terminal and
+  // back) folds it behind its duration instead of drawing it unfinished.
+  it('shows the host-ended latest turn with its host duration after a remount', () => {
+    retained.session = transcript('ready', false, [userTurn, stepCall])
+    setStatus({ state: 'done' })
+    // One clock read: the duration is the difference of these two stamps.
+    const now = Date.now()
+    patchStatus({ stateStartedAt: now - 10_000, turnStartedAt: now - 100_000 })
+
+    renderPane()
+
+    expect(screen.getByText('Worked for 1m 30s')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'Toggle turn details' })).toBeInTheDocument()
+  })
+
+  // The store's staleness drops a silent row after 30 minutes. A wait left unanswered that long
+  // must not read as a finished turn: nothing says it ended.
+  it('does not settle a turn the host went quiet on', () => {
+    retained.session = transcript('ready', true, [userTurn, stepCall])
+    setStatus({ state: 'waiting' }, 60_000)
+    patchStatus({ turnStartedAt: Date.now() - 60_000 })
+
+    renderPane()
+    expect(screen.getByText('Working for 1m 0s')).toBeInTheDocument()
+
+    // The live session reads no hook state once the row is stale, so the wait no longer holds the turn.
+    retained.session = transcript('ready', false, [userTurn, stepCall])
+    act(() => {
+      patchStatus({ updatedAt: Date.now() - 31 * 60_000 })
+    })
+
+    expect(screen.queryByText(/Work(ing|ed) for/)).toBeNull()
+    expect(screen.queryByRole('button', { name: 'Toggle turn details' })).toBeNull()
+    expect(screen.getByText('pnpm build')).toBeInTheDocument()
+  })
+
+  it('folds finished turns from history behind their transcript duration', () => {
+    const at = Date.parse('2026-09-28T10:00:00.000Z')
+    retained.session = transcript('ready', false, [
+      { ...userTurn, timestamp: at },
+      {
+        id: 'answer-1',
+        role: 'assistant',
+        blocks: [{ type: 'text', text: 'Renamed.' }],
+        timestamp: at + 45_000,
+        source: 'transcript'
+      },
+      {
+        id: 'user-2',
+        role: 'user',
+        blocks: [{ type: 'text', text: 'Now add tests' }],
+        timestamp: at + 100_000,
+        source: 'transcript'
+      }
+    ])
+    setStatus({ state: 'done' }, 60_000)
+
+    renderPane()
+
+    expect(screen.getByText('Worked for 45s')).toBeInTheDocument()
+    // The latest turn has no recorded end, and this pane never watched it.
+    expect(screen.getAllByText(/Work(ing|ed) for/)).toHaveLength(1)
+  })
+
+  // The transcript draws no row for harness notices, so they cannot end a turn either.
+  it('keeps a running turn open across a harness notice injected mid-turn', () => {
+    const at = Date.parse('2026-09-28T10:00:00.000Z')
+    retained.session = transcript('working', false, [
+      { ...userTurn, timestamp: at },
+      {
+        id: 'progress-1',
+        role: 'assistant',
+        blocks: [{ type: 'text', text: 'Starting the build.' }],
+        timestamp: at + 10_000,
+        source: 'transcript'
+      },
+      {
+        id: 'notice-1',
+        role: 'user',
+        blocks: [{ type: 'text', text: '<task-notification>\n<task-id>b1</task-id>' }],
+        timestamp: at + 20_000,
+        source: 'transcript'
+      },
+      {
+        id: 'progress-2',
+        role: 'assistant',
+        blocks: [{ type: 'text', text: 'Build finished, checking output.' }],
+        timestamp: at + 25_000,
+        source: 'transcript'
+      }
+    ])
+    setStatus({ state: 'working' }, 30_000)
+
+    renderPane()
+
+    expect(screen.getByText('Working for 30s')).toBeInTheDocument()
+    expect(screen.getByText('Starting the build.')).toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'Toggle turn details' })).toBeNull()
+  })
+
+  it('stays quiet on a settled turn it never watched', () => {
+    retained.session = transcript('ready', false)
+    setStatus({ state: 'done' }, 60_000)
+
+    renderPane()
+
+    expect(screen.queryByText(/Awaiting user input/)).toBeNull()
+    expect(screen.queryByText(/Work(ing|ed) for/)).toBeNull()
+    expect(liveActivityLine()).toBeNull()
+  })
+
+  it('stays quiet when the pane has no status at all', () => {
+    retained.session = transcript('ready', false)
+
+    renderPane()
+
+    expect(screen.queryByText(/Awaiting user input/)).toBeNull()
+    expect(screen.queryByText(/Work(ing|ed) for/)).toBeNull()
+    expect(liveActivityLine()).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatSessionOptionPickers.test.tsx b/src/renderer/src/components/native-chat/NativeChatSessionOptionPickers.test.tsx
index cb777f910f21..f86fc972c22f 100644
--- a/src/renderer/src/components/native-chat/NativeChatSessionOptionPickers.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatSessionOptionPickers.test.tsx
@@ -4,6 +4,10 @@ import { cleanup, render, screen, waitFor } from '@testing-library/react'
 import type * as ReactModule from 'react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { SessionOptionDescriptor } from '../../../../shared/native-chat-session-options'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
+
+const toastError = vi.hoisted(() => vi.fn())
+vi.mock('sonner', () => ({ toast: { error: toastError } }))
 
 vi.mock('@/i18n/i18n', () => ({
   translate: (_key: string, fallback: string, values?: Record<string, string | number>) => {
@@ -441,6 +445,55 @@ describe('NativeChatSessionOptionPickers', () => {
     await waitFor(() => expect(invokeAction).toHaveBeenCalledWith('model'))
   })
 
+  it.each([
+    [
+      "the table's words for a host's refusal, not its message",
+      new RuntimeRpcCallError({
+        id: 'request-1',
+        ok: false,
+        error: {
+          code: 'runtime_error',
+          message: 'agent_session_journal_unreadable',
+          data: {
+            refusal: {
+              code: 'agent_session_journal_unreadable',
+              details: { reason: 'journalCorrupt' }
+            }
+          }
+        },
+        _meta: { runtimeId: 'runtime-1' }
+      }),
+      "Unable to load this chat. The setting wasn't changed."
+    ],
+    [
+      "a local surface's own sentence",
+      new Error('The terminal did not accept the command.'),
+      'The terminal did not accept the command.'
+    ]
+  ])('describes a failed option change with %s', async (_label, error, description) => {
+    toastError.mockClear()
+    const invokeAction = vi.fn().mockRejectedValue(error)
+    render(
+      <NativeChatSessionOptionPickers
+        surface={{ ...surface, invokeAction }}
+        snapshot={[
+          model({
+            kind: { type: 'select', choices: [{ value: 'gpt-5.5', label: 'GPT-5.5' }] },
+            valueSource: 'unknown',
+            action: { type: 'agent-picker' }
+          })
+        ]}
+        isWorking={false}
+      />
+    )
+    screen.getByRole('button', { name: 'Choose in agent picker…' }).click()
+    await waitFor(() =>
+      expect(toastError).toHaveBeenCalledExactlyOnceWith('Could not update option', {
+        description
+      })
+    )
+  })
+
   it('uses a Toggle action for unknown flip-only options via invokeAction', async () => {
     const invokeAction = vi.fn().mockResolvedValue({ snapshot: [] })
     const setOption = vi.fn().mockResolvedValue({ snapshot: [] })
diff --git a/src/renderer/src/components/native-chat/NativeChatSessionOptionPickers.tsx b/src/renderer/src/components/native-chat/NativeChatSessionOptionPickers.tsx
index 507103d485f0..0dacff0289e8 100644
--- a/src/renderer/src/components/native-chat/NativeChatSessionOptionPickers.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatSessionOptionPickers.tsx
@@ -32,6 +32,9 @@ import {
   nativeChatSessionOptionLabel
 } from './native-chat-session-option-labels'
 import type { NativeChatOptionPickerRequest } from './native-chat-composer-types'
+import { agentSessionThrownFailure } from '../../../../shared/agent-session-write-failure'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
+import { agentSessionWriteFailureText } from './agent-session-write-notice-text'
 
 export type NativeChatSessionOptionPickersProps = {
   surface: SessionOptionsSurface | null
@@ -204,6 +207,15 @@ function DescriptorMenuRows(props: {
   )
 }
 
+/** A host's error is words for its log, so it gets the table's; a local surface's error is
+ *  already written for the person. */
+function optionUpdateFailureDescription(error: unknown): string {
+  if (error instanceof RuntimeRpcCallError) {
+    return agentSessionWriteFailureText(agentSessionThrownFailure(error, error.code), 'option')
+  }
+  return error instanceof Error ? error.message : String(error)
+}
+
 function runSurfaceCall(
   pendingKey: string,
   setPendingId: (id: string | null) => void,
@@ -214,7 +226,7 @@ function runSurfaceCall(
     .catch((error) => {
       toast.error(
         translate('components.native-chat.composer.optionUpdateFailed', 'Could not update option'),
-        { description: error instanceof Error ? error.message : String(error) }
+        { description: optionUpdateFailureDescription(error) }
       )
     })
     .finally(() => setPendingId(null))
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx
index 471f1b636d28..c3c08f6647e0 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx
@@ -35,7 +35,7 @@ const STRIP = '[data-native-chat-background-tasks]'
 const GOAL = '[data-native-chat-thread-goal]'
 // The seam is CSS on DOM adjacency: the strip styles itself when a goal tab follows
 // it, and the goal tab styles itself when the strip precedes it.
-const STRIP_DOCK_RULE = /^group-has-\[\+\[([a-z-]+)\]\]\/tasks:(.+)$/
+const STRIP_DOCK_RULE = /^\[\[data-native-chat-background-tasks\]:has\(\+\[([a-z-]+)\]\)_&\]:(.+)$/
 const GOAL_DOCK_RULE = /^group-\[\[([a-z-]+)\]\+&\]\/goal:(.+)$/
 
 function dockRules(root: Element, rule: RegExp): { attribute: string; utility: string }[] {
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.launch-lifecycle.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.launch-lifecycle.test.tsx
index 9513d0cfeb60..644c1c657500 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.launch-lifecycle.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.launch-lifecycle.test.tsx
@@ -26,6 +26,14 @@ vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard
 import { NativeChatStructuredSession } from './NativeChatStructuredSession'
 import { readOutbox } from './structured-agent-session-outbox-storage'
 
+const NOT_SIGNED_IN = {
+  kind: 'refused',
+  code: 'agent_session_operation_invalid',
+  details: { reason: 'notSignedIn' }
+} as const
+// Retry beside it is the resend, so the words keep only the step before it.
+const NOT_SIGNED_IN_TEXT = 'Codex is not signed in for the selected account. Sign in first.'
+
 function sessionView(): React.JSX.Element {
   return (
     <NativeChatStructuredSession
@@ -99,17 +107,54 @@ describe('NativeChatStructuredSession launch lifecycle', () => {
     expect(mocks.retryLaunch).toHaveBeenCalledWith('wt-1', 'session-1')
   })
 
-  it('shows why a failed launch failed beside Retry', () => {
+  it('words why a failed launch failed beside Retry from the refusal, never its code', () => {
+    mocks.launchLifecycle = 'failed'
+    mocks.launchFailure = NOT_SIGNED_IN
+    render(sessionView())
+
+    expect(screen.getByText(`Chat could not be started. ${NOT_SIGNED_IN_TEXT}`)).toBeTruthy()
+    expect(screen.queryByText(/agent_session_/)).toBeNull()
+  })
+
+  it("keeps a step the Retry doesn't take, and drops one it does", () => {
+    mocks.launchLifecycle = 'failed'
+    mocks.launchFailure = {
+      kind: 'refused',
+      code: 'agent_session_conflict',
+      details: { reason: 'claimConflicted' }
+    }
+    const { rerender } = render(sessionView())
+    expect(
+      screen.getByText(
+        'Chat could not be started. This chat is still open in a terminal agent. Quit that agent to continue the chat here.'
+      )
+    ).toBeTruthy()
+
+    mocks.launchFailure = {
+      kind: 'refused',
+      code: 'agent_session_journal_unreadable',
+      details: { reason: 'journalUnavailable' }
+    }
+    rerender(sessionView())
+    expect(
+      screen.getByText(
+        "Chat could not be started. Orca couldn't open this chat's history right now."
+      )
+    ).toBeTruthy()
+  })
+
+  it('says only that the chat could not start when the refusal names no reason', () => {
     mocks.launchLifecycle = 'failed'
-    mocks.launchFailureReason = 'claude is not signed in'
+    mocks.launchFailure = { kind: 'refused', code: 'agent_session_operation_invalid' }
     render(sessionView())
 
-    expect(screen.getByText('Chat could not be started. claude is not signed in')).toBeTruthy()
+    expect(screen.getByText('Chat could not be started.')).toBeTruthy()
+    expect(screen.queryByText(/agent_session_/)).toBeNull()
   })
 
   it('keeps a stale reason off a launch that is no longer failed', () => {
     mocks.launchLifecycle = 'visibility-unknown'
-    mocks.launchFailureReason = 'claude is not signed in'
+    mocks.launchFailure = NOT_SIGNED_IN
     render(sessionView())
 
     expect(screen.getByText('Chat connection could not be confirmed.')).toBeTruthy()
@@ -177,10 +222,10 @@ describe('NativeChatStructuredSession launch lifecycle', () => {
     const { rerender } = render(sessionView())
 
     expect(composerSend()('still there?', [])).toBe(true)
-    mocks.launchFailureReason = 'claude is not signed in'
+    mocks.launchFailure = NOT_SIGNED_IN
     rerender(sessionView())
 
-    expect(screen.getByText('Chat could not be started. claude is not signed in')).toBeTruthy()
+    expect(screen.getByText(`Chat could not be started. ${NOT_SIGNED_IN_TEXT}`)).toBeTruthy()
     expect(mocks.call).not.toHaveBeenCalled()
     expect(readOutbox('session-1')).toEqual([
       expect.objectContaining({
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.read-error.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.read-error.test.tsx
new file mode 100644
index 000000000000..89ef518feb3b
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.read-error.test.tsx
@@ -0,0 +1,108 @@
+// @vitest-environment happy-dom
+
+import { cleanup, render, screen } from '@testing-library/react'
+import { afterEach, expect, it, vi } from 'vitest'
+
+const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
+  (await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
+)
+
+vi.mock('@/runtime/structured-agent-session-client', () =>
+  moduleFactories.structuredAgentSessionClient()
+)
+vi.mock('./use-structured-agent-session', () => moduleFactories.useStructuredAgentSession())
+vi.mock('./use-native-chat-font-scale', () => moduleFactories.useNativeChatFontScale())
+vi.mock('./use-native-chat-file-link-context', () => moduleFactories.useNativeChatFileLinkContext())
+vi.mock('./use-native-chat-file-link-click', () => moduleFactories.useNativeChatFileLinkClick())
+vi.mock('./NativeChatMessageList', () => moduleFactories.nativeChatMessageList())
+vi.mock('./NativeChatComposer', () => moduleFactories.nativeChatComposer())
+vi.mock('./NativeChatApprovalCard', () => moduleFactories.nativeChatApprovalCard())
+vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard())
+
+import { NativeChatStructuredSession } from './NativeChatStructuredSession'
+
+afterEach(() => {
+  cleanup()
+  resetStructuredSessionMocks()
+})
+
+function renderPane(): void {
+  render(
+    <NativeChatStructuredSession
+      isVisible
+      isFocusedGroup
+      tabId="structured-read-error-tab"
+      sessionId="read-error-session"
+      target={{ kind: 'local' }}
+      agent="codex"
+    />
+  )
+}
+
+function journalRefusal(reason: 'journalCorrupt' | 'journalUnavailable') {
+  return { code: 'agent_session_journal_unreadable', details: { reason } } as const
+}
+
+// The host's message and code never reach the pane; it words the refusal, and says it once.
+it('says a failed read with no refusal keeps retrying, and adds nothing of the host', () => {
+  mocks.status = 'error'
+  mocks.messages = []
+
+  renderPane()
+
+  expect(screen.getByText('Could not load conversation')).toBeTruthy()
+  expect(
+    screen.getByText('The transcript could not be read. Orca keeps trying to load it.')
+  ).toBeTruthy()
+  expect(screen.queryByText(/history couldn't be loaded/)).toBeNull()
+  expect(screen.queryByText(/Toggle back to the terminal/)).toBeNull()
+})
+
+it('says a damaged history cannot load in one line, without claiming Orca keeps trying', () => {
+  mocks.status = 'error'
+  mocks.readRefusal = journalRefusal('journalCorrupt')
+  mocks.messages = []
+
+  renderPane()
+
+  expect(screen.getAllByText('Unable to load this chat.')).toHaveLength(1)
+  expect(screen.queryByText('Could not load conversation')).toBeNull()
+  expect(screen.queryByText(/keeps trying/)).toBeNull()
+  expect(screen.queryByText(/agent_session_/)).toBeNull()
+})
+
+it("names a history that couldn't open right now once, and that the pane keeps trying", () => {
+  mocks.status = 'error'
+  mocks.readRefusal = journalRefusal('journalUnavailable')
+  mocks.messages = []
+
+  renderPane()
+
+  expect(screen.getAllByText("Orca couldn't open this chat's history right now.")).toHaveLength(1)
+  expect(screen.queryByText('Could not load conversation')).toBeNull()
+  expect(
+    screen.getByText('The transcript could not be read. Orca keeps trying to load it.')
+  ).toBeTruthy()
+  expect(screen.queryByText(/Try again/)).toBeNull()
+})
+
+it('says only that it is reconnecting, not as an error, when a failure names nothing', () => {
+  mocks.status = 'error'
+
+  renderPane()
+
+  expect(screen.getByTestId('message-list')).toBeTruthy()
+  const reconnecting = screen.getByText('Reconnecting to this chat…')
+  expect(reconnecting.className).not.toContain('text-destructive')
+  expect(screen.queryByText(/history couldn't be loaded/)).toBeNull()
+})
+
+it('words a failed reconnect beside a transcript it keeps', () => {
+  mocks.status = 'error'
+  mocks.readRefusal = journalRefusal('journalUnavailable')
+
+  renderPane()
+
+  expect(screen.getByTestId('message-list')).toBeTruthy()
+  expect(screen.getByText("Orca couldn't open this chat's history right now.")).toBeTruthy()
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.start-failure-notice.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.start-failure-notice.test.tsx
new file mode 100644
index 000000000000..6f529c1d3c9f
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.start-failure-notice.test.tsx
@@ -0,0 +1,163 @@
+// @vitest-environment happy-dom
+
+import { cleanup, render, screen, waitFor, within } from '@testing-library/react'
+import { afterEach, expect, it, vi } from 'vitest'
+import type { AgentSessionFailureFact } from '../../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words'
+import {
+  agentJournalItemKey,
+  agentJournalSubmissionKey
+} from '../../../../shared/agent-session-journal-item-key'
+import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
+import { structuredAgentSessionStartFailureRowIdentity } from '../../../../shared/structured-agent-session-start-failure-row-key'
+
+const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
+  (await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
+)
+
+vi.mock('@/runtime/structured-agent-session-client', () =>
+  moduleFactories.structuredAgentSessionClient()
+)
+vi.mock('./use-structured-agent-session', () => moduleFactories.useStructuredAgentSession())
+vi.mock('./use-native-chat-font-scale', () => moduleFactories.useNativeChatFontScale())
+vi.mock('./use-native-chat-file-link-context', () => moduleFactories.useNativeChatFileLinkContext())
+vi.mock('./use-native-chat-file-link-click', () => moduleFactories.useNativeChatFileLinkClick())
+vi.mock('./NativeChatMessageList', () => moduleFactories.nativeChatMessageList())
+vi.mock('./NativeChatComposer', () => moduleFactories.nativeChatComposer())
+vi.mock('./NativeChatEmptyState', () => moduleFactories.nativeChatEmptyState())
+vi.mock('./NativeChatApprovalCard', () => moduleFactories.nativeChatApprovalCard())
+vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard())
+
+import { NativeChatStructuredSession } from './NativeChatStructuredSession'
+
+afterEach(() => {
+  cleanup()
+  localStorage.clear()
+  resetStructuredSessionMocks()
+})
+
+const SESSION_ID = 'start-failure-session'
+const START_FAILED: AgentSessionFailureFact = { kind: 'providerStartFailed' }
+const START_FAILED_REASON =
+  'Claude stopped before it finished starting. Send your message to try again.'
+
+function startFailureRow(fact: AgentSessionFailureFact): AgentJournalRenderItem {
+  return {
+    itemId: agentJournalItemKey(structuredAgentSessionStartFailureRowIdentity('generation-1')),
+    revision: 1,
+    sequence: 1,
+    observedAt: 1,
+    body: {
+      kind: 'status',
+      tone: 'error',
+      ...agentSessionFailureWords(fact, { agentName: 'Claude', surface: 'row' })
+    }
+  }
+}
+
+function rejected(clientMessageId: string, reason: string, rejection: AgentSessionFailureFact) {
+  return {
+    outbox: {
+      clientMessageId,
+      sessionId: SESSION_ID,
+      body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: clientMessageId }] },
+      previewUris: [],
+      state: 'rejected',
+      queuedAt: 1,
+      lastAttemptAt: null,
+      retryAfterUnknownSubmittedAt: null,
+      lastFailure: { kind: 'rejected', reason, rejection: { kind: rejection.kind } }
+    },
+    submission: {
+      clientMessageId,
+      fence: 1,
+      payloadFingerprint: clientMessageId,
+      dispatchState: 'rejected',
+      providerItemId: null,
+      reason,
+      rejection,
+      submittedAt: 1,
+      resolvedAt: 1
+    }
+  }
+}
+
+function renderPane(messages: ReturnType<typeof rejected>[]): void {
+  mocks.mode = 'outbox'
+  mocks.submissions = messages.map((message) => message.submission)
+  localStorage.setItem(
+    `orca:desktopStructuredAgentSessionOutbox:v1:${encodeURIComponent(SESSION_ID)}`,
+    JSON.stringify(messages.map((message) => message.outbox))
+  )
+  render(
+    <NativeChatStructuredSession
+      isVisible
+      isFocusedGroup
+      tabId="start-failure-tab"
+      sessionId={SESSION_ID}
+      target={{ kind: 'local' }}
+      agent="claude"
+    />
+  )
+}
+
+async function notice(clientMessageId: string): Promise<HTMLElement> {
+  return waitFor(() => {
+    const row = document.querySelector<HTMLElement>(
+      `[data-message-id="${agentJournalSubmissionKey(clientMessageId)}"]`
+    )
+    if (!row) {
+      throw new Error(`no notice on ${clientMessageId}`)
+    }
+    return row
+  })
+}
+
+// The start's own row says why, so its rejected messages say only that they were not sent.
+it("says only 'not sent', with its Retry, on each message the failed start's row explains", async () => {
+  mocks.journalItems = [startFailureRow(START_FAILED)]
+
+  renderPane([
+    rejected('first', START_FAILED_REASON, START_FAILED),
+    rejected('second', START_FAILED_REASON, START_FAILED)
+  ])
+
+  for (const id of ['first', 'second']) {
+    const row = await notice(id)
+    expect(within(row).getByText('Your message was not sent.')).toBeTruthy()
+    expect(within(row).getByRole('button', { name: 'Retry' })).toBeTruthy()
+  }
+  expect(screen.queryByText(/stopped before it finished starting/)).toBeNull()
+})
+
+it('keeps the full notice on a message rejected for a reason no start-failure row states', async () => {
+  mocks.journalItems = [startFailureRow(START_FAILED)]
+  const providerRejected: AgentSessionFailureFact = {
+    kind: 'providerRejected',
+    detail: { text: 'Image type .bmp', audience: 'person' }
+  }
+
+  renderPane([
+    rejected('stated', START_FAILED_REASON, START_FAILED),
+    rejected(
+      'other',
+      'The provider did not accept this message: Image type .bmp.',
+      providerRejected
+    )
+  ])
+
+  expect(within(await notice('stated')).getByText('Your message was not sent.')).toBeTruthy()
+  expect(
+    within(await notice('other')).getByText(
+      'The provider did not accept this message: Image type .bmp.'
+    )
+  ).toBeTruthy()
+})
+
+it("keeps the start failure's own words when its row is not loaded", async () => {
+  renderPane([rejected('first', START_FAILED_REASON, START_FAILED)])
+
+  expect(
+    within(await notice('first')).getByText('Claude stopped before it finished starting.')
+  ).toBeTruthy()
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-harness.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-harness.tsx
index 86963cb542bb..71fd557983ae 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-harness.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-harness.tsx
@@ -2,7 +2,10 @@ import { forwardRef, useImperativeHandle, useRef } from 'react'
 import { vi } from 'vitest'
 import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
 import type { AgentSessionBackgroundTask } from '../../../../shared/agent-session-wire'
+import type { AgentSessionWriteRefusal } from '../../../../shared/agent-session-write-failure'
+import type { AgentSessionRefusalReference } from '../../../../shared/agent-session-wire-refusals'
 import type { NativeChatApprovalCardProps } from './NativeChatApprovalCard'
+import type { NativeChatDeliveryNotice } from './NativeChatMessageRow'
 import type { NativeChatQuestionCardProps } from './NativeChatQuestionCard'
 import type { NativeChatLaunchSeed } from './native-chat-composer-types'
 import type { NativeChatOlderPageResult } from './native-chat-pagination'
@@ -19,15 +22,41 @@ function nullable<T>(): T | null {
   return null
 }
 
+function absent<T>(): T | undefined {
+  return undefined
+}
+
+/** Stands in for the transcript: renders only each message's delivery notice and its Retry. */
+export function DeliveryNoticesMock({
+  notices
+}: {
+  notices?: ReadonlyMap<string, NativeChatDeliveryNotice>
+}): React.JSX.Element {
+  return (
+    <div data-testid="message-list">
+      {[...(notices ?? [])].map(([id, notice]) => (
+        <div key={id} data-message-id={id}>
+          <span>{notice.text}</span>
+          {notice.onRetry ? (
+            <button type="button" onClick={notice.onRetry}>
+              Retry
+            </button>
+          ) : null}
+        </div>
+      ))}
+    </div>
+  )
+}
+
 type StructuredSessionMessageListProps = {
   allowFileUriLinks?: boolean
   isVisible?: boolean
   onLinkClick?: (...args: unknown[]) => void
-  showTurnStatus?: boolean
-  showLiveTurnActivity?: boolean
+  awaitingInput?: 'shown' | 'unshown' | null
   isWorking?: boolean
   runtimeContext?: unknown
   session?: { hasMore: boolean; loadingEarlier: boolean; loadEarlier: () => Promise<void> }
+  deliveryNotices?: ReadonlyMap<string, NativeChatDeliveryNotice>
 }
 
 const initialMessageListProps: StructuredSessionMessageListProps | null = null
@@ -43,24 +72,28 @@ export function createStructuredSessionMocks() {
     call: vi.fn<(...args: never[]) => unknown>(),
     fileLinkClick: vi.fn<(...args: never[]) => unknown>(),
     launchLifecycle: nullable<StructuredAgentSessionLaunchLifecycle>(),
-    launchFailureReason: nullable<string>(),
+    launchFailure: nullable<AgentSessionWriteRefusal>(),
     launchResumes: false,
     retryLaunch: vi.fn<(...args: never[]) => unknown>(),
     controllerProps: nullable<{ transportEnabled?: boolean }>(),
     mode: 'static' as 'static' | 'outbox',
     status: 'ready' as 'idle' | 'loading' | 'ready' | 'error',
+    readRefusal: absent<AgentSessionRefusalReference>(),
     messages: null as null | unknown[],
     messageListProps: initialMessageListProps,
-    composerProps: null as null | {
+    composerProps: nullable<{
       launchSeed?: NativeChatLaunchSeed
       structuredTransport?: Record<string, unknown>
       isWorking?: boolean
-    },
+      onStop?: () => void
+    }>(),
     approvalCardProps: initialApprovalCardProps,
     questionCardProps: null as NativeChatQuestionCardProps | null,
     promptItems: [] as AgentJournalRenderItem[],
+    journalItems: new Array<AgentJournalRenderItem>(),
     respond: vi.fn<(...args: never[]) => unknown>(),
     cancel: vi.fn<(...args: never[]) => unknown>(),
+    stop: vi.fn<() => unknown>(),
     handlePasteEvent: vi.fn<(...args: never[]) => unknown>(),
     pasteFromClipboard: vi.fn<(...args: never[]) => unknown>(),
     submissions: [] as unknown[],
@@ -68,6 +101,8 @@ export function createStructuredSessionMocks() {
     showBackgroundTasks: false,
     isWorking: false,
     turnId: null as string | null,
+    // Unset: Stop follows the turn, as against an older host.
+    canStop: nullable<boolean>(),
     supportsBackgroundTaskStop: false,
     supportsBackgroundTaskStopAll: true,
     backgroundTasks: [] as AgentSessionBackgroundTask[],
@@ -89,6 +124,8 @@ export function createStructuredSessionMocks() {
     useStructuredAgentSession: async () => {
       const { useStructuredAgentSessionOutbox } =
         await import('./use-structured-agent-session-outbox')
+      const { projectStructuredAgentSessionMessages } =
+        await import('../../../../shared/structured-agent-session-message-projection')
       return {
         useStructuredAgentSession: (props: {
           sessionId: string
@@ -103,11 +140,11 @@ export function createStructuredSessionMocks() {
             submissions: mocks.submissions as never
           })
           return {
-            journalItems: [],
+            journalItems: mocks.journalItems,
             messages:
               mocks.messages ??
               (mocks.mode === 'outbox'
-                ? []
+                ? projectStructuredAgentSessionMessages([], outbox.outbox, [])
                 : [
                     {
                       id: 'message-1',
@@ -124,12 +161,14 @@ export function createStructuredSessionMocks() {
                   ]),
             status: mocks.status,
             error: outbox.error,
+            readRefusal: mocks.readRefusal,
             hasOlder: mocks.hasOlder,
             loadingOlder: mocks.loadingOlder,
             olderHistoryGeneration: mocks.olderHistoryGeneration,
             loadOlder: mocks.loadOlder,
             prompts: mocks.promptItems,
             outbox: outbox.outbox,
+            submissions: mocks.submissions,
             blockedClientMessageId: outbox.blockedClientMessageId,
             send: outbox.send,
             retry: outbox.retry,
@@ -143,6 +182,8 @@ export function createStructuredSessionMocks() {
               supportsStopAll: mocks.supportsBackgroundTaskStopAll
             },
             turnId: mocks.turnId,
+            canStop: mocks.canStop ?? mocks.turnId !== null,
+            stop: mocks.stop,
             threadGoal: mocks.threadGoal,
             cancel: mocks.cancel,
             stopBackgroundTask: (taskId?: string) =>
@@ -181,7 +222,7 @@ export function createStructuredSessionMocks() {
       getStructuredAgentSessionLaunchResumes: () => mocks.launchResumes,
       useStructuredAgentSessionLaunchSelection: () => null,
       useStructuredAgentSessionLaunchLifecycle: () => mocks.launchLifecycle,
-      useStructuredAgentSessionLaunchFailureReason: () => mocks.launchFailureReason
+      useStructuredAgentSessionLaunchFailure: () => mocks.launchFailure
     }),
     useNativeChatFontScale: () => ({
       useNativeChatFontScale: () => ({ scale: 1 })
@@ -199,7 +240,7 @@ export function createStructuredSessionMocks() {
     nativeChatMessageList: () => ({
       NativeChatMessageList: (props: typeof mocks.messageListProps) => {
         mocks.messageListProps = props
-        return <div data-testid="message-list" />
+        return <DeliveryNoticesMock notices={props?.deliveryNotices} />
       }
     }),
     nativeChatComposer: () => ({
@@ -237,20 +278,23 @@ export function createStructuredSessionMocks() {
   const resetStructuredSessionMocks = (): void => {
     mocks.call.mockReset()
     mocks.launchLifecycle = null
-    mocks.launchFailureReason = null
+    mocks.launchFailure = null
     mocks.launchResumes = false
     mocks.retryLaunch.mockReset()
     mocks.controllerProps = null
     mocks.mode = 'static'
     mocks.status = 'ready'
+    mocks.readRefusal = undefined
     mocks.messages = null
     mocks.messageListProps = null
     mocks.composerProps = null
     mocks.approvalCardProps = null
     mocks.questionCardProps = null
     mocks.promptItems = []
+    mocks.journalItems = []
     mocks.respond.mockReset()
     mocks.cancel.mockReset()
+    mocks.stop.mockReset()
     mocks.handlePasteEvent.mockReset()
     mocks.pasteFromClipboard.mockReset()
     mocks.submissions = []
@@ -258,6 +302,7 @@ export function createStructuredSessionMocks() {
     mocks.showBackgroundTasks = false
     mocks.isWorking = false
     mocks.turnId = null
+    mocks.canStop = null
     mocks.supportsBackgroundTaskStop = false
     mocks.supportsBackgroundTaskStopAll = true
     mocks.stopBackgroundTask.mockReset()
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx
index e766955b83ec..9279ca63f204 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx
@@ -27,6 +27,7 @@ vi.mock('./NativeChatApprovalCard', () => moduleFactories.nativeChatApprovalCard
 vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard())
 
 import { NativeChatStructuredSession } from './NativeChatStructuredSession'
+import { structuredAgentSessionPaneKey } from '../../../../shared/structured-agent-session-projection'
 
 describe('NativeChatStructuredSession', () => {
   afterEach(() => {
@@ -34,6 +35,22 @@ describe('NativeChatStructuredSession', () => {
     resetStructuredSessionMocks()
   })
 
+  it('gives what a Stop withdrew back to the composer this pane shows', () => {
+    render(
+      <NativeChatStructuredSession
+        isVisible
+        isFocusedGroup
+        tabId="structured-tab-1"
+        sessionId="session-1"
+        target={{ kind: 'local' }}
+        agent="codex"
+      />
+    )
+    const paneKey = structuredAgentSessionPaneKey('structured-tab-1', 'session-1')
+    expect(mocks.composerProps).toMatchObject({ paneKey })
+    expect(mocks.controllerProps).toMatchObject({ composerScopeKey: paneKey })
+  })
+
   it('routes the launch draft and app-menu paste to the structured composer', () => {
     const draft = {
       tabId: 'structured-draft-tab',
@@ -177,8 +194,8 @@ describe('NativeChatStructuredSession', () => {
     expect(mocks.loadOlder).toHaveBeenCalledOnce()
   })
 
-  // Turn status and transcript image previews shipped Codex-first. Every
-  // structured session renders through the same list, so neither is agent-gated.
+  // Transcript image previews shipped Codex-first. Every structured session
+  // renders through the same list, so they are not agent-gated.
   it.each(['codex', 'claude'] as const)(
     'renders the same structured transcript chrome for %s',
     (agent) => {
@@ -193,7 +210,6 @@ describe('NativeChatStructuredSession', () => {
         />
       )
 
-      expect(mocks.messageListProps?.showTurnStatus).toBe(true)
       expect(mocks.messageListProps?.runtimeContext).not.toBeUndefined()
     }
   )
@@ -216,7 +232,7 @@ describe('NativeChatStructuredSession', () => {
 
     expect(mocks.messageListProps).toMatchObject({
       isWorking: true,
-      showLiveTurnActivity: false
+      awaitingInput: 'shown'
     })
     expect(
       document
@@ -231,13 +247,13 @@ describe('NativeChatStructuredSession', () => {
       itemId: 'legacy-question-item',
       expectedRevision: 1
     })
-    expect(mocks.messageListProps?.showLiveTurnActivity).toBe(false)
+    expect(mocks.messageListProps?.awaitingInput).toBe('shown')
 
     mocks.promptItems = []
     rerender(view())
     expect(mocks.messageListProps).toMatchObject({
       isWorking: true,
-      showLiveTurnActivity: true
+      awaitingInput: null
     })
     expect(screen.getByTestId('structured-composer')).toBeTruthy()
     expect(mocks.composerProps?.isWorking).toBe(true)
@@ -285,7 +301,7 @@ describe('NativeChatStructuredSession', () => {
 
     expect(mocks.messageListProps).toMatchObject({
       isWorking: true,
-      showLiveTurnActivity: false
+      awaitingInput: 'shown'
     })
     expect(mocks.approvalCardProps?.approval.title).toBe('Allow command?')
     expect(screen.queryByTestId('structured-composer')).toBeNull()
@@ -296,7 +312,7 @@ describe('NativeChatStructuredSession', () => {
       kind: 'option',
       optionId: 'allow'
     })
-    expect(mocks.messageListProps?.showLiveTurnActivity).toBe(false)
+    expect(mocks.messageListProps?.awaitingInput).toBe('shown')
 
     act(() => mocks.approvalCardProps?.onCancel?.())
     expect(mocks.cancel).toHaveBeenCalledWith('turn-approval', {
@@ -368,6 +384,16 @@ describe('NativeChatStructuredSession', () => {
     expect(screen.getByRole('list', { name: 'Agents' })).toBeTruthy()
   })
 
+  it('offers Stop before any turn opens when the controller can stop, and stops through it', () => {
+    mocks.canStop = true
+    render(claudeSessionView('structured-tab-pre-turn', 'session-pre-turn'))
+
+    expect(mocks.composerProps?.isWorking).toBe(true)
+    act(() => mocks.composerProps?.onStop?.())
+    expect(mocks.stop).toHaveBeenCalledOnce()
+    expect(mocks.cancel).not.toHaveBeenCalled()
+  })
+
   it('keeps the strip mounted through a running turn, with the turn owning the voice', () => {
     // The strip stands for work that OUTLIVES a turn, so `show` is true while
     // `isMonitoring` is false: mounted, but not speaking as the live indicator.
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.transport-probe.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.transport-probe.test.tsx
deleted file mode 100644
index ffa8787e7536..000000000000
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.transport-probe.test.tsx
+++ /dev/null
@@ -1,377 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
-import React from 'react'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-
-const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
-  (await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
-)
-
-vi.mock('@/runtime/structured-agent-session-client', () =>
-  moduleFactories.structuredAgentSessionClient()
-)
-vi.mock('./use-structured-agent-session', () => moduleFactories.useStructuredAgentSession())
-vi.mock('./use-native-chat-font-scale', () => moduleFactories.useNativeChatFontScale())
-vi.mock('./use-native-chat-file-link-context', () => moduleFactories.useNativeChatFileLinkContext())
-vi.mock('./use-native-chat-file-link-click', () => moduleFactories.useNativeChatFileLinkClick())
-vi.mock('./NativeChatMessageList', () => moduleFactories.nativeChatMessageList())
-vi.mock('./NativeChatComposer', () => moduleFactories.nativeChatComposer())
-vi.mock('./NativeChatEmptyState', () => moduleFactories.nativeChatEmptyState())
-vi.mock('./NativeChatApprovalCard', () => moduleFactories.nativeChatApprovalCard())
-vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard())
-
-import { NativeChatStructuredSession } from './NativeChatStructuredSession'
-
-describe('NativeChatStructuredSession transport-unconfirmed sends', () => {
-  afterEach(() => {
-    cleanup()
-    resetStructuredSessionMocks()
-  })
-
-  it('retries an unconfirmed transport send and clears the delivery notice', async () => {
-    mocks.mode = 'outbox'
-    mocks.call.mockRejectedValueOnce(new Error('socket closed')).mockResolvedValueOnce({
-      ok: true,
-      value: {
-        submission: {
-          clientMessageId: 'client-1',
-          dispatchState: 'accepted'
-        }
-      }
-    })
-
-    render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-1"
-        sessionId="session-1"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-
-    const send = mocks.composerProps?.structuredTransport?.send as
-      | ((text: string, attachments: readonly { id: string; path: string }[]) => boolean)
-      | undefined
-    expect(send?.('hello', [])).toBe(true)
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    await waitFor(() => expect(screen.getByText('Message delivery is unconfirmed.')).toBeTruthy())
-
-    fireEvent.click(screen.getByRole('button', { name: /Retry/ }))
-
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    await waitFor(() => expect(screen.queryByText('Message delivery is unconfirmed.')).toBeNull())
-  })
-
-  it('resends a transport-unconfirmed head so later messages are not wedged', async () => {
-    mocks.mode = 'outbox'
-    mocks.submissions = []
-    mocks.call.mockRejectedValueOnce(new Error('socket closed')).mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'client-1', dispatchState: 'accepted' } }
-    })
-
-    render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-wedge"
-        sessionId="session-wedge"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-
-    const send = mocks.composerProps?.structuredTransport?.send as
-      | ((text: string, attachments: readonly { id: string; path: string }[]) => boolean)
-      | undefined
-    expect(send?.('first', [])).toBe(true)
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    await waitFor(() => expect(screen.getByText('Message delivery is unconfirmed.')).toBeTruthy())
-
-    expect(send?.('second', [])).toBe(true)
-    // The head is probed automatically, clears, and the queue drains.
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(3), { timeout: 10000 })
-    await waitFor(() => expect(screen.queryByText('Message delivery is unconfirmed.')).toBeNull())
-  }, 20000)
-
-  it('probes the same operation without marking an explicit user retry', async () => {
-    mocks.mode = 'outbox'
-    mocks.submissions = []
-    mocks.call.mockRejectedValueOnce(new Error('socket closed')).mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'client-1', dispatchState: 'accepted' } }
-    })
-
-    render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-probe-flag"
-        sessionId="session-probe-flag"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-
-    const send = mocks.composerProps?.structuredTransport?.send as
-      | ((text: string, attachments: readonly { id: string; path: string }[]) => boolean)
-      | undefined
-    expect(send?.('first', [])).toBe(true)
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2), { timeout: 10000 })
-
-    const first = mocks.call.mock.calls[0]?.[2] as Record<string, unknown>
-    const probe = mocks.call.mock.calls[1]?.[2] as Record<string, unknown>
-    expect(probe.retryUnknown).toBeUndefined()
-    // Same operation id: both dedupe layers key off it.
-    expect((probe.envelope as { clientOperationId: string }).clientOperationId).toBe(
-      (first.envelope as { clientOperationId: string }).clientOperationId
-    )
-  }, 20000)
-
-  it('parks a host-confirmed unknown instead of probing it', async () => {
-    mocks.mode = 'outbox'
-    mocks.call.mockRejectedValueOnce(new Error('socket closed')).mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'client-1', dispatchState: 'accepted' } }
-    })
-
-    render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-parked"
-        sessionId="session-parked"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-
-    const send = mocks.composerProps?.structuredTransport?.send as
-      | ((text: string, attachments: readonly { id: string; path: string }[]) => boolean)
-      | undefined
-    expect(send?.('first', [])).toBe(true)
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-
-    const sent = mocks.call.mock.calls[0]?.[2] as { envelope: { clientOperationId: string } }
-    // The host now reports an unresolved unknown: another replay is the user's call.
-    mocks.submissions = [
-      {
-        clientMessageId: sent.envelope.clientOperationId,
-        fence: 1,
-        payloadFingerprint: 'fp',
-        dispatchState: 'unknown',
-        providerItemId: null,
-        reason: null,
-        submittedAt: 1,
-        resolvedAt: null
-      }
-    ]
-    // Queue a second message purely to re-render so the effect observes the
-    // new submissions; it must stay wedged behind the parked head.
-    await act(async () => {
-      send?.('second', [])
-    })
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 3000))
-    })
-    expect(mocks.call).toHaveBeenCalledOnce()
-  }, 20000)
-
-  it('still probes while streaming batches rebuild the submissions array', async () => {
-    mocks.mode = 'outbox'
-    mocks.submissions = []
-    mocks.call.mockRejectedValueOnce(new Error('socket closed')).mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'client-1', dispatchState: 'accepted' } }
-    })
-
-    const makeView = (): React.ReactElement => (
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-churn"
-        sessionId="session-churn"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-    const { rerender } = render(makeView())
-
-    const send = mocks.composerProps?.structuredTransport?.send as
-      | ((text: string, attachments: readonly { id: string; path: string }[]) => boolean)
-      | undefined
-    expect(send?.('first', [])).toBe(true)
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-
-    // Each batch mints a fresh submissions array for an unrelated message. An
-    // array-identity dependency restarts the backoff on every one of these, so a
-    // stream that outlasts the delay would never let the probe fire.
-    for (let index = 0; index < 12; index += 1) {
-      mocks.submissions = [
-        {
-          clientMessageId: `other-${index}`,
-          fence: 1,
-          payloadFingerprint: 'fp',
-          dispatchState: 'accepted',
-          providerItemId: null,
-          reason: null,
-          submittedAt: index,
-          resolvedAt: index
-        }
-      ]
-      await act(async () => {
-        rerender(makeView())
-        await new Promise((resolve) => setTimeout(resolve, 250))
-      })
-    }
-
-    // Asserted with no trailing grace period: the probe must have fired *during*
-    // the stream, not after it went quiet.
-    expect(mocks.call).toHaveBeenCalledTimes(2)
-  }, 20000)
-
-  it('restarts probe delay when the runtime target changes', async () => {
-    mocks.mode = 'outbox'
-    mocks.call.mockRejectedValueOnce(new Error('socket closed')).mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'client-1', dispatchState: 'accepted' } }
-    })
-
-    const makeView = (
-      target: { kind: 'local' } | { kind: 'environment'; environmentId: string }
-    ) => (
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-target-switch"
-        sessionId="session-target-switch"
-        target={target}
-        agent="codex"
-      />
-    )
-    const { rerender } = render(makeView({ kind: 'local' }))
-    const send = mocks.composerProps?.structuredTransport?.send as
-      | ((text: string, attachments: readonly { id: string; path: string }[]) => boolean)
-      | undefined
-    expect(send?.('first', [])).toBe(true)
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    await waitFor(() => expect(screen.getByText('Message delivery is unconfirmed.')).toBeTruthy())
-
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 300))
-    })
-    rerender(makeView({ kind: 'environment', environmentId: 'env-1' }))
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 600))
-    })
-    expect(mocks.call).toHaveBeenCalledOnce()
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2), { timeout: 1500 })
-  }, 10000)
-
-  it('never auto-probes an entry the user already force-retried', async () => {
-    mocks.mode = 'outbox'
-    mocks.submissions = []
-    // Both the original send and the user's explicit Retry fail at the transport.
-    mocks.call.mockRejectedValue(new Error('socket closed'))
-
-    render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-forced"
-        sessionId="session-forced"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-
-    const send = mocks.composerProps?.structuredTransport?.send as
-      | ((text: string, attachments: readonly { id: string; path: string }[]) => boolean)
-      | undefined
-    expect(send?.('first', [])).toBe(true)
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    await waitFor(() => expect(screen.getByText('Message delivery is unconfirmed.')).toBeTruthy())
-
-    // User retries with the same envelope and no legacy redelivery signal.
-    fireEvent.click(screen.getByRole('button', { name: /Retry/ }))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    const forcedRequest = mocks.call.mock.calls[1]?.[2] as Record<string, unknown> | undefined
-    expect(forcedRequest?.retryUnknown).toBeUndefined()
-
-    // That retry also failed at the transport. The probe must not repeat an
-    // explicit retry automatically.
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 3000))
-    })
-    expect(mocks.call).toHaveBeenCalledTimes(2)
-  }, 20000)
-
-  it('does not hot-loop when the host answers pending', async () => {
-    mocks.mode = 'outbox'
-    mocks.call.mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'client-1', dispatchState: 'pending' } }
-    })
-
-    render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-pending"
-        sessionId="session-pending"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-
-    const send = mocks.composerProps?.structuredTransport?.send as
-      | ((text: string, attachments: readonly { id: string; path: string }[]) => boolean)
-      | undefined
-    expect(send?.('first', [])).toBe(true)
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-
-    // A pending row parks the entry under the backoff instead of re-dispatching
-    // immediately. Without that, this window is an unbounded back-to-back RPC flood.
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 2500))
-    })
-    expect(mocks.call.mock.calls.length).toBeLessThanOrEqual(3)
-  }, 20000)
-
-  it('keeps probing past the old five-attempt budget', async () => {
-    mocks.mode = 'outbox'
-    mocks.call.mockRejectedValue(new Error('socket closed'))
-    vi.useFakeTimers({ shouldAdvanceTime: true })
-    try {
-      render(
-        <NativeChatStructuredSession
-          isVisible
-          isFocusedGroup
-          tabId="structured-tab-budget"
-          sessionId="session-budget"
-          target={{ kind: 'local' }}
-          agent="codex"
-        />
-      )
-
-      const send = mocks.composerProps?.structuredTransport?.send as
-        | ((text: string, attachments: readonly { id: string; path: string }[]) => boolean)
-        | undefined
-      expect(send?.('first', [])).toBe(true)
-
-      // Backoff is 1+2+4+8+16 = 31s for five probes, which was the old hard budget.
-      // Step past it; a seventh call proves the probe re-arms instead of giving up.
-      for (let step = 0; step < 12; step += 1) {
-        await act(async () => {
-          await vi.advanceTimersByTimeAsync(8_000)
-        })
-      }
-      expect(mocks.call.mock.calls.length).toBeGreaterThanOrEqual(7)
-    } finally {
-      vi.useRealTimers()
-    }
-  }, 30000)
-})
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
index d4fbbbf62bae..1f416bcc0704 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { agentSessionPromptQuestions } from '../../../../shared/agent-session-question-answer'
 import { dispatchStructuredAgentSessionComposerCommand } from '../../../../shared/structured-agent-session-composer'
 import { structuredAgentSessionPaneKey } from '../../../../shared/structured-agent-session-projection'
@@ -22,10 +22,15 @@ import { NativeChatStructuredSessionStatus } from './NativeChatStructuredSession
 import { useNativeChatLaunchDraftSignal } from './use-native-chat-launch-draft-adoption'
 import { NativeChatLaunchRetry } from './NativeChatLaunchRetry'
 import { useNativeChatProvisionalLaunch } from './use-native-chat-provisional-launch'
-import { NativeChatDeliveryRetry } from './NativeChatDeliveryRetry'
-import { useStructuredAgentSessionHostExecutionPhase } from './StructuredAgentSessionStatusBridge'
+import { useStructuredAgentSessionHostExecution } from './StructuredAgentSessionStatusBridge'
 import { structuredAgentLabel } from '@/lib/structured-agent-session-launch-label'
 import { NativeChatThreadGoalBanner } from './NativeChatThreadGoalBanner'
+import { structuredAgentSessionReadFailureNotice } from './structured-agent-session-read-failure-notice'
+import { useStructuredAgentSessionStartFailureFacts } from './use-structured-agent-session-start-failure-facts'
+import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices'
+import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
+
+const NO_SUBMISSIONS: readonly AgentJournalSubmission[] = []
 
 export function NativeChatStructuredSession(
   props: Omit<NativeChatStructuredViewProps, 'mode'>
@@ -37,10 +42,15 @@ export function NativeChatStructuredSession(
   )
   const { sendThroughRelaunch } = provisionalLaunch
   // The host's own word on whether the provider child has answered startup yet.
-  const startupPhase = useStructuredAgentSessionHostExecutionPhase(props.sessionId, props.target)
+  const hostExecution = useStructuredAgentSessionHostExecution(props.sessionId, props.target)
+  const paneKey = useMemo(
+    () => structuredAgentSessionPaneKey(props.tabId, props.sessionId),
+    [props.sessionId, props.tabId]
+  )
   const controller = useStructuredAgentSession({
     ...props,
-    providerStarting: startupPhase === 'starting',
+    composerScopeKey: paneKey,
+    providerStarting: hostExecution.phase === 'starting',
     transportEnabled: provisionalLaunch.transportEnabled,
     ...(provisionalLaunch.launch ? { launch: provisionalLaunch.launch } : {})
   })
@@ -57,10 +67,6 @@ export function NativeChatStructuredSession(
     id: string
     sequence: number
   } | null>(null)
-  const paneKey = useMemo(
-    () => structuredAgentSessionPaneKey(props.tabId, props.sessionId),
-    [props.sessionId, props.tabId]
-  )
   const rootRef = useRef<HTMLDivElement>(null)
   const composerRef = useRef<NativeChatComposerHandle>(null)
   const paneCommands = useStructuredNativeChatPaneCommands({
@@ -100,7 +106,46 @@ export function NativeChatStructuredSession(
     }),
     [controller, props.agent, props.sessionId]
   )
-  const viewState = selectNativeChatViewState(session)
+  // Read at click time, so the notices stay put while the outbox's Retry is rebuilt each render.
+  const retryRef = useRef(controller.retry)
+  useEffect(() => {
+    retryRef.current = controller.retry
+  })
+  const retryDelivery = useCallback((clientMessageId: string) => {
+    retryRef.current(clientMessageId)
+  }, [])
+  const agentLabel = structuredAgentLabel(props.agent === 'codex' ? 'codex' : 'claude')
+  // Only a rejected message reads the journal's rows, so a new batch of them re-renders no row else.
+  const hasRejected = controller.outbox.some((entry) => entry.state === 'rejected')
+  const rejectionRows = hasRejected ? controller.submissions : NO_SUBMISSIONS
+  const startFailures = useStructuredAgentSessionStartFailureFacts(
+    controller.journalItems,
+    hasRejected
+  )
+  const deliveryNotices = useMemo(
+    () =>
+      structuredAgentSessionDeliveryNotices(
+        controller.outbox,
+        controller.blockedClientMessageId,
+        agentLabel,
+        retryDelivery,
+        rejectionRows,
+        startFailures
+      ),
+    [
+      controller.outbox,
+      controller.blockedClientMessageId,
+      agentLabel,
+      retryDelivery,
+      rejectionRows,
+      startFailures
+    ]
+  )
+  const viewState = selectNativeChatViewState(session, { readRetries: true })
+  const readFailure =
+    controller.status === 'error'
+      ? structuredAgentSessionReadFailureNotice(controller.readRefusal)
+      : null
   const fontScale = useNativeChatFontScale(viewState.kind === 'ready')
   const imageRuntimeContext = useNativeChatImageRuntimeContext(props.tabId)
   const { onLinkClick, linkActionRequest, closeLinkActions } = useNativeChatLinkActions(
@@ -217,7 +262,11 @@ export function NativeChatStructuredSession(
         {viewState.kind === 'loading' ? (
           <NativeChatEmptyState kind="loading" />
         ) : viewState.kind === 'error' ? (
-          <NativeChatEmptyState kind="error" message={viewState.message} />
+          <NativeChatEmptyState
+            kind="error"
+            retrying={!readFailure?.final}
+            {...(readFailure?.named ? { headline: readFailure.text } : {})}
+          />
         ) : viewState.kind === 'empty' ? (
           <NativeChatEmptyState kind="empty" agent={props.agent} />
         ) : (
@@ -231,30 +280,34 @@ export function NativeChatStructuredSession(
             fontScale={fontScale.scale}
             workingStartedAt={controller.workingStartedAt}
             settledTurns={controller.settledTurns}
-            showTurnStatus
-            showLiveTurnActivity={prompt === null}
+            activeTurnOpenedBy={controller.activeTurnOpenedBy}
+            turnKeysByItemId={controller.turnKeysByItemId}
+            awaitingInput={prompt === null ? null : 'shown'}
             turnActivity={controller.turnActivity}
             onLinkClick={onLinkClick}
             allowFileUriLinks={onLinkClick !== undefined}
             runtimeContext={imageRuntimeContext}
+            deliveryNotices={deliveryNotices}
           />
         )}
       </div>
-      <NativeChatDeliveryRetry
-        outbox={controller.outbox}
-        blockedClientMessageId={controller.blockedClientMessageId}
-        retry={controller.retry}
-      />
       <NativeChatLaunchRetry
         lifecycle={provisionalLaunch.lifecycle}
-        failureReason={provisionalLaunch.failureReason}
+        failure={provisionalLaunch.failure}
+        agentLabel={agentLabel}
         onRetry={provisionalLaunch.retry}
       />
       <NativeChatStructuredSessionStatus
         sessionId={props.sessionId}
-        agentLabel={structuredAgentLabel(props.agent === 'codex' ? 'codex' : 'claude')}
-        startupPhase={startupPhase}
-        error={controller.error}
+        agentLabel={agentLabel}
+        startupPhase={hostExecution.phase}
+        startupChildKey={hostExecution.childKey}
+        // Said once: on the pane when the failure took it, else here beside the transcript. A
+        // failure that names nothing is only the pane reconnecting.
+        error={
+          viewState.kind === 'error' || !readFailure?.named ? controller.error : readFailure.text
+        }
+        reconnecting={viewState.kind !== 'error' && readFailure !== null && !readFailure.named}
         composerError={composerError}
         isVisible={props.isVisible}
         backgroundTasks={controller.backgroundTasks}
@@ -324,14 +377,8 @@ export function NativeChatStructuredSession(
           targetPtyId={null}
           agent={props.agent}
           canSend={!prompt}
-          // Stop, not status: only a provider-minted turn can be interrupted, so the button
-          // must not flip while a dispatch is still unanswered.
-          isWorking={controller.turnId !== null}
-          onStop={() => {
-            if (controller.turnId) {
-              void controller.cancel(controller.turnId)
-            }
-          }}
+          isWorking={controller.canStop}
+          onStop={() => void controller.stop()}
           structuredTransport={structuredTransport}
           launchSeed={{ ...launchDraftSignal, ownsTabWideLaunchDraft: true }}
         />
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx
index abb248f719c1..81a8f53300f1 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx
@@ -9,6 +9,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
 import type { AgentSessionBackgroundTask } from '../../../../shared/agent-session-wire'
 import type { NativeChatQuestionCardProps } from './NativeChatQuestionCard'
+import type { NativeChatDeliveryNotice } from './NativeChatMessageRow'
 
 const mocks = vi.hoisted(() => ({
   call: vi.fn(),
@@ -17,7 +18,6 @@ const mocks = vi.hoisted(() => ({
   messageListProps: null as null | {
     allowFileUriLinks?: boolean
     onLinkClick?: (...args: unknown[]) => void
-    showTurnStatus?: boolean
     runtimeContext?: unknown
   },
   composerProps: null as null | {
@@ -45,6 +45,8 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
 
 vi.mock('./use-structured-agent-session', async () => {
   const { useStructuredAgentSessionOutbox } = await import('./use-structured-agent-session-outbox')
+  const { projectStructuredAgentSessionMessages } =
+    await import('../../../../shared/structured-agent-session-message-projection')
   return {
     useStructuredAgentSession: (props: {
       sessionId: string
@@ -60,7 +62,7 @@ vi.mock('./use-structured-agent-session', async () => {
         journalItems: [],
         messages:
           mocks.mode === 'outbox'
-            ? []
+            ? projectStructuredAgentSessionMessages([], outbox.outbox, [])
             : [
                 {
                   id: 'message-1',
@@ -77,6 +79,7 @@ vi.mock('./use-structured-agent-session', async () => {
         loadOlder: vi.fn(),
         prompts: mocks.promptItems,
         outbox: outbox.outbox,
+        submissions: mocks.submissions,
         blockedClientMessageId: outbox.blockedClientMessageId,
         send: outbox.send,
         retry: outbox.retry,
@@ -131,12 +134,19 @@ vi.mock('./use-native-chat-file-link-click', () => ({
   useNativeChatFileLinkClick: (context: unknown) => (context ? mocks.fileLinkClick : undefined)
 }))
 
-vi.mock('./NativeChatMessageList', () => ({
-  NativeChatMessageList: (props: typeof mocks.messageListProps) => {
-    mocks.messageListProps = props
-    return <div data-testid="message-list" />
+vi.mock('./NativeChatMessageList', async () => {
+  const { DeliveryNoticesMock } = await import('./NativeChatStructuredSession.test-harness')
+  return {
+    NativeChatMessageList: (
+      props: NonNullable<typeof mocks.messageListProps> & {
+        deliveryNotices?: ReadonlyMap<string, NativeChatDeliveryNotice>
+      }
+    ) => {
+      mocks.messageListProps = props
+      return <DeliveryNoticesMock notices={props.deliveryNotices} />
+    }
   }
-}))
+})
 
 vi.mock('./NativeChatComposer', () => ({
   NativeChatComposer: forwardRef((props: typeof mocks.composerProps, ref) => {
@@ -280,6 +290,128 @@ describe('NativeChatStructuredSession delivery', () => {
     expect(request.envelope.clientOperationId).toBe('op-head')
   })
 
+  it('offers a rejected message no Retry while the queue is stopped, and gives it back once it moves', async () => {
+    mocks.mode = 'outbox'
+    mocks.submissions = []
+    mocks.call.mockResolvedValue({
+      ok: true,
+      value: { submission: { clientMessageId: 'op-head', dispatchState: 'accepted' } }
+    })
+    seedOutbox('session-held-rejected', [
+      seededEntry('session-held-rejected', 'op-head', 'first', 'unconfirmed'),
+      {
+        ...seededEntry('session-held-rejected', 'op-rejected', 'second', 'queued'),
+        state: 'rejected',
+        lastFailure: { kind: 'rejected', reason: 'Claude messages support at most 20 images' }
+      }
+    ])
+
+    render(
+      <NativeChatStructuredSession
+        isVisible
+        isFocusedGroup
+        tabId="structured-tab-held-rejected"
+        sessionId="session-held-rejected"
+        target={{ kind: 'local' }}
+        agent="codex"
+      />
+    )
+
+    await waitFor(() => expect(screen.getByText('Message delivery is unconfirmed.')).toBeTruthy())
+    expect(screen.getByText('Claude messages support at most 20 images')).toBeTruthy()
+    // One Retry, the stopped message's: it sends only that one.
+    fireEvent.click(screen.getByRole('button', { name: /Retry/ }))
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
+    expect(mocks.call.mock.calls[0]?.[2]).toMatchObject({
+      envelope: { clientOperationId: 'op-head' }
+    })
+
+    // The queue moved, so the rejected message offers its own Retry again.
+    await waitFor(() => expect(screen.queryByText('Message delivery is unconfirmed.')).toBeNull())
+    expect(screen.getByText('Claude messages support at most 20 images')).toBeTruthy()
+    expect(screen.getAllByRole('button', { name: /Retry/ })).toHaveLength(1)
+    expect(mocks.call).toHaveBeenCalledOnce()
+  })
+
+  it("words a failed start on each message by the chat's agent, leaving the resend to its Retry", async () => {
+    mocks.mode = 'outbox'
+    mocks.submissions = []
+    const startFailed = (clientMessageId: string, text: string) => ({
+      ...seededEntry('session-start-failed', clientMessageId, text, 'queued'),
+      state: 'rejected' as const,
+      lastFailure: {
+        kind: 'rejected' as const,
+        reason: 'Codex stopped before it finished starting. Send your message to try again.',
+        rejection: { kind: 'providerStartFailed' as const }
+      }
+    })
+    seedOutbox('session-start-failed', [
+      startFailed('op-first', 'first'),
+      startFailed('op-second', 'second')
+    ])
+
+    render(
+      <NativeChatStructuredSession
+        isVisible
+        isFocusedGroup
+        tabId="structured-tab-start-failed"
+        sessionId="session-start-failed"
+        target={{ kind: 'local' }}
+        agent="codex"
+      />
+    )
+
+    await waitFor(() =>
+      expect(screen.getAllByText('Codex stopped before it finished starting.')).toHaveLength(2)
+    )
+    expect(screen.getAllByRole('button', { name: /Retry/ })).toHaveLength(2)
+    expect(screen.queryByText(/Send your message to try again/)).toBeNull()
+  })
+
+  it("words a rejected message from its loaded journal row, not the message's own copy", async () => {
+    mocks.mode = 'outbox'
+    const reason = "Claude couldn't start. Send your message to try again."
+    mocks.submissions = [
+      {
+        clientMessageId: 'op-recorded',
+        fence: 1,
+        payloadFingerprint: 'fingerprint',
+        dispatchState: 'rejected',
+        providerItemId: null,
+        reason,
+        rejection: {
+          kind: 'startFailed',
+          refusal: { code: 'agent_session_identity_required', details: { reason: 'recordMissing' } }
+        },
+        submittedAt: 1,
+        resolvedAt: 1
+      }
+    ]
+    seedOutbox('session-recorded', [
+      {
+        ...seededEntry('session-recorded', 'op-recorded', 'first', 'queued'),
+        state: 'rejected',
+        lastFailure: { kind: 'rejected', reason, rejection: { kind: 'startFailed' } }
+      }
+    ])
+
+    render(
+      <NativeChatStructuredSession
+        isVisible
+        isFocusedGroup
+        tabId="structured-tab-recorded"
+        sessionId="session-recorded"
+        target={{ kind: 'local' }}
+        agent="codex"
+      />
+    )
+
+    await waitFor(() =>
+      expect(screen.getByText("Codex couldn't start. Start a new chat to continue.")).toBeTruthy()
+    )
+    expect(screen.queryByText(reason)).toBeNull()
+  })
+
   it('names the stuck message behind an admitted head, and its Retry sends that one', async () => {
     mocks.mode = 'outbox'
     mocks.submissions = []
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.test.tsx
index 77e365886c8c..da53ca1914cf 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.test.tsx
@@ -2,11 +2,18 @@
 
 import '@testing-library/jest-dom/vitest'
 
-import { cleanup, render, screen } from '@testing-library/react'
+import { act, cleanup, render, screen } from '@testing-library/react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import { NativeChatStructuredSessionStatus } from './NativeChatStructuredSessionStatus'
+import {
+  NativeChatStructuredSessionStatus,
+  SLOW_STARTUP_NOTICE_DELAY_MS
+} from './NativeChatStructuredSessionStatus'
+import { STATUS_MIN_VISIBLE_MS } from '@/lib/delayed-status'
 
-afterEach(cleanup)
+afterEach(() => {
+  cleanup()
+  vi.useRealTimers()
+})
 
 const NO_TASKS = {
   show: false,
@@ -17,12 +24,17 @@ const NO_TASKS = {
   supportsStopAll: false
 }
 
-function renderStatus(startupPhase: 'starting' | 'ready' | null) {
-  return render(
+function statusElement(
+  startupPhase: 'starting' | 'ready' | null,
+  sessionId = 'session-1',
+  startupChildKey: string | null = null
+) {
+  return (
     <NativeChatStructuredSessionStatus
-      sessionId="session-1"
+      sessionId={sessionId}
       agentLabel="Claude"
       startupPhase={startupPhase}
+      startupChildKey={startupChildKey}
       error={null}
       composerError={null}
       isVisible
@@ -32,13 +44,85 @@ function renderStatus(startupPhase: 'starting' | 'ready' | null) {
   )
 }
 
+function renderStatus(startupPhase: 'starting' | 'ready' | null) {
+  return render(statusElement(startupPhase))
+}
+
 describe('NativeChatStructuredSessionStatus', () => {
-  it('says the agent is still starting while the host reports a starting child', () => {
+  it('stays quiet through a normal startup', () => {
+    vi.useFakeTimers()
+    const view = renderStatus('starting')
+    act(() => vi.advanceTimersByTime(SLOW_STARTUP_NOTICE_DELAY_MS - 1))
+    expect(screen.queryByText(/still starting/)).not.toBeInTheDocument()
+    view.rerender(statusElement('ready'))
+    act(() => vi.advanceTimersByTime(SLOW_STARTUP_NOTICE_DELAY_MS))
+    expect(screen.queryByText(/still starting/)).not.toBeInTheDocument()
+  })
+
+  it('says the agent is still starting once startup runs long', () => {
+    vi.useFakeTimers()
     renderStatus('starting')
+    act(() => vi.advanceTimersByTime(SLOW_STARTUP_NOTICE_DELAY_MS))
     expect(screen.getByText(/Claude is still starting/)).toBeInTheDocument()
     expect(screen.getByText(/close this chat/)).toBeInTheDocument()
   })
 
+  it('restarts the grace period for a relaunch or another session', () => {
+    vi.useFakeTimers()
+    const view = renderStatus('starting')
+    act(() => vi.advanceTimersByTime(SLOW_STARTUP_NOTICE_DELAY_MS))
+    view.rerender(statusElement('ready'))
+    act(() => vi.advanceTimersByTime(STATUS_MIN_VISIBLE_MS))
+    expect(screen.queryByText(/still starting/)).not.toBeInTheDocument()
+    view.rerender(statusElement('starting'))
+    expect(screen.queryByText(/still starting/)).not.toBeInTheDocument()
+    act(() => vi.advanceTimersByTime(SLOW_STARTUP_NOTICE_DELAY_MS))
+    expect(screen.getByText(/still starting/)).toBeInTheDocument()
+    view.rerender(statusElement('starting', 'session-2'))
+    expect(screen.queryByText(/still starting/)).not.toBeInTheDocument()
+  })
+
+  it('hides an old notice and gives a replacement child its full grace period', () => {
+    vi.useFakeTimers()
+    const view = render(statusElement('starting', 'session-1', 'child-1'))
+    act(() => vi.advanceTimersByTime(SLOW_STARTUP_NOTICE_DELAY_MS))
+    expect(screen.getByText(/still starting/)).toBeInTheDocument()
+    view.rerender(statusElement('ready', 'session-1', 'child-1'))
+    act(() => vi.advanceTimersByTime(100))
+    view.rerender(statusElement('starting', 'session-1', 'child-2'))
+    expect(screen.queryByText(/still starting/)).not.toBeInTheDocument()
+    act(() => vi.advanceTimersByTime(STATUS_MIN_VISIBLE_MS))
+    expect(screen.queryByText(/still starting/)).not.toBeInTheDocument()
+    act(() => vi.advanceTimersByTime(SLOW_STARTUP_NOTICE_DELAY_MS - STATUS_MIN_VISIBLE_MS))
+    expect(screen.getByText(/still starting/)).toBeInTheDocument()
+  })
+
+  it('resets for a replacement child even when no intermediate phase reaches the view', () => {
+    vi.useFakeTimers()
+    const view = render(statusElement('starting', 'session-1', 'child-1'))
+    act(() => vi.advanceTimersByTime(SLOW_STARTUP_NOTICE_DELAY_MS))
+    view.rerender(statusElement('starting', 'session-1', 'child-2'))
+    expect(screen.queryByText(/still starting/)).not.toBeInTheDocument()
+    act(() => vi.advanceTimersByTime(SLOW_STARTUP_NOTICE_DELAY_MS - 1))
+    expect(screen.queryByText(/still starting/)).not.toBeInTheDocument()
+    act(() => vi.advanceTimersByTime(1))
+    expect(screen.getByText(/still starting/)).toBeInTheDocument()
+  })
+
+  it('resets on an observed restart when an older host has no child identity', () => {
+    vi.useFakeTimers()
+    const view = renderStatus('starting')
+    act(() => vi.advanceTimersByTime(SLOW_STARTUP_NOTICE_DELAY_MS))
+    view.rerender(statusElement('ready'))
+    act(() => vi.advanceTimersByTime(100))
+    view.rerender(statusElement('starting'))
+    expect(screen.queryByText(/still starting/)).not.toBeInTheDocument()
+    act(() => vi.advanceTimersByTime(SLOW_STARTUP_NOTICE_DELAY_MS - 1))
+    expect(screen.queryByText(/still starting/)).not.toBeInTheDocument()
+    act(() => vi.advanceTimersByTime(1))
+    expect(screen.getByText(/still starting/)).toBeInTheDocument()
+  })
+
   it('shows nothing about startup once the child is ready or the host has no word', () => {
     renderStatus('ready')
     expect(screen.queryByText(/still starting/)).not.toBeInTheDocument()
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.tsx
index 86a2b858a422..315188861506 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.tsx
@@ -1,5 +1,6 @@
 import { useState } from 'react'
 import { translate } from '@/i18n/i18n'
+import { useDelayedStatus } from '@/hooks/use-delayed-status'
 import { NativeChatBackgroundTasksStatus } from './NativeChatBackgroundTasksStatus'
 import type { StructuredSessionBackgroundTasksView } from './structured-session-background-tasks-view'
 
@@ -11,13 +12,19 @@ type StoppingBackgroundTasks = {
 
 const NO_STOPPING_TASKS: ReadonlySet<string> = new Set()
 
+// Why: every launch passes through `starting`; only a slow start deserves the notice.
+export const SLOW_STARTUP_NOTICE_DELAY_MS = 5_000
+
 export function NativeChatStructuredSessionStatus(props: {
   sessionId: string
   /** What to call the agent in copy about its process. */
   agentLabel: string
   /** The host's word on the provider child; `starting` is published but not yet answering. */
   startupPhase: 'starting' | 'ready' | null
+  startupChildKey: string | number | null
   error: string | null
+  /** A read the pane is reconnecting on its own: said plainly, not as an error. */
+  reconnecting?: boolean
   composerError: string | null
   isVisible: boolean
   backgroundTasks: StructuredSessionBackgroundTasksView
@@ -26,6 +33,11 @@ export function NativeChatStructuredSessionStatus(props: {
   const [stopping, setStopping] = useState<StoppingBackgroundTasks | null>(null)
   const [expanded, setExpanded] = useState<{ sessionId: string; expanded: boolean } | null>(null)
   const activeStopping = stopping?.sessionId === props.sessionId ? stopping : null
+  const shownStartupPhase = useDelayedStatus(
+    JSON.stringify([props.sessionId, typeof props.startupChildKey, props.startupChildKey]),
+    props.startupPhase === 'starting' ? 'starting' : null,
+    SLOW_STARTUP_NOTICE_DELAY_MS
+  )
 
   const onStop = (taskId?: string) => {
     const sessionId = props.sessionId
@@ -59,7 +71,7 @@ export function NativeChatStructuredSessionStatus(props: {
 
   return (
     <>
-      {props.startupPhase === 'starting' ? (
+      {shownStartupPhase === 'starting' ? (
         <p className="mx-auto w-full max-w-4xl px-4 py-1 text-xs text-muted-foreground">
           {translate(
             'auto.components.native.chat.NativeChatStructuredSessionStatus.starting',
@@ -68,6 +80,11 @@ export function NativeChatStructuredSessionStatus(props: {
           )}
         </p>
       ) : null}
+      {props.reconnecting && !props.error ? (
+        <p className="mx-auto w-full max-w-4xl px-4 py-1 text-xs text-muted-foreground">
+          {translate('components.native-chat.state.reconnecting', 'Reconnecting to this chat…')}
+        </p>
+      ) : null}
       {props.error || props.composerError ? (
         <p className="mx-auto w-full max-w-4xl px-4 py-1 text-xs text-destructive">
           {props.error ?? props.composerError}
diff --git a/src/renderer/src/components/native-chat/NativeChatToolRun.ask-row.test.tsx b/src/renderer/src/components/native-chat/NativeChatToolRun.ask-row.test.tsx
index 4de5a0d214b6..b4257648efaf 100644
--- a/src/renderer/src/components/native-chat/NativeChatToolRun.ask-row.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatToolRun.ask-row.test.tsx
@@ -2,10 +2,14 @@
 
 import '@testing-library/jest-dom/vitest'
 
-import { cleanup, render, screen } from '@testing-library/react'
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, describe, expect, it } from 'vitest'
 import type { NativeChatBlock } from '../../../../shared/native-chat-types'
 import { NativeChatToolRun } from './NativeChatToolRun'
+import {
+  NativeChatDisclosureContext,
+  useNativeChatDisclosures
+} from './native-chat-disclosure-store'
 
 afterEach(cleanup)
 
@@ -16,6 +20,46 @@ function askBlocks(state: 'running' | 'completed'): NativeChatBlock[] {
   return [{ type: 'tool-call', name: 'AskUserQuestion', input: ASK_INPUT, state }]
 }
 
+/** Lays every element out wider than its box, as a long question is on its line. */
+function clipEveryLine(): () => void {
+  const originals = ['scrollWidth', 'clientWidth'].map(
+    (name) => [name, Object.getOwnPropertyDescriptor(HTMLElement.prototype, name)] as const
+  )
+  Object.defineProperty(HTMLElement.prototype, 'scrollWidth', {
+    configurable: true,
+    get: () => 400
+  })
+  Object.defineProperty(HTMLElement.prototype, 'clientWidth', {
+    configurable: true,
+    get: () => 100
+  })
+  return () => {
+    for (const [name, original] of originals) {
+      if (original) {
+        Object.defineProperty(HTMLElement.prototype, name, original)
+      } else {
+        Reflect.deleteProperty(HTMLElement.prototype, name)
+      }
+    }
+  }
+}
+
+function DisclosureHarness({ mounted }: { mounted: boolean }): React.JSX.Element {
+  const disclosures = useNativeChatDisclosures()
+  return (
+    <NativeChatDisclosureContext.Provider value={disclosures}>
+      {mounted ? (
+        <NativeChatToolRun
+          blocks={askBlocks('completed')}
+          expandSignal
+          activeTurnIsWorking={false}
+          disclosureId="message-1"
+        />
+      ) : null}
+    </NativeChatDisclosureContext.Provider>
+  )
+}
+
 describe('NativeChatToolRun awaiting-input row', () => {
   it('does not revive stale tool state after a turn stops', () => {
     render(
@@ -80,9 +124,89 @@ describe('NativeChatToolRun awaiting-input row', () => {
     expect(screen.getByText('Asked:')).not.toHaveClass('animate-pulse')
     expect(screen.getByText(QUESTION)).toBeInTheDocument()
     // A run that is only the ask has no work left to head, so it draws no header.
+    expect(container.querySelector('[data-native-chat-tool-run-state]')).toBeNull()
+  })
+
+  it('leaves a question that fits on its line as plain text', () => {
+    const { container } = render(
+      <NativeChatToolRun blocks={askBlocks('completed')} expandSignal activeTurnIsWorking={false} />
+    )
+    expect(screen.getByText(QUESTION)).toHaveClass('truncate')
     expect(container.querySelector('button')).toBeNull()
   })
 
+  it('opens a clipped question below the toggle and folds it back', () => {
+    const restore = clipEveryLine()
+    try {
+      render(
+        <NativeChatToolRun
+          blocks={askBlocks('completed')}
+          expandSignal
+          activeTurnIsWorking={false}
+        />
+      )
+      const toggle = screen.getByRole('button', { name: /Asked:/ })
+      expect(toggle).toHaveAttribute('aria-expanded', 'false')
+
+      fireEvent.click(toggle)
+      expect(toggle).toHaveAttribute('aria-expanded', 'true')
+      const full = screen.getByText(QUESTION)
+      expect(full).not.toHaveClass('truncate')
+      // Outside the button, so it selects like prose and a click in it keeps it open.
+      expect(full.closest('button')).toBeNull()
+      fireEvent.click(full)
+      expect(toggle).toHaveAttribute('aria-expanded', 'true')
+
+      fireEvent.click(toggle)
+      expect(toggle).toHaveAttribute('aria-expanded', 'false')
+      expect(screen.getByText(QUESTION)).toHaveClass('truncate')
+    } finally {
+      restore()
+    }
+  })
+
+  it('keeps an opened question open when the windowed row remounts', () => {
+    const restore = clipEveryLine()
+    try {
+      const { rerender } = render(<DisclosureHarness mounted />)
+      fireEvent.click(screen.getByRole('button', { name: /Asked:/ }))
+
+      rerender(<DisclosureHarness mounted={false} />)
+      expect(screen.queryByText(QUESTION)).toBeNull()
+      rerender(<DisclosureHarness mounted />)
+
+      const toggle = screen.getByRole('button', { name: /Asked:/ })
+      expect(toggle).toHaveAttribute('aria-expanded', 'true')
+      expect(screen.getByText(QUESTION).closest('button')).toBeNull()
+
+      // Folding it keeps the same control, so keyboard focus is not dropped.
+      toggle.focus()
+      fireEvent.click(toggle)
+      expect(document.activeElement).toBe(toggle)
+      expect(toggle).toHaveAttribute('aria-expanded', 'false')
+    } finally {
+      restore()
+    }
+  })
+
+  it('offers no expansion when the row names only a question count', () => {
+    const restore = clipEveryLine()
+    try {
+      const input = { questions: [{ question: 'First?' }, { question: 'Second?' }] }
+      render(
+        <NativeChatToolRun
+          blocks={[{ type: 'tool-call', name: 'AskUserQuestion', input, state: 'completed' }]}
+          expandSignal
+          activeTurnIsWorking={false}
+        />
+      )
+      expect(screen.getByText('2 questions')).toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: /Asked:/ })).toBeNull()
+    } finally {
+      restore()
+    }
+  })
+
   it('counts only the work that ran in the header beside the ask', () => {
     const blocks: NativeChatBlock[] = [
       { type: 'tool-call', name: 'Read', input: { file_path: 'a.ts' }, state: 'completed' },
@@ -107,7 +231,7 @@ describe('NativeChatToolRun awaiting-input row', () => {
       />
     )
 
-    expect(screen.getByText('Awaiting user input:')).toBeInTheDocument()
+    expect(screen.getByText('Awaiting user input')).toBeInTheDocument()
     expect(screen.queryByText(/request_user_input/)).toBeNull()
   })
 })
diff --git a/src/renderer/src/components/native-chat/NativeChatToolRun.tsx b/src/renderer/src/components/native-chat/NativeChatToolRun.tsx
index 878a501b7093..270c48cc657e 100644
--- a/src/renderer/src/components/native-chat/NativeChatToolRun.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatToolRun.tsx
@@ -59,7 +59,6 @@ export function NativeChatToolRun({
   activeTurnIsWorking,
   trailing,
   expandOverride,
-  structuredActivityUi = true,
   disclosureId,
   onLinkClick
 }: {
@@ -82,7 +81,6 @@ export function NativeChatToolRun({
    *  the agent has already moved past reads as settled even mid-call. Left
    *  unset, a working turn's run is taken to be its last. */
   trailing?: boolean
-  structuredActivityUi?: boolean
   /** Message this run belongs to. Windowing unmounts rows, so a run the reader
    *  opened has to be remembered somewhere that outlives the row. */
   disclosureId?: string
@@ -131,10 +129,9 @@ export function NativeChatToolRun({
   // caller with no turn state, or a turn blocked on the reader's answer, falls
   // back to the calls themselves.
   const live =
-    structuredActivityUi &&
-    (activeTurnIsWorking === true && !askIsActive
+    activeTurnIsWorking === true && !askIsActive
       ? trailing !== false
-      : selectActiveToolCall(headerBlocks, { activeTurnIsWorking }) !== null)
+      : selectActiveToolCall(headerBlocks, { activeTurnIsWorking }) !== null
   // One sentence for the whole run, or the command itself when the run is one
   // call — the reader recognizes `git push` faster than "Ran 1 command".
   const runSentence = nativeChatToolRunSentence(headerBlocks, { live })
@@ -200,7 +197,6 @@ export function NativeChatToolRun({
   // the grouped row visible here made a failed child command look like the
   // whole response was still running (or had failed) even while collapsed.
   if (
-    structuredActivityUi &&
     expandOverride === false &&
     !(revealedDiff && open) &&
     !live &&
@@ -218,7 +214,13 @@ export function NativeChatToolRun({
     <div className="mt-3">
       {standaloneRows}
       {hasAskCall ? (
-        <NativeChatAwaitingInputRow subject={askSubject} pending={askIsActive} />
+        <NativeChatAwaitingInputRow
+          subject={askSubject}
+          pending={askIsActive}
+          disclosureKey={disclosureId === undefined ? undefined : `ask:${disclosureId}`}
+          // A grouped ask here still names only its count.
+          listsQuestions={false}
+        />
       ) : null}
       {!showsHeader ? null : (
         // One element for the run's whole life. Live and settled are states of
@@ -232,7 +234,7 @@ export function NativeChatToolRun({
           aria-live="polite"
           data-native-chat-tool-run-state={live ? 'live' : 'settled'}
         >
-          {structuredActivityUi && settledHeaderIcon ? (
+          {settledHeaderIcon ? (
             <NativeChatToolRunIcon iconName={settledHeaderIcon} className="text-muted-foreground" />
           ) : null}
           <NativeChatToolCategoryDots blocks={blocks} />
@@ -274,7 +276,7 @@ export function NativeChatToolRun({
           {/* Only a stated success is marked done — see nativeChatToolRunOutcome —
               and never while live: between two calls nothing is running, and a
               mark that appeared then would flash on every call. */}
-          {structuredActivityUi && !live && runSucceeded ? (
+          {!live && runSucceeded ? (
             <Check aria-hidden className="size-3 shrink-0 text-muted-foreground" />
           ) : null}
           {latestCallLabel ? (
diff --git a/src/renderer/src/components/native-chat/NativeChatTranscriptRow.tsx b/src/renderer/src/components/native-chat/NativeChatTranscriptRow.tsx
index 266f528ebfd6..91e71df2140e 100644
--- a/src/renderer/src/components/native-chat/NativeChatTranscriptRow.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTranscriptRow.tsx
@@ -1,7 +1,7 @@
 import { memo } from 'react'
 import type { CommentMarkdownLinkClickHandler } from '@/components/sidebar/CommentMarkdown'
 import type { RuntimeFileOperationArgs } from '@/runtime/runtime-file-client'
-import { MessageRow } from './NativeChatMessageRow'
+import { MessageRow, type NativeChatDeliveryNotice } from './NativeChatMessageRow'
 import { NativeChatResolutionReceipt } from './NativeChatResolutionReceipt'
 import { NativeChatWorkingStatus } from './NativeChatWorkingStatus'
 import { NativeChatTurnDiffRollup } from './NativeChatTurnDiffRollup'
@@ -13,11 +13,11 @@ import type { NativeChatDiffReveal, NativeChatDiffTarget } from './native-chat-t
  *  object so a row's props change only when that row's own slot does. */
 export type NativeChatTranscriptRowContext = {
   expandSignal: boolean
-  showTurnStatus: boolean
   revealedDiff: NativeChatDiffReveal | null
   taskListPredecessors: ReadonlyMap<string, NativeChatTaskListPredecessors>
   expandedTurnIds: ReadonlySet<string>
-  failedDeliveryMessageIds?: ReadonlySet<string>
+  /** Keyed by message id: the user messages that did not go through, each with its own words. */
+  deliveryNotices?: ReadonlyMap<string, NativeChatDeliveryNotice>
   allowFileUriLinks: boolean
   runtimeContext?: RuntimeFileOperationArgs | null
   onLinkClick?: CommentMarkdownLinkClickHandler
@@ -42,10 +42,22 @@ export const NativeChatTranscriptRow = memo(function NativeChatTranscriptRow({
   const { message, turnKey, status, receipt, turnDiff } = slot
   const predecessors = context.taskListPredecessors.get(message.id)
   const expanded = turnKey ? context.expandedTurnIds.has(turnKey) : undefined
+  const statusRow = status ? (
+    <NativeChatWorkingStatus
+      startedAt={status.startedAt}
+      workedSeconds={status.workedSeconds}
+      expanded={expanded === true}
+      onToggleExpanded={
+        slot.turnFolds && turnKey ? () => context.onToggleExpandedTurn(turnKey) : undefined
+      }
+    />
+  ) : null
   return (
     <div className="flex flex-col gap-5">
+      {/* A turn with no user bubble carries its bar above its first row. */}
+      {slot.statusAbove ? statusRow : null}
       {receipt ? (
-        <NativeChatResolutionReceipt body={receipt} />
+        <NativeChatResolutionReceipt body={receipt} disclosureId={message.id} />
       ) : (
         <MessageRow
           message={message}
@@ -60,23 +72,13 @@ export const NativeChatTranscriptRow = memo(function NativeChatTranscriptRow({
           onScrollMessageToTop={context.onScrollMessageToTop}
           onLinkClick={context.onLinkClick}
           allowFileUriLinks={context.allowFileUriLinks}
-          deliveryFailed={context.failedDeliveryMessageIds?.has(message.id) === true}
-          structuredActivityUi={context.showTurnStatus}
+          deliveryNotice={context.deliveryNotices?.get(message.id)}
           folded={slot.folded}
+          subagentLabel={slot.subagentLabel}
           runtimeContext={context.runtimeContext}
         />
       )}
-      {status ? (
-        <NativeChatWorkingStatus
-          startedAt={status.startedAt}
-          thinking={status.thinking}
-          workedSeconds={status.workedSeconds}
-          expanded={expanded === true}
-          onToggleExpanded={
-            slot.turnFolds && turnKey ? () => context.onToggleExpandedTurn(turnKey) : undefined
-          }
-        />
-      ) : null}
+      {slot.statusAbove ? null : statusRow}
       {turnDiff ? (
         <NativeChatTurnDiffRollup diff={turnDiff} onReveal={context.onRevealDiff} />
       ) : null}
diff --git a/src/renderer/src/components/native-chat/NativeChatTurnActivityLine.tsx b/src/renderer/src/components/native-chat/NativeChatTurnActivityLine.tsx
index 72e11ad25a81..3813ff8d2038 100644
--- a/src/renderer/src/components/native-chat/NativeChatTurnActivityLine.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTurnActivityLine.tsx
@@ -1,55 +1,30 @@
 import { Loader2 } from 'lucide-react'
 import { translate } from '@/i18n/i18n'
 import type { NativeChatTurnActivity } from '../../../../shared/native-chat-turn-activity'
-import {
-  describeNativeChatActiveTurnLabel,
-  NATIVE_CHAT_TURN_STATUS_COPY,
-  type NativeChatTurnStatus
-} from '../../../../shared/native-chat-turn-status'
-import { useNativeChatElapsedSeconds } from './use-native-chat-elapsed-seconds'
+import { describeNativeChatActiveTurnLabel } from '../../../../shared/native-chat-turn-status'
 
-/** The live turn's one indicator: a spinner plus whatever the turn can say about
- *  itself — the provider's activity text, else that it is reasoning, else how
- *  long it has been working. A settled turn keeps its own `NativeChatWorkingStatus`
- *  row; this one is only ever rendered while the turn is in flight. */
+/** The live turn's tail line: a spinner plus what the turn is doing right now —
+ *  the provider's activity text, else that it is reasoning, else plain "Working…".
+ *  The clock lives in the turn bar under the user's message, not here. */
 export function NativeChatTurnActivityLine({
   activity,
-  status
+  thinking
 }: {
   activity?: NativeChatTurnActivity | null
-  status?: NativeChatTurnStatus | null
+  thinking: boolean
 }): React.JSX.Element {
-  const thinking = status?.thinking === true
-  // The clock only ticks when its number is the label; activity text and
-  // "Thinking" carry no duration.
-  const counting = status != null && !thinking && !activity?.text
-  const elapsedSeconds = useNativeChatElapsedSeconds(status?.startedAt ?? null, counting)
-  const resolved = describeNativeChatActiveTurnLabel({
-    activityText: activity?.text,
-    thinking,
-    elapsedSeconds
-  })
+  const resolved = describeNativeChatActiveTurnLabel({ activityText: activity?.text, thinking })
   const label =
     resolved.source === 'activity'
       ? resolved.text
-      : status == null
-        ? translate('components.native-chat.status.working', 'Working…')
-        : resolved.key === 'thinking'
-          ? translate(
-              'components.native-chat.status.thinking',
-              NATIVE_CHAT_TURN_STATUS_COPY.thinking
-            )
-          : translate(
-              'components.native-chat.status.workingFor',
-              NATIVE_CHAT_TURN_STATUS_COPY.workingFor,
-              { value0: resolved.duration }
-            )
+      : resolved.key === 'thinking'
+        ? translate('components.native-chat.status.thinking', 'Thinking')
+        : translate('components.native-chat.status.working', 'Working…')
 
   return (
     <div
       className="flex min-h-6 items-center gap-1.5 text-sm leading-relaxed text-muted-foreground"
       data-native-chat-turn-activity="true"
-      data-native-chat-turn-status="active"
       aria-live="polite"
       aria-atomic="true"
     >
diff --git a/src/renderer/src/components/native-chat/NativeChatTypingIndicatorRow.tsx b/src/renderer/src/components/native-chat/NativeChatTypingIndicatorRow.tsx
deleted file mode 100644
index 59969c1dece6..000000000000
--- a/src/renderer/src/components/native-chat/NativeChatTypingIndicatorRow.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { translate } from '@/i18n/i18n'
-
-export function NativeChatTypingIndicatorRow(): React.JSX.Element {
-  return (
-    <div
-      className="flex items-center justify-start"
-      aria-label={translate('components.native-chat.status.responding', 'Agent is responding')}
-      aria-live="polite"
-    >
-      <div className="flex h-8 items-center gap-1.5 text-muted-foreground">
-        {[0, 1, 2].map((i) => (
-          <span
-            key={i}
-            className="size-1.5 animate-bounce rounded-full bg-muted-foreground/70"
-            style={{ animationDelay: `${i * 160}ms` }}
-          />
-        ))}
-      </div>
-    </div>
-  )
-}
diff --git a/src/renderer/src/components/native-chat/NativeChatWorkingStatus.tsx b/src/renderer/src/components/native-chat/NativeChatWorkingStatus.tsx
index c610abff7d6e..53e31157075b 100644
--- a/src/renderer/src/components/native-chat/NativeChatWorkingStatus.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatWorkingStatus.tsx
@@ -9,27 +9,22 @@ import { useNativeChatElapsedSeconds } from './use-native-chat-elapsed-seconds'
 
 export { formatNativeChatDuration }
 
+/** The turn bar under the user's message: a running clock while the turn works,
+ *  then the settled duration, which toggles the turn's folded detail. */
 export function NativeChatWorkingStatus({
   startedAt,
-  thinking,
   workedSeconds,
   expanded = false,
   onToggleExpanded
 }: {
   startedAt: number | null
-  thinking: boolean
   workedSeconds?: number | null
   expanded?: boolean
   onToggleExpanded?: () => void
 }): React.JSX.Element {
-  const counting = !thinking && workedSeconds == null
-  const elapsedSeconds = useNativeChatElapsedSeconds(startedAt, counting)
+  const elapsedSeconds = useNativeChatElapsedSeconds(startedAt, workedSeconds == null)
 
-  const { key, duration } = describeNativeChatTurnStatus({
-    thinking,
-    workedSeconds,
-    elapsedSeconds
-  })
+  const { key, duration } = describeNativeChatTurnStatus({ workedSeconds, elapsedSeconds })
   const label =
     key === 'workedFor'
       ? translate(
@@ -39,15 +34,14 @@ export function NativeChatWorkingStatus({
             value0: duration
           }
         )
-      : key === 'thinking'
-        ? translate('components.native-chat.status.thinking', NATIVE_CHAT_TURN_STATUS_COPY.thinking)
-        : translate(
-            'components.native-chat.status.workingFor',
-            NATIVE_CHAT_TURN_STATUS_COPY.workingFor,
-            { value0: duration }
-          )
+      : translate(
+          'components.native-chat.status.workingFor',
+          NATIVE_CHAT_TURN_STATUS_COPY.workingFor,
+          { value0: duration }
+        )
   // `tabular-nums`: the live clock reflows its own label every second otherwise.
-  const className = `flex min-h-8 items-center gap-1 text-sm text-muted-foreground tabular-nums${thinking ? '' : ' border-b border-border'}`
+  const className =
+    'flex min-h-8 items-center gap-1 border-b border-border text-sm text-muted-foreground tabular-nums'
   const caret =
     workedSeconds != null && onToggleExpanded ? (
       <ChevronRight
@@ -82,9 +76,8 @@ export function NativeChatWorkingStatus({
         'components.native-chat.status.responding',
         NATIVE_CHAT_TURN_STATUS_COPY.responding
       )}
-      aria-live="polite"
     >
-      <span className={thinking ? 'animate-pulse' : undefined}>{label}</span>
+      <span>{label}</span>
       {caret}
     </div>
   )
diff --git a/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx b/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx
index ba210d74994c..4b31d0b03572 100644
--- a/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx
+++ b/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx
@@ -10,6 +10,7 @@ import { act, cleanup, render, waitFor } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
 import type { AgentJournalTurnOutcome } from '../../../../shared/agent-session-journal-types'
 import type {
+  AgentSessionStatusEvent,
   AgentSessionTurnCompletion,
   AgentSessionTurnCompletionEvent
 } from '../../../../shared/agent-session-wire'
@@ -27,7 +28,9 @@ type TestStore = {
 type BridgeMocks = {
   store: TestStore | null
   emitters: ((event: AgentSessionTurnCompletionEvent) => void)[]
+  statusEmitters: ((event: AgentSessionStatusEvent) => void)[]
   subscribeCompletions: Mock
+  subscribeStatus: Mock
   supportsCapability: Mock
   unsubscribe: Mock
 }
@@ -35,7 +38,9 @@ type BridgeMocks = {
 const mocks = vi.hoisted<BridgeMocks>(() => ({
   store: null,
   emitters: [],
+  statusEmitters: [],
   subscribeCompletions: vi.fn(),
+  subscribeStatus: vi.fn(),
   supportsCapability: vi.fn(),
   unsubscribe: vi.fn()
 }))
@@ -58,11 +63,16 @@ vi.mock('@/runtime/runtime-rpc-client', async (importOriginal) => ({
 }))
 
 vi.mock('@/runtime/structured-agent-session-client', () => ({
-  subscribeStructuredAgentSessionTurnCompletions: mocks.subscribeCompletions
+  subscribeStructuredAgentSessionTurnCompletions: mocks.subscribeCompletions,
+  subscribeStructuredAgentSessionStatus: mocks.subscribeStatus
 }))
 
 import { StructuredAgentSessionAttentionBridge } from './StructuredAgentSessionAttentionBridge'
 import { resetStructuredAgentSessionTurnCompletionFeedsForTests } from '@/runtime/structured-agent-session-turn-completion-feed'
+import {
+  getStructuredAgentSessionStatusFeed,
+  resetStructuredAgentSessionStatusFeedsForTests
+} from '@/runtime/structured-agent-session-status-feed'
 import {
   makeTabGroup,
   makeUnifiedTab,
@@ -176,7 +186,15 @@ describe('StructuredAgentSessionAttentionBridge', () => {
       }
     })
     resetStructuredAgentSessionTurnCompletionFeedsForTests()
+    resetStructuredAgentSessionStatusFeedsForTests()
     mocks.emitters.length = 0
+    mocks.statusEmitters.length = 0
+    mocks.subscribeStatus.mockImplementation(
+      (_target: unknown, emit: (event: AgentSessionStatusEvent) => void) => {
+        mocks.statusEmitters.push(emit)
+        return Promise.resolve({ unsubscribe: vi.fn() })
+      }
+    )
     mocks.subscribeCompletions.mockImplementation(
       (_target: unknown, emit: (event: AgentSessionTurnCompletionEvent) => void) => {
         mocks.emitters.push(emit)
@@ -215,6 +233,7 @@ describe('StructuredAgentSessionAttentionBridge', () => {
     cleanup()
     vi.unstubAllGlobals()
     resetStructuredAgentSessionTurnCompletionFeedsForTests()
+    resetStructuredAgentSessionStatusFeedsForTests()
   })
 
   it('lights the unread indicators when the host reports a successful turn', async () => {
@@ -235,14 +254,14 @@ describe('StructuredAgentSessionAttentionBridge', () => {
       worktreeId: WORKSPACE,
       paneKey: CHAT_SUBJECT,
       agentState: 'done',
-      agentInterrupted: false
+      agentTurnOutcome: 'success'
     })
   })
 
   // A settled turn is news whichever way it settled, exactly as the CLI lane treats one. The
-  // difference is wording, and it rides the notification flag that already says "stopped".
+  // difference is wording, which main picks from the verdict.
   it.each(['failure', 'cancellation'] as const)(
-    'lights the indicators and says stopped for a %s the host reports',
+    'lights the indicators and hands main the %s the host reports',
     async (outcome) => {
       render(<StructuredAgentSessionAttentionBridge />)
       await waitFor(() => expect(mocks.subscribeCompletions).toHaveBeenCalledOnce())
@@ -254,7 +273,7 @@ describe('StructuredAgentSessionAttentionBridge', () => {
         paneDot: 'agent-completion',
         tabDot: 'agent-completion'
       })
-      expect(onlyDispatch()).toMatchObject({ agentState: 'done', agentInterrupted: true })
+      expect(onlyDispatch()).toMatchObject({ agentState: 'done', agentTurnOutcome: outcome })
     }
   )
 
@@ -299,6 +318,48 @@ describe('StructuredAgentSessionAttentionBridge', () => {
     }
   )
 
+  // Remote clients receive the status and completion streams over separate sockets, unordered, so
+  // the wording must come from the completion alone. The mirror is set to disagree in each case.
+  function mirrorStatus(status: 'idle' | 'attention'): void {
+    mocks.statusEmitters[0]?.({
+      type: 'status',
+      session: {
+        sessionId: SESSION,
+        workspaceId: 'host-side-workspace',
+        agent: 'claude',
+        status,
+        latestPrompt: 'Ship it',
+        updatedAt: 1
+      }
+    })
+  }
+
+  it.each([
+    { awaitingUser: true, mirror: 'idle', agentState: 'blocked' },
+    { awaitingUser: undefined, mirror: 'attention', agentState: 'done' }
+  ] as const)(
+    'words awaitingUser=$awaitingUser as $agentState whatever the status mirror says ($mirror)',
+    async ({ awaitingUser, mirror, agentState }) => {
+      const stopStatus = getStructuredAgentSessionStatusFeed({ kind: 'local' }).activate()
+      render(<StructuredAgentSessionAttentionBridge />)
+      await waitFor(() => expect(mocks.subscribeCompletions).toHaveBeenCalledOnce())
+      await waitFor(() => expect(mocks.subscribeStatus).toHaveBeenCalledOnce())
+      const completion = turnCompletion()
+
+      act(() => {
+        mirrorStatus(mirror)
+        hostStream()({
+          type: 'completion',
+          completion: awaitingUser ? { ...completion, awaitingUser } : completion
+        })
+      })
+
+      expect(indicators().paneDot).toBe('agent-completion')
+      expect(onlyDispatch()).toMatchObject({ agentState, agentTurnOutcome: 'success' })
+      stopStatus()
+    }
+  )
+
   it('lights nothing for a turn whose outcome the host never stated', async () => {
     render(<StructuredAgentSessionAttentionBridge />)
     await waitFor(() => expect(mocks.subscribeCompletions).toHaveBeenCalledOnce())
diff --git a/src/renderer/src/components/native-chat/StructuredAgentSessionStatusBridge.test.tsx b/src/renderer/src/components/native-chat/StructuredAgentSessionStatusBridge.test.tsx
index 6cdaa2646e4a..42091c79de99 100644
--- a/src/renderer/src/components/native-chat/StructuredAgentSessionStatusBridge.test.tsx
+++ b/src/renderer/src/components/native-chat/StructuredAgentSessionStatusBridge.test.tsx
@@ -64,7 +64,7 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
 import {
   getStructuredAgentSessionTabs,
   StructuredAgentSessionStatusBridge,
-  useStructuredAgentSessionHostExecutionPhase
+  useStructuredAgentSessionHostExecution
 } from './StructuredAgentSessionStatusBridge'
 import { resetStructuredAgentSessionStatusFeedsForTests } from '@/runtime/structured-agent-session-status-feed'
 
@@ -698,28 +698,102 @@ describe('StructuredAgentSessionStatusBridge', () => {
     expect(mocks.setAgentStatus).not.toHaveBeenCalled()
   })
 
-  it('re-renders a startup-phase reader only when the phase changes', async () => {
-    const phases: (string | null)[] = []
+  it('re-renders a startup reader only when its phase or child changes', async () => {
+    const executions: ReturnType<typeof useStructuredAgentSessionHostExecution>[] = []
     function PhaseProbe(): null {
-      phases.push(useStructuredAgentSessionHostExecutionPhase('session-1', { kind: 'local' }))
+      executions.push(useStructuredAgentSessionHostExecution('session-1', { kind: 'local' }))
       return null
     }
     render(<PhaseProbe />)
     await waitFor(() => expect(mocks.subscribeStatus).toHaveBeenCalledOnce())
 
-    act(() => feed().emit({ type: 'status', session: summary({ hostExecutionPhase: 'starting' }) }))
-    const rendersWhileStarting = phases.length
     act(() =>
       feed().emit({
         type: 'status',
-        session: summary({ hostExecutionPhase: 'starting', latestPrompt: 'next', updatedAt: 2 })
+        session: summary({
+          hostExecutionPhase: 'starting',
+          hostExecutionChild: { generation: 'child-1', fence: 1 }
+        })
+      })
+    )
+    const rendersWhileStarting = executions.length
+    act(() =>
+      feed().emit({
+        type: 'status',
+        session: summary({
+          hostExecutionPhase: 'starting',
+          hostExecutionChild: { generation: 'child-1', fence: 1 },
+          latestPrompt: 'next',
+          updatedAt: 2
+        })
+      })
+    )
+    expect(executions).toHaveLength(rendersWhileStarting)
+    act(() =>
+      feed().emit({
+        type: 'status',
+        session: summary({
+          hostExecutionPhase: 'starting',
+          hostExecutionChild: { generation: 'child-1', fence: 2 }
+        })
+      })
+    )
+    expect(executions).toHaveLength(rendersWhileStarting)
+
+    act(() =>
+      feed().emit({
+        type: 'status',
+        session: summary({
+          hostExecutionPhase: 'ready',
+          hostExecutionChild: { generation: 'child-1', fence: 1 }
+        })
+      })
+    )
+    expect(executions.at(-1)?.phase).toBe('ready')
+    act(() =>
+      feed().emit({
+        type: 'status',
+        session: summary({
+          hostExecutionPhase: 'starting',
+          hostExecutionChild: { generation: 'child-2', fence: 2 }
+        })
       })
     )
-    expect(phases).toHaveLength(rendersWhileStarting)
+    expect(executions.at(-1)).toEqual({
+      phase: 'starting',
+      childKey: 'child-2'
+    })
+    expect(executions.some(({ phase }) => phase === 'starting')).toBe(true)
+  })
 
-    act(() => feed().emit({ type: 'status', session: summary({ hostExecutionPhase: 'ready' }) }))
-    expect(phases.at(-1)).toBe('ready')
-    expect(phases).toContain('starting')
+  it('uses the fence for a child whose acquisition has no generation', async () => {
+    const executions: ReturnType<typeof useStructuredAgentSessionHostExecution>[] = []
+    function PhaseProbe(): null {
+      executions.push(useStructuredAgentSessionHostExecution('session-1', { kind: 'local' }))
+      return null
+    }
+    render(<PhaseProbe />)
+    await waitFor(() => expect(mocks.subscribeStatus).toHaveBeenCalledOnce())
+    act(() =>
+      feed().emit({
+        type: 'status',
+        session: summary({
+          hostExecutionPhase: 'starting',
+          hostExecutionChild: { generation: null, fence: 1 }
+        })
+      })
+    )
+    expect(executions.at(-1)?.childKey).toBe(1)
+    act(() =>
+      feed().emit({
+        type: 'status',
+        session: summary({
+          hostExecutionPhase: 'starting',
+          hostExecutionChild: { generation: null, fence: 2 }
+        })
+      })
+    )
+    expect(executions.at(-1)?.childKey).toBe(2)
   })
 })
 
diff --git a/src/renderer/src/components/native-chat/StructuredAgentSessionStatusBridge.tsx b/src/renderer/src/components/native-chat/StructuredAgentSessionStatusBridge.tsx
index 92d3128d0821..8205d96a5af5 100644
--- a/src/renderer/src/components/native-chat/StructuredAgentSessionStatusBridge.tsx
+++ b/src/renderer/src/components/native-chat/StructuredAgentSessionStatusBridge.tsx
@@ -8,7 +8,8 @@ import {
 } from '../../../../shared/agent-status-child-work-projection'
 import {
   continueMainAgentStatus,
-  isAgentStatusHeldOpenByChildWork
+  isAgentStatusHeldOpenByChildWork,
+  mainAgentTurnInterrupted
 } from '../../../../shared/agent-lead-status-fold'
 import { mainAgentStatusEqual, agentSubagentsEqual } from '../../../../shared/agent-status-types'
 import { structuredAgentSessionPaneKey } from '../../../../shared/structured-agent-session-projection'
@@ -46,18 +47,30 @@ export function useStructuredAgentSessionStatusSummary(
   return { summary, observation }
 }
 
-/** Only the host's startup phase, so a chat re-renders when that changes, not on every status. */
-export function useStructuredAgentSessionHostExecutionPhase(
+/** The host's child state, projected to stable primitives so journal updates do not re-render chat. */
+export function useStructuredAgentSessionHostExecution(
   sessionId: string,
   target: RuntimeClientTarget
-): NonNullable<AgentSessionStatusSummary['hostExecutionPhase']> | null {
+): {
+  phase: NonNullable<AgentSessionStatusSummary['hostExecutionPhase']> | null
+  childKey: string | number | null
+} {
   const feed = useMemo(() => getStructuredAgentSessionStatusFeed(target), [target])
   useEffect(() => feed.activate(), [feed])
-  return useSyncExternalStore(
+  const phase = useSyncExternalStore(
     feed.subscribe,
     () => feed.getSnapshot().get(sessionId)?.hostExecutionPhase ?? null,
     () => null
   )
+  const childKey = useSyncExternalStore(
+    feed.subscribe,
+    () => {
+      const child = feed.getSnapshot().get(sessionId)?.hostExecutionChild
+      return child?.generation ?? child?.fence ?? null
+    },
+    () => null
+  )
+  return { phase, childKey }
 }
 
 function projectStatus(
@@ -98,6 +111,8 @@ function projectStatus(
     state: agentStatus.state,
     ...(agentStatus.workingMode ? { workingMode: agentStatus.workingMode } : {}),
     mainAgent,
+    // Derived from `mainAgent`, so the equality below needs no second check of it.
+    interrupted: mainAgentTurnInterrupted(mainAgent),
     prompt: summary.latestPrompt,
     agentType: tab.agentSessionAgent,
     // The host projects these from the journal so the row reads like a hook-reported one:
diff --git a/src/renderer/src/components/native-chat/agent-session-write-notice-text.test.ts b/src/renderer/src/components/native-chat/agent-session-write-notice-text.test.ts
new file mode 100644
index 000000000000..260c910d01e2
--- /dev/null
+++ b/src/renderer/src/components/native-chat/agent-session-write-notice-text.test.ts
@@ -0,0 +1,41 @@
+import { afterEach, describe, expect, it } from 'vitest'
+import { i18n } from '@/i18n/i18n'
+import en from '@/i18n/locales/en.json'
+import { agentSessionWriteNoticeEnglish } from '../../../../shared/agent-session-refusal-notice'
+import {
+  AGENT_SESSION_WRITE_NOTICE_COPY,
+  type AgentSessionWriteNoticeSentence
+} from '../../../../shared/agent-session-write-notice-copy'
+import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
+
+const SENTENCES = Object.keys(AGENT_SESSION_WRITE_NOTICE_COPY).filter(
+  (key): key is AgentSessionWriteNoticeSentence => key in AGENT_SESSION_WRITE_NOTICE_COPY
+)
+
+afterEach(async () => {
+  await i18n.changeLanguage('en')
+})
+
+describe('desktop words for a write that did not happen', () => {
+  it('says exactly what the phone says in English', () => {
+    for (const sentence of SENTENCES) {
+      expect(agentSessionWriteNoticeText([sentence])).toBe(
+        agentSessionWriteNoticeEnglish([sentence])
+      )
+    }
+  })
+
+  it('keeps the English catalog in step with the shared copy', () => {
+    expect(en.components['native-chat'].writeNotice).toEqual(AGENT_SESSION_WRITE_NOTICE_COPY)
+  })
+
+  it('translates each sentence whole and shows a provider reason as written', async () => {
+    await i18n.changeLanguage('fr')
+    expect(agentSessionWriteNoticeText(['restartFailed', 'notDoneSend'])).toBe(
+      "L'agent n'a pas pu redémarrer. Votre message n'a pas été envoyé."
+    )
+    expect(
+      agentSessionWriteNoticeText([{ text: 'Claude messages support at most 20 images' }])
+    ).toBe('Claude messages support at most 20 images')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/agent-session-write-notice-text.ts b/src/renderer/src/components/native-chat/agent-session-write-notice-text.ts
new file mode 100644
index 000000000000..812197d6e336
--- /dev/null
+++ b/src/renderer/src/components/native-chat/agent-session-write-notice-text.ts
@@ -0,0 +1,124 @@
+// Desktop words for a chat write that did not happen: each sentence translated whole, with the
+// shared English as its fallback so desktop and mobile never say it differently.
+
+import { translate } from '@/i18n/i18n'
+import { agentSessionWriteNoticeParts } from '../../../../shared/agent-session-refusal-notice'
+import {
+  AGENT_SESSION_WRITE_NOTICE_COPY as COPY,
+  type AgentSessionWriteNoticePart,
+  type AgentSessionWriteNoticeSentence
+} from '../../../../shared/agent-session-write-notice-copy'
+import type {
+  AgentSessionWriteFailure,
+  AgentSessionWriteKind
+} from '../../../../shared/agent-session-write-failure'
+
+const SENTENCES: Record<AgentSessionWriteNoticeSentence, () => string> = {
+  notDoneReadHistory: () =>
+    translate('components.native-chat.writeNotice.notDoneReadHistory', COPY.notDoneReadHistory),
+  notDoneSend: () => translate('components.native-chat.writeNotice.notDoneSend', COPY.notDoneSend),
+  tryAgainComposerSend: () =>
+    translate('components.native-chat.writeNotice.tryAgainComposerSend', COPY.tryAgainComposerSend),
+  notDoneStop: () => translate('components.native-chat.writeNotice.notDoneStop', COPY.notDoneStop),
+  notDoneStopTask: () =>
+    translate('components.native-chat.writeNotice.notDoneStopTask', COPY.notDoneStopTask),
+  notDoneStopTasks: () =>
+    translate('components.native-chat.writeNotice.notDoneStopTasks', COPY.notDoneStopTasks),
+  notDoneAnswer: () =>
+    translate('components.native-chat.writeNotice.notDoneAnswer', COPY.notDoneAnswer),
+  notDoneOption: () =>
+    translate('components.native-chat.writeNotice.notDoneOption', COPY.notDoneOption),
+  notDoneCommand: () =>
+    translate('components.native-chat.writeNotice.notDoneCommand', COPY.notDoneCommand),
+  notDoneGoal: () => translate('components.native-chat.writeNotice.notDoneGoal', COPY.notDoneGoal),
+  restartFailed: () =>
+    translate('components.native-chat.writeNotice.restartFailed', COPY.restartFailed),
+  capacity: () => translate('components.native-chat.writeNotice.capacity', COPY.capacity),
+  outcomeUnknown: () =>
+    translate('components.native-chat.writeNotice.outcomeUnknown', COPY.outcomeUnknown),
+  questionChanged: () =>
+    translate('components.native-chat.writeNotice.questionChanged', COPY.questionChanged),
+  historyUnreadable: () =>
+    translate('components.native-chat.writeNotice.historyUnreadable', COPY.historyUnreadable),
+  historyUnusable: () =>
+    translate('components.native-chat.writeNotice.historyUnusable', COPY.historyUnusable),
+  historyUnavailable: () =>
+    translate('components.native-chat.writeNotice.historyUnavailable', COPY.historyUnavailable),
+  unsupported: () => translate('components.native-chat.writeNotice.unsupported', COPY.unsupported),
+  unreachable: () => translate('components.native-chat.writeNotice.unreachable', COPY.unreachable),
+  recordFailed: () =>
+    translate('components.native-chat.writeNotice.recordFailed', COPY.recordFailed),
+  conversationCleared: () =>
+    translate('components.native-chat.writeNotice.conversationCleared', COPY.conversationCleared),
+  openCurrentConversation: () =>
+    translate(
+      'components.native-chat.writeNotice.openCurrentConversation',
+      COPY.openCurrentConversation
+    ),
+  clearUnfinished: () =>
+    translate('components.native-chat.writeNotice.clearUnfinished', COPY.clearUnfinished),
+  commandRunning: () =>
+    translate('components.native-chat.writeNotice.commandRunning', COPY.commandRunning),
+  waitForCommand: () =>
+    translate('components.native-chat.writeNotice.waitForCommand', COPY.waitForCommand),
+  agentStarting: () =>
+    translate('components.native-chat.writeNotice.agentStarting', COPY.agentStarting),
+  waitForStart: () =>
+    translate('components.native-chat.writeNotice.waitForStart', COPY.waitForStart),
+  turnActive: () => translate('components.native-chat.writeNotice.turnActive', COPY.turnActive),
+  waitForTurn: () => translate('components.native-chat.writeNotice.waitForTurn', COPY.waitForTurn),
+  promptPending: () =>
+    translate('components.native-chat.writeNotice.promptPending', COPY.promptPending),
+  answerFirst: () => translate('components.native-chat.writeNotice.answerFirst', COPY.answerFirst),
+  backgroundTasksRunning: () =>
+    translate(
+      'components.native-chat.writeNotice.backgroundTasksRunning',
+      COPY.backgroundTasksRunning
+    ),
+  waitForBackgroundTasks: () =>
+    translate(
+      'components.native-chat.writeNotice.waitForBackgroundTasks',
+      COPY.waitForBackgroundTasks
+    ),
+  messagesUnsettled: () =>
+    translate('components.native-chat.writeNotice.messagesUnsettled', COPY.messagesUnsettled),
+  settleEarlierMessage: () =>
+    translate('components.native-chat.writeNotice.settleEarlierMessage', COPY.settleEarlierMessage),
+  optionRejected: () =>
+    translate('components.native-chat.writeNotice.optionRejected', COPY.optionRejected),
+  goalsUnsupported: () =>
+    translate('components.native-chat.writeNotice.goalsUnsupported', COPY.goalsUnsupported),
+  agentRefused: () =>
+    translate('components.native-chat.writeNotice.agentRefused', COPY.agentRefused),
+  ownerUnproven: () =>
+    translate('components.native-chat.writeNotice.ownerUnproven', COPY.ownerUnproven),
+  reopenChat: () => translate('components.native-chat.writeNotice.reopenChat', COPY.reopenChat),
+  terminalAgentHoldsChat: () =>
+    translate(
+      'components.native-chat.writeNotice.terminalAgentHoldsChat',
+      COPY.terminalAgentHoldsChat
+    ),
+  quitTerminalAgent: () =>
+    translate('components.native-chat.writeNotice.quitTerminalAgent', COPY.quitTerminalAgent),
+  hostReconciling: () =>
+    translate('components.native-chat.writeNotice.hostReconciling', COPY.hostReconciling),
+  waitMoment: () => translate('components.native-chat.writeNotice.waitMoment', COPY.waitMoment),
+  recordUnreadable: () =>
+    translate('components.native-chat.writeNotice.recordUnreadable', COPY.recordUnreadable),
+  chatNotFound: () =>
+    translate('components.native-chat.writeNotice.chatNotFound', COPY.chatNotFound),
+  startNewChat: () =>
+    translate('components.native-chat.writeNotice.startNewChat', COPY.startNewChat),
+  tryAgain: () => translate('components.native-chat.writeNotice.tryAgain', COPY.tryAgain)
+}
+
+export function agentSessionWriteNoticeText(parts: readonly AgentSessionWriteNoticePart[]): string {
+  return parts.map((part) => (typeof part === 'string' ? SENTENCES[part]() : part.text)).join(' ')
+}
+
+export function agentSessionWriteFailureText(
+  failure: AgentSessionWriteFailure,
+  write: AgentSessionWriteKind
+): string {
+  return agentSessionWriteNoticeText(agentSessionWriteNoticeParts(failure, write))
+}
diff --git a/src/renderer/src/components/native-chat/background-task-header-content.ts b/src/renderer/src/components/native-chat/background-task-header-content.ts
index 0ec1c765e1f8..acbd97cb5431 100644
--- a/src/renderer/src/components/native-chat/background-task-header-content.ts
+++ b/src/renderer/src/components/native-chat/background-task-header-content.ts
@@ -166,8 +166,8 @@ export function backgroundTasksHeaderContent(
         : kindCountLabel(group.kind, 1)
     // A still-growing clock on finished work would lie, exactly as on the row.
     const elapsed =
-      group.kind === 'command' && !entry.settled
-        ? backgroundTaskElapsedLabel(entry.task, options.now)
+      group.kind === 'command' && !entry.row.settled
+        ? backgroundTaskElapsedLabel(entry.row.firstObservedAt, options.now)
         : null
     return {
       segments: [{ text: subject, kind: group.kind }],
diff --git a/src/renderer/src/components/native-chat/background-task-roster.test.ts b/src/renderer/src/components/native-chat/background-task-roster.test.ts
index eb2232056a7b..f4159632c692 100644
--- a/src/renderer/src/components/native-chat/background-task-roster.test.ts
+++ b/src/renderer/src/components/native-chat/background-task-roster.test.ts
@@ -172,8 +172,8 @@ describe('buildBackgroundTaskGroups', () => {
       [agent('settled', { state: 'done', startedAt: 0 })]
     )
     expect(built.map((group) => group.kind)).toEqual(['agent', 'monitor'])
-    expect(built[0].tasks.map((entry) => entry.task.id)).toEqual(['settled', 'early', 'late'])
-    expect(built[0].tasks[0].settled).toBe(true)
+    expect(built[0].tasks.map((entry) => entry.row.id)).toEqual(['settled', 'early', 'late'])
+    expect(built[0].tasks[0].row.settled).toBe(true)
   })
 
   it('defaults the state slot so a stateless row still reads as work', () => {
@@ -234,9 +234,19 @@ describe('resumed tasks from mixed-version hosts', () => {
       [live, ...shells],
       [settled, agent('sibling', { state: 'done' })]
     )
-    expect(
-      groups.flatMap((group) => group.tasks).filter((entry) => entry.task.id === live.id)
-    ).toEqual([{ task: live, settled: false, state: 'working', name: 'Background agent' }])
+    const owners = groups
+      .flatMap((group) => group.tasks)
+      .filter((entry) => entry.row.id === live.id)
+    expect(owners).toHaveLength(1)
+    expect(owners[0]).toMatchObject({
+      row: {
+        settled: false,
+        displayState: 'working',
+        name: 'Background agent',
+        totalTokens: 20000
+      },
+      state: 'working'
+    })
     expect(backgroundTasksHeaderContent(groups, { narrow: false, now: NOW }).segments).toEqual([
       { text: '2 agents', kind: 'agent' },
       { text: '4 shells', kind: 'command' }
diff --git a/src/renderer/src/components/native-chat/background-task-roster.ts b/src/renderer/src/components/native-chat/background-task-roster.ts
index 4b1c290e9444..7b62bb1f57c8 100644
--- a/src/renderer/src/components/native-chat/background-task-roster.ts
+++ b/src/renderer/src/components/native-chat/background-task-roster.ts
@@ -6,6 +6,15 @@ import type {
   AgentSessionBackgroundTask,
   AgentSessionBackgroundTaskRunState
 } from '../../../../shared/agent-session-wire'
+import {
+  buildAgentChildRowModels,
+  buildLegacyTaskRowModels,
+  usableAgentChildLabel,
+  type AgentChildRowContext,
+  type AgentChildRowModel
+} from '../../../../shared/agent-child-row-model'
+import { agentChildRunStateFor } from '../../../../shared/agent-status-child-work-display'
+import type { AgentChildWorkView } from '../../../../shared/agent-status-child-work-view'
 import { formatNativeChatDuration } from '../../../../shared/native-chat-turn-status'
 import { translate } from '@/i18n/i18n'
 
@@ -13,10 +22,10 @@ type TaskKind = AgentSessionBackgroundTask['kind']
 type RunState = AgentSessionBackgroundTaskRunState
 
 export type BackgroundRosterTask = {
-  task: AgentSessionBackgroundTask
-  settled: boolean
+  /** What the row shows, decided by the same model the sidebar's child rows use. */
+  row: AgentChildRowModel
+  /** The row's display state in the header's vocabulary. */
   state: RunState
-  name: string
 }
 
 export type BackgroundTaskGroup = { kind: TaskKind; tasks: BackgroundRosterTask[] }
@@ -24,17 +33,6 @@ export type BackgroundTaskGroup = { kind: TaskKind; tasks: BackgroundRosterTask[
 /** Fixed presentation order; groups render only when non-empty. */
 const KIND_ORDER: readonly TaskKind[] = ['agent', 'command', 'monitor', 'workflow', 'unknown']
 
-/** Provider strings that carry no identity; a row falls through to its kind label. */
-const PLACEHOLDER_NAMES = new Set(['unknown', 'untitled', 'task', 'subagent'])
-
-function usableTaskText(value: string | undefined): string | null {
-  const trimmed = value?.trim()
-  if (!trimmed || PLACEHOLDER_NAMES.has(trimmed.toLowerCase())) {
-    return null
-  }
-  return trimmed
-}
-
 export function backgroundTaskKindLabel(kind: TaskKind): string {
   switch (kind) {
     case 'agent':
@@ -50,56 +48,63 @@ export function backgroundTaskKindLabel(kind: TaskKind): string {
   }
 }
 
-/** Display name: description → name → kind label. Empty-after-trim and
- *  placeholder values fall through, so a row always renders something. */
+/** The transcript row's name: description → name → kind label. Empty-after-trim and
+ *  placeholder values fall through, so the row always renders something. */
 export function resolveBackgroundTaskName(task: AgentSessionBackgroundTask): string {
   return (
-    usableTaskText(task.description) ??
-    usableTaskText(task.name) ??
+    usableAgentChildLabel(task.description) ??
+    usableAgentChildLabel(task.name) ??
     backgroundTaskKindLabel(task.kind)
   )
 }
 
-function effectiveState(task: AgentSessionBackgroundTask, settled: boolean): RunState {
-  if (task.state) {
-    return task.state
-  }
-  if (settled) {
-    return 'done'
-  }
-  return task.kind === 'monitor' ? 'monitoring' : 'working'
+/** Stable-sort first-seen then id, so a live update never reshuffles surviving rows. */
+function groupRosterEntries(entries: BackgroundRosterTask[]): BackgroundTaskGroup[] {
+  entries.sort((left, right) => {
+    const startDelta = left.row.firstObservedAt - right.row.firstObservedAt
+    return startDelta !== 0 ? startDelta : left.row.id < right.row.id ? -1 : 1
+  })
+  return KIND_ORDER.map((kind) => ({
+    kind,
+    tasks: entries.filter((entry) => entry.row.kind === kind)
+  })).filter((group) => group.tasks.length > 0)
 }
 
-/** Merge live and settled tasks into kind groups, stable-sorted first-seen
- *  (startedAt) then id, so a live update never reshuffles surviving rows. */
+function rosterEntries(rows: readonly AgentChildRowModel[]): BackgroundTaskGroup[] {
+  return groupRosterEntries(
+    rows.map((row) => ({ row, state: agentChildRunStateFor(row.displayState) }))
+  )
+}
+
+/** Kind groups from a host that publishes only the task roster, live and settled merged. */
 export function buildBackgroundTaskGroups(
   tasks: readonly AgentSessionBackgroundTask[],
   settledTasks: readonly AgentSessionBackgroundTask[]
 ): BackgroundTaskGroup[] {
-  // Older hosts can retain a previous turn beside its resumed live task.
-  const owners = new Map<string, BackgroundRosterTask>()
-  for (const [roster, settled] of [
-    [settledTasks, true],
-    [tasks, false]
-  ] as const) {
-    for (const task of roster) {
-      owners.set(task.id, {
-        task,
-        settled,
-        state: effectiveState(task, settled),
-        name: resolveBackgroundTaskName(task)
-      })
-    }
-  }
-  const entries = [...owners.values()]
-  entries.sort((left, right) => {
-    const startDelta = (left.task.startedAt ?? 0) - (right.task.startedAt ?? 0)
-    return startDelta !== 0 ? startDelta : left.task.id < right.task.id ? -1 : 1
-  })
-  return KIND_ORDER.map((kind) => ({
-    kind,
-    tasks: entries.filter((entry) => entry.task.kind === kind)
-  })).filter((group) => group.tasks.length > 0)
+  // An old host's unlabeled row keeps the kind label it always showed; a view row reads its state.
+  return rosterEntries(
+    buildLegacyTaskRowModels(tasks, settledTasks).map((row) =>
+      row.name ? row : { ...row, name: backgroundTaskKindLabel(row.kind) }
+    )
+  )
+}
+
+// Until a caller passes the session's parent-row context, every live claim stands as reported.
+const REPORTED_ROW_CONTEXT: AgentChildRowContext = {
+  parentEvidenceFresh: true,
+  transportObservation: 'live',
+  parentObservedAt: 0,
+  hostClockOffsetMs: 0
+}
+
+/** Kind groups from the host's child views: the main agent's work at the top, each child's own
+ *  work nested beneath it rather than counted again in its kind's group. Pass the context the
+ *  sidebar builds for the same parent (`agentChildRowContextForParent`) so both read one verdict. */
+export function buildBackgroundTaskGroupsFromViews(
+  views: readonly AgentChildWorkView[],
+  context: AgentChildRowContext = REPORTED_ROW_CONTEXT
+): BackgroundTaskGroup[] {
+  return rosterEntries(buildAgentChildRowModels(views, context))
 }
 
 export function backgroundTaskStateWord(state: RunState): string {
@@ -155,14 +160,26 @@ export function formatBackgroundTaskTokens(totalTokens: number): string {
     : `${tokenScaleText(Math.round(totalTokens / 100_000) / 10)}m`
 }
 
-export function backgroundTaskElapsedLabel(
-  task: AgentSessionBackgroundTask,
-  now: number
-): string | null {
-  if (task.startedAt === undefined || task.startedAt <= 0) {
+export function backgroundTaskElapsedLabel(startedAt: number, now: number): string | null {
+  if (startedAt <= 0) {
     return null
   }
-  return formatNativeChatDuration((now - task.startedAt) / 1000)
+  return formatNativeChatDuration((now - startedAt) / 1000)
+}
+
+/** Whether a row's elapsed time moves: only live work's does. */
+export function backgroundTaskRowTicks(row: AgentChildRowModel): boolean {
+  return !row.settled && row.firstObservedAt > 0
+}
+
+/** A live row's clock runs; a settled row's stops where it settled, so finished work never ticks. */
+export function backgroundTaskRowElapsedLabel(row: AgentChildRowModel, now: number): string | null {
+  if (!row.settled) {
+    return backgroundTaskElapsedLabel(row.firstObservedAt, now)
+  }
+  return row.settledAt !== undefined
+    ? backgroundTaskElapsedLabel(row.firstObservedAt, row.settledAt)
+    : null
 }
 
 export function backgroundTaskGroupLabel(kind: TaskKind): string {
diff --git a/src/renderer/src/components/native-chat/claude-model-switch-confirmation.ts b/src/renderer/src/components/native-chat/claude-model-switch-confirmation.ts
index eedf8506e1c6..334e4639add8 100644
--- a/src/renderer/src/components/native-chat/claude-model-switch-confirmation.ts
+++ b/src/renderer/src/components/native-chat/claude-model-switch-confirmation.ts
@@ -147,7 +147,7 @@ export function createClaudeModelSwitchConfirmationObserver(args: {
         // exact Claude warning defaults to “Yes” and needs only one Enter.
         const accepted = args.submitConfirmation
           ? args.submitConfirmation() !== false
-          : sendRuntimePtyInput(args.settings, args.ptyId, NATIVE_CHAT_SUBMIT)
+          : sendRuntimePtyInput(args.settings, args.ptyId, NATIVE_CHAT_SUBMIT, 'driving')
         if (!accepted) {
           finish('unknown')
           return
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/AgentComposer.tsx b/src/renderer/src/components/native-chat/fork-agent-composer/AgentComposer.tsx
index cde46d7f5420..8ce222f260ea 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/AgentComposer.tsx
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/AgentComposer.tsx
@@ -57,6 +57,7 @@ export type AgentComposerCoreState = {
   imeEnterGesture: ReturnType<typeof useImeEnterGestureOwnership>
   draft: string
   setDraft: (next: string | ((previous: string) => string)) => void
+  flushDraftAppends: () => void
   caret: number
   setCaret: Dispatch<SetStateAction<number>>
   history: HistoryState
@@ -89,12 +90,15 @@ export function useAgentComposerCoreState(props: AgentComposerCoreProps): AgentC
     onStop,
     onOptimisticSendCanceled
   } = props
-  const { draft, setDraft } = useAgentComposerDraft(paneKey)
+  const imeEnterGesture = useImeEnterGestureOwnership()
+  const { draft, setDraft, flushDraftAppends } = useAgentComposerDraft(
+    paneKey,
+    imeEnterGesture.isComposing
+  )
   const [caret, setCaret] = useState(draft.length)
   const { history, setHistory } = useAgentComposerHistory(paneKey)
   const [activeSuggestion, setActiveSuggestion] = useState(0)
   const [notice, setNotice] = useState<string | null>(null)
-  const imeEnterGesture = useImeEnterGestureOwnership()
   // Why: v1.4.200 widened the app-menu ref to NativeChatComposerInput for upstream's
   // contenteditable editor. This composer's field is a real <textarea>, so the ref
   // only ever holds one, and the overlay and scroll sync need the element itself.
@@ -156,7 +160,7 @@ export function useAgentComposerCoreState(props: AgentComposerCoreProps): AgentC
     if (!target) {
       return
     }
-    sendRuntimePtyInput(target.settings, target.ptyId, ESC)
+    sendRuntimePtyInput(target.settings, target.ptyId, ESC, 'driving')
   }, [cancelPendingSends, isWorking, onStop, resolveTarget])
 
   return {
@@ -164,6 +168,7 @@ export function useAgentComposerCoreState(props: AgentComposerCoreProps): AgentC
     imeEnterGesture,
     draft,
     setDraft,
+    flushDraftAppends,
     caret,
     setCaret,
     history,
@@ -370,6 +375,7 @@ export function useAgentComposerCompose(
       if (element.value !== core.draft) {
         handleDraftChange(element.value, element)
       }
+      core.flushDraftAppends()
       bridges?.flushPendingAttachments?.()
     },
     onPaste: (event) => handlePasteEvent(event),
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/AgentComposerActions.tsx b/src/renderer/src/components/native-chat/fork-agent-composer/AgentComposerActions.tsx
index 08d755e56cc2..9f0831cc67d9 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/AgentComposerActions.tsx
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/AgentComposerActions.tsx
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/components/native-chat/NativeChatComposerActions.tsx
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 import { ArrowUp, Mic, Plus, Square } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/AgentComposerField.tsx b/src/renderer/src/components/native-chat/fork-agent-composer/AgentComposerField.tsx
index 34786d711c27..83b85cadabf7 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/AgentComposerField.tsx
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/AgentComposerField.tsx
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/components/native-chat/NativeChatComposerField.tsx
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 import type { ClipboardEventHandler, KeyboardEventHandler, RefObject } from 'react'
 import { useLayoutEffect, useRef } from 'react'
 import type { useImeEnterGestureOwnership } from '@/lib/ime-composition-keyboard-event'
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/agent-composer-autogrow.test.tsx b/src/renderer/src/components/native-chat/fork-agent-composer/agent-composer-autogrow.test.tsx
index 8bfdc15fdc76..4e91b3489e1c 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/agent-composer-autogrow.test.tsx
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/agent-composer-autogrow.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 // FORK-COPY-OF: src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 
 /** The composer grows with the draft up to 8 lines, then scrolls internally.
  *  Sizing is layout-driven (field-sizing + an lh-relative cap) rather than a JS
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/agent-composer-draft-cache.ts b/src/renderer/src/components/native-chat/fork-agent-composer/agent-composer-draft-cache.ts
index 74006f5e0d65..1c7c873041f8 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/agent-composer-draft-cache.ts
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/agent-composer-draft-cache.ts
@@ -6,6 +6,11 @@
 // mirrors agent-composer-history-cache's subscribe/notify shape, since the dock
 // and native-chat view can both hold a live mount against the same pane.
 
+import {
+  clearNativeChatDraftCacheForTests,
+  readNativeChatDraftCache,
+  writeNativeChatDraftCache
+} from '../native-chat-draft-cache'
 import { createSubscribableScopeCache } from './agent-composer-scope-cache'
 
 const draftCache = createSubscribableScopeCache<string>({
@@ -14,7 +19,27 @@ const draftCache = createSubscribableScopeCache<string>({
 })
 
 export const readAgentComposerDraftCache = draftCache.read
-export const writeAgentComposerDraftCache = draftCache.write
+
+/**
+ * Also mirrors the draft into upstream's native-chat draft cache, which is where a
+ * withdrawn structured send is appended back (`appendNativeChatDraftCache`), so that
+ * append lands after what is actually typed.
+ */
+export function writeAgentComposerDraftCache(scopeKey: string, draft: string): void {
+  writeNativeChatDraftCache(scopeKey, draft)
+  draftCache.write(scopeKey, draft)
+}
+
+/**
+ * Adopts text appended to the native-chat cache while no composer for `scopeKey`
+ * was mounted to hear it. Every fork write mirrors there, so the two differ only then.
+ */
+export function adoptNativeChatDraftAppends(scopeKey: string): void {
+  const appended = readNativeChatDraftCache(scopeKey)
+  if (appended !== '' && appended !== draftCache.read(scopeKey)) {
+    draftCache.write(scopeKey, appended)
+  }
+}
 
 /**
  * Subscribes to writes for `scopeKey`. Fires once immediately with the
@@ -24,4 +49,7 @@ export const writeAgentComposerDraftCache = draftCache.write
  */
 export const subscribeAgentComposerDraftCache = draftCache.subscribe
 
-export const clearAgentComposerDraftCacheForTests = draftCache.clearForTests
+export function clearAgentComposerDraftCacheForTests(): void {
+  draftCache.clearForTests()
+  clearNativeChatDraftCacheForTests()
+}
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-ask-answer-send.ts b/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-ask-answer-send.ts
index 407a9b5db251..79310111e022 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-ask-answer-send.ts
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-ask-answer-send.ts
@@ -43,11 +43,12 @@ export function sendNativeChatAskAnswer(
               target.settings,
               target.ptyId,
               bytes,
+              'driving',
               () => cancelled
             ).catch(() => false)
           )
         } else {
-          sendRuntimePtyInput(target.settings, target.ptyId, bytes)
+          sendRuntimePtyInput(target.settings, target.ptyId, bytes, 'driving')
         }
       }, index * NATIVE_CHAT_QUESTION_STEP_MS)
     )
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-runtime-clear.ts b/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-runtime-clear.ts
index ccbe88f970df..662fc8fe6390 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-runtime-clear.ts
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-runtime-clear.ts
@@ -41,7 +41,7 @@ export function clearUnsubmittedAgentInput(
   const [first = '', ...rest] = splitClearBurst(
     options?.clearInput ?? NATIVE_CHAT_CLEAR_UNSUBMITTED_INPUT
   )
-  sendRuntimePtyInput(settings, ptyId, first)
+  sendRuntimePtyInput(settings, ptyId, first, 'driving')
   return new Promise<void>((resolve) => {
     if (rest.length === 0) {
       resolve()
@@ -50,7 +50,7 @@ export function clearUnsubmittedAgentInput(
     rest.forEach((chunk, index) => {
       delay((index + 1) * NATIVE_CHAT_CLEAR_CHUNK_GAP_MS, () => {
         try {
-          sendRuntimePtyInput(settings, ptyId, chunk)
+          sendRuntimePtyInput(settings, ptyId, chunk, 'driving')
         } finally {
           if (index === rest.length - 1) {
             resolve()
@@ -75,12 +75,15 @@ function sendClearBurstAccepted(
         accepted
           ? new Promise<boolean>((resolve, reject) => {
               delay(NATIVE_CHAT_CLEAR_CHUNK_GAP_MS, () => {
-                sendRuntimePtyInputAcceptance(settings, ptyId, chunk).then(resolve, reject)
+                sendRuntimePtyInputAcceptance(settings, ptyId, chunk, 'driving').then(
+                  resolve,
+                  reject
+                )
               })
             })
           : false
       ),
-    sendRuntimePtyInputAcceptance(settings, ptyId, first)
+    sendRuntimePtyInputAcceptance(settings, ptyId, first, 'driving')
   )
 }
 
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-runtime-send-acceptance.ts b/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-runtime-send-acceptance.ts
index c3f839e1fbf9..6efa6faa9ad7 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-runtime-send-acceptance.ts
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-runtime-send-acceptance.ts
@@ -25,7 +25,7 @@ export function sendBodyAccepted(
         if (!ok || isCancelled()) {
           return false
         }
-        return sendRuntimePtyInputAcceptance(settings, ptyId, bytes, isCancelled)
+        return sendRuntimePtyInputAcceptance(settings, ptyId, bytes, 'driving', isCancelled)
       }),
     Promise.resolve(true)
   )
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-runtime-send-queued.ts b/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-runtime-send-queued.ts
index 874bb4329a92..e925e67048c2 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-runtime-send-queued.ts
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-runtime-send-queued.ts
@@ -41,6 +41,7 @@ export function sendNativeChatMessageVerifiedQueued(
           target.settings,
           target.ptyId,
           buildNativeChatPasteBytes(text),
+          'driving',
           () => isCancelled() || signal?.aborted === true
         )
           .then((bodyAccepted) => {
@@ -57,6 +58,7 @@ export function sendNativeChatMessageVerifiedQueued(
                 target.settings,
                 target.ptyId,
                 NATIVE_CHAT_SUBMIT,
+                'driving',
                 () => isCancelled() || signal?.aborted === true
               )
                 .then((sent) => {
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-send-outcome.ts b/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-send-outcome.ts
index c1e9c0d9f04b..3378f1197727 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-send-outcome.ts
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-send-outcome.ts
@@ -118,7 +118,7 @@ export async function submitAndObserve(
 ): Promise<void> {
   let sent = true
   try {
-    sent = await sendRuntimePtyInputAcceptance(settings, ptyId, NATIVE_CHAT_SUBMIT)
+    sent = await sendRuntimePtyInputAcceptance(settings, ptyId, NATIVE_CHAT_SUBMIT, 'driving')
   } catch {
     sent = false
   } finally {
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-typed-command-send.ts b/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-typed-command-send.ts
index cb6d6c38c5d4..4e3379dcbd78 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-typed-command-send.ts
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/native-chat-typed-command-send.ts
@@ -49,6 +49,7 @@ export async function typeNativeChatCommand(
           target.settings,
           target.ptyId,
           key,
+          'driving',
           () => invalidated || signal?.aborted === true
         ))
           ? 'accepted'
@@ -92,6 +93,7 @@ export function sendNativeChatTypedCommand(
             target.settings,
             target.ptyId,
             key,
+            'driving',
             () => isCancelled() || controller.signal.aborted
           ))
             ? 'accepted'
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-draft.test.tsx b/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-draft.test.tsx
index e236330496e9..abeb398522df 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-draft.test.tsx
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-draft.test.tsx
@@ -6,6 +6,7 @@ import {
   clearAgentComposerDraftCacheForTests,
   subscribeAgentComposerDraftCache
 } from './agent-composer-draft-cache'
+import { appendNativeChatDraftCache, readNativeChatDraftCache } from '../native-chat-draft-cache'
 import { useAgentComposerDraft } from './use-agent-composer-draft'
 
 afterEach(() => {
@@ -81,3 +82,55 @@ describe('useAgentComposerDraft', () => {
     expect(mountB.result.current.draft).toBe('from B + from A')
   })
 })
+
+// The withdrawn-message restore is upstream code that appends through the native-chat cache.
+describe('useAgentComposerDraft with text put back from outside the composer', () => {
+  it('shows appended text after the draft, once across every mount', () => {
+    const mountA = renderHook(() => useAgentComposerDraft('pane-append'))
+    const mountB = renderHook(() => useAgentComposerDraft('pane-append'))
+    act(() => mountA.result.current.setDraft('typed'))
+
+    act(() => appendNativeChatDraftCache('pane-append', 'withdrawn'))
+
+    expect(mountA.result.current.draft).toBe('typed\n\nwithdrawn')
+    expect(mountB.result.current.draft).toBe('typed\n\nwithdrawn')
+  })
+
+  it('holds text appended mid-composition until the composition is flushed', () => {
+    let composing = true
+    const mount = renderHook(() => useAgentComposerDraft('pane-ime', () => composing))
+    act(() => mount.result.current.setDraft('ab'))
+
+    act(() => appendNativeChatDraftCache('pane-ime', 'withdrawn'))
+    act(() => mount.result.current.setDraft('ab가'))
+    expect(mount.result.current.draft).toBe('ab가')
+
+    composing = false
+    act(() => mount.result.current.flushDraftAppends())
+    act(() => mount.result.current.flushDraftAppends())
+    expect(mount.result.current.draft).toBe('ab가\n\nwithdrawn')
+    expect(readNativeChatDraftCache('pane-ime')).toBe('ab가\n\nwithdrawn')
+  })
+
+  it('keeps held text when the composer unmounts mid-composition', () => {
+    const mount = renderHook(() => useAgentComposerDraft('pane-ime-unmount', () => true))
+    act(() => mount.result.current.setDraft('ab'))
+    act(() => appendNativeChatDraftCache('pane-ime-unmount', 'withdrawn'))
+
+    mount.unmount()
+
+    const next = renderHook(() => useAgentComposerDraft('pane-ime-unmount'))
+    expect(next.result.current.draft).toBe('ab\n\nwithdrawn')
+  })
+
+  it('adopts text appended while no composer was mounted', () => {
+    const first = renderHook(() => useAgentComposerDraft('pane-away'))
+    act(() => first.result.current.setDraft('typed'))
+    first.unmount()
+
+    appendNativeChatDraftCache('pane-away', 'withdrawn')
+
+    const second = renderHook(() => useAgentComposerDraft('pane-away'))
+    expect(second.result.current.draft).toBe('typed\n\nwithdrawn')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-draft.ts b/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-draft.ts
index d54a8a3d44f5..f5e73899cee1 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-draft.ts
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-draft.ts
@@ -1,10 +1,18 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
 import {
+  appendNativeChatDraftText,
+  readNativeChatDraftCache,
+  subscribeToNativeChatDraftAppend
+} from '../native-chat-draft-cache'
+import {
+  adoptNativeChatDraftAppends,
   readAgentComposerDraftCache,
   subscribeAgentComposerDraftCache,
   writeAgentComposerDraftCache
 } from './agent-composer-draft-cache'
 
+const NEVER_COMPOSING = (): boolean => false
+
 /**
  * Composer draft state backed by the scope cache so a typed-but-unsent message
  * survives the composer unmounting on a TUI/GUI toggle. `scopeKey` is the stable
@@ -12,12 +20,22 @@ import {
  * reused for a different pane) the cached draft is reloaded. Every live mount
  * for a scope key subscribes to the cache, so a write from one mount is
  * reflected in every other concurrently-mounted host on that pane.
+ *
+ * Text appended from outside the composer (a withdrawn structured send) is shown
+ * after the draft; during an IME composition it is held until `flushDraftAppends`.
  */
-export function useAgentComposerDraft(scopeKey: string): {
+export function useAgentComposerDraft(
+  scopeKey: string,
+  isComposing: () => boolean = NEVER_COMPOSING
+): {
   draft: string
   setDraft: (next: string | ((previous: string) => string)) => void
+  /** Shows text appended during an IME composition, which owns the field until it settles. */
+  flushDraftAppends: () => void
 } {
   const [draft, setDraftState] = useState(() => readAgentComposerDraftCache(scopeKey))
+  // Held out of the cache while composing: the composition's own writes would erase it.
+  const pendingAppendRef = useRef<{ scopeKey: string; text: string } | null>(null)
 
   // Reload the cached draft when reused for a different pane (scope change),
   // adjusting state during render rather than in an effect so the restored draft
@@ -28,7 +46,28 @@ export function useAgentComposerDraft(scopeKey: string): {
     setDraftState(readAgentComposerDraftCache(scopeKey))
   }
 
-  useEffect(() => subscribeAgentComposerDraftCache(scopeKey, setDraftState), [scopeKey])
+  useEffect(() => {
+    adoptNativeChatDraftAppends(scopeKey)
+    return subscribeAgentComposerDraftCache(scopeKey, setDraftState)
+  }, [scopeKey])
+
+  useEffect(
+    () =>
+      subscribeToNativeChatDraftAppend(scopeKey, (text) => {
+        if (!isComposing()) {
+          // the native cache already holds draft + text, and adopting it is idempotent across mounts
+          writeAgentComposerDraftCache(scopeKey, readNativeChatDraftCache(scopeKey))
+          return
+        }
+        const pending = pendingAppendRef.current
+        pendingAppendRef.current = {
+          scopeKey,
+          text:
+            pending?.scopeKey === scopeKey ? appendNativeChatDraftText(pending.text, text) : text
+        }
+      }),
+    [isComposing, scopeKey]
+  )
 
   // Persist every mutation through the cache. Accepts the same value/updater
   // forms as a useState setter so call sites are drop-in.
@@ -42,5 +81,28 @@ export function useAgentComposerDraft(scopeKey: string): {
     [scopeKey]
   )
 
-  return { draft, setDraft }
+  const flushDraftAppends = useCallback(() => {
+    const pending = pendingAppendRef.current
+    pendingAppendRef.current = null
+    if (pending?.scopeKey === scopeKey) {
+      setDraft((previous) => appendNativeChatDraftText(previous, pending.text))
+    }
+  }, [scopeKey, setDraft])
+
+  // A composer leaving mid-composition must not take the held text with it.
+  useEffect(
+    () => () => {
+      const pending = pendingAppendRef.current
+      if (pending?.scopeKey === scopeKey) {
+        pendingAppendRef.current = null
+        writeAgentComposerDraftCache(
+          scopeKey,
+          appendNativeChatDraftText(readAgentComposerDraftCache(scopeKey), pending.text)
+        )
+      }
+    },
+    [scopeKey]
+  )
+
+  return { draft, setDraft, flushDraftAppends }
 }
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-keydown.test.tsx b/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-keydown.test.tsx
index fe6bdf2d9719..9be1238f5eac 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-keydown.test.tsx
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-keydown.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 // FORK-COPY-OF: src/renderer/src/components/native-chat/use-native-chat-composer-keydown.test.tsx
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 
 import { renderHook } from '@testing-library/react'
 import { describe, expect, it, vi } from 'vitest'
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-keydown.ts b/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-keydown.ts
index 67fbf865853d..0169d37474b5 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-keydown.ts
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-keydown.ts
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/components/native-chat/use-native-chat-composer-keydown.ts
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 import { useCallback, type Dispatch, type KeyboardEventHandler, type SetStateAction } from 'react'
 import { recallNext, recallPrevious, type HistoryState } from './agent-composer-history'
 import type { ComposerAutocomplete, NativeChatPickerItem } from '../native-chat-composer-state'
diff --git a/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-send.test.tsx b/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-send.test.tsx
index 898f7b32a8fc..f0ca4a04a6d1 100644
--- a/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-send.test.tsx
+++ b/src/renderer/src/components/native-chat/fork-agent-composer/use-agent-composer-send.test.tsx
@@ -84,12 +84,14 @@ describe('useAgentComposerSend (tier-independent retention)', () => {
       {},
       'pty-native-chat',
       buildNativeChatPasteBytes('plain send'),
+      'driving',
       expect.any(Function)
     )
     expect(sendRuntimePtyInputAcceptance).toHaveBeenCalledWith(
       {},
       'pty-native-chat',
-      NATIVE_CHAT_SUBMIT
+      NATIVE_CHAT_SUBMIT,
+      'driving'
     )
     expect(result.current.core.draft).toBe('')
   })
diff --git a/src/renderer/src/components/native-chat/fork-input-quarantine/native-chat-runtime-quarantine.test.ts b/src/renderer/src/components/native-chat/fork-input-quarantine/native-chat-runtime-quarantine.test.ts
index e226c87b045b..bdc01dc90be6 100644
--- a/src/renderer/src/components/native-chat/fork-input-quarantine/native-chat-runtime-quarantine.test.ts
+++ b/src/renderer/src/components/native-chat/fork-input-quarantine/native-chat-runtime-quarantine.test.ts
@@ -125,7 +125,7 @@ describe('native-chat runtime quarantine boundary', () => {
     sendNativeChatAskAnswer(TARGET, [{ raw: '1' }, { raw: '2' }], onSettled)
     await vi.advanceTimersByTimeAsync(0)
     expect(verifiedWriteBytes()).toEqual(['1'])
-    const isCancelled = sendRuntimePtyInputVerified.mock.calls[0]?.[3]
+    const isCancelled = sendRuntimePtyInputVerified.mock.calls[0]?.[4]
     expect(typeof isCancelled).toBe('function')
 
     armTerminalInputQuarantine(TAB)
@@ -144,7 +144,7 @@ describe('native-chat runtime quarantine boundary', () => {
     sendRuntimePtyInputVerified.mockReturnValueOnce(body.promise)
     const pending = sendNativeChatMessageVerified(TARGET, '/model sonnet')
     await vi.advanceTimersByTimeAsync(0)
-    const isCancelled = sendRuntimePtyInputVerified.mock.calls[0]?.[3]
+    const isCancelled = sendRuntimePtyInputVerified.mock.calls[0]?.[4]
     expect(typeof isCancelled).toBe('function')
 
     armTerminalInputQuarantine(TAB)
diff --git a/src/renderer/src/components/native-chat/fork-native-chat-relay/NativeChatConversation.tsx b/src/renderer/src/components/native-chat/fork-native-chat-relay/NativeChatConversation.tsx
index f5c0418076c1..5139a10ec513 100644
--- a/src/renderer/src/components/native-chat/fork-native-chat-relay/NativeChatConversation.tsx
+++ b/src/renderer/src/components/native-chat/fork-native-chat-relay/NativeChatConversation.tsx
@@ -1,48 +1,24 @@
+import type { ComponentProps } from 'react'
 import { NativeChatMessageList } from '../NativeChatMessageList'
 import { NativeChatReadErrorNotice } from './NativeChatReadErrorNotice'
-import type { CommentMarkdownLinkClickHandler } from '@/components/sidebar/CommentMarkdown'
-import type { NativeChatLiveSession } from './use-native-chat-live-session'
+
+type NativeChatConversationProps = Omit<
+  ComponentProps<typeof NativeChatMessageList>,
+  'expandSignal'
+> & {
+  readError?: string
+}
 
 /** The message list plus, when the transcript read is failing, the inline
  *  notice above it. Split out so the view file dispatches surfaces only. */
 export function NativeChatConversation({
-  session,
-  isVisible,
-  isWorking,
-  fontScale,
-  workingStartedAt,
-  showTurnStatus,
-  onLinkClick,
-  allowFileUriLinks,
-  failedDeliveryMessageIds,
-  readError
-}: {
-  session: NativeChatLiveSession
-  isVisible?: boolean
-  isWorking: boolean
-  fontScale: number
-  workingStartedAt?: number | null
-  showTurnStatus?: boolean
-  onLinkClick?: CommentMarkdownLinkClickHandler
-  allowFileUriLinks: boolean
-  failedDeliveryMessageIds?: ReadonlySet<string>
-  readError?: string
-}): React.JSX.Element {
+  readError,
+  ...listProps
+}: NativeChatConversationProps): React.JSX.Element {
   return (
     <>
       {readError ? <NativeChatReadErrorNotice message={readError} /> : null}
-      <NativeChatMessageList
-        session={session}
-        isVisible={isVisible}
-        isWorking={isWorking}
-        expandSignal={false}
-        fontScale={fontScale}
-        workingStartedAt={workingStartedAt}
-        showTurnStatus={showTurnStatus}
-        onLinkClick={onLinkClick}
-        allowFileUriLinks={allowFileUriLinks}
-        failedDeliveryMessageIds={failedDeliveryMessageIds}
-      />
+      <NativeChatMessageList {...listProps} expandSignal={false} />
     </>
   )
 }
diff --git a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-incremental-assembler.ts b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-incremental-assembler.ts
index d6b2e16a3210..95ae98c365ea 100644
--- a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-incremental-assembler.ts
+++ b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-incremental-assembler.ts
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/components/native-chat/native-chat-incremental-assembler.ts
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 // Incremental native-chat assembler. The full `assembleNativeChatSession` does
 // an O(n log n) Map-build + sort on every call; on the hot streaming path the
 // agent emits many small append batches over a growing transcript, so the full
diff --git a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-live-status.ts b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-live-status.ts
index 97310a251d3d..2414bf0a929c 100644
--- a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-live-status.ts
+++ b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-live-status.ts
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/components/native-chat/native-chat-live-status.ts
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 // Pure merge of live hook turn-state into a NativeChatSession status override.
 // Kept separate from the React hook so the precedence rule (live 'working'
 // surfaces before the transcript flushes its explicit terminal record, then is
@@ -61,14 +61,15 @@ export function mergeNativeChatLiveSession(input: NativeChatLiveMergeInput): Nat
   }
 
   const status = liveStatusOverride(
+    agent,
     hookState,
     sources,
     stateStartedAt,
     transcriptLifecycle,
     hookHasWorkingSubagents ?? false
   )
-  // Why live work still wins: 'working' is what drives Stop-vs-Send, the typing
-  // indicator and the streaming preview, so forcing 'loading' over it renders an
+  // Why live work still wins: 'working' is what drives Stop-vs-Send, the turn
+  // status and the streaming preview, so forcing 'loading' over it renders an
   // idle pane while the agent works. A known session with nothing to show yet is
   // held on the loading surface by selectNativeChatViewState instead.
   if (loading && status !== 'working') {
@@ -82,10 +83,36 @@ export function mergeNativeChatLiveSession(input: NativeChatLiveMergeInput): Nat
   })
 }
 
+/**
+ * Whether the agent stopped mid-turn for the reader (`blocked` and `waiting` both mean a human
+ * must decide). Reconciled like 'working': an interrupt at the prompt fires no hook, so only the
+ * transcript's terminal marker can end a wait the hook never cleared.
+ */
+export function nativeChatHookAwaitsInput(
+  hookState: AgentStatusState | null,
+  stateStartedAt: number | null | undefined,
+  transcriptLifecycle: NativeChatTurnLifecycle | undefined
+): boolean {
+  return (
+    (hookState === 'blocked' || hookState === 'waiting') &&
+    !lifecycleTerminatesCurrentTurn(transcriptLifecycle, stateStartedAt)
+  )
+}
+
 /** Slack for comparing transcript timestamps to hook receipt times across hosts. */
 export const LIFECYCLE_CLOCK_SKEW_SLACK_MS = 2_000
 
+/**
+ * Agents whose own runtime reports the turn end: omp posts `agent_end` from inside the agent,
+ * retried until the host takes it and held back while the run continues. Their hook 'working'
+ * is never a dropped Stop, so a trailing assistant row (a tool call mid-run) cannot end it.
+ */
+function hookDeliversTurnEnd(agent: AgentType): boolean {
+  return agent === 'omp'
+}
+
 function liveStatusOverride(
+  agent: AgentType,
   hookState: AgentStatusState | null,
   sources: NativeChatSources,
   stateStartedAt: number | null | undefined,
@@ -119,6 +146,7 @@ function liveStatusOverride(
   // do not settle early on capable providers.
   if (
     transcriptLifecycle?.state !== 'working' &&
+    !hookDeliversTurnEnd(agent) &&
     trailingAssistantPostDates(sources, stateStartedAt)
   ) {
     return undefined
diff --git a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-pagination.ts b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-pagination.ts
index 9bdef2b3f7ba..04335cba9e1c 100644
--- a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-pagination.ts
+++ b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-pagination.ts
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/components/native-chat/native-chat-pagination.ts
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 // Pure pagination math for the native-chat read window. The renderer reads the
 // transcript tail with a `limit`; when the user scrolls to the top it raises the
 // limit by a page to load older history. Kept pure (no React/IO) so the limit
diff --git a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-runtime-contract.ts b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-runtime-contract.ts
index 82300c67c6a8..e633af9a09c3 100644
--- a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-runtime-contract.ts
+++ b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-runtime-contract.ts
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/components/native-chat/native-chat-runtime-contract.ts
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 import type {
   NativeChatAppendedMessages,
   NativeChatReadSessionResult
diff --git a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-runtime-owner.ts b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-runtime-owner.ts
index ec2f4e2648a1..a09bb132e6a4 100644
--- a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-runtime-owner.ts
+++ b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-runtime-owner.ts
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/components/native-chat/native-chat-runtime-owner.ts
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 import {
   getRuntimeEnvironmentIdForWorktree,
   type WorktreeRuntimeOwnerState
diff --git a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-session-transport.ts b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-session-transport.ts
index 2b45af07a32f..62f006663ed0 100644
--- a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-session-transport.ts
+++ b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-session-transport.ts
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/components/native-chat/native-chat-session-transport.ts
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 import type {
   NativeChatApi,
   NativeChatAppendedMessages,
diff --git a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-view-state.ts b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-view-state.ts
index a897acf98a5e..1be718fcb43e 100644
--- a/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-view-state.ts
+++ b/src/renderer/src/components/native-chat/fork-native-chat-relay/native-chat-view-state.ts
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/components/native-chat/native-chat-view-state.ts
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 // Pure mapping from an assembled NativeChatSession to the discrete view state the
 // UI renders. Keeping it a single function (not branching inside the .tsx) makes
 // the empty/loading/error/working/ready dispatch testable and keeps the render
diff --git a/src/renderer/src/components/native-chat/fork-native-chat-relay/use-native-chat-live-session.ts b/src/renderer/src/components/native-chat/fork-native-chat-relay/use-native-chat-live-session.ts
index 1b38ff357ef3..b49310edaa2f 100644
--- a/src/renderer/src/components/native-chat/fork-native-chat-relay/use-native-chat-live-session.ts
+++ b/src/renderer/src/components/native-chat/fork-native-chat-relay/use-native-chat-live-session.ts
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/components/native-chat/use-native-chat-live-session.ts
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import {
   NATIVE_CHAT_SOURCE_PRIORITY,
@@ -16,7 +16,7 @@ import {
   replaceList
 } from '../../../../../shared/native-chat-merge'
 import { startNativeChatSeedRead } from './native-chat-read-retry'
-import { mergeNativeChatLiveSession } from './native-chat-live-status'
+import { mergeNativeChatLiveSession, nativeChatHookAwaitsInput } from './native-chat-live-status'
 import { useNativeChatAssembledTranscript } from './use-native-chat-assembled-transcript'
 import {
   hasMoreBeforeNativeChatPage,
@@ -47,6 +47,9 @@ export type UseNativeChatLiveSessionArgs = {
 export type NativeChatLiveSession = NativeChatSession & {
   /** Latest provider turn boundary, used to settle orphaned running tool rows. */
   transcriptLifecycle?: NativeChatTurnLifecycle
+  /** The pane's hook says the agent stopped mid-turn for the reader, and the transcript
+   *  has not since ended that turn. */
+  hookAwaitingInput?: boolean
   /** True when an older page may still exist (the last read filled the window). */
   hasMore: boolean
   /** Whether an older-history page is currently loading. */
@@ -394,6 +397,11 @@ export function useNativeChatLiveSession(
     })
     return {
       ...session,
+      hookAwaitingInput: nativeChatHookAwaitsInput(
+        hookState,
+        hookStateStartedAt,
+        transcriptCompanion?.lifecycle
+      ),
       hasMore,
       loadingEarlier,
       olderHistoryGeneration,
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-containment.test.ts b/src/renderer/src/components/native-chat/native-chat-composer-containment.test.ts
deleted file mode 100644
index 2c8a08ffa893..000000000000
--- a/src/renderer/src/components/native-chat/native-chat-composer-containment.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import fs from 'node:fs'
-import { describe, expect, it } from 'vitest'
-
-const composerField = fs.readFileSync(
-  new URL('./NativeChatComposerField.tsx', import.meta.url),
-  'utf8'
-)
-const autocompleteMenus = fs.readFileSync(
-  new URL('./NativeChatAutocompleteMenus.tsx', import.meta.url),
-  'utf8'
-)
-
-describe('native chat composer paint containment (#10481)', () => {
-  it('bounds caret repaints to the composer input shell', () => {
-    expect(composerField).toContain('[contain:paint]')
-  })
-
-  it('keeps the outer composer uncontained so the pickers can overflow it', () => {
-    // The pickers are siblings that render above the shell via `bottom-full`;
-    // containing their parent would clip them.
-    const outerShell = composerField.slice(0, composerField.indexOf('[contain:paint]'))
-    expect(outerShell).toContain('<div className="shrink-0 bg-background">')
-    expect(outerShell).not.toContain('contain:paint')
-  })
-
-  it('lifts both pickers above the contained shell', () => {
-    // The shell is a stacking context now, so it paints at z-index 0 in tree
-    // order — an unlayered picker would lose its drop shadow to it.
-    for (const picker of ['bottom-full left-0 right-0 z-20', 'bottom-full left-3 right-3 z-20']) {
-      expect(autocompleteMenus).toContain(picker)
-    }
-  })
-})
diff --git a/src/renderer/src/components/native-chat/native-chat-draft-cache.ts b/src/renderer/src/components/native-chat/native-chat-draft-cache.ts
index 62ff5dc5cff0..333ab7a2c50c 100644
--- a/src/renderer/src/components/native-chat/native-chat-draft-cache.ts
+++ b/src/renderer/src/components/native-chat/native-chat-draft-cache.ts
@@ -28,6 +28,40 @@ export function writeNativeChatDraftCache(scopeKey: string, draft: string): void
   })
 }
 
+export function appendNativeChatDraftText(draft: string, text: string): string {
+  return draft === '' ? text : `${draft.trimEnd()}\n\n${text}`
+}
+
+// Only a write from outside the composer notifies; its own writes already hold the text.
+const appendListeners = new Map<string, Set<(text: string) => void>>()
+
+/** Puts text back after whatever is typed, and tells a mounted composer to show it. */
+export function appendNativeChatDraftCache(scopeKey: string, text: string): void {
+  if (text === '') {
+    return
+  }
+  writeNativeChatDraftCache(
+    scopeKey,
+    appendNativeChatDraftText(readNativeChatDraftCache(scopeKey), text)
+  )
+  appendListeners.get(scopeKey)?.forEach((listener) => listener(text))
+}
+
+export function subscribeToNativeChatDraftAppend(
+  scopeKey: string,
+  listener: (text: string) => void
+): () => void {
+  const listeners = appendListeners.get(scopeKey) ?? new Set()
+  appendListeners.set(scopeKey, listeners)
+  listeners.add(listener)
+  return () => {
+    listeners.delete(listener)
+    if (listeners.size === 0 && appendListeners.get(scopeKey) === listeners) {
+      appendListeners.delete(scopeKey)
+    }
+  }
+}
+
 export function clearNativeChatDraftCacheForTests(): void {
   draftCache.clear()
 }
diff --git a/src/renderer/src/components/native-chat/native-chat-live-session-contract.ts b/src/renderer/src/components/native-chat/native-chat-live-session-contract.ts
index e3097ca085f2..d61d11b9ac1b 100644
--- a/src/renderer/src/components/native-chat/native-chat-live-session-contract.ts
+++ b/src/renderer/src/components/native-chat/native-chat-live-session-contract.ts
@@ -27,6 +27,9 @@ export function isNativeChatTranscriptUnsettled(phase: ReadState['phase']): bool
 export type NativeChatLiveSession = NativeChatSession & {
   /** Latest provider turn boundary, used to settle orphaned running tool rows. */
   transcriptLifecycle?: NativeChatTurnLifecycle
+  /** The pane's hook says the agent stopped mid-turn for the reader, and the transcript
+   *  has not since ended that turn. Absent on lanes with no hook status. */
+  hookAwaitingInput?: boolean
   /** True when an older page may still exist (the last read filled the window). */
   hasMore: boolean
   /** Whether an older-history page is currently loading. */
diff --git a/src/renderer/src/components/native-chat/native-chat-live-status.test.ts b/src/renderer/src/components/native-chat/native-chat-live-status.test.ts
index ce8a2875df0c..9dcd683dcd90 100644
--- a/src/renderer/src/components/native-chat/native-chat-live-status.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-live-status.test.ts
@@ -3,7 +3,7 @@
 
 import { describe, expect, it } from 'vitest'
 import type { NativeChatMessage } from '../../../../shared/native-chat-types'
-import { mergeNativeChatLiveSession } from './native-chat-live-status'
+import { mergeNativeChatLiveSession, nativeChatHookAwaitsInput } from './native-chat-live-status'
 import { selectNativeChatViewState } from './native-chat-view-state'
 import { shouldShowNativeChatWorking } from './native-chat-working-suppression'
 
@@ -154,6 +154,36 @@ describe('mergeNativeChatLiveSession', () => {
     expect(session.status).toBe('ready')
   })
 
+  it("keeps omp working while its latest row is a tool call written after the turn's start", () => {
+    // Shaped as decodeOmpTranscriptLine emits them: every omp row carries its timestamp.
+    const turnStartedAt = Date.parse('2026-09-28T10:00:00.000Z')
+    const toolCall: NativeChatMessage = {
+      id: 'rec-2',
+      role: 'assistant',
+      blocks: [
+        { type: 'text', text: 'Running the suite.' },
+        { type: 'tool-call', name: 'bash', input: { command: 'pnpm test' } }
+      ],
+      timestamp: turnStartedAt + 4_000,
+      source: 'transcript'
+    }
+    const session = mergeNativeChatLiveSession({
+      messages: [{ ...user('rec-1', 'run the tests'), timestamp: turnStartedAt }, toolCall],
+      sessionId: 'sess',
+      agent: 'omp',
+      hookState: 'working',
+      stateStartedAt: turnStartedAt
+    })
+    expect(session.status).toBe('working')
+    expect(
+      shouldShowNativeChatWorking({
+        isConversation: true,
+        working: session.status === 'working',
+        interrupted: false
+      })
+    ).toBe(true)
+  })
+
   it('keeps working while the hook reports a live background child', () => {
     const session = mergeNativeChatLiveSession({
       messages: [assistant('a-1', 'lead done')],
@@ -201,7 +231,7 @@ describe('mergeNativeChatLiveSession', () => {
       }).status
     ).toBe('working')
     // Regression: a non-null sessionId used to force 'loading' over live work,
-    // so the pane rendered idle mid-turn — Send instead of Stop, no typing
+    // so the pane rendered idle mid-turn — Send instead of Stop, no working
     // indicator, no streaming preview. The empty-transcript loading SURFACE is
     // selectNativeChatViewState's job; the status must stay 'working'.
     expect(
@@ -249,7 +279,7 @@ describe('mergeNativeChatLiveSession', () => {
 
   // The whole chain the defect broke: a fresh Claude session reports its id
   // before the transcript flushes, so the pane rendered Send (not Stop) with no
-  // typing indicator while the agent was working.
+  // working indicator while the agent was working.
   it('keeps the Stop affordance for a working known session mid-flush', () => {
     const session = mergeNativeChatLiveSession({
       messages: [user('u-1', 'run it')],
@@ -271,3 +301,46 @@ describe('mergeNativeChatLiveSession', () => {
     ).toBe(true)
   })
 })
+
+describe('nativeChatHookAwaitsInput', () => {
+  it.each(['waiting', 'blocked'] as const)('reads a %s hook as a wait on the reader', (state) => {
+    expect(nativeChatHookAwaitsInput(state, 5, undefined)).toBe(true)
+    expect(
+      nativeChatHookAwaitsInput(state, 5, { state: 'working', turnId: 'turn-1', timestamp: 1 })
+    ).toBe(true)
+  })
+
+  it('reads no other hook state as a wait', () => {
+    expect(nativeChatHookAwaitsInput('working', 5, undefined)).toBe(false)
+    expect(nativeChatHookAwaitsInput('done', 5, undefined)).toBe(false)
+    expect(nativeChatHookAwaitsInput(null, 5, undefined)).toBe(false)
+  })
+
+  // An interrupt at the prompt fires no hook; the transcript's marker is the only end.
+  it('ends a wait the transcript closed after it began', () => {
+    expect(
+      nativeChatHookAwaitsInput('waiting', 5, {
+        state: 'interrupted',
+        turnId: 'turn-1',
+        timestamp: 6
+      })
+    ).toBe(false)
+    expect(
+      nativeChatHookAwaitsInput('waiting', 5, {
+        state: 'completed',
+        turnId: 'turn-1',
+        timestamp: 6
+      })
+    ).toBe(false)
+  })
+
+  it('keeps a wait that began after the last closed turn', () => {
+    expect(
+      nativeChatHookAwaitsInput('waiting', 5, {
+        state: 'interrupted',
+        turnId: 'turn-1',
+        timestamp: 2
+      })
+    ).toBe(true)
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-live-status.ts b/src/renderer/src/components/native-chat/native-chat-live-status.ts
index eefd7fcbeca1..f3d2bb58be94 100644
--- a/src/renderer/src/components/native-chat/native-chat-live-status.ts
+++ b/src/renderer/src/components/native-chat/native-chat-live-status.ts
@@ -63,14 +63,15 @@ export function mergeNativeChatLiveSession(input: NativeChatLiveMergeInput): Nat
   }
 
   const status = liveStatusOverride(
+    agent,
     hookState,
     statusTailMessage ?? messages.at(-1),
     stateStartedAt,
     transcriptLifecycle,
     hookHasWorkingSubagents ?? false
   )
-  // Why live work still wins: 'working' is what drives Stop-vs-Send, the typing
-  // indicator and the streaming preview, so forcing 'loading' over it renders an
+  // Why live work still wins: 'working' is what drives Stop-vs-Send, the turn
+  // status and the streaming preview, so forcing 'loading' over it renders an
   // idle pane while the agent works. A known session with nothing to show yet is
   // held on the loading surface by selectNativeChatViewState instead.
   if (loading && status !== 'working') {
@@ -84,10 +85,36 @@ export function mergeNativeChatLiveSession(input: NativeChatLiveMergeInput): Nat
   }
 }
 
+/**
+ * Whether the agent stopped mid-turn for the reader (`blocked` and `waiting` both mean a human
+ * must decide). Reconciled like 'working': an interrupt at the prompt fires no hook, so only the
+ * transcript's terminal marker can end a wait the hook never cleared.
+ */
+export function nativeChatHookAwaitsInput(
+  hookState: AgentStatusState | null,
+  stateStartedAt: number | null | undefined,
+  transcriptLifecycle: NativeChatTurnLifecycle | undefined
+): boolean {
+  return (
+    (hookState === 'blocked' || hookState === 'waiting') &&
+    !lifecycleTerminatesCurrentTurn(transcriptLifecycle, stateStartedAt)
+  )
+}
+
 /** Slack for comparing transcript timestamps to hook receipt times across hosts. */
 export const LIFECYCLE_CLOCK_SKEW_SLACK_MS = 2_000
 
+/**
+ * Agents whose own runtime reports the turn end: omp posts `agent_end` from inside the agent,
+ * retried until the host takes it and held back while the run continues. Their hook 'working'
+ * is never a dropped Stop, so a trailing assistant row (a tool call mid-run) cannot end it.
+ */
+function hookDeliversTurnEnd(agent: AgentType): boolean {
+  return agent === 'omp'
+}
+
 function liveStatusOverride(
+  agent: AgentType,
   hookState: AgentStatusState | null,
   statusTailMessage: NativeChatMessage | undefined,
   stateStartedAt: number | null | undefined,
@@ -121,6 +148,7 @@ function liveStatusOverride(
   // do not settle early on capable providers.
   if (
     transcriptLifecycle?.state !== 'working' &&
+    !hookDeliversTurnEnd(agent) &&
     trailingAssistantPostDates(statusTailMessage, stateStartedAt)
   ) {
     return undefined
diff --git a/src/renderer/src/components/native-chat/native-chat-message-rail-items.test.ts b/src/renderer/src/components/native-chat/native-chat-message-rail-items.test.ts
index 5e6fecefa2f9..3a08c6a503e9 100644
--- a/src/renderer/src/components/native-chat/native-chat-message-rail-items.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-message-rail-items.test.ts
@@ -10,6 +10,7 @@ import {
   NATIVE_CHAT_RAIL_MAX_TICKS,
   type NativeChatRailItem
 } from './native-chat-message-rail-items'
+import { selectNativeChatActiveTurnKey } from '../../../../shared/native-chat-turn-status'
 
 function text(id: string, body: string, role: NativeChatMessage['role'] = 'assistant') {
   return {
@@ -42,12 +43,10 @@ function slotsOf(messages: NativeChatMessage[]) {
   return buildNativeChatTranscriptSlots({
     messages,
     turnKeys,
-    latestUserIndex: messages.findLastIndex((message) => message.role === 'user'),
-    currentTurnKey: undefined,
+    activeTurnKey: selectNativeChatActiveTurnKey(messages),
     receipts: new Map<string, NativeChatResolvedPrompt>(),
     turnStatuses: { active: null, completedByTurn: {} },
     turnDiffs: new Map<string, NativeChatTurnDiff>(),
-    showTurnStatus: false,
     expandedTurnKeys: new Set<string>(),
     isWorking: false,
     lifecycleWorking: false
diff --git a/src/renderer/src/components/native-chat/native-chat-noise.test.ts b/src/renderer/src/components/native-chat/native-chat-noise.test.ts
deleted file mode 100644
index a9942ed82d78..000000000000
--- a/src/renderer/src/components/native-chat/native-chat-noise.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import type { NativeChatMessage } from '../../../../shared/native-chat-types'
-import { isNoiseMessage, stripNoiseMessages } from './native-chat-noise'
-
-function msg(
-  role: NativeChatMessage['role'],
-  text: string,
-  blocks?: NativeChatMessage['blocks']
-): NativeChatMessage {
-  return {
-    id: text.slice(0, 8),
-    role,
-    blocks: blocks ?? [{ type: 'text', text }],
-    timestamp: 0,
-    source: 'transcript'
-  }
-}
-
-describe('isNoiseMessage', () => {
-  it('flags task-notification and system-reminder user turns', () => {
-    expect(isNoiseMessage(msg('user', '<task-notification>\n<task-id>x</task-id>'))).toBe(true)
-    expect(isNoiseMessage(msg('user', '<system-reminder>\nbe careful'))).toBe(true)
-    expect(
-      isNoiseMessage(
-        msg(
-          'user',
-          'Caveat: The messages below were generated by the user while running local commands'
-        )
-      )
-    ).toBe(true)
-    expect(isNoiseMessage(msg('user', '[Request interrupted by user]'))).toBe(true)
-  })
-
-  it('keeps real user messages', () => {
-    expect(isNoiseMessage(msg('user', 'make it work for codex'))).toBe(false)
-    expect(isNoiseMessage(msg('user', '<my-custom-element>pasted code'))).toBe(false)
-  })
-
-  it('keeps assistant and tool turns', () => {
-    expect(isNoiseMessage(msg('assistant', '<system-reminder> in prose'))).toBe(false)
-    expect(isNoiseMessage(msg('system', 'Conversation interrupted'))).toBe(false)
-  })
-
-  it('keeps a user turn that carries tool results', () => {
-    expect(isNoiseMessage(msg('user', '', [{ type: 'tool-result', output: 'ok' }]))).toBe(false)
-  })
-
-  it('stripNoiseMessages removes only the noise', () => {
-    const out = stripNoiseMessages([
-      msg('user', 'hello'),
-      msg('user', '<task-notification>done'),
-      msg('assistant', 'hi')
-    ])
-    expect(out.map((m) => m.role)).toEqual(['user', 'assistant'])
-  })
-})
diff --git a/src/renderer/src/components/native-chat/native-chat-rail-outline-parity.test.ts b/src/renderer/src/components/native-chat/native-chat-rail-outline-parity.test.ts
index 3057be1f9083..b1efe034acdc 100644
--- a/src/renderer/src/components/native-chat/native-chat-rail-outline-parity.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-rail-outline-parity.test.ts
@@ -18,6 +18,7 @@ import { omitNativeChatThreadGoalRows } from './native-chat-thread-goal-rows'
 import { buildNativeChatTranscriptSlots } from './native-chat-transcript-slots'
 import type { NativeChatTurnDiff } from './native-chat-turn-diffs'
 import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection'
+import { selectNativeChatActiveTurnKey } from '../../../../shared/native-chat-turn-status'
 
 function row(sequence: number, body: AgentJournalItemBody, itemId = `item-${sequence}`) {
   return { itemId, revision: 1, sequence, observedAt: 1_000 + sequence, body }
@@ -60,7 +61,8 @@ const JOURNAL: AgentJournalRenderItem[] = [
   ]),
   row(10, { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'Done.' }] }),
   user(11, [{ type: 'text', text: 'Thanks' }]),
-  // Journalled after `Thanks` but observed before `Done.`: the transcript orders by observation.
+  // Recovered after a crash: journalled after `Thanks`, but carrying the provider's clock from
+  // before `Done.`. The transcript orders by journal position, never observation.
   { ...user(12, [{ type: 'text', text: 'Observed earlier' }]), observedAt: 1_009.5 }
 ]
 
@@ -80,12 +82,10 @@ function loadedRailItems(items: AgentJournalRenderItem[], submissions: AgentJour
   const slots = buildNativeChatTranscriptSlots({
     messages,
     turnKeys,
-    latestUserIndex: messages.findLastIndex((message) => message.role === 'user'),
-    currentTurnKey: turn,
+    activeTurnKey: selectNativeChatActiveTurnKey(messages),
     receipts: new Map<string, NativeChatResolvedPrompt>(),
     turnStatuses: { active: null, completedByTurn: {} },
     turnDiffs: new Map<string, NativeChatTurnDiff>(),
-    showTurnStatus: true,
     expandedTurnKeys: new Set<string>(),
     isWorking: false,
     lifecycleWorking: false
@@ -107,13 +107,13 @@ describe('conversation outline parity with the loaded rail', () => {
       }))
     ).toEqual(loaded.map(({ id, text, hasImages }) => ({ id, text, hasImages })))
     // Anti-vacuous: the folded tool result, the refused send, the harness turn and the empty
-    // prompt were all dropped, and the late-journalled row sits where it was observed.
+    // prompt were all dropped, and the recovered row sits where it was journalled.
     expect(outline.map((entry) => entry.itemId)).toEqual([
       'item-1',
       'item-5',
       'item-9',
-      'item-12',
-      'item-11'
+      'item-11',
+      'item-12'
     ])
   })
 
@@ -123,8 +123,8 @@ describe('conversation outline parity with the loaded rail', () => {
       { itemId: 'item-1', sequence: 1, preview: 'Fix the parser', imageCount: 0 },
       { itemId: 'item-5', sequence: 5, preview: '', imageCount: 1 },
       { itemId: 'item-9', sequence: 9, preview: 'Compare these', imageCount: 2 },
-      { itemId: 'item-12', sequence: 12, preview: 'Observed earlier', imageCount: 0 },
-      { itemId: 'item-11', sequence: 11, preview: 'Thanks', imageCount: 0 }
+      { itemId: 'item-11', sequence: 11, preview: 'Thanks', imageCount: 0 },
+      { itemId: 'item-12', sequence: 12, preview: 'Observed earlier', imageCount: 0 }
     ])
   })
 })
diff --git a/src/renderer/src/components/native-chat/native-chat-row-height-estimate.ts b/src/renderer/src/components/native-chat/native-chat-row-height-estimate.ts
index 60075385292b..368eea2699b7 100644
--- a/src/renderer/src/components/native-chat/native-chat-row-height-estimate.ts
+++ b/src/renderer/src/components/native-chat/native-chat-row-height-estimate.ts
@@ -29,6 +29,8 @@ export type NativeChatRowChromeMetrics = {
   /** Behind a folded turn: prose and tool activity draw nothing, so estimating
    *  them would reserve a screen of height for a row that paints a roster. */
   folded?: boolean
+  /** A subagent wrote the row, so it draws a caption naming that subagent. */
+  attributed?: boolean
 }
 
 const LINE_HEIGHT_PX = 22
@@ -38,6 +40,7 @@ const USER_BUBBLE_CHROME_PX = 32
 const IMAGE_STRIP_PX = 88
 const TOOL_RUN_PX = 40
 const SUBAGENT_ROW_PX = 32
+const SUBAGENT_CAPTION_PX = 24
 const STATUS_ROW_PX = 28
 const TURN_DIFF_PX = 28
 const RECEIPT_PX = 56
@@ -117,6 +120,9 @@ export function estimateNativeChatRowHeight(
       height += TOOL_RUN_PX
     }
     height += content.subagentGroupCount * SUBAGENT_ROW_PX
+    if (chrome.attributed === true && height > 0) {
+      height += SUBAGENT_CAPTION_PX
+    }
     partCount = height > 0 ? 1 : 0
   }
   if (chrome.hasStatus) {
diff --git a/src/renderer/src/components/native-chat/native-chat-runtime-send.test.ts b/src/renderer/src/components/native-chat/native-chat-runtime-send.test.ts
index 4b0e82a69477..0e81c9194eeb 100644
--- a/src/renderer/src/components/native-chat/native-chat-runtime-send.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-runtime-send.test.ts
@@ -194,7 +194,8 @@ describe('sendNativeChatMessage', () => {
     expect(sendRuntimePtyInputAcceptance).toHaveBeenLastCalledWith(
       SETTINGS,
       PTY,
-      NATIVE_CHAT_SUBMIT
+      NATIVE_CHAT_SUBMIT,
+      'driving'
     )
     expect(mergedWriteBytes()).toHaveLength(6)
   })
@@ -245,7 +246,7 @@ describe('sendNativeChatMessage', () => {
     const bodyCall = sendRuntimePtyInputAcceptance.mock.calls.find(
       (call) => call[2] === buildNativeChatPasteBytes('hi')
     )
-    const isCancelled = bodyCall?.[3] as (() => boolean) | undefined
+    const isCancelled = bodyCall?.[4] as (() => boolean) | undefined
     expect(isCancelled).toBeInstanceOf(Function)
     expect(isCancelled?.()).toBe(false)
 
@@ -543,6 +544,7 @@ describe('sendNativeChatMessageVerified', () => {
       SETTINGS,
       PTY,
       buildNativeChatPasteBytes('/model sonnet'),
+      'driving',
       expect.any(Function)
     )
 
@@ -553,6 +555,7 @@ describe('sendNativeChatMessageVerified', () => {
       SETTINGS,
       PTY,
       NATIVE_CHAT_SUBMIT,
+      'driving',
       expect.any(Function)
     )
     expect(
@@ -594,6 +597,7 @@ describe('sendNativeChatMessageVerified', () => {
       SETTINGS,
       PTY,
       NATIVE_CHAT_SUBMIT,
+      'driving',
       expect.any(Function)
     )
   })
@@ -638,13 +642,14 @@ describe('sendNativeChatMessageVerified', () => {
       SETTINGS,
       PTY,
       NATIVE_CHAT_SUBMIT,
+      'driving',
       expect.any(Function)
     )
 
     // Only once the option command's CR has landed does the card's queued
     // selector write fire.
     await vi.runAllTimersAsync()
-    expect(sendRuntimePtyInput).toHaveBeenCalledWith(SETTINGS, PTY, '2')
+    expect(sendRuntimePtyInput).toHaveBeenCalledWith(SETTINGS, PTY, '2', 'driving')
   })
 })
 
@@ -742,6 +747,7 @@ describe('sendNativeChatMessageWithImageAttachments', () => {
       SETTINGS,
       PTY,
       buildNativeChatPasteBytes('what do you see?'),
+      'driving',
       expect.any(Function)
     )
 
@@ -749,7 +755,8 @@ describe('sendNativeChatMessageWithImageAttachments', () => {
     expect(sendRuntimePtyInputAcceptance).toHaveBeenLastCalledWith(
       SETTINGS,
       PTY,
-      NATIVE_CHAT_SUBMIT
+      NATIVE_CHAT_SUBMIT,
+      'driving'
     )
     expect(totalWriteCalls()).toBe(4)
   })
@@ -775,7 +782,8 @@ describe('sendNativeChatMessageWithImageAttachments', () => {
     expect(sendRuntimePtyInputAcceptance).toHaveBeenLastCalledWith(
       SETTINGS,
       PTY,
-      NATIVE_CHAT_SUBMIT
+      NATIVE_CHAT_SUBMIT,
+      'driving'
     )
   })
 
@@ -825,7 +833,8 @@ describe('sendNativeChatMessageWithImageAttachments', () => {
     expect(sendRuntimePtyInputAcceptance).toHaveBeenCalledWith(
       SETTINGS,
       PTY,
-      NATIVE_CHAT_CLEAR_UNSUBMITTED_INPUT
+      NATIVE_CHAT_CLEAR_UNSUBMITTED_INPUT,
+      'driving'
     )
     expect(
       sendRuntimePtyInputAcceptance.mock.calls.some(
@@ -860,7 +869,7 @@ describe('empty prompt submit', () => {
   it('submits an empty prompt with a bare Enter', () => {
     submitNativeChatPrompt(TARGET)
     expect(sendRuntimePtyInput).toHaveBeenCalledOnce()
-    expect(sendRuntimePtyInput).toHaveBeenCalledWith(SETTINGS, PTY, NATIVE_CHAT_SUBMIT)
+    expect(sendRuntimePtyInput).toHaveBeenCalledWith(SETTINGS, PTY, NATIVE_CHAT_SUBMIT, 'driving')
   })
 })
 
@@ -895,16 +904,17 @@ describe('sendNativeChatAskAnswer', () => {
     )
 
     vi.advanceTimersByTime(0)
-    expect(sendRuntimePtyInput).toHaveBeenCalledWith(SETTINGS, PTY, '1')
+    expect(sendRuntimePtyInput).toHaveBeenCalledWith(SETTINGS, PTY, '1', 'driving')
 
     vi.advanceTimersByTime(NATIVE_CHAT_QUESTION_STEP_MS)
-    expect(sendRuntimePtyInput).toHaveBeenCalledWith(SETTINGS, PTY, '2')
+    expect(sendRuntimePtyInput).toHaveBeenCalledWith(SETTINGS, PTY, '2', 'driving')
 
     vi.advanceTimersByTime(NATIVE_CHAT_QUESTION_STEP_MS)
     expect(sendRuntimePtyInput).toHaveBeenLastCalledWith(
       SETTINGS,
       PTY,
-      buildNativeChatPasteBytes('custom answer')
+      buildNativeChatPasteBytes('custom answer'),
+      'driving'
     )
   })
 
@@ -949,6 +959,7 @@ describe('sendNativeChatAskAnswer', () => {
       SETTINGS,
       PTY,
       '2',
+      'driving',
       expect.any(Function)
     )
     expect(onSettled).not.toHaveBeenCalled()
diff --git a/src/renderer/src/components/native-chat/native-chat-runtime-send.ts b/src/renderer/src/components/native-chat/native-chat-runtime-send.ts
index 1e2305162fbe..c3bf80867964 100644
--- a/src/renderer/src/components/native-chat/native-chat-runtime-send.ts
+++ b/src/renderer/src/components/native-chat/native-chat-runtime-send.ts
@@ -193,7 +193,7 @@ export function sendNativeChatMessageWithImageAttachments(
  *  composer is empty. */
 export function submitNativeChatPrompt(target: NativeChatResolvedTarget): void {
   if (!isTerminalInputQuarantined(target.terminalTabId)) {
-    sendRuntimePtyInput(target.settings, target.ptyId, NATIVE_CHAT_SUBMIT)
+    sendRuntimePtyInput(target.settings, target.ptyId, NATIVE_CHAT_SUBMIT, 'driving')
   }
 }
 
diff --git a/src/renderer/src/components/native-chat/native-chat-session-assembler.ts b/src/renderer/src/components/native-chat/native-chat-session-assembler.ts
index eb61380967ff..674e14d6bf8b 100644
--- a/src/renderer/src/components/native-chat/native-chat-session-assembler.ts
+++ b/src/renderer/src/components/native-chat/native-chat-session-assembler.ts
@@ -7,7 +7,7 @@ import {
   type NativeChatSessionStatus
 } from '../../../../shared/native-chat-types'
 import { NATIVE_CHAT_STREAMING_ID } from '../../../../shared/native-chat-streaming'
-import { compareNativeChatMessagesByTime } from '../../../../shared/native-chat-transcript-projection'
+import { compareNativeChatTranscriptMessages } from '../../../../shared/native-chat-transcript-projection'
 import {
   hasImagePromptMarker,
   isImageSourceUserTurn,
@@ -105,14 +105,14 @@ function messageSortRank(message: NativeChatMessage): number {
   return 0
 }
 
-// Rank first; within a tier the transcript's shared time order.
+// Rank first; within a tier the transcript's shared order.
 export function compareMessages(a: NativeChatMessage, b: NativeChatMessage): number {
   const ar = messageSortRank(a)
   const br = messageSortRank(b)
   if (ar !== br) {
     return ar - br
   }
-  return compareNativeChatMessagesByTime(a, b)
+  return compareNativeChatTranscriptMessages(a, b)
 }
 
 /**
diff --git a/src/renderer/src/components/native-chat/native-chat-stop-layering.test.ts b/src/renderer/src/components/native-chat/native-chat-stop-layering.test.ts
index 26b4009caaa8..4a1f7a7863e3 100644
--- a/src/renderer/src/components/native-chat/native-chat-stop-layering.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-stop-layering.test.ts
@@ -16,7 +16,14 @@ describe('native chat layering', () => {
       expect(source(path)).toContain('<RetainedPaneHost')
     }
     expect(css).not.toMatch(/\.native-chat-pane-shell:has\(\[data-native-chat-working/)
-    expect(css).toMatch(/\[data-sonner-toaster\][^{]*\{[^}]*z-index:\s*40\s*!important;/s)
+    expect(css).toMatch(
+      /\[data-sonner-toaster\][^{]*\{[^}]*z-index:\s*var\(--toaster-z-index,\s*40\)\s*!important;/s
+    )
+    // A :has() in the toaster's selector, or one scanning below body's children, froze large diffs.
+    expect(css).toMatch(
+      /body:has\(>\s*\[data-slot='dialog-overlay'\],\s*>\s*\[data-slot='sheet-overlay'\]\)\s*\{\s*--toaster-z-index:\s*60;/
+    )
+    expect(css).not.toMatch(/:has\([^{]*\)\s+\[data-sonner-toaster\]/)
   })
 
   it('publishes working state from both structured and bridge chat roots', () => {
diff --git a/src/renderer/src/components/native-chat/native-chat-structured-send-composition-clear.test.tsx b/src/renderer/src/components/native-chat/native-chat-structured-send-composition-clear.test.tsx
index 71359459d9f2..3dfcc9f7d1d0 100644
--- a/src/renderer/src/components/native-chat/native-chat-structured-send-composition-clear.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-structured-send-composition-clear.test.tsx
@@ -66,6 +66,7 @@ vi.mock('../dictation/dictation-control-events', () => ({
 }))
 
 import { NativeChatComposer } from './NativeChatComposer'
+import { appendNativeChatDraftCache, readNativeChatDraftCache } from './native-chat-draft-cache'
 
 type Dispatched = { handled: boolean; accepted: boolean; error: string | null }
 
@@ -133,20 +134,20 @@ function renderComposer(structuredTransport: NativeChatStructuredComposerTranspo
   )
 }
 
-describe('structured send racing the next IME composition', () => {
-  beforeEach(() => {
-    Object.defineProperty(window, 'api', {
-      configurable: true,
-      value: {
-        git: { discoverCommitMessageModels: vi.fn().mockResolvedValue({ success: false }) },
-        pty: { getMainBufferSnapshot: vi.fn().mockResolvedValue(null) },
-        ui: { onFileDrop: () => vi.fn() }
-      }
-    })
+beforeEach(() => {
+  Object.defineProperty(window, 'api', {
+    configurable: true,
+    value: {
+      git: { discoverCommitMessageModels: vi.fn().mockResolvedValue({ success: false }) },
+      pty: { getMainBufferSnapshot: vi.fn().mockResolvedValue(null) },
+      ui: { onFileDrop: () => vi.fn() }
+    }
   })
+})
 
-  afterEach(() => cleanup())
+afterEach(() => cleanup())
 
+describe('structured send racing the next IME composition', () => {
   // The regression: the RPC's clear lands while the NEXT composition is live, so the DOM sync
   // drops it and settlement used to adopt the sent text back into the composer (#17359).
   it('does not resurrect the sent message when the clear lands mid-composition', async () => {
@@ -249,3 +250,66 @@ describe('structured send racing the next IME composition', () => {
     expect(promptValue(input)).toBe('/model')
   })
 })
+
+describe('a withdrawn message put back during an IME composition', () => {
+  // The field ignores a programmatic draft while the IME owns it, and the next composed keystroke
+  // wrote the draft without the text, after its outbox entry had already been dropped.
+  it('shows the text once the composition settles, after what was composed', () => {
+    renderComposer(transport())
+    const pane = `tab-${paneCounter}:structured`
+    const input = textarea()
+    changePrompt(input, 'abc')
+
+    fireEvent.compositionStart(input)
+    changePrompt(input, 'abc안')
+    act(() => appendNativeChatDraftCache(pane, 'withdrawn'))
+    changePrompt(input, 'abc안녕')
+    fireEvent.compositionEnd(input, { data: '안녕' })
+
+    expect(promptValue(input)).toBe('abc안녕\n\nwithdrawn')
+    expect(readNativeChatDraftCache(pane)).toBe('abc안녕\n\nwithdrawn')
+  })
+
+  // Settling spends the held text; a later write or composition must not add it again.
+  it('shows the text once, however much is typed or composed after', () => {
+    renderComposer(transport())
+    const pane = `tab-${paneCounter}:structured`
+    const input = textarea()
+    changePrompt(input, 'abc')
+    fireEvent.compositionStart(input)
+    changePrompt(input, 'abc안')
+    act(() => appendNativeChatDraftCache(pane, 'withdrawn'))
+    fireEvent.compositionEnd(input, { data: '안' })
+
+    changePrompt(input, 'abc안\n\nwithdrawn!')
+    fireEvent.compositionStart(input)
+    changePrompt(input, 'abc안\n\nwithdrawn!가')
+    fireEvent.compositionEnd(input, { data: '가' })
+
+    expect(promptValue(input)).toBe('abc안\n\nwithdrawn!가')
+    expect(readNativeChatDraftCache(pane)).toBe('abc안\n\nwithdrawn!가')
+  })
+
+  // The settle first swaps in the composed value (dropping the sent text), then adds the held text.
+  it('keeps the text when a sent message is also cleared mid-composition', async () => {
+    const dispatch = deferred()
+    const structured = transport({ dispatchCommand: vi.fn(() => dispatch.promise) })
+    renderComposer(structured)
+    const pane = `tab-${paneCounter}:structured`
+    const input = textarea()
+    changePrompt(input, '안녕')
+    pressEnter(input)
+
+    fireEvent.compositionStart(input)
+    changePrompt(input, '안녕하')
+    act(() => appendNativeChatDraftCache(pane, 'withdrawn'))
+    await act(async () => {
+      dispatch.resolve(PASS_THROUGH)
+      await dispatch.promise
+    })
+    fireEvent.compositionEnd(input, { data: '하' })
+
+    expect(promptValue(input)).toBe('하\n\nwithdrawn')
+    expect(readNativeChatDraftCache(pane)).toBe('하\n\nwithdrawn')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-terminal-turn.test.ts b/src/renderer/src/components/native-chat/native-chat-terminal-turn.test.ts
new file mode 100644
index 000000000000..4e77c18ace64
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-terminal-turn.test.ts
@@ -0,0 +1,243 @@
+import { describe, expect, it } from 'vitest'
+import {
+  NATIVE_CHAT_INTERRUPTED_STATUS_TEXT,
+  type NativeChatMessage
+} from '../../../../shared/native-chat-types'
+import {
+  nativeChatHookLatestTurnWorkedSeconds,
+  nativeChatHookTurnStartedAt,
+  nativeChatLatestTurnId,
+  nativeChatTranscriptSettledTurns,
+  resolveNativeChatTerminalTurn
+} from './native-chat-terminal-turn'
+
+const idle = {
+  isConversation: true,
+  working: false,
+  hookAwaitingInput: false,
+  interrupted: false,
+  hasPromptCard: false
+}
+
+describe('resolveNativeChatTerminalTurn', () => {
+  it('keeps the turn running while the agent waits, without calling it generating', () => {
+    expect(resolveNativeChatTerminalTurn({ ...idle, hookAwaitingInput: true })).toEqual({
+      isWorking: false,
+      turnActive: true,
+      awaitingInput: 'unshown'
+    })
+  })
+
+  it('lets a prompt card speak for the wait', () => {
+    expect(
+      resolveNativeChatTerminalTurn({ ...idle, hookAwaitingInput: true, hasPromptCard: true })
+    ).toEqual({ isWorking: false, turnActive: true, awaitingInput: 'shown' })
+  })
+
+  it('reports a generating turn with nothing awaited', () => {
+    expect(resolveNativeChatTerminalTurn({ ...idle, working: true })).toEqual({
+      isWorking: true,
+      turnActive: true,
+      awaitingInput: null
+    })
+  })
+
+  // Stop is the reader's word that the turn is over, whatever the hook still says.
+  it('ends the turn on local Stop, wait included', () => {
+    expect(
+      resolveNativeChatTerminalTurn({
+        ...idle,
+        working: true,
+        hookAwaitingInput: true,
+        interrupted: true
+      })
+    ).toEqual({ isWorking: false, turnActive: false, awaitingInput: null })
+  })
+
+  it('stays quiet with no turn at all', () => {
+    expect(resolveNativeChatTerminalTurn(idle)).toEqual({
+      isWorking: false,
+      turnActive: false,
+      awaitingInput: null
+    })
+  })
+})
+
+describe('nativeChatHookTurnStartedAt', () => {
+  const entry = { state: 'working' as const, stateStartedAt: 3_000 }
+
+  // Answered in the terminal: the current state began at 3s, the turn at 1s.
+  it("dates the turn by the host's stamp, not the state it came back from", () => {
+    expect(nativeChatHookTurnStartedAt({ ...entry, turnStartedAt: 1_000 })).toBe(1_000)
+  })
+
+  // A background task held the row 'working' since 500; the main agent's turn began at 8s.
+  it('keeps the stamp when child work holds the row open', () => {
+    expect(
+      nativeChatHookTurnStartedAt({
+        ...entry,
+        stateStartedAt: 500,
+        turnStartedAt: 8_000,
+        mainAgent: { state: 'working', stateStartedAt: 8_000 }
+      })
+    ).toBe(8_000)
+  })
+
+  it("falls back to the main agent's own state start on a host that stamps no turn", () => {
+    expect(
+      nativeChatHookTurnStartedAt({
+        ...entry,
+        stateStartedAt: 500,
+        mainAgent: { state: 'working', stateStartedAt: 8_000 }
+      })
+    ).toBe(8_000)
+  })
+
+  it('falls back to the row once the main agent is done, or where it has none', () => {
+    expect(
+      nativeChatHookTurnStartedAt({ ...entry, mainAgent: { state: 'done', stateStartedAt: 2_500 } })
+    ).toBe(3_000)
+    expect(nativeChatHookTurnStartedAt(entry)).toBe(3_000)
+  })
+
+  it('knows nothing without a status row', () => {
+    expect(nativeChatHookTurnStartedAt(undefined)).toBeNull()
+  })
+})
+
+describe('nativeChatHookLatestTurnWorkedSeconds', () => {
+  const done = { state: 'done' as const, stateStartedAt: 91_000, turnStartedAt: 1_000 }
+
+  it("times a turn the host ended from its turn start to the main agent's done", () => {
+    expect(nativeChatHookLatestTurnWorkedSeconds(done, false)).toBe(90)
+    // Child work still holds the row; the main agent's own end closes the turn.
+    expect(
+      nativeChatHookLatestTurnWorkedSeconds(
+        { ...done, state: 'working', mainAgent: { state: 'done', stateStartedAt: 31_000 } },
+        false
+      )
+    ).toBe(30)
+  })
+
+  // Staleness ages the row out of the pane, not the host's record that the turn finished.
+  it('keeps a host-ended duration once the row is stale', () => {
+    expect(nativeChatHookLatestTurnWorkedSeconds(done, true)).toBe(90)
+  })
+
+  it('hides a local end while the host went quiet mid-turn', () => {
+    expect(
+      nativeChatHookLatestTurnWorkedSeconds(
+        { ...done, state: 'waiting', stateStartedAt: 2_000 },
+        true
+      )
+    ).toBeNull()
+  })
+
+  // A pane-side end (Stop, the transcript's end marker) is the pane's own word; keep what it saw.
+  it('keeps the local reading while the host is fresh and the turn not host-ended', () => {
+    expect(
+      nativeChatHookLatestTurnWorkedSeconds(
+        { ...done, state: 'waiting', stateStartedAt: 2_000 },
+        false
+      )
+    ).toBeUndefined()
+  })
+
+  it('invents no duration without the host turn stamp, or across a session boundary', () => {
+    expect(
+      nativeChatHookLatestTurnWorkedSeconds({ state: 'done', stateStartedAt: 91_000 }, false)
+    ).toBeUndefined()
+    expect(
+      nativeChatHookLatestTurnWorkedSeconds({ ...done, sessionBoundary: true }, false)
+    ).toBeUndefined()
+    expect(nativeChatHookLatestTurnWorkedSeconds(undefined, true)).toBeUndefined()
+  })
+})
+
+function row(
+  id: string,
+  role: NativeChatMessage['role'],
+  timestamp: number | null
+): NativeChatMessage {
+  return { id, role, blocks: [{ type: 'text', text: id }], timestamp, source: 'transcript' }
+}
+
+describe('nativeChatTranscriptSettledTurns', () => {
+  it('times each finished turn from its prompt to its last row, leaving the latest out', () => {
+    const settled = nativeChatTranscriptSettledTurns([
+      row('u1', 'user', 10_000),
+      row('a1', 'assistant', 20_000),
+      row('a2', 'assistant', 55_900),
+      row('u2', 'user', 70_000),
+      row('a3', 'assistant', 80_000)
+    ])
+    expect([...settled]).toEqual([['u1', { startedAt: 10_000, workedSeconds: 45 }]])
+  })
+
+  it('ends an interrupted turn at its interruption', () => {
+    const settled = nativeChatTranscriptSettledTurns([
+      row('u1', 'user', 0),
+      row('a1', 'assistant', 5_000),
+      {
+        ...row('stop', 'system', 12_000),
+        blocks: [{ type: 'text', text: NATIVE_CHAT_INTERRUPTED_STATUS_TEXT }]
+      },
+      row('u2', 'user', 60_000)
+    ])
+    expect(settled.get('u1')).toEqual({ startedAt: 0, workedSeconds: 12 })
+  })
+
+  // An attachment row sits beside the next prompt; it does not stretch the turn before it.
+  it('does not end a turn at a system row the agent did not write', () => {
+    const settled = nativeChatTranscriptSettledTurns([
+      row('u1', 'user', 0),
+      row('a1', 'assistant', 5_000),
+      row('@src/index.ts', 'system', 3_600_000),
+      row('u2', 'user', 3_601_000)
+    ])
+    expect(settled.get('u1')).toEqual({ startedAt: 0, workedSeconds: 5 })
+  })
+
+  // A harness notice (task notification, reminder) is user-role in the transcript but not a prompt.
+  it('times a turn across a harness notice injected mid-turn', () => {
+    const settled = nativeChatTranscriptSettledTurns([
+      row('u1', 'user', 0),
+      row('a1', 'assistant', 5_000),
+      {
+        ...row('notice', 'user', 10_000),
+        blocks: [{ type: 'text', text: '<task-notification>\n<task-id>b1</task-id>' }]
+      },
+      row('a2', 'assistant', 30_000),
+      row('u2', 'user', 60_000)
+    ])
+    expect([...settled]).toEqual([['u1', { startedAt: 0, workedSeconds: 30 }]])
+  })
+
+  // Absent, not null: null would also hide the duration the pane measured itself.
+  it('leaves out a turn missing either end', () => {
+    const settled = nativeChatTranscriptSettledTurns([
+      row('u1', 'user', null),
+      row('a1', 'assistant', 5_000),
+      row('u2', 'user', 10_000),
+      row('a2', 'assistant', null),
+      row('u3', 'user', 20_000)
+    ])
+    expect(settled.size).toBe(0)
+  })
+})
+
+describe('nativeChatLatestTurnId', () => {
+  it('names the last prompt, not a harness notice after it', () => {
+    expect(
+      nativeChatLatestTurnId([
+        row('u1', 'user', 0),
+        row('a1', 'assistant', 5_000),
+        {
+          ...row('notice', 'user', 10_000),
+          blocks: [{ type: 'text', text: '<task-notification>\n<task-id>b1</task-id>' }]
+        }
+      ])
+    ).toBe('u1')
+    expect(nativeChatLatestTurnId([row('a1', 'assistant', 0)])).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-terminal-turn.ts b/src/renderer/src/components/native-chat/native-chat-terminal-turn.ts
new file mode 100644
index 000000000000..2926c5d75f2c
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-terminal-turn.ts
@@ -0,0 +1,132 @@
+import type { AgentStatusEntry } from '../../../../shared/agent-status-types'
+import {
+  isInterruptedStatusMessage,
+  type NativeChatMessage
+} from '../../../../shared/native-chat-types'
+import type {
+  NativeChatSettledTurn,
+  NativeChatSettledTurns
+} from '../../../../shared/native-chat-turn-status'
+import { isNoiseMessage } from '../../../../shared/native-chat-noise'
+import type { NativeChatAwaitingInput } from './NativeChatMessageList'
+import { shouldShowNativeChatWorking } from './native-chat-working-suppression'
+
+export type NativeChatTerminalTurn = {
+  /** The agent is generating: drives Stop-vs-Send and the streaming preview. */
+  isWorking: boolean
+  /** The turn is running, including while its agent waits on the reader, as a
+   *  structured turn runs on behind its prompt card: its clock keeps counting. */
+  turnActive: boolean
+  awaitingInput: NativeChatAwaitingInput | null
+}
+
+/** The turn facts a terminal-backed pane feeds the shared turn-status UI. */
+export function resolveNativeChatTerminalTurn(args: {
+  isConversation: boolean
+  /** Hook 'working', reconciled with the transcript's turn boundaries. */
+  working: boolean
+  /** Hook 'waiting'/'blocked', reconciled the same way. */
+  hookAwaitingInput: boolean
+  /** Local Stop suppression. */
+  interrupted: boolean
+  /** The pane draws the agent's prompt as a card. */
+  hasPromptCard: boolean
+}): NativeChatTerminalTurn {
+  const { isConversation, working, hookAwaitingInput, interrupted, hasPromptCard } = args
+  const turnActive = shouldShowNativeChatWorking({
+    isConversation,
+    working: working || hookAwaitingInput,
+    interrupted
+  })
+  return {
+    isWorking: shouldShowNativeChatWorking({ isConversation, working, interrupted }),
+    turnActive,
+    // A prompt only the terminal shows is the one wait the transcript has to report.
+    awaitingInput: hasPromptCard ? 'shown' : turnActive && hookAwaitingInput ? 'unshown' : null
+  }
+}
+
+type NativeChatHookTurnEntry = Pick<
+  AgentStatusEntry,
+  'state' | 'stateStartedAt' | 'turnStartedAt' | 'mainAgent' | 'sessionBoundary'
+>
+
+/**
+ * When the pane's current turn began: the host's stamp from the main agent's own turn-opening
+ * event, which survives a remount, a reload and child work holding the row open. A host too old to
+ * stamp it leaves the current state's start, the main agent's while it is mid-turn.
+ */
+export function nativeChatHookTurnStartedAt(
+  entry: NativeChatHookTurnEntry | undefined
+): number | null {
+  if (!entry) {
+    return null
+  }
+  if (entry.turnStartedAt !== undefined) {
+    return entry.turnStartedAt
+  }
+  return entry.mainAgent && entry.mainAgent.state !== 'done'
+    ? entry.mainAgent.stateStartedAt
+    : entry.stateStartedAt
+}
+
+/**
+ * The latest turn's duration by the host, for a turn the pane is not running: a number once the
+ * main agent is done (its done stamp minus the host's turn start), null when the host went quiet
+ * mid-turn (nothing says the turn ended, so a locally measured end would be a false claim), and
+ * undefined to keep what the pane observed (an old host, a session boundary, a pane-side end).
+ */
+export function nativeChatHookLatestTurnWorkedSeconds(
+  entry: NativeChatHookTurnEntry | undefined,
+  hookSilent: boolean
+): number | null | undefined {
+  if (!entry) {
+    return undefined
+  }
+  const mainAgent = entry.mainAgent ?? entry
+  if (mainAgent.state === 'done') {
+    return entry.sessionBoundary === true || entry.turnStartedAt === undefined
+      ? undefined
+      : Math.max(0, Math.floor((mainAgent.stateStartedAt - entry.turnStartedAt) / 1000))
+  }
+  return hookSilent ? null : undefined
+}
+
+/** The transcript's latest turn: its last prompt, harness notices aside. */
+export function nativeChatLatestTurnId(messages: readonly NativeChatMessage[]): string | null {
+  const latest = messages.findLast((message) => message.role === 'user' && !isNoiseMessage(message))
+  return latest?.id ?? null
+}
+
+/**
+ * Durations of the transcript's finished turns, from its own timestamps (one clock): a turn runs
+ * from its prompt to the agent's last timestamped row or its interruption. Other system rows (file
+ * mentions, extension notes) can land long after, next to the following prompt. The latest turn is
+ * left out, since nothing here says it has ended, and so is a turn missing either end, which keeps
+ * what the pane observed.
+ */
+export function nativeChatTranscriptSettledTurns(
+  messages: readonly NativeChatMessage[]
+): NativeChatSettledTurns {
+  const settled = new Map<string, NativeChatSettledTurn>()
+  let turn: { id: string; startedAt: number | null; endedAt: number | null } | null = null
+  for (const message of messages) {
+    // A harness notice is user-role but draws no row, so it neither starts nor extends a turn.
+    if (message.role !== 'user' || isNoiseMessage(message)) {
+      const agentRow =
+        message.role === 'system' ? isInterruptedStatusMessage(message) : message.role !== 'user'
+      if (turn && agentRow && message.timestamp != null) {
+        turn.endedAt = Math.max(turn.endedAt ?? message.timestamp, message.timestamp)
+      }
+      continue
+    }
+    if (turn?.startedAt != null && turn.endedAt != null) {
+      settled.set(turn.id, {
+        startedAt: turn.startedAt,
+        workedSeconds: Math.max(0, Math.floor((turn.endedAt - turn.startedAt) / 1000))
+      })
+    }
+    turn = { id: message.id, startedAt: message.timestamp, endedAt: null }
+  }
+  return settled
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-tool-fold.test.ts b/src/renderer/src/components/native-chat/native-chat-tool-fold.test.ts
index 2e15d24eb2a2..3c83b6a2796d 100644
--- a/src/renderer/src/components/native-chat/native-chat-tool-fold.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-tool-fold.test.ts
@@ -252,3 +252,57 @@ describe('spawn-group roster rows', () => {
     expect(prose.map((block) => block.type)).toEqual(['text', 'subagent-group'])
   })
 })
+
+describe('foldToolMessages — each agent folds into its own run', () => {
+  const child = (
+    overrides: Partial<NativeChatMessage> & Pick<NativeChatMessage, 'id'>
+  ): NativeChatMessage => msg({ agentId: 'task-1', ...overrides })
+  const text = (value: string) => ({ type: 'text' as const, text: value })
+  const call = (name: string) => ({ type: 'tool-call' as const, name, input: {} })
+
+  it("does not fold a subagent's tool calls into its parent's message", () => {
+    const folded = foldToolMessages([
+      msg({ id: 'parent', blocks: [text('delegating')] }),
+      child({ id: 'child-grep', blocks: [call('Grep')] })
+    ])
+    expect(folded.map((message) => message.id)).toEqual(['parent', 'child-grep'])
+    expect(folded[0]?.blocks).toEqual([text('delegating')])
+  })
+
+  it("keeps interleaved agents in order, each call in its own agent's run", () => {
+    const folded = foldToolMessages([
+      msg({ id: 'parent', blocks: [text('delegating')] }),
+      child({ id: 'child', blocks: [text('looking')] }),
+      child({ id: 'child-grep', blocks: [call('Grep')] }),
+      msg({ id: 'parent-read', blocks: [call('Read')] })
+    ])
+    // The parent's later call stays where it happened, below the child's work,
+    // rather than jumping back up into the parent's earlier row.
+    expect(folded.map((message) => message.id)).toEqual(['parent', 'child', 'parent-read'])
+    expect(folded[0]?.blocks).toEqual([text('delegating')])
+    expect(folded[1]?.blocks).toEqual([text('looking'), call('Grep')])
+    expect(folded[1]?.agentId).toBe('task-1')
+    expect(folded[2]?.agentId).toBeUndefined()
+  })
+
+  it("ends every agent's run at a turn boundary", () => {
+    const folded = foldToolMessages([
+      child({ id: 'child', blocks: [text('looking')] }),
+      msg({ id: 'ask', role: 'user', blocks: [text('next')] }),
+      child({ id: 'child-grep', blocks: [call('Grep')] })
+    ])
+    // The child's later call stays in the turn it happened in.
+    expect(folded.map((message) => message.id)).toEqual(['child', 'ask', 'child-grep'])
+  })
+
+  it('folds a transcript that names no producer exactly as a single run', () => {
+    const folded = foldToolMessages([
+      msg({ id: 'a', blocks: [text('one')] }),
+      msg({ id: 'a-call', blocks: [call('Bash')] }),
+      msg({ id: 'notice', role: 'system', blocks: [text('Something happened')] }),
+      msg({ id: 'b-call', blocks: [call('Read')] })
+    ])
+    expect(folded.map((message) => message.id)).toEqual(['a', 'notice', 'b-call'])
+    expect(folded[0]?.blocks).toEqual([text('one'), call('Bash')])
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-transcript-slots.test.ts b/src/renderer/src/components/native-chat/native-chat-transcript-slots.test.ts
index ecb6a183f4ea..4c9083755762 100644
--- a/src/renderer/src/components/native-chat/native-chat-transcript-slots.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-transcript-slots.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import type { NativeChatMessage } from '../../../../shared/native-chat-types'
 import {
+  selectNativeChatActiveTurnKey,
   selectNativeChatTurnStatuses,
   type NativeChatTurnStatus
 } from '../../../../shared/native-chat-turn-status'
@@ -38,12 +39,10 @@ function build(
   return buildNativeChatTranscriptSlots({
     messages,
     turnKeys,
-    latestUserIndex: messages.findLastIndex((message) => message.role === 'user'),
-    currentTurnKey: undefined,
+    activeTurnKey: selectNativeChatActiveTurnKey(messages),
     receipts: new Map<string, NativeChatResolvedPrompt>(),
     turnStatuses: NO_STATUSES,
     turnDiffs: new Map<string, NativeChatTurnDiff>(),
-    showTurnStatus: true,
     expandedTurnKeys: new Set<string>(),
     isWorking: false,
     lifecycleWorking: false,
@@ -112,7 +111,7 @@ describe('transcript slots', () => {
   it('keeps a message whose only content is a turn status under it', () => {
     const status: NativeChatTurnStatus = { startedAt: 1, thinking: false, workedSeconds: 4 }
     const slots = build([text('u', '', 'user')], {
-      latestUserIndex: 0,
+      activeTurnKey: 'u',
       turnStatuses: { active: status, completedByTurn: {} }
     })
     expect(slots).toHaveLength(1)
@@ -139,14 +138,15 @@ describe('transcript slots', () => {
     expect(slots[0]?.receipt).toBe(receipt)
   })
 
-  it('leaves the running turn status to the single transcript-tail indicator', () => {
+  it('puts the running turn bar under the prompt it answers', () => {
     const status: NativeChatTurnStatus = { startedAt: 1, thinking: false, workedSeconds: null }
-    const slots = build([text('u', 'ask', 'user')], {
-      latestUserIndex: 0,
+    const slots = build([text('u', 'ask', 'user'), text('a', 'answer')], {
+      activeTurnKey: 'u',
       turnStatuses: { active: status, completedByTurn: {} },
       isWorking: true
     })
-    expect(slots[0]?.status).toBeUndefined()
+    expect(slots[0]?.status).toBe(status)
+    expect(slots[1]?.status).toBeUndefined()
   })
 
   it('reserves a height for every slot it keeps', () => {
@@ -205,3 +205,179 @@ describe('a send the host rejected', () => {
     ])
   })
 })
+
+// Rows belong to the turn the host says owns them, not to the nearest preceding
+// user bubble. The owned turn keys reshape the fold, the bar and liveness.
+describe('turn-owned grouping', () => {
+  const settled: NativeChatTurnStatus = { startedAt: 1, thinking: false, workedSeconds: 70 }
+  // The #23621 shape: B lands mid-turn, three tool calls follow, one turn.
+  const midTurn = [
+    text('A', 'go', 'user'),
+    toolRun('t1'),
+    text('B', 'and also this', 'user'),
+    toolRun('t2'),
+    toolRun('t3'),
+    toolRun('t4'),
+    text('answer', 'Done.')
+  ]
+  const ownedKeys = midTurn.map(() => 'A')
+
+  it("folds every row of a settled turn behind its opener's bar, across a mid-turn send", () => {
+    const slots = build(midTurn, {
+      turnKeys: ownedKeys,
+      turnStatuses: { active: null, completedByTurn: { A: settled } }
+    })
+    // All four tool rows fold; the steered bubble stays visible with no bar of its own.
+    expect(slots.map((slot) => [slot.message.id, slot.status ?? null])).toEqual([
+      ['A', settled],
+      ['B', null],
+      ['answer', null]
+    ])
+    expect(slots[0]?.turnFolds).toBe(true)
+  })
+
+  it('returns every row of the turn when the reader opens it', () => {
+    const slots = build(midTurn, {
+      turnKeys: ownedKeys,
+      turnStatuses: { active: null, completedByTurn: { A: settled } },
+      expandedTurnKeys: new Set(['A'])
+    })
+    expect(slots.map((slot) => slot.message.id)).toEqual([
+      'A',
+      't1',
+      'B',
+      't2',
+      't3',
+      't4',
+      'answer'
+    ])
+  })
+
+  it("anchors a provider-opened turn's bar above its first row", () => {
+    const messages = [text('u1', 'earlier', 'user'), toolRun('w1'), text('done', 'Woke up.')]
+    const slots = build(messages, {
+      turnKeys: ['u1', 'wake', 'wake'],
+      activeTurnKey: 'wake',
+      turnStatuses: { active: settled, completedByTurn: {} },
+      isWorking: true
+    })
+    expect(slots.map((slot) => [slot.message.id, slot.status ?? null, slot.statusAbove])).toEqual([
+      ['u1', null, false],
+      ['w1', settled, true],
+      ['done', null, false]
+    ])
+  })
+
+  it("rolls a turn's diff up once, under its last row, when another prompt lands among its rows", () => {
+    // B opens its own turn but was sent before A's last row was written.
+    const messages = [
+      text('A', 'go', 'user'),
+      toolRun('t1'),
+      text('B', 'next', 'user'),
+      text('a-answer', 'Done with A.'),
+      toolRun('b1')
+    ]
+    const diff = (added: number): NativeChatTurnDiff => ({
+      files: [],
+      added,
+      removed: 0,
+      truncated: false
+    })
+    const slots = build(messages, {
+      turnKeys: ['A', 'A', 'B', 'A', 'B'],
+      turnDiffs: new Map([
+        ['A', diff(1)],
+        ['B', diff(2)]
+      ])
+    })
+    expect(
+      slots.filter((slot) => slot.turnDiff).map((slot) => [slot.message.id, slot.turnDiff?.added])
+    ).toEqual([
+      ['a-answer', 1],
+      ['b1', 2]
+    ])
+  })
+
+  it("keeps a running turn's rows live while a newer message waits behind it", () => {
+    const messages = [text('A', 'go', 'user'), toolRun('t1'), text('C', 'next up', 'user')]
+    const slots = build(messages, {
+      turnKeys: ['A', 'A', 'C'],
+      activeTurnKey: 'A',
+      isWorking: true
+    })
+    expect(slots.map((slot) => [slot.message.id, slot.activeTurnIsWorking])).toEqual([
+      ['A', true],
+      ['t1', true],
+      ['C', false]
+    ])
+  })
+})
+
+describe("a subagent's rows speak as that subagent", () => {
+  const settled: NativeChatTurnStatus = { startedAt: 1, thinking: false, workedSeconds: 5 }
+  const roster: NativeChatMessage = {
+    id: 'roster',
+    role: 'system',
+    blocks: [
+      {
+        type: 'subagent-group',
+        groupId: 'group-1',
+        agents: [{ id: 'task-1', label: 'explore the lane', state: 'working' }]
+      }
+    ],
+    timestamp: 1,
+    source: 'transcript'
+  }
+  const child = (id: string, body: string, agentId = 'task-1'): NativeChatMessage => ({
+    ...text(id, body),
+    agentId
+  })
+  const messages = [
+    text('ask', 'summarise the repo', 'user'),
+    text('answer', 'Delegated; the summary follows.'),
+    roster,
+    child('child-said', 'The PR is CLEAN.')
+  ]
+
+  it("keeps the parent's answer on a settled turn and folds the subagent's later words", () => {
+    const slots = build(messages, {
+      turnStatuses: { active: null, completedByTurn: { ask: settled } },
+      subagentLabels: new Map([['task-1', 'explore the lane']])
+    })
+    const drawn = slots.filter((slot) => !slot.folded).map((slot) => slot.message.id)
+    expect(drawn).toContain('answer')
+    expect(drawn).not.toContain('child-said')
+  })
+
+  it("names the subagent on its row from the roster, and only on a subagent's row", () => {
+    const slots = build(messages, {
+      subagentLabels: new Map([['task-1', 'explore the lane']])
+    })
+    const labelOf = (id: string) => slots.find((slot) => slot.message.id === id)?.subagentLabel
+    expect(labelOf('child-said')).toBe('explore the lane')
+    expect(labelOf('answer')).toBeUndefined()
+  })
+
+  it("keeps the parent's run live while its subagent works below it", () => {
+    const trailing = (rows: NativeChatMessage[]) =>
+      build(rows)
+        .filter((slot) => slot.trailingRun)
+        .map((slot) => slot.message.id)
+    const childRun: NativeChatMessage = { ...toolRun('child-run'), agentId: 'task-1' }
+    // The parent is still inside its spawn call; the child's work does not move it past.
+    expect(trailing([text('ask', 'go', 'user'), toolRun('spawn'), childRun])).toEqual([
+      'spawn',
+      'child-run'
+    ])
+    // The parent answering does move it past its own run, whatever the child does.
+    expect(
+      trailing([text('ask', 'go', 'user'), toolRun('spawn'), text('said', 'Done.'), childRun])
+    ).toEqual(['said', 'child-run'])
+  })
+
+  it('reserves room for the caption on a subagent row', () => {
+    const [parentSlot] = build([text('mine', 'same words')])
+    const [childSlot] = build([child('theirs', 'same words')])
+    expect(childSlot!.estimatedHeight).toBeGreaterThan(parentSlot!.estimatedHeight)
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-transcript-slots.ts b/src/renderer/src/components/native-chat/native-chat-transcript-slots.ts
index bf1b3f3e75cc..b3631fb80125 100644
--- a/src/renderer/src/components/native-chat/native-chat-transcript-slots.ts
+++ b/src/renderer/src/components/native-chat/native-chat-transcript-slots.ts
@@ -13,7 +13,13 @@ import {
   isToolCallBlock,
   type NativeChatMessage
 } from '../../../../shared/native-chat-types'
-import type { NativeChatTurnStatus } from '../../../../shared/native-chat-turn-status'
+import { agentJournalItemSubagentId } from '../../../../shared/agent-session-journal-producer'
+import { nativeChatSubagentLabel } from '../../../../shared/native-chat-subagent-attribution'
+import {
+  NATIVE_CHAT_UNANCHORED_TURN_KEY,
+  type NativeChatTurnStatus
+} from '../../../../shared/native-chat-turn-status'
+import { nativeChatSelfAnchoredTurnRows } from '../../../../shared/native-chat-turn-grouping'
 import {
   nativeChatTurnFold,
   type NativeChatTurnFoldRow
@@ -42,12 +48,18 @@ export type NativeChatTranscriptSlot = {
   receipt: NativeChatResolvedPrompt | undefined
   /** Turn timing shown under this row, already filtered to "should render". */
   status: NativeChatTurnStatus | undefined
+  /** The bar renders above the row: this turn has no user bubble of its own
+   *  (provider-opened), so its bar sits at the turn's position instead. */
+  statusAbove?: boolean
   /** This row is behind its turn's folded status row: it draws no prose and no
    *  tool activity, only work that outlives the turn. */
   folded: boolean
   /** Whether this row's turn hides anything, so its status row offers a caret. */
   turnFolds: boolean
   turnDiff: NativeChatTurnDiff | undefined
+  /** The roster's name for the subagent that wrote this row, when one names it.
+   *  Whether a subagent wrote it at all is the message's own linkage. */
+  subagentLabel: string | undefined
   /** Height to reserve before the row has ever been measured. */
   estimatedHeight: number
 }
@@ -55,20 +67,21 @@ export type NativeChatTranscriptSlot = {
 export type NativeChatTranscriptSlotsInput = {
   messages: readonly NativeChatMessage[]
   turnKeys: readonly (string | undefined)[]
-  latestUserIndex: number
-  currentTurnKey: string | undefined
+  /** The transcript key whose bar carries the live turn's status. */
+  activeTurnKey: string
   receipts: ReadonlyMap<string, NativeChatResolvedPrompt>
   turnStatuses: {
     active: NativeChatTurnStatus | null
     completedByTurn: Readonly<Record<string, NativeChatTurnStatus>>
   }
   turnDiffs: ReadonlyMap<string, NativeChatTurnDiff>
-  showTurnStatus: boolean
   /** Turns the reader opened. Everything else with a duration stays folded. */
   expandedTurnKeys: ReadonlySet<string>
   isWorking: boolean
   /** Session-level lifecycle, which outlives a transcript that never said "done". */
   lifecycleWorking: boolean
+  /** Each subagent's roster label, by the id its rows carry. */
+  subagentLabels?: ReadonlyMap<string, string>
 }
 
 export function buildNativeChatTranscriptSlots(
@@ -77,20 +90,20 @@ export function buildNativeChatTranscriptSlots(
   const {
     messages,
     turnKeys,
-    latestUserIndex,
-    currentTurnKey,
+    activeTurnKey,
     receipts,
     turnStatuses,
     turnDiffs,
-    showTurnStatus,
     expandedTurnKeys,
     isWorking,
-    lifecycleWorking
+    lifecycleWorking,
+    subagentLabels
   } = input
   // One pass to decide what each row draws, then the fold over those readings —
   // so "is this the answer" and "does this row render prose" cannot disagree.
   const foldRows: NativeChatTurnFoldRow[] = messages.map((message, index) => {
     const content = deriveNativeChatRowContent(message.blocks)
+    const agentId = agentJournalItemSubagentId(message)
     return {
       turnKey: turnKeys[index],
       role: message.role,
@@ -99,45 +112,73 @@ export function buildNativeChatTranscriptSlots(
       // and its plain-text twin is then the only record the spawn happened.
       outlivesTurn: message.blocks.some(
         (block) => isSubagentGroupBlock(block) || isBackgroundTaskBlock(block)
-      )
+      ),
+      ...(agentId === null ? {} : { agentId })
     }
   })
   // Liveness is the turn's, not any one call's: the run at the frontier stays
   // live between its calls, and a run the agent has moved past is settled even
   // while its last call is still reporting. An approval's receipt decides a call
   // of the run above it, which then runs, so it does not move past that run.
-  const trailingRunIndex = foldRows.findLastIndex(
-    (row, index) =>
+  // Each agent has its own frontier: a subagent working below its parent's run
+  // has not moved the parent past it.
+  const trailingRunIndexes = new Set<number>()
+  const agentsWithFrontier = new Set<string | null>()
+  for (let index = foldRows.length - 1; index >= 0; index -= 1) {
+    const row = foldRows[index]!
+    const agent = agentJournalItemSubagentId(messages[index])
+    if (
+      !agentsWithFrontier.has(agent) &&
       row.role !== 'user' &&
       row.role !== 'reasoning' &&
       receipts.get(messages[index].id)?.kind !== 'approval' &&
       (row.rendersProse || messages[index].blocks.some(isToolCallBlock))
-  )
+    ) {
+      trailingRunIndexes.add(index)
+      agentsWithFrontier.add(agent)
+    }
+  }
   const settledTurnKeys = new Set(
-    showTurnStatus
-      ? Object.entries(turnStatuses.completedByTurn)
-          .filter(([, status]) => status.workedSeconds != null)
-          .map(([turnKey]) => turnKey)
-      : []
+    Object.entries(turnStatuses.completedByTurn)
+      .filter(([, status]) => status.workedSeconds != null)
+      .map(([turnKey]) => turnKey)
   )
   const { foldedRows, foldableTurnKeys } = nativeChatTurnFold({
     rows: foldRows,
     settledTurnKeys,
     expandedTurnKeys
   })
+  // A turn with no user bubble (provider-opened) anchors its bar at its first row.
+  const selfAnchors = nativeChatSelfAnchoredTurnRows(messages, turnKeys)
+  // A turn's rows need not be contiguous (another turn's prompt can land among
+  // them), so its rollup goes under its last row, not every run boundary.
+  const lastRowByTurn = new Map<string, number>()
+  turnKeys.forEach((turnKey, index) => {
+    if (turnKey !== undefined) {
+      lastRowByTurn.set(turnKey, index)
+    }
+  })
   const slots: NativeChatTranscriptSlot[] = []
   for (const [index, message] of messages.entries()) {
     const turnKey = turnKeys[index]
     const receipt = receipts.get(message.id)
+    const anchorsTurnHere = turnKey !== undefined && selfAnchors.get(turnKey) === index
+    // Only the bubble that opened a turn carries its bar: a message the provider
+    // folded into a running turn shares the turn's key but not its bar.
     const candidateStatus =
-      index === latestUserIndex
+      message.role === 'user' && message.id === activeTurnKey
         ? turnStatuses.active
-        : message.role === 'user' && turnKey
+        : message.role === 'user' && turnKey === message.id
           ? turnStatuses.completedByTurn[turnKey]
-          : undefined
-    const status =
-      showTurnStatus && candidateStatus?.workedSeconds != null ? candidateStatus : undefined
-    const turnDiff = turnKey && turnKeys[index + 1] !== turnKey ? turnDiffs.get(turnKey) : undefined
+          : anchorsTurnHere
+            ? turnKey === activeTurnKey
+              ? (turnStatuses.active ?? turnStatuses.completedByTurn[turnKey])
+              : turnStatuses.completedByTurn[turnKey]
+            : undefined
+    // The live turn's bar carries its running clock; it settles in place.
+    const status = candidateStatus ?? undefined
+    const turnDiff =
+      turnKey && lastRowByTurn.get(turnKey) === index ? turnDiffs.get(turnKey) : undefined
     const folded = foldedRows.has(index)
     // Skipping a folded row entirely is what keeps windowing honest: a counted
     // index the row declines to draw reserves estimated height for nothing and
@@ -147,23 +188,31 @@ export function buildNativeChatTranscriptSlots(
     if (!drawsRow && status === undefined && turnDiff === undefined) {
       continue
     }
+    const subagentId = agentJournalItemSubagentId(message)
     slots.push({
       message,
       turnKey,
+      // Liveness is the owning turn's, not the newest prompt's: a running turn's
+      // rows stay live while a newer message waits behind it.
       activeTurnIsWorking:
-        (currentTurnKey ? turnKey === currentTurnKey : turnKey === undefined) &&
+        (turnKey === activeTurnKey ||
+          (turnKey === undefined && activeTurnKey === NATIVE_CHAT_UNANCHORED_TURN_KEY)) &&
         (isWorking || lifecycleWorking),
-      trailingRun: index === trailingRunIndex,
+      trailingRun: trailingRunIndexes.has(index),
       receipt,
       status: status ?? undefined,
+      statusAbove: anchorsTurnHere && status !== undefined,
       folded,
       turnFolds: turnKey !== undefined && foldableTurnKeys.has(turnKey),
       turnDiff,
+      subagentLabel: nativeChatSubagentLabel(subagentLabels, message),
       estimatedHeight: estimateNativeChatRowHeight(nativeChatRowContentMetrics(message), {
         hasReceipt: receipt !== undefined,
         hasStatus: status !== undefined,
         hasTurnDiff: turnDiff !== undefined,
-        folded
+        folded,
+        // Only an agent's own row draws the caption; a receipt stands in for it.
+        attributed: subagentId !== null && receipt === undefined && message.role !== 'user'
       })
     })
   }
diff --git a/src/renderer/src/components/native-chat/native-chat-typing-indicator.test.ts b/src/renderer/src/components/native-chat/native-chat-typing-indicator.test.ts
deleted file mode 100644
index b53b217eb152..000000000000
--- a/src/renderer/src/components/native-chat/native-chat-typing-indicator.test.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { NATIVE_CHAT_STREAMING_ID } from '../../../../shared/native-chat-streaming'
-import type { NativeChatMessage } from '../../../../shared/native-chat-types'
-import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
-import { projectStructuredItemsToNativeChat } from '../../../../shared/structured-agent-session-projection'
-import { shouldShowNativeChatTypingIndicator } from './native-chat-typing-indicator'
-
-function message(id: string, role: NativeChatMessage['role'], text = id): NativeChatMessage {
-  return { id, role, blocks: [{ type: 'text', text }], timestamp: null, source: 'transcript' }
-}
-
-describe('shouldShowNativeChatTypingIndicator', () => {
-  it('stays hidden when the session is idle', () => {
-    expect(
-      shouldShowNativeChatTypingIndicator({
-        messages: [message('u1', 'user')],
-        isWorking: false
-      })
-    ).toBe(false)
-  })
-
-  it('shows once a send lands and no assistant row exists yet', () => {
-    expect(
-      shouldShowNativeChatTypingIndicator({
-        messages: [message('a0', 'assistant'), message('u1', 'user')],
-        isWorking: true
-      })
-    ).toBe(true)
-  })
-
-  it('hides as soon as the structured reply row arrives, before working clears', () => {
-    expect(
-      shouldShowNativeChatTypingIndicator({
-        messages: [message('u1', 'user'), message('orca-item', 'assistant')],
-        isWorking: true
-      })
-    ).toBe(false)
-  })
-
-  it('hides behind the PTY streaming bubble', () => {
-    expect(
-      shouldShowNativeChatTypingIndicator({
-        messages: [message('u1', 'user'), message(NATIVE_CHAT_STREAMING_ID, 'assistant')],
-        isWorking: true
-      })
-    ).toBe(false)
-  })
-
-  it('does not flicker back on when a system row interleaves mid-turn', () => {
-    expect(
-      shouldShowNativeChatTypingIndicator({
-        messages: [
-          message('u1', 'user'),
-          message('a1', 'assistant'),
-          message('s1', 'system', 'Ran /status')
-        ],
-        isWorking: true
-      })
-    ).toBe(false)
-  })
-
-  it('shows again for the next send even though an earlier turn replied', () => {
-    expect(
-      shouldShowNativeChatTypingIndicator({
-        messages: [message('u1', 'user'), message('a1', 'assistant'), message('u2', 'user')],
-        isWorking: true
-      })
-    ).toBe(true)
-  })
-
-  it('does not let an unresolved tool from an earlier turn hide the next send indicator', () => {
-    const earlierRunningTool: NativeChatMessage = {
-      id: 'tool-old',
-      role: 'assistant',
-      blocks: [
-        { type: 'tool-call', name: 'shell', input: { command: 'sleep 1' }, state: 'running' }
-      ],
-      timestamp: null,
-      source: 'transcript'
-    }
-    expect(
-      shouldShowNativeChatTypingIndicator({
-        messages: [earlierRunningTool, message('a1', 'assistant'), message('u2', 'user')],
-        isWorking: true
-      })
-    ).toBe(true)
-  })
-
-  it('shows after a slash-command marker even though an earlier turn replied', () => {
-    expect(
-      shouldShowNativeChatTypingIndicator({
-        messages: [
-          message('a1', 'assistant'),
-          message('command:compact', 'system', 'Ran /compact')
-        ],
-        isWorking: true
-      })
-    ).toBe(true)
-  })
-
-  it('shows on a session whose transcript is still empty', () => {
-    expect(shouldShowNativeChatTypingIndicator({ messages: [], isWorking: true })).toBe(true)
-  })
-})
-
-// These build rows through the REAL structured projection instead of hand-made
-// `command:` marker ids. The hand-made ids only exist on the PTY transport, so
-// tests using them were blind to how the shipping transport actually looks.
-describe('with rows projected from the structured journal', () => {
-  function toolCallItem(sequence: number): AgentJournalRenderItem {
-    return {
-      itemId: `codex:thread-1:turn-1:${sequence}`,
-      revision: 1,
-      sequence,
-      observedAt: 1_800_000_000_000,
-      body: {
-        kind: 'tool-call',
-        name: 'shell',
-        state: 'running',
-        input: { command: 'sed -n 1,240p README.md' }
-      }
-    } as AgentJournalRenderItem
-  }
-
-  function assistantTextItem(sequence: number): AgentJournalRenderItem {
-    return {
-      itemId: `codex:thread-1:turn-1:${sequence}`,
-      revision: 1,
-      sequence,
-      observedAt: 1_800_000_000_000,
-      body: {
-        kind: 'message',
-        role: 'assistant',
-        blocks: [{ type: 'text', text: "I'm checking PR 14696's metadata." }]
-      }
-    } as AgentJournalRenderItem
-  }
-
-  it('stays visible beside the structured live tool row while a command runs', () => {
-    const messages = projectStructuredItemsToNativeChat([assistantTextItem(1), toolCallItem(2)])
-    expect(messages.at(-1)?.role).toBe('assistant')
-    expect(shouldShowNativeChatTypingIndicator({ messages, isWorking: true })).toBe(true)
-  })
-
-  it('hides once prose is the newest row', () => {
-    const messages = projectStructuredItemsToNativeChat([toolCallItem(1), assistantTextItem(2)])
-    expect(shouldShowNativeChatTypingIndicator({ messages, isWorking: true })).toBe(false)
-  })
-
-  it('stays hidden when the turn is not working, command row or not', () => {
-    const messages = projectStructuredItemsToNativeChat([toolCallItem(1)])
-    expect(shouldShowNativeChatTypingIndicator({ messages, isWorking: false })).toBe(false)
-  })
-})
diff --git a/src/renderer/src/components/native-chat/native-chat-typing-indicator.ts b/src/renderer/src/components/native-chat/native-chat-typing-indicator.ts
deleted file mode 100644
index 144560278a24..000000000000
--- a/src/renderer/src/components/native-chat/native-chat-typing-indicator.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import type { NativeChatMessage } from '../../../../shared/native-chat-types'
-import { NATIVE_CHAT_STREAMING_ID } from '../../../../shared/native-chat-streaming'
-import { isCommandMarkerId } from './native-chat-command-marker'
-
-function isToolActivityOnlyRow(message: NativeChatMessage): boolean {
-  const blocks = message.blocks
-  if (!blocks || blocks.length === 0) {
-    return false
-  }
-  return blocks.every((block) => block.type === 'tool-call' || block.type === 'tool-result')
-}
-
-export function shouldShowNativeChatTypingIndicator(args: {
-  messages: readonly NativeChatMessage[]
-  isWorking: boolean
-}): boolean {
-  if (!args.isWorking) {
-    return false
-  }
-  const { messages } = args
-  for (let index = messages.length - 1; index >= 0; index -= 1) {
-    const message = messages[index]
-    if (!message || message.role === 'user' || isCommandMarkerId(message.id)) {
-      return true
-    }
-    if (isToolActivityOnlyRow(message)) {
-      return true
-    }
-    if (message.role === 'assistant' || message.id === NATIVE_CHAT_STREAMING_ID) {
-      return false
-    }
-  }
-  return true
-}
diff --git a/src/renderer/src/components/native-chat/native-chat-view-state.test.ts b/src/renderer/src/components/native-chat/native-chat-view-state.test.ts
index ea97ec99a191..39bf20322b50 100644
--- a/src/renderer/src/components/native-chat/native-chat-view-state.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-view-state.test.ts
@@ -34,7 +34,30 @@ describe('selectNativeChatViewState', () => {
     })
   })
 
-  it('maps error with its message', () => {
+  it('maps error with its message when nothing has loaded (P2-21)', () => {
+    const state = selectNativeChatViewState(
+      session({ messages: [], status: 'error', error: 'boom' })
+    )
+    expect(state).toEqual({ kind: 'error', message: 'boom' })
+  })
+
+  // The pane's own translated line fills in, which for the structured chat says the read retries.
+  it('maps an error with no text to no message', () => {
+    expect(selectNativeChatViewState(session({ messages: [], status: 'error' }))).toEqual({
+      kind: 'error'
+    })
+  })
+
+  it('keeps a loaded transcript on screen when a later read fails (P2-21)', () => {
+    const state = selectNativeChatViewState(session({ status: 'error', error: 'boom' }), {
+      readRetries: true
+    })
+    expect(state).toEqual({ kind: 'ready', isWorking: false })
+  })
+
+  // The terminal-backed read does not retry; its only messages on error are local echoes (a launch
+  // prompt, a pending send), which must not hide the error and its way back to the terminal.
+  it('shows a terminal-backed read error over local echoes', () => {
     const state = selectNativeChatViewState(session({ status: 'error', error: 'boom' }))
     expect(state).toEqual({ kind: 'error', message: 'boom' })
   })
diff --git a/src/renderer/src/components/native-chat/native-chat-view-state.ts b/src/renderer/src/components/native-chat/native-chat-view-state.ts
index 775635df1229..13a7e8a5afe6 100644
--- a/src/renderer/src/components/native-chat/native-chat-view-state.ts
+++ b/src/renderer/src/components/native-chat/native-chat-view-state.ts
@@ -10,23 +10,36 @@ import type { NativeChatSession } from '../../../../shared/native-chat-types'
  *  live in-flight indicator. The rest are full-pane states. */
 export type NativeChatViewState =
   | { kind: 'loading' }
-  | { kind: 'error'; message: string }
+  | { kind: 'error'; message?: string }
   | { kind: 'empty' }
   | { kind: 'ready'; isWorking: false }
   | { kind: 'ready'; isWorking: true }
 
 /**
- * Decide which surface to render. Error is terminal, but any renderable message
- * wins over loading/empty so optimistic first sends never get replaced by a
- * full-pane placeholder while transcript discovery catches up.
+ * Decide which surface to render. Any renderable message wins over loading/empty so optimistic
+ * first sends never get replaced while transcript discovery catches up. Where the read retries on
+ * its own (the structured chat), messages win over an error too: a read that fails after the
+ * transcript loaded keeps it, and the error reaches the composer's error line. The terminal-backed
+ * read does not retry, and its only messages on error are local echoes, so its error takes the pane.
  */
-export function selectNativeChatViewState(session: NativeChatSession): NativeChatViewState {
-  if (session.status === 'error') {
-    return { kind: 'error', message: session.error ?? 'Conversation could not be loaded.' }
+export function selectNativeChatViewState(
+  session: NativeChatSession,
+  { readRetries = false }: { readRetries?: boolean } = {}
+): NativeChatViewState {
+  // No text of its own: the empty state supplies the pane's translated line.
+  const error: NativeChatViewState | null =
+    session.status === 'error'
+      ? { kind: 'error', ...(session.error ? { message: session.error } : {}) }
+      : null
+  if (error && !readRetries) {
+    return error
   }
   if (session.messages.length > 0) {
     return { kind: 'ready', isWorking: session.status === 'working' }
   }
+  if (error) {
+    return error
+  }
   if (session.status === 'loading') {
     return { kind: 'loading' }
   }
diff --git a/src/renderer/src/components/native-chat/native-chat-working-status-shared-clock.test.tsx b/src/renderer/src/components/native-chat/native-chat-working-status-shared-clock.test.tsx
index e4bae2920046..8600d40c3caa 100644
--- a/src/renderer/src/components/native-chat/native-chat-working-status-shared-clock.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-working-status-shared-clock.test.tsx
@@ -20,7 +20,7 @@ function renderTurns(count: number, startedAt: number): void {
     root.render(
       <>
         {Array.from({ length: count }, (_, index) => (
-          <NativeChatWorkingStatus key={index} startedAt={startedAt} thinking={false} />
+          <NativeChatWorkingStatus key={index} startedAt={startedAt} />
         ))}
       </>
     )
@@ -61,9 +61,7 @@ describe('native chat working status elapsed clock', () => {
 
   it('renders the compact duration in the completed status label', () => {
     act(() => {
-      root.render(
-        <NativeChatWorkingStatus startedAt={1_000_000} thinking={false} workedSeconds={69} />
-      )
+      root.render(<NativeChatWorkingStatus startedAt={1_000_000} workedSeconds={69} />)
     })
 
     expect(elapsedLabels()).toEqual(['Worked for 1m 9s'])
@@ -96,14 +94,9 @@ describe('native chat working status elapsed clock', () => {
     expect(vi.getTimerCount()).toBe(1)
   })
 
-  it('holds no timer for a thinking turn or a completed turn', () => {
+  it('holds no timer for a completed turn', () => {
     act(() => {
-      root.render(
-        <>
-          <NativeChatWorkingStatus startedAt={1_000_000} thinking />
-          <NativeChatWorkingStatus startedAt={1_000_000} thinking={false} workedSeconds={12} />
-        </>
-      )
+      root.render(<NativeChatWorkingStatus startedAt={1_000_000} workedSeconds={12} />)
     })
     expect(vi.getTimerCount()).toBe(0)
   })
diff --git a/src/renderer/src/components/native-chat/structured-agent-question-projection.test.ts b/src/renderer/src/components/native-chat/structured-agent-question-projection.test.ts
index ab74c2efef24..09154a2512a9 100644
--- a/src/renderer/src/components/native-chat/structured-agent-question-projection.test.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-question-projection.test.ts
@@ -215,3 +215,19 @@ describe('structured agent session ask-row projection', () => {
     ).toHaveLength(1)
   })
 })
+
+describe("a subagent's pending question keeps its producer", () => {
+  it('carries the linkage onto the row that stands in for the question', () => {
+    const projected = projectQuestion({
+      ...item('child-q', {
+        kind: 'question',
+        question: 'Which branch?',
+        options: [{ id: 'q1:main', label: 'main' }],
+        resolution: { ...PENDING }
+      }),
+      agentId: 'task-1',
+      producerKind: 'agent'
+    })
+    expect(projected).toMatchObject({ role: 'system', agentId: 'task-1' })
+  })
+})
diff --git a/src/renderer/src/components/native-chat/structured-agent-question-projection.ts b/src/renderer/src/components/native-chat/structured-agent-question-projection.ts
index b56fa1c7ab0e..da2478761191 100644
--- a/src/renderer/src/components/native-chat/structured-agent-question-projection.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-question-projection.ts
@@ -4,6 +4,8 @@ import type {
 } from '../../../../shared/agent-session-journal-types'
 import { isAskUserQuestionTool } from '../../../../shared/agent-question-answered-intent'
 import { parseAskFromToolInput } from '../../../../shared/native-chat-ask'
+import { agentJournalItemRowOrigin } from '../../../../shared/agent-session-journal-position'
+import { agentJournalLinkageFields } from '../../../../shared/agent-session-journal-producer'
 import type { NativeChatMessage } from '../../../../shared/native-chat-types'
 import { projectStructuredItemToNativeChat } from '../../../../shared/structured-agent-session-projection'
 import { readAgentJournalTurn } from '../../../../shared/agent-session-turn-record'
@@ -69,10 +71,9 @@ function projectItem(item: AgentJournalRenderItem): Projection {
     if (body.resolution.state === 'pending') {
       // A system row preserves question identity through tool folding; the receipt renders its body.
       message = {
-        id: item.itemId,
+        ...agentJournalItemRowOrigin(item),
+        ...agentJournalLinkageFields(item),
         role: 'system',
-        timestamp: item.observedAt,
-        source: 'transcript',
         blocks: [{ type: 'text', text: body.question }]
       }
     }
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.test.ts
new file mode 100644
index 000000000000..faadac1127ef
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.test.ts
@@ -0,0 +1,414 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentSessionFailureFact } from '../../../../shared/agent-session-failure'
+import type {
+  AgentJournalRenderItem,
+  AgentJournalSubmission
+} from '../../../../shared/agent-session-journal-types'
+import {
+  createStructuredAgentSessionOutboxEntry,
+  type StructuredAgentSessionOutboxEntry
+} from '../../../../shared/structured-agent-session-outbox'
+import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words'
+import {
+  agentJournalItemKey,
+  agentJournalSubmissionKey
+} from '../../../../shared/agent-session-journal-item-key'
+import { structuredAgentSessionStartFailureRowIdentity } from '../../../../shared/structured-agent-session-start-failure-row-key'
+import {
+  structuredAgentSessionDeliveryNotices,
+  structuredAgentSessionStartFailureFacts
+} from './structured-agent-session-delivery-notices'
+
+function entry(
+  clientMessageId: string,
+  patch: Partial<StructuredAgentSessionOutboxEntry> = {}
+): StructuredAgentSessionOutboxEntry {
+  return {
+    ...createStructuredAgentSessionOutboxEntry({
+      clientMessageId,
+      sessionId: 'session-1',
+      text: clientMessageId,
+      attachments: [],
+      queuedAt: 1
+    }),
+    ...patch
+  }
+}
+
+function texts(
+  outbox: StructuredAgentSessionOutboxEntry[],
+  blocked: string | null = null,
+  submissions: readonly AgentJournalSubmission[] = [],
+  startFailures: readonly AgentSessionFailureFact[] = []
+): Record<string, string> {
+  const notices = structuredAgentSessionDeliveryNotices(
+    outbox,
+    blocked,
+    'Claude',
+    () => {},
+    submissions,
+    startFailures
+  )
+  return Object.fromEntries([...notices].map(([id, notice]) => [id, notice.text]))
+}
+
+describe('the notice on each message that did not go through', () => {
+  it('gives two failed messages each their own reason and their own Retry', () => {
+    const retry = vi.fn()
+    const notices = structuredAgentSessionDeliveryNotices(
+      [
+        entry('first', {
+          state: 'rejected',
+          lastFailure: { kind: 'rejected', reason: 'Claude messages support at most 20 images' }
+        }),
+        entry('second', {
+          state: 'rejected',
+          lastFailure: {
+            kind: 'rejected',
+            reason: 'Claude never finished starting, so Orca stopped it.',
+            rejection: { kind: 'hostStopped' }
+          }
+        })
+      ],
+      null,
+      'Claude',
+      retry,
+      [],
+      []
+    )
+
+    expect([...notices.keys()]).toEqual([
+      agentJournalSubmissionKey('first'),
+      agentJournalSubmissionKey('second')
+    ])
+    expect(notices.get(agentJournalSubmissionKey('first'))?.text).toBe(
+      'Claude messages support at most 20 images'
+    )
+    expect(notices.get(agentJournalSubmissionKey('second'))?.text).toBe(
+      'Claude never finished starting, so Orca stopped it.'
+    )
+    notices.get(agentJournalSubmissionKey('second'))?.onRetry?.()
+    expect(retry).toHaveBeenCalledExactlyOnceWith('second')
+  })
+
+  it('chooses the words from the saved refusal on the message the queue stopped on', () => {
+    expect(
+      texts(
+        [
+          entry('held', {
+            lastFailure: { kind: 'refused', code: 'agent_session_owner_restart_failed' }
+          })
+        ],
+        'held'
+      )
+    ).toEqual({
+      [agentJournalSubmissionKey('held')]: "The agent couldn't restart. Your message was not sent."
+    })
+  })
+
+  // The same rule as a rejected row's: its own Retry is the resend step, and any other step stays.
+  it('leaves a retry step to the Retry beside the message the queue stopped on', () => {
+    const held = (lastFailure: StructuredAgentSessionOutboxEntry['lastFailure']) =>
+      texts([entry('held', { lastFailure })], 'held')
+    expect(
+      held({
+        kind: 'refused',
+        code: 'agent_session_journal_unreadable',
+        details: { reason: 'journalUnavailable' }
+      })
+    ).toEqual({
+      [agentJournalSubmissionKey('held')]:
+        "Orca couldn't open this chat's history right now. Your message was not sent."
+    })
+    expect(
+      held({
+        kind: 'refused',
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'notSignedIn' }
+      })
+    ).toEqual({
+      [agentJournalSubmissionKey('held')]:
+        'Your message was not sent. Claude is not signed in for the selected account. Sign in first.'
+    })
+  })
+
+  it('says a message is unconfirmed, and only that it was not sent when nothing more is known', () => {
+    expect(texts([entry('doubt', { state: 'unconfirmed' })])).toEqual({
+      [agentJournalSubmissionKey('doubt')]: 'Message delivery is unconfirmed.'
+    })
+    expect(texts([entry('bare')], 'bare')).toEqual({
+      [agentJournalSubmissionKey('bare')]: 'Message was not sent.'
+    })
+  })
+
+  // The drain's own rule: a message behind the one the queue stopped on is only waiting, so it says
+  // nothing. A rejected message holds nothing up and keeps its words.
+  it('says why on the message the queue stopped on and on every rejected one', () => {
+    expect(
+      texts([
+        entry('sent', { state: 'dispatching' }),
+        entry('rejected', { state: 'rejected' }),
+        entry('stuck', { state: 'unconfirmed' }),
+        entry('behind', { state: 'unconfirmed' }),
+        entry('queued')
+      ])
+    ).toEqual({
+      [agentJournalSubmissionKey('rejected')]: 'Message was not sent.',
+      [agentJournalSubmissionKey('stuck')]: 'Message delivery is unconfirmed.'
+    })
+  })
+
+  // Its Retry would put it back in the queue to wait unseen behind the stopped message.
+  it('keeps a rejected message its words but not its Retry while the queue is stopped', () => {
+    const retry = vi.fn()
+    for (const [outbox, blocked] of [
+      [[entry('stuck', { state: 'unconfirmed' }), entry('rejected', { state: 'rejected' })], null],
+      [[entry('rejected', { state: 'rejected' }), entry('held')], 'held']
+    ] as const) {
+      const notices = structuredAgentSessionDeliveryNotices(
+        [...outbox],
+        blocked,
+        'Claude',
+        retry,
+        [],
+        []
+      )
+      expect(notices.get(agentJournalSubmissionKey('rejected'))).toEqual({
+        text: 'Message was not sent.'
+      })
+    }
+  })
+
+  // Beside its own Retry the resend step is the button; without one the words keep it.
+  it('leaves out sending again only where the message has its own Retry', () => {
+    const startFailed = (clientMessageId: string): StructuredAgentSessionOutboxEntry =>
+      entry(clientMessageId, {
+        state: 'rejected',
+        lastFailure: {
+          kind: 'rejected',
+          reason: 'Claude stopped before it finished starting. Send your message to try again.',
+          rejection: { kind: 'providerStartFailed' }
+        }
+      })
+    expect(texts([startFailed('first'), startFailed('second')])).toEqual({
+      [agentJournalSubmissionKey('first')]: 'Claude stopped before it finished starting.',
+      [agentJournalSubmissionKey('second')]: 'Claude stopped before it finished starting.'
+    })
+    expect(texts([startFailed('rejected'), entry('held')], 'held')).toMatchObject({
+      [agentJournalSubmissionKey('rejected')]:
+        'Claude stopped before it finished starting. Send your message to try again.'
+    })
+  })
+
+  it.each([
+    [
+      'notDelivered',
+      'This message was not delivered. Send it again to continue.',
+      'This message was not delivered.'
+    ],
+    [
+      'hostFault',
+      "Orca ran into a problem, so this didn't go through. Try again.",
+      "Orca ran into a problem, so this didn't go through."
+    ]
+  ] as const)('leaves the step to the Retry beside a %s message', (kind, reason, shown) => {
+    expect(
+      texts([
+        entry('rejected', {
+          state: 'rejected',
+          lastFailure: { kind: 'rejected', reason, rejection: { kind } }
+        })
+      ])
+    ).toEqual({ [agentJournalSubmissionKey('rejected')]: shown })
+  })
+
+  // The journal holds the whole fact; the message's own copy keeps only its kind and attachment.
+  it("words a recorded rejection from the journal's fact, whatever reason the host wrote", () => {
+    const rejected = (id: string): StructuredAgentSessionOutboxEntry =>
+      entry(id, {
+        state: 'rejected',
+        // An older host's words, and not the pane's agent name: never compared, never shown.
+        lastFailure: {
+          kind: 'rejected',
+          reason: "The agent couldn't be started.",
+          rejection: { kind: 'startFailed' }
+        }
+      })
+    const recorded = (id: string, rejection: AgentSessionFailureFact): AgentJournalSubmission => ({
+      clientMessageId: id,
+      fence: 1,
+      payloadFingerprint: 'fingerprint',
+      dispatchState: 'rejected',
+      providerItemId: null,
+      reason: "The agent couldn't be started.",
+      rejection,
+      submittedAt: 1,
+      resolvedAt: 1
+    })
+    const facts: [string, AgentSessionFailureFact, string][] = [
+      [
+        'gone',
+        {
+          kind: 'startFailed',
+          refusal: {
+            code: 'agent_session_identity_required',
+            details: { reason: 'recordMissing' }
+          }
+        },
+        "Claude couldn't start. Start a new chat to continue."
+      ],
+      [
+        'claimed',
+        {
+          kind: 'startFailed',
+          refusal: { code: 'agent_session_conflict', details: { reason: 'claimConflicted' } }
+        },
+        "Claude couldn't start. This chat is still open in a terminal agent. Quit that agent to continue the chat here."
+      ],
+      [
+        'resumable',
+        { kind: 'startFailed', refusal: { code: 'agent_session_ownership_unknown' } },
+        "Claude couldn't start."
+      ],
+      [
+        'provider',
+        { kind: 'providerRejected', detail: { text: 'Image type .bmp', audience: 'person' } },
+        'The provider did not accept this message: Image type .bmp.'
+      ],
+      [
+        'logged',
+        { kind: 'providerRejected', detail: { text: 'HTTP 400 at /v1', audience: 'log' } },
+        'The provider did not accept this message.'
+      ]
+    ]
+    expect(
+      texts(
+        facts.map(([id]) => rejected(id)),
+        null,
+        facts.map(([id, fact]) => recorded(id, fact))
+      )
+    ).toEqual(
+      Object.fromEntries(facts.map(([id, , shown]) => [agentJournalSubmissionKey(id), shown]))
+    )
+    // Not loaded (older than the loaded page): the message's copy has no refusal or detail, so the
+    // host's sentence, which holds them, is shown for those kinds; the table words the rest.
+    expect(
+      texts([
+        rejected('gone'),
+        entry('provider', {
+          state: 'rejected',
+          lastFailure: {
+            kind: 'rejected',
+            reason: 'The provider did not accept this message: Image type .bmp.',
+            rejection: { kind: 'providerRejected' }
+          }
+        }),
+        entry('stopped', {
+          state: 'rejected',
+          lastFailure: {
+            kind: 'rejected',
+            reason: 'The agent stopped before this message was sent.',
+            rejection: { kind: 'providerExited' }
+          }
+        })
+      ])
+    ).toEqual({
+      [agentJournalSubmissionKey('gone')]: "The agent couldn't be started.",
+      [agentJournalSubmissionKey('provider')]:
+        'The provider did not accept this message: Image type .bmp.',
+      [agentJournalSubmissionKey('stopped')]: 'Claude stopped before this message was sent.'
+    })
+  })
+
+  it('says nothing on a message that is only waiting its turn or on its way', () => {
+    expect(texts([entry('queued'), entry('sending', { state: 'dispatching' })])).toEqual({})
+  })
+
+  // Matched on the typed fact of a row found by its identity, never on either sentence.
+  describe('a message rejected by a start whose row already says why', () => {
+    const startFailed: AgentSessionFailureFact = {
+      kind: 'startFailed',
+      refusal: { code: 'agent_session_identity_required', details: { reason: 'recordMissing' } }
+    }
+    const rejected = (id: string, fact: AgentSessionFailureFact) =>
+      entry(id, {
+        state: 'rejected',
+        lastFailure: {
+          kind: 'rejected',
+          reason: 'Written by the host.',
+          rejection: { kind: fact.kind }
+        }
+      })
+    const recorded = (id: string, fact: AgentSessionFailureFact): AgentJournalSubmission => ({
+      clientMessageId: id,
+      fence: 1,
+      payloadFingerprint: id,
+      dispatchState: 'rejected',
+      providerItemId: null,
+      reason: 'Written by the host.',
+      rejection: fact,
+      submittedAt: 1,
+      resolvedAt: 1
+    })
+    const statusRow = (itemId: string, fact: AgentSessionFailureFact): AgentJournalRenderItem => ({
+      itemId,
+      revision: 1,
+      sequence: 1,
+      observedAt: 1,
+      body: {
+        kind: 'status',
+        tone: 'error',
+        ...agentSessionFailureWords(fact, { agentName: 'Claude', surface: 'row' })
+      }
+    })
+    const startRowKey = agentJournalItemKey(structuredAgentSessionStartFailureRowIdentity('gen'))
+
+    it('reads only the start-failure rows', () => {
+      expect(
+        structuredAgentSessionStartFailureFacts([
+          statusRow(startRowKey, startFailed),
+          statusRow(agentJournalSubmissionKey('exit-row'), { kind: 'providerExited' })
+        ])
+      ).toEqual([startFailed])
+    })
+
+    it('says only that each was not sent, and words any other rejection in full', () => {
+      const otherRefusal: AgentSessionFailureFact = {
+        kind: 'startFailed',
+        refusal: { code: 'agent_session_conflict', details: { reason: 'claimConflicted' } }
+      }
+      const facts = structuredAgentSessionStartFailureFacts([statusRow(startRowKey, startFailed)])
+      expect(
+        texts(
+          [
+            rejected('first', startFailed),
+            rejected('second', startFailed),
+            rejected('other', otherRefusal)
+          ],
+          null,
+          [
+            recorded('first', startFailed),
+            recorded('second', startFailed),
+            recorded('other', otherRefusal)
+          ],
+          facts
+        )
+      ).toEqual({
+        [agentJournalSubmissionKey('first')]: 'Your message was not sent.',
+        [agentJournalSubmissionKey('second')]: 'Your message was not sent.',
+        [agentJournalSubmissionKey('other')]:
+          "Claude couldn't start. This chat is still open in a terminal agent. Quit that agent to continue the chat here."
+      })
+    })
+
+    it('keeps the full notice when the rejection is not loaded, or no start row states it', () => {
+      const shown = "Claude couldn't start. Start a new chat to continue."
+      expect(texts([rejected('first', startFailed)], null, [], [startFailed])).toEqual({
+        [agentJournalSubmissionKey('first')]: 'Written by the host.'
+      })
+      expect(
+        texts([rejected('first', startFailed)], null, [recorded('first', startFailed)], [])
+      ).toEqual({ [agentJournalSubmissionKey('first')]: shown })
+    })
+  })
+})
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.ts b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.ts
new file mode 100644
index 000000000000..ec3eb60e6875
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.ts
@@ -0,0 +1,137 @@
+// Which of the structured chat's own messages say, on their row, that they did not go through.
+//
+// Derived from the outbox on every render and never stored: each failed or held message carries
+// its own typed failure, so each row words its own reason. Read through the drain's own rule: while
+// the queue is stopped, only the message it stopped on has a Retry; another's would wait unseen
+// behind it. One waiting behind says nothing; a rejected message holds nothing up, so it keeps its
+// words and gets its Retry once the queue moves.
+//
+// A message the host recorded and then rejected is worded from the journal's own fact, found by id;
+// the message keeps only a smaller copy, read when its submission is not loaded. A rejection that
+// is a failed start's, the fact its loaded row states, says only that it was not sent: the row
+// already says why.
+
+import {
+  readAgentSessionFailureFact,
+  type AgentSessionFailureFact
+} from '../../../../shared/agent-session-failure'
+import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
+import type {
+  AgentJournalRenderItem,
+  AgentJournalSubmission
+} from '../../../../shared/agent-session-journal-types'
+import { agentSessionWriteNotDoneParts } from '../../../../shared/agent-session-refusal-notice'
+import { isStructuredAgentSessionStartFailureRow } from '../../../../shared/structured-agent-session-start-failure-row-key'
+import {
+  admitStructuredAgentSessionOutboxEntry,
+  type StructuredAgentSessionOutboxEntry
+} from '../../../../shared/structured-agent-session-outbox'
+import type { AgentSessionFailureWordsContext } from '../../../../shared/agent-session-failure-words'
+import { structuredAgentSessionAttemptFailureParts } from '../../../../shared/structured-agent-session-send-disposition'
+import { translate } from '@/i18n/i18n'
+import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
+import type { NativeChatDeliveryNotice } from './NativeChatMessageRow'
+
+/** The facts the chat's loaded start-failure rows state. */
+export function structuredAgentSessionStartFailureFacts(
+  items: readonly AgentJournalRenderItem[]
+): AgentSessionFailureFact[] {
+  const facts: AgentSessionFailureFact[] = []
+  for (const item of items) {
+    if (item.body.kind === 'status' && isStructuredAgentSessionStartFailureRow(item.itemId)) {
+      const fact = readAgentSessionFailureFact(item.body.failure)
+      if (fact) {
+        facts.push(fact)
+      }
+    }
+  }
+  return facts
+}
+
+/** Whether two facts are one failure: a start's row and the messages it rejected share one. */
+export function sameAgentSessionFailureFact(
+  a: AgentSessionFailureFact,
+  b: AgentSessionFailureFact
+): boolean {
+  return (
+    a.kind === b.kind &&
+    a.detail?.text === b.detail?.text &&
+    a.detail?.audience === b.detail?.audience &&
+    a.refusal?.code === b.refusal?.code &&
+    a.refusal?.details?.reason === b.refusal?.details?.reason &&
+    a.attachment?.reason === b.attachment?.reason &&
+    a.attachment?.limit === b.attachment?.limit &&
+    a.retry?.error === b.retry?.error &&
+    a.retry?.status === b.retry?.status
+  )
+}
+
+function deliveryNoticeText(
+  entry: StructuredAgentSessionOutboxEntry,
+  context: AgentSessionFailureWordsContext,
+  recorded: AgentJournalSubmission | undefined,
+  startFailures: readonly AgentSessionFailureFact[]
+): string {
+  if (entry.state === 'unconfirmed') {
+    return translate(
+      'auto.components.native.chat.NativeChatStructuredSession.1f772bb5d0',
+      'Message delivery is unconfirmed.'
+    )
+  }
+  if (!entry.lastFailure) {
+    return translate(
+      'auto.components.native.chat.NativeChatStructuredSession.93ef441197',
+      'Message was not sent.'
+    )
+  }
+  const fact = readAgentSessionFailureFact(recorded?.rejection)
+  if (
+    entry.state === 'rejected' &&
+    fact &&
+    startFailures.some((stated) => sameAgentSessionFailureFact(stated, fact))
+  ) {
+    return agentSessionWriteNoticeText(agentSessionWriteNotDoneParts('send'))
+  }
+  return agentSessionWriteNoticeText(
+    structuredAgentSessionAttemptFailureParts(entry.lastFailure, context, fact)
+  )
+}
+
+/** Keyed by the message id the transcript renders each entry under. `blockedClientMessageId` is
+ *  the entry a refusal stopped the queue on; `agentName` is the chat's agent, for the words. */
+export function structuredAgentSessionDeliveryNotices(
+  outbox: readonly StructuredAgentSessionOutboxEntry[],
+  blockedClientMessageId: string | null,
+  agentName: string,
+  retry: (clientMessageId: string) => void,
+  /** The journal's rows, whose rejected ones carry more of a rejection than the message keeps. */
+  submissions: readonly AgentJournalSubmission[],
+  /** What the loaded start-failure rows state, from `structuredAgentSessionStartFailureFacts`. */
+  startFailures: readonly AgentSessionFailureFact[]
+): ReadonlyMap<string, NativeChatDeliveryNotice> {
+  const admission = admitStructuredAgentSessionOutboxEntry(outbox, blockedClientMessageId)
+  const held = admission.state === 'blocked' ? admission.entry.clientMessageId : null
+  const rejected = new Map(
+    submissions
+      .filter((submission) => submission.dispatchState === 'rejected')
+      .map((submission) => [submission.clientMessageId, submission])
+  )
+  const notices = new Map<string, NativeChatDeliveryNotice>()
+  for (const entry of outbox) {
+    if (entry.state === 'rejected' || entry.clientMessageId === held) {
+      // Its own Retry is the step, so the words leave out sending again.
+      const retryControl = held === null || entry.clientMessageId === held
+      const text = deliveryNoticeText(
+        entry,
+        { agentName, retryControl },
+        rejected.get(entry.clientMessageId),
+        startFailures
+      )
+      notices.set(
+        agentJournalSubmissionKey(entry.clientMessageId),
+        retryControl ? { text, onRetry: () => retry(entry.clientMessageId) } : { text }
+      )
+    }
+  }
+  return notices
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-outbox-dispatch.ts b/src/renderer/src/components/native-chat/structured-agent-session-outbox-dispatch.ts
index fc2d5adf1508..9f91b9f9b3b1 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-outbox-dispatch.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-outbox-dispatch.ts
@@ -10,6 +10,7 @@ import {
 import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 import {
+  stageStructuredAgentSessionOutboxEntryForSend,
   structuredAgentSessionSendRequest,
   updateStructuredAgentSessionOutboxEntry,
   type StructuredAgentSessionOutboxEntry
@@ -56,6 +57,18 @@ export function readMountedStructuredAgentSessionOutbox(
   )
 }
 
+/** A send left dispatching when its owner changed goes out again, under the same id. */
+export function requeueInterruptedStructuredAgentSessionDispatches(
+  entries: StructuredAgentSessionOutboxEntry[],
+  fence: number | null
+): StructuredAgentSessionOutboxEntry[] {
+  return entries.map((entry) =>
+    entry.state === 'dispatching' && !hasInFlightLaunchDispatch(entry, fence)
+      ? { ...entry, state: 'queued' as const }
+      : entry
+  )
+}
+
 export function dispatchStructuredAgentSessionOutboxEntry(args: {
   next: StructuredAgentSessionOutboxEntry
   persisted: readonly StructuredAgentSessionOutboxEntry[]
@@ -77,7 +90,7 @@ export function dispatchStructuredAgentSessionOutboxEntry(args: {
     const staged = updateStructuredAgentSessionOutboxEntry(
       args.persisted,
       args.next.clientMessageId,
-      (entry) => ({ ...entry, state: 'dispatching' as const, lastAttemptAt: Date.now() })
+      (entry) => stageStructuredAgentSessionOutboxEntryForSend(entry, Date.now())
     )
     if (!writeOutbox(args.sessionId, staged)) {
       args.inFlightIdRef.current = null
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-outbox-storage.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-outbox-storage.test.ts
index f289feb7c34b..9b8b3c537a67 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-outbox-storage.test.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-outbox-storage.test.ts
@@ -1,9 +1,13 @@
 // @vitest-environment happy-dom
 
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { createStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
+import {
+  createStructuredAgentSessionOutboxEntry,
+  type StructuredAgentSessionAttemptFailure
+} from '../../../../shared/structured-agent-session-outbox'
 import {
   hasUndeliveredStructuredAgentSessionOutbox,
+  readOutbox,
   resetUndeliveredStructuredAgentSessionOutboxForTests,
   subscribeToUndeliveredStructuredAgentSessionOutbox,
   writeOutbox
@@ -103,3 +107,102 @@ describe('undelivered structured agent session outbox projection', () => {
     releaseRemount()
   })
 })
+
+describe("a saved message's last failure", () => {
+  beforeEach(() => {
+    localStorage.clear()
+  })
+
+  it.each<StructuredAgentSessionAttemptFailure>([
+    { kind: 'refused', code: 'agent_session_checkpoint_stale' },
+    { kind: 'refused', code: 'agent_session_conflict', details: { reason: 'chatStarting' } },
+    {
+      kind: 'refused',
+      code: 'agent_session_ownership_unknown',
+      details: { reason: 'ownerUnproven', ownerVerdict: 'unverifiable' }
+    },
+    { kind: 'rejected', reason: 'Claude messages support at most 20 images' },
+    {
+      kind: 'rejected',
+      reason: 'Claude accepts at most 20 images in one message, so this message was not sent.',
+      rejection: { kind: 'attachmentInvalid', attachment: { reason: 'tooMany', limit: 20 } }
+    },
+    { kind: 'rejected', reason: null },
+    { kind: 'failed' }
+  ])('reads back $kind as it was saved', (lastFailure) => {
+    writeOutbox('session-a', [{ ...entry('session-a', 'client-1'), lastFailure }])
+
+    expect(readOutbox('session-a')[0]?.lastFailure).toEqual(lastFailure)
+  })
+
+  it('keeps the message and drops a failure it cannot read', () => {
+    localStorage.setItem(
+      'orca:desktopStructuredAgentSessionOutbox:v1:session-a',
+      JSON.stringify([
+        { ...entry('session-a', 'client-1'), lastFailure: 'The agent was restarting.' },
+        { ...entry('session-a', 'client-2'), lastFailure: { kind: 'rejected', reason: 7 } }
+      ])
+    )
+
+    const read = readOutbox('session-a')
+    expect(read.map((saved) => saved.clientMessageId)).toEqual(['client-1', 'client-2'])
+    expect(read.every((saved) => saved.lastFailure === undefined)).toBe(true)
+  })
+
+  // Written by a build that kept only the code or the reason; it reads as that build meant it.
+  it('reads an entry saved before failures carried details as it was', () => {
+    localStorage.setItem(
+      'orca:desktopStructuredAgentSessionOutbox:v1:session-a',
+      JSON.stringify([
+        {
+          ...entry('session-a', 'client-1'),
+          lastFailure: { kind: 'refused', code: 'agent_session_checkpoint_stale' }
+        },
+        { ...entry('session-a', 'client-2'), lastFailure: { kind: 'rejected', reason: 'Nope.' } }
+      ])
+    )
+
+    expect(readOutbox('session-a').map((saved) => saved.lastFailure)).toEqual([
+      { kind: 'refused', code: 'agent_session_checkpoint_stale' },
+      { kind: 'rejected', reason: 'Nope.' }
+    ])
+  })
+
+  it('keeps only what a newer build saved that this one can place', () => {
+    localStorage.setItem(
+      'orca:desktopStructuredAgentSessionOutbox:v1:session-a',
+      JSON.stringify([
+        {
+          ...entry('session-a', 'client-1'),
+          lastFailure: {
+            kind: 'refused',
+            code: 'agent_session_checkpoint_stale',
+            details: { reason: 'fromTheFuture', currentFence: 4 }
+          }
+        },
+        {
+          ...entry('session-a', 'client-2'),
+          lastFailure: {
+            kind: 'rejected',
+            reason: 'Claude stopped before it finished starting.',
+            rejection: { kind: 'providerStartFailed', detail: { text: 'exit 1', audience: 'log' } }
+          }
+        },
+        {
+          ...entry('session-a', 'client-3'),
+          lastFailure: { kind: 'rejected', reason: 'Nope.', rejection: { kind: 'fromTheFuture' } }
+        }
+      ])
+    )
+
+    expect(readOutbox('session-a').map((saved) => saved.lastFailure)).toEqual([
+      { kind: 'refused', code: 'agent_session_checkpoint_stale' },
+      {
+        kind: 'rejected',
+        reason: 'Claude stopped before it finished starting.',
+        rejection: { kind: 'providerStartFailed' }
+      },
+      { kind: 'rejected', reason: 'Nope.' }
+    ])
+  })
+})
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-read-failure-notice.ts b/src/renderer/src/components/native-chat/structured-agent-session-read-failure-notice.ts
new file mode 100644
index 000000000000..8dee55de82e6
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-read-failure-notice.ts
@@ -0,0 +1,32 @@
+// What the structured chat says when reading its history failed: the notice table's words for the
+// refusal the read met, never the host's message or code.
+
+import {
+  agentSessionReadHistoryRefusalParts,
+  agentSessionWriteNotDoneParts
+} from '../../../../shared/agent-session-refusal-notice'
+import type { AgentSessionRefusalReference } from '../../../../shared/agent-session-wire-refusals'
+import { isFinalAgentSessionReadRefusal } from '../../../../shared/structured-agent-session-read-refusal'
+import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
+
+export type StructuredAgentSessionReadFailureNotice = {
+  text: string
+  /** The host named the situation, so the words say more than that the history did not load. */
+  named: boolean
+  /** Nothing the read retries gets past it, so the pane no longer says it keeps trying. */
+  final: boolean
+}
+
+export function structuredAgentSessionReadFailureNotice(
+  refusal: AgentSessionRefusalReference | undefined
+): StructuredAgentSessionReadFailureNotice {
+  // The pane reconnects on its own, so it is the Retry beside the words.
+  const parts = refusal
+    ? agentSessionReadHistoryRefusalParts(refusal.code, refusal.details, { retryControl: true })
+    : agentSessionWriteNotDoneParts('read-history')
+  return {
+    text: agentSessionWriteNoticeText(parts),
+    named: refusal?.details?.reason !== undefined,
+    final: isFinalAgentSessionReadRefusal(refusal)
+  }
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-read-owner.ts b/src/renderer/src/components/native-chat/structured-agent-session-read-owner.ts
index 6ec7b38f8b26..e3f87a8e95e6 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-read-owner.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-read-owner.ts
@@ -223,7 +223,7 @@ function createReadOwner(
     }
     const transport = startStructuredAgentSessionReadTransport({
       applyEvent: (event) => apply({ type: 'event', event }),
-      applyError: (message) => apply({ type: 'error', message }),
+      applyError: (message, refusal) => apply({ type: 'error', message, refusal }),
       getCursor: () => snapshot.state.cursor,
       onHistoryReadInvalidated: invalidateOlderPages,
       hydrate: snapshot.state.epoch === null ? hydrate : undefined,
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-read-transport.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-read-transport.test.ts
index 5e5be1b6b3b4..683676c99d65 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-read-transport.test.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-read-transport.test.ts
@@ -9,12 +9,16 @@ import type {
   AgentSessionSubscribeEvent
 } from '../../../../shared/agent-session-wire'
 
-const mocks = vi.hoisted(() => ({ subscribe: vi.fn() }))
+const mocks = vi.hoisted(() => ({ subscribe: vi.fn(), watchHostContact: vi.fn() }))
 
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   subscribeStructuredAgentSession: mocks.subscribe
 }))
 
+vi.mock('@/runtime/runtime-host-contact-regained', () => ({
+  subscribeRuntimeHostContactRegained: mocks.watchHostContact
+}))
+
 import { startStructuredAgentSessionReadTransport } from './structured-agent-session-read-transport'
 
 type SubscribeAttempt = {
@@ -269,7 +273,7 @@ describe('structured agent-session read transport unattached refusals', () => {
       // ...and the failure is owed once it has passed.
       await vi.advanceTimersByTimeAsync(750)
       attempts.at(-1)?.onError(rpcRefusal(UNATTACHED))
-      expect(applyError).toHaveBeenCalledWith(`RuntimeRpcCallError: ${UNATTACHED}`)
+      expect(applyError).toHaveBeenCalledWith(UNATTACHED)
       transport.dispose()
     } finally {
       vi.useRealTimers()
@@ -284,7 +288,7 @@ describe('structured agent-session read transport unattached refusals', () => {
         throw new Error('journal read failed')
       }, applyError)
       await flushPromises()
-      expect(applyError).toHaveBeenCalledExactlyOnceWith('Error: journal read failed')
+      expect(applyError).toHaveBeenCalledExactlyOnceWith('journal read failed')
       transport.dispose()
     } finally {
       vi.useRealTimers()
@@ -303,7 +307,107 @@ describe('structured agent-session read transport unattached refusals', () => {
       expect(applyError).not.toHaveBeenCalled()
 
       attempts[0].onError({ code: 'runtime_error', message: 'transport died' })
-      expect(applyError).toHaveBeenCalledOnce()
+      // The host's own words, never `[object Object]` (P2-04).
+      expect(applyError).toHaveBeenCalledExactlyOnceWith('transport died')
+      transport.dispose()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('hands the pane the refusal a read met, and stops reconnecting only past damage', async () => {
+    vi.useFakeTimers()
+    try {
+      const journalRefusal = (reason: string) => ({
+        code: 'runtime_error',
+        message: 'agent_session_journal_unreadable',
+        data: { refusal: { code: 'agent_session_journal_unreadable', details: { reason } } }
+      })
+      const applyError = vi.fn()
+      const transport = startWithHydration(async () => undefined, applyError)
+      await flushPromises()
+      expect(attempts).toHaveLength(1)
+
+      // An open that can clear keeps reconnecting.
+      attempts[0].onError(journalRefusal('journalUnavailable'))
+      attempts[0].closed.resolve({ unsubscribe: attempts[0].unsubscribe })
+      await flushPromises()
+      expect(applyError).toHaveBeenLastCalledWith('agent_session_journal_unreadable', {
+        code: 'agent_session_journal_unreadable',
+        details: { reason: 'journalUnavailable' }
+      })
+      await vi.advanceTimersByTimeAsync(750)
+      expect(attempts).toHaveLength(2)
+
+      // Damage no retry reads past: decided from the reason, not the message, which is the same.
+      attempts[1].onError(journalRefusal('journalCorrupt'))
+      attempts[1].closed.resolve({ unsubscribe: attempts[1].unsubscribe })
+      await flushPromises()
+      expect(applyError).toHaveBeenLastCalledWith('agent_session_journal_unreadable', {
+        code: 'agent_session_journal_unreadable',
+        details: { reason: 'journalCorrupt' }
+      })
+      await vi.advanceTimersByTimeAsync(60_000)
+      expect(attempts).toHaveLength(2)
+      transport.dispose()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('reads a thrown hydrate refusal the same way, and a new run reads again', async () => {
+    vi.useFakeTimers()
+    try {
+      const corrupt = Object.assign(new Error('agent_session_journal_unreadable'), {
+        response: {
+          error: {
+            code: 'runtime_error',
+            message: 'agent_session_journal_unreadable',
+            data: {
+              refusal: {
+                code: 'agent_session_journal_unreadable',
+                details: { reason: 'journalCorrupt' }
+              }
+            }
+          }
+        }
+      })
+      const hydrate = vi.fn(async () => {
+        throw corrupt
+      })
+      const first = startWithHydration(hydrate, vi.fn())
+      await vi.advanceTimersByTimeAsync(60_000)
+      expect(attempts).toHaveLength(0)
+      first.dispose()
+
+      // Reopening the chat is a new run, which reads again.
+      const second = startWithHydration(hydrate, vi.fn())
+      await flushPromises()
+      expect(hydrate).toHaveBeenCalledTimes(2)
+      second.dispose()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('re-opens after a failed open and leaves the error once the conversation reads (P2-04)', async () => {
+    vi.useFakeTimers()
+    try {
+      const applyError = vi.fn()
+      const applyEvent = vi.fn()
+      const transport = startWithHydration(async () => undefined, applyError, applyEvent)
+      await flushPromises()
+      attempts[0].onError({ code: 'agent_session_journal_unreadable', message: 'disk full' })
+      attempts[0].closed.resolve({ unsubscribe: attempts[0].unsubscribe })
+      await flushPromises()
+      expect(applyError).toHaveBeenCalledExactlyOnceWith('disk full')
+
+      // The retry re-asks, and the host's open runs again: a fault that cleared now reads.
+      await vi.advanceTimersByTimeAsync(750)
+      expect(attempts).toHaveLength(2)
+      attempts[1].onEvent(snapshot(1))
+      await flushPromises()
+      expect(applyEvent).toHaveBeenCalledWith(expect.objectContaining({ type: 'snapshot' }))
       transport.dispose()
     } finally {
       vi.useRealTimers()
@@ -331,4 +435,128 @@ describe('structured agent-session read transport unattached refusals', () => {
       vi.useRealTimers()
     }
   })
+
+  it('waits twice as long after each failed open, up to 30 s, and starts over once a read lands', async () => {
+    vi.useFakeTimers()
+    try {
+      const unavailable = {
+        code: 'runtime_error',
+        message: 'agent_session_journal_unreadable',
+        data: {
+          refusal: {
+            code: 'agent_session_journal_unreadable',
+            details: { reason: 'journalUnavailable' }
+          }
+        }
+      }
+      const transport = startWithHydration(async () => undefined, vi.fn())
+      await flushPromises()
+      // As a local subscribe does: the open resolves, then the host's refusal arrives.
+      const refuseLatest = async (): Promise<void> => {
+        const attempt = attempts.at(-1)!
+        attempt.closed.resolve({ unsubscribe: attempt.unsubscribe })
+        await flushPromises()
+        attempt.onError(unavailable)
+      }
+      const expectReopenAfter = async (delay: number): Promise<void> => {
+        const opened = attempts.length
+        await vi.advanceTimersByTimeAsync(delay - 1)
+        expect(attempts).toHaveLength(opened)
+        await vi.advanceTimersByTimeAsync(1)
+        expect(attempts).toHaveLength(opened + 1)
+      }
+
+      for (const delay of [750, 1_500, 3_000, 6_000, 12_000, 24_000, 30_000, 30_000]) {
+        await refuseLatest()
+        await expectReopenAfter(delay)
+      }
+
+      // A read that delivers is the success the next failure starts over from.
+      attempts.at(-1)!.closed.resolve({ unsubscribe: attempts.at(-1)!.unsubscribe })
+      await flushPromises()
+      attempts.at(-1)!.onEvent(snapshot(1))
+      attempts.at(-1)!.onError(unavailable)
+      await expectReopenAfter(750)
+      await refuseLatest()
+      await expectReopenAfter(1_500)
+
+      // Damage still ends reconnecting, however far the wait has grown.
+      const latest = attempts.at(-1)!
+      latest.closed.resolve({ unsubscribe: latest.unsubscribe })
+      await flushPromises()
+      latest.onError({
+        ...unavailable,
+        data: {
+          refusal: {
+            code: 'agent_session_journal_unreadable',
+            details: { reason: 'journalCorrupt' }
+          }
+        }
+      })
+      const opened = attempts.length
+      await vi.advanceTimersByTimeAsync(120_000)
+      expect(attempts).toHaveLength(opened)
+      transport.dispose()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('reads again as soon as a remote host is reachable, not after the grown wait', async () => {
+    vi.useFakeTimers()
+    try {
+      let hostContactRegained = (): void => {}
+      const stopWatch = vi.fn()
+      mocks.watchHostContact.mockImplementation((_environmentId, listener: () => void) => {
+        hostContactRegained = listener
+        return stopWatch
+      })
+      const unavailable = { code: 'runtime_unavailable', message: 'Remote runtime is unavailable.' }
+      const transport = startStructuredAgentSessionReadTransport({
+        applyEvent: vi.fn(),
+        applyError: vi.fn(),
+        getCursor: () => null,
+        onHistoryReadInvalidated: () => undefined,
+        hydrate: async () => undefined,
+        sessionId: 'session-a',
+        target: { kind: 'environment', environmentId: 'env-a' }
+      })
+      expect(mocks.watchHostContact).toHaveBeenCalledWith('env-a', expect.any(Function))
+      await flushPromises()
+      const refuseLatest = async (): Promise<void> => {
+        const attempt = attempts.at(-1)!
+        attempt.closed.resolve({ unsubscribe: attempt.unsubscribe })
+        await flushPromises()
+        attempt.onError(unavailable)
+      }
+      // An outage long enough that the wait reaches its cap.
+      for (const delay of [750, 1_500, 3_000, 6_000, 12_000, 24_000]) {
+        await refuseLatest()
+        await vi.advanceTimersByTimeAsync(delay)
+      }
+      await refuseLatest()
+      const opened = attempts.length
+      await vi.advanceTimersByTimeAsync(29_000)
+      expect(attempts).toHaveLength(opened)
+
+      hostContactRegained()
+      await vi.advanceTimersByTimeAsync(0)
+      expect(attempts).toHaveLength(opened + 1)
+
+      // The wait starts over too, so a failure right after reconnect is retried soon.
+      await refuseLatest()
+      await vi.advanceTimersByTimeAsync(750)
+      expect(attempts).toHaveLength(opened + 2)
+
+      transport.dispose()
+      expect(stopWatch).toHaveBeenCalledTimes(1)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('does not watch host contact for a local read', () => {
+    startWithHydration(async () => undefined, vi.fn()).dispose()
+    expect(mocks.watchHostContact).not.toHaveBeenCalled()
+  })
 })
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-read-transport.ts b/src/renderer/src/components/native-chat/structured-agent-session-read-transport.ts
index f4310cec8904..a0a693e92a9c 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-read-transport.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-read-transport.ts
@@ -3,18 +3,48 @@ import type { AgentSessionSubscribeEvent } from '../../../../shared/agent-sessio
 import { createStructuredAgentSessionEventCoalescer } from '../../../../shared/structured-agent-session-coalescer'
 import {
   AGENT_SESSION_UNATTACHED_READ_GRACE_MS,
+  isFinalAgentSessionReadRefusal,
   isUnattachedAgentSessionReadRefusal
 } from '../../../../shared/structured-agent-session-read-refusal'
+import type { AgentSessionRefusalReference } from '../../../../shared/agent-session-wire-refusals'
+import { readAgentSessionErrorRefusal } from '../../../../shared/agent-session-write-failure'
+import { subscribeRuntimeHostContactRegained } from '@/runtime/runtime-host-contact-regained'
 import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
 import { subscribeStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 
+// A stream hands its failure over as the raw `{ code, message }` payload; `String()` of that is `[object Object]`.
+function readFailureText(error: unknown): string {
+  if (error instanceof Error) {
+    return error.message || 'Something went wrong.'
+  }
+  if (typeof error === 'string') {
+    return error || 'Something went wrong.'
+  }
+  if (typeof error === 'object' && error !== null) {
+    if ('message' in error && typeof error.message === 'string' && error.message.length > 0) {
+      return error.message
+    }
+    if ('code' in error && typeof error.code === 'string' && error.code.length > 0) {
+      return error.code
+    }
+  }
+  return 'Something went wrong.'
+}
+
+const RECONNECT_FIRST_DELAY_MS = 750
+const RECONNECT_MAX_DELAY_MS = 30_000
+
+/** Each reconnect waits twice the last, up to the cap, until a read delivers. */
 function createReconnectScheduler(args: { shouldStop: () => boolean; reconnect: () => void }) {
   let timer: ReturnType<typeof setTimeout> | null = null
+  let nextDelay = RECONNECT_FIRST_DELAY_MS
   return {
-    schedule(delay = 750): void {
+    schedule(): void {
       if (args.shouldStop() || timer) {
         return
       }
+      const delay = nextDelay
+      nextDelay = Math.min(delay * 2, RECONNECT_MAX_DELAY_MS)
       timer = setTimeout(() => {
         timer = null
         if (!args.shouldStop()) {
@@ -22,6 +52,22 @@ function createReconnectScheduler(args: { shouldStop: () => boolean; reconnect:
         }
       }, delay)
     },
+    /** A read delivered, so the next failure is retried soon again. */
+    reset(): void {
+      nextDelay = RECONNECT_FIRST_DELAY_MS
+    },
+    /** The host is reachable again: a waiting retry runs now instead of after the grown wait. */
+    retryNow(): void {
+      nextDelay = RECONNECT_FIRST_DELAY_MS
+      if (!timer) {
+        return
+      }
+      clearTimeout(timer)
+      timer = null
+      if (!args.shouldStop()) {
+        args.reconnect()
+      }
+    },
     dispose(): void {
       if (timer) {
         clearTimeout(timer)
@@ -33,7 +79,8 @@ function createReconnectScheduler(args: { shouldStop: () => boolean; reconnect:
 
 export function startStructuredAgentSessionReadTransport(args: {
   applyEvent: (event: AgentSessionSubscribeEvent) => void
-  applyError: (message: string) => void
+  /** `message` is the failure's own text, for logs; `refusal` is what a surface words. */
+  applyError: (message: string, refusal?: AgentSessionRefusalReference) => void
   getCursor: () => AgentJournalCursor | null
   onHistoryReadInvalidated: () => void
   hydrate?: (shouldStop: () => boolean) => Promise<void>
@@ -45,6 +92,8 @@ export function startStructuredAgentSessionReadTransport(args: {
 } {
   let stopped = false
   let connected = false
+  // A refusal no retry reads past ends reconnecting for this run; reopening the chat starts another.
+  let failedFinally = false
   let unattachedSince: number | null = null
   let opening = false
   let openGeneration = 0
@@ -57,9 +106,16 @@ export function startStructuredAgentSessionReadTransport(args: {
     }
   })
   const reconnectScheduler = createReconnectScheduler({
-    shouldStop: () => stopped || connected,
+    shouldStop: () => stopped || connected || failedFinally,
     reconnect: () => void open()
   })
+  // Why: an outage grows the retry wait to its cap; a host that is back should not wait it out.
+  const stopHostContactWatch =
+    args.target.kind === 'environment'
+      ? subscribeRuntimeHostContactRegained(args.target.environmentId, () =>
+          reconnectScheduler.retryNow()
+        )
+      : () => {}
   const isCurrentOpenGeneration = (candidate: number): boolean =>
     !stopped && candidate === openGeneration
   const clearUnattachedReadGrace = (): void => {
@@ -69,23 +125,32 @@ export function startStructuredAgentSessionReadTransport(args: {
    * A read failure, reported to the pane only once it is one.
    *
    * A refusal saying this host holds no attached session is the retry loop's own subject, not a
-   * verdict: the reconnect below re-asks, and either the hold that attaches the session or the tab
-   * retirement that ends the pane resolves it. Painting the pane red inside that window turned an
+   * verdict: the reconnect below re-asks, and either the host opening the session or the tab
+   * retirement that ends the pane resolves it. Only an older host still refuses this way. Painting the pane red inside that window turned an
    * ordinary chat close into a `Could not load conversation` the user could do nothing about.
    *
    * A window, not a mute. An unattached read still refusing past the grace is no longer
    * transitional, so the pane is owed the failure rather than a spinner that never resolves.
    */
+  const applyReadFailure = (error: unknown): void => {
+    const refusal = readAgentSessionErrorRefusal(error)
+    failedFinally = isFinalAgentSessionReadRefusal(refusal)
+    if (refusal) {
+      args.applyError(readFailureText(error), refusal)
+    } else {
+      args.applyError(readFailureText(error))
+    }
+  }
   const reportReadFailure = (error: unknown): void => {
     if (!isUnattachedAgentSessionReadRefusal(error)) {
       clearUnattachedReadGrace()
-      args.applyError(String(error))
+      applyReadFailure(error)
       return
     }
     const now = Date.now()
     unattachedSince ??= now
     if (now - unattachedSince >= AGENT_SESSION_UNATTACHED_READ_GRACE_MS) {
-      args.applyError(String(error))
+      applyReadFailure(error)
     }
   }
   const captureHistoryReadGuard = (): (() => boolean) => {
@@ -99,6 +164,10 @@ export function startStructuredAgentSessionReadTransport(args: {
       return
     }
     clearUnattachedReadGrace()
+    // Not on connect: a local subscribe resolves before the host's open refuses.
+    if (event.type !== 'end') {
+      reconnectScheduler.reset()
+    }
     if (event.type === 'snapshot' || event.type === 'reset') {
       coalescer.flush()
       if (!isCurrentOpenGeneration(eventOpenGeneration)) {
@@ -210,6 +279,7 @@ export function startStructuredAgentSessionReadTransport(args: {
       stopped = true
       openGeneration += 1
       args.onHistoryReadInvalidated()
+      stopHostContactWatch()
       reconnectScheduler.dispose()
       coalescer.dispose()
       unsubscribe()
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-transcript-order.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-transcript-order.test.ts
new file mode 100644
index 000000000000..ea9b3a0cf3bf
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-transcript-order.test.ts
@@ -0,0 +1,130 @@
+import { describe, expect, it } from 'vitest'
+import type {
+  AgentJournalItemBody,
+  AgentJournalRenderItem,
+  AgentJournalSubmission
+} from '../../../../shared/agent-session-journal-types'
+import { projectAgentSessionConversationOutline } from '../../../../shared/agent-session-conversation-outline'
+import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
+import {
+  createStructuredAgentSessionOutboxEntry,
+  type StructuredAgentSessionOutboxEntry
+} from '../../../../shared/structured-agent-session-outbox'
+import { createNativeChatMessageListProjection } from './native-chat-message-list-projection'
+import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection'
+
+function journalItem(
+  itemId: string,
+  sequence: number,
+  observedAt: number,
+  body: AgentJournalItemBody,
+  extra: Partial<AgentJournalRenderItem> = {}
+): AgentJournalRenderItem {
+  return { itemId, revision: 1, sequence, observedAt, body, ...extra }
+}
+
+function said(role: 'user' | 'assistant', text: string): AgentJournalItemBody {
+  return { kind: 'message', role, blocks: [{ type: 'text', text }] }
+}
+
+function answered(question: string): AgentJournalItemBody {
+  return {
+    kind: 'question',
+    question,
+    options: [{ id: 'yes', label: 'Yes' }],
+    resolution: { state: 'resolved', selectedOptionId: 'yes', resolvedBy: 'client', resolvedAt: 9 }
+  }
+}
+
+/** The ids the desktop transcript list draws, top to bottom. */
+function drawn(
+  items: AgentJournalRenderItem[],
+  outbox: StructuredAgentSessionOutboxEntry[] = [],
+  submissions: AgentJournalSubmission[] = []
+): string[] {
+  return createNativeChatMessageListProjection()(
+    projectStructuredAgentSessionMessages(items, outbox, submissions)
+  ).map(({ id }) => id)
+}
+
+function queued(clientMessageId: string, text: string, queuedAt: number) {
+  return createStructuredAgentSessionOutboxEntry({
+    clientMessageId,
+    sessionId: 'session',
+    text,
+    attachments: [],
+    queuedAt
+  })
+}
+
+describe('structured transcript order', () => {
+  it('draws a row recovered after a crash at its journal position, not its earlier clock', () => {
+    // The provider logged the last prompt before the crash; the host journalled it on recovery.
+    const items = [
+      journalItem('ask', 1, 100, said('user', 'Fix the parser')),
+      journalItem('reply', 2, 300, said('assistant', 'Working on it')),
+      journalItem('steer', 3, 310, said('user', 'Keep the old API')),
+      journalItem('recovered', 4, 200, said('user', 'Also add a test'), {
+        recovered: true,
+        recoveredAt: 400
+      })
+    ]
+    expect(drawn(items)).toEqual(['ask', 'reply', 'steer', 'recovered'])
+    // The host's outline, published to every client, uses the same order.
+    expect(projectAgentSessionConversationOutline(items, []).map(({ itemId }) => itemId)).toEqual([
+      'ask',
+      'steer',
+      'recovered'
+    ])
+  })
+
+  it("draws one write's questions by their place in it, whatever order they arrive in", () => {
+    // One Codex ask: a single journal write, one sequence and one timestamp. Neither
+    // the ids nor the arrival order below spell the order it was asked in.
+    const scope = journalItem('q:scope', 5, 500, answered('Which files?'))
+    const priority = journalItem('q:priority', 5, 500, answered('What matters?'), {
+      sequenceIndex: 1
+    })
+    const deadline = journalItem('q:deadline', 5, 500, answered('When?'), { sequenceIndex: 2 })
+    expect(drawn([priority, deadline, scope])).toEqual(['q:scope', 'q:priority', 'q:deadline'])
+  })
+
+  it('keeps a send the journal does not hold yet below every row it does', () => {
+    // The composer's clock can trail the host's; the unsent message still reads last.
+    const outbox = [queued('queued', 'One more thing', 150)]
+    const items = [
+      journalItem('ask', 1, 100, said('user', 'Fix the parser')),
+      journalItem('reply', 2, 200, said('assistant', 'Working on it'))
+    ]
+    expect(drawn(items, outbox)).toEqual(['ask', 'reply', agentJournalSubmissionKey('queued')])
+  })
+
+  it('keeps a send the journal recorded and the provider refused at its journal place', () => {
+    // The agent kept writing after the refused steer; its Retry stays with the composer.
+    const refused = agentJournalSubmissionKey('steer')
+    const items = [
+      journalItem('ask', 1, 100, said('user', 'Fix the parser')),
+      journalItem(refused, 2, 200, said('user', 'Keep the old API')),
+      journalItem('reply', 3, 300, said('assistant', 'Done.'))
+    ]
+    const submissions: AgentJournalSubmission[] = [
+      {
+        clientMessageId: 'steer',
+        fence: 1,
+        payloadFingerprint: 'fingerprint',
+        dispatchState: 'rejected',
+        providerItemId: null,
+        reason: 'provider_refused',
+        submittedAt: 200,
+        resolvedAt: 250
+      }
+    ]
+    expect(
+      drawn(
+        items,
+        [queued('steer', 'Keep the old API', 190), queued('next', 'And docs', 400)],
+        submissions
+      )
+    ).toEqual(['ask', refused, 'reply', agentJournalSubmissionKey('next')])
+  })
+})
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-withdrawn-message-restore.test.tsx b/src/renderer/src/components/native-chat/structured-agent-session-withdrawn-message-restore.test.tsx
new file mode 100644
index 000000000000..150b520bcd32
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-withdrawn-message-restore.test.tsx
@@ -0,0 +1,475 @@
+// A message a Stop withdrew never ran, and nothing sends it again. Its sender gets the text and
+// images back in the composer, once, after whatever is typed there.
+
+// @vitest-environment happy-dom
+
+import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type {
+  AgentJournalRenderItem,
+  AgentJournalSubmission
+} from '../../../../shared/agent-session-journal-types'
+import {
+  DISPATCH_REJECTED_CANCELLED,
+  DISPATCH_REJECTED_WRITE_FAILED
+} from '../../../../shared/structured-agent-session-dispatch-rejection'
+
+type SendParams = { envelope?: { clientOperationId: string } }
+type ReadState = { submissions: AgentJournalSubmission[]; items: AgentJournalRenderItem[] }
+
+const mocks = vi.hoisted(() => {
+  const read: ReadState = { submissions: [], items: [] }
+  return {
+    call: vi.fn<(target: unknown, method: string, params: SendParams) => Promise<unknown>>(),
+    toastError: vi.fn(),
+    read
+  }
+})
+
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: mocks.call,
+  supportsStructuredAgentSessionPromptCancel: vi.fn(async () => false)
+}))
+
+vi.mock('./use-structured-agent-session-read', () => ({
+  useStructuredAgentSessionRead: () => ({
+    state: {
+      fence: 1,
+      items: mocks.read.items,
+      submissions: mocks.read.submissions,
+      status: 'ready',
+      error: null,
+      hasOlder: false
+    },
+    loadingOlder: false,
+    loadOlder: vi.fn()
+  })
+}))
+
+vi.mock('sonner', () => ({ toast: { error: mocks.toastError } }))
+
+import {
+  AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
+  AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY
+} from '../../../../shared/protocol-version'
+import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
+import {
+  appendNativeChatDraftCache,
+  clearNativeChatDraftCacheForTests,
+  readNativeChatDraftCache,
+  subscribeToNativeChatDraftAppend,
+  writeNativeChatDraftCache
+} from './native-chat-draft-cache'
+import {
+  appendNativeChatAttachmentCache,
+  clearNativeChatAttachmentCacheForTests,
+  readNativeChatAttachmentCache,
+  useNativeChatComposerAttachments
+} from './use-native-chat-composer-attachments'
+import { useNativeChatDraft } from './use-native-chat-draft'
+import {
+  enqueueStructuredAgentSessionLaunchPrompt,
+  readOutbox,
+  writeOutbox
+} from './structured-agent-session-outbox-storage'
+import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
+import { useStructuredAgentSession } from './use-structured-agent-session'
+
+const SESSION = 'session-1'
+const PANE = 'tab-1::session-1'
+const OTHER_PANE = 'tab-2::session-1'
+const target = { kind: 'local' } as const
+const NONE: AgentJournalSubmission[] = []
+
+function submission(
+  clientMessageId: string,
+  overrides: Partial<AgentJournalSubmission> = {}
+): AgentJournalSubmission {
+  return {
+    clientMessageId,
+    fence: 1,
+    payloadFingerprint: 'fingerprint',
+    dispatchState: 'pending',
+    providerItemId: null,
+    reason: null,
+    submittedAt: 10,
+    resolvedAt: null,
+    handoverRecorded: true,
+    ...overrides
+  }
+}
+
+function withdrawn(
+  clientMessageId: string,
+  overrides: Partial<AgentJournalSubmission> = {}
+): AgentJournalSubmission {
+  return submission(clientMessageId, {
+    dispatchState: 'rejected',
+    reason: DISPATCH_REJECTED_CANCELLED,
+    resolvedAt: 11,
+    ...overrides
+  })
+}
+
+function answerSendsPending(): void {
+  mocks.call.mockImplementation(async (_target, method, params) => {
+    if (method !== 'agentSession.send') {
+      return null
+    }
+    const id = params.envelope?.clientOperationId ?? ''
+    return {
+      ok: true,
+      replayed: false,
+      fence: 1,
+      cursor: { epoch: 'epoch-1', sequence: 2 },
+      value: { clientMessageId: id, submission: submission(id) }
+    }
+  })
+}
+
+function renderOutbox(composerScopeKey: string | null = PANE) {
+  return renderHook(
+    (props: { submissions: AgentJournalSubmission[] }) =>
+      useStructuredAgentSessionOutbox({
+        sessionId: SESSION,
+        target,
+        fence: 1,
+        submissions: props.submissions,
+        ...(composerScopeKey ? { composerScopeKey } : {})
+      }),
+    { initialProps: { submissions: NONE } }
+  )
+}
+
+async function sendToHost(
+  result: { current: ReturnType<typeof useStructuredAgentSessionOutbox> },
+  text: string,
+  attachments: { path: string; previewUri: string }[] = []
+): Promise<string> {
+  act(() => expect(result.current.send(text, attachments)).toBe(true))
+  await waitFor(() => expect(result.current.outbox.at(-1)?.state).toBe('dispatching'))
+  return result.current.outbox.at(-1)!.clientMessageId
+}
+
+function occurrences(text: string, of: string): number {
+  return text.split(of).length - 1
+}
+
+afterEach(() => {
+  cleanup()
+  setLocalRuntimeCapabilitiesForTests(null)
+})
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  localStorage.clear()
+  clearNativeChatDraftCacheForTests()
+  clearNativeChatAttachmentCacheForTests()
+  mocks.read.submissions = []
+  mocks.read.items = []
+  let uuid = 0
+  vi.spyOn(globalThis.crypto, 'randomUUID').mockImplementation(() => {
+    uuid += 1
+    return `11111111-1111-4111-8111-${uuid.toString(16).padStart(12, '0')}`
+  })
+})
+
+describe('a message the host withdrew at a Stop', () => {
+  it.each([
+    ['a Stop during the start withdrew it from the host queue', {}],
+    ['Claude cancelled it as a queued follow-up', { handedOverAt: 12 }]
+  ])(
+    'comes back to the composer with its images, after the draft, when %s',
+    async (_case, handover) => {
+      answerSendsPending()
+      writeNativeChatDraftCache(PANE, 'already typed')
+      appendNativeChatAttachmentCache(PANE, [{ id: 'typed', path: '/tmp/typed.png' }])
+      const { result, rerender } = renderOutbox()
+      const id = await sendToHost(result, 'hello', [
+        { path: '/tmp/shot.png', previewUri: '/tmp/shot.png' }
+      ])
+      rerender({ submissions: [submission(id, handover)] })
+
+      rerender({ submissions: [withdrawn(id, handover)] })
+
+      await waitFor(() => expect(result.current.outbox).toEqual([]))
+      expect(readNativeChatDraftCache(PANE)).toBe('already typed\n\nhello')
+      expect(readNativeChatAttachmentCache(PANE)).toEqual([
+        { id: 'typed', path: '/tmp/typed.png' },
+        { id: expect.any(String), path: '/tmp/shot.png' }
+      ])
+    }
+  )
+
+  it('comes back when the host wrote the withdrawal as a typed fact in a sentence', async () => {
+    answerSendsPending()
+    const { result, rerender } = renderOutbox()
+    const id = await sendToHost(result, 'hello')
+
+    rerender({
+      submissions: [
+        withdrawn(id, {
+          reason: 'This message was withdrawn before the agent started it.',
+          rejection: { kind: 'cancelled' }
+        })
+      ]
+    })
+
+    await waitFor(() => expect(result.current.outbox).toEqual([]))
+    expect(readNativeChatDraftCache(PANE)).toBe('hello')
+  })
+
+  it('comes back once, whatever replays the journal or shows the chat again', async () => {
+    answerSendsPending()
+    const first = renderOutbox()
+    const id = await sendToHost(first.result, 'hello')
+    // A second view of the same chat in this window reads the same outbox.
+    const second = renderOutbox(OTHER_PANE)
+
+    first.rerender({ submissions: [withdrawn(id)] })
+    second.rerender({ submissions: [withdrawn(id)] })
+    // A replayed snapshot, then a reconnect remounting the view.
+    first.rerender({ submissions: [{ ...withdrawn(id) }] })
+    first.unmount()
+    renderOutbox().rerender({ submissions: [withdrawn(id)] })
+
+    await waitFor(() => expect(readOutbox(SESSION)).toEqual([]))
+    const restored = readNativeChatDraftCache(PANE) + readNativeChatDraftCache(OTHER_PANE)
+    expect(occurrences(restored, 'hello')).toBe(1)
+  })
+
+  it('is back in the composer before it leaves storage, so a crash between repeats it', async () => {
+    answerSendsPending()
+    const { result, rerender } = renderOutbox()
+    const id = await sendToHost(result, 'hello')
+    let storedAtRestore: string[] = []
+    const unsubscribe = subscribeToNativeChatDraftAppend(PANE, () => {
+      storedAtRestore = readOutbox(SESSION).map((entry) => entry.clientMessageId)
+    })
+    const beforeDrop = readOutbox(SESSION, { recoverDispatching: false })
+
+    rerender({ submissions: [withdrawn(id)] })
+    unsubscribe()
+
+    expect(storedAtRestore).toEqual([id])
+    // The drop never reached storage: the next mount gives the text back again rather than losing it.
+    cleanup()
+    writeOutbox(SESSION, beforeDrop)
+    renderOutbox().rerender({ submissions: [withdrawn(id)] })
+    expect(readNativeChatDraftCache(PANE)).toBe('hello\n\nhello')
+  })
+
+  it('keeps a message refused for any other reason on its Retry, and gives nothing back', async () => {
+    answerSendsPending()
+    const { result, rerender } = renderOutbox()
+    const id = await sendToHost(result, 'hello')
+
+    rerender({
+      submissions: [
+        submission(id, { dispatchState: 'rejected', reason: DISPATCH_REJECTED_WRITE_FAILED })
+      ]
+    })
+
+    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('rejected'))
+    expect(readNativeChatDraftCache(PANE)).toBe('')
+  })
+
+  it('drops a withdrawn launch prompt where no composer shows the chat', () => {
+    const launch = enqueueStructuredAgentSessionLaunchPrompt(SESSION, 'launch text')!
+    const { result, rerender } = renderOutbox(null)
+
+    expect(() => rerender({ submissions: [withdrawn(launch.clientMessageId)] })).not.toThrow()
+
+    expect(result.current.outbox).toEqual([])
+    expect(readOutbox(SESSION)).toEqual([])
+    expect(readNativeChatDraftCache(PANE)).toBe('')
+  })
+})
+
+describe('a message a Stop took out of the outbox before the host held it', () => {
+  it('comes back to the composer when the Stop follows the send at once', async () => {
+    mocks.call.mockImplementation(() => new Promise<never>(() => {}))
+    const { result } = renderOutbox()
+    act(() => expect(result.current.send('first')).toBe(true))
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
+    act(() => expect(result.current.send('second')).toBe(true))
+
+    act(() => result.current.withdrawUnsent())
+
+    expect(result.current.outbox.map((entry) => entry.body.blocks)).toEqual([
+      [{ type: 'text', text: 'first' }]
+    ])
+    expect(readNativeChatDraftCache(PANE)).toBe('second')
+  })
+
+  it('gives back a send already on its way only when the host withdraws it', async () => {
+    answerSendsPending()
+    const reply = Promise.withResolvers<void>()
+    const answer = mocks.call.getMockImplementation()!
+    mocks.call.mockImplementationOnce(async (...args) => {
+      await reply.promise
+      return answer(...args)
+    })
+    const { result, rerender } = renderOutbox()
+    act(() => expect(result.current.send('hello')).toBe(true))
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
+    const id = result.current.outbox[0]!.clientMessageId
+
+    act(() => result.current.withdrawUnsent())
+    // It lands ahead of the Stop and reads as sent, not as back in the composer.
+    await act(async () => reply.resolve())
+    rerender({ submissions: [submission(id)] })
+    expect(readNativeChatDraftCache(PANE)).toBe('')
+    expect(result.current.outbox.map((entry) => entry.clientMessageId)).toEqual([id])
+
+    rerender({ submissions: [withdrawn(id)] })
+
+    await waitFor(() => expect(result.current.outbox).toEqual([]))
+    expect(readNativeChatDraftCache(PANE)).toBe('hello')
+  })
+
+  it('leaves a message waiting on Retry where it is, and gives back only what it withdrew', async () => {
+    writeOutbox(SESSION, [
+      {
+        clientMessageId: 'refused-1',
+        sessionId: SESSION,
+        body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'refused' }] },
+        previewUris: [],
+        state: 'rejected',
+        queuedAt: 1,
+        lastAttemptAt: null,
+        retryAfterUnknownSubmittedAt: null
+      }
+    ])
+    mocks.call.mockImplementation(() => new Promise<never>(() => {}))
+    const { result } = renderOutbox()
+    act(() => expect(result.current.send('second')).toBe(true))
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
+    act(() => expect(result.current.send('third')).toBe(true))
+    const onItsWay = result.current.outbox[1]!.clientMessageId
+
+    act(() => result.current.withdrawUnsent())
+
+    expect(result.current.outbox.map((entry) => entry.clientMessageId)).toEqual([
+      'refused-1',
+      onItsWay
+    ])
+    expect(readNativeChatDraftCache(PANE)).toBe('third')
+  })
+})
+
+describe('Stop through the chat', () => {
+  beforeEach(() => {
+    setLocalRuntimeCapabilitiesForTests([
+      AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
+      AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY
+    ])
+    writeOutbox(SESSION, [
+      {
+        clientMessageId: 'queued-1',
+        sessionId: SESSION,
+        body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hello' }] },
+        previewUris: [],
+        state: 'dispatching',
+        queuedAt: 1,
+        lastAttemptAt: 1,
+        retryAfterUnknownSubmittedAt: null
+      }
+    ])
+    mocks.read.submissions = [submission('queued-1')]
+  })
+
+  function renderChat() {
+    return renderHook(() =>
+      useStructuredAgentSession({
+        sessionId: SESSION,
+        agent: 'claude',
+        target,
+        isVisible: true,
+        composerScopeKey: PANE
+      })
+    )
+  }
+
+  it('gives back what the host withdrew into the pane that pressed it', async () => {
+    mocks.call.mockImplementation(async (_target, method) =>
+      method === 'agentSession.cancel' ? { ok: true, value: { cancelled: true } } : null
+    )
+    const { result, rerender } = renderChat()
+
+    await act(async () => {
+      await result.current.stop()
+    })
+    mocks.read.submissions = [withdrawn('queued-1')]
+    rerender()
+
+    await waitFor(() => expect(result.current.outbox).toEqual([]))
+    expect(readNativeChatDraftCache(PANE)).toBe('hello')
+  })
+
+  it('says a failed Stop in a toast and gives nothing back', async () => {
+    mocks.call.mockImplementation(async (_target, method) =>
+      method === 'agentSession.cancel'
+        ? { ok: false, refusal: { code: 'agent_session_not_found', message: 'Gone.' } }
+        : null
+    )
+    const { result, rerender } = renderChat()
+
+    await act(async () => {
+      await result.current.stop()
+    })
+    rerender()
+
+    expect(mocks.toastError).toHaveBeenCalledOnce()
+    expect(readNativeChatDraftCache(PANE)).toBe('')
+    expect(result.current.outbox.map((entry) => entry.clientMessageId)).toEqual(['queued-1'])
+  })
+})
+
+const notComposing = (): boolean => false
+
+describe('an open composer', () => {
+  it('shows text put back while it is open, after what is typed', () => {
+    const { result } = renderHook(() => useNativeChatDraft(PANE, notComposing))
+    act(() => result.current.setDraft('typed'))
+
+    act(() => appendNativeChatDraftCache(PANE, 'hello'))
+
+    expect(result.current.draft).toBe('typed\n\nhello')
+  })
+
+  it('keeps text put back mid-composition through the composed writes, even if it unmounts', () => {
+    const { result, unmount } = renderHook(() => useNativeChatDraft(PANE, () => true))
+    act(() => appendNativeChatDraftCache(PANE, 'hello'))
+    act(() => result.current.setDraft('typed'))
+
+    expect(result.current.draft).toBe('typed')
+    unmount()
+    expect(readNativeChatDraftCache(PANE)).toBe('typed\n\nhello')
+  })
+
+  it('shows images put back while it is open, beside the ones attached', () => {
+    const { result } = renderHook(() =>
+      useNativeChatComposerAttachments({
+        attachmentScopeKey: PANE,
+        allowWithoutTarget: true,
+        caret: 0,
+        disabled: false,
+        isComposing: () => false,
+        resolveTarget: () => null,
+        textareaRef: { current: null },
+        setCaret: () => {},
+        setDraft: () => {},
+        setNotice: () => {}
+      })
+    )
+    act(() => result.current.attachResolvedPaths(['/tmp/typed.png']))
+
+    act(() => appendNativeChatAttachmentCache(PANE, [{ id: 'restored', path: '/tmp/shot.png' }]))
+
+    expect(result.current.imageAttachments.map((attachment) => attachment.path)).toEqual([
+      '/tmp/typed.png',
+      '/tmp/shot.png'
+    ])
+  })
+})
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-withdrawn-message-restore.ts b/src/renderer/src/components/native-chat/structured-agent-session-withdrawn-message-restore.ts
new file mode 100644
index 000000000000..fb8a0c202e58
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-withdrawn-message-restore.ts
@@ -0,0 +1,76 @@
+import { useMemo } from 'react'
+import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
+import { dispatchWasWithdrawn } from '../../../../shared/structured-agent-session-dispatch-rejection'
+import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
+import { appendNativeChatDraftCache } from './native-chat-draft-cache'
+import { readOutbox } from './structured-agent-session-outbox-storage'
+import { appendNativeChatAttachmentCache } from './use-native-chat-composer-attachments'
+
+/**
+ * Gives the sender back what a Stop withdrew: its text and images go into this pane's composer,
+ * after whatever is there. Called before the entries leave storage, so a failure between the two
+ * repeats the text rather than losing it. Only this client's outbox holds them, so no other viewer
+ * gets them.
+ */
+function restoreWithdrawnMessages(
+  sessionId: string,
+  composerScopeKey: string | undefined,
+  withdrawn: readonly StructuredAgentSessionOutboxEntry[]
+): void {
+  if (!composerScopeKey || withdrawn.length === 0) {
+    return
+  }
+  // What storage no longer holds was already given back by whichever view dropped it first.
+  const held = new Set(
+    readOutbox(sessionId, { recoverDispatching: false }).map((entry) => entry.clientMessageId)
+  )
+  for (const entry of withdrawn) {
+    if (!held.has(entry.clientMessageId)) {
+      continue
+    }
+    const blocks = entry.body.blocks
+    appendNativeChatDraftCache(
+      composerScopeKey,
+      blocks.flatMap((block) => (block.type === 'text' ? [block.text] : [])).join('\n')
+    )
+    appendNativeChatAttachmentCache(
+      composerScopeKey,
+      blocks.flatMap((block, index) =>
+        block.type === 'image-ref' && block.path
+          ? [{ id: `withdrawn-${entry.clientMessageId}-${index}`, path: block.path }]
+          : []
+      )
+    )
+  }
+}
+
+export function useStructuredAgentSessionWithdrawnRestore(
+  sessionId: string,
+  /** Absent where no composer shows this session; the entries are then only dropped. */
+  composerScopeKey: string | undefined
+): {
+  /** The entries the host settled as withdrawn by a Stop. */
+  byHost: (
+    entries: readonly StructuredAgentSessionOutboxEntry[],
+    submissions: readonly AgentJournalSubmission[]
+  ) => void
+  /** Entries a Stop took out of the outbox here, before the host held them. */
+  byStop: (entries: readonly StructuredAgentSessionOutboxEntry[]) => void
+} {
+  return useMemo(
+    () => ({
+      byHost: (entries, submissions) => {
+        const withdrawn = new Set(
+          submissions.filter(dispatchWasWithdrawn).map((submission) => submission.clientMessageId)
+        )
+        restoreWithdrawnMessages(
+          sessionId,
+          composerScopeKey,
+          entries.filter((entry) => withdrawn.has(entry.clientMessageId))
+        )
+      },
+      byStop: (entries) => restoreWithdrawnMessages(sessionId, composerScopeKey, entries)
+    }),
+    [composerScopeKey, sessionId]
+  )
+}
diff --git a/src/renderer/src/components/native-chat/structured-attention-dispatch.test.ts b/src/renderer/src/components/native-chat/structured-attention-dispatch.test.ts
index 573eca9d4553..76a49ff8e3bc 100644
--- a/src/renderer/src/components/native-chat/structured-attention-dispatch.test.ts
+++ b/src/renderer/src/components/native-chat/structured-attention-dispatch.test.ts
@@ -10,6 +10,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { AgentSessionTurnCompletion } from '../../../../shared/agent-session-wire'
+import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
 import { structuredAgentSessionPaneKey } from '../../../../shared/structured-agent-session-projection'
 import {
   createTestStore,
@@ -230,7 +231,7 @@ describe('dispatchStructuredTurnCompletionAttention', () => {
     expect(indicators().paneDot).toBe('agent-completion')
   })
 
-  it('words a successful turn as finished and a stopped one through the shipped interrupted flag', () => {
+  it('hands main the host verdict, which picks finished, failed or stopped', () => {
     dispatchStructuredTurnCompletionAttention(structuredTab(), completion())
     // 'done' is the host's report that the turn settled, not a reading of the status row: main
     // words a 'working' state as "working", which would announce a finished turn as unfinished.
@@ -238,16 +239,39 @@ describe('dispatchStructuredTurnCompletionAttention', () => {
       source: 'agent-task-complete',
       surface: 'agent-session',
       agentState: 'done',
-      agentInterrupted: false
+      agentTurnOutcome: 'success'
     })
 
-    dispatched.length = 0
-    seed()
+    for (const [outcome, turnId] of [
+      ['cancellation', 'turn-2'],
+      ['failure', 'turn-3']
+    ] as const) {
+      dispatched.length = 0
+      seed()
+      dispatchStructuredTurnCompletionAttention(structuredTab(), completion({ outcome, turnId }))
+      expect(onlyDispatch()).toMatchObject({ agentState: 'done', agentTurnOutcome: outcome })
+    }
+  })
+
+  it('calls back a send refused before any turn, named by its journal item key, as failed', () => {
     dispatchStructuredTurnCompletionAttention(
       structuredTab(),
-      completion({ outcome: 'cancellation', turnId: 'turn-2' })
+      completion({ outcome: 'failure', turnId: agentJournalSubmissionKey('m1') })
     )
-    expect(onlyDispatch()).toMatchObject({ agentState: 'done', agentInterrupted: true })
+    expect(indicators().paneDot).toBe('agent-completion')
+    expect(onlyDispatch()).toMatchObject({ agentState: 'done', agentTurnOutcome: 'failure' })
+  })
+
+  it('asks for input when the host settled a request while a prompt waits on the user', () => {
+    // e.g. a subagent's approval is unanswered.
+    dispatchStructuredTurnCompletionAttention(structuredTab(), completion({ awaitingUser: true }))
+    expect(indicators().paneDot).toBe('agent-completion')
+    expect(onlyDispatch()).toMatchObject({ agentState: 'blocked', agentTurnOutcome: 'success' })
+
+    dispatched.length = 0
+    seed()
+    dispatchStructuredTurnCompletionAttention(structuredTab(), completion())
+    expect(onlyDispatch()).toMatchObject({ agentState: 'done' })
   })
 
   it('says done even while the status row still reads working, because the host settled the turn', () => {
@@ -270,7 +294,7 @@ describe('dispatchStructuredTurnCompletionAttention', () => {
       }
     })
     dispatchStructuredTurnCompletionAttention(structuredTab(), completion())
-    expect(onlyDispatch()).toMatchObject({ agentState: 'done', agentInterrupted: false })
+    expect(onlyDispatch()).toMatchObject({ agentState: 'done', agentTurnOutcome: 'success' })
   })
 
   it('delivers an id the acknowledgement round trip dismisses when the user reads the chat', () => {
diff --git a/src/renderer/src/components/native-chat/structured-attention-dispatch.ts b/src/renderer/src/components/native-chat/structured-attention-dispatch.ts
index f0afca80e133..4553d79b0a52 100644
--- a/src/renderer/src/components/native-chat/structured-attention-dispatch.ts
+++ b/src/renderer/src/components/native-chat/structured-attention-dispatch.ts
@@ -13,10 +13,11 @@
  * adapter, and the same delivery tail — so suppression, acknowledgement, addressing, the success
  * sound and the blocked-permission fallback all have exactly one implementation.
  *
- * EVERY SETTLED TURN NOTIFIES, matching the CLI lane: success says "finished", and failure and
- * cancellation say "stopped" through the shipped `agentInterrupted` flag rather than a second
- * vocabulary. A turn with no outcome is UNKNOWN — the host sends no event for one, and nothing
- * here may turn that absence into success.
+ * EVERY SETTLED TURN NOTIFIES, matching the CLI lane: the outcome picks the wording — "finished",
+ * "failed" or "stopped" — exactly as the hook lane's verdict does. A turn with no outcome is UNKNOWN — the host sends no event for one, and nothing
+ * here may turn that absence into success. A request that settles while a prompt (a subagent's
+ * approval, say) waits on the user is worded "needs input" instead, as the hook lane words a
+ * blocked row.
  *
  * Unread and delivery come out of ONE `resolveAgentAttention` decision. "Do not alert me about
  * something I am watching" is already answered by focus, in the surface adapter's viewed gates and
@@ -107,10 +108,10 @@ export function dispatchStructuredTurnCompletionAttention(
           ...(row?.agentType ? { agentType: row.agentType } : {}),
           // 'done' is what the host told us, not an inference from the row — the row's own state
           // can still read 'working' when the completion outruns the status re-projection, and
-          // main words a 'working' notification as "working". The outcome picks the wording from
-          // there: interrupted covers failure and cancellation alike.
-          agentState: 'done',
-          agentInterrupted: completion.outcome !== 'success',
+          // main words a 'working' notification as "working". The outcome picks the wording from there.
+          // `awaitingUser` is the row's 'blocked': the user has a prompt to answer.
+          agentState: completion.awaitingUser ? 'blocked' : 'done',
+          agentTurnOutcome: completion.outcome,
           ...(row?.prompt ? { agentPrompt: row.prompt } : {}),
           ...(row?.lastAssistantMessage
             ? { agentLastAssistantMessage: row.lastAssistantMessage }
diff --git a/src/renderer/src/components/native-chat/structured-conversation-command-send.ts b/src/renderer/src/components/native-chat/structured-conversation-command-send.ts
index 77be7d336e74..51575e4ae03a 100644
--- a/src/renderer/src/components/native-chat/structured-conversation-command-send.ts
+++ b/src/renderer/src/components/native-chat/structured-conversation-command-send.ts
@@ -3,6 +3,7 @@ import type {
   AgentSessionConversationCommandResult
 } from '../../../../shared/agent-session-conversation-command'
 import { translate } from '@/i18n/i18n'
+import type { StructuredAgentSessionWriteOutcome } from './use-structured-agent-session-mutate'
 
 export async function sendStructuredConversationCommand(input: {
   command: AgentSessionConversationCommand
@@ -10,7 +11,7 @@ export async function sendStructuredConversationCommand(input: {
   blocked: boolean
   send: (
     command: AgentSessionConversationCommand
-  ) => Promise<AgentSessionConversationCommandResult | null>
+  ) => Promise<StructuredAgentSessionWriteOutcome<AgentSessionConversationCommandResult>>
 }): Promise<{ accepted: boolean; error: string | null }> {
   if (input.pending.current || input.blocked) {
     return {
@@ -23,7 +24,11 @@ export async function sendStructuredConversationCommand(input: {
   }
   input.pending.current = true
   try {
-    const result = await input.send(input.command)
+    const outcome = await input.send(input.command)
+    if (outcome.kind === 'not-done') {
+      return { accepted: false, error: outcome.notice }
+    }
+    const result = outcome.kind === 'done' ? outcome.value : null
     return {
       accepted: result?.state === 'completed' && !result.error,
       error:
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts
index defdf7c5b731..fdc905cb2f74 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts
@@ -291,3 +291,17 @@ export function restoreNativeChatAttachmentCache(
   writeNativeChatAttachmentCache(scopeKey, restored)
   return restored
 }
+
+/** Puts settled images back after whatever is attached, and shows them in a mounted composer. */
+export function appendNativeChatAttachmentCache(
+  scopeKey: string,
+  appended: readonly AgentComposerImageAttachment[]
+): void {
+  if (appended.length === 0) {
+    return
+  }
+  writeNativeChatAttachmentCache(scopeKey, [
+    ...readNativeChatAttachmentCache(scopeKey),
+    ...appended
+  ])
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-interrupt.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-interrupt.ts
index 71a654c09270..f59d86303f14 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-interrupt.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-interrupt.ts
@@ -25,7 +25,7 @@ export function useNativeChatComposerInterrupt(args: {
     }
     const target = resolveTarget()
     if (target) {
-      sendRuntimePtyInput(target.settings, target.ptyId, ESC)
+      sendRuntimePtyInput(target.settings, target.ptyId, ESC, 'driving')
     }
   }, [cancelPendingSends, isWorking, onStop, resolveTarget])
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-draft.ts b/src/renderer/src/components/native-chat/use-native-chat-draft.ts
new file mode 100644
index 000000000000..5653c0a77a85
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-draft.ts
@@ -0,0 +1,82 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+import {
+  appendNativeChatDraftText,
+  readNativeChatDraftCache,
+  subscribeToNativeChatDraftAppend,
+  writeNativeChatDraftCache
+} from './native-chat-draft-cache'
+
+/**
+ * Composer draft state backed by the scope cache so a typed-but-unsent message
+ * survives the composer unmounting on a TUI/GUI toggle. `scopeKey` is the stable
+ * pane key also used for image attachments; when it changes (the composer is
+ * reused for a different pane) the cached draft is reloaded.
+ */
+export function useNativeChatDraft(
+  scopeKey: string,
+  isComposing: () => boolean
+): {
+  draft: string
+  setDraft: (next: string | ((previous: string) => string)) => void
+  /** Shows text appended during an IME composition, which owns the field until it settles. */
+  flushDraftAppends: () => void
+} {
+  const [draft, setDraftState] = useState(() => readNativeChatDraftCache(scopeKey))
+  // Appended while composing: the editor's own writes would erase it, so the cache keeps it after them.
+  const pendingAppendRef = useRef<{ scopeKey: string; text: string } | null>(null)
+
+  // Reload the cached draft when reused for a different pane (scope change),
+  // adjusting state during render rather than in an effect so the restored draft
+  // is visible on the first paint after the switch.
+  const lastScopeKey = useRef(scopeKey)
+  if (lastScopeKey.current !== scopeKey) {
+    lastScopeKey.current = scopeKey
+    setDraftState(readNativeChatDraftCache(scopeKey))
+  }
+
+  useEffect(
+    () =>
+      subscribeToNativeChatDraftAppend(scopeKey, (text) => {
+        if (!isComposing()) {
+          setDraftState(readNativeChatDraftCache(scopeKey))
+          return
+        }
+        const pending = pendingAppendRef.current
+        pendingAppendRef.current = {
+          scopeKey,
+          text:
+            pending?.scopeKey === scopeKey ? appendNativeChatDraftText(pending.text, text) : text
+        }
+      }),
+    [isComposing, scopeKey]
+  )
+
+  // Persist every mutation through the cache. Accepts the same value/updater
+  // forms as a useState setter so call sites are drop-in.
+  const setDraft = useCallback(
+    (next: string | ((previous: string) => string)) => {
+      setDraftState((previous) => {
+        const resolved = typeof next === 'function' ? next(previous) : next
+        const pending = pendingAppendRef.current
+        writeNativeChatDraftCache(
+          scopeKey,
+          pending?.scopeKey === scopeKey
+            ? appendNativeChatDraftText(resolved, pending.text)
+            : resolved
+        )
+        return resolved
+      })
+    },
+    [scopeKey]
+  )
+
+  const flushDraftAppends = useCallback(() => {
+    const pending = pendingAppendRef.current
+    pendingAppendRef.current = null
+    if (pending?.scopeKey === scopeKey) {
+      setDraft((previous) => appendNativeChatDraftText(previous, pending.text))
+    }
+  }, [scopeKey, setDraft])
+
+  return { draft, setDraft, flushDraftAppends }
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-interactive-prompt-card.test.ts b/src/renderer/src/components/native-chat/use-native-chat-interactive-prompt-card.test.ts
new file mode 100644
index 000000000000..a13df87c3e8a
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-interactive-prompt-card.test.ts
@@ -0,0 +1,68 @@
+// @vitest-environment happy-dom
+
+import { afterEach, describe, expect, it } from 'vitest'
+import { act, cleanup, renderHook } from '@testing-library/react'
+import type { AgentStatusPayload } from '../../../../shared/agent-status-types'
+import type { NativeChatMessage } from '../../../../shared/native-chat-types'
+
+const { useAppStore } = await import('../../store')
+const { useNativeChatInteractivePromptCard } =
+  await import('./use-native-chat-interactive-prompt-card')
+
+const paneKey = 'tab-card:leaf-card'
+const NO_MESSAGES: readonly NativeChatMessage[] = []
+
+function setStatus(payload: Omit<AgentStatusPayload, 'prompt' | 'agentType'>): void {
+  useAppStore
+    .getState()
+    .setAgentStatus(paneKey, { prompt: 'Rename', agentType: 'claude', ...payload })
+}
+
+afterEach(() => {
+  cleanup()
+  useAppStore.setState({ agentStatusByPaneKey: {} })
+})
+
+describe('useNativeChatInteractivePromptCard', () => {
+  // The hook runs in the pane's view, so each render here re-renders the whole transcript.
+  it('does not re-render for a tool call that carries no prompt', () => {
+    setStatus({ state: 'working', toolName: 'Read' })
+    let renders = 0
+    renderHook(() => {
+      renders += 1
+      return useNativeChatInteractivePromptCard({
+        paneKey,
+        messages: NO_MESSAGES,
+        transcriptSettled: true
+      })
+    })
+    const settled = renders
+
+    act(() => setStatus({ state: 'working', toolName: 'Bash' }))
+    act(() => setStatus({ state: 'working', toolName: 'Edit' }))
+
+    expect(renders).toBe(settled)
+  })
+
+  it('still reads the prompt that arrives with a tool call', () => {
+    setStatus({ state: 'working', toolName: 'Read' })
+    const { result } = renderHook(() =>
+      useNativeChatInteractivePromptCard({
+        paneKey,
+        messages: NO_MESSAGES,
+        transcriptSettled: true
+      })
+    )
+    expect(result.current).toBeNull()
+
+    act(() =>
+      setStatus({
+        state: 'waiting',
+        toolName: 'Bash',
+        interactivePrompt: JSON.stringify({ approval: { tool: 'Bash', summary: 'rm -rf dist' } })
+      })
+    )
+
+    expect(result.current).toMatchObject({ kind: 'approval' })
+  })
+})
diff --git a/src/renderer/src/components/native-chat/use-native-chat-interactive-prompt-card.ts b/src/renderer/src/components/native-chat/use-native-chat-interactive-prompt-card.ts
new file mode 100644
index 000000000000..243fea0ac577
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-interactive-prompt-card.ts
@@ -0,0 +1,48 @@
+import { useMemo } from 'react'
+import { useAppStore } from '../../store'
+import { resolveNativeChatAsk } from '../../../../shared/native-chat-ask'
+import type { NativeChatMessage } from '../../../../shared/native-chat-types'
+import {
+  parseInteractivePrompt,
+  type InteractivePromptCard
+} from './native-chat-interactive-prompt'
+
+/**
+ * The prompt a terminal-backed pane can draw as a card: a tool approval from the
+ * live status, else a question from the live status or, failing that, from the
+ * transcript's unresolved ask (headless host, relay gap, replay, reconnect — a
+ * pane parked on a selector must not take the next message as its answer, #11761).
+ */
+export function useNativeChatInteractivePromptCard({
+  paneKey,
+  messages,
+  transcriptSettled
+}: {
+  paneKey: string
+  /** Pass the command-boundary-trimmed messages so an ask abandoned via `/clear` stays gone. */
+  messages: readonly NativeChatMessage[]
+  transcriptSettled: boolean
+}): InteractivePromptCard {
+  const interactivePrompt = useAppStore(
+    (s) => s.agentStatusByPaneKey[paneKey]?.interactivePrompt ?? null
+  )
+  // The sibling `toolName` lets the question parser dispatch through the tool's
+  // registered parser (mobile parity). Read only beside a prompt: it changes on
+  // every tool call, and this hook re-renders the whole pane.
+  const interactiveToolName = useAppStore((s) => {
+    const entry = s.agentStatusByPaneKey[paneKey]
+    return entry?.interactivePrompt ? (entry.toolName ?? null) : null
+  })
+  return useMemo(() => {
+    const statusCard = parseInteractivePrompt(interactivePrompt, interactiveToolName ?? undefined)
+    if (statusCard?.kind === 'approval') {
+      return statusCard
+    }
+    const prompt = resolveNativeChatAsk({
+      liveAsk: statusCard?.prompt ?? null,
+      messages,
+      transcriptSettled
+    })
+    return prompt ? { kind: 'question' as const, prompt } : null
+  }, [interactivePrompt, interactiveToolName, messages, transcriptSettled])
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-interactive-send.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-interactive-send.test.tsx
index 46ccb935b263..39fe32a98f50 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-interactive-send.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-interactive-send.test.tsx
@@ -241,7 +241,8 @@ describe('useNativeChatInteractiveSend', () => {
     expect(mocks.sendRuntimePtyInput).toHaveBeenCalledWith(
       { terminalTabId: 'tab-1' },
       'pty-1',
-      '\x1b'
+      '\x1b',
+      'driving'
     )
   })
 
diff --git a/src/renderer/src/components/native-chat/use-native-chat-interactive-send.ts b/src/renderer/src/components/native-chat/use-native-chat-interactive-send.ts
index 9723e7ffad16..d1fa6d602dd2 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-interactive-send.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-interactive-send.ts
@@ -95,7 +95,12 @@ export function useNativeChatInteractiveSend(
       if (!targetPtyId || isTerminalInputQuarantined(terminalTabId)) {
         return
       }
-      sendRuntimePtyInput(getSettingsForAgentTabRuntimeOwner(terminalTabId), targetPtyId, raw)
+      sendRuntimePtyInput(
+        getSettingsForAgentTabRuntimeOwner(terminalTabId),
+        targetPtyId,
+        raw,
+        'driving'
+      )
     },
     [terminalTabId, targetPtyId]
   )
diff --git a/src/renderer/src/components/native-chat/use-native-chat-launch-prompt-delivery-notice.ts b/src/renderer/src/components/native-chat/use-native-chat-launch-prompt-delivery-notice.ts
new file mode 100644
index 000000000000..c3d7974c160a
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-launch-prompt-delivery-notice.ts
@@ -0,0 +1,22 @@
+import { useMemo } from 'react'
+import { translate } from '@/i18n/i18n'
+import type { NativeChatMessage } from '../../../../shared/native-chat-types'
+import type { NativeChatDeliveryNotice } from './NativeChatMessageRow'
+
+/** The terminal-backed chat's one delivery notice: its launch prompt, when the terminal refused it
+ *  and the prompt's row is on screen. The terminal is where to act, so it offers no Retry. */
+export function useNativeChatLaunchPromptDeliveryNotice(
+  failedMessageId: string | null | undefined,
+  messages: readonly NativeChatMessage[]
+): ReadonlyMap<string, NativeChatDeliveryNotice> | undefined {
+  return useMemo(() => {
+    if (!failedMessageId || !messages.some((message) => message.id === failedMessageId)) {
+      return undefined
+    }
+    const text = translate(
+      'components.native-chat.launchPromptNotDelivered',
+      'Not delivered — check the terminal'
+    )
+    return new Map([[failedMessageId, { text }]])
+  }, [failedMessageId, messages])
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-live-session.test.ts b/src/renderer/src/components/native-chat/use-native-chat-live-session.test.ts
index cd4b701e2709..4c7f784eb318 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-live-session.test.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-live-session.test.ts
@@ -547,6 +547,42 @@ describe('useNativeChatLiveSession — transport routing', () => {
     expect(latest?.status).toBe('ready')
   })
 
+  // Declining a prompt with an interrupt fires no hook, so the row keeps saying
+  // `waiting`; the transcript's marker is what ends the wait.
+  it('ends a hook wait once the transcript records the turn interrupted', async () => {
+    const waitStartedAt = Date.now() - 1_000
+    useAppStore.getState().setAgentStatus(PANE, { state: 'waiting', prompt: '', agentType: AGENT })
+    const row = useAppStore.getState().agentStatusByPaneKey[PANE]
+    if (!row) {
+      throw new Error('the store dropped the status row this test depends on')
+    }
+    useAppStore.setState({
+      agentStatusByPaneKey: { [PANE]: { ...row, stateStartedAt: waitStartedAt } }
+    })
+    const transport = getMockTransport('env-1')
+    await render({ paneKey: PANE, agent: AGENT, sessionId: SESSION, runtimeEnvironmentId: 'env-1' })
+    await act(async () =>
+      transport.emit({
+        type: 'snapshot',
+        messages: [user('u-1', 'go')],
+        hasMore: false,
+        lifecycle: { state: 'working', turnId: 'turn-1', timestamp: waitStartedAt - 500 }
+      })
+    )
+    expect(latest?.hookAwaitingInput).toBe(true)
+    expect(latest?.status).toBe('ready')
+
+    await act(async () =>
+      transport.emit({
+        type: 'appended',
+        messages: [],
+        lifecycle: { state: 'interrupted', turnId: 'turn-1', timestamp: Date.now() }
+      })
+    )
+
+    expect(latest?.hookAwaitingInput).toBe(false)
+  })
+
   it('does not let an older pagination read rewind a live completion', async () => {
     useAppStore.setState({
       agentStatusByPaneKey: {
diff --git a/src/renderer/src/components/native-chat/use-native-chat-live-session.ts b/src/renderer/src/components/native-chat/use-native-chat-live-session.ts
index a62237f1b354..0f4a4058155d 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-live-session.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-live-session.ts
@@ -9,7 +9,7 @@ import {
   createNativeChatMerger,
   replaceList
 } from '../../../../shared/native-chat-merge'
-import { mergeNativeChatLiveSession } from './native-chat-live-status'
+import { mergeNativeChatLiveSession, nativeChatHookAwaitsInput } from './native-chat-live-status'
 import {
   hasMoreNativeChatHistory,
   NATIVE_CHAT_INITIAL_LIMIT,
@@ -342,6 +342,11 @@ export function useNativeChatLiveSession(
     })
     return {
       ...session,
+      hookAwaitingInput: nativeChatHookAwaitsInput(
+        hookState,
+        hookStateStartedAt,
+        transcriptLifecycle
+      ),
       hasMore,
       loadingEarlier,
       olderHistoryGeneration,
diff --git a/src/renderer/src/components/native-chat/use-native-chat-message-rail.test.ts b/src/renderer/src/components/native-chat/use-native-chat-message-rail.test.ts
index cec8d63a9c70..6772eec7a471 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-message-rail.test.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-message-rail.test.ts
@@ -8,6 +8,7 @@ import type { NativeChatResolvedPrompt } from './native-chat-resolution-receipt'
 import type { NativeChatTurnDiff } from './native-chat-turn-diffs'
 import { buildNativeChatTranscriptSlots } from './native-chat-transcript-slots'
 import { useNativeChatMessageRail } from './use-native-chat-message-rail'
+import { selectNativeChatActiveTurnKey } from '../../../../shared/native-chat-turn-status'
 
 function message(id: string, role: NativeChatMessage['role']): NativeChatMessage {
   return {
@@ -31,12 +32,10 @@ function slotsOf(messages: NativeChatMessage[]) {
   return buildNativeChatTranscriptSlots({
     messages,
     turnKeys,
-    latestUserIndex: messages.findLastIndex((entry) => entry.role === 'user'),
-    currentTurnKey: undefined,
+    activeTurnKey: selectNativeChatActiveTurnKey(messages),
     receipts: new Map<string, NativeChatResolvedPrompt>(),
     turnStatuses: { active: null, completedByTurn: {} },
     turnDiffs: new Map<string, NativeChatTurnDiff>(),
-    showTurnStatus: false,
     expandedTurnKeys: new Set<string>(),
     isWorking: false,
     lifecycleWorking: false
diff --git a/src/renderer/src/components/native-chat/use-native-chat-provisional-launch.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-provisional-launch.test.tsx
index 304168a328ad..d19e114e6b96 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-provisional-launch.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-provisional-launch.test.tsx
@@ -7,13 +7,14 @@ import type * as LaunchIntentModule from '@/lib/launch-structured-agent-session'
 
 const mocks = vi.hoisted(() => ({
   call: vi.fn<(target: unknown, method: string, params?: unknown) => Promise<unknown>>(),
-  launch: vi.fn<(intent: { sessionId: string }) => Promise<{ sessionId: string; fence: number }>>()
+  launch: vi.fn<(intent: { sessionId: string }) => Promise<{ sessionId: string; fence: number }>>(),
+  toastError: vi.fn()
 }))
 
 let readState: StructuredAgentSessionState
 let publishedTabs: unknown[] = []
 
-vi.mock('sonner', () => ({ toast: { error: vi.fn(), message: vi.fn() } }))
+vi.mock('sonner', () => ({ toast: { error: mocks.toastError, message: vi.fn() } }))
 
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   callStructuredAgentSession: mocks.call
@@ -169,7 +170,9 @@ describe('a chat pane over its own launch', () => {
       await launch.launchResult
     })
     rerender()
-    await waitFor(() => expect(result.current.error).toBe('GPT-5.6 Luna is not available'))
+    await waitFor(() =>
+      expect(mocks.toastError).toHaveBeenCalledWith("The setting wasn't changed.")
+    )
     // Reverted to what the chat runs; the refusal never kept the launch from publishing.
     expect(currentModel(result.current.optionSnapshot)).toBe('gpt-5.5')
   })
diff --git a/src/renderer/src/components/native-chat/use-native-chat-provisional-launch.ts b/src/renderer/src/components/native-chat/use-native-chat-provisional-launch.ts
index 0661eb0df889..12528859d71a 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-provisional-launch.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-provisional-launch.ts
@@ -3,7 +3,7 @@ import {
   getStructuredAgentSessionLaunchLifecycle,
   getStructuredAgentSessionLaunchResumes,
   retryStructuredAgentSessionLaunch,
-  useStructuredAgentSessionLaunchFailureReason,
+  useStructuredAgentSessionLaunchFailure,
   useStructuredAgentSessionLaunchLifecycle,
   useStructuredAgentSessionLaunchSelection
 } from '@/lib/structured-agent-session-launch'
@@ -66,7 +66,7 @@ export function useNativeChatProvisionalLaunch(
   sessionId: string
 ) {
   const lifecycle = useStructuredAgentSessionLaunchLifecycle(worktreeId ?? '', sessionId)
-  const failureReason = useStructuredAgentSessionLaunchFailureReason(worktreeId ?? '', sessionId)
+  const failure = useStructuredAgentSessionLaunchFailure(worktreeId ?? '', sessionId)
   const launch = useLatchedLaunchView(sessionId, worktreeId, lifecycle !== null)
   const retry = useCallback(() => {
     if (worktreeId) {
@@ -91,7 +91,7 @@ export function useNativeChatProvisionalLaunch(
   return {
     lifecycle,
     launch,
-    failureReason,
+    failure,
     retry,
     sendThroughRelaunch,
     transportEnabled: lifecycle === null || lifecycle === 'published'
diff --git a/src/renderer/src/components/native-chat/use-native-chat-terminal-turn-timing.ts b/src/renderer/src/components/native-chat/use-native-chat-terminal-turn-timing.ts
new file mode 100644
index 000000000000..13aa5a939771
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-terminal-turn-timing.ts
@@ -0,0 +1,45 @@
+import { useMemo } from 'react'
+import { useAppStore } from '../../store'
+import type { NativeChatMessage } from '../../../../shared/native-chat-types'
+import type { NativeChatSettledTurns } from '../../../../shared/native-chat-turn-status'
+import {
+  nativeChatHookLatestTurnWorkedSeconds,
+  nativeChatHookTurnStartedAt,
+  nativeChatLatestTurnId,
+  nativeChatTranscriptSettledTurns
+} from './native-chat-terminal-turn'
+import { resolveNativeChatHookState } from './use-native-chat-hook-status'
+
+/** The terminal-backed pane's turn timing for the message list: when its running turn began, by
+ *  the host, and each finished turn's duration (the host's for the latest, the transcript's for
+ *  history). All of it survives a remount of the pane. */
+export function useNativeChatTerminalTurnTiming(
+  paneKey: string,
+  messages: readonly NativeChatMessage[],
+  turnActive: boolean
+): { workingStartedAt: number | null; settledTurns: NativeChatSettledTurns } {
+  // Freshness is time-based: re-read when the scheduler says a silent row aged out.
+  const agentStatusEpoch = useAppStore((s) => s.agentStatusEpoch)
+  void agentStatusEpoch
+  const turnStartedAt = useAppStore((s) =>
+    nativeChatHookTurnStartedAt(s.agentStatusByPaneKey[paneKey])
+  )
+  const latestWorkedSeconds = useAppStore((s) => {
+    const entry = s.agentStatusByPaneKey[paneKey]
+    return nativeChatHookLatestTurnWorkedSeconds(entry, resolveNativeChatHookState(entry) === null)
+  })
+  const transcriptSettled = useMemo(() => nativeChatTranscriptSettledTurns(messages), [messages])
+  const latestTurnId = useMemo(() => nativeChatLatestTurnId(messages), [messages])
+  const settledTurns = useMemo(() => {
+    if (turnActive || latestWorkedSeconds === undefined || latestTurnId === null) {
+      return transcriptSettled
+    }
+    return new Map(transcriptSettled).set(
+      latestTurnId,
+      latestWorkedSeconds === null || turnStartedAt === null
+        ? null
+        : { startedAt: turnStartedAt, workedSeconds: latestWorkedSeconds }
+    )
+  }, [latestTurnId, latestWorkedSeconds, transcriptSettled, turnActive, turnStartedAt])
+  return { workingStartedAt: turnActive ? turnStartedAt : null, settledTurns }
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-transcript-scroll.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-transcript-scroll.test.tsx
index 1f08a51299a8..948b83c5dbb8 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-transcript-scroll.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-transcript-scroll.test.tsx
@@ -23,7 +23,7 @@ function TranscriptHarness({
     contentRef,
     itemCount,
     isWorking: false,
-    showTypingIndicator: false,
+    showsTailRow: false,
     isVisible,
     alignToViewportTop: vi.fn(),
     scrollToEnd,
diff --git a/src/renderer/src/components/native-chat/use-native-chat-transcript-scroll.ts b/src/renderer/src/components/native-chat/use-native-chat-transcript-scroll.ts
index 23bebf0f1e8d..6df6d3eb562e 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-transcript-scroll.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-transcript-scroll.ts
@@ -52,7 +52,7 @@ export function useNativeChatTranscriptScroll({
   contentRef,
   itemCount,
   isWorking,
-  showTypingIndicator,
+  showsTailRow,
   isVisible,
   alignToViewportTop,
   scrollToEnd,
@@ -64,7 +64,8 @@ export function useNativeChatTranscriptScroll({
   contentRef: React.RefObject<HTMLDivElement | null>
   itemCount: number
   isWorking: boolean
-  showTypingIndicator: boolean
+  /** Whether the list draws a row after the transcript (live activity or a wait). */
+  showsTailRow: boolean
   isVisible: boolean
   alignToViewportTop: (element: HTMLElement) => void
   scrollToEnd: () => void
@@ -156,7 +157,7 @@ export function useNativeChatTranscriptScroll({
     itemCount,
     isWorking,
     restoreScrollOffset,
-    showTypingIndicator,
+    showsTailRow,
     scrollToEndWhenMeasurable
   ])
 
diff --git a/src/renderer/src/components/native-chat/use-native-chat-transcript-window.options.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-transcript-window.options.test.tsx
index 823f78af6edc..7d245cc76fd2 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-transcript-window.options.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-transcript-window.options.test.tsx
@@ -58,6 +58,7 @@ function slot(id: string): NativeChatTranscriptSlot {
     folded: false,
     turnFolds: false,
     turnDiff: undefined,
+    subagentLabel: undefined,
     estimatedHeight: 48
   }
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-turn-status.ts b/src/renderer/src/components/native-chat/use-native-chat-turn-status.ts
index 82d98c77ec0d..33a795b8b9d6 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-turn-status.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-turn-status.ts
@@ -12,17 +12,18 @@ export type { NativeChatTurnStatus }
 
 export function useNativeChatTurnStatus({
   messages,
-  latestUserIndex,
+  activeTurnKey,
   isWorking,
   workingStartedAt,
   settledTurns,
   thinking = false
 }: {
   messages: readonly NativeChatMessage[]
-  latestUserIndex: number
+  /** The user message whose bar carries the live clock (`selectNativeChatActiveTurnKey`). */
+  activeTurnKey: string
   isWorking: boolean
   workingStartedAt?: number | null
-  /** Host-recorded durations; they outrank whatever this client observed. */
+  /** Recorded durations (the host's journal or the transcript); they outrank what this client observed. */
   settledTurns?: NativeChatSettledTurns | null
   /** Whether the turn is reasoning right now, derived from its journal content. */
   thinking?: boolean
@@ -30,8 +31,6 @@ export function useNativeChatTurnStatus({
   active: NativeChatTurnStatus | null
   completedByTurn: Readonly<Record<string, NativeChatTurnStatus>>
 } {
-  const latestUserId = latestUserIndex !== -1 ? (messages[latestUserIndex]?.id ?? null) : null
-  const activeTurnKey = latestUserId ?? '__unanchored__'
   const [timingByTurn, setTimingByTurn] = useState<NativeChatTurnTimingByTurn>({})
 
   useLayoutEffect(() => {
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-hold.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-hold.ts
index 628a369281bb..f484f500a56f 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-hold.ts
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-hold.ts
@@ -8,6 +8,9 @@
 //
 // The release CHAINS off the hold rather than racing it: an unmount during the hold's round trip
 // would otherwise release a hold that has not landed yet, and the late hold would never be undone.
+//
+// A current host ignores both: it starts an agent only for a send. They stay for older hosts, until
+// MIN_COMPATIBLE_RUNTIME_SERVER_VERSION passes the first host that ignores them.
 
 import { useEffect, useRef } from 'react'
 import { structuredAgentSessionHolderId } from '../../../../shared/structured-agent-session-holder'
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-mutate.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-mutate.ts
index d7706913d21d..57b7acdaf093 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-mutate.ts
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-mutate.ts
@@ -1,25 +1,50 @@
 // One structured-session mutation, fenced and idempotent.
 //
 // The client operation id is keyed on (session, method, payload) so a retry of
-// the same request reuses it and the host upserts one row instead of two, and
+// the same request reuses it and the host upserts one row instead of two (a
+// payload naming no target gets a new one on every call), and
 // every result is discarded unless the runtime fence it was issued against is
-// still the current one.
+// still the current one. A write that did not happen is reported once, in the
+// person's words, by the caller that knows where to say it; nothing latches.
 
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef } from 'react'
+import { toast } from 'sonner'
 import * as conversationCommands from './structured-conversation-command-send'
 import type { AgentSessionMutationResult } from '../../../../shared/agent-session-wire'
+import {
+  agentSessionRefusalFailure,
+  agentSessionThrownFailure,
+  agentSessionWriteKindForMethod as writeKind
+} from '../../../../shared/agent-session-write-failure'
 import { agentSessionRefusalOperationState } from '../../../../shared/agent-session-refusal-retry'
 import { structuredAgentSessionPayloadFingerprint } from '../../../../shared/structured-agent-session-mutation'
+import { structuredAgentSessionWriteNamesItsTarget } from '../../../../shared/structured-agent-session-operation-identity'
 import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 import { structuredSessionOperationId } from './use-structured-agent-session-outbox'
+import { agentSessionWriteFailureText } from './agent-session-write-notice-text'
 
-export type StructuredAgentSessionMutate = <T>(
+export type StructuredAgentSessionWriteOutcome<T> =
+  | { kind: 'done'; value: T }
+  /** Refused or failed, with what to tell the person. */
+  | { kind: 'not-done'; notice: string }
+  /** Settled for an owner or session this pane no longer shows; there is nothing to say. */
+  | { kind: 'dropped' }
+
+type WriteArgs = [
   method: string,
   fingerprintMethod: string,
   fields: Record<string, unknown>,
   operationIdOverride?: string | null
-) => Promise<T | null>
+]
+
+export type StructuredAgentSessionWrite = <T>(
+  ...args: WriteArgs
+) => Promise<StructuredAgentSessionWriteOutcome<T>>
+
+/** A write whose failure is shown as a toast; the control that sent it is the way to try again. */
+export type StructuredAgentSessionMutate = <T>(...args: WriteArgs) => Promise<T | null>
 
 export function useStructuredAgentSessionMutate(args: {
   sessionId: string
@@ -29,13 +54,10 @@ export function useStructuredAgentSessionMutate(args: {
    *  is in flight, and a result from the previous fence is not this session's. */
   stateRef: { current: { fence: number | null } }
 }): {
+  write: StructuredAgentSessionWrite
   mutate: StructuredAgentSessionMutate
-  writeError: string | null
-  /** A write this hook did not send, refused all the same (a pick applied by the launch). */
-  reportWriteError: (message: string) => void
 } {
   const { enabled = true, sessionId, stateRef, target } = args
-  const [writeError, setWriteError] = useState<string | null>(null)
   const operationIds = useRef(new Map<string, string>())
   const enabledRef = useRef(enabled)
   useEffect(() => {
@@ -43,21 +65,28 @@ export function useStructuredAgentSessionMutate(args: {
     enabledRef.current = enabled
   }, [enabled])
 
-  const mutate = useCallback(
+  const write = useCallback(
     async <T>(
       method: string,
       fingerprintMethod: string,
       fields: Record<string, unknown>,
       operationIdOverride?: string | null
-    ): Promise<T | null> => {
+    ): Promise<StructuredAgentSessionWriteOutcome<T>> => {
       if (!enabled || !enabledRef.current || stateRef.current.fence === null) {
-        return null
+        return { kind: 'dropped' }
       }
       const targetFence = stateRef.current.fence
       const key = `${sessionId}:${fingerprintMethod}:${JSON.stringify(fields)}`
+      // A write naming no target acts on whatever is in flight when the host reaches it, so every
+      // press is its own write; one naming its target keeps its id for a retry to replay.
+      const namesTarget = structuredAgentSessionWriteNamesItsTarget(fingerprintMethod, fields)
       const clientOperationId =
-        operationIdOverride ?? operationIds.current.get(key) ?? structuredSessionOperationId()
-      operationIds.current.set(key, clientOperationId)
+        operationIdOverride ??
+        (namesTarget ? operationIds.current.get(key) : undefined) ??
+        structuredSessionOperationId()
+      if (namesTarget) {
+        operationIds.current.set(key, clientOperationId)
+      }
       let result: AgentSessionMutationResult<T>
       try {
         result = await callStructuredAgentSession<AgentSessionMutationResult<T>>(target, method, {
@@ -74,31 +103,60 @@ export function useStructuredAgentSessionMutate(args: {
           ...fields
         })
       } catch (error) {
-        if (enabledRef.current && stateRef.current.fence === targetFence) {
-          setWriteError(error instanceof Error ? error.message : 'Request was not sent')
-        }
-        return null
+        return enabledRef.current && stateRef.current.fence === targetFence
+          ? {
+              kind: 'not-done',
+              notice: agentSessionWriteFailureText(
+                agentSessionThrownFailure(
+                  error,
+                  error instanceof RuntimeRpcCallError ? error.code : undefined
+                ),
+                writeKind(fingerprintMethod, fields)
+              )
+            }
+          : { kind: 'dropped' }
       }
       if (!result.ok) {
-        if (agentSessionRefusalOperationState(result.refusal.code) === 'settled-rejected') {
+        const operationState = agentSessionRefusalOperationState(result.refusal.code)
+        // Cancel's plan recovers no unknown ledger row, so a kept id would earn the same refusal
+        // until it expires, and Stop for that turn would do nothing.
+        if (
+          operationState === 'settled-rejected' ||
+          (operationState === 'unknown' && fingerprintMethod === 'agentSession.cancel')
+        ) {
           operationIds.current.delete(key)
         }
-        if (enabledRef.current && stateRef.current.fence === targetFence) {
-          setWriteError(result.refusal.message)
-        }
-        return null
+        return enabledRef.current && stateRef.current.fence === targetFence
+          ? {
+              kind: 'not-done',
+              notice: agentSessionWriteFailureText(
+                agentSessionRefusalFailure(result.refusal),
+                writeKind(fingerprintMethod, fields)
+              )
+            }
+          : { kind: 'dropped' }
       }
       if (!enabledRef.current || stateRef.current.fence !== targetFence) {
-        return null
+        return { kind: 'dropped' }
       }
       if (!conversationCommands.isUnconfirmedConversationCommand(fingerprintMethod, result.value)) {
         operationIds.current.delete(key)
       }
-      setWriteError(null)
-      return result.value
+      return { kind: 'done', value: result.value }
     },
     [enabled, sessionId, stateRef, target]
   )
 
-  return { mutate, writeError, reportWriteError: setWriteError }
+  const mutate = useCallback(
+    async <T>(...writeArgs: WriteArgs): Promise<T | null> => {
+      const outcome = await write<T>(...writeArgs)
+      if (outcome.kind === 'not-done') {
+        toast.error(outcome.notice)
+      }
+      return outcome.kind === 'done' ? outcome.value : null
+    },
+    [write]
+  )
+
+  return { write, mutate }
 }
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-options.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-options.test.tsx
index 65b39be9a94c..53e582af5de4 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-options.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-options.test.tsx
@@ -7,9 +7,11 @@ const mocks = vi.hoisted(() => ({
   call: vi.fn(),
   enqueue: vi.fn(),
   hold: vi.fn<(sessionId: string, id: string, encoded: string) => Promise<unknown> | null>(),
-  reportWriteError: vi.fn<(message: string) => void>()
+  toastError: vi.fn<(message: string) => void>()
 }))
 
+vi.mock('sonner', () => ({ toast: { error: mocks.toastError } }))
+
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   callStructuredAgentSession: mocks.call
 }))
@@ -99,7 +101,6 @@ function renderOptions(initial: RenderProps, mutate: StructuredAgentSessionMutat
         turnId: props.turnId ?? null,
         unloadedTurnRevisions: undefined,
         mutate,
-        reportWriteError: mocks.reportWriteError,
         ...(props.launch
           ? {
               launch: {
@@ -164,7 +165,7 @@ describe('useStructuredAgentSessionOptions', () => {
     mocks.call.mockReset()
     mocks.enqueue.mockReset()
     mocks.hold.mockReset()
-    mocks.reportWriteError.mockReset()
+    mocks.toastError.mockReset()
   })
 
   it('upgrades the seed with the host catalog while the live read is still pending', async () => {
@@ -408,7 +409,7 @@ describe('useStructuredAgentSessionOptions', () => {
           picks: [{ modelId: 'gpt-5.6-luna', optionId: 'model', value: 'gpt-5.6-luna' }]
         })
       )
-      expect(mocks.reportWriteError).not.toHaveBeenCalled()
+      expect(mocks.toastError).not.toHaveBeenCalled()
       unmount()
     })
 
@@ -416,7 +417,7 @@ describe('useStructuredAgentSessionOptions', () => {
       answer({})
       mocks.hold.mockResolvedValue({
         kind: 'refused',
-        message: 'Model gpt-5.6-luna is unavailable'
+        failure: { kind: 'refused', code: 'agent_session_operation_capacity' }
       })
       const { result, unmount } = renderOptions(
         { ...PROVISIONAL, launchSeedOptions: SEED },
@@ -426,7 +427,9 @@ describe('useStructuredAgentSessionOptions', () => {
         await result.current.setStructuredOption('model', 'gpt-5.6-luna')
       })
       await waitFor(() =>
-        expect(mocks.reportWriteError).toHaveBeenCalledWith('Model gpt-5.6-luna is unavailable')
+        expect(mocks.toastError).toHaveBeenCalledWith(
+          "Orca has received too many requests in the last day. The setting wasn't changed."
+        )
       )
       expect(mocks.enqueue).not.toHaveBeenCalled()
       unmount()
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-options.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-options.ts
index 3cd1f94add8d..e3ee7cd1de05 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-options.ts
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-options.ts
@@ -1,3 +1,4 @@
+import { toast } from 'sonner'
 import { useCallback, useMemo } from 'react'
 import type {
   AgentSessionOptionResult,
@@ -23,6 +24,7 @@ import { encodeStructuredAgentSessionOptionValue } from '../../../../shared/stru
 import type { StructuredAgentSessionMutate } from './use-structured-agent-session-mutate'
 import { useHostModelCatalogUpgrade } from './use-host-model-catalog-upgrade'
 import { useStructuredAgentSessionOptionState } from './use-structured-agent-session-option-state'
+import { agentSessionWriteFailureText } from './agent-session-write-notice-text'
 import type { StructuredAgentSessionLaunchView } from './use-native-chat-provisional-launch'
 import {
   getStructuredAgentSessionLaunchSelection,
@@ -44,7 +46,6 @@ export function useStructuredAgentSessionOptions(args: {
   turnId: string | null
   unloadedTurnRevisions: number | undefined
   mutate: StructuredAgentSessionMutate
-  reportWriteError: (message: string) => void
   launch?: StructuredAgentSessionLaunchView
 }) {
   const {
@@ -53,7 +54,6 @@ export function useStructuredAgentSessionOptions(args: {
     launch,
     mutate,
     providerVisible,
-    reportWriteError,
     sessionId,
     target,
     transportEnabled,
@@ -187,7 +187,7 @@ export function useStructuredAgentSessionOptions(args: {
   const settleLaunchOptionPick = useCallback(
     (outcome: StructuredLaunchOptionOutcome) => {
       if (outcome.kind === 'refused') {
-        reportWriteError(outcome.message)
+        toast.error(agentSessionWriteFailureText(outcome.failure, 'option'))
       } else if (outcome.kind === 'accepted') {
         rememberOptionPicks(
           structuredAgentSessionOptionView(
@@ -199,7 +199,7 @@ export function useStructuredAgentSessionOptions(args: {
         )
       }
     },
-    [launchSeedOptions, optionStateRef, rememberOptionPicks, reportWriteError]
+    [launchSeedOptions, optionStateRef, rememberOptionPicks]
   )
   const optionSnapshot = useMemo(() => {
     const snapshot = structuredAgentSessionOptionSnapshot(
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-admission.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-admission.test.tsx
index 0fff127cd2c2..feb9f898ce25 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-admission.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-admission.test.tsx
@@ -21,6 +21,8 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
 import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
 import { enqueueStructuredAgentSessionLaunchPrompt } from './structured-agent-session-outbox-storage'
 import { settleStructuredAgentLaunchPrompt } from '@/lib/structured-agent-session-launch-prompt'
+import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices'
+import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
 
 const LOCAL_TARGET = { kind: 'local' } as const
 
@@ -32,12 +34,19 @@ function deferred<T>() {
   return { promise, resolve }
 }
 
-type SendRequest = { body?: { blocks?: { text?: string }[] } }
+type SendRequest = {
+  body?: { blocks?: { text?: string }[] }
+  envelope?: { clientOperationId?: string }
+}
 
 function requestText(params: SendRequest | undefined): string | undefined {
   return params?.body?.blocks?.[0]?.text
 }
 
+function requestId(params: SendRequest | undefined): string {
+  return String(params?.envelope?.clientOperationId)
+}
+
 function sentTexts(): (string | undefined)[] {
   return mocks.call.mock.calls.map((call) => requestText(call[2]))
 }
@@ -219,4 +228,94 @@ describe('structured agent session outbox admission', () => {
     await act(async () => admission.resolve(submissionResult(String(id), 'pending', 10)))
     expect(sentTexts()).toEqual(['first', 'second'])
   })
+
+  // A message the queue is held on goes out only by its own Retry, never another message's.
+  it("keeps a refused message held when a rejected message's Retry shows while a head waits", async () => {
+    const inFlight = deferred<ReturnType<typeof submissionResult>>()
+    mocks.call.mockImplementation((_target, _method, params) => {
+      const text = requestText(params)
+      const attempt = sentTexts().filter((sent) => sent === text).length
+      const id = requestId(params)
+      if (text === 'held') {
+        return Promise.resolve(refusedResult('agent_session_ownership_unknown'))
+      }
+      if (attempt === 1) {
+        return Promise.resolve(refusedResult('agent_session_owner_restart_failed'))
+      }
+      return text === 'x' ? inFlight.promise : Promise.resolve(submissionResult(id, 'accepted', 20))
+    })
+    const { result } = renderOutbox()
+    for (const text of ['x', 'a', 'c']) {
+      act(() => expect(result.current.send(text)).toBe(true))
+      await waitFor(() => expect(result.current.outbox.at(-1)?.state).toBe('rejected'))
+    }
+    act(() => expect(result.current.send('held')).toBe(true))
+    await waitFor(() => expect(result.current.blockedClientMessageId).not.toBeNull())
+    const heldId = result.current.blockedClientMessageId
+    const [x, a, c] = result.current.outbox
+
+    // x goes out and stays in flight, so a, retried after it, waits queued ahead of the held one.
+    act(() => result.current.retry(x!.clientMessageId))
+    await waitFor(() => expect(sentTexts()).toEqual(['x', 'a', 'c', 'held', 'x']))
+    act(() => result.current.retry(a!.clientMessageId))
+    await settleTimers(20)
+    // The drain would send a next, so the queue reads as moving and c offers its own Retry.
+    const notices = structuredAgentSessionDeliveryNotices(
+      result.current.outbox,
+      result.current.blockedClientMessageId,
+      'Claude',
+      () => {},
+      [],
+      []
+    )
+    expect(notices.get(agentJournalSubmissionKey(c!.clientMessageId))?.onRetry).toBeDefined()
+
+    act(() => result.current.retry(c!.clientMessageId))
+    expect(result.current.blockedClientMessageId).toBe(heldId)
+    await act(async () => inFlight.resolve(submissionResult(x!.clientMessageId, 'accepted', 20)))
+    await waitFor(() => expect(result.current.outbox).toHaveLength(1))
+    await settleTimers(50)
+    expect(sentTexts().filter((text) => text === 'held')).toHaveLength(1)
+    expect(result.current.blockedClientMessageId).toBe(heldId)
+  })
+
+  it('keeps a refused message held when an unconfirmed message ahead of it is retried', async () => {
+    const none: readonly AgentJournalSubmission[] = []
+    mocks.call.mockImplementation((_target, _method, params) => {
+      const id = requestId(params)
+      if (requestText(params) === 'held') {
+        return Promise.resolve(refusedResult('agent_session_ownership_unknown'))
+      }
+      const sent = sentTexts().filter((text) => text === 'first').length
+      return Promise.resolve(submissionResult(id, sent === 1 ? 'pending' : 'accepted', 10))
+    })
+    const { result, rerender } = renderHook(
+      ({ submissions }: { submissions: readonly AgentJournalSubmission[] }) =>
+        useStructuredAgentSessionOutbox({
+          sessionId: 'session-1',
+          target: LOCAL_TARGET,
+          fence: 1,
+          submissions
+        }),
+      { initialProps: { submissions: none } }
+    )
+    act(() => expect(result.current.send('first')).toBe(true))
+    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('dispatching'))
+    act(() => expect(result.current.send('held')).toBe(true))
+    await waitFor(() => expect(result.current.blockedClientMessageId).not.toBeNull())
+    const heldId = result.current.blockedClientMessageId
+    const firstId = String(result.current.outbox[0]?.clientMessageId)
+    const unknown: AgentJournalSubmission = {
+      ...submissionResult(firstId, 'pending', 10).value.submission,
+      dispatchState: 'unknown'
+    }
+    rerender({ submissions: [unknown] })
+    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('unconfirmed'))
+
+    act(() => result.current.retry(firstId))
+    await waitFor(() => expect(result.current.outbox).toHaveLength(1))
+    await settleTimers(50)
+    expect(sentTexts()).toEqual(['first', 'held', 'first'])
+    expect(result.current.blockedClientMessageId).toBe(heldId)
+  })
 })
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-fence.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-fence.test.tsx
new file mode 100644
index 000000000000..61b5ea95e727
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-fence.test.tsx
@@ -0,0 +1,139 @@
+// @vitest-environment happy-dom
+
+// A moved fence is not a reason to send anything again on a host that records every send before it
+// starts an agent. There, only a Retry or a new send goes out. An older host, which restarts the
+// agent inside the send and refuses it unrecorded when that fails, keeps the resend on a new fence.
+
+import { act, renderHook, waitFor } from '@testing-library/react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
+
+const mocks = vi.hoisted(() => ({ call: vi.fn() }))
+
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: mocks.call
+}))
+
+import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
+import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
+
+const LOCAL_TARGET = { kind: 'local' } as const
+
+function deferred<T>() {
+  let resolve!: (value: T) => void
+  const promise = new Promise<T>((next) => {
+    resolve = next
+  })
+  return { promise, resolve }
+}
+
+function pendingResult(clientMessageId: string) {
+  return {
+    ok: true,
+    replayed: false,
+    fence: 1,
+    cursor: { epoch: 'epoch-1', sequence: 1 },
+    value: {
+      clientMessageId,
+      submission: {
+        clientMessageId,
+        fence: 1,
+        payloadFingerprint: 'fingerprint',
+        dispatchState: 'pending' as const,
+        handoverRecorded: true,
+        providerItemId: null,
+        reason: null,
+        submittedAt: 1,
+        resolvedAt: null
+      }
+    }
+  }
+}
+
+function sentId(call: number): string {
+  const id: unknown = mocks.call.mock.calls[call]?.[2].envelope.clientOperationId
+  return String(id)
+}
+
+function render() {
+  return renderHook(
+    ({ fence }) =>
+      useStructuredAgentSessionOutbox({
+        sessionId: 'session-1',
+        target: LOCAL_TARGET,
+        fence,
+        submissions: []
+      }),
+    { initialProps: { fence: 1 } }
+  )
+}
+
+/** Long enough for any effect a fence change schedules to have sent. */
+async function settle(): Promise<void> {
+  await act(() => new Promise<void>((resolve) => setTimeout(resolve, 50)))
+}
+
+describe('an outbox on a host that accepts a send before any agent has it', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    localStorage.clear()
+    setLocalRuntimeCapabilitiesForTests([AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY])
+  })
+
+  it('neither resends nor drops the answer of a send in flight when the fence moves', async () => {
+    const answer = deferred<ReturnType<typeof pendingResult>>()
+    mocks.call.mockReturnValueOnce(answer.promise)
+    const { result, rerender } = render()
+
+    act(() => expect(result.current.send('hello')).toBe(true))
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
+    // A start or restart on the host moves the fence while the send is out.
+    rerender({ fence: 2 })
+    rerender({ fence: 3 })
+    await settle()
+    expect(mocks.call).toHaveBeenCalledTimes(1)
+
+    await act(async () => answer.resolve(pendingResult(sentId(0))))
+    // The answer lands: the entry is the host's now, not re-queued behind a moved fence.
+    expect(result.current.outbox).toMatchObject([{ state: 'dispatching' }])
+    await settle()
+    expect(mocks.call).toHaveBeenCalledTimes(1)
+  })
+
+  it('keeps a blocked head blocked across a fence change; only Retry sends it', async () => {
+    mocks.call.mockRejectedValueOnce(new Error('send failed')).mockResolvedValue({ ok: true })
+    const { result, rerender } = render()
+
+    act(() => expect(result.current.send('hello')).toBe(true))
+    await waitFor(() => expect(result.current.blockedClientMessageId).not.toBeNull())
+    rerender({ fence: 2 })
+    await settle()
+    expect(mocks.call).toHaveBeenCalledTimes(1)
+    // The failure stays on the message; the fence change neither clears nor resends it.
+    expect(result.current.outbox[0]?.lastFailure).toEqual({ kind: 'failed' })
+
+    act(() => result.current.retry(result.current.outbox[0]!.clientMessageId))
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
+  })
+})
+
+describe('an outbox on an older host', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    localStorage.clear()
+    setLocalRuntimeCapabilitiesForTests([])
+  })
+
+  it('still resends a send in flight when the fence moves, as the new owner may take it', async () => {
+    mocks.call.mockReturnValueOnce(new Promise(() => {})).mockReturnValue(new Promise(() => {}))
+    const { result, rerender } = render()
+
+    act(() => expect(result.current.send('hello')).toBe(true))
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
+    rerender({ fence: 2 })
+
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
+    expect(sentId(1)).toBe(sentId(0))
+  })
+})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-rejection-cause.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-rejection-cause.test.tsx
index d66f579ed0d8..3ce99e6fd4b4 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-rejection-cause.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-rejection-cause.test.tsx
@@ -1,7 +1,9 @@
 // @vitest-environment happy-dom
 
 import { act, renderHook, waitFor } from '@testing-library/react'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
+import { DISPATCH_REJECTED_CANCELLED } from '../../../../shared/structured-agent-session-dispatch-rejection'
 
 const mocks = vi.hoisted(() => ({
   call: vi.fn()
@@ -11,12 +13,49 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
   callStructuredAgentSession: mocks.call
 }))
 
+import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
 import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
+import { agentSessionWriteNoticeEnglish } from '../../../../shared/agent-session-refusal-notice'
+import { structuredAgentSessionAttemptFailureParts } from '../../../../shared/structured-agent-session-send-disposition'
+import {
+  createStructuredAgentSessionOutboxEntry,
+  type StructuredAgentSessionOutboxEntry
+} from '../../../../shared/structured-agent-session-outbox'
+import { writeOutbox } from './structured-agent-session-outbox-storage'
+
+function shownFailure(entry: StructuredAgentSessionOutboxEntry | undefined): string | undefined {
+  return (
+    entry?.lastFailure &&
+    agentSessionWriteNoticeEnglish(structuredAgentSessionAttemptFailureParts(entry.lastFailure))
+  )
+}
 
 // What the host answers when the child it restarted for this send died before starting.
 const REASON =
   'The provider stopped before it finished starting: claude stream-json exited (code 1): claude: not signed in.'
 
+function acceptedResultFor(clientMessageId: string) {
+  return {
+    ok: true,
+    replayed: false,
+    fence: 1,
+    cursor: { epoch: 'epoch-1', sequence: 2 },
+    value: {
+      clientMessageId,
+      submission: {
+        clientMessageId,
+        fence: 1,
+        payloadFingerprint: 'fingerprint',
+        dispatchState: 'accepted',
+        providerItemId: `provider-${clientMessageId}`,
+        reason: null,
+        submittedAt: 1,
+        resolvedAt: 1
+      }
+    }
+  }
+}
+
 function rejectedResultFor(clientMessageId: string) {
   return {
     ok: true,
@@ -45,7 +84,7 @@ describe('a send the host rejected because the agent never started', () => {
     localStorage.clear()
   })
 
-  it('names the cause under the composer and keeps the message for Retry', async () => {
+  it('names the cause on the message and keeps it for Retry', async () => {
     mocks.call.mockImplementationOnce(
       async (
         _target: unknown,
@@ -64,8 +103,350 @@ describe('a send the host rejected because the agent never started', () => {
 
     act(() => expect(result.current.send('hello')).toBe(true))
 
-    await waitFor(() => expect(result.current.error).toBe(REASON))
-    expect(result.current.outbox[0]?.state).toBe('queued')
-    expect(result.current.blockedClientMessageId).toBe(result.current.outbox[0]?.clientMessageId)
+    await waitFor(() => expect(shownFailure(result.current.outbox[0])).toBe(REASON))
+    // Settled as not delivered: it waits for Retry and holds no later message up.
+    expect(result.current.error).toBeNull()
+    expect(result.current.outbox[0]?.state).toBe('rejected')
+    expect(result.current.blockedClientMessageId).toBeNull()
+  })
+
+  it('sends a new message past one the host could not start the agent for, without resending it', async () => {
+    const message = "Claude couldn't restart: Not logged in. Please run /login."
+    mocks.call.mockImplementation(async (_target, _method, params) => {
+      const request = params as {
+        envelope: { clientOperationId: string }
+        body: { blocks: { text?: string }[] }
+      }
+      return request.body.blocks[0]?.text === 'first'
+        ? { ok: false, refusal: { code: 'agent_session_owner_restart_failed', message } }
+        : acceptedResultFor(request.envelope.clientOperationId)
+    })
+    const { result } = renderHook(() =>
+      useStructuredAgentSessionOutbox({
+        sessionId: 'session-1',
+        target: { kind: 'local' },
+        fence: 1,
+        submissions: []
+      })
+    )
+
+    act(() => expect(result.current.send('first')).toBe(true))
+    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('rejected'))
+    const rejectedId = result.current.outbox[0]!.clientMessageId
+
+    // The user's next message is the retry of the start: it goes out on its own.
+    act(() => expect(result.current.send('second')).toBe(true))
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
+    await act(() => new Promise((resolve) => setTimeout(resolve, 50)))
+
+    const sent = mocks.call.mock.calls.map(
+      (call) => (call[2] as { body?: { blocks?: { text?: string }[] } })?.body?.blocks?.[0]?.text
+    )
+    expect(sent).toEqual(['first', 'second'])
+    expect(result.current.outbox.map((entry) => [entry.clientMessageId, entry.state])).toEqual([
+      [rejectedId, 'rejected']
+    ])
+  })
+
+  it('keeps a message the host accepted and then could not deliver, with its reason and Retry', async () => {
+    const reason = "Codex couldn't restart: spawn codex ENOENT."
+    mocks.call.mockImplementation(
+      async (
+        _target: unknown,
+        _method: unknown,
+        params: { envelope: { clientOperationId: string } }
+      ) => pendingResultFor(params.envelope.clientOperationId)
+    )
+    const target = { kind: 'local' } as const
+    const { result, rerender } = renderHook(
+      (props: { submissions: AgentJournalSubmission[] }) =>
+        useStructuredAgentSessionOutbox({
+          sessionId: 'session-1',
+          target,
+          fence: 1,
+          submissions: props.submissions
+        }),
+      { initialProps: { submissions: NO_SUBMISSIONS } }
+    )
+
+    act(() => expect(result.current.send('hello')).toBe(true))
+    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('dispatching'))
+    const id = result.current.outbox[0]!.clientMessageId
+
+    rerender({
+      submissions: [{ ...pendingResultFor(id).value.submission, dispatchState: 'rejected', reason }]
+    })
+
+    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('rejected'))
+    expect(shownFailure(result.current.outbox[0])).toBe(reason)
+    expect(result.current.error).toBeNull()
+    expect(result.current.blockedClientMessageId).toBeNull()
+
+    // Retry is a new message with the same text: a fresh id, sent once.
+    act(() => result.current.retry(id))
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
+    const retried: {
+      envelope: { clientOperationId: string }
+      body: { blocks: { text?: string }[] }
+    } = mocks.call.mock.calls[1]![2]
+    expect(retried.envelope.clientOperationId).not.toBe(id)
+    expect(retried.body.blocks[0]?.text).toBe('hello')
+  })
+
+  it('says nothing when a Stop withdrew the message', async () => {
+    mocks.call.mockImplementation(
+      async (
+        _target: unknown,
+        _method: unknown,
+        params: { envelope: { clientOperationId: string } }
+      ) => pendingResultFor(params.envelope.clientOperationId)
+    )
+    const target = { kind: 'local' } as const
+    const { result, rerender } = renderHook(
+      (props: { submissions: AgentJournalSubmission[] }) =>
+        useStructuredAgentSessionOutbox({
+          sessionId: 'session-1',
+          target,
+          fence: 1,
+          submissions: props.submissions
+        }),
+      { initialProps: { submissions: NO_SUBMISSIONS } }
+    )
+
+    act(() => expect(result.current.send('hello')).toBe(true))
+    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('dispatching'))
+    const id = result.current.outbox[0]!.clientMessageId
+
+    rerender({
+      submissions: [
+        {
+          ...pendingResultFor(id).value.submission,
+          dispatchState: 'rejected',
+          reason: DISPATCH_REJECTED_CANCELLED
+        }
+      ]
+    })
+
+    await waitFor(() => expect(result.current.outbox).toEqual([]))
+    expect(result.current.error).toBeNull()
+  })
+
+  it('reads a message rejected while the chat was closed as not sent, and sends past it', async () => {
+    const reason = "Codex couldn't restart: spawn codex ENOENT."
+    mocks.call.mockImplementation(
+      async (
+        _target: unknown,
+        _method: unknown,
+        params: { envelope: { clientOperationId: string } }
+      ) => pendingResultFor(params.envelope.clientOperationId)
+    )
+    const target = { kind: 'local' } as const
+    const first = renderHook(() =>
+      useStructuredAgentSessionOutbox({
+        sessionId: 'session-1',
+        target,
+        fence: 1,
+        submissions: NO_SUBMISSIONS
+      })
+    )
+    act(() => expect(first.result.current.send('hello')).toBe(true))
+    await waitFor(() => expect(first.result.current.outbox[0]?.state).toBe('dispatching'))
+    const id = first.result.current.outbox[0]!.clientMessageId
+    first.unmount()
+
+    // Reopened after the start failed, or after a quit settled the message as not sent.
+    const rejected = [
+      { ...pendingResultFor(id).value.submission, dispatchState: 'rejected' as const, reason }
+    ]
+    const { result } = renderHook(() =>
+      useStructuredAgentSessionOutbox({
+        sessionId: 'session-1',
+        target,
+        fence: 1,
+        submissions: rejected
+      })
+    )
+
+    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('rejected'))
+    expect(shownFailure(result.current.outbox[0])).toBe(reason)
+    act(() => expect(result.current.send('second')).toBe(true))
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
+  })
+
+  // After a restart nothing in memory remembers the rejection, and its journal row may be older
+  // than the loaded page: the message's own state is what says a resend needs a new id.
+  it('retries a message rejected before a restart under a new id', async () => {
+    const rejected = createStructuredAgentSessionOutboxEntry({
+      clientMessageId: 'rejected-before-restart',
+      sessionId: 'session-1',
+      text: 'first',
+      attachments: [],
+      queuedAt: 1
+    })
+    writeOutbox('session-1', [
+      {
+        ...rejected,
+        state: 'rejected',
+        lastFailure: {
+          kind: 'rejected',
+          reason: 'The provider did not accept this message.',
+          rejection: { kind: 'providerRejected' }
+        }
+      }
+    ])
+    mocks.call.mockImplementation(async (_target, _method, params) =>
+      acceptedResultFor(String(params.envelope.clientOperationId))
+    )
+    const { result } = renderHook(() =>
+      useStructuredAgentSessionOutbox({
+        sessionId: 'session-1',
+        target: { kind: 'local' },
+        fence: 1,
+        submissions: []
+      })
+    )
+    expect(result.current.outbox[0]?.state).toBe('rejected')
+
+    act(() => result.current.retry('rejected-before-restart'))
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
+    const sentId: unknown = mocks.call.mock.calls[0]![2].envelope.clientOperationId
+    expect(sentId).not.toBe('rejected-before-restart')
+    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
+  })
+
+  it('keeps the rejection when the journal settles the message before the send answers', async () => {
+    const reason = "Codex couldn't restart: spawn codex ENOENT."
+    let answer: (value: unknown) => void = () => undefined
+    mocks.call.mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          answer = resolve
+        })
+    )
+    const target = { kind: 'local' } as const
+    const { result, rerender } = renderHook(
+      (props: { submissions: AgentJournalSubmission[] }) =>
+        useStructuredAgentSessionOutbox({
+          sessionId: 'session-1',
+          target,
+          fence: 1,
+          submissions: props.submissions
+        }),
+      { initialProps: { submissions: NO_SUBMISSIONS } }
+    )
+
+    act(() => expect(result.current.send('hello')).toBe(true))
+    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('dispatching'))
+    const id = result.current.outbox[0]!.clientMessageId
+
+    // A start refused at once: the rejection frame lands before the send's own `pending` answer.
+    rerender({
+      submissions: [{ ...pendingResultFor(id).value.submission, dispatchState: 'rejected', reason }]
+    })
+    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('rejected'))
+    await act(async () => answer(pendingResultFor(id)))
+
+    expect(result.current.outbox[0]?.state).toBe('rejected')
+    expect(shownFailure(result.current.outbox[0])).toBe(reason)
+    expect(result.current.error).toBeNull()
+  })
+})
+
+const NO_SUBMISSIONS: AgentJournalSubmission[] = []
+
+function pendingResultFor(clientMessageId: string) {
+  const submission: AgentJournalSubmission = {
+    clientMessageId,
+    fence: 1,
+    payloadFingerprint: 'fingerprint',
+    dispatchState: 'pending',
+    providerItemId: null,
+    reason: null,
+    submittedAt: 1,
+    resolvedAt: null,
+    handoverRecorded: true
+  }
+  return {
+    ok: true,
+    replayed: false,
+    fence: 1,
+    cursor: { epoch: 'epoch-1', sequence: 2 },
+    value: {
+      clientMessageId,
+      submission
+    }
+  }
+}
+
+// Stable across renders, as a mounted pane's target is.
+const LOCAL_TARGET = { kind: 'local' } as const
+
+function submission(
+  clientMessageId: string,
+  dispatchState: 'pending' | 'accepted'
+): AgentJournalSubmission {
+  return {
+    clientMessageId,
+    fence: 3,
+    payloadFingerprint: 'fingerprint',
+    dispatchState,
+    providerItemId: null,
+    reason: null,
+    submittedAt: 10,
+    resolvedAt: dispatchState === 'accepted' ? 11 : null
+  }
+}
+
+// An older host: it restarts the agent inside the send, so a new fence is its word to send again.
+describe('a send refused while its agent restarted', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    localStorage.clear()
+    setLocalRuntimeCapabilitiesForTests([])
+  })
+
+  afterEach(() => {
+    setLocalRuntimeCapabilitiesForTests(null)
+  })
+
+  // The live order: the restart takes seconds, so the journal settles the resend before its reply.
+  it('leaves no error behind once a send refused before an agent restart is delivered', async () => {
+    mocks.call
+      .mockResolvedValueOnce({
+        ok: false,
+        refusal: {
+          code: 'agent_session_checkpoint_stale',
+          message: 'Expected runtime fence 1; the session is at 3.'
+        }
+      })
+      .mockReturnValueOnce(new Promise(() => {}))
+    const { result, rerender } = renderHook(
+      ({ fence, submissions }: { fence: number; submissions: AgentJournalSubmission[] }) =>
+        useStructuredAgentSessionOutbox({
+          sessionId: 'session-1',
+          target: LOCAL_TARGET,
+          fence,
+          submissions
+        }),
+      { initialProps: { fence: 1, submissions: NO_SUBMISSIONS } }
+    )
+
+    act(() => expect(result.current.send('hello')).toBe(true))
+    await waitFor(() =>
+      expect(shownFailure(result.current.outbox[0])).toBe('Your message was not sent.')
+    )
+
+    // The pane learns the new owner and sends the same message again.
+    rerender({ fence: 3, submissions: [] })
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
+    expect(result.current.outbox[0]).toMatchObject({ state: 'dispatching' })
+    expect(shownFailure(result.current.outbox[0])).toBeUndefined()
+
+    const id = result.current.outbox[0]!.clientMessageId
+    rerender({ fence: 3, submissions: [submission(id, 'pending')] })
+    rerender({ fence: 3, submissions: [submission(id, 'accepted')] })
+    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
+    expect(result.current.error).toBeNull()
+    expect(result.current.blockedClientMessageId).toBeNull()
   })
 })
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-unconfirmed-probe.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-unconfirmed-probe.ts
new file mode 100644
index 000000000000..e4e49c119755
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-unconfirmed-probe.ts
@@ -0,0 +1,77 @@
+import { useEffect, useLayoutEffect, useRef, type Dispatch, type SetStateAction } from 'react'
+import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
+import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
+import { writeOutbox } from './structured-agent-session-outbox-storage'
+
+const UNCONFIRMED_PROBE_BASE_DELAY_MS = 1_000
+/** No attempt ceiling: a transport outage outlives any fixed budget, and giving up
+ *  restores the wedge this fixes. Growth caps the rate at one status query per 16s.
+ *  A refusal that blocks the head still ends probing until a manual Retry (or, on an older
+ *  host, a fence change), because the entry leaves `unconfirmed`. */
+const UNCONFIRMED_PROBE_MAX_DELAY_MS = 16_000
+
+/** Re-queues the entry holding the outbox in `unconfirmed`, with backoff, until the journal answers it. */
+export function useStructuredAgentSessionOutboxUnconfirmedProbe(args: {
+  sessionId: string
+  outbox: readonly StructuredAgentSessionOutboxEntry[]
+  submissions: readonly AgentJournalSubmission[]
+  owner: { attached: boolean; ownerChange: number | null; targetKey: string }
+  outboxRef: { current: StructuredAgentSessionOutboxEntry[] }
+  setOutbox: Dispatch<SetStateAction<StructuredAgentSessionOutboxEntry[]>>
+}): void {
+  const { outbox, outboxRef, owner, sessionId, setOutbox, submissions } = args
+  const probeAttemptsRef = useRef({ id: null as string | null, attempts: 0 })
+  useLayoutEffect(() => {
+    probeAttemptsRef.current = { id: null, attempts: 0 }
+  }, [owner.ownerChange, owner.targetKey, sessionId])
+
+  // A transport-side unknown may never have reached the host, and nothing else
+  // moves it out of `unconfirmed`, so one wedges the whole FIFO queue. Re-issuing
+  // the same envelope without `retryUnknown` is idempotent: the operation ledger
+  // replays a recorded outcome, or the host performs a genuine first delivery.
+  // A host-confirmed unknown stays parked until the user explicitly asks Retry
+  // to replay the same operation.
+  // The first `unconfirmed` entry is the one holding the queue, at whatever index it sits: an
+  // unconfirmed tail behind an admitted head would otherwise wedge until the head cleared,
+  // which is the wedge this probe exists to prevent.
+  const blocker = outbox.find((entry) => entry.state === 'unconfirmed')
+  // Depend on primitives: `submissions` is rebuilt on every streaming batch, so an
+  // array-identity dep would reset the backoff forever while the agent is working.
+  // A non-null `retryAfterUnknownSubmittedAt` means the user already retried, so
+  // another request would repeat that explicit action. Only entries that have
+  // never been retried are safe to probe automatically.
+  const probeId =
+    blocker && blocker.sessionId === sessionId && blocker.retryAfterUnknownSubmittedAt === null
+      ? blocker.clientMessageId
+      : null
+  const probeSettled =
+    probeId !== null && submissions.some((submission) => submission.clientMessageId === probeId)
+  useEffect(() => {
+    if (probeId === null || probeSettled || !owner.attached) {
+      return
+    }
+    const attempts = probeAttemptsRef.current.id === probeId ? probeAttemptsRef.current.attempts : 0
+    const timer = setTimeout(
+      () => {
+        probeAttemptsRef.current = { id: probeId, attempts: attempts + 1 }
+        const next = outboxRef.current.map((entry) =>
+          entry.clientMessageId === probeId ? { ...entry, state: 'queued' as const } : entry
+        )
+        outboxRef.current = next
+        setOutbox(next)
+        writeOutbox(sessionId, next)
+      },
+      Math.min(UNCONFIRMED_PROBE_BASE_DELAY_MS * 2 ** attempts, UNCONFIRMED_PROBE_MAX_DELAY_MS)
+    )
+    return () => clearTimeout(timer)
+  }, [
+    outboxRef,
+    owner.attached,
+    owner.ownerChange,
+    owner.targetKey,
+    probeId,
+    probeSettled,
+    sessionId,
+    setOutbox
+  ])
+}
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-withdrawal.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-withdrawal.test.tsx
new file mode 100644
index 000000000000..f188c01919fa
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-withdrawal.test.tsx
@@ -0,0 +1,168 @@
+// What a Stop does to the messages this client sent that the host does not hold yet: nothing may go
+// out after the Stop, and nothing the host already holds or already refused changes here.
+
+// @vitest-environment happy-dom
+
+import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
+import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
+import {
+  hasUnsentStructuredAgentSessionOutboxEntry,
+  withdrawUnsentStructuredAgentSessionOutboxEntries
+} from '../../../../shared/structured-agent-session-outbox-stop-withdrawal'
+
+type SendRequest = { body?: { blocks?: { text?: string }[] } }
+
+const mocks = vi.hoisted(() => ({
+  call: vi.fn<(target: unknown, method: string, params: SendRequest) => Promise<unknown>>()
+}))
+
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: mocks.call
+}))
+
+import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
+import { readOutbox } from './structured-agent-session-outbox-storage'
+
+// One object: a target rebuilt each render reads as a new owner, which re-sends what is on its way.
+const TARGET = { kind: 'local' } as const
+
+function sentTexts(): (string | undefined)[] {
+  return mocks.call.mock.calls.map((call) => call[2].body?.blocks?.[0]?.text)
+}
+
+function pending(clientMessageId: string): AgentJournalSubmission {
+  return {
+    clientMessageId,
+    fence: 1,
+    payloadFingerprint: 'fingerprint',
+    dispatchState: 'pending',
+    providerItemId: null,
+    reason: null,
+    submittedAt: 10,
+    resolvedAt: null,
+    handoverRecorded: true
+  }
+}
+
+function entry(
+  clientMessageId: string,
+  state: StructuredAgentSessionOutboxEntry['state']
+): StructuredAgentSessionOutboxEntry {
+  return {
+    clientMessageId,
+    sessionId: 'session-1',
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: clientMessageId }] },
+    previewUris: [],
+    state,
+    queuedAt: 1,
+    lastAttemptAt: null,
+    retryAfterUnknownSubmittedAt: null
+  }
+}
+
+afterEach(cleanup)
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  localStorage.clear()
+  let uuid = 0
+  vi.spyOn(globalThis.crypto, 'randomUUID').mockImplementation(() => {
+    uuid += 1
+    return `11111111-1111-4111-8111-${uuid.toString(16).padStart(12, '0')}`
+  })
+})
+
+describe('a Stop withdrawing what the host does not hold', () => {
+  it('leaves the send on its way to the host and keeps every message behind it from going out', async () => {
+    const reply = Promise.withResolvers<unknown>()
+    mocks.call.mockImplementation((_target, _method, params) =>
+      params.body?.blocks?.[0]?.text === 'first' ? reply.promise : new Promise<never>(() => {})
+    )
+    const { result } = renderHook(() =>
+      useStructuredAgentSessionOutbox({
+        sessionId: 'session-1',
+        target: TARGET,
+        fence: 1,
+        submissions: []
+      })
+    )
+    act(() => expect(result.current.send('first')).toBe(true))
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
+    act(() => expect(result.current.send('second')).toBe(true))
+    const firstId = result.current.outbox[0]!.clientMessageId
+
+    act(() => result.current.withdrawUnsent())
+    await act(async () =>
+      reply.resolve({
+        ok: true,
+        replayed: false,
+        fence: 1,
+        cursor: { epoch: 'epoch-1', sequence: 10 },
+        value: { clientMessageId: firstId, submission: pending(firstId) }
+      })
+    )
+    await act(async () => new Promise((resolve) => setTimeout(resolve, 50)))
+
+    // The host's answer to it, not this Stop, decides whether it comes back.
+    expect(result.current.outbox.map((candidate) => candidate.clientMessageId)).toEqual([firstId])
+    expect(readOutbox('session-1').map((candidate) => candidate.clientMessageId)).toEqual([firstId])
+    expect(sentTexts()).toEqual(['first'])
+  })
+
+  it('leaves what the journal holds to the host, and a refused message to its Retry', () => {
+    const entries = [
+      entry('held', 'dispatching'),
+      entry('refused', 'rejected'),
+      entry('in-doubt', 'unconfirmed'),
+      entry('local', 'queued')
+    ]
+
+    expect(
+      withdrawUnsentStructuredAgentSessionOutboxEntries(entries, [pending('held')], null, null).map(
+        (candidate) => candidate.clientMessageId
+      )
+    ).toEqual(['held', 'refused'])
+  })
+
+  it('leaves every message that waits on its Retry, not only a refused one', () => {
+    const entries = [
+      entry('blocked', 'queued'),
+      { ...entry('retried-in-doubt', 'unconfirmed'), retryAfterUnknownSubmittedAt: 10 },
+      entry('probed-in-doubt', 'unconfirmed'),
+      entry('local', 'queued')
+    ]
+
+    expect(
+      withdrawUnsentStructuredAgentSessionOutboxEntries(entries, [], 'blocked', null).map(
+        (candidate) => candidate.clientMessageId
+      )
+    ).toEqual(['blocked', 'retried-in-doubt'])
+    expect(hasUnsentStructuredAgentSessionOutboxEntry(entries.slice(0, 2), [], 'blocked')).toBe(
+      false
+    )
+    expect(hasUnsentStructuredAgentSessionOutboxEntry(entries, [], 'blocked')).toBe(true)
+  })
+
+  it('keeps a message whose send failed for its Retry', async () => {
+    mocks.call.mockRejectedValue(new Error('the host refused the frame'))
+    const { result } = renderHook(() =>
+      useStructuredAgentSessionOutbox({
+        sessionId: 'session-1',
+        target: TARGET,
+        fence: 1,
+        submissions: []
+      })
+    )
+    act(() => expect(result.current.send('first')).toBe(true))
+    await waitFor(() => expect(result.current.blockedClientMessageId).not.toBeNull())
+
+    act(() => result.current.withdrawUnsent())
+
+    expect(result.current.outbox.map((candidate) => candidate.body.blocks)).toEqual([
+      [{ type: 'text', text: 'first' }]
+    ])
+    expect(readOutbox('session-1')).toHaveLength(1)
+  })
+})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.test.tsx
index 662ed752582b..04b25f93e8ad 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.test.tsx
@@ -248,7 +248,7 @@ describe('useStructuredAgentSessionOutbox', () => {
       )
 
       act(() => expect(result.current.send('hello')).toBe(true))
-      await waitFor(() => expect(result.current.outbox[0]?.state).toBe('queued'))
+      await waitFor(() => expect(result.current.outbox[0]?.state).toBe('rejected'))
       const firstId = (mocks.call.mock.calls[0]![2] as { envelope: { clientOperationId: string } })
         .envelope.clientOperationId
       const retryId = result.current.outbox[0]!.clientMessageId
@@ -323,7 +323,8 @@ describe('useStructuredAgentSessionOutbox', () => {
     await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
     const id = result.current.outbox[0]!.clientMessageId
     await waitFor(() => expect(result.current.outbox[0]?.state).toBe('unconfirmed'))
-    expect(result.current.error).toBe('Message delivery is unconfirmed')
+    // The Retry row already says delivery is unconfirmed; nothing repeats it.
+    expect([result.current.error, result.current.outbox[0]?.lastFailure]).toEqual([null, undefined])
 
     rerender({
       submissions: [
@@ -530,7 +531,7 @@ describe('useStructuredAgentSessionOutbox', () => {
     ).toBe(firstId)
   })
 
-  it('stops on a host that could not restart the agent and shows its message', async () => {
+  it('stops on a host that could not restart the agent and keeps its refusal on the message', async () => {
     const message = "Claude couldn't restart: Not logged in. Please run /login."
     mocks.call.mockResolvedValue({
       ok: false,
@@ -546,12 +547,20 @@ describe('useStructuredAgentSessionOutbox', () => {
     )
 
     act(() => expect(result.current.send('hello')).toBe(true))
-    await waitFor(() => expect(result.current.error).toBe(message))
+    await waitFor(() =>
+      expect(result.current.outbox[0]?.lastFailure).toEqual({
+        kind: 'refused',
+        code: 'agent_session_owner_restart_failed'
+      })
+    )
+    expect(result.current.error).toBeNull()
     await act(() => new Promise((resolve) => setTimeout(resolve, 50)))
 
     expect(mocks.call).toHaveBeenCalledOnce()
     expect(result.current.outbox).toHaveLength(1)
-    expect(result.current.blockedClientMessageId).toBe(result.current.outbox[0]?.clientMessageId)
+    // Never sent, and never re-sent on its own: it waits for Retry and holds nothing up.
+    expect(result.current.outbox[0]?.state).toBe('rejected')
+    expect(result.current.blockedClientMessageId).toBeNull()
     // Settled, not pending: the refused id never ran, so a Retry is a new operation.
     const sentId: unknown = mocks.call.mock.calls[0]![2].envelope.clientOperationId
     const retryId = result.current.outbox[0]!.clientMessageId
@@ -765,16 +774,11 @@ describe('useStructuredAgentSessionOutbox', () => {
     await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
     const firstId = mocks.call.mock.calls[0]![2].envelope.clientOperationId as string
 
-    // A refused write is answered, not doubted: the entry parks with human copy
-    // rather than under the "delivery is unconfirmed" banner. The durable reason
-    // stays `provider_write_failed: …`; it must not reach the screen.
-    await waitFor(() =>
-      expect(result.current.error).toBe(
-        "Couldn't reach the agent. Your message was not sent — Retry to send it again."
-      )
-    )
-    expect(result.current.outbox[0]?.state).toBe('queued')
-    expect(result.current.blockedClientMessageId).toBe(firstId)
+    // A refused write is answered, not doubted: the entry parks with its rejection rather than
+    // under the "delivery is unconfirmed" banner. The disposition tests pin its words.
+    await waitFor(() => expect(result.current.outbox[0]?.lastFailure?.kind).toBe('rejected'))
+    expect(result.current.outbox[0]?.state).toBe('rejected')
+    expect(result.current.blockedClientMessageId).toBeNull()
 
     // Retry immediately, before the journal subscription can publish the rejected row.
     act(() => result.current.retry(firstId))
@@ -842,7 +846,9 @@ describe('useStructuredAgentSessionOutbox', () => {
     )
 
     act(() => expect(result.current.send('hello')).toBe(true))
-    await waitFor(() => expect(result.current.error).toBe('agent_session_checkpoint_stale'))
+    const refused = { kind: 'refused', code: 'agent_session_checkpoint_stale' }
+    await waitFor(() => expect(result.current.outbox[0]?.lastFailure).toEqual(refused))
+    expect(result.current.error).toBeNull()
 
     rerender({ sessionId: 'session-2' })
     expect(result.current.error).toBeNull()
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.ts
index 17a9e2769f3f..117f22dd9a66 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.ts
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.ts
@@ -7,36 +7,40 @@ import {
   reconcileStructuredAgentSessionOutbox,
   type StructuredAgentSessionOutboxEntry
 } from '../../../../shared/structured-agent-session-outbox'
-import type { StructuredAgentSessionSendDisposition } from '../../../../shared/structured-agent-session-send-disposition'
+import { withdrawUnsentStructuredAgentSessionOutboxEntries } from '../../../../shared/structured-agent-session-outbox-stop-withdrawal'
+import {
+  journalAnswersInFlightSend,
+  type StructuredAgentSessionSendDisposition
+} from '../../../../shared/structured-agent-session-send-disposition'
 import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
 import { readOutbox, writeOutbox } from './structured-agent-session-outbox-storage'
 import {
   dispatchStructuredAgentSessionOutboxEntry,
-  hasInFlightLaunchDispatch,
-  readMountedStructuredAgentSessionOutbox
+  readMountedStructuredAgentSessionOutbox,
+  requeueInterruptedStructuredAgentSessionDispatches
 } from './structured-agent-session-outbox-dispatch'
 import { getStructuredAgentLaunchPromptDispatch } from '@/lib/structured-agent-session-launch-prompt'
+import { useStructuredAgentSessionOutboxOwnerChange } from '@/runtime/structured-agent-session-accepted-send-capability'
+import { useStructuredAgentSessionOutboxUnconfirmedProbe } from './use-structured-agent-session-outbox-unconfirmed-probe'
 import { createBrowserUuid } from '@/lib/browser-uuid'
+import { useStructuredAgentSessionWithdrawnRestore } from './structured-agent-session-withdrawn-message-restore'
 
 export function structuredSessionOperationId(): string {
   return createStructuredAgentSessionOperationId(createBrowserUuid)
 }
 
-const UNCONFIRMED_PROBE_BASE_DELAY_MS = 1_000
-/** No attempt ceiling: a transport outage outlives any fixed budget, and giving up
- *  restores the wedge this fixes. Growth caps the rate at one status query per 16s.
- *  A refusal that blocks the head still ends probing until a fence change or a manual
- *  Retry, because the entry leaves `unconfirmed` -- pre-existing, not closed here. */
-const UNCONFIRMED_PROBE_MAX_DELAY_MS = 16_000
-
 export function useStructuredAgentSessionOutbox(args: {
   sessionId: string
   target: RuntimeClientTarget
   fence: number | null
   submissions: readonly AgentJournalSubmission[]
+  /** The composer that gets back what a Stop withdrew from this client's outbox. */
+  composerScopeKey?: string
 }) {
-  const { fence, sessionId, submissions, target } = args
-  const targetKey = target.kind === 'local' ? 'local' : `environment:${target.environmentId}`
+  const { composerScopeKey, fence, sessionId, submissions, target } = args
+  // What resends, unblocks and drops a send in flight besides a Retry or a new send; see the hook.
+  const owner = useStructuredAgentSessionOutboxOwnerChange(target, fence)
+  const restoreWithdrawn = useStructuredAgentSessionWithdrawnRestore(sessionId, composerScopeKey)
   const [outbox, setOutbox] = useState<StructuredAgentSessionOutboxEntry[]>(() =>
     readMountedStructuredAgentSessionOutbox(sessionId, fence, readOutbox)
   )
@@ -47,8 +51,6 @@ export function useStructuredAgentSessionOutbox(args: {
   const inFlightIdRef = useRef<string | null>(null)
   const dispatchGenerationRef = useRef(0)
   const blockedIdRef = useRef<string | null>(null)
-  const retryWithFreshClientMessageIdRef = useRef<string | null>(null)
-  const probeAttemptsRef = useRef({ id: null as string | null, attempts: 0 })
   const [error, setError] = useState<string | null>(null)
   const [errorSession, setErrorSession] = useState(sessionId)
   // Render-time reset (react.dev: adjusting state when a prop changes), so the
@@ -66,21 +68,15 @@ export function useStructuredAgentSessionOutbox(args: {
     dispatchGenerationRef.current += 1
     inFlightIdRef.current = null
     blockedIdRef.current = null
-    retryWithFreshClientMessageIdRef.current = null
-    probeAttemptsRef.current = { id: null, attempts: 0 }
-  }, [fence, sessionId, targetKey])
+  }, [owner.ownerChange, owner.targetKey, sessionId])
 
   useEffect(() => {
     const sessionChanged = outboxSessionRef.current !== sessionId
     outboxSessionRef.current = sessionId
     const current = sessionChanged
-      ? readMountedStructuredAgentSessionOutbox(sessionId, fence, readOutbox)
+      ? readMountedStructuredAgentSessionOutbox(sessionId, owner.fenceRef.current, readOutbox)
       : outboxRef.current
-    const next = current.map((entry) =>
-      entry.state === 'dispatching' && !hasInFlightLaunchDispatch(entry, fence)
-        ? { ...entry, state: 'queued' as const }
-        : entry
-    )
+    const next = requeueInterruptedStructuredAgentSessionDispatches(current, owner.fenceRef.current)
     if (
       sessionChanged ||
       next.some((entry, index) => entry !== current[index]) ||
@@ -90,7 +86,7 @@ export function useStructuredAgentSessionOutbox(args: {
       setOutbox(next)
       writeOutbox(sessionId, next)
     }
-  }, [fence, sessionId, target])
+  }, [owner.fenceRef, owner.ownerChange, sessionId, target])
 
   useEffect(() => {
     const current = outboxRef.current
@@ -103,12 +99,13 @@ export function useStructuredAgentSessionOutbox(args: {
         .map((submission) => submission.clientMessageId)
     )
     const next = reconcileStructuredAgentSessionOutbox(current, submissions)
-    const admittedInFlight = inFlightIdRef.current !== null && hostOwns.has(inFlightIdRef.current)
+    const admittedInFlight = journalAnswersInFlightSend(submissions, inFlightIdRef.current)
     if (
       admittedInFlight ||
       next.some((entry, index) => entry !== current[index]) ||
       next.length !== current.length
     ) {
+      restoreWithdrawn.byHost(current, submissions)
       outboxRef.current = next
       setOutbox(next)
       writeOutbox(sessionId, next)
@@ -129,7 +126,7 @@ export function useStructuredAgentSessionOutbox(args: {
     ) {
       setError(null)
     }
-  }, [sessionId, submissions])
+  }, [restoreWithdrawn, sessionId, submissions])
 
   // The one place that owns the refs, the React state and the storage write.
   const applyDisposition = useCallback(
@@ -138,7 +135,6 @@ export function useStructuredAgentSessionOutbox(args: {
       // drain, so a later microtask would leave the queue with no trigger to move on.
       inFlightIdRef.current = null
       blockedIdRef.current = disposition.blockedClientMessageId
-      retryWithFreshClientMessageIdRef.current = disposition.retryWithFreshClientMessageId
       setError(disposition.error)
       outboxRef.current = disposition.entries
       setOutbox(disposition.entries)
@@ -218,46 +214,14 @@ export function useStructuredAgentSessionOutbox(args: {
     }
   }, [applyDisposition, fence, outbox, sessionId, target])
 
-  // A transport-side unknown may never have reached the host, and nothing else
-  // moves it out of `unconfirmed`, so one wedges the whole FIFO queue. Re-issuing
-  // the same envelope without `retryUnknown` is idempotent: the operation ledger
-  // replays a recorded outcome, or the host performs a genuine first delivery.
-  // A host-confirmed unknown stays parked until the user explicitly asks Retry
-  // to replay the same operation.
-  // The first `unconfirmed` entry is the one holding the queue, at whatever index it sits: an
-  // unconfirmed tail behind an admitted head would otherwise wedge until the head cleared,
-  // which is the wedge this probe exists to prevent.
-  const blocker = outbox.find((entry) => entry.state === 'unconfirmed')
-  // Depend on primitives: `submissions` is rebuilt on every streaming batch, so an
-  // array-identity dep would reset the backoff forever while the agent is working.
-  // A non-null `retryAfterUnknownSubmittedAt` means the user already retried, so
-  // another request would repeat that explicit action. Only entries that have
-  // never been retried are safe to probe automatically.
-  const probeId =
-    blocker && blocker.sessionId === sessionId && blocker.retryAfterUnknownSubmittedAt === null
-      ? blocker.clientMessageId
-      : null
-  const probeSettled =
-    probeId !== null && submissions.some((submission) => submission.clientMessageId === probeId)
-  useEffect(() => {
-    if (probeId === null || probeSettled || fence === null) {
-      return
-    }
-    const attempts = probeAttemptsRef.current.id === probeId ? probeAttemptsRef.current.attempts : 0
-    const timer = setTimeout(
-      () => {
-        probeAttemptsRef.current = { id: probeId, attempts: attempts + 1 }
-        const next = outboxRef.current.map((entry) =>
-          entry.clientMessageId === probeId ? { ...entry, state: 'queued' as const } : entry
-        )
-        outboxRef.current = next
-        setOutbox(next)
-        writeOutbox(sessionId, next)
-      },
-      Math.min(UNCONFIRMED_PROBE_BASE_DELAY_MS * 2 ** attempts, UNCONFIRMED_PROBE_MAX_DELAY_MS)
-    )
-    return () => clearTimeout(timer)
-  }, [fence, probeId, probeSettled, sessionId, targetKey])
+  useStructuredAgentSessionOutboxUnconfirmedProbe({
+    sessionId,
+    outbox,
+    submissions,
+    owner,
+    outboxRef,
+    setOutbox
+  })
 
   const send = useCallback(
     (text: string, attachments: readonly { path: string; previewUri: string }[] = []): boolean => {
@@ -284,22 +248,39 @@ export function useStructuredAgentSessionOutbox(args: {
     [sessionId]
   )
 
+  // Before the Stop goes out, so the drain has nothing left to send after it.
+  const withdrawUnsent = useCallback((): void => {
+    const next = withdrawUnsentStructuredAgentSessionOutboxEntries(
+      outboxRef.current,
+      submissions,
+      blockedIdRef.current,
+      inFlightIdRef.current
+    )
+    if (next.length !== outboxRef.current.length) {
+      restoreWithdrawn.byStop(outboxRef.current.filter((entry) => !next.includes(entry)))
+      outboxRef.current = next
+      setOutbox(next)
+      writeOutbox(sessionId, next)
+    }
+  }, [restoreWithdrawn, sessionId, submissions])
+
   const retry = (clientMessageId: string): void => {
-    blockedIdRef.current = null
+    // Another message's Retry must not send the one the queue is held on.
+    if (blockedIdRef.current === clientMessageId) {
+      blockedIdRef.current = null
+    }
     setError(null)
     const submission = submissions.find(
       (candidate) => candidate.clientMessageId === clientMessageId
     )
     const current = outboxRef.current.find((entry) => entry.clientMessageId === clientMessageId)
-    // A provider-history reconciliation can settle an earlier unknown as
-    // rejected before the user presses Retry. Reusing that operation id only
-    // replays the settled rejection forever, so rotate the id for a safe resend.
-    if (
-      current &&
-      (submission?.dispatchState === 'rejected' ||
-        retryWithFreshClientMessageIdRef.current === clientMessageId)
-    ) {
-      retryWithFreshClientMessageIdRef.current = null
+    // The host settled this id as rejected, and reusing it only replays that forever, so rotate the
+    // id for a safe resend. Read from the message itself, which outlives a restart, or from a
+    // reconciliation that settled an earlier unknown before the outbox caught up. A refusal that
+    // settled the message already rotated it.
+    const recordedRejection =
+      current?.state === 'rejected' && current.lastFailure?.kind === 'rejected'
+    if (current && (recordedRejection || submission?.dispatchState === 'rejected')) {
       const rotated = outboxRef.current.map((entry) =>
         entry.clientMessageId === clientMessageId
           ? {
@@ -341,5 +322,12 @@ export function useStructuredAgentSessionOutbox(args: {
     outboxRef.current = next
     setOutbox(next)
   }
-  return { outbox, error, blockedClientMessageId: blockedIdRef.current, send, retry }
+  return {
+    outbox,
+    error,
+    blockedClientMessageId: blockedIdRef.current,
+    send,
+    retry,
+    withdrawUnsent
+  }
 }
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-start-failure-facts.test.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-start-failure-facts.test.ts
new file mode 100644
index 000000000000..97ef023dffb7
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-start-failure-facts.test.ts
@@ -0,0 +1,42 @@
+// @vitest-environment happy-dom
+
+import { renderHook } from '@testing-library/react'
+import { expect, it } from 'vitest'
+import type { AgentSessionFailureFact } from '../../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words'
+import { agentJournalItemKey } from '../../../../shared/agent-session-journal-item-key'
+import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
+import { structuredAgentSessionStartFailureRowIdentity } from '../../../../shared/structured-agent-session-start-failure-row-key'
+import { useStructuredAgentSessionStartFailureFacts } from './use-structured-agent-session-start-failure-facts'
+
+function startFailureRow(startKey: string, fact: AgentSessionFailureFact): AgentJournalRenderItem {
+  return {
+    itemId: agentJournalItemKey(structuredAgentSessionStartFailureRowIdentity(startKey)),
+    revision: 1,
+    sequence: 1,
+    observedAt: 1,
+    body: {
+      kind: 'status',
+      tone: 'error',
+      ...agentSessionFailureWords(fact, { agentName: 'Claude', surface: 'row' })
+    }
+  }
+}
+
+// A streaming turn hands over a new item list on every delta; the facts must not follow it.
+it('holds the same facts while the start rows state nothing new', () => {
+  const row = startFailureRow('gen-1', { kind: 'providerStartFailed' })
+  const { result, rerender } = renderHook(
+    ({ items }) => useStructuredAgentSessionStartFailureFacts(items, true),
+    { initialProps: { items: [row] } }
+  )
+  const first = result.current
+  expect(first).toEqual([{ kind: 'providerStartFailed' }])
+
+  rerender({ items: [row, startFailureRow('other-start', { kind: 'providerStartFailed' })] })
+  expect(result.current).not.toBe(first)
+  const second = result.current
+
+  rerender({ items: [row, startFailureRow('other-start', { kind: 'providerStartFailed' })] })
+  expect(result.current).toBe(second)
+})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-start-failure-facts.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-start-failure-facts.ts
new file mode 100644
index 000000000000..83f20103de11
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-start-failure-facts.ts
@@ -0,0 +1,33 @@
+import { useEffect, useMemo, useRef } from 'react'
+import type { AgentSessionFailureFact } from '../../../../shared/agent-session-failure'
+import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
+import {
+  sameAgentSessionFailureFact,
+  structuredAgentSessionStartFailureFacts
+} from './structured-agent-session-delivery-notices'
+
+const NO_FACTS: readonly AgentSessionFailureFact[] = []
+
+/** What the loaded start-failure rows state, read only while `enabled`. Held while unchanged, so a
+ *  streaming turn does not rebuild every row's delivery notice. */
+export function useStructuredAgentSessionStartFailureFacts(
+  items: readonly AgentJournalRenderItem[],
+  enabled: boolean
+): readonly AgentSessionFailureFact[] {
+  const facts = useMemo(
+    () => (enabled ? structuredAgentSessionStartFailureFacts(items) : NO_FACTS),
+    [enabled, items]
+  )
+  const previousRef = useRef<readonly AgentSessionFailureFact[]>(NO_FACTS)
+  const previous = previousRef.current
+  const stable =
+    previous.length === facts.length &&
+    previous.every((fact, index) => sameAgentSessionFailureFact(fact, facts[index]))
+      ? previous
+      : facts
+  // Written after commit, so render stays pure.
+  useEffect(() => {
+    previousRef.current = stable
+  }, [stable])
+  return stable
+}
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-stop.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-stop.test.tsx
new file mode 100644
index 000000000000..5d517bf57bb9
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-stop.test.tsx
@@ -0,0 +1,541 @@
+// @vitest-environment happy-dom
+
+// Stop is there from the moment a message is sent until the work settles — against a host that takes
+// a Stop naming no turn. Against any other host, one that accepts sends first included, it stays
+// exactly what it was: a running turn only, named.
+
+import { act, renderHook } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type {
+  AgentJournalRenderItem,
+  AgentJournalSubmission
+} from '../../../../shared/agent-session-journal-types'
+import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
+
+const mocks = vi.hoisted(() => ({
+  call: vi.fn(),
+  withdrawUnsent: vi.fn(),
+  operations: 0
+}))
+let items: AgentJournalRenderItem[] = []
+let submissions: AgentJournalSubmission[] = []
+let outbox: StructuredAgentSessionOutboxEntry[] = []
+let blockedClientMessageId: string | null = null
+let fence = 3
+
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: mocks.call,
+  supportsStructuredAgentSessionPromptCancel: vi.fn(async () => false)
+}))
+
+vi.mock('./use-structured-agent-session-read', () => ({
+  useStructuredAgentSessionRead: () => ({
+    state: { fence, items, submissions, status: 'ready', error: null, hasOlder: false },
+    loadingOlder: false,
+    loadOlder: vi.fn()
+  })
+}))
+
+vi.mock('./use-structured-agent-session-outbox', () => ({
+  structuredSessionOperationId: () => `operation-${++mocks.operations}`,
+  useStructuredAgentSessionOutbox: () => ({
+    outbox,
+    blockedClientMessageId,
+    error: null,
+    send: vi.fn(),
+    retry: vi.fn(),
+    withdrawUnsent: mocks.withdrawUnsent
+  })
+}))
+
+import {
+  AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
+  AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY
+} from '../../../../shared/protocol-version'
+import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
+import { projectStructuredAgentSessionStatusSummary } from '../../../../shared/structured-agent-session-projection'
+import { structuredAgentSessionAgentStatus } from '../../../../shared/structured-agent-session-agent-status'
+import { useStructuredAgentSession } from './use-structured-agent-session'
+
+function entry(
+  state: StructuredAgentSessionOutboxEntry['state']
+): StructuredAgentSessionOutboxEntry {
+  return {
+    clientMessageId: 'client-1',
+    sessionId: 'session-1',
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hi' }] },
+    previewUris: [],
+    state,
+    queuedAt: 1,
+    lastAttemptAt: null,
+    retryAfterUnknownSubmittedAt: null
+  }
+}
+
+function submission(overrides: Partial<AgentJournalSubmission>): AgentJournalSubmission {
+  return {
+    clientMessageId: 'client-1',
+    fence: 3,
+    payloadFingerprint: 'fingerprint-1',
+    dispatchState: 'pending',
+    providerItemId: null,
+    reason: null,
+    submittedAt: 1,
+    resolvedAt: null,
+    ...overrides
+  }
+}
+
+const RUNNING_TURN: AgentJournalRenderItem = {
+  itemId: 'turn-1',
+  revision: 1,
+  sequence: 1,
+  observedAt: 1,
+  body: { kind: 'turn', turnId: 'provider-turn', state: 'running' }
+}
+
+// Every way work can be in flight after a send, in the order a message passes through them.
+const IN_FLIGHT = {
+  'the send is on its way to the host': () => {
+    outbox = [entry('dispatching')]
+  },
+  'the host has queued it': () => {
+    submissions = [submission({ handoverRecorded: true })]
+  },
+  'it was handed over and is unanswered': () => {
+    submissions = [submission({ handoverRecorded: true, handedOverAt: 2 })]
+  },
+  'a turn is running': () => {
+    items = [RUNNING_TURN]
+  }
+}
+
+function render() {
+  return renderHook(() =>
+    useStructuredAgentSession({
+      sessionId: 'session-1',
+      agent: 'claude',
+      target: { kind: 'local' },
+      isVisible: true
+    })
+  )
+}
+
+function cancels(): unknown[] {
+  return mocks.call.mock.calls
+    .filter(([, method]) => method === 'agentSession.cancel')
+    .map(([, , params]) => params)
+}
+
+afterEach(() => {
+  setLocalRuntimeCapabilitiesForTests(null)
+})
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  mocks.call.mockImplementation(async (_target, method) =>
+    method === 'agentSession.cancel' ? { ok: true, value: { cancelled: true } } : null
+  )
+  items = []
+  submissions = []
+  outbox = []
+  blockedClientMessageId = null
+  fence = 3
+})
+
+describe('Stop against a host that stops the conversation', () => {
+  beforeEach(() => {
+    setLocalRuntimeCapabilitiesForTests([
+      AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
+      AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY
+    ])
+  })
+
+  it.each(Object.entries(IN_FLIGHT))(
+    'shows while %s, and stops the conversation',
+    async (_state, arrange) => {
+      arrange()
+      const { result } = render()
+
+      expect(result.current.canStop).toBe(true)
+      await act(async () => {
+        await result.current.stop()
+      })
+
+      expect(mocks.withdrawUnsent).toHaveBeenCalledOnce()
+      // Withdrawn first, so the drain has nothing left to send after the Stop.
+      const cancelCall = mocks.call.mock.calls.findIndex(
+        ([, method]) => method === 'agentSession.cancel'
+      )
+      expect(mocks.withdrawUnsent.mock.invocationCallOrder[0]).toBeLessThan(
+        mocks.call.mock.invocationCallOrder[cancelCall] ?? 0
+      )
+      expect(cancels()).toEqual([expect.not.objectContaining({ turnId: expect.anything() })])
+    }
+  )
+
+  function cancelOperationIds(): string[] {
+    return mocks.call.mock.calls
+      .filter(([, method]) => method === 'agentSession.cancel')
+      .map(([, , params]) => params.envelope.clientOperationId)
+  }
+
+  it('does not let a Stop whose answer never came back replay into every later one', async () => {
+    submissions = [submission({ handoverRecorded: true, handedOverAt: 2 })]
+    const answers: (() => unknown)[] = [
+      () => {
+        throw new Error('the connection dropped before the host answered')
+      },
+      () => ({
+        ok: false,
+        refusal: { code: 'agent_session_operation_unknown', message: 'Outcome unknown.' }
+      })
+    ]
+    mocks.call.mockImplementation(async (_target, method) =>
+      method === 'agentSession.cancel'
+        ? (answers.shift()?.() ?? { ok: true, value: { cancelled: true } })
+        : null
+    )
+    const { result } = render()
+
+    for (let press = 0; press < 3; press += 1) {
+      await act(async () => {
+        await result.current.stop()
+      })
+    }
+
+    // One key serves every Stop in this chat, so a kept id would replay into a later Stop, which the
+    // host answers as already handled and stops nothing for up to a day.
+    const ids = cancelOperationIds()
+    expect(new Set(ids).size).toBe(3)
+  })
+
+  it('sends a Stop of its own for a second press while the first is still on its way', async () => {
+    submissions = [submission({ handoverRecorded: true, handedOverAt: 2 })]
+    const pending: ((value: unknown) => void)[] = []
+    mocks.call.mockImplementation((_target, method) =>
+      method === 'agentSession.cancel'
+        ? new Promise((resolve) => pending.push(resolve))
+        : Promise.resolve(null)
+    )
+    const { result } = render()
+
+    await act(async () => {
+      const presses = [result.current.stop(), result.current.stop()]
+      for (const resolve of pending) {
+        resolve({ ok: true, value: { cancelled: true } })
+      }
+      await Promise.all(presses)
+    })
+
+    // The host runs them in order; the second acts on whatever is still running, if anything.
+    const ids = cancelOperationIds()
+    expect(ids).toHaveLength(2)
+    expect(ids[1]).not.toBe(ids[0])
+  })
+
+  it('sends a new Stop after one the host answered once the chat had moved on', async () => {
+    items = [RUNNING_TURN]
+    const pending: ((value: unknown) => void)[] = []
+    mocks.call.mockImplementation((_target, method) =>
+      method !== 'agentSession.cancel'
+        ? Promise.resolve(null)
+        : pending.length === 0
+          ? new Promise((resolve) => pending.push(resolve))
+          : Promise.resolve({ ok: true, value: { cancelled: true } })
+    )
+    const { result, rerender } = render()
+
+    let first: Promise<unknown> = Promise.resolve()
+    act(() => {
+      first = result.current.stop()
+    })
+    fence = 4
+    rerender()
+    await act(async () => {
+      pending[0]?.({ ok: true, value: { cancelled: true } })
+      await first
+    })
+    await act(async () => {
+      await result.current.stop()
+    })
+
+    // Reusing the first id would replay it: the host answers not-cancelled and stops nothing.
+    const fences: number[] = mocks.call.mock.calls
+      .filter(([, method]) => method === 'agentSession.cancel')
+      .map(([, , params]) => params.envelope.expectedRuntimeFence)
+    expect(fences).toEqual([3, 4])
+    const ids = cancelOperationIds()
+    expect(ids[1]).not.toBe(ids[0])
+  })
+
+  it('stops a message sent after a Stop whose answer is still on its way', async () => {
+    items = [RUNNING_TURN]
+    const ran = new Set<string>()
+    const pending: (() => void)[] = []
+    mocks.call.mockImplementation((_target, method, params) => {
+      if (method !== 'agentSession.cancel') {
+        return Promise.resolve(null)
+      }
+      // As the host's ledger does: an id it already ran replays as handled and stops nothing.
+      const operationId: string = params.envelope.clientOperationId
+      const value = { cancelled: !ran.has(operationId) }
+      ran.add(operationId)
+      return new Promise((resolve) => pending.push(() => resolve({ ok: true, value })))
+    })
+    const { result, rerender } = render()
+
+    let first: Promise<unknown> = Promise.resolve()
+    let second: Promise<unknown> = Promise.resolve()
+    act(() => {
+      first = result.current.stop()
+    })
+    // The next message goes out, and reaches the host ahead of the second Stop.
+    outbox = [entry('dispatching')]
+    rerender()
+    act(() => {
+      second = result.current.stop()
+    })
+    await act(async () => {
+      for (const answer of pending) {
+        answer()
+      }
+      await Promise.all([first, second])
+    })
+
+    expect(await second).toEqual({ cancelled: true })
+  })
+
+  it('does not let a lost stop of every background task swallow the next one', async () => {
+    const answers: (() => unknown)[] = [
+      () => {
+        throw new Error('the connection dropped before the host answered')
+      }
+    ]
+    mocks.call.mockImplementation(async (_target, method) =>
+      method === 'agentSession.cancel'
+        ? (answers.shift()?.() ?? { ok: true, value: { cancelled: true } })
+        : null
+    )
+    const { result } = render()
+
+    for (let press = 0; press < 2; press += 1) {
+      await act(async () => {
+        await result.current.stopBackgroundTask()
+      })
+    }
+
+    const ids = cancelOperationIds()
+    expect(ids).toHaveLength(2)
+    expect(ids[1]).not.toBe(ids[0])
+  })
+
+  it('replays a lost stop of one background task, which names what it stops', async () => {
+    const answers: (() => unknown)[] = [
+      () => {
+        throw new Error('the connection dropped before the host answered')
+      }
+    ]
+    mocks.call.mockImplementation(async (_target, method) =>
+      method === 'agentSession.cancel'
+        ? (answers.shift()?.() ?? { ok: true, value: { cancelled: true } })
+        : null
+    )
+    const { result } = render()
+
+    for (let press = 0; press < 2; press += 1) {
+      await act(async () => {
+        await result.current.stopBackgroundTask('task-1')
+      })
+    }
+
+    const ids = cancelOperationIds()
+    expect(ids).toHaveLength(2)
+    expect(ids[1]).toBe(ids[0])
+  })
+
+  it('sends a new cancel of a named turn after the host could not settle the last one', async () => {
+    const answers: (() => unknown)[] = [
+      () => ({
+        ok: false,
+        refusal: { code: 'agent_session_operation_unknown', message: 'Outcome unknown.' }
+      })
+    ]
+    mocks.call.mockImplementation(async (_target, method) =>
+      method === 'agentSession.cancel'
+        ? (answers.shift()?.() ?? { ok: true, value: { cancelled: true } })
+        : null
+    )
+    const { result } = render()
+
+    for (let press = 0; press < 2; press += 1) {
+      await act(async () => {
+        await result.current.cancel('provider-turn')
+      })
+    }
+
+    // Cancel recovers nothing from an unknown row, so the same id would earn the same refusal.
+    const ids = cancelOperationIds()
+    expect(ids).toHaveLength(2)
+    expect(ids[1]).not.toBe(ids[0])
+  })
+
+  it('is hidden at rest, and with only a message that will not run', () => {
+    expect(render().result.current.canStop).toBe(false)
+    outbox = [entry('rejected')]
+    submissions = [submission({ dispatchState: 'accepted', resolvedAt: 2 })]
+    expect(render().result.current.canStop).toBe(false)
+  })
+
+  it('is hidden with only a message that waits on its Retry', () => {
+    // A send that failed holds the queue until the user retries it.
+    outbox = [entry('queued')]
+    blockedClientMessageId = 'client-1'
+    expect(render().result.current.canStop).toBe(false)
+
+    // A send the host restarted under is parked for the user, and the chat reads idle.
+    outbox = [{ ...entry('unconfirmed'), retryAfterUnknownSubmittedAt: -1 }]
+    blockedClientMessageId = null
+    submissions = [
+      submission({
+        dispatchState: 'unknown',
+        recovered: true,
+        reason: 'host_restarted_before_acknowledgement'
+      })
+    ]
+    const { result } = render()
+    expect(result.current.isWorking).toBe(false)
+    expect(result.current.canStop).toBe(false)
+  })
+})
+
+const EARLIER_TURN: AgentJournalRenderItem[] = [
+  {
+    itemId: 'user-0',
+    revision: 1,
+    sequence: 1,
+    observedAt: 1,
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'earlier' }] }
+  },
+  {
+    itemId: 'turn-0',
+    revision: 2,
+    sequence: 2,
+    observedAt: 2,
+    body: { kind: 'turn', turnId: 'turn-0', state: 'completed', outcome: 'success' }
+  }
+]
+
+/** The main agent's state as the sidebar row reads it: the host's projection of this journal,
+ *  through the same fold the row applies, or null when the session lists no agent at all. */
+function sidebarMainAgentState(): string | null {
+  const summary = projectStructuredAgentSessionStatusSummary(items, submissions, 3)
+  return summary.status
+    ? structuredAgentSessionAgentStatus({ ...summary, status: summary.status }).mainAgent.state
+    : null
+}
+
+// Claude retrying a rate-limited request (HTTP 429) writes only `api_retry` frames: it echoes the
+// message and opens a turn only once a request gets through or is interrupted, so the journal holds
+// a handed-over send, a row per retry, and no turn for as long as the retries last.
+const RATE_LIMIT_RETRY: AgentJournalRenderItem = {
+  itemId: 'provider-frame:claude:acquisition:1',
+  revision: 3,
+  sequence: 3,
+  observedAt: 3,
+  body: { kind: 'status', text: 'rate_limit', tone: 'error' }
+}
+
+const SIDEBAR_STATES = {
+  'a first message Claude is retrying after HTTP 429': () => {
+    items = [RATE_LIMIT_RETRY]
+    submissions = [submission({ handoverRecorded: true, handedOverAt: 2 })]
+  },
+  'a follow-up Claude is retrying after HTTP 429': () => {
+    items = [...EARLIER_TURN, RATE_LIMIT_RETRY]
+    submissions = [
+      submission({ clientMessageId: 'client-0', dispatchState: 'accepted', resolvedAt: 2 }),
+      submission({ handoverRecorded: true, handedOverAt: 3 })
+    ]
+  },
+  'a send whose write was ambiguous, still on the live child': () => {
+    items = EARLIER_TURN
+    submissions = [submission({ dispatchState: 'unknown', reason: 'write_outcome_unknown' })]
+  },
+  'a send an earlier child never answered': () => {
+    items = EARLIER_TURN
+    submissions = [submission({ fence: 2, handoverRecorded: true, handedOverAt: 2 })]
+  },
+  'a settled turn': () => {
+    items = EARLIER_TURN
+    submissions = [submission({ dispatchState: 'accepted', resolvedAt: 2 })]
+  }
+}
+
+describe('Stop against a host that stops the conversation, beside the sidebar', () => {
+  beforeEach(() => {
+    setLocalRuntimeCapabilitiesForTests([
+      AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
+      AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY
+    ])
+  })
+
+  it.each(Object.entries(SIDEBAR_STATES))(
+    'shows exactly when the sidebar reads working, for %s',
+    (_state, arrange) => {
+      arrange()
+      const { result } = render()
+
+      expect(result.current.canStop).toBe(sidebarMainAgentState() === 'working')
+      expect(result.current.isWorking).toBe(result.current.canStop)
+    }
+  )
+
+  it('is there for a rate-limited request the sidebar reads as working', () => {
+    SIDEBAR_STATES['a follow-up Claude is retrying after HTTP 429']()
+    const { result } = render()
+
+    expect(sidebarMainAgentState()).toBe('working')
+    expect(result.current.turnId).toBeNull()
+    expect(result.current.canStop).toBe(true)
+  })
+})
+
+// A host that accepts sends first but predates the no-turn cancel refuses that cancel as invalid,
+// so it is treated exactly as an older host; so is one whose capabilities are not known yet.
+describe.each([
+  ['one that only accepts sends first', [AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY]],
+  ['an older one', []],
+  ['one not heard from yet', null]
+])('Stop against a host that is %s', (_host, capabilities) => {
+  beforeEach(() => {
+    setLocalRuntimeCapabilitiesForTests(capabilities)
+  })
+
+  it.each(Object.entries(IN_FLIGHT).filter(([state]) => state !== 'a turn is running'))(
+    'stays hidden while %s, and sends no cancel naming no turn',
+    async (_state, arrange) => {
+      arrange()
+      const { result } = render()
+
+      expect(result.current.canStop).toBe(false)
+      await act(async () => {
+        await result.current.stop()
+      })
+      expect(cancels()).toEqual([])
+      expect(mocks.withdrawUnsent).not.toHaveBeenCalled()
+    }
+  )
+
+  it('stops a running turn by name, as it always did', async () => {
+    items = [RUNNING_TURN]
+    const { result } = render()
+
+    expect(result.current.canStop).toBe(true)
+    await act(async () => {
+      await result.current.stop()
+    })
+    expect(cancels()).toEqual([expect.objectContaining({ turnId: 'provider-turn' })])
+    expect(mocks.withdrawUnsent).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-transport-state.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-transport-state.ts
index c2c93788a042..b08801b199b6 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-transport-state.ts
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-transport-state.ts
@@ -1,8 +1,6 @@
 import { useMemo } from 'react'
-import {
-  activeStructuredAgentSessionTurnId,
-  hasUnansweredStructuredAgentSessionDispatch
-} from '../../../../shared/structured-agent-session-projection'
+import { activeStructuredAgentSessionTurnId } from '../../../../shared/structured-agent-session-projection'
+import { isStructuredAgentSessionMainAgentWorking } from '../../../../shared/structured-agent-session-main-agent-working'
 import type { StructuredAgentSessionState } from '../../../../shared/structured-agent-session-reducer'
 import { selectStructuredAgentTurnActivity } from '../../../../shared/native-chat-turn-activity'
 import { structuredSessionBackgroundTasksView } from './structured-session-background-tasks-view'
@@ -19,8 +17,8 @@ export function useStructuredAgentSessionTransportState(
   const submissions = enabled ? state.submissions : NO_SUBMISSIONS
   const fence = enabled ? state.fence : null
   const turnId = activeStructuredAgentSessionTurnId(journalItems)
-  const isWorking =
-    turnId !== null || hasUnansweredStructuredAgentSessionDispatch(submissions, fence)
+  // The rule the host projects every session list's Working from, so this chat cannot disagree.
+  const isWorking = isStructuredAgentSessionMainAgentWorking(turnId, submissions, fence)
   const turnActivity = useMemo(
     () => selectStructuredAgentTurnActivity(journalItems, turnId, enabled ? state.activity : null),
     [enabled, journalItems, state.activity, turnId]
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-transport.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-transport.ts
index 7bf979f8ff0a..f0c3eaa59a83 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-transport.ts
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-transport.ts
@@ -20,10 +20,8 @@ export function useStructuredAgentSessionTransport(args: {
     enabled: providerVisible
   })
   // A worktree switch hides the pane, but a message the user already sent is still owed a
-  // delivery. The read is what carries the journal rows that retire it, and its subscription
-  // takes a retaining hold — without which the host evicts the session once its idle window runs
-  // out and then refuses the send outright. Gated on `enabled`: a session not yet published has
-  // nothing to read. Attention is not the signal; owed work is.
+  // delivery, and the read is what carries the journal rows that retire it. Gated on `enabled`:
+  // a session not yet published has nothing to read. Attention is not the signal; owed work is.
   const hasUndelivered = useUndeliveredStructuredAgentSessionOutbox(sessionId)
   const read = useStructuredAgentSessionRead({
     sessionId,
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-write-refusal.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-write-refusal.test.tsx
new file mode 100644
index 000000000000..8cc467a3d283
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-write-refusal.test.tsx
@@ -0,0 +1,233 @@
+// @vitest-environment happy-dom
+
+import { act, renderHook } from '@testing-library/react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({
+  call: vi.fn(),
+  toastError: vi.fn()
+}))
+
+vi.mock('sonner', () => ({ toast: { error: mocks.toastError, message: vi.fn() } }))
+
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: mocks.call
+}))
+
+vi.mock('./use-structured-agent-session-read', () => ({
+  useStructuredAgentSessionRead: () => ({
+    state: {
+      fence: 3,
+      items: [],
+      submissions: [],
+      status: 'ready',
+      error: null,
+      hasOlder: false,
+      handoff: null
+    },
+    loadingOlder: false,
+    loadOlder: vi.fn()
+  })
+}))
+
+vi.mock('./use-structured-agent-session-outbox', () => ({
+  structuredSessionOperationId: () => 'operation-1',
+  useStructuredAgentSessionOutbox: () => ({
+    outbox: [],
+    blockedClientMessageId: null,
+    error: null,
+    send: vi.fn(),
+    retry: vi.fn()
+  })
+}))
+
+import { useStructuredAgentSession } from './use-structured-agent-session'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
+
+const LOCAL_TARGET = { kind: 'local' } as const
+const OPTIONS = { models: [], current: {} }
+
+describe('a chat write the host refused', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('says a refused Stop once, in plain words, and leaves nothing latched', async () => {
+    mocks.call.mockImplementation((_target, method) =>
+      method === 'agentSession.options'
+        ? Promise.resolve(OPTIONS)
+        : Promise.resolve({
+            ok: false,
+            refusal: {
+              code: 'agent_session_checkpoint_stale',
+              message: 'Expected runtime fence 1; the session is at 3.'
+            }
+          })
+    )
+    const { result } = renderHook(() =>
+      useStructuredAgentSession({
+        sessionId: 'session-1',
+        target: LOCAL_TARGET,
+        agent: 'claude',
+        isVisible: true
+      })
+    )
+
+    await act(async () => {
+      await expect(result.current.cancel('turn-1')).resolves.toBeNull()
+    })
+
+    expect(mocks.toastError).toHaveBeenCalledWith("The agent wasn't stopped.")
+    expect(result.current.error).toBeNull()
+  })
+
+  it('does not say a Stop failed when its request timed out after it may have run', async () => {
+    mocks.call.mockImplementation((_target, method) =>
+      method === 'agentSession.options'
+        ? Promise.resolve(OPTIONS)
+        : Promise.reject(
+            new RuntimeRpcCallError({
+              id: 'request-1',
+              ok: false,
+              error: {
+                code: 'runtime_timeout',
+                message: 'Timed out waiting for the remote Orca runtime to respond.'
+              },
+              _meta: { runtimeId: 'runtime-1' }
+            })
+          )
+    )
+    const { result } = renderHook(() =>
+      useStructuredAgentSession({
+        sessionId: 'session-1',
+        target: LOCAL_TARGET,
+        agent: 'claude',
+        isVisible: true
+      })
+    )
+
+    await act(async () => {
+      await expect(result.current.cancel('turn-1')).resolves.toBeNull()
+    })
+
+    expect(mocks.toastError).toHaveBeenCalledWith(
+      "Orca couldn't confirm what happened. Check the chat."
+    )
+  })
+
+  it('words a refusal the host threw from its data, never the bare code it carries as its message', async () => {
+    mocks.call.mockImplementation((_target, method) =>
+      method === 'agentSession.options'
+        ? Promise.resolve(OPTIONS)
+        : Promise.reject(
+            new RuntimeRpcCallError({
+              id: 'request-1',
+              ok: false,
+              error: {
+                code: 'runtime_error',
+                message: 'agent_session_journal_unreadable',
+                data: {
+                  refusal: {
+                    code: 'agent_session_journal_unreadable',
+                    details: { reason: 'journalUnavailable' }
+                  }
+                }
+              },
+              _meta: { runtimeId: 'runtime-1' }
+            })
+          )
+    )
+    const { result } = renderHook(() =>
+      useStructuredAgentSession({
+        sessionId: 'session-1',
+        target: LOCAL_TARGET,
+        agent: 'claude',
+        isVisible: true
+      })
+    )
+
+    await act(async () => {
+      await expect(result.current.cancel('turn-1')).resolves.toBeNull()
+    })
+
+    expect(mocks.toastError).toHaveBeenCalledExactlyOnceWith(
+      "Orca couldn't open this chat's history right now. The agent wasn't stopped. Try again."
+    )
+  })
+
+  it('answers a refused conversation command inline, where the command was typed', async () => {
+    mocks.call.mockImplementation((_target, method) =>
+      method === 'agentSession.options'
+        ? Promise.resolve(OPTIONS)
+        : Promise.resolve({
+            ok: false,
+            refusal: {
+              code: 'agent_session_operation_invalid',
+              message: 'agent_session_rewind:outcome-unknown'
+            }
+          })
+    )
+    const { result } = renderHook(() =>
+      useStructuredAgentSession({
+        sessionId: 'session-1',
+        target: LOCAL_TARGET,
+        agent: 'claude',
+        isVisible: true
+      })
+    )
+
+    await act(async () => {
+      await expect(result.current.runConversationCommand('compact')).resolves.toEqual({
+        accepted: false,
+        // The code does not say why, so no next step is offered that could be false.
+        error: "The command didn't run."
+      })
+    })
+
+    expect(mocks.toastError).not.toHaveBeenCalled()
+    expect(result.current.error).toBeNull()
+  })
+
+  it('says the reason the host named, for a Stop and for a command', async () => {
+    mocks.call.mockImplementation((_target, method) =>
+      method === 'agentSession.options'
+        ? Promise.resolve(OPTIONS)
+        : Promise.resolve({
+            ok: false,
+            refusal:
+              method === 'agentSession.cancel'
+                ? {
+                    code: 'agent_session_conflict',
+                    message: 'The chat is still starting.',
+                    details: { reason: 'chatStarting' }
+                  }
+                : {
+                    code: 'agent_session_operation_invalid',
+                    message: 'Wait for the current turn to finish before using this command.',
+                    details: { reason: 'turnActive' }
+                  }
+          })
+    )
+    const { result } = renderHook(() =>
+      useStructuredAgentSession({
+        sessionId: 'session-1',
+        target: LOCAL_TARGET,
+        agent: 'claude',
+        isVisible: true
+      })
+    )
+
+    await act(async () => {
+      await expect(result.current.cancel('turn-1')).resolves.toBeNull()
+      await expect(result.current.runConversationCommand('compact')).resolves.toEqual({
+        accepted: false,
+        error:
+          "The agent is still responding. The command didn't run. Wait for the agent to finish responding, or stop it."
+      })
+    })
+
+    expect(mocks.toastError).toHaveBeenCalledWith(
+      "The agent is still starting. The agent wasn't stopped. Wait for the agent to finish starting."
+    )
+  })
+})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx
index be20364c1dcc..719fa29be616 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx
@@ -6,8 +6,11 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 const mocks = vi.hoisted(() => ({
   call: vi.fn(),
   operationId: vi.fn(),
-  enqueueSettingsWrite: vi.fn()
+  enqueueSettingsWrite: vi.fn(),
+  toastError: vi.fn()
 }))
+
+vi.mock('sonner', () => ({ toast: { error: mocks.toastError, message: vi.fn() } }))
 let fence = 3
 let sessionCommands: { name: string; kind: 'command' | 'skill' }[] | undefined
 let items: AgentJournalRenderItem[] = []
@@ -255,7 +258,12 @@ describe('useStructuredAgentSession options', () => {
       expect(await result.current.setStructuredOption('model', 'gpt-fast')).toBe(false)
     })
 
-    expect(result.current.error).toBe('provider rejected option')
+    // Said once, without the transport's text, and without claiming an outcome the failure
+    // cannot prove; nothing stays behind under the composer.
+    expect(mocks.toastError).toHaveBeenCalledWith(
+      "Orca couldn't confirm what happened. Check the chat."
+    )
+    expect(result.current.error).toBeNull()
     expect(result.current.optionSnapshot.find((entry) => entry.id === 'model')).toMatchObject({
       settable: true
     })
@@ -411,6 +419,7 @@ describe('useStructuredAgentSession options', () => {
     })
 
     expect(result.current.error).toBeNull()
+    expect(mocks.toastError).not.toHaveBeenCalled()
   })
 
   it('includes one background task id in the cancel fingerprint and payload', async () => {
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.ts b/src/renderer/src/components/native-chat/use-structured-agent-session.ts
index 9db1e6ff0759..8756d47aa71d 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session.ts
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session.ts
@@ -12,6 +12,8 @@ import {
   supportsStructuredAgentSessionPromptCancel,
   supportsStructuredAgentSessionQuestionAnswers
 } from '@/runtime/structured-agent-session-client'
+import { useStructuredAgentSessionHostStopsConversation } from '@/runtime/structured-agent-session-host-capability'
+import { hasUnsentStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox-stop-withdrawal'
 import {
   legacyAgentSessionSelectedOptionId,
   type AgentSessionPromptResponse
@@ -43,9 +45,12 @@ export function useStructuredAgentSession(args: {
   providerStarting?: boolean
   /** This view started the session; only then does the stored selection name what it runs. */
   launch?: StructuredAgentSessionLaunchView
+  /** The composer that gets back what a Stop withdrew. */
+  composerScopeKey?: string
 }) {
   const {
     agent,
+    composerScopeKey,
     isVisible,
     launch,
     providerStarting = false,
@@ -53,21 +58,13 @@ export function useStructuredAgentSession(args: {
     target,
     transportEnabled = true
   } = args
-  const {
-    state,
-    loadingOlder,
-    olderHistoryGeneration,
-    loadOlder,
-    mutate,
-    writeError,
-    reportWriteError,
-    providerVisible
-  } = useStructuredAgentSessionTransport({
-    sessionId,
-    target,
-    isVisible,
-    enabled: transportEnabled
-  })
+  const { state, loadingOlder, olderHistoryGeneration, loadOlder, mutate, write, providerVisible } =
+    useStructuredAgentSessionTransport({
+      sessionId,
+      target,
+      isVisible,
+      enabled: transportEnabled
+    })
   const commandPending = useRef(false)
   const transportState = useStructuredAgentSessionTransportState(state, transportEnabled)
   const {
@@ -89,14 +86,14 @@ export function useStructuredAgentSession(args: {
     turnId: transportState.turnId,
     unloadedTurnRevisions: state.unloadedTurnRevisions,
     mutate,
-    reportWriteError,
     ...(launch ? { launch } : {})
   })
   const outboxController = useStructuredAgentSessionOutbox({
     sessionId,
     target,
     fence: transportState.fence,
-    submissions: transportState.submissions
+    submissions: transportState.submissions,
+    composerScopeKey
   })
 
   const threadGoal = useStructuredAgentSessionThreadGoal({
@@ -118,6 +115,19 @@ export function useStructuredAgentSession(args: {
 
   const prompts = pendingStructuredSessionPrompts(transportState.journalItems)
   const { outbox } = outboxController
+  // A host that takes a Stop naming no turn gets Stop from the send until the work settles; every
+  // Stop before a turn opens needs that form. An older host can stop only a turn it has opened.
+  const stopsConversation =
+    useStructuredAgentSessionHostStopsConversation(target) && transportState.fence !== null
+  const canStop =
+    transportState.turnId !== null ||
+    (stopsConversation &&
+      (transportState.isWorking ||
+        hasUnsentStructuredAgentSessionOutboxEntry(
+          outbox,
+          transportState.submissions,
+          outboxController.blockedClientMessageId
+        )))
   const messages = useStructuredAgentSessionMessages(
     transportState.journalItems,
     outbox,
@@ -136,7 +146,7 @@ export function useStructuredAgentSession(args: {
           outbox.length
         ),
         send: (command) =>
-          mutate<AgentSessionConversationCommandResult>(
+          write<AgentSessionConversationCommandResult>(
             'agentSession.conversationCommand',
             'agentSession.conversationCommand',
             { command }
@@ -145,9 +155,10 @@ export function useStructuredAgentSession(args: {
     journalItems: transportState.journalItems,
     messages,
     status: transportEnabled ? state.status : 'ready',
-    error: transportEnabled
-      ? (state.error ?? writeError ?? outboxController.error)
-      : outboxController.error,
+    /** The outbox's own line; a failed read is worded from `readRefusal`, never its text. */
+    error: outboxController.error,
+    /** The refusal the failed read met, while `status` is `error`. */
+    readRefusal: transportEnabled ? state.readRefusal : undefined,
     hasOlder: transportEnabled && state.hasOlder,
     railOutline: transportEnabled ? railOutline : null,
     loadingOlder: transportEnabled && loadingOlder,
@@ -155,6 +166,8 @@ export function useStructuredAgentSession(args: {
     loadOlder,
     prompts,
     outbox,
+    /** The journal's rows for sent messages, which carry a rejected message's whole fact. */
+    submissions: transportState.submissions,
     blockedClientMessageId: outboxController.blockedClientMessageId,
     send: (...input: Parameters<typeof outboxController.send>) =>
       !commandPending.current && outboxController.send(...input),
@@ -162,9 +175,21 @@ export function useStructuredAgentSession(args: {
     isWorking: transportState.isWorking,
     workingStartedAt: transportState.turnTiming.workingStartedAt,
     settledTurns: transportState.turnTiming.settledTurns,
+    activeTurnOpenedBy: transportState.turnTiming.activeTurnOpenedBy,
+    turnKeysByItemId: transportState.turnTiming.turnKeysByItemId,
     turnActivity: transportState.turnActivity,
     backgroundTasks: transportState.backgroundTasks,
     turnId: transportState.turnId,
+    canStop,
+    stop: () => {
+      if (stopsConversation) {
+        outboxController.withdrawUnsent()
+        return mutate('agentSession.cancel', 'agentSession.cancel', {})
+      }
+      return transportState.turnId
+        ? mutate('agentSession.cancel', 'agentSession.cancel', { turnId: transportState.turnId })
+        : Promise.resolve(null)
+    },
     cancel: async (turnId: string, prompt?: StructuredPromptCancelTarget) => {
       // Capability negotiation must complete before mutate constructs the payload
       // fingerprint and operation id: older hosts reject the strict prompt field.
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-turn-timing.ts b/src/renderer/src/components/native-chat/use-structured-agent-turn-timing.ts
index 5603c82b42f2..dd6b16628248 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-turn-timing.ts
+++ b/src/renderer/src/components/native-chat/use-structured-agent-turn-timing.ts
@@ -5,18 +5,17 @@ import type {
 } from '../../../../shared/agent-session-journal-types'
 import type { NativeChatSettledTurns } from '../../../../shared/native-chat-turn-status'
 import type { StructuredAgentHostClock } from '../../../../shared/structured-agent-session-reducer'
-import {
-  selectStructuredAgentRunningTurnTiming,
-  selectStructuredAgentSettledTurns
-} from '../../../../shared/structured-agent-session-turn-timing'
+import { selectStructuredAgentTurnBars } from '../../../../shared/structured-agent-session-turn-timing'
 import {
   stepStructuredAgentTurnClock,
   type StructuredAgentTurnClockLatch
 } from '../../../../shared/structured-agent-turn-clock-anchor'
 
 /** Host-recorded turn timing for the structured lane: settled durations straight
- *  off the journal, and a skew-free start for the live counter whose host-to-local
- *  conversion is latched once per turn. */
+ *  off the journal, the transcript key that owns the running turn's bar, each
+ *  row's owning turn, and a
+ *  skew-free start for the live counter whose host-to-local conversion is latched
+ *  once per turn. */
 export function useStructuredAgentTurnTiming(
   {
     items,
@@ -28,16 +27,17 @@ export function useStructuredAgentTurnTiming(
     hostClock?: StructuredAgentHostClock | null
   },
   turnId: string | null
-): { settledTurns: NativeChatSettledTurns; workingStartedAt: number | null } {
-  const settledTurns = useMemo(
-    () => selectStructuredAgentSettledTurns(items, submissions),
-    [items, submissions]
+): {
+  settledTurns: NativeChatSettledTurns
+  workingStartedAt: number | null
+  activeTurnOpenedBy: string | null
+  turnKeysByItemId: ReadonlyMap<string, string>
+} {
+  const { settledTurns, runningTiming, activeTurnOpenedBy, turnKeysByItemId } = useMemo(
+    () => selectStructuredAgentTurnBars(items, submissions, turnId),
+    [items, submissions, turnId]
   )
   const [latch, setLatch] = useState<StructuredAgentTurnClockLatch | null>(null)
-  const runningTiming = useMemo(
-    () => (turnId === null ? null : selectStructuredAgentRunningTurnTiming(items, turnId)),
-    [items, turnId]
-  )
   // Stamp during render (React's derive-from-props pattern) so the first paint of
   // a new turn already counts from the right instant.
   const step = stepStructuredAgentTurnClock({
@@ -50,5 +50,10 @@ export function useStructuredAgentTurnTiming(
   if (step.latch !== latch) {
     setLatch(step.latch)
   }
-  return { settledTurns, workingStartedAt: step.workingStartedAt }
+  return {
+    settledTurns,
+    workingStartedAt: step.workingStartedAt,
+    activeTurnOpenedBy,
+    turnKeysByItemId
+  }
 }
diff --git a/src/renderer/src/components/new-workspace/NewWorkspaceComposerAdvancedSection.tsx b/src/renderer/src/components/new-workspace/NewWorkspaceComposerAdvancedSection.tsx
index f7b18f6ebaaf..55deb82b95bc 100644
--- a/src/renderer/src/components/new-workspace/NewWorkspaceComposerAdvancedSection.tsx
+++ b/src/renderer/src/components/new-workspace/NewWorkspaceComposerAdvancedSection.tsx
@@ -272,7 +272,7 @@ export function NewWorkspaceComposerAdvancedSection({
                     <div className="flex items-start justify-between gap-3 p-3">
                       <span
                         className={cn(
-                          'min-w-0 space-y-1',
+                          'min-w-0',
                           resolvedSetupDecision === 'run' ? '' : 'opacity-50'
                         )}
                       >
@@ -282,12 +282,6 @@ export function NewWorkspaceComposerAdvancedSection({
                             'Wait for setup to complete before starting agent'
                           )}
                         </span>
-                        <span className="block text-[11px] text-muted-foreground">
-                          {translate(
-                            'auto.components.NewWorkspaceComposerCard.waitForSetupBeforeAgentHelp',
-                            'Turn this on when setup installs dependencies, MCP servers, or config files the agent needs during startup.'
-                          )}
-                        </span>
                       </span>
                       <SettingsSwitch
                         checked={setupAgentStartupPolicy === 'wait-for-setup'}
diff --git a/src/renderer/src/components/pull-request-page/checks/fix-dialog.tsx b/src/renderer/src/components/pull-request-page/checks/fix-dialog.tsx
index 9d9c58e79619..cb72999ee9b9 100644
--- a/src/renderer/src/components/pull-request-page/checks/fix-dialog.tsx
+++ b/src/renderer/src/components/pull-request-page/checks/fix-dialog.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { toast } from 'sonner'
 import type { useAppStore } from '@/store'
 import { SourceControlAgentActionDialog } from '@/components/right-sidebar/SourceControlAgentActionDialog'
-import { readSourceControlLaunchRecipeAgentId } from '@/lib/source-control-launch-agent-selection'
+import { readSourceControlLaunchRecipeAgentId } from '../../../../../shared/source-control-launch-agent-selection'
 import type { SourceControlActionRecipe } from '../../../../../shared/source-control-ai-actions'
 import { translate } from '@/i18n/i18n'
 import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types'
diff --git a/src/renderer/src/components/pull-request-page/page/surface.tsx b/src/renderer/src/components/pull-request-page/page/surface.tsx
index ff3af71c68d4..c4c48984bc41 100644
--- a/src/renderer/src/components/pull-request-page/page/surface.tsx
+++ b/src/renderer/src/components/pull-request-page/page/surface.tsx
@@ -133,7 +133,9 @@ export default function PullRequestPage({
       return
     }
 
-    const result = activateAndRevealWorktree(currentAttached.id)
+    const result = activateAndRevealWorktree(currentAttached.id, {
+      navigationIntent: 'user-open'
+    })
     if (result === false) {
       toast.error(
         translate(
diff --git a/src/renderer/src/components/refactor-hook-contract.test-support.ts b/src/renderer/src/components/refactor-hook-contract.test-support.ts
deleted file mode 100644
index cb191c7c86fe..000000000000
--- a/src/renderer/src/components/refactor-hook-contract.test-support.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import { createHash } from 'node:crypto'
-// TypeScript 7 is a native CLI; AST tests still need the legacy JavaScript API.
-import ts from 'typescript-api'
-
-export type HookContractFact = {
-  dependencies: string[] | null
-  name: string
-}
-
-type HookDefinition = {
-  body: ts.Node
-  sourceFile: ts.SourceFile
-}
-
-export type HookSource = {
-  relativePath: string
-  source: string
-}
-
-export type HookDefinitions = ReadonlyMap<string, HookDefinition>
-
-function readFunctionName(node: ts.Node): string | null {
-  if ((ts.isFunctionDeclaration(node) || ts.isFunctionExpression(node)) && node.name) {
-    return node.name.text
-  }
-  if (
-    ts.isArrowFunction(node) &&
-    ts.isVariableDeclaration(node.parent) &&
-    ts.isIdentifier(node.parent.name)
-  ) {
-    return node.parent.name.text
-  }
-  return null
-}
-
-function readHookName(node: ts.CallExpression): string | null {
-  if (ts.isIdentifier(node.expression) && /^use[A-Z]/.test(node.expression.text)) {
-    return node.expression.text
-  }
-  if (
-    ts.isPropertyAccessExpression(node.expression) &&
-    /^use[A-Z]/.test(node.expression.name.text)
-  ) {
-    return node.expression.name.text
-  }
-  return null
-}
-
-function normalize(node: ts.Node, sourceFile: ts.SourceFile): string {
-  return node
-    .getText(sourceFile)
-    .replace(/\/\*[\s\S]*?\*\//g, '')
-    .replace(/\/\/.*$/gm, '')
-    .replace(/\s+/g, '')
-}
-
-export function readHookDefinitions(
-  sources: readonly HookSource[],
-  includesDefinition: (name: string) => boolean
-): HookDefinitions {
-  const definitions = new Map<string, HookDefinition>()
-  for (const { relativePath, source } of sources) {
-    const sourceFile = ts.createSourceFile(
-      relativePath,
-      source,
-      ts.ScriptTarget.Latest,
-      true,
-      relativePath.endsWith('.tsx') ? ts.ScriptKind.TSX : ts.ScriptKind.TS
-    )
-    const visit = (node: ts.Node): void => {
-      if (
-        (ts.isFunctionDeclaration(node) ||
-          ts.isFunctionExpression(node) ||
-          ts.isArrowFunction(node)) &&
-        node.body
-      ) {
-        const name = readFunctionName(node)
-        if (name && includesDefinition(name)) {
-          definitions.set(name, { body: node.body, sourceFile })
-        }
-      }
-      ts.forEachChild(node, visit)
-    }
-    visit(sourceFile)
-  }
-  return definitions
-}
-
-export function readFlattenedHookFacts(
-  definitions: HookDefinitions,
-  rootName: string
-): HookContractFact[] {
-  const flatten = (name: string, active: ReadonlySet<string>): HookContractFact[] => {
-    const definition = definitions.get(name)
-    if (!definition || active.has(name)) {
-      throw new Error(`Invalid hook stage: ${name}`)
-    }
-    const facts: HookContractFact[] = []
-    const nextActive = new Set([...active, name])
-    const visit = (node: ts.Node): void => {
-      if (ts.isCallExpression(node)) {
-        const hookName = readHookName(node)
-        if (hookName) {
-          if (definitions.has(hookName)) {
-            facts.push(...flatten(hookName, nextActive))
-          } else {
-            const dependencyArray = [...node.arguments]
-              .toReversed()
-              .find((argument) => ts.isArrayLiteralExpression(argument))
-            facts.push({
-              dependencies: dependencyArray
-                ? [...dependencyArray.elements].map((element) =>
-                    normalize(element, definition.sourceFile)
-                  )
-                : null,
-              name: hookName
-            })
-          }
-        }
-      }
-      ts.forEachChild(node, visit)
-    }
-    visit(definition.body)
-    return facts
-  }
-
-  return flatten(rootName, new Set())
-}
-
-export function hashContract(values: readonly string[]): string {
-  return createHash('sha256').update(values.join('\n')).digest('hex')
-}
-
-export function readDependencyContract(facts: readonly HookContractFact[]): string[] {
-  return facts.flatMap(({ dependencies, name }) =>
-    dependencies === null ? [] : [`${name}|[${dependencies.join(',')}]`]
-  )
-}
-
-export function projectDependencyContract(
-  facts: readonly HookContractFact[],
-  allowedAdditions: Readonly<Record<number, readonly string[]>>
-): string[] {
-  const dependencyFacts = facts.filter(
-    (fact): fact is HookContractFact & { dependencies: string[] } => fact.dependencies !== null
-  )
-  for (const ordinal of Object.keys(allowedAdditions).map(Number)) {
-    if (!Number.isInteger(ordinal) || ordinal < 0 || ordinal >= dependencyFacts.length) {
-      throw new Error(`Invalid dependency-array ordinal: ${ordinal}`)
-    }
-  }
-  return dependencyFacts.map(({ dependencies, name }, ordinal) => {
-    const projected = [...dependencies]
-    for (const addition of allowedAdditions[ordinal] ?? []) {
-      const index = projected.indexOf(addition)
-      if (index === -1) {
-        throw new Error(`Missing allowed dependency addition at ${ordinal}: ${addition}`)
-      }
-      projected.splice(index, 1)
-    }
-    return `${name}|[${projected.join(',')}]`
-  })
-}
diff --git a/src/renderer/src/components/right-sidebar/SourceControl.host-context-boundary.test.ts b/src/renderer/src/components/right-sidebar/SourceControl.host-context-boundary.test.ts
deleted file mode 100644
index 12539a08accd..000000000000
--- a/src/renderer/src/components/right-sidebar/SourceControl.host-context-boundary.test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const WORKTREE_CONTEXT_SOURCE = readFileSync(
-  join(__dirname, 'source-control/listing/use-worktree-context.ts'),
-  'utf8'
-)
-const PR_GENERATION_SOURCE = readFileSync(
-  join(__dirname, 'source-control/review/use-pull-request-generation.ts'),
-  'utf8'
-)
-const CREATE_REVIEW_COMPOSER_SOURCE = readFileSync(
-  join(__dirname, 'source-control/review/use-create-review-composer.ts'),
-  'utf8'
-)
-const STATUS_REFRESH_SOURCE = readFileSync(
-  join(__dirname, 'source-control/sync/use-status-refresh.ts'),
-  'utf8'
-)
-const BASE_REF_DEFAULT_SOURCE = readFileSync(
-  join(__dirname, 'source-control/sync/use-base-ref-default.ts'),
-  'utf8'
-)
-
-function sourceBetween(source: string, startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start + startPattern.length)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('SourceControl host-context boundaries', () => {
-  it('snapshots PR generation host ownership and reuses it after async branch preparation', () => {
-    const generateSection = sourceBetween(
-      PR_GENERATION_SOURCE,
-      'const handleGeneratePullRequestFieldsForActive = useCallback(',
-      'const handleCancelGeneratePullRequestFieldsForActive = useCallback('
-    )
-    expect(generateSection).toContain('runtimeTargetSettings: activeRepoSettings')
-    expect(generateSection).toContain('settings: context.runtimeTargetSettings')
-
-    const cancelSection = sourceBetween(
-      PR_GENERATION_SOURCE,
-      'const handleCancelGeneratePullRequestFieldsForActive = useCallback(',
-      'const handlePullRequestGenerationSeedRestored = useCallback('
-    )
-    expect(cancelSection).toContain('settings: record.context.runtimeTargetSettings')
-
-    const refreshSection = sourceBetween(
-      STATUS_REFRESH_SOURCE,
-      'const refreshGitStatusAfterPullRequestGeneration = useCallback(',
-      '  return {'
-    )
-    expect(refreshSection).toContain('settings: context.runtimeTargetSettings')
-    expect(refreshSection).not.toContain('settings: activeRepoSettings')
-  })
-
-  it('routes create-review field generation through caller-provided owner settings', () => {
-    const composerCall = sourceBetween(
-      CREATE_REVIEW_COMPOSER_SOURCE,
-      '} = useCreatePullRequestDialogFields({',
-      'const handleGeneratePullRequestFieldsClick = useCallback'
-    )
-    expect(composerCall).toContain('settings: activeRepoSettings')
-
-    const hookSource = readFileSync(
-      join(__dirname, 'use-create-pull-request-field-generation.ts'),
-      'utf8'
-    )
-    const requestContext = sourceBetween(hookSource, 'const requestContext = {', 'const seed = {')
-    expect(requestContext).toContain('settings,')
-    expect(requestContext).not.toContain('useAppStore.getState().settings')
-  })
-
-  it('keeps eligibility base refreshes scoped to repo execution ownership', () => {
-    const ownerSettingsSection = sourceBetween(
-      WORKTREE_CONTEXT_SOURCE,
-      'const activeRepoSettings = useMemo(',
-      'const activeRepoRuntimeEnvironmentId'
-    )
-    expect(ownerSettingsSection).not.toContain('activeRepo ?? null')
-    expect(ownerSettingsSection).toContain(
-      '[activeRepoConnectionId, activeRepoExecutionHostId, activeRepoId, settings]'
-    )
-
-    const baseRefSection = sourceBetween(
-      BASE_REF_DEFAULT_SOURCE,
-      '// Why: reset to null so that effectiveBaseRef becomes falsy until the IPC',
-      '  return defaultBaseRef'
-    )
-    expect(baseRefSection).toContain(
-      'getRuntimeRepoBaseRefDefault(\n      { activeRuntimeEnvironmentId: activeRepoRuntimeEnvironmentId },\n      activeRepoId'
-    )
-    const dependencyBlock = sourceBetween(baseRefSection, '  }, [', '  ])')
-    const dependencyEntries = dependencyBlock
-      .split('\n')
-      .slice(1)
-      .map((line) => line.trim().replace(/,$/, ''))
-      .filter((line) => line.length > 0 && !line.startsWith('//'))
-    expect(dependencyEntries).toEqual([
-      'activeRepoConnectionId',
-      'activeRepoExecutionHostId',
-      'activeRepoId',
-      'activeRepoRuntimeEnvironmentId',
-      'isBranchVisible',
-      'isFolder'
-    ])
-  })
-})
diff --git a/src/renderer/src/components/right-sidebar/SourceControl.virtual-file-list.test.tsx b/src/renderer/src/components/right-sidebar/SourceControl.virtual-file-list.test.tsx
index 2970693dfe48..4d3c172c1ba9 100644
--- a/src/renderer/src/components/right-sidebar/SourceControl.virtual-file-list.test.tsx
+++ b/src/renderer/src/components/right-sidebar/SourceControl.virtual-file-list.test.tsx
@@ -203,13 +203,13 @@ beforeEach(() => {
   // and 24px rows (both rect + row measurement read offsetHeight), and keep
   // the observer path inert so measurements stay deterministic.
   vi.stubGlobal('ResizeObserver', NoopResizeObserver)
-  vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(
-    function (this: HTMLElement) {
-      return this.classList.contains('overflow-auto')
-        ? VIEWPORT_HEIGHT_PX
-        : VIRTUALIZED_LIST_ROW_HEIGHT_PX
-    }
-  )
+  vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(function (
+    this: HTMLElement
+  ) {
+    return this.classList.contains('overflow-auto')
+      ? VIEWPORT_HEIGHT_PX
+      : VIRTUALIZED_LIST_ROW_HEIGHT_PX
+  })
   vi.spyOn(Element.prototype, 'getBoundingClientRect').mockImplementation(function (this: Element) {
     // The panel scroller acts as the fixed viewport; everything inside it
     // shifts up by scrollTop, which is what the list's scroll-margin math
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-refresh.test.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-refresh.test.ts
index 567e080360a7..db39129526ec 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-refresh.test.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-refresh.test.ts
@@ -819,11 +819,4 @@ describe('useAiVaultSessionRefresh in a non-secure context', () => {
       })
     })
   })
-
-  // Guards the stub itself: an own-property stub of randomUUID is unrestorable, so a
-  // leaky teardown would silently strip the real method from every later test in the file.
-  it('leaves the real crypto.randomUUID in place afterwards', () => {
-    // oxlint-disable-next-line no-restricted-properties -- asserting the restore this case exists for
-    expect(typeof globalThis.crypto.randomUUID).toBe('function')
-  })
 })
diff --git a/src/renderer/src/components/right-sidebar/checks-panel/active-content.tsx b/src/renderer/src/components/right-sidebar/checks-panel/active-content.tsx
index b7d70633aa76..c4327b0039a1 100644
--- a/src/renderer/src/components/right-sidebar/checks-panel/active-content.tsx
+++ b/src/renderer/src/components/right-sidebar/checks-panel/active-content.tsx
@@ -8,7 +8,7 @@ import { SourceControlAgentActionDialog } from '../SourceControlAgentActionDialo
 import { ChecksPanelUpdatedAtMetadata } from '../checks-panel-updated-at-metadata'
 import { getChecksPanelRefreshErrorBannerLine } from '../github-refresh-error-copy'
 import { resolveChecksPanelHostedReviewModifierDestination } from '../checks-panel-hosted-review-click-routing'
-import { readSourceControlLaunchRecipeAgentId } from '@/lib/source-control-launch-agent-selection'
+import { readSourceControlLaunchRecipeAgentId } from '../../../../../shared/source-control-launch-agent-selection'
 import { resolveSourceControlActionRecipe } from '../../../../../shared/source-control-ai'
 import { clearPendingPRCommentAiAck } from '../pr-comments-ai-launch-ack'
 import { getBrokenChecks } from '../../pr-checks-fix-prompt'
diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts b/src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts
index 6f579cb12503..2ca6b771e1c0 100644
--- a/src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts
@@ -8,7 +8,7 @@ import { planAgentCliArgsSuffix } from '@/lib/tui-agent-startup'
 import {
   pickSourceControlLaunchAgent,
   readSourceControlLaunchRecipeAgentId
-} from '@/lib/source-control-launch-agent-selection'
+} from '../../../../../../shared/source-control-launch-agent-selection'
 import { isTuiAgentEnabled } from '../../../../../../shared/tui-agent-selection'
 import type {
   SourceControlActionRecipe,
diff --git a/src/renderer/src/components/right-sidebar/source-control/commit/component-gates.ts b/src/renderer/src/components/right-sidebar/source-control/commit/component-gates.ts
index e5b59366ce9e..aca9e0ca192d 100644
--- a/src/renderer/src/components/right-sidebar/source-control/commit/component-gates.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/commit/component-gates.ts
@@ -1,4 +1,4 @@
-import { pickSourceControlLaunchAgent } from '@/lib/source-control-launch-agent-selection'
+import { pickSourceControlLaunchAgent } from '../../../../../../shared/source-control-launch-agent-selection'
 import type { GitConflictOperation } from '../../../../../../shared/git-status-types'
 import type { TuiAgent } from '../../../../../../shared/tui-agent'
 
diff --git a/src/renderer/src/components/right-sidebar/source-control/commit/recovery-notice.tsx b/src/renderer/src/components/right-sidebar/source-control/commit/recovery-notice.tsx
index 6364c37fc7c7..7335902831d8 100644
--- a/src/renderer/src/components/right-sidebar/source-control/commit/recovery-notice.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/commit/recovery-notice.tsx
@@ -11,7 +11,7 @@ import {
   DialogTitle
 } from '@/components/ui/dialog'
 import { translate } from '@/i18n/i18n'
-import { readSourceControlLaunchRecipeAgentId } from '@/lib/source-control-launch-agent-selection'
+import { readSourceControlLaunchRecipeAgentId } from '../../../../../../shared/source-control-launch-agent-selection'
 import type {
   SourceControlActionRecipe,
   SourceControlLaunchActionId
diff --git a/src/renderer/src/components/right-sidebar/source-control/panel/panel-dialogs.tsx b/src/renderer/src/components/right-sidebar/source-control/panel/panel-dialogs.tsx
index 293f22f7ee55..1c8367c15344 100644
--- a/src/renderer/src/components/right-sidebar/source-control/panel/panel-dialogs.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/panel/panel-dialogs.tsx
@@ -1,4 +1,4 @@
-import { readSourceControlLaunchRecipeAgentId } from '@/lib/source-control-launch-agent-selection'
+import { readSourceControlLaunchRecipeAgentId } from '../../../../../../shared/source-control-launch-agent-selection'
 import { SourceControlDialogLayer } from './dialog-layer'
 import type { SourceControlPanelReadyProps } from './panel-props'
 
diff --git a/src/renderer/src/components/right-sidebar/useSourceControlAgentActionDialog.ts b/src/renderer/src/components/right-sidebar/useSourceControlAgentActionDialog.ts
index 3e8e95322945..cee7a7300fc6 100644
--- a/src/renderer/src/components/right-sidebar/useSourceControlAgentActionDialog.ts
+++ b/src/renderer/src/components/right-sidebar/useSourceControlAgentActionDialog.ts
@@ -3,7 +3,7 @@ import { getAgentCatalog } from '@/lib/agent-catalog'
 import {
   pickSourceControlLaunchAgent,
   resolveSourceControlLaunchAgentScope
-} from '@/lib/source-control-launch-agent-selection'
+} from '../../../../shared/source-control-launch-agent-selection'
 import { useAppStore } from '@/store'
 import { useRepoById } from '@/store/selectors'
 import type { AgentLaunchOverrides } from '../../../../shared/fork-automation-launch-settings/agent-launch-overrides'
diff --git a/src/renderer/src/components/settings/AccountsPane.section-lifetime.test.tsx b/src/renderer/src/components/settings/AccountsPane.section-lifetime.test.tsx
new file mode 100644
index 000000000000..ff46d9637327
--- /dev/null
+++ b/src/renderer/src/components/settings/AccountsPane.section-lifetime.test.tsx
@@ -0,0 +1,257 @@
+// @vitest-environment happy-dom
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { getDefaultSettings } from '../../../../shared/constants'
+import { AccountsPane } from './AccountsPane'
+
+const fake = vi.hoisted(() => ({
+  query: '',
+  cursorStatus: vi.fn(async () => ({
+    signedIn: false,
+    email: null,
+    displayName: null,
+    credentialSource: null,
+    planType: null,
+    tokenFresh: false,
+    error: null
+  })),
+  cursorRefresh: vi.fn(async () => {}),
+  cursorUsage: { updatedAt: 0 },
+  status: vi.fn(async () => ({
+    signedIn: false,
+    email: null,
+    teamId: null,
+    tokenFresh: false,
+    error: null
+  })),
+  pending: vi.fn(async () => null),
+  subscribe: vi.fn(() => vi.fn()),
+  refresh: vi.fn(async () => {}),
+  write: vi.fn(),
+  watcher: vi.fn(() => ({ close: vi.fn() })),
+  grokUsage: { updatedAt: 0 }
+}))
+vi.mock('@/i18n/i18n', () => ({
+  i18n: { language: 'en' },
+  translate: (_key: string, fallback: string, values?: Record<string, string | number>) =>
+    Object.entries(values ?? {}).reduce(
+      (text, [key, value]) => text.replaceAll(`{{${key}}}`, String(value)),
+      fallback
+    )
+}))
+vi.mock('@/store', () => ({
+  useAppStore: (selector: (state: Record<string, unknown>) => unknown) =>
+    selector({
+      settingsSearchQuery: fake.query,
+      rateLimits: {
+        codex: null,
+        codexTarget: { runtime: 'host', wslDistro: null },
+        minimax: null,
+        cursor: fake.cursorUsage,
+        grok: fake.grokUsage
+      },
+      runtimeEnvironments: [],
+      refreshRateLimits: fake.cursorRefresh,
+      refreshGrokRateLimits: fake.refresh,
+      recordFeatureInteraction: fake.write,
+      fetchSettings: fake.write
+    })
+}))
+vi.mock('@/runtime/runtime-provider-accounts-client', () => ({
+  emptyClaudeAccountsState: () => ({
+    accounts: [],
+    activeAccountId: null,
+    activeAccountIdsByRuntime: { host: null, wsl: {} }
+  }),
+  emptyCodexAccountsState: () => ({
+    accounts: [],
+    activeAccountId: null,
+    activeAccountIdsByRuntime: { host: null, wsl: {} }
+  }),
+  hasRemoteProviderAccountOwner: (settings: { activeRuntimeEnvironmentId?: string }) =>
+    Boolean(settings.activeRuntimeEnvironmentId),
+  watchProviderAccounts: fake.watcher,
+  selectClaudeProviderAccount: fake.write,
+  selectCodexProviderAccount: fake.write,
+  removeClaudeProviderAccount: fake.write,
+  removeCodexProviderAccount: fake.write
+}))
+beforeEach(() => {
+  vi.clearAllMocks()
+  fake.query = ''
+  fake.grokUsage = { updatedAt: 0 }
+  fake.cursorUsage = { updatedAt: 0 }
+  Object.assign(window, {
+    api: {
+      minimaxCredentials: {
+        getStatus: vi.fn(async () => ({ cookieConfigured: false, apiKeyConfigured: false }))
+      },
+      codexConfigSync: {
+        status: vi.fn(async () => ({
+          state: 'synced',
+          reason: null,
+          systemConfigPath: '/synthetic/config.toml'
+        }))
+      },
+      codexAccounts: { getPendingLoginUrl: fake.pending, onPendingLoginUrlChanged: fake.subscribe },
+      cursorAccounts: { getStatus: fake.cursorStatus },
+      grokAccounts: { getStatus: fake.status }
+    }
+  })
+})
+afterEach(() => {
+  cleanup()
+  Reflect.deleteProperty(window, 'api')
+})
+
+it.each([false, true])(
+  'retains Grok status reads with Windows account support %s',
+  async (wslSupportedPlatform) => {
+    const props = {
+      settings: getDefaultSettings('/synthetic'),
+      updateSettings: fake.write,
+      wslSupportedPlatform
+    }
+    const view = render(<AccountsPane {...props} />)
+    await act(async () => {})
+    // The invariant is identity, not a magic number: the matched section keeps the same DOM
+    // node across every query edit, so editing the query cannot cost an extra read or watcher.
+    const mountedHeading = screen.getByText('Grok (xAI)', { exact: true })
+    const watchersAfterMount = fake.watcher.mock.calls.length
+    const statusReadsAfterMount = fake.status.mock.calls.length
+    for (const query of ['g', 'gr', 'gro', 'grok', '', 'g', 'gr', 'gro', 'grok']) {
+      fake.query = query
+      await act(async () => view.rerender(<AccountsPane {...props} />))
+      expect(screen.getByText('Grok (xAI)', { exact: true })).toBe(mountedHeading)
+    }
+    expect(fake.watcher.mock.calls.length).toBe(watchersAfterMount)
+    expect(fake.status.mock.calls.length).toBe(statusReadsAfterMount)
+  }
+)
+it.each([false, true])(
+  'retains Codex login reads with Windows account support %s',
+  async (wslSupportedPlatform) => {
+    const props = {
+      settings: getDefaultSettings('/synthetic'),
+      updateSettings: fake.write,
+      wslSupportedPlatform
+    }
+    const view = render(<AccountsPane {...props} />)
+    await act(async () => {})
+    const mountedHeading = screen.getByText('Codex', { exact: true })
+    const pendingReadsAfterMount = fake.pending.mock.calls.length
+    const subscriptionsAfterMount = fake.subscribe.mock.calls.length
+    for (const query of [
+      'c',
+      'co',
+      'cod',
+      'code',
+      'codex',
+      '',
+      'c',
+      'co',
+      'cod',
+      'code',
+      'codex'
+    ]) {
+      fake.query = query
+      await act(async () => view.rerender(<AccountsPane {...props} />))
+      expect(screen.getByText('Codex', { exact: true })).toBe(mountedHeading)
+    }
+    expect(fake.pending.mock.calls.length).toBe(pendingReadsAfterMount)
+    expect(fake.subscribe.mock.calls.length).toBe(subscriptionsAfterMount)
+  }
+)
+it('preserves explicit Grok refresh and real hide/reopen status reads', async () => {
+  fake.query = 'grok'
+  const props = { settings: getDefaultSettings('/synthetic'), updateSettings: fake.write }
+  const view = render(<AccountsPane {...props} />)
+  await act(async () => {})
+  fireEvent.click(screen.getByRole('button', { name: 'Refresh usage' }))
+  await act(async () => {})
+  expect(fake.refresh).toHaveBeenCalledTimes(1)
+  expect(fake.status).toHaveBeenCalledTimes(2)
+  fake.query = 'codex'
+  await act(async () => view.rerender(<AccountsPane {...props} />))
+  expect(screen.queryByText('Grok (xAI)', { exact: true })).toBeNull()
+  fake.query = 'grok'
+  await act(async () => view.rerender(<AccountsPane {...props} />))
+  expect(fake.status).toHaveBeenCalledTimes(3)
+  expect(fake.write).not.toHaveBeenCalled()
+})
+
+it('keeps usage-driven Grok status refreshes while the section stays mounted', async () => {
+  fake.query = 'grok'
+  const props = { settings: getDefaultSettings('/synthetic'), updateSettings: fake.write }
+  const view = render(<AccountsPane {...props} />)
+  await act(async () => {})
+  fake.grokUsage = { updatedAt: 10 }
+  await act(async () => view.rerender(<AccountsPane {...props} />))
+  expect(fake.status).toHaveBeenCalledTimes(2)
+  fake.query = 'gro'
+  await act(async () => view.rerender(<AccountsPane {...props} />))
+  expect(fake.status).toHaveBeenCalledTimes(2)
+  fake.grokUsage = { updatedAt: 11 }
+  await act(async () => view.rerender(<AccountsPane {...props} />))
+  expect(fake.status).toHaveBeenCalledTimes(3)
+})
+
+it('keeps the login subscription until Codex genuinely hides', async () => {
+  const props = { settings: getDefaultSettings('/synthetic'), updateSettings: fake.write }
+  const view = render(<AccountsPane {...props} />)
+  await act(async () => {})
+  const unsubscribe = fake.subscribe.mock.results[0].value
+  fake.query = 'codex'
+  await act(async () => view.rerender(<AccountsPane {...props} />))
+  expect(unsubscribe).not.toHaveBeenCalled()
+  fake.query = 'grok'
+  await act(async () => view.rerender(<AccountsPane {...props} />))
+  expect(unsubscribe).toHaveBeenCalledTimes(1)
+  fake.query = 'codex'
+  await act(async () => view.rerender(<AccountsPane {...props} />))
+  expect(fake.subscribe).toHaveBeenCalledTimes(2)
+  view.unmount()
+  expect(fake.subscribe.mock.results[1].value).toHaveBeenCalledTimes(1)
+})
+
+it.each([false, true])(
+  'retains Cursor status reads with Windows account support %s',
+  async (wslSupportedPlatform) => {
+    const props = {
+      settings: getDefaultSettings('/synthetic'),
+      updateSettings: fake.write,
+      wslSupportedPlatform
+    }
+    const view = render(<AccountsPane {...props} />)
+    await act(async () => {})
+    const mountedHeading = screen.getByText('Cursor', { exact: true })
+    const statusReadsAfterMount = fake.cursorStatus.mock.calls.length
+    for (const query of ['c', 'cu', 'cur', 'curs', 'curso', 'cursor', '', 'c', 'cu', 'cursor']) {
+      fake.query = query
+      await act(async () => view.rerender(<AccountsPane {...props} />))
+      expect(screen.getByText('Cursor', { exact: true })).toBe(mountedHeading)
+    }
+    expect(fake.cursorStatus.mock.calls.length).toBe(statusReadsAfterMount)
+    expect(fake.write).not.toHaveBeenCalled()
+  }
+)
+
+it('keeps Cursor refresh driven by usage updates and genuine reopen', async () => {
+  fake.query = 'cursor'
+  const props = { settings: getDefaultSettings('/synthetic'), updateSettings: fake.write }
+  const view = render(<AccountsPane {...props} />)
+  await act(async () => {})
+  fireEvent.click(screen.getByRole('button', { name: 'Refresh usage' }))
+  await act(async () => {})
+  expect(fake.cursorRefresh).toHaveBeenCalledTimes(1)
+  expect(fake.cursorStatus).toHaveBeenCalledTimes(1)
+  fake.cursorUsage = { updatedAt: 1 }
+  await act(async () => view.rerender(<AccountsPane {...props} />))
+  expect(fake.cursorStatus).toHaveBeenCalledTimes(2)
+  fake.query = 'codex'
+  await act(async () => view.rerender(<AccountsPane {...props} />))
+  expect(screen.queryByText('Cursor', { exact: true })).toBeNull()
+  fake.query = 'cursor'
+  await act(async () => view.rerender(<AccountsPane {...props} />))
+  expect(fake.cursorStatus).toHaveBeenCalledTimes(3)
+})
diff --git a/src/renderer/src/components/settings/AccountsPane.tsx b/src/renderer/src/components/settings/AccountsPane.tsx
index 7e7bea38d142..a418aa9916ba 100644
--- a/src/renderer/src/components/settings/AccountsPane.tsx
+++ b/src/renderer/src/components/settings/AccountsPane.tsx
@@ -27,6 +27,7 @@ import {
 } from './accounts-search'
 import { getRemoteAccountsPaneScope } from './provider-account-scope'
 import { ProviderHostScopeControl } from './ProviderHostScopeControl'
+import { SettingsSectionStack } from './SettingsSectionStack'
 import { matchesSettingsSearch } from './settings-search'
 import { getCodexAccountAuthWarning } from './codex-account-auth-warning'
 import { getCodexConfigSyncWarning } from './codex-config-sync-warning'
@@ -35,7 +36,6 @@ import {
   providerAccountIsActiveInView,
   providerAccountMatchesView
 } from './provider-account-visibility'
-import { Separator } from '../ui/separator'
 import { GrokAccountsSection } from './GrokAccountsSection'
 import { CursorAccountsSection } from './CursorAccountsSection'
 import type {
@@ -385,17 +385,12 @@ export function AccountsPane({
     matchesSettingsSearch(searchQuery, getAccountsCursorSearchEntries()) ? (
       <CursorAccountsSection key="cursor" />
     ) : null
-  ].filter(Boolean)
+  ]
 
   return (
     <div className="space-y-8">
       {renderAccountsRemovalDialogs(model, removeCodexTarget, removeClaudeTarget)}
-      {visibleSections.map((section, index) => (
-        <div key={index} className="space-y-8">
-          {index > 0 ? <Separator /> : null}
-          {section}
-        </div>
-      ))}
+      <SettingsSectionStack sections={visibleSections} spacing="group" />
     </div>
   )
 }
diff --git a/src/renderer/src/components/settings/AgentsPane.test.tsx b/src/renderer/src/components/settings/AgentsPane.test.tsx
index ada6d8f19387..dc7ae374986f 100644
--- a/src/renderer/src/components/settings/AgentsPane.test.tsx
+++ b/src/renderer/src/components/settings/AgentsPane.test.tsx
@@ -9,6 +9,7 @@ import { useAppStore } from '../../store'
 import { getAgentGeneratedTabTitlesTitle } from './agent-generated-tab-title-copy'
 import { getAgentStatusHooksTitle } from './agent-status-hooks-copy'
 import { getAgentAwakeDescription, getAgentAwakeTitle } from './agent-awake-copy'
+import { getCodexTerminalServerIsolationTitle } from './codex-terminal-server-isolation-copy'
 import { AgentAwakeSetting } from './AgentAwakeSetting'
 import { AgentRuntimeSetting } from './AgentRuntimeSetting'
 import type * as AgentRuntimeSettingModule from './AgentRuntimeSetting'
@@ -263,6 +264,17 @@ describe('AgentsPane', () => {
     }
   })
 
+  it('keeps the host-only Codex server row out of paired web clients', () => {
+    Reflect.set(globalThis, '__ORCA_WEB_CLIENT__', true)
+    try {
+      expect(renderPane(getDefaultSettings('/tmp'))).not.toContain(
+        getCodexTerminalServerIsolationTitle()
+      )
+    } finally {
+      Reflect.deleteProperty(globalThis, '__ORCA_WEB_CLIENT__')
+    }
+  })
+
   it('renders the agent runtime control on Windows-class hosts', () => {
     const markup = renderPane(
       {
diff --git a/src/renderer/src/components/settings/AgentsPane.tsx b/src/renderer/src/components/settings/AgentsPane.tsx
index 59e139973ad0..d7b0bc60ab59 100644
--- a/src/renderer/src/components/settings/AgentsPane.tsx
+++ b/src/renderer/src/components/settings/AgentsPane.tsx
@@ -8,6 +8,7 @@ import { useAppStore } from '@/store'
 import { AgentAwakeSetting } from './AgentAwakeSetting'
 import { AgentCacheTimerSection } from './AgentCacheTimerSection'
 import { AgentRuntimeSetting } from './AgentRuntimeSetting'
+import { CodexTerminalServerIsolationSetting } from './CodexTerminalServerIsolationSetting'
 import { buildCodexSessionSourceHomeControl } from './codex-session-source-home-control'
 import {
   getAgentGeneratedTabTitlesDescription,
@@ -255,6 +256,9 @@ export function AgentsPane({
         wslCapabilitiesLoading={wslCapabilitiesLoading}
       />
       <AgentStatusHooksSetting settings={settings} updateSettings={updateSettings} />
+      {!isPairedWebClientWindow() ? (
+        <CodexTerminalServerIsolationSetting settings={settings} updateSettings={updateSettings} />
+      ) : null}
       <AgentGeneratedTabTitlesSetting settings={settings} updateSettings={updateSettings} />
       {!isPairedWebClientWindow() ? (
         <AgentAwakeSetting settings={settings} updateSettings={updateSettings} />
diff --git a/src/renderer/src/components/settings/CodexTerminalServerIsolationSetting.tsx b/src/renderer/src/components/settings/CodexTerminalServerIsolationSetting.tsx
new file mode 100644
index 000000000000..76c43c88b110
--- /dev/null
+++ b/src/renderer/src/components/settings/CodexTerminalServerIsolationSetting.tsx
@@ -0,0 +1,41 @@
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import { isCodexTerminalServerIsolationEnabled } from '../../../../shared/codex-terminal-server-isolation'
+import { CODEX_TERMINAL_SERVER_ISOLATION_SETTINGS_TARGET_ID } from '@/lib/settings-navigation-types'
+import {
+  getCodexTerminalServerIsolationDescription,
+  getCodexTerminalServerIsolationSearchKeywords,
+  getCodexTerminalServerIsolationTitle
+} from './codex-terminal-server-isolation-copy'
+import { SearchableSetting } from './SearchableSetting'
+import { SettingsSwitchRow } from './SettingsFormControls'
+
+type CodexTerminalServerIsolationSettingProps = {
+  settings: GlobalSettings
+  updateSettings: (updates: Partial<GlobalSettings>) => void | Promise<void>
+}
+
+export function CodexTerminalServerIsolationSetting({
+  settings,
+  updateSettings
+}: CodexTerminalServerIsolationSettingProps): React.JSX.Element {
+  const title = getCodexTerminalServerIsolationTitle()
+  const description = getCodexTerminalServerIsolationDescription()
+  const enabled = isCodexTerminalServerIsolationEnabled(settings)
+  return (
+    <section className="space-y-3">
+      <SearchableSetting
+        id={CODEX_TERMINAL_SERVER_ISOLATION_SETTINGS_TARGET_ID}
+        title={title}
+        description={description}
+        keywords={getCodexTerminalServerIsolationSearchKeywords()}
+      >
+        <SettingsSwitchRow
+          label={title}
+          description={description}
+          checked={enabled}
+          onChange={() => void updateSettings({ codexTerminalServerIsolation: !enabled })}
+        />
+      </SearchableSetting>
+    </section>
+  )
+}
diff --git a/src/renderer/src/components/settings/GeneralPane.section-lifetime.test.tsx b/src/renderer/src/components/settings/GeneralPane.section-lifetime.test.tsx
new file mode 100644
index 000000000000..65311898711d
--- /dev/null
+++ b/src/renderer/src/components/settings/GeneralPane.section-lifetime.test.tsx
@@ -0,0 +1,206 @@
+// @vitest-environment happy-dom
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { getDefaultSettings } from '../../../../shared/constants'
+import { GeneralPane } from './GeneralPane'
+const fake = vi.hoisted(() => ({
+  query: '',
+  getVersion: vi.fn(async () => '1.4.100'),
+  refresh: vi.fn(async () => {}),
+  action: vi.fn(),
+  updates: new Map([
+    ['synthetic-host', { environmentId: 'synthetic-host', phase: 'current', name: 'Synthetic' }]
+  ])
+}))
+vi.mock('@/i18n/i18n', () => ({
+  i18n: { language: 'en' },
+  translate: (_key: string, fallback: string, values?: Record<string, string | number>) =>
+    Object.entries(values ?? {}).reduce(
+      (text, [key, value]) => text.replaceAll(`{{${key}}}`, String(value)),
+      fallback
+    )
+}))
+vi.mock('@/store', () => ({
+  useAppStore: (selector: (state: Record<string, unknown>) => unknown) =>
+    selector({
+      settingsSearchQuery: fake.query,
+      updateStatus: { state: 'idle' },
+      remoteServerUpdates: fake.updates,
+      remoteServerUpdatesChecking: false,
+      remoteServerUpdatesRunning: false,
+      refreshRemoteServerUpdates: fake.refresh,
+      setRemoteServerUpdateDialogOpen: fake.action
+    })
+}))
+vi.mock('@/components/settings/GeneralWorkspaceSettingsSection', () => ({
+  GeneralWorkspaceSettingsSection: () => null
+}))
+vi.mock('@/components/settings/CliSection', () => ({ CliSection: () => null }))
+vi.mock('@/components/settings/GeneralSupportSection', () => ({
+  GeneralSupportSection: () => null
+}))
+vi.mock('@/components/settings/ReleaseChannelSection', () => ({
+  ReleaseChannelSection: () => <div>Release picker open</div>
+}))
+vi.mock('@/components/settings/DefaultWindowsProjectRuntimeSetting', () => ({
+  DefaultWindowsProjectRuntimeSetting: () => null
+}))
+beforeEach(() => {
+  vi.clearAllMocks()
+  fake.query = ''
+  fake.updates = new Map([
+    ['synthetic-host', { environmentId: 'synthetic-host', phase: 'current', name: 'Synthetic' }]
+  ])
+  Object.assign(window, { api: { updater: { getVersion: fake.getVersion } } })
+})
+afterEach(() => {
+  cleanup()
+  Reflect.deleteProperty(window, 'api')
+})
+it.each([false, true])(
+  'retains update sections with Windows runtime support %s',
+  async (wslSupportedPlatform) => {
+    const props = {
+      settings: getDefaultSettings('/synthetic'),
+      updateSettings: vi.fn(),
+      fontSuggestions: [],
+      wslSupportedPlatform
+    }
+    const view = render(<GeneralPane {...props} />)
+    await act(async () => {})
+    // The invariant is identity, not a magic number: the matched section keeps the same DOM
+    // node across every query edit, so editing the query cannot cost an extra read.
+    const mountedHeading = screen.getByText('Updates', { exact: true })
+    const versionReadsAfterMount = fake.getVersion.mock.calls.length
+    const remoteRefreshesAfterMount = fake.refresh.mock.calls.length
+    for (const query of [
+      'u',
+      'up',
+      'upd',
+      'upda',
+      'updat',
+      'update',
+      '',
+      'v',
+      've',
+      'ver',
+      'vers',
+      'versi',
+      'versio',
+      'version'
+    ]) {
+      fake.query = query
+      await act(async () => view.rerender(<GeneralPane {...props} />))
+      expect(screen.getByText('Updates', { exact: true })).toBe(mountedHeading)
+    }
+    expect(fake.getVersion.mock.calls.length).toBe(versionReadsAfterMount)
+    expect(fake.refresh.mock.calls.length).toBe(remoteRefreshesAfterMount)
+  }
+)
+
+it('keeps showing store-published remote update state without a remount', async () => {
+  const props = {
+    settings: getDefaultSettings('/synthetic'),
+    updateSettings: vi.fn(),
+    fontSuggestions: []
+  }
+  fake.query = 'update'
+  const view = render(<GeneralPane {...props} />)
+  await act(async () => {})
+  const mountedHeading = screen.getByText('Updates', { exact: true })
+  expect(screen.getByText('1 paired server · 1 up to date')).toBeTruthy()
+  // Remote update entries live in the store, so a retained section stays fresh through the
+  // subscription rather than through the remount a query edit used to force.
+  fake.updates = new Map([
+    ['synthetic-host', { environmentId: 'synthetic-host', phase: 'available', name: 'Synthetic' }]
+  ])
+  fake.query = 'updat'
+  await act(async () => view.rerender(<GeneralPane {...props} />))
+  expect(screen.getByText('Updates', { exact: true })).toBe(mountedHeading)
+  expect(screen.getByText('1 paired server · 1 ready to update')).toBeTruthy()
+  expect(fake.refresh.mock.calls.length).toBe(1)
+})
+it('keeps explicit remote refresh and true hide/reopen reads', async () => {
+  const props = {
+    settings: getDefaultSettings('/synthetic'),
+    updateSettings: vi.fn(),
+    fontSuggestions: []
+  }
+  const view = render(<GeneralPane {...props} />)
+  await act(async () => {})
+  fireEvent.click(screen.getByRole('button', { name: 'Check for Server Updates' }))
+  expect(fake.refresh).toHaveBeenCalledTimes(2)
+  fake.query = 'Tab Order'
+  await act(async () => view.rerender(<GeneralPane {...props} />))
+  expect(screen.queryByText('Updates', { exact: true })).toBeNull()
+  fake.query = 'update'
+  await act(async () => view.rerender(<GeneralPane {...props} />))
+  expect(fake.getVersion).toHaveBeenCalledTimes(2)
+  expect(fake.refresh).toHaveBeenCalledTimes(3)
+})
+
+it('preserves an autosave draft until external settings change or the section hides', async () => {
+  const settings = { ...getDefaultSettings('/synthetic'), editorAutoSaveDelayMs: 1000 }
+  const props = { settings, updateSettings: vi.fn(), fontSuggestions: [] }
+  const view = render(<GeneralPane {...props} />)
+  await act(async () => {})
+  fireEvent.change(screen.getByRole('spinbutton'), { target: { value: '2500' } })
+  fake.query = 'Auto Save'
+  await act(async () => view.rerender(<GeneralPane {...props} />))
+  expect(screen.getByRole('spinbutton').getAttribute('value')).toBe('2500')
+  expect(props.updateSettings).not.toHaveBeenCalled()
+  const changedProps = { ...props, settings: { ...settings, editorAutoSaveDelayMs: 3000 } }
+  await act(async () => view.rerender(<GeneralPane {...changedProps} />))
+  expect(screen.getByRole('spinbutton').getAttribute('value')).toBe('3000')
+  fireEvent.change(screen.getByRole('spinbutton'), { target: { value: '3500' } })
+  fake.query = 'Tab Order'
+  await act(async () => view.rerender(<GeneralPane {...changedProps} />))
+  expect(screen.queryByRole('spinbutton')).toBeNull()
+  fake.query = 'Auto Save'
+  await act(async () => view.rerender(<GeneralPane {...changedProps} />))
+  expect(screen.getByRole('spinbutton').getAttribute('value')).toBe('3000')
+  expect(props.updateSettings).not.toHaveBeenCalled()
+})
+it('retains the revealed release picker only while Updates remains visible', async () => {
+  const props = {
+    settings: getDefaultSettings('/synthetic'),
+    updateSettings: vi.fn(),
+    fontSuggestions: []
+  }
+  const view = render(<GeneralPane {...props} />)
+  await act(async () => {})
+  fireEvent.click(screen.getByText('Updates', { exact: true }), { altKey: true })
+  expect(screen.getByText('Release picker open')).toBeTruthy()
+  fake.query = 'update'
+  await act(async () => view.rerender(<GeneralPane {...props} />))
+  expect(screen.getByText('Release picker open')).toBeTruthy()
+  fake.query = 'Tab Order'
+  await act(async () => view.rerender(<GeneralPane {...props} />))
+  fake.query = 'update'
+  await act(async () => view.rerender(<GeneralPane {...props} />))
+  expect(screen.queryByText('Release picker open')).toBeNull()
+})
+it('does not publish a version result from a genuinely unmounted section', async () => {
+  let resolveOld: ((value: string) => void) | undefined
+  fake.getVersion.mockImplementationOnce(
+    () =>
+      new Promise<string>((resolve) => {
+        resolveOld = resolve
+      })
+  )
+  const props = {
+    settings: getDefaultSettings('/synthetic'),
+    updateSettings: vi.fn(),
+    fontSuggestions: []
+  }
+  const view = render(<GeneralPane {...props} />)
+  await act(async () => {})
+  fake.query = 'Tab Order'
+  await act(async () => view.rerender(<GeneralPane {...props} />))
+  fake.query = 'update'
+  await act(async () => view.rerender(<GeneralPane {...props} />))
+  expect(screen.getByText('Current version: 1.4.100')).toBeTruthy()
+  await act(async () => resolveOld?.('1.0.0'))
+  expect(screen.getByText('Current version: 1.4.100')).toBeTruthy()
+  expect(screen.queryByText('Current version: 1.0.0')).toBeNull()
+})
diff --git a/src/renderer/src/components/settings/GeneralPane.test.ts b/src/renderer/src/components/settings/GeneralPane.test.ts
index 482fc1df787e..e8fd5ea998bf 100644
--- a/src/renderer/src/components/settings/GeneralPane.test.ts
+++ b/src/renderer/src/components/settings/GeneralPane.test.ts
@@ -4,7 +4,6 @@ import {
   getDesktopPlatformFromUserAgent,
   getGeneralPaneSearchEntries,
   getTabOrderControlSearchKeywords,
-  shouldCommitOpenInApplicationsDraft,
   shouldShowProjectRuntimeSection,
   updateAutoSaveDelayDraftState
 } from './GeneralPane'
@@ -30,36 +29,6 @@ describe('GeneralPane auto-save delay drafts', () => {
   })
 })
 
-describe('GeneralPane open-in application drafts', () => {
-  it('does not commit rows until both label and command are present', () => {
-    expect(
-      shouldCommitOpenInApplicationsDraft([{ id: 'draft', label: 'Cursor', command: '' }])
-    ).toBe(false)
-    expect(
-      shouldCommitOpenInApplicationsDraft([{ id: 'draft', label: '', command: 'cursor' }])
-    ).toBe(false)
-    expect(
-      shouldCommitOpenInApplicationsDraft([{ id: 'draft', label: '   ', command: 'cursor' }])
-    ).toBe(false)
-    expect(
-      shouldCommitOpenInApplicationsDraft([{ id: 'draft', label: 'Cursor', command: '   ' }])
-    ).toBe(false)
-  })
-
-  it('allows commit when every draft row has a label and command', () => {
-    expect(shouldCommitOpenInApplicationsDraft([])).toBe(true)
-    expect(
-      shouldCommitOpenInApplicationsDraft([{ id: 'cursor', label: 'Cursor', command: 'cursor' }])
-    ).toBe(true)
-    expect(
-      shouldCommitOpenInApplicationsDraft([
-        { id: 'cursor', label: 'Cursor', command: 'cursor' },
-        { id: 'zed', label: 'Zed', command: 'zed' }
-      ])
-    ).toBe(true)
-  })
-})
-
 describe('GeneralPane desktop platform detection', () => {
   it('keeps Windows available for Windows-only CLI settings', () => {
     expect(
diff --git a/src/renderer/src/components/settings/GeneralPane.tsx b/src/renderer/src/components/settings/GeneralPane.tsx
index 981e5d530e94..e9b9fc4bc30b 100644
--- a/src/renderer/src/components/settings/GeneralPane.tsx
+++ b/src/renderer/src/components/settings/GeneralPane.tsx
@@ -1,7 +1,6 @@
 import type React from 'react'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import { useAppStore } from '../../store'
-import { Separator } from '../ui/separator'
 import { CliSection } from './CliSection'
 import { GeneralEditorSettingsSection } from './GeneralEditorSettingsSection'
 import { GeneralSupportSection } from './GeneralSupportSection'
@@ -18,6 +17,7 @@ import {
 } from './general-search'
 import { getGeneralProjectRuntimeSearchEntries } from './general-project-runtime-search'
 import { RecentTabOrderControl } from './RecentTabOrderControl'
+import { SettingsSectionStack } from './SettingsSectionStack'
 import { matchesSettingsSearch, type SettingsSearchEntry } from './settings-search'
 import { SearchableSetting } from './SearchableSetting'
 import { SettingsSubsectionHeader, SettingsSwitchRow } from './SettingsFormControls'
@@ -279,18 +279,15 @@ export function GeneralPane({
     // its own loading placeholder and its own collapsing Separator. Without
     // that separation, a dangling divider would remain above the collapsed
     // section.
-  ].filter(Boolean)
+  ]
 
   return (
     <div className="space-y-6">
-      {visibleSections.map((section, index) => (
-        <div key={index} className="space-y-6">
-          {index > 0 ? <Separator /> : null}
-          {section}
-        </div>
-      ))}
+      <SettingsSectionStack sections={visibleSections} spacing="section" />
       {matchesSettingsSearch(searchQuery, getGeneralSupportSearchEntries()) ? (
-        <GeneralSupportSection hasPrecedingSections={visibleSections.length > 0} />
+        <GeneralSupportSection
+          hasPrecedingSections={visibleSections.some((section) => section !== null)}
+        />
       ) : null}
     </div>
   )
diff --git a/src/renderer/src/components/settings/RepositoryHookPolicySettings.tsx b/src/renderer/src/components/settings/RepositoryHookPolicySettings.tsx
index a6bedb5949cf..6a41bdb974e4 100644
--- a/src/renderer/src/components/settings/RepositoryHookPolicySettings.tsx
+++ b/src/renderer/src/components/settings/RepositoryHookPolicySettings.tsx
@@ -141,19 +141,13 @@ export function RepositorySetupPolicySetting({
         />
       </div>
       <div className="flex items-start justify-between gap-4 border-t border-border/60 pt-4">
-        <div className="min-w-0 space-y-1">
+        <div className="min-w-0">
           <h5 className="text-sm font-semibold">
             {translate(
               'auto.components.settings.RepositoryHooksSection.waitForSetupBeforeAgent',
               'Wait for setup to complete before starting agent'
             )}
           </h5>
-          <p className="text-xs text-muted-foreground">
-            {translate(
-              'auto.components.settings.RepositoryHooksSection.waitForSetupBeforeAgentHelp',
-              'Turn this on when setup installs dependencies, MCP servers, or config files the agent needs during startup.'
-            )}
-          </p>
         </div>
         <SettingsSwitch
           checked={setupAgentStartupPolicy === 'wait-for-setup'}
diff --git a/src/renderer/src/components/settings/SettingsSectionStack.tsx b/src/renderer/src/components/settings/SettingsSectionStack.tsx
new file mode 100644
index 000000000000..c243980eafa0
--- /dev/null
+++ b/src/renderer/src/components/settings/SettingsSectionStack.tsx
@@ -0,0 +1,27 @@
+import type { ReactElement } from 'react'
+import { Separator } from '../ui/separator'
+
+// Why: settings panes rebuild their section list from the search query, so a pane-local
+// `key={index}` re-binds every key when an earlier section drops out. React then tears down
+// and remounts each surviving section, discarding its unsaved drafts and re-issuing its
+// loads once per keystroke. Keying by the section's own element key keeps a section that
+// stays matched mounted for the whole search.
+export function SettingsSectionStack({
+  sections,
+  spacing
+}: {
+  sections: readonly (ReactElement | null)[]
+  spacing: 'section' | 'group'
+}): ReactElement {
+  const visibleSections = sections.filter((section): section is ReactElement => section !== null)
+  return (
+    <>
+      {visibleSections.map((section, index) => (
+        <div key={section.key} className={spacing === 'group' ? 'space-y-8' : 'space-y-6'}>
+          {index > 0 ? <Separator /> : null}
+          {section}
+        </div>
+      ))}
+    </>
+  )
+}
diff --git a/src/renderer/src/components/settings/SourceControlActionRepoOverrideNote.test.tsx b/src/renderer/src/components/settings/SourceControlActionRepoOverrideNote.test.tsx
index 095cfc4b550f..c0cc25498194 100644
--- a/src/renderer/src/components/settings/SourceControlActionRepoOverrideNote.test.tsx
+++ b/src/renderer/src/components/settings/SourceControlActionRepoOverrideNote.test.tsx
@@ -5,7 +5,7 @@ import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '../ui/tooltip'
 import { SourceControlActionRepoOverrideNote } from './SourceControlActionRepoOverrideNote'
-import type { SourceControlActionRecipeOverrideSummary } from '@/lib/source-control-launch-agent-selection'
+import type { SourceControlActionRecipeOverrideSummary } from '../../../../shared/source-control-launch-agent-selection'
 
 let container: HTMLDivElement
 let root: Root
diff --git a/src/renderer/src/components/settings/SourceControlActionRepoOverrideNote.tsx b/src/renderer/src/components/settings/SourceControlActionRepoOverrideNote.tsx
index 28fd8cbcdcf9..6ec74d0ee355 100644
--- a/src/renderer/src/components/settings/SourceControlActionRepoOverrideNote.tsx
+++ b/src/renderer/src/components/settings/SourceControlActionRepoOverrideNote.tsx
@@ -5,7 +5,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip'
 import type {
   SourceControlActionRecipeOverrideField,
   SourceControlActionRecipeOverrideSummary
-} from '@/lib/source-control-launch-agent-selection'
+} from '../../../../shared/source-control-launch-agent-selection'
 import { translate } from '@/i18n/i18n'
 
 type SourceControlActionRepoOverrideNoteProps = {
diff --git a/src/renderer/src/components/settings/SourceControlAiActionRecipeDefaults.tsx b/src/renderer/src/components/settings/SourceControlAiActionRecipeDefaults.tsx
index d32ad595194c..ffd28a5131a2 100644
--- a/src/renderer/src/components/settings/SourceControlAiActionRecipeDefaults.tsx
+++ b/src/renderer/src/components/settings/SourceControlAiActionRecipeDefaults.tsx
@@ -21,7 +21,7 @@ import { useRepos } from '@/store/selectors'
 import {
   summarizeReposOverridingActionRecipe,
   type SourceControlActionRecipeOverrideSummary
-} from '@/lib/source-control-launch-agent-selection'
+} from '../../../../shared/source-control-launch-agent-selection'
 import { SearchableSetting } from './SearchableSetting'
 import { getRepositorySourceControlAiActionRecipeSectionId } from './repository-settings-targets'
 import { matchesSettingsSearch } from './settings-search'
diff --git a/src/renderer/src/components/settings/SshPassphraseDialog.tsx b/src/renderer/src/components/settings/SshPassphraseDialog.tsx
index 7f9e2ff61c31..922e795fe28b 100644
--- a/src/renderer/src/components/settings/SshPassphraseDialog.tsx
+++ b/src/renderer/src/components/settings/SshPassphraseDialog.tsx
@@ -61,7 +61,10 @@ export function SshPassphraseDialog(): React.JSX.Element | null {
   )
 
   const handleSubmit = useCallback(async () => {
-    if (!request || !value) {
+    // Why: keyboard-interactive servers may accept an empty response (e.g.
+    // plain Enter to trigger a default MFA push); passwords and passphrases
+    // are never empty.
+    if (!request || (!value && request.kind !== 'keyboard-interactive')) {
       return
     }
     setSubmitting(true)
@@ -186,7 +189,7 @@ export function SshPassphraseDialog(): React.JSX.Element | null {
           <Input
             id="ssh-credential-input"
             ref={setInputRef}
-            type="password"
+            type={isKeyboardInteractive && request.echo ? 'text' : 'password'}
             value={value}
             onChange={(e) => setValue(e.target.value)}
             onKeyDown={(e) => {
@@ -224,7 +227,11 @@ export function SshPassphraseDialog(): React.JSX.Element | null {
           >
             {translate('auto.components.settings.SshPassphraseDialog.d5a234456f', 'Cancel')}
           </Button>
-          <Button size="sm" onClick={() => void handleSubmit()} disabled={!value || submitting}>
+          <Button
+            size="sm"
+            onClick={() => void handleSubmit()}
+            disabled={(!value && !isKeyboardInteractive) || submitting}
+          >
             {isKeyboardInteractive
               ? translate('auto.components.settings.SshPassphraseDialog.c624f64b86', 'Continue')
               : isPassword
diff --git a/src/renderer/src/components/settings/agents-search.ts b/src/renderer/src/components/settings/agents-search.ts
index ed353d5acbfc..6d02eb894e23 100644
--- a/src/renderer/src/components/settings/agents-search.ts
+++ b/src/renderer/src/components/settings/agents-search.ts
@@ -15,6 +15,11 @@ import {
   getAgentStatusHooksTitle
 } from './agent-status-hooks-copy'
 import { getAgentCacheTimerSearchEntries } from './agent-cache-timer-search'
+import {
+  getCodexTerminalServerIsolationDescription,
+  getCodexTerminalServerIsolationSearchKeywords,
+  getCodexTerminalServerIsolationTitle
+} from './codex-terminal-server-isolation-copy'
 import { translate } from '@/i18n/i18n'
 import { searchKeywords, translateSearchKeyword, uniqueKeywords } from './settings-search-keywords'
 import { createLocalizedCatalog } from '@/i18n/localized-catalog'
@@ -62,10 +67,12 @@ function expandAgentSearchText(value: string): string[] {
 type AgentsPaneSearchOptions = {
   includeAgentAwake?: boolean
   includeAgentRuntime?: boolean
+  includeCodexTerminalServerIsolation?: boolean
 }
 
 const AGENT_AWAKE_SEARCH_ENTRY_ID = 'agent-awake'
 const AGENT_RUNTIME_SEARCH_ENTRY_ID = 'agent-runtime'
+const CODEX_TERMINAL_SERVER_ISOLATION_SEARCH_ENTRY_ID = 'codex-terminal-server-isolation'
 
 const getAllAgentsPaneSearchEntries = createLocalizedCatalog(() => [
   {
@@ -108,6 +115,12 @@ const getAllAgentsPaneSearchEntries = createLocalizedCatalog(() => [
     description: getAgentStatusHooksDescription(),
     keywords: getAgentStatusHooksSearchKeywords()
   },
+  {
+    title: getCodexTerminalServerIsolationTitle(),
+    id: CODEX_TERMINAL_SERVER_ISOLATION_SEARCH_ENTRY_ID,
+    description: getCodexTerminalServerIsolationDescription(),
+    keywords: getCodexTerminalServerIsolationSearchKeywords()
+  },
   {
     title: getAgentGeneratedTabTitlesTitle(),
     description: getAgentGeneratedTabTitlesDescription(),
@@ -145,12 +158,20 @@ const getAllAgentsPaneSearchEntries = createLocalizedCatalog(() => [
 
 export function getAgentsPaneSearchEntries({
   includeAgentAwake = true,
-  includeAgentRuntime = true
+  includeAgentRuntime = true,
+  includeCodexTerminalServerIsolation = true
 }: AgentsPaneSearchOptions = {}) {
-  const entries = getAllAgentsPaneSearchEntries()
-  return entries.filter(
-    (entry) =>
-      (!('id' in entry) || entry.id !== AGENT_RUNTIME_SEARCH_ENTRY_ID || includeAgentRuntime) &&
-      (!('id' in entry) || entry.id !== AGENT_AWAKE_SEARCH_ENTRY_ID || includeAgentAwake)
+  const hiddenIds = new Set<string>()
+  if (!includeAgentAwake) {
+    hiddenIds.add(AGENT_AWAKE_SEARCH_ENTRY_ID)
+  }
+  if (!includeAgentRuntime) {
+    hiddenIds.add(AGENT_RUNTIME_SEARCH_ENTRY_ID)
+  }
+  if (!includeCodexTerminalServerIsolation) {
+    hiddenIds.add(CODEX_TERMINAL_SERVER_ISOLATION_SEARCH_ENTRY_ID)
+  }
+  return getAllAgentsPaneSearchEntries().filter(
+    (entry) => !('id' in entry) || !hiddenIds.has(entry.id)
   )
 }
diff --git a/src/renderer/src/components/settings/appearance-status-bar-search.test.ts b/src/renderer/src/components/settings/appearance-status-bar-search.test.ts
index 3518bcba8aac..bc8596d564d3 100644
--- a/src/renderer/src/components/settings/appearance-status-bar-search.test.ts
+++ b/src/renderer/src/components/settings/appearance-status-bar-search.test.ts
@@ -31,6 +31,16 @@ describe('getStatusBarToggles', () => {
     )
   })
 
+  it('includes ZCode quota in Appearance search', () => {
+    const toggle = getStatusBarToggles().find((entry) => entry.id === 'zcode')
+
+    expect(toggle).toMatchObject({
+      title: 'ZCode Usage',
+      toggleDescription: 'Show ZCode Coding Plan quota usage.'
+    })
+    expect(toggle?.keywords).toEqual(expect.arrayContaining(['zcode', 'zai', 'glm']))
+  })
+
   it('includes MiniMax usage so Appearance can toggle the default-on status item', () => {
     const miniMaxToggle = getStatusBarToggles().find((entry) => entry.id === 'minimax')
 
diff --git a/src/renderer/src/components/settings/appearance-status-bar-search.ts b/src/renderer/src/components/settings/appearance-status-bar-search.ts
index 8a4d65f21fd1..16749f4ab311 100644
--- a/src/renderer/src/components/settings/appearance-status-bar-search.ts
+++ b/src/renderer/src/components/settings/appearance-status-bar-search.ts
@@ -6,6 +6,7 @@ import { getAntigravityStatusBarToggleSearchEntry } from './appearance-status-ba
 import { getMiniMaxStatusBarToggleSearchEntry } from './appearance-status-bar-minimax-toggle-search'
 import { getGrokStatusBarToggleSearchEntry } from './appearance-status-bar-grok-toggle-search'
 import { getCursorStatusBarToggleSearchEntry } from './appearance-status-bar-cursor-toggle-search'
+import { getZcodeStatusBarToggleSearchEntry } from './appearance-status-bar-zcode-toggle-search'
 
 export const getStatusBarToggles = createLocalizedCatalog(
   (): readonly {
@@ -169,6 +170,7 @@ export const getStatusBarToggles = createLocalizedCatalog(
     getMiniMaxStatusBarToggleSearchEntry(),
     getGrokStatusBarToggleSearchEntry(),
     getCursorStatusBarToggleSearchEntry(),
+    getZcodeStatusBarToggleSearchEntry(),
     {
       id: 'ssh',
       title: translate('auto.components.settings.appearance.search.57fb424c56', 'Remote Hosts'),
diff --git a/src/renderer/src/components/settings/appearance-status-bar-zcode-toggle-search.ts b/src/renderer/src/components/settings/appearance-status-bar-zcode-toggle-search.ts
new file mode 100644
index 000000000000..1d618a65dc39
--- /dev/null
+++ b/src/renderer/src/components/settings/appearance-status-bar-zcode-toggle-search.ts
@@ -0,0 +1,34 @@
+import type { StatusBarItem } from '../../../../shared/ui-chrome-types'
+import { translate } from '@/i18n/i18n'
+import { translateSearchKeyword } from './settings-search-keywords'
+
+export function getZcodeStatusBarToggleSearchEntry(): {
+  id: StatusBarItem
+  title: string
+  description: string
+  keywords: string[]
+  toggleDescription: string
+} {
+  return {
+    id: 'zcode',
+    title: translate('auto.components.settings.appearance.search.zcodeUsageTitle', 'ZCode Usage'),
+    description: translate(
+      'auto.components.settings.appearance.search.zcodeUsageDescription',
+      'Show ZCode Coding Plan quota usage in the status bar.'
+    ),
+    keywords: [
+      ...translateSearchKeyword(
+        'auto.components.settings.appearance.search.896eb53fd4',
+        'status bar'
+      ),
+      ...translateSearchKeyword('auto.components.settings.appearance.search.zcode', 'zcode'),
+      ...translateSearchKeyword('auto.components.settings.appearance.search.00a028f25f', 'usage'),
+      ...translateSearchKeyword('auto.components.settings.appearance.search.zai', 'zai'),
+      ...translateSearchKeyword('auto.components.settings.appearance.search.glm', 'glm')
+    ],
+    toggleDescription: translate(
+      'settings.appearance.statusBar.zcodeToggleDescription',
+      'Show ZCode Coding Plan quota usage.'
+    )
+  }
+}
diff --git a/src/renderer/src/components/settings/codex-terminal-server-isolation-copy.ts b/src/renderer/src/components/settings/codex-terminal-server-isolation-copy.ts
new file mode 100644
index 000000000000..b48f6de8166d
--- /dev/null
+++ b/src/renderer/src/components/settings/codex-terminal-server-isolation-copy.ts
@@ -0,0 +1,32 @@
+import { translate } from '@/i18n/i18n'
+import { searchKeywords } from './settings-search-keywords'
+
+export function getCodexTerminalServerIsolationTitle(): string {
+  return translate(
+    'settings.agents.codexTerminalServerIsolation.title',
+    'Run each Codex terminal on its own server'
+  )
+}
+
+export function getCodexTerminalServerIsolationDescription(): string {
+  return translate(
+    'settings.agents.codexTerminalServerIsolation.description',
+    "Keeps Orca's status and closing tabs working correctly. Turn off to use Codex's shared server and its agents overview. Applies to new terminals."
+  )
+}
+
+export function getCodexTerminalServerIsolationSearchKeywords(): string[] {
+  return searchKeywords([
+    {
+      key: 'auto.components.settings.agents.search.5ded38b843',
+      fallback: 'codex',
+      englishOnly: true
+    },
+    { key: 'auto.components.settings.agents.search.7e15b89f6e', fallback: 'server' },
+    { key: 'auto.components.settings.agents.search.ff457e1e7b', fallback: 'daemon' },
+    { key: 'auto.components.settings.agents.search.9f3becc4e8', fallback: 'shared' },
+    { key: 'auto.components.settings.agents.search.34337ed5c7', fallback: 'isolate' },
+    { key: 'auto.components.settings.agents.search.9a84e65118', fallback: 'agents overview' },
+    { key: 'auto.components.settings.agents.search.6984d4291a', fallback: 'status' }
+  ])
+}
diff --git a/src/renderer/src/components/settings/worktree-symlink-path-filter.scan-budget.test.ts b/src/renderer/src/components/settings/worktree-symlink-path-filter.scan-budget.test.ts
new file mode 100644
index 000000000000..cde893fca59f
--- /dev/null
+++ b/src/renderer/src/components/settings/worktree-symlink-path-filter.scan-budget.test.ts
@@ -0,0 +1,115 @@
+import { expect, it } from 'vitest'
+import {
+  getWorktreeSymlinkPathFilterState,
+  WORKTREE_SYMLINK_PATH_MAX_SUGGESTIONS
+} from './worktree-symlink-path-filter'
+
+it.each([100, 1_000, 50_000])('bounds matching name reads across %i entries', (size) => {
+  let nameReads = 0
+  const suggestions = Array.from({ length: size }, (_, index) => ({
+    get name() {
+      nameReads++
+      return `package-${index}`
+    },
+    isDirectory: true
+  }))
+  const result = getWorktreeSymlinkPathFilterState({
+    query: 'package',
+    suggestions,
+    existingPaths: []
+  })
+  expect(result.filtered).toHaveLength(WORKTREE_SYMLINK_PATH_MAX_SUGGESTIONS)
+  expect(nameReads).toBe(WORKTREE_SYMLINK_PATH_MAX_SUGGESTIONS * 2)
+  expect(result.filtered[0]).toBe(suggestions[0])
+  expect(result.filtered.at(-1)).toBe(suggestions[49])
+  expect(result.showLiteralItem).toBe(true)
+})
+
+it('keeps the stock filter and slice results, identities and literal choice', () => {
+  const suggestions = Array.from({ length: 120 }, (_, index) => ({
+    name: index % 3 === 0 ? `PACKAGE-${index}` : `other-${index}`,
+    isDirectory: index % 2 === 0
+  }))
+  const limits = [0, 1, 5, 50, 500, -1, -5, 2.8, Number.NaN, Infinity, -Infinity]
+  for (const query of ['', '  /package ', 'OTHER', 'PACKAGE-3', 'missing']) {
+    const queryTrimmed = query.trim().replace(/^\/+/, '')
+    const normalizedQuery = queryTrimmed.toLowerCase()
+    for (const maxSuggestions of limits) {
+      const filtered = (
+        normalizedQuery
+          ? suggestions.filter((entry) => entry.name.toLowerCase().includes(normalizedQuery))
+          : suggestions
+      ).slice(0, maxSuggestions)
+      const result = getWorktreeSymlinkPathFilterState({
+        query,
+        suggestions,
+        existingPaths: ['missing'],
+        maxSuggestions
+      })
+      expect(result).toEqual({
+        queryTrimmed,
+        filtered,
+        showLiteralItem:
+          queryTrimmed.length > 0 &&
+          !filtered.some((entry) => entry.name === queryTrimmed) &&
+          queryTrimmed !== 'missing',
+        isQueryTooLarge: false
+      })
+      expect(result.filtered.every((entry, index) => entry === filtered[index])).toBe(true)
+    }
+  }
+})
+
+it('searches past nonmatches and preserves sparse-array filtering', () => {
+  const suggestions = Array.from({ length: 1_000 }, (_, index) => ({
+    name: index % 30 === 0 ? `target-${index}` : `other-${index}`,
+    isDirectory: true
+  }))
+  delete suggestions[0]
+  const result = getWorktreeSymlinkPathFilterState({
+    query: 'target',
+    suggestions,
+    existingPaths: [],
+    maxSuggestions: 5
+  })
+  expect(result.filtered).toEqual(
+    suggestions.filter((entry) => entry.name.includes('target')).slice(0, 5)
+  )
+  expect(result.filtered.map((entry) => entry.name)).toEqual([
+    'target-30',
+    'target-60',
+    'target-90',
+    'target-120',
+    'target-150'
+  ])
+})
+
+it('does not inspect names when no suggestions can be returned', () => {
+  const result = getWorktreeSymlinkPathFilterState({
+    query: 'target',
+    suggestions: [
+      {
+        get name(): string {
+          throw new Error('a zero result budget must not inspect names')
+        },
+        isDirectory: true
+      }
+    ],
+    existingPaths: [],
+    maxSuggestions: 0
+  })
+  expect(result.filtered).toEqual([])
+  expect(result.showLiteralItem).toBe(true)
+})
+
+it('retains the literal choice when an exact match falls after the visible limit', () => {
+  const suggestions = Array.from({ length: 50 }, (_, index) => ({
+    name: `target-${index}`,
+    isDirectory: true
+  }))
+  suggestions.push({ name: 'target', isDirectory: true })
+  expect(
+    getWorktreeSymlinkPathFilterState({ query: 'target', suggestions, existingPaths: [] })
+      .showLiteralItem
+  ).toBe(true)
+})
diff --git a/src/renderer/src/components/settings/worktree-symlink-path-filter.ts b/src/renderer/src/components/settings/worktree-symlink-path-filter.ts
index 1dc8d393d8db..f50a2f99cd1e 100644
--- a/src/renderer/src/components/settings/worktree-symlink-path-filter.ts
+++ b/src/renderer/src/components/settings/worktree-symlink-path-filter.ts
@@ -44,11 +44,26 @@ export function getWorktreeSymlinkPathFilterState<T extends WorktreeSymlinkPathS
   }
 
   const normalizedQuery = queryTrimmed.toLowerCase()
-  const filtered = (
-    normalizedQuery
-      ? suggestions.filter((entry) => entry.name.toLowerCase().includes(normalizedQuery))
-      : suggestions
-  ).slice(0, maxSuggestions)
+  let filtered: T[]
+  if (normalizedQuery && Number.isInteger(maxSuggestions) && maxSuggestions >= 0) {
+    filtered = []
+    for (let index = 0; index < suggestions.length && filtered.length < maxSuggestions; index++) {
+      if (!(index in suggestions)) {
+        continue
+      }
+      const entry = suggestions[index]
+      if (entry.name.toLowerCase().includes(normalizedQuery)) {
+        filtered.push(entry)
+      }
+    }
+  } else {
+    // Preserve slice semantics for empty queries and unusual caller-supplied limits.
+    filtered = (
+      normalizedQuery
+        ? suggestions.filter((entry) => entry.name.toLowerCase().includes(normalizedQuery))
+        : suggestions
+    ).slice(0, maxSuggestions)
+  }
   const hasExactMatch = filtered.some((entry) => entry.name === queryTrimmed)
 
   return {
diff --git a/src/renderer/src/components/sidebar/DeleteWorktreeDialog.host-context-boundary.test.ts b/src/renderer/src/components/sidebar/DeleteWorktreeDialog.host-context-boundary.test.ts
deleted file mode 100644
index 15f7cc04a984..000000000000
--- a/src/renderer/src/components/sidebar/DeleteWorktreeDialog.host-context-boundary.test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const SOURCE = readFileSync(join(__dirname, 'use-delete-worktree-status-hydration.ts'), 'utf8')
-
-function sourceBetween(source: string, startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start + startPattern.length)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('DeleteWorktreeDialog host-context boundaries', () => {
-  it('preloads git status from the selected worktree owner instead of the focused host', () => {
-    const effect = sourceBetween(SOURCE, 'deleteTargets.filter(', 'return () => {')
-
-    expect(effect).toContain('getSettingsForWorktreeRuntimeOwner')
-    expect(effect).toContain('worktreesByRepo: useAppStore.getState().worktreesByRepo')
-    expect(effect).toContain('target.id')
-    expect(effect).not.toContain('settings,\n        worktreeId: target.id')
-  })
-
-  it('does not restart pending status requests when one target hydrates', () => {
-    const effect = sourceBetween(SOURCE, 'useEffect(() => {', '}, [')
-
-    expect(SOURCE).not.toContain('useAppStore((state) => state.gitStatusByWorktree)')
-    expect(effect).toContain('useAppStore.getState().gitStatusByWorktree')
-    expect(effect).toContain('const controller = new AbortController()')
-    expect(effect).toContain('signal: controller.signal')
-    expect(effect).toContain('controller.abort()')
-  })
-})
diff --git a/src/renderer/src/components/sidebar/StatusIndicator.test.ts b/src/renderer/src/components/sidebar/StatusIndicator.test.ts
index 1c2386156285..668596ef6dd4 100644
--- a/src/renderer/src/components/sidebar/StatusIndicator.test.ts
+++ b/src/renderer/src/components/sidebar/StatusIndicator.test.ts
@@ -36,15 +36,9 @@ describe('StatusIndicator', () => {
   it('renders working as a yellow spinner ring', () => {
     const markup = renderMarkup('working')
 
-    expect(markup).toContain('border-yellow-500')
-    expect(markup).toContain('border-t-transparent')
-    // Why: rotation must come from the compositor-driven CSS animation, not a
-    // JS clock writing per-element styles on the input thread (STA-3328).
-    expect(markup).toContain('agent-working-spinner')
+    // The spinner's own classes and animation contract belong to AgentWorkingSpinner.test.tsx;
+    // this pins only that 'working' reaches for it.
     expect(markup).toContain('data-agent-spinner')
-    // Why: under reduced motion the top border is filled so the static ring
-    // reads as a complete marker, not a broken partial spinner (#9515).
-    expect(markup).toContain('motion-reduce:border-t-yellow-500')
   })
 
   it('renders monitoring as a static heartbeat glyph', () => {
diff --git a/src/renderer/src/components/sidebar/StatusIndicator.tsx b/src/renderer/src/components/sidebar/StatusIndicator.tsx
index fdce0b62f83b..10f65234c6f8 100644
--- a/src/renderer/src/components/sidebar/StatusIndicator.tsx
+++ b/src/renderer/src/components/sidebar/StatusIndicator.tsx
@@ -25,6 +25,7 @@ const AGENT_STATUS_TOOLTIP_STATUSES = new Set<Status>([
   'working',
   'monitoring',
   'permission',
+  'failed',
   'interrupted',
   'done'
 ])
@@ -58,7 +59,7 @@ const StatusIndicator = React.memo(function StatusIndicator({
         <Activity className="size-3 text-yellow-500" aria-hidden="true" />
       </span>
     )
-  } else if (status === 'interrupted') {
+  } else if (status === 'failed' || status === 'interrupted') {
     indicator = (
       <span
         className={cn('inline-flex h-3 w-3 shrink-0 items-center justify-center', className)}
diff --git a/src/renderer/src/components/sidebar/WorktreeCardAgents.acknowledgement-emphasis.test.tsx b/src/renderer/src/components/sidebar/WorktreeCardAgents.acknowledgement-emphasis.test.tsx
new file mode 100644
index 000000000000..1459e7f1bb30
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorktreeCardAgents.acknowledgement-emphasis.test.tsx
@@ -0,0 +1,179 @@
+// @vitest-environment happy-dom
+
+import { renderToStaticMarkup } from 'react-dom/server'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { DashboardAgentRow } from '@/components/dashboard/useDashboardData'
+import { TooltipProvider } from '@/components/ui/tooltip'
+import { makePaneKey } from '../../../../shared/stable-pane-id'
+import {
+  clearWorktreeAgentExpansionStateForTests,
+  seedWorktreeAgentExpansionStateForTests
+} from './worktree-card-agents-expansion-state'
+import WorktreeCardAgents from './WorktreeCardAgents'
+
+const WORKSPACE = 'acknowledgement-workspace'
+const PANE_A = makePaneKey('tab-a', '11111111-1111-4111-8111-111111111111')
+const PANE_B = makePaneKey('tab-b', '22222222-2222-4222-8222-222222222222')
+let acknowledgements: Record<string, number> = {}
+let focusedPaneKey: string | null = null
+
+vi.mock('@/store', () => ({
+  useAppStore: (selector: (state: unknown) => unknown) =>
+    selector({
+      agentActivityDisplayMode: 'compact',
+      acknowledgedAgentsByPaneKey: acknowledgements,
+      agentSendPopoverTargetMode: null,
+      dropAgentStatus: vi.fn(),
+      dismissRetainedAgent: vi.fn(),
+      sendPromptToSidebarAgentTarget: vi.fn()
+    })
+}))
+vi.mock('./useWorktreeAgentRows', () => ({ useWorktreeAgentRows: () => [] }))
+vi.mock('@/lib/worktree-activation', () => ({ activateAndRevealWorktree: vi.fn() }))
+vi.mock('@/lib/activate-tab-and-focus-pane', () => ({ activateTabAndFocusPane: vi.fn() }))
+vi.mock('@/hooks/use-now', () => ({ useNow: () => 5000 }))
+vi.mock('./focused-agent-row-highlight', () => ({
+  useFocusedAgentPaneKey: () => focusedPaneKey
+}))
+vi.mock('@/components/dashboard/use-agent-row-conversation-name', () => ({
+  useAgentRowConversationName: () => null
+}))
+vi.mock('./CacheTimer', () => ({
+  default: () => null,
+  usePromptCacheCountdownForPane: () => null
+}))
+
+function agentRow(
+  paneKey: string,
+  state: DashboardAgentRow['state'] = 'done',
+  entry: Partial<DashboardAgentRow['entry']> = {}
+): DashboardAgentRow {
+  const tabId = paneKey === PANE_A ? 'tab-a' : 'tab-b'
+  return {
+    paneKey,
+    agentType: 'codex',
+    rowSource: 'live',
+    state,
+    startedAt: 1000,
+    tab: {
+      id: tabId,
+      ptyId: null,
+      worktreeId: WORKSPACE,
+      title: tabId,
+      customTitle: null,
+      color: null,
+      sortOrder: 0,
+      createdAt: 1000
+    },
+    entry: {
+      paneKey,
+      worktreeId: WORKSPACE,
+      state: state === 'idle' || state === 'unverifiable' ? 'done' : state,
+      prompt: paneKey === PANE_A ? 'Review agent A' : 'Review agent B',
+      lastAssistantMessage: 'Result details',
+      stateStartedAt: 2000,
+      updatedAt: 2000,
+      stateHistory: [],
+      ...entry
+    }
+  }
+}
+
+function renderLabels(agents: DashboardAgentRow[]): HTMLElement[] {
+  const container = document.createElement('div')
+  container.innerHTML = renderToStaticMarkup(
+    <TooltipProvider>
+      <WorktreeCardAgents worktreeId={WORKSPACE} agents={agents} />
+    </TooltipProvider>
+  )
+  return [
+    ...container.querySelectorAll<HTMLElement>('.compact-agent-row .flex-1 > span:first-child')
+  ]
+}
+
+function expectEmphasis(label: HTMLElement | undefined, unvisited: boolean): void {
+  expect(label).toBeDefined()
+  expect(label?.classList.contains('font-semibold')).toBe(unvisited)
+  expect(label?.classList.contains('font-normal')).toBe(!unvisited)
+  expect(label?.classList.contains('text-foreground')).toBe(unvisited)
+}
+
+beforeEach(() => {
+  acknowledgements = { [PANE_B]: 2000 }
+  focusedPaneKey = null
+  clearWorktreeAgentExpansionStateForTests()
+  seedWorktreeAgentExpansionStateForTests(WORKSPACE, {
+    compactRootListExpanded: true,
+    collapsedLineageParents: new Set()
+  })
+})
+
+describe('compact acknowledgement emphasis through WorktreeCardAgents', () => {
+  it('changes only A when its acknowledgement covers its current turn', () => {
+    const agents = [agentRow(PANE_A), agentRow(PANE_B)]
+    const [aBefore, bBefore] = renderLabels(agents)
+    expectEmphasis(aBefore, true)
+    expectEmphasis(bBefore, false)
+    acknowledgements = { ...acknowledgements, [PANE_A]: 2000 }
+    const [aAfter, bAfter] = renderLabels(agents)
+    expectEmphasis(aAfter, false)
+    expect(bAfter?.outerHTML).toBe(bBefore?.outerHTML)
+  })
+
+  it.each([
+    { ack: undefined, timestamp: 2000, emphasized: true },
+    { ack: 1999, timestamp: 2000, emphasized: true },
+    { ack: 2000, timestamp: 2000, emphasized: false },
+    { ack: 2001, timestamp: 2000, emphasized: false },
+    { ack: undefined, timestamp: 0, emphasized: false }
+  ])('uses ack $ack against timestamp $timestamp', ({ ack, timestamp, emphasized }) => {
+    acknowledgements = ack === undefined ? {} : { [PANE_A]: ack }
+    const [label] = renderLabels([agentRow(PANE_A, 'done', { stateStartedAt: timestamp })])
+    expectEmphasis(label, emphasized)
+  })
+
+  it.each(['working', 'blocked', 'waiting', 'done', 'idle', 'unverifiable'] as const)(
+    'uses the same age rule for %s rows',
+    (state) => {
+      const row = agentRow(PANE_A, state)
+      expectEmphasis(renderLabels([row])[0], true)
+      acknowledgements = { [PANE_A]: 2000 }
+      expectEmphasis(renderLabels([row])[0], false)
+    }
+  )
+
+  it.each([false, true])('preserves focused contrast when unvisited is %s', (unvisited) => {
+    focusedPaneKey = PANE_A
+    acknowledgements = unvisited ? {} : { [PANE_A]: 2000 }
+    const [label] = renderLabels([agentRow(PANE_A)])
+    expect(label?.classList.contains('text-foreground')).toBe(true)
+    expect(label?.classList.contains('font-semibold')).toBe(unvisited)
+    expect(label?.classList.contains('font-normal')).toBe(!unvisited)
+    expect(label?.nextElementSibling?.className).toBe('text-foreground/70')
+  })
+
+  it('emphasizes the monitoring label while preserving prompt ordering', () => {
+    const [label] = renderLabels([agentRow(PANE_A, 'working', { workingMode: 'monitoring' })])
+    expectEmphasis(label, true)
+    expect(label?.textContent).toBe('Monitoring background tasks')
+    expect(label?.nextElementSibling?.textContent).toContain('Review agent A')
+  })
+
+  it('keeps interruption text secondary to the acknowledgement signal', () => {
+    const [label] = renderLabels([agentRow(PANE_A, 'done', { interrupted: true })])
+    expectEmphasis(label, true)
+    expect(label?.nextElementSibling?.textContent).toContain('Interrupted by user')
+  })
+
+  it('does not treat same-state output as a new turn, but admits a newer timestamp', () => {
+    acknowledgements = { [PANE_A]: 2000 }
+    expectEmphasis(renderLabels([agentRow(PANE_A)])[0], false)
+    expectEmphasis(
+      renderLabels([
+        agentRow(PANE_A, 'done', { updatedAt: 3000, lastAssistantMessage: 'More output' })
+      ])[0],
+      false
+    )
+    expectEmphasis(renderLabels([agentRow(PANE_A, 'done', { stateStartedAt: 3000 })])[0], true)
+  })
+})
diff --git a/src/renderer/src/components/sidebar/WorktreeCardAgents.test.tsx b/src/renderer/src/components/sidebar/WorktreeCardAgents.test.tsx
index ffe49ff22e6b..73b9a430bd76 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardAgents.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardAgents.test.tsx
@@ -132,7 +132,6 @@ vi.mock('@/components/dashboard/DashboardAgentRow', () => ({
     childAgentCount,
     childAgentsExpanded,
     onToggleChildAgents,
-    disclosureInGutter,
     onActivate
   }: {
     agent: { paneKey: string }
@@ -143,7 +142,6 @@ vi.mock('@/components/dashboard/DashboardAgentRow', () => ({
     childAgentCount?: number
     childAgentsExpanded?: boolean
     onToggleChildAgents?: () => void
-    disclosureInGutter?: boolean
     onActivate: (tabId: string, paneKey: string) => void
   }) => {
     capturedRowActivations.push({ paneKey: agent.paneKey, onActivate })
@@ -155,7 +153,6 @@ vi.mock('@/components/dashboard/DashboardAgentRow', () => ({
         data-disabled-reason={sendTargetDisabledReason}
         data-has-send-handler={typeof onSendTargetClick === 'function' ? 'true' : 'false'}
         data-pane-key={agent.paneKey}
-        data-disclosure-in-gutter={disclosureInGutter ? 'true' : 'false'}
       >
         {agent.paneKey}
         {typeof childAgentCount === 'number' && childAgentCount > 0 ? (
@@ -222,7 +219,7 @@ describe('WorktreeCardAgents', () => {
     expect(markup).not.toContain('data-testid="agent-row"')
   })
 
-  it('dims non-focused compact agent row text', async () => {
+  it('emphasizes unvisited non-focused compact agent row text', async () => {
     mockAgentActivityDisplayMode = 'compact'
     mockAgents = [
       mockAgent({
@@ -236,7 +233,7 @@ describe('WorktreeCardAgents', () => {
 
     const markup = renderToStaticMarkup(<WorktreeCardAgents worktreeId="wt-1" />)
 
-    expect(markup).toContain('<span class="text-muted-foreground/90">Run tests</span>')
+    expect(markup).toContain('<span class="font-semibold text-foreground">Run tests</span>')
     expect(markup).toContain('<span class="text-muted-foreground/65"> - Inspecting changes</span>')
     expect(markup).not.toContain('data-focused-agent-pane="true"')
     expect(markup).not.toContain('<span class="text-foreground">Run tests</span>')
@@ -258,7 +255,7 @@ describe('WorktreeCardAgents', () => {
     const markup = renderToStaticMarkup(<WorktreeCardAgents worktreeId="wt-1" />)
 
     expect(markup).toContain('data-focused-agent-pane="true"')
-    expect(markup).toContain('<span class="text-foreground">Focused prompt</span>')
+    expect(markup).toContain('<span class="font-semibold text-foreground">Focused prompt</span>')
     expect(markup).toContain('<span class="text-foreground/70"> - Reading output</span>')
     expect(markup).not.toContain('<span class="text-muted-foreground/90">Focused prompt</span>')
   })
@@ -438,8 +435,6 @@ describe('WorktreeCardAgents', () => {
     expect(markup).toContain('role="tree"')
     expect(markup).toContain('data-pane-key="tab-parent:1"')
     expect(markup).toContain('data-pane-key="tab-child:1"')
-    expect(markup).toContain('data-pane-key="tab-parent:1" data-disclosure-in-gutter="true"')
-    expect(markup).toContain('data-pane-key="tab-child:1" data-disclosure-in-gutter="false"')
     expect(markup).toContain('aria-label="Hide 1 child agent"')
     expect(markup).toContain('aria-expanded="true"')
   })
diff --git a/src/renderer/src/components/sidebar/WorktreeCardAgents.tsx b/src/renderer/src/components/sidebar/WorktreeCardAgents.tsx
index f1ba5cf4d529..77918e22b91c 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardAgents.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardAgents.tsx
@@ -245,7 +245,6 @@ const WorktreeCardAgentsBody = React.memo(function WorktreeCardAgentsBody({
     }
     const childAgents = childrenByParentPaneKey.get(agent.paneKey) ?? []
     const hasChildAgents = childAgents.length > 0
-    const isRootAgent = ancestorPaneKeys.size === 0
     // Why: spawned child agents are actionable work, so show them as soon as the parent appears (disclosure still folds noise).
     const expanded = !collapsedLineageParents.has(agent.paneKey)
     const sendTarget = isAgentSendTargetModeActive
@@ -271,14 +270,12 @@ const WorktreeCardAgentsBody = React.memo(function WorktreeCardAgentsBody({
           stateDotSize="sm"
           // Why: clicking the row jumps straight to the agent, so the expand chevron is redundant (keep the identity glyph).
           hideExpand
-          // Why: fold children under the parent row's leading chevron so a parent reads as a tree node (Variant B in the mockups).
+          // Why: child expansion belongs to the parent agent row.
           childAgentCount={hasChildAgents ? childAgents.length : undefined}
           childAgentsExpanded={expanded}
           onToggleChildAgents={
             hasChildAgents ? () => toggleLineageParent(agent.paneKey) : undefined
           }
-          // Why: nested levels keep the chevron inline; their gutter is the parent's guide line.
-          disclosureInGutter={isRootAgent}
           isFocusedPane={agent.paneKey === focusedAgentPaneKey}
           sendTargetStatus={sendTarget?.status}
           sendTargetDisabledReason={sendTarget?.disabledReason}
@@ -307,7 +304,6 @@ const WorktreeCardAgentsBody = React.memo(function WorktreeCardAgentsBody({
     }
     const childAgents = childrenByParentPaneKey.get(agent.paneKey) ?? []
     const hasChildAgents = childAgents.length > 0
-    const isRootAgent = ancestorPaneKeys.size === 0
     const expanded = !collapsedLineageParents.has(agent.paneKey)
     const sendTarget = isAgentSendTargetModeActive
       ? (sendTargetsByPaneKey.get(agent.paneKey) ?? {
@@ -322,6 +318,7 @@ const WorktreeCardAgentsBody = React.memo(function WorktreeCardAgentsBody({
         <CompactAgentRow
           agent={agent}
           now={now}
+          isUnvisited={unvisitedByPaneKey[agent.paneKey] ?? false}
           onActivate={
             agent.rowSource === 'retained' ? handleActivateRetainedAgent : handleActivateAgentTab
           }
@@ -333,7 +330,6 @@ const WorktreeCardAgentsBody = React.memo(function WorktreeCardAgentsBody({
           onToggleChildAgents={
             hasChildAgents ? () => toggleLineageParent(agent.paneKey) : undefined
           }
-          disclosureInGutter={isRootAgent}
           isFocusedPane={agent.paneKey === focusedAgentPaneKey}
           cacheTimerActive={cacheTimerActive}
         />
diff --git a/src/renderer/src/components/sidebar/WorktreeContextMenu.delete-shortcut.test.tsx b/src/renderer/src/components/sidebar/WorktreeContextMenu.delete-shortcut.test.tsx
index c6664b14e2cb..8bdac0ca1437 100644
--- a/src/renderer/src/components/sidebar/WorktreeContextMenu.delete-shortcut.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeContextMenu.delete-shortcut.test.tsx
@@ -79,6 +79,7 @@ vi.mock('lucide-react', async () =>
 )
 
 vi.mock('@/i18n/i18n', () => ({
+  i18n: { language: 'en' },
   translate: (_key: string, fallback: string) => fallback
 }))
 
diff --git a/src/renderer/src/components/sidebar/WorktreeList.lineage-agent-expansion-coupling.test.tsx b/src/renderer/src/components/sidebar/WorktreeList.lineage-agent-expansion-coupling.test.tsx
index a68908e56189..f3cbe8ff0e79 100644
--- a/src/renderer/src/components/sidebar/WorktreeList.lineage-agent-expansion-coupling.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeList.lineage-agent-expansion-coupling.test.tsx
@@ -463,6 +463,8 @@ describe('WorktreeCard agent-list <-> child-worktrees expansion coupling', () =>
       for (const root of mountedRoots.splice(0)) {
         root.unmount()
       }
+      // Lazy markdown imports must finish before Vitest tears down the module environment.
+      await vi.dynamicImportSettled()
     })
     document.body.innerHTML = ''
     clearWorktreeAgentExpansionStateForTests()
diff --git a/src/renderer/src/components/sidebar/__snapshots__/subagent-child-row-fallback-pixels.test.tsx.snap b/src/renderer/src/components/sidebar/__snapshots__/subagent-child-row-fallback-pixels.test.tsx.snap
new file mode 100644
index 000000000000..d1c70a5fee23
--- /dev/null
+++ b/src/renderer/src/components/sidebar/__snapshots__/subagent-child-row-fallback-pixels.test.tsx.snap
@@ -0,0 +1,46 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`chat strip rows from a legacy background-task roster > render exactly as before 1`] = `"<div data-native-chat-background-tasks="true" class="group/tasks shrink-0 bg-background px-3 pt-2 sm:px-4"><div class="mx-auto w-full max-w-4xl [[data-native-chat-background-tasks]:has(+[data-native-chat-thread-goal])_&amp;]:px-2"><div class="overflow-hidden rounded-lg border border-border bg-muted/50 text-xs text-muted-foreground shadow-xs [[data-native-chat-background-tasks]:has(+[data-native-chat-thread-goal])_&amp;]:rounded-b-none [[data-native-chat-background-tasks]:has(+[data-native-chat-thread-goal])_&amp;]:shadow-none"><div class="flex h-8 items-center px-1.5"><button type="button" class="flex h-6 min-w-0 flex-1 cursor-pointer items-center gap-2 rounded-md px-1.5 text-left outline-none hover:bg-accent hover:text-accent-foreground focus-visible:ring-[3px] focus-visible:ring-ring/50" aria-expanded="true" aria-controls="_R_0_" aria-label="8 agents · 1 shell · 1 monitor"><span class="min-w-0 truncate"><span><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot mr-1 inline size-3 align-[-0.125em] text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="font-medium text-foreground">8 agents</span></span><span><span class="text-muted-foreground"> · </span><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-square-terminal mr-1 inline size-3 align-[-0.125em] text-muted-foreground" aria-hidden="true"><path d="m7 11 2-2-2-2"></path><path d="M11 13h4"></path><rect width="18" height="18" x="3" y="3" rx="2" ry="2"></rect></svg><span class="font-medium text-foreground">1 shell</span></span><span><span class="text-muted-foreground"> · </span><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-activity mr-1 inline size-3 align-[-0.125em] text-yellow-500" aria-hidden="true"><path d="M22 12h-2.48a2 2 0 0 0-1.93 1.46l-2.35 8.36a.25.25 0 0 1-.48 0L9.24 2.18a.25.25 0 0 0-.48 0l-2.35 8.36A2 2 0 0 1 4.49 12H2"></path></svg><span class="font-medium text-foreground">1 monitor</span></span></span><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-chevron-down size-3 transition-transform rotate-180" aria-hidden="true"><path d="m6 9 6 6 6-6"></path></svg></button></div><div id="_R_0_" class="scrollbar-sleek max-h-40 overflow-y-auto border-t border-border px-3 py-2"><div class=""><p class="px-0.5 pb-1 font-mono text-[10px] uppercase tracking-wider text-muted-foreground">Agents</p><ul role="list" aria-label="Agents" class="space-y-0.5"><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Blocked"><span class="block rounded-full size-1.5 bg-red-500"></span></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Failed child</span><span class="text-muted-foreground"> · failed</span></span></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="No recent update"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-dashed text-amber-500 size-2.5" aria-hidden="true"><path d="M10.1 2.182a10 10 0 0 1 3.8 0"></path><path d="M13.9 21.818a10 10 0 0 1-3.8 0"></path><path d="M17.609 3.721a10 10 0 0 1 2.69 2.7"></path><path d="M2.182 13.9a10 10 0 0 1 0-3.8"></path><path d="M20.279 17.609a10 10 0 0 1-2.7 2.69"></path><path d="M21.818 10.1a10 10 0 0 1 0 3.8"></path><path d="M3.721 6.391a10 10 0 0 1 2.7-2.69"></path><path d="M6.391 20.279a10 10 0 0 1-2.69-2.7"></path></svg></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Background agent</span><span class="text-muted-foreground"> · no contact</span></span><button data-slot="button" data-variant="ghost" data-size="xs" class="inline-flex shrink-0 items-center justify-center cursor-pointer font-medium whitespace-nowrap transition-all outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&amp;_svg]:pointer-events-none [&amp;_svg]:shrink-0 hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50 h-6 gap-1 rounded-md px-2 text-xs has-[&gt;svg]:px-1.5 [&amp;_svg:not([class*=&#x27;size-&#x27;])]:size-3" type="button" aria-label="Stop Background agent">Stop</button></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Idle"><span class="block rounded-full size-1.5 bg-neutral-500/40"></span></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Cancelled child</span></span></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Waiting for input"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-message-circle-question-mark text-agent-question size-2.5" aria-hidden="true"><path d="M2.992 16.342a2 2 0 0 1 .094 1.167l-1.065 3.29a1 1 0 0 0 1.236 1.168l3.413-.998a2 2 0 0 1 1.099.092 10 10 0 1 0-4.777-4.719"></path><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><path d="M12 17h.01"></path></svg></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Approve edits</span><span class="text-muted-foreground"> · needs approval</span></span><button data-slot="button" data-variant="ghost" data-size="xs" class="inline-flex shrink-0 items-center justify-center cursor-pointer font-medium whitespace-nowrap transition-all outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&amp;_svg]:pointer-events-none [&amp;_svg]:shrink-0 hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50 h-6 gap-1 rounded-md px-2 text-xs has-[&gt;svg]:px-1.5 [&amp;_svg:not([class*=&#x27;size-&#x27;])]:size-3" type="button" aria-label="Stop Approve edits">Stop</button></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Done"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-check text-emerald-500 size-2.5" aria-hidden="true"><circle cx="12" cy="12" r="10"></circle><path d="m9 12 2 2 4-4"></path></svg></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Summarize logs</span></span><span class="shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">900</span></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Working"><span data-agent-spinner="" class="agent-working-spinner block rounded-full border-2 border-yellow-500 border-t-transparent motion-reduce:border-t-yellow-500 size-1.5"></span></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Review the parser</span></span><span class="shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">18.2k · 10m 0s</span><button data-slot="button" data-variant="ghost" data-size="xs" class="inline-flex shrink-0 items-center justify-center cursor-pointer font-medium whitespace-nowrap transition-all outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&amp;_svg]:pointer-events-none [&amp;_svg]:shrink-0 hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50 h-6 gap-1 rounded-md px-2 text-xs has-[&gt;svg]:px-1.5 [&amp;_svg:not([class*=&#x27;size-&#x27;])]:size-3" type="button" aria-label="Stop Review the parser" disabled="">Stop</button></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Blocked"><span class="block rounded-full size-1.5 bg-red-500"></span></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Explore</span><span class="text-muted-foreground"> · failed</span></span><span class="shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">8m 20s</span><button data-slot="button" data-variant="ghost" data-size="xs" class="inline-flex shrink-0 items-center justify-center cursor-pointer font-medium whitespace-nowrap transition-all outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&amp;_svg]:pointer-events-none [&amp;_svg]:shrink-0 hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50 h-6 gap-1 rounded-md px-2 text-xs has-[&gt;svg]:px-1.5 [&amp;_svg:not([class*=&#x27;size-&#x27;])]:size-3" type="button" aria-label="Stop Explore">Stop</button></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Working"><span data-agent-spinner="" class="agent-working-spinner block rounded-full border-2 border-yellow-500 border-t-transparent motion-reduce:border-t-yellow-500 size-1.5"></span></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Old host child</span></span><span class="shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">6m 40s</span><button data-slot="button" data-variant="ghost" data-size="xs" class="inline-flex shrink-0 items-center justify-center cursor-pointer font-medium whitespace-nowrap transition-all outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&amp;_svg]:pointer-events-none [&amp;_svg]:shrink-0 hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50 h-6 gap-1 rounded-md px-2 text-xs has-[&gt;svg]:px-1.5 [&amp;_svg:not([class*=&#x27;size-&#x27;])]:size-3" type="button" aria-label="Stop Old host child">Stop</button></li></ul></div><div class="mt-1.5 border-t border-border/60 pt-1.5"><p class="px-0.5 pb-1 font-mono text-[10px] uppercase tracking-wider text-muted-foreground">Shell</p><ul role="list" aria-label="Shell" class="space-y-0.5"><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-square-terminal size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="m7 11 2-2-2-2"></path><path d="M11 13h4"></path><rect width="18" height="18" x="3" y="3" rx="2" ry="2"></rect></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Working"><span data-agent-spinner="" class="agent-working-spinner block rounded-full border-2 border-yellow-500 border-t-transparent motion-reduce:border-t-yellow-500 size-1.5"></span></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">npm run dev</span></span><span class="shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">11m 40s</span></li></ul></div><div class="mt-1.5 border-t border-border/60 pt-1.5"><p class="px-0.5 pb-1 font-mono text-[10px] uppercase tracking-wider text-muted-foreground">Monitors</p><ul role="list" aria-label="Monitors" class="space-y-0.5"><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-activity size-3.5 shrink-0 text-yellow-500" aria-hidden="true"><path d="M22 12h-2.48a2 2 0 0 0-1.93 1.46l-2.35 8.36a.25.25 0 0 1-.48 0L9.24 2.18a.25.25 0 0 0-.48 0l-2.35 8.36A2 2 0 0 1 4.49 12H2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Monitoring background tasks"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-activity text-yellow-500 size-2.5" aria-hidden="true"><path d="M22 12h-2.48a2 2 0 0 0-1.93 1.46l-2.35 8.36a.25.25 0 0 1-.48 0L9.24 2.18a.25.25 0 0 0-.48 0l-2.35 8.36A2 2 0 0 1 4.49 12H2"></path></svg></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">tail -f server.log</span></span><button data-slot="button" data-variant="ghost" data-size="xs" class="inline-flex shrink-0 items-center justify-center cursor-pointer font-medium whitespace-nowrap transition-all outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&amp;_svg]:pointer-events-none [&amp;_svg]:shrink-0 hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50 h-6 gap-1 rounded-md px-2 text-xs has-[&gt;svg]:px-1.5 [&amp;_svg:not([class*=&#x27;size-&#x27;])]:size-3" type="button" aria-label="Stop tail -f server.log">Stop</button></li></ul></div></div></div></div></div>"`;
+
+exports[`chat strip rows from a legacy background-task roster > render exactly as before 2`] = `"<div data-native-chat-background-tasks="true" class="group/tasks shrink-0 bg-background px-3 pt-2 sm:px-4"><div class="mx-auto w-full max-w-4xl [[data-native-chat-background-tasks]:has(+[data-native-chat-thread-goal])_&amp;]:px-2"><div class="overflow-hidden rounded-lg border border-border bg-muted/50 text-xs text-muted-foreground shadow-xs [[data-native-chat-background-tasks]:has(+[data-native-chat-thread-goal])_&amp;]:rounded-b-none [[data-native-chat-background-tasks]:has(+[data-native-chat-thread-goal])_&amp;]:shadow-none"><div class="flex h-8 items-center px-1.5"><button type="button" class="flex h-6 min-w-0 flex-1 cursor-pointer items-center gap-2 rounded-md px-1.5 text-left outline-none hover:bg-accent hover:text-accent-foreground focus-visible:ring-[3px] focus-visible:ring-ring/50" aria-expanded="true" aria-controls="_R_0_" aria-label="8 agents · 1 shell · 1 monitor"><span class="min-w-0 truncate"><span><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot mr-1 inline size-3 align-[-0.125em] text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="font-medium text-foreground">8 agents</span></span><span><span class="text-muted-foreground"> · </span><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-square-terminal mr-1 inline size-3 align-[-0.125em] text-muted-foreground" aria-hidden="true"><path d="m7 11 2-2-2-2"></path><path d="M11 13h4"></path><rect width="18" height="18" x="3" y="3" rx="2" ry="2"></rect></svg><span class="font-medium text-foreground">1 shell</span></span><span><span class="text-muted-foreground"> · </span><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-activity mr-1 inline size-3 align-[-0.125em] text-yellow-500" aria-hidden="true"><path d="M22 12h-2.48a2 2 0 0 0-1.93 1.46l-2.35 8.36a.25.25 0 0 1-.48 0L9.24 2.18a.25.25 0 0 0-.48 0l-2.35 8.36A2 2 0 0 1 4.49 12H2"></path></svg><span class="font-medium text-foreground">1 monitor</span></span></span><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-chevron-down size-3 transition-transform rotate-180" aria-hidden="true"><path d="m6 9 6 6 6-6"></path></svg></button></div><div id="_R_0_" class="scrollbar-sleek max-h-40 overflow-y-auto border-t border-border px-3 py-2"><div class=""><p class="px-0.5 pb-1 font-mono text-[10px] uppercase tracking-wider text-muted-foreground">Agents</p><ul role="list" aria-label="Agents" class="space-y-0.5"><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Blocked"><span class="block rounded-full size-1.5 bg-red-500"></span></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Failed child</span><span class="text-muted-foreground"> · failed</span></span></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="No recent update"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-dashed text-amber-500 size-2.5" aria-hidden="true"><path d="M10.1 2.182a10 10 0 0 1 3.8 0"></path><path d="M13.9 21.818a10 10 0 0 1-3.8 0"></path><path d="M17.609 3.721a10 10 0 0 1 2.69 2.7"></path><path d="M2.182 13.9a10 10 0 0 1 0-3.8"></path><path d="M20.279 17.609a10 10 0 0 1-2.7 2.69"></path><path d="M21.818 10.1a10 10 0 0 1 0 3.8"></path><path d="M3.721 6.391a10 10 0 0 1 2.7-2.69"></path><path d="M6.391 20.279a10 10 0 0 1-2.69-2.7"></path></svg></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Background agent</span><span class="text-muted-foreground"> · no contact</span></span></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Idle"><span class="block rounded-full size-1.5 bg-neutral-500/40"></span></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Cancelled child</span></span></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Waiting for input"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-message-circle-question-mark text-agent-question size-2.5" aria-hidden="true"><path d="M2.992 16.342a2 2 0 0 1 .094 1.167l-1.065 3.29a1 1 0 0 0 1.236 1.168l3.413-.998a2 2 0 0 1 1.099.092 10 10 0 1 0-4.777-4.719"></path><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><path d="M12 17h.01"></path></svg></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Approve edits</span><span class="text-muted-foreground"> · needs approval</span></span></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Done"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-check text-emerald-500 size-2.5" aria-hidden="true"><circle cx="12" cy="12" r="10"></circle><path d="m9 12 2 2 4-4"></path></svg></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Summarize logs</span></span><span class="shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">900</span></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Working"><span data-agent-spinner="" class="agent-working-spinner block rounded-full border-2 border-yellow-500 border-t-transparent motion-reduce:border-t-yellow-500 size-1.5"></span></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Review the parser</span></span><span class="shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">18.2k · 10m 0s</span></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Blocked"><span class="block rounded-full size-1.5 bg-red-500"></span></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Explore</span><span class="text-muted-foreground"> · failed</span></span><span class="shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">8m 20s</span></li><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Working"><span data-agent-spinner="" class="agent-working-spinner block rounded-full border-2 border-yellow-500 border-t-transparent motion-reduce:border-t-yellow-500 size-1.5"></span></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">Old host child</span></span><span class="shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">6m 40s</span></li></ul></div><div class="mt-1.5 border-t border-border/60 pt-1.5"><p class="px-0.5 pb-1 font-mono text-[10px] uppercase tracking-wider text-muted-foreground">Shell</p><ul role="list" aria-label="Shell" class="space-y-0.5"><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-square-terminal size-3.5 shrink-0 text-muted-foreground" aria-hidden="true"><path d="m7 11 2-2-2-2"></path><path d="M11 13h4"></path><rect width="18" height="18" x="3" y="3" rx="2" ry="2"></rect></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Working"><span data-agent-spinner="" class="agent-working-spinner block rounded-full border-2 border-yellow-500 border-t-transparent motion-reduce:border-t-yellow-500 size-1.5"></span></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">npm run dev</span></span><span class="shrink-0 font-mono text-[10px] tabular-nums text-muted-foreground">11m 40s</span></li></ul></div><div class="mt-1.5 border-t border-border/60 pt-1.5"><p class="px-0.5 pb-1 font-mono text-[10px] uppercase tracking-wider text-muted-foreground">Monitors</p><ul role="list" aria-label="Monitors" class="space-y-0.5"><li class="flex h-6 min-w-0 items-center gap-2 text-foreground/80"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-activity size-3.5 shrink-0 text-yellow-500" aria-hidden="true"><path d="M22 12h-2.48a2 2 0 0 0-1.93 1.46l-2.35 8.36a.25.25 0 0 1-.48 0L9.24 2.18a.25.25 0 0 0-.48 0l-2.35 8.36A2 2 0 0 1 4.49 12H2"></path></svg><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Monitoring background tasks"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-activity text-yellow-500 size-2.5" aria-hidden="true"><path d="M22 12h-2.48a2 2 0 0 0-1.93 1.46l-2.35 8.36a.25.25 0 0 1-.48 0L9.24 2.18a.25.25 0 0 0-.48 0l-2.35 8.36A2 2 0 0 1 4.49 12H2"></path></svg></span><span class="min-w-0 flex-1 truncate"><span class="font-medium text-foreground">tail -f server.log</span></span></li></ul></div><div class="mt-2 border-t border-border pt-2"><button data-slot="button" data-variant="ghost" data-size="xs" class="inline-flex shrink-0 items-center justify-center cursor-pointer font-medium whitespace-nowrap transition-all outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&amp;_svg]:pointer-events-none [&amp;_svg]:shrink-0 hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50 h-6 gap-1 rounded-md px-2 text-xs has-[&gt;svg]:px-1.5 [&amp;_svg:not([class*=&#x27;size-&#x27;])]:size-3" type="button" aria-label="Stop background tasks">Stop</button></div></div></div></div></div>"`;
+
+exports[`sidebar child rows from a legacy subagents snapshot > render a stale parent and a lost transport exactly as before 1`] = `
+[
+  "<div draggable="false" class="compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover flex h-6 items-center gap-1"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="No recent update" data-state="closed" data-slot="tooltip-trigger"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-dashed text-amber-500 size-2.5" aria-hidden="true"><path d="M10.1 2.182a10 10 0 0 1 3.8 0"></path><path d="M13.9 21.818a10 10 0 0 1-3.8 0"></path><path d="M17.609 3.721a10 10 0 0 1 2.69 2.7"></path><path d="M2.182 13.9a10 10 0 0 1 0-3.8"></path><path d="M20.279 17.609a10 10 0 0 1-2.7 2.69"></path><path d="M21.818 10.1a10 10 0 0 1 0 3.8"></path><path d="M3.721 6.391a10 10 0 0 1 2.7-2.69"></path><path d="M6.391 20.279a10 10 0 0 1-2.69-2.7"></path></svg></span><span class="min-w-0 flex-1 truncate" title="Review the parser - No update in 5m"><span class="font-normal text-muted-foreground/90">Review the parser</span><span class="text-muted-foreground/65"> - No update in 5m</span></span><span class="min-w-0 max-w-24 truncate font-mono text-[10px] text-muted-foreground/70" title="claude-sonnet">claude-sonnet</span><span class="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">10m</span></div>",
+  "<div draggable="false" class="compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover flex h-6 items-center gap-1"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="No recent update" data-state="closed" data-slot="tooltip-trigger"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-dashed text-amber-500 size-2.5" aria-hidden="true"><path d="M10.1 2.182a10 10 0 0 1 3.8 0"></path><path d="M13.9 21.818a10 10 0 0 1-3.8 0"></path><path d="M17.609 3.721a10 10 0 0 1 2.69 2.7"></path><path d="M2.182 13.9a10 10 0 0 1 0-3.8"></path><path d="M20.279 17.609a10 10 0 0 1-2.7 2.69"></path><path d="M21.818 10.1a10 10 0 0 1 0 3.8"></path><path d="M3.721 6.391a10 10 0 0 1 2.7-2.69"></path><path d="M6.391 20.279a10 10 0 0 1-2.69-2.7"></path></svg></span><span class="min-w-0 flex-1 truncate" title="Explore - No update in 5m"><span class="font-normal text-muted-foreground/90">Explore</span><span class="text-muted-foreground/65"> - No update in 5m</span></span><span class="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">8m</span></div>",
+  "<div draggable="false" class="compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover flex h-6 items-center gap-1"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="No recent update" data-state="closed" data-slot="tooltip-trigger"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-dashed text-amber-500 size-2.5" aria-hidden="true"><path d="M10.1 2.182a10 10 0 0 1 3.8 0"></path><path d="M13.9 21.818a10 10 0 0 1-3.8 0"></path><path d="M17.609 3.721a10 10 0 0 1 2.69 2.7"></path><path d="M2.182 13.9a10 10 0 0 1 0-3.8"></path><path d="M20.279 17.609a10 10 0 0 1-2.7 2.69"></path><path d="M21.818 10.1a10 10 0 0 1 0 3.8"></path><path d="M3.721 6.391a10 10 0 0 1 2.7-2.69"></path><path d="M6.391 20.279a10 10 0 0 1-2.69-2.7"></path></svg></span><span class="min-w-0 flex-1 truncate" title="No recent update - No update in 5m"><span class="font-normal text-muted-foreground/90">No recent update</span><span class="text-muted-foreground/65"> - No update in 5m</span></span><span class="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">16m</span></div>",
+  "<div draggable="false" class="compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover flex h-6 items-center gap-1"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="No recent update" data-state="closed" data-slot="tooltip-trigger"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-dashed text-amber-500 size-2.5" aria-hidden="true"><path d="M10.1 2.182a10 10 0 0 1 3.8 0"></path><path d="M13.9 21.818a10 10 0 0 1-3.8 0"></path><path d="M17.609 3.721a10 10 0 0 1 2.69 2.7"></path><path d="M2.182 13.9a10 10 0 0 1 0-3.8"></path><path d="M20.279 17.609a10 10 0 0 1-2.7 2.69"></path><path d="M21.818 10.1a10 10 0 0 1 0 3.8"></path><path d="M3.721 6.391a10 10 0 0 1 2.7-2.69"></path><path d="M6.391 20.279a10 10 0 0 1-2.69-2.7"></path></svg></span><span class="min-w-0 flex-1 truncate" title="Approve edits - No update in 5m"><span class="font-normal text-muted-foreground/90">Approve edits</span><span class="text-muted-foreground/65"> - No update in 5m</span></span><span class="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">6m</span></div>",
+  "<div draggable="false" class="compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover flex h-6 items-center gap-1"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="No recent update" data-state="closed" data-slot="tooltip-trigger"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-dashed text-amber-500 size-2.5" aria-hidden="true"><path d="M10.1 2.182a10 10 0 0 1 3.8 0"></path><path d="M13.9 21.818a10 10 0 0 1-3.8 0"></path><path d="M17.609 3.721a10 10 0 0 1 2.69 2.7"></path><path d="M2.182 13.9a10 10 0 0 1 0-3.8"></path><path d="M20.279 17.609a10 10 0 0 1-2.7 2.69"></path><path d="M21.818 10.1a10 10 0 0 1 0 3.8"></path><path d="M3.721 6.391a10 10 0 0 1 2.7-2.69"></path><path d="M6.391 20.279a10 10 0 0 1-2.69-2.7"></path></svg></span><span class="min-w-0 flex-1 truncate" title="Review the parser - No update in 5m"><span class="font-normal text-muted-foreground/90">Review the parser</span><span class="text-muted-foreground/65"> - No update in 5m</span></span><span class="min-w-0 max-w-24 truncate font-mono text-[10px] text-muted-foreground/70" title="claude-sonnet">claude-sonnet</span><span class="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">10m</span></div>",
+]
+`;
+
+exports[`sidebar child rows from a legacy subagents snapshot > render the compact rows exactly as before 1`] = `
+[
+  "<div draggable="false" class="compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover flex h-6 items-center gap-1"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Working" data-state="closed" data-slot="tooltip-trigger"><span data-agent-spinner="" class="agent-working-spinner block rounded-full border-2 border-yellow-500 border-t-transparent motion-reduce:border-t-yellow-500 size-1.5"></span></span><span class="min-w-0 flex-1 truncate" title="Review the parser - general-purpose"><span class="font-normal text-muted-foreground/90">Review the parser</span><span class="text-muted-foreground/65"> - general-purpose</span></span><span class="min-w-0 max-w-24 truncate font-mono text-[10px] text-muted-foreground/70" title="claude-sonnet">claude-sonnet</span><span class="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">10m</span></div>",
+  "<div draggable="false" class="compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover flex h-6 items-center gap-1"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Working" data-state="closed" data-slot="tooltip-trigger"><span data-agent-spinner="" class="agent-working-spinner block rounded-full border-2 border-yellow-500 border-t-transparent motion-reduce:border-t-yellow-500 size-1.5"></span></span><span class="min-w-0 flex-1 truncate" title="Explore"><span class="font-normal text-muted-foreground/90">Explore</span></span><span class="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">8m</span></div>",
+  "<div draggable="false" class="compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover flex h-6 items-center gap-1"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Working" data-state="closed" data-slot="tooltip-trigger"><span data-agent-spinner="" class="agent-working-spinner block rounded-full border-2 border-yellow-500 border-t-transparent motion-reduce:border-t-yellow-500 size-1.5"></span></span><span class="min-w-0 flex-1 truncate" title="Working - Agent"><span class="font-normal text-muted-foreground/90">Working</span><span class="text-muted-foreground/65"> - Agent</span></span><span class="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">16m</span></div>",
+  "<div draggable="false" class="compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover flex h-6 items-center gap-1"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Waiting for input" data-state="closed" data-slot="tooltip-trigger"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-message-circle-question-mark text-agent-question size-2.5" aria-hidden="true"><path d="M2.992 16.342a2 2 0 0 1 .094 1.167l-1.065 3.29a1 1 0 0 0 1.236 1.168l3.413-.998a2 2 0 0 1 1.099.092 10 10 0 1 0-4.777-4.719"></path><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><path d="M12 17h.01"></path></svg></span><span class="min-w-0 flex-1 truncate" title="Approve edits - Agent"><span class="font-normal text-muted-foreground/90">Approve edits</span><span class="text-muted-foreground/65"> - Agent</span></span><span class="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">6m</span></div>",
+  "<div draggable="false" class="compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover flex h-6 items-center gap-1"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Blocked" data-state="closed" data-slot="tooltip-trigger"><span class="block rounded-full size-1.5 bg-red-500"></span></span><span class="min-w-0 flex-1 truncate" title="Rate limited - Agent"><span class="font-normal text-muted-foreground/90">Rate limited</span><span class="text-muted-foreground/65"> - Agent</span></span><span class="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">6m</span></div>",
+  "<div draggable="false" class="compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover flex h-6 items-center gap-1"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Idle" data-state="closed" data-slot="tooltip-trigger"><span class="block rounded-full size-1.5 bg-neutral-500/40"></span></span><span class="min-w-0 flex-1 truncate" title="Teammate - writer"><span class="font-normal text-muted-foreground/90">Teammate</span><span class="text-muted-foreground/65"> - writer</span></span><span class="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">6m</span></div>",
+  "<div draggable="false" class="compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover flex h-6 items-center gap-1"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="No recent update" data-state="closed" data-slot="tooltip-trigger"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-dashed text-amber-500 size-2.5" aria-hidden="true"><path d="M10.1 2.182a10 10 0 0 1 3.8 0"></path><path d="M13.9 21.818a10 10 0 0 1-3.8 0"></path><path d="M17.609 3.721a10 10 0 0 1 2.69 2.7"></path><path d="M2.182 13.9a10 10 0 0 1 0-3.8"></path><path d="M20.279 17.609a10 10 0 0 1-2.7 2.69"></path><path d="M21.818 10.1a10 10 0 0 1 0 3.8"></path><path d="M3.721 6.391a10 10 0 0 1 2.7-2.69"></path><path d="M6.391 20.279a10 10 0 0 1-2.69-2.7"></path></svg></span><span class="min-w-0 flex-1 truncate" title="Lost child - No update in 5m"><span class="font-normal text-muted-foreground/90">Lost child</span><span class="text-muted-foreground/65"> - No update in 5m</span></span><span class="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">6m</span></div>",
+]
+`;
+
+exports[`sidebar child rows from a legacy subagents snapshot > render the full rows exactly as before 1`] = `
+[
+  "<div class="agent-disclosure-row group/agent-row relative -ml-2 flex flex-col py-1 px-2 cursor-pointer rounded-sm worktree-agent-row-hover" title="started 10m ago"><div class="flex items-center gap-1.5"><span class="inline-flex shrink-0 items-center justify-center" aria-label="Working" data-state="closed" data-slot="tooltip-trigger"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Working"><span data-agent-spinner="" class="agent-working-spinner block rounded-full border-2 border-yellow-500 border-t-transparent motion-reduce:border-t-yellow-500 size-1.5"></span></span></span><span class="block min-w-0 flex-1 overflow-hidden text-[11px] leading-snug transition-[height] duration-200 ease-out [interpolate-size:allow-keywords] h-[1lh] truncate font-normal text-muted-foreground" title="Review the parser">Review the parser</span><span class="max-w-24 shrink-0 truncate font-mono text-[10px] text-muted-foreground/70" title="claude-sonnet">claude-sonnet</span><span class="relative ml-auto flex shrink-0 items-center justify-end h-3.5 w-12"><span class="pointer-events-none shrink-0 text-[10px] leading-none text-muted-foreground/60" aria-hidden="true">10m ago</span></span></div><div data-agent-row-tool-slot="" class="mt-0.5 min-w-0 pl-5 text-[10px] leading-snug text-muted-foreground/70"><span data-agent-row-tool-placeholder="true" aria-hidden="true" class="block h-[1lh]"></span></div><div class="mt-0.5 pl-5 text-[10px] leading-snug text-muted-foreground/70"> </div></div>",
+  "<div class="agent-disclosure-row group/agent-row relative -ml-2 flex flex-col py-1 px-2 cursor-pointer rounded-sm worktree-agent-row-hover" title="started 8m ago"><div class="flex items-center gap-1.5"><span class="inline-flex shrink-0 items-center justify-center" aria-label="Working" data-state="closed" data-slot="tooltip-trigger"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Working"><span data-agent-spinner="" class="agent-working-spinner block rounded-full border-2 border-yellow-500 border-t-transparent motion-reduce:border-t-yellow-500 size-1.5"></span></span></span><span class="block min-w-0 flex-1 overflow-hidden text-[11px] leading-snug transition-[height] duration-200 ease-out [interpolate-size:allow-keywords] h-[1lh] truncate font-normal text-muted-foreground" title="Explore">Explore</span><span class="relative ml-auto flex shrink-0 items-center justify-end h-3.5 w-12"><span class="pointer-events-none shrink-0 text-[10px] leading-none text-muted-foreground/60" aria-hidden="true">8m ago</span></span></div><div data-agent-row-tool-slot="" class="mt-0.5 min-w-0 pl-5 text-[10px] leading-snug text-muted-foreground/70"><span data-agent-row-tool-placeholder="true" aria-hidden="true" class="block h-[1lh]"></span></div><div class="mt-0.5 pl-5 text-[10px] leading-snug text-muted-foreground/70"> </div></div>",
+  "<div class="agent-disclosure-row group/agent-row relative -ml-2 flex flex-col py-1 px-2 cursor-pointer rounded-sm worktree-agent-row-hover" title="started 16m ago"><div class="flex items-center gap-1.5"><span class="inline-flex shrink-0 items-center justify-center" aria-label="Working" data-state="closed" data-slot="tooltip-trigger"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Working"><span data-agent-spinner="" class="agent-working-spinner block rounded-full border-2 border-yellow-500 border-t-transparent motion-reduce:border-t-yellow-500 size-1.5"></span></span></span><span class="block min-w-0 flex-1 overflow-hidden text-[11px] leading-snug transition-[height] duration-200 ease-out [interpolate-size:allow-keywords] h-[1lh] truncate font-normal text-muted-foreground" title="Working">Working</span><span class="relative ml-auto flex shrink-0 items-center justify-end h-3.5 w-12"><span class="pointer-events-none shrink-0 text-[10px] leading-none text-muted-foreground/60" aria-hidden="true">16m ago</span></span></div><div data-agent-row-tool-slot="" class="mt-0.5 min-w-0 pl-5 text-[10px] leading-snug text-muted-foreground/70"><span data-agent-row-tool-placeholder="true" aria-hidden="true" class="block h-[1lh]"></span></div><div class="mt-0.5 pl-5 text-[10px] leading-snug text-muted-foreground/70"> </div></div>",
+  "<div class="agent-disclosure-row group/agent-row relative -ml-2 flex flex-col py-1 px-2 cursor-pointer rounded-sm worktree-agent-row-hover" title="started 6m ago"><div class="flex items-center gap-1.5"><span class="inline-flex shrink-0 items-center justify-center" aria-label="Waiting for input" data-state="closed" data-slot="tooltip-trigger"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Waiting for input"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-message-circle-question-mark text-agent-question size-2.5" aria-hidden="true"><path d="M2.992 16.342a2 2 0 0 1 .094 1.167l-1.065 3.29a1 1 0 0 0 1.236 1.168l3.413-.998a2 2 0 0 1 1.099.092 10 10 0 1 0-4.777-4.719"></path><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><path d="M12 17h.01"></path></svg></span></span><span class="block min-w-0 flex-1 overflow-hidden text-[11px] leading-snug transition-[height] duration-200 ease-out [interpolate-size:allow-keywords] h-[1lh] truncate font-normal text-muted-foreground" title="Approve edits">Approve edits</span><span class="relative ml-auto flex shrink-0 items-center justify-end h-3.5 w-12"><span class="pointer-events-none shrink-0 text-[10px] leading-none text-muted-foreground/60" aria-hidden="true">6m ago</span></span></div><div class="mt-0.5 pl-5 text-[10px] leading-snug text-muted-foreground/70"> </div></div>",
+  "<div class="agent-disclosure-row group/agent-row relative -ml-2 flex flex-col py-1 px-2 cursor-pointer rounded-sm worktree-agent-row-hover" title="started 6m ago"><div class="flex items-center gap-1.5"><span class="inline-flex shrink-0 items-center justify-center" aria-label="Blocked" data-state="closed" data-slot="tooltip-trigger"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Blocked"><span class="block rounded-full size-1.5 bg-red-500"></span></span></span><span class="block min-w-0 flex-1 overflow-hidden text-[11px] leading-snug transition-[height] duration-200 ease-out [interpolate-size:allow-keywords] h-[1lh] truncate font-normal text-muted-foreground" title="Rate limited">Rate limited</span><span class="relative ml-auto flex shrink-0 items-center justify-end h-3.5 w-12"><span class="pointer-events-none shrink-0 text-[10px] leading-none text-muted-foreground/60" aria-hidden="true">6m ago</span></span></div><div class="mt-0.5 pl-5 text-[10px] leading-snug text-muted-foreground/70"> </div></div>",
+  "<div class="agent-disclosure-row group/agent-row relative -ml-2 flex flex-col py-1 px-2 cursor-pointer rounded-sm worktree-agent-row-hover" title="started 6m ago"><div class="flex items-center gap-1.5"><span class="inline-flex shrink-0 items-center justify-center" aria-label="Idle" data-state="closed" data-slot="tooltip-trigger"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="Idle"><span class="block rounded-full size-1.5 bg-neutral-500/40"></span></span></span><span class="block min-w-0 flex-1 overflow-hidden text-[11px] leading-snug transition-[height] duration-200 ease-out [interpolate-size:allow-keywords] h-[1lh] truncate font-normal text-muted-foreground" title="Teammate">Teammate</span><span class="relative ml-auto flex shrink-0 items-center justify-end h-3.5 w-12"><span class="pointer-events-none shrink-0 text-[10px] leading-none text-muted-foreground/60" aria-hidden="true">6m ago</span></span></div><div class="mt-0.5 pl-5 text-[10px] leading-snug text-muted-foreground/70"> </div></div>",
+  "<div class="agent-disclosure-row group/agent-row relative -ml-2 flex flex-col py-1 px-2 cursor-pointer rounded-sm worktree-agent-row-hover" title="No update in 5m • started 6m ago"><div class="flex items-center gap-1.5"><span class="inline-flex shrink-0 items-center justify-center" aria-label="No update in 5m" data-state="closed" data-slot="tooltip-trigger"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="No recent update"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-dashed text-amber-500 size-2.5" aria-hidden="true"><path d="M10.1 2.182a10 10 0 0 1 3.8 0"></path><path d="M13.9 21.818a10 10 0 0 1-3.8 0"></path><path d="M17.609 3.721a10 10 0 0 1 2.69 2.7"></path><path d="M2.182 13.9a10 10 0 0 1 0-3.8"></path><path d="M20.279 17.609a10 10 0 0 1-2.7 2.69"></path><path d="M21.818 10.1a10 10 0 0 1 0 3.8"></path><path d="M3.721 6.391a10 10 0 0 1 2.7-2.69"></path><path d="M6.391 20.279a10 10 0 0 1-2.69-2.7"></path></svg></span></span><span class="block min-w-0 flex-1 overflow-hidden text-[11px] leading-snug transition-[height] duration-200 ease-out [interpolate-size:allow-keywords] h-[1lh] truncate font-normal text-muted-foreground" title="Lost child">Lost child</span><span class="relative ml-auto flex shrink-0 items-center justify-end h-3.5 w-12"><span class="pointer-events-none shrink-0 text-[10px] leading-none text-muted-foreground/60" aria-hidden="true">No update in 5m</span></span></div><div class="mt-0.5 pl-5 text-[10px] leading-snug text-muted-foreground/70"> </div></div>",
+]
+`;
+
+exports[`sidebar child rows from a legacy subagents snapshot > render the full rows exactly as before 2`] = `
+[
+  "<div class="agent-disclosure-row group/agent-row relative -ml-2 flex flex-col py-1 px-2 cursor-pointer rounded-sm worktree-agent-row-hover" title="No update in 5m • started 10m ago"><div class="flex items-center gap-1.5"><span class="inline-flex shrink-0 items-center justify-center" aria-label="No update in 5m" data-state="closed" data-slot="tooltip-trigger"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="No recent update"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-dashed text-amber-500 size-2.5" aria-hidden="true"><path d="M10.1 2.182a10 10 0 0 1 3.8 0"></path><path d="M13.9 21.818a10 10 0 0 1-3.8 0"></path><path d="M17.609 3.721a10 10 0 0 1 2.69 2.7"></path><path d="M2.182 13.9a10 10 0 0 1 0-3.8"></path><path d="M20.279 17.609a10 10 0 0 1-2.7 2.69"></path><path d="M21.818 10.1a10 10 0 0 1 0 3.8"></path><path d="M3.721 6.391a10 10 0 0 1 2.7-2.69"></path><path d="M6.391 20.279a10 10 0 0 1-2.69-2.7"></path></svg></span></span><span class="block min-w-0 flex-1 overflow-hidden text-[11px] leading-snug transition-[height] duration-200 ease-out [interpolate-size:allow-keywords] h-[1lh] truncate font-normal text-muted-foreground" title="Review the parser">Review the parser</span><span class="max-w-24 shrink-0 truncate font-mono text-[10px] text-muted-foreground/70" title="claude-sonnet">claude-sonnet</span><span class="relative ml-auto flex shrink-0 items-center justify-end h-3.5 w-12"><span class="pointer-events-none shrink-0 text-[10px] leading-none text-muted-foreground/60" aria-hidden="true">No update in 5m</span></span></div><div class="mt-0.5 pl-5 text-[10px] leading-snug text-muted-foreground/70"> </div></div>",
+  "<div class="agent-disclosure-row group/agent-row relative -ml-2 flex flex-col py-1 px-2 cursor-pointer rounded-sm worktree-agent-row-hover" title="No update in 5m • started 8m ago"><div class="flex items-center gap-1.5"><span class="inline-flex shrink-0 items-center justify-center" aria-label="No update in 5m" data-state="closed" data-slot="tooltip-trigger"><span class="inline-flex shrink-0 items-center justify-center h-2.5 w-2.5" aria-label="No recent update"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-dashed text-amber-500 size-2.5" aria-hidden="true"><path d="M10.1 2.182a10 10 0 0 1 3.8 0"></path><path d="M13.9 21.818a10 10 0 0 1-3.8 0"></path><path d="M17.609 3.721a10 10 0 0 1 2.69 2.7"></path><path d="M2.182 13.9a10 10 0 0 1 0-3.8"></path><path d="M20.279 17.609a10 10 0 0 1-2.7 2.69"></path><path d="M21.818 10.1a10 10 0 0 1 0 3.8"></path><path d="M3.721 6.391a10 10 0 0 1 2.7-2.69"></path><path d="M6.391 20.279a10 10 0 0 1-2.69-2.7"></path></svg></span></span><span class="block min-w-0 flex-1 overflow-hidden text-[11px] leading-snug transition-[height] duration-200 ease-out [interpolate-size:allow-keywords] h-[1lh] truncate font-normal text-muted-foreground" title="Explore">Explore</span><span class="relative ml-auto flex shrink-0 items-center justify-end h-3.5 w-12"><span class="pointer-events-none shrink-0 text-[10px] leading-none text-muted-foreground/60" aria-hidden="true">No update in 5m</span></span></div><div class="mt-0.5 pl-5 text-[10px] leading-snug text-muted-foreground/70"> </div></div>",
+]
+`;
diff --git a/src/renderer/src/components/sidebar/fork-worktree-groups/WorktreeGroupMenuItems.tsx b/src/renderer/src/components/sidebar/fork-worktree-groups/WorktreeGroupMenuItems.tsx
index 80216a2aeb46..90c63e648ecb 100644
--- a/src/renderer/src/components/sidebar/fork-worktree-groups/WorktreeGroupMenuItems.tsx
+++ b/src/renderer/src/components/sidebar/fork-worktree-groups/WorktreeGroupMenuItems.tsx
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/components/sidebar/WorktreeContextMenuView.tsx,src/renderer/src/components/sidebar/WorktreeContextMenuOverlays.tsx
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 import React, { useCallback, useState } from 'react'
 import { CircleX, FolderInput, FolderPlus } from 'lucide-react'
 import {
diff --git a/src/renderer/src/components/sidebar/project-group-header-dom.test.ts b/src/renderer/src/components/sidebar/project-group-header-dom.test.ts
deleted file mode 100644
index 2e7523e5ecb5..000000000000
--- a/src/renderer/src/components/sidebar/project-group-header-dom.test.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-
-function readWorktreeListSource(): string {
-  return readFileSync(
-    fileURLToPath(new URL('./worktree-list/rows/SectionHeader.tsx', import.meta.url)),
-    'utf8'
-  )
-}
-
-function readHeaderDragSource(): string {
-  return readFileSync(
-    fileURLToPath(new URL('./worktree-list/drag/use-header-drag.ts', import.meta.url)),
-    'utf8'
-  )
-}
-
-describe('Project Group header drag DOM source', () => {
-  it('renders concrete Project Group header drag attributes separately from repo headers', () => {
-    const source = readWorktreeListSource()
-
-    expect(source).toContain('data-project-group-header-id={projectGroupIdForHeader}')
-    expect(source).toContain('data-project-group-header-index={projectGroupHeaderIndex}')
-    expect(source).toContain('data-project-group-header-bucket={projectGroupHeaderBucketKey}')
-    expect(source).toContain('data-project-group-header-drag-handle=')
-  })
-
-  it('commits Project Group manual sorting through updateProjectGroup tabOrder', () => {
-    const source = readHeaderDragSource()
-
-    expect(source).toContain('const updateProjectGroup = useAppStore((s) => s.updateProjectGroup)')
-    // Why: the commit must carry the group's owner host so a non-focused host still persists the order.
-    expect(source).toContain(
-      'void updateProjectGroup(groupId, { tabOrder }, { hostId: ownerHostId ?? undefined })'
-    )
-  })
-
-  it('keeps grab cursor on the title surface and dual handle attrs on row + surface', () => {
-    // Why: lock the cursor/hit-test split so a cleanup does not put grab back on the whole row
-    // or drop row-level handle attrs that arm drag from indent/padding.
-    const source = readWorktreeListSource()
-    const headerBlockStart = source.indexOf('data-repo-header-id={projectIdForHeader}')
-    const headerBlockEnd = source.indexOf('<ProjectHeaderActions>', headerBlockStart)
-    expect(headerBlockStart).toBeGreaterThan(-1)
-    expect(headerBlockEnd).toBeGreaterThan(headerBlockStart)
-    const headerBlock = source.slice(headerBlockStart, headerBlockEnd)
-
-    // Dual handle placement: row (indent/padding) + title surface.
-    expect(headerBlock.match(/data-repo-header-drag-handle=/g)?.length).toBe(2)
-    expect(headerBlock.match(/data-project-group-header-drag-handle=/g)?.length).toBe(2)
-    // Surface owns grab; outer row only gets cursor-pointer when not draggable.
-    expect(headerBlock).toContain(
-      "!(isDraggableRepoHeader || isDraggableProjectGroupHeader) && 'cursor-pointer'"
-    )
-    expect(headerBlock).toContain("'flex min-w-0 flex-1 items-center gap-1.5 self-stretch'")
-    expect(headerBlock).toContain("'cursor-grab active:cursor-grabbing'")
-    // Row-level ternary grab must stay gone.
-    expect(headerBlock).not.toMatch(
-      /isDraggableRepoHeader \|\| isDraggableProjectGroupHeader\s*\?\s*'cursor-grab/
-    )
-  })
-})
diff --git a/src/renderer/src/components/sidebar/sleep-worktree-activation-race.test.ts b/src/renderer/src/components/sidebar/sleep-worktree-activation-race.test.ts
index bf7eb3c758eb..5f3b588f93c2 100644
--- a/src/renderer/src/components/sidebar/sleep-worktree-activation-race.test.ts
+++ b/src/renderer/src/components/sidebar/sleep-worktree-activation-race.test.ts
@@ -88,6 +88,7 @@ describe('sleep flow vs slept-workspace activation', () => {
     expect(mocks.resumeWorkspace).toHaveBeenCalledWith({ workspaceId: 'wt-parent' })
     expect(mocks.activateAndRevealWorktree).toHaveBeenCalledTimes(1)
     expect(mocks.activateAndRevealWorktree).toHaveBeenCalledWith('wt-parent', {
+      navigationIntent: 'user-open',
       revealInSidebar: false
     })
 
@@ -102,6 +103,7 @@ describe('sleep flow vs slept-workspace activation', () => {
     await activateWorktreeFromSidebar('wt-parent')
 
     expect(mocks.activateAndRevealWorktree).toHaveBeenCalledWith('wt-parent', {
+      navigationIntent: 'user-open',
       revealInSidebar: false
     })
     expect(mocks.toastError).toHaveBeenCalledWith(
diff --git a/src/renderer/src/components/sidebar/smart-attention.test.ts b/src/renderer/src/components/sidebar/smart-attention.test.ts
index e8bcfad610ab..c1868cb9496d 100644
--- a/src/renderer/src/components/sidebar/smart-attention.test.ts
+++ b/src/renderer/src/components/sidebar/smart-attention.test.ts
@@ -102,6 +102,27 @@ describe('mostRecentAttentionInHistory', () => {
     ).toBe(NOW - 4_000)
   })
 
+  it('counts a failed history done as attention and skips a cancelled one', () => {
+    expect(
+      mostRecentAttentionInHistory([
+        makeHistory('done', NOW - 4_000),
+        {
+          ...makeHistory('done', NOW - 1_000),
+          mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: NOW - 1_000 }
+        }
+      ])
+    ).toBe(NOW - 1_000)
+    expect(
+      mostRecentAttentionInHistory([
+        makeHistory('done', NOW - 4_000),
+        {
+          ...makeHistory('done', NOW - 1_000),
+          mainAgent: { state: 'done', outcome: 'cancellation', stateStartedAt: NOW - 1_000 }
+        }
+      ])
+    ).toBe(NOW - 4_000)
+  })
+
   it('returns null when only interrupted dones exist', () => {
     expect(mostRecentAttentionInHistory([makeHistory('done', NOW - 1_000, true)])).toBeNull()
   })
@@ -181,6 +202,31 @@ describe('resolveAttention', () => {
     expect(resolveAttention([hookPane(entry)], NOW)).toEqual(IDLE)
   })
 
+  it('ranks a failed done in Class 2 at its end time, like a completion', () => {
+    const entry = makeEntry({
+      paneKey: 't:1',
+      state: 'done',
+      mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: NOW - 90_000 },
+      stateStartedAt: NOW - 90_000,
+      updatedAt: NOW - 30_000
+    })
+    expect(resolveAttention([hookPane(entry)], NOW)).toEqual({
+      cls: 2,
+      attentionTimestamp: NOW - 90_000
+    })
+  })
+
+  it('still demotes a done the user stopped, recorded as a cancellation verdict', () => {
+    const entry = makeEntry({
+      paneKey: 't:1',
+      state: 'done',
+      mainAgent: { state: 'done', outcome: 'cancellation', stateStartedAt: NOW - 90_000 },
+      stateStartedAt: NOW - 90_000,
+      updatedAt: NOW - 30_000
+    })
+    expect(resolveAttention([hookPane(entry)], NOW)).toEqual(IDLE)
+  })
+
   it('treats a session boundary as idle unless it displaced a real completion', () => {
     const boundary = makeEntry({
       paneKey: 't:1',
diff --git a/src/renderer/src/components/sidebar/smart-attention.ts b/src/renderer/src/components/sidebar/smart-attention.ts
index 481dd0c20109..5130efe9379a 100644
--- a/src/renderer/src/components/sidebar/smart-attention.ts
+++ b/src/renderer/src/components/sidebar/smart-attention.ts
@@ -1,5 +1,6 @@
 import { classifyTitleActivity, isExplicitAgentStatusFresh } from '@/lib/pane-agent-evidence'
 import { agentEntryCompletionAt } from '../../../../shared/agent-completion-time'
+import { agentTurnStoppedByUser } from '../../../../shared/agent-main-agent-verdict'
 import { migrationUnsupportedToAgentStatusEntry } from '@/lib/migration-unsupported-agent-entry'
 import { resolveDecayedAgentRowState } from '@/lib/agent-row-decay-state'
 import { tabHasLivePty } from '@/lib/tab-has-live-pty'
@@ -85,18 +86,15 @@ export function hasFreshAttributedAgentStatus(
 
 /**
  * Return the timestamp of the most recent `done`/`blocked`/`waiting` history row, ignoring
- * interrupted `done` rows (Ctrl+C). Returns `null` when no qualifying row exists.
+ * `done` rows the user stopped (Ctrl+C). Returns `null` when no qualifying row exists.
  */
 export function mostRecentAttentionInHistory(history: AgentStateHistoryEntry[]): number | null {
   let max = 0
   for (const h of history) {
-    // Why: setAgentStatus preserves `interrupted` on history rows, so filter them like the current entry.
-    if (h.state === 'done' && h.interrupted) {
-      continue
-    }
+    // Why: history rows keep the verdict, so filter a stopped turn like the current entry.
     if (h.state === 'done' || h.state === 'blocked' || h.state === 'waiting') {
       // Why: Infinity from a corrupted row would pin the worktree atop Class 3 forever; treat non-finite as missing.
-      if (!Number.isFinite(h.startedAt)) {
+      if (agentTurnStoppedByUser(h) || !Number.isFinite(h.startedAt)) {
         continue
       }
       if (h.startedAt > max) {
@@ -163,8 +161,8 @@ export function resolveAttention(panes: PaneInput[], now: number): WorktreeAtten
         ts = entry.stateStartedAt
         cause = entry.state
       } else if (entry.state === 'done') {
-        // Why: null covers interrupted `done` (Ctrl+C — user is finished with it) and idle session
-        // boundaries; neither is attention.
+        // Why: null covers a stopped `done` (not a completion) and idle session boundaries;
+        // neither is attention. A failed `done` ranks here: it is news the user has not seen.
         const completedAt = agentEntryCompletionAt(entry)
         if (completedAt === null) {
           continue
diff --git a/src/renderer/src/components/sidebar/smart-sort.test.ts b/src/renderer/src/components/sidebar/smart-sort.test.ts
index 3c0193fbc2ed..6be13b7ceaf8 100644
--- a/src/renderer/src/components/sidebar/smart-sort.test.ts
+++ b/src/renderer/src/components/sidebar/smart-sort.test.ts
@@ -85,7 +85,8 @@ function makeEntry(overrides: Partial<AgentStatusEntry> & { paneKey: string }):
     tabId: overrides.tabId,
     terminalTitle: overrides.terminalTitle,
     stateHistory: overrides.stateHistory ?? [],
-    interrupted: overrides.interrupted
+    interrupted: overrides.interrupted,
+    mainAgent: overrides.mainAgent
   }
 }
 
@@ -334,6 +335,31 @@ describe('smart sort — interrupted and stale handling', () => {
     expect(sorted.map((w) => w.id)).toEqual(['real-done', 'interrupted'])
   })
 
+  it('ranks a failed turn above an idle worktree and a cancelled one below it', () => {
+    const idle = makeWorktree({ id: 'idle', displayName: 'Idle', lastActivityAt: NOW - 10_000 })
+    const failed = makeWorktree({ id: 'failed', displayName: 'Failed', lastActivityAt: 0 })
+    const stopped = makeWorktree({ id: 'stopped', displayName: 'Stopped', lastActivityAt: 0 })
+    const tabs = {
+      [idle.id]: [makeTab({ id: 'tab-idle', worktreeId: idle.id })],
+      [failed.id]: [makeTab({ id: 'tab-failed', worktreeId: failed.id })],
+      [stopped.id]: [makeTab({ id: 'tab-stopped', worktreeId: stopped.id })]
+    }
+    const doneWith = (tabId: string, outcome: 'failure' | 'cancellation') =>
+      makeEntry({
+        paneKey: paneKey(tabId, '1'),
+        state: 'done',
+        mainAgent: { state: 'done', outcome, stateStartedAt: NOW - 60_000 },
+        stateStartedAt: NOW - 60_000,
+        updatedAt: NOW - 1_000
+      })
+    const entries = {
+      [paneKey('tab-failed', '1')]: doneWith('tab-failed', 'failure'),
+      [paneKey('tab-stopped', '1')]: doneWith('tab-stopped', 'cancellation')
+    }
+    const sorted = sortSmart([stopped, idle, failed], tabs, entries)
+    expect(sorted.map((w) => w.id)).toEqual(['failed', 'idle', 'stopped'])
+  })
+
   it('stale entries fall to Class 4', () => {
     const stale = makeWorktree({
       id: 'stale',
diff --git a/src/renderer/src/components/sidebar/subagent-child-row-fallback-pixels.test.tsx b/src/renderer/src/components/sidebar/subagent-child-row-fallback-pixels.test.tsx
new file mode 100644
index 000000000000..0be9f5ae5469
--- /dev/null
+++ b/src/renderer/src/components/sidebar/subagent-child-row-fallback-pixels.test.tsx
@@ -0,0 +1,237 @@
+/** @vitest-environment happy-dom */
+import { renderToStaticMarkup } from 'react-dom/server'
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentSessionBackgroundTask } from '../../../../shared/agent-session-wire'
+import type { AgentStatusEntry, AgentSubagentSnapshot } from '../../../../shared/agent-status-types'
+import type { TerminalTab } from '../../../../shared/terminal-tab-types'
+import DashboardAgentRow from '@/components/dashboard/DashboardAgentRow'
+import { NativeChatBackgroundTasksStatus } from '@/components/native-chat/NativeChatBackgroundTasksStatus'
+import { TooltipProvider } from '@/components/ui/tooltip'
+import { CompactAgentRow } from './worktree-card-compact-agent-row'
+import { buildSubagentChildRows } from './worktree-subagent-child-rows'
+
+vi.mock('@/components/dashboard/use-agent-row-conversation-name', () => ({
+  useAgentRowConversationName: () => null
+}))
+
+vi.mock('./CacheTimer', () => ({
+  default: () => null,
+  usePromptCacheCountdownForPane: () => null
+}))
+
+// Captured on the unmodified renderer: a host that sends only today's legacy shapes (an old host,
+// or any CLI pane) must keep rendering exactly these rows.
+
+const NOW = 1_000_000
+
+const tab: TerminalTab = {
+  id: 'parent-tab',
+  ptyId: null,
+  worktreeId: 'wt-1',
+  title: 'Parent',
+  customTitle: null,
+  color: null,
+  sortOrder: 0,
+  createdAt: 1
+}
+
+function parentWith(
+  subagents: AgentSubagentSnapshot[],
+  overrides: Partial<AgentStatusEntry> = {}
+): AgentStatusEntry {
+  return {
+    paneKey: 'parent-tab:leaf-1',
+    tabId: tab.id,
+    worktreeId: tab.worktreeId,
+    state: 'working',
+    prompt: 'parent prompt',
+    updatedAt: 700_000,
+    stateStartedAt: 10,
+    stateHistory: [],
+    subagents,
+    ...overrides
+  }
+}
+
+const SUBAGENTS: AgentSubagentSnapshot[] = [
+  {
+    id: 'described',
+    state: 'working',
+    startedAt: 400_000,
+    agentType: 'general-purpose',
+    model: 'claude-sonnet',
+    description: 'Review the parser'
+  },
+  { id: 'typed-only', state: 'working', startedAt: 500_000, agentType: 'Explore' },
+  { id: 'anonymous', state: 'working', startedAt: 0 },
+  { id: 'asking', state: 'waiting', startedAt: 600_000, description: 'Approve edits' },
+  { id: 'stuck', state: 'blocked', startedAt: 610_000, description: 'Rate limited' },
+  { id: 'parked', state: 'idle', startedAt: 620_000, description: 'Teammate', agentType: 'writer' },
+  { id: 'quiet', state: 'unverifiable', startedAt: 630_000, description: 'Lost child' }
+]
+
+function normalize(markup: string): string {
+  return markup.replaceAll('<!-- -->', '')
+}
+
+function compactMarkup(parent: AgentStatusEntry, parentIsFresh: boolean): string[] {
+  return buildSubagentChildRows({ parentEntry: parent, tab, parentIsFresh }).map((agent) =>
+    normalize(
+      renderToStaticMarkup(
+        <TooltipProvider>
+          <CompactAgentRow agent={agent} now={NOW} onActivate={() => {}} />
+        </TooltipProvider>
+      )
+    )
+  )
+}
+
+function fullMarkup(parent: AgentStatusEntry, parentIsFresh: boolean): string[] {
+  return buildSubagentChildRows({ parentEntry: parent, tab, parentIsFresh }).map((agent) =>
+    normalize(
+      renderToStaticMarkup(
+        <TooltipProvider>
+          <DashboardAgentRow
+            agent={agent}
+            now={NOW}
+            onActivate={() => {}}
+            onDismiss={() => {}}
+            stateDotSize="sm"
+            hideExpand
+            hideLineageConnectors
+          />
+        </TooltipProvider>
+      )
+    )
+  )
+}
+
+function textOf(markup: string): string {
+  const container = document.createElement('div')
+  container.innerHTML = markup
+  return container.textContent ?? ''
+}
+
+describe('sidebar child rows from a legacy subagents snapshot', () => {
+  it('render the compact rows exactly as before', () => {
+    const rows = compactMarkup(parentWith(SUBAGENTS), true)
+    expect(rows.map(textOf)).toEqual([
+      'Review the parser - general-purposeclaude-sonnet10m',
+      'Explore8m',
+      'Working - Agent16m',
+      'Approve edits - Agent6m',
+      'Rate limited - Agent6m',
+      'Teammate - writer6m',
+      'Lost child - No update in 5m6m'
+    ])
+    expect(rows).toMatchSnapshot()
+  })
+
+  it('render a stale parent and a lost transport exactly as before', () => {
+    const stale = compactMarkup(parentWith(SUBAGENTS.slice(0, 4)), false)
+    const lost = compactMarkup(
+      parentWith(SUBAGENTS.slice(0, 1), { subagentObservation: 'unverifiable' }),
+      true
+    )
+    expect([...stale, ...lost].map(textOf)).toEqual([
+      'Review the parser - No update in 5mclaude-sonnet10m',
+      'Explore - No update in 5m8m',
+      'No recent update - No update in 5m16m',
+      'Approve edits - No update in 5m6m',
+      'Review the parser - No update in 5mclaude-sonnet10m'
+    ])
+    expect([...stale, ...lost]).toMatchSnapshot()
+  })
+
+  it('render the full rows exactly as before', () => {
+    expect(fullMarkup(parentWith(SUBAGENTS), true)).toMatchSnapshot()
+    expect(fullMarkup(parentWith(SUBAGENTS.slice(0, 2)), false)).toMatchSnapshot()
+  })
+})
+
+const TASKS: AgentSessionBackgroundTask[] = [
+  {
+    id: 'agent-working',
+    kind: 'agent',
+    description: 'Review the parser',
+    name: 'general-purpose',
+    state: 'working',
+    startedAt: 400_000,
+    totalTokens: 18_200
+  },
+  { id: 'agent-waiting', kind: 'agent', description: 'Approve edits', state: 'waiting' },
+  { id: 'agent-blocked', kind: 'agent', name: 'Explore', state: 'blocked', startedAt: 500_000 },
+  { id: 'agent-quiet', kind: 'agent', description: 'subagent', state: 'unverifiable' },
+  { id: 'agent-stateless', kind: 'agent', description: 'Old host child', startedAt: 600_000 },
+  {
+    id: 'command-1',
+    kind: 'command',
+    description: 'npm run dev',
+    startedAt: 300_000,
+    stoppable: false
+  },
+  { id: 'monitor-1', kind: 'monitor', description: 'tail -f server.log' }
+]
+
+const SETTLED_TASKS: AgentSessionBackgroundTask[] = [
+  {
+    id: 'agent-done',
+    kind: 'agent',
+    description: 'Summarize logs',
+    state: 'done',
+    startedAt: 100_000,
+    totalTokens: 900
+  },
+  { id: 'agent-stopped', kind: 'agent', description: 'Cancelled child', state: 'idle' },
+  { id: 'agent-failed', kind: 'agent', description: 'Failed child', state: 'blocked' }
+]
+
+function stripMarkup(supportsTaskStop: boolean): string {
+  vi.useFakeTimers()
+  vi.setSystemTime(NOW)
+  try {
+    return normalize(
+      renderToStaticMarkup(
+        <TooltipProvider>
+          <NativeChatBackgroundTasksStatus
+            tasks={TASKS}
+            settledTasks={SETTLED_TASKS}
+            supportsTaskStop={supportsTaskStop}
+            supportsStopAll
+            stoppingTaskIds={new Set(['agent-working'])}
+            stoppingAll={false}
+            indicatorActive
+            isVisible
+            expanded
+            onExpandedChange={() => {}}
+            onStop={() => {}}
+          />
+        </TooltipProvider>
+      )
+    )
+  } finally {
+    vi.useRealTimers()
+  }
+}
+
+describe('chat strip rows from a legacy background-task roster', () => {
+  it('render exactly as before', () => {
+    const markup = stripMarkup(true)
+    const container = document.createElement('div')
+    container.innerHTML = markup
+    expect([...container.querySelectorAll('li')].map((row) => row.textContent)).toEqual([
+      'Failed child · failed',
+      'Background agent · no contactStop',
+      'Cancelled child',
+      'Approve edits · needs approvalStop',
+      'Summarize logs900',
+      'Review the parser18.2k · 10m 0sStop',
+      'Explore · failed8m 20sStop',
+      'Old host child6m 40sStop',
+      'npm run dev11m 40s',
+      'tail -f server.logStop'
+    ])
+    expect(markup).toMatchSnapshot()
+    expect(stripMarkup(false)).toMatchSnapshot()
+  })
+})
diff --git a/src/renderer/src/components/sidebar/use-worktree-activity-status.ts b/src/renderer/src/components/sidebar/use-worktree-activity-status.ts
index 2617ec91f239..4100a655b33b 100644
--- a/src/renderer/src/components/sidebar/use-worktree-activity-status.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-activity-status.ts
@@ -28,9 +28,11 @@ export function useWorktreeActivityStatus(worktreeId: string): WorktreeStatus {
     hasPermission,
     hasLiveWorking,
     hasLiveMonitoring,
+    hasFailed,
     hasInterrupted,
     hasLiveDone,
     hasRetainedDone,
+    hasRetainedFailed,
     agentStatusPaneIdsByTabId,
     stalePaneIdsByTabId
   } = useAppStore(useShallow((s) => selectWorktreeAgentActivitySummary(s, worktreeId)))
@@ -51,9 +53,11 @@ export function useWorktreeActivityStatus(worktreeId: string): WorktreeStatus {
         hasPermission: hasPermission || hasPendingAsk,
         hasLiveWorking,
         hasLiveMonitoring,
+        hasFailed,
         hasInterrupted,
         hasLiveDone,
-        hasRetainedDone
+        hasRetainedDone,
+        hasRetainedFailed
       }),
     [
       tabs,
@@ -67,9 +71,11 @@ export function useWorktreeActivityStatus(worktreeId: string): WorktreeStatus {
       hasPendingAsk,
       hasLiveWorking,
       hasLiveMonitoring,
+      hasFailed,
       hasInterrupted,
       hasLiveDone,
-      hasRetainedDone
+      hasRetainedDone,
+      hasRetainedFailed
     ]
   )
 }
diff --git a/src/renderer/src/components/sidebar/use-worktree-activity-statuses.ts b/src/renderer/src/components/sidebar/use-worktree-activity-statuses.ts
index afb93bf0b26e..ebdabc998920 100644
--- a/src/renderer/src/components/sidebar/use-worktree-activity-statuses.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-activity-statuses.ts
@@ -35,9 +35,11 @@ export function selectWorktreeActivityStatuses(
       hasPermission,
       hasLiveWorking,
       hasLiveMonitoring,
+      hasFailed,
       hasInterrupted,
       hasLiveDone,
       hasRetainedDone,
+      hasRetainedFailed,
       agentStatusPaneIdsByTabId,
       stalePaneIdsByTabId
     } = selectWorktreeAgentActivitySummary(statusInputs, worktreeId)
@@ -54,9 +56,11 @@ export function selectWorktreeActivityStatuses(
         hasPermission: hasPermission || selectWorktreeHasPendingAsk(statusInputs, worktreeId),
         hasLiveWorking,
         hasLiveMonitoring,
+        hasFailed,
         hasInterrupted,
         hasLiveDone,
-        hasRetainedDone
+        hasRetainedDone,
+        hasRetainedFailed
       })
     )
   }
diff --git a/src/renderer/src/components/sidebar/use-worktree-context-menu-commands.ts b/src/renderer/src/components/sidebar/use-worktree-context-menu-commands.ts
index ebef4544b231..30920343680f 100644
--- a/src/renderer/src/components/sidebar/use-worktree-context-menu-commands.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-context-menu-commands.ts
@@ -164,7 +164,7 @@ export function useWorktreeContextMenuCommands(args: {
   }, [args])
   const handleOpenParent = useCallback(() => {
     if (args.validParentWorktreeId) {
-      activateAndRevealWorktree(args.validParentWorktreeId)
+      activateAndRevealWorktree(args.validParentWorktreeId, { navigationIntent: 'user-open' })
     }
   }, [args.validParentWorktreeId])
   return {
diff --git a/src/renderer/src/components/sidebar/worktree-agent-activity-summary.test.ts b/src/renderer/src/components/sidebar/worktree-agent-activity-summary.test.ts
index 7b3bdd42849e..a4ac0369bf79 100644
--- a/src/renderer/src/components/sidebar/worktree-agent-activity-summary.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-agent-activity-summary.test.ts
@@ -22,6 +22,7 @@ function makeAgentStatusEntry(args: {
   restoredUnconfirmed?: true
   workingMode?: AgentStatusEntry['workingMode']
   interrupted?: true
+  mainAgent?: AgentStatusEntry['mainAgent']
 }): AgentStatusEntry {
   return {
     paneKey: args.paneKey,
@@ -34,6 +35,7 @@ function makeAgentStatusEntry(args: {
     restoredUnconfirmed: args.restoredUnconfirmed,
     workingMode: args.workingMode,
     interrupted: args.interrupted,
+    mainAgent: args.mainAgent,
     orchestration: args.parentPaneKey
       ? {
           taskId: 'task-1',
@@ -223,6 +225,134 @@ describe('selectWorktreeAgentActivitySummary', () => {
     expect(summary).toMatchObject({ hasInterrupted: true, hasLiveDone: false })
   })
 
+  it('separates a failed outcome from clean completion and from a cancellation', () => {
+    vi.spyOn(Date, 'now').mockReturnValue(2_000)
+    const paneKey = makePaneKey('tab-1', LEAF_ID)
+    const summary = selectWorktreeAgentActivitySummary(
+      {
+        tabsByWorktree: { 'repo::/wt-1': [makeTab('tab-1', 'repo::/wt-1')] },
+        agentStatusEpoch: 3,
+        agentStatusByPaneKey: {
+          [paneKey]: makeAgentStatusEntry({
+            paneKey,
+            state: 'done',
+            mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: 1_000 }
+          })
+        },
+        migrationUnsupportedByPtyId: {},
+        runtimeAgentOrchestrationByPaneKey: {},
+        retainedAgentsByPaneKey: {}
+      },
+      'repo::/wt-1'
+    )
+
+    expect(summary).toMatchObject({ hasFailed: true, hasInterrupted: false, hasLiveDone: false })
+  })
+
+  it('reports a main agent that failed while its subagents run, beside their pending question', () => {
+    vi.spyOn(Date, 'now').mockReturnValue(2_000)
+    const paneKey = makePaneKey('tab-1', LEAF_ID)
+    const summaryFor = (state: 'working' | 'waiting', outcome: 'failure' | 'success') =>
+      selectWorktreeAgentActivitySummary(
+        {
+          tabsByWorktree: { 'repo::/wt-1': [makeTab('tab-1', 'repo::/wt-1')] },
+          agentStatusEpoch: state === 'working' ? (outcome === 'failure' ? 5 : 6) : 7,
+          agentStatusByPaneKey: {
+            [paneKey]: makeAgentStatusEntry({
+              paneKey,
+              state,
+              mainAgent: { state: 'done', outcome, stateStartedAt: 1_000 }
+            })
+          },
+          migrationUnsupportedByPtyId: {},
+          runtimeAgentOrchestrationByPaneKey: {},
+          retainedAgentsByPaneKey: {}
+        },
+        'repo::/wt-1'
+      )
+
+    expect(summaryFor('working', 'failure')).toMatchObject({
+      hasFailed: true,
+      hasLiveWorking: false
+    })
+    expect(summaryFor('working', 'success')).toMatchObject({
+      hasFailed: false,
+      hasLiveWorking: true
+    })
+    expect(summaryFor('waiting', 'failure')).toMatchObject({ hasFailed: true, hasPermission: true })
+  })
+
+  describe('a failed agent on the worktree card', () => {
+    const worktreeId = 'repo::/wt-2'
+    const liveTab = makeTab('tab-1', worktreeId)
+    const retainedTab = makeTab('tab-2', worktreeId)
+    const failure = { state: 'done', outcome: 'failure', stateStartedAt: 1_000 } as const
+    const workingKey = makePaneKey('tab-1', LEAF_ID)
+    const failedKey = makePaneKey('tab-1', '22222222-2222-4222-8222-222222222222')
+    const working = makeAgentStatusEntry({ paneKey: workingKey, state: 'working' })
+    const retainedFailure = {
+      'tab-2:0': {
+        entry: makeAgentStatusEntry({ paneKey: 'tab-2:0', state: 'done', mainAgent: failure }),
+        worktreeId,
+        tab: retainedTab,
+        agentType: 'claude' as const,
+        startedAt: 1_000
+      }
+    }
+    let epoch = 100
+    const cardFor = (
+      agentStatusByPaneKey: AgentActivityInput['agentStatusByPaneKey'],
+      retainedAgentsByPaneKey: AgentActivityInput['retainedAgentsByPaneKey']
+    ) => {
+      vi.spyOn(Date, 'now').mockReturnValue(2_000)
+      const summary = selectWorktreeAgentActivitySummary(
+        {
+          tabsByWorktree: { [worktreeId]: [liveTab, retainedTab] },
+          agentStatusEpoch: epoch++,
+          agentStatusByPaneKey,
+          migrationUnsupportedByPtyId: {},
+          runtimeAgentOrchestrationByPaneKey: {},
+          retainedAgentsByPaneKey
+        },
+        worktreeId
+      )
+      return {
+        summary,
+        status: resolveWorktreeStatus({ tabs: [], browserTabs: [], ptyIdsByTabId: {}, ...summary })
+      }
+    }
+
+    it('reads a retained failure as failed once nothing else is live, not done', () => {
+      const { summary, status } = cardFor({}, retainedFailure)
+
+      expect(summary).toMatchObject({ hasRetainedFailed: true, hasRetainedDone: false })
+      expect(status).toBe('failed')
+    })
+
+    it('lets live work outrank a departed agent that failed', () => {
+      const { summary, status } = cardFor({ [workingKey]: working }, retainedFailure)
+
+      expect(summary).toMatchObject({ hasFailed: false, hasRetainedFailed: true })
+      expect(status).toBe('working')
+    })
+
+    it('keeps a live failure above live work', () => {
+      const { status } = cardFor(
+        {
+          [workingKey]: working,
+          [failedKey]: makeAgentStatusEntry({
+            paneKey: failedKey,
+            state: 'done',
+            mainAgent: failure
+          })
+        },
+        {}
+      )
+
+      expect(status).toBe('failed')
+    })
+  })
+
   it('lets an unconfirmed restored row suppress only its pane title', () => {
     vi.spyOn(Date, 'now').mockReturnValue(2_000)
     const paneKey = makePaneKey('tab-1', LEAF_ID)
diff --git a/src/renderer/src/components/sidebar/worktree-agent-activity-summary.ts b/src/renderer/src/components/sidebar/worktree-agent-activity-summary.ts
index 589b7c468540..52d1fb23268b 100644
--- a/src/renderer/src/components/sidebar/worktree-agent-activity-summary.ts
+++ b/src/renderer/src/components/sidebar/worktree-agent-activity-summary.ts
@@ -8,18 +8,23 @@ import {
 } from '@/lib/agent-status-worktree-attribution'
 import {
   AGENT_STATUS_STALE_AFTER_MS,
-  type AgentStatusEntry,
   type AgentStatusOrchestrationContext
 } from '../../../../shared/agent-status-types'
+import { agentVerdictDisplayMark } from '../../../../shared/agent-main-agent-verdict'
+import { applyAgentPaneActivityFlags } from '@/lib/agent-pane-activity-flags'
 
 export type WorktreeAgentActivitySummary = {
   hasPermission: boolean
   hasLiveWorking: boolean
   hasLiveMonitoring: boolean
+  /** A fresh failed main agent, also while its subagents run; kept apart from clean done. */
+  hasFailed: boolean
   /** Fresh interrupted completion, kept separate from clean done outcomes. */
   hasInterrupted: boolean
   hasLiveDone: boolean
   hasRetainedDone: boolean
+  /** A departed agent's failure; unlike `hasFailed` it yields to live work. */
+  hasRetainedFailed: boolean
   agentStatusPaneIdsByTabId: Record<string, ReadonlySet<string>>
   /** Stale rows suppress generated permission labels while preserving native title fallback. */
   stalePaneIdsByTabId: Record<string, ReadonlySet<string>>
@@ -31,9 +36,11 @@ const EMPTY_SUMMARY: WorktreeAgentActivitySummary = {
   hasPermission: false,
   hasLiveWorking: false,
   hasLiveMonitoring: false,
+  hasFailed: false,
   hasInterrupted: false,
   hasLiveDone: false,
   hasRetainedDone: false,
+  hasRetainedFailed: false,
   agentStatusPaneIdsByTabId: EMPTY_AGENT_STATUS_PANE_IDS_BY_TAB_ID,
   stalePaneIdsByTabId: EMPTY_AGENT_STATUS_PANE_IDS_BY_TAB_ID
 }
@@ -134,7 +141,7 @@ function getWorktreeAgentActivitySummaries(
     if (entry.state === 'done') {
       addParentPaneId(summary, orchestration, worktreeId, tabIdToWorktreeId)
     }
-    applyLiveAgentState(summary, entry)
+    applyAgentPaneActivityFlags(summary, entry)
   }
 
   for (const unsupported of Object.values(state.migrationUnsupportedByPtyId ?? {})) {
@@ -147,7 +154,12 @@ function getWorktreeAgentActivitySummaries(
 
   for (const retained of Object.values(state.retainedAgentsByPaneKey ?? {})) {
     const summary = summaryForWorktree(retained.worktreeId)
-    summary.hasRetainedDone = true
+    // Why: a failed agent is retained so its failure stays visible, not so it reads done.
+    if (agentVerdictDisplayMark(retained.entry) === 'failed') {
+      summary.hasRetainedFailed = true
+    } else {
+      summary.hasRetainedDone = true
+    }
     const paneIdentity = parseAgentStatusPaneIdentity(retained.entry?.paneKey)
     if (paneIdentity) {
       addAgentStatusPaneId(summary, paneIdentity.tabId, paneIdentity.paneId)
@@ -190,9 +202,11 @@ function summariesEqual(
     previous.hasPermission === next.hasPermission &&
     previous.hasLiveWorking === next.hasLiveWorking &&
     previous.hasLiveMonitoring === next.hasLiveMonitoring &&
+    previous.hasFailed === next.hasFailed &&
     previous.hasInterrupted === next.hasInterrupted &&
     previous.hasLiveDone === next.hasLiveDone &&
     previous.hasRetainedDone === next.hasRetainedDone &&
+    previous.hasRetainedFailed === next.hasRetainedFailed &&
     agentStatusPaneIdsByTabIdEqual(
       previous.agentStatusPaneIdsByTabId,
       next.agentStatusPaneIdsByTabId
@@ -227,26 +241,6 @@ function agentStatusPaneIdsByTabIdEqual(
   return true
 }
 
-function applyLiveAgentState(
-  summary: WorktreeAgentActivitySummary,
-  entry: Pick<AgentStatusEntry, 'state' | 'workingMode' | 'interrupted'>
-): void {
-  if (entry.state === 'blocked' || entry.state === 'waiting') {
-    summary.hasPermission = true
-  } else if (entry.interrupted === true) {
-    // Interrupted is encoded as done, so it must be checked first.
-    summary.hasInterrupted = true
-  } else if (entry.state === 'working') {
-    if (entry.workingMode === 'monitoring') {
-      summary.hasLiveMonitoring = true
-    } else {
-      summary.hasLiveWorking = true
-    }
-  } else if (entry.state === 'done') {
-    summary.hasLiveDone = true
-  }
-}
-
 function addAgentStatusPaneId(
   summary: WorktreeAgentActivitySummary,
   tabId: string,
diff --git a/src/renderer/src/components/sidebar/worktree-card-agent-summary.test.ts b/src/renderer/src/components/sidebar/worktree-card-agent-summary.test.ts
index e303ed2c4027..62a7d54c6d57 100644
--- a/src/renderer/src/components/sidebar/worktree-card-agent-summary.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-card-agent-summary.test.ts
@@ -4,7 +4,12 @@ import { describe, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
 import type { DashboardAgentRow as DashboardAgentRowData } from '@/components/dashboard/useDashboardData'
 import { CompactAgentRow, getCompactAgentSecondary } from './worktree-card-compact-agent-row'
-import { getAgentDotState, summarizeAgents } from './worktree-card-agent-summary'
+import {
+  buildSummaryAgentGroups,
+  getAgentDotState,
+  summarizeAgents
+} from './worktree-card-agent-summary'
+import { buildSubagentChildRows } from './worktree-subagent-child-rows'
 
 function monitoringAgent(): DashboardAgentRowData {
   return {
@@ -45,6 +50,30 @@ function renderCompactAgentRow(props: React.ComponentProps<typeof CompactAgentRo
 }
 
 describe('worktree card agent summary', () => {
+  it('keeps a failed child in the groups and the counts', () => {
+    const failed: DashboardAgentRowData = {
+      ...monitoringAgent(),
+      paneKey: 'tab-1:leaf-1\u0000subagent:child',
+      rowSource: 'subagent',
+      state: 'blocked',
+      childRow: {
+        id: 'child',
+        kind: 'agent',
+        displayState: 'failed',
+        name: 'Fuzz the tokenizer',
+        detail: null,
+        firstObservedAt: 1,
+        recencyAt: 1,
+        canStop: false,
+        settled: true,
+        owned: []
+      }
+    }
+    expect(getAgentDotState(failed)).toBe('failed')
+    expect(buildSummaryAgentGroups([failed]).map((group) => group.state)).toEqual(['failed'])
+    expect(summarizeAgents([failed], 'Agent')).toBe('Agent failed')
+  })
+
   it('presents passive working as monitoring', () => {
     const agent = monitoringAgent()
 
@@ -102,4 +131,72 @@ describe('worktree card agent summary', () => {
 
     expect(summarizeAgents([done, interrupted], 'Agents')).toBe('Agents: 1 interrupted, 1 done')
   })
+
+  it('lists a failed turn as failed, not done, ahead of an interrupted one', () => {
+    const done = monitoringAgent()
+    done.state = 'done'
+    done.entry.state = 'done'
+    done.entry.workingMode = undefined
+    const failed = {
+      ...done,
+      paneKey: 'tab-1:leaf-3',
+      entry: {
+        ...done.entry,
+        paneKey: 'tab-1:leaf-3',
+        mainAgent: { state: 'done' as const, outcome: 'failure' as const, stateStartedAt: 1 }
+      }
+    }
+    const interrupted = {
+      ...done,
+      paneKey: 'tab-1:leaf-2',
+      entry: { ...done.entry, paneKey: 'tab-1:leaf-2', interrupted: true }
+    }
+
+    expect(getAgentDotState(failed)).toBe('failed')
+    expect(getCompactAgentSecondary(failed, 0)).toBe('Failed')
+    expect(getCompactAgentSecondary(interrupted, 0)).toBe('Interrupted by user')
+    expect(summarizeAgents([done, interrupted, failed], 'Agents')).toBe(
+      'Agents: 1 failed, 1 interrupted, 1 done'
+    )
+  })
+
+  it('reads a main agent that failed while its subagent works as failed, ranked above working', () => {
+    const held = (outcome: 'failure' | 'success' | 'cancellation'): DashboardAgentRowData => {
+      const agent = monitoringAgent()
+      agent.entry.workingMode = undefined
+      agent.entry.mainAgent = { state: 'done', outcome, stateStartedAt: 1 }
+      return agent
+    }
+    const working = monitoringAgent()
+    working.paneKey = 'tab-1:leaf-2'
+    working.entry = { ...working.entry, paneKey: 'tab-1:leaf-2', workingMode: undefined }
+
+    expect(getAgentDotState(held('failure'))).toBe('failed')
+    expect(getCompactAgentSecondary(held('failure'), 0)).toBe('Failed')
+    expect(summarizeAgents([working, held('failure')], 'Agents')).toBe(
+      'Agents: 1 failed, 1 working'
+    )
+    // Only a failure outranks live work; a success or a stop with a live subagent reads working.
+    expect(getAgentDotState(held('success'))).toBe('working')
+    expect(getAgentDotState(held('cancellation'))).toBe('working')
+    expect(getCompactAgentSecondary(held('cancellation'), 0)).not.toBe('Interrupted by user')
+  })
+
+  it('keeps a subagent row on its own state while its failed main agent reads failed', () => {
+    const parent = monitoringAgent()
+    parent.entry = {
+      ...parent.entry,
+      workingMode: undefined,
+      mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: 1 },
+      subagents: [{ id: 'child-1', state: 'working', startedAt: 1 }]
+    }
+    const [child] = buildSubagentChildRows({
+      parentEntry: parent.entry,
+      tab: parent.tab,
+      parentIsFresh: true
+    })
+
+    expect(getAgentDotState(parent)).toBe('failed')
+    expect(getAgentDotState(child)).toBe('working')
+  })
 })
diff --git a/src/renderer/src/components/sidebar/worktree-card-agent-summary.ts b/src/renderer/src/components/sidebar/worktree-card-agent-summary.ts
index 314aa430d160..76fe81307e90 100644
--- a/src/renderer/src/components/sidebar/worktree-card-agent-summary.ts
+++ b/src/renderer/src/components/sidebar/worktree-card-agent-summary.ts
@@ -1,7 +1,7 @@
 import type { AgentDotState } from '@/components/AgentStateDot'
 import type { DashboardAgentRow as DashboardAgentRowData } from '@/components/dashboard/useDashboardData'
 import { formatAgentTypeLabel } from '@/lib/agent-status'
-import { agentRowDotState } from '@/lib/agent-row-dot-state'
+import { agentRowDisplayDotState } from '@/lib/agent-row-dot-state'
 
 export type SummaryAgentGroup = {
   state: AgentDotState
@@ -11,6 +11,8 @@ export type SummaryAgentGroup = {
 const SUMMARY_STATE_ORDER: AgentDotState[] = [
   'waiting',
   'blocked',
+  // Why: a failed main agent outranks live work; a pending question still comes first.
+  'failed',
   'working',
   'monitoring',
   'interrupted',
@@ -21,10 +23,7 @@ const SUMMARY_STATE_ORDER: AgentDotState[] = [
 ]
 
 export function getAgentDotState(agent: DashboardAgentRowData): AgentDotState {
-  if (agent.entry.interrupted === true) {
-    return 'interrupted'
-  }
-  return agentRowDotState(agent.state, agent.entry.workingMode)
+  return agentRowDisplayDotState(agent)
 }
 
 export function formatSummaryStateLabel(state: AgentDotState): string {
diff --git a/src/renderer/src/components/sidebar/worktree-card-compact-agent-row.tsx b/src/renderer/src/components/sidebar/worktree-card-compact-agent-row.tsx
index 20e42a002997..e75bafa83338 100644
--- a/src/renderer/src/components/sidebar/worktree-card-compact-agent-row.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-compact-agent-row.tsx
@@ -1,36 +1,22 @@
 import React, { useCallback, useEffect, useRef } from 'react'
-import { ChevronRight } from 'lucide-react'
+import { DashboardAgentChildDisclosure } from '@/components/dashboard/DashboardAgentChildDisclosure'
 import { AgentStateDot, agentStateLabel } from '@/components/AgentStateDot'
+import { AgentChildRowContent } from '@/components/AgentChildRowContent'
 import type { DashboardAgentRow as DashboardAgentRowData } from '@/components/dashboard/useDashboardData'
 import { AgentIcon } from '@/lib/agent-catalog'
 import { agentTypeToIconAgent, formatAgentTypeLabel } from '@/lib/agent-status'
 import { cn } from '@/lib/utils'
 import { getAgentDotState } from './worktree-card-agent-summary'
-import { translate } from '@/i18n/i18n'
 import { getAgentRowPrimaryText } from '@/lib/agent-row-primary-text'
 import { formatAgentToolPreview } from '@/lib/agent-row-tool-preview'
 import { agentNoUpdateLabel } from '@/lib/agent-row-decay-state'
 import { useAgentRowConversationName } from '@/components/dashboard/use-agent-row-conversation-name'
 import { lastEnteredDoneAt } from '@/components/dashboard/agent-finished-timestamp'
 import CacheTimer, { usePromptCacheCountdownForPane } from './CacheTimer'
+import { formatShortTimeAgo } from '@/lib/short-time-ago'
+import { agentVerdictDisplayMark } from '../../../../shared/agent-main-agent-verdict'
 import { SessionHandoffLineageBadge } from '@/components/agent-session-continuation/fork-session-handoff/SessionHandoffLineageBadge'
 
-function formatShortTimeAgo(ts: number, now: number): string {
-  const delta = now - ts
-  if (delta < 60_000) {
-    return 'now'
-  }
-  const minutes = Math.floor(delta / 60_000)
-  if (minutes < 60) {
-    return `${minutes}m`
-  }
-  const hours = Math.floor(minutes / 60)
-  if (hours < 24) {
-    return `${hours}h`
-  }
-  return `${Math.floor(hours / 24)}d`
-}
-
 function getCompactAgentPrimary(
   agent: DashboardAgentRowData,
   conversationName: string | null
@@ -44,9 +30,13 @@ export function getCompactAgentSecondary(
   now: number,
   lastAssistantMessageOverride?: string
 ): string {
-  if (agent.entry.interrupted === true) {
+  const verdictMark = agentVerdictDisplayMark(agent.entry)
+  if (verdictMark === 'interrupted') {
     return 'Interrupted by user'
   }
+  if (verdictMark === 'failed') {
+    return 'Failed'
+  }
   // Why: the only honest thing to say about a pane Orca still holds but no longer hears
   // from is how long the silence has run; the user supplies the meaning.
   if (agent.state === 'unverifiable') {
@@ -81,14 +71,6 @@ function getCompactAgentTime(agent: DashboardAgentRowData, now: number): string
   return startedAt > 0 ? formatShortTimeAgo(startedAt, now) : null
 }
 
-function stopActivationKeyPropagation(e: React.KeyboardEvent): void {
-  // Why: the surrounding worktree list handles Enter/Space as row activation.
-  // Focused nested buttons need those keys to stay local.
-  if (e.key === 'Enter' || e.key === ' ') {
-    e.stopPropagation()
-  }
-}
-
 type CompactAgentRowProps = {
   agent: DashboardAgentRowData
   now: number
@@ -101,10 +83,10 @@ type CompactAgentRowProps = {
   childAgentCount?: number
   childAgentsExpanded?: boolean
   onToggleChildAgents?: () => void
-  disclosureInGutter?: boolean
   isFocusedPane?: boolean
   hideIdentityIcon?: boolean
   cacheTimerActive?: boolean
+  isUnvisited?: boolean
 }
 
 export const CompactAgentRow = React.memo(function CompactAgentRow({
@@ -117,10 +99,10 @@ export const CompactAgentRow = React.memo(function CompactAgentRow({
   childAgentCount,
   childAgentsExpanded = false,
   onToggleChildAgents,
-  disclosureInGutter = false,
   isFocusedPane = false,
   hideIdentityIcon = false,
-  cacheTimerActive = true
+  cacheTimerActive = true,
+  isUnvisited = false
 }: CompactAgentRowProps) {
   const hasChildDisclosure =
     typeof childAgentCount === 'number' &&
@@ -192,71 +174,66 @@ export const CompactAgentRow = React.memo(function CompactAgentRow({
     },
     [agent.paneKey, onSendTargetClick, sendTargetStatus]
   )
-  const handleToggleChildren = useCallback(
-    (e: React.MouseEvent<HTMLButtonElement>) => {
-      e.preventDefault()
-      e.stopPropagation()
-      onToggleChildAgents?.()
-    },
-    [onToggleChildAgents]
+  const timestamp = shortTime ? (
+    <span
+      className={cn(
+        'shrink-0 text-[10px] tabular-nums',
+        isFocusedPane ? 'text-foreground/70' : 'text-muted-foreground/60'
+      )}
+    >
+      {shortTime}
+    </span>
+  ) : null
+
+  // Why: the selected-row fill is strong enough to wash out the dimmed prompt/secondary text, so
+  // lift the lead toward full foreground when focused; an unvisited row stays bold either way.
+  const leadClassName = cn(
+    isUnvisited ? 'font-semibold text-foreground' : 'font-normal text-muted-foreground/90',
+    isFocusedPane && !isUnvisited && 'text-foreground'
   )
 
   const rowBody = (
     <>
-      {hasChildDisclosure ? (
-        <button
-          type="button"
-          className="compact-agent-child-disclosure-button flex size-4 shrink-0 items-center justify-center rounded-sm text-muted-foreground hover:bg-worktree-sidebar-accent hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-worktree-sidebar-ring"
-          aria-label={translate(
-            'auto.components.sidebar.worktree.card.compact.agents.a128d7006b',
-            '{{value0}} {{value1}} child {{value2}}',
-            {
-              value0: childAgentsExpanded ? 'Hide' : 'Show',
-              value1: childAgentCount,
-              value2: childAgentCount === 1 ? 'agent' : 'agents'
-            }
+      {agent.childRow ? (
+        // Why: a child row reads through the piece the chat strip renders, so both say the same.
+        <AgentChildRowContent
+          row={agent.childRow}
+          now={now}
+          leadClassName={leadClassName}
+          trailClassName={isFocusedPane ? 'text-foreground/70' : 'text-muted-foreground/65'}
+          separator=" - "
+          dotTitle={sendTargetDisabledReason ? null : undefined}
+          tooltipSide="right"
+          lineTitle={!sendTargetDisabledReason}
+        />
+      ) : (
+        <>
+          {/* Why: the row's actionable disabled reason must win on every hit area. */}
+          <AgentStateDot
+            state={dotState}
+            size="sm"
+            title={sendTargetDisabledReason ? null : undefined}
+            tooltipSide="right"
+          />
+          {!hideIcon && (
+            <span className="inline-flex shrink-0" title={formatAgentTypeLabel(agent.agentType)}>
+              <AgentIcon agent={agentTypeToIconAgent(agent.agentType)} size={13} />
+            </span>
           )}
-          aria-expanded={childAgentsExpanded}
-          onClick={handleToggleChildren}
-          onKeyDown={stopActivationKeyPropagation}
-        >
-          <ChevronRight
-            className={cn(
-              'size-3 transition-transform duration-150',
-              childAgentsExpanded && 'rotate-90'
+          <span
+            className="min-w-0 flex-1 truncate"
+            title={sendTargetDisabledReason ? undefined : rowTitle}
+          >
+            <span className={leadClassName}>{leadingText}</span>
+            {trailingText && (
+              <span className={isFocusedPane ? 'text-foreground/70' : 'text-muted-foreground/65'}>
+                {' '}
+                - {trailingText}
+              </span>
             )}
-            aria-hidden
-          />
-        </button>
-      ) : null}
-      {/* Why: the row's actionable disabled reason must win on every hit area. */}
-      <AgentStateDot
-        state={dotState}
-        size="sm"
-        title={sendTargetDisabledReason ? null : undefined}
-        tooltipSide="right"
-      />
-      {!hideIcon && (
-        <span className="inline-flex shrink-0" title={formatAgentTypeLabel(agent.agentType)}>
-          <AgentIcon agent={agentTypeToIconAgent(agent.agentType)} size={13} />
-        </span>
-      )}
-      <span
-        className="min-w-0 flex-1 truncate"
-        title={sendTargetDisabledReason ? undefined : rowTitle}
-      >
-        {/* Why: the selected-row fill is strong enough to wash out the dimmed
-            prompt/secondary text, so lift both toward full foreground when focused. */}
-        <span className={isFocusedPane ? 'text-foreground' : 'text-muted-foreground/90'}>
-          {leadingText}
-        </span>
-        {trailingText && (
-          <span className={isFocusedPane ? 'text-foreground/70' : 'text-muted-foreground/65'}>
-            {' '}
-            - {trailingText}
           </span>
-        )}
-      </span>
+        </>
+      )}
       {model && (
         <span
           className={cn(
@@ -280,16 +257,15 @@ export const CompactAgentRow = React.memo(function CompactAgentRow({
         </span>
       )}
       {cacheTimer && <CacheTimer startedAt={cacheTimer.startedAt} ttlMs={cacheTimer.ttlMs} />}
-      {shortTime && (
-        <span
-          className={cn(
-            'shrink-0 text-[10px] tabular-nums',
-            // Why: the muted timestamp drops out against the selected-row fill.
-            isFocusedPane ? 'text-foreground/70' : 'text-muted-foreground/60'
-          )}
-        >
-          {shortTime}
-        </span>
+      {hasChildDisclosure ? (
+        <DashboardAgentChildDisclosure
+          childAgentCount={childAgentCount}
+          childAgentsExpanded={childAgentsExpanded}
+          onToggleChildAgents={onToggleChildAgents}
+          timestamp={timestamp}
+        />
+      ) : (
+        timestamp
       )}
     </>
   )
@@ -298,11 +274,9 @@ export const CompactAgentRow = React.memo(function CompactAgentRow({
     <div
       draggable={false}
       className={cn(
-        'compact-agent-row group/compact-agent-row min-w-0 overflow-hidden cursor-pointer rounded-sm px-1 text-[11px] leading-none',
+        'compact-agent-row agent-disclosure-row group/compact-agent-row min-w-0 cursor-pointer rounded-sm px-1 text-[11px] leading-none',
         'text-muted-foreground worktree-agent-row-hover',
         hasChildDisclosure && 'worktree-agent-lineage-parent-row',
-        // Why: hang the chevron in the card gutter so the state dot keeps the column of chevron-less rows.
-        hasChildDisclosure && disclosureInGutter && '-ml-5',
         isLineageChild && 'worktree-agent-lineage-child-row',
         'flex h-6 items-center gap-1',
         isFocusedPane && 'bg-worktree-sidebar-accent',
diff --git a/src/renderer/src/components/sidebar/worktree-card-surface.tsx b/src/renderer/src/components/sidebar/worktree-card-surface.tsx
index b14c8c6ec7de..8146f1b31600 100644
--- a/src/renderer/src/components/sidebar/worktree-card-surface.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-surface.tsx
@@ -51,7 +51,7 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
         'relative flex cursor-pointer flex-col pr-1.5 transition-[background-color,border-color,opacity,box-shadow] duration-200 outline-none select-none',
         titleOnlyCard ? 'py-0.5' : 'pt-0.5 pb-1',
         flushSurface ? 'ml-1 w-[calc(100%-0.25rem)]' : 'ml-1',
-        'rounded-lg',
+        'overflow-hidden rounded-lg',
         // Why: the live data attribute updates before React state during navigation,
         // so it must own the complete active style without stale utility classes.
         isLineageDropTarget
diff --git a/src/renderer/src/components/sidebar/worktree-keyboard-cycle.test.ts b/src/renderer/src/components/sidebar/worktree-keyboard-cycle.test.ts
index 430736c92be0..9f5562d91cd0 100644
--- a/src/renderer/src/components/sidebar/worktree-keyboard-cycle.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-keyboard-cycle.test.ts
@@ -1,5 +1,3 @@
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
 import type { HostSectionRow } from './host-section-rows'
 import {
@@ -151,27 +149,3 @@ describe('getCyclableWorktreeIds', () => {
     expect(getCyclableWorktreeIds(rows, 'single-location')).toEqual(['visible-after-host'])
   })
 })
-
-describe('WorktreeList keyboard cycling', () => {
-  it('cycles over the rendered rows instead of rebuilding a parallel layout', () => {
-    const source = readFileSync(
-      fileURLToPath(new URL('./worktree-list/navigation/use-keyboard.ts', import.meta.url)),
-      'utf8'
-    )
-    const navigateWorktree = source.slice(
-      source.indexOf('const navigateWorktree = useCallback('),
-      source.indexOf('const handleContainerKeyDown = useCallback(')
-    )
-
-    // Why: a second buildRows call drifts from the rendered layout (host sections,
-    // pinned placement); cycling must read the same rows the viewport renders.
-    expect(navigateWorktree).toContain('getCyclableWorktreeRows(rows, pinnedDisplayPolicy)')
-    expect(navigateWorktree).toContain('getCyclableRowIdentity')
-    // Why: the active host is stored resolved while a local row is unqualified; comparing raw identities wraps to the top.
-    expect(navigateWorktree).toContain('resolveActiveCycleIdentity')
-    expect(navigateWorktree).not.toContain('composeWorktreeHostIdentity')
-    expect(navigateWorktree).toContain('executionHostId: nextWorktree.hostId')
-    expect(navigateWorktree).toContain('resolveCycledWorktreeId')
-    expect(navigateWorktree).not.toContain('buildRows(')
-  })
-})
diff --git a/src/renderer/src/components/sidebar/worktree-list/grouping/build-rows.test.ts b/src/renderer/src/components/sidebar/worktree-list/grouping/build-rows.test.ts
index d95c204026ce..fb53b8d016a2 100644
--- a/src/renderer/src/components/sidebar/worktree-list/grouping/build-rows.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/grouping/build-rows.test.ts
@@ -1,25 +1,11 @@
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
 import { buildRows } from './build-rows'
 import { ALL_GROUP_META, getPRGroupKey, PINNED_GROUP_KEY } from './group-keys'
 import { getGroupKeyForWorktree } from './worktree-group-keys'
-import {
-  REPO_HEADER_ACTION_BUTTON_CLASS,
-  REPO_HEADER_ACTION_REVEAL_CLASS
-} from '../../repo-header-action-button-class'
 import { repo, worktree, repoMap } from '../../worktree-list-groups-test-fixtures'
 import type { Repo } from '../../../../../../shared/repo-types'
 import type { Worktree } from '../../../../../../shared/worktree/types'
 
-function readWorktreeListSource(): string {
-  return readFileSync(fileURLToPath(new URL('../../WorktreeList.tsx', import.meta.url)), 'utf8')
-}
-
-function readSectionHeaderRowSource(): string {
-  return readFileSync(fileURLToPath(new URL('../rows/SectionHeader.tsx', import.meta.url)), 'utf8')
-}
-
 describe('getPRGroupKey', () => {
   it('puts merged PRs in the done group', () => {
     const prCache = {
@@ -382,40 +368,3 @@ describe('buildRows with pinned worktrees', () => {
     ])
   })
 })
-
-describe('WorktreeList header styles', () => {
-  it('does not title-case workspace group labels', () => {
-    const source = readSectionHeaderRowSource()
-
-    expect(source).not.toContain('leading-none capitalize')
-  })
-
-  it('collapses repo header actions without reserving title width', () => {
-    expect(REPO_HEADER_ACTION_REVEAL_CLASS).toContain('min-w-0 max-w-0 -ml-1.5')
-    expect(REPO_HEADER_ACTION_REVEAL_CLASS).toContain('focus:ml-0 focus:max-w-5 focus:opacity-100')
-    expect(REPO_HEADER_ACTION_REVEAL_CLASS).toContain(
-      'group-hover:ml-0 group-hover:max-w-5 group-hover:opacity-100'
-    )
-    expect(REPO_HEADER_ACTION_BUTTON_CLASS).toContain(
-      'transition-[margin,max-width,opacity,background-color,color]'
-    )
-    expect(REPO_HEADER_ACTION_BUTTON_CLASS).toContain(
-      'data-[state=open]:ml-0 data-[state=open]:max-w-5 data-[state=open]:opacity-100'
-    )
-  })
-
-  it('resolves repo header color from project group headers only', () => {
-    const source = readSectionHeaderRowSource()
-
-    expect(source).toContain('resolveProjectGroupHeaderColor({')
-    expect(source).toContain('headerKey: row.key')
-    expect(source).toContain('color={repoHeaderColor}')
-  })
-
-  it('adapts projected setup rows for sidebar project grouping', () => {
-    const source = readWorktreeListSource()
-
-    expect(source).toContain('const projectHostSetupProjection = useProjectHostSetupProjection()')
-    expect(source).toContain('projectHostSetups: projectHostSetupProjection.setups')
-  })
-})
diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.focus.test.tsx b/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.focus.test.tsx
new file mode 100644
index 000000000000..c09637354f21
--- /dev/null
+++ b/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.focus.test.tsx
@@ -0,0 +1,290 @@
+// @vitest-environment happy-dom
+import { act, useRef, useState } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { useVirtualizer } from '@tanstack/react-virtual'
+import { Terminal } from '@xterm/xterm'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { HostSectionRow } from '../../host-section-rows'
+import { repo, worktree } from '../../worktree-list-groups-test-fixtures'
+import { focusPanePreservingOverlays } from '@/lib/pane-manager/pane-overlay-focus'
+import { getShortcutPlatform } from '@/lib/shortcut-platform'
+
+const state = {
+  keybindings: undefined,
+  activeView: 'terminal',
+  activeTabType: 'terminal',
+  activeWorktreeId: 'a',
+  activeTabId: 'tab-a',
+  tabsByWorktree: {
+    a: [{ id: 'tab-a' }],
+    b: [{ id: 'tab-b' }],
+    c: [{ id: 'tab-c' }],
+    'folder:one': [{ id: 'folder-tab' }]
+  }
+}
+const activate = vi.fn()
+const focusRuntime = vi.fn()
+vi.mock('@/store', () => ({
+  useAppStore: Object.assign((selector: (s: typeof state) => unknown) => selector(state), {
+    getState: () => state
+  })
+}))
+vi.mock('@/lib/worktree-activation', () => ({
+  activateAndRevealWorktree: (...args: unknown[]) => activate(...args)
+}))
+vi.mock('@/runtime/sync-runtime-graph', () => ({
+  focusRuntimeTerminalSurface: (...args: unknown[]) => focusRuntime(...args)
+}))
+const { useWorktreeListKeyboardNavigation } = await import('./use-keyboard')
+Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true })
+
+const rows: HostSectionRow[] = ['a', 'b', 'c'].map((id) => ({
+  type: 'item',
+  rowKey: id,
+  sectionKey: repo.id,
+  worktree: { ...worktree, id, hostId: 'ssh:fixture' },
+  repo,
+  depth: 0,
+  groupDepth: 0,
+  lineageTrail: [],
+  isLastLineageChild: false,
+  lineageChildCount: 0
+}))
+let root: Root
+let container: HTMLDivElement
+let list: HTMLDivElement
+let terminal: Terminal
+let textarea: HTMLTextAreaElement
+let autoFocus: () => void
+let modal = 'none'
+
+function Probe() {
+  const scrollRef = useRef<HTMLDivElement>(null)
+  const [activeId, setActiveId] = useState(state.activeWorktreeId)
+  const virtualizer = useVirtualizer<HTMLDivElement, HTMLDivElement>({
+    count: rows.length,
+    getScrollElement: () => scrollRef.current,
+    estimateSize: () => 30
+  })
+  activate.mockImplementation((id: string) => {
+    state.activeWorktreeId = id
+    state.activeTabId = `tab-${id}`
+    setActiveId(id)
+    autoFocus()
+  })
+  const { handleContainerKeyDown } = useWorktreeListKeyboardNavigation({
+    rows,
+    renderRows: rows,
+    activeWorktreeId: activeId,
+    activeWorkspaceExecutionHostId: 'ssh:fixture',
+    pinnedDisplayPolicy: 'single-location',
+    virtualizer,
+    scrollRef,
+    activeModal: modal,
+    markDirectScrollInput: () => {}
+  })
+  return (
+    <div
+      ref={scrollRef}
+      data-worktree-sidebar
+      role="listbox"
+      tabIndex={0}
+      onKeyDown={handleContainerKeyDown}
+    >
+      <button>Row action</button>
+    </div>
+  )
+}
+
+function press(key: string, init: KeyboardEventInit = {}, target: HTMLElement = list) {
+  act(() => {
+    target.dispatchEvent(
+      new KeyboardEvent('keydown', { key, code: key, bubbles: true, cancelable: true, ...init })
+    )
+  })
+}
+
+beforeEach(() => {
+  Object.assign(state, {
+    activeView: 'terminal',
+    activeTabType: 'terminal',
+    activeWorktreeId: 'a',
+    activeTabId: 'tab-a'
+  })
+  activate.mockReset()
+  focusRuntime.mockReset()
+  modal = 'none'
+  container = document.createElement('div')
+  textarea = document.createElement('textarea')
+  textarea.className = 'xterm-helper-textarea'
+  document.body.append(container, textarea)
+  terminal = new Terminal()
+  vi.spyOn(terminal, 'focus').mockImplementation(() => textarea.focus())
+  autoFocus = () => focusPanePreservingOverlays({ container, terminal })
+  root = createRoot(container)
+  act(() => root.render(<Probe />))
+  const element = container.querySelector('[data-worktree-sidebar]')
+  if (!(element instanceof HTMLDivElement)) {
+    throw new Error('List missing')
+  }
+  list = element
+  list.focus()
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  terminal.dispose()
+  vi.restoreAllMocks()
+  document.body.innerHTML = ''
+})
+
+describe('workspace list focus ownership', () => {
+  it('keeps repeated arrows in the list across activation and rerenders', () => {
+    press('ArrowDown')
+    expect(document.activeElement).toBe(list)
+    press('ArrowDown')
+    expect(document.activeElement).toBe(list)
+    press('ArrowUp')
+    expect(activate.mock.calls.map(([id]) => id)).toEqual(['b', 'c', 'b'])
+    expect(activate).toHaveBeenLastCalledWith('b', {
+      navigationIntent: 'user-open',
+      executionHostId: 'ssh:fixture'
+    })
+    expect(terminal.focus).not.toHaveBeenCalled()
+  })
+
+  it('keeps delayed terminal readiness from taking focus', () => {
+    autoFocus = () => {}
+    press('ArrowDown')
+    focusPanePreservingOverlays({ container, terminal })
+    expect(document.activeElement).toBe(list)
+  })
+
+  it.each(['inside', 'outside'])(
+    'releases ownership before an explicit %s pointer action',
+    (where) => {
+      press('ArrowDown')
+      const target = where === 'inside' ? list : textarea
+      target.dispatchEvent(new Event('pointerdown', { bubbles: true }))
+      focusPanePreservingOverlays({ container, terminal })
+      expect(document.activeElement).toBe(textarea)
+    }
+  )
+
+  it('does not revive old ownership when leaving and reentering the list', () => {
+    press('ArrowDown')
+    textarea.focus()
+    list.focus()
+    focusPanePreservingOverlays({ container, terminal })
+    expect(document.activeElement).toBe(textarea)
+  })
+
+  it('drops ownership when the list unmounts and remounts', () => {
+    press('ArrowDown')
+    act(() => root.render(null))
+    focusPanePreservingOverlays({ container, terminal })
+    expect(document.activeElement).toBe(textarea)
+    act(() => root.render(<Probe />))
+    container.querySelector<HTMLElement>('[data-worktree-sidebar]')?.focus()
+    focusPanePreservingOverlays({ container, terminal })
+    expect(document.activeElement).toBe(textarea)
+  })
+
+  it.each(['Mac', 'Windows', 'Linux'])(
+    'keeps CmdOrCtrl cycling as terminal navigation on %s',
+    (platform) => {
+      vi.spyOn(navigator, 'userAgent', 'get').mockReturnValue(platform)
+      press('ArrowDown')
+      const mod = getShortcutPlatform() === 'darwin' ? { metaKey: true } : { ctrlKey: true }
+      press('ArrowDown', { ...mod, shiftKey: true })
+      expect(activate.mock.calls.map(([id]) => id)).toEqual(['b', 'c'])
+      expect(document.activeElement).toBe(textarea)
+    }
+  )
+
+  it('does not navigate while an application modal is active', () => {
+    modal = 'settings'
+    act(() => root.render(<Probe />))
+    press('ArrowDown')
+    press('Enter')
+    expect(activate).not.toHaveBeenCalled()
+    expect(focusRuntime).not.toHaveBeenCalled()
+  })
+
+  it.each(['dialog', 'menu'])('does not navigate behind a visible %s', (role) => {
+    const overlay = document.createElement('div')
+    overlay.setAttribute('role', role)
+    document.body.append(overlay)
+    press('ArrowDown')
+    press('Enter')
+    expect(activate).not.toHaveBeenCalled()
+    expect(focusRuntime).not.toHaveBeenCalled()
+    expect(document.activeElement).toBe(list)
+  })
+
+  it('does not consume Enter from a row action', () => {
+    const button = list.querySelector('button')
+    if (!button) {
+      throw new Error('Button missing')
+    }
+    button.focus()
+    press('Enter', {}, button)
+    expect(document.activeElement).toBe(button)
+    expect(focusRuntime).not.toHaveBeenCalled()
+  })
+
+  it('asks the workspace-scoped pane API to focus the selected active pane', () => {
+    press('ArrowDown')
+    focusRuntime.mockImplementation(() => {
+      textarea.focus()
+      return true
+    })
+    press('Enter')
+    expect(focusRuntime).toHaveBeenCalledWith('tab-b', null, 'b')
+    expect(document.activeElement).toBe(textarea)
+    expect(list.hasAttribute('data-keyboard-navigation')).toBe(false)
+  })
+
+  it('uses folder workspace identity when handing focus to its terminal', () => {
+    Object.assign(state, { activeWorktreeId: 'folder:one', activeTabId: 'folder-tab' })
+    press('Enter')
+    expect(focusRuntime).toHaveBeenCalledWith('folder-tab', null, 'folder:one')
+  })
+
+  it.each([false, true])(
+    'keeps ownership when Enter returns %s without moving focus',
+    (handled) => {
+      press('ArrowDown')
+      focusRuntime.mockReturnValue(handled)
+      press('Enter')
+      expect(document.activeElement).toBe(list)
+      focusPanePreservingOverlays({ container, terminal })
+      expect(document.activeElement).toBe(list)
+      expect(terminal.focus).not.toHaveBeenCalled()
+    }
+  )
+
+  it.each(['editor', 'browser', 'agent', 'empty', 'unowned', 'unmounted', 'other-view'])(
+    'leaves focus in the list for %s targets instead of another terminal',
+    (target) => {
+      if (['editor', 'browser', 'agent'].includes(target)) {
+        state.activeTabType = target
+      }
+      if (target === 'empty') {
+        state.activeWorktreeId = ''
+      }
+      if (target === 'unowned') {
+        state.activeTabId = 'tab-b'
+      }
+      if (target === 'other-view') {
+        state.activeView = 'settings'
+      }
+      focusRuntime.mockReturnValue(false)
+      press('Enter')
+      expect(document.activeElement).toBe(list)
+      if (target !== 'unmounted') {
+        expect(focusRuntime).not.toHaveBeenCalled()
+      }
+    }
+  )
+})
diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.host-identity.test.tsx b/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.host-identity.test.tsx
index efac59a9c078..4944d69340ac 100644
--- a/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.host-identity.test.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.host-identity.test.tsx
@@ -101,7 +101,7 @@ describe('worktree keyboard cycling with a resolved active host', () => {
 
     press('down')
 
-    expect(activateAndRevealWorktree).toHaveBeenCalledWith('c', {})
+    expect(activateAndRevealWorktree).toHaveBeenCalledWith('c', { navigationIntent: 'user-open' })
   })
 
   it('steps to the previous row when the active host resolved to local', () => {
@@ -109,7 +109,7 @@ describe('worktree keyboard cycling with a resolved active host', () => {
 
     press('up')
 
-    expect(activateAndRevealWorktree).toHaveBeenCalledWith('a', {})
+    expect(activateAndRevealWorktree).toHaveBeenCalledWith('a', { navigationIntent: 'user-open' })
   })
 
   it('still steps normally when the active host is unqualified', () => {
@@ -117,6 +117,6 @@ describe('worktree keyboard cycling with a resolved active host', () => {
 
     press('down')
 
-    expect(activateAndRevealWorktree).toHaveBeenCalledWith('c', {})
+    expect(activateAndRevealWorktree).toHaveBeenCalledWith('c', { navigationIntent: 'user-open' })
   })
 })
diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.ts b/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.ts
index c8d3ec5d80d4..612bd82b505c 100644
--- a/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.ts
@@ -3,6 +3,8 @@ import type React from 'react'
 import type { Virtualizer } from '@tanstack/react-virtual'
 import { useAppStore } from '@/store'
 import { activateAndRevealWorktree } from '@/lib/worktree-activation'
+import { focusRuntimeTerminalSurface } from '@/runtime/sync-runtime-graph'
+import { hasVisibleOverlay } from '@/lib/visible-overlay'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import { getShortcutPlatform } from '@/lib/shortcut-platform'
 import { keybindingMatchesAction } from '../../../../../../shared/keybindings'
@@ -87,10 +89,10 @@ export function useWorktreeListKeyboardNavigation(args: {
       }
 
       // Why: keyboard cycling is real navigation; route through the activation helper that records history.
-      activateAndRevealWorktree(
-        nextWorktree.id,
-        nextWorktree.hostId ? { executionHostId: nextWorktree.hostId } : {}
-      )
+      activateAndRevealWorktree(nextWorktree.id, {
+        navigationIntent: 'user-open',
+        ...(nextWorktree.hostId ? { executionHostId: nextWorktree.hostId } : {})
+      })
 
       const rowIndex = findPreferredRenderRowIndexForWorktreeIdentity(
         renderRows,
@@ -112,13 +114,19 @@ export function useWorktreeListKeyboardNavigation(args: {
   )
 
   useEffect(() => {
+    const endListNavigation = () => {
+      scrollRef.current?.removeAttribute('data-keyboard-navigation')
+    }
     const handleKeyDown = (e: KeyboardEvent) => {
       if (activeModal !== 'none' || isEditableTarget(e.target)) {
         return
       }
 
       const platform = getShortcutPlatform()
-      if (keybindingMatchesAction('sidebar.focusWorktreeList', e, platform, keybindings)) {
+      if (
+        keybindingMatchesAction('sidebar.focusWorktreeList', e, platform, keybindings) &&
+        !hasVisibleOverlay()
+      ) {
         scrollRef.current?.focus()
         e.preventDefault()
         return
@@ -129,7 +137,8 @@ export function useWorktreeListKeyboardNavigation(args: {
         : keybindingMatchesAction('worktree.navigateDown', e, platform, keybindings)
           ? 'down'
           : null
-      if (direction) {
+      if (direction && !hasVisibleOverlay()) {
+        endListNavigation()
         markDirectScrollInput()
         navigateWorktree(direction)
         e.preventDefault()
@@ -137,31 +146,50 @@ export function useWorktreeListKeyboardNavigation(args: {
     }
 
     window.addEventListener('keydown', handleKeyDown, { capture: true })
-    return () => window.removeEventListener('keydown', handleKeyDown, { capture: true })
+    window.addEventListener('pointerdown', endListNavigation, { capture: true })
+    window.addEventListener('focusout', endListNavigation, { capture: true })
+    return () => {
+      window.removeEventListener('keydown', handleKeyDown, { capture: true })
+      window.removeEventListener('pointerdown', endListNavigation, { capture: true })
+      window.removeEventListener('focusout', endListNavigation, { capture: true })
+    }
   }, [activeModal, keybindings, markDirectScrollInput, navigateWorktree, scrollRef])
 
   const handleContainerKeyDown = useCallback(
     (e: React.KeyboardEvent) => {
+      if (
+        e.defaultPrevented ||
+        e.target !== e.currentTarget ||
+        activeModal !== 'none' ||
+        hasVisibleOverlay()
+      ) {
+        return
+      }
       if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
-        if (e.target !== e.currentTarget) {
-          return
-        }
+        // The focused DOM node owns navigation, including while a new terminal mounts.
+        e.currentTarget.setAttribute('data-keyboard-navigation', '')
         markDirectScrollInput()
         navigateWorktree(e.key === 'ArrowUp' ? 'up' : 'down')
         e.preventDefault()
       } else if (e.key === 'Enter') {
-        const helper = document.querySelector(
-          '.xterm-helper-textarea'
-        ) as HTMLTextAreaElement | null
-        if (helper) {
-          helper.focus()
+        const { activeView, activeWorktreeId, activeTabType, activeTabId, tabsByWorktree } =
+          useAppStore.getState()
+        if (
+          activeView === 'terminal' &&
+          activeTabType === 'terminal' &&
+          activeWorktreeId &&
+          activeTabId &&
+          tabsByWorktree[activeWorktreeId]?.some((tab) => tab.id === activeTabId)
+        ) {
+          // The registered manager owns the active split; unavailable surfaces keep list focus.
+          focusRuntimeTerminalSurface(activeTabId, null, activeWorktreeId)
         }
         e.preventDefault()
       } else if (['PageUp', 'PageDown', 'Home', 'End', ' '].includes(e.key)) {
         markDirectScrollInput()
       }
     },
-    [markDirectScrollInput, navigateWorktree]
+    [activeModal, markDirectScrollInput, navigateWorktree]
   )
 
   return { handleContainerKeyDown }
diff --git a/src/renderer/src/components/sidebar/worktree-subagent-child-rows.ts b/src/renderer/src/components/sidebar/worktree-subagent-child-rows.ts
index e629a8e352b1..729038d46ef2 100644
--- a/src/renderer/src/components/sidebar/worktree-subagent-child-rows.ts
+++ b/src/renderer/src/components/sidebar/worktree-subagent-child-rows.ts
@@ -1,6 +1,17 @@
 import type { DashboardAgentRow } from '@/components/dashboard/useDashboardData'
+import type { AgentRowState } from '@/lib/agent-row-decay-state'
 import type { AgentStatusEntry } from '../../../../shared/agent-status-types'
-import { resolveAgentChildWorkFreshness } from '../../../../shared/agent-status-child-work-freshness'
+import {
+  agentChildRowContextForParent,
+  buildAgentChildRowModels,
+  buildLegacyAgentChildRowModels,
+  flattenAgentChildRowModels,
+  type AgentChildRowModel
+} from '../../../../shared/agent-child-row-model'
+import {
+  agentChildRunStateFor,
+  type AgentChildDisplayState
+} from '../../../../shared/agent-status-child-work-display'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 
 /** Row-identity key for an in-process subagent child row. The NUL separator
@@ -11,12 +22,71 @@ function subagentRowKey(parentPaneKey: string, subagentId: string): string {
   return `${parentPaneKey}\u0000subagent:${subagentId}`
 }
 
+/** The lifecycle word every reader of a CLI row already understands; the row's own dot says more. */
+function agentRowStateFor(displayState: AgentChildDisplayState): AgentRowState {
+  const runState = agentChildRunStateFor(displayState)
+  // A CLI row carries monitoring as `working` plus its `workingMode`.
+  return runState === 'monitoring' ? 'working' : runState
+}
+
+function childDashboardRow(
+  row: AgentChildRowModel,
+  parentEntry: AgentStatusEntry,
+  tab: TerminalTab
+): DashboardAgentRow {
+  const state = agentRowStateFor(row.displayState)
+  const startedAt = row.firstObservedAt > 0 ? row.firstObservedAt : parentEntry.stateStartedAt
+  const paneKey = subagentRowKey(parentEntry.paneKey, row.id)
+  const detail = row.detail
+  // The same fields a CLI agent row carries, so every reader of a CLI row reads a child the same way.
+  const entry: AgentStatusEntry = {
+    state: state === 'idle' || state === 'unverifiable' ? 'done' : state,
+    ...(row.displayState === 'monitoring' ? { workingMode: 'monitoring' as const } : {}),
+    prompt: row.name,
+    // The parent's delivery clock; the child's own evidence clock rides `evidenceObservedAt`.
+    updatedAt: parentEntry.updatedAt,
+    ...(row.observedAt !== undefined ? { evidenceObservedAt: row.observedAt } : {}),
+    stateStartedAt: startedAt,
+    agentType: row.agentType,
+    model: row.model,
+    ...(detail?.kind === 'operation'
+      ? {
+          toolName: detail.toolName,
+          ...(detail.input !== undefined ? { toolInput: detail.input } : {})
+        }
+      : {}),
+    ...(detail?.kind === 'message' ? { lastAssistantMessage: detail.text } : {}),
+    paneKey,
+    worktreeId: parentEntry.worktreeId,
+    tabId: parentEntry.tabId,
+    stateHistory: [],
+    orchestration: {
+      taskId: `subagent:${row.id}`,
+      dispatchId: `subagent:${row.id}`,
+      displayName: row.name || undefined,
+      parentPaneKey: parentEntry.paneKey
+    }
+  }
+  return {
+    paneKey,
+    entry,
+    tab,
+    agentType: row.agentType ?? 'unknown',
+    rowSource: 'subagent',
+    state,
+    activationPaneKey: parentEntry.paneKey,
+    startedAt,
+    childRow: row
+  }
+}
+
 /**
- * Derive indented child rows for the live in-process subagents/teammates a
- * pane's agent has spawned (entry.subagents, reported via agent hooks). These
- * children have no PTY or tab of their own: the rows reuse the parent's tab,
- * activate the parent's pane, and link into the existing lineage tree through
- * `orchestration.parentPaneKey`.
+ * Derive indented child rows for the subagents/teammates a pane's agent has
+ * spawned. These children have no PTY or tab of their own: the rows reuse the
+ * parent's tab, activate the parent's pane, and link into the existing lineage
+ * tree through `orchestration.parentPaneKey`. The host's child views win; a host
+ * that sends only the legacy `subagents` snapshot (an old host, any CLI pane)
+ * is read as before.
  */
 export function buildSubagentChildRows(args: {
   parentEntry: AgentStatusEntry
@@ -25,48 +95,14 @@ export function buildSubagentChildRows(args: {
    *  states are equally unverifiable. */
   parentIsFresh: boolean
 }): DashboardAgentRow[] {
-  const subagents = args.parentEntry.subagents
-  if (!subagents || subagents.length === 0) {
-    return []
-  }
-  return subagents.map((subagent) => {
-    const freshness = resolveAgentChildWorkFreshness({
-      state: subagent.state,
-      membership: 'live',
-      parentEvidenceFresh: args.parentIsFresh,
-      transportObservation: args.parentEntry.subagentObservation ?? 'live'
-    })
-    const state = freshness === 'done' ? 'idle' : freshness === 'monitoring' ? 'working' : freshness
-    const activeState = state !== 'idle' && state !== 'unverifiable' ? state : undefined
-    const startedAt = subagent.startedAt > 0 ? subagent.startedAt : args.parentEntry.stateStartedAt
-    const paneKey = subagentRowKey(args.parentEntry.paneKey, subagent.id)
-    const entry: AgentStatusEntry = {
-      state: activeState ?? 'done',
-      prompt: subagent.description ?? subagent.agentType ?? '',
-      updatedAt: args.parentEntry.updatedAt,
-      stateStartedAt: startedAt,
-      agentType: subagent.agentType,
-      model: subagent.model,
-      paneKey,
-      worktreeId: args.parentEntry.worktreeId,
-      tabId: args.parentEntry.tabId,
-      stateHistory: [],
-      orchestration: {
-        taskId: `subagent:${subagent.id}`,
-        dispatchId: `subagent:${subagent.id}`,
-        displayName: subagent.description,
-        parentPaneKey: args.parentEntry.paneKey
-      }
-    }
-    return {
-      paneKey,
-      entry,
-      tab: args.tab,
-      agentType: subagent.agentType ?? 'unknown',
-      rowSource: 'subagent' as const,
-      state,
-      activationPaneKey: args.parentEntry.paneKey,
-      startedAt
-    }
-  })
+  const { parentEntry } = args
+  const context = agentChildRowContextForParent(parentEntry, args.parentIsFresh)
+  const rows =
+    parentEntry.children !== undefined
+      ? buildAgentChildRowModels(parentEntry.children, context)
+      : buildLegacyAgentChildRowModels(parentEntry.subagents ?? [], context)
+  // Shells and monitors show through their owner's dot; the sidebar lists agents.
+  return flattenAgentChildRowModels(rows)
+    .filter((row) => row.kind === 'agent')
+    .map((row) => childDashboardRow(row, parentEntry, args.tab))
 }
diff --git a/src/renderer/src/components/star-nag/StarNagAgentValueMomentObserver.test.tsx b/src/renderer/src/components/star-nag/StarNagAgentValueMomentObserver.test.tsx
index 3a689eac09a2..846b3fa9034a 100644
--- a/src/renderer/src/components/star-nag/StarNagAgentValueMomentObserver.test.tsx
+++ b/src/renderer/src/components/star-nag/StarNagAgentValueMomentObserver.test.tsx
@@ -177,6 +177,36 @@ describe('StarNagAgentValueMomentObserver', () => {
     expect(showAgentValueMoment).not.toHaveBeenCalled()
   })
 
+  it('ignores a prompted done whose turn failed', async () => {
+    ;({ root, container } = renderObserver())
+
+    setAgentEntries({ pane: entry({ state: 'working' }) })
+    setAgentEntries({
+      pane: entry({
+        state: 'done',
+        mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: 1 }
+      })
+    })
+    await act(async () => {
+      vi.advanceTimersByTime(2400)
+    })
+
+    expect(agentValueMoment).not.toHaveBeenCalled()
+  })
+
+  it('ignores a return to a done dated before the work it ended', async () => {
+    ;({ root, container } = renderObserver())
+
+    setAgentEntries({ pane: entry({ state: 'done', stateStartedAt: 1 }) })
+    setAgentEntries({ pane: entry({ state: 'working', stateStartedAt: 5 }) })
+    setAgentEntries({ pane: entry({ state: 'done', stateStartedAt: 1 }) })
+    await act(async () => {
+      vi.advanceTimersByTime(2400)
+    })
+
+    expect(agentValueMoment).not.toHaveBeenCalled()
+  })
+
   it('waits for other live agents and recent typing to quiet', async () => {
     ;({ root, container } = renderObserver())
 
diff --git a/src/renderer/src/components/star-nag/StarNagAgentValueMomentObserver.tsx b/src/renderer/src/components/star-nag/StarNagAgentValueMomentObserver.tsx
index 42f6145b1f38..ace4491a13c3 100644
--- a/src/renderer/src/components/star-nag/StarNagAgentValueMomentObserver.tsx
+++ b/src/renderer/src/components/star-nag/StarNagAgentValueMomentObserver.tsx
@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useRef } from 'react'
 import type { AgentStatusEntry } from '../../../../shared/agent-status-types'
+import { agentTurnEndedUncleanly } from '../../../../shared/agent-main-agent-verdict'
 import { useAppStore } from '@/store'
 
 // Why: leave a short quiet window after agents finish so the prompt does not
@@ -36,7 +37,9 @@ function hasSuccessfulDoneTransition(
       // Why: a session-boundary done is an idle connect (STA-3386), not a value moment —
       // a stale working row + resume would otherwise nag on launch.
       entry.sessionBoundary !== true &&
-      !entry.interrupted &&
+      !agentTurnEndedUncleanly(entry) &&
+      // A new done, not a return to one dated before the work it ended (a command at rest).
+      entry.stateStartedAt >= previousEntry.stateStartedAt &&
       hasMeaningfulPrompt(entry)
     ) {
       return true
diff --git a/src/renderer/src/components/status-bar/PetStatusSegment.layout.test.ts b/src/renderer/src/components/status-bar/PetStatusSegment.layout.test.ts
deleted file mode 100644
index e213100816e4..000000000000
--- a/src/renderer/src/components/status-bar/PetStatusSegment.layout.test.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-describe('PetStatusSegment layout', () => {
-  it('does not reserve fixed right padding on the pet menu trigger', () => {
-    const source = readFileSync(join(__dirname, 'PetStatusSegment.tsx'), 'utf8')
-
-    // Why: the old pr-[6.5rem] reserved ~104px of empty space after the label and
-    // shoved neighboring status-bar segments left; unit-guard so CI catches a
-    // reintroduction without needing Electron Playwright.
-    expect(source).not.toMatch(/pr-\[\d+(?:\.\d+)?rem\]/)
-    expect(source).toMatch(/className="group inline-flex items-center cursor-pointer pl-1 py-0\.5"/)
-  })
-})
diff --git a/src/renderer/src/components/status-bar/PortsStatusSegment.render-stability.test.tsx b/src/renderer/src/components/status-bar/PortsStatusSegment.render-stability.test.tsx
index d6d4ad951840..3f518db6751b 100644
--- a/src/renderer/src/components/status-bar/PortsStatusSegment.render-stability.test.tsx
+++ b/src/renderer/src/components/status-bar/PortsStatusSegment.render-stability.test.tsx
@@ -30,6 +30,7 @@ vi.mock('@/lib/react-error-boundary-reporting', () => ({
 }))
 
 vi.mock('@/i18n/i18n', () => ({
+  i18n: { language: 'en' },
   translate: (_key: string, fallback: string, options?: Record<string, unknown>) =>
     options
       ? fallback.replace(/{{(\w+)}}/g, (_match, name: string) => String(options[name] ?? ''))
diff --git a/src/renderer/src/components/status-bar/ResourceUsageStatusSegment.rows.test.tsx b/src/renderer/src/components/status-bar/ResourceUsageStatusSegment.rows.test.tsx
index 783202de0cb7..580c7f02f13b 100644
--- a/src/renderer/src/components/status-bar/ResourceUsageStatusSegment.rows.test.tsx
+++ b/src/renderer/src/components/status-bar/ResourceUsageStatusSegment.rows.test.tsx
@@ -23,6 +23,7 @@ vi.mock('@/components/ui/tooltip', () => ({
 }))
 
 vi.mock('@/i18n/i18n', () => ({
+  i18n: { language: 'en' },
   translate: (_key: string, fallback: string, values?: Record<string, string>) =>
     values
       ? Object.entries(values).reduce(
diff --git a/src/renderer/src/components/status-bar/StatusBarProviderSegment.tsx b/src/renderer/src/components/status-bar/StatusBarProviderSegment.tsx
index 3a9bc0cba485..f3aaa6cbeded 100644
--- a/src/renderer/src/components/status-bar/StatusBarProviderSegment.tsx
+++ b/src/renderer/src/components/status-bar/StatusBarProviderSegment.tsx
@@ -6,7 +6,14 @@ import {
   type UsagePercentageDisplay
 } from '../../../../shared/usage-percentage-display'
 import type { StatusBarUsageMode } from '../../../../shared/status-bar-usage-mode'
-import { ProviderIcon, clampUsedPercent, getProviderUsageStatusLabel } from './tooltip'
+import {
+  ProviderIcon,
+  USAGE_URGENT_PERCENT,
+  USAGE_WARNING_PERCENT,
+  clampUsedPercent,
+  getProviderDisplayName,
+  getProviderUsageStatusLabel
+} from './tooltip'
 import { getTightestUsageSection } from './UsageRosterPanel'
 import { formatRateLimitWindowChipLabel } from '@/lib/window-label-formatter'
 import { formatUsagePercentageLabel } from './usage-percentage-label'
@@ -67,6 +74,65 @@ export function ProviderLetterBadge({ p }: { p: ProviderRateLimits }): React.JSX
   )
 }
 
+export type UsageTone = 'urgent' | 'warning' | 'normal'
+
+/** Urgency by consumption, matching the usage bar colors, whatever % display the user chose. */
+export function getUsageTone(p: ProviderRateLimits): UsageTone {
+  const tightest = getTightestUsageSection(p)
+  const used = tightest ? clampUsedPercent(tightest.window.usedPercent) : 0
+  return used >= USAGE_URGENT_PERCENT
+    ? 'urgent'
+    : used >= USAGE_WARNING_PERCENT
+      ? 'warning'
+      : 'normal'
+}
+
+/**
+ * Stands in for usage chips a narrow bar can't fit. Always rendered at the collapsing
+ * density so its width is known before anything collapses; out of the row while empty.
+ */
+export function UsageOverflowChip({
+  hidden,
+  display
+}: {
+  hidden: readonly ProviderRateLimits[]
+  display: UsagePercentageDisplay
+}): React.JSX.Element {
+  const tones = hidden.map(getUsageTone)
+  const tone = tones.includes('urgent')
+    ? 'urgent'
+    : tones.includes('warning')
+      ? 'warning'
+      : 'normal'
+  const names = hidden
+    .map((p) => {
+      const tightest = getTightestUsageSection(p)
+      const name = getProviderDisplayName(p.provider)
+      return tightest
+        ? `${name} ${formatUsagePercentageLabel(tightest.window.usedPercent, display)}`
+        : name
+    })
+    .join(', ')
+  return (
+    <span
+      data-usage-more
+      data-usage-collapsed={hidden.length === 0}
+      data-tone={tone}
+      aria-hidden={hidden.length === 0}
+      title={translate(
+        'auto.components.status.bar.StatusBar.hiddenUsageProviders',
+        'Also: {{value0}}',
+        {
+          value0: names
+        }
+      )}
+      className="inline-flex h-4 items-center rounded-full border border-border px-1.5 text-[11px] font-medium tabular-nums text-foreground data-[tone=urgent]:border-destructive/40 data-[tone=urgent]:text-destructive data-[tone=warning]:border-status-warning-border data-[tone=warning]:text-status-warning data-[usage-collapsed=true]:invisible data-[usage-collapsed=true]:absolute"
+    >
+      +{Math.max(1, hidden.length)}
+    </span>
+  )
+}
+
 function getProviderLetter(provider: ProviderRateLimits['provider']): string {
   switch (provider) {
     case 'claude':
@@ -85,6 +151,8 @@ function getProviderLetter(provider: ProviderRateLimits['provider']): string {
       return 'R'
     case 'cursor':
       return 'U'
+    case 'zcode':
+      return 'Z'
     case 'codex':
       return 'X'
   }
diff --git a/src/renderer/src/components/status-bar/StatusBarSurface.tsx b/src/renderer/src/components/status-bar/StatusBarSurface.tsx
index dfdcbb926db7..844eeabe5045 100644
--- a/src/renderer/src/components/status-bar/StatusBarSurface.tsx
+++ b/src/renderer/src/components/status-bar/StatusBarSurface.tsx
@@ -8,7 +8,6 @@ import {
   DropdownMenuTrigger
 } from '@/components/ui/dropdown-menu'
 import { translate } from '@/i18n/i18n'
-import { getProviderDisplayName } from './tooltip'
 import { UsageRosterPanel } from './UsageRosterPanel'
 import { getUsageProviderAccountsSectionId } from './usage-provider-settings-target'
 import {
@@ -27,7 +26,7 @@ import { FloatingTerminalIconContextMenu } from '@/components/floating-terminal/
 import { ClaudeSwitcherMenu } from './ClaudeSwitcherMenu'
 import { CodexSwitcherMenu } from './CodexSwitcherMenu'
 import { ProviderDetailsMenu, CLOSE_ALL_CONTEXT_MENUS_EVENT } from './ProviderDetailsMenu'
-import { ProviderLetterBadge, ProviderSegment } from './StatusBarProviderSegment'
+import { ProviderSegment, UsageOverflowChip, getUsageTone } from './StatusBarProviderSegment'
 import { useStatusBarController } from './use-status-bar-controller'
 import { StatusBarVisibilityMenu } from './StatusBarVisibilityMenu'
 import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
@@ -61,8 +60,10 @@ export function StatusBarSurface({
   const {
     anyFetching,
     anyVisible,
+    barRef,
+    collapseUsage,
+    collapsedUsageProviders,
     compact,
-    containerRefCallback,
     floatingTerminalActionLabel,
     floatingTerminalShortcut,
     handleManageAccounts,
@@ -71,11 +72,13 @@ export function StatusBarSurface({
     handleUsageDetails,
     handleUsageMenuOpenChange,
     hasVisibleUsageMeters,
-    iconOnly,
     isEmptyUsageState,
     isRefreshing,
+    overflowing,
     petEnabled,
     rosterProviders,
+    segmentsIconOnly,
+    segmentsRef,
     setMenuOpen,
     setMenuPoint,
     setStatusBarUsageMode,
@@ -88,13 +91,16 @@ export function StatusBarSurface({
     statusBarUsageMode,
     usageMenuFocusHandoff,
     usageMenuOpen,
-    usagePercentageDisplay
+    usagePercentageDisplay,
+    usageRef,
+    usageTightestOnly
   } = controller
 
   return (
     <div
-      ref={containerRefCallback}
-      className="flex items-center h-6 min-h-[24px] px-3 gap-4 border-t border-border bg-[var(--bg-titlebar,var(--card))] text-xs select-none shrink-0 relative"
+      ref={barRef}
+      // Why: one line at any width — density steps down first. overflow-clip (not hidden) so focus can't scroll the bar; the clip margin spares focus rings and badge dots.
+      className="flex items-center h-6 min-h-[24px] px-3 gap-4 overflow-clip [overflow-clip-margin:3px] whitespace-nowrap border-t border-border bg-[var(--bg-titlebar,var(--card))] text-xs select-none shrink-0 relative"
       onContextMenuCapture={(event) => {
         if (!shouldOpenStatusBarContextMenu(event.target)) {
           return
@@ -107,193 +113,217 @@ export function StatusBarSurface({
         setMenuOpen(true)
       }}
     >
-      <div className="flex items-center gap-3">
-        {isEmptyUsageState ? (
-          showEmptyUsageCta ? (
-            <StatusBarUsageEmptyCta />
-          ) : null
-        ) : hasVisibleUsageMeters ? (
-          // Consolidated roster pill → opens the all-agents Usage popover (mock parity).
-          <UsagePercentageDisplayChangeNotice hasVisibleUsageMeters={hasVisibleUsageMeters}>
-            <DropdownMenu
-              open={usageMenuOpen}
-              onOpenChange={handleUsageMenuOpenChange}
-              modal={false}
-            >
-              <DropdownMenuTrigger asChild>
-                <button
-                  type="button"
-                  className="inline-flex items-center gap-3 rounded px-1 py-0.5 hover:bg-accent/70"
-                  aria-label={translate(
-                    'auto.components.status.bar.UsageRosterPanel.title',
-                    'Usage'
-                  )}
-                >
-                  {rosterProviders.map((p) =>
-                    iconOnly ? (
-                      // Narrow status bar: fall back to main's compact letter badge.
-                      <span key={p.provider} title={getProviderDisplayName(p.provider)}>
-                        <ProviderLetterBadge p={p} />
-                      </span>
-                    ) : (
-                      <ProviderSegment
-                        key={p.provider}
-                        p={p}
-                        compact={compact}
-                        display={usagePercentageDisplay}
-                        mode={statusBarUsageMode}
-                      />
-                    )
-                  )}
-                </button>
-              </DropdownMenuTrigger>
-              <DropdownMenuContent
-                {...STATUS_BAR_CONTEXT_MENU_EXEMPT_PROPS}
-                side="top"
-                align="start"
-                sideOffset={8}
-                // Keep the popover (and its drill-in submenus) above the status
-                // bar instead of overlapping it — bottom padding ≈ footer height.
-                collisionPadding={{ top: 8, bottom: 32, left: 8, right: 8 }}
-                className="w-[360px] p-0"
-                onPointerDownOutside={usageMenuFocusHandoff.onPointerDownOutside}
-                onCloseAutoFocus={usageMenuFocusHandoff.onCloseAutoFocus}
+      {/* Why: usage gives way first — what it drops stays one click away in its popover. */}
+      <div
+        className="status-bar-usage-cluster flex min-w-0 flex-1 items-center overflow-clip [overflow-clip-margin:3px]"
+        data-overflowing={overflowing}
+      >
+        <div ref={usageRef} className="flex shrink-0 items-center gap-3">
+          {isEmptyUsageState ? (
+            showEmptyUsageCta ? (
+              <StatusBarUsageEmptyCta />
+            ) : null
+          ) : hasVisibleUsageMeters ? (
+            // Consolidated roster pill → opens the all-agents Usage popover (mock parity).
+            <UsagePercentageDisplayChangeNotice hasVisibleUsageMeters={hasVisibleUsageMeters}>
+              <DropdownMenu
+                open={usageMenuOpen}
+                onOpenChange={handleUsageMenuOpenChange}
+                modal={false}
               >
-                <UsageRosterPanel
-                  providers={rosterProviders}
-                  display={usagePercentageDisplay}
-                  statusBarUsageMode={statusBarUsageMode}
-                  onStatusBarUsageModeChange={setStatusBarUsageMode}
-                  isRefreshing={isRefreshing || anyFetching}
-                  onRefresh={handleRefresh}
-                  onOpenProvider={handleOpenProviderAccounts}
-                  onSignIn={handleOpenProviderAccounts}
-                  canSignIn={(provider) => getUsageProviderAccountsSectionId(provider) !== null}
-                  onManageAccounts={handleManageAccounts}
-                  onUsageDetails={handleUsageDetails}
-                  renderRow={(p, rowNode) => {
-                    // Every provider drills into its detail panel (parity with the
-                    // per-provider dropdowns on main); Claude/Codex additionally get
-                    // the account switcher + runtime toggle + Codex reset credits.
-                    if (p.provider === 'claude') {
-                      return (
-                        <ClaudeSwitcherMenu
-                          claude={p}
+                <DropdownMenuTrigger asChild>
+                  <button
+                    type="button"
+                    className="inline-flex items-center gap-3 rounded px-1 py-0.5 hover:bg-accent/70"
+                    aria-label={translate(
+                      'auto.components.status.bar.UsageRosterPanel.title',
+                      'Usage'
+                    )}
+                  >
+                    {rosterProviders.map((p) => (
+                      // Why: collapsed chips leave the row but stay measurable, so the density hook can bring them back.
+                      <span
+                        key={p.provider}
+                        data-usage-chip={p.provider}
+                        data-usage-urgent={getUsageTone(p) === 'urgent'}
+                        data-usage-collapsed={collapsedUsageProviders.includes(p.provider)}
+                        aria-hidden={collapsedUsageProviders.includes(p.provider)}
+                        className="inline-flex data-[usage-collapsed=true]:invisible data-[usage-collapsed=true]:absolute"
+                      >
+                        <ProviderSegment
+                          p={p}
                           compact={compact}
-                          iconOnly={false}
-                          asSubmenu
-                          triggerContent={rowNode}
+                          display={usagePercentageDisplay}
+                          mode={usageTightestOnly ? 'compact' : statusBarUsageMode}
                         />
-                      )
-                    }
-                    if (p.provider === 'codex') {
+                      </span>
+                    ))}
+                    {collapseUsage ? (
+                      <UsageOverflowChip
+                        hidden={rosterProviders.filter((p) =>
+                          collapsedUsageProviders.includes(p.provider)
+                        )}
+                        display={usagePercentageDisplay}
+                      />
+                    ) : null}
+                  </button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent
+                  {...STATUS_BAR_CONTEXT_MENU_EXEMPT_PROPS}
+                  side="top"
+                  align="start"
+                  sideOffset={8}
+                  // Keep the popover (and its drill-in submenus) above the status
+                  // bar instead of overlapping it — bottom padding ≈ footer height.
+                  collisionPadding={{ top: 8, bottom: 32, left: 8, right: 8 }}
+                  className="w-[360px] p-0"
+                  onPointerDownOutside={usageMenuFocusHandoff.onPointerDownOutside}
+                  onCloseAutoFocus={usageMenuFocusHandoff.onCloseAutoFocus}
+                >
+                  <UsageRosterPanel
+                    providers={rosterProviders}
+                    display={usagePercentageDisplay}
+                    statusBarUsageMode={statusBarUsageMode}
+                    onStatusBarUsageModeChange={setStatusBarUsageMode}
+                    isRefreshing={isRefreshing || anyFetching}
+                    onRefresh={handleRefresh}
+                    onOpenProvider={handleOpenProviderAccounts}
+                    onSignIn={handleOpenProviderAccounts}
+                    canSignIn={(provider) => getUsageProviderAccountsSectionId(provider) !== null}
+                    onManageAccounts={handleManageAccounts}
+                    onUsageDetails={handleUsageDetails}
+                    renderRow={(p, rowNode) => {
+                      // Every provider drills into its detail panel (parity with the
+                      // per-provider dropdowns on main); Claude/Codex additionally get
+                      // the account switcher + runtime toggle + Codex reset credits.
+                      if (p.provider === 'claude') {
+                        return (
+                          <ClaudeSwitcherMenu
+                            claude={p}
+                            compact={compact}
+                            iconOnly={false}
+                            asSubmenu
+                            triggerContent={rowNode}
+                          />
+                        )
+                      }
+                      if (p.provider === 'codex') {
+                        return (
+                          <CodexSwitcherMenu
+                            codex={p}
+                            compact={compact}
+                            iconOnly={false}
+                            asSubmenu
+                            triggerContent={rowNode}
+                          />
+                        )
+                      }
                       return (
-                        <CodexSwitcherMenu
-                          codex={p}
+                        <ProviderDetailsMenu
+                          provider={p}
                           compact={compact}
                           iconOnly={false}
                           asSubmenu
                           triggerContent={rowNode}
+                          ariaLabel={translate(
+                            'auto.components.status.bar.UsageRosterPanel.openDetails',
+                            'Open usage details'
+                          )}
                         />
                       )
-                    }
-                    return (
-                      <ProviderDetailsMenu
-                        provider={p}
-                        compact={compact}
-                        iconOnly={false}
-                        asSubmenu
-                        triggerContent={rowNode}
-                        ariaLabel={translate(
-                          'auto.components.status.bar.UsageRosterPanel.openDetails',
-                          'Open usage details'
-                        )}
-                      />
-                    )
-                  }}
-                />
-              </DropdownMenuContent>
-            </DropdownMenu>
-          </UsagePercentageDisplayChangeNotice>
-        ) : null}
-        {anyVisible && !isEmptyUsageState && (
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <button
-                onClick={handleRefresh}
-                disabled={isRefreshing}
-                className="p-0.5 rounded hover:bg-accent text-muted-foreground hover:text-foreground transition-colors disabled:opacity-40"
-                aria-label={translate(
-                  'auto.components.status.bar.StatusBar.3325d996cb',
-                  'Refresh rate limits'
-                )}
-              >
-                <RefreshCw
-                  size={11}
-                  className={isRefreshing || anyFetching ? 'animate-spin' : ''}
-                />
-              </button>
-            </TooltipTrigger>
-            <TooltipContent side="top" sideOffset={6}>
-              {translate('auto.components.status.bar.StatusBar.c8857b40f7', 'Refresh usage data')}
-            </TooltipContent>
-          </Tooltip>
-        )}
-      </div>
-
-      <div className="flex-1" />
-
-      <div className="flex items-center gap-3">
-        {!isPairedWebClientWindow() ? <CaffeinateStatusSegment iconOnly={iconOnly} /> : null}
-        <RemoteServerUpdateStatusSegment iconOnly={iconOnly} />
-        <SkillUpdateStatusSegment iconOnly={iconOnly} />
-        <NativeChatResumeStatusSegment iconOnly={iconOnly} />
-        <UpdateStatusSegment compact={compact} iconOnly={iconOnly} />
-        <React.Suspense fallback={null}>
-          {petEnabled ? <PetStatusSegment /> : null}
-          {showResourceUsage ? (
-            <ResourceUsageStatusSegment compact={compact} iconOnly={iconOnly} />
+                    }}
+                  />
+                </DropdownMenuContent>
+              </DropdownMenu>
+            </UsagePercentageDisplayChangeNotice>
           ) : null}
-          {showPorts ? <PortsStatusSegment compact={compact} iconOnly={iconOnly} /> : null}
-          {showSsh ? <SshStatusSegment compact={compact} iconOnly={iconOnly} /> : null}
-        </React.Suspense>
-        {showFloatingTerminalToggle && (
-          <FloatingTerminalIconContextMenu currentLocation="status-bar" className="relative">
+          {anyVisible && !isEmptyUsageState && (
             <Tooltip>
               <TooltipTrigger asChild>
                 <button
-                  type="button"
-                  className="relative inline-flex size-5 cursor-pointer items-center justify-center rounded border border-border bg-secondary text-secondary-foreground shadow-xs transition-colors hover:bg-accent hover:text-accent-foreground"
-                  aria-label={
-                    showFloatingWorkspaceAttentionDot
-                      ? translate(
-                          'auto.components.status.bar.StatusBar.floatingTerminalNewActivity',
-                          '{{label}}, new activity',
-                          { label: floatingTerminalActionLabel }
-                        )
-                      : floatingTerminalActionLabel
-                  }
-                  onClick={() => {
-                    window.dispatchEvent(new CustomEvent(TOGGLE_FLOATING_TERMINAL_EVENT))
-                  }}
+                  onClick={handleRefresh}
+                  disabled={isRefreshing}
+                  className="p-0.5 rounded hover:bg-accent text-muted-foreground hover:text-foreground transition-colors disabled:opacity-40"
+                  aria-label={translate(
+                    'auto.components.status.bar.StatusBar.3325d996cb',
+                    'Refresh rate limits'
+                  )}
                 >
-                  <PanelsTopLeft className="size-3.5" />
-                  {showFloatingWorkspaceAttentionDot ? (
-                    // Why: amber = Orca's "needs attention" convention; ring matches the fill so the dot reads on the icon.
-                    <span
-                      aria-hidden
-                      data-floating-terminal-attention
-                      className="pointer-events-none absolute right-0.5 top-0.5 size-1.5 rounded-full bg-amber-500 ring-1 ring-secondary"
-                    />
-                  ) : null}
+                  <RefreshCw
+                    size={11}
+                    className={isRefreshing || anyFetching ? 'animate-spin' : ''}
+                  />
                 </button>
               </TooltipTrigger>
               <TooltipContent side="top" sideOffset={6}>
-                {floatingTerminalActionLabel} ({floatingTerminalShortcut})
+                {translate('auto.components.status.bar.StatusBar.c8857b40f7', 'Refresh usage data')}
               </TooltipContent>
             </Tooltip>
-          </FloatingTerminalIconContextMenu>
-        )}
+          )}
+        </div>
+      </div>
+
+      {/* Why: attention segments never clip; below the tightest density they scroll rather than vanish. */}
+      <div
+        className="min-w-0 data-[overflowing=true]:overflow-x-auto data-[overflowing=true]:scrollbar-none"
+        data-overflowing={overflowing}
+      >
+        <div ref={segmentsRef} className="flex w-max items-center gap-3">
+          {!isPairedWebClientWindow() ? (
+            <CaffeinateStatusSegment iconOnly={segmentsIconOnly} />
+          ) : null}
+          <RemoteServerUpdateStatusSegment iconOnly={segmentsIconOnly} />
+          <SkillUpdateStatusSegment iconOnly={segmentsIconOnly} />
+          <NativeChatResumeStatusSegment iconOnly={segmentsIconOnly} />
+          <UpdateStatusSegment compact={compact} iconOnly={segmentsIconOnly} />
+          <React.Suspense fallback={null}>
+            {petEnabled ? <PetStatusSegment /> : null}
+            {showResourceUsage ? (
+              <ResourceUsageStatusSegment compact={compact} iconOnly={segmentsIconOnly} />
+            ) : null}
+            {showPorts ? (
+              <PortsStatusSegment compact={compact} iconOnly={segmentsIconOnly} />
+            ) : null}
+            {showSsh ? <SshStatusSegment compact={compact} iconOnly={segmentsIconOnly} /> : null}
+          </React.Suspense>
+          {showFloatingTerminalToggle && (
+            <FloatingTerminalIconContextMenu currentLocation="status-bar" className="relative">
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <button
+                    type="button"
+                    className="relative inline-flex size-5 cursor-pointer items-center justify-center rounded border border-border bg-secondary text-secondary-foreground shadow-xs transition-colors hover:bg-accent hover:text-accent-foreground"
+                    aria-label={
+                      showFloatingWorkspaceAttentionDot
+                        ? translate(
+                            'auto.components.status.bar.StatusBar.floatingTerminalNewActivity',
+                            '{{label}}, new activity',
+                            { label: floatingTerminalActionLabel }
+                          )
+                        : floatingTerminalActionLabel
+                    }
+                    onClick={() => {
+                      window.dispatchEvent(new CustomEvent(TOGGLE_FLOATING_TERMINAL_EVENT))
+                    }}
+                  >
+                    <PanelsTopLeft className="size-3.5" />
+                    {showFloatingWorkspaceAttentionDot ? (
+                      // Why: amber = Orca's "needs attention" convention; ring matches the fill so the dot reads on the icon.
+                      <span
+                        aria-hidden
+                        data-floating-terminal-attention
+                        className="pointer-events-none absolute right-0.5 top-0.5 size-1.5 rounded-full bg-amber-500 ring-1 ring-secondary"
+                      />
+                    ) : null}
+                  </button>
+                </TooltipTrigger>
+                <TooltipContent side="top" sideOffset={6}>
+                  {floatingTerminalActionLabel} ({floatingTerminalShortcut})
+                </TooltipContent>
+              </Tooltip>
+            </FloatingTerminalIconContextMenu>
+          )}
+        </div>
       </div>
 
       <StatusBarVisibilityMenu controller={controller} />
diff --git a/src/renderer/src/components/status-bar/StatusBarVisibilityMenu.tsx b/src/renderer/src/components/status-bar/StatusBarVisibilityMenu.tsx
index a2dab03d9c09..c98f91c673ec 100644
--- a/src/renderer/src/components/status-bar/StatusBarVisibilityMenu.tsx
+++ b/src/renderer/src/components/status-bar/StatusBarVisibilityMenu.tsx
@@ -133,6 +133,18 @@ export function StatusBarVisibilityMenu({
             {translate('auto.components.status.bar.StatusBar.grokUsageMenu', 'Grok Usage')}
           </DropdownMenuCheckboxItem>
         )}
+        {isStatusBarItemAvailable('zcode', detectedAgentIds) && (
+          <DropdownMenuCheckboxItem
+            checked={statusBarItems.includes('zcode')}
+            onCheckedChange={() => {
+              recordFeatureInteraction('usage-tracking')
+              toggleStatusBarItem('zcode')
+            }}
+          >
+            <AgentIcon agent="zcode" size={14} />
+            {translate('auto.components.status.bar.StatusBar.zcodeUsageMenu', 'ZCode Usage')}
+          </DropdownMenuCheckboxItem>
+        )}
         <DropdownMenuCheckboxItem
           checked={statusBarItems.includes('cursor')}
           onCheckedChange={() => {
diff --git a/src/renderer/src/components/status-bar/UsageRosterPanel.test.tsx b/src/renderer/src/components/status-bar/UsageRosterPanel.test.tsx
index de4f5a0e06f8..4f538ea852fa 100644
--- a/src/renderer/src/components/status-bar/UsageRosterPanel.test.tsx
+++ b/src/renderer/src/components/status-bar/UsageRosterPanel.test.tsx
@@ -247,6 +247,35 @@ describe('UsageRow', () => {
     expect(markup).toContain('25%')
     expect(markup).toContain('60%')
   })
+
+  it('labels ZCode MCP separately from Coding Plan windows in both roster modes', () => {
+    const zcode: ProviderRateLimits = {
+      provider: 'zcode',
+      session: { usedPercent: 1, windowMinutes: 300, resetsAt: null, resetDescription: null },
+      weekly: { usedPercent: 94, windowMinutes: 10_080, resetsAt: null, resetDescription: null },
+      monthly: { usedPercent: 97, windowMinutes: 43_200, resetsAt: null, resetDescription: null },
+      updatedAt: mocks.now,
+      status: 'ok',
+      error: null
+    }
+    const renderRow = (mode: 'verbose' | 'compact') =>
+      renderToStaticMarkup(
+        <UsageRow
+          p={zcode}
+          display="used"
+          mode={mode}
+          state={{ kind: 'usage', statusLabel: null }}
+          showSignInAction={false}
+          now={mocks.now}
+        />
+      )
+
+    expect(renderRow('verbose')).toContain('data-usage-window="MCP"')
+    expect(renderRow('verbose')).toContain('MCP')
+    expect(renderRow('verbose')).not.toContain('30d')
+    expect(renderRow('compact')).toContain('MCP')
+    expect(renderRow('compact')).not.toContain('30d')
+  })
 })
 
 describe('UsageRosterPanel density picker', () => {
diff --git a/src/renderer/src/components/status-bar/UsageRosterPanel.tsx b/src/renderer/src/components/status-bar/UsageRosterPanel.tsx
index feb066fadca4..6163f1ba5489 100644
--- a/src/renderer/src/components/status-bar/UsageRosterPanel.tsx
+++ b/src/renderer/src/components/status-bar/UsageRosterPanel.tsx
@@ -49,6 +49,9 @@ function shortLabel(
   if (section.window === p.fableWeekly) {
     return 'Fable'
   }
+  if (p.provider === 'zcode' && section.window === p.monthly) {
+    return section.label
+  }
   return useRemainingDuration
     ? formatRateLimitWindowChipLabel(section.window)
     : formatWindowLabel(section.window.windowMinutes)
diff --git a/src/renderer/src/components/status-bar/resource-session-classification-parity.test.ts b/src/renderer/src/components/status-bar/resource-session-classification-parity.test.ts
deleted file mode 100644
index ec7c7a628486..000000000000
--- a/src/renderer/src/components/status-bar/resource-session-classification-parity.test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const CONTROLLER_PATH = resolve(__dirname, 'use-resource-usage-status-controller.ts')
-const DERIVED_MODEL_PATH = resolve(__dirname, 'use-resource-usage-derived-model.ts')
-
-/**
- * Both destructive paths — bulk "kill orphans" and a single row's kill — must classify from the
- * same binding inputs. When the merge call site re-listed the fields instead of reusing the
- * object, it silently omitted deferred SSH sessions: bulk cleanup spared them while the row's
- * kill destroyed them with no confirmation. Same bug, one click over (#8459).
- */
-describe('resource session classification parity', () => {
-  it('feeds the row merge the same binding inputs as the bulk selector', () => {
-    const source = readFileSync(DERIVED_MODEL_PATH, 'utf8')
-    const mergeCall = source.slice(
-      source.indexOf('mergeSnapshotAndSessions(resourceSnapshot'),
-      source.indexOf('ambiguousWorktreeIds\n          })')
-    )
-
-    expect(mergeCall).toContain('...resourceSessionBindings')
-    // Any of these appearing inline means the call site is re-deriving bindings and can drift.
-    for (const field of [
-      'ptyIdsByTabId,',
-      'tabsByWorktree,',
-      'terminalLayoutsByTabId,',
-      'deferredSshSessionIdsByTabId,',
-      'workspaceSessionReady,'
-    ]) {
-      expect(mergeCall).not.toContain(field)
-    }
-  })
-
-  it('keeps every binding source in the one object both paths read', () => {
-    const source = readFileSync(CONTROLLER_PATH, 'utf8')
-    const bindings = source.slice(
-      source.indexOf('const resourceSessionBindings = useMemo'),
-      source.indexOf('const popoverBodyRef')
-    )
-
-    for (const field of [
-      'ptyIdsByTabId',
-      'tabsByWorktree',
-      'terminalLayoutsByTabId',
-      'deferredSshSessionIdsByTabId',
-      'workspaceSessionReady'
-    ]) {
-      expect(bindings).toContain(field)
-    }
-  })
-})
diff --git a/src/renderer/src/components/status-bar/status-bar-agent-gating.test.ts b/src/renderer/src/components/status-bar/status-bar-agent-gating.test.ts
index cd98315df505..4c7ada35a47d 100644
--- a/src/renderer/src/components/status-bar/status-bar-agent-gating.test.ts
+++ b/src/renderer/src/components/status-bar/status-bar-agent-gating.test.ts
@@ -20,6 +20,7 @@ describe('isStatusBarItemAvailable', () => {
     expect(isStatusBarItemAvailable('gemini', null)).toBe(true)
     expect(isStatusBarItemAvailable('antigravity', null)).toBe(true)
     expect(isStatusBarItemAvailable('grok', null)).toBe(true)
+    expect(isStatusBarItemAvailable('zcode', null)).toBe(true)
   })
 
   it('hides CLI items not detected on PATH', () => {
@@ -28,6 +29,7 @@ describe('isStatusBarItemAvailable', () => {
     expect(isStatusBarItemAvailable('gemini', ['claude', 'codex'])).toBe(false)
     expect(isStatusBarItemAvailable('antigravity', ['claude', 'codex'])).toBe(false)
     expect(isStatusBarItemAvailable('grok', ['claude', 'kimi'])).toBe(false)
+    expect(isStatusBarItemAvailable('zcode', ['claude', 'kimi'])).toBe(false)
   })
 
   it('shows CLI items detected on PATH', () => {
@@ -36,5 +38,6 @@ describe('isStatusBarItemAvailable', () => {
     expect(isStatusBarItemAvailable('gemini', ['gemini'])).toBe(true)
     expect(isStatusBarItemAvailable('antigravity', ['antigravity'])).toBe(true)
     expect(isStatusBarItemAvailable('grok', ['grok'])).toBe(true)
+    expect(isStatusBarItemAvailable('zcode', ['zcode'])).toBe(true)
   })
 })
diff --git a/src/renderer/src/components/status-bar/status-bar-agent-gating.ts b/src/renderer/src/components/status-bar/status-bar-agent-gating.ts
index 145abef3a900..85f641b96d2d 100644
--- a/src/renderer/src/components/status-bar/status-bar-agent-gating.ts
+++ b/src/renderer/src/components/status-bar/status-bar-agent-gating.ts
@@ -13,7 +13,8 @@ const CLI_GATED_ITEMS: ReadonlySet<StatusBarItem> = new Set([
   'gemini',
   'kimi',
   'antigravity',
-  'grok'
+  'grok',
+  'zcode'
 ])
 
 export function isStatusBarItemAvailable(
diff --git a/src/renderer/src/components/status-bar/status-bar-container-observer.ts b/src/renderer/src/components/status-bar/status-bar-container-observer.ts
deleted file mode 100644
index 627b982efcde..000000000000
--- a/src/renderer/src/components/status-bar/status-bar-container-observer.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export function observeStatusBarContainer(
-  node: HTMLDivElement,
-  onWidthChange: (width: number) => void
-): ResizeObserver {
-  const observer = new ResizeObserver((entries) => {
-    for (const entry of entries) {
-      onWidthChange(entry.contentRect.width)
-    }
-  })
-  observer.observe(node)
-  return observer
-}
diff --git a/src/renderer/src/components/status-bar/status-bar-density.test.ts b/src/renderer/src/components/status-bar/status-bar-density.test.ts
new file mode 100644
index 000000000000..1ddcbaf35f08
--- /dev/null
+++ b/src/renderer/src/components/status-bar/status-bar-density.test.ts
@@ -0,0 +1,91 @@
+import { describe, expect, it } from 'vitest'
+import {
+  STATUS_BAR_DENSITY_LEVELS,
+  pickStatusBarDensityLevel,
+  recordStatusBarDensityWidth
+} from './status-bar-density'
+
+const TIGHTEST = STATUS_BAR_DENSITY_LEVELS.length - 1
+const w = (natural: number, fit = natural) => ({ natural, fit })
+
+describe('STATUS_BAR_DENSITY_LEVELS', () => {
+  it('collapses usage into "+N" before right-side segments lose their labels', () => {
+    const firstCollapse = STATUS_BAR_DENSITY_LEVELS.findIndex((level) => level.collapseUsage)
+    const firstIconOnly = STATUS_BAR_DENSITY_LEVELS.findIndex((level) => level.segmentsIconOnly)
+    expect(firstCollapse).toBeGreaterThan(-1)
+    expect(firstCollapse).toBeLessThan(firstIconOnly)
+  })
+})
+
+describe('pickStatusBarDensityLevel', () => {
+  it('keeps the roomiest level that fits', () => {
+    expect(pickStatusBarDensityLevel([w(700), w(600), w(500), w(400), w(300)], 800)).toBe(0)
+    expect(pickStatusBarDensityLevel([w(700), w(600), w(500), w(400), w(300)], 550)).toBe(2)
+  })
+
+  it('fits a collapsing level by its collapsed width, not its natural width', () => {
+    // Level 3 would need 500 with every chip, but 380 with calm chips folded into "+N".
+    expect(pickStatusBarDensityLevel([w(700), w(600), w(500), w(500, 380), w(300)], 400)).toBe(3)
+  })
+
+  it('probes an unmeasured level before settling on a tighter one', () => {
+    expect(pickStatusBarDensityLevel([w(700), undefined, w(500)], 650)).toBe(1)
+    expect(pickStatusBarDensityLevel([], 650)).toBe(0)
+  })
+
+  it('falls back to the tightest level when nothing fits', () => {
+    expect(pickStatusBarDensityLevel([w(700), w(600), w(500), w(400), w(300)], 200)).toBe(TIGHTEST)
+  })
+
+  it('tolerates sub-pixel rounding at the boundary', () => {
+    expect(pickStatusBarDensityLevel([w(600.6)], 600)).toBe(0)
+  })
+})
+
+describe('recordStatusBarDensityWidth', () => {
+  it('fills in a level without disturbing the others', () => {
+    expect(recordStatusBarDensityWidth([w(700), undefined, w(500)], 1, w(600))).toEqual([
+      w(700),
+      w(600),
+      w(500)
+    ])
+  })
+
+  it('forgets other levels when a level re-measures differently', () => {
+    // A segment appeared or vanished, so the other levels' widths no longer describe the bar.
+    expect(recordStatusBarDensityWidth([w(700), w(600), w(500)], 1, w(640))).toEqual([
+      undefined,
+      w(640)
+    ])
+  })
+
+  it('drops only the other collapsing levels when only the collapsed width moves', () => {
+    // Urgency changes which chips collapse, moving fit widths but never the natural one.
+    expect(
+      recordStatusBarDensityWidth(
+        [w(700), w(600), w(500), w(600, 450), w(500, 400)],
+        3,
+        w(600, 430)
+      )
+    ).toEqual([w(700), w(600), w(500), w(600, 430), undefined])
+  })
+
+  it('re-probes a roomier collapsing level once the tightest level sees its fit move', () => {
+    // Level 3's stale fit (450) kept the bar at level 4; fewer urgent chips now let it fit.
+    const settled = [w(700), w(600), w(500), w(600, 450), w(500, 400)]
+    expect(pickStatusBarDensityLevel(settled, 420)).toBe(TIGHTEST)
+    const remeasured = recordStatusBarDensityWidth(settled, TIGHTEST, w(500, 380))
+    expect(remeasured).toEqual([w(700), w(600), w(500), undefined, w(500, 380)])
+    expect(pickStatusBarDensityLevel(remeasured, 420)).toBe(3)
+    const probed = recordStatusBarDensityWidth(remeasured, 3, w(600, 410))
+    expect(pickStatusBarDensityLevel(probed, 420)).toBe(3)
+  })
+
+  it('keeps other levels on a sub-pixel re-measure', () => {
+    expect(recordStatusBarDensityWidth([w(700), w(600), w(500)], 1, w(600.5))).toEqual([
+      w(700),
+      w(600.5),
+      w(500)
+    ])
+  })
+})
diff --git a/src/renderer/src/components/status-bar/status-bar-density.ts b/src/renderer/src/components/status-bar/status-bar-density.ts
new file mode 100644
index 000000000000..6801d9103589
--- /dev/null
+++ b/src/renderer/src/components/status-bar/status-bar-density.ts
@@ -0,0 +1,183 @@
+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
+import type { MutableRefObject } from 'react'
+import { measureUsageRow, pickCollapsedUsageChips } from './status-bar-usage-collapse'
+
+export type StatusBarDensity = {
+  /** Drop usage mini bars and secondary segment labels. */
+  compact: boolean
+  /** One percentage per provider, whatever the chosen usage mode. */
+  usageTightestOnly: boolean
+  /** Right-side segments show icon + count; tooltips carry the label. */
+  segmentsIconOnly: boolean
+  /** Calm providers give way to a "+N" chip when even one percentage each doesn't fit. */
+  collapseUsage: boolean
+}
+
+// Why: ordered roomiest → tightest so each step gives up the least useful detail first.
+// Usage gives way before right-side labels (collapsing into "+N" before those go
+// icon-only) because the Usage popover holds everything the bar drops.
+export const STATUS_BAR_DENSITY_LEVELS: readonly StatusBarDensity[] = [
+  { compact: false, usageTightestOnly: false, segmentsIconOnly: false, collapseUsage: false },
+  { compact: true, usageTightestOnly: false, segmentsIconOnly: false, collapseUsage: false },
+  { compact: true, usageTightestOnly: true, segmentsIconOnly: false, collapseUsage: false },
+  { compact: true, usageTightestOnly: true, segmentsIconOnly: false, collapseUsage: true },
+  { compact: true, usageTightestOnly: true, segmentsIconOnly: true, collapseUsage: true }
+]
+
+export type StatusBarLevelWidth = {
+  /** Width with every usage chip shown; a change here means the content changed. */
+  natural: number
+  /** Narrowest the level can get: natural, or with calm chips collapsed where the level allows it. */
+  fit: number
+}
+const NO_COLLAPSED_USAGE: readonly string[] = []
+
+const WIDTH_TOLERANCE_PX = 1
+
+/** Roomiest level known to fit; an unmeasured level is returned so it gets probed. */
+export function pickStatusBarDensityLevel(
+  levelWidths: readonly (StatusBarLevelWidth | undefined)[],
+  availableWidth: number
+): number {
+  const tightest = STATUS_BAR_DENSITY_LEVELS.length - 1
+  for (let level = 0; level < tightest; level++) {
+    const width = levelWidths[level]
+    if (width === undefined || width.fit <= availableWidth + WIDTH_TOLERANCE_PX) {
+      return level
+    }
+  }
+  return tightest
+}
+
+/** A level measuring differently than before means the content changed, so every other level's width is stale. */
+export function recordStatusBarDensityWidth(
+  levelWidths: readonly (StatusBarLevelWidth | undefined)[],
+  level: number,
+  width: StatusBarLevelWidth
+): (StatusBarLevelWidth | undefined)[] {
+  const previous = levelWidths[level]
+  const naturalChanged =
+    previous !== undefined && Math.abs(previous.natural - width.natural) > WIDTH_TOLERANCE_PX
+  // Why: urgency can change which chips pin without moving the natural width.
+  const fitChanged =
+    previous !== undefined && Math.abs(previous.fit - width.fit) > WIDTH_TOLERANCE_PX
+  const next = naturalChanged
+    ? []
+    : fitChanged
+      ? levelWidths.map((entry, index) =>
+          STATUS_BAR_DENSITY_LEVELS[index]?.collapseUsage ? undefined : entry
+        )
+      : [...levelWidths]
+  next[level] = width
+  return next
+}
+
+type ElementRef = MutableRefObject<HTMLElement | null>
+
+function measureWidth(ref: ElementRef): number {
+  return ref.current?.getBoundingClientRect().width ?? 0
+}
+
+/**
+ * Picks the roomiest density at which the usage cluster and the right-side segments fit
+ * on one line. Widths are measured from the rendered content, so a transient segment
+ * (update ready, chats to resume) condenses the bar only while it is present. At the
+ * collapsing levels it also names the usage chips that give way to a "+N" chip.
+ */
+export function useStatusBarDensity(): {
+  density: StatusBarDensity
+  overflowing: boolean
+  collapsedUsageProviders: readonly string[]
+  barRef: (node: HTMLElement | null) => void
+  usageRef: (node: HTMLElement | null) => void
+  segmentsRef: (node: HTMLElement | null) => void
+} {
+  const [level, setLevel] = useState(0)
+  const [overflowing, setOverflowing] = useState(false)
+  const [collapsedUsageProviders, setCollapsedUsageProviders] = useState(NO_COLLAPSED_USAGE)
+  const committedLevelRef = useRef(0)
+  const overflowingRef = useRef(false)
+  const collapsedUsageRef = useRef(NO_COLLAPSED_USAGE)
+  const levelWidthsRef = useRef<(StatusBarLevelWidth | undefined)[]>([])
+  const barElementRef = useRef<HTMLElement | null>(null)
+  const usageElementRef = useRef<HTMLElement | null>(null)
+  const segmentsElementRef = useRef<HTMLElement | null>(null)
+  const observerRef = useRef<ResizeObserver | null>(null)
+
+  const evaluate = useCallback((): void => {
+    const bar = barElementRef.current
+    if (!bar) {
+      return
+    }
+    const style = getComputedStyle(bar)
+    const available =
+      bar.clientWidth - Number.parseFloat(style.paddingLeft) - Number.parseFloat(style.paddingRight)
+    const usage = measureUsageRow(usageElementRef.current)
+    const fixedWidth = (Number.parseFloat(style.columnGap) || 0) + measureWidth(segmentsElementRef)
+    const required = usage.naturalWidth + fixedWidth
+    const collapses = STATUS_BAR_DENSITY_LEVELS[committedLevelRef.current].collapseUsage
+    levelWidthsRef.current = recordStatusBarDensityWidth(
+      levelWidthsRef.current,
+      committedLevelRef.current,
+      { natural: required, fit: collapses ? usage.pinnedWidth + fixedWidth : required }
+    )
+    const nextLevel = pickStatusBarDensityLevel(levelWidthsRef.current, available)
+    if (nextLevel !== committedLevelRef.current) {
+      setLevel(nextLevel)
+    }
+    const collapsible =
+      nextLevel === committedLevelRef.current && STATUS_BAR_DENSITY_LEVELS[nextLevel].collapseUsage
+    const nextCollapsed = collapsible
+      ? pickCollapsedUsageChips(
+          usage.chips,
+          required - available - WIDTH_TOLERANCE_PX,
+          usage.moreChipWidth,
+          usage.chipGap
+        )
+      : NO_COLLAPSED_USAGE
+    if (nextCollapsed.join() !== collapsedUsageRef.current.join()) {
+      collapsedUsageRef.current = nextCollapsed
+      setCollapsedUsageProviders(nextCollapsed)
+    }
+    const nextOverflowing = usage.renderedWidth + fixedWidth > available + WIDTH_TOLERANCE_PX
+    if (nextOverflowing !== overflowingRef.current) {
+      overflowingRef.current = nextOverflowing
+      setOverflowing(nextOverflowing)
+    }
+  }, [])
+
+  // Why: runs before paint, so probing a roomier level that turns out not to fit never flashes.
+  useLayoutEffect(() => {
+    committedLevelRef.current = level
+    evaluate()
+  })
+
+  useEffect(() => () => observerRef.current?.disconnect(), [])
+
+  const refs = useMemo(() => {
+    const bind =
+      (target: ElementRef) =>
+      (node: HTMLElement | null): void => {
+        observerRef.current ??= new ResizeObserver(() => evaluate())
+        if (target.current) {
+          observerRef.current.unobserve(target.current)
+        }
+        target.current = node
+        if (node) {
+          observerRef.current.observe(node)
+        }
+      }
+    return {
+      barRef: bind(barElementRef),
+      usageRef: bind(usageElementRef),
+      segmentsRef: bind(segmentsElementRef)
+    }
+  }, [evaluate])
+
+  return {
+    density: STATUS_BAR_DENSITY_LEVELS[level],
+    overflowing,
+    collapsedUsageProviders,
+    ...refs
+  }
+}
diff --git a/src/renderer/src/components/status-bar/status-bar-provider-visibility.test.ts b/src/renderer/src/components/status-bar/status-bar-provider-visibility.test.ts
index b144ddbdeaea..987bb91c040e 100644
--- a/src/renderer/src/components/status-bar/status-bar-provider-visibility.test.ts
+++ b/src/renderer/src/components/status-bar/status-bar-provider-visibility.test.ts
@@ -459,7 +459,8 @@ describe('isUsageEmptyState', () => {
           antigravity: provider('unavailable', { provider: 'antigravity' }),
           minimax: provider('unavailable', { provider: 'minimax' }),
           grok: provider('unavailable', { provider: 'grok' }),
-          cursor: provider('unavailable', { provider: 'cursor' })
+          cursor: provider('unavailable', { provider: 'cursor' }),
+          zcode: provider('unavailable', { provider: 'zcode' })
         },
         usageSettings()
       )
@@ -478,7 +479,8 @@ describe('isUsageEmptyState', () => {
           antigravity: provider('unavailable', { provider: 'antigravity' }),
           minimax: provider('unavailable', { provider: 'minimax' }),
           grok: provider('unavailable', { provider: 'grok' }),
-          cursor: provider('unavailable', { provider: 'cursor' })
+          cursor: provider('unavailable', { provider: 'cursor' }),
+          zcode: provider('unavailable', { provider: 'zcode' })
         },
         usageSettings({
           codexManagedAccounts: [
@@ -501,22 +503,21 @@ describe('isUsageEmptyState', () => {
   })
 
   it('shows the setup CTA for a loaded profile with no configured usage provider', () => {
-    expect(
-      isUsageEmptyState(
-        {
-          claude: provider('unavailable', { provider: 'claude' }),
-          codex: provider('unavailable', { provider: 'codex' }),
-          gemini: provider('unavailable'),
-          opencodeGo: provider('unavailable', { provider: 'opencode-go' }),
-          kimi: provider('unavailable', { provider: 'kimi' }),
-          antigravity: null,
-          minimax: provider('unavailable', { provider: 'minimax' }),
-          grok: provider('unavailable', { provider: 'grok' }),
-          cursor: provider('unavailable', { provider: 'cursor' })
-        },
-        usageSettings()
-      )
-    ).toBe(true)
+    const settledProviders = {
+      claude: provider('unavailable', { provider: 'claude' }),
+      codex: provider('unavailable', { provider: 'codex' }),
+      gemini: provider('unavailable'),
+      opencodeGo: provider('unavailable', { provider: 'opencode-go' }),
+      kimi: provider('unavailable', { provider: 'kimi' }),
+      antigravity: null,
+      minimax: provider('unavailable', { provider: 'minimax' }),
+      grok: provider('unavailable', { provider: 'grok' }),
+      cursor: provider('unavailable', { provider: 'cursor' }),
+      zcode: provider('unavailable', { provider: 'zcode' })
+    }
+    expect(isUsageEmptyState(settledProviders, usageSettings())).toBe(true)
+    expect(isUsageEmptyState({ ...settledProviders, zcode: undefined }, usageSettings())).toBe(true)
+    expect(isUsageEmptyState({ ...settledProviders, zcode: null }, usageSettings())).toBe(false)
   })
 
   it('does not show the setup CTA while checked Antigravity usage is awaiting a snapshot', () => {
@@ -531,7 +532,8 @@ describe('isUsageEmptyState', () => {
           antigravity: null,
           grok: provider('unavailable', { provider: 'grok' }),
           minimax: provider('unavailable', { provider: 'minimax' }),
-          cursor: provider('unavailable', { provider: 'cursor' })
+          cursor: provider('unavailable', { provider: 'cursor' }),
+          zcode: provider('unavailable', { provider: 'zcode' })
         },
         usageSettings({ antigravityUsageConfigured: true, geminiCliOAuthEnabled: true })
       )
@@ -552,7 +554,8 @@ describe('isUsageEmptyState', () => {
           antigravity: null,
           grok: provider('unavailable', { provider: 'grok' }),
           minimax: provider('unavailable', { provider: 'minimax' }),
-          cursor: provider('unavailable', { provider: 'cursor' })
+          cursor: provider('unavailable', { provider: 'cursor' }),
+          zcode: provider('unavailable', { provider: 'zcode' })
         },
         usageSettings({ antigravityUsageConfigured: true })
       )
diff --git a/src/renderer/src/components/status-bar/status-bar-provider-visibility.ts b/src/renderer/src/components/status-bar/status-bar-provider-visibility.ts
index 086540781d71..24392aa48ab3 100644
--- a/src/renderer/src/components/status-bar/status-bar-provider-visibility.ts
+++ b/src/renderer/src/components/status-bar/status-bar-provider-visibility.ts
@@ -34,6 +34,7 @@ type UsageProviderSnapshots = {
   minimax: ProviderRateLimits | null | undefined
   grok: ProviderRateLimits | null | undefined
   cursor: ProviderRateLimits | null | undefined
+  zcode?: ProviderRateLimits | null
 }
 
 type UsageProviderId = ProviderRateLimits['provider']
@@ -181,7 +182,8 @@ export function isUsageEmptyState(
     antigravitySnapshotPending ||
     isProviderSnapshotPending(providers.minimax) ||
     isProviderSnapshotPending(providers.grok) ||
-    isProviderSnapshotPending(providers.cursor)
+    isProviderSnapshotPending(providers.cursor) ||
+    (providers.zcode !== undefined && isProviderSnapshotPending(providers.zcode))
   ) {
     return false
   }
@@ -195,6 +197,7 @@ export function isUsageEmptyState(
     !isProviderConfigured(providers.antigravity) &&
     !isProviderConfigured(providers.minimax) &&
     !isProviderConfigured(providers.grok) &&
-    !isProviderConfigured(providers.cursor)
+    !isProviderConfigured(providers.cursor) &&
+    !isProviderConfigured(providers.zcode)
   )
 }
diff --git a/src/renderer/src/components/status-bar/status-bar-usage-collapse.test.ts b/src/renderer/src/components/status-bar/status-bar-usage-collapse.test.ts
new file mode 100644
index 000000000000..9abddbb902ee
--- /dev/null
+++ b/src/renderer/src/components/status-bar/status-bar-usage-collapse.test.ts
@@ -0,0 +1,46 @@
+import { describe, expect, it } from 'vitest'
+import { pickCollapsedUsageChips } from './status-bar-usage-collapse'
+
+const GAP = 12
+const MORE = 20
+// Roster order, as the status bar renders it.
+const chips = [
+  { provider: 'claude', width: 60, urgent: false },
+  { provider: 'codex', width: 60, urgent: false },
+  { provider: 'gemini', width: 60, urgent: false },
+  { provider: 'grok', width: 60, urgent: false },
+  { provider: 'cursor', width: 60, urgent: true }
+]
+
+describe('pickCollapsedUsageChips', () => {
+  it('collapses nothing when the row fits', () => {
+    expect(pickCollapsedUsageChips(chips, 0, MORE, GAP)).toEqual([])
+    expect(pickCollapsedUsageChips(chips, -40, MORE, GAP)).toEqual([])
+  })
+
+  it('drops calm agents from the end of the roster and keeps the urgent one', () => {
+    // 10px over: one chip frees 72px, which also pays for the "+N" chip (20 + 12).
+    expect(pickCollapsedUsageChips(chips, 10, MORE, GAP)).toEqual(['grok'])
+    expect(pickCollapsedUsageChips(chips, 60, MORE, GAP)).toEqual(['grok', 'gemini'])
+  })
+
+  it('reserves room for the "+N" chip it introduces', () => {
+    // 41px over + 32px for "+N" = 73px, one more than a single chip frees.
+    expect(pickCollapsedUsageChips(chips, 41, MORE, GAP)).toEqual(['grok', 'gemini'])
+  })
+
+  it('drops urgent agents only after every calm one', () => {
+    expect(pickCollapsedUsageChips(chips, 300, MORE, GAP)).toEqual([
+      'grok',
+      'gemini',
+      'codex',
+      'claude',
+      'cursor'
+    ])
+  })
+
+  it('drops urgent agents from the end of the roster too', () => {
+    const allUrgent = chips.map((chip) => ({ ...chip, urgent: true }))
+    expect(pickCollapsedUsageChips(allUrgent, 10, MORE, GAP)).toEqual(['cursor'])
+  })
+})
diff --git a/src/renderer/src/components/status-bar/status-bar-usage-collapse.ts b/src/renderer/src/components/status-bar/status-bar-usage-collapse.ts
new file mode 100644
index 000000000000..4a08acd8f126
--- /dev/null
+++ b/src/renderer/src/components/status-bar/status-bar-usage-collapse.ts
@@ -0,0 +1,93 @@
+export type UsageChipMeasure = {
+  provider: string
+  width: number
+  urgent: boolean
+  collapsed: boolean
+}
+
+export type UsageRowMeasure = {
+  /** Width of the usage row as if every chip were shown, so collapsing never reads as a content change. */
+  naturalWidth: number
+  /** Width with every calm chip collapsed into "+N", keeping urgent ones. */
+  pinnedWidth: number
+  /** Width the row actually occupies right now. */
+  renderedWidth: number
+  chips: UsageChipMeasure[]
+  moreChipWidth: number
+  chipGap: number
+}
+
+/**
+ * Chooses which usage chips give way so the row sheds `overflowPx`. Calm agents go first,
+ * from the end of the roster; urgent ones only when calm ones can't free enough room.
+ */
+export function pickCollapsedUsageChips(
+  chips: readonly Pick<UsageChipMeasure, 'provider' | 'width' | 'urgent'>[],
+  overflowPx: number,
+  moreChipWidth: number,
+  chipGap: number
+): string[] {
+  if (overflowPx <= 0) {
+    return []
+  }
+  // The first collapsed chip brings the "+N" chip (and its gap) into the row.
+  const needed = overflowPx + moreChipWidth + chipGap
+  const dropOrder = [
+    ...chips.filter((chip) => !chip.urgent).toReversed(),
+    ...chips.filter((chip) => chip.urgent).toReversed()
+  ]
+  const collapsed: string[] = []
+  let freed = 0
+  for (const chip of dropOrder) {
+    if (freed >= needed) {
+      break
+    }
+    collapsed.push(chip.provider)
+    freed += chip.width + chipGap
+  }
+  return collapsed
+}
+
+/** Reads the `data-usage-*` markers the status bar renders on its usage chips and "+N" chip. */
+export function measureUsageRow(usage: HTMLElement | null): UsageRowMeasure {
+  if (!usage) {
+    return {
+      naturalWidth: 0,
+      pinnedWidth: 0,
+      renderedWidth: 0,
+      chips: [],
+      moreChipWidth: 0,
+      chipGap: 0
+    }
+  }
+  const renderedWidth = usage.getBoundingClientRect().width
+  const chipElements = [...usage.querySelectorAll<HTMLElement>('[data-usage-chip]')]
+  const chipRow = chipElements[0]?.parentElement
+  const chipGap = chipRow ? Number.parseFloat(getComputedStyle(chipRow).columnGap) || 0 : 0
+  const chips = chipElements.map((element) => ({
+    provider: element.dataset.usageChip ?? '',
+    width: element.getBoundingClientRect().width,
+    urgent: element.dataset.usageUrgent === 'true',
+    collapsed: element.dataset.usageCollapsed === 'true'
+  }))
+  const more = usage.querySelector<HTMLElement>('[data-usage-more]')
+  const moreChipWidth = more?.getBoundingClientRect().width ?? 0
+  const moreInRow = more !== null && more.dataset.usageCollapsed !== 'true'
+  const collapsedWidth = chips
+    .filter((chip) => chip.collapsed)
+    .reduce((sum, chip) => sum + chip.width + chipGap, 0)
+  const naturalWidth = renderedWidth + collapsedWidth - (moreInRow ? moreChipWidth + chipGap : 0)
+  const calmChips = chips.filter((chip) => !chip.urgent)
+  const pinnedWidth =
+    naturalWidth -
+    calmChips.reduce((sum, chip) => sum + chip.width + chipGap, 0) +
+    (calmChips.length > 0 ? moreChipWidth + chipGap : 0)
+  return {
+    naturalWidth,
+    pinnedWidth,
+    renderedWidth,
+    chips,
+    moreChipWidth,
+    chipGap
+  }
+}
diff --git a/src/renderer/src/components/status-bar/tooltip.test.ts b/src/renderer/src/components/status-bar/tooltip.test.ts
index fd7561e250cd..f08f1e4a1ebd 100644
--- a/src/renderer/src/components/status-bar/tooltip.test.ts
+++ b/src/renderer/src/components/status-bar/tooltip.test.ts
@@ -54,7 +54,8 @@ const PROVIDER_IDS: ProviderRateLimits['provider'][] = [
   'opencode-go',
   'kimi',
   'minimax',
-  'grok'
+  'grok',
+  'zcode'
 ]
 
 afterEach(() => {
@@ -294,6 +295,18 @@ describe('provider usage error copy', () => {
 })
 
 describe('getWindowSections', () => {
+  it('keeps ZCode Coding Plan windows separate from MCP quota', () => {
+    const session = { usedPercent: 25, windowMinutes: 300, resetsAt: null, resetDescription: null }
+    const weekly = { usedPercent: 40, windowMinutes: 10080, resetsAt: null, resetDescription: null }
+    const mcp = { usedPercent: 10, windowMinutes: 43200, resetsAt: null, resetDescription: null }
+    const sections = getWindowSections(
+      provider({ provider: 'zcode', session, weekly, monthly: mcp })
+    )
+
+    expect(sections.map((section) => section.label)).toEqual(['Session', 'Weekly', 'MCP'])
+    expect(sections[2].window).toBe(mcp)
+  })
+
   it('returns buckets as sections when present', () => {
     const p: ProviderRateLimits = {
       provider: 'gemini',
diff --git a/src/renderer/src/components/status-bar/tooltip.tsx b/src/renderer/src/components/status-bar/tooltip.tsx
index be15ae18c02f..735452c9e266 100644
--- a/src/renderer/src/components/status-bar/tooltip.tsx
+++ b/src/renderer/src/components/status-bar/tooltip.tsx
@@ -97,6 +97,9 @@ export function ProviderIcon({ provider }: { provider: string }): React.JSX.Elem
   if (provider === 'grok') {
     return <AgentIcon agent="grok" size={13} />
   }
+  if (provider === 'zcode') {
+    return <AgentIcon agent="zcode" size={13} />
+  }
   if (provider === 'cursor') {
     return <AgentIcon agent="cursor" size={13} />
   }
@@ -186,7 +189,10 @@ export function getWindowSections(
   }
   if (p.monthly !== undefined && p.monthly !== null) {
     sections.push({
-      label: translate('auto.components.status.bar.tooltip.7f7f208060', 'Monthly'),
+      label:
+        p.provider === 'zcode'
+          ? translate('auto.components.status.bar.tooltip.zcode.mcp', 'MCP')
+          : translate('auto.components.status.bar.tooltip.7f7f208060', 'Monthly'),
       window: p.monthly
     })
   }
@@ -204,11 +210,14 @@ export function getWindowSections(
 
 // Why: urgency color tracks % used even when fill represents % remaining;
 // low usage stays neutral so persistent chrome stays quiet.
+export const USAGE_WARNING_PERCENT = 60
+export const USAGE_URGENT_PERCENT = 80
+
 export function barColor(usedPct: number): string {
-  if (usedPct < 60) {
+  if (usedPct < USAGE_WARNING_PERCENT) {
     return 'bg-muted-foreground/40'
   }
-  if (usedPct < 80) {
+  if (usedPct < USAGE_URGENT_PERCENT) {
     return 'bg-yellow-500'
   }
   return 'bg-red-500'
diff --git a/src/renderer/src/components/status-bar/usage-error-copy.ts b/src/renderer/src/components/status-bar/usage-error-copy.ts
index a0a6cabf1a9a..95942ddb5b72 100644
--- a/src/renderer/src/components/status-bar/usage-error-copy.ts
+++ b/src/renderer/src/components/status-bar/usage-error-copy.ts
@@ -26,6 +26,9 @@ export function getProviderDisplayName(provider: ProviderRateLimits['provider'])
   if (provider === 'grok') {
     return 'Grok'
   }
+  if (provider === 'zcode') {
+    return 'ZCode'
+  }
   if (provider === 'cursor') {
     return 'Cursor'
   }
diff --git a/src/renderer/src/components/status-bar/usage-provider-settings-target.ts b/src/renderer/src/components/status-bar/usage-provider-settings-target.ts
index 39380e135950..b531bffd161e 100644
--- a/src/renderer/src/components/status-bar/usage-provider-settings-target.ts
+++ b/src/renderer/src/components/status-bar/usage-provider-settings-target.ts
@@ -21,7 +21,9 @@ export function getUsageProviderAccountsSectionId(
     case 'cursor':
       return 'accounts-cursor'
     case 'kimi':
+    case 'zcode':
       // Why: Orca must not mutate Kimi's CLI-owned credential lifecycle.
+      // ZCode likewise owns its Coding Plan credential in ~/.zcode/cli/config.json.
       return null
   }
 }
diff --git a/src/renderer/src/components/status-bar/use-status-bar-controller.ts b/src/renderer/src/components/status-bar/use-status-bar-controller.ts
index b7f57c7f1e7b..8ec0bcfce437 100644
--- a/src/renderer/src/components/status-bar/use-status-bar-controller.ts
+++ b/src/renderer/src/components/status-bar/use-status-bar-controller.ts
@@ -9,7 +9,7 @@ import { isStatusBarItemAvailable } from './status-bar-agent-gating'
 import { getVisibleUsageProvider, isUsageEmptyState } from './status-bar-provider-visibility'
 import { getUsageProviderAccountsSectionId } from './usage-provider-settings-target'
 import { CLOSE_ALL_CONTEXT_MENUS_EVENT, useStatusBarMenuFocusHandoff } from './ProviderDetailsMenu'
-import { observeStatusBarContainer } from './status-bar-container-observer'
+import { useStatusBarDensity } from './status-bar-density'
 
 export function useStatusBarController(floatingTerminalOpen: boolean) {
   const floatingTerminalShortcut = useShortcutLabel('floatingTerminal.toggle')
@@ -40,14 +40,18 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
   const petEnabled = useAppStore((s) => s.settings?.experimentalPet === true)
   const toggleStatusBarItem = useAppStore((s) => s.toggleStatusBarItem)
   const usageEmptyStateDismissed = useAppStore((s) => s.usageEmptyStateDismissed)
-  const containerRef = useRef<HTMLDivElement>(null)
   const mountedRef = useRef(true)
   const [isRefreshing, setIsRefreshing] = useState(false)
   const [menuOpen, setMenuOpen] = useState(false)
   const [menuPoint, setMenuPoint] = useState({ x: 0, y: 0 })
-
-  const [containerWidth, setContainerWidth] = useState(900)
-  const resizeObserverRef = useRef<ResizeObserver | null>(null)
+  const {
+    density: { compact, usageTightestOnly, segmentsIconOnly, collapseUsage },
+    overflowing,
+    collapsedUsageProviders,
+    barRef,
+    usageRef,
+    segmentsRef
+  } = useStatusBarDensity()
 
   useEffect(() => {
     mountedRef.current = true
@@ -67,18 +71,6 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
     void ensureDetectedAgents()
   }, [ensureDetectedAgents])
 
-  const containerRefCallback = useCallback((node: HTMLDivElement | null) => {
-    if (resizeObserverRef.current) {
-      resizeObserverRef.current.disconnect()
-      resizeObserverRef.current = null
-    }
-    if (node) {
-      containerRef.current = node
-      resizeObserverRef.current = observeStatusBarContainer(node, setContainerWidth)
-      setContainerWidth(node.getBoundingClientRect().width)
-    }
-  }, [])
-
   const refreshDetectedAgents = useAppStore((s) => s.refreshDetectedAgents)
   const handleRefresh = useCallback(async () => {
     if (isRefreshing) {
@@ -99,7 +91,8 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
     return null
   }
 
-  const { claude, codex, gemini, opencodeGo, kimi, antigravity, minimax, grok, cursor } = rateLimits
+  const { claude, codex, gemini, opencodeGo, kimi, antigravity, minimax, grok, cursor, zcode } =
+    rateLimits
 
   // Why: a bar is earned by a live snapshot or durable Settings setup; detection-gating hides per-CLI bars when the agent isn't on PATH.
   // Why: Antigravity has no persisted credential, so a checked status item + detected CLI is the durable "show its slot" signal.
@@ -125,6 +118,7 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
   const visibleMiniMax = getVisibleUsageProvider('minimax', minimax, usageSettings)
   const visibleGrok = getVisibleUsageProvider('grok', grok, usageSettings)
   const visibleCursor = getVisibleUsageProvider('cursor', cursor, usageSettings)
+  const visibleZcode = getVisibleUsageProvider('zcode', zcode, usageSettings)
   const showClaude =
     visibleClaude !== null &&
     statusBarItems.includes('claude') &&
@@ -154,6 +148,10 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
   // Why: a Cursor session can come from the IDE alone, so PATH detection of
   // cursor-agent would hide a real meter from IDE-only users.
   const showCursor = visibleCursor !== null && statusBarItems.includes('cursor')
+  const showZcode =
+    visibleZcode !== null &&
+    statusBarItems.includes('zcode') &&
+    isStatusBarItemAvailable('zcode', detectedAgentIds)
   // Why: OpenCode Go is web/cookie-auth, not a CLI on PATH, so detection-gating doesn't apply.
   const visibleOpencodeGo = getVisibleUsageProvider('opencode-go', opencodeGo, usageSettings)
   const showOpencodeGo = visibleOpencodeGo !== null && statusBarItems.includes('opencode-go')
@@ -172,11 +170,12 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
     showAntigravity ||
     showMiniMax ||
     showGrok ||
-    showCursor
+    showCursor ||
+    showZcode
   const anyVisible = hasVisibleUsageMeters || showResourceUsage
   // Why: include Settings so durable managed accounts count — a configured user isn't shown the empty state while snapshots hydrate.
   const isEmptyUsageState = isUsageEmptyState(
-    { claude, codex, gemini, opencodeGo, kimi, antigravity, minimax, grok, cursor },
+    { claude, codex, gemini, opencodeGo, kimi, antigravity, minimax, grok, cursor, zcode },
     usageSettings
   )
   // Why: one-time nudge — once dismissed, stays hidden even if providers reconnect later.
@@ -190,10 +189,9 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
     antigravity?.status === 'fetching' ||
     minimax?.status === 'fetching' ||
     grok?.status === 'fetching' ||
-    cursor?.status === 'fetching'
+    cursor?.status === 'fetching' ||
+    zcode?.status === 'fetching'
 
-  const compact = containerWidth < 900
-  const iconOnly = containerWidth < 500
   const floatingTerminalActionLabel = floatingTerminalOpen
     ? 'Minimize Floating Workspace'
     : 'Show Floating Workspace'
@@ -210,7 +208,8 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
     showKimi ? visibleKimi : null,
     showMiniMax ? visibleMiniMax : null,
     showGrok ? visibleGrok : null,
-    showCursor ? visibleCursor : null
+    showCursor ? visibleCursor : null,
+    showZcode ? visibleZcode : null
   ].filter((p): p is ProviderRateLimits => p !== null)
 
   const handleManageAccounts = (): void => {
@@ -243,8 +242,10 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
   return {
     anyFetching,
     anyVisible,
+    barRef,
+    collapseUsage,
+    collapsedUsageProviders,
     compact,
-    containerRefCallback,
     detectedAgentIds,
     floatingTerminalActionLabel,
     floatingTerminalShortcut,
@@ -254,14 +255,16 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
     handleUsageDetails,
     handleUsageMenuOpenChange,
     hasVisibleUsageMeters,
-    iconOnly,
     isEmptyUsageState,
     isRefreshing,
     menuOpen,
     menuPoint,
+    overflowing,
     petEnabled,
     recordFeatureInteraction,
     rosterProviders,
+    segmentsIconOnly,
+    segmentsRef,
     setMenuOpen,
     setMenuPoint,
     setStatusBarUsageMode,
@@ -276,7 +279,9 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
     toggleStatusBarItem,
     usageMenuFocusHandoff,
     usageMenuOpen,
-    usagePercentageDisplay
+    usagePercentageDisplay,
+    usageRef,
+    usageTightestOnly
   }
 }
 
diff --git a/src/renderer/src/components/status-bar/workspace-space-manager-source-boundary.test.ts b/src/renderer/src/components/status-bar/workspace-space-manager-source-boundary.test.ts
deleted file mode 100644
index 5c8c19757831..000000000000
--- a/src/renderer/src/components/status-bar/workspace-space-manager-source-boundary.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const COMPONENT_ROOT = __dirname
-const PRODUCTION_MODULES = [
-  'WorkspaceSpaceManagerPanel.tsx',
-  'use-workspace-space-decision-projection.ts',
-  'use-workspace-space-git-refresh-action.ts',
-  'use-workspace-space-manager-bindings.ts',
-  'use-workspace-space-manager-panel.ts',
-  'use-workspace-space-manager-projection.ts',
-  'workspace-space-breakdown-list.tsx',
-  'workspace-space-decision-details.ts',
-  'workspace-space-decision-hover-card.tsx',
-  'workspace-space-manager-overview.tsx',
-  'workspace-space-manager-state-types.ts',
-  'workspace-space-manager-table.tsx',
-  'workspace-space-manager-toolbar.tsx',
-  'workspace-space-manager-view.tsx',
-  'workspace-space-metrics.tsx',
-  'workspace-space-selection-controls.tsx',
-  'workspace-space-status-badge.tsx',
-  'workspace-space-treemap.tsx',
-  'workspace-space-worktree-row.tsx'
-] as const
-
-function source(relativePath: string): string {
-  return readFileSync(join(COMPONENT_ROOT, relativePath), 'utf8').replace(/\r\n?/g, '\n')
-}
-
-describe('workspace space manager source boundaries', () => {
-  it('keeps the public export path as a controller/view facade', () => {
-    const facade = source('WorkspaceSpaceManagerPanel.tsx')
-
-    expect(facade).toContain('useWorkspaceSpaceManagerPanel()')
-    expect(facade).toContain('<WorkspaceSpaceManagerView model={model} />')
-    expect(facade).toContain('export { getWorkspaceDecisionDetails }')
-    expect(facade).not.toContain('max-lines')
-  })
-
-  it('keeps every production module below its physical line limit', () => {
-    for (const moduleName of PRODUCTION_MODULES) {
-      const moduleSource = source(moduleName)
-      const limit = moduleName.endsWith('.tsx') ? 400 : 300
-
-      expect(moduleSource.split('\n').length - 1, moduleName).toBeLessThan(limit)
-      expect(moduleSource, moduleName).not.toContain('disable max-lines')
-    }
-  })
-
-  it('preserves bounded git refreshes and source-owned runtime routing', () => {
-    const action = source('use-workspace-space-git-refresh-action.ts')
-    const projection = source('use-workspace-space-manager-projection.ts')
-
-    expect(action).toContain('const currentState = useAppStore.getState()')
-    expect(action).toContain('connectionId:')
-    expect(action).toContain('getRuntimeGitStatus({')
-    expect(action).toContain('getWorkspaceSpaceWorktreeIdentity(worktree)')
-    expect(action).toContain('inFlightGitStatusRefreshes.current.delete(requestKey)')
-    expect(projection).toContain('const GIT_STATUS_REFRESH_CONCURRENCY = 6')
-    expect(projection).toContain('await refreshWorkspaceGitStatus(worktree)')
-    expect(projection).toContain('void Promise.all(')
-    expect(projection).toContain('cancelled = true')
-  })
-
-  it('preserves normal, force, and open-workspace action routing', () => {
-    const controller = source('use-workspace-space-manager-panel.ts')
-    const table = source('workspace-space-manager-table.tsx')
-
-    expect(controller).toContain('runWorktreeBatchDelete(identities, {')
-    expect(controller).toContain('forceConfirm: true')
-    expect(controller).toContain('prepareActiveWorktreeFocusAfterDelete(worktree.worktreeId)')
-    expect(controller).toContain(
-      'removeWorktree(\n        { id: worktree.worktreeId, executionHostId: worktree.executionHostId ?? null },\n        true,\n        { allowUnverifiedPtyStop: true }\n      )'
-    )
-    expect(table).toContain('activateAndRevealWorktree(worktree.worktreeId)')
-  })
-})
diff --git a/src/renderer/src/components/status-bar/workspace-space-manager-table.tsx b/src/renderer/src/components/status-bar/workspace-space-manager-table.tsx
index d4a146555391..8b0ec305124c 100644
--- a/src/renderer/src/components/status-bar/workspace-space-manager-table.tsx
+++ b/src/renderer/src/components/status-bar/workspace-space-manager-table.tsx
@@ -140,7 +140,11 @@ export function WorkspaceSpaceManagerTable({
                       deleteState={getDeleteStateForWorktree(worktree)}
                       onToggleSelected={() => toggleSelection(worktree)}
                       onInspect={() => setInspectedWorktreeId(identity)}
-                      onOpenWorkspace={() => activateAndRevealWorktree(worktree.worktreeId)}
+                      onOpenWorkspace={() =>
+                        activateAndRevealWorktree(worktree.worktreeId, {
+                          navigationIntent: 'user-open'
+                        })
+                      }
                       onDelete={() => deleteWorktrees([worktree])}
                       onForceDelete={() => forceDeleteWorktree(worktree)}
                     />
diff --git a/src/renderer/src/components/tab-bar/TabBarCreateEntry.search.test.tsx b/src/renderer/src/components/tab-bar/TabBarCreateEntry.search.test.tsx
index b40166cbc1db..8a168bcb6844 100644
--- a/src/renderer/src/components/tab-bar/TabBarCreateEntry.search.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabBarCreateEntry.search.test.tsx
@@ -99,6 +99,66 @@ afterEach(() => {
 })
 
 describe('TabBarCreateEntry search behavior', () => {
+  it.each([false, true])('searches weak file matches on Enter (delayed listing: %s)', (delayed) => {
+    const readyListing = {
+      files: [
+        'tests/e2e/terminal-split-activation-latency-main-probe.ts',
+        'src/main/linear/issue-context-inline-media.test.ts',
+        'src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-section-cache-match.ts'
+      ],
+      loading: false,
+      loadError: null
+    }
+    fileListMock.current = delayed ? { files: [], loading: true, loadError: null } : readyListing
+    const onOpenEntry = vi.fn().mockResolvedValue(undefined)
+    renderEntry({ onOpenEntry })
+    setQuery('asciinema')
+
+    if (delayed) {
+      expect(container.querySelector('[aria-selected="true"]')).toBeNull()
+      submit()
+      expect(onOpenEntry).not.toHaveBeenCalled()
+      fileListMock.current = readyListing
+      renderEntry({ onOpenEntry })
+    }
+
+    expect(container.querySelector('[role="option"]')?.textContent).toContain('Search Google')
+    expect(container.querySelector('[aria-selected="true"]')?.textContent).toContain(
+      'Search Google'
+    )
+    submit()
+    expect(onOpenEntry).toHaveBeenCalledWith(
+      expect.objectContaining({
+        classification: { kind: 'search', engine: 'google', query: 'asciinema' }
+      })
+    )
+  })
+
+  it.each(['a', 'ab', 'asciinema'])('waits for an exact filename before arming %s', (query) => {
+    fileListMock.current = { files: [], loading: true, loadError: null }
+    const onOpenEntry = vi.fn().mockResolvedValue(undefined)
+    renderEntry({ onOpenEntry })
+    setQuery(query)
+
+    expect(container.querySelector('[aria-selected="true"]')).toBeNull()
+    submit()
+    expect(onOpenEntry).not.toHaveBeenCalled()
+
+    fileListMock.current = { files: [`docs/${query}`], loading: false, loadError: null }
+    renderEntry({ onOpenEntry })
+    expect(container.querySelector('[aria-selected="true"]')?.textContent).toContain('Open file')
+    submit()
+    expect(onOpenEntry).toHaveBeenCalledWith(
+      expect.objectContaining({
+        classification: {
+          kind: 'existing-file',
+          matchKind: 'exact-basename',
+          relativePath: `docs/${query}`
+        }
+      })
+    )
+  })
+
   it('tracks the configured provider and submits its exact classification', () => {
     const onOpenEntry = vi.fn().mockResolvedValue(undefined)
     renderEntry({ onOpenEntry })
diff --git a/src/renderer/src/components/tab-bar/client-hosted-browser-row-strip-placement.test.ts b/src/renderer/src/components/tab-bar/client-hosted-browser-row-strip-placement.test.ts
index 2b3dfadf4731..a2b30515f1d4 100644
--- a/src/renderer/src/components/tab-bar/client-hosted-browser-row-strip-placement.test.ts
+++ b/src/renderer/src/components/tab-bar/client-hosted-browser-row-strip-placement.test.ts
@@ -1,28 +1,11 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { resolveClientHostedBrowserRowStripGroupId } from './client-hosted-browser-row-strip-placement'
 
-function itemSurfaceSource(): string {
-  return readFileSync(join(__dirname, 'tab-bar-item-surface.tsx'), 'utf8')
-}
-
 describe('resolveClientHostedBrowserRowStripGroupId', () => {
-  it('names exactly one owning strip when the worktree is split', () => {
-    const groups = [{ id: 'group-left' }, { id: 'group-right' }, { id: 'group-bottom' }]
-
-    const owner = resolveClientHostedBrowserRowStripGroupId(groups)
-
-    expect(groups.filter((group) => group.id === owner)).toHaveLength(1)
-  })
-
   // Why: picking the focused group instead would make a row hop strips as the user clicks around.
   it('keeps the same owner as focus moves', () => {
     const groups = [{ id: 'group-left' }, { id: 'group-right' }]
 
-    expect(resolveClientHostedBrowserRowStripGroupId(groups)).toBe(
-      resolveClientHostedBrowserRowStripGroupId([...groups])
-    )
     expect(resolveClientHostedBrowserRowStripGroupId(groups)).toBe('group-left')
   })
 
@@ -30,28 +13,3 @@ describe('resolveClientHostedBrowserRowStripGroupId', () => {
     expect(resolveClientHostedBrowserRowStripGroupId([])).toBeNull()
   })
 })
-
-/**
- * A client-hosted placeholder is retired by activating anything else in its strip. That only holds
- * while every row kind's activation goes through the one wrapper — a new kind wired straight to
- * its `onActivate*` prop would leave the placeholder covering the pane it just switched to.
- */
-describe('tab-bar activation census', () => {
-  it('routes every row kind activation through the placeholder-clearing wrapper', () => {
-    const source = itemSurfaceSource()
-    const activations = source.match(/onActivate=\{[^}]*\}/g) ?? []
-
-    expect(activations.length).toBeGreaterThan(0)
-    for (const activation of activations) {
-      expect(activation, 'a row kind activates without retiring the placeholder').toContain(
-        'activateRealTab('
-      )
-    }
-  })
-
-  it('clears the placeholder before handing off to the real activation', () => {
-    expect(itemSurfaceSource()).toMatch(
-      /clearClientHostedBrowserRowSelection\(\)\s*\n\s*activate\?\.\(arg\)/
-    )
-  })
-})
diff --git a/src/renderer/src/components/tab-bar/tab-bar-item-surface.client-hosted-active-state.test.tsx b/src/renderer/src/components/tab-bar/tab-bar-item-surface.client-hosted-active-state.test.tsx
index 2cdff8b19315..a3f85044626a 100644
--- a/src/renderer/src/components/tab-bar/tab-bar-item-surface.client-hosted-active-state.test.tsx
+++ b/src/renderer/src/components/tab-bar/tab-bar-item-surface.client-hosted-active-state.test.tsx
@@ -1,7 +1,5 @@
 // @vitest-environment happy-dom
 
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import type React from 'react'
 import { afterEach, describe, expect, it } from 'vitest'
 import type { WorkspaceVisibleTabType } from '../../../../shared/tab-types'
@@ -166,21 +164,3 @@ describe('client-hosted row while a real tab is activated', () => {
     }
   )
 })
-
-/**
- * The fixtures above cannot cover a row kind that does not exist yet, and a new one wired straight
- * to its own active-tab selector is exactly how this regressed the first time.
- */
-describe('tab-bar active-state census', () => {
-  it('suppresses every row kind while a client-hosted row owns the strip', () => {
-    const source = readFileSync(join(__dirname, 'tab-bar-item-surface.tsx'), 'utf8')
-    const decisions = source.match(/isActive=\{[^}]*\}/g) ?? []
-
-    expect(decisions.length).toBeGreaterThan(0)
-    for (const decision of decisions) {
-      expect(decision, 'a row kind underlines itself past a client-hosted row').toContain(
-        '!clientHostedRowOwnsActiveState'
-      )
-    }
-  })
-})
diff --git a/src/renderer/src/components/tab-bar/tab-bar-item-surface.tsx b/src/renderer/src/components/tab-bar/tab-bar-item-surface.tsx
index 08f3df3bc98a..449b9628ca89 100644
--- a/src/renderer/src/components/tab-bar/tab-bar-item-surface.tsx
+++ b/src/renderer/src/components/tab-bar/tab-bar-item-surface.tsx
@@ -175,7 +175,7 @@ export function renderTabBarItems({
           onCloseToLeft={() => onCloseToLeft(item.id)}
           onDuplicate={
             runtime.managedBrowserCreationEnabled
-              ? () => onDuplicateBrowserTab?.(item.id)
+              ? () => onDuplicateBrowserTab?.(item.id, item.unifiedTabId)
               : undefined
           }
           onTogglePin={() => togglePinned(item)}
diff --git a/src/renderer/src/components/tab-bar/tab-bar-props.ts b/src/renderer/src/components/tab-bar/tab-bar-props.ts
index c7ee410530a3..a6dae82bba52 100644
--- a/src/renderer/src/components/tab-bar/tab-bar-props.ts
+++ b/src/renderer/src/components/tab-bar/tab-bar-props.ts
@@ -47,7 +47,7 @@ export type TabBarProps = {
   onActivateBrowserTab?: (tabId: string) => void
   onActivateAgentSession?: (tabId: string) => void
   onCloseBrowserTab?: (tabId: string) => void
-  onDuplicateBrowserTab?: (tabId: string) => void
+  onDuplicateBrowserTab?: (tabId: string, unifiedTabId: string) => void
   onCloseAllFiles?: () => void
   onMakePreviewFilePermanent?: (fileId: string, tabId?: string) => void
   onPinFile?: (fileId: string, tabId?: string) => void
diff --git a/src/renderer/src/components/tab-bar/tab-create-entry-classifier.test.ts b/src/renderer/src/components/tab-bar/tab-create-entry-classifier.test.ts
index 54bb018c96ec..0a272dad7e0f 100644
--- a/src/renderer/src/components/tab-bar/tab-create-entry-classifier.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-create-entry-classifier.test.ts
@@ -194,9 +194,9 @@ describe('tab create entry classification', () => {
       relativePath: 'src/components/Button.tsx'
     })
     expect(classifyTabEntryQuery('btn', files)).toEqual({
-      kind: 'existing-file',
-      matchKind: 'fuzzy',
-      relativePath: 'src/components/Button.tsx'
+      kind: 'search',
+      engine: 'google',
+      query: 'btn'
     })
   })
 
@@ -212,6 +212,18 @@ describe('tab create entry classification', () => {
     ])
   })
 
+  it('keeps literal filename matches after an exact basename match', () => {
+    expect(
+      getTabEntryOptions('Makefile', readyFiles(['build/Makefile', 'build/Makefile.am'])).map(
+        (option) => option.classification
+      )
+    ).toEqual([
+      { kind: 'existing-file', matchKind: 'exact-basename', relativePath: 'build/Makefile' },
+      { kind: 'search', engine: 'google', query: 'Makefile' },
+      { kind: 'existing-file', matchKind: 'literal-basename', relativePath: 'build/Makefile.am' }
+    ])
+  })
+
   it('prefers creating typed file paths over fuzzy matches', () => {
     expect(
       getTabEntryOptions('read.md', readyFiles(['README.md'])).map(
@@ -224,7 +236,7 @@ describe('tab create entry classification', () => {
     ])
   })
 
-  it('keeps single-token quick-open matches ahead of search, but not phrases', () => {
+  it('keeps literal filename matches ahead of search, but not phrases', () => {
     expect(
       getTabEntryOptions('typescript', readyFiles(['docs/typescript-guide.md'])).map(
         (option) => option.classification
@@ -232,7 +244,7 @@ describe('tab create entry classification', () => {
     ).toEqual([
       {
         kind: 'existing-file',
-        matchKind: 'fuzzy',
+        matchKind: 'literal-basename',
         relativePath: 'docs/typescript-guide.md'
       },
       { kind: 'search', engine: 'google', query: 'typescript' },
@@ -260,7 +272,7 @@ describe('tab create entry classification', () => {
   })
 
   // Fuzzy matching is a subsequence scan, so a short token matches broadly.
-  it('keeps a search slot when fuzzy matches would fill the whole list', () => {
+  it('puts search ahead of fuzzy filename and path matches', () => {
     const files = [
       'src/components/Button.tsx',
       'src/lib/bootstrap-nav.ts',
@@ -269,15 +281,14 @@ describe('tab create entry classification', () => {
       'src/bin/tune.ts'
     ]
     expect(getTabEntryOptions('btn', readyFiles(files)).map((o) => o.classification.kind)).toEqual([
+      'search',
       'existing-file',
       'existing-file',
-      'existing-file',
-      'search'
+      'existing-file'
     ])
-    // A one-slot list still answers with the file, so Enter keeps quick-open.
     expect(
       getTabEntryOptions('btn', readyFiles(files), 1).map((o) => o.classification.kind)
-    ).toEqual(['existing-file'])
+    ).toEqual(['search'])
   })
 
   it('ranks search before ordinary create-file actions', () => {
diff --git a/src/renderer/src/components/tab-bar/tab-create-entry-classifier.ts b/src/renderer/src/components/tab-bar/tab-create-entry-classifier.ts
index 78de06106a80..5c1b715d5f14 100644
--- a/src/renderer/src/components/tab-bar/tab-create-entry-classifier.ts
+++ b/src/renderer/src/components/tab-bar/tab-create-entry-classifier.ts
@@ -3,7 +3,11 @@ import type { RuntimeFileListState } from '../quick-open-file-list'
 import { translate } from '@/i18n/i18n'
 import { getTabEntryOmniboxPlaceholder } from './tab-create-entry-copy'
 import { DEFAULT_SEARCH_ENGINE, type SearchEngine } from '../../../../shared/browser-url'
-import { findExistingFileMatches, isLikelyNewFileIntent } from './tab-create-entry-file-matches'
+import {
+  findExistingFileMatches,
+  isLikelyNewFileIntent,
+  type ExistingFileMatch
+} from './tab-create-entry-file-matches'
 import { parseForcedSearchQuery } from './tab-create-entry-forced-search'
 import {
   isTabEntryAbsolutePathLike,
@@ -31,11 +35,7 @@ export const TAB_ENTRY_ABSOLUTE_PATH_REMOTE_BLOCKED_MESSAGE =
 export type TabEntryClassification =
   | { kind: 'empty'; message: string }
   | { kind: 'explicit-url'; url: string }
-  | {
-      kind: 'existing-file'
-      matchKind: 'exact-path' | 'exact-basename' | 'fuzzy'
-      relativePath: string
-    }
+  | ExistingFileMatch
   | { kind: 'host-url'; url: string }
   | { kind: 'search'; engine: SearchEngine; query: string }
   | { kind: 'new-file'; relativePath: string }
@@ -223,8 +223,9 @@ export function getTabEntryOptions(
     getPreparedQuickOpenFiles(fileList.files),
     Math.max(actionLimit, 1)
   )
-  const exactExistingFiles = existingFiles.filter((file) => file.matchKind !== 'fuzzy')
-  const fuzzyExistingFiles = existingFiles.filter((file) => file.matchKind === 'fuzzy')
+  const exactExistingFiles = existingFiles.filter(
+    (file) => file.matchKind === 'exact-path' || file.matchKind === 'exact-basename'
+  )
 
   if (exactExistingFiles.length > 0) {
     const options: TabEntryActionClassification[] = [...exactExistingFiles]
@@ -233,37 +234,41 @@ export function getTabEntryOptions(
     } else if (!hostUrl && newFile) {
       options.push(search)
     }
+    options.push(...existingFiles.filter((file) => file.matchKind === 'literal-basename'))
     return toOptions(options, actionLimit)
   }
   if (hostUrl?.kind === 'blocked') {
     return [blockedOption('invalid-url', hostUrl.message)]
   }
   if (hostUrl?.kind === 'host-url') {
-    return toOptions([hostUrl, ...fuzzyExistingFiles], actionLimit)
+    return toOptions([hostUrl, ...existingFiles], actionLimit)
   }
   if (pathError || !newFile) {
     // Why: an unusable path is still a live quick-open prefix — "src/" cannot be
     // created, but it matches real files, and dropping them turns every typed
     // separator into an error row mid-keystroke.
-    return fuzzyExistingFiles.length > 0
-      ? toOptions(fuzzyExistingFiles, actionLimit)
+    return existingFiles.length > 0
+      ? toOptions(existingFiles, actionLimit)
       : [invalidPathOption(pathError)]
   }
   if (isLikelyNewFileIntent(trimmed)) {
-    return toOptions([newFile, search, ...fuzzyExistingFiles], actionLimit)
+    return toOptions([newFile, search, ...existingFiles], actionLimit)
   }
   // Why no create row: a spaced, extension-less phrase is a web query, and a
   // stray arrow/click on "Create file" leaves an empty `release notes` on disk
   // that then outranks search as an exact match forever after.
   if (/\s/.test(trimmed)) {
-    return toOptions([search, ...fuzzyExistingFiles], actionLimit)
+    return toOptions([search, ...existingFiles], actionLimit)
+  }
+  // Short Latin tokens match too many filenames to imply file intent; CJK words can be short.
+  if (/^[\p{Script=Latin}\p{Nd}]{1,2}$/u.test(trimmed.normalize('NFC'))) {
+    return toOptions([search, ...existingFiles, newFile], actionLimit)
   }
-  // Why: a single token is still a quick-open attempt ("btn" → Button.tsx), so
-  // only phrases promote web search over fuzzy matches. Fuzzy matching is a
-  // subsequence scan that fills every slot in a real repo, so hold one back —
-  // otherwise search silently disappears from the list it should always offer.
+  const literalFiles = existingFiles.filter((file) => file.matchKind === 'literal-basename')
+  const fuzzyFiles = existingFiles.filter((file) => file.matchKind === 'fuzzy')
+  // Reserve a search slot even when literal filename matches fill the list.
   return toOptions(
-    [...fuzzyExistingFiles.slice(0, Math.max(actionLimit - 1, 1)), search, newFile],
+    [...literalFiles.slice(0, Math.max(actionLimit - 1, 1)), search, ...fuzzyFiles, newFile],
     actionLimit
   )
 }
diff --git a/src/renderer/src/components/tab-bar/tab-create-entry-file-matches.test.ts b/src/renderer/src/components/tab-bar/tab-create-entry-file-matches.test.ts
index 8ac46512051b..b271d168e78e 100644
--- a/src/renderer/src/components/tab-bar/tab-create-entry-file-matches.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-create-entry-file-matches.test.ts
@@ -2,6 +2,7 @@ import { expect, it, vi } from 'vitest'
 import { prepareQuickOpenFiles, rankQuickOpenFiles } from '../quick-open-search'
 import { findExistingFileMatches } from './tab-create-entry-file-matches'
 import type * as QuickOpenSearch from '../quick-open-search'
+import { compareFileNames } from '../../../../shared/file-name-sort'
 
 const ranking = vi.hoisted(() => ({ calls: 0 }))
 vi.mock('../quick-open-search', async (importOriginal) => {
@@ -28,6 +29,20 @@ it('skips fuzzy ranking when exact matches fill the requested window', () => {
   expect(ranking.calls).toBe(0)
 })
 
+it('selects literal filenames from a large inventory without running fuzzy ranking', () => {
+  const files = prepareQuickOpenFiles([
+    ...Array.from({ length: 100_000 }, (_, index) => `a/s/c/i/i/n/e/m/a/file-${index}.ts`),
+    'docs/asciinema-10.md',
+    'docs/asciinema-2.md'
+  ])
+  ranking.calls = 0
+  expect(findExistingFileMatches('asciinema', files, 2).map((file) => file.relativePath)).toEqual([
+    'docs/asciinema-2.md',
+    'docs/asciinema-10.md'
+  ])
+  expect(ranking.calls).toBe(0)
+})
+
 it('deduplicates exact paths and still fills remaining slots with fuzzy matches', () => {
   const files = prepareQuickOpenFiles(['a.md', 'a.md', 'other/a.md', 'abc.md'])
   expect(findExistingFileMatches('a.md', files, 4)).toEqual([
@@ -37,14 +52,12 @@ it('deduplicates exact paths and still fills remaining slots with fuzzy matches'
   ])
 })
 
-// Why: skipping the ranker is only sound because a fuzzy hit can never outrank an
-// exact one — exact results are concatenated first and dedupe is first-wins, so the
-// exact prefix is exactly what a full ranked-then-sliced list would have returned.
-// This re-runs the pre-skip pipeline and holds the shipped one to it.
+// Sort every literal candidate to check the bounded selection against a full reference.
 function rankThenSlice(
   query: string,
   files: readonly QuickOpenSearch.QuickOpenIndexedFile[],
-  limit: number
+  limit: number,
+  preferLiteralFilenames = false
 ): { kind: string; matchKind: string; relativePath: string }[] {
   const normalized = query.trim().replace(/\\/g, '/')
   if (!normalized || limit <= 0) {
@@ -56,6 +69,12 @@ function rankThenSlice(
     ...files
       .filter((f) => f.lowerFilename === lower)
       .map((f) => ['exact-basename', f.path] as const),
+    ...(preferLiteralFilenames
+      ? files
+          .filter((file) => file.lowerFilename.includes(lower))
+          .sort((a, b) => compareFileNames(a.path, b.path))
+          .map((file) => ['literal-basename', file.path] as const)
+      : []),
     ...rankQuickOpenFiles(normalized, files, limit).map((f) => ['fuzzy', f.path] as const)
   ]
   const seen = new Set<string>()
@@ -65,7 +84,7 @@ function rankThenSlice(
     .slice(0, limit)
 }
 
-it('returns what rank-then-slice would have returned, including at limit 1', () => {
+it('preserves quick-open ordering for explicit file and path queries, including at limit 1', () => {
   const corpus = [
     ['a.md', 'ab.md', 'abc.md', 'deep/nested/a.md'],
     ['ab.md', 'abc.md', 'deep/nested/a.md'],
@@ -74,7 +93,7 @@ it('returns what rank-then-slice would have returned, including at limit 1', ()
     ['README.md', 'docs/readme.md', 'readme.mdx'],
     ['only-fuzzy.md']
   ]
-  const queries = ['a.md', 'index.ts', 'readme.md', 'src/index.ts', 'a', 'nope.md']
+  const queries = ['a.md', 'index.ts', 'readme.md', 'src/index.ts', 'nope.md']
   for (const paths of corpus) {
     const files = prepareQuickOpenFiles(paths)
     for (const query of queries) {
@@ -90,6 +109,46 @@ it('returns what rank-then-slice would have returned, including at limit 1', ()
   }
 })
 
+it('matches the full literal-first reference for bare tokens across limits and input orders', () => {
+  const queries = ['a', 'ab', 'abc', 'BTN', 'button', 'asciinema', '工具', 'é']
+  for (const query of queries) {
+    const paths = [
+      ...Array.from({ length: 12 }, (_, index) => `${[...query].join('/')}/file-${index}.ts`),
+      `docs/${query}-10.md`,
+      `docs/${query}-2.md`,
+      `docs/${query}-2.md`,
+      `docs\\${query.toLowerCase()}-guide.md`,
+      `docs/a${'x'.repeat(120)}-${query.toUpperCase()}.md`,
+      'unrelated.txt'
+    ]
+    for (const corpus of [paths, [...paths, query, `docs/${query}`, query]]) {
+      for (const orderedPaths of [corpus, corpus.toReversed()]) {
+        const files = prepareQuickOpenFiles(orderedPaths)
+        for (const limit of [0, 1, 2, 3, 5, 20]) {
+          expect({
+            query,
+            limit,
+            matches: findExistingFileMatches(` ${query} `, files, limit)
+          }).toEqual({ query, limit, matches: rankThenSlice(query, files, limit, true) })
+        }
+      }
+    }
+  }
+})
+
+it('does not let duplicate literal candidates consume the result limit', () => {
+  const files = prepareQuickOpenFiles([
+    ...Array.from({ length: 10 }, () => 'docs/button-1.md'),
+    'docs/button-2.md'
+  ])
+  ranking.calls = 0
+  expect(findExistingFileMatches('button', files, 2)).toEqual([
+    { kind: 'existing-file', matchKind: 'literal-basename', relativePath: 'docs/button-1.md' },
+    { kind: 'existing-file', matchKind: 'literal-basename', relativePath: 'docs/button-2.md' }
+  ])
+  expect(ranking.calls).toBe(0)
+})
+
 it('takes the exact match at limit 1 without consulting the ranker at all', () => {
   const files = prepareQuickOpenFiles(['a.md', 'ab.md', 'abc.md', 'deep/nested/a.md'])
   ranking.calls = 0
diff --git a/src/renderer/src/components/tab-bar/tab-create-entry-file-matches.ts b/src/renderer/src/components/tab-bar/tab-create-entry-file-matches.ts
index eb2f19576d89..72233be30758 100644
--- a/src/renderer/src/components/tab-bar/tab-create-entry-file-matches.ts
+++ b/src/renderer/src/components/tab-bar/tab-create-entry-file-matches.ts
@@ -1,8 +1,12 @@
-import { rankQuickOpenFiles, type QuickOpenIndexedFile } from '../quick-open-search'
+import {
+  QuickOpenPathRanker,
+  rankQuickOpenFiles,
+  type QuickOpenIndexedFile
+} from '../quick-open-search'
 
 export type ExistingFileMatch = {
   kind: 'existing-file'
-  matchKind: 'exact-path' | 'exact-basename' | 'fuzzy'
+  matchKind: 'exact-path' | 'exact-basename' | 'literal-basename' | 'fuzzy'
   relativePath: string
 }
 
@@ -36,6 +40,27 @@ export function isLikelyNewFileIntent(query: string): boolean {
   return hasFilenameExtension(trimmed) || /^\.[^.].*$/.test(trimmed)
 }
 
+function findLiteralFilenameMatches(
+  query: string,
+  files: readonly QuickOpenIndexedFile[],
+  limit: number
+): ExistingFileMatch[] {
+  // Natural ordering avoids arbitrary fuzzy scores among literal filename matches.
+  const ranker = new QuickOpenPathRanker('', limit)
+  const seen = new Set<string>()
+  for (const file of files) {
+    if (file.lowerFilename.includes(query) && !seen.has(file.path)) {
+      seen.add(file.path)
+      ranker.consider(file.path)
+    }
+  }
+  return ranker.result().paths.map((relativePath) => ({
+    kind: 'existing-file',
+    matchKind: 'literal-basename',
+    relativePath
+  }))
+}
+
 function dedupeMatches(matches: ExistingFileMatch[]): ExistingFileMatch[] {
   const seen = new Set<string>()
   return matches.filter((match) => {
@@ -75,11 +100,21 @@ export function findExistingFileMatches(
   if (exactMatches.length >= limit) {
     return exactMatches.slice(0, limit)
   }
+  const preferFilenames = !isLikelyNewFileIntent(normalizedQuery) && !/\s/.test(normalizedQuery)
+  const preferredMatches = preferFilenames
+    ? dedupeMatches([
+        ...exactMatches,
+        ...findLiteralFilenameMatches(lowerQuery, indexedFiles, limit)
+      ])
+    : exactMatches
+  if (preferredMatches.length >= limit) {
+    return preferredMatches.slice(0, limit)
+  }
   const fuzzyMatches = rankQuickOpenFiles(normalizedQuery, indexedFiles, limit).map((file) => ({
     kind: 'existing-file' as const,
     matchKind: 'fuzzy' as const,
     relativePath: file.path
   }))
 
-  return dedupeMatches([...exactMatches, ...fuzzyMatches]).slice(0, limit)
+  return dedupeMatches([...preferredMatches, ...fuzzyMatches]).slice(0, limit)
 }
diff --git a/src/renderer/src/components/tab-bar/tab-create-entry-history-placement.test.ts b/src/renderer/src/components/tab-bar/tab-create-entry-history-placement.test.ts
index 7907a075b252..d0557dfd13a3 100644
--- a/src/renderer/src/components/tab-bar/tab-create-entry-history-placement.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-create-entry-history-placement.test.ts
@@ -2,10 +2,11 @@ import { describe, expect, it } from 'vitest'
 import { insertHistoryRowsBelowFileMatches } from './tab-create-entry-history-placement'
 import type { BrowserHistoryOmniboxRow } from './tab-create-entry-active-option'
 import type { TabEntryOption } from './tab-create-entry-action'
+import type { ExistingFileMatch } from './tab-create-entry-file-matches'
 
 function fileOption(
   relativePath: string,
-  matchKind: 'exact-path' | 'exact-basename' | 'fuzzy'
+  matchKind: ExistingFileMatch['matchKind']
 ): TabEntryOption {
   return {
     id: `existing-file:${relativePath}`,
@@ -40,7 +41,7 @@ describe('tab create entry history placement', () => {
     const placed = insertHistoryRowsBelowFileMatches(
       [
         fileOption('README.md', 'exact-basename'),
-        fileOption('docs/readme-notes.md', 'fuzzy'),
+        fileOption('docs/readme-notes.md', 'literal-basename'),
         newFileOption,
         searchOption
       ],
@@ -53,9 +54,9 @@ describe('tab create entry history placement', () => {
     expect(placed[3]).toMatchObject({ option: { id: 'new-file:readme' } })
   })
 
-  it('stays below a fuzzy match that is the only file row', () => {
+  it.each(['literal-basename', 'fuzzy'] as const)('stays below a lone %s file row', (matchKind) => {
     const placed = insertHistoryRowsBelowFileMatches(
-      [fileOption('docs/readme-notes.md', 'fuzzy'), searchOption],
+      [fileOption('docs/readme-notes.md', matchKind), searchOption],
       rows
     )
 
diff --git a/src/renderer/src/components/tab-bar/tab-create-entry-search-ranking.test.ts b/src/renderer/src/components/tab-bar/tab-create-entry-search-ranking.test.ts
new file mode 100644
index 000000000000..82a9a2bfb14a
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/tab-create-entry-search-ranking.test.ts
@@ -0,0 +1,139 @@
+import { describe, expect, it } from 'vitest'
+import { classifyTabEntryQuery, getTabEntryOptions } from './tab-create-entry-classifier'
+import { prepareQuickOpenFiles } from '../quick-open-search'
+import { findExistingFileMatches } from './tab-create-entry-file-matches'
+
+const unrelatedFiles = [
+  'tests/e2e/terminal-split-activation-latency-main-probe.ts',
+  'src/main/linear/issue-context-inline-media.test.ts',
+  'src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-section-cache-match.ts'
+]
+const readyFiles = (files: string[]) => ({ files, loading: false, loadError: null })
+
+describe('new-tab file matches versus web search', () => {
+  it('puts search ahead of scattered path matches for asciinema', () => {
+    const options = getTabEntryOptions('asciinema', readyFiles(unrelatedFiles))
+    expect(options.map((option) => option.classification.kind)).toEqual([
+      'search',
+      'existing-file',
+      'existing-file',
+      'existing-file'
+    ])
+    expect(classifyTabEntryQuery('asciinema', readyFiles(unrelatedFiles))).toEqual({
+      kind: 'search',
+      engine: 'google',
+      query: 'asciinema'
+    })
+  })
+
+  it('keeps an actual filename match ahead of search and weak matches below it', () => {
+    const options = getTabEntryOptions(
+      'asciinema',
+      readyFiles([...unrelatedFiles, 'docs/asciinema-guide.md'])
+    )
+    expect(options[0].classification).toMatchObject({
+      kind: 'existing-file',
+      relativePath: 'docs/asciinema-guide.md'
+    })
+    expect(options[1].classification.kind).toBe('search')
+    expect(options.slice(2).every((option) => option.classification.kind === 'existing-file')).toBe(
+      true
+    )
+  })
+
+  it.each([1, 2, 4, 8])('finds a literal filename before limiting to %i actions', (limit) => {
+    const files = readyFiles([
+      ...Array.from({ length: 10 }, (_, index) => `b/u/t/t/o/n/file-${index}.ts`),
+      'src/components/Button.tsx'
+    ])
+    expect(getTabEntryOptions('button', files, limit)[0].classification).toMatchObject({
+      kind: 'existing-file',
+      relativePath: 'src/components/Button.tsx'
+    })
+  })
+
+  it('offers fuzzy filename abbreviations below search', () => {
+    expect(
+      getTabEntryOptions('btn', readyFiles(['src/components/Button.tsx'])).map(
+        (option) => option.classification
+      )
+    ).toEqual([
+      { kind: 'search', engine: 'google', query: 'btn' },
+      { kind: 'existing-file', matchKind: 'fuzzy', relativePath: 'src/components/Button.tsx' },
+      { kind: 'new-file', relativePath: 'btn' }
+    ])
+  })
+
+  it('finds literal filenames even when their old fuzzy score falls outside the result limit', () => {
+    const target = `docs/a${'x'.repeat(120)}-asciinema.md`
+    const files = readyFiles([
+      ...Array.from({ length: 10 }, (_, index) => `a/s/c/i/i/n/e/m/a/file-${index}.ts`),
+      target
+    ])
+    expect(getTabEntryOptions('asciinema', files)[0].classification).toMatchObject({
+      kind: 'existing-file',
+      relativePath: target
+    })
+  })
+
+  it.each([
+    ['btn', 'src/components/Button.tsx', false],
+    ['button', 'src/components/Button.tsx', true],
+    ['asciinema', 'docs/ASCIINEMA-guide.md', true],
+    ['asciinema', 'docs\\ASCIINEMA-guide.md', true],
+    ['asciinema', `docs/a${'x'.repeat(120)}-asciinema.md`, true],
+    ['asciinema', unrelatedFiles[0], false],
+    ['asciinema', unrelatedFiles[1], false],
+    ['asciinema', unrelatedFiles[2], false],
+    ['abc', 'alphabet-biology-chemistry.md', false],
+    ['abc', 'a----b----c.md', false],
+    ['btn', 'src/base/tone.ts', false]
+  ])('reports literal filename matching for %s in %s', (query, path, matches) => {
+    const results = findExistingFileMatches(query, prepareQuickOpenFiles([path]), 1)
+    expect(results.some((result) => result.matchKind === 'literal-basename')).toBe(matches)
+  })
+
+  it.each(['a', 'AB', 'é', 'e\u0301', '12'])('puts search first for short token %s', (query) => {
+    const files = readyFiles(
+      Array.from({ length: 10 }, (_, index) => `docs/${query}-guide-${index}.md`)
+    )
+    for (const limit of [1, 2, 4, 8]) {
+      const options = getTabEntryOptions(query, files, limit)
+      expect(options[0].classification).toEqual({ kind: 'search', engine: 'google', query })
+      expect(options.slice(1).map((option) => option.classification)).toEqual(
+        Array.from({ length: limit - 1 }, (_, index) => ({
+          kind: 'existing-file',
+          matchKind: 'literal-basename',
+          relativePath: `docs/${query}-guide-${index}.md`
+        }))
+      )
+    }
+  })
+
+  it.each(['a', 'ab'])('keeps exact short filename %s ahead of search', (query) => {
+    for (const relativePath of [query, `docs/${query}`]) {
+      const files = readyFiles([`${query}-guide.md`, relativePath])
+      expect(classifyTabEntryQuery(query, files)).toEqual({
+        kind: 'existing-file',
+        matchKind: relativePath === query ? 'exact-path' : 'exact-basename',
+        relativePath
+      })
+    }
+  })
+
+  it.each(['文', '工具'])('keeps short CJK filename matches ahead of search for %s', (query) => {
+    expect(classifyTabEntryQuery(query, readyFiles([`docs/${query}指南.md`]))).toEqual({
+      kind: 'existing-file',
+      matchKind: 'literal-basename',
+      relativePath: `docs/${query}指南.md`
+    })
+  })
+
+  it('reserves search when literal filenames fill the list', () => {
+    const files = readyFiles(['button.tsx', 'button.css', 'button.test.ts', 'button.md'])
+    expect(getTabEntryOptions('button', files).map((option) => option.classification.kind)).toEqual(
+      ['existing-file', 'existing-file', 'existing-file', 'search']
+    )
+    expect(classifyTabEntryQuery('button', files).kind).toBe('existing-file')
+  })
+})
diff --git a/src/renderer/src/components/tab-bar/tab-strip-growth-scroll.test.tsx b/src/renderer/src/components/tab-bar/tab-strip-growth-scroll.test.tsx
new file mode 100644
index 000000000000..f18f8333ee3a
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/tab-strip-growth-scroll.test.tsx
@@ -0,0 +1,141 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { useTabStripOverflowNavigation } from './tab-strip-overflow-navigation'
+
+const TAB_WIDTH = 100
+const VIEWPORT_WIDTH = 300
+
+const scrollLeftByElement = new WeakMap<Element, number>()
+const originals = {
+  rect: HTMLElement.prototype.getBoundingClientRect,
+  scrollIntoView: HTMLElement.prototype.scrollIntoView,
+  scrollLeft: Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'scrollLeft'),
+  scrollWidth: Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'scrollWidth'),
+  clientWidth: Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'clientWidth')
+}
+
+function isStrip(el: Element): boolean {
+  return el.hasAttribute('data-strip')
+}
+
+function rect(left: number, width: number): DOMRect {
+  return DOMRect.fromRect({ x: left, y: 0, width, height: 20 })
+}
+
+/** 100px tabs in a 300px strip; a tab's x is its index minus the strip's scroll. */
+function installStripLayout(): void {
+  Object.defineProperty(HTMLElement.prototype, 'scrollWidth', {
+    configurable: true,
+    get(this: Element) {
+      return isStrip(this) ? this.children.length * TAB_WIDTH : 0
+    }
+  })
+  Object.defineProperty(HTMLElement.prototype, 'clientWidth', {
+    configurable: true,
+    get(this: Element) {
+      return isStrip(this) ? VIEWPORT_WIDTH : 0
+    }
+  })
+  Object.defineProperty(HTMLElement.prototype, 'scrollLeft', {
+    configurable: true,
+    get(this: Element) {
+      return scrollLeftByElement.get(this) ?? 0
+    },
+    set(this: Element, value: number) {
+      const max = Math.max(0, this.scrollWidth - this.clientWidth)
+      scrollLeftByElement.set(this, Math.min(max, Math.max(0, value)))
+    }
+  })
+  HTMLElement.prototype.getBoundingClientRect = function (this: HTMLElement): DOMRect {
+    if (isStrip(this)) {
+      return rect(0, VIEWPORT_WIDTH)
+    }
+    const strip = this.parentElement
+    if (strip && isStrip(strip)) {
+      const index = Array.from(strip.children).indexOf(this)
+      return rect(index * TAB_WIDTH - strip.scrollLeft, TAB_WIDTH)
+    }
+    return rect(0, 0)
+  }
+  HTMLElement.prototype.scrollIntoView = function (): void {}
+}
+
+function restoreStripLayout(): void {
+  HTMLElement.prototype.getBoundingClientRect = originals.rect
+  HTMLElement.prototype.scrollIntoView = originals.scrollIntoView
+  for (const key of ['scrollLeft', 'scrollWidth', 'clientWidth'] as const) {
+    const descriptor = originals[key]
+    if (descriptor) {
+      Object.defineProperty(HTMLElement.prototype, key, descriptor)
+    } else {
+      Reflect.deleteProperty(HTMLElement.prototype, key)
+    }
+  }
+}
+
+function Strip({ tabs, active }: { tabs: string[]; active: string }): React.JSX.Element {
+  const navigation = useTabStripOverflowNavigation({
+    activeVisibleTabId: active,
+    layoutKey: tabs.join(','),
+    tabCount: tabs.length,
+    worktreeId: 'wt-1'
+  })
+  return (
+    <div data-strip="" ref={navigation.tabStripRef}>
+      {tabs.map((id) => (
+        <div key={id} data-tab-id={id} />
+      ))}
+    </div>
+  )
+}
+
+const TABS = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J']
+
+function mountScrolled(active: string, scrollLeft: number) {
+  const view = render(<Strip tabs={TABS} active={active} />)
+  const strip = view.container.querySelector<HTMLElement>('[data-strip]')!
+  act(() => {
+    strip.scrollLeft = scrollLeft
+    strip.dispatchEvent(new Event('scroll'))
+  })
+  return { ...view, strip }
+}
+
+function tabX(strip: HTMLElement, id: string): number {
+  return strip.querySelector<HTMLElement>(`[data-tab-id="${id}"]`)!.getBoundingClientRect().left
+}
+
+describe('tab strip scroll when tabs are added', () => {
+  beforeEach(installStripLayout)
+  afterEach(() => {
+    cleanup()
+    restoreStripLayout()
+  })
+
+  it('keeps the viewed tab still when a background tab lands to its left', () => {
+    const { strip, rerender } = mountScrolled('F', 400)
+    expect(tabX(strip, 'F')).toBe(100)
+    rerender(<Strip tabs={['A', 'B', 'N', ...TABS.slice(2)]} active="F" />)
+    expect(tabX(strip, 'F')).toBe(100)
+  })
+
+  it('keeps the viewed tab still when a background tab lands after it', () => {
+    const { strip, rerender } = mountScrolled('F', 400)
+    rerender(<Strip tabs={[...TABS.slice(0, 6), 'N', ...TABS.slice(6)]} active="F" />)
+    expect(strip.scrollLeft).toBe(400)
+    expect(tabX(strip, 'F')).toBe(100)
+  })
+
+  it('does not jump to the end for a background tab while pinned to the end', () => {
+    const { strip, rerender } = mountScrolled('J', 700)
+    rerender(<Strip tabs={[...TABS, 'N']} active="J" />)
+    expect(tabX(strip, 'J')).toBe(200)
+  })
+
+  it('scrolls to the end for a foreground tab appended at the end', () => {
+    const { strip, rerender } = mountScrolled('C', 0)
+    rerender(<Strip tabs={[...TABS, 'N']} active="N" />)
+    expect(strip.scrollLeft).toBe(800)
+  })
+})
diff --git a/src/renderer/src/components/tab-bar/tab-strip-overflow-navigation.ts b/src/renderer/src/components/tab-bar/tab-strip-overflow-navigation.ts
index 77af550b748a..462a97e9405d 100644
--- a/src/renderer/src/components/tab-bar/tab-strip-overflow-navigation.ts
+++ b/src/renderer/src/components/tab-bar/tab-strip-overflow-navigation.ts
@@ -6,6 +6,12 @@ import {
   type TabStripScrollMetrics
 } from './tab-strip-scroll-metrics'
 import { isTabStripPointerGestureActive } from './tab-strip-pointer-gesture'
+import {
+  captureTabStripScrollAnchor,
+  isLastTabStripTab,
+  restoreTabStripScrollAnchor,
+  type TabStripScrollAnchor
+} from './tab-strip-scroll-anchor'
 
 const TAB_STRIP_SCROLL_FRACTION = 0.75
 const TAB_STRIP_MIN_SCROLL_STEP_PX = 120
@@ -25,6 +31,11 @@ export function scrollTabStripByStep(
   })
 }
 
+function isTabStripScrolledToEnd(el: HTMLElement): boolean {
+  const max = Math.max(0, el.scrollWidth - el.clientWidth)
+  return el.scrollLeft >= max - 2
+}
+
 const EMPTY_TAB_STRIP_OVERFLOW_STATE: TabStripScrollMetrics = {
   hasOverflow: false,
   canScrollStart: false,
@@ -51,6 +62,11 @@ export function useTabStripOverflowNavigation({
   const tabStripRef = useRef<HTMLDivElement>(null)
   const prevStripLenRef = useRef<{ worktreeId: string; len: number } | null>(null)
   const stickToEndRef = useRef(false)
+  const activeTabIdRef = useRef<string | null>(null)
+  const scrollAnchorRef = useRef<{
+    activeTabId: string | null
+    anchor: TabStripScrollAnchor | null
+  } | null>(null)
   const [tabStripOverflowState, setTabStripOverflowState] = useState<TabStripScrollMetrics>(
     EMPTY_TAB_STRIP_OVERFLOW_STATE
   )
@@ -74,6 +90,14 @@ export function useTabStripOverflowNavigation({
     },
     []
   )
+  const recordScrollAnchor = useCallback((): void => {
+    const el = tabStripRef.current
+    if (!el) {
+      return
+    }
+    const activeTabId = activeTabIdRef.current
+    scrollAnchorRef.current = { activeTabId, anchor: captureTabStripScrollAnchor(el, activeTabId) }
+  }, [])
 
   useEffect(() => {
     const el = tabStripRef.current
@@ -96,14 +120,11 @@ export function useTabStripOverflowNavigation({
     if (!el) {
       return
     }
-    const isAtEnd = (): boolean => {
-      const max = Math.max(0, el.scrollWidth - el.clientWidth)
-      return el.scrollLeft >= max - 2
-    }
     const onScroll = (): void => {
       // Only keep sticking while the user hasn't intentionally scrolled away.
-      stickToEndRef.current = isAtEnd()
+      stickToEndRef.current = isTabStripScrolledToEnd(el)
       updateTabStripOverflowState()
+      recordScrollAnchor()
     }
     el.addEventListener('scroll', onScroll, { passive: true })
     onScroll()
@@ -112,13 +133,10 @@ export function useTabStripOverflowNavigation({
       updateTabStripOverflowState()
       // If the user is pinned to the right edge, keep it pinned even as tab
       // labels (e.g. "Terminal 5" -> branch name) expand and change scrollWidth.
-      if (!stickToEndRef.current) {
-        return
-      }
-      if (isTabStripPointerGestureActive()) {
-        return
+      if (stickToEndRef.current && !isTabStripPointerGestureActive()) {
+        el.scrollLeft = Math.max(0, el.scrollWidth - el.clientWidth)
       }
-      el.scrollLeft = Math.max(0, el.scrollWidth - el.clientWidth)
+      recordScrollAnchor()
     }
 
     const disconnectResizeObservers = bindTabStripContentResizeObservers(el, handleStripResize)
@@ -127,7 +145,12 @@ export function useTabStripOverflowNavigation({
       el.removeEventListener('scroll', onScroll)
       disconnectResizeObservers()
     }
-  }, [updateTabStripOverflowState])
+  }, [recordScrollAnchor, updateTabStripOverflowState])
+
+  // Why a ref set first: the growth effect below must see this commit's active tab without re-running on every tab switch.
+  useLayoutEffect(() => {
+    activeTabIdRef.current = activeVisibleTabId
+  }, [activeVisibleTabId])
 
   useLayoutEffect(() => {
     const strip = tabStripRef.current
@@ -142,56 +165,65 @@ export function useTabStripOverflowNavigation({
       return
     }
     const pointerGestureActive = isTabStripPointerGestureActive()
-    if (stickToEndRef.current && !pointerGestureActive) {
-      const scrollToEnd = (): void => {
-        const el = tabStripRef.current
-        if (!el) {
-          return
-        }
-        el.scrollLeft = Math.max(0, el.scrollWidth - el.clientWidth)
-        updateTabStripOverflowState()
+    const scrollToEnd = (stick: boolean): void => {
+      const el = tabStripRef.current
+      if (!el) {
+        return
       }
-      scrollToEnd()
-      requestAnimationFrame(scrollToEnd)
+      el.scrollLeft = Math.max(0, el.scrollWidth - el.clientWidth)
+      if (stick) {
+        stickToEndRef.current = true
+      }
+      updateTabStripOverflowState()
     }
+    const recorded = scrollAnchorRef.current
     if (tabCount > prev.len && !pointerGestureActive) {
-      const scrollToEnd = (): void => {
-        const el = tabStripRef.current
-        if (!el) {
-          return
+      if (recorded?.activeTabId === activeTabIdRef.current) {
+        // Why: a background open must not move the tab the user is looking at; insertions
+        // around it keep its on-screen x, the way VS Code and Chrome leave the viewed tab still.
+        if (recorded.anchor) {
+          restoreTabStripScrollAnchor(strip, recorded.anchor)
         }
-        el.scrollLeft = Math.max(0, el.scrollWidth - el.clientWidth)
-        stickToEndRef.current = true
-        updateTabStripOverflowState()
+        stickToEndRef.current = isTabStripScrolledToEnd(strip)
+      } else if (isLastTabStripTab(strip, activeTabIdRef.current)) {
+        scrollToEnd(true)
+        requestAnimationFrame(() => scrollToEnd(true))
       }
-      scrollToEnd()
-      requestAnimationFrame(scrollToEnd)
+      // A foreground tab opened mid-strip is revealed by the active-tab effect below.
+    } else if (stickToEndRef.current && !pointerGestureActive) {
+      scrollToEnd(false)
+      requestAnimationFrame(() => scrollToEnd(false))
     }
     prevStripLenRef.current = { worktreeId, len: tabCount }
     updateTabStripOverflowState()
     requestAnimationFrame(updateTabStripOverflowState)
-  }, [layoutKey, tabCount, updateTabStripOverflowState, worktreeId])
+    recordScrollAnchor()
+  }, [layoutKey, recordScrollAnchor, tabCount, updateTabStripOverflowState, worktreeId])
 
   useLayoutEffect(() => {
     const strip = tabStripRef.current
     if (!strip || !activeVisibleTabId) {
+      recordScrollAnchor()
       return
     }
     const activeTab = strip.querySelector<HTMLElement>(
       `[data-tab-id="${CSS.escape(activeVisibleTabId)}"]`
     )
     if (!activeTab) {
+      recordScrollAnchor()
       return
     }
     if (isTabStripPointerGestureActive()) {
       // Why: active-tab preview changes during a tab press must not move the
       // strip under a stationary pointer before the release decides click/drag.
       requestAnimationFrame(updateTabStripOverflowState)
+      recordScrollAnchor()
       return
     }
     activeTab.scrollIntoView({ block: 'nearest', inline: 'nearest' })
     requestAnimationFrame(updateTabStripOverflowState)
-  }, [activeVisibleTabId, updateTabStripOverflowState])
+    recordScrollAnchor()
+  }, [activeVisibleTabId, recordScrollAnchor, updateTabStripOverflowState])
 
   return { tabStripRef, tabStripOverflowState, scrollTabStrip }
 }
diff --git a/src/renderer/src/components/tab-bar/tab-strip-scroll-anchor.ts b/src/renderer/src/components/tab-bar/tab-strip-scroll-anchor.ts
new file mode 100644
index 000000000000..b7f38ba281a7
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/tab-strip-scroll-anchor.ts
@@ -0,0 +1,54 @@
+/** A tab's on-screen x inside the strip viewport, recorded before tabs are inserted around it. */
+export type TabStripScrollAnchor = {
+  tabId: string
+  offset: number
+}
+
+function tabElements(strip: HTMLElement): HTMLElement[] {
+  return Array.from(strip.querySelectorAll<HTMLElement>('[data-tab-id]'))
+}
+
+function findTab(strip: HTMLElement, tabId: string): HTMLElement | undefined {
+  return tabElements(strip).find((tab) => tab.dataset.tabId === tabId)
+}
+
+/** The active tab when it is on screen, else the first visible tab; null when nothing is visible. */
+export function captureTabStripScrollAnchor(
+  strip: HTMLElement,
+  activeTabId: string | null
+): TabStripScrollAnchor | null {
+  const stripRect = strip.getBoundingClientRect()
+  const isVisible = (tab: HTMLElement): boolean => {
+    const rect = tab.getBoundingClientRect()
+    return rect.width > 0 && rect.right > stripRect.left && rect.left < stripRect.right
+  }
+  const active = activeTabId ? findTab(strip, activeTabId) : undefined
+  const anchor =
+    active && isVisible(active) ? active : tabElements(strip).find((tab) => isVisible(tab))
+  const tabId = anchor?.dataset.tabId
+  if (!anchor || !tabId) {
+    return null
+  }
+  return { tabId, offset: anchor.getBoundingClientRect().left - stripRect.left }
+}
+
+/** Scroll so the anchor tab is back at its recorded x; false when that tab is gone. */
+export function restoreTabStripScrollAnchor(
+  strip: HTMLElement,
+  anchor: TabStripScrollAnchor
+): boolean {
+  const tab = findTab(strip, anchor.tabId)
+  if (!tab) {
+    return false
+  }
+  const drift =
+    tab.getBoundingClientRect().left - strip.getBoundingClientRect().left - anchor.offset
+  if (drift !== 0) {
+    strip.scrollLeft += drift
+  }
+  return true
+}
+
+export function isLastTabStripTab(strip: HTMLElement, tabId: string | null): boolean {
+  return tabId !== null && tabElements(strip).at(-1)?.dataset.tabId === tabId
+}
diff --git a/src/renderer/src/components/tab-bar/terminal-tab-activity-status.test.ts b/src/renderer/src/components/tab-bar/terminal-tab-activity-status.test.ts
index fc626b99132b..129d290d5712 100644
--- a/src/renderer/src/components/tab-bar/terminal-tab-activity-status.test.ts
+++ b/src/renderer/src/components/tab-bar/terminal-tab-activity-status.test.ts
@@ -163,6 +163,39 @@ describe('resolveTerminalTabActivityStatus', () => {
     ).toBe('interrupted')
   })
 
+  it('reports a failed done as failed, and not as a clean finish', () => {
+    const failed = entry(FIRST_LEAF_ID, 'done', {
+      mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: NOW }
+    })
+    const finished = entry(SECOND_LEAF_ID, 'done')
+    expect(
+      resolveTerminalTabActivityStatus({
+        tab: TAB,
+        agentStatusByPaneKey: { [failed.paneKey]: failed, [finished.paneKey]: finished },
+        ptyIdsByTabId: LIVE_PTY
+      })
+    ).toBe('failed')
+  })
+
+  it('reads a main agent that failed while its subagent works as failed; success or stop as working', () => {
+    const status = (outcome: 'failure' | 'success' | 'cancellation') => {
+      const held = entry(FIRST_LEAF_ID, 'working', {
+        mainAgent: { state: 'done', outcome, stateStartedAt: NOW }
+      })
+      return resolveTerminalTabActivityStatus({
+        tab: TAB,
+        agentStatusByPaneKey: { [held.paneKey]: held },
+        ptyIdsByTabId: LIVE_PTY
+      })
+    }
+    expect(status('failure')).toBe('failed')
+    expect(resolveTerminalTabAttentionBadge({ status: status('failure'), hasUnread: false })).toBe(
+      'failed'
+    )
+    expect(status('success')).toBe('working')
+    expect(status('cancellation')).toBe('working')
+  })
+
   it('does not let a finished sibling mask an interrupted outcome', () => {
     const interrupted = entry(FIRST_LEAF_ID, 'done', { interrupted: true })
     const finished = entry(SECOND_LEAF_ID, 'done')
diff --git a/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts b/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts
index d03e0cbccb7a..f553c52e512b 100644
--- a/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts
+++ b/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts
@@ -9,6 +9,10 @@ import {
   type AgentStatusEntry
 } from '../../../../shared/agent-status-types'
 import { parseLegacyNumericPaneKey, parsePaneKey } from '../../../../shared/stable-pane-id'
+import {
+  applyAgentPaneActivityFlags,
+  type AgentPaneActivityFlags
+} from '@/lib/agent-pane-activity-flags'
 import type { TerminalLayoutSnapshot, TerminalTab } from '../../../../shared/terminal-tab-types'
 
 // Why: a terminal tab is a container of panes, exactly like a worktree card is
@@ -17,15 +21,8 @@ import type { TerminalLayoutSnapshot, TerminalTab } from '../../../../shared/ter
 // skip the card's retained-done promotion — see resolveTerminalTabActivityStatus).
 export type TerminalTabActivityStatus = WorktreeStatus
 
-// Per-tab live-hook flags, mirroring applyLiveAgentState in
-// worktree-agent-activity-summary.ts. blocked/waiting collapse to permission,
-// matching every other status surface in the app.
-type TerminalTabActivityFlags = {
-  hasPermission: boolean
-  hasLiveWorking: boolean
-  hasLiveMonitoring: boolean
-  hasInterrupted: boolean
-  hasLiveDone: boolean
+// Per-tab live-hook flags, folded by the same applyAgentPaneActivityFlags as the worktree card.
+type TerminalTabActivityFlags = AgentPaneActivityFlags & {
   paneIds: Set<string>
   /** Panes whose row went stale; suppress generated permission labels only. */
   stalePaneIds: Set<string>
@@ -84,20 +81,7 @@ function getTerminalTabActivityFlags(
 
     const flags = getOrCreateTerminalTabActivityFlags(flagsByTabId, identity.tabId)
     flags.paneIds.add(identity.paneId)
-    if (entry.state === 'blocked' || entry.state === 'waiting') {
-      flags.hasPermission = true
-    } else if (entry.state === 'working') {
-      if (entry.workingMode === 'monitoring') {
-        flags.hasLiveMonitoring = true
-      } else {
-        flags.hasLiveWorking = true
-      }
-    } else if (entry.interrupted === true) {
-      // Interrupted is encoded as done, so it must be checked first.
-      flags.hasInterrupted = true
-    } else if (entry.state === 'done') {
-      flags.hasLiveDone = true
-    }
+    applyAgentPaneActivityFlags(flags, entry)
   }
 
   flagsCache = { agentStatusByPaneKey, agentStatusEpoch, flagsByTabId }
@@ -114,6 +98,7 @@ function getOrCreateTerminalTabActivityFlags(
       hasPermission: false,
       hasLiveWorking: false,
       hasLiveMonitoring: false,
+      hasFailed: false,
       hasInterrupted: false,
       hasLiveDone: false,
       paneIds: new Set(),
@@ -180,6 +165,7 @@ export function resolveTerminalTabActivityStatus({
     hasPermission: hasPendingAsk || (flags?.hasPermission ?? false),
     hasLiveWorking: flags?.hasLiveWorking ?? false,
     hasLiveMonitoring: flags?.hasLiveMonitoring ?? false,
+    hasFailed: flags?.hasFailed ?? false,
     hasInterrupted: flags?.hasInterrupted ?? false,
     hasLiveDone: flags?.hasLiveDone ?? false,
     // Why: retained/orchestration promotions are worktree-aggregate concerns;
@@ -201,6 +187,7 @@ export type TerminalTabAttentionBadge =
   | 'working'
   | 'monitoring'
   | 'permission'
+  | 'failed'
   | 'interrupted'
   | 'unread'
   | 'done'
@@ -231,8 +218,8 @@ export function resolveTerminalTabAttentionBadge({
   if (status === 'done') {
     return 'done'
   }
-  if (status === 'interrupted') {
-    return 'interrupted'
+  if (status === 'failed' || status === 'interrupted') {
+    return status
   }
   return null
 }
@@ -240,11 +227,12 @@ export function resolveTerminalTabAttentionBadge({
 /** Map a container activity status onto AgentStateDot's vocabulary (no unread — that's a bell). */
 export function terminalTabActivityToAgentDotState(
   status: TerminalTabActivityStatus
-): 'working' | 'monitoring' | 'permission' | 'interrupted' | 'done' | null {
+): 'working' | 'monitoring' | 'permission' | 'failed' | 'interrupted' | 'done' | null {
   switch (status) {
     case 'working':
     case 'monitoring':
     case 'permission':
+    case 'failed':
     case 'interrupted':
     case 'done':
       return status
diff --git a/src/renderer/src/components/tab-group/RetainedPaneHost.test.tsx b/src/renderer/src/components/tab-group/RetainedPaneHost.test.tsx
index 964214e0d9f0..ea71e0e8fd51 100644
--- a/src/renderer/src/components/tab-group/RetainedPaneHost.test.tsx
+++ b/src/renderer/src/components/tab-group/RetainedPaneHost.test.tsx
@@ -2,10 +2,13 @@
 import { act, cleanup, fireEvent, render } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { RetainedPaneHost } from './RetainedPaneHost'
+import { registerTabGroupBody } from './tab-group-body-geometry'
 
 const disconnect = vi.fn()
+const observerCreated = vi.fn()
 let notifyResize: () => void
 let anchors: HTMLDivElement[]
+let unregisterAnchors: (() => void)[]
 
 beforeEach(() => {
   vi.stubGlobal('__ORCA_WEB_CLIENT__', true)
@@ -14,12 +17,15 @@ beforeEach(() => {
     class {
       constructor(callback: () => void) {
         notifyResize = callback
+        observerCreated()
       }
       observe(): void {}
+      unobserve(): void {}
       disconnect = disconnect
     }
   )
   disconnect.mockClear()
+  observerCreated.mockClear()
   anchors = ['left', 'right'].map((id, index) => {
     const anchor = document.createElement('div')
     anchor.dataset.tabGroupBodyId = id
@@ -27,11 +33,14 @@ beforeEach(() => {
     document.body.append(anchor)
     return anchor
   })
+  unregisterAnchors = ['left', 'right'].map((id, index) => registerTabGroupBody(id, anchors[index]))
 })
 
 afterEach(() => {
   cleanup()
+  unregisterAnchors.forEach((unregister) => unregister())
   anchors.forEach((anchor) => anchor.remove())
+  vi.restoreAllMocks()
   vi.unstubAllGlobals()
 })
 
@@ -105,3 +114,84 @@ it('allows hidden terminal startup measurement without exposing input or startin
   expect(timeout).not.toHaveBeenCalled()
   timeout.mockRestore()
 })
+
+function countResizeListeners(spy: ReturnType<typeof vi.spyOn>): number {
+  return spy.mock.calls.filter(([type]) => type === 'resize').length
+}
+
+it('measures a group once for all of its visible panes', () => {
+  const addListener = vi.spyOn(window, 'addEventListener')
+  const view = render(
+    <>
+      <RetainedPaneHost groupId="left" isVisible>
+        <span />
+      </RetainedPaneHost>
+      <RetainedPaneHost groupId="left" isVisible>
+        <span />
+      </RetainedPaneHost>
+      <RetainedPaneHost groupId="left" isVisible>
+        <span />
+      </RetainedPaneHost>
+    </>
+  )
+  expect(observerCreated).toHaveBeenCalledTimes(1)
+  expect(countResizeListeners(addListener)).toBe(1)
+
+  const measureBody = vi.fn(() => new DOMRect(0, 40, 300, 500))
+  anchors[0].getBoundingClientRect = measureBody
+  act(() => notifyResize())
+  expect(measureBody).toHaveBeenCalledTimes(1)
+  const hosts = Array.from(
+    view.container.querySelectorAll<HTMLElement>('[data-retained-pane-host]')
+  )
+  expect(hosts.map((host) => host.style.width)).toEqual(['300px', '300px', '300px'])
+
+  const removeListener = vi.spyOn(window, 'removeEventListener')
+  view.unmount()
+  expect(disconnect).toHaveBeenCalledTimes(1)
+  expect(countResizeListeners(removeListener)).toBe(1)
+})
+
+it('does not measure a hidden pane until it becomes visible', () => {
+  const addListener = vi.spyOn(window, 'addEventListener')
+  const view = render(
+    <RetainedPaneHost groupId="left" isVisible={false}>
+      <span />
+    </RetainedPaneHost>
+  )
+  const host = view.container.firstElementChild as HTMLDivElement
+  expect(observerCreated).not.toHaveBeenCalled()
+  expect(countResizeListeners(addListener)).toBe(0)
+  expect(host.style.display).toBe('none')
+
+  anchors[0].getBoundingClientRect = () => new DOMRect(0, 48, 320, 400)
+  view.rerender(
+    <RetainedPaneHost groupId="left" isVisible>
+      <span />
+    </RetainedPaneHost>
+  )
+  expect(observerCreated).toHaveBeenCalledTimes(1)
+  expect(host.style.top).toBe('48px')
+  expect(host.style.width).toBe('320px')
+
+  view.rerender(
+    <RetainedPaneHost groupId="left" isVisible={false}>
+      <span />
+    </RetainedPaneHost>
+  )
+  expect(disconnect).toHaveBeenCalledTimes(1)
+})
+
+it('keeps measuring a hidden pane that asks to measure while hidden', () => {
+  const view = render(
+    <RetainedPaneHost groupId="left" isVisible={false} measureWhileHidden>
+      <span />
+    </RetainedPaneHost>
+  )
+  const host = view.container.firstElementChild as HTMLDivElement
+  expect(observerCreated).toHaveBeenCalledTimes(1)
+  expect(host.style.width).toBe('400px')
+  anchors[0].getBoundingClientRect = () => new DOMRect(0, 32, 360, 568)
+  act(() => notifyResize())
+  expect(host.style.width).toBe('360px')
+})
diff --git a/src/renderer/src/components/tab-group/RetainedPaneHost.tsx b/src/renderer/src/components/tab-group/RetainedPaneHost.tsx
index 6007f2b1c202..c9ec5d3a8260 100644
--- a/src/renderer/src/components/tab-group/RetainedPaneHost.tsx
+++ b/src/renderer/src/components/tab-group/RetainedPaneHost.tsx
@@ -1,6 +1,7 @@
 import { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { SYNC_FIT_PANES_EVENT } from '@/constants/terminal'
 import { tabGroupBodyAnchorName } from './tab-group-body-anchor'
+import { subscribeTabGroupBodyRect, type TabGroupBodyRect } from './tab-group-body-geometry'
 
 const HAS_CSS_ANCHOR_POSITIONING =
   typeof CSS !== 'undefined' &&
@@ -9,7 +10,6 @@ const HAS_CSS_ANCHOR_POSITIONING =
   CSS.supports('width', 'anchor-size(--orca-terminal-overlay-probe width)')
 const MIN_OVERLAY_FIT_WIDTH_PX = 48
 const MIN_OVERLAY_FIT_HEIGHT_PX = 24
-const FALLBACK_RECT_MIN_CHANGE_PX = 1
 
 function shouldUseCssAnchorPositioning(): boolean {
   return (
@@ -18,13 +18,6 @@ function shouldUseCssAnchorPositioning(): boolean {
   )
 }
 
-type MeasuredFallbackRect = {
-  top: number
-  left: number
-  width: number
-  height: number
-}
-
 type RetainedPaneHostProps = {
   groupId: string | undefined
   isVisible: boolean
@@ -47,67 +40,17 @@ export function RetainedPaneHost({
 }: RetainedPaneHostProps): React.JSX.Element {
   const anchorName = groupId !== undefined ? tabGroupBodyAnchorName(groupId) : undefined
   const overlayRef = useRef<HTMLDivElement | null>(null)
-  const [measuredFallbackRect, setMeasuredFallbackRect] = useState<MeasuredFallbackRect | null>(
-    null
-  )
+  const [measuredFallbackRect, setMeasuredFallbackRect] = useState<TabGroupBodyRect | null>(null)
+  // Why: a hidden host renders display:none, so it has no use for group geometry until shown.
+  const measuresFallbackRect =
+    groupId !== undefined && !shouldUseCssAnchorPositioning() && (isVisible || measureWhileHidden)
   useLayoutEffect(() => {
-    if (!anchorName || shouldUseCssAnchorPositioning() || !groupId) {
+    const container = overlayRef.current?.parentElement
+    if (!measuresFallbackRect || groupId === undefined || !container) {
       return
     }
-
-    const findBody = (): HTMLElement | null => {
-      for (const candidate of document.querySelectorAll<HTMLElement>('[data-tab-group-body-id]')) {
-        if (candidate.dataset.tabGroupBodyId === groupId) {
-          return candidate
-        }
-      }
-      return null
-    }
-
-    const updateRect = (): void => {
-      const overlay = overlayRef.current
-      const parent = overlay?.parentElement
-      const body = findBody()
-      if (!parent || !body) {
-        setMeasuredFallbackRect(null)
-        return
-      }
-      const parentRect = parent.getBoundingClientRect()
-      const bodyRect = body.getBoundingClientRect()
-      const next: MeasuredFallbackRect = {
-        top: bodyRect.top - parentRect.top,
-        left: bodyRect.left - parentRect.left,
-        width: bodyRect.width,
-        height: bodyRect.height
-      }
-      // Why: ResizeObserver and xterm fit can otherwise amplify sub-pixel jitter forever.
-      setMeasuredFallbackRect((prev) =>
-        prev &&
-        Math.abs(prev.top - next.top) < FALLBACK_RECT_MIN_CHANGE_PX &&
-        Math.abs(prev.left - next.left) < FALLBACK_RECT_MIN_CHANGE_PX &&
-        Math.abs(prev.width - next.width) < FALLBACK_RECT_MIN_CHANGE_PX &&
-        Math.abs(prev.height - next.height) < FALLBACK_RECT_MIN_CHANGE_PX
-          ? prev
-          : next
-      )
-    }
-
-    updateRect()
-    const body = findBody()
-    const parent = overlayRef.current?.parentElement
-    const resizeObserver = new ResizeObserver(updateRect)
-    if (body) {
-      resizeObserver.observe(body)
-    }
-    if (parent) {
-      resizeObserver.observe(parent)
-    }
-    window.addEventListener('resize', updateRect)
-    return () => {
-      resizeObserver.disconnect()
-      window.removeEventListener('resize', updateRect)
-    }
-  }, [anchorName, groupId, isVisible])
+    return subscribeTabGroupBodyRect(groupId, container, setMeasuredFallbackRect)
+  }, [groupId, measuresFallbackRect])
 
   useLayoutEffect(() => {
     if (!fitTerminal || !isVisible || !anchorName) {
diff --git a/src/renderer/src/components/tab-group/TabGroupPanel.tsx b/src/renderer/src/components/tab-group/TabGroupPanel.tsx
index 6e48ddd0ec08..f6ad4b04d897 100644
--- a/src/renderer/src/components/tab-group/TabGroupPanel.tsx
+++ b/src/renderer/src/components/tab-group/TabGroupPanel.tsx
@@ -1,4 +1,4 @@
-import { Suspense, useMemo } from 'react'
+import { Suspense, useCallback, useMemo } from 'react'
 import { lazyWithRetry as lazy } from '@/lib/lazy-with-retry'
 import { useDroppable } from '@dnd-kit/core'
 import { Ellipsis, X } from 'lucide-react'
@@ -18,6 +18,7 @@ import { closeTerminalTab } from '../terminal/terminal-tab-actions'
 import { resolveGroupTabFromVisibleId } from './tab-group-visible-id'
 import { getTabPaneBodyDroppableId, type HoveredTabInsertion } from './useTabDragSplit'
 import { tabGroupBodyAnchorName } from './tab-group-body-anchor'
+import { registerTabGroupBody } from './tab-group-body-geometry'
 import { translate } from '@/i18n/i18n'
 import type { TabGroup } from '../../../../shared/tab-types'
 import type { ClientHostedBrowserRow } from '../../../../shared/client-hosted-browser-rows'
@@ -93,6 +94,20 @@ export default function TabGroupPanel({
     },
     disabled: !isTabDragActive
   })
+  const setBodyRef = useCallback(
+    (node: HTMLDivElement | null) => {
+      setBodyDropRef(node)
+      if (!node) {
+        return undefined
+      }
+      const unregisterBody = registerTabGroupBody(groupId, node)
+      return () => {
+        unregisterBody()
+        setBodyDropRef(null)
+      }
+    },
+    [groupId, setBodyDropRef]
+  )
   // Why: per-group anchor-name lets the worktree-level overlay position panes via CSS anchor positioning, so moving a tab between groups re-targets the anchor instead of remounting xterm (loses alt-screen TUI state) or reloading `<webview>`.
   const bodyAnchorName = tabGroupBodyAnchorName(groupId)
   // Why: memoize so a fresh style object each render doesn't break downstream memoization keyed on referential equality.
@@ -334,7 +349,7 @@ export default function TabGroupPanel({
       </div>
 
       <div
-        ref={setBodyDropRef}
+        ref={setBodyRef}
         data-tab-group-body-id={groupId}
         data-worktree-id={worktreeId}
         className="relative flex-1 min-h-0 overflow-hidden"
diff --git a/src/renderer/src/components/tab-group/tab-group-body-geometry.test.ts b/src/renderer/src/components/tab-group/tab-group-body-geometry.test.ts
new file mode 100644
index 000000000000..07458d30beee
--- /dev/null
+++ b/src/renderer/src/components/tab-group/tab-group-body-geometry.test.ts
@@ -0,0 +1,141 @@
+// @vitest-environment happy-dom
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { registerTabGroupBody, subscribeTabGroupBodyRect } from './tab-group-body-geometry'
+
+type FakeObserver = {
+  callback: () => void
+  observed: Set<Element>
+  disconnected: boolean
+}
+
+let observers: FakeObserver[]
+let cleanups: (() => void)[]
+
+function element(rect: DOMRect): HTMLDivElement {
+  const node = document.createElement('div')
+  node.getBoundingClientRect = () => rect
+  return node
+}
+
+function track(cleanup: () => void): () => void {
+  cleanups.push(cleanup)
+  return cleanup
+}
+
+function resizeListenerDelta(
+  add: ReturnType<typeof vi.spyOn>,
+  remove: ReturnType<typeof vi.spyOn>
+) {
+  const count = (spy: ReturnType<typeof vi.spyOn>): number =>
+    spy.mock.calls.filter(([type]) => type === 'resize').length
+  return count(add) - count(remove)
+}
+
+beforeEach(() => {
+  observers = []
+  cleanups = []
+  vi.stubGlobal(
+    'ResizeObserver',
+    class {
+      private readonly record: FakeObserver
+      constructor(callback: () => void) {
+        this.record = { callback, observed: new Set(), disconnected: false }
+        observers.push(this.record)
+      }
+      observe(target: Element): void {
+        this.record.observed.add(target)
+      }
+      unobserve(target: Element): void {
+        this.record.observed.delete(target)
+      }
+      disconnect(): void {
+        this.record.disconnected = true
+        this.record.observed.clear()
+      }
+    }
+  )
+})
+
+afterEach(() => {
+  cleanups.forEach((cleanup) => cleanup())
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+})
+
+describe('subscribeTabGroupBodyRect', () => {
+  it('shares one observer per group and one window listener across groups', () => {
+    const add = vi.spyOn(window, 'addEventListener')
+    const remove = vi.spyOn(window, 'removeEventListener')
+    const container = element(new DOMRect(0, 10, 800, 600))
+    track(registerTabGroupBody('a', element(new DOMRect(0, 42, 400, 568))))
+    track(registerTabGroupBody('b', element(new DOMRect(400, 42, 400, 568))))
+
+    const first = vi.fn()
+    const second = vi.fn()
+    const other = vi.fn()
+    const unsubscribeFirst = subscribeTabGroupBodyRect('a', container, first)
+    const unsubscribeSecond = subscribeTabGroupBodyRect('a', container, second)
+    const unsubscribeOther = subscribeTabGroupBodyRect('b', container, other)
+
+    expect(observers).toHaveLength(2)
+    expect(resizeListenerDelta(add, remove)).toBe(1)
+    expect(first).toHaveBeenLastCalledWith({ top: 32, left: 0, width: 400, height: 568 })
+    expect(second.mock.lastCall?.[0]).toBe(first.mock.lastCall?.[0])
+    expect(other).toHaveBeenLastCalledWith({ top: 32, left: 400, width: 400, height: 568 })
+
+    unsubscribeFirst()
+    expect(observers[0].disconnected).toBe(false)
+    unsubscribeSecond()
+    expect(observers[0].disconnected).toBe(true)
+    expect(resizeListenerDelta(add, remove)).toBe(1)
+    unsubscribeOther()
+    expect(observers[1].disconnected).toBe(true)
+    expect(resizeListenerDelta(add, remove)).toBe(0)
+  })
+
+  it('notifies only on changes larger than a pixel', () => {
+    const container = element(new DOMRect(0, 0, 800, 600))
+    let bodyRect = new DOMRect(0, 32, 400, 568)
+    const body = element(bodyRect)
+    body.getBoundingClientRect = () => bodyRect
+    track(registerTabGroupBody('a', body))
+    const listener = vi.fn()
+    track(subscribeTabGroupBodyRect('a', container, listener))
+    listener.mockClear()
+
+    bodyRect = new DOMRect(0, 32.5, 400.5, 568)
+    window.dispatchEvent(new Event('resize'))
+    expect(listener).not.toHaveBeenCalled()
+
+    bodyRect = new DOMRect(0, 32, 380, 568)
+    observers[0].callback()
+    expect(listener).toHaveBeenCalledTimes(1)
+    expect(listener).toHaveBeenLastCalledWith({ top: 32, left: 0, width: 380, height: 568 })
+  })
+
+  it('follows the group body as it mounts, is replaced, and unmounts', () => {
+    const container = element(new DOMRect(0, 0, 800, 600))
+    const listener = vi.fn()
+    track(subscribeTabGroupBodyRect('a', container, listener))
+    expect(listener).toHaveBeenLastCalledWith(null)
+
+    const firstBody = element(new DOMRect(0, 32, 400, 568))
+    const unregisterFirst = registerTabGroupBody('a', firstBody)
+    expect(observers[0].observed.has(firstBody)).toBe(true)
+    expect(listener).toHaveBeenLastCalledWith({ top: 32, left: 0, width: 400, height: 568 })
+
+    const secondBody = element(new DOMRect(0, 32, 600, 568))
+    const unregisterSecond = track(registerTabGroupBody('a', secondBody))
+    expect(observers[0].observed.has(firstBody)).toBe(false)
+    expect(observers[0].observed.has(secondBody)).toBe(true)
+    expect(listener).toHaveBeenLastCalledWith({ top: 32, left: 0, width: 600, height: 568 })
+
+    // A late unregister from the replaced panel must not drop the live body.
+    unregisterFirst()
+    expect(observers[0].observed.has(secondBody)).toBe(true)
+
+    unregisterSecond()
+    expect(observers[0].observed.has(secondBody)).toBe(false)
+    expect(listener).toHaveBeenLastCalledWith(null)
+  })
+})
diff --git a/src/renderer/src/components/tab-group/tab-group-body-geometry.ts b/src/renderer/src/components/tab-group/tab-group-body-geometry.ts
new file mode 100644
index 000000000000..28712fb07166
--- /dev/null
+++ b/src/renderer/src/components/tab-group/tab-group-body-geometry.ts
@@ -0,0 +1,171 @@
+// Why: every retained pane in a group sits over the same tab-group body, so the
+// non-anchor fallback (web client) measures that body once per group instead of
+// once per pane, and only while some pane in the group can display.
+
+export type TabGroupBodyRect = {
+  top: number
+  left: number
+  width: number
+  height: number
+}
+
+type TabGroupBodyRectListener = (rect: TabGroupBodyRect | null) => void
+
+type GroupBodyGeometrySource = {
+  groupId: string
+  // The positioned element the pane hosts are laid out in; rects are relative to it.
+  container: HTMLElement
+  listeners: Set<TabGroupBodyRectListener>
+  observer: ResizeObserver
+  observedBody: HTMLElement | null
+  rect: TabGroupBodyRect | null
+}
+
+const RECT_MIN_CHANGE_PX = 1
+
+const bodiesByGroupId = new Map<string, HTMLElement>()
+const sourcesByGroupId = new Map<string, Set<GroupBodyGeometrySource>>()
+
+function isSameRect(prev: TabGroupBodyRect | null, next: TabGroupBodyRect | null): boolean {
+  if (!prev || !next) {
+    return prev === next
+  }
+  // Why: ResizeObserver and xterm fit can otherwise amplify sub-pixel jitter forever.
+  return (
+    Math.abs(prev.top - next.top) < RECT_MIN_CHANGE_PX &&
+    Math.abs(prev.left - next.left) < RECT_MIN_CHANGE_PX &&
+    Math.abs(prev.width - next.width) < RECT_MIN_CHANGE_PX &&
+    Math.abs(prev.height - next.height) < RECT_MIN_CHANGE_PX
+  )
+}
+
+function measureSource(source: GroupBodyGeometrySource): void {
+  const body = source.observedBody
+  let next: TabGroupBodyRect | null = null
+  if (body) {
+    const containerRect = source.container.getBoundingClientRect()
+    const bodyRect = body.getBoundingClientRect()
+    next = {
+      top: bodyRect.top - containerRect.top,
+      left: bodyRect.left - containerRect.left,
+      width: bodyRect.width,
+      height: bodyRect.height
+    }
+  }
+  if (isSameRect(source.rect, next)) {
+    return
+  }
+  source.rect = next
+  for (const listener of source.listeners) {
+    listener(next)
+  }
+}
+
+function measureAllSources(): void {
+  for (const sources of sourcesByGroupId.values()) {
+    for (const source of sources) {
+      measureSource(source)
+    }
+  }
+}
+
+function syncObservedBody(source: GroupBodyGeometrySource): void {
+  const body = bodiesByGroupId.get(source.groupId) ?? null
+  if (body === source.observedBody) {
+    return
+  }
+  if (source.observedBody) {
+    source.observer.unobserve(source.observedBody)
+  }
+  if (body) {
+    source.observer.observe(body)
+  }
+  source.observedBody = body
+}
+
+function onGroupBodyChanged(groupId: string): void {
+  for (const source of sourcesByGroupId.get(groupId) ?? []) {
+    syncObservedBody(source)
+    measureSource(source)
+  }
+}
+
+/** Registers the element that is the body of `groupId`; returns the unregister function. */
+export function registerTabGroupBody(groupId: string, body: HTMLElement): () => void {
+  bodiesByGroupId.set(groupId, body)
+  onGroupBodyChanged(groupId)
+  return () => {
+    // A remounted panel may already have registered its replacement body.
+    if (bodiesByGroupId.get(groupId) !== body) {
+      return
+    }
+    bodiesByGroupId.delete(groupId)
+    onGroupBodyChanged(groupId)
+  }
+}
+
+function acquireSource(groupId: string, container: HTMLElement): GroupBodyGeometrySource {
+  let sources = sourcesByGroupId.get(groupId)
+  for (const existing of sources ?? []) {
+    if (existing.container === container) {
+      return existing
+    }
+  }
+  const source: GroupBodyGeometrySource = {
+    groupId,
+    container,
+    listeners: new Set(),
+    observer: new ResizeObserver(() => measureSource(source)),
+    observedBody: null,
+    rect: null
+  }
+  source.observer.observe(container)
+  syncObservedBody(source)
+  if (sourcesByGroupId.size === 0) {
+    window.addEventListener('resize', measureAllSources)
+  }
+  if (!sources) {
+    sources = new Set()
+    sourcesByGroupId.set(groupId, sources)
+  }
+  sources.add(source)
+  return source
+}
+
+function releaseSource(source: GroupBodyGeometrySource): void {
+  source.observer.disconnect()
+  const sources = sourcesByGroupId.get(source.groupId)
+  sources?.delete(source)
+  if (sources?.size === 0) {
+    sourcesByGroupId.delete(source.groupId)
+  }
+  if (sourcesByGroupId.size === 0) {
+    window.removeEventListener('resize', measureAllSources)
+  }
+}
+
+/**
+ * Subscribes to the rect of `groupId`'s body relative to `container`. The
+ * listener is called synchronously with the current rect, then on each change.
+ */
+export function subscribeTabGroupBodyRect(
+  groupId: string,
+  container: HTMLElement,
+  listener: TabGroupBodyRectListener
+): () => void {
+  const source = acquireSource(groupId, container)
+  // Why: observers miss moves without a resize, so a pane that becomes visible re-reads once.
+  measureSource(source)
+  listener(source.rect)
+  // A per-subscription entry keeps unsubscribe idempotent even if one listener subscribes twice.
+  const entry: TabGroupBodyRectListener = (rect) => listener(rect)
+  source.listeners.add(entry)
+  return () => {
+    if (!source.listeners.delete(entry)) {
+      return
+    }
+    if (source.listeners.size === 0) {
+      releaseSource(source)
+    }
+  }
+}
diff --git a/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts b/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
index d0fae789882d..609a0e6579ce 100644
--- a/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
+++ b/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
@@ -99,7 +99,7 @@ export function useTabGroupCreationCommands({
     openEntry: async (args: TabCreateEntryArgs) => {
       await openTabBarEntry(args)
     },
-    duplicateBrowserTab: (browserTabId: string) => {
+    duplicateBrowserTab: (browserTabId: string, sourceUnifiedTabId: string) => {
       void (async () => {
         const state = useAppStore.getState()
         const tabs = state.browserTabsByWorktree[worktreeId] ?? []
@@ -123,17 +123,19 @@ export function useTabGroupCreationCommands({
             environmentId: runtimeEnvironmentId,
             url: source.url,
             profileId: source.sessionProfileId,
-            targetGroupId: groupId
+            targetGroupId: groupId,
+            clientAfterTabId: sourceUnifiedTabId
           })
           if (created) {
             return
           }
           throw new Error('The paired runtime could not duplicate the managed browser tab.')
         }
+        // Why no targetGroupId: a source-following duplicate joins the source's live group.
         createBrowserTab(worktreeId, source.url, {
           ...buildDuplicatedBrowserTabOptions(source),
           ...(runtimeEnvironmentId ? { browserRuntimeEnvironmentId: null } : {}),
-          targetGroupId: groupId
+          afterTabId: sourceUnifiedTabId
         })
       })().catch((error) => {
         toast.error(error instanceof Error ? error.message : String(error))
diff --git a/src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.focus.test.ts b/src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.focus.test.ts
index 290fb5c59845..b438f5ecee8c 100644
--- a/src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.focus.test.ts
+++ b/src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.focus.test.ts
@@ -659,13 +659,13 @@ describe('useTabGroupWorkspaceModel terminal activation focus', () => {
     const { useTabGroupWorkspaceModel } = await import('./useTabGroupWorkspaceModel')
     const model = useTabGroupWorkspaceModel({ groupId: 'group-1', worktreeId: 'wt-1' })
 
-    model.commands.duplicateBrowserTab('browser-workspace-1')
+    model.commands.duplicateBrowserTab('browser-workspace-1', 'browser-unified-1')
 
     expect(mocks.createBrowserTab).toHaveBeenCalledWith('wt-1', 'https://example.com', {
       title: 'Example',
       sessionProfileId: 'profile-1',
       sessionPartition: 'persist:orca-browser-session-profile-1',
-      targetGroupId: 'group-1'
+      afterTabId: 'browser-unified-1'
     })
   })
 
diff --git a/src/renderer/src/components/task-drawer-source-boundary.test.ts b/src/renderer/src/components/task-drawer-source-boundary.test.ts
deleted file mode 100644
index 1a2f64504e76..000000000000
--- a/src/renderer/src/components/task-drawer-source-boundary.test.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const COMPONENT_ROOT = __dirname
-
-function componentSource(relativePath: string): string {
-  return readFileSync(join(COMPONENT_ROOT, relativePath), 'utf8').replace(/\r\n?/g, '\n')
-}
-
-function sourceBetween(source: string, startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start + startPattern.length)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('task drawer source boundaries', () => {
-  it('threads GitHub task source context through detail mutations', () => {
-    const source = [
-      componentSource('github-item-dialog/edit-item-fields/gh-edit-section.tsx'),
-      componentSource('github-item-dialog/edit-item-fields/gh-edit-section-mutations.ts')
-    ].join('\n')
-    const issueUpdate = sourceBetween(
-      componentSource('github/github-work-item-edit-mutations.ts'),
-      'async function runIssueUpdate',
-      'async function runWorkItemBodyUpdate'
-    )
-    const commentUpdate = sourceBetween(
-      componentSource('github/github-work-item-comment-mutations.ts'),
-      'function addIssueCommentForRepo',
-      'function addPRReviewCommentForRepo'
-    )
-    const editSection = source
-
-    expect(issueUpdate).toContain('sourceContext: args.sourceContext')
-    expect(commentUpdate).toContain('sourceContext: args.sourceContext')
-    expect(editSection).toContain('sourceContext,')
-    expect(editSection).toContain(
-      'patchWorkItem(itemId, { state: newState }, itemRepoId, { sourceContext })'
-    )
-    expect(editSection).toContain(
-      'patchWorkItem(itemId, { labels: newLabels }, itemRepoId, { sourceContext })'
-    )
-  })
-
-  it('threads GitLab task source context through the shared drawer selector', () => {
-    const controllerSource = componentSource('GitLabItemDialog.tsx')
-    const source = [
-      controllerSource,
-      componentSource('gitlab-item-dialog/use-gitlab-item-dialog-effects.ts'),
-      componentSource('gitlab-item-dialog/use-gitlab-details-editing.ts'),
-      componentSource('gitlab-item-dialog/use-gitlab-primary-actions.ts'),
-      componentSource('gitlab-item-dialog/use-gitlab-review-actions.ts')
-    ].join('\n')
-    const selector = sourceBetween(
-      controllerSource,
-      'const repoSelector = useMemo',
-      'const updateCommentDraft'
-    )
-
-    expect(selector).toContain('...(repoId ? { repoId } : {})')
-    expect(selector).toContain('...(sourceContext ? { sourceContext } : {})')
-    expect(selector).toContain('}, [repoId, repoPath, sourceContext])')
-    expect(source).toContain('workItemDetails({ ...repoSelector')
-    expect(source).toContain('updateMR({ ...repoSelector')
-    expect(source).toContain('addMRComment({')
-    expect(source).toContain('addIssueComment({')
-    expect(source).toContain('...repoSelector')
-  })
-
-  it('uses Linear task source context for drawer reads, mutations, and optimistic patches', () => {
-    const drawerSource = componentSource('LinearItemDrawer.tsx')
-    const editSection = componentSource('linear-item-drawer-edit-controller.tsx')
-    const drawer = sourceBetween(
-      drawerSource,
-      'export default function LinearItemDrawer',
-      'return renderLinearItemDrawerSheet'
-    )
-
-    expect(editSection).toContain('const providerSettings = sourceContext ?? settings')
-    expect(editSection).toContain('linearUpdateIssue(providerSettings')
-    expect(editSection).toContain(
-      'patchLinearIssue(issue.id, { state: stateValue }, { sourceContext })'
-    )
-    expect(editSection).toContain(
-      'patchLinearIssue(issue.id, { assignee: newAssignee }, { sourceContext })'
-    )
-    expect(drawer).toContain('const providerSettings = sourceContext ?? settings')
-    expect(drawer).toContain('linearGetIssue(providerSettings')
-    expect(drawer).toContain('linearIssueComments(providerSettings')
-  })
-
-  it('uses Jira task source context for drawer reads, mutations, and optimistic patches', () => {
-    const source = componentSource('JiraIssueWorkspace.tsx')
-    const drawer = sourceBetween(source, 'export default function JiraIssueWorkspace', 'return (')
-
-    expect(drawer).toContain('const providerSettings = sourceContext ?? settings')
-    expect(drawer).toContain('jiraIssueComments(providerSettings')
-    expect(drawer).toContain('jiraGetIssue(providerSettings')
-    expect(drawer).toContain('jiraListTransitions(providerSettings')
-    expect(drawer).toContain('jiraUpdateIssue(providerSettings')
-    expect(drawer).toContain('jiraAddIssueComment(')
-    expect(drawer).toContain('patchJiraIssue(displayed.key, optimistic, { sourceContext })')
-    expect(drawer).toContain('patchJiraIssue(previous.key, previous, { sourceContext })')
-  })
-})
diff --git a/src/renderer/src/components/task-page-github-issue-creation.test.ts b/src/renderer/src/components/task-page-github-issue-creation.test.ts
deleted file mode 100644
index bacc3988bb8f..000000000000
--- a/src/renderer/src/components/task-page-github-issue-creation.test.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { readTaskPageSource } from './task-page-source-family.test-support'
-import { readFileSync } from 'node:fs'
-
-const taskPageSource = readTaskPageSource('use-task-page-github-issue-creation.ts')
-const newIssueDraftSource = readFileSync(
-  new URL('./use-task-page-github-issue-draft.ts', import.meta.url),
-  'utf8'
-)
-const newIssueRepoResetSource = readFileSync(
-  new URL('./task-page-new-issue-draft.ts', import.meta.url),
-  'utf8'
-)
-
-function issueCreationSection(): string {
-  const start = taskPageSource.indexOf('const handleCreateNewIssue')
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = taskPageSource.indexOf('const nextModel', start)
-  expect(end).toBeGreaterThan(start)
-  return taskPageSource.slice(start, end)
-}
-
-describe('TaskPage GitHub issue creation', () => {
-  it('keeps issue creation targeted to the first selected repo on a fresh mount', () => {
-    expect(newIssueDraftSource).toContain(
-      'selectedRepos.find((r) => r.id === newIssueRepoId) ?? selectedRepos[0] ?? null'
-    )
-    // Why: a repo leaving the selection mid-draft must reset to the first selected repo.
-    expect(newIssueRepoResetSource).toContain('newIssueRepoId === null')
-    expect(newIssueRepoResetSource).toContain('return { repoId: selectedRepoIds[0] ?? null }')
-  })
-
-  it('covers the complete remote oversized-body recovery timeout envelope', () => {
-    const section = issueCreationSection()
-
-    expect(section).toContain("'github.createIssue'")
-    expect(section).toMatch(/\{\s*timeoutMs: 65_000\s*\}/)
-  })
-
-  it('treats a body-save warning as created while preserving the recovery draft', () => {
-    const section = issueCreationSection()
-    const warningBranch = section.slice(
-      section.indexOf('if (result.bodySaveWarning)'),
-      section.indexOf('// Why: bump the nonce')
-    )
-
-    expect(warningBranch).toContain('toast.warning')
-    expect(warningBranch).toContain('description: result.bodySaveWarning')
-    expect(warningBranch).toMatch(/setNewIssueDraft\(\{\s*title: ''\s*\}\)/)
-    expect(warningBranch).toContain('} else {')
-    expect(warningBranch).toContain('clearNewIssueDraft()')
-  })
-})
diff --git a/src/renderer/src/components/task-page-source-family.test-support.ts b/src/renderer/src/components/task-page-source-family.test-support.ts
deleted file mode 100644
index 2253f11295e6..000000000000
--- a/src/renderer/src/components/task-page-source-family.test-support.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { readFileSync, readdirSync } from 'node:fs'
-import { join } from 'node:path'
-
-import {
-  type HookContractFact,
-  readFlattenedHookFacts,
-  readHookDefinitions
-} from './refactor-hook-contract.test-support'
-
-const TASK_PAGE_FLAT_SOURCE_PATTERN = /^(?:use-task-page-.*\.ts|task-page-.*\.tsx?)$/
-const TASK_PAGE_DIRECTORY = 'task-page'
-const TASK_PAGE_EXTRACTED_LOWERCASE_FILES = new Set([
-  'task-page-draft-storage.tsx',
-  'task-page-github-landing-refresh-run.tsx',
-  'task-page-github-quiet-refresh-run.tsx',
-  'task-page-github-review-model.tsx',
-  'task-page-github-reviewer-actions.ts',
-  'task-page-linear-issue-model.tsx',
-  'task-page-linear-jira-list-model.tsx',
-  'task-page-source-context.tsx'
-])
-
-function isSourceFile(name: string): boolean {
-  return !name.includes('.test.') && !name.includes('.test-support.')
-}
-
-// Why: the components/task-page tree nests by provider, so a flat readdir would silently
-// return an empty family and turn every ratchet built on it into a no-op.
-function readTaskPageDirectory(relativeDirectory: string): string[] {
-  return readdirSync(join(__dirname, relativeDirectory), { withFileTypes: true }).flatMap(
-    (entry) => {
-      const relativePath = `${relativeDirectory}/${entry.name}`
-      if (entry.isDirectory()) {
-        return readTaskPageDirectory(relativePath)
-      }
-      return /\.tsx?$/.test(entry.name) && isSourceFile(entry.name) ? [relativePath] : []
-    }
-  )
-}
-
-export const TASK_PAGE_SOURCE_FILES = [
-  ...readdirSync(__dirname).filter(
-    (name) => TASK_PAGE_FLAT_SOURCE_PATTERN.test(name) && isSourceFile(name)
-  ),
-  ...readTaskPageDirectory(TASK_PAGE_DIRECTORY)
-].sort()
-
-export const TASK_PAGE_REFACTOR_SOURCE_FILES = TASK_PAGE_SOURCE_FILES.filter(
-  (name) =>
-    (name.startsWith(`${TASK_PAGE_DIRECTORY}/`) && name.endsWith('.tsx')) ||
-    /^use-task-page-.*\.ts$/.test(name) ||
-    TASK_PAGE_EXTRACTED_LOWERCASE_FILES.has(name)
-)
-
-export function readTaskPageSource(relativePath: string): string {
-  return readFileSync(join(__dirname, relativePath), 'utf8')
-}
-
-export function readTaskPageSourceFamily(): string {
-  return TASK_PAGE_SOURCE_FILES.map(
-    (relativePath) => `// TaskPage source: ${relativePath}\n${readTaskPageSource(relativePath)}`
-  ).join('\n')
-}
-
-export function readTaskPageRefactorSourceFamily(): string {
-  return TASK_PAGE_REFACTOR_SOURCE_FILES.map(readTaskPageSource).join('\n')
-}
-
-export function readFlattenedTaskPageHookFacts(): HookContractFact[] {
-  const definitions = readHookDefinitions(
-    TASK_PAGE_REFACTOR_SOURCE_FILES.map((relativePath) => ({
-      relativePath,
-      source: readTaskPageSource(relativePath)
-    })),
-    (name) => name === 'TaskPage' || name.startsWith('useTaskPage')
-  )
-  return readFlattenedHookFacts(definitions, 'TaskPage')
-}
-
-export function readFlattenedTaskPageHookOrder(): string[] {
-  return readFlattenedTaskPageHookFacts().map(({ name }) => name)
-}
diff --git a/src/renderer/src/components/task-page-source-switch-boundary.test.ts b/src/renderer/src/components/task-page-source-switch-boundary.test.ts
deleted file mode 100644
index ae3bc60df21e..000000000000
--- a/src/renderer/src/components/task-page-source-switch-boundary.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { readTaskPageSource } from './task-page-source-family.test-support'
-
-const CONTENT_SOURCE = readTaskPageSource('task-page/Content.tsx')
-const SOURCE_BAR_SOURCE = readTaskPageSource('task-page/SourceBar.tsx')
-const SOURCE_CONTEXT_SOURCE = readTaskPageSource('task-page-source-context.tsx')
-const RUNTIME_HOSTS_SOURCE = readTaskPageSource('use-task-page-runtime-hosts.ts')
-const GITHUB_DETAIL_SOURCE = readTaskPageSource('use-task-page-github-detail.ts')
-const WORKSPACE_ACTIONS_SOURCE = readTaskPageSource('use-task-page-workspace-actions.ts')
-
-function sourceBetween(source: string, startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start + startPattern.length)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('TaskPage source switching host boundary', () => {
-  it('renders GitHub item details from the task-detail page owner only', () => {
-    const detailSection = sourceBetween(
-      CONTENT_SOURCE,
-      '<PullRequestPage',
-      ") : taskSource === 'github' && githubMode === 'project' ?"
-    )
-
-    expect(CONTENT_SOURCE).toContain('<ProjectViewWrapper selectedRepoIds={repoSelection} />')
-    expect(detailSection).toContain('workItem={dialogWorkItem}')
-    expect(detailSection).toContain('<PullRequestPage')
-    expect(detailSection).toContain('sourceContext={dialogSourceContext}')
-    expect(detailSection).toContain('<GitHubItemDialog')
-    expect(detailSection).toContain('sourceContext={dialogSourceContext}')
-    expect(CONTENT_SOURCE.match(/<GitHubItemDialog/g)).toHaveLength(1)
-  })
-
-  it('switches task source without mutating the focused run host', () => {
-    const section = sourceBetween(
-      SOURCE_BAR_SOURCE,
-      '{visibleSourceOptions.map((source) => {',
-      "{taskSource === 'linear' && linearConnected ?"
-    )
-
-    expect(section).toContain('openTaskPage(')
-    expect(section).toContain('taskSource: source.id')
-    expect(section).toContain('defaultTaskSource: source.id')
-    expect(section).not.toContain('activeRuntimeEnvironmentId')
-    expect(section).not.toContain('projectHostSetupId')
-    expect(section).not.toContain('workspaceRunContext')
-  })
-
-  it('treats missing remote task-source capability as source unavailable', () => {
-    const section = sourceBetween(
-      SOURCE_CONTEXT_SOURCE,
-      'function getTaskSourceHostAvailabilityForHost',
-      'function getTaskPageRepoCacheInput'
-    )
-
-    expect(section).toContain('TASK_SOURCE_CONTEXT_RUNTIME_CAPABILITY')
-    expect(section).toContain("reason: 'checking-task-source-capability'")
-    expect(section).toContain("reason: 'missing-task-source-capability'")
-  })
-
-  it('checks runtime-owned provider auth on the owning runtime', () => {
-    const section = sourceBetween(
-      RUNTIME_HOSTS_SOURCE,
-      'const runtimeTaskSourceHostIds = useMemo(() => {',
-      'const nextModel'
-    )
-
-    expect(section).toContain('TASK_SOURCE_CONTEXT_RUNTIME_CAPABILITY')
-    expect(section).toContain("'preflight.check'")
-    expect(section).toMatch(/\{\s*kind: 'environment',\s*environmentId: parsed\.environmentId\s*\}/)
-    expect(RUNTIME_HOSTS_SOURCE).toContain('runtimePreflightStatusByHostId')
-  })
-
-  it('preserves exact GitLab project identity when opening or starting from an item', () => {
-    const sourceContextBuilder = sourceBetween(
-      SOURCE_CONTEXT_SOURCE,
-      'function getTaskPageRepoSourceContext',
-      'function getTaskSourceHostAvailabilityForHost'
-    )
-    expect(sourceContextBuilder).toContain('gitlabProjectRef?: GitLabProjectRef | null')
-    expect(sourceContextBuilder).toContain('buildGitLabProviderIdentity(gitlabProjectRef)')
-
-    const openGitLabDetail = sourceBetween(
-      GITHUB_DETAIL_SOURCE,
-      'const openGitLabDetailPage = useCallback(',
-      'const nextModel'
-    )
-    expect(openGitLabDetail).toContain('item.projectRef')
-
-    const startGitLabWorkspace = sourceBetween(
-      WORKSPACE_ACTIONS_SOURCE,
-      'const openComposerForGitLabItem = useCallback(',
-      'const handleUseGitLabItem = useCallback('
-    )
-    expect(startGitLabWorkspace).toContain('item.projectRef')
-  })
-})
diff --git a/src/renderer/src/components/task-page-task-creation-drafts.test.ts b/src/renderer/src/components/task-page-task-creation-drafts.test.ts
deleted file mode 100644
index 969c1b0c3733..000000000000
--- a/src/renderer/src/components/task-page-task-creation-drafts.test.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { describe, expect, it } from 'vitest'
-import {
-  readTaskPageSource,
-  readTaskPageSourceFamily
-} from './task-page-source-family.test-support'
-
-const taskPageSource = readTaskPageSourceFamily()
-const linearCreateDialogsSource = readFileSync(
-  new URL('./use-task-page-linear-creation-state.ts', import.meta.url),
-  'utf8'
-)
-const jiraCreateDialogSource = readFileSync(
-  new URL('./use-task-page-jira-creation-state.ts', import.meta.url),
-  'utf8'
-)
-const jiraCreateSubmitSource = readFileSync(
-  new URL('./use-task-page-jira-issue-creation.ts', import.meta.url),
-  'utf8'
-)
-const draftWriterSource = readFileSync(
-  new URL('./task-page-draft-storage.tsx', import.meta.url),
-  'utf8'
-)
-const draftRetentionSource = [linearCreateDialogsSource, jiraCreateDialogSource].join('\n')
-
-function sectionBetween(source: string, startAnchor: string, endAnchor: string): string {
-  const start = source.indexOf(startAnchor)
-  expect(start, `missing anchor: ${startAnchor}`).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endAnchor, start)
-  expect(end, `missing anchor: ${endAnchor}`).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('TaskPage Linear/Jira creation drafts', () => {
-  it('uses the contentful gate for each session draft writer', () => {
-    expect(draftWriterSource.split('isTaskCreationDraftContentful(draft)')).toHaveLength(4)
-  })
-
-  it('retains all three drafts on dismissal without subscribing TaskPage to draft actions', () => {
-    expect(draftRetentionSource.split('useTaskCreationDraftRetention({')).toHaveLength(4)
-    expect(taskPageSource).not.toMatch(
-      /useAppStore\(\(s\) => s\.(?:set|clear)New(?:LinearProject|LinearIssue|JiraIssue)Draft\)/
-    )
-    expect(draftRetentionSource).not.toMatch(
-      /useAppStore\(\(s\) => s\.(?:set|clear)New(?:LinearProject|LinearIssue|JiraIssue)Draft\)/
-    )
-  })
-
-  it('restores dismissed typed text when each dialog reopens', () => {
-    const linearFilters = readFileSync(
-      new URL('./task-page/linear/Filters.tsx', import.meta.url),
-      'utf8'
-    )
-    const jiraFilters = readFileSync(
-      new URL('./task-page/jira/Filters.tsx', import.meta.url),
-      'utf8'
-    )
-    expect(linearFilters).toContain("setNewLinearProjectName(draft?.name ?? '')")
-    expect(linearFilters).toContain("setNewLinearProjectDescription(draft?.description ?? '')")
-    expect(linearFilters).toContain("setNewLinearProjectContent(draft?.content ?? '')")
-    expect(linearFilters).toContain("setNewLinearIssueTitle(issueDraft?.title ?? '')")
-    expect(linearFilters).toContain("setNewLinearIssueBody(issueDraft?.body ?? '')")
-    expect(jiraFilters).toContain("setNewJiraIssueTitle(draft?.title ?? '')")
-    expect(jiraFilters).toContain("setNewJiraIssueBody(draft?.body ?? '')")
-  })
-
-  it('discards each recovery draft only on a successful create', () => {
-    const linearProjectSection = sectionBetween(
-      readTaskPageSource('use-task-page-linear-project-creation.ts'),
-      'const handleCreateNewLinearProject',
-      'const nextModel'
-    )
-    expect(linearProjectSection).toContain('discardNewLinearProjectDraft()')
-
-    const linearIssueSection = sectionBetween(
-      readTaskPageSource('use-task-page-linear-issue-creation.ts'),
-      'const handleCreateNewLinearIssue',
-      'const nextModel'
-    )
-    expect(linearIssueSection).toContain('discardNewLinearIssueDraft()')
-
-    const jiraIssueSection = sectionBetween(
-      readTaskPageSource('use-task-page-jira-issue-creation.ts'),
-      'const handleCreateNewJiraIssue',
-      'const nextModel'
-    )
-    expect(jiraIssueSection).toContain('discardNewJiraIssueDraft()')
-  })
-
-  it('surfaces Jira create transport failures without leaking stale-context toasts', () => {
-    const jiraIssueSection = sectionBetween(
-      jiraCreateSubmitSource,
-      'const handleCreateNewJiraIssue',
-      'const nextModel'
-    )
-    expect(jiraIssueSection).toContain('} catch (error) {')
-    expect(jiraIssueSection).toContain(
-      'submitProviderRuntimeContextKey === providerRuntimeContextKeyRef.current'
-    )
-    expect(jiraIssueSection).toContain('toast.error(')
-  })
-})
diff --git a/src/renderer/src/components/task-page-workspace-composer-boundary.test.ts b/src/renderer/src/components/task-page-workspace-composer-boundary.test.ts
deleted file mode 100644
index a16128eee760..000000000000
--- a/src/renderer/src/components/task-page-workspace-composer-boundary.test.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import {
-  readTaskPageSource,
-  readTaskPageSourceFamily
-} from './task-page-source-family.test-support'
-
-const TASK_PAGE_SOURCE = readTaskPageSourceFamily()
-const WORKSPACE_ACTIONS_SOURCE = readTaskPageSource('use-task-page-workspace-actions.ts')
-const COMPOSER_ACTIONS_SOURCE = readTaskPageSource('use-task-page-composer-actions.ts')
-const PROJECT_VIEW_SOURCE = readFileSync(
-  join(__dirname, 'github-project', 'ProjectViewWrapper.tsx'),
-  'utf8'
-)
-const COMPOSER_MODAL_SOURCE = readFileSync(join(__dirname, 'NewWorkspaceComposerModal.tsx'), 'utf8')
-const QUICK_SUBMIT_PREPARATION_SOURCE =
-  readFileSync(join(__dirname, '../hooks/composer-state/quick-submit-preparation.ts'), 'utf8') +
-  readFileSync(join(__dirname, '../hooks/composer-state/quick-creation-execution.ts'), 'utf8') +
-  readFileSync(join(__dirname, '../hooks/composer-state/quick-creation-request.ts'), 'utf8')
-
-function sourceBetween(source: string, startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start + startPattern.length)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('TaskPage workspace creation source boundaries', () => {
-  it('prefills the workspace composer for GitHub issues and pull requests', () => {
-    const section = sourceBetween(
-      WORKSPACE_ACTIONS_SOURCE,
-      'const openComposerForItem = useCallback(',
-      'const handleUseWorkItem = useCallback('
-    )
-
-    expect(section).toContain("provider: 'github'")
-    expect(section).toContain('type: item.type')
-    expect(section).toContain('number: item.number')
-    expect(section).toContain('title: item.title')
-    expect(section).toContain('url: item.url')
-    expect(section).toContain("openModal('new-workspace-composer', {")
-    expect(section).toContain("getTaskPageRepoSourceContext(repoMap.get(item.repoId), 'github')")
-    expect(section).toContain('prefilledName: getGitHubWorkItemWorkspaceSeed(item)')
-    expect(section).toContain('initialRepoId: item.repoId')
-    expect(section).toContain('initialGitHubWorkItem: item')
-    expect(section).toContain("enableIssueAutomation: item.type === 'issue'")
-    expect(section).toContain("telemetrySource: 'sidebar'")
-  })
-
-  it('forwards PR start-point data and issue automation through quick submit', () => {
-    expect(COMPOSER_MODAL_SOURCE).toContain(
-      'initialGitHubWorkItem: modalData.initialGitHubWorkItem ?? null'
-    )
-    expect(COMPOSER_MODAL_SOURCE).toContain(
-      'enableIssueAutomation: modalData.enableIssueAutomation === true'
-    )
-    const quickSubmit = QUICK_SUBMIT_PREPARATION_SOURCE
-    expect(quickSubmit).toContain('readAndConfirmRuntimeIssueCommand(')
-    expect(quickSubmit).toContain('selectedRepoExecutionHostId')
-    expect(quickSubmit).toContain('isSubmissionCancelled')
-    expect(quickSubmit).toContain(
-      '...(input.issueCommand ? { issueCommand: input.issueCommand } : {})'
-    )
-  })
-
-  it('routes TaskPage GitHub starts directly to the composer', () => {
-    const section = sourceBetween(
-      WORKSPACE_ACTIONS_SOURCE,
-      'const handleUseWorkItem = useCallback(',
-      'const handleOpenOrUseGitHubWorkItem = useCallback('
-    )
-
-    expect(section).toContain("recordFeatureInteraction('github-tasks')")
-    expect(section).toContain('openComposerForItem(item)')
-    expect(section).not.toContain('createGitHubWorkItemWorkspaceInBackground')
-    expect(WORKSPACE_ACTIONS_SOURCE).not.toContain('@/lib/github-work-item-background-create')
-    expect(TASK_PAGE_SOURCE).not.toContain('@/lib/github-work-item-background-create')
-  })
-
-  it('routes TaskPage Linear starts directly to the composer', () => {
-    const composerSection = sourceBetween(
-      COMPOSER_ACTIONS_SOURCE,
-      'const openComposerForLinearItem = useCallback(',
-      'const handleUseLinearItem = useCallback('
-    )
-    const handlerSection = sourceBetween(
-      COMPOSER_ACTIONS_SOURCE,
-      'const handleUseLinearItem = useCallback(',
-      'const handleOpenOrUseLinearItem = useCallback('
-    )
-
-    expect(composerSection).toContain('buildLinearIssueLinkedWorkItem(issue)')
-    expect(composerSection).toContain("openModal('new-workspace-composer', {")
-    expect(composerSection).toContain('taskSourceContext: linearTaskSourceContext')
-    expect(composerSection).toContain('prefilledName: getLinearIssueWorkspaceName(issue)')
-    expect(composerSection).toContain("telemetrySource: 'sidebar'")
-    expect(handlerSection).toContain("recordFeatureInteraction('linear-tasks')")
-    expect(handlerSection).toContain('openComposerForLinearItem(issue)')
-  })
-
-  it('resumes an attachment from the primary action and composes when none exists', () => {
-    const section = sourceBetween(
-      WORKSPACE_ACTIONS_SOURCE,
-      'const handleOpenOrUseGitHubWorkItem = useCallback(',
-      'const openComposerForGitLabItem = useCallback('
-    )
-
-    expect(section).toContain('findGithubWorkItemWorkspaceAttachment(')
-    expect(section).toContain('if (!currentAttached)')
-    expect(section).toContain('handleUseWorkItem(item)')
-    expect(section).toContain('activateAndRevealWorktree(currentAttached.id)')
-  })
-
-  it('uses the shared composer handler from GitHub detail and start-new actions', () => {
-    const detail = readFileSync(join(__dirname, 'task-page/Content.tsx'), 'utf8')
-    const actions = readFileSync(join(__dirname, 'task-page/github/Rows.tsx'), 'utf8')
-    expect(detail.match(/onUse=\{\(item\) => \{/g)).toHaveLength(2)
-    expect(actions.match(/onSelect=\{\(\) => handleUseWorkItem\(item\)\}/g)).toHaveLength(2)
-  })
-
-  it('keeps project-view GitHub actions on the direct start-work path for issue #4756', () => {
-    const startAnchor = PROJECT_VIEW_SOURCE.includes('const handleStartWork')
-      ? 'const handleStartWork = useCallback('
-      : '// Why: issue #4756 keeps project-view actions on the direct'
-    const endAnchor = PROJECT_VIEW_SOURCE.includes('const handleStartWork')
-      ? 'const closeDialogRepoItem'
-      : 'openModalFallback: () => {'
-    const section = sourceBetween(PROJECT_VIEW_SOURCE, startAnchor, endAnchor)
-
-    expect(section).toContain('void launchWorkItemDirect({')
-    expect(section).toContain("launchSource: 'task_page'")
-    expect(section).not.toContain('createGitHubWorkItemWorkspaceInBackground')
-  })
-})
diff --git a/src/renderer/src/components/terminal-cold-activation.ts b/src/renderer/src/components/terminal-cold-activation.ts
index 8b6e96467eef..2d8cf075b572 100644
--- a/src/renderer/src/components/terminal-cold-activation.ts
+++ b/src/renderer/src/components/terminal-cold-activation.ts
@@ -1,11 +1,15 @@
 import { useAppStore } from '../store'
 import {
+  canAdmitTerminalTabsForStartup,
   canDeferColdActivationTabsForHost,
-  canMountTerminalWorkspaceForStartup,
   planColdActivationTabDeferral,
   pruneClosedBackgroundMountTabs,
   revealActivationDeferredTabs
 } from './terminal/background-terminal-worktree-mount'
+import {
+  holdTerminalTabsForStartup,
+  releaseStartupTerminalTabHold
+} from './terminal/startup-terminal-tab-hold'
 import { hasRegisteredRuntimeTerminalTab } from '../runtime/sync-runtime-graph'
 import { anyMountedWorktreeHasLayout as computeAnyMountedWorktreeHasLayout } from './terminal/split-group-mount'
 import { isParkRestorableTerminalPty } from './terminal-pane/terminal-hidden-view-parking'
@@ -32,6 +36,7 @@ export function applyTerminalColdActivation(controller: TerminalParkingFoundatio
     pairedRuntimeParkingEnvironmentIds,
     pendingStartupByTabId,
     renderedActiveWorktreeId,
+    startupTerminalTabHoldRef,
     startupWorktreeRefreshCompleted,
     tabsByWorktree,
     terminalParkingEnabled,
@@ -40,14 +45,26 @@ export function applyTerminalColdActivation(controller: TerminalParkingFoundatio
     workspaceSurfaceIds,
     workspaceSurfaceIdSet
   } = controller
-  if (
+  // Why the surface mounts on the tab model alone: the hydrated tabs, groups, and layout are
+  // everything the tab strip and the chat, browser, and editor panes need. Only terminal
+  // panes wait, held below, for startup restoration to publish PTY ownership — gating the
+  // whole surface on that chain left a restored session blank until its last step.
+  const startupHeldWorktreeId =
     renderedActiveWorktreeId &&
-    canMountTerminalWorkspaceForStartup({
+    !canAdmitTerminalTabsForStartup({
       workspaceSessionReady,
       hydrationSucceeded,
       startupWorktreeRefreshCompleted
     })
-  ) {
+      ? renderedActiveWorktreeId
+      : null
+  releaseStartupTerminalTabHold(
+    startupTerminalTabHoldRef,
+    backgroundMountTabIdsByWorktreeRef.current,
+    mountedWorktreeIdsRef.current,
+    startupHeldWorktreeId
+  )
+  if (renderedActiveWorktreeId && !startupHeldWorktreeId) {
     const worktreeTabs = tabsByWorktree[renderedActiveWorktreeId] ?? []
     const coldActivationDeferralEnabled =
       terminalParkingEnabled && terminalTitleSnapshotAuthorityEnabled
@@ -157,6 +174,15 @@ export function applyTerminalColdActivation(controller: TerminalParkingFoundatio
     tabsByWorktree,
     activationDeferredMountTabIdsByWorktreeRef.current
   )
+  if (startupHeldWorktreeId) {
+    holdTerminalTabsForStartup(
+      startupTerminalTabHoldRef,
+      backgroundMountTabIdsByWorktreeRef.current,
+      mountedWorktreeIdsRef.current,
+      startupHeldWorktreeId,
+      (tabsByWorktree[startupHeldWorktreeId] ?? []).map((tab) => tab.id)
+    )
+  }
   for (const id of mountedWorktreeIdsRef.current) {
     if (!workspaceSurfaceIdSet.has(id)) {
       mountedWorktreeIdsRef.current.delete(id)
@@ -173,7 +199,8 @@ export function applyTerminalColdActivation(controller: TerminalParkingFoundatio
   )
   return {
     anyMountedWorktreeHasLayout,
-    activationDeferralPlanRevision: activationDeferralPlanRevisionRef.current
+    activationDeferralPlanRevision: activationDeferralPlanRevisionRef.current,
+    startupTerminalTabHold: startupTerminalTabHoldRef.current
   }
 }
 
diff --git a/src/renderer/src/components/terminal-pane/TerminalContextMenu.test.tsx b/src/renderer/src/components/terminal-pane/TerminalContextMenu.test.tsx
index ad7b55143d7f..92e83ac32c36 100644
--- a/src/renderer/src/components/terminal-pane/TerminalContextMenu.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalContextMenu.test.tsx
@@ -78,6 +78,7 @@ function renderMenu(overrides: Record<string, unknown> = {}): string {
     onEqualizePaneSizes: vi.fn(),
     onClosePane: vi.fn(),
     onClearScreen: vi.fn(),
+    onResetTerminal: vi.fn(),
     canContinueAgentSessionInNewSession: false,
     onContinueAgentSessionInNewSession: vi.fn(),
     onForkAgentSession: vi.fn(),
diff --git a/src/renderer/src/components/terminal-pane/TerminalContextMenu.tsx b/src/renderer/src/components/terminal-pane/TerminalContextMenu.tsx
index 06e1b541c4b8..06ae15d55893 100644
--- a/src/renderer/src/components/terminal-pane/TerminalContextMenu.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalContextMenu.tsx
@@ -13,6 +13,7 @@ import {
   PanelsTopLeft,
   PanelRightClose,
   Pencil,
+  RotateCcw,
   SquareTerminal,
   TextSelect,
   X
@@ -54,6 +55,7 @@ type TerminalContextMenuProps = {
   onEqualizePaneSizes: () => void
   onClosePane: () => void
   onClearScreen: () => void
+  onResetTerminal: () => void
   canContinueAgentSessionInNewSession: boolean
   onContinueAgentSessionInNewSession: () => void
   onForkAgentSession: () => void
@@ -148,6 +150,7 @@ function TerminalContextMenuItems({
   onEqualizePaneSizes,
   onClosePane,
   onClearScreen,
+  onResetTerminal,
   canContinueAgentSessionInNewSession,
   onContinueAgentSessionInNewSession,
   onForkAgentSession,
@@ -376,6 +379,13 @@ function TerminalContextMenuItems({
         <Eraser />
         {translate('auto.components.terminal.pane.TerminalContextMenu.b4cdd9314e', 'Clear Screen')}
       </DropdownMenuItem>
+      <DropdownMenuItem onSelect={onResetTerminal}>
+        <RotateCcw />
+        {translate(
+          'auto.components.terminal.pane.TerminalContextMenu.resetTerminal',
+          'Reset Terminal'
+        )}
+      </DropdownMenuItem>
     </>
   )
 }
diff --git a/src/renderer/src/components/terminal-pane/TerminalErrorToast.test.ts b/src/renderer/src/components/terminal-pane/TerminalErrorToast.test.ts
index 31febbd6c21a..18069a846b59 100644
--- a/src/renderer/src/components/terminal-pane/TerminalErrorToast.test.ts
+++ b/src/renderer/src/components/terminal-pane/TerminalErrorToast.test.ts
@@ -361,6 +361,19 @@ describe('TerminalErrorToast environment footer', () => {
     await waitFor(() => expect(environmentMocks.resolveFooter).not.toHaveBeenCalled())
   })
 
+  it('shows the issue request once for a host error that already asks for one', () => {
+    const view = render(
+      React.createElement(TerminalErrorToast, {
+        error:
+          'Failed to spawn shell "/bin/zsh": boom (shell: /bin/zsh). If this persists, please file an issue.',
+        onDismiss: vi.fn()
+      })
+    )
+
+    expect(view.container.textContent?.match(/If this persists/g)).toHaveLength(1)
+    expect(view.container.textContent).toContain('(shell: /bin/zsh).')
+  })
+
   it('renders owner-unverified as a warning without an issue link', () => {
     const onRetry = vi.fn().mockResolvedValue(true)
     const view = render(
diff --git a/src/renderer/src/components/terminal-pane/TerminalErrorToast.tsx b/src/renderer/src/components/terminal-pane/TerminalErrorToast.tsx
index 8b627a9651f8..a31b0c37856b 100644
--- a/src/renderer/src/components/terminal-pane/TerminalErrorToast.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalErrorToast.tsx
@@ -3,6 +3,10 @@ import { translate } from '@/i18n/i18n'
 import { resolveClientEnvironmentFooter } from '@/lib/client-environment-info'
 import { Button } from '@/components/ui/button'
 import { hasClientEnvironmentFooter } from '../../../../shared/client-environment-info'
+import {
+  localizeTerminalSpawnHints,
+  withoutTerminalSpawnIssueRequest
+} from './terminal-spawn-error-display'
 
 const SSH_PREFIX = 'SSH connection is not active'
 // Produced by pty-connection.ts reportError() when a PTY reattach can't reach its SSH host.
@@ -112,7 +116,7 @@ function humanizeUnreattachableSession(error: string): string {
 
 /** Swaps raw daemon-boundary codes for copy a user can act on. */
 export function humanizeTerminalError(error: string): string {
-  let humanized = error
+  let humanized = localizeTerminalSpawnHints(error)
   if (humanized.includes(PANE_OWNER_UNVERIFIED_MARKER)) {
     const explanation = isPaneOwnerUnverifiedError(humanized)
       ? translate(
@@ -178,7 +182,11 @@ export function TerminalErrorToast({
   // Restart cannot recover a session after its owning daemon exits.
   const showIssueLink =
     !ssh && !paneOwnerUnverified && !showDaemonRestart && !isExplainedTerminalError(error)
-  const displayError = humanizeTerminalError(error)
+  const humanizedError = humanizeTerminalError(error)
+  // Why: the toast appends its own linked request, so the host's plain-text one would repeat it.
+  const displayError = showIssueLink
+    ? withoutTerminalSpawnIssueRequest(humanizedError)
+    : humanizedError
   const tint = paneOwnerUnverified
     ? null
     : ssh
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.react185.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.react185.test.tsx
index dbdca3557797..cf9cabd9c576 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.react185.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.react185.test.tsx
@@ -23,6 +23,7 @@ vi.mock('../../store', () => ({
 }))
 
 import { TerminalOverlaySlot } from './TerminalOverlaySlot'
+import { registerTabGroupBody } from '../tab-group/tab-group-body-geometry'
 
 const GROUP_ID = 'group-react185'
 const TAB_ID = 'tab-react185'
@@ -52,6 +53,7 @@ let capturedResizeCallback: (() => void) | null = null
 let container: HTMLDivElement
 let bodyEl: HTMLDivElement
 let bodyRect: DOMRect
+let unregisterBody: () => void
 let root: Root
 
 class CapturingResizeObserver {
@@ -103,12 +105,14 @@ beforeEach(() => {
   bodyRect = createRect({ top: 32, height: 568 })
   bodyEl.getBoundingClientRect = () => bodyRect
   document.body.appendChild(bodyEl)
+  unregisterBody = registerTabGroupBody(GROUP_ID, bodyEl)
 })
 
 afterEach(() => {
   act(() => {
     root?.unmount()
   })
+  unregisterBody()
   container?.remove()
   bodyEl?.remove()
   vi.unstubAllGlobals()
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.tsx
index 2cb20783f53e..63e75e9cdd57 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.tsx
@@ -9,7 +9,9 @@ import {
 } from '../activity/activity-terminal-portal'
 import { shouldMountBackgroundWorktreeTab } from '../terminal/background-terminal-worktree-mount'
 import { useNativeChatToggleShortcut } from '../native-chat/use-native-chat-toggle-shortcut'
+import { RetainedPaneHost } from '../tab-group/RetainedPaneHost'
 import { TerminalOverlaySlot } from './TerminalOverlaySlot'
+import { TerminalRestoringPlaceholder } from './TerminalRestoringPlaceholder'
 import { useTerminalTabColdParking } from './use-terminal-tab-cold-parking'
 
 type TerminalOverlayAssignment = {
@@ -132,40 +134,50 @@ const TerminalPaneOverlayLayer = memo(function TerminalPaneOverlayLayer({
 
   return (
     <>
-      {terminalTabs
-        .filter((terminalTab) =>
-          shouldMountBackgroundWorktreeTab(backgroundMountTabIds, terminalTab.id)
-        )
-        .map((terminalTab) => {
-          const assignment = assignments.get(terminalTab.id)
-          const isVisible = Boolean(isWorktreeActive && assignment?.isActiveInGroup)
-          const isActive = Boolean(isVisible && assignment?.groupId === activeGroupId)
-          const activityTerminalPortal = findActivityTerminalPortal(activityTerminalPortals, {
-            worktreeId,
-            tabId: terminalTab.id
-          })
-          if (parkedTerminalTabIds.has(terminalTab.id)) {
-            return null
-          }
-          return (
-            <TerminalOverlaySlot
+      {terminalTabs.map((terminalTab) => {
+        const assignment = assignments.get(terminalTab.id)
+        const isVisible = Boolean(isWorktreeActive && assignment?.isActiveInGroup)
+        if (!shouldMountBackgroundWorktreeTab(backgroundMountTabIds, terminalTab.id)) {
+          // Why only the startup hold lands here visible: reveal admits every other visible
+          // deferred tab in the same render pass.
+          return isVisible ? (
+            <RetainedPaneHost
               key={terminalTab.id}
-              terminalTabId={terminalTab.id}
-              terminalGeneration={terminalTab.generation}
-              worktreeId={worktreeId}
-              worktreePath={worktreePath}
-              startupCwd={terminalTab.startupCwd}
               groupId={assignment?.groupId}
-              isWorktreeActive={isWorktreeActive}
-              isVisible={isVisible}
-              isActive={isActive}
-              activityTerminalPortal={activityTerminalPortal}
+              isVisible
               onFocusOwningGroup={focusOwningGroup}
-              consumeSuppressedPtyExit={consumeSuppressedPtyExit}
-              leaveWorktreeIfEmpty={leaveWorktreeIfEmpty}
-            />
-          )
-        })}
+            >
+              <TerminalRestoringPlaceholder />
+            </RetainedPaneHost>
+          ) : null
+        }
+        const isActive = Boolean(isVisible && assignment?.groupId === activeGroupId)
+        const activityTerminalPortal = findActivityTerminalPortal(activityTerminalPortals, {
+          worktreeId,
+          tabId: terminalTab.id
+        })
+        if (parkedTerminalTabIds.has(terminalTab.id)) {
+          return null
+        }
+        return (
+          <TerminalOverlaySlot
+            key={terminalTab.id}
+            terminalTabId={terminalTab.id}
+            terminalGeneration={terminalTab.generation}
+            worktreeId={worktreeId}
+            worktreePath={worktreePath}
+            startupCwd={terminalTab.startupCwd}
+            groupId={assignment?.groupId}
+            isWorktreeActive={isWorktreeActive}
+            isVisible={isVisible}
+            isActive={isActive}
+            activityTerminalPortal={activityTerminalPortal}
+            onFocusOwningGroup={focusOwningGroup}
+            consumeSuppressedPtyExit={consumeSuppressedPtyExit}
+            leaveWorktreeIfEmpty={leaveWorktreeIfEmpty}
+          />
+        )
+      })}
     </>
   )
 })
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneSurface.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneSurface.tsx
index df56e62cbc4e..890588868419 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneSurface.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneSurface.tsx
@@ -93,14 +93,14 @@ export function TerminalPaneSurface({
     searchStateRef,
     searchInputRef,
     sessionRestoredBannerPaneIds,
-    sessionStateSaveFailureOpen,
+    sessionStateSaveFailureMessage,
     setAgentSessionContinuation,
     setAgentSessionFork,
     setContainerRef,
     setQuickCommandEditorOpen,
     setRenameValue,
     setSearchOpen,
-    setSessionStateSaveFailureOpen,
+    setSessionStateSaveFailureMessage,
     showSplitButton,
     showSshReconnectOverlay,
     splitTerminalPaneFromHeader,
@@ -204,8 +204,9 @@ export function TerminalPaneSurface({
       <DaemonActionDialog api={daemonActions} />
       {isActive && (
         <TerminalSessionStateSaveFailureDialog
-          open={sessionStateSaveFailureOpen}
-          onDismiss={() => setSessionStateSaveFailureOpen(false)}
+          open={sessionStateSaveFailureMessage !== null}
+          failureMessage={sessionStateSaveFailureMessage ?? ''}
+          onDismiss={() => setSessionStateSaveFailureMessage(null)}
           onOpenSpaceAnalyzer={openDiskSpaceAnalyzer}
         />
       )}
@@ -247,6 +248,7 @@ export function TerminalPaneSurface({
         onEqualizePaneSizes={contextMenu.onEqualizePaneSizes}
         onClosePane={contextMenu.onClosePane}
         onClearScreen={contextMenu.onClearScreen}
+        onResetTerminal={contextMenu.onResetTerminal}
         canContinueAgentSessionInNewSession={contextMenuCanContinueInNewSession}
         onContinueAgentSessionInNewSession={contextMenu.onContinueAgentSessionInNewSession}
         onForkAgentSession={() => void contextMenu.onForkAgentSession()}
diff --git a/src/renderer/src/components/terminal-pane/TerminalRestoringPlaceholder.tsx b/src/renderer/src/components/terminal-pane/TerminalRestoringPlaceholder.tsx
new file mode 100644
index 000000000000..4a2bb775e0d2
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/TerminalRestoringPlaceholder.tsx
@@ -0,0 +1,20 @@
+import { Loader2 } from 'lucide-react'
+import { translate } from '@/i18n/i18n'
+
+/** Fills a terminal tab's slot while startup restoration holds its pane unmounted. */
+export function TerminalRestoringPlaceholder(): React.JSX.Element {
+  return (
+    <div
+      className="absolute inset-0 flex items-center justify-center gap-2 text-sm text-muted-foreground"
+      role="status"
+      aria-live="polite"
+      data-terminal-restoring-placeholder=""
+    >
+      <Loader2 className="size-4 animate-spin" />
+      {translate(
+        'auto.components.terminal.pane.TerminalRestoringPlaceholder.restoring',
+        'Restoring terminal…'
+      )}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/terminal-pane/TerminalSessionStateSaveFailureDialog.tsx b/src/renderer/src/components/terminal-pane/TerminalSessionStateSaveFailureDialog.tsx
index 6ab425685a39..889fa69d7efb 100644
--- a/src/renderer/src/components/terminal-pane/TerminalSessionStateSaveFailureDialog.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalSessionStateSaveFailureDialog.tsx
@@ -1,4 +1,4 @@
-import { HardDrive } from 'lucide-react'
+import { AlertCircle } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import {
   Dialog,
@@ -9,16 +9,20 @@ import {
   DialogTitle
 } from '@/components/ui/dialog'
 import { translate } from '@/i18n/i18n'
+import { isTerminalSessionStorageCapacityFailure } from '../../../../shared/terminal-session-state-save-failure'
 
 export function TerminalSessionStateSaveFailureDialog({
   open,
+  failureMessage,
   onDismiss,
   onOpenSpaceAnalyzer
 }: {
   open: boolean
+  failureMessage: string
   onDismiss: () => void
   onOpenSpaceAnalyzer: () => void
 }): React.JSX.Element {
+  const capacityFailure = isTerminalSessionStorageCapacityFailure(failureMessage)
   return (
     <Dialog
       open={open}
@@ -32,29 +36,33 @@ export function TerminalSessionStateSaveFailureDialog({
         <DialogHeader className="gap-3">
           <div className="flex items-center gap-3">
             <div className="flex size-8 shrink-0 items-center justify-center rounded-md border border-border bg-muted/40">
-              <HardDrive className="size-4 text-muted-foreground" />
+              <AlertCircle className="size-4 text-muted-foreground" />
             </div>
             <DialogTitle className="text-base">
-              {translate(
-                'auto.components.terminal.pane.TerminalSessionStateSaveFailureDialog.678c780a2c',
-                'Disk space is unavailable'
-              )}
+              {translate('terminal.sessionSaveFailure.title', 'Could not save terminal session')}
             </DialogTitle>
           </div>
           <DialogDescription className="text-xs leading-5">
-            {translate(
-              'auto.components.terminal.pane.TerminalSessionStateSaveFailureDialog.e2fcf07c0d',
-              'Orca could not save this terminal session because local storage is full or not writable. Open the disk space analyzer to find workspace storage you can clean up.'
-            )}
+            {capacityFailure
+              ? translate(
+                  'terminal.sessionSaveFailure.capacity',
+                  'The device saving this terminal reported full storage or an exceeded storage quota. Free space on that device, then try again.'
+                )
+              : translate(
+                  'terminal.sessionSaveFailure.unknown',
+                  'Orca could not save the terminal state. Try again. If this continues, share the Orca logs with support so we can identify the cause.'
+                )}
           </DialogDescription>
         </DialogHeader>
 
-        <div className="rounded-md border border-border bg-muted/35 px-3 py-2.5 text-xs leading-5 text-muted-foreground">
-          {translate(
-            'auto.components.terminal.pane.TerminalSessionStateSaveFailureDialog.38c282a2c4',
-            'The analyzer opens directly from here. You can also open it later from the lower-left toolbox menu by choosing Space Analyzer.'
-          )}
-        </div>
+        {capacityFailure && (
+          <div className="rounded-md border border-border bg-muted/35 px-3 py-2.5 text-xs leading-5 text-muted-foreground">
+            {translate(
+              'auto.components.terminal.pane.TerminalSessionStateSaveFailureDialog.38c282a2c4',
+              'The analyzer opens directly from here. You can also open it later from the lower-left toolbox menu by choosing Space Analyzer.'
+            )}
+          </div>
+        )}
 
         <DialogFooter className="gap-2">
           <Button type="button" variant="outline" size="sm" onClick={onDismiss}>
@@ -63,12 +71,14 @@ export function TerminalSessionStateSaveFailureDialog({
               'Dismiss'
             )}
           </Button>
-          <Button type="button" size="sm" autoFocus onClick={onOpenSpaceAnalyzer}>
-            {translate(
-              'auto.components.terminal.pane.TerminalSessionStateSaveFailureDialog.6bee0c8f17',
-              'Open Disk Space Analyzer'
-            )}
-          </Button>
+          {capacityFailure && (
+            <Button type="button" size="sm" onClick={onOpenSpaceAnalyzer}>
+              {translate(
+                'auto.components.terminal.pane.TerminalSessionStateSaveFailureDialog.6bee0c8f17',
+                'Open Disk Space Analyzer'
+              )}
+            </Button>
+          )}
         </DialogFooter>
       </DialogContent>
     </Dialog>
diff --git a/src/renderer/src/components/terminal-pane/closed-terminal-leaf-notice.test.ts b/src/renderer/src/components/terminal-pane/closed-terminal-leaf-notice.test.ts
new file mode 100644
index 000000000000..cfb0ab967252
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/closed-terminal-leaf-notice.test.ts
@@ -0,0 +1,103 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { TerminalLayoutSnapshot } from '../../../../shared/terminal-tab-types'
+import { CLOSE_TERMINAL_PANE_EVENT } from '@/constants/terminal'
+
+const TAB_ID = 'tab-1'
+const LEAF_ID = '11111111-1111-4111-8111-111111111111'
+const SIBLING_LEAF_ID = '22222222-2222-4222-8222-222222222222'
+
+const splitLayout: TerminalLayoutSnapshot = {
+  root: {
+    type: 'split',
+    direction: 'vertical',
+    first: { type: 'leaf', leafId: LEAF_ID },
+    second: { type: 'leaf', leafId: SIBLING_LEAF_ID }
+  },
+  activeLeafId: LEAF_ID,
+  expandedLeafId: null,
+  ptyIdsByLeafId: { [LEAF_ID]: 'pty-closed', [SIBLING_LEAF_ID]: 'pty-sibling' }
+}
+
+const layouts: Record<string, TerminalLayoutSnapshot> = {}
+const state = {
+  tabsByWorktree: {},
+  terminalLayoutsByTabId: layouts,
+  runtimePaneTitlesByTabId: {},
+  clearTabLaunchAgent: vi.fn(),
+  updateTabTitle: vi.fn(),
+  setTabLayout: vi.fn((tabId: string, layout: TerminalLayoutSnapshot) => {
+    state.terminalLayoutsByTabId[tabId] = layout
+  })
+}
+
+vi.mock('@/store', () => ({ useAppStore: { getState: () => state } }))
+
+import { applyClosedTerminalLeafNotice } from './closed-terminal-leaf-notice'
+import { applyTerminalPaneCloseRequest } from './terminal-pane-lifecycle-close'
+import { parkedWatchersByTabId } from './terminal-parked-watcher-registry'
+
+function leafIds(layout: TerminalLayoutSnapshot | undefined): string[] {
+  return Object.keys(layout?.ptyIdsByLeafId ?? {})
+}
+
+beforeEach(() => {
+  state.terminalLayoutsByTabId = { [TAB_ID]: splitLayout }
+  state.setTabLayout.mockClear()
+  vi.stubGlobal('window', new EventTarget())
+})
+
+afterEach(() => {
+  parkedWatchersByTabId.clear()
+  vi.unstubAllGlobals()
+})
+
+describe('a split pane main already closed', () => {
+  it('reaches a mounted pane as a leaf-addressed close', () => {
+    const details: unknown[] = []
+    window.addEventListener(CLOSE_TERMINAL_PANE_EVENT, (event) =>
+      details.push(event instanceof CustomEvent ? event.detail : null)
+    )
+
+    applyClosedTerminalLeafNotice(TAB_ID, LEAF_ID)
+
+    expect(details).toEqual([{ tabId: TAB_ID, leafId: LEAF_ID }])
+  })
+
+  it('is ignored by a mounted pane whose exit already removed that leaf', () => {
+    const manager = {
+      closePane: vi.fn(),
+      detachPaneForExternalMove: vi.fn(),
+      retirePanePreservingPty: vi.fn(),
+      getNumericIdForLeaf: () => null,
+      getPanes: () => [{ id: 2 }]
+    }
+    const closeTab = vi.fn()
+
+    const result = applyTerminalPaneCloseRequest({
+      detail: { tabId: TAB_ID, leafId: LEAF_ID },
+      manager,
+      closeTab,
+      closeTabPreservingPty: vi.fn()
+    })
+
+    // Why: a numeric pane id would have reached the last-pane branch and closed the whole tab.
+    expect(result).toBe('ignored')
+    expect(closeTab).not.toHaveBeenCalled()
+    expect(manager.closePane).not.toHaveBeenCalled()
+  })
+
+  it('collapses a parked tab stored layout once, whichever of notice or exit lands first', () => {
+    parkedWatchersByTabId.set(TAB_ID, {
+      worktreeId: 'repo::/worktree',
+      tabPtyId: 'pty-closed',
+      disposersByPtyId: new Map([['pty-closed', vi.fn()]]),
+      paneIdByPtyId: new Map()
+    })
+
+    applyClosedTerminalLeafNotice(TAB_ID, LEAF_ID)
+    applyClosedTerminalLeafNotice(TAB_ID, LEAF_ID)
+
+    expect(leafIds(state.terminalLayoutsByTabId[TAB_ID])).toEqual([SIBLING_LEAF_ID])
+    expect(state.setTabLayout).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/closed-terminal-leaf-notice.ts b/src/renderer/src/components/terminal-pane/closed-terminal-leaf-notice.ts
new file mode 100644
index 000000000000..2b465db28781
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/closed-terminal-leaf-notice.ts
@@ -0,0 +1,16 @@
+import { CLOSE_TERMINAL_PANE_EVENT, type CloseTerminalPaneDetail } from '@/constants/terminal'
+import { collapseParkedTerminalLeaf } from './terminal-parked-pty-watcher'
+import { isTerminalTabParked } from './terminal-parked-watcher-registry'
+
+/**
+ * Drops a split pane main already closed. Addressed by leaf, so it is a no-op once the pane's own
+ * exit handling removed it, and the exit is a no-op after it: whichever lands first wins.
+ */
+export function applyClosedTerminalLeafNotice(tabId: string, leafId: string): void {
+  if (isTerminalTabParked(tabId)) {
+    collapseParkedTerminalLeaf(tabId, leafId)
+    return
+  }
+  const detail: CloseTerminalPaneDetail = { tabId, leafId }
+  window.dispatchEvent(new CustomEvent(CLOSE_TERMINAL_PANE_EVENT, { detail }))
+}
diff --git a/src/renderer/src/components/terminal-pane/codex-terminal-server-isolation-notice.test.ts b/src/renderer/src/components/terminal-pane/codex-terminal-server-isolation-notice.test.ts
new file mode 100644
index 000000000000..ce7ee2218987
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/codex-terminal-server-isolation-notice.test.ts
@@ -0,0 +1,152 @@
+// @vitest-environment happy-dom
+
+import { act, createElement } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { CODEX_TERMINAL_SERVER_ISOLATION_SETTINGS_TARGET_ID } from '@/lib/settings-navigation-types'
+import { useCodexTerminalServerIsolationNotice } from './codex-terminal-server-isolation-notice'
+
+// Why a real zustand store double: the hook relies on subscribe/setState semantics.
+const { toastInfoMock, harness } = vi.hoisted(() => ({
+  toastInfoMock: vi.fn(),
+  harness: { setState: (_patch: Record<string, unknown>, _replace?: true): void => {} }
+}))
+
+vi.mock('sonner', () => ({ toast: { info: toastInfoMock } }))
+
+vi.mock('@/store', async () => {
+  const { createStore } = await import('zustand/vanilla')
+  const backing = createStore<Record<string, unknown>>()(() => ({}))
+  harness.setState = (patch, replace) =>
+    replace ? backing.setState(patch, true) : backing.setState(patch)
+  const useAppStore = <T>(selector: (state: Record<string, unknown>) => T): T =>
+    selector(backing.getState())
+  return { useAppStore: Object.assign(useAppStore, backing) }
+})
+
+const store = {
+  setState: (patch: Record<string, unknown>, replace?: true) => harness.setState(patch, replace)
+}
+let seen = false
+
+const openSettingsPage = vi.fn()
+const openSettingsTarget = vi.fn()
+const mountedRoots: Root[] = []
+
+function resetStore(overrides: Record<string, unknown> = {}): void {
+  seen = false
+  store.setState(
+    {
+      persistedUIReady: true,
+      codexTerminalServerIsolationNoticeSeen: false,
+      settings: { codexTerminalServerIsolation: true },
+      tabsByWorktree: {},
+      agentStatusByPaneKey: {},
+      paneForegroundAgentByPaneKey: {},
+      openSettingsPage,
+      openSettingsTarget,
+      markCodexTerminalServerIsolationNoticeSeen: () => {
+        seen = true
+        store.setState({ codexTerminalServerIsolationNoticeSeen: true })
+      },
+      ...overrides
+    },
+    true
+  )
+}
+
+function HookProbe(): null {
+  useCodexTerminalServerIsolationNotice()
+  return null
+}
+
+async function mountProbe(): Promise<void> {
+  const container = document.createElement('div')
+  document.body.appendChild(container)
+  const root = createRoot(container)
+  mountedRoots.push(root)
+  await act(async () => {
+    root.render(createElement(HookProbe))
+  })
+}
+
+const codexTab = { 'wt-1': [{ id: 'tab-1', launchAgent: 'codex' }] }
+
+describe('useCodexTerminalServerIsolationNotice', () => {
+  beforeEach(() => {
+    toastInfoMock.mockReset()
+    openSettingsPage.mockReset()
+    openSettingsTarget.mockReset()
+    resetStore()
+  })
+
+  afterEach(() => {
+    for (const root of mountedRoots.splice(0)) {
+      act(() => root.unmount())
+    }
+    document.body.innerHTML = ''
+  })
+
+  it('shows once when the first Codex terminal starts, and marks it seen', async () => {
+    await mountProbe()
+    expect(toastInfoMock).not.toHaveBeenCalled()
+
+    act(() => store.setState({ tabsByWorktree: codexTab }))
+    act(() => store.setState({ agentStatusByPaneKey: { 'tab-2:leaf': { agentType: 'codex' } } }))
+
+    expect(toastInfoMock).toHaveBeenCalledTimes(1)
+    expect(toastInfoMock.mock.calls[0]?.[1]).toMatchObject({ duration: Infinity })
+    expect(seen).toBe(true)
+  })
+
+  it.each([
+    [
+      'a typed codex seen by hooks',
+      { agentStatusByPaneKey: { 'tab-1:leaf': { agentType: 'codex' } } }
+    ],
+    [
+      'a typed codex in the foreground',
+      { paneForegroundAgentByPaneKey: { 'tab-1:leaf': { agent: 'codex' } } }
+    ]
+  ])('also triggers on %s', async (_name, patch) => {
+    await mountProbe()
+    act(() => store.setState(patch))
+    expect(toastInfoMock).toHaveBeenCalledTimes(1)
+  })
+
+  it('never shows for other agents', async () => {
+    await mountProbe()
+    act(() =>
+      store.setState({
+        tabsByWorktree: { 'wt-1': [{ id: 'tab-1', launchAgent: 'claude' }] },
+        agentStatusByPaneKey: { 'tab-1:leaf': { agentType: 'claude' } },
+        paneForegroundAgentByPaneKey: { 'tab-1:leaf': { agent: 'opencode' } }
+      })
+    )
+    expect(toastInfoMock).not.toHaveBeenCalled()
+  })
+
+  it.each([
+    ['it was already seen', { codexTerminalServerIsolationNoticeSeen: true }],
+    ['the user turned the setting off', { settings: { codexTerminalServerIsolation: false } }],
+    ['persisted UI has not hydrated', { persistedUIReady: false }]
+  ])('stays quiet when %s', async (_name, overrides) => {
+    resetStore({ ...overrides, tabsByWorktree: codexTab })
+    await mountProbe()
+    expect(toastInfoMock).not.toHaveBeenCalled()
+  })
+
+  it('opens Settings at the Codex server setting', async () => {
+    resetStore({ tabsByWorktree: codexTab })
+    await mountProbe()
+
+    toastInfoMock.mock.calls[0]?.[1]?.action.onClick()
+
+    expect(openSettingsPage).toHaveBeenCalledTimes(1)
+    expect(openSettingsTarget).toHaveBeenCalledWith({
+      pane: 'agents',
+      repoId: null,
+      sectionId: CODEX_TERMINAL_SERVER_ISOLATION_SETTINGS_TARGET_ID
+    })
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/codex-terminal-server-isolation-notice.ts b/src/renderer/src/components/terminal-pane/codex-terminal-server-isolation-notice.ts
new file mode 100644
index 000000000000..7ff018ee6f61
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/codex-terminal-server-isolation-notice.ts
@@ -0,0 +1,111 @@
+import { useEffect } from 'react'
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import type { AppState } from '@/store/types'
+import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { CODEX_TERMINAL_SERVER_ISOLATION_SETTINGS_TARGET_ID } from '@/lib/settings-navigation-types'
+import { isCodexTerminalServerIsolationEnabled } from '../../../../shared/codex-terminal-server-isolation'
+
+type CodexNoticeState = Pick<
+  AppState,
+  | 'persistedUIReady'
+  | 'codexTerminalServerIsolationNoticeSeen'
+  | 'settings'
+  | 'tabsByWorktree'
+  | 'agentStatusByPaneKey'
+  | 'paneForegroundAgentByPaneKey'
+>
+
+// Why three sources: Orca-launched tabs, hook-reported agents (SSH too), and a typed `codex` seen locally.
+function hasCodexTerminal(state: CodexNoticeState): boolean {
+  return (
+    Object.values(state.tabsByWorktree).some((tabs) =>
+      tabs.some((tab) => tab.launchAgent === 'codex')
+    ) ||
+    Object.values(state.agentStatusByPaneKey).some((entry) => entry.agentType === 'codex') ||
+    Object.values(state.paneForegroundAgentByPaneKey).some((entry) => entry.agent === 'codex')
+  )
+}
+
+export function shouldShowCodexTerminalServerIsolationNotice(state: CodexNoticeState): boolean {
+  return (
+    state.persistedUIReady &&
+    !state.codexTerminalServerIsolationNoticeSeen &&
+    state.settings !== null &&
+    // Why: a user who already opted out needs no announcement of the default.
+    isCodexTerminalServerIsolationEnabled(state.settings) &&
+    hasCodexTerminal(state)
+  )
+}
+
+function didNoticeInputsChange(state: CodexNoticeState, previous: CodexNoticeState): boolean {
+  return (
+    state.persistedUIReady !== previous.persistedUIReady ||
+    state.settings !== previous.settings ||
+    state.tabsByWorktree !== previous.tabsByWorktree ||
+    state.agentStatusByPaneKey !== previous.agentStatusByPaneKey ||
+    state.paneForegroundAgentByPaneKey !== previous.paneForegroundAgentByPaneKey
+  )
+}
+
+function showCodexTerminalServerIsolationNotice(): void {
+  // Why mark before showing: seen means shown, so a quit or reload never repeats it.
+  useAppStore.getState().markCodexTerminalServerIsolationNoticeSeen()
+  toast.info(
+    translate(
+      'terminal.codexTerminalServerIsolationNotice.title',
+      'Orca now runs Codex without its shared server'
+    ),
+    {
+      // Why a stable id: a late sync that resets the flag can't stack a second toast.
+      id: 'codex-terminal-server-isolation-notice',
+      description: translate(
+        'terminal.codexTerminalServerIsolationNotice.description',
+        'This makes agent status more reliable. You can turn it back on in Settings.'
+      ),
+      duration: Infinity,
+      action: {
+        label: translate(
+          'terminal.codexTerminalServerIsolationNotice.openSettings',
+          'Open Settings'
+        ),
+        onClick: () => {
+          const store = useAppStore.getState()
+          store.openSettingsPage()
+          store.openSettingsTarget({
+            pane: 'agents',
+            repoId: null,
+            sectionId: CODEX_TERMINAL_SERVER_ISOLATION_SETTINGS_TARGET_ID
+          })
+        }
+      }
+    }
+  )
+}
+
+export function useCodexTerminalServerIsolationNotice(): void {
+  const seen = useAppStore((s) => s.codexTerminalServerIsolationNoticeSeen)
+
+  useEffect(() => {
+    // Why: a paired web client's terminals follow the host's setting, not this window's.
+    if (seen || isPairedWebClientWindow()) {
+      return
+    }
+    if (shouldShowCodexTerminalServerIsolationNotice(useAppStore.getState())) {
+      showCodexTerminalServerIsolationNotice()
+      return
+    }
+    // Why a filtered subscription: a selector would rescan every tab on each store write.
+    const unsubscribe = useAppStore.subscribe((state, previous) => {
+      if (
+        didNoticeInputsChange(state, previous) &&
+        shouldShowCodexTerminalServerIsolationNotice(state)
+      ) {
+        unsubscribe()
+        showCodexTerminalServerIsolationNotice()
+      }
+    })
+    return unsubscribe
+  }, [seen])
+}
diff --git a/src/renderer/src/components/terminal-pane/deferred-split-pane-handoff.test.ts b/src/renderer/src/components/terminal-pane/deferred-split-pane-handoff.test.ts
index cba19b43c2fd..c77339bfe2e5 100644
--- a/src/renderer/src/components/terminal-pane/deferred-split-pane-handoff.test.ts
+++ b/src/renderer/src/components/terminal-pane/deferred-split-pane-handoff.test.ts
@@ -30,39 +30,52 @@ describe('deferred split pane handoff', () => {
     const cwdPromise = Promise.resolve('/source/cwd')
     const initial = beginDeferredSplitPaneHandoff(key, cwdPromise)
 
-    appendDeferredSplitPaneInput(initial, { data: 'typed', kind: 'ordinary' })
-    appendDeferredSplitPaneInput(initial, { data: '\x1b[0n', kind: 'immediate' })
-    appendDeferredSplitPaneInput(initial, { data: '\x03', kind: 'accepted' })
+    appendDeferredSplitPaneInput(initial, { data: 'typed', kind: 'ordinary', inputKind: 'driving' })
+    appendDeferredSplitPaneInput(initial, {
+      data: '\x1b[0n',
+      kind: 'immediate',
+      inputKind: 'query-reply'
+    })
+    appendDeferredSplitPaneInput(initial, { data: '\x03', kind: 'accepted', inputKind: 'driving' })
 
     const remounted = claimDeferredSplitPaneHandoff(key)
 
     expect(remounted?.cwdPromise).toBe(cwdPromise)
     expect(remounted?.preconnectInput).toEqual([
-      { data: 'typed', kind: 'ordinary' },
-      { data: '\x1b[0n', kind: 'immediate' },
-      { data: '\x03', kind: 'accepted' }
+      { data: 'typed', kind: 'ordinary', inputKind: 'driving' },
+      { data: '\x1b[0n', kind: 'immediate', inputKind: 'query-reply' },
+      { data: '\x03', kind: 'accepted', inputKind: 'driving' }
     ])
   })
 
   it('keeps input across repeated remounts and fences stale owners', () => {
     const key = makePaneKey('tab-1', LEAF_1)
     const initial = beginDeferredSplitPaneHandoff(key, Promise.resolve('/source/cwd'))
-    appendDeferredSplitPaneInput(initial, { data: 'before-first-remount', kind: 'ordinary' })
+    appendDeferredSplitPaneInput(initial, {
+      data: 'before-first-remount',
+      kind: 'ordinary',
+      inputKind: 'driving'
+    })
     const firstRemount = claimDeferredSplitPaneHandoff(key)
     expect(firstRemount).not.toBeNull()
 
-    appendDeferredSplitPaneInput(initial, { data: 'stale-input', kind: 'ordinary' })
+    appendDeferredSplitPaneInput(initial, {
+      data: 'stale-input',
+      kind: 'ordinary',
+      inputKind: 'driving'
+    })
     clearDeferredSplitPaneHandoff(initial)
     clearDeferredSplitPaneHandoff(initial)
     appendDeferredSplitPaneInput(firstRemount!.handle, {
       data: 'before-second-remount',
-      kind: 'ordinary'
+      kind: 'ordinary',
+      inputKind: 'driving'
     })
 
     const secondRemount = claimDeferredSplitPaneHandoff(key)
     expect(secondRemount?.preconnectInput).toEqual([
-      { data: 'before-first-remount', kind: 'ordinary' },
-      { data: 'before-second-remount', kind: 'ordinary' }
+      { data: 'before-first-remount', kind: 'ordinary', inputKind: 'driving' },
+      { data: 'before-second-remount', kind: 'ordinary', inputKind: 'driving' }
     ])
 
     clearDeferredSplitPaneHandoff(firstRemount!.handle)
@@ -74,21 +87,33 @@ describe('deferred split pane handoff', () => {
   it('releases an unmounted owner without dropping its pending handoff', () => {
     const key = makePaneKey('tab-1', LEAF_1)
     const initial = beginDeferredSplitPaneHandoff(key, Promise.resolve('/source/cwd'))
-    appendDeferredSplitPaneInput(initial, { data: 'before-unmount', kind: 'ordinary' })
+    appendDeferredSplitPaneInput(initial, {
+      data: 'before-unmount',
+      kind: 'ordinary',
+      inputKind: 'driving'
+    })
 
     releaseDeferredSplitPaneHandoff(initial)
-    appendDeferredSplitPaneInput(initial, { data: 'late-stale', kind: 'ordinary' })
+    appendDeferredSplitPaneInput(initial, {
+      data: 'late-stale',
+      kind: 'ordinary',
+      inputKind: 'driving'
+    })
     clearDeferredSplitPaneHandoff(initial)
 
     expect(claimDeferredSplitPaneHandoff(key)?.preconnectInput).toEqual([
-      { data: 'before-unmount', kind: 'ordinary' }
+      { data: 'before-unmount', kind: 'ordinary', inputKind: 'driving' }
     ])
   })
 
   it('lets a late close discard a released handoff by its stable pane key', () => {
     const key = makePaneKey('tab-1', LEAF_1)
     const owner = beginDeferredSplitPaneHandoff(key, Promise.resolve('/source/cwd'))
-    appendDeferredSplitPaneInput(owner, { data: 'must-not-replay', kind: 'ordinary' })
+    appendDeferredSplitPaneInput(owner, {
+      data: 'must-not-replay',
+      kind: 'ordinary',
+      inputKind: 'driving'
+    })
 
     // Whole-tab cleanup releases the mount-local handle before a stale close callback can run.
     releaseDeferredSplitPaneHandoff(owner)
@@ -112,7 +137,11 @@ describe('deferred split pane handoff', () => {
   it('drops a stale record when an authoritative restored PTY wins the key', () => {
     const key = makePaneKey('tab-authoritative', LEAF_1)
     const stale = beginDeferredSplitPaneHandoff(key, Promise.resolve('/stale'))
-    appendDeferredSplitPaneInput(stale, { data: 'must-not-replay', kind: 'ordinary' })
+    appendDeferredSplitPaneInput(stale, {
+      data: 'must-not-replay',
+      kind: 'ordinary',
+      inputKind: 'driving'
+    })
 
     discardDeferredSplitPaneHandoffForKey(key)
 
@@ -123,26 +152,44 @@ describe('deferred split pane handoff', () => {
   it('replaces an older handoff for the same stable pane key', () => {
     const key = makePaneKey('tab-1', LEAF_1)
     const stale = beginDeferredSplitPaneHandoff(key, Promise.resolve('/stale'))
-    appendDeferredSplitPaneInput(stale, { data: 'stale', kind: 'ordinary' })
+    appendDeferredSplitPaneInput(stale, { data: 'stale', kind: 'ordinary', inputKind: 'driving' })
     const currentPromise = Promise.resolve('/current')
     const current = beginDeferredSplitPaneHandoff(key, currentPromise)
 
-    appendDeferredSplitPaneInput(stale, { data: 'late-stale', kind: 'ordinary' })
+    appendDeferredSplitPaneInput(stale, {
+      data: 'late-stale',
+      kind: 'ordinary',
+      inputKind: 'driving'
+    })
     clearDeferredSplitPaneHandoff(stale)
-    appendDeferredSplitPaneInput(current, { data: 'current', kind: 'ordinary' })
+    appendDeferredSplitPaneInput(current, {
+      data: 'current',
+      kind: 'ordinary',
+      inputKind: 'driving'
+    })
 
     const claimed = claimDeferredSplitPaneHandoff(key)
     expect(claimed?.cwdPromise).toBe(currentPromise)
-    expect(claimed?.preconnectInput).toEqual([{ data: 'current', kind: 'ordinary' }])
+    expect(claimed?.preconnectInput).toEqual([
+      { data: 'current', kind: 'ordinary', inputKind: 'driving' }
+    ])
   })
 
   it('retains input within the shared preconnect entry and code-unit caps', () => {
     const entryKey = makePaneKey('tab-entries', LEAF_1)
     const entryHandle = beginDeferredSplitPaneHandoff(entryKey, Promise.resolve('/entries'))
     for (let index = 0; index < PTY_PRECONNECT_INPUT_MAX_ENTRIES; index += 1) {
-      appendDeferredSplitPaneInput(entryHandle, { data: '', kind: 'ordinary' })
+      appendDeferredSplitPaneInput(entryHandle, {
+        data: '',
+        kind: 'ordinary',
+        inputKind: 'driving'
+      })
     }
-    appendDeferredSplitPaneInput(entryHandle, { data: 'overflow', kind: 'ordinary' })
+    appendDeferredSplitPaneInput(entryHandle, {
+      data: 'overflow',
+      kind: 'ordinary',
+      inputKind: 'driving'
+    })
     expect(claimDeferredSplitPaneHandoff(entryKey)?.preconnectInput).toHaveLength(
       PTY_PRECONNECT_INPUT_MAX_ENTRIES
     )
@@ -154,11 +201,20 @@ describe('deferred split pane handoff', () => {
     )
     appendDeferredSplitPaneInput(codeUnitHandle, {
       data: 'x'.repeat(PTY_PRECONNECT_INPUT_MAX_CODE_UNITS),
-      kind: 'ordinary'
+      kind: 'ordinary',
+      inputKind: 'driving'
+    })
+    appendDeferredSplitPaneInput(codeUnitHandle, {
+      data: 'overflow',
+      kind: 'ordinary',
+      inputKind: 'driving'
     })
-    appendDeferredSplitPaneInput(codeUnitHandle, { data: 'overflow', kind: 'ordinary' })
     expect(claimDeferredSplitPaneHandoff(codeUnitKey)?.preconnectInput).toEqual([
-      { data: 'x'.repeat(PTY_PRECONNECT_INPUT_MAX_CODE_UNITS), kind: 'ordinary' }
+      {
+        data: 'x'.repeat(PTY_PRECONNECT_INPUT_MAX_CODE_UNITS),
+        kind: 'ordinary',
+        inputKind: 'driving'
+      }
     ])
   })
 
@@ -209,12 +265,12 @@ describe('deferred split pane handoff', () => {
   it('does not expose the registry input array by reference', () => {
     const key = makePaneKey('tab-1', LEAF_1)
     const handle = beginDeferredSplitPaneHandoff(key, Promise.resolve('/source/cwd'))
-    appendDeferredSplitPaneInput(handle, { data: 'kept', kind: 'ordinary' })
+    appendDeferredSplitPaneInput(handle, { data: 'kept', kind: 'ordinary', inputKind: 'driving' })
     const firstClaim = claimDeferredSplitPaneHandoff(key)
     firstClaim?.preconnectInput.splice(0)
 
     expect(claimDeferredSplitPaneHandoff(key)?.preconnectInput).toEqual([
-      { data: 'kept', kind: 'ordinary' }
+      { data: 'kept', kind: 'ordinary', inputKind: 'driving' }
     ])
   })
 })
diff --git a/src/renderer/src/components/terminal-pane/deferred-split-pane-handoff.ts b/src/renderer/src/components/terminal-pane/deferred-split-pane-handoff.ts
index 6dfa1f30866a..046b43daa9c8 100644
--- a/src/renderer/src/components/terminal-pane/deferred-split-pane-handoff.ts
+++ b/src/renderer/src/components/terminal-pane/deferred-split-pane-handoff.ts
@@ -135,7 +135,7 @@ export function appendDeferredSplitPaneInput(
   ) {
     return
   }
-  owned.record.preconnectInput.push({ data: input.data, kind: input.kind })
+  owned.record.preconnectInput.push({ ...input })
   owned.record.inputCodeUnits += input.data.length
 }
 
diff --git a/src/renderer/src/components/terminal-pane/fork-terminal-dock/TerminalDockComposer.tsx b/src/renderer/src/components/terminal-pane/fork-terminal-dock/TerminalDockComposer.tsx
index daa5614bb72d..f8ad956b50ad 100644
--- a/src/renderer/src/components/terminal-pane/fork-terminal-dock/TerminalDockComposer.tsx
+++ b/src/renderer/src/components/terminal-pane/fork-terminal-dock/TerminalDockComposer.tsx
@@ -7,6 +7,7 @@ import type { SendOutcome } from '../../native-chat/fork-agent-composer/native-c
 import type { AgentComposerHandle } from '../../native-chat/fork-agent-composer/agent-composer-types'
 import { NativeChatComposer } from '../../native-chat/NativeChatComposer'
 import { NativeChatInteractiveCard } from '../../native-chat/NativeChatInteractiveCard'
+import { useNativeChatInteractivePromptCard } from '../../native-chat/use-native-chat-interactive-prompt-card'
 import { selectNativeChatRuntimeEnvironmentId } from '../../native-chat/native-chat-runtime-owner'
 import {
   useNativeChatInteractiveSend,
@@ -87,16 +88,19 @@ function TerminalDockCardComposer({
     [session.messages, status]
   )
   const [cardActive, setCardActive] = useState(false)
+  const promptCard = useNativeChatInteractivePromptCard({
+    paneKey: props.paneKey,
+    messages: session.messages,
+    transcriptSettled: session.readPhase === 'ready'
+  })
 
   return (
     <>
       <div className="absolute inset-x-0 bottom-full z-30" data-terminal-dock-card-overlay="">
         <NativeChatInteractiveCard
-          paneKey={props.paneKey}
+          card={promptCard}
           send={interactiveSend}
           canSend={props.canSend}
-          messages={session.messages}
-          transcriptSettled={session.readPhase === 'ready'}
           onShowingCardChange={setCardActive}
           answerInputRef={answerInputRef}
         />
diff --git a/src/renderer/src/components/terminal-pane/ipc-pty-connect.ts b/src/renderer/src/components/terminal-pane/ipc-pty-connect.ts
index 39a3ce0c5af8..ea5a4dda3aae 100644
--- a/src/renderer/src/components/terminal-pane/ipc-pty-connect.ts
+++ b/src/renderer/src/components/terminal-pane/ipc-pty-connect.ts
@@ -1,5 +1,5 @@
 import { isRuntimeOwnedSshTargetId } from '../../../../shared/execution-host'
-import { extractIpcErrorMessage } from '@/lib/ipc-error'
+import { readIpcErrorDetail } from '@/lib/ipc-error'
 import { ensurePtyDispatcher } from './pty-dispatcher'
 import {
   clearConsumedPreHandlerPtyExit,
@@ -181,10 +181,8 @@ function handleConnectError(
   context: IpcPtyConnectContext
 ): PtyConnectResult | undefined {
   const { connectionId } = context.transportOptions
-  const message = extractIpcErrorMessage(
-    error,
-    error instanceof Error ? error.message : String(error)
-  )
+  const message =
+    readIpcErrorDetail(error) ?? (error instanceof Error ? error.message : String(error))
   if (connectionId && options.sessionId && isSshSessionGoneError(message)) {
     return { id: options.sessionId, sessionExpired: true }
   }
diff --git a/src/renderer/src/components/terminal-pane/keyboard-handlers-ime-enter-keyup.test.tsx b/src/renderer/src/components/terminal-pane/keyboard-handlers-ime-enter-keyup.test.tsx
index 7e6f9a02549c..8a84eddbcefb 100644
--- a/src/renderer/src/components/terminal-pane/keyboard-handlers-ime-enter-keyup.test.tsx
+++ b/src/renderer/src/components/terminal-pane/keyboard-handlers-ime-enter-keyup.test.tsx
@@ -328,7 +328,7 @@ describe('Windows IME Enter-keyup press-time evidence', () => {
     vi.runAllTimers()
 
     expect(harness.sendInput).toHaveBeenCalledTimes(1)
-    expect(harness.sendInput).toHaveBeenCalledWith('\x1b\r')
+    expect(harness.sendInput).toHaveBeenCalledWith('\x1b\r', 'driving')
     hook.unmount()
     harness.dispose()
   })
@@ -351,7 +351,7 @@ describe('Windows IME Enter-keyup press-time evidence', () => {
     vi.runAllTimers()
 
     expect(harness.sendInput).toHaveBeenCalledTimes(1)
-    expect(harness.sendInput).toHaveBeenCalledWith('\x1b\r')
+    expect(harness.sendInput).toHaveBeenCalledWith('\x1b\r', 'driving')
     hook.unmount()
     harness.dispose()
   })
@@ -374,7 +374,7 @@ describe('Windows IME Enter-keyup press-time evidence', () => {
 
     expect(harness.setActivePane).toHaveBeenCalledWith(2, { focus: false })
     expect(harness.sendInput).toHaveBeenCalledOnce()
-    expect(harness.sendInput).toHaveBeenCalledWith('\x1b\r')
+    expect(harness.sendInput).toHaveBeenCalledWith('\x1b\r', 'driving')
     hook.unmount()
     harness.dispose()
   })
diff --git a/src/renderer/src/components/terminal-pane/layout-serialization.test.ts b/src/renderer/src/components/terminal-pane/layout-serialization.test.ts
index 8980c86ee8db..5835246ebaf9 100644
--- a/src/renderer/src/components/terminal-pane/layout-serialization.test.ts
+++ b/src/renderer/src/components/terminal-pane/layout-serialization.test.ts
@@ -38,7 +38,6 @@ import {
   POST_REPLAY_MODE_RESET,
   replayPayloadEndsWithCursorHidden,
   RESET_GRAPHIC_RENDITION,
-  RESET_KITTY_KEYBOARD_PROTOCOL,
   RESET_TERMINAL_CURSOR_STYLE
 } from '../../../../shared/terminal-mode-reset-profiles'
 import {
@@ -462,7 +461,7 @@ describe('replayPayloadEndsWithCursorHidden', () => {
 describe('buildPostReplayLiveAgentReattachReset', () => {
   it('preserves an intentionally hidden cursor', () => {
     expect(buildPostReplayLiveAgentReattachReset('agent frame\x1b[?25l')).toBe(
-      `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}`
+      RESET_TERMINAL_CURSOR_STYLE
     )
   })
 
diff --git a/src/renderer/src/components/terminal-pane/pane-helpers.test.ts b/src/renderer/src/components/terminal-pane/pane-helpers.test.ts
index 5a63dfafc2e7..5ade359ba09c 100644
--- a/src/renderer/src/components/terminal-pane/pane-helpers.test.ts
+++ b/src/renderer/src/components/terminal-pane/pane-helpers.test.ts
@@ -70,6 +70,8 @@ describe('fitAndFocusPanes', () => {
       )
     }
 
+    matches = vi.fn(() => false)
+
     closest: (selector: string) => Element | null
   }
 
diff --git a/src/renderer/src/components/terminal-pane/pending-split-close.test.ts b/src/renderer/src/components/terminal-pane/pending-split-close.test.ts
index 5a022ef9c993..3ab94611f941 100644
--- a/src/renderer/src/components/terminal-pane/pending-split-close.test.ts
+++ b/src/renderer/src/components/terminal-pane/pending-split-close.test.ts
@@ -191,3 +191,18 @@ it('retires a local folder-workspace split without a git worktree row', async ()
   await p.connecting
   expect(window.api.pty.kill).toHaveBeenCalledTimes(2)
 })
+
+it('commits the explicit split close in main by its leaf without waiting for its write', async () => {
+  const p = await preparePendingSplitClose()
+  // Main's durable write never settles here: the pane must still leave and be killed at once.
+  const closeTerminalSurface = vi.fn(() => new Promise<void>(() => {}))
+  Object.assign(window.api, { session: { ...window.api.session, closeTerminalSurface } })
+  p.actions.executeClosePane(1)
+  expect(closeTerminalSurface).toHaveBeenCalledExactlyOnceWith({
+    worktreeId: 'workspace',
+    target: { kind: 'pane', tabId: p.tabId, leafId: p.leafId }
+  })
+  expect(p.transports.has(1)).toBe(false)
+  expect(p.state.terminalLayoutsByTabId[p.tabId].ptyIdsByLeafId?.[p.leafId]).toBeUndefined()
+  expect(window.api.pty.kill).toHaveBeenCalledExactlyOnceWith('pty-restored')
+})
diff --git a/src/renderer/src/components/terminal-pane/pty-buffer-serializer.test.ts b/src/renderer/src/components/terminal-pane/pty-buffer-serializer.test.ts
index 4adda77cc208..f72596187fbb 100644
--- a/src/renderer/src/components/terminal-pane/pty-buffer-serializer.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-buffer-serializer.test.ts
@@ -6,6 +6,7 @@ describe('pty buffer serializer registry', () => {
 
   beforeEach(() => {
     vi.resetModules()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the registry reads only these pty members.
     ;(globalThis as { window: typeof window }).window = {
       ...originalWindow,
       api: {
@@ -13,6 +14,7 @@ describe('pty buffer serializer registry', () => {
         pty: {
           ...originalWindow?.api?.pty,
           onClearBufferRequest: vi.fn(() => () => {}),
+          onResetInputModesRequest: vi.fn(() => () => {}),
           onSerializeBufferRequest: vi.fn(() => () => {}),
           sendSerializedBuffer: vi.fn()
         }
@@ -120,4 +122,16 @@ describe('pty buffer serializer registry', () => {
       expect.objectContaining({ pendingEscapeTailAnsi: '\x1b[38;5;' })
     )
   })
+
+  it("routes a host's Reset Terminal request to the pane that owns the PTY", async () => {
+    const { registerPtySerializer } = await import('./pty-buffer-serializer')
+    const resetInputModes = vi.fn()
+    registerPtySerializer('pty-1', () => null, { resetInputModes })
+    const [[onRequest]] = vi.mocked(window.api.pty.onResetInputModesRequest).mock.calls
+
+    onRequest({ ptyId: 'pty-2' })
+    expect(resetInputModes).not.toHaveBeenCalled()
+    onRequest({ ptyId: 'pty-1' })
+    expect(resetInputModes).toHaveBeenCalledOnce()
+  })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-buffer-serializer.ts b/src/renderer/src/components/terminal-pane/pty-buffer-serializer.ts
index 35d6a833050e..ada99d6cbe81 100644
--- a/src/renderer/src/components/terminal-pane/pty-buffer-serializer.ts
+++ b/src/renderer/src/components/terminal-pane/pty-buffer-serializer.ts
@@ -34,6 +34,7 @@ export type SerializeFn = (
 type SerializerEntry = {
   fn: SerializeFn
   clear?: () => void
+  resetInputModes?: () => void
   owner: symbol
 }
 
@@ -50,10 +51,10 @@ let listenerAttached = false
 export function registerPtySerializer(
   ptyId: string,
   serialize: SerializeFn,
-  clear?: () => void
+  actions: Pick<SerializerEntry, 'clear' | 'resetInputModes'> = {}
 ): () => void {
   const owner = Symbol(ptyId)
-  serializersByPtyId.set(ptyId, { fn: serialize, clear, owner })
+  serializersByPtyId.set(ptyId, { fn: serialize, ...actions, owner })
   ensureSerializerListener()
   return () => {
     const current = serializersByPtyId.get(ptyId)
@@ -116,6 +117,11 @@ export function registerPtyTitleSource(
   }
 }
 
+/** Grounds the pane's own records only; the host grounds its models on its own request. */
+export function resetPtyRendererInputModes(ptyId: string): void {
+  serializersByPtyId.get(ptyId)?.resetInputModes?.()
+}
+
 export function hasPtySerializer(ptyId: string): boolean {
   return serializersByPtyId.has(ptyId)
 }
@@ -133,6 +139,8 @@ function ensureSerializerListener(): void {
     serializersByPtyId.get(request.ptyId)?.clear?.()
   })
 
+  window.api.pty.onResetInputModesRequest((request) => resetPtyRendererInputModes(request.ptyId))
+
   window.api.pty.onSerializeBufferRequest((request) => {
     const entry = serializersByPtyId.get(request.ptyId)
     void Promise.resolve(entry?.fn(request.opts) ?? null)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-cold-restore-resume-command.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-cold-restore-resume-command.test.ts
index 89bcc7254d19..757f3260fbcb 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-cold-restore-resume-command.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-cold-restore-resume-command.test.ts
@@ -457,7 +457,7 @@ describe('connectPanePty', () => {
     ).resolves.toBe("codex '--dangerously-bypass-approvals-and-sandbox' 'resume' 'codex-session-1'")
   })
 
-  it('keeps a contentless reattach when the sleeping record represents a live session', async () => {
+  async function expectLiveNoteKeepsContentlessReattach(state: 'working' | 'done'): Promise<void> {
     const { connectPanePty } = await import('./pty-connection')
     const paneKey = makePaneKey('tab-1', LEAF_2)
     const transport = createMockTransport('restored-session')
@@ -488,6 +488,7 @@ describe('connectPanePty', () => {
         }
       }
     } as StoreState
+    Object.assign(mockStoreState.sleepingAgentSessionsByPaneKey[paneKey] ?? {}, { state })
     const pane = createPane(2)
     const manager = createManager(2)
     const deps = createDeps({
@@ -502,7 +503,13 @@ describe('connectPanePty', () => {
     expect(transport.disconnect).not.toHaveBeenCalled()
     expect(deps.syncPanePtyLayoutBinding).toHaveBeenCalledWith(2, 'restored-session')
     expect(mockStoreState.clearSleepingAgentSession).not.toHaveBeenCalled()
-  })
+  }
+
+  // Why: a live note is the idle anchor of a running pane, done or not, never hibernation evidence.
+  it.each(['working', 'done'] as const)(
+    'keeps a contentless reattach when a live-origin %s note represents a running session',
+    expectLiveNoteKeepsContentlessReattach
+  )
 
   it('keeps a contentless reattach when a live status supersedes passive sleep evidence', async () => {
     const { connectPanePty } = await import('./pty-connection')
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.test.ts
index 279f99d3ede7..45a603f9e7fb 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.test.ts
@@ -1,6 +1,7 @@
 import type * as React from 'react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { POST_REPLAY_REATTACH_RESET } from '../../../../shared/terminal-mode-reset-profiles'
+import { TerminalKittyKeyboardModeTracker } from '../../../../shared/terminal-kitty-keyboard-mode-tracker'
 import { makePaneKey } from '../../../../shared/stable-pane-id'
 import { flushAsyncTicks, createDeferred } from './pty-connection-test-async'
 import {
@@ -532,11 +533,13 @@ describe('connectPanePty', () => {
     const paneKey = makePaneKey('tab-1', LEAF_1)
     const pane = createPane(1)
     const { writes } = captureCallbackTerminalWrites(pane)
+    const deps = createDeps({ isVisibleRef: { current: false } })
 
     connectPanePty(
       pane as never,
       createManager(1) as never,
-      createDeps({ isVisibleRef: { current: false } }) as never
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: fixture types intentionally model the production connection boundary.
+      deps as never
     )
     await vi.advanceTimersByTimeAsync(20)
     await flushAsyncTicks()
@@ -545,11 +548,15 @@ describe('connectPanePty', () => {
       identity: { agentType: 'droid' }
     }
 
+    // The agent negotiates Kitty keys across a chunk split, then dies armed.
+    dataCallbackRef.current?.('\x1b[>')
+    dataCallbackRef.current?.('5u')
     // A SIGKILLed agent emits no mode teardown; only the shell's next prompt
     // mark arrives. The bare 133;D must not disarm yet — the foreground read
     // has not confirmed the agent is gone.
     dataCallbackRef.current?.('\x1b]133;D;0\x07')
     expect(writes.some((w) => w.includes(POST_REPLAY_REATTACH_RESET))).toBe(false)
+    expect(deps.paneKittyKeyboardModesRef.current.get(pane.id)?.flags).toBe(5)
 
     await vi.advanceTimersByTimeAsync(350)
     await flushAsyncTicks()
@@ -559,6 +566,58 @@ describe('connectPanePty', () => {
     // The live shell re-arms bracketed paste at its prompt before the disarm
     // fires; the reset must not strip it.
     expect(disarm).not.toContain('\x1b[?2004l')
+    // Shortcut policy reads the mirror, so it must drop the dead app's flags with xterm.
+    expect(deps.paneKittyKeyboardModesRef.current.get(pane.id)?.flags).toBe(0)
+  })
+
+  it('grounds xterm and the input mirror in stream order when output is still queued', async () => {
+    vi.useFakeTimers()
+    const { connectPanePty } = await import('./pty-connection')
+    const confirmRead = createDeferred<string>()
+    vi.mocked(window.api.pty.confirmForegroundProcess).mockReturnValue(confirmRead.promise)
+    const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
+    const ptyId = 'pty-stale-mode-queued-output'
+    const transport = createMockTransport(ptyId)
+    transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
+      dataCallbackRef.current = callbacks.onData ?? null
+      return { id: ptyId }
+    })
+    transportFactoryQueue.push(transport)
+    const paneKey = makePaneKey('tab-1', LEAF_1)
+    const pane = createPane(1)
+    const { writes } = captureCallbackTerminalWrites(pane)
+    const deps = createDeps({ isVisibleRef: { current: false } })
+
+    connectPanePty(
+      pane as never,
+      createManager(1) as never,
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: fixture types intentionally model the production connection boundary.
+      deps as never
+    )
+    await vi.advanceTimersByTimeAsync(20)
+    await flushAsyncTicks()
+    mockStoreState.agentLaunchConfigByPaneKey[paneKey] = {
+      launchConfig: { agentArgs: '', agentEnv: {} },
+      identity: { agentType: 'droid' }
+    }
+    dataCallbackRef.current?.('\x1b]133;D;0\x07')
+    await vi.advanceTimersByTimeAsync(350)
+    await flushAsyncTicks()
+    expect(window.api.pty.confirmForegroundProcess).toHaveBeenCalled()
+
+    // Hidden-pane output sits in the background queue when the shell proof lands.
+    dataCallbackRef.current?.('\x1b[>5u')
+    expect(writes.some((w) => w.includes('\x1b[>5u'))).toBe(false)
+    confirmRead.resolve('bash')
+    await flushAsyncTicks()
+    await vi.advanceTimersByTimeAsync(100)
+
+    // Parsing what xterm received, in order, must match the mirror.
+    const xtermView = new TerminalKittyKeyboardModeTracker()
+    writes.forEach((write) => xtermView.scan(write))
+    expect(writes.some((w) => w.includes(POST_REPLAY_REATTACH_RESET))).toBe(true)
+    expect(deps.paneKittyKeyboardModesRef.current.get(pane.id)?.flags).toBe(0)
+    expect(xtermView.flags).toBe(0)
   })
 
   it('keeps armed modes while the agent still owns the foreground after a leaked 133;D', async () => {
@@ -576,11 +635,13 @@ describe('connectPanePty', () => {
     const paneKey = makePaneKey('tab-1', LEAF_1)
     const pane = createPane(1)
     const { writes } = captureCallbackTerminalWrites(pane)
+    const deps = createDeps({ isVisibleRef: { current: false } })
 
     connectPanePty(
       pane as never,
       createManager(1) as never,
-      createDeps({ isVisibleRef: { current: false } }) as never
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: fixture types intentionally model the production connection boundary.
+      deps as never
     )
     await vi.advanceTimersByTimeAsync(20)
     await flushAsyncTicks()
@@ -589,6 +650,7 @@ describe('connectPanePty', () => {
       identity: { agentType: 'droid' }
     }
 
+    dataCallbackRef.current?.('\x1b[>5u')
     // A full-screen agent's nested command shell leaks a 133;D onto the main
     // PTY; the confirming read republishes the live agent, so its armed
     // mouse/kitty modes must survive untouched.
@@ -597,6 +659,7 @@ describe('connectPanePty', () => {
     await flushAsyncTicks()
 
     expect(writes.some((w) => w.includes(POST_REPLAY_REATTACH_RESET))).toBe(false)
+    expect(deps.paneKittyKeyboardModesRef.current.get(pane.id)?.flags).toBe(5)
   })
 
   it('retires stale routing after unavailable command-finish reads without asserting shell', async () => {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-daemon-snapshot-replay.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-daemon-snapshot-replay.test.ts
index 2a20be955756..088c2c549052 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-daemon-snapshot-replay.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-daemon-snapshot-replay.test.ts
@@ -6,6 +6,7 @@ import {
   POST_REPLAY_REATTACH_RESET,
   RESET_GRAPHIC_RENDITION
 } from '../../../../shared/terminal-mode-reset-profiles'
+import { replayEpilogue } from './pty-connection-test-replay-epilogue'
 import { Terminal } from '@xterm/headless'
 import { flushAsyncTicks, createDeferred, writeHeadlessTerminal } from './pty-connection-test-async'
 import { createRect } from './pty-connection-test-dom'
@@ -192,11 +193,11 @@ describe('connectPanePty', () => {
       expect.any(Function)
     )
     expect(pane.terminal.write).toHaveBeenCalledWith(
-      POST_REPLAY_REATTACH_RESET,
+      replayEpilogue(POST_REPLAY_REATTACH_RESET),
       expect.any(Function)
     )
     expect(pane.terminal.write).not.toHaveBeenCalledWith(
-      POST_REPLAY_MODE_RESET,
+      replayEpilogue(POST_REPLAY_MODE_RESET, 0),
       expect.any(Function)
     )
 
@@ -252,7 +253,7 @@ describe('connectPanePty', () => {
     await flushAsyncTicks(20)
 
     expect(pane.terminal.write).toHaveBeenCalledWith(
-      POST_REPLAY_DEAD_TUI_RESET,
+      replayEpilogue(POST_REPLAY_DEAD_TUI_RESET),
       expect.any(Function)
     )
   })
@@ -461,7 +462,7 @@ describe('connectPanePty', () => {
     expect(writes.join('')).toContain('RESTORE-LIVE-STATE')
     expect(writes.join('')).not.toContain('ALT-FRAME-BODY')
     expect(writes).toContain(`${RESET_GRAPHIC_RENDITION}PREFIX-SCROLLBACKRESTORE-LIVE-STATE`)
-    expect(writes).toContain(POST_REPLAY_MODE_RESET)
+    expect(writes).toContain(replayEpilogue(POST_REPLAY_MODE_RESET, 0))
   })
 
   it('resizes the pane to the snapshot grid before replaying daemon snapshot bytes (bug #7279)', async () => {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-foreground-write-path.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-foreground-write-path.test.ts
index 743f06f6f424..f2dfe0bd6377 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-foreground-write-path.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-foreground-write-path.test.ts
@@ -240,7 +240,7 @@ describe('connectPanePty', () => {
 
     const forward = deferPtyInput.mock.calls[0]?.[2] as (data: string) => void
     forward('a')
-    expect(transport.sendInput).toHaveBeenCalledWith('a')
+    expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply')
   })
 
   it('forwards terminal input directly when the host supplies no deferPtyInput', async () => {
@@ -253,7 +253,7 @@ describe('connectPanePty', () => {
     await flushAsyncTicks()
     sendTerminalInputThroughPane(pane, 'a')
 
-    expect(transport.sendInput).toHaveBeenCalledWith('a')
+    expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply')
   })
 
   it('keeps large ANSI redraws after captured shortcut input on the immediate path', async () => {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-fresh-spawn-guards.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-fresh-spawn-guards.test.ts
index 17511577376a..408ce503b7e3 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-fresh-spawn-guards.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-fresh-spawn-guards.test.ts
@@ -177,28 +177,6 @@ describe('connectPanePty', () => {
     )
   })
 
-  // Why: a late exit from a replaced PTY skips onExit's kitty reset, so a fresh spawn must reset the reused per-pane tracker itself or restart-in-place leaks old kitty flags.
-  it('resets a stale kitty keyboard mirror when spawning a fresh PTY', async () => {
-    const { connectPanePty } = await import('./pty-connection')
-    const { TerminalKittyKeyboardModeTracker } =
-      await import('../../../../shared/terminal-kitty-keyboard-mode-tracker')
-    const transport = createMockTransport()
-    transportFactoryQueue.push(transport)
-    const staleTracker = new TerminalKittyKeyboardModeTracker()
-    staleTracker.scan('\x1b[>1u')
-    expect(staleTracker.flags).toBe(1)
-    // Why: a unique tab id keeps this pane's key clear of other tests' pendingSpawnByPaneKey entries so the connect deterministically fresh-spawns.
-    const deps = createDeps({
-      tabId: 'tab-kitty-fresh-spawn',
-      paneKittyKeyboardModesRef: { current: new Map([[91, staleTracker]]) }
-    })
-
-    connectPanePty(createPane(91) as never, createManager(91) as never, deps as never)
-    await flushAsyncTicks()
-
-    expect(staleTracker.flags).toBe(0)
-  })
-
   // Why: deleting a worktree kills its PTYs for the filesystem teardown; the
   // renderer must not race a doomed respawn into a directory main is deleting
   // (main fences it with TerminalRemovalInProgressError and the pane is about to
@@ -490,7 +468,7 @@ describe('connectPanePty', () => {
     // Released (via the guard's fallback or parse completion): input flows again.
     deps.replayingPanesRef.current.delete(pane.id)
     sendTerminalInputThroughPane(pane, 'echo hi\r')
-    expect(transport.sendInput).toHaveBeenCalledWith('echo hi\r')
+    expect(transport.sendInput).toHaveBeenCalledWith('echo hi\r', 'query-reply')
   })
 
   it('preserves classified user input during replay while suppressing synthetic replies', async () => {
@@ -533,7 +511,7 @@ describe('connectPanePty', () => {
     for (const forward of deferred.splice(0)) {
       forward()
     }
-    expect(transport.sendInput).toHaveBeenCalledExactlyOnceWith('input_under_flood\r')
+    expect(transport.sendInput).toHaveBeenCalledExactlyOnceWith('input_under_flood\r', 'driving')
 
     // A wheel over a replayed alt-screen frame becomes cursor keys; the fresh shell must not recall history from them.
     pane.terminal.buffer.active.type = 'alternate'
@@ -544,7 +522,7 @@ describe('connectPanePty', () => {
     for (const forward of deferred.splice(0)) {
       forward()
     }
-    expect(transport.sendInput).toHaveBeenCalledExactlyOnceWith('input_under_flood\r')
+    expect(transport.sendInput).toHaveBeenCalledExactlyOnceWith('input_under_flood\r', 'driving')
 
     // The same bytes on the normal buffer can only be a keyboard arrow, which survives replay.
     pane.terminal.buffer.active.type = 'normal'
@@ -556,7 +534,7 @@ describe('connectPanePty', () => {
       forward()
     }
     expect(transport.sendInput).toHaveBeenCalledTimes(2)
-    expect(transport.sendInput).toHaveBeenLastCalledWith('\x1b[B')
+    expect(transport.sendInput).toHaveBeenLastCalledWith('\x1b[B', 'driving')
 
     // Once the guard releases, the same mouse report is ordinary input again.
     deps.replayingPanesRef.current.delete(pane.id)
@@ -567,7 +545,7 @@ describe('connectPanePty', () => {
     for (const forward of deferred.splice(0)) {
       forward()
     }
-    expect(transport.sendInput).toHaveBeenLastCalledWith('\x1b[<0;12;4M')
+    expect(transport.sendInput).toHaveBeenLastCalledWith('\x1b[<0;12;4M', 'driving')
   })
 
   it('settles a queued startup only after the pane binds its spawned PTY', async () => {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-hibernation-wake.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-hibernation-wake.test.ts
index 7aa4de64a1d4..7855e756226f 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-hibernation-wake.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-hibernation-wake.test.ts
@@ -209,6 +209,52 @@ describe('connectPanePty', () => {
     expect(transport.connect.mock.calls.length).toBe(connectCallsAfterWake)
   })
 
+  // Why: pins #16308's incidental effect. Hibernation writes a worktree-sleep note, yet any
+  // suppressed exit over a finished turn's live idle anchor now arms a resume on reveal.
+  it('arms an in-place resume from a finished turn idle anchor on a suppressed exit', async () => {
+    const { connectPanePty } = await import('./pty-connection')
+    const transport = createMockTransport('pty-pane-2')
+    transportFactoryQueue.push(transport)
+    const deps = createDeps({
+      consumeSuppressedPtyExit: vi.fn(() => true),
+      isVisibleRef: { current: false }
+    })
+    const pane = createPane(2)
+    const paneKey = `tab-1:${leafIdForPane(2)}`
+    mockStoreState.sleepingAgentSessionsByPaneKey[paneKey] = {
+      paneKey,
+      tabId: 'tab-1',
+      worktreeId: 'wt-1',
+      agent: 'claude',
+      providerSession: { key: 'session_id', id: 'sess-idle-anchor' },
+      prompt: '',
+      state: 'done',
+      capturedAt: 1,
+      updatedAt: 1,
+      origin: 'live'
+    }
+    mockStoreState.suppressedPtyExitIds['tab-pty'] = true
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixtures implement the pane, manager and deps members connectPanePty reads.
+    const args = [pane, createManager(1), deps] as unknown as Parameters<typeof connectPanePty>
+    const binding = connectPanePty(...args)
+    await flushAsyncTicks()
+    const onPtyExit = createdTransportOptions[0]?.onPtyExit
+    expect(onPtyExit).toBeTypeOf('function')
+    const connectCallsBeforeExit = transport.connect.mock.calls.length
+    if (typeof onPtyExit === 'function') {
+      onPtyExit('tab-pty')
+    }
+    await flushAsyncTicks()
+
+    binding.noteVisibilityResume()
+    await flushAsyncTicks()
+
+    const resumeConnectOptions: { command?: string } | undefined =
+      transport.connect.mock.calls.at(-1)?.[0]
+    expect(transport.connect.mock.calls.length).toBeGreaterThan(connectCallsBeforeExit)
+    expect(resumeConnectOptions?.command).toContain('sess-idle-anchor')
+  })
+
   it('resumes a hibernated agent from a navigation-free wake without a visibility reveal', async () => {
     // Mobile wake fanout drives wakeHibernatedAgentIfArmed on a still-hidden pane (no isVisible flip): the armed --resume must fire exactly once even if delivered twice (INV-1).
     const { connectPanePty } = await import('./pty-connection')
@@ -692,7 +738,7 @@ describe('connectPanePty', () => {
     sendTerminalInputThroughPane(pane, '\x1b[O')
     expect(mockStoreState.recordTerminalInput).not.toHaveBeenCalled()
     // The reply still reaches the shell; only the activity recording is gated.
-    expect(transport.sendInput).toHaveBeenCalledWith('\x1b[O')
+    expect(transport.sendInput).toHaveBeenCalledWith('\x1b[O', 'query-reply')
 
     // Real user input fires the core signal and records activity.
     for (const listener of userInputListeners) {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-hidden-codex-queries.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-hidden-codex-queries.test.ts
index fe18699c20d5..e9443188b95b 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-hidden-codex-queries.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-hidden-codex-queries.test.ts
@@ -6,6 +6,7 @@ import {
   POST_REPLAY_LIVE_SNAPSHOT_RESET,
   POST_REPLAY_REATTACH_RESET
 } from '../../../../shared/terminal-mode-reset-profiles'
+import { replayEpilogue } from './pty-connection-test-replay-epilogue'
 import { makePaneKey } from '../../../../shared/stable-pane-id'
 import { flushAsyncTicks } from './pty-connection-test-async'
 import {
@@ -520,15 +521,15 @@ describe('connectPanePty', () => {
 
       // A live agent owns ?1004h (focus reporting); the plain reset's ?1004l would silence focus events until restart, since agents only enable it at startup.
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_AGENT_SNAPSHOT_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_AGENT_SNAPSHOT_RESET),
         expect.any(Function)
       )
       expect(pane.terminal.write).not.toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_SNAPSHOT_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_SNAPSHOT_RESET),
         expect.any(Function)
       )
       expect(pane.terminal.write).not.toHaveBeenCalledWith(
-        POST_REPLAY_DEAD_TUI_RESET,
+        replayEpilogue(POST_REPLAY_DEAD_TUI_RESET),
         expect.any(Function)
       )
     } finally {
@@ -583,11 +584,11 @@ describe('connectPanePty', () => {
       await flushAsyncTicks(20)
 
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        POST_REPLAY_DEAD_TUI_RESET,
+        replayEpilogue(POST_REPLAY_DEAD_TUI_RESET),
         expect.any(Function)
       )
       expect(pane.terminal.write).not.toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_AGENT_SNAPSHOT_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_AGENT_SNAPSHOT_RESET),
         expect.any(Function)
       )
     } finally {
@@ -634,15 +635,15 @@ describe('connectPanePty', () => {
       await flushAsyncTicks(20)
 
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_SNAPSHOT_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_SNAPSHOT_RESET),
         expect.any(Function)
       )
       expect(pane.terminal.write).not.toHaveBeenCalledWith(
-        POST_REPLAY_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_REATTACH_RESET),
         expect.any(Function)
       )
       expect(pane.terminal.write).not.toHaveBeenCalledWith(
-        POST_REPLAY_DEAD_TUI_RESET,
+        replayEpilogue(POST_REPLAY_DEAD_TUI_RESET),
         expect.any(Function)
       )
     } finally {
@@ -689,11 +690,11 @@ describe('connectPanePty', () => {
       await flushAsyncTicks(20)
 
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_SNAPSHOT_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_SNAPSHOT_RESET),
         expect.any(Function)
       )
       expect(pane.terminal.write).not.toHaveBeenCalledWith(
-        POST_REPLAY_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_REATTACH_RESET),
         expect.any(Function)
       )
     } finally {
@@ -739,11 +740,11 @@ describe('connectPanePty', () => {
       await flushAsyncTicks(20)
 
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        POST_REPLAY_DEAD_TUI_RESET,
+        replayEpilogue(POST_REPLAY_DEAD_TUI_RESET),
         expect.any(Function)
       )
       expect(pane.terminal.write).not.toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_SNAPSHOT_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_SNAPSHOT_RESET),
         expect.any(Function)
       )
       expect(window.api.pty.inspectProcess).not.toHaveBeenCalled()
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-hook-completion-bell-arbitration.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-hook-completion-bell-arbitration.test.ts
index e315563f0c66..ef49288f3eb5 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-hook-completion-bell-arbitration.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-hook-completion-bell-arbitration.test.ts
@@ -528,7 +528,7 @@ describe('connectPanePty', () => {
       'terminal-bell'
     )
     expect(deps.clearTerminalPaneUnread).not.toHaveBeenCalled()
-    expect(transport.sendInput).toHaveBeenCalledWith('a')
+    expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply')
   })
 
   // Why: xterm auto-replies during replay must not count as user interaction, or a BELed pane would self-dismiss unseen.
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-hook-completion-side-effects.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-hook-completion-side-effects.test.ts
index e61460ee4902..2845be5a64d8 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-hook-completion-side-effects.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-hook-completion-side-effects.test.ts
@@ -1,9 +1,6 @@
 import type * as React from 'react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  RESET_KITTY_KEYBOARD_PROTOCOL,
-  RESET_TERMINAL_CURSOR_STYLE
-} from '../../../../shared/terminal-mode-reset-profiles'
+import { RESET_TERMINAL_CURSOR_STYLE } from '../../../../shared/terminal-mode-reset-profiles'
 import { makePaneKey } from '../../../../shared/stable-pane-id'
 import { flushAsyncTicks } from './pty-connection-test-async'
 import { AGENT_TASK_COMPLETE_NOTIFICATION_MAX_WAIT_MS } from './pty-connection-test-constants'
@@ -456,15 +453,15 @@ describe('connectPanePty', () => {
         expect(deps.dispatchNotification).toHaveBeenCalledWith(expectedNotification)
       }
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}`,
+        RESET_TERMINAL_CURSOR_STYLE,
         expect.any(Function)
       )
       transport.sendInput.mockClear()
       sendTerminalInputThroughPane(pane, '\x1b[I')
       sendTerminalInputThroughPane(pane, '\x7f')
       expect(transport.sendInput).toHaveBeenCalledTimes(2)
-      expect(transport.sendInput).toHaveBeenNthCalledWith(1, '\x1b[I')
-      expect(transport.sendInput).toHaveBeenLastCalledWith('\x7f')
+      expect(transport.sendInput).toHaveBeenNthCalledWith(1, '\x1b[I', 'query-reply')
+      expect(transport.sendInput).toHaveBeenLastCalledWith('\x7f', 'query-reply')
     } finally {
       restoreUserAgent()
     }
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-hook-idle-arbitration.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-hook-idle-arbitration.test.ts
index 1b6cfd4f0493..e7af721d19af 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-hook-idle-arbitration.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-hook-idle-arbitration.test.ts
@@ -225,7 +225,7 @@ describe('connectPanePty', () => {
         agentToolName: 'Edit',
         agentToolInput: 'src/main/ipc/notifications.ts',
         agentLastAssistantMessage: 'Implemented the formatter.',
-        agentInterrupted: false
+        agentTurnOutcome: undefined
       })
     )
   })
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-interrupt-inference.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-interrupt-inference.test.ts
index 4b1f376b7732..7e9034c1d619 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-interrupt-inference.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-interrupt-inference.test.ts
@@ -364,7 +364,7 @@ describe('connectPanePty', () => {
     vi.advanceTimersByTime(500)
     await flushAsyncTicks()
 
-    expect(transport.sendInput).toHaveBeenCalledWith('\x03')
+    expect(transport.sendInput).toHaveBeenCalledWith('\x03', 'query-reply')
     expect(window.api.agentStatus.inferInterrupt).not.toHaveBeenCalled()
     expect(deps.setRuntimePaneTitle).not.toHaveBeenCalled()
     expect(deps.updateTabTitle).not.toHaveBeenCalled()
@@ -478,7 +478,7 @@ describe('connectPanePty', () => {
     vi.advanceTimersByTime(500)
     await flushAsyncTicks()
 
-    expect(transport.sendInputAccepted).toHaveBeenCalledWith('\x1b[99;5u')
+    expect(transport.sendInputAccepted).toHaveBeenCalledWith('\x1b[99;5u', 'query-reply')
     expect(window.api.agentStatus.inferInterrupt).toHaveBeenCalledWith({
       paneKey,
       baselineUpdatedAt: 1_000,
@@ -652,7 +652,7 @@ describe('connectPanePty', () => {
     vi.advanceTimersByTime(500)
     await flushAsyncTicks()
 
-    expect(transport.sendInput).toHaveBeenCalledWith('\x03')
+    expect(transport.sendInput).toHaveBeenCalledWith('\x03', 'query-reply')
     expect(window.api.agentStatus.inferInterrupt).not.toHaveBeenCalled()
   })
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-kitty-keyboard-restore.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-kitty-keyboard-restore.test.ts
new file mode 100644
index 000000000000..9faaaf10eb3b
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-connection-kitty-keyboard-restore.test.ts
@@ -0,0 +1,233 @@
+import type * as React from 'react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  POST_REPLAY_REATTACH_RESET,
+  PROCESS_BOUNDARY_GROUND
+} from '../../../../shared/terminal-mode-reset-profiles'
+import { TerminalKittyKeyboardModeTracker } from '../../../../shared/terminal-kitty-keyboard-mode-tracker'
+import { replayEpilogue } from './pty-connection-test-replay-epilogue'
+import { flushAsyncTicks } from './pty-connection-test-async'
+import {
+  LEAF_1,
+  createMockTransport,
+  createPane,
+  createManager,
+  type MockTransport
+} from './pty-connection-test-pane-fixtures'
+import { buildPaneConnectionDeps } from './pty-connection-test-deps'
+import { createInitialStoreState } from './pty-connection-test-store-fixtures'
+import type { StoreState } from './pty-connection-test-store-state'
+import {
+  installTerminalTestGlobals,
+  restoreTerminalTestGlobals
+} from './pty-connection-test-environment'
+
+const {
+  resetAndRefreshAllTerminalWebglAtlases,
+  scheduleTerminalWebglAtlasRecovery,
+  scheduleRuntimeGraphSync,
+  shouldSeedCacheTimerOnInitialTitle,
+  toastInfo,
+  notifyCodexPaneBoundForStaleSweep
+} = vi.hoisted(() => ({
+  resetAndRefreshAllTerminalWebglAtlases: vi.fn(),
+  scheduleTerminalWebglAtlasRecovery: vi.fn(),
+  scheduleRuntimeGraphSync: vi.fn(),
+  shouldSeedCacheTimerOnInitialTitle: vi.fn(() => false),
+  toastInfo: vi.fn(),
+  notifyCodexPaneBoundForStaleSweep: vi.fn()
+}))
+
+let mockStoreState: StoreState
+let transportFactoryQueue: MockTransport[] = []
+let createdTransportOptions: Record<string, unknown>[] = []
+let storeSubscribers: ((state: StoreState) => void)[] = []
+
+vi.mock('@/runtime/sync-runtime-graph', () => ({
+  scheduleRuntimeGraphSync
+}))
+
+vi.mock('@/lib/pane-manager/pane-manager-registry', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  resetAndRefreshAllTerminalWebglAtlases
+}))
+
+vi.mock('./terminal-webgl-atlas-recovery', () => ({
+  scheduleTerminalWebglAtlasRecovery
+}))
+
+vi.mock('@/store', () => ({
+  useAppStore: {
+    getState: () => mockStoreState,
+    subscribe: (listener: (state: StoreState) => void) => {
+      storeSubscribers.push(listener)
+      return () => {
+        storeSubscribers = storeSubscribers.filter((candidate) => candidate !== listener)
+      }
+    }
+  }
+}))
+
+vi.mock('@/lib/agent-status', async (importOriginal) => {
+  const { buildAgentStatusModuleMock } = await import('./pty-connection-test-environment')
+  return buildAgentStatusModuleMock(await importOriginal<Record<string, unknown>>())
+})
+
+vi.mock('./cache-timer-seeding', () => ({
+  shouldSeedCacheTimerOnInitialTitle
+}))
+
+vi.mock('sonner', () => ({
+  toast: {
+    info: toastInfo
+  }
+}))
+
+vi.mock('@/lib/codex-stale-pane-sweep', () => ({
+  notifyCodexPaneBoundForStaleSweep
+}))
+
+// Why: the working→idle test invokes the real useNotificationDispatch hook outside React, so useCallback must pass through (safe suite-wide: no test here renders React).
+vi.mock('react', async (importOriginal) => {
+  const actual = await importOriginal<typeof React>()
+  return {
+    ...actual,
+    useCallback: <T extends (...args: unknown[]) => unknown>(fn: T): T => fn
+  }
+})
+
+vi.mock('./pty-transport', () => ({
+  createIpcPtyTransport: vi.fn((options: Record<string, unknown>) => {
+    createdTransportOptions.push(options)
+    const nextTransport = transportFactoryQueue.shift()
+    if (!nextTransport) {
+      throw new Error('No mock transport queued')
+    }
+    return nextTransport
+  })
+}))
+
+vi.mock('./remote-runtime-pty-transport', () => ({
+  createRemoteRuntimePtyTransport: vi.fn(
+    (_environmentId: string, options: Record<string, unknown>) => {
+      createdTransportOptions.push(options)
+      const nextTransport = transportFactoryQueue.shift()
+      if (!nextTransport) {
+        throw new Error('No mock transport queued')
+      }
+      return nextTransport
+    }
+  )
+}))
+
+// Why: stub only getEagerPtyBufferHandle so tests can simulate a live eager buffer (adopt path) without standing up the real IPC dispatcher.
+vi.mock('./pty-dispatcher', async (importOriginal) => {
+  const actual = await importOriginal<Record<string, unknown>>()
+  return {
+    ...actual,
+    getEagerPtyBufferHandle: vi.fn(() => undefined)
+  }
+})
+
+function createDeps(overrides: Record<string, unknown> = {}) {
+  return buildPaneConnectionDeps(() => mockStoreState, overrides)
+}
+
+// Why: xterm and the pane mirror must end every restore on the same kitty flags.
+describe('connectPanePty kitty keyboard restore', () => {
+  beforeEach(() => {
+    vi.resetModules()
+    vi.clearAllMocks()
+    transportFactoryQueue = []
+    createdTransportOptions = []
+    storeSubscribers = []
+    mockStoreState = createInitialStoreState(() => mockStoreState)
+    installTerminalTestGlobals()
+  })
+
+  afterEach(async () => {
+    await restoreTerminalTestGlobals()
+  })
+
+  async function reattachWithSnapshotFlags(kittyKeyboard: boolean) {
+    const { connectPanePty } = await import('./pty-connection')
+    const transport = createMockTransport('tab-pty')
+    transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) =>
+      sessionId
+        ? {
+            id: sessionId,
+            snapshot: 'live app frame',
+            snapshotKittyKeyboardFlags: 31,
+            snapshotSeq: 7
+          }
+        : null
+    )
+    transportFactoryQueue.push(transport)
+    const pane = createPane(1)
+    pane.terminal.options.vtExtensions.kittyKeyboard = kittyKeyboard
+    const deps = createDeps({
+      restoredLeafId: LEAF_1,
+      restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' }
+    })
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: pane-connection mocks cover the members connectPanePty reads.
+    connectPanePty(pane as never, createManager(1) as never, deps as never)
+    await flushAsyncTicks(20)
+    return { pane, mirror: deps.paneKittyKeyboardModesRef.current.get(pane.id) }
+  }
+
+  it("restores a live app's host-proven flags into xterm and the mirror on reattach", async () => {
+    const { pane, mirror } = await reattachWithSnapshotFlags(true)
+
+    expect(pane.terminal.write).toHaveBeenCalledWith(
+      `${POST_REPLAY_REATTACH_RESET}\x1b[<99u\x1b[=31u`,
+      expect.any(Function)
+    )
+    expect(mirror?.flags).toBe(31)
+  })
+
+  // Why: xterm ignores CSI u while the protocol is withheld (ConPTY), so its mirror must too.
+  it('keeps a withheld-protocol pane at 0 in both records despite host flags', async () => {
+    const { pane, mirror } = await reattachWithSnapshotFlags(false)
+
+    expect(pane.terminal.write).toHaveBeenCalledWith(
+      replayEpilogue(POST_REPLAY_REATTACH_RESET),
+      expect.any(Function)
+    )
+    expect(mirror?.flags).toBe(0)
+  })
+
+  it('grounds xterm and the mirror with one scanned write before a restart-in-place spawns', async () => {
+    const { connectPanePty } = await import('./pty-connection')
+    transportFactoryQueue.push(createMockTransport())
+    const pane = createPane(91)
+    // Why: a unique tab id keeps this pane's key clear of other tests' pendingSpawnByPaneKey entries so the connect deterministically fresh-spawns.
+    const deps = createDeps({ tabId: 'tab-kitty-fresh-spawn' })
+    // The pane's previous occupant left the alternate screen and kitty flags on.
+    const mirror = new TerminalKittyKeyboardModeTracker()
+    mirror.scan('\x1b[?1049h\x1b[>5u')
+    deps.paneKittyKeyboardModesRef.current.set(pane.id, mirror)
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: pane-connection mocks cover the members connectPanePty reads.
+    connectPanePty(pane as never, createManager(91) as never, deps as never)
+    await flushAsyncTicks(20)
+
+    expect(pane.terminal.write).toHaveBeenCalledWith(PROCESS_BOUNDARY_GROUND, expect.any(Function))
+    expect(mirror.snapshotFlags).toBe(0)
+    expect(mirror.isAlternateScreen).toBe(false)
+  })
+
+  it('grounds xterm and the mirror together on Reset Terminal and asks the host to ground', async () => {
+    const { pane, mirror } = await reattachWithSnapshotFlags(true)
+    expect(mirror?.flags).toBe(31)
+    const { resetTerminalInputModes } = await import('./terminal-input-mode-reset')
+
+    resetTerminalInputModes('tab-pty')
+
+    expect(pane.terminal.write).toHaveBeenLastCalledWith(
+      PROCESS_BOUNDARY_GROUND,
+      expect.any(Function)
+    )
+    expect(mirror?.flags).toBe(0)
+    expect(window.api.pty.resetInputModes).toHaveBeenCalledWith('tab-pty')
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-parked-ssh-snapshot.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-parked-ssh-snapshot.test.ts
index 39191d5d36a6..840437719085 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-parked-ssh-snapshot.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-parked-ssh-snapshot.test.ts
@@ -4,6 +4,7 @@ import {
   POST_REPLAY_REATTACH_RESET,
   RESET_GRAPHIC_RENDITION
 } from '../../../../shared/terminal-mode-reset-profiles'
+import { replayEpilogue } from './pty-connection-test-replay-epilogue'
 import { toAppSshPtyId } from '../../../../shared/ssh-pty-id'
 import type { SshConnectionState } from '../../../../shared/ssh-types'
 import { flushAsyncTicks, createDeferred } from './pty-connection-test-async'
@@ -209,7 +210,7 @@ describe('connectPanePty', () => {
     // Why: the relay's replay buffer holds full history, so clear xterm before writing to avoid duplicating prior-session content.
     expect(writes).toContain(`${RESET_GRAPHIC_RENDITION}\x1b[2J\x1b[3J\x1b[H`)
     expect(writes).toContain('restored-ssh-output')
-    expect(writes).toContain(POST_REPLAY_REATTACH_RESET)
+    expect(writes).toContain(replayEpilogue(POST_REPLAY_REATTACH_RESET))
     expect(api.pty.signal).toHaveBeenCalledWith('leaf-session', 'SIGWINCH')
   })
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-pi-synchronized-input.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-pi-synchronized-input.test.ts
index a7917a1ccdfb..173c721d25c7 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-pi-synchronized-input.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-pi-synchronized-input.test.ts
@@ -164,8 +164,8 @@ describe('connectPanePty', () => {
       const pane = createPane(1)
       const synchronizedOutput = { synchronizedOutput: false }
       const renderRows = vi.fn()
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: test fixture exposes xterm's private render state to observe the DEC 2026 present.
       ;(
-        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: test fixture exposes xterm's private render state to observe the DEC 2026 present.
         pane.terminal as unknown as {
           _core: {
             coreService: { decPrivateModes: typeof synchronizedOutput }
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-reattach-mode-reset.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-reattach-mode-reset.test.ts
index 99c54dad2eb4..6c22586b59f2 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-reattach-mode-reset.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-reattach-mode-reset.test.ts
@@ -7,9 +7,9 @@ import {
   POST_REPLAY_REATTACH_RESET,
   POST_REPLAY_REATTACH_RESET_KEEP_MOUSE,
   RESET_GRAPHIC_RENDITION,
-  RESET_KITTY_KEYBOARD_PROTOCOL,
   RESET_TERMINAL_CURSOR_STYLE
 } from '../../../../shared/terminal-mode-reset-profiles'
+import { replayEpilogue } from './pty-connection-test-replay-epilogue'
 import { flushAsyncTicks } from './pty-connection-test-async'
 import {
   withMockedDocumentActiveElement,
@@ -275,8 +275,8 @@ describe('connectPanePty', () => {
     transport.sendInputImmediate.mockClear()
     sendTerminalInputThroughPane(pane, 'yes')
     sendTerminalInputThroughPane(pane, '\x1b[A') // arrow-key auto-repeat stays batched
-    expect(transport.sendInput).toHaveBeenCalledWith('yes')
-    expect(transport.sendInput).toHaveBeenCalledWith('\x1b[A')
+    expect(transport.sendInput).toHaveBeenCalledWith('yes', 'query-reply')
+    expect(transport.sendInput).toHaveBeenCalledWith('\x1b[A', 'query-reply')
     expect(transport.sendInputImmediate).not.toHaveBeenCalled()
 
     // terminal-query-reply.test proves real xterm emits this as one framed onData reply; this pins it to the immediate path.
@@ -291,7 +291,7 @@ describe('connectPanePty', () => {
     const printableInputs = [']10;hello', '>|xterm.js(6.1.0-beta.287)', ']|literal-text']
     for (const data of printableInputs) {
       sendTerminalInputThroughPane(pane, data)
-      expect(transport.sendInput).toHaveBeenCalledWith(data)
+      expect(transport.sendInput).toHaveBeenCalledWith(data, 'query-reply')
     }
     expect(transport.sendInputImmediate).not.toHaveBeenCalled()
   })
@@ -368,10 +368,10 @@ describe('connectPanePty', () => {
       connectPanePty(pane as never, manager as never, deps as never)
       await flushAsyncTicks(20)
 
-      expect(transport.sendInput).toHaveBeenCalledWith('\x1b[I')
+      expect(transport.sendInput).toHaveBeenCalledWith('\x1b[I', 'query-reply')
       // Snapshot ends with ?25l (Cursor Agent parks/hides the cursor); the reset must preserve it, not force ?25h, or a stray block paints.
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}`,
+        replayEpilogue(RESET_TERMINAL_CURSOR_STYLE),
         expect.any(Function)
       )
       const writes = (pane.terminal.write as ReturnType<typeof vi.fn>).mock.calls.map(
@@ -411,11 +411,11 @@ describe('connectPanePty', () => {
     await flushAsyncTicks(20)
 
     expect(pane.terminal.write).toHaveBeenCalledWith(
-      POST_REPLAY_DEAD_TUI_RESET,
+      replayEpilogue(POST_REPLAY_DEAD_TUI_RESET),
       expect.any(Function)
     )
     expect(pane.terminal.write).not.toHaveBeenCalledWith(
-      POST_REPLAY_LIVE_AGENT_REATTACH_RESET,
+      replayEpilogue(POST_REPLAY_LIVE_AGENT_REATTACH_RESET),
       expect.any(Function)
     )
   })
@@ -459,8 +459,8 @@ describe('connectPanePty', () => {
       expect(writes).toContain(
         `${RESET_GRAPHIC_RENDITION}\x1b[?1003h\x1b[?1006h\x1b[?2004huser@host ~ $ `
       )
-      expect(writes).toContain(POST_REPLAY_MODE_RESET)
-      expect(writes).not.toContain(POST_REPLAY_LIVE_AGENT_REATTACH_RESET)
+      expect(writes).toContain(replayEpilogue(POST_REPLAY_MODE_RESET, 0))
+      expect(writes).not.toContain(replayEpilogue(POST_REPLAY_LIVE_AGENT_REATTACH_RESET))
     })
   })
 
@@ -512,11 +512,11 @@ describe('connectPanePty', () => {
       )
       const output = writes.join('')
       const snapshotIndex = output.indexOf('\x1b[?1003h\x1b[?1006h\x1b[?2004huser@host ~ $ ')
-      const resetIndex = output.indexOf(POST_REPLAY_MODE_RESET)
+      const resetIndex = output.indexOf(replayEpilogue(POST_REPLAY_MODE_RESET, 0))
       expect(snapshotIndex).toBeGreaterThanOrEqual(0)
       expect(resetIndex).toBeGreaterThan(snapshotIndex)
-      expect(writes).toContain(POST_REPLAY_MODE_RESET)
-      expect(writes).not.toContain(POST_REPLAY_LIVE_AGENT_REATTACH_RESET)
+      expect(writes).toContain(replayEpilogue(POST_REPLAY_MODE_RESET, 0))
+      expect(writes).not.toContain(replayEpilogue(POST_REPLAY_LIVE_AGENT_REATTACH_RESET))
     })
   })
 
@@ -547,7 +547,7 @@ describe('connectPanePty', () => {
       await flushAsyncTicks(20)
 
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_AGENT_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_AGENT_REATTACH_RESET),
         expect.any(Function)
       )
     })
@@ -581,7 +581,7 @@ describe('connectPanePty', () => {
 
       expect(transport.sendInput).not.toHaveBeenCalledWith('\x1b[I')
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}`,
+        replayEpilogue(RESET_TERMINAL_CURSOR_STYLE),
         expect.any(Function)
       )
     })
@@ -614,11 +614,11 @@ describe('connectPanePty', () => {
 
       expect(transport.sendInput).not.toHaveBeenCalledWith('\x1b[I')
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        POST_REPLAY_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_REATTACH_RESET),
         expect.any(Function)
       )
       expect(pane.terminal.write).not.toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_AGENT_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_AGENT_REATTACH_RESET),
         expect.any(Function)
       )
     })
@@ -650,7 +650,8 @@ describe('connectPanePty', () => {
         .map((call) => String(call[0]))
         .find(
           (data) =>
-            data === POST_REPLAY_REATTACH_RESET || data === POST_REPLAY_REATTACH_RESET_KEEP_MOUSE
+            data === replayEpilogue(POST_REPLAY_REATTACH_RESET) ||
+            data === replayEpilogue(POST_REPLAY_REATTACH_RESET_KEEP_MOUSE)
         )
     })
   }
@@ -658,12 +659,12 @@ describe('connectPanePty', () => {
   it('keeps mouse reporting when a reattach snapshot restores a live alternate-screen TUI', async () => {
     await expect(
       reattachSnapshotResetFor('\x1b[?1049h\x1b[?1002h\x1b[?1006hthird-party tui session')
-    ).resolves.toBe(POST_REPLAY_REATTACH_RESET_KEEP_MOUSE)
+    ).resolves.toBe(replayEpilogue(POST_REPLAY_REATTACH_RESET_KEEP_MOUSE))
   })
 
   it('still disarms mouse reporting when a reattach snapshot ends on the normal buffer', async () => {
     await expect(reattachSnapshotResetFor('\x1b[?1003h\x1b[?1006hdead tui residue')).resolves.toBe(
-      POST_REPLAY_REATTACH_RESET
+      replayEpilogue(POST_REPLAY_REATTACH_RESET)
     )
   })
 
@@ -703,11 +704,11 @@ describe('connectPanePty', () => {
 
       expect(transport.sendInput).not.toHaveBeenCalledWith('\x1b[I')
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        POST_REPLAY_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_REATTACH_RESET),
         expect.any(Function)
       )
       expect(pane.terminal.write).not.toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_AGENT_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_AGENT_REATTACH_RESET),
         expect.any(Function)
       )
     })
@@ -741,11 +742,11 @@ describe('connectPanePty', () => {
 
       expect(transport.sendInput).not.toHaveBeenCalledWith('\x1b[I')
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        POST_REPLAY_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_REATTACH_RESET),
         expect.any(Function)
       )
       expect(pane.terminal.write).not.toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_AGENT_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_AGENT_REATTACH_RESET),
         expect.any(Function)
       )
     })
@@ -782,11 +783,11 @@ describe('connectPanePty', () => {
 
       expect(transport.sendInput).not.toHaveBeenCalledWith('\x1b[I')
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        POST_REPLAY_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_REATTACH_RESET),
         expect.any(Function)
       )
       expect(pane.terminal.write).not.toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_AGENT_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_AGENT_REATTACH_RESET),
         expect.any(Function)
       )
     })
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-replay-payload-handling.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-replay-payload-handling.test.ts
index 559060108eee..dbcc67fa47ec 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-replay-payload-handling.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-replay-payload-handling.test.ts
@@ -3,9 +3,9 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   POST_REPLAY_LIVE_AGENT_REATTACH_RESET,
   POST_REPLAY_REATTACH_RESET,
-  RESET_KITTY_KEYBOARD_PROTOCOL,
   RESET_TERMINAL_CURSOR_STYLE
 } from '../../../../shared/terminal-mode-reset-profiles'
+import { replayEpilogue } from './pty-connection-test-replay-epilogue'
 import { flushAsyncTicks } from './pty-connection-test-async'
 import {
   NORMAL_BUFFER_PROLOGUE,
@@ -397,10 +397,10 @@ describe('connectPanePty', () => {
       await flushAsyncTicks(12)
 
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_AGENT_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_AGENT_REATTACH_RESET),
         expect.any(Function)
       )
-      expect(transport.sendInput).toHaveBeenCalledWith('\x1b[I')
+      expect(transport.sendInput).toHaveBeenCalledWith('\x1b[I', 'query-reply')
       return connection
     })
     disposable.dispose()
@@ -437,7 +437,7 @@ describe('connectPanePty', () => {
       await flushAsyncTicks(12)
 
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        POST_REPLAY_LIVE_AGENT_REATTACH_RESET,
+        replayEpilogue(POST_REPLAY_LIVE_AGENT_REATTACH_RESET),
         expect.any(Function)
       )
       return connection
@@ -514,7 +514,7 @@ describe('connectPanePty', () => {
       await flushAsyncTicks(12)
 
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}`,
+        replayEpilogue(RESET_TERMINAL_CURSOR_STYLE),
         expect.any(Function)
       )
       expect(pane.terminal.write).toHaveBeenCalledWith('\x1b[?25h\x1b[?1004l', expect.any(Function))
@@ -673,7 +673,7 @@ describe('connectPanePty', () => {
     await flushAsyncTicks(8)
 
     const replayIndex = writes.indexOf('authoritative replay')
-    const resetIndex = writes.indexOf(POST_REPLAY_REATTACH_RESET)
+    const resetIndex = writes.indexOf(replayEpilogue(POST_REPLAY_REATTACH_RESET))
     const liveIndex = writes.indexOf('NEWER-LIVE\r\n')
     expect(replayIndex).toBeGreaterThan(0)
     expect(resetIndex).toBeGreaterThan(replayIndex)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-setup-split-spawn.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-setup-split-spawn.test.ts
index c61fb188cafc..924389689846 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-setup-split-spawn.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-setup-split-spawn.test.ts
@@ -600,7 +600,7 @@ describe('connectPanePty', () => {
       writes.join('').indexOf('NEWER-LIVE-SSH-OUTPUT')
     )
     expect(transport.sendInput).not.toHaveBeenCalledWith('codex resume provider-session\r')
-    expect(transport.sendInput).toHaveBeenCalledWith('AFTER_ADOPTION_REPLAY\r')
+    expect(transport.sendInput).toHaveBeenCalledWith('AFTER_ADOPTION_REPLAY\r', 'query-reply')
     expect(deps.syncPanePtyLayoutBinding).toHaveBeenCalledWith(1, stablePtyId)
   })
 
@@ -642,7 +642,7 @@ describe('connectPanePty', () => {
     setFitOverride('pty-live', 'remote-desktop-fit', 80, 24)
     transport.claimViewport.mockClear()
     ;(onDataHandler as (data: string) => void)('a')
-    expect(transport.sendInput).toHaveBeenCalledWith('a')
+    expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply')
     expect(transport.claimViewport).toHaveBeenCalledTimes(1)
     ;(onDataHandler as (data: string) => void)('b')
     // The renderer stays parked until runtime convergence is acknowledged, so a second keystroke can retry a transient failed resize.
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-ssh-startup-draft-delivery.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-ssh-startup-draft-delivery.test.ts
index 2538c9e0cecc..59fdc6decd7c 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-ssh-startup-draft-delivery.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-ssh-startup-draft-delivery.test.ts
@@ -222,7 +222,10 @@ describe('connectPanePty', () => {
 
     expect(createdTransportOptions[0]?.commandDelivery).toBe('provider')
     expect(transport.sendInput).not.toHaveBeenCalledWith('droid\r')
-    expect(transport.sendInputAccepted).toHaveBeenCalledWith(`\x1b[200~${prompt}\x1b[201~`)
+    expect(transport.sendInputAccepted).toHaveBeenCalledWith(
+      `\x1b[200~${prompt}\x1b[201~`,
+      'launch'
+    )
   })
 
   it('waits past 8s for a cold Codex composer and preserves input ordering', async () => {
@@ -279,7 +282,8 @@ describe('connectPanePty', () => {
     await flushAsyncTicks()
 
     expect(transport.sendInputAccepted).toHaveBeenCalledWith(
-      '\x1b[200~https://github.com/stablyai/orca/issues/42\x1b[201~'
+      '\x1b[200~https://github.com/stablyai/orca/issues/42\x1b[201~',
+      'launch'
     )
     expect(transport.sendInput.mock.calls.map(([data]) => data)).toEqual([
       '\x1b[I',
@@ -354,7 +358,8 @@ describe('connectPanePty', () => {
 
     expect(transport.sendInputAccepted).toHaveBeenCalledTimes(1)
     expect(transport.sendInputAccepted).toHaveBeenCalledWith(
-      '\x1b[200~Linked Linear issue: STA-905\x1b[201~'
+      '\x1b[200~Linked Linear issue: STA-905\x1b[201~',
+      'launch'
     )
   })
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-stalled-hidden-restore.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-stalled-hidden-restore.test.ts
index d4c2ffd6745f..a0f06268e971 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-stalled-hidden-restore.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-stalled-hidden-restore.test.ts
@@ -1,6 +1,9 @@
 import type * as React from 'react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { RESET_AFTER_BYTE_GAP } from '../../../../shared/terminal-mode-reset-profiles'
+import {
+  buildKittyKeyboardRestore,
+  RESET_AFTER_BYTE_GAP
+} from '../../../../shared/terminal-mode-reset-profiles'
 import { flushAsyncTicks, createDeferred } from './pty-connection-test-async'
 import { NORMAL_BUFFER_PROLOGUE } from './pty-connection-test-constants'
 import {
@@ -18,6 +21,9 @@ import {
   restoreTerminalTestGlobals
 } from './pty-connection-test-environment'
 
+// An abandon re-asserts the (known-zero) mirror's kitty flags after grounding the gap.
+const ABANDONED_RESTORE_GAP = `${RESET_AFTER_BYTE_GAP}${buildKittyKeyboardRestore(0)}`
+
 const {
   resetAndRefreshAllTerminalWebglAtlases,
   scheduleTerminalWebglAtlasRecovery,
@@ -206,10 +212,10 @@ describe('connectPanePty', () => {
     const warningIndex = written.findIndex((data) => data.includes('main recovery was unavailable'))
     const combinedLiveIndex = written.indexOf(firstLive + secondLive)
     expect(warningIndex).toBeGreaterThanOrEqual(0)
-    expect(written[warningIndex - 1]).toBe(RESET_AFTER_BYTE_GAP)
+    expect(written[warningIndex - 1]).toBe(ABANDONED_RESTORE_GAP)
     // Exactly one: writeRestoreUnavailableWarning already grounds the gap, so a
     // second unconditional write here was pure duplication.
-    expect(written.filter((data) => data === RESET_AFTER_BYTE_GAP)).toHaveLength(1)
+    expect(written.filter((data) => data === ABANDONED_RESTORE_GAP)).toHaveLength(1)
     expect(combinedLiveIndex).toBeGreaterThan(warningIndex)
 
     snapshot.resolve({
@@ -276,7 +282,7 @@ describe('connectPanePty', () => {
     await flushAsyncTicks(10)
 
     const written = pane.terminal.write.mock.calls.map(([data]) => data as string)
-    const resetIndex = written.indexOf(RESET_AFTER_BYTE_GAP)
+    const resetIndex = written.indexOf(ABANDONED_RESTORE_GAP)
     const liveIndex = written.findIndex((data) => data.includes('live-after-reveal'))
     expect(resetIndex).toBeGreaterThanOrEqual(0)
     expect(liveIndex).toBeGreaterThanOrEqual(0)
@@ -319,13 +325,13 @@ describe('connectPanePty', () => {
     await flushAsyncTicks(10)
 
     const written = pane.terminal.write.mock.calls.map(([data]) => data as string)
-    const resetIndex = written.indexOf(RESET_AFTER_BYTE_GAP)
+    const resetIndex = written.indexOf(ABANDONED_RESTORE_GAP)
     const liveIndex = written.indexOf(live)
     expect(resetIndex).toBeGreaterThanOrEqual(0)
     expect(liveIndex).toBeGreaterThan(resetIndex)
     // The re-arm arm grounds in rearmRemoteHiddenOutputRestoreInsteadOfWarning,
     // so the abandon body must not ground a second time.
-    expect(written.filter((data) => data === RESET_AFTER_BYTE_GAP)).toHaveLength(1)
+    expect(written.filter((data) => data === ABANDONED_RESTORE_GAP)).toHaveLength(1)
     expect(written.join('')).not.toContain('main recovery was unavailable')
 
     disposable.dispose()
@@ -383,8 +389,8 @@ describe('connectPanePty', () => {
     expect(liveIndex).toBeGreaterThan(warningIndex)
     // This arm gives up on recovery too, so the gap is grounded exactly once
     // before the blocked foreground is drained under it.
-    expect(written.filter((data) => data === RESET_AFTER_BYTE_GAP)).toHaveLength(1)
-    expect(written.indexOf(RESET_AFTER_BYTE_GAP)).toBeLessThan(liveIndex)
+    expect(written.filter((data) => data === ABANDONED_RESTORE_GAP)).toHaveLength(1)
+    expect(written.indexOf(ABANDONED_RESTORE_GAP)).toBeLessThan(liveIndex)
     disposable.dispose()
   })
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-startup-command-delivery.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-startup-command-delivery.test.ts
index 969bf836594e..f85917e28c61 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-startup-command-delivery.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-startup-command-delivery.test.ts
@@ -525,7 +525,7 @@ describe('connectPanePty', () => {
       await flushAsyncTicks()
 
       expect(pane.terminal.paste).toHaveBeenCalledWith(command)
-      expect(transport.sendInput).toHaveBeenCalledWith('\r')
+      expect(transport.sendInput).toHaveBeenCalledWith('\r', 'launch')
       expect(transport.sendInput).not.toHaveBeenCalledWith(`${command}\r`)
     } finally {
       globalThis.setTimeout = originalSetTimeout
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-task-complete-dispatch.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-task-complete-dispatch.test.ts
index 4767de833820..25b40d861831 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-task-complete-dispatch.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-task-complete-dispatch.test.ts
@@ -699,7 +699,7 @@ describe('connectPanePty', () => {
     expect('agentToolName' in dispatchArgs).toBe(false)
     expect('agentToolInput' in dispatchArgs).toBe(false)
     expect('agentLastAssistantMessage' in dispatchArgs).toBe(false)
-    expect('agentInterrupted' in dispatchArgs).toBe(false)
+    expect('agentTurnOutcome' in dispatchArgs).toBe(false)
   })
 
   // Why: agent-row removal belongs to process/PTY lifecycle, not title reversion, so interrupts can't disappear the activity row.
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-terminal-input-gating.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-terminal-input-gating.test.ts
index 4659fccb5c56..4a2d2ee12063 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-terminal-input-gating.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-terminal-input-gating.test.ts
@@ -191,7 +191,7 @@ describe('connectPanePty', () => {
     }
     ;(onDataHandler as (data: string) => void)('a')
 
-    expect(transport.sendInput).toHaveBeenCalledWith('a')
+    expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply')
   })
 
   it('uses the current worktree tab for Codex stale fallback without enumerating all worktrees', async () => {
@@ -234,7 +234,7 @@ describe('connectPanePty', () => {
     }
     ;(onDataHandler as (data: string) => void)('a')
 
-    expect(transport.sendInput).toHaveBeenCalledWith('a')
+    expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply')
   })
 
   it('blocks stale Codex fallback input from the current worktree tab without enumerating all worktrees', async () => {
@@ -313,7 +313,7 @@ describe('connectPanePty', () => {
     }
     ;(onDataHandler as (data: string) => void)('a')
 
-    expect(transport.sendInput).toHaveBeenCalledWith('a')
+    expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply')
   })
 
   it('restores input through the tab fallback when the dismissed pane has no live PTY binding', async () => {
@@ -347,7 +347,7 @@ describe('connectPanePty', () => {
     }
     ;(onDataHandler as (data: string) => void)('a')
 
-    expect(transport.sendInput).toHaveBeenCalledWith('a')
+    expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply')
   })
 
   it('keeps a dismissed split pane typing while a sibling still holds the prompt', async () => {
@@ -389,7 +389,7 @@ describe('connectPanePty', () => {
     ;(onDataHandler as (data: string) => void)('a')
 
     expect((transport.getPtyId as unknown as () => string | null)()).toBe('pty-dismissed')
-    expect(transport.sendInput).toHaveBeenCalledWith('a')
+    expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply')
   })
 
   it('keeps blocking a pane with its own unanswered notice next to a dismissed sibling', async () => {
@@ -466,7 +466,7 @@ describe('connectPanePty', () => {
     ;(onDataHandler as (data: string) => void)('a')
 
     expect((transport.getPtyId as unknown as () => string | null)()).toBe('pty-plain-shell')
-    expect(transport.sendInput).toHaveBeenCalledWith('a')
+    expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply')
   })
 
   it('keeps blocking input on a pane whose restart is requested but not yet run', async () => {
@@ -782,7 +782,7 @@ describe('connectPanePty', () => {
     await flushAsyncTicks()
     vi.advanceTimersByTime(500)
 
-    expect(transport.sendInputAccepted).toHaveBeenCalledWith('\x03')
+    expect(transport.sendInputAccepted).toHaveBeenCalledWith('\x03', 'query-reply')
     expect(transport.sendInput).not.toHaveBeenCalled()
     expect(window.api.agentStatus.inferInterrupt).not.toHaveBeenCalled()
   })
@@ -843,7 +843,7 @@ describe('connectPanePty', () => {
     expect(transport.sendInput).not.toHaveBeenCalledWith('\r')
     // The terminator disarmed it, so the next real command reaches the shell.
     sendTerminalInputThroughPane(pane, 'ls\r')
-    expect(transport.sendInput).toHaveBeenCalledWith('ls\r')
+    expect(transport.sendInput).toHaveBeenCalledWith('ls\r', 'query-reply')
     _resetTerminalPaneRecoveryForTests()
   })
 
@@ -867,7 +867,7 @@ describe('connectPanePty', () => {
     vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS * 2)
     await flushAsyncTicks()
 
-    expect(transport.sendInput).toHaveBeenCalledWith('x')
+    expect(transport.sendInput).toHaveBeenCalledWith('x', 'query-reply')
     expect(pane.terminal.write).toHaveBeenCalledWith('', expect.any(Function))
     expect(remountTerminalTabForRecovery).toHaveBeenCalledWith('tab-1', AUTOMATIC_REQUEST)
     binding.dispose()
@@ -892,7 +892,7 @@ describe('connectPanePty', () => {
     vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS * 2)
     await flushAsyncTicks()
 
-    expect(transport.sendInputAccepted).toHaveBeenCalledWith('\x03')
+    expect(transport.sendInputAccepted).toHaveBeenCalledWith('\x03', 'query-reply')
     expect(pane.terminal.write).not.toHaveBeenCalledWith('', expect.any(Function))
     binding.dispose()
   })
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-test-deps.ts b/src/renderer/src/components/terminal-pane/pty-connection-test-deps.ts
index cc7536afcb71..e37ab960e3b7 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-test-deps.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-test-deps.ts
@@ -2,6 +2,7 @@ import { vi } from 'vitest'
 import type { Mock } from 'vitest'
 import { leafIdForPane } from './pty-connection-test-pane-fixtures'
 import type { StoreState } from './pty-connection-test-store-state'
+import type { TerminalKittyKeyboardModeTracker } from '../../../../shared/terminal-kitty-keyboard-mode-tracker'
 
 type MockRef = { current: Mock }
 
@@ -16,7 +17,7 @@ export type PaneConnectionDeps = {
   mountFollowsTerminalPark: boolean
   paneTransportsRef: { current: Map<number, unknown> }
   paneMode2031Ref: { current: Map<number, unknown> }
-  paneKittyKeyboardModesRef: { current: Map<number, unknown> }
+  paneKittyKeyboardModesRef: { current: Map<number, TerminalKittyKeyboardModeTracker> }
   paneLastThemeModeRef: { current: Map<number, unknown> }
   replayingPanesRef: { current: Map<number, unknown> }
   isActiveRef: { current: boolean }
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-test-environment.ts b/src/renderer/src/components/terminal-pane/pty-connection-test-environment.ts
index eb3a40b6803b..d8a9333c359d 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-test-environment.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-test-environment.ts
@@ -54,6 +54,8 @@ export function installTerminalTestGlobals(): void {
         setPtyDeliveryInterest: vi.fn(),
         ackColdRestore: vi.fn(),
         onClearBufferRequest: vi.fn(() => vi.fn()),
+        onResetInputModesRequest: vi.fn(() => vi.fn()),
+        resetInputModes: vi.fn(),
         onSerializeBufferRequest: vi.fn(() => vi.fn()),
         sendSerializedBuffer: vi.fn(),
         declarePendingPaneSerializer: vi.fn().mockResolvedValue(1),
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-test-pane-fixtures.ts b/src/renderer/src/components/terminal-pane/pty-connection-test-pane-fixtures.ts
index c91c51f789e9..302efe743bb0 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-test-pane-fixtures.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-test-pane-fixtures.ts
@@ -103,6 +103,7 @@ export type MockPaneTerminal = {
     scrollback: number
     ignoreBracketedPasteMode: boolean
     theme: { foreground: string; background: string }
+    vtExtensions: { kittyKeyboard: boolean }
   }
   write: Mock<(data: string, callback?: () => void) => void>
   resize: Mock<(cols: number, rows: number) => void>
@@ -162,7 +163,8 @@ export function createPane(paneId: number): MockPane {
       theme: {
         foreground: '#eeeeee',
         background: '#111111'
-      }
+      },
+      vtExtensions: { kittyKeyboard: true }
     },
     write: vi.fn<(data: string, callback?: () => void) => void>(function write(...args): void {
       const [data, callback] = args
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-test-replay-epilogue.ts b/src/renderer/src/components/terminal-pane/pty-connection-test-replay-epilogue.ts
new file mode 100644
index 000000000000..56b4c5152497
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-connection-test-replay-epilogue.ts
@@ -0,0 +1,6 @@
+import { buildKittyKeyboardRestore } from '../../../../shared/terminal-mode-reset-profiles'
+
+/** A post-replay reset: the profile, then the mirror's kitty restore (a bare pop while unproven). */
+export function replayEpilogue(profile: string, provenFlags?: number): string {
+  return `${profile}${buildKittyKeyboardRestore(provenFlags)}`
+}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-typed-agent-identity.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-typed-agent-identity.test.ts
index 119e61e121ee..73105c0248aa 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-typed-agent-identity.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-typed-agent-identity.test.ts
@@ -182,7 +182,7 @@ describe('connectPanePty', () => {
       agentType: 'pi'
     })
 
-    expect(transport.sendInput).toHaveBeenCalledWith('omp\r')
+    expect(transport.sendInput).toHaveBeenCalledWith('omp\r', 'query-reply')
     expect(deps.setRuntimePaneTitle).toHaveBeenCalledWith('tab-1', 1, 'OMP ready')
     expect(deps.updateTabTitle).toHaveBeenCalledWith('tab-1', 'OMP ready')
     expect(mockStoreState.agentStatusByPaneKey[paneKey]).toMatchObject({
@@ -436,7 +436,7 @@ describe('connectPanePty', () => {
       agentType: 'pi'
     })
 
-    expect(transport.sendInput).toHaveBeenCalledWith('pi \x17omp\r')
+    expect(transport.sendInput).toHaveBeenCalledWith('pi \x17omp\r', 'query-reply')
     expect(deps.setRuntimePaneTitle).toHaveBeenCalledWith('tab-1', 1, 'OMP ready')
     expect(mockStoreState.agentStatusByPaneKey[paneKey]).toMatchObject({
       state: 'done',
@@ -474,7 +474,7 @@ describe('connectPanePty', () => {
       agentType: 'pi'
     })
 
-    expect(transport.sendInput).toHaveBeenCalledWith('pi\r')
+    expect(transport.sendInput).toHaveBeenCalledWith('pi\r', 'query-reply')
     expect(deps.setRuntimePaneTitle).toHaveBeenCalledWith('tab-1', 1, 'Pi ready')
     expect(deps.updateTabTitle).toHaveBeenCalledWith('tab-1', 'Pi ready')
     expect(mockStoreState.agentStatusByPaneKey[paneKey]).toMatchObject({
@@ -525,7 +525,7 @@ describe('connectPanePty', () => {
       agentType: 'pi'
     })
 
-    expect(transport.sendInput).toHaveBeenCalledWith('omp\r')
+    expect(transport.sendInput).toHaveBeenCalledWith('omp\r', 'query-reply')
     expect(deps.setRuntimePaneTitle).toHaveBeenCalledWith('tab-1', 1, 'Pi ready')
     expect(mockStoreState.agentStatusByPaneKey[paneKey]).toMatchObject({
       state: 'done',
@@ -564,7 +564,7 @@ describe('connectPanePty', () => {
       agentType: 'pi'
     })
 
-    expect(transport.sendInput).toHaveBeenCalledWith('omp\r')
+    expect(transport.sendInput).toHaveBeenCalledWith('omp\r', 'query-reply')
     expect(deps.setRuntimePaneTitle).toHaveBeenCalledWith('tab-1', 1, 'Pi ready')
     expect(mockStoreState.agentStatusByPaneKey[paneKey]).toMatchObject({
       state: 'done',
@@ -650,7 +650,7 @@ describe('connectPanePty', () => {
       agentType: 'pi'
     })
 
-    expect(transport.sendInput).toHaveBeenCalledWith('op\x1b[Dm\r')
+    expect(transport.sendInput).toHaveBeenCalledWith('op\x1b[Dm\r', 'query-reply')
     expect(mockStoreState.agentStatusByPaneKey[paneKey]).toMatchObject({
       state: 'done',
       agentType: 'omp',
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-windows-keyboard-reset.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-windows-keyboard-reset.test.ts
index 471e237a2004..22ef4f6618a2 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-windows-keyboard-reset.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-windows-keyboard-reset.test.ts
@@ -182,7 +182,7 @@ describe('connectPanePty', () => {
     )
   })
 
-  it('resets stale keyboard state when a native Windows agent becomes idle', async () => {
+  it('keeps kitty keyboard state when a native Windows agent becomes idle', async () => {
     const restoreUserAgent = temporarilySetNavigatorUserAgent(
       'Mozilla/5.0 (Windows NT 10.0; Win64; x64)'
     )
@@ -206,7 +206,12 @@ describe('connectPanePty', () => {
 
       idleHandler('* Codex done')
 
+      // Why: a finished turn is not a dead app; its kitty flags stay until the host sees it exit.
       expect(pane.terminal.write).toHaveBeenCalledWith(
+        RESET_TERMINAL_CURSOR_STYLE,
+        expect.any(Function)
+      )
+      expect(pane.terminal.write).not.toHaveBeenCalledWith(
         `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}`,
         expect.any(Function)
       )
@@ -254,7 +259,7 @@ describe('connectPanePty', () => {
       )
       transport.sendInput.mockClear()
       sendTerminalInputThroughPane(pane, '\x1b[I')
-      expect(transport.sendInput).toHaveBeenCalledWith('\x1b[I')
+      expect(transport.sendInput).toHaveBeenCalledWith('\x1b[I', 'query-reply')
     } finally {
       restoreUserAgent()
     }
@@ -311,14 +316,14 @@ describe('connectPanePty', () => {
         )
         transport.sendInput.mockClear()
         sendTerminalInputThroughPane(pane, '\x1b[I')
-        expect(transport.sendInput).toHaveBeenCalledWith('\x1b[I')
+        expect(transport.sendInput).toHaveBeenCalledWith('\x1b[I', 'query-reply')
       } finally {
         restoreUserAgent()
       }
     }
   )
 
-  it('resets stale keyboard state when native Windows hook status reaches done', async () => {
+  it('resets cursor style when native Windows hook status reaches done', async () => {
     const restoreUserAgent = temporarilySetNavigatorUserAgent(
       'Mozilla/5.0 (Windows NT 10.0; Win64; x64)'
     )
@@ -359,7 +364,7 @@ describe('connectPanePty', () => {
       notifyStoreSubscribers()
 
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}`,
+        RESET_TERMINAL_CURSOR_STYLE,
         expect.any(Function)
       )
     } finally {
@@ -367,7 +372,7 @@ describe('connectPanePty', () => {
     }
   })
 
-  it('resets stale keyboard state when a batched done→working→done burst lands as one publication', async () => {
+  it('resets cursor style when a batched done→working→done burst lands as one publication', async () => {
     const restoreUserAgent = temporarilySetNavigatorUserAgent(
       'Mozilla/5.0 (Windows NT 10.0; Win64; x64)'
     )
@@ -413,7 +418,7 @@ describe('connectPanePty', () => {
       notifyStoreSubscribers()
 
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}`,
+        RESET_TERMINAL_CURSOR_STYLE,
         expect.any(Function)
       )
     } finally {
@@ -421,7 +426,7 @@ describe('connectPanePty', () => {
     }
   })
 
-  it('resets stale keyboard state when a batched burst ends on working after a completed turn', async () => {
+  it('resets cursor style when a batched burst ends on working after a completed turn', async () => {
     const restoreUserAgent = temporarilySetNavigatorUserAgent(
       'Mozilla/5.0 (Windows NT 10.0; Win64; x64)'
     )
@@ -464,7 +469,7 @@ describe('connectPanePty', () => {
       notifyStoreSubscribers()
 
       expect(pane.terminal.write).toHaveBeenCalledWith(
-        `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}`,
+        RESET_TERMINAL_CURSOR_STYLE,
         expect.any(Function)
       )
     } finally {
@@ -472,7 +477,7 @@ describe('connectPanePty', () => {
     }
   })
 
-  it('keeps native Windows same-turn done repaints from re-resetting keyboard state', async () => {
+  it('keeps native Windows same-turn done repaints from re-resetting cursor style', async () => {
     const restoreUserAgent = temporarilySetNavigatorUserAgent(
       'Mozilla/5.0 (Windows NT 10.0; Win64; x64)'
     )
@@ -568,7 +573,7 @@ describe('connectPanePty', () => {
       notifyStoreSubscribers()
 
       sendTerminalInputThroughPane(pane, '\x1b[I')
-      expect(transport.sendInput).toHaveBeenCalledWith('\x1b[I')
+      expect(transport.sendInput).toHaveBeenCalledWith('\x1b[I', 'query-reply')
     } finally {
       restoreUserAgent()
     }
@@ -621,8 +626,8 @@ describe('connectPanePty', () => {
         sendTerminalInputThroughPane(pane, '\x1b[O')
         sendTerminalInputThroughPane(pane, '\x1b[I')
 
-        expect(transport.sendInput).toHaveBeenNthCalledWith(1, '\x1b[O')
-        expect(transport.sendInput).toHaveBeenNthCalledWith(2, '\x1b[I')
+        expect(transport.sendInput).toHaveBeenNthCalledWith(1, '\x1b[O', 'query-reply')
+        expect(transport.sendInput).toHaveBeenNthCalledWith(2, '\x1b[I', 'query-reply')
       } finally {
         restoreUserAgent()
       }
@@ -667,8 +672,8 @@ describe('connectPanePty', () => {
 
       sendTerminalInputThroughPane(pane, '\x7f')
       sendTerminalInputThroughPane(pane, 'x')
-      expect(transport.sendInput).toHaveBeenNthCalledWith(1, '\x7f')
-      expect(transport.sendInput).toHaveBeenNthCalledWith(2, 'x')
+      expect(transport.sendInput).toHaveBeenNthCalledWith(1, '\x7f', 'query-reply')
+      expect(transport.sendInput).toHaveBeenNthCalledWith(2, 'x', 'query-reply')
       expect(pane.terminal.modes.sendFocusMode).toBe(true)
 
       mockStoreState.agentStatusByPaneKey[paneKey] = {
@@ -679,7 +684,7 @@ describe('connectPanePty', () => {
       transport.sendInput.mockClear()
 
       sendTerminalInputThroughPane(pane, '\x1b[I')
-      expect(transport.sendInput).toHaveBeenCalledWith('\x1b[I')
+      expect(transport.sendInput).toHaveBeenCalledWith('\x1b[I', 'query-reply')
       expect(pane.terminal.modes.sendFocusMode).toBe(true)
 
       mockStoreState.agentStatusByPaneKey[paneKey] = {
@@ -689,7 +694,7 @@ describe('connectPanePty', () => {
       notifyStoreSubscribers()
       transport.sendInput.mockClear()
       sendTerminalInputThroughPane(pane, '\x1b[O')
-      expect(transport.sendInput).toHaveBeenCalledWith('\x1b[O')
+      expect(transport.sendInput).toHaveBeenCalledWith('\x1b[O', 'query-reply')
     } finally {
       restoreUserAgent()
     }
@@ -725,8 +730,8 @@ describe('connectPanePty', () => {
       sendTerminalInputThroughPane(pane, '\x1b[O')
       sendTerminalInputThroughPane(pane, '\x1b[I')
 
-      expect(transport.sendInput).toHaveBeenNthCalledWith(1, '\x1b[O')
-      expect(transport.sendInput).toHaveBeenNthCalledWith(2, '\x1b[I')
+      expect(transport.sendInput).toHaveBeenNthCalledWith(1, '\x1b[O', 'query-reply')
+      expect(transport.sendInput).toHaveBeenNthCalledWith(2, '\x1b[I', 'query-reply')
       expect(pane.terminal.modes.sendFocusMode).toBe(true)
     } finally {
       restoreUserAgent()
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts b/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
index 1eabdf990327..e8f8e7c1a087 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
@@ -91,8 +91,8 @@ export function createReattachPayloadHandlers(
             : daemonSnapshotReplay
         }`
       )
-      session.writeReplayData(
-        session.reattachReplayResetSequence(
+      session.writeReplayEpilogue(
+        session.chooseReattachReplayReset(
           daemonSnapshotReplay,
           Boolean(ctx.connectResult.coldRestore),
           ctx.connectResult.isAlternateScreen,
@@ -198,8 +198,8 @@ export function createReattachPayloadHandlers(
         })) {
           session.writeReplayData(replayChunk)
         }
-        session.writeReplayData(
-          session.reattachReplayResetSequence(
+        session.writeReplayEpilogue(
+          session.chooseReattachReplayReset(
             modelData,
             Boolean(ctx.connectResult?.coldRestore),
             modelSnapshot.alternateScreen ?? ctx.connectResult?.isAlternateScreen,
@@ -237,8 +237,8 @@ export function createReattachPayloadHandlers(
         session.writeReplayData(
           `${ctx.connectResult.coldRestore ? RESET_GRAPHIC_RENDITION : ''}${ctx.connectResult.replay}`
         )
-        session.writeReplayData(
-          session.reattachReplayResetSequence(
+        session.writeReplayEpilogue(
+          session.chooseReattachReplayReset(
             ctx.connectResult.replay,
             Boolean(ctx.connectResult.coldRestore),
             ctx.connectResult.isAlternateScreen
@@ -305,9 +305,7 @@ export function createReattachPayloadHandlers(
         session.clearSleepingRecordAfterColdRestoreSpawn(preparedStartup)
       }
       // Why: cold-restore spawned a fresh shell; reset mode bytes a crashed TUI (e.g. Claude's \e[?1004h) left in scrollback that no live TUI now consumes.
-      session.writeReplayData(POST_REPLAY_MODE_RESET)
-      // Why: the dead run's kitty flags died with it and its scrollback was never scanned — the fresh shell starts at zero.
-      session.kittyKeyboardModes.reset()
+      session.writeInputModeGround(POST_REPLAY_MODE_RESET)
       session.consumeRestoredViewportBlankingMarker()
       // Why: a taller destination fit must not pull recovered rows back into the fresh shell's viewport after source-grid replay.
       session.writeFreshShellViewportBlanking(Math.max(destinationRows, session.pane.terminal.rows))
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty-session.ts b/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty-session.ts
index c6a25e0d4618..417ccd812da1 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty-session.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty-session.ts
@@ -1,5 +1,6 @@
 import type { ManagedPane, PaneManager } from '@/lib/pane-manager/pane-manager'
 import type { PtyConnectionDeps } from '../pty-connection-types'
+import type { PtyTransport } from '../pty-transport-types'
 
 // Why: connectPanePty is a single closure factory. The bag lets extracted
 // installers share the same mutable bindings without changing call order.
@@ -7,6 +8,8 @@ export type ConnectPanePtySession = {
   pane: ManagedPane
   manager: PaneManager
   deps: PtyConnectionDeps
+  // Why typed: every PTY write must name its input kind, and the bag's `any` would hide a missing one.
+  transport: PtyTransport
   // oxlint-disable-next-line typescript/no-explicit-any -- session bag for mechanical extract
   [key: string]: any
 }
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts b/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts
index 663bb3b345b2..8c560ce30bd0 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts
@@ -114,10 +114,6 @@ export function connectPanePty(
   session.remoteOutputGatedPtyId = null
   session.remoteOutputFactConsumerPtyId = null
   session.suppressViewportClaimTerminalResize = false
-  // Why: idle callbacks are registered before the deferred PTY output plumbing
-  // exists. Start with the shared scheduler, then switch to the PTY writer
-  // below so hidden-tab resets keep backlog-recovery callbacks and byte order.
-  session.idleAgentTerminalModeReset = RESET_TERMINAL_CURSOR_STYLE
   session.suppressNativeWindowsIdleCodexFocusReports = false
   session.setFocusReportSuppressionForAgentCompletion = (
     title: string | undefined,
@@ -127,11 +123,14 @@ export function connectPanePty(
     session.suppressNativeWindowsIdleCodexFocusReports =
       agentType && agentType !== 'unknown' ? agentType === 'codex' : titleAgentType === 'codex'
   }
+  // Why: idle callbacks are registered before the deferred PTY output plumbing
+  // exists. Start with the shared scheduler, then switch to the PTY writer
+  // so hidden-tab resets keep backlog-recovery callbacks and byte order.
   session.queueAgentIdleTerminalModeReset = (): void => {
     if (session.disposed) {
       return
     }
-    writeTerminalOutput(session.pane.terminal, session.idleAgentTerminalModeReset, {
+    writeTerminalOutput(session.pane.terminal, RESET_TERMINAL_CURSOR_STYLE, {
       foreground: shouldWritePtyOutputForeground(session.deps.isVisibleRef.current)
     })
   }
@@ -162,16 +161,16 @@ export function connectPanePty(
   // Why: paneKey crosses PTY env, hook IPC, retained rows, and reload/replay.
   // Use the stable layout leaf UUID, not the renderer-local numeric pane id.
   session.cacheKey = makePaneKey(session.deps.tabId, session.pane.leafId)
-  // Why: mirrors the kitty keyboard flags the pane's application negotiates.
-  // Fed only from application output (live PTY bytes + daemon replay
-  // payloads), never from renderer-generated resets, so it reflects what the
-  // application expects even after defensive renderer-side kitty wipes.
+  // Why: xterm exposes no kitty read, so this mirror tracks the flags xterm's
+  // encoder applies; see TerminalKittyKeyboardModeTracker for its feeds.
   session.kittyKeyboardModes = (() => {
     const existing = session.deps.paneKittyKeyboardModesRef.current.get(session.pane.id)
     if (existing) {
       return existing
     }
-    const created = new TerminalKittyKeyboardModeTracker()
+    const created = new TerminalKittyKeyboardModeTracker({
+      kittyKeyboard: session.pane.terminal.options.vtExtensions?.kittyKeyboard === true
+    })
     session.deps.paneKittyKeyboardModesRef.current.set(session.pane.id, created)
     return created
   })()
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts b/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts
index 6c3a0628f797..f2a91feb98c8 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts
@@ -91,7 +91,7 @@ export function bindDeferredColdRestoreAndSnapshot(session: ConnectPanePtySessio
     if (result.status !== 'pasted' || !isStartupPasteTargetCurrent(ptyId)) {
       return false
     }
-    return session.transport.sendInput('\r')
+    return session.transport.sendInput('\r', 'launch')
   }
   session.schedulePendingStartupCommandDelivery = (): void => {
     const startup = session.pendingStartupCommand
@@ -116,7 +116,7 @@ export function bindDeferredColdRestoreAndSnapshot(session: ConnectPanePtySessio
         const command = startup.command
         const submitted = session.shouldDeliverStartupViaTerminalPaste
           ? await runTerminalPasteStartupCommand(command)
-          : session.transport.sendInput(`${command}\r`)
+          : session.transport.sendInput(`${command}\r`, 'launch')
         if (submitted) {
           session.armStartupDraftReadinessObservation()
         } else {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-choice.ts b/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-choice.ts
index f56f3c54f6cb..6d045232a367 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-choice.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-choice.ts
@@ -27,7 +27,10 @@ export function runDeferredSessionReattachChoice(session: ConnectPanePtySession)
   const existingPtyId = storeSnapshot.tabsByWorktree[session.deps.worktreeId]?.find(
     (t) => t.id === session.deps.tabId
   )?.ptyId
-  const hasSleepingAgentSession = Boolean(session.getSleepingRecordForPane(storeSnapshot))
+  // Why: the host owns a mirrored tab's agent liveness and answers it at connect; a client note must not divert its start.
+  const resumesFromSleepingNote =
+    !isWebTerminalSurfaceTabId(session.deps.tabId) &&
+    Boolean(session.getSleepingRecordForPane(storeSnapshot))
 
   // Why: the tab-level fallback must not steal a PTY a setup sibling already published while the main pane waited for split geometry.
   const tabFallbackPtyId =
@@ -41,7 +44,7 @@ export function runDeferredSessionReattachChoice(session: ConnectPanePtySession)
 
   const restoredSessionId = restoredPtyId ?? null
   const sleptRemoteRuntimeSessionId =
-    restoredSessionId && isRemoteRuntimePtyId(restoredSessionId) && hasSleepingAgentSession
+    restoredSessionId && isRemoteRuntimePtyId(restoredSessionId) && resumesFromSleepingNote
       ? restoredSessionId
       : null
   const detachedLivePtyId =
@@ -53,7 +56,7 @@ export function runDeferredSessionReattachChoice(session: ConnectPanePtySession)
         : tabFallbackPtyId
       : null
   const detachedRemoteLeafPtyId =
-    restoredSessionId && isRemoteRuntimePtyId(restoredSessionId) && !hasSleepingAgentSession
+    restoredSessionId && isRemoteRuntimePtyId(restoredSessionId) && !resumesFromSleepingNote
       ? restoredSessionId
       : null
   const candidateReattachSessionId =
@@ -171,7 +174,7 @@ export function runDeferredSessionReattachChoice(session: ConnectPanePtySession)
                 `Pending PTY spawn for tab ${session.deps.tabId} resolved without a PTY id, retrying fresh spawn`
               )
             }
-            if (sleptRemoteColdRestoreStartup || hasSleepingAgentSession) {
+            if (sleptRemoteColdRestoreStartup || resumesFromSleepingNote) {
               session.startFreshColdRestoreAgentResume(sleptRemoteColdRestoreStartup ?? undefined)
             } else {
               session.startFreshSpawn()
@@ -202,7 +205,7 @@ export function runDeferredSessionReattachChoice(session: ConnectPanePtySession)
         })
     } else {
       recordPtyConnectDiagnostic(`pane=${session.pane.id} -> FRESH SPAWN`)
-      if (sleptRemoteColdRestoreStartup || hasSleepingAgentSession) {
+      if (sleptRemoteColdRestoreStartup || resumesFromSleepingNote) {
         session.startFreshColdRestoreAgentResume(sleptRemoteColdRestoreStartup ?? undefined)
       } else {
         session.startFreshSpawn()
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-live-bookmark.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-live-bookmark.test.ts
new file mode 100644
index 000000000000..6f2b55aec244
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-live-bookmark.test.ts
@@ -0,0 +1,205 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { ConnectPanePtySession } from './connect-pane-pty-session'
+import { runDeferredSessionReattachChoice } from './deferred-session-reattach-choice'
+import type * as PairedParkedTerminalRestore from './paired-parked-terminal-restore'
+
+// Reproduction: a mirrored remote web-terminal pane whose host PTY is alive, with a periodic
+// origin:'live' crash-recovery bookmark, must attach to that PTY, not cold-restore a fresh agent.
+
+const TAB_ID = 'web-terminal-tab-1'
+const LEAF_ID = 'leaf-1'
+const ENV_ID = 'env-1'
+const REMOTE_PTY_ID = `remote:${ENV_ID}@@term_1`
+const WORKTREE_ID = 'repo-1::/workspaces/wt-1'
+
+const mocks = vi.hoisted(() => {
+  const state: Record<string, unknown> = {}
+  return { state, startDeferredSessionReattach: vi.fn(), canRestorePairedParked: false }
+})
+
+vi.mock('@/store', () => ({
+  useAppStore: { getState: () => mocks.state }
+}))
+vi.mock('@/runtime/sync-runtime-graph', () => ({ scheduleRuntimeGraphSync: vi.fn() }))
+vi.mock('../pty-dispatcher', () => ({ getEagerPtyBufferHandle: () => null }))
+vi.mock('./paired-parked-terminal-restore', async (importOriginal) => ({
+  ...(await importOriginal<typeof PairedParkedTerminalRestore>()),
+  canRestorePairedParkedTerminal: () => mocks.canRestorePairedParked
+}))
+vi.mock('./deferred-session-reattach-connect', () => ({
+  startDeferredSessionReattach: mocks.startDeferredSessionReattach
+}))
+
+const now = Date.UTC(2026, 8, 25)
+
+const codexLiveBookmark = {
+  worktreeId: WORKTREE_ID,
+  tabId: TAB_ID,
+  leafId: LEAF_ID,
+  agent: 'codex',
+  providerSession: { key: 'session_id', id: 'codex-conv-1' },
+  connectionId: null,
+  state: 'done',
+  origin: 'live',
+  capturedAt: now,
+  updatedAt: now,
+  launchConfig: { agentCommand: "codex '--dangerously-bypass-approvals-and-sandbox'" }
+}
+
+const claudeLiveBookmark = {
+  worktreeId: WORKTREE_ID,
+  tabId: TAB_ID,
+  leafId: LEAF_ID,
+  agent: 'claude',
+  providerSession: { key: 'session_id', id: 'claude-conv-1' },
+  connectionId: ENV_ID,
+  state: 'working',
+  origin: 'live',
+  capturedAt: now,
+  updatedAt: now
+}
+
+function setStore(sleepingRecord: Record<string, unknown> | null, tabId = TAB_ID): void {
+  const paneKey = `${tabId}:${LEAF_ID}`
+  mocks.state = {
+    tabsByWorktree: { [WORKTREE_ID]: [{ id: tabId, ptyId: REMOTE_PTY_ID }] },
+    ptyIdsByTabId: { [tabId]: [REMOTE_PTY_ID] },
+    sleepingAgentSessionsByPaneKey: sleepingRecord ? { [paneKey]: sleepingRecord } : {},
+    runtimeStatusByEnvironmentId: new Map()
+  }
+}
+
+function buildSession(
+  tabId = TAB_ID,
+  overrides: Record<string, unknown> = {}
+): ConnectPanePtySession {
+  const paneKey = `${tabId}:${LEAF_ID}`
+  let attachedPtyId: string | null = null
+  const transport = {
+    attach: vi.fn((opts: { existingPtyId: string }) => {
+      attachedPtyId = opts.existingPtyId
+    }),
+    getPtyId: () => attachedPtyId
+  }
+  const session = {
+    pane: { id: 1, leafId: LEAF_ID },
+    cacheKey: paneKey,
+    pendingSpawnKey: paneKey,
+    tabGeneration: 0,
+    transport,
+    cols: 80,
+    rows: 24,
+    disposed: false,
+    hadExistingPaneTransportAtConnect: false,
+    mountFollowsTerminalPark: false,
+    runtimeEnvironmentId: ENV_ID,
+    connectionId: null,
+    allowInitialIdleCacheSeed: true,
+    deps: {
+      tabId,
+      worktreeId: WORKTREE_ID,
+      restoredLeafId: LEAF_ID,
+      restoredPtyIdByLeafId: { [LEAF_ID]: REMOTE_PTY_ID },
+      paneTransportsRef: { current: new Map([[1, transport]]) },
+      clearTabPtyId: vi.fn()
+    },
+    // Mirrors installSleepingRecordAccess's stable-key lookup, which does not filter on origin.
+    getSleepingRecordForPane: (state: {
+      sleepingAgentSessionsByPaneKey: Record<string, unknown>
+    }) => {
+      const record = state.sleepingAgentSessionsByPaneKey[paneKey]
+      return record ? { paneKey, record } : null
+    },
+    buildColdRestoreAgentResumeStartup: vi.fn(() => ({ command: 'resume' })),
+    syncPanePtyLayoutBinding: vi.fn(),
+    clearPaneMode2031State: vi.fn(),
+    clearHiddenOutputRestoreState: vi.fn(),
+    captureTransportOutputCallbacks: vi.fn(() => ({ callbacks: {}, generation: 0 })),
+    bindActivePanePty: vi.fn(),
+    registerPaneSerializerFor: vi.fn(),
+    reportError: vi.fn(),
+    startFreshSpawn: vi.fn(),
+    startFreshColdRestoreAgentResume: vi.fn(),
+    armDirectSshPaneRetryTimeout: vi.fn(),
+    canAdoptCapturedDirectSshRetryPty: vi.fn(() => true),
+    ...overrides
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: test bag covers every member runDeferredSessionReattachChoice reads.
+  return session as unknown as ConnectPanePtySession
+}
+
+function expectAttachedToLiveRemotePty(session: ConnectPanePtySession): void {
+  expect(session.transport.attach).toHaveBeenCalledWith(
+    expect.objectContaining({ existingPtyId: REMOTE_PTY_ID })
+  )
+  expect(session.startFreshColdRestoreAgentResume).not.toHaveBeenCalled()
+  expect(session.startFreshSpawn).not.toHaveBeenCalled()
+  expect(session.deps.clearTabPtyId).not.toHaveBeenCalled()
+  expect(session.syncPanePtyLayoutBinding).not.toHaveBeenCalledWith(null)
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  mocks.canRestorePairedParked = false
+})
+
+describe('deferred reattach choice: mirrored remote pane with a live crash-recovery bookmark', () => {
+  it('attaches to the restored remote PTY when there is no sleeping note', () => {
+    setStore(null)
+    const session = buildSession()
+    runDeferredSessionReattachChoice(session)
+    expectAttachedToLiveRemotePty(session)
+    expect(mocks.startDeferredSessionReattach).not.toHaveBeenCalled()
+  })
+
+  it.each([
+    ['a done codex', codexLiveBookmark],
+    ['a working claude', claudeLiveBookmark]
+  ])('still attaches to the live remote PTY under %s live bookmark', (_label, record) => {
+    setStore(record)
+    const session = buildSession()
+    runDeferredSessionReattachChoice(session)
+    expectAttachedToLiveRemotePty(session)
+  })
+
+  // Why: the host owns a mirrored tab's liveness, so no client note may divert its start.
+  it.each(['worktree-sleep', 'quit'])(
+    'still attaches to the host PTY under a genuine %s sleep note',
+    (origin) => {
+      setStore({ ...codexLiveBookmark, origin })
+      const session = buildSession()
+      runDeferredSessionReattachChoice(session)
+      expectAttachedToLiveRemotePty(session)
+      expect(session.buildColdRestoreAgentResumeStartup).not.toHaveBeenCalled()
+    }
+  )
+
+  it('reattaches a parked-tab mount under a live note without clearing the binding', () => {
+    mocks.canRestorePairedParked = true
+    setStore(codexLiveBookmark)
+    const session = buildSession(TAB_ID, { mountFollowsTerminalPark: true })
+    runDeferredSessionReattachChoice(session)
+    expect(mocks.startDeferredSessionReattach).toHaveBeenCalledWith(session, REMOTE_PTY_ID)
+    expect(session.syncPanePtyLayoutBinding).not.toHaveBeenCalledWith(null)
+    expect(session.deps.clearTabPtyId).not.toHaveBeenCalled()
+    expect(session.startFreshColdRestoreAgentResume).not.toHaveBeenCalled()
+    expect(session.buildColdRestoreAgentResumeStartup).not.toHaveBeenCalled()
+  })
+})
+
+describe('deferred reattach choice: client-created runtime tab keeps its sleep note', () => {
+  it.each(['worktree-sleep', 'quit'])(
+    'takes the slept branch under a real %s sleep note',
+    (origin) => {
+      const tabId = 'client-tab-1'
+      setStore({ ...codexLiveBookmark, tabId, origin }, tabId)
+      const session = buildSession(tabId)
+      runDeferredSessionReattachChoice(session)
+      expect(session.transport.attach).not.toHaveBeenCalled()
+      expect(session.syncPanePtyLayoutBinding).toHaveBeenCalledWith(null)
+      expect(session.deps.clearTabPtyId).toHaveBeenCalledWith(tabId, REMOTE_PTY_ID)
+      expect(session.startFreshColdRestoreAgentResume).toHaveBeenCalledWith({ command: 'resume' })
+      expect(session.startFreshSpawn).not.toHaveBeenCalled()
+    }
+  )
+})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/direct-ssh-retry-status.ts b/src/renderer/src/components/terminal-pane/pty-connection/direct-ssh-retry-status.ts
index 474f730b2019..9264fa0d3750 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/direct-ssh-retry-status.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/direct-ssh-retry-status.ts
@@ -6,10 +6,6 @@ import {
   hasCachedWindowsTerminalCapabilities
 } from '@/lib/windows-terminal-capabilities'
 import { requestTerminalWritePipelineProbe } from '@/lib/pane-manager/terminal-write-pipeline-health'
-import {
-  RESET_KITTY_KEYBOARD_PROTOCOL,
-  RESET_TERMINAL_CURSOR_STYLE
-} from '../../../../../shared/terminal-mode-reset-profiles'
 import { subscribeToTerminalUserInput } from '../terminal-user-input-signal'
 import {
   isTerminalUserInputFromKeyboard,
@@ -90,11 +86,6 @@ export function installDirectSshRetryStatus(session: ConnectPanePtySession): voi
     ),
     executionHostId: session.executionHostId
   })
-  if (session.isNativeWindowsConpty) {
-    // Why: Windows ConPTY agent turns can leave renderer keyboard modes armed
-    // after completion, corrupting plain input with encoded bytes.
-    session.idleAgentTerminalModeReset = `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}`
-  }
   session.shouldApplyNativeWindowsRewriteRefresh = session.isNativeWindowsConpty
   session.shouldApplyWindowsRendererUnicodeRefresh = CLIENT_PLATFORM === 'win32'
   session.shouldProtectNativeWindowsSynchronizedOutput = session.isNativeWindowsConpty
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/empty-reattach-retire-evidence.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/empty-reattach-retire-evidence.test.ts
new file mode 100644
index 000000000000..086cfb820811
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-connection/empty-reattach-retire-evidence.test.ts
@@ -0,0 +1,84 @@
+import { describe, expect, it } from 'vitest'
+import {
+  hasEmptyReattachRetireEvidence,
+  isHibernationDoneRecord
+} from './empty-reattach-retire-evidence'
+import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session-resume'
+import type { ColdRestoreAgentResumeStartup } from './fresh-spawn-types'
+
+function note(overrides: Partial<SleepingAgentSessionRecord> = {}): SleepingAgentSessionRecord {
+  return {
+    paneKey: 'tab-1:leaf-1',
+    worktreeId: 'wt-1',
+    agent: 'codex',
+    providerSession: { key: 'session_id', id: 'conv-1' },
+    prompt: '',
+    state: 'done',
+    capturedAt: 1,
+    updatedAt: 1,
+    ...overrides
+  }
+}
+
+function resumeStartup(
+  record: SleepingAgentSessionRecord | null,
+  useLiveEntry = false
+): ColdRestoreAgentResumeStartup {
+  return {
+    command: 'codex resume conv-1',
+    agent: 'codex',
+    resumeProviderSession: { key: 'session_id', id: 'conv-1' },
+    launchConfig: { agentArgs: '', agentEnv: {} },
+    launchToken: 'token-1',
+    useLiveEntry,
+    hasSleepingRecord: record !== null,
+    sleepingRecordEntry: record ? { paneKey: record.paneKey, record } : null
+  }
+}
+
+const WORKTREE_SLEEP_DONE = note({ origin: 'worktree-sleep' })
+
+describe('isHibernationDoneRecord', () => {
+  it.each([
+    ['a legacy originless done note', true, note()],
+    ['a worktree-sleep done note', true, WORKTREE_SLEEP_DONE],
+    ['a live done note (the idle anchor of a running pane)', false, note({ origin: 'live' })],
+    [
+      'a live done note marked not interrupted',
+      false,
+      note({ origin: 'live', interrupted: false })
+    ],
+    ['a quit done note', false, note({ origin: 'quit' })],
+    [
+      'a worktree-sleep note still working',
+      false,
+      note({ origin: 'worktree-sleep', state: 'working' })
+    ]
+  ])('%s -> %s', (_label, expected, record) => {
+    expect(isHibernationDoneRecord(record)).toBe(expected)
+  })
+})
+
+describe('hasEmptyReattachRetireEvidence', () => {
+  it.each([
+    ['a local pty', 'local-pty-1'],
+    ['a local daemon session id', 'wt-1@@daemon-session-1']
+  ])('retires %s under a hibernation done note', (_label, ptyId) => {
+    expect(hasEmptyReattachRetireEvidence(ptyId, resumeStartup(WORKTREE_SLEEP_DONE))).toBe(true)
+  })
+
+  it('never retires a remote runtime pty, whose disconnect leaves the host PTY alive', () => {
+    expect(
+      hasEmptyReattachRetireEvidence('remote:env-1@@term_1', resumeStartup(WORKTREE_SLEEP_DONE))
+    ).toBe(false)
+  })
+
+  it.each([
+    ['no resume startup', undefined],
+    ['a startup resuming the live entry', resumeStartup(WORKTREE_SLEEP_DONE, true)],
+    ['a startup without a sleeping note', resumeStartup(null)],
+    ['a live done note', resumeStartup(note({ origin: 'live' }))]
+  ])('keeps a local pty with %s', (_label, startup) => {
+    expect(hasEmptyReattachRetireEvidence('local-pty-1', startup)).toBe(false)
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/empty-reattach-retire-evidence.ts b/src/renderer/src/components/terminal-pane/pty-connection/empty-reattach-retire-evidence.ts
new file mode 100644
index 000000000000..eaa7638df6fe
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-connection/empty-reattach-retire-evidence.ts
@@ -0,0 +1,22 @@
+import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session-resume'
+import type { ColdRestoreAgentResumeStartup } from './fresh-spawn-types'
+import { isRemoteRuntimePtyId } from './paired-parked-terminal-restore'
+
+// Why not activationTreatsNoteAsFinished: a live+done note is a finished turn's idle anchor for a running pane, not sleep.
+export function isHibernationDoneRecord(record: SleepingAgentSessionRecord): boolean {
+  return (
+    (record.origin === undefined || record.origin === 'worktree-sleep') && record.state === 'done'
+  )
+}
+
+// Why: never remote, where disconnect() only closes this viewer's stream, so the retry re-lands on the same live PTY and loops.
+export function hasEmptyReattachRetireEvidence(
+  ptyId: string,
+  coldRestoreStartup: ColdRestoreAgentResumeStartup | null | undefined
+): boolean {
+  const record =
+    coldRestoreStartup && !coldRestoreStartup.useLiveEntry
+      ? coldRestoreStartup.sleepingRecordEntry?.record
+      : undefined
+  return !isRemoteRuntimePtyId(ptyId) && record !== undefined && isHibernationDoneRecord(record)
+}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/foreground-output-refresh.ts b/src/renderer/src/components/terminal-pane/pty-connection/foreground-output-refresh.ts
index dff163f81d8c..9c1b45051bed 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/foreground-output-refresh.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/foreground-output-refresh.ts
@@ -151,6 +151,7 @@ export function bindForegroundOutputRefresh(session: ConnectPanePtySession): voi
       session.hiddenDeliverySyncedPtyId = null
     }
     if (
+      !ptyId ||
       !session.isHiddenDeliveryGateManagedPty(ptyId) ||
       !session.canUseHiddenOutputSnapshot(ptyId)
     ) {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-follow-reset.ts b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-follow-reset.ts
index 83ab2e3f478a..cb553ebc7deb 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-follow-reset.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-follow-reset.ts
@@ -5,7 +5,8 @@ import {
   POST_REPLAY_DEAD_TUI_RESET,
   POST_REPLAY_MODE_RESET,
   POST_REPLAY_REATTACH_RESET,
-  POST_REPLAY_REATTACH_RESET_KEEP_MOUSE
+  POST_REPLAY_REATTACH_RESET_KEEP_MOUSE,
+  buildKittyKeyboardRestore
 } from '../../../../../shared/terminal-mode-reset-profiles'
 import { buildFreshShellViewportBlankingSequence } from '../terminal-restored-viewport'
 import { flushTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
@@ -129,7 +130,29 @@ export function bindFreshSpawnFollowReset(session: ConnectPanePtySession): void
     })
   }
 
-  session.reattachReplayResetSequence = (
+  // Why one writer: the kitty mirror and xterm must parse every renderer-originated mode byte alike.
+  session.writeInputModeGround = (data: string): void => {
+    session.kittyKeyboardModes.scan(data)
+    session.writeReplayData(data)
+  }
+
+  /**
+   * Writes a post-replay reset ending in the mirror's Kitty flags, through the
+   * mirror first. The restore is built after scanning the profile because its
+   * `?1049l` moves both records to the other screen's slot.
+   */
+  session.writeReplayEpilogue = <T>(
+    profile: string,
+    write: (data: string) => T = session.writeReplayData
+  ): T => {
+    session.kittyKeyboardModes.scan(profile)
+    const kitty = buildKittyKeyboardRestore(session.kittyKeyboardModes.snapshotFlags)
+    session.kittyKeyboardModes.scan(kitty)
+    return write(`${profile}${kitty}`)
+  }
+
+  /** Picks the post-replay reset profile for a reattach; the caller writes it via writeReplayEpilogue. */
+  session.chooseReattachReplayReset = (
     payload: string,
     ownerProcessEnded = false,
     isAlternateScreen?: boolean,
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts
index 29bc438a01cd..b260adcccb8c 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts
@@ -1,4 +1,5 @@
 import { useAppStore } from '@/store'
+import { PROCESS_BOUNDARY_GROUND } from '../../../../../shared/terminal-mode-reset-profiles'
 import { hasPtySerializer } from '../pty-buffer-serializer'
 import { writeTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
 
@@ -52,11 +53,9 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
     // Why: a canceled old replay clear can preserve xterm's native
     // isUserScrolling flag. A replacement shell must start in follow mode.
     session.resetFreshSpawnFollowOutput()
-    // Why: a fresh spawn is a new process with kitty keyboard flags at
-    // zero. The exit-handler reset alone is not enough: a late exit from a
-    // replaced PTY takes the stale-transport early return and skips it, so
-    // a restart-in-place would leak the old TUI's flags into a fresh shell.
-    session.kittyKeyboardModes.reset()
+    // Why: a fresh spawn is a new process, so a restart-in-place must not
+    // inherit the old TUI's screen, mouse or kitty modes in xterm or the mirror.
+    session.writeInputModeGround(PROCESS_BOUNDARY_GROUND)
     session.prepareFreshShellViewportForSpawn(options)
     const coldRestoreOverride =
       startupOverride && 'launchConfig' in startupOverride
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/hidden-output-restore-abandon.ts b/src/renderer/src/components/terminal-pane/pty-connection/hidden-output-restore-abandon.ts
index 3d08e5d495b4..3e30289c2f68 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/hidden-output-restore-abandon.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/hidden-output-restore-abandon.ts
@@ -1,4 +1,3 @@
-import { RESET_AFTER_BYTE_GAP } from '../../../../../shared/terminal-mode-reset-profiles'
 import { cancelScheduledHiddenOutputRestore } from '../hidden-output-restore-scheduler'
 
 import type { ConnectPanePtySession } from './connect-pane-pty-session'
@@ -62,7 +61,7 @@ export function bindAbandonHiddenOutputRestore(session: ConnectPanePtySession):
     // session.rearmRemoteHiddenOutputRestoreInsteadOfWarning. Only the quiet
     // flood-abandon reaches neither, and it still drains chunks below.
     else if (!rearmedRemoteRestore) {
-      session.writePtyOutputToXterm(RESET_AFTER_BYTE_GAP, true)
+      session.writeAbandonedRestoreGap()
     }
     if (hadPendingOverflow) {
       return
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/hidden-output-restore-drain.ts b/src/renderer/src/components/terminal-pane/pty-connection/hidden-output-restore-drain.ts
index 1705fbe2cdf3..ea4c48f43f29 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/hidden-output-restore-drain.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/hidden-output-restore-drain.ts
@@ -1,6 +1,5 @@
 import { recordTerminalFreezeBreadcrumb } from '../terminal-freeze-breadcrumbs'
 import { redactPtyIdForDiagnostics } from '../../../../../shared/pty-delivery-diagnostics'
-import { RESET_AFTER_BYTE_GAP } from '../../../../../shared/terminal-mode-reset-profiles'
 import { cancelScheduledHiddenOutputRestore } from '../hidden-output-restore-scheduler'
 import { isRemoteExecutionHostPtyId } from '../remote-execution-host-pty'
 
@@ -173,7 +172,7 @@ export function bindHiddenOutputRestoreDrain(session: ConnectPanePtySession): vo
       cycle: session.hiddenOutputRestoreRemoteAbandonCycles
     })
     session.noteHiddenOutputRestoreFloodBackpressure()
-    session.writePtyOutputToXterm(RESET_AFTER_BYTE_GAP, true)
+    session.writeAbandonedRestoreGap()
     return true
   }
 }
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/hidden-output-restore-snapshot.ts b/src/renderer/src/components/terminal-pane/pty-connection/hidden-output-restore-snapshot.ts
index 450fdd799db0..e895128b280d 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/hidden-output-restore-snapshot.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/hidden-output-restore-snapshot.ts
@@ -6,7 +6,8 @@ import {
   POST_REPLAY_LIVE_SNAPSHOT_RESET,
   POST_REPLAY_DEAD_TUI_RESET,
   POST_REPLAY_REATTACH_RESET,
-  RESET_AFTER_BYTE_GAP
+  RESET_AFTER_BYTE_GAP,
+  buildKittyKeyboardRestore
 } from '../../../../../shared/terminal-mode-reset-profiles'
 import {
   discardTerminalOutput,
@@ -30,9 +31,18 @@ import { recordTerminalFreezeBreadcrumb } from '../terminal-freeze-breadcrumbs'
 import type { ConnectPanePtySession } from './connect-pane-pty-session'
 
 export function bindHiddenOutputRestoreSnapshot(session: ConnectPanePtySession): void {
+  // Why the kitty restore: an abandoned restore discards queued chunks the
+  // mirror already scanned, so xterm re-adopts the mirror's flags.
+  session.writeAbandonedRestoreGap = function (): void {
+    session.writePtyOutputToXterm(
+      `${RESET_AFTER_BYTE_GAP}${buildKittyKeyboardRestore(session.kittyKeyboardModes.snapshotFlags)}`,
+      true
+    )
+  }
+
   session.writeRestoreUnavailableWarning = function (): void {
     // The reset must parse before both the warning and any foreground drain.
-    session.writePtyOutputToXterm(RESET_AFTER_BYTE_GAP, true)
+    session.writeAbandonedRestoreGap()
     if (!shouldWritePtyOutputForeground(session.deps.isVisibleRef.current)) {
       return
     }
@@ -156,7 +166,7 @@ export function bindHiddenOutputRestoreSnapshot(session: ConnectPanePtySession):
               : hasLiveAgent
                 ? POST_REPLAY_LIVE_AGENT_SNAPSHOT_RESET
                 : POST_REPLAY_LIVE_SNAPSHOT_RESET
-          session.writeReplayData(postReplayReset)
+          session.writeReplayEpilogue(postReplayReset)
           if (snapshot.pendingEscapeTailAnsi) {
             // Why last: snapshot taken mid-escape; re-arm as the FINAL replay write (any later ESC aborts it) so the live tail completes it, not render literally (Bug E / #7329).
             session.writeReplayData(snapshot.pendingEscapeTailAnsi)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts b/src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts
index 19cd7cc374bd..2c86932c499d 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts
@@ -1,8 +1,7 @@
 import { agentTypeToIconAgent } from '@/lib/agent-status'
 import { useAppStore } from '@/store'
 import { getConnectionId } from '@/lib/connection-context'
-import { replayIntoTerminal } from '../replay-guard'
-import { POST_REPLAY_REATTACH_RESET } from '../../../../../shared/terminal-mode-reset-profiles'
+import { CONFIRMED_SHELL_MODE_RESET } from '../../../../../shared/terminal-mode-reset-profiles'
 import {
   isLocalNativeWindowsConpty,
   resolveWindowsShellOverride
@@ -181,14 +180,7 @@ export function installPaneAgentIdentity(session: ConnectPanePtySession): void {
       // Why: a hard-killed agent leaves mouse/focus/kitty modes armed, and the
       // surviving shell then receives pointer moves as typed SGR reports; the
       // replay guard keeps xterm's auto-replies from leaking to the shell.
-      replayIntoTerminal(session.pane, session.deps.replayingPanesRef, POST_REPLAY_REATTACH_RESET, {
-        breadcrumbIdentity: {
-          tabId: session.deps.tabId,
-          worktreeId: session.deps.worktreeId,
-          ptyId: session.transport.getPtyId()
-        },
-        shouldRefreshViewportSynchronously: session.shouldRefreshForegroundSynchronously
-      })
+      session.writeInputModeGround(CONFIRMED_SHELL_MODE_RESET)
       if (reason === 'visible-pty') {
         state.clearAgentLaunchConfig(session.cacheKey)
         return
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-register.ts b/src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-register.ts
index b4a953ef5b5e..2b75548ec393 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-register.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-register.ts
@@ -1,3 +1,4 @@
+import { buildProcessBoundaryGround } from '../../../../../shared/terminal-mode-reset-profiles'
 import { serializeWithAbsoluteCursor } from '../../../../../shared/terminal-serialize-absolute-cursor'
 import { isTerminalWritePipelineCertifiedDead } from '@/lib/pane-manager/terminal-write-pipeline-health'
 import { registerPtySerializer, registerPtyTitleSource } from '../pty-buffer-serializer'
@@ -72,10 +73,16 @@ export function bindRegisterPaneSerializer(session: ConnectPanePtySession): void
           return null
         }
       },
-      () => {
-        session.clearHiddenOutputRestoreState()
-        discardTerminalOutput(session.pane.terminal)
-        clearTerminalScrollbackAndFollowOutput(session.pane.terminal)
+      {
+        clear: () => {
+          session.clearHiddenOutputRestoreState()
+          discardTerminalOutput(session.pane.terminal)
+          clearTerminalScrollbackAndFollowOutput(session.pane.terminal)
+        },
+        resetInputModes: () =>
+          session.writeInputModeGround(
+            buildProcessBoundaryGround({ keepFocusReporting: session.isNativeWindowsConpty })
+          )
       }
     )
     const unregisterTitleSource = registerPtyTitleSource(ptyId, (handler) =>
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-settle.ts b/src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-settle.ts
index 9ca1202e9b1b..8015e49dd11f 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-settle.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-settle.ts
@@ -122,16 +122,22 @@ export function bindSettlePaneSerializer(session: ConnectPanePtySession): void {
     )
     // Why: xterm focus reports share this transport queue. Bypassing it can
     // race CSI I against the draft on ConPTY and expose a literal `[I` prefix.
-    void sendAgentDraftPasteContent(settings, ptyId, session.startupDraftPrompt, async (data) => {
-      const accepted = await writeTerminalPastePtyInput(session.transport, data)
-      if (accepted && !startupDraftInputRecorded) {
-        // Why: this transport write bypasses xterm's user-input signal; keep
-        // the composed draft from being discarded by later hibernation.
-        startupDraftInputRecorded = true
-        session.recordTerminalInputForHibernation()
+    void sendAgentDraftPasteContent(
+      settings,
+      ptyId,
+      session.startupDraftPrompt,
+      'launch',
+      async (data) => {
+        const accepted = await writeTerminalPastePtyInput(session.transport, data, 'launch')
+        if (accepted && !startupDraftInputRecorded) {
+          // Why: this transport write bypasses xterm's user-input signal; keep
+          // the composed draft from being discarded by later hibernation.
+          startupDraftInputRecorded = true
+          session.recordTerminalInputForHibernation()
+        }
+        return accepted
       }
-      return accepted
-    })
+    )
       .catch(() => false)
       .finally(() => {
         startupDraftPasteInFlight = false
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.test.ts
new file mode 100644
index 000000000000..5bd07b591418
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.test.ts
@@ -0,0 +1,40 @@
+import { describe, expect, it } from 'vitest'
+import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session-resume'
+import { noteArmsHibernatedPaneWake } from './pty-exit-hibernate'
+
+function note(overrides: Partial<SleepingAgentSessionRecord> = {}): SleepingAgentSessionRecord {
+  return {
+    paneKey: 'tab-1:leaf-1',
+    worktreeId: 'wt-1',
+    agent: 'codex',
+    providerSession: { key: 'session_id', id: 'conv-1' },
+    prompt: '',
+    state: 'done',
+    capturedAt: 1,
+    updatedAt: 1,
+    ...overrides
+  }
+}
+
+describe('noteArmsHibernatedPaneWake', () => {
+  it.each([
+    ['a hibernation note (worktree-sleep done)', true, note({ origin: 'worktree-sleep' })],
+    ['a legacy originless done note', true, note()],
+    // Why: #16308's incidental widening, kept; pty-connection-hibernation-wake.test.ts pins its effect.
+    ['a finished turn idle anchor (live done)', true, note({ origin: 'live' })],
+    ['an interrupted live turn', false, note({ origin: 'live', interrupted: true })],
+    [
+      'a failed live turn',
+      false,
+      note({ origin: 'live', mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: 1 } })
+    ],
+    ['a quit capture', false, note({ origin: 'quit' })],
+    [
+      'a manual-sleep note still working',
+      false,
+      note({ origin: 'worktree-sleep', state: 'working' })
+    ]
+  ])('%s -> %s', (_label, expected, record) => {
+    expect(noteArmsHibernatedPaneWake(record)).toBe(expected)
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts b/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
index cdf4b869b124..98315f2ca6f8 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
@@ -6,13 +6,11 @@ import {
   deferPtyShutdownExit,
   isHostPtySleepPending
 } from '../pty-shutdown-exit-deferral'
-import { replayIntoTerminal } from '../replay-guard'
 import { POST_REPLAY_MODE_RESET } from '../../../../../shared/terminal-mode-reset-profiles'
 import { isProvenProcessExit } from '../../../../../shared/terminal-exit-cause'
-import {
-  getProviderSessionClaimKey,
-  isPassiveCompletedHibernationEvidence
-} from '@/lib/sleeping-agent-pane-ownership'
+import { getProviderSessionClaimKey } from '@/lib/sleeping-agent-pane-ownership'
+import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session-resume'
+import { agentTurnEndedUncleanly } from '../../../../../shared/agent-main-agent-verdict'
 import {
   createGitBashConsoleCapacityDetector,
   type GitBashConsoleCapacityDetector
@@ -22,6 +20,15 @@ import type { PtyPaneStartup } from '../pty-connection-types'
 import type { ConnectPanePtySession } from './connect-pane-pty-session'
 import { isPtyExitReplacedByRestart } from '../pty-exit-delivery'
 
+// Why live+done arms too: kept from #16308's wake-sweep widening; hibernation itself only writes worktree-sleep notes.
+export function noteArmsHibernatedPaneWake(record: SleepingAgentSessionRecord): boolean {
+  return (
+    record.state === 'done' &&
+    record.origin !== 'quit' &&
+    !(record.origin === 'live' && agentTurnEndedUncleanly(record))
+  )
+}
+
 /** PTY exit handling, hibernated-pane wake targets, and post-exit focus transfer. */
 export function installPtyExitHibernate(session: ConnectPanePtySession): void {
   type ProcessExitState = {
@@ -217,9 +224,6 @@ export function installPtyExitHibernate(session: ConnectPanePtySession): void {
     if (!isUnverifiedExit) {
       session.clearPanePtyFitBinding()
     }
-    // Why: the negotiating application died with its PTY; any replacement
-    // session starts with kitty keyboard flags at zero.
-    session.kittyKeyboardModes.reset()
     const isSuppressedExit =
       session.deps.consumeSuppressedPtyExit(ptyId) ||
       preserveRendererBinding ||
@@ -259,22 +263,12 @@ export function installPtyExitHibernate(session: ConnectPanePtySession): void {
       // is a wake hint or should be discarded; runtime cleanup above is enough.
       session.manager.setPaneGpuRendering(session.pane.id, true)
       const sleepingRecordEntry = session.getSleepingRecordForPane(useAppStore.getState())
-      if (
-        sleepingRecordEntry &&
-        isPassiveCompletedHibernationEvidence(sleepingRecordEntry.record)
-      ) {
+      if (sleepingRecordEntry && noteArmsHibernatedPaneWake(sleepingRecordEntry.record)) {
         // Why: hibernation killed this pane's PTY while hidden. The frozen TUI
         // frame still has mouse-tracking/bracketed-paste armed, which silently
         // eats every click and keystroke against a dead transport — disarm the
         // modes now and arm the reveal-time wake.
-        replayIntoTerminal(session.pane, session.deps.replayingPanesRef, POST_REPLAY_MODE_RESET, {
-          breadcrumbIdentity: {
-            tabId: session.deps.tabId,
-            worktreeId: session.deps.worktreeId,
-            ptyId
-          },
-          shouldRefreshViewportSynchronously: session.shouldRefreshForegroundSynchronously
-        })
+        session.writeInputModeGround(POST_REPLAY_MODE_RESET)
         session.hibernatedWakeTarget = { ptyId, record: sleepingRecordEntry.record }
         const pendingWakeMatches =
           session.pendingHibernatedWakeTarget?.ptyId === ptyId &&
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pty-input-forward.ts b/src/renderer/src/components/terminal-pane/pty-connection/pty-input-forward.ts
index 6ff7c2444433..aad2384bb278 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pty-input-forward.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pty-input-forward.ts
@@ -100,6 +100,8 @@ export function installPtyInputForward(session: ConnectPanePtySession): void {
       session.clearPendingTerminalInputIntent()
       return
     }
+    // Why xterm's provenance: its own focus reports reach onData too, and no person typed them.
+    const inputKind = wasUserInput ? 'driving' : 'query-reply'
     const intent = session.pendingTerminalInputIntent
     // Why: real xterm can deliver the terminal byte even when our DOM keydown
     // listener missed the press. Exact Ctrl+C/Escape bytes are still safe to
@@ -123,7 +125,7 @@ export function installPtyInputForward(session: ConnectPanePtySession): void {
       }
       session.clearPendingTerminalInputIntent()
       const writePromise = session.transport
-        .sendInputAccepted(data)
+        .sendInputAccepted(data, inputKind)
         .then((accepted): boolean | Promise<boolean> | null => {
           if (accepted) {
             // Why: rejected writes use transport recovery and must not arm a parser probe.
@@ -152,7 +154,7 @@ export function installPtyInputForward(session: ConnectPanePtySession): void {
     }
     if (intent) {
       session.claimViewportForUserActivity()
-      if (session.transport.sendInput(data)) {
+      if (session.transport.sendInput(data, inputKind)) {
         session.markAcceptedTerminalInputSent()
         session.observeAcceptedShellCommandInput(data)
         session.observeAcceptedTerminalInput(data, intent)
@@ -163,7 +165,7 @@ export function installPtyInputForward(session: ConnectPanePtySession): void {
       return
     }
     session.claimViewportForUserActivity()
-    if (session.transport.sendInput(data)) {
+    if (session.transport.sendInput(data, inputKind)) {
       session.markAcceptedTerminalInputSent()
       session.observeAcceptedShellCommandInput(data)
       session.observeAcceptedTerminalInput(data)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts
index de3ee9011a8a..46d2d41982dc 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts
@@ -10,11 +10,14 @@ import type { ReattachPayloadContext } from './reattach-payload-context'
 import type { ReattachPayloadSession } from './reattach-payload-session'
 
 function createSession(overrides: Record<string, unknown> = {}): ReattachPayloadSession {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the handlers under test read only these session members.
   return {
     pane: createPane(1),
     rememberReattachPayloadAgentSignal: vi.fn(),
     writeReplayData: vi.fn(),
-    reattachReplayResetSequence: vi.fn(() => '<reset>'),
+    writeInputModeGround: vi.fn(),
+    chooseReattachReplayReset: vi.fn(() => '<reset>'),
+    writeReplayEpilogue: vi.fn(),
     sendFocusedReattachFocusInAfterReplay: vi.fn(),
     kittyKeyboardModes: {
       hasProvenBaseline: true,
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-session.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-session.ts
index c9d53a56b54c..b4c963d29f48 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-session.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-session.ts
@@ -5,6 +5,7 @@ export type ReattachPayloadSession = Pick<
   | 'applyColdRestoreAgentResumeStartup'
   | 'applySnapshotKittyKeyboardModes'
   | 'buildColdRestoreAgentResumeStartup'
+  | 'chooseReattachReplayReset'
   | 'clearSleepingRecordAfterColdRestoreSpawn'
   | 'consumeRestoredViewportBlankingMarker'
   | 'createReattachGridPush'
@@ -13,7 +14,6 @@ export type ReattachPayloadSession = Pick<
   | 'markHiddenOutputRestoreNeeded'
   | 'pane'
   | 'pendingReattachFit'
-  | 'reattachReplayResetSequence'
   | 'recordRendererOrderedSeq'
   | 'rememberReattachPayloadAgentSignal'
   | 'schedulePendingStartupCommandDelivery'
@@ -24,5 +24,7 @@ export type ReattachPayloadSession = Pick<
   | 'suppressStructuralReplayPtyResize'
   | 'transport'
   | 'writeFreshShellViewportBlanking'
+  | 'writeInputModeGround'
+  | 'writeReplayEpilogue'
   | 'writeReplayData'
 >
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-ssh-reconnect-model-paint.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-ssh-reconnect-model-paint.test.ts
index 68782e666f66..bf14e261b2be 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-ssh-reconnect-model-paint.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-ssh-reconnect-model-paint.test.ts
@@ -36,11 +36,13 @@ function createSession(
   fireLog: FireLog,
   overrides: Record<string, unknown> = {}
 ): ReattachPayloadSession {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the handlers under test read only these session members.
   return {
     pane: createPane(1),
     rememberReattachPayloadAgentSignal: vi.fn(),
     writeReplayData: vi.fn((data: string) => fireLog.push(`write:${data}`)),
-    reattachReplayResetSequence: vi.fn(() => '<reset>'),
+    chooseReattachReplayReset: vi.fn(() => '<reset>'),
+    writeReplayEpilogue: vi.fn((profile: string) => fireLog.push(`write:${profile}`)),
     sendFocusedReattachFocusInAfterReplay: vi.fn(),
     applySnapshotKittyKeyboardModes: vi.fn(() => fireLog.push('kitty:snapshot-baseline')),
     setRestoredSnapshotBaseline: vi.fn(),
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts
index 86237ac8f214..addf17ba8e86 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts
@@ -4,6 +4,7 @@ import { bindSerializeHiddenOutputSnapshot } from './hidden-output-snapshot-seri
 import type { ConnectPanePtySession } from './connect-pane-pty-session'
 import type { HiddenOutputSnapshotResult } from './hidden-output-snapshot-serialize'
 import type { ReattachPayloadContext } from './reattach-payload-context'
+import type { ColdRestoreAgentResumeStartup } from './fresh-spawn-types'
 
 /**
  * A park-reveal of a remote-runtime pty arrives with `replay: ''`, so the host
@@ -333,3 +334,64 @@ describe('handleReattachResult park-reveal snapshot verdict', () => {
     expect(bag.retryUnverifiableParkRevealSnapshot).toHaveBeenCalledOnce()
   })
 })
+
+// Retiring an empty reattach converges only locally: a remote disconnect() closes this viewer's
+// stream, so the resume would re-land on the same live host PTY and loop.
+describe('handleReattachResult empty reattach under a hibernation note', () => {
+  const record = {
+    paneKey: 'tab-1:leaf-1',
+    worktreeId: 'wt-1',
+    agent: 'codex',
+    providerSession: { key: 'session_id', id: 'conv-1' },
+    prompt: '',
+    state: 'done',
+    origin: 'worktree-sleep',
+    capturedAt: 1,
+    updatedAt: 1
+  } as const
+  const startup: ColdRestoreAgentResumeStartup = {
+    command: 'codex resume conv-1',
+    agent: 'codex',
+    resumeProviderSession: record.providerSession,
+    launchConfig: { agentArgs: '', agentEnv: {} },
+    launchToken: 'token-1',
+    useLiveEntry: false,
+    hasSleepingRecord: true,
+    sleepingRecordEntry: { paneKey: record.paneKey, record }
+  }
+
+  // The wake-hint row passes a non-remote stale id: only the result's remote id may decide.
+  it.each([
+    ['a fresh-spawn adoption', false, null],
+    ['a paired-parked reveal', true, REMOTE_PTY_ID],
+    ['a host wake-hint reattach', false, 'term_1']
+  ])('keeps the live remote PTY on %s', async (_label, mountFollowsTerminalPark, staleId) => {
+    const bag = buildParkRevealSession({
+      mountFollowsTerminalPark,
+      serializeHiddenOutputSnapshot: probeAnswers({ kind: 'snapshot', snapshot: HOST_IMAGE })
+    })
+
+    await expect(
+      bag.session.handleReattachResult(PARK_REVEAL_RESULT, staleId, startup)
+    ).resolves.toBe(true)
+
+    expect(bag.transport.disconnect).not.toHaveBeenCalled()
+    expect(bag.session.startFreshColdRestoreAgentResume).not.toHaveBeenCalled()
+    expect(bag.session.setPanePtyFitBinding).toHaveBeenCalledWith(REMOTE_PTY_ID)
+  })
+
+  it('retires an empty local fresh-spawn adoption and resumes the provider session', async () => {
+    const bag = buildParkRevealSession({ mountFollowsTerminalPark: false })
+
+    await expect(
+      bag.session.handleReattachResult({ id: 'local-pty-1', isReattach: true }, null, startup)
+    ).resolves.toBe(false)
+
+    expect(bag.transport.disconnect).toHaveBeenCalledOnce()
+    expect(bag.session.syncPanePtyLayoutBinding).toHaveBeenCalledWith(null)
+    expect(bag.session.startFreshColdRestoreAgentResume).toHaveBeenCalledExactlyOnceWith(startup, {
+      forceBlankRestoredViewport: true
+    })
+    expect(bag.session.setPanePtyFitBinding).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts
index 25e5445a417a..f141b6719529 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts
@@ -5,12 +5,12 @@ import { warnTerminalLifecycleAnomaly } from '../terminal-lifecycle-diagnostics'
 // actually attached — nothing is inspectable while the session hydrates.
 import { notifyCodexPaneBoundForStaleSweep } from '@/lib/codex-stale-pane-sweep'
 import { useAppStore } from '@/store'
-import { isPassiveCompletedHibernationEvidence } from '@/lib/sleeping-agent-pane-ownership'
 import { parseAppSshPtyId } from '../../../../../shared/ssh-pty-id'
 import { resolveHiddenRestoreScrollbackRows } from '../terminal-hidden-restore-scrollback'
 import { shouldIgnoreStalePanePtyLayoutBinding } from './pane-pty-layout-binding'
 
 import { isRemoteRuntimePtyId } from './paired-parked-terminal-restore'
+import { hasEmptyReattachRetireEvidence } from './empty-reattach-retire-evidence'
 import type { ColdRestoreAgentResumeStartup } from './fresh-spawn-types'
 
 import type { ConnectPanePtySession } from './connect-pane-pty-session'
@@ -187,14 +187,12 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
     const hasStructuralReplay = Boolean(
       connectResult?.snapshot || connectResult?.replay || connectResult?.coldRestore
     )
-    const resumeComesFromPassiveHibernation = Boolean(
-      coldRestoreStartup &&
-      !coldRestoreStartup.useLiveEntry &&
-      coldRestoreStartup.sleepingRecordEntry &&
-      isPassiveCompletedHibernationEvidence(coldRestoreStartup.sleepingRecordEntry.record)
-    )
-    // Why: reattach drops startup commands; only passive hibernation is authority to retire an empty adopted shell and resume its provider session.
-    if (!hasStructuralReplay && connectResult?.isReattach && resumeComesFromPassiveHibernation) {
+    // Why: reattach drops startup commands; only real hibernation is authority to retire an empty adopted shell and resume its provider session.
+    if (
+      !hasStructuralReplay &&
+      connectResult?.isReattach &&
+      hasEmptyReattachRetireEvidence(ptyId, coldRestoreStartup)
+    ) {
       session.transport.disconnect()
       if (staleSessionId) {
         session.clearExitedPanePtyLayoutBinding(staleSessionId)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/replay-data-drain.ts b/src/renderer/src/components/terminal-pane/pty-connection/replay-data-drain.ts
index 81ac85ed752d..087326d0f400 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/replay-data-drain.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/replay-data-drain.ts
@@ -63,7 +63,7 @@ export function bindReplayDataDrain(session: ConnectPanePtySession): void {
       if (!session.shouldSendFocusedAgentReattachFocusIn() || !sendFocusMode) {
         return
       }
-      session.transport.sendInput(TERMINAL_FOCUS_IN_SEQUENCE)
+      session.transport.sendInput(TERMINAL_FOCUS_IN_SEQUENCE, 'query-reply')
     })
   }
 
@@ -158,8 +158,9 @@ export function bindReplayDataDrain(session: ConnectPanePtySession): void {
         continue
       }
       if (clearBeforeReplay || data.length > 0) {
-        await session.writeReplayDataAsync(
-          session.reattachReplayResetSequence(data, false, alternateScreen, terminalOwner)
+        await session.writeReplayEpilogue(
+          session.chooseReattachReplayReset(data, false, alternateScreen, terminalOwner),
+          session.writeReplayDataAsync
         )
         if (!isCurrentPayload()) {
           continue
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/session-reconcile-dispose.ts b/src/renderer/src/components/terminal-pane/pty-connection/session-reconcile-dispose.ts
index af21b11f25e3..a48a56d9c7a4 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/session-reconcile-dispose.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/session-reconcile-dispose.ts
@@ -7,10 +7,7 @@ import {
 import { cancelPendingSafeFitContinuations } from '@/lib/pane-manager/pane-tree-ops'
 import { PANE_PTY_RESIZE_HOLD_FLUSH_EVENT } from '@/lib/pane-manager/pane-pty-resize-hold'
 import { discardTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
-import {
-  getProviderSessionClaimKey,
-  isPassiveCompletedHibernationEvidence
-} from '@/lib/sleeping-agent-pane-ownership'
+import { getProviderSessionClaimKey } from '@/lib/sleeping-agent-pane-ownership'
 import { releaseRendererPtyVisibilityClaim } from '../pty-renderer-delivery-claims'
 
 import { REMOTE_PTY_ID_PREFIX } from './pty-connect-limits'
@@ -18,6 +15,7 @@ import { SHIFT_ENTER_RECONFIRM_IDLE_MS } from './foreground-output-scan'
 import type { PanePtyBinding } from './pane-pty-binding'
 
 import type { ConnectPanePtySession } from './connect-pane-pty-session'
+import { noteArmsHibernatedPaneWake } from './pty-exit-hibernate'
 
 export function installSessionReconcileDispose(session: ConnectPanePtySession): PanePtyBinding {
   session.reconcileIfSessionDead = (
@@ -134,7 +132,7 @@ export function installSessionReconcileDispose(session: ConnectPanePtySession):
       const currentPtyId = session.transport.getPtyId()
       if (
         recordEntry &&
-        isPassiveCompletedHibernationEvidence(recordEntry.record) &&
+        noteArmsHibernatedPaneWake(recordEntry.record) &&
         currentPtyId !== null &&
         state.suppressedPtyExitIds[currentPtyId] === true &&
         !session.disposed &&
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/ssh-snapshot-prepaint.ts b/src/renderer/src/components/terminal-pane/pty-connection/ssh-snapshot-prepaint.ts
index 8dfe10e8a6eb..fd2a4a097a24 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/ssh-snapshot-prepaint.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/ssh-snapshot-prepaint.ts
@@ -60,7 +60,7 @@ export function bindPrepaintParkedSshSnapshot(session: ConnectPanePtySession): v
             })) {
               session.writeReplayData(replayChunk)
             }
-            session.writeReplayData(session.reattachReplayResetSequence(modelData))
+            session.writeReplayEpilogue(session.chooseReattachReplayReset(modelData))
             if (snapshot.pendingEscapeTailAnsi) {
               session.writeReplayData(snapshot.pendingEscapeTailAnsi)
             }
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/write-pty-output-to-xterm.ts b/src/renderer/src/components/terminal-pane/pty-connection/write-pty-output-to-xterm.ts
index 3335776a118b..34fdd14bf705 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/write-pty-output-to-xterm.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/write-pty-output-to-xterm.ts
@@ -1,6 +1,7 @@
 import { takeCurrentTerminalDeliveryCredit } from '@/lib/pane-manager/terminal-delivery-credit'
 import { nativeWindowsRewriteNeedsFollowupRenderRefresh } from '@/lib/pane-manager/terminal-complex-script'
 import { writeTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
+import { RESET_TERMINAL_CURSOR_STYLE } from '../../../../../shared/terminal-mode-reset-profiles'
 import { forceFullViewportPresent } from '@/lib/pane-manager/terminal-render-pause-release'
 
 import { FOREGROUND_SYNCHRONIZED_FRAME_INTERACTIVE_WINDOW_MS } from './foreground-output-budgets'
@@ -126,7 +127,7 @@ export function bindWritePtyOutputToXterm(session: ConnectPanePtySession): void
       return
     }
     session.writePtyOutputToXterm(
-      session.idleAgentTerminalModeReset,
+      RESET_TERMINAL_CURSOR_STYLE,
       shouldWritePtyOutputForeground(session.deps.isVisibleRef.current)
     )
   }
diff --git a/src/renderer/src/components/terminal-pane/pty-input-write-queue-contract.ts b/src/renderer/src/components/terminal-pane/pty-input-write-queue-contract.ts
index 6ac6068f0685..b3a2236fe1c2 100644
--- a/src/renderer/src/components/terminal-pane/pty-input-write-queue-contract.ts
+++ b/src/renderer/src/components/terminal-pane/pty-input-write-queue-contract.ts
@@ -1,3 +1,5 @@
+import type { TerminalInputKind } from '../../../../shared/terminal-input-kind'
+
 export const TERMINAL_INPUT_COALESCE_MAX_CODE_UNITS = 4096
 export const PTY_INPUT_WRITE_QUEUE_MAX_PENDING_REPLIES = 64
 export const PTY_INPUT_WRITE_QUEUE_MAX_PENDING_REPLY_CODE_UNITS =
@@ -8,6 +10,7 @@ export type PendingPtyInputWrite = {
   id: string
   text: string
   replyOnly: boolean
+  inputKind: TerminalInputKind
   resolveAccepted: ((accepted: boolean) => void) | undefined
   tooLarge: boolean | Promise<boolean>
   chunks?: Iterator<string>
@@ -15,17 +18,17 @@ export type PendingPtyInputWrite = {
 }
 
 export type PtyInputWriteQueue = {
-  enqueue: (id: string, data: string) => boolean
+  enqueue: (id: string, data: string, inputKind: TerminalInputKind) => boolean
   enqueueQueryReply: (id: string, data: string) => boolean
-  enqueueAccepted: (id: string, data: string) => Promise<boolean>
+  enqueueAccepted: (id: string, data: string, inputKind: TerminalInputKind) => Promise<boolean>
   waitForDrain: () => Promise<void>
   clear: () => void
 }
 
 export type PtyInputWriteQueueDeps = {
   isWritable: (id: string) => boolean
-  write: (id: string, data: string) => void
-  writeAccepted?: (id: string, data: string) => Promise<boolean>
+  write: (id: string, data: string, inputKind: TerminalInputKind) => void
+  writeAccepted?: (id: string, data: string, inputKind: TerminalInputKind) => Promise<boolean>
   yieldBetweenWrites?: () => Promise<void>
   onDrainFailure?: (id: string) => void
 }
diff --git a/src/renderer/src/components/terminal-pane/pty-input-write-queue.test.ts b/src/renderer/src/components/terminal-pane/pty-input-write-queue.test.ts
index 556ba19f8a63..9b3099d0326e 100644
--- a/src/renderer/src/components/terminal-pane/pty-input-write-queue.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-input-write-queue.test.ts
@@ -81,7 +81,7 @@ describe('pty input write queue', () => {
     // Simulates a 2s aggressive trackpad gesture at 120Hz: 240 SGR reports
     // enqueued while the drain cannot run between events.
     for (let i = 0; i < 240; i += 1) {
-      expect(queue.enqueue('pty-1', WHEEL_UP_REPORT)).toBe(true)
+      expect(queue.enqueue('pty-1', WHEEL_UP_REPORT, 'driving')).toBe(true)
     }
     await queue.waitForDrain()
 
@@ -98,7 +98,7 @@ describe('pty input write queue', () => {
 
     const inputs = ['a', '\x1b[<65;1;1M', 'bc', '\x1b[A', 'd']
     for (const input of inputs) {
-      queue.enqueue('pty-1', input)
+      queue.enqueue('pty-1', input, 'driving')
     }
     await queue.waitForDrain()
 
@@ -112,10 +112,10 @@ describe('pty input write queue', () => {
       write: (id, data) => writes.push({ id, data })
     })
 
-    queue.enqueue('pty-1', 'a')
-    queue.enqueue('pty-1', 'b')
-    queue.enqueue('pty-2', 'c')
-    queue.enqueue('pty-1', 'd')
+    queue.enqueue('pty-1', 'a', 'driving')
+    queue.enqueue('pty-1', 'b', 'driving')
+    queue.enqueue('pty-2', 'c', 'driving')
+    queue.enqueue('pty-1', 'd', 'driving')
     await queue.waitForDrain()
 
     expect(writes).toEqual([
@@ -131,7 +131,7 @@ describe('pty input write queue', () => {
 
     const piece = 'x'.repeat(1000)
     for (let i = 0; i < 12; i += 1) {
-      queue.enqueue('pty-1', piece)
+      queue.enqueue('pty-1', piece, 'driving')
     }
     await queue.waitForDrain()
 
@@ -146,9 +146,9 @@ describe('pty input write queue', () => {
     const { writes, queue } = createRecordingQueue()
 
     const large = 'y'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES * 2 + 100)
-    queue.enqueue('pty-1', 'before')
-    queue.enqueue('pty-1', large)
-    queue.enqueue('pty-1', 'after')
+    queue.enqueue('pty-1', 'before', 'driving')
+    queue.enqueue('pty-1', large, 'driving')
+    queue.enqueue('pty-1', 'after', 'driving')
     await queue.waitForDrain()
 
     expect(writes.map((write) => write.data).join('')).toBe(`before${large}after`)
@@ -161,7 +161,7 @@ describe('pty input write queue', () => {
   it('rejects input over the terminal input byte limit without writing', async () => {
     const { writes, queue } = createRecordingQueue()
 
-    expect(queue.enqueue('pty-1', 'z'.repeat(TERMINAL_INPUT_MAX_BYTES + 1))).toBe(false)
+    expect(queue.enqueue('pty-1', 'z'.repeat(TERMINAL_INPUT_MAX_BYTES + 1), 'driving')).toBe(false)
     await queue.waitForDrain()
 
     expect(writes).toEqual([])
@@ -171,9 +171,9 @@ describe('pty input write queue', () => {
     let writable = true
     const { writes, queue } = createRecordingQueue({ writable: () => writable })
 
-    queue.enqueue('pty-1', 'a')
+    queue.enqueue('pty-1', 'a', 'driving')
     writable = false
-    queue.enqueue('pty-1', 'b')
+    queue.enqueue('pty-1', 'b', 'driving')
     await queue.waitForDrain()
 
     expect(writes).toEqual([{ id: 'pty-1', data: 'a' }])
@@ -210,7 +210,7 @@ describe('pty input write queue', () => {
     const reply = mode2031SequenceFor('dark')
 
     queue.enqueueQueryReply('pty-1', reply)
-    queue.enqueue('pty-1', 'y')
+    queue.enqueue('pty-1', 'y', 'driving')
     await queue.waitForDrain()
 
     expect(writes).toEqual([
@@ -231,7 +231,7 @@ describe('pty input write queue', () => {
       allAccepted = queue.enqueueQueryReply('pty-1', reply) && allAccepted
     }
     expect(allAccepted).toBe(true)
-    expect(queue.enqueue('pty-1', 'k')).toBe(true)
+    expect(queue.enqueue('pty-1', 'k', 'driving')).toBe(true)
 
     await Promise.resolve()
     expect(pendingYields).toHaveLength(1)
@@ -256,7 +256,7 @@ describe('pty input write queue', () => {
     for (const reply of replies) {
       expect(queue.enqueueQueryReply('pty-1', reply)).toBe(true)
     }
-    expect(queue.enqueue('pty-1', 'k')).toBe(true)
+    expect(queue.enqueue('pty-1', 'k', 'driving')).toBe(true)
 
     await Promise.resolve()
     for (let turn = 0; turn < PTY_INPUT_WRITE_QUEUE_MAX_PENDING_REPLIES; turn += 1) {
@@ -286,10 +286,10 @@ describe('pty input write queue', () => {
     expect(second.length * 3).toBeGreaterThan(PTY_INPUT_WRITE_QUEUE_MAX_PENDING_REPLY_CODE_UNITS)
     queue.enqueueQueryReply('pty-1', first)
     queue.enqueueQueryReply('pty-1', dropped)
-    queue.enqueue('pty-1', 'x')
+    queue.enqueue('pty-1', 'x', 'driving')
     queue.enqueueQueryReply('pty-1', second)
     queue.enqueueQueryReply('pty-1', third)
-    queue.enqueue('pty-1', 'k')
+    queue.enqueue('pty-1', 'k', 'driving')
 
     await Promise.resolve()
     expect(pendingYields).toHaveLength(1)
@@ -365,7 +365,7 @@ describe('pty input write queue', () => {
     const replies = Array.from({ length: 10_000 }, (_, index) => `\x1b[?${index};1n`)
 
     for (const input of ordinary) {
-      expect(queue.enqueue('pty-1', input)).toBe(true)
+      expect(queue.enqueue('pty-1', input, 'driving')).toBe(true)
     }
     for (const reply of replies) {
       expect(queue.enqueueQueryReply('pty-1', reply)).toBe(true)
@@ -386,7 +386,7 @@ describe('pty input write queue', () => {
     const replies = Array.from({ length: 10_000 }, (_, index) => `\x1b[?${index};1n`)
 
     expect(queue.enqueueQueryReply('pty-1', '\x1b[?10000;1n')).toBe(true)
-    expect(queue.enqueue('pty-1', ordinary)).toBe(true)
+    expect(queue.enqueue('pty-1', ordinary, 'driving')).toBe(true)
     for (const reply of replies) {
       expect(queue.enqueueQueryReply('pty-1', reply)).toBe(true)
     }
@@ -413,14 +413,14 @@ describe('pty input write queue', () => {
     })
 
     try {
-      expect(queue.enqueue('pty-1', 'stale')).toBe(true)
-      expect(queue.enqueue('pty-1', 'also-stale')).toBe(false)
+      expect(queue.enqueue('pty-1', 'stale', 'driving')).toBe(true)
+      expect(queue.enqueue('pty-1', 'also-stale', 'driving')).toBe(false)
       await expect(queue.waitForDrain()).resolves.toBeUndefined()
 
       shouldThrow = false
-      expect(queue.enqueue('pty-1', 'still-stale')).toBe(false)
+      expect(queue.enqueue('pty-1', 'still-stale', 'driving')).toBe(false)
       queue.clear()
-      expect(queue.enqueue('pty-1', 'fresh')).toBe(true)
+      expect(queue.enqueue('pty-1', 'fresh', 'driving')).toBe(true)
       await queue.waitForDrain()
 
       expect(writes).toEqual([{ id: 'pty-1', data: 'fresh' }])
@@ -443,9 +443,9 @@ describe('pty input write queue', () => {
       }
     })
 
-    expect(queue.enqueue('pty-1', 'first')).toBe(true)
-    const accepted = queue.enqueueAccepted('pty-1', 'second')
-    expect(queue.enqueue('pty-1', 'third')).toBe(true)
+    expect(queue.enqueue('pty-1', 'first', 'driving')).toBe(true)
+    const accepted = queue.enqueueAccepted('pty-1', 'second', 'driving')
+    expect(queue.enqueue('pty-1', 'third', 'driving')).toBe(true)
     expect(queue.enqueueQueryReply('pty-1', 'fourth')).toBe(true)
     await flushAsyncTicks()
 
@@ -475,13 +475,13 @@ describe('pty input write queue', () => {
         delivered.push(`accepted:${data}`)
         if (!reentered) {
           reentered = true
-          queue.enqueue('pty-1', 'later')
+          queue.enqueue('pty-1', 'later', 'driving')
         }
         return acceptedWrite.promise
       }
     })
 
-    const accepted = queue.enqueueAccepted('pty-1', 'first')
+    const accepted = queue.enqueueAccepted('pty-1', 'first', 'driving')
     await flushAsyncTicks()
 
     expect(delivered).toEqual(['accepted:first'])
@@ -503,12 +503,12 @@ describe('pty input write queue', () => {
       writeAccepted: (_id, data) => {
         delivered.push(`accepted:${data}`)
         queue.clear()
-        queue.enqueue('pty-1', 'fresh')
+        queue.enqueue('pty-1', 'fresh', 'driving')
         return acceptedWrite.promise
       }
     })
 
-    const accepted = queue.enqueueAccepted('pty-1', 'stale')
+    const accepted = queue.enqueueAccepted('pty-1', 'stale', 'driving')
 
     await expect(accepted).resolves.toBe(false)
     await queue.waitForDrain()
@@ -533,12 +533,12 @@ describe('pty input write queue', () => {
         return acceptedWrite.promise
       }
     })
-    const active = queue.enqueueAccepted('pty-1', 'stale-active')
-    const pending = queue.enqueueAccepted('pty-1', 'stale-pending')
+    const active = queue.enqueueAccepted('pty-1', 'stale-active', 'driving')
+    const pending = queue.enqueueAccepted('pty-1', 'stale-pending', 'driving')
     await acceptedStarted.promise
 
     queue.clear()
-    expect(queue.enqueue('pty-1', 'fresh')).toBe(true)
+    expect(queue.enqueue('pty-1', 'fresh', 'driving')).toBe(true)
 
     await expect(active).resolves.toBe(false)
     await expect(pending).resolves.toBe(false)
@@ -567,7 +567,9 @@ describe('pty input write queue', () => {
     })
 
     try {
-      expect(queue.enqueue('pty-1', 'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES * 2))).toBe(true)
+      expect(
+        queue.enqueue('pty-1', 'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES * 2), 'driving')
+      ).toBe(true)
       expect(rejectYield).toBeDefined()
       rejectYield?.(failure)
       await queue.waitForDrain()
@@ -607,11 +609,13 @@ describe('pty input write queue', () => {
     })
 
     try {
-      expect(queue.enqueue('pty-1', 'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES * 2))).toBe(true)
+      expect(
+        queue.enqueue('pty-1', 'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES * 2), 'driving')
+      ).toBe(true)
       expect(rejectYield).toBeDefined()
       queue.clear()
       rejectNextYield = false
-      expect(queue.enqueue('pty-2', 'fresh')).toBe(true)
+      expect(queue.enqueue('pty-2', 'fresh', 'driving')).toBe(true)
       rejectYield?.(failure)
       await queue.waitForDrain()
 
@@ -697,8 +701,8 @@ describe('pty input write queue', () => {
     })
 
     const large = 'y'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES * 3)
-    queue.enqueue('pty-1', large)
-    queue.enqueue('pty-1', 'tail')
+    queue.enqueue('pty-1', large, 'driving')
+    queue.enqueue('pty-1', 'tail', 'driving')
     // First chunk is written synchronously, then the drain parks on the yield.
     expect(writes.length).toBe(1)
 
@@ -716,9 +720,9 @@ describe('pty input write queue', () => {
     const stale = 'é'.repeat(CLIPBOARD_TEXT_MEASURE_YIELD_CODE_UNITS + 1)
 
     try {
-      expect(queue.enqueue('pty-1', stale)).toBe(true)
+      expect(queue.enqueue('pty-1', stale, 'driving')).toBe(true)
       queue.clear()
-      expect(queue.enqueue('pty-1', 'fresh')).toBe(true)
+      expect(queue.enqueue('pty-1', 'fresh', 'driving')).toBe(true)
 
       await vi.runAllTimersAsync()
       await queue.waitForDrain()
@@ -755,7 +759,7 @@ describe('pty input write queue', () => {
     globalThis.gc?.()
     const heapBefore = process.memoryUsage().heapUsed
     for (let index = 0; index < 20_000; index += 1) {
-      await queue.enqueueAccepted('pty-1', 'x')
+      await queue.enqueueAccepted('pty-1', 'x', 'driving')
     }
     await queue.waitForDrain()
     globalThis.gc?.()
diff --git a/src/renderer/src/components/terminal-pane/pty-input-write-queue.ts b/src/renderer/src/components/terminal-pane/pty-input-write-queue.ts
index 31b37ed6af51..7f646354b275 100644
--- a/src/renderer/src/components/terminal-pane/pty-input-write-queue.ts
+++ b/src/renderer/src/components/terminal-pane/pty-input-write-queue.ts
@@ -12,6 +12,7 @@ import {
   type PtyInputWriteQueue,
   type PtyInputWriteQueueDeps
 } from './pty-input-write-queue-contract'
+import type { TerminalInputKind } from '../../../../shared/terminal-input-kind'
 import {
   createHeadQueue,
   peekHeadQueue,
@@ -111,7 +112,7 @@ export function createPtyInputWriteQueue(deps: PtyInputWriteQueueDeps): PtyInput
   // Why: one cancel per in-flight write rather than `.then()` on a queue-lifetime
   // promise — those reactions are retained until that promise settles, so a
   // long-lived pane accumulated one record per acknowledged write (Esc, Ctrl+C).
-  async function writeAcceptedChunk(id: string, data: string): Promise<boolean> {
+  async function writeAcceptedChunk(item: PendingPtyInputWrite, data: string): Promise<boolean> {
     let cancel = (): void => undefined
     const cancelled = new Promise<boolean>((resolve) => {
       cancel = () => resolve(false)
@@ -122,7 +123,9 @@ export function createPtyInputWriteQueue(deps: PtyInputWriteQueueDeps): PtyInput
     try {
       return await Promise.race([
         cancelled,
-        Promise.resolve(deps.writeAccepted?.(id, data) ?? false).catch(() => false)
+        Promise.resolve(deps.writeAccepted?.(item.id, data, item.inputKind) ?? false).catch(
+          () => false
+        )
       ])
     } finally {
       pendingAcceptedCancels.delete(cancel)
@@ -173,6 +176,7 @@ export function createPtyInputWriteQueue(deps: PtyInputWriteQueueDeps): PtyInput
               peek.tooLarge !== false ||
               peek.chunks !== undefined ||
               !isCoalesciblePtyInput(peek) ||
+              peek.inputKind !== next.inputKind ||
               payload.length + peek.text.length > TERMINAL_INPUT_COALESCE_MAX_CODE_UNITS
             ) {
               break
@@ -180,7 +184,7 @@ export function createPtyInputWriteQueue(deps: PtyInputWriteQueueDeps): PtyInput
             payload += peek.text
             removePending(peek)
           }
-          deps.write(next.id, payload)
+          deps.write(next.id, payload, next.inputKind)
           if (firstPending()) {
             await yieldBetweenWrites()
           }
@@ -196,8 +200,8 @@ export function createPtyInputWriteQueue(deps: PtyInputWriteQueueDeps): PtyInput
         }
         const writeGeneration = generation
         const accepted = next.resolveAccepted
-          ? await writeAcceptedChunk(next.id, chunk.value)
-          : (deps.write(next.id, chunk.value), true)
+          ? await writeAcceptedChunk(next, chunk.value)
+          : (deps.write(next.id, chunk.value, next.inputKind), true)
         if (generation !== writeGeneration || firstPending() !== next) {
           continue
         }
@@ -249,8 +253,9 @@ export function createPtyInputWriteQueue(deps: PtyInputWriteQueueDeps): PtyInput
 
   function enqueueInput(
     id: string,
-    data: string,
+    text: string,
     queryReply: boolean,
+    inputKind: TerminalInputKind,
     resolveAccepted?: PendingPtyInputWrite['resolveAccepted']
   ): boolean {
     try {
@@ -260,20 +265,28 @@ export function createPtyInputWriteQueue(deps: PtyInputWriteQueueDeps): PtyInput
       }
       // Every query reply stays atomic so host-side ordering can classify it (#13892).
       const replyOnly = queryReply
-      if (replyOnly && !admitReply(data)) {
+      if (replyOnly && !admitReply(text)) {
         return false
       }
-      const tooLarge = replyOnly ? false : isTerminalInputTooLargeWithDeferredMeasurement(data)
+      const tooLarge = replyOnly ? false : isTerminalInputTooLargeWithDeferredMeasurement(text)
       if (tooLarge === true) {
         resolveAccepted?.(false)
         return false
       }
-      const item = { sequence: nextSequence, id, text: data, replyOnly, tooLarge, resolveAccepted }
+      const item = {
+        sequence: nextSequence,
+        id,
+        text,
+        replyOnly,
+        inputKind,
+        tooLarge,
+        resolveAccepted
+      }
       nextSequence += 1
       if (replyOnly) {
         pendingReplies.items.push(item)
         pendingReplyCount += 1
-        pendingReplyCodeUnits += data.length
+        pendingReplyCodeUnits += text.length
       } else {
         pendingOrdinary.items.push(item)
       }
@@ -286,17 +299,17 @@ export function createPtyInputWriteQueue(deps: PtyInputWriteQueueDeps): PtyInput
   }
 
   return {
-    enqueue(id: string, data: string): boolean {
-      return enqueueInput(id, data, false)
+    enqueue(id: string, data: string, inputKind: TerminalInputKind): boolean {
+      return enqueueInput(id, data, false, inputKind)
     },
 
     enqueueQueryReply(id: string, data: string): boolean {
-      return enqueueInput(id, data, true)
+      return enqueueInput(id, data, true, 'query-reply')
     },
 
-    enqueueAccepted: (id, data) =>
+    enqueueAccepted: (id, data, inputKind) =>
       new Promise((resolve) => {
-        enqueueInput(id, data, false, resolve)
+        enqueueInput(id, data, false, inputKind, resolve)
       }),
 
     async waitForDrain(): Promise<void> {
diff --git a/src/renderer/src/components/terminal-pane/pty-preconnect-input-buffer.test.ts b/src/renderer/src/components/terminal-pane/pty-preconnect-input-buffer.test.ts
index d36c3a274ed3..2595863cb3d4 100644
--- a/src/renderer/src/components/terminal-pane/pty-preconnect-input-buffer.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-preconnect-input-buffer.test.ts
@@ -11,9 +11,9 @@ describe('createPtyPreconnectInputBuffer', () => {
     const acceptedWrite = createDeferred<boolean>()
     const buffer = createPtyPreconnectInputBuffer()
     const delivered: string[] = []
-    const accepted = buffer.enqueueAccepted('first')
-    expect(buffer.enqueue('second', 'ordinary')).toBe(true)
-    expect(buffer.enqueue('third', 'immediate')).toBe(true)
+    const accepted = buffer.enqueueAccepted('first', 'driving')
+    expect(buffer.enqueue('second', 'ordinary', 'driving')).toBe(true)
+    expect(buffer.enqueue('third', 'immediate', 'driving')).toBe(true)
     const writer = {
       isCurrent: () => true,
       sendInput: (data: string) => {
@@ -52,9 +52,9 @@ describe('createPtyPreconnectInputBuffer', () => {
       const writeStarted = createDeferred<void>()
       const buffer = createPtyPreconnectInputBuffer()
       const sendInput = vi.fn(() => true)
-      const accepted = buffer.enqueueAccepted('first')
-      const laterAccepted = buffer.enqueueAccepted('third')
-      expect(buffer.enqueue('second', 'ordinary')).toBe(true)
+      const accepted = buffer.enqueueAccepted('first', 'driving')
+      const laterAccepted = buffer.enqueueAccepted('third', 'driving')
+      expect(buffer.enqueue('second', 'ordinary', 'driving')).toBe(true)
       const flushing = buffer.flush({
         isCurrent: () => true,
         sendInput,
@@ -72,7 +72,7 @@ describe('createPtyPreconnectInputBuffer', () => {
       await expect(laterAccepted).resolves.toBe(false)
       await expect(flushing).resolves.toBeUndefined()
       expect(sendInput).not.toHaveBeenCalled()
-      expect(buffer.enqueue('after-clear', 'ordinary')).toBe(false)
+      expect(buffer.enqueue('after-clear', 'ordinary', 'driving')).toBe(false)
 
       if (lateOutcome === 'resolve') {
         acceptedWrite.resolve(true)
@@ -91,7 +91,8 @@ describe('createPtyPreconnectInputBuffer', () => {
     const codeUnitWriteStarted = createDeferred<void>()
     const codeUnitBuffer = createPtyPreconnectInputBuffer()
     const codeUnitAccepted = codeUnitBuffer.enqueueAccepted(
-      'x'.repeat(PTY_PRECONNECT_INPUT_MAX_CODE_UNITS)
+      'x'.repeat(PTY_PRECONNECT_INPUT_MAX_CODE_UNITS),
+      'driving'
     )
     const codeUnitFlush = codeUnitBuffer.flush({
       isCurrent: () => true,
@@ -104,7 +105,7 @@ describe('createPtyPreconnectInputBuffer', () => {
     })
     await codeUnitWriteStarted.promise
 
-    expect(codeUnitBuffer.enqueue('overflow', 'ordinary')).toBe(false)
+    expect(codeUnitBuffer.enqueue('overflow', 'ordinary', 'driving')).toBe(false)
 
     codeUnitBuffer.clear()
     codeUnitWrite.resolve(true)
@@ -114,9 +115,9 @@ describe('createPtyPreconnectInputBuffer', () => {
     const entryWrite = createDeferred<boolean>()
     const entryWriteStarted = createDeferred<void>()
     const entryBuffer = createPtyPreconnectInputBuffer()
-    const entryAccepted = entryBuffer.enqueueAccepted('first')
+    const entryAccepted = entryBuffer.enqueueAccepted('first', 'driving')
     for (let index = 1; index < PTY_PRECONNECT_INPUT_MAX_ENTRIES; index += 1) {
-      expect(entryBuffer.enqueue('', 'ordinary')).toBe(true)
+      expect(entryBuffer.enqueue('', 'ordinary', 'driving')).toBe(true)
     }
     const entryFlush = entryBuffer.flush({
       isCurrent: () => true,
@@ -129,7 +130,7 @@ describe('createPtyPreconnectInputBuffer', () => {
     })
     await entryWriteStarted.promise
 
-    expect(entryBuffer.enqueue('', 'ordinary')).toBe(false)
+    expect(entryBuffer.enqueue('', 'ordinary', 'driving')).toBe(false)
 
     entryBuffer.clear()
     entryWrite.resolve(true)
@@ -141,12 +142,13 @@ describe('createPtyPreconnectInputBuffer', () => {
     const entryBuffer = createPtyPreconnectInputBuffer(
       Array.from({ length: PTY_PRECONNECT_INPUT_MAX_ENTRIES + 1 }, () => ({
         data: '',
-        kind: 'ordinary' as const
+        kind: 'ordinary' as const,
+        inputKind: 'driving' as const
       }))
     )
     let entryWrites = 0
 
-    expect(entryBuffer.enqueue('', 'ordinary')).toBe(false)
+    expect(entryBuffer.enqueue('', 'ordinary', 'driving')).toBe(false)
     await entryBuffer.flush({
       isCurrent: () => true,
       sendInput: () => {
@@ -158,12 +160,16 @@ describe('createPtyPreconnectInputBuffer', () => {
     expect(entryWrites).toBe(PTY_PRECONNECT_INPUT_MAX_ENTRIES)
 
     const codeUnitBuffer = createPtyPreconnectInputBuffer([
-      { data: 'x'.repeat(PTY_PRECONNECT_INPUT_MAX_CODE_UNITS), kind: 'ordinary' },
-      { data: 'overflow', kind: 'ordinary' }
+      {
+        data: 'x'.repeat(PTY_PRECONNECT_INPUT_MAX_CODE_UNITS),
+        kind: 'ordinary',
+        inputKind: 'driving'
+      },
+      { data: 'overflow', kind: 'ordinary', inputKind: 'driving' }
     ])
     const codeUnitWrites: number[] = []
 
-    expect(codeUnitBuffer.enqueue('new', 'ordinary')).toBe(false)
+    expect(codeUnitBuffer.enqueue('new', 'ordinary', 'driving')).toBe(false)
     await codeUnitBuffer.flush({
       isCurrent: () => true,
       sendInput: (data) => {
@@ -179,7 +185,7 @@ describe('createPtyPreconnectInputBuffer', () => {
     // Regression: an abandoned deferred spawn never reaches connect(), so nothing
     // drained the buffer and a paste awaiting sendInputAccepted hung forever.
     const buffer = createPtyPreconnectInputBuffer()
-    const pastePending = buffer.enqueueAccepted('pasted text')
+    const pastePending = buffer.enqueueAccepted('pasted text', 'driving')
     let settled = false
     void pastePending.then(() => {
       settled = true
diff --git a/src/renderer/src/components/terminal-pane/pty-preconnect-input-buffer.ts b/src/renderer/src/components/terminal-pane/pty-preconnect-input-buffer.ts
index 3dce1962bb96..cb8dec2d6d0f 100644
--- a/src/renderer/src/components/terminal-pane/pty-preconnect-input-buffer.ts
+++ b/src/renderer/src/components/terminal-pane/pty-preconnect-input-buffer.ts
@@ -1,4 +1,5 @@
 import { CLIPBOARD_TEXT_MEASURE_YIELD_CODE_UNITS } from '../../../../shared/clipboard-text'
+import type { TerminalInputKind } from '../../../../shared/terminal-input-kind'
 
 export const PTY_PRECONNECT_INPUT_MAX_ENTRIES = 1024
 // Why: a retention budget, not the 16MB single-write ceiling. The deferral lasts
@@ -12,6 +13,7 @@ export type PtyPreconnectInputKind = 'ordinary' | 'immediate' | 'accepted'
 export type PtyPreconnectInputEntry = {
   data: string
   kind: PtyPreconnectInputKind
+  inputKind: TerminalInputKind
 }
 
 type BufferedInput = PtyPreconnectInputEntry & {
@@ -20,9 +22,9 @@ type BufferedInput = PtyPreconnectInputEntry & {
 
 type PreconnectInputWriter = {
   isCurrent: () => boolean
-  sendInput: (data: string) => boolean
+  sendInput: (data: string, inputKind: TerminalInputKind) => boolean
   sendInputImmediate: (data: string) => boolean
-  sendInputAccepted?: (data: string) => Promise<boolean>
+  sendInputAccepted?: (data: string, inputKind: TerminalInputKind) => Promise<boolean>
 }
 
 export type PtyPreconnectInputBuffer = {
@@ -30,10 +32,12 @@ export type PtyPreconnectInputBuffer = {
   enqueue: (
     data: string,
     kind: 'ordinary' | 'immediate',
+    inputKind: TerminalInputKind,
     onRetained?: (entry: PtyPreconnectInputEntry) => void
   ) => boolean
   enqueueAccepted: (
     data: string,
+    inputKind: TerminalInputKind,
     onRetained?: (entry: PtyPreconnectInputEntry) => void
   ) => Promise<boolean>
   flush: (writer: PreconnectInputWriter) => Promise<void>
@@ -70,14 +74,15 @@ export function createPtyPreconnectInputBuffer(
   const createInput = (
     data: string,
     kind: PtyPreconnectInputKind,
+    inputKind: TerminalInputKind,
     resolve?: BufferedInput['resolve']
-  ): BufferedInput => ({ data, kind, ...(resolve ? { resolve } : {}) })
+  ): BufferedInput => ({ data, kind, inputKind, ...(resolve ? { resolve } : {}) })
   const notifyRetained = (
     onRetained: ((entry: PtyPreconnectInputEntry) => void) | undefined,
     input: BufferedInput
   ): void => {
     try {
-      onRetained?.({ data: input.data, kind: input.kind })
+      onRetained?.({ data: input.data, kind: input.kind, inputKind: input.inputKind })
     } catch {
       // Handoff capture is advisory; a callback failure must not reject input admission.
     }
@@ -86,7 +91,7 @@ export function createPtyPreconnectInputBuffer(
   // Seeded entries came from a predecessor transport and must not be reported
   // back to that predecessor's handoff owner as newly typed input.
   for (const entry of initialEntries) {
-    retain(createInput(entry.data, entry.kind))
+    retain(createInput(entry.data, entry.kind, entry.inputKind))
   }
   const clear = (): void => {
     const dropped = pending
@@ -124,8 +129,8 @@ export function createPtyPreconnectInputBuffer(
             accepted = await Promise.race([
               Promise.resolve(
                 writer.sendInputAccepted
-                  ? writer.sendInputAccepted(input.data)
-                  : writer.sendInput(input.data)
+                  ? writer.sendInputAccepted(input.data, input.inputKind)
+                  : writer.sendInput(input.data, input.inputKind)
               ),
               flushStopped.then(() => null)
             ])
@@ -152,7 +157,7 @@ export function createPtyPreconnectInputBuffer(
         const accepted =
           input.kind === 'immediate'
             ? writer.sendInputImmediate(input.data)
-            : writer.sendInput(input.data)
+            : writer.sendInput(input.data, input.inputKind)
         if (!accepted) {
           clear()
           return
@@ -186,17 +191,17 @@ export function createPtyPreconnectInputBuffer(
 
   return {
     isBuffering: () => buffering,
-    enqueue(data, kind, onRetained) {
-      const input = createInput(data, kind)
+    enqueue(data, kind, inputKind, onRetained) {
+      const input = createInput(data, kind, inputKind)
       const retained = retain(input)
       if (retained) {
         notifyRetained(onRetained, input)
       }
       return retained
     },
-    enqueueAccepted(data, onRetained) {
+    enqueueAccepted(data, inputKind, onRetained) {
       return new Promise<boolean>((resolve) => {
-        const input = createInput(data, 'accepted', resolve)
+        const input = createInput(data, 'accepted', inputKind, resolve)
         if (!retain(input)) {
           resolve(false)
           return
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-connect-spawn.test.ts b/src/renderer/src/components/terminal-pane/pty-transport-connect-spawn.test.ts
index 129c920f976b..ed9c029d14cf 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-connect-spawn.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-connect-spawn.test.ts
@@ -68,6 +68,22 @@ describe('createIpcPtyTransport', () => {
     expect(spawn).not.toHaveBeenCalled()
   })
 
+  it('keeps the recovery hint and raw diagnostic from a wrapped spawn error', async () => {
+    const { createIpcPtyTransport } = await import('./pty-transport')
+    vi.mocked(window.api.pty.spawn).mockRejectedValueOnce(
+      new Error(
+        "Error invoking remote method 'pty:spawn': Error: Close unused terminals, then try again.\nnode-pty: open_slave failed: EMFILE (errno 24)"
+      )
+    )
+    const onError = vi.fn()
+
+    await createIpcPtyTransport({}).connect({ url: '', callbacks: { onError } })
+
+    expect(onError).toHaveBeenCalledWith(
+      'Close unused terminals, then try again.\nnode-pty: open_slave failed: EMFILE (errno 24)'
+    )
+  })
+
   it('threads provider command ownership through the spawn IPC', async () => {
     const { createIpcPtyTransport } = await import('./pty-transport')
     const transport = createIpcPtyTransport({
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-input-write.test.ts b/src/renderer/src/components/terminal-pane/pty-transport-input-write.test.ts
index 1060d617dd21..df2c11e08d43 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-input-write.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-input-write.test.ts
@@ -65,8 +65,8 @@ describe('createIpcPtyTransport', () => {
       const transport = createIpcPtyTransport({})
       await transport.connect({ url: '', callbacks: { onWriteUnavailable: recovery } })
 
-      expect(transport.sendInput('input')).toBe(true)
-      expect(transport.sendInput('later-input')).toBe(false)
+      expect(transport.sendInput('input', 'driving')).toBe(true)
+      expect(transport.sendInput('later-input', 'driving')).toBe(false)
 
       expect(recovery).toHaveBeenCalledOnce()
       expect(warn).toHaveBeenCalledWith('[pty-input-write-queue] drain failed:', failure)
@@ -80,8 +80,8 @@ describe('createIpcPtyTransport', () => {
     const localTransport = createIpcPtyTransport({})
 
     await localTransport.connect({ url: '', callbacks: {} })
-    await expect(localTransport.sendInputAccepted?.('\x03')).resolves.toBe(true)
-    expect(window.api.pty.writeAccepted).toHaveBeenCalledWith('pty-1', '\x03')
+    await expect(localTransport.sendInputAccepted?.('\x03', 'driving')).resolves.toBe(true)
+    expect(window.api.pty.writeAccepted).toHaveBeenCalledWith('pty-1', '\x03', 'driving')
 
     const sshTransport = createIpcPtyTransport({ connectionId: 'ssh-1' })
     await sshTransport.connect({ url: '', callbacks: {} })
@@ -103,8 +103,8 @@ describe('createIpcPtyTransport', () => {
     const transport = createIpcPtyTransport({ bufferInputUntilConnect: true })
 
     const connecting = transport.connect({ url: '', callbacks: {} })
-    expect(transport.sendInput('first-')).toBe(true)
-    const accepted = transport.sendInputAccepted?.('second-')
+    expect(transport.sendInput('first-', 'driving')).toBe(true)
+    const accepted = transport.sendInputAccepted?.('second-', 'driving')
     expect(transport.sendInputImmediate('third')).toBe(true)
     expect(window.api.pty.write).not.toHaveBeenCalled()
     expect(window.api.pty.writeAccepted).not.toHaveBeenCalled()
@@ -133,21 +133,21 @@ describe('createIpcPtyTransport', () => {
     const transport = createIpcPtyTransport({
       bufferInputUntilConnect: true,
       preconnectInput: [
-        { data: 'before-remount-', kind: 'ordinary' },
-        { data: '\x1b[0n', kind: 'immediate' },
-        { data: '\x03', kind: 'accepted' }
+        { data: 'before-remount-', kind: 'ordinary', inputKind: 'driving' },
+        { data: '\x1b[0n', kind: 'immediate', inputKind: 'query-reply' },
+        { data: '\x03', kind: 'accepted', inputKind: 'driving' }
       ],
       onPreconnectInput
     })
 
     const connecting = transport.connect({ url: '', callbacks: {} })
-    expect(transport.sendInput('new-ordinary-')).toBe(true)
+    expect(transport.sendInput('new-ordinary-', 'driving')).toBe(true)
     expect(transport.sendInputImmediate('new-immediate-')).toBe(true)
-    const accepted = transport.sendInputAccepted?.('new-accepted')
+    const accepted = transport.sendInputAccepted?.('new-accepted', 'driving')
     expect(onPreconnectInput.mock.calls).toEqual([
-      [{ data: 'new-ordinary-', kind: 'ordinary' }],
-      [{ data: 'new-immediate-', kind: 'immediate' }],
-      [{ data: 'new-accepted', kind: 'accepted' }]
+      [{ data: 'new-ordinary-', kind: 'ordinary', inputKind: 'driving' }],
+      [{ data: 'new-immediate-', kind: 'immediate', inputKind: 'query-reply' }],
+      [{ data: 'new-accepted', kind: 'accepted', inputKind: 'driving' }]
     ])
 
     spawn.resolve({ id: 'pty-1' })
@@ -180,8 +180,8 @@ describe('createIpcPtyTransport', () => {
       onPreconnectInput: (input) => captured.push(input)
     })
 
-    const predecessorAccepted = predecessor.sendInputAccepted?.('\x03')
-    expect(captured).toEqual([{ data: '\x03', kind: 'accepted' }])
+    const predecessorAccepted = predecessor.sendInputAccepted?.('\x03', 'driving')
+    expect(captured).toEqual([{ data: '\x03', kind: 'accepted', inputKind: 'driving' }])
 
     const successor = createIpcPtyTransport({ preconnectInput: captured })
     const connecting = successor.connect({ url: '', callbacks: {} })
@@ -205,17 +205,17 @@ describe('createIpcPtyTransport', () => {
       onPreconnectInput
     })
 
-    expect(transport.sendInput('ordinary')).toBe(true)
+    expect(transport.sendInput('ordinary', 'driving')).toBe(true)
     expect(transport.sendInputImmediate('immediate')).toBe(true)
-    const accepted = transport.sendInputAccepted?.('accepted')
+    const accepted = transport.sendInputAccepted?.('accepted', 'driving')
     expect(onPreconnectInput).toHaveBeenCalledTimes(3)
 
     await transport.connect({ url: '', callbacks: {} })
 
     await expect(accepted).resolves.toBe(true)
-    expect(window.api.pty.write).toHaveBeenCalledWith('pty-1', 'ordinary')
-    expect(window.api.pty.write).toHaveBeenCalledWith('pty-1', 'immediate')
-    expect(window.api.pty.writeAccepted).toHaveBeenCalledWith('pty-1', 'accepted')
+    expect(window.api.pty.write).toHaveBeenCalledWith('pty-1', 'ordinary', 'driving')
+    expect(window.api.pty.write).toHaveBeenCalledWith('pty-1', 'immediate', 'query-reply')
+    expect(window.api.pty.writeAccepted).toHaveBeenCalledWith('pty-1', 'accepted', 'driving')
   })
 
   it('keeps live acknowledged input ahead of later ordinary and immediate writes', async () => {
@@ -235,9 +235,9 @@ describe('createIpcPtyTransport', () => {
       const transport = createIpcPtyTransport({})
       await transport.connect({ url: '', callbacks: {} })
 
-      expect(transport.sendInput('first')).toBe(true)
-      const accepted = transport.sendInputAccepted?.('second')
-      expect(transport.sendInput('third')).toBe(true)
+      expect(transport.sendInput('first', 'driving')).toBe(true)
+      const accepted = transport.sendInputAccepted?.('second', 'driving')
+      expect(transport.sendInput('third', 'driving')).toBe(true)
       expect(transport.sendInputImmediate('fourth')).toBe(true)
       await flushAsyncTicks()
 
@@ -275,11 +275,11 @@ describe('createIpcPtyTransport', () => {
       const slowInput = 'é'.repeat(CLIPBOARD_TEXT_MEASURE_YIELD_CODE_UNITS + 1)
 
       const connecting = transport.connect({ url: '', callbacks: {} })
-      expect(transport.sendInput(slowInput)).toBe(true)
+      expect(transport.sendInput(slowInput, 'driving')).toBe(true)
       await connecting
 
-      const accepted = transport.sendInputAccepted?.('accepted')
-      expect(transport.sendInput('later')).toBe(true)
+      const accepted = transport.sendInputAccepted?.('accepted', 'driving')
+      expect(transport.sendInput('later', 'driving')).toBe(true)
       expect(transport.sendInputImmediate('reply')).toBe(true)
       expect(delivered).toEqual([])
 
@@ -318,14 +318,14 @@ describe('createIpcPtyTransport', () => {
     const { createIpcPtyTransport } = await import('./pty-transport')
     const transport = createIpcPtyTransport({ bufferInputUntilConnect: true })
 
-    expect(transport.sendInput('ordinary')).toBe(true)
-    const accepted = transport.sendInputAccepted?.('accepted')
+    expect(transport.sendInput('ordinary', 'driving')).toBe(true)
+    const accepted = transport.sendInputAccepted?.('accepted', 'driving')
     await transport.destroy?.()
 
     await expect(accepted).resolves.toBe(false)
-    expect(transport.sendInput('after-destroy')).toBe(false)
+    expect(transport.sendInput('after-destroy', 'driving')).toBe(false)
     expect(transport.sendInputImmediate('after-destroy')).toBe(false)
-    await expect(transport.sendInputAccepted?.('after-destroy')).resolves.toBe(false)
+    await expect(transport.sendInputAccepted?.('after-destroy', 'driving')).resolves.toBe(false)
     expect(window.api.pty.write).not.toHaveBeenCalled()
     expect(window.api.pty.writeAccepted).not.toHaveBeenCalled()
   })
@@ -341,11 +341,11 @@ describe('createIpcPtyTransport', () => {
       const transport = createIpcPtyTransport({ bufferInputUntilConnect: true })
 
       const connecting = transport.connect({ url: '', callbacks: {} })
-      const accepted = transport.sendInputAccepted?.('first')
-      expect(transport.sendInput('later')).toBe(true)
+      const accepted = transport.sendInputAccepted?.('first', 'driving')
+      expect(transport.sendInput('later', 'driving')).toBe(true)
       spawn.resolve({ id: 'pty-1' })
       await flushAsyncTicks()
-      expect(window.api.pty.writeAccepted).toHaveBeenCalledWith('pty-1', 'first')
+      expect(window.api.pty.writeAccepted).toHaveBeenCalledWith('pty-1', 'first', 'driving')
 
       if (teardown === 'disconnect') {
         transport.disconnect()
@@ -358,7 +358,7 @@ describe('createIpcPtyTransport', () => {
       await expect(accepted).resolves.toBe(false)
       await expect(connecting).resolves.toBe('pty-1')
       expect(window.api.pty.write).not.toHaveBeenCalled()
-      expect(transport.sendInput('after-teardown')).toBe(false)
+      expect(transport.sendInput('after-teardown', 'driving')).toBe(false)
 
       acceptedWrite.resolve(true)
       await flushAsyncTicks()
@@ -377,10 +377,10 @@ describe('createIpcPtyTransport', () => {
       const transport = createIpcPtyTransport({})
       await transport.connect({ url: '', callbacks: {} })
 
-      const accepted = transport.sendInputAccepted?.('first')
-      expect(transport.sendInput('later')).toBe(true)
+      const accepted = transport.sendInputAccepted?.('first', 'driving')
+      expect(transport.sendInput('later', 'driving')).toBe(true)
       await flushAsyncTicks()
-      expect(window.api.pty.writeAccepted).toHaveBeenCalledWith('pty-1', 'first')
+      expect(window.api.pty.writeAccepted).toHaveBeenCalledWith('pty-1', 'first', 'driving')
 
       if (teardown === 'disconnect') {
         transport.disconnect()
@@ -392,7 +392,7 @@ describe('createIpcPtyTransport', () => {
 
       await expect(accepted).resolves.toBe(false)
       expect(window.api.pty.write).not.toHaveBeenCalled()
-      expect(transport.sendInput('after-teardown')).toBe(false)
+      expect(transport.sendInput('after-teardown', 'driving')).toBe(false)
 
       acceptedWrite.resolve(true)
       await flushAsyncTicks()
@@ -412,7 +412,7 @@ describe('createIpcPtyTransport', () => {
       const onConnect = vi.fn()
 
       const connecting = transport.connect({ url: '', callbacks: { onConnect } })
-      const accepted = transport.sendInputAccepted?.('pending')
+      const accepted = transport.sendInputAccepted?.('pending', 'driving')
       if (teardown === 'disconnect') {
         transport.disconnect()
       } else {
@@ -551,18 +551,18 @@ describe('createIpcPtyTransport', () => {
       const chunk = 'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES)
       await transport.connect({ url: '', callbacks: {} })
 
-      expect(transport.sendInput(`${chunk}${chunk}`)).toBe(true)
-      expect(window.api.pty.write).toHaveBeenCalledExactlyOnceWith('pty-1', chunk)
+      expect(transport.sendInput(`${chunk}${chunk}`, 'driving')).toBe(true)
+      expect(window.api.pty.write).toHaveBeenCalledExactlyOnceWith('pty-1', chunk, 'driving')
 
       onExit?.({ id: 'pty-1', code: 0 })
       transport.attach({ existingPtyId: 'pty-1', callbacks: {} })
-      expect(transport.sendInput('fresh')).toBe(true)
+      expect(transport.sendInput('fresh', 'driving')).toBe(true)
 
       await vi.runAllTimersAsync()
 
       expect(vi.mocked(window.api.pty.write).mock.calls).toEqual([
-        ['pty-1', chunk],
-        ['pty-1', 'fresh']
+        ['pty-1', chunk, 'driving'],
+        ['pty-1', 'fresh', 'driving']
       ])
     } finally {
       vi.useRealTimers()
@@ -577,22 +577,22 @@ describe('createIpcPtyTransport', () => {
     const chunk = 'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES)
     await transport.connect({ url: '', callbacks: {} })
 
-    const accepted = transport.sendInputAccepted?.(`${chunk}stale-tail`)
+    const accepted = transport.sendInputAccepted?.(`${chunk}stale-tail`, 'driving')
     await flushAsyncTicks()
-    expect(window.api.pty.writeAccepted).toHaveBeenCalledExactlyOnceWith('pty-1', chunk)
+    expect(window.api.pty.writeAccepted).toHaveBeenCalledExactlyOnceWith('pty-1', chunk, 'driving')
 
     onExit?.({ id: 'pty-1', code: 0 })
     transport.attach({ existingPtyId: 'pty-1', callbacks: {} })
-    expect(transport.sendInput('fresh')).toBe(true)
+    expect(transport.sendInput('fresh', 'driving')).toBe(true)
 
     await expect(accepted).resolves.toBe(false)
     await flushAsyncTicks()
-    expect(window.api.pty.write).toHaveBeenCalledExactlyOnceWith('pty-1', 'fresh')
+    expect(window.api.pty.write).toHaveBeenCalledExactlyOnceWith('pty-1', 'fresh', 'driving')
 
     acceptedWrite.resolve(true)
     await flushAsyncTicks()
 
-    expect(window.api.pty.writeAccepted).toHaveBeenCalledExactlyOnceWith('pty-1', chunk)
+    expect(window.api.pty.writeAccepted).toHaveBeenCalledExactlyOnceWith('pty-1', chunk, 'driving')
     await expect(accepted).resolves.toBe(false)
   })
 
@@ -601,13 +601,13 @@ describe('createIpcPtyTransport', () => {
     const transport = createIpcPtyTransport({ bufferInputUntilConnect: true })
 
     expect(transport.sendInputImmediate('immediate')).toBe(true)
-    const accepted = transport.sendInputAccepted?.('accepted')
+    const accepted = transport.sendInputAccepted?.('accepted', 'driving')
     transport.disconnect()
 
     await expect(accepted).resolves.toBe(false)
-    expect(transport.sendInput('after-disconnect')).toBe(false)
+    expect(transport.sendInput('after-disconnect', 'driving')).toBe(false)
     expect(transport.sendInputImmediate('after-disconnect')).toBe(false)
-    await expect(transport.sendInputAccepted?.('after-disconnect')).resolves.toBe(false)
+    await expect(transport.sendInputAccepted?.('after-disconnect', 'driving')).resolves.toBe(false)
     expect(window.api.pty.write).not.toHaveBeenCalled()
     expect(window.api.pty.writeAccepted).not.toHaveBeenCalled()
   })
@@ -619,13 +619,13 @@ describe('createIpcPtyTransport', () => {
     bufferPreHandlerPtyExit(ptyId, 0)
     const { createIpcPtyTransport } = await import('./pty-transport')
     const transport = createIpcPtyTransport({ bufferInputUntilConnect: true })
-    const accepted = transport.sendInputAccepted?.('input')
+    const accepted = transport.sendInputAccepted?.('input', 'driving')
 
     transport.attach({ existingPtyId: ptyId, callbacks: {} })
 
     await expect(accepted).resolves.toBe(false)
     expect(transport.isConnected()).toBe(false)
-    expect(transport.sendInput('after-exit')).toBe(false)
+    expect(transport.sendInput('after-exit', 'driving')).toBe(false)
     clearPreHandlerPtyState(ptyId)
   })
 
@@ -635,7 +635,7 @@ describe('createIpcPtyTransport', () => {
     })
     const { createIpcPtyTransport } = await import('./pty-transport')
     const transport = createIpcPtyTransport({ bufferInputUntilConnect: true })
-    const accepted = transport.sendInputAccepted?.('input')
+    const accepted = transport.sendInputAccepted?.('input', 'driving')
 
     expect(() => transport.attach({ existingPtyId: 'pty-attach-failure', callbacks: {} })).toThrow(
       'dispatcher attach failed'
@@ -643,7 +643,7 @@ describe('createIpcPtyTransport', () => {
 
     await expect(accepted).resolves.toBe(false)
     expect(transport.isConnected()).toBe(false)
-    expect(transport.sendInput('after-failure')).toBe(false)
+    expect(transport.sendInput('after-failure', 'driving')).toBe(false)
   })
 
   it('settles and drops preconnect input when the split spawn fails', async () => {
@@ -652,14 +652,14 @@ describe('createIpcPtyTransport', () => {
     const transport = createIpcPtyTransport({ bufferInputUntilConnect: true })
     const onError = vi.fn()
 
-    expect(transport.sendInput('ordinary')).toBe(true)
-    const accepted = transport.sendInputAccepted?.('accepted')
+    expect(transport.sendInput('ordinary', 'driving')).toBe(true)
+    const accepted = transport.sendInputAccepted?.('accepted', 'driving')
     await transport.connect({ url: '', callbacks: { onError } })
 
     await expect(accepted).resolves.toBe(false)
-    expect(transport.sendInput('after-failure')).toBe(false)
+    expect(transport.sendInput('after-failure', 'driving')).toBe(false)
     expect(transport.sendInputImmediate('after-failure')).toBe(false)
-    await expect(transport.sendInputAccepted?.('after-failure')).resolves.toBe(false)
+    await expect(transport.sendInputAccepted?.('after-failure', 'driving')).resolves.toBe(false)
     expect(onError).toHaveBeenCalledWith('spawn failed')
     expect(window.api.pty.write).not.toHaveBeenCalled()
     expect(window.api.pty.writeAccepted).not.toHaveBeenCalled()
@@ -673,16 +673,16 @@ describe('createIpcPtyTransport', () => {
     const transport = createIpcPtyTransport({ bufferInputUntilConnect: true })
 
     const connecting = transport.connect({ url: '', callbacks: {} })
-    expect(transport.sendInput('first')).toBe(true)
-    const accepted = transport.sendInputAccepted?.('second')
-    expect(transport.sendInput('third')).toBe(true)
+    expect(transport.sendInput('first', 'driving')).toBe(true)
+    const accepted = transport.sendInputAccepted?.('second', 'driving')
+    expect(transport.sendInput('third', 'driving')).toBe(true)
 
     spawn.resolve({ id: 'pty-1' })
     await connecting
 
     await expect(accepted).resolves.toBe(false)
     expect(window.api.pty.write).toHaveBeenCalledOnce()
-    expect(window.api.pty.write).toHaveBeenCalledWith('pty-1', 'first')
+    expect(window.api.pty.write).toHaveBeenCalledWith('pty-1', 'first', 'driving')
   })
 
   it('drops acknowledged preconnect input when an earlier ordinary write fails', async () => {
@@ -695,8 +695,8 @@ describe('createIpcPtyTransport', () => {
     const transport = createIpcPtyTransport({ bufferInputUntilConnect: true })
 
     try {
-      expect(transport.sendInput('first')).toBe(true)
-      const accepted = transport.sendInputAccepted?.('second')
+      expect(transport.sendInput('first', 'driving')).toBe(true)
+      const accepted = transport.sendInputAccepted?.('second', 'driving')
       await transport.connect({ url: '', callbacks: {} })
 
       await expect(accepted).resolves.toBe(false)
@@ -712,12 +712,14 @@ describe('createIpcPtyTransport', () => {
     const transport = createIpcPtyTransport({ bufferInputUntilConnect: true })
 
     for (let index = 0; index < PTY_PRECONNECT_INPUT_MAX_ENTRIES; index += 1) {
-      expect(transport.sendInput('x')).toBe(true)
+      expect(transport.sendInput('x', 'driving')).toBe(true)
     }
-    expect(transport.sendInput('overflow')).toBe(false)
+    expect(transport.sendInput('overflow', 'driving')).toBe(false)
 
     const oversized = createIpcPtyTransport({ bufferInputUntilConnect: true })
-    expect(oversized.sendInput('x'.repeat(PTY_PRECONNECT_INPUT_MAX_CODE_UNITS + 1))).toBe(false)
+    expect(
+      oversized.sendInput('x'.repeat(PTY_PRECONNECT_INPUT_MAX_CODE_UNITS + 1), 'driving')
+    ).toBe(false)
     await transport.destroy?.()
     await oversized.destroy?.()
   })
@@ -731,14 +733,14 @@ describe('createIpcPtyTransport', () => {
 
       await transport.connect({ url: '', callbacks: {} })
 
-      expect(transport.sendInput(`${chunk}tail`)).toBe(true)
+      expect(transport.sendInput(`${chunk}tail`, 'driving')).toBe(true)
       expect(window.api.pty.write).toHaveBeenCalledTimes(1)
-      expect(window.api.pty.write).toHaveBeenNthCalledWith(1, 'pty-1', chunk)
+      expect(window.api.pty.write).toHaveBeenNthCalledWith(1, 'pty-1', chunk, 'driving')
 
       await vi.runOnlyPendingTimersAsync()
 
       expect(window.api.pty.write).toHaveBeenCalledTimes(2)
-      expect(window.api.pty.write).toHaveBeenNthCalledWith(2, 'pty-1', 'tail')
+      expect(window.api.pty.write).toHaveBeenNthCalledWith(2, 'pty-1', 'tail', 'driving')
     } finally {
       vi.useRealTimers()
     }
@@ -755,7 +757,7 @@ describe('createIpcPtyTransport', () => {
 
       await transport.connect({ url: '', callbacks: {} })
       expect(transport.sendInputImmediate(first)).toBe(true)
-      expect(transport.sendInput(ordinary)).toBe(true)
+      expect(transport.sendInput(ordinary, 'driving')).toBe(true)
       for (const reply of replies) {
         expect(transport.sendInputImmediate(reply)).toBe(true)
       }
@@ -763,11 +765,11 @@ describe('createIpcPtyTransport', () => {
       await vi.runAllTimersAsync()
 
       expect(vi.mocked(window.api.pty.write).mock.calls).toEqual([
-        ['pty-1', first],
-        ['pty-1', ordinary],
+        ['pty-1', first, 'query-reply'],
+        ['pty-1', ordinary, 'driving'],
         ...replies
           .slice(-PTY_INPUT_WRITE_QUEUE_MAX_PENDING_REPLIES)
-          .map((reply) => ['pty-1', reply])
+          .map((reply) => ['pty-1', reply, 'query-reply'])
       ])
     } finally {
       vi.useRealTimers()
@@ -783,7 +785,7 @@ describe('createIpcPtyTransport', () => {
 
       await transport.connect({ url: '', callbacks: {} })
 
-      expect(transport.sendInput(text)).toBe(true)
+      expect(transport.sendInput(text, 'driving')).toBe(true)
       expect(window.api.pty.write).not.toHaveBeenCalled()
 
       await vi.runAllTimersAsync()
@@ -805,7 +807,7 @@ describe('createIpcPtyTransport', () => {
 
     await transport.connect({ url: '', callbacks: {} })
 
-    expect(transport.sendInput('x'.repeat(TERMINAL_INPUT_MAX_BYTES + 1))).toBe(false)
+    expect(transport.sendInput('x'.repeat(TERMINAL_INPUT_MAX_BYTES + 1), 'driving')).toBe(false)
     expect(window.api.pty.write).not.toHaveBeenCalled()
   })
 
@@ -818,16 +820,16 @@ describe('createIpcPtyTransport', () => {
 
       await transport.connect({ url: '', callbacks: {} })
 
-      const accepted = transport.sendInputAccepted?.(`${chunk}tail`)
+      const accepted = transport.sendInputAccepted?.(`${chunk}tail`, 'driving')
       await Promise.resolve()
       expect(window.api.pty.writeAccepted).toHaveBeenCalledTimes(1)
-      expect(window.api.pty.writeAccepted).toHaveBeenNthCalledWith(1, 'pty-1', chunk)
+      expect(window.api.pty.writeAccepted).toHaveBeenNthCalledWith(1, 'pty-1', chunk, 'driving')
 
       await vi.runOnlyPendingTimersAsync()
 
       await expect(accepted).resolves.toBe(true)
       expect(window.api.pty.writeAccepted).toHaveBeenCalledTimes(2)
-      expect(window.api.pty.writeAccepted).toHaveBeenNthCalledWith(2, 'pty-1', 'tail')
+      expect(window.api.pty.writeAccepted).toHaveBeenNthCalledWith(2, 'pty-1', 'tail', 'driving')
     } finally {
       vi.useRealTimers()
     }
@@ -842,7 +844,7 @@ describe('createIpcPtyTransport', () => {
 
       await transport.connect({ url: '', callbacks: {} })
 
-      const accepted = transport.sendInputAccepted?.(text)
+      const accepted = transport.sendInputAccepted?.(text, 'driving')
       await Promise.resolve()
       expect(window.api.pty.writeAccepted).not.toHaveBeenCalled()
 
@@ -867,7 +869,7 @@ describe('createIpcPtyTransport', () => {
     await transport.connect({ url: '', callbacks: {} })
 
     await expect(
-      transport.sendInputAccepted?.('x'.repeat(TERMINAL_INPUT_MAX_BYTES + 1))
+      transport.sendInputAccepted?.('x'.repeat(TERMINAL_INPUT_MAX_BYTES + 1), 'driving')
     ).resolves.toBe(false)
     expect(window.api.pty.writeAccepted).not.toHaveBeenCalled()
   })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-reattach-admission.test.ts b/src/renderer/src/components/terminal-pane/pty-transport-reattach-admission.test.ts
index 7eeba23ec8d7..b10fd3fe1bad 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-reattach-admission.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-reattach-admission.test.ts
@@ -92,7 +92,7 @@ describe('createIpcPtyTransport', () => {
     await transport.connect({ url: '', callbacks: { onError } })
     expect(onError).toHaveBeenCalled()
     expect(transport.isConnected()).toBe(false)
-    expect(transport.sendInput('echo hello\r')).toBe(false)
+    expect(transport.sendInput('echo hello\r', 'driving')).toBe(false)
     await flushPtySideEffects()
     expect(write).not.toHaveBeenCalled()
 
@@ -102,7 +102,7 @@ describe('createIpcPtyTransport', () => {
     await transport.connect({ url: '', callbacks: { onError: onErrorKilled } })
     expect(onErrorKilled).not.toHaveBeenCalled()
     expect(transport.isConnected()).toBe(false)
-    expect(transport.sendInput('echo hello\r')).toBe(false)
+    expect(transport.sendInput('echo hello\r', 'driving')).toBe(false)
     await flushPtySideEffects()
     expect(write).not.toHaveBeenCalled()
   })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-types.ts b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
index 3b835b9d0a26..dce25fd547cc 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
@@ -10,6 +10,7 @@ import type {
 import type { StartupCommandDelivery } from '../../../../shared/codex-startup-delivery'
 import type { ProjectExecutionRuntimeResolution } from '../../../../shared/project-execution-runtime'
 import type { EventProps } from '../../../../shared/telemetry-events'
+import type { TerminalInputKind } from '../../../../shared/terminal-input-kind'
 import type { TerminalOscColorQueryReplyColors } from '../../../../shared/terminal-osc-color-reply'
 import type { TuiAgent } from '../../../../shared/tui-agent'
 import type { ExecutionHostId } from '../../../../shared/execution-host'
@@ -182,7 +183,7 @@ export type PtyTransport = {
     callbacks: PtyCallbacks
   }) => void
   disconnect: () => void
-  sendInput: (data: string) => boolean
+  sendInput: (data: string, inputKind: TerminalInputKind) => boolean
   // Why: latency-critical terminal query replies (CPR/DSR/DA/OSC color/pixel
   // size) must skip input coalescing — a querying program reads them in raw
   // mode with a short timeout, so a debounced reply lands on the shell prompt
@@ -190,7 +191,7 @@ export type PtyTransport = {
   // this is `sendInput` for them; the remote transport flushes pending input
   // (preserving order) and sends the reply immediately.
   sendInputImmediate: (data: string) => boolean
-  sendInputAccepted?: (data: string) => Promise<boolean>
+  sendInputAccepted?: (data: string, inputKind: TerminalInputKind) => Promise<boolean>
   /** Settles retained pre-connect input when a deferred spawn is abandoned before connect. */
   abandonPreconnectInput?: () => void
   claimViewport?: (cols: number, rows: number) => boolean
@@ -211,6 +212,8 @@ export type PtyTransport = {
   getRecoveryState?: () => PtyTransportRecoveryState
   /** Starts a fresh connection epoch while preserving the authoritative remote PTY identity. */
   retryRecovery?: () => boolean
+  /** Lets a wrapper retain input when recovery re-enters connect internally. */
+  setConnectForRecovery?: (connect: PtyTransport['connect']) => void
   /** The user dismissed the error surface; the next occurrence of the same message must surface again. */
   notifyErrorSurfaceDismissed?: () => void
   getPtyId: () => string | null
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-user-input.test.ts b/src/renderer/src/components/terminal-pane/pty-transport-user-input.test.ts
new file mode 100644
index 000000000000..34a71b81b8c7
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-transport-user-input.test.ts
@@ -0,0 +1,89 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createDeferred, flushAsyncTicks } from './pty-connection-test-async'
+import type { PtyPreconnectInputEntry } from './pty-preconnect-input-buffer'
+import { installIpcPtyWindow, restorePtySpecWindow } from './pty-transport-test-harness'
+
+describe('createIpcPtyTransport: input kind', () => {
+  const originalWindow: typeof window | undefined = globalThis.window
+
+  beforeEach(() => {
+    vi.resetModules()
+    installIpcPtyWindow(originalWindow, {})
+  })
+
+  afterEach(() => {
+    restorePtySpecWindow(originalWindow)
+  })
+
+  it('sends every write with the kind its writer gave it', async () => {
+    const { createIpcPtyTransport } = await import('./pty-transport')
+    const transport = createIpcPtyTransport({})
+    await transport.connect({ url: '', callbacks: {} })
+
+    transport.sendInput('typed', 'driving')
+    await flushAsyncTicks()
+    transport.sendInput('\x1b[I', 'query-reply')
+    await flushAsyncTicks()
+    transport.sendInputImmediate('\x1b[1;1R')
+    await flushAsyncTicks()
+    await transport.sendInputAccepted?.('echo startup\r', 'launch')
+
+    expect(vi.mocked(window.api.pty.write).mock.calls).toEqual([
+      ['pty-1', 'typed', 'driving'],
+      ['pty-1', '\x1b[I', 'query-reply'],
+      ['pty-1', '\x1b[1;1R', 'query-reply']
+    ])
+    expect(window.api.pty.writeAccepted).toHaveBeenCalledWith('pty-1', 'echo startup\r', 'launch')
+    transport.disconnect()
+  })
+
+  it('never merges bytes of different kinds', async () => {
+    const { createIpcPtyTransport } = await import('./pty-transport')
+    const transport = createIpcPtyTransport({})
+    await transport.connect({ url: '', callbacks: {} })
+
+    // The first write drains at once; what queues behind it would otherwise coalesce.
+    transport.sendInput('\x1b[O', 'query-reply')
+    transport.sendInput('\x1b[I', 'query-reply')
+    transport.sendInput('a', 'driving')
+    transport.sendInput('b', 'driving')
+
+    await vi.waitFor(() =>
+      expect(vi.mocked(window.api.pty.write).mock.calls).toEqual([
+        ['pty-1', '\x1b[O', 'query-reply'],
+        ['pty-1', '\x1b[I', 'query-reply'],
+        ['pty-1', 'ab', 'driving']
+      ])
+    )
+    transport.disconnect()
+  })
+
+  it('keeps the kind of input written before the spawn connects and across a remount', async () => {
+    const spawn = createDeferred<Awaited<ReturnType<typeof window.api.pty.spawn>>>()
+    vi.mocked(window.api.pty.spawn).mockReturnValue(spawn.promise)
+    const { createIpcPtyTransport } = await import('./pty-transport')
+    const captured: PtyPreconnectInputEntry[] = []
+    const predecessor = createIpcPtyTransport({
+      bufferInputUntilConnect: true,
+      onPreconnectInput: (entry) => captured.push(entry)
+    })
+    void predecessor.connect({ url: '', callbacks: {} })
+    predecessor.sendInput('typed-early', 'driving')
+    predecessor.sendInput('startup', 'launch')
+    predecessor.destroy?.()
+
+    const successor = createIpcPtyTransport({ preconnectInput: captured })
+    spawn.resolve({ id: 'pty-1' })
+    await successor.connect({ url: '', callbacks: {} })
+    await flushAsyncTicks()
+
+    expect(captured).toEqual([
+      { data: 'typed-early', kind: 'ordinary', inputKind: 'driving' },
+      { data: 'startup', kind: 'ordinary', inputKind: 'launch' }
+    ])
+    expect(vi.mocked(window.api.pty.write).mock.calls).toEqual([
+      ['pty-1', 'typed-early', 'driving'],
+      ['pty-1', 'startup', 'launch']
+    ])
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport.ts b/src/renderer/src/components/terminal-pane/pty-transport.ts
index a8adfccb7ac7..fd26a7324b5d 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport.ts
@@ -5,6 +5,7 @@ import { createPtyInputWriteQueue } from './pty-input-write-queue'
 import { createPtyOutputProcessor } from './pty-output-processor'
 import { createPtyPreconnectInputBuffer } from './pty-preconnect-input-buffer'
 import type { IpcPtyTransportOptions, PtyTransport } from './pty-transport-types'
+import type { TerminalInputKind } from '../../../../shared/terminal-input-kind'
 
 export {
   ensurePtyDispatcher,
@@ -57,8 +58,8 @@ export function createIpcPtyTransport(opts: IpcPtyTransportOptions = {}): PtyTra
 
   const inputWriteQueue = createPtyInputWriteQueue({
     isWritable: (id) => !destroyed && connected && ptyId === id,
-    write: (id, data) => window.api.pty.write(id, data),
-    writeAccepted: (id, data) => window.api.pty.writeAccepted(id, data),
+    write: (id, data, inputKind) => window.api.pty.write(id, data, inputKind),
+    writeAccepted: (id, data, inputKind) => window.api.pty.writeAccepted(id, data, inputKind),
     onDrainFailure: (id) => {
       if (ptyId === id) {
         storedCallbacks.onWriteUnavailable?.()
@@ -115,12 +116,13 @@ export function createIpcPtyTransport(opts: IpcPtyTransportOptions = {}): PtyTra
     }
     await preconnectInputBuffer.flush({
       isCurrent: () => !destroyed && connected && ptyId === id,
-      sendInput: (data) => inputWriteQueue.enqueue(id, data),
+      sendInput: (data, inputKind) => inputWriteQueue.enqueue(id, data, inputKind),
       sendInputImmediate: (data) => inputWriteQueue.enqueueQueryReply(id, data),
       ...(connectionId
         ? {}
         : {
-            sendInputAccepted: (data: string) => inputWriteQueue.enqueueAccepted(id, data)
+            sendInputAccepted: (data: string, inputKind: TerminalInputKind) =>
+              inputWriteQueue.enqueueAccepted(id, data, inputKind)
           })
     })
   }
@@ -213,16 +215,23 @@ export function createIpcPtyTransport(opts: IpcPtyTransportOptions = {}): PtyTra
       storedCallbacks = {}
     },
 
-    sendInput(data) {
+    sendInput(data, inputKind) {
       if (!destroyed && preconnectInputBuffer?.isBuffering()) {
-        return preconnectInputBuffer.enqueue(data, 'ordinary', opts.onPreconnectInput)
+        return preconnectInputBuffer.enqueue(data, 'ordinary', inputKind, opts.onPreconnectInput)
       }
-      return !destroyed && connected && ptyId ? inputWriteQueue.enqueue(ptyId, data) : false
+      return !destroyed && connected && ptyId
+        ? inputWriteQueue.enqueue(ptyId, data, inputKind)
+        : false
     },
 
     sendInputImmediate(data) {
       if (!destroyed && preconnectInputBuffer?.isBuffering()) {
-        return preconnectInputBuffer.enqueue(data, 'immediate', opts.onPreconnectInput)
+        return preconnectInputBuffer.enqueue(
+          data,
+          'immediate',
+          'query-reply',
+          opts.onPreconnectInput
+        )
       }
       return !destroyed && connected && ptyId
         ? inputWriteQueue.enqueueQueryReply(ptyId, data)
@@ -232,14 +241,14 @@ export function createIpcPtyTransport(opts: IpcPtyTransportOptions = {}): PtyTra
     ...(connectionId
       ? {}
       : {
-          async sendInputAccepted(data: string): Promise<boolean> {
+          async sendInputAccepted(data: string, inputKind: TerminalInputKind): Promise<boolean> {
             if (!destroyed && preconnectInputBuffer?.isBuffering()) {
-              return preconnectInputBuffer.enqueueAccepted(data, opts.onPreconnectInput)
+              return preconnectInputBuffer.enqueueAccepted(data, inputKind, opts.onPreconnectInput)
             }
             if (destroyed || !connected || !ptyId) {
               return false
             }
-            return inputWriteQueue.enqueueAccepted(ptyId, data)
+            return inputWriteQueue.enqueueAccepted(ptyId, data, inputKind)
           }
         }),
 
diff --git a/src/renderer/src/components/terminal-pane/remote-reattach-input-buffer.test.ts b/src/renderer/src/components/terminal-pane/remote-reattach-input-buffer.test.ts
new file mode 100644
index 000000000000..9b6a731b1585
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/remote-reattach-input-buffer.test.ts
@@ -0,0 +1,150 @@
+import { describe, expect, it, vi } from 'vitest'
+import { createDeferred, flushAsyncTicks } from './pty-connection-test-async'
+import type { PtyConnectResult, PtyTransport } from './pty-transport-types'
+import { withRemoteReattachInputBuffer } from './remote-reattach-input-buffer'
+
+const ORIGINAL_ID = 'remote:environment@@term_original'
+
+function createHarness() {
+  const connected = createDeferred<PtyConnectResult | undefined>()
+  let ptyId: string | null = null
+  const writes: string[] = []
+  const delegate: PtyTransport = {
+    connect: vi.fn(() => connected.promise),
+    attach: vi.fn(),
+    disconnect: vi.fn(),
+    detach: vi.fn(),
+    destroy: vi.fn(),
+    isConnected: () => ptyId !== null,
+    getPtyId: () => ptyId,
+    resize: () => true,
+    sendInput: vi.fn((data) => {
+      if (!ptyId) {
+        return false
+      }
+      writes.push(data)
+      return true
+    }),
+    sendInputImmediate: vi.fn(() => false),
+    sendInputAccepted: vi.fn(async (data) => {
+      if (!ptyId) {
+        return false
+      }
+      writes.push(data)
+      return true
+    })
+  }
+  return {
+    delegate,
+    connected,
+    writes,
+    transport: withRemoteReattachInputBuffer(delegate),
+    finish(id: string | null = ORIGINAL_ID) {
+      ptyId = id
+      connected.resolve(id ? { id, isReattach: true } : undefined)
+    }
+  }
+}
+
+describe('remote reattach type-ahead', () => {
+  it('preserves typing from the restored screen before connect starts', async () => {
+    const harness = createHarness()
+    expect(harness.transport.sendInput('before', 'driving')).toBe(true)
+    const accepted = harness.transport.sendInputAccepted?.('\x03', 'driving')
+    const connecting = harness.transport.connect({ url: '', sessionId: ORIGINAL_ID, callbacks: {} })
+    expect(harness.transport.sendInput('after\r', 'driving')).toBe(true)
+    harness.finish()
+    await connecting
+    await expect(accepted).resolves.toBe(true)
+    expect(harness.writes).toEqual(['before', '\x03', 'after\r'])
+  })
+
+  it('discards pre-entry typing when the first connection creates a fresh terminal', async () => {
+    const harness = createHarness()
+    const accepted = harness.transport.sendInputAccepted?.('old tail\r', 'driving')
+    const connecting = harness.transport.connect({ url: '', callbacks: {} })
+    await expect(accepted).resolves.toBe(false)
+    harness.finish('remote:environment@@fresh')
+    await connecting
+    expect(harness.writes).toEqual([])
+  })
+
+  it('delivers typing and an acknowledged interrupt once the original endpoint reattaches', async () => {
+    const harness = createHarness()
+    const connecting = harness.transport.connect({ url: '', sessionId: ORIGINAL_ID, callbacks: {} })
+    expect(harness.transport.sendInput('partial', 'driving')).toBe(true)
+    const accepted = harness.transport.sendInputAccepted?.('\x03', 'driving')
+    expect(harness.transport.sendInput('next\r', 'driving')).toBe(true)
+    expect(harness.writes).toEqual([])
+    harness.finish()
+    await connecting
+    await expect(accepted).resolves.toBe(true)
+    expect(harness.writes).toEqual(['partial', '\x03', 'next\r'])
+    expect(harness.transport.sendInput('later', 'driving')).toBe(true)
+    expect(harness.writes.at(-1)).toBe('later')
+  })
+
+  it.each(['remote:environment@@term_replacement', null])(
+    'never forwards retained input when the original endpoint is unavailable: %s',
+    async (replacementId) => {
+      const harness = createHarness()
+      const connecting = harness.transport.connect({
+        url: '',
+        sessionId: ORIGINAL_ID,
+        callbacks: {}
+      })
+      const accepted = harness.transport.sendInputAccepted?.('dangerous tail\r', 'driving')
+      harness.finish(replacementId)
+      await connecting
+      await expect(accepted).resolves.toBe(false)
+      expect(harness.writes).toEqual([])
+    }
+  )
+
+  it.each(['disconnect', 'detach', 'destroy'] as const)(
+    'drops input and settles accepted writes on %s before a late reattach',
+    async (action) => {
+      const harness = createHarness()
+      const connecting = harness.transport.connect({
+        url: '',
+        sessionId: ORIGINAL_ID,
+        callbacks: {}
+      })
+      const accepted = harness.transport.sendInputAccepted?.('stale\r', 'driving')
+      harness.transport[action]?.()
+      await expect(accepted).resolves.toBe(false)
+      harness.finish()
+      await connecting
+      expect(harness.writes).toEqual([])
+    }
+  )
+
+  it('keeps newly typed bytes behind a pending acknowledged write', async () => {
+    const harness = createHarness()
+    const acknowledgement = createDeferred<boolean>()
+    harness.delegate.sendInputAccepted = () => acknowledgement.promise
+    const transport = withRemoteReattachInputBuffer(harness.delegate)
+    const connecting = transport.connect({ url: '', sessionId: ORIGINAL_ID, callbacks: {} })
+    const accepted = transport.sendInputAccepted?.('\x03', 'driving')
+    harness.finish()
+    await flushAsyncTicks()
+    expect(transport.sendInput('after interrupt\r', 'driving')).toBe(true)
+    expect(harness.writes).toEqual([])
+    acknowledgement.resolve(true)
+    await connecting
+    await expect(accepted).resolves.toBe(true)
+    expect(harness.writes).toEqual(['after interrupt\r'])
+  })
+
+  it('rejects pending writes when connection fails and leaves query replies unbuffered', async () => {
+    const harness = createHarness()
+    const connecting = harness.transport.connect({ url: '', sessionId: ORIGINAL_ID, callbacks: {} })
+    const accepted = harness.transport.sendInputAccepted?.('typed', 'driving')
+    expect(harness.transport.sendInput('\x1b[I', 'query-reply')).toBe(false)
+    expect(harness.transport.sendInputImmediate('\x1b[1;1R')).toBe(false)
+    harness.connected.reject(new Error('offline'))
+    await expect(connecting).rejects.toThrow('offline')
+    await expect(accepted).resolves.toBe(false)
+    expect(harness.writes).toEqual([])
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/remote-reattach-input-buffer.ts b/src/renderer/src/components/terminal-pane/remote-reattach-input-buffer.ts
new file mode 100644
index 000000000000..6e5969a74c86
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/remote-reattach-input-buffer.ts
@@ -0,0 +1,90 @@
+import { parseRemoteRuntimePtyId } from '../../../../shared/remote-runtime-pty-id'
+import { createPtyPreconnectInputBuffer } from './pty-preconnect-input-buffer'
+import type { PtyTransport } from './pty-transport-types'
+
+/** Keeps type-ahead on a restored screen bound to its original remote terminal. */
+export function withRemoteReattachInputBuffer(transport: PtyTransport): PtyTransport {
+  const sendAccepted = transport.sendInputAccepted?.bind(transport)
+  let pending: ReturnType<typeof createPtyPreconnectInputBuffer> | null =
+    createPtyPreconnectInputBuffer()
+  let entered = false
+  const clear = (): void => {
+    pending?.clear()
+    pending = null
+  }
+  const wrapped: PtyTransport = {
+    ...transport,
+    async connect(options) {
+      const expectedId = options.sessionId
+      const initialBuffer = entered ? null : pending
+      entered = true
+      const buffer =
+        expectedId && parseRemoteRuntimePtyId(expectedId)
+          ? (initialBuffer ?? createPtyPreconnectInputBuffer())
+          : null
+      // Restored pixels can accept typing before the first connect call begins.
+      if (pending !== buffer) {
+        clear()
+      }
+      pending = buffer
+      try {
+        const result = await transport.connect(options)
+        if (buffer) {
+          await buffer.flush({
+            // A replacement endpoint must never receive the old terminal's unfinished command.
+            isCurrent: () => pending === buffer && transport.getPtyId() === expectedId,
+            sendInput: (data, kind) => transport.sendInput(data, kind),
+            sendInputImmediate: (data) => transport.sendInputImmediate(data),
+            ...(sendAccepted ? { sendInputAccepted: sendAccepted } : {})
+          })
+        }
+        return result
+      } finally {
+        buffer?.clear()
+        if (pending === buffer) {
+          pending = null
+        }
+      }
+    },
+    sendInput(data, kind) {
+      return kind !== 'query-reply' && pending?.isBuffering()
+        ? pending.enqueue(data, 'ordinary', kind)
+        : transport.sendInput(data, kind)
+    },
+    // Emulator replies stay on the immediate path; replay must not retain them as user input.
+    ...(sendAccepted
+      ? {
+          sendInputAccepted: (data, kind) =>
+            kind !== 'query-reply' && pending?.isBuffering()
+              ? pending.enqueueAccepted(data, kind)
+              : sendAccepted(data, kind)
+        }
+      : {}),
+    attach(options) {
+      entered = true
+      clear()
+      transport.attach(options)
+    },
+    disconnect() {
+      entered = true
+      clear()
+      transport.disconnect()
+    },
+    ...(transport.detach
+      ? {
+          detach: (options) => {
+            entered = true
+            clear()
+            transport.detach?.(options)
+          }
+        }
+      : {}),
+    destroy(options) {
+      entered = true
+      clear()
+      return transport.destroy?.(options)
+    }
+  }
+  transport.setConnectForRecovery?.((options) => wrapped.connect(options))
+  return wrapped
+}
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-error-surface-dismissal.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-error-surface-dismissal.test.ts
index 1df9a355a051..b07afbb20d34 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-error-surface-dismissal.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-error-surface-dismissal.test.ts
@@ -48,18 +48,18 @@ describe('remote runtime error surface dismissal', () => {
     const onError = vi.fn()
     const transport = await attachTransportWithFatalSends(onError)
 
-    expect(await transport.sendInputAccepted?.('a')).toBe(false)
-    expect(await transport.sendInputAccepted?.('b')).toBe(false)
+    expect(await transport.sendInputAccepted?.('a', 'driving')).toBe(false)
+    expect(await transport.sendInputAccepted?.('b', 'driving')).toBe(false)
     // Contract preserved: one continuous outage still surfaces the repeated error once.
     expect(onError.mock.calls).toEqual([[FATAL_ERROR]])
 
     transport.notifyErrorSurfaceDismissed?.()
 
-    expect(await transport.sendInputAccepted?.('c')).toBe(false)
+    expect(await transport.sendInputAccepted?.('c', 'driving')).toBe(false)
     expect(onError.mock.calls).toEqual([[FATAL_ERROR], [FATAL_ERROR]])
 
     // The memory re-arms: repeats after the re-surfaced error are suppressed again until the next dismissal.
-    expect(await transport.sendInputAccepted?.('d')).toBe(false)
+    expect(await transport.sendInputAccepted?.('d', 'driving')).toBe(false)
     expect(onError).toHaveBeenCalledTimes(2)
     transport.destroy?.()
   })
@@ -68,9 +68,9 @@ describe('remote runtime error surface dismissal', () => {
     const onError = vi.fn()
     const transport = await attachTransportWithFatalSends(onError)
 
-    expect(await transport.sendInputAccepted?.('a')).toBe(false)
-    expect(await transport.sendInputAccepted?.('b')).toBe(false)
-    expect(await transport.sendInputAccepted?.('c')).toBe(false)
+    expect(await transport.sendInputAccepted?.('a', 'driving')).toBe(false)
+    expect(await transport.sendInputAccepted?.('b', 'driving')).toBe(false)
+    expect(await transport.sendInputAccepted?.('c', 'driving')).toBe(false)
 
     expect(onError).toHaveBeenCalledTimes(1)
     transport.destroy?.()
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-query-reply-immediate.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-query-reply-immediate.test.ts
index ec46891e9d53..6d8616a1baa8 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-query-reply-immediate.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-query-reply-immediate.test.ts
@@ -71,7 +71,7 @@ describe('remote transport sendInputImmediate (#7329)', () => {
       await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalled())
 
       // Typed input: debounced — nothing sent before the 8ms flush.
-      expect(transport.sendInput('yes')).toBe(true)
+      expect(transport.sendInput('yes', 'driving')).toBe(true)
       expect(terminalSendCalls()).toEqual([])
 
       // Query reply (OSC 11 background color): sent immediately, no timer.
@@ -139,10 +139,10 @@ describe('remote transport sendInputImmediate (#7329)', () => {
     // A paste above CLIPBOARD_TEXT_MEASURE_YIELD_CODE_UNITS forces the async
     // validation path, so its bytes are captured in validationTail, not pending.
     const paste = 'p'.repeat(CLIPBOARD_TEXT_MEASURE_YIELD_CODE_UNITS + 1)
-    expect(transport.sendInput(paste)).toBe(true)
+    expect(transport.sendInput(paste, 'driving')).toBe(true)
     // Immediately (validation still pending) a TUI emits a CPR reply.
     expect(transport.sendInputImmediate('\x1b[3;1R')).toBe(true)
-    expect(transport.sendInput('z')).toBe(true)
+    expect(transport.sendInput('z', 'driving')).toBe(true)
 
     // Wait until the reply is actually flushed instead of sleeping a fixed
     // interval: the reply legitimately trails the paste's async validation plus
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-session-launch.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-session-launch.test.ts
index 6185198d59e0..f5861cbc8105 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-session-launch.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-session-launch.test.ts
@@ -523,7 +523,7 @@ describe('createRemoteRuntimePtyTransport', () => {
       }
       send.mockClear()
 
-      expect(transport.sendInput('ls\r')).toBe(true)
+      expect(transport.sendInput('ls\r', 'driving')).toBe(true)
       await vi.runOnlyPendingTimersAsync()
       expect(runtimeCall).not.toHaveBeenCalled()
       const inputFrame = decodeTerminalStreamFrame(send.mock.calls[0][0])
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-surface-replacement.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-surface-replacement.test.ts
index 398efce980ae..58034193be8f 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-surface-replacement.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-surface-replacement.test.ts
@@ -249,7 +249,9 @@ describe('createRemoteRuntimePtyTransport', () => {
       expect(handleEvents.getWebSessionTerminalHandleSubscriberCountForTests()).toBe(1)
 
       const listCallsAfterBound = hostListCalls
-      await expect(transport.sendInputAccepted?.('retry while reconnecting')).resolves.toBe(false)
+      await expect(
+        transport.sendInputAccepted?.('retry while reconnecting', 'driving')
+      ).resolves.toBe(false)
       await vi.advanceTimersByTimeAsync(16_000)
 
       // The accepted-snapshot listener already owns recovery. User input must
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-input-coalescing.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-input-coalescing.test.ts
index 999716aa43d3..b77f0b26e82f 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-input-coalescing.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-input-coalescing.test.ts
@@ -143,9 +143,9 @@ describe('createRemoteRuntimePtyTransport', () => {
       })
       await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalled())
       expect(transport.claimViewport?.(101, 33)).toBe(true)
-      expect(transport.sendInput('x')).toBe(true)
+      expect(transport.sendInput('x', 'driving')).toBe(true)
       expect(transport.sendInputImmediate('\x1b[?1;2c')).toBe(true)
-      expect(transport.sendInput('z')).toBe(true)
+      expect(transport.sendInput('z', 'driving')).toBe(true)
       await vi.advanceTimersByTimeAsync(8)
       expect(runtimeCall).not.toHaveBeenCalledWith(
         expect.objectContaining({ method: 'terminal.send' })
@@ -193,8 +193,8 @@ describe('createRemoteRuntimePtyTransport', () => {
       runtimeCall.mockClear()
       subscriptionSendBinary.mockClear()
 
-      expect(transport.sendInput('a')).toBe(true)
-      expect(transport.sendInput('b')).toBe(true)
+      expect(transport.sendInput('a', 'driving')).toBe(true)
+      expect(transport.sendInput('b', 'driving')).toBe(true)
       expect(runtimeCall).not.toHaveBeenCalled()
 
       await vi.runOnlyPendingTimersAsync()
@@ -225,8 +225,8 @@ describe('createRemoteRuntimePtyTransport', () => {
       runtimeCall.mockClear()
       subscriptionSendBinary.mockClear()
 
-      expect(transport.sendInput('a')).toBe(true)
-      expect(transport.sendInput('b')).toBe(true)
+      expect(transport.sendInput('a', 'driving')).toBe(true)
+      expect(transport.sendInput('b', 'driving')).toBe(true)
       await vi.runOnlyPendingTimersAsync()
 
       expect(runtimeCall).not.toHaveBeenCalled()
@@ -256,14 +256,14 @@ describe('createRemoteRuntimePtyTransport', () => {
       subscriptionSendBinary.mockClear()
 
       const chunk = 'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES)
-      expect(transport.sendInput(chunk)).toBe(true)
+      expect(transport.sendInput(chunk, 'driving')).toBe(true)
       expect(subscriptionSendBinary).toHaveBeenCalledTimes(1)
       let frame = decodeTerminalStreamFrame(subscriptionSendBinary.mock.calls[0][0])
       expect(frame?.opcode).toBe(TerminalStreamOpcode.Input)
       expect(frame?.streamId).toBe(streamId)
       expect(frame ? decodeTerminalStreamText(frame.payload) : '').toBe(chunk)
 
-      expect(transport.sendInput('tail')).toBe(true)
+      expect(transport.sendInput('tail', 'driving')).toBe(true)
       await vi.runOnlyPendingTimersAsync()
 
       expect(runtimeCall).not.toHaveBeenCalled()
@@ -299,7 +299,7 @@ describe('createRemoteRuntimePtyTransport', () => {
 
     await transport.connect({ url: '', callbacks: {} })
 
-    await expect(transport.sendInputAccepted?.('\x03')).resolves.toBe(true)
+    await expect(transport.sendInputAccepted?.('\x03', 'driving')).resolves.toBe(true)
     expect(runtimeCall).toHaveBeenCalledWith({
       selector: 'env-1',
       method: 'terminal.send',
@@ -339,8 +339,8 @@ describe('createRemoteRuntimePtyTransport', () => {
       await transport.connect({ url: '', callbacks: {} })
       subscriptionSendBinary.mockClear()
 
-      expect(transport.sendInput('a')).toBe(true)
-      await expect(transport.sendInputAccepted?.('\x03')).resolves.toBe(true)
+      expect(transport.sendInput('a', 'driving')).toBe(true)
+      await expect(transport.sendInputAccepted?.('\x03', 'driving')).resolves.toBe(true)
       await vi.runOnlyPendingTimersAsync()
 
       expect(runtimeCall).toHaveBeenCalledWith({
@@ -383,7 +383,7 @@ describe('createRemoteRuntimePtyTransport', () => {
 
     await transport.connect({ url: '', callbacks: {} })
 
-    await expect(transport.sendInputAccepted?.('\x03')).resolves.toBe(false)
+    await expect(transport.sendInputAccepted?.('\x03', 'driving')).resolves.toBe(false)
   })
 
   it('splits large acknowledged remote input before terminal.send RPCs', async () => {
@@ -415,7 +415,7 @@ describe('createRemoteRuntimePtyTransport', () => {
     await transport.connect({ url: '', callbacks: {} })
 
     const chunk = '😀'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES / 4)
-    await expect(transport.sendInputAccepted?.(`${chunk}tail`)).resolves.toBe(true)
+    await expect(transport.sendInputAccepted?.(`${chunk}tail`, 'driving')).resolves.toBe(true)
 
     const sendCalls = runtimeCall.mock.calls.filter((call) => call[0].method === 'terminal.send')
     expect(sendCalls).toHaveLength(2)
@@ -455,7 +455,7 @@ describe('createRemoteRuntimePtyTransport', () => {
       await transport.connect({ url: '', callbacks: {} })
       runtimeCall.mockClear()
 
-      const accepted = transport.sendInputAccepted?.(text)
+      const accepted = transport.sendInputAccepted?.(text, 'driving')
       await Promise.resolve()
 
       expect(runtimeCall).not.toHaveBeenCalled()
@@ -502,9 +502,9 @@ describe('createRemoteRuntimePtyTransport', () => {
 
     await transport.connect({ url: '', callbacks: {} })
 
-    await expect(transport.sendInputAccepted?.(`${firstChunk}${rejectedChunk}after`)).resolves.toBe(
-      false
-    )
+    await expect(
+      transport.sendInputAccepted?.(`${firstChunk}${rejectedChunk}after`, 'driving')
+    ).resolves.toBe(false)
 
     const sendTexts = runtimeCall.mock.calls
       .filter((call) => call[0].method === 'terminal.send')
@@ -530,7 +530,10 @@ describe('createRemoteRuntimePtyTransport', () => {
     runtimeCall.mockClear()
 
     await expect(
-      transport.sendInputAccepted?.('😀'.repeat(Math.floor(TERMINAL_INPUT_MAX_BYTES / 4) + 1))
+      transport.sendInputAccepted?.(
+        '😀'.repeat(Math.floor(TERMINAL_INPUT_MAX_BYTES / 4) + 1),
+        'driving'
+      )
     ).resolves.toBe(false)
     expect(runtimeCall).not.toHaveBeenCalled()
   })
@@ -550,7 +553,7 @@ describe('createRemoteRuntimePtyTransport', () => {
       runtimeCall.mockClear()
       subscriptionSendBinary.mockClear()
 
-      expect(transport.sendInput('echo one\necho two\r\n')).toBe(true)
+      expect(transport.sendInput('echo one\necho two\r\n', 'driving')).toBe(true)
       await vi.runOnlyPendingTimersAsync()
 
       expect(runtimeCall).not.toHaveBeenCalled()
@@ -614,7 +617,7 @@ describe('createRemoteRuntimePtyTransport', () => {
       subscriptionSendBinary.mockClear()
 
       expect(transport.claimViewport?.(101, 33)).toBe(true)
-      expect(transport.sendInput('x')).toBe(true)
+      expect(transport.sendInput('x', 'driving')).toBe(true)
       await vi.runOnlyPendingTimersAsync()
 
       const frames = subscriptionSendBinary.mock.calls.map((call) =>
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-input-fallback.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-input-fallback.test.ts
index 6230bd00d8f4..30c03745abed 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-input-fallback.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-input-fallback.test.ts
@@ -60,7 +60,7 @@ describe('createRemoteRuntimePtyTransport', () => {
         callbacks: { onWriteUnavailable }
       })
       await vi.waitFor(() => expect(transport.getPtyId()).toBe('remote:env-1@@terminal-1'))
-      expect(transport.sendInput('x')).toBe(true)
+      expect(transport.sendInput('x', 'driving')).toBe(true)
       await vi.advanceTimersByTimeAsync(8)
 
       await vi.waitFor(() => expect(onWriteUnavailable).toHaveBeenCalledOnce())
@@ -103,7 +103,7 @@ describe('createRemoteRuntimePtyTransport', () => {
         callbacks: { onWriteUnavailable, onError }
       })
       await vi.waitFor(() => expect(transport.getPtyId()).toBe('remote:env-1@@terminal-1'))
-      expect(transport.sendInput('x')).toBe(true)
+      expect(transport.sendInput('x', 'driving')).toBe(true)
       await vi.advanceTimersByTimeAsync(8)
 
       await vi.waitFor(() => expect(onWriteUnavailable).toHaveBeenCalledOnce())
@@ -148,7 +148,7 @@ describe('createRemoteRuntimePtyTransport', () => {
         callbacks: { onWriteUnavailable: oldWriteUnavailable }
       })
       await vi.waitFor(() => expect(transport.getPtyId()).toBe('remote:env-1@@terminal-1'))
-      expect(transport.sendInput('old')).toBe(true)
+      expect(transport.sendInput('old', 'driving')).toBe(true)
       await vi.advanceTimersByTimeAsync(8)
       await vi.waitFor(() =>
         expect(runtimeCall).toHaveBeenCalledWith(
@@ -205,7 +205,7 @@ describe('createRemoteRuntimePtyTransport', () => {
         callbacks: {}
       })
       await vi.waitFor(() => expect(transport.getPtyId()).toBe('remote:env-1@@terminal-old'))
-      expect(transport.sendInput('queued-for-old')).toBe(true)
+      expect(transport.sendInput('queued-for-old', 'driving')).toBe(true)
 
       resolvedPaneHandle = 'terminal-new'
       transport.attach({
@@ -322,7 +322,7 @@ describe('createRemoteRuntimePtyTransport', () => {
       subscriptionSendBinary.mockClear()
 
       // Why: replacement input stays disabled until terminal.resolvePane proves the new handle belongs to this pane.
-      expect(transport.sendInput('x')).toBe(false)
+      expect(transport.sendInput('x', 'driving')).toBe(false)
       vi.advanceTimersByTime(8)
 
       const inputFrames = subscriptionSendBinary.mock.calls
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-reattach-type-ahead.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-reattach-type-ahead.test.ts
new file mode 100644
index 000000000000..94fd6f828539
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-reattach-type-ahead.test.ts
@@ -0,0 +1,68 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+import {
+  TerminalStreamOpcode,
+  decodeTerminalStreamText
+} from '../../../../shared/terminal-stream-protocol'
+import { createDeferred } from './pty-connection-test-async'
+import {
+  createRemoteRuntimeTransportMocks,
+  type MultiplexSubscriptionCallbacks
+} from './remote-runtime-pty-transport-test-harness'
+
+let callbacks: MultiplexSubscriptionCallbacks = null
+let resolvedHandle = 'terminal-1'
+const { runtimeCall, latestFrameForOpcode, resetRemoteRuntimeTransport } =
+  createRemoteRuntimeTransportMocks({
+    getCallbacks: () => callbacks,
+    setCallbacks: (value) => {
+      callbacks = value
+    },
+    getResolvedPaneHandle: () => resolvedHandle,
+    setResolvedPaneHandle: (value) => {
+      resolvedHandle = value
+    }
+  })
+
+beforeEach(resetRemoteRuntimeTransport)
+
+it('sends typing from a restored screen after the host finishes resolving its original pane', async () => {
+  const resolution = createDeferred<void>()
+  const call = runtimeCall.getMockImplementation()
+  runtimeCall.mockImplementation(async (request: { method: string }) => {
+    if (request.method === 'terminal.resolvePane') {
+      await resolution.promise
+    }
+    return call?.(request)
+  })
+  const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
+  const transport = createRemoteRuntimePtyTransport('env-1', {
+    worktreeId: 'wt-1',
+    tabId: 'web-terminal-host-tab-1',
+    leafId: 'pane:1'
+  })
+  try {
+    expect(transport.sendInput('probe-', 'driving')).toBe(true)
+    const connecting = transport.connect({
+      url: '',
+      sessionId: 'remote:env-1@@terminal-1',
+      callbacks: {}
+    })
+    await vi.waitFor(() => {
+      expect(runtimeCall).toHaveBeenCalledWith(
+        expect.objectContaining({ method: 'terminal.resolvePane' })
+      )
+    })
+    expect(transport.getPtyId()).toBeNull()
+    expect(transport.sendInput('cold-parked\r', 'driving')).toBe(true)
+    expect(latestFrameForOpcode(TerminalStreamOpcode.Input)).toBeUndefined()
+    resolution.resolve()
+    await connecting
+    await vi.waitFor(() => {
+      const frame = latestFrameForOpcode(TerminalStreamOpcode.Input)
+      expect(frame && decodeTerminalStreamText(frame.payload)).toBe('probe-cold-parked\r')
+    })
+  } finally {
+    resolution.resolve()
+    transport.destroy?.()
+  }
+})
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-stale-handle-recovery.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-stale-handle-recovery.test.ts
index 53c1921fe745..cec529588521 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-stale-handle-recovery.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-stale-handle-recovery.test.ts
@@ -226,7 +226,7 @@ describe('createRemoteRuntimePtyTransport', () => {
     if (!sendInputAccepted) {
       throw new Error('Expected acknowledged remote terminal input')
     }
-    const pendingSend = sendInputAccepted('sent-before-rebind')
+    const pendingSend = sendInputAccepted('sent-before-rebind', 'driving')
     await vi.waitFor(() =>
       expect(runtimeCall).toHaveBeenCalledWith(expect.objectContaining({ method: 'terminal.send' }))
     )
@@ -293,7 +293,7 @@ describe('createRemoteRuntimePtyTransport', () => {
     if (!sendInputAccepted) {
       throw new Error('Expected acknowledged remote terminal input')
     }
-    const pendingSend = sendInputAccepted('sent-before-close')
+    const pendingSend = sendInputAccepted('sent-before-close', 'driving')
     await vi.waitFor(() =>
       expect(runtimeCall).toHaveBeenCalledWith(expect.objectContaining({ method: 'terminal.send' }))
     )
@@ -390,7 +390,7 @@ describe('createRemoteRuntimePtyTransport', () => {
       if (!sendInputAccepted) {
         throw new Error('Expected acknowledged remote terminal input')
       }
-      const pendingSend = sendInputAccepted('sent-before-stream-end')
+      const pendingSend = sendInputAccepted('sent-before-stream-end', 'driving')
       await vi.waitFor(() =>
         expect(runtimeCall).toHaveBeenCalledWith(
           expect.objectContaining({ method: 'terminal.send' })
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-sticky-replacement-policy.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-sticky-replacement-policy.test.ts
index 5a61a5587e67..ce689695bc02 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-sticky-replacement-policy.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-sticky-replacement-policy.test.ts
@@ -76,7 +76,7 @@ describe('createRemoteRuntimePtyTransport', () => {
       if (!sendInputAccepted) {
         throw new Error('Expected acknowledged remote terminal input')
       }
-      const pendingSend = sendInputAccepted('sent-before-stream-end')
+      const pendingSend = sendInputAccepted('sent-before-stream-end', 'driving')
       await vi.waitFor(() =>
         expect(runtimeCall).toHaveBeenCalledWith(
           expect.objectContaining({ method: 'terminal.send' })
@@ -361,7 +361,10 @@ describe('createRemoteRuntimePtyTransport', () => {
     if (!sendInputAccepted) {
       throw new Error('Expected acknowledged remote terminal input')
     }
-    const sends = Promise.all([sendInputAccepted('first'), sendInputAccepted('second')])
+    const sends = Promise.all([
+      sendInputAccepted('first', 'driving'),
+      sendInputAccepted('second', 'driving')
+    ])
     await vi.waitFor(() => expect(hostListCalls).toBe(1))
     await expect(sends).resolves.toEqual([false, false])
 
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-stream-reconnect.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-stream-reconnect.test.ts
index e0b85414e3f8..c3d61a8b3d37 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-stream-reconnect.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-stream-reconnect.test.ts
@@ -466,7 +466,7 @@ describe('createRemoteRuntimePtyTransport', () => {
       })
 
       expect(transport.isConnected()).toBe(false)
-      expect(transport.sendInput(`detached-${cycle}`)).toBe(false)
+      expect(transport.sendInput(`detached-${cycle}`, 'driving')).toBe(false)
       expect(unsubscribeByEpoch[cycle]).toHaveBeenCalledTimes(1)
       await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(cycle + 2))
       await vi.waitFor(() => expect(latestSubscribePayload().terminal).toBe('terminal-1'))
@@ -542,7 +542,7 @@ describe('createRemoteRuntimePtyTransport', () => {
       expect(disconnectedState?.phase).toBe('disconnected')
       expect(transport.getPtyId()).toBe('remote:env-1@@terminal-1')
       expect(transport.isConnected()).toBe(false)
-      expect(transport.sendInput('must not reach a stale socket')).toBe(false)
+      expect(transport.sendInput('must not reach a stale socket', 'driving')).toBe(false)
       expect(onError).not.toHaveBeenCalled()
       await vi.advanceTimersByTimeAsync(5 * 60_000)
       expect(runtimeSubscribe).toHaveBeenCalledTimes(callsAtCutoff)
@@ -591,7 +591,7 @@ describe('createRemoteRuntimePtyTransport', () => {
     subscriptionCallbacks?.onClose?.()
     await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
     expect(transport.claimViewport?.(101, 33)).toBe(true)
-    const accepted = transport.sendInputAccepted?.('\x03')
+    const accepted = transport.sendInputAccepted?.('\x03', 'driving')
     await Promise.resolve()
     rejectReconnect(new Error('reconnect failed'))
 
@@ -610,7 +610,7 @@ describe('createRemoteRuntimePtyTransport', () => {
     const { streamId } = latestSubscribePayload()
 
     expect(transport.claimViewport?.(101, 33)).toBe(true)
-    const accepted = transport.sendInputAccepted?.('x')
+    const accepted = transport.sendInputAccepted?.('x', 'driving')
     subscriptionCallbacks?.onResponse({
       ok: true,
       result: { type: 'end', streamId }
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
index cce743377e4d..eb737baa5ffb 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
@@ -1,4 +1,5 @@
 import { createAgentSessionKeyboardOptions } from '@/runtime/agent-session-keyboard-capability'
+import { withRemoteReattachInputBuffer } from './remote-reattach-input-buffer'
 /* eslint-disable max-lines -- Why: remote PTY transport keeps lifecycle, JSON fallback, and binary stream wiring together so reconnect/destroy ordering stays testable as one behavior surface. */
 import type { RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
 import {
@@ -886,7 +887,7 @@ export function createRemoteRuntimePtyTransport(
       return true
     }
     if (lastConnectOptions) {
-      void transport.connect(lastConnectOptions)
+      void connectForRecovery(lastConnectOptions)
       return true
     }
     return false
@@ -2177,6 +2178,7 @@ export function createRemoteRuntimePtyTransport(
     flushPendingClaimInput(nextStream)
   }
 
+  let connectForRecovery: PtyTransport['connect'] = (options) => transport.connect(options)
   const transport: PtyTransport = {
     async connect(options) {
       cancelTerminalCreateRetryWait()
@@ -2587,6 +2589,8 @@ export function createRemoteRuntimePtyTransport(
       storedCallbacks = {}
     },
 
+    // Why no kind: terminal.send has no launch kind, and its query-reply kind is for mobile
+    // clients, so the host classifies a desktop's bytes itself.
     sendInput(data: string): boolean {
       if (!connected || !handle || recoveryBlocksIo()) {
         return false
@@ -2717,7 +2721,7 @@ export function createRemoteRuntimePtyTransport(
         recovery.currentPhase === 'disconnected'
       ) {
         recovery.begin()
-        void transport.connect(lastConnectOptions)
+        void connectForRecovery(lastConnectOptions)
         return true
       }
       // Why: online/resume fires a parked retry; the button must not be weaker than an event (#12684).
@@ -2787,6 +2791,9 @@ export function createRemoteRuntimePtyTransport(
       return stream.serializeBufferOutcome(opts)
     },
 
+    setConnectForRecovery(connect) {
+      connectForRecovery = connect
+    },
     destroy() {
       destroyed = true
       setAttachmentUnavailable()
@@ -2802,5 +2809,5 @@ export function createRemoteRuntimePtyTransport(
       viewportBatcher.clear()
     }
   }
-  return transport
+  return withRemoteReattachInputBuffer(transport)
 }
diff --git a/src/renderer/src/components/terminal-pane/sleeping-record-park-exemption.test.ts b/src/renderer/src/components/terminal-pane/sleeping-record-park-exemption.test.ts
index 37fe50db1a16..79e2ec738f3f 100644
--- a/src/renderer/src/components/terminal-pane/sleeping-record-park-exemption.test.ts
+++ b/src/renderer/src/components/terminal-pane/sleeping-record-park-exemption.test.ts
@@ -75,4 +75,22 @@ describe('selectSleepingRecordParkExemptTabIds', () => {
 
     expect([...selectSleepingRecordParkExemptTabIds(stateWith({}), 'wt-1')]).toEqual([])
   })
+
+  // Why: pins #16308's incidental effect — a finished turn's idle anchor no longer pins its hidden tab mounted.
+  it('lets a finished turn park but keeps running and interrupted turns mounted', () => {
+    const note = (tabId: string, overrides: Partial<SleepingAgentSessionRecord>) =>
+      sleepingRecord({ paneKey: `${tabId}:${LEAF_ID}`, origin: 'live', ...overrides })
+    const records = {
+      a: note('tab-idle-anchor', { state: 'done' }),
+      b: note('tab-running', { state: 'working' }),
+      c: note('tab-interrupted', { state: 'done', interrupted: true }),
+      d: note('tab-quit', { state: 'done', origin: 'quit' })
+    }
+
+    expect([...selectSleepingRecordParkExemptTabIds(stateWith(records), 'wt-1')]).toEqual([
+      'tab-running',
+      'tab-interrupted',
+      'tab-quit'
+    ])
+  })
 })
diff --git a/src/renderer/src/components/terminal-pane/sleeping-record-park-exemption.ts b/src/renderer/src/components/terminal-pane/sleeping-record-park-exemption.ts
index 4859edade2b0..7e572ab6904f 100644
--- a/src/renderer/src/components/terminal-pane/sleeping-record-park-exemption.ts
+++ b/src/renderer/src/components/terminal-pane/sleeping-record-park-exemption.ts
@@ -1,6 +1,6 @@
 import type { SleepingAgentSessionRecord } from '../../../../shared/agent-session-resume'
 import { parseLegacyNumericPaneKey, parsePaneKey } from '../../../../shared/stable-pane-id'
-import { isPassiveCompletedHibernationEvidence } from '../../lib/sleeping-agent-pane-ownership'
+import { activationTreatsNoteAsFinished } from '../../lib/sleeping-agent-pane-ownership'
 import { createWorktreeRecordSelector } from '@/store/worktree-record-selector-cache'
 
 const EMPTY_TAB_IDS: ReadonlySet<string> = new Set()
@@ -11,8 +11,8 @@ type SleepingRecordParkExemptionState = {
 
 /** Tab ids whose panes own a sleeping record a mount can actually consume.
  *  Why: a parked pane can never cold-restore, so per-tab parks must exempt
- *  these — but only these: passive-completed records never resume,
- *  and exempting them would pin a hidden pane mounted indefinitely.
+ *  these — but not notes activation treats as finished: exempting those
+ *  would pin every hidden finished-agent pane mounted indefinitely.
  *
  *  Why memoized on the record map's identity (STA-7552): zustand re-runs every
  *  mounted subscriber's selector on every store write, so an unrelated pane
@@ -36,7 +36,7 @@ export const selectSleepingRecordParkExemptTabIds = createWorktreeRecordSelector
       if (!record || record.worktreeId !== worktreeId) {
         continue
       }
-      if (isPassiveCompletedHibernationEvidence(record)) {
+      if (activationTreatsNoteAsFinished(record)) {
         continue
       }
       // Why: malformed pane keys must yield no owner instead of a truncated tab id.
diff --git a/src/renderer/src/components/terminal-pane/terminal-captured-input-dispatch.test.ts b/src/renderer/src/components/terminal-pane/terminal-captured-input-dispatch.test.ts
index df997a87afc7..05513b53c66f 100644
--- a/src/renderer/src/components/terminal-pane/terminal-captured-input-dispatch.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-captured-input-dispatch.test.ts
@@ -27,7 +27,7 @@ describe('sendCapturedTerminalInput', () => {
           data: '\r'
         })
       ).toBe(true)
-      expect(transport.sendInput).toHaveBeenCalledWith('\r')
+      expect(transport.sendInput).toHaveBeenCalledWith('\r', 'driving')
     }
   )
 
diff --git a/src/renderer/src/components/terminal-pane/terminal-captured-input-dispatch.ts b/src/renderer/src/components/terminal-pane/terminal-captured-input-dispatch.ts
index 7a2780a5d32e..5409d5420de5 100644
--- a/src/renderer/src/components/terminal-pane/terminal-captured-input-dispatch.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-captured-input-dispatch.ts
@@ -32,7 +32,7 @@ export function sendCapturedTerminalInput({
   ) {
     return false
   }
-  const sent = capturedTransport.sendInput(data)
+  const sent = capturedTransport.sendInput(data, 'driving')
   if (sent) {
     onAccepted?.()
   }
diff --git a/src/renderer/src/components/terminal-pane/terminal-command-lifecycle.ts b/src/renderer/src/components/terminal-pane/terminal-command-lifecycle.ts
index 61ad0891fa61..5d60514842e9 100644
--- a/src/renderer/src/components/terminal-pane/terminal-command-lifecycle.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-command-lifecycle.ts
@@ -15,9 +15,9 @@ export function createTerminalCommandLifecycle(options: TerminalCommandLifecycle
   // Why: the byte parsing lives in shared so main's side-effect tracker emits
   // identical command-finished facts for local/SSH PTYs; this renderer wrapper
   // remains the byte path for remote-runtime PTYs and the kill-switch-off mode.
-  const scanner = createOsc133CommandFinishedScanner(
-    options.onCommandFinished,
-    options.onCommandStarted
+  // Why the wrapper: the scanner passes a chunk offset, which a callback with its own optional parameter must not receive.
+  const scanner = createOsc133CommandFinishedScanner(options.onCommandFinished, () =>
+    options.onCommandStarted?.()
   )
   const disposables: IDisposable[] = []
 
diff --git a/src/renderer/src/components/terminal-pane/terminal-copy-shortcut.test.ts b/src/renderer/src/components/terminal-pane/terminal-copy-shortcut.test.ts
new file mode 100644
index 000000000000..05b363d973a1
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-copy-shortcut.test.ts
@@ -0,0 +1,90 @@
+// @vitest-environment happy-dom
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { PaneManager } from '@/lib/pane-manager/pane-manager'
+import { dispatchTerminalShortcutAction } from './terminal-keyboard-action-dispatch'
+import { resolveTerminalShortcutAction } from './terminal-shortcut-policy'
+import { createTerminalNativeOnlyShortcutTracker } from './terminal-native-only-shortcut'
+
+type DispatchContext = Parameters<typeof dispatchTerminalShortcutAction>[3]
+
+function dispatchCopy(selection: string, repeat: boolean) {
+  const writeTerminalClipboardText = vi.fn().mockResolvedValue(undefined)
+  vi.stubGlobal('api', { ui: { writeTerminalClipboardText } })
+  const tracker = createTerminalNativeOnlyShortcutTracker()
+  const event = new KeyboardEvent('keydown', {
+    key: 'c',
+    code: 'KeyC',
+    metaKey: true,
+    repeat,
+    cancelable: true
+  })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Copy only reads the active pane's selection.
+  const manager = {
+    getActivePane: () => ({ terminal: { getSelection: () => selection } })
+  } as PaneManager
+  const context: DispatchContext = {
+    tabId: 'tab',
+    worktreeId: 'workspace',
+    fallbackCwd: '',
+    expandedPaneIdRef: { current: null },
+    setExpandedPane: vi.fn(),
+    restoreExpandedLayout: vi.fn(),
+    refreshPaneSizes: vi.fn(),
+    persistLayoutSnapshot: vi.fn(),
+    toggleExpandPane: vi.fn(),
+    setSearchOpen: vi.fn(),
+    focusSearchInput: vi.fn(),
+    searchOpenRef: { current: false },
+    onRequestClosePane: vi.fn(),
+    onClearPaneScrollback: vi.fn(),
+    onSetTitle: vi.fn(),
+    onClearPaneTitle: vi.fn(),
+    paneTransportsRef: { current: new Map() },
+    paneCwdRef: { current: new Map() },
+    managerRef: { current: manager },
+    getKeyboardSplitTelemetrySource: () => 'keyboard',
+    armNativeOnlyShortcut: tracker.armKeyDown
+  }
+  dispatchTerminalShortcutAction({ type: 'copySelection' }, event, manager, context)
+  return {
+    claimed: event.defaultPrevented,
+    copies: writeTerminalClipboardText.mock.calls.length,
+    releaseClaimed: tracker.consumeCompanion({ type: 'keyup', key: 'c', code: 'KeyC' })
+  }
+}
+
+afterEach(() => vi.unstubAllGlobals())
+
+describe('terminal copy shortcut', () => {
+  it('leaves an unselected press to the terminal', () => {
+    expect(dispatchCopy('', false)).toEqual({ claimed: false, copies: 0, releaseClaimed: false })
+  })
+
+  it('copies a selection once and claims the press through its release', () => {
+    expect(dispatchCopy('text', false)).toEqual({ claimed: true, copies: 1, releaseClaimed: true })
+    expect(dispatchCopy('text', true)).toEqual({ claimed: true, copies: 0, releaseClaimed: false })
+  })
+
+  it('matches held and remapped copy bindings', () => {
+    const keybindings = { 'terminal.copySelection': ['Mod+Shift+C'] }
+    const chord = {
+      key: 'c',
+      code: 'KeyC',
+      metaKey: true,
+      ctrlKey: false,
+      altKey: false,
+      shiftKey: false
+    }
+    expect(resolveTerminalShortcutAction(chord, true, 'false', 0, false, keybindings)).toBeNull()
+    expect(
+      resolveTerminalShortcutAction(
+        { ...chord, shiftKey: true, repeat: true },
+        true,
+        'false',
+        0,
+        false,
+        keybindings
+      )
+    ).toEqual({ type: 'copySelection' })
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/terminal-drop-handler.test.ts b/src/renderer/src/components/terminal-pane/terminal-drop-handler.test.ts
index ee6a492f642d..26e8f21d3fe5 100644
--- a/src/renderer/src/components/terminal-pane/terminal-drop-handler.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-drop-handler.test.ts
@@ -156,7 +156,8 @@ describe('handleTerminalFileDrop', () => {
       { assertCurrent: expect.any(Function) }
     )
     expect(sendInput).toHaveBeenCalledWith(
-      wrapTerminalBracketedPasteText('/remote/repo/.orca/drops/logo.png')
+      wrapTerminalBracketedPasteText('/remote/repo/.orca/drops/logo.png'),
+      'driving'
     )
     expect(focus).toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
@@ -252,7 +253,8 @@ describe('handleTerminalFileDrop', () => {
       { assertCurrent: expect.any(Function) }
     )
     expect(sendInput).toHaveBeenCalledWith(
-      wrapTerminalBracketedPasteText('\\\\server\\share\\repo\\.orca\\drops\\logo.png')
+      wrapTerminalBracketedPasteText('\\\\server\\share\\repo\\.orca\\drops\\logo.png'),
+      'driving'
     )
   })
 
@@ -308,7 +310,7 @@ describe('handleTerminalFileDrop', () => {
       '/remote/repo/.orca/drops',
       { assertCurrent: expect.any(Function) }
     )
-    expect(sendInput).toHaveBeenCalledWith('/remote/repo/.orca/drops/spec.pdf ')
+    expect(sendInput).toHaveBeenCalledWith('/remote/repo/.orca/drops/spec.pdf ', 'driving')
   })
 
   it('keeps explicit local worktree drops local while a runtime is focused', async () => {
@@ -335,7 +337,7 @@ describe('handleTerminalFileDrop', () => {
     })
 
     expect(mocks.importExternalPathsToRuntime).not.toHaveBeenCalled()
-    expect(sendInput).toHaveBeenCalledWith('/Users/me/spec.pdf ')
+    expect(sendInput).toHaveBeenCalledWith('/Users/me/spec.pdf ', 'driving')
     expect(focus).toHaveBeenCalled()
   })
 
@@ -382,8 +384,12 @@ describe('handleTerminalFileDrop', () => {
     })
 
     expect(mocks.importExternalPathsToRuntime).not.toHaveBeenCalled()
-    expect(sendInput).toHaveBeenNthCalledWith(1, "'/mnt/c/Users/alice/Desktop/notes one.txt' ")
-    expect(sendInput).toHaveBeenNthCalledWith(2, '/home/alice/repo/README.md ')
+    expect(sendInput).toHaveBeenNthCalledWith(
+      1,
+      "'/mnt/c/Users/alice/Desktop/notes one.txt' ",
+      'driving'
+    )
+    expect(sendInput).toHaveBeenNthCalledWith(2, '/home/alice/repo/README.md ', 'driving')
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
   })
 
@@ -413,7 +419,7 @@ describe('handleTerminalFileDrop', () => {
       data: { paths: ['/Users/me/spec.pdf'], target: 'terminal' }
     })
 
-    expect(sendInputAccepted).toHaveBeenCalledWith('/Users/me/spec.pdf ')
+    expect(sendInputAccepted).toHaveBeenCalledWith('/Users/me/spec.pdf ', 'driving')
     expect(sendInput).not.toHaveBeenCalled()
     expect(focus).toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
@@ -452,7 +458,7 @@ describe('handleTerminalFileDrop', () => {
 
     expect(activeSendInput).not.toHaveBeenCalled()
     expect(activeFocus).not.toHaveBeenCalled()
-    expect(targetSendInput).toHaveBeenCalledWith('/Users/me/spec.pdf ')
+    expect(targetSendInput).toHaveBeenCalledWith('/Users/me/spec.pdf ', 'driving')
     expect(targetFocus).toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-target')
   })
@@ -508,8 +514,8 @@ describe('handleTerminalFileDrop', () => {
       worktreePath: '\\\\wsl.localhost\\Ubuntu-24.04\\home\\user\\repo'
     })
     expect(sendInput.mock.calls).toEqual([
-      ["'/mnt/c/Users/Name/My Project/file.txt' "],
-      ['/home/user/repo/README.md ']
+      ["'/mnt/c/Users/Name/My Project/file.txt' ", 'driving'],
+      ['/home/user/repo/README.md ', 'driving']
     ])
     expect(focus).toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
@@ -608,7 +614,7 @@ describe('handleTerminalFileDrop', () => {
       expectedSshTargetId: 'ssh-win',
       expectedSshConnectionGeneration: 4
     })
-    expect(sendInput).toHaveBeenCalledWith('"C:\\Remote Repo\\A&B.txt" ')
+    expect(sendInput).toHaveBeenCalledWith('"C:\\Remote Repo\\A&B.txt" ', 'driving')
     expect(focus).toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
   })
@@ -684,6 +690,6 @@ describe('handleTerminalFileDrop', () => {
       data: { paths: ["/Users/me/it's here.txt"], target: 'terminal' }
     })
 
-    expect(sendInput).toHaveBeenCalledWith("'/remote/repo/it'\\''s here.txt' ")
+    expect(sendInput).toHaveBeenCalledWith("'/remote/repo/it'\\''s here.txt' ", 'driving')
   })
 })
diff --git a/src/renderer/src/components/terminal-pane/terminal-drop-internal-handler.test.ts b/src/renderer/src/components/terminal-pane/terminal-drop-internal-handler.test.ts
index 2c1c2652e87c..cd42929c2480 100644
--- a/src/renderer/src/components/terminal-pane/terminal-drop-internal-handler.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-drop-internal-handler.test.ts
@@ -116,7 +116,10 @@ describe('handleInternalTerminalFileDrop', () => {
     })
 
     expect(result).toEqual({ status: 'pasted', pathCount: 2 })
-    expect(sendInput.mock.calls).toEqual([['/repo/a.ts '], ["'/repo/my file.ts' "]])
+    expect(sendInput.mock.calls).toEqual([
+      ['/repo/a.ts ', 'driving'],
+      ["'/repo/my file.ts' ", 'driving']
+    ])
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
     expect(focus).toHaveBeenCalled()
   })
@@ -155,7 +158,7 @@ describe('handleInternalTerminalFileDrop', () => {
 
     expect(result).toEqual({ status: 'cancelled', reason: 'target-stale', pathCount: 1 })
     expect(sendInputAccepted).toHaveBeenCalledTimes(1)
-    expect(sendInputAccepted).toHaveBeenCalledWith('/repo/a.ts ')
+    expect(sendInputAccepted).toHaveBeenCalledWith('/repo/a.ts ', 'driving')
     expect(sendInput).not.toHaveBeenCalled()
     expect(replacementSendInput).not.toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
@@ -187,7 +190,7 @@ describe('handleInternalTerminalFileDrop', () => {
     })
 
     expect(result).toEqual({ status: 'pasted', pathCount: 1 })
-    expect(sendInputAccepted).toHaveBeenCalledWith('/repo/a.ts ')
+    expect(sendInputAccepted).toHaveBeenCalledWith('/repo/a.ts ', 'driving')
     expect(sendInput).not.toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
     expect(focus).toHaveBeenCalled()
@@ -254,7 +257,7 @@ describe('handleInternalTerminalFileDrop', () => {
     })
 
     expect(result).toEqual({ status: 'pasted', pathCount: 1 })
-    expect(sendInput).toHaveBeenCalledWith('"C:\\repo\\a&b.txt" ')
+    expect(sendInput).toHaveBeenCalledWith('"C:\\repo\\a&b.txt" ', 'driving')
   })
 
   it('uses SSH remote platform metadata for Windows internal file drops', async () => {
@@ -293,7 +296,7 @@ describe('handleInternalTerminalFileDrop', () => {
     })
 
     expect(result).toEqual({ status: 'pasted', pathCount: 1 })
-    expect(sendInput).toHaveBeenCalledWith('"C:\\Remote Repo\\A&B.txt" ')
+    expect(sendInput).toHaveBeenCalledWith('"C:\\Remote Repo\\A&B.txt" ', 'driving')
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
     expect(focus).toHaveBeenCalled()
   })
@@ -334,7 +337,7 @@ describe('handleInternalTerminalFileDrop', () => {
     })
 
     expect(result).toEqual({ status: 'pasted', pathCount: 1 })
-    expect(sendInput).toHaveBeenCalledWith("'/remote/repo/it'\\''s here.txt' ")
+    expect(sendInput).toHaveBeenCalledWith("'/remote/repo/it'\\''s here.txt' ", 'driving')
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
     expect(focus).toHaveBeenCalled()
   })
@@ -387,7 +390,7 @@ describe('handleInternalTerminalFileDrop', () => {
     expect(result).toEqual({ status: 'pasted', pathCount: 1 })
     expect(activeSendInput).not.toHaveBeenCalled()
     expect(activeFocus).not.toHaveBeenCalled()
-    expect(targetSendInput).toHaveBeenCalledWith('/repo/drop-target.ts ')
+    expect(targetSendInput).toHaveBeenCalledWith('/repo/drop-target.ts ', 'driving')
     expect(targetFocus).toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-target')
   })
diff --git a/src/renderer/src/components/terminal-pane/terminal-drop-path-writer.test.ts b/src/renderer/src/components/terminal-pane/terminal-drop-path-writer.test.ts
index 7fcb898d7eb1..20fe46c1fdac 100644
--- a/src/renderer/src/components/terminal-pane/terminal-drop-path-writer.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-drop-path-writer.test.ts
@@ -48,7 +48,7 @@ describe('terminal drop path writer', () => {
       failureReason: 'write-rejected'
     })
     expect(sendInputAccepted).toHaveBeenCalledTimes(1)
-    expect(sendInputAccepted).toHaveBeenCalledWith('/repo/a.ts ')
+    expect(sendInputAccepted).toHaveBeenCalledWith('/repo/a.ts ', 'driving')
     expect(sendInput).not.toHaveBeenCalled()
   })
 
@@ -70,7 +70,8 @@ describe('terminal drop path writer', () => {
     // Why: image attachment detection in terminal TUIs keys off bracketed paste
     // of the literal path — no shell-escaping, no trailing space.
     expect(sendInputAccepted).toHaveBeenCalledWith(
-      wrapTerminalBracketedPasteText('/repo/My Screenshot.png')
+      wrapTerminalBracketedPasteText('/repo/My Screenshot.png'),
+      'driving'
     )
   })
 
@@ -88,10 +89,11 @@ describe('terminal drop path writer', () => {
       targetShell: 'posix'
     })
 
-    expect(sendInputAccepted).toHaveBeenNthCalledWith(1, '/repo/a.ts ')
+    expect(sendInputAccepted).toHaveBeenNthCalledWith(1, '/repo/a.ts ', 'driving')
     expect(sendInputAccepted).toHaveBeenNthCalledWith(
       2,
-      wrapTerminalBracketedPasteText('/repo/shot.png')
+      wrapTerminalBracketedPasteText('/repo/shot.png'),
+      'driving'
     )
   })
 
@@ -113,9 +115,10 @@ describe('terminal drop path writer', () => {
     // non-image path would collide with it without an explicit separator.
     expect(sendInputAccepted).toHaveBeenNthCalledWith(
       1,
-      `${wrapTerminalBracketedPasteText('/repo/shot.png')} `
+      `${wrapTerminalBracketedPasteText('/repo/shot.png')} `,
+      'driving'
     )
-    expect(sendInputAccepted).toHaveBeenNthCalledWith(2, '/repo/a.ts ')
+    expect(sendInputAccepted).toHaveBeenNthCalledWith(2, '/repo/a.ts ', 'driving')
   })
 
   it('does not insert a separator between back-to-back image pastes', async () => {
@@ -136,11 +139,13 @@ describe('terminal drop path writer', () => {
     // TUI input between the two attachments.
     expect(sendInputAccepted).toHaveBeenNthCalledWith(
       1,
-      wrapTerminalBracketedPasteText('/repo/one.png')
+      wrapTerminalBracketedPasteText('/repo/one.png'),
+      'driving'
     )
     expect(sendInputAccepted).toHaveBeenNthCalledWith(
       2,
-      wrapTerminalBracketedPasteText('/repo/two.png')
+      wrapTerminalBracketedPasteText('/repo/two.png'),
+      'driving'
     )
   })
 
@@ -158,7 +163,10 @@ describe('terminal drop path writer', () => {
       targetShell: 'posix'
     })
 
-    expect(sendInputAccepted).toHaveBeenCalledWith("'/repo/a.png; touch /tmp/pwned #.png' ")
+    expect(sendInputAccepted).toHaveBeenCalledWith(
+      "'/repo/a.png; touch /tmp/pwned #.png' ",
+      'driving'
+    )
   })
 
   it('falls back to shell escaping for image paths with Windows shell metacharacters', async () => {
@@ -175,7 +183,7 @@ describe('terminal drop path writer', () => {
       targetShell: 'windows'
     })
 
-    expect(sendInputAccepted).toHaveBeenCalledWith('"C:\\Users\\me\\Pictures\\a&b.png" ')
+    expect(sendInputAccepted).toHaveBeenCalledWith('"C:\\Users\\me\\Pictures\\a&b.png" ', 'driving')
   })
 
   it('separates an image paste from a following image path that must be shell escaped', async () => {
@@ -194,9 +202,14 @@ describe('terminal drop path writer', () => {
 
     expect(sendInputAccepted).toHaveBeenNthCalledWith(
       1,
-      `${wrapTerminalBracketedPasteText('/repo/shot.png')} `
+      `${wrapTerminalBracketedPasteText('/repo/shot.png')} `,
+      'driving'
+    )
+    expect(sendInputAccepted).toHaveBeenNthCalledWith(
+      2,
+      "'/repo/a.png; touch /tmp/pwned #.png' ",
+      'driving'
     )
-    expect(sendInputAccepted).toHaveBeenNthCalledWith(2, "'/repo/a.png; touch /tmp/pwned #.png' ")
   })
 
   it('times out dropped path writes that never receive PTY acknowledgement', async () => {
diff --git a/src/renderer/src/components/terminal-pane/terminal-drop-path-writer.ts b/src/renderer/src/components/terminal-pane/terminal-drop-path-writer.ts
index f8ed3766251c..824a812ddb7d 100644
--- a/src/renderer/src/components/terminal-pane/terminal-drop-path-writer.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-drop-path-writer.ts
@@ -72,7 +72,7 @@ export async function writeTerminalDropPathsToCapturedTarget({
         )
       : `${shellEscapePath(path, targetShell)} `
     const writeResult = await runTerminalPasteOperationWithTimeout(
-      () => writeTerminalPastePtyInput(liveTransport, payload),
+      () => writeTerminalPastePtyInput(liveTransport, payload, 'driving'),
       operationTimeoutMs
     )
     if (writeResult.timedOut) {
diff --git a/src/renderer/src/components/terminal-pane/terminal-ime-composition-route.ts b/src/renderer/src/components/terminal-pane/terminal-ime-composition-route.ts
index 7b7ed78989fb..45fe1ee23ab9 100644
--- a/src/renderer/src/components/terminal-pane/terminal-ime-composition-route.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-ime-composition-route.ts
@@ -99,8 +99,8 @@ export function readTerminalImeCompositionSessionDetail(
 export function installTerminalImeCompositionRoute(args: {
   terminalElement: HTMLElement | null | undefined
   terminal: Pick<Terminal, 'input'>
-  capturedTransport: PtyTransport
-  getCurrentTransport: () => PtyTransport | undefined
+  capturedTransport: Pick<PtyTransport, 'getPtyId'>
+  getCurrentTransport: () => Pick<PtyTransport, 'getPtyId'> | undefined
 }): IDisposable {
   const terminalElement = args.terminalElement
   const sessions = new Map<number, CapturedCompositionSession>()
diff --git a/src/renderer/src/components/terminal-pane/terminal-ime-user-input-provenance.test.ts b/src/renderer/src/components/terminal-pane/terminal-ime-user-input-provenance.test.ts
new file mode 100644
index 000000000000..5b0accad22cb
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-ime-user-input-provenance.test.ts
@@ -0,0 +1,174 @@
+// @vitest-environment happy-dom
+// IME and Hangul commits bypass xterm's key path and enter through `terminal.input`. Main records
+// a run's first user input from xterm's user-input signal, so every commit route must carry it.
+import { Terminal } from '@xterm/xterm'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import type { IDisposable } from '@xterm/xterm'
+import type { PtyTransport } from './pty-transport'
+import {
+  installTerminalImeCompositionRoute,
+  XTERM_COMPOSITION_SESSION_END_EVENT,
+  XTERM_COMPOSITION_SESSION_START_EVENT
+} from './terminal-ime-composition-route'
+import { IPAD_DESKTOP_MODE_UA, pretendIosWeb } from './terminal-ios-hangul-preedit-fixture'
+import { installTerminalPaneInputHandling } from './terminal-pane-pane-input'
+import { subscribeToTerminalInputData } from './terminal-user-input-signal'
+
+const MAC_UA =
+  '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'
+
+type ForwardedInput = { data: string; wasUserInput: boolean }
+
+const disposables: IDisposable[] = []
+
+function openPane(): {
+  terminal: Terminal
+  textarea: HTMLTextAreaElement
+  forwarded: ForwardedInput[]
+} {
+  const container = document.createElement('div')
+  document.body.appendChild(container)
+  const terminal = new Terminal({ cols: 40, rows: 8 })
+  disposables.push(terminal)
+  terminal.open(container)
+  installTerminalPaneInputHandling({
+    pane: { id: 1, terminal },
+    managerRef: { current: null },
+    paneKittyKeyboardModesRef: { current: new Map() },
+    settingsRef: { current: {} },
+    imeCompositionDisposablesRef: { current: new Map() },
+    imeNativeTextForwarderDisposablesRef: { current: new Map() }
+  })
+  const forwarded: ForwardedInput[] = []
+  disposables.push(
+    subscribeToTerminalInputData(terminal, (data, wasUserInput) =>
+      forwarded.push({ data, wasUserInput })
+    )
+  )
+  return { terminal, textarea: terminal.textarea!, forwarded }
+}
+
+function key(
+  textarea: HTMLTextAreaElement,
+  type: 'keydown' | 'keypress' | 'keyup',
+  init: { key: string; code: string; keyCode: number }
+): KeyboardEvent {
+  const event = new KeyboardEvent(type, { ...init, bubbles: true, cancelable: true })
+  // happy-dom drops the legacy numeric fields from KeyboardEventInit; xterm's key paths read them.
+  Object.defineProperty(event, 'keyCode', { value: init.keyCode })
+  Object.defineProperty(event, 'charCode', { value: type === 'keypress' ? init.keyCode : 0 })
+  textarea.dispatchEvent(event)
+  return event
+}
+
+function insertText(textarea: HTMLTextAreaElement, inputType: string, data: string | null): void {
+  const event = new InputEvent('input', { bubbles: true })
+  Object.defineProperty(event, 'inputType', { value: inputType })
+  Object.defineProperty(event, 'data', { value: data })
+  Object.defineProperty(event, 'composed', { value: true })
+  textarea.dispatchEvent(event)
+}
+
+describe('IME and Hangul commits reach the PTY as user input', () => {
+  let originalUserAgent: PropertyDescriptor | undefined
+  let originalMaxTouchPoints: PropertyDescriptor | undefined
+  let originalGetContext: PropertyDescriptor | undefined
+
+  beforeEach(() => {
+    originalUserAgent = Object.getOwnPropertyDescriptor(navigator, 'userAgent')
+    originalMaxTouchPoints = Object.getOwnPropertyDescriptor(navigator, 'maxTouchPoints')
+    // happy-dom has no 2d context, which the DOM renderer's WidthCache requires.
+    originalGetContext = Object.getOwnPropertyDescriptor(HTMLCanvasElement.prototype, 'getContext')
+    Object.defineProperty(HTMLCanvasElement.prototype, 'getContext', {
+      configurable: true,
+      value: () => ({ measureText: () => ({ width: 10 }) })
+    })
+  })
+
+  afterEach(() => {
+    for (const disposable of disposables.splice(0)) {
+      disposable.dispose()
+    }
+    for (const [property, descriptor] of [
+      ['userAgent', originalUserAgent],
+      ['maxTouchPoints', originalMaxTouchPoints]
+    ] as const) {
+      // Why delete: with no own descriptor the real value lives on the prototype, which the stub shadows.
+      if (descriptor) {
+        Object.defineProperty(navigator, property, descriptor)
+      } else {
+        Reflect.deleteProperty(navigator, property)
+      }
+    }
+    if (originalGetContext) {
+      Object.defineProperty(HTMLCanvasElement.prototype, 'getContext', originalGetContext)
+    } else {
+      Reflect.deleteProperty(HTMLCanvasElement.prototype, 'getContext')
+    }
+    document.body.replaceChildren()
+  })
+
+  it('marks a macOS input-source substitution as user input', () => {
+    pretendIosWeb(0, MAC_UA)
+    const { textarea, forwarded } = openPane()
+
+    const keydown = key(textarea, 'keydown', { key: ',', code: 'Comma', keyCode: 188 })
+    expect(keydown.defaultPrevented).toBe(false)
+    textarea.value = '，'
+    insertText(textarea, 'insertText', '，')
+    key(textarea, 'keyup', { key: ',', code: 'Comma', keyCode: 188 })
+
+    expect(forwarded).toEqual([{ data: '，', wasUserInput: true }])
+  })
+
+  it('marks an iPadOS Hangul syllable commit as user input', async () => {
+    pretendIosWeb(5, IPAD_DESKTOP_MODE_UA)
+    const { textarea, forwarded } = openPane()
+    const typeJamo = async (jamo: string, written: string, replaces: boolean) => {
+      if (
+        !key(textarea, 'keydown', { key: jamo, code: 'KeyQ', keyCode: jamo.charCodeAt(0) })
+          .defaultPrevented
+      ) {
+        key(textarea, 'keypress', { key: jamo, code: 'KeyQ', keyCode: jamo.charCodeAt(0) })
+      }
+      if (replaces) {
+        textarea.value = textarea.value.slice(0, -1)
+        insertText(textarea, 'deleteContentBackward', null)
+      }
+      textarea.value += written
+      insertText(textarea, 'insertText', written)
+      await new Promise((resolve) => window.setTimeout(resolve, 0))
+    }
+
+    await typeJamo('ㅎ', 'ㅎ', false)
+    await typeJamo('ㅏ', '하', true)
+    await typeJamo('ㄴ', '한', true)
+    await typeJamo('ㄱ', 'ㄱ', false)
+
+    expect(forwarded).toEqual([{ data: '한', wasUserInput: true }])
+  })
+
+  it('marks a composition the route delivers after a pane switch as user input', () => {
+    const { terminal, forwarded } = openPane()
+    const transport: Pick<PtyTransport, 'getPtyId'> = { getPtyId: () => 'pty-1' }
+    disposables.push(
+      installTerminalImeCompositionRoute({
+        terminalElement: terminal.element!,
+        terminal,
+        capturedTransport: transport,
+        getCurrentTransport: () => transport
+      })
+    )
+    const session = (type: string, data?: string): CustomEvent =>
+      new CustomEvent(type, {
+        bubbles: true,
+        cancelable: true,
+        detail: { id: 1, data, dataPendingReconciliation: false }
+      })
+
+    terminal.element!.dispatchEvent(session(XTERM_COMPOSITION_SESSION_START_EVENT))
+    terminal.element!.dispatchEvent(session(XTERM_COMPOSITION_SESSION_END_EVENT, '한'))
+
+    expect(forwarded).toEqual([{ data: '한', wasUserInput: true }])
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/terminal-ime-xterm-midline-preedit-tail.test.ts b/src/renderer/src/components/terminal-pane/terminal-ime-xterm-midline-preedit-tail.test.ts
index 46861938efef..ff8ec1d3408c 100644
--- a/src/renderer/src/components/terminal-pane/terminal-ime-xterm-midline-preedit-tail.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-ime-xterm-midline-preedit-tail.test.ts
@@ -52,17 +52,17 @@ type RigOptions = {
  * overflow. This gives the preedit span a width and the screen its cols*rows box.
  */
 function stubCompositionLayout(preeditWidth: () => number): void {
-  vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(
-    function (this: HTMLElement) {
-      if (this.classList.contains('xterm-composition-preedit')) {
-        return DOMRect.fromRect({ height: CELL_HEIGHT_PX, width: preeditWidth() })
-      }
-      if (this.classList.contains('xterm-screen')) {
-        return DOMRect.fromRect({ height: 24 * CELL_HEIGHT_PX, width: 80 * CELL_WIDTH_PX })
-      }
-      return DOMRect.fromRect({ height: 0, width: 0 })
+  vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(function (
+    this: HTMLElement
+  ) {
+    if (this.classList.contains('xterm-composition-preedit')) {
+      return DOMRect.fromRect({ height: CELL_HEIGHT_PX, width: preeditWidth() })
     }
-  )
+    if (this.classList.contains('xterm-screen')) {
+      return DOMRect.fromRect({ height: 24 * CELL_HEIGHT_PX, width: 80 * CELL_WIDTH_PX })
+    }
+    return DOMRect.fromRect({ height: 0, width: 0 })
+  })
 }
 
 function openTerminal(options: RigOptions = {}): Rig {
diff --git a/src/renderer/src/components/terminal-pane/terminal-ime-xterm-preedit-cell-grid.test.ts b/src/renderer/src/components/terminal-pane/terminal-ime-xterm-preedit-cell-grid.test.ts
index 083b1c43ebd5..38f10c0db500 100644
--- a/src/renderer/src/components/terminal-pane/terminal-ime-xterm-preedit-cell-grid.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-ime-xterm-preedit-cell-grid.test.ts
@@ -99,12 +99,13 @@ describe('IME preedit advances on the terminal cell grid (#19315)', () => {
       'letterSpacing'
     )!.set!
     // happy-dom drops calc(var(...)); Electron coverage checks the resulting layout.
-    vi.spyOn(CSSStyleDeclaration.prototype, 'letterSpacing', 'set').mockImplementation(
-      function (this: CSSStyleDeclaration, value) {
-        assignedSpacing.set(this, value)
-        setter.call(this, value)
-      }
-    )
+    vi.spyOn(CSSStyleDeclaration.prototype, 'letterSpacing', 'set').mockImplementation(function (
+      this: CSSStyleDeclaration,
+      value
+    ) {
+      assignedSpacing.set(this, value)
+      setter.call(this, value)
+    })
     vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockImplementation(() => {
       const context: CanvasRenderingContext2D = Object.create(null)
       context.font = '13px monospace'
diff --git a/src/renderer/src/components/terminal-pane/terminal-input-mode-reset.ts b/src/renderer/src/components/terminal-pane/terminal-input-mode-reset.ts
new file mode 100644
index 000000000000..479da70f65d6
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-input-mode-reset.ts
@@ -0,0 +1,18 @@
+import { resetWebRuntimeTerminalInputModes } from '@/runtime/web-runtime-session'
+import { resetPtyRendererInputModes } from './pty-buffer-serializer'
+
+/**
+ * Reset Terminal: grounds the input modes an app left armed (Kitty keyboard,
+ * mouse, bracketed paste, focus, alt screen, cursor keys) in the pane and in the
+ * host's models, so a reattach does not re-arm them. Each side grounds its own
+ * records; an older host rejects the request and only the pane is grounded.
+ */
+export function resetTerminalInputModes(ptyId: string | null): void {
+  if (!ptyId) {
+    return
+  }
+  resetPtyRendererInputModes(ptyId)
+  if (!resetWebRuntimeTerminalInputModes(ptyId)) {
+    window.api.pty.resetInputModes(ptyId)
+  }
+}
diff --git a/src/renderer/src/components/terminal-pane/terminal-ios-hangul-preedit-coexistence.test.ts b/src/renderer/src/components/terminal-pane/terminal-ios-hangul-preedit-coexistence.test.ts
index 5f65a429922e..42f032b17f46 100644
--- a/src/renderer/src/components/terminal-pane/terminal-ios-hangul-preedit-coexistence.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-ios-hangul-preedit-coexistence.test.ts
@@ -210,7 +210,7 @@ describe('the iPadOS Hangul path alongside everything else', () => {
     pretendIosWeb()
     const rig = openIosTerminal()
     const sent: string[] = []
-    writeTerminalPastePtyInput({ sendInput: (data) => (sent.push(data), true) }, 'echo ')
+    writeTerminalPastePtyInput({ sendInput: (data) => (sent.push(data), true) }, 'echo ', 'driving')
     expect(sent).toEqual(['echo '])
 
     await typeHangeul(rig)
diff --git a/src/renderer/src/components/terminal-pane/terminal-keyboard-action-dispatch.ts b/src/renderer/src/components/terminal-pane/terminal-keyboard-action-dispatch.ts
index feb3eb4b7de7..ce0c10694f32 100644
--- a/src/renderer/src/components/terminal-pane/terminal-keyboard-action-dispatch.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-keyboard-action-dispatch.ts
@@ -79,10 +79,6 @@ export function dispatchTerminalShortcutAction(
     event.stopImmediatePropagation()
     return
   }
-  if (event.repeat) {
-    return
-  }
-
   if (action.type === 'copySelection') {
     const pane = manager.getActivePane() ?? manager.getPanes()[0]
     if (!pane || !pane.terminal.getSelection()) {
@@ -90,10 +86,16 @@ export function dispatchTerminalShortcutAction(
     }
     event.preventDefault()
     event.stopImmediatePropagation()
-    void copyTerminalSelection({
-      terminal: pane.terminal,
-      writeClipboardText: window.api.ui.writeTerminalClipboardText
-    }).catch(() => {})
+    if (!event.repeat) {
+      armNativeOnlyShortcut(event)
+      void copyTerminalSelection({
+        terminal: pane.terminal,
+        writeClipboardText: window.api.ui.writeTerminalClipboardText
+      }).catch(() => {})
+    }
+    return
+  }
+  if (event.repeat) {
     return
   }
   if (action.type === 'toggleSearch') {
diff --git a/src/renderer/src/components/terminal-pane/terminal-link-action-request.ts b/src/renderer/src/components/terminal-pane/terminal-link-action-request.ts
index 1ddedfe9e5a1..21f917302ca4 100644
--- a/src/renderer/src/components/terminal-pane/terminal-link-action-request.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-link-action-request.ts
@@ -50,7 +50,7 @@ export function requestTerminalLinkAction(
     !event ||
     !context ||
     !(
-      isTerminalLinkActionActivation(event) ||
+      (isTerminalLinkActionActivation(event) && context.plainClickBehavior !== 'none') ||
       (isTerminalMiddleClickActivation(event) && context.middleClickBehavior !== 'none')
     ) ||
     !context.pointerGesture.canRequestAction(event)
diff --git a/src/renderer/src/components/terminal-pane/terminal-link-action-routing.test.ts b/src/renderer/src/components/terminal-pane/terminal-link-action-routing.test.ts
index ca1168eb7b68..be546428c907 100644
--- a/src/renderer/src/components/terminal-pane/terminal-link-action-routing.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-link-action-routing.test.ts
@@ -122,6 +122,26 @@ describe('terminal link action routing', () => {
     expect(run).toHaveBeenCalledOnce()
   })
 
+  it('leaves disabled plain clicks with the terminal while middle click remains enabled', () => {
+    const context = actionContext()
+    context.plainClickBehavior = 'none'
+    context.middleClickBehavior = 'open'
+    const event = plainEvent()
+    const run = vi.fn()
+
+    expect(
+      requestTerminalLinkAction(event, context, {
+        destination: 'https://example.com',
+        kind: 'url',
+        primary: { label: 'Open', run }
+      })
+    ).toBe(false)
+    expect(context.claimPtyMouse).not.toHaveBeenCalled()
+    expect(event.preventDefault).not.toHaveBeenCalled()
+    expect(context.request).not.toHaveBeenCalled()
+    expect(run).not.toHaveBeenCalled()
+  })
+
   it('keeps middle click available when plain clicks stay with the terminal', () => {
     const run = vi.fn()
     const context = actionContext()
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-hook-order-parity.test.ts b/src/renderer/src/components/terminal-pane/terminal-pane-hook-order-parity.test.ts
deleted file mode 100644
index ded0bbf5c2ac..000000000000
--- a/src/renderer/src/components/terminal-pane/terminal-pane-hook-order-parity.test.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import { createHash } from 'node:crypto'
-import { readFileSync, readdirSync } from 'node:fs'
-import { join } from 'node:path'
-// TypeScript 7 is a native CLI; AST tests still need the legacy JavaScript API.
-import ts from 'typescript-api'
-import { describe, expect, it } from 'vitest'
-
-const TERMINAL_PANE_HOOK_SOURCE_PATTERN =
-  /^(?:TerminalPane\.tsx|use-terminal-pane-(?:chat-state|close-actions|context-actions|controller|foundation|global-listeners|layout-bindings|layout-persistence|lifecycle-stage|mobile-actions|paste-listeners|process-exit-actions|projection|reconciliation|startup-actions|store-actions|store-bindings|title-effects|title-state)\.ts)$/
-// Rebased onto main after the workbench surface-per-workspace and deferred
-// split-cwd changes; the pane session-ID projection added one render hook (230 hooks).
-// Then 27 stable-action `useAppStore` subscriptions folded into four
-// `useTerminalPaneStoreActions()` calls, each one `useMemo` (204 hooks, 8 useMemo).
-// Restoring the terminal/chat switcher added four `useCallback`s -- three in
-// chat-state (can-toggle, toggle-for-leaf, toggle-active) and the context-menu
-// toggle in projection (208 hooks, still 8 useMemo).
-// Then chat-state's orchestration dispatch-status subscription went with the
-// paused notice that read it (207 hooks, still 8 useMemo).
-// Then host-authoritative layout removal added two `useRef`s in reconciliation
-// (last host layout leaf set, retired leaf set) (209 hooks, still 8 useMemo).
-// Then search match count + Cmd+F focus parity (#9035) added a `useRef` and a `useCallback` in
-// foundation (search input ref, focus-search-input) (211 hooks, still 8 useMemo).
-// Then the pending split-close admission added one `useRef` in close-actions
-// (the confirmed-close continuation) (212 hooks, still 8 useMemo).
-// Then the dead adopted-structured-session portal went with its local target `useMemo`
-// in projection (211 hooks, 7 useMemo).
-// Then chat ownership through toggles and restore (#23049) added a `useRef`, a `useLayoutEffect`
-// and a `useEffect` across chat-state, layout-persistence and title-effects (214 hooks, still 7 useMemo).
-const PRE_REFACTOR_HOOK_ORDER_SHA256 =
-  '3736b71c612bb28b9b5298c7704ee1b32c7afc0254e75d0072ff4df870ec3be9'
-
-const sourceFiles = readdirSync(__dirname)
-  .filter((name) => TERMINAL_PANE_HOOK_SOURCE_PATTERN.test(name))
-  .sort()
-
-function readFunctionDefinitions(): Map<string, ts.FunctionDeclaration> {
-  const definitions = new Map<string, ts.FunctionDeclaration>()
-  for (const relativePath of sourceFiles) {
-    const filePath = join(__dirname, relativePath)
-    const sourceFile = ts.createSourceFile(
-      filePath,
-      readFileSync(filePath, 'utf8'),
-      ts.ScriptTarget.Latest,
-      true,
-      relativePath.endsWith('.tsx') ? ts.ScriptKind.TSX : ts.ScriptKind.TS
-    )
-    const visit = (node: ts.Node): void => {
-      if (
-        ts.isFunctionDeclaration(node) &&
-        node.name &&
-        (node.name.text === 'TerminalPane' || node.name.text.startsWith('useTerminalPane'))
-      ) {
-        definitions.set(node.name.text, node)
-      }
-      ts.forEachChild(node, visit)
-    }
-    visit(sourceFile)
-  }
-  return definitions
-}
-
-function readFlattenedHookOrder(): string[] {
-  const definitions = readFunctionDefinitions()
-  const flatten = (name: string, active: ReadonlySet<string>): string[] => {
-    const definition = definitions.get(name)
-    if (!definition?.body) {
-      throw new Error(`Missing terminal pane hook stage: ${name}`)
-    }
-    if (active.has(name)) {
-      throw new Error(`Recursive terminal pane hook stage: ${name}`)
-    }
-    const nextActive = new Set([...active, name])
-    const hooks: string[] = []
-    const visit = (node: ts.Node): void => {
-      if (
-        ts.isCallExpression(node) &&
-        ts.isIdentifier(node.expression) &&
-        /^use[A-Z]/.test(node.expression.text)
-      ) {
-        const hookName = node.expression.text
-        hooks.push(...(definitions.has(hookName) ? flatten(hookName, nextActive) : [hookName]))
-      }
-      ts.forEachChild(node, visit)
-    }
-    visit(definition.body)
-    return hooks
-  }
-
-  return flatten('TerminalPane', new Set())
-}
-
-describe('TerminalPane refactor hook parity', () => {
-  it('preserves the recursively flattened render hook order', () => {
-    const hooks = readFlattenedHookOrder()
-    expect(hooks).toHaveLength(214)
-    expect(hooks.filter((hook) => hook === 'useMemo')).toHaveLength(7)
-    expect(createHash('sha256').update(hooks.join('\n')).digest('hex')).toBe(
-      PRE_REFACTOR_HOOK_ORDER_SHA256
-    )
-  })
-
-  it('aggregates every extracted hook stage', () => {
-    expect(sourceFiles).toHaveLength(20)
-    expect(sourceFiles).toContain('TerminalPane.tsx')
-    expect(sourceFiles).toContain('use-terminal-pane-controller.ts')
-  })
-
-  it('defers quick-command host work until the context menu opens', () => {
-    const startupSource = readFileSync(
-      join(__dirname, 'use-terminal-pane-startup-actions.ts'),
-      'utf8'
-    )
-    const contextSource = readFileSync(
-      join(__dirname, 'use-terminal-pane-context-actions.ts'),
-      'utf8'
-    )
-
-    expect(startupSource).toContain('const quickCommandRepoId =')
-    expect(startupSource).not.toContain('useTerminalQuickCommandHosts')
-    expect(contextSource).toContain('useTerminalQuickCommandHosts(worktreeId, contextMenu.open)')
-    expect(contextSource).toContain('terminalQuickCommandMatchesWorkspaceProject')
-    expect(contextSource).toContain('projectHostSetupProjection.setups')
-    expect(contextSource).toContain('quickCommandExecutionHostId')
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-host-state.test.ts b/src/renderer/src/components/terminal-pane/terminal-pane-host-state.test.ts
index c9614690e4bf..fef6ce122247 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-host-state.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-host-state.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import type { AppState } from '@/store/types'
+import { selectWorktreeHostConnectionPhase } from '@/lib/worktree-host-connection-phase'
 import { selectTerminalPaneHostState } from './terminal-pane-host-state'
 
 function makeState(overrides: Record<string, unknown>): AppState {
@@ -161,4 +162,71 @@ describe('selectTerminalPaneHostState', () => {
       sshReconnectTargetRemoved: false
     })
   })
+
+  // The terminal reads the shared host signal but names the published status: an undialed
+  // target during startup restoration stays "disconnected" here (the overlay and error
+  // ownership are unchanged) even though the other panes read that window as connecting.
+  it('reports the published status through the shared signal, across startup and connect', () => {
+    const repos = [{ id: 'repo-ssh', connectionId: 'ssh-a' }]
+    const worktreesByRepo = { 'repo-ssh': [{ id: 'wt-ssh', repoId: 'repo-ssh' }] }
+    const withStatus = (status: string | null): AppState =>
+      makeState({
+        repos,
+        worktreesByRepo,
+        terminalStartupRestorationReady: false,
+        sshConnectionStates: new Map(
+          status ? [['ssh-a', { targetId: 'ssh-a', status, error: null, reconnectAttempt: 0 }]] : []
+        )
+      })
+
+    expect(selectWorktreeHostConnectionPhase(withStatus(null), 'wt-ssh').phase).toBe('connecting')
+    expect(selectTerminalPaneHostState(withStatus(null), 'wt-ssh').sshReconnectStatus).toBe(
+      'disconnected'
+    )
+    expect(selectTerminalPaneHostState(withStatus('connecting'), 'wt-ssh').sshReconnectStatus).toBe(
+      'connecting'
+    )
+    expect(selectTerminalPaneHostState(withStatus('connected'), 'wt-ssh').sshReconnectStatus).toBe(
+      'connected'
+    )
+  })
+
+  // An owning runtime that has not published its SSH state is unverifiable, not down: the
+  // terminal keeps reporting no status, so it shows no reconnect overlay for it.
+  it('reports no status for a nested target whose runtime has not published its SSH state', () => {
+    const state = makeState({
+      repos: [{ id: 'repo-runtime', connectionId: 'ssh-nested', executionHostId: 'runtime:env-a' }],
+      runtimeStatusByEnvironmentId: new Map([
+        ['env-a', { status: { runtimeId: 'runtime-a' }, checkedAt: 1 }]
+      ]),
+      sshStateByEnvironment: new Map([
+        [
+          'env-a',
+          {
+            connectionStates: new Map(),
+            targetLabels: new Map(),
+            removedTargetLabels: new Map(),
+            targetsHydrated: false
+          }
+        ]
+      ]),
+      worktreesByRepo: {
+        'repo-runtime': [
+          {
+            id: 'wt-runtime',
+            repoId: 'repo-runtime',
+            hostId: 'runtime:env-a',
+            runtimeOwnerEnvironmentId: 'env-a'
+          }
+        ]
+      }
+    })
+
+    expect(selectWorktreeHostConnectionPhase(state, 'wt-runtime').phase).toBe('unverifiable')
+    expect(selectTerminalPaneHostState(state, 'wt-runtime')).toMatchObject({
+      sshReconnectEnvironmentId: 'env-a',
+      sshReconnectStatus: null,
+      sshReconnectTargetId: 'ssh-nested'
+    })
+  })
 })
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-host-state.ts b/src/renderer/src/components/terminal-pane/terminal-pane-host-state.ts
index c0d1615fbeb9..19471a706e71 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-host-state.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-host-state.ts
@@ -1,21 +1,22 @@
 import type { AppState } from '@/store/types'
 import { getConnectionIdFromState } from '@/lib/connection-context'
-import { getExplicitRuntimeEnvironmentIdForWorktree } from '@/lib/worktree-runtime-owner'
+import {
+  resolveWorktreeHostConnection,
+  type WorktreeHostConnection
+} from '@/lib/worktree-host-connection-phase'
 import { isNativeChatTranscriptLocalReadable } from '@/lib/native-chat-transcript-readability'
 import {
   selectRuntimeAwareSshError,
-  selectRuntimeAwareSshStatus,
   selectRuntimeAwareSshTargetLabel,
   selectRuntimeAwareSshTargetRemoved
 } from '@/store/slices/runtime-environment-ssh'
-import { isRuntimeOwnedSshTargetId } from '../../../../shared/execution-host'
 
 export type TerminalPaneHostState = {
   nativeChatTranscriptIsLocalReadable: boolean
   sshReconnectEnvironmentId: string | null
   /** The failure detail behind the status; the overlay shows only a canned sentence without it. */
   sshReconnectError: string | null
-  sshReconnectStatus: ReturnType<typeof selectRuntimeAwareSshStatus>
+  sshReconnectStatus: WorktreeHostConnection['publishedStatus']
   sshReconnectTargetId: string | null
   sshReconnectTargetLabel: string
   sshReconnectTargetRemoved: boolean
@@ -25,9 +26,8 @@ function computeTerminalPaneHostState(state: AppState, worktreeId: string): Term
   const connectionId = getConnectionIdFromState(state, worktreeId)
   const nativeChatTranscriptIsLocalReadableResult =
     isNativeChatTranscriptLocalReadable(connectionId)
-  const sshReconnectTargetId =
-    connectionId && !isRuntimeOwnedSshTargetId(connectionId) ? connectionId : null
-  if (!sshReconnectTargetId) {
+  const host = resolveWorktreeHostConnection(state, worktreeId, connectionId)
+  if (!host.targetId) {
     return {
       nativeChatTranscriptIsLocalReadable: nativeChatTranscriptIsLocalReadableResult,
       sshReconnectEnvironmentId: null,
@@ -38,7 +38,7 @@ function computeTerminalPaneHostState(state: AppState, worktreeId: string): Term
       sshReconnectTargetRemoved: false
     }
   }
-  const sshReconnectEnvironmentId = getExplicitRuntimeEnvironmentIdForWorktree(state, worktreeId)
+  const { targetId: sshReconnectTargetId, environmentId: sshReconnectEnvironmentId } = host
   return {
     nativeChatTranscriptIsLocalReadable: nativeChatTranscriptIsLocalReadableResult,
     sshReconnectEnvironmentId,
@@ -47,11 +47,7 @@ function computeTerminalPaneHostState(state: AppState, worktreeId: string): Term
       sshReconnectEnvironmentId,
       sshReconnectTargetId
     ),
-    sshReconnectStatus: selectRuntimeAwareSshStatus(
-      state,
-      sshReconnectEnvironmentId,
-      sshReconnectTargetId
-    ),
+    sshReconnectStatus: host.publishedStatus,
     sshReconnectTargetId,
     sshReconnectTargetLabel: selectRuntimeAwareSshTargetLabel(
       state,
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-lifecycle-primitives.ts b/src/renderer/src/components/terminal-pane/terminal-pane-lifecycle-primitives.ts
index d569e2650982..385c07cf7c0b 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-lifecycle-primitives.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-lifecycle-primitives.ts
@@ -3,22 +3,12 @@ import type { TerminalLayoutSnapshot, TerminalTab } from '../../../../shared/ter
 import type { PtyPaneStartup } from './pty-connection-types'
 import type { PtyTransport } from './pty-transport'
 import type { PaneCwdMap } from './resolve-split-cwd'
-import { writeTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
-import { RESET_KITTY_KEYBOARD_PROTOCOL } from '../../../../shared/terminal-mode-reset-profiles'
 import type { TerminalPaneSplitSource } from '../../../../shared/feature-education-telemetry'
 import type { HttpLinkSourceOwner } from '@/lib/http-link-routing'
 import { resolveLocalhostHttpLinkDisplayUrl } from '@/lib/http-link-routing'
 import { recordCreatedTerminalPaneSplit } from './terminal-pane-split-completion'
 import { PRIMARY_SELECTION_MAX_LENGTH } from '@/lib/primary-selection'
 
-/** Writes a transport-agnostic interrupt reset without running xterm work inline. */
-export function resetTerminalKeyboardProtocolAfterInterrupt(terminal: Terminal): void {
-  writeTerminalOutput(terminal, RESET_KITTY_KEYBOARD_PROTOCOL, {
-    foreground: true,
-    latencySensitive: false
-  })
-}
-
 export function recordRuntimeCreatedTerminalPaneSplit(
   createdPane: unknown,
   args: {
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-listener-order-parity.test.ts b/src/renderer/src/components/terminal-pane/terminal-pane-listener-order-parity.test.ts
deleted file mode 100644
index 70a214abfd5e..000000000000
--- a/src/renderer/src/components/terminal-pane/terminal-pane-listener-order-parity.test.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { createHash } from 'node:crypto'
-import { readFileSync, readdirSync } from 'node:fs'
-import { join } from 'node:path'
-// TypeScript 7 is a native CLI; AST tests still need the legacy JavaScript API.
-import ts from 'typescript-api'
-import { describe, expect, it } from 'vitest'
-
-const LISTENER_SOURCE_PATTERN =
-  /^(?:TerminalPane\.tsx|terminal-pane-paste-listeners\.ts|use-terminal-pane-(?:chat-state|close-actions|context-actions|controller|foundation|global-listeners|layout-bindings|layout-persistence|lifecycle-stage|mobile-actions|paste-listeners|projection|reconciliation|startup-actions|store-bindings|title-effects|title-state)\.ts)$/
-const PRE_REFACTOR_LISTENER_ORDER_SHA256 =
-  '2a2c5caaa368636d761ec819a7858f6b8010e578ccdd5c1be5960f87968c7e8a'
-
-type FunctionDefinition = { declaration: ts.FunctionDeclaration; sourceFile: ts.SourceFile }
-
-function readDefinitions(): Map<string, FunctionDefinition> {
-  const definitions = new Map<string, FunctionDefinition>()
-  for (const relativePath of readdirSync(__dirname).filter((name) =>
-    LISTENER_SOURCE_PATTERN.test(name)
-  )) {
-    const filePath = join(__dirname, relativePath)
-    const sourceFile = ts.createSourceFile(
-      filePath,
-      readFileSync(filePath, 'utf8'),
-      ts.ScriptTarget.Latest,
-      true,
-      relativePath.endsWith('.tsx') ? ts.ScriptKind.TSX : ts.ScriptKind.TS
-    )
-    const visit = (node: ts.Node): void => {
-      if (
-        ts.isFunctionDeclaration(node) &&
-        node.name &&
-        (node.name.text === 'TerminalPane' ||
-          node.name.text === 'registerTerminalPanePasteListeners' ||
-          node.name.text.startsWith('useTerminalPane'))
-      ) {
-        definitions.set(node.name.text, { declaration: node, sourceFile })
-      }
-      ts.forEachChild(node, visit)
-    }
-    visit(sourceFile)
-  }
-  return definitions
-}
-
-function readFlattenedListeners(): string[] {
-  const definitions = readDefinitions()
-  const listeners: string[] = []
-  const visitDefinition = (name: string, active: ReadonlySet<string>): void => {
-    const definition = definitions.get(name)
-    if (!definition?.declaration.body) {
-      throw new Error(`Missing terminal pane stage: ${name}`)
-    }
-    if (active.has(name)) {
-      throw new Error(`Recursive terminal pane stage: ${name}`)
-    }
-    const nextActive = new Set([...active, name])
-    const visit = (node: ts.Node): void => {
-      if (ts.isCallExpression(node)) {
-        if (
-          ts.isPropertyAccessExpression(node.expression) &&
-          ['addEventListener', 'removeEventListener'].includes(node.expression.name.text)
-        ) {
-          listeners.push(
-            [
-              node.expression.expression.getText(definition.sourceFile),
-              node.expression.name.text,
-              ...node.arguments.map((argument) =>
-                argument.getText(definition.sourceFile).replace(/\s+/g, '')
-              )
-            ].join('|')
-          )
-        }
-        if (ts.isIdentifier(node.expression) && definitions.has(node.expression.text)) {
-          visitDefinition(node.expression.text, nextActive)
-        }
-      }
-      ts.forEachChild(node, visit)
-    }
-    visit(definition.declaration.body)
-  }
-
-  visitDefinition('TerminalPane', new Set())
-  return listeners
-}
-
-describe('TerminalPane refactor listener parity', () => {
-  it('preserves ordered listener registration and cleanup', () => {
-    const listeners = readFlattenedListeners()
-    expect(listeners).toHaveLength(24)
-    expect(createHash('sha256').update(listeners.join('\n')).digest('hex')).toBe(
-      PRE_REFACTOR_LISTENER_ORDER_SHA256
-    )
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-menu-paste.ts b/src/renderer/src/components/terminal-pane/terminal-pane-menu-paste.ts
index 295b7e35c53f..b27900d20975 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-menu-paste.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-menu-paste.ts
@@ -89,7 +89,7 @@ export const executeTerminalPaneMenuPasteText = async (
   const execution = await executeTerminalPastePlan(plan, {
     pasteText: (pasteText, pasteOptions) =>
       pasteTerminalText(pane.terminal, pasteText, pasteOptions),
-    writePty: (data) => writeTerminalPastePtyInput(transport, data),
+    writePty: (data) => writeTerminalPastePtyInput(transport, data, 'driving'),
     isTargetCurrent: () => isPanePasteTargetMounted(context, pane, transport, ptyId),
     canContinue: () => isPanePasteTargetMounted(context, pane, transport, ptyId)
   })
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-pane-input.ts b/src/renderer/src/components/terminal-pane/terminal-pane-pane-input.ts
index b639d3b6ef8f..32ee26390299 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-pane-input.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-pane-input.ts
@@ -30,10 +30,9 @@ import {
 } from './xterm-bypass-policy'
 import { markTerminalPinnedViewport } from '@/lib/pane-manager/terminal-scroll-intent'
 import { syncTerminalScrollIntentSoon } from '@/lib/pane-manager/terminal-scroll-intent-settle'
-import { resetTerminalKeyboardProtocolAfterInterrupt } from './terminal-pane-lifecycle-primitives'
 
 type PaneInputContext = {
-  pane: ManagedPane
+  pane: Pick<ManagedPane, 'id' | 'terminal'>
   managerRef: React.RefObject<PaneManager | null>
   paneKittyKeyboardModesRef: UseTerminalPaneLifecycleDeps['paneKittyKeyboardModesRef']
   settingsRef: React.RefObject<Record<string, unknown> | null | undefined>
@@ -141,7 +140,6 @@ export function installTerminalPaneInputHandling(context: PaneInputContext): voi
       if (event.type === 'keydown') {
         pendingTerminalInterruptKeyup = true
         pane.terminal.input(TERMINAL_INTERRUPT_INPUT)
-        resetTerminalKeyboardProtocolAfterInterrupt(pane.terminal)
       } else {
         pendingTerminalInterruptKeyup = false
       }
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-paste-execution.ts b/src/renderer/src/components/terminal-pane/terminal-pane-paste-execution.ts
index e436bd2cc6a0..309c42dc18da 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-paste-execution.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-paste-execution.ts
@@ -93,7 +93,7 @@ export function createTerminalPanePasteExecution(
     const execution = await executeTerminalPastePlan(plan, {
       pasteText: (pasteText, pasteOptions) =>
         pasteTerminalText(pane.terminal, pasteText, pasteOptions),
-      writePty: (data) => writeTerminalPastePtyInput(transport, data),
+      writePty: (data) => writeTerminalPastePtyInput(transport, data, 'driving'),
       isTargetCurrent: () => {
         if (!isPanePasteTargetMounted(pane, transport, ptyId)) {
           return false
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-quick-command-initialization.test.ts b/src/renderer/src/components/terminal-pane/terminal-pane-quick-command-initialization.test.ts
new file mode 100644
index 000000000000..b64f75831603
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-quick-command-initialization.test.ts
@@ -0,0 +1,23 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+
+describe('TerminalPane quick-command initialization', () => {
+  it('defers quick-command host work until the context menu opens', () => {
+    const startupSource = readFileSync(
+      join(__dirname, 'use-terminal-pane-startup-actions.ts'),
+      'utf8'
+    )
+    const contextSource = readFileSync(
+      join(__dirname, 'use-terminal-pane-context-actions.ts'),
+      'utf8'
+    )
+
+    expect(startupSource).toContain('const quickCommandRepoId =')
+    expect(startupSource).not.toContain('useTerminalQuickCommandHosts')
+    expect(contextSource).toContain('useTerminalQuickCommandHosts(worktreeId, contextMenu.open)')
+    expect(contextSource).toContain('terminalQuickCommandMatchesWorkspaceProject')
+    expect(contextSource).toContain('projectHostSetupProjection.setups')
+    expect(contextSource).toContain('quickCommandExecutionHostId')
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/terminal-parked-pty-watcher.ts b/src/renderer/src/components/terminal-pane/terminal-parked-pty-watcher.ts
index 158d03e8bb02..f70599f148c6 100644
--- a/src/renderer/src/components/terminal-pane/terminal-parked-pty-watcher.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-parked-pty-watcher.ts
@@ -181,9 +181,15 @@ export function collapseParkedExitedLeaf(tabId: string, ptyId: string): void {
   const leafId =
     capturedPanesByTabId.get(tabId)?.panes.find((pane) => pane.ptyId === ptyId)?.leafId ??
     Object.entries(layout?.ptyIdsByLeafId ?? {}).find(([, boundPtyId]) => boundPtyId === ptyId)?.[0]
-  if (!leafId) {
-    return
+  if (leafId) {
+    collapseParkedTerminalLeaf(tabId, leafId, ptyId)
   }
+}
+
+/** Removes one leaf from a parked tab's stored layout; a no-op once the leaf is gone. */
+export function collapseParkedTerminalLeaf(tabId: string, leafId: string, ptyId?: string): void {
+  const state = useAppStore.getState()
+  const layout = state.terminalLayoutsByTabId[tabId]
   const detached = detachTerminalLayoutLeaf(layout, leafId)
   if (!detached) {
     return
@@ -191,7 +197,7 @@ export function collapseParkedExitedLeaf(tabId: string, ptyId: string): void {
   const terminalTab = Object.values(state.tabsByWorktree)
     .flat()
     .find((candidate) => candidate.id === tabId)
-  if (shouldClearLaunchAgentForClosedPane(terminalTab, ptyId)) {
+  if (shouldClearLaunchAgentForClosedPane(terminalTab, ptyId ?? layout?.ptyIdsByLeafId?.[leafId])) {
     state.clearTabLaunchAgent(tabId)
   }
   state.setTabLayout(tabId, detached.sourceLayout)
diff --git a/src/renderer/src/components/terminal-pane/terminal-paste-operation-order.test.ts b/src/renderer/src/components/terminal-pane/terminal-paste-operation-order.test.ts
index b36f0d06f65d..f08926b2c81d 100644
--- a/src/renderer/src/components/terminal-pane/terminal-paste-operation-order.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-paste-operation-order.test.ts
@@ -54,7 +54,13 @@ describe('terminal paste operation ordering', () => {
       pasteText: () => {},
       writePty,
       yieldToEventLoop: async () => {
-        startupDraft ??= sendAgentDraftPasteContent(null, 'pty-1', 'GENERATED_CONTEXT', writePty)
+        startupDraft ??= sendAgentDraftPasteContent(
+          null,
+          'pty-1',
+          'GENERATED_CONTEXT',
+          'launch',
+          writePty
+        )
       }
     })
     await startupDraft
@@ -80,6 +86,7 @@ describe('terminal paste operation ordering', () => {
       null,
       'pty-1',
       'G'.repeat(64 * 1024 + 1),
+      'launch',
       async (data) => {
         writes.push({ owner: 'startup', data })
         if (data === BRACKETED_PASTE_START) {
diff --git a/src/renderer/src/components/terminal-pane/terminal-programmatic-text-paste.ts b/src/renderer/src/components/terminal-pane/terminal-programmatic-text-paste.ts
index f92427e4729a..4f3549a15eef 100644
--- a/src/renderer/src/components/terminal-pane/terminal-programmatic-text-paste.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-programmatic-text-paste.ts
@@ -66,7 +66,7 @@ export function handleTerminalProgrammaticTextPaste({
     .then((plan) =>
       executeTerminalPastePlan(plan, {
         pasteText: (text, options) => pasteTerminalText(pane.terminal, text, options),
-        writePty: (data) => writeTerminalPastePtyInput(transport, data),
+        writePty: (data) => writeTerminalPastePtyInput(transport, data, 'driving'),
         isTargetCurrent: () =>
           isTerminalPanePasteTargetCurrent({
             manager: getManager(),
diff --git a/src/renderer/src/components/terminal-pane/terminal-pty-paste-writer.test.ts b/src/renderer/src/components/terminal-pane/terminal-pty-paste-writer.test.ts
index e501c50402d1..5a587c6acc9f 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pty-paste-writer.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pty-paste-writer.test.ts
@@ -8,21 +8,21 @@ describe('terminal PTY paste writer', () => {
     const sendInputAccepted = vi.fn().mockResolvedValue(true)
 
     await expect(
-      writeTerminalPastePtyInput({ sendInput, sendInputAccepted }, 'payload')
+      writeTerminalPastePtyInput({ sendInput, sendInputAccepted }, 'payload', 'driving')
     ).resolves.toBe(true)
 
-    expect(sendInputAccepted).toHaveBeenCalledWith('payload')
+    expect(sendInputAccepted).toHaveBeenCalledWith('payload', 'driving')
     expect(sendInput).not.toHaveBeenCalled()
   })
 
   it('falls back to queued PTY writes when acknowledged writes are unavailable', () => {
     const sendInput = vi.fn().mockReturnValue(true)
 
-    expect(writeTerminalPastePtyInput({ sendInput }, 'payload')).toBe(true)
-    expect(sendInput).toHaveBeenCalledWith('payload')
+    expect(writeTerminalPastePtyInput({ sendInput }, 'payload', 'driving')).toBe(true)
+    expect(sendInput).toHaveBeenCalledWith('payload', 'driving')
   })
 
   it('rejects writes without a transport', () => {
-    expect(writeTerminalPastePtyInput(undefined, 'payload')).toBe(false)
+    expect(writeTerminalPastePtyInput(undefined, 'payload', 'driving')).toBe(false)
   })
 })
diff --git a/src/renderer/src/components/terminal-pane/terminal-pty-paste-writer.ts b/src/renderer/src/components/terminal-pane/terminal-pty-paste-writer.ts
index dd7e257615a1..d1fffbc76fbc 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pty-paste-writer.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pty-paste-writer.ts
@@ -1,15 +1,17 @@
 import type { PtyTransport } from './pty-transport'
+import type { TerminalInputKind } from '../../../../shared/terminal-input-kind'
 
 type TerminalPastePtyWriter = Pick<PtyTransport, 'sendInput' | 'sendInputAccepted'>
 
 export function writeTerminalPastePtyInput(
   transport: TerminalPastePtyWriter | undefined,
-  data: string
+  data: string,
+  inputKind: TerminalInputKind
 ): boolean | Promise<boolean> {
   if (!transport) {
     return false
   }
   // Why: paste chunking must respect PTY backpressure. sendInput only queues
   // local writes, while sendInputAccepted resolves after the PTY accepts them.
-  return transport.sendInputAccepted?.(data) ?? transport.sendInput(data)
+  return transport.sendInputAccepted?.(data, inputKind) ?? transport.sendInput(data, inputKind)
 }
diff --git a/src/renderer/src/components/terminal-pane/terminal-quick-command-dispatch.test.ts b/src/renderer/src/components/terminal-pane/terminal-quick-command-dispatch.test.ts
index 7759e8802bf3..11c0449bd968 100644
--- a/src/renderer/src/components/terminal-pane/terminal-quick-command-dispatch.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-quick-command-dispatch.test.ts
@@ -40,7 +40,7 @@ describe('sendTerminalQuickCommandToPane', () => {
     })
 
     expect(sent).toBe(true)
-    expect(sendInput).toHaveBeenCalledWith('git status\r')
+    expect(sendInput).toHaveBeenCalledWith('git status\r', 'driving')
     expect(pane.terminal.focus).toHaveBeenCalledOnce()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
   })
@@ -62,7 +62,7 @@ describe('sendTerminalQuickCommandToPane', () => {
     })
 
     expect(sent).toBe(false)
-    expect(sendInput).toHaveBeenCalledWith('npm test')
+    expect(sendInput).toHaveBeenCalledWith('npm test', 'driving')
     expect(pane.terminal.focus).not.toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).not.toHaveBeenCalled()
   })
@@ -85,7 +85,7 @@ describe('sendTerminalQuickCommandToPane', () => {
     })
 
     expect(sent).toBe(true)
-    expect(sendInput).toHaveBeenCalledWith('cd packages; bun run build; cd ..\r')
+    expect(sendInput).toHaveBeenCalledWith('cd packages; bun run build; cd ..\r', 'driving')
     expect(pane.terminal.focus).toHaveBeenCalledOnce()
   })
 
@@ -107,7 +107,7 @@ describe('sendTerminalQuickCommandToPane', () => {
     })
 
     expect(sent).toBe(true)
-    expect(sendInput).toHaveBeenCalledWith('echo one; echo two')
+    expect(sendInput).toHaveBeenCalledWith('echo one; echo two', 'driving')
     expect(pane.terminal.focus).toHaveBeenCalledOnce()
   })
 
diff --git a/src/renderer/src/components/terminal-pane/terminal-quick-command-dispatch.ts b/src/renderer/src/components/terminal-pane/terminal-quick-command-dispatch.ts
index 39d49d02c866..5c8d3622b002 100644
--- a/src/renderer/src/components/terminal-pane/terminal-quick-command-dispatch.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-quick-command-dispatch.ts
@@ -5,6 +5,7 @@ import {
   isTerminalAgentQuickCommand
 } from '../../../../shared/terminal-quick-commands'
 import { recordTerminalUserInputForLeaf } from './terminal-input-activity'
+import type { PtyTransport } from './pty-transport-types'
 
 type QuickCommandPane = {
   leafId: string
@@ -13,9 +14,7 @@ type QuickCommandPane = {
   }
 }
 
-type QuickCommandTransport = {
-  sendInput: (data: string) => boolean
-}
+type QuickCommandTransport = Pick<PtyTransport, 'sendInput'>
 
 export function sendTerminalQuickCommandToPane({
   command,
@@ -36,7 +35,8 @@ export function sendTerminalQuickCommandToPane({
   }
 
   const sent = transport.sendInput(
-    buildTerminalQuickCommandInput(flattenTerminalQuickCommand(command))
+    buildTerminalQuickCommandInput(flattenTerminalQuickCommand(command)),
+    'driving'
   )
   if (sent) {
     recordTerminalUserInputForLeaf(tabId, pane.leafId)
diff --git a/src/renderer/src/components/terminal-pane/terminal-replay-cursor-state.test.ts b/src/renderer/src/components/terminal-pane/terminal-replay-cursor-state.test.ts
index ce6a3db257c9..70a3c4d26685 100644
--- a/src/renderer/src/components/terminal-pane/terminal-replay-cursor-state.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-replay-cursor-state.test.ts
@@ -1,12 +1,12 @@
 import { describe, expect, it } from 'vitest'
 import { Terminal } from '@xterm/headless'
 import {
+  CONFIRMED_SHELL_MODE_RESET,
   POST_REPLAY_LIVE_AGENT_REATTACH_RESET,
   POST_REPLAY_LIVE_SNAPSHOT_RESET,
   POST_REPLAY_MODE_RESET,
   POST_REPLAY_REATTACH_RESET,
-  RESET_KITTY_KEYBOARD_PROTOCOL,
-  RESET_TERMINAL_CURSOR_STYLE
+  RESET_KITTY_KEYBOARD_PROTOCOL
 } from '../../../../shared/terminal-mode-reset-profiles'
 
 const OLD_REATTACH_RESET_WITHOUT_CURSOR_STYLE = '\x1b[?25h\x1b[?1004l'
@@ -74,10 +74,11 @@ function writeTerminal(term: Terminal, data: string): Promise<void> {
 }
 
 describe('terminal replay state reset', () => {
-  it('includes Kitty keyboard protocol reset in replay reset bundles', () => {
+  it('resets Kitty keyboard state only in the process-ended bundles', () => {
     expect(RESET_KITTY_KEYBOARD_PROTOCOL).toBe('\x1b[<99u\x1b[=0u')
     expect(POST_REPLAY_MODE_RESET).toContain(RESET_KITTY_KEYBOARD_PROTOCOL)
-    expect(POST_REPLAY_REATTACH_RESET).toContain(RESET_KITTY_KEYBOARD_PROTOCOL)
+    expect(CONFIRMED_SHELL_MODE_RESET).toContain(RESET_KITTY_KEYBOARD_PROTOCOL)
+    expect(POST_REPLAY_REATTACH_RESET).not.toContain(RESET_KITTY_KEYBOARD_PROTOCOL)
     expect(POST_REPLAY_LIVE_SNAPSHOT_RESET).not.toContain(RESET_KITTY_KEYBOARD_PROTOCOL)
   })
 
@@ -137,7 +138,7 @@ describe('terminal replay state reset', () => {
     }
   })
 
-  it('clears active-buffer Kitty keyboard state after live reattach replay', async () => {
+  it("keeps a live app's Kitty keyboard state through the live reattach reset", async () => {
     const term = new Terminal({
       cols: 80,
       rows: 24,
@@ -147,25 +148,14 @@ describe('terminal replay state reset', () => {
 
     try {
       await writeTerminal(term, '\x1b[=31u\x1b[>15u')
-      expect(readKittyKeyboardState(term)).toMatchObject({
-        flags: 15,
-        mainStack: [31]
-      })
-
       await writeTerminal(term, POST_REPLAY_REATTACH_RESET)
-      // Why: after renderer reattach, the next Ctrl+C must not inherit a stale
-      // Kitty CSI-u encoder state from the replayed TUI snapshot.
-      expect(readKittyKeyboardState(term)).toMatchObject({
-        flags: 0,
-        mainFlags: 0,
-        mainStack: []
-      })
+      expect(readKittyKeyboardState(term)).toMatchObject({ flags: 15, mainStack: [31] })
     } finally {
       term.dispose()
     }
   })
 
-  it('clears active-buffer Kitty keyboard state with the idle-agent reset sequence', async () => {
+  it('clears active-buffer Kitty keyboard state with the confirmed-shell reset', async () => {
     const term = new Terminal({
       cols: 80,
       rows: 24,
@@ -175,14 +165,7 @@ describe('terminal replay state reset', () => {
 
     try {
       await writeTerminal(term, '\x1b[=31u\x1b[>15u')
-      expect(readKittyKeyboardState(term)).toMatchObject({
-        flags: 15,
-        mainStack: [31]
-      })
-
-      await writeTerminal(term, `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}`)
-      // Why: this is the exact reset emitted when a native Windows agent turn
-      // completes, so the next Backspace/Enter must not inherit CSI-u encoding.
+      await writeTerminal(term, CONFIRMED_SHELL_MODE_RESET)
       expect(readKittyKeyboardState(term)).toMatchObject({
         flags: 0,
         mainFlags: 0,
diff --git a/src/renderer/src/components/terminal-pane/terminal-shortcut-policy.ts b/src/renderer/src/components/terminal-pane/terminal-shortcut-policy.ts
index 3ec1fea161da..98f47941bb74 100644
--- a/src/renderer/src/components/terminal-pane/terminal-shortcut-policy.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-shortcut-policy.ts
@@ -100,17 +100,17 @@ export function resolveTerminalShortcutAction(
     return { type: 'switchInputSource' }
   }
 
-  // Why: held select-all keydowns must remain claimed until keyup so Kitty
-  // event reporting cannot encode their repeat or release into the PTY.
+  // Why: held select-all and copy keydowns must remain claimed until keyup so
+  // Kitty event reporting cannot encode their repeat or release into the PTY.
   if (keybindingMatchesAction('terminal.selectAll', event, platform, keybindings)) {
     return { type: 'selectAll' }
   }
 
-  if (!event.repeat) {
-    if (keybindingMatchesAction('terminal.copySelection', event, platform, keybindings)) {
-      return { type: 'copySelection' }
-    }
+  if (keybindingMatchesAction('terminal.copySelection', event, platform, keybindings)) {
+    return { type: 'copySelection' }
+  }
 
+  if (!event.repeat) {
     if (keybindingMatchesAction('terminal.search', event, platform, keybindings)) {
       return { type: 'toggleSearch' }
     }
diff --git a/src/renderer/src/components/terminal-pane/terminal-spawn-error-display.test.ts b/src/renderer/src/components/terminal-pane/terminal-spawn-error-display.test.ts
new file mode 100644
index 000000000000..fad9f9d7c204
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-spawn-error-display.test.ts
@@ -0,0 +1,70 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+  LEGACY_PTY_ALLOCATION_HINT,
+  LEGACY_TERMINAL_PROCESS_LIMIT_HINT,
+  PTY_ALLOCATION_HINT,
+  TERMINAL_PROCESS_LIMIT_HINT
+} from '../../../../shared/terminal-spawn-error-copy'
+
+// Why a locale stand-in: English fallbacks equal the host copy, so only a translation shows the swap.
+vi.mock('@/i18n/i18n', () => ({
+  translate: (key: string, fallback: string) =>
+    ({
+      'auto.components.terminal.pane.TerminalErrorToast.ptyAllocationLimit':
+        '系统无法再分配 pty 设备。',
+      'auto.components.terminal.pane.TerminalErrorToast.terminalProcessLimit':
+        '系统无法再启动终端进程。'
+    })[key] ?? fallback
+}))
+
+import {
+  localizeTerminalSpawnHints,
+  withoutTerminalSpawnIssueRequest
+} from './terminal-spawn-error-display'
+
+const RAW =
+  'Failed to spawn shell "/bin/zsh": node-pty: open_slave failed: EMFILE (errno 24, Too many open files) (shell: /bin/zsh). If this persists, please file an issue.'
+
+describe('localizeTerminalSpawnHints', () => {
+  it('translates the pty allocation hint and keeps the raw diagnostic', () => {
+    expect(localizeTerminalSpawnHints(`${PTY_ALLOCATION_HINT}\n${RAW}`)).toBe(
+      `系统无法再分配 pty 设备。\n${RAW}`
+    )
+  })
+
+  it('translates the terminal process limit hint', () => {
+    expect(localizeTerminalSpawnHints(TERMINAL_PROCESS_LIMIT_HINT)).toBe('系统无法再启动终端进程。')
+  })
+
+  it('translates the multi-line hints an older host publishes', () => {
+    expect(localizeTerminalSpawnHints(`${LEGACY_PTY_ALLOCATION_HINT} ${RAW}`)).toBe(
+      `系统无法再分配 pty 设备。 ${RAW}`
+    )
+    expect(localizeTerminalSpawnHints(LEGACY_TERMINAL_PROCESS_LIMIT_HINT)).toBe(
+      '系统无法再启动终端进程。'
+    )
+  })
+
+  it('leaves unrelated errors untouched', () => {
+    expect(localizeTerminalSpawnHints('Paste failed.')).toBe('Paste failed.')
+  })
+})
+
+describe('withoutTerminalSpawnIssueRequest', () => {
+  it('drops the host issue request and keeps the diagnostic', () => {
+    expect(withoutTerminalSpawnIssueRequest(RAW)).toBe(
+      'Failed to spawn shell "/bin/zsh": node-pty: open_slave failed: EMFILE (errno 24, Too many open files) (shell: /bin/zsh).'
+    )
+  })
+
+  it('drops the request from an error before another pane error', () => {
+    expect(withoutTerminalSpawnIssueRequest(`${RAW}\nPaste failed.`)).toBe(
+      'Failed to spawn shell "/bin/zsh": node-pty: open_slave failed: EMFILE (errno 24, Too many open files) (shell: /bin/zsh).\nPaste failed.'
+    )
+  })
+
+  it('keeps the same words when they are part of the diagnostic', () => {
+    const error = `Command printed: If this persists, please file an issue.\nMore detail follows.`
+    expect(withoutTerminalSpawnIssueRequest(error)).toBe(error)
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/terminal-spawn-error-display.ts b/src/renderer/src/components/terminal-pane/terminal-spawn-error-display.ts
new file mode 100644
index 000000000000..faa79292388e
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-spawn-error-display.ts
@@ -0,0 +1,39 @@
+import { translate } from '@/i18n/i18n'
+import {
+  LEGACY_PTY_ALLOCATION_HINT,
+  LEGACY_TERMINAL_PROCESS_LIMIT_HINT,
+  PTY_ALLOCATION_HINT,
+  TERMINAL_PROCESS_LIMIT_HINT,
+  TERMINAL_SPAWN_ISSUE_REQUEST
+} from '../../../../shared/terminal-spawn-error-copy'
+
+/** Swaps the host's English resource-limit hints for the viewer's locale. */
+export function localizeTerminalSpawnHints(error: string): string {
+  const ptyAllocation = translate(
+    'auto.components.terminal.pane.TerminalErrorToast.ptyAllocationLimit',
+    PTY_ALLOCATION_HINT
+  )
+  const processLimit = translate(
+    'auto.components.terminal.pane.TerminalErrorToast.terminalProcessLimit',
+    TERMINAL_PROCESS_LIMIT_HINT
+  )
+  // Why a replacer: a translation containing `$&` would otherwise be read as a substitution.
+  return error
+    .replaceAll(LEGACY_PTY_ALLOCATION_HINT, () => ptyAllocation)
+    .replaceAll(PTY_ALLOCATION_HINT, () => ptyAllocation)
+    .replaceAll(LEGACY_TERMINAL_PROCESS_LIMIT_HINT, () => processLimit)
+    .replaceAll(TERMINAL_PROCESS_LIMIT_HINT, () => processLimit)
+}
+
+/** Drops the host's plain-text issue request where the toast renders its own linked one. */
+export function withoutTerminalSpawnIssueRequest(error: string): string {
+  const suffix = ` ${TERMINAL_SPAWN_ISSUE_REQUEST}`
+  return error
+    .split('\n')
+    .map((line) =>
+      line.includes('Failed to spawn shell "') && line.endsWith(suffix)
+        ? line.slice(0, -suffix.length)
+        : line
+    )
+    .join('\n')
+}
diff --git a/src/renderer/src/components/terminal-pane/terminal-startup-command-paste.ts b/src/renderer/src/components/terminal-pane/terminal-startup-command-paste.ts
index 3a2307cd87dc..913c8b6cfdcd 100644
--- a/src/renderer/src/components/terminal-pane/terminal-startup-command-paste.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-startup-command-paste.ts
@@ -47,7 +47,7 @@ export async function executeTerminalStartupCommandPaste({
 
   return executeTerminalPastePlan(plan, {
     pasteText: (text, options) => pasteTerminalText(pane.terminal, text, options),
-    writePty: (data) => writeTerminalPastePtyInput(transport, data),
+    writePty: (data) => writeTerminalPastePtyInput(transport, data, 'launch'),
     isTargetCurrent: isCurrent,
     canContinue: isCurrent
   })
diff --git a/src/renderer/src/components/terminal-pane/title-agent-identity.ts b/src/renderer/src/components/terminal-pane/title-agent-identity.ts
index 8a496052335f..157d082a9197 100644
--- a/src/renderer/src/components/terminal-pane/title-agent-identity.ts
+++ b/src/renderer/src/components/terminal-pane/title-agent-identity.ts
@@ -1,3 +1,4 @@
+import { isQoderTerminalTitle } from '../../../../shared/qoder-terminal-title'
 import {
   detectAgentStatusFromTitle,
   isGeminiTerminalTitle,
@@ -21,6 +22,7 @@ export function titleHasExplicitAgentIdentity(title: string): boolean {
     title.startsWith('. ') ||
     title.startsWith('* ') ||
     title.startsWith('\u2733') ||
+    isQoderTerminalTitle(title) ||
     isGeminiTerminalTitle(title) ||
     isPiTerminalTitle(title)
   ) {
diff --git a/src/renderer/src/components/terminal-pane/use-notification-dispatch-verdict.test.ts b/src/renderer/src/components/terminal-pane/use-notification-dispatch-verdict.test.ts
new file mode 100644
index 000000000000..2178d357c7aa
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/use-notification-dispatch-verdict.test.ts
@@ -0,0 +1,53 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { dispatchTerminalNotification } from './use-notification-dispatch'
+import {
+  PANE_KEY,
+  getLastNotificationDispatchArg,
+  makeAgentStatus,
+  resetNotificationDispatchMockState,
+  type NotificationDispatchMockState
+} from './notification-dispatch-test-harness'
+
+vi.mock('@/store', async () => {
+  const harness = await import('./notification-dispatch-test-harness')
+  return harness.createNotificationDispatchStoreModuleMock()
+})
+
+vi.mock('@/lib/desktop-notification-sound', async () => {
+  const harness = await import('./notification-dispatch-test-harness')
+  return harness.createDesktopNotificationSoundModuleMock()
+})
+
+let mockState: NotificationDispatchMockState
+
+// The hook lane hands main the row's verdict, read through the one accessor, so a terminal
+// agent's StopFailure is worded "failed" rather than "finished".
+describe('dispatchTerminalNotification verdict', () => {
+  beforeEach(() => {
+    mockState = resetNotificationDispatchMockState()
+  })
+
+  afterEach(() => {
+    vi.unstubAllGlobals()
+  })
+
+  it.each([
+    [{ mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: 1 } }, 'failure'],
+    [{ mainAgent: { state: 'done', outcome: 'cancellation', stateStartedAt: 1 } }, 'cancellation'],
+    [{ interrupted: true }, 'cancellation'],
+    [{}, undefined]
+  ] as const)('passes %j as the turn outcome %s', (overrides, outcome) => {
+    mockState.agentStatusByPaneKey[PANE_KEY] = makeAgentStatus(PANE_KEY, overrides)
+
+    dispatchTerminalNotification('wt-primary', {
+      source: 'agent-task-complete',
+      terminalTitle: 'codex',
+      paneKey: PANE_KEY
+    })
+
+    expect(getLastNotificationDispatchArg()).toMatchObject({
+      agentState: 'done',
+      agentTurnOutcome: outcome
+    })
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/use-notification-dispatch.ts b/src/renderer/src/components/terminal-pane/use-notification-dispatch.ts
index 304e844d99db..3e4e4b4cb987 100644
--- a/src/renderer/src/components/terminal-pane/use-notification-dispatch.ts
+++ b/src/renderer/src/components/terminal-pane/use-notification-dispatch.ts
@@ -2,6 +2,7 @@ import { useCallback } from 'react'
 import { useAppStore } from '@/store'
 import { resolveCommittedTitleAgentType } from '@/lib/pane-agent-evidence'
 import { buildAgentNotificationId } from '../../../../shared/agent-notification-id'
+import { agentMainAgentVerdict } from '../../../../shared/agent-main-agent-verdict'
 import { shareCompatibleTitleIdentityGroup } from '../../../../shared/agent-title-owner'
 import {
   isFreshNonDoneAgentStatus,
@@ -146,7 +147,7 @@ export function dispatchTerminalNotification(
         agentToolName: agentStatus.toolName,
         agentToolInput: agentStatus.toolInput,
         agentLastAssistantMessage: agentStatus.lastAssistantMessage,
-        agentInterrupted: agentStatus.interrupted
+        agentTurnOutcome: agentMainAgentVerdict(agentStatus) ?? undefined
       }
     : {}
   const notificationId =
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-close-actions.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-close-actions.ts
index 3e8dd463a30e..bcdbd9b41b30 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-close-actions.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-close-actions.ts
@@ -16,6 +16,7 @@ import { clearPaneTerminalError } from './terminal-error-accumulation'
 import type { TerminalPaneBindingController } from './use-terminal-pane-layout-bindings'
 import { retireUnboundIpcTerminalPane } from './retire-unbound-ipc-terminal-pane'
 import { capturePendingTerminalPaneClose } from './terminal-pane-close-admission'
+import { commitTerminalSurfaceClose } from '@/store/terminals/terminal-surface-close-intent'
 
 export function useTerminalPaneCloseActions(controller: TerminalPaneBindingController) {
   const confirmedCloseRef = useRef<(() => void) | null>(null)
@@ -50,6 +51,7 @@ export function useTerminalPaneCloseActions(controller: TerminalPaneBindingContr
         clearSessionRestoredBannerForPane(paneId)
         const leafId = manager.getLeafId(paneId)
         if (leafId) {
+          commitTerminalSurfaceClose(worktreeId, { kind: 'pane', tabId, leafId })
           retireUnboundIpcTerminalPane({
             getState: useAppStore.getState,
             tabId,
@@ -82,7 +84,8 @@ export function useTerminalPaneCloseActions(controller: TerminalPaneBindingContr
       onCloseTab,
       syncPanePtyLayoutBinding,
       syncPanePtyLayoutBindingForLeaf,
-      tabId
+      tabId,
+      worktreeId
     ]
   )
   const getCloseDialogCopyKind = useCallback(
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-context-menu.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-context-menu.ts
index 155482f21632..463a3a7f4154 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-context-menu.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-context-menu.ts
@@ -26,6 +26,7 @@ import { useTerminalContextMenuTrigger } from './use-terminal-context-menu-trigg
 import { useAppStore } from '@/store'
 import { makePaneKey } from '../../../../shared/stable-pane-id'
 import { resolvePaneAgentSessionId } from './pane-agent-session-id'
+import { resetTerminalInputModes } from './terminal-input-mode-reset'
 
 type UseTerminalPaneContextMenuDeps = {
   managerRef: React.RefObject<PaneManager | null>
@@ -68,6 +69,7 @@ type TerminalMenuState = {
   onEqualizePaneSizes: () => void
   onClosePane: () => void
   onClearScreen: () => void
+  onResetTerminal: () => void
   onForkAgentSession: () => Promise<void>
   onContinueAgentSessionInNewSession: () => void
   onCopyAgentSessionContext: () => Promise<void>
@@ -209,6 +211,13 @@ export function useTerminalPaneContextMenu({
     }
   }
 
+  const onResetTerminal = (): void => {
+    const pane = resolveMenuPane()
+    if (pane) {
+      resetTerminalInputModes(paneTransportsRef.current.get(pane.id)?.getPtyId() ?? null)
+    }
+  }
+
   const onForkAgentSession = async (): Promise<void> =>
     forkAgentSessionFromMenuPane(agentSessionContext, resolveMenuPane())
 
@@ -295,6 +304,7 @@ export function useTerminalPaneContextMenu({
     onEqualizePaneSizes,
     onClosePane,
     onClearScreen,
+    onResetTerminal,
     onForkAgentSession,
     onContinueAgentSessionInNewSession,
     onCopyAgentSessionContext,
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-foundation.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-foundation.ts
index 7a0da0ec79ed..008925a06889 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-foundation.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-foundation.ts
@@ -148,7 +148,9 @@ export function useTerminalPaneFoundation(
   const [ptyRecoveryStatesByPaneId, setPtyRecoveryStatesByPaneId] = useState<
     Record<number, VisiblePtyRecoveryState>
   >({})
-  const [sessionStateSaveFailureOpen, setSessionStateSaveFailureOpen] = useState(false)
+  const [sessionStateSaveFailureMessage, setSessionStateSaveFailureMessage] = useState<
+    string | null
+  >(null)
   const daemonActions = useDaemonActions()
   const { refreshMobileOverlays } = useMobileOverlayTicks({
     managerRef,
@@ -235,8 +237,8 @@ export function useTerminalPaneFoundation(
     setTerminalError,
     ptyRecoveryStatesByPaneId,
     setPtyRecoveryStatesByPaneId,
-    sessionStateSaveFailureOpen,
-    setSessionStateSaveFailureOpen,
+    sessionStateSaveFailureMessage,
+    setSessionStateSaveFailureMessage,
     daemonActions,
     refreshMobileOverlays
   }
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-lifecycle.test.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-lifecycle.test.ts
index a86341860fae..7e9e1e42b93a 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-lifecycle.test.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-lifecycle.test.ts
@@ -12,7 +12,6 @@ import {
   resolvePaneSeedCwd,
   resolveQueuedInitialCwd,
   replayLayoutWithOneShotParkIntent,
-  resetTerminalKeyboardProtocolAfterInterrupt,
   retireMountedTerminalPaneSurface,
   shouldDetachPaneTransportOnUnmount,
   splitPaneWithOneShotStartup,
@@ -168,23 +167,6 @@ describe('applyTerminalPaneCloseRequest', () => {
   })
 })
 
-describe('resetTerminalKeyboardProtocolAfterInterrupt', () => {
-  it('does not write to an xterm whose pipeline is certified dead', async () => {
-    const { _resetWritePipelineHealthForTests, notifyUndeliverableWrite } =
-      await import('@/lib/pane-manager/terminal-write-pipeline-health')
-    const terminal = { write: vi.fn() }
-    try {
-      notifyUndeliverableWrite(terminal, 'replay-wedged')
-
-      resetTerminalKeyboardProtocolAfterInterrupt(terminal as never)
-
-      expect(terminal.write).not.toHaveBeenCalled()
-    } finally {
-      _resetWritePipelineHealthForTests(terminal)
-    }
-  })
-})
-
 // Why: onPaneCreated uses paneOwnsQueuedStartup to decide whether a pane may spend the tab's queued
 // startup command. Setup/issue splits borrow the same deps.startup field for their own one-shot
 // payload, so a looser test would let a split pane spend a command it never runs — re-breaking
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-lifecycle.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-lifecycle.ts
index d5f39d6fa8ac..944a2e6bbe0c 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-lifecycle.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-lifecycle.ts
@@ -25,7 +25,6 @@ export {
   mapRestoredPaneTitlesByPaneId,
   paneOwnsQueuedStartup,
   replayLayoutWithOneShotParkIntent,
-  resetTerminalKeyboardProtocolAfterInterrupt,
   resolvePaneLinkCwd,
   resolvePaneSeedCwd,
   resolveQueuedInitialCwd,
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-mobile-actions.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-mobile-actions.ts
index 5796dde988c4..4179d3920a40 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-mobile-actions.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-mobile-actions.ts
@@ -208,7 +208,7 @@ export function useTerminalPaneMobileActions(controller: TerminalPaneContextCont
         const execution = await executeTerminalPastePlan(plan, {
           pasteText: (pasteText, pasteOptions) =>
             pasteTerminalText(clickedPane.terminal, pasteText, pasteOptions),
-          writePty: (data) => writeTerminalPastePtyInput(transport, data),
+          writePty: (data) => writeTerminalPastePtyInput(transport, data, 'driving'),
           isTargetCurrent: targetStillMounted,
           canContinue: targetStillMounted
         })
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-startup-actions.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-startup-actions.ts
index 5f59aa73e25e..deff696c93fb 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-startup-actions.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-startup-actions.ts
@@ -46,7 +46,7 @@ export function useTerminalPaneStartupActions(controller: TerminalPaneStoreContr
     setQuickCommandEditorHostId,
     setQuickCommandEditorOpen,
     setSessionRestoredBannerPaneIds,
-    setSessionStateSaveFailureOpen,
+    setSessionStateSaveFailureMessage,
     setShouldMeasureHiddenStartup,
     setTerminalError,
     setTerminalErrorsByPaneId,
@@ -114,7 +114,7 @@ export function useTerminalPaneStartupActions(controller: TerminalPaneStoreContr
   )
 
   const openDiskSpaceAnalyzer = useCallback(() => {
-    setSessionStateSaveFailureOpen(false)
+    setSessionStateSaveFailureMessage(null)
     openSpacePage()
     void refreshWorkspaceSpace().catch((error: unknown) => {
       console.warn('Failed to refresh Space Analyzer after terminal session save failure:', error)
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-title-state.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-title-state.ts
index 69f292dadcf5..be4093da6cc0 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-title-state.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-title-state.ts
@@ -20,7 +20,7 @@ export function useTerminalPaneTitleState(controller: TerminalPaneFoundation) {
     tabId,
     paneTransportsRef,
     setPtyRecoveryStatesByPaneId,
-    setSessionStateSaveFailureOpen,
+    setSessionStateSaveFailureMessage,
     setTerminalError,
     setTerminalErrorsByPaneId,
     sshReconnectOwnsTerminalErrorsRef
@@ -92,7 +92,7 @@ export function useTerminalPaneTitleState(controller: TerminalPaneFoundation) {
     if (isTerminalSessionStateSaveFailure(message)) {
       setTerminalError(null)
       setTerminalErrorsByPaneId({})
-      setSessionStateSaveFailureOpen(true)
+      setSessionStateSaveFailureMessage(message)
       return
     }
     const visibleMessage = sshReconnectOwnsTerminalErrorsRef.current
diff --git a/src/renderer/src/components/terminal-pane/xterm-bypass-policy.test.ts b/src/renderer/src/components/terminal-pane/xterm-bypass-policy.test.ts
index 265a80bf47e9..c08ff8316c10 100644
--- a/src/renderer/src/components/terminal-pane/xterm-bypass-policy.test.ts
+++ b/src/renderer/src/components/terminal-pane/xterm-bypass-policy.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import {
+  isAppOwnedCopyChord,
   shouldBypassXtermKeyboardEvent,
   shouldPreventDefaultTerminalImeCandidateKey,
   shouldSuppressTerminalImeKeyboardEvent
@@ -19,12 +20,32 @@ describe('shouldBypassXtermKeyboardEvent — macOS', () => {
     ).toBe(true)
   })
 
-  it('bubbles Cmd+C even with no selection (no-op copy is harmless on macOS)', () => {
+  it('bubbles Cmd+C in a plain shell with no selection', () => {
     expect(
       shouldBypassXtermKeyboardEvent(event({ key: 'c', code: 'KeyC', metaKey: true }), noSel)
     ).toBe(true)
   })
 
+  it.each([1, 2, 3, 8, 31])('lets unselected Cmd+C reach Kitty flags %i', (flags) => {
+    for (const type of ['keydown', 'keyup']) {
+      for (const repeat of [false, true]) {
+        const chord = event({ type, key: 'c', code: 'KeyC', metaKey: true, repeat })
+        expect(shouldBypassXtermKeyboardEvent(chord, { ...noSel, kittyKeyboardFlags: flags })).toBe(
+          false
+        )
+        expect(shouldBypassXtermKeyboardEvent(chord, { ...opts, kittyKeyboardFlags: flags })).toBe(
+          true
+        )
+        expect(
+          shouldBypassXtermKeyboardEvent(
+            { ...chord, defaultPrevented: true },
+            { ...noSel, kittyKeyboardFlags: flags }
+          )
+        ).toBe(true)
+      }
+    }
+  })
+
   it('bubbles Cmd+V so web clients receive the native paste event', () => {
     expect(
       shouldBypassXtermKeyboardEvent(event({ key: 'v', code: 'KeyV', metaKey: true }), noSel)
@@ -173,6 +194,24 @@ describe('shouldBypassXtermKeyboardEvent — macOS', () => {
   })
 })
 
+describe('isAppOwnedCopyChord', () => {
+  const cmdC = event({ key: 'c', code: 'KeyC', metaKey: true })
+  const kittyApp = { isMac: true, hasSelection: false, kittyKeyboardFlags: 1 }
+
+  it('gives unselected macOS Cmd+C to an app that negotiated Kitty reporting', () => {
+    expect(isAppOwnedCopyChord(cmdC, kittyApp)).toBe(true)
+  })
+
+  it('keeps Orca copy for a selection, a plain shell, other chords, and other platforms', () => {
+    expect(isAppOwnedCopyChord(cmdC, { ...kittyApp, hasSelection: true })).toBe(false)
+    expect(isAppOwnedCopyChord(cmdC, { ...kittyApp, kittyKeyboardFlags: 0 })).toBe(false)
+    expect(isAppOwnedCopyChord(cmdC, { ...kittyApp, kittyKeyboardFlags: undefined })).toBe(false)
+    expect(isAppOwnedCopyChord({ ...cmdC, shiftKey: true }, kittyApp)).toBe(false)
+    const ctrlShiftC = event({ key: 'C', code: 'KeyC', ctrlKey: true, shiftKey: true })
+    expect(isAppOwnedCopyChord(ctrlShiftC, { ...kittyApp, isMac: false })).toBe(false)
+  })
+})
+
 describe('shouldSuppressTerminalImeKeyboardEvent — macOS', () => {
   const idle = {
     isMac: true,
diff --git a/src/renderer/src/components/terminal-pane/xterm-bypass-policy.ts b/src/renderer/src/components/terminal-pane/xterm-bypass-policy.ts
index 2ab8f27f4f1b..977a1731e1ed 100644
--- a/src/renderer/src/components/terminal-pane/xterm-bypass-policy.ts
+++ b/src/renderer/src/components/terminal-pane/xterm-bypass-policy.ts
@@ -282,6 +282,23 @@ function matchesClipboardBinding(
   return keybindingMatchesInput(binding, event, platform)
 }
 
+/**
+ * On macOS an unselected Cmd+C belongs to an app that negotiated Kitty keyboard
+ * reporting: apps like Codex capture the mouse, so their highlight is never an
+ * xterm selection. Without negotiation, unselected Cmd+C still sends nothing.
+ */
+export function isAppOwnedCopyChord(
+  event: XtermBypassEvent,
+  options: Pick<XtermBypassOptions, 'isMac' | 'hasSelection' | 'kittyKeyboardFlags'>
+): boolean {
+  return (
+    options.isMac &&
+    !options.hasSelection &&
+    (options.kittyKeyboardFlags ?? 0) !== 0 &&
+    matchesClipboardBinding('Mod+C', event, 'darwin')
+  )
+}
+
 /**
  * Decide whether plain Ctrl+C should bypass xterm's kitty CSI-u encoder and
  * be sent as ETX through Terminal.input() instead.
@@ -356,6 +373,10 @@ export function shouldBypassXtermKeyboardEvent(
     return true
   }
 
+  if (isAppOwnedCopyChord(event, options)) {
+    return false
+  }
+
   if (isMac) {
     // Why: window-level handlers already consume other Cmd chords before xterm
     // sees them in Electron. Web clients still need paste to bubble to
diff --git a/src/renderer/src/components/terminal-parked-watcher-sync-entries.test.tsx b/src/renderer/src/components/terminal-parked-watcher-sync-entries.test.tsx
index efcc2fb8d448..37b40a20053d 100644
--- a/src/renderer/src/components/terminal-parked-watcher-sync-entries.test.tsx
+++ b/src/renderer/src/components/terminal-parked-watcher-sync-entries.test.tsx
@@ -80,6 +80,7 @@ function renderWatcherEffects(overrides: Partial<WatcherController> = {}): Promi
     pendingStartupByTabId: {},
     // Another workspace is on screen, so the mounted one is hidden and parks.
     renderedActiveWorktreeId: 'repo-1::/worktree-9',
+    startupTerminalTabHold: null,
     tabsByWorktree: {
       [PARKED_WORKTREE_ID]: [
         terminalTab('tab-parked', PARKED_WORKTREE_ID),
@@ -127,6 +128,20 @@ describe('parked terminal watcher sync entries', () => {
     expect([...(parkedEntry?.parkedTabIds ?? [])]).toEqual(['tab-parked'])
   })
 
+  it('watches the tabs a startup hold keeps unmounted on the visible workspace', async () => {
+    const heldWorktreeId = surfaceIds[9]
+    const tab = terminalTab('held-agent', heldWorktreeId, 'live-pty')
+    await renderWatcherEffects({
+      mountedWorktreeIdsRef: { current: new Set([heldWorktreeId]) },
+      startupTerminalTabHold: { worktreeId: heldWorktreeId, heldTabIds: new Set([tab.id]) },
+      tabsByWorktree: { [heldWorktreeId]: [tab] }
+    })
+
+    const entry = lastSyncEntries().get(heldWorktreeId)
+    expect([...entry!.parkedTabIds]).toEqual([tab.id])
+    expect([...entry!.restoreTitleOnStartTabIds!]).toEqual([tab.id])
+  })
+
   it('does not allocate a parked-tab-id set per unmounted surface', async () => {
     await renderWatcherEffects()
 
diff --git a/src/renderer/src/components/terminal-split-workspace-surfaces-startup-hold.test.tsx b/src/renderer/src/components/terminal-split-workspace-surfaces-startup-hold.test.tsx
new file mode 100644
index 000000000000..b8e1040995ee
--- /dev/null
+++ b/src/renderer/src/components/terminal-split-workspace-surfaces-startup-hold.test.tsx
@@ -0,0 +1,86 @@
+// @vitest-environment happy-dom
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { TerminalSplitWorkspaceSurfaces } from './TerminalSplitWorkspaceSurfaces'
+import type { StartupTerminalTabHold } from './terminal/startup-terminal-tab-hold'
+import type { TerminalController } from './use-terminal-controller'
+
+const mocks = vi.hoisted(() => ({
+  surfaceProps: new Map<string, ReadonlySet<string> | null>()
+}))
+vi.mock('./TerminalWorktreeSplitSurface', () => ({
+  WorktreeSplitSurface: (props: {
+    worktreeId: string
+    activationDeferredMountTabIds: ReadonlySet<string> | null
+  }) => {
+    mocks.surfaceProps.set(props.worktreeId, props.activationDeferredMountTabIds)
+    return null
+  }
+}))
+vi.mock('./browser-pane/host-guest/browser-guest-paint-retention', () => ({
+  useAnyBrowserGuestNeedsPaint: () => false
+}))
+Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true })
+
+const HELD_WORKTREE_ID = 'repo::/held'
+const DEFERRED_WORKTREE_ID = 'repo::/deferred'
+const OTHER_WORKTREE_ID = 'repo::/other'
+const WORKTREE_IDS = [HELD_WORKTREE_ID, DEFERRED_WORKTREE_ID, OTHER_WORKTREE_ID]
+
+let root: Root | undefined
+afterEach(async () => {
+  await act(async () => root?.unmount())
+  root = undefined
+  mocks.surfaceProps.clear()
+})
+
+async function renderSurfaces(
+  hold: StartupTerminalTabHold | null,
+  deferred: Map<string, ReadonlySet<string>>
+): Promise<void> {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: TerminalSplitWorkspaceSurfaces reads only the fields listed here; the rest of the controller is machinery this render never touches.
+  const controller = {
+    activationDeferredMountTabIdsByWorktreeRef: { current: deferred },
+    activeGroupIdByWorktree: {},
+    activeView: 'terminal',
+    activityTerminalPortals: [],
+    anyMountedWorktreeHasLayout: true,
+    backgroundMountTabIdsByWorktreeRef: { current: new Map() },
+    effectiveActiveLayout: { type: 'leaf', groupId: 'group-1' },
+    effectiveParkedTerminalWorktreeIds: new Set(),
+    forceParkedTerminalWorktreeIds: new Set(),
+    getEffectiveLayoutForWorktree: () => ({ type: 'leaf', groupId: 'group-1' }),
+    measurableBackgroundWorktreeIdsRef: { current: new Set() },
+    mountedWorktreeIdsRef: { current: new Set(WORKTREE_IDS) },
+    renderedActiveWorktreeId: HELD_WORKTREE_ID,
+    startupTerminalTabHold: hold,
+    workspaceSurfaces: WORKTREE_IDS.map((id) => ({ id, path: `/${id}` }))
+  } as unknown as TerminalController
+  const container = document.createElement('div')
+  root = createRoot(container)
+  await act(async () => root?.render(<TerminalSplitWorkspaceSurfaces controller={controller} />))
+}
+
+describe('split workspace surfaces under a startup terminal hold', () => {
+  it('hands each surface its parked-equivalent tabs: deferral set, else held tabs, else none', async () => {
+    const hold: StartupTerminalTabHold = {
+      worktreeId: HELD_WORKTREE_ID,
+      heldTabIds: new Set(['held-tab'])
+    }
+    const deferredTabIds = new Set(['deferred-tab'])
+
+    await renderSurfaces(hold, new Map([[DEFERRED_WORKTREE_ID, deferredTabIds]]))
+
+    // Held tabs render no pane, so the surface must hand them to parked watchers.
+    expect(mocks.surfaceProps.get(HELD_WORKTREE_ID)).toBe(hold.heldTabIds)
+    expect(mocks.surfaceProps.get(DEFERRED_WORKTREE_ID)).toBe(deferredTabIds)
+    expect(mocks.surfaceProps.get(OTHER_WORKTREE_ID)).toBeNull()
+  })
+
+  it('passes no held tabs once the hold is released', async () => {
+    await renderSurfaces(null, new Map())
+
+    expect(mocks.surfaceProps.get(HELD_WORKTREE_ID)).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/terminal-startup-hold-placeholder.test.tsx b/src/renderer/src/components/terminal-startup-hold-placeholder.test.tsx
new file mode 100644
index 000000000000..be648b543b48
--- /dev/null
+++ b/src/renderer/src/components/terminal-startup-hold-placeholder.test.tsx
@@ -0,0 +1,222 @@
+// @vitest-environment happy-dom
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { Tab, TabGroup } from '../../../shared/tab-types'
+import type { TerminalTab } from '../../../shared/terminal-tab-types'
+import type { TerminalController } from './use-terminal-controller'
+
+vi.mock('../store', async () => {
+  const { create } = await import('zustand')
+  const activeGroupIdByWorktree: Record<string, string | undefined> = {}
+  const groupsByWorktree: Record<string, TabGroup[]> = {}
+  const tabsByWorktree: Record<string, TerminalTab[]> = {}
+  const unifiedTabsByWorktree: Record<string, Tab[]> = {}
+  const useAppStore = create(() => ({
+    activeGroupIdByWorktree,
+    groupsByWorktree,
+    tabsByWorktree,
+    unifiedTabsByWorktree,
+    consumeSuppressedPtyExit: () => false,
+    focusGroup: () => {},
+    reconcileWorktreeTabModel: () => ({ renderableTabCount: 1 }),
+    setActiveWorktree: () => {}
+  }))
+  return { useAppStore }
+})
+vi.mock('./native-chat/use-native-chat-toggle-shortcut', () => ({
+  useNativeChatToggleShortcut: () => {}
+}))
+vi.mock('./terminal-pane/use-terminal-tab-cold-parking', () => ({
+  useTerminalTabColdParking: () => new Set()
+}))
+vi.mock('./terminal-pane/TerminalOverlaySlot', () => ({
+  TerminalOverlaySlot: (props: { terminalTabId: string }) => (
+    <div data-terminal-pane-tab-id={props.terminalTabId} />
+  )
+}))
+vi.mock('./terminal-pane/TerminalPane', () => ({
+  default: (props: { tabId: string }) => <div data-terminal-pane-tab-id={props.tabId} />
+}))
+vi.mock('./tab-group/RetainedPaneHost', () => ({
+  RetainedPaneHost: (props: { groupId?: string; children: React.ReactNode }) => (
+    <div data-retained-pane-group-id={props.groupId}>{props.children}</div>
+  )
+}))
+
+import { useAppStore } from '../store'
+import TerminalPaneOverlayLayer from './terminal-pane/TerminalPaneOverlayLayer'
+import { TerminalLegacyTerminalPanes } from './TerminalLegacyTerminalPanes'
+
+Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true })
+
+const WORKTREE_ID = 'repo::/held'
+const GROUP_ID = 'group-a'
+const NO_ADMITTED_TABS: ReadonlySet<string> = new Set()
+
+function terminalTab(id: string): TerminalTab {
+  return {
+    id,
+    worktreeId: WORKTREE_ID,
+    ptyId: null,
+    title: id,
+    customTitle: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 0,
+    generation: 0
+  }
+}
+
+function unifiedTerminalTab(id: string): Tab {
+  return {
+    id: `unified-${id}`,
+    entityId: id,
+    worktreeId: WORKTREE_ID,
+    groupId: GROUP_ID,
+    contentType: 'terminal',
+    label: id,
+    customLabel: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 0
+  }
+}
+
+function setTabs(tabIds: string[], activeTabId: string): void {
+  const group: TabGroup = {
+    id: GROUP_ID,
+    worktreeId: WORKTREE_ID,
+    activeTabId: `unified-${activeTabId}`,
+    tabOrder: tabIds.map((tabId) => `unified-${tabId}`)
+  }
+  useAppStore.setState({
+    activeGroupIdByWorktree: { [WORKTREE_ID]: GROUP_ID },
+    groupsByWorktree: { [WORKTREE_ID]: [group] },
+    tabsByWorktree: { [WORKTREE_ID]: tabIds.map(terminalTab) },
+    unifiedTabsByWorktree: { [WORKTREE_ID]: tabIds.map(unifiedTerminalTab) }
+  })
+}
+
+let container: HTMLDivElement
+let root: Root
+
+beforeEach(() => {
+  container = document.createElement('div')
+  document.body.appendChild(container)
+  root = createRoot(container)
+})
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+})
+
+function placeholders(): Element[] {
+  return [...container.querySelectorAll('[data-terminal-restoring-placeholder]')]
+}
+
+function mountedPaneTabIds(): string[] {
+  return [...container.querySelectorAll('[data-terminal-pane-tab-id]')].map(
+    (element) => element.getAttribute('data-terminal-pane-tab-id') ?? ''
+  )
+}
+
+describe('overlay layer under the startup terminal hold', () => {
+  function renderOverlay(backgroundMountTabIds: ReadonlySet<string> | null): void {
+    act(() =>
+      root.render(
+        <TerminalPaneOverlayLayer
+          worktreeId={WORKTREE_ID}
+          worktreePath="/held"
+          isWorktreeActive
+          backgroundMountTabIds={backgroundMountTabIds}
+        />
+      )
+    )
+  }
+
+  it('fills the visible held tab slot, including a tab created under the hold, until the gate opens', () => {
+    setTabs(['tab-a', 'tab-b'], 'tab-a')
+    renderOverlay(NO_ADMITTED_TABS)
+    // Only the visible tab gets a placeholder; the hidden held tab renders nothing.
+    expect(placeholders()).toHaveLength(1)
+    expect(placeholders()[0].parentElement?.getAttribute('data-retained-pane-group-id')).toBe(
+      GROUP_ID
+    )
+    expect(mountedPaneTabIds()).toEqual([])
+
+    setTabs(['tab-a', 'tab-b', 'tab-new'], 'tab-new')
+    renderOverlay(NO_ADMITTED_TABS)
+    expect(placeholders()).toHaveLength(1)
+    expect(mountedPaneTabIds()).toEqual([])
+
+    renderOverlay(null)
+    expect(placeholders()).toHaveLength(0)
+    expect(mountedPaneTabIds()).toEqual(['tab-a', 'tab-b', 'tab-new'])
+  })
+
+  it('renders no placeholder while the held worktree is not the active one', () => {
+    setTabs(['tab-a'], 'tab-a')
+    act(() =>
+      root.render(
+        <TerminalPaneOverlayLayer
+          worktreeId={WORKTREE_ID}
+          worktreePath="/held"
+          isWorktreeActive={false}
+          backgroundMountTabIds={NO_ADMITTED_TABS}
+        />
+      )
+    )
+    expect(placeholders()).toHaveLength(0)
+  })
+})
+
+describe('legacy terminal panes under the startup terminal hold', () => {
+  function renderLegacy(
+    tabIds: string[],
+    activeTabId: string,
+    restriction: ReadonlySet<string> | null
+  ): void {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: TerminalLegacyTerminalPanes reads only the fields listed here.
+    const controller = {
+      activeTabId,
+      activeTabType: 'terminal',
+      activeView: 'terminal',
+      activityTerminalPortals: [],
+      backgroundMountTabIdsByWorktreeRef: {
+        current: new Map(restriction ? [[WORKTREE_ID, restriction]] : [])
+      },
+      effectiveParkedTerminalWorktreeIds: new Set(),
+      evictionExemptTerminalTabIds: new Set(),
+      handleCloseTab: () => {},
+      handlePtyExit: () => {},
+      measurableBackgroundWorktreeIdsRef: { current: new Set() },
+      mountedWorktreeIdsRef: { current: new Set([WORKTREE_ID]) },
+      renderedActiveWorktreeId: WORKTREE_ID,
+      tabsByWorktree: { [WORKTREE_ID]: tabIds.map(terminalTab) },
+      worktreeBrowserTabs: [],
+      worktreeFiles: [],
+      workspaceSurfaces: [{ id: WORKTREE_ID, path: '/held' }]
+    } as unknown as TerminalController
+    act(() => root.render(<TerminalLegacyTerminalPanes controller={controller} />))
+  }
+
+  it('fills the active held tab, including a tab created under the hold, until the gate opens', () => {
+    renderLegacy(['tab-a', 'tab-b'], 'tab-a', NO_ADMITTED_TABS)
+    expect(placeholders()).toHaveLength(1)
+    expect(mountedPaneTabIds()).toEqual([])
+
+    renderLegacy(['tab-a', 'tab-b', 'tab-new'], 'tab-new', NO_ADMITTED_TABS)
+    expect(placeholders()).toHaveLength(1)
+
+    renderLegacy(['tab-a', 'tab-b', 'tab-new'], 'tab-new', null)
+    expect(placeholders()).toHaveLength(0)
+    expect(mountedPaneTabIds()).toEqual(['tab-a', 'tab-b', 'tab-new'])
+  })
+
+  it('renders no placeholder when the active tab is not a held one', () => {
+    renderLegacy(['tab-a', 'tab-b'], 'tab-a', new Set(['tab-a']))
+    expect(placeholders()).toHaveLength(0)
+    expect(mountedPaneTabIds()).toEqual(['tab-a'])
+  })
+})
diff --git a/src/renderer/src/components/terminal-workspace-surface-ids.test.tsx b/src/renderer/src/components/terminal-workspace-surface-ids.test.tsx
index f93b06a3b052..d21b878c2184 100644
--- a/src/renderer/src/components/terminal-workspace-surface-ids.test.tsx
+++ b/src/renderer/src/components/terminal-workspace-surface-ids.test.tsx
@@ -77,6 +77,7 @@ describe('workspace surface ids', () => {
   it('does not rebuild a surface-id array or set on a cold-activation render', () => {
     const ids = Array.from({ length: 423 }, (_, index) => `repo::/worktree-${index}`)
     const { surfaces, mapCalls } = countingSurfaces(ids)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: applyTerminalColdActivation reads only the fields listed here; the rest of the foundation is render machinery this test never exercises.
     const controller = {
       activationDeferralPlanRevisionRef: { current: 0 },
       activationDeferredMountTabIdsByWorktreeRef: { current: new Map() },
@@ -89,6 +90,7 @@ describe('workspace surface ids', () => {
       groupsByWorktree: {},
       hydrationSucceeded: false,
       lastActivationWorktreeIdRef: { current: null },
+      startupTerminalTabHoldRef: { current: null },
       layoutByWorktree: {},
       mountedWorktreeIdsRef: { current: new Set(['repo::/worktree-0', 'repo::/gone']) },
       pairedRuntimeParkingEnvironmentIds: new Set(),
diff --git a/src/renderer/src/components/terminal/background-terminal-worktree-mount.test.ts b/src/renderer/src/components/terminal/background-terminal-worktree-mount.test.ts
index 0978393bba7f..117f049978ee 100644
--- a/src/renderer/src/components/terminal/background-terminal-worktree-mount.test.ts
+++ b/src/renderer/src/components/terminal/background-terminal-worktree-mount.test.ts
@@ -11,7 +11,7 @@ import {
   addBackgroundMountedTerminalWorktree,
   applyBackgroundMountTabRestriction,
   canDeferColdActivationTabsForHost,
-  canMountTerminalWorkspaceForStartup,
+  canAdmitTerminalTabsForStartup,
   collectDeferredMountTabIds,
   hasRequestedBackgroundTerminalWorktreeMount,
   planColdActivationTabDeferral,
@@ -23,24 +23,24 @@ import {
   shouldMountBackgroundWorktreeTab
 } from './background-terminal-worktree-mount'
 
-describe('terminal workspace startup mount gate', () => {
+describe('startup terminal tab admission gate', () => {
   it('waits for hydration unless startup entered degraded mode', () => {
     expect(
-      canMountTerminalWorkspaceForStartup({
+      canAdmitTerminalTabsForStartup({
         workspaceSessionReady: true,
         hydrationSucceeded: false,
         startupWorktreeRefreshCompleted: false
       })
     ).toBe(false)
     expect(
-      canMountTerminalWorkspaceForStartup({
+      canAdmitTerminalTabsForStartup({
         workspaceSessionReady: true,
         hydrationSucceeded: true,
         startupWorktreeRefreshCompleted: false
       })
     ).toBe(true)
     expect(
-      canMountTerminalWorkspaceForStartup({
+      canAdmitTerminalTabsForStartup({
         workspaceSessionReady: true,
         hydrationSucceeded: false,
         startupWorktreeRefreshCompleted: true
diff --git a/src/renderer/src/components/terminal/background-terminal-worktree-mount.ts b/src/renderer/src/components/terminal/background-terminal-worktree-mount.ts
index 8f8bf4461b0f..4f4214e07fc1 100644
--- a/src/renderer/src/components/terminal/background-terminal-worktree-mount.ts
+++ b/src/renderer/src/components/terminal/background-terminal-worktree-mount.ts
@@ -150,7 +150,14 @@ export function shouldMountBackgroundWorktreeTab(
 // working set (and later tab switches) ends up exactly where it was before.
 export const COLD_ACTIVATION_TAB_DEFER_THRESHOLD = 0
 
-export function canMountTerminalWorkspaceForStartup(args: {
+/**
+ * Whether restored terminal tabs may mount their panes. Why this fences panes and not the
+ * workspace surface: a pane binds a PTY on mount, and until startup restoration has fenced
+ * the daemon provider, reconnected SSH targets, and published PTY ownership, that bind would
+ * attach to a not-yet-restored session or spawn a duplicate shell. The tab strip and the
+ * chat, browser, and editor panes bind nothing, so they mount from the hydrated tab model.
+ */
+export function canAdmitTerminalTabsForStartup(args: {
   workspaceSessionReady: boolean
   hydrationSucceeded: boolean
   startupWorktreeRefreshCompleted: boolean
diff --git a/src/renderer/src/components/terminal/cold-activation-deferral-stranding.test.ts b/src/renderer/src/components/terminal/cold-activation-deferral-stranding.test.ts
index 89737f429916..40ab1847a4e3 100644
--- a/src/renderer/src/components/terminal/cold-activation-deferral-stranding.test.ts
+++ b/src/renderer/src/components/terminal/cold-activation-deferral-stranding.test.ts
@@ -31,6 +31,7 @@ import {
 import { capturedPanesByTabId } from '../terminal-pane/terminal-parked-watcher-registry'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import type { TerminalParkingFoundation } from '../use-terminal-parking-foundation'
+import type { StartupTerminalTabHold } from './startup-terminal-tab-hold'
 
 const WORKTREE_ID = 'repo::/worktree'
 const OTHER_WORKTREE_ID = 'repo::/other-worktree'
@@ -82,9 +83,11 @@ function useStrandingHarness(props: HarnessProps) {
   const backgroundMountTabIdsByWorktreeRef = useRef(new Map<string, ReadonlySet<string>>())
   const activationDeferredMountTabIdsByWorktreeRef = useRef(new Map<string, ReadonlySet<string>>())
   const lastActivationWorktreeIdRef = useRef<string | null>(null)
+  const startupTerminalTabHoldRef = useRef<StartupTerminalTabHold | null>(null)
   const mountedWorktreeIdsRef = useRef(new Set<string>())
   const activationDeferralPlanRevisionRef = useRef(0)
   const [backgroundMountRevision, setBackgroundMountRevision] = useState(0)
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: applyTerminalColdActivation and the admission hook read only the fields listed here; the rest of the foundation is render machinery this harness never exercises.
   const foundation = {
     activationDeferralPlanRevisionRef,
     activationDeferredMountTabIdsByWorktreeRef,
@@ -98,6 +101,7 @@ function useStrandingHarness(props: HarnessProps) {
     groupsByWorktree: {},
     hydrationSucceeded: props.gateOpen,
     lastActivationWorktreeIdRef,
+    startupTerminalTabHoldRef,
     layoutByWorktree: {},
     mountedWorktreeIdsRef,
     pairedRuntimeParkingEnvironmentIds: new Set<string>(),
diff --git a/src/renderer/src/components/terminal/initial-terminal-structured-launch.test.tsx b/src/renderer/src/components/terminal/initial-terminal-structured-launch.test.tsx
index ec897d479da4..ef45ae6cb3ec 100644
--- a/src/renderer/src/components/terminal/initial-terminal-structured-launch.test.tsx
+++ b/src/renderer/src/components/terminal/initial-terminal-structured-launch.test.tsx
@@ -1,19 +1,33 @@
 // @vitest-environment happy-dom
-import { act } from 'react'
+import { act, StrictMode } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { useTerminalWatcherEffects } from '../use-terminal-watcher-effects'
+import {
+  claimEmptyWorkspaceDefaultSurface,
+  releaseEmptyWorkspaceDefaultSurface
+} from '@/lib/empty-workspace-default-surface-claims'
 
-const mocks = vi.hoisted(() => ({
-  gate: vi.fn(),
-  resume: vi.fn(),
-  authority: 'none',
-  launchStatus: vi.fn((_worktreeId: string, _provider: string): string => 'idle'),
-  createTab: vi.fn()
-}))
+const mocks = vi.hoisted(() => {
+  const storeTabsByWorktree: Record<string, unknown[]> = {}
+  const storeClosedRecords: Record<string, { worktreeId: string; closedAt: number }> = {}
+  return {
+    gate: vi.fn(),
+    resume: vi.fn(),
+    authority: 'none',
+    launchStatus: vi.fn((_worktreeId: string, _provider: string): string => 'idle'),
+    createTab: vi.fn(),
+    storeTabsByWorktree,
+    storeClosedRecords
+  }
+})
 vi.mock('@/store', () => ({
   useAppStore: Object.assign(() => mocks.authority, {
-    getState: () => ({ activeWorktreeId: 'wt-1' })
+    getState: () => ({
+      activeWorktreeId: 'wt-1',
+      tabsByWorktree: mocks.storeTabsByWorktree,
+      closedTerminalTabTombstonesByTabId: mocks.storeClosedRecords
+    })
   })
 }))
 vi.mock('@/lib/worktree-agent-activation-gate', () => ({
@@ -35,12 +49,16 @@ vi.mock('../terminal-pane/terminal-parked-tab-watchers', () => ({
   disposeAllParkedTerminalWatchers: vi.fn()
 }))
 
+const PENDING_INTENT = { callerProvidesSurface: false, seedUserDefaultSurface: true }
+
 Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true })
 let root: Root | undefined
 afterEach(async () => {
   await act(async () => root?.unmount())
   vi.clearAllMocks()
   mocks.authority = 'none'
+  mocks.storeTabsByWorktree = {}
+  mocks.storeClosedRecords = {}
 })
 
 function Watcher({ restored = true, hydrated = false, worktreeId = 'wt-1' } = {}): null {
@@ -72,6 +90,7 @@ function Watcher({ restored = true, hydrated = false, worktreeId = 'wt-1' } = {}
     pairedRuntimeParkingEnvironmentIds: new Set(),
     pendingStartupByTabId: {},
     renderedActiveWorktreeId: worktreeId,
+    startupTerminalTabHold: null,
     terminalParkingEnabled: false,
     terminalProviderSnapshotCapabilityRevision: 0,
     terminalSshParkingEnabled: false,
@@ -108,6 +127,134 @@ describe('passive terminal seeding during native chat creation', () => {
   })
 })
 
+function deferredGate(): (outcome: 'empty' | 'blocked') => Promise<void> {
+  let finishGate!: (outcome: 'empty' | 'blocked') => void
+  // One shared promise, as the gate's in-flight dedupe hands every rerun.
+  mocks.gate.mockReturnValue(
+    new Promise((resolve) => {
+      finishGate = resolve
+    })
+  )
+  return async (outcome) => act(async () => finishGate(outcome))
+}
+
+describe('passive terminal seeding retries until a decision applies', () => {
+  it('seeds once after a StrictMode double run', async () => {
+    const finishGate = deferredGate()
+    const renderStrict = () =>
+      root?.render(
+        <StrictMode>
+          <Watcher />
+        </StrictMode>
+      )
+    root = createRoot(document.createElement('div'))
+    await act(async () => renderStrict())
+    await finishGate('empty')
+    expect(mocks.createTab).toHaveBeenCalledTimes(1)
+
+    // The applied decision is final: a later run neither re-checks nor seeds again.
+    await act(async () => renderStrict())
+    expect(mocks.createTab).toHaveBeenCalledTimes(1)
+    expect(mocks.gate).toHaveBeenCalledTimes(2)
+  })
+
+  it('seeds once when an input changes mid-check', async () => {
+    const finishGate = deferredGate()
+    root = createRoot(document.createElement('div'))
+    await act(async () => root?.render(<Watcher />))
+    // Each render passes a fresh reconcile callback, so this rerun cancels the first check.
+    await act(async () => root?.render(<Watcher />))
+    await finishGate('empty')
+    expect(mocks.createTab).toHaveBeenCalledTimes(1)
+    expect(mocks.gate).toHaveBeenCalledTimes(2)
+  })
+
+  it('seeds once across two empty checks separated by leaving the workspace', async () => {
+    const resolvers: ((outcome: 'empty') => void)[] = []
+    mocks.gate.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          resolvers.push(resolve)
+        })
+    )
+    root = createRoot(document.createElement('div'))
+    await act(async () => root?.render(<Watcher />))
+    await act(async () => root?.render(<Watcher worktreeId="wt-2" />))
+    await act(async () => root?.render(<Watcher />))
+    await act(async () => resolvers.forEach((resolve) => resolve('empty')))
+    await act(async () => root?.render(<Watcher />))
+
+    expect(mocks.createTab).toHaveBeenCalledTimes(1)
+    expect(mocks.gate).toHaveBeenCalledTimes(3)
+  })
+
+  it('does not seed a workspace whose last terminal closed during the check', async () => {
+    const finishGate = deferredGate()
+    root = createRoot(document.createElement('div'))
+    await act(async () => root?.render(<Watcher />))
+    // closeTab empties the row and records the close in the same store write.
+    mocks.storeTabsByWorktree = { 'wt-1': [] }
+    mocks.storeClosedRecords = { 'closed-tab': { worktreeId: 'wt-1', closedAt: Date.now() } }
+    await finishGate('empty')
+    expect(mocks.createTab).not.toHaveBeenCalled()
+  })
+
+  it('seeds an empty row that has no close record, which legacy data leaves', async () => {
+    const finishGate = deferredGate()
+    root = createRoot(document.createElement('div'))
+    await act(async () => root?.render(<Watcher />))
+    mocks.storeTabsByWorktree = { 'wt-1': [] }
+    await finishGate('empty')
+    expect(mocks.createTab).toHaveBeenCalledTimes(1)
+  })
+
+  it('leaves the seed to an activation reseed awaiting agent detection', async () => {
+    const finishGate = deferredGate()
+    root = createRoot(document.createElement('div'))
+    await act(async () => root?.render(<Watcher />))
+    claimEmptyWorkspaceDefaultSurface('wt-1', PENDING_INTENT)
+    try {
+      await finishGate('empty')
+      expect(mocks.createTab).not.toHaveBeenCalled()
+    } finally {
+      releaseEmptyWorkspaceDefaultSurface('wt-1')
+    }
+  })
+
+  // Why: that reseed bails once the user leaves, so a workspace left mid-wait must seed on return.
+  it('seeds on return to a workspace left while a reseed awaited agent detection', async () => {
+    mocks.gate.mockResolvedValue('empty')
+    claimEmptyWorkspaceDefaultSurface('wt-1', PENDING_INTENT)
+    root = createRoot(document.createElement('div'))
+    try {
+      await act(async () => root?.render(<Watcher />))
+      expect(mocks.createTab).not.toHaveBeenCalled()
+    } finally {
+      releaseEmptyWorkspaceDefaultSurface('wt-1')
+    }
+
+    await act(async () => root?.render(<Watcher worktreeId="wt-2" />))
+    await act(async () => root?.render(<Watcher />))
+    expect(mocks.createTab).toHaveBeenCalledTimes(1)
+  })
+
+  it('seeds after leaving and returning to a blocked workspace', async () => {
+    mocks.gate.mockResolvedValue('blocked')
+    root = createRoot(document.createElement('div'))
+    await act(async () => root?.render(<Watcher />))
+    expect(mocks.createTab).not.toHaveBeenCalled()
+
+    await act(async () => root?.render(<Watcher worktreeId="wt-2" />))
+    mocks.gate.mockResolvedValue('empty')
+    await act(async () => root?.render(<Watcher />))
+    expect(mocks.createTab).toHaveBeenCalledTimes(1)
+    expect(mocks.createTab).toHaveBeenCalledWith('wt-1', undefined, undefined, {
+      pendingActivationSpawn: true
+    })
+    expect(mocks.gate.mock.calls.map(([id]) => id)).toEqual(['wt-1', 'wt-2', 'wt-1'])
+  })
+})
+
 describe('startup agent recovery host inventory', () => {
   it('keeps recovery available until the execution host answers', async () => {
     mocks.authority = 'unverifiable'
diff --git a/src/renderer/src/components/terminal/initial-terminal-wiring.test.ts b/src/renderer/src/components/terminal/initial-terminal-wiring.test.ts
index ed56289625ef..d56384227cc3 100644
--- a/src/renderer/src/components/terminal/initial-terminal-wiring.test.ts
+++ b/src/renderer/src/components/terminal/initial-terminal-wiring.test.ts
@@ -15,8 +15,11 @@ function readSource(relativePath: string): string {
 describe('Terminal auto-create wiring', () => {
   const source = readSource(TERMINAL_PATH)
 
-  it('derives the tombstone from the active worktree row', () => {
-    expect(source).toContain('Object.hasOwn(tabsByWorktree, activeWorktreeId)')
+  it('derives the tombstone from the active worktree row and its close records at decision time', () => {
+    // Why the live store: a render-captured row goes stale while the activation check runs.
+    expect(source).toMatch(
+      /isTerminalWorkspaceEmptiedOnPurpose\(\s*useAppStore\.getState\(\),\s*activeWorktreeId\s*\)/
+    )
   })
 
   it('passes that derivation into shouldAutoCreateInitialTerminal', () => {
@@ -31,10 +34,4 @@ describe('Terminal auto-create wiring', () => {
       'shouldAutoCreateInitialTerminal(renderableTabCount, activeWorktreeHasTerminalState)'
     )
   })
-
-  it('keeps that derivation in the effect dependencies', () => {
-    // Why: without the dep the effect never re-runs when the row appears or disappears.
-    // Anchored to the neighbouring dep so a stray trailing comma elsewhere can't satisfy it.
-    expect(source).toContain('activeWorktreeId,\n    activeWorktreeHasTerminalState,')
-  })
 })
diff --git a/src/renderer/src/components/terminal/initial-terminal.ts b/src/renderer/src/components/terminal/initial-terminal.ts
index b895bf0cbd54..515effce58c2 100644
--- a/src/renderer/src/components/terminal/initial-terminal.ts
+++ b/src/renderer/src/components/terminal/initial-terminal.ts
@@ -2,6 +2,7 @@ export function shouldAutoCreateInitialTerminal(
   renderableTabCount: number,
   hasPersistedTerminalState = false
 ): boolean {
-  // Why: a missing row means never initialized; an explicit empty row records that the user closed the last terminal.
+  // Why: desktop callers pass isTerminalWorkspaceEmptiedOnPurpose, so an empty row with no close
+  // record (legacy data, or a writer that is not a close) still reads as never initialized.
   return renderableTabCount === 0 && !hasPersistedTerminalState
 }
diff --git a/src/renderer/src/components/terminal/startup-terminal-tab-hold.test.ts b/src/renderer/src/components/terminal/startup-terminal-tab-hold.test.ts
new file mode 100644
index 000000000000..d49d4a511cd8
--- /dev/null
+++ b/src/renderer/src/components/terminal/startup-terminal-tab-hold.test.ts
@@ -0,0 +1,349 @@
+// @vitest-environment happy-dom
+
+/**
+ * Defect under test: the restored workspace surface used to wait for the whole
+ * startup chain (SSH reconnect, PTY reconnect, legacy worker recovery) before it
+ * mounted, so a session whose tab model had been in the store for seconds painted
+ * nothing at all. Only terminal panes need that chain — they bind a PTY on mount.
+ * The surface now mounts on the tab model, and terminal tabs are held unadmitted
+ * until the gate opens and the activation plan replaces the hold.
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { act, cleanup, renderHook } from '@testing-library/react'
+import { useRef, useState } from 'react'
+import { useAppStore } from '@/store'
+import { applyTerminalColdActivation } from '../terminal-cold-activation'
+import { useActivationDeferredTabAdmission } from './use-activation-deferred-tab-admission'
+import {
+  pruneClosedBackgroundMountTabs,
+  revealActivationDeferredTabs,
+  shouldMountBackgroundWorktreeTab
+} from './background-terminal-worktree-mount'
+import {
+  holdTerminalTabsForStartup,
+  releaseStartupTerminalTabHold,
+  selectParkedEquivalentMountTabIds,
+  type StartupTerminalTabHold
+} from './startup-terminal-tab-hold'
+import type { TabGroup, TabGroupLayoutNode } from '../../../../shared/tab-types'
+import type { TerminalTab } from '../../../../shared/terminal-tab-types'
+import type { TerminalParkingFoundation } from '../use-terminal-parking-foundation'
+
+const WORKTREE_ID = 'repo::/worktree'
+const OTHER_WORKTREE_ID = 'repo::/other-worktree'
+const TAB_1 = 'tab-1'
+const TAB_2 = 'tab-2'
+const GROUP_ID = 'group-1'
+const SURFACE_IDS = [WORKTREE_ID, OTHER_WORKTREE_ID]
+
+const initialState = useAppStore.getInitialState()
+const originalRequestIdle = globalThis.requestIdleCallback
+const originalCancelIdle = globalThis.cancelIdleCallback
+
+function terminalTab(id: string, worktreeId: string): TerminalTab {
+  return {
+    id,
+    ptyId: `${worktreeId}@@${id}`,
+    worktreeId,
+    title: id,
+    customTitle: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 1
+  }
+}
+
+function leafLayout(worktreeId: string): {
+  groups: TabGroup[]
+  layout: TabGroupLayoutNode
+} {
+  return {
+    groups: [
+      { id: GROUP_ID, worktreeId, activeTabId: TAB_1, tabOrder: [TAB_1, TAB_2], recentTabIds: [] }
+    ],
+    layout: { type: 'leaf', groupId: GROUP_ID }
+  }
+}
+
+type HarnessProps = { worktreeId: string | null; gateOpen: boolean }
+
+/** Mirrors use-terminal-controller.ts: cold activation during render, then admission. */
+function useStartupHoldHarness(props: HarnessProps) {
+  const backgroundMountTabIdsByWorktreeRef = useRef(new Map<string, ReadonlySet<string>>())
+  const activationDeferredMountTabIdsByWorktreeRef = useRef(new Map<string, ReadonlySet<string>>())
+  const lastActivationWorktreeIdRef = useRef<string | null>(null)
+  const startupTerminalTabHoldRef = useRef<StartupTerminalTabHold | null>(null)
+  const mountedWorktreeIdsRef = useRef(new Set<string>())
+  const activationDeferralPlanRevisionRef = useRef(0)
+  const [backgroundMountRevision, setBackgroundMountRevision] = useState(0)
+  const restored = leafLayout(props.worktreeId ?? WORKTREE_ID)
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: applyTerminalColdActivation and the admission hook read only the fields listed here; the rest of the foundation is render machinery this harness never exercises.
+  const foundation = {
+    activationDeferralPlanRevisionRef,
+    activationDeferredMountTabIdsByWorktreeRef,
+    activeGroupIdByWorktree: props.worktreeId ? { [props.worktreeId]: GROUP_ID } : {},
+    activeTabId: TAB_1,
+    activeTabIdByWorktree: props.worktreeId ? { [props.worktreeId]: TAB_1 } : {},
+    activeWorktreeDeferralHostId: 'local',
+    activityTerminalPortals: [],
+    backgroundMountRevision,
+    backgroundMountTabIdsByWorktreeRef,
+    groupsByWorktree: props.worktreeId ? { [props.worktreeId]: restored.groups } : {},
+    hydrationSucceeded: props.gateOpen,
+    lastActivationWorktreeIdRef,
+    layoutByWorktree: props.worktreeId ? { [props.worktreeId]: restored.layout } : {},
+    mountedWorktreeIdsRef,
+    pairedRuntimeParkingEnvironmentIds: new Set<string>(),
+    pendingStartupByTabId: {},
+    renderedActiveWorktreeId: props.worktreeId,
+    setBackgroundMountRevision,
+    startupTerminalTabHoldRef,
+    startupWorktreeRefreshCompleted: props.gateOpen,
+    tabsByWorktree: useAppStore.getState().tabsByWorktree,
+    terminalParkingEnabled: true,
+    terminalTitleSnapshotAuthorityEnabled: true,
+    workspaceSessionReady: props.gateOpen,
+    workspaceSurfaceIds: SURFACE_IDS,
+    workspaceSurfaceIdSet: new Set(SURFACE_IDS)
+  } as unknown as TerminalParkingFoundation
+  const coldActivation = Object.assign(foundation, applyTerminalColdActivation(foundation))
+  useActivationDeferredTabAdmission(coldActivation)
+  return {
+    activationDeferredMountTabIdsByWorktreeRef,
+    anyMountedWorktreeHasLayout: coldActivation.anyMountedWorktreeHasLayout,
+    backgroundMountTabIdsByWorktreeRef,
+    mountedWorktreeIdsRef,
+    startupTerminalTabHold: coldActivation.startupTerminalTabHold
+  }
+}
+
+function admits(
+  restrictions: Map<string, ReadonlySet<string>>,
+  worktreeId: string,
+  tabId: string
+): boolean {
+  return shouldMountBackgroundWorktreeTab(restrictions.get(worktreeId) ?? null, tabId)
+}
+
+describe('startup terminal tab hold', () => {
+  beforeEach(() => {
+    useAppStore.setState(initialState, true)
+    useAppStore.setState({
+      tabsByWorktree: {
+        [WORKTREE_ID]: [terminalTab(TAB_1, WORKTREE_ID), terminalTab(TAB_2, WORKTREE_ID)],
+        [OTHER_WORKTREE_ID]: [terminalTab(TAB_1, OTHER_WORKTREE_ID)]
+      }
+    })
+    // Deterministic drain: force scheduleActivationDeferredAdmission onto timers.
+    // @ts-expect-error -- exercising the no-requestIdleCallback environment
+    globalThis.requestIdleCallback = undefined
+    // @ts-expect-error -- exercising the no-requestIdleCallback environment
+    globalThis.cancelIdleCallback = undefined
+    vi.useFakeTimers()
+  })
+
+  afterEach(() => {
+    cleanup()
+    vi.useRealTimers()
+    globalThis.requestIdleCallback = originalRequestIdle
+    globalThis.cancelIdleCallback = originalCancelIdle
+    useAppStore.setState(initialState, true)
+  })
+
+  it('mounts the restored surface before the gate opens and holds every terminal tab', () => {
+    const { result, rerender } = renderHook(useStartupHoldHarness, {
+      initialProps: { worktreeId: WORKTREE_ID, gateOpen: false }
+    })
+    const restrictions = result.current.backgroundMountTabIdsByWorktreeRef.current
+
+    // The surface mounts from the tab model alone...
+    expect(result.current.mountedWorktreeIdsRef.current.has(WORKTREE_ID)).toBe(true)
+    expect(result.current.anyMountedWorktreeHasLayout).toBe(true)
+    // ...while no terminal pane may bind a PTY yet, and none is idle-admission work.
+    expect(admits(restrictions, WORKTREE_ID, TAB_1)).toBe(false)
+    expect(admits(restrictions, WORKTREE_ID, TAB_2)).toBe(false)
+    expect(result.current.activationDeferredMountTabIdsByWorktreeRef.current.has(WORKTREE_ID)).toBe(
+      false
+    )
+    // Held tabs stay parked-equivalent, so watchers own their bells, titles, and completions.
+    expect(result.current.startupTerminalTabHold).toEqual({
+      worktreeId: WORKTREE_ID,
+      heldTabIds: new Set([TAB_1, TAB_2])
+    })
+    act(() => {
+      vi.advanceTimersByTime(1_000)
+    })
+    expect(admits(restrictions, WORKTREE_ID, TAB_1)).toBe(false)
+
+    // The gate opening runs the activation plan, which replaces the hold.
+    rerender({ worktreeId: WORKTREE_ID, gateOpen: true })
+    expect(result.current.mountedWorktreeIdsRef.current.has(WORKTREE_ID)).toBe(true)
+    expect(admits(restrictions, WORKTREE_ID, TAB_1)).toBe(true)
+    expect(admits(restrictions, WORKTREE_ID, TAB_2)).toBe(true)
+    expect(result.current.startupTerminalTabHold).toBeNull()
+  })
+
+  it('returns a workspace switched away from mid-startup to the unmounted world', () => {
+    const { result, rerender } = renderHook(useStartupHoldHarness, {
+      initialProps: { worktreeId: WORKTREE_ID, gateOpen: false }
+    })
+    expect(result.current.mountedWorktreeIdsRef.current.has(WORKTREE_ID)).toBe(true)
+
+    rerender({ worktreeId: OTHER_WORKTREE_ID, gateOpen: false })
+    const restrictions = result.current.backgroundMountTabIdsByWorktreeRef.current
+    expect(result.current.mountedWorktreeIdsRef.current.has(WORKTREE_ID)).toBe(false)
+    expect(restrictions.has(WORKTREE_ID)).toBe(false)
+    expect(result.current.mountedWorktreeIdsRef.current.has(OTHER_WORKTREE_ID)).toBe(true)
+    expect(admits(restrictions, OTHER_WORKTREE_ID, TAB_1)).toBe(false)
+
+    rerender({ worktreeId: OTHER_WORKTREE_ID, gateOpen: true })
+    expect(admits(restrictions, OTHER_WORKTREE_ID, TAB_1)).toBe(true)
+  })
+
+  it('returns a workspace left for no workspace mid-startup to the unmounted world', () => {
+    const initialProps: HarnessProps = { worktreeId: WORKTREE_ID, gateOpen: false }
+    const { result, rerender } = renderHook(useStartupHoldHarness, { initialProps })
+    expect(result.current.mountedWorktreeIdsRef.current.has(WORKTREE_ID)).toBe(true)
+
+    rerender({ worktreeId: null, gateOpen: false })
+    expect(result.current.mountedWorktreeIdsRef.current.has(WORKTREE_ID)).toBe(false)
+    expect(result.current.backgroundMountTabIdsByWorktreeRef.current.has(WORKTREE_ID)).toBe(false)
+    expect(result.current.startupTerminalTabHold).toBeNull()
+
+    rerender({ worktreeId: null, gateOpen: true })
+    expect(result.current.mountedWorktreeIdsRef.current.size).toBe(0)
+  })
+
+  it('keeps holding a widened hold whose targeted tab closed', () => {
+    const { result, rerender } = renderHook(useStartupHoldHarness, {
+      initialProps: { worktreeId: WORKTREE_ID, gateOpen: false }
+    })
+    const restrictions = result.current.backgroundMountTabIdsByWorktreeRef.current
+    // A targeted background mount widens the hold to its tab.
+    restrictions.set(WORKTREE_ID, new Set([TAB_1]))
+    act(() => {
+      useAppStore.setState({
+        tabsByWorktree: {
+          ...useAppStore.getState().tabsByWorktree,
+          [WORKTREE_ID]: [terminalTab(TAB_2, WORKTREE_ID)]
+        }
+      })
+    })
+    rerender({ worktreeId: WORKTREE_ID, gateOpen: false })
+
+    expect(result.current.mountedWorktreeIdsRef.current.has(WORKTREE_ID)).toBe(true)
+    expect(admits(restrictions, WORKTREE_ID, TAB_2)).toBe(false)
+    expect(result.current.startupTerminalTabHold?.heldTabIds).toEqual(new Set([TAB_2]))
+  })
+
+  it('does not mount a surface with no active workspace', () => {
+    const { result } = renderHook(useStartupHoldHarness, {
+      initialProps: { worktreeId: null, gateOpen: false }
+    })
+    expect(result.current.mountedWorktreeIdsRef.current.size).toBe(0)
+    expect(result.current.backgroundMountTabIdsByWorktreeRef.current.size).toBe(0)
+  })
+})
+
+describe('holdTerminalTabsForStartup', () => {
+  it('admits no terminal tab of a worktree that has not mounted yet', () => {
+    const hold: { current: StartupTerminalTabHold | null } = { current: null }
+    const restrictions = new Map<string, ReadonlySet<string>>()
+    const mounted = new Set<string>()
+
+    holdTerminalTabsForStartup(hold, restrictions, mounted, 'wt-active', ['tab-1'])
+
+    expect(restrictions.get('wt-active')).toEqual(new Set())
+    expect(mounted.has('wt-active')).toBe(true)
+    expect(shouldMountBackgroundWorktreeTab(restrictions.get('wt-active') ?? null, 'tab-1')).toBe(
+      false
+    )
+    expect(hold.current).toEqual({ worktreeId: 'wt-active', heldTabIds: new Set(['tab-1']) })
+  })
+
+  it('keeps a targeted background mount that landed first and never narrows a full mount', () => {
+    const hold: { current: StartupTerminalTabHold | null } = { current: null }
+    const restrictions = new Map<string, ReadonlySet<string>>([['wt-active', new Set(['tab-1'])]])
+    const mounted = new Set<string>(['wt-full'])
+
+    holdTerminalTabsForStartup(hold, restrictions, mounted, 'wt-active', ['tab-1', 'tab-2'])
+    expect(restrictions.get('wt-active')).toEqual(new Set(['tab-1']))
+    expect(hold.current?.heldTabIds).toEqual(new Set(['tab-2']))
+
+    releaseStartupTerminalTabHold(hold, restrictions, mounted, 'wt-full')
+    holdTerminalTabsForStartup(hold, restrictions, mounted, 'wt-full', ['tab-1'])
+    expect(restrictions.has('wt-full')).toBe(false)
+    expect(hold.current?.heldTabIds).toEqual(new Set())
+  })
+
+  it('keeps the held set identity while the hold is unchanged', () => {
+    const hold: { current: StartupTerminalTabHold | null } = { current: null }
+    const restrictions = new Map<string, ReadonlySet<string>>()
+    const mounted = new Set<string>()
+    holdTerminalTabsForStartup(hold, restrictions, mounted, 'wt-active', ['tab-1'])
+    const first = hold.current
+
+    holdTerminalTabsForStartup(hold, restrictions, mounted, 'wt-active', ['tab-1'])
+
+    expect(hold.current).toBe(first)
+  })
+
+  it('survives prune and reveal passes untouched', () => {
+    const hold: { current: StartupTerminalTabHold | null } = { current: null }
+    const restrictions = new Map<string, ReadonlySet<string>>()
+    const deferred = new Map<string, ReadonlySet<string>>()
+    const mounted = new Set<string>()
+    holdTerminalTabsForStartup(hold, restrictions, mounted, 'wt-active', ['tab-1'])
+
+    expect(
+      pruneClosedBackgroundMountTabs(
+        restrictions,
+        mounted,
+        { 'wt-active': [{ id: 'tab-1' }] },
+        deferred
+      )
+    ).toBe(false)
+    revealActivationDeferredTabs({
+      restrictions,
+      deferredMountTabIdsByWorktree: deferred,
+      worktreeId: 'wt-active',
+      allTabIds: ['tab-1'],
+      immediateTabIds: new Set(['tab-1'])
+    })
+    expect(restrictions.get('wt-active')).toEqual(new Set())
+    expect(mounted.has('wt-active')).toBe(true)
+  })
+
+  it('releases an unwidened hold and leaves a widened one as a targeted restriction', () => {
+    const hold: { current: StartupTerminalTabHold | null } = { current: null }
+    const restrictions = new Map<string, ReadonlySet<string>>()
+    const mounted = new Set<string>()
+    holdTerminalTabsForStartup(hold, restrictions, mounted, 'wt-previous', ['tab-1'])
+
+    releaseStartupTerminalTabHold(hold, restrictions, mounted, 'wt-previous')
+    expect(hold.current?.worktreeId).toBe('wt-previous')
+
+    releaseStartupTerminalTabHold(hold, restrictions, mounted, null)
+    expect(restrictions.has('wt-previous')).toBe(false)
+    expect(mounted.has('wt-previous')).toBe(false)
+    expect(hold.current).toBeNull()
+
+    holdTerminalTabsForStartup(hold, restrictions, mounted, 'wt-targeted', ['tab-wake', 'tab-2'])
+    restrictions.set('wt-targeted', new Set(['tab-wake']))
+    releaseStartupTerminalTabHold(hold, restrictions, mounted, 'wt-active')
+    expect(restrictions.get('wt-targeted')).toEqual(new Set(['tab-wake']))
+    expect(mounted.has('wt-targeted')).toBe(true)
+  })
+})
+
+describe('selectParkedEquivalentMountTabIds', () => {
+  const hold: StartupTerminalTabHold = { worktreeId: 'wt-held', heldTabIds: new Set(['tab-1']) }
+
+  it('prefers the activation deferral, then the hold, for the held worktree only', () => {
+    const deferred = new Set(['tab-deferred'])
+    expect(selectParkedEquivalentMountTabIds(deferred, hold, 'wt-held')).toBe(deferred)
+    expect(selectParkedEquivalentMountTabIds(undefined, hold, 'wt-held')).toBe(hold.heldTabIds)
+    expect(selectParkedEquivalentMountTabIds(undefined, hold, 'wt-other')).toBeNull()
+    expect(selectParkedEquivalentMountTabIds(undefined, null, 'wt-held')).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/terminal/startup-terminal-tab-hold.ts b/src/renderer/src/components/terminal/startup-terminal-tab-hold.ts
new file mode 100644
index 000000000000..6398911e5c3b
--- /dev/null
+++ b/src/renderer/src/components/terminal/startup-terminal-tab-hold.ts
@@ -0,0 +1,77 @@
+import {
+  applyBackgroundMountTabRestriction,
+  collectDeferredMountTabIds
+} from './background-terminal-worktree-mount'
+
+export type StartupTerminalTabHold = {
+  worktreeId: string
+  /** Tabs the hold keeps unmounted — parked-equivalent, so watchers own their side effects. */
+  heldTabIds: ReadonlySet<string>
+}
+
+/**
+ * Ends the hold unless `nextHeldWorktreeId` is still the held worktree. Must run before the
+ * activation plan, which would otherwise read the hold as a plan it had installed.
+ *
+ * Why an unwidened hold unmounts: nothing but the surface was mounted under it, so a worktree
+ * switched away from — or left for no workspace — mid-startup returns to the unmounted world
+ * where parked watchers cover it. A hold a targeted background mount widened keeps that mount's
+ * tabs, like any targeted restriction.
+ */
+export function releaseStartupTerminalTabHold(
+  hold: { current: StartupTerminalTabHold | null },
+  restrictions: Map<string, ReadonlySet<string>>,
+  mountedWorktreeIds: Set<string>,
+  nextHeldWorktreeId: string | null
+): void {
+  const held = hold.current
+  if (!held || held.worktreeId === nextHeldWorktreeId) {
+    return
+  }
+  hold.current = null
+  if (restrictions.get(held.worktreeId)?.size === 0) {
+    restrictions.delete(held.worktreeId)
+    mountedWorktreeIds.delete(held.worktreeId)
+  }
+}
+
+/**
+ * Keeps the worktree's terminal tabs unmounted while startup restoration is still publishing
+ * PTY ownership, so the workspace surface can mount from the hydrated tab model without a pane
+ * binding a PTY early. Runs after prune, so no prune pass can drop the hold before render.
+ *
+ * Why an empty admitted set and no deferral entry: reveal and idle admission act only on
+ * worktrees with a deferral entry, so nothing admits a held tab until the startup gate opens
+ * and the activation plan replaces the hold. A targeted background mount widens it to its
+ * tabs, as it widens any restriction; a worktree already fully mounted is never narrowed.
+ */
+export function holdTerminalTabsForStartup(
+  hold: { current: StartupTerminalTabHold | null },
+  restrictions: Map<string, ReadonlySet<string>>,
+  mountedWorktreeIds: Set<string>,
+  worktreeId: string,
+  tabIds: readonly string[]
+): void {
+  applyBackgroundMountTabRestriction(restrictions, mountedWorktreeIds, worktreeId, [])
+  mountedWorktreeIds.add(worktreeId)
+  const heldTabIds = collectDeferredMountTabIds(restrictions.get(worktreeId) ?? null, tabIds)
+  const previous = hold.current
+  // Why reuse: the set feeds a memoized surface prop, so an unchanged hold keeps its identity.
+  if (
+    previous?.worktreeId === worktreeId &&
+    previous.heldTabIds.size === heldTabIds.size &&
+    Array.from(heldTabIds).every((tabId) => previous.heldTabIds.has(tabId))
+  ) {
+    return
+  }
+  hold.current = { worktreeId, heldTabIds }
+}
+
+/** The watcher-coverage set for a mounted worktree: activation-deferred tabs, else held tabs. */
+export function selectParkedEquivalentMountTabIds(
+  activationDeferredMountTabIds: ReadonlySet<string> | undefined,
+  hold: StartupTerminalTabHold | null,
+  worktreeId: string
+): ReadonlySet<string> | null {
+  return activationDeferredMountTabIds ?? (hold?.worktreeId === worktreeId ? hold.heldTabIds : null)
+}
diff --git a/src/renderer/src/components/terminal/terminal-close-confirm-keyboard-vs-mouse.test.ts b/src/renderer/src/components/terminal/terminal-close-confirm-keyboard-vs-mouse.test.ts
index b2cdcb5b2adc..82f686f851f7 100644
--- a/src/renderer/src/components/terminal/terminal-close-confirm-keyboard-vs-mouse.test.ts
+++ b/src/renderer/src/components/terminal/terminal-close-confirm-keyboard-vs-mouse.test.ts
@@ -8,8 +8,6 @@
  * Keyboard path: Cmd+W -> TerminalPane.handleRequestClosePane -> probePtyRunningWork
  *   (split panes) or closeTerminalTab's guard (last pane) -> CloseTerminalDialog.
  */
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const {
@@ -92,21 +90,6 @@ describe('#10142 close confirmation policy is the same for keyboard and mouse',
     })
   })
 
-  // Control: the keyboard entry point does probe for running children.
-  it('keyboard Cmd+W path probes for running child processes before closing', () => {
-    const source = readFileSync(
-      join(__dirname, '../terminal-pane/use-terminal-pane-close-actions.ts'),
-      'utf8'
-    )
-    const handler = source.slice(source.indexOf('const handleRequestClosePane'))
-    // The shared probe, not a direct inspect: the pane path asks the same question as the tab
-    // guard, and routing both through one measurement is what stops them drifting on what an
-    // unanswered host means.
-    expect(handler.slice(0, handler.indexOf('useImperativeHandle'))).toContain(
-      'probePtyRunningWork'
-    )
-  })
-
   // Control: the harness does observe a guard when one exists — pinning blocks the same mouse close.
   it('mouse close routes a pinned tab through its confirmation guard', () => {
     const state = stateWithBusyTerminalTab(closeTab)
@@ -121,13 +104,6 @@ describe('#10142 close confirmation policy is the same for keyboard and mouse',
     expect(closeTab).not.toHaveBeenCalled()
   })
 
-  it('mouse close (X button / middle-click) consults the running-process probe', async () => {
-    closeTerminalTab('tab-busy')
-    await Promise.resolve()
-
-    expect(inspectRuntimeTerminalProcessMock).toHaveBeenCalled()
-  })
-
   it('mouse close (X button / middle-click) does not drop a busy tab without confirmation', async () => {
     closeTerminalTab('tab-busy')
     await Promise.resolve()
diff --git a/src/renderer/src/components/terminal/use-terminal-provider-snapshot-capability.test.tsx b/src/renderer/src/components/terminal/use-terminal-provider-snapshot-capability.test.tsx
index b1f6e0876171..c17634115864 100644
--- a/src/renderer/src/components/terminal/use-terminal-provider-snapshot-capability.test.tsx
+++ b/src/renderer/src/components/terminal/use-terminal-provider-snapshot-capability.test.tsx
@@ -1,6 +1,4 @@
 // @vitest-environment happy-dom
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { renderHook, waitFor } from '@testing-library/react'
 import {
@@ -195,21 +193,6 @@ describe('useTerminalProviderSnapshotCapability', () => {
     hook.unmount()
   })
 
-  // Why source-pinned: the hook test cannot prove the quiet parking effect consumes the external revision.
-  it('invalidates the Terminal parking pass when a capability verdict changes', () => {
-    const projectionSource = readFileSync(
-      join(__dirname, '../use-terminal-workspace-projection.ts'),
-      'utf8'
-    )
-    const parkingSource = readFileSync(join(__dirname, '../use-terminal-parking-pass.ts'), 'utf8')
-
-    expect(projectionSource).toContain(
-      'const terminalProviderSnapshotCapabilityRevision = useTerminalProviderSnapshotCapability('
-    )
-    expect(projectionSource).toContain('terminalProviderSnapshotCapabilityRevision')
-    expect(parkingSource.match(/terminalProviderSnapshotCapabilityRevision/g)).toHaveLength(2)
-  })
-
   it('cancels an unknown-capability retry when the hook unmounts', async () => {
     vi.useFakeTimers()
     resolveCapabilities.mockResolvedValue([{ id: 'ssh:target@@pty-1', authoritative: null }])
diff --git a/src/renderer/src/components/use-task-page-workspace-actions.ts b/src/renderer/src/components/use-task-page-workspace-actions.ts
index 2a88981b6756..5e2cb6f2aab5 100644
--- a/src/renderer/src/components/use-task-page-workspace-actions.ts
+++ b/src/renderer/src/components/use-task-page-workspace-actions.ts
@@ -60,7 +60,9 @@ export function useTaskPageWorkspaceActions(model: TaskPageSearchActionsModel) {
         handleUseWorkItem(item)
         return
       }
-      const result = activateAndRevealWorktree(currentAttached.id)
+      const result = activateAndRevealWorktree(currentAttached.id, {
+        navigationIntent: 'user-open'
+      })
       if (result === false) {
         toast.error(
           item.type === 'pr'
diff --git a/src/renderer/src/components/use-terminal-create-actions.test.tsx b/src/renderer/src/components/use-terminal-create-actions.test.tsx
index b12fd7730c6e..0c05e2a172cc 100644
--- a/src/renderer/src/components/use-terminal-create-actions.test.tsx
+++ b/src/renderer/src/components/use-terminal-create-actions.test.tsx
@@ -93,7 +93,7 @@ describe('useTerminalCreateActions creation gates', () => {
 
   it('toasts instead of duplicating a browser tab when the provider forbids it', () => {
     mocks.browserAvailability = { state: 'hidden', reason: 'no browser here' }
-    renderActions().handleDuplicateBrowserTab('browser-1')
+    renderActions().handleDuplicateBrowserTab('browser-1', 'unified-browser-1')
     expect(mocks.toastError).toHaveBeenCalledWith('no browser here')
     expect(mocks.createBrowserTab).not.toHaveBeenCalled()
   })
diff --git a/src/renderer/src/components/use-terminal-create-actions.ts b/src/renderer/src/components/use-terminal-create-actions.ts
index 0d958ce70e0c..c67f7a664f34 100644
--- a/src/renderer/src/components/use-terminal-create-actions.ts
+++ b/src/renderer/src/components/use-terminal-create-actions.ts
@@ -168,7 +168,7 @@ export function useTerminalCreateActions(controller: TerminalColdActivationContr
   }, [])
 
   const handleDuplicateBrowserTab = useCallback(
-    (browserTabId: string) => {
+    (browserTabId: string, sourceUnifiedTabId: string) => {
       if (!activeWorktreeId) {
         return
       }
@@ -195,14 +195,16 @@ export function useTerminalCreateActions(controller: TerminalColdActivationContr
           worktreeId: activeWorktreeId,
           environmentId: runtimeEnvironmentId,
           url: source.url,
-          profileId: source.sessionProfileId
+          profileId: source.sessionProfileId,
+          clientAfterTabId: sourceUnifiedTabId
         }).catch(showClientCreationActionError)
         return
       }
       try {
         createBrowserTab(activeWorktreeId, source.url, {
           ...buildDuplicatedBrowserTabOptions(source),
-          ...(runtimeEnvironmentId ? { browserRuntimeEnvironmentId: null } : {})
+          ...(runtimeEnvironmentId ? { browserRuntimeEnvironmentId: null } : {}),
+          afterTabId: sourceUnifiedTabId
         })
       } catch (error) {
         showClientCreationActionError(error)
diff --git a/src/renderer/src/components/use-terminal-parking-foundation.ts b/src/renderer/src/components/use-terminal-parking-foundation.ts
index c368b299471e..3123a881d209 100644
--- a/src/renderer/src/components/use-terminal-parking-foundation.ts
+++ b/src/renderer/src/components/use-terminal-parking-foundation.ts
@@ -12,6 +12,7 @@ import {
   takeAllPendingBackgroundTerminalWorktreeMounts,
   takePendingBackgroundTerminalWorktreeMount
 } from './terminal/background-terminal-worktree-mount'
+import type { StartupTerminalTabHold } from './terminal/startup-terminal-tab-hold'
 import {
   combineTerminalWorktreeParkIds,
   useManualTerminalWorktreeParking
@@ -68,6 +69,7 @@ export function useTerminalParkingFoundation(controller: TerminalEditorCloseCont
   const backgroundMountTabIdsByWorktreeRef = useRef(new Map<string, ReadonlySet<string>>())
   const activationDeferredMountTabIdsByWorktreeRef = useRef(new Map<string, ReadonlySet<string>>())
   const lastActivationWorktreeIdRef = useRef<string | null>(null)
+  const startupTerminalTabHoldRef = useRef<StartupTerminalTabHold | null>(null)
   // Why a ref, not state: the cold-activation pass runs during render, where a
   // setState would be a render-phase update; the pass returns the count instead.
   const activationDeferralPlanRevisionRef = useRef(0)
@@ -167,6 +169,7 @@ export function useTerminalParkingFoundation(controller: TerminalEditorCloseCont
     backgroundMountTabIdsByWorktreeRef,
     activationDeferredMountTabIdsByWorktreeRef,
     lastActivationWorktreeIdRef,
+    startupTerminalTabHoldRef,
     activationDeferralPlanRevisionRef
   }
 }
diff --git a/src/renderer/src/components/use-terminal-watcher-effects.ts b/src/renderer/src/components/use-terminal-watcher-effects.ts
index e840c3f9ba05..39764c873457 100644
--- a/src/renderer/src/components/use-terminal-watcher-effects.ts
+++ b/src/renderer/src/components/use-terminal-watcher-effects.ts
@@ -10,11 +10,14 @@ import {
   type ParkedTerminalTabWatcherSyncEntry
 } from './terminal-pane/terminal-parked-tab-watchers'
 import { useAppStore } from '@/store'
+import { isTerminalWorkspaceEmptiedOnPurpose } from '../../../shared/closed-terminal-tab-tombstones'
 import { gateWorktreeAgentActivation } from '@/lib/worktree-agent-activation-gate'
 import { createWorkspaceTerminalHostAuthoritySelector } from '@/lib/workspace-terminal-host-authority'
 import { getStructuredAgentLaunchStatus } from '@/lib/structured-agent-session-launch'
+import { isEmptyWorkspaceDefaultSurfacePending } from '@/lib/empty-workspace-default-surface-claims'
 import { AGENT_SESSION_PROVIDER_HANDLE_PROVIDERS } from '../../../shared/agent-session-provider-handle'
 import type { TerminalColdActivationController } from './terminal-cold-activation'
+import { selectParkedEquivalentMountTabIds } from './terminal/startup-terminal-tab-hold'
 
 // Why shared: surfaces without watchable live tabs need no per-pass allocation.
 const NO_PARKED_TAB_IDS: ReadonlySet<string> = new Set()
@@ -41,6 +44,7 @@ type TerminalWatcherController = Pick<
   | 'pendingStartupByTabId'
   | 'reconcileWorktreeTabModel'
   | 'renderedActiveWorktreeId'
+  | 'startupTerminalTabHold'
   | 'tabsByWorktree'
   | 'terminalParkingEnabled'
   | 'terminalProviderSnapshotCapabilityRevision'
@@ -73,6 +77,7 @@ export function useTerminalWatcherEffects(controller: TerminalWatcherController)
     pendingStartupByTabId,
     reconcileWorktreeTabModel,
     renderedActiveWorktreeId,
+    startupTerminalTabHold,
     tabsByWorktree,
     terminalParkingEnabled,
     terminalProviderSnapshotCapabilityRevision,
@@ -118,7 +123,11 @@ export function useTerminalWatcherEffects(controller: TerminalWatcherController)
             }
           }
         }
-        deferredTabIds = activationDeferredMountTabIdsByWorktreeRef.current.get(workspaceId) ?? null
+        deferredTabIds = selectParkedEquivalentMountTabIds(
+          activationDeferredMountTabIdsByWorktreeRef.current.get(workspaceId),
+          startupTerminalTabHold,
+          workspaceId
+        )
         for (const tab of tabs) {
           if (
             deferredTabIds?.has(tab.id) &&
@@ -172,6 +181,7 @@ export function useTerminalWatcherEffects(controller: TerminalWatcherController)
     pairedRuntimeParkingEnvironmentIds,
     pendingStartupByTabId,
     renderedActiveWorktreeId,
+    startupTerminalTabHold,
     tabsByWorktree,
     terminalParkingEnabled,
     terminalProviderSnapshotCapabilityRevision,
@@ -183,11 +193,6 @@ export function useTerminalWatcherEffects(controller: TerminalWatcherController)
   useEffect(() => () => disposeAllParkedTerminalWatchers(), [])
 
   const startupActivationGateWorktreeIdsRef = useRef(new Set<string>())
-  // Why (main): a missing row means never initialized, an explicit empty row means the user
-  // closed the last terminal — so the gate must not re-seed one in the second case.
-  const activeWorktreeHasTerminalState = activeWorktreeId
-    ? Object.hasOwn(tabsByWorktree, activeWorktreeId)
-    : false
   // Why a store subscription rather than a read inside the effects: the verdict flips to `none` the
   // moment the execution host answers, and that transition is what re-runs the passes below.
   // Why the retained selector: resolution walks the owner catalogs, so recomputing it on every store
@@ -210,16 +215,26 @@ export function useTerminalWatcherEffects(controller: TerminalWatcherController)
     if (startupActivationGateWorktreeIdsRef.current.has(activeWorktreeId)) {
       return
     }
-    startupActivationGateWorktreeIdsRef.current.add(activeWorktreeId)
     let cancelled = false
     void gateWorktreeAgentActivation(activeWorktreeId).then((outcome) => {
       if (
         cancelled ||
-        outcome !== 'empty' ||
+        outcome === 'blocked' ||
         useAppStore.getState().activeWorktreeId !== activeWorktreeId
       ) {
         return
       }
+      // A reseed awaiting agent detection owns the surface. Left unmarked: that reseed bails if the
+      // user leaves during the wait, so a later return must seed here.
+      if (outcome === 'empty' && isEmptyWorkspaceDefaultSurfacePending(activeWorktreeId)) {
+        return
+      }
+      // Why mark only once a decision applies: a cancelled or blocked check must stay retryable,
+      // and a rerun shares the gate's in-flight promise instead of repeating its work.
+      startupActivationGateWorktreeIdsRef.current.add(activeWorktreeId)
+      if (outcome !== 'empty') {
+        return
+      }
       // A pending or unanswered chat create owns the surface even before its tab is published.
       if (
         AGENT_SESSION_PROVIDER_HANDLE_PROVIDERS.some(
@@ -230,6 +245,12 @@ export function useTerminalWatcherEffects(controller: TerminalWatcherController)
       }
       // Why: the activation gate reconciles durable/live agent state first; only an actually empty, never-visited workspace receives a default shell.
       const { renderableTabCount } = reconcileWorktreeTabModel(activeWorktreeId)
+      // Why (main): only a workspace emptied by a recorded close stays empty; an empty row with no
+      // record is unknown and seeds. Read at decision time: the row can change while the check runs.
+      const activeWorktreeHasTerminalState = isTerminalWorkspaceEmptiedOnPurpose(
+        useAppStore.getState(),
+        activeWorktreeId
+      )
       if (shouldAutoCreateInitialTerminal(renderableTabCount, activeWorktreeHasTerminalState)) {
         // Why: tag this never-visited-worktree tab so its PTY spawn doesn't count as activity and reshuffle the sidebar (explicit New Tab still bumps).
         createTab(activeWorktreeId, undefined, undefined, { pendingActivationSpawn: true })
@@ -240,7 +261,6 @@ export function useTerminalWatcherEffects(controller: TerminalWatcherController)
     }
   }, [
     activeWorktreeId,
-    activeWorktreeHasTerminalState,
     activeWorktreeHostAuthority,
     createTab,
     reconcileWorktreeTabModel,
diff --git a/src/renderer/src/components/use-worktree-jump-palette-selection-actions.ts b/src/renderer/src/components/use-worktree-jump-palette-selection-actions.ts
index e0da6c158fef..822a23f9e622 100644
--- a/src/renderer/src/components/use-worktree-jump-palette-selection-actions.ts
+++ b/src/renderer/src/components/use-worktree-jump-palette-selection-actions.ts
@@ -65,10 +65,10 @@ export function useWorktreeJumpPaletteSelectionActions({
         )
         return
       }
-      const activation = activateAndRevealWorktree(
-        worktree.id,
-        executionHostId ? { executionHostId } : {}
-      )
+      const activation = activateAndRevealWorktree(worktree.id, {
+        navigationIntent: 'user-open',
+        ...(executionHostId ? { executionHostId } : {})
+      })
       recordFeatureInteraction('cmd-j-workspace-open')
       skipRestoreFocusRef.current = true
       closeModal()
diff --git a/src/renderer/src/components/virtualized-list.test.tsx b/src/renderer/src/components/virtualized-list.test.tsx
index 7320c19ea62e..7de8428cef4e 100644
--- a/src/renderer/src/components/virtualized-list.test.tsx
+++ b/src/renderer/src/components/virtualized-list.test.tsx
@@ -89,13 +89,13 @@ beforeEach(() => {
   root = createRoot(host)
 
   vi.stubGlobal('ResizeObserver', MockResizeObserver)
-  vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(
-    function (this: HTMLElement) {
-      return this.classList.contains('overflow-auto')
-        ? VIEWPORT_HEIGHT_PX
-        : VIRTUALIZED_LIST_ROW_HEIGHT_PX
-    }
-  )
+  vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(function (
+    this: HTMLElement
+  ) {
+    return this.classList.contains('overflow-auto')
+      ? VIEWPORT_HEIGHT_PX
+      : VIRTUALIZED_LIST_ROW_HEIGHT_PX
+  })
   vi.spyOn(Element.prototype, 'getBoundingClientRect').mockImplementation(function (this: Element) {
     const top = topsByElement.get(this) ?? 0
     const height = this.classList.contains('overflow-auto')
diff --git a/src/renderer/src/components/worktree-jump-palette-recent-inclusion.test.ts b/src/renderer/src/components/worktree-jump-palette-recent-inclusion.test.ts
new file mode 100644
index 000000000000..654324782323
--- /dev/null
+++ b/src/renderer/src/components/worktree-jump-palette-recent-inclusion.test.ts
@@ -0,0 +1,85 @@
+import { describe, expect, it } from 'vitest'
+import type { WorkspaceTabPaletteSearchResult } from '@/lib/workspace-tab-palette-search'
+import type { TabPaneInputSources } from '@/components/sidebar/smart-attention'
+import type { AgentJournalTurnOutcome } from '../../../shared/agent-turn-outcome'
+import type { AgentStatusEntry } from '../../../shared/agent-status-types'
+import { shouldIncludeOpenTabInRecentSection } from './worktree-jump-palette-recent-inclusion'
+import { makeAgentEntry, makeWorktree } from './worktree-jump-palette-test-fixtures'
+
+const NOW = 1_700_000_000_000
+const TAB_ID = 'terminal-1'
+
+function currentTabResult(): WorkspaceTabPaletteSearchResult {
+  return {
+    tabId: 'unified-terminal-1',
+    entityId: TAB_ID,
+    worktreeId: 'wt-1',
+    groupId: 'group-1',
+    contentType: 'terminal',
+    occupantAgent: null,
+    title: 'Terminal',
+    secondaryText: '',
+    secondaryMatches: [],
+    repoName: 'repo/orca',
+    worktreeName: 'Palette Worktree',
+    branchName: 'main',
+    titleRanges: [],
+    secondaryRanges: [],
+    repoRanges: [],
+    worktreeRanges: [],
+    branchRanges: [],
+    typeAliasMatches: [],
+    isCurrentTab: true,
+    isCurrentWorktree: true,
+    score: 0,
+    qualityClass: null,
+    rank: null,
+    paletteIdentity: `terminal\u0000wt-1\u0000group-1\u0000unified-terminal-1`,
+    lastActiveAt: null,
+    activity: { ageBucket: null, timestamp: 0 }
+  }
+}
+
+function includesCurrentTabWith(entry: AgentStatusEntry): boolean {
+  const paneSources: TabPaneInputSources = {
+    entriesByTabId: new Map([[TAB_ID, [entry]]]),
+    ptyIdsByTabId: {},
+    runtimePaneTitlesByTabId: {}
+  }
+  return shouldIncludeOpenTabInRecentSection({
+    item: { id: 'item-1', type: 'workspace-tab', result: currentTabResult() },
+    worktree: makeWorktree('wt-1', 'Palette Worktree'),
+    row: {
+      id: TAB_ID,
+      worktreeId: 'wt-1',
+      unifiedTabId: 'unified-terminal-1',
+      terminalTab: { id: TAB_ID, title: 'zsh' },
+      worktreeLastActivityAt: 0
+    },
+    paneSources,
+    unreadTerminalTabs: {},
+    unreadAgentCompletionPanes: {},
+    now: NOW
+  })
+}
+
+function doneWith(outcome?: AgentJournalTurnOutcome): AgentStatusEntry {
+  return makeAgentEntry(
+    TAB_ID,
+    'done',
+    NOW - 1_000,
+    outcome ? { mainAgent: { state: 'done', outcome, stateStartedAt: NOW - 1_000 } } : {}
+  )
+}
+
+describe('shouldIncludeOpenTabInRecentSection', () => {
+  it('keeps the current tab out of Recent once its turn settled, a failure like a completion', () => {
+    expect(includesCurrentTabWith(doneWith())).toBe(false)
+    expect(includesCurrentTabWith(doneWith('cancellation'))).toBe(false)
+    expect(includesCurrentTabWith(doneWith('failure'))).toBe(false)
+  })
+
+  it('keeps the current tab in Recent while its agent still works', () => {
+    expect(includesCurrentTabWith(makeAgentEntry(TAB_ID, 'working', NOW - 1_000))).toBe(true)
+  })
+})
diff --git a/src/renderer/src/components/worktree-jump-palette-recent-inclusion.ts b/src/renderer/src/components/worktree-jump-palette-recent-inclusion.ts
index 8324c95746d1..9ecb3ccd4e03 100644
--- a/src/renderer/src/components/worktree-jump-palette-recent-inclusion.ts
+++ b/src/renderer/src/components/worktree-jump-palette-recent-inclusion.ts
@@ -48,5 +48,6 @@ export function shouldIncludeOpenTabInRecentSection({
       unreadAgentCompletionPanes
     })
   })
-  return badge != null && badge !== 'done' && badge !== 'interrupted'
+  // Why: a settled outcome on the tab you are on is not news; a failure ranks like a completion.
+  return badge != null && badge !== 'done' && badge !== 'failed' && badge !== 'interrupted'
 }
diff --git a/src/renderer/src/components/worktree-jump-palette-sleeping-filter.test.ts b/src/renderer/src/components/worktree-jump-palette-sleeping-filter.test.ts
index 73ce01b2951b..56fe90c0eb2a 100644
--- a/src/renderer/src/components/worktree-jump-palette-sleeping-filter.test.ts
+++ b/src/renderer/src/components/worktree-jump-palette-sleeping-filter.test.ts
@@ -1,10 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { isSleepingSweepExemptWorkspace } from './sidebar/visible-worktrees'
 import type { Worktree } from '../../../shared/worktree/types'
-import { readWorktreeJumpPaletteSource } from './worktree-jump-palette-source.test-support'
-
-const worktreeSource = readWorktreeJumpPaletteSource('use-worktree-jump-palette-worktrees.ts')
-const storeSource = readWorktreeJumpPaletteSource('use-worktree-jump-palette-store-state.ts')
 
 function makeWorktree(overrides: Partial<Worktree> = {}): Worktree {
   return {
@@ -30,28 +26,6 @@ function makeWorktree(overrides: Partial<Worktree> = {}): Worktree {
 }
 
 describe('Cmd+J empty-query "Hide sleeping" pass (#8873)', () => {
-  // Why source-level: the palette re-implements the sidebar's filter pass
-  // inline, so the only structural guarantee that the two agree is that both
-  // call the shared predicate. A behavioral copy here would not catch a
-  // hand-rolled duplicate creeping back in.
-  it('routes the sleeping sweep through the shared exemption predicate', () => {
-    const start = worktreeSource.indexOf('const emptyQueryVisibleWorktrees = useMemo(')
-    expect(start).toBeGreaterThanOrEqual(0)
-    const end = worktreeSource.indexOf('const { visibleWorktreesForState', start)
-    const filterPass = worktreeSource.slice(start, end)
-
-    expect(filterPass).toContain(
-      '!isSleepingSweepExemptWorkspace(worktree, alwaysShowDefaultBranchWorkspace)'
-    )
-    expect(filterPass).toContain('alwaysShowDefaultBranchWorkspace,')
-  })
-
-  it('reads the flag from the same store field the sidebar uses', () => {
-    expect(storeSource).toMatch(
-      /const alwaysShowDefaultBranchWorkspace = useAppStore\(\s*\(state\) => state\.alwaysShowDefaultBranchWorkspace\s*\)/
-    )
-  })
-
   it('exempts a project entry point by default and honours an explicit opt-out', () => {
     const main = makeWorktree()
 
diff --git a/src/renderer/src/components/worktree-jump-palette-source-context-boundary.test.ts b/src/renderer/src/components/worktree-jump-palette-source-context-boundary.test.ts
deleted file mode 100644
index 0815cc7092f0..000000000000
--- a/src/renderer/src/components/worktree-jump-palette-source-context-boundary.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { readWorktreeJumpPaletteSource } from './worktree-jump-palette-source.test-support'
-
-const source = [
-  readWorktreeJumpPaletteSource('use-worktree-jump-palette-create-action.ts'),
-  readWorktreeJumpPaletteSource('worktree-jump-palette-create-worktree.ts')
-].join('\n')
-
-function sourceBetween(startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start + startPattern.length)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('WorktreeJumpPalette source-context boundaries', () => {
-  it('defers pasted GitHub URL resolution to the composer so cross-project detection runs', () => {
-    // Why: pasting a cross-project URL must surface the same "Switch project?"
-    // prompt as Cmd+N. The palette hands the raw URL to the composer's name
-    // field instead of pre-resolving it against an arbitrary repo, which
-    // silently linked cross-project items to the wrong project.
-    const githubLinkSection = sourceBetween('if (ghLink) {', 'if (ghNumber !== null) {')
-    expect(githubLinkSection).toContain('prefilledName: trimmed')
-    expect(githubLinkSection).not.toContain('lookupGitHubWorkItemByOwnerRepoForSource')
-  })
-
-  it('resolves typed raw issue/PR numbers through the lookup repo source host', () => {
-    expect(source).toContain('buildTaskSourceContextFromRepo')
-
-    const rawNumberSection = sourceBetween(
-      'void lookupGitHubWorkItemForSource({',
-      '.then((item) => {'
-    )
-    expect(rawNumberSection).toContain('sourceContext')
-  })
-})
diff --git a/src/renderer/src/components/worktree-jump-palette-source.test-support.ts b/src/renderer/src/components/worktree-jump-palette-source.test-support.ts
deleted file mode 100644
index 6cb92e66de66..000000000000
--- a/src/renderer/src/components/worktree-jump-palette-source.test-support.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-
-export function readWorktreeJumpPaletteSource(relativePath: string): string {
-  return readFileSync(join(__dirname, relativePath), 'utf8')
-}
diff --git a/src/renderer/src/fork-hosted-review-sitter/fix-checks-agent-launch-caller-profile.ts b/src/renderer/src/fork-hosted-review-sitter/fix-checks-agent-launch-caller-profile.ts
index 92c86b0728af..002c92597cb8 100644
--- a/src/renderer/src/fork-hosted-review-sitter/fix-checks-agent-launch-caller-profile.ts
+++ b/src/renderer/src/fork-hosted-review-sitter/fix-checks-agent-launch-caller-profile.ts
@@ -5,11 +5,6 @@ import type { AgentLaunchCallerProfile } from '@/lib/agent-launch-caller-profile
 export const HOSTED_REVIEW_FIX_CHECKS_CALLER_PROFILE: AgentLaunchCallerProfile = {
   id: 'hosted-review-fix-checks',
   caller: 'src/renderer/src/fork-hosted-review-sitter/fix-checks-agent-launch.ts',
-  sourceMarkers: [
-    'agentArgs: recipe.agentArgs',
-    "promptDelivery: 'submit-after-ready'",
-    'beforeSurfaceOpen: () => {'
-  ],
   args: {
     agent: 'codex',
     worktreeId: 'wt-1',
@@ -19,9 +14,5 @@ export const HOSTED_REVIEW_FIX_CHECKS_CALLER_PROFILE: AgentLaunchCallerProfile =
     promptDelivery: 'submit-after-ready',
     launchPlatform: 'darwin',
     launchSource: 'task_page'
-  },
-  passesBeforeSurfaceOpen: true,
-  passesLaunchPlan: false,
-  passesOnPromptDelivered: false,
-  readsBack: ['surface-tab-id']
+  }
 }
diff --git a/src/renderer/src/fork-hosted-review-sitter/fix-checks-agent-launch.ts b/src/renderer/src/fork-hosted-review-sitter/fix-checks-agent-launch.ts
index 1d547170c870..ff9e8e32c69b 100644
--- a/src/renderer/src/fork-hosted-review-sitter/fix-checks-agent-launch.ts
+++ b/src/renderer/src/fork-hosted-review-sitter/fix-checks-agent-launch.ts
@@ -1,5 +1,5 @@
 // FORK-COPY-OF: src/renderer/src/lib/fix-checks-agent-launch.ts
-// FORK-COPY-SHA: 083f583a53e4c74a65acf420eee4ca2e0efa9df1
+// FORK-COPY-SHA: 75ea50273328d9bd5465170d10a098711d61b5a4
 // Upstream comparison baseline 1457d3966cf7b4165d17b18c57668d1e829f7674. Kept fork-owned so manual
 // checks fixes share the PR Sitter's main-process policy launch without adding an upstream logic block.
 import { toast } from 'sonner'
@@ -14,7 +14,7 @@ import { planAgentCliArgsSuffix } from '@/lib/tui-agent-startup'
 import {
   pickSourceControlLaunchAgent,
   readSourceControlLaunchRecipeAgentId
-} from '@/lib/source-control-launch-agent-selection'
+} from '../../../shared/source-control-launch-agent-selection'
 import { resolveSourceControlLaunchPlatform } from '@/lib/source-control-launch-platform'
 import { activateAndRevealWorktree } from '@/lib/worktree-activation'
 import { useAppStore } from '@/store'
diff --git a/src/renderer/src/fork-hosted-review-sitter/hosted-review-sitter-format.ts b/src/renderer/src/fork-hosted-review-sitter/hosted-review-sitter-format.ts
index 16c06e75125f..3546b9c7664a 100644
--- a/src/renderer/src/fork-hosted-review-sitter/hosted-review-sitter-format.ts
+++ b/src/renderer/src/fork-hosted-review-sitter/hosted-review-sitter-format.ts
@@ -252,11 +252,7 @@ export function hostedReviewSitterLedgerEntrySummary(
   switch (entry.kind) {
     case 'attempt':
       return {
-        title: translate(
-          `fork.hostedReviewSitter.ledger.${entry.state}`,
-          `${entry.state === 'settled' ? 'Finished' : entry.state === 'running' ? 'Running' : 'Attempted'} {{action}}`,
-          { action: hostedReviewSitterKernelActionLabel(entry.action.kind) }
-        ),
+        title: attemptTitle(entry.state, hostedReviewSitterKernelActionLabel(entry.action.kind)),
         detail:
           entry.reason ??
           resultDetail(entry.result) ??
@@ -385,3 +381,19 @@ export function hostedReviewSitterLedgerEntrySummary(
       }
   }
 }
+
+function attemptTitle(
+  state: Extract<LedgerEntry, { kind: 'attempt' }>['state'],
+  action: string
+): string {
+  switch (state) {
+    case 'settled':
+      return translate('fork.hostedReviewSitter.ledger.settled', 'Finished {{action}}', { action })
+    case 'running':
+      return translate('fork.hostedReviewSitter.ledger.running', 'Running {{action}}', { action })
+    case 'attempted':
+      return translate('fork.hostedReviewSitter.ledger.attempted', 'Attempted {{action}}', {
+        action
+      })
+  }
+}
diff --git a/src/renderer/src/hooks/direct-ssh-host-catalog-noop.test.ts b/src/renderer/src/hooks/direct-ssh-host-catalog-noop.test.ts
new file mode 100644
index 000000000000..0568f79bf9b5
--- /dev/null
+++ b/src/renderer/src/hooks/direct-ssh-host-catalog-noop.test.ts
@@ -0,0 +1,162 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { Repo } from '../../../shared/repo-types'
+import type { DirectSshAuthority, SshProviderEpoch } from '../../../shared/ssh-types'
+import { createTestStore } from '../store/slices/store-test-helpers'
+import { createDirectSshHostHydration } from './direct-ssh-host-hydration'
+
+const authority: DirectSshAuthority = {
+  targetId: 'target-a',
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The fixture uses one opaque epoch identity throughout.
+  providerEpoch: 'catalog-epoch' as SshProviderEpoch,
+  connectionGeneration: 1
+}
+
+const remoteRepo: Repo = {
+  id: 'shared',
+  path: '/srv/repo',
+  displayName: 'Remote repo',
+  badgeColor: '',
+  addedAt: 1,
+  connectionId: authority.targetId,
+  executionHostId: 'ssh:target-a',
+  hookSettings: { mode: 'auto', scripts: { setup: 'echo ready', archive: '' } },
+  symlinkPaths: ['.env'],
+  repoIcon: { type: 'lucide', name: 'Box' }
+}
+
+function fixture() {
+  const localRepo: Repo = {
+    ...remoteRepo,
+    path: '/local/repo',
+    connectionId: null,
+    executionHostId: 'local'
+  }
+  const folderRepo: Repo = { ...remoteRepo, id: 'folder', kind: 'folder', path: '/srv/folder' }
+  const initialRepos = [remoteRepo, localRepo, folderRepo]
+  const store = createTestStore()
+  store.setState({
+    repos: initialRepos,
+    manualRepoOrder: [
+      { hostId: 'ssh:target-a', repoId: 'shared' },
+      { hostId: 'local', repoId: 'shared' },
+      { hostId: 'ssh:target-a', repoId: 'folder' }
+    ]
+  })
+  let fetched: readonly Repo[] = [remoteRepo, folderRepo]
+  const hydration = createDirectSshHostHydration({
+    store,
+    listRepos: async () => ({
+      authoritative: true,
+      authority: { kind: 'direct-ssh', executionHostId: 'ssh:target-a', ...authority },
+      repos: structuredClone(fetched)
+    }),
+    listLineage: vi.fn(),
+    isCurrentAuthority: () => true
+  })
+  const listener = vi.fn()
+  store.subscribe(listener)
+  return {
+    store,
+    hydration,
+    listener,
+    initialRepos,
+    localRepo,
+    folderRepo,
+    setFetched: (repos: readonly Repo[]) => {
+      fetched = repos
+    }
+  }
+}
+
+describe('direct SSH host catalog publication', () => {
+  it('does not publish cloned equal repos across twenty refreshes', async () => {
+    const { store, hydration, listener, initialRepos } = fixture()
+    const initialState = store.getState()
+    for (let index = 0; index < 20; index++) {
+      await hydration.capturePreparationInput(authority, 'wake-refresh')
+    }
+    expect(store.getState().repos).toBe(initialRepos)
+    expect(store.getState()).toBe(initialState)
+    expect(listener).not.toHaveBeenCalled()
+    hydration.stop()
+  })
+
+  it('publishes a nested change once and retains equal sibling identities', async () => {
+    const { store, hydration, listener, localRepo, folderRepo, setFetched } = fixture()
+    const changed = { ...remoteRepo, symlinkPaths: ['.env', '.env.local'] }
+    setFetched([changed, folderRepo])
+    await hydration.capturePreparationInput(authority, 'wake-refresh')
+    expect(store.getState().repos).toEqual([changed, localRepo, folderRepo])
+    expect(store.getState().repos[0]).not.toBe(remoteRepo)
+    expect(store.getState().repos[1]).toBe(localRepo)
+    expect(store.getState().repos[2]).toBe(folderRepo)
+    expect(listener).toHaveBeenCalledOnce()
+    await hydration.capturePreparationInput(authority, 'wake-refresh')
+    expect(listener).toHaveBeenCalledOnce()
+    hydration.stop()
+  })
+
+  it('removes only target rows and retains manual order when adding a repo', async () => {
+    const { store, hydration, listener, localRepo, folderRepo, setFetched } = fixture()
+    const added = { ...remoteRepo, id: 'added', path: '/srv/added' }
+    setFetched([added, folderRepo])
+    await hydration.capturePreparationInput(authority, 'wake-refresh')
+    expect(store.getState().repos).toEqual([localRepo, folderRepo, added])
+    expect(store.getState().repos[0]).toBe(localRepo)
+    expect(store.getState().repos[1]).toBe(folderRepo)
+    expect(listener).toHaveBeenCalledOnce()
+    hydration.stop()
+  })
+
+  it('still advances catalog observation revisions when rows stay equal', async () => {
+    const { hydration, listener } = fixture()
+    const first = await hydration.capturePreparationInput(authority, 'reconnect')
+    const second = await hydration.capturePreparationInput(authority, 'wake-refresh')
+    expect(first).not.toBeNull()
+    expect(second?.catalogRevision).toBe(first!.catalogRevision + 1)
+    const repoFingerprint = JSON.stringify([
+      ['ssh:target-a', 'folder'],
+      ['ssh:target-a', 'shared']
+    ])
+    expect(
+      hydration.isPreparationTokenCurrent({
+        authority,
+        catalogRevision: first!.catalogRevision,
+        repoFingerprint
+      })
+    ).toBe(false)
+    expect(
+      hydration.isPreparationTokenCurrent({
+        authority,
+        catalogRevision: second!.catalogRevision,
+        repoFingerprint
+      })
+    ).toBe(true)
+    expect(listener).not.toHaveBeenCalled()
+    hydration.stop()
+  })
+
+  // Why these two shapes: the gate must fail closed on a field no previous row carried, so a
+  // `Repo` field added after this gate landed still publishes without anyone revisiting the
+  // comparison. `'auto'` is documented as semantically identical to an absent
+  // `issueSourcePreference`, which makes it the sharpest case for the strict own-key policy.
+  it.each([
+    {
+      label: 'an optional key no previous row carried',
+      changed: { ...remoteRepo, issueSourcePreference: 'auto' } satisfies Repo
+    },
+    {
+      label: 'a nested record no previous row carried',
+      changed: { ...remoteRepo, upstream: { owner: 'octo', repo: 'remote' } } satisfies Repo
+    }
+  ])('publishes when a fetched row gains $label', async ({ changed }) => {
+    const { store, hydration, listener, folderRepo, setFetched } = fixture()
+    setFetched([changed, folderRepo])
+    await hydration.capturePreparationInput(authority, 'wake-refresh')
+    expect(listener).toHaveBeenCalledOnce()
+    expect(store.getState().repos).toContainEqual(changed)
+    await hydration.capturePreparationInput(authority, 'wake-refresh')
+    expect(listener).toHaveBeenCalledOnce()
+    hydration.stop()
+  })
+})
diff --git a/src/renderer/src/hooks/direct-ssh-host-hydration.ts b/src/renderer/src/hooks/direct-ssh-host-hydration.ts
index 2c3265017600..32b97b50a557 100644
--- a/src/renderer/src/hooks/direct-ssh-host-hydration.ts
+++ b/src/renderer/src/hooks/direct-ssh-host-hydration.ts
@@ -6,7 +6,7 @@ import { applyManualRepoOrder } from '../../../shared/manual-repo-order'
 import type { DirectSshAuthority } from '../../../shared/ssh-types'
 import { isWorkspaceKey } from '../../../shared/workspace-scope'
 import type { AppState } from '../store/types'
-import { reuseEqualRecordMap } from '../store/slices/repo-identity-reconcile'
+import { reconcileFetchedRepos, reuseEqualRecordMap } from '../store/slices/repo-identity-reconcile'
 import type {
   DirectSshLineageOutcome,
   DirectSshPreparationInput,
@@ -66,13 +66,14 @@ function mergeExactHostCatalog(state: AppState, snapshot: HostRepoCatalogSnapsho
   const hostId = snapshot.authority.executionHostId
   // Why re-apply the overlay: re-appending the host's rows puts them at the tail, which would
   // undo the user's manual cross-host order on every connect.
-  return {
-    ...state,
-    repos: applyManualRepoOrder(
+  const repos = reconcileFetchedRepos(
+    state.repos,
+    applyManualRepoOrder(
       [...state.repos.filter((repo) => getRepoExecutionHostId(repo) !== hostId), ...snapshot.repos],
       state.manualRepoOrder
     )
-  }
+  )
+  return repos === state.repos ? state : { ...state, repos }
 }
 
 // Why: the host owns every in-scope key, so drop the stale in-scope rows, overlay the snapshot's,
diff --git a/src/renderer/src/hooks/ipc-events-agent-status-store-test-fixtures.ts b/src/renderer/src/hooks/ipc-events-agent-status-store-test-fixtures.ts
index 7cabf081db90..8f676cada26f 100644
--- a/src/renderer/src/hooks/ipc-events-agent-status-store-test-fixtures.ts
+++ b/src/renderer/src/hooks/ipc-events-agent-status-store-test-fixtures.ts
@@ -47,6 +47,7 @@ export type AgentStatusSetData = {
   connectionId?: string | null
   receivedAt: number
   stateStartedAt: number
+  turnStartedAt?: number
 }
 export type StoreLike = Record<string, unknown>
 export type StoreSubscribeListener = (state: StoreLike, previousState: StoreLike) => void
diff --git a/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts b/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts
index 3883f7ac8af6..249e435b9a47 100644
--- a/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts
+++ b/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts
@@ -3,6 +3,7 @@
    calls back out would duplicate them into all 4 specs. */
 import type * as ReactModule from 'react'
 import { vi } from 'vitest'
+import type { TerminalSurfaceCloseTarget } from '../../../shared/terminal-surface-close-target'
 
 export type RequestTabCloseListener = (data: {
   requestId: string
@@ -12,7 +13,7 @@ export type RequestTabCloseListener = (data: {
 export type CloseActiveTabListener = (payload?: { sourceId: string }) => void
 export type CloseFloatingItemListener = (payload: { sourceId: string }) => void
 export type SelectFloatingIndexListener = (payload: { index: number }) => void
-export type CloseTerminalListener = (data: { tabId: string; paneRuntimeId?: number | null }) => void
+export type CloseTerminalListener = (target: TerminalSurfaceCloseTarget) => void
 export type CloseSessionTabListener = (data: { tabId: string; worktreeId: string }) => void
 export type SessionTabCloseRequestListener = (data: {
   requestId: string
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-event-applicator.ts b/src/renderer/src/hooks/ipc-events/agent-status-event-applicator.ts
index 47aa5521a26b..41957078f41a 100644
--- a/src/renderer/src/hooks/ipc-events/agent-status-event-applicator.ts
+++ b/src/renderer/src/hooks/ipc-events/agent-status-event-applicator.ts
@@ -227,7 +227,8 @@ export function createAgentStatusEventApplicator(args: {
         ...(data.evidenceObservedAt !== undefined
           ? { evidenceObservedAt: data.evidenceObservedAt }
           : {}),
-        stateStartedAt: data.stateStartedAt
+        stateStartedAt: data.stateStartedAt,
+        ...(Number.isFinite(data.turnStartedAt) ? { turnStartedAt: data.turnStartedAt } : {})
       },
       routing: {
         tabId: ownerTabId,
diff --git a/src/renderer/src/hooks/ipc-events/browser-state-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/browser-state-ipc-bridge.ts
index 47da67cdc857..f55604032695 100644
--- a/src/renderer/src/hooks/ipc-events/browser-state-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/browser-state-ipc-bridge.ts
@@ -1,5 +1,6 @@
 import { rememberLiveBrowserUrl } from '@/components/browser-pane/describe-page/live-browser-url-registry'
 import { getRuntimeEnvironmentIdForWorktree } from '@/lib/worktree-runtime-owner'
+import { resolveBrowserSourceUnifiedTab } from '@/lib/browser-workspace-source-resolution'
 import { redactKagiSessionToken } from '../../../../shared/browser-url'
 import { useAppStore } from '../../store'
 import {
@@ -121,9 +122,18 @@ export function registerBrowserStateIpcBridge(
       const sourceTab = (store.browserTabsByWorktree[sourcePage.worktreeId] ?? []).find(
         (tab) => tab.id === sourcePage.workspaceId
       )
+      const sourceUnifiedTab = resolveBrowserSourceUnifiedTab(
+        store,
+        browserPageId,
+        sourcePage.worktreeId
+      )
       store.createBrowserTab(sourcePage.worktreeId, url, {
         title: url,
         activate: activate ?? true,
+        ...(sourceUnifiedTab ? { afterTabId: sourceUnifiedTab.id } : {}),
+        ...(sourceUnifiedTab?.executionHostId
+          ? { executionHostId: sourceUnifiedTab.executionHostId }
+          : {}),
         ...(sourceTab
           ? {
               sessionProfileId: sourceTab.sessionProfileId,
diff --git a/src/renderer/src/hooks/ipc-events/browser-state-open-link-profile.test.ts b/src/renderer/src/hooks/ipc-events/browser-state-open-link-profile.test.ts
index 446a0dc74359..9db3d4ee5f5d 100644
--- a/src/renderer/src/hooks/ipc-events/browser-state-open-link-profile.test.ts
+++ b/src/renderer/src/hooks/ipc-events/browser-state-open-link-profile.test.ts
@@ -80,6 +80,12 @@ describe('link-opened Orca tabs', () => {
           }
         ]
       },
+      unifiedTabsByWorktree: {
+        'worktree-1': [
+          { id: 'unified-1', entityId: 'workspace-1', contentType: 'browser', groupId: 'group-1' }
+        ]
+      },
+      groupsByWorktree: { 'worktree-1': [{ id: 'group-1', tabOrder: ['unified-1'] }] },
       createBrowserTab: createBrowserTabMock
     }
 
@@ -89,6 +95,7 @@ describe('link-opened Orca tabs', () => {
       'worktree-1',
       'https://docs.example.com/guide',
       expect.objectContaining({
+        afterTabId: 'unified-1',
         sessionProfileId: 'profile-client-a',
         sessionPartition: 'persist:orca-browser-session-client-a'
       })
diff --git a/src/renderer/src/hooks/ipc-events/host-session-tab-target.ts b/src/renderer/src/hooks/ipc-events/host-session-tab-target.ts
new file mode 100644
index 000000000000..86397dd464d3
--- /dev/null
+++ b/src/renderer/src/hooks/ipc-events/host-session-tab-target.ts
@@ -0,0 +1,13 @@
+import { LOCAL_STRUCTURED_SESSION_OWNER } from '@/runtime/local-structured-session-owner'
+import { resolveLocalTabIdForHostSessionTab } from '@/runtime/web-session-tabs-sync/tracking-mappings'
+
+/** Main addresses its own session-tab ids; a mirrored chat tab lives here under a different id. */
+export function resolveWindowTabIdForHostTab(worktreeId: string, tabId: string): string {
+  return (
+    resolveLocalTabIdForHostSessionTab({
+      environmentId: LOCAL_STRUCTURED_SESSION_OWNER,
+      worktreeId,
+      hostTabId: tabId
+    }) ?? tabId
+  )
+}
diff --git a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
index aaf1686e702f..43a7e5905585 100644
--- a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
@@ -1,5 +1,4 @@
-import { CLOSE_TERMINAL_PANE_EVENT } from '@/constants/terminal'
-import type { CloseTerminalPaneDetail } from '@/constants/terminal'
+import { applyClosedTerminalLeafNotice } from '@/components/terminal-pane/closed-terminal-leaf-notice'
 import { closeTerminalTab } from '@/components/terminal/terminal-tab-actions'
 import { detectLanguage } from '@/lib/language-detect'
 import { runSleepWorktree } from '@/components/sidebar/sleep-worktree-flow'
@@ -53,14 +52,12 @@ export function registerMobileAndTerminalCloseIpcBridge(
   )
 
   unsubs.push(
-    window.api.ui.onCloseTerminal(({ tabId, paneRuntimeId }) => {
-      if (paneRuntimeId != null) {
-        // Why: route pane closes via the lifecycle hook for sibling promotion (falls through to closeTab on the last pane).
-        const detail: CloseTerminalPaneDetail = { tabId, paneRuntimeId }
-        window.dispatchEvent(new CustomEvent(CLOSE_TERMINAL_PANE_EVENT, { detail }))
+    window.api.ui.onCloseTerminal((target) => {
+      if (target.kind === 'pane') {
+        applyClosedTerminalLeafNotice(target.tabId, target.leafId)
       } else {
         // Why: the CLI/RPC caller is answered immediately, so it cannot wait on a modal.
-        closeTerminalTab(tabId, { skipRunningProcessConfirm: true })
+        closeTerminalTab(target.tabId, { skipRunningProcessConfirm: true })
       }
     })
   )
diff --git a/src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge-ownership.test.ts b/src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge-ownership.test.ts
new file mode 100644
index 000000000000..cd1b231da18c
--- /dev/null
+++ b/src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge-ownership.test.ts
@@ -0,0 +1,179 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import { subscribeRuntimeEnvironmentFromPreload } from '../../../../preload/runtime-environment-subscriptions'
+import { tagRuntimeSubscriptionReplayResponse } from '../../../../shared/runtime-subscription-replay'
+import { createCompatibleRuntimeStatusResponse } from '@/runtime/runtime-compatibility-test-fixture'
+import { registerRuntimeClientIpcBridge } from './runtime-client-ipc-bridge'
+
+const initialState = useAppStore.getState()
+
+beforeEach(() => vi.useFakeTimers())
+afterEach(() => {
+  useAppStore.setState(initialState, true)
+  vi.useRealTimers()
+  vi.unstubAllGlobals()
+})
+
+function createHarness() {
+  type Ipc = Parameters<typeof subscribeRuntimeEnvironmentFromPreload>[0]
+  type Args = Parameters<typeof subscribeRuntimeEnvironmentFromPreload>[1]
+  type Callbacks = Parameters<typeof subscribeRuntimeEnvironmentFromPreload>[2]
+  let listener: Parameters<Ipc['on']>[1] | undefined
+  const pending: ReturnType<typeof Promise.withResolvers<unknown>>[] = []
+  const issueRead = Promise.withResolvers<null>()
+  const ipc: Ipc = {
+    invoke: vi.fn((channel) => {
+      if (channel !== 'runtimeEnvironments:subscribe') {
+        return Promise.resolve()
+      }
+      const setup = Promise.withResolvers<unknown>()
+      pending.push(setup)
+      return setup.promise
+    }),
+    send: vi.fn(),
+    on: (_channel, callback) => {
+      listener = callback
+    },
+    removeListener: vi.fn()
+  }
+  const getIssue = vi.fn(() => issueRead.promise)
+  const refreshStatus = vi.fn(async () => true)
+  let nextId = 0
+  vi.stubGlobal('window', {
+    api: {
+      runtimeEnvironments: {
+        subscribe: (args: Args, callbacks: Callbacks) =>
+          subscribeRuntimeEnvironmentFromPreload(ipc, args, callbacks, () => `sub-${nextId++}`),
+        call: vi.fn(async () => ({ id: 'r', ok: true, result: [] }))
+      },
+      linear: { getIssue }
+    }
+  })
+  const status = createCompatibleRuntimeStatusResponse()
+  if (!status.ok) {
+    throw new Error('expected valid runtime status fixture')
+  }
+  useAppStore.setState({
+    settings: null,
+    runtimeEnvironments: [
+      {
+        id: 'host-a',
+        name: 'Host A',
+        createdAt: 1,
+        updatedAt: 1,
+        lastUsedAt: null,
+        runtimeId: null,
+        endpoints: [
+          { id: 'ws-a', kind: 'websocket', label: 'WS', endpoint: 'ws://example.invalid' }
+        ],
+        preferredEndpointId: 'ws-a'
+      }
+    ],
+    runtimeStatusByEnvironmentId: new Map([['host-a', { status: status.result, checkedAt: 1 }]]),
+    linearIssueCache: {},
+    linearSearchCache: {},
+    linearListCache: {},
+    linearProjectIssueCache: {},
+    linearCustomViewIssueCache: {},
+    checkLinearConnection: vi.fn(async () => {}),
+    refreshRuntimeEnvironmentStatus: refreshStatus
+  })
+  const starts: (() => void)[] = []
+  const start = (): (() => void) => {
+    const unsubs: (() => void)[] = []
+    const unsubscribeStore = registerRuntimeClientIpcBridge(unsubs, {
+      worktreeChangeRefreshQueue: { enqueue: vi.fn(), dispose: vi.fn() },
+      activateNotifiedWorktree: vi.fn(async () => {})
+    })
+    const stop = (): void => {
+      unsubscribeStore()
+      unsubs.forEach((unsubscribe) => unsubscribe())
+    }
+    starts.push(stop)
+    return stop
+  }
+  return {
+    start,
+    getIssue,
+    refreshStatus,
+    pending,
+    ipc,
+    emit: (index: number, replay = false) => {
+      const response = {
+        id: 'r',
+        ok: true as const,
+        _meta: { runtimeId: 'remote-runtime' },
+        result: {
+          type: 'linearLinkedIssueUpdated',
+          identifier: 'ISSUE-1',
+          workspaceId: 'workspace-a'
+        }
+      }
+      listener?.(null, {
+        subscriptionId: `sub-${index}`,
+        type: 'response',
+        response: replay ? tagRuntimeSubscriptionReplayResponse(response) : response
+      })
+    },
+    finish: async () => {
+      starts.forEach((stop) => stop())
+      pending.forEach((setup, index) =>
+        setup.resolve({ subscriptionId: `sub-${index}`, requestId: 'r' })
+      )
+      issueRead.resolve(null)
+      for (let index = 0; index < 30; index += 1) {
+        await Promise.resolve()
+      }
+    }
+  }
+}
+
+it('does no Linear read dispatch or cache publication after cleanup while setup is pending', async () => {
+  const h = createHarness()
+  let publications = 0
+  const stopCounting = useAppStore.subscribe((state, previous) => {
+    if (state.linearIssueCache !== previous.linearIssueCache) {
+      publications += 1
+    }
+  })
+  try {
+    h.start()()
+    for (let index = 0; index < 100; index += 1) {
+      h.emit(0)
+    }
+    expect(h.getIssue).not.toHaveBeenCalled()
+    expect(publications).toBe(0)
+  } finally {
+    stopCounting()
+    await h.finish()
+  }
+  expect(h.ipc.removeListener).toHaveBeenCalledOnce()
+})
+
+it('does no replay recovery or resubscription after cleanup', async () => {
+  const h = createHarness()
+  try {
+    h.start()()
+    h.emit(0, true)
+    expect(h.refreshStatus).not.toHaveBeenCalled()
+    expect(h.pending).toHaveLength(1)
+    expect(h.getIssue).not.toHaveBeenCalled()
+  } finally {
+    await h.finish()
+  }
+})
+
+it('accepts a fresh bridge early frame while rejecting the previous bridge frame', async () => {
+  const h = createHarness()
+  try {
+    h.start()()
+    h.start()
+    h.emit(0)
+    h.emit(1)
+    expect(h.getIssue).toHaveBeenCalledOnce()
+    expect(h.getIssue).toHaveBeenCalledWith({ id: 'ISSUE-1', workspaceId: 'workspace-a' })
+  } finally {
+    await h.finish()
+  }
+  expect(h.ipc.removeListener).toHaveBeenCalledOnce()
+})
diff --git a/src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge.ts
index a5db87bbce10..ae014d702300 100644
--- a/src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge.ts
@@ -137,7 +137,7 @@ export function registerRuntimeClientIpcBridge(
   const runtimeClientEventsSync = createRuntimeClientEventsSync({
     getDesiredEnvironmentIds: () => getRuntimeClientEventEnvironmentIds(useAppStore.getState()),
     getSubscriptionKey: (environmentId) => buildRuntimeClientEventEnvironmentKey([environmentId]),
-    subscribe: (environmentId, onEvent, onError) => {
+    subscribe: (environmentId, onEvent, onError, isCurrent) => {
       const sshGeneration = getEnvironmentSshStateGeneration(environmentId)
       const runtimeGeneration = getRuntimeEnvironmentConnectionGeneration(environmentId)
       const runtimeRevision = getRuntimeEnvironmentRevision(environmentId)
@@ -154,6 +154,9 @@ export function registerRuntimeClientIpcBridge(
         },
         onError,
         () => {
+          if (!isCurrent()) {
+            return
+          }
           invalidateRuntimeClientEventReplay({
             getSshStateReference: () => useAppStore.getState().sshStateByEnvironment,
             refreshRuntimeStatus: () => {
diff --git a/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
index 474640720349..7cd2b65efb9b 100644
--- a/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
@@ -13,6 +13,7 @@ import {
 } from '../../store/pinned-tab-close-guard'
 import { useAppStore } from '../../store'
 import { resolveBrowserSessionTabTarget } from './browser-session-tab-target'
+import { resolveWindowTabIdForHostTab } from './host-session-tab-target'
 
 export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
   unsubs.push(
@@ -20,8 +21,9 @@ export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
       if (isLocalSessionTabCloseOwned(worktreeId, tabId)) {
         return
       }
+      const localTabId = resolveWindowTabIdForHostTab(worktreeId, tabId)
       const store = useAppStore.getState()
-      const browserTarget = resolveBrowserSessionTabTarget(store, worktreeId, tabId)
+      const browserTarget = resolveBrowserSessionTabTarget(store, worktreeId, localTabId)
       if (browserTarget) {
         guardPinnedTabClose({
           isPinned: isUnifiedTabPinned(store, worktreeId, browserTarget.workspaceId),
@@ -31,11 +33,11 @@ export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
         return
       }
       guardPinnedTabClose({
-        isPinned: isUnifiedTabPinned(store, worktreeId, tabId),
-        tabLabel: resolvePinnedTabLabel(store, worktreeId, tabId),
+        isPinned: isUnifiedTabPinned(store, worktreeId, localTabId),
+        tabLabel: resolvePinnedTabLabel(store, worktreeId, localTabId),
         onClose: () => {
           const currentStore = useAppStore.getState()
-          closeMobileSessionTabInStore(currentStore, worktreeId, tabId)
+          closeMobileSessionTabInStore(currentStore, worktreeId, localTabId)
         }
       })
     })
@@ -43,8 +45,9 @@ export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
 
   unsubs.push(
     window.api.ui.onSessionTabCloseRequest(({ requestId, tabId, worktreeId, expiresAt }) => {
+      const localTabId = resolveWindowTabIdForHostTab(worktreeId, tabId)
       const store = useAppStore.getState()
-      const browserTarget = resolveBrowserSessionTabTarget(store, worktreeId, tabId)
+      const browserTarget = resolveBrowserSessionTabTarget(store, worktreeId, localTabId)
       let cancelConfirmation: (() => void) | undefined
       let timeout: ReturnType<typeof setTimeout> | undefined
       let settled = false
@@ -78,7 +81,11 @@ export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
             respond()
             return
           }
-          const closed = closeMobileSessionTabInStore(useAppStore.getState(), worktreeId, tabId)
+          const closed = closeMobileSessionTabInStore(
+            useAppStore.getState(),
+            worktreeId,
+            localTabId
+          )
           respond(closed ? undefined : SESSION_TAB_NOT_FOUND_ERROR)
         } catch (error) {
           respond(error instanceof Error ? error.message : SESSION_TAB_CLOSE_FAILED_ERROR)
@@ -92,7 +99,7 @@ export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
         )
         return
       }
-      const visibleId = browserTarget?.workspaceId ?? tabId
+      const visibleId = browserTarget?.workspaceId ?? localTabId
       cancelConfirmation = guardPinnedTabClose({
         isPinned: isUnifiedTabPinned(store, worktreeId, visibleId),
         tabLabel: resolvePinnedTabLabel(store, worktreeId, visibleId),
diff --git a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
index 85460c888413..29ddc098726e 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
@@ -9,6 +9,7 @@ import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane'
 import { useAppStore } from '../../store'
 import type { AppState } from '../../store/types'
 import { resolveBrowserSessionTabTarget } from './browser-session-tab-target'
+import { resolveWindowTabIdForHostTab } from './host-session-tab-target'
 import {
   activateTerminalInitiatedWorktree,
   focusTerminalInitiatedTab
@@ -146,9 +147,12 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
 
   unsubs.push(
     window.api.ui.onFocusEditorTab(({ tabId, worktreeId, userInitiated }) => {
+      const localTabId = resolveWindowTabIdForHostTab(worktreeId, tabId)
       const store = useAppStore.getState()
-      const tab = (store.unifiedTabsByWorktree[worktreeId] ?? []).find((item) => item.id === tabId)
-      const browserTarget = resolveBrowserSessionTabTarget(store, worktreeId, tabId)
+      const tab = (store.unifiedTabsByWorktree[worktreeId] ?? []).find(
+        (item) => item.id === localTabId
+      )
+      const browserTarget = resolveBrowserSessionTabTarget(store, worktreeId, localTabId)
       // Why: chat-completion focus is a courtesy reveal, not navigation — never yank the user
       // back into a workspace they deliberately left. A notification click is the opposite: the
       // user asked for this workspace, and the activateWorktree that precedes it is async, so
diff --git a/src/renderer/src/hooks/ipc-events/workspace-shortcut-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/workspace-shortcut-ipc-bridge.ts
index 9e78916fef3d..496f885ebbb5 100644
--- a/src/renderer/src/hooks/ipc-events/workspace-shortcut-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/workspace-shortcut-ipc-bridge.ts
@@ -93,11 +93,10 @@ export function registerWorkspaceShortcutIpcBridge(unsubs: (() => void)[]): void
       const visibleTargets = getVisibleWorktreeShortcutTargets()
       const target = visibleTargets[index]
       if (target) {
-        if (target.executionHostId) {
-          activateAndRevealWorkspace(target.id, { executionHostId: target.executionHostId })
-        } else {
-          activateAndRevealWorkspace(target.id)
-        }
+        activateAndRevealWorkspace(target.id, {
+          navigationIntent: 'user-open',
+          ...(target.executionHostId ? { executionHostId: target.executionHostId } : {})
+        })
       }
     })
   )
diff --git a/src/renderer/src/hooks/remote-workspace-session-merge-close-tombstones.test.ts b/src/renderer/src/hooks/remote-workspace-session-merge-close-tombstones.test.ts
index a1e82633f988..5fbdd00ffed5 100644
--- a/src/renderer/src/hooks/remote-workspace-session-merge-close-tombstones.test.ts
+++ b/src/renderer/src/hooks/remote-workspace-session-merge-close-tombstones.test.ts
@@ -33,32 +33,28 @@ function sessionState(overrides: Partial<WorkspaceSessionState> = {}): Workspace
   } as WorkspaceSessionState
 }
 
+// Records ride on `current` here for brevity; the caller passes the renderer's read-only mirror.
 function merge(
   current: WorkspaceSessionState,
   remote: WorkspaceSessionState,
-  liveTabs: AppState['tabsByWorktree'] = {},
-  remoteRevision?: number
+  liveTabs: AppState['tabsByWorktree'] = {}
 ): WorkspaceSessionState {
   return mergeDirectSshRemoteWorkspaceSession(
-    current,
+    { ...current, closedTerminalTabTombstonesByTabId: undefined },
     remote,
     new Set([WORKTREE]),
     liveTabs,
     new Set(),
     undefined,
-    remoteRevision
+    current.closedTerminalTabTombstonesByTabId
   )
 }
 
-function tombstone(tabId: string, ackRevision?: number): WorkspaceSessionState {
+function tombstone(tabId: string): WorkspaceSessionState {
   return sessionState({
     tabsByWorktree: { [WORKTREE]: [] },
     closedTerminalTabTombstonesByTabId: {
-      [tabId]: {
-        closedAt: Date.now(),
-        worktreeId: WORKTREE,
-        ...(ackRevision ? { ackRevision } : {})
-      }
+      [tabId]: { closedAt: Date.now(), worktreeId: WORKTREE }
     }
   })
 }
@@ -77,7 +73,7 @@ describe('direct-SSH pull merge: closed-tab tombstones', () => {
       remoteSessionIdsByTabId: { toString: 'session-1' }
     })
 
-    const merged = merge(current, remote, {}, 2)
+    const merged = merge(current, remote, {})
 
     expect(merged.tabsByWorktree[WORKTREE]?.map((tab) => tab.id)).toEqual(['toString'])
     expect(Object.hasOwn(merged.terminalLayoutsByTabId, 'toString')).toBe(true)
@@ -96,7 +92,7 @@ describe('direct-SSH pull merge: closed-tab tombstones', () => {
     })
     const remote = sessionState({ tabsByWorktree: { [WORKTREE]: [terminalTab('tab-x')] } })
 
-    const merged = merge(current, remote, {}, 2)
+    const merged = merge(current, remote, {})
 
     expect(merged.tabsByWorktree[WORKTREE]?.map((tab) => tab.id)).toEqual(['tab-x'])
   })
@@ -109,12 +105,11 @@ describe('direct-SSH pull merge: closed-tab tombstones', () => {
       remoteSessionIdsByTabId: { ghost: 'pty-1' }
     })
 
-    const merged = merge(tombstone('ghost'), remote, { [WORKTREE]: [] }, 3)
+    const merged = merge(tombstone('ghost'), remote, { [WORKTREE]: [] })
 
     expect(merged.tabsByWorktree[WORKTREE]).toEqual([])
     expect(merged.terminalLayoutsByTabId.ghost).toBeUndefined()
     expect(merged.remoteSessionIdsByTabId?.ghost).toBeUndefined()
-    expect(merged.closedTerminalTabTombstonesByTabId?.ghost).toBeDefined()
   })
 
   it('does not re-add a tombstoned tab through the host-unknown branch', () => {
@@ -127,7 +122,7 @@ describe('direct-SSH pull merge: closed-tab tombstones', () => {
     })
     const remote = sessionState({ tabsByWorktree: { [WORKTREE]: [] } })
 
-    const merged = merge(current, remote, {}, 3)
+    const merged = merge(current, remote, {})
 
     expect(merged.tabsByWorktree[WORKTREE]).toEqual([])
   })
@@ -143,7 +138,7 @@ describe('direct-SSH pull merge: closed-tab tombstones', () => {
       activeTabIdByWorktree: { [WORKTREE]: 'ghost' }
     })
 
-    const merged = merge(tombstone('ghost'), remote, { [WORKTREE]: [] }, 3)
+    const merged = merge(tombstone('ghost'), remote, { [WORKTREE]: [] })
 
     expect(merged.tabsByWorktree[WORKTREE].map((tab) => tab.id)).toEqual(['survivor'])
   })
@@ -156,37 +151,20 @@ describe('direct-SSH pull merge: closed-tab tombstones', () => {
     })
     const remote = sessionState({ tabsByWorktree: { [WORKTREE]: [live] } })
 
-    const merged = merge(current, remote, { [WORKTREE]: [live] }, 3)
+    const merged = merge(current, remote, { [WORKTREE]: [live] })
 
     expect(merged.tabsByWorktree[WORKTREE].map((tab) => tab.id)).toEqual(['live'])
   })
 
-  it('leaves a tab alone when no tombstone names it', () => {
-    // The pre-existing absence-is-not-closed trade, restated: a host that still lists a tab closed
-    // on some other client keeps it here, because absence is all this merge would have to go on.
-    const agent = terminalTab('agent')
-    const closedElsewhere = terminalTab('closed-elsewhere')
-    const current = sessionState({ tabsByWorktree: { [WORKTREE]: [agent, closedElsewhere] } })
-    const remote = sessionState({ tabsByWorktree: { [WORKTREE]: [agent] } })
-
-    const merged = merge(current, remote, { [WORKTREE]: [agent, closedElsewhere] }, 3)
-
-    expect(merged.tabsByWorktree[WORKTREE].map((tab) => tab.id)).toContain('closed-elsewhere')
-  })
-
-  it('retires the tombstone once a newer snapshot stops listing the tab', () => {
-    const remote = sessionState({ tabsByWorktree: { [WORKTREE]: [] } })
-
-    const merged = merge(tombstone('ghost', 3), remote, { [WORKTREE]: [] }, 4)
+  it('neither retires nor writes back a record once the host stops listing the tab', () => {
+    // Main alone writes records; an acknowledgement used to delete them here, which made a workspace
+    // the user emptied read as never initialized as soon as the host caught up.
+    const current = tombstone('ghost')
+    const merged = merge(current, sessionState({ tabsByWorktree: { [WORKTREE]: [] } }), {
+      [WORKTREE]: []
+    })
 
     expect(merged.closedTerminalTabTombstonesByTabId).toBeUndefined()
-  })
-
-  it('keeps the tombstone when the snapshot omits the worktree entirely', () => {
-    // A snapshot that says nothing about the worktree — including one whose path never resolved —
-    // is not evidence the host saw the close.
-    const merged = merge(tombstone('ghost', 3), sessionState(), {}, 4)
-
-    expect(merged.closedTerminalTabTombstonesByTabId?.ghost).toBeDefined()
+    expect(current.closedTerminalTabTombstonesByTabId?.ghost).toBeDefined()
   })
 })
diff --git a/src/renderer/src/hooks/remote-workspace-session-merge-closed-terminal-tombstone.test.ts b/src/renderer/src/hooks/remote-workspace-session-merge-closed-terminal-tombstone.test.ts
index 3764181e71c1..ff817913da43 100644
--- a/src/renderer/src/hooks/remote-workspace-session-merge-closed-terminal-tombstone.test.ts
+++ b/src/renderer/src/hooks/remote-workspace-session-merge-closed-terminal-tombstone.test.ts
@@ -15,9 +15,10 @@ import { useAppStore } from '@/store'
  * The closed-last-terminal tombstone across a direct-SSH reconnect, end to end.
  *
  * The unit-level rule lives in remote-workspace-session-merge-local-survival.test.ts; this asserts
- * what that rule is FOR. `Object.hasOwn(tabsByWorktree, worktreeId)` has to keep meaning one thing
- * — the merge dropping the key turned "the user closed the last terminal" into "never
- * initialized", and the seeding pass then handed the terminal back on every reconnect.
+ * what that rule is FOR. An empty row plus a close record has to keep meaning one thing — the
+ * merge dropping the key, or the re-hydration dropping the record, turns "the user closed the last
+ * terminal" into "never initialized", and the seeding pass then hands the terminal back on every
+ * reconnect.
  */
 const initialAppStoreState = useAppStore.getState()
 
@@ -26,9 +27,13 @@ afterEach(() => {
   useAppStore.setState(initialAppStoreState, true)
 })
 
-/** The state a workspace lands in once its last terminal is closed: an explicit empty row. */
+/** The state a workspace lands in once its last terminal is closed: an explicit empty row, and
+ *  the close record the renderer mirrors from main. */
 function seedClosedLastTerminal(worktreeId: string): void {
-  useAppStore.setState({ tabsByWorktree: { [worktreeId]: [] } })
+  useAppStore.setState({
+    tabsByWorktree: { [worktreeId]: [] },
+    closedTerminalTabTombstonesByTabId: { closed: { closedAt: Date.now(), worktreeId } }
+  })
   expect(useAppStore.getState().reconcileWorktreeTabModel(worktreeId).renderableTabCount).toBe(0)
 }
 
diff --git a/src/renderer/src/hooks/remote-workspace-session-merge.ts b/src/renderer/src/hooks/remote-workspace-session-merge.ts
index 964c942e0ad8..f8bbb0d5ab16 100644
--- a/src/renderer/src/hooks/remote-workspace-session-merge.ts
+++ b/src/renderer/src/hooks/remote-workspace-session-merge.ts
@@ -1,6 +1,9 @@
 import type { TerminalTab } from '../../../shared/terminal-tab-types'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
-import { reconcileClosedTerminalTabTombstones } from '../../../shared/closed-terminal-tab-tombstones'
+import {
+  hasClosedTerminalTabRecord,
+  type ClosedTerminalTabTombstonesByTabId
+} from '../../../shared/closed-terminal-tab-tombstones'
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import { worktreeWorkspaceKey } from '../../../shared/workspace-scope'
 import { splitWorktreeId } from '../../../shared/worktree/id'
@@ -33,7 +36,7 @@ export function mergeDirectSshRemoteWorkspaceSession(
   liveTabsByWorktree: AppState['tabsByWorktree'],
   preserveLocalTerminalTabIds: ReadonlySet<string>,
   replaceExecutionHostId?: ExecutionHostId,
-  remoteRevision?: number,
+  closedTabRecords?: ClosedTerminalTabTombstonesByTabId,
   preserveLocalLayoutTabIds: ReadonlySet<string> = new Set()
 ): WorkspaceSessionState {
   // Live tabs across the worktrees this snapshot replaces. Close-suppression consults it so a tab
@@ -45,7 +48,7 @@ export function mergeDirectSshRemoteWorkspaceSession(
   //      (terminal-tab-close.ts), so a tombstoned id is not live anywhere;
   //   2. isSuppressedByClose matches the tombstone's own worktreeId, so it cannot reach another
   //      workspace's tab even if an id somehow recurred;
-  //   3. only closeReason === 'user' ever writes a tombstone.
+  //   3. only a tab close writes a record; nothing infers one from a tab's absence.
   // A final sweep of suppression over the assembled tabsByWorktree — including worktrees
   // omitTargetWorktrees passes through verbatim — is still deliberately absent.
   const currentTabsById = new Map(
@@ -56,10 +59,10 @@ export function mergeDirectSshRemoteWorkspaceSession(
   const locallyPreservedTabIds = new Set<string>()
   const localTabsFor = (worktreeId: string): TerminalTab[] =>
     liveTabsByWorktree[worktreeId] ?? current.tabsByWorktree[worktreeId] ?? []
-  // Why presence and not length: an explicit empty row is the record that the user closed the last
-  // terminal (initial-terminal.ts), and localTabsFor cannot tell it from an absent one. Admitting
-  // only non-empty rows dropped the key, which reads downstream as "never initialized" and seeds a
-  // fresh terminal on every reconnect.
+  // Why presence and not length: an explicit empty row, with a close record for the worktree, is how
+  // a workspace the user emptied reads (initial-terminal.ts), and localTabsFor cannot tell it from an
+  // absent one. Admitting only non-empty rows dropped the key, which reads downstream as "never
+  // initialized" and seeds a fresh terminal on every reconnect.
   const hasLocalTabsRow = (worktreeId: string): boolean =>
     Object.hasOwn(liveTabsByWorktree, worktreeId) ||
     Object.hasOwn(current.tabsByWorktree, worktreeId)
@@ -116,36 +119,13 @@ export function mergeDirectSshRemoteWorkspaceSession(
       .filter(([tabId]) => remoteKnownTabIds.has(tabId))
       .map(([, sessionId]) => sessionId)
   )
-  // The other half of the trade below. Absence still cannot say "closed", so this says it instead:
-  // a tab THIS client watched the user close, whose close never reached the host. Only ids the user
-  // closed are ever in here, and only until the host's own snapshot stops listing them.
-  const closedTerminalTabTombstonesByTabId = reconcileClosedTerminalTabTombstones({
-    tombstones: current.closedTerminalTabTombstonesByTabId,
-    acknowledgedWorktreeIds: new Set(
-      [...replaceWorktreeIds].filter((worktreeId) =>
-        Object.hasOwn(remote.tabsByWorktree, worktreeId)
-      )
-    ),
-    hostKnownTabIds: remoteKnownTabIds,
-    hostRevision: remoteRevision,
-    now: Date.now()
-  })
-  // Why Object.hasOwn and not `in`: the map is a plain object from Object.fromEntries, so `in`
-  // answers true for every Object.prototype key on an EMPTY map — a host tab whose id is
-  // `toString` would be filtered, blocked from the host-unknown branch, and stripped of its layout
-  // and session id. Tab ids are validated only as non-empty and colon-free, and createTab honours
-  // caller-supplied id hints, so that id is reachable. This is the one place either direction could
-  // delete a tab the user never closed.
-  // Why the worktree comparison: the tombstone already carries the worktree it was closed in, so
-  // scoping on it makes "this suppression cannot reach another workspace's tab" structural rather
-  // than a property of where the call sites happen to sit.
-  // Why a live local tab still overrides its own tombstone: an id that is live here means the
-  // tombstone is stale (a close undone before it persisted), not a revival. Deleting a live pane is
-  // the one outcome this whole function exists to avoid.
+  // The other half of the trade below. Absence still cannot say "closed", so main's close record
+  // says it instead. Read only here: main alone writes records, and nothing acknowledges them away.
+  // Scoped to the record's own worktree, so suppression cannot reach another workspace's tab.
+  // Why a live local tab still overrides its record: an id that is live here means the record is
+  // stale, not a revival. Deleting a live pane is the one outcome this function exists to avoid.
   const isSuppressedByClose = (tabId: string, worktreeId: string): boolean =>
-    Object.hasOwn(closedTerminalTabTombstonesByTabId, tabId) &&
-    closedTerminalTabTombstonesByTabId[tabId]?.worktreeId === worktreeId &&
-    !currentTabsById.has(tabId)
+    hasClosedTerminalTabRecord(closedTabRecords, tabId, worktreeId) && !currentTabsById.has(tabId)
   // Ids this merge actually suppressed, recorded as it walks the worktrees. The layout and
   // session-id sweeps below have no worktree in scope, so they consult decisions already made
   // rather than re-deriving one without the scope that makes it safe.
@@ -271,10 +251,9 @@ export function mergeDirectSshRemoteWorkspaceSession(
   // the workspace or its path did not resolve to a local id, and taking that literally drops the
   // user onto the home screen while their terminals keep running. So it is only overridden when the
   // workspace they are standing in demonstrably still exists in the merged result.
-  // Why presence and not length, the same reading `hasLocalTabsRow` above already gives: an
-  // explicit empty row is the record that the user closed the last terminal, and a workspace they
-  // emptied still exists in the merged result. Counting rows sent them to the home screen for
-  // having closed their last tab.
+  // Why presence and not length, the same reading `hasLocalTabsRow` above already gives: a
+  // workspace the user emptied keeps an explicit empty row, so it still exists in the merged
+  // result. Counting rows sent them to the home screen for having closed their last tab.
   const localActiveWorkspaceSurvives =
     current.activeWorktreeId != null &&
     replaceWorktreeIds.has(current.activeWorktreeId) &&
@@ -348,11 +327,7 @@ export function mergeDirectSshRemoteWorkspaceSession(
       // tabs. Removal is the worktree-teardown path's job, not a reconnect's.
       ...current.defaultTerminalTabsAppliedByWorktreeId,
       ...remote.defaultTerminalTabsAppliedByWorktreeId
-    },
-    closedTerminalTabTombstonesByTabId:
-      Object.keys(closedTerminalTabTombstonesByTabId).length > 0
-        ? closedTerminalTabTombstonesByTabId
-        : undefined
+    }
   }
 }
 
diff --git a/src/renderer/src/hooks/remote-workspace-snapshot-apply-deferred-session-write.test.ts b/src/renderer/src/hooks/remote-workspace-snapshot-apply-deferred-session-write.test.ts
index 00b2e8b0c263..020d7d43c923 100644
--- a/src/renderer/src/hooks/remote-workspace-snapshot-apply-deferred-session-write.test.ts
+++ b/src/renderer/src/hooks/remote-workspace-snapshot-apply-deferred-session-write.test.ts
@@ -213,7 +213,6 @@ describe('session writes deferred by a direct-SSH apply', () => {
 
       expect(persist, 'the close made during the apply never reached disk').toHaveBeenCalledTimes(1)
       const patch = persist.mock.calls[0][0].patch
-      expect(patch.closedTerminalTabTombstonesByTabId?.['tab-b']?.worktreeId).toBe(WORKTREE_B)
       expect(patch.tabsByWorktree?.[WORKTREE_B]).toEqual([])
       expect(patch.tabsByWorktree?.[WORKTREE_A]).toHaveLength(1)
     } finally {
@@ -321,9 +320,7 @@ describe('session writes deferred by a direct-SSH apply', () => {
       vi.advanceTimersByTime(5_200)
 
       expect(persist, 'a clock step back stranded the deferred write').toHaveBeenCalledTimes(1)
-      expect(
-        persist.mock.calls[0][0].patch.closedTerminalTabTombstonesByTabId?.['tab-b']
-      ).toBeDefined()
+      expect(persist.mock.calls[0][0].patch.tabsByWorktree?.[WORKTREE_B]).toEqual([])
     } finally {
       cleanup()
     }
diff --git a/src/renderer/src/hooks/remote-workspace-snapshot-apply.ts b/src/renderer/src/hooks/remote-workspace-snapshot-apply.ts
index e304ff175972..5ca493251ec0 100644
--- a/src/renderer/src/hooks/remote-workspace-snapshot-apply.ts
+++ b/src/renderer/src/hooks/remote-workspace-snapshot-apply.ts
@@ -182,7 +182,7 @@ export async function applyDirectSshRemoteWorkspaceSnapshot({
     state.tabsByWorktree,
     currentRecoveryTabIds(state, authority, worktreeIds),
     toSshExecutionHostId(authority.targetId),
-    snapshot.revision,
+    state.closedTerminalTabTombstonesByTabId,
     new Set(
       [...worktreeIds].flatMap((id) =>
         (state.tabsByWorktree[id] ?? [])
diff --git a/src/renderer/src/hooks/runtime-client-events-sync-ownership.test.ts b/src/renderer/src/hooks/runtime-client-events-sync-ownership.test.ts
new file mode 100644
index 000000000000..8383c8637811
--- /dev/null
+++ b/src/renderer/src/hooks/runtime-client-events-sync-ownership.test.ts
@@ -0,0 +1,297 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { RuntimeClientEvent } from '../../../shared/runtime-client-events'
+import {
+  createRuntimeClientEventsSync,
+  type RuntimeClientEventSubscriptionHandle
+} from './runtime-client-events-sync'
+
+function makeHarness() {
+  let desired = ['A', 'B']
+  let key = 'A:1'
+  const records: {
+    environmentId: string
+    emit: () => void
+    resolve: () => void
+    reject: () => void
+    unsubscribe: ReturnType<typeof vi.fn>
+  }[] = []
+  const onEvent = vi.fn()
+  const manager = createRuntimeClientEventsSync({
+    getDesiredEnvironmentIds: () => desired,
+    getSubscriptionKey: (id) => (id === 'A' ? key : id),
+    subscribe: (environmentId, notify) => {
+      const pending = Promise.withResolvers<RuntimeClientEventSubscriptionHandle>()
+      const unsubscribe = vi.fn()
+      const event: RuntimeClientEvent = { type: 'reposChanged' }
+      records.push({
+        environmentId,
+        emit: () => notify(event),
+        resolve: () => pending.resolve({ unsubscribe }),
+        reject: () => pending.reject(new Error('setup failed')),
+        unsubscribe
+      })
+      notify(event)
+      return pending.promise
+    },
+    onEvent
+  })
+  return {
+    manager,
+    onEvent,
+    records,
+    setDesired: (next: string[]) => {
+      desired = next
+    },
+    rekey: () => {
+      key = 'A:2'
+    }
+  }
+}
+
+async function settle(): Promise<void> {
+  for (let index = 0; index < 4; index += 1) {
+    await Promise.resolve()
+  }
+}
+
+describe('runtime event subscription ownership', () => {
+  it.each([{ desired: ['A'] }, { desired: ['A', 'B'] }])(
+    'keeps the nested desired set after an initial frame replaces $desired',
+    async ({ desired }) => {
+      const h = makeHarness()
+      h.setDesired(desired)
+      h.onEvent.mockImplementation((id: string) => {
+        if (id === 'A') {
+          h.setDesired(['C'])
+          h.manager.sync()
+        }
+      })
+      h.manager.sync()
+      expect(h.records.map(({ environmentId }) => environmentId)).toEqual(['A', 'C'])
+      h.onEvent.mockClear()
+      h.records.forEach((record) => record.emit())
+      expect(h.onEvent.mock.calls.map(([id]) => id)).toEqual(['C'])
+      h.records.forEach((record) => record.resolve())
+      await settle()
+      expect(h.records[0].unsubscribe).toHaveBeenCalledOnce()
+      expect(h.records[1].unsubscribe).not.toHaveBeenCalled()
+      h.manager.sync()
+      expect(h.records).toHaveLength(2)
+      h.manager.stop()
+      expect(h.records[1].unsubscribe).toHaveBeenCalledOnce()
+    }
+  )
+
+  it('keeps a retained owner when unsubscribe replaces an outer empty desired set', async () => {
+    const h = makeHarness()
+    h.manager.sync()
+    h.records.forEach((record) => record.resolve())
+    await settle()
+    h.records[0].unsubscribe.mockImplementation(() => {
+      h.setDesired(['B', 'C'])
+      h.manager.sync()
+    })
+    h.setDesired([])
+    h.manager.sync()
+    expect(h.records[0].unsubscribe).toHaveBeenCalledOnce()
+    expect(h.records[1].unsubscribe).not.toHaveBeenCalled()
+    h.onEvent.mockClear()
+    h.records.forEach((record) => record.emit())
+    expect(h.onEvent.mock.calls.map(([id]) => id)).toEqual(['B', 'C'])
+    h.records[2].resolve()
+    await settle()
+    expect(h.records[2].unsubscribe).not.toHaveBeenCalled()
+    h.manager.stop()
+    h.records.forEach((record) => expect(record.unsubscribe).toHaveBeenCalledOnce())
+  })
+
+  it('detaches stopped subscriptions before unsubscribe starts a new owner', async () => {
+    const h = makeHarness()
+    h.manager.sync()
+    h.records.forEach((record) => record.resolve())
+    await settle()
+    h.records[0].unsubscribe.mockImplementation(() => {
+      h.setDesired(['C'])
+      h.manager.sync()
+    })
+    h.manager.stop()
+    expect(h.records[0].unsubscribe).toHaveBeenCalledOnce()
+    expect(h.records[1].unsubscribe).toHaveBeenCalledOnce()
+    h.onEvent.mockClear()
+    h.records.forEach((record) => record.emit())
+    expect(h.onEvent.mock.calls.map(([id]) => id)).toEqual(['C'])
+    h.records[2].resolve()
+    await settle()
+    expect(h.records[2].unsubscribe).not.toHaveBeenCalled()
+    h.manager.stop()
+    expect(h.records[2].unsubscribe).toHaveBeenCalledOnce()
+  })
+
+  it('preserves a new owner started synchronously by the last initial frame', async () => {
+    let desired = ['A']
+    const records: {
+      emit: () => void
+      setup: ReturnType<typeof Promise.withResolvers<RuntimeClientEventSubscriptionHandle>>
+      unsubscribe: ReturnType<typeof vi.fn<() => void>>
+    }[] = []
+    const onEvent = vi.fn((id: string) => {
+      if (id === 'A') {
+        manager.stop()
+        desired = ['B']
+        manager.sync()
+      }
+    })
+    const manager = createRuntimeClientEventsSync({
+      getDesiredEnvironmentIds: () => desired,
+      subscribe: (_id, notify) => {
+        const setup = Promise.withResolvers<RuntimeClientEventSubscriptionHandle>()
+        const unsubscribe = vi.fn()
+        const emit = (): void => notify({ type: 'reposChanged' })
+        records.push({ emit, setup, unsubscribe })
+        emit()
+        return setup.promise
+      },
+      onEvent
+    })
+    manager.sync()
+    onEvent.mockClear()
+    records[0].emit()
+    records[1].emit()
+    expect(onEvent.mock.calls.map(([id]) => id)).toEqual(['B'])
+    records.forEach(({ setup, unsubscribe }) => setup.resolve({ unsubscribe }))
+    await settle()
+    expect(records[0].unsubscribe).toHaveBeenCalledOnce()
+    expect(records[1].unsubscribe).not.toHaveBeenCalled()
+    manager.stop()
+  })
+
+  it('stops starting further subscriptions when an initial frame synchronously stops the owner', async () => {
+    const pending = Promise.withResolvers<RuntimeClientEventSubscriptionHandle>()
+    const unsubscribe = vi.fn()
+    const subscribe = vi.fn((_id: string, notify: (event: RuntimeClientEvent) => void) => {
+      notify({ type: 'reposChanged' })
+      return pending.promise
+    })
+    const manager = createRuntimeClientEventsSync({
+      getDesiredEnvironmentIds: () => ['A', 'B'],
+      subscribe,
+      onEvent: () => manager.stop()
+    })
+    manager.sync()
+    expect(subscribe).toHaveBeenCalledOnce()
+    pending.resolve({ unsubscribe })
+    await settle()
+    expect(unsubscribe).toHaveBeenCalledOnce()
+  })
+
+  it('admits synchronous initial frames, pending frames and settled live frames', async () => {
+    const h = makeHarness()
+    h.manager.sync()
+    expect(h.onEvent).toHaveBeenCalledTimes(2)
+    h.records[0].emit()
+    h.records[0].resolve()
+    await settle()
+    h.records[0].emit()
+    expect(h.onEvent).toHaveBeenCalledTimes(4)
+    h.manager.stop()
+  })
+
+  it('drops pending and settled callbacks after stop and releases the late handle', async () => {
+    const h = makeHarness()
+    h.manager.sync()
+    h.records[1].resolve()
+    await settle()
+    h.manager.stop()
+    h.onEvent.mockClear()
+    h.records.forEach((record) => record.emit())
+    expect(h.onEvent).not.toHaveBeenCalled()
+    h.records[0].resolve()
+    await settle()
+    h.records.forEach((record) => expect(record.unsubscribe).toHaveBeenCalledOnce())
+  })
+
+  it.each([false, true])(
+    'drops a replaced owner while another host stays live (settled=%s)',
+    async (settled) => {
+      const h = makeHarness()
+      h.manager.sync()
+      h.records[1].resolve()
+      if (settled) {
+        h.records[0].resolve()
+      }
+      await settle()
+      h.setDesired(['B'])
+      h.manager.sync()
+      h.setDesired(['A', 'B'])
+      h.manager.sync()
+      h.onEvent.mockClear()
+      h.records[0].emit()
+      h.records[1].emit()
+      h.records[2].emit()
+      expect(h.onEvent.mock.calls.map(([id]) => id)).toEqual(['B', 'A'])
+      h.records[0].resolve()
+      h.records[2].resolve()
+      await settle()
+      expect(h.records[0].unsubscribe).toHaveBeenCalledOnce()
+      expect(h.records[2].unsubscribe).not.toHaveBeenCalled()
+      h.manager.stop()
+    }
+  )
+
+  it('rejects callbacks from the old key and admits its replacement before setup completes', async () => {
+    const h = makeHarness()
+    h.manager.sync()
+    h.rekey()
+    h.manager.sync()
+    h.onEvent.mockClear()
+    h.records[0].emit()
+    h.records[2].emit()
+    expect(h.onEvent).toHaveBeenCalledTimes(1)
+    h.records[0].resolve()
+    h.records[2].resolve()
+    await settle()
+    expect(h.records[0].unsubscribe).toHaveBeenCalledOnce()
+    h.manager.stop()
+  })
+
+  it('permits restarting after stop without reviving the old callback', () => {
+    const h = makeHarness()
+    h.manager.sync()
+    h.manager.stop()
+    h.manager.sync()
+    h.onEvent.mockClear()
+    h.records[0].emit()
+    h.records[2].emit()
+    expect(h.onEvent).toHaveBeenCalledTimes(1)
+    h.manager.stop()
+  })
+
+  it('drops callbacks from a rejected setup while retry is waiting', async () => {
+    const h = makeHarness()
+    const warning = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    try {
+      h.manager.sync()
+      h.records[0].reject()
+      await settle()
+      h.onEvent.mockClear()
+      h.records[0].emit()
+      expect(h.onEvent).not.toHaveBeenCalled()
+    } finally {
+      h.manager.stop()
+      warning.mockRestore()
+    }
+  })
+
+  it('revokes an owner before its unsubscribe callback can reenter delivery', async () => {
+    const h = makeHarness()
+    h.manager.sync()
+    h.records[0].resolve()
+    await settle()
+    h.records[0].unsubscribe.mockImplementation(h.records[0].emit)
+    h.onEvent.mockClear()
+    h.setDesired(['B'])
+    h.manager.sync()
+    expect(h.onEvent).not.toHaveBeenCalled()
+    h.manager.stop()
+  })
+})
diff --git a/src/renderer/src/hooks/runtime-client-events-sync.ts b/src/renderer/src/hooks/runtime-client-events-sync.ts
index 6388c35e3aca..ae44fe789071 100644
--- a/src/renderer/src/hooks/runtime-client-events-sync.ts
+++ b/src/renderer/src/hooks/runtime-client-events-sync.ts
@@ -13,7 +13,9 @@ export type RuntimeClientEventsSyncDeps = {
   subscribe: (
     environmentId: string,
     onEvent: (event: RuntimeClientEvent) => void,
-    onError: (error: unknown) => void
+    onError: (error: unknown) => void,
+    /** Use for subscription-side recovery that runs before event delivery. */
+    isCurrent: () => boolean
   ) => Promise<RuntimeClientEventSubscriptionHandle>
   onEvent: (environmentId: string, event: RuntimeClientEvent) => void
   /** Base retry delay; doubles per consecutive failure up to retryMaxDelayMs. */
@@ -49,8 +51,12 @@ export type RuntimeClientEventsSync = {
 export function createRuntimeClientEventsSync(
   deps: RuntimeClientEventsSyncDeps
 ): RuntimeClientEventsSync {
-  const subscriptions = new Map<string, { key: string; unsubscribe: () => void }>()
-  const pending = new Map<string, { key: string; generation: number }>()
+  type SubscriptionToken = { key: string; generation: number }
+  const subscriptions = new Map<
+    string,
+    { key: string; token: SubscriptionToken; unsubscribe: () => void }
+  >()
+  const pending = new Map<string, SubscriptionToken>()
   const retryTimers = new Map<string, ReturnType<typeof setTimeout>>()
   const consecutiveFailures = new Map<string, { key: string; count: number }>()
   const retryDelayMs = deps.retryDelayMs ?? 1_000
@@ -58,6 +64,7 @@ export function createRuntimeClientEventsSync(
   const random = deps.random ?? Math.random
   const getSubscriptionKey = deps.getSubscriptionKey ?? ((environmentId: string) => environmentId)
   let generation = 0
+  let syncInvocation = 0
 
   const clearRetryTimer = (environmentId: string): void => {
     const retryTimer = retryTimers.get(environmentId)
@@ -109,9 +116,7 @@ export function createRuntimeClientEventsSync(
 
   const stop = (): void => {
     generation += 1
-    for (const subscription of subscriptions.values()) {
-      subscription.unsubscribe()
-    }
+    const stoppedSubscriptions = [...subscriptions.values()]
     subscriptions.clear()
     pending.clear()
     for (const retryTimer of retryTimers.values()) {
@@ -119,9 +124,14 @@ export function createRuntimeClientEventsSync(
     }
     retryTimers.clear()
     consecutiveFailures.clear()
+    for (const subscription of stoppedSubscriptions) {
+      subscription.unsubscribe()
+    }
   }
 
   const sync = (): void => {
+    const syncGeneration = generation
+    const currentSyncInvocation = ++syncInvocation
     const desiredIds = new Set(deps.getDesiredEnvironmentIds())
     for (const environmentId of retryTimers.keys()) {
       if (desiredIds.has(environmentId)) {
@@ -136,14 +146,20 @@ export function createRuntimeClientEventsSync(
     }
 
     for (const [environmentId, subscription] of subscriptions) {
+      if (syncGeneration !== generation || currentSyncInvocation !== syncInvocation) {
+        return
+      }
       if (desiredIds.has(environmentId) && subscription.key === getSubscriptionKey(environmentId)) {
         continue
       }
-      subscription.unsubscribe()
       subscriptions.delete(environmentId)
+      subscription.unsubscribe()
     }
 
     for (const environmentId of desiredIds) {
+      if (syncGeneration !== generation || currentSyncInvocation !== syncInvocation) {
+        return
+      }
       const subscriptionKey = getSubscriptionKey(environmentId)
       const pendingSubscription = pending.get(environmentId)
       if (pendingSubscription && pendingSubscription.key !== subscriptionKey) {
@@ -159,13 +175,23 @@ export function createRuntimeClientEventsSync(
       const subscribeGeneration = generation
       const pendingSubscriptionToken = { key: subscriptionKey, generation: subscribeGeneration }
       pending.set(environmentId, pendingSubscriptionToken)
+      const isCurrent = (): boolean =>
+        subscribeGeneration === generation &&
+        (pending.get(environmentId) === pendingSubscriptionToken ||
+          subscriptions.get(environmentId)?.token === pendingSubscriptionToken)
       void deps
         .subscribe(
           environmentId,
-          (event) => deps.onEvent(environmentId, event),
+          (event) => {
+            // Initial frames arrive before setup settles; only the owning attempt may deliver.
+            if (isCurrent()) {
+              deps.onEvent(environmentId, event)
+            }
+          },
           (error) => {
             console.warn('[runtime-client-events] subscription error:', error)
-          }
+          },
+          isCurrent
         )
         .then((subscription) => {
           const isCurrentPending = pending.get(environmentId) === pendingSubscriptionToken
@@ -192,6 +218,7 @@ export function createRuntimeClientEventsSync(
           consecutiveFailures.delete(environmentId)
           subscriptions.set(environmentId, {
             key: subscriptionKey,
+            token: pendingSubscriptionToken,
             unsubscribe: subscription.unsubscribe
           })
         })
@@ -224,6 +251,9 @@ export function createRuntimeClientEventsSync(
         })
     }
 
+    if (syncGeneration !== generation || currentSyncInvocation !== syncInvocation) {
+      return
+    }
     for (const [environmentId, pendingSubscription] of pending) {
       if (
         desiredIds.has(environmentId) &&
diff --git a/src/renderer/src/hooks/settings-navigation-capability-sections.ts b/src/renderer/src/hooks/settings-navigation-capability-sections.ts
index b207682844fd..72ef10dff295 100644
--- a/src/renderer/src/hooks/settings-navigation-capability-sections.ts
+++ b/src/renderer/src/hooks/settings-navigation-capability-sections.ts
@@ -42,7 +42,8 @@ export function buildCapabilitySettingsSections({
       icon: Bot,
       searchEntries: getAgentsPaneSearchEntries({
         includeAgentAwake: !isWebClient,
-        includeAgentRuntime: isLocalWindowsHost
+        includeAgentRuntime: isLocalWindowsHost,
+        includeCodexTerminalServerIsolation: !isWebClient
       }),
       group: 'capabilities'
     },
diff --git a/src/renderer/src/hooks/use-delayed-status.ts b/src/renderer/src/hooks/use-delayed-status.ts
new file mode 100644
index 000000000000..c895107bb4ae
--- /dev/null
+++ b/src/renderer/src/hooks/use-delayed-status.ts
@@ -0,0 +1,17 @@
+import { useEffect, useState } from 'react'
+import { createDelayedStatus, type ShownStatus } from '@/lib/delayed-status'
+
+/**
+ * Returns `value` only once it has lasted past `showDelayMs`, then holds it for a
+ * minimum time, so a short status never flashes. `key` is what the status belongs
+ * to (for example a session); a new key drops it at once.
+ */
+export function useDelayedStatus<A>(key: string, value: A | null, showDelayMs: number): A | null {
+  const [shown, setShown] = useState<ShownStatus<A> | null>(null)
+  const [status] = useState(() => createDelayedStatus<A>(setShown, { showDelayMs }))
+  useEffect(() => () => status.dispose(), [status])
+  useEffect(() => {
+    status.update(key, value)
+  }, [status, key, value])
+  return shown?.key === key ? shown.value : null
+}
diff --git a/src/renderer/src/hooks/useComposerState-host-context-boundaries.test.ts b/src/renderer/src/hooks/useComposerState-host-context-boundaries.test.ts
index 764a033275fe..9d76c9f9a232 100644
--- a/src/renderer/src/hooks/useComposerState-host-context-boundaries.test.ts
+++ b/src/renderer/src/hooks/useComposerState-host-context-boundaries.test.ts
@@ -1,8 +1,5 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import {
-  canResolveFolderSmartGitHubSubmit,
   getInitialAutoManagedWorkspaceName,
   getInitialGitHubPrStartPointSelection,
   getMatchingLinkedTaskSourceContext,
@@ -11,54 +8,6 @@ import {
   resolveInitialWorkspaceRunSeed
 } from './useComposerState'
 
-function readComposerModule(fileName: string): string {
-  return readFileSync(join(__dirname, 'composer-state', fileName), 'utf8')
-}
-
-const COMPOSER_SOURCE = {
-  cardProps: readComposerModule('composer-card-props.ts'),
-  derived: readComposerModule('derived-composer-state.ts'),
-  folderSubmit: readComposerModule('folder-submit-orchestration.ts'),
-  fullCreation: readComposerModule('full-creation-execution.ts'),
-  fullCreationStartup: readComposerModule('full-creation-startup.ts'),
-  fullSubmitOrchestration: readComposerModule('full-submit-orchestration.ts'),
-  fullSubmitPreparation: readComposerModule('full-submit-preparation.ts'),
-  fullSubmitSourcePreparation: readComposerModule('full-submit-source-preparation.ts'),
-  githubProvider: readComposerModule('github-provider-selection.ts'),
-  githubSourceApplication: readComposerModule('github-source-application.ts'),
-  githubSubmit: readComposerModule('github-submit-resolution.ts'),
-  gitlabProvider: readComposerModule('gitlab-provider-selection.ts'),
-  hostRuntime: readComposerModule('host-runtime-effects.ts'),
-  initialTarget: readComposerModule('initial-target-state.ts'),
-  issueSource: readComposerModule('issue-source-actions.ts'),
-  linkedItemLookup: readComposerModule('linked-item-lookup-effects.ts'),
-  navigation: readComposerModule('composer-navigation-actions.ts'),
-  projectTarget: readComposerModule('project-target-actions.ts'),
-  providerRuntime: readComposerModule('provider-runtime-sync.ts'),
-  quickCreation: readComposerModule('quick-creation-execution.ts'),
-  quickSubmitAction: readComposerModule('quick-submit-action.ts'),
-  quickSubmitPreparation: readComposerModule('quick-submit-preparation.ts'),
-  quickSubmitSourcePreparation: readComposerModule('quick-submit-source-preparation.ts'),
-  runtimeTarget: readComposerModule('runtime-target-selection.ts'),
-  sourceContext: readComposerModule('source-context-state.ts'),
-  sourceIdentity: readComposerModule('source-identity-actions.ts'),
-  targetChange: readComposerModule('target-change-actions.ts'),
-  quickStartup: readComposerModule('quick-startup-plan.ts'),
-  workspaceIdentity: readComposerModule('workspace-identity-state.ts')
-} as const
-const RECIPE_OPTIONS_SOURCE = readFileSync(
-  join(__dirname, 'useEphemeralVmRecipeOptions.ts'),
-  'utf8'
-)
-
-function sourceBetween(source: string, startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start + startPattern.length)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
 describe('useComposerState host-context boundaries', () => {
   it('seeds TaskPage pull requests as submit-time PR start points', () => {
     const item = {
@@ -156,14 +105,6 @@ describe('useComposerState host-context boundaries', () => {
     ).toEqual({ workspaceName: 'title-derived-name', displayName: 'Title derived name' })
   })
 
-  it('requires pasted PR recovery to match the selected GitHub host', () => {
-    const recoverySection = COMPOSER_SOURCE.derived
-
-    expect(recoverySection).toContain('githubRepoIdentityKey(fromName.slug)')
-    expect(recoverySection).toContain('githubRepoIdentityKey(selectedRepoSlug)')
-    expect(recoverySection).not.toContain('fromName.slug.owner.toLowerCase()')
-  })
-
   it('auto-owns linked-item generated prefilled names', () => {
     expect(
       getInitialAutoManagedWorkspaceName({
@@ -179,112 +120,6 @@ describe('useComposerState host-context boundaries', () => {
     ).toBe('fix-workspace-name')
   })
 
-  it('resolves GitHub PR bases against the selected run repo, not the source item repo', () => {
-    const section = COMPOSER_SOURCE.githubProvider
-
-    expect(section).toContain('const runRepo = selectedRepo ??')
-    expect(section).toContain('resolveGitHubPrStartPointForRepo')
-    expect(section).toContain('repoId: runRepo.id')
-    expect(section).toContain('settings: itemRepoSettings')
-    expect(section).toContain('smartGitHubPrStartPointSelectionRef.current = startPointSelection')
-    expect(section).toContain(
-      'if (smartGitHubPrStartPointSelectionRef.current !== startPointSelection)'
-    )
-    expect(section).not.toContain('repoId: repoForItem.id')
-    expect(section).not.toContain('repo: repoForItem.id')
-  })
-
-  it('resolves GitLab MR bases against the selected run repo, not the source item repo', () => {
-    const section = COMPOSER_SOURCE.gitlabProvider
-
-    expect(section).toContain('const runRepo = selectedRepo ??')
-    expect(section).toContain('repoId: runRepo.id')
-    expect(section).toContain('getSettingsForRepoRuntimeOwner')
-    expect(section).toContain('worktree.resolveMrBase')
-    expect(section).toContain('repo: runRepo.id')
-    expect(section).not.toContain('repoId: repoForItem.id')
-    // Why (#6263): an unresolved MR base must surface a toast and clear stale
-    // state instead of silently dropping the worktree onto origin/master.
-    expect(section).toContain('toast.error(result.error)')
-    expect(section).toContain("'Failed to resolve MR base.'")
-    expect(section).toMatch(/\.catch\(\(error: unknown\) =>/)
-  })
-
-  it('clears only repo-scoped linked work items when the repo or project changes', () => {
-    // Why: Linear and Jira issues are workspace-scoped context — a repo or
-    // project switch must keep them attached. Jira used to be dropped because
-    // this path special-cased Linear only.
-    const repoChangeSection = COMPOSER_SOURCE.targetChange
-    expect(repoChangeSection).toContain(
-      '!shouldPreserveWorkspaceSourceOnRepoChange(linkedWorkItem)'
-    )
-
-    const folderSourceSection = COMPOSER_SOURCE.targetChange
-    expect(folderSourceSection).toContain('!shouldPreserveWorkspaceSourceOnRepoChange(current)')
-
-    // No switch path may gate the linked-item clear on a Linear-only predicate
-    // again. (isLinearLinkedWorkItem itself may still appear — it drives the
-    // separate Linear branch-name feature — but never the preservation decision.)
-    expect(COMPOSER_SOURCE.targetChange).not.toContain('if (!preserveLinearLinkedWorkItem)')
-  })
-
-  it('does not use local SSH gates for runtime-owned folder targets', () => {
-    const targetSection = COMPOSER_SOURCE.runtimeTarget
-    expect(targetSection).toContain("parsedFolderTargetHost?.kind === 'runtime'")
-    expect(targetSection).toContain('connectionId: folderTargetConnectionId')
-    expect(COMPOSER_SOURCE.runtimeTarget).not.toContain('folderSourceConnectionId')
-  })
-
-  it('routes folder target runtime ownership through detection, path status, and create', () => {
-    const targetSection = COMPOSER_SOURCE.runtimeTarget
-    expect(targetSection).toContain('folderTargetRuntimeEnvironmentId')
-    expect(targetSection).toContain("{ kind: 'runtime' as const")
-    expect(targetSection).toContain('useFolderWorkspaceComposerPathStatus(')
-    expect(targetSection).toContain('folderTargetRuntimeEnvironmentId')
-    expect(targetSection).toContain('useDetectedAgents(folderTargetAgentDetectionTarget)')
-
-    const submitSection = COMPOSER_SOURCE.folderSubmit
-    expect(submitSection).toContain('isRemote: folderTargetIsRemote')
-    expect(submitSection).toContain(
-      "launchSource: telemetrySource === 'onboarding' ? 'onboarding' : 'new_workspace_composer'"
-    )
-    expect(submitSection).toContain('runtimeEnvironmentId: folderTargetRuntimeEnvironmentId')
-  })
-
-  it('detects composer agents against the repo host: SSH, then runtime, then local (#7082)', () => {
-    // Why: a repo owned by a paired runtime must show the runtime's agents, not
-    // the local machine's. SSH stays first priority; runtime falls through before
-    // local so an SSH repo never double-detects. Regression guard for #7082.
-    const selectorSection = COMPOSER_SOURCE.workspaceIdentity
-    expect(selectorSection).toContain('if (isRemote) {')
-    expect(selectorSection).toContain('s.remoteDetectedAgentIds[connectionId]')
-    expect(selectorSection).toContain('if (runtimeEnvironmentId) {')
-    expect(selectorSection).toContain('s.runtimeDetectedAgentIds[runtimeEnvironmentId]')
-    expect(selectorSection).toContain('return s.detectedAgentIds')
-    // SSH branch is checked before the runtime branch.
-    expect(selectorSection.indexOf('if (isRemote) {')).toBeLessThan(
-      selectorSection.indexOf('if (runtimeEnvironmentId) {')
-    )
-
-    expect(COMPOSER_SOURCE.workspaceIdentity).toContain(
-      'const runtimeEnvironmentId = selectedRepoSettings?.activeRuntimeEnvironmentId?.trim() || null'
-    )
-
-    // Detection effect fans out to the same three hosts in the same order and
-    // re-runs when the runtime environment changes.
-    const detectSection = sourceBetween(
-      COMPOSER_SOURCE.hostRuntime,
-      'const detect = isRemote',
-      '// Per-repo: load yaml hooks'
-    )
-    expect(detectSection).toContain('ensureRemoteDetectedAgents(connectionId!)')
-    expect(detectSection).toContain('ensureRuntimeDetectedAgents(runtimeEnvironmentId)')
-    expect(detectSection).toContain('ensureDetectedAgents()')
-    expect(detectSection).toMatch(
-      /\}, \[\s*connectionId,\s*runtimeEnvironmentId,\s*isRemote,\s*selectedRepoSshStatus,\s*disabledTuiAgents/
-    )
-  })
-
   it('seeds initial workspace run target from the task source context', () => {
     expect(
       resolveInitialWorkspaceRunSeed({
@@ -316,299 +151,6 @@ describe('useComposerState host-context boundaries', () => {
       hostId: 'local',
       projectHostSetupId: 'setup-local'
     })
-
-    const section = COMPOSER_SOURCE.initialTarget
-
-    expect(section).toContain('resolveInitialWorkspaceRunSeed')
-    expect(section).toContain('initialTaskSourceContext')
-    expect(section).toContain('projectId: initialRunSeed.projectId')
-    expect(section).toContain('hostId: initialRunSeed.hostId')
-    expect(section).toContain('projectHostSetupId: initialRunSeed.projectHostSetupId')
-  })
-
-  it('resolves typed GitHub issue/PR input through the selected repo source context', () => {
-    expect(COMPOSER_SOURCE.sourceContext).toContain(
-      'const selectedRepoGitHubSourceContext = useMemo'
-    )
-
-    const directLookup = COMPOSER_SOURCE.linkedItemLookup
-    expect(directLookup).toContain('sourceContext: selectedRepoGitHubSourceContext')
-    expect(directLookup).toContain('lookupGitHubWorkItemByOwnerRepoForSource')
-    expect(directLookup).toContain('type: normalizedLinkQuery.directLink.type')
-
-    const submitLookup = COMPOSER_SOURCE.githubSubmit
-    expect(submitLookup).toContain('sourceContext:')
-    expect(submitLookup).toContain('selectedRepoGitHubSourceContext')
-  })
-
-  it('uses submit-time GitHub PR start points for the create payload', () => {
-    const submitLookup = COMPOSER_SOURCE.githubSubmit
-    expect(submitLookup).toContain('resolveGitHubPrStartPointForRepo')
-    expect(submitLookup).toContain("kind: 'pr-start-point'")
-    expect(submitLookup).toContain("kind: 'metadata-only'")
-    expect(submitLookup).toContain('baseBranch: prStartPoint.baseBranch')
-    expect(submitLookup).toContain('branchNameOverride: prStartPoint.branchNameOverride')
-    const selectedPrSubmitLookup = sourceBetween(
-      submitLookup,
-      'if (linkedWorkItem) {',
-      'const intent = getSmartGitHubSubmitIntent(name)'
-    )
-    expect(selectedPrSubmitLookup).toContain('smartGitHubPrStartPointSelectionRef.current')
-    expect(selectedPrSubmitLookup).toContain("linkedWorkItemIdentity?.type === 'pr'")
-    expect(selectedPrSubmitLookup).toContain("startPointIdentity?.type === 'pr'")
-    expect(selectedPrSubmitLookup).toContain(
-      'startPointIdentity.number === linkedWorkItemIdentity.number'
-    )
-    expect(selectedPrSubmitLookup).toContain('resolveGitHubPrStartPointForRepo')
-    expect(selectedPrSubmitLookup.indexOf('resolveGitHubPrStartPointForRepo')).toBeLessThan(
-      selectedPrSubmitLookup.indexOf("return { kind: 'none' }")
-    )
-
-    const fullSubmit = COMPOSER_SOURCE.fullSubmitSourcePreparation + COMPOSER_SOURCE.fullCreation
-    expect(fullSubmit).toContain("smartGitHubResolution.kind === 'pr-start-point'")
-    expect(fullSubmit).toContain("smartGitHubResolution.kind === 'metadata-only'")
-    expect(fullSubmit).toContain('effectiveLinkedPR !== null || linkedGitLabMR !== null')
-    expect(fullSubmit).toContain('selectedRepoIsGit ? submitBaseBranch : undefined')
-    expect(fullSubmit).toContain('submitPushTarget')
-    expect(fullSubmit).toContain('submitCompareBaseRef')
-    expect(fullSubmit).not.toContain('smartGitHubResolution?.baseBranch ?? baseBranch')
-    expect(fullSubmit).not.toContain('smartGitHubResolution?.compareBaseRef ?? compareBaseRef')
-    expect(fullSubmit).not.toContain('smartGitHubResolution?.pushTarget ?? pushTarget')
-    expect(fullSubmit).not.toContain(
-      'smartGitHubResolution?.branchNameOverride ?? branchNameOverride'
-    )
-
-    const quickSubmit =
-      COMPOSER_SOURCE.quickSubmitSourcePreparation +
-      COMPOSER_SOURCE.quickSubmitPreparation +
-      COMPOSER_SOURCE.quickCreation
-    expect(quickSubmit).toContain("smartGitHubResolution.kind === 'pr-start-point'")
-    expect(quickSubmit).toContain("smartGitHubResolution.kind === 'metadata-only'")
-    expect(quickSubmit).toContain('effectiveLinkedPR !== null || linkedGitLabMR !== null')
-    expect(quickSubmit).toContain('explicitBaseBranch: smartSubmitBaseBranch')
-    expect(quickSubmit).toContain('pushTarget: submitPushTarget')
-    expect(quickSubmit).toContain('compareBaseRef: submitCompareBaseRef')
-    expect(quickSubmit).not.toContain('smartGitHubResolution?.baseBranch ?? baseBranch')
-    expect(quickSubmit).not.toContain('smartGitHubResolution?.compareBaseRef ?? compareBaseRef')
-    expect(quickSubmit).not.toContain('smartGitHubResolution?.pushTarget ?? pushTarget')
-    expect(quickSubmit).not.toContain(
-      'smartGitHubResolution?.branchNameOverride ?? branchNameOverride'
-    )
-  })
-
-  it('saves setup startup policy before creating a workspace', () => {
-    const persistSection = COMPOSER_SOURCE.providerRuntime
-    expect(persistSection).toContain('setupAgentStartupPolicySaveRef.current')
-    expect(persistSection).toContain('pendingSave?.repoId === currentRepo.id')
-    expect(persistSection).toContain('pendingSave.policy === policy')
-    expect(persistSection).toContain('await pendingSave.promise')
-    expect(persistSection).toContain('continue')
-    expect(COMPOSER_SOURCE.providerRuntime).toContain('setupAgentStartupPolicyDraftRef.current')
-
-    const fullSubmit = COMPOSER_SOURCE.fullCreation
-    const fullPolicySave = fullSubmit.indexOf('persistSetupAgentStartupPolicy()')
-    const fullCreate = fullSubmit.indexOf('const result = await createWorktree(')
-    expect(fullPolicySave).toBeGreaterThanOrEqual(0)
-    expect(fullCreate).toBeGreaterThan(fullPolicySave)
-
-    const quickSubmit = COMPOSER_SOURCE.quickCreation
-    const quickPolicySave = quickSubmit.indexOf('persistSetupAgentStartupPolicy()')
-    const quickCreate = quickSubmit.indexOf('const request = buildQuickCreationRequest(')
-    expect(quickPolicySave).toBeGreaterThanOrEqual(0)
-    expect(quickCreate).toBeGreaterThan(quickPolicySave)
-  })
-
-  it('resolves submit-time GitHub smart input when folder child repos exist', () => {
-    expect(
-      canResolveFolderSmartGitHubSubmit({
-        hasFolderSourceRepos: true
-      })
-    ).toBe(true)
-    expect(
-      canResolveFolderSmartGitHubSubmit({
-        hasFolderSourceRepos: false
-      })
-    ).toBe(false)
-
-    const lookupSection = COMPOSER_SOURCE.githubSubmit
-    expect(lookupSection).toContain('isProjectGroupTarget')
-    expect(lookupSection).toContain('folderSourceRepos.filter(isGitRepoKind)')
-    expect(lookupSection).toContain('Promise.all')
-    expect(lookupSection).toContain('buildTaskSourceContextFromRepo')
-
-    const section = COMPOSER_SOURCE.folderSubmit
-    expect(section).toContain('canResolveFolderSmartGitHubSubmit')
-    expect(section).toContain('hasFolderSourceRepos: folderSourceRepos.length > 0')
-    expect(section).toContain('? resolvePendingSmartGitHubSubmit()')
-    expect(section).toContain("Promise.resolve({ kind: 'none' } as const)")
-    expect(section).toContain("smartGitHubSettlement.status === 'cancelled'")
-    expect(section).not.toContain('folderSourceRequiresConnection')
-  })
-
-  it('clears branch reuse state when manually editing the branch name', () => {
-    const section = COMPOSER_SOURCE.sourceIdentity
-
-    expect(section).toContain('resolveComposerManualBranchNameChange')
-    expect(section).toContain('setReuseEligibleBranch(null)')
-    expect(section).toContain('setReuseSelectedBranch(false)')
-    expect(section).toContain("branchAutoNameRef.current = ''")
-  })
-
-  it('forces repo-scoped source reset when returning from folder target to a repo with the same id', () => {
-    const handleRepoChange = COMPOSER_SOURCE.targetChange
-    expect(handleRepoChange).toContain('forceResetStartFrom?: boolean')
-    expect(handleRepoChange).toContain('value === repoId && !options.forceResetStartFrom')
-
-    const handleProjectChange = COMPOSER_SOURCE.projectTarget
-    expect(handleProjectChange).toContain(
-      'handleRepoChange(nextRepoId, { forceResetStartFrom: isProjectGroupTarget })'
-    )
-  })
-
-  it('keeps a Linear branch override when its workspace-scoped issue survives a repo change', () => {
-    const section = COMPOSER_SOURCE.targetChange
-
-    expect(section).toContain('const preservedLinearBranchName = preserveLinearLinkedWorkItem')
-    expect(section).toContain('getLinearLinkedWorkItemBranchName(linkedWorkItem)')
-    expect(section).toContain('setBranchNameOverride(preservedLinearBranchName)')
-    expect(section).toContain(
-      'setBranchNameOverridePreservesNameEdits(Boolean(preservedLinearBranchName))'
-    )
-    expect(section).toContain("branchAutoNameRef.current = preservedLinearBranchName ?? ''")
-  })
-
-  it('clears a Linear branch override when its linked issue is removed', () => {
-    const section = COMPOSER_SOURCE.sourceIdentity
-
-    expect(section).toContain('const removedLinearItem = isLinearLinkedWorkItem(linkedWorkItem)')
-    expect(section).toContain('if (removedLinearItem)')
-    expect(section).toContain('setBranchNameOverride(undefined)')
-    expect(section).toContain('setBranchNameOverridePreservesNameEdits(false)')
-    expect(section).toContain("branchAutoNameRef.current = ''")
-  })
-
-  it('keeps Jira-mode URL edits synchronously blocked before lookup settles', () => {
-    // Why: derived on every render from the same name the submit path uses, so an in-flight
-    // URL cannot slip through between the keystroke and the create.
-    expect(COMPOSER_SOURCE.workspaceIdentity).toContain(
-      'isBlockingJiraUrlIntent(smartNameMode, name)'
-    )
-    const section = COMPOSER_SOURCE.sourceIdentity
-
-    expect(section).not.toContain("smartNameMode === 'smart'")
-    expect(section).not.toContain('setSourceIntentBlocksCreate')
-  })
-
-  it('selects a project by its own host instead of pinning the current host', () => {
-    // Regression: passing the current host as a hard `hostId` made picking a
-    // project set up only on a different host a silent no-op. The current host
-    // must be a preference (focusedHostScope), with a fallback to any ready host.
-    const handleProjectChange = COMPOSER_SOURCE.projectTarget
-    expect(handleProjectChange).toContain('focusedHostScope: preferredHostId ?? workspaceHostScope')
-    expect(handleProjectChange).not.toContain('hostId: preferredHostId')
-  })
-
-  it('clears GitLab-specific linked state when clearing smart-name selection', () => {
-    const section = COMPOSER_SOURCE.issueSource
-    expect(section).toContain("setLinkedIssue('')")
-    expect(section).toContain('setLinkedPR(null)')
-    expect(section).toContain('setLinkedGitLabIssue(null)')
-    expect(section).toContain('setLinkedGitLabMR(null)')
-    expect(section).toContain('setLinkedWorkItem(null)')
-  })
-
-  it('clears stale opposite-provider review fields when selecting linked work items', () => {
-    const githubApply = COMPOSER_SOURCE.githubSourceApplication
-    expect(githubApply).toContain('setLinkedGitLabIssue(null)')
-    expect(githubApply).toContain('setLinkedGitLabMR(null)')
-    expect(githubApply).toContain('setBranchNameOverridePreservesNameEdits(false)')
-    expect(githubApply).toContain("branchAutoNameRef.current = ''")
-
-    const gitlabApply = COMPOSER_SOURCE.gitlabProvider
-    expect(gitlabApply).toContain("setLinkedIssue('')")
-    expect(gitlabApply).toContain('setLinkedPR(null)')
-    expect(gitlabApply).toContain('setBranchNameOverridePreservesNameEdits(false)')
-    expect(gitlabApply).toContain("branchAutoNameRef.current = ''")
-
-    const githubProjectGroupHandler = COMPOSER_SOURCE.githubProvider
-    const gitlabProjectGroupHandler = COMPOSER_SOURCE.githubProvider
-    expect(githubProjectGroupHandler).toContain('setLinkedGitLabIssue(null)')
-    expect(githubProjectGroupHandler).toContain('setLinkedGitLabMR(null)')
-    expect(gitlabProjectGroupHandler).toContain(
-      "setLinkedIssue(identity.type === 'issue' ? String(identity.number) : '')"
-    )
-    expect(gitlabProjectGroupHandler).toContain(
-      "setLinkedPR(identity.type === 'pr' ? identity.number : null)"
-    )
-  })
-
-  it('disables repo-backed folder smart lookup when a folder target has no source repos', () => {
-    const cardProps = COMPOSER_SOURCE.cardProps
-    expect(cardProps).toContain(
-      'repoBackedSourcesDisabled: isProjectGroupTarget ? folderSourceRepos.length === 0 : false'
-    )
-    expect(cardProps).toContain(
-      'repoBackedSearchRepos: isProjectGroupTarget ? folderSourceRepos : undefined'
-    )
-  })
-
-  it('surfaces folder submit smart-resolution failures through create error UI', () => {
-    const section = COMPOSER_SOURCE.folderSubmit
-    expect(section).toContain('catch (error)')
-    expect(section).toContain('const formattedError = formatWorkspaceCreateError(error)')
-    expect(section).toContain('setCreateError(formattedError)')
-    expect(section).toContain('toast.error(getWorkspaceCreateErrorToastMessage(formattedError))')
-    expect(section).toContain('if (!folderWorkspaceCreated)')
-    expect(section).toContain('setCreateError({')
-  })
-
-  it('uses submit-time smart metadata for both folder launch mode and startup content', () => {
-    const section = COMPOSER_SOURCE.folderSubmit
-    expect(section).toContain(
-      'const submitLinkedWorkItem = smartGitHubMetadata?.linkedWorkItem ?? linkedWorkItem'
-    )
-    expect(section).toContain('resolveFolderWorkspaceLaunchDraft(submitLinkedWorkItem, note)')
-    expect(section).toContain('linkedWorkItem: submitLinkedWorkItem')
-  })
-
-  it('gates every submit path on the derived source intent', () => {
-    // Why: derived from name+mode, so the submitted name and the gate can never disagree.
-    expect(COMPOSER_SOURCE.workspaceIdentity).toContain(
-      'const sourceIntentBlocksCreate = !linkedWorkItem && isBlockingJiraUrlIntent(smartNameMode, name)'
-    )
-    const submitSections = [
-      COMPOSER_SOURCE.navigation,
-      COMPOSER_SOURCE.fullSubmitOrchestration,
-      COMPOSER_SOURCE.quickSubmitAction
-    ]
-
-    for (const section of submitSections) {
-      expect(section).toContain('sourceIntentBlocksCreate')
-    }
-  })
-
-  it('passes folder child repos to smart lookup instead of building task source options', () => {
-    const cardProps = COMPOSER_SOURCE.cardProps
-    expect(cardProps).toContain(
-      'repoBackedSearchRepos: isProjectGroupTarget ? folderSourceRepos : undefined'
-    )
-    expect(cardProps).not.toContain('folderSourceProjectOptions')
-    expect(cardProps).not.toContain('handleFolderTaskSourceProjectChange')
-    expect(cardProps).not.toContain('getRepoIdFromNewWorkspaceFolderSourceOptionId')
-  })
-
-  it('keeps folder run repo changes inside the selected folder source set', () => {
-    const section = COMPOSER_SOURCE.targetChange
-    expect(section).toContain('folderSourceRepos.some((repo) => repo.id === value)')
-    expect(section).toContain('return')
-
-    const cardProps = COMPOSER_SOURCE.cardProps
-    expect(cardProps).toContain('allowSmartNameAddProject: !isProjectGroupTarget')
-  })
-
-  it('preserves Jira linked items when switching from repo target to folder target', () => {
-    const section = COMPOSER_SOURCE.projectTarget
-    expect(section).toContain('!shouldPreserveWorkspaceSourceOnRepoChange(linkedWorkItem)')
   })
 
   it('restores Jira draft context only when its site and issue identity agree', () => {
@@ -644,139 +186,4 @@ describe('useComposerState host-context boundaries', () => {
       getMatchingLinkedTaskSourceContext({ ...item, jiraIdentifier: 'ORCA-999' }, context)
     ).toBeNull()
   })
-
-  it('resolves quick-create base refs through the worktree-create precedence helper', () => {
-    const section = COMPOSER_SOURCE.quickSubmitPreparation
-    expect(section).not.toContain('repoWorktreeBaseRef: selectedRepo.worktreeBaseRef')
-    expect(section).not.toContain('getRuntimeRepoBaseRefDefault')
-  })
-
-  it('plans new workspace agent startup from the selected repo runtime', () => {
-    expect(COMPOSER_SOURCE.runtimeTarget).toContain(
-      'const selectedRepoAgentLaunchPlatform = useMemo'
-    )
-    expect(COMPOSER_SOURCE.runtimeTarget).toContain('getLocalRepoProjectExecutionRuntimeContext')
-    expect(COMPOSER_SOURCE.runtimeTarget).toContain(
-      'getAgentLaunchPlatformForRepo(selectedRepo, projectRuntime)'
-    )
-
-    const fullStartupPlan = sourceBetween(
-      COMPOSER_SOURCE.fullSubmitPreparation,
-      'const startupPlan = buildAgentStartupPlan({',
-      'const shouldSeedInitialAgentStatus ='
-    )
-    expect(fullStartupPlan).toContain('platform: selectedRepoAgentLaunchPlatform')
-    expect(fullStartupPlan).not.toContain('platform: CLIENT_PLATFORM')
-    expect(COMPOSER_SOURCE.fullCreation).toContain('startupDraft: startupPlan.draftPrompt')
-
-    const quickStartupPlan = sourceBetween(
-      COMPOSER_SOURCE.quickCreation,
-      'buildQuickComposerStartup({',
-      'const startupPolicySettlement ='
-    )
-    expect(quickStartupPlan).toContain('platform: selectedRepoAgentLaunchPlatform')
-    expect(quickStartupPlan).not.toContain('platform: CLIENT_PLATFORM')
-  })
-
-  // Why: activation no longer rebuilds a startup from `createdWithAgent`, so this
-  // caller's own `startup` is the only thing that launches the agent it planned.
-  it('passes its own startup to activation when submit planned an agent', () => {
-    const activation = COMPOSER_SOURCE.fullCreation + COMPOSER_SOURCE.fullCreationStartup
-
-    expect(activation).toContain('...(!structuredLaunch && startup ? { startup } : {})')
-    expect(activation).toContain('backendStartupTerminalSpawned: true')
-    expect(activation).toContain('command: args.startupPlan.launchCommand')
-    expect(activation).toContain('launchAgent: args.agent')
-    // The removed activation-time fallback must not come back through this caller.
-    expect(COMPOSER_SOURCE.fullCreation).not.toContain('buildCreatedAgentReopenStartup')
-  })
-
-  it('prepares linked quick-create drafts for the selected default agent', () => {
-    const quickSubmit = COMPOSER_SOURCE.quickCreation + COMPOSER_SOURCE.quickStartup
-
-    expect(quickSubmit).toContain(
-      'const promptLinkedWorkItem = agent === null ? null : submitLinkedWorkItem'
-    )
-    expect(quickSubmit).toContain('resolveQuickCreateLinkedWorkItemPrompt(promptLinkedWorkItem')
-    expect(quickSubmit).not.toContain('explicitAgentChoice')
-    expect(quickSubmit).not.toContain('shouldPrepareQuickLinkedWorkItemAgentPrompt')
-    expect(COMPOSER_SOURCE.quickCreation).not.toContain('resolveQuickWorkspaceSubmitAgent')
-  })
-
-  it('keeps sentinel-based Jira and Linear starts out of issue-command templates', () => {
-    const submitSources =
-      COMPOSER_SOURCE.derived +
-      COMPOSER_SOURCE.fullSubmitSourcePreparation +
-      COMPOSER_SOURCE.fullSubmitPreparation +
-      COMPOSER_SOURCE.fullCreation +
-      COMPOSER_SOURCE.quickSubmitPreparation +
-      COMPOSER_SOURCE.quickCreation
-    expect(submitSources).not.toContain('isOrcaCliAvailableForLaunch')
-    expect(submitSources).not.toContain('hasGeneratedLinearSourceContext')
-    expect(submitSources).not.toContain('shouldDraftGeneratedLinearContext')
-    expect(COMPOSER_SOURCE.derived).toMatch(
-      /willApplyIssueCommandAsPrompt[\s\S]*canUseIssueCommandForLinkedItemProvider\(linkedWorkItemProvider\)/
-    )
-
-    const previewSection = COMPOSER_SOURCE.derived
-    expect(previewSection).toContain(
-      'canUseIssueCommandForLinkedItemProvider(linkedWorkItemProvider)'
-    )
-
-    const fullSubmit =
-      COMPOSER_SOURCE.fullSubmitSourcePreparation +
-      COMPOSER_SOURCE.fullSubmitPreparation +
-      COMPOSER_SOURCE.fullCreation +
-      COMPOSER_SOURCE.fullCreationStartup
-    expect(fullSubmit).toContain(
-      'canUseIssueCommandForLinkedItemProvider(submitLinkedWorkItemProvider)'
-    )
-    expect(fullSubmit).toMatch(
-      /submitShouldRunIssueAutomation[\s\S]*canUseIssueCommandForLinkedItemProvider\(submitLinkedWorkItemProvider\)/
-    )
-    expect(fullSubmit).toContain('prompt: submitStartupPrompt')
-    expect(fullSubmit).toContain('const shouldSeedInitialAgentStatus =')
-    expect(fullSubmit).toContain('...(args.shouldSeedInitialAgentStatus')
-
-    const quickSubmit =
-      COMPOSER_SOURCE.quickSubmitPreparation +
-      COMPOSER_SOURCE.quickCreation +
-      COMPOSER_SOURCE.quickStartup
-    expect(quickSubmit).toContain('startupPlan.draftPrompt = draftPrompt')
-  })
-
-  it('selects the failed Jira source host before opening integration settings', () => {
-    const section = COMPOSER_SOURCE.navigation
-
-    expect(section).toContain('getTaskSourceRuntimeSettings(')
-    expect(section).toContain('smartNameJiraSourceContext')
-    expect(section).toContain('setActiveRuntimeEnvironmentPreference(targetRuntimeEnvironmentId)')
-    expect(section.indexOf('setActiveRuntimeEnvironmentPreference')).toBeLessThan(
-      section.indexOf("openSettingsTarget({ pane: 'integrations'")
-    )
-    expect(section).toContain('if (!selected)')
-  })
-
-  it('gates per-workspace environment recipe discovery behind the experimental setting', () => {
-    const recipeLoadSection = COMPOSER_SOURCE.runtimeTarget
-    expect(recipeLoadSection).toContain('settings?.experimentalEphemeralVms === true')
-    expect(recipeLoadSection).toContain('useEphemeralVmRecipeOptions')
-    expect(recipeLoadSection).toContain('enabled: ephemeralVmsEnabled')
-    expect(RECIPE_OPTIONS_SOURCE).toContain('args.enabled &&')
-    expect(RECIPE_OPTIONS_SOURCE).toContain('window.api.ephemeralVm')
-    expect(RECIPE_OPTIONS_SOURCE).toContain('window.api.plugins.onChanged')
-    expect(RECIPE_OPTIONS_SOURCE).toContain('requestGeneration')
-
-    const submitSection = COMPOSER_SOURCE.quickCreation
-    expect(submitSection).toContain(
-      'const activeEphemeralVmRecipeId = ephemeralVmsEnabled ? selectedEphemeralVmRecipeId : null'
-    )
-    expect(submitSection).toContain('recipeId: activeEphemeralVmRecipeId')
-
-    const cardPropsSection = COMPOSER_SOURCE.cardProps
-    expect(cardPropsSection).toContain('ephemeralVmRecipes:')
-    expect(cardPropsSection).toContain('!ephemeralVmsEnabled')
-    expect(cardPropsSection).toContain('selectedEphemeralVmRecipeId:')
-    expect(cardPropsSection).toContain('ephemeralVmRecipeError:')
-  })
 })
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-replay.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-replay.test.ts
index e26448f0b63c..f8f77eced611 100644
--- a/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-replay.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-replay.test.ts
@@ -79,7 +79,9 @@ describe('useIpcEvents agent status snapshot integration', () => {
         toolInput: 'pnpm test',
         terminalHandle: 'term-future',
         receivedAt: 1_700_000_000_000,
-        stateStartedAt: 1_699_999_999_000
+        stateStartedAt: 1_699_999_999_000,
+        // A reload starts with no state history; the host's turn start must arrive with the row.
+        turnStartedAt: 1_699_999_990_000
       }
     ])
     await Promise.resolve()
@@ -113,7 +115,11 @@ describe('useIpcEvents agent status snapshot integration', () => {
         toolInput: 'pnpm test'
       }),
       'SSH Tab',
-      { updatedAt: 1_700_000_000_000, stateStartedAt: 1_699_999_999_000 },
+      {
+        updatedAt: 1_700_000_000_000,
+        stateStartedAt: 1_699_999_999_000,
+        turnStartedAt: 1_699_999_990_000
+      },
       expectWorktreeRouting('wt-1'),
       undefined
     )
diff --git a/src/renderer/src/hooks/useIpcEvents-close-routing-session-tabs.test.ts b/src/renderer/src/hooks/useIpcEvents-close-routing-session-tabs.test.ts
index 5240ea803f7a..e22c6b41e0f9 100644
--- a/src/renderer/src/hooks/useIpcEvents-close-routing-session-tabs.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-close-routing-session-tabs.test.ts
@@ -92,7 +92,7 @@ describe('useIpcEvents browser tab close routing', () => {
       getState: () => ({})
     })
 
-    closeTerminalListenerRef.current?.({ tabId: 'terminal-1' })
+    closeTerminalListenerRef.current?.({ kind: 'tab', tabId: 'terminal-1' })
 
     // The CLI/RPC caller is answered immediately, so this close must never raise a modal.
     expect(closeTerminalTabMock).toHaveBeenCalledWith('terminal-1', {
diff --git a/src/renderer/src/hooks/useIpcEvents-cmd-j-digit-chord.test.ts b/src/renderer/src/hooks/useIpcEvents-cmd-j-digit-chord.test.ts
index a0ff1ea24dc9..ae61b9adcb9a 100644
--- a/src/renderer/src/hooks/useIpcEvents-cmd-j-digit-chord.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-cmd-j-digit-chord.test.ts
@@ -52,7 +52,9 @@ describe('useIpcEvents digit-chord routing while Cmd+J is open', () => {
 
     expect(rowJumps).toEqual([])
     // Why assert the activation and not just the silent bus: a premature return would also emit nothing.
-    expect(harness.activateAndRevealWorkspace).toHaveBeenCalledWith('wt-c')
+    expect(harness.activateAndRevealWorkspace).toHaveBeenCalledWith('wt-c', {
+      navigationIntent: 'user-open'
+    })
   })
 
   it('routes duplicate ids at different positions to their rendered hosts', async () => {
@@ -67,6 +69,7 @@ describe('useIpcEvents digit-chord routing while Cmd+J is open', () => {
     harness.jumpToWorktreeIndex(1)
 
     expect(harness.activateAndRevealWorkspace).toHaveBeenCalledWith('repo::path', {
+      navigationIntent: 'user-open',
       executionHostId: 'ssh:box'
     })
   })
diff --git a/src/renderer/src/hooks/useSettingsNavigationMetadata.test.ts b/src/renderer/src/hooks/useSettingsNavigationMetadata.test.ts
index 12ca698f192e..d3e75ca301b0 100644
--- a/src/renderer/src/hooks/useSettingsNavigationMetadata.test.ts
+++ b/src/renderer/src/hooks/useSettingsNavigationMetadata.test.ts
@@ -1,8 +1,7 @@
-import { readdirSync, readFileSync } from 'node:fs'
-import { basename, resolve } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { buildSettingsNavigationMetadata } from './useSettingsNavigationMetadata'
 import type { Repo } from '../../../shared/repo-types'
+import { getCodexTerminalServerIsolationTitle } from '../components/settings/codex-terminal-server-isolation-copy'
 
 const repo = {
   id: 'repo-1',
@@ -181,6 +180,21 @@ describe('settings navigation metadata', () => {
     )
   })
 
+  it('lists the host-only Codex server setting in desktop Agents search only', () => {
+    const agentTitles = (isWebClient: boolean): string[] | undefined =>
+      buildSettingsNavigationMetadata({
+        isMac: false,
+        isWindows: false,
+        isWebClient,
+        repos: [repo]
+      })
+        .find((section) => section.id === 'agents')
+        ?.searchEntries.map((entry) => entry.title)
+
+    expect(agentTitles(false)).toContain(getCodexTerminalServerIsolationTitle())
+    expect(agentTitles(true)).not.toContain(getCodexTerminalServerIsolationTitle())
+  })
+
   it('keeps the Browser shortcut searchable for a capable web runtime', () => {
     const sections = buildSettingsNavigationMetadata({
       isMac: false,
@@ -405,42 +419,4 @@ describe('settings navigation metadata', () => {
     expect(ids({ isMac: false })).not.toContain('developer-permissions')
     expect(ids({ isMac: true })).toContain('developer-permissions')
   })
-
-  it('does not import Settings page or pane UI modules from the metadata hook', () => {
-    const testDir = import.meta.dirname
-    // Why: the section tables live in sibling settings-navigation-* modules, so reading only the
-    // hook would scan a file that no longer holds the imports this guard exists to police.
-    // Walk recursively so a later split that nests the modules cannot shrink this guard.
-    const sourceFiles = [
-      'useSettingsNavigationMetadata.ts',
-      ...readdirSync(testDir, { recursive: true, encoding: 'utf8' }).filter(
-        (name) => basename(name).startsWith('settings-navigation-') && name.endsWith('.ts')
-      )
-    ]
-    expect(sourceFiles.length).toBeGreaterThan(1)
-    const importLines = sourceFiles
-      .flatMap((name) => readFileSync(resolve(testDir, name), 'utf8').split('\n'))
-      .filter((line) => line.trim().startsWith('import '))
-      .join('\n')
-
-    expect(importLines).not.toMatch(/components\/settings\/Settings(?:'|")/)
-    expect(importLines).not.toMatch(/components\/settings\/[A-Z][A-Za-z]+Pane(?:'|")/)
-    expect(importLines).not.toMatch(/components\/stats\/StatsPane(?:'|")/)
-  })
-
-  it('does not import Settings page or pane UI modules from the quick action registry', () => {
-    const testDir = import.meta.dirname
-    const registrySource = readFileSync(
-      resolve(testDir, '../components/cmd-j/quick-actions.ts'),
-      'utf8'
-    )
-    const importLines = registrySource
-      .split('\n')
-      .filter((line) => line.trim().startsWith('import '))
-      .join('\n')
-
-    expect(importLines).not.toMatch(/components\/settings\/Settings(?:'|")/)
-    expect(importLines).not.toMatch(/components\/settings\/[A-Z][A-Za-z]+Pane(?:'|")/)
-    expect(importLines).not.toMatch(/components\/stats\/StatsPane(?:'|")/)
-  })
 })
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index 5161ef912c71..a6ebe3b1b872 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -99,11 +99,11 @@
         "setupKindGit": "Git repo"
       },
       "PullRequestPage": {
-        "3450247584": "Comment",
         "19f19560d5": "destructive",
         "1ff5d979df": "No one assigned",
         "2b4fdb880c": "Unmark viewed",
         "2e528e1c2d": "Viewed",
+        "3450247584": "Comment",
         "42c36d9166": "{{value0}} {{value1}} reaction{{value2}}",
         "4b960e5978": "Loading code context…",
         "50b8fb290f": "Mark viewed",
@@ -245,9 +245,9 @@
           "f0202f3a89": "Daily"
         },
         "AutomationsPage": {
-          "2695883141": "delete",
           "0329f9bef1": "Close · Esc",
           "0ae52dd760": "hermes",
+          "2695883141": "delete",
           "3e42a5cc1b": "SSH connection failed.",
           "53f06f0ad5": "Retry source",
           "587a4b205c": "Next",
@@ -297,13 +297,6 @@
           "unknownManager": "This external automation is no longer listed for any host in view."
         }
       },
-      "browser-pane": {
-        "markup": {
-          "errorAttach": "Could not attach the markup screenshot.",
-          "errorCapture": "Could not capture the page to draw on.",
-          "errorUnavailable": "Screenshot markup is not available on this page."
-        }
-      },
       "browser": {
         "pane": {
           "BrowserPane": {
@@ -340,6 +333,13 @@
           }
         }
       },
+      "browser-pane": {
+        "markup": {
+          "errorAttach": "Could not attach the markup screenshot.",
+          "errorCapture": "Could not capture the page to draw on.",
+          "errorUnavailable": "Screenshot markup is not available on this page."
+        }
+      },
       "contextual": {
         "tours": {
           "ContextualTourControl": {
@@ -595,9 +595,6 @@
           }
         }
       },
-      "linear-issue-attribute-filter-dropdowns": {
-        "optionsFromTeam": "Options from {{team}}"
-      },
       "linear": {
         "api": {
           "key": {
@@ -616,6 +613,9 @@
           }
         }
       },
+      "linear-issue-attribute-filter-dropdowns": {
+        "optionsFromTeam": "Options from {{team}}"
+      },
       "mobile": {
         "MobileHero": {
           "79d2f480da": "Network interface to advertise",
@@ -882,9 +882,9 @@
               },
               "empty": {
                 "state": {
-                  "3322603418": "Pull request status unavailable",
                   "13e1c7d5ed": "No {{value0}} found",
                   "2bdd7aaf2d": "GitHub status could not be refreshed. Existing cached data was preserved.",
+                  "3322603418": "Pull request status unavailable",
                   "3d4af82ff4": "Refreshing GitHub status for this branch",
                   "41252bc53f": "Branch not published",
                   "5b0cfae9a5": "Create a {{value0}} to start checks and review.",
@@ -1589,6 +1589,7 @@
             "2afd3b5858": "enable",
             "2e188c771c": "hide",
             "32836788b0": "generated title",
+            "34337ed5c7": "isolate",
             "48f84d10f1": "running",
             "52115d0d7c": "auto",
             "5784ae8c43": "rename",
@@ -1598,12 +1599,15 @@
             "66b6b82eb4": "awake",
             "6956646a1e": "title",
             "6984d4291a": "status",
+            "7e15b89f6e": "server",
             "845ad9128a": "power",
             "848dcae8d3": "generated",
             "8599603496": "done",
             "87fffe6c20": "show",
             "8a17fd6026": "stable",
             "966890236d": "name",
+            "9a84e65118": "agents overview",
+            "9f3becc4e8": "shared",
             "a6d594c17d": "install",
             "a79d266f71": "session",
             "afbf35be68": "stable session",
@@ -1620,6 +1624,7 @@
             "ef804b7337": "Agent Location",
             "f2932bf22b": "detected",
             "f412abbba5": "claude",
+            "ff457e1e7b": "daemon",
             "ff8de8a2ad": "display"
           }
         },
@@ -2023,6 +2028,15 @@
               }
             }
           }
+        },
+        "worktree": {
+          "card": {
+            "compact": {
+              "agents": {
+                "a128d7006b": "{{value0}} {{value1}} child {{value2}}"
+              }
+            }
+          }
         }
       },
       "skills": {
@@ -2482,9 +2496,17 @@
           "MobileDriverOverlay": {
             "3eed73394f": "Your keyboard is paused"
           },
+          "TerminalErrorToast": {
+            "ptyAllocationLimit": "Your system cannot allocate any more pty devices. Close some terminals you are not using, in Orca or another program, then try again.",
+            "terminalProcessLimit": "Your system cannot start another terminal process. Close unused terminals or quit unused processes, then try again."
+          },
           "TerminalRemoteRuntimeReconnectBanner": {
             "retryingBody": "Orca will retry for up to one minute. This terminal will resume if the connection returns."
           },
+          "TerminalSessionStateSaveFailureDialog": {
+            "678c780a2c": "Disk space is unavailable",
+            "e2fcf07c0d": "Orca could not save this terminal session because local storage is full or not writable. Open the disk space analyzer to find workspace storage you can clean up."
+          },
           "TerminalSshReconnectOverlay": {
             "connectButton": "Connect",
             "connectingButton": "Connecting..."
@@ -2675,6 +2697,7 @@
       "ask": {
         "asked": "Asked:",
         "awaiting": "Awaiting user input:",
+        "awaitingUnnamed": "Awaiting user input",
         "questionCount": "{{value0}} questions"
       },
       "composer": {
@@ -2690,6 +2713,7 @@
           "title": "Start a chat with {{value0}}"
         },
         "error": {
+          "retryingSubtitle": "The transcript could not be read. Orca keeps trying to load it.",
           "subtitle": "The transcript could not be read. Toggle back to the terminal to keep working.",
           "title": "Could not load conversation"
         },
@@ -2704,11 +2728,14 @@
       },
       "status": {
         "responding": "Agent is responding",
-        "thinking": "Thinking",
         "toggleDetails": "Toggle turn details",
         "workedFor": "Worked for {{value0}}",
         "workingFor": "Working for {{value0}}"
       },
+      "subagents": {
+        "unnamed": "Subagent",
+        "writtenBy": "Written by subagent {{value0}}"
+      },
       "tool": {
         "countN": "{{value0}} tool calls",
         "countOne": "1 tool call",
@@ -2726,6 +2753,56 @@
         "runningPreview": "Running {{preview}}",
         "usedManySummary": "Used {{toolCount}} tools",
         "usedOneSummary": "Used 1 tool"
+      },
+      "writeNotice": {
+        "agentRefused": "The agent turned this down.",
+        "agentStarting": "The agent is still starting.",
+        "answerFirst": "Answer the question or approval first.",
+        "backgroundTasksRunning": "Background tasks are still running.",
+        "capacity": "Orca has received too many requests in the last day.",
+        "chatNotFound": "The Orca running this chat has no record of it.",
+        "clearUnfinished": "The last /clear didn't finish.",
+        "commandRunning": "A /compact or /clear is still running.",
+        "conversationCleared": "This conversation has been cleared.",
+        "goalsUnsupported": "This agent doesn't support goals.",
+        "historyUnavailable": "Orca couldn't open this chat's history right now.",
+        "historyUnreadable": "Orca couldn't read this chat's saved history.",
+        "historyUnusable": "Unable to load this chat.",
+        "hostReconciling": "Orca is still checking on this chat after restarting.",
+        "messagesUnsettled": "A message you sent earlier hasn't been confirmed yet.",
+        "notDoneAnswer": "Your answer was not sent.",
+        "notDoneCommand": "The command didn't run.",
+        "notDoneGoal": "The goal wasn't changed.",
+        "notDoneOption": "The setting wasn't changed.",
+        "notDoneReadHistory": "This chat's history couldn't be loaded.",
+        "notDoneSend": "Your message was not sent.",
+        "notDoneStop": "The agent wasn't stopped.",
+        "notDoneStopTask": "The background task wasn't stopped.",
+        "notDoneStopTasks": "The background tasks weren't stopped.",
+        "openCurrentConversation": "Open the current conversation to continue.",
+        "optionRejected": "The agent didn't accept this setting.",
+        "outcomeUnknown": "Orca couldn't confirm what happened. Check the chat.",
+        "ownerUnproven": "Orca hasn't confirmed that this chat's previous agent stopped.",
+        "promptPending": "The agent is waiting for an answer to a question or approval.",
+        "questionChanged": "This question was already answered or has changed.",
+        "quitTerminalAgent": "Quit that agent to continue the chat here.",
+        "recordFailed": "Orca couldn't record it in this chat's history.",
+        "recordUnreadable": "Orca couldn't read this chat's saved state.",
+        "reopenChat": "Reopen the chat to check again.",
+        "restartFailed": "The agent couldn't restart.",
+        "settleEarlierMessage": "Wait for your earlier message to go through, or retry it.",
+        "startNewChat": "Start a new chat to continue.",
+        "terminalAgentHoldsChat": "This chat is still open in a terminal agent.",
+        "tryAgain": "Try again.",
+        "tryAgainComposerSend": "Send it again.",
+        "turnActive": "The agent is still responding.",
+        "unreachable": "Orca couldn't reach the agent.",
+        "unsupported": "The Orca running this chat doesn't support this. Update Orca, then try again.",
+        "waitForBackgroundTasks": "Wait for the background tasks to finish.",
+        "waitForCommand": "Wait for the /compact or /clear to finish.",
+        "waitForStart": "Wait for the agent to finish starting.",
+        "waitForTurn": "Wait for the agent to finish responding, or stop it.",
+        "waitMoment": "Wait a moment."
       }
     },
     "onboarding": {
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index fc187cb55272..ab3264338812 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -151,7 +151,8 @@
         "portsToggleDescription": "Show live workspace ports. Click it for workspace-scoped ports and external listeners.",
         "antigravityToggleDescription": "Show Antigravity subscription usage for the active workspace.",
         "grokToggleDescription": "Show Grok subscription credit usage when signed in via Grok CLI.",
-        "cursorToggleDescription": "Show Cursor plan usage when signed in through cursor-agent or Cursor IDE."
+        "cursorToggleDescription": "Show Cursor plan usage when signed in through cursor-agent or Cursor IDE.",
+        "zcodeToggleDescription": "Show ZCode Coding Plan quota usage."
       },
       "menuBarIcon": {
         "title": "Show Menu Bar Icon",
@@ -224,6 +225,12 @@
           "deferred": "deferred"
         }
       }
+    },
+    "agents": {
+      "codexTerminalServerIsolation": {
+        "title": "Run each Codex terminal on its own server",
+        "description": "Keeps Orca's status and closing tabs working correctly. Turn off to use Codex's shared server and its agents overview. Applies to new terminals."
+      }
     }
   },
   "menu": {
@@ -602,6 +609,7 @@
           "9e2a9bb87b": "Continue",
           "6f8056a565": "Command Code",
           "4238b771b5": "Codebuff",
+          "freebuff_label": "Freebuff",
           "cbaf0c2e0b": "Cline",
           "1f8a19e9ad": "Autohand Code",
           "5e8eff11b3": "Auggie",
@@ -626,10 +634,13 @@
           "da41abbdd4": "Ante",
           "060d152fb5": "Trae",
           "muse_label": "Muse",
+          "dsh_label": "DeepSeek Harness",
+          "qoder_label": "Qoder CLI",
           "zcode_label": "ZCode",
           "d443a47995": "Prime Agent",
           "mimo_code_label": "MiMo Code",
-          "opencode2_label": "OpenCode 2"
+          "opencode2_label": "OpenCode 2",
+          "codebuddy_label": "CodeBuddy"
         },
         "skill": {
           "cli": {
@@ -1740,7 +1751,6 @@
         "notConnected": "Not connected",
         "notePasteTooLarge": "Paste is too large for the note field.",
         "waitForSetupBeforeAgent": "Wait for setup to complete before starting agent",
-        "waitForSetupBeforeAgentHelp": "Turn this on when setup installs dependencies, MCP servers, or config files the agent needs during startup.",
         "destroyDisabled": "destroy disabled",
         "destroyConfigured": "destroy configured",
         "noDestroyConfigured": "no destroy",
@@ -3206,6 +3216,7 @@
           },
           "TerminalContextMenu": {
             "b4cdd9314e": "Clear Screen",
+            "resetTerminal": "Reset Terminal",
             "8c17d6786d": "Close Pane",
             "copyTerminalId": "Copy Terminal ID",
             "2cf85a6a55": "Copy Pane ID",
@@ -3241,7 +3252,9 @@
             "e16012e31e": "The terminal daemon that owned this session exited, so the session and its scrollback could not be recovered. Open a new terminal to continue.",
             "sessionUnavailable": "Orca couldn't reattach to this pane's terminal session on the host. Open a new terminal to continue.",
             "sourceRestoring": "Reconnecting this terminal — its output is being re-established. The session is still running.",
-            "remoteTerminalClosed": "Remote terminal was closed."
+            "remoteTerminalClosed": "Remote terminal was closed.",
+            "ptyAllocationLimit": "Your system cannot allocate any more pty devices. Close some terminals you are not using, in Orca or another program, then try again.",
+            "terminalProcessLimit": "Your system cannot start another terminal process. Close unused terminals or quit unused processes, then try again."
           },
           "TerminalProcessExitOverlay": {
             "capacityTitle": "Git Bash console limit reached",
@@ -3414,6 +3427,9 @@
           "TerminalQuickCommandsSubmenu": {
             "3ccc7981bb": "Host unavailable",
             "54f29b7c0d": "Loading host…"
+          },
+          "TerminalRestoringPlaceholder": {
+            "restoring": "Restoring terminal…"
           }
         }
       },
@@ -3834,7 +3850,9 @@
             "floatingTerminalNewActivity": "{{label}}, new activity",
             "codexSignInSuccess": "Signed in to Codex",
             "codexSignInError": "Codex sign-in failed. Please try again.",
-            "cursorUsageMenu": "Cursor Usage"
+            "cursorUsageMenu": "Cursor Usage",
+            "hiddenUsageProviders": "Also: {{value0}}",
+            "zcodeUsageMenu": "ZCode Usage"
           },
           "StatusBarUsageEmptyCta": {
             "828c764a79": "Connect an account",
@@ -3981,6 +3999,7 @@
             }
           },
           "tooltip": {
+            "zcode": { "mcp": "MCP" },
             "cedb7b99e3": "% used",
             "6d6df77f41": "No data available",
             "7f7f208060": "Monthly",
@@ -8060,8 +8079,7 @@
           "81057d5f71": "Saving...",
           "da37d6f10e": "Copy",
           "3149964b66": "Copied",
-          "waitForSetupBeforeAgent": "Wait for setup to complete before starting agent",
-          "waitForSetupBeforeAgentHelp": "Turn this on when setup installs dependencies, MCP servers, or config files the agent needs during startup."
+          "waitForSetupBeforeAgent": "Wait for setup to complete before starting agent"
         },
         "RepositoryIconPicker": {
           "2b7d27b93c": "Use {{value0}} repo color",
@@ -9189,6 +9207,11 @@
             "042c551bc5": "config",
             "f412abbba5": "claude",
             "5ded38b843": "codex",
+            "7e15b89f6e": "server",
+            "ff457e1e7b": "daemon",
+            "9f3becc4e8": "shared",
+            "34337ed5c7": "isolate",
+            "9a84e65118": "agents overview",
             "be7ea3553b": "tab",
             "6956646a1e": "title",
             "32836788b0": "generated title",
@@ -9373,6 +9396,11 @@
             "c5b9f8d1e3": "xai",
             "usagePercentageDisplayTitle": "Usage percentages",
             "usagePercentageDisplayDescription": "Choose whether provider limits show the percentage used or remaining.",
+            "zcodeUsageTitle": "ZCode Usage",
+            "zcodeUsageDescription": "Show ZCode Coding Plan quota usage in the status bar.",
+            "zcode": "zcode",
+            "zai": "zai",
+            "glm": "glm",
             "tray": {
               "tray": "tray",
               "system": "system tray",
@@ -17482,6 +17510,56 @@
       "empty": "No users found"
     },
     "native-chat": {
+      "writeNotice": {
+        "notDoneReadHistory": "This chat's history couldn't be loaded.",
+        "notDoneSend": "Your message was not sent.",
+        "tryAgainComposerSend": "Send it again.",
+        "notDoneStop": "The agent wasn't stopped.",
+        "notDoneStopTask": "The background task wasn't stopped.",
+        "notDoneStopTasks": "The background tasks weren't stopped.",
+        "notDoneAnswer": "Your answer was not sent.",
+        "notDoneOption": "The setting wasn't changed.",
+        "notDoneCommand": "The command didn't run.",
+        "notDoneGoal": "The goal wasn't changed.",
+        "restartFailed": "The agent couldn't restart.",
+        "capacity": "Orca has received too many requests in the last day.",
+        "outcomeUnknown": "Orca couldn't confirm what happened. Check the chat.",
+        "questionChanged": "This question was already answered or has changed.",
+        "historyUnreadable": "Orca couldn't read this chat's saved history.",
+        "historyUnusable": "Unable to load this chat.",
+        "historyUnavailable": "Orca couldn't open this chat's history right now.",
+        "unsupported": "The Orca running this chat doesn't support this. Update Orca, then try again.",
+        "unreachable": "Orca couldn't reach the agent.",
+        "recordFailed": "Orca couldn't record it in this chat's history.",
+        "conversationCleared": "This conversation has been cleared.",
+        "openCurrentConversation": "Open the current conversation to continue.",
+        "clearUnfinished": "The last /clear didn't finish.",
+        "commandRunning": "A /compact or /clear is still running.",
+        "waitForCommand": "Wait for the /compact or /clear to finish.",
+        "agentStarting": "The agent is still starting.",
+        "waitForStart": "Wait for the agent to finish starting.",
+        "turnActive": "The agent is still responding.",
+        "waitForTurn": "Wait for the agent to finish responding, or stop it.",
+        "promptPending": "The agent is waiting for an answer to a question or approval.",
+        "answerFirst": "Answer the question or approval first.",
+        "backgroundTasksRunning": "Background tasks are still running.",
+        "waitForBackgroundTasks": "Wait for the background tasks to finish.",
+        "messagesUnsettled": "A message you sent earlier hasn't been confirmed yet.",
+        "settleEarlierMessage": "Wait for your earlier message to go through, or retry it.",
+        "optionRejected": "The agent didn't accept this setting.",
+        "goalsUnsupported": "This agent doesn't support goals.",
+        "agentRefused": "The agent turned this down.",
+        "ownerUnproven": "Orca hasn't confirmed that this chat's previous agent stopped.",
+        "reopenChat": "Reopen the chat to check again.",
+        "terminalAgentHoldsChat": "This chat is still open in a terminal agent.",
+        "quitTerminalAgent": "Quit that agent to continue the chat here.",
+        "hostReconciling": "Orca is still checking on this chat after restarting.",
+        "waitMoment": "Wait a moment.",
+        "recordUnreadable": "Orca couldn't read this chat's saved state.",
+        "chatNotFound": "The Orca running this chat has no record of it.",
+        "startNewChat": "Start a new chat to continue.",
+        "tryAgain": "Try again."
+      },
       "taskList": {
         "title": "Tasks",
         "completed": "Completed",
@@ -17715,8 +17793,10 @@
         },
         "error": {
           "title": "Could not load conversation",
-          "subtitle": "The transcript could not be read. Toggle back to the terminal to keep working."
+          "subtitle": "The transcript could not be read. Toggle back to the terminal to keep working.",
+          "retryingSubtitle": "The transcript could not be read. Orca keeps trying to load it."
         },
+        "reconnecting": "Reconnecting to this chat…",
         "pairHost": "Pair a host to view agent chat history.",
         "notAgent": {
           "title": "No conversation here",
@@ -17751,6 +17831,7 @@
       },
       "ask": {
         "awaiting": "Awaiting user input:",
+        "awaitingUnnamed": "Awaiting user input",
         "asked": "Asked:",
         "questionCount": "{{value0}} questions"
       },
@@ -17787,7 +17868,9 @@
         "startedN": "Kicked off {{value0}} subagents",
         "ranOne": "Ran 1 subagent",
         "ranN": "Ran {{value0}} subagents",
-        "tokens": "{{value0}} tokens"
+        "tokens": "{{value0}} tokens",
+        "unnamed": "Subagent",
+        "writtenBy": "Written by subagent {{value0}}"
       },
       "conversationCommand": {
         "pendingWork": "Wait for pending work and messages to finish before using this command.",
@@ -18146,6 +18229,9 @@
           }
         }
       }
+    },
+    "agentChildRow": {
+      "ended": "Ended"
     }
   },
   "dashboardPopout": {
@@ -18575,6 +18661,7 @@
       "needsInput": "needs input",
       "working": "working",
       "stopped": "stopped",
+      "failed": "failed",
       "finished": "finished"
     }
   },
@@ -18662,5 +18749,17 @@
   },
   "common": {
     "retry": "Retry"
+  },
+  "terminal": {
+    "sessionSaveFailure": {
+      "title": "Could not save terminal session",
+      "capacity": "The device saving this terminal reported full storage or an exceeded storage quota. Free space on that device, then try again.",
+      "unknown": "Orca could not save the terminal state. Try again. If this continues, share the Orca logs with support so we can identify the cause."
+    },
+    "codexTerminalServerIsolationNotice": {
+      "title": "Orca now runs Codex without its shared server",
+      "description": "This makes agent status more reliable. You can turn it back on in Settings.",
+      "openSettings": "Open Settings"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index e9ed1a51aa97..79070fc23f5d 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -385,7 +385,8 @@
           "d443a47995": "Prime Agent",
           "mimo_code_label": "MiMo Code",
           "muse_label": "Muse",
-          "zcode_label": "ZCode"
+          "zcode_label": "ZCode",
+          "codebuddy_label": "CodeBuddy"
         },
         "skill": {
           "cli": {
@@ -1378,7 +1379,6 @@
         "reuseExistingBranchHint": "Haz checkout de la rama existente en lugar de crear una nueva a partir de ella.",
         "createMultiple": "Crear más",
         "waitForSetupBeforeAgent": "Esperar a que termine el setup antes de iniciar el agente",
-        "waitForSetupBeforeAgentHelp": "Activa esto cuando el setup instale dependencias, servidores MCP o archivos de configuración que el agente necesita al iniciar.",
         "destroyDisabled": "destroy deshabilitado",
         "destroyConfigured": "destroy configurado",
         "noDestroyConfigured": "sin destroy",
@@ -2751,6 +2751,7 @@
           },
           "TerminalContextMenu": {
             "b4cdd9314e": "Borrar pantalla",
+            "resetTerminal": "Restablecer terminal",
             "8c17d6786d": "Cerrar panel",
             "copyTerminalId": "Copiar ID de terminal",
             "2cf85a6a55": "Copiar ID del panel",
@@ -2777,7 +2778,9 @@
             "a7e2fd2699": "abre un issue",
             "5c8ce20be6": "Si esto persiste, por favor",
             "cc6d997c65": "Reinicia el servicio del terminal desde aquí para borrar el estado obsoleto.",
-            "remoteTerminalClosed": "La terminal remota se cerró."
+            "remoteTerminalClosed": "La terminal remota se cerró.",
+            "ptyAllocationLimit": "Tu sistema no puede asignar más dispositivos pty. Cierra algunas terminales que no estés usando, en Orca o en otro programa, y vuelve a intentarlo.",
+            "terminalProcessLimit": "Tu sistema no puede iniciar otro proceso de terminal. Cierra las terminales que no uses o sal de los procesos que no necesites y vuelve a intentarlo."
           },
           "TerminalProcessExitOverlay": {
             "capacityTitle": "Se alcanzó el límite de consolas de Git Bash",
@@ -2927,6 +2930,9 @@
             "retryingBody": "Orca is retrying automatically. This terminal will resume if the connection returns.",
             "disconnectedBody": "Automatic retries stopped. Reconnect to resume this terminal session.",
             "reconnectButton": "Reconnect"
+          },
+          "TerminalRestoringPlaceholder": {
+            "restoring": "Restaurando terminal…"
           }
         }
       },
@@ -3342,7 +3348,8 @@
             "floatingTerminalNewActivity": "{{label}}, nueva actividad",
             "codexSignInSuccess": "Sesión iniciada en Codex",
             "codexSignInError": "No se pudo iniciar sesión en Codex. Inténtalo de nuevo.",
-            "cursorUsageMenu": "Uso de Cursor"
+            "cursorUsageMenu": "Uso de Cursor",
+            "hiddenUsageProviders": "También: {{value0}}"
           },
           "StatusBarUsageEmptyCta": {
             "828c764a79": "Conectar una cuenta",
@@ -6796,8 +6803,7 @@
           "81057d5f71": "Guardando...",
           "da37d6f10e": "Copiar",
           "3149964b66": "Copiado",
-          "waitForSetupBeforeAgent": "Espera a que se complete la configuración antes de iniciar el agente",
-          "waitForSetupBeforeAgentHelp": "Activa esto cuando la configuración instale dependencias, servidores MCP o archivos de configuración que el agente necesite durante el inicio."
+          "waitForSetupBeforeAgent": "Espera a que se complete la configuración antes de iniciar el agente"
         },
         "RepositoryIconPicker": {
           "2b7d27b93c": "Usar {{value0}} como color del repositorio",
@@ -14922,6 +14928,56 @@
   },
   "components": {
     "native-chat": {
+      "writeNotice": {
+        "notDoneReadHistory": "No se pudo cargar el historial de este chat.",
+        "notDoneSend": "Su mensaje no se envió.",
+        "tryAgainComposerSend": "Vuelva a enviarlo.",
+        "notDoneStop": "El agente no se detuvo.",
+        "notDoneStopTask": "La tarea en segundo plano no se detuvo.",
+        "notDoneStopTasks": "Las tareas en segundo plano no se detuvieron.",
+        "notDoneAnswer": "Su respuesta no se envió.",
+        "notDoneOption": "La configuración no se cambió.",
+        "notDoneCommand": "El comando no se ejecutó.",
+        "notDoneGoal": "El objetivo no se cambió.",
+        "restartFailed": "El agente no pudo reiniciarse.",
+        "capacity": "Orca ha recibido demasiadas solicitudes en el último día.",
+        "outcomeUnknown": "Orca no pudo confirmar qué pasó. Revise el chat.",
+        "questionChanged": "Esta pregunta ya se respondió o ha cambiado.",
+        "historyUnreadable": "Orca no pudo leer el historial guardado de este chat.",
+        "historyUnusable": "No se puede cargar este chat.",
+        "historyUnavailable": "Orca no pudo abrir el historial de este chat en este momento.",
+        "unsupported": "La versión de Orca que ejecuta este chat no lo admite. Actualice Orca y vuelva a intentarlo.",
+        "unreachable": "Orca no pudo comunicarse con el agente.",
+        "recordFailed": "Orca no pudo registrarlo en el historial de este chat.",
+        "conversationCleared": "Esta conversación se borró.",
+        "openCurrentConversation": "Abra la conversación actual para continuar.",
+        "clearUnfinished": "El último /clear no terminó.",
+        "commandRunning": "Todavía se está ejecutando un /compact o /clear.",
+        "waitForCommand": "Espere a que termine el /compact o /clear.",
+        "agentStarting": "El agente todavía se está iniciando.",
+        "waitForStart": "Espere a que el agente termine de iniciarse.",
+        "turnActive": "El agente todavía está respondiendo.",
+        "waitForTurn": "Espere a que el agente termine de responder o deténgalo.",
+        "promptPending": "El agente está esperando una respuesta a una pregunta o aprobación.",
+        "answerFirst": "Responda primero a la pregunta o aprobación.",
+        "backgroundTasksRunning": "Todavía hay tareas en segundo plano en ejecución.",
+        "waitForBackgroundTasks": "Espere a que terminen las tareas en segundo plano.",
+        "messagesUnsettled": "Un mensaje que envió antes todavía no se ha confirmado.",
+        "settleEarlierMessage": "Espere a que se entregue su mensaje anterior o vuelva a intentarlo.",
+        "optionRejected": "El agente no aceptó este ajuste.",
+        "goalsUnsupported": "Este agente no admite objetivos.",
+        "agentRefused": "El agente lo rechazó.",
+        "ownerUnproven": "Orca no ha confirmado que el agente anterior de este chat se haya detenido.",
+        "reopenChat": "Vuelva a abrir el chat para comprobarlo de nuevo.",
+        "terminalAgentHoldsChat": "Este chat sigue abierto en un agente de terminal.",
+        "quitTerminalAgent": "Cierre ese agente para continuar el chat aquí.",
+        "hostReconciling": "Orca todavía está comprobando este chat después de reiniciarse.",
+        "waitMoment": "Espere un momento.",
+        "recordUnreadable": "Orca no pudo leer el estado guardado de este chat.",
+        "chatNotFound": "La versión de Orca que ejecuta este chat no tiene ningún registro de él.",
+        "startNewChat": "Inicie un chat nuevo para continuar.",
+        "tryAgain": "Vuelva a intentarlo."
+      },
       "composer": {
         "imageUnsupported": "Este agente no admite pegar imágenes.",
         "send": "Enviar",
@@ -14999,8 +15055,10 @@
         },
         "error": {
           "title": "No se pudo cargar la conversación",
-          "subtitle": "No se pudo leer la transcripción. Vuelva a la terminal para seguir trabajando."
+          "subtitle": "No se pudo leer la transcripción. Vuelva a la terminal para seguir trabajando.",
+          "retryingSubtitle": "No se pudo leer la transcripción. Orca sigue intentando cargarla."
         },
+        "reconnecting": "Reconectando con este chat…",
         "pairHost": "Empareje un host para ver el historial de chat del agente.",
         "notAgent": {
           "title": "No hay conversación aquí",
@@ -15045,6 +15103,10 @@
         "label": "Contexto: {{used}} de {{window}} tokens, {{percent}} % usados",
         "title": "Contexto",
         "estimated": "Estimado a partir de la última respuesta."
+      },
+      "subagents": {
+        "unnamed": "Subagente",
+        "writtenBy": "Escrito por el subagente {{value0}}"
       }
     },
     "tab": {
@@ -15109,6 +15171,9 @@
         "copySessionIdSuccess": "ID de sesión copiado",
         "copySessionIdError": "No se pudo copiar el ID de sesión"
       }
+    },
+    "agentChildRow": {
+      "ended": "Finalizado"
     }
   },
   "dashboardPopout": {
@@ -15252,6 +15317,7 @@
       "needsInput": "necesita información",
       "working": "trabajando",
       "stopped": "detenido",
+      "failed": "fallido",
       "finished": "finalizado"
     }
   },
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index e19217dc04c0..f378465a9436 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -595,6 +595,7 @@
           "mimo_code_label": "MiMo Code",
           "muse_label": "Muse",
           "opencode2_label": "OpenCode 2",
+          "codebuddy_label": "CodeBuddy",
           "zcode_label": "ZCode"
         },
         "skill": {
@@ -1705,7 +1706,6 @@
         "notConnected": "Non connecté",
         "notePasteTooLarge": "Le contenu collé est trop volumineux pour le champ de note.",
         "waitForSetupBeforeAgent": "Attendre la fin du setup avant de démarrer l'agent",
-        "waitForSetupBeforeAgentHelp": "Activez cette option quand le setup installe des dépendances, des serveurs MCP ou des fichiers de configuration dont l'agent a besoin au démarrage.",
         "destroyDisabled": "destroy désactivé",
         "destroyConfigured": "destroy configuré",
         "noDestroyConfigured": "pas de destroy",
@@ -3136,6 +3136,7 @@
           },
           "TerminalContextMenu": {
             "b4cdd9314e": "Effacer l'écran",
+            "resetTerminal": "Réinitialiser le terminal",
             "8c17d6786d": "Fermer le volet",
             "copyTerminalId": "Copier l'ID du terminal",
             "2cf85a6a55": "Copier l'ID du volet",
@@ -3171,7 +3172,9 @@
             "ownerUnknown": "Orca n'a pas pu vérifier le propriétaire de ce terminal.",
             "42b283ecfc": "Orca n'a pas pu reconnecter ce terminal en toute sécurité car l'hôte n'a pas pu vérifier sa session enregistrée. Orca a laissé la session enregistrée inchangée. Cliquez sur Réessayer pour essayer de vous reconnecter maintenant. S'il ne parvient toujours pas à se reconnecter, ouvrez un nouveau terminal.",
             "sourceRestoring": "Reconnexion de ce terminal - sa sortie est en cours de rétablissement. La session est toujours en cours.",
-            "remoteTerminalClosed": "Le terminal distant était fermé."
+            "remoteTerminalClosed": "Le terminal distant était fermé.",
+            "ptyAllocationLimit": "Votre système ne peut plus allouer de périphériques pty. Fermez quelques terminaux inutilisés, dans Orca ou dans un autre programme, puis réessayez.",
+            "terminalProcessLimit": "Votre système ne peut pas démarrer un autre processus de terminal. Fermez les terminaux inutilisés ou quittez les processus inutiles, puis réessayez."
           },
           "TerminalProcessExitOverlay": {
             "capacityTitle": "Limite de consoles Git Bash atteinte",
@@ -3344,6 +3347,9 @@
           "TerminalQuickCommandsSubmenu": {
             "3ccc7981bb": "Hôte indisponible",
             "54f29b7c0d": "Chargement de l'hôte…"
+          },
+          "TerminalRestoringPlaceholder": {
+            "restoring": "Restauration du terminal…"
           }
         }
       },
@@ -3764,7 +3770,8 @@
             "floatingTerminalNewActivity": "{{label}}, nouvelle activité",
             "codexSignInSuccess": "Connecté à Codex",
             "codexSignInError": "Échec de la connexion à Codex. Veuillez réessayer.",
-            "cursorUsageMenu": "Utilisation Cursor"
+            "cursorUsageMenu": "Utilisation Cursor",
+            "hiddenUsageProviders": "Aussi : {{value0}}"
           },
           "StatusBarUsageEmptyCta": {
             "828c764a79": "Connecter un compte",
@@ -7983,8 +7990,7 @@
           "81057d5f71": "Enregistrement...",
           "da37d6f10e": "Copier",
           "3149964b66": "Copied",
-          "waitForSetupBeforeAgent": "Attendre la fin du setup avant de démarrer l'agent",
-          "waitForSetupBeforeAgentHelp": "Activez cette option quand le setup installe des dépendances, des serveurs MCP ou des fichiers de configuration dont l'agent a besoin au démarrage."
+          "waitForSetupBeforeAgent": "Attendre la fin du setup avant de démarrer l'agent"
         },
         "RepositoryIconPicker": {
           "2b7d27b93c": "Utiliser la couleur de dépôt {{value0}}",
@@ -17405,6 +17411,56 @@
   },
   "components": {
     "native-chat": {
+      "writeNotice": {
+        "notDoneReadHistory": "L'historique de ce chat n'a pas pu être chargé.",
+        "notDoneSend": "Votre message n'a pas été envoyé.",
+        "tryAgainComposerSend": "Renvoyez-le.",
+        "notDoneStop": "L'agent n'a pas été arrêté.",
+        "notDoneStopTask": "La tâche en arrière-plan n'a pas été arrêtée.",
+        "notDoneStopTasks": "Les tâches en arrière-plan n'ont pas été arrêtées.",
+        "notDoneAnswer": "Votre réponse n'a pas été envoyée.",
+        "notDoneOption": "Le paramètre n'a pas été modifié.",
+        "notDoneCommand": "La commande n'a pas été exécutée.",
+        "notDoneGoal": "L'objectif n'a pas été modifié.",
+        "restartFailed": "L'agent n'a pas pu redémarrer.",
+        "capacity": "Orca a reçu trop de requêtes au cours de la dernière journée.",
+        "outcomeUnknown": "Orca n'a pas pu confirmer ce qui s'est passé. Vérifiez le chat.",
+        "questionChanged": "Cette question a déjà reçu une réponse ou a changé.",
+        "historyUnreadable": "Orca n'a pas pu lire l'historique enregistré de ce chat.",
+        "historyUnusable": "Impossible de charger ce chat.",
+        "historyUnavailable": "Orca n'a pas pu ouvrir l'historique de ce chat pour le moment.",
+        "unsupported": "L'instance d'Orca qui exécute ce chat ne le prend pas en charge. Mettez Orca à jour, puis réessayez.",
+        "unreachable": "Orca n'a pas pu joindre l'agent.",
+        "recordFailed": "Orca n'a pas pu l'enregistrer dans l'historique de ce chat.",
+        "conversationCleared": "Cette conversation a été effacée.",
+        "openCurrentConversation": "Ouvrez la conversation actuelle pour continuer.",
+        "clearUnfinished": "Le dernier /clear ne s'est pas terminé.",
+        "commandRunning": "Un /compact ou /clear est encore en cours.",
+        "waitForCommand": "Attendez la fin du /compact ou /clear.",
+        "agentStarting": "L'agent est encore en cours de démarrage.",
+        "waitForStart": "Attendez que l'agent ait fini de démarrer.",
+        "turnActive": "L'agent est encore en train de répondre.",
+        "waitForTurn": "Attendez que l'agent ait fini de répondre, ou arrêtez-le.",
+        "promptPending": "L'agent attend une réponse à une question ou à une demande d'approbation.",
+        "answerFirst": "Répondez d'abord à la question ou à la demande d'approbation.",
+        "backgroundTasksRunning": "Des tâches en arrière-plan sont encore en cours.",
+        "waitForBackgroundTasks": "Attendez la fin des tâches en arrière-plan.",
+        "messagesUnsettled": "Un message que vous avez envoyé plus tôt n'a pas encore été confirmé.",
+        "settleEarlierMessage": "Attendez que votre message précédent soit transmis, ou renvoyez-le.",
+        "optionRejected": "L'agent n'a pas accepté ce réglage.",
+        "goalsUnsupported": "Cet agent ne prend pas en charge les objectifs.",
+        "agentRefused": "L'agent l'a refusé.",
+        "ownerUnproven": "Orca n'a pas confirmé l'arrêt de l'agent précédent de ce chat.",
+        "reopenChat": "Rouvrez le chat pour vérifier à nouveau.",
+        "terminalAgentHoldsChat": "Ce chat est encore ouvert dans un agent de terminal.",
+        "quitTerminalAgent": "Quittez cet agent pour continuer le chat ici.",
+        "hostReconciling": "Orca vérifie encore ce chat après son redémarrage.",
+        "waitMoment": "Patientez un instant.",
+        "recordUnreadable": "Orca n'a pas pu lire l'état enregistré de ce chat.",
+        "chatNotFound": "L'instance d'Orca qui exécute ce chat n'en a aucune trace.",
+        "startNewChat": "Démarrez un nouveau chat pour continuer.",
+        "tryAgain": "Réessayez."
+      },
       "composer": {
         "imageUnsupported": "Le collage d'image n'est pas pris en charge pour cet agent.",
         "send": "Envoyer",
@@ -17561,8 +17617,10 @@
         },
         "error": {
           "title": "Impossible de charger la conversation",
-          "subtitle": "La transcription n'a pas pu être lue. Rebasculez sur le terminal pour continuer à travailler."
+          "subtitle": "La transcription n'a pas pu être lue. Rebasculez sur le terminal pour continuer à travailler.",
+          "retryingSubtitle": "La transcription n'a pas pu être lue. Orca continue d'essayer de la charger."
         },
+        "reconnecting": "Reconnexion à ce chat…",
         "pairHost": "Associez un hôte pour consulter l'historique de chat des agents.",
         "notAgent": {
           "title": "Aucune conversation ici",
@@ -17687,6 +17745,7 @@
       "railEmptyMessage": "Message",
       "ask": {
         "awaiting": "En attente de la saisie de l'utilisateur :",
+        "awaitingUnnamed": "En attente de la saisie de l'utilisateur",
         "asked": "Demandé:",
         "questionCount": "{{value0}} questions"
       },
@@ -17710,7 +17769,9 @@
         "startedN": "Lancement des sous-agents {{value0}}",
         "ranOne": "A exécuté 1 sous-agent",
         "ranN": "Ran les sous-agents {{value0}}",
-        "tokens": "Jetons {{value0}}"
+        "tokens": "Jetons {{value0}}",
+        "unnamed": "Sous-agent",
+        "writtenBy": "Écrit par le sous-agent {{value0}}"
       },
       "conversationCommand": {
         "pendingWork": "Attendez la fin du travail et des messages en attente avant d'utiliser cette commande.",
@@ -18109,6 +18170,9 @@
           }
         }
       }
+    },
+    "agentChildRow": {
+      "ended": "Terminé"
     }
   },
   "dashboardPopout": {
@@ -18284,6 +18348,7 @@
       "needsInput": "attend une réponse",
       "working": "en cours",
       "stopped": "arrêté",
+      "failed": "échoué",
       "finished": "terminé"
     }
   },
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index f3e2e0f082b0..bcb68593d904 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -496,6 +496,7 @@
           "mimo_code_label": "MiMo Code",
           "muse_label": "Muse",
           "opencode2_label": "OpenCode 2",
+          "codebuddy_label": "CodeBuddy",
           "zcode_label": "ZCode"
         },
         "skill": {
@@ -1602,7 +1603,6 @@
         "reuseExistingBranchHint": "既存のブランチから新規ブランチを作成せず、そのブランチをチェックアウトします。",
         "createMultiple": "さらに作成",
         "waitForSetupBeforeAgent": "セットアップが完了するまで待ってから Agent を開始してください",
-        "waitForSetupBeforeAgentHelp": "セットアップによって、起動時に Agent に必要な依存関係、MCP サーバー、または構成ファイルがインストールされるときに、これをオンにします。",
         "destroyDisabled": "破壊は無効です",
         "destroyConfigured": "設定されたものを破棄する",
         "noDestroyConfigured": "破壊しない",
@@ -3033,6 +3033,7 @@
           },
           "TerminalContextMenu": {
             "b4cdd9314e": "クリアスクリーン",
+            "resetTerminal": "ターミナルをリセット",
             "8c17d6786d": "ペインを閉じる",
             "copyTerminalId": "ターミナル ID をコピー",
             "2cf85a6a55": "ペインIDのコピー",
@@ -3068,7 +3069,9 @@
             "42b283ecfc": "ホストが保存されたセッションを確認できなかったため、Orca はこのターミナルを安全に再接続できませんでした。 Orca は保存されたセッションを変更せずに残しました。今すぐ再接続を試みるには、「再試行」をクリックします。それでも再接続できない場合は、新規ターミナルを開きます。",
             "e16012e31e": "このセッションを所有していたターミナルデーモンが終了したため、セッションとそのスクロールバックを回復できませんでした。続行するには、新規ターミナルを開いてください。",
             "sessionUnavailable": "Orca はホスト上のこのペインのターミナルセッションに再接続できませんでした。続行するには、新規ターミナルを開いてください。",
-            "sourceRestoring": "このターミナルを再接続しています — その出力が再確立されています。セッションはまだ実行中です。"
+            "sourceRestoring": "このターミナルを再接続しています — その出力が再確立されています。セッションはまだ実行中です。",
+            "ptyAllocationLimit": "システムはこれ以上 pty デバイスを割り当てられません。Orca または他のプログラムで使っていないターミナルをいくつか閉じてから、もう一度お試しください。",
+            "terminalProcessLimit": "システムはこれ以上ターミナルプロセスを起動できません。使っていないターミナルを閉じるか、不要なプロセスを終了してから、もう一度お試しください。"
           },
           "TerminalProcessExitOverlay": {
             "capacityTitle": "Git Bash のコンソール上限に達しました",
@@ -3241,6 +3244,9 @@
           "TerminalQuickCommandsSubmenu": {
             "3ccc7981bb": "ホストが利用不可",
             "54f29b7c0d": "ホストを読み込み中…"
+          },
+          "TerminalRestoringPlaceholder": {
+            "restoring": "ターミナルを復元中…"
           }
         }
       },
@@ -3669,7 +3675,8 @@
             "floatingTerminalNewActivity": "{{label}}、新規アクティビティ",
             "codexSignInSuccess": "Codex にサインインしました",
             "codexSignInError": "Codex のサインインに失敗しました。もう一度お試しください。",
-            "cursorUsageMenu": "Cursor の使用状況"
+            "cursorUsageMenu": "Cursor の使用状況",
+            "hiddenUsageProviders": "ほかに: {{value0}}"
           },
           "StatusBarUsageEmptyCta": {
             "828c764a79": "アカウントを接続する",
@@ -7864,8 +7871,7 @@
           "81057d5f71": "保存中…",
           "da37d6f10e": "コピー",
           "3149964b66": "コピーしました",
-          "waitForSetupBeforeAgent": "セットアップが完了するまで待ってから Agent を開始してください",
-          "waitForSetupBeforeAgentHelp": "セットアップによって、起動時に Agent に必要な依存関係、MCP サーバー、または構成ファイルがインストールされるときに、これをオンにします。"
+          "waitForSetupBeforeAgent": "セットアップが完了するまで待ってから Agent を開始してください"
         },
         "RepositoryIconPicker": {
           "2b7d27b93c": "{{value0}} リポジトリカラーを使用する",
@@ -15009,7 +15015,7 @@
         },
         "MarkdownPreview": {
           "e4683f70c4": "キャンセル",
-          "d737791433": "AI に関するメモを追加",
+          "d737791433": "AI 向けのメモを追加",
           "b1bfc04034": "選択したテキスト",
           "f37b98999e": "このメモ",
           "2b2b31382c": "フロントマター",
@@ -15497,7 +15503,7 @@
             "e05063cfc1": "{{value0}} 行目",
             "c845170b3b": "行 {{value0}}-{{value1}}",
             "commentTooLarge": "コメントが大きすぎるため安全に送信できません。",
-            "f6c449191e": "AI に関するメモを追加",
+            "f6c449191e": "AI 向けのメモを追加",
             "5fa4bfebaa": "メモを追加",
             "5e9b3d0c2e": "追加中…"
           },
@@ -17341,6 +17347,56 @@
       }
     },
     "native-chat": {
+      "writeNotice": {
+        "notDoneReadHistory": "このチャットの履歴を読み込めませんでした。",
+        "notDoneSend": "メッセージは送信されませんでした。",
+        "tryAgainComposerSend": "もう一度送信してください。",
+        "notDoneStop": "Agent は停止されませんでした。",
+        "notDoneStopTask": "バックグラウンドタスクは停止されませんでした。",
+        "notDoneStopTasks": "バックグラウンドタスクは停止されませんでした。",
+        "notDoneAnswer": "回答は送信されませんでした。",
+        "notDoneOption": "設定は変更されませんでした。",
+        "notDoneCommand": "コマンドは実行されませんでした。",
+        "notDoneGoal": "目標は変更されませんでした。",
+        "restartFailed": "Agent を再起動できませんでした。",
+        "capacity": "Orca が過去 1 日に受け取ったリクエストが多すぎます。",
+        "outcomeUnknown": "Orca は何が起きたかを確認できませんでした。チャットを確認してください。",
+        "questionChanged": "この質問はすでに回答済みか、変更されています。",
+        "historyUnreadable": "Orca はこのチャットの保存済み履歴を読み取れませんでした。",
+        "historyUnusable": "このチャットを読み込めません。",
+        "historyUnavailable": "Orca は現在このチャットの履歴を開けませんでした。",
+        "unsupported": "このチャットを実行している Orca はこの操作に対応していません。Orca を更新してから、もう一度お試しください。",
+        "unreachable": "Orca は Agent に接続できませんでした。",
+        "recordFailed": "Orca はこのチャットの履歴に記録できませんでした。",
+        "conversationCleared": "この会話はクリアされました。",
+        "openCurrentConversation": "続けるには、現在の会話を開いてください。",
+        "clearUnfinished": "前回の /clear は完了しませんでした。",
+        "commandRunning": "/compact または /clear がまだ実行中です。",
+        "waitForCommand": "/compact または /clear が終わるまでお待ちください。",
+        "agentStarting": "Agent はまだ起動中です。",
+        "waitForStart": "Agent の起動が終わるまでお待ちください。",
+        "turnActive": "Agent はまだ応答中です。",
+        "waitForTurn": "Agent の応答が終わるまで待つか、Agent を停止してください。",
+        "promptPending": "Agent は質問または承認への回答を待っています。",
+        "answerFirst": "先に質問または承認に回答してください。",
+        "backgroundTasksRunning": "バックグラウンドタスクがまだ実行中です。",
+        "waitForBackgroundTasks": "バックグラウンドタスクが終わるまでお待ちください。",
+        "messagesUnsettled": "以前に送信したメッセージがまだ確認されていません。",
+        "settleEarlierMessage": "以前のメッセージが届くまで待つか、再試行してください。",
+        "optionRejected": "Agent はこの設定を受け入れませんでした。",
+        "goalsUnsupported": "この Agent は目標に対応していません。",
+        "agentRefused": "Agent がこれを拒否しました。",
+        "ownerUnproven": "Orca は、このチャットの以前の Agent が停止したことをまだ確認できていません。",
+        "reopenChat": "もう一度確認するには、チャットを開き直してください。",
+        "terminalAgentHoldsChat": "このチャットはまだターミナルの Agent で開かれています。",
+        "quitTerminalAgent": "ここでチャットを続けるには、その Agent を終了してください。",
+        "hostReconciling": "Orca は再起動後、このチャットをまだ確認しています。",
+        "waitMoment": "しばらくお待ちください。",
+        "recordUnreadable": "Orca はこのチャットの保存済みの状態を読み取れませんでした。",
+        "chatNotFound": "このチャットを実行している Orca には、このチャットの記録がありません。",
+        "startNewChat": "続けるには、新しいチャットを開始してください。",
+        "tryAgain": "もう一度お試しください。"
+      },
       "composer": {
         "imageUnsupported": "この Agent では画像の貼り付けはサポートされていません。",
         "send": "送信",
@@ -17497,8 +17553,10 @@
         },
         "error": {
           "title": "会話を読み込めませんでした",
-          "subtitle": "トランスクリプトを読み取ることができませんでした。作業を続けるには、ターミナルに切り替えてください。"
+          "subtitle": "トランスクリプトを読み取ることができませんでした。作業を続けるには、ターミナルに切り替えてください。",
+          "retryingSubtitle": "トランスクリプトを読み取ることができませんでした。Orca は読み込みを再試行し続けます。"
         },
+        "reconnecting": "このチャットに再接続しています…",
         "pairHost": "ホストをペアリングして、Agent のチャット履歴を表示します。",
         "notAgent": {
           "title": "ここでは会話はありません",
@@ -17623,6 +17681,7 @@
       "railEmptyMessage": "メッセージ",
       "ask": {
         "awaiting": "ユーザー入力を待っています:",
+        "awaitingUnnamed": "ユーザー入力を待っています",
         "asked": "質問:",
         "questionCount": "{{value0}} の質問"
       },
@@ -17646,7 +17705,9 @@
         "startedN": "{{value0}} サブ Agent をキックオフしました",
         "ranOne": "1 人のサブ Agent を実行しました",
         "ranN": "{{value0}} サブ Agent を実行しました",
-        "tokens": "{{value0}} トークン"
+        "tokens": "{{value0}} トークン",
+        "unnamed": "サブ Agent",
+        "writtenBy": "サブ Agent {{value0}} による出力"
       },
       "conversationCommand": {
         "pendingWork": "このコマンドを使用する前に、保留中の作業とメッセージが完了するまで待ってください。",
@@ -18010,6 +18071,9 @@
           }
         }
       }
+    },
+    "agentChildRow": {
+      "ended": "終了"
     }
   },
   "dashboardPopout": {
@@ -18236,6 +18300,7 @@
       "needsInput": "入力待ち",
       "working": "処理中",
       "stopped": "停止",
+      "failed": "失敗",
       "finished": "完了"
     }
   },
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index b3c26d91cc13..8aa0335d8917 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -496,6 +496,7 @@
           "mimo_code_label": "MiMo Code",
           "muse_label": "Muse",
           "opencode2_label": "OpenCode 2",
+          "codebuddy_label": "CodeBuddy",
           "zcode_label": "ZCode"
         },
         "skill": {
@@ -1602,7 +1603,6 @@
         "reuseExistingBranchHint": "기존 브랜치에서 새 브랜치를 만들지 않고 해당 브랜치를 체크아웃합니다.",
         "createMultiple": "더 만들기",
         "waitForSetupBeforeAgent": "agent를 시작하기 전에 설정이 완료될 때까지 기다리세요.",
-        "waitForSetupBeforeAgentHelp": "설치 프로그램이 시작 중에 agent에 필요한 종속성, MCP 서버 또는 구성 파일을 설치할 때 이 기능을 켜십시오.",
         "destroyDisabled": "비활성화된 파괴",
         "destroyConfigured": "구성된 파괴",
         "noDestroyConfigured": "파괴하지 마세요",
@@ -3033,6 +3033,7 @@
           },
           "TerminalContextMenu": {
             "b4cdd9314e": "화면 지우기",
+            "resetTerminal": "터미널 초기화",
             "8c17d6786d": "창 닫기",
             "copyTerminalId": "터미널 ID 복사",
             "2cf85a6a55": "창 ID 복사",
@@ -3068,7 +3069,9 @@
             "42b283ecfc": "호스트가 저장된 세션을 확인할 수 없기 때문에 Orca가 이 터미널을 안전하게 다시 연결할 수 없습니다. 오르카는 저장된 세션을 변경하지 않고 그대로 두었습니다. 지금 다시 연결을 시도하려면 재시도를 클릭하세요. 그래도 다시 연결할 수 없으면 새 터미널을 엽니다.",
             "e16012e31e": "이 세션을 소유한 터미널 데몬이 종료되었으므로 세션과 해당 스크롤백을 복구할 수 없습니다. 계속하려면 새 터미널을 여세요.",
             "sessionUnavailable": "Orca가 호스트에서 이 창의 터미널 세션에 다시 연결할 수 없습니다. 계속하려면 새 터미널을 여세요.",
-            "sourceRestoring": "이 터미널을 다시 연결하는 중 - 출력이 다시 설정되고 있습니다. 세션이 아직 실행 중입니다."
+            "sourceRestoring": "이 터미널을 다시 연결하는 중 - 출력이 다시 설정되고 있습니다. 세션이 아직 실행 중입니다.",
+            "ptyAllocationLimit": "시스템에서 더 이상 pty 장치를 할당할 수 없습니다. Orca 또는 다른 프로그램에서 사용하지 않는 터미널을 몇 개 닫은 후 다시 시도하세요.",
+            "terminalProcessLimit": "시스템에서 터미널 프로세스를 더 시작할 수 없습니다. 사용하지 않는 터미널을 닫거나 불필요한 프로세스를 종료한 후 다시 시도하세요."
           },
           "TerminalProcessExitOverlay": {
             "capacityTitle": "Git Bash 콘솔 한도에 도달했습니다",
@@ -3241,6 +3244,9 @@
           "TerminalQuickCommandsSubmenu": {
             "3ccc7981bb": "호스트를 사용할 수 없음",
             "54f29b7c0d": "호스트 로드 중…"
+          },
+          "TerminalRestoringPlaceholder": {
+            "restoring": "터미널 복원 중…"
           }
         }
       },
@@ -3669,7 +3675,8 @@
             "floatingTerminalNewActivity": "{{label}}, 새 활동",
             "codexSignInSuccess": "Codex에 로그인했습니다",
             "codexSignInError": "Codex 로그인에 실패했습니다. 다시 시도해 주세요.",
-            "cursorUsageMenu": "Cursor 사용량"
+            "cursorUsageMenu": "Cursor 사용량",
+            "hiddenUsageProviders": "그 외: {{value0}}"
           },
           "StatusBarUsageEmptyCta": {
             "828c764a79": "계정 연결",
@@ -7827,8 +7834,7 @@
           "81057d5f71": "저장 중...",
           "da37d6f10e": "복사",
           "3149964b66": "복사됨",
-          "waitForSetupBeforeAgent": "agent를 시작하기 전에 설정이 완료될 때까지 기다리세요.",
-          "waitForSetupBeforeAgentHelp": "설치 프로그램이 시작 중에 agent에 필요한 종속성, MCP 서버 또는 구성 파일을 설치할 때 이 기능을 켜십시오."
+          "waitForSetupBeforeAgent": "agent를 시작하기 전에 설정이 완료될 때까지 기다리세요."
         },
         "RepositoryIconPicker": {
           "2b7d27b93c": "{{value0}} repo 색상 사용",
@@ -15009,7 +15015,7 @@
         },
         "MarkdownPreview": {
           "e4683f70c4": "취소",
-          "d737791433": "AI에 대한 메모 추가",
+          "d737791433": "AI에게 전달할 메모 추가",
           "b1bfc04034": "선택한 텍스트",
           "f37b98999e": "이 메모",
           "2b2b31382c": "머리말",
@@ -15497,7 +15503,7 @@
             "e05063cfc1": "라인 {{value0}}",
             "c845170b3b": "라인 {{value0}}-{{value1}}",
             "commentTooLarge": "댓글이 너무 길어 안전하게 제출할 수 없습니다.",
-            "f6c449191e": "AI에 대한 메모 추가",
+            "f6c449191e": "AI에게 전달할 메모 추가",
             "5fa4bfebaa": "메모 추가",
             "5e9b3d0c2e": "추가 중..."
           },
@@ -17341,6 +17347,56 @@
       }
     },
     "native-chat": {
+      "writeNotice": {
+        "notDoneReadHistory": "이 채팅의 기록을 불러오지 못했습니다.",
+        "notDoneSend": "메시지가 전송되지 않았습니다.",
+        "tryAgainComposerSend": "다시 보내세요.",
+        "notDoneStop": "에이전트가 중지되지 않았습니다.",
+        "notDoneStopTask": "백그라운드 작업이 중지되지 않았습니다.",
+        "notDoneStopTasks": "백그라운드 작업이 중지되지 않았습니다.",
+        "notDoneAnswer": "답변이 전송되지 않았습니다.",
+        "notDoneOption": "설정이 변경되지 않았습니다.",
+        "notDoneCommand": "명령이 실행되지 않았습니다.",
+        "notDoneGoal": "목표가 변경되지 않았습니다.",
+        "restartFailed": "에이전트를 다시 시작하지 못했습니다.",
+        "capacity": "Orca가 지난 하루 동안 너무 많은 요청을 받았습니다.",
+        "outcomeUnknown": "Orca가 무슨 일이 있었는지 확인하지 못했습니다. 채팅을 확인하세요.",
+        "questionChanged": "이 질문은 이미 답변되었거나 변경되었습니다.",
+        "historyUnreadable": "Orca가 이 채팅의 저장된 기록을 읽지 못했습니다.",
+        "historyUnusable": "이 채팅을 불러올 수 없습니다.",
+        "historyUnavailable": "Orca가 지금 이 채팅의 기록을 열지 못했습니다.",
+        "unsupported": "이 채팅을 실행 중인 Orca가 이 기능을 지원하지 않습니다. Orca를 업데이트한 후 다시 시도하세요.",
+        "unreachable": "Orca가 에이전트에 연결하지 못했습니다.",
+        "recordFailed": "Orca가 이 채팅의 기록에 저장하지 못했습니다.",
+        "conversationCleared": "이 대화는 지워졌습니다.",
+        "openCurrentConversation": "계속하려면 현재 대화를 여세요.",
+        "clearUnfinished": "마지막 /clear가 완료되지 않았습니다.",
+        "commandRunning": "/compact 또는 /clear가 아직 실행 중입니다.",
+        "waitForCommand": "/compact 또는 /clear가 끝날 때까지 기다리세요.",
+        "agentStarting": "에이전트가 아직 시작 중입니다.",
+        "waitForStart": "에이전트가 시작을 마칠 때까지 기다리세요.",
+        "turnActive": "에이전트가 아직 응답 중입니다.",
+        "waitForTurn": "에이전트가 응답을 마칠 때까지 기다리거나 에이전트를 중지하세요.",
+        "promptPending": "에이전트가 질문 또는 승인에 대한 응답을 기다리고 있습니다.",
+        "answerFirst": "먼저 질문 또는 승인에 응답하세요.",
+        "backgroundTasksRunning": "백그라운드 작업이 아직 실행 중입니다.",
+        "waitForBackgroundTasks": "백그라운드 작업이 끝날 때까지 기다리세요.",
+        "messagesUnsettled": "앞서 보낸 메시지가 아직 확인되지 않았습니다.",
+        "settleEarlierMessage": "앞서 보낸 메시지가 전달될 때까지 기다리거나 다시 시도하세요.",
+        "optionRejected": "에이전트가 이 설정을 받아들이지 않았습니다.",
+        "goalsUnsupported": "이 에이전트는 목표를 지원하지 않습니다.",
+        "agentRefused": "에이전트가 이를 거부했습니다.",
+        "ownerUnproven": "Orca가 이 채팅의 이전 에이전트가 중지되었는지 아직 확인하지 못했습니다.",
+        "reopenChat": "다시 확인하려면 채팅을 다시 여세요.",
+        "terminalAgentHoldsChat": "이 채팅은 아직 터미널 에이전트에서 열려 있습니다.",
+        "quitTerminalAgent": "여기에서 채팅을 계속하려면 해당 에이전트를 종료하세요.",
+        "hostReconciling": "Orca가 다시 시작된 후 이 채팅을 아직 확인하고 있습니다.",
+        "waitMoment": "잠시 기다리세요.",
+        "recordUnreadable": "Orca가 이 채팅의 저장된 상태를 읽지 못했습니다.",
+        "chatNotFound": "이 채팅을 실행하는 Orca에 이 채팅의 기록이 없습니다.",
+        "startNewChat": "계속하려면 새 채팅을 시작하세요.",
+        "tryAgain": "다시 시도하세요."
+      },
       "composer": {
         "imageUnsupported": "이 에이전트는 이미지 붙여넣기를 지원하지 않습니다.",
         "send": "보내기",
@@ -17497,8 +17553,10 @@
         },
         "error": {
           "title": "대화를 로드할 수 없습니다.",
-          "subtitle": "스크립트를 읽을 수 없습니다. 계속 작업하려면 terminal로 다시 전환하세요."
+          "subtitle": "스크립트를 읽을 수 없습니다. 계속 작업하려면 terminal로 다시 전환하세요.",
+          "retryingSubtitle": "스크립트를 읽을 수 없습니다. Orca가 계속 다시 불러오기를 시도합니다."
         },
+        "reconnecting": "이 채팅에 다시 연결하는 중…",
         "pairHost": "호스트를 페어링하여 에이전트 채팅 기록을 확인하세요.",
         "notAgent": {
           "title": "여기에는 대화가 없습니다.",
@@ -17623,6 +17681,7 @@
       "railEmptyMessage": "메시지",
       "ask": {
         "awaiting": "사용자 입력을 기다리는 중:",
+        "awaitingUnnamed": "사용자 입력을 기다리는 중",
         "asked": "질문:",
         "questionCount": "{{value0}} 질문"
       },
@@ -17646,7 +17705,9 @@
         "startedN": "{{value0}} 하위 에이전트가 시작되었습니다.",
         "ranOne": "하위 에이전트 1개 실행",
         "ranN": "{{value0}} 하위 에이전트를 실행했습니다.",
-        "tokens": "{{value0}} 토큰"
+        "tokens": "{{value0}} 토큰",
+        "unnamed": "하위 에이전트",
+        "writtenBy": "하위 에이전트 {{value0}}의 출력"
       },
       "conversationCommand": {
         "pendingWork": "이 명령을 사용하기 전에 보류 중인 작업과 메시지가 완료될 때까지 기다리십시오.",
@@ -18010,6 +18071,9 @@
           }
         }
       }
+    },
+    "agentChildRow": {
+      "ended": "종료됨"
     }
   },
   "dashboardPopout": {
@@ -18236,6 +18300,7 @@
       "needsInput": "입력 필요",
       "working": "작업 중",
       "stopped": "중지됨",
+      "failed": "실패함",
       "finished": "완료됨"
     }
   },
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index a5652bc21417..70cbc25bdc54 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -496,6 +496,7 @@
           "mimo_code_label": "MiMo Code",
           "muse_label": "Muse",
           "opencode2_label": "OpenCode 2",
+          "codebuddy_label": "CodeBuddy",
           "zcode_label": "ZCode"
         },
         "skill": {
@@ -1602,7 +1603,6 @@
         "reuseExistingBranchHint": "检出已有分支，而不是从它创建新分支。",
         "createMultiple": "创建更多",
         "waitForSetupBeforeAgent": "等待设置完成后再启动智能体",
-        "waitForSetupBeforeAgentHelp": "如果设置会安装依赖、MCP 服务器或智能体启动时需要的配置文件，请开启此选项。",
         "destroyDisabled": "已禁用销毁",
         "destroyConfigured": "已配置销毁",
         "noDestroyConfigured": "未配置销毁",
@@ -3033,6 +3033,7 @@
           },
           "TerminalContextMenu": {
             "b4cdd9314e": "清屏",
+            "resetTerminal": "重置终端",
             "8c17d6786d": "关闭窗格",
             "copyTerminalId": "复制终端 ID",
             "2cf85a6a55": "复制窗格 ID",
@@ -3068,7 +3069,9 @@
             "42b283ecfc": "Orca 无法安全地重新连接此终端，因为主机无法验证其保存的会话。 Orca 保持保存的会话不变。单击“重试”立即尝试重新连接。如果仍然无法重新连接，请打开一个新终端。",
             "e16012e31e": "拥有该会话的终端守护程序已退出，因此该会话及其回滚无法恢复。打开新终端以继续。",
             "sessionUnavailable": "Orca 无法重新连接到主机上此窗格的终端会话。打开新终端以继续。",
-            "sourceRestoring": "重新连接该终端 — 正在重新建立其输出。会话仍在进行。"
+            "sourceRestoring": "重新连接该终端 — 正在重新建立其输出。会话仍在进行。",
+            "ptyAllocationLimit": "系统无法再分配 pty 设备。请在 Orca 或其他程序中关闭一些不用的终端，然后重试。",
+            "terminalProcessLimit": "系统无法再启动终端进程。请关闭不用的终端或退出不用的进程，然后重试。"
           },
           "TerminalProcessExitOverlay": {
             "capacityTitle": "已达到 Git Bash 控制台上限",
@@ -3241,6 +3244,9 @@
           "TerminalQuickCommandsSubmenu": {
             "3ccc7981bb": "主机不可用",
             "54f29b7c0d": "正在加载主机..."
+          },
+          "TerminalRestoringPlaceholder": {
+            "restoring": "正在恢复终端…"
           }
         }
       },
@@ -3669,7 +3675,8 @@
             "floatingTerminalNewActivity": "{{label}}，有新活动",
             "codexSignInSuccess": "已登录 Codex",
             "codexSignInError": "Codex 登录失败，请重试。",
-            "cursorUsageMenu": "Cursor 用量"
+            "cursorUsageMenu": "Cursor 用量",
+            "hiddenUsageProviders": "另有：{{value0}}"
           },
           "StatusBarUsageEmptyCta": {
             "828c764a79": "连接账户",
@@ -7827,8 +7834,7 @@
           "81057d5f71": "保存中...",
           "da37d6f10e": "复制",
           "3149964b66": "已复制",
-          "waitForSetupBeforeAgent": "等待设置完成后再启动智能体",
-          "waitForSetupBeforeAgentHelp": "如果设置会安装依赖、MCP 服务器或智能体启动时需要的配置文件，请开启此选项。"
+          "waitForSetupBeforeAgent": "等待设置完成后再启动智能体"
         },
         "RepositoryIconPicker": {
           "2b7d27b93c": "使用 {{value0}} 仓库颜色",
@@ -17306,6 +17312,56 @@
   },
   "components": {
     "native-chat": {
+      "writeNotice": {
+        "notDoneReadHistory": "无法加载此聊天的历史记录。",
+        "notDoneSend": "您的消息未发送。",
+        "tryAgainComposerSend": "请重新发送。",
+        "notDoneStop": "智能体未停止。",
+        "notDoneStopTask": "后台任务未停止。",
+        "notDoneStopTasks": "后台任务未停止。",
+        "notDoneAnswer": "您的回答未发送。",
+        "notDoneOption": "设置未更改。",
+        "notDoneCommand": "命令未运行。",
+        "notDoneGoal": "目标未更改。",
+        "restartFailed": "智能体无法重新启动。",
+        "capacity": "Orca 在过去一天内收到的请求过多。",
+        "outcomeUnknown": "Orca 无法确认发生了什么。请查看聊天。",
+        "questionChanged": "此问题已被回答或已更改。",
+        "historyUnreadable": "Orca 无法读取此聊天的已保存历史记录。",
+        "historyUnusable": "无法加载此聊天。",
+        "historyUnavailable": "Orca 目前无法打开此聊天的历史记录。",
+        "unsupported": "运行此聊天的 Orca 不支持此操作。请更新 Orca 后重试。",
+        "unreachable": "Orca 无法连接到智能体。",
+        "recordFailed": "Orca 无法将其记录到此聊天的历史记录中。",
+        "conversationCleared": "此对话已被清除。",
+        "openCurrentConversation": "请打开当前对话以继续。",
+        "clearUnfinished": "上一次 /clear 未完成。",
+        "commandRunning": "/compact 或 /clear 仍在运行。",
+        "waitForCommand": "请等待 /compact 或 /clear 完成。",
+        "agentStarting": "智能体仍在启动。",
+        "waitForStart": "请等待智能体完成启动。",
+        "turnActive": "智能体仍在回复。",
+        "waitForTurn": "请等待智能体完成回复，或将其停止。",
+        "promptPending": "智能体正在等待您回答问题或审批。",
+        "answerFirst": "请先回答问题或审批。",
+        "backgroundTasksRunning": "后台任务仍在运行。",
+        "waitForBackgroundTasks": "请等待后台任务完成。",
+        "messagesUnsettled": "您之前发送的一条消息尚未确认。",
+        "settleEarlierMessage": "请等待之前的消息送达，或重试该消息。",
+        "optionRejected": "智能体未接受此设置。",
+        "goalsUnsupported": "此智能体不支持目标。",
+        "agentRefused": "智能体拒绝了此请求。",
+        "ownerUnproven": "Orca 尚未确认此聊天之前的智能体已停止。",
+        "reopenChat": "请重新打开聊天以再次检查。",
+        "terminalAgentHoldsChat": "此聊天仍在终端智能体中打开。",
+        "quitTerminalAgent": "请退出该智能体，以便在此处继续聊天。",
+        "hostReconciling": "Orca 重启后仍在检查此聊天。",
+        "waitMoment": "请稍候。",
+        "recordUnreadable": "Orca 无法读取此聊天的已保存状态。",
+        "chatNotFound": "运行此聊天的 Orca 没有此聊天的记录。",
+        "startNewChat": "请开始新的聊天以继续。",
+        "tryAgain": "请重试。"
+      },
       "composer": {
         "imageUnsupported": "此智能体不支持粘贴图片。",
         "send": "发送",
@@ -17462,8 +17518,10 @@
         },
         "error": {
           "title": "无法加载对话",
-          "subtitle": "无法读取记录。请切回终端继续工作。"
+          "subtitle": "无法读取记录。请切回终端继续工作。",
+          "retryingSubtitle": "无法读取记录。Orca 会继续尝试加载。"
         },
+        "reconnecting": "正在重新连接此聊天…",
         "pairHost": "配对主机以查看智能体聊天记录。",
         "notAgent": {
           "title": "这里没有对话",
@@ -17588,6 +17646,7 @@
       "railEmptyMessage": "信息",
       "ask": {
         "awaiting": "等待用户输入：",
+        "awaitingUnnamed": "等待用户输入",
         "asked": "问：",
         "questionCount": "{{value0}} 问题"
       },
@@ -17611,7 +17670,9 @@
         "startedN": "启动 {{value0}} 子代理",
         "ranOne": "Ran 1 子代理",
         "ranN": "Ran {{value0}} 子代理",
-        "tokens": "{{value0}} 代币"
+        "tokens": "{{value0}} 代币",
+        "unnamed": "子代理",
+        "writtenBy": "由子代理 {{value0}} 输出"
       },
       "conversationCommand": {
         "pendingWork": "在使用此命令之前，请等待挂起的工作和消息完成。",
@@ -18010,6 +18071,9 @@
           }
         }
       }
+    },
+    "agentChildRow": {
+      "ended": "已结束"
     }
   },
   "dashboardPopout": {
@@ -18236,6 +18300,7 @@
       "needsInput": "需要输入",
       "working": "处理中",
       "stopped": "已停止",
+      "failed": "已失败",
       "finished": "已完成"
     }
   },
diff --git a/src/renderer/src/i18n/notification-agent-status-locales.test.ts b/src/renderer/src/i18n/notification-agent-status-locales.test.ts
new file mode 100644
index 000000000000..47828fa580a0
--- /dev/null
+++ b/src/renderer/src/i18n/notification-agent-status-locales.test.ts
@@ -0,0 +1,22 @@
+import { describe, expect, it } from 'vitest'
+import en from './locales/en.json'
+import es from './locales/es.json'
+import fr from './locales/fr.json'
+import ja from './locales/ja.json'
+import ko from './locales/ko.json'
+import zh from './locales/zh.json'
+
+// Main words a notification from these keys with an English fallback, so a locale missing one
+// silently notifies in English; no other gate catches it.
+describe('notification agent status locales', () => {
+  it.each(Object.entries({ en, es, fr, ja, ko, zh }))(
+    '%s words every verdict',
+    (_locale, catalog) => {
+      const words = catalog.notifications.agentStatus
+      for (const key of ['needsInput', 'working', 'stopped', 'failed', 'finished'] as const) {
+        expect(words[key]).toEqual(expect.any(String))
+        expect(words[key].length).toBeGreaterThan(0)
+      }
+    }
+  )
+})
diff --git a/src/renderer/src/lib/activity-thread-display.test.ts b/src/renderer/src/lib/activity-thread-display.test.ts
index 03d5e7883316..0f491dca0d54 100644
--- a/src/renderer/src/lib/activity-thread-display.test.ts
+++ b/src/renderer/src/lib/activity-thread-display.test.ts
@@ -203,6 +203,17 @@ describe('getActivityThreadStatusPreview', () => {
     ).toBe('Interrupted by user')
   })
 
+  it('surfaces a failed turn as failed, not as its last reply', () => {
+    expect(
+      getActivityThreadStatusPreview({
+        state: 'done',
+        lastAssistantMessage: 'Done!',
+        mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: 1 },
+        prompt: 'Ship it'
+      })
+    ).toBe('Failed')
+  })
+
   it('names what a blocked approval is waiting on', () => {
     // Why: a permission request parks the row on 'waiting', and the tool fields are the
     // only thing that says what the user is being asked to approve (STA-3160).
diff --git a/src/renderer/src/lib/activity-thread-display.ts b/src/renderer/src/lib/activity-thread-display.ts
index c330edcb6f00..a4c81bc1a5dd 100644
--- a/src/renderer/src/lib/activity-thread-display.ts
+++ b/src/renderer/src/lib/activity-thread-display.ts
@@ -11,6 +11,7 @@ import {
   orchestrationLabelsMatchLiveDispatch
 } from './agent-row-primary-text'
 import { formatAgentToolPreview } from './agent-row-tool-preview'
+import { agentVerdictDisplayMark } from '../../../shared/agent-main-agent-verdict'
 
 // Why: follow-up replies ("yes", "ok proceed") are valid hook prompts but are
 // terrible scan labels for a cross-worktree agent list — treat them as non-titles.
@@ -194,13 +195,18 @@ export function getActivityThreadStatusPreview(
     | 'lastAssistantMessage'
     | 'lastCompletedAssistantMessage'
     | 'interrupted'
+    | 'mainAgent'
     | 'prompt'
   >,
   agentState?: AgentStatusState | null
 ): string {
-  if (entry.interrupted === true) {
+  const verdictMark = agentVerdictDisplayMark(entry)
+  if (verdictMark === 'interrupted') {
     return 'Interrupted by user'
   }
+  if (verdictMark === 'failed') {
+    return 'Failed'
+  }
   const state = agentState ?? entry.state
   const toolPreview = formatAgentToolPreview(entry, state)
   if (toolPreview) {
@@ -228,6 +234,7 @@ export function resolveActivityThreadStatusPreview(
     | 'lastAssistantMessage'
     | 'lastCompletedAssistantMessage'
     | 'interrupted'
+    | 'mainAgent'
     | 'prompt'
   >,
   agentState: AgentStatusState | null | undefined,
diff --git a/src/renderer/src/lib/agent-catalog-platform.ts b/src/renderer/src/lib/agent-catalog-platform.ts
new file mode 100644
index 000000000000..9a9eac351f07
--- /dev/null
+++ b/src/renderer/src/lib/agent-catalog-platform.ts
@@ -0,0 +1,13 @@
+export function getCatalogPlatform(): NodeJS.Platform {
+  const userAgent = typeof navigator === 'undefined' ? '' : navigator.userAgent
+  if (userAgent.includes('Windows')) {
+    return 'win32'
+  }
+  if (userAgent.includes('Mac')) {
+    return 'darwin'
+  }
+  if (userAgent) {
+    return 'linux'
+  }
+  return typeof process === 'undefined' ? 'linux' : process.platform
+}
diff --git a/src/renderer/src/lib/agent-catalog.tsx b/src/renderer/src/lib/agent-catalog.tsx
index 42c9baa7f6ea..325d838552d2 100644
--- a/src/renderer/src/lib/agent-catalog.tsx
+++ b/src/renderer/src/lib/agent-catalog.tsx
@@ -1,3 +1,4 @@
+import { getCatalogPlatform } from './agent-catalog-platform'
 import type React from 'react'
 import { ClaudeIcon, DroidIcon, OpenAIIcon } from '@/components/status-bar/icons'
 import openClaudeLogoUrl from '../../../../resources/openclaude-logo.png?url'
@@ -30,20 +31,6 @@ export type AgentCatalogEntry = {
   homepageUrl: string
 }
 
-function getCatalogPlatform(): NodeJS.Platform {
-  const userAgent = typeof navigator === 'undefined' ? '' : navigator.userAgent
-  if (userAgent.includes('Windows')) {
-    return 'win32'
-  }
-  if (userAgent.includes('Mac')) {
-    return 'darwin'
-  }
-  if (userAgent) {
-    return 'linux'
-  }
-  return typeof process === 'undefined' ? 'linux' : process.platform
-}
-
 export const getAgentCatalog = createLocalizedCatalog((): AgentCatalogEntry[] => [
   {
     id: 'claude',
@@ -127,6 +114,20 @@ export const getAgentCatalog = createLocalizedCatalog((): AgentCatalogEntry[] =>
     faviconDomain: 'dev.meta.ai',
     homepageUrl: 'https://dev.meta.ai/docs/muse-code'
   },
+  {
+    id: 'dsh',
+    label: translate('auto.lib.agent.catalog.dsh_label', 'DeepSeek Harness'),
+    cmd: 'dsh-tui',
+    searchAliases: ['deepseek', 'dsh', 'dst', 'deepseek harness'],
+    homepageUrl: 'https://deepseek-harness.github.io/deepseek-harness/'
+  },
+  {
+    id: 'qoder',
+    label: translate('auto.lib.agent.catalog.qoder_label', 'Qoder CLI'),
+    cmd: 'qodercli',
+    faviconDomain: 'qoder.com',
+    homepageUrl: 'https://docs.qoder.com/cli/overview'
+  },
   {
     id: 'zcode',
     label: translate('auto.lib.agent.catalog.zcode_label', 'ZCode'),
@@ -242,6 +243,13 @@ export const getAgentCatalog = createLocalizedCatalog((): AgentCatalogEntry[] =>
     faviconDomain: 'codebuff.com',
     homepageUrl: 'https://www.codebuff.com/docs/help/quick-start'
   },
+  {
+    id: 'freebuff',
+    label: translate('auto.lib.agent.catalog.freebuff_label', 'Freebuff'),
+    cmd: 'freebuff',
+    faviconDomain: 'freebuff.com',
+    homepageUrl: 'https://freebuff.com/cli'
+  },
   {
     id: 'command-code',
     label: translate('auto.lib.agent.catalog.6f8056a565', 'Command Code'),
@@ -328,6 +336,13 @@ export const getAgentCatalog = createLocalizedCatalog((): AgentCatalogEntry[] =>
     cmd: 'openclaw',
     faviconDomain: 'openclaw.ai',
     homepageUrl: 'https://github.com/openclaw/openclaw'
+  },
+  {
+    id: 'codebuddy',
+    label: translate('auto.lib.agent.catalog.codebuddy_label', 'CodeBuddy'),
+    cmd: 'codebuddy',
+    faviconDomain: 'codebuddy.ai',
+    homepageUrl: 'https://www.codebuddy.ai/cli'
   }
 ])
 
diff --git a/src/renderer/src/lib/agent-draft-paste-content.ts b/src/renderer/src/lib/agent-draft-paste-content.ts
index a76086b67904..19d5a30d275c 100644
--- a/src/renderer/src/lib/agent-draft-paste-content.ts
+++ b/src/renderer/src/lib/agent-draft-paste-content.ts
@@ -12,6 +12,7 @@ import {
 } from '@/components/terminal-pane/terminal-bracketed-paste'
 import { runTerminalPtyInputTransaction } from '@/components/terminal-pane/terminal-pty-input-transaction'
 import { sendRuntimePtyInputVerified } from '@/runtime/runtime-terminal-inspection'
+import type { TerminalInputKind } from '../../../shared/terminal-input-kind'
 
 // Why: bracketed paste markers let supported TUIs treat generated prompt text
 // as one paste instead of echoing character-by-character or triggering edits.
@@ -29,10 +30,11 @@ export async function sendAgentDraftPasteContent(
   settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
   ptyId: string,
   content: string,
+  inputKind: TerminalInputKind,
   writePty?: AgentDraftPtyInputWriter
 ): Promise<boolean> {
   return await runTerminalPtyInputTransaction(ptyId, () =>
-    sendAgentDraftPasteContentNow(settings, ptyId, content, writePty)
+    sendAgentDraftPasteContentNow(settings, ptyId, content, inputKind, writePty)
   )
 }
 
@@ -42,6 +44,7 @@ export async function sendAgentDraftPasteContentNow(
   settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
   ptyId: string,
   content: string,
+  inputKind: TerminalInputKind,
   writePty?: AgentDraftPtyInputWriter
 ): Promise<boolean> {
   if (content.length > AGENT_DRAFT_PASTE_MAX_BYTES) {
@@ -57,6 +60,7 @@ export async function sendAgentDraftPasteContentNow(
       settings,
       ptyId,
       wrapTerminalBracketedPasteText(terminalContent),
+      inputKind,
       writePty
     )
   }
@@ -71,16 +75,16 @@ export async function sendAgentDraftPasteContentNow(
   for (const chunk of iterateAgentDraftPasteContentChunks(terminalContent)) {
     let accepted = false
     try {
-      accepted = await writeAgentDraftPtyInput(settings, ptyId, chunk, writePty)
+      accepted = await writeAgentDraftPtyInput(settings, ptyId, chunk, inputKind, writePty)
     } catch {
       if (bracketedPasteOpen && chunk !== BRACKETED_PASTE_END) {
-        await closeAgentDraftBracketedPaste(settings, ptyId, writePty)
+        await closeAgentDraftBracketedPaste(settings, ptyId, inputKind, writePty)
       }
       return false
     }
     if (!accepted) {
       if (bracketedPasteOpen && chunk !== BRACKETED_PASTE_END) {
-        await closeAgentDraftBracketedPaste(settings, ptyId, writePty)
+        await closeAgentDraftBracketedPaste(settings, ptyId, inputKind, writePty)
       }
       return false
     }
@@ -197,20 +201,24 @@ async function writeAgentDraftPtyInput(
   settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
   ptyId: string,
   data: string,
+  inputKind: TerminalInputKind,
   writePty?: AgentDraftPtyInputWriter
 ): Promise<boolean> {
-  return writePty ? await writePty(data) : await sendRuntimePtyInputVerified(settings, ptyId, data)
+  return writePty
+    ? await writePty(data)
+    : await sendRuntimePtyInputVerified(settings, ptyId, data, inputKind)
 }
 
 async function closeAgentDraftBracketedPaste(
   settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
   ptyId: string,
+  inputKind: TerminalInputKind,
   writePty?: AgentDraftPtyInputWriter
 ): Promise<void> {
   try {
     // Why: once the opener reached the PTY, a failed content chunk should not
     // leave the target TUI in bracketed-paste mode.
-    await writeAgentDraftPtyInput(settings, ptyId, BRACKETED_PASTE_END, writePty)
+    await writeAgentDraftPtyInput(settings, ptyId, BRACKETED_PASTE_END, inputKind, writePty)
   } catch {
     // The original write already failed; callers only need the paste to fail closed.
   }
diff --git a/src/renderer/src/lib/agent-favicon-assets.ts b/src/renderer/src/lib/agent-favicon-assets.ts
index 6c7221efe807..b041965736ef 100644
--- a/src/renderer/src/lib/agent-favicon-assets.ts
+++ b/src/renderer/src/lib/agent-favicon-assets.ts
@@ -1,3 +1,4 @@
+import qoderUrl from '../../../shared/agent-icons/qoder.png?url'
 import type { TuiAgent } from '../../../shared/tui-agent'
 import grokUrl from '../../../shared/agent-icons/grok.png?url'
 import mimoCodeUrl from '../../../shared/agent-icons/mimo-code.png?url'
@@ -13,6 +14,7 @@ import crushUrl from '../../../shared/agent-icons/crush.png?url'
 import augUrl from '../../../shared/agent-icons/aug.png?url'
 import autohandUrl from '../../../shared/agent-icons/autohand.png?url'
 import clineUrl from '../../../shared/agent-icons/cline.png?url'
+import freebuffUrl from '../../../shared/agent-icons/freebuff.png?url'
 import codebuffUrl from '../../../shared/agent-icons/codebuff.png?url'
 import commandCodeUrl from '../../../shared/agent-icons/command-code.png?url'
 import continueUrl from '../../../shared/agent-icons/continue.png?url'
@@ -26,6 +28,7 @@ import devinUrl from '../../../shared/agent-icons/devin.png?url'
 import museUrl from '../../../shared/agent-icons/muse.png?url'
 import zcodeUrl from '../../../shared/agent-icons/zcode.png?url'
 import openclawUrl from '../../../shared/agent-icons/openclaw.png?url'
+import dshUrl from '../../../shared/agent-icons/dsh.png?url'
 
 // Why: these agents have no hand-authored SVG glyph, so previously their icons
 // loaded live from Google's favicon service. That service is unreachable in some
@@ -40,6 +43,7 @@ export const AGENT_FAVICON_ASSETS: Partial<Record<TuiAgent, string>> = {
   ante: anteUrl,
   trae: traeUrl,
   'prime-agent': primeAgentUrl,
+  qoder: qoderUrl,
   gemini: geminiUrl,
   antigravity: antigravityUrl,
   goose: gooseUrl,
@@ -50,6 +54,7 @@ export const AGENT_FAVICON_ASSETS: Partial<Record<TuiAgent, string>> = {
   autohand: autohandUrl,
   cline: clineUrl,
   codebuff: codebuffUrl,
+  freebuff: freebuffUrl,
   'command-code': commandCodeUrl,
   continue: continueUrl,
   cursor: cursorUrl,
@@ -60,6 +65,7 @@ export const AGENT_FAVICON_ASSETS: Partial<Record<TuiAgent, string>> = {
   hermes: hermesUrl,
   devin: devinUrl,
   muse: museUrl,
+  dsh: dshUrl,
   zcode: zcodeUrl,
   openclaw: openclawUrl
 }
diff --git a/src/renderer/src/lib/agent-followup-delivery.test.ts b/src/renderer/src/lib/agent-followup-delivery.test.ts
index 207c70ada367..48534cf8b06e 100644
--- a/src/renderer/src/lib/agent-followup-delivery.test.ts
+++ b/src/renderer/src/lib/agent-followup-delivery.test.ts
@@ -49,7 +49,7 @@ describe('sendFollowupPromptWhenAgentReady — interpreter-wrapped agents', () =
       })
 
       expect(delivered).toBe(true)
-      expect(sendRuntimePtyInputVerified).toHaveBeenCalledWith(null, 'pty-1', 'ship it\r')
+      expect(sendRuntimePtyInputVerified).toHaveBeenCalledWith(null, 'pty-1', 'ship it\r', 'launch')
     })
 
     it(`still refuses to type into a bare ${agent} shell foreground`, async () => {
@@ -105,6 +105,6 @@ describe('sendFollowupPromptWhenAgentReady — interpreter-wrapped agents', () =
     })
 
     expect(delivered).toBe(true)
-    expect(sendRuntimePtyInputVerified).toHaveBeenCalledWith(null, 'pty-1', 'ship it\r')
+    expect(sendRuntimePtyInputVerified).toHaveBeenCalledWith(null, 'pty-1', 'ship it\r', 'launch')
   })
 })
diff --git a/src/renderer/src/lib/agent-followup-delivery.ts b/src/renderer/src/lib/agent-followup-delivery.ts
index bdcf0b4a92fb..e520cb6df1f0 100644
--- a/src/renderer/src/lib/agent-followup-delivery.ts
+++ b/src/renderer/src/lib/agent-followup-delivery.ts
@@ -22,7 +22,7 @@ export async function sendFollowupPromptWhenAgentReady(args: {
     return false
   }
   try {
-    return await sendRuntimePtyInputVerified(settings, ptyId, `${prompt}\r`)
+    return await sendRuntimePtyInputVerified(settings, ptyId, `${prompt}\r`, 'launch')
   } catch {
     return false
   }
diff --git a/src/renderer/src/lib/agent-hibernation-pane-eligibility.ts b/src/renderer/src/lib/agent-hibernation-pane-eligibility.ts
index bc55936fd249..0971402e8726 100644
--- a/src/renderer/src/lib/agent-hibernation-pane-eligibility.ts
+++ b/src/renderer/src/lib/agent-hibernation-pane-eligibility.ts
@@ -5,6 +5,7 @@ import type { TerminalLayoutSnapshot, TerminalTab } from '../../../shared/termin
 import { parseRemoteRuntimePtyId } from '@/runtime/runtime-terminal-stream'
 import { lastInputBlocksHibernation } from './agent-hibernation-input-guard'
 import { isLiveResumeAnchorForCompletedAgent } from './live-resume-anchor-record'
+import { agentTurnEndedUncleanly } from '../../../shared/agent-main-agent-verdict'
 import type { AgentHibernationPlannerSnapshot } from './agent-hibernation-planner-snapshot'
 
 export type EligiblePane = {
@@ -89,7 +90,7 @@ export function getEligiblePane(args: {
   )
   if (
     entry.state !== 'done' ||
-    entry.interrupted === true ||
+    agentTurnEndedUncleanly(entry) ||
     Boolean(entry.subagents?.length) ||
     hasUnsettledOrUnknownDispatch(entry) ||
     (sleepingRecord && !hasOnlyLiveResumeAnchor)
diff --git a/src/renderer/src/lib/agent-hibernation-planner.test.ts b/src/renderer/src/lib/agent-hibernation-planner.test.ts
index 5be241004bbc..79aa349d5764 100644
--- a/src/renderer/src/lib/agent-hibernation-planner.test.ts
+++ b/src/renderer/src/lib/agent-hibernation-planner.test.ts
@@ -110,6 +110,21 @@ describe('agent sleep planner', () => {
     expect(
       plannedWorktrees(snapshot({ agentStatusByPaneKey: { [interrupted.paneKey]: interrupted } }))
     ).toEqual([])
+    // A failure ranks like a completion for attention, but a failed pane is never passive.
+    const failed = entry({ mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: OLD } })
+    expect(
+      plannedWorktrees(snapshot({ agentStatusByPaneKey: { [failed.paneKey]: failed } }))
+    ).toEqual([])
+    // A main agent that finished while its subagents still run is live work, whatever its verdict.
+    for (const outcome of ['success', 'failure'] as const) {
+      const held = entry({
+        state: 'working',
+        mainAgent: { state: 'done', outcome, stateStartedAt: OLD }
+      })
+      expect(
+        plannedWorktrees(snapshot({ agentStatusByPaneKey: { [held.paneKey]: held } }))
+      ).toEqual([])
+    }
     const noSession = entry({ providerSession: undefined })
     expect(
       plannedWorktrees(snapshot({ agentStatusByPaneKey: { [noSession.paneKey]: noSession } }))
diff --git a/src/renderer/src/lib/agent-launch-caller-profile-census.test.ts b/src/renderer/src/lib/agent-launch-caller-profile-census.test.ts
deleted file mode 100644
index 42787f4a2945..000000000000
--- a/src/renderer/src/lib/agent-launch-caller-profile-census.test.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-// Ties every caller profile back to the call site it characterizes. The behaviour files feed the
-// profiles through the real funnel; without this census a call site could change what it passes and
-// the behaviour files would keep happily pinning a shape nobody sends any more.
-
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import { glob } from 'tinyglobby'
-import { AGENT_LAUNCH_CALLER_PROFILES } from './agent-launch-caller-profiles-test-harness'
-
-const REPO_ROOT = join(import.meta.dirname, '../../../..')
-const FUNNEL = 'src/renderer/src/lib/launch-agent-in-new-tab.ts'
-
-async function productionCallers(): Promise<string[]> {
-  const files = await glob(['src/**/*.ts', 'src/**/*.tsx'], {
-    cwd: REPO_ROOT,
-    ignore: ['**/*.test.ts', '**/*.test.tsx']
-  })
-  return files
-    .filter((file) => file !== FUNNEL)
-    .filter((file) => readFileSync(join(REPO_ROOT, file), 'utf8').includes('launchAgentInNewTab('))
-    .sort()
-}
-
-describe('agent launch caller profiles', () => {
-  it('covers every production call site of the funnel and no phantom one', async () => {
-    const profiled = AGENT_LAUNCH_CALLER_PROFILES.map((profile) => profile.caller).sort()
-
-    expect(profiled).toEqual(await productionCallers())
-  })
-
-  it('names each profile exactly once', () => {
-    const ids = AGENT_LAUNCH_CALLER_PROFILES.map((profile) => profile.id)
-
-    expect(new Set(ids).size).toBe(ids.length)
-    expect(ids.length).toBe(13)
-  })
-
-  it.each(AGENT_LAUNCH_CALLER_PROFILES.map((profile) => [profile.id, profile] as const))(
-    'keeps %s anchored to the arguments its call site still builds',
-    (_id, profile) => {
-      const source = readFileSync(join(REPO_ROOT, profile.caller), 'utf8')
-
-      // Why: a positive control on the instrument — an unreadable or renamed file would otherwise
-      // make every marker below vacuously "not found" and the assertion would just be noise.
-      expect(source).toContain('launchAgentInNewTab(')
-      expect(profile.sourceMarkers.length).toBeGreaterThan(0)
-      for (const marker of profile.sourceMarkers) {
-        expect(source).toContain(marker)
-      }
-    }
-  )
-
-  it.each(AGENT_LAUNCH_CALLER_PROFILES.map((profile) => [profile.id, profile] as const))(
-    'records whether %s installs launch callbacks, matching its source',
-    (_id, profile) => {
-      const source = readFileSync(join(REPO_ROOT, profile.caller), 'utf8')
-
-      expect(source.includes('beforeSurfaceOpen:')).toBe(profile.passesBeforeSurfaceOpen)
-      expect(source.includes('agentSessionLaunchPlan,')).toBe(profile.passesLaunchPlan)
-      expect(source.includes('onPromptDelivered')).toBe(profile.passesOnPromptDelivered)
-    }
-  )
-
-  it('pins which call sites read a tab id straight off the synchronous result', () => {
-    const readers = AGENT_LAUNCH_CALLER_PROFILES.filter((profile) =>
-      profile.readsBack.includes('surface-tab-id')
-    ).map((profile) => profile.id)
-
-    // Why: this is the coupling a move to an async launch RPC threatens most directly — these
-    // call sites cannot tolerate a tab id that only exists after the launch settles.
-    expect(readers.sort()).toEqual([
-      'fix-checks',
-      'floating-default-agent',
-      'hosted-review-fix-checks',
-      'quick-command',
-      'source-control-action',
-      'source-control-recovery',
-      'tab-bar-create-menu',
-      'tab-bar-quick-launch-button'
-    ])
-  })
-
-  it('pins which call sites await the prompt-delivery promise', () => {
-    const awaiters = AGENT_LAUNCH_CALLER_PROFILES.filter((profile) =>
-      profile.readsBack.includes('prompt-delivery-result')
-    ).map((profile) => profile.id)
-
-    expect(awaiters.sort()).toEqual(['session-continuation', 'source-control-action'])
-  })
-})
diff --git a/src/renderer/src/lib/agent-launch-caller-profiles-test-harness.ts b/src/renderer/src/lib/agent-launch-caller-profiles-test-harness.ts
index a99a604160bf..ef0f42f7cf3e 100644
--- a/src/renderer/src/lib/agent-launch-caller-profiles-test-harness.ts
+++ b/src/renderer/src/lib/agent-launch-caller-profiles-test-harness.ts
@@ -8,42 +8,23 @@ import { HOSTED_REVIEW_FIX_CHECKS_CALLER_PROFILE } from '../fork-hosted-review-s
  * The suite feeds these argument shapes through the real funnel instead of driving twelve caller
  * module graphs: a migration rewrites the funnel's internals, not what a caller hands it, so the
  * observable outcome of each caller's argument shape is the thing that must survive.
- *
- * `sourceMarkers` re-anchors each profile to its call site. A caller that stops passing what the
- * profile encodes fails the census rather than silently drifting out of coverage.
  */
 export type CallerLaunchArgs = Omit<
   LaunchAgentInNewTabArgs,
   'beforeSurfaceOpen' | 'agentSessionLaunchPlan' | 'onPromptDelivered'
 >
 
-export type CallerResultRead =
-  | 'surface-tab-id'
-  | 'prompt-delivery-result'
-  | 'null-only'
-  | 'discarded'
-
 export type AgentLaunchCallerProfile = {
   /** Production module that owns this call site. */
   caller: string
   /** Stable id used in test titles so a dropped profile is visible in the report. */
   id: string
-  /** Literal fragments the call site must still contain for this profile to be current. */
-  sourceMarkers: readonly string[]
   /**
    * The argument object this call site builds. Values the call site derives at runtime (agent,
    * workspace, prompt text, group) use a representative stand-in; values it fixes as a literal are
    * reproduced exactly.
    */
   args: CallerLaunchArgs
-  /** The call site installs a `beforeSurfaceOpen` hook. */
-  passesBeforeSurfaceOpen: boolean
-  /** The call site hands in a route plan preflighted before the workspace existed. */
-  passesLaunchPlan: boolean
-  /** The call site installs an `onPromptDelivered` callback. */
-  passesOnPromptDelivered: boolean
-  /** What the call site reads off the synchronous result. */
-  readsBack: readonly CallerResultRead[]
 }
 
 const PROMPT = 'Explain the failing check and propose a fix.'
@@ -52,36 +33,30 @@ export const AGENT_LAUNCH_CALLER_PROFILES: readonly AgentLaunchCallerProfile[] =
   {
     id: 'dashboard-spawn',
     caller: 'src/renderer/src/components/dashboard/launch-dashboard-agent.ts',
-    sourceMarkers: ["launchSource: 'unknown'"],
-    args: { agent: 'codex', worktreeId: 'wt-1', launchSource: 'unknown' },
-    passesBeforeSurfaceOpen: false,
-    passesLaunchPlan: false,
-    passesOnPromptDelivered: false,
-    readsBack: ['null-only']
+    args: { agent: 'codex', worktreeId: 'wt-1', launchSource: 'unknown' }
+  },
+  {
+    id: 'empty-workspace-default-chat',
+    caller: 'src/renderer/src/lib/empty-workspace-default-agent-chat.ts',
+    args: {
+      agent: 'codex',
+      worktreeId: 'wt-1',
+      launchSource: 'unknown',
+      pendingActivationSpawn: true
+    }
   },
   {
     id: 'floating-default-agent',
     caller: 'src/renderer/src/components/floating-terminal/FloatingTerminalWindowControls.tsx',
-    sourceMarkers: ['worktreeId: FLOATING_TERMINAL_WORKTREE_ID', "launchSource: 'shortcut'"],
     args: {
       agent: 'codex',
       worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
       launchSource: 'shortcut'
-    },
-    passesBeforeSurfaceOpen: false,
-    passesLaunchPlan: false,
-    passesOnPromptDelivered: false,
-    readsBack: ['surface-tab-id']
+    }
   },
   {
     id: 'source-control-action',
     caller: 'src/renderer/src/components/right-sidebar/runSourceControlAgentActionStart.ts',
-    sourceMarkers: [
-      'groupId: groupId ?? worktreeId',
-      'agentArgs: launchAgentArgs',
-      'promptDelivery,',
-      'launchPlatform,'
-    ],
     args: {
       agent: 'codex',
       worktreeId: 'wt-1',
@@ -92,21 +67,11 @@ export const AGENT_LAUNCH_CALLER_PROFILES: readonly AgentLaunchCallerProfile[] =
       launchPlatform: 'darwin',
       // Caller-supplied, not fixed at the call site: one representative value stands in.
       launchSource: 'sidebar'
-    },
-    passesBeforeSurfaceOpen: false,
-    passesLaunchPlan: false,
-    passesOnPromptDelivered: false,
-    readsBack: ['surface-tab-id', 'prompt-delivery-result']
+    }
   },
   {
     id: 'source-control-recovery',
     caller: 'src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts',
-    sourceMarkers: [
-      'groupId: activeGroupId ?? activeWorktreeId',
-      'agentArgs: savedRecipe.agentArgs',
-      "promptDelivery: 'submit-after-ready'",
-      "launchSource: 'source_control_recovery'"
-    ],
     args: {
       agent: 'codex',
       worktreeId: 'wt-1',
@@ -116,36 +81,22 @@ export const AGENT_LAUNCH_CALLER_PROFILES: readonly AgentLaunchCallerProfile[] =
       promptDelivery: 'submit-after-ready',
       launchPlatform: 'darwin',
       launchSource: 'source_control_recovery'
-    },
-    passesBeforeSurfaceOpen: false,
-    passesLaunchPlan: false,
-    passesOnPromptDelivered: false,
-    readsBack: ['surface-tab-id']
+    }
   },
   {
     id: 'git-history-explain-commit',
     caller:
       'src/renderer/src/components/right-sidebar/source-control/sync/use-git-history-commit-actions.ts',
-    sourceMarkers: ['prompt: explainPrompt', "promptDelivery: 'submit-after-ready'"],
     args: {
       agent: 'codex',
       worktreeId: 'wt-1',
       prompt: PROMPT,
       promptDelivery: 'submit-after-ready'
-    },
-    passesBeforeSurfaceOpen: false,
-    passesLaunchPlan: false,
-    passesOnPromptDelivered: false,
-    readsBack: ['discarded']
+    }
   },
   {
     id: 'tab-bar-quick-launch-button',
     caller: 'src/renderer/src/components/tab-bar/QuickLaunchButton.tsx',
-    sourceMarkers: [
-      '...(prompt !== undefined ? { prompt } : {})',
-      '...(promptDelivery !== undefined ? { promptDelivery } : {})',
-      '...(onPromptDelivered !== undefined ? { onPromptDelivered } : {})'
-    ],
     args: {
       agent: 'codex',
       worktreeId: 'wt-1',
@@ -153,36 +104,21 @@ export const AGENT_LAUNCH_CALLER_PROFILES: readonly AgentLaunchCallerProfile[] =
       prompt: PROMPT,
       promptDelivery: 'submit-after-ready',
       launchSource: 'tab_bar_quick_launch'
-    },
-    passesBeforeSurfaceOpen: false,
-    passesLaunchPlan: false,
-    passesOnPromptDelivered: true,
-    readsBack: ['surface-tab-id']
+    }
   },
   {
     id: 'tab-bar-create-menu',
     caller: 'src/renderer/src/components/tab-bar/use-tab-bar-create-menu-controller.ts',
-    sourceMarkers: ['groupId: resolvedGroupId', "launchSource: 'tab_bar_quick_launch'"],
     args: {
       agent: 'codex',
       worktreeId: 'wt-1',
       groupId: 'group-1',
       launchSource: 'tab_bar_quick_launch'
-    },
-    passesBeforeSurfaceOpen: false,
-    passesLaunchPlan: false,
-    passesOnPromptDelivered: false,
-    readsBack: ['surface-tab-id']
+    }
   },
   {
     id: 'terminal-session-fork',
     caller: 'src/renderer/src/components/terminal-pane/terminal-agent-session-fork.ts',
-    sourceMarkers: [
-      "promptDelivery: 'draft'",
-      "launchSource: 'terminal_context_menu'",
-      'agentSessionLaunchPlan,',
-      'beforeSurfaceOpen: (surface) =>'
-    ],
     args: {
       agent: 'codex',
       worktreeId: 'wt-1',
@@ -190,30 +126,16 @@ export const AGENT_LAUNCH_CALLER_PROFILES: readonly AgentLaunchCallerProfile[] =
       promptDelivery: 'draft',
       launchSource: 'terminal_context_menu',
       launchPlatform: 'darwin'
-    },
-    passesBeforeSurfaceOpen: true,
-    passesLaunchPlan: true,
-    passesOnPromptDelivered: false,
-    readsBack: ['null-only']
+    }
   },
   {
     id: 'terminal-create-shortcut',
     caller: 'src/renderer/src/components/use-terminal-create-actions.ts',
-    sourceMarkers: ['groupId: targetGroupId', "launchSource: 'shortcut'"],
-    args: { agent: 'codex', worktreeId: 'wt-1', groupId: 'group-1', launchSource: 'shortcut' },
-    passesBeforeSurfaceOpen: false,
-    passesLaunchPlan: false,
-    passesOnPromptDelivered: false,
-    readsBack: ['null-only']
+    args: { agent: 'codex', worktreeId: 'wt-1', groupId: 'group-1', launchSource: 'shortcut' }
   },
   {
     id: 'fix-checks',
     caller: 'src/renderer/src/lib/fix-checks-agent-launch.ts',
-    sourceMarkers: [
-      'agentArgs: recipe.agentArgs',
-      "promptDelivery: 'submit-after-ready'",
-      'beforeSurfaceOpen: () => {'
-    ],
     args: {
       agent: 'codex',
       worktreeId: 'wt-1',
@@ -224,19 +146,11 @@ export const AGENT_LAUNCH_CALLER_PROFILES: readonly AgentLaunchCallerProfile[] =
       launchPlatform: 'darwin',
       // Caller-supplied, not fixed at the call site: one representative value stands in.
       launchSource: 'task_page'
-    },
-    passesBeforeSurfaceOpen: true,
-    passesLaunchPlan: false,
-    passesOnPromptDelivered: false,
-    readsBack: ['surface-tab-id']
+    }
   },
   {
     id: 'session-continuation',
     caller: 'src/renderer/src/lib/launch-agent-session-continuation.ts',
-    sourceMarkers: [
-      "promptDelivery: agent === 'claude' ? 'draft' : 'submit-after-ready'",
-      'onPromptDelivered: () =>'
-    ],
     args: {
       agent: 'codex',
       worktreeId: 'wt-1',
@@ -246,20 +160,11 @@ export const AGENT_LAUNCH_CALLER_PROFILES: readonly AgentLaunchCallerProfile[] =
       initialCwd: '/repo/worktree/packages/app',
       // Caller-supplied, not fixed at the call site: one representative value stands in.
       launchSource: 'command_palette'
-    },
-    passesBeforeSurfaceOpen: false,
-    passesLaunchPlan: false,
-    passesOnPromptDelivered: true,
-    readsBack: ['prompt-delivery-result']
+    }
   },
   {
     id: 'quick-command',
     caller: 'src/renderer/src/lib/run-quick-command-in-new-tab.ts',
-    sourceMarkers: [
-      "launchSource: 'quick_command'",
-      'quickCommandLabel: command.label',
-      "{ promptDelivery: 'submit-after-ready' as const }"
-    ],
     args: {
       agent: 'codex',
       worktreeId: 'wt-1',
@@ -267,11 +172,7 @@ export const AGENT_LAUNCH_CALLER_PROFILES: readonly AgentLaunchCallerProfile[] =
       prompt: PROMPT,
       launchSource: 'quick_command',
       quickCommandLabel: 'Review'
-    },
-    passesBeforeSurfaceOpen: false,
-    passesLaunchPlan: false,
-    passesOnPromptDelivered: false,
-    readsBack: ['surface-tab-id']
+    }
   },
   HOSTED_REVIEW_FIX_CHECKS_CALLER_PROFILE
 ]
diff --git a/src/renderer/src/lib/agent-launch-routing-caller-census.test.ts b/src/renderer/src/lib/agent-launch-routing-caller-census.test.ts
deleted file mode 100644
index 026309404d14..000000000000
--- a/src/renderer/src/lib/agent-launch-routing-caller-census.test.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import { glob } from 'tinyglobby'
-
-const REPO_ROOT = join(import.meta.dirname, '../../../..')
-const CENSUS_FILE = 'src/renderer/src/lib/agent-launch-routing-caller-census.test.ts'
-
-const LAUNCH_AGENT_IN_NEW_TAB_CALLERS = [
-  'src/renderer/src/components/dashboard/launch-dashboard-agent.ts',
-  // Joined the funnel rather than appearing beside it: this button used to hand-roll the helper's
-  // terminal arm against `queueTabStartupCommand`. A line going up here is a converged bypass.
-  'src/renderer/src/components/floating-terminal/FloatingTerminalWindowControls.tsx',
-  'src/renderer/src/components/right-sidebar/runSourceControlAgentActionStart.ts',
-  'src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts',
-  'src/renderer/src/components/right-sidebar/source-control/sync/use-git-history-commit-actions.ts',
-  'src/renderer/src/components/tab-bar/QuickLaunchButton.tsx',
-  'src/renderer/src/components/tab-bar/use-tab-bar-create-menu-controller.ts',
-  'src/renderer/src/components/terminal-pane/terminal-agent-session-fork.ts',
-  'src/renderer/src/components/use-terminal-create-actions.ts',
-  'src/renderer/src/fork-hosted-review-sitter/fix-checks-agent-launch.ts',
-  'src/renderer/src/lib/fix-checks-agent-launch.ts',
-  'src/renderer/src/lib/launch-agent-session-continuation.ts',
-  'src/renderer/src/lib/run-quick-command-in-new-tab.ts'
-]
-
-// Why: the planner is the one production module that decides a route. A second resolver call
-// site is how the seven launch sites drifted apart before it existed.
-const ROUTE_RESOLVER_DEFINITION = 'src/renderer/src/lib/agent-launch-routing.ts'
-const ROUTE_PLANNER = 'src/renderer/src/lib/agent-session-launch-plan.ts'
-const DIRECT_ROUTE_RESOLVER_CALL = /\b(?:resolveAgentLaunchRoute|structuredAgentLaunchSupported)\(/
-// Why: adopting a verdict bypasses the resolver by design (a persisted quick-create request, a
-// resume whose gate already planned), so each adopter is pinned rather than trusted by convention.
-const VERDICT_ADOPTERS = [
-  'src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts',
-  'src/renderer/src/lib/worktree-creation-structured-session.ts'
-]
-
-async function productionFiles(): Promise<string[]> {
-  return glob(['src/**/*.ts', 'src/**/*.tsx'], {
-    cwd: REPO_ROOT,
-    ignore: ['**/*.test.ts', '**/*.test.tsx', CENSUS_FILE]
-  })
-}
-
-describe('agent launch routing caller census', () => {
-  it('pins every production launchAgentInNewTab caller behind the shared funnel', async () => {
-    const callers = (await productionFiles())
-      .filter((file) => file !== 'src/renderer/src/lib/launch-agent-in-new-tab.ts')
-      .filter((file) =>
-        readFileSync(join(REPO_ROOT, file), 'utf8').includes('launchAgentInNewTab(')
-      )
-      .sort()
-    expect(callers).toEqual([...LAUNCH_AGENT_IN_NEW_TAB_CALLERS].sort())
-  })
-
-  it('lets only the planner decide a launch route', async () => {
-    const directCallers = (await productionFiles())
-      .filter((file) => file !== ROUTE_RESOLVER_DEFINITION)
-      .filter((file) =>
-        DIRECT_ROUTE_RESOLVER_CALL.test(readFileSync(join(REPO_ROOT, file), 'utf8'))
-      )
-      .sort()
-    expect(directCallers).toEqual([ROUTE_PLANNER])
-  })
-
-  it('pins every production adopter of a planned verdict', async () => {
-    const adopters = (await productionFiles())
-      .filter((file) => file !== ROUTE_PLANNER)
-      .filter((file) =>
-        readFileSync(join(REPO_ROOT, file), 'utf8').includes('adoptAgentSessionLaunchVerdict(')
-      )
-      .sort()
-    expect(adopters).toEqual([...VERDICT_ADOPTERS].sort())
-  })
-
-  it('keeps non-visible, resume, and floating launchers intentionally outside the route', () => {
-    for (const file of [
-      'src/renderer/src/lib/launch-agent-background-session.ts',
-      'src/renderer/src/lib/launch-ai-vault-session.ts',
-      'src/renderer/src/components/floating-terminal/FloatingTerminalWindowControls.tsx'
-    ]) {
-      expect(readFileSync(join(REPO_ROOT, file), 'utf8')).not.toContain('resolveAgentLaunchRoute')
-    }
-  })
-})
diff --git a/src/renderer/src/lib/agent-pane-activity-flags.ts b/src/renderer/src/lib/agent-pane-activity-flags.ts
new file mode 100644
index 000000000000..5298c840df92
--- /dev/null
+++ b/src/renderer/src/lib/agent-pane-activity-flags.ts
@@ -0,0 +1,38 @@
+import type { AgentStatusEntry } from '../../../shared/agent-status-types'
+import { agentVerdictDisplayMark } from '../../../shared/agent-main-agent-verdict'
+
+/** What fresh agent panes contribute to a container's status (worktree card, terminal tab). */
+export type AgentPaneActivityFlags = {
+  hasPermission: boolean
+  hasLiveWorking: boolean
+  hasLiveMonitoring: boolean
+  hasFailed: boolean
+  hasInterrupted: boolean
+  hasLiveDone: boolean
+}
+
+/** Fold one fresh pane's entry into its container's flags; `resolveWorktreeStatus` ranks them. */
+export function applyAgentPaneActivityFlags(
+  flags: AgentPaneActivityFlags,
+  entry: Pick<AgentStatusEntry, 'state' | 'workingMode' | 'interrupted' | 'mainAgent'>
+): void {
+  const mark = agentVerdictDisplayMark(entry)
+  if (entry.state === 'blocked' || entry.state === 'waiting') {
+    flags.hasPermission = true
+  }
+  // Why: a failed main agent outranks the live work its subagents hold, and it still counts
+  // beside a subagent's question so the failure shows once that is answered.
+  if (mark === 'failed') {
+    flags.hasFailed = true
+  } else if (mark === 'interrupted') {
+    flags.hasInterrupted = true
+  } else if (entry.state === 'working') {
+    if (entry.workingMode === 'monitoring') {
+      flags.hasLiveMonitoring = true
+    } else {
+      flags.hasLiveWorking = true
+    }
+  } else if (entry.state === 'done') {
+    flags.hasLiveDone = true
+  }
+}
diff --git a/src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts b/src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts
index 5b763aa5c6d7..84ad14770d1d 100644
--- a/src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts
+++ b/src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts
@@ -105,7 +105,12 @@ describe('post-paste submit retry Enter', () => {
 
     await expect(promise).resolves.toBe(true)
     expect(enterWrites()).toHaveLength(2)
-    expect(testState.sendRuntimePtyInputVerified).toHaveBeenLastCalledWith({}, 'pty-1', '\r')
+    expect(testState.sendRuntimePtyInputVerified).toHaveBeenLastCalledWith(
+      {},
+      'pty-1',
+      '\r',
+      'launch'
+    )
     expect(vi.getTimerCount()).toBe(0)
   })
 
@@ -143,7 +148,8 @@ describe('post-paste submit retry Enter', () => {
     const competing = sendAgentDraftPasteContent(
       {},
       'pty-1',
-      'y'.repeat(AGENT_DRAFT_PASTE_DIRECT_MAX_BYTES + 1)
+      'y'.repeat(AGENT_DRAFT_PASTE_DIRECT_MAX_BYTES + 1),
+      'driving'
     )
     await flushMicrotasks(10)
     expect(writes).toEqual([PASTED_ISSUE_URL, '\r'])
diff --git a/src/renderer/src/lib/agent-paste-draft.test.ts b/src/renderer/src/lib/agent-paste-draft.test.ts
index fdcb76cf2ede..bb07fb58504a 100644
--- a/src/renderer/src/lib/agent-paste-draft.test.ts
+++ b/src/renderer/src/lib/agent-paste-draft.test.ts
@@ -57,7 +57,9 @@ vi.mock('@/components/terminal-pane/pty-pre-handler-buffer', () => ({
 
 vi.mock('@/runtime/runtime-terminal-inspection', () => ({
   isRemoteRuntimePtyId: testState.isRemoteRuntimePtyId,
-  sendRuntimePtyInputVerified: testState.sendRuntimePtyInputVerified,
+  // Why drop the kind: this suite pins write shapes; startup-draft-input-kind.test.ts pins kinds.
+  sendRuntimePtyInputVerified: (settings: unknown, ptyId: string, data: string) =>
+    testState.sendRuntimePtyInputVerified(settings, ptyId, data),
   inspectRuntimeTerminalProcess: testState.inspectRuntimeTerminalProcess
 }))
 
@@ -726,7 +728,8 @@ describe('pasteDraftWhenAgentReady', () => {
     const competing = sendAgentDraftPasteContent(
       {},
       'pty-1',
-      'y'.repeat(AGENT_DRAFT_PASTE_DIRECT_MAX_BYTES + 1)
+      'y'.repeat(AGENT_DRAFT_PASTE_DIRECT_MAX_BYTES + 1),
+      'driving'
     )
     await flushMicrotasks(10)
     expect(writes).toEqual([PASTED_ISSUE_URL])
@@ -902,7 +905,7 @@ describe('pasteDraftWhenAgentReady', () => {
 
   it('yields during large accepted-size preflight before writing agent draft chunks', async () => {
     const content = 'x'.repeat(AGENT_DRAFT_PASTE_DIRECT_MAX_BYTES + 300 * 1024)
-    const promise = sendAgentDraftPasteContent({}, 'pty-1', content)
+    const promise = sendAgentDraftPasteContent({}, 'pty-1', content, 'driving')
 
     await flushMicrotasks(5)
     expect(testState.sendRuntimePtyInputVerified).not.toHaveBeenCalled()
@@ -915,9 +918,9 @@ describe('pasteDraftWhenAgentReady', () => {
   })
 
   it('rejects oversized agent drafts before any PTY write', async () => {
-    await expect(
-      sendAgentDraftPasteContent({}, 'pty-1', 'x'.repeat(AGENT_DRAFT_PASTE_MAX_BYTES + 1))
-    ).resolves.toBe(false)
+    const oversized = 'x'.repeat(AGENT_DRAFT_PASTE_MAX_BYTES + 1)
+    const result = sendAgentDraftPasteContent({}, 'pty-1', oversized, 'driving')
+    await expect(result).resolves.toBe(false)
 
     expect(testState.sendRuntimePtyInputVerified).not.toHaveBeenCalled()
   })
diff --git a/src/renderer/src/lib/agent-paste-draft.ts b/src/renderer/src/lib/agent-paste-draft.ts
index a260d6bee189..feca855338a2 100644
--- a/src/renderer/src/lib/agent-paste-draft.ts
+++ b/src/renderer/src/lib/agent-paste-draft.ts
@@ -1,5 +1,6 @@
 import type { GlobalSettings } from '../../../shared/global-settings-types'
 import type { TuiAgent } from '../../../shared/tui-agent'
+import type { TerminalInputKind } from '../../../shared/terminal-input-kind'
 import { TUI_AGENT_CONFIG } from '../../../shared/tui-agent-config'
 import { resolveDraftPasteReadyTimeoutMs } from '../../../shared/draft-paste-ready-timeout'
 import { useAppStore } from '@/store'
@@ -136,7 +137,9 @@ export async function pasteDraftWhenAgentReady(args: {
     ptyId,
     content,
     submit: submit === true,
-    agent
+    agent,
+    // Why launch: this delivers the prompt or draft an agent is started with.
+    inputKind: 'launch'
   })
 }
 
@@ -188,7 +191,9 @@ export async function pasteDraftToAgentPtyWhenReady(args: {
     ptyId,
     content,
     submit: submit === true,
-    agent
+    agent,
+    // Why launch: this delivers the prompt or draft an agent is started with.
+    inputKind: 'launch'
   })
 }
 
@@ -201,7 +206,8 @@ export async function submitPromptToAgentPty(args: {
     settings: getSettingsForAgentTabRuntimeOwner(args.tabId),
     ptyId: args.ptyId,
     content: args.content,
-    submit: true
+    submit: true,
+    inputKind: 'driving'
   })
 }
 
@@ -209,7 +215,7 @@ export async function sendBracketedPasteToRunningAgent(args: {
   ptyId: string
   content: string
 }): Promise<boolean> {
-  return await sendBracketedPasteToAgent({ ptyId: args.ptyId, content: args.content, submit: true })
+  return await sendBracketedPasteToAgent({ ...args, submit: true, inputKind: 'driving' })
 }
 
 async function sendBracketedPasteToAgent(args: {
@@ -218,14 +224,16 @@ async function sendBracketedPasteToAgent(args: {
   content: string
   submit: boolean
   agent?: TuiAgent
+  inputKind: TerminalInputKind
 }): Promise<boolean> {
   const { settings = useAppStore.getState().settings, ptyId, content, submit, agent } = args
+  const { inputKind } = args
   const submitRetryDelayMs = agent ? TUI_AGENT_CONFIG[agent]?.submitRetryDelayMs : undefined
   try {
     // Why: paste + Enter (+ retry Enter) must be one transaction, or a concurrent
     // paste on this PTY can slip between them and submit a half-written prompt.
     return await runTerminalPtyInputTransaction(ptyId, async () => {
-      const pasted = await sendAgentDraftPasteContentNow(settings, ptyId, content)
+      const pasted = await sendAgentDraftPasteContentNow(settings, ptyId, content, inputKind)
       if (!pasted || !submit) {
         return pasted
       }
@@ -234,14 +242,14 @@ async function sendBracketedPasteToAgent(args: {
       // Enter arrive in the same PTY write. Split the submit into the next turn so
       // the TUI processes bracketed-paste termination before handling Enter.
       await new Promise<void>((resolve) => window.setTimeout(resolve, POST_PASTE_SUBMIT_DELAY_MS))
-      const submitted = await sendRuntimePtyInputVerified(settings, ptyId, '\r')
+      const submitted = await sendRuntimePtyInputVerified(settings, ptyId, '\r', inputKind)
 
       if (submitRetryDelayMs !== undefined) {
         // Why: agents that render their composer before Enter is live silently eat
         // the first Enter; the retry is best-effort and never downgrades `submitted`.
         await new Promise<void>((resolve) => window.setTimeout(resolve, submitRetryDelayMs))
         try {
-          await sendRuntimePtyInputVerified(settings, ptyId, '\r')
+          await sendRuntimePtyInputVerified(settings, ptyId, '\r', inputKind)
         } catch {
           // Why: a rejected retry leaves the first Enter's verdict untouched.
         }
diff --git a/src/renderer/src/lib/agent-row-dot-state.ts b/src/renderer/src/lib/agent-row-dot-state.ts
index 79c0d7c198c5..bf2b7b1e5320 100644
--- a/src/renderer/src/lib/agent-row-dot-state.ts
+++ b/src/renderer/src/lib/agent-row-dot-state.ts
@@ -1,5 +1,7 @@
 import type { AgentDotState } from '@/components/AgentStateDot'
-import type { AgentWorkingMode } from '../../../shared/agent-status-types'
+import type { AgentChildRowModel } from '../../../shared/agent-child-row-model'
+import { agentVerdictDisplayMark } from '../../../shared/agent-main-agent-verdict'
+import type { AgentStatusEntry, AgentWorkingMode } from '../../../shared/agent-status-types'
 import type { AgentRowState } from './agent-row-decay-state'
 
 /**
@@ -22,3 +24,20 @@ export function agentRowDotState(
   }
   return 'idle'
 }
+
+/**
+ * The dot an agent row renders: a child row's own, else the main agent's verdict (a stop or a
+ * failure, which a failure shows even while subagents still run), else its state.
+ */
+export function agentRowDisplayDotState(agent: {
+  state: AgentRowState
+  entry: Pick<AgentStatusEntry, 'state' | 'interrupted' | 'mainAgent' | 'workingMode'>
+  childRow?: Pick<AgentChildRowModel, 'displayState'>
+}): AgentDotState {
+  if (agent.childRow) {
+    return agent.childRow.displayState
+  }
+  return (
+    agentVerdictDisplayMark(agent.entry) ?? agentRowDotState(agent.state, agent.entry.workingMode)
+  )
+}
diff --git a/src/renderer/src/lib/agent-status.ts b/src/renderer/src/lib/agent-status.ts
index acf7d7cbd532..04ecd728541a 100644
--- a/src/renderer/src/lib/agent-status.ts
+++ b/src/renderer/src/lib/agent-status.ts
@@ -100,6 +100,7 @@ export { formatAgentTypeLabel } from '../../../shared/agent-type-label'
 const ICONABLE_AGENT_TYPES: Record<TuiAgent, true> = {
   claude: true,
   'claude-agent-teams': true,
+  codebuddy: true,
   openclaude: true,
   codex: true,
   autohand: true,
@@ -109,6 +110,7 @@ const ICONABLE_AGENT_TYPES: Record<TuiAgent, true> = {
   pi: true,
   omp: true,
   'prime-agent': true,
+  qoder: true,
   gemini: true,
   antigravity: true,
   aider: true,
@@ -120,6 +122,7 @@ const ICONABLE_AGENT_TYPES: Record<TuiAgent, true> = {
   aug: true,
   cline: true,
   codebuff: true,
+  freebuff: true,
   'command-code': true,
   continue: true,
   cursor: true,
@@ -136,7 +139,8 @@ const ICONABLE_AGENT_TYPES: Record<TuiAgent, true> = {
   ante: true,
   trae: true,
   muse: true,
-  zcode: true
+  zcode: true,
+  dsh: true
 }
 
 // Why: return null (not a 'claude' fallback) for unknown so Codex panes don't flash the Claude icon before the hook fires.
diff --git a/src/renderer/src/lib/browser-workspace-source-resolution.test.ts b/src/renderer/src/lib/browser-workspace-source-resolution.test.ts
new file mode 100644
index 000000000000..6dd57c668cfa
--- /dev/null
+++ b/src/renderer/src/lib/browser-workspace-source-resolution.test.ts
@@ -0,0 +1,115 @@
+import { describe, expect, it } from 'vitest'
+import type { Tab, TabGroup } from '../../../shared/tab-types'
+import type { BrowserPage, BrowserWorkspace } from '../../../shared/browser-workspace-types'
+import { resolveBrowserSourceUnifiedTab } from './browser-workspace-source-resolution'
+
+const WT = 'wt-1'
+
+type ResolverState = Parameters<typeof resolveBrowserSourceUnifiedTab>[0]
+
+function wrapper(id: string, workspaceId: string, groupId = 'group-1'): Tab {
+  return {
+    id,
+    entityId: workspaceId,
+    groupId,
+    worktreeId: WT,
+    contentType: 'browser',
+    label: 'Example',
+    customLabel: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 1
+  }
+}
+
+function workspace(id: string): BrowserWorkspace {
+  return {
+    id,
+    worktreeId: WT,
+    activePageId: null,
+    pageIds: [],
+    url: 'about:blank',
+    title: '',
+    loading: false,
+    faviconUrl: null,
+    canGoBack: false,
+    canGoForward: false,
+    loadError: null,
+    createdAt: 1
+  }
+}
+
+function page(id: string, workspaceId: string): BrowserPage {
+  return {
+    id,
+    workspaceId,
+    worktreeId: WT,
+    url: 'about:blank',
+    title: '',
+    loading: false,
+    faviconUrl: null,
+    canGoBack: false,
+    canGoForward: false,
+    loadError: null,
+    createdAt: 1
+  }
+}
+
+function makeState(overrides: {
+  workspaces?: string[]
+  pages?: Record<string, string[]>
+  wrappers?: Tab[]
+  groups?: TabGroup[]
+}): ResolverState {
+  const workspaces = overrides.workspaces ?? ['ws-1']
+  const pages = overrides.pages ?? { 'ws-1': ['page-1'] }
+  const wrappers = overrides.wrappers ?? [wrapper('tab-1', 'ws-1')]
+  return {
+    browserTabsByWorktree: {
+      [WT]: workspaces.map(workspace)
+    },
+    browserPagesByWorkspace: Object.fromEntries(
+      Object.entries(pages).map(([workspaceId, ids]) => [
+        workspaceId,
+        ids.map((id) => page(id, workspaceId))
+      ])
+    ),
+    unifiedTabsByWorktree: { [WT]: wrappers },
+    groupsByWorktree: {
+      [WT]: overrides.groups ?? [
+        { id: 'group-1', worktreeId: WT, activeTabId: null, tabOrder: wrappers.map((t) => t.id) }
+      ]
+    }
+  }
+}
+
+describe('resolveBrowserSourceUnifiedTab', () => {
+  it('returns the unique live wrapper for a source page', () => {
+    expect(resolveBrowserSourceUnifiedTab(makeState({}), 'page-1', WT)?.id).toBe('tab-1')
+  })
+
+  it('stays inside the caller workspace', () => {
+    expect(resolveBrowserSourceUnifiedTab(makeState({}), 'page-1', 'wt-other')).toBeUndefined()
+  })
+
+  it('omits the anchor for ambiguous wrappers', () => {
+    const state = makeState({ wrappers: [wrapper('tab-1', 'ws-1'), wrapper('tab-2', 'ws-1')] })
+    expect(resolveBrowserSourceUnifiedTab(state, 'page-1', WT)).toBeUndefined()
+  })
+
+  it('omits the anchor when two workspaces claim the page', () => {
+    const state = makeState({
+      workspaces: ['ws-1', 'ws-2'],
+      pages: { 'ws-1': ['page-1'], 'ws-2': ['page-1'] }
+    })
+    expect(resolveBrowserSourceUnifiedTab(state, 'page-1', WT)).toBeUndefined()
+  })
+
+  it('omits the anchor for a closed page or a wrapper outside its group order', () => {
+    expect(resolveBrowserSourceUnifiedTab(makeState({}), 'closed-page', WT)).toBeUndefined()
+    const detached = makeState({
+      groups: [{ id: 'group-1', worktreeId: WT, activeTabId: null, tabOrder: [] }]
+    })
+    expect(resolveBrowserSourceUnifiedTab(detached, 'page-1', WT)).toBeUndefined()
+  })
+})
diff --git a/src/renderer/src/lib/browser-workspace-source-resolution.ts b/src/renderer/src/lib/browser-workspace-source-resolution.ts
index 9e10c6f7043d..857f6f77270f 100644
--- a/src/renderer/src/lib/browser-workspace-source-resolution.ts
+++ b/src/renderer/src/lib/browser-workspace-source-resolution.ts
@@ -1,3 +1,4 @@
+import type { Tab } from '../../../shared/tab-types'
 import type { AppState } from '../store/types'
 
 export type BrowserWorkspaceOwner = {
@@ -25,3 +26,39 @@ export function resolveBrowserWorkspaceOwner(
   }
   return null
 }
+
+/**
+ * The unified tab wrapping a source browser page. Anything but exactly one live wrapper in the
+ * caller's workspace is ambiguous, so the caller omits the source relationship.
+ */
+export function resolveBrowserSourceUnifiedTab(
+  state: Pick<
+    AppState,
+    | 'browserTabsByWorktree'
+    | 'browserPagesByWorkspace'
+    | 'unifiedTabsByWorktree'
+    | 'groupsByWorktree'
+  >,
+  sourcePageId: string,
+  worktreeId: string
+): Tab | undefined {
+  const owningWorkspaceIds = (state.browserTabsByWorktree[worktreeId] ?? [])
+    .filter((workspace) =>
+      (state.browserPagesByWorkspace[workspace.id] ?? []).some((page) => page.id === sourcePageId)
+    )
+    .map((workspace) => workspace.id)
+  if (owningWorkspaceIds.length !== 1) {
+    return undefined
+  }
+  const wrappers = (state.unifiedTabsByWorktree[worktreeId] ?? []).filter(
+    (tab) => tab.contentType === 'browser' && tab.entityId === owningWorkspaceIds[0]
+  )
+  if (wrappers.length !== 1) {
+    return undefined
+  }
+  const wrapper = wrappers[0]
+  const group = (state.groupsByWorktree[worktreeId] ?? []).find(
+    (candidate) => candidate.id === wrapper.groupId
+  )
+  return group?.tabOrder.includes(wrapper.id) ? wrapper : undefined
+}
diff --git a/src/renderer/src/lib/delayed-status.test.ts b/src/renderer/src/lib/delayed-status.test.ts
new file mode 100644
index 000000000000..11778a3d414e
--- /dev/null
+++ b/src/renderer/src/lib/delayed-status.test.ts
@@ -0,0 +1,89 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createDelayedStatus, STATUS_MIN_VISIBLE_MS, type ShownStatus } from './delayed-status'
+
+const SHOW_DELAY_MS = 1_000
+
+function track() {
+  const changes: (ShownStatus<string> | null)[] = []
+  const status = createDelayedStatus<string>((shown) => changes.push(shown), {
+    showDelayMs: SHOW_DELAY_MS
+  })
+  return { status, changes }
+}
+
+beforeEach(() => {
+  vi.useFakeTimers()
+})
+
+afterEach(() => {
+  vi.useRealTimers()
+})
+
+describe('createDelayedStatus', () => {
+  it('never shows a status that clears within the show delay', () => {
+    const { status, changes } = track()
+    status.update('a', 'starting')
+    vi.advanceTimersByTime(SHOW_DELAY_MS - 1)
+    status.update('a', null)
+    vi.advanceTimersByTime(SHOW_DELAY_MS * 2)
+    expect(changes).toEqual([])
+  })
+
+  it('shows a status that outlasts the show delay', () => {
+    const { status, changes } = track()
+    status.update('a', 'starting')
+    vi.advanceTimersByTime(SHOW_DELAY_MS)
+    expect(changes).toEqual([{ key: 'a', value: 'starting' }])
+  })
+
+  it('keeps a shown status up for the minimum visible time', () => {
+    const { status, changes } = track()
+    status.update('a', 'starting')
+    vi.advanceTimersByTime(SHOW_DELAY_MS)
+    status.update('a', null)
+    vi.advanceTimersByTime(STATUS_MIN_VISIBLE_MS - 1)
+    expect(changes).toEqual([{ key: 'a', value: 'starting' }])
+    vi.advanceTimersByTime(1)
+    expect(changes).toEqual([{ key: 'a', value: 'starting' }, null])
+  })
+
+  it('hides at once when the status clears after the minimum visible time', () => {
+    const { status, changes } = track()
+    status.update('a', 'starting')
+    vi.advanceTimersByTime(SHOW_DELAY_MS + STATUS_MIN_VISIBLE_MS)
+    status.update('a', null)
+    expect(changes).toEqual([{ key: 'a', value: 'starting' }, null])
+  })
+
+  it('restarts the show delay when an unkeyed status clears and returns during its hold', () => {
+    const { status, changes } = track()
+    status.update('a', 'starting')
+    vi.advanceTimersByTime(SHOW_DELAY_MS)
+    status.update('a', null)
+    vi.advanceTimersByTime(100)
+    status.update('a', 'starting')
+    expect(changes).toEqual([{ key: 'a', value: 'starting' }, null])
+    vi.advanceTimersByTime(SHOW_DELAY_MS - 1)
+    expect(changes).toHaveLength(2)
+    vi.advanceTimersByTime(1)
+    expect(changes.at(-1)).toEqual({ key: 'a', value: 'starting' })
+  })
+
+  it('drops the shown status at once for a new key, which waits its own delay', () => {
+    const { status, changes } = track()
+    status.update('a', 'starting')
+    vi.advanceTimersByTime(SHOW_DELAY_MS)
+    status.update('b', 'starting')
+    expect(changes).toEqual([{ key: 'a', value: 'starting' }, null])
+    vi.advanceTimersByTime(SHOW_DELAY_MS)
+    expect(changes.at(-1)).toEqual({ key: 'b', value: 'starting' })
+  })
+
+  it('does not show after dispose', () => {
+    const { status, changes } = track()
+    status.update('a', 'starting')
+    status.dispose()
+    vi.advanceTimersByTime(SHOW_DELAY_MS * 2)
+    expect(changes).toEqual([])
+  })
+})
diff --git a/src/renderer/src/lib/delayed-status.ts b/src/renderer/src/lib/delayed-status.ts
new file mode 100644
index 000000000000..8c388c966e4b
--- /dev/null
+++ b/src/renderer/src/lib/delayed-status.ts
@@ -0,0 +1,92 @@
+/** How long a shown status stays up, so it cannot flash right at the show delay. */
+export const STATUS_MIN_VISIBLE_MS = 400
+
+/** The status a view should show, and the key it belongs to. */
+export type ShownStatus<A> = {
+  key: string
+  value: A
+}
+
+export type DelayedStatus<A> = {
+  /** Reports the real status for `key`. A new key drops the shown status at once. */
+  update: (key: string, value: A | null) => void
+  /** Cancels pending timers. A later `update` starts again from the real status. */
+  dispose: () => void
+}
+
+/**
+ * Turns a real status into the status a view shows. A status that clears within
+ * `showDelayMs` is never shown; a shown status stays for at least `minVisibleMs`.
+ * Values compare by identity, so use strings or other stable values.
+ */
+export function createDelayedStatus<A>(
+  onChange: (shown: ShownStatus<A> | null) => void,
+  options: { showDelayMs: number; minVisibleMs?: number }
+): DelayedStatus<A> {
+  const minVisibleMs = options.minVisibleMs ?? STATUS_MIN_VISIBLE_MS
+  let key = ''
+  let latest: A | null = null
+  let shown: A | null = null
+  // While hidden, this is the show delay. While shown, the minimum visible time.
+  let timer: ReturnType<typeof setTimeout> | undefined
+
+  const clearTimer = (): void => {
+    clearTimeout(timer)
+    timer = undefined
+  }
+  const hide = (): void => {
+    shown = null
+    onChange(null)
+  }
+  const show = (value: A): void => {
+    shown = value
+    onChange({ key, value })
+    clearTimer()
+    timer = setTimeout(() => {
+      timer = undefined
+      if (latest === null) {
+        hide()
+      }
+    }, minVisibleMs)
+  }
+
+  return {
+    update: (nextKey, value) => {
+      if (nextKey !== key) {
+        key = nextKey
+        clearTimer()
+        if (shown !== null) {
+          hide()
+        }
+      }
+      if (shown !== null && latest === null && value !== null) {
+        clearTimer()
+        hide()
+      }
+      latest = value
+
+      if (shown === null) {
+        if (value === null) {
+          clearTimer()
+        } else if (timer === undefined) {
+          timer = setTimeout(() => {
+            timer = undefined
+            if (latest !== null) {
+              show(latest)
+            }
+          }, options.showDelayMs)
+        }
+        return
+      }
+
+      if (value !== null) {
+        if (value !== shown) {
+          show(value)
+        }
+      } else if (timer === undefined) {
+        hide()
+      }
+    },
+    dispose: clearTimer
+  }
+}
diff --git a/src/renderer/src/lib/empty-workspace-default-agent-chat.test.ts b/src/renderer/src/lib/empty-workspace-default-agent-chat.test.ts
new file mode 100644
index 000000000000..e3ad93eb3db4
--- /dev/null
+++ b/src/renderer/src/lib/empty-workspace-default-agent-chat.test.ts
@@ -0,0 +1,154 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { GlobalSettings } from '../../../shared/global-settings-types'
+import { getDefaultSettings } from '../../../shared/constants'
+import { useAppStore } from '@/store'
+import {
+  emptyWorkspaceDefaultChatAwaitsDetection,
+  loadEmptyWorkspaceDefaultChatDetection,
+  openDefaultAgentChatInEmptyWorkspace
+} from './empty-workspace-default-agent-chat'
+
+const mocks = vi.hoisted(() => ({
+  launchAgentInNewTab: vi.fn(),
+  planAgentSessionLaunch: vi.fn(),
+  detectionTargetKey: vi.fn<() => string | undefined>()
+}))
+
+vi.mock('@/lib/launch-agent-in-new-tab', () => ({
+  launchAgentInNewTab: mocks.launchAgentInNewTab
+}))
+vi.mock('@/lib/agent-session-launch-plan', () => ({
+  planAgentSessionLaunch: mocks.planAgentSessionLaunch
+}))
+vi.mock('@/hooks/useAgentDetectionTarget', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  getAgentDetectionTargetKeyForWorktree: mocks.detectionTargetKey
+}))
+
+const initialAppStoreState = useAppStore.getState()
+
+function seedSettings(settings: Partial<GlobalSettings>): void {
+  useAppStore.setState({
+    detectedAgentIds: ['claude', 'codex'],
+    settings: {
+      ...getDefaultSettings('/tmp'),
+      experimentalNativeChat: true,
+      openAgentTabsInChatByDefault: true,
+      defaultTuiAgent: 'codex',
+      disabledTuiAgents: [],
+      ...settings
+    }
+  })
+}
+
+beforeEach(() => {
+  mocks.detectionTargetKey.mockReturnValue('local')
+  mocks.planAgentSessionLaunch.mockReturnValue({ route: 'structured-native-chat' })
+  mocks.launchAgentInNewTab.mockReturnValue({
+    surface: { kind: 'local-agent-session', tabId: 'chat-tab', sessionId: 's-1' }
+  })
+})
+
+afterEach(() => {
+  vi.useRealTimers()
+  vi.clearAllMocks()
+  useAppStore.setState(initialAppStoreState, true)
+})
+
+describe('openDefaultAgentChatInEmptyWorkspace', () => {
+  it('launches the default agent as a chat', () => {
+    seedSettings({})
+
+    expect(openDefaultAgentChatInEmptyWorkspace('wt-1')).toEqual({ primaryTabId: 'chat-tab' })
+    expect(mocks.launchAgentInNewTab).toHaveBeenCalledWith(
+      expect.objectContaining({ agent: 'codex', worktreeId: 'wt-1', pendingActivationSpawn: true })
+    )
+  })
+
+  it('does nothing unless new agent tabs open as chat', () => {
+    seedSettings({ openAgentTabsInChatByDefault: false })
+
+    expect(openDefaultAgentChatInEmptyWorkspace('wt-1')).toBeNull()
+    expect(mocks.launchAgentInNewTab).not.toHaveBeenCalled()
+  })
+
+  it('respects a Blank Terminal default agent', () => {
+    seedSettings({ defaultTuiAgent: 'blank' })
+
+    expect(openDefaultAgentChatInEmptyWorkspace('wt-1')).toBeNull()
+    expect(mocks.launchAgentInNewTab).not.toHaveBeenCalled()
+  })
+
+  it('does not start an agent that could only open as a terminal here', () => {
+    seedSettings({})
+    mocks.planAgentSessionLaunch.mockReturnValue({ route: 'terminal-tui' })
+
+    expect(openDefaultAgentChatInEmptyWorkspace('wt-1')).toBeNull()
+    expect(mocks.launchAgentInNewTab).not.toHaveBeenCalled()
+  })
+
+  it('reads the agents detected on the workspace SSH host', () => {
+    seedSettings({})
+    mocks.detectionTargetKey.mockReturnValue('ssh:conn-1')
+    useAppStore.setState({ remoteDetectedAgentIds: { 'conn-1': ['claude'] } })
+
+    openDefaultAgentChatInEmptyWorkspace('wt-1')
+
+    expect(mocks.launchAgentInNewTab).toHaveBeenCalledWith(
+      expect.objectContaining({ agent: 'claude' })
+    )
+  })
+
+  it('treats a workspace whose host is unresolved as unknown', () => {
+    seedSettings({})
+    mocks.detectionTargetKey.mockReturnValue(undefined)
+
+    expect(emptyWorkspaceDefaultChatAwaitsDetection('wt-1')).toBe(false)
+    expect(openDefaultAgentChatInEmptyWorkspace('wt-1')).toBeNull()
+    expect(mocks.launchAgentInNewTab).not.toHaveBeenCalled()
+  })
+})
+
+describe('agent detection for the default chat', () => {
+  it('waits only while chat is the default and the host list has not loaded', () => {
+    seedSettings({})
+    mocks.detectionTargetKey.mockReturnValue('ssh:conn-1')
+    useAppStore.setState({ remoteDetectedAgentIds: {} })
+    expect(emptyWorkspaceDefaultChatAwaitsDetection('wt-1')).toBe(true)
+
+    useAppStore.setState({ remoteDetectedAgentIds: { 'conn-1': [] } })
+    expect(emptyWorkspaceDefaultChatAwaitsDetection('wt-1')).toBe(false)
+
+    seedSettings({ openAgentTabsInChatByDefault: false })
+    useAppStore.setState({ remoteDetectedAgentIds: {} })
+    expect(emptyWorkspaceDefaultChatAwaitsDetection('wt-1')).toBe(false)
+  })
+
+  // Why: Blank Terminal opens a shell whatever the host has, so waiting only delays that shell.
+  it('does not wait when the default agent is Blank Terminal', () => {
+    seedSettings({ defaultTuiAgent: 'blank' })
+    mocks.detectionTargetKey.mockReturnValue('ssh:conn-1')
+    useAppStore.setState({ remoteDetectedAgentIds: {} })
+
+    expect(emptyWorkspaceDefaultChatAwaitsDetection('wt-1')).toBe(false)
+  })
+
+  it('probes the workspace host and gives up after a bounded wait', async () => {
+    vi.useFakeTimers()
+    seedSettings({})
+    mocks.detectionTargetKey.mockReturnValue('ssh:conn-1')
+    const ensureRemoteDetectedAgents = vi.fn(() => new Promise<never>(() => {}))
+    useAppStore.setState({ ensureRemoteDetectedAgents })
+    let settled = false
+
+    void loadEmptyWorkspaceDefaultChatDetection('wt-1').then(() => {
+      settled = true
+    })
+    await vi.advanceTimersByTimeAsync(4_999)
+    expect(settled).toBe(false)
+    await vi.advanceTimersByTimeAsync(1)
+
+    expect(ensureRemoteDetectedAgents).toHaveBeenCalledWith('conn-1')
+    expect(settled).toBe(true)
+  })
+})
diff --git a/src/renderer/src/lib/empty-workspace-default-agent-chat.ts b/src/renderer/src/lib/empty-workspace-default-agent-chat.ts
new file mode 100644
index 000000000000..84156f99927e
--- /dev/null
+++ b/src/renderer/src/lib/empty-workspace-default-agent-chat.ts
@@ -0,0 +1,113 @@
+import { agentTabsDefaultToNativeChat } from '../../../shared/structured-native-chat-launch-route'
+import { pickTuiAgent } from '../../../shared/tui-agent-selection'
+import type { TuiAgent } from '../../../shared/tui-agent'
+import { withTimeout } from '../../../shared/promise-timeout-fallback'
+import { useAppStore } from '@/store'
+import type { AppState } from '@/store/types'
+import {
+  getAgentDetectionTargetKeyForWorktree,
+  parseAgentDetectionTargetKey
+} from '@/hooks/useAgentDetectionTarget'
+import type { AgentDetectionTarget } from '@/hooks/useDetectedAgents'
+import { workspaceKindForWorktreeId } from '@/lib/agent-launch-route-input'
+import { planAgentSessionLaunch } from '@/lib/agent-session-launch-plan'
+import { launchAgentInNewTab } from '@/lib/launch-agent-in-new-tab'
+
+// Why bounded: detection only decides chat vs shell, so a slow host must not hold the workspace empty.
+const DEFAULT_CHAT_DETECTION_TIMEOUT_MS = 5_000
+
+/**
+ * The host whose agent list picks the default chat; undefined when the workspace opens a shell
+ * whatever that list says. Shared by the wait and the open so they cannot drift.
+ */
+function defaultChatDetectionTarget(
+  state: AppState,
+  worktreeId: string
+): AgentDetectionTarget | undefined {
+  // Why: a 'blank' default means the user wants workspaces to open without an agent.
+  if (
+    !agentTabsDefaultToNativeChat(state.settings) ||
+    state.settings?.defaultTuiAgent === 'blank'
+  ) {
+    return undefined
+  }
+  // Why: an unresolved owner is an unknown host, not the local machine.
+  return parseAgentDetectionTargetKey(getAgentDetectionTargetKeyForWorktree(state, worktreeId))
+}
+
+/** Same host lists the tab bar reads; null means that host's detection has not loaded. */
+function readDetectedAgents(state: AppState, target: AgentDetectionTarget): TuiAgent[] | null {
+  if (target.kind === 'ssh') {
+    return state.remoteDetectedAgentIds[target.connectionId] ?? null
+  }
+  if (target.kind === 'runtime') {
+    return state.runtimeDetectedAgentIds[target.environmentId] ?? null
+  }
+  return target.contextKey
+    ? (state.localDetectedAgentIdsByContext[target.contextKey] ?? null)
+    : state.detectedAgentIds
+}
+
+/** True when the default chat could open here but the workspace host's agent list has not loaded. */
+export function emptyWorkspaceDefaultChatAwaitsDetection(worktreeId: string): boolean {
+  const state = useAppStore.getState()
+  const target = defaultChatDetectionTarget(state, worktreeId)
+  return target !== undefined && readDetectedAgents(state, target) === null
+}
+
+/** Loads the workspace host's agent list; resolves on success, failure, or timeout. */
+export async function loadEmptyWorkspaceDefaultChatDetection(worktreeId: string): Promise<void> {
+  const state = useAppStore.getState()
+  const target = defaultChatDetectionTarget(state, worktreeId)
+  if (!target) {
+    return
+  }
+  const detection =
+    target.kind === 'ssh'
+      ? state.ensureRemoteDetectedAgents(target.connectionId)
+      : target.kind === 'runtime'
+        ? state.ensureRuntimeDetectedAgents(target.environmentId)
+        : state.ensureDetectedAgents(target.worktreeId)
+  await withTimeout(detection, DEFAULT_CHAT_DETECTION_TIMEOUT_MS, [])
+}
+
+/**
+ * When the user's new agent tabs open as chat, an empty workspace opens their default agent as a
+ * chat instead of a bare shell. Null means nothing opened and the caller seeds the shell.
+ */
+export function openDefaultAgentChatInEmptyWorkspace(
+  worktreeId: string
+): { primaryTabId: string | null } | null {
+  const state = useAppStore.getState()
+  const target = defaultChatDetectionTarget(state, worktreeId)
+  if (!target) {
+    return null
+  }
+  const agent = pickTuiAgent(
+    state.settings?.defaultTuiAgent,
+    readDetectedAgents(state, target) ?? [],
+    state.settings?.disabledTuiAgents
+  )
+  if (!agent) {
+    return null
+  }
+  const agentSessionLaunchPlan = planAgentSessionLaunch(state, {
+    agent,
+    workspace: { kind: workspaceKindForWorktreeId(worktreeId), worktreeId }
+  })
+  // Why: an agent that can only open as a TUI here would replace the shell with a process nobody asked for.
+  if (agentSessionLaunchPlan.route === 'terminal-tui') {
+    return null
+  }
+  const result = launchAgentInNewTab({
+    agent,
+    worktreeId,
+    launchSource: 'unknown',
+    agentSessionLaunchPlan,
+    pendingActivationSpawn: true
+  })
+  if (!result) {
+    return null
+  }
+  return { primaryTabId: result.surface.kind === 'host-published' ? null : result.surface.tabId }
+}
diff --git a/src/renderer/src/lib/empty-workspace-default-surface-claims.ts b/src/renderer/src/lib/empty-workspace-default-surface-claims.ts
new file mode 100644
index 000000000000..61a989e6bfc0
--- /dev/null
+++ b/src/renderer/src/lib/empty-workspace-default-surface-claims.ts
@@ -0,0 +1,29 @@
+import type { GatedEmptyWorkspaceReseedIntent } from './worktree-initial-terminal-seeding'
+
+// Why: while a gated reseed waits on agent detection, it owns the workspace's first surface;
+// any other seeder landing in that wait would put a shell beside the chat it is about to open.
+// Why the intent: the wait seeds for the latest activation, so a later one must not be dropped.
+const pendingIntentByWorkspace = new Map<string, GatedEmptyWorkspaceReseedIntent>()
+
+/** Records this activation's intent; false when a wait already pending now carries it instead. */
+export function claimEmptyWorkspaceDefaultSurface(
+  workspaceKey: string,
+  intent: GatedEmptyWorkspaceReseedIntent
+): boolean {
+  const alreadyPending = pendingIntentByWorkspace.has(workspaceKey)
+  pendingIntentByWorkspace.set(workspaceKey, intent)
+  return !alreadyPending
+}
+
+/** Ends the wait and returns the latest activation's intent. */
+export function releaseEmptyWorkspaceDefaultSurface(
+  workspaceKey: string
+): GatedEmptyWorkspaceReseedIntent | undefined {
+  const intent = pendingIntentByWorkspace.get(workspaceKey)
+  pendingIntentByWorkspace.delete(workspaceKey)
+  return intent
+}
+
+export function isEmptyWorkspaceDefaultSurfacePending(workspaceKey: string): boolean {
+  return pendingIntentByWorkspace.has(workspaceKey)
+}
diff --git a/src/renderer/src/lib/finished-agent-resume-resurrection.test.ts b/src/renderer/src/lib/finished-agent-resume-resurrection.test.ts
index d0132f531752..c2d5785b0084 100644
--- a/src/renderer/src/lib/finished-agent-resume-resurrection.test.ts
+++ b/src/renderer/src/lib/finished-agent-resume-resurrection.test.ts
@@ -15,7 +15,7 @@
 import { afterEach, describe, expect, it } from 'vitest'
 import { makePaneKey } from '../../../shared/stable-pane-id'
 import { useAppStore } from '@/store'
-import { isPassiveCompletedHibernationEvidence } from './sleeping-agent-pane-ownership'
+import { activationTreatsNoteAsFinished } from './sleeping-agent-pane-ownership'
 import { resumeSleepingAgentSessionsForWorktree } from './resume-sleeping-agent-session'
 
 const initialAppStoreState = useAppStore.getState()
@@ -80,7 +80,7 @@ function reportTurnFinished(interrupted = false): void {
 describe('a finished local agent', () => {
   it('keeps completed quit records resumable', () => {
     expect(
-      isPassiveCompletedHibernationEvidence({
+      activationTreatsNoteAsFinished({
         paneKey: 'quit-tab:quit-leaf',
         tabId: 'quit-tab',
         worktreeId: WORKTREE_ID,
@@ -108,7 +108,7 @@ describe('a finished local agent', () => {
     expect(record?.agent).toBe('codex')
     expect(record?.providerSession).toEqual({ key: 'session_id', id: SESSION_ID })
     expect(
-      isPassiveCompletedHibernationEvidence(record!),
+      activationTreatsNoteAsFinished(record!),
       'a finished agent must read as history, or activation restarts it'
     ).toBe(true)
   })
@@ -120,7 +120,7 @@ describe('a finished local agent', () => {
     const record = useAppStore.getState().sleepingAgentSessionsByPaneKey[PANE_KEY]
     expect(record?.state).toBe('done')
     expect(record?.interrupted).toBe(true)
-    expect(isPassiveCompletedHibernationEvidence(record!)).toBe(false)
+    expect(activationTreatsNoteAsFinished(record!)).toBe(false)
 
     useAppStore.setState({
       tabsByWorktree: { [WORKTREE_ID]: [] },
diff --git a/src/renderer/src/lib/fix-checks-agent-launch.test.ts b/src/renderer/src/lib/fix-checks-agent-launch.test.ts
index c044ae4b068b..32c636f13f7c 100644
--- a/src/renderer/src/lib/fix-checks-agent-launch.test.ts
+++ b/src/renderer/src/lib/fix-checks-agent-launch.test.ts
@@ -97,7 +97,7 @@ vi.mock('@/lib/new-workspace', () => ({
   CLIENT_PLATFORM: 'win32'
 }))
 
-vi.mock('@/lib/source-control-launch-agent-selection', () => ({
+vi.mock('../../../shared/source-control-launch-agent-selection', () => ({
   pickSourceControlLaunchAgent: mocks.pickSourceControlLaunchAgent,
   readSourceControlLaunchRecipeAgentId: mocks.readSourceControlLaunchRecipeAgentId
 }))
diff --git a/src/renderer/src/lib/fix-checks-agent-launch.ts b/src/renderer/src/lib/fix-checks-agent-launch.ts
index 7d60edf23712..43d07b3ad1ae 100644
--- a/src/renderer/src/lib/fix-checks-agent-launch.ts
+++ b/src/renderer/src/lib/fix-checks-agent-launch.ts
@@ -11,7 +11,7 @@ import { planAgentCliArgsSuffix } from '@/lib/tui-agent-startup'
 import {
   pickSourceControlLaunchAgent,
   readSourceControlLaunchRecipeAgentId
-} from '@/lib/source-control-launch-agent-selection'
+} from '../../../shared/source-control-launch-agent-selection'
 import { resolveSourceControlLaunchPlatform } from '@/lib/source-control-launch-platform'
 import { activateAndRevealWorktree } from '@/lib/worktree-activation'
 import { useAppStore } from '@/store'
diff --git a/src/renderer/src/lib/focus-terminal-tab-surface.split-focus.test.ts b/src/renderer/src/lib/focus-terminal-tab-surface.split-focus.test.ts
new file mode 100644
index 000000000000..d3fda81fa6b0
--- /dev/null
+++ b/src/renderer/src/lib/focus-terminal-tab-surface.split-focus.test.ts
@@ -0,0 +1,47 @@
+// @vitest-environment happy-dom
+
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { focusTerminalTabSurface } from './focus-terminal-tab-surface'
+
+vi.mock('@/components/terminal-pane/terminal-ime-input-context-refresh', () => ({
+  refreshTerminalImeInputContext: vi.fn()
+}))
+
+describe('deferred split terminal focus', () => {
+  afterEach(() => {
+    document.body.replaceChildren()
+    vi.unstubAllGlobals()
+  })
+
+  it.each([null, 'left'])(
+    'preserves a pane reveal unless an explicit leaf (%s) was requested',
+    (requestedLeaf) => {
+      const frames: FrameRequestCallback[] = []
+      vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
+        frames.push(callback)
+        return frames.length
+      })
+      vi.stubGlobal('cancelAnimationFrame', vi.fn())
+      const tab = document.createElement('div')
+      tab.dataset.terminalTabId = 'floating-tab'
+      const inputs = ['left', 'right'].map((leafId) => {
+        const pane = document.createElement('div')
+        pane.dataset.leafId = leafId
+        const input = document.createElement('textarea')
+        input.className = 'xterm-helper-textarea'
+        pane.append(input)
+        tab.append(pane)
+        return input
+      })
+      document.body.append(tab)
+
+      focusTerminalTabSurface('floating-tab', requestedLeaf)
+      frames.shift()?.(0)
+      // The activity row focuses the right pane before the panel's deferred focus completes.
+      inputs[1].focus()
+      frames.shift()?.(0)
+
+      expect(document.activeElement).toBe(inputs[requestedLeaf ? 0 : 1])
+    }
+  )
+})
diff --git a/src/renderer/src/lib/focus-terminal-tab-surface.ts b/src/renderer/src/lib/focus-terminal-tab-surface.ts
index 44d9d7993411..f36b2aaae14d 100644
--- a/src/renderer/src/lib/focus-terminal-tab-surface.ts
+++ b/src/renderer/src/lib/focus-terminal-tab-surface.ts
@@ -83,7 +83,10 @@ export function focusTerminalTabSurface(
       const scopedSelector = leafId
         ? `[data-terminal-tab-id="${escapedTabId}"] [data-leaf-id="${cssAttributeString(leafId)}"]${UNCOVERED_TERMINAL_LEAF_SELECTOR} .xterm-helper-textarea`
         : `[data-terminal-tab-id="${escapedTabId}"] ${UNCOVERED_TERMINAL_LEAF_SELECTOR} .xterm-helper-textarea`
-      const scoped = document.querySelector(scopedSelector) as HTMLElement | null
+      // A pane-specific reveal may have focused a split while this tab-wide request was waiting.
+      const scoped =
+        (!leafId ? document.querySelector<HTMLElement>(`${scopedSelector}:focus`) : null) ??
+        document.querySelector<HTMLElement>(scopedSelector)
       if (scoped) {
         focusTerminalHelper(scoped, options)
         return
diff --git a/src/renderer/src/lib/fork-session-handoff/launch-session-handoff.ts b/src/renderer/src/lib/fork-session-handoff/launch-session-handoff.ts
index a322e8ca7df6..8df3a4d12da9 100644
--- a/src/renderer/src/lib/fork-session-handoff/launch-session-handoff.ts
+++ b/src/renderer/src/lib/fork-session-handoff/launch-session-handoff.ts
@@ -8,7 +8,7 @@ import {
 import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
 import type { LaunchSource } from '../../../../shared/telemetry-events'
-import { TUI_AGENT_CONFIG } from '../../../../shared/tui-agent-config'
+import { TUI_AGENT_CONFIG, type TuiAgentConfig } from '../../../../shared/tui-agent-config'
 import { isTuiAgentEnabled } from '../../../../shared/tui-agent-selection'
 import type { TuiAgent } from '../../../../shared/tui-agent'
 import { parsePaneKey } from '../../../../shared/stable-pane-id'
@@ -48,7 +48,7 @@ export type LaunchForkSessionHandoffResult =
   | { ok: false; reason: 'agent-unavailable' | 'launch-failed' }
 
 type StoreState = ReturnType<typeof useAppStore.getState>
-type AgentTrustPreset = 'cursor' | 'copilot' | 'codex' | 'antigravity'
+type AgentTrustPreset = NonNullable<TuiAgentConfig['preflightTrust']>
 
 export type LaunchForkSessionHandoffCollaborators = {
   getState?: () => StoreState
diff --git a/src/renderer/src/lib/language-detect.test.ts b/src/renderer/src/lib/language-detect.test.ts
index d67d18f1db5b..9493bae94853 100644
--- a/src/renderer/src/lib/language-detect.test.ts
+++ b/src/renderer/src/lib/language-detect.test.ts
@@ -20,6 +20,22 @@ describe('detectLanguage', () => {
     expect(detectLanguage('packages/app.nimble')).toBe('nim')
   })
 
+  it.each([
+    'documents/report.typ',
+    'C:\\documents\\REPORT.TYP',
+    '\\\\server\\share\\report.typ',
+    '/home/user/folder workspace/Report.TyP'
+  ])('maps Typst source %s to the typst language id', (filePath) => {
+    expect(detectLanguage(filePath)).toBe('typst')
+  })
+
+  it.each(['report.typ.bak', 'report.typx', 'documents.typ/README', 'documents.typ\\README'])(
+    'keeps non-Typst file %s on plaintext',
+    (filePath) => {
+      expect(detectLanguage(filePath)).toBe('plaintext')
+    }
+  )
+
   it('maps exact filenames from Windows paths', () => {
     expect(detectLanguage('C:\\Users\\alice\\repo\\Dockerfile')).toBe('dockerfile')
     expect(detectLanguage('C:\\Users\\alice\\repo\\CMakeLists.txt')).toBe('cmake')
@@ -96,6 +112,11 @@ describe('detectLanguage', () => {
     expect(detectLanguage('C:\\theme\\snippets\\CART.LIQUID')).toBe('liquid')
   })
 
+  it('maps .sol files to the Monaco built-in sol language id, not the solidity alias', () => {
+    expect(detectLanguage('contracts/Vault.sol')).toBe('sol')
+    expect(detectLanguage('C:\\repo\\contracts\\TOKEN.SOL')).toBe('sol')
+  })
+
   it('maps Salesforce Apex sources to the apex language id (case-insensitive)', () => {
     expect(detectLanguage('force-app/main/default/classes/AccountService.cls')).toBe('apex')
     expect(detectLanguage('force-app/main/default/triggers/AccountTrigger.trigger')).toBe('apex')
@@ -103,6 +124,23 @@ describe('detectLanguage', () => {
     expect(detectLanguage('C:\\repo\\force-app\\classes\\ACCOUNTSERVICE.CLS')).toBe('apex')
   })
 
+  it.each([
+    'templates/base.twig',
+    'templates/node--article.html.twig',
+    'C:\\theme\\templates\\PAGE.HTML.TWIG',
+    '\\\\server\\share\\templates\\PAGE.TWIG',
+    '/home/user/folder workspace/templates/Base.TwIg'
+  ])('maps Twig template %s to the Monaco built-in twig language id', (filePath) => {
+    expect(detectLanguage(filePath)).toBe('twig')
+  })
+
+  it.each(['base.twig.bak', 'base.twigx', 'templates.twig/README', 'templates.twig\\README'])(
+    'keeps non-Twig file %s on plaintext',
+    (filePath) => {
+      expect(detectLanguage(filePath)).toBe('plaintext')
+    }
+  )
+
   it('keeps .json/.jsonc on the built-in json language and unknown on plaintext', () => {
     expect(detectLanguage('config/settings.json')).toBe('json')
     expect(detectLanguage('config/tsconfig.jsonc')).toBe('json')
diff --git a/src/renderer/src/lib/language-detect.ts b/src/renderer/src/lib/language-detect.ts
index b38ab72523b3..c3d766d37100 100644
--- a/src/renderer/src/lib/language-detect.ts
+++ b/src/renderer/src/lib/language-detect.ts
@@ -1,3 +1,5 @@
+import { detectMonacoFilenameLanguage } from './monaco-filename-language'
+
 function extname(filePath: string): string {
   const lastDot = filePath.lastIndexOf('.')
   const lastSep = Math.max(filePath.lastIndexOf('/'), filePath.lastIndexOf('\\'))
@@ -42,6 +44,7 @@ const EXT_TO_LANGUAGE: Record<string, string> = {
   // Why: Monaco declares Liquid as both '.liquid' and '.html.liquid'; the final-extension
   // lookup below covers the compound form, so the single entry is enough.
   '.liquid': 'liquid',
+  '.twig': 'twig',
   '.xml': 'xml',
   '.svg': 'xml',
   '.py': 'python',
@@ -92,6 +95,8 @@ const EXT_TO_LANGUAGE: Record<string, string> = {
   '.hrl': 'erlang',
   '.hs': 'haskell',
   '.clj': 'clojure',
+  // Why: Monaco registers Solidity under the id 'sol'; 'solidity' is only an alias.
+  '.sol': 'sol',
   '.vue': 'vue',
   '.svelte': 'svelte',
   '.astro': 'astro',
@@ -102,6 +107,7 @@ const EXT_TO_LANGUAGE: Record<string, string> = {
   '.nim': 'nim',
   '.nims': 'nim',
   '.nimble': 'nim',
+  '.typ': 'typst',
   '.tf': 'hcl',
   '.hcl': 'hcl',
   '.abap': 'abap',
@@ -127,7 +133,7 @@ export function detectLanguage(filePath: string): string {
   // Check exact filename first
   const parts = filePath.split(/[\\/]/)
   const filename = parts.at(-1)!
-  if (FILENAME_TO_LANGUAGE[filename]) {
+  if (Object.hasOwn(FILENAME_TO_LANGUAGE, filename)) {
     return FILENAME_TO_LANGUAGE[filename]
   }
 
@@ -137,6 +143,7 @@ export function detectLanguage(filePath: string): string {
   // Scoped dotenv names fall back to INI only when no specific extension matches.
   return (
     EXT_TO_LANGUAGE[ext] ??
+    detectMonacoFilenameLanguage(filename) ??
     (lowerName === '.env' || lowerName.startsWith('.env.') ? 'ini' : 'plaintext')
   )
 }
diff --git a/src/renderer/src/lib/launch-agent-background-session-remote.test.ts b/src/renderer/src/lib/launch-agent-background-session-remote.test.ts
index 11ade27d58af..ed62c67f3568 100644
--- a/src/renderer/src/lib/launch-agent-background-session-remote.test.ts
+++ b/src/renderer/src/lib/launch-agent-background-session-remote.test.ts
@@ -178,7 +178,8 @@ describe('launchAgentBackgroundSession remote runtime and SSH startup delivery',
 
       expect(mockWrite).toHaveBeenCalledWith(
         'pty-1',
-        "claude '--dangerously-skip-permissions' 'run the automation'\r"
+        "claude '--dangerously-skip-permissions' 'run the automation'\r",
+        'launch'
       )
     } finally {
       vi.useRealTimers()
@@ -214,7 +215,8 @@ describe('launchAgentBackgroundSession remote runtime and SSH startup delivery',
 
       expect(mockWrite).toHaveBeenCalledWith(
         'pty-1',
-        "codex '--dangerously-bypass-approvals-and-sandbox' 'run the automation'\r"
+        "codex '--dangerously-bypass-approvals-and-sandbox' 'run the automation'\r",
+        'launch'
       )
     } finally {
       vi.useRealTimers()
@@ -241,7 +243,8 @@ describe('launchAgentBackgroundSession remote runtime and SSH startup delivery',
 
       expect(mockWrite).toHaveBeenCalledWith(
         'pty-1',
-        "codex '--dangerously-bypass-approvals-and-sandbox'\r"
+        "codex '--dangerously-bypass-approvals-and-sandbox'\r",
+        'launch'
       )
     } finally {
       vi.useRealTimers()
@@ -262,7 +265,8 @@ describe('launchAgentBackgroundSession remote runtime and SSH startup delivery',
 
       expect(mockWrite).toHaveBeenCalledWith(
         'pty-1',
-        "codex '--dangerously-bypass-approvals-and-sandbox'\r"
+        "codex '--dangerously-bypass-approvals-and-sandbox'\r",
+        'launch'
       )
     } finally {
       vi.useRealTimers()
@@ -288,7 +292,8 @@ describe('launchAgentBackgroundSession remote runtime and SSH startup delivery',
 
       expect(mockWrite).toHaveBeenCalledWith(
         'pty-1',
-        "codex '--dangerously-bypass-approvals-and-sandbox' 'run the automation'\r"
+        "codex '--dangerously-bypass-approvals-and-sandbox' 'run the automation'\r",
+        'launch'
       )
     } finally {
       vi.useRealTimers()
@@ -312,7 +317,8 @@ describe('launchAgentBackgroundSession remote runtime and SSH startup delivery',
 
       expect(mockWrite).toHaveBeenCalledWith(
         'pty-1',
-        "codex '--dangerously-bypass-approvals-and-sandbox' 'run the automation'\r"
+        "codex '--dangerously-bypass-approvals-and-sandbox' 'run the automation'\r",
+        'launch'
       )
     } finally {
       vi.useRealTimers()
@@ -353,7 +359,8 @@ describe('launchAgentBackgroundSession remote runtime and SSH startup delivery',
 
       expect(mockWrite).toHaveBeenCalledWith(
         'pty-1',
-        "codex --prefill 'draft from override' '--dangerously-bypass-approvals-and-sandbox'\r"
+        "codex --prefill 'draft from override' '--dangerously-bypass-approvals-and-sandbox'\r",
+        'launch'
       )
     } finally {
       vi.useRealTimers()
diff --git a/src/renderer/src/lib/launch-agent-background-session.ts b/src/renderer/src/lib/launch-agent-background-session.ts
index 5cce15f735f5..cd8b144519d9 100644
--- a/src/renderer/src/lib/launch-agent-background-session.ts
+++ b/src/renderer/src/lib/launch-agent-background-session.ts
@@ -135,7 +135,7 @@ export async function launchAgentBackgroundSession(
     command: sshConnectionId ? startupPlan.launchCommand : null,
     waitForShellReady:
       Boolean(sshConnectionId) && sshBackgroundLaunchWaitsForShellReady(startupPlan),
-    write: (ptyId, data) => window.api.pty.write(ptyId, data)
+    write: (ptyId, data) => window.api.pty.write(ptyId, data, 'launch')
   })
   // Route by the worktree's owner host, not the focused runtime.
   const runtimeTarget = getActiveRuntimeTarget(
diff --git a/src/renderer/src/lib/launch-agent-in-new-tab.ts b/src/renderer/src/lib/launch-agent-in-new-tab.ts
index 0d9bde28b090..e2a44af65620 100644
--- a/src/renderer/src/lib/launch-agent-in-new-tab.ts
+++ b/src/renderer/src/lib/launch-agent-in-new-tab.ts
@@ -64,6 +64,8 @@ export type LaunchAgentInNewTabArgs = {
   onPromptDeliveryUnconfirmed?: () => void
   /** Keeps a preflighted route authoritative across workspace creation. */
   agentSessionLaunchPlan?: AgentSessionLaunchPlan
+  /** The launch seeds a workspace being opened, so its PTY spawn must not reshuffle Recent. */
+  pendingActivationSpawn?: boolean
   /** Lets a workspace reveal itself before the selected surface opens. */
   beforeSurfaceOpen?: (
     surface:
@@ -120,6 +122,7 @@ function launchAgentInNewTabInternal(args: LaunchAgentInNewTabArgs): LaunchAgent
     onPromptDelivered,
     onPromptDeliveryUnconfirmed,
     agentSessionLaunchPlan,
+    pendingActivationSpawn,
     beforeSurfaceOpen
   } = args
   const store = useAppStore.getState()
@@ -255,6 +258,7 @@ function launchAgentInNewTabInternal(args: LaunchAgentInNewTabArgs): LaunchAgent
   const tab = store.createTab(worktreeId, groupId, undefined, {
     launchAgent: agent,
     quickCommandLabel,
+    ...(pendingActivationSpawn ? { pendingActivationSpawn: true } : {}),
     ...initialViewModeProps
   })
   seedNativeChatAppliedSessionOptions(tab.id, agent, startupPlan.sessionOptions)
diff --git a/src/renderer/src/lib/launch-structured-agent-session.ts b/src/renderer/src/lib/launch-structured-agent-session.ts
index 759f5c7d6146..e1594d94c975 100644
--- a/src/renderer/src/lib/launch-structured-agent-session.ts
+++ b/src/renderer/src/lib/launch-structured-agent-session.ts
@@ -12,6 +12,11 @@ import {
 import { resolveStructuredLaunchSeedOptions } from '../../../shared/native-chat-session-option-defaults'
 import { hasRuntimeRpcErrorCode } from '../../../shared/runtime-rpc-error-code'
 import { isDefinitiveAgentSessionCreateRefusal } from '../../../shared/agent-session-definitive-refusal'
+import {
+  readAgentSessionRefusalReference,
+  type AgentSessionRefusalReference
+} from '../../../shared/agent-session-wire-refusals'
+import { readAgentSessionErrorRefusal } from '../../../shared/agent-session-write-failure'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 import { toRuntimeWorktreeSelector } from '@/runtime/runtime-worktree-selector'
 import { useAppStore } from '@/store'
@@ -47,7 +52,9 @@ class StructuredAgentSessionCreateError extends Error {
   constructor(
     message: string,
     /** The wire refusal code, or the RPC error code when the create never reached a handler. */
-    readonly code: string
+    readonly code: string,
+    /** The host's refusal as a reader may word it; absent from an older host or a local failure. */
+    readonly refusal?: AgentSessionRefusalReference
   ) {
     super(message)
   }
@@ -58,8 +65,12 @@ class StructuredAgentSessionCreateError extends Error {
  * `launchStructuredAgentSession` is the only place that decides it against the shared allowlist.
  */
 export class StructuredAgentSessionCreateRefusalError extends StructuredAgentSessionCreateError {
-  constructor(message: string, code: string = 'structured_agent_session_unsupported') {
-    super(message, code)
+  constructor(
+    message: string,
+    code: string = 'structured_agent_session_unsupported',
+    refusal?: AgentSessionRefusalReference
+  ) {
+    super(message, code, refusal)
     this.name = 'StructuredAgentSessionCreateRefusalError'
   }
 }
@@ -70,8 +81,8 @@ export class StructuredAgentSessionCreateRefusalError extends StructuredAgentSes
  * down the same path as a lost reply, which replays the intent and reconciles.
  */
 export class StructuredAgentSessionCreateUnknownOutcomeError extends StructuredAgentSessionCreateError {
-  constructor(message: string, code: string) {
-    super(message, code)
+  constructor(message: string, code: string, refusal?: AgentSessionRefusalReference) {
+    super(message, code, refusal)
     this.name = 'StructuredAgentSessionCreateUnknownOutcomeError'
   }
 }
@@ -252,7 +263,8 @@ async function hostSupportsCreate(intent: StructuredAgentSessionLaunchIntent): P
       }
       throw new StructuredAgentSessionCreateUnknownOutcomeError(
         error instanceof Error ? error.message : String(error),
-        code
+        code,
+        readAgentSessionErrorRefusal(error)
       )
     }
   }
@@ -291,20 +303,22 @@ export async function launchStructuredAgentSession(
       abandonStructuredAgentSessionLaunchIntent(intent)
       throw new StructuredAgentSessionCreateRefusalError(
         error instanceof Error ? error.message : String(error),
-        code
+        code,
+        readAgentSessionErrorRefusal(error)
       )
     }
     throw error
   }
   if (!result.ok) {
     const { code, message, ownerVerdict } = result.refusal
+    const refusal = readAgentSessionRefusalReference(result.refusal)
     // A failed operation whose provider is proven gone is a failure a new operation may retry.
     if (!isDefinitiveAgentSessionCreateRefusal(code) && ownerVerdict !== 'exited') {
       // Keep the focus intent: the session may exist, and recovery still has to adopt it.
-      throw new StructuredAgentSessionCreateUnknownOutcomeError(message, code)
+      throw new StructuredAgentSessionCreateUnknownOutcomeError(message, code, refusal)
     }
     abandonStructuredAgentSessionLaunchIntent(intent)
-    throw new StructuredAgentSessionCreateRefusalError(message, code)
+    throw new StructuredAgentSessionCreateRefusalError(message, code, refusal)
   }
   return { sessionId: result.value.sessionId, fence: result.value.fence }
 }
diff --git a/src/renderer/src/lib/linear-issue-workspace-open.test.ts b/src/renderer/src/lib/linear-issue-workspace-open.test.ts
index 86a72ab4df9d..e455c52308ab 100644
--- a/src/renderer/src/lib/linear-issue-workspace-open.test.ts
+++ b/src/renderer/src/lib/linear-issue-workspace-open.test.ts
@@ -87,6 +87,7 @@ describe('openLinearIssueWorkspaceOrStart', () => {
 
     expect(openLinearIssueWorkspaceOrStart({ identifier: 'ENG-1' }, vi.fn())).toBe('opened')
     expect(mocks.activateAndRevealWorktree).toHaveBeenCalledWith('worktree-1', {
+      navigationIntent: 'user-open',
       executionHostId: 'ssh:builder'
     })
   })
@@ -97,6 +98,7 @@ describe('openLinearIssueWorkspaceOrStart', () => {
 
     expect(openLinearIssueWorkspaceOrStart({ identifier: 'ENG-1' }, startWorkspace)).toBe('opened')
     expect(mocks.activateAndRevealFolderWorkspace).toHaveBeenCalledWith('folder-1', {
+      navigationIntent: 'user-open',
       executionHostId: 'local'
     })
     expect(startWorkspace).not.toHaveBeenCalled()
diff --git a/src/renderer/src/lib/linear-issue-workspace-open.ts b/src/renderer/src/lib/linear-issue-workspace-open.ts
index 4b838176f444..63d2944c180c 100644
--- a/src/renderer/src/lib/linear-issue-workspace-open.ts
+++ b/src/renderer/src/lib/linear-issue-workspace-open.ts
@@ -35,14 +35,14 @@ export function openLinearIssueWorkspaceOrStart(
   const workspaceScope = parseWorkspaceKey(attached.id)
   const activation =
     workspaceScope?.type === 'folder'
-      ? activateAndRevealFolderWorkspace(
-          workspaceScope.folderWorkspaceId,
-          attached.hostId ? { executionHostId: attached.hostId } : undefined
-        )
-      : activateAndRevealWorktree(
-          attached.id,
-          attached.hostId ? { executionHostId: attached.hostId } : {}
-        )
+      ? activateAndRevealFolderWorkspace(workspaceScope.folderWorkspaceId, {
+          navigationIntent: 'user-open',
+          ...(attached.hostId ? { executionHostId: attached.hostId } : {})
+        })
+      : activateAndRevealWorktree(attached.id, {
+          navigationIntent: 'user-open',
+          ...(attached.hostId ? { executionHostId: attached.hostId } : {})
+        })
   if (activation === false) {
     toast.error(
       translate(
diff --git a/src/renderer/src/lib/monaco-filename-language.test.ts b/src/renderer/src/lib/monaco-filename-language.test.ts
new file mode 100644
index 000000000000..013e9cc7f17a
--- /dev/null
+++ b/src/renderer/src/lib/monaco-filename-language.test.ts
@@ -0,0 +1,64 @@
+import { describe, expect, it } from 'vitest'
+import { detectLanguage } from './language-detect'
+import { detectMonacoFilenameLanguage } from './monaco-filename-language'
+import associations from './monaco-language-associations.json'
+
+describe('Monaco filename detection', () => {
+  it.each([
+    ['contracts/Vault.sol', 'sol'],
+    ['infra/main.bicep', 'bicep'],
+    ['queries/query.cypher', 'cypher'],
+    ['scripts/run.fsx', 'fsharp'],
+    ['shaders/main.wgsl', 'wgsl'],
+    ['docs/guide.rst', 'restructuredtext'],
+    ['C:\\workspace\\main.TcPOU', 'st'],
+    ['\\\\host\\share\\main.ML', 'fsharp'],
+    ['/remote/folder workspace/main.pas', 'pascal'],
+    ['templates/page.ftl', 'freemarker2'],
+    ['config/.babelrc', 'json'],
+    ['Gemfile', 'ruby'],
+    ['include/header.hxx', 'cpp'],
+    ['script.es6', 'javascript'],
+    ['script.pp', 'ruby']
+  ])('detects %s using built-in metadata', (path, language) => {
+    expect(detectLanguage(path)).toBe(language)
+  })
+
+  it('recognizes every unambiguous upstream extension and filename', () => {
+    for (const language of associations) {
+      for (const extension of language.extensions) {
+        const owners = associations.filter((entry) =>
+          entry.extensions.some((candidate) => candidate.toLowerCase() === extension.toLowerCase())
+        )
+        if (owners.length === 1) {
+          expect(detectMonacoFilenameLanguage(`sample${extension}`)).toBe(language.id)
+        }
+      }
+      for (const filename of language.filenames) {
+        expect(detectMonacoFilenameLanguage(filename)).toBe(language.id)
+      }
+    }
+  })
+
+  it.each([
+    ['file.mdx', 'markdown'],
+    ['file.tsx', 'typescript'],
+    ['file.jsonl', 'jsonl'],
+    ['file.ipynb', 'notebook'],
+    ['file.vue', 'vue'],
+    ['file.svelte', 'svelte'],
+    ['file.astro', 'astro'],
+    ['file.typ', 'typst'],
+    ['file.nim', 'nim'],
+    ['file.h', 'c'],
+    ['.env.staging', 'ini'],
+    ['file.unknown', 'plaintext'],
+    ['folder.sol/README', 'plaintext'],
+    ['folder.sol\\README', 'plaintext'],
+    ['constructor', 'plaintext'],
+    ['toString', 'plaintext'],
+    ['__proto__', 'plaintext']
+  ])('preserves Orca behavior for %s', (path, language) => {
+    expect(detectLanguage(path)).toBe(language)
+  })
+})
diff --git a/src/renderer/src/lib/monaco-filename-language.ts b/src/renderer/src/lib/monaco-filename-language.ts
new file mode 100644
index 000000000000..c8fc6d54d3d6
--- /dev/null
+++ b/src/renderer/src/lib/monaco-filename-language.ts
@@ -0,0 +1,25 @@
+import associations from './monaco-language-associations.json'
+
+// Generated metadata avoids importing Monaco during session restoration.
+const filenames = new Map<string, string>()
+const extensions = new Map<string, string>()
+// Like Monaco, later registrations win ambiguous associations such as .pp.
+for (const language of associations) {
+  for (const filename of language.filenames) {
+    filenames.set(filename.toLowerCase(), language.id)
+  }
+  for (const extension of language.extensions) {
+    extensions.set(extension.toLowerCase(), language.id)
+  }
+}
+const suffixes = [...extensions.keys()].sort((a, b) => b.length - a.length)
+
+export function detectMonacoFilenameLanguage(filename: string): string | undefined {
+  const lowerName = filename.toLowerCase()
+  const exact = filenames.get(lowerName)
+  if (exact) {
+    return exact
+  }
+  const suffix = suffixes.find((extension) => lowerName.endsWith(extension))
+  return suffix ? extensions.get(suffix) : undefined
+}
diff --git a/src/renderer/src/lib/monaco-language-associations.json b/src/renderer/src/lib/monaco-language-associations.json
new file mode 100644
index 000000000000..6effc0051406
--- /dev/null
+++ b/src/renderer/src/lib/monaco-language-associations.json
@@ -0,0 +1,470 @@
+[
+  {
+    "id": "json",
+    "extensions": [".json", ".bowerrc", ".jshintrc", ".jscsrc", ".eslintrc", ".babelrc", ".har"],
+    "filenames": []
+  },
+  {
+    "id": "abap",
+    "extensions": [".abap"],
+    "filenames": []
+  },
+  {
+    "id": "apex",
+    "extensions": [".cls"],
+    "filenames": []
+  },
+  {
+    "id": "azcli",
+    "extensions": [".azcli"],
+    "filenames": []
+  },
+  {
+    "id": "bat",
+    "extensions": [".bat", ".cmd"],
+    "filenames": []
+  },
+  {
+    "id": "bicep",
+    "extensions": [".bicep"],
+    "filenames": []
+  },
+  {
+    "id": "cameligo",
+    "extensions": [".mligo"],
+    "filenames": []
+  },
+  {
+    "id": "clojure",
+    "extensions": [".clj", ".cljs", ".cljc", ".edn"],
+    "filenames": []
+  },
+  {
+    "id": "coffeescript",
+    "extensions": [".coffee"],
+    "filenames": []
+  },
+  {
+    "id": "c",
+    "extensions": [".c", ".h"],
+    "filenames": []
+  },
+  {
+    "id": "cpp",
+    "extensions": [".cpp", ".cc", ".cxx", ".hpp", ".hh", ".hxx"],
+    "filenames": []
+  },
+  {
+    "id": "csharp",
+    "extensions": [".cs", ".csx", ".cake"],
+    "filenames": []
+  },
+  {
+    "id": "csp",
+    "extensions": [".csp"],
+    "filenames": []
+  },
+  {
+    "id": "css",
+    "extensions": [".css"],
+    "filenames": []
+  },
+  {
+    "id": "cypher",
+    "extensions": [".cypher", ".cyp"],
+    "filenames": []
+  },
+  {
+    "id": "dart",
+    "extensions": [".dart"],
+    "filenames": []
+  },
+  {
+    "id": "dockerfile",
+    "extensions": [".dockerfile"],
+    "filenames": ["Dockerfile"]
+  },
+  {
+    "id": "ecl",
+    "extensions": [".ecl"],
+    "filenames": []
+  },
+  {
+    "id": "elixir",
+    "extensions": [".ex", ".exs"],
+    "filenames": []
+  },
+  {
+    "id": "flow9",
+    "extensions": [".flow"],
+    "filenames": []
+  },
+  {
+    "id": "fsharp",
+    "extensions": [".fs", ".fsi", ".ml", ".mli", ".fsx", ".fsscript"],
+    "filenames": []
+  },
+  {
+    "id": "freemarker2",
+    "extensions": [".ftl", ".ftlh", ".ftlx"],
+    "filenames": []
+  },
+  {
+    "id": "freemarker2.tag-angle.interpolation-dollar",
+    "extensions": [],
+    "filenames": []
+  },
+  {
+    "id": "freemarker2.tag-bracket.interpolation-dollar",
+    "extensions": [],
+    "filenames": []
+  },
+  {
+    "id": "freemarker2.tag-angle.interpolation-bracket",
+    "extensions": [],
+    "filenames": []
+  },
+  {
+    "id": "freemarker2.tag-bracket.interpolation-bracket",
+    "extensions": [],
+    "filenames": []
+  },
+  {
+    "id": "freemarker2.tag-auto.interpolation-dollar",
+    "extensions": [],
+    "filenames": []
+  },
+  {
+    "id": "freemarker2.tag-auto.interpolation-bracket",
+    "extensions": [],
+    "filenames": []
+  },
+  {
+    "id": "go",
+    "extensions": [".go"],
+    "filenames": []
+  },
+  {
+    "id": "graphql",
+    "extensions": [".graphql", ".gql"],
+    "filenames": []
+  },
+  {
+    "id": "handlebars",
+    "extensions": [".handlebars", ".hbs"],
+    "filenames": []
+  },
+  {
+    "id": "hcl",
+    "extensions": [".tf", ".tfvars", ".hcl"],
+    "filenames": []
+  },
+  {
+    "id": "html",
+    "extensions": [".html", ".htm", ".shtml", ".xhtml", ".mdoc", ".jsp", ".asp", ".aspx", ".jshtm"],
+    "filenames": []
+  },
+  {
+    "id": "ini",
+    "extensions": [".ini", ".properties", ".gitconfig"],
+    "filenames": ["config", ".gitattributes", ".gitconfig", ".editorconfig"]
+  },
+  {
+    "id": "java",
+    "extensions": [".java", ".jav"],
+    "filenames": []
+  },
+  {
+    "id": "javascript",
+    "extensions": [".js", ".es6", ".jsx", ".mjs", ".cjs"],
+    "filenames": ["jakefile"]
+  },
+  {
+    "id": "julia",
+    "extensions": [".jl"],
+    "filenames": []
+  },
+  {
+    "id": "kotlin",
+    "extensions": [".kt", ".kts"],
+    "filenames": []
+  },
+  {
+    "id": "less",
+    "extensions": [".less"],
+    "filenames": []
+  },
+  {
+    "id": "lexon",
+    "extensions": [".lex"],
+    "filenames": []
+  },
+  {
+    "id": "lua",
+    "extensions": [".lua"],
+    "filenames": []
+  },
+  {
+    "id": "liquid",
+    "extensions": [".liquid", ".html.liquid"],
+    "filenames": []
+  },
+  {
+    "id": "m3",
+    "extensions": [".m3", ".i3", ".mg", ".ig"],
+    "filenames": []
+  },
+  {
+    "id": "markdown",
+    "extensions": [".md", ".markdown", ".mdown", ".mkdn", ".mkd", ".mdwn", ".mdtxt", ".mdtext"],
+    "filenames": []
+  },
+  {
+    "id": "mdx",
+    "extensions": [".mdx"],
+    "filenames": []
+  },
+  {
+    "id": "mips",
+    "extensions": [".s"],
+    "filenames": []
+  },
+  {
+    "id": "msdax",
+    "extensions": [".dax", ".msdax"],
+    "filenames": []
+  },
+  {
+    "id": "mysql",
+    "extensions": [],
+    "filenames": []
+  },
+  {
+    "id": "objective-c",
+    "extensions": [".m"],
+    "filenames": []
+  },
+  {
+    "id": "pascal",
+    "extensions": [".pas", ".p", ".pp"],
+    "filenames": []
+  },
+  {
+    "id": "pascaligo",
+    "extensions": [".ligo"],
+    "filenames": []
+  },
+  {
+    "id": "perl",
+    "extensions": [".pl", ".pm"],
+    "filenames": []
+  },
+  {
+    "id": "pgsql",
+    "extensions": [],
+    "filenames": []
+  },
+  {
+    "id": "php",
+    "extensions": [".php", ".php4", ".php5", ".phtml", ".ctp"],
+    "filenames": []
+  },
+  {
+    "id": "pla",
+    "extensions": [".pla"],
+    "filenames": []
+  },
+  {
+    "id": "postiats",
+    "extensions": [".dats", ".sats", ".hats"],
+    "filenames": []
+  },
+  {
+    "id": "powerquery",
+    "extensions": [".pq", ".pqm"],
+    "filenames": []
+  },
+  {
+    "id": "powershell",
+    "extensions": [".ps1", ".psm1", ".psd1"],
+    "filenames": []
+  },
+  {
+    "id": "proto",
+    "extensions": [".proto"],
+    "filenames": []
+  },
+  {
+    "id": "pug",
+    "extensions": [".jade", ".pug"],
+    "filenames": []
+  },
+  {
+    "id": "python",
+    "extensions": [".py", ".rpy", ".pyw", ".cpy", ".gyp", ".gypi"],
+    "filenames": []
+  },
+  {
+    "id": "qsharp",
+    "extensions": [".qs"],
+    "filenames": []
+  },
+  {
+    "id": "r",
+    "extensions": [".r", ".rhistory", ".rmd", ".rprofile", ".rt"],
+    "filenames": []
+  },
+  {
+    "id": "razor",
+    "extensions": [".cshtml"],
+    "filenames": []
+  },
+  {
+    "id": "redis",
+    "extensions": [".redis"],
+    "filenames": []
+  },
+  {
+    "id": "redshift",
+    "extensions": [],
+    "filenames": []
+  },
+  {
+    "id": "restructuredtext",
+    "extensions": [".rst"],
+    "filenames": []
+  },
+  {
+    "id": "ruby",
+    "extensions": [".rb", ".rbx", ".rjs", ".gemspec", ".pp"],
+    "filenames": ["rakefile", "Gemfile"]
+  },
+  {
+    "id": "rust",
+    "extensions": [".rs", ".rlib"],
+    "filenames": []
+  },
+  {
+    "id": "sb",
+    "extensions": [".sb"],
+    "filenames": []
+  },
+  {
+    "id": "scala",
+    "extensions": [".scala", ".sc", ".sbt"],
+    "filenames": []
+  },
+  {
+    "id": "scheme",
+    "extensions": [".scm", ".ss", ".sch", ".rkt"],
+    "filenames": []
+  },
+  {
+    "id": "scss",
+    "extensions": [".scss"],
+    "filenames": []
+  },
+  {
+    "id": "shell",
+    "extensions": [".sh", ".bash"],
+    "filenames": []
+  },
+  {
+    "id": "sol",
+    "extensions": [".sol"],
+    "filenames": []
+  },
+  {
+    "id": "aes",
+    "extensions": [".aes"],
+    "filenames": []
+  },
+  {
+    "id": "sparql",
+    "extensions": [".rq"],
+    "filenames": []
+  },
+  {
+    "id": "sql",
+    "extensions": [".sql"],
+    "filenames": []
+  },
+  {
+    "id": "st",
+    "extensions": [".st", ".iecst", ".iecplc", ".lc3lib", ".TcPOU", ".TcDUT", ".TcGVL", ".TcIO"],
+    "filenames": []
+  },
+  {
+    "id": "swift",
+    "extensions": [".swift"],
+    "filenames": []
+  },
+  {
+    "id": "systemverilog",
+    "extensions": [".sv", ".svh"],
+    "filenames": []
+  },
+  {
+    "id": "verilog",
+    "extensions": [".v", ".vh"],
+    "filenames": []
+  },
+  {
+    "id": "tcl",
+    "extensions": [".tcl"],
+    "filenames": []
+  },
+  {
+    "id": "twig",
+    "extensions": [".twig"],
+    "filenames": []
+  },
+  {
+    "id": "typescript",
+    "extensions": [".ts", ".tsx", ".cts", ".mts"],
+    "filenames": []
+  },
+  {
+    "id": "typespec",
+    "extensions": [".tsp"],
+    "filenames": []
+  },
+  {
+    "id": "vb",
+    "extensions": [".vb"],
+    "filenames": []
+  },
+  {
+    "id": "wgsl",
+    "extensions": [".wgsl"],
+    "filenames": []
+  },
+  {
+    "id": "xml",
+    "extensions": [
+      ".xml",
+      ".xsd",
+      ".dtd",
+      ".ascx",
+      ".csproj",
+      ".config",
+      ".props",
+      ".targets",
+      ".wxi",
+      ".wxl",
+      ".wxs",
+      ".xaml",
+      ".svg",
+      ".svgz",
+      ".opf",
+      ".xslt",
+      ".xsl"
+    ],
+    "filenames": []
+  },
+  {
+    "id": "yaml",
+    "extensions": [".yaml", ".yml"],
+    "filenames": []
+  }
+]
diff --git a/src/renderer/src/lib/monaco-languages/register-typst.test.ts b/src/renderer/src/lib/monaco-languages/register-typst.test.ts
new file mode 100644
index 000000000000..a3cdc96fe0aa
--- /dev/null
+++ b/src/renderer/src/lib/monaco-languages/register-typst.test.ts
@@ -0,0 +1,76 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+  TYPST_LANGUAGE_ID,
+  TYPST_TEXTMATE_SCOPE,
+  loadTypstTextMateGrammar,
+  registerTypstLanguage
+} from './register-typst'
+
+function createMonacoMock(languages: { id: string }[] = []) {
+  return {
+    languages: {
+      getLanguages: vi.fn(() => languages),
+      register: vi.fn((language: { id: string }) => languages.push(language)),
+      setLanguageConfiguration: vi.fn(),
+      registerTokensProviderFactory: vi.fn()
+    }
+  }
+}
+
+describe('registerTypstLanguage', () => {
+  it('registers Typst with its extension, TextMate scope, and editor configuration', () => {
+    const monaco = createMonacoMock()
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the mock exercises only the four languages.* calls this registration touches; the full Monaco module type cannot be satisfied structurally.
+    registerTypstLanguage(monaco as never)
+
+    expect(monaco.languages.register).toHaveBeenCalledWith({
+      id: TYPST_LANGUAGE_ID,
+      extensions: ['.typ'],
+      aliases: ['Typst', 'typst']
+    })
+    expect(monaco.languages.setLanguageConfiguration).toHaveBeenCalledWith(
+      TYPST_LANGUAGE_ID,
+      expect.objectContaining({
+        comments: { lineComment: '//', blockComment: ['/*', '*/'] },
+        brackets: [
+          ['{', '}'],
+          ['[', ']'],
+          ['(', ')']
+        ]
+      })
+    )
+    expect(monaco.languages.registerTokensProviderFactory).toHaveBeenCalledWith(
+      TYPST_LANGUAGE_ID,
+      expect.objectContaining({ create: expect.any(Function) })
+    )
+  })
+
+  it('does not register Typst twice', () => {
+    const monaco = createMonacoMock()
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only the mocked languages API is used.
+    registerTypstLanguage(monaco as never)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only the mocked languages API is used.
+    registerTypstLanguage(monaco as never)
+
+    expect(monaco.languages.register).toHaveBeenCalledTimes(1)
+    expect(monaco.languages.setLanguageConfiguration).toHaveBeenCalledTimes(1)
+    expect(monaco.languages.registerTokensProviderFactory).toHaveBeenCalledTimes(1)
+  })
+})
+
+describe('loadTypstTextMateGrammar', () => {
+  it('lazily loads the vendored Typst grammar for the Typst scope', async () => {
+    const grammar = await loadTypstTextMateGrammar(TYPST_TEXTMATE_SCOPE)
+
+    expect(grammar).toMatchObject({
+      name: 'typst',
+      scopeName: TYPST_TEXTMATE_SCOPE
+    })
+  })
+
+  it('ignores unrelated TextMate scopes', async () => {
+    await expect(loadTypstTextMateGrammar('source.python')).resolves.toBeNull()
+  })
+})
diff --git a/src/renderer/src/lib/monaco-languages/register-typst.ts b/src/renderer/src/lib/monaco-languages/register-typst.ts
new file mode 100644
index 000000000000..82f83e54a038
--- /dev/null
+++ b/src/renderer/src/lib/monaco-languages/register-typst.ts
@@ -0,0 +1,56 @@
+import type * as Monaco from 'monaco-editor'
+import type { IRawGrammar } from 'vscode-textmate'
+import { registerTextMateLanguage } from './textmate-language-registration'
+
+type MonacoModule = typeof Monaco
+
+export const TYPST_LANGUAGE_ID = 'typst'
+export const TYPST_TEXTMATE_SCOPE = 'source.typst'
+
+export const typstLanguageConfiguration: Monaco.languages.LanguageConfiguration = {
+  comments: {
+    lineComment: '//',
+    blockComment: ['/*', '*/']
+  },
+  brackets: [
+    ['{', '}'],
+    ['[', ']'],
+    ['(', ')']
+  ],
+  autoClosingPairs: [
+    { open: '{', close: '}' },
+    { open: '[', close: ']' },
+    { open: '(', close: ')' },
+    { open: '"', close: '"' }
+  ],
+  surroundingPairs: [
+    { open: '{', close: '}' },
+    { open: '[', close: ']' },
+    { open: '(', close: ')' },
+    { open: '"', close: '"' }
+  ]
+}
+
+export async function loadTypstTextMateGrammar(scopeName: string): Promise<IRawGrammar | null> {
+  if (scopeName !== TYPST_TEXTMATE_SCOPE) {
+    return null
+  }
+
+  // Lazy upstream grammar; provenance and Apache-2.0 license are in typst-LICENSE.txt.
+  const grammarModule = await import('./textmate-grammars/typst.tmLanguage.json')
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: TextMate injects the $self/$base repository entries required by IRawGrammar; real tokenization tests validate this vendored JSON.
+  return grammarModule.default as unknown as IRawGrammar
+}
+
+export function registerTypstLanguage(monaco: MonacoModule): void {
+  registerTextMateLanguage(monaco, {
+    language: {
+      id: TYPST_LANGUAGE_ID,
+      extensions: ['.typ'],
+      aliases: ['Typst', 'typst']
+    },
+    configuration: typstLanguageConfiguration,
+    scopeName: TYPST_TEXTMATE_SCOPE,
+    loadGrammar: loadTypstTextMateGrammar
+  })
+}
diff --git a/src/renderer/src/lib/monaco-languages/textmate-grammars/typst-LICENSE.txt b/src/renderer/src/lib/monaco-languages/textmate-grammars/typst-LICENSE.txt
new file mode 100644
index 000000000000..5c8e11a6e699
--- /dev/null
+++ b/src/renderer/src/lib/monaco-languages/textmate-grammars/typst-LICENSE.txt
@@ -0,0 +1,183 @@
+Typst
+
+Source: https://github.com/typst/typst/blob/9f2b6e8715237cb086899a42873660fe744622e8/tools/support/typst.tmLanguage.json
+Modifications by Orca: JSON formatting; line comments have opaque bodies;
+block comments nest only block comments; math reuses string and comment rules
+and consumes escapes before recognizing its closing dollar delimiter.
+
+                              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
diff --git a/src/renderer/src/lib/monaco-languages/textmate-grammars/typst.tmLanguage.json b/src/renderer/src/lib/monaco-languages/textmate-grammars/typst.tmLanguage.json
new file mode 100644
index 000000000000..26c14b4c4f41
--- /dev/null
+++ b/src/renderer/src/lib/monaco-languages/textmate-grammars/typst.tmLanguage.json
@@ -0,0 +1,383 @@
+{
+  "comment": "Adapted by Orca: isolate comment nesting and protect strings, escapes, and comments inside math. See typst-LICENSE.txt for pinned upstream provenance.",
+  "name": "typst",
+  "patterns": [{ "include": "#markup" }],
+  "repository": {
+    "comments": {
+      "patterns": [
+        { "include": "#block-comment" },
+        {
+          "name": "comment.line.double-slash.typst",
+          "begin": "(?<!:)//",
+          "end": "\n",
+          "beginCaptures": { "0": { "name": "punctuation.definition.comment.typst" } }
+        }
+      ]
+    },
+    "common": {
+      "patterns": [{ "include": "#comments" }]
+    },
+    "markup": {
+      "patterns": [
+        { "include": "#common" },
+        {
+          "name": "constant.character.escape.content.typst",
+          "match": "\\\\([\\\\/\\[\\]{}#*_=~`$-.]|u\\{[0-9a-zA-Z]*\\}?)"
+        },
+        {
+          "name": "punctuation.definition.linebreak.typst",
+          "match": "\\\\"
+        },
+        {
+          "name": "punctuation.definition.nonbreaking-space.typst",
+          "match": "~"
+        },
+        {
+          "name": "punctuation.definition.shy.typst",
+          "match": "-\\?"
+        },
+        {
+          "name": "punctuation.definition.em-dash.typst",
+          "match": "---"
+        },
+        {
+          "name": "punctuation.definition.en-dash.typst",
+          "match": "--"
+        },
+        {
+          "name": "punctuation.definition.ellipsis.typst",
+          "match": "\\.\\.\\."
+        },
+        {
+          "name": "constant.symbol.typst",
+          "match": ":([a-zA-Z0-9]+:)+"
+        },
+        {
+          "name": "markup.bold.typst",
+          "begin": "(^\\*|\\*$|((?<=\\W|_)\\*)|(\\*(?=\\W|_)))",
+          "end": "(^\\*|\\*$|((?<=\\W|_)\\*)|(\\*(?=\\W|_)))|\n|(?=\\])",
+          "captures": { "0": { "name": "punctuation.definition.bold.typst" } },
+          "patterns": [{ "include": "#markup" }]
+        },
+        {
+          "name": "markup.italic.typst",
+          "begin": "(^_|_$|((?<=\\W|_)_)|(_(?=\\W|_)))",
+          "end": "(^_|_$|((?<=\\W|_)_)|(_(?=\\W|_)))|\n|(?=\\])",
+          "captures": { "0": { "name": "punctuation.definition.italic.typst" } },
+          "patterns": [{ "include": "#markup" }]
+        },
+        {
+          "name": "markup.underline.link.typst",
+          "match": "https?://[0-9a-zA-Z~/%#&=',;\\.\\+\\?]*"
+        },
+        {
+          "name": "markup.raw.block.typst",
+          "begin": "`{3,}",
+          "end": "\\0",
+          "captures": { "0": { "name": "punctuation.definition.raw.typst" } }
+        },
+        {
+          "name": "markup.raw.inline.typst",
+          "begin": "`",
+          "end": "`",
+          "captures": { "0": { "name": "punctuation.definition.raw.typst" } }
+        },
+        { "include": "#math" },
+        {
+          "name": "markup.heading.typst",
+          "contentName": "entity.name.section.typst",
+          "begin": "^\\s*=+\\s+",
+          "end": "\n|(?=<)",
+          "beginCaptures": { "0": { "name": "punctuation.definition.heading.typst" } },
+          "patterns": [{ "include": "#markup" }]
+        },
+        {
+          "name": "punctuation.definition.list.unnumbered.typst",
+          "match": "^\\s*-\\s+"
+        },
+        {
+          "name": "punctuation.definition.list.numbered.typst",
+          "match": "^\\s*([0-9]*\\.|\\+)\\s+"
+        },
+        {
+          "match": "^\\s*(/)\\s+([^:]*:)",
+          "captures": {
+            "1": { "name": "punctuation.definition.list.description.typst" },
+            "2": { "name": "markup.list.term.typst" }
+          }
+        },
+        {
+          "name": "entity.other.label.typst",
+          "match": "<[[:alpha:]_][[:alnum:]_-]*>",
+          "captures": { "1": { "name": "punctuation.definition.label.typst" } }
+        },
+        {
+          "name": "entity.other.reference.typst",
+          "match": "(@)[[:alpha:]_][[:alnum:]_-]*",
+          "captures": { "1": { "name": "punctuation.definition.reference.typst" } }
+        },
+        {
+          "begin": "(#)(let|set|show|context)\\b",
+          "end": "\n|(;)|(?=])",
+          "beginCaptures": {
+            "0": { "name": "keyword.other.typst" },
+            "1": { "name": "punctuation.definition.keyword.typst" }
+          },
+          "endCaptures": { "1": { "name": "punctuation.terminator.statement.typst" } },
+          "patterns": [{ "include": "#code" }]
+        },
+        {
+          "name": "keyword.other.typst",
+          "match": "(#)(as|in)\\b",
+          "captures": { "1": { "name": "punctuation.definition.keyword.typst" } }
+        },
+        {
+          "begin": "((#)if|(?<=(}|])\\s*)else)\\b",
+          "end": "\n|(?=])|(?<=}|])",
+          "beginCaptures": {
+            "0": { "name": "keyword.control.conditional.typst" },
+            "2": { "name": "punctuation.definition.keyword.typst" }
+          },
+          "patterns": [{ "include": "#code" }]
+        },
+        {
+          "begin": "(#)(for|while)\\b",
+          "end": "\n|(?=])|(?<=}|])",
+          "beginCaptures": {
+            "0": { "name": "keyword.control.loop.typst" },
+            "1": { "name": "punctuation.definition.keyword.typst" }
+          },
+          "patterns": [{ "include": "#code" }]
+        },
+        {
+          "name": "keyword.control.loop.typst",
+          "match": "(#)(break|continue)\\b",
+          "captures": { "1": { "name": "punctuation.definition.keyword.typst" } }
+        },
+        {
+          "begin": "(#)(import|include|export)\\b",
+          "end": "\n|(;)|(?=])",
+          "beginCaptures": {
+            "0": { "name": "keyword.control.import.typst" },
+            "1": { "name": "punctuation.definition.keyword.typst" }
+          },
+          "endCaptures": { "1": { "name": "punctuation.terminator.statement.typst" } },
+          "patterns": [{ "include": "#code" }]
+        },
+        {
+          "name": "keyword.control.flow.typst",
+          "match": "(#)(return)\\b",
+          "captures": { "1": { "name": "punctuation.definition.keyword.typst" } }
+        },
+        {
+          "comment": "Function name",
+          "name": "entity.name.function.typst",
+          "match": "((#)[[:alpha:]_][[:alnum:]_-]*!?)(?=\\[|\\()",
+          "captures": { "2": { "name": "punctuation.definition.function.typst" } }
+        },
+        {
+          "comment": "Function arguments",
+          "begin": "(?<=#[[:alpha:]_][[:alnum:]_-]*!?)\\(",
+          "end": "\\)",
+          "captures": { "0": { "name": "punctuation.definition.group.typst" } },
+          "patterns": [{ "include": "#arguments" }]
+        },
+        {
+          "name": "entity.other.interpolated.typst",
+          "match": "(#)[[:alpha:]_][.[:alnum:]_-]*",
+          "captures": { "1": { "name": "punctuation.definition.variable.typst" } }
+        },
+        {
+          "name": "meta.block.content.typst",
+          "begin": "#",
+          "end": "\\s",
+          "patterns": [{ "include": "#code" }]
+        }
+      ]
+    },
+    "code": {
+      "patterns": [
+        { "include": "#common" },
+        {
+          "name": "meta.block.code.typst",
+          "begin": "{",
+          "end": "}",
+          "captures": { "0": { "name": "punctuation.definition.block.code.typst" } },
+          "patterns": [{ "include": "#code" }]
+        },
+        {
+          "name": "meta.block.content.typst",
+          "begin": "\\[",
+          "end": "\\]",
+          "captures": { "0": { "name": "punctuation.definition.block.content.typst" } },
+          "patterns": [{ "include": "#markup" }]
+        },
+        {
+          "name": "comment.line.double-slash.typst",
+          "begin": "//",
+          "end": "\n",
+          "beginCaptures": { "0": { "name": "punctuation.definition.comment.typst" } }
+        },
+        {
+          "name": "punctuation.separator.colon.typst",
+          "match": ":"
+        },
+        {
+          "name": "punctuation.separator.comma.typst",
+          "match": ","
+        },
+        {
+          "name": "keyword.operator.typst",
+          "match": "=>|\\.\\."
+        },
+        {
+          "name": "keyword.operator.relational.typst",
+          "match": "==|!=|<=|<|>=|>"
+        },
+        {
+          "name": "keyword.operator.assignment.typst",
+          "match": "\\+=|-=|\\*=|/=|="
+        },
+        {
+          "name": "keyword.operator.arithmetic.typst",
+          "match": "\\+|\\*|/|(?<![[:alpha:]_][[:alnum:]_-]*)-(?![:alnum:]_-]*[[:alpha:]_])"
+        },
+        {
+          "name": "keyword.operator.word.typst",
+          "match": "\\b(and|or|not)\\b"
+        },
+        {
+          "name": "keyword.other.typst",
+          "match": "\\b(let|as|in|set|show|context)\\b"
+        },
+        {
+          "name": "keyword.control.conditional.typst",
+          "match": "\\b(if|else)\\b"
+        },
+        {
+          "name": "keyword.control.loop.typst",
+          "match": "\\b(for|while|break|continue)\\b"
+        },
+        {
+          "name": "keyword.control.import.typst",
+          "match": "\\b(import|include|export)\\b"
+        },
+        {
+          "name": "keyword.control.flow.typst",
+          "match": "\\b(return)\\b"
+        },
+        { "include": "#constants" },
+        {
+          "comment": "Function name",
+          "name": "entity.name.function.typst",
+          "match": "\\b[[:alpha:]_][[:alnum:]_-]*!?(?=\\[|\\()"
+        },
+        {
+          "comment": "Function name",
+          "name": "entity.name.function.typst",
+          "match": "(?<=\\bshow\\s*)\\b[[:alpha:]_][[:alnum:]_-]*(?=\\s*[:.])"
+        },
+        {
+          "comment": "Function arguments",
+          "begin": "(?<=\\b[[:alpha:]_][[:alnum:]_-]*!?)\\(",
+          "end": "\\)",
+          "captures": { "0": { "name": "punctuation.definition.group.typst" } },
+          "patterns": [{ "include": "#arguments" }]
+        },
+        {
+          "name": "variable.other.typst",
+          "match": "\\b[[:alpha:]_][[:alnum:]_-]*\\b"
+        },
+        {
+          "name": "meta.group.typst",
+          "begin": "\\(",
+          "end": "\\)|(?=;)",
+          "captures": { "0": { "name": "punctuation.definition.group.typst" } },
+          "patterns": [{ "include": "#code" }]
+        }
+      ]
+    },
+    "constants": {
+      "patterns": [
+        {
+          "name": "constant.language.none.typst",
+          "match": "\\bnone\\b"
+        },
+        {
+          "name": "constant.language.auto.typst",
+          "match": "\\bauto\\b"
+        },
+        {
+          "name": "constant.language.boolean.typst",
+          "match": "\\b(true|false)\\b"
+        },
+        {
+          "name": "constant.numeric.length.typst",
+          "match": "\\b(\\d*)?\\.?\\d+([eE][+-]?\\d+)?(mm|pt|cm|in|em)\\b"
+        },
+        {
+          "name": "constant.numeric.angle.typst",
+          "match": "\\b(\\d*)?\\.?\\d+([eE][+-]?\\d+)?(rad|deg)\\b"
+        },
+        {
+          "name": "constant.numeric.percentage.typst",
+          "match": "\\b(\\d*)?\\.?\\d+([eE][+-]?\\d+)?%"
+        },
+        {
+          "name": "constant.numeric.fr.typst",
+          "match": "\\b(\\d*)?\\.?\\d+([eE][+-]?\\d+)?fr"
+        },
+        {
+          "name": "constant.numeric.integer.typst",
+          "match": "\\b(0x[0-9a-zA-Z]+|(0b|0o)?\\d+)\\b"
+        },
+        {
+          "name": "constant.numeric.float.typst",
+          "match": "\\b(\\d*)?\\.?\\d+([eE][+-]?\\d+)?\\b"
+        },
+        { "include": "#string" },
+        { "include": "#math" }
+      ]
+    },
+    "arguments": {
+      "patterns": [
+        {
+          "name": "variable.parameter.typst",
+          "match": "\\b[[:alpha:]_][[:alnum:]_-]*(?=:)"
+        },
+        { "include": "#code" }
+      ]
+    },
+    "block-comment": {
+      "name": "comment.block.typst",
+      "begin": "/\\*",
+      "end": "\\*/",
+      "captures": { "0": { "name": "punctuation.definition.comment.typst" } },
+      "patterns": [{ "include": "#block-comment" }]
+    },
+    "string": {
+      "name": "string.quoted.double.typst",
+      "begin": "\"",
+      "end": "\"",
+      "captures": { "0": { "name": "punctuation.definition.string.typst" } },
+      "patterns": [
+        {
+          "name": "constant.character.escape.string.typst",
+          "match": "\\\\([\\\\\"nrt]|u\\{?[0-9a-zA-Z]*\\}?)"
+        }
+      ]
+    },
+    "math": {
+      "name": "string.other.math.typst",
+      "begin": "\\$",
+      "end": "\\$",
+      "captures": { "0": { "name": "punctuation.definition.string.math.typst" } },
+      "patterns": [
+        { "include": "#comments" },
+        { "include": "#string" },
+        { "name": "constant.character.escape.math.typst", "match": "\\\\." }
+      ]
+    }
+  },
+  "scopeName": "source.typst"
+}
diff --git a/src/renderer/src/lib/monaco-languages/textmate-language-registration.test.ts b/src/renderer/src/lib/monaco-languages/textmate-language-registration.test.ts
index dcd7b969ba91..a5638026eef5 100644
--- a/src/renderer/src/lib/monaco-languages/textmate-language-registration.test.ts
+++ b/src/renderer/src/lib/monaco-languages/textmate-language-registration.test.ts
@@ -65,8 +65,12 @@ describe('registerTextMateLanguage', () => {
     expect(loadProviderModule).not.toHaveBeenCalled()
 
     const providerPromise = createTokensProvider()
+    expect(createTokensProvider()).toBe(providerPromise)
 
     await expect(providerPromise).resolves.toBe(provider)
+    expect(createTokensProvider()).toBe(providerPromise)
+    expect(loadProviderModule).toHaveBeenCalledTimes(1)
+    expect(createTextMateTokensProvider).toHaveBeenCalledTimes(1)
     expect(createTextMateTokensProvider).toHaveBeenCalledWith({
       scopeName: 'source.nim',
       loadGrammar
diff --git a/src/renderer/src/lib/monaco-languages/textmate-token-provider.test.ts b/src/renderer/src/lib/monaco-languages/textmate-token-provider.test.ts
index d2d40b04ba01..86b5d0c8604f 100644
--- a/src/renderer/src/lib/monaco-languages/textmate-token-provider.test.ts
+++ b/src/renderer/src/lib/monaco-languages/textmate-token-provider.test.ts
@@ -4,6 +4,7 @@ import { describe, expect, it } from 'vitest'
 import { createOnigScanner, createOnigString, loadWASM } from 'vscode-oniguruma'
 import type { IOnigLib, IRawGrammar } from 'vscode-textmate'
 import nimGrammar from './textmate-grammars/nim.tmLanguage.json'
+import { loadTypstTextMateGrammar } from './register-typst'
 import { createTextMateTokensProvider } from './textmate-token-provider'
 
 const require = createRequire(import.meta.url)
@@ -46,6 +47,107 @@ describe('createTextMateTokensProvider', () => {
     )
   })
 
+  it('tokenizes Typst markup, code, and math through the lazy grammar loader', async () => {
+    const provider = await createTextMateTokensProvider({
+      scopeName: 'source.typst',
+      loadGrammar: loadTypstTextMateGrammar,
+      loadOniguruma: loadNodeOniguruma
+    })
+    const scopesOf = (line: string) =>
+      provider.tokenize(line, provider.getInitialState()).tokens.map((token) => token.scopes)
+
+    expect(scopesOf('#let width = 12pt')).toEqual(
+      expect.arrayContaining(['keyword.other.typst', 'constant.numeric.length.typst'])
+    )
+    expect(scopesOf('#set text(font: "Inter")')).toEqual(
+      expect.arrayContaining(['entity.name.function.typst', 'string.quoted.double.typst'])
+    )
+    expect(scopesOf('// note')).toContain('comment.line.double-slash.typst')
+    expect(scopesOf('$ sum_(k=0)^n k $')).toContain('string.other.math.typst')
+  })
+
+  it.each([
+    ['```rust', 'let x = 1', '```', '#let y = 2'],
+    ['````', '```', '````', '#let y = 2']
+  ])('carries a Typst raw block until its matching fence closes (%s)', async (...lines) => {
+    const provider = await createTextMateTokensProvider({
+      scopeName: 'source.typst',
+      loadGrammar: loadTypstTextMateGrammar,
+      loadOniguruma: loadNodeOniguruma
+    })
+
+    let state = provider.getInitialState()
+    const lineScopes = lines.map((line) => {
+      const result = provider.tokenize(line, state)
+      state = result.endState
+      return result.tokens.map((token) => token.scopes)
+    })
+
+    expect(lineScopes[1]).toEqual(['markup.raw.block.typst'])
+    expect(lineScopes[3]).toContain('keyword.other.typst')
+  })
+
+  it('carries Typst math across lines and returns to code after the closing dollar', async () => {
+    const provider = await createTextMateTokensProvider({
+      scopeName: 'source.typst',
+      loadGrammar: loadTypstTextMateGrammar,
+      loadOniguruma: loadNodeOniguruma
+    })
+    const opening = provider.tokenize('$', provider.getInitialState())
+    const clone = opening.endState.clone()
+    expect(clone.equals(opening.endState)).toBe(true)
+    const body = provider.tokenize('x^2 + y^2 = z^2', clone)
+    expect(body.tokens.map((token) => token.scopes)).toEqual(['string.other.math.typst'])
+    const closing = provider.tokenize('$', body.endState)
+    const after = provider.tokenize('#let y = 2', closing.endState)
+    expect(after.tokens.map((token) => token.scopes)).toContain('keyword.other.typst')
+    expect(after.tokens.map((token) => token.scopes)).not.toContain('string.other.math.typst')
+    expect(provider.tokenize('#let y = 2', provider.getInitialState()).tokens).toEqual(after.tokens)
+  })
+
+  it.each([
+    ['// Write /* to start a block comment.'],
+    ['/* documentation: // */'],
+    ['/* outer', '/* inner */ still outer', '*/'],
+    ['$ "cost $5" + x $'],
+    ['$ x + \\$ + y $'],
+    ['$ "escaped \\" $5" + x $'],
+    ['$ x + \\\\ $'],
+    ['$', '"cost $5" + \\$ + y', '$'],
+    ['$ x /* $ ignored */ + y $'],
+    ['$', '// $ ignored', 'x + y', '$'],
+    ['#let formula = $ "cost $5" + \\$ $']
+  ])('returns to Typst code after a comment or math region (%j)', async (...lines) => {
+    const provider = await createTextMateTokensProvider({
+      scopeName: 'source.typst',
+      loadGrammar: loadTypstTextMateGrammar,
+      loadOniguruma: loadNodeOniguruma
+    })
+    let state = provider.getInitialState()
+    for (const line of lines) {
+      state = provider.tokenize(line, state).endState
+    }
+    const after = '#let after = 12pt'
+    const tokens = provider.tokenize(after, state).tokens
+    expect(tokens).toEqual(provider.tokenize(after, provider.getInitialState()).tokens)
+    expect(tokens.map((token) => token.scopes)).toEqual(
+      expect.arrayContaining(['keyword.other.typst', 'constant.numeric.length.typst'])
+    )
+  })
+
+  it('keeps nested Typst block comments active until both closers', async () => {
+    const provider = await createTextMateTokensProvider({
+      scopeName: 'source.typst',
+      loadGrammar: loadTypstTextMateGrammar,
+      loadOniguruma: loadNodeOniguruma
+    })
+    let state = provider.tokenize('/* outer /* inner', provider.getInitialState()).endState
+    state = provider.tokenize('*/ still outer', state).endState
+    expect(provider.tokenize('#let hidden = 2', state).tokens.map((token) => token.scopes)).toEqual(
+      ['comment.block.typst']
+    )
+  })
+
   it('fails clearly when a scope has no grammar', async () => {
     await expect(
       createTextMateTokensProvider({
diff --git a/src/renderer/src/lib/monaco-setup.ts b/src/renderer/src/lib/monaco-setup.ts
index c94a147839d7..5c2c69d24cba 100644
--- a/src/renderer/src/lib/monaco-setup.ts
+++ b/src/renderer/src/lib/monaco-setup.ts
@@ -13,6 +13,7 @@ import { registerJsonlLanguage } from './monaco-languages/register-jsonl'
 import { registerNimLanguage } from './monaco-languages/register-nim'
 import { registerShellMarkdownAliases } from './monaco-languages/register-shell-markdown-aliases'
 import { registerSvelteLanguage } from './monaco-languages/register-svelte'
+import { registerTypstLanguage } from './monaco-languages/register-typst'
 import { registerVueLanguage } from './monaco-languages/register-vue'
 import { installMonacoDelayerCancellationGuard } from './monaco-delayer-cancellation-guard'
 import { installMonacoDiffEditorDisposalGuard } from './monaco-diff-editor-disposal'
@@ -82,6 +83,7 @@ runMonacoSetupSteps([
   ['Svelte language registration', () => registerSvelteLanguage(monaco)],
   ['Astro language registration', () => registerAstroLanguage(monaco)],
   ['Nim language registration', () => registerNimLanguage(monaco)],
+  ['Typst language registration', () => registerTypstLanguage(monaco)],
   ['JSONL language registration', () => registerJsonlLanguage(monaco)],
   ['shell Markdown alias registration', () => registerShellMarkdownAliases(monaco)],
   ['delayer cancellation guard', installMonacoDelayerCancellationGuard],
diff --git a/src/renderer/src/lib/new-workspace.test.ts b/src/renderer/src/lib/new-workspace.test.ts
index 78d59f781f2a..d3ca4fa01e63 100644
--- a/src/renderer/src/lib/new-workspace.test.ts
+++ b/src/renderer/src/lib/new-workspace.test.ts
@@ -293,7 +293,12 @@ describe('ensureAgentStartupInTerminal prompt delivery', () => {
       }
     })
 
-    expect(mockSendRuntimePtyInputVerified).toHaveBeenCalledWith({}, 'pty-1', 'fix the spinner\r')
+    expect(mockSendRuntimePtyInputVerified).toHaveBeenCalledWith(
+      {},
+      'pty-1',
+      'fix the spinner\r',
+      'launch'
+    )
     expect(mockTrack).not.toHaveBeenCalledWith('agent_prompt_sent', expect.anything())
   })
 
diff --git a/src/renderer/src/lib/non-secure-context-crypto.repro.test.ts b/src/renderer/src/lib/non-secure-context-crypto.repro.test.ts
index ce16d669f16a..87da1737c795 100644
--- a/src/renderer/src/lib/non-secure-context-crypto.repro.test.ts
+++ b/src/renderer/src/lib/non-secure-context-crypto.repro.test.ts
@@ -20,19 +20,6 @@ afterEach(() => {
 })
 
 describe('non-secure context (plain HTTP LAN web client)', () => {
-  it('crypto.randomUUID is undefined, like the browser reports', () => {
-    // oxlint-disable-next-line no-restricted-properties -- asserting the absence this suite exists for
-    expect((globalThis.crypto as Crypto).randomUUID).toBeUndefined()
-    // oxlint-disable-next-line no-restricted-properties -- asserting the absence this suite exists for
-    expect(() => (globalThis.crypto as Crypto).randomUUID()).toThrow()
-  })
-
-  it('hashOrcaHookScript does not throw when crypto.subtle is missing', async () => {
-    const { hashOrcaHookScript } = await import('./orca-hook-trust')
-    const hash = await hashOrcaHookScript('echo hi')
-    expect(hash).toMatch(/^[0-9a-f]+$/)
-  })
-
   // The fallback must match the secure-context hash, or the shared trust store
   // mismatches and the user is re-prompted to approve a hook they already
   // trusted on the desktop app.
@@ -54,9 +41,7 @@ describe('non-secure context (plain HTTP LAN web client)', () => {
   it('loads the renderer agent-status authority and its store slice', async () => {
     vi.resetModules()
     const { rendererAgentStatusObservations } = await import('./renderer-agent-status-observations')
-    const { createAgentStatusAuthorityActions } =
-      await import('../store/slices/agent-status-authority-actions')
-    expect(typeof createAgentStatusAuthorityActions).toBe('function')
+    await import('../store/slices/agent-status-authority-actions')
     expect(rendererAgentStatusObservations.getAuthorityId()).toMatch(
       /^renderer:[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/
     )
diff --git a/src/renderer/src/lib/pane-manager/pane-overlay-focus.test.ts b/src/renderer/src/lib/pane-manager/pane-overlay-focus.test.ts
index 6b51c1ba4498..1f8d603c89f2 100644
--- a/src/renderer/src/lib/pane-manager/pane-overlay-focus.test.ts
+++ b/src/renderer/src/lib/pane-manager/pane-overlay-focus.test.ts
@@ -105,6 +105,26 @@ describe.each(['initial', 'active'] as const)('%s pane focus', (operation) => {
     expect(document.activeElement).toBe(f.textarea)
   })
 
+  it('preserves the focused list during arrow navigation', () => {
+    const f = fixture()
+    const sidebar = overlay('listbox')
+    sidebar.setAttribute('data-worktree-sidebar', '')
+    sidebar.setAttribute('data-keyboard-navigation', '')
+    focus(f)
+    expect(document.activeElement).toBe(sidebar)
+    expect(f.pane.terminal.focus).not.toHaveBeenCalled()
+  })
+
+  it('ignores a navigation marker on a list that no longer owns focus', () => {
+    const f = fixture()
+    const sidebar = overlay('listbox')
+    sidebar.setAttribute('data-worktree-sidebar', '')
+    sidebar.setAttribute('data-keyboard-navigation', '')
+    sidebar.blur()
+    focus(f)
+    expect(document.activeElement).toBe(f.textarea)
+  })
+
   it('allows focus after the overlay closes', () => {
     const f = fixture()
     overlay('menu').style.display = 'none'
diff --git a/src/renderer/src/lib/pane-manager/pane-overlay-focus.ts b/src/renderer/src/lib/pane-manager/pane-overlay-focus.ts
index 0dcf5c07ce90..bb53245df41a 100644
--- a/src/renderer/src/lib/pane-manager/pane-overlay-focus.ts
+++ b/src/renderer/src/lib/pane-manager/pane-overlay-focus.ts
@@ -6,11 +6,12 @@ export function focusPanePreservingOverlays(
 ): void {
   if (
     typeof document !== 'undefined' &&
-    hasVisibleOverlay({
-      ignoreMatches: '[role="listbox"][data-worktree-sidebar]',
-      ignoreContaining: pane.container,
-      ignoreDismissed: true
-    })
+    (document.activeElement?.matches('[data-worktree-sidebar][data-keyboard-navigation]') ||
+      hasVisibleOverlay({
+        ignoreMatches: '[role="listbox"][data-worktree-sidebar]',
+        ignoreContaining: pane.container,
+        ignoreDismissed: true
+      }))
   ) {
     return
   }
diff --git a/src/renderer/src/lib/react-commit-cascade-telemetry.test.ts b/src/renderer/src/lib/react-commit-cascade-telemetry.test.ts
index 89e0456c2ce4..d09337c8d0cd 100644
--- a/src/renderer/src/lib/react-commit-cascade-telemetry.test.ts
+++ b/src/renderer/src/lib/react-commit-cascade-telemetry.test.ts
@@ -2,7 +2,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { sanitizeCrashReportDetails } from '../../../shared/crash-report-redaction'
 import { REACT_NESTED_UPDATE_LIMIT } from '../../../shared/react-update-depth-attribution'
 import {
-  REACT_CASCADING_LANES,
   setReactCommitCascadeRendererSurface,
   REACT_COMMIT_CASCADE_ARM_COMMITS,
   REACT_COMMIT_CASCADE_BREADCRUMB,
@@ -67,7 +66,6 @@ describe('cascade thresholds', () => {
   it('derives arm and notice limits from React commit budget', () => {
     expect(REACT_COMMIT_CASCADE_NOTICE_LIMIT).toBeLessThan(REACT_NESTED_UPDATE_LIMIT)
     expect(REACT_COMMIT_CASCADE_ARM_COMMITS).toBeLessThan(REACT_COMMIT_CASCADE_NOTICE_LIMIT)
-    expect(REACT_CASCADING_LANES).toBe(42)
   })
 })
 
diff --git a/src/renderer/src/lib/recent-workspace-tab-rows.test.ts b/src/renderer/src/lib/recent-workspace-tab-rows.test.ts
index b0488309bf38..9babe59d9bf8 100644
--- a/src/renderer/src/lib/recent-workspace-tab-rows.test.ts
+++ b/src/renderer/src/lib/recent-workspace-tab-rows.test.ts
@@ -166,6 +166,28 @@ describe('resolveRecentWorkspaceTabStatus', () => {
     )
   })
 
+  it('surfaces a failed outcome as failed', () => {
+    const failed = entry('failed', 'done', NOW - 1_000, {
+      mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: NOW - 1_000 }
+    })
+
+    expect(resolveRecentWorkspaceTabStatus(row('failed'), sources([failed]), NOW)).toBe('failed')
+  })
+
+  it('surfaces a main agent that failed while its subagent works as failed, above working', () => {
+    const held = (tabId: string, outcome: 'failure' | 'success') =>
+      entry(tabId, 'working', NOW - 1_000, {
+        mainAgent: { state: 'done', outcome, stateStartedAt: NOW - 2_000 }
+      })
+
+    expect(
+      resolveRecentWorkspaceTabStatus(row('held'), sources([held('held', 'failure')]), NOW)
+    ).toBe('failed')
+    expect(
+      resolveRecentWorkspaceTabStatus(row('held'), sources([held('held', 'success')]), NOW)
+    ).toBe('working')
+  })
+
   it('does not let a cleanly finished sibling mask an interruption', () => {
     const interrupted = entry('mixed', 'done', NOW - 1_000, {
       paneKey: `mixed:${LEAF_ID}`,
diff --git a/src/renderer/src/lib/recent-workspace-tab-rows.ts b/src/renderer/src/lib/recent-workspace-tab-rows.ts
index 2f4b172c4755..45f902139539 100644
--- a/src/renderer/src/lib/recent-workspace-tab-rows.ts
+++ b/src/renderer/src/lib/recent-workspace-tab-rows.ts
@@ -7,6 +7,7 @@ import {
   type WorktreeAttention
 } from '@/components/sidebar/smart-attention'
 import { tabHasLivePty } from './tab-has-live-pty'
+import { agentVerdictDisplayMark } from '../../../shared/agent-main-agent-verdict'
 import { isExplicitAgentStatusFresh } from './pane-agent-evidence'
 import type { WorktreeStatus } from './worktree-status'
 import type { TerminalTab } from '../../../shared/terminal-tab-types'
@@ -74,6 +75,21 @@ export function resolveRecentWorkspaceTabStatus(
   const panes = collectTabPaneInputs(row.terminalTab, row.worktreeLastActivityAt, paneSources, now)
   const attention = resolveAttention(panes, now)
   const explicit = STATUS_BY_ATTENTION_CLASS[attention.cls]
+  if (explicit === 'permission') {
+    return explicit
+  }
+  const verdicts = new Set(
+    panes.flatMap((pane) =>
+      pane.kind === 'hook' &&
+      isExplicitAgentStatusFresh(pane.entry, now, AGENT_STATUS_STALE_AFTER_MS)
+        ? [agentVerdictDisplayMark(pane.entry)]
+        : []
+    )
+  )
+  // Why: a failed main agent outranks the subagent work still holding its row live.
+  if (verdicts.has('failed')) {
+    return 'failed'
+  }
   if (explicit === 'working') {
     const hasForegroundWork = panes.some(
       (pane) =>
@@ -82,16 +98,7 @@ export function resolveRecentWorkspaceTabStatus(
     )
     return hasForegroundWork ? 'working' : 'monitoring'
   }
-  if (explicit === 'permission') {
-    return explicit
-  }
-  const hasInterrupted = panes.some(
-    (pane) =>
-      pane.kind === 'hook' &&
-      pane.entry.interrupted === true &&
-      isExplicitAgentStatusFresh(pane.entry, now, AGENT_STATUS_STALE_AFTER_MS)
-  )
-  if (hasInterrupted) {
+  if (verdicts.has('interrupted')) {
     return 'interrupted'
   }
   if (explicit === 'done') {
diff --git a/src/renderer/src/lib/resume-sleeping-agent-session.ts b/src/renderer/src/lib/resume-sleeping-agent-session.ts
index 50fb378888f9..ab2f06b40ef4 100644
--- a/src/renderer/src/lib/resume-sleeping-agent-session.ts
+++ b/src/renderer/src/lib/resume-sleeping-agent-session.ts
@@ -7,7 +7,7 @@ import { AGENT_STATUS_STALE_AFTER_MS } from '../../../shared/agent-status-types'
 import { parsePaneKey } from '../../../shared/stable-pane-id'
 import {
   getProviderSessionClaimKey,
-  isPassiveCompletedHibernationEvidence,
+  activationTreatsNoteAsFinished,
   recordPaneIsOwnedByPreservedPane,
   stablePaneHasLivePty
 } from './sleeping-agent-pane-ownership'
@@ -34,7 +34,7 @@ function clearPassiveCompletedRecordsForClaimKey(
 ): void {
   const state = useAppStore.getState()
   for (const record of records) {
-    if (record.paneKey === keepPaneKey || !isPassiveCompletedHibernationEvidence(record)) {
+    if (record.paneKey === keepPaneKey || !activationTreatsNoteAsFinished(record)) {
       continue
     }
     if (getProviderSessionClaimKey(record) === claimKey) {
@@ -50,7 +50,7 @@ function getCurrentPaneOwnedClaimKeys(records: readonly SleepingAgentSessionReco
     if (
       state.sleepingAgentSessionsByPaneKey[record.paneKey] !== record ||
       isInvalidWorktreeActivationRecord(record) ||
-      isPassiveCompletedHibernationEvidence(record)
+      activationTreatsNoteAsFinished(record)
     ) {
       continue
     }
@@ -240,7 +240,7 @@ export function resumeSleepingAgentSessionsForWorktree(
     (record) => !isInvalidWorktreeActivationRecord(record)
   )
   const activeWorktreeRecords = validWorktreeRecords.filter(
-    (record) => !isPassiveCompletedHibernationEvidence(record)
+    (record) => !activationTreatsNoteAsFinished(record)
   )
   const activeClaimKeys = new Set(activeWorktreeRecords.map(getProviderSessionClaimKey))
   const newestActiveRecordByClaimKey = getNewestActiveRecordsByClaimKey(activeWorktreeRecords)
@@ -280,7 +280,7 @@ export function resumeSleepingAgentSessionsForWorktree(
       continue
     }
     const isPaneOwned = recordPaneIsOwnedByPreservedPane(record, currentState)
-    if (isPassiveCompletedHibernationEvidence(record)) {
+    if (activationTreatsNoteAsFinished(record)) {
       // Why: completed-agent hibernation is passive history; activation should
       // only keep displayable evidence, never start new work from it.
       if (!isPaneOwned || activeClaimKeys.has(claimKey)) {
diff --git a/src/renderer/src/lib/session-write-subscriber-deferred-persist.test.ts b/src/renderer/src/lib/session-write-subscriber-deferred-persist.test.ts
index df8bf5217d0d..2a65442bd184 100644
--- a/src/renderer/src/lib/session-write-subscriber-deferred-persist.test.ts
+++ b/src/renderer/src/lib/session-write-subscriber-deferred-persist.test.ts
@@ -104,16 +104,12 @@ describe('session write subscriber defers writes across a closed persistence gat
 
     expect(persist).toHaveBeenCalledTimes(1)
     const patch = persist.mock.calls[0][0].patch
+    // Close records are main's; the renderer's mirror of them is never written back.
+    expect(patch.closedTerminalTabTombstonesByTabId).toBeUndefined()
     expect(
-      patch.closedTerminalTabTombstonesByTabId,
-      'the tombstone written during the apply window was discarded, not deferred'
-    ).toEqual({
-      'closed-during-apply': {
-        closedAt: expect.any(Number),
-        worktreeId: 'wt-remote'
-      }
-    })
-    expect(patch.activeTabId).toBe('still-open-tab')
+      patch.activeTabId,
+      'the mutation made during the apply window was discarded, not deferred'
+    ).toBe('still-open-tab')
     expect(patch.activeRepoId).toBe('repo-1')
     cleanup()
   })
@@ -198,7 +194,7 @@ describe('session write subscriber defers writes across a closed persistence gat
       'target B lost a tab close because target A was mid-apply'
     ).toEqual([])
     expect(patch.tabsByWorktree?.['wt-target-a']).toHaveLength(1)
-    expect(patch.closedTerminalTabTombstonesByTabId?.['tab-b']?.worktreeId).toBe('wt-target-b')
+    expect(patch.closedTerminalTabTombstonesByTabId).toBeUndefined()
     cleanup()
   })
 
diff --git a/src/renderer/src/lib/session-write-subscriber.test.ts b/src/renderer/src/lib/session-write-subscriber.test.ts
index 2f31550c6c02..dda5c01f44c9 100644
--- a/src/renderer/src/lib/session-write-subscriber.test.ts
+++ b/src/renderer/src/lib/session-write-subscriber.test.ts
@@ -102,6 +102,27 @@ describe('createSessionWriteSubscriber', () => {
     cleanup()
   })
 
+  it('writes when the gate is already open at creation, with no store tick to wake it', () => {
+    // Why the store-write spy: every other case here opens the gate *after* creating the
+    // subscriber, so the opening setState is itself the tick that produces the first write. With
+    // the gate already open only the creation-time seed can, and equal catalogs no longer publish
+    // a tick to stand in for it.
+    useAppStore.setState({ workspaceSessionReady: true, hydrationSucceeded: true })
+
+    const persist = vi.fn<(payload: WorkspaceSessionWrite) => void>()
+    const storeTicks = vi.fn()
+    const unsubStoreTicks = useAppStore.subscribe(storeTicks)
+    const cleanup = createSessionWriteSubscriber({ store: useAppStore, persist })
+
+    vi.advanceTimersByTime(200)
+
+    expect(storeTicks).not.toHaveBeenCalled()
+    expect(persist).toHaveBeenCalledTimes(1)
+
+    unsubStoreTicks()
+    cleanup()
+  })
+
   it('re-checks the hydration gate when a pending debounce fires', () => {
     const persist = vi.fn<(payload: WorkspaceSessionWrite) => void>()
     const cleanup = createSessionWriteSubscriber({ store: useAppStore, persist })
diff --git a/src/renderer/src/lib/session-write-subscriber.ts b/src/renderer/src/lib/session-write-subscriber.ts
index 685a8e56e3f9..7e7e9cf73605 100644
--- a/src/renderer/src/lib/session-write-subscriber.ts
+++ b/src/renderer/src/lib/session-write-subscriber.ts
@@ -201,7 +201,7 @@ export function createSessionWriteSubscriber({
     return false
   }
 
-  const unsub = store.subscribe((state) => {
+  const evaluateSessionState = (state: AppState): void => {
     if (!shouldPersistWorkspaceSession(state)) {
       return
     }
@@ -255,7 +255,14 @@ export function createSessionWriteSubscriber({
       return
     }
     armFlushTimer()
-  })
+  }
+
+  // Why evaluate once here: `prev === null` is what bootstraps the first full write, so a writer
+  // created when the session gate is *already* open owed that write to whatever unrelated store
+  // tick happened to arrive next. Catalog refreshes no longer publish when nothing changed, so
+  // that incidental wake-up is not guaranteed; seed from the current state instead.
+  evaluateSessionState(store.getState())
+  const unsub = store.subscribe(evaluateSessionState)
 
   const unsubGateOpen = subscribeToPersistGateOpen?.(() => {
     if (pendingChangedFields.size === 0 || timer !== null) {
diff --git a/src/renderer/src/lib/settings-navigation-types.ts b/src/renderer/src/lib/settings-navigation-types.ts
index 6012be309289..693425dde73a 100644
--- a/src/renderer/src/lib/settings-navigation-types.ts
+++ b/src/renderer/src/lib/settings-navigation-types.ts
@@ -67,6 +67,8 @@ export const BROWSER_TERMINAL_LINK_ACTIONS_SETTINGS_TARGET_ID = 'browser-termina
 export const BROWSER_CLIENT_HOSTED_REMOTE_SETTINGS_TARGET_ID = 'browser-client-hosted-remote'
 export const BROWSER_SSH_WORKSPACE_ROUTING_SETTINGS_TARGET_ID = 'browser-ssh-workspace-routing'
 export const BROWSER_USER_AGENT_SETTINGS_TARGET_ID = 'browser-user-agent'
+export const CODEX_TERMINAL_SERVER_ISOLATION_SETTINGS_TARGET_ID =
+  'agents-codex-terminal-server-isolation'
 export const GLOBAL_WORKTREE_VISIBILITY_SETTINGS_TARGET_ID = 'general-global-worktree-visibility'
 
 export type SettingsNavigationTarget = {
diff --git a/src/renderer/src/lib/sidebar-worktree-activation.test.ts b/src/renderer/src/lib/sidebar-worktree-activation.test.ts
index a33f91565a25..a12ca8affa81 100644
--- a/src/renderer/src/lib/sidebar-worktree-activation.test.ts
+++ b/src/renderer/src/lib/sidebar-worktree-activation.test.ts
@@ -26,6 +26,7 @@ describe('sidebar worktree activation', () => {
     await activateWorktreeFromSidebar('wt-live')
 
     expect(mocks.activateAndRevealWorktree).toHaveBeenCalledWith('wt-live', {
+      navigationIntent: 'user-open',
       revealInSidebar: false
     })
     expect(mocks.activateAndRevealFolderWorkspace).not.toHaveBeenCalled()
@@ -38,6 +39,7 @@ describe('sidebar worktree activation', () => {
     // sidebar click itself must switch app state immediately.
     expect(mocks.activateAndRevealWorktree).toHaveBeenCalledTimes(1)
     expect(mocks.activateAndRevealWorktree).toHaveBeenCalledWith('wt-slept', {
+      navigationIntent: 'user-open',
       revealInSidebar: false
     })
   })
@@ -57,6 +59,7 @@ describe('sidebar worktree activation', () => {
     const activation = activateWorktreeFromSidebar('wt-vm')
 
     expect(mocks.activateAndRevealWorktree).toHaveBeenCalledWith('wt-vm', {
+      navigationIntent: 'user-open',
       revealInSidebar: false
     })
     expect(resumeWorkspace).toHaveBeenCalledWith({ workspaceId: 'wt-vm' })
@@ -68,7 +71,9 @@ describe('sidebar worktree activation', () => {
   it('routes folder workspace activation through the guarded folder path', async () => {
     await activateWorktreeFromSidebar('folder:folder-workspace-1')
 
-    expect(mocks.activateAndRevealFolderWorkspace).toHaveBeenCalledWith('folder-workspace-1')
+    expect(mocks.activateAndRevealFolderWorkspace).toHaveBeenCalledWith('folder-workspace-1', {
+      navigationIntent: 'user-open'
+    })
     expect(mocks.activateAndRevealWorktree).not.toHaveBeenCalled()
   })
 })
diff --git a/src/renderer/src/lib/sidebar-worktree-activation.ts b/src/renderer/src/lib/sidebar-worktree-activation.ts
index dd4eec3f0df6..01bb94ad11b8 100644
--- a/src/renderer/src/lib/sidebar-worktree-activation.ts
+++ b/src/renderer/src/lib/sidebar-worktree-activation.ts
@@ -13,17 +13,15 @@ export async function activateWorktreeFromSidebar(
 ): Promise<void> {
   const workspaceScope = parseWorkspaceKey(worktreeId)
   if (workspaceScope?.type === 'folder') {
-    if (executionHostId) {
-      activateAndRevealFolderWorkspace(workspaceScope.folderWorkspaceId, {
-        executionHostId
-      })
-    } else {
-      activateAndRevealFolderWorkspace(workspaceScope.folderWorkspaceId)
-    }
+    activateAndRevealFolderWorkspace(workspaceScope.folderWorkspaceId, {
+      navigationIntent: 'user-open',
+      ...(executionHostId ? { executionHostId } : {})
+    })
     return
   }
   // Keep navigation independent from an optional runtime wake IPC.
   activateAndRevealWorktree(worktreeId, {
+    navigationIntent: 'user-open',
     revealInSidebar: false,
     ...(executionHostId ? { executionHostId } : {})
   })
diff --git a/src/renderer/src/lib/sleeping-agent-pane-ownership.test.ts b/src/renderer/src/lib/sleeping-agent-pane-ownership.test.ts
new file mode 100644
index 000000000000..e12978572016
--- /dev/null
+++ b/src/renderer/src/lib/sleeping-agent-pane-ownership.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it } from 'vitest'
+import type { SleepingAgentSessionRecord } from '../../../shared/agent-session-resume'
+import { activationTreatsNoteAsFinished } from './sleeping-agent-pane-ownership'
+
+function note(overrides: Partial<SleepingAgentSessionRecord> = {}): SleepingAgentSessionRecord {
+  return {
+    paneKey: 'tab-1:leaf-1',
+    worktreeId: 'wt-1',
+    agent: 'codex',
+    providerSession: { key: 'session_id', id: 'conv-1' },
+    prompt: '',
+    state: 'done',
+    capturedAt: 1,
+    updatedAt: 1,
+    ...overrides
+  }
+}
+
+describe('activationTreatsNoteAsFinished', () => {
+  it.each([
+    ['a worktree-sleep done note', true, note({ origin: 'worktree-sleep' })],
+    ['a legacy originless done note', true, note()],
+    ['a finished turn idle anchor (live done)', true, note({ origin: 'live' })],
+    [
+      'an interrupted worktree-sleep note',
+      true,
+      note({ origin: 'worktree-sleep', interrupted: true })
+    ],
+    ['an interrupted live turn', false, note({ origin: 'live', interrupted: true })],
+    ['a quit capture', false, note({ origin: 'quit' })],
+    ['a running turn (live working)', false, note({ origin: 'live', state: 'working' })]
+  ])('%s -> %s', (_label, expected, record) => {
+    expect(activationTreatsNoteAsFinished(record)).toBe(expected)
+  })
+})
diff --git a/src/renderer/src/lib/sleeping-agent-pane-ownership.ts b/src/renderer/src/lib/sleeping-agent-pane-ownership.ts
index 8dac858af02d..73294da7c6e5 100644
--- a/src/renderer/src/lib/sleeping-agent-pane-ownership.ts
+++ b/src/renderer/src/lib/sleeping-agent-pane-ownership.ts
@@ -1,5 +1,6 @@
 import type { useAppStore } from '@/store'
 import type { SleepingAgentSessionRecord } from '../../../shared/agent-session-resume'
+import { agentTurnEndedUncleanly } from '../../../shared/agent-main-agent-verdict'
 import type {
   TerminalLayoutSnapshot,
   TerminalPaneLayoutNode,
@@ -17,13 +18,12 @@ export function getProviderSessionClaimKey(record: SleepingAgentSessionRecord):
     : base
 }
 
-// Why quit is excluded: it is an explicit request to keep resumable work. A
-// live interrupted checkpoint is also active work; interrupted worktree-sleep
-// records retain their existing passive/cleanup semantics.
-export function isPassiveCompletedHibernationEvidence(record: SleepingAgentSessionRecord): boolean {
+// Why live+done counts (#16308): workspace activation must not resume a finished turn's idle anchor.
+// Quit asks to keep work resumable and a live stopped or failed turn is unfinished.
+export function activationTreatsNoteAsFinished(record: SleepingAgentSessionRecord): boolean {
   return (
     record.origin !== 'quit' &&
-    !(record.origin === 'live' && record.interrupted === true) &&
+    !(record.origin === 'live' && agentTurnEndedUncleanly(record)) &&
     record.state === 'done'
   )
 }
@@ -125,7 +125,8 @@ function paneWillConnectOnActivation(
   // never cancels it), so any preserved restorable pane cold-restores in place.
   // Gating on the visible tab forked a second live surface onto the same
   // provider session for every non-group-active agent tab. Web-mirror tabs are
-  // the exception: they never mount a local pane, so they cannot own recovery.
+  // the exception: their pane attaches the host PTY instead of cold-restoring
+  // from a note, so they cannot own recovery.
   return !isWebTerminalSurfaceTabId(tabId)
 }
 
@@ -144,7 +145,7 @@ export function recordPaneIsOwnedByPreservedPane(
     if (!tab || !hasMatchingStablePaneLayout(tabId, stable.leafId, state.terminalLayoutsByTabId)) {
       return false
     }
-    if (isPassiveCompletedHibernationEvidence(record)) {
+    if (activationTreatsNoteAsFinished(record)) {
       return true
     }
     // Why: a pane with a live PTY owns its running session regardless of which
diff --git a/src/renderer/src/lib/solidity-language-id-registration.test.ts b/src/renderer/src/lib/solidity-language-id-registration.test.ts
new file mode 100644
index 000000000000..5cfe2598837d
--- /dev/null
+++ b/src/renderer/src/lib/solidity-language-id-registration.test.ts
@@ -0,0 +1,20 @@
+import { readFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { describe, expect, it } from 'vitest'
+import { detectLanguage } from './language-detect'
+
+// Why: Monaco registers Solidity as id 'sol' with 'solidity' only an alias, and
+// mapping an alias silently renders plaintext. Pin against the installed package
+// so an upstream id change fails here instead of in the editor.
+describe('solidity language id', () => {
+  it('matches the id monaco-editor registers for .sol', () => {
+    const require = createRequire(import.meta.url)
+    const source = readFileSync(
+      require.resolve('monaco-editor/esm/vs/basic-languages/solidity/solidity.contribution.js'),
+      'utf8'
+    )
+    const registeredId = /id:\s*["']([^"']+)["']/.exec(source)?.[1]
+    expect(registeredId).toBeDefined()
+    expect(detectLanguage('contracts/Vault.sol')).toBe(registeredId)
+  })
+})
diff --git a/src/renderer/src/lib/startup-draft-input-kind.test.ts b/src/renderer/src/lib/startup-draft-input-kind.test.ts
new file mode 100644
index 000000000000..34c96e3073fa
--- /dev/null
+++ b/src/renderer/src/lib/startup-draft-input-kind.test.ts
@@ -0,0 +1,113 @@
+// @vitest-environment happy-dom
+// A created worktree's draft reaches its agent by one of two renderer routes: the pane's own
+// startup paste, or the draft helper that waits for the agent. Both must write it as launch input.
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { TerminalInputKind } from '../../../shared/terminal-input-kind'
+import { bindSettlePaneSerializer } from '@/components/terminal-pane/pty-connection/pane-serializer-settle'
+import type { ConnectPanePtySession } from '@/components/terminal-pane/pty-connection/connect-pane-pty-session'
+import { STARTUP_DRAFT_PASTE_QUIET_MS } from '@/components/terminal-pane/pty-connection/pty-connect-limits'
+import { pasteDraftToAgentPtyWhenReady, submitPromptToAgentPty } from './agent-paste-draft'
+
+vi.mock('@/store', () => ({
+  useAppStore: {
+    getState: () => ({ settings: {}, terminalLayoutsByTabId: {} }),
+    subscribe: () => () => {}
+  }
+}))
+
+vi.mock('./worktree-runtime-owner', () => ({
+  getSettingsForWorktreeRuntimeOwner: () => ({}),
+  getRuntimeEnvironmentIdForWorktree: () => null
+}))
+
+vi.mock('./agent-draft-readiness', () => ({
+  waitForAgentDraftInputReady: async () => true
+}))
+
+const DRAFT = 'plan the migration'
+const originalApi = window.api
+
+function stubPtyApi(): { kinds: TerminalInputKind[] } {
+  const kinds: TerminalInputKind[] = []
+  const writeAccepted = vi.fn(async (_id: string, _data: string, inputKind: TerminalInputKind) => {
+    kinds.push(inputKind)
+    return true
+  })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: both routes reach only pty.writeAccepted.
+  window.api = { pty: { writeAccepted, write: vi.fn() } } as unknown as typeof window.api
+  return { kinds }
+}
+
+/** The pane route: the pane's transport pastes the draft once the agent's composer is ready. */
+async function paneRouteKinds(): Promise<TerminalInputKind[]> {
+  const { kinds } = stubPtyApi()
+  const transport = {
+    getPtyId: () => 'pty-1',
+    sendInput: () => true,
+    sendInputAccepted: (data: string, inputKind: TerminalInputKind) =>
+      window.api.pty.writeAccepted('pty-1', data, inputKind)
+  }
+  const pane = { id: 1 }
+  const bag: Record<string, unknown> = {
+    pane,
+    transport,
+    disposed: false,
+    connectionId: null,
+    ownsStartupDraftPaste: true,
+    shouldDeliverStartupViaTerminalPaste: false,
+    startupDraftPrompt: DRAFT,
+    recordTerminalInputForHibernation: () => {},
+    deps: { worktreeId: 'wt-1', paneTransportsRef: { current: new Map([[pane.id, transport]]) } }
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the session is an any-typed bag; the draft path reads only the fields above.
+  const session = bag as unknown as ConnectPanePtySession
+  bindSettlePaneSerializer(session)
+  session.observeStartupDraftPasteReadiness('\x1b[?2004h')
+  await vi.advanceTimersByTimeAsync(STARTUP_DRAFT_PASTE_QUIET_MS)
+  await vi.runAllTimersAsync()
+  return kinds
+}
+
+/** The helper route: the draft helper waits for the agent, then writes through the runtime. */
+async function helperRouteKinds(): Promise<TerminalInputKind[]> {
+  const { kinds } = stubPtyApi()
+  const pasted = pasteDraftToAgentPtyWhenReady({
+    tabId: 'tab-1',
+    ptyId: 'pty-1',
+    content: DRAFT,
+    agent: 'aider'
+  })
+  await vi.runAllTimersAsync()
+  await expect(pasted).resolves.toBe(true)
+  return kinds
+}
+
+describe('a created worktree’s startup draft', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+    window.api = originalApi
+  })
+
+  it('writes as launch input on both renderer routes', async () => {
+    const paneKinds = await paneRouteKinds()
+    const helperKinds = await helperRouteKinds()
+
+    expect(paneKinds.length).toBeGreaterThan(0)
+    expect(new Set(paneKinds)).toEqual(new Set(['launch']))
+    expect(new Set(helperKinds)).toEqual(new Set(paneKinds))
+  })
+
+  it('differs from a prompt submitted to an agent that is already running', async () => {
+    const { kinds } = stubPtyApi()
+
+    const submitted = submitPromptToAgentPty({ tabId: 'tab-1', ptyId: 'pty-1', content: DRAFT })
+    await vi.runAllTimersAsync()
+
+    await expect(submitted).resolves.toBe(true)
+    expect(new Set(kinds)).toEqual(new Set(['driving']))
+  })
+})
diff --git a/src/renderer/src/lib/structured-agent-session-launch-exited-owner.test.ts b/src/renderer/src/lib/structured-agent-session-launch-exited-owner.test.ts
index 1662e4c04300..10ebbc8fd890 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-exited-owner.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-exited-owner.test.ts
@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 // The launch client against the create wire contract: a failed create whose provider is proven
-// gone reads as failed (with its reason) and Retry starts it again; any other verdict stays unknown.
+// gone reads as failed (with its refusal) and Retry starts it again; any other verdict stays unknown.
 
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type {
@@ -49,13 +49,14 @@ import {
   startStructuredAgentLaunch
 } from './structured-agent-session-launch'
 import {
-  getStructuredAgentSessionLaunchFailureReason,
+  getStructuredAgentSessionLaunchFailure,
   resetStructuredAgentLaunchRegistryForTests
 } from './structured-agent-session-launch-registry'
 import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
 
 const WORKTREE = 'wt-1'
 const EXIT_REASON = 'claude stream-json exited (code 1): stderr tail'
+const HOST_REFUSAL = { kind: 'refused', code: 'agent_session_operation_invalid' }
 
 /** The verdict the host puts on the failed operation's replay; undefined models an older host. */
 let replayVerdict: AgentSessionOwnerVerdict | undefined
@@ -125,12 +126,13 @@ beforeEach(() => {
 })
 
 describe('structured launch after a host-failed create', () => {
-  it('fails with the host reason when the provider is proven gone, and Retry starts it under a new operation', async () => {
+  it('fails with the host refusal when the provider is proven gone, and Retry starts it under a new operation', async () => {
     const sessionId = launch()
     await settle(sessionId)
 
     expect(getStructuredAgentSessionLaunchLifecycle(WORKTREE, sessionId)).toBe('failed')
-    expect(getStructuredAgentSessionLaunchFailureReason(WORKTREE, sessionId)).toBe(EXIT_REASON)
+    // The host's message is for its log; the Retry line words the refusal.
+    expect(getStructuredAgentSessionLaunchFailure(WORKTREE, sessionId)).toEqual(HOST_REFUSAL)
     expect(createdOperations.every((operation) => operation === failedOperation)).toBe(true)
 
     expect(retryStructuredAgentSessionLaunch(WORKTREE, sessionId)).toBe(true)
@@ -147,7 +149,8 @@ describe('structured launch after a host-failed create', () => {
     const sessionId = launch()
     await settle(sessionId)
     expect(getStructuredAgentSessionLaunchLifecycle(WORKTREE, sessionId)).toBe('failed')
-    expect(getStructuredAgentSessionLaunchFailureReason(WORKTREE, sessionId)).toBe(EXIT_REASON)
+    // The host's message is for its log; the Retry line words the refusal.
+    expect(getStructuredAgentSessionLaunchFailure(WORKTREE, sessionId)).toEqual(HOST_REFUSAL)
     expect(createdOperations).toEqual([failedOperation])
     expect(retryStructuredAgentSessionLaunch(WORKTREE, sessionId)).toBe(true)
     await settle(sessionId)
diff --git a/src/renderer/src/lib/structured-agent-session-launch-failure.ts b/src/renderer/src/lib/structured-agent-session-launch-failure.ts
new file mode 100644
index 000000000000..b9ad791a0c44
--- /dev/null
+++ b/src/renderer/src/lib/structured-agent-session-launch-failure.ts
@@ -0,0 +1,18 @@
+// What a failed chat start's Retry line may say: the host's refusal, never its message.
+
+import { readAgentSessionRefusalReference } from '../../../shared/agent-session-wire-refusals'
+import {
+  agentSessionRefusalFailure,
+  readAgentSessionErrorRefusal,
+  type AgentSessionWriteRefusal
+} from '../../../shared/agent-session-write-failure'
+
+/** The host's refusal behind a failed launch; undefined when the failure carried none (a lost
+ *  reply, a local fault, an older host). Reads a create error's own refusal or an RPC error's. */
+export function structuredLaunchFailure(error: unknown): AgentSessionWriteRefusal | undefined {
+  const refusal =
+    error instanceof Error && 'refusal' in error
+      ? readAgentSessionRefusalReference(error.refusal)
+      : readAgentSessionErrorRefusal(error)
+  return refusal ? agentSessionRefusalFailure(refusal) : undefined
+}
diff --git a/src/renderer/src/lib/structured-agent-session-launch-options.test.ts b/src/renderer/src/lib/structured-agent-session-launch-options.test.ts
index c48ccf403e71..3787ebe36080 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-options.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-options.test.ts
@@ -3,6 +3,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-session-contracts'
 import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
 
 type CallParams = {
   envelope?: { expectedRuntimeFence?: number | null }
@@ -243,12 +244,16 @@ describe('picks made while a chat launches', () => {
     await settle()
     setOptionReplies[0]!.resolve({
       ok: false,
-      refusal: { code: 'agent_session_option_invalid', message: 'Model gpt-missing is unavailable' }
+      refusal: {
+        code: 'agent_session_operation_capacity',
+        message: 'Model gpt-missing is unavailable'
+      }
     })
 
+    // The picker gets the refusal as a fact; the host's diagnostic is not kept.
     await expect(pick).resolves.toEqual({
       kind: 'refused',
-      message: 'Model gpt-missing is unavailable'
+      failure: { kind: 'refused', code: 'agent_session_operation_capacity' }
     })
     await expect(launch.promptDeliveryResult).resolves.toEqual({
       delivered: true,
@@ -260,6 +265,41 @@ describe('picks made while a chat launches', () => {
     ])
   })
 
+  it('reports a refusal the host threw as its fact, never the bare code it carries as a message', async () => {
+    mocks.launch.mockResolvedValue({ sessionId: SESSION_ID, fence: 1 })
+    startStructuredAgentLaunch(WORKTREE_ID, 'codex')
+    const pick = holdStructuredAgentSessionLaunchOption(SESSION_ID, 'model', 'gpt-missing')
+    await settle()
+    setOptionReplies[0]!.resolve(
+      Promise.reject(
+        new RuntimeRpcCallError({
+          id: 'request-1',
+          ok: false,
+          error: {
+            code: 'runtime_error',
+            message: 'agent_session_journal_unreadable',
+            data: {
+              refusal: {
+                code: 'agent_session_journal_unreadable',
+                details: { reason: 'journalUnavailable' }
+              }
+            }
+          },
+          _meta: { runtimeId: 'runtime-1' }
+        })
+      )
+    )
+
+    await expect(pick).resolves.toEqual({
+      kind: 'refused',
+      failure: {
+        kind: 'refused',
+        code: 'agent_session_journal_unreadable',
+        details: { reason: 'journalUnavailable' }
+      }
+    })
+  })
+
   it('keeps picks held through a failed start and applies them to the retry', async () => {
     mocks.launch
       .mockRejectedValueOnce(new StructuredAgentSessionCreateRefusalError('unsupported'))
diff --git a/src/renderer/src/lib/structured-agent-session-launch-options.ts b/src/renderer/src/lib/structured-agent-session-launch-options.ts
index c7d98e848fcb..b087264ce251 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-options.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-options.ts
@@ -9,6 +9,7 @@ import {
   structuredAgentSessionPayloadFingerprint
 } from '../../../shared/structured-agent-session-mutation'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
 import { createBrowserUuid } from '@/lib/browser-uuid'
 import {
   StructuredAgentSessionLaunchCancelledError,
@@ -20,6 +21,11 @@ import {
   subscribeStructuredAgentLaunchStatus,
   type StructuredLaunchState
 } from './structured-agent-session-launch-registry'
+import {
+  agentSessionRefusalFailure,
+  agentSessionThrownFailure,
+  type AgentSessionWriteFailure
+} from '../../../shared/agent-session-write-failure'
 
 /** The options a launch starts with, replaced whole so readers can compare by identity. */
 export type StructuredLaunchSelection = {
@@ -31,7 +37,7 @@ export type StructuredLaunchSelection = {
 
 export type StructuredLaunchOptionOutcome =
   | { kind: 'accepted'; options: Readonly<Record<string, string>> }
-  | { kind: 'refused'; message: string }
+  | { kind: 'refused'; failure: AgentSessionWriteFailure }
   | { kind: 'superseded' }
 
 type OptionReply = (outcome: StructuredLaunchOptionOutcome) => void
@@ -100,9 +106,15 @@ async function setLaunchOption(
     })
     return result.ok
       ? { kind: 'accepted', options: result.value.options ?? { [key]: value } }
-      : { kind: 'refused', message: result.refusal.message }
+      : { kind: 'refused', failure: agentSessionRefusalFailure(result.refusal) }
   } catch (error) {
-    return { kind: 'refused', message: error instanceof Error ? error.message : String(error) }
+    return {
+      kind: 'refused',
+      failure: agentSessionThrownFailure(
+        error,
+        error instanceof RuntimeRpcCallError ? error.code : undefined
+      )
+    }
   }
 }
 
diff --git a/src/renderer/src/lib/structured-agent-session-launch-prompt.test.ts b/src/renderer/src/lib/structured-agent-session-launch-prompt.test.ts
index b0e8d0674ffb..6945c0456454 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-prompt.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-prompt.test.ts
@@ -1,7 +1,10 @@
 // @vitest-environment happy-dom
 
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { enqueueStructuredAgentSessionLaunchPrompt } from '@/components/native-chat/structured-agent-session-outbox-storage'
+import {
+  enqueueStructuredAgentSessionLaunchPrompt,
+  mutateStructuredAgentSessionLaunchPrompt
+} from '@/components/native-chat/structured-agent-session-outbox-storage'
 
 const mocks = vi.hoisted(() => ({ call: vi.fn() }))
 
@@ -57,4 +60,32 @@ describe('settleStructuredAgentLaunchPrompt', () => {
     }[]
     expect(persisted).toMatchObject([{ state: 'dispatching' }])
   })
+
+  it('drops the previous attempt failure when the launch path sends the message again', async () => {
+    const stagedEntry = enqueueStructuredAgentSessionLaunchPrompt('session-1', 'review this')
+    mutateStructuredAgentSessionLaunchPrompt(
+      'session-1',
+      stagedEntry!.clientMessageId,
+      (entry) => ({
+        ...entry,
+        lastFailure: { kind: 'refused', code: 'agent_session_operation_capacity' }
+      })
+    )
+    mocks.call.mockResolvedValue({
+      ok: false,
+      refusal: { code: 'agent_session_checkpoint_stale', message: 'stale' }
+    })
+
+    await settleStructuredAgentLaunchPrompt({
+      launchResult: Promise.resolve({ sessionId: 'session-1', fence: 1 }),
+      options: { prompt: 'review this' },
+      stagedEntry
+    })
+
+    const persisted: unknown = JSON.parse(localStorage.getItem(localStorage.key(0)!) ?? '[]')
+    expect(persisted).toHaveLength(1)
+    expect(persisted).not.toContainEqual(
+      expect.objectContaining({ lastFailure: expect.anything() })
+    )
+  })
 })
diff --git a/src/renderer/src/lib/structured-agent-session-launch-prompt.ts b/src/renderer/src/lib/structured-agent-session-launch-prompt.ts
index 18cd3f01cf2f..84c8fa6e1910 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-prompt.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-prompt.ts
@@ -4,9 +4,11 @@ import type {
 } from '../../../shared/agent-session-wire'
 import {
   requeueStructuredAgentSessionSendRefusal,
+  stageStructuredAgentSessionOutboxEntryForSend,
   structuredAgentSessionSendRequest,
   type StructuredAgentSessionOutboxEntry
 } from '../../../shared/structured-agent-session-outbox'
+import { agentSessionRefusalFailure } from '../../../shared/agent-session-write-failure'
 import { createStructuredAgentSessionOperationId } from '../../../shared/structured-agent-session-mutation'
 import {
   mutateStructuredAgentSessionLaunchPrompt,
@@ -92,11 +94,9 @@ async function dispatchStructuredLaunchPrompt(
   receipt: LaunchReceipt
 ): Promise<boolean> {
   if (
-    !mutateEntry(entry, (current) => ({
-      ...current,
-      state: 'dispatching',
-      lastAttemptAt: Date.now()
-    }))
+    !mutateEntry(entry, (current) =>
+      stageStructuredAgentSessionOutboxEntryForSend(current, Date.now())
+    )
   ) {
     return false
   }
@@ -112,7 +112,7 @@ async function dispatchStructuredLaunchPrompt(
       mutateEntry(entry, (current) =>
         requeueStructuredAgentSessionSendRefusal(
           current,
-          result.refusal.code,
+          agentSessionRefusalFailure(result.refusal),
           () => createStructuredAgentSessionOperationId(createBrowserUuid),
           entry.lastAttemptAt !== null
         )
diff --git a/src/renderer/src/lib/structured-agent-session-launch-registry.ts b/src/renderer/src/lib/structured-agent-session-launch-registry.ts
index dcafea65803d..2f444446e03e 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-registry.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-registry.ts
@@ -1,5 +1,6 @@
 import { useSyncExternalStore } from 'react'
 import type { AgentSessionHandleProvider } from '../../../shared/agent-session-provider-handle'
+import type { AgentSessionWriteRefusal } from '../../../shared/agent-session-write-failure'
 import type { StructuredAgentSessionResumeSource } from '../../../shared/structured-agent-session-create'
 import type { StructuredLaunchRecoveryState } from './structured-agent-session-launch-recovery'
 import type { StructuredLaunchSelection } from './structured-agent-session-launch-options'
@@ -26,8 +27,9 @@ export type StructuredLaunchState = StructuredLaunchRecoveryState & {
   /** Fixed by the caller that opened this launch so coalesced prompts use one delivery mode. */
   promptDelivery: StructuredAgentLaunchOptions['promptDelivery']
   callers: StructuredLaunchCallerGroup
-  /** Why the last attempt failed, shown beside Retry; the toast stays generic. */
-  failureReason?: string
+  /** The host's refusal behind the last failed attempt, worded beside Retry; the toast stays
+   *  generic. Absent when the failure named none. */
+  failure?: AgentSessionWriteRefusal
   selection: StructuredLaunchSelection
 }
 
@@ -176,25 +178,25 @@ export function getStructuredAgentSessionLaunchResumes(sessionId: string): boole
   return resumeFrom !== undefined
 }
 
-export function getStructuredAgentSessionLaunchFailureReason(
+export function getStructuredAgentSessionLaunchFailure(
   worktreeId: string,
   sessionId: string
-): string | null {
+): AgentSessionWriteRefusal | null {
   const state = getStructuredLaunchStateBySessionId(sessionId)
   return state &&
     matchesLaunchWorktree(state, worktreeId) &&
     launchStateLifecycle(state) === 'failed'
-    ? (state.failureReason ?? null)
+    ? (state.failure ?? null)
     : null
 }
 
-export function useStructuredAgentSessionLaunchFailureReason(
+export function useStructuredAgentSessionLaunchFailure(
   worktreeId: string,
   sessionId: string
-): string | null {
+): AgentSessionWriteRefusal | null {
   return useSyncExternalStore(
     subscribeStructuredAgentLaunchStatus,
-    () => getStructuredAgentSessionLaunchFailureReason(worktreeId, sessionId),
+    () => getStructuredAgentSessionLaunchFailure(worktreeId, sessionId),
     () => null
   )
 }
diff --git a/src/renderer/src/lib/structured-agent-session-launch.ts b/src/renderer/src/lib/structured-agent-session-launch.ts
index 5ad75c36ed67..4c62128813b4 100644
--- a/src/renderer/src/lib/structured-agent-session-launch.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch.ts
@@ -27,6 +27,7 @@ import {
 } from '@/lib/structured-agent-session-launch-callers'
 import * as launchDraft from './structured-agent-session-launch-draft'
 import { trackStructuredLaunchFailureToast } from './structured-agent-session-launch-failure-toast'
+import { structuredLaunchFailure } from './structured-agent-session-launch-failure'
 import {
   deleteStructuredLaunchStateIfCurrent,
   getStructuredLaunchState,
@@ -51,7 +52,7 @@ export {
   retireStructuredAgentSessionLaunchCancellationTombstone,
   shouldRetainStructuredAgentSessionLaunchTab,
   subscribeStructuredAgentLaunchStatus,
-  useStructuredAgentSessionLaunchFailureReason,
+  useStructuredAgentSessionLaunchFailure,
   useStructuredAgentSessionLaunchLifecycle,
   type StructuredAgentLaunchStatus,
   type StructuredAgentSessionLaunchLifecycle
@@ -138,7 +139,13 @@ function trackLaunchSettlement(
         }
         return
       }
-      state.failureReason = error instanceof Error ? error.message : String(error)
+      // The host's message is for its log; the Retry line words the refusal itself.
+      const failure = structuredLaunchFailure(error)
+      if (failure) {
+        state.failure = failure
+      } else {
+        delete state.failure
+      }
       if (error instanceof StructuredAgentSessionCreateRefusalError) {
         settleStructuredLaunchRefusal(state)
       } else if (!state.visibilityUnknown) {
@@ -171,7 +178,7 @@ function restartStructuredLaunchState(state: StructuredLaunchState): void {
     state.intent = retryStructuredAgentSessionLaunchIntent(state.intent)
   }
   resetStructuredLaunchCallers(state)
-  delete state.failureReason
+  delete state.failure
   state.callers.outcome = 'pending'
   // A new create seeds from the settings of now; picks held through the failure still apply.
   state.selection = { ...state.selection, seed: state.intent.seedOptions }
diff --git a/src/renderer/src/lib/structured-agent-startup-label-census.test.ts b/src/renderer/src/lib/structured-agent-startup-label-census.test.ts
deleted file mode 100644
index 888e17c46c1e..000000000000
--- a/src/renderer/src/lib/structured-agent-startup-label-census.test.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import { glob } from 'tinyglobby'
-
-const REPO_ROOT = join(import.meta.dirname, '../../../..')
-
-describe('structured launch copy', () => {
-  it('never exposes the removed starting-chat phase or label', async () => {
-    const files = await glob(
-      ['src/renderer/src/**/*.ts', 'src/renderer/src/**/*.tsx', 'src/renderer/src/i18n/**/*.json'],
-      {
-        cwd: REPO_ROOT,
-        ignore: ['**/*.test.ts', '**/*.test.tsx']
-      }
-    )
-    const offenders = files.filter((file) => {
-      const source = readFileSync(join(REPO_ROOT, file), 'utf8')
-      return (
-        source.includes('starting-chat') ||
-        source.includes('Starting chat…') ||
-        /Starting (?:\{\{value0\}\}|Claude|Codex) chat…/.test(source)
-      )
-    })
-
-    expect(offenders).toEqual([])
-  })
-})
diff --git a/src/renderer/src/lib/terminal-links-cjk.test.ts b/src/renderer/src/lib/terminal-links-cjk.test.ts
new file mode 100644
index 000000000000..d1cddfb74f3f
--- /dev/null
+++ b/src/renderer/src/lib/terminal-links-cjk.test.ts
@@ -0,0 +1,43 @@
+import { describe, expect, it } from 'vitest'
+import { extractTerminalFileLinks, resolveTerminalFileLinkText } from './terminal-links'
+
+describe('CJK terminal path names', () => {
+  for (const character of ['・', '･', '〜', '～']) {
+    it.each([
+      '/tmp/前CHAR後/a.txt',
+      'C:/tmp/前CHAR後/a.txt',
+      String.raw`C:\tmp\前CHAR後\a.txt`,
+      '//nas/base/前CHAR後/a.txt',
+      String.raw`\\nas\base\前CHAR後\a.txt`,
+      './前CHAR後/a.txt',
+      '/tmp/前CHAR後/space name/a.txt'
+    ])(`keeps ${character} in %s`, (template) => {
+      const filePath = template.replace('CHAR', character)
+      const links = extractTerminalFileLinks(filePath)
+      expect(links.map((link) => link.pathText)).toEqual([filePath])
+      expect(links[0]).toMatchObject({ startIndex: 0, endIndex: filePath.length })
+    })
+
+    it(`preserves location and normalized Windows target for ${character}`, () => {
+      expect(resolveTerminalFileLinkText(`C:\\tmp\\前${character}後\\a.txt:12:3`, '/cwd')).toEqual({
+        absolutePath: `C:/tmp/前${character}後/a.txt`,
+        line: 12,
+        column: 3
+      })
+    })
+
+    it.each([',', ';', '"', "'", '，', '。'])(`stops ${character} paths at %s`, (delimiter) => {
+      const filePath = `/tmp/前${character}後/a.txt`
+      expect(
+        extractTerminalFileLinks(`${filePath}${delimiter}次`).map((link) => link.pathText)
+      ).toEqual([filePath])
+    })
+
+    it(`keeps URI handling separate for ${character}`, () => {
+      expect(extractTerminalFileLinks(`https://example.com/前${character}後/a.txt`)).toEqual([])
+      expect(extractTerminalFileLinks(`file:///tmp/前${character}後/a.txt`)[0]?.pathText).toBe(
+        `/tmp/前${character}後/a.txt`
+      )
+    })
+  }
+})
diff --git a/src/renderer/src/lib/terminal-links.ts b/src/renderer/src/lib/terminal-links.ts
index 970c6d9208c7..bffbc9c653a0 100644
--- a/src/renderer/src/lib/terminal-links.ts
+++ b/src/renderer/src/lib/terminal-links.ts
@@ -33,8 +33,9 @@ export type ResolvedTerminalFileLink = Pick<ParsedTerminalFileLink, 'line' | 'co
 // `:line` and `:col` suffixes (e.g. `src/foo.ts:12:3`, `./bin`, `/abs/path`).
 // Why: framework route files commonly use punctuation segments like
 // `app/(shop)/products/[id]/page.tsx`; keep those links whole.
+// Keep Japanese middle dots and tildes without admitting prose delimiters.
 const LOCAL_PATH_REGEX =
-  /(?:~[\\/]|[\\/]|\.{1,2}[\\/]|[A-Za-z]:[\\/]|[\p{L}\p{N}\p{M}._-]+[\\/])[\p{L}\p{N}\p{M}._~\-/%+@\\()[\]]*(?::\d+)?(?::\d+)?/gu
+  /(?:~[\\/]|[\\/]|\.{1,2}[\\/]|[A-Za-z]:[\\/]|[\p{L}\p{N}\p{M}._-]+[\\/])[\p{L}\p{N}\p{M}._~\-/%+@\\()[\]\u30FB\uFF65\u301C\uFF5E]*(?::\d+)?(?::\d+)?/gu
 
 // Matches separator paths whose file or folder names include spaces. This runs
 // before LOCAL_PATH_REGEX so `/Users/A/Foo Bar/file.ts` is claimed as one link
diff --git a/src/renderer/src/lib/unified-tab-anchor-insertion.test.ts b/src/renderer/src/lib/unified-tab-anchor-insertion.test.ts
new file mode 100644
index 000000000000..49592599b7c0
--- /dev/null
+++ b/src/renderer/src/lib/unified-tab-anchor-insertion.test.ts
@@ -0,0 +1,106 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { Tab, TabGroup } from '../../../shared/tab-types'
+
+type AnchorStoreState = {
+  unifiedTabsByWorktree: Record<string, Tab[]>
+  groupsByWorktree: Record<string, TabGroup[]>
+  reorderUnifiedTabs: ReturnType<typeof vi.fn>
+}
+
+const mocks = vi.hoisted(() => {
+  const state: { current: AnchorStoreState | null } = { current: null }
+  return { state }
+})
+
+vi.mock('../store', () => ({
+  useAppStore: { getState: () => mocks.state.current }
+}))
+
+import { insertUnifiedTabAfterAnchor } from './unified-tab-anchor-insertion'
+
+const WT = 'wt-1'
+
+function tab(id: string, groupId: string, isPinned = false): Tab {
+  return {
+    id,
+    entityId: id,
+    groupId,
+    worktreeId: WT,
+    contentType: 'terminal',
+    label: id,
+    customLabel: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 1,
+    isPinned
+  }
+}
+
+function seed(tabs: Tab[], groups: TabGroup[]): void {
+  mocks.state.current = {
+    unifiedTabsByWorktree: { [WT]: tabs },
+    groupsByWorktree: { [WT]: groups },
+    reorderUnifiedTabs: vi.fn()
+  }
+}
+
+describe('insertUnifiedTabAfterAnchor', () => {
+  beforeEach(() => {
+    seed([], [])
+  })
+
+  it('moves a late terminal right after its anchor', () => {
+    seed(
+      [tab('A', 'g1'), tab('B', 'g1'), tab('C', 'g1'), tab('T', 'g1')],
+      [{ id: 'g1', worktreeId: WT, activeTabId: 'A', tabOrder: ['A', 'B', 'C', 'T'] }]
+    )
+    insertUnifiedTabAfterAnchor(WT, 'T', 'A')
+    expect(mocks.state.current?.reorderUnifiedTabs).toHaveBeenCalledWith(
+      'g1',
+      ['A', 'T', 'B', 'C'],
+      {
+        recordInteraction: false
+      }
+    )
+  })
+
+  it('keeps an unpinned terminal after the pinned prefix', () => {
+    seed(
+      [tab('P1', 'g1', true), tab('P2', 'g1', true), tab('C', 'g1'), tab('T', 'g1')],
+      [{ id: 'g1', worktreeId: WT, activeTabId: 'P1', tabOrder: ['P1', 'P2', 'C', 'T'] }]
+    )
+    insertUnifiedTabAfterAnchor(WT, 'T', 'P1')
+    expect(mocks.state.current?.reorderUnifiedTabs).toHaveBeenCalledWith(
+      'g1',
+      ['P1', 'P2', 'T', 'C'],
+      {
+        recordInteraction: false
+      }
+    )
+  })
+
+  it('is a no-op for a missing anchor or tabs in different groups', () => {
+    seed(
+      [tab('A', 'g1'), tab('T', 'g2')],
+      [
+        { id: 'g1', worktreeId: WT, activeTabId: 'A', tabOrder: ['A'] },
+        { id: 'g2', worktreeId: WT, activeTabId: 'T', tabOrder: ['T'] }
+      ]
+    )
+    insertUnifiedTabAfterAnchor(WT, 'T', 'A')
+    insertUnifiedTabAfterAnchor(WT, 'T', 'missing')
+    expect(mocks.state.current?.reorderUnifiedTabs).not.toHaveBeenCalled()
+  })
+
+  it('is a no-op when a stale group order lists a tab another group owns', () => {
+    seed(
+      [tab('A', 'g1'), tab('T', 'g2')],
+      [
+        { id: 'g1', worktreeId: WT, activeTabId: 'A', tabOrder: ['A', 'T'] },
+        { id: 'g2', worktreeId: WT, activeTabId: 'T', tabOrder: ['T'] }
+      ]
+    )
+    insertUnifiedTabAfterAnchor(WT, 'T', 'A')
+    expect(mocks.state.current?.reorderUnifiedTabs).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/lib/unified-tab-anchor-insertion.ts b/src/renderer/src/lib/unified-tab-anchor-insertion.ts
index 2b9055b919f2..ab3bc2c68b7a 100644
--- a/src/renderer/src/lib/unified-tab-anchor-insertion.ts
+++ b/src/renderer/src/lib/unified-tab-anchor-insertion.ts
@@ -1,6 +1,7 @@
 import { useAppStore } from '../store'
+import { insertTabIdIntoOrder } from '../store/slices/tabs/tabs-tab-order'
 
-/** Move `tabId` to sit immediately after `anchorTabId`; no-op unless both share a group. */
+/** Move `tabId` to sit immediately after `anchorTabId`; no-op unless both share a live group. */
 export function insertUnifiedTabAfterAnchor(
   worktreeId: string,
   tabId: string,
@@ -10,13 +11,30 @@ export function insertUnifiedTabAfterAnchor(
     return
   }
   const state = useAppStore.getState()
+  const tabs = state.unifiedTabsByWorktree[worktreeId] ?? []
+  const tab = tabs.find((candidate) => candidate.id === tabId)
+  const anchor = tabs.find((candidate) => candidate.id === anchorTabId)
+  if (!tab || !anchor || tab.groupId !== anchor.groupId) {
+    return
+  }
   const group = (state.groupsByWorktree[worktreeId] ?? []).find(
-    (candidate) => candidate.tabOrder.includes(tabId) && candidate.tabOrder.includes(anchorTabId)
+    (candidate) => candidate.id === tab.groupId
+  )
+  if (!group?.tabOrder.includes(tabId) || !group.tabOrder.includes(anchorTabId)) {
+    return
+  }
+  const order = insertTabIdIntoOrder(
+    group.tabOrder,
+    tabs,
+    tabId,
+    tab.isPinned === true,
+    anchorTabId
   )
-  if (!group) {
+  if (
+    order.length === group.tabOrder.length &&
+    order.every((id, index) => id === group.tabOrder[index])
+  ) {
     return
   }
-  const order = group.tabOrder.filter((id) => id !== tabId)
-  order.splice(order.indexOf(anchorTabId) + 1, 0, tabId)
   state.reorderUnifiedTabs(group.id, order, { recordInteraction: false })
 }
diff --git a/src/renderer/src/lib/wake-sleeping-agents-in-background.test.ts b/src/renderer/src/lib/wake-sleeping-agents-in-background.test.ts
index 40281b4a2443..dc8dc8452b8f 100644
--- a/src/renderer/src/lib/wake-sleeping-agents-in-background.test.ts
+++ b/src/renderer/src/lib/wake-sleeping-agents-in-background.test.ts
@@ -23,7 +23,7 @@ vi.mock('./resume-sleeping-agent-session', () => ({
 // the gating, not the predicate internals.
 const isPassiveSpy = vi.fn()
 vi.mock('./sleeping-agent-pane-ownership', () => ({
-  isPassiveCompletedHibernationEvidence: (record: unknown) => isPassiveSpy(record),
+  activationTreatsNoteAsFinished: (record: unknown) => isPassiveSpy(record),
   recordPaneIsOwnedByPreservedPane: () => false,
   getProviderSessionClaimKey: (record: {
     worktreeId: string
diff --git a/src/renderer/src/lib/wake-sleeping-agents-in-background.ts b/src/renderer/src/lib/wake-sleeping-agents-in-background.ts
index df22b07f209b..4cfe88c51b82 100644
--- a/src/renderer/src/lib/wake-sleeping-agents-in-background.ts
+++ b/src/renderer/src/lib/wake-sleeping-agents-in-background.ts
@@ -9,7 +9,7 @@ import { parseLegacyNumericPaneKey, parsePaneKey } from '../../../shared/stable-
 import { resumeSleepingAgentSessionsForWorktree } from './resume-sleeping-agent-session'
 import {
   getProviderSessionClaimKey,
-  isPassiveCompletedHibernationEvidence,
+  activationTreatsNoteAsFinished,
   recordPaneIsOwnedByPreservedPane
 } from './sleeping-agent-pane-ownership'
 
@@ -89,12 +89,12 @@ function getCanonicalPassiveWakeRecords(
 ): SleepingAgentSessionRecord[] {
   const activeClaimKeys = new Set(
     records
-      .filter((record) => !isPassiveCompletedHibernationEvidence(record))
+      .filter((record) => !activationTreatsNoteAsFinished(record))
       .map(getProviderSessionClaimKey)
   )
   const recordsByClaim = new Map<string, SleepingAgentSessionRecord[]>()
   for (const record of records) {
-    if (!isPassiveCompletedHibernationEvidence(record)) {
+    if (!activationTreatsNoteAsFinished(record)) {
       continue
     }
     const claimKey = getProviderSessionClaimKey(record)
diff --git a/src/renderer/src/lib/workspace-activation-terminal-focus.test.ts b/src/renderer/src/lib/workspace-activation-terminal-focus.test.ts
index 26bbe4b1ebda..e87fc615042e 100644
--- a/src/renderer/src/lib/workspace-activation-terminal-focus.test.ts
+++ b/src/renderer/src/lib/workspace-activation-terminal-focus.test.ts
@@ -1,209 +1,235 @@
-import type * as SyncRuntimeGraphModule from '@/runtime/sync-runtime-graph'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const focusTerminalTabSurfaceMock = vi.hoisted(() => vi.fn())
-const focusRuntimeTerminalSurfaceMock = vi.hoisted(() => vi.fn())
-const getStateMock = vi.hoisted(() => vi.fn())
-
-vi.mock('@/lib/focus-terminal-tab-surface', () => ({
-  focusTerminalTabSurface: focusTerminalTabSurfaceMock
-}))
-
-vi.mock('@/runtime/sync-runtime-graph', () => ({
-  focusRuntimeTerminalSurface: focusRuntimeTerminalSurfaceMock
+// @vitest-environment happy-dom
+import type { AppState } from '@/store/types'
+import { act, createElement } from 'react'
+import { createRoot } from 'react-dom/client'
+import { Dialog, DialogContent, DialogTitle } from '@/components/ui/dialog'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+
+const mocks = vi.hoisted(() => ({
+  focus: vi.fn(),
+  getState: vi.fn(),
+  subscribe: vi.fn()
 }))
-
+vi.mock('@/runtime/sync-runtime-graph', () => ({ focusRuntimeTerminalSurface: mocks.focus }))
 vi.mock('@/store', () => ({
-  useAppStore: {
-    getState: getStateMock
-  }
+  useAppStore: { getState: mocks.getState, subscribe: mocks.subscribe }
 }))
 
 import { queueWorkspaceActivationTerminalFocus } from './workspace-activation-terminal-focus'
 
-const CHAT_VIEW_LEAF_ID = 'cccccccc-cccc-4ccc-8ccc-cccccccccccc'
-
-type FocusState = {
-  activeWorktreeId: string | null
-  activeView: string
-  activeTabType: string
-  activeTabId: string | null
-}
-
-let pendingFrame: (() => void) | null = null
-
-function setFocusState(state: FocusState): void {
-  getStateMock.mockImplementation(() => state)
-}
+let state: Pick<
+  AppState,
+  | 'activeWorktreeId'
+  | 'activeWorkspaceExecutionHostId'
+  | 'activeView'
+  | 'activeTabType'
+  | 'activeTabId'
+  | 'activeModal'
+>
+let frame: FrameRequestCallback | null
+let notifyStore: () => void
+let notifyMount: () => void
+const unsubscribe = vi.fn()
+const disconnect = vi.fn()
 
 function flushFrame(): void {
-  const frame = pendingFrame
-  pendingFrame = null
-  frame?.()
+  const callback = frame
+  frame = null
+  callback?.(0)
 }
 
-describe('queueWorkspaceActivationTerminalFocus', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    pendingFrame = null
-    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
-      pendingFrame = () => callback(0)
-      return 1
-    })
-    focusRuntimeTerminalSurfaceMock.mockReturnValue(false)
+beforeEach(() => {
+  vi.clearAllMocks()
+  vi.useFakeTimers()
+  frame = null
+  state = {
+    activeWorktreeId: 'wt-1',
+    activeWorkspaceExecutionHostId: null,
+    activeView: 'terminal',
+    activeTabType: 'terminal',
+    activeTabId: 'tab-1',
+    activeModal: 'none'
+  }
+  mocks.getState.mockImplementation(() => state)
+  mocks.subscribe.mockImplementation((listener) => {
+    notifyStore = listener
+    return unsubscribe
   })
+  mocks.focus.mockReturnValue(false)
+  vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
+    frame = callback
+    return 1
+  })
+  vi.stubGlobal('cancelAnimationFrame', () => {
+    frame = null
+  })
+  vi.stubGlobal(
+    'MutationObserver',
+    class {
+      constructor(callback: () => void) {
+        notifyMount = callback
+      }
+      observe = vi.fn()
+      disconnect = disconnect
+    }
+  )
+})
+afterEach(() => {
+  document.dispatchEvent(new Event('pointerdown'))
+  document.body.replaceChildren()
+  vi.useRealTimers()
+  vi.unstubAllGlobals()
+})
 
-  it('focuses the primary tab from the activation result after the modal close frame', () => {
-    setFocusState({
-      activeWorktreeId: 'wt-1',
-      activeView: 'terminal',
-      activeTabType: 'terminal',
-      activeTabId: 'tab-1'
-    })
-
-    queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: 'tab-1' })
-
-    expect(focusRuntimeTerminalSurfaceMock).not.toHaveBeenCalled()
+describe('workspace activation focus', () => {
+  it('focuses an existing terminal after the palette closes and cleans up', () => {
+    mocks.focus.mockReturnValue(true)
+    expect(queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: 'tab-1' })).toBe(true)
+    expect(mocks.focus).not.toHaveBeenCalled()
     flushFrame()
-
-    expect(focusRuntimeTerminalSurfaceMock).toHaveBeenCalledWith('tab-1', null, 'wt-1')
-    expect(focusTerminalTabSurfaceMock).toHaveBeenCalledWith('tab-1')
+    expect(mocks.focus).toHaveBeenCalledWith('tab-1', null, 'wt-1')
+    expect(unsubscribe).toHaveBeenCalledOnce()
+    expect(disconnect).toHaveBeenCalledOnce()
+    expect(vi.getTimerCount()).toBe(0)
   })
 
-  it('uses the adopted active terminal tab when activation did not create one', () => {
-    setFocusState({
-      activeWorktreeId: 'wt-1',
-      activeView: 'terminal',
-      activeTabType: 'terminal',
-      activeTabId: 'tab-adopted'
-    })
-
+  it('waits for a sleeping terminal to mount instead of focusing another workspace', () => {
     queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: null })
     flushFrame()
+    expect(mocks.focus).toHaveBeenCalledTimes(1)
+    expect(frame).toBeNull()
+    mocks.focus.mockReturnValue(true)
+    notifyMount()
+    flushFrame()
+    expect(mocks.focus).toHaveBeenLastCalledWith('tab-1', null, 'wt-1')
+    expect(unsubscribe).toHaveBeenCalledOnce()
+  })
 
-    expect(focusRuntimeTerminalSurfaceMock).toHaveBeenCalledWith('tab-adopted', null, 'wt-1')
-    expect(focusTerminalTabSurfaceMock).toHaveBeenCalledWith('tab-adopted')
+  it('claims a workspace whose terminal tab is created asynchronously', () => {
+    state.activeTabId = null
+    expect(queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: null })).toBe(true)
+    flushFrame()
+    expect(mocks.focus).not.toHaveBeenCalled()
+    state.activeTabId = 'restored-tab'
+    notifyStore()
+    flushFrame()
+    mocks.focus.mockReturnValue(true)
+    notifyMount()
+    flushFrame()
+    expect(mocks.focus).toHaveBeenLastCalledWith('restored-tab', null, 'wt-1')
   })
 
-  it('does not fall back to DOM focus when the runtime surface handled focus', () => {
-    focusRuntimeTerminalSurfaceMock.mockReturnValue(true)
-    setFocusState({
-      activeWorktreeId: 'wt-1',
-      activeView: 'terminal',
-      activeTabType: 'terminal',
-      activeTabId: 'tab-1'
-    })
+  it.each([
+    { activeWorktreeId: 'wt-2' },
+    { activeWorkspaceExecutionHostId: 'ssh:second-host' },
+    { activeView: 'settings' },
+    { activeTabType: 'browser' },
+    { activeTabId: 'tab-2' },
+    { activeModal: 'worktree-palette' }
+  ] as const)('cancels when selection changes to %j during restoration', (change) => {
+    queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: 'tab-1' })
+    flushFrame()
+    mocks.focus.mockClear()
+    state = { ...state, ...change }
+    notifyStore()
+    flushFrame()
+    notifyMount()
+    flushFrame()
+    expect(mocks.focus).not.toHaveBeenCalled()
+    expect(unsubscribe).toHaveBeenCalledOnce()
+  })
 
+  it('cancels on a user click while waiting', () => {
     queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: 'tab-1' })
     flushFrame()
+    document.dispatchEvent(new Event('pointerdown'))
+    mocks.focus.mockClear()
+    notifyMount()
+    flushFrame()
+    expect(mocks.focus).not.toHaveBeenCalled()
+  })
 
-    expect(focusRuntimeTerminalSurfaceMock).toHaveBeenCalledWith('tab-1', null, 'wt-1')
-    expect(focusTerminalTabSurfaceMock).not.toHaveBeenCalled()
+  it('does not steal focus from an input claimed during restoration', () => {
+    queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: 'tab-1' })
+    const input = document.createElement('input')
+    document.body.append(input)
+    input.focus()
+    notifyMount()
+    flushFrame()
+    expect(mocks.focus).not.toHaveBeenCalled()
+    expect(document.activeElement).toBe(input)
   })
 
-  // Why: a legacy native chat is a terminal tab whose xterm stays mounted under the chat portal.
-  // Activation must leave the caret in the composer, so neither the runtime path's xterm focus
-  // nor the DOM fallback may fire. Runs the real runtime surface, not the module mock.
-  it('leaves a chat-view terminal tab unfocused on both the runtime and DOM paths', async () => {
-    const runtime = await vi.importActual<typeof SyncRuntimeGraphModule>(
-      '@/runtime/sync-runtime-graph'
-    )
-    focusRuntimeTerminalSurfaceMock.mockImplementation(runtime.focusRuntimeTerminalSurface)
-    const focus = vi.fn()
-    const pane = {
-      id: 1,
-      leafId: CHAT_VIEW_LEAF_ID,
-      container: {
-        querySelector: (selector: string) =>
-          selector === '.native-chat-pane-shell' ? ({} as Element) : null
-      },
-      terminal: { focus }
-    }
-    const manager = {
-      getPanes: () => [pane],
-      getActivePane: () => pane,
-      getLeafId: () => CHAT_VIEW_LEAF_ID,
-      getNumericIdForLeaf: () => pane.id,
-      setActivePane: vi.fn()
-    }
-    const unregister = runtime.registerRuntimeTerminalTab({
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      getManager: () => manager as never,
-      getContainer: () => null,
-      getPtyIdForPane: () => null,
-      getTabWideAgentHintLeafId: () => null
-    })
+  it('retains focus through composer dialog close with a previously focused editable input', async () => {
+    const previousInput = document.createElement('input')
+    const container = document.createElement('div')
+    document.body.append(previousInput, container)
+    previousInput.focus()
+    const root = createRoot(container)
     try {
-      setFocusState({
-        activeWorktreeId: 'wt-1',
-        activeView: 'terminal',
-        activeTabType: 'terminal',
-        activeTabId: 'tab-1'
+      // The composer uses a controlled modal without a DialogTrigger or close autofocus handler.
+      await act(async () => {
+        root.render(
+          createElement(
+            Dialog,
+            { open: true },
+            createElement(
+              DialogContent,
+              { 'aria-describedby': undefined },
+              createElement(DialogTitle, null, 'New workspace'),
+              createElement('input', { 'aria-label': 'Workspace name' })
+            )
+          )
+        )
       })
-
+      expect(document.activeElement?.getAttribute('aria-label')).toBe('Workspace name')
       queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: 'tab-1' })
+      await act(async () => root.render(null))
+      await act(async () => vi.advanceTimersByTime(0))
+      expect(previousInput.isConnected).toBe(true)
+      expect(document.activeElement).not.toBe(previousInput)
+      mocks.focus.mockReturnValue(true)
       flushFrame()
-
-      expect(focus).not.toHaveBeenCalled()
-      expect(focusTerminalTabSurfaceMock).not.toHaveBeenCalled()
+      expect(mocks.focus).toHaveBeenCalledWith('tab-1', null, 'wt-1')
     } finally {
-      unregister()
+      await act(async () => root.unmount())
     }
   })
 
-  // Why: #9939 — the return value is what stops the palette from running its whole-document
-  // fallback, which would grab the worktree the user just left, now mounted but hidden.
-  it('reports that it claimed focus for a terminal destination', () => {
-    setFocusState({
-      activeWorktreeId: 'wt-1',
-      activeView: 'terminal',
-      activeTabType: 'terminal',
-      activeTabId: 'tab-adopted'
-    })
-
-    expect(queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: null })).toBe(true)
-  })
-
-  it('declines a destination whose restored surface is not a terminal', () => {
-    setFocusState({
-      activeWorktreeId: 'wt-1',
-      activeView: 'terminal',
-      activeTabType: 'browser',
-      activeTabId: 'tab-adopted'
-    })
-
-    expect(queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: null })).toBe(false)
+  it('keeps the post-palette request when terminal mounting briefly takes focus', () => {
+    queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: 'tab-1' })
+    const textarea = document.createElement('textarea')
+    textarea.className = 'xterm-helper-textarea'
+    document.body.append(textarea)
+    textarea.focus()
+    textarea.blur()
+    mocks.focus.mockReturnValue(true)
     flushFrame()
-    expect(focusRuntimeTerminalSurfaceMock).not.toHaveBeenCalled()
-    expect(focusTerminalTabSurfaceMock).not.toHaveBeenCalled()
+    expect(mocks.focus).toHaveBeenCalledWith('tab-1', null, 'wt-1')
   })
 
-  it('declines a destination that has no terminal tab yet', () => {
-    setFocusState({
-      activeWorktreeId: 'wt-1',
-      activeView: 'terminal',
-      activeTabType: 'terminal',
-      activeTabId: null
-    })
-
-    expect(queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: null })).toBe(false)
+  it('expires a request if restoration fails', () => {
+    queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: 'tab-1' })
+    vi.advanceTimersByTime(30_000)
+    notifyMount()
+    flushFrame()
+    expect(mocks.focus).not.toHaveBeenCalled()
+    expect(unsubscribe).toHaveBeenCalledOnce()
   })
 
-  it('does not steal focus if the user leaves the created workspace first', () => {
-    const state: FocusState = {
-      activeWorktreeId: 'wt-1',
-      activeView: 'terminal',
-      activeTabType: 'terminal',
-      activeTabId: 'tab-1'
-    }
-    setFocusState(state)
-
+  it('cancels the previous request when a new activation is declined', () => {
     queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: 'tab-1' })
-    state.activeWorktreeId = 'wt-2'
+    state.activeTabType = 'browser'
+    expect(queueWorkspaceActivationTerminalFocus('wt-1', { primaryTabId: null })).toBe(false)
+    notifyMount()
     flushFrame()
+    expect(mocks.focus).not.toHaveBeenCalled()
+  })
 
-    expect(focusRuntimeTerminalSurfaceMock).not.toHaveBeenCalled()
-    expect(focusTerminalTabSurfaceMock).not.toHaveBeenCalled()
+  it('declines a failed activation', () => {
+    expect(queueWorkspaceActivationTerminalFocus('wt-1', false)).toBe(false)
+    expect(mocks.subscribe).not.toHaveBeenCalled()
   })
 })
diff --git a/src/renderer/src/lib/workspace-activation-terminal-focus.ts b/src/renderer/src/lib/workspace-activation-terminal-focus.ts
index 8e7bcf03a33e..7b36867461bf 100644
--- a/src/renderer/src/lib/workspace-activation-terminal-focus.ts
+++ b/src/renderer/src/lib/workspace-activation-terminal-focus.ts
@@ -1,54 +1,94 @@
+import { shouldPreserveEditableFocus } from '@/components/terminal-pane/pane-helpers'
 import { useAppStore } from '@/store'
-import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface'
 import { focusRuntimeTerminalSurface } from '@/runtime/sync-runtime-graph'
 import type { ActivateAndRevealResult } from '@/lib/worktree-activation'
 
-function resolveActivatedWorkspaceTerminalTabId(
-  worktreeId: string,
-  activation: ActivateAndRevealResult | false
-): string | null {
-  const state = useAppStore.getState()
-  if (activation && activation.primaryTabId) {
-    return activation.primaryTabId
-  }
-  if (
-    state.activeWorktreeId !== worktreeId ||
-    state.activeView !== 'terminal' ||
-    state.activeTabType !== 'terminal'
-  ) {
-    return null
-  }
-  return state.activeTabId
-}
+let cancelPendingFocus: (() => void) | null = null
 
-// Why: returns false when the destination's restored surface is not a terminal, so callers can
-// fall back instead of focusing an unrelated worktree's mounted-but-hidden terminal (#9939).
+// A sleeping workspace can publish its tab and mount its terminal after the palette closes.
 export function queueWorkspaceActivationTerminalFocus(
   worktreeId: string,
   activation: ActivateAndRevealResult | false
 ): boolean {
-  const tabId = resolveActivatedWorkspaceTerminalTabId(worktreeId, activation)
-  if (!tabId) {
+  cancelPendingFocus?.()
+  const initial = useAppStore.getState()
+  if (
+    !activation ||
+    initial.activeWorktreeId !== worktreeId ||
+    initial.activeView !== 'terminal' ||
+    initial.activeTabType !== 'terminal'
+  ) {
     return false
   }
-
-  requestAnimationFrame(() => {
+  let tabId = activation.primaryTabId ?? initial.activeTabId
+  const executionHostId = initial.activeWorkspaceExecutionHostId
+  const initialFocus = document.activeElement
+  const closingDialog = document.querySelector('[role="dialog"]')
+  let frameId: number | null = null
+  let finished = false
+  const cancel = (): void => {
+    if (finished) {
+      return
+    }
+    finished = true
+    if (frameId !== null) {
+      cancelAnimationFrame(frameId)
+    }
+    observer.disconnect()
+    unsubscribe()
+    clearTimeout(timeout)
+    document.removeEventListener('pointerdown', cancel, true)
+    document.removeEventListener('focusin', onFocus, true)
+    if (cancelPendingFocus === cancel) {
+      cancelPendingFocus = null
+    }
+  }
+  const attempt = (): void => {
+    frameId = null
     const state = useAppStore.getState()
     if (
       state.activeWorktreeId !== worktreeId ||
+      state.activeWorkspaceExecutionHostId !== executionHostId ||
       state.activeView !== 'terminal' ||
       state.activeTabType !== 'terminal' ||
-      state.activeTabId !== tabId
+      (tabId !== null && state.activeTabId !== tabId) ||
+      state.activeModal !== 'none'
     ) {
+      cancel()
       return
     }
-
-    // Why: creation closes a Radix dialog immediately after activation. Queue
-    // focus past that close so focus restoration cannot leave the user on the
-    // removed composer field after Cmd/Ctrl+Enter.
-    if (!focusRuntimeTerminalSurface(tabId, null, worktreeId)) {
-      focusTerminalTabSurface(tabId)
+    tabId ??= state.activeTabId
+    if (tabId && focusRuntimeTerminalSurface(tabId, null, worktreeId)) {
+      cancel()
+    }
+  }
+  const schedule = (): void => {
+    if (!finished && frameId === null) {
+      frameId = requestAnimationFrame(attempt)
     }
+  }
+  const onFocus = (): void => {
+    const active = document.activeElement
+    if (
+      active !== initialFocus &&
+      !closingDialog?.contains(active) &&
+      shouldPreserveEditableFocus(active)
+    ) {
+      cancel()
+    }
+  }
+  const observer = new MutationObserver(schedule)
+  observer.observe(document.body, {
+    childList: true,
+    subtree: true,
+    attributes: true,
+    attributeFilter: ['class', 'style', 'data-state']
   })
+  const unsubscribe = useAppStore.subscribe(schedule)
+  const timeout = setTimeout(cancel, 30_000)
+  document.addEventListener('pointerdown', cancel, true)
+  document.addEventListener('focusin', onFocus, true)
+  cancelPendingFocus = cancel
+  schedule()
   return true
 }
diff --git a/src/renderer/src/lib/workspace-browser-tab-open.test.ts b/src/renderer/src/lib/workspace-browser-tab-open.test.ts
index 5ae73fa7c128..19ae49740388 100644
--- a/src/renderer/src/lib/workspace-browser-tab-open.test.ts
+++ b/src/renderer/src/lib/workspace-browser-tab-open.test.ts
@@ -96,6 +96,7 @@ describe('openWorkspaceBrowserTab', () => {
       {
         activate: true,
         browserRuntimeEnvironmentId: null,
+        executionHostId: 'ssh:ssh-target',
         focusAddressBar: false,
         sessionProfileId: 'ssh-profile',
         targetGroupId: 'group-1',
@@ -118,6 +119,7 @@ describe('openWorkspaceBrowserTab', () => {
     await openWorkspaceBrowserTab({
       workspaceId: WORKSPACE_ID,
       url: 'https://github.com/acme/orca/pull/456',
+      afterTabId: 'source-unified-tab',
       intent: { kind: 'url' },
       focusOnCreate: false,
       selectWorktree: false
@@ -126,7 +128,7 @@ describe('openWorkspaceBrowserTab', () => {
     expect(createBrowserTab).toHaveBeenCalledWith(
       WORKSPACE_ID,
       'https://github.com/acme/orca/pull/456',
-      expect.objectContaining({ activate: false })
+      expect.objectContaining({ activate: false, afterTabId: 'source-unified-tab' })
     )
   })
 
@@ -202,6 +204,7 @@ describe('openWorkspaceBrowserTab', () => {
     await openWorkspaceBrowserTab({
       workspaceId: WORKSPACE_ID,
       url: 'https://gitlab.com/acme/orca/-/merge_requests/77',
+      afterTabId: 'source-unified-tab',
       intent: { kind: 'url' },
       focusOnCreate: false,
       selectWorktree: false
@@ -209,6 +212,7 @@ describe('openWorkspaceBrowserTab', () => {
 
     expect(mocks.createRemote).toHaveBeenCalledWith(
       expect.objectContaining({
+        clientAfterTabId: 'source-unified-tab',
         focusOnCreate: false,
         selectWorktree: false,
         url: 'https://gitlab.com/acme/orca/-/merge_requests/77'
diff --git a/src/renderer/src/lib/workspace-browser-tab-open.ts b/src/renderer/src/lib/workspace-browser-tab-open.ts
index 18149a98bbc3..5329511941e6 100644
--- a/src/renderer/src/lib/workspace-browser-tab-open.ts
+++ b/src/renderer/src/lib/workspace-browser-tab-open.ts
@@ -24,6 +24,8 @@ export type WorkspaceBrowserTabIntent = { kind: 'url' } | { kind: 'search'; engi
 export type OpenWorkspaceBrowserTabRequest = {
   workspaceId: string
   targetGroupId?: string
+  /** Client-local unified tab id of the source; a source-following open omits targetGroupId. */
+  afterTabId?: string
   url: string
   intent: WorkspaceBrowserTabIntent
   /** Keep the caller's current terminal/task surface selected while creating the tab. */
@@ -190,10 +192,12 @@ function createClientBrowserTab(
       activate: request.focusOnCreate !== false,
       browserRuntimeEnvironmentId: null,
       focusAddressBar: false,
+      executionHostId: hostId,
       sessionProfileId:
         state.defaultBrowserSessionProfileIdByHostId[hostId] ??
         state.defaultBrowserSessionProfileId,
       targetGroupId: request.targetGroupId,
+      ...(request.afterTabId ? { afterTabId: request.afterTabId } : {}),
       title: presentation.title
     })
   } catch (error) {
@@ -289,6 +293,7 @@ export async function openWorkspaceBrowserTab(
       environmentId,
       url: request.url,
       targetGroupId: request.targetGroupId,
+      ...(request.afterTabId ? { clientAfterTabId: request.afterTabId } : {}),
       // Owner-pinned links need the host tab published before client reconciliation.
       ...(expectedEnvironmentId !== null ? { waitForRegistration: true } : {}),
       ...(request.placementPreference !== undefined
diff --git a/src/renderer/src/lib/workspace-emoji-shortcodes.lazy.test.ts b/src/renderer/src/lib/workspace-emoji-shortcodes.lazy.test.ts
index eafc3e3b2b8c..2e4dfac4a4a8 100644
--- a/src/renderer/src/lib/workspace-emoji-shortcodes.lazy.test.ts
+++ b/src/renderer/src/lib/workspace-emoji-shortcodes.lazy.test.ts
@@ -1,5 +1,3 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 describe('workspace emoji shortcode index laziness', () => {
@@ -20,11 +18,4 @@ describe('workspace emoji shortcode index laziness', () => {
     expect(shortcodeIndex.searchWorkspaceEmojiShortcodes('tada')[0]?.emoji).toBe('🎉')
     expect(catalog.isEmojiShortcodeCatalogBuiltForTest()).toBe(true)
   })
-
-  it('keeps the exact-shortcode index out of module scope', () => {
-    const indexSource = readFileSync(join(__dirname, 'workspace-emoji-shortcodes.ts'), 'utf8')
-
-    expect(indexSource).not.toMatch(/^const \w+ = new Map\(/m)
-    expect(indexSource).not.toContain('STANDARD_EMOJI_SHORTCODE_ENTRIES')
-  })
 })
diff --git a/src/renderer/src/lib/workspace-session-browser-history.test.ts b/src/renderer/src/lib/workspace-session-browser-history.test.ts
index 1a9bde2f605d..8c6ef564e255 100644
--- a/src/renderer/src/lib/workspace-session-browser-history.test.ts
+++ b/src/renderer/src/lib/workspace-session-browser-history.test.ts
@@ -34,8 +34,7 @@ function createSnapshot(browserUrlHistory: BrowserHistoryEntry[]): WorkspaceSess
     worktreesByRepo: {},
     lastKnownRelayPtyIdByTabId: {},
     lastVisitedAtByWorktreeId: {},
-    defaultTerminalTabsAppliedByWorktreeId: {},
-    closedTerminalTabTombstonesByTabId: {}
+    defaultTerminalTabsAppliedByWorktreeId: {}
   }
 }
 
diff --git a/src/renderer/src/lib/workspace-session-closed-tab-tombstones.test.ts b/src/renderer/src/lib/workspace-session-closed-tab-tombstones.test.ts
deleted file mode 100644
index 522b079aff6e..000000000000
--- a/src/renderer/src/lib/workspace-session-closed-tab-tombstones.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { buildWorkspaceSessionPatch } from './workspace-session-patch'
-import { SESSION_RELEVANT_FIELDS } from './workspace-session'
-import { CLOSED_TERMINAL_TAB_TOMBSTONE_TTL_MS } from '../../../shared/closed-terminal-tab-tombstones'
-
-// Why browserPagesByWorkspace is stubbed: buildWorkspaceSessionPatch pre-filters staged browser tabs
-// before field dispatch, so the minimal fixture has to carry the map it iterates.
-function patchFor(
-  map: Record<string, { closedAt: number; worktreeId: string }>
-): ReturnType<typeof buildWorkspaceSessionPatch> {
-  return buildWorkspaceSessionPatch(
-    { browserPagesByWorkspace: {}, closedTerminalTabTombstonesByTabId: map } as never,
-    ['closedTerminalTabTombstonesByTabId']
-  )
-}
-
-describe('closed-tab tombstones in the persisted session', () => {
-  it('is a session-relevant field, so a close on its own schedules a write', () => {
-    expect(SESSION_RELEVANT_FIELDS).toContain('closedTerminalTabTombstonesByTabId')
-  })
-
-  it('writes live tombstones and drops ones past the TTL', () => {
-    const now = Date.now()
-    expect(
-      patchFor({
-        fresh: { closedAt: now, worktreeId: 'repo-1::/srv/app' },
-        stale: {
-          closedAt: now - CLOSED_TERMINAL_TAB_TOMBSTONE_TTL_MS - 1,
-          worktreeId: 'repo-1::/srv/app'
-        }
-      }).closedTerminalTabTombstonesByTabId
-    ).toEqual({ fresh: { closedAt: now, worktreeId: 'repo-1::/srv/app' } })
-  })
-
-  it('omits the field entirely once the map empties', () => {
-    expect(patchFor({}).closedTerminalTabTombstonesByTabId).toBeUndefined()
-  })
-})
diff --git a/src/renderer/src/lib/workspace-session-closed-tab-tombstones.ts b/src/renderer/src/lib/workspace-session-closed-tab-tombstones.ts
deleted file mode 100644
index 48b1cb1a727c..000000000000
--- a/src/renderer/src/lib/workspace-session-closed-tab-tombstones.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
-import { pruneClosedTerminalTabTombstones } from '../../../shared/closed-terminal-tab-tombstones'
-
-/** Applies the TTL/cap bound on the way to disk, and omits an empty map like its siblings. */
-export function buildPersistedClosedTerminalTabTombstones(
-  map: WorkspaceSessionState['closedTerminalTabTombstonesByTabId']
-): WorkspaceSessionState['closedTerminalTabTombstonesByTabId'] {
-  const pruned = pruneClosedTerminalTabTombstones(map, Date.now())
-  return Object.keys(pruned).length > 0 ? pruned : undefined
-}
diff --git a/src/renderer/src/lib/workspace-session-editor-drafts.test.ts b/src/renderer/src/lib/workspace-session-editor-drafts.test.ts
index 690e5917fd1b..ba639bb46683 100644
--- a/src/renderer/src/lib/workspace-session-editor-drafts.test.ts
+++ b/src/renderer/src/lib/workspace-session-editor-drafts.test.ts
@@ -36,7 +36,6 @@ function createSnapshot(
     lastKnownRelayPtyIdByTabId: {},
     lastVisitedAtByWorktreeId: {},
     defaultTerminalTabsAppliedByWorktreeId: {},
-    closedTerminalTabTombstonesByTabId: {},
     ...overrides
   }
 }
diff --git a/src/renderer/src/lib/workspace-session-liveness.test.ts b/src/renderer/src/lib/workspace-session-liveness.test.ts
index 5cabd5b52ff6..821c059bfa05 100644
--- a/src/renderer/src/lib/workspace-session-liveness.test.ts
+++ b/src/renderer/src/lib/workspace-session-liveness.test.ts
@@ -35,7 +35,6 @@ function createSnapshot(
     lastKnownRelayPtyIdByTabId: {},
     lastVisitedAtByWorktreeId: {},
     defaultTerminalTabsAppliedByWorktreeId: {},
-    closedTerminalTabTombstonesByTabId: {},
     ...overrides
   }
 }
diff --git a/src/renderer/src/lib/workspace-session-patch.ts b/src/renderer/src/lib/workspace-session-patch.ts
index 4537e1c570bb..dc2947918c20 100644
--- a/src/renderer/src/lib/workspace-session-patch.ts
+++ b/src/renderer/src/lib/workspace-session-patch.ts
@@ -20,7 +20,6 @@ import { withoutStagedBrowserTabs } from './workspace-session-staged-browser-tab
 import { buildPersistedUnifiedTabSessionData } from './workspace-session-unified-tabs'
 import { buildLastVisitedAtByWorktreeId } from './workspace-session-focus-recency'
 import { buildSleepingAgentSessionData } from './workspace-session-sleeping-agents'
-import { buildPersistedClosedTerminalTabTombstones } from './workspace-session-closed-tab-tombstones'
 
 type SessionRelevantField = keyof WorkspaceSessionSnapshot
 
@@ -193,11 +192,6 @@ export function buildWorkspaceSessionPatch(
         ? snapshot.defaultTerminalTabsAppliedByWorktreeId
         : undefined
   }
-  if (changed.has('closedTerminalTabTombstonesByTabId')) {
-    patch.closedTerminalTabTombstonesByTabId = buildPersistedClosedTerminalTabTombstones(
-      snapshot.closedTerminalTabTombstonesByTabId
-    )
-  }
   if (changed.has('sleepingAgentSessionsByPaneKey')) {
     patch.sleepingAgentSessionsByPaneKey =
       buildSleepingAgentSessionData(snapshot).sleepingAgentSessionsByPaneKey
diff --git a/src/renderer/src/lib/workspace-session-relevant-fields.test.ts b/src/renderer/src/lib/workspace-session-relevant-fields.test.ts
index ce26d33ec82d..9aadf0579647 100644
--- a/src/renderer/src/lib/workspace-session-relevant-fields.test.ts
+++ b/src/renderer/src/lib/workspace-session-relevant-fields.test.ts
@@ -36,7 +36,6 @@ describe('SESSION_RELEVANT_FIELDS', () => {
     lastKnownRelayPtyIdByTabId: true,
     lastVisitedAtByWorktreeId: true,
     defaultTerminalTabsAppliedByWorktreeId: true,
-    closedTerminalTabTombstonesByTabId: true,
     sleepingAgentSessionsByPaneKey: true,
     clientHostedBrowserCloseIntentsByEnvironment: true,
     pendingReconnectPtyIdByTabId: true,
diff --git a/src/renderer/src/lib/workspace-session-ssh-partition-round-trip.test.ts b/src/renderer/src/lib/workspace-session-ssh-partition-round-trip.test.ts
index 19050b9ff670..13cc1baf5078 100644
--- a/src/renderer/src/lib/workspace-session-ssh-partition-round-trip.test.ts
+++ b/src/renderer/src/lib/workspace-session-ssh-partition-round-trip.test.ts
@@ -682,8 +682,7 @@ describe('ssh host partition remote-workspace round trip', () => {
       new Set([WORKTREE_ID]),
       read.session.tabsByWorktree,
       new Set(),
-      SSH_HOST_ID,
-      1
+      SSH_HOST_ID
     )
 
     expect(merged.tabsByWorktree[WORKTREE_ID]?.map((entry) => entry.id)).toEqual(['tab-runtime'])
@@ -718,8 +717,7 @@ describe('ssh host partition remote-workspace round trip', () => {
       new Set([WORKTREE_ID]),
       read.session.tabsByWorktree,
       new Set(),
-      SSH_HOST_ID,
-      2
+      SSH_HOST_ID
     )
 
     expect(merged.tabsByWorktree[WORKTREE_ID]?.map((entry) => entry.id)).toEqual(['tab-runtime'])
diff --git a/src/renderer/src/lib/workspace-session.ts b/src/renderer/src/lib/workspace-session.ts
index e35e2194f8ef..4bf57f6d82fc 100644
--- a/src/renderer/src/lib/workspace-session.ts
+++ b/src/renderer/src/lib/workspace-session.ts
@@ -11,7 +11,6 @@ import type { OpenFile } from '../store/slices/editor'
 import { buildPersistedUnifiedTabSessionData } from './workspace-session-unified-tabs'
 import { buildLastVisitedAtByWorktreeId } from './workspace-session-focus-recency'
 import { buildSleepingAgentSessionData } from './workspace-session-sleeping-agents'
-import { buildPersistedClosedTerminalTabTombstones } from './workspace-session-closed-tab-tombstones'
 import { buildActiveConnectionIdsAtShutdown } from './workspace-session-reconnect-targets'
 import { withoutStagedBrowserTabs } from './workspace-session-staged-browser-tabs'
 import { buildBrowserSessionData } from './workspace-session-browser-tabs'
@@ -57,7 +56,6 @@ export type WorkspaceSessionSnapshot = Pick<
   | 'lastKnownRelayPtyIdByTabId'
   | 'lastVisitedAtByWorktreeId'
   | 'defaultTerminalTabsAppliedByWorktreeId'
-  | 'closedTerminalTabTombstonesByTabId'
 > & {
   activeWorkspaceExecutionHostId?: AppState['activeWorkspaceExecutionHostId']
   sleepingAgentSessionsByPaneKey?: AppState['sleepingAgentSessionsByPaneKey']
@@ -100,7 +98,6 @@ export const SESSION_RELEVANT_FIELDS = [
   'lastKnownRelayPtyIdByTabId',
   'lastVisitedAtByWorktreeId',
   'defaultTerminalTabsAppliedByWorktreeId',
-  'closedTerminalTabTombstonesByTabId',
   'sleepingAgentSessionsByPaneKey',
   'clientHostedBrowserCloseIntentsByEnvironment',
   'pendingReconnectPtyIdByTabId',
@@ -330,9 +327,6 @@ export function buildWorkspaceSessionPayload(
       Object.keys(snapshot.defaultTerminalTabsAppliedByWorktreeId).length > 0
         ? snapshot.defaultTerminalTabsAppliedByWorktreeId
         : undefined,
-    closedTerminalTabTombstonesByTabId: buildPersistedClosedTerminalTabTombstones(
-      snapshot.closedTerminalTabTombstonesByTabId
-    ),
     ...buildSleepingAgentSessionData(snapshot),
     // Why unconditional rather than omit-when-empty: a full write replaces the persisted object,
     // so an emptied map has to be written as empty or the last replay never sticks.
diff --git a/src/renderer/src/lib/worktree-activation-default-agent-chat.test.ts b/src/renderer/src/lib/worktree-activation-default-agent-chat.test.ts
new file mode 100644
index 000000000000..ae956cabd216
--- /dev/null
+++ b/src/renderer/src/lib/worktree-activation-default-agent-chat.test.ts
@@ -0,0 +1,362 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import { activateAndRevealFolderWorkspace, activateAndRevealWorktree } from './worktree-activation'
+import * as activationGate from './worktree-agent-activation-gate'
+import {
+  ensureWorktreeHasInitialTerminal,
+  reseedGatedEmptyWorkspace
+} from './worktree-initial-terminal-seeding'
+import {
+  isEmptyWorkspaceDefaultSurfacePending,
+  releaseEmptyWorkspaceDefaultSurface
+} from './empty-workspace-default-surface-claims'
+import { folderWorkspaceKey } from '../../../shared/workspace-scope'
+import {
+  makeCreatedAgentWorktree as makeWorktree,
+  seedEmptyActivatableWorktree
+} from '@/lib/worktree-activation-created-agent-test-state'
+import {
+  createMockStore,
+  registerWorktreeActivationReset
+} from './worktree-activation-test-harness'
+
+const defaultChat = vi.hoisted(() => ({
+  open: vi.fn(),
+  awaitsDetection: vi.fn(),
+  loadDetection: vi.fn()
+}))
+
+vi.mock('@/lib/empty-workspace-default-agent-chat', () => ({
+  openDefaultAgentChatInEmptyWorkspace: defaultChat.open,
+  emptyWorkspaceDefaultChatAwaitsDetection: defaultChat.awaitsDetection,
+  loadEmptyWorkspaceDefaultChatDetection: defaultChat.loadDetection
+}))
+
+const USER_OPEN = { navigationIntent: 'user-open' } as const
+const FOLDER_ID = 'folder-1'
+const FOLDER_KEY = folderWorkspaceKey(FOLDER_ID)
+const initialAppStoreState = useAppStore.getState()
+
+registerWorktreeActivationReset()
+
+beforeEach(() => {
+  defaultChat.open.mockReset()
+  defaultChat.awaitsDetection.mockReset().mockReturnValue(false)
+  defaultChat.loadDetection.mockReset().mockResolvedValue(undefined)
+})
+
+afterEach(() => {
+  vi.unstubAllGlobals()
+  vi.restoreAllMocks()
+  releaseEmptyWorkspaceDefaultSurface(makeWorktree().id)
+  releaseEmptyWorkspaceDefaultSurface(FOLDER_KEY)
+  useAppStore.setState(initialAppStoreState, true)
+})
+
+/** Electron exposes the PTY inventory, so an empty workspace is seeded by the gated reseed. */
+function useElectronActivationGate(): ReturnType<typeof vi.spyOn> {
+  vi.stubGlobal('window', { api: { runtime: { call: vi.fn() }, pty: { listSessions: vi.fn() } } })
+  return vi.spyOn(activationGate, 'gateWorktreeAgentActivation').mockResolvedValue('empty')
+}
+
+function seedEmptyFolderWorkspace(): void {
+  useAppStore.setState({
+    folderWorkspaces: [
+      {
+        id: FOLDER_ID,
+        projectGroupId: 'group-1',
+        name: 'notes',
+        folderPath: '/local/notes',
+        executionHostId: 'local',
+        linkedTask: null,
+        comment: '',
+        isArchived: false,
+        isUnread: false,
+        isPinned: false,
+        sortOrder: 0
+      }
+    ],
+    activeView: 'terminal',
+    tabsByWorktree: {},
+    unifiedTabsByWorktree: {},
+    groupsByWorktree: {},
+    getFreshFolderWorkspacePathStatus: () => ({ exists: true }),
+    markWorktreeVisited: vi.fn(),
+    recordWorktreeVisit: vi.fn(),
+    revealWorktreeInSidebar: vi.fn()
+  } as unknown as Partial<ReturnType<typeof useAppStore.getState>>)
+}
+
+function tabCount(workspaceKey: string): number {
+  return (useAppStore.getState().tabsByWorktree[workspaceKey] ?? []).length
+}
+
+async function flushPromises(): Promise<void> {
+  await new Promise((resolve) => setTimeout(resolve, 0))
+}
+
+// Why: with chat as the default view, clicking an empty workspace used to open a bare shell the
+// user then had to turn into a chat by hand.
+describe('empty workspace seeding with a default agent chat', () => {
+  it('opens the default agent chat instead of a shell', () => {
+    defaultChat.open.mockReturnValue({ primaryTabId: 'chat-tab' })
+    const createTab = vi.fn(() => ({ id: 'shell-tab' }))
+    const store = createMockStore({ createTab })
+
+    const primaryTabId = ensureWorktreeHasInitialTerminal(
+      store,
+      'wt-1',
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      { seedUserDefaultSurface: true }
+    )
+
+    expect(defaultChat.open).toHaveBeenCalledWith('wt-1')
+    expect(primaryTabId).toBe('chat-tab')
+    expect(createTab).not.toHaveBeenCalled()
+  })
+
+  it('falls back to a shell when no chat can open', () => {
+    defaultChat.open.mockReturnValue(null)
+    const createTab = vi.fn(() => ({ id: 'shell-tab' }))
+    const store = createMockStore({ createTab })
+
+    const primaryTabId = ensureWorktreeHasInitialTerminal(
+      store,
+      'wt-1',
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      { seedUserDefaultSurface: true }
+    )
+
+    expect(primaryTabId).toBe('shell-tab')
+    expect(createTab).toHaveBeenCalledTimes(1)
+  })
+
+  it('keeps the shell for seeds that did not ask for the default surface', () => {
+    const store = createMockStore({ createTab: vi.fn(() => ({ id: 'shell-tab' })) })
+
+    ensureWorktreeHasInitialTerminal(store, 'wt-1')
+    ensureWorktreeHasInitialTerminal(store, 'wt-2', undefined, undefined, undefined, undefined, {
+      seedUserDefaultSurface: true,
+      activateCreatedTabs: false
+    })
+
+    expect(defaultChat.open).not.toHaveBeenCalled()
+  })
+
+  it('a user open of an empty workspace asks for the default surface', () => {
+    defaultChat.open.mockReturnValue({ primaryTabId: null })
+    const worktree = makeWorktree()
+    seedEmptyActivatableWorktree(worktree)
+
+    activateAndRevealWorktree(worktree.id, { ...USER_OPEN, notifyHostRuntime: false })
+
+    expect(defaultChat.open).toHaveBeenCalledWith(worktree.id)
+  })
+
+  it('back/forward navigation asks for the default surface', () => {
+    defaultChat.open.mockReturnValue({ primaryTabId: null })
+    const worktree = makeWorktree()
+    seedEmptyActivatableWorktree(worktree)
+    useAppStore.setState({
+      worktreeNavHistory: [worktree.id, 'repo-1::/elsewhere'],
+      worktreeNavHistoryIndex: 1
+    })
+
+    useAppStore.getState().goBackWorktree()
+
+    expect(defaultChat.open).toHaveBeenCalledWith(worktree.id)
+  })
+
+  // Why: CLI/phone creates, fallbacks after a failed agent launch, and the move after a delete
+  // activate with no intent; none of them may start an agent nobody picked.
+  it.each([
+    ['no navigation intent', {}],
+    ['a Blank Terminal pick', { ...USER_OPEN, agent: null }]
+  ])('keeps the shell for %s', (_label, selection) => {
+    const worktree = makeWorktree()
+    seedEmptyActivatableWorktree(worktree)
+
+    activateAndRevealWorktree(worktree.id, { ...selection, notifyHostRuntime: false })
+
+    expect(defaultChat.open).not.toHaveBeenCalled()
+    expect(tabCount(worktree.id)).toBe(1)
+  })
+})
+
+describe('the gated reseed that seeds an empty workspace in Electron', () => {
+  it('opens the default agent chat for a user open', async () => {
+    defaultChat.open.mockReturnValue({ primaryTabId: null })
+    const worktree = makeWorktree()
+    seedEmptyActivatableWorktree(worktree)
+    const gate = useElectronActivationGate()
+
+    const result = activateAndRevealWorktree(worktree.id, {
+      ...USER_OPEN,
+      notifyHostRuntime: false
+    })
+    expect(result === false ? 'failed' : result.primaryTabId).toBeNull()
+    await gate.mock.results[0]?.value
+
+    expect(defaultChat.open).toHaveBeenCalledWith(worktree.id)
+    expect(tabCount(worktree.id)).toBe(0)
+  })
+
+  it('seeds a shell for an activation without a user open', async () => {
+    const worktree = makeWorktree()
+    seedEmptyActivatableWorktree(worktree)
+    const gate = useElectronActivationGate()
+
+    activateAndRevealWorktree(worktree.id, { notifyHostRuntime: false })
+    await gate.mock.results[0]?.value
+
+    expect(defaultChat.open).not.toHaveBeenCalled()
+    expect(tabCount(worktree.id)).toBe(1)
+  })
+
+  it('opens the default agent chat for a user-opened folder workspace', async () => {
+    defaultChat.open.mockReturnValue({ primaryTabId: null })
+    seedEmptyFolderWorkspace()
+    const gate = useElectronActivationGate()
+
+    activateAndRevealFolderWorkspace(FOLDER_ID, { ...USER_OPEN, executionHostId: 'local' })
+    await gate.mock.results[0]?.value
+
+    expect(defaultChat.open).toHaveBeenCalledWith(FOLDER_KEY)
+    expect(tabCount(FOLDER_KEY)).toBe(0)
+  })
+
+  it('waits for the host agent list and lets no other reseed seed a shell meanwhile', async () => {
+    defaultChat.open.mockReturnValue({ primaryTabId: null })
+    defaultChat.awaitsDetection.mockReturnValue(true)
+    let finishDetection!: () => void
+    defaultChat.loadDetection.mockReturnValue(
+      new Promise<void>((resolve) => {
+        finishDetection = resolve
+      })
+    )
+    const worktree = makeWorktree()
+    seedEmptyActivatableWorktree(worktree)
+    const gate = useElectronActivationGate()
+
+    activateAndRevealWorktree(worktree.id, { ...USER_OPEN, notifyHostRuntime: false })
+    await gate.mock.results[0]?.value
+
+    expect(defaultChat.loadDetection).toHaveBeenCalledWith(worktree.id)
+    expect(isEmptyWorkspaceDefaultSurfacePending(worktree.id)).toBe(true)
+    reseedGatedEmptyWorkspace(worktree.id, {
+      callerProvidesSurface: false,
+      seedUserDefaultSurface: false
+    })
+    expect(tabCount(worktree.id)).toBe(0)
+    expect(defaultChat.open).not.toHaveBeenCalled()
+
+    finishDetection()
+    await flushPromises()
+
+    expect(isEmptyWorkspaceDefaultSurfacePending(worktree.id)).toBe(false)
+    expect(defaultChat.open).toHaveBeenCalledTimes(1)
+    expect(tabCount(worktree.id)).toBe(0)
+  })
+
+  // Why: the wait used to keep the first activation's intent, so returning to the workspace through
+  // history (no host id) failed the first intent's host check and left it with no surface at all.
+  it('seeds for the latest activation when the workspace is reopened during the wait', async () => {
+    defaultChat.open.mockReturnValue({ primaryTabId: null })
+    defaultChat.awaitsDetection.mockReturnValue(true)
+    let finishDetection!: () => void
+    defaultChat.loadDetection.mockReturnValue(
+      new Promise<void>((resolve) => {
+        finishDetection = resolve
+      })
+    )
+    const worktree = makeWorktree()
+    seedEmptyActivatableWorktree(worktree)
+    const gate = useElectronActivationGate()
+
+    activateAndRevealWorktree(worktree.id, {
+      ...USER_OPEN,
+      executionHostId: 'local',
+      notifyHostRuntime: false
+    })
+    await gate.mock.results[0]?.value
+    useAppStore.setState({ activeWorktreeId: 'repo-1::/elsewhere' })
+    activateAndRevealWorktree(worktree.id, { ...USER_OPEN, notifyHostRuntime: false })
+    await gate.mock.results[1]?.value
+    expect(useAppStore.getState().activeWorkspaceExecutionHostId).toBeNull()
+    finishDetection()
+    await flushPromises()
+
+    expect(defaultChat.loadDetection).toHaveBeenCalledTimes(1)
+    expect(isEmptyWorkspaceDefaultSurfacePending(worktree.id)).toBe(false)
+    expect(defaultChat.open).toHaveBeenCalledTimes(1)
+  })
+
+  it('seeds a shell when a plain activation follows the user open during the wait', async () => {
+    defaultChat.awaitsDetection.mockReturnValue(true)
+    let finishDetection!: () => void
+    defaultChat.loadDetection.mockReturnValue(
+      new Promise<void>((resolve) => {
+        finishDetection = resolve
+      })
+    )
+    const worktree = makeWorktree()
+    seedEmptyActivatableWorktree(worktree)
+    const gate = useElectronActivationGate()
+
+    activateAndRevealWorktree(worktree.id, { ...USER_OPEN, notifyHostRuntime: false })
+    await gate.mock.results[0]?.value
+    activateAndRevealWorktree(worktree.id, { notifyHostRuntime: false })
+    await gate.mock.results[1]?.value
+    expect(tabCount(worktree.id)).toBe(0)
+    finishDetection()
+    await flushPromises()
+
+    expect(defaultChat.open).not.toHaveBeenCalled()
+    expect(tabCount(worktree.id)).toBe(1)
+  })
+
+  it('re-checks the active workspace after the wait', async () => {
+    defaultChat.awaitsDetection.mockReturnValue(true)
+    let finishDetection!: () => void
+    defaultChat.loadDetection.mockReturnValue(
+      new Promise<void>((resolve) => {
+        finishDetection = resolve
+      })
+    )
+    const worktree = makeWorktree()
+    seedEmptyActivatableWorktree(worktree)
+    const gate = useElectronActivationGate()
+
+    activateAndRevealWorktree(worktree.id, { ...USER_OPEN, notifyHostRuntime: false })
+    await gate.mock.results[0]?.value
+    useAppStore.setState({ activeWorktreeId: 'repo-1::/elsewhere' })
+    finishDetection()
+    await flushPromises()
+
+    expect(isEmptyWorkspaceDefaultSurfacePending(worktree.id)).toBe(false)
+    expect(defaultChat.open).not.toHaveBeenCalled()
+    expect(tabCount(worktree.id)).toBe(0)
+  })
+
+  it('seeds the shell when detection fails', async () => {
+    defaultChat.open.mockReturnValue(null)
+    defaultChat.awaitsDetection.mockReturnValue(true)
+    defaultChat.loadDetection.mockRejectedValue(new Error('ssh probe failed'))
+    const worktree = makeWorktree()
+    seedEmptyActivatableWorktree(worktree)
+    const gate = useElectronActivationGate()
+
+    activateAndRevealWorktree(worktree.id, { ...USER_OPEN, notifyHostRuntime: false })
+    await gate.mock.results[0]?.value
+    await flushPromises()
+
+    expect(isEmptyWorkspaceDefaultSurfacePending(worktree.id)).toBe(false)
+    expect(tabCount(worktree.id)).toBe(1)
+  })
+})
diff --git a/src/renderer/src/lib/worktree-activation-default-tabs.test.ts b/src/renderer/src/lib/worktree-activation-default-tabs.test.ts
index 3b9909483402..a6e5e5136a85 100644
--- a/src/renderer/src/lib/worktree-activation-default-tabs.test.ts
+++ b/src/renderer/src/lib/worktree-activation-default-tabs.test.ts
@@ -21,8 +21,11 @@ describe('ensureWorktreeHasInitialTerminal', () => {
     expect(store.queueTabSetupSplit).not.toHaveBeenCalled()
   })
 
-  it('does not recreate a terminal after an explicit empty state was persisted', () => {
-    const store = createMockStore({ tabsByWorktree: { 'wt-1': [] } })
+  it('does not recreate a terminal after the user closed the last one', () => {
+    const store = createMockStore({
+      tabsByWorktree: { 'wt-1': [] },
+      closedTerminalTabTombstonesByTabId: { closed: { closedAt: Date.now(), worktreeId: 'wt-1' } }
+    })
 
     ensureWorktreeHasInitialTerminal(store, 'wt-1')
 
diff --git a/src/renderer/src/lib/worktree-activation-emptied-workspace-reseed.test.ts b/src/renderer/src/lib/worktree-activation-emptied-workspace-reseed.test.ts
index 4d2b43e26bd4..13cedba66df1 100644
--- a/src/renderer/src/lib/worktree-activation-emptied-workspace-reseed.test.ts
+++ b/src/renderer/src/lib/worktree-activation-emptied-workspace-reseed.test.ts
@@ -24,9 +24,12 @@ afterEach(() => {
 })
 
 /** The state a workspace lands in once its last terminal is closed: the row survives as an
- *  explicit empty list rather than disappearing. */
+ *  explicit empty list rather than disappearing, beside the close's record. */
 function seedClosedLastTerminal(worktreeId: string): void {
-  useAppStore.setState({ tabsByWorktree: { [worktreeId]: [] } })
+  useAppStore.setState({
+    tabsByWorktree: { [worktreeId]: [] },
+    closedTerminalTabTombstonesByTabId: { closed: { closedAt: Date.now(), worktreeId } }
+  })
   const { renderableTabCount } = useAppStore.getState().reconcileWorktreeTabModel(worktreeId)
   expect(renderableTabCount).toBe(0)
 }
diff --git a/src/renderer/src/lib/worktree-activation-gated-empty-reseed.ts b/src/renderer/src/lib/worktree-activation-gated-empty-reseed.ts
index bb597d10e6ea..2ab11bb14522 100644
--- a/src/renderer/src/lib/worktree-activation-gated-empty-reseed.ts
+++ b/src/renderer/src/lib/worktree-activation-gated-empty-reseed.ts
@@ -1,14 +1,20 @@
-import type { ExecutionHostId } from '../../../shared/execution-host'
 import {
   gateWorktreeAgentActivation,
   type WorktreeAgentActivationOutcome
 } from './worktree-agent-activation-gate'
-import { reseedGatedEmptyWorkspace } from './worktree-initial-terminal-seeding'
-
-type GatedEmptyWorkspaceReseedIntent = {
-  callerProvidesSurface: boolean
-  executionHostId?: ExecutionHostId
-}
+import {
+  reseedGatedEmptyWorkspace,
+  type GatedEmptyWorkspaceReseedIntent
+} from './worktree-initial-terminal-seeding'
+import {
+  emptyWorkspaceDefaultChatAwaitsDetection,
+  loadEmptyWorkspaceDefaultChatDetection
+} from './empty-workspace-default-agent-chat'
+import {
+  claimEmptyWorkspaceDefaultSurface,
+  isEmptyWorkspaceDefaultSurfacePending,
+  releaseEmptyWorkspaceDefaultSurface
+} from './empty-workspace-default-surface-claims'
 
 const latestReseedIntentByGate = new WeakMap<
   Promise<WorktreeAgentActivationOutcome>,
@@ -17,22 +23,36 @@ const latestReseedIntentByGate = new WeakMap<
 
 export function gateAndReseedEmptyWorkspace(
   workspaceKey: string,
-  callerProvidesSurface: boolean,
-  executionHostId?: ExecutionHostId
+  intent: GatedEmptyWorkspaceReseedIntent
 ): void {
   const gate = gateWorktreeAgentActivation(workspaceKey)
-  const intent: GatedEmptyWorkspaceReseedIntent = {
-    callerProvidesSurface,
-    ...(executionHostId ? { executionHostId } : {})
-  }
   latestReseedIntentByGate.set(gate, intent)
   void gate.then((outcome) => {
     if (latestReseedIntentByGate.get(gate) !== intent) {
       return
     }
     latestReseedIntentByGate.delete(gate)
-    if (outcome === 'empty') {
-      reseedGatedEmptyWorkspace(workspaceKey, intent.callerProvidesSurface, intent.executionHostId)
+    if (outcome !== 'empty') {
+      return
+    }
+    const awaitsDetection =
+      intent.seedUserDefaultSurface && emptyWorkspaceDefaultChatAwaitsDetection(workspaceKey)
+    if (!awaitsDetection && !isEmptyWorkspaceDefaultSurfacePending(workspaceKey)) {
+      reseedGatedEmptyWorkspace(workspaceKey, intent)
+      return
+    }
+    // Why: the default agent depends on the host's list; seeding before it loads locks in a shell.
+    // A wait already pending takes this later intent instead, so the latest activation wins.
+    if (!claimEmptyWorkspaceDefaultSurface(workspaceKey, intent)) {
+      return
+    }
+    const settle = (): void => {
+      const latestIntent = releaseEmptyWorkspaceDefaultSurface(workspaceKey)
+      // Re-checks the active workspace, host, and emptiness the wait may have changed.
+      if (latestIntent) {
+        reseedGatedEmptyWorkspace(workspaceKey, latestIntent)
+      }
     }
+    void loadEmptyWorkspaceDefaultChatDetection(workspaceKey).then(settle, settle)
   })
 }
diff --git a/src/renderer/src/lib/worktree-activation-nav-registration.ts b/src/renderer/src/lib/worktree-activation-nav-registration.ts
index 11a0af533292..46ab7f30c632 100644
--- a/src/renderer/src/lib/worktree-activation-nav-registration.ts
+++ b/src/renderer/src/lib/worktree-activation-nav-registration.ts
@@ -4,13 +4,14 @@ import {
 } from '@/store/slices/worktree-nav-history'
 import type { WorktreeNavHistoryViewEntry } from '@/store/slices/worktree-nav-history'
 
-type ActivateFn = (worktreeId: string) => unknown
+type ActivateFn = (worktreeId: string, opts: { navigationIntent: 'user-open' }) => unknown
 type ViewActivateFn = (entry: WorktreeNavHistoryViewEntry) => void
 
 export function registerWorktreeActivation(
   activate: ActivateFn,
   activateView: ViewActivateFn
 ): void {
-  setWorktreeNavActivator(activate)
+  // Why: back/forward is the user reopening a workspace they chose, like a sidebar click.
+  setWorktreeNavActivator((worktreeId) => activate(worktreeId, { navigationIntent: 'user-open' }))
   setWorktreeNavViewActivator(activateView)
 }
diff --git a/src/renderer/src/lib/worktree-activation-store-contract.ts b/src/renderer/src/lib/worktree-activation-store-contract.ts
index 63ce180ffed9..66de89e85e35 100644
--- a/src/renderer/src/lib/worktree-activation-store-contract.ts
+++ b/src/renderer/src/lib/worktree-activation-store-contract.ts
@@ -8,9 +8,11 @@ import type {
 } from '../../../shared/agent-session-resume'
 import type { WorktreeRuntimeOwnerState } from '@/lib/worktree-runtime-owner'
 import type { AgentStartedTelemetry } from '@/lib/worktree-startup-payload'
+import type { ClosedTerminalTabTombstonesByTabId } from '../../../shared/closed-terminal-tab-tombstones'
 
 export type WorktreeActivationStore = Partial<WorktreeRuntimeOwnerState> & {
   tabsByWorktree: Record<string, { id: string }[]>
+  closedTerminalTabTombstonesByTabId?: ClosedTerminalTabTombstonesByTabId
   defaultTerminalTabsAppliedByWorktreeId: Record<string, true>
   createTab: (
     worktreeId: string,
@@ -75,4 +77,7 @@ export type InitialTerminalOptions = {
    *  Setup/issue work still runs, but work that needs no host terminal must not seed a shell
    *  beside the chat the caller is about to create. */
   callerProvidesSurface?: boolean
+  /** The user deliberately opened this workspace with no surface choice, so it may open their
+   *  default agent chat instead of a bare shell. */
+  seedUserDefaultSurface?: boolean
 }
diff --git a/src/renderer/src/lib/worktree-activation-surface-selection.ts b/src/renderer/src/lib/worktree-activation-surface-selection.ts
index 4385994ff94d..9b78a23cd09a 100644
--- a/src/renderer/src/lib/worktree-activation-surface-selection.ts
+++ b/src/renderer/src/lib/worktree-activation-surface-selection.ts
@@ -13,6 +13,8 @@ export type WorktreeActivationSurfaceSelection = {
   agent?: TuiAgent | null
   /** A navigation caller is about to open its own editor, diff, or other non-terminal surface. */
   providesInitialSurface?: boolean
+  /** Set only where the user deliberately opened this existing workspace; absent keeps the shell seed. */
+  navigationIntent?: 'user-open'
 }
 
 export type WorktreeActivationOptions = WorktreeActivationSurfaceSelection & {
@@ -38,3 +40,14 @@ export function activationProvidesInitialSurface(
 ): boolean {
   return selection?.providesInitialSurface === true || selection?.agent != null
 }
+
+/** A deliberate user open with no surface choice: an empty workspace gets the user's default surface. */
+export function activationSeedsUserDefaultSurface(
+  selection?: WorktreeActivationSurfaceSelection
+): boolean {
+  return (
+    selection?.navigationIntent === 'user-open' &&
+    selection.agent === undefined &&
+    selection.providesInitialSurface !== true
+  )
+}
diff --git a/src/renderer/src/lib/worktree-activation.ts b/src/renderer/src/lib/worktree-activation.ts
index f2e2ac8f85a9..f63b1189097d 100644
--- a/src/renderer/src/lib/worktree-activation.ts
+++ b/src/renderer/src/lib/worktree-activation.ts
@@ -28,6 +28,7 @@ import { ensureWebRuntimeWorktreeTerminalAfterWake } from '@/lib/web-runtime-wor
 import { applyWorktreeNavViewEntry } from '@/lib/worktree-nav-view-history-replay'
 import {
   activationProvidesInitialSurface,
+  activationSeedsUserDefaultSurface,
   type WorktreeActivationOptions,
   type WorktreeActivationSurfaceSelection
 } from './worktree-activation-surface-selection'
@@ -47,7 +48,8 @@ export type ActivateAndRevealResult = {
 function ensureFolderWorkspaceInitialTerminal(
   folderWorkspace: FolderWorkspace,
   startup?: WorktreeStartupPayload,
-  providesInitialSurface?: boolean
+  providesInitialSurface?: boolean,
+  seedUserDefaultSurface?: boolean
 ): string | null {
   if (providesInitialSurface === true && startup === undefined) {
     return null
@@ -61,7 +63,10 @@ function ensureFolderWorkspaceInitialTerminal(
     undefined,
     undefined,
     undefined,
-    { reseedEmptiedWorkspace: providesInitialSurface !== true }
+    {
+      reseedEmptiedWorkspace: providesInitialSurface !== true,
+      ...(seedUserDefaultSurface ? { seedUserDefaultSurface: true } : {})
+    }
   )
   return primaryTabId
 }
@@ -128,6 +133,7 @@ export function activateAndRevealFolderWorkspace(
 
   const workspaceKey = folderWorkspaceKey(folderWorkspaceId)
   const providesInitialSurface = activationProvidesInitialSurface(opts)
+  const seedUserDefaultSurface = activationSeedsUserDefaultSurface(opts)
   state.markWorktreeVisited(workspaceKey)
   if (!state.isNavigatingHistory) {
     state.recordWorktreeVisit(workspaceKey)
@@ -144,15 +150,20 @@ export function activateAndRevealFolderWorkspace(
     resumeSleepingAgentSessionsForWorktree(workspaceKey)
   }
   if (shouldGateAgentActivation) {
-    gateAndReseedEmptyWorkspace(
-      workspaceKey,
-      opts?.providesInitialSurface === true,
-      opts?.executionHostId
-    )
+    gateAndReseedEmptyWorkspace(workspaceKey, {
+      callerProvidesSurface: opts?.providesInitialSurface === true,
+      seedUserDefaultSurface,
+      ...(opts?.executionHostId ? { executionHostId: opts.executionHostId } : {})
+    })
   }
   const primaryTabId = shouldGateAgentActivation
     ? null
-    : ensureFolderWorkspaceInitialTerminal(folderWorkspace, opts?.startup, providesInitialSurface)
+    : ensureFolderWorkspaceInitialTerminal(
+        folderWorkspace,
+        opts?.startup,
+        providesInitialSurface,
+        seedUserDefaultSurface
+      )
 
   if (opts?.revealInSidebar !== false) {
     state.revealWorktreeInSidebar(
@@ -185,6 +196,7 @@ export function activateAndRevealWorktree(
     opts?.startup || opts?.setup || opts?.defaultTabs || opts?.issueCommand
   )
   const providesInitialSurface = activationProvidesInitialSurface(opts)
+  const seedUserDefaultSurface = activationSeedsUserDefaultSurface(opts)
   // Why: a plain reselect should still reveal the sidebar row but must not restamp focus recency or wake persistence.
   const isPlainAlreadyActiveTerminal =
     !hasActivationWork &&
@@ -243,11 +255,11 @@ export function activateAndRevealWorktree(
     resumeSleepingAgentSessionsForWorktree(worktreeId)
   }
   if (shouldGateAgentActivation) {
-    gateAndReseedEmptyWorkspace(
-      worktreeId,
-      opts?.providesInitialSurface === true,
-      opts?.executionHostId
-    )
+    gateAndReseedEmptyWorkspace(worktreeId, {
+      callerProvidesSurface: opts?.providesInitialSurface === true,
+      seedUserDefaultSurface,
+      ...(opts?.executionHostId ? { executionHostId: opts.executionHostId } : {})
+    })
   }
 
   // 4. Ensure a focusable surface exists for externally-created worktrees
@@ -266,6 +278,7 @@ export function activateAndRevealWorktree(
             ...(opts?.backendStartupTerminalSpawned ? { backendStartupTerminalSpawned: true } : {}),
             ...(opts?.createNewTerminalForStartup ? { createNewTerminalForStartup: true } : {}),
             ...(providesInitialSurface ? { callerProvidesSurface: true } : {}),
+            ...(seedUserDefaultSurface ? { seedUserDefaultSurface: true } : {}),
             reseedEmptiedWorkspace: !providesInitialSurface
           }
         )
diff --git a/src/renderer/src/lib/worktree-creation-flow-agent-trust-preflight.test.ts b/src/renderer/src/lib/worktree-creation-flow-agent-trust-preflight.test.ts
deleted file mode 100644
index 2a960761900e..000000000000
--- a/src/renderer/src/lib/worktree-creation-flow-agent-trust-preflight.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const FLOW_SOURCE = readFileSync(join(__dirname, 'worktree-creation-flow-execute.ts'), 'utf8')
-const PREFLIGHT_SOURCE = readFileSync(join(__dirname, 'agent-trust-preflight.ts'), 'utf8')
-
-function sourceBetween(source: string, startPattern: string, endPattern: string): string {
-  const start = source.indexOf(startPattern)
-  expect(start).toBeGreaterThanOrEqual(0)
-  const end = source.indexOf(endPattern, start + startPattern.length)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('worktree creation flow agent trust preflight', () => {
-  it('forwards the repo SSH connection id when pre-marking terminal agent trust', () => {
-    const preflight = PREFLIGHT_SOURCE
-    const createFlow = sourceBetween(
-      FLOW_SOURCE,
-      'const backendSpawned = result.startupTerminal?.spawned === true',
-      '// `createWorktree` already inserted the real worktree row'
-    )
-
-    expect(preflight).toContain('connectionId?: string | null')
-    expect(preflight).toContain('...(args.connectionId ? { connectionId: args.connectionId } : {})')
-    expect(createFlow).toContain('repoConnectionId')
-    expect(createFlow).toContain('repo.id === worktree.repoId')
-    expect(createFlow).toContain('await preflightAgentTrust({')
-    expect(createFlow).toContain('connectionId: repoConnectionId')
-  })
-})
diff --git a/src/renderer/src/lib/worktree-host-connection-phase.test.ts b/src/renderer/src/lib/worktree-host-connection-phase.test.ts
new file mode 100644
index 000000000000..ab7b3cdeeb7d
--- /dev/null
+++ b/src/renderer/src/lib/worktree-host-connection-phase.test.ts
@@ -0,0 +1,227 @@
+import { describe, expect, it } from 'vitest'
+import type { AppState } from '@/store/types'
+import type { SshConnectionStatus } from '../../../shared/ssh-types'
+import { selectWorktreeHostConnectionPhase } from './worktree-host-connection-phase'
+
+function makeState(overrides: Record<string, unknown>): AppState {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the phase selector reads only the repo, worktree, runtime, and SSH fields set here.
+  return {
+    activeWorktreeId: null,
+    detectedWorktreesByRepo: {},
+    folderWorkspaces: [],
+    projectGroups: [],
+    removedSshTargetLabels: new Map(),
+    repos: [],
+    runtimeStatusByEnvironmentId: new Map(),
+    sshConnectionStates: new Map(),
+    sshStateByEnvironment: new Map(),
+    sshTargetLabels: new Map(),
+    sshTargetsHydrated: true,
+    terminalStartupRestorationReady: true,
+    worktreesByRepo: {},
+    ...overrides
+  } as unknown as AppState
+}
+
+function makeSshState(
+  status: SshConnectionStatus | null,
+  overrides: Record<string, unknown> = {}
+): AppState {
+  return makeState({
+    repos: [{ id: 'repo-ssh', connectionId: 'ssh-a' }],
+    sshConnectionStates: new Map(
+      status
+        ? [
+            [
+              'ssh-a',
+              {
+                targetId: 'ssh-a',
+                status,
+                error: null,
+                reconnectAttempt: 0,
+                connectionGeneration: 7
+              }
+            ]
+          ]
+        : []
+    ),
+    worktreesByRepo: { 'repo-ssh': [{ id: 'wt-ssh', repoId: 'repo-ssh' }] },
+    ...overrides
+  })
+}
+
+describe('selectWorktreeHostConnectionPhase', () => {
+  it('reports a local workspace, and no worktree, as local', () => {
+    const state = makeState({
+      repos: [{ id: 'repo-local' }],
+      worktreesByRepo: { 'repo-local': [{ id: 'wt-local', repoId: 'repo-local' }] }
+    })
+
+    const local = {
+      phase: 'local',
+      targetId: null,
+      environmentId: null,
+      publishedStatus: null,
+      connectedEpoch: null
+    }
+    expect(selectWorktreeHostConnectionPhase(state, 'wt-local')).toEqual(local)
+    expect(selectWorktreeHostConnectionPhase(state, null)).toEqual(local)
+  })
+
+  it('reports a runtime-owned target as local: this client never dials it', () => {
+    const state = makeState({
+      repos: [{ id: 'repo-ephemeral', connectionId: 'runtime-ssh-vm-a' }],
+      worktreesByRepo: { 'repo-ephemeral': [{ id: 'wt-ephemeral', repoId: 'repo-ephemeral' }] }
+    })
+
+    expect(selectWorktreeHostConnectionPhase(state, 'wt-ephemeral').phase).toBe('local')
+  })
+
+  it('reads an unpublished target as connecting only until startup restoration finishes', () => {
+    expect(
+      selectWorktreeHostConnectionPhase(
+        makeSshState(null, { terminalStartupRestorationReady: false }),
+        'wt-ssh'
+      )
+    ).toMatchObject({ phase: 'connecting', targetId: 'ssh-a', publishedStatus: 'disconnected' })
+    expect(selectWorktreeHostConnectionPhase(makeSshState(null), 'wt-ssh')).toMatchObject({
+      phase: 'unavailable',
+      targetId: 'ssh-a',
+      publishedStatus: 'disconnected'
+    })
+  })
+
+  it('maps published statuses; only a connected host names its connection', () => {
+    expect(selectWorktreeHostConnectionPhase(makeSshState('connecting'), 'wt-ssh')).toEqual({
+      phase: 'connecting',
+      targetId: 'ssh-a',
+      environmentId: null,
+      publishedStatus: 'connecting',
+      connectedEpoch: null
+    })
+    expect(selectWorktreeHostConnectionPhase(makeSshState('reconnecting'), 'wt-ssh').phase).toBe(
+      'connecting'
+    )
+    expect(selectWorktreeHostConnectionPhase(makeSshState('deploying-relay'), 'wt-ssh').phase).toBe(
+      'connecting'
+    )
+    expect(selectWorktreeHostConnectionPhase(makeSshState('connected'), 'wt-ssh')).toEqual({
+      phase: 'connected',
+      targetId: 'ssh-a',
+      environmentId: null,
+      publishedStatus: 'connected',
+      connectedEpoch: 'ssh-a:7'
+    })
+  })
+
+  it('reports failed and disconnected targets as unavailable once restoration is done', () => {
+    for (const status of ['reconnection-failed', 'disconnected', 'auth-failed', 'error'] as const) {
+      expect(selectWorktreeHostConnectionPhase(makeSshState(status), 'wt-ssh').phase).toBe(
+        'unavailable'
+      )
+    }
+  })
+
+  it('keeps a published failure unavailable even before restoration finishes', () => {
+    expect(
+      selectWorktreeHostConnectionPhase(
+        makeSshState('auth-failed', { terminalStartupRestorationReady: false }),
+        'wt-ssh'
+      ).phase
+    ).toBe('unavailable')
+  })
+
+  it("reads a runtime environment's nested target from that environment's SSH state", () => {
+    const state = makeState({
+      repos: [{ id: 'repo-runtime', connectionId: 'ssh-nested', executionHostId: 'runtime:env-a' }],
+      runtimeStatusByEnvironmentId: new Map([
+        ['env-a', { status: { runtimeId: 'runtime-a' }, checkedAt: 1 }]
+      ]),
+      sshStateByEnvironment: new Map([
+        [
+          'env-a',
+          {
+            connectionStates: new Map([
+              [
+                'ssh-nested',
+                {
+                  targetId: 'ssh-nested',
+                  status: 'connected',
+                  error: null,
+                  reconnectAttempt: 0,
+                  connectionGeneration: 3
+                }
+              ]
+            ]),
+            targetLabels: new Map([['ssh-nested', 'build box']]),
+            removedTargetLabels: new Map(),
+            targetsHydrated: true
+          }
+        ]
+      ]),
+      terminalStartupRestorationReady: false,
+      worktreesByRepo: {
+        'repo-runtime': [
+          {
+            id: 'wt-runtime',
+            repoId: 'repo-runtime',
+            hostId: 'runtime:env-a',
+            runtimeOwnerEnvironmentId: 'env-a'
+          }
+        ]
+      }
+    })
+
+    expect(selectWorktreeHostConnectionPhase(state, 'wt-runtime')).toEqual({
+      phase: 'connected',
+      targetId: 'ssh-nested',
+      environmentId: 'env-a',
+      publishedStatus: 'connected',
+      connectedEpoch: 'ssh-nested:3'
+    })
+  })
+
+  it('names a new connection on every reconnect', () => {
+    const connected = makeSshState('connected')
+    const reconnected = makeSshState('connected', {
+      sshConnectionStates: new Map([
+        [
+          'ssh-a',
+          {
+            targetId: 'ssh-a',
+            status: 'connected',
+            error: null,
+            reconnectAttempt: 0,
+            connectionGeneration: 8
+          }
+        ]
+      ])
+    })
+
+    expect(selectWorktreeHostConnectionPhase(reconnected, 'wt-ssh').connectedEpoch).not.toBe(
+      selectWorktreeHostConnectionPhase(connected, 'wt-ssh').connectedEpoch
+    )
+  })
+
+  it('reports a nested target whose runtime is unreachable as unverifiable, not down', () => {
+    const state = makeState({
+      repos: [{ id: 'repo-runtime', connectionId: 'ssh-nested', executionHostId: 'runtime:env-a' }],
+      worktreesByRepo: {
+        'repo-runtime': [
+          {
+            id: 'wt-runtime',
+            repoId: 'repo-runtime',
+            hostId: 'runtime:env-a',
+            runtimeOwnerEnvironmentId: 'env-a'
+          }
+        ]
+      }
+    })
+
+    expect(selectWorktreeHostConnectionPhase(state, 'wt-runtime')).toMatchObject({
+      phase: 'unverifiable',
+      targetId: 'ssh-nested',
+      publishedStatus: null
+    })
+  })
+})
diff --git a/src/renderer/src/lib/worktree-host-connection-phase.ts b/src/renderer/src/lib/worktree-host-connection-phase.ts
new file mode 100644
index 000000000000..8a0d39d4b1cf
--- /dev/null
+++ b/src/renderer/src/lib/worktree-host-connection-phase.ts
@@ -0,0 +1,119 @@
+import { useShallow } from 'zustand/react/shallow'
+import { useAppStore } from '@/store'
+import type { AppState } from '@/store/types'
+import { getConnectionIdFromState } from '@/lib/connection-context'
+import { getExplicitRuntimeEnvironmentIdForWorktree } from '@/lib/worktree-runtime-owner'
+import {
+  selectRuntimeAwareSshConnectionGeneration,
+  selectRuntimeAwareSshStatus
+} from '@/store/slices/runtime-environment-ssh'
+import { isConnectingSshStatus } from '@/ssh/ssh-connection-recoverability'
+import type { SshConnectionStatus } from '../../../shared/ssh-types'
+import { isRuntimeOwnedSshTargetId } from '../../../shared/execution-host'
+
+/**
+ * `local`: no SSH target this client dials for the worktree — a local workspace, a
+ * runtime-owned target, or an owner that has not resolved yet.
+ * `unverifiable`: the owning remote runtime is unreachable or has not published its SSH
+ * state, so this client cannot see the target — not evidence that it is down.
+ */
+export type WorktreeHostConnectionPhase =
+  | 'local'
+  | 'connecting'
+  | 'connected'
+  | 'unavailable'
+  | 'unverifiable'
+
+export type WorktreeHostConnection = {
+  phase: WorktreeHostConnectionPhase
+  targetId: string | null
+  /** The remote runtime whose mirrored SSH state owns the target; null for this client's own. */
+  environmentId: string | null
+  /**
+   * The status as published, before `phase` reads an undialed startup target as connecting.
+   * Surfaces that name the status itself (the terminal's reconnect overlay) read this; null
+   * when local or unverifiable.
+   */
+  publishedStatus: SshConnectionStatus | null
+  /** Names the live connection: null unless connected, and new on every reconnect. */
+  connectedEpoch: string | null
+}
+
+const LOCAL_HOST_CONNECTION: WorktreeHostConnection = {
+  phase: 'local',
+  targetId: null,
+  environmentId: null,
+  publishedStatus: null,
+  connectedEpoch: null
+}
+
+function derivePhase(
+  state: AppState,
+  targetId: string,
+  environmentId: string | null,
+  publishedStatus: SshConnectionStatus | null
+): WorktreeHostConnectionPhase {
+  if (publishedStatus === null) {
+    return 'unverifiable'
+  }
+  if (publishedStatus === 'connected') {
+    return 'connected'
+  }
+  if (isConnectingSshStatus(publishedStatus)) {
+    return 'connecting'
+  }
+  // Why: startup restoration dials the targets that were live at shutdown; until it publishes,
+  // a missing entry means "not dialed yet", not "disconnected". Restoration finishing (or
+  // degrading) ends this on its own.
+  if (
+    environmentId === null &&
+    !state.terminalStartupRestorationReady &&
+    !state.sshConnectionStates.has(targetId)
+  ) {
+    return 'connecting'
+  }
+  return 'unavailable'
+}
+
+/** The shared signal for a caller that already resolved the worktree's connection id. */
+export function resolveWorktreeHostConnection(
+  state: AppState,
+  worktreeId: string,
+  targetId: string | null | undefined
+): WorktreeHostConnection {
+  if (!targetId || isRuntimeOwnedSshTargetId(targetId)) {
+    return LOCAL_HOST_CONNECTION
+  }
+  const environmentId = getExplicitRuntimeEnvironmentIdForWorktree(state, worktreeId)
+  const publishedStatus = selectRuntimeAwareSshStatus(state, environmentId, targetId)
+  const generation = selectRuntimeAwareSshConnectionGeneration(state, environmentId, targetId)
+  return {
+    phase: derivePhase(state, targetId, environmentId, publishedStatus),
+    targetId,
+    environmentId,
+    publishedStatus,
+    connectedEpoch: publishedStatus === 'connected' ? `${targetId}:${generation ?? ''}` : null
+  }
+}
+
+/**
+ * The one reading of a worktree's SSH host that every pane shares, derived from the
+ * published SSH state. Panes must not re-derive status or reconnect identity themselves.
+ */
+export function selectWorktreeHostConnectionPhase(
+  state: AppState,
+  worktreeId: string | null
+): WorktreeHostConnection {
+  if (!worktreeId) {
+    return LOCAL_HOST_CONNECTION
+  }
+  return resolveWorktreeHostConnection(
+    state,
+    worktreeId,
+    getConnectionIdFromState(state, worktreeId)
+  )
+}
+
+export function useWorktreeHostConnection(worktreeId: string | null): WorktreeHostConnection {
+  return useAppStore(useShallow((state) => selectWorktreeHostConnectionPhase(state, worktreeId)))
+}
diff --git a/src/renderer/src/lib/worktree-initial-terminal-close-records.test.ts b/src/renderer/src/lib/worktree-initial-terminal-close-records.test.ts
new file mode 100644
index 000000000000..cd563d9cbe74
--- /dev/null
+++ b/src/renderer/src/lib/worktree-initial-terminal-close-records.test.ts
@@ -0,0 +1,70 @@
+import { describe, expect, it } from 'vitest'
+import { ensureWorktreeHasInitialTerminal } from './worktree-initial-terminal-seeding'
+import {
+  createMockStore,
+  registerWorktreeActivationReset
+} from './worktree-activation-test-harness'
+import {
+  CLOSED_TERMINAL_TAB_TOMBSTONE_TTL_MS,
+  MAX_CLOSED_TERMINAL_TAB_TOMBSTONES,
+  recordClosedTerminalTabTombstone,
+  type ClosedTerminalTabTombstonesByTabId
+} from '../../../shared/closed-terminal-tab-tombstones'
+
+registerWorktreeActivationReset()
+
+const WT = 'wt-1'
+
+/** Startup hydration's seeding decision: no reseed opt-in, so only the row and records decide. */
+function seeds(
+  tabsByWorktree: Record<string, { id: string }[]>,
+  closedTerminalTabTombstonesByTabId?: ClosedTerminalTabTombstonesByTabId,
+  opts?: { reseedEmptiedWorkspace?: boolean }
+): boolean {
+  const store = createMockStore({ tabsByWorktree, closedTerminalTabTombstonesByTabId })
+  ensureWorktreeHasInitialTerminal(store, WT, undefined, undefined, undefined, undefined, opts)
+  return store.createTab.mock.calls.length > 0
+}
+
+function closedAt(closedAtMs: number): ClosedTerminalTabTombstonesByTabId {
+  return { 'closed-tab': { closedAt: closedAtMs, worktreeId: WT, reason: 'user' } }
+}
+
+describe('seeding an empty workspace reads close records', () => {
+  it('an empty row with a close record stays empty', () => {
+    expect(seeds({ [WT]: [] }, closedAt(Date.now()))).toBe(false)
+  })
+
+  it('a legacy empty row with no record seeds', () => {
+    expect(seeds({ [WT]: [] })).toBe(true)
+  })
+
+  it('an empty row whose only record is past its TTL seeds', () => {
+    expect(
+      seeds({ [WT]: [] }, closedAt(Date.now() - CLOSED_TERMINAL_TAB_TOMBSTONE_TTL_MS - 1))
+    ).toBe(true)
+  })
+
+  it('an empty row whose record the per-host cap evicted seeds', () => {
+    const now = Date.now()
+    let records = closedAt(now - 1_000)
+    for (let index = 0; index < MAX_CLOSED_TERMINAL_TAB_TOMBSTONES; index += 1) {
+      records = recordClosedTerminalTabTombstone(
+        records,
+        `other-${index}`,
+        { worktreeId: 'wt-other', reason: 'user' },
+        now
+      )
+    }
+    expect(records['closed-tab']).toBeUndefined()
+    expect(seeds({ [WT]: [] }, records)).toBe(true)
+  })
+
+  // Known weakness until every membership shrink is a close: an older close plus an empty row
+  // written by something that is not a close still reads as emptied on purpose.
+  it('a stale record from an earlier close suppresses the startup seed; activation reseeds', () => {
+    const earlierClose = closedAt(Date.now() - 60_000)
+    expect(seeds({ [WT]: [] }, earlierClose)).toBe(false)
+    expect(seeds({ [WT]: [] }, earlierClose, { reseedEmptiedWorkspace: true })).toBe(true)
+  })
+})
diff --git a/src/renderer/src/lib/worktree-initial-terminal-seeding.ts b/src/renderer/src/lib/worktree-initial-terminal-seeding.ts
index f9c2844d4721..feb01ef0b9b5 100644
--- a/src/renderer/src/lib/worktree-initial-terminal-seeding.ts
+++ b/src/renderer/src/lib/worktree-initial-terminal-seeding.ts
@@ -4,6 +4,7 @@ import type {
 } from '../../../shared/worktree/launch-types'
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import { shouldAutoCreateInitialTerminal } from '@/components/terminal/initial-terminal'
+import { isTerminalWorkspaceEmptiedOnPurpose } from '../../../shared/closed-terminal-tab-tombstones'
 import { createSequencedSetupAgentCommands } from '../../../shared/setup-agent-sequencing'
 import { getSetupRunnerCommandPlatformForPath } from '../../../shared/setup-runner-command'
 import { agentKindToTuiAgent } from '../../../shared/agent-kind'
@@ -28,6 +29,8 @@ import {
   type IssueCommandLaunch
 } from '@/lib/worktree-setup-issue-command-queue'
 import { applyDefaultTerminalTabs } from '@/lib/worktree-default-terminal-tabs'
+import { openDefaultAgentChatInEmptyWorkspace } from '@/lib/empty-workspace-default-agent-chat'
+import { isEmptyWorkspaceDefaultSurfacePending } from '@/lib/empty-workspace-default-surface-claims'
 
 function getSetupRunnerCommandPlatformForLaunch(setup: WorktreeSetupLaunch): 'windows' | 'posix' {
   return getSetupRunnerCommandPlatformForPath(
@@ -36,15 +39,22 @@ function getSetupRunnerCommandPlatformForLaunch(setup: WorktreeSetupLaunch): 'wi
   )
 }
 
+export type GatedEmptyWorkspaceReseedIntent = {
+  callerProvidesSurface: boolean
+  seedUserDefaultSurface: boolean
+  executionHostId?: ExecutionHostId
+}
+
 /** Re-seed after an empty gate unless its activation owns the surface or no longer owns the host. */
 export function reseedGatedEmptyWorkspace(
   workspaceKey: string,
-  callerProvidesSurface: boolean,
-  executionHostId?: ExecutionHostId
+  intent: GatedEmptyWorkspaceReseedIntent
 ): void {
+  const { callerProvidesSurface, seedUserDefaultSurface, executionHostId } = intent
   const state = useAppStore.getState()
   if (
     callerProvidesSurface === true ||
+    isEmptyWorkspaceDefaultSurfacePending(workspaceKey) ||
     state.activeWorktreeId !== workspaceKey ||
     (executionHostId !== undefined && state.activeWorkspaceExecutionHostId !== executionHostId)
   ) {
@@ -58,7 +68,8 @@ export function reseedGatedEmptyWorkspace(
     undefined,
     undefined,
     {
-      reseedEmptiedWorkspace: true
+      reseedEmptiedWorkspace: true,
+      ...(seedUserDefaultSurface ? { seedUserDefaultSurface: true } : {})
     }
   )
 }
@@ -174,7 +185,7 @@ export function ensureWorktreeHasInitialTerminal(
   // terminal is added; and closeTabPreservingPty (use-terminal-pane-lifecycle.ts) skips both
   // deactivation hooks for pane moves and retirement, where re-seeding is the wanted outcome.
   const shouldHonourClosedTerminalTombstone =
-    Object.hasOwn(store.tabsByWorktree, worktreeId) && opts?.reseedEmptiedWorkspace !== true
+    isTerminalWorkspaceEmptiedOnPurpose(store, worktreeId) && opts?.reseedEmptiedWorkspace !== true
   // Why: an execution host that has not answered is not a host with no terminals; seeding into that
   // gap is what adds a tab per launch (STA-4658). Explicit launch work below is a request to create
   // a terminal now, so it stays ungated.
@@ -215,6 +226,16 @@ export function ensureWorktreeHasInitialTerminal(
   if (templatedTabId) {
     return templatedTabId
   }
+  if (
+    opts?.seedUserDefaultSurface === true &&
+    !hasExplicitLaunchWork &&
+    opts.activateCreatedTabs !== false
+  ) {
+    const defaultChat = openDefaultAgentChatInEmptyWorkspace(worktreeId)
+    if (defaultChat) {
+      return defaultChat.primaryTabId
+    }
+  }
 
   // Why: tag this activation-created tab so its PTY spawn doesn't count as activity and reshuffle the Recent sort.
   // Why: stamp the seeded agent before hooks arrive so native chat and provider chrome can resolve it immediately.
diff --git a/src/renderer/src/lib/worktree-jump-navigation.test.ts b/src/renderer/src/lib/worktree-jump-navigation.test.ts
index 4c76316556c9..af8072ac9c46 100644
--- a/src/renderer/src/lib/worktree-jump-navigation.test.ts
+++ b/src/renderer/src/lib/worktree-jump-navigation.test.ts
@@ -57,7 +57,9 @@ describe('worktree jump navigation', () => {
 
     expect(mocks.worktreePassesSidebarFilters).not.toHaveBeenCalled()
     expect(mocks.warning).not.toHaveBeenCalled()
-    expect(mocks.activateAndRevealWorkspace).toHaveBeenCalledWith('repo::/deleted', {})
+    expect(mocks.activateAndRevealWorkspace).toHaveBeenCalledWith('repo::/deleted', {
+      navigationIntent: 'user-open'
+    })
   })
 
   it('switches the left sidebar to Spaces and warns when filters hide the target', () => {
@@ -67,6 +69,7 @@ describe('worktree jump navigation', () => {
 
     expect(state.setSidebarBody).toHaveBeenCalledWith('workspaces')
     expect(mocks.activateAndRevealWorkspace).toHaveBeenCalledWith('repo::/target', {
+      navigationIntent: 'user-open',
       revealInSidebar: false,
       clearSidebarFilters: false
     })
@@ -98,7 +101,9 @@ describe('worktree jump navigation', () => {
 
     expect(jumpToWorktreeFromSidebar('wt-collapsed')).toBe(true)
 
-    expect(mocks.activateAndRevealWorkspace).toHaveBeenCalledWith('wt-collapsed', {})
+    expect(mocks.activateAndRevealWorkspace).toHaveBeenCalledWith('wt-collapsed', {
+      navigationIntent: 'user-open'
+    })
     expect(mocks.warning).not.toHaveBeenCalled()
   })
 
@@ -121,6 +126,7 @@ describe('worktree jump navigation', () => {
     expect(jumpToWorktreeFromSidebar('repo::/target', { executionHostId: 'ssh:beta' })).toBe(true)
 
     expect(mocks.activateAndRevealWorkspace).toHaveBeenCalledWith('repo::/target', {
+      navigationIntent: 'user-open',
       revealInSidebar: false,
       clearSidebarFilters: false,
       executionHostId: 'ssh:beta'
@@ -134,6 +140,7 @@ describe('worktree jump navigation', () => {
     expect(jumpToWorktreeFromSidebar('folder:folder-1', { executionHostId: 'local' })).toBe(true)
 
     expect(mocks.activateAndRevealWorkspace).toHaveBeenCalledWith('folder:folder-1', {
+      navigationIntent: 'user-open',
       executionHostId: 'local'
     })
     // Folder workspaces never get the filter-hidden treatment.
diff --git a/src/renderer/src/lib/worktree-jump-navigation.ts b/src/renderer/src/lib/worktree-jump-navigation.ts
index bfc0d6dd9364..38721b3337bc 100644
--- a/src/renderer/src/lib/worktree-jump-navigation.ts
+++ b/src/renderer/src/lib/worktree-jump-navigation.ts
@@ -60,6 +60,7 @@ export function jumpToWorktreeFromSidebar(
 
   // Why the workspace dispatcher: it owns the folder-vs-worktree split and the folder path-status gate.
   const activated = activateAndRevealWorkspace(worktreeId, {
+    navigationIntent: 'user-open',
     ...(hiddenBeforeActivation ? { revealInSidebar: false, clearSidebarFilters: false } : {}),
     ...(options?.executionHostId ? { executionHostId: options.executionHostId } : {})
   })
diff --git a/src/renderer/src/lib/worktree-status-spinner-launch-agent.test.ts b/src/renderer/src/lib/worktree-status-spinner-launch-agent.test.ts
index 78b71ef25da7..e964a9f28f11 100644
--- a/src/renderer/src/lib/worktree-status-spinner-launch-agent.test.ts
+++ b/src/renderer/src/lib/worktree-status-spinner-launch-agent.test.ts
@@ -55,18 +55,6 @@ describe('#9040 worktree dot attributes spinner titles to the launched agent', (
     expect(status).toBe('working')
   })
 
-  // Why: pins the #9647 gate — spinner attribution needs a launch identity, so a
-  // spinner in a tab no agent was launched in cannot spin the dot.
-  it('stays active for a spinner title with no launch identity', () => {
-    const status = getWorktreeStatus(
-      [{ id: 'tab-1', title: '⠐ Review branch for regressions' }],
-      [],
-      livePtyMap('tab-1')
-    )
-
-    expect(status).toBe('active')
-  })
-
   it('does not manufacture activity from a non-spinner title with a launch identity', () => {
     const status = getWorktreeStatus(
       [{ id: 'tab-1', title: 'bash', launchAgent: 'claude' }],
diff --git a/src/renderer/src/lib/worktree-status.interrupted.test.ts b/src/renderer/src/lib/worktree-status.interrupted.test.ts
index 76536ff8c7a0..d44530c91e27 100644
--- a/src/renderer/src/lib/worktree-status.interrupted.test.ts
+++ b/src/renderer/src/lib/worktree-status.interrupted.test.ts
@@ -44,6 +44,38 @@ describe('resolveWorktreeStatus — interrupted (STA-5357)', () => {
     )
   })
 
+  it('reports a failure above live work and every outcome, below only a pending question', () => {
+    expect(resolveWorktreeStatus({ ...base, hasFailed: true })).toBe('failed')
+    expect(resolveWorktreeStatus({ ...base, hasFailed: true, hasInterrupted: true })).toBe('failed')
+    expect(resolveWorktreeStatus({ ...base, hasFailed: true, hasLiveDone: true })).toBe('failed')
+    expect(resolveWorktreeStatus({ ...base, hasFailed: true, hasLiveWorking: true })).toBe('failed')
+    expect(resolveWorktreeStatus({ ...base, hasFailed: true, hasLiveMonitoring: true })).toBe(
+      'failed'
+    )
+    expect(resolveWorktreeStatus({ ...base, hasFailed: true, hasPermission: true })).toBe(
+      'permission'
+    )
+  })
+
+  it('reports a departed agent failure below live work and above every outcome', () => {
+    expect(resolveWorktreeStatus({ ...base, hasRetainedFailed: true })).toBe('failed')
+    expect(resolveWorktreeStatus({ ...base, hasRetainedFailed: true, hasInterrupted: true })).toBe(
+      'failed'
+    )
+    expect(resolveWorktreeStatus({ ...base, hasRetainedFailed: true, hasRetainedDone: true })).toBe(
+      'failed'
+    )
+    expect(resolveWorktreeStatus({ ...base, hasRetainedFailed: true, hasLiveWorking: true })).toBe(
+      'working'
+    )
+    expect(
+      resolveWorktreeStatus({ ...base, hasRetainedFailed: true, hasLiveMonitoring: true })
+    ).toBe('monitoring')
+    expect(resolveWorktreeStatus({ ...base, hasRetainedFailed: true, hasPermission: true })).toBe(
+      'permission'
+    )
+  })
+
   it('leaves every other combination alone', () => {
     expect(resolveWorktreeStatus({ ...base, hasLiveDone: true })).toBe('done')
     expect(resolveWorktreeStatus({ ...base, hasLiveWorking: true })).toBe('working')
diff --git a/src/renderer/src/lib/worktree-status.ts b/src/renderer/src/lib/worktree-status.ts
index cbd6c3c82f31..eecff15da077 100644
--- a/src/renderer/src/lib/worktree-status.ts
+++ b/src/renderer/src/lib/worktree-status.ts
@@ -17,6 +17,7 @@ export type WorktreeStatus =
   | 'working'
   | 'monitoring'
   | 'permission'
+  | 'failed'
   | 'interrupted'
   | 'done'
   | 'inactive'
@@ -35,6 +36,7 @@ const STATUS_LABELS: Record<WorktreeStatus, string> = {
   working: 'Working',
   monitoring: 'Monitoring background tasks',
   permission: 'Needs permission',
+  failed: 'Failed',
   interrupted: 'Interrupted',
   done: 'Done',
   inactive: 'Inactive'
@@ -167,7 +169,7 @@ export function getWorktreeStatusLabel(status: WorktreeStatus): string {
  *
  * Map args are narrowed to this worktree. `hasPermission`/`hasLiveWorking`/
  * `hasLiveDone` are fresh hook entries ({blocked,waiting} / {working} / {done});
- * `hasRetainedDone` is a retained-agent snapshot scoped to this worktreeId.
+ * `hasRetainedDone`/`hasRetainedFailed` are retained-agent snapshots scoped to this worktreeId.
  */
 export function resolveWorktreeStatus(args: {
   tabs: readonly Pick<TerminalTab, 'id' | 'title' | 'launchAgent'>[]
@@ -181,9 +183,11 @@ export function resolveWorktreeStatus(args: {
   hasPermission: boolean
   hasLiveWorking: boolean
   hasLiveMonitoring?: boolean
+  hasFailed?: boolean
   hasInterrupted?: boolean
   hasLiveDone: boolean
   hasRetainedDone: boolean
+  hasRetainedFailed?: boolean
 }): WorktreeStatus {
   const heuristic = getWorktreeStatus(
     args.tabs,
@@ -204,6 +208,11 @@ export function resolveWorktreeStatus(args: {
   if (heuristic === 'permission') {
     return 'permission'
   }
+  // Why: a failure is news, so it outranks live work (a failed main agent's subagents may still
+  // run); only a pending question comes first.
+  if (args.hasFailed) {
+    return 'failed'
+  }
   // Why: restored cards get the hook snapshot before panes mount; trust the explicit working row so they stay yellow on restart.
   if (args.hasLiveWorking || heuristic === 'working') {
     return 'working'
@@ -211,7 +220,11 @@ export function resolveWorktreeStatus(args: {
   if (args.hasLiveMonitoring || heuristic === 'monitoring') {
     return 'monitoring'
   }
-  // Terminal outcomes follow live states, but an interrupted outcome must not collapse into success.
+  // Why: a departed agent's failure has no expiry, so it must not pin the card over live work.
+  if (args.hasRetainedFailed) {
+    return 'failed'
+  }
+  // A stop follows live states, but must not collapse into success.
   if (args.hasInterrupted) {
     return 'interrupted'
   }
diff --git a/src/renderer/src/runtime/agent-resume-host-authority-capability.test.ts b/src/renderer/src/runtime/agent-resume-host-authority-capability.test.ts
index f25aa9868a94..e5b6d8327ae6 100644
--- a/src/renderer/src/runtime/agent-resume-host-authority-capability.test.ts
+++ b/src/renderer/src/runtime/agent-resume-host-authority-capability.test.ts
@@ -1,6 +1,9 @@
 import { describe, expect, it } from 'vitest'
 import { RESUMABLE_TUI_AGENTS } from '../../../shared/agent-session-resume'
 import {
+  AGENT_SESSION_QODER_RESUME_RUNTIME_CAPABILITY,
+  AGENT_SESSION_CODEBUDDY_RESUME_RUNTIME_CAPABILITY,
+  AGENT_SESSION_DSH_RESUME_RUNTIME_CAPABILITY,
   AGENT_SESSION_KIMI_RESUME_RUNTIME_CAPABILITY,
   AGENT_SESSION_MUSE_RESUME_RUNTIME_CAPABILITY,
   AGENT_SESSION_OPENCODE2_RESUME_RUNTIME_CAPABILITY,
@@ -54,7 +57,9 @@ describe('agentResumeHostAuthorityCapability', () => {
       )
     ).toEqual({
       claude: undefined,
+      codebuddy: AGENT_SESSION_CODEBUDDY_RESUME_RUNTIME_CAPABILITY,
       codex: undefined,
+      qoder: AGENT_SESSION_QODER_RESUME_RUNTIME_CAPABILITY,
       gemini: undefined,
       antigravity: undefined,
       opencode: undefined,
@@ -69,7 +74,8 @@ describe('agentResumeHostAuthorityCapability', () => {
       copilot: undefined,
       muse: AGENT_SESSION_MUSE_RESUME_RUNTIME_CAPABILITY,
       omp: AGENT_SESSION_OMP_RESUME_PATH_RUNTIME_CAPABILITY,
-      kimi: AGENT_SESSION_KIMI_RESUME_RUNTIME_CAPABILITY
+      kimi: AGENT_SESSION_KIMI_RESUME_RUNTIME_CAPABILITY,
+      dsh: AGENT_SESSION_DSH_RESUME_RUNTIME_CAPABILITY
     })
   })
 })
diff --git a/src/renderer/src/runtime/agent-resume-host-authority-capability.ts b/src/renderer/src/runtime/agent-resume-host-authority-capability.ts
index ddc59b5ae981..a5cefe6a74c5 100644
--- a/src/renderer/src/runtime/agent-resume-host-authority-capability.ts
+++ b/src/renderer/src/runtime/agent-resume-host-authority-capability.ts
@@ -2,6 +2,9 @@ import type { ResumableTuiAgent } from '../../../shared/agent-session-resume'
 import type { TuiAgent } from '../../../shared/tui-agent'
 import {
   AGENT_SESSION_KIMI_RESUME_RUNTIME_CAPABILITY,
+  AGENT_SESSION_QODER_RESUME_RUNTIME_CAPABILITY,
+  AGENT_SESSION_CODEBUDDY_RESUME_RUNTIME_CAPABILITY,
+  AGENT_SESSION_DSH_RESUME_RUNTIME_CAPABILITY,
   AGENT_SESSION_MUSE_RESUME_RUNTIME_CAPABILITY,
   AGENT_SESSION_ZCODE_RESUME_RUNTIME_CAPABILITY,
   AGENT_SESSION_OPENCODE2_RESUME_RUNTIME_CAPABILITY,
@@ -18,7 +21,9 @@ import {
 const RESUME_HOST_AUTHORITY_CAPABILITY_BY_AGENT = {
   // These shipped inside agent-session.host-authority.v1's enum, so the generic probe covers them.
   claude: undefined,
+  codebuddy: AGENT_SESSION_CODEBUDDY_RESUME_RUNTIME_CAPABILITY,
   codex: undefined,
+  qoder: AGENT_SESSION_QODER_RESUME_RUNTIME_CAPABILITY,
   gemini: undefined,
   antigravity: undefined,
   opencode: undefined,
@@ -36,7 +41,8 @@ const RESUME_HOST_AUTHORITY_CAPABILITY_BY_AGENT = {
   muse: AGENT_SESSION_MUSE_RESUME_RUNTIME_CAPABILITY,
   zcode: AGENT_SESSION_ZCODE_RESUME_RUNTIME_CAPABILITY,
   omp: AGENT_SESSION_OMP_RESUME_PATH_RUNTIME_CAPABILITY,
-  kimi: AGENT_SESSION_KIMI_RESUME_RUNTIME_CAPABILITY
+  kimi: AGENT_SESSION_KIMI_RESUME_RUNTIME_CAPABILITY,
+  dsh: AGENT_SESSION_DSH_RESUME_RUNTIME_CAPABILITY
 } satisfies Record<ResumableTuiAgent, RuntimeCapability | undefined>
 
 export function agentResumeHostAuthorityCapability(
diff --git a/src/renderer/src/runtime/browser-workspace-tab-close-census.test.ts b/src/renderer/src/runtime/browser-workspace-tab-close-census.test.ts
deleted file mode 100644
index 212e9d7afe7e..000000000000
--- a/src/renderer/src/runtime/browser-workspace-tab-close-census.test.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-import { readdirSync, readFileSync } from 'node:fs'
-import { join, relative, sep } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-// Why: who tears a browser workspace down is a policy, and every close site that decides it alone
-// gets it wrong in a different way — the ambiguous multi-owner close fell through silently, the
-// pageless host mirror was un-closable, and the menu's Close Tab fired at a host that had never
-// heard of a staged tab. Testing planBrowserWorkspaceTabClose in isolation cannot catch the next
-// site that skips it, so this census pins every renderer file that closes a browser workspace:
-// how often it reaches for the store action, and whether it asks the shared plan first. Adding a
-// close anywhere fails this test until it is classified here.
-const BROWSER_WORKSPACE_CLOSE_SITES: {
-  path: string
-  /**
-   * Every mention of the identifier, not just call expressions: a renamed destructure or a
-   * `store['closeBrowserTab']` lookup is still a close site, and matching `closeBrowserTab(`
-   * walks straight past both.
-   */
-  closeBrowserTabMentions: number
-  /** How many local teardowns forward the plan's cleanup reason; 0 for sites that skip the plan. */
-  planReasonForwardings: number
-  /** How many closeBrowserTab calls actually pass that reason on; 0 for sites that skip the plan. */
-  reasonCarryingCloseCalls: number
-  routesThroughPlan: boolean
-  why: string
-}[] = [
-  {
-    path: 'src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-lifecycle.ts',
-    closeBrowserTabMentions: 4,
-    reasonCarryingCloseCalls: 0,
-    planReasonForwardings: 0,
-    routesThroughPlan: false,
-    why: 'Mirrors a page the host already retired; a plan-driven close would echo it back.'
-  },
-  {
-    path: 'src/renderer/src/components/floating-terminal/use-floating-terminal-close-actions.ts',
-    closeBrowserTabMentions: 6,
-    reasonCarryingCloseCalls: 0,
-    planReasonForwardings: 0,
-    routesThroughPlan: false,
-    why: 'Floating workspace tabs are local-only and have no remote owner to reconcile.'
-  },
-  {
-    path: 'src/renderer/src/components/floating-terminal/use-floating-terminal-panel-store-state.ts',
-    closeBrowserTabMentions: 3,
-    reasonCarryingCloseCalls: 0,
-    planReasonForwardings: 0,
-    routesThroughPlan: false,
-    why: 'Passes the local floating-panel close action through its controller.'
-  },
-  {
-    path: 'src/renderer/src/components/use-terminal-bulk-close-actions.ts',
-    closeBrowserTabMentions: 3,
-    reasonCarryingCloseCalls: 1,
-    planReasonForwardings: 1,
-    routesThroughPlan: true,
-    why: 'Bulk terminal-tab teardown plans browser ownership before local cleanup.'
-  },
-  {
-    path: 'src/renderer/src/components/use-terminal-workspace-store-bindings.ts',
-    closeBrowserTabMentions: 3,
-    reasonCarryingCloseCalls: 0,
-    planReasonForwardings: 0,
-    routesThroughPlan: false,
-    why: 'Store binding exposes the close action to terminal controllers.'
-  },
-  {
-    path: 'src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.ts',
-    closeBrowserTabMentions: 3,
-    reasonCarryingCloseCalls: 0,
-    planReasonForwardings: 0,
-    routesThroughPlan: false,
-    why: 'Host-requested closes are applied locally without echoing a close request.'
-  },
-  {
-    path: 'src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts',
-    closeBrowserTabMentions: 2,
-    reasonCarryingCloseCalls: 0,
-    planReasonForwardings: 0,
-    routesThroughPlan: false,
-    why: 'Host session-tab requests are applied locally without echo.'
-  },
-  {
-    path: 'src/renderer/src/lib/workspace-browser-tab-close.ts',
-    closeBrowserTabMentions: 2,
-    reasonCarryingCloseCalls: 1,
-    planReasonForwardings: 1,
-    routesThroughPlan: true,
-    why: 'All workspace browser teardown funnels through the ownership plan before local cleanup.'
-  },
-  {
-    path: 'src/renderer/src/runtime/browser-workspace-tab-close.ts',
-    closeBrowserTabMentions: 1,
-    reasonCarryingCloseCalls: 0,
-    planReasonForwardings: 0,
-    routesThroughPlan: true,
-    why: 'The funnel disavowal fallback completes teardown when every owning host denies the tab.'
-  },
-  {
-    path: 'src/renderer/src/runtime/web-runtime-browser-tab-staging.ts',
-    closeBrowserTabMentions: 1,
-    reasonCarryingCloseCalls: 0,
-    planReasonForwardings: 0,
-    routesThroughPlan: false,
-    why: 'Rolls back a client-staged row for a create that never reached a host page.'
-  },
-  {
-    path: 'src/renderer/src/store/slices/browser/browser-close-actions.ts',
-    closeBrowserTabMentions: 3,
-    reasonCarryingCloseCalls: 0,
-    planReasonForwardings: 0,
-    routesThroughPlan: false,
-    why: 'Slice-owned shutdown tears down every browser row directly.'
-  },
-  {
-    path: 'src/renderer/src/store/slices/browser/browser-slice-contract.ts',
-    closeBrowserTabMentions: 1,
-    reasonCarryingCloseCalls: 0,
-    planReasonForwardings: 0,
-    routesThroughPlan: false,
-    why: 'The extracted slice contract declares the close action consumed by browser controllers.'
-  }
-]
-
-function listSourceFiles(dir: string): string[] {
-  return readdirSync(dir, { withFileTypes: true }).flatMap((entry) => {
-    const fullPath = join(dir, entry.name)
-    if (entry.isDirectory()) {
-      return listSourceFiles(fullPath)
-    }
-    // Test harnesses and fixtures stub the store action rather than closing anything.
-    if (
-      !/\.(ts|tsx)$/.test(entry.name) ||
-      /\.test\.(ts|tsx)$/.test(entry.name) ||
-      /-test-(harness|fixtures)\.(ts|tsx)$/.test(entry.name)
-    ) {
-      return []
-    }
-    return [fullPath]
-  })
-}
-
-// Why: comments are stripped first, so commenting a close call out in place must fail the census
-// rather than quietly shrink the count.
-function stripComments(source: string): string {
-  return source.replace(/\/\*[\s\S]*?\*\//g, '').replace(/(^|[^:])\/\/.*$/gm, '$1')
-}
-
-function countCloseBrowserTabMentions(source: string): number {
-  return stripComments(source).match(/\bcloseBrowserTab\b/g)?.length ?? 0
-}
-
-describe('browser workspace close census', () => {
-  it.each(BROWSER_WORKSPACE_CLOSE_SITES)(
-    '$path mentions closeBrowserTab $closeBrowserTabMentions times, plan-routed: $routesThroughPlan',
-    ({ path, closeBrowserTabMentions, routesThroughPlan }) => {
-      const source = stripComments(readFileSync(join(process.cwd(), path), 'utf8'))
-      expect(countCloseBrowserTabMentions(source)).toBe(closeBrowserTabMentions)
-      expect(/\bcloseBrowserWorkspaceTabOnHosts\(/.test(source)).toBe(routesThroughPlan)
-    }
-  )
-
-  it('lists every renderer file that closes a browser workspace', () => {
-    const root = join(process.cwd(), 'src/renderer')
-    const closers = listSourceFiles(root)
-      .filter((filePath) => countCloseBrowserTabMentions(readFileSync(filePath, 'utf8')) > 0)
-      .map((filePath) => relative(process.cwd(), filePath).split(sep).join('/'))
-      .sort()
-    expect(closers).toEqual(BROWSER_WORKSPACE_CLOSE_SITES.map((site) => site.path).sort())
-  })
-
-  // Why: the plan is only an authority if its consumers actually run its local teardown. A site
-  // that reads the plan and then closes on its own terms is the same divergence with extra steps.
-  // Bound to the forwarding expression itself — merely mentioning localCloseReason is not wiring,
-  // and Terminal.tsx's two sites have no behavior test to catch it going missing.
-  it('every plan-routed site forwards the plan cleanup reason into its local teardown', () => {
-    const forwardsReason =
-      /plan\.localCloseReason\s*\?\s*\{\s*reason:\s*plan\.localCloseReason\s*\}\s*:\s*undefined/g
-    // Why: the expression existing somewhere in the file is not the wiring — a call that drops it on
-    // the floor reads identically. Both halves are pinned: the reason is computed, and the close
-    // calls carry it.
-    const carriesReason =
-      /closeBrowserTab\(\s*[^()]*?(?:[Cc]loseOptions|plan\.localCloseReason)[^()]*?\)/g
-    for (const site of BROWSER_WORKSPACE_CLOSE_SITES) {
-      const source = stripComments(readFileSync(join(process.cwd(), site.path), 'utf8'))
-      expect({
-        path: site.path,
-        forwards: source.match(forwardsReason)?.length ?? 0,
-        carrying: source.match(carriesReason)?.length ?? 0
-      }).toEqual({
-        path: site.path,
-        forwards: site.planReasonForwardings,
-        carrying: site.reasonCarryingCloseCalls
-      })
-    }
-  })
-})
diff --git a/src/renderer/src/runtime/focus-runtime-terminal-surface-chat-view.test.ts b/src/renderer/src/runtime/focus-runtime-terminal-surface-chat-view.test.ts
index 39683bf2791d..a2eff98b6c6a 100644
--- a/src/renderer/src/runtime/focus-runtime-terminal-surface-chat-view.test.ts
+++ b/src/renderer/src/runtime/focus-runtime-terminal-surface-chat-view.test.ts
@@ -66,13 +66,15 @@ function registerChatViewTab(covered: boolean): {
   focus: ReturnType<typeof vi.fn>
   setActivePane: ReturnType<typeof vi.fn>
 } {
-  const focus = vi.fn()
+  const textarea = document.createElement('textarea')
+  document.body.append(textarea)
+  const focus = vi.fn(() => textarea.focus())
   const setActivePane = vi.fn()
   const pane = {
     id: PANE_ID,
     leafId: LEAF_ID,
     container: makePaneContainer(covered),
-    terminal: { focus }
+    terminal: { focus, textarea }
   }
   const manager = {
     getPanes: () => [pane],
@@ -99,6 +101,7 @@ function registerChatViewTab(covered: boolean): {
 // under the chat portal, so focusing it drags the caret out of the composer (#9939 twin).
 describe('focusRuntimeTerminalSurface on a chat-view pane', () => {
   afterEach(() => {
+    document.body.replaceChildren()
     while (unregisterCallbacks.length > 0) {
       unregisterCallbacks.pop()?.()
     }
diff --git a/src/renderer/src/runtime/focus-runtime-terminal-surface-readiness.test.ts b/src/renderer/src/runtime/focus-runtime-terminal-surface-readiness.test.ts
new file mode 100644
index 000000000000..6430ea97c1e3
--- /dev/null
+++ b/src/renderer/src/runtime/focus-runtime-terminal-surface-readiness.test.ts
@@ -0,0 +1,57 @@
+// @vitest-environment happy-dom
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { PaneManager } from '@/lib/pane-manager/pane-manager'
+import { focusRuntimeTerminalSurface, registerRuntimeTerminalTab } from './sync-runtime-graph'
+
+let unregister: (() => void) | undefined
+
+afterEach(() => {
+  unregister?.()
+  document.body.replaceChildren()
+})
+
+describe('terminal focus readiness', () => {
+  function register(hasPane: boolean, hasTextarea = true) {
+    const textarea = document.createElement('textarea')
+    const pane = {
+      id: 1,
+      container: document.createElement('div'),
+      terminal: {
+        textarea: hasTextarea ? textarea : undefined,
+        focus: vi.fn(() => textarea.focus())
+      }
+    }
+    const manager = {
+      getActivePane: () => (hasPane ? pane : undefined),
+      getPanes: () => (hasPane ? [pane] : [])
+    }
+    unregister = registerRuntimeTerminalTab({
+      tabId: 'restoring-tab',
+      worktreeId: 'restoring-workspace',
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Focus reads only getActivePane/getPanes and the pane's container/terminal.
+      getManager: () => manager as unknown as PaneManager,
+      getContainer: () => null,
+      getPtyIdForPane: () => null,
+      getTabWideAgentHintLeafId: () => null
+    })
+    return textarea
+  }
+
+  it('does not report success before the active pane exists', () => {
+    register(false)
+    expect(focusRuntimeTerminalSurface('restoring-tab', null, 'restoring-workspace')).toBe(false)
+  })
+
+  it('does not report success before the terminal textarea exists', () => {
+    register(true, false)
+    expect(focusRuntimeTerminalSurface('restoring-tab', null, 'restoring-workspace')).toBe(false)
+  })
+
+  it('does not consume focus until the terminal can receive it', () => {
+    const textarea = register(true)
+    expect(focusRuntimeTerminalSurface('restoring-tab', null, 'restoring-workspace')).toBe(false)
+    document.body.append(textarea)
+    expect(focusRuntimeTerminalSurface('restoring-tab', null, 'restoring-workspace')).toBe(true)
+    expect(document.activeElement).toBe(textarea)
+  })
+})
diff --git a/src/renderer/src/runtime/fork-input-quarantine/runtime-terminal-verified-input-cancellation.test.ts b/src/renderer/src/runtime/fork-input-quarantine/runtime-terminal-verified-input-cancellation.test.ts
index fbd321b3e9ad..6812ba984896 100644
--- a/src/renderer/src/runtime/fork-input-quarantine/runtime-terminal-verified-input-cancellation.test.ts
+++ b/src/renderer/src/runtime/fork-input-quarantine/runtime-terminal-verified-input-cancellation.test.ts
@@ -36,6 +36,7 @@ describe('verified runtime input cancellation', () => {
       { activeRuntimeEnvironmentId: null },
       'local-pty',
       'a'.repeat(CLIPBOARD_TEXT_MEASURE_YIELD_CODE_UNITS + 1),
+      'driving',
       () => cancelled
     )
     cancelled = true
@@ -60,10 +61,11 @@ describe('verified runtime input cancellation', () => {
       { activeRuntimeEnvironmentId: null },
       'local-pty',
       'stale input',
+      'driving',
       () => cancelled
     )
     await vi.waitFor(() =>
-      expect(localWriteAccepted).toHaveBeenCalledWith('local-pty', 'stale input')
+      expect(localWriteAccepted).toHaveBeenCalledWith('local-pty', 'stale input', 'driving')
     )
 
     cancelled = true
diff --git a/src/renderer/src/runtime/fork-terminal-dock/runtime-pty-input-acceptance.test.ts b/src/renderer/src/runtime/fork-terminal-dock/runtime-pty-input-acceptance.test.ts
index 4cd2bb05c1fe..83d7a14fcdb7 100644
--- a/src/renderer/src/runtime/fork-terminal-dock/runtime-pty-input-acceptance.test.ts
+++ b/src/renderer/src/runtime/fork-terminal-dock/runtime-pty-input-acceptance.test.ts
@@ -65,7 +65,8 @@ describe('runtime terminal input acceptance', () => {
         sendRuntimePtyInputAcceptance(
           { activeRuntimeEnvironmentId: 'env-2' },
           'remote:env-1@@terminal-stale',
-          'x'
+          'x',
+          'driving'
         )
       ).resolves.toBe(false)
 
@@ -83,7 +84,8 @@ describe('runtime terminal input acceptance', () => {
         sendRuntimePtyInputAcceptance(
           { activeRuntimeEnvironmentId: 'env-2' },
           'remote:env-1@@terminal-1',
-          'x'
+          'x',
+          'driving'
         )
       ).resolves.toBe(false)
 
@@ -106,7 +108,8 @@ describe('runtime terminal input acceptance', () => {
         const accepted = sendRuntimePtyInputAcceptance(
           { activeRuntimeEnvironmentId: 'env-2' },
           'remote:env-1@@terminal-1',
-          text
+          text,
+          'driving'
         )
 
         await vi.runAllTimersAsync()
@@ -141,7 +144,8 @@ describe('runtime terminal input acceptance', () => {
         sendRuntimePtyInputAcceptance(
           { activeRuntimeEnvironmentId: 'env-2' },
           'remote:env-1@@terminal-1',
-          'x'
+          'x',
+          'driving'
         )
       ).resolves.toBe(true)
 
@@ -165,10 +169,15 @@ describe('runtime terminal input acceptance', () => {
       })
 
       await expect(
-        sendRuntimePtyInputAcceptance({ activeRuntimeEnvironmentId: null }, 'local-pty', 'x')
+        sendRuntimePtyInputAcceptance(
+          { activeRuntimeEnvironmentId: null },
+          'local-pty',
+          'x',
+          'driving'
+        )
       ).resolves.toBe(true)
 
-      expect(localWriteInputAccepted).toHaveBeenCalledWith('local-pty', 'x')
+      expect(localWriteInputAccepted).toHaveBeenCalledWith('local-pty', 'x', 'driving')
       expect(localWrite).not.toHaveBeenCalled()
       expect(useAppStore.getState().lastTerminalInputAtByPaneKey[PANE_KEY]).toEqual(
         expect.any(Number)
@@ -179,17 +188,24 @@ describe('runtime terminal input acceptance', () => {
       localWriteInputAccepted.mockResolvedValue(false)
 
       await expect(
-        sendRuntimePtyInputAcceptance({ activeRuntimeEnvironmentId: null }, 'local-pty', 'x')
+        sendRuntimePtyInputAcceptance(
+          { activeRuntimeEnvironmentId: null },
+          'local-pty',
+          'x',
+          'driving'
+        )
       ).resolves.toBe(false)
 
-      expect(localWriteInputAccepted).toHaveBeenCalledWith('local-pty', 'x')
+      expect(localWriteInputAccepted).toHaveBeenCalledWith('local-pty', 'x', 'driving')
       expect(useAppStore.getState().lastTerminalInputAtByPaneKey).toEqual({})
     })
 
     it('leaves the fire-and-forget local write path untouched', async () => {
-      expect(sendRuntimePtyInput({ activeRuntimeEnvironmentId: null }, 'local-pty', 'x')).toBe(true)
+      expect(
+        sendRuntimePtyInput({ activeRuntimeEnvironmentId: null }, 'local-pty', 'x', 'driving')
+      ).toBe(true)
 
-      expect(localWrite).toHaveBeenCalledWith('local-pty', 'x')
+      expect(localWrite).toHaveBeenCalledWith('local-pty', 'x', 'driving')
       expect(localWriteInputAccepted).not.toHaveBeenCalled()
     })
 
@@ -202,6 +218,7 @@ describe('runtime terminal input acceptance', () => {
           { activeRuntimeEnvironmentId: null },
           'local-pty',
           text,
+          'driving',
           () => cancelled
         )
         cancelled = true
@@ -224,6 +241,7 @@ describe('runtime terminal input acceptance', () => {
           { activeRuntimeEnvironmentId: 'env-2' },
           'remote:env-1@@terminal-1',
           text,
+          'driving',
           () => cancelled
         )
         cancelled = true
@@ -245,10 +263,11 @@ describe('runtime terminal input acceptance', () => {
           { activeRuntimeEnvironmentId: null },
           'local-pty',
           'x',
+          'driving',
           () => false
         )
       ).resolves.toBe(true)
-      expect(localWriteInputAccepted).toHaveBeenCalledWith('local-pty', 'x')
+      expect(localWriteInputAccepted).toHaveBeenCalledWith('local-pty', 'x', 'driving')
     })
   })
 })
diff --git a/src/renderer/src/runtime/host-session-mirror-settle-census.test.ts b/src/renderer/src/runtime/host-session-mirror-settle-census.test.ts
deleted file mode 100644
index 7d6a0eadc3e3..000000000000
--- a/src/renderer/src/runtime/host-session-mirror-settle-census.test.ts
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- * Registry test for the host-session-mirror settle seam. Four review rounds
- * each found a NEW call site settling the latch out of order with its store
- * patch, so the seam is enforced structurally: a settle exists only as the
- * receipt of a landed patch (or as the audited stale-frame exception), and a
- * new patch or settle site fails this census until it adopts that contract.
- */
-
-import { readdirSync, readFileSync, statSync } from 'node:fs'
-import { join, relative, sep } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const RENDERER_SRC = join(import.meta.dirname, '..')
-
-const SETTLE_RULE = [
-  'The mirror latch settles EXACTLY when evidence reached the store.',
-  'applyWebSessionTabsStorePatch returns the settle receipt for its own patch:',
-  'capture it and invoke it after the frame finishes recovery. A frame whose',
-  'patch wrote nothing settles through hostSessionMirrorSettleForPatchlessFrame,',
-  'and ONLY on a decision carrying settlesHostMirror — a rejection backed by the',
-  'equal/newer view already accepted into the store. Never derive that from a',
-  'bare boolean: "the mirror never writes this workspace" is also a rejection,',
-  'and settling on it drains parked resume work against state nobody wrote.',
-  'A captured receipt that is never invoked wedges its pane instead, so every',
-  'receipt has to reach a call. Never call markHostSessionMirror*Hydrated from',
-  'feature code, and never add a boolean that remembers "the patch landed" —',
-  'that ordering bug shipped four times. If you added a legitimate new site,',
-  'update this census deliberately.'
-].join(' ')
-
-/** Receipt-minting calls. Every one owes its caller an invocation. */
-const RECEIPT_CALLS = [
-  'applyWebSessionTabsStorePatch(',
-  'hostSessionMirrorSettleForPatchlessFrame('
-] as const
-
-/**
- * The binding a receipt was captured into, read backwards from the call.
- * TypeScript cannot express a must-call obligation and the invocation is
- * deliberately deferred to after `finishRecovery`, so this stays textual:
- * an unrecognised capture shape fails rather than passing unaudited.
- */
-function receiptBindingName(before: string): string | null {
-  const lines = before.split('\n')
-  for (let line = lines.length - 1; line >= 0 && line > lines.length - 8; line -= 1) {
-    const match = /\b(?:const|let|var)?\s*([A-Za-z_$][\w$]*)\s*(?::[^=]*?)?=(?![=>])/.exec(
-      lines[line]!
-    )
-    if (match) {
-      return match[1]!
-    }
-  }
-  return null
-}
-
-function productionSources(): { path: string; source: string }[] {
-  const sources: { path: string; source: string }[] = []
-  const walk = (dir: string): void => {
-    for (const entry of readdirSync(dir)) {
-      const path = join(dir, entry)
-      if (statSync(path).isDirectory()) {
-        walk(path)
-        continue
-      }
-      if (!/\.(ts|tsx)$/.test(entry) || /\.test\.|\.d\.ts$/.test(entry)) {
-        continue
-      }
-      sources.push({
-        path: relative(RENDERER_SRC, path).split(sep).join('/'),
-        source: readFileSync(path, 'utf8')
-      })
-    }
-  }
-  walk(RENDERER_SRC)
-  return sources
-}
-
-function countOccurrences(source: string, needle: string): number {
-  let count = 0
-  for (
-    let index = source.indexOf(needle);
-    index !== -1;
-    index = source.indexOf(needle, index + 1)
-  ) {
-    count += 1
-  }
-  return count
-}
-
-describe('host-session-mirror settle census', () => {
-  const sources = productionSources()
-
-  it('mirror marks are reachable only through the settle receipts', () => {
-    const markCounts: Record<string, { hydrated: number; worktreeHydrated: number }> = {}
-    for (const { path, source } of sources) {
-      const hydrated = countOccurrences(source, 'markHostSessionMirrorHydrated(')
-      const worktreeHydrated = countOccurrences(source, 'markHostSessionMirrorWorktreeHydrated(')
-      if (hydrated + worktreeHydrated > 0) {
-        markCounts[path] = { hydrated, worktreeHydrated }
-      }
-    }
-    expect(markCounts, SETTLE_RULE).toEqual({
-      // The definitions themselves.
-      'runtime/host-session-mirror-hydration.ts': { hydrated: 1, worktreeHydrated: 1 },
-      // Exactly the receipt constructors: the patch receipt (environment-wide
-      // and per-worktree) and the stale-frame receipt. The environment-wide
-      // mark has three audited arms, all inside the receipt: an authoritative
-      // empty inventory, a non-empty inventory, and an empty inventory that
-      // settles only after `terminal.list` says the host has no live PTY —
-      // `0 === 0` is not host evidence (STA-5377).
-      'runtime/web-session-tabs-sync/mirror-settle.ts': { hydrated: 3, worktreeHydrated: 2 }
-    })
-  })
-
-  it('every store patch call site captures its settle receipt', () => {
-    const needle = 'applyWebSessionTabsStorePatch('
-    const callSites: Record<string, number> = {}
-    for (const { path, source } of sources) {
-      let calls = 0
-      for (
-        let index = source.indexOf(needle);
-        index !== -1;
-        index = source.indexOf(needle, index + 1)
-      ) {
-        const before = source.slice(0, index).trimEnd()
-        if (before.endsWith('function')) {
-          continue // The definition.
-        }
-        calls += 1
-        // A receipt is captured when the call is an expression consumed by an
-        // assignment, return, ternary, or argument — never a bare statement.
-        const capturedBy = before.slice(-1)
-        expect(
-          ['=', '(', ',', '?', ':', '{'].includes(capturedBy) || before.endsWith('return'),
-          `${path} discards the settle receipt of applyWebSessionTabsStorePatch. ${SETTLE_RULE}`
-        ).toBe(true)
-      }
-      if (calls > 0) {
-        callSites[path] = calls
-      }
-    }
-    expect(callSites, SETTLE_RULE).toEqual({
-      // Initial listAll, visibility-resume repair, full inventory, global
-      // singular frame, and scoped active frame are owned by these extracted
-      // recovery/event modules.
-      'runtime/web-session-tabs-sync/active-session-subscription.ts': 1,
-      'runtime/web-session-tabs-sync/global-session-events.ts': 1,
-      'runtime/web-session-tabs-sync/global-session-inventory-event.ts': 1,
-      'runtime/web-session-tabs-sync/load-initial.ts': 1,
-      'runtime/web-session-tabs-sync/visibility-resume-repair.ts': 1,
-      // The eager post-create session.tabs.list refresh.
-      'runtime/web-runtime-session-snapshot.ts': 1,
-      // The local structured-session mirror owns two: the inventory/subscription
-      // frame, and the toggle-off teardown that retracts the tabs it published.
-      'runtime/local-structured-session-tabs-sync/snapshot-apply.ts': 2
-    })
-  })
-
-  it('every captured settle receipt reaches an invocation', () => {
-    const receiptBindings: Record<string, Record<string, number>> = {}
-    for (const { path, source } of sources) {
-      for (const needle of RECEIPT_CALLS) {
-        for (
-          let index = source.indexOf(needle);
-          index !== -1;
-          index = source.indexOf(needle, index + 1)
-        ) {
-          const before = source.slice(0, index).trimEnd()
-          if (before.endsWith('function')) {
-            continue // The definition.
-          }
-          const name = receiptBindingName(before)
-          expect(
-            name,
-            `${path} captures a settle receipt in a shape this census cannot follow. ${SETTLE_RULE}`
-          ).not.toBeNull()
-          // The obligation is discharged by the next call of the same binding —
-          // a fresh declaration of that name in between means the call belongs
-          // to another receipt, so this one was dropped.
-          const rest = source.slice(index + needle.length)
-          const invocation = new RegExp(`\\b${name}\\s*(?:\\?\\.)?\\(`).exec(rest)
-          const redeclared =
-            invocation !== null &&
-            new RegExp(`\\b(?:let|const|var)\\s+${name}\\b`).test(rest.slice(0, invocation.index))
-          expect(
-            invocation !== null && !redeclared,
-            `${path} never invokes the settle receipt it captured into \`${name}\`. ${SETTLE_RULE}`
-          ).toBe(true)
-          const bindings = (receiptBindings[path] ??= {})
-          bindings[name!] = (bindings[name!] ?? 0) + 1
-        }
-      }
-    }
-    // Pinning the resolved names keeps the rule from going vacuous: a binding
-    // this census misreads settles on some other identifier's invocation.
-    expect(receiptBindings, SETTLE_RULE).toEqual({
-      // Hydration and mirror receipts remain pinned by their extracted owners:
-      // the global singular frame owns two hydration completions and the global
-      // inventory frame one, initial loading owns one, active subscription owns
-      // two mirror settles, and visibility resume repair owns one. The local
-      // structured-session apply module owns one settle per direction: the
-      // snapshot it mirrors in, and the teardown that retracts it.
-      'runtime/web-session-tabs-sync/active-session-subscription.ts': { settle: 2 },
-      'runtime/web-session-tabs-sync/global-session-events.ts': { settleHydration: 2 },
-      'runtime/web-session-tabs-sync/global-session-inventory-event.ts': { settleHydration: 1 },
-      'runtime/web-session-tabs-sync/load-initial.ts': { settleHydration: 1 },
-      'runtime/web-session-tabs-sync/visibility-resume-repair.ts': { settle: 1 },
-      'runtime/web-runtime-session-snapshot.ts': { settleMirror: 1 },
-      'runtime/local-structured-session-tabs-sync/snapshot-apply.ts': {
-        settleStructuredSessionClear: 1,
-        settleStructuredSessionMirror: 1
-      }
-    })
-  })
-
-  it('the patchless settle appears only at its audited sites', () => {
-    const patchlessCounts: Record<string, number> = {}
-    for (const { path, source } of sources) {
-      const count = countOccurrences(source, 'hostSessionMirrorSettleForPatchlessFrame(')
-      if (count > 0) {
-        patchlessCounts[path] = count
-      }
-    }
-    expect(patchlessCounts, SETTLE_RULE).toEqual({
-      // The definition, the global singular frame, and the scoped active frame.
-      'runtime/web-session-tabs-sync/active-session-subscription.ts': 1,
-      'runtime/web-session-tabs-sync/global-session-events.ts': 1,
-      'runtime/web-session-tabs-sync/mirror-settle.ts': 1
-    })
-  })
-
-  it('only the audited decisions grant a rejected frame a settle', () => {
-    const settlingCounts: Record<string, number> = {}
-    const silentCounts: Record<string, number> = {}
-    for (const { path, source } of sources) {
-      const settling = countOccurrences(source, 'settlesHostMirror: true')
-      const silent = countOccurrences(source, 'settlesHostMirror: false')
-      if (settling > 0) {
-        settlingCounts[path] = settling
-      }
-      if (silent > 0) {
-        silentCounts[path] = silent
-      }
-    }
-    // A new decision has to be minted here, and minting one forces its author
-    // to say whether the frame is host evidence — the whole point of the pair.
-    expect(settlingCounts, SETTLE_RULE).toEqual({
-      // The applied frame (its own patch) and the outranked one (the accepted view).
-      'runtime/web-session-tabs-sync/tracking-decisions.ts': 2
-    })
-    expect(silentCounts, SETTLE_RULE).toEqual({
-      // The unmirrored frame: no accepted view of it ever reached the store.
-      'runtime/web-session-tabs-sync/tracking-decisions.ts': 1
-    })
-  })
-})
diff --git a/src/renderer/src/runtime/mobile-markdown-bridge.test.ts b/src/renderer/src/runtime/mobile-markdown-bridge.test.ts
index 2e5abd834e42..e039cc515ebb 100644
--- a/src/renderer/src/runtime/mobile-markdown-bridge.test.ts
+++ b/src/renderer/src/runtime/mobile-markdown-bridge.test.ts
@@ -1,7 +1,8 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   hashMarkdownContent,
-  MOBILE_MARKDOWN_EDIT_MAX_BYTES
+  MOBILE_MARKDOWN_EDIT_MAX_BYTES,
+  MOBILE_MARKDOWN_READ_MAX_BYTES
 } from '../../../shared/mobile-markdown-document'
 import { attachEditorAutosaveController } from '../components/editor/editor-autosave-controller'
 import { registerPendingEditorFlush } from '../components/editor/editor-pending-flush'
@@ -157,4 +158,69 @@ describe('mobile markdown bridge', () => {
       detach()
     }
   })
+
+  it('reads a markdown file between the edit and read budgets whole, as read-only', async () => {
+    openMarkdownFile()
+    const content = 'a'.repeat(632 * 1024)
+    setupWindow({ readFile: vi.fn().mockResolvedValue({ content, isBinary: false }) })
+    const detach = attachMobileMarkdownBridge()
+
+    try {
+      const response = await sendRequest({
+        id: 'read-632k',
+        operation: 'read',
+        worktreeId: 'wt-1',
+        tabId: 'tab-md'
+      })
+
+      expect(response).toMatchObject({
+        ok: true,
+        result: { content, editable: false, readOnlyReason: 'file_too_large' }
+      })
+      expect(response).not.toHaveProperty('result.truncated')
+    } finally {
+      detach()
+    }
+  })
+
+  it('truncates a markdown file over the read budget on a UTF-8 boundary', async () => {
+    openMarkdownFile()
+    // The 3-byte euro sign straddles the budget, so the cut must drop it whole.
+    const prefix = 'a'.repeat(MOBILE_MARKDOWN_READ_MAX_BYTES - 1)
+    const content = `${prefix}\u20actail`
+    setupWindow({ readFile: vi.fn().mockResolvedValue({ content, isBinary: false }) })
+    const detach = attachMobileMarkdownBridge()
+
+    try {
+      const response = await sendRequest({
+        id: 'read-over-budget',
+        operation: 'read',
+        worktreeId: 'wt-1',
+        tabId: 'tab-md'
+      })
+
+      expect(response).toMatchObject({
+        ok: true,
+        result: {
+          editable: false,
+          readOnlyReason: 'file_too_large',
+          truncated: true,
+          byteLength: MOBILE_MARKDOWN_READ_MAX_BYTES - 1 + 3 + 4,
+          version: hashMarkdownContent(prefix)
+        }
+      })
+      expect(response).toHaveProperty('result.content', prefix)
+      const save = await sendRequest({
+        id: 'save-truncated',
+        operation: 'save',
+        worktreeId: 'wt-1',
+        tabId: 'tab-md',
+        baseVersion: hashMarkdownContent(prefix),
+        content: prefix
+      })
+      expect(save).toMatchObject({ ok: false, error: 'file_too_large' })
+    } finally {
+      detach()
+    }
+  })
 })
diff --git a/src/renderer/src/runtime/mobile-markdown-bridge.ts b/src/renderer/src/runtime/mobile-markdown-bridge.ts
index b605c014801d..c51a76568432 100644
--- a/src/renderer/src/runtime/mobile-markdown-bridge.ts
+++ b/src/renderer/src/runtime/mobile-markdown-bridge.ts
@@ -15,13 +15,13 @@ import {
   hashMarkdownContent,
   isMarkdownContentByteLengthOverLimit,
   MOBILE_MARKDOWN_EDIT_MAX_BYTES,
+  truncateMobileMarkdownRead,
   type RuntimeMarkdownReadTabResult,
   type RuntimeMarkdownSaveTabResult,
   type RuntimeMobileMarkdownRequest,
   type RuntimeMobileMarkdownResponse
 } from '../../../shared/mobile-markdown-document'
 
-const MOBILE_MARKDOWN_READ_MAX_BYTES = 512 * 1024
 const saveQueues = new Map<string, Promise<void>>()
 
 type FileContent = {
@@ -67,16 +67,18 @@ async function readMobileMarkdownTab(
   flushEditorState(target.sourceFile.id)
   const { content, source } = await readCurrentContent(target.sourceFile)
   const readOnlyReason = getReadOnlyReason(target.tab, target.sourceFile, content)
+  const preview = truncateMobileMarkdownRead(content)
   return {
     tabId,
     filePath: target.sourceFile.filePath,
     relativePath: target.sourceFile.relativePath,
-    content,
+    content: preview.content,
     isDirty: target.sourceFile.isDirty || source === 'draft',
-    version: hashMarkdownContent(content),
+    version: hashMarkdownContent(preview.content),
     source,
     editable: readOnlyReason === undefined,
-    ...(readOnlyReason ? { readOnlyReason } : {})
+    ...(readOnlyReason ? { readOnlyReason } : {}),
+    ...(preview.truncated ? { truncated: true, byteLength: preview.byteLength } : {})
   }
 }
 
@@ -252,9 +254,6 @@ async function readFileContent(file: OpenFile): Promise<string> {
   if (result.isBinary) {
     throw new Error('binary_file')
   }
-  if (isMarkdownContentByteLengthOverLimit(result.content, MOBILE_MARKDOWN_READ_MAX_BYTES)) {
-    throw new Error('file_too_large')
-  }
   return result.content
 }
 
diff --git a/src/renderer/src/runtime/remote-agent-session-launch.test.ts b/src/renderer/src/runtime/remote-agent-session-launch.test.ts
index d8cf0c542cb8..dda22ff12fd4 100644
--- a/src/renderer/src/runtime/remote-agent-session-launch.test.ts
+++ b/src/renderer/src/runtime/remote-agent-session-launch.test.ts
@@ -45,7 +45,7 @@ describe('remote agent-session launch routing', () => {
     expect(legacy).not.toHaveBeenCalled()
   })
 
-  it.each(['kimi', 'muse'] as const)(
+  it.each(['kimi', 'muse', 'codebuddy'] as const)(
     'falls back to legacy when an older host lacks the %s resume capability',
     async (agent) => {
       const hostAuthority = vi.fn().mockResolvedValue('structured')
@@ -70,23 +70,29 @@ describe('remote agent-session launch routing', () => {
     }
   )
 
-  it('uses host authority when the host supports Muse resume', async () => {
-    const hostAuthority = vi.fn().mockResolvedValue('host')
-    const legacy = vi.fn()
-    mocks.supportsCapability.mockResolvedValue(true)
+  it.each(['muse', 'codebuddy'] as const)(
+    'uses host authority when the host supports %s resume',
+    async (agent) => {
+      const hostAuthority = vi.fn().mockResolvedValue('host')
+      const legacy = vi.fn()
+      mocks.supportsCapability.mockResolvedValue(true)
 
-    await expect(
-      runRemoteAgentSessionLaunch({
-        environmentId: 'env-1',
-        hostAuthority,
-        hostAuthorityCapability: agentResumeHostAuthorityCapability('muse'),
-        legacy
-      })
-    ).resolves.toBe('host')
-    expect(mocks.supportsCapability).toHaveBeenCalledWith('env-1', 'agent-session.muse-resume.v1')
-    expect(hostAuthority).toHaveBeenCalledOnce()
-    expect(legacy).not.toHaveBeenCalled()
-  })
+      await expect(
+        runRemoteAgentSessionLaunch({
+          environmentId: 'env-1',
+          hostAuthority,
+          hostAuthorityCapability: agentResumeHostAuthorityCapability(agent),
+          legacy
+        })
+      ).resolves.toBe('host')
+      expect(mocks.supportsCapability).toHaveBeenCalledWith(
+        'env-1',
+        `agent-session.${agent}-resume.v1`
+      )
+      expect(hostAuthority).toHaveBeenCalledOnce()
+      expect(legacy).not.toHaveBeenCalled()
+    }
+  )
 
   it('preserves the exact legacy path when the capability is absent', async () => {
     const hostAuthority = vi.fn().mockResolvedValue('structured')
diff --git a/src/renderer/src/runtime/remote-server-parity.test.ts b/src/renderer/src/runtime/remote-server-parity.test.ts
index 7c1bcf9bb687..c9779332f666 100644
--- a/src/renderer/src/runtime/remote-server-parity.test.ts
+++ b/src/renderer/src/runtime/remote-server-parity.test.ts
@@ -210,29 +210,6 @@ describe('parity §3: remote terminal create appends rightmost (matches local)',
       toWebTerminalSurfaceTabId('host-tab-3')
     ])
   })
-
-  it('preserves existing relative order when adding (no reshuffle)', () => {
-    const prior = stateWithLocalTerminals([
-      localTerminal('host-tab-1', 0, false),
-      localTerminal('host-tab-2', 1, true)
-    ])
-    recordWebSessionFocusIntent({ environmentId: ENV }, WT, `host-tab-3::${LEAF_C}`)
-    const patch = applyWebSessionTabsSnapshot(
-      prior,
-      makeSnapshot([
-        { parentTab: 'host-tab-1', leaf: LEAF_A, active: false },
-        { parentTab: 'host-tab-2', leaf: LEAF_B, active: false },
-        { parentTab: 'host-tab-3', leaf: LEAF_C, active: true }
-      ]),
-      ENV,
-      NOW + 10
-    ) as Partial<WebSessionTabsSyncState>
-    expect(groupOrder(patch)).toEqual([
-      toWebTerminalSurfaceTabId('host-tab-1'),
-      toWebTerminalSurfaceTabId('host-tab-2'),
-      toWebTerminalSurfaceTabId('host-tab-3')
-    ])
-  })
 })
 
 // ──────────────────────────────────────────────────────────────────────────
@@ -422,24 +399,3 @@ describe('parity §11: remote browser create focuses the new browser tab', () =>
     expect(nextType).toBe('terminal')
   })
 })
-
-// ──────────────────────────────────────────────────────────────────────────
-// Plan §1 — Lifecycle: an emptied host snapshot does not bootstrap phantom tabs
-// when local terminals already exist (sleep/disconnect must not invent state).
-// ──────────────────────────────────────────────────────────────────────────
-describe('parity §1: empty host snapshot does not fabricate tabs', () => {
-  it('an empty snapshot with existing local terminals does not add a phantom tab', () => {
-    const prior = stateWithLocalTerminals([localTerminal('host-tab-1', 0, true)])
-    const patch = applyWebSessionTabsSnapshot(
-      prior,
-      makeSnapshot([], { activeTabId: null, activeTabType: null }),
-      ENV,
-      NOW + 10
-    ) as Partial<WebSessionTabsSyncState>
-    // No new fabricated terminal ids beyond what existed.
-    const order = groupOrder(patch)
-    for (const id of order) {
-      expect(id).toBe(toWebTerminalSurfaceTabId('host-tab-1'))
-    }
-  })
-})
diff --git a/src/renderer/src/runtime/runtime-host-contact-parity.test.ts b/src/renderer/src/runtime/runtime-host-contact-parity.test.ts
index a24e963a1d97..83e152cd8996 100644
--- a/src/renderer/src/runtime/runtime-host-contact-parity.test.ts
+++ b/src/renderer/src/runtime/runtime-host-contact-parity.test.ts
@@ -10,16 +10,6 @@ import {
   runtimeHostContactFromSnapshot
 } from '../../../shared/runtime-host-contact'
 import type { RuntimeStatus } from '../../../shared/runtime-types'
-import {
-  runtimeHostConnectionState,
-  runtimeHostConnectionStateForEntry,
-  type RuntimeHostConnectionState
-} from './runtime-host-connection-state'
-
-// This file exists to prove the contact introduced here changes nothing. It carries a frozen copy
-// of the derivation as it stood before, and asserts the shipping one agrees with it on every
-// combination of the inputs it reads. A behaviour change would have to survive the whole
-// cross-product to go unnoticed, which is a much harder thing to do by accident than to argue.
 
 type Entry = {
   status: RuntimeStatus | null
@@ -27,33 +17,6 @@ type Entry = {
   snapshot?: RuntimeHostStatusSnapshot
 }
 
-/** The derivation exactly as it read before `RuntimeHostContact` existed. Do not refactor. */
-function legacyRuntimeHostConnectionStateForEntry(
-  entry: Entry | null | undefined
-): RuntimeHostConnectionState {
-  const snapshot = entry?.snapshot
-  if (snapshot) {
-    if (snapshot.retired || snapshot.verification === 'blocked') {
-      return 'disconnected'
-    }
-    if (snapshot.transport === 'disconnected') {
-      return 'reconnecting'
-    }
-    if (snapshot.verification === 'checking' && !entry?.status) {
-      return 'checking'
-    }
-    if (snapshot.transport === 'ready' && snapshot.verification !== 'verified') {
-      return 'runtime-unavailable'
-    }
-  }
-  return runtimeHostConnectionState({
-    hasStatusEntry: Boolean(entry),
-    status: entry?.status ?? null,
-    ...(snapshot?.transport === 'connecting' ? { transportStatus: 'checking' as const } : {}),
-    remoteControl: entry?.remoteControl ?? entry?.status?.remoteControl ?? null
-  })
-}
-
 const VERIFICATIONS = ['checking', 'verified', 'unavailable', 'blocked'] as const
 const TRANSPORTS = ['unknown', 'connecting', 'ready', 'disconnected'] as const
 const RETIRED = [false, true] as const
@@ -138,38 +101,7 @@ function* everySnapshotEntry(): Generator<{ label: string; entry: Entry }> {
   }
 }
 
-describe('the host contact changes no verdict', () => {
-  it('agrees with the frozen derivation on every snapshot combination', () => {
-    const cases = [...everySnapshotEntry()]
-    // Guard against the enumeration silently collapsing: 4 x 4 x 2 x 2 x 6.
-    expect(cases).toHaveLength(384)
-    const disagreements = cases
-      .map(({ label, entry }) => ({
-        label,
-        now: runtimeHostConnectionStateForEntry(entry),
-        before: legacyRuntimeHostConnectionStateForEntry(entry)
-      }))
-      .filter(({ now, before }) => now !== before)
-    expect(disagreements).toEqual([])
-  })
-
-  it('agrees for entries that carry no snapshot at all', () => {
-    const entries: (Entry | null | undefined)[] = [
-      null,
-      undefined,
-      { status: null },
-      { status: makeStatus() },
-      { status: null, remoteControl: makeRemoteControl('closed') },
-      { status: null, remoteControl: makeRemoteControl('ready') },
-      { status: makeStatus({ remoteControl: makeRemoteControl('reconnecting') }) }
-    ]
-    for (const entry of entries) {
-      expect(runtimeHostConnectionStateForEntry(entry)).toBe(
-        legacyRuntimeHostConnectionStateForEntry(entry)
-      )
-    }
-  })
-
+describe('the revoked predicate and the contact verdict stay in step', () => {
   it('keeps the revoked predicate and the contact verdict in step', () => {
     for (const { label, entry } of everySnapshotEntry()) {
       expect(
diff --git a/src/renderer/src/runtime/runtime-host-contact-regained.test.ts b/src/renderer/src/runtime/runtime-host-contact-regained.test.ts
new file mode 100644
index 000000000000..5daabf377901
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-host-contact-regained.test.ts
@@ -0,0 +1,111 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { RuntimeStatus } from '../../../shared/runtime-types'
+
+vi.mock('sonner', () => ({
+  toast: { warning: vi.fn(), dismiss: vi.fn() }
+}))
+
+vi.mock('@/store', async () => {
+  const { create } = await import('zustand')
+  const { createRuntimeStatusSlice } = await import('@/store/slices/runtime-status')
+  type Slice = ReturnType<typeof createRuntimeStatusSlice>
+  return {
+    useAppStore: create<Slice>()((...a) =>
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the slice reads only its own fields.
+      createRuntimeStatusSlice(...(a as unknown as Parameters<typeof createRuntimeStatusSlice>))
+    )
+  }
+})
+
+import { useAppStore } from '@/store'
+import { clearRuntimeEnvironmentConnectionGenerationsForTests } from '@/store/slices/runtime-status'
+import { subscribeRuntimeHostContactRegained } from './runtime-host-contact-regained'
+
+function makeStatus(runtimeId: string): RuntimeStatus {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: fixture carries only the fields the slice reads.
+  return {
+    runtimeId,
+    rendererGraphEpoch: 0,
+    graphStatus: 'ready',
+    authoritativeWindowId: null,
+    liveTabCount: 0,
+    liveLeafCount: 0,
+    runtimeProtocolVersion: 3,
+    minCompatibleRuntimeClientVersion: 3
+  } as RuntimeStatus
+}
+
+let lastVerified: RuntimeStatus | null = null
+
+// As the host-status snapshot does: an outage keeps the last verified status, so a same-runtime
+// return moves only the contact epoch, not the connection generation.
+function publish(status: RuntimeStatus | null, checkedAt: number): void {
+  lastVerified = status ?? lastVerified
+  useAppStore.getState().setRuntimeEnvironmentStatus('env-a', {
+    status,
+    checkedAt,
+    snapshot: {
+      environmentId: 'env-a',
+      pairingRevision: 1,
+      sequence: checkedAt,
+      checkedAt,
+      status: lastVerified,
+      verification: status ? 'verified' : 'unavailable',
+      transport: status ? 'ready' : 'disconnected'
+    }
+  })
+}
+
+beforeEach(() => {
+  clearRuntimeEnvironmentConnectionGenerationsForTests()
+  vi.stubGlobal('window', { api: {}, dispatchEvent: vi.fn() })
+  useAppStore.setState({ runtimeStatusByEnvironmentId: new Map() })
+  lastVerified = null
+})
+
+afterEach(() => {
+  vi.unstubAllGlobals()
+})
+
+describe('subscribeRuntimeHostContactRegained', () => {
+  it('fires when the runtime answers again after an outage, and not while it stays down', () => {
+    publish(makeStatus('runtime-a'), 1)
+    const listener = vi.fn()
+    const stop = subscribeRuntimeHostContactRegained('env-a', listener)
+
+    publish(null, 2)
+    publish(null, 3)
+    expect(listener).not.toHaveBeenCalled()
+
+    // Same runtime back: only the contact epoch moves.
+    const generation = useAppStore
+      .getState()
+      .runtimeStatusByEnvironmentId.get('env-a')?.connectionGeneration
+    publish(makeStatus('runtime-a'), 4)
+    expect(
+      useAppStore.getState().runtimeStatusByEnvironmentId.get('env-a')?.connectionGeneration
+    ).toBe(generation)
+    expect(listener).toHaveBeenCalledTimes(1)
+    publish(makeStatus('runtime-a'), 5)
+    expect(listener).toHaveBeenCalledTimes(1)
+
+    // A restarted runtime: the connection generation moves.
+    publish(makeStatus('runtime-b'), 6)
+    expect(listener).toHaveBeenCalledTimes(2)
+
+    stop()
+    publish(null, 7)
+    publish(makeStatus('runtime-b'), 8)
+    expect(listener).toHaveBeenCalledTimes(2)
+  })
+
+  it('ignores other environments', () => {
+    publish(makeStatus('runtime-a'), 1)
+    const listener = vi.fn()
+    const stop = subscribeRuntimeHostContactRegained('env-b', listener)
+    publish(null, 2)
+    publish(makeStatus('runtime-a'), 3)
+    expect(listener).not.toHaveBeenCalled()
+    stop()
+  })
+})
diff --git a/src/renderer/src/runtime/runtime-host-contact-regained.ts b/src/renderer/src/runtime/runtime-host-contact-regained.ts
new file mode 100644
index 000000000000..b829f51d99a5
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-host-contact-regained.ts
@@ -0,0 +1,31 @@
+import { useAppStore } from '@/store'
+import type { AppState } from '@/store/types'
+
+function contactMarks(state: AppState, environmentId: string): string | null {
+  const entry = state.runtimeStatusByEnvironmentId.get(environmentId)
+  return entry ? `${entry.hostContactEpoch ?? 0}:${entry.connectionGeneration ?? 0}` : null
+}
+
+/**
+ * Calls `listener` each time this client regains contact with an environment's runtime: the
+ * same-runtime return (`hostContactEpoch`) or a new runtime session (`connectionGeneration`),
+ * both published by runtime-status.ts.
+ */
+export function subscribeRuntimeHostContactRegained(
+  environmentId: string,
+  listener: () => void
+): () => void {
+  let lastMarks = contactMarks(useAppStore.getState(), environmentId)
+  return useAppStore.subscribe((state, previousState) => {
+    if (state.runtimeStatusByEnvironmentId === previousState.runtimeStatusByEnvironmentId) {
+      return
+    }
+    const marks = contactMarks(state, environmentId)
+    // Why keep the last marks across a missing entry: a cleared status that returns is a reconnect.
+    if (marks === null || marks === lastMarks) {
+      return
+    }
+    lastMarks = marks
+    listener()
+  })
+}
diff --git a/src/renderer/src/runtime/runtime-terminal-inspection.test.ts b/src/renderer/src/runtime/runtime-terminal-inspection.test.ts
index 796ea35a58df..dc36e718fa10 100644
--- a/src/renderer/src/runtime/runtime-terminal-inspection.test.ts
+++ b/src/renderer/src/runtime/runtime-terminal-inspection.test.ts
@@ -112,7 +112,12 @@ describe('runtime terminal owner routing', () => {
 
   it('sends input through the PTY owning environment instead of the active one', async () => {
     expect(
-      sendRuntimePtyInput({ activeRuntimeEnvironmentId: 'env-2' }, 'remote:env-1@@terminal-1', 'x')
+      sendRuntimePtyInput(
+        { activeRuntimeEnvironmentId: 'env-2' },
+        'remote:env-1@@terminal-1',
+        'x',
+        'driving'
+      )
     ).toBe(true)
 
     await vi.waitFor(() => {
@@ -343,7 +348,12 @@ describe('runtime terminal owner routing', () => {
     })
 
     expect(
-      sendRuntimePtyInput({ activeRuntimeEnvironmentId: 'env-2' }, 'remote:env-1@@terminal-1', 'x')
+      sendRuntimePtyInput(
+        { activeRuntimeEnvironmentId: 'env-2' },
+        'remote:env-1@@terminal-1',
+        'x',
+        'driving'
+      )
     ).toBe(true)
 
     await vi.waitFor(() => {
@@ -374,7 +384,12 @@ describe('runtime terminal owner routing', () => {
     useAppStore.setState({ lastTerminalInputAtByPaneKey: {} })
 
     expect(
-      sendRuntimePtyInput({ activeRuntimeEnvironmentId: 'env-2' }, 'remote:env-1@@terminal-1', 'x')
+      sendRuntimePtyInput(
+        { activeRuntimeEnvironmentId: 'env-2' },
+        'remote:env-1@@terminal-1',
+        'x',
+        'driving'
+      )
     ).toBe(true)
     const nextLeafId = '22222222-2222-4222-8222-222222222222'
     useAppStore.setState({
@@ -419,7 +434,12 @@ describe('runtime terminal owner routing', () => {
     })
 
     expect(
-      sendRuntimePtyInput({ activeRuntimeEnvironmentId: 'env-2' }, 'remote:env-1@@terminal-1', 'x')
+      sendRuntimePtyInput(
+        { activeRuntimeEnvironmentId: 'env-2' },
+        'remote:env-1@@terminal-1',
+        'x',
+        'driving'
+      )
     ).toBe(true)
 
     await vi.waitFor(() => {
@@ -438,7 +458,8 @@ describe('runtime terminal owner routing', () => {
       sendRuntimePtyInputVerified(
         { activeRuntimeEnvironmentId: 'env-2' },
         'remote:env-1@@terminal-stale',
-        'x'
+        'x',
+        'driving'
       )
     ).resolves.toBe(false)
   })
@@ -454,7 +475,8 @@ describe('runtime terminal owner routing', () => {
       sendRuntimePtyInputVerified(
         { activeRuntimeEnvironmentId: 'env-2' },
         'remote:env-1@@terminal-1',
-        'x'
+        'x',
+        'driving'
       )
     ).resolves.toBe(false)
 
@@ -474,17 +496,19 @@ describe('runtime terminal owner routing', () => {
     localWriteAccepted.mockResolvedValue(true)
 
     await expect(
-      sendRuntimePtyInputVerified({ activeRuntimeEnvironmentId: null }, 'local-pty', 'x')
+      sendRuntimePtyInputVerified({ activeRuntimeEnvironmentId: null }, 'local-pty', 'x', 'driving')
     ).resolves.toBe(true)
 
-    expect(localWriteAccepted).toHaveBeenCalledWith('local-pty', 'x')
+    expect(localWriteAccepted).toHaveBeenCalledWith('local-pty', 'x', 'driving')
     expect(localWrite).not.toHaveBeenCalled()
   })
 
   it('rejects oversized fire-and-forget local input before IPC writes', () => {
     const text = 'x'.repeat(TERMINAL_INPUT_MAX_BYTES + 1)
 
-    expect(sendRuntimePtyInput({ activeRuntimeEnvironmentId: null }, 'local-pty', text)).toBe(false)
+    expect(
+      sendRuntimePtyInput({ activeRuntimeEnvironmentId: null }, 'local-pty', text, 'driving')
+    ).toBe(false)
 
     expect(localWrite).not.toHaveBeenCalled()
     expect(localWriteAccepted).not.toHaveBeenCalled()
@@ -494,7 +518,12 @@ describe('runtime terminal owner routing', () => {
     const text = 'x'.repeat(TERMINAL_INPUT_MAX_BYTES + 1)
 
     expect(
-      sendRuntimePtyInput({ activeRuntimeEnvironmentId: 'env-2' }, 'remote:env-1@@terminal-1', text)
+      sendRuntimePtyInput(
+        { activeRuntimeEnvironmentId: 'env-2' },
+        'remote:env-1@@terminal-1',
+        text,
+        'driving'
+      )
     ).toBe(false)
 
     expect(runtimeTransportCall).not.toHaveBeenCalled()
@@ -506,14 +535,14 @@ describe('runtime terminal owner routing', () => {
     try {
       const text = 'x'.repeat(CLIPBOARD_TEXT_MEASURE_YIELD_CODE_UNITS + 1)
 
-      expect(sendRuntimePtyInput({ activeRuntimeEnvironmentId: null }, 'local-pty', text)).toBe(
-        true
-      )
+      expect(
+        sendRuntimePtyInput({ activeRuntimeEnvironmentId: null }, 'local-pty', text, 'driving')
+      ).toBe(true)
       expect(localWrite).not.toHaveBeenCalled()
 
       await vi.advanceTimersByTimeAsync(0)
 
-      expect(localWrite).toHaveBeenCalledWith('local-pty', text)
+      expect(localWrite).toHaveBeenCalledWith('local-pty', text, 'driving')
       expect(localWriteAccepted).not.toHaveBeenCalled()
     } finally {
       vi.useRealTimers()
@@ -525,9 +554,9 @@ describe('runtime terminal owner routing', () => {
     try {
       const text = makeByteOversizedTerminalInput()
 
-      expect(sendRuntimePtyInput({ activeRuntimeEnvironmentId: null }, 'local-pty', text)).toBe(
-        true
-      )
+      expect(
+        sendRuntimePtyInput({ activeRuntimeEnvironmentId: null }, 'local-pty', text, 'driving')
+      ).toBe(true)
 
       await vi.runAllTimersAsync()
 
@@ -542,7 +571,12 @@ describe('runtime terminal owner routing', () => {
     const text = 'x'.repeat(TERMINAL_INPUT_MAX_BYTES + 1)
 
     await expect(
-      sendRuntimePtyInputVerified({ activeRuntimeEnvironmentId: null }, 'local-pty', text)
+      sendRuntimePtyInputVerified(
+        { activeRuntimeEnvironmentId: null },
+        'local-pty',
+        text,
+        'driving'
+      )
     ).resolves.toBe(false)
 
     expect(localWriteAccepted).not.toHaveBeenCalled()
@@ -557,7 +591,8 @@ describe('runtime terminal owner routing', () => {
       const accepted = sendRuntimePtyInputVerified(
         { activeRuntimeEnvironmentId: null },
         'local-pty',
-        text
+        text,
+        'driving'
       )
 
       expect(localWriteAccepted).not.toHaveBeenCalled()
@@ -565,7 +600,7 @@ describe('runtime terminal owner routing', () => {
       await vi.advanceTimersByTimeAsync(0)
 
       await expect(accepted).resolves.toBe(true)
-      expect(localWriteAccepted).toHaveBeenCalledWith('local-pty', text)
+      expect(localWriteAccepted).toHaveBeenCalledWith('local-pty', text, 'driving')
       expect(localWrite).not.toHaveBeenCalled()
     } finally {
       vi.useRealTimers()
@@ -579,7 +614,8 @@ describe('runtime terminal owner routing', () => {
       const accepted = sendRuntimePtyInputVerified(
         { activeRuntimeEnvironmentId: null },
         'local-pty',
-        text
+        text,
+        'driving'
       )
 
       await vi.runAllTimersAsync()
@@ -614,7 +650,8 @@ describe('runtime terminal owner routing', () => {
       sendRuntimePtyInputVerified(
         { activeRuntimeEnvironmentId: 'env-2' },
         'remote:env-1@@terminal-1',
-        'x'
+        'x',
+        'driving'
       )
     ).resolves.toBe(true)
 
@@ -645,7 +682,8 @@ describe('runtime terminal owner routing', () => {
       sendRuntimePtyInputVerified(
         { activeRuntimeEnvironmentId: 'env-2' },
         'remote:env-1@@terminal-1',
-        'x'
+        'x',
+        'driving'
       )
     ).resolves.toBe(false)
 
@@ -831,10 +869,10 @@ describe('runtime terminal owner routing', () => {
     localWriteAccepted.mockResolvedValue(false)
 
     await expect(
-      sendRuntimePtyInputVerified({ activeRuntimeEnvironmentId: null }, 'local-pty', 'x')
+      sendRuntimePtyInputVerified({ activeRuntimeEnvironmentId: null }, 'local-pty', 'x', 'driving')
     ).resolves.toBe(true)
 
-    expect(localWriteAccepted).toHaveBeenCalledWith('local-pty', 'x')
-    expect(localWrite).toHaveBeenCalledWith('local-pty', 'x')
+    expect(localWriteAccepted).toHaveBeenCalledWith('local-pty', 'x', 'driving')
+    expect(localWrite).toHaveBeenCalledWith('local-pty', 'x', 'driving')
   })
 })
diff --git a/src/renderer/src/runtime/runtime-terminal-inspection.ts b/src/renderer/src/runtime/runtime-terminal-inspection.ts
index a5aa140ecf2f..d97615cdcc9f 100644
--- a/src/renderer/src/runtime/runtime-terminal-inspection.ts
+++ b/src/renderer/src/runtime/runtime-terminal-inspection.ts
@@ -24,6 +24,7 @@ export type {
   ClientOnlyUnverifiableInspection,
   ClientOnlyUnverifiableReason
 } from '../../../shared/terminal-process-inspection'
+import type { TerminalInputKind } from '../../../shared/terminal-input-kind'
 
 export type RuntimeTerminalProcessInspection = TerminalProcessInspection
 
@@ -220,7 +221,8 @@ export async function confirmRuntimeTerminalForegroundProcess(
 export function sendRuntimePtyInput(
   settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
   ptyId: string,
-  data: string
+  data: string,
+  inputKind: TerminalInputKind
 ): boolean {
   const tooLarge = isRuntimePtyInputTooLarge(data)
   if (tooLarge === true) {
@@ -232,13 +234,13 @@ export function sendRuntimePtyInput(
     void tooLarge
       .then((resolvedTooLarge) => {
         if (!resolvedTooLarge) {
-          sendRuntimePtyInputWithinLimit(settings, ptyId, data)
+          sendRuntimePtyInputWithinLimit(settings, ptyId, data, inputKind)
         }
       })
       .catch(() => {})
     return true
   }
-  return sendRuntimePtyInputWithinLimit(settings, ptyId, data)
+  return sendRuntimePtyInputWithinLimit(settings, ptyId, data, inputKind)
 }
 
 function resolveRuntimeSendTarget(
@@ -252,14 +254,17 @@ function resolveRuntimeSendTarget(
   return { target, terminal: getRemoteRuntimeTerminalHandle(ptyId) }
 }
 
+// Why the kind reaches only the local write: terminal.send has no launch kind, and its query-reply
+// kind is for mobile clients, so the host classifies a desktop's environment write by its bytes.
 function sendRuntimePtyInputWithinLimit(
   settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
   ptyId: string,
-  data: string
+  data: string,
+  inputKind: TerminalInputKind
 ): boolean {
   const { target, terminal } = resolveRuntimeSendTarget(settings, ptyId)
   if (target.kind !== 'environment' || !terminal) {
-    window.api.pty.write(ptyId, data)
+    window.api.pty.write(ptyId, data, inputKind)
     recordRuntimeTerminalInputForPtyId(ptyId)
     return true
   }
@@ -301,6 +306,7 @@ export async function sendRuntimePtyInputAcceptance(
   settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
   ptyId: string,
   data: string,
+  inputKind: TerminalInputKind,
   isCancelled?: () => boolean
 ): Promise<boolean> {
   const tooLarge = isRuntimePtyInputTooLarge(data)
@@ -314,7 +320,7 @@ export async function sendRuntimePtyInputAcceptance(
   if (target.kind !== 'environment' || !terminal) {
     // Why: fire-and-forget `write` can't observe a PTY-gone or mobile-lease
     // rejection; the acceptance path needs main's real answer.
-    const accepted = await window.api.pty.writeInputAccepted(ptyId, data)
+    const accepted = await window.api.pty.writeInputAccepted(ptyId, data, inputKind)
     if (accepted) {
       recordRuntimeTerminalInputForPtyId(ptyId)
     }
@@ -341,6 +347,7 @@ export async function sendRuntimePtyInputVerified(
   settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
   ptyId: string,
   data: string,
+  inputKind: TerminalInputKind,
   isCancelled?: () => boolean
 ): Promise<boolean> {
   const tooLarge = isRuntimePtyInputTooLarge(data)
@@ -352,12 +359,12 @@ export async function sendRuntimePtyInputVerified(
   }
   const { target, terminal } = resolveRuntimeSendTarget(settings, ptyId)
   if (target.kind !== 'environment' || !terminal) {
-    const accepted = await window.api.pty.writeAccepted(ptyId, data)
+    const accepted = await window.api.pty.writeAccepted(ptyId, data, inputKind)
     if (!accepted) {
       if (isCancelled?.()) {
         return false
       }
-      window.api.pty.write(ptyId, data)
+      window.api.pty.write(ptyId, data, inputKind)
       // Why: SSH/local fallback writes are fire-and-forget. Callers use this
       // boolean to continue UX flow, while hook telemetry confirms real turns.
       recordRuntimeTerminalInputForPtyId(ptyId)
diff --git a/src/renderer/src/runtime/structured-agent-session-accepted-send-capability.test.tsx b/src/renderer/src/runtime/structured-agent-session-accepted-send-capability.test.tsx
new file mode 100644
index 000000000000..acdfdbb03233
--- /dev/null
+++ b/src/renderer/src/runtime/structured-agent-session-accepted-send-capability.test.tsx
@@ -0,0 +1,51 @@
+// @vitest-environment happy-dom
+
+import { renderHook, waitFor } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY } from '../../../shared/protocol-version'
+
+const mocks = vi.hoisted(() => ({ supports: vi.fn() }))
+
+vi.mock('./runtime-rpc-client', () => ({
+  runtimeEnvironmentSupportsCapability: mocks.supports
+}))
+
+import { setLocalRuntimeCapabilitiesForTests } from './local-runtime-capabilities'
+import { useStructuredAgentSessionHostAcceptsSend } from './structured-agent-session-accepted-send-capability'
+
+afterEach(() => {
+  setLocalRuntimeCapabilitiesForTests(null)
+  vi.clearAllMocks()
+})
+
+describe('whether a host accepts a send before any agent has it', () => {
+  it('reads the local host from its advertised capabilities', () => {
+    setLocalRuntimeCapabilitiesForTests([AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY])
+    const { result } = renderHook(() => useStructuredAgentSessionHostAcceptsSend({ kind: 'local' }))
+    expect(result.current).toBe(true)
+  })
+
+  it('treats a local host that does not advertise it as an older one', () => {
+    setLocalRuntimeCapabilitiesForTests([])
+    const { result } = renderHook(() => useStructuredAgentSessionHostAcceptsSend({ kind: 'local' }))
+    expect(result.current).toBe(false)
+  })
+
+  it('asks a remote host, and reads a failed probe as an older host', async () => {
+    mocks.supports.mockResolvedValueOnce(true).mockRejectedValueOnce(new Error('offline'))
+    const accepts = renderHook(() =>
+      useStructuredAgentSessionHostAcceptsSend({ kind: 'environment', environmentId: 'env-1' })
+    )
+    await waitFor(() => expect(accepts.result.current).toBe(true))
+    expect(mocks.supports).toHaveBeenCalledWith(
+      'env-1',
+      AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY
+    )
+
+    const offline = renderHook(() =>
+      useStructuredAgentSessionHostAcceptsSend({ kind: 'environment', environmentId: 'env-2' })
+    )
+    await waitFor(() => expect(mocks.supports).toHaveBeenCalledTimes(2))
+    expect(offline.result.current).toBe(false)
+  })
+})
diff --git a/src/renderer/src/runtime/structured-agent-session-accepted-send-capability.ts b/src/renderer/src/runtime/structured-agent-session-accepted-send-capability.ts
new file mode 100644
index 000000000000..0df8fdbea31a
--- /dev/null
+++ b/src/renderer/src/runtime/structured-agent-session-accepted-send-capability.ts
@@ -0,0 +1,49 @@
+import { useLayoutEffect, useRef, type RefObject } from 'react'
+import { AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY } from '../../../shared/protocol-version'
+import type { RuntimeClientTarget } from './runtime-client-target'
+import {
+  structuredAgentSessionHostKey,
+  useStructuredAgentSessionHostCapability
+} from './structured-agent-session-host-capability'
+
+/**
+ * Whether the host answers a send at acceptance and never refuses one because its agent could not
+ * start. Such a host records every send before it starts anything, so nothing about a moved fence
+ * calls for a resend. False until the host has said so: an older host is handled as it always was.
+ */
+export function useStructuredAgentSessionHostAcceptsSend(target: RuntimeClientTarget): boolean {
+  return useStructuredAgentSessionHostCapability(
+    target,
+    AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY
+  )
+}
+
+/**
+ * When an outbox treats its owner as changed: resending a send in flight under the same id,
+ * dropping that send's answer, and unblocking a refused head. An older host restarts the agent
+ * inside the send and refuses it, unrecorded, when that fails, so a new fence is its only word that
+ * another try may land. A host that accepts first records every send before it starts anything,
+ * so a moved fence means nothing there, and only a Retry or a new send goes out.
+ */
+export function useStructuredAgentSessionOutboxOwnerChange(
+  target: RuntimeClientTarget,
+  fence: number | null
+): {
+  ownerChange: number | null
+  attached: boolean
+  fenceRef: RefObject<number | null>
+  targetKey: string
+} {
+  const acceptsSend = useStructuredAgentSessionHostAcceptsSend(target)
+  // Read by effects that run on an owner change, not on every fence move.
+  const fenceRef = useRef(fence)
+  useLayoutEffect(() => {
+    fenceRef.current = fence
+  }, [fence])
+  return {
+    ownerChange: acceptsSend ? null : fence,
+    attached: fence !== null,
+    fenceRef,
+    targetKey: structuredAgentSessionHostKey(target)
+  }
+}
diff --git a/src/renderer/src/runtime/structured-agent-session-host-capability.test.tsx b/src/renderer/src/runtime/structured-agent-session-host-capability.test.tsx
new file mode 100644
index 000000000000..121b0719d3d4
--- /dev/null
+++ b/src/renderer/src/runtime/structured-agent-session-host-capability.test.tsx
@@ -0,0 +1,53 @@
+// @vitest-environment happy-dom
+
+import { renderHook, waitFor } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import {
+  AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
+  AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY
+} from '../../../shared/protocol-version'
+
+const mocks = vi.hoisted(() => ({ supports: vi.fn() }))
+
+vi.mock('./runtime-rpc-client', () => ({
+  runtimeEnvironmentSupportsCapability: mocks.supports
+}))
+
+import { setLocalRuntimeCapabilitiesForTests } from './local-runtime-capabilities'
+import { useStructuredAgentSessionHostStopsConversation } from './structured-agent-session-host-capability'
+
+afterEach(() => {
+  setLocalRuntimeCapabilitiesForTests(null)
+  vi.clearAllMocks()
+})
+
+describe('whether a host takes a Stop naming no turn', () => {
+  it('reads it from the host capability of that name, not from accepting sends first', () => {
+    setLocalRuntimeCapabilitiesForTests([AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY])
+    expect(
+      renderHook(() => useStructuredAgentSessionHostStopsConversation({ kind: 'local' })).result
+        .current
+    ).toBe(false)
+
+    setLocalRuntimeCapabilitiesForTests([AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY])
+    expect(
+      renderHook(() => useStructuredAgentSessionHostStopsConversation({ kind: 'local' })).result
+        .current
+    ).toBe(true)
+  })
+
+  it('asks a remote host for that capability', async () => {
+    mocks.supports.mockResolvedValueOnce(true)
+    const { result } = renderHook(() =>
+      useStructuredAgentSessionHostStopsConversation({
+        kind: 'environment',
+        environmentId: 'env-1'
+      })
+    )
+    await waitFor(() => expect(result.current).toBe(true))
+    expect(mocks.supports).toHaveBeenCalledWith(
+      'env-1',
+      AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY
+    )
+  })
+})
diff --git a/src/renderer/src/runtime/structured-agent-session-host-capability.ts b/src/renderer/src/runtime/structured-agent-session-host-capability.ts
new file mode 100644
index 000000000000..22e59365bf1c
--- /dev/null
+++ b/src/renderer/src/runtime/structured-agent-session-host-capability.ts
@@ -0,0 +1,63 @@
+import { useEffect, useState } from 'react'
+import {
+  AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY,
+  type RuntimeCapability
+} from '../../../shared/protocol-version'
+import type { RuntimeClientTarget } from './runtime-client-target'
+import {
+  ensureLocalRuntimeCapabilities,
+  readLocalRuntimeCapabilitiesOrUnknown
+} from './local-runtime-capabilities'
+import { runtimeEnvironmentSupportsCapability } from './runtime-rpc-client'
+
+export function structuredAgentSessionHostKey(target: RuntimeClientTarget): string {
+  return target.kind === 'local' ? 'local' : `environment:${target.environmentId}`
+}
+
+/** Whether the session's host advertises `capability`. False until the host has said so, and for
+ *  a failed probe: an older host is handled as it always was. */
+export function useStructuredAgentSessionHostCapability(
+  target: RuntimeClientTarget,
+  capability: RuntimeCapability
+): boolean {
+  const key = structuredAgentSessionHostKey(target)
+  const [answer, setAnswer] = useState<{ key: string; supported: boolean }>(() => ({
+    key,
+    supported:
+      target.kind === 'local' &&
+      (readLocalRuntimeCapabilitiesOrUnknown()?.includes(capability) ?? false)
+  }))
+  const environmentId = target.kind === 'environment' ? target.environmentId : null
+  useEffect(() => {
+    let cancelled = false
+    const probe =
+      environmentId === null
+        ? ensureLocalRuntimeCapabilities().then(
+            (capabilities) => capabilities?.includes(capability) ?? false
+          )
+        : runtimeEnvironmentSupportsCapability(environmentId, capability)
+    void probe
+      .catch(() => false)
+      .then((supported) => {
+        if (!cancelled) {
+          setAnswer((current) =>
+            current.key === key && current.supported === supported ? current : { key, supported }
+          )
+        }
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [capability, environmentId, key])
+  return answer.key === key && answer.supported
+}
+
+/** Whether the host takes a Stop naming no turn: the only Stop before the provider opens one. */
+export function useStructuredAgentSessionHostStopsConversation(
+  target: RuntimeClientTarget
+): boolean {
+  return useStructuredAgentSessionHostCapability(
+    target,
+    AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY
+  )
+}
diff --git a/src/renderer/src/runtime/structured-agent-session-status-feed-lifecycle.test.ts b/src/renderer/src/runtime/structured-agent-session-status-feed-lifecycle.test.ts
index 4f98700d8067..e192bddae52e 100644
--- a/src/renderer/src/runtime/structured-agent-session-status-feed-lifecycle.test.ts
+++ b/src/renderer/src/runtime/structured-agent-session-status-feed-lifecycle.test.ts
@@ -27,7 +27,9 @@ const owned: AgentSessionStatusSummary = {
   status: 'working',
   latestPrompt: 'work',
   updatedAt: 1,
-  hostExecutionOwned: true
+  hostExecutionOwned: true,
+  hostExecutionPhase: 'starting',
+  hostExecutionChild: { generation: 'child-1', fence: 1 }
 }
 const done: AgentSessionStatusSummary = {
   ...owned,
@@ -69,7 +71,12 @@ describe('structured status feed execution authority lifecycle', () => {
     subscription().emit({ type: 'snapshot', sessions: [owned, done] })
     subscription().emit({ type: 'end' })
     expect(subscription().unsubscribe).toHaveBeenCalledOnce()
-    expect(feed.getSnapshot().get('running')).toEqual({ ...owned, hostExecutionOwned: undefined })
+    expect(feed.getSnapshot().get('running')).toEqual({
+      ...owned,
+      hostExecutionOwned: undefined,
+      hostExecutionPhase: undefined,
+      hostExecutionChild: undefined
+    })
     expect(feed.getSnapshot().get('completed')).toBe(done)
     subscription().emit({ type: 'status', session: owned })
     expect(feed.getSnapshot().get('running')?.hostExecutionOwned).toBeUndefined()
diff --git a/src/renderer/src/runtime/structured-agent-session-status-feed.ts b/src/renderer/src/runtime/structured-agent-session-status-feed.ts
index 84bbcacdeccf..7e4d7f27eb8e 100644
--- a/src/renderer/src/runtime/structured-agent-session-status-feed.ts
+++ b/src/renderer/src/runtime/structured-agent-session-status-feed.ts
@@ -95,7 +95,12 @@ function createOwner(target: RuntimeClientTarget): OwnedStatusFeed {
       if (!next) {
         next = new Map(snapshot)
       }
-      const { hostExecutionOwned: _owned, hostExecutionPhase: _phase, ...retained } = summary
+      const {
+        hostExecutionOwned: _owned,
+        hostExecutionPhase: _phase,
+        hostExecutionChild: _child,
+        ...retained
+      } = summary
       next.set(sessionId, retained)
     }
     if (next) {
diff --git a/src/renderer/src/runtime/structured-agent-session-tab-retirement.test.ts b/src/renderer/src/runtime/structured-agent-session-tab-retirement.test.ts
index 7963b1c150ec..5c3017998c04 100644
--- a/src/renderer/src/runtime/structured-agent-session-tab-retirement.test.ts
+++ b/src/renderer/src/runtime/structured-agent-session-tab-retirement.test.ts
@@ -84,7 +84,6 @@ describe('structured agent session tab retirement', () => {
     beginStructuredAgentSessionTabClose({
       target,
       worktreeId: 'wt-1',
-      tabId: 'agent-tab-1',
       sessionId: 'session-1',
       provisional: true
     })
@@ -119,13 +118,11 @@ describe('structured agent session tab retirement', () => {
     retireStructuredAgentSessionTab({
       target,
       worktreeId: 'wt-1',
-      tabId: 'agent-tab-1',
       sessionId: 'session-1'
     })
     retireStructuredAgentSessionTab({
       target,
       worktreeId: 'wt-1',
-      tabId: 'agent-tab-1',
       sessionId: 'session-1'
     })
     expect(mocks.closeSession).toHaveBeenCalledTimes(1)
diff --git a/src/renderer/src/runtime/structured-agent-session-tab-retirement.ts b/src/renderer/src/runtime/structured-agent-session-tab-retirement.ts
index 8489aa0e6a6a..567e7459603a 100644
--- a/src/renderer/src/runtime/structured-agent-session-tab-retirement.ts
+++ b/src/renderer/src/runtime/structured-agent-session-tab-retirement.ts
@@ -19,7 +19,6 @@ function retirementKey(target: RuntimeClientTarget, worktreeId: string, sessionI
 export function retireStructuredAgentSessionTab(args: {
   target: RuntimeClientTarget
   worktreeId: string
-  tabId: string
   sessionId: string
   onError?: (error: unknown) => void
 }): void {
@@ -28,11 +27,13 @@ export function retireStructuredAgentSessionTab(args: {
   if (existing) {
     return
   }
+  const hostTabId = `agent-session:${args.sessionId}`
+  // Why: main echoes the host tab id it was asked to close, never this window's tab id.
   const closeHostTab = () =>
-    withLocalSessionTabCloseOwner(args.worktreeId, args.tabId, () =>
+    withLocalSessionTabCloseOwner(args.worktreeId, hostTabId, () =>
       callRuntimeRpc(args.target, 'session.tabs.close', {
         worktree: toRuntimeWorktreeSelector(args.worktreeId),
-        tabId: `agent-session:${args.sessionId}`,
+        tabId: hostTabId,
         reason: 'user'
       })
     )
@@ -58,7 +59,6 @@ export function retireStructuredAgentSessionTab(args: {
 export function beginStructuredAgentSessionTabClose(args: {
   target: RuntimeClientTarget
   worktreeId: string
-  tabId: string
   sessionId: string
   provisional: boolean
   onError?: (error: unknown) => void
@@ -92,7 +92,6 @@ export function suppressCancelledStructuredSessionTabs(
     retireStructuredAgentSessionTab({
       target,
       worktreeId: snapshot.worktree,
-      tabId: `agent-session:${sessionId}`,
       sessionId,
       onError
     })
diff --git a/src/renderer/src/runtime/structured-conversation-tab-replacement.test.ts b/src/renderer/src/runtime/structured-conversation-tab-replacement.test.ts
index 8f34606ef27f..c6804fb43390 100644
--- a/src/renderer/src/runtime/structured-conversation-tab-replacement.test.ts
+++ b/src/renderer/src/runtime/structured-conversation-tab-replacement.test.ts
@@ -94,10 +94,10 @@ describe('clear pane identity', () => {
         groupId: 'local-group',
         isPinned: true
       })
-      expect(next.groupsByWorktree?.[WT]?.[0]).toMatchObject({
-        activeTabId: 'local-pane'
-      })
-      expect(next.groupsByWorktree?.[WT]?.[0]?.tabOrder[0]).toBe('local-pane')
+      // An omitted groups patch means the snapshot left every group as it was.
+      const nextGroup = (next.groupsByWorktree ?? state.groupsByWorktree)[WT]?.[0]
+      expect(nextGroup).toMatchObject({ activeTabId: 'local-pane' })
+      expect(nextGroup?.tabOrder[0]).toBe('local-pane')
       expect(next.activeTabIdByWorktree?.[WT] ?? state.activeTabIdByWorktree[WT]).toBe('local-pane')
       expect(next.tabsByWorktree?.[WT] ?? []).toEqual([])
       const repeated = applyWebSessionTabsSnapshot({ ...state, ...next }, snapshot, ENV, NOW + 1, {
diff --git a/src/renderer/src/runtime/sync-runtime-graph-agent-status-projection.test.ts b/src/renderer/src/runtime/sync-runtime-graph-agent-status-projection.test.ts
index 2ac4a8bbfd76..b78bb3175851 100644
--- a/src/renderer/src/runtime/sync-runtime-graph-agent-status-projection.test.ts
+++ b/src/renderer/src/runtime/sync-runtime-graph-agent-status-projection.test.ts
@@ -13,6 +13,10 @@ import {
 // under test so a drifted constant cannot make this reference silently disagree for a reason
 // unrelated to the change.
 const BUCKET_MS = AGENT_STATUS_SYNC_UPDATED_AT_BUCKET_MS_FOR_TESTS
+type MainAgentStatus = AppState['agentStatusByPaneKey'][string]['mainAgent']
+function mainAgentKey(mainAgent: MainAgentStatus) {
+  return mainAgent ? [mainAgent.state, mainAgent.outcome ?? null, mainAgent.stateStartedAt] : null
+}
 function referenceProjection(map: AppState['agentStatusByPaneKey']): string {
   return JSON.stringify(
     Object.entries(map)
@@ -25,20 +29,24 @@ function referenceProjection(map: AppState['agentStatusByPaneKey']): string {
         prompt: entry.prompt,
         updatedAtBucket: Math.floor(entry.updatedAt / BUCKET_MS),
         stateStartedAt: entry.stateStartedAt,
+        // A new turn can keep the state (child work held it open); its stamp alone must republish.
+        turnStartedAt: entry.turnStartedAt ?? null,
         agentType: entry.agentType ?? null,
         terminalTitle: entry.terminalTitle ?? null,
         stateHistory: entry.stateHistory.map((history) => ({
           state: history.state,
           prompt: history.prompt,
           startedAt: history.startedAt,
-          interrupted: history.interrupted ?? null
+          interrupted: history.interrupted ?? null,
+          mainAgent: mainAgentKey(history.mainAgent)
         })),
         toolName: entry.toolName ?? null,
         toolInput: entry.toolInput ?? null,
         interactivePrompt: entry.interactivePrompt ?? null,
         lastAssistantMessage: entry.lastAssistantMessage ?? null,
         lastAssistantMessageIsToolOutput: entry.lastAssistantMessageIsToolOutput ?? null,
-        interrupted: entry.interrupted ?? null
+        interrupted: entry.interrupted ?? null,
+        mainAgent: mainAgentKey(entry.mainAgent)
       }))
   )
 }
@@ -71,6 +79,7 @@ describe('mobile agent-status projection equivalence', () => {
     statusMaps.push({})
     statusMaps.push({ 'tab-0:leaf-0': makeEntry(0) })
     statusMaps.push({ 'tab-0:leaf-0': makeEntry(0, { workingMode: 'monitoring' }) })
+    statusMaps.push({ 'tab-0:leaf-0': makeEntry(0, { turnStartedAt: 1740000000500 }) })
     const many: AppState['agentStatusByPaneKey'] = {}
     for (let index = 0; index < 12; index += 1) {
       many[`tab-${index}:leaf-0`] = makeEntry(index)
@@ -145,4 +154,39 @@ describe('mobile agent-status projection equivalence', () => {
     expect([...projected].sort()).toEqual([...localeCompareOrderedEntries].sort())
     expect(projected).toHaveLength(localeCompareOrderedEntries.length)
   })
+
+  it('republishes a verdict change that leaves the interrupted flag as it was', () => {
+    resetRuntimeMobileAgentStatusProjectionCacheForTests()
+    const project = (live: 'success' | 'failure', history: 'success' | 'failure'): string =>
+      buildRuntimeMobileAgentStatusProjectionForTests({
+        'tab-0:leaf-0': makeEntry(0, {
+          state: 'done',
+          mainAgent: { state: 'done', outcome: live, stateStartedAt: 1740000000000 },
+          stateHistory: [
+            {
+              state: 'done',
+              prompt: 'p',
+              startedAt: 1,
+              mainAgent: { state: 'done', outcome: history, stateStartedAt: 1 }
+            }
+          ]
+        })
+      })
+    expect(project('failure', 'success')).not.toBe(project('success', 'success'))
+    expect(project('success', 'failure')).not.toBe(project('success', 'success'))
+  })
+
+  it('republishes a main agent failing while its subagents keep the row working', () => {
+    resetRuntimeMobileAgentStatusProjectionCacheForTests()
+    const project = (outcome?: 'failure', stateStartedAt = 1740000000000): string =>
+      buildRuntimeMobileAgentStatusProjectionForTests({
+        'tab-0:leaf-0': makeEntry(0, {
+          state: 'working',
+          mainAgent: { state: 'done', ...(outcome ? { outcome } : {}), stateStartedAt }
+        })
+      })
+    expect(project('failure')).not.toBe(project())
+    // The main agent's own clock dates the failure on mobile, so moving it republishes too.
+    expect(project('failure', 1740000001000)).not.toBe(project('failure'))
+  })
 })
diff --git a/src/renderer/src/runtime/sync-runtime-graph-projection-hot-path.test.ts b/src/renderer/src/runtime/sync-runtime-graph-projection-hot-path.test.ts
index 1a163ada0a82..587e30a769e4 100644
--- a/src/renderer/src/runtime/sync-runtime-graph-projection-hot-path.test.ts
+++ b/src/renderer/src/runtime/sync-runtime-graph-projection-hot-path.test.ts
@@ -35,6 +35,11 @@ const { AGENT_STATUS_SYNC_UPDATED_AT_BUCKET_MS } = await import('./sync-runtime-
 
 // ── Reference implementations: the pre-change bodies, kept verbatim ────────────────────
 
+type MainAgentStatus = AppState['agentStatusByPaneKey'][string]['mainAgent']
+function mainAgentKey(mainAgent: MainAgentStatus) {
+  return mainAgent ? [mainAgent.state, mainAgent.outcome ?? null, mainAgent.stateStartedAt] : null
+}
+
 function referenceEditorDraftsProjection(editorDrafts: AppState['editorDrafts']): string {
   return JSON.stringify(
     Object.fromEntries(
@@ -106,20 +111,23 @@ function referenceAgentStatusProjection(map: AppState['agentStatusByPaneKey']):
         prompt: entry.prompt,
         updatedAtBucket: Math.floor(entry.updatedAt / AGENT_STATUS_SYNC_UPDATED_AT_BUCKET_MS),
         stateStartedAt: entry.stateStartedAt,
+        turnStartedAt: entry.turnStartedAt ?? null,
         agentType: entry.agentType ?? null,
         terminalTitle: entry.terminalTitle ?? null,
         stateHistory: entry.stateHistory.map((history) => ({
           state: history.state,
           prompt: history.prompt,
           startedAt: history.startedAt,
-          interrupted: history.interrupted ?? null
+          interrupted: history.interrupted ?? null,
+          mainAgent: mainAgentKey(history.mainAgent)
         })),
         toolName: entry.toolName ?? null,
         toolInput: entry.toolInput ?? null,
         interactivePrompt: entry.interactivePrompt ?? null,
         lastAssistantMessage: entry.lastAssistantMessage ?? null,
         lastAssistantMessageIsToolOutput: entry.lastAssistantMessageIsToolOutput ?? null,
-        interrupted: entry.interrupted ?? null
+        interrupted: entry.interrupted ?? null,
+        mainAgent: mainAgentKey(entry.mainAgent)
       }))
   )
 }
diff --git a/src/renderer/src/runtime/sync-runtime-graph-terminal-registration-ownership.test.ts b/src/renderer/src/runtime/sync-runtime-graph-terminal-registration-ownership.test.ts
index 97d17f3fc475..410e8dea763e 100644
--- a/src/renderer/src/runtime/sync-runtime-graph-terminal-registration-ownership.test.ts
+++ b/src/renderer/src/runtime/sync-runtime-graph-terminal-registration-ownership.test.ts
@@ -1,3 +1,4 @@
+// @vitest-environment happy-dom
 import { describe, expect, it, vi } from 'vitest'
 import {
   buildMobileSessionTabSnapshots,
@@ -77,11 +78,24 @@ describe('runtime terminal registration ownership', () => {
   })
 
   it('focuses the requested worktree when tab ids collide', () => {
-    const focusA = vi.fn()
-    const focusB = vi.fn()
+    const textareaA = document.createElement('textarea')
+    const textareaB = document.createElement('textarea')
+    document.body.append(textareaA, textareaB)
+    const focusA = vi.fn(() => textareaA.focus())
+    const focusB = vi.fn(() => textareaB.focus())
     const container = { querySelector: () => null }
-    const paneA = { id: 1, leafId: LEAF_A, container, terminal: { focus: focusA } }
-    const paneB = { id: 1, leafId: LEAF_B, container, terminal: { focus: focusB } }
+    const paneA = {
+      id: 1,
+      leafId: LEAF_A,
+      container,
+      terminal: { focus: focusA, textarea: textareaA }
+    }
+    const paneB = {
+      id: 1,
+      leafId: LEAF_B,
+      container,
+      terminal: { focus: focusB, textarea: textareaB }
+    }
     const managerA = {
       getPanes: () => [paneA],
       getActivePane: () => paneA,
@@ -113,9 +127,12 @@ describe('runtime terminal registration ownership', () => {
     try {
       expect(focusRuntimeTerminalSurface(TAB_ID, null, WORKTREE_B)).toBe(true)
       expect(focusB).toHaveBeenCalledOnce()
+      expect(document.activeElement).toBe(textareaB)
       expect(focusA).not.toHaveBeenCalled()
       expect(focusRuntimeTerminalSurface(TAB_ID)).toBe(false)
     } finally {
+      textareaA.remove()
+      textareaB.remove()
       unregisterB()
       unregisterA()
     }
diff --git a/src/renderer/src/runtime/sync-runtime-graph.ts b/src/renderer/src/runtime/sync-runtime-graph.ts
index aadc0c44cadc..e536959761e6 100644
--- a/src/renderer/src/runtime/sync-runtime-graph.ts
+++ b/src/renderer/src/runtime/sync-runtime-graph.ts
@@ -90,8 +90,12 @@ export function focusRuntimeTerminalSurface(
     if (activePaneIsCoveredByNativeChat(manager)) {
       return true
     }
-    manager.getActivePane()?.terminal.focus()
-    return true
+    const pane = manager.getActivePane()
+    if (!pane) {
+      return false
+    }
+    pane.terminal.focus()
+    return !!pane.terminal.textarea && document.activeElement === pane.terminal.textarea
   }
   const resolution = resolveLeafIdForManager(tabId, leafId, manager)
   if (resolution.status !== 'resolved') {
diff --git a/src/renderer/src/runtime/sync-runtime-graph/agent-status-projection.ts b/src/renderer/src/runtime/sync-runtime-graph/agent-status-projection.ts
index 16c188edef5e..25b655738396 100644
--- a/src/renderer/src/runtime/sync-runtime-graph/agent-status-projection.ts
+++ b/src/renderer/src/runtime/sync-runtime-graph/agent-status-projection.ts
@@ -1,7 +1,12 @@
 import type { AppState } from '@/store/types'
+import type { AgentMainAgentStatus } from '../../../../shared/main-agent-status'
 import { AGENT_STATUS_SYNC_UPDATED_AT_BUCKET_MS, graphState } from './graph-state'
 import type { AgentStatusProjectionCacheEntry } from './types'
 
+function mainAgentKey(mainAgent: AgentMainAgentStatus | undefined) {
+  return mainAgent ? [mainAgent.state, mainAgent.outcome ?? null, mainAgent.stateStartedAt] : null
+}
+
 function serializeAgentStatusEntry(
   paneKey: string,
   entry: AppState['agentStatusByPaneKey'][string]
@@ -14,13 +19,15 @@ function serializeAgentStatusEntry(
     prompt: entry.prompt,
     updatedAtBucket: Math.floor(entry.updatedAt / AGENT_STATUS_SYNC_UPDATED_AT_BUCKET_MS),
     stateStartedAt: entry.stateStartedAt,
+    turnStartedAt: entry.turnStartedAt ?? null,
     agentType: entry.agentType ?? null,
     terminalTitle: entry.terminalTitle ?? null,
     stateHistory: entry.stateHistory.map((history) => ({
       state: history.state,
       prompt: history.prompt,
       startedAt: history.startedAt,
-      interrupted: history.interrupted ?? null
+      interrupted: history.interrupted ?? null,
+      mainAgent: mainAgentKey(history.mainAgent)
     })),
     toolName: entry.toolName ?? null,
     toolInput: entry.toolInput ?? null,
@@ -28,7 +35,9 @@ function serializeAgentStatusEntry(
     interactivePrompt: entry.interactivePrompt ?? null,
     lastAssistantMessage: entry.lastAssistantMessage ?? null,
     lastAssistantMessageIsToolOutput: entry.lastAssistantMessageIsToolOutput ?? null,
-    interrupted: entry.interrupted ?? null
+    interrupted: entry.interrupted ?? null,
+    // A failure changes the verdict and leaves `interrupted` as it was.
+    mainAgent: mainAgentKey(entry.mainAgent)
   })
 }
 
diff --git a/src/renderer/src/runtime/web-runtime-browser-creation-context.ts b/src/renderer/src/runtime/web-runtime-browser-creation-context.ts
index d82f287b4752..279c9169afc7 100644
--- a/src/renderer/src/runtime/web-runtime-browser-creation-context.ts
+++ b/src/renderer/src/runtime/web-runtime-browser-creation-context.ts
@@ -37,6 +37,8 @@ export type CreateWebRuntimeSessionBrowserTabArgs = {
   profileId?: string | null
   targetGroupId?: string
   clientTargetGroupId?: string
+  /** Client-only unified tab id the staged row follows; never sent to the host. */
+  clientAfterTabId?: string
   clientTargetGroupCreated?: boolean
   focusOnCreate?: boolean
   /** Wait until a renderer-backed host can publish the new page in its session snapshot. */
@@ -109,6 +111,18 @@ export function createWebRuntimeBrowserCreationContext(
   }
 }
 
+/**
+ * The client group this create is steered to. With an anchor only an explicit client destination
+ * counts; a host-facing targetGroupId would otherwise freeze the row away from the source's group.
+ */
+export function resolveWebRuntimeBrowserClientTargetGroupId(
+  args: CreateWebRuntimeSessionBrowserTabArgs
+): string | undefined {
+  return args.clientAfterTabId
+    ? args.clientTargetGroupId
+    : (args.clientTargetGroupId ?? args.targetGroupId)
+}
+
 export function stageWebRuntimeBrowserCreation(context: WebRuntimeBrowserCreationContext): void {
   const { args, environmentId, intentOwner, provisionalPageId, shouldFocusOnCreate } = context
   throwIfE2eWebRuntimeBrowserCapabilityUnavailable()
@@ -125,6 +139,7 @@ export function stageWebRuntimeBrowserCreation(context: WebRuntimeBrowserCreatio
   if (context.shouldSelectWorktree) {
     selectWebRuntimeSessionBrowserWorktree(args.worktreeId, environmentId)
   }
+  const stagedTargetGroupId = resolveWebRuntimeBrowserClientTargetGroupId(args)
   // Why: everything below this point is a host round-trip; stage the tab first so the strip
   // reacts to the click instead of to the runtime.
   context.staged = stageWebRuntimeBrowserTab({
@@ -135,9 +150,8 @@ export function stageWebRuntimeBrowserCreation(context: WebRuntimeBrowserCreatio
     ...(args.url !== undefined ? { url: args.url } : {}),
     ...(args.stagedTitle !== undefined ? { title: args.stagedTitle } : {}),
     ...(args.profileId !== undefined ? { profileId: args.profileId } : {}),
-    ...((args.clientTargetGroupId ?? args.targetGroupId)
-      ? { targetGroupId: (args.clientTargetGroupId ?? args.targetGroupId) as string }
-      : {}),
+    ...(stagedTargetGroupId ? { targetGroupId: stagedTargetGroupId } : {}),
+    ...(args.clientAfterTabId ? { afterTabId: args.clientAfterTabId } : {}),
     ...(args.stagedFocusAddressBar !== undefined
       ? { focusAddressBar: args.stagedFocusAddressBar }
       : {}),
diff --git a/src/renderer/src/runtime/web-runtime-browser-creation-placement-test-rig.ts b/src/renderer/src/runtime/web-runtime-browser-creation-placement-test-rig.ts
new file mode 100644
index 000000000000..6eacef429e37
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-browser-creation-placement-test-rig.ts
@@ -0,0 +1,244 @@
+import { vi } from 'vitest'
+import type { BrowserPage, BrowserWorkspace } from '../../../shared/browser-workspace-types'
+import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
+import type { Tab, TabGroup } from '../../../shared/tab-types'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import { useAppStore } from '../store'
+import type { AppState } from '../store/types'
+import { applyWebSessionTabsSnapshot } from './web-session-tabs-sync'
+import { ENV, NOW, WT, makeSnapshot } from './web-session-tabs-sync-test-harness'
+
+export const HOST: ExecutionHostId = `runtime:${ENV}`
+export const G1 = 'group-1'
+export const G2 = 'group-2'
+
+export type MirroredRow = { unifiedTabId: string; workspaceId: string; pageId: string }
+
+export function mirroredRow(name: string): MirroredRow {
+  return {
+    unifiedTabId: `${name}-tab`,
+    workspaceId: `${name}-workspace`,
+    pageId: `${name}-page`
+  }
+}
+
+export const SOURCE = mirroredRow('source')
+export const AFTER = mirroredRow('after')
+export const OTHER = mirroredRow('other')
+
+function workspace(row: MirroredRow): BrowserWorkspace {
+  return {
+    id: row.workspaceId,
+    worktreeId: WT,
+    activePageId: row.pageId,
+    pageIds: [row.pageId],
+    url: 'https://example.com/',
+    title: 'Example',
+    loading: false,
+    faviconUrl: null,
+    canGoBack: false,
+    canGoForward: false,
+    loadError: null,
+    createdAt: NOW
+  }
+}
+
+function page(row: MirroredRow): BrowserPage {
+  return {
+    id: row.pageId,
+    workspaceId: row.workspaceId,
+    worktreeId: WT,
+    url: 'https://example.com/',
+    title: 'Example',
+    loading: false,
+    faviconUrl: null,
+    canGoBack: false,
+    canGoForward: false,
+    loadError: null,
+    createdAt: NOW,
+    browserRuntimeEnvironmentId: ENV,
+    viewportPresetId: null
+  }
+}
+
+function unifiedTab(row: MirroredRow, groupId: string, sortOrder: number): Tab {
+  return {
+    id: row.unifiedTabId,
+    entityId: row.workspaceId,
+    groupId,
+    worktreeId: WT,
+    executionHostId: HOST,
+    contentType: 'browser',
+    label: 'Example',
+    customLabel: null,
+    color: null,
+    sortOrder,
+    createdAt: NOW,
+    lastFocusedAt: NOW - 10,
+    isPreview: false,
+    isPinned: false
+  }
+}
+
+export function runtimeStatusesFor(
+  capabilities: string[]
+): AppState['runtimeStatusByEnvironmentId'] {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: creation reads only status.capabilities from this entry.
+  return new Map([
+    [ENV, { status: { capabilities }, checkedAt: 1 }]
+  ]) as AppState['runtimeStatusByEnvironmentId']
+}
+
+/** G1 holds SOURCE then AFTER with SOURCE active; G2 holds OTHER and is the focused group. */
+export function seedPairedWorktree(): void {
+  const rows = [SOURCE, AFTER, OTHER]
+  const groups: TabGroup[] = [
+    {
+      id: G1,
+      worktreeId: WT,
+      activeTabId: SOURCE.unifiedTabId,
+      tabOrder: [SOURCE.unifiedTabId, AFTER.unifiedTabId],
+      recentTabIds: [SOURCE.unifiedTabId]
+    },
+    {
+      id: G2,
+      worktreeId: WT,
+      activeTabId: OTHER.unifiedTabId,
+      tabOrder: [OTHER.unifiedTabId],
+      recentTabIds: [OTHER.unifiedTabId]
+    }
+  ]
+  useAppStore.setState({
+    activeWorktreeId: WT,
+    activeWorkspaceExecutionHostId: HOST,
+    runtimeStatusByEnvironmentId: runtimeStatusesFor([
+      'browser.screencast.v1',
+      'browser.tab-create-known-id.v1'
+    ]),
+    browserTabsByWorktree: { [WT]: rows.map(workspace) },
+    browserPagesByWorkspace: Object.fromEntries(rows.map((row) => [row.workspaceId, [page(row)]])),
+    remoteBrowserPageHandlesByPageId: Object.fromEntries(
+      rows.map((row) => [row.pageId, { environmentId: ENV, remotePageId: row.pageId }])
+    ),
+    unifiedTabsByWorktree: {
+      [WT]: [unifiedTab(SOURCE, G1, 0), unifiedTab(AFTER, G1, 1), unifiedTab(OTHER, G2, 0)]
+    },
+    groupsByWorktree: { [WT]: groups },
+    activeGroupIdByWorktree: { [WT]: G2 },
+    layoutByWorktree: {
+      [WT]: {
+        type: 'split',
+        direction: 'horizontal',
+        first: { type: 'leaf', groupId: G1 },
+        second: { type: 'leaf', groupId: G2 }
+      }
+    },
+    activeTabType: 'browser',
+    activeTabTypeByWorktree: { [WT]: 'browser' },
+    activeBrowserTabId: OTHER.workspaceId,
+    activeBrowserTabIdByWorktree: { [WT]: OTHER.workspaceId },
+    tabBarOrderByWorktree: {}
+  })
+}
+
+function hostBrowserTab(
+  remotePageId: string,
+  hostWorkspaceId = `host-workspace-${remotePageId}`
+): RuntimeMobileSessionTabsResult['tabs'][number] {
+  return {
+    type: 'browser',
+    id: `host-tab-${remotePageId}`,
+    title: 'Example',
+    browserWorkspaceId: hostWorkspaceId,
+    browserPageId: remotePageId,
+    url: 'https://example.com/',
+    loading: false,
+    canGoBack: false,
+    canGoForward: false,
+    isActive: false
+  }
+}
+
+/** The host's page list; each publication mirrors every page it holds. */
+export const hostPages: string[] = []
+let snapshotVersion = 1
+
+export function publishHostSnapshot(): void {
+  snapshotVersion += 1
+  const snapshot = makeSnapshot(
+    [SOURCE.pageId, AFTER.pageId, OTHER.pageId, ...hostPages].map((id) => hostBrowserTab(id)),
+    { snapshotVersion, activeTabType: 'browser', activeTabId: null }
+  )
+  useAppStore.setState((state) =>
+    applyWebSessionTabsSnapshot(state, snapshot, ENV, NOW + snapshotVersion)
+  )
+}
+
+export function resetHostPages(): void {
+  hostPages.length = 0
+  snapshotVersion = 1
+}
+
+type Deferred = {
+  params: { page?: string; targetGroupId?: string } & Record<string, unknown>
+  resolve: (browserPageId?: string) => void
+  reject: (error: Error) => void
+}
+
+/** Every browser.tabCreate waits here until the test answers it. */
+export const pendingCreates: Deferred[] = []
+
+export function installRuntimeTransport(): ReturnType<typeof vi.fn> {
+  pendingCreates.length = 0
+  const call = vi.fn(
+    (request: { method: string; params: Deferred['params'] }) =>
+      new Promise((resolve, reject) => {
+        if (request.method === 'browser.tabCreate') {
+          pendingCreates.push({
+            params: request.params,
+            resolve: (browserPageId = request.params.page) => {
+              if (browserPageId) {
+                hostPages.push(browserPageId)
+              }
+              resolve({ id: 'create', ok: true, result: { browserPageId } })
+            },
+            reject
+          })
+          return
+        }
+        resolve({ id: request.method, ok: true, result: { closed: true } })
+      })
+  )
+  vi.stubGlobal('window', {
+    api: {
+      runtimeEnvironments: {
+        call,
+        prepareBrowserClientHostPlacement: vi.fn().mockResolvedValue({ kind: 'server' })
+      }
+    }
+  })
+  return call
+}
+
+export function groupOrder(groupId: string): string[] {
+  return useAppStore.getState().groupsByWorktree[WT]?.find((g) => g.id === groupId)?.tabOrder ?? []
+}
+
+export function wrapperForRemotePage(remotePageId: string): Tab | undefined {
+  const state = useAppStore.getState()
+  const workspace = (state.browserTabsByWorktree[WT] ?? []).find((candidate) =>
+    (state.browserPagesByWorkspace[candidate.id] ?? []).some(
+      (candidatePage) =>
+        state.remoteBrowserPageHandlesByPageId[candidatePage.id]?.remotePageId === remotePageId
+    )
+  )
+  return (state.unifiedTabsByWorktree[WT] ?? []).find(
+    (tab) => tab.contentType === 'browser' && tab.entityId === workspace?.id
+  )
+}
+
+export async function flushMicrotasks(): Promise<void> {
+  for (let index = 0; index < 20; index += 1) {
+    await Promise.resolve()
+  }
+}
diff --git a/src/renderer/src/runtime/web-runtime-browser-creation-placement.test.ts b/src/renderer/src/runtime/web-runtime-browser-creation-placement.test.ts
new file mode 100644
index 000000000000..45cd7433da8f
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-browser-creation-placement.test.ts
@@ -0,0 +1,343 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type * as SnapshotModule from './web-runtime-session-snapshot'
+import { useAppStore } from '../store'
+import { createWebRuntimeSessionBrowserTab } from './web-runtime-browser-creation'
+import { resetWebSessionBrowserPlacementsForTests } from './web-session-browser-placement'
+import { resetWebSessionTabsSyncTestState, ENV, WT } from './web-session-tabs-sync-test-harness'
+import {
+  AFTER,
+  G1,
+  G2,
+  HOST,
+  OTHER,
+  SOURCE,
+  flushMicrotasks,
+  groupOrder,
+  hostPages,
+  installRuntimeTransport,
+  pendingCreates,
+  publishHostSnapshot,
+  resetHostPages,
+  runtimeStatusesFor,
+  seedPairedWorktree,
+  wrapperForRemotePage
+} from './web-runtime-browser-creation-placement-test-rig'
+
+vi.mock('./web-runtime-session-snapshot', async (importOriginal) => ({
+  ...(await importOriginal<typeof SnapshotModule>()),
+  refreshWebRuntimeSessionTabsSnapshot: vi.fn(async () => publishHostSnapshot())
+}))
+
+function openLinkFromSource(
+  overrides: Partial<Parameters<typeof createWebRuntimeSessionBrowserTab>[0]> = {}
+): Promise<boolean> {
+  return createWebRuntimeSessionBrowserTab({
+    worktreeId: WT,
+    environmentId: ENV,
+    url: 'https://example.com/link',
+    clientAfterTabId: SOURCE.unifiedTabId,
+    focusOnCreate: false,
+    selectWorktree: false,
+    placementPreference: 'server',
+    ...overrides
+  })
+}
+
+function g1Group() {
+  return useAppStore.getState().groupsByWorktree[WT]?.find((group) => group.id === G1)
+}
+
+describe('paired browser creation placement', () => {
+  let runtimeCall: ReturnType<typeof installRuntimeTransport>
+
+  beforeEach(() => {
+    resetWebSessionTabsSyncTestState()
+    resetWebSessionBrowserPlacementsForTests()
+    resetHostPages()
+    seedPairedWorktree()
+    runtimeCall = installRuntimeTransport()
+  })
+
+  afterEach(() => {
+    vi.unstubAllGlobals()
+  })
+
+  it('stages each background link after its source before any await and keeps source, 3, 2, 1', async () => {
+    const creates = [openLinkFromSource(), openLinkFromSource(), openLinkFromSource()]
+    const staged = pendingCreates.map((create) => create.params.page ?? '')
+    // Why no await above: the rows exist off the synchronous part of each call.
+    const stagedIds = staged.map((pageId) => wrapperForRemotePage(pageId)!.id)
+    expect(groupOrder(G1)).toEqual([
+      SOURCE.unifiedTabId,
+      stagedIds[2],
+      stagedIds[1],
+      stagedIds[0],
+      AFTER.unifiedTabId
+    ])
+
+    for (const index of [2, 0, 1]) {
+      pendingCreates[index].resolve()
+      await flushMicrotasks()
+    }
+    await expect(Promise.all(creates)).resolves.toEqual([true, true, true])
+
+    expect(groupOrder(G1)).toEqual([
+      SOURCE.unifiedTabId,
+      stagedIds[2],
+      stagedIds[1],
+      stagedIds[0],
+      AFTER.unifiedTabId
+    ])
+    for (const pageId of staged) {
+      expect(wrapperForRemotePage(pageId)?.lastFocusedAt).toBeUndefined()
+    }
+    const state = useAppStore.getState()
+    expect(g1Group()).toMatchObject({
+      activeTabId: SOURCE.unifiedTabId,
+      recentTabIds: [SOURCE.unifiedTabId]
+    })
+    expect(state.activeGroupIdByWorktree[WT]).toBe(G2)
+    expect(state.activeBrowserTabIdByWorktree[WT]).toBe(OTHER.workspaceId)
+    expect(
+      state.unifiedTabsByWorktree[WT]?.find((tab) => tab.id === SOURCE.unifiedTabId)?.lastFocusedAt
+    ).toBeDefined()
+    // Repeated snapshots neither replay the anchor nor manufacture visits.
+    publishHostSnapshot()
+    expect(groupOrder(G1)[1]).toBe(stagedIds[2])
+    expect(g1Group()?.recentTabIds).toEqual([SOURCE.unifiedTabId])
+  })
+
+  it('keeps the host-facing RPC free of the client anchor', async () => {
+    void openLinkFromSource({ targetGroupId: 'host-group' })
+    expect(pendingCreates[0].params).not.toHaveProperty('clientAfterTabId')
+    expect(pendingCreates[0].params).not.toHaveProperty('afterTabId')
+    expect(pendingCreates[0].params).toMatchObject({
+      targetGroupId: 'host-group',
+      activate: false,
+      navigation: 'caller'
+    })
+    // A host-facing group never freezes the anchored staged row out of the source's group.
+    expect(groupOrder(G1)[1]).toBe(wrapperForRemotePage(pendingCreates[0].params.page!)?.id)
+    expect(wrapperForRemotePage(pendingCreates[0].params.page!)?.executionHostId).toBe(HOST)
+    pendingCreates[0].resolve()
+    await flushMicrotasks()
+    expect(runtimeCall).toHaveBeenCalledTimes(1)
+  })
+
+  it('appends Group New Browser Tab staging to the invoking group without an anchor', async () => {
+    const create = createWebRuntimeSessionBrowserTab({
+      worktreeId: WT,
+      environmentId: ENV,
+      url: 'about:blank',
+      targetGroupId: G1,
+      clientTargetGroupId: G1,
+      placementPreference: 'server'
+    })
+    const pageId = pendingCreates[0].params.page!
+    const created = wrapperForRemotePage(pageId)!.id
+    expect(groupOrder(G1)).toEqual([SOURCE.unifiedTabId, AFTER.unifiedTabId, created])
+    expect(useAppStore.getState().activeGroupIdByWorktree[WT]).toBe(G1)
+    pendingCreates[0].resolve()
+    await expect(create).resolves.toBe(true)
+    expect(groupOrder(G1)).toEqual([SOURCE.unifiedTabId, AFTER.unifiedTabId, created])
+  })
+
+  it('stages the store Group New Browser Tab command before its first await', async () => {
+    useAppStore.setState({
+      browserDefaultUrl: 'about:blank',
+      repos: [
+        {
+          id: 'repo',
+          path: '/repo',
+          displayName: 'Repo',
+          badgeColor: '#000000',
+          addedAt: 1,
+          connectionId: null,
+          executionHostId: HOST
+        }
+      ],
+      worktreesByRepo: {
+        repo: [
+          {
+            id: WT,
+            repoId: 'repo',
+            path: '/worktree',
+            head: 'abc',
+            branch: 'main',
+            isBare: false,
+            isMainWorktree: false,
+            displayName: 'Worktree',
+            comment: '',
+            linkedIssue: null,
+            linkedPR: null,
+            linkedLinearIssue: null,
+            isArchived: false,
+            isUnread: false,
+            isPinned: false,
+            sortOrder: 0,
+            lastActivityAt: 1
+          }
+        ]
+      }
+    })
+    const open = useAppStore.getState().openNewBrowserTabInActiveWorkspace(G1)
+    const order = groupOrder(G1)
+    expect(order.slice(0, 2)).toEqual([SOURCE.unifiedTabId, AFTER.unifiedTabId])
+    expect(order).toHaveLength(3)
+    const created = order[2]
+    await flushMicrotasks()
+    expect(pendingCreates[0].params).toMatchObject({ targetGroupId: G1 })
+    expect(wrapperForRemotePage(pendingCreates[0].params.page!)?.id).toBe(created)
+    pendingCreates[0].resolve()
+    await open
+    expect(groupOrder(G1)).toEqual([SOURCE.unifiedTabId, AFTER.unifiedTabId, created])
+  })
+
+  it('fills an empty group structurally without adoption recording a visit', async () => {
+    const state = useAppStore.getState()
+    useAppStore.setState({
+      groupsByWorktree: {
+        [WT]: [
+          ...state.groupsByWorktree[WT]!,
+          { id: 'group-3', worktreeId: WT, activeTabId: null, tabOrder: [], recentTabIds: [] }
+        ]
+      },
+      layoutByWorktree: {
+        [WT]: {
+          type: 'split',
+          direction: 'horizontal',
+          first: state.layoutByWorktree[WT]!,
+          second: { type: 'leaf', groupId: 'group-3' }
+        }
+      }
+    })
+    const create = createWebRuntimeSessionBrowserTab({
+      worktreeId: WT,
+      environmentId: ENV,
+      url: 'https://example.com/',
+      clientTargetGroupId: 'group-3',
+      focusOnCreate: false,
+      selectWorktree: false,
+      placementPreference: 'server'
+    })
+    const created = wrapperForRemotePage(pendingCreates[0].params.page!)!.id
+    pendingCreates[0].resolve()
+    await expect(create).resolves.toBe(true)
+    publishHostSnapshot()
+    expect(
+      useAppStore.getState().groupsByWorktree[WT]?.find((group) => group.id === 'group-3')
+    ).toMatchObject({ activeTabId: created, tabOrder: [created], recentTabIds: [] })
+    expect(useAppStore.getState().activeGroupIdByWorktree[WT]).toBe(G2)
+  })
+
+  it('keeps a staged row the user dragged elsewhere through adoption', async () => {
+    const create = openLinkFromSource()
+    const pageId = pendingCreates[0].params.page!
+    const staged = wrapperForRemotePage(pageId)!.id
+    useAppStore.getState().moveUnifiedTabToGroup(staged, G2)
+    pendingCreates[0].resolve()
+    await expect(create).resolves.toBe(true)
+    expect(groupOrder(G2)).toContain(staged)
+    expect(groupOrder(G1)).toEqual([SOURCE.unifiedTabId, AFTER.unifiedTabId])
+  })
+
+  it('does not reclaim focus after the user selects another tab mid-create', async () => {
+    const create = openLinkFromSource({ focusOnCreate: true })
+    const staged = wrapperForRemotePage(pendingCreates[0].params.page!)!.id
+    expect(g1Group()?.activeTabId).toBe(staged)
+    useAppStore.getState().activateTab(OTHER.unifiedTabId)
+    useAppStore.getState().activateTab(SOURCE.unifiedTabId)
+    pendingCreates[0].resolve()
+    await expect(create).resolves.toBe(true)
+    publishHostSnapshot()
+    expect(g1Group()?.activeTabId).toBe(SOURCE.unifiedTabId)
+    expect(useAppStore.getState().activeWorktreeId).toBe(WT)
+  })
+
+  it('stages before a deferred hosting preparation resolves', async () => {
+    let answerPreparation!: (placement: { kind: 'server' }) => void
+    const prepare = vi.fn(
+      () =>
+        new Promise<{ kind: 'server' }>((resolve) => {
+          answerPreparation = resolve
+        })
+    )
+    vi.stubGlobal('window', {
+      api: {
+        runtimeEnvironments: { call: runtimeCall, prepareBrowserClientHostPlacement: prepare }
+      }
+    })
+    const create = openLinkFromSource({ placementPreference: 'auto' })
+    const stagedRows = groupOrder(G1)
+    expect(stagedRows).toHaveLength(3)
+    useAppStore.getState().focusGroup(WT, G2)
+    await flushMicrotasks()
+    answerPreparation({ kind: 'server' })
+    await flushMicrotasks()
+    pendingCreates[0].resolve()
+    await expect(create).resolves.toBe(true)
+    expect(groupOrder(G1)).toEqual(stagedRows)
+    expect(useAppStore.getState().activeGroupIdByWorktree[WT]).toBe(G2)
+  })
+
+  it('rehomes a staged row in place when an older host answers with its own id first', async () => {
+    useAppStore.setState({
+      runtimeStatusByEnvironmentId: runtimeStatusesFor(['browser.screencast.v1'])
+    })
+    const create = openLinkFromSource()
+    const staged = groupOrder(G1)[1]
+    expect(pendingCreates[0].params.page).toBeUndefined()
+    pendingCreates[0].resolve('host-minted-page')
+    await expect(create).resolves.toBe(true)
+    expect(groupOrder(G1)).toEqual([SOURCE.unifiedTabId, staged, AFTER.unifiedTabId])
+    expect(wrapperForRemotePage('host-minted-page')?.id).toBe(staged)
+  })
+
+  it('keeps the mirrored row and discards the stage when an older host mirrors first', async () => {
+    useAppStore.setState({
+      runtimeStatusByEnvironmentId: runtimeStatusesFor(['browser.screencast.v1'])
+    })
+    const create = openLinkFromSource()
+    const staged = groupOrder(G1)[1]
+    hostPages.push('host-minted-page')
+    publishHostSnapshot()
+    hostPages.pop()
+    pendingCreates[0].resolve('host-minted-page')
+    await expect(create).resolves.toBe(true)
+    const mirrored = wrapperForRemotePage('host-minted-page')!
+    const browserRows = useAppStore
+      .getState()
+      .unifiedTabsByWorktree[WT]!.filter((tab) => tab.contentType === 'browser')
+    expect(browserRows).toHaveLength(4)
+    expect(mirrored.id).not.toBe(staged)
+    expect(groupOrder(G1)).not.toContain(staged)
+    // Compatibility limit: exact adjacency is not replayed onto the mirrored row.
+    publishHostSnapshot()
+    expect(useAppStore.getState().unifiedTabsByWorktree[WT]).toHaveLength(4)
+  })
+
+  it('falls back to ordinary adoption without adjacency when staging fails', async () => {
+    const createBrowserTab = useAppStore.getState().createBrowserTab
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    useAppStore.setState({
+      createBrowserTab: () => {
+        throw new Error('staging refused')
+      }
+    })
+    try {
+      const create = openLinkFromSource()
+      expect(groupOrder(G1)).toEqual([SOURCE.unifiedTabId, AFTER.unifiedTabId])
+      useAppStore.setState({ createBrowserTab })
+      pendingCreates[0].resolve()
+      await expect(create).resolves.toBe(true)
+      const adopted = wrapperForRemotePage(pendingCreates[0].params.page!)
+      expect(adopted).toBeDefined()
+      expect(
+        useAppStore.getState().unifiedTabsByWorktree[WT]!.filter((tab) => tab.id === adopted!.id)
+      ).toHaveLength(1)
+      expect(groupOrder(G1).indexOf(adopted!.id)).not.toBe(1)
+    } finally {
+      warn.mockRestore()
+    }
+  })
+})
diff --git a/src/renderer/src/runtime/web-runtime-browser-creation.ts b/src/renderer/src/runtime/web-runtime-browser-creation.ts
index 99ad27d0adb5..abb119fe9159 100644
--- a/src/renderer/src/runtime/web-runtime-browser-creation.ts
+++ b/src/renderer/src/runtime/web-runtime-browser-creation.ts
@@ -16,6 +16,7 @@ import {
   completeWebRuntimeBrowserCreation,
   createWebRuntimeBrowserCreationContext,
   rehomeWebRuntimeBrowserCreation,
+  resolveWebRuntimeBrowserClientTargetGroupId,
   restageWebRuntimeBrowserCreation,
   stageWebRuntimeBrowserCreation,
   type CreateWebRuntimeSessionBrowserTabArgs
@@ -30,6 +31,7 @@ import {
 } from './web-runtime-browser-creation-e2e-fault'
 import { isWebRuntimeSessionActive } from './web-runtime-session-environment'
 import { refreshWebRuntimeSessionTabsSnapshot } from './web-runtime-session-snapshot'
+import { registerPairedBrowserTabCreator } from '../store/slices/browser/paired-browser-tab-creator'
 
 export async function createWebRuntimeSessionBrowserTab(
   args: CreateWebRuntimeSessionBrowserTabArgs
@@ -131,6 +133,11 @@ export async function createWebRuntimeSessionBrowserTab(
     if (created.browserPageId !== context.provisionalPageId) {
       rehomeWebRuntimeBrowserCreation(context, created.browserPageId)
     }
+    // Why: a staged row the user moved is judged where it renders now, not where it was requested.
+    const resolveExpectedGroupId = (): string | undefined =>
+      (context.staged
+        ? resolveStagedWebRuntimeBrowserTabGroupId(context.staged, args.worktreeId)
+        : undefined) ?? resolveWebRuntimeBrowserClientTargetGroupId(args)
     try {
       await refreshWebRuntimeSessionTabsSnapshot(environmentId, args.worktreeId, {
         expectedEnvironmentPairingRevision: context.intentOwner.pairingRevision,
@@ -145,18 +152,13 @@ export async function createWebRuntimeSessionBrowserTab(
           environmentId,
           args.worktreeId,
           created.browserPageId,
-          args.clientTargetGroupId ?? args.targetGroupId
+          resolveExpectedGroupId()
         )
       ) {
         throw error
       }
     }
-    const expectedGroupId =
-      (context.staged
-        ? resolveStagedWebRuntimeBrowserTabGroupId(context.staged, args.worktreeId)
-        : undefined) ??
-      args.clientTargetGroupId ??
-      args.targetGroupId
+    const expectedGroupId = resolveExpectedGroupId()
     let materialized = hasMaterializedWebRuntimeBrowserPage(
       useAppStore.getState(),
       environmentId,
@@ -253,3 +255,5 @@ export async function createWebRuntimeSessionBrowserTab(
     return finishWebRuntimeBrowserCreationFailure(context, failure, error)
   }
 }
+
+registerPairedBrowserTabCreator(createWebRuntimeSessionBrowserTab)
diff --git a/src/renderer/src/runtime/web-runtime-browser-tab-staging.ts b/src/renderer/src/runtime/web-runtime-browser-tab-staging.ts
index dee7bad23760..8a7259c41995 100644
--- a/src/renderer/src/runtime/web-runtime-browser-tab-staging.ts
+++ b/src/renderer/src/runtime/web-runtime-browser-tab-staging.ts
@@ -1,4 +1,5 @@
 import { useAppStore } from '../store'
+import { toRuntimeExecutionHostId } from '../../../shared/execution-host'
 
 /** Local rows minted for a browser tab whose host create RPC has not answered yet. */
 export type StagedWebRuntimeBrowserTab = {
@@ -21,6 +22,7 @@ export function stageWebRuntimeBrowserTab(args: {
   title?: string
   profileId?: string | null
   targetGroupId?: string
+  afterTabId?: string
   activate: boolean
   focusAddressBar?: boolean
   clientHosted?: boolean
@@ -31,6 +33,9 @@ export function stageWebRuntimeBrowserTab(args: {
       activate: args.activate,
       browserPageId: args.remotePageId,
       browserRuntimeEnvironmentId: args.environmentId,
+      // Why: the paired runtime owns this row; placement must not borrow the globally selected host.
+      executionHostId: toRuntimeExecutionHostId(args.environmentId),
+      ...(args.afterTabId ? { afterTabId: args.afterTabId } : {}),
       ...(args.title !== undefined ? { title: args.title } : {}),
       ...(args.profileId !== undefined && args.profileId !== null
         ? { sessionProfileId: args.profileId }
diff --git a/src/renderer/src/runtime/web-runtime-session.ts b/src/renderer/src/runtime/web-runtime-session.ts
index d62b48527b34..1ef7cfa5d6df 100644
--- a/src/renderer/src/runtime/web-runtime-session.ts
+++ b/src/renderer/src/runtime/web-runtime-session.ts
@@ -25,7 +25,10 @@ export {
   consumePendingWebRuntimeSplitMirrorTelemetry,
   closeWebRuntimeTerminal,
   updateWebRuntimePaneLayout,
-  setWebRuntimeTabProps,
-  clearWebRuntimeTerminalBuffer
+  setWebRuntimeTabProps
 } from './web-runtime-terminal-actions'
+export {
+  clearWebRuntimeTerminalBuffer,
+  resetWebRuntimeTerminalInputModes
+} from './web-runtime-terminal-buffer-actions'
 export type { WebRuntimeSplitSource } from './web-runtime-split-focus'
diff --git a/src/renderer/src/runtime/web-runtime-terminal-actions.ts b/src/renderer/src/runtime/web-runtime-terminal-actions.ts
index 26938a1a0a76..d38ab03dafca 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-actions.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-actions.ts
@@ -281,32 +281,3 @@ export function setWebRuntimeTabProps(args: {
     })
   return true
 }
-
-// Why: local pane.terminal.clear() is undone by the next host snapshot replay; clear the host buffer so it sticks.
-export function clearWebRuntimeTerminalBuffer(ptyId: string | null | undefined): boolean {
-  if (!ptyId) {
-    return false
-  }
-  const remote = parseRemoteRuntimePtyId(ptyId)
-  const environmentId = remote?.environmentId?.trim()
-  if (!remote || !environmentId || !isWebRuntimeSessionActive(environmentId)) {
-    return false
-  }
-  void window.api.runtimeEnvironments
-    .call({
-      selector: environmentId,
-      method: 'terminal.clearBuffer',
-      params: { terminal: remote.handle },
-      timeoutMs: 15_000
-    })
-    .then((response) => {
-      unwrapRuntimeRpcResult(response as RuntimeRpcResponse<{ clear: unknown }>)
-    })
-    .catch((error) => {
-      console.warn(
-        '[web-runtime-session] failed to clear terminal buffer:',
-        error instanceof Error ? error.message : String(error)
-      )
-    })
-  return true
-}
diff --git a/src/renderer/src/runtime/web-runtime-terminal-buffer-actions.ts b/src/renderer/src/runtime/web-runtime-terminal-buffer-actions.ts
new file mode 100644
index 000000000000..8759f2feaeb6
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-terminal-buffer-actions.ts
@@ -0,0 +1,49 @@
+import { unwrapRuntimeRpcResult } from './runtime-rpc-client'
+import { parseRemoteRuntimePtyId } from './runtime-terminal-stream'
+import { isWebRuntimeSessionActive } from './web-runtime-session-environment'
+
+// Why: local pane.terminal.clear() is undone by the next host snapshot replay; clear the host buffer so it sticks.
+export function clearWebRuntimeTerminalBuffer(ptyId: string | null | undefined): boolean {
+  return callWebRuntimeTerminalAction(ptyId, 'terminal.clearBuffer', 'clear terminal buffer')
+}
+
+// Why: same as clear; the host's snapshot would re-arm the modes on the next replay.
+export function resetWebRuntimeTerminalInputModes(ptyId: string | null | undefined): boolean {
+  return callWebRuntimeTerminalAction(
+    ptyId,
+    'terminal.resetInputModes',
+    'reset terminal input modes'
+  )
+}
+
+function callWebRuntimeTerminalAction(
+  ptyId: string | null | undefined,
+  method: 'terminal.clearBuffer' | 'terminal.resetInputModes',
+  action: string
+): boolean {
+  if (!ptyId) {
+    return false
+  }
+  const remote = parseRemoteRuntimePtyId(ptyId)
+  const environmentId = remote?.environmentId?.trim()
+  if (!remote || !environmentId || !isWebRuntimeSessionActive(environmentId)) {
+    return false
+  }
+  void window.api.runtimeEnvironments
+    .call({
+      selector: environmentId,
+      method,
+      params: { terminal: remote.handle },
+      timeoutMs: 15_000
+    })
+    .then((response) => {
+      unwrapRuntimeRpcResult(response)
+    })
+    .catch((error) => {
+      console.warn(
+        `[web-runtime-session] failed to ${action}:`,
+        error instanceof Error ? error.message : String(error)
+      )
+    })
+  return true
+}
diff --git a/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts b/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
index 1df1f4df697c..564348a105d5 100644
--- a/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
+++ b/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
@@ -213,13 +213,18 @@ export function reconcileClientOwnedTabPlacement(
         : (group.activeTabId ?? tabOrder[0] ?? null))
     const validActiveTabId =
       activeTabId && tabOrder.includes(activeTabId) ? activeTabId : (tabOrder[0] ?? null)
+    const sanitizedRecent = sanitizeRecentTabIds(group.recentTabIds, tabOrder)
+    // Why: only explicit intent or a close/move successor is a visit; retaining the active tab or
+    // structurally filling an empty group must not reorder MRU.
+    const recordsVisit = validActiveTabId === intentActive || displacedActive !== null
     reconciled.push({
       ...group,
       tabOrder,
       activeTabId: validActiveTabId,
-      recentTabIds: validActiveTabId
-        ? pushRecentTabId(sanitizeRecentTabIds(group.recentTabIds, tabOrder), validActiveTabId)
-        : []
+      recentTabIds:
+        validActiveTabId && recordsVisit
+          ? pushRecentTabId(sanitizedRecent, validActiveTabId)
+          : sanitizedRecent
     })
   }
 
diff --git a/src/renderer/src/runtime/web-session-tabs-sync-browser-tabs.test.ts b/src/renderer/src/runtime/web-session-tabs-sync-browser-tabs.test.ts
index 7bdcc7f37bb1..b90b06b61067 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync-browser-tabs.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync-browser-tabs.test.ts
@@ -493,44 +493,45 @@ describe('applyWebSessionTabsSnapshot', () => {
       groupId: previewGroupId
     })
 
+    const state = makeState({
+      groupsByWorktree: {
+        [WT]: [
+          {
+            id: editorGroupId,
+            worktreeId: WT,
+            activeTabId: 'local-editor',
+            tabOrder: ['local-editor']
+          },
+          {
+            id: previewGroupId,
+            worktreeId: WT,
+            activeTabId: null,
+            tabOrder: []
+          }
+        ]
+      },
+      layoutByWorktree: { [WT]: initialLayout },
+      unifiedTabsByWorktree: {
+        [WT]: [
+          {
+            id: 'local-editor',
+            worktreeId: WT,
+            groupId: editorGroupId,
+            contentType: 'editor',
+            entityId: 'local-file',
+            label: 'example.html',
+            sortOrder: 0,
+            createdAt: NOW,
+            isPreview: false,
+            isPinned: false,
+            customLabel: null,
+            color: null
+          }
+        ]
+      }
+    })
     const patch = applyWebSessionTabsSnapshot(
-      makeState({
-        groupsByWorktree: {
-          [WT]: [
-            {
-              id: editorGroupId,
-              worktreeId: WT,
-              activeTabId: 'local-editor',
-              tabOrder: ['local-editor']
-            },
-            {
-              id: previewGroupId,
-              worktreeId: WT,
-              activeTabId: null,
-              tabOrder: []
-            }
-          ]
-        },
-        layoutByWorktree: { [WT]: initialLayout },
-        unifiedTabsByWorktree: {
-          [WT]: [
-            {
-              id: 'local-editor',
-              worktreeId: WT,
-              groupId: editorGroupId,
-              contentType: 'editor',
-              entityId: 'local-file',
-              label: 'example.html',
-              sortOrder: 0,
-              createdAt: NOW,
-              isPreview: false,
-              isPinned: false,
-              customLabel: null,
-              color: null
-            }
-          ]
-        }
-      }),
+      state,
       makeSnapshot([], {
         activeTabType: null,
         tabGroups: [{ id: editorGroupId, activeTabId: null, tabOrder: [], recentTabIds: [] }],
@@ -538,9 +539,11 @@ describe('applyWebSessionTabsSnapshot', () => {
       }),
       ENV,
       NOW
-    ) as Partial<WebSessionTabsSyncState>
+    )
+    // An omitted groups patch means the snapshot left every group as it was.
+    const groups = patch.groupsByWorktree?.[WT] ?? state.groupsByWorktree[WT]
 
-    expect(patch.groupsByWorktree?.[WT]?.map((group) => group.id)).toContain(previewGroupId)
+    expect(groups?.map((group) => group.id)).toContain(previewGroupId)
     expect(layoutHasGroup(patch.layoutByWorktree?.[WT] ?? initialLayout, previewGroupId)).toBe(true)
   })
 
diff --git a/src/renderer/src/runtime/web-session-tabs-sync-client-owned-placement.test.ts b/src/renderer/src/runtime/web-session-tabs-sync-client-owned-placement.test.ts
index cfe0154a9322..dd076a20fb08 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync-client-owned-placement.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync-client-owned-placement.test.ts
@@ -241,15 +241,13 @@ describe('client-owned tab placement for paired worktrees', () => {
       groupId: PREVIEW_GROUP
     })
 
-    const patch = applyWebSessionTabsSnapshot(
-      splitClientState(),
-      ambientSplitSnapshot(),
-      ENV,
-      NOW
-    ) as Partial<WebSessionTabsSyncState>
+    const state = splitClientState()
+    const patch = applyWebSessionTabsSnapshot(state, ambientSplitSnapshot(), ENV, NOW)
+    // An omitted groups patch means the snapshot left every group as it was.
+    const next = { ...state, ...patch }
 
-    expect(groupById(patch, HOST_GROUP)?.activeTabId).toBe(T2)
-    expect(groupById(patch, PREVIEW_GROUP)?.activeTabId).toBe(BROWSER_HOST_TAB)
+    expect(groupById(next, HOST_GROUP)?.activeTabId).toBe(T2)
+    expect(groupById(next, PREVIEW_GROUP)?.activeTabId).toBe(BROWSER_HOST_TAB)
   })
 
   it('keeps the client-focused group focused across repeated ambient snapshots', () => {
diff --git a/src/renderer/src/runtime/web-session-tabs-sync-remote-main-agent-verdict.test.ts b/src/renderer/src/runtime/web-session-tabs-sync-remote-main-agent-verdict.test.ts
new file mode 100644
index 000000000000..4a0f0c09070e
--- /dev/null
+++ b/src/renderer/src/runtime/web-session-tabs-sync-remote-main-agent-verdict.test.ts
@@ -0,0 +1,112 @@
+/**
+ * A paired client mirrors a host's agent rows from `session.tabs`. A main agent that fails while
+ * its subagents keep the row working changes nothing but `mainAgent`: the row's state, start and
+ * (within one host frame) update time all stay put. The mirror must still take the new row and
+ * invalidate the worktree rollup, which caches on the agent-status epoch.
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
+import type { AgentMainAgentStatus } from '../../../shared/main-agent-status'
+import { makePaneKey } from '../../../shared/stable-pane-id'
+import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
+import { getDefaultSettings } from '../../../shared/constants'
+import { createTestStore, makeWorktree, seedStore } from '../store/slices/store-test-helpers'
+import { resetRendererOwnedAgentStatusPanesForTests } from '../components/terminal-pane/renderer-owned-agent-status-registry'
+import {
+  applyFreshWebSessionTabsSnapshot,
+  resetWebSessionTabsSnapshotFreshnessForTests
+} from './web-session-tabs-sync'
+import { selectWorktreeAgentActivitySummary } from '../components/sidebar/worktree-agent-activity-summary'
+
+// Why: web-session-tabs-sync imports the app-level store singleton; this
+// harness drives a createTestStore instance instead, like its sibling suites.
+vi.mock('../store', () => ({
+  useAppStore: {
+    setState: vi.fn(),
+    getState: vi.fn(() => ({})),
+    subscribe: vi.fn(() => () => {})
+  }
+}))
+
+const WT = 'repo1::/path/wt1'
+const ENV = 'remote-env-1'
+const T0 = 1_700_000_000_000
+const HOST_TAB_ID = 'host-tab-1'
+const LEAF_ID = '11111111-1111-4111-8111-111111111111'
+
+function hostSnapshot(snapshotVersion: number, mainAgent: AgentMainAgentStatus) {
+  const snapshot: RuntimeMobileSessionTabsResult = {
+    worktree: WT,
+    publicationEpoch: 'host-epoch-1',
+    snapshotVersion,
+    activeGroupId: 'host-group-1',
+    activeTabId: `${HOST_TAB_ID}::${LEAF_ID}`,
+    activeTabType: 'terminal',
+    tabs: [
+      {
+        type: 'terminal',
+        id: `${HOST_TAB_ID}::${LEAF_ID}`,
+        title: 'Claude Code',
+        parentTabId: HOST_TAB_ID,
+        leafId: LEAF_ID,
+        isActive: true,
+        launchAgent: 'claude',
+        status: 'ready',
+        terminal: 'terminal-1',
+        agentStatus: {
+          state: 'working',
+          prompt: 'ship it',
+          updatedAt: T0 - 1_000,
+          stateStartedAt: T0 - 5_000,
+          agentType: 'claude',
+          paneKey: makePaneKey(HOST_TAB_ID, LEAF_ID),
+          tabId: HOST_TAB_ID,
+          worktreeId: WT,
+          stateHistory: [],
+          mainAgent
+        }
+      }
+    ]
+  }
+  return snapshot
+}
+
+describe('a mirrored main agent that fails while its subagents keep the row working', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+    vi.setSystemTime(T0)
+    resetWebSessionTabsSnapshotFreshnessForTests()
+    resetRendererOwnedAgentStatusPanesForTests()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+    resetRendererOwnedAgentStatusPanesForTests()
+  })
+
+  it('reaches the store and the worktree rollup', () => {
+    const store = createTestStore()
+    seedStore(store, {
+      settings: getDefaultSettings('/tmp'),
+      worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/path/wt1' })] },
+      activeWorktreeId: WT
+    })
+    const apply = (snapshot: RuntimeMobileSessionTabsResult): void => {
+      store.setState(applyFreshWebSessionTabsSnapshot(store.getState(), snapshot, ENV, T0))
+    }
+
+    apply(hostSnapshot(1, { state: 'working', stateStartedAt: T0 - 5_000 }))
+    expect(selectWorktreeAgentActivitySummary(store.getState(), WT)).toMatchObject({
+      hasLiveWorking: true,
+      hasFailed: false
+    })
+
+    apply(hostSnapshot(2, { state: 'done', outcome: 'failure', stateStartedAt: T0 - 2_000 }))
+    const paneKey = makePaneKey(toWebTerminalSurfaceTabId(HOST_TAB_ID), LEAF_ID)
+    expect(store.getState().agentStatusByPaneKey[paneKey]?.mainAgent?.outcome).toBe('failure')
+    expect(selectWorktreeAgentActivitySummary(store.getState(), WT)).toMatchObject({
+      hasLiveWorking: false,
+      hasFailed: true
+    })
+  })
+})
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/agent-status-patch.ts b/src/renderer/src/runtime/web-session-tabs-sync/agent-status-patch.ts
index e68958ec6bd4..e6166f809f75 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/agent-status-patch.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/agent-status-patch.ts
@@ -3,6 +3,7 @@ import {
   type AgentStatusEntry
 } from '../../../../shared/agent-status-types'
 import { agentEntryCompletionAt } from '../../../../shared/agent-completion-time'
+import { agentMainAgentVerdict } from '../../../../shared/agent-main-agent-verdict'
 import { normalizeCompatibleAgentStatusEntryForOwner } from '../../../../shared/agent-title-owner'
 import { isWebTerminalSurfaceTabId, toWebTerminalSurfaceTabId } from '../web-runtime-session'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
@@ -221,6 +222,9 @@ export function buildMirroredAgentStatusPatch(
       entry.state === 'done' &&
       agentEntryCompletionAt(existing) !== agentEntryCompletionAt(entry)
     const workingModeChanged = existing?.workingMode !== entry.workingMode
+    // A verdict moves no clock, including a main agent failing while its subagents keep the row working.
+    const verdictChanged =
+      !!existing && agentMainAgentVerdict(existing) !== agentMainAgentVerdict(entry)
     const entrySortRelevantChange =
       !existing ||
       existing.state !== entry.state ||
@@ -230,7 +234,7 @@ export function buildMirroredAgentStatusPatch(
       doneAttentionChanged ||
       isMirroredCommandCodeTurnBump(existing, entry)
     aggregateRelevantChange =
-      aggregateRelevantChange || entrySortRelevantChange || workingModeChanged
+      aggregateRelevantChange || entrySortRelevantChange || workingModeChanged || verdictChanged
     sortRelevantChange = sortRelevantChange || entrySortRelevantChange
   }
 
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/mirrored-status-tab-retractions.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/mirrored-status-tab-retractions.test.ts
index 975703fe6b54..31303c0ad869 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/mirrored-status-tab-retractions.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/mirrored-status-tab-retractions.test.ts
@@ -66,8 +66,25 @@ it('does not retract a colliding tab id owned by another host', () => {
   const tabId = toWebTerminalSurfaceTabId('same-tab')
   const paneKey = makePaneKey(tabId, LEAF_ID)
   state.agentStatusByPaneKey[paneKey] = {
-    paneKey, tabId, worktreeId: 'folder:1', connectionId: 'host-b', agentType: 'omp', state: 'done', prompt: '', updatedAt: NOW, stateStartedAt: NOW, stateHistory: []
+    paneKey,
+    tabId,
+    worktreeId: 'folder:1',
+    connectionId: 'host-b',
+    agentType: 'omp',
+    state: 'done',
+    prompt: '',
+    updatedAt: NOW,
+    stateStartedAt: NOW,
+    stateHistory: []
   }
   setHostSessionTabIdMapping({ environmentId: 'host-a', worktreeId: 'folder:1', tabId }, 'same-tab')
-  expect(collectUnhydratedMirroredTabRetractions({ state, environmentId: 'host-a', worktreeId: 'folder:1', nextHostTerminalTabIds: new Set(), currentTerminalIds: new Set() })).toEqual([])
+  expect(
+    collectUnhydratedMirroredTabRetractions({
+      state,
+      environmentId: 'host-a',
+      worktreeId: 'folder:1',
+      nextHostTerminalTabIds: new Set(),
+      currentTerminalIds: new Set()
+    })
+  ).toEqual([])
 })
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/mirrored-status-tab-retractions.ts b/src/renderer/src/runtime/web-session-tabs-sync/mirrored-status-tab-retractions.ts
index 1f971225a4c8..bc956b9fbfc9 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/mirrored-status-tab-retractions.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/mirrored-status-tab-retractions.ts
@@ -36,7 +36,8 @@ export function collectUnhydratedMirroredTabRetractions(args: {
     if (
       entry?.worktreeId === args.worktreeId &&
       (entry.connectionId === args.environmentId ||
-        (args.environmentId === 'local' && (entry.connectionId === null || entry.connectionId === undefined))) &&
+        (args.environmentId === 'local' &&
+          (entry.connectionId === null || entry.connectionId === undefined))) &&
       tabId &&
       candidates.has(tabId)
     ) {
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/state-equality-core.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/state-equality-core.test.ts
new file mode 100644
index 000000000000..aa466c0f9b57
--- /dev/null
+++ b/src/renderer/src/runtime/web-session-tabs-sync/state-equality-core.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it } from 'vitest'
+import type {
+  AgentStateHistoryEntry,
+  AgentStatusEntry
+} from '../../../../shared/agent-status-types'
+import { agentStatusEntryEqual, sameAgentStateHistory } from './state-equality-core'
+
+function doneEntry(mainAgent?: AgentStateHistoryEntry['mainAgent']): AgentStateHistoryEntry {
+  return { state: 'done', prompt: 'ship it', startedAt: 1_000, ...(mainAgent ? { mainAgent } : {}) }
+}
+
+describe('sameAgentStateHistory', () => {
+  it('sees a history verdict or main agent clock change under an unchanged flag', () => {
+    const failed = doneEntry({ state: 'done', outcome: 'failure', stateStartedAt: 900 })
+    expect(sameAgentStateHistory([failed], [{ ...failed }])).toBe(true)
+    expect(sameAgentStateHistory([doneEntry()], [failed])).toBe(false)
+    expect(
+      sameAgentStateHistory(
+        [failed],
+        [doneEntry({ state: 'done', outcome: 'success', stateStartedAt: 900 })]
+      )
+    ).toBe(false)
+    expect(
+      sameAgentStateHistory(
+        [failed],
+        [doneEntry({ state: 'done', outcome: 'failure', stateStartedAt: 950 })]
+      )
+    ).toBe(false)
+  })
+})
+
+describe('agentStatusEntryEqual', () => {
+  // A paired client must take a host row whose only change is a new turn under the same state.
+  it('sees a new host turn start under an unchanged state', () => {
+    const entry: AgentStatusEntry = {
+      state: 'working',
+      prompt: 'ship it',
+      updatedAt: 2_000,
+      stateStartedAt: 1_000,
+      turnStartedAt: 1_000,
+      paneKey: 'tab-1:leaf-1',
+      stateHistory: []
+    }
+    expect(agentStatusEntryEqual(entry, { ...entry })).toBe(true)
+    expect(agentStatusEntryEqual(entry, { ...entry, turnStartedAt: 1_500 })).toBe(false)
+  })
+})
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/state-equality-core.ts b/src/renderer/src/runtime/web-session-tabs-sync/state-equality-core.ts
index 42345db35d0a..407b7f6c2f3f 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/state-equality-core.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/state-equality-core.ts
@@ -4,6 +4,7 @@ import {
   type AgentStatusEntry
 } from '../../../../shared/agent-status-types'
 import { agentProviderSessionsEqual } from '../../../../shared/agent-session-resume'
+import { mainAgentStatusEqual } from '../../../../shared/main-agent-status'
 import type {
   WebSessionTabsBatchContext,
   WebSessionTabsBatchRecordKey,
@@ -29,7 +30,8 @@ export function sameAgentStateHistory(
       entry.state === b[index]?.state &&
       entry.prompt === b[index]?.prompt &&
       entry.startedAt === b[index]?.startedAt &&
-      entry.interrupted === b[index]?.interrupted
+      entry.interrupted === b[index]?.interrupted &&
+      mainAgentStatusEqual(entry.mainAgent, b[index]?.mainAgent)
   )
 }
 
@@ -46,6 +48,7 @@ export function agentStatusEntryEqual(
     a.prompt === b.prompt &&
     a.updatedAt === b.updatedAt &&
     a.stateStartedAt === b.stateStartedAt &&
+    a.turnStartedAt === b.turnStartedAt &&
     a.agentType === b.agentType &&
     a.paneKey === b.paneKey &&
     a.worktreeId === b.worktreeId &&
@@ -57,6 +60,7 @@ export function agentStatusEntryEqual(
     a.lastAssistantMessage === b.lastAssistantMessage &&
     a.lastAssistantMessageIsToolOutput === b.lastAssistantMessageIsToolOutput &&
     a.interrupted === b.interrupted &&
+    mainAgentStatusEqual(a.mainAgent, b.mainAgent) &&
     a.promptInteractionKey === b.promptInteractionKey &&
     a.restoredUnconfirmed === b.restoredUnconfirmed &&
     agentProviderSessionsEqual(a.agentType, a.providerSession, b.providerSession) &&
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/tab-builders.ts b/src/renderer/src/runtime/web-session-tabs-sync/tab-builders.ts
index aaec9e88f5d2..31a7ac4b080b 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/tab-builders.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/tab-builders.ts
@@ -59,8 +59,12 @@ export function buildBrowserUnifiedTab(
     label: tab.title,
     customLabel: null,
     color: hostTab.color !== undefined ? hostTab.color : (existingUnifiedTab?.color ?? null),
-    sortOrder: tab.createdAt,
+    // Why: adoption must not reset the staged row's placement or manufacture/drop a focus visit.
+    sortOrder: existingUnifiedTab?.sortOrder ?? tab.createdAt,
     createdAt: tab.createdAt,
+    ...(existingUnifiedTab?.lastFocusedAt !== undefined
+      ? { lastFocusedAt: existingUnifiedTab.lastFocusedAt }
+      : {}),
     isPreview: false,
     isPinned:
       hostTab.isPinned !== undefined
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/tracking-mappings.ts b/src/renderer/src/runtime/web-session-tabs-sync/tracking-mappings.ts
index 83f8633f253b..ed6ba998a1e9 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/tracking-mappings.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/tracking-mappings.ts
@@ -73,3 +73,20 @@ export function hostSessionTabIdsByLocalTabForWorktree(
   }
   return entries
 }
+
+/** The local tab mirroring a host tab, or null when no mirrored tab claims it. */
+export function resolveLocalTabIdForHostSessionTab(args: {
+  environmentId: string
+  worktreeId: string
+  hostTabId: string
+}): string | null {
+  for (const [tabId, hostTabId] of hostSessionTabIdsByLocalTabForWorktree(
+    args.environmentId,
+    args.worktreeId
+  )) {
+    if (hostTabId === args.hostTabId) {
+      return tabId
+    }
+  }
+  return null
+}
diff --git a/src/renderer/src/startup/startup-degraded-recovery.test.ts b/src/renderer/src/startup/startup-degraded-recovery.test.ts
new file mode 100644
index 000000000000..a3f0fb44f261
--- /dev/null
+++ b/src/renderer/src/startup/startup-degraded-recovery.test.ts
@@ -0,0 +1,74 @@
+// @vitest-environment happy-dom
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('sonner', () => ({ toast: { error: vi.fn() } }))
+vi.mock('../components/terminal/terminal-provider-snapshot-capability', () => ({
+  collectTerminalProviderSnapshotPtyIds: () => [],
+  refreshTerminalProviderSnapshotCapabilities: async () => undefined
+}))
+vi.mock('../store', async () => {
+  const { create } = await import('zustand')
+  const useAppStore = create(() => ({
+    startupWorktreeRefreshCompleted: false,
+    terminalStartupRestorationReady: false,
+    workspaceSessionReady: false
+  }))
+  return { useAppStore }
+})
+
+import { useAppStore } from '../store'
+import { recoverFromDegradedStartup } from './startup-degraded-recovery'
+
+function recover(args: {
+  isCancelled: () => boolean
+  reconnectPersistedTerminals: () => Promise<void>
+}): Promise<void> {
+  return recoverFromDegradedStartup({
+    error: new Error('hydration failed'),
+    uiHydrated: true,
+    reconnectStarted: false,
+    hydratePersistedUI: vi.fn(),
+    abortSignal: new AbortController().signal,
+    ...args
+  })
+}
+
+describe('recoverFromDegradedStartup', () => {
+  beforeEach(() => {
+    vi.spyOn(console, 'error').mockImplementation(() => undefined)
+    useAppStore.setState({ terminalStartupRestorationReady: false, workspaceSessionReady: false })
+    Object.defineProperty(window, 'api', {
+      configurable: true,
+      value: {
+        app: {
+          awaitFirstWindowStartupServices: async () => undefined,
+          recoverLegacyWorkerTerminalsForRendererStartup: async () => undefined,
+          relaunch: vi.fn()
+        }
+      }
+    })
+  })
+
+  it('releases terminal startup restoration once the degraded reconnect succeeds', async () => {
+    await recover({
+      isCancelled: () => false,
+      reconnectPersistedTerminals: async () => {
+        useAppStore.setState({ workspaceSessionReady: true })
+      }
+    })
+
+    expect(useAppStore.getState().terminalStartupRestorationReady).toBe(true)
+  })
+
+  it('leaves the flag to the newer pass when this one was cancelled mid-reconnect', async () => {
+    let cancelled = false
+    await recover({
+      isCancelled: () => cancelled,
+      reconnectPersistedTerminals: async () => {
+        cancelled = true
+      }
+    })
+
+    expect(useAppStore.getState().terminalStartupRestorationReady).toBe(false)
+  })
+})
diff --git a/src/renderer/src/startup/startup-degraded-recovery.ts b/src/renderer/src/startup/startup-degraded-recovery.ts
index 987a74a8341e..c5570af27173 100644
--- a/src/renderer/src/startup/startup-degraded-recovery.ts
+++ b/src/renderer/src/startup/startup-degraded-recovery.ts
@@ -93,6 +93,11 @@ export async function recoverFromDegradedStartup(args: DegradedStartupRecoveryAr
     )
     await reconnectPersistedTerminals(abortSignal)
     await window.api.app.recoverLegacyWorkerTerminalsForRendererStartup()
+    // Why: reconnect set workspaceSessionReady but not this flag, which the success chain sets
+    // last; without it a degraded boot keeps every restoration reader waiting for good.
+    if (!isCancelled()) {
+      useAppStore.setState({ terminalStartupRestorationReady: true })
+    }
   } catch (reconnectErr) {
     console.error('[startup] reconnectPersistedTerminals failed in error path:', reconnectErr)
     // Why (issue #1158): the await may have run during StrictMode teardown; re-check cancellation so a cancelled pass 1 doesn't stomp pass 2's hydration.
diff --git a/src/renderer/src/store/folder-workspaces/folder-workspace-catalog-actions.ts b/src/renderer/src/store/folder-workspaces/folder-workspace-catalog-actions.ts
index a5636882ea5a..83678c50946f 100644
--- a/src/renderer/src/store/folder-workspaces/folder-workspace-catalog-actions.ts
+++ b/src/renderer/src/store/folder-workspaces/folder-workspace-catalog-actions.ts
@@ -13,6 +13,7 @@ import {
   mergeFetchedFolderWorkspaceCatalog
 } from './folder-workspace-catalog'
 import { listRuntimeEnvironmentsForAllHostLoad } from '../runtime-catalog-hosts'
+import { reuseEqualRecordMap } from '../slices/repo-identity-reconcile'
 import { getFolderWorkspaceUpdateCoordinator } from './folder-workspace-mutations'
 
 export function createFolderWorkspaceCatalogActions(
@@ -47,11 +48,12 @@ export function createFolderWorkspaceCatalogActions(
             current.folderWorkspaces,
             current.projectGroups
           )
+          if (arrayElementsUnchanged(folderWorkspaces, current.folderWorkspaces)) {
+            return current
+          }
           return {
             folderWorkspaces,
-            ...(arrayElementsUnchanged(folderWorkspaces, current.folderWorkspaces)
-              ? {}
-              : { folderWorkspacePathStatuses: {} })
+            folderWorkspacePathStatuses: {}
           }
         })
       } catch (err) {
@@ -85,11 +87,12 @@ export function createFolderWorkspaceCatalogActions(
             current.folderWorkspaces,
             current.projectGroups
           )
+          if (arrayElementsUnchanged(folderWorkspaces, current.folderWorkspaces)) {
+            return current
+          }
           return {
             folderWorkspaces,
-            ...(arrayElementsUnchanged(folderWorkspaces, current.folderWorkspaces)
-              ? {}
-              : { folderWorkspacePathStatuses: {} })
+            folderWorkspacePathStatuses: {}
           }
         })
       }
@@ -130,12 +133,22 @@ export function createFolderWorkspaceCatalogActions(
         })
       )
       if (!failed) {
-        set((s) => ({
-          restoredRuntimeHostIdByWorkspaceSessionKey: clearRestoredFolderWorkspaceSessionOwners(
+        set((s) => {
+          // Why reuseEqualRecordMap: the cleanup rebuilds the record every refresh, and
+          // reference-equality readers (live dashboard selector, popout bridge) re-run on a
+          // fresh-but-equal identity, so the equal case must keep the previous one.
+          const restoredRuntimeHostIdByWorkspaceSessionKey = reuseEqualRecordMap(
             s.restoredRuntimeHostIdByWorkspaceSessionKey,
-            s
+            clearRestoredFolderWorkspaceSessionOwners(
+              s.restoredRuntimeHostIdByWorkspaceSessionKey,
+              s
+            )
           )
-        }))
+          return restoredRuntimeHostIdByWorkspaceSessionKey ===
+            s.restoredRuntimeHostIdByWorkspaceSessionKey
+            ? s
+            : { restoredRuntimeHostIdByWorkspaceSessionKey }
+        })
       }
     }
   }
diff --git a/src/renderer/src/store/github/check-actions.ts b/src/renderer/src/store/github/check-actions.ts
index d29a3720d380..51b9a891f1c8 100644
--- a/src/renderer/src/store/github/check-actions.ts
+++ b/src/renderer/src/store/github/check-actions.ts
@@ -12,7 +12,11 @@ import {
 } from './cache-identity'
 import { isFresh, withBoundedCacheEntry } from './cache-policy'
 import { debouncedSaveCache } from './cache-persistence'
-import { inflightChecksRequests } from './request-coordination'
+import {
+  inflightChecksRequests,
+  nextProviderRequestId,
+  ownsInflightRequest
+} from './request-coordination'
 import { getGitHubRepoSourceSettings, getGitHubWorkItemRequestContext } from './work-item-routing'
 
 export const createCheckActions = (
@@ -87,18 +91,26 @@ export const createCheckActions = (
       return cachedChecks
     }
 
-    const inflightRequest = inflightChecksRequests.get(inflightKey)
-    if (inflightRequest) {
-      if (
-        (options?.force && !inflightRequest.force) ||
-        (options?.noCache && !inflightRequest.noCache)
-      ) {
-        await inflightRequest.promise.catch(() => {})
-      } else {
+    let waitedForUpgrade = false
+    for (;;) {
+      const inflightRequest = inflightChecksRequests.get(inflightKey)
+      if (!inflightRequest) {
+        break
+      }
+      const weakerThanRequested =
+        (options?.force && !inflightRequest.force) || (options?.noCache && !inflightRequest.noCache)
+      if (!weakerThanRequested) {
         return inflightRequest.promise
       }
+      // Why: wait out one weaker request so peers can share the upgrade, but never twice — a steady stream of weaker callers would otherwise starve this one forever.
+      if (waitedForUpgrade) {
+        break
+      }
+      waitedForUpgrade = true
+      await inflightRequest.promise.catch(() => {})
     }
 
+    const requestId = nextProviderRequestId()
     const request = (async () => {
       try {
         const requestContext = getGitHubWorkItemRequestContext(
@@ -131,6 +143,12 @@ export const createCheckActions = (
                 noCache: Boolean(options?.force || options?.noCache),
                 sourceContext: options?.sourceContext
               })) as PRCheckDetail[])
+        // Why: the bounded upgrade wait can leave us running beside a stronger request for this
+        // key. Both bypass gh's cache here, but the later-started one holds the newer run state —
+        // let only the key's current owner write checksCache and the PR status it derives.
+        if (!ownsInflightRequest(inflightChecksRequests, inflightKey, requestId)) {
+          return checks
+        }
         set((s) => {
           const nextState: Partial<AppState> = {
             checksCache: withBoundedCacheEntry(s.checksCache, cacheKey, {
@@ -168,13 +186,16 @@ export const createCheckActions = (
           return latestCached.data
         }
         return []
-      } finally {
+      }
+    })().finally(() => {
+      if (ownsInflightRequest(inflightChecksRequests, inflightKey, requestId)) {
         inflightChecksRequests.delete(inflightKey)
       }
-    })()
+    })
 
     inflightChecksRequests.set(inflightKey, {
       promise: request,
+      requestId,
       force: Boolean(options?.force),
       noCache: Boolean(options?.force || options?.noCache)
     })
diff --git a/src/renderer/src/store/github/project-actions.ts b/src/renderer/src/store/github/project-actions.ts
index f4c5fec3100c..68fc2b0a37a5 100644
--- a/src/renderer/src/store/github/project-actions.ts
+++ b/src/renderer/src/store/github/project-actions.ts
@@ -18,6 +18,8 @@ import { withBoundedCacheEntry, WORK_ITEMS_CACHE_TTL } from './cache-policy'
 import {
   acquireProviderRequestSlot as acquireWorkItemSlot,
   inflightProjectViewRequests,
+  nextProviderRequestId,
+  ownsInflightRequest,
   releaseProviderRequestSlot as releaseWorkItemSlot
 } from './request-coordination'
 import {
@@ -57,16 +59,25 @@ export const createProjectActions = (
       }
     }
 
-    const existing = inflightProjectViewRequests.get(requestKey)
-    if (existing) {
+    let waitedForUpgrade = false
+    for (;;) {
+      const existing = inflightProjectViewRequests.get(requestKey)
+      if (!existing) {
+        break
+      }
       // Why: a forcing caller must not dedupe to a non-forcing in-flight request; wait for it to settle, then issue a fresh forced call (mirrors fetchWorkItems).
-      if (options?.force && !existing.force) {
-        await existing.promise.catch(() => {})
-      } else {
+      if (!options?.force || existing.force) {
         return existing.promise
       }
+      // Why: wait out one weaker request so peers can share the upgrade, but never twice — a steady stream of weaker callers would otherwise starve this one forever.
+      if (waitedForUpgrade) {
+        break
+      }
+      waitedForUpgrade = true
+      await existing.promise.catch(() => {})
     }
 
+    const requestId = nextProviderRequestId()
     const request = (async (): Promise<GetProjectViewTableResult> => {
       await acquireWorkItemSlot()
       try {
@@ -79,6 +90,12 @@ export const createProjectActions = (
                 { timeoutMs: 60_000 }
               )
             : await window.api.gh.getProjectViewTable(args)
+        // Why: the bounded upgrade wait can leave us running beside a stronger request for this
+        // key, so neither write below may land once it owns the key — a late non-OK reply would
+        // otherwise stamp its error over the fresher table (or over a newer error) at the known key.
+        if (!ownsInflightRequest(inflightProjectViewRequests, requestKey, requestId)) {
+          return envelope
+        }
         if (envelope.ok) {
           const table = envelope.data
           const key = projectViewCacheKey(
@@ -119,12 +136,16 @@ export const createProjectActions = (
         }
       } finally {
         releaseWorkItemSlot()
+      }
+    })().finally(() => {
+      if (ownsInflightRequest(inflightProjectViewRequests, requestKey, requestId)) {
         inflightProjectViewRequests.delete(requestKey)
       }
-    })()
+    })
 
     inflightProjectViewRequests.set(requestKey, {
       promise: request,
+      requestId,
       force: Boolean(options?.force)
     })
     return request
diff --git a/src/renderer/src/store/github/provider-request-coalescing.test.ts b/src/renderer/src/store/github/provider-request-coalescing.test.ts
new file mode 100644
index 000000000000..f012999ce65d
--- /dev/null
+++ b/src/renderer/src/store/github/provider-request-coalescing.test.ts
@@ -0,0 +1,343 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { GitHubWorkItem, ListWorkItemsResult } from '../../../../shared/github/work-item-types'
+import type { PRCheckDetail } from '../../../../shared/github/check-types'
+import type { GitHubProjectTable } from '../../../../shared/github/project-types'
+import type { GetProjectViewTableResult } from '../../../../shared/github/project-result-types'
+import type { FetchOptions } from './cache-model'
+import { projectViewCacheKey, projectViewRequestKey } from './cache-identity'
+import { inflightProjectViewRequests } from './request-coordination'
+import {
+  createTestStore,
+  mockApi,
+  resetRemoteRuntimeMocks
+} from '../slices/github-slice-test-harness'
+
+function workItems(title: string): ListWorkItemsResult<GitHubWorkItem> {
+  return {
+    items: [
+      {
+        id: 'issue-1',
+        type: 'issue',
+        number: 1,
+        title,
+        state: 'open',
+        url: 'https://example.test/1',
+        labels: [],
+        updatedAt: '2026-09-25T00:00:00Z',
+        author: null,
+        repoId: 'repo-1'
+      }
+    ],
+    sources: { issues: null, prs: null, originCandidate: null, upstreamCandidate: null }
+  }
+}
+
+const projectViewRequest = {
+  owner: 'acme',
+  ownerType: 'organization' as const,
+  projectNumber: 1,
+  viewId: 'view-1'
+}
+const projectViewCacheKey1 = projectViewCacheKey('organization', 'acme', 1, 'view-1')
+
+function projectTable(title: string): GitHubProjectTable {
+  return {
+    project: {
+      id: 'project-1',
+      owner: 'acme',
+      ownerType: 'organization',
+      number: 1,
+      title,
+      url: 'https://github.com/orgs/acme/projects/1'
+    },
+    selectedView: {
+      id: 'view-1',
+      number: 1,
+      name: 'Table',
+      layout: 'TABLE_LAYOUT',
+      filter: '',
+      fields: [],
+      groupByFields: [],
+      sortByFields: []
+    },
+    rows: [],
+    totalCount: 0,
+    parentFieldDropped: false
+  }
+}
+
+const strongerWorkItemOptions: FetchOptions[] = [
+  { force: true },
+  { force: true, noCache: true },
+  { force: true, requireComplete: true }
+]
+
+describe('GitHub provider request upgrade coalescing', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    resetRemoteRuntimeMocks()
+  })
+
+  it.each(strongerWorkItemOptions)('coalesces twenty work-item upgrades: %j', async (options) => {
+    const store = createTestStore()
+    const weak = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
+    const fresh = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
+    mockApi.gh.listWorkItems.mockReturnValueOnce(weak.promise).mockReturnValue(fresh.promise)
+    const first = store.getState().fetchWorkItems('repo-1', '/repo', 24, '')
+    const settled = vi.fn()
+    const followers = Array.from({ length: 20 }, () =>
+      store.getState().fetchWorkItems('repo-1', '/repo', 24, '', options).then(settled)
+    )
+    weak.resolve(workItems('weak'))
+    await first
+    await vi.waitFor(() =>
+      expect(mockApi.gh.listWorkItems.mock.calls.length).toBeGreaterThanOrEqual(2)
+    )
+    expect(settled).not.toHaveBeenCalled()
+    fresh.resolve(workItems('fresh'))
+    await Promise.all(followers)
+    expect(mockApi.gh.listWorkItems).toHaveBeenCalledTimes(2)
+    expect(settled).toHaveBeenCalledTimes(20)
+    expect(settled.mock.calls.every(([rows]) => rows[0].title === 'fresh')).toBe(true)
+    expect(mockApi.gh.listWorkItems).toHaveBeenLastCalledWith({
+      repoPath: '/repo',
+      repoId: 'repo-1',
+      limit: 24,
+      query: undefined,
+      ...(options.noCache ? { noCache: true } : {})
+    })
+  })
+
+  it('never joins a weaker replacement and never waits out more than one', async () => {
+    const store = createTestStore()
+    const weak = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
+    const forced = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
+    const strict = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
+    mockApi.gh.listWorkItems
+      .mockReturnValueOnce(weak.promise)
+      .mockReturnValueOnce(forced.promise)
+      .mockReturnValue(strict.promise)
+    const first = store.getState().fetchWorkItems('repo-1', '/repo', 24, '')
+    const forcedFetch = store.getState().fetchWorkItems('repo-1', '/repo', 24, '', { force: true })
+    const strictSettled = vi.fn()
+    const strictFollowers = Array.from({ length: 20 }, () =>
+      store
+        .getState()
+        .fetchWorkItems('repo-1', '/repo', 24, '', {
+          force: true,
+          noCache: true,
+          requireComplete: true
+        })
+        .then(strictSettled)
+    )
+    weak.resolve(workItems('weak'))
+    await first
+    // Why: the strict callers must reach the bridge without waiting out the weaker
+    // replacement too — the upgrade wait is bounded, so a repeating weaker refresh
+    // can never starve them. They still share exactly one strict request.
+    await vi.waitFor(() => expect(mockApi.gh.listWorkItems).toHaveBeenCalledTimes(3))
+    expect(mockApi.gh.listWorkItems).toHaveBeenLastCalledWith(
+      expect.objectContaining({ noCache: true })
+    )
+    expect(strictSettled).not.toHaveBeenCalled()
+    strict.resolve(workItems('strict'))
+    await Promise.all(strictFollowers)
+    forced.resolve(workItems('forced'))
+    await expect(forcedFetch).resolves.toEqual(workItems('forced').items)
+    expect(mockApi.gh.listWorkItems).toHaveBeenCalledTimes(3)
+    expect(strictSettled).toHaveBeenCalledTimes(20)
+    expect(strictSettled.mock.calls.every(([rows]) => rows[0].title === 'strict')).toBe(true)
+  })
+
+  it('keeps an invalidated request from removing its replacement dedupe entry', async () => {
+    const store = createTestStore()
+    const stale = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
+    const fresh = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
+    mockApi.gh.listWorkItems.mockReturnValueOnce(stale.promise).mockReturnValue(fresh.promise)
+    const first = store.getState().fetchWorkItems('repo-1', '/repo', 24, '')
+    store.getState().evictGitHubRepoCaches('repo-1', '/repo')
+    const replacement = store.getState().fetchWorkItems('repo-1', '/repo', 24, '', { force: true })
+    stale.resolve(workItems('stale'))
+    await first
+    const joined = store.getState().fetchWorkItems('repo-1', '/repo', 24, '', { force: true })
+    fresh.resolve(workItems('fresh'))
+    await expect(Promise.all([replacement, joined])).resolves.toEqual([
+      workItems('fresh').items,
+      workItems('fresh').items
+    ])
+    expect(mockApi.gh.listWorkItems).toHaveBeenCalledTimes(2)
+  })
+
+  it('rejects partial results for every complete-result waiter and allows a later retry', async () => {
+    const store = createTestStore()
+    const weak = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
+    const partial = {
+      ...workItems('partial'),
+      errors: { issues: { type: 'network_error' as const, message: 'offline' } }
+    }
+    mockApi.gh.listWorkItems.mockReturnValueOnce(weak.promise).mockResolvedValue(partial)
+    const first = store.getState().fetchWorkItems('repo-1', '/repo', 24, '')
+    const followers = Array.from({ length: 20 }, () =>
+      store.getState().fetchWorkItems('repo-1', '/repo', 24, '', {
+        force: true,
+        requireComplete: true
+      })
+    )
+    const settled = Promise.allSettled(followers)
+    weak.resolve(workItems('weak'))
+    await first
+    expect((await settled).every((result) => result.status === 'rejected')).toBe(true)
+    expect(mockApi.gh.listWorkItems).toHaveBeenCalledTimes(2)
+    mockApi.gh.listWorkItems.mockResolvedValue(workItems('recovered'))
+    await expect(
+      store.getState().fetchWorkItems('repo-1', '/repo', 24, '', {
+        force: true,
+        requireComplete: true
+      })
+    ).resolves.toEqual(workItems('recovered').items)
+    expect(mockApi.gh.listWorkItems).toHaveBeenCalledTimes(3)
+  })
+
+  it.each([{ force: true }, { noCache: true }])(
+    'coalesces twenty check upgrades: %j',
+    async (options) => {
+      const store = createTestStore()
+      const weak = Promise.withResolvers<PRCheckDetail[]>()
+      const fresh = Promise.withResolvers<PRCheckDetail[]>()
+      mockApi.gh.prChecks.mockReturnValueOnce(weak.promise).mockReturnValue(fresh.promise)
+      const first = store.getState().fetchPRChecks('/repo', 1, 'main', 'sha')
+      const settled = vi.fn()
+      const followers = Array.from({ length: 20 }, () =>
+        store.getState().fetchPRChecks('/repo', 1, 'main', 'sha', undefined, options).then(settled)
+      )
+      weak.resolve([])
+      await first
+      await vi.waitFor(() =>
+        expect(mockApi.gh.prChecks.mock.calls.length).toBeGreaterThanOrEqual(2)
+      )
+      expect(settled).not.toHaveBeenCalled()
+      const checks: PRCheckDetail[] = [
+        { name: 'fresh', status: 'completed', conclusion: 'success', url: null }
+      ]
+      fresh.resolve(checks)
+      await Promise.all(followers)
+      expect(mockApi.gh.prChecks).toHaveBeenCalledTimes(2)
+      expect(settled).toHaveBeenCalledTimes(20)
+      expect(settled.mock.calls.every(([rows]) => rows === checks)).toBe(true)
+    }
+  )
+
+  // Why: the bounded wait lets a force-only request (which still allows gh's own cache to answer)
+  // run beside a noCache one. Whichever settles last used to win the cache unconditionally.
+  it('keeps a late weaker work-item reply from burying the stronger result', async () => {
+    const store = createTestStore()
+    const weak = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
+    const forced = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
+    const strict = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
+    mockApi.gh.listWorkItems
+      .mockReturnValueOnce(weak.promise)
+      .mockReturnValueOnce(forced.promise)
+      .mockReturnValue(strict.promise)
+    const first = store.getState().fetchWorkItems('repo-1', '/repo', 24, '')
+    const forcedFetch = store.getState().fetchWorkItems('repo-1', '/repo', 24, '', { force: true })
+    const strictFetch = store
+      .getState()
+      .fetchWorkItems('repo-1', '/repo', 24, '', { force: true, noCache: true })
+    weak.resolve(workItems('weak'))
+    await first
+    await vi.waitFor(() => expect(mockApi.gh.listWorkItems).toHaveBeenCalledTimes(3))
+
+    strict.resolve(workItems('fresh'))
+    await expect(strictFetch).resolves.toEqual(workItems('fresh').items)
+    forced.resolve(workItems('gh-cached'))
+    await expect(forcedFetch).resolves.toEqual(workItems('gh-cached').items)
+
+    expect(store.getState().getCachedWorkItems('repo-1', 24, '', '/repo')).toEqual(
+      workItems('fresh').items
+    )
+    // Why: the stale payload must not be what isFresh hands back for the rest of the TTL either.
+    await expect(store.getState().fetchWorkItems('repo-1', '/repo', 24, '')).resolves.toEqual(
+      workItems('fresh').items
+    )
+    expect(mockApi.gh.listWorkItems).toHaveBeenCalledTimes(3)
+  })
+
+  it('keeps a superseded check reply from rewinding the cached run state', async () => {
+    const store = createTestStore()
+    const plain = Promise.withResolvers<PRCheckDetail[]>()
+    const noCacheOnly = Promise.withResolvers<PRCheckDetail[]>()
+    const forcedOnly = Promise.withResolvers<PRCheckDetail[]>()
+    mockApi.gh.prChecks
+      .mockReturnValueOnce(plain.promise)
+      .mockReturnValueOnce(noCacheOnly.promise)
+      .mockReturnValue(forcedOnly.promise)
+    const first = store.getState().fetchPRChecks('/repo', 1, 'main', 'sha')
+    // Why: force and noCache are incomparable, so each waits out the plain request and the second
+    // one then breaks out of the bounded wait while the first is still in flight.
+    const noCacheFetch = store
+      .getState()
+      .fetchPRChecks('/repo', 1, 'main', 'sha', undefined, { noCache: true })
+    const forcedFetch = store
+      .getState()
+      .fetchPRChecks('/repo', 1, 'main', 'sha', undefined, { force: true })
+    plain.resolve([])
+    await first
+    await vi.waitFor(() => expect(mockApi.gh.prChecks).toHaveBeenCalledTimes(3))
+
+    const newer: PRCheckDetail[] = [
+      { name: 'build', status: 'completed', conclusion: 'success', url: null }
+    ]
+    const older: PRCheckDetail[] = [
+      { name: 'build', status: 'in_progress', conclusion: null, url: null }
+    ]
+    forcedOnly.resolve(newer)
+    await expect(forcedFetch).resolves.toEqual(newer)
+    noCacheOnly.resolve(older)
+    await expect(noCacheFetch).resolves.toEqual(older)
+
+    expect(Object.values(store.getState().checksCache).map((entry) => entry.data)).toEqual([newer])
+  })
+
+  it('keeps a superseded project failure from stamping the known view key', async () => {
+    const store = createTestStore()
+    const weak = Promise.withResolvers<GetProjectViewTableResult>()
+    const replacementWeak = Promise.withResolvers<GetProjectViewTableResult>()
+    const forcedResult = Promise.withResolvers<GetProjectViewTableResult>()
+    mockApi.gh.getProjectViewTable
+      .mockReturnValueOnce(weak.promise)
+      .mockReturnValueOnce(replacementWeak.promise)
+      .mockReturnValue(forcedResult.promise)
+
+    const first = store.getState().fetchProjectViewTable(projectViewRequest)
+    const forcedFetch = store.getState().fetchProjectViewTable(projectViewRequest, { force: true })
+    // Why: only a non-forced entry can be superseded mid-flight, and it has to appear in the
+    // microtask after the first request clears the key — before the forced waiter re-checks it.
+    const pending = inflightProjectViewRequests.get(
+      projectViewRequestKey(projectViewRequest, 'local')
+    )
+    expect(pending).toBeDefined()
+    let replacementFetch: Promise<GetProjectViewTableResult> | undefined
+    void pending?.promise.then(() => {
+      replacementFetch = store.getState().fetchProjectViewTable(projectViewRequest)
+    })
+
+    const staleError = { type: 'network_error' as const, message: 'first attempt offline' }
+    weak.resolve({ ok: false, error: staleError })
+    await first
+    await vi.waitFor(() => expect(mockApi.gh.getProjectViewTable).toHaveBeenCalledTimes(3))
+    expect(store.getState().projectViewCache[projectViewCacheKey1]).toMatchObject({
+      error: staleError
+    })
+
+    forcedResult.resolve({ ok: true, data: projectTable('forced') })
+    await expect(forcedFetch).resolves.toEqual({ ok: true, data: projectTable('forced') })
+    const error = { type: 'network_error' as const, message: 'offline' }
+    replacementWeak.resolve({ ok: false, error })
+    await expect(replacementFetch).resolves.toEqual({ ok: false, error })
+
+    expect(store.getState().projectViewCache[projectViewCacheKey1]).toMatchObject({
+      data: projectTable('forced')
+    })
+    expect(store.getState().projectViewCache[projectViewCacheKey1].error).toBeUndefined()
+  })
+})
diff --git a/src/renderer/src/store/github/pull-request-actions.ts b/src/renderer/src/store/github/pull-request-actions.ts
index c9a43e075ac7..17852c1d57f9 100644
--- a/src/renderer/src/store/github/pull-request-actions.ts
+++ b/src/renderer/src/store/github/pull-request-actions.ts
@@ -9,6 +9,7 @@ import { prCacheKey } from './cache-identity'
 import { isFresh } from './cache-policy'
 import { buildGitHubPRRefreshStateClearToken } from './pr-refresh-state'
 import { githubHostedReviewFallbackPRNumber, prLookupHintKey } from './pr-result-routing'
+import { nextLookupGeneration } from '../lookup-generation-sequence'
 import { inflightPRRequests, prRequestGenerations } from './request-coordination'
 import { settingsForGitHubRepoOwner } from './work-item-routing'
 import {
@@ -113,7 +114,7 @@ export const createPullRequestActions = (
       return inflightRequest.promise
     }
 
-    const generation = (prRequestGenerations.get(cacheKey) ?? 0) + 1
+    const generation = nextLookupGeneration()
     const requestStartedAt = Date.now()
     const requestStartedHostedReviewEntry = get().hostedReviewCache[hostedReviewCacheKey]
     const requestStartedPRRefreshState = get().prRefreshStates[cacheKey]
diff --git a/src/renderer/src/store/github/request-coordination.ts b/src/renderer/src/store/github/request-coordination.ts
index fc6f3cb0b7c5..7aecfcd2b44b 100644
--- a/src/renderer/src/store/github/request-coordination.ts
+++ b/src/renderer/src/store/github/request-coordination.ts
@@ -13,31 +13,56 @@ export type InflightPR = {
 }
 export type InflightChecks = {
   promise: Promise<PRCheckDetail[]>
+  requestId: number
   force: boolean
   noCache: boolean
 }
 export type InflightWorkItems = {
   promise: Promise<readonly GitHubWorkItem[]>
+  requestId: number
   force: boolean
   noCache: boolean
   requireComplete: boolean
 }
+export type InflightProjectView = {
+  promise: Promise<GetProjectViewTableResult>
+  requestId: number
+  force: boolean
+}
 
 export const inflightPRRequests = new Map<string, InflightPR>()
 export const inflightIssueRequests = new Map<string, Promise<IssueInfo | null>>()
 export const inflightChecksRequests = new Map<string, InflightChecks>()
 export const inflightCommentsRequests = new Map<string, Promise<PRComment[]>>()
 export const inflightWorkItemsRequests = new Map<string, InflightWorkItems>()
-export const inflightProjectViewRequests = new Map<
-  string,
-  { promise: Promise<GetProjectViewTableResult>; force: boolean }
->()
+export const inflightProjectViewRequests = new Map<string, InflightProjectView>()
 export const prRequestGenerations = new Map<string, number>()
 export const prRefreshStartedHostedReviewEntries = new Map<
   string,
   AppState['hostedReviewCache'][string] | undefined
 >()
 
+let providerRequestSequence = 0
+
+/** Stamp identifying one provider request, captured before it awaits so it can recheck ownership after. */
+export function nextProviderRequestId(): number {
+  providerRequestSequence += 1
+  return providerRequestSequence
+}
+
+/**
+ * Why: the upgrade wait is bounded, so a stronger request can run beside a weaker one for the same
+ * key. Only the request the key currently resolves to may write that key's cache — otherwise a late
+ * weaker reply overwrites the stronger request's fresher result under a brand-new `fetchedAt`.
+ */
+export function ownsInflightRequest<T extends { requestId: number }>(
+  registry: ReadonlyMap<string, T>,
+  key: string,
+  requestId: number
+): boolean {
+  return registry.get(key)?.requestId === requestId
+}
+
 export function _getGitHubPRRequestGenerationCountForTest(): number {
   return prRequestGenerations.size
 }
diff --git a/src/renderer/src/store/github/work-item-fetch-actions.ts b/src/renderer/src/store/github/work-item-fetch-actions.ts
index 722556ee0ff4..5d865741931b 100644
--- a/src/renderer/src/store/github/work-item-fetch-actions.ts
+++ b/src/renderer/src/store/github/work-item-fetch-actions.ts
@@ -13,6 +13,8 @@ import { isFresh, withBoundedCacheEntry, WORK_ITEMS_CACHE_TTL } from './cache-po
 import {
   acquireProviderRequestSlot as acquireWorkItemSlot,
   inflightWorkItemsRequests,
+  nextProviderRequestId,
+  ownsInflightRequest,
   releaseProviderRequestSlot as releaseWorkItemSlot
 } from './request-coordination'
 import { findRepoForGitHubOwner } from './repository-routing'
@@ -109,20 +111,29 @@ export const createWorkItemFetchActions = (
       options?.sourceContext
     )
     const inflightKey = workItemsInflightRequestKey(key, requestContext.target)
-    const existing = inflightWorkItemsRequests.get(inflightKey)
-    if (existing) {
+    let waitedForUpgrade = false
+    for (;;) {
+      const existing = inflightWorkItemsRequests.get(inflightKey)
+      if (!existing) {
+        break
+      }
       // Why: a forcing/noCache caller must not dedupe to a weaker in-flight fetch (noCache is stricter — it must bypass gh api's cache too).
-      if (
+      const weakerThanRequested =
         (options?.force && !existing.force) ||
         (options?.noCache && !existing.noCache) ||
         (options?.requireComplete && !existing.requireComplete)
-      ) {
-        await existing.promise.catch(() => {})
-      } else {
+      if (!weakerThanRequested) {
         return existing.promise
       }
+      // Why: wait out one weaker request so peers can share the upgrade, but never twice — a steady stream of weaker callers would otherwise starve this one forever.
+      if (waitedForUpgrade) {
+        break
+      }
+      waitedForUpgrade = true
+      await existing.promise.catch(() => {})
     }
 
+    const requestId = nextProviderRequestId()
     const request = (async () => {
       await acquireWorkItemSlot()
       try {
@@ -163,6 +174,12 @@ export const createWorkItemFetchActions = (
         if (get().workItemsInvalidationNonce !== requestInvalidationNonce) {
           return items
         }
+        // Why: a stronger request may have replaced us on this key while we were awaiting (a
+        // force-only caller still lets gh's own cache answer), so writing here would bury its
+        // fresher rows under a new fetchedAt and keep isFresh serving them for the whole TTL.
+        if (!ownsInflightRequest(inflightWorkItemsRequests, inflightKey, requestId)) {
+          return items
+        }
         // Why: TaskPage useShallow-selects cache entry refs. A new { ...entry, fetchedAt }
         // still remaps every visible row. IPC structuredClone rebuilds nested records, so
         // data === previous.data never holds — reconcile structurally, then either mutate
@@ -220,12 +237,16 @@ export const createWorkItemFetchActions = (
         throw err
       } finally {
         releaseWorkItemSlot()
+      }
+    })().finally(() => {
+      if (ownsInflightRequest(inflightWorkItemsRequests, inflightKey, requestId)) {
         inflightWorkItemsRequests.delete(inflightKey)
       }
-    })()
+    })
 
     inflightWorkItemsRequests.set(inflightKey, {
       promise: request,
+      requestId,
       force: Boolean(options?.force),
       noCache: Boolean(options?.noCache),
       requireComplete: Boolean(options?.requireComplete)
diff --git a/src/renderer/src/store/lookup-generation-sequence.ts b/src/renderer/src/store/lookup-generation-sequence.ts
new file mode 100644
index 000000000000..c253b9d01840
--- /dev/null
+++ b/src/renderer/src/store/lookup-generation-sequence.ts
@@ -0,0 +1,22 @@
+/**
+ * Id source for the generation stamps that decide which in-flight lookup owns a
+ * cache key. One counter, allocated from for the life of the process, serves
+ * every cache and every coordinator that needs such a stamp.
+ *
+ * A coordinator that drops a key's generation entry once its newest lookup
+ * settles lets a per-key counter restart at 1 while an older lookup of the same
+ * key is still out: that straggler then reads as the current owner, publishes
+ * its stale answer, and tears down the live newer lookup's ownership so the
+ * fresh answer is dropped. Ids that are never reused remove the collision.
+ *
+ * Callers only ever compare stamps for equality, never order or magnitude, so a
+ * single shared sequence is safe no matter how many caches draw from it.
+ * Deliberately has no reset: rewinding it while a lookup is out recreates the
+ * very collision this exists to prevent.
+ */
+let lookupGenerationSequence = 0
+
+export function nextLookupGeneration(): number {
+  lookupGenerationSequence += 1
+  return lookupGenerationSequence
+}
diff --git a/src/renderer/src/store/plugin-language-packs-startup.test.ts b/src/renderer/src/store/plugin-language-packs-startup.test.ts
new file mode 100644
index 000000000000..6cb5a9c57114
--- /dev/null
+++ b/src/renderer/src/store/plugin-language-packs-startup.test.ts
@@ -0,0 +1,182 @@
+// @vitest-environment happy-dom
+
+import { StrictMode } from 'react'
+import { act, cleanup, renderHook } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { PluginChangeEvent } from '../../../shared/plugins/plugin-change-event'
+import {
+  pluginLanguageResourceId,
+  type PluginLanguagePackRegistration
+} from '../../../shared/plugins/plugin-language-pack-artifact'
+import type * as LanguagePackModule from './plugin-language-packs'
+
+let languagePacks: typeof LanguagePackModule
+
+function pack(name: string): PluginLanguagePackRegistration {
+  const id = `plugin:${name}` as const
+  return {
+    id,
+    resourceLanguage: pluginLanguageResourceId(id),
+    pluginKey: name,
+    locale: 'en',
+    catalog: {}
+  }
+}
+
+function installBridge() {
+  const requests: ReturnType<typeof Promise.withResolvers<PluginLanguagePackRegistration[]>>[] = []
+  const listLanguagePacks = vi.fn(() => {
+    const request = Promise.withResolvers<PluginLanguagePackRegistration[]>()
+    requests.push(request)
+    return request.promise
+  })
+  const listeners: ((event: PluginChangeEvent) => void)[] = []
+  const onChanged = vi.fn((listener: (event: PluginChangeEvent) => void) => {
+    listeners.push(listener)
+    return () => {}
+  })
+  vi.stubGlobal('api', { plugins: { listLanguagePacks, onChanged } })
+  return { requests, listLanguagePacks, onChanged, listeners }
+}
+
+beforeEach(async () => {
+  vi.resetModules()
+  languagePacks = await import('./plugin-language-packs')
+})
+
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+})
+
+describe('plugin language-pack startup ownership', () => {
+  it.each([false, true])(
+    'shares one load across mounted consumers (StrictMode: %s)',
+    async (strict) => {
+      const bridge = installBridge()
+      const wrapper = strict ? StrictMode : undefined
+      const first = renderHook(() => languagePacks.usePluginLanguagePacks(), { wrapper })
+      const second = renderHook(() => languagePacks.usePluginLanguagePacks(), { wrapper })
+      const dispatches = bridge.listLanguagePacks.mock.calls.length
+      const result = [pack('startup')]
+      await act(async () => {
+        for (const request of bridge.requests) {
+          request.resolve(result)
+        }
+        await Promise.all(bridge.requests.map((request) => request.promise))
+      })
+      expect(dispatches).toBe(1)
+      expect(bridge.onChanged).toHaveBeenCalledTimes(1)
+      expect(first.result.current).toEqual(result)
+      expect(second.result.current).toBe(first.result.current)
+    }
+  )
+
+  it.each(['resolve', 'reject'] as const)(
+    'keeps a newer refresh pending after an older request %ss',
+    async (settlement) => {
+      const bridge = installBridge()
+      const store = languagePacks.usePluginLanguagePackStore
+      const older = store.getState().fetchPacks()
+      const newer = store.getState().fetchPacks()
+      if (settlement === 'resolve') {
+        bridge.requests[0].resolve([pack('old')])
+      } else {
+        bridge.requests[0].reject(new Error('old failure'))
+      }
+      await older
+      expect(store.getState().loaded).toBe(false)
+      languagePacks.ensurePluginLanguagePacksLoaded()
+      const dispatches = bridge.listLanguagePacks.mock.calls.length
+      for (const request of bridge.requests.slice(1)) {
+        request.resolve([pack('current')])
+      }
+      await newer
+      expect(dispatches).toBe(2)
+      expect(store.getState().packs).toEqual([pack('current')])
+    }
+  )
+
+  it('allows a content-change refresh to supersede startup while ignoring unrelated changes', async () => {
+    const bridge = installBridge()
+    languagePacks.ensurePluginLanguagePacksLoaded()
+    bridge.listeners[0]({ contentPacksChanged: false })
+    expect(bridge.listLanguagePacks).toHaveBeenCalledTimes(1)
+    bridge.listeners[0]({ contentPacksChanged: true })
+    expect(bridge.listLanguagePacks).toHaveBeenCalledTimes(2)
+    bridge.requests[1].resolve([pack('changed')])
+    await bridge.requests[1].promise
+    bridge.requests[0].resolve([pack('old')])
+    await bridge.requests[0].promise
+    languagePacks.ensurePluginLanguagePacksLoaded()
+    expect(bridge.listLanguagePacks).toHaveBeenCalledTimes(2)
+    expect(languagePacks.usePluginLanguagePackStore.getState().packs).toEqual([pack('changed')])
+  })
+
+  it('keeps the shared startup request alive after the first consumer unmounts', async () => {
+    const bridge = installBridge()
+    const first = renderHook(() => languagePacks.usePluginLanguagePacks())
+    first.unmount()
+    const second = renderHook(() => languagePacks.usePluginLanguagePacks())
+    const dispatches = bridge.listLanguagePacks.mock.calls.length
+    await act(async () => {
+      for (const request of bridge.requests) {
+        request.resolve([pack('retained')])
+      }
+      await Promise.all(bridge.requests.map((request) => request.promise))
+    })
+    expect(dispatches).toBe(1)
+    expect(second.result.current).toEqual([pack('retained')])
+  })
+
+  it('retries a wedged startup request instead of joining it for the session', async () => {
+    vi.useFakeTimers()
+    try {
+      const bridge = installBridge()
+      languagePacks.ensurePluginLanguagePacksLoaded()
+      // A request that is merely slow is shared, not duplicated.
+      vi.advanceTimersByTime(9_000)
+      languagePacks.ensurePluginLanguagePacksLoaded()
+      expect(bridge.listLanguagePacks).toHaveBeenCalledTimes(1)
+      // Past the join window it is wedged, so a later consumer must be able to make progress.
+      vi.advanceTimersByTime(2_000)
+      languagePacks.ensurePluginLanguagePacksLoaded()
+      expect(bridge.listLanguagePacks).toHaveBeenCalledTimes(2)
+      bridge.requests[1].resolve([pack('recovered')])
+      await vi.waitFor(() =>
+        expect(languagePacks.usePluginLanguagePackStore.getState().loaded).toBe(true)
+      )
+      expect(languagePacks.usePluginLanguagePackStore.getState().packs).toEqual([pack('recovered')])
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('retains fail-closed loading and permits an explicit retry after rejection', async () => {
+    const bridge = installBridge()
+    const store = languagePacks.usePluginLanguagePackStore
+    const failed = store.getState().fetchPacks()
+    bridge.requests[0].reject(new Error('bridge unavailable'))
+    await failed
+    expect(store.getState().loaded).toBe(true)
+    expect(store.getState().packs).toEqual([])
+    languagePacks.ensurePluginLanguagePacksLoaded()
+    expect(bridge.listLanguagePacks).toHaveBeenCalledTimes(1)
+    const retry = store.getState().fetchPacks()
+    bridge.requests[1].resolve([pack('retry')])
+    await retry
+    expect(store.getState().packs).toEqual([pack('retry')])
+  })
+
+  it('finishes without an older bridge API and admits a later explicit refresh', async () => {
+    vi.stubGlobal('api', {})
+    languagePacks.ensurePluginLanguagePacksLoaded()
+    expect(languagePacks.usePluginLanguagePackStore.getState().loaded).toBe(true)
+    const bridge = installBridge()
+    const refresh = languagePacks.usePluginLanguagePackStore.getState().fetchPacks()
+    bridge.requests[0].resolve([pack('available')])
+    await refresh
+    expect(bridge.listLanguagePacks).toHaveBeenCalledTimes(1)
+    expect(languagePacks.usePluginLanguagePackStore.getState().packs).toEqual([pack('available')])
+  })
+})
diff --git a/src/renderer/src/store/plugin-language-packs.ts b/src/renderer/src/store/plugin-language-packs.ts
index 7c37c53c9c8f..009ab459612c 100644
--- a/src/renderer/src/store/plugin-language-packs.ts
+++ b/src/renderer/src/store/plugin-language-packs.ts
@@ -11,7 +11,17 @@ type PluginLanguagePackState = {
   fetchPacks: () => Promise<void>
 }
 
+/**
+ * Joining the startup request saves a duplicate IPC round trip, but its handler awaits plugin
+ * discovery — a wedged one must not turn `ensurePluginLanguagePacksLoaded` into a no-op for the
+ * session, which would pin every consumer on built-in translations. Past this bound the pending
+ * request is wedged rather than slow, so a later consumer starts its own (mirrors the reasoning in
+ * `src/main/git/coalesced-probe.ts`).
+ */
+const STARTUP_REQUEST_JOIN_WINDOW_MS = 10_000
+
 let requestGeneration = 0
+let latestRequestStartedAt: number | null = null
 let changeSubscriptionStarted = false
 
 export const usePluginLanguagePackStore = create<PluginLanguagePackState>()((set) => ({
@@ -19,9 +29,11 @@ export const usePluginLanguagePackStore = create<PluginLanguagePackState>()((set
   loaded: false,
   fetchPacks: async () => {
     const generation = ++requestGeneration
+    latestRequestStartedAt = Date.now()
     const api = window.api?.plugins
     if (!api?.listLanguagePacks) {
       if (generation === requestGeneration) {
+        latestRequestStartedAt = null
         set({ packs: [], loaded: true })
       }
       return
@@ -44,13 +56,20 @@ export const usePluginLanguagePackStore = create<PluginLanguagePackState>()((set
       if (generation === requestGeneration) {
         set({ packs: [], loaded: true })
       }
+    } finally {
+      if (generation === requestGeneration) {
+        latestRequestStartedAt = null
+      }
     }
   }
 }))
 
 export function ensurePluginLanguagePacksLoaded(): void {
   const state = usePluginLanguagePackStore.getState()
-  if (!state.loaded) {
+  const joinable =
+    latestRequestStartedAt !== null &&
+    Date.now() - latestRequestStartedAt < STARTUP_REQUEST_JOIN_WINDOW_MS
+  if (!state.loaded && !joinable) {
     void state.fetchPacks()
   }
   if (!changeSubscriptionStarted && window.api?.plugins?.onChanged) {
diff --git a/src/renderer/src/store/project-groups/project-group-catalog-actions.ts b/src/renderer/src/store/project-groups/project-group-catalog-actions.ts
index c7841c85e0cd..d19ac185766e 100644
--- a/src/renderer/src/store/project-groups/project-group-catalog-actions.ts
+++ b/src/renderer/src/store/project-groups/project-group-catalog-actions.ts
@@ -32,11 +32,12 @@ export function createProjectGroupCatalogActions(
             return current
           }
           const { projectGroups } = mergeFetchedProjectGroupCatalog(catalog, current.projectGroups)
+          if (arrayElementsUnchanged(projectGroups, current.projectGroups)) {
+            return current
+          }
           return {
             projectGroups,
-            ...(arrayElementsUnchanged(projectGroups, current.projectGroups)
-              ? {}
-              : { folderWorkspacePathStatuses: {} })
+            folderWorkspacePathStatuses: {}
           }
         })
       } catch (err) {
@@ -55,11 +56,12 @@ export function createProjectGroupCatalogActions(
             return s
           }
           const { projectGroups } = mergeFetchedProjectGroupCatalog(catalog, s.projectGroups)
+          if (arrayElementsUnchanged(projectGroups, s.projectGroups)) {
+            return s
+          }
           return {
             projectGroups,
-            ...(arrayElementsUnchanged(projectGroups, s.projectGroups)
-              ? {}
-              : { folderWorkspacePathStatuses: {} })
+            folderWorkspacePathStatuses: {}
           }
         })
       }
diff --git a/src/renderer/src/store/slices/agent-status-contract.ts b/src/renderer/src/store/slices/agent-status-contract.ts
index afff64d33037..64ff3e10dcfe 100644
--- a/src/renderer/src/store/slices/agent-status-contract.ts
+++ b/src/renderer/src/store/slices/agent-status-contract.ts
@@ -88,6 +88,8 @@ export type AgentStatusTiming = {
   /** Observation clock for staleness; see `AgentStatusEntry.evidenceObservedAt`. */
   evidenceObservedAt?: number
   stateStartedAt?: number
+  /** The host's turn start; see `AgentStatusEntry.turnStartedAt`. */
+  turnStartedAt?: number
 }
 
 export type AgentStatusRouting = {
diff --git a/src/renderer/src/store/slices/agent-status-drop-actions.ts b/src/renderer/src/store/slices/agent-status-drop-actions.ts
index cff59fdc3296..12d6c9b62747 100644
--- a/src/renderer/src/store/slices/agent-status-drop-actions.ts
+++ b/src/renderer/src/store/slices/agent-status-drop-actions.ts
@@ -13,6 +13,7 @@ import {
   shouldReplaceRetainedWithLive
 } from './agent-status-pane-key-tab-binding'
 import { retireAgentPaneAuthorityAliasesByOwnerTab } from './agent-pane-authority'
+import { agentTurnStoppedByUser } from '../../../../shared/agent-main-agent-verdict'
 
 function removeAcknowledgement(
   acknowledgements: Record<string, number>,
@@ -162,7 +163,7 @@ export function createAgentStatusDropActions(
         if (
           liveEntry?.state === 'done' &&
           liveEntry.agentType !== undefined &&
-          liveEntry.interrupted !== true
+          !agentTurnStoppedByUser(liveEntry)
         ) {
           retainedEvidence.set(
             paneKey,
diff --git a/src/renderer/src/store/slices/agent-status-live-entry-builder.ts b/src/renderer/src/store/slices/agent-status-live-entry-builder.ts
index 28bf952460c3..ec80692f95e8 100644
--- a/src/renderer/src/store/slices/agent-status-live-entry-builder.ts
+++ b/src/renderer/src/store/slices/agent-status-live-entry-builder.ts
@@ -113,6 +113,11 @@ export function buildAgentStatusLiveEntry(
       : existing && existing.state === payload.state
         ? existing.stateStartedAt
         : updatedAt)
+  // Why: a writer with no turn clock (an OSC repaint) keeps the host's stamp only within one state;
+  // a state change it cannot date must not inherit another turn's start.
+  const turnStartedAt =
+    timing?.turnStartedAt ??
+    (existing && existing.state === payload.state ? existing.turnStartedAt : undefined)
   if (
     existing &&
     shouldSuppressInheritedTerminalStatus({
@@ -205,6 +210,7 @@ export function buildAgentStatusLiveEntry(
     ...(metadata?.structuredHostOwned === true ? { structuredHostOwned: true as const } : {}),
     stateStartedAt,
     stateObservedAt,
+    ...(turnStartedAt !== undefined ? { turnStartedAt } : {}),
     agentType: identity.agentType,
     model:
       payload.model ?? (existing?.agentType === identity.agentType ? existing.model : undefined),
diff --git a/src/renderer/src/store/slices/agent-status-live-entry-state-history.ts b/src/renderer/src/store/slices/agent-status-live-entry-state-history.ts
index 6976b0b990bb..d1836ca137bc 100644
--- a/src/renderer/src/store/slices/agent-status-live-entry-state-history.ts
+++ b/src/renderer/src/store/slices/agent-status-live-entry-state-history.ts
@@ -3,6 +3,7 @@ import {
   type AgentStateHistoryEntry,
   type AgentStatusEntry
 } from '../../../../shared/agent-status-types'
+import { agentVerdictFields } from '../../../../shared/agent-main-agent-verdict'
 import type { AgentStatusPayload } from './agent-status-contract'
 
 /** The history a live entry carries after this write, and when its state was first observed. A
@@ -36,7 +37,7 @@ export function resolveAgentStatusLiveEntryStateHistory(
         prompt: existing.prompt,
         startedAt: existing.stateStartedAt,
         observedAt: existing.stateObservedAt,
-        interrupted: existing.interrupted
+        ...agentVerdictFields(existing)
       }
     ]
     if (history.length > AGENT_STATE_HISTORY_MAX) {
diff --git a/src/renderer/src/store/slices/agent-status-live-facts.ts b/src/renderer/src/store/slices/agent-status-live-facts.ts
index 851ab7890123..9d8c19742f7f 100644
--- a/src/renderer/src/store/slices/agent-status-live-facts.ts
+++ b/src/renderer/src/store/slices/agent-status-live-facts.ts
@@ -16,6 +16,7 @@ import {
 } from './agent-status-pane-key-tab-binding'
 import { pruneMigrationUnsupportedEntries } from './agent-status-migration-unsupported-entries'
 import { sleepingRecordFromEntry } from './agent-status-sleeping-records'
+import { agentMainAgentVerdict } from '../../../../shared/agent-main-agent-verdict'
 
 export type AgentStatusLiveFacts = {
   existingSleepingRecord: SleepingAgentSessionRecord | undefined
@@ -95,12 +96,16 @@ export function deriveAgentStatusLiveFacts(args: AgentStatusLiveFactsArgs): Agen
       entry.lastAssistantMessageIsToolOutput !== existing.lastAssistantMessageIsToolOutput ||
       entry.orchestration !== existing.orchestration ||
       entry.subagents !== existing.subagents ||
-      entry.providerSession !== existing.providerSession ||
-      entry.interrupted !== existing.interrupted)
+      entry.providerSession !== existing.providerSession)
+  // A verdict moves no clock: a failure keeps a done's completion time, and a main agent that fails
+  // while its subagents keep the row working leaves the row's state and start as they were.
+  const verdictChanged =
+    !!existing && agentMainAgentVerdict(entry) !== agentMainAgentVerdict(existing)
   const retentionRelevantChange =
     sortRelevantChange ||
     attributionChanged ||
     existing?.workingMode !== entry.workingMode ||
+    verdictChanged ||
     doneRetentionFieldsChanged
   const existingSleepingRecord = state.sleepingAgentSessionsByPaneKey[paneKey]
   const liveRecoveryWorktreeId =
diff --git a/src/renderer/src/store/slices/agent-status-main-agent-fact.test.ts b/src/renderer/src/store/slices/agent-status-main-agent-fact.test.ts
index bd00eaa50158..8ceb45488e8d 100644
--- a/src/renderer/src/store/slices/agent-status-main-agent-fact.test.ts
+++ b/src/renderer/src/store/slices/agent-status-main-agent-fact.test.ts
@@ -51,14 +51,12 @@ describe('the main agent fact on a renderer status entry', () => {
     })
     expect(store.getState().agentStatusByPaneKey[PANE].mainAgent).toEqual(mainAgent)
 
-    store
-      .getState()
-      .setAgentStatus(PANE, {
-        state: 'done',
-        prompt: 'go',
-        agentType: 'claude',
-        observation: osc(2)
-      })
+    store.getState().setAgentStatus(PANE, {
+      state: 'done',
+      prompt: 'go',
+      agentType: 'claude',
+      observation: osc(2)
+    })
     expect(store.getState().agentStatusByPaneKey[PANE].mainAgent).toBeUndefined()
   })
 
diff --git a/src/renderer/src/store/slices/agent-status-provider-session-actions.ts b/src/renderer/src/store/slices/agent-status-provider-session-actions.ts
index 1ffe1d7cb0e8..8deddac21be8 100644
--- a/src/renderer/src/store/slices/agent-status-provider-session-actions.ts
+++ b/src/renderer/src/store/slices/agent-status-provider-session-actions.ts
@@ -21,6 +21,7 @@ import {
 import { removePaneKeys } from './agent-status-pane-keyed-records'
 import { registryEntryMatchesStatus } from './agent-status-launch-config'
 import { copyLaunchConfig } from './agent-status-sleeping-records'
+import { agentVerdictFields } from '../../../../shared/agent-main-agent-verdict'
 
 export function createAgentStatusProviderSessionActions(
   runtime: AgentStatusRuntime
@@ -113,9 +114,7 @@ export function createAgentStatusProviderSessionActions(
               ? { connectionId: existingRecord.connectionId }
               : {}),
           ...(launchConfig ? { launchConfig: copyLaunchConfig(launchConfig) } : {}),
-          ...(preservesCompletedRecoveryRecord && existingRecord.interrupted !== undefined
-            ? { interrupted: existingRecord.interrupted }
-            : {}),
+          ...(preservesCompletedRecoveryRecord ? agentVerdictFields(existingRecord) : {}),
           origin: preservesQuitOrigin ? 'quit' : 'live'
         }
         removedLiveStatus = existingStatus !== undefined
diff --git a/src/renderer/src/store/slices/agent-status-provider-session.test.ts b/src/renderer/src/store/slices/agent-status-provider-session.test.ts
index 786b45378ecc..30793ffce290 100644
--- a/src/renderer/src/store/slices/agent-status-provider-session.test.ts
+++ b/src/renderer/src/store/slices/agent-status-provider-session.test.ts
@@ -455,6 +455,61 @@ describe('recordAgentProviderSession', () => {
     })
   })
 
+  it('keeps a completed recovery record failed on a same-session update', () => {
+    const store = createTestStore()
+    store.setState({
+      tabsByWorktree: {
+        'wt-1': [makeTab({ id: 'tab-1', worktreeId: 'wt-1' })]
+      }
+    } as Partial<AppState>)
+    const providerSession = makePiCompatibleProviderSession('pi')
+
+    store
+      .getState()
+      .setAgentStatus(
+        'tab-1:leaf-1',
+        { state: 'working', prompt: 'finish the task', agentType: 'pi' },
+        'Pi',
+        { updatedAt: 20, stateStartedAt: 20 },
+        { tabId: 'tab-1', worktreeId: 'wt-1' },
+        { providerSession }
+      )
+    store.getState().setAgentStatus(
+      'tab-1:leaf-1',
+      {
+        state: 'done',
+        prompt: 'finish the task',
+        agentType: 'pi',
+        mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: 30 }
+      },
+      'Pi',
+      { updatedAt: 30, stateStartedAt: 30 },
+      { tabId: 'tab-1', worktreeId: 'wt-1' },
+      { providerSession }
+    )
+    expect(store.getState().sleepingAgentSessionsByPaneKey['tab-1:leaf-1']).toMatchObject({
+      state: 'done',
+      mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: 30 }
+    })
+
+    store
+      .getState()
+      .recordAgentProviderSession(
+        'tab-1:leaf-1',
+        'pi',
+        providerSession,
+        { updatedAt: 40 },
+        { tabId: 'tab-1', worktreeId: 'wt-1' }
+      )
+
+    expect(store.getState().sleepingAgentSessionsByPaneKey['tab-1:leaf-1']).toMatchObject({
+      providerSession,
+      state: 'done',
+      mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: 30 },
+      origin: 'live'
+    })
+  })
+
   it('does not downgrade a quit recovery record on a same-session update', () => {
     const store = createTestStore()
     store.setState({
diff --git a/src/renderer/src/store/slices/agent-status-recovery-collection.ts b/src/renderer/src/store/slices/agent-status-recovery-collection.ts
index 689dbf861a7d..491805b5b98e 100644
--- a/src/renderer/src/store/slices/agent-status-recovery-collection.ts
+++ b/src/renderer/src/store/slices/agent-status-recovery-collection.ts
@@ -18,6 +18,7 @@ import {
   type CollectSleepingAgentSessionRecordsOptions
 } from './agent-status-sleeping-records'
 import { getLaunchConfigForEntry } from './agent-status-launch-config'
+import { agentTurnStoppedByUser } from '../../../../shared/agent-main-agent-verdict'
 import { isCompletedPiCompatibleAgentWithLiveRecoveryRecord } from '@/lib/live-resume-anchor-record'
 
 export function collectSleepingAgentSessionRecordsForWorktree(
@@ -153,7 +154,7 @@ export function collectHibernatedCompletionEvidenceForWorktree(
       !allowedPaneKeys.has(paneKey) ||
       entry.state !== 'done' ||
       agentType === undefined ||
-      entry.interrupted === true
+      agentTurnStoppedByUser(entry)
     ) {
       continue
     }
diff --git a/src/renderer/src/store/slices/agent-status-recovery-equivalence.ts b/src/renderer/src/store/slices/agent-status-recovery-equivalence.ts
index 660d104abf6f..1659e757df51 100644
--- a/src/renderer/src/store/slices/agent-status-recovery-equivalence.ts
+++ b/src/renderer/src/store/slices/agent-status-recovery-equivalence.ts
@@ -3,6 +3,7 @@ import type {
   SleepingAgentLaunchConfig
 } from '../../../../shared/agent-session-resume'
 import { agentProviderSessionsEqual } from '../../../../shared/agent-session-resume'
+import { agentMainAgentVerdict } from '../../../../shared/agent-main-agent-verdict'
 
 export function launchConfigsEqual(
   a: SleepingAgentLaunchConfig | undefined,
@@ -41,7 +42,7 @@ export function sleepingRecordsEquivalentIgnoringCaptureTime(
     existing.updatedAt === next.updatedAt &&
     existing.terminalTitle === next.terminalTitle &&
     existing.lastAssistantMessage === next.lastAssistantMessage &&
-    existing.interrupted === next.interrupted &&
+    agentMainAgentVerdict(existing) === agentMainAgentVerdict(next) &&
     existing.origin === next.origin &&
     launchConfigsEqual(existing.launchConfig, next.launchConfig)
   )
@@ -61,7 +62,7 @@ export function recoveryRecordMatches(
     existing.worktreeId === next.worktreeId &&
     existing.tabId === next.tabId &&
     existing.state === next.state &&
-    existing.interrupted === next.interrupted &&
+    agentMainAgentVerdict(existing) === agentMainAgentVerdict(next) &&
     agentProviderSessionsEqual(existing.agent, existing.providerSession, next.providerSession) &&
     launchConfigsEqual(existing.launchConfig, next.launchConfig)
   )
diff --git a/src/renderer/src/store/slices/agent-status-sleeping-records.ts b/src/renderer/src/store/slices/agent-status-sleeping-records.ts
index 6363fb9e2166..8e1abd3c2029 100644
--- a/src/renderer/src/store/slices/agent-status-sleeping-records.ts
+++ b/src/renderer/src/store/slices/agent-status-sleeping-records.ts
@@ -1,5 +1,9 @@
 import type { AppState } from '../types'
 import type { AgentStatusEntry } from '../../../../shared/agent-status-types'
+import {
+  agentTurnEndedUncleanly,
+  agentVerdictFields
+} from '../../../../shared/agent-main-agent-verdict'
 import {
   getAgentResumeArgv,
   isResumableTuiAgent,
@@ -57,7 +61,7 @@ export function sleepingRecordFromEntry(args: {
       ? { lastAssistantMessage: args.entry.lastAssistantMessage }
       : {}),
     ...(args.launchConfig ? { launchConfig: copyLaunchConfig(args.launchConfig) } : {}),
-    ...(args.entry.interrupted ? { interrupted: true } : {}),
+    ...agentVerdictFields(args.entry),
     ...(args.origin ? { origin: args.origin } : {})
   }
 }
@@ -79,7 +83,7 @@ export function normalizeSleepingAgentSessionCollectOptions(
 }
 
 export function isValidCompletedAgentHibernationEntry(entry: AgentStatusEntry): boolean {
-  return entry.state === 'done' && entry.interrupted !== true
+  return entry.state === 'done' && !agentTurnEndedUncleanly(entry)
 }
 
 // Why: a finished pane is passive wake evidence, and a mobile wake background-mounts every passive
@@ -98,14 +102,18 @@ export function isDurableSleepingCapture(record: SleepingAgentSessionRecord): bo
 }
 
 // Why: manual sleep kills the pty either way, so the record carries resume identity, not the dead
-// turn's interrupt flag — and an explicitly slept workspace is never stale at wake, so a row the
+// turn's verdict — and an explicitly slept workspace is never stale at wake, so a row the
 // user is deliberately sleeping must not trip the wake-side staleness discard. `state` is preserved
 // so a done pane wakes lazily in place instead of spawning a new tab.
 export function manualSleepCaptureEntry(
   entry: AgentStatusEntry,
   capturedAt: number
 ): AgentStatusEntry {
-  return { ...entry, updatedAt: capturedAt, interrupted: false }
+  if (!entry.mainAgent) {
+    return { ...entry, updatedAt: capturedAt, interrupted: false }
+  }
+  const { outcome: _outcome, ...mainAgent } = entry.mainAgent
+  return { ...entry, updatedAt: capturedAt, interrupted: false, mainAgent }
 }
 
 export function removeSleepingRecordsReplacedByManualWorktreeSleep(
diff --git a/src/renderer/src/store/slices/agent-status-turn-started-at.test.ts b/src/renderer/src/store/slices/agent-status-turn-started-at.test.ts
new file mode 100644
index 000000000000..324b70e075f1
--- /dev/null
+++ b/src/renderer/src/store/slices/agent-status-turn-started-at.test.ts
@@ -0,0 +1,50 @@
+import { describe, expect, it } from 'vitest'
+import { createTestStore } from './store-test-helpers'
+
+const PANE = 'tab-1:11111111-1111-4111-8111-111111111111'
+
+describe("the host's turn start on a renderer status entry", () => {
+  it('lands on the entry from the host timing and follows each host write', () => {
+    const store = createTestStore()
+    store
+      .getState()
+      .setAgentStatus(PANE, { state: 'working', prompt: 'go', agentType: 'claude' }, undefined, {
+        updatedAt: 1_000,
+        stateStartedAt: 1_000,
+        turnStartedAt: 900
+      })
+    expect(store.getState().agentStatusByPaneKey[PANE]?.turnStartedAt).toBe(900)
+
+    // The same prompt sent again: the state never left working, the host stamped a new turn.
+    store
+      .getState()
+      .setAgentStatus(PANE, { state: 'working', prompt: 'go', agentType: 'claude' }, undefined, {
+        updatedAt: 2_000,
+        stateStartedAt: 1_000,
+        turnStartedAt: 1_900
+      })
+    expect(store.getState().agentStatusByPaneKey[PANE]?.turnStartedAt).toBe(1_900)
+  })
+
+  it('keeps the stamp behind an unchanged state when a writer carries none, and drops it on a state edge', () => {
+    const store = createTestStore()
+    store
+      .getState()
+      .setAgentStatus(PANE, { state: 'working', prompt: 'go', agentType: 'claude' }, undefined, {
+        updatedAt: 1_000,
+        stateStartedAt: 1_000,
+        turnStartedAt: 900
+      })
+    // A renderer-side OSC repaint has no turn clock of its own.
+    store.getState().setAgentStatus(PANE, {
+      state: 'working',
+      prompt: 'go',
+      agentType: 'claude',
+      toolName: 'Bash'
+    })
+    expect(store.getState().agentStatusByPaneKey[PANE]?.turnStartedAt).toBe(900)
+
+    store.getState().setAgentStatus(PANE, { state: 'done', prompt: 'go', agentType: 'claude' })
+    expect(store.getState().agentStatusByPaneKey[PANE]?.turnStartedAt).toBeUndefined()
+  })
+})
diff --git a/src/renderer/src/store/slices/agent-status-verdict-copies.test.ts b/src/renderer/src/store/slices/agent-status-verdict-copies.test.ts
new file mode 100644
index 000000000000..26bec4113b15
--- /dev/null
+++ b/src/renderer/src/store/slices/agent-status-verdict-copies.test.ts
@@ -0,0 +1,191 @@
+import { describe, expect, it } from 'vitest'
+import type { SleepingAgentSessionRecord } from '../../../../shared/agent-session-resume'
+import type { AgentStatusEntry } from '../../../../shared/agent-status-types'
+import { parseWorkspaceSession } from '../../../../shared/workspace-session-schema'
+import { buildPaneActivityEvents } from '@/components/activity/activity-pane-events'
+import { makeTab, makeWorktree } from '@/components/activity/ActivityPrototypePage-test-fixtures'
+import type { AppState } from '../types'
+import { agentMeta, agentTitle } from '@/components/activity/activity-thread-presentation'
+import { activationTreatsNoteAsFinished } from '@/lib/sleeping-agent-pane-ownership'
+import { resolveAgentStatusLiveEntryStateHistory } from './agent-status-live-entry-state-history'
+import { deriveAgentStatusLiveFacts } from './agent-status-live-facts'
+import {
+  recoveryRecordMatches,
+  sleepingRecordsEquivalentIgnoringCaptureTime
+} from './agent-status-recovery-equivalence'
+import {
+  isValidCompletedAgentHibernationEntry,
+  manualSleepCaptureEntry,
+  sleepingRecordFromEntry
+} from './agent-status-sleeping-records'
+
+// Every copy of a row's verdict carries it: history, sleep records and their equality checks.
+// A copy that kept only `interrupted` would read a failure as a clean finish.
+const PANE_KEY = 'tab-1:11111111-1111-4111-8111-111111111111'
+const FAILED_MAIN_AGENT = { state: 'done', outcome: 'failure', stateStartedAt: 2_000 } as const
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: these readers touch only the three maps given; every tab lookup is answered by the tab the caller passes.
+const STATE = {
+  sleepingAgentSessionsByPaneKey: {},
+  migrationUnsupportedByPtyId: {},
+  tabsByWorktree: {}
+} as unknown as AppState
+
+function failedDone(overrides: Partial<AgentStatusEntry> = {}): AgentStatusEntry {
+  return {
+    paneKey: PANE_KEY,
+    state: 'done',
+    prompt: 'ship it',
+    updatedAt: 2_000,
+    stateStartedAt: 2_000,
+    stateHistory: [],
+    agentType: 'claude',
+    providerSession: { key: 'session_id', id: 'session-1' },
+    mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: 2_000 },
+    ...overrides
+  }
+}
+
+function record(overrides: Partial<SleepingAgentSessionRecord> = {}): SleepingAgentSessionRecord {
+  return {
+    paneKey: PANE_KEY,
+    worktreeId: 'wt-1',
+    agent: 'claude',
+    providerSession: { key: 'session_id', id: 'session-1' },
+    prompt: 'ship it',
+    state: 'done',
+    capturedAt: 3_000,
+    updatedAt: 2_000,
+    origin: 'live',
+    ...overrides
+  }
+}
+
+describe('a failed done keeps its verdict in every copy', () => {
+  it('copies the verdict into history with the state it leaves', () => {
+    const { history } = resolveAgentStatusLiveEntryStateHistory(
+      failedDone(),
+      { state: 'working' },
+      3_000
+    )
+    expect(history.at(-1)).toMatchObject({
+      state: 'done',
+      mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: 2_000 }
+    })
+  })
+
+  it('draws a history done as failed from its own main agent status, not the live row', () => {
+    // The main agent failed before the row settled, so its clock differs from the row's.
+    const mainAgent = { ...FAILED_MAIN_AGENT, stateStartedAt: 1_500 }
+    const entry: AgentStatusEntry = {
+      ...failedDone({ state: 'working', stateStartedAt: 3_000, mainAgent: undefined }),
+      stateHistory: resolveAgentStatusLiveEntryStateHistory(
+        failedDone({ mainAgent }),
+        { state: 'working' },
+        3_000
+      ).history
+    }
+    const events = buildPaneActivityEvents({
+      entry,
+      worktree: makeWorktree(),
+      repo: null,
+      tab: makeTab(),
+      agentType: 'claude',
+      agentAlive: true,
+      acknowledgedAt: 0,
+      clearedAt: 0,
+      liveState: null
+    })
+    const done = events.find((event) => event.state === 'done')
+    expect(done?.entry.mainAgent).toEqual(mainAgent)
+    expect(done && agentTitle(done)).toBe('Agent failed')
+    expect(done && agentMeta(done)).toBe('Claude failed')
+  })
+
+  it('records the verdict on a sleep record and never hibernates a failed pane', () => {
+    const sleeping = sleepingRecordFromEntry({
+      state: STATE,
+      entry: failedDone(),
+      worktreeId: 'wt-1',
+      tab: makeTab(),
+      capturedAt: 3_000,
+      origin: 'live'
+    })
+    expect(sleeping?.mainAgent).toEqual({
+      state: 'done',
+      outcome: 'failure',
+      stateStartedAt: 2_000
+    })
+    expect(isValidCompletedAgentHibernationEntry(failedDone())).toBe(false)
+    // A live checkpoint of a turn that failed is still work the user owns.
+    expect(activationTreatsNoteAsFinished(record({ mainAgent: FAILED_MAIN_AGENT }))).toBe(false)
+    expect(activationTreatsNoteAsFinished(record())).toBe(true)
+  })
+
+  it('keeps the main agent status through persistence, and drops only a malformed one', () => {
+    const hydrate = (sleeping: unknown) => {
+      const result = parseWorkspaceSession({
+        activeRepoId: null,
+        activeWorktreeId: null,
+        activeTabId: null,
+        tabsByWorktree: {},
+        terminalLayoutsByTabId: {},
+        sleepingAgentSessionsByPaneKey: { [PANE_KEY]: sleeping }
+      })
+      return result.ok ? result.value.sleepingAgentSessionsByPaneKey?.[PANE_KEY] : undefined
+    }
+    const sleeping = sleepingRecordFromEntry({
+      state: STATE,
+      entry: failedDone(),
+      worktreeId: 'wt-1',
+      tab: makeTab(),
+      capturedAt: 3_000,
+      origin: 'live'
+    })
+    expect(hydrate(sleeping)?.mainAgent).toEqual(FAILED_MAIN_AGENT)
+    const malformed = hydrate({ ...sleeping, mainAgent: { state: 'done', outcome: 'failure' } })
+    expect(malformed).toMatchObject({ paneKey: PANE_KEY, state: 'done', origin: 'live' })
+    expect(malformed?.mainAgent).toBeUndefined()
+  })
+
+  it('leaves the verdict behind when the user sleeps the workspace', () => {
+    expect(manualSleepCaptureEntry(failedDone(), 4_000).mainAgent).not.toHaveProperty('outcome')
+  })
+
+  // A failure keeps its completion clock, so only a verdict compare sees success -> failure.
+  it('re-retains a done whose verdict changed under an unchanged flag and clock', () => {
+    const failed = failedDone()
+    const withVerdict = (outcome: 'success' | 'failure'): AgentStatusEntry => ({
+      ...failed,
+      mainAgent: { state: 'done', outcome, stateStartedAt: 2_000 }
+    })
+    const facts = (existing: AgentStatusEntry, entry: AgentStatusEntry) =>
+      deriveAgentStatusLiveFacts({
+        state: STATE,
+        paneKey: PANE_KEY,
+        entry,
+        existing,
+        launchConfigSource: undefined,
+        retainsResumableRecoveryIdentity: false,
+        commandCodeNewTurn: false,
+        updatedAt: 2_000
+      })
+    expect(facts(withVerdict('success'), withVerdict('failure')).retentionRelevantChange).toBe(true)
+    expect(facts(withVerdict('failure'), withVerdict('failure')).retentionRelevantChange).toBe(
+      false
+    )
+    // A main agent failing while its subagents keep the row working is a verdict change too.
+    const held = (outcome: 'success' | 'failure'): AgentStatusEntry => ({
+      ...withVerdict(outcome),
+      state: 'working'
+    })
+    expect(facts(held('success'), held('failure')).retentionRelevantChange).toBe(true)
+  })
+
+  it('treats a verdict change as a different record even when interrupted did not move', () => {
+    const clean = record({ mainAgent: { ...FAILED_MAIN_AGENT, outcome: 'success' } })
+    const failed = record({ mainAgent: FAILED_MAIN_AGENT })
+    expect(sleepingRecordsEquivalentIgnoringCaptureTime(clean, failed)).toBe(false)
+    expect(recoveryRecordMatches(clean, failed)).toBe(false)
+    expect(sleepingRecordsEquivalentIgnoringCaptureTime(failed, { ...failed })).toBe(true)
+  })
+})
diff --git a/src/renderer/src/store/slices/agent-status-worktree-drop-actions.ts b/src/renderer/src/store/slices/agent-status-worktree-drop-actions.ts
index b7d88675f6ba..f8ac95b5dce0 100644
--- a/src/renderer/src/store/slices/agent-status-worktree-drop-actions.ts
+++ b/src/renderer/src/store/slices/agent-status-worktree-drop-actions.ts
@@ -9,6 +9,7 @@ import {
   shouldReplaceRetainedWithLive
 } from './agent-status-pane-key-tab-binding'
 import { removePaneKeys } from './agent-status-pane-keyed-records'
+import { agentTurnStoppedByUser } from '../../../../shared/agent-main-agent-verdict'
 
 export function createAgentStatusWorktreeDropActions(
   runtime: AgentStatusRuntime
@@ -63,7 +64,7 @@ export function createAgentStatusWorktreeDropActions(
               allowedPaneKeys.has(paneKey) &&
               entry.state === 'done' &&
               entry.agentType !== undefined &&
-              entry.interrupted !== true
+              !agentTurnStoppedByUser(entry)
             ) {
               retainedEvidence.set(
                 paneKey,
diff --git a/src/renderer/src/store/slices/browser-remote-tab-creation.test.ts b/src/renderer/src/store/slices/browser-remote-tab-creation.test.ts
index 96230bf88a4c..06fcaab8512c 100644
--- a/src/renderer/src/store/slices/browser-remote-tab-creation.test.ts
+++ b/src/renderer/src/store/slices/browser-remote-tab-creation.test.ts
@@ -12,8 +12,9 @@ const createWebRuntimeSessionBrowserTabMock = vi.hoisted(() => vi.fn())
 const runtimeEnvironmentCall = vi.fn()
 const runtimeEnvironmentTransportCall = vi.fn()
 
-vi.mock('@/runtime/web-runtime-session', () => ({
-  createWebRuntimeSessionBrowserTab: createWebRuntimeSessionBrowserTabMock
+vi.mock('@/store/slices/browser/paired-browser-tab-creator', () => ({
+  getRegisteredPairedBrowserTabCreator: () => null,
+  loadPairedBrowserTabCreator: async () => createWebRuntimeSessionBrowserTabMock
 }))
 
 const mockApi = createBrowserMockApi(runtimeEnvironmentTransportCall)
diff --git a/src/renderer/src/store/slices/browser-slice-test-harness.ts b/src/renderer/src/store/slices/browser-slice-test-harness.ts
index dd60b4cacdae..bad5a94139c1 100644
--- a/src/renderer/src/store/slices/browser-slice-test-harness.ts
+++ b/src/renderer/src/store/slices/browser-slice-test-harness.ts
@@ -49,11 +49,13 @@ export function createBrowserMockApi(runtimeEnvironmentTransportCall: Mock): Bro
 export function createTestStore() {
   return create<AppState>()(
     (...a) =>
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a partial store; browser actions touch only the fields seeded here.
       ({
         settings: { activeRuntimeEnvironmentId: null } as AppState['settings'],
         activeWorktreeId: 'wt-1',
         browserDefaultUrl: 'about:blank',
         unifiedTabsByWorktree: {},
+        groupsByWorktree: {},
         tabBarOrderByWorktree: {},
         tabsByWorktree: {},
         openFiles: [],
diff --git a/src/renderer/src/store/slices/browser-tab-creation-placement.test.ts b/src/renderer/src/store/slices/browser-tab-creation-placement.test.ts
new file mode 100644
index 000000000000..37e44fd9cc58
--- /dev/null
+++ b/src/renderer/src/store/slices/browser-tab-creation-placement.test.ts
@@ -0,0 +1,459 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type * as AgentStatusModule from '@/lib/agent-status'
+import type { Tab, TabGroup } from '../../../../shared/tab-types'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
+import {
+  createTestStore,
+  makeTabGroup,
+  makeUnifiedTab,
+  makeWorktree,
+  seedStore
+} from './store-test-helpers'
+import { createStoreCascadesMockApi } from './store-cascades-test-harness'
+
+vi.mock('sonner', () => ({
+  toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
+}))
+vi.mock('@/components/terminal-pane/pty-dispatcher', () => ({
+  restorePtyDataHandlersAfterFailedShutdown: vi.fn(),
+  unregisterPtyDataHandlers: vi.fn(() => [])
+}))
+vi.mock('@/lib/agent-status', async (importOriginal) => {
+  const actual = await importOriginal<typeof AgentStatusModule>()
+  return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) }
+})
+
+createStoreCascadesMockApi()
+
+const WT = 'repo1::/path/wt-placement'
+const G1 = 'group-1'
+const G2 = 'group-2'
+
+type Store = ReturnType<typeof createTestStore>
+
+function browserTab(id: string, groupId: string, extra: Partial<Tab> = {}): Tab {
+  return makeUnifiedTab({
+    id,
+    worktreeId: WT,
+    groupId,
+    contentType: 'browser',
+    entityId: `${id}-workspace`,
+    lastFocusedAt: 100,
+    ...extra
+  })
+}
+
+/** Unpinned A B C in G1 with B active; G2 holds X and is the focused group. */
+function seedSplit(store: Store, overrides: { tabs?: Tab[]; groups?: TabGroup[] } = {}): void {
+  seedStore(store, {
+    worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1' })] },
+    activeWorktreeId: WT,
+    unifiedTabsByWorktree: {
+      [WT]: overrides.tabs ?? [
+        browserTab('A', G1),
+        browserTab('B', G1),
+        browserTab('C', G1),
+        browserTab('X', G2)
+      ]
+    },
+    groupsByWorktree: {
+      [WT]: overrides.groups ?? [
+        makeTabGroup({
+          id: G1,
+          worktreeId: WT,
+          activeTabId: 'B',
+          tabOrder: ['A', 'B', 'C'],
+          recentTabIds: ['A', 'B']
+        }),
+        makeTabGroup({
+          id: G2,
+          worktreeId: WT,
+          activeTabId: 'X',
+          tabOrder: ['X'],
+          recentTabIds: ['X']
+        })
+      ]
+    },
+    activeGroupIdByWorktree: { [WT]: G2 },
+    layoutByWorktree: {
+      [WT]: {
+        type: 'split',
+        direction: 'horizontal',
+        first: { type: 'leaf', groupId: G1 },
+        second: { type: 'leaf', groupId: G2 }
+      }
+    }
+  })
+}
+
+function group(store: Store, groupId: string, worktreeId = WT): TabGroup | undefined {
+  return store.getState().groupsByWorktree[worktreeId]?.find((g) => g.id === groupId)
+}
+
+function createdUnifiedId(store: Store, workspaceId: string, worktreeId = WT): string {
+  const tab = store
+    .getState()
+    .unifiedTabsByWorktree[worktreeId]?.find((candidate) => candidate.entityId === workspaceId)
+  if (!tab) {
+    throw new Error(`no wrapper for ${workspaceId}`)
+  }
+  return tab.id
+}
+
+describe('browser tab creation placement', () => {
+  let store: Store
+
+  beforeEach(() => {
+    store = createTestStore()
+  })
+
+  it('appends Group New Browser Tab regardless of the active tab', async () => {
+    seedSplit(store)
+    await store.getState().openNewBrowserTabInActiveWorkspace(G1)
+    const n = store.getState().unifiedTabsByWorktree[WT]!.at(-1)!
+    expect(group(store, G1)?.tabOrder).toEqual(['A', 'B', 'C', n.id])
+
+    store.getState().activateTab('A')
+    await store.getState().openNewBrowserTabInActiveWorkspace(G1)
+    const m = store.getState().unifiedTabsByWorktree[WT]!.at(-1)!
+    expect(group(store, G1)?.tabOrder).toEqual(['A', 'B', 'C', n.id, m.id])
+  })
+
+  it('uses the invoking group workspace instead of the globally selected one', async () => {
+    seedSplit(store)
+    store.setState({ activeWorktreeId: 'repo1::/elsewhere' })
+    await store.getState().openNewBrowserTabInActiveWorkspace(G1)
+    expect(group(store, G1)?.tabOrder).toHaveLength(4)
+    expect(store.getState().unifiedTabsByWorktree['repo1::/elsewhere']).toBeUndefined()
+  })
+
+  it('places a duplicate directly after its source', () => {
+    seedSplit(store)
+    const workspace = store
+      .getState()
+      .createBrowserTab(WT, 'https://example.com', { afterTabId: 'B' })
+    const duplicate = createdUnifiedId(store, workspace.id)
+    expect(group(store, G1)?.tabOrder).toEqual(['A', 'B', duplicate, 'C'])
+    expect(
+      store
+        .getState()
+        .unifiedTabsByWorktree[WT]!.filter((tab) => tab.groupId === G1)
+        .map((tab) => [tab.id, tab.sortOrder])
+    ).toEqual([
+      ['A', 0],
+      ['B', 1],
+      ['C', 3],
+      [duplicate, 2]
+    ])
+  })
+
+  it('places a background link after its source without touching selection or MRU', () => {
+    seedSplit(store)
+    const before = store.getState()
+    const workspace = store
+      .getState()
+      .createBrowserTab(WT, 'https://example.com/link', { afterTabId: 'B', activate: false })
+    const link = createdUnifiedId(store, workspace.id)
+    const after = store.getState()
+
+    expect(group(store, G1)).toMatchObject({
+      tabOrder: ['A', 'B', link, 'C'],
+      activeTabId: 'B',
+      recentTabIds: ['A', 'B']
+    })
+    expect(after.activeGroupIdByWorktree[WT]).toBe(G2)
+    expect(after.activeWorktreeId).toBe(WT)
+    expect(after.activeTabType).toBe(before.activeTabType)
+    expect(after.activeBrowserTabId).toBe(before.activeBrowserTabId)
+    expect(after.unifiedTabsByWorktree[WT]!.find((tab) => tab.id === link)?.lastFocusedAt).toBe(
+      undefined
+    )
+    expect(after.unifiedTabsByWorktree[WT]!.find((tab) => tab.id === 'B')?.lastFocusedAt).toBe(100)
+  })
+
+  it('focuses the resolved group for a foreground source action in an unfocused split', () => {
+    seedSplit(store)
+    const workspace = store
+      .getState()
+      .createBrowserTab(WT, 'https://example.com', { afterTabId: 'B' })
+    const created = createdUnifiedId(store, workspace.id)
+    const state = store.getState()
+    expect(state.activeGroupIdByWorktree[WT]).toBe(G1)
+    expect(group(store, G1)).toMatchObject({ activeTabId: created })
+    expect(group(store, G1)?.recentTabIds).toEqual(['A', 'B', created])
+    expect(state.activeBrowserTabId).toBe(workspace.id)
+    expect(state.activeTabType).toBe('browser')
+  })
+
+  it('lets an explicit destination win over the anchor group', () => {
+    seedSplit(store)
+    const workspace = store
+      .getState()
+      .createBrowserTab(WT, 'https://example.com', { afterTabId: 'B', targetGroupId: G2 })
+    expect(group(store, G2)?.tabOrder).toEqual(['X', createdUnifiedId(store, workspace.id)])
+    expect(group(store, G1)?.tabOrder).toEqual(['A', 'B', 'C'])
+  })
+
+  it('treats a closed anchor as absent and appends in the active group', () => {
+    seedSplit(store)
+    const workspace = store
+      .getState()
+      .createBrowserTab(WT, 'https://example.com', { afterTabId: 'closed-tab' })
+    expect(group(store, G2)?.tabOrder).toEqual(['X', createdUnifiedId(store, workspace.id)])
+  })
+
+  it('falls back to the active group, not the first group, for an expired requested group', () => {
+    seedSplit(store)
+    const workspace = store
+      .getState()
+      .createBrowserTab(WT, 'https://example.com', { targetGroupId: 'deleted-group' })
+    expect(group(store, G2)?.tabOrder).toEqual(['X', createdUnifiedId(store, workspace.id)])
+  })
+
+  it('ignores an ambiguous anchor id', () => {
+    seedSplit(store, {
+      tabs: [browserTab('A', G1), browserTab('B', G1), browserTab('B', G2), browserTab('C', G1)]
+    })
+    const workspace = store
+      .getState()
+      .createBrowserTab(WT, 'https://example.com', { afterTabId: 'B' })
+    expect(group(store, G2)?.tabOrder).toEqual(['X', createdUnifiedId(store, workspace.id)])
+  })
+
+  it('ignores an anchor whose group order no longer contains it', () => {
+    seedSplit(store, {
+      groups: [
+        makeTabGroup({ id: G1, worktreeId: WT, activeTabId: 'A', tabOrder: ['A', 'C'] }),
+        makeTabGroup({ id: G2, worktreeId: WT, activeTabId: 'X', tabOrder: ['X'] })
+      ]
+    })
+    const workspace = store
+      .getState()
+      .createBrowserTab(WT, 'https://example.com', { afterTabId: 'B' })
+    expect(group(store, G2)?.tabOrder).toEqual(['X', createdUnifiedId(store, workspace.id)])
+  })
+
+  it('collapses duplicate order entries while inserting once', () => {
+    seedSplit(store, {
+      groups: [
+        makeTabGroup({ id: G1, worktreeId: WT, activeTabId: 'B', tabOrder: ['A', 'B', 'A', 'C'] }),
+        makeTabGroup({ id: G2, worktreeId: WT, activeTabId: 'X', tabOrder: ['X'] })
+      ]
+    })
+    const workspace = store
+      .getState()
+      .createBrowserTab(WT, 'https://example.com', { afterTabId: 'B' })
+    expect(group(store, G1)?.tabOrder).toEqual([
+      'A',
+      'B',
+      createdUnifiedId(store, workspace.id),
+      'C'
+    ])
+  })
+
+  it('keeps an unpinned tab from a pinned source after the pinned prefix', () => {
+    seedSplit(store, {
+      tabs: [
+        browserTab('P1', G1, { isPinned: true }),
+        browserTab('P2', G1, { isPinned: true }),
+        browserTab('C', G1),
+        browserTab('X', G2)
+      ],
+      groups: [
+        makeTabGroup({ id: G1, worktreeId: WT, activeTabId: 'P1', tabOrder: ['P1', 'P2', 'C'] }),
+        makeTabGroup({ id: G2, worktreeId: WT, activeTabId: 'X', tabOrder: ['X'] })
+      ]
+    })
+    const workspace = store
+      .getState()
+      .createBrowserTab(WT, 'https://example.com', { afterTabId: 'P1' })
+    expect(group(store, G1)?.tabOrder).toEqual([
+      'P1',
+      'P2',
+      createdUnifiedId(store, workspace.id),
+      'C'
+    ])
+  })
+
+  it('keeps a pinned candidate before the unpinned suffix and beside a pinned anchor', () => {
+    seedSplit(store, {
+      tabs: [
+        browserTab('P1', G1, { isPinned: true }),
+        browserTab('P2', G1, { isPinned: true }),
+        browserTab('C', G1),
+        browserTab('X', G2)
+      ],
+      groups: [
+        makeTabGroup({ id: G1, worktreeId: WT, activeTabId: 'P1', tabOrder: ['P1', 'P2', 'C'] }),
+        makeTabGroup({ id: G2, worktreeId: WT, activeTabId: 'X', tabOrder: ['X'] })
+      ]
+    })
+    const fromUnpinned = store
+      .getState()
+      .createUnifiedTab(WT, 'editor', { afterTabId: 'C', isPinned: true })
+    expect(group(store, G1)?.tabOrder).toEqual(['P1', 'P2', fromUnpinned.id, 'C'])
+    const fromPinned = store
+      .getState()
+      .createUnifiedTab(WT, 'editor', { afterTabId: 'P1', isPinned: true })
+    expect(group(store, G1)?.tabOrder).toEqual(['P1', fromPinned.id, 'P2', fromUnpinned.id, 'C'])
+    expect(fromPinned.sortOrder).toBe(1)
+  })
+
+  it('appends in the partition when preview replacement removes the anchor', () => {
+    seedSplit(store, {
+      tabs: [
+        browserTab('A', G1, { sortOrder: 0 }),
+        makeUnifiedTab({
+          id: 'P',
+          worktreeId: WT,
+          groupId: G1,
+          contentType: 'editor',
+          isPreview: true,
+          sortOrder: 1
+        }),
+        browserTab('C', G1, { sortOrder: 2 }),
+        browserTab('X', G2)
+      ],
+      groups: [
+        makeTabGroup({ id: G1, worktreeId: WT, activeTabId: 'P', tabOrder: ['A', 'P', 'C'] }),
+        makeTabGroup({ id: G2, worktreeId: WT, activeTabId: 'X', tabOrder: ['X'] })
+      ]
+    })
+    const created = store
+      .getState()
+      .createUnifiedTab(WT, 'editor', { afterTabId: 'P', isPreview: true, targetGroupId: G1 })
+    expect(group(store, G1)?.tabOrder).toEqual(['A', 'C', created.id])
+    expect(created.sortOrder).toBe(2)
+    const sortOrderById = Object.fromEntries(
+      store.getState().unifiedTabsByWorktree[WT]!.map((tab) => [tab.id, tab.sortOrder])
+    )
+    expect(sortOrderById).toMatchObject({ A: 0, C: 1, [created.id]: 2 })
+  })
+
+  it('leaves the wrapper host unset instead of stamping a substituted routing host', () => {
+    seedSplit(store)
+    // Why: no repo row and a focused runtime make the routing resolver substitute runtime:env-1.
+    store.setState({
+      activeWorktreeId: 'repo1::/elsewhere',
+      settings: { ...store.getState().settings!, activeRuntimeEnvironmentId: 'env-1' }
+    })
+    const workspace = store.getState().createBrowserTab(WT, 'https://example.com', {
+      activate: false,
+      browserRuntimeEnvironmentId: null
+    })
+    const wrapper = store
+      .getState()
+      .unifiedTabsByWorktree[WT]!.find((tab) => tab.entityId === workspace.id)
+    expect(wrapper).toBeDefined()
+    expect(wrapper?.executionHostId).toBeUndefined()
+  })
+
+  it('rejects an anchor owned by a foreign execution host', () => {
+    seedSplit(store, {
+      tabs: [browserTab('A', G1, { executionHostId: 'ssh:other' }), browserTab('X', G2)],
+      groups: [
+        makeTabGroup({ id: G1, worktreeId: WT, activeTabId: 'A', tabOrder: ['A'] }),
+        makeTabGroup({ id: G2, worktreeId: WT, activeTabId: 'X', tabOrder: ['X'] })
+      ]
+    })
+    const workspace = store.getState().createBrowserTab(WT, 'https://example.com', {
+      afterTabId: 'A',
+      executionHostId: 'runtime:env-1'
+    })
+    expect(group(store, G2)?.tabOrder).toEqual(['X', createdUnifiedId(store, workspace.id)])
+  })
+
+  it('accepts an SSH-backed anchor through the worktree runtime-owner alias', () => {
+    const sshHost: ExecutionHostId = 'ssh:target-1'
+    seedSplit(store, {
+      tabs: [browserTab('A', G1, { executionHostId: sshHost }), browserTab('C', G1)],
+      groups: [makeTabGroup({ id: G1, worktreeId: WT, activeTabId: 'A', tabOrder: ['A', 'C'] })]
+    })
+    store.setState({
+      worktreesByRepo: {
+        repo1: [
+          makeWorktree({
+            id: WT,
+            repoId: 'repo1',
+            hostId: sshHost,
+            runtimeOwnerEnvironmentId: 'env-1'
+          })
+        ]
+      }
+    })
+    const workspace = store.getState().createBrowserTab(WT, 'https://example.com', {
+      afterTabId: 'A',
+      executionHostId: 'runtime:env-1'
+    })
+    expect(group(store, G1)?.tabOrder).toEqual(['A', createdUnifiedId(store, workspace.id), 'C'])
+  })
+
+  it('places source actions in folder and floating workspaces', () => {
+    const folderWt = 'folder:folder-1'
+    const folder: FolderWorkspace = {
+      id: 'folder-1',
+      projectGroupId: 'pg',
+      name: 'Folder',
+      folderPath: '/tmp/folder',
+      executionHostId: 'local',
+      linkedTask: null,
+      comment: '',
+      isArchived: false,
+      isUnread: false,
+      isPinned: false,
+      sortOrder: 0,
+      lastActivityAt: 0,
+      createdAt: 0,
+      updatedAt: 0
+    }
+    for (const worktreeId of [folderWt, FLOATING_TERMINAL_WORKTREE_ID]) {
+      store.setState({
+        folderWorkspaces: [folder],
+        unifiedTabsByWorktree: {
+          ...store.getState().unifiedTabsByWorktree,
+          [worktreeId]: ['A', 'B'].map((id) =>
+            makeUnifiedTab({ id: `${worktreeId}-${id}`, worktreeId, groupId: `${worktreeId}-g` })
+          )
+        },
+        groupsByWorktree: {
+          ...store.getState().groupsByWorktree,
+          [worktreeId]: [
+            makeTabGroup({
+              id: `${worktreeId}-g`,
+              worktreeId,
+              activeTabId: `${worktreeId}-A`,
+              tabOrder: [`${worktreeId}-A`, `${worktreeId}-B`]
+            })
+          ]
+        }
+      })
+      const workspace = store.getState().createBrowserTab(worktreeId, 'https://example.com', {
+        afterTabId: `${worktreeId}-A`,
+        browserRuntimeEnvironmentId: null
+      })
+      expect(group(store, `${worktreeId}-g`, worktreeId)?.tabOrder).toEqual([
+        `${worktreeId}-A`,
+        createdUnifiedId(store, workspace.id, worktreeId),
+        `${worktreeId}-B`
+      ])
+    }
+  })
+
+  it('selects the first tab of an empty group structurally without recording a visit', () => {
+    seedSplit(store, {
+      groups: [
+        makeTabGroup({ id: G1, worktreeId: WT, activeTabId: null, tabOrder: [], recentTabIds: [] }),
+        makeTabGroup({ id: G2, worktreeId: WT, activeTabId: 'X', tabOrder: ['X'] })
+      ],
+      tabs: [browserTab('X', G2)]
+    })
+    const workspace = store
+      .getState()
+      .createBrowserTab(WT, 'https://example.com', { targetGroupId: G1, activate: false })
+    const created = createdUnifiedId(store, workspace.id)
+    expect(group(store, G1)).toMatchObject({ activeTabId: created, recentTabIds: [] })
+    expect(store.getState().activeGroupIdByWorktree[WT]).toBe(G2)
+  })
+})
diff --git a/src/renderer/src/store/slices/browser/browser-slice-contract.ts b/src/renderer/src/store/slices/browser/browser-slice-contract.ts
index 3f3aa6ead2bf..3cbeba14d989 100644
--- a/src/renderer/src/store/slices/browser/browser-slice-contract.ts
+++ b/src/renderer/src/store/slices/browser/browser-slice-contract.ts
@@ -39,6 +39,10 @@ export type CreateBrowserTabOptions = {
   sessionPartition?: string | null
   // Place the new tab in a specific group (e.g. "Open Preview to the Side"); defaults to the worktree's active group.
   targetGroupId?: string
+  /** Client-local unified tab id of the source; the new tab lands right after it when still live. */
+  afterTabId?: string
+  /** Verified execution host for the new wrapper; unset keeps createUnifiedTab's active-workspace fallback. */
+  executionHostId?: ExecutionHostId
   // Explicit "New Tab" focuses the address bar even with a real home URL; link-opened tabs leave it unset.
   focusAddressBar?: boolean
   browserRuntimeEnvironmentId?: string | null
diff --git a/src/renderer/src/store/slices/browser/browser-tab-actions.ts b/src/renderer/src/store/slices/browser/browser-tab-actions.ts
index 95ae0e7c7a77..2635cd326512 100644
--- a/src/renderer/src/store/slices/browser/browser-tab-actions.ts
+++ b/src/renderer/src/store/slices/browser/browser-tab-actions.ts
@@ -18,6 +18,11 @@ import {
 import { getBrowserSessionProfileHostId } from './browser-host-state'
 import { getRuntimeEnvironmentIdForWorktree } from '@/lib/worktree-runtime-owner'
 import { admitBrowserPageMount } from '@/components/browser-pane/host-guest/browser-page-mount-admission'
+import {
+  getRegisteredPairedBrowserTabCreator,
+  loadPairedBrowserTabCreator
+} from './paired-browser-tab-creator'
+import { findGroupAndWorktree } from '../tab-group-state'
 
 export function createBrowserTabActions(
   set: BrowserSliceSet,
@@ -151,19 +156,29 @@ export function createBrowserTabActions(
         (t) => t.contentType === 'browser' && t.entityId === workspaceId
       )
       if (!alreadyHasUnifiedTab) {
-        state.createUnifiedTab(worktreeId, 'browser', {
+        const shouldActivate = options?.activate ?? true
+        const created = state.createUnifiedTab(worktreeId, 'browser', {
           entityId: workspaceId,
           label: browserTab.title,
           targetGroupId: options?.targetGroupId,
-          activate: options?.activate ?? true
+          ...(options?.afterTabId ? { afterTabId: options.afterTabId } : {}),
+          // Why no routing-host default: a substituted host would disown the wrapper from its worktree.
+          ...(options?.executionHostId ? { executionHostId: options.executionHostId } : {}),
+          activate: shouldActivate
         })
+        // Why: unified creation already selected the tab and recorded the visit; only the group moves.
+        if (shouldActivate && created) {
+          get().focusGroup(worktreeId, created.groupId)
+        }
       }
       return browserTab
     },
 
     openNewBrowserTabInActiveWorkspace: async (groupId) => {
       const state = get()
-      const worktreeId = state.activeWorktreeId
+      // Why: the invoking group owns its workspace; global selection may already point elsewhere.
+      const worktreeId =
+        findGroupAndWorktree(state.groupsByWorktree, groupId)?.worktreeId ?? state.activeWorktreeId
       if (!worktreeId) {
         return
       }
@@ -179,9 +194,11 @@ export function createBrowserTabActions(
         if (!runtimeEnvironmentId) {
           throw new Error('The paired runtime browser provider is unavailable.')
         }
-        const { createWebRuntimeSessionBrowserTab } = await import('@/runtime/web-runtime-session')
+        // The registered path stages on the click; a cold runtime loads before staging.
+        const createPairedBrowserTab =
+          getRegisteredPairedBrowserTabCreator() ?? (await loadPairedBrowserTabCreator())
         try {
-          const created = await createWebRuntimeSessionBrowserTab({
+          const created = await createPairedBrowserTab({
             worktreeId,
             environmentId: runtimeEnvironmentId,
             url: defaultUrl,
@@ -230,9 +247,10 @@ export function createBrowserTabActions(
         if (!runtimeEnvironmentId) {
           return false
         }
-        const { createWebRuntimeSessionBrowserTab } = await import('@/runtime/web-runtime-session')
+        const createPairedBrowserTab =
+          getRegisteredPairedBrowserTabCreator() ?? (await loadPairedBrowserTabCreator())
         try {
-          return await createWebRuntimeSessionBrowserTab({
+          return await createPairedBrowserTab({
             worktreeId,
             environmentId: runtimeEnvironmentId,
             url,
diff --git a/src/renderer/src/store/slices/browser/paired-browser-tab-creator.ts b/src/renderer/src/store/slices/browser/paired-browser-tab-creator.ts
new file mode 100644
index 000000000000..bed32bd7f3bd
--- /dev/null
+++ b/src/renderer/src/store/slices/browser/paired-browser-tab-creator.ts
@@ -0,0 +1,21 @@
+import type { CreateWebRuntimeSessionBrowserTabArgs } from '@/runtime/web-runtime-browser-creation-context'
+
+type PairedBrowserTabCreator = (args: CreateWebRuntimeSessionBrowserTabArgs) => Promise<boolean>
+
+let registeredCreator: PairedBrowserTabCreator | null = null
+
+// Why: the runtime imports the store, so its loaded module registers a synchronous creation path.
+// Cold calls use the lazy import below and stage once it resolves.
+export function registerPairedBrowserTabCreator(create: PairedBrowserTabCreator): void {
+  registeredCreator = create
+}
+
+export function getRegisteredPairedBrowserTabCreator(): PairedBrowserTabCreator | null {
+  return registeredCreator
+}
+
+export async function loadPairedBrowserTabCreator(): Promise<PairedBrowserTabCreator> {
+  const { createWebRuntimeSessionBrowserTab } =
+    await import('@/runtime/web-runtime-browser-creation')
+  return createWebRuntimeSessionBrowserTab
+}
diff --git a/src/renderer/src/store/slices/cmd-j-create-actions.test.ts b/src/renderer/src/store/slices/cmd-j-create-actions.test.ts
index acd617a97594..15cb73f31816 100644
--- a/src/renderer/src/store/slices/cmd-j-create-actions.test.ts
+++ b/src/renderer/src/store/slices/cmd-j-create-actions.test.ts
@@ -12,10 +12,14 @@ const createWebRuntimeSessionBrowserTabMock = vi.hoisted(() => vi.fn())
 const createWebRuntimeSessionTerminalMock = vi.hoisted(() => vi.fn())
 
 vi.mock('@/runtime/web-runtime-session', () => ({
-  createWebRuntimeSessionBrowserTab: createWebRuntimeSessionBrowserTabMock,
   createWebRuntimeSessionTerminal: createWebRuntimeSessionTerminalMock
 }))
 
+vi.mock('@/store/slices/browser/paired-browser-tab-creator', () => ({
+  getRegisteredPairedBrowserTabCreator: () => null,
+  loadPairedBrowserTabCreator: async () => createWebRuntimeSessionBrowserTabMock
+}))
+
 vi.mock('@/lib/focus-terminal-tab-surface', () => ({
   focusTerminalTabSurface: vi.fn()
 }))
diff --git a/src/renderer/src/store/slices/github-pr-comments.test.ts b/src/renderer/src/store/slices/github-pr-comments.test.ts
index 8432f944fd41..b78fe1589f6a 100644
--- a/src/renderer/src/store/slices/github-pr-comments.test.ts
+++ b/src/renderer/src/store/slices/github-pr-comments.test.ts
@@ -234,62 +234,6 @@ describe('createGitHubSlice.fetchPRComments', () => {
       vi.useRealTimers()
     }
   })
-
-  it('preserves cached checks when the checks IPC fails', async () => {
-    const store = createTestStore()
-    const repoPath = '/repo'
-    const branch = 'feature/test'
-    const checksCacheKey = `${repoPath}::pr-checks::12`
-    const cachedChecks = [
-      { name: 'build', status: 'completed', conclusion: 'failure', url: null } as const
-    ]
-
-    store.setState({
-      checksCache: {
-        [checksCacheKey]: {
-          data: cachedChecks,
-          fetchedAt: 1,
-          headSha: 'abc123head'
-        }
-      }
-    } as unknown as Partial<AppState>)
-    mockApi.gh.prChecks.mockRejectedValueOnce(new Error('rate limited'))
-
-    await expect(
-      store.getState().fetchPRChecks(repoPath, 12, branch, 'abc123head', null, { force: true })
-    ).resolves.toEqual(cachedChecks)
-
-    expect(store.getState().checksCache[checksCacheKey]?.data).toEqual(cachedChecks)
-    expect(store.getState().checksCache[checksCacheKey]?.fetchedAt).toBe(1)
-  })
-
-  it('does not return cached checks for a different requested head SHA after IPC failure', async () => {
-    const store = createTestStore()
-    const repoPath = '/repo'
-    const branch = 'feature/test'
-    const checksCacheKey = `${repoPath}::pr-checks::12`
-    const oldHeadChecks = [
-      { name: 'build', status: 'completed', conclusion: 'success', url: null } as const
-    ]
-
-    store.setState({
-      checksCache: {
-        [checksCacheKey]: {
-          data: oldHeadChecks,
-          fetchedAt: 1,
-          headSha: 'old-head'
-        }
-      }
-    } as unknown as Partial<AppState>)
-    mockApi.gh.prChecks.mockRejectedValueOnce(new Error('rate limited'))
-
-    await expect(
-      store.getState().fetchPRChecks(repoPath, 12, branch, 'new-head', null, { force: true })
-    ).resolves.toEqual([])
-
-    expect(store.getState().checksCache[checksCacheKey]?.data).toEqual(oldHeadChecks)
-    expect(store.getState().checksCache[checksCacheKey]?.headSha).toBe('old-head')
-  })
 })
 
 describe('createGitHubSlice PR comment mutations', () => {
diff --git a/src/renderer/src/store/slices/github-pr-request-lifetime.test.ts b/src/renderer/src/store/slices/github-pr-request-lifetime.test.ts
new file mode 100644
index 000000000000..ddd964712315
--- /dev/null
+++ b/src/renderer/src/store/slices/github-pr-request-lifetime.test.ts
@@ -0,0 +1,154 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { PRRefreshOutcome } from '../../../../shared/github/pull-request-refresh-types'
+import { inflightPRRequests, prRequestGenerations } from '../github/request-coordination'
+import {
+  createTestStore,
+  makePR,
+  mockApi,
+  resetRemoteRuntimeMocks,
+  runtimeEnvironmentCall
+} from './github-slice-test-harness'
+
+beforeEach(() => {
+  vi.useFakeTimers()
+  vi.setSystemTime(1000)
+  vi.clearAllMocks()
+  resetRemoteRuntimeMocks()
+  mockApi.gh.refreshPRNow.mockReset()
+  vi.spyOn(console, 'error').mockImplementation(() => undefined)
+})
+
+afterEach(() => {
+  vi.clearAllTimers()
+  vi.useRealTimers()
+  vi.restoreAllMocks()
+})
+
+function found(number: number): PRRefreshOutcome {
+  return { kind: 'found', pr: makePR({ number }), fetchedAt: Date.now() }
+}
+
+const cases = [
+  { route: 'local', replacement: 'force', outcome: 'found' },
+  { route: 'local', replacement: 'hint', outcome: 'found' },
+  { route: 'local', replacement: 'force', outcome: 'rejected' },
+  { route: 'runtime', replacement: 'force', outcome: 'found' },
+  { route: 'runtime', replacement: 'force', outcome: 'upstream-error' },
+  { route: 'runtime', replacement: 'hint', outcome: 'no-pr' }
+] as const
+
+describe('pull-request lookup ownership after newer settlement', () => {
+  it.each(cases)(
+    'preserves $route lookup after late $outcome with $replacement replacement',
+    async ({ route, replacement, outcome }) => {
+      const store = createTestStore()
+      const pending: ReturnType<typeof Promise.withResolvers<PRRefreshOutcome>>[] = []
+      const startRequest = () => {
+        const request = Promise.withResolvers<PRRefreshOutcome>()
+        pending.push(request)
+        return request.promise
+      }
+      if (route === 'runtime') {
+        store.setState({
+          repos: [
+            {
+              id: 'runtime-repo',
+              path: '/runtime/repo',
+              displayName: 'Runtime repo',
+              badgeColor: 'blue',
+              addedAt: 1,
+              executionHostId: 'runtime:env-1'
+            }
+          ]
+        })
+        runtimeEnvironmentCall.mockImplementation(async () => ({
+          id: 'rpc',
+          ok: true,
+          result: await startRequest()
+        }))
+      } else {
+        mockApi.gh.refreshPRNow.mockImplementation(startRequest)
+      }
+      const path = route === 'runtime' ? '/runtime/repo' : '/local/repo'
+      const branch = `lifetime-${route}-${replacement}-${outcome}`
+      const options = replacement === 'hint' ? { force: true, fallbackPRNumber: 10 } : undefined
+      const first = store.getState().fetchPRForBranch(path, branch, options)
+      await vi.waitFor(() => expect(pending).toHaveLength(1))
+      vi.setSystemTime(2000)
+      const secondOptions =
+        replacement === 'hint' ? { force: true, fallbackPRNumber: 20 } : { force: true }
+      const second = store.getState().fetchPRForBranch(path, branch, secondOptions)
+      await vi.waitFor(() => expect(pending).toHaveLength(2))
+      pending[1].resolve(found(20))
+      await second
+      expect(prRequestGenerations.size).toBe(0)
+
+      vi.setSystemTime(3000)
+      const third = store.getState().fetchPRForBranch(path, branch, secondOptions)
+      await vi.waitFor(() => expect(pending).toHaveLength(3))
+      const activeBefore = [...inflightPRRequests.values()][0]
+      const key = [...inflightPRRequests.keys()][0]
+      expect(activeBefore).toBeDefined()
+      if (outcome === 'rejected') {
+        pending[0].reject(new Error('old lookup failed'))
+      } else if (outcome === 'upstream-error') {
+        pending[0].resolve({
+          kind: 'upstream-error',
+          message: 'old error',
+          errorType: 'unknown',
+          fetchedAt: 3000
+        })
+      } else if (outcome === 'no-pr') {
+        pending[0].resolve({ kind: 'no-pr', fetchedAt: 3000 })
+      } else {
+        pending[0].resolve(found(10))
+      }
+      await first
+      const activeAfter = inflightPRRequests.get(key)
+      const cachedAfterStale = store.getState().prCache[key]?.data?.number
+      const refreshStateAfter = store.getState().prRefreshStates[key]
+      vi.setSystemTime(4000)
+      const follower = store.getState().fetchPRForBranch(path, branch, secondOptions)
+      await vi.waitFor(() => expect(pending.length).toBeGreaterThanOrEqual(3))
+      await Promise.resolve()
+      const requestCount = pending.length
+      pending[2].resolve(found(30))
+      pending[3]?.resolve(found(40))
+      const results = await Promise.all([third, follower])
+
+      expect(activeAfter).toBe(activeBefore)
+      // The stale lookup asked for PR 10; only the live lookup may publish.
+      expect(cachedAfterStale).toBe(20)
+      expect(refreshStateAfter).toBeUndefined()
+      expect(requestCount).toBe(3)
+      expect(results.map((result) => result?.number)).toEqual([30, 30])
+      expect(store.getState().prCache[key]?.data?.number).toBe(30)
+      expect(inflightPRRequests.size).toBe(0)
+      expect(prRequestGenerations.size).toBe(0)
+      if (route === 'runtime') {
+        expect(mockApi.gh.refreshPRNow).not.toHaveBeenCalled()
+      } else {
+        expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
+      }
+    }
+  )
+
+  it('dedupes each branch independently and removes settled generation entries', async () => {
+    const store = createTestStore()
+    const pending = Promise.withResolvers<PRRefreshOutcome>()
+    mockApi.gh.refreshPRNow.mockReturnValue(pending.promise)
+    const calls = ['one', 'two'].flatMap((branch) =>
+      Array.from({ length: 10 }, () =>
+        store.getState().fetchPRForBranch('/repo', branch, { force: true })
+      )
+    )
+    expect(mockApi.gh.refreshPRNow).toHaveBeenCalledTimes(2)
+    expect(prRequestGenerations.size).toBe(2)
+
+    pending.resolve(found(12))
+    await Promise.all(calls)
+
+    expect(inflightPRRequests.size).toBe(0)
+    expect(prRequestGenerations.size).toBe(0)
+  })
+})
diff --git a/src/renderer/src/store/slices/github-project-request-coordination.test.ts b/src/renderer/src/store/slices/github-project-request-coordination.test.ts
index 96e4632e9093..40a64f77ce75 100644
--- a/src/renderer/src/store/slices/github-project-request-coordination.test.ts
+++ b/src/renderer/src/store/slices/github-project-request-coordination.test.ts
@@ -73,7 +73,7 @@ describe('createGitHubSlice.fetchProjectViewTable coordination', () => {
     expect(mockApi.gh.getProjectViewTable).toHaveBeenCalledTimes(1)
   })
 
-  it('lets each forced waiter start after a weaker request settles', async () => {
+  it('shares one fresh request across twenty forced waiters after a weaker request', async () => {
     const store = createTestStore()
     const weak = Promise.withResolvers<GetProjectViewTableResult>()
     mockApi.gh.getProjectViewTable
@@ -81,12 +81,16 @@ describe('createGitHubSlice.fetchProjectViewTable coordination', () => {
       .mockResolvedValue({ ok: true, data: makeTable('forced') })
 
     const first = store.getState().fetchProjectViewTable(request)
-    const forcedOne = store.getState().fetchProjectViewTable(request, { force: true })
-    const forcedTwo = store.getState().fetchProjectViewTable(request, { force: true })
+    const forced = Array.from({ length: 20 }, () =>
+      store.getState().fetchProjectViewTable(request, { force: true })
+    )
     weak.resolve({ ok: true, data: makeTable('weak') })
 
-    await expect(Promise.all([first, forcedOne, forcedTwo])).resolves.toHaveLength(3)
-    expect(mockApi.gh.getProjectViewTable).toHaveBeenCalledTimes(3)
+    await expect(first).resolves.toEqual({ ok: true, data: makeTable('weak') })
+    await expect(Promise.all(forced)).resolves.toEqual(
+      Array.from({ length: 20 }, () => ({ ok: true, data: makeTable('forced') }))
+    )
+    expect(mockApi.gh.getProjectViewTable).toHaveBeenCalledTimes(2)
   })
 
   it('stamps a classified failure onto stale data only when the view key is known', async () => {
diff --git a/src/renderer/src/store/slices/github-work-items-query-bounds.test.ts b/src/renderer/src/store/slices/github-work-items-query-bounds.test.ts
deleted file mode 100644
index 40b89fdd4d5b..000000000000
--- a/src/renderer/src/store/slices/github-work-items-query-bounds.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import {
-  GITHUB_WORK_ITEMS_QUERY_MAX_BYTES,
-  isGitHubWorkItemsQueryTooLarge
-} from './github-work-items-query-bounds'
-
-describe('GitHub work item query bounds', () => {
-  it('allows normal GitHub search syntax', () => {
-    expect(isGitHubWorkItemsQueryTooLarge('is:pr is:open label:bug')).toBe(false)
-  })
-
-  it('rejects oversized pasted work item queries', () => {
-    expect(isGitHubWorkItemsQueryTooLarge('x'.repeat(GITHUB_WORK_ITEMS_QUERY_MAX_BYTES))).toBe(
-      false
-    )
-    expect(isGitHubWorkItemsQueryTooLarge('x'.repeat(GITHUB_WORK_ITEMS_QUERY_MAX_BYTES + 1))).toBe(
-      true
-    )
-  })
-
-  it('measures UTF-8 bytes for non-ASCII query text', () => {
-    expect(isGitHubWorkItemsQueryTooLarge(String.fromCodePoint(0x1f600).repeat(3_000))).toBe(true)
-  })
-})
diff --git a/src/renderer/src/store/slices/hosted-review-request-lifetime.test.ts b/src/renderer/src/store/slices/hosted-review-request-lifetime.test.ts
new file mode 100644
index 000000000000..747e2fefd03e
--- /dev/null
+++ b/src/renderer/src/store/slices/hosted-review-request-lifetime.test.ts
@@ -0,0 +1,169 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { create } from 'zustand'
+import type { HostedReviewInfo } from '../../../../shared/hosted-review'
+import type { AppState } from '../types'
+import { createHostedReviewSlice } from './hosted-review'
+import {
+  _clearHostedReviewRequestGenerationsForTest,
+  hostedReviewRequestGenerations,
+  inflightHostedReviewRequests
+} from './hosted-review-request-state'
+
+const runtimeRpc = vi.hoisted(() => ({ callRuntimeRpc: vi.fn() }))
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  callRuntimeRpc: runtimeRpc.callRuntimeRpc,
+  getActiveRuntimeTarget: (settings: AppState['settings']) => {
+    const environmentId = settings?.activeRuntimeEnvironmentId
+    return environmentId ? { kind: 'environment', environmentId } : { kind: 'local' }
+  }
+}))
+
+const forBranch = vi.fn()
+type TestState = Pick<
+  AppState,
+  | 'settings'
+  | 'repos'
+  | 'prCache'
+  | 'hostedReviewCache'
+  | 'fetchHostedReviewForBranch'
+  | 'getHostedReviewCreationEligibility'
+  | 'createHostedReview'
+  | 'createStackedHostedReview'
+>
+
+function makeStore(runtime = false) {
+  return create<TestState>()((...args) => ({
+    settings: null,
+    repos: [
+      {
+        id: 'repo',
+        path: '/repo',
+        displayName: 'Repo',
+        badgeColor: 'blue',
+        addedAt: 1,
+        ...(runtime ? { executionHostId: 'runtime:env-1' } : {})
+      }
+    ],
+    prCache: {},
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This harness provides every state field read by the hosted-review slice.
+    ...createHostedReviewSlice(...(args as Parameters<typeof createHostedReviewSlice>))
+  }))
+}
+
+function review(number: number): HostedReviewInfo {
+  return {
+    provider: 'gitlab',
+    number,
+    title: `Review ${number}`,
+    state: 'open',
+    url: `https://gitlab.com/group/project/-/merge_requests/${number}`,
+    status: 'success',
+    updatedAt: '2026-09-25T00:00:00Z',
+    mergeable: 'MERGEABLE'
+  }
+}
+
+beforeEach(() => {
+  _clearHostedReviewRequestGenerationsForTest()
+  vi.useFakeTimers()
+  vi.setSystemTime(1000)
+  forBranch.mockReset()
+  runtimeRpc.callRuntimeRpc.mockReset()
+  vi.stubGlobal('window', { api: { hostedReview: { forBranch } } })
+  vi.spyOn(console, 'error').mockImplementation(() => undefined)
+})
+
+afterEach(() => {
+  _clearHostedReviewRequestGenerationsForTest()
+  vi.useRealTimers()
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+})
+
+const cases = [
+  { route: 'local', replacement: 'force', outcome: 'found' },
+  { route: 'local', replacement: 'force', outcome: 'rejected' },
+  { route: 'local', replacement: 'hint', outcome: 'found' },
+  { route: 'runtime', replacement: 'force', outcome: 'found' },
+  { route: 'runtime', replacement: 'force', outcome: 'missing' },
+  { route: 'runtime', replacement: 'hint', outcome: 'rejected' }
+] as const
+
+describe('hosted review lookup ownership after newer settlement', () => {
+  it.each(cases)(
+    'preserves $route lookup after late $outcome with $replacement replacement',
+    async ({ route, replacement, outcome }) => {
+      const store = makeStore(route === 'runtime')
+      const pending: ReturnType<typeof Promise.withResolvers<HostedReviewInfo | null>>[] = []
+      const startRequest = () => {
+        const request = Promise.withResolvers<HostedReviewInfo | null>()
+        pending.push(request)
+        return request.promise
+      }
+      const dispatch = route === 'runtime' ? runtimeRpc.callRuntimeRpc : forBranch
+      dispatch.mockImplementation(startRequest)
+      const branch = `${route}-${replacement}-${outcome}`
+      const firstOptions = replacement === 'hint' ? { force: true, linkedGitLabMR: 10 } : {}
+      const first = store.getState().fetchHostedReviewForBranch('/repo', branch, firstOptions)
+      vi.setSystemTime(2000)
+      const options = replacement === 'hint' ? { force: true, linkedGitLabMR: 20 } : { force: true }
+      const second = store.getState().fetchHostedReviewForBranch('/repo', branch, options)
+      expect(pending).toHaveLength(2)
+      pending[1].resolve(review(20))
+      await second
+      expect(hostedReviewRequestGenerations.size).toBe(0)
+      vi.setSystemTime(3000)
+      const third = store.getState().fetchHostedReviewForBranch('/repo', branch, options)
+      expect(pending).toHaveLength(3)
+      const entry = [...inflightHostedReviewRequests.entries()].at(-1)
+      expect(entry).toBeDefined()
+      if (!entry) {
+        throw new Error('Expected a pending lookup')
+      }
+      const [key, owner] = entry
+      const cacheKey = [...hostedReviewRequestGenerations.keys()][0]
+      const generationBefore = hostedReviewRequestGenerations.get(cacheKey)
+      if (outcome === 'rejected') {
+        pending[0].reject(new Error('Old lookup failed'))
+      } else {
+        pending[0].resolve(outcome === 'missing' ? null : review(10))
+      }
+      await first
+      const currentOwner = inflightHostedReviewRequests.get(key)
+      const generationAfter = hostedReviewRequestGenerations.get(cacheKey)
+      const cachedBefore = store.getState().hostedReviewCache[cacheKey].data
+      const follower = store.getState().fetchHostedReviewForBranch('/repo', branch, options)
+      const requestCount = pending.length
+      pending[2].resolve(review(30))
+      pending[3]?.resolve(review(40))
+      const results = await Promise.all([third, follower])
+
+      expect(currentOwner).toBe(owner)
+      expect(generationAfter).toBe(generationBefore)
+      expect(cachedBefore?.number).toBe(20)
+      expect(requestCount).toBe(3)
+      expect(results.map((result) => result?.number)).toEqual([30, 30])
+      expect(store.getState().hostedReviewCache[cacheKey].data?.number).toBe(30)
+      expect(inflightHostedReviewRequests.size).toBe(0)
+      expect(hostedReviewRequestGenerations.size).toBe(0)
+      expect(route === 'runtime' ? forBranch : runtimeRpc.callRuntimeRpc).not.toHaveBeenCalled()
+    }
+  )
+
+  it('dedupes each branch independently and removes settled generation entries', async () => {
+    const store = makeStore()
+    const pending = Promise.withResolvers<HostedReviewInfo | null>()
+    forBranch.mockReturnValue(pending.promise)
+    const callers = ['one', 'two'].flatMap((branch) =>
+      Array.from({ length: 10 }, () =>
+        store.getState().fetchHostedReviewForBranch('/repo', branch, { force: true })
+      )
+    )
+    expect(forBranch).toHaveBeenCalledTimes(2)
+    expect(hostedReviewRequestGenerations.size).toBe(2)
+    pending.resolve(review(20))
+    await Promise.all(callers)
+    expect(inflightHostedReviewRequests.size).toBe(0)
+    expect(hostedReviewRequestGenerations.size).toBe(0)
+  })
+})
diff --git a/src/renderer/src/store/slices/hosted-review.ts b/src/renderer/src/store/slices/hosted-review.ts
index cad350d986ba..af4dff3e862b 100644
--- a/src/renderer/src/store/slices/hosted-review.ts
+++ b/src/renderer/src/store/slices/hosted-review.ts
@@ -8,6 +8,7 @@ import type {
 } from '../../../../shared/hosted-review'
 import { callRuntimeRpc, getActiveRuntimeTarget } from '@/runtime/runtime-rpc-client'
 import type { AppState } from '../types'
+import { nextLookupGeneration } from '../lookup-generation-sequence'
 import {
   getHostedReviewCacheKey,
   linkedReviewHintKey,
@@ -186,7 +187,7 @@ export const createHostedReviewSlice: StateCreator<AppState, [], [], HostedRevie
 
     const inflightRequest = inflightHostedReviewRequests.get(requestKey)
     const startRequest = (): Promise<HostedReviewInfo | null> => {
-      const generation = (requestGenerations.get(cacheKey) ?? 0) + 1
+      const generation = nextLookupGeneration()
       const requestStartedAt = Date.now()
       const requestStartedEntry = get().hostedReviewCache[cacheKey]
       requestGenerations.set(cacheKey, generation)
diff --git a/src/renderer/src/store/slices/linear-invalidation.test.ts b/src/renderer/src/store/slices/linear-invalidation.test.ts
index febf6bc222fa..59c0bd666c64 100644
--- a/src/renderer/src/store/slices/linear-invalidation.test.ts
+++ b/src/renderer/src/store/slices/linear-invalidation.test.ts
@@ -136,35 +136,6 @@ describe('createLinearSlice invalidation', () => {
     ).toMatchObject({ items: [{ id: 'LIST' }] })
   })
 
-  it('caches teams by workspace and dedupes fresh reads', async () => {
-    const store = createTestStore()
-    linearListTeams.mockResolvedValueOnce([team('team-1')])
-
-    await expect(store.getState().listLinearTeams('workspace-1')).resolves.toMatchObject([
-      { id: 'team-1' }
-    ])
-    await expect(store.getState().listLinearTeams('workspace-1')).resolves.toMatchObject([
-      { id: 'team-1' }
-    ])
-
-    expect(linearListTeams).toHaveBeenCalledTimes(1)
-    expect(store.getState().getCachedLinearTeams('workspace-1')).toMatchObject([{ id: 'team-1' }])
-  })
-
-  it('patches issue-cache entries keyed by workspace-qualified ids', () => {
-    const store = createTestStore()
-    store.setState({
-      linearIssueCache: {
-        'workspace-1::issue-id': { data: issue('issue-id'), fetchedAt: Date.now() }
-      }
-    })
-
-    store.getState().patchLinearIssue('issue-id', { title: 'Updated' })
-
-    expect(store.getState().linearIssueCache['workspace-1::issue-id'].data?.title).toBe('Updated')
-    expect(store.getState().linearIssueCache['workspace-1::issue-id'].fetchedAt).toBe(0)
-  })
-
   it('refreshing a linked Linear issue invalidates stale issue collection caches', async () => {
     const store = createTestStore()
     linearGetIssue.mockResolvedValueOnce(issue('issue-id'))
diff --git a/src/renderer/src/store/slices/repo-identity-reconcile.test.ts b/src/renderer/src/store/slices/repo-identity-reconcile.test.ts
index 43afafe717fc..703ff4833060 100644
--- a/src/renderer/src/store/slices/repo-identity-reconcile.test.ts
+++ b/src/renderer/src/store/slices/repo-identity-reconcile.test.ts
@@ -1,5 +1,4 @@
 import { describe, expect, it } from 'vitest'
-import fs from 'node:fs'
 import type { Repo } from '../../../../shared/repo-types'
 import { reconcileFetchedRepos, reuseEqualRecordMap } from './repo-identity-reconcile'
 
@@ -119,8 +118,6 @@ describe('reconcileFetchedRepos', () => {
 
     expect(result).toBe(previous)
     expect(result.every((repo, index) => repo === previous[index])).toBe(true)
-    const source = fs.readFileSync(new URL('./repo-identity-reconcile.ts', import.meta.url), 'utf8')
-    expect(source).not.toMatch(/previous\.find|next\.find|findIndex/)
   })
 })
 
diff --git a/src/renderer/src/store/slices/repos-catalog-notifications.test.ts b/src/renderer/src/store/slices/repos-catalog-notifications.test.ts
new file mode 100644
index 000000000000..88fbd339ec3e
--- /dev/null
+++ b/src/renderer/src/store/slices/repos-catalog-notifications.test.ts
@@ -0,0 +1,229 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
+import type { ProjectGroup } from '../../../../shared/project-group-types'
+import { createTestStore } from './store-test-helpers'
+
+const group: ProjectGroup = {
+  id: 'group-1',
+  name: 'Group',
+  parentPath: '/parent',
+  parentGroupId: null,
+  createdFrom: 'manual',
+  tabOrder: 0,
+  isCollapsed: false,
+  color: null,
+  createdAt: 1,
+  updatedAt: 3
+}
+const folder: FolderWorkspace = {
+  id: 'folder-1',
+  projectGroupId: group.id,
+  name: 'Folder',
+  folderPath: '/parent/folder',
+  linkedTask: null,
+  comment: '',
+  isArchived: false,
+  isUnread: false,
+  isPinned: false,
+  sortOrder: 0,
+  lastActivityAt: 1,
+  createdAt: 1,
+  updatedAt: 3
+}
+const groupsList = vi.fn<() => Promise<ProjectGroup[]>>()
+const foldersList = vi.fn<() => Promise<FolderWorkspace[]>>()
+const folderUpdate = vi.fn<Window['api']['folderWorkspaces']['update']>()
+type TestStore = ReturnType<typeof createTestStore>
+type CatalogCase = {
+  label: string
+  catalog: 'projectGroups' | 'folderWorkspaces'
+  refresh: (store: TestStore) => Promise<void>
+}
+const cases: CatalogCase[] = [
+  {
+    label: 'selected groups',
+    catalog: 'projectGroups',
+    refresh: (s) => s.getState().fetchProjectGroups()
+  },
+  {
+    label: 'all-host local groups',
+    catalog: 'projectGroups',
+    refresh: (s) => s.getState().fetchProjectGroupsForAllHosts({ remoteHosts: 'skip' })
+  },
+  {
+    label: 'selected folders',
+    catalog: 'folderWorkspaces',
+    refresh: (s) => s.getState().fetchFolderWorkspaces()
+  },
+  {
+    label: 'all-host local folders',
+    catalog: 'folderWorkspaces',
+    refresh: (s) => s.getState().fetchFolderWorkspacesForAllHosts({ remoteHosts: 'skip' })
+  }
+]
+
+beforeEach(() => {
+  groupsList.mockReset().mockImplementation(async () => structuredClone([group]))
+  foldersList.mockReset().mockImplementation(async () => structuredClone([folder]))
+  folderUpdate.mockReset()
+  vi.stubGlobal('window', {
+    api: {
+      projectGroups: { list: groupsList },
+      folderWorkspaces: { list: foldersList, update: folderUpdate },
+      runtimeEnvironments: { list: async () => [] }
+    },
+    dispatchEvent: vi.fn()
+  })
+  vi.spyOn(console, 'error').mockImplementation(() => {})
+})
+afterEach(() => {
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+})
+
+function seed(): TestStore {
+  const store = createTestStore()
+  store.setState({
+    projectGroups: [{ ...group, executionHostId: 'local' }],
+    folderWorkspaces: [{ ...folder, executionHostId: 'local' }],
+    folderWorkspacePathStatuses: {
+      cached: {
+        status: { path: folder.folderPath, exists: true },
+        checkedAt: 1,
+        requestSnapshot: 'snapshot'
+      }
+    }
+  })
+  return store
+}
+
+it.each(cases)('does not notify for ten equal $label refreshes', async ({ refresh, catalog }) => {
+  const store = seed()
+  const initial = store.getState()
+  const changed = vi.fn()
+  const unsubscribe = store.subscribe(changed)
+  for (let index = 0; index < 10; index += 1) {
+    await refresh(store)
+  }
+  unsubscribe()
+  expect(changed).not.toHaveBeenCalled()
+  expect(store.getState()).toBe(initial)
+  expect(store.getState()[catalog]).toBe(initial[catalog])
+  expect(store.getState().folderWorkspacePathStatuses).toBe(initial.folderWorkspacePathStatuses)
+})
+
+it.each(cases)(
+  'publishes changed $label and invalidates path statuses',
+  async ({ refresh, catalog }) => {
+    const store = seed()
+    groupsList.mockResolvedValue([{ ...group, name: 'Changed group' }])
+    foldersList.mockResolvedValue([{ ...folder, name: 'Changed folder' }])
+    const changed = vi.fn()
+    const unsubscribe = store.subscribe(changed)
+    await refresh(store)
+    unsubscribe()
+    expect(changed).toHaveBeenCalledOnce()
+    expect(store.getState()[catalog][0]?.name).toMatch(/^Changed /)
+    expect(store.getState().folderWorkspacePathStatuses).toEqual({})
+  }
+)
+
+it.each(cases)('retains state after a failed $label read', async ({ refresh }) => {
+  const store = seed()
+  const initial = store.getState()
+  groupsList.mockRejectedValue(new Error('offline'))
+  foldersList.mockRejectedValue(new Error('offline'))
+  const changed = vi.fn()
+  const unsubscribe = store.subscribe(changed)
+  await refresh(store)
+  unsubscribe()
+  expect(store.getState()).toBe(initial)
+  expect(changed).not.toHaveBeenCalled()
+})
+
+it.each(cases)(
+  'fences an older $label response after a newer no-op response',
+  async ({ refresh, catalog }) => {
+    const store = seed()
+    const initial = store.getState()
+    const olderGroups = Promise.withResolvers<ProjectGroup[]>()
+    const olderFolders = Promise.withResolvers<FolderWorkspace[]>()
+    if (catalog === 'projectGroups') {
+      groupsList.mockReturnValueOnce(olderGroups.promise)
+    } else {
+      foldersList.mockReturnValueOnce(olderFolders.promise)
+    }
+    const older = refresh(store)
+    const changed = vi.fn()
+    const unsubscribe = store.subscribe(changed)
+    await refresh(store)
+    olderGroups.resolve([{ ...group, name: 'Obsolete group' }])
+    olderFolders.resolve([{ ...folder, name: 'Obsolete folder' }])
+    await older
+    unsubscribe()
+    expect(store.getState()).toBe(initial)
+    expect(changed).not.toHaveBeenCalled()
+  }
+)
+
+it.each(cases.filter((entry) => entry.catalog === 'folderWorkspaces'))(
+  'keeps update revision fencing after an equal $label response',
+  async ({ refresh }) => {
+    const store = seed()
+    const pending = Promise.withResolvers<FolderWorkspace>()
+    folderUpdate.mockReturnValueOnce(pending.promise)
+    const update = store.getState().updateFolderWorkspace(folder.id, { isUnread: true })
+    const initial = store.getState()
+    await refresh(store)
+    expect(store.getState()).toBe(initial)
+    pending.resolve({ ...folder, isUnread: true, updatedAt: 2 })
+    await update
+    expect(store.getState().folderWorkspaces[0]?.isUnread).toBe(false)
+    expect(store.getState().folderWorkspaces[0]?.updatedAt).toBe(3)
+  }
+)
+
+it('accepts a newer update after an equal catalog response', async () => {
+  const store = seed()
+  const pending = Promise.withResolvers<FolderWorkspace>()
+  folderUpdate.mockReturnValueOnce(pending.promise)
+  const update = store.getState().updateFolderWorkspace(folder.id, { isUnread: true })
+  await store.getState().fetchFolderWorkspaces()
+  pending.resolve({ ...folder, isUnread: true, updatedAt: 4 })
+  await update
+  expect(store.getState().folderWorkspaces[0]?.isUnread).toBe(true)
+  expect(store.getState().folderWorkspaces[0]?.updatedAt).toBe(4)
+})
+
+it('still clears restored folder owners after a successful all-host refresh', async () => {
+  const store = seed()
+  store.setState({
+    restoredRuntimeHostIdByWorkspaceSessionKey: {
+      'folder:folder-1': 'runtime:retired',
+      unrelated: 'runtime:kept'
+    }
+  })
+  const changed = vi.fn()
+  const unsubscribe = store.subscribe(changed)
+  await store.getState().fetchFolderWorkspacesForAllHosts()
+  unsubscribe()
+  expect(changed).toHaveBeenCalledOnce()
+  expect(store.getState().restoredRuntimeHostIdByWorkspaceSessionKey).toEqual({
+    unrelated: 'runtime:kept'
+  })
+})
+
+it('does not publish an all-host refresh whose restored owners need no cleanup', async () => {
+  const store = seed()
+  store.setState({ restoredRuntimeHostIdByWorkspaceSessionKey: { unrelated: 'runtime:kept' } })
+  const initial = store.getState()
+  const changed = vi.fn()
+  const unsubscribe = store.subscribe(changed)
+  await store.getState().fetchFolderWorkspacesForAllHosts()
+  unsubscribe()
+  expect(changed).not.toHaveBeenCalled()
+  expect(store.getState()).toBe(initial)
+  expect(store.getState().restoredRuntimeHostIdByWorkspaceSessionKey).toBe(
+    initial.restoredRuntimeHostIdByWorkspaceSessionKey
+  )
+})
diff --git a/src/renderer/src/store/slices/runtime-environment-ssh-selectors.ts b/src/renderer/src/store/slices/runtime-environment-ssh-selectors.ts
index 7cd1942db3a1..90f092220997 100644
--- a/src/renderer/src/store/slices/runtime-environment-ssh-selectors.ts
+++ b/src/renderer/src/store/slices/runtime-environment-ssh-selectors.ts
@@ -60,6 +60,24 @@ export function selectRuntimeAwareSshError(
   return bucket.connectionStates.get(targetId)?.error ?? null
 }
 
+export function selectRuntimeAwareSshConnectionGeneration(
+  state: RuntimeAwareSshReadState,
+  environmentId: string | null,
+  targetId: string
+): number | null {
+  if (environmentId === null) {
+    return state.sshConnectionStates.get(targetId)?.connectionGeneration ?? null
+  }
+  if (!isEnvironmentReachable(state, environmentId)) {
+    return null
+  }
+  const bucket = state.sshStateByEnvironment.get(environmentId)
+  if (!bucket?.targetsHydrated) {
+    return null
+  }
+  return bucket.connectionStates.get(targetId)?.connectionGeneration ?? null
+}
+
 export function selectRuntimeAwareSshTargetLabel(
   state: RuntimeAwareSshReadState,
   environmentId: string | null,
diff --git a/src/renderer/src/store/slices/runtime-environment-ssh.ts b/src/renderer/src/store/slices/runtime-environment-ssh.ts
index 3efbf0e78053..e6b2f30db615 100644
--- a/src/renderer/src/store/slices/runtime-environment-ssh.ts
+++ b/src/renderer/src/store/slices/runtime-environment-ssh.ts
@@ -4,6 +4,7 @@ import type { SshConnectionState, SshTargetSummary } from '../../../../shared/ss
 import { sanitizeSshTargetGeneration } from '../../../../shared/ssh-target-generation'
 import { sshConnectionStatesEqual, sshTargetLabelsEqual } from './ssh-target-cleanup'
 export {
+  selectRuntimeAwareSshConnectionGeneration,
   selectRuntimeAwareSshError,
   selectRuntimeAwareSshStatus,
   selectRuntimeAwareSshTargetLabel,
diff --git a/src/renderer/src/store/slices/runtime-host-status-entry-parity.test.ts b/src/renderer/src/store/slices/runtime-host-status-entry-parity.test.ts
deleted file mode 100644
index 63c3de2e7087..000000000000
--- a/src/renderer/src/store/slices/runtime-host-status-entry-parity.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-// The store's host-status entry is one shape, and every reader of the map has to accept exactly
-// it. A narrower local copy still typechecks against the store — the fields it is missing are all
-// optional — so it freezes at the vintage it was written at and never fails. #17710 added
-// `remoteControl` and #20003 added `snapshot`; the copies these assertions cover were not updated
-// either time. Like the other typed-contract tests, they fail at typecheck, not at runtime.
-import { describe, expectTypeOf, it } from 'vitest'
-import type { buildExecutionHostRegistry } from '../../../../shared/execution-host-registry'
-import type { buildSidebarHostOptions } from '@/components/sidebar/sidebar-host-options'
-import type { getRuntimeAutomationAvailability } from '@/components/automations/automation-target-availability'
-import type { getRuntimeSourceHostAvailability } from '@/components/automations/automation-source-context'
-import type { AutomationListLocalRowProps } from '@/components/automations/AutomationListLocalRow'
-import type { AutomationsListPanelProps } from '@/components/automations/AutomationsListPanel'
-import type { RuntimeEnvironmentStatus } from './runtime-status-types'
-
-// Compare the entry each reader accepts rather than the surrounding map, so a mismatch names the
-// field that drifted instead of every ReadonlyMap method signature.
-type AcceptedEntry<T> = NonNullable<T> extends ReadonlyMap<string, infer TEntry> ? TEntry : never
-
-type RegistryEntry = AcceptedEntry<
-  Parameters<typeof buildExecutionHostRegistry>[0]['runtimeStatusByEnvironmentId']
->
-type SidebarEntry = AcceptedEntry<
-  Parameters<typeof buildSidebarHostOptions>[0]['runtimeStatusByEnvironmentId']
->
-type AutomationEntry = AcceptedEntry<Parameters<typeof getRuntimeAutomationAvailability>[1]>
-type SourceContextEntry = AcceptedEntry<Parameters<typeof getRuntimeSourceHostAvailability>[1]>
-type LocalRowEntry = AcceptedEntry<AutomationListLocalRowProps['runtimeStatusByEnvironmentId']>
-type ListPanelEntry = AcceptedEntry<AutomationsListPanelProps['runtimeStatusByEnvironmentId']>
-
-describe('every reader of the runtime host status map accepts the store entry', () => {
-  it('holds for the execution-host registry', () => {
-    expectTypeOf<RegistryEntry>().toEqualTypeOf<RuntimeEnvironmentStatus>()
-  })
-
-  it('holds for the sidebar host options', () => {
-    expectTypeOf<SidebarEntry>().toEqualTypeOf<RuntimeEnvironmentStatus>()
-  })
-
-  it('holds for runtime automation availability', () => {
-    expectTypeOf<AutomationEntry>().toEqualTypeOf<RuntimeEnvironmentStatus>()
-  })
-
-  // These three only forward the map, which is exactly how a stale copy survives: nothing they
-  // do with it can fail, so the drift surfaces in whatever they hand it to.
-  it('holds for the automation source-context reader', () => {
-    expectTypeOf<SourceContextEntry>().toEqualTypeOf<RuntimeEnvironmentStatus>()
-  })
-
-  it('holds for the automation list row', () => {
-    expectTypeOf<LocalRowEntry>().toEqualTypeOf<RuntimeEnvironmentStatus>()
-  })
-
-  it('holds for the automations list panel', () => {
-    expectTypeOf<ListPanelEntry>().toEqualTypeOf<RuntimeEnvironmentStatus>()
-  })
-})
diff --git a/src/renderer/src/store/slices/ssh.ts b/src/renderer/src/store/slices/ssh.ts
index 36142d0c1c60..ddeaf415fd50 100644
--- a/src/renderer/src/store/slices/ssh.ts
+++ b/src/renderer/src/store/slices/ssh.ts
@@ -29,6 +29,9 @@ export type SshCredentialRequest = {
   targetId: string
   kind: 'passphrase' | 'password' | 'keyboard-interactive'
   detail: string
+  /** RFC 4256 echo flag for keyboard-interactive prompts: when true the
+   * server allows the typed response to be shown. */
+  echo?: boolean
 }
 
 export type SshSlice = {
diff --git a/src/renderer/src/store/slices/tabs/tabs-close-actions.ts b/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
index 48a96a7507d2..6db54ae36f48 100644
--- a/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
@@ -65,7 +65,6 @@ export function createTabsCloseActions(
             activeRuntimeEnvironmentId: getRuntimeEnvironmentIdForWorktree(state, worktreeId)
           }),
           worktreeId,
-          tabId: tab.id,
           sessionId: tab.entityId,
           provisional
         })
diff --git a/src/renderer/src/store/slices/tabs/tabs-create-actions.ts b/src/renderer/src/store/slices/tabs/tabs-create-actions.ts
index bc3f08558a13..2149b84cbc13 100644
--- a/src/renderer/src/store/slices/tabs/tabs-create-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-create-actions.ts
@@ -12,7 +12,13 @@ import {
   sanitizeRecentTabIds,
   updateGroup
 } from '../tab-group-state'
-import { canReplacePreviewContentType } from './tabs-tab-order'
+import {
+  applyTabOrderSortValues,
+  canReplacePreviewContentType,
+  insertTabIdIntoOrder
+} from './tabs-tab-order'
+import { resolveUnifiedTabCreatePlacement } from './tabs-create-placement'
+import { folderWorkspaceToWorktree } from '../../../../../shared/folder-workspace-worktree'
 
 export function createTabsCreateActions(
   set: TabsSliceSet,
@@ -23,13 +29,26 @@ export function createTabsCreateActions(
       const id = init?.id ?? createBrowserUuid()
       let created!: Tab
       set((state) => {
+        const existingTabs = state.unifiedTabsByWorktree[worktreeId] ?? []
+        const placement = resolveUnifiedTabCreatePlacement({
+          groups: state.groupsByWorktree[worktreeId] ?? [],
+          tabs: existingTabs,
+          activeGroupId: state.activeGroupIdByWorktree[worktreeId],
+          targetGroupId: init?.targetGroupId,
+          afterTabId: init?.afterTabId,
+          executionHostId: init?.executionHostId,
+          lookupWorktrees: () =>
+            [
+              ...(state.allWorktrees?.() ?? []),
+              ...(state.folderWorkspaces ?? []).map(folderWorkspaceToWorktree)
+            ].filter((worktree) => worktree.id === worktreeId)
+        })
         const { group, groupsByWorktree, activeGroupIdByWorktree } = ensureGroup(
           state.groupsByWorktree,
           state.activeGroupIdByWorktree,
           worktreeId,
-          init?.targetGroupId ?? state.activeGroupIdByWorktree[worktreeId]
+          placement.groupId
         )
-        const existingTabs = state.unifiedTabsByWorktree[worktreeId] ?? []
 
         let nextTabs = existingTabs
         let nextOrder = dedupeTabOrder(group.tabOrder)
@@ -50,6 +69,17 @@ export function createTabsCreateActions(
         const createdAt = Date.now()
         const executionHostId =
           init?.executionHostId ?? getActiveExecutionHostIdForWorktree(state, worktreeId)
+        // Why: preview replacement may have removed the anchor; the order then appends in-partition.
+        nextOrder = insertTabIdIntoOrder(
+          nextOrder,
+          nextTabs,
+          id,
+          init?.isPinned === true,
+          placement.anchorTabId
+        )
+        const insertedIndex = nextOrder.indexOf(id)
+        // Why always: preview replacement can leave a gap, so an append alone would reuse a sibling's sortOrder.
+        nextTabs = applyTabOrderSortValues(nextTabs, nextOrder)
         created = {
           id,
           entityId: init?.entityId ?? id,
@@ -67,7 +97,7 @@ export function createTabsCreateActions(
             : {}),
           customLabel: init?.customLabel ?? null,
           color: init?.color ?? null,
-          sortOrder: nextOrder.length,
+          sortOrder: insertedIndex,
           createdAt,
           // Why: creating an active tab is a focus event; Cmd+J recency reads lastFocusedAt.
           ...(shouldActivate ? { lastFocusedAt: createdAt } : {}),
@@ -75,7 +105,6 @@ export function createTabsCreateActions(
           isPinned: init?.isPinned
         }
 
-        nextOrder = dedupeTabOrder([...nextOrder, created.id])
         const nextActiveTabId = shouldActivate ? created.id : (group.activeTabId ?? created.id)
         const sanitizedRecent = sanitizeRecentTabIds(group.recentTabIds, nextOrder)
         // Why: automation-created browser tabs must paint without stealing the visible group selection from the user's current tab.
diff --git a/src/renderer/src/store/slices/tabs/tabs-create-placement.ts b/src/renderer/src/store/slices/tabs/tabs-create-placement.ts
new file mode 100644
index 000000000000..f354b30e8026
--- /dev/null
+++ b/src/renderer/src/store/slices/tabs/tabs-create-placement.ts
@@ -0,0 +1,73 @@
+import type { Tab, TabGroup } from '../../../../../shared/tab-types'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
+import type { Worktree } from '../../../../../shared/worktree/types'
+import { isExecutionHostAliasForWorktree } from '@/lib/worktree-execution-host-alias'
+
+type WorktreeHostAliases = Pick<Worktree, 'hostId' | 'runtimeOwnerEnvironmentId'>
+
+export type UnifiedTabCreatePlacementInput = {
+  groups: readonly TabGroup[]
+  tabs: readonly Tab[]
+  activeGroupId: string | undefined
+  targetGroupId?: string
+  afterTabId?: string
+  /** The caller's verified host; an anchor owned by another host is foreign. */
+  executionHostId?: ExecutionHostId
+  /** Records sharing this worktree id; host aliases only count when exactly one exists. */
+  lookupWorktrees: () => readonly WorktreeHostAliases[]
+}
+
+export type UnifiedTabCreatePlacement = {
+  /** A live group, or undefined to let ensureGroup pick its first-group/new-root fallback. */
+  groupId: string | undefined
+  anchorTabId: string | undefined
+}
+
+function isAnchorHostCompatible(
+  anchorHostId: ExecutionHostId | undefined,
+  input: UnifiedTabCreatePlacementInput
+): boolean {
+  const requestedHostId = input.executionHostId
+  if (!requestedHostId || !anchorHostId || anchorHostId === requestedHostId) {
+    return true
+  }
+  const worktrees = input.lookupWorktrees()
+  return (
+    worktrees.length === 1 &&
+    isExecutionHostAliasForWorktree(requestedHostId, worktrees[0]) &&
+    isExecutionHostAliasForWorktree(anchorHostId, worktrees[0])
+  )
+}
+
+function resolveAnchor(input: UnifiedTabCreatePlacementInput): Tab | undefined {
+  if (!input.afterTabId) {
+    return undefined
+  }
+  const matches = input.tabs.filter((tab) => tab.id === input.afterTabId)
+  if (matches.length !== 1) {
+    return undefined
+  }
+  const anchor = matches[0]
+  const group = input.groups.find((candidate) => candidate.id === anchor.groupId)
+  if (!group?.tabOrder.includes(anchor.id)) {
+    return undefined
+  }
+  return isAnchorHostCompatible(anchor.executionHostId, input) ? anchor : undefined
+}
+
+/** Resolve a new tab's destination group and the live anchor it should follow there. */
+export function resolveUnifiedTabCreatePlacement(
+  input: UnifiedTabCreatePlacementInput
+): UnifiedTabCreatePlacement {
+  const isLiveGroup = (groupId: string | undefined): groupId is string =>
+    Boolean(groupId && input.groups.some((group) => group.id === groupId))
+  const anchor = resolveAnchor(input)
+  // Why validate first: an expired requested id must fall to the active group, not ensureGroup's first group.
+  const groupId = isLiveGroup(input.targetGroupId)
+    ? input.targetGroupId
+    : (anchor?.groupId ?? (isLiveGroup(input.activeGroupId) ? input.activeGroupId : undefined))
+  return {
+    groupId,
+    anchorTabId: anchor && anchor.groupId === groupId ? anchor.id : undefined
+  }
+}
diff --git a/src/renderer/src/store/slices/tabs/tabs-slice-contract.ts b/src/renderer/src/store/slices/tabs/tabs-slice-contract.ts
index 528587b6bcae..bf0e62a2ebba 100644
--- a/src/renderer/src/store/slices/tabs/tabs-slice-contract.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-slice-contract.ts
@@ -36,6 +36,8 @@ export type TabsSlice = TabTerminalDockSlice & {
         | 'isPinned'
       > & {
         targetGroupId: string
+        /** Client-local unified tab id to insert after; an explicit targetGroupId still wins. */
+        afterTabId: string
         activate: boolean
         recordInteraction: boolean
       }
diff --git a/src/renderer/src/store/slices/tabs/tabs-tab-order.ts b/src/renderer/src/store/slices/tabs/tabs-tab-order.ts
index 236465ba6d12..b62e85fdb085 100644
--- a/src/renderer/src/store/slices/tabs/tabs-tab-order.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-tab-order.ts
@@ -17,10 +17,35 @@ export function applyTabOrderSortValues(tabs: Tab[], tabOrder: string[]): Tab[]
   const orderMap = new Map(tabOrder.map((id, index) => [id, index]))
   return tabs.map((tab) => {
     const sortOrder = orderMap.get(tab.id)
-    return sortOrder === undefined ? tab : { ...tab, sortOrder }
+    return sortOrder === undefined || sortOrder === tab.sortOrder ? tab : { ...tab, sortOrder }
   })
 }
 
+/**
+ * Insert `tabId` after `anchorTabId` when both share a pin partition; otherwise at the end of the
+ * new tab's partition. Siblings keep their relative order.
+ */
+export function insertTabIdIntoOrder(
+  tabOrder: readonly string[],
+  tabs: readonly Tab[],
+  tabId: string,
+  isPinned: boolean,
+  anchorTabId?: string
+): string[] {
+  const tabById = new Map(tabs.map((tab) => [tab.id, tab]))
+  const order = dedupeTabOrder([...tabOrder]).filter((id) => id !== tabId)
+  const firstUnpinnedIndex = order.findIndex((id) => !tabById.get(id)?.isPinned)
+  const pinnedPrefixEnd = firstUnpinnedIndex === -1 ? order.length : firstUnpinnedIndex
+  const anchorIndex = anchorTabId ? order.indexOf(anchorTabId) : -1
+  const anchorIsPinned = anchorIndex !== -1 && tabById.get(order[anchorIndex])?.isPinned === true
+  let index = isPinned ? pinnedPrefixEnd : order.length
+  if (anchorIndex !== -1) {
+    index = anchorIsPinned === isPinned ? anchorIndex + 1 : pinnedPrefixEnd
+  }
+  order.splice(index, 0, tabId)
+  return order
+}
+
 export function isReplaceablePreviewContentType(contentType: Tab['contentType']): boolean {
   return (
     contentType === 'editor' ||
diff --git a/src/renderer/src/store/slices/ui-hydration-workspace-preferences.test.ts b/src/renderer/src/store/slices/ui-hydration-workspace-preferences.test.ts
index 0a380a0625a1..815ae36b523e 100644
--- a/src/renderer/src/store/slices/ui-hydration-workspace-preferences.test.ts
+++ b/src/renderer/src/store/slices/ui-hydration-workspace-preferences.test.ts
@@ -140,7 +140,8 @@ describe('createUISlice hydratePersistedUI', () => {
       'minimax',
       'antigravity',
       'grok',
-      'cursor'
+      'cursor',
+      'zcode'
     ])
     expect(setUI).toHaveBeenCalledWith({
       statusBarItems: [
@@ -151,14 +152,16 @@ describe('createUISlice hydratePersistedUI', () => {
         'minimax',
         'antigravity',
         'grok',
-        'cursor'
+        'cursor',
+        'zcode'
       ],
       _portsStatusBarDefaultAdded: true,
       _kimiStatusBarDefaultAdded: true,
       _minimaxStatusBarDefaultAdded: true,
       _antigravityStatusBarDefaultAdded: true,
       _grokStatusBarDefaultAdded: true,
-      _cursorStatusBarDefaultAdded: true
+      _cursorStatusBarDefaultAdded: true,
+      _zcodeStatusBarDefaultAdded: true
     })
   })
 
@@ -175,7 +178,8 @@ describe('createUISlice hydratePersistedUI', () => {
         _minimaxStatusBarDefaultAdded: true,
         _antigravityStatusBarDefaultAdded: true,
         _grokStatusBarDefaultAdded: true,
-        _cursorStatusBarDefaultAdded: true
+        _cursorStatusBarDefaultAdded: true,
+        _zcodeStatusBarDefaultAdded: true
       })
     )
 
diff --git a/src/renderer/src/store/slices/ui/ui-slice-contract-contextual.ts b/src/renderer/src/store/slices/ui/ui-slice-contract-contextual.ts
index 0f997f5aeeac..4aaec0e5df6e 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-contract-contextual.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-contract-contextual.ts
@@ -114,4 +114,6 @@ export type UISliceContextual = {
   dismissUsagePercentageDisplayChangeNotice: () => void
   usageEmptyStateDismissed: boolean
   dismissUsageEmptyState: () => void
+  codexTerminalServerIsolationNoticeSeen: boolean
+  markCodexTerminalServerIsolationNoticeSeen: () => void
 }
diff --git a/src/renderer/src/store/slices/ui/ui-slice-hydration-actions.ts b/src/renderer/src/store/slices/ui/ui-slice-hydration-actions.ts
index 0bb4b7970463..879a1e613ea2 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-hydration-actions.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-hydration-actions.ts
@@ -241,6 +241,8 @@ export function createUiHydrationActions(set: UISliceSet, _get: UISliceGet): Par
             ui.usagePercentageDisplayChangeNoticeDismissed === true,
           // Why: default false so existing users still see the CTA; only explicit dismissal persists true.
           usageEmptyStateDismissed: ui.usageEmptyStateDismissed === true,
+          codexTerminalServerIsolationNoticeSeen:
+            ui.codexTerminalServerIsolationNoticeSeen === true,
           ...hydrateAgentReadState(ui),
           workspaceCleanupDismissals: sanitizeWorkspaceCleanupDismissals(
             ui.workspaceCleanup?.dismissals
diff --git a/src/renderer/src/store/slices/ui/ui-slice-hydration-status-bar-items.ts b/src/renderer/src/store/slices/ui/ui-slice-hydration-status-bar-items.ts
index 47c770804c23..26b6071d64dd 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-hydration-status-bar-items.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-hydration-status-bar-items.ts
@@ -8,6 +8,7 @@ const DEFAULT_ON_MINIMAX_STATUS_BAR_ITEM: StatusBarItem = 'minimax'
 const DEFAULT_ON_ANTIGRAVITY_STATUS_BAR_ITEM: StatusBarItem = 'antigravity'
 const DEFAULT_ON_GROK_STATUS_BAR_ITEM: StatusBarItem = 'grok'
 const DEFAULT_ON_CURSOR_STATUS_BAR_ITEM: StatusBarItem = 'cursor'
+const DEFAULT_ON_ZCODE_STATUS_BAR_ITEM: StatusBarItem = 'zcode'
 
 export function hydrateStatusBarItems(ui: PersistedUIState): StatusBarItem[] {
   let items = migrateStatusBarItems(ui.statusBarItems)
@@ -17,7 +18,8 @@ export function hydrateStatusBarItems(ui: PersistedUIState): StatusBarItem[] {
     ['_minimaxStatusBarDefaultAdded', DEFAULT_ON_MINIMAX_STATUS_BAR_ITEM],
     ['_antigravityStatusBarDefaultAdded', DEFAULT_ON_ANTIGRAVITY_STATUS_BAR_ITEM],
     ['_grokStatusBarDefaultAdded', DEFAULT_ON_GROK_STATUS_BAR_ITEM],
-    ['_cursorStatusBarDefaultAdded', DEFAULT_ON_CURSOR_STATUS_BAR_ITEM]
+    ['_cursorStatusBarDefaultAdded', DEFAULT_ON_CURSOR_STATUS_BAR_ITEM],
+    ['_zcodeStatusBarDefaultAdded', DEFAULT_ON_ZCODE_STATUS_BAR_ITEM]
   ] as const
   for (const [flag, item] of defaults) {
     if (!ui[flag] && !items.includes(item)) {
diff --git a/src/renderer/src/store/slices/ui/ui-slice-trust-actions.ts b/src/renderer/src/store/slices/ui/ui-slice-trust-actions.ts
index 8111c8f8f1fd..dabf69bb29df 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-trust-actions.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-trust-actions.ts
@@ -138,6 +138,16 @@ export function createUiTrustActions(set: UISliceSet, _get: UISliceGet): Partial
         }
         window.api.ui.set({ usageEmptyStateDismissed: true }).catch(console.error)
         return { usageEmptyStateDismissed: true }
+      }),
+    // Why default true: nothing may toast before hydration reads the persisted flag.
+    codexTerminalServerIsolationNoticeSeen: true,
+    markCodexTerminalServerIsolationNoticeSeen: () =>
+      set((s) => {
+        if (s.codexTerminalServerIsolationNoticeSeen) {
+          return s
+        }
+        window.api.ui.set({ codexTerminalServerIsolationNoticeSeen: true }).catch(console.error)
+        return { codexTerminalServerIsolationNoticeSeen: true }
       })
   }
 }
diff --git a/src/renderer/src/store/slices/worktrees/session/worktree-identity-rename-row-worktree-ids.test.ts b/src/renderer/src/store/slices/worktrees/session/worktree-identity-rename-row-worktree-ids.test.ts
index 039b1b5ca91a..cb6dd89e0262 100644
--- a/src/renderer/src/store/slices/worktrees/session/worktree-identity-rename-row-worktree-ids.test.ts
+++ b/src/renderer/src/store/slices/worktrees/session/worktree-identity-rename-row-worktree-ids.test.ts
@@ -41,7 +41,7 @@ describe('buildWorktreeRenameState value-owned worktree rows', () => {
     const next = buildWorktreeRenameState(
       appState({
         closedTerminalTabTombstonesByTabId: {
-          'tab-1': { closedAt: 5, worktreeId: OLD, ackRevision: 3 },
+          'tab-1': { closedAt: 5, worktreeId: OLD, reason: 'user' },
           'tab-2': { closedAt: 6, worktreeId: OTHER }
         }
       }),
@@ -49,7 +49,7 @@ describe('buildWorktreeRenameState value-owned worktree rows', () => {
       NEW
     )
     expect(next.closedTerminalTabTombstonesByTabId).toEqual({
-      'tab-1': { closedAt: 5, worktreeId: NEW, ackRevision: 3 },
+      'tab-1': { closedAt: 5, worktreeId: NEW, reason: 'user' },
       'tab-2': { closedAt: 6, worktreeId: OTHER }
     })
   })
diff --git a/src/renderer/src/store/terminals/terminal-surface-close-intent.ts b/src/renderer/src/store/terminals/terminal-surface-close-intent.ts
new file mode 100644
index 000000000000..25393aa8129b
--- /dev/null
+++ b/src/renderer/src/store/terminals/terminal-surface-close-intent.ts
@@ -0,0 +1,16 @@
+import type { TerminalSurfaceCloseTarget } from '../../../../shared/terminal-surface-close-target'
+
+/** Commits a terminal tab or split-pane close in main, which owns membership: a renderer save
+ *  cannot shrink it, so without this the close would ride on the PTY exit. */
+export function commitTerminalSurfaceClose(
+  worktreeId: string,
+  target: TerminalSurfaceCloseTarget,
+  reason?: 'user' | 'cleanup'
+): void {
+  // Why optional: an older preload can linger through an in-place renderer reload.
+  void globalThis.window?.api?.session
+    ?.closeTerminalSurface?.({ worktreeId, target, ...(reason ? { reason } : {}) })
+    ?.catch((error: unknown) => {
+      console.warn('[terminal-close] main did not commit the close', error)
+    })
+}
diff --git a/src/renderer/src/store/terminals/terminal-tab-close-intent.test.ts b/src/renderer/src/store/terminals/terminal-tab-close-intent.test.ts
new file mode 100644
index 000000000000..61b51c053375
--- /dev/null
+++ b/src/renderer/src/store/terminals/terminal-tab-close-intent.test.ts
@@ -0,0 +1,100 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import type * as AgentStatusModule from '@/lib/agent-status'
+import {
+  TEST_REPO,
+  createTestStore,
+  makeTab,
+  makeWorktree,
+  seedStore
+} from '../slices/store-test-helpers'
+import { createStoreCascadesMockApi } from '../slices/store-cascades-test-harness'
+
+vi.mock('sonner', () => ({
+  toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
+}))
+
+vi.mock('@/components/terminal-pane/pty-dispatcher', () => ({
+  restorePtyDataHandlersAfterFailedShutdown: vi.fn(),
+  unregisterPtyDataHandlers: vi.fn<() => unknown[]>(() => [])
+}))
+
+vi.mock('@/lib/agent-status', async (importOriginal) => ({
+  ...(await importOriginal<typeof AgentStatusModule>()),
+  detectAgentStatusFromTitle: vi.fn().mockReturnValue(null)
+}))
+
+const mockApi = createStoreCascadesMockApi()
+const closeTerminalSurface = vi.fn()
+Object.assign(mockApi, { session: { closeTerminalSurface } })
+
+const SSH_WORKTREE = 'remote-repo::/srv/app'
+const SSH_PTY = 'ssh:target@@pty2:1:1'
+
+function storeWithSshTab(): ReturnType<typeof createTestStore> {
+  const store = createTestStore()
+  seedStore(store, {
+    repos: [{ ...TEST_REPO, id: 'remote-repo', path: '/srv/app', connectionId: 'ssh-1' }],
+    worktreesByRepo: {
+      'remote-repo': [makeWorktree({ id: SSH_WORKTREE, repoId: 'remote-repo', path: '/srv/app' })]
+    },
+    tabsByWorktree: {
+      [SSH_WORKTREE]: [makeTab({ id: 'ssh-tab', worktreeId: SSH_WORKTREE, ptyId: SSH_PTY })]
+    },
+    ptyIdsByTabId: { 'ssh-tab': [SSH_PTY] }
+  })
+  return store
+}
+
+describe('closeTab close intent', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    closeTerminalSurface.mockResolvedValue(undefined)
+    mockApi.worktrees.updateMeta.mockResolvedValue({})
+  })
+
+  it('commits the close in main even when the SSH shutdown throws', async () => {
+    mockApi.pty.kill.mockRejectedValue(new Error('relay shutdown failed'))
+    const store = storeWithSshTab()
+
+    store.getState().closeTab('ssh-tab')
+    await Promise.resolve()
+
+    expect(mockApi.pty.kill).toHaveBeenCalledWith(SSH_PTY)
+    expect(closeTerminalSurface).toHaveBeenCalledWith({
+      worktreeId: SSH_WORKTREE,
+      target: { kind: 'tab', tabId: 'ssh-tab' },
+      reason: 'user'
+    })
+  })
+
+  it('removes the tab and kills it without waiting for main to write the close', async () => {
+    closeTerminalSurface.mockReturnValue(new Promise<void>(() => {}))
+    const store = storeWithSshTab()
+
+    store.getState().closeTab('ssh-tab')
+
+    expect(closeTerminalSurface).toHaveBeenCalledTimes(1)
+    expect(store.getState().tabsByWorktree[SSH_WORKTREE]).toEqual([])
+    await Promise.resolve()
+    expect(mockApi.pty.kill).toHaveBeenCalledWith(SSH_PTY)
+  })
+
+  it.each([['user'], ['cleanup']] as const)('sends the intent for a %s close', (reason) => {
+    storeWithSshTab().getState().closeTab('ssh-tab', { reason })
+
+    expect(closeTerminalSurface).toHaveBeenCalledTimes(1)
+  })
+
+  // Why: exits still retire through main's own exit handling until main decides exits itself.
+  it('sends nothing for a pty-exit close', () => {
+    storeWithSshTab().getState().closeTab('ssh-tab', { reason: 'pty-exit' })
+
+    expect(closeTerminalSurface).not.toHaveBeenCalled()
+  })
+
+  it('sends nothing when a paired host owns the close', () => {
+    storeWithSshTab().getState().closeTab('ssh-tab', { remoteCloseOwnedByHost: true })
+
+    expect(closeTerminalSurface).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/store/terminals/terminal-tab-close-tombstone.test.ts b/src/renderer/src/store/terminals/terminal-tab-close-tombstone.test.ts
index 8a7d5039c8ac..9d7820c7bd3a 100644
--- a/src/renderer/src/store/terminals/terminal-tab-close-tombstone.test.ts
+++ b/src/renderer/src/store/terminals/terminal-tab-close-tombstone.test.ts
@@ -2,6 +2,9 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import { createTestStore, makeTab, makeWorktree, seedStore } from '../slices/store-test-helpers'
 import { createStoreCascadesMockApi } from '../slices/store-cascades-test-harness'
+import { mergeDirectSshRemoteWorkspaceSession } from '@/hooks/remote-workspace-session-merge'
+import { buildWorkspaceSessionPayload } from '@/lib/workspace-session'
+import { getDefaultWorkspaceSession } from '../../../../shared/constants'
 
 vi.mock('sonner', () => ({
   toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
@@ -43,38 +46,93 @@ function storeWithBothWorktrees(): ReturnType<typeof createTestStore> {
   return store
 }
 
-describe('closeTab close tombstones', () => {
+const closeTerminalSurface = vi.fn()
+Object.assign(mockApi, { session: { closeTerminalSurface } })
+
+describe('closeTab close-record mirror', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    closeTerminalSurface.mockResolvedValue(undefined)
     mockApi.worktrees.updateMeta.mockResolvedValue({})
   })
 
-  it('records the closed tab against the worktree it was closed in', () => {
+  // Why every workspace kind: main records every close it is told about, and the mirror is what
+  // the seeding predicate reads before the next launch hydrates main's copy.
+  it.each([
+    ['remote-tab', REMOTE_WORKTREE],
+    ['local-tab', LOCAL_WORKTREE]
+  ])('mirrors the record main is told to write for %s', (tabId, worktreeId) => {
     const store = storeWithBothWorktrees()
 
-    store.getState().closeTab('remote-tab')
+    store.getState().closeTab(tabId)
 
-    expect(store.getState().closedTerminalTabTombstonesByTabId['remote-tab']).toEqual({
+    expect(store.getState().closedTerminalTabTombstonesByTabId[tabId]).toEqual({
       closedAt: expect.any(Number),
-      worktreeId: REMOTE_WORKTREE
+      worktreeId,
+      reason: 'user'
+    })
+    expect(closeTerminalSurface).toHaveBeenCalledWith({
+      worktreeId,
+      target: { kind: 'tab', tabId },
+      reason: 'user'
     })
   })
 
-  // A tombstone outlives the host's own record, so the only claim it may ever make is "the user
-  // closed this". Neither of these closes is that claim.
-  it.each([['pty-exit'], ['cleanup']] as const)('records nothing for a %s close', (reason) => {
+  it('mirrors a cleanup close with its reason', () => {
     const store = storeWithBothWorktrees()
 
-    store.getState().closeTab('remote-tab', { reason })
+    store.getState().closeTab('remote-tab', { reason: 'cleanup' })
 
-    expect(store.getState().closedTerminalTabTombstonesByTabId['remote-tab']).toBeUndefined()
+    expect(store.getState().closedTerminalTabTombstonesByTabId['remote-tab']?.reason).toBe(
+      'cleanup'
+    )
   })
 
-  it('records nothing for a definitively local worktree, which no pull merge ever reads', () => {
+  // Main alone closes for a process exit; a paired host owns its own records.
+  it.each([
+    ['a pty-exit close', { reason: 'pty-exit' as const }],
+    ['a host-owned close', { remoteCloseOwnedByHost: true }]
+  ])('mirrors nothing for %s', (_label, opts) => {
     const store = storeWithBothWorktrees()
 
-    store.getState().closeTab('local-tab')
+    store.getState().closeTab('remote-tab', opts)
 
     expect(store.getState().closedTerminalTabTombstonesByTabId).toEqual({})
+    expect(closeTerminalSurface).not.toHaveBeenCalled()
+  })
+
+  // The race the mirror exists for: a host pull lands after closeTab and before main has answered
+  // the close intent (which never resolves here). The host still lists the tab.
+  it('keeps a closed SSH tab closed through a pull that lands before main answers', () => {
+    closeTerminalSurface.mockReturnValue(new Promise(() => {}))
+    const store = storeWithBothWorktrees()
+    const hostStillListing = {
+      ...getDefaultWorkspaceSession(),
+      tabsByWorktree: {
+        [REMOTE_WORKTREE]: [makeTab({ id: 'remote-tab', worktreeId: REMOTE_WORKTREE })]
+      }
+    }
+    const applyPull = (): void => {
+      const state = store.getState()
+      const merged = mergeDirectSshRemoteWorkspaceSession(
+        buildWorkspaceSessionPayload(state),
+        hostStillListing,
+        new Set([REMOTE_WORKTREE]),
+        state.tabsByWorktree,
+        new Set(),
+        undefined,
+        state.closedTerminalTabTombstonesByTabId
+      )
+      const replaceWorkspaceKeys = [REMOTE_WORKTREE]
+      store.getState().hydrateWorkspaceSession(merged, { replaceWorkspaceKeys })
+      store.getState().hydrateTabsSession(merged, { replaceWorkspaceKeys })
+    }
+
+    store.getState().closeTab('remote-tab')
+    applyPull()
+    // A second pull: once re-added, a live local tab would override its record for good.
+    applyPull()
+
+    expect(store.getState().tabsByWorktree[REMOTE_WORKTREE]?.map((tab) => tab.id) ?? []).toEqual([])
   })
 })
diff --git a/src/renderer/src/store/terminals/terminal-tab-close.ts b/src/renderer/src/store/terminals/terminal-tab-close.ts
index c84263e7b7fd..8227521d2ecd 100644
--- a/src/renderer/src/store/terminals/terminal-tab-close.ts
+++ b/src/renderer/src/store/terminals/terminal-tab-close.ts
@@ -1,6 +1,4 @@
-import { recordClosedTerminalTabTombstone } from '../../../../shared/closed-terminal-tab-tombstones'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
-import { getConnectionIdFromState } from '@/lib/connection-owner-resolution'
 import { sweepRetiredTerminalTabState } from '../slices/retired-terminal-tab-state-sweep'
 import {
   getRecentlyClosedTabPosition,
@@ -15,6 +13,7 @@ import {
 } from '../slices/terminal-tab-retirement'
 import type { TerminalSlice, TerminalStoreGet, TerminalStoreSet } from './terminal-state'
 import { startTerminalTabProviderRetirement } from './terminal-tab-close-providers'
+import { commitTerminalSurfaceClose } from './terminal-surface-close-intent'
 import { omitUnverifiedPtyLossTabIds } from './terminal-unverified-pty-loss'
 import { removePaneKeysByTabPrefix } from '../slices/agent-status-pane-keyed-records'
 import { omitRecordKeys } from '../slices/worktrees/teardown/record-key-omission'
@@ -26,7 +25,9 @@ export function createTerminalTabCloseActions(
   return {
     closeTab: (tabId, opts) => {
       const closeReason = opts?.reason ?? 'user'
-      const retiresSession = closeReason === 'user' || closeReason === 'cleanup'
+      // Why narrowed separately: main alone records a close for a process exit.
+      const intentReason = closeReason === 'pty-exit' ? null : closeReason
+      const retiresSession = intentReason !== null
       const retirementPlan =
         opts?.precomputedRetirementPlan?.tabId === tabId
           ? opts.precomputedRetirementPlan
@@ -68,22 +69,19 @@ export function createTerminalTabCloseActions(
             next[wId] = after
           }
         }
-        // Why `user` and not retiresSession: a tombstone outlives the host's own record, so the only
-        // thing it may ever say is "the user closed this". A pty-exit close is the process ending,
-        // and a `cleanup` close retires a tab the app itself created — neither is that claim.
-        // Why a non-local worktree only: the tombstone is read solely by the direct-SSH pull merge,
-        // and a definitively local tab would just consume the map's cap. An unresolved repo
-        // (undefined, not null) still records — losing the tombstone reinstates the resurrection.
+        // Why mirrored here and never persisted: main records the close through the intent below,
+        // and the direct-SSH pull merge reads this synchronously, so a pull landing before main
+        // answered would otherwise re-add the tab. Goes away when that merge moves to main.
         const nextClosedTombstones =
-          closeReason === 'user' &&
-          closedWorktreeId &&
-          getConnectionIdFromState(s, closedWorktreeId) !== null
-            ? recordClosedTerminalTabTombstone(
-                s.closedTerminalTabTombstonesByTabId,
-                tabId,
-                closedWorktreeId,
-                Date.now()
-              )
+          intentReason && closedWorktreeId && opts?.remoteCloseOwnedByHost !== true
+            ? {
+                ...s.closedTerminalTabTombstonesByTabId,
+                [tabId]: {
+                  closedAt: Date.now(),
+                  worktreeId: closedWorktreeId,
+                  reason: intentReason
+                }
+              }
             : s.closedTerminalTabTombstonesByTabId
         // Why: only explicit user closes feed the Cmd+Shift+T reopen stack; cleanup/PTY-exit closes must not pollute undo history.
         const closedPosition =
@@ -249,6 +247,9 @@ export function createTerminalTabCloseActions(
             : {})
         }
       })
+      if (intentReason && closingWorktreeId && opts?.remoteCloseOwnedByHost !== true) {
+        commitTerminalSurfaceClose(closingWorktreeId, { kind: 'tab', tabId }, intentReason)
+      }
       // Why shared with the paired snapshot apply: every path that removes a tab owes it the same sweep, and a second copy of the list is how one path silently misses a new entry.
       sweepRetiredTerminalTabState(get(), tabId, closingWorktreeId)
       for (const tabs of Object.values(get().unifiedTabsByWorktree)) {
diff --git a/src/renderer/src/store/terminals/workspace-terminal-hydration-patch.ts b/src/renderer/src/store/terminals/workspace-terminal-hydration-patch.ts
index 6f2e3d47e753..ef53641d0dc7 100644
--- a/src/renderer/src/store/terminals/workspace-terminal-hydration-patch.ts
+++ b/src/renderer/src/store/terminals/workspace-terminal-hydration-patch.ts
@@ -198,7 +198,7 @@ export function targetScopedWorkspaceHydrationPatch(
       ),
       ...state.defaultTerminalTabsAppliedByWorktreeId
     },
-    // Why passed through whole: hydration already unioned it with live store state, and the map is
+    // Why passed through whole: hydration already fell back to live store state, and the map is
     // keyed by tab id rather than by workspace key so replaceHydratedRecordKeys has nothing to match.
     closedTerminalTabTombstonesByTabId: hydrated.closedTerminalTabTombstonesByTabId,
     automaticAgentResumeClaimsByTabId: replaceHydratedRecordKeys(
diff --git a/src/renderer/src/store/terminals/workspace-terminal-hydration.ts b/src/renderer/src/store/terminals/workspace-terminal-hydration.ts
index db278e05d925..9cfe4e687e8d 100644
--- a/src/renderer/src/store/terminals/workspace-terminal-hydration.ts
+++ b/src/renderer/src/store/terminals/workspace-terminal-hydration.ts
@@ -191,11 +191,10 @@ export function createWorkspaceTerminalHydrationActions(
             ...session.defaultTerminalTabsAppliedByWorktreeId,
             ...s.defaultTerminalTabsAppliedByWorktreeId
           },
-          // Why replace and not union: both callers hand over a map they derived from this store
-          // synchronously (the pull merge) or from disk before the store had one (startup), so there
-          // is no local tombstone to lose — and a union would resurrect the ones the merge just
-          // retired on the host's acknowledgement, which is the whole bound on this map.
-          closedTerminalTabTombstonesByTabId: session.closedTerminalTabTombstonesByTabId ?? {},
+          // Why keep the store's when absent: only main's session carries close records, and the
+          // pull merge's session does not, so re-hydrating from it must not clear the mirror.
+          closedTerminalTabTombstonesByTabId:
+            session.closedTerminalTabTombstonesByTabId ?? s.closedTerminalTabTombstonesByTabId,
           automaticAgentResumeClaimsByTabId: {},
           sleepingAgentSessionsByPaneKey,
           pendingReconnectWorktreeIds,
diff --git a/src/renderer/src/web/preload-api/web-terminal-api.ts b/src/renderer/src/web/preload-api/web-terminal-api.ts
index 5c85b21b76f0..5e71d2d74e69 100644
--- a/src/renderer/src/web/preload-api/web-terminal-api.ts
+++ b/src/renderer/src/web/preload-api/web-terminal-api.ts
@@ -19,6 +19,8 @@ export function createPtyApi(): NonNullable<Partial<PreloadApi>['pty']> {
     signal: () => {},
     // Web panes clear the host buffer via the terminal.clearBuffer runtime RPC.
     clearBuffer: () => {},
+    // Likewise terminal.resetInputModes.
+    resetInputModes: () => {},
     kill: () => Promise.resolve(),
     ackColdRestore: () => {},
     ackData: () => {},
@@ -86,6 +88,7 @@ export function createPtyApi(): NonNullable<Partial<PreloadApi>['pty']> {
     onSpawned: () => noopUnsubscribe,
     onSerializeBufferRequest: () => noopUnsubscribe,
     onClearBufferRequest: () => noopUnsubscribe,
+    onResetInputModesRequest: () => noopUnsubscribe,
     sendSerializedBuffer: () => {},
     declarePendingPaneSerializer: () => Promise.resolve(0),
     settlePaneSerializer: () => Promise.resolve(),
diff --git a/src/renderer/src/web/preload-api/web-workspace-session-api.ts b/src/renderer/src/web/preload-api/web-workspace-session-api.ts
index 2a8abc03b616..553b065c9923 100644
--- a/src/renderer/src/web/preload-api/web-workspace-session-api.ts
+++ b/src/renderer/src/web/preload-api/web-workspace-session-api.ts
@@ -81,6 +81,8 @@ export function createWebWorkspaceSessionApi(): Partial<PreloadApi> {
           })
         )
       },
+      // Why a no-op: web closes reach the host through its session-tab and terminal close RPCs.
+      closeTerminalSurface: async () => {},
       // localStorage writes synchronously, so there is no deferred web flush.
       flush: async () => {},
       readTerminalScrollback: () => null,
diff --git a/src/renderer/src/web/web-runtime-client-export-parity.test.ts b/src/renderer/src/web/web-runtime-client-export-parity.test.ts
deleted file mode 100644
index 6ba87eaad36d..000000000000
--- a/src/renderer/src/web/web-runtime-client-export-parity.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { expect, expectTypeOf, it } from 'vitest'
-import type { WebPairingOffer } from './web-pairing'
-import * as WebClient from './web-runtime-client'
-
-it('keeps the paired-web client public export surface exact', () => {
-  expectTypeOf<WebClient.SubscribeOptions>().toEqualTypeOf<WebClient.SubscribeOptions>()
-  expectTypeOf<WebClient.WebRuntimeSubscriptionHandle>().toEqualTypeOf<WebClient.WebRuntimeSubscriptionHandle>()
-  expectTypeOf<ConstructorParameters<typeof WebClient.WebRuntimeClient>>().toEqualTypeOf<
-    [
-      pairing: WebPairingOffer,
-      options?: ConstructorParameters<typeof WebClient.WebRuntimeClient>[1]
-    ]
-  >()
-  expectTypeOf<keyof WebClient.WebRuntimeClient>().toEqualTypeOf<
-    'call' | 'close' | 'subscribe' | 'statusOwner'
-  >()
-  expect(Object.keys(WebClient)).toEqual(['WebRuntimeClient'])
-})
diff --git a/src/shared/__fixtures__/codebuddy-question-hooks.jsonl b/src/shared/__fixtures__/codebuddy-question-hooks.jsonl
new file mode 100644
index 000000000000..81a69a899b62
--- /dev/null
+++ b/src/shared/__fixtures__/codebuddy-question-hooks.jsonl
@@ -0,0 +1,6 @@
+{"hook_event_name": "UserPromptSubmit", "prompt": "Use AskUserQuestion to ask me to choose red or blue. After I answer, reply with my color and stop.", "permission_mode": "default", "version": "2.159.0", "model": "fast-model", "session_id": "codebuddy-verification", "transcript_path": "/sessions/codebuddy-verification.jsonl"}
+{"hook_event_name": "SessionStart", "source": "startup", "permission_mode": "default", "version": "2.159.0", "model": "fast-model", "session_id": "codebuddy-verification", "transcript_path": "/sessions/codebuddy-verification.jsonl"}
+{"hook_event_name": "Notification", "notification_type": "permission_prompt", "message": "needs your permission to use AskUserQuestion", "permission_mode": "default", "version": "2.159.0", "model": "fast-model", "session_id": "codebuddy-verification", "transcript_path": "/sessions/codebuddy-verification.jsonl"}
+{"hook_event_name": "PreToolUse", "tool_name": "AskUserQuestion", "tool_input": {"questions": [{"header": "Color", "multiSelect": false, "options": [{"description": "Choose red", "label": "Red"}, {"description": "Choose blue", "label": "Blue"}], "question": "Which color do you choose?"}]}, "permission_mode": "default", "version": "2.159.0", "model": "fast-model", "session_id": "codebuddy-verification", "transcript_path": "/sessions/codebuddy-verification.jsonl"}
+{"hook_event_name": "PostToolUse", "tool_name": "AskUserQuestion", "tool_input": {"questions": [{"header": "Color", "multiSelect": false, "options": [{"description": "Choose red", "label": "Red"}, {"description": "Choose blue", "label": "Blue"}], "question": "Which color do you choose?"}]}, "tool_response": " \u00b7 Which color do you choose? \u2192 Red", "permission_mode": "default", "version": "2.159.0", "model": "fast-model", "session_id": "codebuddy-verification", "transcript_path": "/sessions/codebuddy-verification.jsonl"}
+{"hook_event_name": "Stop", "last_assistant_message": "Red", "permission_mode": "default", "version": "2.159.0", "model": "fast-model", "session_id": "codebuddy-verification", "transcript_path": "/sessions/codebuddy-verification.jsonl"}
diff --git a/src/shared/__fixtures__/codebuddy-question-hooks.meta.json b/src/shared/__fixtures__/codebuddy-question-hooks.meta.json
new file mode 100644
index 000000000000..28ac3a2d76b3
--- /dev/null
+++ b/src/shared/__fixtures__/codebuddy-question-hooks.meta.json
@@ -0,0 +1,6 @@
+{
+  "version": "2.159.0",
+  "platform": "darwin",
+  "model": "fast-model",
+  "description": "Live CLI: question notification precedes PreToolUse; PreToolUse follows the answer; SessionStart follows UserPromptSubmit. Host paths and session identifiers replaced."
+}
diff --git a/src/shared/__fixtures__/qoder-no-account-hooks.jsonl b/src/shared/__fixtures__/qoder-no-account-hooks.jsonl
new file mode 100644
index 000000000000..0508c506368d
--- /dev/null
+++ b/src/shared/__fixtures__/qoder-no-account-hooks.jsonl
@@ -0,0 +1,6 @@
+{"session_id":"00000000-0000-4000-8000-000000000000","transcript_path":"/private/tmp/orca-qoder-probe/config/projects/-private-tmp-orca-qoder-probe-workspace/00000000-0000-4000-8000-000000000000.jsonl","cwd":"/private/tmp/orca-qoder-probe/workspace","hook_event_name":"SessionStart","permission_mode":"default","source":"startup"}
+{"session_id":"00000000-0000-4000-8000-000000000000","transcript_path":"/private/tmp/orca-qoder-probe/config/projects/-private-tmp-orca-qoder-probe-workspace/00000000-0000-4000-8000-000000000000.jsonl","cwd":"/private/tmp/orca-qoder-probe/workspace","hook_event_name":"UserPromptSubmit","permission_mode":"default","prompt":"Reply with hello.","request_set_id":"00000000-0000-4000-8000-000000000000"}
+{"session_id":"00000000-0000-4000-8000-000000000000","transcript_path":"/private/tmp/orca-qoder-probe/config/projects/-private-tmp-orca-qoder-probe-workspace/00000000-0000-4000-8000-000000000000.jsonl","cwd":"/private/tmp/orca-qoder-probe/workspace","hook_event_name":"Notification","permission_mode":"default","notification_type":"idle_prompt","message":"Qoder CLI finished responding and is awaiting input.","details":{"streamingState":"idle"}}
+{"session_id":"00000000-0000-4000-8000-000000000000","transcript_path":"/private/tmp/orca-qoder-probe/config/projects/-private-tmp-orca-qoder-probe-workspace/00000000-0000-4000-8000-000000000000.jsonl","cwd":"/private/tmp/orca-qoder-probe/workspace","hook_event_name":"SessionEnd","permission_mode":"default","reason":"other"}
+{"session_id":"00000000-0000-4000-8000-000000000000","transcript_path":"/tmp/orca-qoder-probe/config/projects/-private-tmp-orca-qoder-probe-workspace/00000000-0000-4000-8000-000000000000.jsonl","cwd":"/private/tmp/orca-qoder-probe/workspace","hook_event_name":"SessionStart","permission_mode":"default","source":"resume"}
+{"session_id":"00000000-0000-4000-8000-000000000000","transcript_path":"/private/tmp/orca-qoder-probe/config/projects/-private-tmp-orca-qoder-probe-workspace/00000000-0000-4000-8000-000000000000.jsonl","cwd":"/private/tmp/orca-qoder-probe/workspace","hook_event_name":"SessionEnd","permission_mode":"default","reason":"other"}
diff --git a/src/shared/agent-child-row-model.test.ts b/src/shared/agent-child-row-model.test.ts
new file mode 100644
index 000000000000..a99ef0a71520
--- /dev/null
+++ b/src/shared/agent-child-row-model.test.ts
@@ -0,0 +1,384 @@
+import { describe, expect, it } from 'vitest'
+import {
+  agentChildRowContextForParent,
+  buildAgentChildRowModels,
+  buildLegacyAgentChildRowModels,
+  buildLegacyTaskRowModels,
+  flattenAgentChildRowModels,
+  type AgentChildRowContext,
+  type AgentChildRowModel
+} from './agent-child-row-model'
+import type { AgentChildWorkView } from './agent-status-child-work-view'
+
+const FRESH: AgentChildRowContext = {
+  parentEvidenceFresh: true,
+  transportObservation: 'live',
+  parentObservedAt: 900,
+  hostClockOffsetMs: 0
+}
+const STALE: AgentChildRowContext = { ...FRESH, parentEvidenceFresh: false }
+const LOST: AgentChildRowContext = { ...FRESH, transportObservation: 'unverifiable' }
+
+function view(id: string, overrides: Partial<AgentChildWorkView> = {}): AgentChildWorkView {
+  return {
+    id,
+    providerId: `task-${id}`,
+    kind: 'agent',
+    description: `child ${id}`,
+    agentType: 'general-purpose',
+    state: 'working',
+    membership: 'live',
+    firstObservedAt: 100,
+    observedAt: 500,
+    stoppable: true,
+    invocation: { invocationId: `spawn-${id}`, generation: 1 },
+    ...overrides
+  }
+}
+
+function settled(
+  id: string,
+  outcome: NonNullable<AgentChildWorkView['outcome']>,
+  overrides: Partial<AgentChildWorkView> = {}
+): AgentChildWorkView {
+  return view(id, {
+    state: 'done',
+    membership: 'settled',
+    outcome,
+    settledAt: 450,
+    ...overrides
+  })
+}
+
+function shell(id: string, owner: string, overrides: Partial<AgentChildWorkView> = {}) {
+  return view(id, {
+    kind: 'command',
+    description: 'npm run dev',
+    agentType: undefined,
+    state: 'monitoring',
+    parentChildWorkId: owner,
+    ...overrides
+  })
+}
+
+function only(views: AgentChildWorkView[], context = FRESH): AgentChildRowModel {
+  const [row] = buildAgentChildRowModels(views, context)
+  return row
+}
+
+describe('buildAgentChildRowModels: the display vocabulary', () => {
+  it.each<[string, AgentChildWorkView[], Pick<AgentChildRowModel, 'displayState' | 'detail'>]>([
+    [
+      'working with no known operation names its role',
+      [view('a')],
+      { displayState: 'working', detail: { kind: 'role', agentType: 'general-purpose' } }
+    ],
+    [
+      'working with a foreground tool names the tool the way a CLI row does',
+      [view('a', { operation: { toolName: 'Read', basis: 'open', observedAt: 400 } })],
+      { displayState: 'working', detail: { kind: 'operation', toolName: 'Read' } }
+    ],
+    [
+      'a foreground shell reads as working with its command',
+      [
+        view('a', {
+          operation: { toolName: 'Bash', input: 'npm test', basis: 'open', observedAt: 400 }
+        })
+      ],
+      {
+        displayState: 'working',
+        detail: { kind: 'operation', toolName: 'Bash', input: 'npm test' }
+      }
+    ],
+    [
+      'an idle child whose own shell runs reads monitoring',
+      [view('a', { state: 'idle' }), shell('s', 'a')],
+      { displayState: 'monitoring', detail: { kind: 'monitoring' } }
+    ],
+    [
+      'a finished child whose own shell runs reads monitoring',
+      [settled('a', 'succeeded', { lastMessage: 'All green' }), shell('s', 'a')],
+      { displayState: 'monitoring', detail: { kind: 'monitoring' } }
+    ],
+    [
+      'waiting names the tool the approval is for',
+      [
+        view('a', {
+          state: 'waiting',
+          operation: { toolName: 'Edit', input: 'src/a.ts', basis: 'open', observedAt: 400 }
+        })
+      ],
+      {
+        displayState: 'waiting',
+        detail: { kind: 'operation', toolName: 'Edit', input: 'src/a.ts' }
+      }
+    ],
+    [
+      'blocked says why',
+      [view('a', { state: 'blocked', lastMessage: 'Rate limited' })],
+      { displayState: 'blocked', detail: { kind: 'message', text: 'Rate limited' } }
+    ],
+    [
+      'succeeded reads done with its last message',
+      [settled('a', 'succeeded', { lastMessage: 'Found 3 call sites' })],
+      { displayState: 'done', detail: { kind: 'message', text: 'Found 3 call sites' } }
+    ],
+    [
+      'failed reads failed with its error',
+      [settled('a', 'failed', { lastMessage: 'Exit code 1' })],
+      { displayState: 'failed', detail: { kind: 'message', text: 'Exit code 1' } }
+    ],
+    [
+      'cancelled reads interrupted and adds no message',
+      [settled('a', 'cancelled', { lastMessage: 'half a thought' })],
+      { displayState: 'interrupted', detail: { kind: 'role', agentType: 'general-purpose' } }
+    ],
+    [
+      'an ending the lane cannot classify is neutral and says Ended',
+      [settled('a', 'unknown')],
+      { displayState: 'idle', detail: { kind: 'ended' } }
+    ],
+    [
+      'a parked live child names its role',
+      [view('a', { state: 'idle' })],
+      { displayState: 'idle', detail: { kind: 'role', agentType: 'general-purpose' } }
+    ],
+    [
+      'a host-reported unverifiable child reports its silence',
+      [view('a', { state: 'unverifiable' })],
+      { displayState: 'unverifiable', detail: { kind: 'no-update' } }
+    ]
+  ])('%s', (_name, views, expected) => {
+    expect(only(views)).toMatchObject(expected)
+  })
+
+  it('suppresses the tool line while monitoring, even when a stale operation arrives', () => {
+    const row = only([
+      view('a', {
+        state: 'idle',
+        operation: { toolName: 'Bash', input: 'npm test', basis: 'reported', observedAt: 400 }
+      }),
+      shell('s', 'a')
+    ])
+    expect(row.displayState).toBe('monitoring')
+    expect(row.detail).toEqual({ kind: 'monitoring' })
+  })
+
+  it('makes every live claim unverifiable under a stale parent or a lost transport', () => {
+    for (const context of [STALE, LOST]) {
+      expect(only([view('a')], context)).toMatchObject({
+        displayState: 'unverifiable',
+        detail: { kind: 'no-update' }
+      })
+      // A finished child's monitoring is a claim about live work; its outcome is history.
+      expect(only([settled('a', 'succeeded'), shell('s', 'a')], context).displayState).toBe(
+        'unverifiable'
+      )
+      expect(only([settled('a', 'failed')], context).displayState).toBe('failed')
+      expect(only([view('a', { state: 'idle' })], context).displayState).toBe('idle')
+    }
+  })
+
+  it('gives sibling rows their own clocks, never the parent one', () => {
+    const [busy, quiet] = buildAgentChildRowModels(
+      [view('busy', { observedAt: 880 }), view('quiet', { firstObservedAt: 200, observedAt: 300 })],
+      STALE
+    )
+    expect([busy.recencyAt, quiet.recencyAt]).toEqual([880, 300])
+    expect([busy.observedAt, quiet.observedAt]).toEqual([880, 300])
+    expect([busy.firstObservedAt, quiet.firstObservedAt]).toEqual([100, 200])
+  })
+
+  it('nests owned work under its owner and keeps host order', () => {
+    const rows = buildAgentChildRowModels(
+      [
+        view('a'),
+        shell('s', 'a', { state: 'working' }),
+        view('b'),
+        view('grandchild', { parentChildWorkId: 'a' })
+      ],
+      FRESH
+    )
+    expect(rows.map((row) => row.id)).toEqual(['a', 'b'])
+    expect(rows[0].owned.map((row) => row.id)).toEqual(['s', 'grandchild'])
+    expect(flattenAgentChildRowModels(rows).map((row) => row.id)).toEqual([
+      'a',
+      's',
+      'grandchild',
+      'b'
+    ])
+    // A shell names itself; only an agent's own tool line can go stale.
+    expect(rows[0].owned[0]).toMatchObject({ displayState: 'working', detail: null })
+  })
+
+  it('names a row by its label and omits a role that restates it', () => {
+    expect(
+      only([view('a', { description: '  ', name: 'subagent', agentType: 'Explore' })])
+    ).toMatchObject({ name: 'Explore', detail: null })
+    expect(only([view('a', { description: undefined, agentType: undefined })])).toMatchObject({
+      name: '',
+      detail: { kind: 'role', agentType: 'unknown' }
+    })
+  })
+
+  it('offers a stop only for a live row the host can target', () => {
+    expect(only([view('a')]).canStop).toBe(true)
+    expect(only([view('a', { providerId: undefined })]).canStop).toBe(false)
+    expect(only([view('a', { stoppable: false })]).canStop).toBe(false)
+    expect(only([settled('a', 'succeeded')]).canStop).toBe(false)
+  })
+})
+
+describe('buildLegacyAgentChildRowModels', () => {
+  it('reads a legacy snapshot as before: no clock of its own, no outcome, no operation', () => {
+    const rows = buildLegacyAgentChildRowModels(
+      [
+        { id: 'w', state: 'working', startedAt: 10, description: 'Review', agentType: 'Explore' },
+        { id: 'i', state: 'idle', startedAt: 20, agentType: 'writer' },
+        { id: 'u', state: 'unverifiable', startedAt: 30 }
+      ],
+      FRESH
+    )
+    expect(rows).toEqual([
+      expect.objectContaining({
+        id: 'w',
+        providerId: 'w',
+        displayState: 'working',
+        name: 'Review',
+        detail: { kind: 'role', agentType: 'Explore' },
+        firstObservedAt: 10,
+        recencyAt: 900,
+        settled: false,
+        canStop: false
+      }),
+      expect.objectContaining({ id: 'i', displayState: 'idle', name: 'writer', detail: null }),
+      expect.objectContaining({
+        id: 'u',
+        displayState: 'unverifiable',
+        detail: { kind: 'no-update' }
+      })
+    ])
+    expect(rows.every((row) => row.observedAt === undefined)).toBe(true)
+  })
+
+  it('decays live legacy states under a stale parent, as before', () => {
+    const rows = buildLegacyAgentChildRowModels(
+      [
+        { id: 'w', state: 'working', startedAt: 10 },
+        { id: 'q', state: 'waiting', startedAt: 10 },
+        { id: 'i', state: 'idle', startedAt: 10 }
+      ],
+      STALE
+    )
+    expect(rows.map((row) => row.displayState)).toEqual(['unverifiable', 'unverifiable', 'idle'])
+  })
+})
+
+describe('buildLegacyTaskRowModels', () => {
+  it('keeps the state the host decided and says only its reason', () => {
+    const rows = buildLegacyTaskRowModels(
+      [
+        { id: 'w', kind: 'agent', description: 'Review', state: 'working', startedAt: 10 },
+        { id: 'q', kind: 'agent', description: 'Approve', state: 'waiting' },
+        { id: 'u', kind: 'agent', description: 'Lost', state: 'unverifiable' },
+        { id: 'm', kind: 'monitor', description: 'tail -f log' },
+        { id: 'c', kind: 'command', description: 'npm test', stoppable: false }
+      ],
+      [{ id: 'd', kind: 'agent', description: 'Done', totalTokens: 900 }]
+    )
+    expect(rows.map((row) => [row.id, row.displayState, row.detail])).toEqual([
+      ['d', 'done', null],
+      ['w', 'working', null],
+      ['q', 'waiting', { kind: 'reason', state: 'waiting' }],
+      ['u', 'unverifiable', { kind: 'reason', state: 'unverifiable' }],
+      ['m', 'monitoring', null],
+      ['c', 'working', null]
+    ])
+    expect(rows.map((row) => row.canStop)).toEqual([true, true, true, true, true, false])
+    expect(rows[0]).toMatchObject({ settled: true, totalTokens: 900 })
+  })
+
+  it('lets a resumed live task replace its retained settled row', () => {
+    const rows = buildLegacyTaskRowModels(
+      [{ id: 'r', kind: 'agent', state: 'working' }],
+      [{ id: 'r', kind: 'agent', state: 'done' }]
+    )
+    expect(rows).toHaveLength(1)
+    expect(rows[0]).toMatchObject({ settled: false, displayState: 'working' })
+  })
+})
+
+describe('one label rule for every shape a host publishes', () => {
+  it.each(['task', ' Subagent ', 'unknown', '   '])(
+    'skips the placeholder %j on all three',
+    (label) => {
+      const [fromView] = buildAgentChildRowModels(
+        [view('a', { description: label, agentType: 'Explore' })],
+        FRESH
+      )
+      const [fromSnapshot] = buildLegacyAgentChildRowModels(
+        [{ id: 'a', state: 'working', startedAt: 10, description: label, agentType: 'Explore' }],
+        FRESH
+      )
+      const [fromRoster] = buildLegacyTaskRowModels(
+        [{ id: 'a', kind: 'agent', state: 'working', description: label, name: 'Explore' }],
+        []
+      )
+      expect([fromView.name, fromSnapshot.name, fromRoster.name]).toEqual([
+        'Explore',
+        'Explore',
+        'Explore'
+      ])
+    }
+  )
+
+  it('leaves a row with no usable label unnamed on all three', () => {
+    const [fromSnapshot] = buildLegacyAgentChildRowModels(
+      [{ id: 'a', state: 'working', startedAt: 10, description: 'task' }],
+      FRESH
+    )
+    const [fromRoster] = buildLegacyTaskRowModels(
+      [{ id: 'a', kind: 'agent', state: 'working', description: 'task' }],
+      []
+    )
+    expect([only([view('a', { description: 'task', agentType: undefined })]).name]).toEqual([''])
+    expect([fromSnapshot.name, fromRoster.name]).toEqual(['', ''])
+  })
+})
+
+describe('agentChildRowContextForParent: the reader clock', () => {
+  const MIRRORED_PARENT = {
+    // The host's clock runs 20 minutes ahead of this machine's.
+    updatedAt: 1_200_000 + 20 * 60_000,
+    evidenceObservedAt: 1_190_000 + 20 * 60_000,
+    mirroredEvidenceReceivedAt: 1_190_000
+  }
+
+  it("measures a mirrored parent on this machine's receipt clock, never the host's", () => {
+    const context = agentChildRowContextForParent(MIRRORED_PARENT, false)
+    expect(context).toMatchObject({ parentObservedAt: 1_190_000, hostClockOffsetMs: -20 * 60_000 })
+    const [legacy] = buildLegacyAgentChildRowModels(
+      [{ id: 'a', state: 'working', startedAt: 10 }],
+      context
+    )
+    expect(legacy.recencyAt).toBe(1_190_000)
+    // A view's own host stamp moves onto the reader clock; its host-clock age is kept.
+    const [child] = buildAgentChildRowModels(
+      [view('a', { observedAt: 1_100_000 + 20 * 60_000 })],
+      context
+    )
+    expect(child.recencyAt).toBe(1_100_000)
+    expect(child.observedAt).toBe(1_100_000 + 20 * 60_000)
+  })
+
+  it('leaves a parent observed on this machine on its own clock', () => {
+    expect(
+      agentChildRowContextForParent({ updatedAt: 500, evidenceObservedAt: 400 }, true)
+    ).toEqual({
+      parentEvidenceFresh: true,
+      transportObservation: 'live',
+      parentObservedAt: 400,
+      hostClockOffsetMs: 0
+    })
+  })
+})
diff --git a/src/shared/agent-child-row-model.ts b/src/shared/agent-child-row-model.ts
new file mode 100644
index 000000000000..8e1cf606eea1
--- /dev/null
+++ b/src/shared/agent-child-row-model.ts
@@ -0,0 +1,376 @@
+/**
+ * One row model for every surface that lists child work (the sidebar's child rows and the chat
+ * strip), with one builder per shape a host may publish. All three name a row with one label rule
+ * (`usableAgentChildLabel`) and decide what it says with one detail rule (`agentChildRowDetail`):
+ *  - `buildAgentChildRowModels`: the host's child views (`children`), the source of record.
+ *  - `buildLegacyAgentChildRowModels`: the `subagents` snapshot.
+ *  - `buildLegacyTaskRowModels`: the session feed's `tasks` / `settledTasks` roster.
+ *
+ * The two legacy builders exist only for hosts that publish no views, and each is deleted, not
+ * migrated, when its last publisher is gone: the snapshot builder once CLI panes publish
+ * `children` and no supported paired host predates that; the roster builder once no supported
+ * paired host predates child views on the session feed.
+ */
+import type { AgentSessionBackgroundTask } from './agent-session-background-task-wire'
+import type { AgentChildWorkKind } from './agent-status-child-work'
+import { resolveAgentChildWorkFreshness } from './agent-status-child-work-freshness'
+import {
+  agentChildWorkOwnedLiveness,
+  deriveAgentChildDisplayState,
+  type AgentChildDisplayState
+} from './agent-status-child-work-display'
+import type { AgentChildWorkView } from './agent-status-child-work-view'
+import {
+  agentStatusAuthorityObservedAt,
+  agentStatusEvidenceObservedAt
+} from './agent-status-freshness'
+import type { AgentStatusEntry, AgentSubagentSnapshot } from './agent-status-types'
+
+/** What a child row says beside its name. Surfaces format it; they never decide it. */
+export type AgentChildRowDetail =
+  /** The tool the child is running now, as `tool: input` — the line a CLI agent row shows. */
+  | { kind: 'operation'; toolName: string; input?: string }
+  /** Its own work is over and only work it owns still runs; the tool line is stale. */
+  | { kind: 'monitoring' }
+  | { kind: 'message'; text: string }
+  /** Settled, and the lane cannot say how. */
+  | { kind: 'ended' }
+  /** How long since the last evidence for this child (see `recencyAt`). */
+  | { kind: 'no-update' }
+  /** The child's role, when nothing more specific is known. */
+  | { kind: 'role'; agentType: string }
+  /** A host that publishes only a run state: that state's reason word. */
+  | { kind: 'reason'; state: 'waiting' | 'blocked' | 'unverifiable' }
+
+/** One child row, for every surface that lists child work (sidebar and chat strip). */
+export type AgentChildRowModel = {
+  /** Row identity: the host's child id, or the provider id an old host names it by. */
+  id: string
+  /** The id a targeted stop names; absent when the host holds none. */
+  providerId?: string
+  kind: AgentChildWorkKind
+  displayState: AgentChildDisplayState
+  /** '' when the child reported no label; a surface then names the row by its state. */
+  name: string
+  agentType?: string
+  model?: string
+  detail: AgentChildRowDetail | null
+  /** When the child was first seen: the elapsed anchor. */
+  firstObservedAt: number
+  /** Last evidence for THIS child. Absent from a host that reports none. */
+  observedAt?: number
+  /** The reader-clock time a "no update" reading measures from: the child's own evidence, else
+   *  its parent's. */
+  recencyAt: number
+  settledAt?: number
+  totalTokens?: number
+  canStop: boolean
+  settled: boolean
+  /** Work this child owns (a nested agent, a shell it launched), in host order. */
+  owned: AgentChildRowModel[]
+}
+
+export type AgentChildRowContext = {
+  /** A stale parent makes every live claim beneath it unverifiable. */
+  parentEvidenceFresh: boolean
+  transportObservation: 'live' | 'unverifiable'
+  /** The parent's last evidence on the READER's clock (its receipt time when mirrored from another
+   *  host): recency for a child whose host reports no clock of its own. */
+  parentObservedAt: number
+  /** Reader clock minus the host's, at that evidence; 0 for a parent observed on this machine. Moves
+   *  a child's host-stamped clock onto the reader's, so no age subtracts across two machines. */
+  hostClockOffsetMs: number
+}
+
+/** The context a parent row gives its children. Every surface that lists one parent's children
+ *  builds it here, from the same parent row, so a lost child reads the same everywhere. */
+export function agentChildRowContextForParent(
+  parent: Pick<
+    AgentStatusEntry,
+    'updatedAt' | 'evidenceObservedAt' | 'mirroredEvidenceReceivedAt' | 'subagentObservation'
+  >,
+  parentEvidenceFresh: boolean
+): AgentChildRowContext {
+  // The parent row decays on this same clock, so a child's silence reads the same as its parent's.
+  const parentObservedAt = agentStatusEvidenceObservedAt(parent)
+  return {
+    parentEvidenceFresh,
+    transportObservation: parent.subagentObservation ?? 'live',
+    parentObservedAt,
+    hostClockOffsetMs: parentObservedAt - agentStatusAuthorityObservedAt(parent)
+  }
+}
+
+/** Provider strings that carry no identity; the next label wins. */
+const PLACEHOLDER_LABELS = new Set(['unknown', 'untitled', 'task', 'subagent'])
+
+/** A provider label that names the child, or undefined for an empty or placeholder one. */
+export function usableAgentChildLabel(value: string | undefined): string | undefined {
+  const trimmed = value?.trim()
+  return trimmed && !PLACEHOLDER_LABELS.has(trimmed.toLowerCase()) ? trimmed : undefined
+}
+
+// A live claim beneath a parent Orca no longer hears from asserts nothing; settled history stands.
+function withFreshness(
+  displayState: AgentChildDisplayState,
+  context: AgentChildRowContext
+): AgentChildDisplayState {
+  if (
+    displayState === 'done' ||
+    displayState === 'failed' ||
+    displayState === 'interrupted' ||
+    displayState === 'idle'
+  ) {
+    return displayState
+  }
+  return resolveAgentChildWorkFreshness({
+    state: displayState,
+    membership: 'live',
+    parentEvidenceFresh: context.parentEvidenceFresh,
+    transportObservation: context.transportObservation
+  })
+}
+
+type AgentChildRowDetailSource = {
+  /** `run-state`: the host reported only the child's run state (the legacy task roster). */
+  evidence: 'child' | 'run-state'
+  kind: AgentChildWorkKind
+  name: string
+  agentType?: string
+  operation?: { toolName: string; input?: string }
+  lastMessage?: string
+  settled: boolean
+}
+
+// A role that restates the name adds nothing.
+function roleDetail(source: AgentChildRowDetailSource): AgentChildRowDetail | null {
+  if (source.kind !== 'agent') {
+    return null
+  }
+  const agentType = source.agentType ?? 'unknown'
+  return source.name.trim() === agentType.trim() ? null : { kind: 'role', agentType }
+}
+
+function messageOrRole(source: AgentChildRowDetailSource): AgentChildRowDetail | null {
+  const text = source.lastMessage?.trim()
+  return text ? { kind: 'message', text } : roleDetail(source)
+}
+
+/** The one rule for what a child row says, in the order a CLI agent row decides it. */
+function agentChildRowDetail(
+  source: AgentChildRowDetailSource,
+  displayState: AgentChildDisplayState
+): AgentChildRowDetail | null {
+  if (source.evidence === 'run-state') {
+    return displayState === 'waiting' ||
+      displayState === 'blocked' ||
+      displayState === 'unverifiable'
+      ? { kind: 'reason', state: displayState }
+      : null
+  }
+  switch (displayState) {
+    case 'unverifiable':
+      return { kind: 'no-update' }
+    case 'monitoring':
+      // A shell or monitor names itself; only an agent's own tool line goes stale.
+      return source.kind === 'agent' ? { kind: 'monitoring' } : null
+    case 'working':
+    case 'waiting':
+      return source.operation
+        ? {
+            kind: 'operation',
+            toolName: source.operation.toolName,
+            ...(source.operation.input !== undefined ? { input: source.operation.input } : {})
+          }
+        : messageOrRole(source)
+    case 'blocked':
+    case 'done':
+    case 'failed':
+      return messageOrRole(source)
+    case 'interrupted':
+      return roleDetail(source)
+    case 'idle':
+      return source.settled ? { kind: 'ended' } : roleDetail(source)
+  }
+}
+
+function viewName(view: AgentChildWorkView): string {
+  return (
+    usableAgentChildLabel(view.description) ??
+    usableAgentChildLabel(view.name) ??
+    usableAgentChildLabel(view.agentType) ??
+    ''
+  )
+}
+
+function rowFromView(
+  view: AgentChildWorkView,
+  views: readonly AgentChildWorkView[],
+  ownedByOwner: ReadonlyMap<string, AgentChildWorkView[]>,
+  context: AgentChildRowContext,
+  path: ReadonlySet<string>
+): AgentChildRowModel {
+  const displayState = withFreshness(
+    deriveAgentChildDisplayState(view, agentChildWorkOwnedLiveness(views, view.id)),
+    context
+  )
+  const settled = view.membership === 'settled'
+  const name = viewName(view)
+  const nextPath = new Set(path).add(view.id)
+  return {
+    id: view.id,
+    ...(view.providerId !== undefined ? { providerId: view.providerId } : {}),
+    kind: view.kind,
+    displayState,
+    name,
+    ...(view.agentType !== undefined ? { agentType: view.agentType } : {}),
+    ...(view.model !== undefined ? { model: view.model } : {}),
+    detail: agentChildRowDetail(
+      {
+        evidence: 'child',
+        kind: view.kind,
+        name,
+        agentType: view.agentType,
+        operation: view.operation,
+        lastMessage: view.lastMessage,
+        settled
+      },
+      displayState
+    ),
+    firstObservedAt: view.firstObservedAt,
+    observedAt: view.observedAt,
+    recencyAt: view.observedAt + context.hostClockOffsetMs,
+    ...(view.settledAt !== undefined ? { settledAt: view.settledAt } : {}),
+    ...(view.totalTokens !== undefined ? { totalTokens: view.totalTokens } : {}),
+    canStop: !settled && view.stoppable && view.providerId !== undefined,
+    settled,
+    owned: (ownedByOwner.get(view.id) ?? [])
+      .filter((owned) => !nextPath.has(owned.id))
+      .map((owned) => rowFromView(owned, views, ownedByOwner, context, nextPath))
+  }
+}
+
+/**
+ * Child rows from the host's views: the main agent's children at the top, and everything a child
+ * owns nested beneath it. Display state comes from the shared child fold, so a finished subagent
+ * whose shell still runs reads `monitoring` exactly as a CLI agent does.
+ */
+export function buildAgentChildRowModels(
+  views: readonly AgentChildWorkView[],
+  context: AgentChildRowContext
+): AgentChildRowModel[] {
+  const ownedByOwner = new Map<string, AgentChildWorkView[]>()
+  for (const view of views) {
+    if (view.parentChildWorkId !== undefined) {
+      ownedByOwner.set(view.parentChildWorkId, [
+        ...(ownedByOwner.get(view.parentChildWorkId) ?? []),
+        view
+      ])
+    }
+  }
+  return views
+    .filter((view) => view.parentChildWorkId === undefined)
+    .map((view) => rowFromView(view, views, ownedByOwner, context, new Set()))
+}
+
+/**
+ * Child rows from a host that sends only the legacy `subagents` snapshot (an old host, or any CLI
+ * pane): live agents with a lifecycle state and a spawn time, and no clock of their own.
+ */
+export function buildLegacyAgentChildRowModels(
+  subagents: readonly AgentSubagentSnapshot[],
+  context: AgentChildRowContext
+): AgentChildRowModel[] {
+  return subagents.map((subagent) => {
+    const displayState = withFreshness(
+      deriveAgentChildDisplayState({ state: subagent.state, membership: 'live' }, null),
+      context
+    )
+    const name =
+      usableAgentChildLabel(subagent.description) ?? usableAgentChildLabel(subagent.agentType) ?? ''
+    return {
+      id: subagent.id,
+      providerId: subagent.id,
+      kind: 'agent',
+      displayState,
+      name,
+      ...(subagent.agentType !== undefined ? { agentType: subagent.agentType } : {}),
+      ...(subagent.model !== undefined ? { model: subagent.model } : {}),
+      detail: agentChildRowDetail(
+        { evidence: 'child', kind: 'agent', name, agentType: subagent.agentType, settled: false },
+        displayState
+      ),
+      firstObservedAt: subagent.startedAt,
+      recencyAt: context.parentObservedAt,
+      canStop: false,
+      settled: false,
+      owned: []
+    }
+  })
+}
+
+function legacyTaskDisplayState(
+  task: AgentSessionBackgroundTask,
+  settled: boolean
+): AgentChildDisplayState {
+  if (task.state) {
+    return task.state
+  }
+  if (settled) {
+    return 'done'
+  }
+  return task.kind === 'monitor' ? 'monitoring' : 'working'
+}
+
+// The host decided each row's state; the row keeps it.
+function legacyTaskRow(task: AgentSessionBackgroundTask, settled: boolean): AgentChildRowModel {
+  const displayState = legacyTaskDisplayState(task, settled)
+  const name = usableAgentChildLabel(task.description) ?? usableAgentChildLabel(task.name) ?? ''
+  const startedAt = task.startedAt ?? 0
+  return {
+    id: task.id,
+    providerId: task.id,
+    kind: task.kind,
+    displayState,
+    name,
+    detail: agentChildRowDetail(
+      { evidence: 'run-state', kind: task.kind, name, settled },
+      displayState
+    ),
+    firstObservedAt: startedAt,
+    recencyAt: startedAt,
+    ...(task.totalTokens !== undefined ? { totalTokens: task.totalTokens } : {}),
+    // Absent means stoppable: a host predating the field published only rows its stop could act on.
+    canStop: task.stoppable !== false,
+    settled,
+    owned: []
+  }
+}
+
+/**
+ * Rows from a host that publishes only the session feed's task roster (a host predating child
+ * views): flat, each with the run state the host decided and no clock beyond its start.
+ */
+export function buildLegacyTaskRowModels(
+  tasks: readonly AgentSessionBackgroundTask[],
+  settledTasks: readonly AgentSessionBackgroundTask[]
+): AgentChildRowModel[] {
+  // Older hosts can retain a previous turn beside its resumed live task; the live row wins.
+  const rows = new Map<string, AgentChildRowModel>()
+  for (const [roster, settled] of [
+    [settledTasks, true],
+    [tasks, false]
+  ] as const) {
+    for (const task of roster) {
+      rows.set(task.id, legacyTaskRow(task, settled))
+    }
+  }
+  return [...rows.values()]
+}
+
+/** Every row of a tree, owners before what they own. */
+export function flattenAgentChildRowModels(
+  rows: readonly AgentChildRowModel[]
+): AgentChildRowModel[] {
+  return rows.flatMap((row) => [row, ...flattenAgentChildRowModels(row.owned)])
+}
diff --git a/src/shared/agent-completion-time.ts b/src/shared/agent-completion-time.ts
index 4b7ea78c430f..a0794139b62c 100644
--- a/src/shared/agent-completion-time.ts
+++ b/src/shared/agent-completion-time.ts
@@ -1,9 +1,10 @@
 import type { AgentStateHistoryEntry, AgentStatusEntry } from './agent-status-types'
+import { agentTurnStoppedByUser } from './agent-main-agent-verdict'
 
 /** The subset of a hook entry a completion time is derived from. */
 export type AgentCompletionSource = Pick<
   AgentStatusEntry,
-  'state' | 'stateStartedAt' | 'stateHistory' | 'interrupted' | 'sessionBoundary'
+  'state' | 'stateStartedAt' | 'stateHistory' | 'interrupted' | 'mainAgent' | 'sessionBoundary'
 >
 
 function mostRecentCompletedTurnInHistory(
@@ -13,7 +14,7 @@ function mostRecentCompletedTurnInHistory(
   for (const row of history ?? []) {
     if (
       row.state === 'done' &&
-      row.interrupted !== true &&
+      !agentTurnStoppedByUser(row) &&
       Number.isFinite(row.startedAt) &&
       row.startedAt > max
     ) {
@@ -29,11 +30,11 @@ function mostRecentCompletedTurnInHistory(
  * can't rank as freshly done while showing an age past the staleness threshold.
  *
  * A completion is only:
- *   - a non-interrupted `done` (its `stateStartedAt` — unmoved by same-state tool/prompt pings); or
+ *   - a `done` the user did not stop, failures included (its `stateStartedAt` — unmoved by same-state tool/prompt pings); or
  *   - for a session-boundary `done` (connected idle, not a turn), the real completion it displaced.
  */
 export function agentEntryCompletionAt(entry: AgentCompletionSource): number | null {
-  if (entry.state !== 'done' || entry.interrupted === true) {
+  if (entry.state !== 'done' || agentTurnStoppedByUser(entry)) {
     return null
   }
   if (entry.sessionBoundary === true) {
diff --git a/src/shared/agent-headless-command.ts b/src/shared/agent-headless-command.ts
index 3ce26e949c37..9f742a5355d1 100644
--- a/src/shared/agent-headless-command.ts
+++ b/src/shared/agent-headless-command.ts
@@ -1,4 +1,7 @@
+import { isCodebuddyNonInteractiveCommand } from './codebuddy-headless-command'
+import { isQoderHeadlessCommand } from './qoder-headless-command'
 import { isAnteHeadlessOneShotCommand } from './ante-headless-command'
+import { isDshNonInteractiveCommand } from './dsh-launch-command'
 import { isMuseHeadlessOneShotCommand } from './muse-headless-command'
 import { isZCodeHeadlessOneShotCommand } from './zcode-headless-command'
 import { isPrimeAgentHeadlessOneShotCommand } from './prime-agent-headless-command'
@@ -8,16 +11,21 @@ import type { TuiAgent } from './tui-agent'
 // Why: a table (not an if-chain) so adding an agent is one entry; Claude and Trae share
 // the same `--print` one-shot contract, Ante's `--prompt` form, Prime Agent's
 // `--mode` forms, Muse's `exec` subcommand, and ZCode's `--prompt`/`--target` forms need
-// their own matchers.
+// their own matchers. DSH's entry is wider than a one-shot: `dsh` also boots a web server
+// and JSON-RPC stdio profiles, and none of those can answer a prompt in the pane either,
+// which is what this table gates.
 const HEADLESS_ONE_SHOT_MATCHERS: Partial<
   Record<TuiAgent, (tokens: readonly string[]) => boolean>
 > = {
+  qoder: isQoderHeadlessCommand,
   claude: isPrintModeHeadlessOneShotCommand,
+  codebuddy: isCodebuddyNonInteractiveCommand,
   trae: isPrintModeHeadlessOneShotCommand,
   'prime-agent': isPrimeAgentHeadlessOneShotCommand,
   ante: isAnteHeadlessOneShotCommand,
   muse: isMuseHeadlessOneShotCommand,
-  zcode: isZCodeHeadlessOneShotCommand
+  zcode: isZCodeHeadlessOneShotCommand,
+  dsh: isDshNonInteractiveCommand
 }
 
 export function isHeadlessOneShotAgentCommand(agent: TuiAgent, tokens: readonly string[]): boolean {
diff --git a/src/shared/agent-hook-listener/provider-dispatch.ts b/src/shared/agent-hook-listener/provider-dispatch.ts
index d3abd287e89f..ab7e847c4cad 100644
--- a/src/shared/agent-hook-listener/provider-dispatch.ts
+++ b/src/shared/agent-hook-listener/provider-dispatch.ts
@@ -1,3 +1,5 @@
+import { normalizeCompatibleLifecycleEvent } from './providers/compatible-lifecycle-events'
+import { normalizeQoderEvent } from './providers/qoder-events'
 import type { ParsedAgentStatusPayload } from '../agent-status-types'
 import type { AgentHookSource } from '../agent-hook-relay'
 import { readLastCommandCodeUserPromptEntryFromTranscript } from './command-code-transcript'
@@ -23,6 +25,7 @@ import { normalizeHermesEvent } from './providers/hermes-events'
 import { normalizeDevinEvent } from './providers/devin-events'
 import { normalizeKimiEvent } from './providers/kimi-events'
 import { normalizeMuseEvent } from './providers/muse-events'
+import { normalizeDshEvent } from './providers/dsh-events'
 import { normalizeZCodeEvent } from './providers/zcode-events'
 
 export type ProviderDispatchResult = {
@@ -51,6 +54,16 @@ export function normalizeProviderEvent(input: {
   let payload: ParsedAgentStatusPayload | null
 
   switch (source) {
+    case 'codebuddy':
+      payload = normalizeCompatibleLifecycleEvent(
+        source,
+        state,
+        eventName,
+        promptText,
+        paneKey,
+        hookPayload
+      )
+      break
     case 'claude':
       payload = normalizeClaudeEvent(state, eventName, promptText, paneKey, hookPayload)
       break
@@ -148,12 +161,18 @@ export function normalizeProviderEvent(input: {
     case 'devin':
       payload = normalizeDevinEvent(state, eventName, promptText, paneKey, hookPayload)
       break
+    case 'qoder':
+      payload = normalizeQoderEvent(state, eventName, promptText, paneKey, hookPayload)
+      break
     case 'kimi':
       payload = normalizeKimiEvent(state, eventName, promptText, paneKey, hookPayload)
       break
     case 'muse':
       payload = normalizeMuseEvent(state, eventName, promptText, paneKey, hookPayload)
       break
+    case 'dsh':
+      payload = normalizeDshEvent(state, eventName, promptText, paneKey, hookPayload)
+      break
     case 'zcode':
       payload = normalizeZCodeEvent(state, eventName, promptText, paneKey, hookPayload)
       break
diff --git a/src/shared/agent-hook-listener/provider-event-routing.ts b/src/shared/agent-hook-listener/provider-event-routing.ts
index f9dc1e6d5d7a..80cd0fdc91c9 100644
--- a/src/shared/agent-hook-listener/provider-event-routing.ts
+++ b/src/shared/agent-hook-listener/provider-event-routing.ts
@@ -25,16 +25,22 @@ import { extractHermesToolFields } from './providers/hermes-tool-fields'
 export function isNewTurnEvent(source: AgentHookSource, eventName: unknown): boolean {
   // Why: exhaustive switch so a new AgentHookSource fails typecheck here instead of falling through to false.
   switch (source) {
+    case 'qoder':
     case 'claude':
       // Why: SessionStart lands an idle row (STA-3386) and must also drop stale
       // tool/prompt caches left by the pane's previous session.
       return eventName === 'SessionStart' || eventName === 'UserPromptSubmit'
+    case 'codebuddy':
     case 'kimi':
       // Why: Kimi Code emits Claude-compatible hook events, so UserPromptSubmit is its new-turn boundary too.
       return eventName === 'UserPromptSubmit'
     case 'muse':
       // Muse uses Claude-compatible lifecycle events.
       return eventName === 'UserPromptSubmit'
+    case 'dsh':
+      // Why: DSH's Claude-Code hook bridge fires SessionStart once per session before the
+      // first turn, which is the point stale tool/prompt caches from a reused pane must go.
+      return eventName === 'SessionStart' || eventName === 'UserPromptSubmit'
     case 'zcode':
       // Why: matches Codex/Claude — SessionStart lands an idle boundary row and drops stale
       // tool/prompt caches, while UserPromptSubmit is the actual turn boundary.
@@ -134,13 +140,18 @@ export function extractToolFields(
 ): ToolSnapshot {
   // Why: exhaustive switch so a new AgentHookSource fails typecheck here instead of silently routing through OpenCode's extractor.
   switch (source) {
+    case 'qoder':
     case 'claude':
     // Why: Kimi Code uses Claude's tool_name/tool_input payload fields verbatim.
     // falls through
+    case 'codebuddy':
     case 'kimi':
     // Muse uses Claude-compatible tool fields.
     // falls through
     case 'muse':
+    // DSH's own Claude-Code hook bridge emits Claude's tool_name/tool_input verbatim.
+    // falls through
+    case 'dsh':
     // Why: ZCode's hook runner writes Claude's `tool_name`/`tool_input`/`tool_response` aliases.
     // falls through
     case 'zcode':
diff --git a/src/shared/agent-hook-listener/providers/compatible-lifecycle-events.ts b/src/shared/agent-hook-listener/providers/compatible-lifecycle-events.ts
new file mode 100644
index 000000000000..2678dfc5e1ea
--- /dev/null
+++ b/src/shared/agent-hook-listener/providers/compatible-lifecycle-events.ts
@@ -0,0 +1,104 @@
+import { isAskUserQuestionTool } from '../../agent-question-answered-intent'
+import {
+  normalizeAgentStatusPayload,
+  type ParsedAgentStatusPayload
+} from '../../agent-status-types'
+import type { HookListenerState } from '../listener-state'
+import {
+  resolvePrompt,
+  resolveToolState,
+  shouldIgnoreCompactContinuationUserPromptSubmit
+} from '../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
+import { readString } from '../tool-input-preview'
+
+function readCompatibleState(
+  eventName: unknown,
+  payload: Record<string, unknown>
+): 'working' | 'waiting' | 'done' | null {
+  switch (eventName) {
+    case 'SessionStart':
+      // Compaction restarts the session during an active turn.
+      return ['startup', 'resume', 'clear', 'new'].includes(String(payload.source)) ? 'done' : null
+    case 'UserPromptSubmit':
+    case 'PostToolUse':
+    case 'PostToolUseFailure':
+      return 'working'
+    case 'PreToolUse':
+      return isAskUserQuestionTool(readString(payload, 'tool_name')) ? 'waiting' : 'working'
+    case 'PermissionRequest':
+      return 'waiting'
+    case 'Stop':
+    case 'StopFailure':
+    case 'SessionEnd':
+      return 'done'
+    case 'PostCompact':
+      return payload.trigger === 'manual' ? 'done' : null
+    case 'Notification':
+      if (
+        payload.notification_type === 'permission_prompt' ||
+        payload.notification_type === 'elicitation_dialog'
+      ) {
+        return 'waiting'
+      }
+      return payload.notification_type === 'idle_prompt' ? 'done' : null
+    default:
+      return null
+  }
+}
+
+export function normalizeCompatibleLifecycleEvent(
+  source: 'qoder' | 'codebuddy',
+  state: HookListenerState,
+  eventName: unknown,
+  promptText: string,
+  paneKey: string,
+  hookPayload: Record<string, unknown>
+): ParsedAgentStatusPayload | null {
+  if (shouldIgnoreCompactContinuationUserPromptSubmit(eventName, promptText)) {
+    return null
+  }
+  // CodeBuddy emits SessionStart after UserPromptSubmit, so it cannot settle a turn.
+  if (source === 'codebuddy' && eventName === 'SessionStart') {
+    return null
+  }
+  const stateName =
+    source === 'codebuddy' && eventName === 'PreToolUse'
+      ? 'working'
+      : readCompatibleState(eventName, hookPayload)
+  if (!stateName) {
+    return null
+  }
+  const resetOnNewTurn = isNewTurnEvent(source, eventName)
+  const toolFields = extractToolFields(source, eventName, hookPayload)
+  if (
+    source === 'codebuddy' &&
+    eventName === 'Notification' &&
+    hookPayload.notification_type === 'permission_prompt' &&
+    hookPayload.message === 'needs your permission to use AskUserQuestion'
+  ) {
+    toolFields.toolName = 'AskUserQuestion'
+  }
+  const snapshot = resolveToolState(state, paneKey, toolFields, { resetOnNewTurn })
+  return normalizeAgentStatusPayload({
+    state: stateName,
+    agentType: source,
+    prompt: resolvePrompt(
+      state,
+      paneKey,
+      source === 'codebuddy' && eventName === 'Notification' ? '' : promptText,
+      { resetOnNewTurn }
+    ),
+    toolName: snapshot.toolName,
+    toolInput: snapshot.toolInput,
+    interactivePrompt: snapshot.interactivePrompt,
+    lastAssistantMessage: snapshot.lastAssistantMessage,
+    lastAssistantMessageIsToolOutput: snapshot.lastAssistantMessageIsToolOutput,
+    sessionBoundary: eventName === 'SessionStart' || eventName === 'PostCompact' ? true : undefined,
+    interrupted: eventName === 'Stop' && hookPayload.is_interrupt === true ? true : undefined,
+    mainAgent:
+      eventName === 'StopFailure'
+        ? { state: 'done', outcome: 'failure', stateStartedAt: Date.now() }
+        : undefined
+  })
+}
diff --git a/src/shared/agent-hook-listener/providers/dsh-events.test.ts b/src/shared/agent-hook-listener/providers/dsh-events.test.ts
new file mode 100644
index 000000000000..b552018845d1
--- /dev/null
+++ b/src/shared/agent-hook-listener/providers/dsh-events.test.ts
@@ -0,0 +1,122 @@
+import { beforeEach, describe, expect, it } from 'vitest'
+import { createHookListenerState, type HookListenerState } from '../listener-state'
+import { normalizeAndAccept } from '../../agent-hook-listener-test-harness'
+
+// Payload shape copied from a live run of @deepseek-ai/dsh-hooks-claude-code 0.1.5-rc.3
+// mounted through $DSH_HOME/cordis.patch.yml: `session_id`, an always-empty
+// `transcript_path`, `cwd`, `hook_event_name`, plus the per-event fields.
+const SESSION_ID = '9478e2d8-29bc-4009-ab32-657efa2bd763'
+const CHILD_SESSION_ID = 'b1c4fb80-4f12-4a6f-9a68-7c0d5f0f5a12'
+
+const base = { transcript_path: '', cwd: '/tmp/ws', session_id: SESSION_ID }
+
+function event(name: string, extra: Record<string, unknown> = {}): Record<string, unknown> {
+  return { ...base, hook_event_name: name, ...extra }
+}
+
+describe('normalizeDshEvent', () => {
+  let state: HookListenerState
+
+  beforeEach(() => {
+    state = createHookListenerState()
+  })
+
+  it('reports a prompt as working and a stop as done', () => {
+    const submitted = normalizeAndAccept(
+      state,
+      'dsh',
+      event('UserPromptSubmit', { prompt: 'fix the flaky test' })
+    )
+    expect(submitted?.payload.state).toBe('working')
+    expect(submitted?.payload.agentType).toBe('dsh')
+    expect(submitted?.payload.prompt).toBe('fix the flaky test')
+
+    const stopped = normalizeAndAccept(state, 'dsh', event('Stop', { stop_hook_active: false }))
+    expect(stopped?.payload.state).toBe('done')
+    // The prompt is carried across the turn so a finished row still names the work.
+    expect(stopped?.payload.prompt).toBe('fix the flaky test')
+  })
+
+  it('lands an idle row on SessionStart', () => {
+    const started = normalizeAndAccept(state, 'dsh', event('SessionStart', { source: 'startup' }))
+    expect(started?.payload.state).toBe('done')
+    expect(started?.payload.agentType).toBe('dsh')
+  })
+
+  it('treats an ordinary tool as working and surfaces its name', () => {
+    normalizeAndAccept(state, 'dsh', event('UserPromptSubmit', { prompt: 'read the readme' }))
+    const pre = normalizeAndAccept(
+      state,
+      'dsh',
+      event('PreToolUse', {
+        tool_name: 'read',
+        tool_input: { path: 'README.md' },
+        tool_use_id: 'call-1'
+      })
+    )
+    expect(pre?.payload.state).toBe('working')
+    expect(pre?.payload.toolName).toBe('read')
+  })
+
+  it('reports ask_user_question as waiting and its answer as working again', () => {
+    normalizeAndAccept(state, 'dsh', event('UserPromptSubmit', { prompt: 'pick a colour' }))
+    const asked = normalizeAndAccept(
+      state,
+      'dsh',
+      event('PreToolUse', {
+        tool_name: 'ask_user_question',
+        tool_input: {
+          questions: [{ header: 'Colour', question: 'Which one?', options: [{ label: 'Blue' }] }]
+        },
+        tool_use_id: 'call-2'
+      })
+    )
+    // Why this matters: DSH's bridge has no Notification/PermissionRequest event, so the
+    // ask-the-user tool is the only structured signal that a pane needs the user.
+    expect(asked?.payload.state).toBe('waiting')
+    expect(asked?.payload.interactivePrompt).toContain('Which one?')
+
+    const answered = normalizeAndAccept(
+      state,
+      'dsh',
+      event('PostToolUse', {
+        tool_name: 'ask_user_question',
+        tool_use_id: 'call-2',
+        tool_response: 'Blue'
+      })
+    )
+    expect(answered?.payload.state).toBe('working')
+  })
+
+  it('ignores subagent lifecycle events', () => {
+    normalizeAndAccept(state, 'dsh', event('UserPromptSubmit', { prompt: 'delegate this' }))
+    const done = normalizeAndAccept(state, 'dsh', event('Stop', {}))
+    expect(done?.payload.state).toBe('done')
+
+    // The bridge stamps the CHILD's session id and a constant `general-purpose` agent_type
+    // on both subagent events, so a child that outlives the lead's Stop would otherwise
+    // flip the finished pane back to working (the Muse regression in #22216).
+    for (const name of ['SubagentStart', 'SubagentStop']) {
+      expect(
+        normalizeAndAccept(state, 'dsh', {
+          ...base,
+          session_id: CHILD_SESSION_ID,
+          hook_event_name: name,
+          agent_id: 'agent-7',
+          agent_type: 'general-purpose'
+        })
+      ).toBeNull()
+    }
+  })
+
+  it('ignores events the bridge cannot send', () => {
+    // Notification and PermissionRequest are Claude-only; if one ever arrives it is not
+    // from this bridge, and guessing a state from it would be unfounded.
+    expect(
+      normalizeAndAccept(state, 'dsh', event('Notification', { message: 'waiting' }))
+    ).toBeNull()
+    expect(
+      normalizeAndAccept(state, 'dsh', event('PermissionRequest', { tool_name: 'bash' }))
+    ).toBeNull()
+  })
+})
diff --git a/src/shared/agent-hook-listener/providers/dsh-events.ts b/src/shared/agent-hook-listener/providers/dsh-events.ts
new file mode 100644
index 000000000000..670cba55c17d
--- /dev/null
+++ b/src/shared/agent-hook-listener/providers/dsh-events.ts
@@ -0,0 +1,84 @@
+import { isAskUserQuestionTool } from '../../agent-question-answered-intent'
+import {
+  normalizeAgentStatusPayload,
+  type ParsedAgentStatusPayload
+} from '../../agent-status-types'
+import type { HookListenerState } from '../listener-state'
+import {
+  resolvePrompt,
+  resolveToolState,
+  shouldIgnoreCompactContinuationUserPromptSubmit
+} from '../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
+import { readString } from '../tool-input-preview'
+
+/**
+ * DeepSeek Harness reaches Orca through its own `@deepseek-ai/dsh-hooks-claude-code`
+ * bridge, so the payloads are Claude-shaped (`session_id`, `tool_name`, `tool_input`,
+ * `tool_use_id`, `prompt`) and the event names are a strict subset of Claude's:
+ * SessionStart, UserPromptSubmit, PreToolUse, PostToolUse, Stop, SubagentStart and
+ * SubagentStop. There is no Notification and no PermissionRequest.
+ *
+ * That missing pair is why the waiting state is read from the tool instead: DSH asks the
+ * user through `ask_user_question` (`@deepseek-ai/dsh-tool-ask-user`), whose PreToolUse
+ * fires while the question card owns the screen and whose PostToolUse only lands once the
+ * user answers. An approval pause has no hook of its own and reads as `working`, which is
+ * the honest answer — the harness is mid-tool, not idle.
+ */
+export function normalizeDshEvent(
+  state: HookListenerState,
+  eventName: unknown,
+  promptText: string,
+  paneKey: string,
+  hookPayload: Record<string, unknown>
+): ParsedAgentStatusPayload | null {
+  if (shouldIgnoreCompactContinuationUserPromptSubmit(eventName, promptText)) {
+    return null
+  }
+
+  // Why: the bridge stamps the *child's* session id on both subagent events and labels
+  // every child `general-purpose`, so a child turn cannot be told from the lead's. Muse
+  // (#22216) showed what that costs: child hooks flip a finished pane back to working.
+  if (eventName === 'SubagentStart' || eventName === 'SubagentStop') {
+    return null
+  }
+
+  const toolName = readString(hookPayload, 'tool_name')
+
+  let stateName: 'working' | 'waiting' | 'done'
+  switch (eventName) {
+    case 'UserPromptSubmit':
+    case 'PostToolUse':
+      stateName = 'working'
+      break
+    case 'PreToolUse':
+      stateName = isAskUserQuestionTool(toolName) ? 'waiting' : 'working'
+      break
+    case 'SessionStart':
+    case 'Stop':
+      stateName = 'done'
+      break
+    default:
+      return null
+  }
+
+  const snapshot = resolveToolState(
+    state,
+    paneKey,
+    extractToolFields('dsh', eventName, hookPayload),
+    { resetOnNewTurn: isNewTurnEvent('dsh', eventName) }
+  )
+
+  return normalizeAgentStatusPayload({
+    state: stateName,
+    prompt: resolvePrompt(state, paneKey, promptText, {
+      resetOnNewTurn: isNewTurnEvent('dsh', eventName)
+    }),
+    agentType: 'dsh',
+    toolName: snapshot.toolName,
+    toolInput: snapshot.toolInput,
+    interactivePrompt: snapshot.interactivePrompt,
+    lastAssistantMessage: snapshot.lastAssistantMessage,
+    lastAssistantMessageIsToolOutput: snapshot.lastAssistantMessageIsToolOutput
+  })
+}
diff --git a/src/shared/agent-hook-listener/providers/qoder-events.ts b/src/shared/agent-hook-listener/providers/qoder-events.ts
new file mode 100644
index 000000000000..c83923d58f74
--- /dev/null
+++ b/src/shared/agent-hook-listener/providers/qoder-events.ts
@@ -0,0 +1,19 @@
+import { normalizeCompatibleLifecycleEvent } from './compatible-lifecycle-events'
+import type { HookListenerState } from '../listener-state'
+
+export function normalizeQoderEvent(
+  state: HookListenerState,
+  eventName: unknown,
+  promptText: string,
+  paneKey: string,
+  hookPayload: Record<string, unknown>
+) {
+  return normalizeCompatibleLifecycleEvent(
+    'qoder',
+    state,
+    eventName,
+    promptText,
+    paneKey,
+    hookPayload
+  )
+}
diff --git a/src/shared/agent-hook-listener/source-routing.ts b/src/shared/agent-hook-listener/source-routing.ts
index e84313b0c261..2940685665c4 100644
--- a/src/shared/agent-hook-listener/source-routing.ts
+++ b/src/shared/agent-hook-listener/source-routing.ts
@@ -5,6 +5,8 @@ import type { AgentHookSource } from '../agent-hook-relay'
 export const HOOK_SOURCE_BY_PATHNAME: Readonly<Record<string, AgentHookSource>> = Object.freeze({
   '/hook/claude': 'claude',
   '/hook/codex': 'codex',
+  '/hook/qoder': 'qoder',
+  '/hook/codebuddy': 'codebuddy',
   '/hook/gemini': 'gemini',
   '/hook/antigravity': 'antigravity',
   '/hook/amp': 'amp',
@@ -23,7 +25,8 @@ export const HOOK_SOURCE_BY_PATHNAME: Readonly<Record<string, AgentHookSource>>
   '/hook/devin': 'devin',
   '/hook/kimi': 'kimi',
   '/hook/muse': 'muse',
-  '/hook/zcode': 'zcode'
+  '/hook/zcode': 'zcode',
+  '/hook/dsh': 'dsh'
 })
 
 export function resolveHookSource(pathname: string): AgentHookSource | null {
diff --git a/src/shared/agent-hook-relay.ts b/src/shared/agent-hook-relay.ts
index cc5d21ba8f72..bb2dca99f729 100644
--- a/src/shared/agent-hook-relay.ts
+++ b/src/shared/agent-hook-relay.ts
@@ -37,6 +37,8 @@ import type { AgentHookTarget } from './agent-hook-types'
 const AGENT_HOOK_SOURCES = [
   'claude',
   'codex',
+  'qoder',
+  'codebuddy',
   'gemini',
   'antigravity',
   'amp',
@@ -55,7 +57,8 @@ const AGENT_HOOK_SOURCES = [
   'devin',
   'kimi',
   'muse',
-  'zcode'
+  'zcode',
+  'dsh'
 ] as const
 
 export type AgentHookSource = (typeof AGENT_HOOK_SOURCES)[number]
diff --git a/src/shared/agent-hook-scrub-safe-env.test.ts b/src/shared/agent-hook-scrub-safe-env.test.ts
new file mode 100644
index 000000000000..42368b03b19d
--- /dev/null
+++ b/src/shared/agent-hook-scrub-safe-env.test.ts
@@ -0,0 +1,59 @@
+import { describe, expect, it } from 'vitest'
+import {
+  applyScrubSafeAgentEnvAliases,
+  ORCA_SCRUB_SAFE_LAUNCH_ENV,
+  ORCA_SCRUB_SAFE_PANE_ENV
+} from './agent-hook-scrub-safe-env'
+
+/** The rule DeepSeek Harness's shell executor applies, measured against dsh 0.1.5-rc.1. */
+function isScrubbedName(name: string): boolean {
+  return /KEY|TOKEN|SECRET|PASSWORD/.test(name)
+}
+
+describe('applyScrubSafeAgentEnvAliases', () => {
+  it('mirrors pane identity onto names a credential scrub keeps', () => {
+    const env: Record<string, string> = {
+      ORCA_PANE_KEY: 'tab-1:11111111-1111-4111-8111-111111111111',
+      ORCA_AGENT_LAUNCH_TOKEN: 'launch-abc'
+    }
+    applyScrubSafeAgentEnvAliases(env)
+    expect(env[ORCA_SCRUB_SAFE_PANE_ENV]).toBe(env.ORCA_PANE_KEY)
+    expect(env[ORCA_SCRUB_SAFE_LAUNCH_ENV]).toBe(env.ORCA_AGENT_LAUNCH_TOKEN)
+  })
+
+  it('picks alias names the scrub does not take', () => {
+    // The whole point: if an alias were itself scrubbed it would carry nothing.
+    expect(isScrubbedName(ORCA_SCRUB_SAFE_PANE_ENV)).toBe(false)
+    expect(isScrubbedName(ORCA_SCRUB_SAFE_LAUNCH_ENV)).toBe(false)
+    expect(isScrubbedName('ORCA_PANE_KEY')).toBe(true)
+    expect(isScrubbedName('ORCA_AGENT_LAUNCH_TOKEN')).toBe(true)
+  })
+
+  it('leaves the canonical names untouched', () => {
+    const env: Record<string, string> = { ORCA_PANE_KEY: 'pane', ORCA_AGENT_LAUNCH_TOKEN: 'tok' }
+    applyScrubSafeAgentEnvAliases(env)
+    expect(env.ORCA_PANE_KEY).toBe('pane')
+    expect(env.ORCA_AGENT_LAUNCH_TOKEN).toBe('tok')
+  })
+
+  it('drops a stale alias when its source is gone', () => {
+    // Why this matters: an alias inherited from a parent pane would attribute this pane's
+    // hooks to the wrong row — worse than reporting no status at all.
+    const env: Record<string, string> = {
+      [ORCA_SCRUB_SAFE_PANE_ENV]: 'inherited-pane',
+      [ORCA_SCRUB_SAFE_LAUNCH_ENV]: 'inherited-launch'
+    }
+    applyScrubSafeAgentEnvAliases(env)
+    expect(env[ORCA_SCRUB_SAFE_PANE_ENV]).toBeUndefined()
+    expect(env[ORCA_SCRUB_SAFE_LAUNCH_ENV]).toBeUndefined()
+  })
+
+  it('treats an empty source as absent', () => {
+    const env: Record<string, string> = {
+      ORCA_PANE_KEY: '',
+      [ORCA_SCRUB_SAFE_PANE_ENV]: 'stale'
+    }
+    applyScrubSafeAgentEnvAliases(env)
+    expect(env[ORCA_SCRUB_SAFE_PANE_ENV]).toBeUndefined()
+  })
+})
diff --git a/src/shared/agent-hook-scrub-safe-env.ts b/src/shared/agent-hook-scrub-safe-env.ts
new file mode 100644
index 000000000000..e83895e2a30d
--- /dev/null
+++ b/src/shared/agent-hook-scrub-safe-env.ts
@@ -0,0 +1,49 @@
+/**
+ * Scrub-safe aliases for the two pane-identity env vars whose NAMES some agent harnesses
+ * refuse to pass through to a hook process.
+ *
+ * DeepSeek Harness runs command hooks through its own shell executor, which drops every
+ * variable whose name contains `KEY`, `TOKEN`, `SECRET` or `PASSWORD` before the hook
+ * process starts. That is a reasonable credential-scrub default, and it is not something
+ * Orca can turn off — but it takes `ORCA_PANE_KEY` and `ORCA_AGENT_LAUNCH_TOKEN` with it,
+ * which are the two values a status hook needs to say *which pane* it is reporting for.
+ * Without them the hook has nothing to attribute to and exits without posting, so the pane
+ * reads as an agent Orca never hears from.
+ *
+ * Verified against `@deepseek-ai/dsh` 0.1.5-rc.1 by running a probe hook that printed its
+ * own environment: `PROBE_PLAIN`, `PROBE_AUTH`, `PROBE_CREDENTIAL`, `PROBE_HOOK_PORT` and
+ * `PROBE_PANE_ID` arrive; `PROBE_KEY`, `PROBE_TOKEN`, `PROBE_SECRET`, `PROBE_PASSWORD` and
+ * `PROBE_PANE_KEY` do not.
+ *
+ * These are aliases, never replacements: the canonical names stay exactly as they are, so
+ * every existing agent, script and test keeps reading what it reads today.
+ */
+
+/** Alias for `ORCA_PANE_KEY`. */
+export const ORCA_SCRUB_SAFE_PANE_ENV = 'ORCA_AGENT_PANE' as const
+
+/** Alias for `ORCA_AGENT_LAUNCH_TOKEN`. */
+export const ORCA_SCRUB_SAFE_LAUNCH_ENV = 'ORCA_AGENT_LAUNCH' as const
+
+const ALIASES: readonly (readonly [source: string, alias: string])[] = [
+  ['ORCA_PANE_KEY', ORCA_SCRUB_SAFE_PANE_ENV],
+  ['ORCA_AGENT_LAUNCH_TOKEN', ORCA_SCRUB_SAFE_LAUNCH_ENV]
+]
+
+/**
+ * Mirror pane identity onto its scrub-safe aliases, in place.
+ *
+ * An alias is written only when its source is present, and dropped when the source is
+ * absent — a stale alias inherited from a parent pane would attribute this pane's hooks to
+ * the wrong row, which is worse than no status at all.
+ */
+export function applyScrubSafeAgentEnvAliases(env: Record<string, string>): void {
+  for (const [source, alias] of ALIASES) {
+    const value = env[source]
+    if (value === undefined || value === '') {
+      delete env[alias]
+      continue
+    }
+    env[alias] = value
+  }
+}
diff --git a/src/shared/agent-hook-types.ts b/src/shared/agent-hook-types.ts
index a006c2cc37de..0bc5b67bc284 100644
--- a/src/shared/agent-hook-types.ts
+++ b/src/shared/agent-hook-types.ts
@@ -7,6 +7,8 @@ export const AGENT_HOOK_TARGETS = [
   'claude',
   'openclaude',
   'codex',
+  'qoder',
+  'codebuddy',
   'gemini',
   'antigravity',
   'amp',
@@ -19,7 +21,8 @@ export const AGENT_HOOK_TARGETS = [
   'devin',
   'kimi',
   'muse',
-  'zcode'
+  'zcode',
+  'dsh'
 ] as const
 export type AgentHookTarget = (typeof AGENT_HOOK_TARGETS)[number]
 
diff --git a/src/shared/agent-icons/codebuddy.png b/src/shared/agent-icons/codebuddy.png
new file mode 100644
index 000000000000..ecaab1216f4b
Binary files /dev/null and b/src/shared/agent-icons/codebuddy.png differ
diff --git a/src/shared/agent-icons/dsh.png b/src/shared/agent-icons/dsh.png
new file mode 100644
index 000000000000..b5835f8f61fe
Binary files /dev/null and b/src/shared/agent-icons/dsh.png differ
diff --git a/src/shared/agent-icons/freebuff.png b/src/shared/agent-icons/freebuff.png
new file mode 100644
index 000000000000..acb0e0aadde1
Binary files /dev/null and b/src/shared/agent-icons/freebuff.png differ
diff --git a/src/shared/agent-icons/qoder.png b/src/shared/agent-icons/qoder.png
new file mode 100644
index 000000000000..42c952ed33a1
Binary files /dev/null and b/src/shared/agent-icons/qoder.png differ
diff --git a/src/shared/agent-kind.ts b/src/shared/agent-kind.ts
index 06fa51ab76c3..3fb112e61149 100644
--- a/src/shared/agent-kind.ts
+++ b/src/shared/agent-kind.ts
@@ -16,6 +16,7 @@ type ConcreteAgentKind = Exclude<AgentKind, 'other'>
 const TUI_AGENT_KIND_BY_AGENT = {
   claude: 'claude-code',
   'claude-agent-teams': 'claude-agent-teams',
+  codebuddy: 'codebuddy',
   openclaude: 'openclaude',
   codex: 'codex',
   autohand: 'autohand',
@@ -25,6 +26,7 @@ const TUI_AGENT_KIND_BY_AGENT = {
   pi: 'pi',
   omp: 'omp',
   'prime-agent': 'prime-agent',
+  qoder: 'qoder',
   gemini: 'gemini',
   antigravity: 'antigravity',
   aider: 'aider',
@@ -36,6 +38,7 @@ const TUI_AGENT_KIND_BY_AGENT = {
   aug: 'aug',
   cline: 'cline',
   codebuff: 'codebuff',
+  freebuff: 'freebuff',
   'command-code': 'command-code',
   continue: 'continue',
   cursor: 'cursor',
@@ -52,7 +55,8 @@ const TUI_AGENT_KIND_BY_AGENT = {
   ante: 'ante',
   trae: 'trae',
   muse: 'muse',
-  zcode: 'zcode'
+  zcode: 'zcode',
+  dsh: 'dsh'
 } satisfies Record<TuiAgent, ConcreteAgentKind>
 
 // Why: `satisfies Record<TuiAgent, …>` makes the lookup exhaustive at compile
diff --git a/src/shared/agent-launch-intent.ts b/src/shared/agent-launch-intent.ts
index 016b759d8773..bffb93c1b9a2 100644
--- a/src/shared/agent-launch-intent.ts
+++ b/src/shared/agent-launch-intent.ts
@@ -305,7 +305,9 @@ export const AGENT_LAUNCH_RESERVED_CREATE_FIELDS = [
   'startupDraft',
   'startupLaunchConfig',
   'startupEnv',
-  'startupCommandDelivery'
+  'startupCommandDelivery',
+  // The launch carries its own; a create's copy would be a second, possibly contradicting, answer.
+  'launchSource'
 ] as const
 
 /** Strips the reserved agent fields from a create payload. Callers migrating from
diff --git a/src/shared/agent-main-agent-verdict.test.ts b/src/shared/agent-main-agent-verdict.test.ts
new file mode 100644
index 000000000000..b41d44af4abd
--- /dev/null
+++ b/src/shared/agent-main-agent-verdict.test.ts
@@ -0,0 +1,124 @@
+import { describe, expect, it } from 'vitest'
+import {
+  agentMainAgentVerdict,
+  agentTurnEndedUncleanly,
+  agentTurnStoppedByUser,
+  agentVerdictDisplayMark,
+  agentVerdictFields,
+  type AgentMainAgentVerdictSource
+} from './agent-main-agent-verdict'
+import type { AgentStatusState } from './agent-status-types'
+import { AGENT_JOURNAL_TURN_OUTCOMES, type AgentJournalTurnOutcome } from './agent-turn-outcome'
+
+const STATES: AgentStatusState[] = ['working', 'blocked', 'waiting', 'done']
+const OUTCOMES: (AgentJournalTurnOutcome | undefined)[] = [
+  undefined,
+  ...AGENT_JOURNAL_TURN_OUTCOMES
+]
+
+// The rule as the plan states it: the main agent's own state decides when a row carries it; a row
+// without it (a legacy or old-host row) reads the legacy flag, which alone needs the combined `done`.
+function expected(row: AgentMainAgentVerdictSource): AgentJournalTurnOutcome | null {
+  const legacyFlag = row.state === 'done' && row.interrupted === true ? 'cancellation' : null
+  if (row.mainAgent) {
+    return row.mainAgent.state === 'done' ? (row.mainAgent.outcome ?? legacyFlag) : null
+  }
+  return legacyFlag
+}
+
+const MAIN_AGENTS: (AgentMainAgentVerdictSource['mainAgent'] | undefined)[] = [
+  undefined,
+  ...STATES.flatMap((state) =>
+    OUTCOMES.map((outcome) => ({ state, ...(outcome ? { outcome } : {}) }))
+  )
+]
+
+const PRODUCT: AgentMainAgentVerdictSource[] = STATES.flatMap((state) =>
+  MAIN_AGENTS.flatMap((mainAgent) =>
+    [undefined, false, true].map((interrupted) => ({
+      state,
+      ...(interrupted !== undefined ? { interrupted } : {}),
+      ...(mainAgent ? { mainAgent } : {})
+    }))
+  )
+)
+
+describe('agentMainAgentVerdict', () => {
+  it('decodes the one verdict over (main agent present/absent) x combined state x outcomes x flag', () => {
+    for (const row of PRODUCT) {
+      const verdict = expected(row)
+      const label = JSON.stringify(row)
+      expect(agentMainAgentVerdict(row), label).toBe(verdict)
+      expect(agentTurnEndedUncleanly(row), label).toBe(
+        verdict === 'cancellation' || verdict === 'failure'
+      )
+      expect(agentTurnStoppedByUser(row), label).toBe(verdict === 'cancellation')
+      expect(agentVerdictDisplayMark(row), label).toBe(
+        verdict === 'failure'
+          ? 'failed'
+          : verdict === 'cancellation' && row.state === 'done'
+            ? 'interrupted'
+            : null
+      )
+    }
+  })
+
+  it('reads a main agent that failed while its subagent still works as failed', () => {
+    const row = {
+      state: 'working' as const,
+      mainAgent: { state: 'done' as const, outcome: 'failure' as const }
+    }
+    expect(agentMainAgentVerdict(row)).toBe('failure')
+    expect(agentVerdictDisplayMark(row)).toBe('failed')
+  })
+
+  it('keeps a success or a stop with live subagent work reading working', () => {
+    for (const outcome of ['success', 'cancellation'] as const) {
+      const row = { state: 'working' as const, mainAgent: { state: 'done' as const, outcome } }
+      expect(agentVerdictDisplayMark(row)).toBeNull()
+    }
+  })
+
+  it('has no verdict while the main agent itself is not done, whatever the combined row says', () => {
+    const row = {
+      state: 'done' as const,
+      interrupted: true,
+      mainAgent: { state: 'working' as const }
+    }
+    expect(agentMainAgentVerdict(row)).toBeNull()
+  })
+
+  it('reads the legacy flag only on a done row, and under a done main agent with no outcome', () => {
+    expect(agentMainAgentVerdict({ state: 'working', interrupted: true })).toBeNull()
+    expect(
+      agentMainAgentVerdict({ state: 'done', interrupted: true, mainAgent: { state: 'done' } })
+    ).toBe('cancellation')
+    expect(agentMainAgentVerdict({ state: 'done', interrupted: true })).toBe('cancellation')
+  })
+
+  it('prefers the recorded verdict over the legacy flag', () => {
+    expect(
+      agentMainAgentVerdict({
+        state: 'done',
+        interrupted: true,
+        mainAgent: { state: 'done', outcome: 'failure' }
+      })
+    ).toBe('failure')
+  })
+})
+
+describe('agentVerdictFields', () => {
+  const mainAgent = { state: 'done' as const, outcome: 'failure' as const, stateStartedAt: 7 }
+
+  it('copies the whole main agent status and a true legacy flag together', () => {
+    expect(agentVerdictFields({ interrupted: true, mainAgent })).toEqual({
+      interrupted: true,
+      mainAgent
+    })
+  })
+
+  it('copies nothing a row does not carry, and never a false flag', () => {
+    expect(agentVerdictFields({ interrupted: false })).toEqual({})
+    expect(agentVerdictFields({})).toEqual({})
+  })
+})
diff --git a/src/shared/agent-main-agent-verdict.ts b/src/shared/agent-main-agent-verdict.ts
new file mode 100644
index 000000000000..f9754cf0c38d
--- /dev/null
+++ b/src/shared/agent-main-agent-verdict.ts
@@ -0,0 +1,75 @@
+import type { AgentJournalTurnOutcome } from './agent-turn-outcome'
+import type { AgentStatusState } from './agent-status-types'
+import type { AgentMainAgentStatus } from './main-agent-status'
+
+export type AgentMainAgentVerdictSource = {
+  state: AgentStatusState
+  interrupted?: boolean
+  mainAgent?: { state: AgentStatusState; outcome?: AgentJournalTurnOutcome }
+}
+
+/** The fields that carry the verdict. History entries, sleep records and `worktree ps` rows copy
+ *  them through {@link agentVerdictFields}, so no copy keeps one form and drops the other. */
+export type AgentVerdictFields = {
+  interrupted?: true
+  mainAgent?: AgentMainAgentStatus
+}
+
+/** The verdict-bearing fields to copy from a row onto another record. */
+export function agentVerdictFields(row: {
+  interrupted?: boolean
+  mainAgent?: AgentMainAgentStatus
+}): AgentVerdictFields {
+  return {
+    ...(row.interrupted === true ? { interrupted: true } : {}),
+    ...(row.mainAgent ? { mainAgent: row.mainAgent } : {})
+  }
+}
+
+/**
+ * The recorded verdict on the main agent's latest finished turn. One fact at two fidelities:
+ * `mainAgent.outcome`, and the legacy `interrupted` flag, which only ever meant a cancellation.
+ * Read from the main agent's own state, not the combined row's: a main agent that failed while its
+ * subagents still work has a verdict. Null while the main agent is not done, and when no verdict
+ * was recorded. Only the legacy flag needs the combined `done`, because a row without `mainAgent`
+ * has nothing else that says the main agent itself finished.
+ */
+export function agentMainAgentVerdict(
+  row: AgentMainAgentVerdictSource
+): AgentJournalTurnOutcome | null {
+  if (row.mainAgent && row.mainAgent.state !== 'done') {
+    return null
+  }
+  return (
+    row.mainAgent?.outcome ??
+    (row.state === 'done' && row.interrupted === true ? 'cancellation' : null)
+  )
+}
+
+/**
+ * What the verdict marks on the agent's own display. A failure outranks every combined state: it
+ * is news the user must see even while subagents still run. A stop marks only a row that is itself
+ * done, so a stopped main agent's live child work still reads working, as a clean finish does.
+ */
+export function agentVerdictDisplayMark(
+  row: AgentMainAgentVerdictSource
+): 'failed' | 'interrupted' | null {
+  const verdict = agentMainAgentVerdict(row)
+  if (verdict === 'failure') {
+    return 'failed'
+  }
+  return verdict === 'cancellation' && row.state === 'done' ? 'interrupted' : null
+}
+
+/** The turn ended without finishing its work: stopped, or failed. Clean-finish policy
+ *  (hibernation, pane ownership, the value moment) treats both alike. */
+export function agentTurnEndedUncleanly(row: AgentMainAgentVerdictSource): boolean {
+  const verdict = agentMainAgentVerdict(row)
+  return verdict === 'cancellation' || verdict === 'failure'
+}
+
+/** The user stopped the turn. Attention (completion time, Smart Sort, sticky retention) demotes
+ *  only this: a failure is news the user has not seen, so it ranks like a completion. */
+export function agentTurnStoppedByUser(row: AgentMainAgentVerdictSource): boolean {
+  return agentMainAgentVerdict(row) === 'cancellation'
+}
diff --git a/src/shared/agent-node-entrypoint-identities.ts b/src/shared/agent-node-entrypoint-identities.ts
index e71118312d01..fb4327c076f5 100644
--- a/src/shared/agent-node-entrypoint-identities.ts
+++ b/src/shared/agent-node-entrypoint-identities.ts
@@ -26,5 +26,13 @@ export const EXACT_NODE_ENTRYPOINT_IDENTITIES: readonly {
     pattern: /(?:^|\/)node_modules\/prime-agent\/dist\/bundle\/cli\.js$/,
     agent: 'prime-agent',
     processName: 'prime-agent'
+  },
+  // Why: DSH's npm shim launches a generic `lib/bin.js`, and the launcher re-execs it
+  // directly on Windows, so only the package path identifies it. The profile still decides
+  // whether the pane is the agent — `dsh web` resolves here too and is filtered after.
+  {
+    pattern: /(?:^|\/)node_modules\/@deepseek-ai\/dsh\/lib\/bin\.js$/,
+    agent: 'dsh',
+    processName: 'dsh'
   }
 ]
diff --git a/src/shared/agent-node-package-entrypoints.ts b/src/shared/agent-node-package-entrypoints.ts
new file mode 100644
index 000000000000..7f8f9abd7cb2
--- /dev/null
+++ b/src/shared/agent-node-package-entrypoints.ts
@@ -0,0 +1,17 @@
+// Node CLIs whose shim launches a script named after the agent, but generic enough that
+// the basename alone is not identity (`dsh-tui.js` could be anyone's file). The package
+// directory in the resolved path is what makes the match authoritative.
+//
+// Split out of agent-process-recognition.ts so the recognizer keeps only its logic and a
+// new agent's install path is a data edit, as in agent-node-entrypoint-identities.ts.
+export const NODE_PACKAGE_SCRIPT_ENTRYPOINTS: Record<string, readonly string[]> = {
+  codex: ['node_modules/@openai/codex/'],
+  codebuddy: ['node_modules/@tencent-ai/codebuddy-code/'],
+  gemini: ['node_modules/@google/gemini-cli/'],
+  // Why: ZCode's npm bin is `dist/zcode.cjs`, so a package install runs as `node …zcode.cjs`
+  // and never shows `zcode` as the foreground name (a SEA build still matches by name).
+  zcode: ['node_modules/@zcode/cli/'],
+  // Why: the `dsh-tui` launcher is installed twice — once on PATH and once inside the
+  // profile it bootstraps — and the PATH copy re-execs the profile copy by absolute path.
+  'dsh-tui': ['node_modules/@deepseek-harness-tui/dsh-tui/']
+}
diff --git a/src/shared/agent-overlay-env.ts b/src/shared/agent-overlay-env.ts
new file mode 100644
index 000000000000..91e1f85b6ab9
--- /dev/null
+++ b/src/shared/agent-overlay-env.ts
@@ -0,0 +1,27 @@
+// Why: a nested terminal can inherit prior OpenCode/Pi/OMP overlay env; restore the user's recorded source dir, else strip only Orca-owned values.
+export function restoreOrStripOverlayEnv(
+  baseEnv: Record<string, string>,
+  keys: {
+    primary: string
+    overlay: string
+    source: string
+    preserveExplicitPrimary?: boolean
+  },
+  inheritedEnv: NodeJS.ProcessEnv = process.env
+): void {
+  const sourceValue = baseEnv[keys.source] ?? inheritedEnv[keys.source]
+  const overlayValue = baseEnv[keys.overlay] ?? inheritedEnv[keys.overlay]
+  // Source-only markers from older launches still identify an inherited overlay.
+  const preservePrimary =
+    keys.preserveExplicitPrimary &&
+    Boolean(overlayValue) &&
+    baseEnv[keys.primary] !== undefined &&
+    baseEnv[keys.primary] !== overlayValue
+  if (sourceValue && !preservePrimary) {
+    baseEnv[keys.primary] = sourceValue
+  } else if (overlayValue && baseEnv[keys.primary] === overlayValue) {
+    delete baseEnv[keys.primary]
+  }
+  delete baseEnv[keys.overlay]
+  delete baseEnv[keys.source]
+}
diff --git a/src/shared/agent-process-recognition.ts b/src/shared/agent-process-recognition.ts
index a0f0faa68e7c..a8262eb4760e 100644
--- a/src/shared/agent-process-recognition.ts
+++ b/src/shared/agent-process-recognition.ts
@@ -1,5 +1,6 @@
 import { getTuiAgentDetectCommands, TUI_AGENT_CONFIG } from './tui-agent-config'
 import { EXACT_NODE_ENTRYPOINT_IDENTITIES } from './agent-node-entrypoint-identities'
+import { NODE_PACKAGE_SCRIPT_ENTRYPOINTS } from './agent-node-package-entrypoints'
 import type { AgentType } from './agent-status-types'
 import type { TuiAgent } from './tui-agent'
 import { filterHeadlessOneShotAgentCommand } from './agent-headless-command'
@@ -35,13 +36,6 @@ function normalizeProcessName(
 }
 
 const FOREGROUND_AGENT_WRAPPER_PROCESS_NAMES = new Set(['node', 'python', 'python3'])
-const NODE_PACKAGE_SCRIPT_ENTRYPOINTS: Record<string, readonly string[]> = {
-  codex: ['node_modules/@openai/codex/'],
-  gemini: ['node_modules/@google/gemini-cli/'],
-  // Why: ZCode's npm bin is `dist/zcode.cjs`, so a package install runs as `node …zcode.cjs`
-  // and never shows `zcode` as the foreground name (a SEA build still matches by name).
-  zcode: ['node_modules/@zcode/cli/']
-}
 const PYTHON_SCRIPT_ENTRYPOINT_DIRECTORIES = ['/bin/', '/scripts/', '/site-packages/']
 
 const PROCESS_TO_AGENT = new Map<string, TuiAgent>()
@@ -79,6 +73,10 @@ function agentForNormalizedProcess(normalized: string): TuiAgent | undefined {
   if (normalized.startsWith('codex-')) {
     return PROCESS_TO_AGENT.get('codex')
   }
+  // Qoder's launcher resolves to a versioned native binary.
+  if (/^qodercli-\d/.test(normalized)) {
+    return PROCESS_TO_AGENT.get('qodercli')
+  }
   if (normalized.startsWith('grok-')) {
     return PROCESS_TO_AGENT.get('grok')
   }
@@ -164,6 +162,7 @@ export function isExpectedAgentProcess(
   return (
     normalizedProcess === normalizedExpected ||
     normalizedProcess.startsWith(`${normalizedExpected}.`) ||
+    (normalizedExpected === 'qodercli' && /^qodercli-\d/.test(normalizedProcess)) ||
     (normalizedExpected === 'muse' && normalizedProcess.startsWith('muse-bin-'))
   )
 }
diff --git a/src/shared/agent-session-caller-env.ts b/src/shared/agent-session-caller-env.ts
new file mode 100644
index 000000000000..5f66128dc5f9
--- /dev/null
+++ b/src/shared/agent-session-caller-env.ts
@@ -0,0 +1,38 @@
+/**
+ * The Orca-minted agent session id, injected into a structured session's own child processes. When
+ * it is present it IS the orchestration caller: the CLI sends it in the orchestration envelope and
+ * the host resolves the session it names, so no terminal is resolved or guessed on its behalf.
+ *
+ * Identity by session id assumes one machine and one user. A host boundary (SSH, a paired peer,
+ * WSL) re-opens that decision: the host refuses a claim that arrives across one, and the SSH
+ * passthrough never carries the id.
+ */
+import { ORCA_SESSION_ADDRESS_PREFIX } from './orca-session-address-prefix'
+import { isStructuredWorkerHandle } from './structured-worker-handle'
+
+export const ORCA_AGENT_SESSION_ID_ENV = 'ORCA_AGENT_SESSION_ID'
+
+export function readInjectedAgentSessionId(
+  env: Readonly<Record<string, string | undefined>> = process.env
+): string | undefined {
+  const value = env[ORCA_AGENT_SESSION_ID_ENV]?.trim()
+  return value ? value : undefined
+}
+
+/**
+ * The address the host gives this session (`mailboxAddressOf` on its resolved party): a structured
+ * worker keeps the handle it was minted, any other session is `session:<id>`. Only for text that
+ * must match what the host writes; the CLI spells it without the host resolver.
+ */
+export function injectedSessionAddress(
+  env: Readonly<Record<string, string | undefined>> = process.env
+): string | undefined {
+  const sessionId = readInjectedAgentSessionId(env)
+  if (!sessionId) {
+    return undefined
+  }
+  const ownHandle = env.ORCA_TERMINAL_HANDLE
+  return isStructuredWorkerHandle(ownHandle)
+    ? ownHandle
+    : `${ORCA_SESSION_ADDRESS_PREFIX}${sessionId}`
+}
diff --git a/src/shared/agent-session-conversation-command.ts b/src/shared/agent-session-conversation-command.ts
index e1c038de934a..8b5ecb6ccf04 100644
--- a/src/shared/agent-session-conversation-command.ts
+++ b/src/shared/agent-session-conversation-command.ts
@@ -1,11 +1,20 @@
+import type { AgentSessionFailureFact } from './agent-session-failure'
+import type { AgentSessionFailureSentence } from './agent-session-failure-words'
+
 export type AgentSessionConversationCommand = 'clear' | 'compact'
 
 export type AgentSessionConversationCommandResult = {
   command: AgentSessionConversationCommand
   state: 'completed' | 'unknown'
   replacementSessionId?: string
-  error?: string
-}
+} &
+  /** `error`: a sentence for a person; released clients print it as it is. */
+  (
+    | { error?: string; failure?: undefined }
+    /** What failed, typed, beside its sentence, both from `agentSessionFailureWords`; `failure` is
+     *  absent from older hosts. */
+    | { error: AgentSessionFailureSentence; failure: AgentSessionFailureFact }
+  )
 
 export type AgentSessionConversationCommandRecord = AgentSessionConversationCommandResult & {
   runtimeFence?: number
diff --git a/src/shared/agent-session-conversation-outline.ts b/src/shared/agent-session-conversation-outline.ts
index bc4fa3b40ade..2b6bb846adb8 100644
--- a/src/shared/agent-session-conversation-outline.ts
+++ b/src/shared/agent-session-conversation-outline.ts
@@ -75,8 +75,8 @@ export function truncateOutlinePreview(text: string, maxChars: number): string {
 
 /** User messages that draw a transcript row, in transcript order. Projected over the
  *  whole journal, not user items alone: whether a user row survives depends on its
- *  neighbours (a harness sidecar folds into the turn before it) and its order on
- *  when it was observed. Previews are uncut; the reply bound owns length. */
+ *  neighbours (a harness sidecar folds into the turn before it), and its order is
+ *  its journal position. Previews are uncut; the reply bound owns length. */
 export function projectAgentSessionConversationOutline(
   items: readonly AgentJournalRenderItem[],
   submissions: readonly AgentJournalSubmission[]
diff --git a/src/shared/agent-session-failure-words.test.ts b/src/shared/agent-session-failure-words.test.ts
new file mode 100644
index 000000000000..515ba2300c5d
--- /dev/null
+++ b/src/shared/agent-session-failure-words.test.ts
@@ -0,0 +1,244 @@
+import { describe, expect, it } from 'vitest'
+import {
+  AGENT_SESSION_ATTACHMENT_PROBLEM_REASONS,
+  AGENT_SESSION_FAILURE_KINDS,
+  isSubmissionRejectionFact,
+  readAgentSessionFailureFact,
+  type AgentSessionFailureFact,
+  type AgentSessionFailureKind,
+  type SubmissionRejectionKind
+} from './agent-session-failure'
+import {
+  agentSessionFailureSentence,
+  agentSessionFailureWords,
+  type AgentSessionFailureSurface
+} from './agent-session-failure-words'
+import {
+  classifyDispatchRejection,
+  DISPATCH_REJECTED_CANCELLED,
+  DISPATCH_REJECTED_CODEX_QUEUE_FULL,
+  DISPATCH_REJECTED_QUEUE_FULL,
+  DISPATCH_REJECTED_WRITE_FAILED
+} from './structured-agent-session-dispatch-rejection'
+
+/** What Orca's own text looks like: a code or marker, a uuid, a path, an exception. */
+const ORCA_INTERNAL = /\b[a-z]+_[a-z_]+\b|[0-9a-f]{8}-[0-9a-f]{4}-|[/\\][\w.-]+[/\\]|Error:|ENOENT/
+
+const SURFACES: readonly AgentSessionFailureSurface[] = ['row', 'rejection']
+const LEGACY_MARKER_KINDS: ReadonlySet<SubmissionRejectionKind> = new Set([
+  'cancelled',
+  'writeFailed',
+  'queueFull'
+])
+
+/** Every fact shape a kind can carry: bare, with a person or a log detail, with a refusal, and
+ *  for an attachment each reason with and without its limit. */
+function factsFor(kind: AgentSessionFailureKind): AgentSessionFailureFact[] {
+  const facts: AgentSessionFailureFact[] = [
+    { kind },
+    { kind, detail: { text: 'Context window exceeded.', audience: 'person' } },
+    {
+      kind,
+      // A log detail and a refusal ride with the fact; neither may reach the sentence.
+      detail: { text: 'Error: ENOENT /Users/me/.claude/x agent_session_conflict', audience: 'log' },
+      refusal: { code: 'agent_session_identity_required', details: { reason: 'recordMissing' } }
+    }
+  ]
+  if (kind === 'providerRetrying') {
+    facts.push({ kind, retry: { error: 'rate_limit', status: 429 } })
+    facts.push({ kind, retry: { error: 'overloaded', status: 529 } })
+    facts.push({ kind, retry: { status: 500 } })
+  }
+  if (kind === 'attachmentInvalid') {
+    for (const reason of AGENT_SESSION_ATTACHMENT_PROBLEM_REASONS) {
+      facts.push({ kind, attachment: { reason } })
+      facts.push({ kind, attachment: { reason, limit: 5 * 1024 * 1024 } })
+    }
+  }
+  return facts
+}
+
+describe('the words written beside a failure fact', () => {
+  describe.each(SURFACES)('on the %s surface', (surface) => {
+    it.each(AGENT_SESSION_FAILURE_KINDS)('for %s are one sentence a person can read', (kind) => {
+      for (const fact of factsFor(kind)) {
+        for (const [agentName, command] of [
+          ['Claude', undefined],
+          [undefined, undefined],
+          ['Codex', 'clear']
+        ] as const) {
+          const sentence = agentSessionFailureSentence(fact, surface, { agentName, command })
+          expect([fact, sentence]).toEqual([fact, expect.stringMatching(/[^.]\.$/)])
+          expect(sentence).not.toMatch(/\.\./)
+          expect(sentence).not.toMatch(ORCA_INTERNAL)
+          const context = { agentName, command, provider: 'claude' } as const
+          if (surface === 'row') {
+            expect(agentSessionFailureWords(fact, { ...context, surface }).text).toBe(sentence)
+          } else if (isSubmissionRejectionFact(fact) && !LEGACY_MARKER_KINDS.has(fact.kind)) {
+            expect(agentSessionFailureWords(fact, { ...context, surface }).reason).toBe(sentence)
+          }
+        }
+      }
+    })
+  })
+
+  it('writes the legacy markers released clients hide, byte for byte, on a rejection', () => {
+    const reason = (kind: SubmissionRejectionKind, provider?: 'claude' | 'codex') =>
+      agentSessionFailureWords({ kind }, { surface: 'rejection', provider }).reason
+    expect(reason('cancelled')).toBe(DISPATCH_REJECTED_CANCELLED)
+    expect(DISPATCH_REJECTED_CANCELLED).toBe('provider_cancelled_before_start')
+    expect(reason('queueFull', 'claude')).toBe(DISPATCH_REJECTED_QUEUE_FULL)
+    expect(DISPATCH_REJECTED_QUEUE_FULL).toBe('claude structured dispatch queue is full')
+    expect(reason('queueFull', 'codex')).toBe(DISPATCH_REJECTED_CODEX_QUEUE_FULL)
+    expect(DISPATCH_REJECTED_CODEX_QUEUE_FULL).toBe('codex structured dispatch queue is full')
+    // Bare: the error that once followed it belongs in the log.
+    expect(reason('writeFailed')).toBe(DISPATCH_REJECTED_WRITE_FAILED)
+    expect(DISPATCH_REJECTED_WRITE_FAILED).toBe('provider_write_failed')
+    // With no provider to name its marker, a full queue gets a sentence.
+    expect(reason('queueFull')).toBe(
+      'Too many messages were waiting for the agent, so this one was not sent.'
+    )
+    for (const kind of LEGACY_MARKER_KINDS) {
+      const written = agentSessionFailureWords(
+        { kind },
+        { surface: 'rejection', provider: 'codex' }
+      )
+      expect(classifyDispatchRejection({ reason: written.reason })).toMatchObject({ kind })
+    }
+  })
+
+  it('names /clear as the next step for the start a /clear needed', () => {
+    const clear = (kind: AgentSessionFailureKind) =>
+      agentSessionFailureSentence({ kind }, 'row', { agentName: 'Codex', command: 'clear' })
+    expect(clear('notSignedIn')).toBe(
+      'Codex is not signed in for the selected account. Sign in, then run /clear again.'
+    )
+    expect(clear('startFailed')).toBe("Codex couldn't start. Run /clear again.")
+    expect(clear('restartFailed')).toBe("Codex couldn't restart. Run /clear again.")
+    expect(clear('providerStartFailed')).toBe(
+      'Codex stopped before it finished starting. Run /clear again.'
+    )
+  })
+
+  it('names the agent that stopped starting, and a failed start or restart gives a next step', () => {
+    const sentence = (kind: AgentSessionFailureKind, agentName?: string) =>
+      agentSessionFailureSentence({ kind }, 'rejection', { agentName })
+    expect(sentence('providerStartFailed', 'Claude')).toBe(
+      'Claude stopped before it finished starting. Send your message to try again.'
+    )
+    expect(sentence('providerStartFailed')).toBe(
+      'The agent stopped before it finished starting. Send your message to try again.'
+    )
+    expect(sentence('startFailed', 'Codex')).toBe(
+      "Codex couldn't start. Send your message to try again."
+    )
+    expect(sentence('restartFailed')).toBe(
+      "The agent couldn't restart. Send your message to try again."
+    )
+    // Nothing to restart from: a new chat is the only step, so no retry is offered.
+    expect(
+      agentSessionFailureSentence(
+        {
+          kind: 'startFailed',
+          refusal: { code: 'agent_session_identity_required', details: { reason: 'recordMissing' } }
+        },
+        'row',
+        { agentName: 'Codex' }
+      )
+    ).toBe("Codex couldn't start. Start a new chat to continue.")
+  })
+
+  it('names the exit a row reports differently from the message it left unsent', () => {
+    expect(
+      agentSessionFailureWords({ kind: 'providerExited' }, { surface: 'row', agentName: 'Claude' })
+        .text
+    ).toBe(
+      'Claude stopped while this response was in progress. You can continue in this conversation.'
+    )
+    expect(
+      agentSessionFailureWords(
+        { kind: 'providerExited' },
+        { surface: 'rejection', agentName: 'Codex' }
+      ).reason
+    ).toBe('Codex stopped before this message was sent.')
+    expect(agentSessionFailureWords({ kind: 'providerExited' }, { surface: 'row' }).text).toBe(
+      'The agent stopped while this response was in progress. You can continue in this conversation.'
+    )
+    expect(
+      agentSessionFailureWords({ kind: 'providerExited' }, { surface: 'rejection' }).reason
+    ).toBe('The agent stopped before this message was sent.')
+  })
+
+  it('says a refused Stop reached the agent, which declined it', () => {
+    const refused = (detail?: { text: string; audience: 'person' | 'log' }, agentName?: string) =>
+      agentSessionFailureWords(
+        { kind: 'stopRefused', ...(detail ? { detail } : {}) },
+        { surface: 'row', agentName }
+      ).text
+    expect(refused(undefined, 'Codex')).toBe('Codex had no turn running to stop.')
+    expect(refused()).toBe('The agent had no turn running to stop.')
+    expect(refused({ text: 'no active turn to interrupt.', audience: 'person' }, 'Codex')).toBe(
+      "Codex didn't stop: no active turn to interrupt."
+    )
+    // Words Codex wrote for the log are never quoted to a person.
+    expect(refused({ text: 'rpc -32600', audience: 'log' }, 'Codex')).toBe(
+      'Codex had no turn running to stop.'
+    )
+  })
+
+  it('says what frees a chat a terminal agent still holds, without naming its process', () => {
+    expect(
+      agentSessionFailureSentence(
+        {
+          kind: 'restartFailed',
+          refusal: { code: 'agent_session_conflict', details: { reason: 'claimConflicted' } }
+        },
+        'row',
+        { agentName: 'Codex' }
+      )
+    ).toBe(
+      "Codex couldn't restart. This chat is still open in a terminal agent. Quit that agent to continue the chat here."
+    )
+  })
+
+  it('says which limit an attachment broke, in megabytes', () => {
+    const sentence = (attachment: AgentSessionFailureFact['attachment']) =>
+      agentSessionFailureSentence({ kind: 'attachmentInvalid', attachment }, 'rejection', {
+        agentName: 'Claude'
+      })
+    expect(sentence({ reason: 'tooLarge', limit: 5 * 1024 * 1024 })).toBe(
+      'An image on this message is larger than 5 MB, so the message was not sent.'
+    )
+    expect(sentence({ reason: 'totalTooLarge', limit: 20 * 1024 * 1024 })).toBe(
+      'The images on this message add up to more than 20 MB, so the message was not sent.'
+    )
+    expect(sentence({ reason: 'tooMany', limit: 20 })).toBe(
+      'Claude accepts at most 20 images in one message, so this message was not sent.'
+    )
+    expect(sentence(undefined)).toBe("An attachment on this message can't be sent to the agent.")
+  })
+})
+
+describe('an attachment problem as a reader meets it', () => {
+  it('keeps what it can place and drops what it cannot', () => {
+    expect(
+      readAgentSessionFailureFact({
+        kind: 'attachmentInvalid',
+        attachment: { reason: 'tooMany', limit: 20 }
+      })
+    ).toEqual({ kind: 'attachmentInvalid', attachment: { reason: 'tooMany', limit: 20 } })
+    expect(
+      readAgentSessionFailureFact({
+        kind: 'attachmentInvalid',
+        attachment: { reason: 'tooMany', limit: 'twenty' }
+      })
+    ).toEqual({ kind: 'attachmentInvalid', attachment: { reason: 'tooMany' } })
+    // A reason a newer host added reads as the generic attachment failure.
+    expect(
+      readAgentSessionFailureFact({
+        kind: 'attachmentInvalid',
+        attachment: { reason: 'futureReason' }
+      })
+    ).toEqual({ kind: 'attachmentInvalid' })
+  })
+})
diff --git a/src/shared/agent-session-failure-words.ts b/src/shared/agent-session-failure-words.ts
new file mode 100644
index 000000000000..06befa038eb0
--- /dev/null
+++ b/src/shared/agent-session-failure-words.ts
@@ -0,0 +1,278 @@
+// The sentence a person reads beside each failure fact, and the one constructor that writes both.
+//
+// A row's `text`, a rejected message's `reason` and a conversation command's `error` are what
+// every released client prints as they are, so the host writes them here, from the fact, and
+// nowhere else: never Orca's own error text, a refusal's message, or a probe's evidence. A
+// provider's words reach the sentence only when the provider wrote them for a person. The table
+// is also the English default for a client that chooses its own copy from the fact.
+
+import {
+  isSubmissionRejectionFact,
+  type AgentSessionAttachmentProblem,
+  type AgentSessionAttachmentProblemReason,
+  type AgentSessionFailureFact,
+  type AgentSessionFailureKind,
+  type ProviderDiagnostic,
+  type SubmissionRejectionFact,
+  type SubmissionRejectionKind
+} from './agent-session-failure'
+import type { AgentSessionWireRefusalCode } from './agent-session-wire-refusals'
+import {
+  DISPATCH_REJECTED_CANCELLED,
+  DISPATCH_REJECTED_CODEX_QUEUE_FULL,
+  DISPATCH_REJECTED_QUEUE_FULL,
+  DISPATCH_REJECTED_WRITE_FAILED
+} from './structured-agent-session-dispatch-rejection'
+
+declare const failureSentence: unique symbol
+
+/** Words only `agentSessionFailureWords` makes, so no writer can put its own beside a fact. */
+export type AgentSessionFailureSentence = string & { readonly [failureSentence]: true }
+
+/** A status row that reports a failure. */
+export type AgentSessionFailureRowWords = {
+  text: AgentSessionFailureSentence
+  failure: AgentSessionFailureFact
+}
+
+/** A rejection as the host writes it: the sentence (or, for the cases released clients already
+ *  hide, the legacy marker) they print, and the fact newer ones read. */
+export type AgentJournalDispatchRejection = {
+  reason: AgentSessionFailureSentence
+  rejection: SubmissionRejectionFact
+}
+
+/** `row`: a status row, about the chat. `rejection`: a rejected message's reason, about it. */
+export type AgentSessionFailureSurface = 'row' | 'rejection'
+
+export type AgentSessionFailureWordsContext = {
+  /** The chat's agent, when the writer knows it. */
+  agentName?: string
+  /** Names the legacy queue-full marker; without it a full queue is worded as a sentence. */
+  provider?: 'claude' | 'codex'
+  /** The conversation command a failed start was for, so the next step is to run it again
+   *  rather than to send a message. */
+  command?: 'clear'
+  /** The surface retries for the person — its own Retry beside the words, or a read that reconnects
+   *  on its own — so they leave out sending or trying again. */
+  retryControl?: boolean
+}
+
+/**
+ * Whether a refused start leaves the chat anything to start again from. `false`: this host has
+ * nothing to restart it from — no record, or none it can run — so only a new chat continues.
+ * A new wire code does not compile until it is classified here.
+ */
+export const START_REFUSAL_RESUMABLE: Record<AgentSessionWireRefusalCode, boolean> = {
+  execution_owner_reconciling: true,
+  agent_session_conflict: true,
+  agent_session_checkpoint_stale: true,
+  agent_session_ownership_unknown: true,
+  agent_session_operation_capacity: true,
+  structured_agent_session_unsupported: false,
+  agent_session_operation_conflict: true,
+  agent_session_operation_expired: true,
+  agent_session_operation_invalid: true,
+  agent_session_operation_unknown: true,
+  agent_session_item_revision_stale: true,
+  agent_session_already_resolved: true,
+  agent_session_identity_required: false,
+  agent_session_journal_unreadable: true,
+  agent_session_owner_restart_failed: true
+}
+
+/** Sentences a refusal notice shows too, so a chat says them one way. */
+export const TERMINAL_AGENT_HOLDS_CHAT = 'This chat is still open in a terminal agent.'
+export const QUIT_TERMINAL_AGENT = 'Quit that agent to continue the chat here.'
+export const START_NEW_CHAT = 'Start a new chat to continue.'
+
+/** Person-facing provider text is quoted, but bounded so the sentence stays one. */
+const MAX_QUOTED_DETAIL_CHARS = 512
+const BYTES_PER_MB = 1024 * 1024
+
+type Sentence = (
+  context: AgentSessionFailureWordsContext,
+  fact: AgentSessionFailureFact,
+  surface: AgentSessionFailureSurface
+) => string
+
+function quotingPersonDetail(lead: string, detail: ProviderDiagnostic | undefined): string {
+  const quoted =
+    detail?.audience === 'person'
+      ? detail.text
+          .slice(0, MAX_QUOTED_DETAIL_CHARS)
+          .trim()
+          .replace(/[.\s]+$/, '')
+      : ''
+  return quoted ? `${lead}: ${quoted}.` : `${lead}.`
+}
+
+/** What to do once the start can work, for a sentence that ends in it. */
+function retryStep({ command }: AgentSessionFailureWordsContext): string {
+  return command === 'clear' ? 'run /clear again' : 'send your message again'
+}
+
+/** The next step after a start or restart that failed: the command, or the message, again. */
+function startRetry({ command, retryControl }: AgentSessionFailureWordsContext): string {
+  if (retryControl) {
+    return ''
+  }
+  return command === 'clear' ? ' Run /clear again.' : ' Send your message to try again.'
+}
+
+function couldNot(verb: string): Sentence {
+  return (context, fact) => {
+    const { agentName } = context
+    const failed = `${agentName ?? 'The agent'} couldn't ${verb}.`
+    // Only a terminal agent an older build recorded holds a claim; quitting it frees the chat.
+    if (fact.refusal?.details?.reason === 'claimConflicted') {
+      return `${failed} ${TERMINAL_AGENT_HOLDS_CHAT} ${QUIT_TERMINAL_AGENT}`
+    }
+    const code = fact.refusal?.code
+    return code && !START_REFUSAL_RESUMABLE[code]
+      ? `${failed} ${START_NEW_CHAT}`
+      : `${failed}${startRetry(context)}`
+  }
+}
+
+function megabytes(bytes: number): string {
+  return `${Math.round((bytes / BYTES_PER_MB) * 10) / 10} MB`
+}
+
+const NOT_SENT = 'so the message was not sent.'
+
+const ATTACHMENT_SENTENCES = {
+  empty: () => `An image on this message is empty, ${NOT_SENT}`,
+  tooLarge: (_, { limit }) =>
+    limit
+      ? `An image on this message is larger than ${megabytes(limit)}, ${NOT_SENT}`
+      : `An image on this message is too large, ${NOT_SENT}`,
+  tooMany: ({ agentName }, { limit }) =>
+    limit
+      ? `${agentName ?? 'The agent'} accepts at most ${limit} images in one message, so this message was not sent.`
+      : 'This message has too many images, so it was not sent.',
+  totalTooLarge: (_, { limit }) =>
+    limit
+      ? `The images on this message add up to more than ${megabytes(limit)}, ${NOT_SENT}`
+      : `The images on this message are too large together, ${NOT_SENT}`,
+  unsupportedType: ({ agentName }) =>
+    `${agentName ?? 'The agent'} accepts only PNG, JPEG, GIF, and WebP images, so this message was not sent.`,
+  notAFile: () => `An image on this message isn't a file, ${NOT_SENT}`,
+  noSource: () => `An image on this message has no file to send, ${NOT_SENT}`
+} satisfies Record<
+  AgentSessionAttachmentProblemReason,
+  (context: AgentSessionFailureWordsContext, problem: AgentSessionAttachmentProblem) => string
+>
+
+const FAILURE_SENTENCES = {
+  providerStartFailed: (context) =>
+    `${context.agentName ?? 'The agent'} stopped before it finished starting.${startRetry(context)}`,
+  startFailed: couldNot('start'),
+  // Beside a Retry the resend is the button, but signing in is still a step to take first.
+  notSignedIn: (context) =>
+    `${context.agentName ?? 'The agent'} is not signed in for the selected account. ${context.retryControl ? 'Sign in first.' : `Sign in, then ${retryStep(context)}.`}`,
+  historyTooLarge: () =>
+    `This conversation's history is too large to restore here. ${START_NEW_CHAT}`,
+  managedAccountEnvOverride: () =>
+    'This Claude launch sets its own Anthropic sign-in variables. Remove them to use a managed Claude account.',
+  accountSwitchInProgress: () =>
+    'A Claude account switch is in progress. Try again after it finishes.',
+  managedAccountUnsupported: (context) =>
+    `While a Claude account is added in WSL, Claude chats need a Windows Claude account. Choose or add one in Claude Accounts settings${context.retryControl ? '' : `, then ${retryStep(context)}`}.`,
+  providerExited: ({ agentName }, _, surface) =>
+    surface === 'row'
+      ? `${agentName ?? 'The agent'} stopped while this response was in progress. You can continue in this conversation.`
+      : `${agentName ?? 'The agent'} stopped before this message was sent.`,
+  restartFailed: couldNot('restart'),
+  providerRejected: (_, fact) =>
+    quotingPersonDetail('The provider did not accept this message', fact.detail),
+  attachmentInvalid: (context, fact) =>
+    fact.attachment
+      ? ATTACHMENT_SENTENCES[fact.attachment.reason](context, fact.attachment)
+      : "An attachment on this message can't be sent to the agent.",
+  attachmentUnreadable: () => `An attachment on this message couldn't be read, ${NOT_SENT}`,
+  emptyMessage: () => 'This message is empty, so it was not sent.',
+  queueFull: () => 'Too many messages were waiting for the agent, so this one was not sent.',
+  writeFailed: () => "Orca couldn't hand this message to the agent, so it was not sent.",
+  cancelled: () => 'This message was withdrawn before the agent started it.',
+  chatClosed: () => 'The chat closed before this message was sent.',
+  hostRestarted: () => 'Orca restarted before this message was sent.',
+  notDelivered: ({ retryControl }) =>
+    retryControl
+      ? 'This message was not delivered.'
+      : 'This message was not delivered. Send it again to continue.',
+  compactionFailed: (_, fact) => quotingPersonDetail('Compaction failed', fact.detail),
+  compactionUnconfirmed: () => 'Compaction completion is unconfirmed.',
+  cancelUnconfirmed: () => 'Cancellation was not confirmed.',
+  // The agent was reached and declined, so the sentence says that, not that the Stop was lost.
+  stopRefused: ({ agentName }, fact) =>
+    fact.detail?.audience === 'person'
+      ? quotingPersonDetail(`${agentName ?? 'The agent'} didn't stop`, fact.detail)
+      : `${agentName ?? 'The agent'} had no turn running to stop.`,
+  answerUnconfirmed: () => 'Your answer was recorded but the agent did not confirm it.',
+  hostFault: ({ retryControl }) =>
+    `Orca ran into a problem, so this didn't go through.${retryControl ? '' : ' Try again.'}`,
+  hostStopped: ({ agentName }) =>
+    `${agentName ?? 'The agent'} never finished starting, so Orca stopped it.`,
+  providerRetrying: ({ agentName }, { retry }) =>
+    retry?.error === 'rate_limit' || retry?.status === 429
+      ? `${agentName ?? 'The agent'} is rate-limited and retrying.`
+      : `${agentName ?? 'The agent'} hit a temporary problem and is retrying.`
+} satisfies Record<AgentSessionFailureKind, Sentence>
+
+/** The sentence a person reads for this fact on this surface; never a marker. */
+export function agentSessionFailureSentence(
+  fact: AgentSessionFailureFact,
+  surface: AgentSessionFailureSurface,
+  context: AgentSessionFailureWordsContext = {}
+): string {
+  const sentence: Sentence = FAILURE_SENTENCES[fact.kind]
+  return sentence(context, fact, surface)
+}
+
+/** The markers released clients hide, for the rejections that had one before rows carried a fact.
+ *  A write failure is the bare marker: its error belongs in the log. */
+const LEGACY_REJECTION_MARKERS: Partial<
+  Record<SubmissionRejectionKind, (context: AgentSessionFailureWordsContext) => string | undefined>
+> = {
+  cancelled: () => DISPATCH_REJECTED_CANCELLED,
+  writeFailed: () => DISPATCH_REJECTED_WRITE_FAILED,
+  queueFull: ({ provider }) =>
+    provider === 'codex'
+      ? DISPATCH_REJECTED_CODEX_QUEUE_FULL
+      : provider === 'claude'
+        ? DISPATCH_REJECTED_QUEUE_FULL
+        : undefined
+}
+
+/** The words a status row reporting this fact records. */
+export function agentSessionFailureWords(
+  fact: AgentSessionFailureFact,
+  context: AgentSessionFailureWordsContext & { surface: 'row' }
+): AgentSessionFailureRowWords
+/** The words a message rejected for this fact records. */
+export function agentSessionFailureWords(
+  fact: SubmissionRejectionFact,
+  context: AgentSessionFailureWordsContext & { surface: 'rejection' }
+): AgentJournalDispatchRejection
+export function agentSessionFailureWords(
+  fact: AgentSessionFailureFact,
+  context: AgentSessionFailureWordsContext & { surface: AgentSessionFailureSurface }
+): AgentSessionFailureRowWords | AgentJournalDispatchRejection {
+  if (context.surface === 'row') {
+    return { text: branded(agentSessionFailureSentence(fact, 'row', context)), failure: fact }
+  }
+  // The rejection overload admits only these; a caller that got past the types is Orca's bug.
+  if (!isSubmissionRejectionFact(fact)) {
+    throw new Error(`agent session failure kind ${fact.kind} cannot reject a message`)
+  }
+  const words =
+    LEGACY_REJECTION_MARKERS[fact.kind]?.(context) ??
+    agentSessionFailureSentence(fact, 'rejection', context)
+  return { reason: branded(words), rejection: fact }
+}
+
+function branded(words: string): AgentSessionFailureSentence {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only `agentSessionFailureWords` calls this, with words from the table or a legacy marker for its fact.
+  return words as AgentSessionFailureSentence
+}
diff --git a/src/shared/agent-session-failure.test.ts b/src/shared/agent-session-failure.test.ts
new file mode 100644
index 000000000000..4dc12f9bfe8b
--- /dev/null
+++ b/src/shared/agent-session-failure.test.ts
@@ -0,0 +1,93 @@
+import { describe, expect, it } from 'vitest'
+import {
+  MAX_PROVIDER_DIAGNOSTIC_CHARS,
+  providerDiagnostic,
+  providerDiagnosticOf,
+  readAgentSessionFailureFact,
+  withProviderDiagnostic
+} from './agent-session-failure'
+
+describe('provider diagnostics', () => {
+  it('bounds the text and records nothing for an empty one', () => {
+    expect(providerDiagnostic('  ', 'log')).toBeUndefined()
+    expect(
+      providerDiagnostic('x'.repeat(MAX_PROVIDER_DIAGNOSTIC_CHARS + 50), 'log')?.text
+    ).toHaveLength(MAX_PROVIDER_DIAGNOSTIC_CHARS)
+  })
+
+  it('is read from the error that carries it, or from what it wraps', () => {
+    const diagnostic = { text: 'bad request', audience: 'person' as const }
+    const carried = withProviderDiagnostic(
+      new Error('codex turn/start failed: bad request'),
+      diagnostic
+    )
+    expect(providerDiagnosticOf(carried)).toEqual(diagnostic)
+    expect(providerDiagnosticOf(new Error('wrapped', { cause: carried }))).toEqual(diagnostic)
+    expect(providerDiagnosticOf(new AggregateError([new Error('other'), carried], 'both'))).toEqual(
+      diagnostic
+    )
+  })
+
+  it('ends on an aggregate error that contains itself', () => {
+    const loop = new AggregateError([], 'loop')
+    loop.errors.push(loop)
+    expect(providerDiagnosticOf(loop)).toBeUndefined()
+  })
+
+  it('is never inferred from an error that did not carry one', () => {
+    // Orca's own wording, even when it quotes something that looks like a provider message.
+    expect(
+      providerDiagnosticOf(new Error('claude stream-json exited (code 1): not signed in'))
+    ).toBe(undefined)
+    expect(providerDiagnosticOf('a string')).toBeUndefined()
+  })
+})
+
+describe('reading a failure fact', () => {
+  it('keeps what this build can place', () => {
+    expect(
+      readAgentSessionFailureFact({
+        kind: 'restartFailed',
+        refusal: { code: 'agent_session_conflict', details: { reason: 'claimConflicted' } },
+        detail: { text: 'x', audience: 'person' }
+      })
+    ).toEqual({
+      kind: 'restartFailed',
+      refusal: { code: 'agent_session_conflict', details: { reason: 'claimConflicted' } },
+      detail: { text: 'x', audience: 'person' }
+    })
+  })
+
+  it('keeps what a provider said it is retrying, and only that', () => {
+    expect(
+      readAgentSessionFailureFact({
+        kind: 'providerRetrying',
+        retry: { error: 'rate_limit', status: 429, attempt: 3 }
+      })
+    ).toEqual({ kind: 'providerRetrying', retry: { error: 'rate_limit', status: 429 } })
+    expect(
+      readAgentSessionFailureFact({ kind: 'providerRetrying', retry: { error: '', status: 'x' } })
+    ).toEqual({ kind: 'providerRetrying' })
+  })
+
+  it('reads a row an unreleased build wrote with a cause as a refusal with no details', () => {
+    expect(
+      readAgentSessionFailureFact({
+        kind: 'restartFailed',
+        refusal: { code: 'agent_session_conflict', cause: 'claimConflicted' }
+      })
+    ).toEqual({ kind: 'restartFailed', refusal: { code: 'agent_session_conflict' } })
+  })
+
+  it('drops what a newer host wrote that this build cannot place', () => {
+    expect(readAgentSessionFailureFact({ kind: 'futureKind' })).toBeUndefined()
+    expect(readAgentSessionFailureFact(undefined)).toBeUndefined()
+    expect(
+      readAgentSessionFailureFact({
+        kind: 'restartFailed',
+        refusal: { code: 'agent_session_conflict', details: { reason: 'futureReason' } },
+        detail: { text: 'x', audience: 'future' }
+      })
+    ).toEqual({ kind: 'restartFailed', refusal: { code: 'agent_session_conflict' } })
+  })
+})
diff --git a/src/shared/agent-session-failure.ts b/src/shared/agent-session-failure.ts
new file mode 100644
index 000000000000..ee4d5f739b23
--- /dev/null
+++ b/src/shared/agent-session-failure.ts
@@ -0,0 +1,265 @@
+// What went wrong in a chat, typed where the host decides it, beside the sentence a person reads.
+//
+// The host writes both at once: `text`/`reason` stays a complete sentence because released clients
+// print it as it is, and this fact is what newer clients choose their copy and action from. A
+// provider's own words ride separately as `detail`, set only where Orca composed them from a
+// value the provider wrote — never recovered from a string afterwards, since by then nothing can
+// tell a provider's sentence from Orca's.
+
+import {
+  readAgentSessionRefusalReference,
+  type AgentSessionRefusalReference
+} from './agent-session-wire-refusals'
+
+/** One per situation with its own honest next step; a new one needs copy before it compiles. */
+export const AGENT_SESSION_FAILURE_KINDS = [
+  /** Only an observed exit: the provider stopped while starting. */
+  'providerStartFailed',
+  /** A start that did not land, with no one to blame: Orca's fault, a failed spawn, a close. */
+  'startFailed',
+  'notSignedIn',
+  'historyTooLarge',
+  'managedAccountEnvOverride',
+  'accountSwitchInProgress',
+  'managedAccountUnsupported',
+  'providerExited',
+  'restartFailed',
+  'providerRejected',
+  'attachmentInvalid',
+  'attachmentUnreadable',
+  'emptyMessage',
+  'queueFull',
+  'writeFailed',
+  'cancelled',
+  'chatClosed',
+  'hostRestarted',
+  'notDelivered',
+  'compactionFailed',
+  'compactionUnconfirmed',
+  'cancelUnconfirmed',
+  /** A Stop naming no turn reached the agent, which ended nothing while the chat read working. */
+  'stopRefused',
+  'answerUnconfirmed',
+  'hostFault',
+  /** Orca stopped an agent whose start never finished. */
+  'hostStopped',
+  /** The provider is retrying a request its API refused; not a failure yet. */
+  'providerRetrying'
+] as const
+export type AgentSessionFailureKind = (typeof AGENT_SESSION_FAILURE_KINDS)[number]
+
+export function isAgentSessionFailureKind(value: unknown): value is AgentSessionFailureKind {
+  return typeof value === 'string' && AGENT_SESSION_FAILURE_KINDS.some((kind) => kind === value)
+}
+
+/** Kinds only a status row reports: none is ever why a message was not sent. */
+const STATUS_ROW_ONLY_FAILURE_KINDS = [
+  'compactionFailed',
+  'compactionUnconfirmed',
+  'cancelUnconfirmed',
+  'stopRefused',
+  'answerUnconfirmed',
+  'providerRetrying'
+] as const satisfies readonly AgentSessionFailureKind[]
+
+/** Why a message was not sent. A new failure kind is one of these until listed above. */
+export type SubmissionRejectionKind = Exclude<
+  AgentSessionFailureKind,
+  (typeof STATUS_ROW_ONLY_FAILURE_KINDS)[number]
+>
+
+export function isSubmissionRejectionKind(value: unknown): value is SubmissionRejectionKind {
+  return (
+    isAgentSessionFailureKind(value) &&
+    !STATUS_ROW_ONLY_FAILURE_KINDS.some((statusOnly) => statusOnly === value)
+  )
+}
+
+/** `person`: written by the provider for whoever reads the chat, shown inline. `log`: a stderr
+ *  tail or exit status, shown only behind Details. */
+export type ProviderDiagnosticAudience = 'person' | 'log'
+
+export type ProviderDiagnostic = {
+  text: string
+  audience: ProviderDiagnosticAudience
+}
+
+/** Stderr can be a whole dump; the row keeps enough to act on. The same cap as the exit reason a
+ *  lease record keeps, so a diagnostic never outgrows what the record may store. */
+export const MAX_PROVIDER_DIAGNOSTIC_CHARS = 512
+
+/** Which of Orca's checks an image failed. A new one needs a sentence before it compiles. */
+export const AGENT_SESSION_ATTACHMENT_PROBLEM_REASONS = [
+  'empty',
+  'tooLarge',
+  'tooMany',
+  'totalTooLarge',
+  'unsupportedType',
+  'notAFile',
+  'noSource'
+] as const
+export type AgentSessionAttachmentProblemReason =
+  (typeof AGENT_SESSION_ATTACHMENT_PROBLEM_REASONS)[number]
+
+export type AgentSessionAttachmentProblem = {
+  reason: AgentSessionAttachmentProblemReason
+  /** The limit it broke: bytes for `tooLarge` and `totalTooLarge`, a count for `tooMany`. */
+  limit?: number
+}
+
+/** What the provider said it is retrying, in its own fields. */
+export type AgentSessionProviderRetry = {
+  /** The provider's error type, e.g. `rate_limit` or `overloaded`. */
+  error?: string
+  /** The HTTP status the request failed with. */
+  status?: number
+}
+
+export type AgentSessionFailureFact = {
+  kind: AgentSessionFailureKind
+  /** Provider-authored only; absent whenever Orca wrote the words. */
+  detail?: ProviderDiagnostic
+  /** On `restartFailed` and `startFailed`: the refusal that kept the agent from starting. */
+  refusal?: AgentSessionRefusalReference
+  /** On `attachmentInvalid`: which check the attachment failed. */
+  attachment?: AgentSessionAttachmentProblem
+  /** On `providerRetrying`: why the provider is retrying. */
+  retry?: AgentSessionProviderRetry
+}
+
+/** A fact as a row stores it: its kind may be one a newer host added, so only
+ *  `readAgentSessionFailureFact` or the rejection classifier may place it. */
+export type UnreadAgentSessionFailureFact = { kind: string }
+
+/** A fact a rejected message may carry. */
+export type SubmissionRejectionFact = AgentSessionFailureFact & { kind: SubmissionRejectionKind }
+
+export function isSubmissionRejectionFact(
+  fact: AgentSessionFailureFact
+): fact is SubmissionRejectionFact {
+  return isSubmissionRejectionKind(fact.kind)
+}
+
+/** Null for empty text, so a writer never records a detail with nothing in it. */
+export function providerDiagnostic(
+  text: string,
+  audience: ProviderDiagnosticAudience
+): ProviderDiagnostic | undefined {
+  const bounded = text.trim().slice(0, MAX_PROVIDER_DIAGNOSTIC_CHARS).trim()
+  return bounded ? { text: bounded, audience } : undefined
+}
+
+export function agentSessionFailureFact<TKind extends AgentSessionFailureKind>(
+  kind: TKind,
+  extra: {
+    detail?: ProviderDiagnostic
+    refusal?: AgentSessionRefusalReference
+    attachment?: AgentSessionAttachmentProblem
+    retry?: AgentSessionProviderRetry
+  } = {}
+): AgentSessionFailureFact & { kind: TKind } {
+  // Re-bounded here, so no writer can store more than the cap however it built the detail.
+  const detail = extra.detail
+    ? providerDiagnostic(extra.detail.text, extra.detail.audience)
+    : undefined
+  return {
+    kind,
+    ...(detail ? { detail } : {}),
+    ...(extra.refusal ? { refusal: extra.refusal } : {}),
+    ...(extra.attachment ? { attachment: extra.attachment } : {}),
+    ...(extra.retry ? { retry: extra.retry } : {})
+  }
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+export function isProviderDiagnostic(value: unknown): value is ProviderDiagnostic {
+  return (
+    isRecord(value) &&
+    typeof value.text === 'string' &&
+    (value.audience === 'person' || value.audience === 'log')
+  )
+}
+
+function readAttachmentProblem(value: unknown): AgentSessionAttachmentProblem | undefined {
+  if (!isRecord(value)) {
+    return undefined
+  }
+  const reason = AGENT_SESSION_ATTACHMENT_PROBLEM_REASONS.find((known) => known === value.reason)
+  if (!reason) {
+    return undefined
+  }
+  const limit = value.limit
+  return typeof limit === 'number' && Number.isFinite(limit) && limit > 0
+    ? { reason, limit }
+    : { reason }
+}
+
+/** A retry as a reader meets it; undefined when it names neither field. */
+export function readProviderRetry(value: unknown): AgentSessionProviderRetry | undefined {
+  if (!isRecord(value)) {
+    return undefined
+  }
+  const error =
+    typeof value.error === 'string' && value.error.trim() ? value.error.trim() : undefined
+  const status =
+    typeof value.status === 'number' && Number.isInteger(value.status) && value.status > 0
+      ? value.status
+      : undefined
+  return error || status
+    ? { ...(error ? { error } : {}), ...(status ? { status } : {}) }
+    : undefined
+}
+
+/** A fact as a reader meets it. Undefined for anything this build cannot place, including a kind a
+ *  newer host added, so the reader falls back to what it does for a row with no fact. */
+export function readAgentSessionFailureFact(value: unknown): AgentSessionFailureFact | undefined {
+  if (!isRecord(value) || !isAgentSessionFailureKind(value.kind)) {
+    return undefined
+  }
+  const refusal = readAgentSessionRefusalReference(value.refusal)
+  const attachment = readAttachmentProblem(value.attachment)
+  const retry = readProviderRetry(value.retry)
+  return agentSessionFailureFact(value.kind, {
+    ...(isProviderDiagnostic(value.detail) ? { detail: value.detail } : {}),
+    ...(refusal ? { refusal } : {}),
+    ...(attachment ? { attachment } : {}),
+    ...(retry ? { retry } : {})
+  })
+}
+
+/** The provider-authored diagnostic an error carries, set only where it was composed. Follows the
+ *  `cause` chain, since wrappers such as the acquisition errors keep the original as their cause. */
+export function providerDiagnosticOf(error: unknown): ProviderDiagnostic | undefined {
+  return providerDiagnosticWithin(error, 0)
+}
+
+// One depth bound across `cause` and aggregated errors, so an error that contains itself ends.
+function providerDiagnosticWithin(error: unknown, start: number): ProviderDiagnostic | undefined {
+  let current: unknown = error
+  for (let depth = start; depth < 6 && current instanceof Error; depth += 1) {
+    if ('providerDiagnostic' in current && isProviderDiagnostic(current.providerDiagnostic)) {
+      return current.providerDiagnostic
+    }
+    if (current instanceof AggregateError) {
+      for (const inner of current.errors) {
+        const found = providerDiagnosticWithin(inner, depth + 1)
+        if (found) {
+          return found
+        }
+      }
+    }
+    current = current.cause
+  }
+  return undefined
+}
+
+/** Attaches the provider's words to the error Orca built around them. */
+export function withProviderDiagnostic<TError extends Error>(
+  error: TError,
+  diagnostic: ProviderDiagnostic | undefined
+): TError {
+  return diagnostic ? Object.assign(error, { providerDiagnostic: diagnostic }) : error
+}
diff --git a/src/shared/agent-session-journal-position.ts b/src/shared/agent-session-journal-position.ts
new file mode 100644
index 000000000000..9e317f1ee713
--- /dev/null
+++ b/src/shared/agent-session-journal-position.ts
@@ -0,0 +1,36 @@
+// The journal's own order: the sequence of the row that created an item, then the
+// item's place among that row's writes. Time never enters it — a row recovered
+// after a crash carries the provider's earlier clock at a later sequence.
+
+import type { AgentJournalPosition, AgentJournalRenderItem } from './agent-session-journal-types'
+import type { NativeChatMessage } from './native-chat-types'
+
+type PositionedItem = Pick<AgentJournalRenderItem, 'sequence' | 'sequenceIndex'>
+
+/** What every transcript row projected from a journal item carries, so a row
+ *  that changes shape (a question once answered) keeps its identity and place. */
+export function agentJournalItemRowOrigin(
+  item: AgentJournalRenderItem
+): Pick<NativeChatMessage, 'id' | 'timestamp' | 'source' | 'journalPosition'> {
+  return {
+    id: item.itemId,
+    timestamp: item.observedAt,
+    source: 'transcript',
+    journalPosition: agentJournalItemPosition(item)
+  }
+}
+
+export function agentJournalItemPosition(item: PositionedItem): AgentJournalPosition {
+  return { sequence: item.sequence, index: item.sequenceIndex ?? 0 }
+}
+
+export function compareAgentJournalPositions(
+  a: AgentJournalPosition,
+  b: AgentJournalPosition
+): number {
+  return a.sequence - b.sequence || a.index - b.index
+}
+
+export function compareAgentJournalItems(a: PositionedItem, b: PositionedItem): number {
+  return a.sequence - b.sequence || (a.sequenceIndex ?? 0) - (b.sequenceIndex ?? 0)
+}
diff --git a/src/shared/agent-session-journal-producer.ts b/src/shared/agent-session-journal-producer.ts
index ff51c6eaf576..2a5410eb2752 100644
--- a/src/shared/agent-session-journal-producer.ts
+++ b/src/shared/agent-session-journal-producer.ts
@@ -25,7 +25,15 @@ import type {
 export function isRootAgentJournalItem(
   item: Pick<AgentJournalRenderItem, 'agentId'> | undefined
 ): boolean {
-  return item?.agentId == null
+  return agentJournalItemSubagentId(item) === null
+}
+
+/** The subagent that produced a row, or null when the session's own agent did.
+ *  Same reading of absence as {@link isRootAgentJournalItem}. */
+export function agentJournalItemSubagentId(
+  item: Pick<AgentJournalRenderItem, 'agentId'> | undefined
+): string | null {
+  return item?.agentId ?? null
 }
 
 /** Whether a write names its producer at all. One that does not revises a row
diff --git a/src/shared/agent-session-journal-schemas.test.ts b/src/shared/agent-session-journal-schemas.test.ts
index ec66caaa059e..594d6a04b11c 100644
--- a/src/shared/agent-session-journal-schemas.test.ts
+++ b/src/shared/agent-session-journal-schemas.test.ts
@@ -332,6 +332,57 @@ describe('optional notice metadata', () => {
   })
 })
 
+describe('typed failure facts', () => {
+  it('admits a status row and a submission with a fact, and the same rows without one', () => {
+    const failure = {
+      kind: 'providerStartFailed',
+      detail: { text: 'exit status 1', audience: 'log' }
+    }
+    expect(isAdmissibleAgentJournalItemBody({ kind: 'status', text: 'Stopped.', failure })).toBe(
+      true
+    )
+    expect(isAdmissibleAgentJournalItemBody({ kind: 'status', text: 'Stopped.' })).toBe(true)
+    const submission = {
+      clientMessageId: 'cm-1',
+      fence: 1,
+      payloadFingerprint: 'fp',
+      dispatchState: 'rejected',
+      providerItemId: null,
+      reason: 'Not sent.',
+      submittedAt: 1,
+      resolvedAt: 2
+    }
+    expect(isAdmissibleAgentJournalSubmission(submission)).toBe(true)
+    expect(isAdmissibleAgentJournalSubmission({ ...submission, rejection: failure })).toBe(true)
+  })
+
+  it("admits a refusal's details, and a row an earlier build wrote with its cause", () => {
+    const refused = (refusal: Record<string, unknown>) =>
+      isAdmissibleAgentJournalItemBody({
+        kind: 'status',
+        text: "Codex couldn't restart.",
+        failure: { kind: 'restartFailed', refusal }
+      })
+    expect(
+      refused({
+        code: 'agent_session_conflict',
+        details: { reason: 'claimConflicted', futureFact: 1 }
+      })
+    ).toBe(true)
+    expect(refused({ code: 'agent_session_conflict', cause: 'claimConflicted' })).toBe(true)
+  })
+
+  it('keeps a kind or audience a newer host writes admissible', () => {
+    expect(
+      isAdmissibleAgentJournalItemBody({
+        kind: 'status',
+        text: 'Stopped.',
+        failure: { kind: 'futureKind', detail: { text: 'x', audience: 'future' } }
+      })
+    ).toBe(true)
+  })
+})
+
 describe('optional tool annotations', () => {
   const body = { kind: 'tool-call', name: 'shell', input: null, state: 'completed' }
   it('admits old rows and rows with optional annotations without a new kind', () => {
diff --git a/src/shared/agent-session-journal-schemas.ts b/src/shared/agent-session-journal-schemas.ts
index b7a80634bf84..d193db01846a 100644
--- a/src/shared/agent-session-journal-schemas.ts
+++ b/src/shared/agent-session-journal-schemas.ts
@@ -18,6 +18,7 @@ import { AgentSessionContextUsageSchema } from './agent-session-context-usage-sc
 import type {
   AgentJournalItemBody,
   AgentJournalMessageItem,
+  AgentJournalResolution,
   AgentJournalRenderItem,
   AgentJournalSubmission
 } from './agent-session-journal-types'
@@ -199,6 +200,14 @@ const ThreadGoalState = z.union([
   z.object({ state: z.string() }).refine((value) => !['set', 'cleared'].includes(value.state))
 ])
 
+/** Open like `state`: a kind, audience or refusal detail a newer host writes must not turn the row
+ *  malformed; the fact reader is where an unplaceable one is dropped. */
+const FailureFact = z.object({
+  kind: z.string().min(1),
+  detail: z.object({ text: z.string(), audience: z.string().min(1) }).optional(),
+  refusal: z.object({ code: z.string().min(1), details: z.looseObject({}).optional() }).optional()
+})
+
 export const AgentJournalItemBodySchema = z.discriminatedUnion('kind', [
   MessageBody,
   z.object({
@@ -251,7 +260,8 @@ export const AgentJournalItemBodySchema = z.discriminatedUnion('kind', [
       })
       .optional(),
     providerFrame: ProviderFrame.optional(),
-    threadGoal: ThreadGoalState.optional()
+    threadGoal: ThreadGoalState.optional(),
+    failure: FailureFact.optional()
   }),
   z.object({
     kind: z.literal('turn'),
@@ -289,6 +299,7 @@ export const AgentJournalRenderItemSchema = z.object({
   revision: z.number().int(),
   body: AgentJournalItemBodySchema,
   sequence: z.number().int(),
+  sequenceIndex: z.number().int().nonnegative().optional(),
   observedAt: z.number(),
   recovered: z.literal(true).optional(),
   recoveredAt: z.number().optional(),
@@ -304,9 +315,16 @@ export const AgentJournalSubmissionSchema = z.object({
   reason: z.string().nullable(),
   submittedAt: z.number(),
   resolvedAt: z.number().nullable(),
-  recovered: z.literal(true).optional()
+  recovered: z.literal(true).optional(),
+  handoverRecorded: z.literal(true).optional(),
+  handedOverAt: z.number().optional(),
+  rejection: FailureFact.optional()
 })
 
+export function isAgentJournalResolution(value: unknown): value is AgentJournalResolution {
+  return Resolution.safeParse(value).success
+}
+
 export function isAdmissibleAgentJournalItemBody(value: unknown): value is AgentJournalItemBody {
   return AgentJournalItemBodySchema.safeParse(value).success
 }
diff --git a/src/shared/agent-session-journal-types.ts b/src/shared/agent-session-journal-types.ts
index f5bd250c0c9c..a17561e6b810 100644
--- a/src/shared/agent-session-journal-types.ts
+++ b/src/shared/agent-session-journal-types.ts
@@ -7,6 +7,8 @@
 // rewritten in place, so a host that cannot read a row refuses to write the
 // journal rather than skipping or compacting past it.
 
+import type { UnreadAgentSessionFailureFact } from './agent-session-failure'
+import type { AgentSessionFailureRowWords } from './agent-session-failure-words'
 import type { AgentType } from './agent-status-types'
 import type { AgentSessionQuestionAnswer } from './agent-session-question-answer'
 import type { AgentJournalTurnOutcome } from './agent-turn-outcome'
@@ -257,9 +259,8 @@ export type AgentJournalThreadGoalState =
   | { state: 'set'; goal: AgentJournalThreadGoal }
   | { state: 'cleared' }
 
-export type AgentJournalStatusItem = {
+type AgentJournalStatusItemFields = {
   kind: 'status'
-  text: string
   /** Optional display hints; unknown values retain the ordinary text fallback. */
   presentation?: string
   tone?: string
@@ -278,6 +279,19 @@ export type AgentJournalStatusItem = {
   threadGoal?: AgentJournalThreadGoalState
 }
 
+/** A status row that reports no failure; its text is its writer's own. */
+export type AgentJournalPlainStatusItem = AgentJournalStatusItemFields & {
+  text: string
+  failure?: undefined
+}
+
+export type AgentJournalStatusItem =
+  | AgentJournalPlainStatusItem
+  | (AgentJournalStatusItemFields &
+      /** A row that reports a failure: what failed, typed, beside the sentence older clients print,
+       *  both from `agentSessionFailureWords`. Absent on rows from older hosts. */
+      AgentSessionFailureRowWords)
+
 /** The durable record of one root turn. `running` exposes cancellation while
  *  the provider can still accept it; the item is revised to a terminal state,
  *  never tombstoned, so the endpoints survive. Timestamps are the execution
@@ -327,6 +341,13 @@ export type AgentJournalProducerLinkage = {
   attempt?: number
 }
 
+/** Where the journal placed an item: the sequence of the row that created it,
+ *  then its place among that row's writes. The timeline's only ordering key. */
+export type AgentJournalPosition = {
+  sequence: number
+  index: number
+}
+
 /** One reduced timeline entry. `sequence` orders the list; `observedAt` is the
  *  provider's own clock and may sort earlier than a later sequence when the row
  *  was recovered after a crash. */
@@ -335,6 +356,9 @@ export type AgentJournalRenderItem = AgentJournalProducerLinkage & {
   revision: number
   body: AgentJournalItemBody
   sequence: number
+  /** Place among the writes of the row at `sequence`, which one lifecycle batch
+   *  shares across every item it creates. Absent ⇒ 0, and on a host that predates it. */
+  sequenceIndex?: number
   observedAt: number
   /** Set when the row was appended by crash reconciliation rather than live. */
   recovered?: true
@@ -357,13 +381,23 @@ export type AgentJournalSubmission = {
   dispatchState: AgentJournalDispatchState
   /** Provider item identity adopted on accept; null otherwise. */
   providerItemId: string | null
-  /** Terminal reason on `rejected`. */
+  /** Terminal reason on `rejected`: a sentence a person can read, or one of the legacy markers
+   *  older clients already recognise. On `unknown`, the doubt marker. */
   reason: string | null
+  /** On `rejected`, why, typed; absent on rows from older hosts. */
+  rejection?: UnreadAgentSessionFailureFact
   submittedAt: number
   resolvedAt: number | null
   /** Set when crash reconciliation resolved the dispatch, not the provider. A live
    *  `unknown` is a send still outstanding; a recovered one outlived its writer. */
   recovered?: true
+  /** The host accepted this send to hand over later; absent on sends dispatched as they were
+   *  recorded (older hosts). With no `handedOverAt` yet, a pending one is still queued. */
+  handoverRecorded?: true
+  /** When the host handed it to the provider (its `dispatch{pending}` row). */
+  handedOverAt?: number
+  /** Host-only: the submission row's sequence, which tells which host process accepted it. */
+  acceptedSequence?: number
 }
 
 /** Durable answer to "did my send land?", keyed by client message id. Only an
diff --git a/src/shared/agent-session-lease-adjudication.test.ts b/src/shared/agent-session-lease-adjudication.test.ts
index 2216782b5e5c..35e794efd0d2 100644
--- a/src/shared/agent-session-lease-adjudication.test.ts
+++ b/src/shared/agent-session-lease-adjudication.test.ts
@@ -2,7 +2,6 @@ import { describe, expect, it } from 'vitest'
 import {
   adjudicateAgentSessionRestart,
   agentSessionLeaseAdmitsWriter,
-  classifyObservedAgentSessionSpawnToken,
   evaluateAgentSessionAcquisition,
   isProvenAliveProbe,
   isProvenDeadProbe,
@@ -91,7 +90,11 @@ describe('acquisition compare-and-swap', () => {
         handoffOperationId: null,
         probe: MATCHED
       })
-    ).toEqual({ decision: 'refused', code: 'agent_session_checkpoint_stale' })
+    ).toEqual({
+      decision: 'refused',
+      code: 'agent_session_checkpoint_stale',
+      details: { reason: 'fenceStale' }
+    })
     expect(acquire(held, MATCHED)).toEqual({ decision: 'granted', nextFence: 8 })
   })
 
@@ -108,7 +111,11 @@ describe('acquisition compare-and-swap', () => {
         handoffOperationId: null,
         probe: MATCHED
       })
-    ).toEqual({ decision: 'refused', code: 'agent_session_checkpoint_stale' })
+    ).toEqual({
+      decision: 'refused',
+      code: 'agent_session_checkpoint_stale',
+      details: { reason: 'fenceStale' }
+    })
   })
 
   it('never grants a second owner on expiry alone', () => {
@@ -116,11 +123,13 @@ describe('acquisition compare-and-swap', () => {
     const expired = lease({ leaseDeadlineAt: 1, lastRenewedAt: 1 })
     expect(acquire(expired, INDETERMINATE)).toEqual({
       decision: 'refused',
-      code: 'agent_session_ownership_unknown'
+      code: 'agent_session_ownership_unknown',
+      details: { reason: 'ownerUnproven' }
     })
     expect(acquire(expired, MATCHED)).toEqual({
       decision: 'refused',
-      code: 'agent_session_conflict'
+      code: 'agent_session_conflict',
+      details: { reason: 'ownerAlive' }
     })
     expect(acquire(expired, { outcome: 'pid-absent' })).toEqual({
       decision: 'granted',
@@ -131,7 +140,8 @@ describe('acquisition compare-and-swap', () => {
   it('refuses while unreconciled even with proof the owner is dead', () => {
     expect(acquire(lease({ unreconciled: true }), { outcome: 'pid-absent' })).toEqual({
       decision: 'refused',
-      code: 'execution_owner_reconciling'
+      code: 'execution_owner_reconciling',
+      details: { reason: 'hostReconciling' }
     })
   })
 
@@ -139,14 +149,16 @@ describe('acquisition compare-and-swap', () => {
     // Restart adjudication and recovery resolution are what retire it, once its owner is gone.
     expect(acquire(lease({ claimStatus: 'conflicted' }), { outcome: 'exit-observed' })).toEqual({
       decision: 'refused',
-      code: 'agent_session_conflict'
+      code: 'agent_session_conflict',
+      details: { reason: 'claimConflicted' }
     })
   })
 
   it('refuses acquisition in the recovering stage', () => {
     expect(acquire(lease({ handoffStage: 'recovering' }), { outcome: 'pid-absent' })).toEqual({
       decision: 'refused',
-      code: 'agent_session_ownership_unknown'
+      code: 'agent_session_ownership_unknown',
+      details: { reason: 'ownerUnproven' }
     })
   })
 
@@ -159,7 +171,8 @@ describe('acquisition compare-and-swap', () => {
     })
     expect(acquire(mid, { outcome: 'reservation-unused' }, 'op-2')).toEqual({
       decision: 'refused',
-      code: 'agent_session_operation_conflict'
+      code: 'agent_session_operation_conflict',
+      details: { reason: 'handoffInFlight' }
     })
     expect(acquire(mid, { outcome: 'reservation-unused' }, 'op-1')).toEqual({
       decision: 'retry-reservation',
@@ -171,7 +184,8 @@ describe('acquisition compare-and-swap', () => {
     const reserved = lease({ ownerProcess: null, claimStatus: 'reserved', handoffStage: null })
     expect(acquire(reserved, INDETERMINATE)).toEqual({
       decision: 'refused',
-      code: 'agent_session_ownership_unknown'
+      code: 'agent_session_ownership_unknown',
+      details: { reason: 'ownerUnproven' }
     })
     expect(acquire(reserved, { outcome: 'reservation-unused' })).toEqual({
       decision: 'granted',
@@ -208,14 +222,28 @@ describe('restart reconciliation', () => {
     expect(result).toEqual({
       disposition: 'evicted',
       nextFence: 8,
+      // The death happened between the last renewal and the probe.
       evidence: {
         kind: 'identity-mismatch',
         detail: 'mismatched process-start-time',
-        observedAt: 9_000
+        observedAt: 9_000,
+        ownerFence: 7,
+        lastProvenAliveAt: 500
       }
     })
   })
 
+  it('never records the owner alive after the probe that found it gone', () => {
+    // A clock stepped back across the restart would otherwise write an interval load rejects.
+    expect(
+      adjudicateAgentSessionRestart({
+        lease: lease({ lastRenewedAt: 9_500 }),
+        probe: { outcome: 'pid-absent' },
+        observedAt: 9_000
+      })
+    ).toMatchObject({ evidence: { observedAt: 9_000, lastProvenAliveAt: 9_000 } })
+  })
+
   it('hands an unverifiable owner to recovery resolution instead of evicting it', () => {
     expect(
       adjudicateAgentSessionRestart({
@@ -255,7 +283,13 @@ describe('restart reconciliation', () => {
     ).toEqual({
       disposition: 'evicted',
       nextFence: 8,
-      evidence: { kind: 'pid-absent', detail: 'recorded pid absent on host', observedAt: 9_000 }
+      evidence: {
+        kind: 'pid-absent',
+        detail: 'recorded pid absent on host',
+        observedAt: 9_000,
+        ownerFence: 7,
+        lastProvenAliveAt: 500
+      }
     })
   })
 
@@ -294,13 +328,19 @@ describe('restart reconciliation', () => {
       ).toEqual({
         disposition: 'evicted',
         nextFence: 8,
-        evidence: { kind: 'pid-absent', detail: 'reservation never spawned', observedAt: 9_000 }
+        // The proof is about this reservation's own fence.
+        evidence: {
+          kind: 'pid-absent',
+          detail: 'reservation never spawned',
+          observedAt: 9_000,
+          ownerFence: 7
+        }
       })
     }
   )
 })
 
-describe('writer admission and orphan spawn tokens', () => {
+describe('writer admission', () => {
   it('admits a writer only when reconciled, settled, live, and holding a process', () => {
     expect(agentSessionLeaseAdmitsWriter(lease())).toBe(true)
     expect(agentSessionLeaseAdmitsWriter(lease({ unreconciled: true }))).toBe(false)
@@ -308,18 +348,4 @@ describe('writer admission and orphan spawn tokens', () => {
     expect(agentSessionLeaseAdmitsWriter(lease({ claimStatus: 'reserved' }))).toBe(false)
     expect(agentSessionLeaseAdmitsWriter(lease({ ownerProcess: null }))).toBe(false)
   })
-
-  it('calls a spawn token with no matching lease an orphan', () => {
-    const leases = [lease(), lease({ sessionId: 'session-beta-1', reservedSpawnToken: 'spawn-b' })]
-    expect(classifyObservedAgentSessionSpawnToken({ spawnToken: 'spawn-a', leases })).toBe('owned')
-    expect(classifyObservedAgentSessionSpawnToken({ spawnToken: 'spawn-b', leases })).toBe('owned')
-    expect(classifyObservedAgentSessionSpawnToken({ spawnToken: 'spawn-z', leases })).toBe('orphan')
-  })
-
-  it('still recognises an owner whose reservation token was cleared after proving', () => {
-    const proved = lease({ reservedSpawnToken: null })
-    expect(
-      classifyObservedAgentSessionSpawnToken({ spawnToken: 'spawn-a', leases: [proved] })
-    ).toBe('owned')
-  })
 })
diff --git a/src/shared/agent-session-lease-adjudication.ts b/src/shared/agent-session-lease-adjudication.ts
index ecdb1cecc3a7..271b136456f0 100644
--- a/src/shared/agent-session-lease-adjudication.ts
+++ b/src/shared/agent-session-lease-adjudication.ts
@@ -15,7 +15,10 @@ import type {
   AgentSessionHandoffStage,
   AgentSessionLease
 } from './agent-session-record'
-import type { AgentSessionOwnerVerdict } from './agent-session-wire-refusals'
+import type {
+  AgentSessionOwnerVerdict,
+  AgentSessionRefusalDetailsByCode
+} from './agent-session-wire-refusals'
 
 export type AgentSessionIdentityMatchField = 'process-start-time' | 'spawn-token'
 
@@ -44,7 +47,13 @@ export type AgentSessionAcquisitionDecision =
   | { decision: 'granted'; nextFence: number }
   /** The same acquisition operation re-entering its own reservation; no new fence, no new spawn. */
   | { decision: 'retry-reservation'; fence: number }
-  | { decision: 'refused'; code: AgentSessionLeaseRefusalCode }
+  | {
+      [C in AgentSessionLeaseRefusalCode]: {
+        decision: 'refused'
+        code: C
+        details: AgentSessionRefusalDetailsByCode[C]
+      }
+    }[AgentSessionLeaseRefusalCode]
 
 export type AgentSessionRestartAdjudication =
   /** Nothing is outstanding — no owner, no reservation. Clear any latched stage; the fence stays. */
@@ -71,16 +80,23 @@ export function isProvenAliveProbe(probe: AgentSessionOwnerProbe): boolean {
 
 function deathEvidenceFor(
   probe: AgentSessionOwnerProbe,
-  observedAt: number
+  observedAt: number,
+  lease: AgentSessionLease
 ): AgentSessionDeathEvidence | null {
+  // Capped so a clock that stepped back across the restart still writes a valid interval.
+  const interval = {
+    observedAt,
+    ownerFence: lease.runtimeFence,
+    lastProvenAliveAt: Math.min(lease.lastRenewedAt, observedAt)
+  }
   if (probe.outcome === 'exit-observed') {
-    return { kind: 'exit-observed', detail: 'observed process exit', observedAt }
+    return { kind: 'exit-observed', detail: 'observed process exit', ...interval }
   }
   if (probe.outcome === 'pid-absent') {
-    return { kind: 'pid-absent', detail: 'recorded pid absent on host', observedAt }
+    return { kind: 'pid-absent', detail: 'recorded pid absent on host', ...interval }
   }
   if (probe.outcome === 'identity-mismatch') {
-    return { kind: 'identity-mismatch', detail: `mismatched ${probe.field}`, observedAt }
+    return { kind: 'identity-mismatch', detail: `mismatched ${probe.field}`, ...interval }
   }
   return null
 }
@@ -131,23 +147,43 @@ export function evaluateAgentSessionAcquisition(args: {
 }): AgentSessionAcquisitionDecision {
   const { lease, expectedFence, handoffOperationId, probe } = args
   if (lease.unreconciled) {
-    return { decision: 'refused', code: 'execution_owner_reconciling' }
+    return {
+      decision: 'refused',
+      code: 'execution_owner_reconciling',
+      details: { reason: 'hostReconciling' }
+    }
   }
   if (!isAgentSessionFenceCurrent(lease, expectedFence)) {
-    return { decision: 'refused', code: 'agent_session_checkpoint_stale' }
+    return {
+      decision: 'refused',
+      code: 'agent_session_checkpoint_stale',
+      details: { reason: 'fenceStale' }
+    }
   }
   if (lease.claimStatus === 'conflicted') {
     // Why: the user's own terminal agent; restart adjudication and recovery retire it once gone.
-    return { decision: 'refused', code: 'agent_session_conflict' }
+    return {
+      decision: 'refused',
+      code: 'agent_session_conflict',
+      details: { reason: 'claimConflicted' }
+    }
   }
   if (lease.handoffStage === 'recovering') {
     // Why: no stage expires into an owner; recovery resolution concludes about it first.
-    return { decision: 'refused', code: 'agent_session_ownership_unknown' }
+    return {
+      decision: 'refused',
+      code: 'agent_session_ownership_unknown',
+      details: { reason: 'ownerUnproven' }
+    }
   }
   if (lease.handoffStage !== null && lease.handoffOperationId !== null) {
     if (handoffOperationId !== lease.handoffOperationId) {
       // Why: the retry key is operation id + fence + stage; a different id is a different intent.
-      return { decision: 'refused', code: 'agent_session_operation_conflict' }
+      return {
+        decision: 'refused',
+        code: 'agent_session_operation_conflict',
+        details: { reason: 'handoffInFlight' }
+      }
     }
     if (
       lease.ownerProcess === null &&
@@ -162,19 +198,24 @@ export function evaluateAgentSessionAcquisition(args: {
     if (!isProvenDeadProbe(probe)) {
       // Why: a lapsed deadline means Orca stopped hearing from the owner, not that the child
       // stopped editing files and spending tokens.
-      return {
-        decision: 'refused',
-        code: isProvenAliveProbe(probe)
-          ? 'agent_session_conflict'
-          : 'agent_session_ownership_unknown'
-      }
+      return isProvenAliveProbe(probe)
+        ? { decision: 'refused', code: 'agent_session_conflict', details: { reason: 'ownerAlive' } }
+        : {
+            decision: 'refused',
+            code: 'agent_session_ownership_unknown',
+            details: { reason: 'ownerUnproven' }
+          }
     }
     return { decision: 'granted', nextFence: nextAgentSessionFence(lease) }
   }
   if (lease.claimStatus === 'reserved' && probe.outcome !== 'reservation-unused') {
     // Why: a reservation with no proven process is not a free lease — the crash may have lost
     // the race with the spawn rather than beaten it.
-    return { decision: 'refused', code: 'agent_session_ownership_unknown' }
+    return {
+      decision: 'refused',
+      code: 'agent_session_ownership_unknown',
+      details: { reason: 'ownerUnproven' }
+    }
   }
   return { decision: 'granted', nextFence: nextAgentSessionFence(lease) }
 }
@@ -199,14 +240,19 @@ export function adjudicateAgentSessionRestart(args: {
     // Why: a child spawned before its identity was recorded lost its stdio with the runtime that
     // crashed, so nothing can drive it. A token scan that proves no child is the only evidence there
     // can be; without it the lease is released anyway. A live child still carrying the token is
-    // not signalled here, and the orphan reaper, which runs once at store open, may have seen this
-    // lease still claiming it.
+    // never signalled: the token is inherited by every descendant, so it cannot prove which one is
+    // the provider child.
     return {
       disposition: 'evicted',
       nextFence: nextAgentSessionFence(lease),
       evidence:
         probe.outcome === 'reservation-unused'
-          ? { kind: 'pid-absent', detail: 'reservation never spawned', observedAt }
+          ? {
+              kind: 'pid-absent',
+              detail: 'reservation never spawned',
+              observedAt,
+              ownerFence: lease.runtimeFence
+            }
           : null
     }
   }
@@ -219,7 +265,7 @@ export function adjudicateAgentSessionRestart(args: {
       reason: 'owner outlived the runtime that held its transport'
     }
   }
-  const evidence = deathEvidenceFor(probe, observedAt)
+  const evidence = deathEvidenceFor(probe, observedAt, lease)
   if (evidence) {
     return { disposition: 'evicted', nextFence: nextAgentSessionFence(lease), evidence }
   }
@@ -231,19 +277,3 @@ export function adjudicateAgentSessionRestart(args: {
       probe.outcome === 'indeterminate' ? probe.reason : 'process identity could not be verified'
   }
 }
-
-/**
- * A process carrying an Orca spawn token with no matching lease is an orphan: stop it, never
- * adopt it. Neither age nor CPU is evidence — only a token match justifies acting on a process.
- */
-export function classifyObservedAgentSessionSpawnToken(args: {
-  spawnToken: string
-  leases: readonly AgentSessionLease[]
-}): 'owned' | 'orphan' {
-  const owned = args.leases.some(
-    (lease) =>
-      lease.reservedSpawnToken === args.spawnToken ||
-      lease.ownerProcess?.spawnToken === args.spawnToken
-  )
-  return owned ? 'owned' : 'orphan'
-}
diff --git a/src/shared/agent-session-mutation-envelope.test.ts b/src/shared/agent-session-mutation-envelope.test.ts
index 306450f8a639..028de74935ad 100644
--- a/src/shared/agent-session-mutation-envelope.test.ts
+++ b/src/shared/agent-session-mutation-envelope.test.ts
@@ -163,11 +163,18 @@ describe('admitAgentSessionMutation', () => {
   it('surfaces a ledger refusal verbatim', () => {
     const admission = admitAgentSessionMutation({
       ...base,
-      ledger: { decision: 'refused', code: 'agent_session_operation_expired' }
+      ledger: {
+        decision: 'refused',
+        code: 'agent_session_operation_expired',
+        details: { reason: 'operationExpired' }
+      }
     })
     expect(admission).toMatchObject({
       decision: 'refused',
-      refusal: { code: 'agent_session_operation_expired' }
+      refusal: {
+        code: 'agent_session_operation_expired',
+        details: { reason: 'operationExpired' }
+      }
     })
   })
 })
diff --git a/src/shared/agent-session-mutation-envelope.ts b/src/shared/agent-session-mutation-envelope.ts
index b591d82af2e0..770c184b5628 100644
--- a/src/shared/agent-session-mutation-envelope.ts
+++ b/src/shared/agent-session-mutation-envelope.ts
@@ -15,6 +15,7 @@ import { agentSessionLeaseAdmitsWriter } from './agent-session-lease-adjudicatio
 import type { AgentSessionLease } from './agent-session-record'
 import { terminalOwnerRefusalMessage } from './agent-session-legacy-handoff-lease'
 import type { AgentSessionMutationEnvelope, AgentSessionWireRefusal } from './agent-session-wire'
+import { refuse } from './agent-session-wire-refusals'
 
 /**
  * Stable digest over the fields that define what this call DOES. Keys are
@@ -64,11 +65,11 @@ export function agentSessionFingerprintConflict(
 ): AgentSessionWireRefusal | null {
   return envelope.payloadFingerprint === hostFingerprint
     ? null
-    : {
-        code: 'agent_session_operation_conflict',
-        message:
-          'The payload does not match the fingerprint the client declared for this operation.'
-      }
+    : refuse(
+        'agent_session_operation_conflict',
+        { reason: 'fingerprintMismatch' },
+        'The payload does not match the fingerprint the client declared for this operation.'
+      )
 }
 
 export type AgentSessionMutationAdmission =
@@ -92,6 +93,9 @@ export function admitAgentSessionMutation(input: {
   /** Decision from the durable ledger, evaluated under `hostFingerprint`. */
   ledger: AgentSessionOperationDecision
   lease: AgentSessionLease
+  /** A write to the conversation, not to the provider child: a send is accepted and a Stop
+   *  withdraws queued messages whoever owns the child, so the lease does not admit them. */
+  conversationWrite?: true
 }): AgentSessionMutationAdmission {
   const { envelope, lease, ledger } = input
   const mismatch = agentSessionFingerprintConflict(envelope, input.hostFingerprint)
@@ -101,15 +105,19 @@ export function admitAgentSessionMutation(input: {
   if (ledger.decision === 'refused') {
     return {
       decision: 'refused',
-      refusal: {
-        code: ledger.code,
-        message: `Operation ${envelope.clientOperationId} was refused: ${ledger.code}.`
-      }
+      refusal: refuse(
+        ledger.code,
+        ledger.details,
+        `Operation ${envelope.clientOperationId} was refused: ${ledger.code}.`
+      )
     }
   }
   if (ledger.decision === 'replay') {
     return { decision: 'replay', row: ledger.row }
   }
+  if (input.conversationWrite) {
+    return { decision: 'admit', row: ledger.row }
+  }
   const leaseRefusal = refuseUnlessWriterAdmitted(lease)
   if (leaseRefusal) {
     return { decision: 'refused', refusal: leaseRefusal }
@@ -124,24 +132,31 @@ function refuseUnlessWriterAdmitted(lease: AgentSessionLease): AgentSessionWireR
     return null
   }
   if (lease.unreconciled) {
-    return {
-      code: 'execution_owner_reconciling',
-      message: 'This host has not yet adjudicated the session lease.'
-    }
+    return refuse(
+      'execution_owner_reconciling',
+      { reason: 'hostReconciling' },
+      'This host has not yet adjudicated the session lease.'
+    )
   }
   if (lease.handoffStage !== null) {
-    return {
-      code: 'agent_session_conflict',
-      message:
-        lease.claimStatus === 'conflicted'
-          ? terminalOwnerRefusalMessage(lease)
-          : lease.handoffStage === 'new-owner-proving'
-            ? 'The chat is still starting.'
-            : "Orca has not yet confirmed that this chat's previous agent process stopped. Reopen the chat to check again."
+    if (lease.claimStatus === 'conflicted') {
+      return refuse(
+        'agent_session_conflict',
+        { reason: 'claimConflicted' },
+        terminalOwnerRefusalMessage(lease)
+      )
     }
+    return lease.handoffStage === 'new-owner-proving'
+      ? refuse('agent_session_conflict', { reason: 'chatStarting' }, 'The chat is still starting.')
+      : refuse(
+          'agent_session_conflict',
+          { reason: 'ownerUnproven' },
+          "Orca has not yet confirmed that this chat's previous agent process stopped. Reopen the chat to check again."
+        )
   }
-  return {
-    code: 'agent_session_ownership_unknown',
-    message: 'The session has no live owner to accept writes.'
-  }
+  return refuse(
+    'agent_session_ownership_unknown',
+    { reason: 'noLiveOwner' },
+    'The session has no live owner to accept writes.'
+  )
 }
diff --git a/src/shared/agent-session-operation-ledger.test.ts b/src/shared/agent-session-operation-ledger.test.ts
index 0710eade4614..ef10fac8f2b4 100644
--- a/src/shared/agent-session-operation-ledger.test.ts
+++ b/src/shared/agent-session-operation-ledger.test.ts
@@ -64,7 +64,8 @@ describe('operation admission', () => {
     admit(rows)
     expect(evaluate(rows, { fingerprint: 'fp-2' })).toEqual({
       decision: 'refused',
-      code: 'agent_session_operation_conflict'
+      code: 'agent_session_operation_conflict',
+      details: { reason: 'operationIdReused' }
     })
   })
 
@@ -78,14 +79,19 @@ describe('operation admission', () => {
     const rows = new Map<string, AgentSessionOperationRow>()
     expect(evaluate(rows, { operationId: 'not-an-operation-id' })).toEqual({
       decision: 'refused',
-      code: 'agent_session_operation_invalid'
+      code: 'agent_session_operation_invalid',
+      details: { reason: 'operationIdInvalid' }
     })
     // Why: a future-dated id would look new again after its own tombstone is collected.
     expect(
       evaluate(rows, {
         operationId: operationId(NOW + AGENT_SESSION_OPERATION_FUTURE_SKEW_MS + 1)
       })
-    ).toEqual({ decision: 'refused', code: 'agent_session_operation_invalid' })
+    ).toEqual({
+      decision: 'refused',
+      code: 'agent_session_operation_invalid',
+      details: { reason: 'operationIdInvalid' }
+    })
     expect(
       evaluate(rows, { operationId: operationId(NOW + AGENT_SESSION_OPERATION_FUTURE_SKEW_MS) })
         .decision
@@ -97,7 +103,8 @@ describe('operation admission', () => {
     const stale = operationId(NOW - AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS - 1)
     expect(evaluate(rows, { operationId: stale })).toEqual({
       decision: 'refused',
-      code: 'agent_session_operation_expired'
+      code: 'agent_session_operation_expired',
+      details: { reason: 'operationExpired' }
     })
     expect(
       evaluate(rows, { operationId: operationId(NOW - AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS) })
@@ -110,12 +117,14 @@ describe('operation admission', () => {
     admit(rows, { operationId: operationId(NOW, 'b'.repeat(32)) })
     expect(evaluate(rows, { perClientLimit: 1 })).toEqual({
       decision: 'refused',
-      code: 'agent_session_operation_capacity'
+      code: 'agent_session_operation_capacity',
+      details: { reason: 'operationCapacity' }
     })
     // A different caller is still refused once the global cap is reached.
     expect(evaluate(rows, { callerKey: 'client-2', globalLimit: 1 })).toEqual({
       decision: 'refused',
-      code: 'agent_session_operation_capacity'
+      code: 'agent_session_operation_capacity',
+      details: { reason: 'operationCapacity' }
     })
     expect(evaluate(rows, { callerKey: 'client-2', perClientLimit: 1 }).decision).toBe('admit')
   })
diff --git a/src/shared/agent-session-operation-ledger.ts b/src/shared/agent-session-operation-ledger.ts
index 18d0f18754bd..90caec22bb79 100644
--- a/src/shared/agent-session-operation-ledger.ts
+++ b/src/shared/agent-session-operation-ledger.ts
@@ -1,3 +1,7 @@
+import type {
+  AgentSessionAnyRefusalDetails,
+  AgentSessionRefusalDetailsByCode
+} from './agent-session-refusal-details'
 import {
   isAgentSessionRewindResult,
   type AgentSessionRewindReason,
@@ -55,7 +59,15 @@ export type AgentSessionOperationOutcome =
        */
       launch?: unknown
     }
-  | { status: 'failed'; code: string; message?: string; rewindReason?: AgentSessionRewindReason }
+  | {
+      status: 'failed'
+      code: string
+      message?: string
+      rewindReason?: AgentSessionRewindReason
+      /** Beside the code, so a replay says what the first answer did. Read back against the code,
+       *  since the code is a string here; a row written before details carries none. */
+      details?: AgentSessionAnyRefusalDetails
+    }
   /** The effect may or may not have happened; replay this answer instead of spawning again. */
   | { status: 'unknown' }
 
@@ -78,7 +90,13 @@ export type AgentSessionOperationRefusalCode =
 export type AgentSessionOperationDecision =
   | { decision: 'replay'; row: AgentSessionOperationRow }
   | { decision: 'admit'; row: AgentSessionOperationRow }
-  | { decision: 'refused'; code: AgentSessionOperationRefusalCode }
+  | {
+      [C in AgentSessionOperationRefusalCode]: {
+        decision: 'refused'
+        code: C
+        details: AgentSessionRefusalDetailsByCode[C]
+      }
+    }[AgentSessionOperationRefusalCode]
 
 /** NUL cannot occur in a caller key or operation id, so no pair can forge another pair's key. */
 const OPERATION_KEY_SEPARATOR = '\u0000'
@@ -228,19 +246,31 @@ export function evaluateAgentSessionOperation(args: {
     operationTimestamp > now + AGENT_SESSION_OPERATION_FUTURE_SKEW_MS
   ) {
     // Why: a future-dated id could look new again after its tombstone is collected.
-    return { decision: 'refused', code: 'agent_session_operation_invalid' }
+    return {
+      decision: 'refused',
+      code: 'agent_session_operation_invalid',
+      details: { reason: 'operationIdInvalid' }
+    }
   }
   const key = agentSessionOperationKey(callerKey, operationId)
   const existing = rows.get(key)
   if (existing) {
     return existing.fingerprint === fingerprint
       ? { decision: 'replay', row: existing }
-      : { decision: 'refused', code: 'agent_session_operation_conflict' }
+      : {
+          decision: 'refused',
+          code: 'agent_session_operation_conflict',
+          details: { reason: 'operationIdReused' }
+        }
   }
   if (now - operationTimestamp > AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS) {
     // Why: once a tombstone could have expired, an unseen replay must never be reinterpreted as
     // permission to start another fresh agent.
-    return { decision: 'refused', code: 'agent_session_operation_expired' }
+    return {
+      decision: 'refused',
+      code: 'agent_session_operation_expired',
+      details: { reason: 'operationExpired' }
+    }
   }
   const perClientLimit = args.perClientLimit ?? AGENT_SESSION_DURABLE_OPERATION_PER_CLIENT_LIMIT
   const globalLimit = args.globalLimit ?? AGENT_SESSION_DURABLE_OPERATION_GLOBAL_LIMIT
@@ -253,7 +283,11 @@ export function evaluateAgentSessionOperation(args: {
   if (callerCount >= perClientLimit || rows.size >= globalLimit) {
     // Why: tombstones cannot be evicted early without making an old replay capable of spawning
     // again; reject new ids until retained rows age out.
-    return { decision: 'refused', code: 'agent_session_operation_capacity' }
+    return {
+      decision: 'refused',
+      code: 'agent_session_operation_capacity',
+      details: { reason: 'operationCapacity' }
+    }
   }
   return {
     decision: 'admit',
diff --git a/src/shared/agent-session-option-catalog-codebuddy.ts b/src/shared/agent-session-option-catalog-codebuddy.ts
new file mode 100644
index 000000000000..d0a8afa04c51
--- /dev/null
+++ b/src/shared/agent-session-option-catalog-codebuddy.ts
@@ -0,0 +1,44 @@
+import { hasFlag } from './agent-cli-flag-detection'
+import { removeAgentArgOption } from './agent-session-option-agent-args'
+import type { AgentSessionOptionCatalog, CatalogOption } from './agent-session-option-catalog-types'
+
+const CODEBUDDY_EFFORT: CatalogOption = {
+  id: 'effort',
+  label: 'Reasoning effort',
+  category: 'thought_level',
+  kind: {
+    type: 'select',
+    choices: [
+      { value: 'minimal', label: 'Minimal' },
+      { value: 'low', label: 'Low' },
+      { value: 'medium', label: 'Medium' },
+      { value: 'high', label: 'High' },
+      { value: 'xhigh', label: 'Extra high' },
+      { value: 'max', label: 'Max' }
+    ],
+    defaultValue: 'medium'
+  },
+  apply: {
+    launchArgs: (value) => ['--effort', String(value)],
+    agentArgsOverride: (tokens) => hasFlag(tokens, ['--effort']),
+    removeAgentArgs: (tokens) => removeAgentArgOption(tokens, ['--effort'])
+  }
+}
+
+export const CODEBUDDY_SESSION_OPTION_CATALOG: AgentSessionOptionCatalog = {
+  supportsWorkerLaunchPreferences: true,
+  // Stable CLI aliases let CodeBuddy resolve the account's current model choices.
+  models: [
+    { id: 'default-model', label: 'Default' },
+    { id: 'fast-model', label: 'Fast' },
+    { id: 'balanced-model', label: 'Balanced' },
+    { id: 'primary-model', label: 'Primary' },
+    { id: 'deep-model', label: 'Deep' }
+  ].map((model) => ({ ...model, options: [CODEBUDDY_EFFORT] })),
+  modelApply: {
+    launchArgs: (value) => ['--model', String(value)],
+    agentArgsOverride: (tokens) => hasFlag(tokens, ['--model']),
+    removeAgentArgs: (tokens) => removeAgentArgOption(tokens, ['--model'])
+  },
+  unknownModelOptions: [CODEBUDDY_EFFORT]
+}
diff --git a/src/shared/agent-session-option-catalog.ts b/src/shared/agent-session-option-catalog.ts
index a8e26f5a0edb..74a7f3848017 100644
--- a/src/shared/agent-session-option-catalog.ts
+++ b/src/shared/agent-session-option-catalog.ts
@@ -1,3 +1,4 @@
+import { CODEBUDDY_SESSION_OPTION_CATALOG } from './agent-session-option-catalog-codebuddy'
 import type { AgentType } from './agent-status-types'
 import { ANTIGRAVITY_SESSION_OPTION_CATALOG } from './agent-session-option-catalog-antigravity'
 import {
@@ -34,6 +35,7 @@ export { createClaudeCatalogOptions }
 const CATALOGS: AgentSessionOptionCatalogMap = {
   antigravity: ANTIGRAVITY_SESSION_OPTION_CATALOG,
   claude: CLAUDE_SESSION_OPTION_CATALOG,
+  codebuddy: CODEBUDDY_SESSION_OPTION_CATALOG,
   codex: CODEX_SESSION_OPTION_CATALOG,
   gemini: GEMINI_SESSION_OPTION_CATALOG,
   cursor: CURSOR_SESSION_OPTION_CATALOG,
diff --git a/src/shared/agent-session-question-answer.ts b/src/shared/agent-session-question-answer.ts
index cc815acf5428..08374adc3d52 100644
--- a/src/shared/agent-session-question-answer.ts
+++ b/src/shared/agent-session-question-answer.ts
@@ -5,6 +5,9 @@ const GROUP_ANSWER_PREFIX = 'question-group:'
 /** A single-question item has no question list; the client and host must agree on its id. */
 const SINGLE_QUESTION_ID = 'q1'
 
+/** Longest option id a host takes, which also bounds an answer packed into one. */
+export const AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH = 1024
+
 /** Largest typed answer to one question, in UTF-8 bytes. */
 export const AGENT_SESSION_QUESTION_ANSWER_MAX_BYTES = 64 * 1024
 
diff --git a/src/shared/agent-session-queued-submission.ts b/src/shared/agent-session-queued-submission.ts
new file mode 100644
index 000000000000..6295897fd54e
--- /dev/null
+++ b/src/shared/agent-session-queued-submission.ts
@@ -0,0 +1,13 @@
+import type { AgentJournalSubmission } from './agent-session-journal-types'
+
+/** Accepted by the host and not yet handed to the provider: provably unwritten, so every way out
+ *  of this state is delivery or a rejection, never doubt. */
+export function isQueuedAgentJournalSubmission(
+  submission: Pick<AgentJournalSubmission, 'handoverRecorded' | 'dispatchState' | 'handedOverAt'>
+): boolean {
+  return (
+    submission.handoverRecorded === true &&
+    submission.dispatchState === 'pending' &&
+    submission.handedOverAt === undefined
+  )
+}
diff --git a/src/shared/agent-session-record.ts b/src/shared/agent-session-record.ts
index 2b85695a8459..12a26e64ac77 100644
--- a/src/shared/agent-session-record.ts
+++ b/src/shared/agent-session-record.ts
@@ -87,6 +87,13 @@ export type AgentSessionDeathEvidence = {
   kind: 'exit-observed' | 'pid-absent' | 'identity-mismatch'
   detail: string
   observedAt: number
+  /** Fence of the owner (or reservation) this death is about; a fence names exactly one. Absent on
+   *  evidence older builds wrote, which then speaks for no turn. */
+  ownerFence?: number
+  /** The death interval's lower bound: the last time the runtime holding the owner's transport
+   *  proved it alive. Only a probe's proof records it: absent on a surface-release exit, a failed
+   *  start, and evidence older builds wrote. */
+  lastProvenAliveAt?: number
 }
 
 export type AgentSessionLease = {
@@ -102,6 +109,8 @@ export type AgentSessionLease = {
   /** Reserved before any process exists, then matched against the child's environment. */
   reservedSpawnToken: string | null
   leaseDeadlineAt: number
+  /** While `ownerProcess` is set, the last time its transport holder proved it alive; parking in
+   *  `recovering` proves nothing, so it leaves this alone. */
   lastRenewedAt: number
   handoffOperationId: string | null
   journalCheckpoint: AgentSessionJournalCheckpoint | null
@@ -276,13 +285,20 @@ function isAgentSessionDeathEvidence(value: unknown): value is AgentSessionDeath
     return false
   }
   const evidence = value as Partial<AgentSessionDeathEvidence>
+  const { observedAt, lastProvenAliveAt, ownerFence } = evidence
   return (
     (evidence.kind === 'exit-observed' ||
       evidence.kind === 'pid-absent' ||
       evidence.kind === 'identity-mismatch') &&
     isBoundedString(evidence.detail, MAX_ID_LENGTH) &&
-    Number.isSafeInteger(evidence.observedAt) &&
-    (evidence.observedAt as number) >= 0
+    typeof observedAt === 'number' &&
+    Number.isSafeInteger(observedAt) &&
+    observedAt >= 0 &&
+    (ownerFence === undefined || (Number.isSafeInteger(ownerFence) && ownerFence >= 0)) &&
+    (lastProvenAliveAt === undefined ||
+      (Number.isSafeInteger(lastProvenAliveAt) &&
+        lastProvenAliveAt >= 0 &&
+        lastProvenAliveAt <= observedAt))
   )
 }
 
diff --git a/src/shared/agent-session-refusal-details.ts b/src/shared/agent-session-refusal-details.ts
new file mode 100644
index 000000000000..6080a772ee2a
--- /dev/null
+++ b/src/shared/agent-session-refusal-details.ts
@@ -0,0 +1,271 @@
+// What a refusal says beyond its code: one reason list and one set of facts per code.
+//
+// A code alone cannot say what to do: `agent_session_operation_invalid` covers a cleared
+// conversation (open the current one) and a busy command (wait). Each reason here is one situation
+// with its own honest words and next step; a reason two codes share is listed under each. There is
+// no catch-all: a site that cannot name its situation sends the code with no reason, the same as an
+// older host, and the reader falls back to what it does for the code.
+
+import type { AgentJournalResolution } from './agent-session-journal-types'
+import { isAgentJournalResolution } from './agent-session-journal-schemas'
+import { AGENT_SESSION_REWIND_REASONS, type AgentSessionRewindReason } from './agent-session-rewind'
+import type {
+  AgentSessionOwnerVerdict,
+  AgentSessionWireRefusalCode
+} from './agent-session-wire-refusals'
+
+export const AGENT_SESSION_REFUSAL_REASONS = {
+  agent_session_operation_invalid: [
+    // The request
+    'requestMalformed',
+    'operationIdInvalid',
+    'messageIdReused',
+    'operationRefusedEarlier',
+    'journalWriteFailed',
+    // The conversation's state
+    'conversationCleared',
+    /** A /clear that never committed; its replacement conversation may not exist. */
+    'clearUnconfirmed',
+    'conversationCommandUnconfirmed',
+    'conversationCommandInFlight',
+    'handoffInFlight',
+    'turnActive',
+    'promptPending',
+    'backgroundTasksRunning',
+    'messagesUnsettled',
+    'rewindRefused',
+    'rewindUnconfirmed',
+    // A prompt card or an option
+    'promptGone',
+    'optionRejected',
+    // The provider
+    'providerStarting',
+    'goalsUnsupported',
+    'providerRejected',
+    'providerStartFailed',
+    'notSignedIn',
+    'historyTooLarge',
+    /** The launch's own Anthropic sign-in variables would override the managed Claude account. */
+    'managedAccountEnvOverride',
+    'accountSwitchInProgress',
+    /** A Claude account is added in WSL and no Windows one is selected, which a chat can't run under. */
+    'managedAccountUnsupported',
+    /** The agent started, then Orca could not open the chat's conversation for it. */
+    'attachFailed'
+  ],
+  agent_session_ownership_unknown: [
+    'sessionNotAttached',
+    'noLiveOwner',
+    /** Orca cannot prove an agent process it recorded or started has exited. */
+    'ownerUnproven',
+    'claimConflicted',
+    'recordMissing',
+    'replaySuperseded',
+    'leaseMoved',
+    'spawnIdentityMismatch',
+    'notResumable',
+    'noProviderChild',
+    'conversationHeldElsewhere'
+  ],
+  agent_session_conflict: [
+    'chatStarting',
+    'ownerUnproven',
+    'claimConflicted',
+    'ownerAlive',
+    'identityMismatch',
+    'sessionExists',
+    'conversationHeldElsewhere',
+    'tabIdTaken'
+  ],
+  execution_owner_reconciling: ['hostReconciling', 'recordUnreadable'],
+  agent_session_checkpoint_stale: ['fenceStale', 'leaseMoved', 'recordMissing'],
+  agent_session_identity_required: ['recordMissing', 'transcriptNotFound', 'transcriptUnreadable'],
+  agent_session_operation_conflict: ['fingerprintMismatch', 'operationIdReused', 'handoffInFlight'],
+  agent_session_operation_expired: ['operationExpired'],
+  agent_session_operation_capacity: ['operationCapacity'],
+  agent_session_operation_unknown: [
+    'outcomeUnknown',
+    'resultLost',
+    'rewindUnconfirmed',
+    'tabUnconfirmed'
+  ],
+  agent_session_item_revision_stale: ['promptMoved'],
+  agent_session_already_resolved: ['promptAlreadyResolved'],
+  agent_session_journal_unreadable: [
+    /** SQLite reports the chat's journal damaged or not a database; no retry reads past it. */
+    'journalCorrupt',
+    /** Any other failed open, which can clear. */
+    'journalUnavailable'
+  ],
+  structured_agent_session_unsupported: [
+    'clientCapabilityMissing',
+    'hostDisabled',
+    'hostUnsupported'
+  ],
+  // Sent with no reason when starting the agent for an operation throws; older clients read it too.
+  agent_session_owner_restart_failed: []
+} as const satisfies Record<AgentSessionWireRefusalCode, readonly string[]>
+
+export type AgentSessionRefusalReason<C extends AgentSessionWireRefusalCode> =
+  (typeof AGENT_SESSION_REFUSAL_REASONS)[C][number]
+
+/** A reason under any code, for a reader that keys words on the name alone. */
+export type AgentSessionAnyRefusalReason = AgentSessionRefusalReason<AgentSessionWireRefusalCode>
+
+type RewindFacts = {
+  /** Which rewind check refused. */
+  rewindReason?: AgentSessionRewindReason
+}
+
+type PromptFacts = {
+  /** The revision the host actually holds. */
+  currentRevision?: number
+  /** The winning answer and who gave it. */
+  resolution?: AgentJournalResolution
+}
+
+type NoFacts = Record<never, never>
+
+/** The facts a code carries beside its reason. */
+type AgentSessionRefusalFactsByCode = {
+  agent_session_operation_invalid: RewindFacts
+  agent_session_operation_unknown: RewindFacts
+  agent_session_checkpoint_stale: {
+    /** So the client can retry without another round trip. */
+    currentFence?: number
+  }
+  agent_session_item_revision_stale: PromptFacts
+  agent_session_already_resolved: PromptFacts
+  agent_session_ownership_unknown: NoFacts
+  agent_session_conflict: NoFacts
+  execution_owner_reconciling: NoFacts
+  agent_session_identity_required: NoFacts
+  agent_session_operation_conflict: NoFacts
+  agent_session_operation_expired: NoFacts
+  agent_session_operation_capacity: NoFacts
+  agent_session_journal_unreadable: NoFacts
+  structured_agent_session_unsupported: NoFacts
+  agent_session_owner_restart_failed: NoFacts
+}
+
+/** A durably failed create says whether anything still runs for it, whichever code it failed
+ *  with: `exited` proves nothing does, so a new operation cannot collide with this one. */
+type AgentSessionRefusalCommonFacts = { ownerVerdict?: AgentSessionOwnerVerdict }
+
+export type AgentSessionRefusalFacts<C extends AgentSessionWireRefusalCode> =
+  AgentSessionRefusalFactsByCode[C] & AgentSessionRefusalCommonFacts
+
+/** What an emitter must name: a reason its code lists, and that code's facts. */
+export type AgentSessionRefusalDetailsByCode = {
+  [C in AgentSessionWireRefusalCode]: {
+    reason: AgentSessionRefusalReason<C>
+  } & AgentSessionRefusalFacts<C>
+}
+
+/** Details as the wire and a durable record carry them. The reason is absent where the host could
+ *  not name the situation; the whole object is absent from older hosts. */
+export type AgentSessionRefusalDetails<C extends AgentSessionWireRefusalCode> = {
+  reason?: AgentSessionRefusalReason<C>
+} & AgentSessionRefusalFacts<C>
+
+/** Details under whichever code, for a store that keeps them beside a code it reads as a string. */
+export type AgentSessionAnyRefusalDetails = AgentSessionRefusalDetails<AgentSessionWireRefusalCode>
+
+/** The loose top-level fields released clients read; the host writes them only from details. */
+export type AgentSessionLegacyRefusalFields = {
+  currentFence?: number
+  currentRevision?: number
+  resolution?: AgentJournalResolution
+  ownerVerdict?: AgentSessionOwnerVerdict
+  rewindReason?: AgentSessionRewindReason
+}
+
+const FACT_KEYS_BY_CODE: Partial<
+  Record<AgentSessionWireRefusalCode, readonly (keyof AgentSessionLegacyRefusalFields)[]>
+> = {
+  agent_session_operation_invalid: ['rewindReason'],
+  agent_session_operation_unknown: ['rewindReason'],
+  agent_session_checkpoint_stale: ['currentFence'],
+  agent_session_item_revision_stale: ['currentRevision', 'resolution'],
+  agent_session_already_resolved: ['currentRevision', 'resolution']
+}
+
+const OWNER_VERDICTS: readonly AgentSessionOwnerVerdict[] = ['live', 'unverifiable', 'exited']
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function readFact(
+  key: keyof AgentSessionLegacyRefusalFields,
+  value: unknown
+): AgentSessionLegacyRefusalFields {
+  switch (key) {
+    case 'currentFence':
+      return Number.isSafeInteger(value) && typeof value === 'number' ? { currentFence: value } : {}
+    case 'currentRevision':
+      return Number.isSafeInteger(value) && typeof value === 'number'
+        ? { currentRevision: value }
+        : {}
+    case 'resolution':
+      return isAgentJournalResolution(value) ? { resolution: value } : {}
+    case 'ownerVerdict': {
+      const ownerVerdict = OWNER_VERDICTS.find((verdict) => verdict === value)
+      return ownerVerdict ? { ownerVerdict } : {}
+    }
+    case 'rewindReason': {
+      const rewindReason = AGENT_SESSION_REWIND_REASONS.find((reason) => reason === value)
+      return rewindReason ? { rewindReason } : {}
+    }
+  }
+}
+
+export function isAgentSessionRefusalReason<C extends AgentSessionWireRefusalCode>(
+  code: C,
+  value: unknown
+): value is AgentSessionRefusalReason<C> {
+  const reasons: readonly string[] = AGENT_SESSION_REFUSAL_REASONS[code]
+  return typeof value === 'string' && reasons.includes(value)
+}
+
+/**
+ * Details as a reader meets them: from the wire, a ledger row or a stored failure, possibly
+ * written by another build. Keeps only a reason and facts this code lists, so a reason a newer
+ * host added reads as none; undefined when nothing is left.
+ */
+export function readAgentSessionRefusalDetails<C extends AgentSessionWireRefusalCode>(
+  code: C,
+  value: unknown
+): AgentSessionRefusalDetails<C> | undefined {
+  if (!isRecord(value)) {
+    return undefined
+  }
+  const keys = [...(FACT_KEYS_BY_CODE[code] ?? []), 'ownerVerdict' as const]
+  const facts = keys.reduce<AgentSessionLegacyRefusalFields>(
+    (kept, key) => ({ ...kept, ...readFact(key, value[key]) }),
+    {}
+  )
+  const read = {
+    ...(isAgentSessionRefusalReason(code, value.reason) ? { reason: value.reason } : {}),
+    ...facts
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the reason was checked against `code`'s list and only the facts `code` lists (plus the verdict every code may carry) were kept.
+  return Object.keys(read).length > 0 ? (read as AgentSessionRefusalDetails<C>) : undefined
+}
+
+/** The loose fields released clients read, taken from details; the one place they are written. */
+export function agentSessionLegacyRefusalFields(
+  details: AgentSessionLegacyRefusalFields | undefined
+): AgentSessionLegacyRefusalFields {
+  if (!details) {
+    return {}
+  }
+  const { currentFence, currentRevision, resolution, ownerVerdict, rewindReason } = details
+  return {
+    ...(rewindReason !== undefined ? { rewindReason } : {}),
+    ...(currentFence !== undefined ? { currentFence } : {}),
+    ...(resolution !== undefined ? { resolution } : {}),
+    ...(currentRevision !== undefined ? { currentRevision } : {}),
+    ...(ownerVerdict !== undefined ? { ownerVerdict } : {})
+  }
+}
diff --git a/src/shared/agent-session-refusal-notice.test.ts b/src/shared/agent-session-refusal-notice.test.ts
new file mode 100644
index 000000000000..a83a95c43880
--- /dev/null
+++ b/src/shared/agent-session-refusal-notice.test.ts
@@ -0,0 +1,645 @@
+import { describe, expect, it } from 'vitest'
+import {
+  AGENT_SESSION_WIRE_REFUSAL_CODES,
+  type AgentSessionWireRefusalCode
+} from './agent-session-wire-refusals'
+import {
+  agentSessionReadHistoryRefusalParts,
+  agentSessionRefusalCauseParts,
+  agentSessionRefusalNotice,
+  agentSessionRefusalReasonWords,
+  agentSessionWriteFailureNotice,
+  agentSessionWriteNoticeEnglish,
+  agentSessionWriteNoticeParts
+} from './agent-session-refusal-notice'
+import {
+  AGENT_SESSION_WRITE_NOTICE_COPY,
+  type AgentSessionWriteNoticeSentence
+} from './agent-session-write-notice-copy'
+import { AGENT_SESSION_REFUSAL_REASONS } from './agent-session-refusal-details'
+import { agentSessionFailureSentence } from './agent-session-failure-words'
+import {
+  agentSessionRefusalFailure,
+  agentSessionRpcErrorFailure,
+  agentSessionWriteKindForMethod,
+  type AgentSessionWriteFailure,
+  type AgentSessionWriteKind,
+  type AgentSessionWriteRefusal
+} from './agent-session-write-failure'
+import {
+  DISPATCH_REJECTED_NOT_DELIVERED,
+  DISPATCH_REJECTED_QUEUE_FULL,
+  DISPATCH_REJECTED_WRITE_FAILED
+} from './structured-agent-session-dispatch-rejection'
+import { structuredAgentSessionRejectionParts } from './structured-agent-session-send-disposition'
+
+const WRITES: AgentSessionWriteKind[] = [
+  'read-history',
+  'send',
+  'composer-send',
+  'stop',
+  'stop-task',
+  'stop-tasks',
+  'answer',
+  'option',
+  'command',
+  'goal'
+]
+const HOST_TEXT = 'Expected runtime fence 1; the session is at 3.'
+
+// A cause is named only where every host emitter of the code means it; any other code says only
+// what did not happen, because one code covers owner states or reasons the client cannot tell apart.
+const CAUSES: Partial<Record<AgentSessionWireRefusalCode, AgentSessionWriteNoticeSentence>> = {
+  // Only send preparation, when the owner it restarted for this send failed to start.
+  agent_session_owner_restart_failed: 'restartFailed',
+  // Only the ledger, when a day's retained operation ids fill a client's or the host's quota.
+  agent_session_operation_capacity: 'capacity',
+  // A replayed operation with no recorded outcome, or a send behind a rewind whose outcome is
+  // unrecorded: either way Orca cannot say what happened.
+  agent_session_operation_unknown: 'outcomeUnknown',
+  // Only the pending-prompt check.
+  agent_session_item_revision_stale: 'questionChanged',
+  agent_session_already_resolved: 'questionChanged',
+  // Send preparation, for any failed open; the code names nothing else.
+  agent_session_journal_unreadable: 'historyUnreadable',
+  // On these writes, only an older host, or the phone reading an unknown method.
+  structured_agent_session_unsupported: 'unsupported'
+}
+
+function isCause(part: unknown): boolean {
+  return typeof part === 'string' && !part.startsWith('notDone') && part !== 'tryAgainComposerSend'
+}
+
+// A newer host can send a code this client has never heard of.
+const FUTURE_CODE: AgentSessionWriteFailure = JSON.parse(
+  '{"kind":"refused","code":"agent_session_from_the_future"}'
+)
+const FAILURES: AgentSessionWriteFailure[] = [
+  ...AGENT_SESSION_WIRE_REFUSAL_CODES.map((code) => ({ kind: 'refused' as const, code })),
+  { kind: 'failed' },
+  { kind: 'unconfirmed' },
+  FUTURE_CODE
+]
+const NOT_DONE: Record<AgentSessionWriteKind, AgentSessionWriteNoticeSentence> = {
+  'read-history': 'notDoneReadHistory',
+  send: 'notDoneSend',
+  'composer-send': 'notDoneSend',
+  stop: 'notDoneStop',
+  'stop-task': 'notDoneStopTask',
+  'stop-tasks': 'notDoneStopTasks',
+  answer: 'notDoneAnswer',
+  option: 'notDoneOption',
+  command: 'notDoneCommand',
+  goal: 'notDoneGoal'
+}
+
+function codeOf(failure: AgentSessionWriteFailure): string {
+  return failure.kind === 'refused' ? failure.code : failure.kind
+}
+
+// The host may have run it: a thrown request, or a replayed id with no recorded outcome.
+function mayHaveRun(failure: AgentSessionWriteFailure): boolean {
+  return codeOf(failure) === 'unconfirmed' || codeOf(failure) === 'agent_session_operation_unknown'
+}
+
+// Where the cause sentence alone already says the write cannot take effect.
+function causeSaysNotDone(
+  failure: AgentSessionWriteFailure,
+  write: AgentSessionWriteKind
+): boolean {
+  const code = codeOf(failure)
+  return (
+    code === 'structured_agent_session_unsupported' ||
+    (write === 'read-history' && code === 'agent_session_journal_unreadable') ||
+    (write === 'answer' &&
+      (code === 'agent_session_item_revision_stale' || code === 'agent_session_already_resolved'))
+  )
+}
+
+// The phone resends under the same id. These record nothing under it (the lease refusals drop the
+// row they admitted), so a resend can go through; every other code can be refused again.
+const RESEND_CAN_WORK = new Set([
+  'failed',
+  'agent_session_checkpoint_stale',
+  'agent_session_conflict',
+  'agent_session_ownership_unknown',
+  'execution_owner_reconciling'
+])
+
+// Every (failure x write) cell of the table, checked against the rules a notice must keep.
+describe('the notice for every failure and write', () => {
+  const cells = FAILURES.flatMap((failure) =>
+    WRITES.map((write) => {
+      const parts = agentSessionWriteNoticeParts(failure, write)
+      return {
+        failure,
+        write,
+        parts,
+        english: agentSessionWriteNoticeEnglish(parts),
+        cell: `${codeOf(failure)} x ${write}`
+      }
+    })
+  )
+
+  it('says the write did not happen, once and for that write, whenever that is certain', () => {
+    for (const { failure, write, parts, cell } of cells.filter((c) => !mayHaveRun(c.failure))) {
+      const notDone = parts.filter((part) => typeof part === 'string' && part.startsWith('notDone'))
+      expect(notDone, cell).toEqual(causeSaysNotDone(failure, write) ? [] : [NOT_DONE[write]])
+    }
+  })
+
+  it('never says a write did not happen when the host may have run it', () => {
+    for (const { parts, cell } of cells.filter((c) => mayHaveRun(c.failure))) {
+      expect(parts, cell).toEqual(['outcomeUnknown'])
+    }
+  })
+
+  // The control that sent the write is how to try again; only the phone's composer has none.
+  it('says how to try again only to update Orca, or on the phone where a resend can work', () => {
+    for (const { failure, write, parts, english, cell } of cells) {
+      const phoneResend = write === 'composer-send' && RESEND_CAN_WORK.has(codeOf(failure))
+      expect(parts.includes('tryAgainComposerSend'), cell).toBe(phoneResend)
+      expect(/again/i.test(english), cell).toBe(
+        phoneResend || codeOf(failure) === 'structured_agent_session_unsupported'
+      )
+    }
+    for (const reason of [null, DISPATCH_REJECTED_WRITE_FAILED, DISPATCH_REJECTED_QUEUE_FULL]) {
+      expect(
+        agentSessionWriteNoticeEnglish(structuredAgentSessionRejectionParts(reason, 'send'))
+      ).not.toMatch(/again/i)
+    }
+  })
+
+  it('names a cause only for a code on the allowlist', () => {
+    for (const { failure, parts, cell } of cells) {
+      const cause =
+        failure.kind === 'unconfirmed'
+          ? 'outcomeUnknown'
+          : failure.kind === 'refused'
+            ? CAUSES[failure.code]
+            : undefined
+      expect(parts.filter(isCause), cell).toEqual(cause ? [cause] : [])
+    }
+  })
+
+  // Census of host emitters, one per code, that write for a log or carry a marker. One is enough
+  // to rule out showing the host's message for that code:
+  // - every code a planned write settles: "Operation <id> was already refused: <code>."
+  //   (structured-agent-session-replay-outcome.ts; the settlement stores no message)
+  // - operation_conflict / _expired / _invalid / _capacity: "Operation <id> was refused: <code>."
+  //   (agent-session-mutation-envelope.ts, the ledger)
+  // - operation_invalid, operation_unknown: `agent_session_rewind:<reason>` (structured-rewind-refusal.ts)
+  // - operation_unknown: "The outcome of operation <id> is unknown; it was not run again."
+  // - checkpoint_stale, conflict, identity_required, execution_owner_reconciling, unsupported: the
+  //   bare code thrown as the message (lease-release, reservation-admission, tab-table,
+  //   claim-identity, lease-transitions, reveal)
+  // - ownership_unknown: "The session attached without a provider child to write to." (agent-start)
+  // - item_revision_stale / already_resolved: "Item <id> has moved on." (prompt-state)
+  // - owner_restart_failed: "<agent> couldn't restart: <cause>.", where the cause is the resume's
+  //   own refusal message, including the ledger's (dead-generation-settlement, agent-start)
+  // - journal_unreadable: "The conversation could not be opened: <error>" (send preparation, before
+  //   it named a reason)
+  it('is never empty and never shows the host message', () => {
+    for (const { failure, write, parts, cell } of cells) {
+      expect(parts.length, cell).toBeGreaterThan(0)
+      expect(
+        parts.every((part) => typeof part === 'string'),
+        cell
+      ).toBe(true)
+      if (failure.kind === 'refused') {
+        expect(
+          agentSessionRefusalNotice({ code: failure.code, message: HOST_TEXT }, write),
+          cell
+        ).not.toContain('fence')
+      }
+    }
+  })
+})
+
+describe('structuredAgentSessionRejectionParts', () => {
+  it('never shows the crash-recovery marker as the reason', () => {
+    expect(structuredAgentSessionRejectionParts(DISPATCH_REJECTED_NOT_DELIVERED, 'send')).toEqual([
+      'notDoneSend'
+    ])
+  })
+})
+
+describe('agentSessionRefusalNotice', () => {
+  // The phone resends under the same operation id. Owner refusals and failed requests record
+  // nothing under it, so a resend can go through; a conflicting or expired id is refused again.
+  it.each([
+    ['agent_session_checkpoint_stale', 'Your message was not sent. Send it again.'],
+    ['execution_owner_reconciling', 'Your message was not sent. Send it again.'],
+    ['agent_session_operation_expired', 'Your message was not sent.'],
+    ['agent_session_operation_conflict', 'Your message was not sent.'],
+    ['agent_session_operation_invalid', 'Your message was not sent.'],
+    ['agent_session_owner_restart_failed', "The agent couldn't restart. Your message was not sent."]
+  ] as const)('tells the phone to send it again only where that can work: %s', (code, expected) => {
+    expect(agentSessionRefusalNotice({ code, message: HOST_TEXT }, 'composer-send')).toBe(expected)
+  })
+
+  it('says what did not happen for a failed request', () => {
+    expect(agentSessionWriteFailureNotice('composer-send')).toBe(
+      'Your message was not sent. Send it again.'
+    )
+    expect(agentSessionWriteFailureNotice('stop')).toBe("The agent wasn't stopped.")
+  })
+
+  // A request that may have run must not say it did not happen.
+  it.each(['runtime_timeout', 'runtime_error', undefined])(
+    'claims nothing about a request that threw with %s',
+    (code) => {
+      for (const write of WRITES) {
+        expect(
+          agentSessionWriteNoticeEnglish(
+            agentSessionWriteNoticeParts(agentSessionRpcErrorFailure(code), write)
+          )
+        ).toBe("Orca couldn't confirm what happened. Check the chat.")
+      }
+    }
+  )
+
+  it('says what did not happen when the host turned the request away before running it', () => {
+    expect(agentSessionRpcErrorFailure('invalid_argument')).toEqual({
+      kind: 'refused',
+      code: 'agent_session_operation_invalid'
+    })
+    expect(agentSessionRpcErrorFailure('method_not_found')).toEqual({
+      kind: 'refused',
+      code: 'structured_agent_session_unsupported'
+    })
+  })
+
+  it('says an agent could not restart without promising a retry will work', () => {
+    // The host words the cause into the chat's status row; some causes need a new chat.
+    expect(
+      agentSessionRefusalNotice(
+        {
+          code: 'agent_session_owner_restart_failed',
+          message:
+            "Claude couldn't restart: Operation 1-a was refused: agent_session_operation_expired."
+        },
+        'send'
+      )
+    ).toBe("The agent couldn't restart. Your message was not sent.")
+  })
+
+  it('names a background-task stop as that, not as stopping the agent', () => {
+    const stop = (fields: Record<string, unknown>): string =>
+      agentSessionRefusalNotice(
+        { code: 'agent_session_checkpoint_stale', message: HOST_TEXT },
+        agentSessionWriteKindForMethod('agentSession.cancel', fields)
+      )
+    expect(stop({ turnId: 't1' })).toBe("The agent wasn't stopped.")
+    expect(stop({ turnId: 'background-tasks', scope: 'background-tasks', taskId: 'b1' })).toBe(
+      "The background task wasn't stopped."
+    )
+    expect(stop({ turnId: 'background-tasks', scope: 'background-tasks' })).toBe(
+      "The background tasks weren't stopped."
+    )
+  })
+
+  it('says a Stop refused over a moved-on prompt did not stop the agent', () => {
+    const refusal = {
+      code: 'agent_session_already_resolved' as const,
+      message: 'Item q1 moved on.'
+    }
+    expect(agentSessionRefusalNotice(refusal, 'stop')).toBe(
+      "This question was already answered or has changed. The agent wasn't stopped."
+    )
+    expect(agentSessionRefusalNotice(refusal, 'answer')).toBe(
+      'This question was already answered or has changed.'
+    )
+  })
+
+  it('says only what did not happen for a code from a newer host', () => {
+    const refusal = JSON.parse('{"code":"agent_session_from_the_future","message":"internal"}')
+    expect(agentSessionRefusalNotice(refusal, 'stop')).toBe("The agent wasn't stopped.")
+  })
+})
+
+// Every (code x reason) a host can name, as a write keeps it.
+const REASONED: AgentSessionWriteRefusal[] = AGENT_SESSION_WIRE_REFUSAL_CODES.flatMap((code) =>
+  AGENT_SESSION_REFUSAL_REASONS[code].map((reason) =>
+    agentSessionRefusalFailure({ code, details: { reason } })
+  )
+)
+
+function reasonOf(failure: AgentSessionWriteRefusal): string {
+  return `${failure.code}/${failure.details?.reason}`
+}
+
+describe('the notice for every reason a host names', () => {
+  const cells = REASONED.flatMap((failure) =>
+    WRITES.map((write) => ({
+      failure,
+      write,
+      parts: agentSessionWriteNoticeParts(failure, write),
+      words: agentSessionRefusalReasonWords(failure),
+      cell: `${reasonOf(failure)} x ${write}`
+    }))
+  )
+
+  it('has words for every reason', () => {
+    for (const { words, cell } of cells) {
+      expect(words, cell).toBeDefined()
+    }
+  })
+
+  it('keeps the code words where the table says the reason means nothing more', () => {
+    for (const { failure, write, parts, words, cell } of cells) {
+      if (words && 'words' in words) {
+        expect(parts, cell).toEqual(
+          agentSessionWriteNoticeParts({ ...failure, details: undefined }, write)
+        )
+      }
+    }
+  })
+
+  // A retry is the control that sent the write; only an open that can clear says to try again.
+  it('names a step exactly where the person has one to take', () => {
+    for (const { words, cell } of cells) {
+      if (words && 'cause' in words) {
+        const retryNow = words.action === 'retry' && words.step === 'tryAgain'
+        expect(words.step !== undefined && !retryNow, cell).toBe(
+          words.action === 'wait' || words.action === 'actFirst' || words.action === 'goElsewhere'
+        )
+        expect(retryNow, cell).toBe(words.cause === 'historyUnavailable')
+      }
+    }
+  })
+
+  // Beside a Retry, that Retry is the step for a reason whose action is to retry, and only for it.
+  it('leaves out only a retry step when a Retry stands beside the words', () => {
+    const beside = { agentName: 'Codex', retryControl: true }
+    for (const { failure, write, parts, words, cell } of cells) {
+      if (words && 'cause' in words) {
+        const retried = words.action === 'retry' ? words.step : undefined
+        expect(agentSessionWriteNoticeParts(failure, write, beside), cell).toEqual(
+          parts.filter((part) => part !== retried)
+        )
+      }
+    }
+    const send = (failure: AgentSessionWriteRefusal) =>
+      agentSessionWriteNoticeParts(failure, 'send', beside)
+    expect(
+      send({
+        kind: 'refused',
+        code: 'agent_session_journal_unreadable',
+        details: { reason: 'journalUnavailable' }
+      })
+    ).toEqual(['historyUnavailable', 'notDoneSend'])
+    expect(
+      send({
+        kind: 'refused',
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'notSignedIn' }
+      })
+    ).toEqual([
+      'notDoneSend',
+      { text: 'Codex is not signed in for the selected account. Sign in first.' }
+    ])
+    expect(
+      send({
+        kind: 'refused',
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'providerStartFailed' }
+      })
+    ).toEqual(['notDoneSend', { text: 'Codex stopped before it finished starting.' }])
+  })
+
+  it('says the write did not happen, once, and never shows the host message', () => {
+    for (const { failure, write, parts, cell } of cells) {
+      const english = agentSessionWriteNoticeEnglish(parts)
+      expect(english.length, cell).toBeGreaterThan(0)
+      expect(agentSessionRefusalNotice({ ...failure, message: HOST_TEXT }, write), cell).toBe(
+        english
+      )
+      if (failure.code === 'agent_session_operation_unknown') {
+        expect(parts, cell).toEqual(['outcomeUnknown'])
+        continue
+      }
+      const notDone = parts.filter((part) => typeof part === 'string' && part.startsWith('notDone'))
+      const answeredAway = write === 'answer' && parts.includes('questionChanged')
+      const unsupported = failure.code === 'structured_agent_session_unsupported'
+      const saysNotDone =
+        write === 'read-history' && failure.code === 'agent_session_journal_unreadable'
+      expect(notDone, cell).toEqual(
+        answeredAway || unsupported || saysNotDone ? [] : [NOT_DONE[write]]
+      )
+    }
+  })
+
+  it("uses the failure's own sentence for a start that failed, and only for a message", () => {
+    const failure = agentSessionRefusalFailure({
+      code: 'agent_session_operation_invalid',
+      details: { reason: 'notSignedIn' }
+    })
+    expect(agentSessionWriteNoticeParts(failure, 'send')).toEqual([
+      'notDoneSend',
+      { text: agentSessionFailureSentence({ kind: 'notSignedIn' }, 'rejection') }
+    ])
+    // Its next step is to send the message again, which a Stop cannot do.
+    expect(agentSessionWriteNoticeParts(failure, 'stop')).toEqual(['notDoneStop'])
+  })
+
+  it.each([
+    [
+      'agent_session_operation_invalid',
+      'conversationCleared',
+      'send',
+      'This conversation has been cleared. Your message was not sent. Open the current conversation to continue.'
+    ],
+    [
+      'agent_session_operation_invalid',
+      'clearUnconfirmed',
+      'send',
+      "The last /clear didn't finish. Your message was not sent. Start a new chat to continue."
+    ],
+    [
+      'agent_session_operation_invalid',
+      'turnActive',
+      'command',
+      "The agent is still responding. The command didn't run. Wait for the agent to finish responding, or stop it."
+    ],
+    [
+      'agent_session_conflict',
+      'claimConflicted',
+      'composer-send',
+      'This chat is still open in a terminal agent. Your message was not sent. Quit that agent to continue the chat here.'
+    ],
+    [
+      'agent_session_conflict',
+      'chatStarting',
+      'stop',
+      "The agent is still starting. The agent wasn't stopped. Wait for the agent to finish starting."
+    ],
+    [
+      'agent_session_operation_invalid',
+      'promptGone',
+      'answer',
+      'This question was already answered or has changed.'
+    ],
+    [
+      'agent_session_checkpoint_stale',
+      'fenceStale',
+      'composer-send',
+      'Your message was not sent. Send it again.'
+    ]
+  ] as const)('%s / %s on %s', (code, reason, write, expected) => {
+    expect(
+      agentSessionRefusalNotice({ code, message: HOST_TEXT, details: { reason } }, write)
+    ).toBe(expected)
+  })
+})
+
+describe('a refusal from a host that names no reason this build knows', () => {
+  it.each([
+    ['an older host', undefined],
+    ['a reason a newer host added', { reason: 'fromTheFuture' }],
+    ['facts with no reason', { ownerVerdict: 'unverifiable' }]
+  ])("reads as the code's row: %s", (_label, details) => {
+    const refusal = JSON.parse(
+      JSON.stringify({ code: 'agent_session_operation_invalid', message: HOST_TEXT, details })
+    )
+    expect(agentSessionRefusalNotice(refusal, 'command')).toBe("The command didn't run.")
+  })
+})
+
+it('keeps a sentence the failure rows share word for word', () => {
+  expect(agentSessionFailureSentence({ kind: 'historyTooLarge' }, 'row')).toContain(
+    AGENT_SESSION_WRITE_NOTICE_COPY.startNewChat
+  )
+})
+
+// A failed journal open says what happened to the history, not what was asked of it.
+describe('a chat whose history the host could not open', () => {
+  const notice = (details: unknown, write: AgentSessionWriteKind): string =>
+    agentSessionRefusalNotice(
+      JSON.parse(
+        JSON.stringify({ code: 'agent_session_journal_unreadable', message: HOST_TEXT, details })
+      ),
+      write
+    )
+
+  it.each([
+    ['journalCorrupt', 'read-history', 'Unable to load this chat.'],
+    ['journalCorrupt', 'send', 'Unable to load this chat. Your message was not sent.'],
+    [
+      'journalUnavailable',
+      'read-history',
+      "Orca couldn't open this chat's history right now. Try again."
+    ],
+    [
+      'journalUnavailable',
+      'send',
+      "Orca couldn't open this chat's history right now. Your message was not sent. Try again."
+    ]
+  ] as const)('%s on %s', (reason, write, expected) => {
+    expect(notice({ reason }, write)).toBe(expected)
+  })
+
+  // Damage can't be told apart from an open that can clear, so it never says to start over.
+  it.each([
+    ['an older host', undefined],
+    ['a reason an unreleased build wrote', { reason: 'journalUnreadable' }]
+  ])('promises nothing for a refusal that names no reason: %s', (_label, details) => {
+    expect(notice(details, 'read-history')).toBe("Orca couldn't read this chat's saved history.")
+    expect(notice(details, 'send')).toBe(
+      "Orca couldn't read this chat's saved history. Your message was not sent."
+    )
+    expect(
+      agentSessionReadHistoryRefusalParts('agent_session_journal_unreadable', details)
+    ).toEqual(['historyUnreadable'])
+  })
+
+  it('says only that the history did not load for any other read refusal', () => {
+    expect(agentSessionReadHistoryRefusalParts('agent_session_ownership_unknown')).toEqual([
+      'notDoneReadHistory'
+    ])
+    expect(agentSessionReadHistoryRefusalParts('agent_session_from_the_future')).toEqual([
+      'notDoneReadHistory'
+    ])
+  })
+})
+
+// For a line that already says what did not happen and shows its own Retry, such as a chat that
+// could not start: the Retry is the step for retrying and for sending again, and only for those.
+describe('agentSessionRefusalCauseParts', () => {
+  it('keeps a step other than retrying, beside the cause', () => {
+    expect(
+      agentSessionRefusalCauseParts({
+        kind: 'refused',
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'turnActive' }
+      })
+    ).toEqual(['turnActive', 'waitForTurn'])
+    expect(
+      agentSessionRefusalCauseParts({
+        kind: 'refused',
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'historyTooLarge' }
+      })
+    ).toEqual([
+      {
+        text: "This conversation's history is too large to restore here. Start a new chat to continue."
+      }
+    ])
+  })
+
+  it('leaves out a step the Retry beside it takes', () => {
+    expect(
+      agentSessionRefusalCauseParts({
+        kind: 'refused',
+        code: 'agent_session_journal_unreadable',
+        details: { reason: 'journalUnavailable' }
+      })
+    ).toEqual(['historyUnavailable'])
+    expect(
+      agentSessionRefusalCauseParts(
+        {
+          kind: 'refused',
+          code: 'agent_session_operation_invalid',
+          details: { reason: 'notSignedIn' }
+        },
+        { agentName: 'Claude' }
+      )
+    ).toEqual([{ text: 'Claude is not signed in for the selected account. Sign in first.' }])
+    expect(
+      agentSessionRefusalCauseParts({
+        kind: 'refused',
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'providerStartFailed' }
+      })
+    ).toEqual([{ text: 'The agent stopped before it finished starting.' }])
+    expect(
+      agentSessionRefusalCauseParts({
+        kind: 'refused',
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'managedAccountUnsupported' }
+      })
+    ).toEqual([
+      {
+        text: 'While a Claude account is added in WSL, Claude chats need a Windows Claude account. Choose or add one in Claude Accounts settings.'
+      }
+    ])
+  })
+
+  it('writes the same sentences as before where no Retry stands beside them', () => {
+    expect(agentSessionFailureSentence({ kind: 'notSignedIn' }, 'rejection')).toBe(
+      'The agent is not signed in for the selected account. Sign in, then send your message again.'
+    )
+  })
+
+  it.each<[string, AgentSessionWriteFailure]>([
+    ['a refusal with no reason', { kind: 'refused', code: 'agent_session_operation_invalid' }],
+    [
+      "a reason whose code's words stand",
+      { kind: 'refused', code: 'agent_session_conflict', details: { reason: 'ownerAlive' } }
+    ],
+    ['a failed request', { kind: 'failed' }],
+    ['an unconfirmed one', { kind: 'unconfirmed' }]
+  ])('names nothing for %s', (_label, failure) => {
+    expect(agentSessionRefusalCauseParts(failure)).toEqual([])
+  })
+})
diff --git a/src/shared/agent-session-refusal-notice.ts b/src/shared/agent-session-refusal-notice.ts
new file mode 100644
index 000000000000..0f4121dc9b31
--- /dev/null
+++ b/src/shared/agent-session-refusal-notice.ts
@@ -0,0 +1,375 @@
+// The one way a chat surface puts a write that did not happen into words.
+//
+// A refusal's `message` is never shown. Every code has at least one host emitter whose message is
+// written for a log or carries a marker (the census is pinned in the test), so the refusal's
+// reason, when the host names one, and otherwise its code, pick the copy with the write. A code's
+// own row names a cause only where every emitter of the code means it; it is also the words for a
+// host too old to send a reason. A notice says how to get past a refusal only where the person has
+// a step to take; retrying is the control that sent the write, except on the phone, whose message
+// goes back to the composer, and a history that couldn't open right now says to try again unless
+// something beside the words retries it.
+// Surfaces keep the fact and choose the words when they show it, so nothing saved carries copy.
+
+import type { AgentSessionFailureKind } from './agent-session-failure'
+import {
+  agentSessionFailureSentence,
+  type AgentSessionFailureWordsContext
+} from './agent-session-failure-words'
+import type { AgentSessionRefusalReason } from './agent-session-refusal-details'
+import {
+  AGENT_SESSION_WRITE_NOTICE_COPY,
+  type AgentSessionWriteNoticePart,
+  type AgentSessionWriteNoticeSentence
+} from './agent-session-write-notice-copy'
+import type {
+  AgentSessionWireRefusal,
+  AgentSessionWireRefusalCode
+} from './agent-session-wire-refusals'
+import {
+  agentSessionRefusalFailure,
+  parseAgentSessionWriteFailure,
+  type AgentSessionWriteFailure,
+  type AgentSessionWriteKind,
+  type AgentSessionWriteRefusal
+} from './agent-session-write-failure'
+
+const NOT_DONE: Record<AgentSessionWriteKind, AgentSessionWriteNoticeSentence> = {
+  'read-history': 'notDoneReadHistory',
+  send: 'notDoneSend',
+  'composer-send': 'notDoneSend',
+  stop: 'notDoneStop',
+  'stop-task': 'notDoneStopTask',
+  'stop-tasks': 'notDoneStopTasks',
+  answer: 'notDoneAnswer',
+  option: 'notDoneOption',
+  command: 'notDoneCommand',
+  goal: 'notDoneGoal'
+}
+
+/** That the write did not happen, for one that a second attempt can carry out. Only the phone says
+ *  how: its message goes back to the composer and it has no Retry control. Everywhere else the
+ *  control that sent the write is the way to try again. */
+export function agentSessionWriteNotDoneParts(
+  write: AgentSessionWriteKind
+): AgentSessionWriteNoticeSentence[] {
+  return write === 'composer-send' ? ['notDoneSend', 'tryAgainComposerSend'] : [NOT_DONE[write]]
+}
+
+/** What the person can do about a refusal with this reason. */
+export type AgentSessionRefusalAction =
+  /** Use the control that sent the write again. */
+  | 'retry'
+  /** Wait for what the notice names; its step says what. */
+  | 'wait'
+  /** Take the step the notice names first. */
+  | 'actFirst'
+  /** Continue somewhere else: the current conversation, or a new chat. */
+  | 'goElsewhere'
+  | 'checkChat'
+  | 'updateOrca'
+  /** What the write was for is over: the question it answered moved on. */
+  | 'nothingLeft'
+  /** Orca's own state or fault; nothing the person does gets past it. */
+  | 'hostFinding'
+
+export type AgentSessionRefusalReasonWords =
+  /** The code's own words are the honest ones for this reason. */
+  | { words: 'code'; action: AgentSessionRefusalAction }
+  /** What stopped the write, and the step past it where the person has one to take. */
+  | {
+      cause: AgentSessionWriteNoticeSentence
+      step?: AgentSessionWriteNoticeSentence
+      action: AgentSessionRefusalAction
+    }
+  /** A start that failed: the sentence that failure has everywhere, whose next step is a send. */
+  | { fact: AgentSessionFailureKind; action: AgentSessionRefusalAction }
+
+function codeWords(action: AgentSessionRefusalAction): AgentSessionRefusalReasonWords {
+  return { words: 'code', action }
+}
+
+function causeWords(
+  cause: AgentSessionWriteNoticeSentence,
+  action: AgentSessionRefusalAction,
+  step?: AgentSessionWriteNoticeSentence
+): AgentSessionRefusalReasonWords {
+  return step ? { cause, step, action } : { cause, action }
+}
+
+const AGENT_STARTING = causeWords('agentStarting', 'wait', 'waitForStart')
+const OWNER_UNPROVEN = causeWords('ownerUnproven', 'actFirst', 'reopenChat')
+// Only a terminal agent an older build recorded holds a claim; quitting it frees the chat.
+const TERMINAL_CLAIM = causeWords('terminalAgentHoldsChat', 'actFirst', 'quitTerminalAgent')
+
+// Every reason of every code, so a reason the host adds does not compile until it has words.
+// Reasons only a create, attach, hold or adopted import meets never reach a chat write; they keep
+// their code's words.
+const REASON_WORDS = {
+  agent_session_operation_invalid: {
+    requestMalformed: codeWords('hostFinding'),
+    operationIdInvalid: codeWords('hostFinding'),
+    messageIdReused: codeWords('hostFinding'),
+    // Settled under that id, so the control's retry goes out under a new one.
+    operationRefusedEarlier: codeWords('retry'),
+    journalWriteFailed: causeWords('recordFailed', 'retry'),
+    conversationCleared: causeWords(
+      'conversationCleared',
+      'goElsewhere',
+      'openCurrentConversation'
+    ),
+    // Nothing settles an unfinished /clear yet, so only a new chat continues.
+    clearUnconfirmed: causeWords('clearUnfinished', 'goElsewhere', 'startNewChat'),
+    // A /clear or /compact whose outcome the host never settled; only the host resolves it.
+    conversationCommandUnconfirmed: codeWords('hostFinding'),
+    conversationCommandInFlight: causeWords('commandRunning', 'wait', 'waitForCommand'),
+    // The chat's agent process is being replaced, which a start or restart does.
+    handoffInFlight: AGENT_STARTING,
+    turnActive: causeWords('turnActive', 'wait', 'waitForTurn'),
+    promptPending: causeWords('promptPending', 'actFirst', 'answerFirst'),
+    backgroundTasksRunning: causeWords('backgroundTasksRunning', 'wait', 'waitForBackgroundTasks'),
+    messagesUnsettled: causeWords('messagesUnsettled', 'actFirst', 'settleEarlierMessage'),
+    // No chat surface sends a rewind; a replayed one says only that it did not happen.
+    rewindRefused: codeWords('hostFinding'),
+    rewindUnconfirmed: codeWords('hostFinding'),
+    promptGone: causeWords('questionChanged', 'nothingLeft'),
+    optionRejected: causeWords('optionRejected', 'retry'),
+    providerStarting: AGENT_STARTING,
+    goalsUnsupported: causeWords('goalsUnsupported', 'hostFinding'),
+    providerRejected: causeWords('agentRefused', 'retry'),
+    providerStartFailed: { fact: 'providerStartFailed', action: 'retry' },
+    notSignedIn: { fact: 'notSignedIn', action: 'actFirst' },
+    historyTooLarge: { fact: 'historyTooLarge', action: 'goElsewhere' },
+    managedAccountEnvOverride: { fact: 'managedAccountEnvOverride', action: 'actFirst' },
+    accountSwitchInProgress: { fact: 'accountSwitchInProgress', action: 'wait' },
+    managedAccountUnsupported: { fact: 'managedAccountUnsupported', action: 'actFirst' },
+    attachFailed: codeWords('retry')
+  },
+  agent_session_ownership_unknown: {
+    sessionNotAttached: codeWords('retry'),
+    noLiveOwner: codeWords('retry'),
+    ownerUnproven: OWNER_UNPROVEN,
+    claimConflicted: TERMINAL_CLAIM,
+    recordMissing: codeWords('retry'),
+    replaySuperseded: codeWords('retry'),
+    leaseMoved: codeWords('retry'),
+    spawnIdentityMismatch: codeWords('hostFinding'),
+    notResumable: codeWords('retry'),
+    noProviderChild: codeWords('retry'),
+    conversationHeldElsewhere: codeWords('retry')
+  },
+  agent_session_conflict: {
+    chatStarting: AGENT_STARTING,
+    ownerUnproven: OWNER_UNPROVEN,
+    claimConflicted: TERMINAL_CLAIM,
+    ownerAlive: codeWords('retry'),
+    identityMismatch: codeWords('hostFinding'),
+    sessionExists: codeWords('retry'),
+    conversationHeldElsewhere: codeWords('retry'),
+    tabIdTaken: codeWords('retry')
+  },
+  execution_owner_reconciling: {
+    hostReconciling: causeWords('hostReconciling', 'wait', 'waitMoment'),
+    recordUnreadable: causeWords('recordUnreadable', 'hostFinding')
+  },
+  agent_session_checkpoint_stale: {
+    fenceStale: codeWords('retry'),
+    leaseMoved: codeWords('retry'),
+    recordMissing: codeWords('retry')
+  },
+  agent_session_identity_required: {
+    recordMissing: causeWords('chatNotFound', 'goElsewhere', 'startNewChat'),
+    transcriptNotFound: codeWords('retry'),
+    transcriptUnreadable: codeWords('hostFinding')
+  },
+  agent_session_operation_conflict: {
+    fingerprintMismatch: codeWords('hostFinding'),
+    operationIdReused: codeWords('hostFinding'),
+    handoffInFlight: codeWords('retry')
+  },
+  agent_session_operation_expired: { operationExpired: codeWords('retry') },
+  agent_session_operation_capacity: { operationCapacity: codeWords('wait') },
+  agent_session_operation_unknown: {
+    outcomeUnknown: codeWords('checkChat'),
+    resultLost: codeWords('checkChat'),
+    rewindUnconfirmed: codeWords('checkChat'),
+    tabUnconfirmed: codeWords('checkChat')
+  },
+  agent_session_item_revision_stale: { promptMoved: codeWords('nothingLeft') },
+  agent_session_already_resolved: { promptAlreadyResolved: codeWords('nothingLeft') },
+  agent_session_journal_unreadable: {
+    // No retry reads past damage, and the words name no step: it only can't load.
+    journalCorrupt: causeWords('historyUnusable', 'hostFinding'),
+    // Says its step despite 'retry' unless a Retry stands beside it: the phone often has none.
+    journalUnavailable: causeWords('historyUnavailable', 'retry', 'tryAgain')
+  },
+  // Thrown, so a client meets these only as an RPC error; the code's words stand.
+  structured_agent_session_unsupported: {
+    clientCapabilityMissing: codeWords('updateOrca'),
+    hostDisabled: codeWords('hostFinding'),
+    hostUnsupported: codeWords('updateOrca')
+  },
+  agent_session_owner_restart_failed: {}
+} satisfies {
+  [C in AgentSessionWireRefusalCode]: Record<
+    AgentSessionRefusalReason<C>,
+    AgentSessionRefusalReasonWords
+  >
+}
+
+/** The words and next step a reason gets; undefined when the refusal names none. */
+export function agentSessionRefusalReasonWords(
+  failure: AgentSessionWriteRefusal
+): AgentSessionRefusalReasonWords | undefined {
+  const reason = failure.details?.reason
+  const byReason: Partial<Record<string, AgentSessionRefusalReasonWords>> | undefined =
+    REASON_WORDS[failure.code]
+  return reason === undefined ? undefined : byReason?.[reason]
+}
+
+// Each already says the history was not read.
+const HISTORY_CAUSES: ReadonlySet<AgentSessionWriteNoticeSentence> = new Set([
+  'historyUnusable',
+  'historyUnavailable',
+  'historyUnreadable'
+])
+
+/** A cause, and that the request did not happen unless the cause already says so. */
+function causeParts(
+  cause: AgentSessionWriteNoticeSentence,
+  write: AgentSessionWriteKind
+): AgentSessionWriteNoticeSentence[] {
+  const saysNotDone =
+    (write === 'read-history' && HISTORY_CAUSES.has(cause)) ||
+    (cause === 'questionChanged' && write === 'answer')
+  return saysNotDone ? [cause] : [cause, NOT_DONE[write]]
+}
+
+/** The notice a named reason has of its own; undefined leaves the code's words. */
+function reasonParts(
+  failure: AgentSessionWriteRefusal,
+  write: AgentSessionWriteKind,
+  context: AgentSessionFailureWordsContext
+): AgentSessionWriteNoticePart[] | undefined {
+  const words = agentSessionRefusalReasonWords(failure)
+  if (!words || 'words' in words) {
+    return undefined
+  }
+  if ('fact' in words) {
+    const sentence = agentSessionFailureSentence({ kind: words.fact }, 'rejection', context)
+    return write === 'send' || write === 'composer-send'
+      ? [NOT_DONE[write], { text: sentence }]
+      : undefined
+  }
+  const said = causeParts(words.cause, write)
+  // A Retry beside the words is the step for a reason whose action is to retry.
+  const retried = context.retryControl && words.action === 'retry'
+  return words.step && !retried ? [...said, words.step] : said
+}
+
+/** What stopped a refused start, for a line that already says the chat did not start and shows its
+ *  own Retry. Empty when the refusal names no reason with words of its own. */
+export function agentSessionRefusalCauseParts(
+  failure: AgentSessionWriteFailure,
+  context: { agentName?: string } = {}
+): AgentSessionWriteNoticePart[] {
+  const parts =
+    failure.kind === 'refused'
+      ? reasonParts(failure, 'send', { ...context, retryControl: true })
+      : undefined
+  return parts?.filter((part) => part !== 'notDoneSend') ?? []
+}
+
+/** `context.retryControl`: a Retry beside the words is the step for a reason whose action is to
+ *  retry, and for sending again; any other step stays. */
+export function agentSessionWriteNoticeParts(
+  failure: AgentSessionWriteFailure,
+  write: AgentSessionWriteKind,
+  context: AgentSessionFailureWordsContext = {}
+): AgentSessionWriteNoticePart[] {
+  const notDone = NOT_DONE[write]
+  if (failure.kind === 'failed') {
+    return agentSessionWriteNotDoneParts(write)
+  }
+  if (failure.kind === 'unconfirmed') {
+    return ['outcomeUnknown']
+  }
+  const byReason = reasonParts(failure, write, context)
+  if (byReason) {
+    return byReason
+  }
+  switch (failure.code) {
+    // The cause is in the chat's own status row. Some restarts can be retried and some need a new
+    // chat, and the code does not say which.
+    case 'agent_session_owner_restart_failed':
+      return ['restartFailed', notDone]
+    // Several different owner states share these codes. Each is refused before the id is recorded,
+    // so the phone's resend under the same id can go through.
+    case 'agent_session_checkpoint_stale':
+    case 'agent_session_conflict':
+    case 'agent_session_ownership_unknown':
+    case 'execution_owner_reconciling':
+      return agentSessionWriteNotDoneParts(write)
+    // Counted across every chat and freed only as a day's requests age out, so trying again now
+    // would likely be refused again.
+    case 'agent_session_operation_capacity':
+      return ['capacity', notDone]
+    // The phone resends under the same id, which the host refuses the same way again. The rest
+    // stand for reasons the code does not name (a cleared conversation, a pending question, a
+    // provider's own rejection...), so any cause or next step could be false.
+    case 'agent_session_operation_conflict':
+    case 'agent_session_operation_expired':
+    case 'agent_session_operation_invalid':
+    case 'agent_session_identity_required':
+      return [notDone]
+    case 'agent_session_operation_unknown':
+      return ['outcomeUnknown']
+    // A Stop names the prompt it was pressed under, so it can be refused this way too.
+    case 'agent_session_item_revision_stale':
+    case 'agent_session_already_resolved':
+      return causeParts('questionChanged', write)
+    // A host that names no reason raised it for damage and for an open that can clear alike.
+    case 'agent_session_journal_unreadable':
+      return causeParts('historyUnreadable', write)
+    case 'structured_agent_session_unsupported':
+      return ['unsupported']
+  }
+  // A newer host can send a code this client has never heard of.
+  return [notDone]
+}
+
+export function agentSessionWriteNoticeEnglish(
+  parts: readonly AgentSessionWriteNoticePart[]
+): string {
+  return parts
+    .map((part) => (typeof part === 'string' ? AGENT_SESSION_WRITE_NOTICE_COPY[part] : part.text))
+    .join(' ')
+}
+
+/** English, for a surface without translations. Takes the refusal as the wire gives it; its
+ *  message is not read. */
+export function agentSessionRefusalNotice(
+  refusal: Pick<AgentSessionWireRefusal, 'code' | 'message' | 'details'>,
+  write: AgentSessionWriteKind
+): string {
+  return agentSessionWriteNoticeEnglish(
+    agentSessionWriteNoticeParts(agentSessionRefusalFailure(refusal), write)
+  )
+}
+
+/** English, for a write whose request failed without a refusal. */
+export function agentSessionWriteFailureNotice(write: AgentSessionWriteKind): string {
+  return agentSessionWriteNoticeEnglish(agentSessionWriteNoticeParts({ kind: 'failed' }, write))
+}
+
+/** The notice for a refused read of a chat's history, from the refusal's code and any details a
+ *  host sent; a code this build does not know says only that the history did not load. */
+export function agentSessionReadHistoryRefusalParts(
+  code: string,
+  details?: unknown,
+  context: AgentSessionFailureWordsContext = {}
+): AgentSessionWriteNoticePart[] {
+  const failure = parseAgentSessionWriteFailure({ kind: 'refused', code, details })
+  return failure
+    ? agentSessionWriteNoticeParts(failure, 'read-history', context)
+    : agentSessionWriteNotDoneParts('read-history')
+}
diff --git a/src/shared/agent-session-refusal-retry.test.ts b/src/shared/agent-session-refusal-retry.test.ts
new file mode 100644
index 000000000000..30a9a177f8e5
--- /dev/null
+++ b/src/shared/agent-session-refusal-retry.test.ts
@@ -0,0 +1,104 @@
+import { describe, expect, it } from 'vitest'
+import type { AgentSessionOwnerVerdict } from './agent-session-wire'
+import { agentSessionOwnerVerdictAllowsFreshOperationId } from './agent-session-refusal-retry'
+import { parseAgentSessionWriteFailure } from './agent-session-write-failure'
+import {
+  admitStructuredAgentSessionOutboxEntry,
+  createStructuredAgentSessionOutboxEntry,
+  requeueStructuredAgentSessionSendRefusal
+} from './structured-agent-session-outbox'
+import { disposeStructuredAgentSessionSendResult } from './structured-agent-session-send-disposition'
+
+const entry = createStructuredAgentSessionOutboxEntry({
+  clientMessageId: 'message-1',
+  sessionId: 'session-1',
+  text: 'hello',
+  attachments: [],
+  queuedAt: 1
+})
+
+/** A refused send as a reloaded entry holds it: through the saved shape and back. */
+function storedOwnershipRefusal(ownerVerdict: AgentSessionOwnerVerdict | undefined) {
+  const failure = parseAgentSessionWriteFailure(
+    JSON.parse(
+      JSON.stringify({
+        kind: 'refused',
+        code: 'agent_session_ownership_unknown',
+        details: { reason: 'ownerUnproven', ...(ownerVerdict ? { ownerVerdict } : {}) }
+      })
+    )
+  )
+  if (failure?.kind !== 'refused') {
+    throw new Error('the saved refusal did not read back')
+  }
+  return failure
+}
+
+function retried(ownerVerdict: AgentSessionOwnerVerdict | undefined) {
+  return requeueStructuredAgentSessionSendRefusal(
+    entry,
+    storedOwnershipRefusal(ownerVerdict),
+    () => 'message-2'
+  )
+}
+
+describe("the owner's verdict decides a retry's operation id only as a floor", () => {
+  it('lets a retry use a new id once the stored verdict proves nothing runs', () => {
+    expect(agentSessionOwnerVerdictAllowsFreshOperationId('exited')).toBe(true)
+    // A new id only: nothing recorded the message, so it stays queued at the head.
+    expect(retried('exited')).toMatchObject({ clientMessageId: 'message-2', state: 'queued' })
+  })
+
+  it('keeps later sends behind the message after an exited refusal', () => {
+    const later = createStructuredAgentSessionOutboxEntry({
+      clientMessageId: 'message-3',
+      sessionId: 'session-1',
+      text: 'after',
+      attachments: [],
+      queuedAt: 2
+    })
+    const disposition = disposeStructuredAgentSessionSendResult({
+      entries: [entry, later],
+      entry,
+      blockedClientMessageId: null,
+      result: {
+        ok: false,
+        refusal: {
+          code: 'agent_session_ownership_unknown',
+          message: 'x',
+          details: { reason: 'ownerUnproven', ownerVerdict: 'exited' }
+        }
+      },
+      createOperationId: () => 'message-2'
+    })
+    expect(disposition.blockedClientMessageId).toBe('message-2')
+    expect(
+      admitStructuredAgentSessionOutboxEntry(
+        disposition.entries,
+        disposition.blockedClientMessageId
+      )
+    ).toMatchObject({ state: 'blocked', entry: { clientMessageId: 'message-2' } })
+  })
+
+  it.each<AgentSessionOwnerVerdict | undefined>(['unverifiable', 'live', undefined])(
+    'keeps the id for a stored %s verdict, whose operation may still land',
+    (stored) => {
+      expect(agentSessionOwnerVerdictAllowsFreshOperationId(stored)).toBe(false)
+      expect(retried(stored)).toMatchObject({ clientMessageId: 'message-1', state: 'queued' })
+    }
+  )
+
+  it.each<AgentSessionOwnerVerdict | undefined>(['unverifiable', 'live', undefined])(
+    'moves off a stored %s verdict only when the current lease proves the owner exited',
+    (stored) => {
+      expect(agentSessionOwnerVerdictAllowsFreshOperationId(stored, 'exited')).toBe(true)
+      expect(agentSessionOwnerVerdictAllowsFreshOperationId(stored, 'unverifiable')).toBe(false)
+      expect(agentSessionOwnerVerdictAllowsFreshOperationId(stored, 'live')).toBe(false)
+    }
+  )
+
+  it('never lowers a stored exited', () => {
+    expect(agentSessionOwnerVerdictAllowsFreshOperationId('exited', 'live')).toBe(true)
+    expect(agentSessionOwnerVerdictAllowsFreshOperationId('exited', 'unverifiable')).toBe(true)
+  })
+})
diff --git a/src/shared/agent-session-refusal-retry.ts b/src/shared/agent-session-refusal-retry.ts
index 9777cfd42d1e..093d3549729a 100644
--- a/src/shared/agent-session-refusal-retry.ts
+++ b/src/shared/agent-session-refusal-retry.ts
@@ -1,4 +1,4 @@
-import type { AgentSessionWireRefusalCode } from './agent-session-wire'
+import type { AgentSessionOwnerVerdict, AgentSessionWireRefusalCode } from './agent-session-wire'
 
 export type AgentSessionRefusalOperationState = 'settled-rejected' | 'pending-admission' | 'unknown'
 
@@ -28,3 +28,16 @@ export function agentSessionRefusalOperationState(
       return 'pending-admission'
   }
 }
+
+/**
+ * Whether a verdict lets a retry use a new operation id. A stored `exited` is final: nothing runs
+ * the refused operation, so a new id cannot collide with it. Any other stored verdict is a floor:
+ * the first operation may still land, so only a verdict re-derived from the current lease can prove
+ * `exited`, and nothing lowers a stored `exited`.
+ */
+export function agentSessionOwnerVerdictAllowsFreshOperationId(
+  stored: AgentSessionOwnerVerdict | undefined,
+  current?: AgentSessionOwnerVerdict
+): boolean {
+  return stored === 'exited' || current === 'exited'
+}
diff --git a/src/shared/agent-session-resume-marker.ts b/src/shared/agent-session-resume-marker.ts
index 2c308ec998ec..3890bd8f81d3 100644
--- a/src/shared/agent-session-resume-marker.ts
+++ b/src/shared/agent-session-resume-marker.ts
@@ -6,8 +6,9 @@
 // the stop, because that fact exists only in memory at that moment — the provider rewrites the
 // journal in its own words on reattach.
 //
-// A marker has no expiry. It ends only by the user's own actions: a newer message in that chat, a
-// successful resume, a dismissal, or closing the chat — each of which deletes it.
+// A marker has no expiry. It ends when the chat's agent is started again other than by its own
+// continuation, or by a successful resume, a dismissal, or closing the chat — each of which
+// deletes it.
 
 import { z } from 'zod'
 import { AGENT_STATUS_STATES } from './agent-status-types'
@@ -18,6 +19,7 @@ import {
   AGENT_SESSION_RESTART_ACTIVITY_MAX_TASKS
 } from './agent-session-restart-activity'
 import type { AgentSessionRestartActivity } from './agent-session-restart-activity'
+import type { AgentJournalCursor } from './agent-session-journal-types'
 
 /** Why the app went away. Recorded because an update install is a restart the user did not choose,
  *  and the surface that offers the resume says so. */
@@ -48,8 +50,9 @@ export type AgentSessionResumeMarker = {
   /** The work in flight when teardown observed it — a running turn, or a send that had not yet
    *  become one. */
   work: AgentSessionResumeWork
-  /** The user message observed at teardown; a newer one supersedes this offer before its turn opens. */
-  latestUserItemId: string | null
+  /** The user message observed at teardown. Nothing reads it; still written for one release so the
+   *  previous build, whose parser requires it, can read this marker after a downgrade. */
+  latestUserItemId?: string | null
   /** Execution host's clock at teardown. */
   recordedAt: number
   trigger: AgentSessionResumeTrigger
@@ -65,6 +68,12 @@ export type AgentSessionResumeMarker = {
   providerHandleRoot: string
   /** Stable teardown identity for continuation deduplication, not launch ancestry. */
   teardownId: string
+  /**
+   * Where the chat's journal stood when the offer was taken. A message accepted after it, or a
+   * journal on another epoch, means the chat moved on. Absent on markers from builds that did not
+   * record it.
+   */
+  journalCursor?: AgentJournalCursor
   /**
    * What the session was doing, captured at the same stop-time snapshot that decided the offer.
    * The dialog row, the status bar and the wire candidate read ONLY this; nothing re-reads the
@@ -114,11 +123,15 @@ const agentSessionRestartActivitySchema = z.object({
 const agentSessionResumeMarkerSchema = z.object({
   sessionId: markerField,
   work: agentSessionResumeWorkSchema,
-  latestUserItemId: markerField.nullable(),
+  latestUserItemId: markerField.nullable().optional(),
   recordedAt: z.number().int().nonnegative(),
   trigger: z.enum(AGENT_SESSION_RESUME_TRIGGERS),
   providerHandleRoot: markerField,
   teardownId: markerField,
+  journalCursor: z
+    .object({ epoch: markerField, sequence: z.number().int().nonnegative() })
+    .optional()
+    .catch(undefined),
   activity: agentSessionRestartActivitySchema.optional().catch(undefined)
 })
 
@@ -129,6 +142,10 @@ export function parseAgentSessionResumeMarker(value: unknown): AgentSessionResum
   if (!parsed.success) {
     return null
   }
-  const { activity, ...marker } = parsed.data
-  return activity === undefined ? marker : { ...marker, activity }
+  const { activity, journalCursor, ...marker } = parsed.data
+  return {
+    ...marker,
+    ...(journalCursor === undefined ? {} : { journalCursor }),
+    ...(activity === undefined ? {} : { activity })
+  }
 }
diff --git a/src/shared/agent-session-resume.test.ts b/src/shared/agent-session-resume.test.ts
index 577492ddefc4..397a1a9451f8 100644
--- a/src/shared/agent-session-resume.test.ts
+++ b/src/shared/agent-session-resume.test.ts
@@ -28,6 +28,10 @@ describe('agent session resume metadata', () => {
     expect(isResumableTuiAgent('kimi')).toBe(true)
   })
 
+  it('treats CodeBuddy as a resumable TUI agent', () => {
+    expect(isResumableTuiAgent('codebuddy')).toBe(true)
+  })
+
   it.each([
     ['claude', { session_id: 'claude-session' }, { key: 'session_id', id: 'claude-session' }],
     ['codex', { session_id: 'codex-session' }, { key: 'session_id', id: 'codex-session' }],
@@ -70,6 +74,7 @@ describe('agent session resume metadata', () => {
 
   it.each([
     ['claude', { key: 'session_id', id: 's1' }, ['claude', '--resume', 's1']],
+    ['codebuddy', { key: 'session_id', id: 's1' }, ['codebuddy', '--resume', 's1']],
     ['codex', { key: 'session_id', id: 's1' }, ['codex', 'resume', 's1']],
     ['gemini', { key: 'session_id', id: 's1' }, ['gemini', '--resume', 's1']],
     ['antigravity', { key: 'conversation_id', id: 's1' }, ['agy', '--conversation', 's1']],
diff --git a/src/shared/agent-session-resume.ts b/src/shared/agent-session-resume.ts
index 89bef799a22c..40a3699af3c3 100644
--- a/src/shared/agent-session-resume.ts
+++ b/src/shared/agent-session-resume.ts
@@ -1,10 +1,13 @@
 import type { AgentHookSource } from './agent-hook-relay'
 import type { AgentStatusState } from './agent-status-types'
+import type { AgentMainAgentStatus } from './main-agent-status'
 import type { TuiAgent } from './tui-agent'
 
 export const RESUMABLE_TUI_AGENTS = [
   'claude',
+  'codebuddy',
   'codex',
+  'qoder',
   'gemini',
   'antigravity',
   'opencode',
@@ -19,7 +22,8 @@ export const RESUMABLE_TUI_AGENTS = [
   'copilot',
   'kimi',
   'muse',
-  'zcode'
+  'zcode',
+  'dsh'
 ] as const satisfies readonly TuiAgent[]
 
 export type ResumableTuiAgent = (typeof RESUMABLE_TUI_AGENTS)[number]
@@ -58,6 +62,9 @@ export type SleepingAgentSessionRecord = {
   terminalTitle?: string
   lastAssistantMessage?: string
   interrupted?: boolean
+  /** The main agent's own status when captured, copied with `interrupted` by `agentVerdictFields`;
+   *  read the verdict through `agentMainAgentVerdict`. */
+  mainAgent?: AgentMainAgentStatus
   connectionId?: string | null
   launchConfig?: SleepingAgentLaunchConfig
   /** How the record was captured. Worktree-sleep records (legacy records have
@@ -189,6 +196,8 @@ export function extractAgentProviderSession(
     // Native-chat agents: also capture the hook's authoritative transcript_path,
     // since recent Claude Code names the transcript file with a UUID that differs
     // from the hook session_id (so the id-based glob no longer finds it).
+    case 'qoder':
+    case 'codebuddy':
     case 'claude':
     case 'codex': {
       const id = readSessionId(payload, ['session_id'])
@@ -212,6 +221,12 @@ export function extractAgentProviderSession(
       const id = readSessionId(payload, ['session_id'])
       return id ? { key: 'session_id', id } : null
     }
+    // Why: DSH's hook bridge always sends an empty `transcript_path` (its persistence seam
+    // exposes no artifact path), so the session id alone carries the resume target.
+    case 'dsh': {
+      const id = readSessionId(payload, ['session_id'])
+      return id ? { key: 'session_id', id } : null
+    }
     case 'antigravity': {
       const id = readSessionId(payload, ['conversationId'])
       return id ? { key: 'conversation_id', id } : null
@@ -264,10 +279,14 @@ export function getAgentResumeArgv(
 ): string[] | null {
   const id = providerSession.id
   switch (agent) {
+    case 'codebuddy':
+      return providerSession.key === 'session_id' ? ['codebuddy', '--resume', id] : null
     case 'claude':
       return providerSession.key === 'session_id' ? ['claude', '--resume', id] : null
     case 'codex':
       return providerSession.key === 'session_id' ? ['codex', 'resume', id] : null
+    case 'qoder':
+      return providerSession.key === 'session_id' ? ['qodercli', '--resume', id] : null
     case 'gemini':
       return providerSession.key === 'session_id' ? ['gemini', '--resume', id] : null
     case 'antigravity':
@@ -314,5 +333,9 @@ export function getAgentResumeArgv(
       return providerSession.key === 'session_id' ? ['muse', 'resume', id] : null
     case 'zcode':
       return providerSession.key === 'session_id' ? ['zcode', '--resume', id] : null
+    // Why: `dsh-tui --resume <id>` re-enters the session the launcher recorded for this
+    // workspace. DSH keys sessions by workspace path, so callers must keep the cwd.
+    case 'dsh':
+      return providerSession.key === 'session_id' ? ['dsh-tui', '--resume', id] : null
   }
 }
diff --git a/src/shared/agent-session-wire-refusals.test.ts b/src/shared/agent-session-wire-refusals.test.ts
new file mode 100644
index 000000000000..af017a617e74
--- /dev/null
+++ b/src/shared/agent-session-wire-refusals.test.ts
@@ -0,0 +1,218 @@
+import { describe, expect, it } from 'vitest'
+import {
+  AGENT_SESSION_REFUSAL_REASONS,
+  readAgentSessionRefusalDetails
+} from './agent-session-refusal-details'
+import {
+  AGENT_SESSION_WIRE_REFUSAL_CODES,
+  agentSessionRefusalError,
+  agentSessionRefusalReference,
+  readAgentSessionRefusalReference,
+  refuse,
+  refuseUnclassified,
+  withAgentSessionRefusalFacts,
+  type AgentSessionWireRefusal
+} from './agent-session-wire-refusals'
+import type { AgentJournalResolution } from './agent-session-journal-types'
+
+const RESOLUTION: AgentJournalResolution = {
+  state: 'resolved',
+  selectedOptionId: 'allow',
+  resolvedBy: 'phone-1',
+  resolvedAt: 1_789_000_000_000
+}
+
+/** The refusal with its new field removed: exactly what a released client reads. */
+function asReleasedClientSeesIt(refusal: AgentSessionWireRefusal): unknown {
+  const { details: _details, ...rest } = JSON.parse(JSON.stringify(refusal))
+  return rest
+}
+
+describe('a refusal names only a reason its code lists', () => {
+  it('rejects a reason another code lists, at compile time', () => {
+    // @ts-expect-error `promptGone` is an operation_invalid reason, not a conflict one.
+    refuse('agent_session_conflict', { reason: 'promptGone' }, 'm')
+    // @ts-expect-error the thrown form is held to the same list.
+    agentSessionRefusalError('agent_session_identity_required', { reason: 'claimConflicted' })
+    // @ts-expect-error a fact another code carries is not this code's.
+    refuse('agent_session_conflict', { reason: 'ownerAlive', currentFence: 3 }, 'm')
+    // @ts-expect-error the unclassified path cannot carry a reason.
+    refuseUnclassified('agent_session_conflict', 'm', { reason: 'claimConflicted' })
+    expect(refuse('agent_session_conflict', { reason: 'ownerAlive' }, 'm').details).toEqual({
+      reason: 'ownerAlive'
+    })
+  })
+
+  it('has no catch-all reason under any code', () => {
+    for (const code of AGENT_SESSION_WIRE_REFUSAL_CODES) {
+      for (const reason of AGENT_SESSION_REFUSAL_REASONS[code]) {
+        expect([code, reason]).not.toEqual([code, expect.stringMatching(/^(other|unknown)$/i)])
+        expect(reason).not.toMatch(/fault|generic|misc/i)
+      }
+    }
+  })
+})
+
+describe('the loose fields released clients read', () => {
+  it('are copied from details by refuse, one field at a time', () => {
+    expect(
+      refuse('agent_session_checkpoint_stale', { reason: 'fenceStale', currentFence: 4 }, 'm')
+    ).toMatchObject({ currentFence: 4 })
+    expect(
+      refuse(
+        'agent_session_item_revision_stale',
+        { reason: 'promptMoved', currentRevision: 2, resolution: RESOLUTION },
+        'm'
+      )
+    ).toMatchObject({ currentRevision: 2, resolution: RESOLUTION })
+    expect(
+      refuse(
+        'agent_session_operation_invalid',
+        { reason: 'rewindRefused', rewindReason: 'busy' },
+        'm'
+      )
+    ).toMatchObject({ rewindReason: 'busy' })
+    expect(
+      refuse(
+        'agent_session_ownership_unknown',
+        { reason: 'ownerUnproven', ownerVerdict: 'exited' },
+        'm'
+      )
+    ).toMatchObject({ ownerVerdict: 'exited' })
+    expect(
+      refuseUnclassified('agent_session_checkpoint_stale', 'm', { currentFence: 9 })
+    ).toMatchObject({ currentFence: 9, details: { currentFence: 9 } })
+  })
+
+  it('gain a verdict learned after the refusal, in details and at the top level', () => {
+    const stamped = withAgentSessionRefusalFacts(
+      refuse('agent_session_operation_invalid', { reason: 'providerStartFailed' }, 'm'),
+      { ownerVerdict: 'exited' }
+    )
+    expect(stamped).toEqual({
+      code: 'agent_session_operation_invalid',
+      message: 'm',
+      details: { reason: 'providerStartFailed', ownerVerdict: 'exited' },
+      ownerVerdict: 'exited'
+    })
+    // A refusal an older row replayed, with no reason, still reaches released clients with it.
+    expect(
+      withAgentSessionRefusalFacts(refuseUnclassified('agent_session_conflict', 'm'), {
+        ownerVerdict: 'unverifiable'
+      })
+    ).toEqual({
+      code: 'agent_session_conflict',
+      message: 'm',
+      details: { ownerVerdict: 'unverifiable' },
+      ownerVerdict: 'unverifiable'
+    })
+  })
+
+  // Each expected value is the literal the host built for the same situation before details.
+  it.each([
+    [
+      'a moved prompt',
+      refuse(
+        'agent_session_item_revision_stale',
+        { reason: 'promptMoved', currentRevision: 2, resolution: RESOLUTION },
+        'Item i has moved on.'
+      ),
+      {
+        code: 'agent_session_item_revision_stale',
+        message: 'Item i has moved on.',
+        currentRevision: 2,
+        resolution: RESOLUTION
+      }
+    ],
+    [
+      'a resolved prompt',
+      refuse(
+        'agent_session_already_resolved',
+        { reason: 'promptAlreadyResolved', currentRevision: 2, resolution: RESOLUTION },
+        'Item i was already resolved.'
+      ),
+      {
+        code: 'agent_session_already_resolved',
+        message: 'Item i was already resolved.',
+        currentRevision: 2,
+        resolution: RESOLUTION
+      }
+    ],
+    [
+      'a stale fence',
+      refuse('agent_session_checkpoint_stale', { reason: 'fenceStale', currentFence: 4 }, 'm'),
+      { code: 'agent_session_checkpoint_stale', message: 'm', currentFence: 4 }
+    ],
+    [
+      'a refused rewind',
+      refuse(
+        'agent_session_operation_invalid',
+        { reason: 'rewindRefused', rewindReason: 'busy' },
+        'agent_session_rewind:busy'
+      ),
+      {
+        code: 'agent_session_operation_invalid',
+        message: 'agent_session_rewind:busy',
+        rewindReason: 'busy'
+      }
+    ],
+    [
+      'a failed create',
+      withAgentSessionRefusalFacts(
+        refuse('agent_session_operation_invalid', { reason: 'providerStartFailed' }, 'exited 1'),
+        { ownerVerdict: 'exited' }
+      ),
+      { code: 'agent_session_operation_invalid', message: 'exited 1', ownerVerdict: 'exited' }
+    ],
+    [
+      'a refusal with no facts',
+      refuse('agent_session_conflict', { reason: 'claimConflicted' }, 'm'),
+      { code: 'agent_session_conflict', message: 'm' }
+    ]
+  ] as const)('read by a released client exactly as before for %s', (_label, refusal, before) => {
+    expect(asReleasedClientSeesIt(refusal)).toEqual(before)
+  })
+})
+
+describe('a stored refusal read back', () => {
+  it('keeps what the code lists and drops the rest', () => {
+    expect(
+      readAgentSessionRefusalDetails('agent_session_checkpoint_stale', {
+        reason: 'fenceStale',
+        currentFence: 3,
+        currentRevision: 8,
+        cause: 'fenceStale'
+      })
+    ).toEqual({ reason: 'fenceStale', currentFence: 3 })
+    // A reason a newer host added reads as none, but the facts beside it still count.
+    expect(
+      readAgentSessionRefusalDetails('agent_session_checkpoint_stale', {
+        reason: 'futureReason',
+        currentFence: 3
+      })
+    ).toEqual({ currentFence: 3 })
+    expect(readAgentSessionRefusalDetails('agent_session_conflict', { reason: 'x' })).toBe(
+      undefined
+    )
+  })
+
+  it('round-trips through its reference, and reads an older shape as naming nothing', () => {
+    const refusal = refuse(
+      'agent_session_ownership_unknown',
+      { reason: 'noLiveOwner', ownerVerdict: 'live' },
+      'm'
+    )
+    const reference = agentSessionRefusalReference(refusal)
+    expect(reference).toEqual({
+      code: 'agent_session_ownership_unknown',
+      details: { reason: 'noLiveOwner', ownerVerdict: 'live' }
+    })
+    expect(readAgentSessionRefusalReference(JSON.parse(JSON.stringify(reference)))).toEqual(
+      reference
+    )
+    expect(
+      readAgentSessionRefusalReference({ code: 'agent_session_conflict', cause: 'claimConflicted' })
+    ).toEqual({ code: 'agent_session_conflict' })
+    expect(readAgentSessionRefusalReference({ code: 'agent_session_future' })).toBeUndefined()
+  })
+})
diff --git a/src/shared/agent-session-wire-refusals.ts b/src/shared/agent-session-wire-refusals.ts
index 12cd63d44904..8fd1602377b5 100644
--- a/src/shared/agent-session-wire-refusals.ts
+++ b/src/shared/agent-session-wire-refusals.ts
@@ -1,8 +1,24 @@
 // How the host declines an `agentSession.*` mutation: the closed code list, its
 // narrowing guard, and the refusal body a client reads.
 
-import type { AgentJournalResolution } from './agent-session-journal-types'
-import type { AgentSessionRewindReason } from './agent-session-rewind'
+import {
+  agentSessionLegacyRefusalFields,
+  readAgentSessionRefusalDetails,
+  type AgentSessionAnyRefusalDetails,
+  type AgentSessionLegacyRefusalFields,
+  type AgentSessionRefusalDetails,
+  type AgentSessionRefusalDetailsByCode,
+  type AgentSessionRefusalFacts
+} from './agent-session-refusal-details'
+
+export type {
+  AgentSessionAnyRefusalDetails,
+  AgentSessionAnyRefusalReason,
+  AgentSessionLegacyRefusalFields,
+  AgentSessionRefusalDetails,
+  AgentSessionRefusalDetailsByCode,
+  AgentSessionRefusalReason
+} from './agent-session-refusal-details'
 
 export const AGENT_SESSION_WIRE_REFUSAL_CODES = [
   'structured_agent_session_unsupported',
@@ -38,17 +54,140 @@ export function isAgentSessionWireRefusalCode(
 /** What the host last proved about a session's provider process; see the SSH execution boundary. */
 export type AgentSessionOwnerVerdict = 'live' | 'unverifiable' | 'exited'
 
-export type AgentSessionWireRefusal = {
-  rewindReason?: AgentSessionRewindReason
-  code: AgentSessionWireRefusalCode
+/** One variant per code, so a refusal's details can only be that code's. */
+export type AgentSessionRefusalOf<C extends AgentSessionWireRefusalCode> = {
+  [K in C]: {
+    code: K
+    /** For logs and released clients, which print it; newer clients choose words from details. */
+    message: string
+    /** Absent from older hosts. */
+    details?: AgentSessionRefusalDetails<K>
+  } & AgentSessionLegacyRefusalFields
+}[C]
+
+export type AgentSessionWireRefusal = AgentSessionRefusalOf<AgentSessionWireRefusalCode>
+
+/** A refusal named without its prose: what a durable record or an error's data keeps. */
+export type AgentSessionRefusalReference = {
+  [K in AgentSessionWireRefusalCode]: { code: K; details?: AgentSessionRefusalDetails<K> }
+}[AgentSessionWireRefusalCode]
+
+function buildRefusal(
+  code: AgentSessionWireRefusalCode,
+  details: AgentSessionAnyRefusalDetails | undefined,
   message: string
-  /** On a stale fence, so the client can retry without another round trip. */
-  currentFence?: number
-  /** On a lost compare-and-set: the winning answer and who gave it. */
-  resolution?: AgentJournalResolution
-  /** On a lost compare-and-set: the revision the host actually holds. */
-  currentRevision?: number
-  /** On a durably failed create: `exited` proves nothing runs for the session, so a new
-   *  operation cannot collide with this one. Absent (older hosts) reads as unverifiable. */
-  ownerVerdict?: AgentSessionOwnerVerdict
+): AgentSessionWireRefusal {
+  const kept = details && Object.keys(details).length > 0 ? details : undefined
+  const refusal = {
+    code,
+    message,
+    ...(kept ? { details: kept } : {}),
+    ...agentSessionLegacyRefusalFields(kept)
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: every caller passes details typed for `code` (refuse and refuseUnclassified by their signatures, the reference by its own union).
+  return refusal as AgentSessionWireRefusal
+}
+
+/** A refusal built at its emitter. The reason must be one `code` lists; the legacy top-level fields
+ *  released clients read are copied from `details` here and nowhere else. */
+export function refuse<C extends AgentSessionWireRefusalCode>(
+  code: C,
+  details: NoInfer<AgentSessionRefusalDetailsByCode[C]>,
+  message: string
+): AgentSessionWireRefusal {
+  return buildRefusal(code, details, message)
+}
+
+/**
+ * A refusal whose situation this site cannot name: the code, and whatever facts it does know, with
+ * no reason, exactly as an older host sends it. The explicit path, so no emitter reaches for a
+ * catch-all reason instead.
+ */
+export function refuseUnclassified<C extends AgentSessionWireRefusalCode>(
+  code: C,
+  message: string,
+  facts?: NoInfer<AgentSessionRefusalFacts<C>>
+): AgentSessionWireRefusal {
+  return buildRefusal(code, facts, message)
+}
+
+/** A refusal rebuilt from what a record or a decision kept of it. */
+export function agentSessionRefusalFromReference(
+  reference: AgentSessionRefusalReference,
+  message: string
+): AgentSessionWireRefusal {
+  return buildRefusal(reference.code, reference.details, message)
+}
+
+/** The same refusal with more facts: a failed create's verdict, learned after the refusal was. */
+export function withAgentSessionRefusalFacts(
+  refusal: AgentSessionWireRefusal,
+  facts: { ownerVerdict: AgentSessionOwnerVerdict }
+): AgentSessionWireRefusal {
+  return buildRefusal(refusal.code, { ...refusal.details, ...facts }, refusal.message)
+}
+
+/** The refusal reduced to what may be stored or put in an error's data. */
+export function agentSessionRefusalReference(
+  refusal: AgentSessionWireRefusal
+): AgentSessionRefusalReference {
+  return buildReference(refusal.code, refusal.details)
+}
+
+/** A reference read back from a record another build may have written; details are checked
+ *  against the code, and anything else they held (an older build's `cause`) is dropped. */
+export function readAgentSessionRefusalReference(
+  value: unknown
+): AgentSessionRefusalReference | undefined {
+  if (
+    typeof value !== 'object' ||
+    value === null ||
+    !('code' in value) ||
+    !isAgentSessionWireRefusalCode(value.code)
+  ) {
+    return undefined
+  }
+  return buildReference(
+    value.code,
+    'details' in value ? readAgentSessionRefusalDetails(value.code, value.details) : undefined
+  )
+}
+
+function buildReference(
+  code: AgentSessionWireRefusalCode,
+  details: AgentSessionAnyRefusalDetails | undefined
+): AgentSessionRefusalReference {
+  const reference = { code, ...(details ? { details } : {}) }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: `details` is the refusal's own, or was read against `code`.
+  return reference as AgentSessionRefusalReference
+}
+
+/**
+ * A refusal raised rather than returned. Its message is the bare code, exactly as the
+ * `Error(code)` it replaces: the RPC passthrough, the restart-resume ledger and released clients
+ * all read a thrown refusal's message as its code. The details ride on `refusal` and reach the
+ * client only in the RPC error's data. Deliberately no `code` property, so no `'code' in error`
+ * passthrough meant for another subsystem can claim it.
+ */
+export class AgentSessionRefusalError extends Error {
+  readonly refusal: AgentSessionWireRefusal
+
+  constructor(refusal: AgentSessionWireRefusal, options?: { cause?: unknown }) {
+    super(refusal.code, options)
+    this.name = 'AgentSessionRefusalError'
+    this.refusal = refusal
+  }
+}
+
+/** A store or host refusal thrown under its situation; the error's message stays the code. */
+export function agentSessionRefusalError<C extends AgentSessionWireRefusalCode>(
+  code: C,
+  details: NoInfer<AgentSessionRefusalDetailsByCode[C]>,
+  message: string = code
+): AgentSessionRefusalError {
+  return new AgentSessionRefusalError(refuse(code, details, message))
+}
+
+export function isAgentSessionRefusalError(error: unknown): error is AgentSessionRefusalError {
+  return error instanceof AgentSessionRefusalError
 }
diff --git a/src/shared/agent-session-wire.ts b/src/shared/agent-session-wire.ts
index 7118a2237ebd..7306f0b42665 100644
--- a/src/shared/agent-session-wire.ts
+++ b/src/shared/agent-session-wire.ts
@@ -187,6 +187,9 @@ export type AgentSessionStatusSummary = {
   /** With `hostExecutionOwned`: whether that child has proven its start. `starting` is a
    *  published session whose provider has not yet answered startup; absent on older hosts. */
   hostExecutionPhase?: 'starting' | 'ready'
+  /** The current provider child, distinct from the conversation and from replacement children.
+   *  Absent on older hosts and whenever this host has no live child. */
+  hostExecutionChild?: { generation: string | null; fence: number }
   latestPrompt: string
   /** Provider model in force for the next turn; absent until the host has read the options. */
   model?: string
@@ -223,7 +226,8 @@ export type AgentSessionStatusEvent =
 // ─── Turn completion feed ───────────────────────────────────────────────────
 
 /**
- * One root turn reaching a terminal outcome, derived by the EXECUTION HOST at journal commit.
+ * The session's latest request reaching a terminal outcome — a root turn, or a send the agent or
+ * its start refused — derived by the EXECUTION HOST at journal commit.
  *
  * This is the EDGE, with turn identity; `AgentSessionStatusSummary.turnOutcome` is the STATE.
  * The summary carries the verdict only while the session is idle, as a fact about the main agent's
@@ -239,11 +243,14 @@ export type AgentSessionTurnCompletion = {
   /** Host-and-workspace scope; a bare provider turn id is not globally unique. */
   scope: AgentSessionExecutionLocation
   sessionId: string
-  /** Root turn identity from the journal turn record; no second identity is minted. */
+  /** The request's identity: the root turn's id, or for a send refused before any turn, that
+   *  send's journal item key. Neither is minted here. */
   turnId: string
   outcome: AgentJournalTurnOutcome
   /** Execution host's clock at journal commit. */
   completedAt: number
+  /** The request settled while a prompt waits on the user. Absent otherwise, and from older hosts. */
+  awaitingUser?: true
 }
 
 /**
@@ -295,7 +302,7 @@ export type AgentSessionAttachResult = {
   sessionId: string
   fence: number
   page: AgentSessionHistoryPage
-  /** Submissions the crash boundary settled as `unknown` while attaching. */
+  /** Submissions a crash boundary left `unknown` that provider history could not decide. */
   unconfirmedClientMessageIds: string[]
   /** The host-owned id of the tab showing this chat, when it has one. Absent from older hosts. */
   tabId?: string
@@ -307,8 +314,8 @@ export type AgentSessionSendResult = {
 }
 
 export type AgentSessionCancelResult = {
-  /** The turn the client named, echoed so a late reply can be matched. */
-  turnId: string
+  /** The turn the client named, echoed so a late reply can be matched; absent when it named none. */
+  turnId?: string
   cancelled: boolean
 }
 
diff --git a/src/shared/agent-session-write-failure.test.ts b/src/shared/agent-session-write-failure.test.ts
new file mode 100644
index 000000000000..0b614b3a2650
--- /dev/null
+++ b/src/shared/agent-session-write-failure.test.ts
@@ -0,0 +1,167 @@
+import { describe, expect, it } from 'vitest'
+import {
+  agentSessionRefusalFailure,
+  agentSessionThrownFailure,
+  parseAgentSessionWriteFailure,
+  readAgentSessionErrorRefusal
+} from './agent-session-write-failure'
+
+const HOST_TEXT = 'Expected runtime fence 1; the session is at 3.'
+
+function saved(value: unknown): unknown {
+  return JSON.parse(JSON.stringify(value))
+}
+
+describe('parseAgentSessionWriteFailure', () => {
+  // The shape saved before refusals carried a reason; it loads as it was and reads as its code.
+  it('reads back an entry saved with the code alone, unchanged', () => {
+    expect(
+      parseAgentSessionWriteFailure(saved({ kind: 'refused', code: 'agent_session_conflict' }))
+    ).toEqual({ kind: 'refused', code: 'agent_session_conflict' })
+    expect(parseAgentSessionWriteFailure({ kind: 'failed' })).toEqual({ kind: 'failed' })
+    expect(
+      parseAgentSessionWriteFailure({
+        kind: 'refused',
+        code: 'agent_session_conflict',
+        message: HOST_TEXT
+      })
+    ).toEqual({ kind: 'refused', code: 'agent_session_conflict' })
+  })
+
+  it.each([
+    [
+      'a reason',
+      { kind: 'refused', code: 'agent_session_conflict', details: { reason: 'chatStarting' } }
+    ],
+    [
+      "a rewind's reason",
+      {
+        kind: 'refused',
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'rewindRefused', rewindReason: 'busy' }
+      }
+    ],
+    [
+      "the owner's verdict",
+      {
+        kind: 'refused',
+        code: 'agent_session_ownership_unknown',
+        details: { reason: 'ownerUnproven', ownerVerdict: 'exited' }
+      }
+    ]
+  ])('keeps %s', (_label, value) => {
+    expect(parseAgentSessionWriteFailure(saved(value))).toEqual(value)
+  })
+
+  // A newer build's reason or verdict is dropped, never guessed; the code's words stand.
+  it.each([
+    [{ reason: 'fromTheFuture' }, undefined],
+    [{ reason: 'fromTheFuture', ownerVerdict: 'exited' }, { ownerVerdict: 'exited' }],
+    [{ reason: 'ownerUnproven', ownerVerdict: 'gone' }, { reason: 'ownerUnproven' }],
+    [{ reason: 'chatStarting' }, undefined]
+  ])('drops what this build cannot place: %j', (details, kept) => {
+    expect(
+      parseAgentSessionWriteFailure({
+        kind: 'refused',
+        code: 'agent_session_ownership_unknown',
+        details
+      })
+    ).toEqual({
+      kind: 'refused',
+      code: 'agent_session_ownership_unknown',
+      ...(kept ? { details: kept } : {})
+    })
+  })
+
+  it.each([
+    null,
+    'The agent was restarting.',
+    { kind: 'refused' },
+    { kind: 'refused', code: 'agent_session_from_the_future' },
+    { kind: 'something-else' }
+  ])('drops %j instead of guessing', (value) => {
+    expect(parseAgentSessionWriteFailure(value)).toBeUndefined()
+  })
+})
+
+describe('agentSessionRefusalFailure', () => {
+  // What moves with the owner, the question's answer and the host's words are never kept.
+  it('keeps only the facts that stay true after a reload', () => {
+    expect(
+      agentSessionRefusalFailure({
+        code: 'agent_session_checkpoint_stale',
+        details: { reason: 'fenceStale', currentFence: 3, ownerVerdict: 'exited' }
+      })
+    ).toEqual({
+      kind: 'refused',
+      code: 'agent_session_checkpoint_stale',
+      details: { reason: 'fenceStale' }
+    })
+    // A prompt's revision and winning answer, and a provider's diagnostic, as a host may send them.
+    const answered = JSON.parse(
+      JSON.stringify({
+        code: 'agent_session_already_resolved',
+        details: {
+          reason: 'promptAlreadyResolved',
+          currentRevision: 2,
+          resolution: { state: 'answered', selectedOptionId: 'yes', resolvedBy: 'phone' },
+          detail: { text: 'stderr', audience: 'log' }
+        }
+      })
+    )
+    expect(agentSessionRefusalFailure(answered)).toEqual({
+      kind: 'refused',
+      code: 'agent_session_already_resolved',
+      details: { reason: 'promptAlreadyResolved' }
+    })
+  })
+
+  it('keeps a code from a newer host without reading its details', () => {
+    const refusal = JSON.parse('{"code":"agent_session_from_the_future","details":{"reason":"x"}}')
+    expect(agentSessionRefusalFailure(refusal)).toEqual({
+      kind: 'refused',
+      code: 'agent_session_from_the_future'
+    })
+  })
+})
+
+describe('a refusal a failed request carried in its error', () => {
+  const refusal = {
+    code: 'agent_session_journal_unreadable',
+    details: { reason: 'journalCorrupt', stray: 'dropped' }
+  }
+  const payload = { code: 'runtime_error', message: 'agent_session_journal_unreadable' }
+
+  it('is read from a thrown RPC error and from a stream payload alike', () => {
+    const expected = {
+      code: 'agent_session_journal_unreadable',
+      details: { reason: 'journalCorrupt' }
+    }
+    expect(
+      readAgentSessionErrorRefusal({ response: { error: { ...payload, data: { refusal } } } })
+    ).toEqual(expected)
+    expect(readAgentSessionErrorRefusal(saved({ ...payload, data: { refusal } }))).toEqual(expected)
+  })
+
+  it.each([
+    ['an older host', payload],
+    ['a thrown error without a response', new Error('agent_session_journal_unreadable')],
+    ['a code this build does not know', { ...payload, data: { refusal: { code: 'from_later' } } }],
+    ['nothing', undefined]
+  ])('is absent from %s', (_label, error) => {
+    expect(readAgentSessionErrorRefusal(error)).toBeUndefined()
+  })
+
+  it("words the refusal when there is one, else what the request's error code proves", () => {
+    expect(agentSessionThrownFailure({ ...payload, data: { refusal } }, 'runtime_error')).toEqual({
+      kind: 'refused',
+      code: 'agent_session_journal_unreadable',
+      details: { reason: 'journalCorrupt' }
+    })
+    expect(agentSessionThrownFailure(payload, 'runtime_error')).toEqual({ kind: 'unconfirmed' })
+    expect(agentSessionThrownFailure(payload, 'method_not_found')).toEqual({
+      kind: 'refused',
+      code: 'structured_agent_session_unsupported'
+    })
+  })
+})
diff --git a/src/shared/agent-session-write-failure.ts b/src/shared/agent-session-write-failure.ts
new file mode 100644
index 000000000000..81809133871e
--- /dev/null
+++ b/src/shared/agent-session-write-failure.ts
@@ -0,0 +1,183 @@
+// A chat write that did not happen, as a fact: what the person was doing, and what the host said.
+// Saved with a queued message, so it holds only what stays true after a reload; the words are
+// chosen from it when it is shown (`agent-session-refusal-notice.ts`).
+
+import {
+  readAgentSessionRefusalDetails,
+  type AgentSessionRefusalReason
+} from './agent-session-refusal-details'
+import type { AgentSessionRewindReason } from './agent-session-rewind'
+import {
+  isAgentSessionWireRefusalCode,
+  readAgentSessionRefusalReference,
+  type AgentSessionOwnerVerdict,
+  type AgentSessionRefusalReference,
+  type AgentSessionWireRefusal,
+  type AgentSessionWireRefusalCode
+} from './agent-session-wire-refusals'
+
+/** What the person was doing, which decides what the notice says did not happen. `send` keeps
+ *  the message behind a Retry control; `composer-send` puts it back in the composer, as the phone
+ *  does. `read-history` is opening the chat to show its history, which writes nothing. */
+export type AgentSessionWriteKind =
+  | 'read-history'
+  | 'send'
+  | 'composer-send'
+  | 'stop'
+  | 'stop-task'
+  | 'stop-tasks'
+  | 'answer'
+  | 'option'
+  | 'command'
+  | 'goal'
+
+/** The kind of write an `agentSession.*` call stands for. */
+export function agentSessionWriteKindForMethod(
+  fingerprintMethod: string,
+  fields: Record<string, unknown>
+): AgentSessionWriteKind {
+  if (fingerprintMethod === 'agentSession.send') {
+    return 'send'
+  }
+  if (fingerprintMethod === 'agentSession.cancel') {
+    // A background-task stop never asked the agent to stop.
+    if (fields.scope !== 'background-tasks') {
+      return 'stop'
+    }
+    return typeof fields.taskId === 'string' ? 'stop-task' : 'stop-tasks'
+  }
+  if (fingerprintMethod.startsWith('agentSession.respondTo')) {
+    return 'answer'
+  }
+  if (fingerprintMethod === 'agentSession.setOption') {
+    return 'option'
+  }
+  if (fingerprintMethod === 'agentSession.threadGoal') {
+    return 'goal'
+  }
+  return 'command'
+}
+
+/** What a saved refusal keeps beside its reason: facts about the refused operation that stay true
+ *  after a reload. Never the fence, revision or resolution, which move, nor any provider text. */
+type DurableRefusalFacts = {
+  agent_session_operation_invalid: { rewindReason?: AgentSessionRewindReason }
+  agent_session_operation_unknown: { rewindReason?: AgentSessionRewindReason }
+  /** A snapshot from when it was refused; see `agentSessionOwnerVerdictAllowsFreshOperationId`. */
+  agent_session_ownership_unknown: { ownerVerdict?: AgentSessionOwnerVerdict }
+}
+
+const DURABLE_FACT_KEYS: Partial<Record<AgentSessionWireRefusalCode, readonly string[]>> = {
+  agent_session_operation_invalid: ['rewindReason'],
+  agent_session_operation_unknown: ['rewindReason'],
+  agent_session_ownership_unknown: ['ownerVerdict']
+} satisfies { [C in keyof DurableRefusalFacts]: readonly (keyof DurableRefusalFacts[C])[] }
+
+export type AgentSessionWriteRefusalDetails<C extends AgentSessionWireRefusalCode> = {
+  reason?: AgentSessionRefusalReason<C>
+} & (C extends keyof DurableRefusalFacts ? DurableRefusalFacts[C] : Record<never, never>)
+
+/** A refused write: its code, and what the host said about it that outlives the reply. */
+export type AgentSessionWriteRefusal = {
+  [C in AgentSessionWireRefusalCode]: {
+    kind: 'refused'
+    code: C
+    /** Absent from older hosts and from entries saved before refusals carried a reason. */
+    details?: AgentSessionWriteRefusalDetails<C>
+  }
+}[AgentSessionWireRefusalCode]
+
+/** Why a write did not happen, or that nothing proves it did not. */
+export type AgentSessionWriteFailure =
+  | AgentSessionWriteRefusal
+  /** The request failed without a refusal before the host ran it, so nothing is known about why. */
+  | { kind: 'failed' }
+  /** The request failed where the host may already have run it (a timeout, a lost connection, an
+   *  error inside the method). */
+  | { kind: 'unconfirmed' }
+
+/** The refusal as a write keeps it. Details are read against the code, so a reason or verdict
+ *  another build added is dropped and the code's own words stand. */
+function agentSessionWriteRefusal(
+  code: AgentSessionWireRefusalCode,
+  details: unknown
+): AgentSessionWriteRefusal {
+  const durable: readonly string[] = ['reason', ...(DURABLE_FACT_KEYS[code] ?? [])]
+  const kept = Object.fromEntries(
+    Object.entries(readAgentSessionRefusalDetails(code, details) ?? {}).filter(([key]) =>
+      durable.includes(key)
+    )
+  )
+  const refusal = {
+    kind: 'refused',
+    code,
+    ...(Object.keys(kept).length > 0 ? { details: kept } : {})
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: `kept` holds only a reason and facts read against `code` and allowed for it above.
+  return refusal as AgentSessionWriteRefusal
+}
+
+export function agentSessionRefusalFailure(
+  refusal: Pick<AgentSessionWireRefusal, 'code' | 'details'>
+): AgentSessionWriteRefusal {
+  // A newer host can send a code this client has never heard of; its details mean nothing here.
+  return isAgentSessionWireRefusalCode(refusal.code)
+    ? agentSessionWriteRefusal(refusal.code, refusal.details)
+    : { kind: 'refused', code: refusal.code }
+}
+
+/** A request that threw, from the RPC error code the host answered with (undefined when none came
+ *  back). Only a host that turned it away before running the method proves the write did not
+ *  happen. */
+export function agentSessionRpcErrorFailure(code: string | undefined): AgentSessionWriteFailure {
+  if (code === 'method_not_found' || code === 'method_not_supported') {
+    return { kind: 'refused', code: 'structured_agent_session_unsupported' }
+  }
+  return code === 'invalid_argument' || code === 'unauthorized'
+    ? { kind: 'refused', code: 'agent_session_operation_invalid' }
+    : { kind: 'unconfirmed' }
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null
+}
+
+/** The refusal a failed request's error carries in its data. Takes both shapes a client meets: an
+ *  RPC call's thrown error, whose payload is on `response.error`, and the payload a stream hands
+ *  its error callback. Undefined from an older host, or for a failure that was not a refusal. */
+export function readAgentSessionErrorRefusal(
+  error: unknown
+): AgentSessionRefusalReference | undefined {
+  const payload =
+    isRecord(error) && isRecord(error.response) && isRecord(error.response.error)
+      ? error.response.error
+      : error
+  const data = isRecord(payload) ? payload.data : undefined
+  return isRecord(data) ? readAgentSessionRefusalReference(data.refusal) : undefined
+}
+
+/** What to say about a request that threw: the host's refusal when its error carried one, else
+ *  what the RPC error code proves. Words only: whether the write may have happened stays the
+ *  caller's own classification. */
+export function agentSessionThrownFailure(
+  error: unknown,
+  rpcCode: string | undefined
+): AgentSessionWriteFailure {
+  const refusal = readAgentSessionErrorRefusal(error)
+  return refusal ? agentSessionRefusalFailure(refusal) : agentSessionRpcErrorFailure(rpcCode)
+}
+
+/** A saved failure, or undefined when it is not one this build wrote. */
+export function parseAgentSessionWriteFailure(
+  value: unknown
+): AgentSessionWriteFailure | undefined {
+  if (typeof value !== 'object' || value === null || !('kind' in value)) {
+    return undefined
+  }
+  if (value.kind === 'failed') {
+    return { kind: 'failed' }
+  }
+  return value.kind === 'refused' && 'code' in value && isAgentSessionWireRefusalCode(value.code)
+    ? agentSessionWriteRefusal(value.code, 'details' in value ? value.details : undefined)
+    : undefined
+}
diff --git a/src/shared/agent-session-write-notice-copy.ts b/src/shared/agent-session-write-notice-copy.ts
new file mode 100644
index 000000000000..d0c36e27a407
--- /dev/null
+++ b/src/shared/agent-session-write-notice-copy.ts
@@ -0,0 +1,64 @@
+// The sentences a chat notice is made of, each whole so desktop can translate it on its own.
+
+import {
+  QUIT_TERMINAL_AGENT,
+  START_NEW_CHAT,
+  TERMINAL_AGENT_HOLDS_CHAT
+} from './agent-session-failure-words'
+
+/** Every sentence a notice is made of. Desktop translates each whole sentence with this as its
+ *  fallback; mobile shows it as is. */
+export const AGENT_SESSION_WRITE_NOTICE_COPY = {
+  notDoneReadHistory: "This chat's history couldn't be loaded.",
+  notDoneSend: 'Your message was not sent.',
+  tryAgainComposerSend: 'Send it again.',
+  notDoneStop: "The agent wasn't stopped.",
+  notDoneStopTask: "The background task wasn't stopped.",
+  notDoneStopTasks: "The background tasks weren't stopped.",
+  notDoneAnswer: 'Your answer was not sent.',
+  notDoneOption: "The setting wasn't changed.",
+  notDoneCommand: "The command didn't run.",
+  notDoneGoal: "The goal wasn't changed.",
+  restartFailed: "The agent couldn't restart.",
+  capacity: 'Orca has received too many requests in the last day.',
+  outcomeUnknown: "Orca couldn't confirm what happened. Check the chat.",
+  questionChanged: 'This question was already answered or has changed.',
+  historyUnreadable: "Orca couldn't read this chat's saved history.",
+  historyUnusable: 'Unable to load this chat.',
+  historyUnavailable: "Orca couldn't open this chat's history right now.",
+  unsupported: "The Orca running this chat doesn't support this. Update Orca, then try again.",
+  unreachable: "Orca couldn't reach the agent.",
+  recordFailed: "Orca couldn't record it in this chat's history.",
+  conversationCleared: 'This conversation has been cleared.',
+  openCurrentConversation: 'Open the current conversation to continue.',
+  clearUnfinished: "The last /clear didn't finish.",
+  commandRunning: 'A /compact or /clear is still running.',
+  waitForCommand: 'Wait for the /compact or /clear to finish.',
+  agentStarting: 'The agent is still starting.',
+  waitForStart: 'Wait for the agent to finish starting.',
+  turnActive: 'The agent is still responding.',
+  waitForTurn: 'Wait for the agent to finish responding, or stop it.',
+  promptPending: 'The agent is waiting for an answer to a question or approval.',
+  answerFirst: 'Answer the question or approval first.',
+  backgroundTasksRunning: 'Background tasks are still running.',
+  waitForBackgroundTasks: 'Wait for the background tasks to finish.',
+  messagesUnsettled: "A message you sent earlier hasn't been confirmed yet.",
+  settleEarlierMessage: 'Wait for your earlier message to go through, or retry it.',
+  optionRejected: "The agent didn't accept this setting.",
+  goalsUnsupported: "This agent doesn't support goals.",
+  agentRefused: 'The agent turned this down.',
+  ownerUnproven: "Orca hasn't confirmed that this chat's previous agent stopped.",
+  reopenChat: 'Reopen the chat to check again.',
+  terminalAgentHoldsChat: TERMINAL_AGENT_HOLDS_CHAT,
+  quitTerminalAgent: QUIT_TERMINAL_AGENT,
+  hostReconciling: 'Orca is still checking on this chat after restarting.',
+  waitMoment: 'Wait a moment.',
+  recordUnreadable: "Orca couldn't read this chat's saved state.",
+  chatNotFound: 'The Orca running this chat has no record of it.',
+  startNewChat: START_NEW_CHAT,
+  tryAgain: 'Try again.'
+} as const
+
+export type AgentSessionWriteNoticeSentence = keyof typeof AGENT_SESSION_WRITE_NOTICE_COPY
+/** A notice as whole sentences, each translated on its own; `text` is a provider's own words. */
+export type AgentSessionWriteNoticePart = AgentSessionWriteNoticeSentence | { text: string }
diff --git a/src/shared/agent-state-history.ts b/src/shared/agent-state-history.ts
index 4833d351c66d..105d8e549087 100644
--- a/src/shared/agent-state-history.ts
+++ b/src/shared/agent-state-history.ts
@@ -1,4 +1,5 @@
 import type { AgentStatusState } from './agent-status-types'
+import type { AgentMainAgentStatus } from './main-agent-status'
 
 /** A snapshot of a previous agent state, used to render activity blocks.
  *  Why: intentionally narrower than AgentStatusEntry — tool/assistant context is
@@ -16,6 +17,9 @@ export type AgentStateHistoryEntry = {
   /** True when this `done` was a cancellation (agent hook like Claude `is_interrupt`,
    *  or Orca's guarded fallback). Always falsy for non-`done` states so retention logic can preserve it. */
   interrupted?: boolean
+  /** The main agent's own status when this state was left, copied with `interrupted` by
+   *  `agentVerdictFields`; read the verdict through `agentMainAgentVerdict`. */
+  mainAgent?: AgentMainAgentStatus
 }
 
 /** Maximum number of history entries kept per agent to bound memory. */
diff --git a/src/shared/agent-status-child-work-alias.ts b/src/shared/agent-status-child-work-alias.ts
index 539c9c38214e..c7ff29a5c6a4 100644
--- a/src/shared/agent-status-child-work-alias.ts
+++ b/src/shared/agent-status-child-work-alias.ts
@@ -16,11 +16,17 @@ const CHILD_ALIAS_KEY_PREFIX = 'agent-child-work-alias-v1:'
 const MAX_ALIAS_PART_LENGTH = 512
 
 /**
- * `thread_id` names a child by its own provider thread (a Codex subagent). The hook lane registers
- * a Claude `agent_id` under `task_id` (it is the same registry id) and a Codex `agent_id` under
- * `thread_id`; no `agent_id` kind exists on purpose.
+ * `thread_id` names a child by its own provider thread (a Codex subagent); `turn_id` names one run
+ * of such a child, as `tool_use_id` names one run of a task. The hook lane registers a Claude
+ * `agent_id` under `task_id` (it is the same registry id) and a Codex `agent_id` under `thread_id`;
+ * no `agent_id` kind exists on purpose.
  */
-export const AGENT_CHILD_WORK_ALIAS_KINDS = ['task_id', 'tool_use_id', 'thread_id'] as const
+export const AGENT_CHILD_WORK_ALIAS_KINDS = [
+  'task_id',
+  'tool_use_id',
+  'thread_id',
+  'turn_id'
+] as const
 export type AgentChildWorkAliasKind = (typeof AGENT_CHILD_WORK_ALIAS_KINDS)[number]
 const ALIAS_KIND_SET: ReadonlySet<string> = new Set(AGENT_CHILD_WORK_ALIAS_KINDS)
 
diff --git a/src/shared/agent-status-child-work-display.ts b/src/shared/agent-status-child-work-display.ts
new file mode 100644
index 000000000000..c83957199f99
--- /dev/null
+++ b/src/shared/agent-status-child-work-display.ts
@@ -0,0 +1,114 @@
+import { foldAgentLeadStatus } from './agent-lead-status-fold'
+import type { AgentSessionBackgroundTaskRunState } from './agent-session-background-task-wire'
+import type { AgentChildWorkId, AgentChildWorkOutcome } from './agent-status-child-work'
+import {
+  agentChildWorkLiveness,
+  type AgentChildWorkLiveness
+} from './agent-status-child-work-liveness'
+import type { AgentChildWorkView } from './agent-status-child-work-view'
+import type { AgentStatusState } from './agent-status-types'
+import { groupedBy } from './grouped-by'
+
+// What a surface derives from child views. Kept apart from the projection, which resolves owners
+// against status subjects and so reaches host-only code: every surface, renderer included, loads
+// this module.
+
+type AgentChildWorkOwnershipView = Pick<
+  AgentChildWorkView,
+  'id' | 'kind' | 'state' | 'membership' | 'parentChildWorkId'
+>
+
+/** Liveness of all live work beneath a child, at any depth — the same input a parent row folds. */
+export function agentChildWorkOwnedLiveness(
+  views: readonly AgentChildWorkOwnershipView[],
+  ownerId: AgentChildWorkId
+): AgentChildWorkLiveness {
+  const owned = groupedBy(views, (view) => view.parentChildWorkId)
+  const seen = new Set<AgentChildWorkId>([ownerId])
+  const frontier = [ownerId]
+  const liveDescendants: AgentChildWorkOwnershipView[] = []
+  for (let owner = frontier.pop(); owner !== undefined; owner = frontier.pop()) {
+    for (const view of owned.get(owner) ?? []) {
+      if (!seen.has(view.id)) {
+        seen.add(view.id)
+        frontier.push(view.id)
+        if (view.membership === 'live') {
+          liveDescendants.push(view)
+        }
+      }
+    }
+  }
+  return agentChildWorkLiveness(liveDescendants)
+}
+
+/** The dot a child row renders; every value is an `AgentStateDot` state. */
+export type AgentChildDisplayState =
+  | 'working'
+  | 'monitoring'
+  | 'waiting'
+  | 'blocked'
+  | 'done'
+  | 'failed'
+  | 'interrupted'
+  | 'idle'
+  | 'unverifiable'
+
+const SETTLED_DISPLAY_STATE: Record<AgentChildWorkOutcome, AgentChildDisplayState> = {
+  succeeded: 'done',
+  failed: 'failed',
+  cancelled: 'interrupted',
+  // Neutral: an ending the lane cannot classify asserts nothing.
+  unknown: 'idle'
+}
+
+/**
+ * A child's display state, through the same fold that decides a parent row's: work that is idle
+ * or finished enters it as `done`, so a live shell the child owns reads `monitoring` exactly as it
+ * would under a CLI agent. `unverifiable` is a freshness verdict and bypasses the fold.
+ */
+export function deriveAgentChildDisplayState(
+  view: Pick<AgentChildWorkView, 'state' | 'membership' | 'outcome'>,
+  ownedLiveness: AgentChildWorkLiveness
+): AgentChildDisplayState {
+  if (view.state === 'unverifiable') {
+    return 'unverifiable'
+  }
+  // Stored only by a shell or a monitor, and neither owns work.
+  if (view.state === 'monitoring') {
+    return 'monitoring'
+  }
+  const leadState: AgentStatusState =
+    view.membership === 'settled' || view.state === 'done' || view.state === 'idle'
+      ? 'done'
+      : view.state
+  // A child's cancel never hides the work it left running.
+  const foldInput = { leadState, childWorkLiveness: ownedLiveness, interrupted: false }
+  const folded = foldAgentLeadStatus(foldInput)
+  if (folded.stateName !== 'done') {
+    return folded.workingMode ?? folded.stateName
+  }
+  return view.membership === 'live' ? 'idle' : SETTLED_DISPLAY_STATE[view.outcome ?? 'unknown']
+}
+
+/**
+ * A display state in the run-state words a host publishes and every older reader already speaks:
+ * a failure reads as `blocked`, a cancel as `idle`. The row's own dot keeps the real outcome.
+ */
+export function agentChildRunStateFor(
+  displayState: AgentChildDisplayState
+): AgentSessionBackgroundTaskRunState {
+  switch (displayState) {
+    case 'failed':
+      return 'blocked'
+    case 'interrupted':
+      return 'idle'
+    case 'working':
+    case 'monitoring':
+    case 'waiting':
+    case 'blocked':
+    case 'done':
+    case 'idle':
+    case 'unverifiable':
+      return displayState
+  }
+}
diff --git a/src/shared/agent-status-child-work-evidence-resolution.ts b/src/shared/agent-status-child-work-evidence-resolution.ts
index 50c80e5bdbd7..14c31bee4b6b 100644
--- a/src/shared/agent-status-child-work-evidence-resolution.ts
+++ b/src/shared/agent-status-child-work-evidence-resolution.ts
@@ -20,7 +20,15 @@ import { agentStatusSubjectsEqual, type AgentStatusSubject } from './agent-statu
  *  a handle is unique per parent and provider without being unique across producers. */
 export const STRUCTURED_CHILD_WORK_PRODUCER_ID = 'structured-session-child-work'
 const SEGMENT_ID = STRUCTURED_CHILD_WORK_PRODUCER_ID
-const RUN_ALIAS_KIND: AgentChildWorkAliasKind = 'tool_use_id'
+/** A run is named in the provider's own terms: a task runs under its spawn call, a thread under
+ *  its turn. The kinds stay apart so a turn id can never pass for a spawn call. */
+const RUN_ALIAS_KIND_BY_ID_KIND = {
+  task_id: 'tool_use_id',
+  thread_id: 'turn_id'
+} as const satisfies Record<AgentChildWorkEvidenceHandle['idKind'], AgentChildWorkAliasKind>
+const RUN_ALIAS_KINDS: ReadonlySet<AgentChildWorkAliasKind> = new Set(
+  Object.values(RUN_ALIAS_KIND_BY_ID_KIND)
+)
 
 export const STRUCTURED_CHILD_WORK_PROVENANCE: AgentChildWorkProvenance = {
   source: 'structured-session',
@@ -70,7 +78,13 @@ export function agentChildWorkHandleAliases(
   return [
     { segmentId: SEGMENT_ID, aliasKind: handle.idKind, alias: handle.id },
     ...(handle.runId !== undefined && handle.runId !== handle.id
-      ? [{ segmentId: SEGMENT_ID, aliasKind: RUN_ALIAS_KIND, alias: handle.runId }]
+      ? [
+          {
+            segmentId: SEGMENT_ID,
+            aliasKind: RUN_ALIAS_KIND_BY_ID_KIND[handle.idKind],
+            alias: handle.runId
+          }
+        ]
       : [])
   ]
 }
@@ -123,14 +137,14 @@ export function resolveAgentChildWorkHandle(
     : { child: child ?? null, ambiguous: false, highestGeneration }
 }
 
-/** The owner a handle id names, by its stable id or by the run handle it spawned under. */
+/** The owner a handle id names, by its stable id or by the spawn call it runs under. */
 export function resolveAgentChildWorkOwner(
   scope: AgentChildWorkEvidenceScope,
   ownerId: string
 ): string | undefined {
   const resolution = resolveAgentChildWorkHandle(
     scope,
-    ['task_id', 'thread_id', RUN_ALIAS_KIND],
+    ['task_id', 'thread_id', 'tool_use_id'],
     ownerId
   )
   return resolution?.child?.childWorkId
@@ -164,7 +178,7 @@ export function currentAgentChildWorkAliases(
   return {
     ...(stable ? { stable } : {}),
     stableId: stable?.id,
-    runId: current.find((alias) => alias.aliasKind === RUN_ALIAS_KIND)?.alias,
+    runId: current.find((alias) => RUN_ALIAS_KINDS.has(alias.aliasKind))?.alias,
     aliases: current.map((alias) => ({
       segmentId: alias.segmentId,
       aliasKind: alias.aliasKind,
@@ -183,7 +197,7 @@ export function isPreviousAgentChildWorkRun(
     .getAliasesForChild(child.childWorkId)
     .some(
       (alias) =>
-        alias.aliasKind === RUN_ALIAS_KIND &&
+        RUN_ALIAS_KINDS.has(alias.aliasKind) &&
         alias.alias === runId &&
         !agentChildWorkFencesEqual(alias.fence, child.invocation)
     )
diff --git a/src/shared/agent-status-child-work-evidence.ts b/src/shared/agent-status-child-work-evidence.ts
index 06fe05d38a8c..8df08126827c 100644
--- a/src/shared/agent-status-child-work-evidence.ts
+++ b/src/shared/agent-status-child-work-evidence.ts
@@ -2,7 +2,8 @@
 //
 // A producer decodes provider frames into these edges and the host folds them into the one
 // record per child it owns. Edges carry facts, not records: which child is live, what it is
-// doing, how it ended. Only a child's own ending settles it, or the end of its session.
+// doing, how it ended, or that it is gone. Only a child's own ending settles it, or the end of its
+// session. Edges are host-internal: the producer and the store share one process.
 
 import type { AgentChildWorkAliasKind } from './agent-status-child-work-alias'
 import type {
@@ -13,9 +14,9 @@ import type {
   AgentChildWorkState
 } from './agent-status-child-work'
 
-/** How the provider names one child. `id` is the stable handle today's wire already publishes
- *  (a Claude task id); `runId` names the current run when the provider mints one per run (the
- *  spawn call), and a different one is the provider starting the child again. */
+/** How the provider names one child. `id` is the stable handle: a task id, or the child's own
+ *  thread. `runId` names the current run when the provider mints one per run (a task's spawn
+ *  call, a thread's turn), and a different one is the provider starting the child again. */
 export type AgentChildWorkEvidenceHandle = {
   idKind: Extract<AgentChildWorkAliasKind, 'task_id' | 'thread_id'>
   id: string
@@ -74,8 +75,17 @@ export type AgentChildWorkEndedEvidence = {
  *  with an outcome nobody reported. Settled children stay; the parent's removal drops them. */
 export type AgentChildWorkSessionEndedEvidence = { type: 'session-ended'; observedAt: number }
 
+/** Work that leaves nothing to report once it stops, such as a command whose process exited: its
+ *  record goes rather than settles. For work that owns no other record. */
+export type AgentChildWorkRemovedEvidence = {
+  type: 'removed'
+  observedAt: number
+  handle: AgentChildWorkEvidenceHandle
+}
+
 export type AgentChildWorkEvidence =
   | AgentChildWorkLiveEvidence
   | AgentChildWorkOperationEvidence
   | AgentChildWorkEndedEvidence
+  | AgentChildWorkRemovedEvidence
   | AgentChildWorkSessionEndedEvidence
diff --git a/src/shared/agent-status-child-work-reconciliation.test.ts b/src/shared/agent-status-child-work-reconciliation.test.ts
index 377c580fc41c..79ffc1c57616 100644
--- a/src/shared/agent-status-child-work-reconciliation.test.ts
+++ b/src/shared/agent-status-child-work-reconciliation.test.ts
@@ -5,10 +5,7 @@ import type {
   AgentChildWorkEvidence,
   AgentChildWorkLiveObservation
 } from './agent-status-child-work-evidence'
-import {
-  reconcileAgentChildWorkEvidence,
-  STRUCTURED_CHILD_WORK_MAX_SETTLED
-} from './agent-status-child-work-reconciliation'
+import { reconcileAgentChildWorkEvidence } from './agent-status-child-work-reconciliation'
 import { STRUCTURED_CHILD_WORK_MAX_LIVE } from './agent-status-child-work-evidence-admission'
 import { createAgentStatusStore, type AgentStatusStore } from './agent-status-store'
 import { makeStructuredAgentStatusSubject } from './agent-status-subject'
@@ -399,17 +396,9 @@ describe('structured child-work reconciliation', () => {
     expect(records(store)).toHaveLength(STRUCTURED_CHILD_WORK_MAX_LIVE)
   })
 
-  it('keeps a bounded settled history, never dropping a child that owns live work', () => {
+  it('keeps every settled child until the parent row goes', () => {
     const { store, apply } = harness()
-    apply(live(child('owner')))
-    apply(live(child('shell', { kind: 'command', ownerId: 'owner' })))
-    apply({
-      type: 'ended',
-      observedAt: 101,
-      handle: { idKind: 'task_id', id: 'owner' },
-      outcome: 'succeeded'
-    })
-    for (let index = 0; index < STRUCTURED_CHILD_WORK_MAX_SETTLED + 1; index += 1) {
+    for (let index = 0; index < 100; index += 1) {
       apply(live(child(`done-${index}`), 200 + index), {
         type: 'ended',
         observedAt: 200 + index,
@@ -418,9 +407,22 @@ describe('structured child-work reconciliation', () => {
       })
     }
     const settled = records(store).filter((record) => record.membership === 'settled')
-    expect(settled).toHaveLength(STRUCTURED_CHILD_WORK_MAX_SETTLED)
-    expect(settled.map((record) => record.description)).toContain('Task owner')
-    expect(settled.map((record) => record.description)).not.toContain('Task done-0')
-    expect(settled.map((record) => record.description)).not.toContain('Task done-1')
+    expect(settled).toHaveLength(100)
+    expect(settled.map((record) => record.description)).toContain('Task done-0')
+  })
+
+  it('removes work that stopped with nothing to report, and only the record it names', () => {
+    const { store, apply } = harness()
+    apply(live(child('owner')), live(child('shell', { kind: 'command', ownerId: 'owner' })))
+    expect(
+      apply({ type: 'removed', observedAt: 200, handle: { idKind: 'task_id', id: 'shell' } })
+    ).toMatchObject({ removed: 1, settled: 0 })
+    expect(only(store)).toMatchObject({ description: 'Task owner', membership: 'live' })
+    expect(store.getAliasesForChild('child-2')).toEqual([])
+    // A handle it no longer answers to removes nothing.
+    expect(
+      apply({ type: 'removed', observedAt: 201, handle: { idKind: 'task_id', id: 'shell' } })
+    ).toMatchObject({ removed: 0 })
+    expect(records(store)).toHaveLength(1)
   })
 })
diff --git a/src/shared/agent-status-child-work-reconciliation.ts b/src/shared/agent-status-child-work-reconciliation.ts
index 08d057afc96b..43f23b85483a 100644
--- a/src/shared/agent-status-child-work-reconciliation.ts
+++ b/src/shared/agent-status-child-work-reconciliation.ts
@@ -1,14 +1,17 @@
 // Fold one structured session's child-work evidence into the host's records.
 //
 // The store holds the only current record per child; evidence patches it. A child settles on its
-// own ending, or `unknown` when its session ends while it is still live. It owns only the records
-// its own producer admitted, and never claims an outcome the evidence did not report.
+// own ending, or `unknown` when its session ends while it is still live; work with nothing to
+// report once it stops is removed instead. Settled children stay until the host drops the parent's
+// row. It owns only the records its own producer admitted, and never claims an outcome the
+// evidence did not report.
 
 import type { AgentChildWorkAdmission } from './agent-status-child-work-admission'
 import type {
   AgentChildWorkEndedEvidence,
   AgentChildWorkEvidence,
-  AgentChildWorkOperationEvidence
+  AgentChildWorkOperationEvidence,
+  AgentChildWorkRemovedEvidence
 } from './agent-status-child-work-evidence'
 import {
   applyAgentChildWorkLive,
@@ -26,9 +29,6 @@ import {
 
 export type { AgentChildWorkReconcileOutcome } from './agent-status-child-work-evidence-admission'
 
-/** Settled children kept per session. The oldest go first, never one that owns live work. */
-export const STRUCTURED_CHILD_WORK_MAX_SETTLED = 32
-
 export type AgentChildWorkReconcileInput = AgentChildWorkEvidenceScope & {
   admission: AgentChildWorkAdmission
   evidence: readonly AgentChildWorkEvidence[]
@@ -98,32 +98,20 @@ function settleLive(ctx: ReconcileContext, observedAt: number): void {
   }
 }
 
-function removeChildren(ctx: ReconcileContext, childWorkIds: string[]): void {
-  if (childWorkIds.length > 0 && ctx.store.applyMutation({ removeChildren: childWorkIds })) {
-    ctx.outcome.removed += childWorkIds.length
+/** The work is gone and has no ending to keep: its record, and the handles it answered to, go. */
+function applyRemoved(ctx: ReconcileContext, edge: AgentChildWorkRemovedEvidence): void {
+  const resolution = resolveAgentChildWorkHandle(ctx, [edge.handle.idKind], edge.handle.id)
+  if (resolution?.ambiguous) {
+    ctx.outcome.rejected.push({ handleId: edge.handle.id, reason: 'ambiguous' })
+    return
   }
-}
-
-/** Oldest-settled first; a settled child that still owns live work stays so its work keeps an owner. */
-function trimSettled(ctx: ReconcileContext): void {
-  const owned = ownedStructuredChildWork(ctx)
-  const settled = owned.filter((record) => record.membership === 'settled')
-  const excess = settled.length - STRUCTURED_CHILD_WORK_MAX_SETTLED
-  if (excess <= 0) {
+  const existing = resolution?.child
+  if (!existing || agentChildWorkRunVerdict(ctx, existing, edge.handle.runId) === 'previous') {
     return
   }
-  const owners = new Set(
-    owned.flatMap((record) =>
-      record.membership === 'live' && record.parentChildWorkId ? [record.parentChildWorkId] : []
-    )
-  )
-  const removable = settled
-    .filter((record) => !owners.has(record.childWorkId))
-    .sort((a, b) => (a.settledAt ?? a.observedAt) - (b.settledAt ?? b.observedAt))
-  removeChildren(
-    ctx,
-    removable.slice(0, excess).map((record) => record.childWorkId)
-  )
+  if (ctx.store.applyMutation({ removeChildren: [existing.childWorkId] })) {
+    ctx.outcome.removed += 1
+  }
 }
 
 /** Apply one batch of evidence. The parent must already be held: the store refuses a child whose
@@ -145,13 +133,11 @@ export function reconcileAgentChildWorkEvidence(
       applyOperation(ctx, edge)
     } else if (edge.type === 'ended') {
       applyEnded(ctx, edge)
+    } else if (edge.type === 'removed') {
+      applyRemoved(ctx, edge)
     } else {
       settleLive(ctx, edge.observedAt)
     }
   }
-  // Only a settle adds settled history; skipping the scan otherwise keeps progress edges cheap.
-  if (ctx.outcome.settled > 0) {
-    trimSettled(ctx)
-  }
   return ctx.outcome
 }
diff --git a/src/shared/agent-status-child-work-view.test.ts b/src/shared/agent-status-child-work-view.test.ts
index 9c79a5451835..da0de4e752cd 100644
--- a/src/shared/agent-status-child-work-view.test.ts
+++ b/src/shared/agent-status-child-work-view.test.ts
@@ -15,7 +15,9 @@ import {
 } from './agent-status-child-work-projection'
 import {
   agentChildWorkOwnedLiveness,
-  deriveAgentChildDisplayState,
+  deriveAgentChildDisplayState
+} from './agent-status-child-work-display'
+import {
   projectAgentChildWorkViews,
   type AgentChildWorkView,
   type AgentChildWorkViewAlias
diff --git a/src/shared/agent-status-child-work-view.ts b/src/shared/agent-status-child-work-view.ts
index 80324d854e43..bfcbcfc11d5a 100644
--- a/src/shared/agent-status-child-work-view.ts
+++ b/src/shared/agent-status-child-work-view.ts
@@ -1,4 +1,3 @@
-import { foldAgentLeadStatus } from './agent-lead-status-fold'
 import {
   AGENT_CHILD_WORK_ALIAS_KINDS,
   type AgentChildWorkAliasInput,
@@ -15,12 +14,8 @@ import {
   type AgentChildWorkOutcome,
   type AgentChildWorkState
 } from './agent-status-child-work'
-import {
-  agentChildWorkLiveness,
-  type AgentChildWorkLiveness
-} from './agent-status-child-work-liveness'
 import { agentStatusSubjectsEqual } from './agent-status-subject'
-import type { AgentStatusState } from './agent-status-types'
+import { groupedBy } from './grouped-by'
 
 /** What a surface reads about one child: a read-only projection of the host's record.
  *  Host bookkeeping (residency, invocation history, provenance, aliases) never travels. A view
@@ -60,7 +55,8 @@ export type AgentChildWorkViewAlias = Pick<
 const PROVIDER_ID_ALIAS_RANK: Record<AgentChildWorkAliasKind, number> = {
   task_id: 0,
   thread_id: 1,
-  tool_use_id: 2
+  tool_use_id: 2,
+  turn_id: 3
 }
 const PROVIDER_ID_ALIAS_ORDER = [...AGENT_CHILD_WORK_ALIAS_KINDS].sort(
   (left, right) => PROVIDER_ID_ALIAS_RANK[left] - PROVIDER_ID_ALIAS_RANK[right]
@@ -82,21 +78,6 @@ function providerIdFor(
   return undefined
 }
 
-// Not `Map.groupBy`: the relay runs this core on Node 18, which lacks it.
-function groupedBy<T, K>(items: readonly T[], keyOf: (item: T) => K): Map<K, T[]> {
-  const groups = new Map<K, T[]>()
-  for (const item of items) {
-    const key = keyOf(item)
-    const group = groups.get(key)
-    if (group) {
-      group.push(item)
-    } else {
-      groups.set(key, [item])
-    }
-  }
-  return groups
-}
-
 function isOnOwnershipCycle(
   start: AgentChildWorkInput,
   byId: ReadonlyMap<AgentChildWorkId, AgentChildWorkInput>
@@ -160,80 +141,3 @@ export function projectAgentChildWorkViews(
     }
   })
 }
-
-type AgentChildWorkOwnershipView = Pick<
-  AgentChildWorkView,
-  'id' | 'kind' | 'state' | 'membership' | 'parentChildWorkId'
->
-
-/** Liveness of all live work beneath a child, at any depth — the same input a parent row folds. */
-export function agentChildWorkOwnedLiveness(
-  views: readonly AgentChildWorkOwnershipView[],
-  ownerId: AgentChildWorkId
-): AgentChildWorkLiveness {
-  const owned = groupedBy(views, (view) => view.parentChildWorkId)
-  const seen = new Set<AgentChildWorkId>([ownerId])
-  const frontier = [ownerId]
-  const liveDescendants: AgentChildWorkOwnershipView[] = []
-  for (let owner = frontier.pop(); owner !== undefined; owner = frontier.pop()) {
-    for (const view of owned.get(owner) ?? []) {
-      if (!seen.has(view.id)) {
-        seen.add(view.id)
-        frontier.push(view.id)
-        if (view.membership === 'live') {
-          liveDescendants.push(view)
-        }
-      }
-    }
-  }
-  return agentChildWorkLiveness(liveDescendants)
-}
-
-/** The dot a child row renders; every value is an `AgentStateDot` state. */
-export type AgentChildDisplayState =
-  | 'working'
-  | 'monitoring'
-  | 'waiting'
-  | 'blocked'
-  | 'done'
-  | 'failed'
-  | 'interrupted'
-  | 'idle'
-  | 'unverifiable'
-
-const SETTLED_DISPLAY_STATE: Record<AgentChildWorkOutcome, AgentChildDisplayState> = {
-  succeeded: 'done',
-  failed: 'failed',
-  cancelled: 'interrupted',
-  // Neutral: an ending the lane cannot classify asserts nothing.
-  unknown: 'idle'
-}
-
-/**
- * A child's display state, through the same fold that decides a parent row's: work that is idle
- * or finished enters it as `done`, so a live shell the child owns reads `monitoring` exactly as it
- * would under a CLI agent. `unverifiable` is a freshness verdict and bypasses the fold.
- */
-export function deriveAgentChildDisplayState(
-  view: Pick<AgentChildWorkView, 'state' | 'membership' | 'outcome'>,
-  ownedLiveness: AgentChildWorkLiveness
-): AgentChildDisplayState {
-  if (view.state === 'unverifiable') {
-    return 'unverifiable'
-  }
-  // Stored only by a shell or a monitor, and neither owns work.
-  if (view.state === 'monitoring') {
-    return 'monitoring'
-  }
-  const leadState: AgentStatusState =
-    view.membership === 'settled' || view.state === 'done' || view.state === 'idle'
-      ? 'done'
-      : view.state
-  // A child's cancel never hides the work it left running.
-  const foldInput = { leadState, childWorkLiveness: ownedLiveness, interrupted: false }
-  const folded = foldAgentLeadStatus(foldInput)
-  if (folded.stateName !== 'done') {
-    return folded.workingMode ?? folded.stateName
-  }
-  return view.membership === 'live' ? 'idle' : SETTLED_DISPLAY_STATE[view.outcome ?? 'unknown']
-}
diff --git a/src/shared/agent-status-field-normalization.ts b/src/shared/agent-status-field-normalization.ts
index 25d6b6413d4e..4fb741b5ec16 100644
--- a/src/shared/agent-status-field-normalization.ts
+++ b/src/shared/agent-status-field-normalization.ts
@@ -2,12 +2,17 @@
 // String normalizers shared by every agent-status payload field: trim/fold to
 // a single line for previews, preserve structure for multiline bodies, and
 // truncate without splitting surrogate pairs. Extracted from
-// agent-status-types.ts, which owns the payload shapes and per-field caps.
+// agent-status-types.ts, which owns the payload shapes and the caps no other module applies.
 
 import { compactDispatchPromptForStatus } from './orca-dispatch-status-prompt'
 
 /** Maximum character length for the prompt field. Truncated on parse. */
 export const AGENT_STATUS_MAX_FIELD_LENGTH = 200
+/** Maximum character length for the toolInput preview. */
+export const AGENT_STATUS_TOOL_INPUT_MAX_LENGTH = 160
+/** Maximum character length for the agentType label. Truncated on parse. */
+export const AGENT_TYPE_MAX_LENGTH = 40
+export const AGENT_MODEL_MAX_LENGTH = 120
 
 const SINGLE_LINE_FIELD_SCAN_OVERHEAD = 64
 const SINGLE_LINE_FIELD_SCAN_MULTIPLIER = 8
diff --git a/src/shared/agent-status-hooks-setting.ts b/src/shared/agent-status-hooks-setting.ts
new file mode 100644
index 000000000000..1c2c49feb0c5
--- /dev/null
+++ b/src/shared/agent-status-hooks-setting.ts
@@ -0,0 +1,25 @@
+import type { GlobalSettings } from './global-settings-types'
+import type { TuiAgent } from './tui-agent'
+import { isTuiAgentEnabled } from './tui-agent-selection'
+
+export type AgentStatusHooksSettings =
+  | Partial<Pick<GlobalSettings, 'agentStatusHooksEnabled' | 'disabledTuiAgents'>>
+  | null
+  | undefined
+
+// Why shared: the CLI compiles shared/ itself, so its per-launch Codex preflight needs no out/main entry.
+export function isAgentStatusHooksEnabled(
+  settings: Partial<Pick<GlobalSettings, 'agentStatusHooksEnabled'>> | null | undefined
+): boolean {
+  return settings?.agentStatusHooksEnabled !== false
+}
+
+// Why: turning an agent off removes its hooks, so any install that reads only the global switch writes them back.
+export function isAgentStatusHooksEnabledForAgent(
+  settings: AgentStatusHooksSettings,
+  agent: TuiAgent
+): boolean {
+  return (
+    isAgentStatusHooksEnabled(settings) && isTuiAgentEnabled(agent, settings?.disabledTuiAgents)
+  )
+}
diff --git a/src/shared/agent-status-ipc-payload.ts b/src/shared/agent-status-ipc-payload.ts
index a15282b00181..68398a6d0def 100644
--- a/src/shared/agent-status-ipc-payload.ts
+++ b/src/shared/agent-status-ipc-payload.ts
@@ -55,6 +55,10 @@ export type AgentStatusIpcPayload = ParsedAgentStatusPayload & {
   evidenceObservedAt?: number
   /** Timestamp (ms) when the current state first appeared for this pane. */
   stateStartedAt: number
+  /** When the main agent's current turn began, stamped by the hook server from the main agent's
+   *  own turn-opening event. Optional: old hosts and turns opened unseen omit it, and readers fall
+   *  back to `stateStartedAt`. */
+  turnStartedAt?: number
   orchestration?: AgentStatusOrchestrationContext
   providerSession?: AgentProviderSessionMetadata
   /** Resume identity update only; the status-shaped fields are transport placeholders. */
diff --git a/src/shared/agent-status-osc-scan-budget.test.ts b/src/shared/agent-status-osc-scan-budget.test.ts
index c61e2faded10..d05200564626 100644
--- a/src/shared/agent-status-osc-scan-budget.test.ts
+++ b/src/shared/agent-status-osc-scan-budget.test.ts
@@ -17,24 +17,26 @@ function parseWithSearchBudget(data: string) {
     }
     return found
   })
-  const execSpy = vi
-    .spyOn(RegExp.prototype, 'exec')
-    .mockImplementation(function (this: RegExp, input) {
-      const from = this.global || this.sticky ? this.lastIndex : 0
-      const found = exec.call(this, input)
-      if (input === data) {
-        searchedChars += (found === null ? data.length : found.index + found[0].length) - from
-      }
-      return found
-    })
-  const charCodeAtSpy = vi
-    .spyOn(String.prototype, 'charCodeAt')
-    .mockImplementation(function (this: string, index) {
-      if (this === data) {
-        searchedChars += 1
-      }
-      return charCodeAt.call(this, index)
-    })
+  const execSpy = vi.spyOn(RegExp.prototype, 'exec').mockImplementation(function (
+    this: RegExp,
+    input
+  ) {
+    const from = this.global || this.sticky ? this.lastIndex : 0
+    const found = exec.call(this, input)
+    if (input === data) {
+      searchedChars += (found === null ? data.length : found.index + found[0].length) - from
+    }
+    return found
+  })
+  const charCodeAtSpy = vi.spyOn(String.prototype, 'charCodeAt').mockImplementation(function (
+    this: string,
+    index
+  ) {
+    if (this === data) {
+      searchedChars += 1
+    }
+    return charCodeAt.call(this, index)
+  })
   try {
     return { result: createAgentStatusOscProcessor()(data), searchedChars }
   } finally {
diff --git a/src/shared/agent-status-store-copying-oracle.test-fixture.ts b/src/shared/agent-status-store-copying-oracle.test-fixture.ts
index cec2a2556e0b..06446079c56b 100644
--- a/src/shared/agent-status-store-copying-oracle.test-fixture.ts
+++ b/src/shared/agent-status-store-copying-oracle.test-fixture.ts
@@ -83,6 +83,9 @@ export function createCopyingAgentStatusStoreOracle(epoch: string): CopyingAgent
     getAliasesForChild: (childWorkId) =>
       [...current.aliases.values()].filter((alias) => alias.childWorkId === childWorkId),
     resolveChildAliases(aliases) {
+      if (aliases.length === 0) {
+        return []
+      }
       const keys = new Set(aliases.map(serializeAgentChildWorkAliasKey))
       const matches: AgentChildWorkAliasRecord[] = []
       for (const alias of current.aliases.values()) {
diff --git a/src/shared/agent-status-subagent-snapshot.ts b/src/shared/agent-status-subagent-snapshot.ts
new file mode 100644
index 000000000000..b5a9f5af8fa4
--- /dev/null
+++ b/src/shared/agent-status-subagent-snapshot.ts
@@ -0,0 +1,108 @@
+// A pane's in-process subagents as the hook lane publishes them on a status row: the snapshot
+// shape, its normalization at every admission point, and the equality stores reuse arrays by.
+
+import {
+  AGENT_MODEL_MAX_LENGTH,
+  AGENT_STATUS_TOOL_INPUT_MAX_LENGTH,
+  AGENT_TYPE_MAX_LENGTH,
+  normalizeOptionalField
+} from './agent-status-field-normalization'
+
+export type AgentSubagentState = 'working' | 'blocked' | 'waiting' | 'idle' | 'unverifiable'
+
+/** A live in-process child of the pane's provider session. Rendered as an
+ *  indented child row with no PTY of its own. */
+export type AgentSubagentSnapshot = {
+  /** Provider-assigned lifecycle id. */
+  id: string
+  agentType?: string
+  /** Provider model used by this child, when exposed by its lifecycle event. */
+  model?: string
+  description?: string
+  state: AgentSubagentState
+  /** Timestamp (ms) when this subagent was first observed. */
+  startedAt: number
+}
+
+/** Maximum subagent child rows carried per status entry. Bounds per-pane cache
+ *  and IPC fanout against a runaway spawner. */
+export const AGENT_STATUS_MAX_SUBAGENTS = 32
+const AGENT_SUBAGENT_ID_MAX_LENGTH = 64
+
+function normalizeSubagentSnapshot(value: unknown): AgentSubagentSnapshot | null {
+  if (typeof value !== 'object' || value === null) {
+    return null
+  }
+  const obj = value as Record<string, unknown>
+  if (typeof obj.id !== 'string') {
+    return null
+  }
+  const id = obj.id.trim()
+  if (id.length === 0 || id.length > AGENT_SUBAGENT_ID_MAX_LENGTH) {
+    return null
+  }
+  if (
+    obj.state !== 'working' &&
+    obj.state !== 'blocked' &&
+    obj.state !== 'waiting' &&
+    obj.state !== 'idle' &&
+    obj.state !== 'unverifiable'
+  ) {
+    return null
+  }
+  return {
+    id,
+    state: obj.state,
+    startedAt:
+      typeof obj.startedAt === 'number' && Number.isFinite(obj.startedAt) ? obj.startedAt : 0,
+    agentType: normalizeOptionalField(obj.agentType, AGENT_TYPE_MAX_LENGTH),
+    model: normalizeOptionalField(obj.model, AGENT_MODEL_MAX_LENGTH),
+    description: normalizeOptionalField(obj.description, AGENT_STATUS_TOOL_INPUT_MAX_LENGTH)
+  }
+}
+
+export function normalizeAgentSubagentsField(value: unknown): AgentSubagentSnapshot[] | undefined {
+  if (!Array.isArray(value) || value.length === 0) {
+    return undefined
+  }
+  const normalized: AgentSubagentSnapshot[] = []
+  for (const item of value) {
+    const snapshot = normalizeSubagentSnapshot(item)
+    if (snapshot) {
+      normalized.push(snapshot)
+      if (normalized.length >= AGENT_STATUS_MAX_SUBAGENTS) {
+        break
+      }
+    }
+  }
+  return normalized.length > 0 ? normalized : undefined
+}
+
+/** Structural equality for subagent lists so stores can reuse the previous
+ *  array reference (and skip fanout) when nothing actually changed. */
+export function agentSubagentsEqual(
+  a: AgentSubagentSnapshot[] | undefined,
+  b: AgentSubagentSnapshot[] | undefined
+): boolean {
+  if (a === b) {
+    return true
+  }
+  if (!a || !b || a.length !== b.length) {
+    return !a && !b
+  }
+  for (let i = 0; i < a.length; i++) {
+    const x = a[i]
+    const y = b[i]
+    if (
+      x.id !== y.id ||
+      x.state !== y.state ||
+      x.startedAt !== y.startedAt ||
+      x.agentType !== y.agentType ||
+      x.model !== y.model ||
+      x.description !== y.description
+    ) {
+      return false
+    }
+  }
+  return true
+}
diff --git a/src/shared/agent-status-types.ts b/src/shared/agent-status-types.ts
index dcd447e6bef5..5a9d34ae7d38 100644
--- a/src/shared/agent-status-types.ts
+++ b/src/shared/agent-status-types.ts
@@ -8,8 +8,12 @@ import type { AgentStateHistoryEntry } from './agent-state-history'
 import { isAgentJournalTurnOutcome } from './agent-turn-outcome'
 import type { OrchestrationFleetAttention } from './orchestration-fleet-attention'
 import type { AgentStatusRowFacets } from './agent-status-observation'
+import type { AgentChildWorkView } from './agent-status-child-work-view'
 import type { TuiAgent } from './tui-agent'
 import {
+  AGENT_MODEL_MAX_LENGTH,
+  AGENT_STATUS_TOOL_INPUT_MAX_LENGTH,
+  AGENT_TYPE_MAX_LENGTH,
   normalizeInteractivePromptField,
   normalizeOptionalField,
   normalizeOptionalMultilineField,
@@ -18,7 +22,23 @@ import {
 } from './agent-status-field-normalization'
 import { assertJsonTextStructureWithinLimits } from './json-text-structure-limit'
 
-export { AGENT_STATUS_MAX_FIELD_LENGTH } from './agent-status-field-normalization'
+import {
+  normalizeAgentSubagentsField,
+  type AgentSubagentSnapshot
+} from './agent-status-subagent-snapshot'
+
+export {
+  AGENT_MODEL_MAX_LENGTH,
+  AGENT_STATUS_MAX_FIELD_LENGTH,
+  AGENT_STATUS_TOOL_INPUT_MAX_LENGTH,
+  AGENT_TYPE_MAX_LENGTH
+} from './agent-status-field-normalization'
+export {
+  AGENT_STATUS_MAX_SUBAGENTS,
+  agentSubagentsEqual,
+  type AgentSubagentSnapshot,
+  type AgentSubagentState
+} from './agent-status-subagent-snapshot'
 export type {
   AgentStatusCacheIdentity,
   AgentStatusClearIpcPayload,
@@ -53,22 +73,6 @@ export type AgentStatusOrchestrationContext = {
   attention?: OrchestrationFleetAttention
 }
 
-export type AgentSubagentState = 'working' | 'blocked' | 'waiting' | 'idle' | 'unverifiable'
-
-/** A live in-process child of the pane's provider session. Rendered as an
- *  indented child row with no PTY of its own. */
-export type AgentSubagentSnapshot = {
-  /** Provider-assigned lifecycle id. */
-  id: string
-  agentType?: string
-  /** Provider model used by this child, when exposed by its lifecycle event. */
-  model?: string
-  description?: string
-  state: AgentSubagentState
-  /** Timestamp (ms) when this subagent was first observed. */
-  startedAt: number
-}
-
 export type AgentStatusEntry = {
   /** Renderer-local status-feed confirmation for children; absent on hook rows. */
   subagentObservation?: 'live' | 'unverifiable'
@@ -91,6 +95,9 @@ export type AgentStatusEntry = {
   stateStartedAt: number
   /** `updatedAt` of the write that switched into `state`; see AgentStateHistoryEntry.observedAt. */
   stateObservedAt?: number
+  /** When the main agent's current turn began, as the hook server stamped it. Absent from old hosts
+   *  and writers without a turn clock; readers fall back to `stateStartedAt`. */
+  turnStartedAt?: number
   agentType?: AgentType
   /** Provider model currently used by this session. */
   model?: string
@@ -142,6 +149,9 @@ export type AgentStatusEntry = {
   /** The main agent's own state; absent from old hosts and from writers that carry no main agent fact
    *  (OSC, launch seeds), where readers fall back to `state`. */
   mainAgent?: AgentMainAgentStatus
+  /** The host's child-work views for this session, when it publishes them; child rows then read
+   *  these instead of `subagents`. Absent from older hosts. */
+  children?: AgentChildWorkView[]
   /** Provider-owned conversation/session id captured from hook payloads.
    *  Used only for exact CLI resume; Orca terminal ids are not agent-session ids. */
   providerSession?: AgentProviderSessionMetadata
@@ -237,8 +247,6 @@ export function pickParsedAgentStatusPayload(
  */
 /** Maximum character length for the toolName field. */
 export const AGENT_STATUS_TOOL_NAME_MAX_LENGTH = 60
-/** Maximum character length for the toolInput preview. */
-export const AGENT_STATUS_TOOL_INPUT_MAX_LENGTH = 160
 /** Maximum character length for the lastAssistantMessage preview.
  *  Why: 8 KB fits a multi-paragraph summary while bounding per-pane cache against a buggy/malicious agent spamming huge strings. */
 export const AGENT_STATUS_ASSISTANT_MESSAGE_MAX_LENGTH = 8000
@@ -260,71 +268,15 @@ const VALID_STATES: ReadonlySet<string> = new Set<string>(AGENT_STATUS_STATES)
 export function isAgentStatusState(value: unknown): value is AgentStatusState {
   return typeof value === 'string' && VALID_STATES.has(value)
 }
-/** Maximum character length for the agentType label. Truncated on parse. */
-export const AGENT_TYPE_MAX_LENGTH = 40
-export const AGENT_MODEL_MAX_LENGTH = 120
 
-/** Maximum subagent child rows carried per status entry. Bounds per-pane cache
- *  and IPC fanout against a runaway spawner. */
-export const AGENT_STATUS_MAX_SUBAGENTS = 32
 export const AGENT_STATUS_JSON_STRUCTURE_LIMITS = {
   structuralTokens: 4096,
   nestingDepth: 16
 } as const
-const AGENT_SUBAGENT_ID_MAX_LENGTH = 64
-
-function normalizeSubagentSnapshot(value: unknown): AgentSubagentSnapshot | null {
-  if (typeof value !== 'object' || value === null) {
-    return null
-  }
-  const obj = value as Record<string, unknown>
-  if (typeof obj.id !== 'string') {
-    return null
-  }
-  const id = obj.id.trim()
-  if (id.length === 0 || id.length > AGENT_SUBAGENT_ID_MAX_LENGTH) {
-    return null
-  }
-  if (
-    obj.state !== 'working' &&
-    obj.state !== 'blocked' &&
-    obj.state !== 'waiting' &&
-    obj.state !== 'idle' &&
-    obj.state !== 'unverifiable'
-  ) {
-    return null
-  }
-  return {
-    id,
-    state: obj.state,
-    startedAt:
-      typeof obj.startedAt === 'number' && Number.isFinite(obj.startedAt) ? obj.startedAt : 0,
-    agentType: normalizeOptionalField(obj.agentType, AGENT_TYPE_MAX_LENGTH),
-    model: normalizeOptionalField(obj.model, AGENT_MODEL_MAX_LENGTH),
-    description: normalizeOptionalField(obj.description, AGENT_STATUS_TOOL_INPUT_MAX_LENGTH)
-  }
-}
-
-function normalizeSubagentsField(value: unknown): AgentSubagentSnapshot[] | undefined {
-  if (!Array.isArray(value) || value.length === 0) {
-    return undefined
-  }
-  const normalized: AgentSubagentSnapshot[] = []
-  for (const item of value) {
-    const snapshot = normalizeSubagentSnapshot(item)
-    if (snapshot) {
-      normalized.push(snapshot)
-      if (normalized.length >= AGENT_STATUS_MAX_SUBAGENTS) {
-        break
-      }
-    }
-  }
-  return normalized.length > 0 ? normalized : undefined
-}
 
 /** A malformed `mainAgent` drops the FIELD, never the row: the combined `state` is still valid
  *  evidence, and readers fall back to it exactly as they do for a host that predates the field. */
-function normalizeMainAgentStatusField(value: unknown): AgentMainAgentStatus | undefined {
+export function normalizeMainAgentStatusField(value: unknown): AgentMainAgentStatus | undefined {
   if (typeof value !== 'object' || value === null) {
     return undefined
   }
@@ -344,35 +296,6 @@ function normalizeMainAgentStatusField(value: unknown): AgentMainAgentStatus | u
   }
 }
 
-/** Structural equality for subagent lists so stores can reuse the previous
- *  array reference (and skip fanout) when nothing actually changed. */
-export function agentSubagentsEqual(
-  a: AgentSubagentSnapshot[] | undefined,
-  b: AgentSubagentSnapshot[] | undefined
-): boolean {
-  if (a === b) {
-    return true
-  }
-  if (!a || !b || a.length !== b.length) {
-    return !a && !b
-  }
-  for (let i = 0; i < a.length; i++) {
-    const x = a[i]
-    const y = b[i]
-    if (
-      x.id !== y.id ||
-      x.state !== y.state ||
-      x.startedAt !== y.startedAt ||
-      x.agentType !== y.agentType ||
-      x.model !== y.model ||
-      x.description !== y.description
-    ) {
-      return false
-    }
-  }
-  return true
-}
-
 /**
  * Normalize and validate an already-parsed agent status object. Shared by the
  * JSON string entry point (`parseAgentStatusPayload`) and the object entry
@@ -420,7 +343,7 @@ function normalizeAgentStatusObject(parsed: unknown): ParsedAgentStatusPayload |
     interrupted: obj.interrupted === true && state === 'done' ? true : undefined,
     sessionBoundary: obj.sessionBoundary === true && state === 'done' ? true : undefined,
     turnCompletedAt: normalizeTurnCompletedAtField(obj.turnCompletedAt, state),
-    subagents: normalizeSubagentsField(obj.subagents),
+    subagents: normalizeAgentSubagentsField(obj.subagents),
     mainAgent: normalizeMainAgentStatusField(obj.mainAgent)
   }
 }
diff --git a/src/shared/agent-title-core.ts b/src/shared/agent-title-core.ts
index 3d0bdbc0feb5..a3bc238a7e1e 100644
--- a/src/shared/agent-title-core.ts
+++ b/src/shared/agent-title-core.ts
@@ -1,3 +1,6 @@
+import { isDshTerminalTitle } from './dsh-terminal-title'
+export { DSH_WHALE, isDshTerminalTitle } from './dsh-terminal-title'
+import { isQoderTerminalTitle } from './qoder-terminal-title'
 import {
   AGY_AGENT_NAME_RE,
   DROID_AGENT_NAME_RE,
@@ -56,6 +59,13 @@ export const BRAILLE_SPINNER_RE = /[\u2800-\u28ff]/g
 export const QUARTER_CIRCLE_SPINNER_RE = /[\u25d0-\u25d3]/g
 
 function computeIsGeminiTerminalTitle(title: string): boolean {
+  // Why first: see isDshTerminalTitle — the two agents share the `✦` glyph.
+  if (isQoderTerminalTitle(title)) {
+    return false
+  }
+  if (isDshTerminalTitle(title)) {
+    return false
+  }
   // Why: Gemini OSC glyphs are stronger evidence than any cwd/session text.
   if (
     title.includes(GEMINI_PERMISSION) ||
diff --git a/src/shared/agent-title-decoration.test.ts b/src/shared/agent-title-decoration.test.ts
index a87426c83cf5..5a5666696e0b 100644
--- a/src/shared/agent-title-decoration.test.ts
+++ b/src/shared/agent-title-decoration.test.ts
@@ -5,6 +5,11 @@ import {
 } from './agent-title-decoration'
 
 describe('stripLeadingAgentTitleDecoration', () => {
+  it('strips Qoder permission decoration without stripping triangles inside a title', () => {
+    expect(stripLeadingAgentTitleDecoration('▲ Qoder CLI')).toBe('Qoder CLI')
+    expect(stripLeadingAgentTitleDecoration('deploy ▲ complete')).toBe('deploy ▲ complete')
+  })
+
   it("strips Claude's ✳ idle glyph", () => {
     expect(stripLeadingAgentTitleDecoration('✳ Claude Code')).toBe('Claude Code')
   })
diff --git a/src/shared/agent-title-decoration.ts b/src/shared/agent-title-decoration.ts
index 47a6db679e79..3ae4d0075e68 100644
--- a/src/shared/agent-title-decoration.ts
+++ b/src/shared/agent-title-decoration.ts
@@ -1,11 +1,11 @@
 // Leading status decorations that coding agents prepend to their OSC title —
-// Claude's '✳', Gemini's glyphs (✦ ⏲ ◇ ✋), braille and quarter-circle spinners,
+// Claude's '✳', Gemini's glyphs (✦ ⏲ ◇ ✋), Qoder’s ▲, braille and quarter-circle spinners,
 // and Claude's '. '/'* ' working/idle prefixes. Once the tab bar shows the
 // provider icon, this leading glyph reads as a redundant second icon, so strip
 // it from the displayed title. Scoped to titles we already know belong to an agent.
 const LEADING_AGENT_TITLE_DECORATION_RE =
   // eslint-disable-next-line no-control-regex -- intentional unicode status-glyph ranges
-  /^(?:[✳✦⏲◇✋⠀-⣿◐-◓]+|[.*]\s)\s*/
+  /^(?:[✳✦⏲◇✋▲⠀-⣿◐-◓]+|[.*]\s)\s*/
 
 export function stripLeadingAgentTitleDecorationOrEmpty(title: string): string {
   return title.replace(LEADING_AGENT_TITLE_DECORATION_RE, '').trimStart()
diff --git a/src/shared/agent-title-identity.ts b/src/shared/agent-title-identity.ts
index 949768e03b51..69d1531fb9e0 100644
--- a/src/shared/agent-title-identity.ts
+++ b/src/shared/agent-title-identity.ts
@@ -1,3 +1,4 @@
+import { isQoderTerminalTitle } from './qoder-terminal-title'
 import { getPiStateTitleBrand } from './pi-state-title-marker'
 import {
   AGY_AGENT_NAME_RE,
@@ -72,6 +73,9 @@ function computeAgentLabel(title: string): string | null {
   if (piStateBrand) {
     return piStateBrand
   }
+  if (isQoderTerminalTitle(title)) {
+    return 'Qoder CLI'
+  }
   if (isGeminiTerminalTitle(title)) {
     return 'Gemini CLI'
   }
diff --git a/src/shared/agent-title-status.ts b/src/shared/agent-title-status.ts
index a74ae15d6bf0..7cd7a2c292cd 100644
--- a/src/shared/agent-title-status.ts
+++ b/src/shared/agent-title-status.ts
@@ -1,3 +1,4 @@
+import { qoderTitleStatus } from './qoder-terminal-title'
 import {
   AGY_AGENT_NAME_RE,
   BRAILLE_SPINNER_RE,
@@ -19,6 +20,7 @@ import {
   containsQuarterCircleSpinner,
   containsLegacyAgentName,
   isClaudeManagementTitle,
+  isDshTerminalTitle,
   isGeminiTerminalTitle,
   isPiAgentTitle,
   isPiTerminalTitle
@@ -128,6 +130,10 @@ export function createAgentStatusTracker(
  * Normalize high-churn agent titles into stable display labels before storage.
  */
 export function normalizeTerminalTitle(title: string): string {
+  const qoderStatus = qoderTitleStatus(title)
+  if (qoderStatus) {
+    return `${qoderStatus === 'working' ? '✦' : qoderStatus === 'permission' ? '▲' : '◇'} Qoder CLI`
+  }
   if (!title) {
     return title
   }
@@ -180,6 +186,10 @@ function canonicalizeBrailleSpinnerFrame(title: string): string {
 }
 
 function computeAgentStatusFromTitle(title: string): AgentStatus | null {
+  const qoderStatus = qoderTitleStatus(title)
+  if (qoderStatus) {
+    return qoderStatus
+  }
   if (!title || isClaudeManagementTitle(title)) {
     return null
   }
@@ -198,14 +208,20 @@ function computeAgentStatusFromTitle(title: string): AgentStatus | null {
     return piStateStatus
   }
 
-  if (title.includes(GEMINI_PERMISSION)) {
-    return 'permission'
-  }
-  if (title.includes(GEMINI_WORKING) || title.includes(GEMINI_SILENT_WORKING)) {
-    return 'working'
-  }
-  if (title.includes(GEMINI_IDLE)) {
-    return 'idle'
+  // Why the guard: DSH-TUI prefixes its title with `✦` while it is at REST, and that is
+  // Gemini's WORKING glyph. Reading it here made a finished DSH pane report working
+  // forever. DSH's own spinner prefixes are braille, which the spinner check below
+  // already covers, and its hooks are the authority either way.
+  if (!isDshTerminalTitle(title)) {
+    if (title.includes(GEMINI_PERMISSION)) {
+      return 'permission'
+    }
+    if (title.includes(GEMINI_WORKING) || title.includes(GEMINI_SILENT_WORKING)) {
+      return 'working'
+    }
+    if (title.includes(GEMINI_IDLE)) {
+      return 'idle'
+    }
   }
 
   // Why: resolve synthetic Pi/OMP permission/idle labels before the broader
diff --git a/src/shared/agent-tui-ansi-fuzz-stream.ts b/src/shared/agent-tui-ansi-fuzz-stream.ts
index afffcc0a411a..885dd9c0d50d 100644
--- a/src/shared/agent-tui-ansi-fuzz-stream.ts
+++ b/src/shared/agent-tui-ansi-fuzz-stream.ts
@@ -29,9 +29,9 @@ export function mulberry32(seed: number): () => number {
 export type AgentTuiStreamDims = { cols: number; rows: number }
 
 export type AgentTuiStreamProfile = {
-  /** Mouse-mode toggles require mirroring TerminalMouseModeMirror to build
-   *  rehydrate parity; the renderer-side fuzz cannot import that main-only
-   *  module (tsconfig.tc.web.json excludes src/main/daemon), so it opts out. */
+  /** Mouse-mode toggles need the daemon's rehydrate for parity; the
+   *  renderer-side fuzz cannot import that main-only module
+   *  (tsconfig.tc.web.json excludes src/main/daemon), so it opts out. */
   includeMouseModes: boolean
   /** OSC 8 hyperlinks mark their cells underlined in the xterm buffer, but
    *  SerializeAddon never re-emits OSC 8 — production restores link ranges
diff --git a/src/shared/agent-type-label.ts b/src/shared/agent-type-label.ts
index 24febeaafa73..72d1b1b6d634 100644
--- a/src/shared/agent-type-label.ts
+++ b/src/shared/agent-type-label.ts
@@ -4,8 +4,11 @@ import type { AgentType } from './agent-status-types'
 // (e.g. native chat's empty state on both surfaces) from one source of truth.
 const WELL_KNOWN_LABELS: Record<string, string> = {
   claude: 'Claude',
+  codebuddy: 'CodeBuddy',
   openclaude: 'OpenClaude',
   codex: 'Codex',
+  qoder: 'Qoder CLI',
+  qodercli: 'Qoder CLI',
   gemini: 'Gemini',
   antigravity: 'Antigravity',
   amp: 'Amp',
@@ -27,7 +30,8 @@ const WELL_KNOWN_LABELS: Record<string, string> = {
   trae: 'Trae',
   kimi: 'Kimi',
   muse: 'Muse',
-  zcode: 'ZCode'
+  zcode: 'ZCode',
+  dsh: 'DeepSeek Harness'
 }
 
 export function formatAgentTypeLabel(agentType: AgentType | null | undefined): string {
diff --git a/src/shared/ai-vault-resume-command.test.ts b/src/shared/ai-vault-resume-command.test.ts
index da8ced39e0e3..db89cb412638 100644
--- a/src/shared/ai-vault-resume-command.test.ts
+++ b/src/shared/ai-vault-resume-command.test.ts
@@ -28,6 +28,17 @@ describe('buildAiVaultResumeCommand', () => {
     ).toBe('cmd /d /s /c "cd /d ""C:\\Users\\Ada Lovelace\\repo"" && codex resume ""session-1"""')
   })
 
+  it('resumes CodeBuddy sessions with the Claude-compatible --resume flag', () => {
+    expect(
+      buildAiVaultResumeCommand({
+        agent: 'codebuddy',
+        sessionId: 'aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee',
+        cwd: '/repo/app',
+        platform: 'darwin'
+      })
+    ).toBe("cd '/repo/app' && codebuddy --resume 'aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee'")
+  })
+
   it('builds a direct queued command for a live cmd shell', () => {
     expect(
       buildAiVaultResumeCommand({
diff --git a/src/shared/ai-vault-resume-command.ts b/src/shared/ai-vault-resume-command.ts
index fbd0658def12..efb2ddbe5d3c 100644
--- a/src/shared/ai-vault-resume-command.ts
+++ b/src/shared/ai-vault-resume-command.ts
@@ -218,7 +218,9 @@ function buildAgentResumeInvocation(
       return `${baseCommand} resume ${sessionArg}`
     case 'cline':
       return `${baseCommand} --id ${sessionArg}`
+    case 'codebuddy':
     case 'claude':
+    case 'zcode':
     case 'cursor':
     case 'gemini':
     case 'grok':
diff --git a/src/shared/ai-vault-session-deletion.ts b/src/shared/ai-vault-session-deletion.ts
index d3c2211ab847..4875ab6e889a 100644
--- a/src/shared/ai-vault-session-deletion.ts
+++ b/src/shared/ai-vault-session-deletion.ts
@@ -40,6 +40,7 @@ export const AI_VAULT_DELETABLE_AGENTS = [
   'pi',
   'omp',
   'claude',
+  'codebuddy',
   'rovo',
   'grok',
   'cline'
diff --git a/src/shared/ai-vault-types.ts b/src/shared/ai-vault-types.ts
index b2635555bf67..e337f98d7a08 100644
--- a/src/shared/ai-vault-types.ts
+++ b/src/shared/ai-vault-types.ts
@@ -3,6 +3,7 @@ import type { ExecutionHostId, ExecutionHostScope } from './execution-host'
 
 export const AI_VAULT_AGENTS = [
   'claude',
+  'codebuddy',
   'codex',
   'hermes',
   'pi',
@@ -15,6 +16,7 @@ export const AI_VAULT_AGENTS = [
   'copilot',
   'opencode',
   'opencode2',
+  'zcode',
   'grok',
   'openclaw',
   'devin',
@@ -50,6 +52,7 @@ export type AiVaultGroup = 'project' | 'folder' | 'agent'
 
 export const AI_VAULT_AGENT_LABELS = {
   claude: 'Claude',
+  codebuddy: 'CodeBuddy',
   codex: 'Codex',
   hermes: 'Hermes',
   pi: 'Pi',
@@ -62,6 +65,7 @@ export const AI_VAULT_AGENT_LABELS = {
   copilot: 'GitHub Copilot',
   opencode: 'OpenCode',
   opencode2: 'OpenCode 2',
+  zcode: 'ZCode',
   grok: 'Grok',
   openclaw: 'OpenClaw',
   devin: 'Devin',
diff --git a/src/shared/browser-network-tunnel-stream-framing.test.ts b/src/shared/browser-network-tunnel-stream-framing.test.ts
index 4ca73810cdf4..c4efcbca83af 100644
--- a/src/shared/browser-network-tunnel-stream-framing.test.ts
+++ b/src/shared/browser-network-tunnel-stream-framing.test.ts
@@ -82,12 +82,14 @@ describe('browser network tunnel stream framing', () => {
     )
     const originalSet = Uint8Array.prototype.set
     let copiedBytes = 0
-    const set = vi
-      .spyOn(Uint8Array.prototype, 'set')
-      .mockImplementation(function (this: Uint8Array, source, offset) {
-        copiedBytes += source.length
-        originalSet.call(this, source, offset)
-      })
+    const set = vi.spyOn(Uint8Array.prototype, 'set').mockImplementation(function (
+      this: Uint8Array,
+      source,
+      offset
+    ) {
+      copiedBytes += source.length
+      originalSet.call(this, source, offset)
+    })
     try {
       for (const byte of encoded) {
         decoder.feed(new Uint8Array([byte]))
diff --git a/src/shared/browser-url.test.ts b/src/shared/browser-url.test.ts
index 274377668672..2f947601bdac 100644
--- a/src/shared/browser-url.test.ts
+++ b/src/shared/browser-url.test.ts
@@ -212,6 +212,44 @@ describe('browser-url helpers', () => {
     )
   })
 
+  it.each([
+    ['example.com:8443/docs?q=one#section', 'https://example.com:8443/docs?q=one#section'],
+    ['EXAMPLE.COM:443', 'https://example.com/'],
+    ['example.com:80', 'https://example.com:80/'],
+    ['app.localhost:3000', 'http://app.localhost:3000/'],
+    ['app.localhost:443', 'http://app.localhost:443/'],
+    ['app.localhost:80', 'http://app.localhost/'],
+    ['deep.app.localhost:5173/path?x=1#preview', 'http://deep.app.localhost:5173/path?x=1#preview'],
+    ['https://app.localhost:3000', 'https://app.localhost:3000/'],
+    ['http://example.com:80/docs', 'http://example.com/docs'],
+    ['example.com:65535/docs', 'https://example.com:65535/docs'],
+    ['example.com:0', 'https://example.com:0/'],
+    ['APP.LOCALHOST.:443/docs', 'http://app.localhost.:443/docs'],
+    ['[::1]:3000/docs', 'http://[::1]:3000/docs'],
+    ['https://user:pass@example.com:8443/docs', 'https://user:pass@example.com:8443/docs'],
+    [
+      'example.com:8443/path@evil.test?next=:80#part',
+      'https://example.com:8443/path@evil.test?next=:80#part'
+    ]
+  ])('navigates a domain with a port: %s', (input, expected) => {
+    expect(normalizeBrowserNavigationUrl(input, 'google')).toBe(expected)
+    expect(normalizeBrowserNavigationUrl(input)).toBe(expected)
+  })
+
+  it.each([
+    'javascript:1234',
+    'data:1234',
+    'custom:3000',
+    'example.com:65536',
+    'example.com:8443@evil.test',
+    'example.com:8443\\evil.test',
+    'example.com:-1',
+    'example.com:3.5',
+    'example.com:8443evil.test'
+  ])('does not turn an unsupported scheme or invalid port into a navigation: %s', (input) => {
+    expect(normalizeBrowserNavigationUrl(input, 'google')).toBeNull()
+  })
+
   it('builds search URLs correctly', () => {
     expect(buildSearchUrl('hello world', 'google')).toBe(
       'https://www.google.com/search?q=hello%20world'
diff --git a/src/shared/browser-url.ts b/src/shared/browser-url.ts
index eaaf8211c6db..7854a24bac65 100644
--- a/src/shared/browser-url.ts
+++ b/src/shared/browser-url.ts
@@ -64,6 +64,24 @@ function isValidDnsName(name: string): boolean {
     )
 }
 
+/** Avoids parsing a dotted host and port as a scheme; .localhost defaults to HTTP. */
+function classifySchemeLessDomainPortAddress(input: string): URL | null {
+  const match = /^([^\s/\\:@?#]+):\d+(?:[/?#].*)?$/.exec(input)
+  if (!match || !match[1].includes('.')) {
+    return null
+  }
+  try {
+    const url = new URL(`https://${input}`)
+    const hostname = normalizeCertificateHostname(url.hostname)
+    if (!isValidDnsName(hostname)) {
+      return null
+    }
+    return hostname.endsWith('.localhost') ? new URL(`http://${input}`) : url
+  } catch {
+    return null
+  }
+}
+
 function isIpv4Loopback(hostname: string): boolean {
   const octets = hostname.split('.')
   if (octets.length !== 4 || octets.some((octet) => !/^\d{1,3}$/.test(octet))) {
@@ -290,6 +308,11 @@ export function normalizeBrowserNavigationUrl(
     return absolutePathToFileUrl(trimmed)
   }
 
+  const domainPortAddress = classifySchemeLessDomainPortAddress(trimmed)
+  if (domainPortAddress) {
+    return domainPortAddress.toString()
+  }
+
   try {
     const parsed = new URL(trimmed)
     // Why: file:// is allowed so the browser pane can render local files the
diff --git a/src/shared/child-process/__fixtures__/child-process-import-allowlist.txt b/src/shared/child-process/__fixtures__/child-process-import-allowlist.txt
index ed21cc84dd5a..7741c9907dde 100644
--- a/src/shared/child-process/__fixtures__/child-process-import-allowlist.txt
+++ b/src/shared/child-process/__fixtures__/child-process-import-allowlist.txt
@@ -164,7 +164,6 @@ src/relay/ai-vault-service-spawn.ts
 src/relay/external-automations-handler.ts
 src/relay/fs-handler-git-fallback.ts
 src/relay/fs-handler-list-files.ts
-src/relay/fs-handler-utils.ts
 src/relay/fs-list-files-fallback-chain.ts
 src/relay/git-handler.ts
 src/relay/git-stdout-stream.ts
@@ -177,5 +176,4 @@ src/shared/ephemeral-vm-recipe-runner.ts
 src/shared/fish-binary-requirement.ts
 src/shared/process-table-snapshot-reader.ts
 src/shared/pty-slave-line-discipline-echo.ts
-src/shared/ripgrep-process-availability.ts
 src/shared/shell-process-readiness.ts
diff --git a/src/shared/child-process/child-process-import-boundary.test.ts b/src/shared/child-process/child-process-import-boundary.test.ts
index 917a8a58beb5..f7d78c9f84b5 100644
--- a/src/shared/child-process/child-process-import-boundary.test.ts
+++ b/src/shared/child-process/child-process-import-boundary.test.ts
@@ -23,14 +23,6 @@ const CHILD_PROCESS_IMPORT_ALLOWLIST: readonly string[] = readFileSync(
   .map((line) => line.trim())
   .filter((line) => line.length > 0 && !line.startsWith('#'))
 
-/**
- * The true count of files importing child_process directly.
- *
- * May only ever be DECREASED, and only by migrating a file off
- * `node:child_process`. Raising it is never the fix.
- */
-const DIRECT_IMPORTER_PIN = 151
-
 const IMPORT_PATTERN =
   /(?:from\s+['"]node:child_process['"]|from\s+['"]child_process['"]|require\(\s*['"]node:child_process['"]|require\(\s*['"]child_process['"])/
 
@@ -118,23 +110,4 @@ describe('child_process import boundary', () => {
     const stale = CHILD_PROCESS_IMPORT_ALLOWLIST.filter((path) => !offenders.includes(path))
     expect(stale, 'Allowlist entry no longer imports child_process — delete the line.').toEqual([])
   })
-
-  it('holds the offender count at the pin', () => {
-    // Bounding by the allowlist's own length proves nothing: the two move
-    // together, so a swap (one file migrated off, one new file added with its
-    // entry) kept the bound satisfied. The pin is a literal for that reason.
-    expect(
-      offenders.length,
-      `${offenders.length} files import child_process directly; the pin is ${DIRECT_IMPORTER_PIN}. ` +
-        'Never raise the pin -- migrate the file to runProcess/spawnProcess from ' +
-        'src/shared/child-process instead.'
-    ).toBeLessThanOrEqual(DIRECT_IMPORTER_PIN)
-    // A pin left above reality is how a ratchet rots: it re-opens room for the
-    // next direct import to land for free.
-    expect(
-      offenders.length,
-      `Only ${offenders.length} files import child_process directly. Lower DIRECT_IMPORTER_PIN to ` +
-        `${offenders.length} to keep the ground you just took.`
-    ).toBeGreaterThanOrEqual(DIRECT_IMPORTER_PIN)
-  })
 })
diff --git a/src/shared/closed-terminal-tab-tombstones.test.ts b/src/shared/closed-terminal-tab-tombstones.test.ts
index a2db1828ac32..b28c64d9dd93 100644
--- a/src/shared/closed-terminal-tab-tombstones.test.ts
+++ b/src/shared/closed-terminal-tab-tombstones.test.ts
@@ -2,37 +2,29 @@ import { describe, expect, it } from 'vitest'
 import {
   CLOSED_TERMINAL_TAB_TOMBSTONE_TTL_MS,
   MAX_CLOSED_TERMINAL_TAB_TOMBSTONES,
+  closedTerminalTabTombstoneSchema,
+  hasClosedTerminalTabRecord,
+  isTerminalWorkspaceEmptiedOnPurpose,
   pruneClosedTerminalTabTombstones,
   recordClosedTerminalTabTombstone,
-  reconcileClosedTerminalTabTombstones,
   type ClosedTerminalTabTombstonesByTabId
 } from './closed-terminal-tab-tombstones'
 
 const NOW = 1_800_000_000_000
 const WT = 'repo-1::/srv/app'
 
-function reconcile(
-  tombstones: ClosedTerminalTabTombstonesByTabId,
-  args: {
-    acknowledgedWorktreeIds?: string[]
-    hostKnownTabIds?: string[]
-    hostRevision?: number
-  }
-): ClosedTerminalTabTombstonesByTabId {
-  return reconcileClosedTerminalTabTombstones({
-    tombstones,
-    acknowledgedWorktreeIds: new Set(args.acknowledgedWorktreeIds ?? [WT]),
-    hostKnownTabIds: new Set(args.hostKnownTabIds ?? []),
-    hostRevision: args.hostRevision,
-    now: NOW
+describe('closed terminal tab records', () => {
+  it('records the closing worktree, reason and time', () => {
+    expect(
+      recordClosedTerminalTabTombstone({}, 'tab-1', { worktreeId: WT, reason: 'cleanup' }, NOW)
+    ).toEqual({ 'tab-1': { closedAt: NOW, worktreeId: WT, reason: 'cleanup' } })
   })
-}
 
-describe('closed terminal tab tombstones', () => {
-  it('records the closing worktree and time', () => {
-    expect(recordClosedTerminalTabTombstone({}, 'tab-1', WT, NOW)).toEqual({
-      'tab-1': { closedAt: NOW, worktreeId: WT }
-    })
+  it('treats a record past the TTL as absent, even before its partition prunes it', () => {
+    const stale = {
+      'tab-1': { closedAt: NOW - CLOSED_TERMINAL_TAB_TOMBSTONE_TTL_MS - 1, worktreeId: WT }
+    }
+    expect(hasClosedTerminalTabRecord(stale, 'tab-1', undefined, NOW)).toBe(false)
   })
 
   it('prunes past the TTL and caps at the newest entries', () => {
@@ -57,53 +49,46 @@ describe('closed terminal tab tombstones', () => {
     expect(capped['tab-0']).toBeDefined()
     expect(capped[`tab-${MAX_CLOSED_TERMINAL_TAB_TOMBSTONES + 9}`]).toBeUndefined()
   })
-})
-
-describe('closed terminal tab tombstone acknowledgement', () => {
-  const tombstones = { 'tab-1': { closedAt: NOW, worktreeId: WT } }
-
-  it('a snapshot carrying no revision acknowledges nothing', () => {
-    expect(reconcile(tombstones, { hostRevision: undefined })).toEqual(tombstones)
-  })
-
-  it('a snapshot with no row for the tombstone worktree acknowledges nothing', () => {
-    const kept = reconcile(tombstones, { acknowledgedWorktreeIds: [], hostRevision: 9 })
-    expect(kept['tab-1']).toEqual({ closedAt: NOW, worktreeId: WT })
-  })
-
-  it('the first omitting snapshot only stamps the revision — it could predate the close', () => {
-    const kept = reconcile(tombstones, { hostRevision: 4 })
-    expect(kept['tab-1']).toEqual({ closedAt: NOW, worktreeId: WT, ackRevision: 4 })
-  })
 
-  it('a strictly newer omitting snapshot retires the tombstone', () => {
-    const stamped = reconcile(tombstones, { hostRevision: 4 })
-    expect(reconcile(stamped, { hostRevision: 5 })['tab-1']).toBeUndefined()
+  it('reads an older build record as a close, and an unknown reason as no reason', () => {
+    expect(closedTerminalTabTombstoneSchema.parse({ closedAt: 1, worktreeId: WT })).toEqual({
+      closedAt: 1,
+      worktreeId: WT
+    })
+    expect(
+      closedTerminalTabTombstoneSchema.parse({ closedAt: 1, worktreeId: WT, reason: 'later' })
+    ).toEqual({ closedAt: 1, worktreeId: WT, reason: undefined })
   })
+})
 
-  it('a repeat of the same revision does not retire it', () => {
-    const stamped = reconcile(tombstones, { hostRevision: 4 })
-    expect(reconcile(stamped, { hostRevision: 4 })['tab-1']).toBeDefined()
-  })
+describe('emptied on purpose', () => {
+  const closed: ClosedTerminalTabTombstonesByTabId = { 'tab-1': { closedAt: NOW, worktreeId: WT } }
 
-  it('a host that still lists the tab re-arms the watermark instead of retiring', () => {
-    const stamped = reconcile(tombstones, { hostRevision: 4 })
-    const stillListed = reconcile(stamped, { hostRevision: 7, hostKnownTabIds: ['tab-1'] })
-    expect(stillListed['tab-1']).toEqual({ closedAt: NOW, worktreeId: WT, ackRevision: 7 })
-    expect(reconcile(stillListed, { hostRevision: 7 })['tab-1']).toBeDefined()
-    expect(reconcile(stillListed, { hostRevision: 8 })['tab-1']).toBeUndefined()
+  it('an empty row with a close record in that workspace was emptied on purpose', () => {
+    expect(
+      isTerminalWorkspaceEmptiedOnPurpose(
+        { tabsByWorktree: { [WT]: [] }, closedTerminalTabTombstonesByTabId: closed },
+        WT
+      )
+    ).toBe(true)
   })
 
-  it('a host revision that went backwards never retires', () => {
-    const stamped = reconcile(tombstones, { hostRevision: 40 })
-    const rewound = reconcile(stamped, { hostRevision: 1 })
-    expect(rewound['tab-1']).toEqual({ closedAt: NOW, worktreeId: WT, ackRevision: 40 })
+  it('an empty row with no record is unknown, as is a missing row', () => {
+    expect(isTerminalWorkspaceEmptiedOnPurpose({ tabsByWorktree: { [WT]: [] } }, WT)).toBe(false)
+    expect(
+      isTerminalWorkspaceEmptiedOnPurpose(
+        { tabsByWorktree: {}, closedTerminalTabTombstonesByTabId: closed },
+        WT
+      )
+    ).toBe(false)
   })
 
-  it('a tab listed under a different worktree still counts as known to the host', () => {
-    const stamped = reconcile(tombstones, { hostRevision: 4 })
+  it('a record for another workspace does not count', () => {
     expect(
-      reconcile(stamped, { hostRevision: 5, hostKnownTabIds: ['tab-1'] })['tab-1']
-    ).toBeDefined()
+      isTerminalWorkspaceEmptiedOnPurpose(
+        { tabsByWorktree: { other: [] }, closedTerminalTabTombstonesByTabId: closed },
+        'other'
+      )
+    ).toBe(false)
   })
 })
diff --git a/src/shared/closed-terminal-tab-tombstones.ts b/src/shared/closed-terminal-tab-tombstones.ts
index 3db0a585987d..6c7b6f81d49c 100644
--- a/src/shared/closed-terminal-tab-tombstones.ts
+++ b/src/shared/closed-terminal-tab-tombstones.ts
@@ -1,18 +1,23 @@
 import { z } from 'zod'
+import type { RuntimeSessionTabCloseReason } from './runtime-session-contracts'
 
-/** A client's own record that the user closed a terminal tab.
+const TERMINAL_TAB_CLOSE_REASONS = [
+  'user',
+  'cleanup',
+  'pty-exit'
+] as const satisfies readonly RuntimeSessionTabCloseReason[]
+
+/** Main's record that a terminal tab was closed, written by its close transaction only.
  *
- *  Why it must exist: absence alone cannot distinguish "the host was never told" from "the user
- *  closed it", so the merge keeps the tab — and a `pty.kill` that died on the transport means the
- *  host keeps listing it forever. This is the close signal that outlives the failed RPC.
- *  Safe because tab ids are uuids: a tombstoned id never legitimately returns. */
+ *  Why it must exist: absence alone cannot distinguish "never told" from "closed", so without it a
+ *  host snapshot or a late spawn commit brings the tab back, and an emptied workspace reads as one
+ *  that was never initialized. Safe because tab ids are uuids: a closed id never legitimately
+ *  returns. Nothing acknowledges it away; it dies by TTL or the per-host cap. */
 export type ClosedTerminalTabTombstone = {
   closedAt: number
   worktreeId: string
-  /** Newest host revision seen for this tab's scope since the close. Retirement needs a STRICTLY
-   *  newer snapshot that omits the tab, so a pull already in flight when the user closed cannot
-   *  acknowledge a close it predates. */
-  ackRevision?: number
+  /** Absent on records an older build wrote, when only user closes were recorded. */
+  reason?: RuntimeSessionTabCloseReason
 }
 
 export type ClosedTerminalTabTombstonesByTabId = Record<string, ClosedTerminalTabTombstone>
@@ -22,11 +27,12 @@ export type ClosedTerminalTabTombstonesByTabId = Record<string, ClosedTerminalTa
 export const closedTerminalTabTombstoneSchema = z.object({
   closedAt: z.number().int().nonnegative(),
   worktreeId: z.string().min(1),
-  ackRevision: z.number().int().nonnegative().optional()
+  // Why catch: a reason a newer build adds must not cost this build the record itself.
+  reason: z.enum(TERMINAL_TAB_CLOSE_REASONS).optional().catch(undefined)
 })
 
-/** Backstops only — host acknowledgement is the normal exit. These cover a target the user never
- *  reconnects to, whose tombstones would otherwise never be retired. */
+/** Bounds on one host partition's map: pruned per partition, so one host's churn cannot evict
+ *  another host's records. */
 export const CLOSED_TERMINAL_TAB_TOMBSTONE_TTL_MS = 30 * 24 * 60 * 60 * 1000
 export const MAX_CLOSED_TERMINAL_TAB_TOMBSTONES = 500
 
@@ -44,61 +50,49 @@ export function pruneClosedTerminalTabTombstones(
 export function recordClosedTerminalTabTombstone(
   map: ClosedTerminalTabTombstonesByTabId | undefined,
   tabId: string,
-  worktreeId: string,
+  record: Omit<ClosedTerminalTabTombstone, 'closedAt'>,
   now: number
 ): ClosedTerminalTabTombstonesByTabId {
-  return pruneClosedTerminalTabTombstones({ ...map, [tabId]: { closedAt: now, worktreeId } }, now)
-}
-
-function maxAckRevision(a: number | undefined, b: number | undefined): number | undefined {
-  if (a === undefined) {
-    return b
-  }
-  return b === undefined ? a : Math.max(a, b)
+  return pruneClosedTerminalTabTombstones({ ...map, [tabId]: { ...record, closedAt: now } }, now)
 }
 
-export type ClosedTerminalTabTombstoneAck = {
-  tombstones: ClosedTerminalTabTombstonesByTabId | undefined
-  /** Worktrees this snapshot actually carries a tab row for. A worktree the snapshot says nothing
-   *  about — including one whose path never resolved to a local id — is not evidence of anything,
-   *  so its tombstones are left untouched. */
-  acknowledgedWorktreeIds: ReadonlySet<string>
-  /** Every tab id the snapshot lists, across all worktrees: an id the host still carries anywhere
-   *  has not been acknowledged, whichever worktree it now sits under. */
-  hostKnownTabIds: ReadonlySet<string>
-  hostRevision: number | undefined
-  now: number
+/** Whether a tab id was closed within the TTL, by the record's own worktree. The TTL is checked
+ *  here because pruning only runs when the partition next records a close. Object.hasOwn because
+ *  the map is a plain object: `in` answers true for every Object.prototype key. */
+export function hasClosedTerminalTabRecord(
+  map: ClosedTerminalTabTombstonesByTabId | undefined,
+  tabId: string,
+  worktreeId?: string,
+  now = Date.now()
+): boolean {
+  const record = map !== undefined && Object.hasOwn(map, tabId) ? map[tabId] : undefined
+  return (
+    record !== undefined &&
+    now - record.closedAt <= CLOSED_TERMINAL_TAB_TOMBSTONE_TTL_MS &&
+    (worktreeId === undefined || record.worktreeId === worktreeId)
+  )
 }
 
-/** Retires tombstones the host has demonstrably seen, and stamps the rest with the revision that
- *  proved it had not yet.
- *
- *  Retirement takes a snapshot that both covers the tombstone's worktree and is strictly newer than
- *  the last one that did — one snapshot alone can be the pull that was already in flight when the
- *  user closed. Absence never deletes here: a snapshot with no revision, or one carrying no row for
- *  the worktree, retires nothing. */
-export function reconcileClosedTerminalTabTombstones({
-  tombstones,
-  acknowledgedWorktreeIds,
-  hostKnownTabIds,
-  hostRevision,
-  now
-}: ClosedTerminalTabTombstoneAck): ClosedTerminalTabTombstonesByTabId {
-  const pruned = pruneClosedTerminalTabTombstones(tombstones, now)
-  if (hostRevision === undefined) {
-    return pruned
-  }
-  const kept: ClosedTerminalTabTombstonesByTabId = {}
-  for (const [tabId, tombstone] of Object.entries(pruned)) {
-    if (!acknowledgedWorktreeIds.has(tombstone.worktreeId)) {
-      kept[tabId] = tombstone
-      continue
-    }
-    const observed = tombstone.ackRevision
-    if (!hostKnownTabIds.has(tabId) && observed !== undefined && hostRevision > observed) {
-      continue
-    }
-    kept[tabId] = { ...tombstone, ackRevision: maxAckRevision(observed, hostRevision) }
-  }
-  return kept
+/** Emptied on purpose: the workspace's terminal row exists, is empty, and some tab in it was
+ *  closed within the TTL. An empty row with no live record is unknown (legacy data, an expired
+ *  record, or a writer that is not a close), so it reads as never initialized. Any record
+ *  suffices, which is weaker than "the last removal was a close" until every membership shrink is
+ *  a close. */
+export function isTerminalWorkspaceEmptiedOnPurpose(
+  state: {
+    tabsByWorktree: Readonly<Record<string, readonly unknown[] | undefined>>
+    closedTerminalTabTombstonesByTabId?: ClosedTerminalTabTombstonesByTabId
+  },
+  worktreeId: string,
+  now = Date.now()
+): boolean {
+  return (
+    Object.hasOwn(state.tabsByWorktree, worktreeId) &&
+    (state.tabsByWorktree[worktreeId]?.length ?? 0) === 0 &&
+    Object.values(state.closedTerminalTabTombstonesByTabId ?? {}).some(
+      (record) =>
+        record.worktreeId === worktreeId &&
+        now - record.closedAt <= CLOSED_TERMINAL_TAB_TOMBSTONE_TTL_MS
+    )
+  )
 }
diff --git a/src/shared/codebuddy-agent.test.ts b/src/shared/codebuddy-agent.test.ts
new file mode 100644
index 000000000000..6915cf8d5730
--- /dev/null
+++ b/src/shared/codebuddy-agent.test.ts
@@ -0,0 +1,67 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { createHookListenerState } from './agent-hook-listener/listener-state'
+import { normalizeAndAccept } from './agent-hook-listener-test-harness'
+import { recognizeAgentProcessFromCommandLine } from './agent-process-recognition'
+import { getAgentSessionOptionCatalog } from './agent-session-option-catalog'
+import { getAgentResumeArgv } from './agent-session-resume'
+
+describe('CodeBuddy harness', () => {
+  it('replays the live question lifecycle without settling at late SessionStart', () => {
+    const state = createHookListenerState()
+    const events = readFileSync(
+      join(__dirname, '__fixtures__/codebuddy-question-hooks.jsonl'),
+      'utf8'
+    )
+      .trim()
+      .split('\n')
+      .map((line) => JSON.parse(line))
+    const rows = events.map((event) => normalizeAndAccept(state, 'codebuddy', event))
+    expect(rows.map((row) => row?.payload.state ?? null)).toEqual([
+      'working',
+      null,
+      'waiting',
+      'working',
+      'working',
+      'done'
+    ])
+    expect(rows[2]?.payload).toMatchObject({ agentType: 'codebuddy', toolName: 'AskUserQuestion' })
+    expect(rows[5]?.payload).toMatchObject({ agentType: 'codebuddy', lastAssistantMessage: 'Red' })
+    expect(rows[5]?.providerSession?.id).toBe('codebuddy-verification')
+  })
+
+  it.each([
+    'codebuddy',
+    'cbc',
+    'C:\\Tools\\codebuddy.cmd',
+    'node /usr/lib/node_modules/@tencent-ai/codebuddy-code/dist/codebuddy.js'
+  ])('recognizes interactive %s', (command) => {
+    expect(recognizeAgentProcessFromCommandLine(command)?.agent).toBe('codebuddy')
+  })
+
+  it('excludes print runs and resumes the original provider session', () => {
+    for (const flag of ['--print', '--serve', '--acp', '--bg', '--background']) {
+      expect(recognizeAgentProcessFromCommandLine(`codebuddy ${flag}`)).toBeNull()
+    }
+    expect(recognizeAgentProcessFromCommandLine('codebuddy -- --serve')?.agent).toBe('codebuddy')
+    expect(getAgentResumeArgv('codebuddy', { key: 'session_id', id: 'session-1' })).toEqual([
+      'codebuddy',
+      '--resume',
+      'session-1'
+    ])
+  })
+
+  it('passes explicit model and effort preferences through the CLI flags', () => {
+    const catalog = getAgentSessionOptionCatalog('codebuddy')
+    expect(catalog?.modelApply.launchArgs?.('fast-model')).toEqual(['--model', 'fast-model'])
+    expect(catalog?.unknownModelOptions?.[0].apply.launchArgs?.('high')).toEqual([
+      '--effort',
+      'high'
+    ])
+    expect(catalog?.modelApply.removeAgentArgs?.(['--model', 'old', '--', 'prompt'])).toEqual([
+      '--',
+      'prompt'
+    ])
+  })
+})
diff --git a/src/shared/codebuddy-headless-command.ts b/src/shared/codebuddy-headless-command.ts
new file mode 100644
index 000000000000..5c632b27b3b0
--- /dev/null
+++ b/src/shared/codebuddy-headless-command.ts
@@ -0,0 +1,13 @@
+import { agentArgOptionTokens } from './agent-session-option-agent-args'
+import { isPrintModeHeadlessOneShotCommand, optionName } from './print-mode-headless-command'
+
+const NON_INTERACTIVE_FLAGS = new Set(['--serve', '--acp', '--bg', '--background'])
+
+export function isCodebuddyNonInteractiveCommand(tokens: readonly string[]): boolean {
+  return (
+    isPrintModeHeadlessOneShotCommand(tokens) ||
+    agentArgOptionTokens(tokens)
+      .slice(1)
+      .some((token) => NON_INTERACTIVE_FLAGS.has(optionName(token)))
+  )
+}
diff --git a/src/shared/codex-shell-function.ts b/src/shared/codex-shell-function.ts
new file mode 100644
index 000000000000..c886917a0073
--- /dev/null
+++ b/src/shared/codex-shell-function.ts
@@ -0,0 +1,94 @@
+// Orca's `codex` shell function for every shell family: runs launch prep and adds
+// --no-daemon. Pure text, so any host that writes a shell script can embed it.
+// Why --no-daemon: Codex 0.156+ otherwise shares one server per CODEX_HOME that runs every tab's
+// hooks with the first tab's Orca env and dies with it (#22873). These args need that server or exit 2.
+export const CODEX_SHARED_SERVER_ARGS = ['agents', 'queue', '--no-daemon', '--remote'] as const
+const CODEX_SHARED_SERVER_ARG_PATTERN = `^(${CODEX_SHARED_SERVER_ARGS.join('|')}|--remote=.*)$`
+
+export function getPosixCodexShellLaunchPreflight(): string {
+  return `# Why: a typed alias expands inside the shell, after pane launch prep.
+# Why unalias inside the substitution: an alias named codex makes command -v
+# report the alias text, and the subshell leaves the user's own alias intact.
+# Why || : twice — zsh alone aborts inside the substitution, but every shell's
+# assignment adopts its exit status, so an absent codex trips set -e in bash too.
+__orca_codex_binary="$(unalias codex 2>/dev/null || :; command -v codex 2>/dev/null || :)"
+if [[ -n "\${__orca_codex_binary:-}" && -x "\${__orca_codex_binary}" ]]; then
+  # Why the function reserved word: it suppresses alias expansion of the name,
+  # which otherwise rewrites this header at parse time and aborts the whole file.
+  function codex {
+    # Why local: zsh's warn_create_global warns for each global a function creates.
+    local __orca_codex_arg __orca_codex_isolate="\${ORCA_CODEX_ISOLATE:-1}"
+    if [[ -n "\${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "\${ORCA_CODEX_LAUNCH_PREFLIGHT}" ]]; then
+      "\${ORCA_CODEX_LAUNCH_PREFLIGHT}" agent hooks prepare-codex >/dev/null 2>&1 || :
+    fi
+    for __orca_codex_arg in "$@"; do
+      case "$__orca_codex_arg" in ${CODEX_SHARED_SERVER_ARGS.join('|')}|--remote=*) __orca_codex_isolate=0 ;; esac
+    done
+    # Why probe every launch: a cached answer goes stale across an upgrade, and 0.155 and older exit 2 on the flag.
+    if [[ "$__orca_codex_isolate" != 0 ]]; then
+      case "$(command codex --help 2>/dev/null </dev/null)" in *--no-daemon*) set -- --no-daemon "$@" ;; esac
+    fi
+    command codex "$@"
+  }
+fi
+unset __orca_codex_binary
+`
+}
+
+export function getFishCodexShellLaunchPreflight(): string {
+  return `# Why captured: an unquoted (type -t codex) expands to zero words when codex is
+# absent, leaving "test = file" — fish then errors instead of failing closed.
+# Quoting in place is not the fix; fish never substitutes inside double quotes.
+set -l __orca_codex_type (type -t codex 2>/dev/null)
+if test "$__orca_codex_type" = file
+  function codex
+    if test -x "$ORCA_CODEX_LAUNCH_PREFLIGHT"
+      command "$ORCA_CODEX_LAUNCH_PREFLIGHT" agent hooks prepare-codex >/dev/null 2>&1; or true
+    end
+    if test "$ORCA_CODEX_ISOLATE" != 0; and not string match -qr -- '${CODEX_SHARED_SERVER_ARG_PATTERN}' $argv; and command codex --help 2>/dev/null </dev/null | string match -q -- '*--no-daemon*'
+      set argv --no-daemon $argv
+    end
+    command codex $argv
+  end
+end
+set -e __orca_codex_type`
+}
+
+export function getPowerShellCodexShellLaunchPreflight(): string {
+  return `$orcaCodexCommand = Get-Command codex -ErrorAction SilentlyContinue | Select-Object -First 1
+if ($orcaCodexCommand -and
+    $orcaCodexCommand.CommandType -in @("Application", "ExternalScript")) {
+    function Global:codex {
+        $orcaCodexExecutable = Get-Command codex -CommandType Application,ExternalScript -ErrorAction SilentlyContinue | Select-Object -First 1
+        if (-not $orcaCodexExecutable) {
+            Write-Error "codex executable not found"
+            $global:LASTEXITCODE = 127
+            return
+        }
+        $orcaCodexFlags = @()
+        # Why try/catch: under the user's $ErrorActionPreference = 'Stop', a failing prep or probe must not abort the launch.
+        if ($env:ORCA_CODEX_LAUNCH_PREFLIGHT) {
+            try {
+                & $env:ORCA_CODEX_LAUNCH_PREFLIGHT agent hooks prepare-codex *> $null
+            } catch {
+            }
+        }
+        if ($env:ORCA_CODEX_ISOLATE -ne '0' -and -not (@($args) -cmatch '${CODEX_SHARED_SERVER_ARG_PATTERN}')) {
+            try {
+                if ((& $orcaCodexExecutable.Source --help 2>$null) -match '--no-daemon') {
+                    $orcaCodexFlags = @('--no-daemon')
+                }
+            } catch {
+            }
+        }
+        # Why: a native command inside a function never sees the function's pipeline input on its own.
+        if ($MyInvocation.ExpectingInput) {
+            $input | & $orcaCodexExecutable.Source @orcaCodexFlags @args
+        } else {
+            & $orcaCodexExecutable.Source @orcaCodexFlags @args
+        }
+        $global:LASTEXITCODE = $LASTEXITCODE
+    }
+}
+Remove-Variable orcaCodexCommand -ErrorAction SilentlyContinue`
+}
diff --git a/src/shared/codex-terminal-server-isolation.ts b/src/shared/codex-terminal-server-isolation.ts
new file mode 100644
index 000000000000..daa68a972d7f
--- /dev/null
+++ b/src/shared/codex-terminal-server-isolation.ts
@@ -0,0 +1,26 @@
+import type { GlobalSettings } from './global-settings-types'
+
+type CodexTerminalServerIsolationSettings =
+  | Partial<Pick<GlobalSettings, 'codexTerminalServerIsolation'>>
+  | null
+  | undefined
+
+// Why this name: the codex shell wrapper (codex-shell-launch-preflight.ts) reads it to skip --no-daemon.
+const CODEX_ISOLATE_ENV = 'ORCA_CODEX_ISOLATE'
+
+export function isCodexTerminalServerIsolationEnabled(
+  settings: CodexTerminalServerIsolationSettings
+): boolean {
+  return settings?.codexTerminalServerIsolation !== false
+}
+
+/** Opt-out only: with isolation on nothing is injected, so behaviour matches the pre-setting default. */
+export function withCodexTerminalServerIsolationEnv(
+  env: Record<string, string> | undefined,
+  settings: CodexTerminalServerIsolationSettings
+): Record<string, string> | undefined {
+  if (isCodexTerminalServerIsolationEnabled(settings)) {
+    return env
+  }
+  return { ...env, [CODEX_ISOLATE_ENV]: '0' }
+}
diff --git a/src/shared/commit-message-agent-spec.test.ts b/src/shared/commit-message-agent-spec.test.ts
index cfef72d6f2ed..81769f5aef68 100644
--- a/src/shared/commit-message-agent-spec.test.ts
+++ b/src/shared/commit-message-agent-spec.test.ts
@@ -36,6 +36,7 @@ describe('COMMIT_MESSAGE_AGENT_SPECS', () => {
       'codex',
       'copilot',
       'cursor',
+      'dsh',
       'kimi',
       'muse',
       'omp',
diff --git a/src/shared/commit-message-agent-specs-secondary.ts b/src/shared/commit-message-agent-specs-secondary.ts
index 80dfe37212f4..0ad5086bec71 100644
--- a/src/shared/commit-message-agent-specs-secondary.ts
+++ b/src/shared/commit-message-agent-specs-secondary.ts
@@ -137,6 +137,27 @@ export function buildSecondaryCommitMessageAgentSpecs({
       models: [{ id: 'default', label: 'Config default' }],
       defaultModelId: 'default'
     },
+    dsh: {
+      id: 'dsh',
+      label: 'DeepSeek Harness',
+      binary: 'dsh',
+      // Why: `dsh --profile headless` runs one fresh persisted session, prints the final
+      // answer and exits — the documented one-shot entry mode. The interactive `dsh-tui`
+      // profile is deliberately not used here; Source Control AI stays one-shot.
+      // Why stdin and not argv: the prompt carries the whole diff. On argv it would sit in
+      // the process table for every user on the box, and it would eventually hit the argv
+      // limit. `-` is DSH's explicit stdin marker; measured against 0.1.5-rc.1, omitting the
+      // positional entirely is rejected ("a task is required") even when stdin is a pipe.
+      promptDelivery: 'stdin',
+      buildArgs: () => ['--profile', 'headless', '-'],
+      // Why: the launcher owns `--profile`; a second one would boot a different profile.
+      singletonOptions: [['--profile']],
+      modelSource: 'static',
+      // Why: the headless app parses no `--model`. The model comes from the profile's
+      // `llm-deepseek` row, so the only honest choice here is the configured default.
+      models: [{ id: 'default', label: 'Config default' }],
+      defaultModelId: 'default'
+    },
     copilot: {
       id: 'copilot',
       label: 'GitHub Copilot',
diff --git a/src/shared/cross-platform-path-guards.test.ts b/src/shared/cross-platform-path-guards.test.ts
index cf6c729b89bf..aec52a1f6762 100644
--- a/src/shared/cross-platform-path-guards.test.ts
+++ b/src/shared/cross-platform-path-guards.test.ts
@@ -293,12 +293,6 @@ describe('no-op regex passes stay skipped', () => {
  * this is the price. Keep the raw-candidate entry point the plain `relativePathInsideRoot` call.
  */
 describe('cross-platform-path exposes a single root-bound factory', () => {
-  it('has no raw-candidate sibling to the normalized matcher', () => {
-    expect(Object.keys(guarded).filter((name) => name.startsWith('create'))).toEqual([
-      'createNormalizedPathInsideOrEqualMatcher'
-    ])
-  })
-
   it('shows what mixing the two contracts would cost', () => {
     const root = '//wsl.localhost/Ubuntu/Repo'
     const candidate = '//wsl.localhost/Ubuntu/Repo/src/App.tsx'
diff --git a/src/shared/default-global-settings.ts b/src/shared/default-global-settings.ts
index 65ad7c608724..282069fce0d3 100644
--- a/src/shared/default-global-settings.ts
+++ b/src/shared/default-global-settings.ts
@@ -225,6 +225,7 @@ export function buildDefaultSettings(args: {
     agentDefaultEnv: { ...DEFAULT_TUI_AGENT_ENV },
     agentYoloDefaultsMigrated: true,
     agentStatusHooksEnabled: true,
+    codexTerminalServerIsolation: true,
     tabAutoGenerateTitle: false,
     confirmClosePinnedTab: true,
     editorPreviewTabsEnabled: true,
diff --git a/src/shared/draft-paste-ready-scanner.ts b/src/shared/draft-paste-ready-scanner.ts
index 1e586031a4ec..f7a9cb7c0c52 100644
--- a/src/shared/draft-paste-ready-scanner.ts
+++ b/src/shared/draft-paste-ready-scanner.ts
@@ -67,6 +67,16 @@ const DRAFT_PASTE_READY_SIGNALS: Record<DraftPasteReadySignal, DraftPasteReadySi
     // the main-process caller drops the draft when readiness never resolves.
     quietAnchor: DECSET_BRACKETED_PASTE
   },
+  // Why: DSH-TUI draws the same U+276F composer glyph inside the alternate screen, and
+  // animates its intro continuously behind it, so it needs grok's marker-plus-quiet shape
+  // rather than the default quiet window. Its own entry (not grok's) so the two agents'
+  // evidence — and any future divergence — stay separable.
+  'dsh-composer-prompt': {
+    markerAnchor: DECSET_ALT_SCREEN,
+    markerAnchorEnd: DECRST_ALT_SCREEN,
+    marker: GROK_COMPOSER_PROMPT,
+    quietAnchor: DECSET_BRACKETED_PASTE
+  },
   'zcode-composer-prompt': {
     markerAnchor: DECSET_ALT_SCREEN,
     markerAnchorEnd: DECRST_ALT_SCREEN,
@@ -126,6 +136,10 @@ export type DraftPasteReadyScanResult = {
  *     that keeps those launches on the pre-existing delivery path. The alt-screen
  *     anchor is revoked on `\x1b[?1049l`: leaving it hands the terminal back to
  *     the shell, so a glyph after that is the shell's prompt, not grok's composer.
+ *   - `dsh-composer-prompt`: the grok shape applied to DSH-TUI, whose composer draws the
+ *     same `❯` inside the alternate screen. The committed
+ *     `dsh-tui-ready-no-key.txt` transcript is the evidence: DECSET 2004 at byte 6,
+ *     `\x1b[?1049h` at byte 40, and the first `❯` at byte 5910.
  *   - `zcode-composer-prompt`: ready when ZCode's composer box corner (`╭`) renders
  *     after the alternate-screen switch. ZCode repaints its animated ASCII banner
  *     indefinitely — the captured transcript is still repainting 30s after the composer
diff --git a/src/shared/dsh-launch-command.test.ts b/src/shared/dsh-launch-command.test.ts
new file mode 100644
index 000000000000..6585318cc980
--- /dev/null
+++ b/src/shared/dsh-launch-command.test.ts
@@ -0,0 +1,91 @@
+import { describe, expect, it } from 'vitest'
+import { isDshNonInteractiveCommand } from './dsh-launch-command'
+import { recognizeAgentProcessFromCommandLine } from './agent-process-recognition'
+
+function tokens(commandLine: string): string[] {
+  return commandLine.split(' ')
+}
+
+describe('isDshNonInteractiveCommand', () => {
+  it.each([
+    'dsh web',
+    'dsh --profile web',
+    'dsh --profile=web --port 8080',
+    'dsh --profile headless "run the tests"',
+    'dsh --profile sdk',
+    'dsh --profile sdk-minimal',
+    'dsh --profile acp',
+    'dsh plugin --profile dsh-tui add some-plugin',
+    'dsh --profile dsh-tui --dump-config'
+  ])('rejects %s', (commandLine) => {
+    expect(isDshNonInteractiveCommand(tokens(commandLine))).toBe(true)
+  })
+
+  it.each([
+    'dsh --profile dsh-tui',
+    'dsh --profile=dsh-tui',
+    'dsh --profile dsh-tui --resume 9478e2d8-29bc-4009-ab32-657efa2bd763',
+    'dsh-tui',
+    'dsh-tui --resume',
+    'dst'
+  ])('accepts %s', (commandLine) => {
+    expect(isDshNonInteractiveCommand(tokens(commandLine))).toBe(false)
+  })
+
+  it('reads only the first --profile, so app arguments cannot retarget it', () => {
+    // `--resume web` belongs to the terminal app, not the launcher.
+    expect(isDshNonInteractiveCommand(tokens('dsh --profile dsh-tui --resume web'))).toBe(false)
+  })
+
+  it.each([
+    'dsh-tui web',
+    'dst web',
+    'dsh-tui plugin',
+    'dsh-tui --continue web',
+    'dsh-tui /home/dev/projects/web',
+    'node /usr/local/lib/node_modules/.bin/dsh-tui web',
+    'C:\\Users\\dev\\AppData\\npm\\dsh-tui.cmd web'
+  ])('keeps %s interactive: the launcher already chose the TUI profile', (commandLine) => {
+    // Everything after `dsh-tui`/`dst` is the terminal app's argv — a workspace target or a
+    // resume id — so a folder named `web` or `plugin` is a directory name, not a subcommand.
+    expect(isDshNonInteractiveCommand(tokens(commandLine))).toBe(false)
+  })
+})
+
+describe('dsh foreground process recognition', () => {
+  it.each([
+    'dsh-tui',
+    'dst',
+    '/opt/homebrew/bin/dsh --profile dsh-tui',
+    'node /usr/local/lib/node_modules/.bin/dsh-tui',
+    'node /home/dev/.dsh/profiles/dsh-tui/node_modules/@deepseek-harness-tui/dsh-tui/bin/dsh-tui.js',
+    'node /usr/local/lib/node_modules/@deepseek-ai/dsh/lib/bin.js --profile dsh-tui'
+  ])('recognizes %s as dsh', (commandLine) => {
+    expect(recognizeAgentProcessFromCommandLine(commandLine)?.agent).toBe('dsh')
+  })
+
+  it.each([
+    'dsh web',
+    'dsh --profile headless "summarize the diff"',
+    'node /usr/local/lib/node_modules/@deepseek-ai/dsh/lib/bin.js --profile acp'
+  ])('does not claim %s as an interactive agent pane', (commandLine) => {
+    expect(recognizeAgentProcessFromCommandLine(commandLine)).toBeNull()
+  })
+
+  it.each(['dsh-tui web', 'dst plugin'])(
+    'still recognizes %s as the dsh agent pane',
+    (commandLine) => {
+      expect(recognizeAgentProcessFromCommandLine(commandLine)?.agent).toBe('dsh')
+    }
+  )
+
+  it('still reports non-interactive dsh when headless one-shots are included', () => {
+    // Non-interactivity guards ask for the wider set: a `dsh web` pane is not a shell
+    // either, so callers that protect agent panes from reuse must still see it.
+    expect(
+      recognizeAgentProcessFromCommandLine('dsh --profile headless "go"', {
+        includeHeadlessOneShot: true
+      })?.agent
+    ).toBe('dsh')
+  })
+})
diff --git a/src/shared/dsh-launch-command.ts b/src/shared/dsh-launch-command.ts
new file mode 100644
index 000000000000..60100a9823b1
--- /dev/null
+++ b/src/shared/dsh-launch-command.ts
@@ -0,0 +1,115 @@
+// DeepSeek Harness ships one binary, `dsh`, and boots a *profile* with it. Only the
+// `dsh-tui` profile paints an interactive composer; `web` serves HTTP, `headless` answers
+// one task and exits, `sdk`/`sdk-minimal`/`acp` speak JSON-RPC on stdio, and `plugin` is
+// package management. All five are `dsh` in the process table, so foreground recognition
+// has to read the profile to tell an agent pane from a server or a one-shot.
+//
+// `dsh-tui` (and its `dst` alias) forward straight to `dsh --profile dsh-tui`, so they are
+// always interactive and never reach this matcher.
+
+/** Profiles that boot something other than the interactive terminal UI. */
+const NON_INTERACTIVE_PROFILES = new Set([
+  'web',
+  'headless',
+  'sdk',
+  'sdk-minimal',
+  'acp',
+  'desktop'
+])
+
+/** Bare-word subcommands the launcher accepts: `plugin` boots no profile at all, and `web`
+ *  is the documented alias for `--profile web`. Neither hosts an interactive pane. */
+const SUBCOMMANDS = new Set(['plugin', 'web'])
+
+/** Launcher flags that print a composed config and exit. */
+const DUMP_FLAGS = new Set(['--dump-config', '--dump-default-config', '--dump-config-schema'])
+
+/** Binaries that always boot `--profile dsh-tui` and forward the rest to the terminal app. */
+const TUI_LAUNCHER_NAMES = new Set(['dsh-tui', 'dst'])
+
+const PROGRAM_EXTENSION_RE = /\.(?:exe|cmd|bat|ps1|js|mjs|cjs)$/
+
+function programBasename(token: string | undefined): string {
+  const unquoted = token?.trim().replace(/^["']|["']$/g, '') ?? ''
+  const basename = unquoted.split(/[\\/]/).pop() ?? unquoted
+  return basename.toLowerCase().replace(PROGRAM_EXTENSION_RE, '')
+}
+
+function readProfileName(tokens: readonly string[], index: number): string | null {
+  const token = tokens[index]
+  if (token === undefined) {
+    return null
+  }
+  if (token.startsWith('--profile=')) {
+    return token.slice('--profile='.length)
+  }
+  return token === '--profile' ? (tokens[index + 1] ?? null) : null
+}
+
+/** Launcher flags that take a value, so the token after them is never an app argument. */
+const LAUNCHER_FLAGS_WITH_VALUE = new Set(['--profile', '--from-default-profile', '--patch'])
+
+/** Valueless launcher flags. */
+const LAUNCHER_FLAGS = new Set(['-V', '--version', '-h', '--help', ...DUMP_FLAGS])
+
+/** Splits `--profile=web` down to `--profile` so both spellings match one lookup. */
+function flagName(token: string): string {
+  return token.split('=', 1)[0]
+}
+
+function isLauncherToken(token: string): boolean {
+  return LAUNCHER_FLAGS.has(token) || LAUNCHER_FLAGS_WITH_VALUE.has(flagName(token))
+}
+
+/**
+ * Whether a `dsh` command line runs something other than the interactive agent.
+ *
+ * Only the launcher's own tokens are read. Everything after the first token the launcher
+ * does not recognize belongs to the booted app (`dsh --profile dsh-tui --resume <id>`),
+ * and a prompt or session id is free text that must never be read as a launcher flag.
+ */
+export function isDshNonInteractiveCommand(tokens: readonly string[]): boolean {
+  // Why first: `dsh-tui`/`dst` have already chosen the interactive profile, and everything
+  // after them is the TERMINAL APP's argv — a `--resume` id or a workspace target. A
+  // workspace folder named `web` or `plugin` is an ordinary directory name, and reading it
+  // as a `dsh` subcommand would mark a live agent pane non-interactive, costing it status
+  // hooks and prompt delivery. Index 1 as well as 0 because a node shim puts the launcher
+  // script path there.
+  if (
+    TUI_LAUNCHER_NAMES.has(programBasename(tokens[0])) ||
+    TUI_LAUNCHER_NAMES.has(programBasename(tokens[1]))
+  ) {
+    return false
+  }
+  let profile: string | null = null
+  let index = 1
+  // Skip the leading non-flag tokens: an interpreter invocation puts the script path here.
+  while (index < tokens.length && !isLauncherToken(tokens[index])) {
+    const token = tokens[index]
+    if (SUBCOMMANDS.has(token)) {
+      return true
+    }
+    if (!token.startsWith('-') && index > 1) {
+      // A bare word that is neither a subcommand nor a flag: the app's arguments start here.
+      return false
+    }
+    index += 1
+  }
+  for (; index < tokens.length; index += 1) {
+    const token = tokens[index]
+    if (DUMP_FLAGS.has(token)) {
+      return true
+    }
+    if (!isLauncherToken(token)) {
+      break
+    }
+    const explicitProfile = readProfileName(tokens, index)
+    if (explicitProfile !== null && profile === null) {
+      profile = explicitProfile
+    }
+    if (LAUNCHER_FLAGS_WITH_VALUE.has(token)) {
+      index += 1
+    }
+  }
+  return profile !== null && NON_INTERACTIVE_PROFILES.has(profile)
+}
diff --git a/src/shared/dsh-terminal-title.test.ts b/src/shared/dsh-terminal-title.test.ts
new file mode 100644
index 000000000000..ab28f4d56f4a
--- /dev/null
+++ b/src/shared/dsh-terminal-title.test.ts
@@ -0,0 +1,45 @@
+import { describe, expect, it } from 'vitest'
+import { detectAgentStatusFromTitle, normalizeTerminalTitle } from './agent-title-status'
+import { isDshTerminalTitle, isGeminiTerminalTitle } from './agent-title-core'
+import { getAgentLabel, resolveExplicitTerminalTitleAgentType } from './terminal-title-agent-type'
+
+// DSH-TUI titles are `<prefix> 🐋 <session title>`: `✦` at rest, `⠂`/`⠐` while a turn
+// runs. Both halves collide with an existing agent — `✦` is Gemini CLI's WORKING glyph,
+// and the braille frames are what Claude's generic heuristic claims — so the whale has to
+// outrank both. Evidence: src/main/runtime/__fixtures__/dsh-tui-ready-no-key.txt.
+const RESTING = '✦ \u{1F40B} dsh-demo-repo'
+const WORKING_FRAMES = ['⠂ \u{1F40B} fix the flaky test', '⠐ \u{1F40B} fix the flaky test']
+
+describe('a DSH-TUI terminal title', () => {
+  it('is recognized by its whale', () => {
+    expect(isDshTerminalTitle(RESTING)).toBe(true)
+    expect(isDshTerminalTitle('✦ some other agent')).toBe(false)
+  })
+
+  it('is never read as Gemini CLI', () => {
+    expect(isGeminiTerminalTitle(RESTING)).toBe(false)
+    expect(getAgentLabel(RESTING)).toBe('DeepSeek Harness')
+    expect(resolveExplicitTerminalTitleAgentType(RESTING)).toBe('dsh')
+  })
+
+  it('survives normalization instead of being rewritten to Gemini', () => {
+    expect(normalizeTerminalTitle(RESTING)).toBe(RESTING)
+  })
+
+  it('does not report working just because it carries Gemini’s working glyph', () => {
+    // The regression this guards: a finished DSH pane reported working forever, because
+    // `✦` is DSH's REST prefix and Gemini's WORKING glyph.
+    expect(detectAgentStatusFromTitle(RESTING)).toBeNull()
+  })
+
+  it('keeps its working frames out of Claude’s braille lane', () => {
+    for (const frame of WORKING_FRAMES) {
+      expect(getAgentLabel(frame)).toBe('DeepSeek Harness')
+    }
+  })
+
+  it('leaves a real Gemini title alone', () => {
+    expect(isGeminiTerminalTitle('✦ gemini')).toBe(true)
+    expect(normalizeTerminalTitle('✦ gemini')).toBe('✦ Gemini CLI')
+  })
+})
diff --git a/src/shared/dsh-terminal-title.ts b/src/shared/dsh-terminal-title.ts
new file mode 100644
index 000000000000..76662bd10d06
--- /dev/null
+++ b/src/shared/dsh-terminal-title.ts
@@ -0,0 +1,10 @@
+/** DSH-TUI titles are always `<prefix> 🐋 <session title>` (its Chat screen's
+ *  `useTerminalTitle`), and the whale is the only part no other agent emits. It has to
+ *  outrank the Gemini glyphs below: DSH's IDLE prefix is `✦`, which is Gemini's WORKING
+ *  glyph, so without this a resting DSH pane reads as a working Gemini — wrong agent,
+ *  wrong state. Evidence: src/main/runtime/__fixtures__/dsh-tui-ready-no-key.txt. */
+export const DSH_WHALE = '\u{1F40B}' // 🐋
+
+export function isDshTerminalTitle(title: string): boolean {
+  return title.includes(DSH_WHALE)
+}
diff --git a/src/shared/emoji-shortcode-catalog.lazy.test.ts b/src/shared/emoji-shortcode-catalog.lazy.test.ts
index dc05160696b1..f46e0e742aa0 100644
--- a/src/shared/emoji-shortcode-catalog.lazy.test.ts
+++ b/src/shared/emoji-shortcode-catalog.lazy.test.ts
@@ -1,5 +1,3 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import emojiShortcodes from 'emojibase-data/en/shortcodes/emojibase.json'
 
@@ -29,37 +27,4 @@ describe('emoji shortcode catalog laziness', () => {
     expect(catalog.replaceKnownEmojiWithShortcodes('ship \u{1F389}')).toBe('ship  party ')
     expect(catalog.isEmojiShortcodeCatalogBuiltForTest()).toBe(true)
   })
-
-  it('leaves the main-process worktree namer importing only the deferred entry points', () => {
-    // A cross-project import would drag src/main into the shared tsconfig, so assert on source.
-    const worktreeLogic = readFileSync(join(__dirname, '../main/ipc/worktree-logic.ts'), 'utf8')
-    const catalogImport = worktreeLogic.match(
-      /import \{([^}]*)\} from '[^']*emoji-shortcode-catalog'/
-    )
-
-    expect(catalogImport?.[1].split(',').map((name) => name.trim())).toEqual([
-      'replaceKnownEmojiWithShortcodes',
-      'setEmojiShortcodeDatasetLoader'
-    ])
-  })
-
-  it('keeps the catalog build out of module scope', () => {
-    const sharedSource = readFileSync(join(__dirname, 'emoji-shortcode-catalog.ts'), 'utf8')
-
-    // A module-scope `const X = <expression over the dataset>` is the regression this guards.
-    expect(sharedSource).not.toMatch(/^const \w+ = Object\.entries\(/m)
-    expect(sharedSource).not.toMatch(/^const \w+ = new (?:Map|Intl\.Segmenter)\(/m)
-    expect(sharedSource).toContain('function loadCatalog()')
-  })
-
-  it('keeps the 166 KB dataset off every module main statically imports', () => {
-    const sharedSource = readFileSync(join(__dirname, 'emoji-shortcode-catalog.ts'), 'utf8')
-    const worktreeLogic = readFileSync(join(__dirname, '../main/ipc/worktree-logic.ts'), 'utf8')
-
-    // A static `emojibase-data` import anywhere main reaches inlines the dataset into
-    // out/main/index.js and JSON.parses it on every launch.
-    const staticDatasetImport = /\bfrom '[^']*emojibase-data[^']*'/
-    expect(sharedSource).not.toMatch(staticDatasetImport)
-    expect(worktreeLogic).not.toMatch(staticDatasetImport)
-  })
 })
diff --git a/src/shared/ephemeral-vm-recipe-output-capture.test.ts b/src/shared/ephemeral-vm-recipe-output-capture.test.ts
new file mode 100644
index 000000000000..27fe3c134664
--- /dev/null
+++ b/src/shared/ephemeral-vm-recipe-output-capture.test.ts
@@ -0,0 +1,356 @@
+import { EventEmitter } from 'node:events'
+import { PassThrough } from 'node:stream'
+import { setImmediate } from 'node:timers/promises'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import {
+  clampRecipeCaptureBytes,
+  DEFAULT_MAX_CAPTURE_BYTES,
+  runRecipeCommand
+} from './ephemeral-vm-recipe-process'
+import { GrowingByteBuffer } from './growing-byte-buffer'
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  vi.useRealTimers()
+})
+
+/** The pre-ring policy: re-encode the retained tail on every chunk and trim to a character boundary. */
+function oldAppend(current: string, chunk: string, maxBytes: number): string {
+  if (maxBytes <= 0) {
+    return ''
+  }
+  const chunkBytes = Buffer.byteLength(chunk, 'utf8')
+  return chunkBytes >= maxBytes
+    ? utf8Tail(chunk, maxBytes)
+    : utf8Tail(current, maxBytes - chunkBytes) + chunk
+}
+
+function utf8Tail(value: string, maxBytes: number): string {
+  const bytes = Buffer.from(value, 'utf8')
+  if (bytes.byteLength <= maxBytes) {
+    return value
+  }
+  let start = bytes.byteLength - maxBytes
+  while (start < bytes.byteLength && (bytes[start]! & 0xc0) === 0x80) {
+    start += 1
+  }
+  return bytes.subarray(start).toString('utf8')
+}
+
+/** What the capture now retains: the last maxBytes raw bytes, minus a leading partial sequence. */
+function rawByteTail(bytes: Buffer, maxBytes: number): string {
+  let start = Math.max(0, bytes.byteLength - maxBytes)
+  while (start < bytes.byteLength && (bytes[start]! & 0xc0) === 0x80) {
+    start += 1
+  }
+  return bytes.toString('utf8', start)
+}
+
+/** Independent oracle: keep whole code points from the end until the byte limit is reached. */
+function codePointTail(text: string, maxBytes: number): string {
+  const points = Array.from(text)
+  const retained: string[] = []
+  let bytes = 0
+  while (points.length > 0) {
+    const point = points.pop()!
+    bytes += Buffer.byteLength(point, 'utf8')
+    if (bytes > maxBytes) {
+      break
+    }
+    retained.unshift(point)
+  }
+  return retained.join('')
+}
+
+function deterministicRandom(seed: number): (max: number) => number {
+  let state = seed
+  return (max: number): number => {
+    state = (Math.imul(state, 1664525) + 1013904223) >>> 0
+    return max <= 0 ? 0 : state % max
+  }
+}
+
+function fakeCommand(maxCaptureBytes?: number, signal?: AbortSignal) {
+  const child = Object.assign(new EventEmitter(), {
+    pid: undefined,
+    stdin: new PassThrough(),
+    stdout: new PassThrough(),
+    stderr: new PassThrough(),
+    kill: vi.fn<(signal?: NodeJS.Signals) => boolean>(() => true),
+    unref: vi.fn()
+  })
+  const stdoutChunks: string[] = []
+  const stderrChunks: string[] = []
+  const result = runRecipeCommand({
+    command: 'synthetic-recipe',
+    repoPath: process.cwd(),
+    context: { recipeId: 'fixture', repoPath: process.cwd() },
+    mode: 'create',
+    resultSchemaVersion: 1,
+    maxCaptureBytes,
+    signal,
+    onStdout: (chunk) => stdoutChunks.push(chunk),
+    onStderr: (chunk) => stderrChunks.push(chunk),
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The fixture implements every child member used by runRecipeCommand.
+    spawnCommand: vi.fn(() => child) as never
+  })
+  return { child, result, stdoutChunks, stderrChunks }
+}
+
+/**
+ * Counts the bytes the capture moves, scoped to our own buffer class: a spy on Buffer itself would
+ * also see unrelated allocations in the same tick and make the budget assertions flaky.
+ */
+function countCaptureWork() {
+  const appendedValues: (Buffer | Uint8Array)[] = []
+  const counts = { appendedBytes: 0, decodedBytes: 0, decodeCalls: 0 }
+  const append = GrowingByteBuffer.prototype.appendRetainedSuffix
+  const take = GrowingByteBuffer.prototype.takeBuffer
+  vi.spyOn(GrowingByteBuffer.prototype, 'appendRetainedSuffix').mockImplementation(function (
+    this: GrowingByteBuffer,
+    bytes: Buffer | Uint8Array,
+    maxBytes: number
+  ): void {
+    appendedValues.push(bytes)
+    counts.appendedBytes += bytes.byteLength
+    append.call(this, bytes, maxBytes)
+  })
+  vi.spyOn(GrowingByteBuffer.prototype, 'takeBuffer').mockImplementation(function (
+    this: GrowingByteBuffer
+  ): Buffer {
+    const taken = take.call(this)
+    counts.decodeCalls += 1
+    counts.decodedBytes += taken.byteLength
+    return taken
+  })
+  return { appendedValues, counts }
+}
+
+describe('recipe output capture', () => {
+  it.each([0, -1, 1, 2, 3, 4, 7, 16, 255, 256, 257, 1024])(
+    'matches the old per-chunk UTF-8 tail for limit %s across varied chunk boundaries',
+    async (limit) => {
+      const random = deterministicRandom(0x19780728)
+      const alphabet = ['a', '\0', '\n', 'é', '中', '😀', '�', '́']
+      for (let sample = 0; sample < 4; sample += 1) {
+        const fixture = fakeCommand(limit)
+        let expected = ''
+        for (let index = 0; index < 80; index += 1) {
+          const chunk = Array.from(
+            { length: random(40) },
+            () => alphabet[random(alphabet.length)]
+          ).join('')
+          fixture.child.stdout.emit('data', Buffer.from(chunk, 'utf8'))
+          expected = oldAppend(expected, chunk, limit)
+        }
+        fixture.child.emit('close', 0, null)
+        await expect(fixture.result).resolves.toMatchObject({ stdout: expected, stderr: '' })
+      }
+    }
+  )
+
+  it('does not restore bytes discarded at an earlier chunk boundary', async () => {
+    const fixture = fakeCommand(5)
+    for (const chunk of ['😀', 'ab', 'c']) {
+      fixture.child.stdout.emit('data', Buffer.from(chunk, 'utf8'))
+    }
+    fixture.child.emit('close', 0, null)
+    await expect(fixture.result).resolves.toMatchObject({ stdout: 'abc' })
+  })
+
+  it.each([1, 7, 31, 255, 4097])(
+    'retains the same code-point tail for limit %s wherever byte boundaries fall',
+    async (limit) => {
+      const random = deterministicRandom(0x5eed1234 + limit)
+      let text = ''
+      for (let index = 0; index < 2000; index += 1) {
+        text += index % 29 === 0 ? 'a中😀é'.repeat(200) : ['x', '😀', '中', 'é'][index % 4]
+      }
+      const bytes = Buffer.from(text, 'utf8')
+      const fixture = fakeCommand(limit)
+      // Split mid-character on purpose: retention is over raw bytes, so the tail must not depend on it.
+      for (let cursor = 0; cursor < bytes.byteLength;) {
+        const size = Math.min(1 + random(2048), bytes.byteLength - cursor)
+        fixture.child.stdout.emit('data', bytes.subarray(cursor, cursor + size))
+        cursor += size
+      }
+      fixture.child.emit('close', 0, null)
+      const result = await fixture.result
+      expect(result.stdout).toBe(codePointTail(text, limit))
+      expect(Buffer.byteLength(result.stdout, 'utf8')).toBeLessThanOrEqual(limit)
+    }
+  )
+
+  it('preserves stream decoding, callback boundaries and independent tails', async () => {
+    const fixture = fakeCommand(9)
+    const stdoutBytes = Buffer.from('α😀中文invalid:�:end')
+    const stderrBytes = Buffer.from('stderr:\n😀!')
+    const malformed = Buffer.from([0xff, 0xe2, 0x28, 0xa1])
+    for (const byte of stdoutBytes) {
+      fixture.child.stdout.write(Buffer.from([byte]))
+    }
+    for (const byte of stderrBytes) {
+      fixture.child.stderr.write(Buffer.from([byte]))
+    }
+    fixture.child.stdout.write(malformed)
+    fixture.child.emit('close', 17, null)
+    const result = await fixture.result
+    // Callbacks still see exactly what setEncoding('utf8') produced, split character by character.
+    expect(fixture.stdoutChunks.join('')).toBe(`${stdoutBytes.toString()}��(�`)
+    expect(fixture.stderrChunks.join('')).toBe(stderrBytes.toString())
+    // The tail is now the last 9 raw bytes rather than the last 9 bytes of re-encoded replacement
+    // characters, so malformed output keeps more of what the recipe actually wrote.
+    expect(result).toEqual({
+      stdout: rawByteTail(Buffer.concat([stdoutBytes, malformed]), 9),
+      stderr: rawByteTail(stderrBytes, 9),
+      exitCode: 17,
+      signal: null
+    })
+    expect(result.stdout).toBe(':end��(�')
+  })
+
+  it('moves at most 5 MiB through the capture for 4 MiB of output', async () => {
+    const fixture = fakeCommand()
+    const chunk = Buffer.from('a'.repeat(4096))
+    const { appendedValues, counts } = countCaptureWork()
+    for (let index = 0; index < 1024; index += 1) {
+      fixture.child.stdout.emit('data', chunk)
+    }
+    fixture.child.emit('close', 0, null)
+    const result = await fixture.result
+    expect(result.stdout).toBe('a'.repeat(1024 * 1024))
+    expect(fixture.stdoutChunks).toHaveLength(1024)
+    // The pre-ring policy re-encoded the retained tail per chunk: 943,194,112 bytes for this input.
+    expect(counts.appendedBytes + counts.decodedBytes).toBeLessThanOrEqual(5 * 1024 * 1024)
+    expect(counts.appendedBytes).toBe(4 * 1024 * 1024)
+    expect(counts.decodedBytes).toBe(1024 * 1024)
+    // Nothing is encoded: the capture stores the very Buffers the stream delivered.
+    expect(appendedValues.every((value) => value === chunk)).toBe(true)
+  })
+
+  it('returns the captured tails when cancellation needs force-kill', async () => {
+    vi.useFakeTimers()
+    const controller = new AbortController()
+    const fixture = fakeCommand(6, controller.signal)
+    fixture.child.stdout.emit('data', Buffer.from('abc😀Z'))
+    fixture.child.stderr.emit('data', Buffer.from('error tail'))
+    controller.abort()
+    fixture.child.stdout.emit('data', Buffer.from('!'))
+    await vi.advanceTimersByTimeAsync(5000)
+    await expect(fixture.result).resolves.toEqual({
+      stdout: '😀Z!',
+      stderr: 'r tail',
+      exitCode: null,
+      signal: null,
+      aborted: true
+    })
+    expect(fixture.child.kill.mock.calls).toEqual([['SIGTERM'], ['SIGKILL']])
+    expect(fixture.child.unref).toHaveBeenCalledOnce()
+  })
+
+  it('preserves failures after output and synchronous spawn errors', async () => {
+    const fixture = fakeCommand(5)
+    const error = new Error('recipe failed')
+    fixture.child.stdout.emit('data', Buffer.from('earlier output'))
+    fixture.child.emit('error', error)
+    await expect(fixture.result).rejects.toBe(error)
+    fixture.child.emit('close', 1, null)
+    await expect(
+      runRecipeCommand({
+        command: 'synthetic-recipe',
+        repoPath: process.cwd(),
+        context: { recipeId: 'fixture', repoPath: process.cwd() },
+        mode: 'create',
+        resultSchemaVersion: 1,
+        spawnCommand: () => {
+          throw error
+        }
+      })
+    ).rejects.toBe(error)
+  })
+
+  it.each(['close', 'error'])(
+    'releases capture storage after %s while preserving late callbacks',
+    async (event) => {
+      if (!global.gc) {
+        throw new Error('This regression requires --expose-gc')
+      }
+      const fixture = fakeCommand(128 * 1024)
+      const allocations: WeakRef<Buffer>[] = []
+      const allocUnsafe = Buffer.allocUnsafe
+      const allocationSpy = vi.spyOn(Buffer, 'allocUnsafe').mockImplementation((size) => {
+        const bytes = allocUnsafe(size)
+        allocations.push(new WeakRef(bytes))
+        return bytes
+      })
+      for (let index = 0; index < 3; index++) {
+        fixture.child.stdout.emit('data', Buffer.from('a'.repeat(4096)))
+        fixture.child.stderr.emit('data', Buffer.from('b'.repeat(4096)))
+      }
+      allocationSpy.mockRestore()
+      if (event === 'error') {
+        fixture.child.emit('error', new Error('recipe failed'))
+        await expect(fixture.result).rejects.toThrow('recipe failed')
+      } else {
+        fixture.child.emit('close', 0, null)
+        await expect(fixture.result).resolves.toMatchObject({
+          stdout: 'a'.repeat(3 * 4096),
+          stderr: 'b'.repeat(3 * 4096)
+        })
+      }
+      for (let turn = 0; turn < 3; turn++) {
+        await setImmediate()
+        global.gc()
+      }
+      expect(allocations.length).toBeGreaterThan(0)
+      expect(allocations.filter((ref) => ref.deref() !== undefined)).toHaveLength(0)
+      const { counts } = countCaptureWork()
+      fixture.child.stdout.emit('data', Buffer.from('late stdout'))
+      fixture.child.stderr.emit('data', Buffer.from('late stderr'))
+      fixture.child.emit('close', 1, null)
+      expect(counts).toEqual({ appendedBytes: 0, decodedBytes: 0, decodeCalls: 0 })
+      expect(fixture.stdoutChunks.at(-1)).toBe('late stdout')
+      expect(fixture.stderrChunks.at(-1)).toBe('late stderr')
+    }
+  )
+
+  it('decodes once per stream when force-kill closes synchronously', async () => {
+    vi.useFakeTimers()
+    const controller = new AbortController()
+    const fixture = fakeCommand(8, controller.signal)
+    fixture.child.kill.mockImplementation((signal) => {
+      if (signal === 'SIGKILL') {
+        fixture.child.emit('close', null, 'SIGKILL')
+      }
+      return true
+    })
+    fixture.child.stdout.emit('data', Buffer.from('before😀'))
+    const { counts } = countCaptureWork()
+    controller.abort()
+    await vi.advanceTimersByTimeAsync(5000)
+    await expect(fixture.result).resolves.toEqual({
+      stdout: 'fore😀',
+      stderr: '',
+      exitCode: null,
+      signal: 'SIGKILL',
+      aborted: true
+    })
+    expect(vi.getTimerCount()).toBe(0)
+    expect(counts.decodeCalls).toBe(2)
+  })
+
+  it.each([
+    { limit: undefined, expected: DEFAULT_MAX_CAPTURE_BYTES },
+    { limit: 1024, expected: 1024 },
+    { limit: 1.5, expected: 1 },
+    { limit: 4.5, expected: 4 },
+    { limit: 0, expected: 0 },
+    { limit: -1, expected: 0 },
+    { limit: -Infinity, expected: 0 },
+    { limit: Number.NaN, expected: DEFAULT_MAX_CAPTURE_BYTES },
+    { limit: Infinity, expected: DEFAULT_MAX_CAPTURE_BYTES },
+    { limit: Number.MAX_VALUE, expected: DEFAULT_MAX_CAPTURE_BYTES }
+  ])('clamps a $limit capture limit to a bounded byte count', ({ limit, expected }) => {
+    expect(clampRecipeCaptureBytes(limit)).toBe(expected)
+  })
+})
diff --git a/src/shared/ephemeral-vm-recipe-process.ts b/src/shared/ephemeral-vm-recipe-process.ts
index 30d44ac1dbce..e943567095c0 100644
--- a/src/shared/ephemeral-vm-recipe-process.ts
+++ b/src/shared/ephemeral-vm-recipe-process.ts
@@ -1,8 +1,10 @@
 import { spawn, type ChildProcessWithoutNullStreams } from 'node:child_process'
+import { StringDecoder } from 'node:string_decoder'
 import type { EphemeralVmRecipeContext } from './ephemeral-vm-recipe-runner'
 import { admitProcessTreeKill } from './child-process/process-tree-kill-gate'
+import { GrowingByteBuffer } from './growing-byte-buffer'
 
-const DEFAULT_MAX_CAPTURE_BYTES = 1024 * 1024
+export const DEFAULT_MAX_CAPTURE_BYTES = 1024 * 1024
 const CANCEL_FORCE_KILL_DELAY_MS = 5_000
 
 export type ProcessRunResult = {
@@ -37,7 +39,7 @@ export async function runRecipeCommand(args: {
   onStderr?: (chunk: string) => void
   spawnCommand?: typeof spawn
 }): Promise<ProcessRunResult> {
-  const maxBytes = args.maxCaptureBytes ?? DEFAULT_MAX_CAPTURE_BYTES
+  const maxBytes = clampRecipeCaptureBytes(args.maxCaptureBytes)
   const spawnCommand = args.spawnCommand ?? spawn
 
   return new Promise((resolve, reject) => {
@@ -55,12 +57,12 @@ export async function runRecipeCommand(args: {
       return
     }
 
-    let stdout = ''
-    let stderr = ''
+    const stdout = new GrowingByteBuffer()
+    const stderr = new GrowingByteBuffer()
     let settled = false
     let aborted = false
     let forceKillTimer: ReturnType<typeof setTimeout> | undefined
-    const finish = (result: ProcessRunResult): void => {
+    const finish = (result: Omit<ProcessRunResult, 'stdout' | 'stderr'>): void => {
       if (settled) {
         return
       }
@@ -69,7 +71,7 @@ export async function runRecipeCommand(args: {
         clearTimeout(forceKillTimer)
       }
       args.signal?.removeEventListener('abort', abort)
-      resolve(result)
+      resolve({ stdout: takeRetainedTail(stdout), stderr: takeRetainedTail(stderr), ...result })
     }
     const fail = (error: Error): void => {
       if (settled) {
@@ -80,6 +82,8 @@ export async function runRecipeCommand(args: {
         clearTimeout(forceKillTimer)
       }
       args.signal?.removeEventListener('abort', abort)
+      stdout.clear()
+      stderr.clear()
       reject(error)
     }
     const abort = (): void => {
@@ -92,7 +96,7 @@ export async function runRecipeCommand(args: {
           return
         }
         killRecipeProcess(child, true)
-        finish({ stdout, stderr, exitCode: null, signal: null, aborted: true })
+        finish({ exitCode: null, signal: null, aborted: true })
         child.stdin.destroy()
         child.stdout.destroy()
         child.stderr.destroy()
@@ -102,21 +106,37 @@ export async function runRecipeCommand(args: {
       killRecipeProcess(child)
     }
 
-    child.stdout.setEncoding('utf8')
-    child.stderr.setEncoding('utf8')
-    child.stdout.on('data', (chunk: string) => {
-      stdout = appendBounded(stdout, chunk, maxBytes)
-      args.onStdout?.(chunk)
-    })
-    child.stderr.on('data', (chunk: string) => {
-      stderr = appendBounded(stderr, chunk, maxBytes)
-      args.onStderr?.(chunk)
-    })
+    // No setEncoding: the retained tail stays raw bytes, and a per-stream StringDecoder gives the
+    // callbacks the same character boundaries setEncoding would have (it uses the same decoder).
+    const stdoutDecoder = new StringDecoder('utf8')
+    const stderrDecoder = new StringDecoder('utf8')
+    const capture = (
+      buffer: GrowingByteBuffer,
+      decoder: StringDecoder,
+      chunk: Buffer,
+      forward: ((chunk: string) => void) | undefined
+    ): void => {
+      if (!settled) {
+        buffer.appendRetainedSuffix(chunk, maxBytes)
+      }
+      if (!forward) {
+        return
+      }
+      const decoded = decoder.write(chunk)
+      if (decoded.length > 0) {
+        forward(decoded)
+      }
+    }
+    child.stdout.on('data', (chunk: Buffer) => capture(stdout, stdoutDecoder, chunk, args.onStdout))
+    child.stderr.on('data', (chunk: Buffer) => capture(stderr, stderrDecoder, chunk, args.onStderr))
+    // setEncoding flushes its decoder at end-of-stream; keep that final replacement character.
+    child.stdout.on('end', () => flushDecoder(stdoutDecoder, args.onStdout))
+    child.stderr.on('end', () => flushDecoder(stderrDecoder, args.onStderr))
     child.on('error', (error) => {
       fail(error)
     })
     child.on('close', (exitCode, signal) => {
-      finish({ stdout, stderr, exitCode, signal, ...(aborted ? { aborted: true } : {}) })
+      finish({ exitCode, signal, ...(aborted ? { aborted: true } : {}) })
     })
 
     if (args.signal?.aborted) {
@@ -133,6 +153,38 @@ export async function runRecipeCommand(args: {
   })
 }
 
+/** No production caller overrides the cap, so odd values are clamped rather than coerced per chunk. */
+export function clampRecipeCaptureBytes(value: number | undefined): number {
+  if (value === undefined || Number.isNaN(value)) {
+    return DEFAULT_MAX_CAPTURE_BYTES
+  }
+  if (value <= 0) {
+    return 0
+  }
+  const floored = Math.floor(value)
+  return Number.isSafeInteger(floored) ? floored : DEFAULT_MAX_CAPTURE_BYTES
+}
+
+// Retention cuts on a byte boundary, so drop the partial sequence the old per-chunk trim removed.
+function takeRetainedTail(buffer: GrowingByteBuffer): string {
+  const bytes = buffer.takeBuffer()
+  let start = 0
+  while (start < bytes.byteLength && (bytes[start]! & 0xc0) === 0x80) {
+    start += 1
+  }
+  return bytes.toString('utf8', start)
+}
+
+function flushDecoder(
+  decoder: StringDecoder,
+  forward: ((chunk: string) => void) | undefined
+): void {
+  const trailing = decoder.end()
+  if (trailing.length > 0) {
+    forward?.(trailing)
+  }
+}
+
 /** Exported for the refusal-fallback test; the abort path is otherwise unreachable. */
 export function killRecipeProcess(child: ChildProcessWithoutNullStreams, force = false): void {
   const signal = force ? 'SIGKILL' : 'SIGTERM'
@@ -199,26 +251,3 @@ function buildRecipeEnv(
     ORCA_VERSION: context.orcaVersion ?? ''
   }
 }
-
-function appendBounded(current: string, chunk: string, maxBytes: number): string {
-  if (maxBytes <= 0) {
-    return ''
-  }
-  const chunkBytes = Buffer.byteLength(chunk, 'utf8')
-  if (chunkBytes >= maxBytes) {
-    return utf8Tail(chunk, maxBytes)
-  }
-  return utf8Tail(current, maxBytes - chunkBytes) + chunk
-}
-
-function utf8Tail(value: string, maxBytes: number): string {
-  const bytes = Buffer.from(value, 'utf8')
-  if (bytes.byteLength <= maxBytes) {
-    return value
-  }
-  let start = bytes.byteLength - maxBytes
-  while (start < bytes.byteLength && (bytes[start]! & 0xc0) === 0x80) {
-    start += 1
-  }
-  return bytes.subarray(start).toString('utf8')
-}
diff --git a/src/shared/freebuff-launch.test.ts b/src/shared/freebuff-launch.test.ts
new file mode 100644
index 000000000000..b58dc4bd0917
--- /dev/null
+++ b/src/shared/freebuff-launch.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it } from 'vitest'
+import { buildAgentDraftLaunchPlan, buildAgentStartupPlan } from './tui-agent-startup'
+import { isExpectedAgentProcess, recognizeAgentProcess } from './agent-process-recognition'
+import { pickTuiAgent } from './tui-agent-selection'
+
+describe('Freebuff terminal launches', () => {
+  it.each(['darwin', 'linux', 'win32'] as const)(
+    'delivers task text through the interactive terminal on %s',
+    (platform) => {
+      const prompt = '--help\nFix "quoted" paths and $HOME handling'
+      const plan = buildAgentStartupPlan({
+        agent: 'freebuff',
+        prompt,
+        cmdOverrides: {},
+        platform
+      })
+      expect(plan).toMatchObject({
+        launchCommand: 'freebuff',
+        expectedProcess: 'freebuff',
+        followupPrompt: prompt
+      })
+      expect(
+        buildAgentDraftLaunchPlan({
+          agent: 'freebuff',
+          draft: prompt,
+          cmdOverrides: {},
+          platform
+        })
+      ).toBeNull()
+    }
+  )
+
+  it('uses the same launch contract on SSH hosts', () => {
+    expect(
+      buildAgentStartupPlan({
+        agent: 'freebuff',
+        prompt: 'Inspect this folder',
+        cmdOverrides: {},
+        platform: 'linux',
+        isRemote: true
+      })
+    ).toMatchObject({ launchCommand: 'freebuff', followupPrompt: 'Inspect this folder' })
+  })
+
+  it.each(['/usr/local/bin/freebuff', 'C:\\tools\\freebuff.exe'])(
+    'recognizes %s separately from Codebuff',
+    (processName) => {
+      expect(recognizeAgentProcess(processName)?.agent).toBe('freebuff')
+      expect(isExpectedAgentProcess(processName, 'codebuff')).toBe(false)
+    }
+  )
+
+  it('honors independent installation and disabled-agent preferences', () => {
+    expect(pickTuiAgent('freebuff', ['freebuff', 'codebuff'])).toBe('freebuff')
+    expect(pickTuiAgent(null, ['freebuff'])).toBe('freebuff')
+    expect(pickTuiAgent('freebuff', ['freebuff', 'codebuff'], ['freebuff'])).toBe('codebuff')
+  })
+})
diff --git a/src/shared/freebuff-screen-status.ts b/src/shared/freebuff-screen-status.ts
new file mode 100644
index 000000000000..e5f18472a7d4
--- /dev/null
+++ b/src/shared/freebuff-screen-status.ts
@@ -0,0 +1,152 @@
+import type { ParsedAgentStatusPayload } from './agent-status-types'
+import { extractLastOscTitle } from './osc-title-extraction'
+import { extractOscTitleScanTail } from './osc-title-scan-tail'
+import { advancePartialEscapeTail } from './terminal-partial-escape-tail'
+
+export function splitFreebuffScreenUpdates(data: string, pendingEscape: string): string[] {
+  const input = pendingEscape + data
+  const chunks: string[] = []
+  let start = 0
+  // oxlint-disable-next-line no-control-regex -- Terminal protocol delimiters contain ESC and BEL.
+  for (const match of input.matchAll(/\x1b\[\?2026l/g)) {
+    const end = match.index + match[0].length - pendingEscape.length
+    if (end > start) {
+      chunks.push(data.slice(start, end))
+    }
+    start = Math.max(start, end)
+  }
+  if (start < data.length) {
+    chunks.push(data.slice(start))
+  }
+  return chunks
+}
+
+function cleanBoxLine(line: string): string {
+  return line.replace(/^[│┃\s]+|[│┃\s]+$/g, '').trim()
+}
+
+/** Reads the live composer area, never status words in the conversation above it. */
+export function readFreebuffScreenStatus(
+  lines: readonly string[],
+  alternate: boolean
+): Omit<ParsedAgentStatusPayload, 'prompt' | 'agentType'> | null {
+  const text = lines.join('\n')
+  if (!alternate) {
+    if (
+      /freebuff found agent files in this repository/.test(text) &&
+      /Load and run these\? \[y\/N\]/.test(text)
+    ) {
+      return { state: 'blocked', toolInput: 'Trust repository agent files? [y/N]' }
+    }
+    return null
+  }
+  if (/Press ENTER to login\.\.\./.test(text)) {
+    return { state: 'blocked', toolInput: 'Sign in to Freebuff' }
+  }
+  const footer = lines.findLastIndex((line) => /\/model\s+to change.*Chat:/.test(line))
+  if (footer === -1) {
+    return null
+  }
+  const dialog = lines.findLastIndex((line) => /[╭─].*Some questions for you.*[─╮]/.test(line))
+  if (
+    dialog !== -1 &&
+    dialog < footer &&
+    /↑↓ navigate/.test(lines.slice(dialog, footer).join('\n'))
+  ) {
+    const body = lines.slice(dialog + 1, footer).map(cleanBoxLine)
+    const question = body.find((line) => /^[▼▶▸▾►]/.test(line))?.replace(/^[▼▶▸▾►]\s*/, '')
+    const options = body.flatMap((line) => {
+      const match = /^[○●]\s+(.+)$/.exec(line)
+      return match ? [{ label: match[1], description: '' }] : []
+    })
+    return {
+      state: 'waiting',
+      toolName: 'ask_user',
+      toolInput: question ?? 'Freebuff is waiting for an answer',
+      ...(question
+        ? { interactivePrompt: JSON.stringify({ questions: [{ question, options }] }) }
+        : {})
+    }
+  }
+  const composerTop = lines.findLastIndex(
+    (line, index) => index < footer && /^\s*╭─+╮\s*$/.test(line)
+  )
+  if (composerTop === -1 || footer - composerTop > 12) {
+    return null
+  }
+  const status = lines[composerTop - 1]?.trim() ?? ''
+  if (
+    /^(?:thinking|working|connecting|retrying)\.\.\./.test(status) ||
+    status.startsWith('high demand — in line')
+  ) {
+    return { state: 'working' }
+  }
+  if (status === '' && text.includes('Your first message starts the session.')) {
+    return { state: 'done', sessionBoundary: true }
+  }
+  if (/^(?:\d+[hms]\s*)+left\b|^unlimited\b/.test(status) && /End session/.test(status)) {
+    return { state: 'done' }
+  }
+  return null
+}
+
+/** One observation stream per execution-host terminal; recreated with its screen model. */
+export class FreebuffScreenStatusTracker {
+  private titleTail = ''
+  private frameTail = ''
+  private insideFrame = false
+  private identified: boolean
+  private prompt = ''
+  private previous: string | null = null
+  private worked = false
+
+  constructor(identified = false) {
+    this.identified = identified
+  }
+
+  observe(
+    data: string,
+    readScreen: () => { lines: readonly string[]; alternate: boolean }
+  ): ParsedAgentStatusPayload | null {
+    const titleInput = this.titleTail + data
+    this.titleTail = extractOscTitleScanTail(titleInput)
+    const title = extractLastOscTitle(titleInput)
+    if (title?.startsWith('Freebuff: ')) {
+      this.identified = true
+      this.prompt = title.slice('Freebuff: '.length)
+    }
+    const frameInput = this.frameTail + data
+    // oxlint-disable-next-line no-control-regex -- Terminal protocol delimiters contain ESC and BEL.
+    for (const match of frameInput.matchAll(/\x1b\[\?2026([hl])/g)) {
+      this.insideFrame = match[1] === 'h'
+    }
+    this.frameTail = advancePartialEscapeTail(this.frameTail, data)
+    if (!this.identified || this.insideFrame || this.frameTail.length > 0) {
+      return null
+    }
+    const { lines, alternate } = readScreen()
+    const result = readFreebuffScreenStatus(lines, alternate)
+    if (!result) {
+      return null
+    }
+    if (result.sessionBoundary) {
+      this.prompt = ''
+      this.worked = false
+    }
+    const payload: ParsedAgentStatusPayload = {
+      ...result,
+      agentType: 'freebuff',
+      prompt: this.prompt,
+      ...(result.state === 'done' && !this.worked ? { sessionBoundary: true } : {})
+    }
+    if (result.state === 'working' || result.state === 'waiting') {
+      this.worked = true
+    }
+    const signature = JSON.stringify(payload)
+    if (signature === this.previous) {
+      return null
+    }
+    this.previous = signature
+    return payload
+  }
+}
diff --git a/src/shared/freebuff-startup.test.ts b/src/shared/freebuff-startup.test.ts
new file mode 100644
index 000000000000..2d614c53d1a4
--- /dev/null
+++ b/src/shared/freebuff-startup.test.ts
@@ -0,0 +1,56 @@
+import { describe, expect, it } from 'vitest'
+import { buildAgentStartupPlan } from './tui-agent-startup'
+
+describe('Freebuff startup', () => {
+  it.each([
+    ['darwin', 'posix', false],
+    ['linux', 'posix', false],
+    ['win32', 'powershell', false],
+    ['win32', 'cmd', false],
+    ['linux', 'posix', true]
+  ] as const)('delivers prompts after launch on %s/%s (remote=%s)', (platform, shell, isRemote) => {
+    const prompt = 'Review "quoted paths"; $(echo task)\nThen explain the changes.'
+    const plan = buildAgentStartupPlan({
+      agent: 'freebuff',
+      prompt,
+      cmdOverrides: { codebuff: 'codebuff --debug' },
+      platform,
+      shell,
+      isRemote
+    })
+
+    expect(plan).toMatchObject({
+      agent: 'freebuff',
+      launchCommand: 'freebuff',
+      expectedProcess: 'freebuff',
+      followupPrompt: prompt
+    })
+  })
+
+  it('keeps Freebuff command overrides separate from Codebuff', () => {
+    const cmdOverrides = { freebuff: 'freebuff --debug' }
+    const freebuff = buildAgentStartupPlan({
+      agent: 'freebuff',
+      prompt: '',
+      allowEmptyPromptLaunch: true,
+      cmdOverrides,
+      platform: 'linux',
+      isRemote: true
+    })
+    const codebuff = buildAgentStartupPlan({
+      agent: 'codebuff',
+      prompt: '',
+      allowEmptyPromptLaunch: true,
+      cmdOverrides,
+      platform: 'linux',
+      isRemote: true
+    })
+
+    expect(freebuff).toMatchObject({
+      launchCommand: 'freebuff --debug',
+      expectedProcess: 'freebuff',
+      followupPrompt: null
+    })
+    expect(codebuff).toMatchObject({ launchCommand: 'codebuff', expectedProcess: 'codebuff' })
+  })
+})
diff --git a/src/shared/git-remote-identity.test.ts b/src/shared/git-remote-identity.test.ts
index cc4fa4dff57f..a159f5d39d9d 100644
--- a/src/shared/git-remote-identity.test.ts
+++ b/src/shared/git-remote-identity.test.ts
@@ -51,6 +51,25 @@ describe('normalizeGitRemoteUrl', () => {
 })
 
 describe('deriveGitRemoteIdentity', () => {
+  it.each(['blob:none', 'blob:limit=1024', 'tree:0'])(
+    'prefers a partial-clone origin with filter %s over contributor remotes',
+    (filter) => {
+      expect(
+        deriveGitRemoteIdentity(
+          [
+            'amoaba\thttps://github.com/AmoabaKelvin/orca.git (fetch)',
+            `origin\thttps://github.com/stablyai/orca.git (fetch) [${filter}]`,
+            'origin\thttps://github.com/another/orca.git (push)'
+          ].join('\r\n')
+        )
+      ).toEqual({
+        canonicalKey: 'github.com/stablyai/orca',
+        remoteName: 'origin',
+        remoteUrl: 'https://github.com/stablyai/orca.git'
+      })
+    }
+  )
+
   it('prefers upstream, then origin, then the first named remote', () => {
     expect(
       deriveGitRemoteIdentity(
diff --git a/src/shared/git-remote-identity.ts b/src/shared/git-remote-identity.ts
index bc221157a2e5..c4c215e125da 100644
--- a/src/shared/git-remote-identity.ts
+++ b/src/shared/git-remote-identity.ts
@@ -95,10 +95,8 @@ export function parseGitRemoteVerboseOutput(stdout: string): GitRemoteEntry[] {
   const entries: GitRemoteEntry[] = []
   for (const rawLine of stdout.split(/\r?\n/)) {
     const line = rawLine.trim()
-    if (!line.endsWith('(fetch)')) {
-      continue
-    }
-    const match = /^(\S+)\s+(.+?)\s+\(fetch\)$/.exec(line)
+    // Partial clones append their object filter after the fetch marker.
+    const match = /^(\S+)\s+(.+?)\s+\(fetch\)(?:\s+\[[^\]\r\n]*\])?$/.exec(line)
     if (!match) {
       continue
     }
diff --git a/src/shared/global-settings-types.ts b/src/shared/global-settings-types.ts
index e1acba87d50c..6cfd9b42d7a0 100644
--- a/src/shared/global-settings-types.ts
+++ b/src/shared/global-settings-types.ts
@@ -427,6 +427,8 @@ export type GlobalSettings = {
   agentYoloDefaultsMigrated?: boolean
   /** Why: disabling must persist so startup doesn't reinstall global agent hook entries the user just removed. */
   agentStatusHooksEnabled: boolean
+  /** Why: Codex's shared server runs every tab's hooks with the first tab's env; off opts new terminals back into it. Absent reads as on. */
+  codexTerminalServerIsolation?: boolean
   /** Dismissed freshness tuples: no write authority, just suppress re-nudging the same official placement/revision. */
   dismissedSkillFreshnessNudges?: string[]
   /** Why: generated tab titles are subjective, so they stay opt-in and manual renames win. */
diff --git a/src/shared/grouped-by.ts b/src/shared/grouped-by.ts
new file mode 100644
index 000000000000..0797dca96201
--- /dev/null
+++ b/src/shared/grouped-by.ts
@@ -0,0 +1,14 @@
+// Not `Map.groupBy`: the relay runs this core on Node 18, which lacks it.
+export function groupedBy<T, K>(items: readonly T[], keyOf: (item: T) => K): Map<K, T[]> {
+  const groups = new Map<K, T[]>()
+  for (const item of items) {
+    const key = keyOf(item)
+    const group = groups.get(key)
+    if (group) {
+      group.push(item)
+    } else {
+      groups.set(key, [item])
+    }
+  }
+  return groups
+}
diff --git a/src/shared/growing-byte-buffer.test.ts b/src/shared/growing-byte-buffer.test.ts
index 731da290c053..988d63bb2ae9 100644
--- a/src/shared/growing-byte-buffer.test.ts
+++ b/src/shared/growing-byte-buffer.test.ts
@@ -65,4 +65,31 @@ describe('GrowingByteBuffer', () => {
 
     expect(buffer.toString()).toBe('345678')
   })
+
+  it('reads and writes correctly after the head offset has advanced', () => {
+    const buffer = new GrowingByteBuffer()
+    buffer.append(Buffer.from('aaa\nbbb\nccc'))
+
+    expect(buffer.takePrefixString(buffer.indexOfByte(0x0a))).toBe('aaa')
+    buffer.discardPrefix(1)
+    expect(buffer.indexOfByte(0x0a)).toBe(3)
+    expect(buffer.byteLength).toBe(7)
+    buffer.append(Buffer.from('!'))
+    expect(buffer.toString()).toBe('bbb\nccc!')
+    expect(buffer.takeBuffer()).toEqual(Buffer.from('bbb\nccc!'))
+    expect(buffer.byteLength).toBe(0)
+  })
+
+  it('keeps a bounded suffix stable across many small appends without unbounded growth', () => {
+    const buffer = new GrowingByteBuffer()
+    let expected = ''
+    for (let index = 0; index < 5_000; index += 1) {
+      const chunk = String(index % 10).repeat(3)
+      buffer.appendRetainedSuffix(Buffer.from(chunk), 64)
+      expected = (expected + chunk).slice(-64)
+    }
+
+    expect(buffer.byteLength).toBe(64)
+    expect(buffer.takeString()).toBe(expected)
+  })
 })
diff --git a/src/shared/growing-byte-buffer.ts b/src/shared/growing-byte-buffer.ts
index beba2cd02d68..bbcdab4ba309 100644
--- a/src/shared/growing-byte-buffer.ts
+++ b/src/shared/growing-byte-buffer.ts
@@ -1,5 +1,7 @@
 export class GrowingByteBuffer {
   private storage = Buffer.alloc(0)
+  // Live bytes are storage[start, start + length); the head offset keeps prefix discards O(1).
+  private start = 0
   private length = 0
 
   get byteLength(): number {
@@ -11,16 +13,13 @@ export class GrowingByteBuffer {
       return
     }
     const required = this.length + bytes.byteLength
-    if (required > this.storage.byteLength) {
-      const capacity = Math.max(required, Math.max(256, this.storage.byteLength * 2))
-      const next = Buffer.allocUnsafe(capacity)
-      this.storage.copy(next, 0, 0, this.length)
-      this.storage = next
+    if (this.start + required > this.storage.byteLength) {
+      this.reclaimHeadRoom(required)
     }
     const source = Buffer.isBuffer(bytes)
       ? bytes
       : Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength)
-    source.copy(this.storage, this.length)
+    source.copy(this.storage, this.start + this.length)
     this.length = required
   }
 
@@ -37,26 +36,23 @@ export class GrowingByteBuffer {
       : Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength)
     if (source.byteLength >= maxBytes) {
       this.storage = Buffer.from(source.subarray(source.byteLength - maxBytes))
+      this.start = 0
       this.length = maxBytes
       return
     }
-    const retainedBytes = Math.min(this.length, maxBytes - source.byteLength)
-    if (retainedBytes < this.length) {
-      this.storage.copy(this.storage, 0, this.length - retainedBytes, this.length)
-      this.length = retainedBytes
-    }
+    this.retainSuffix(maxBytes - source.byteLength)
     this.append(source)
   }
 
   indexOfByte(value: number, byteOffset = 0): number {
-    return this.storage.subarray(0, this.length).indexOf(value, byteOffset)
+    return this.storage.subarray(this.start, this.start + this.length).indexOf(value, byteOffset)
   }
 
   takePrefixString(byteLength: number, encoding: BufferEncoding = 'utf8'): string {
     if (!Number.isSafeInteger(byteLength) || byteLength < 0 || byteLength > this.length) {
       throw new RangeError('Prefix length exceeds retained bytes')
     }
-    const value = this.storage.toString(encoding, 0, byteLength)
+    const value = this.storage.toString(encoding, this.start, this.start + byteLength)
     this.discardPrefix(byteLength)
     return value
   }
@@ -65,11 +61,11 @@ export class GrowingByteBuffer {
     if (!Number.isSafeInteger(byteLength) || byteLength < 0 || byteLength > this.length) {
       throw new RangeError('Prefix length exceeds retained bytes')
     }
-    if (byteLength === 0) {
-      return
-    }
-    this.storage.copy(this.storage, 0, byteLength, this.length)
+    this.start += byteLength
     this.length -= byteLength
+    if (this.length === 0) {
+      this.start = 0
+    }
   }
 
   retainSuffix(maxBytes: number): void {
@@ -79,12 +75,15 @@ export class GrowingByteBuffer {
     if (this.length <= maxBytes) {
       return
     }
-    this.storage.copy(this.storage, 0, this.length - maxBytes, this.length)
+    this.start += this.length - maxBytes
     this.length = maxBytes
+    if (this.length === 0) {
+      this.start = 0
+    }
   }
 
   toString(encoding: BufferEncoding = 'utf8'): string {
-    return this.storage.toString(encoding, 0, this.length)
+    return this.storage.toString(encoding, this.start, this.start + this.length)
   }
 
   takeString(encoding: BufferEncoding = 'utf8'): string {
@@ -95,13 +94,27 @@ export class GrowingByteBuffer {
 
   // Returns a view over the released storage, not a copy; the buffer never writes to it again.
   takeBuffer(): Buffer {
-    const value = this.storage.subarray(0, this.length)
+    const value = this.storage.subarray(this.start, this.start + this.length)
     this.clear()
     return value
   }
 
   clear(): void {
     this.storage = Buffer.alloc(0)
+    this.start = 0
     this.length = 0
   }
+
+  private reclaimHeadRoom(required: number): void {
+    // Slide the live bytes down while they fit in half the storage; only grow when they do not.
+    if (required * 2 <= this.storage.byteLength) {
+      this.storage.copy(this.storage, 0, this.start, this.start + this.length)
+    } else {
+      const capacity = Math.max(required, Math.max(256, this.storage.byteLength * 2))
+      const next = Buffer.allocUnsafe(capacity)
+      this.storage.copy(next, 0, this.start, this.start + this.length)
+      this.storage = next
+    }
+    this.start = 0
+  }
 }
diff --git a/src/shared/host-balanced-listing-scaling.test.ts b/src/shared/host-balanced-listing-scaling.test.ts
index 0a0d2a093bf3..3d33e54da849 100644
--- a/src/shared/host-balanced-listing-scaling.test.ts
+++ b/src/shared/host-balanced-listing-scaling.test.ts
@@ -8,26 +8,26 @@ it('retires exhausted host buckets from subsequent listing rounds', () => {
   ]
   const original = Map.prototype.values
   let reads = 0
-  const spy = vi
-    .spyOn(Map.prototype, 'values')
-    .mockImplementation(function (this: Map<string, number[]>) {
-      const iterator = original.call(this)
-      if (!this.has('large-host')) {
-        return iterator
-      }
-      return iterator.map(
-        (bucket: number[]) =>
-          new Proxy(bucket, {
-            get(target, key, receiver) {
-              if (typeof key === 'string' && /^\d+$/.test(key)) {
-                reads += 1
-              }
-              // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
-              return Reflect.get(target, key, receiver)
+  const spy = vi.spyOn(Map.prototype, 'values').mockImplementation(function (
+    this: Map<string, number[]>
+  ) {
+    const iterator = original.call(this)
+    if (!this.has('large-host')) {
+      return iterator
+    }
+    return iterator.map(
+      (bucket: number[]) =>
+        new Proxy(bucket, {
+          get(target, key, receiver) {
+            if (typeof key === 'string' && /^\d+$/.test(key)) {
+              reads += 1
             }
-          })
-      )
-    })
+            // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
+            return Reflect.get(target, key, receiver)
+          }
+        })
+    )
+  })
   let result: typeof rows
   try {
     result = selectHostBalancedPage(rows, 2000, (row) => row.host)
diff --git a/src/shared/linear/links.test.ts b/src/shared/linear/links.test.ts
index 48005d93d062..71148426e740 100644
--- a/src/shared/linear/links.test.ts
+++ b/src/shared/linear/links.test.ts
@@ -49,6 +49,18 @@ describe('linear links', () => {
     expect(parseLinearIssueInput('eng-123')).toEqual({ identifier: 'ENG-123' })
   })
 
+  it('parses Linear team keys that start with a digit', () => {
+    expect(parseLinearIssueInput('4k-12')).toEqual({ identifier: '4K-12' })
+    expect(parseLinearIssueInput('https://linear.app/acme/issue/4K-12')).toEqual({
+      identifier: '4K-12',
+      organizationUrlKey: 'acme'
+    })
+  })
+
+  it('rejects bare identifiers with no letter in the team key', () => {
+    expect(parseLinearIssueInput('2026-09')).toBeNull()
+  })
+
   it('parses Linear issue URLs with organization URL keys', () => {
     expect(parseLinearIssueInput('https://linear.app/acme/issue/eng-123/fix-auth')).toEqual({
       identifier: 'ENG-123',
@@ -139,6 +151,19 @@ describe('buildLinearIssueLinkUpdates', () => {
     expectNoUndefinedValues(result as Record<string, unknown>)
   })
 
+  it('links digit-prefixed Linear team keys from bare identifiers and URLs', () => {
+    expect(buildLinearIssueLinkUpdates('4K-12')).toEqual({
+      linkedLinearIssue: '4K-12',
+      linkedLinearIssueWorkspaceId: null,
+      linkedLinearIssueOrganizationUrlKey: null
+    })
+    expect(buildLinearIssueLinkUpdates('https://linear.app/acme/issue/4K-12')).toEqual({
+      linkedLinearIssue: '4K-12',
+      linkedLinearIssueWorkspaceId: null,
+      linkedLinearIssueOrganizationUrlKey: 'acme'
+    })
+  })
+
   it('returns null for unparseable input', () => {
     expect(buildLinearIssueLinkUpdates('not an issue')).toBeNull()
     expect(buildLinearIssueLinkUpdates('https://github.com/o/r/issues/12')).toBeNull()
diff --git a/src/shared/linear/links.ts b/src/shared/linear/links.ts
index c4b7f6b2c52d..d6c7e080a519 100644
--- a/src/shared/linear/links.ts
+++ b/src/shared/linear/links.ts
@@ -70,7 +70,7 @@ export type LinearIssueLinkUpdates = {
   linkedLinearIssueOrganizationUrlKey: string | null
 }
 
-const LINEAR_IDENTIFIER_PATTERN = /^[A-Za-z][A-Za-z0-9_]*-\d+$/
+const LINEAR_IDENTIFIER_PATTERN = /^(?=[A-Za-z0-9_]*[A-Za-z])[A-Za-z0-9][A-Za-z0-9_]*-\d+$/
 
 export function parseLinearIssueInput(input: string): ParsedLinearIssueInput | null {
   const trimmed = input.trim()
diff --git a/src/shared/local-build-compatibility-contract.json b/src/shared/local-build-compatibility-contract.json
index 1f1b52fba9b1..2ea87a9fb24c 100644
--- a/src/shared/local-build-compatibility-contract.json
+++ b/src/shared/local-build-compatibility-contract.json
@@ -3,9 +3,9 @@
   "appId": "com.zpyoung.orca",
   "stateSchemaVersion": 1,
   "readableStateSchemaVersions": [1],
-  "daemonProtocolVersion": 36,
+  "daemonProtocolVersion": 37,
   "attachableDaemonProtocolVersions": [
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-    27, 28, 29, 30, 31, 32, 33, 34, 35, 36
+    27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37
   ]
 }
diff --git a/src/shared/local-build-compatibility-contract.ts b/src/shared/local-build-compatibility-contract.ts
index b9685dd4faf2..d77d6c5cfef1 100644
--- a/src/shared/local-build-compatibility-contract.ts
+++ b/src/shared/local-build-compatibility-contract.ts
@@ -3,9 +3,9 @@ export const LOCAL_BUILD_COMPATIBILITY_CONTRACT = {
   appId: 'com.zpyoung.orca',
   stateSchemaVersion: 1,
   readableStateSchemaVersions: [1],
-  daemonProtocolVersion: 36,
+  daemonProtocolVersion: 37,
   attachableDaemonProtocolVersions: [
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-    27, 28, 29, 30, 31, 32, 33, 34, 35, 36
+    27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37
   ]
 } as const
diff --git a/src/shared/main-process-ndjson-framer.ts b/src/shared/main-process-ndjson-framer.ts
index a348b9a4e39d..790f058b5c50 100644
--- a/src/shared/main-process-ndjson-framer.ts
+++ b/src/shared/main-process-ndjson-framer.ts
@@ -63,6 +63,8 @@ export function createIncrementalNdjsonFramer(
   options: IncrementalNdjsonFramerOptions = {}
 ): IncrementalNdjsonFramer {
   const maxLineBytes = Math.max(1, options.maxLineBytes ?? NDJSON_MAX_LINE_BYTES)
+  // No line can exceed an unbounded limit, so measuring segments and keeping a rejection prefix is dead work.
+  const unbounded = maxLineBytes === Number.POSITIVE_INFINITY
   const maxPendingInputBytes = Math.max(REJECTED_LINE_PREFIX_MAX_BYTES, maxLineBytes * 2)
   let lineSegments: string[] = []
   let lineBytes = 0
@@ -152,9 +154,11 @@ export function createIncrementalNdjsonFramer(
           return
         }
       } else {
-        const segmentBytes = Buffer.byteLength(segment, 'utf8')
+        const segmentBytes = unbounded ? 0 : Buffer.byteLength(segment, 'utf8')
         const nextLineBytes = lineBytes + segmentBytes
-        rememberPrefix(segment, segmentBytes)
+        if (!unbounded) {
+          rememberPrefix(segment, segmentBytes)
+        }
         if (nextLineBytes > maxLineBytes) {
           const rejected: NdjsonRejectedRecord = {
             kind: 'line-too-long',
diff --git a/src/shared/mobile-markdown-document.test.ts b/src/shared/mobile-markdown-document.test.ts
index f4d2a0032619..a44191edf914 100644
--- a/src/shared/mobile-markdown-document.test.ts
+++ b/src/shared/mobile-markdown-document.test.ts
@@ -3,6 +3,7 @@ import {
   hashMarkdownContent,
   isMarkdownContentByteLengthOverLimit,
   MOBILE_MARKDOWN_EDIT_MAX_BYTES,
+  MOBILE_MARKDOWN_READ_MAX_BYTES,
   utf8ByteLength
 } from './mobile-markdown-document'
 
@@ -45,4 +46,9 @@ describe('mobile markdown document byte accounting', () => {
   it('keeps content hashes prefixed with exact byte length', () => {
     expect(hashMarkdownContent('😀')).toMatch(/^content:4:/)
   })
+
+  it('keeps the read budget above the edit budget', () => {
+    // Behavioural pin for truncated => not editable: the bridge's over-budget read test.
+    expect(MOBILE_MARKDOWN_READ_MAX_BYTES).toBeGreaterThan(MOBILE_MARKDOWN_EDIT_MAX_BYTES)
+  })
 })
diff --git a/src/shared/mobile-markdown-document.ts b/src/shared/mobile-markdown-document.ts
index dced4bb8c851..14a6474cf5dc 100644
--- a/src/shared/mobile-markdown-document.ts
+++ b/src/shared/mobile-markdown-document.ts
@@ -1,6 +1,11 @@
 import { getClipboardTextByteLength, isClipboardTextByteLengthOverLimit } from './clipboard-text'
+import { clampUtf8TextPrefix } from './utf8-byte-limits'
 
 export const MOBILE_MARKDOWN_EDIT_MAX_BYTES = 256 * 1024
+/** Markdown preview budget; the file preview keeps its own. Above it a mobile read returns a
+ *  UTF-8-boundary prefix marked `truncated`, never a refusal. Sized like the 2 MiB terminal
+ *  snapshot; the relay splice frame cap is 8 MiB. */
+export const MOBILE_MARKDOWN_READ_MAX_BYTES = 2 * 1024 * 1024
 
 export type RuntimeMarkdownReadOnlyReason =
   | 'unsupported_preview'
@@ -46,6 +51,10 @@ export type RuntimeMarkdownReadTabResult = {
   source: 'draft' | 'file'
   editable: boolean
   readOnlyReason?: RuntimeMarkdownReadOnlyReason
+  /** Present only when `content` is a prefix; older phones ignore both fields. */
+  truncated?: boolean
+  /** The full document's UTF-8 size, sent with `truncated`. */
+  byteLength?: number
 }
 
 export type RuntimeMarkdownSaveTabResult = {
@@ -71,3 +80,19 @@ export function isMarkdownContentByteLengthOverLimit(content: string, maxBytes:
 export function utf8ByteLength(content: string): number {
   return getClipboardTextByteLength(content)
 }
+
+export function truncateMobileMarkdownRead(
+  content: string
+):
+  | { content: string; truncated: false }
+  | { content: string; truncated: true; byteLength: number } {
+  const byteLength = utf8ByteLength(content)
+  if (byteLength <= MOBILE_MARKDOWN_READ_MAX_BYTES) {
+    return { content, truncated: false }
+  }
+  return {
+    content: clampUtf8TextPrefix(content, MOBILE_MARKDOWN_READ_MAX_BYTES),
+    truncated: true,
+    byteLength
+  }
+}
diff --git a/src/shared/mobile-web-bundle/manifest-contract.test.ts b/src/shared/mobile-web-bundle/manifest-contract.test.ts
index c072b9de63be..089fb9c91491 100644
--- a/src/shared/mobile-web-bundle/manifest-contract.test.ts
+++ b/src/shared/mobile-web-bundle/manifest-contract.test.ts
@@ -11,6 +11,7 @@ import {
   MOBILE_WEB_BUNDLE_MAX_ROUTES,
   MOBILE_WEB_BUNDLE_MAX_TOTAL_BYTES,
   MOBILE_WEB_BUNDLE_SCHEMA_VERSION,
+  MOBILE_WEB_PAGE_VERSION,
   type MobileWebBundleAsset
 } from './manifest-contract'
 
@@ -104,6 +105,24 @@ describe('MobileWebBundleManifestSchema', () => {
   })
 })
 
+describe('the page version a manifest carries', () => {
+  it('takes a count, which is what a shell floors on', () => {
+    expect(
+      MobileWebBundleManifestSchema.safeParse(manifestOf([ENTRY], { pageVersion: 1 })).success
+    ).toBe(true)
+    for (const bad of [-1, 1.5, '1']) {
+      expect(
+        MobileWebBundleManifestSchema.safeParse(manifestOf([ENTRY], { pageVersion: bad })).success,
+        String(bad)
+      ).toBe(false)
+    }
+  })
+
+  it('is at least 1, so a manifest without one reads as older than every page that has one', () => {
+    expect(MOBILE_WEB_PAGE_VERSION).toBeGreaterThanOrEqual(1)
+  })
+})
+
 describe('the page routes a manifest declares', () => {
   function withRoutes(routes: unknown): boolean {
     return MobileWebBundleManifestSchema.safeParse(manifestOf([ENTRY], { routes })).success
diff --git a/src/shared/mobile-web-bundle/manifest-contract.ts b/src/shared/mobile-web-bundle/manifest-contract.ts
index 644c0dc1e095..e12443cb7a23 100644
--- a/src/shared/mobile-web-bundle/manifest-contract.ts
+++ b/src/shared/mobile-web-bundle/manifest-contract.ts
@@ -4,6 +4,12 @@ import { sha256 } from '../sha256'
 /** A reader that sees another value must reject rather than guess at the shape. */
 export const MOBILE_WEB_BUNDLE_SCHEMA_VERSION = 1 as const
 
+/**
+ * The page's build number, written into every manifest. A shell requires a page at least as new as
+ * its own floor and walls an older desktop; bump this when a shell stops handling an older page.
+ */
+export const MOBILE_WEB_PAGE_VERSION = 1
+
 /** The only stable-named asset, and the only one that references the content-addressed names. */
 export const MOBILE_WEB_BUNDLE_ENTRYPOINT = 'index.html'
 
@@ -259,6 +265,8 @@ export const MobileWebBundleManifestSchema = z
     desktopVersion: z.string().min(1).max(MAX_DESKTOP_VERSION_LENGTH),
     minCompatibleRuntimeProtocolVersion: z.number().int().nonnegative(),
     runtimeProtocolVersion: z.number().int().nonnegative(),
+    /** `MOBILE_WEB_PAGE_VERSION` at build time; absent from a desktop older than the field. */
+    pageVersion: z.number().int().nonnegative().optional(),
     entrypoint: z.literal(MOBILE_WEB_BUNDLE_ENTRYPOINT),
     totalBytes: z.number().int().nonnegative().max(MOBILE_WEB_BUNDLE_MAX_TOTAL_BYTES),
     assets: z.array(MobileWebBundleAssetSchema).min(1).max(MOBILE_WEB_BUNDLE_MAX_ASSETS),
diff --git a/src/shared/native-chat-ask-row.test.ts b/src/shared/native-chat-ask-row.test.ts
index f032f88c73f4..05cdcce29009 100644
--- a/src/shared/native-chat-ask-row.test.ts
+++ b/src/shared/native-chat-ask-row.test.ts
@@ -42,7 +42,7 @@ describe('native chat ask row', () => {
       nativeChatAskRunSubject([
         askCall({ questions: [{ question: 'Which branch?' }, { question: 'Proceed?' }] })
       ])
-    ).toEqual({ kind: 'count', count: 2 })
+    ).toEqual({ kind: 'questions', questions: ['Which branch?', 'Proceed?'] })
   })
 
   it('aggregates the per-question calls Codex journals for a single prompt', () => {
@@ -53,7 +53,7 @@ describe('native chat ask row', () => {
         askCall({ questions: [{ question: 'Which branch?' }] }, 'request_user_input'),
         askCall({ questions: [{ question: 'Proceed?' }] }, 'request_user_input')
       ])
-    ).toEqual({ kind: 'count', count: 2 })
+    ).toEqual({ kind: 'questions', questions: ['Which branch?', 'Proceed?'] })
   })
 
   it('decodes the JSON-string arguments Codex delivers', () => {
diff --git a/src/shared/native-chat-ask-row.ts b/src/shared/native-chat-ask-row.ts
index 4944e10e6490..6d92f244f8ef 100644
--- a/src/shared/native-chat-ask-row.ts
+++ b/src/shared/native-chat-ask-row.ts
@@ -9,16 +9,17 @@ import { pairToolBlocks } from './native-chat-tool-fold'
 
 export const NATIVE_CHAT_ASK_ROW_COPY = {
   awaiting: 'Awaiting user input:',
+  awaitingUnnamed: 'Awaiting user input',
   asked: 'Asked:',
   questionCount: '{{value0}} questions'
 } as const
 
-/** What the row names after its label: the question itself, or how many were
- *  asked. One row stands for the whole prompt, so a grouped prompt may not quote
- *  just its first question as though it were the only one. */
+/** What was asked: the one question, or every question of a grouped prompt. One
+ *  row stands for the whole prompt, so a grouped prompt names its count on the
+ *  line rather than quoting its first question as though it were the only one. */
 export type NativeChatAskRowSubject =
   | { kind: 'question'; text: string }
-  | { kind: 'count'; count: number }
+  | { kind: 'questions'; questions: string[] }
 
 /** Whether this block is a question tool call, and so is drawn as the awaiting
  *  row rather than as an ordinary tool line. */
@@ -93,7 +94,7 @@ export function nativeChatAskRunSubject(
     return null
   }
   if (questions.length > 1) {
-    return { kind: 'count', count: questions.length }
+    return { kind: 'questions', questions }
   }
   const text = questions[0]
   return text ? { kind: 'question', text } : null
diff --git a/src/shared/native-chat-empty-state.ts b/src/shared/native-chat-empty-state.ts
index 2797648afd0f..3ef7b1a19025 100644
--- a/src/shared/native-chat-empty-state.ts
+++ b/src/shared/native-chat-empty-state.ts
@@ -19,6 +19,11 @@ export const NATIVE_CHAT_EMPTY_STATE_COPY = {
     title: 'Could not load conversation',
     subtitle: 'The transcript could not be read. Toggle back to the terminal to keep working.'
   },
+  // The structured chat's read reconnects on its own; the terminal-backed read does not.
+  retryingError: {
+    title: 'Could not load conversation',
+    subtitle: 'The transcript could not be read. Orca keeps trying to load it.'
+  },
   notAgent: {
     title: 'No conversation here',
     subtitle: 'This terminal is not running a recognized coding agent.'
diff --git a/src/shared/native-chat-subagent-attribution.ts b/src/shared/native-chat-subagent-attribution.ts
new file mode 100644
index 000000000000..19619ec6c872
--- /dev/null
+++ b/src/shared/native-chat-subagent-attribution.ts
@@ -0,0 +1,42 @@
+// Whose words a transcript row carries, when they are not the session's own agent's.
+//
+// A session's subagents write into its journal, and the transcript keeps their rows
+// where they happened. Each such row names the subagent that wrote it, using the
+// label that subagent's spawn roster already gives it, so a child's words are never
+// read as its parent's. Shared so desktop and mobile name the same agent.
+
+import { agentJournalItemSubagentId } from './agent-session-journal-producer'
+import { isSubagentGroupBlock, type NativeChatMessage } from './native-chat-types'
+
+/** English copy: the desktop's i18n fallbacks, and mobile's text as-is. */
+export const NATIVE_CHAT_SUBAGENT_ATTRIBUTION_COPY = {
+  unnamed: 'Subagent',
+  writtenBy: 'Written by subagent {{value0}}'
+} as const
+
+/** Each subagent's roster label, by the id its rows carry. */
+export function nativeChatSubagentLabels(
+  messages: readonly NativeChatMessage[]
+): ReadonlyMap<string, string> {
+  const labels = new Map<string, string>()
+  for (const message of messages) {
+    for (const block of message.blocks) {
+      if (isSubagentGroupBlock(block)) {
+        for (const agent of block.agents) {
+          labels.set(agent.id, agent.label)
+        }
+      }
+    }
+  }
+  return labels
+}
+
+/** The roster's name for the subagent that wrote a row. Undefined for the
+ *  session's own rows, and for a subagent no loaded roster names. */
+export function nativeChatSubagentLabel(
+  labels: ReadonlyMap<string, string> | undefined,
+  message: NativeChatMessage
+): string | undefined {
+  const agentId = agentJournalItemSubagentId(message)
+  return agentId === null ? undefined : labels?.get(agentId)
+}
diff --git a/src/shared/native-chat-tool-fold.ts b/src/shared/native-chat-tool-fold.ts
index e08a722c2428..f3c72a45a6b2 100644
--- a/src/shared/native-chat-tool-fold.ts
+++ b/src/shared/native-chat-tool-fold.ts
@@ -8,6 +8,7 @@ import {
   type NativeChatToolCallBlock,
   type NativeChatToolResultBlock
 } from './native-chat-types'
+import { agentJournalItemSubagentId } from './agent-session-journal-producer'
 import { isKnownHarnessInjectedUserTurnText } from './harness-injected-user-turns'
 import { isNoiseMessage } from './native-chat-noise'
 
@@ -78,14 +79,23 @@ function dropUnattributableToolResults(message: NativeChatMessage): NativeChatMe
   return blocks.length > 0 ? { ...message, blocks } : null
 }
 
-/** Fold consecutive tool-only messages into their preceding assistant turn. */
+/** Fold consecutive tool-only messages into their preceding assistant turn.
+ *  Only into a run the same agent wrote: a subagent's calls interleave with its
+ *  parent's in one journal, and absorbing one into the other would present one
+ *  agent's work as the other's. */
 export function foldToolMessages(messages: readonly NativeChatMessage[]): NativeChatMessage[] {
   const output: NativeChatMessage[] = []
   let mutableAssistantIndex = -1
   let clonedAssistantIndex = -1
   for (const message of messages) {
-    if (isHarnessSidecarToolMessage(message) && mutableAssistantIndex >= 0) {
-      const index = mutableAssistantIndex
+    const foldTarget =
+      mutableAssistantIndex >= 0 &&
+      agentJournalItemSubagentId(output[mutableAssistantIndex]) ===
+        agentJournalItemSubagentId(message)
+        ? mutableAssistantIndex
+        : -1
+    if (isHarnessSidecarToolMessage(message) && foldTarget >= 0) {
+      const index = foldTarget
       const assistant = output[index]
       if (assistant?.role === 'assistant') {
         if (clonedAssistantIndex !== index) {
@@ -100,8 +110,8 @@ export function foldToolMessages(messages: readonly NativeChatMessage[]): Native
         continue
       }
     }
-    if (isToolOnlyMessage(message) && mutableAssistantIndex >= 0) {
-      const index = mutableAssistantIndex
+    if (isToolOnlyMessage(message) && foldTarget >= 0) {
+      const index = foldTarget
       const assistant = output[index]
       if (assistant?.role !== 'assistant') {
         output.push(message)
diff --git a/src/shared/native-chat-transcript-projection.ts b/src/shared/native-chat-transcript-projection.ts
index 26b218247112..45f2488f4aa6 100644
--- a/src/shared/native-chat-transcript-projection.ts
+++ b/src/shared/native-chat-transcript-projection.ts
@@ -4,6 +4,7 @@
 // of exactly what the renderer's transcript runs, not a second reading of it.
 
 import type { NativeChatMessage } from './native-chat-types'
+import { compareAgentJournalPositions } from './agent-session-journal-position'
 import { stripNoiseMessages } from './native-chat-noise'
 import { foldToolMessages } from './native-chat-tool-fold'
 
@@ -27,11 +28,32 @@ export function compareNativeChatMessagesByTime(
   return 0
 }
 
+/** Rows the journal holds read in the journal's own order, never its clock: a
+ *  batch shares one timestamp, and a row recovered after a crash carries an
+ *  earlier one. A row not in the journal yet — a send still in the outbox — was
+ *  made after everything the journal holds, so it follows them; only such rows,
+ *  and terminal-backed transcripts, which have no journal, order by time. */
+export function compareNativeChatTranscriptMessages(
+  a: NativeChatMessage,
+  b: NativeChatMessage
+): number {
+  if (a.journalPosition && b.journalPosition) {
+    return compareAgentJournalPositions(a.journalPosition, b.journalPosition)
+  }
+  if (a.journalPosition || b.journalPosition) {
+    return a.journalPosition ? -1 : 1
+  }
+  return compareNativeChatMessagesByTime(a, b)
+}
+
 /** `compare` lets the renderer order its own tail rows (streaming, optimistic
  *  sends), which never exist on the host. */
 export function projectNativeChatTranscriptMessages(
   messages: readonly NativeChatMessage[],
-  compare: (a: NativeChatMessage, b: NativeChatMessage) => number = compareNativeChatMessagesByTime
+  compare: (
+    a: NativeChatMessage,
+    b: NativeChatMessage
+  ) => number = compareNativeChatTranscriptMessages
 ): NativeChatMessage[] {
   // Not `toSorted`: mobile's Hermes lacks it, and src/shared must stay loadable there.
   return stripNoiseMessages(foldToolMessages(Array.from(messages).sort(compare)))
diff --git a/src/shared/native-chat-turn-fold.test.ts b/src/shared/native-chat-turn-fold.test.ts
index cd7e4de024de..d6bba89e552c 100644
--- a/src/shared/native-chat-turn-fold.test.ts
+++ b/src/shared/native-chat-turn-fold.test.ts
@@ -147,3 +147,33 @@ describe('nativeChatTurnFold', () => {
     expect(foldedRows.size).toBe(0)
   })
 })
+
+describe("a subagent's words are never the turn's answer", () => {
+  // The reported shape: the parent replies, then a subagent it launched keeps
+  // narrating into the same journal after the parent's last word.
+  const rows: NativeChatTurnFoldRow[] = [
+    row({ role: 'user' }),
+    row(),
+    row({ agentId: 'task-1' }),
+    row({ agentId: 'task-1', rendersProse: false })
+  ]
+
+  it("names the session's own last prose, not a subagent's later prose", () => {
+    expect(nativeChatTurnAnswerRows(rows).get('turn-1')).toBe(1)
+  })
+
+  it("folds the subagent's prose behind a settled turn and keeps the parent's answer", () => {
+    const { foldedRows } = nativeChatTurnFold({
+      rows,
+      settledTurnKeys: SETTLED,
+      expandedTurnKeys: NONE
+    })
+    expect(foldedRows.has(1)).toBe(false)
+    expect(foldedRows.has(2)).toBe(true)
+  })
+
+  it('reports no answer for a turn in which only subagents spoke', () => {
+    const onlyChildren = [row({ role: 'user' }), row({ agentId: 'task-1' })]
+    expect(nativeChatTurnAnswerRows(onlyChildren).has('turn-1')).toBe(false)
+  })
+})
diff --git a/src/shared/native-chat-turn-fold.ts b/src/shared/native-chat-turn-fold.ts
index 5ceb0ef89898..52407a9d5244 100644
--- a/src/shared/native-chat-turn-fold.ts
+++ b/src/shared/native-chat-turn-fold.ts
@@ -9,6 +9,7 @@
 // Shared because desktop and mobile both draw this disclosure, and a fold that
 // hides a different row on each surface is the same bug twice.
 
+import { isRootAgentJournalItem } from './agent-session-journal-producer'
 import type { NativeChatRole } from './native-chat-types'
 
 /** What the fold needs to know about one transcript row. Deliberately not a
@@ -24,6 +25,8 @@ export type NativeChatTurnFoldRow = {
    *  spawn roster or a background task. That row is the durable report of how
    *  the work ended — often the only one — so it never folds. */
   outlivesTurn: boolean
+  /** The subagent that produced the row. Absent ⇒ the session's own agent. */
+  agentId?: string
 }
 
 export type NativeChatTurnFold = {
@@ -39,14 +42,21 @@ export const NATIVE_CHAT_EMPTY_TURN_FOLD: NativeChatTurnFold = {
   foldableTurnKeys: new Set()
 }
 
-/** The index of each turn's answer: its last assistant row that renders prose.
- *  A turn with no such row has no answer, and folds whole. */
+/** The index of each turn's answer: the last prose the session's own agent
+ *  wrote. A subagent that is still narrating after its parent's last word would
+ *  otherwise stand as the turn's only visible reply. A turn with no such row has
+ *  no answer, and folds whole. */
 export function nativeChatTurnAnswerRows(
   rows: readonly NativeChatTurnFoldRow[]
 ): ReadonlyMap<string, number> {
   const answers = new Map<string, number>()
   for (const [index, row] of rows.entries()) {
-    if (row.turnKey !== undefined && row.role === 'assistant' && row.rendersProse) {
+    if (
+      row.turnKey !== undefined &&
+      row.role === 'assistant' &&
+      row.rendersProse &&
+      isRootAgentJournalItem(row)
+    ) {
       answers.set(row.turnKey, index)
     }
   }
diff --git a/src/shared/native-chat-turn-grouping.test.ts b/src/shared/native-chat-turn-grouping.test.ts
new file mode 100644
index 000000000000..5c6425dd7ed4
--- /dev/null
+++ b/src/shared/native-chat-turn-grouping.test.ts
@@ -0,0 +1,76 @@
+import { describe, expect, it } from 'vitest'
+import type { NativeChatMessage } from './native-chat-types'
+import { nativeChatRowTurnKeys, nativeChatSelfAnchoredTurnRows } from './native-chat-turn-grouping'
+
+function message(id: string, role: NativeChatMessage['role'] = 'assistant'): NativeChatMessage {
+  return { id, role, blocks: [{ type: 'text', text: id }], timestamp: null, source: 'transcript' }
+}
+
+describe('nativeChatRowTurnKeys', () => {
+  it('keeps rows after a mid-turn send with the turn that produced them', () => {
+    // The #23621 shape: B lands mid-turn, three tool rows follow, all one turn.
+    const messages = [
+      message('A', 'user'),
+      message('t1'),
+      message('B', 'user'),
+      message('t2'),
+      message('t3'),
+      message('t4')
+    ]
+    const owned = new Map([
+      ['A', 'A'],
+      ['t1', 'A'],
+      ['B', 'A'],
+      ['t2', 'A'],
+      ['t3', 'A'],
+      ['t4', 'A']
+    ])
+    expect(nativeChatRowTurnKeys(messages, owned)).toEqual(['A', 'A', 'A', 'A', 'A', 'A'])
+  })
+
+  it('lets an unmapped user row key itself and unmapped rows inherit it', () => {
+    // C is an optimistic echo the journal has not admitted yet: positional rules.
+    const messages = [message('A', 'user'), message('t1'), message('C', 'user'), message('t2')]
+    const owned = new Map([
+      ['A', 'A'],
+      ['t1', 'A']
+    ])
+    expect(nativeChatRowTurnKeys(messages, owned)).toEqual(['A', 'A', 'C', 'C'])
+  })
+
+  it('reproduces preceding-user grouping exactly when the host attributes nothing', () => {
+    const messages = [
+      message('lead'),
+      message('A', 'user'),
+      message('t1'),
+      message('B', 'user'),
+      message('t2')
+    ]
+    const positional = [undefined, 'A', 'A', 'B', 'B']
+    expect(nativeChatRowTurnKeys(messages, null)).toEqual(positional)
+    expect(nativeChatRowTurnKeys(messages, new Map())).toEqual(positional)
+  })
+
+  it('keys a provider-opened turn to a record no message carries', () => {
+    const messages = [message('A', 'user'), message('t1'), message('t2')]
+    const owned = new Map([
+      ['A', 'A'],
+      ['t1', 'wake-turn'],
+      ['t2', 'wake-turn']
+    ])
+    expect(nativeChatRowTurnKeys(messages, owned)).toEqual(['A', 'wake-turn', 'wake-turn'])
+  })
+})
+
+describe('nativeChatSelfAnchoredTurnRows', () => {
+  it('anchors a turn with no user bubble at its first rendered row', () => {
+    const messages = [message('A', 'user'), message('t1'), message('t2'), message('t3')]
+    const turnKeys = ['A', 'A', 'wake-turn', 'wake-turn']
+    expect(nativeChatSelfAnchoredTurnRows(messages, turnKeys)).toEqual(new Map([['wake-turn', 2]]))
+  })
+
+  it('never anchors a turn whose key is a rendered message', () => {
+    const messages = [message('A', 'user'), message('t1')]
+    expect(nativeChatSelfAnchoredTurnRows(messages, ['A', 'A']).size).toBe(0)
+  })
+})
diff --git a/src/shared/native-chat-turn-grouping.ts b/src/shared/native-chat-turn-grouping.ts
new file mode 100644
index 000000000000..7c181352db5e
--- /dev/null
+++ b/src/shared/native-chat-turn-grouping.ts
@@ -0,0 +1,49 @@
+// Which turn each transcript row belongs to, and where a turn with no user
+// bubble anchors its bar. Shared because desktop and mobile both group rows and
+// place bars from these keys, and a row grouped differently on each surface is
+// the same bug twice.
+
+import type { NativeChatMessage } from './native-chat-types'
+
+/**
+ * Resolve each row's turn key. The host's attribution (`turnKeysByItemId`, from
+ * `selectStructuredAgentTurnBars`) wins, so rows after a mid-turn send stay with
+ * the turn that produced them. Rows it cannot name keep positional grouping —
+ * an unmapped user row keys itself, anything else inherits the previous row's
+ * key — which on a host without turn attribution is exactly today's
+ * preceding-user-message grouping.
+ */
+export function nativeChatRowTurnKeys(
+  messages: readonly NativeChatMessage[],
+  turnKeysByItemId?: ReadonlyMap<string, string> | null
+): (string | undefined)[] {
+  let currentTurnKey: string | undefined
+  return messages.map((message) => {
+    const owned = turnKeysByItemId?.get(message.id)
+    if (owned !== undefined) {
+      currentTurnKey = owned
+      return owned
+    }
+    if (message.role === 'user') {
+      currentTurnKey = message.id
+    }
+    return currentTurnKey
+  })
+}
+
+/** For each turn key with no message of its own — a turn the provider opened, or
+ *  whose opener is outside the loaded window — the row index that anchors its
+ *  bar: the turn's first rendered row, matching the turn's own position. */
+export function nativeChatSelfAnchoredTurnRows(
+  messages: readonly NativeChatMessage[],
+  turnKeys: readonly (string | undefined)[]
+): ReadonlyMap<string, number> {
+  const messageIds = new Set(messages.map((message) => message.id))
+  const anchors = new Map<string, number>()
+  turnKeys.forEach((turnKey, index) => {
+    if (turnKey !== undefined && !messageIds.has(turnKey) && !anchors.has(turnKey)) {
+      anchors.set(turnKey, index)
+    }
+  })
+  return anchors
+}
diff --git a/src/shared/native-chat-turn-status.test.ts b/src/shared/native-chat-turn-status.test.ts
index 8157676a22c1..e36eaa86fd3e 100644
--- a/src/shared/native-chat-turn-status.test.ts
+++ b/src/shared/native-chat-turn-status.test.ts
@@ -32,81 +32,66 @@ describe('formatNativeChatDuration', () => {
 })
 
 describe('describeNativeChatTurnStatus', () => {
-  it('prefers the settled duration over the thinking and counting labels', () => {
-    expect(
-      describeNativeChatTurnStatus({ thinking: true, workedSeconds: 184, elapsedSeconds: 9 })
-    ).toEqual({ key: 'workedFor', duration: '3m 4s' })
-  })
-
-  it('reports thinking before the turn produces output', () => {
-    expect(
-      describeNativeChatTurnStatus({ thinking: true, workedSeconds: null, elapsedSeconds: 9 })
-    ).toEqual({ key: 'thinking', duration: null })
+  it('prefers the settled duration over the running clock', () => {
+    expect(describeNativeChatTurnStatus({ workedSeconds: 184, elapsedSeconds: 9 })).toEqual({
+      key: 'workedFor',
+      duration: '3m 4s'
+    })
   })
 
-  it('counts once the turn has output', () => {
-    expect(
-      describeNativeChatTurnStatus({ thinking: false, workedSeconds: null, elapsedSeconds: 12 })
-    ).toEqual({ key: 'workingFor', duration: '12s' })
+  it('counts from the first second of the turn', () => {
+    expect(describeNativeChatTurnStatus({ workedSeconds: null, elapsedSeconds: 0 })).toEqual({
+      key: 'workingFor',
+      duration: '0s'
+    })
   })
 })
 
 describe('describeNativeChatActiveTurnLabel', () => {
   it('lets provider activity beat both fallbacks', () => {
     expect(
-      describeNativeChatActiveTurnLabel({
-        activityText: 'Reading src/main.ts',
-        thinking: true,
-        elapsedSeconds: 12
-      })
+      describeNativeChatActiveTurnLabel({ activityText: 'Reading src/main.ts', thinking: true })
     ).toEqual({ source: 'activity', text: 'Reading src/main.ts' })
   })
 
   it('falls back to reasoning when the provider says nothing usable', () => {
-    expect(
-      describeNativeChatActiveTurnLabel({ activityText: '   ', thinking: true, elapsedSeconds: 12 })
-    ).toEqual({ source: 'status', key: 'thinking', duration: null })
-    expect(
-      describeNativeChatActiveTurnLabel({ activityText: null, thinking: true, elapsedSeconds: 12 })
-    ).toEqual({ source: 'status', key: 'thinking', duration: null })
+    expect(describeNativeChatActiveTurnLabel({ activityText: '   ', thinking: true })).toEqual({
+      source: 'status',
+      key: 'thinking'
+    })
+    expect(describeNativeChatActiveTurnLabel({ activityText: null, thinking: true })).toEqual({
+      source: 'status',
+      key: 'thinking'
+    })
   })
 
-  it('falls back to the running clock when the turn is neither talking nor reasoning', () => {
-    expect(describeNativeChatActiveTurnLabel({ thinking: false, elapsedSeconds: 184 })).toEqual({
+  // The clock belongs to the turn bar; repeating it here is two rows saying "Working for".
+  it('falls back to plain working, never the clock, when neither applies', () => {
+    expect(describeNativeChatActiveTurnLabel({ thinking: false })).toEqual({
       source: 'status',
-      key: 'workingFor',
-      duration: '3m 4s'
+      key: 'working'
     })
   })
 })
 
 describe('formatNativeChatActiveTurnLabel', () => {
-  it('renders the one live row in English for platforms without i18n', () => {
+  it('renders the live tail line in English for platforms without i18n', () => {
     expect(
-      formatNativeChatActiveTurnLabel({
-        activityText: 'Running pnpm test',
-        thinking: false,
-        elapsedSeconds: 4
-      })
+      formatNativeChatActiveTurnLabel({ activityText: 'Running pnpm test', thinking: false })
     ).toBe('Running pnpm test')
-    expect(formatNativeChatActiveTurnLabel({ thinking: true, elapsedSeconds: 4 })).toBe('Thinking')
-    expect(formatNativeChatActiveTurnLabel({ thinking: false, elapsedSeconds: 12 })).toBe(
-      'Working for 12s'
-    )
+    expect(formatNativeChatActiveTurnLabel({ thinking: true })).toBe('Thinking')
+    expect(formatNativeChatActiveTurnLabel({ thinking: false })).toBe('Working…')
   })
 })
 
 describe('formatNativeChatTurnStatusLabel', () => {
-  it('renders each state in English for platforms without i18n', () => {
-    expect(
-      formatNativeChatTurnStatusLabel({ thinking: true, workedSeconds: null, elapsedSeconds: 0 })
-    ).toBe('Thinking')
-    expect(
-      formatNativeChatTurnStatusLabel({ thinking: false, workedSeconds: null, elapsedSeconds: 12 })
-    ).toBe('Working for 12s')
-    expect(
-      formatNativeChatTurnStatusLabel({ thinking: false, workedSeconds: 184, elapsedSeconds: 0 })
-    ).toBe('Worked for 3m 4s')
+  it('renders the turn bar in English for platforms without i18n', () => {
+    expect(formatNativeChatTurnStatusLabel({ workedSeconds: null, elapsedSeconds: 12 })).toBe(
+      'Working for 12s'
+    )
+    expect(formatNativeChatTurnStatusLabel({ workedSeconds: 184, elapsedSeconds: 0 })).toBe(
+      'Worked for 3m 4s'
+    )
   })
 })
 
@@ -380,6 +365,24 @@ describe('selectNativeChatTurnStatuses', () => {
     )
     expect(completedByTurn).toEqual({})
   })
+
+  it('keeps the just-ended turn live until its local duration is stamped', () => {
+    const running = { u1: { startedAt: 1_000, workedSeconds: null } }
+    const { active } = selectNativeChatTurnStatuses(running, {
+      activeTurnKey: 'u1',
+      isWorking: false,
+      thinking: true
+    })
+    expect(active).toEqual({ startedAt: 1_000, thinking: false, workedSeconds: null })
+    // The host saying it never saw the end still wins.
+    const unverifiable = selectNativeChatTurnStatuses(running, {
+      activeTurnKey: 'u1',
+      isWorking: false,
+      thinking: false,
+      settledByTurn: new Map([['u1', null]])
+    })
+    expect(unverifiable.active).toBeNull()
+  })
 })
 
 describe('nativeChatElapsedSeconds', () => {
diff --git a/src/shared/native-chat-turn-status.ts b/src/shared/native-chat-turn-status.ts
index 9f942ad7e216..acbab30aabfd 100644
--- a/src/shared/native-chat-turn-status.ts
+++ b/src/shared/native-chat-turn-status.ts
@@ -1,10 +1,14 @@
-// Turn-status derivation and copy for the native-chat "Thinking / Working for N /
-// Worked for N" row, shared by the desktop renderer (as its i18n fallback strings)
-// and the mobile app (used directly — mobile ships English only) so the two
-// surfaces never drift. Everything here is pure; each platform owns its own clock.
+// Turn-status derivation and copy for the native-chat turn rows — the "Working for N /
+// Worked for N" bar under the user's message and the live line at the turn's tail —
+// shared by the desktop renderer (as its i18n fallback strings) and the mobile app
+// (used directly — mobile ships English only) so the two surfaces never drift.
+// Everything here is pure; each platform owns its own clock.
+
+import type { NativeChatMessage } from './native-chat-types'
 
 export const NATIVE_CHAT_TURN_STATUS_COPY = {
   thinking: 'Thinking',
+  working: 'Working…',
   workingFor: 'Working for {{value0}}',
   workedFor: 'Worked for {{value0}}',
   toggleDetails: 'Toggle turn details',
@@ -26,28 +30,22 @@ export function formatNativeChatDuration(seconds: number): string {
   return `${hours}h ${minutes % 60}m ${remainingSeconds}s`
 }
 
-/** Which of the three copy keys a turn-status row renders, and its duration
- *  argument. Desktop maps this onto `translate`; mobile formats it directly. */
+/** The turn bar's copy key and duration: the running clock, then the settled one.
+ *  Desktop maps this onto `translate`; mobile formats it directly. */
 export function describeNativeChatTurnStatus({
-  thinking,
   workedSeconds,
   elapsedSeconds
 }: {
-  thinking: boolean
   workedSeconds?: number | null
   elapsedSeconds: number
-}): { key: 'thinking' | 'workingFor' | 'workedFor'; duration: string | null } {
-  if (workedSeconds != null) {
-    return { key: 'workedFor', duration: formatNativeChatDuration(workedSeconds) }
-  }
-  if (thinking) {
-    return { key: 'thinking', duration: null }
-  }
-  return { key: 'workingFor', duration: formatNativeChatDuration(elapsedSeconds) }
+}): { key: 'workingFor' | 'workedFor'; duration: string } {
+  return workedSeconds != null
+    ? { key: 'workedFor', duration: formatNativeChatDuration(workedSeconds) }
+    : { key: 'workingFor', duration: formatNativeChatDuration(elapsedSeconds) }
 }
 
-/** The two readings that label a live turn's one indicator row, carried together
- *  so a surface cannot pick up one without the other. */
+/** The two readings that label a live turn's tail line, carried together so a
+ *  surface cannot pick up one without the other. */
 export type NativeChatLiveTurnIndicator = {
   thinking: boolean
   activityText: string | null
@@ -55,52 +53,41 @@ export type NativeChatLiveTurnIndicator = {
 
 export type NativeChatActiveTurnLabel =
   | { source: 'activity'; text: string }
-  | { source: 'status'; key: 'thinking' | 'workingFor'; duration: string | null }
+  | { source: 'status'; key: 'thinking' | 'working' }
 
-/** The live turn's single indicator label. Provider activity wins because it is the
- *  only text that says what the turn is actually doing; reasoning is next; the
- *  running clock is the floor. Shared so desktop and mobile cannot disagree. */
+/** The live tail line's label. Provider activity wins because it is the only text
+ *  that says what the turn is actually doing; reasoning is next. It never carries
+ *  the clock — the turn bar owns that. Shared so desktop and mobile cannot disagree. */
 export function describeNativeChatActiveTurnLabel({
   activityText,
-  thinking,
-  elapsedSeconds
+  thinking
 }: {
   activityText?: string | null
   thinking: boolean
-  elapsedSeconds: number
 }): NativeChatActiveTurnLabel {
   const text = activityText?.trim()
   if (text) {
     return { source: 'activity', text }
   }
-  return thinking
-    ? { source: 'status', key: 'thinking', duration: null }
-    : { source: 'status', key: 'workingFor', duration: formatNativeChatDuration(elapsedSeconds) }
+  return { source: 'status', key: thinking ? 'thinking' : 'working' }
 }
 
-/** The live turn's label in English. For platforms without i18n (mobile). */
+/** The live tail line's label in English. For platforms without i18n (mobile). */
 export function formatNativeChatActiveTurnLabel(input: {
   activityText?: string | null
   thinking: boolean
-  elapsedSeconds: number
 }): string {
   const label = describeNativeChatActiveTurnLabel(input)
-  if (label.source === 'activity') {
-    return label.text
-  }
-  const copy = NATIVE_CHAT_TURN_STATUS_COPY[label.key]
-  return label.duration == null ? copy : copy.replaceAll('{{value0}}', label.duration)
+  return label.source === 'activity' ? label.text : NATIVE_CHAT_TURN_STATUS_COPY[label.key]
 }
 
-/** Resolve the turn-status label in English. For platforms without i18n (mobile). */
+/** Resolve the turn bar's label in English. For platforms without i18n (mobile). */
 export function formatNativeChatTurnStatusLabel(input: {
-  thinking: boolean
   workedSeconds?: number | null
   elapsedSeconds: number
 }): string {
   const { key, duration } = describeNativeChatTurnStatus(input)
-  const copy = NATIVE_CHAT_TURN_STATUS_COPY[key]
-  return duration == null ? copy : copy.replaceAll('{{value0}}', duration)
+  return NATIVE_CHAT_TURN_STATUS_COPY[key].replaceAll('{{value0}}', duration)
 }
 
 export type NativeChatTurnTiming = {
@@ -116,6 +103,23 @@ export type NativeChatTurnStatus = {
 
 export type NativeChatTurnTimingByTurn = Readonly<Record<string, NativeChatTurnTiming>>
 
+/** The live turn's key when the transcript has no user message to hang it on. */
+export const NATIVE_CHAT_UNANCHORED_TURN_KEY = '__unanchored__'
+
+/** The user message whose bar carries the live clock: the one the host says opened
+ *  the running turn — a message sent while it runs is not that one — else, when the
+ *  host names none, the latest user message. */
+export function selectNativeChatActiveTurnKey(
+  messages: readonly NativeChatMessage[],
+  activeTurnOpenedBy?: string | null
+): string {
+  return (
+    activeTurnOpenedBy ??
+    messages.findLast((message) => message.role === 'user')?.id ??
+    NATIVE_CHAT_UNANCHORED_TURN_KEY
+  )
+}
+
 /** The turn-timing state machine, lifted out of the React hook so desktop and
  *  mobile stamp start/stop identically. Returns the same reference when nothing
  *  changed so callers can bail out of a state update. */
@@ -241,14 +245,20 @@ export function selectNativeChatTurnStatuses(
       workedSeconds: settled.workedSeconds
     }
   }
+  const activeTiming = timingByTurn[activeTurnKey]
   return {
     active: isWorking
       ? {
-          startedAt: timingByTurn[activeTurnKey]?.startedAt ?? workingStartedAt ?? null,
+          startedAt: activeTiming?.startedAt ?? workingStartedAt ?? null,
           thinking,
           workedSeconds: null
         }
-      : (completedByTurn[activeTurnKey] ?? null),
+      : (completedByTurn[activeTurnKey] ??
+        // Ended, but the local duration is stamped a pass later: stay live until then so
+        // the bar settles in place instead of blinking out. The host's null still hides it.
+        (activeTiming?.workedSeconds === null && !settledByTurn?.has(activeTurnKey)
+          ? { startedAt: activeTiming.startedAt, thinking: false, workedSeconds: null }
+          : null)),
     completedByTurn
   }
 }
diff --git a/src/shared/native-chat-types.ts b/src/shared/native-chat-types.ts
index 7f99a6219859..2a44c29c7450 100644
--- a/src/shared/native-chat-types.ts
+++ b/src/shared/native-chat-types.ts
@@ -10,7 +10,12 @@ import type {
   AgentSessionBackgroundTask,
   AgentSessionBackgroundTaskRunState
 } from './agent-session-background-task-wire'
-import type { AgentJournalMessageSendMode } from './agent-session-journal-types'
+import type { AgentSessionFailureFact } from './agent-session-failure'
+import type {
+  AgentJournalMessageSendMode,
+  AgentJournalPosition,
+  AgentJournalProducerLinkage
+} from './agent-session-journal-types'
 import type { AgentType } from './agent-status-types'
 import type { NativeChatToolMetadata } from './native-chat-tool-identity'
 
@@ -51,6 +56,8 @@ export type NativeChatTextBlock = {
       truncated: boolean
     }
   }
+  /** On a status line that reports a failure: what failed, typed. */
+  failure?: AgentSessionFailureFact
 }
 
 /** A tool invocation by the agent. `input` is the (already-serialized) tool
@@ -184,7 +191,9 @@ export type NativeChatBlock =
   | NativeChatSubagentGroupBlock
   | NativeChatBackgroundTaskBlock
 
-export type NativeChatMessage = {
+/** A transcript row. Structured rows carry the journal row's producer linkage, so
+ *  "who said this" survives the projection; terminal-backed rows carry none. */
+export type NativeChatMessage = AgentJournalProducerLinkage & {
   /** Stable across re-reads/appends so the assembler and the renderer list can
    *  dedup and key by it. */
   id: string
@@ -199,6 +208,9 @@ export type NativeChatMessage = {
   turnId?: string
   /** How a user message was delivered when it was not an ordinary prompt. */
   sentAs?: AgentJournalMessageSendMode
+  /** Set only by the structured projection, on rows the journal holds, and ranks
+   *  them ahead of time. Terminal-backed messages never carry it, and worker reads strip it. */
+  journalPosition?: AgentJournalPosition
 }
 
 export const NATIVE_CHAT_TURN_LIFECYCLE_STATES = ['working', 'completed', 'interrupted'] as const
diff --git a/src/shared/network/manual-address.test.ts b/src/shared/network/manual-address.test.ts
index 6ef595361298..0260eeb7d726 100644
--- a/src/shared/network/manual-address.test.ts
+++ b/src/shared/network/manual-address.test.ts
@@ -1,16 +1,8 @@
 import { describe, it, expect } from 'vitest'
-import { readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
 import { parseManualNetworkAddress } from './manual-address'
 import { PAIRING_ENDPOINT_MAX_CHARACTERS } from '../mobile-pairing-protocol-limits'
 
 describe('parseManualNetworkAddress', () => {
-  it('keeps renderer validation off the Zod schema import path', () => {
-    const source = readFileSync(resolve('src/shared/network/manual-address.ts'), 'utf8')
-    expect(source).not.toContain('mobile-relay-pairing-offer')
-    expect(source).not.toContain("from 'zod'")
-  })
-
   describe('IPv4', () => {
     it('accepts canonical IPv4', () => {
       expect(parseManualNetworkAddress('192.168.1.24')).toEqual({
diff --git a/src/shared/notification-settings-types.ts b/src/shared/notification-settings-types.ts
index 58d9eb6a549d..b3056ee8f9b6 100644
--- a/src/shared/notification-settings-types.ts
+++ b/src/shared/notification-settings-types.ts
@@ -1,4 +1,5 @@
 import type { AgentStatusState, AgentType } from './agent-status-types'
+import type { AgentJournalTurnOutcome } from './agent-turn-outcome'
 
 export type NotificationSettings = {
   enabled: boolean
@@ -43,7 +44,8 @@ export type NotificationDispatchRequest = {
   agentToolName?: string
   agentToolInput?: string
   agentLastAssistantMessage?: string
-  agentInterrupted?: boolean
+  /** The verdict on the turn this notification reports, which picks its wording. */
+  agentTurnOutcome?: AgentJournalTurnOutcome
   /** Read only for source 'pending-ask', whose text is built in the renderer so it goes
    *  through translate(). Every other source must leave these unset: it builds its own
    *  title/body in buildNotificationOptions, which does not read these fields at all. */
diff --git a/src/shared/opencode-installed-plugin.test.ts b/src/shared/opencode-installed-plugin.test.ts
new file mode 100644
index 000000000000..d7814c1229b8
--- /dev/null
+++ b/src/shared/opencode-installed-plugin.test.ts
@@ -0,0 +1,47 @@
+import { mkdtempSync, rmSync, symlinkSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import {
+  isInstalledOpenCodePluginCurrent,
+  isOverlayOpenCodePluginCurrent
+} from './opencode-installed-plugin'
+
+describe('installed OpenCode plugin currency', () => {
+  let dir: string
+  let pluginPath: string
+
+  beforeEach(() => {
+    dir = mkdtempSync(join(tmpdir(), 'orca-opencode-installed-plugin-'))
+    pluginPath = join(dir, 'orca-opencode-status.js')
+  })
+
+  afterEach(() => {
+    rmSync(dir, { recursive: true, force: true })
+  })
+
+  it('treats a missing or different file as stale', () => {
+    expect(isInstalledOpenCodePluginCurrent(pluginPath, 'plugin')).toBe(false)
+    expect(isOverlayOpenCodePluginCurrent(pluginPath, 'plugin')).toBe(false)
+    writeFileSync(pluginPath, 'older plugin')
+    expect(isInstalledOpenCodePluginCurrent(pluginPath, 'plugin')).toBe(false)
+    expect(isOverlayOpenCodePluginCurrent(pluginPath, 'plugin')).toBe(false)
+  })
+
+  it('treats a regular file with the same bytes as current', () => {
+    writeFileSync(pluginPath, 'plugin')
+    expect(isInstalledOpenCodePluginCurrent(pluginPath, 'plugin')).toBe(true)
+    expect(isOverlayOpenCodePluginCurrent(pluginPath, 'plugin')).toBe(true)
+  })
+
+  it.skipIf(process.platform === 'win32')(
+    'follows a symlink except in an overlay, where a link is a mirrored user entry',
+    () => {
+      const targetPath = join(dir, 'target.js')
+      writeFileSync(targetPath, 'plugin')
+      symlinkSync(targetPath, pluginPath)
+      expect(isInstalledOpenCodePluginCurrent(pluginPath, 'plugin')).toBe(true)
+      expect(isOverlayOpenCodePluginCurrent(pluginPath, 'plugin')).toBe(false)
+    }
+  )
+})
diff --git a/src/shared/opencode-installed-plugin.ts b/src/shared/opencode-installed-plugin.ts
new file mode 100644
index 000000000000..33a80f4d1683
--- /dev/null
+++ b/src/shared/opencode-installed-plugin.ts
@@ -0,0 +1,22 @@
+import { lstatSync } from 'node:fs'
+import { nodeFileContentsEqualSync } from './node-file-content-equality'
+
+// Why: OpenCode 2 reloads a plugin (and every plugin loaded after it) when its file's mtime changes,
+// even with identical bytes, so installers must skip the write when Orca's plugin is already current.
+// Follows symlinks: OpenCode 2 loads through them, so a linked file with Orca's bytes is current.
+export function isInstalledOpenCodePluginCurrent(pluginPath: string, source: string): boolean {
+  try {
+    return nodeFileContentsEqualSync(pluginPath, source)
+  } catch {
+    return false
+  }
+}
+
+// Overlay variant: a symlink there mirrors a user entry, never Orca's file, even when the bytes match.
+export function isOverlayOpenCodePluginCurrent(pluginPath: string, source: string): boolean {
+  try {
+    return lstatSync(pluginPath).isFile() && nodeFileContentsEqualSync(pluginPath, source)
+  } catch {
+    return false
+  }
+}
diff --git a/src/shared/opencode-launch-command.test.ts b/src/shared/opencode-launch-command.test.ts
index a422633f4bff..d9457de42e04 100644
--- a/src/shared/opencode-launch-command.test.ts
+++ b/src/shared/opencode-launch-command.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { isOpenCode2LaunchCommand } from './opencode-launch-command'
+import { isOpenCode2LaunchCommand, selectOpenCodeHookAgent } from './opencode-launch-command'
 
 describe('isOpenCode2LaunchCommand', () => {
   it.each(['opencode2', '/usr/local/bin/opencode2', 'opencode2.exe', 'opencode2.cmd'])(
@@ -13,3 +13,19 @@ describe('isOpenCode2LaunchCommand', () => {
     expect(isOpenCode2LaunchCommand(command)).toBe(false)
   })
 })
+
+describe('OpenCode hook selection', () => {
+  it.each([
+    'opencode --session fixture',
+    '"C:\\tools\\opencode.exe" --session fixture',
+    '/usr/local/bin/opencode'
+  ])('preserves disabled v1 identity for %s', (command) => {
+    expect(selectOpenCodeHookAgent(undefined, command, (agent) => agent === 'opencode2')).toBeNull()
+  })
+  it('trusts the supplied identity for wrapped or renamed commands', () => {
+    expect(selectOpenCodeHookAgent('opencode', 'opencode2', () => true)).toBe('opencode')
+    expect(
+      selectOpenCodeHookAgent('opencode2', 'my-wrapper', (agent) => agent === 'opencode2')
+    ).toBe('opencode2')
+  })
+})
diff --git a/src/shared/opencode-launch-command.ts b/src/shared/opencode-launch-command.ts
index 44dd3038e6b9..92c4896b094c 100644
--- a/src/shared/opencode-launch-command.ts
+++ b/src/shared/opencode-launch-command.ts
@@ -1,8 +1,31 @@
 import { getCommandTokenPathBasename, getFirstCommandToken } from './command-token-scanner'
+import type { TuiAgent } from './tui-agent'
 
-export function isOpenCode2LaunchCommand(launchCommand: string | undefined): boolean {
+function openCodeCommandAgent(launchCommand: string | undefined): 'opencode' | 'opencode2' | null {
   const binary = getCommandTokenPathBasename(getFirstCommandToken(launchCommand ?? ''))
     .toLowerCase()
     .replace(/\.(?:cmd|exe|sh)$/, '')
-  return binary === 'opencode2'
+  return binary === 'opencode' || binary === 'opencode2' ? binary : null
+}
+
+export function isOpenCode2LaunchCommand(launchCommand: string | undefined): boolean {
+  return openCodeCommandAgent(launchCommand) === 'opencode2'
+}
+
+export function selectOpenCodeHookAgent(
+  launchAgent: TuiAgent | undefined,
+  launchCommand: string | undefined,
+  isEnabled: (agent: 'opencode' | 'opencode2') => boolean
+): 'opencode' | 'opencode2' | null {
+  const explicit =
+    launchAgent === 'opencode' || launchAgent === 'opencode2'
+      ? launchAgent
+      : launchAgent === undefined
+        ? openCodeCommandAgent(launchCommand)
+        : null
+  // An explicit version selects its own integration; disabling it never substitutes the other.
+  if (explicit) {
+    return isEnabled(explicit) ? explicit : null
+  }
+  return isEnabled('opencode') ? 'opencode' : isEnabled('opencode2') ? 'opencode2' : null
 }
diff --git a/src/shared/orca-session-address-prefix.ts b/src/shared/orca-session-address-prefix.ts
new file mode 100644
index 000000000000..984aec9d7890
--- /dev/null
+++ b/src/shared/orca-session-address-prefix.ts
@@ -0,0 +1,2 @@
+// A leaf with no imports, so the CLI entry can spell a session address without the codec's zod graph.
+export const ORCA_SESSION_ADDRESS_PREFIX = 'session:'
diff --git a/src/shared/orca-session-address.ts b/src/shared/orca-session-address.ts
index 339ccb01f435..d0098ea2ef9d 100644
--- a/src/shared/orca-session-address.ts
+++ b/src/shared/orca-session-address.ts
@@ -1,17 +1,19 @@
 import { isAgentSessionId } from './agent-session-record'
+import { STRUCTURED_WORKER_HANDLE_PREFIX } from './structured-worker-handle'
+import { ORCA_SESSION_ADDRESS_PREFIX } from './orca-session-address-prefix'
 
 /**
- * The Orca session id is the id Orca minted for a structured session (its session record id), never
- * the provider's own session id. Orchestration stores, bare, the one the agent is addressed by: for
- * a `/clear`ed chat, its lineage root's, not the live session's. Mail addresses the session as
- * `session:<id>`, beside `run:<id>` and `dispatch:<id>`, and derives that spelling here rather than
- * storing it.
+ * The Orca session id is the id Orca minted for a structured session (its session record id, the
+ * value of `ORCA_AGENT_SESSION_ID`), never the provider's own session id. Orchestration stores,
+ * bare, the one the agent is addressed by: for a `/clear`ed chat, its lineage root's, not the live
+ * session's. Mail addresses the session as `session:<id>`, beside `run:<id>` and `dispatch:<id>`,
+ * and derives that spelling here rather than storing it.
  *
  * Where the session runs is not part of the id; it is read from the session record when needed. PTY
  * agents have none today, and never a pane-keyed one: a pane outlives the agent in it, so such an id
  * would be inherited by the pane's next occupant.
  */
-export const ORCA_SESSION_ADDRESS_PREFIX = 'session:'
+export { ORCA_SESSION_ADDRESS_PREFIX }
 
 declare const orcaSessionIdBrand: unique symbol
 declare const orcaSessionAddressBrand: unique symbol
@@ -24,7 +26,7 @@ export type OrcaSessionAddress = string & { readonly [orcaSessionAddressBrand]:
 // Terminal handles (`term_` from the PTY runtime, `structworker_` from structured-worker-identity)
 // share the session-id charset. A handle is never a session, so one handed over by mistake must not
 // become a durable Orca session id.
-const TERMINAL_HANDLE_PREFIXES = ['term_', 'structworker_'] as const
+const TERMINAL_HANDLE_PREFIXES = ['term_', STRUCTURED_WORKER_HANDLE_PREFIX] as const
 
 export function isOrcaSessionId(id: string): id is OrcaSessionId {
   return isAgentSessionId(id) && !TERMINAL_HANDLE_PREFIXES.some((prefix) => id.startsWith(prefix))
diff --git a/src/shared/pane-agent-identity-inventory.test.ts b/src/shared/pane-agent-identity-inventory.test.ts
deleted file mode 100644
index da3a426d4d58..000000000000
--- a/src/shared/pane-agent-identity-inventory.test.ts
+++ /dev/null
@@ -1,496 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import { glob } from 'tinyglobby'
-import {
-  blankStringContents,
-  blankStringContentsDesynced,
-  isTestFile,
-  stripComments
-} from './source-scan/source-tree-scan'
-
-const HELPERS = [
-  'getAgentLabel',
-  'isClaudeAgent',
-  'titleHasAgentName',
-  'buildAgentNameRe',
-  'resolveTerminalTitleAgentType',
-  'resolveExplicitTerminalTitleAgentType',
-  'resolveCommittedTitleAgentType',
-  'resolvePaneAgentOwner',
-  'resolveCompatibleAgentTypeForOwner',
-  'classifyTitleActivity',
-  'detectAgentStatusFromTitle',
-  'resolveAgentTypeFromTerminalTitle',
-  'resolvePaneAgentIdentity',
-  'resolveCanonicalPaneAgentIdentity',
-  'resolvePublishedPaneAgentIdentity'
-] as const
-
-const TEST_SUPPORT_PATHS = new Set([
-  'src/renderer/src/components/terminal-pane/pty-connection-test-environment.ts'
-])
-
-type Helper = (typeof HELPERS)[number]
-type InventoryPath = string | readonly [path: string, occurrences: number]
-type Classification =
-  | 'parser-implementation'
-  | 'activity-only'
-  | 'enum-formatter'
-  | 'evidence-producer'
-  | 'identity-consumer'
-  | 'action-consumer'
-
-type InventoryGroup = {
-  helper: Helper
-  classification: Classification
-  paths: readonly InventoryPath[]
-}
-
-const INVENTORY: readonly InventoryGroup[] = [
-  {
-    helper: 'getAgentLabel',
-    classification: 'enum-formatter',
-    paths: [
-      [
-        'src/renderer/src/components/agent-session-continuation/AgentSessionContinuationDialog.tsx',
-        2
-      ],
-      [
-        'src/renderer/src/components/agent-session-continuation/fork-session-handoff/AgentSessionContinuationDialog.tsx',
-        2
-      ],
-      ['src/renderer/src/components/automations/AutomationListLocalRow.tsx', 2],
-      'src/renderer/src/components/automations/automation-draft-model.ts',
-      ['src/renderer/src/components/automations/automation-list-search-rows.ts', 2],
-      ['src/renderer/src/components/settings/NativeChatSupportedAgents.tsx', 2],
-      ['src/renderer/src/components/settings/QuickCommandsList.tsx', 2],
-      ['src/renderer/src/components/tab-bar/TabBarQuickCommandItem.tsx', 2],
-      ['src/renderer/src/components/tab-bar/TabBarQuickCommandsMenu.tsx', 2],
-      'src/renderer/src/lib/agent-catalog.tsx',
-      ['src/renderer/src/lib/launch-agent-session-continuation.ts', 3],
-      ['src/renderer/src/lib/orchestration-skill-coverage.ts', 2]
-    ]
-  },
-  {
-    helper: 'getAgentLabel',
-    classification: 'activity-only',
-    paths: [['src/renderer/src/lib/pane-agent-evidence.ts', 2]]
-  },
-  {
-    helper: 'getAgentLabel',
-    classification: 'parser-implementation',
-    paths: [
-      'src/renderer/src/lib/agent-status.ts',
-      'src/shared/agent-detection.ts',
-      'src/shared/agent-title-identity.ts',
-      ['src/shared/agent-title-owner.ts', 2],
-      ['src/shared/terminal-title-agent-type.ts', 2]
-    ]
-  },
-  {
-    helper: 'isClaudeAgent',
-    classification: 'action-consumer',
-    paths: [
-      ['src/renderer/src/components/terminal-pane/cache-timer-seeding.ts', 2],
-      ['src/renderer/src/components/terminal-pane/parked-terminal-byte-watcher.ts', 2],
-      ['src/renderer/src/components/terminal-pane/pty-connection/agent-task-complete-notify.ts', 2],
-      ['src/renderer/src/store/terminals/terminal-ephemeral-state.ts', 2]
-    ]
-  },
-  {
-    helper: 'isClaudeAgent',
-    classification: 'action-consumer',
-    paths: [
-      ['src/renderer/src/components/terminal-pane/pty-connection/command-inferred-pane-agent.ts', 2]
-    ]
-  },
-  {
-    helper: 'isClaudeAgent',
-    classification: 'parser-implementation',
-    paths: [
-      'src/renderer/src/lib/agent-status.ts',
-      'src/shared/agent-detection.ts',
-      ['src/shared/agent-title-identity.ts', 2],
-      ['src/shared/terminal-title-agent-type.ts', 2]
-    ]
-  },
-  {
-    helper: 'titleHasAgentName',
-    classification: 'parser-implementation',
-    paths: [
-      'src/shared/agent-detection.ts',
-      'src/shared/agent-name-token-match.ts',
-      ['src/shared/agent-title-core.ts', 4],
-      ['src/shared/agent-title-evidence.ts', 2],
-      ['src/shared/agent-title-identity.ts', 11],
-      ['src/shared/terminal-title-agent-type.ts', 15]
-    ]
-  },
-  {
-    helper: 'titleHasAgentName',
-    classification: 'evidence-producer',
-    paths: [['src/renderer/src/hooks/ipc-events/agent-status-routing.ts', 2]]
-  },
-  {
-    helper: 'buildAgentNameRe',
-    classification: 'parser-implementation',
-    paths: [['src/shared/agent-name-token-match.ts', 2]]
-  },
-  {
-    helper: 'resolveTerminalTitleAgentType',
-    classification: 'identity-consumer',
-    paths: [['src/renderer/src/lib/notes-send-agent-targets.ts', 2]]
-  },
-  {
-    helper: 'resolveTerminalTitleAgentType',
-    classification: 'parser-implementation',
-    paths: [['src/shared/terminal-title-agent-type.ts', 2]]
-  },
-  {
-    helper: 'resolveExplicitTerminalTitleAgentType',
-    classification: 'identity-consumer',
-    paths: [
-      ['mobile/src/session/mobile-terminal-tab-agent.ts', 2],
-      ['src/main/runtime/tui-idle-evidence.ts', 2],
-      ['src/renderer/src/lib/open-tab-occupant-agent.ts', 2],
-      ['src/renderer/src/lib/use-tab-agent.ts', 3]
-    ]
-  },
-  {
-    helper: 'resolveExplicitTerminalTitleAgentType',
-    classification: 'parser-implementation',
-    paths: [
-      ['src/renderer/src/lib/pane-agent-evidence.ts', 2],
-      ['src/renderer/src/lib/tab-agent-from-signals.ts', 2],
-      'src/shared/terminal-title-agent-type.ts'
-    ]
-  },
-  {
-    helper: 'resolveCommittedTitleAgentType',
-    classification: 'action-consumer',
-    paths: [
-      ['src/renderer/src/components/tab-bar/native-chat-tab-agent-evidence.ts', 3],
-      ['src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts', 2],
-      ['src/renderer/src/components/terminal-pane/terminal-ctrl-enter.ts', 2],
-      ['src/renderer/src/components/terminal-pane/terminal-windows-shift-enter.ts', 2],
-      ['src/renderer/src/components/terminal-pane/use-notification-dispatch.ts', 2]
-    ]
-  },
-  {
-    helper: 'resolveCommittedTitleAgentType',
-    classification: 'identity-consumer',
-    paths: [
-      ['src/renderer/src/components/terminal-pane/native-chat-leaf-title-agent.ts', 4],
-      ['src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts', 2]
-    ]
-  },
-  {
-    helper: 'resolveCommittedTitleAgentType',
-    classification: 'parser-implementation',
-    paths: ['src/renderer/src/lib/pane-agent-evidence.ts']
-  },
-  {
-    helper: 'resolveCommittedTitleAgentType',
-    classification: 'action-consumer',
-    paths: [
-      ['src/renderer/src/components/terminal-pane/pty-connection/command-inferred-pane-agent.ts', 2]
-    ]
-  },
-  {
-    helper: 'resolvePaneAgentOwner',
-    classification: 'parser-implementation',
-    paths: ['src/shared/pane-agent-owner.ts']
-  },
-  {
-    helper: 'resolvePaneAgentOwner',
-    classification: 'evidence-producer',
-    paths: [['src/renderer/src/components/terminal-pane/parked-terminal-command-status.ts', 2]]
-  },
-  {
-    helper: 'resolvePaneAgentOwner',
-    classification: 'identity-consumer',
-    paths: [
-      ['src/renderer/src/components/sidebar/worktree-title-derived-agent-rows.ts', 2],
-      ['src/renderer/src/components/terminal-pane/pty-connection/shell-command-inference.ts', 2],
-      ['src/renderer/src/lib/use-tab-agent.ts', 2]
-    ]
-  },
-  {
-    helper: 'resolveCompatibleAgentTypeForOwner',
-    classification: 'parser-implementation',
-    paths: [['src/shared/agent-title-owner.ts', 2]]
-  },
-  {
-    helper: 'resolveCompatibleAgentTypeForOwner',
-    classification: 'identity-consumer',
-    paths: [
-      ['src/renderer/src/components/sidebar/worktree-agent-row-type.ts', 2],
-      ['src/main/runtime/runtime-mobile-session-projection.ts', 3],
-      ['src/renderer/src/components/sidebar/worktree-title-derived-agent-rows.ts', 2],
-      ['src/renderer/src/lib/tab-agent-from-signals.ts', 2],
-      ['src/renderer/src/lib/use-tab-agent.ts', 2]
-    ]
-  },
-  {
-    helper: 'resolveCompatibleAgentTypeForOwner',
-    classification: 'action-consumer',
-    paths: [
-      ['src/renderer/src/components/terminal-pane/pty-connection/agent-task-complete-notify.ts', 2],
-      [
-        'src/renderer/src/components/terminal-pane/pty-connection/command-inferred-pane-agent.ts',
-        3
-      ],
-      ['src/renderer/src/components/terminal-pane/pty-connection/terminal-keydown-fit.ts', 3]
-    ]
-  },
-  {
-    helper: 'resolveCompatibleAgentTypeForOwner',
-    classification: 'evidence-producer',
-    paths: [
-      ['src/renderer/src/components/terminal-pane/pty-connection/direct-ssh-retry-status.ts', 2],
-      ['src/renderer/src/components/terminal-pane/pty-connection/title-spawn-bell.ts', 2]
-    ]
-  },
-  {
-    helper: 'classifyTitleActivity',
-    classification: 'identity-consumer',
-    paths: [
-      ['src/renderer/src/components/sidebar/smart-attention.ts', 3],
-      ['src/renderer/src/components/sidebar/worktree-title-derived-agent-rows.ts', 2],
-      ['src/renderer/src/components/status-bar/workspace-space-presentation.ts', 3],
-      ['src/renderer/src/lib/active-agent-note-target.ts', 2],
-      ['src/renderer/src/lib/worktree-status.ts', 3],
-      ['src/renderer/src/store/slices/terminal-helpers.ts', 2]
-    ]
-  },
-  {
-    helper: 'classifyTitleActivity',
-    classification: 'action-consumer',
-    paths: [
-      ['src/renderer/src/components/terminal-pane/cache-timer-seeding.ts', 2],
-      ['src/renderer/src/lib/agent-ready-wait.ts', 2],
-      ['src/renderer/src/store/terminals/terminal-ephemeral-state.ts', 2]
-    ]
-  },
-  {
-    helper: 'classifyTitleActivity',
-    classification: 'activity-only',
-    paths: [
-      ['src/renderer/src/store/slices/workspace-cleanup-local-evidence.ts', 3],
-      ['src/renderer/src/store/terminals/terminal-tab-presentation.ts', 4]
-    ]
-  },
-  {
-    helper: 'classifyTitleActivity',
-    classification: 'evidence-producer',
-    paths: [
-      ['src/renderer/src/lib/agent-send-title-status.ts', 2],
-      ['src/renderer/src/lib/agent-status-terminal-title.ts', 2]
-    ]
-  },
-  {
-    helper: 'classifyTitleActivity',
-    classification: 'parser-implementation',
-    paths: [
-      ['src/renderer/src/lib/agent-status.ts', 5],
-      'src/renderer/src/lib/pane-agent-evidence.ts'
-    ]
-  },
-  {
-    helper: 'detectAgentStatusFromTitle',
-    classification: 'evidence-producer',
-    paths: [
-      ['src/main/runtime/orca-runtime-apply-tracked-pty-title.ts', 2],
-      ['src/main/runtime/orca-runtime-get-pty-record-for-pane-key.ts', 2],
-      ['src/main/runtime/orca-runtime-get-unpersisted-tracked-title-for-pty.ts', 2],
-      ['src/main/runtime/orca-runtime-maybe-hydrate-headless-from-renderer.ts', 2],
-      ['src/main/runtime/orca-runtime-record-agent-prompt-lifecycle-state.ts', 2],
-      ['src/main/runtime/runtime-terminal-agent-status-query.ts', 3],
-      ['src/main/runtime/runtime-worktree-status-projection.ts', 4],
-      ['src/main/runtime/terminal-wait-detection.ts', 2],
-      ['src/renderer/src/components/terminal-pane/agent-completion-title-observer.ts', 2],
-      ['src/renderer/src/components/terminal-pane/pty-connection/shell-command-inference.ts', 4],
-      ['src/renderer/src/components/terminal-pane/pty-output-title-observer.ts', 2],
-      ['src/shared/terminal-output-side-effects.ts', 3]
-    ]
-  },
-  {
-    helper: 'detectAgentStatusFromTitle',
-    classification: 'action-consumer',
-    paths: [
-      ['src/renderer/src/components/terminal-pane/pty-connection/agent-task-complete-notify.ts', 2],
-      [
-        'src/renderer/src/components/terminal-pane/pty-connection/command-inferred-pane-agent.ts',
-        3
-      ],
-      ['src/renderer/src/components/terminal-pane/pty-connection/interrupt-input-intent.ts', 3]
-    ]
-  },
-  {
-    helper: 'detectAgentStatusFromTitle',
-    classification: 'parser-implementation',
-    paths: [
-      ['src/renderer/src/components/terminal-pane/title-agent-identity.ts', 2],
-      'src/renderer/src/lib/agent-status.ts',
-      ['src/renderer/src/lib/pane-agent-evidence.ts', 3],
-      ['src/shared/agent-decorative-title-signature.ts', 2],
-      'src/shared/agent-detection.ts',
-      ['src/shared/agent-title-owner.ts', 2],
-      ['src/shared/agent-title-status.ts', 6]
-    ]
-  },
-  {
-    helper: 'resolveAgentTypeFromTerminalTitle',
-    classification: 'identity-consumer',
-    paths: [
-      ['src/renderer/src/components/sidebar/worktree-agent-row-type.ts', 2],
-      'src/renderer/src/components/sidebar/worktree-title-derived-agent-rows.ts',
-      ['src/renderer/src/lib/worktree-status.ts', 2]
-    ]
-  },
-  {
-    helper: 'resolvePaneAgentIdentity',
-    classification: 'parser-implementation',
-    paths: ['src/shared/pane-agent-identity-resolver.ts']
-  },
-  {
-    helper: 'resolvePaneAgentIdentity',
-    classification: 'identity-consumer',
-    paths: [['src/shared/published-pane-agent-identity.ts', 2]]
-  },
-  {
-    helper: 'resolveCanonicalPaneAgentIdentity',
-    classification: 'parser-implementation',
-    paths: ['src/shared/pane-agent-identity-adapter.ts']
-  },
-  {
-    helper: 'resolveCanonicalPaneAgentIdentity',
-    classification: 'identity-consumer',
-    paths: [['src/shared/agent-status-identity.ts', 2]]
-  },
-  {
-    helper: 'resolveCanonicalPaneAgentIdentity',
-    classification: 'identity-consumer',
-    paths: [['src/shared/terminal-title-agent-type.ts', 2]]
-  },
-  {
-    helper: 'resolvePublishedPaneAgentIdentity',
-    classification: 'parser-implementation',
-    paths: [
-      'src/shared/published-pane-agent-identity.ts',
-      ['src/main/runtime/orca-runtime-write-orchestration-pointer-pty.ts', 2]
-    ]
-  }
-]
-
-const DIRECT_SINGLE_SOURCE_SURFACES: readonly {
-  path: string
-  classification: Classification
-  marker: string
-}[] = [
-  {
-    path: 'src/renderer/src/components/terminal-pane/terminal-renderer-policy.ts',
-    classification: 'identity-consumer',
-    marker: 'resolveGeminiCompatFallback'
-  },
-  {
-    path: 'src/renderer/src/components/terminal-pane/terminal-title-evidence.ts',
-    classification: 'identity-consumer',
-    marker: 'resolvePaneTitleDecision'
-  },
-  {
-    path: 'src/renderer/src/components/terminal/terminal-close-copy-kind.ts',
-    classification: 'identity-consumer',
-    marker: 'resolveLeafCloseCopyKind'
-  },
-  {
-    path: 'src/main/runtime/orchestration/mailbox-pointer-stage.ts',
-    classification: 'action-consumer',
-    marker: 'isCursorAgentTitle'
-  },
-  {
-    path: 'src/main/providers/local-pty-session-activation.ts',
-    classification: 'action-consumer',
-    marker: 'launchAgent'
-  },
-  {
-    path: 'src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-settle.ts',
-    classification: 'action-consumer',
-    marker: 'sendStartupDraftPaste'
-  },
-  {
-    path: 'src/renderer/src/lib/active-agent-note-send.ts',
-    classification: 'action-consumer',
-    marker: 'sendNotesToActiveAgentSession'
-  },
-  {
-    path: 'src/renderer/src/components/native-chat/native-chat-runtime-send.ts',
-    classification: 'action-consumer',
-    marker: 'sendNativeChatMessage'
-  },
-  {
-    path: 'mobile/src/session/mobile-native-chat-send.ts',
-    classification: 'action-consumer',
-    marker: 'sendMobileNativeChatMessageWithOutcome'
-  },
-  {
-    path: 'mobile/src/session/mobile-native-chat-image-send.ts',
-    classification: 'action-consumer',
-    marker: 'pasteMobileNativeChatImagePaths'
-  },
-  {
-    path: 'mobile/src/session/pr-ai-triage-launch.ts',
-    classification: 'action-consumer',
-    marker: 'createTerminalAndSendPrompt'
-  }
-]
-
-describe('pane agent identity inventory ratchet', () => {
-  it('classifies every legacy helper definition, import, and callsite in src and mobile/src', async () => {
-    const files = await glob(['src/**/*.{ts,tsx}', 'mobile/src/**/*.{ts,tsx}'], {
-      ignore: ['**/*.test.*', '**/*.spec.*']
-    })
-    const actual: { helper: Helper; path: string; occurrences: number }[] = []
-    for (const path of files) {
-      if (isTestFile(path) || TEST_SUPPORT_PATHS.has(path)) {
-        continue
-      }
-      const rawSource = readFileSync(join(process.cwd(), path), 'utf8')
-      if (!HELPERS.some((helper) => rawSource.includes(helper))) {
-        continue
-      }
-      const decommentedSource = stripComments(rawSource)
-      if (blankStringContentsDesynced(decommentedSource)) {
-        throw new Error(`String scanner desynchronized while inventorying ${path}`)
-      }
-      const source = blankStringContents(decommentedSource)
-      for (const helper of HELPERS) {
-        const occurrences = source.match(new RegExp(`\\b${helper}\\b`, 'g'))?.length ?? 0
-        if (occurrences > 0) {
-          actual.push({ helper, path, occurrences })
-        }
-      }
-    }
-    const expected = INVENTORY.flatMap(({ helper, paths }) =>
-      paths.map((site) => {
-        const [path, occurrences] = typeof site === 'string' ? [site, 1] : site
-        return { helper, path, occurrences }
-      })
-    )
-    const byHelperAndPath = (left: (typeof actual)[number], right: (typeof actual)[number]) =>
-      left.helper.localeCompare(right.helper) || left.path.localeCompare(right.path)
-    expect(actual.sort(byHelperAndPath)).toEqual(expected.sort(byHelperAndPath))
-  }, 30_000)
-
-  it('pins direct single-source identity and action branches outside named helpers', () => {
-    for (const site of DIRECT_SINGLE_SOURCE_SURFACES) {
-      const source = stripComments(readFileSync(join(process.cwd(), site.path), 'utf8'))
-      expect({
-        path: site.path,
-        classification: site.classification,
-        hasMarker: source.includes(site.marker)
-      }).toEqual({ path: site.path, classification: site.classification, hasMarker: true })
-    }
-  })
-})
diff --git a/src/shared/pane-agent-identity-surface-inventory.test.ts b/src/shared/pane-agent-identity-surface-inventory.test.ts
deleted file mode 100644
index 77d9edb3b84c..000000000000
--- a/src/shared/pane-agent-identity-surface-inventory.test.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import { glob } from 'tinyglobby'
-import { isTestFile, stripComments } from './source-scan/source-tree-scan'
-
-/**
- * Surface half of the identity inventory ratchet: every consumer decision point from the closed
- * 65-row inventory (rows 32–65 — the direct title/native-chat selectors, tab projections, mobile
- * sync graph, lifecycle selectors, status/OSC ingress, worktree status, attention, and
- * title-reset paths) is pinned to a marker symbol in its file. The helper-name census
- * (`pane-agent-identity-inventory.test.ts`) is necessary but not sufficient — these files reach
- * identity through direct reads a name census cannot see. Moving or renaming a marker means the
- * inventory row must be re-classified, deliberately, before review.
- */
-
-type SurfaceRow = {
-  /** Row number in the closed consumer inventory. */
-  row: number
-  path: string
-  marker: string
-}
-
-const SURFACE_ROWS: readonly SurfaceRow[] = [
-  {
-    row: 32,
-    path: 'src/renderer/src/components/terminal-pane/native-chat-leaf-title-agent.ts',
-    marker: 'resolveNativeChatLeafTitleAgent'
-  },
-  {
-    row: 32,
-    path: 'src/renderer/src/components/terminal-pane/use-terminal-pane-chat-state.ts',
-    marker: 'resolveNativeChatLeafTitleAgent'
-  },
-  {
-    row: 33,
-    path: 'src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts',
-    marker: 'installPaneAgentIdentity'
-  },
-  { row: 34, path: 'src/main/runtime/orchestration/groups.ts', marker: 'terminalIsAgent' },
-  {
-    row: 35,
-    path: 'src/renderer/src/lib/active-agent-note-target.ts',
-    marker: 'getActiveTerminalNoteTarget'
-  },
-  {
-    row: 36,
-    path: 'src/renderer/src/components/terminal-pane/terminal-agent-paste-bracketing.ts',
-    marker: 'resolveProtectedMultilinePasteOptionsForPane'
-  },
-  {
-    row: 37,
-    path: 'src/renderer/src/components/terminal-pane/command-code-output-ownership.ts',
-    marker: 'canCommandCodeOutputOwnPane'
-  },
-  { row: 38, path: 'src/renderer/src/lib/agent-ready-wait.ts', marker: 'waitForAgentReady' },
-  {
-    row: 39,
-    path: 'src/renderer/src/lib/agent-paste-draft.ts',
-    marker: 'getSettingsForAgentTabRuntimeOwner'
-  },
-  {
-    row: 40,
-    path: 'src/renderer/src/lib/agent-followup-delivery.ts',
-    marker: 'sendFollowupPromptWhenAgentReady'
-  },
-  {
-    row: 41,
-    path: 'src/renderer/src/lib/codex-session-restart.ts',
-    marker: 'markLiveCodexSessionsForRestart'
-  },
-  {
-    row: 41,
-    path: 'src/renderer/src/lib/codex-pane-restart-eligibility.ts',
-    marker: 'isCodexForegroundProcess'
-  },
-  {
-    row: 42,
-    path: 'src/renderer/src/components/native-chat/native-chat-availability.ts',
-    marker: 'canToggleNativeChat'
-  },
-  {
-    row: 43,
-    path: 'src/renderer/src/components/native-chat/native-chat-pane-resolution.ts',
-    marker: 'resolveNativeChatSession'
-  },
-  {
-    row: 44,
-    path: 'src/renderer/src/components/terminal-pane/terminal-agent-session-continuation.ts',
-    marker: 'canContinueAgentSessionInNewSession'
-  },
-  {
-    row: 45,
-    path: 'src/renderer/src/components/terminal-pane/terminal-agent-session-fork.ts',
-    marker: 'prepareAgentSessionForkFromPane'
-  },
-  {
-    row: 46,
-    path: 'src/renderer/src/components/terminal-pane/agent-interrupt-inference.ts',
-    marker: 'isPlainEscapeKeyEvent'
-  },
-  {
-    row: 46,
-    path: 'src/renderer/src/components/terminal-pane/agent-question-answered-inference.ts',
-    marker: 'inferQuestionAnsweredFromCurrentStatus'
-  },
-  {
-    row: 47,
-    path: 'src/renderer/src/components/terminal-pane/terminal-keyboard-protocol-pane-agent.ts',
-    marker: 'resolvePaneKeyboardProtocolAgent'
-  },
-  {
-    row: 47,
-    path: 'src/renderer/src/components/terminal-pane/terminal-pane-manager-options.ts',
-    marker: 'resolvePaneKeyboardProtocolAgent'
-  },
-  {
-    row: 48,
-    path: 'src/renderer/src/components/tab-bar/tab-agent-types-by-tab-id.ts',
-    marker: 'selectTabAgentTypesByTabId'
-  },
-  {
-    row: 49,
-    path: 'src/renderer/src/components/terminal-pane/terminal-tab-agent-type-index.ts',
-    marker: 'createTerminalTabAgentTypeSelector'
-  },
-  {
-    row: 50,
-    path: 'src/renderer/src/lib/tab-agent-status-index.ts',
-    marker: 'selectLiveTabAgentPanes'
-  },
-  {
-    row: 51,
-    path: 'src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts',
-    marker: 'resolveTerminalTabActivityStatus'
-  },
-  {
-    row: 52,
-    path: 'src/renderer/src/lib/workspace-tab-agent-metadata.ts',
-    marker: 'maxAgentActivityAt'
-  },
-  {
-    row: 52,
-    path: 'src/renderer/src/lib/workspace-tab-palette-entry-builder.ts',
-    marker: 'buildSearchableWorkspaceTabEntries'
-  },
-  {
-    row: 53,
-    path: 'src/renderer/src/lib/running-agent-targets.ts',
-    marker: 'deriveRunningAgentSendTargets'
-  },
-  {
-    row: 54,
-    path: 'src/renderer/src/runtime/sync-runtime-graph.ts',
-    marker: 'buildMobileSessionTabSnapshots'
-  },
-  {
-    row: 55,
-    path: 'src/renderer/src/lib/agent-hibernation-pane-eligibility.ts',
-    marker: 'toRuntimePtyId'
-  },
-  {
-    row: 56,
-    path: 'src/renderer/src/lib/resume-sleeping-agent-session.ts',
-    marker: 'resumeSleepingAgentSessionsForWorktree'
-  },
-  {
-    row: 57,
-    path: 'src/renderer/src/lib/automation-session-reuse.ts',
-    marker: 'findReusableAutomationSession'
-  },
-  {
-    row: 58,
-    path: 'src/renderer/src/components/terminal-pane/pty-connection/cold-restore-resume-startup.ts',
-    marker: 'bindBuildColdRestoreAgentResumeStartup'
-  },
-  {
-    row: 59,
-    path: 'src/main/agent-hooks/server/server-authority-evidence.ts',
-    marker: 'recordCurrentAuthorityObservation'
-  },
-  {
-    row: 59,
-    path: 'src/main/runtime/orca-runtime-write-orchestration-pointer-pty.ts',
-    marker: 'resolvePaneAgentIdentityField'
-  },
-  {
-    row: 59,
-    path: 'src/renderer/src/hooks/ipc-events/agent-status-event-applicator.ts',
-    marker: 'createAgentStatusEventApplicator'
-  },
-  {
-    row: 59,
-    path: 'src/renderer/src/store/slices/agent-status-authority-actions.ts',
-    marker: 'transferAgentPaneAuthority'
-  },
-  {
-    row: 59,
-    path: 'src/renderer/src/store/slices/pane-foreground-agent.ts',
-    marker: 'createPaneForegroundAgentSlice'
-  },
-  {
-    row: 59,
-    path: 'src/renderer/src/hooks/ipc-events/agent-status-routing.ts',
-    marker: 'isAgentStatusForRecentlyClosedTab'
-  },
-  {
-    row: 60,
-    path: 'src/renderer/src/components/terminal-pane/pty-connection/title-spawn-bell.ts',
-    marker: 'installTitleSpawnBell'
-  },
-  { row: 61, path: 'src/renderer/src/lib/worktree-status.ts', marker: 'getWorktreeStatus' },
-  {
-    row: 62,
-    path: 'src/main/runtime/runtime-worktree-status-projection.ts',
-    marker: 'getLeafWorktreeStatus'
-  },
-  {
-    row: 63,
-    path: 'src/renderer/src/components/sidebar/smart-attention.ts',
-    marker: 'buildAttentionByWorktree'
-  },
-  {
-    row: 64,
-    path: 'src/renderer/src/components/status-bar/workspace-space-presentation.ts',
-    marker: 'countWorkspaceSpaceActiveAgents'
-  },
-  { row: 65, path: 'src/renderer/src/store/slices/terminal-helpers.ts', marker: 'getResetTitle' },
-  {
-    row: 6,
-    path: 'src/renderer/src/runtime/web-session-tabs-sync.ts',
-    marker: 'applyWebSessionTabs'
-  }
-]
-
-describe('pane agent identity surface inventory (rows 6, 32–65)', () => {
-  it('every pinned surface still carries its marker symbol', () => {
-    for (const row of SURFACE_ROWS) {
-      const source = stripComments(readFileSync(join(process.cwd(), row.path), 'utf8'))
-      expect({ row: row.row, path: row.path, hasMarker: source.includes(row.marker) }).toEqual({
-        row: row.row,
-        path: row.path,
-        hasMarker: true
-      })
-    }
-  })
-})
-
-/**
- * Identity-observation rebind audit. Advancing a pane incarnation without a positive replacement
- * proof is how a legitimate reclaim and a stale-hook bug get conflated (see
- * `PaneReplacementProof` in pane-agent-identity-adapter.ts). Every existing sequencer `rebind`
- * call is pinned here by file and count: today they are the retired-pane `restart` disposition
- * (three ingress paths) and the renderer pane-key transfer. Adding a rebind call, or changing
- * these, requires updating this audit — and per the migration plan, a `replacementProof`.
- */
-const IDENTITY_SEQUENCER_REBIND_RE = /\b(?:observations|rendererAgentStatusObservations)\.rebind\(/g
-
-const EXPECTED_REBIND_SITES: readonly (readonly [path: string, occurrences: number])[] = [
-  ['src/main/agent-hooks/server/server-ingest-normalization.ts', 1],
-  ['src/main/agent-hooks/server/server-ingest-remote.ts', 1],
-  ['src/main/agent-hooks/server/server-lifecycle.ts', 1],
-  ['src/renderer/src/store/slices/agent-status-authority-actions.ts', 1]
-]
-
-describe('identity observation rebind audit', () => {
-  it('pins every identity-sequencer rebind call site by file and count', async () => {
-    const files = await glob(['src/**/*.{ts,tsx}', 'mobile/src/**/*.{ts,tsx}'], {
-      ignore: ['**/*.test.*', '**/*.spec.*']
-    })
-    const actual: [string, number][] = []
-    for (const path of files.sort()) {
-      if (isTestFile(path)) {
-        continue
-      }
-      const source = stripComments(readFileSync(join(process.cwd(), path), 'utf8'))
-      const occurrences = source.match(IDENTITY_SEQUENCER_REBIND_RE)?.length ?? 0
-      if (occurrences > 0) {
-        actual.push([path, occurrences])
-      }
-    }
-    expect(actual).toEqual(EXPECTED_REBIND_SITES.map((site) => [...site]))
-  }, 30_000)
-})
diff --git a/src/shared/persisted-ui-state-types.ts b/src/shared/persisted-ui-state-types.ts
index aca9d743632e..d948be305f34 100644
--- a/src/shared/persisted-ui-state-types.ts
+++ b/src/shared/persisted-ui-state-types.ts
@@ -122,6 +122,8 @@ export type PersistedUIState = {
   _grokStatusBarDefaultAdded?: boolean
   /** One-shot migration flag for adding the default-on Cursor status item. */
   _cursorStatusBarDefaultAdded?: boolean
+  /** One-shot migration flag for adding the default-on ZCode status item. */
+  _zcodeStatusBarDefaultAdded?: boolean
   statusBarItems: StatusBarItem[]
   statusBarVisible: boolean
   /** Why: this is client-side presentation, not a provider/account or execution-host setting. */
@@ -168,6 +170,8 @@ export type PersistedUIState = {
   usagePercentageDisplayChangeNoticeDismissed?: boolean
   /** User-hidden empty-state usage CTA; permanently hides the "Connect AI accounts" prompt even if providers are later disconnected. */
   usageEmptyStateDismissed?: boolean
+  /** One-shot toast announcing per-terminal Codex servers; set when shown, so absent means not yet seen. */
+  codexTerminalServerIsolationNoticeSeen?: boolean
   /** URL for new browser tabs; null = blank tab. */
   browserDefaultUrl?: string | null
   browserDefaultSearchEngine?: 'google' | 'duckduckgo' | 'bing' | 'kagi' | null
diff --git a/src/shared/priority-semaphore.test.ts b/src/shared/priority-semaphore.test.ts
index aeeacda94ef0..5cfbe898bdc8 100644
--- a/src/shared/priority-semaphore.test.ts
+++ b/src/shared/priority-semaphore.test.ts
@@ -2,19 +2,6 @@ import { describe, expect, it } from 'vitest'
 import { PrioritySemaphore } from './priority-semaphore'
 
 describe('PrioritySemaphore', () => {
-  it('allows up to N concurrent acquires', async () => {
-    const sem = new PrioritySemaphore(2)
-    const r1 = await sem.acquire(0)
-    const r2 = await sem.acquire(0)
-
-    // Both acquired immediately
-    expect(typeof r1).toBe('function')
-    expect(typeof r2).toBe('function')
-
-    r1()
-    r2()
-  })
-
   it('blocks when concurrency limit is reached', async () => {
     const sem = new PrioritySemaphore(1)
     const r1 = await sem.acquire(0)
@@ -129,23 +116,6 @@ describe('PrioritySemaphore', () => {
     expect(order[0]).toBe('B-high')
   })
 
-  it('works with zero waiters', async () => {
-    const sem = new PrioritySemaphore(3)
-    const r1 = await sem.acquire(0)
-    r1()
-    // No crash, no hanging
-  })
-
-  it('release is idempotent', async () => {
-    const sem = new PrioritySemaphore(1)
-    const r1 = await sem.acquire(0)
-    r1()
-    r1() // double release should not throw or corrupt state
-
-    const r2 = await sem.acquire(0)
-    r2()
-  })
-
   it('removes an aborted waiter without consuming the next permit', async () => {
     const sem = new PrioritySemaphore(1)
     const release = await sem.acquire(0)
diff --git a/src/shared/process-table-snapshot.test.ts b/src/shared/process-table-snapshot.test.ts
index fea3d891b6d7..19aa43127649 100644
--- a/src/shared/process-table-snapshot.test.ts
+++ b/src/shared/process-table-snapshot.test.ts
@@ -300,16 +300,6 @@ describe('shared process-table capture', () => {
     ])
   })
 
-  it('builds only the indexes a resolver reads', () => {
-    // Why: an unread group index costs two maps plus a per-row array on every
-    // capture, on the exact path this reader exists to make cheap.
-    const index = buildProcessTableIndex(
-      parseStrictProcessTableRows('100 1 100 101 Ss /bin/zsh\n101 100 101 101 S+ node /opt/codex')
-    )
-
-    expect(Object.keys(index).sort()).toEqual(['byPid', 'childrenByPpid', 'rows', 'stats'])
-  })
-
   it('keeps the lenient view readable when the same capture is strictly unreadable', async () => {
     const forks = mockPsCaptures('100 1 Ss+ /bin/zsh\n')
 
@@ -502,14 +492,6 @@ describe('getProcessTableIndex', () => {
     expect(buildProcessTableIndex(rows).byPid.get(100)).toBe(rows[0])
   })
 
-  it('materializes only the maps the descendant walk reads', () => {
-    // Why: this memo exists to cut relay CPU; four indexes for two readers would
-    // make a single-pane relay pay more per capture than the code it replaced.
-    const index = getProcessTableIndex(parseProcessTableRows('100 1 Ss bash'))
-
-    expect(Object.keys(index).sort()).toEqual(['byPid', 'childrenByPpid', 'rows', 'stats'])
-  })
-
   it('keeps the memo out of measured builds so a cache hit cannot satisfy a perf gate', () => {
     const rows = parseProcessTableRows('100 1 Ss bash')
     const stats: ProcessTableIndexStats = {
diff --git a/src/shared/protocol-version.ts b/src/shared/protocol-version.ts
index 96077df602c1..80ebf57d0a61 100644
--- a/src/shared/protocol-version.ts
+++ b/src/shared/protocol-version.ts
@@ -180,6 +180,17 @@ export const STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY = 'agent-session.struct
 // clients skip the host's bounded best-effort settlement observation.
 export const AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY =
   'agent-session.pending-send-result.v1' as const
+// Why: a send is now answered once the host accepts it, before any agent has it. A client without
+// this cannot show a message rejected after that answer, so the host holds its reply until the
+// message is handed over or rejected. Transitional: drop the hold once no supported desktop or
+// mobile client lacks the capability; mobile must first show a rejected message in place.
+export const AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY =
+  'agent-session.accepted-send.v1' as const
+// Why: `agentSession.cancel` params are strict and older hosts require `turnId`. A host advertising
+// this takes a cancel naming no turn as "stop what the conversation has in flight", which is the
+// only Stop a client can send before the provider has opened a turn.
+export const AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY =
+  'agent-session.conversation-stop.v1' as const
 // Why: paired clients advertise Claude-structured support so the host can gate its agent-specific
 // journal and lifecycle surfaces independently from Codex support.
 export const CLAUDE_STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY =
@@ -244,6 +255,11 @@ export const AGENT_SESSION_KIMI_RESUME_RUNTIME_CAPABILITY = 'agent-session.kimi-
 export const AGENT_SESSION_OPENCODE2_RESUME_RUNTIME_CAPABILITY =
   'agent-session.opencode2-resume.v1' as const
 export const AGENT_SESSION_MUSE_RESUME_RUNTIME_CAPABILITY = 'agent-session.muse-resume.v1' as const
+export const AGENT_SESSION_DSH_RESUME_RUNTIME_CAPABILITY = 'agent-session.dsh-resume.v1' as const
+export const AGENT_SESSION_CODEBUDDY_RESUME_RUNTIME_CAPABILITY =
+  'agent-session.codebuddy-resume.v1' as const
+export const AGENT_SESSION_QODER_RESUME_RUNTIME_CAPABILITY =
+  'agent-session.qoder-resume.v1' as const
 export const AGENT_SESSION_ZCODE_RESUME_RUNTIME_CAPABILITY =
   'agent-session.zcode-resume.v1' as const
 // Why: older runtimes strip mutation owner fields, so clients must fence writes before RPC.
@@ -320,6 +336,7 @@ export const NATIVE_REMOTE_RUNTIME_CLIENT_CAPABILITIES = [
 export const ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES = [
   ...NATIVE_REMOTE_RUNTIME_CLIENT_CAPABILITIES,
   AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY,
+  AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
   BROWSER_CLIENT_HOST_RUNTIME_CAPABILITY,
   BROWSER_CLIENT_PAGE_METADATA_RUNTIME_CAPABILITY,
   // Why: only the renderer runs the retirement-proof ledger; CLI and mobile must keep full lists.
@@ -392,6 +409,10 @@ export const RUNTIME_CAPABILITIES = [
   AGENT_SESSION_KEYBOARD_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
   AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY,
+  // The host side: it accepts a send before any agent has it, and a Stop with no writer before a
+  // turn starts, so a client may gate on either.
+  AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
+  AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_HOLD_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_REVEAL_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY,
@@ -407,6 +428,9 @@ export const RUNTIME_CAPABILITIES = [
   AGENT_SESSION_KIMI_RESUME_RUNTIME_CAPABILITY,
   AGENT_SESSION_OPENCODE2_RESUME_RUNTIME_CAPABILITY,
   AGENT_SESSION_MUSE_RESUME_RUNTIME_CAPABILITY,
+  AGENT_SESSION_DSH_RESUME_RUNTIME_CAPABILITY,
+  AGENT_SESSION_QODER_RESUME_RUNTIME_CAPABILITY,
+  AGENT_SESSION_CODEBUDDY_RESUME_RUNTIME_CAPABILITY,
   AGENT_SESSION_ZCODE_RESUME_RUNTIME_CAPABILITY,
   FILE_MUTATION_OWNERSHIP_RUNTIME_CAPABILITY,
   GITHUB_MARK_PR_READY_RUNTIME_CAPABILITY,
diff --git a/src/shared/pty-liveness-verdict.ts b/src/shared/pty-liveness-verdict.ts
index 0dd650161f38..ae1632572428 100644
--- a/src/shared/pty-liveness-verdict.ts
+++ b/src/shared/pty-liveness-verdict.ts
@@ -27,6 +27,17 @@ export function describeUnconfirmedStop(reason: string): string {
   return `The PTY was not confirmed stopped: ${endSentence(reason)}`
 }
 
+/** A close's unconfirmed-stop sentence; it promises a retry only when the host recorded one. */
+export function describeUnconfirmedCloseStop(close: {
+  ptyStopReason?: string
+  pendingKillRecorded?: true
+}): string {
+  const sentence = describeUnconfirmedStop(close.ptyStopReason ?? 'its host could not be reached')
+  return close.pendingKillRecorded === true
+    ? `${sentence} The kill retries when the host reconnects.`
+    : sentence
+}
+
 /** Words a close whose PTY teardown was never confirmed, for a stop receipt. */
 export function describeUnconfirmedAgentStop(close: {
   ptyStopVerdict?: 'live' | 'unverifiable'
diff --git a/src/shared/qoder-agent.test.ts b/src/shared/qoder-agent.test.ts
new file mode 100644
index 000000000000..8db665e72094
--- /dev/null
+++ b/src/shared/qoder-agent.test.ts
@@ -0,0 +1,160 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import {
+  recognizeAgentProcessFromCommandLine,
+  isExpectedAgentProcess
+} from './agent-process-recognition'
+import {
+  getAgentLabel,
+  isGeminiTerminalTitle,
+  normalizeTerminalTitle,
+  detectAgentStatusFromTitle
+} from './agent-detection'
+import { buildAgentStartupPlan } from './tui-agent-startup'
+import { getAgentResumeArgv } from './agent-session-resume'
+import { createHookListenerState } from './agent-hook-listener/listener-state'
+import { normalizeAndAccept } from './agent-hook-listener-test-harness'
+
+describe('Qoder agent identity and lifecycle', () => {
+  it('recognizes the installed versioned binary on native platforms and excludes headless runs', () => {
+    for (const command of [
+      'qodercli',
+      '/home/dev/.qoder/bin/qodercli/qodercli-1.1.64',
+      'C:\\Qoder\\qodercli-1.1.64.exe'
+    ]) {
+      expect(recognizeAgentProcessFromCommandLine(command)?.agent).toBe('qoder')
+      expect(isExpectedAgentProcess(command, 'qodercli')).toBe(true)
+    }
+    expect(recognizeAgentProcessFromCommandLine('qodercli --print hello')).toBeNull()
+    for (const args of [
+      '-o json',
+      '--input-format=stream-json',
+      '--remote-control session',
+      '--acp',
+      '--delete-session 1'
+    ]) {
+      expect(recognizeAgentProcessFromCommandLine(`qodercli ${args}`)).toBeNull()
+    }
+    expect(recognizeAgentProcessFromCommandLine('qodercli --prompt-interactive hello')?.agent).toBe(
+      'qoder'
+    )
+    expect(recognizeAgentProcessFromCommandLine('qodercli-unrelated')).toBeNull()
+  })
+
+  it.each([
+    ['◇ Qoder CLI | Ready', 'idle'],
+    ['✦ Implement feature | Thinking', 'working'],
+    ['▲ Implement feature | Confirm', 'permission']
+  ] as const)('keeps %s attributed through title storage', (title, status) => {
+    const stored = normalizeTerminalTitle(title.padEnd(80))
+    expect(getAgentLabel(stored)).toBe('Qoder CLI')
+    expect(isGeminiTerminalTitle(title)).toBe(false)
+    expect(detectAgentStatusFromTitle(stored)).toBe(status)
+    expect(normalizeTerminalTitle(stored)).toBe(stored)
+  })
+
+  it('keeps upstream Gemini titles and arbitrary triangle text unchanged', () => {
+    expect(isGeminiTerminalTitle('✦  Working (project)')).toBe(true)
+    expect(getAgentLabel('deploy ▲ complete')).not.toBe('Qoder CLI')
+  })
+
+  it('tracks start, work, permission, completion and resume without becoming Claude', () => {
+    const state = createHookListenerState()
+    const session = { session_id: 'qoder-session', transcript_path: '/tmp/qoder-session.jsonl' }
+    const send = (hook_event_name: string, extra = {}) =>
+      normalizeAndAccept(state, 'qoder', { ...session, hook_event_name, ...extra })
+    const started = send('SessionStart', { source: 'startup' })
+    expect(started?.payload).toMatchObject({
+      agentType: 'qoder',
+      state: 'done',
+      sessionBoundary: true
+    })
+    expect(started?.providerSession).toMatchObject({ id: 'qoder-session' })
+    expect(send('UserPromptSubmit', { prompt: 'Fix the bug' })?.payload).toMatchObject({
+      state: 'working',
+      agentType: 'qoder',
+      prompt: 'Fix the bug'
+    })
+    expect(
+      send('PermissionRequest', { tool_name: 'Bash', tool_input: { command: 'pwd' } })?.payload
+    ).toMatchObject({ state: 'waiting', toolName: 'Bash' })
+    expect(send('PostToolUse', { tool_name: 'Bash' })?.payload.state).toBe('working')
+    expect(send('SessionStart', { source: 'compact' })).toBeNull()
+    expect(send('Stop', { last_assistant_message: 'Fixed.' })?.payload).toMatchObject({
+      state: 'done',
+      lastAssistantMessage: 'Fixed.'
+    })
+    expect(send('StopFailure', { error: 'Unavailable' })?.payload.mainAgent).toMatchObject({
+      outcome: 'failure'
+    })
+    expect(getAgentResumeArgv('qoder', { key: 'session_id', id: 'qoder-session' })).toEqual([
+      'qodercli',
+      '--resume',
+      'qoder-session'
+    ])
+  })
+})
+
+it('replays captured unauthenticated startup, prompt, idle and resume hooks', () => {
+  const state = createHookListenerState()
+  const lines = readFileSync(
+    join(__dirname, '__fixtures__', 'qoder-no-account-hooks.jsonl'),
+    'utf8'
+  )
+    .trim()
+    .split('\n')
+  const events = lines.map((line) => normalizeAndAccept(state, 'qoder', JSON.parse(line)))
+  expect(events.map((event) => event?.payload.state)).toEqual([
+    'done',
+    'working',
+    'done',
+    'done',
+    'done',
+    'done'
+  ])
+  expect(events.every((event) => event?.payload.agentType === 'qoder')).toBe(true)
+  expect(events[4]?.payload.sessionBoundary).toBe(true)
+  expect(events[4]?.providerSession?.id).toBe(events[0]?.providerSession?.id)
+})
+
+it.each(['darwin', 'linux', 'win32'] as const)(
+  'launches a Qoder prompt safely on %s',
+  (platform) => {
+    const plan = buildAgentStartupPlan({
+      agent: 'qoder',
+      prompt: "fix Bob's branch; echo $HOME",
+      cmdOverrides: {},
+      platform
+    })
+    expect(plan?.expectedProcess).toBe('qodercli')
+    expect(plan?.followupPrompt).toBeNull()
+    expect(plan?.launchCommand).toBe(
+      platform === 'win32'
+        ? "qodercli --prompt-interactive 'fix Bob''s branch; echo $HOME'"
+        : `qodercli --prompt-interactive 'fix Bob'"'"'s branch; echo $HOME'`
+    )
+  }
+)
+
+it('does not rewrite DSH titles containing a pipe as Qoder', () => {
+  const title = '✦ 🐋 refactor parser | run tests'
+  expect(normalizeTerminalTitle(title)).toBe(title)
+  expect(getAgentLabel(title)).not.toBe('Qoder CLI')
+  expect(detectAgentStatusFromTitle(title)).not.toBe('working')
+})
+
+it('settles manual compaction without interrupting automatic compaction', () => {
+  const state = createHookListenerState()
+  const send = (hook_event_name: string, extra = {}) =>
+    normalizeAndAccept(state, 'qoder', { hook_event_name, ...extra })
+  expect(send('UserPromptSubmit', { prompt: 'Refactor' })?.payload.state).toBe('working')
+  expect(send('PreCompact', { trigger: 'manual' })).toBeNull()
+  expect(send('PostCompact', { trigger: 'auto' })).toBeNull()
+  expect(send('SessionStart', { source: 'compact' })).toBeNull()
+  expect(send('PostCompact', { trigger: 'manual' })?.payload).toMatchObject({
+    state: 'done',
+    sessionBoundary: true,
+    agentType: 'qoder'
+  })
+})
diff --git a/src/shared/qoder-headless-command.ts b/src/shared/qoder-headless-command.ts
new file mode 100644
index 000000000000..6ffb16ca9b37
--- /dev/null
+++ b/src/shared/qoder-headless-command.ts
@@ -0,0 +1,31 @@
+import { isPrintModeHeadlessOneShotCommand, optionName } from './print-mode-headless-command'
+
+export function isQoderHeadlessCommand(tokens: readonly string[]): boolean {
+  if (isPrintModeHeadlessOneShotCommand(tokens)) {
+    return true
+  }
+  for (let index = 1; index < tokens.length; index += 1) {
+    const token = tokens[index]
+    if (token === '--') {
+      return false
+    }
+    const name = optionName(token)
+    const value = token.includes('=') ? token.slice(token.indexOf('=') + 1) : tokens[index + 1]
+    if (name === '-o' && (value === 'json' || value === 'stream-json')) {
+      return true
+    }
+    if (name === '--input-format' && value === 'stream-json') {
+      return true
+    }
+    if (
+      name === '--remote-control' ||
+      name === '--remote' ||
+      name === '--list-sessions' ||
+      name === '--delete-session' ||
+      name === '--acp'
+    ) {
+      return true
+    }
+  }
+  return false
+}
diff --git a/src/shared/qoder-terminal-title.ts b/src/shared/qoder-terminal-title.ts
new file mode 100644
index 000000000000..e21b9dbb0e38
--- /dev/null
+++ b/src/shared/qoder-terminal-title.ts
@@ -0,0 +1,21 @@
+import { isDshTerminalTitle } from './dsh-terminal-title'
+
+// Qoder 1.1.64: one space after the glyph, then a session title and a pipe-delimited status.
+const QODER_DYNAMIC_TITLE_RE = /^[✦◇▲] (?! ).*\s\|\s[^|]+$/
+const QODER_LABEL_RE = /^(?:[✦◇▲] )?Qoder CLI(?: CN)?(?: \(.*\))?$/
+
+export function isQoderTerminalTitle(title: string): boolean {
+  if (isDshTerminalTitle(title)) {
+    return false
+  }
+  const trimmed = title.trim()
+  return QODER_DYNAMIC_TITLE_RE.test(trimmed) || QODER_LABEL_RE.test(trimmed)
+}
+
+export function qoderTitleStatus(title: string): 'working' | 'permission' | 'idle' | null {
+  if (!isQoderTerminalTitle(title)) {
+    return null
+  }
+  const glyph = title.trimStart()[0]
+  return glyph === '✦' ? 'working' : glyph === '▲' ? 'permission' : 'idle'
+}
diff --git a/src/shared/rate-limit-state-factory.ts b/src/shared/rate-limit-state-factory.ts
index 3dade988f0b9..494f56e4dff1 100644
--- a/src/shared/rate-limit-state-factory.ts
+++ b/src/shared/rate-limit-state-factory.ts
@@ -12,6 +12,7 @@ export function createEmptyRateLimitState(overrides: Partial<RateLimitState> = {
     minimax: null,
     grok: null,
     cursor: null,
+    zcode: null,
     minimaxCookieConfigured: false,
     minimaxApiKeyConfigured: false,
     opencodeGoApiKeyConfigured: false,
diff --git a/src/shared/rate-limit-types.test.ts b/src/shared/rate-limit-types.test.ts
index b24e40385794..556af5785659 100644
--- a/src/shared/rate-limit-types.test.ts
+++ b/src/shared/rate-limit-types.test.ts
@@ -17,6 +17,7 @@ describe('RateLimitState', () => {
       minimax: null,
       grok: null,
       cursor: null,
+      zcode: null,
       minimaxCookieConfigured: false,
       minimaxApiKeyConfigured: false,
       opencodeGoApiKeyConfigured: false,
diff --git a/src/shared/rate-limit-types.ts b/src/shared/rate-limit-types.ts
index 48ff7c7abe35..6b06f09d10e9 100644
--- a/src/shared/rate-limit-types.ts
+++ b/src/shared/rate-limit-types.ts
@@ -58,6 +58,7 @@ export type ProviderRateLimits = {
     | 'grok'
     | 'antigravity'
     | 'cursor'
+    | 'zcode'
   /** 5-hour session window, null if not available. */
   session: RateLimitWindow | null
   /** 7-day weekly window, null if not available. */
@@ -139,6 +140,7 @@ export type RateLimitState = {
   minimax: ProviderRateLimits | null
   grok: ProviderRateLimits | null
   cursor: ProviderRateLimits | null
+  zcode: ProviderRateLimits | null
   /**
    * True when a MiniMax session cookie is persisted on disk. The cookie lives
    * outside GlobalSettings, so this flag is the durable signal that the
diff --git a/src/shared/ripgrep-process-availability.ts b/src/shared/ripgrep-process-availability.ts
index 4c39916aed8b..6fa761cc02e9 100644
--- a/src/shared/ripgrep-process-availability.ts
+++ b/src/shared/ripgrep-process-availability.ts
@@ -1,6 +1,7 @@
 import { constants } from 'node:fs'
 import { access, stat } from 'node:fs/promises'
-import { spawn, type ChildProcess } from 'node:child_process'
+import { spawnProcess, type ChildProcessHandle } from './child-process/run-process'
+import { abortSignalReason, throwIfSignalAborted } from './abort-signal-reason'
 
 const RIPGREP_CWD_CHECK_TIMEOUT_MS = 1000
 const RIPGREP_FAILURE_PROBE_TIMEOUT_MS = 5000
@@ -36,7 +37,7 @@ export function isTransientRipgrepSpawnError(error: unknown): boolean {
 
 function ignoreRipgrepSpawnError(): void {}
 
-export function killSpawnedRipgrepProcess(child: ChildProcess): boolean {
+export function killSpawnedRipgrepProcess(child: ChildProcessHandle): boolean {
   // Why: killing a failed-spawn handle can signal the relay's own process group.
   if (Object.hasOwn(child, 'pid') && child.pid === undefined) {
     return false
@@ -45,7 +46,7 @@ export function killSpawnedRipgrepProcess(child: ChildProcess): boolean {
 }
 
 export function absorbPendingRipgrepSpawnError(
-  child: ChildProcess,
+  child: ChildProcessHandle,
   state: { errorObserved: boolean; unavailableExitObserved: boolean }
 ): void {
   if (
@@ -77,12 +78,19 @@ export async function isRipgrepSpawnCwdUsable(cwd: string): Promise<boolean> {
   }
 }
 
-function probeRipgrepVersion(command: string, env: NodeJS.ProcessEnv): Promise<boolean> {
-  return new Promise((resolve) => {
-    let child: ChildProcess
+function probeRipgrepVersion(
+  command: string,
+  env: NodeJS.ProcessEnv,
+  signal?: AbortSignal
+): Promise<boolean> {
+  if (signal?.aborted) {
+    return Promise.reject(abortSignalReason(signal))
+  }
+  return new Promise((resolve, reject) => {
+    let child: ChildProcessHandle
     try {
       // windowsHide: a probe must never flash a console window on Windows.
-      child = spawn(command, ['--version'], { env, stdio: 'ignore', windowsHide: true })
+      child = spawnProcess({ program: command, args: ['--version'], env, stdio: 'ignore' })
     } catch {
       resolve(false)
       return
@@ -91,26 +99,45 @@ function probeRipgrepVersion(command: string, env: NodeJS.ProcessEnv): Promise<b
     // Why kill on timeout: a `rg --version` that hangs -- a stalled network mount, or antivirus
     // holding a just-installed rg.exe -- would otherwise leave a live process and a ref'd handle
     // behind for the relay's lifetime, once per launch failure.
-    const settle = (available: boolean, kill = false): void => {
+    const settle = (available: boolean, kill = false, error?: Error): void => {
       if (settled) {
         return
       }
       settled = true
       clearTimeout(timeout)
+      signal?.removeEventListener('abort', onAbort)
       child.off('close', onClose)
+      child.off('error', onError)
+      // A queued spawn error or synchronous kill failure can arrive after cleanup.
+      child.once('error', ignoreRipgrepSpawnError)
       if (kill) {
-        killSpawnedRipgrepProcess(child)
+        try {
+          killSpawnedRipgrepProcess(child)
+        } catch {
+          // A refused kill must not strand the probe's settlement.
+        }
+      }
+      if (error) {
+        reject(error)
+      } else {
+        resolve(available)
       }
-      // Why leave one 'error' listener attached: a spawn error can still arrive after this
-      // settles, and an unhandled 'error' on a ChildProcess throws.
-      child.once('error', ignoreRipgrepSpawnError)
-      resolve(available)
     }
+    const onAbort = (): void => {
+      if (signal) {
+        settle(false, true, abortSignalReason(signal))
+      }
+    }
+    const onError = (): void => settle(false)
     const onClose = (code: number | null): void => settle(code === 0)
-    child.once('error', () => settle(false))
+    child.once('error', onError)
     child.once('close', onClose)
     const timeout = setTimeout(() => settle(false, true), RIPGREP_FAILURE_PROBE_TIMEOUT_MS)
     timeout.unref?.()
+    signal?.addEventListener('abort', onAbort, { once: true })
+    if (signal?.aborted) {
+      onAbort()
+    }
   })
 }
 
@@ -129,13 +156,18 @@ function probeRipgrepVersion(command: string, env: NodeJS.ProcessEnv): Promise<b
 export async function classifyRipgrepLaunchFailure(
   cwd: string,
   candidates: readonly (string | null)[],
-  env: NodeJS.ProcessEnv
+  env: NodeJS.ProcessEnv,
+  signal?: AbortSignal
 ): Promise<'cwd-unreachable' | 'ripgrep-unavailable'> {
-  if (await isRipgrepSpawnCwdUsable(cwd)) {
+  throwIfSignalAborted(signal)
+  const usable = await isRipgrepSpawnCwdUsable(cwd)
+  throwIfSignalAborted(signal)
+  if (usable) {
     return 'ripgrep-unavailable'
   }
   for (const command of new Set(candidates.filter((entry) => entry !== null))) {
-    if (await probeRipgrepVersion(command, env)) {
+    throwIfSignalAborted(signal)
+    if (await probeRipgrepVersion(command, env, signal)) {
       return 'cwd-unreachable'
     }
   }
@@ -179,7 +211,7 @@ export async function classifySynchronousRipgrepSpawnFailure(
 }
 
 export function isRipgrepUnavailableExit(
-  child: ChildProcess,
+  child: ChildProcessHandle,
   code: number | null,
   signal: NodeJS.Signals | null,
   options: { classifyNativeLauncherExit?: boolean } = {}
diff --git a/src/shared/rpc-contract/agent-launch-params.ts b/src/shared/rpc-contract/agent-launch-params.ts
index 3fd12f52eede..3926c610708a 100644
--- a/src/shared/rpc-contract/agent-launch-params.ts
+++ b/src/shared/rpc-contract/agent-launch-params.ts
@@ -18,6 +18,7 @@ import { isValidHostTerminalTabId } from '../terminal-tab-id'
 import { isTuiAgent } from '../tui-agent-config'
 import type { TuiAgent } from '../tui-agent'
 import { WorktreeCreate } from './worktree-create-params'
+import { LaunchSourceParam } from './launch-source-param'
 import { TerminalTabIdParam } from './agent-session-params'
 import { SessionId } from './structured-agent-session-params'
 import { isStructuredAgentSessionIdFor } from '../structured-agent-session-create'
@@ -78,16 +79,7 @@ export const AgentLaunchFields = z.object({
   /** A start directory other than the workspace root. Terminal-only, and the host downgrades a
    *  structured launch that carries one rather than ignoring it. */
   cwd: z.string().min(1, 'Empty launch cwd').optional(),
-  /**
-   * Telemetry attribution, deliberately `z.string()` rather than the closed `launchSourceSchema`.
-   *
-   * Params are validated by the HOST, so a closed enum here is a version claim pointing the wrong
-   * way: a newer client naming a launch surface an older host has never heard of would have its
-   * whole launch refused over a label nothing reads as behaviour. Bookkeeping must not gate a user
-   * action, so the arm set stays open here and the host parses it leniently at the point it is
-   * actually used — the same `safeParse`-and-skip the PTY spawn already does.
-   */
-  launchSource: z.string().optional(),
+  launchSource: LaunchSourceParam.optional(),
   /**
    * The pane a terminal launch should create, minted by a caller that places its own tabs.
    *
diff --git a/src/shared/rpc-contract/client-ui-params.ts b/src/shared/rpc-contract/client-ui-params.ts
index 43e5ebf8d7f6..06fb569ffaac 100644
--- a/src/shared/rpc-contract/client-ui-params.ts
+++ b/src/shared/rpc-contract/client-ui-params.ts
@@ -75,6 +75,7 @@ export const StatusBarItem = z.enum([
   'minimax',
   'grok',
   'cursor',
+  'zcode',
   'ssh',
   'resource-usage',
   'ports'
@@ -193,6 +194,7 @@ export const UiUpdateFields = z
     _antigravityStatusBarDefaultAdded: z.boolean().optional(),
     _grokStatusBarDefaultAdded: z.boolean().optional(),
     _cursorStatusBarDefaultAdded: z.boolean().optional(),
+    _zcodeStatusBarDefaultAdded: z.boolean().optional(),
     statusBarVisible: z.boolean().optional(),
     usagePercentageDisplay: z.enum(['used', 'remaining']).optional(),
     statusBarUsageMode: z.enum(['verbose', 'compact']).optional(),
@@ -244,6 +246,7 @@ export const UiUpdateFields = z
     projectOrderManualDefaultNoticeDismissed: z.boolean().optional(),
     usagePercentageDisplayChangeNoticeDismissed: z.boolean().optional(),
     usageEmptyStateDismissed: z.boolean().optional(),
+    codexTerminalServerIsolationNoticeSeen: z.boolean().optional(),
     petVisible: z.boolean().optional(),
     petId: z.string().optional(),
     customPets: UnknownRecordArray.optional(),
diff --git a/src/shared/rpc-contract/launch-source-param.ts b/src/shared/rpc-contract/launch-source-param.ts
new file mode 100644
index 000000000000..610044224833
--- /dev/null
+++ b/src/shared/rpc-contract/launch-source-param.ts
@@ -0,0 +1,12 @@
+import { z } from 'zod'
+
+/**
+ * Which surface started an agent launch, deliberately `z.string()` rather than the closed
+ * `launchSourceSchema`.
+ *
+ * Params are validated by the HOST, so a closed enum here is a version claim pointing the wrong
+ * way: a newer client naming a launch surface an older host has never heard of would have its
+ * whole launch refused over a label nothing reads as behaviour. Bookkeeping must not gate a user
+ * action, so the arm set stays open here and the host resolves it leniently where it is used.
+ */
+export const LaunchSourceParam = z.string()
diff --git a/src/shared/rpc-contract/rpc-params-catalog.generated.ts b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
index 3ce1326133ce..09c8af3129e3 100644
--- a/src/shared/rpc-contract/rpc-params-catalog.generated.ts
+++ b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
@@ -1147,6 +1147,7 @@ export const RPC_PARAMS_BY_METHOD = {
   'terminal.read': TerminalRead,
   'terminal.recoverPane': TerminalRecoverPane,
   'terminal.rename': TerminalRename,
+  'terminal.resetInputModes': TerminalHandle,
   'terminal.resizeForClient': TerminalResizeForClient,
   'terminal.resolveActive': TerminalResolveActive,
   'terminal.resolveIdentity': TerminalHandle,
diff --git a/src/shared/rpc-contract/structured-agent-session-params.ts b/src/shared/rpc-contract/structured-agent-session-params.ts
index bd9ce3db82ab..7b259b21bed8 100644
--- a/src/shared/rpc-contract/structured-agent-session-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session-params.ts
@@ -2,7 +2,10 @@ import { z } from 'zod'
 import { isAgentSessionSurfaceTabId } from '../agent-session-surface-tab-id'
 import { isAgentSessionId } from '../agent-session-record'
 import { normalizeExecutionHostId } from '../execution-host'
-import { AGENT_SESSION_QUESTION_ANSWER_MAX_BYTES } from '../agent-session-question-answer'
+import {
+  AGENT_SESSION_QUESTION_ANSWER_MAX_BYTES,
+  AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH
+} from '../agent-session-question-answer'
 import {
   AGENT_SESSION_ID_MAX_LENGTH,
   AGENT_SESSION_HISTORY_DIRECTIONS,
@@ -13,7 +16,7 @@ import {
 export const MAX_ID_LENGTH = AGENT_SESSION_ID_MAX_LENGTH
 
 // Four Claude questions with all four generated choices occupy 610 chars when fully percent-encoded.
-export const MAX_RESPONSE_OPTION_ID_LENGTH = 1024
+export const MAX_RESPONSE_OPTION_ID_LENGTH = AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH
 
 export const MAX_PROMPT_BYTES = 256 * 1024
 
@@ -182,7 +185,8 @@ export const SendParams = z
 export const CancelParams = z
   .object({
     envelope: MutationEnvelope,
-    turnId: Identifier('Invalid turn id'),
+    // Absent: stop whatever the conversation has in flight. Present: only if that turn is current.
+    turnId: Identifier('Invalid turn id').optional(),
     scope: z.literal('background-tasks').optional(),
     taskId: Identifier('Invalid task id').optional(),
     prompt: z
@@ -201,6 +205,9 @@ export const CancelParams = z
     if (value.prompt !== undefined && value.scope === 'background-tasks') {
       ctx.addIssue({ code: 'custom', message: 'A prompt cannot use background-task scope' })
     }
+    if (value.turnId === undefined && (value.prompt !== undefined || value.scope !== undefined)) {
+      ctx.addIssue({ code: 'custom', message: 'A prompt or background-task cancel names its turn' })
+    }
   })
 
 export const RespondParams = z
diff --git a/src/shared/rpc-contract/terminal-viewport-schemas-params.ts b/src/shared/rpc-contract/terminal-viewport-schemas-params.ts
index aac38a1858ee..416ce7859e08 100644
--- a/src/shared/rpc-contract/terminal-viewport-schemas-params.ts
+++ b/src/shared/rpc-contract/terminal-viewport-schemas-params.ts
@@ -29,7 +29,9 @@ export const TerminalUnsubscribe = z.object({
     .object({
       id: requiredString('Missing client ID')
     })
-    .optional()
+    .optional(),
+  // Why: the `terminal.subscribe` frame id; addresses that exact request, so a stale unsubscribe can't end a newer stream on the same slot.
+  requestId: z.string().min(1).optional()
 })
 
 // Why: in-place update avoids an unsubscribe→resubscribe that flashed the lock banner and stranded the PTY at phone dims (docs/mobile-presence-lock.md).
diff --git a/src/shared/rpc-contract/worktree-create-params.ts b/src/shared/rpc-contract/worktree-create-params.ts
index 7c0b1f55fadf..04de055a6393 100644
--- a/src/shared/rpc-contract/worktree-create-params.ts
+++ b/src/shared/rpc-contract/worktree-create-params.ts
@@ -5,6 +5,7 @@ import { workspaceSourceSchema } from '../telemetry-events'
 import { RUNTIME_NAVIGATION_TARGETS } from '../runtime-navigation'
 import { sleepingAgentLaunchConfigSchema } from '../workspace-session-sleeping-agents'
 import { isTuiAgent } from '../tui-agent-config'
+import { LaunchSourceParam } from './launch-source-param'
 import {
   OptionalBoolean,
   OptionalFiniteNumber,
@@ -110,6 +111,8 @@ export const WorktreeCreate = z
     // workspaces execute in a different shell than the client process.
     startupAgent: OptionalTuiAgent,
     startupPrompt: OptionalString,
+    // Which surface asked for the agent the host launches from `startupAgent` or `startupDraft`.
+    launchSource: LaunchSourceParam.optional(),
     // Why: task-driven mobile creates need desktop parity: the host chooses
     // the same default/detected agent and drafts the linked issue/PR URL into it.
     startupDraft: OptionalString,
diff --git a/src/shared/runtime-client-export-parity.test.ts b/src/shared/runtime-client-export-parity.test.ts
deleted file mode 100644
index 2b86d2e6e998..000000000000
--- a/src/shared/runtime-client-export-parity.test.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-import { describe, expect, expectTypeOf, it } from 'vitest'
-import type { PairingOffer } from './pairing'
-import type { RuntimeCapability } from './protocol-version'
-import * as RemoteClient from './remote-runtime-client'
-import type { RuntimeOrchestrationEnvelope, RuntimeRpcResponse } from './runtime-rpc-envelope'
-import * as Runtime from './runtime-types'
-
-type RuntimeTypeInventory = [
-  Runtime.BrowserBackResult,
-  Runtime.BrowserCaptureStartResult,
-  Runtime.BrowserCaptureStopResult,
-  Runtime.BrowserCheckResult,
-  Runtime.BrowserClearResult,
-  Runtime.BrowserClickResult,
-  Runtime.BrowserConsoleEntry,
-  Runtime.BrowserConsoleResult,
-  Runtime.BrowserCookie,
-  Runtime.BrowserCookieDeleteResult,
-  Runtime.BrowserCookieGetResult,
-  Runtime.BrowserCookieSetResult,
-  Runtime.BrowserDetectedInfo,
-  Runtime.BrowserDetectedProfileInfo,
-  Runtime.BrowserDetectProfilesResult,
-  Runtime.BrowserDragResult,
-  Runtime.BrowserErrorCode,
-  Runtime.BrowserEvalResult,
-  Runtime.BrowserFillResult,
-  Runtime.BrowserFocusResult,
-  Runtime.BrowserGeolocationResult,
-  Runtime.BrowserGotoResult,
-  Runtime.BrowserHoverResult,
-  Runtime.BrowserInterceptDisableResult,
-  Runtime.BrowserInterceptedRequest,
-  Runtime.BrowserInterceptEnableResult,
-  Runtime.BrowserKeypressResult,
-  Runtime.BrowserNetworkEntry,
-  Runtime.BrowserNetworkLogResult,
-  Runtime.BrowserPdfResult,
-  Runtime.BrowserProfileClearDefaultCookiesResult,
-  Runtime.BrowserProfileCreateResult,
-  Runtime.BrowserProfileDeleteResult,
-  Runtime.BrowserProfileImportFromBrowserResult,
-  Runtime.BrowserProfileListResult,
-  Runtime.BrowserReloadResult,
-  Runtime.BrowserScreencastDialogClosedResult,
-  Runtime.BrowserScreencastDialogResult,
-  Runtime.BrowserScreencastEndResult,
-  Runtime.BrowserScreencastErrorResult,
-  Runtime.BrowserScreencastReadyResult,
-  Runtime.BrowserScreencastResult,
-  Runtime.BrowserScreenshotResult,
-  Runtime.BrowserScrollResult,
-  Runtime.BrowserSelectAllResult,
-  Runtime.BrowserSelectResult,
-  Runtime.BrowserSnapshotRef,
-  Runtime.BrowserSnapshotResult,
-  Runtime.BrowserTabCreateResult,
-  Runtime.BrowserTabCurrentResult,
-  Runtime.BrowserTabInfo,
-  Runtime.BrowserTabListResult,
-  Runtime.BrowserTabProfileCloneResult,
-  Runtime.BrowserTabProfileShowResult,
-  Runtime.BrowserTabSetProfileResult,
-  Runtime.BrowserTabShowResult,
-  Runtime.BrowserTabSwitchResult,
-  Runtime.BrowserTypeResult,
-  Runtime.BrowserUploadResult,
-  Runtime.BrowserViewportResult,
-  Runtime.BrowserWaitResult,
-  Runtime.CliRuntimeState,
-  Runtime.CliStatusResult,
-  Runtime.ComputerActionMetadata,
-  Runtime.ComputerActionResult,
-  Runtime.ComputerActionVerification,
-  Runtime.ComputerAppInfo,
-  Runtime.ComputerAppQuery,
-  Runtime.ComputerErrorCode,
-  Runtime.ComputerListAppsResult,
-  Runtime.ComputerListWindowsResult,
-  Runtime.ComputerProviderCapabilities,
-  Runtime.ComputerScreenshotData,
-  Runtime.ComputerScreenshotMetadata,
-  Runtime.ComputerScreenshotStatus,
-  Runtime.ComputerSnapshotData,
-  Runtime.ComputerSnapshotResult,
-  Runtime.ComputerWindowInfo,
-  Runtime.ComputerWindowListWindow,
-  Runtime.DeviceScope,
-  Runtime.RuntimeBrowserDriverState,
-  Runtime.RuntimeBrowserUnavailableReason,
-  Runtime.RuntimeDegradation,
-  Runtime.RuntimeDesktopWindowStatus,
-  Runtime.RuntimeFileListEntry,
-  Runtime.RuntimeFileListResult,
-  Runtime.RuntimeFileOpenResult,
-  Runtime.RuntimeFilePreviewResult,
-  Runtime.RuntimeFileReadChunkResult,
-  Runtime.RuntimeFileReadResult,
-  Runtime.RuntimeGitCheckoutResult,
-  Runtime.RuntimeGitLocalBranches,
-  Runtime.RuntimeGraphStatus,
-  Runtime.RuntimeMarkdownReadTabResult,
-  Runtime.RuntimeMarkdownSaveTabResult,
-  Runtime.RuntimeMobileSessionBrowserTab,
-  Runtime.RuntimeMobileSessionClientTab,
-  Runtime.RuntimeMobileSessionCreateTerminalResult,
-  Runtime.RuntimeMobileSessionFileTab,
-  Runtime.RuntimeMobileSessionMarkdownTab,
-  Runtime.RuntimeMobileSessionSnapshotTab,
-  Runtime.RuntimeMobileSessionTabCloseResult,
-  Runtime.RuntimeMobileSessionTabGroup,
-  Runtime.RuntimeMobileSessionTabMove,
-  Runtime.RuntimeMobileSessionTabMoveResult,
-  Runtime.RuntimeMobileSessionTabsRemovedResult,
-  Runtime.RuntimeMobileSessionTabsResult,
-  Runtime.RuntimeMobileSessionTabsSnapshot,
-  Runtime.RuntimeMobileSessionTerminalClientTab,
-  Runtime.RuntimeMobileSessionTerminalTab,
-  Runtime.RuntimeMobileTerminalTheme,
-  Runtime.RuntimeNativeChatFileContext,
-  Runtime.RuntimeNativeChatLaunchDraftResolution,
-  Runtime.RuntimeRendererSyncWindowGraph,
-  Runtime.RuntimeRepoList,
-  Runtime.RuntimeRepoSearchRefs,
-  Runtime.RuntimeSessionTabCloseReason,
-  Runtime.RuntimeSpeechModelSummary,
-  Runtime.RuntimeSpeechSetupState,
-  Runtime.RuntimeStatus,
-  Runtime.RuntimeSyncedLeaf,
-  Runtime.RuntimeSyncedTab,
-  Runtime.RuntimeSyncWindowGraph,
-  Runtime.RuntimeSyncWindowGraphResult,
-  Runtime.RuntimeTerminalAgentStatus,
-  Runtime.RuntimeTerminalAgentStatusState,
-  Runtime.RuntimeTerminalClose,
-  Runtime.RuntimeTerminalCreate,
-  Runtime.RuntimeTerminalCreateRequestPayload,
-  Runtime.RuntimeTerminalDriverState,
-  Runtime.RuntimeTerminalFocus,
-  Runtime.RuntimeTerminalInteractiveWait,
-  Runtime.RuntimeTerminalInteractiveWaitSource,
-  Runtime.RuntimeTerminalListHostScope,
-  Runtime.RuntimeTerminalListResult,
-  Runtime.RuntimeTerminalOrphanAdoptionClaim,
-  Runtime.RuntimeTerminalOrphanAdoptionRequest,
-  Runtime.RuntimeTerminalOrphanAdoptionResult,
-  Runtime.RuntimeTerminalOrphanTopology,
-  Runtime.RuntimeTerminalOrphanTopologyGroup,
-  Runtime.RuntimeTerminalOrphanTopologyTab,
-  Runtime.RuntimeTerminalPathOpenTarget,
-  Runtime.RuntimeTerminalPathResolution,
-  Runtime.RuntimeTerminalPresentation,
-  Runtime.RuntimeTerminalRead,
-  Runtime.RuntimeTerminalRename,
-  Runtime.RuntimeTerminalResolvePane,
-  Runtime.RuntimeTerminalSend,
-  Runtime.RuntimeTerminalShow,
-  Runtime.RuntimeTerminalSplit,
-  Runtime.RuntimeTerminalState,
-  Runtime.RuntimeTerminalSummary,
-  Runtime.RuntimeTerminalUnavailableReason,
-  Runtime.RuntimeTerminalVisualGroupNode,
-  Runtime.RuntimeTerminalVisualLayout,
-  Runtime.RuntimeTerminalVisualLayoutNode,
-  Runtime.RuntimeTerminalVisualPaneNode,
-  Runtime.RuntimeTerminalVisualTab,
-  Runtime.RuntimeTerminalVisualTerminalNode,
-  Runtime.RuntimeTerminalWait,
-  Runtime.RuntimeTerminalWaitBlockedReason,
-  Runtime.RuntimeTerminalWaitCondition,
-  Runtime.RuntimeWorktreeAgentRow,
-  Runtime.RuntimeWorktreeCreateResult,
-  Runtime.RuntimeWorktreeListResult,
-  Runtime.RuntimeWorktreePsConditionalResult,
-  Runtime.RuntimeWorktreePsResult,
-  Runtime.RuntimeWorktreePsSnapshotResult,
-  Runtime.RuntimeWorktreePsSummary,
-  Runtime.RuntimeWorktreePsUnchangedResult,
-  Runtime.RuntimeWorktreeRecord,
-  Runtime.RuntimeWorktreeRemoveResult,
-  Runtime.RuntimeWorktreeStatus,
-  Runtime.RuntimeWorktreeTerminalSleepResult
-]
-
-describe('runtime client public export parity', () => {
-  it('keeps the runtime type inventory compile-visible', () => {
-    expectTypeOf<RuntimeTypeInventory>().toEqualTypeOf<RuntimeTypeInventory>()
-    expectTypeOf<RemoteClient.RemoteRuntimeSubscription>().toEqualTypeOf<RemoteClient.RemoteRuntimeSubscription>()
-    expectTypeOf<RemoteClient.RemoteRuntimeSubscriptionCallbacks>().toEqualTypeOf<RemoteClient.RemoteRuntimeSubscriptionCallbacks>()
-    expectTypeOf(RemoteClient.sendRemoteRuntimeRequest).toEqualTypeOf<
-      <TResult>(
-        pairing: PairingOffer,
-        method: string,
-        params: unknown,
-        timeoutMs: number,
-        envelope?: RuntimeOrchestrationEnvelope,
-        signal?: AbortSignal,
-        clientCapabilities?: readonly RuntimeCapability[]
-      ) => Promise<RuntimeRpcResponse<TResult>>
-    >()
-    expectTypeOf(RemoteClient.sendRemoteRuntimeRequestWithStatusPreflight).toEqualTypeOf<
-      <TResult>(
-        pairing: PairingOffer,
-        method: string,
-        params: unknown,
-        timeoutMs: number,
-        validateStatus: (response: RuntimeRpcResponse<Runtime.RuntimeStatus>) => void,
-        envelope?: RuntimeOrchestrationEnvelope,
-        clientCapabilities?: readonly RuntimeCapability[]
-      ) => Promise<RuntimeRpcResponse<TResult>>
-    >()
-    expectTypeOf(RemoteClient.subscribeRemoteRuntimeRequest).toEqualTypeOf<
-      <TResult>(
-        pairing: PairingOffer,
-        method: string,
-        params: unknown,
-        timeoutMs: number,
-        callbacks: RemoteClient.RemoteRuntimeSubscriptionCallbacks<TResult>,
-        options?: RemoteClient.RemoteRuntimeSubscriptionOptions
-      ) => Promise<RemoteClient.RemoteRuntimeSubscription>
-    >()
-  })
-
-  it('keeps the runtime and transport value exports exact', () => {
-    expect(Object.keys(Runtime).sort()).toEqual([
-      'BROWSER_UNAVAILABLE_ERROR_CODE',
-      'COMPUTER_ERROR_CODES',
-      'HEADLESS_RUNTIME_WINDOW_ID',
-      'TERMINAL_PTY_DEGRADATION_CAPABILITY',
-      'TERMINAL_UNAVAILABLE_ERROR_CODE',
-      'UNPUBLISHED_WORKTREE_PUBLICATION_EPOCH',
-      'browserUnavailableMessage',
-      'terminalUnavailableMessage'
-    ])
-    expect(Object.keys(RemoteClient).sort()).toEqual([
-      'RemoteRuntimeClientError',
-      'sendRemoteRuntimeRequest',
-      'sendRemoteRuntimeRequestWithStatusPreflight',
-      'subscribeRemoteRuntimeRequest'
-    ])
-  })
-})
diff --git a/src/shared/runtime-terminal-contracts.ts b/src/shared/runtime-terminal-contracts.ts
index 235ef1e6b798..63adc2d67f82 100644
--- a/src/shared/runtime-terminal-contracts.ts
+++ b/src/shared/runtime-terminal-contracts.ts
@@ -322,6 +322,9 @@ export type RuntimeTerminalClose = {
   ptyKilled: boolean
   ptyStopVerdict?: 'live' | 'unverifiable'
   ptyStopReason?: string
+  /** The host durably recorded a kill order it replays when the PTY's SSH host reconnects.
+   *  Older hosts never send it, so a client promises no retry without it. */
+  pendingKillRecorded?: true
 }
 
 export type RuntimeTerminalWaitCondition = 'exit' | 'tui-idle'
diff --git a/src/shared/runtime-worktree-contracts.ts b/src/shared/runtime-worktree-contracts.ts
index c56bc3a17e6f..3d95fb0a3dc9 100644
--- a/src/shared/runtime-worktree-contracts.ts
+++ b/src/shared/runtime-worktree-contracts.ts
@@ -1,4 +1,5 @@
 import type { AgentStatusState, AgentType, AgentWorkingMode } from './agent-status-types'
+import type { AgentMainAgentStatus } from './main-agent-status'
 import type { BaseRefSearchResult, Repo } from './repo-types'
 import type { CreateWorktreeResult, RemoveWorktreeResult } from './worktree/create-types'
 import type {
@@ -22,6 +23,10 @@ export type RuntimeWorktreeAgentRow = {
   toolName: string | null
   toolInput: string | null
   interrupted: boolean
+  /** The main agent's own state, verdict and clock, sent whenever the host row has one, including
+   *  while subagents hold the row `working`. Optional on the wire: old hosts never send it, and a
+   *  reader without it falls back to `interrupted`. */
+  mainAgent?: AgentMainAgentStatus
   stateStartedAt: number
   updatedAt: number
   restoredUnconfirmed?: boolean
diff --git a/src/shared/setup-agent-sequencing-codex-no-daemon.test.ts b/src/shared/setup-agent-sequencing-codex-no-daemon.test.ts
new file mode 100644
index 000000000000..7ef05ec847ba
--- /dev/null
+++ b/src/shared/setup-agent-sequencing-codex-no-daemon.test.ts
@@ -0,0 +1,90 @@
+import { spawn, spawnSync, type ChildProcess } from 'node:child_process'
+import { chmodSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import { createSequencedSetupAgentCommands } from './setup-agent-sequencing'
+
+// Why: the POSIX gate evals the agent in a fresh `bash -lc`, which never reads
+// Orca's shell wrapper, so it must carry the codex --no-daemon rule itself.
+const roots: string[] = []
+const gates: ChildProcess[] = []
+
+afterEach(() => {
+  for (const gate of gates.splice(0)) {
+    gate.kill()
+  }
+  for (const root of roots.splice(0)) {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+
+function prepareGate(startupCommand: string) {
+  const root = mkdtempSync(join(tmpdir(), 'orca-gate-codex-'))
+  roots.push(root)
+  const bin = join(root, 'bin')
+  mkdirSync(bin)
+  // Why: `bash -l` reads /etc/profile, whose macOS path_helper moves the fixture bin
+  // behind /usr/local/bin and /opt/homebrew/bin; re-prepend it so a real codex never runs.
+  writeFileSync(join(root, '.bash_profile'), `export PATH=${JSON.stringify(bin)}:"$PATH"\n`)
+  const runner = join(root, 'setup-runner.sh')
+  const sequenced = createSequencedSetupAgentCommands({
+    runnerScriptPath: runner,
+    startupCommand,
+    platform: 'posix',
+    nonce: 'n1',
+    // Why: a failed assertion must not leave a gate polling for the default two hours.
+    waitTimeoutSeconds: 5
+  })
+  return {
+    sequenced,
+    // Why HOME and CODEX_HOME: `bash -l` must read no real profile, and nothing may touch ~/.codex.
+    env: { HOME: root, CODEX_HOME: root, PATH: `${bin}:/usr/bin:/bin`, ...sequenced.startupEnv },
+    finishSetup: (help: string) => {
+      const codex = join(bin, 'codex')
+      writeFileSync(
+        codex,
+        `#!/bin/sh\n[ "$1" = --help ] && { printf '%s\\n' '${help}'; exit 0; }\nprintf 'ARGV:%s\\n' "$*"\n`
+      )
+      chmodSync(codex, 0o755)
+      writeFileSync(`${runner}.n1.done`, 'n1:0\n')
+    }
+  }
+}
+
+function runGate(startupCommand: string, help: string, env: Record<string, string> = {}): string {
+  const gate = prepareGate(startupCommand)
+  gate.finishSetup(help)
+  return spawnSync('bash', ['-c', gate.sequenced.startupCommand], {
+    encoding: 'utf8',
+    env: { ...gate.env, ...env }
+  }).stdout
+}
+
+describe.skipIf(process.platform === 'win32')('sequenced setup gate runs codex', () => {
+  it('with --no-daemon when the binary supports it', () => {
+    expect(runGate('codex --yolo', '--no-daemon')).toBe('ARGV:--no-daemon --yolo\n')
+  })
+
+  it.each([
+    ['an old binary', 'codex --yolo', '--no-alt-screen', {}],
+    ['a subcommand that needs the shared server', 'codex agents', '--no-daemon', {}],
+    ['the opt-out', 'codex --yolo', '--no-daemon', { ORCA_CODEX_ISOLATE: '0' }]
+  ])('unchanged for %s', (_case, command, help, env) => {
+    expect(runGate(command, help, env)).toBe(`ARGV:${command.slice('codex '.length)}\n`)
+  })
+
+  it('with --no-daemon when setup is what installs codex', async () => {
+    const gate = prepareGate('codex --yolo')
+    const child = spawn('bash', ['-c', gate.sequenced.startupCommand], { env: gate.env })
+    gates.push(child)
+    let stdout = ''
+    child.stdout.on('data', (chunk: Buffer) => (stdout += chunk.toString()))
+    const exited = new Promise((resolve) => child.on('close', resolve))
+    // Why after spawn: the gate is already waiting when setup puts codex on PATH.
+    await new Promise((resolve) => setTimeout(resolve, 300))
+    gate.finishSetup('--no-daemon')
+    await exited
+    expect(stdout).toBe('ARGV:--no-daemon --yolo\n')
+  })
+})
diff --git a/src/shared/setup-agent-sequencing.ts b/src/shared/setup-agent-sequencing.ts
index a865b23f8373..0adcbebf1386 100644
--- a/src/shared/setup-agent-sequencing.ts
+++ b/src/shared/setup-agent-sequencing.ts
@@ -1,4 +1,5 @@
 import { encodePowerShellCommand } from './powershell-command-encoding'
+import { getPosixCodexShellLaunchPreflight } from './codex-shell-function'
 import {
   nativeWindowsPathToPosixShellPath,
   resolveSetupRunnerCommand,
@@ -128,7 +129,9 @@ function buildPosixStartupScript(
     `rm -f ${marker} ${tmp} 2>/dev/null;`,
     // Why: failure and timeout announce themselves; a silent success left
     // "Waiting for setup..." as the pane's last line forever.
-    `if [ "$status" = "0" ]; then echo ${quotePosixArg(SETUP_COMPLETE_MESSAGE)} >&2; if [ -n "\${${SETUP_AGENT_SEQUENCE_STARTUP_COMMAND_ENV}:-}" ]; then eval "\$${SETUP_AGENT_SEQUENCE_STARTUP_COMMAND_ENV}"; exit "$?"; else ${startupSuccessCommand}; fi; fi;`,
+    // Why here and not first: setup may be what puts codex on PATH, and this
+    // `bash -lc` never reads Orca's shell wrapper, so it defines the function itself.
+    `if [ "$status" = "0" ]; then echo ${quotePosixArg(SETUP_COMPLETE_MESSAGE)} >&2;\n${getPosixCodexShellLaunchPreflight()}if [ -n "\${${SETUP_AGENT_SEQUENCE_STARTUP_COMMAND_ENV}:-}" ]; then eval "\$${SETUP_AGENT_SEQUENCE_STARTUP_COMMAND_ENV}"; exit "$?"; else ${startupSuccessCommand}; fi; fi;`,
     'echo "Setup failed; skipping agent startup." >&2;',
     'exit "${status:-1}";',
     'fi;',
diff --git a/src/shared/skills-cli-agent-keys.ts b/src/shared/skills-cli-agent-keys.ts
index a85fa9d80abe..1955bfa6d581 100644
--- a/src/shared/skills-cli-agent-keys.ts
+++ b/src/shared/skills-cli-agent-keys.ts
@@ -14,6 +14,7 @@ import type { TuiAgent } from './tui-agent'
 export const SKILLS_CLI_AGENT_KEY_BY_TUI_AGENT = {
   claude: 'claude-code',
   'claude-agent-teams': 'claude-code',
+  codebuddy: 'codebuddy',
   // Why: Orca states OpenClaude reads Claude-owned roots (native-chat-agent-profiles).
   openclaude: 'claude-code',
   codex: 'codex',
@@ -24,6 +25,7 @@ export const SKILLS_CLI_AGENT_KEY_BY_TUI_AGENT = {
   pi: 'pi',
   omp: null,
   'prime-agent': null,
+  qoder: 'qoder',
   gemini: 'gemini-cli',
   antigravity: 'antigravity',
   aider: null,
@@ -35,6 +37,7 @@ export const SKILLS_CLI_AGENT_KEY_BY_TUI_AGENT = {
   aug: 'augment',
   cline: 'cline',
   codebuff: null,
+  freebuff: null,
   'command-code': 'command-code',
   continue: 'continue',
   cursor: 'cursor',
@@ -52,7 +55,9 @@ export const SKILLS_CLI_AGENT_KEY_BY_TUI_AGENT = {
   // Why: Orca detects trae by `traecli`, an alias only TRAE CN ships.
   trae: 'trae-cn',
   muse: null,
-  zcode: 'zcode'
+  zcode: 'zcode',
+  // Why: DSH ships skills as Cordis plugins, not a `skills --agent` target.
+  dsh: null
 } satisfies Record<TuiAgent, string | null>
 
 /**
diff --git a/src/shared/source-control-ai-action-recipes.test.ts b/src/shared/source-control-ai-action-recipes.test.ts
index 352f9cfa337e..15e09ebe9127 100644
--- a/src/shared/source-control-ai-action-recipes.test.ts
+++ b/src/shared/source-control-ai-action-recipes.test.ts
@@ -427,7 +427,7 @@ describe('source-control AI action recipes', () => {
     ).toEqual({
       ok: false,
       error:
-        'Agent "aider" does not support Source Control AI commit messages. Supported agents: OMP, Claude, Codex, OpenCode, OpenCode 2, Pi, Amp, Cursor, Kimi, Muse, GitHub Copilot, Antigravity, or Custom command.'
+        'Agent "aider" does not support Source Control AI commit messages. Supported agents: OMP, Claude, Codex, OpenCode, OpenCode 2, Pi, Amp, Cursor, Kimi, Muse, DeepSeek Harness, GitHub Copilot, Antigravity, or Custom command.'
     })
   })
 })
diff --git a/src/renderer/src/lib/source-control-launch-agent-selection.test.ts b/src/shared/source-control-launch-agent-selection.test.ts
similarity index 94%
rename from src/renderer/src/lib/source-control-launch-agent-selection.test.ts
rename to src/shared/source-control-launch-agent-selection.test.ts
index 3ef15b580d9a..1862122d8715 100644
--- a/src/renderer/src/lib/source-control-launch-agent-selection.test.ts
+++ b/src/shared/source-control-launch-agent-selection.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from 'vitest'
-import { getDefaultSettings } from '../../../shared/constants'
-import type { GlobalSettings } from '../../../shared/global-settings-types'
-import type { Repo } from '../../../shared/repo-types'
-import type { TuiAgent } from '../../../shared/tui-agent'
+import { getDefaultSettings } from './constants'
+import type { GlobalSettings } from './global-settings-types'
+import type { Repo } from './repo-types'
+import type { TuiAgent } from './tui-agent'
 import {
   resolveSourceControlLaunchAgentScope,
   summarizeReposOverridingActionRecipe
diff --git a/src/renderer/src/lib/source-control-launch-agent-selection.ts b/src/shared/source-control-launch-agent-selection.ts
similarity index 88%
rename from src/renderer/src/lib/source-control-launch-agent-selection.ts
rename to src/shared/source-control-launch-agent-selection.ts
index 379f56405442..4a408b2ffc64 100644
--- a/src/renderer/src/lib/source-control-launch-agent-selection.ts
+++ b/src/shared/source-control-launch-agent-selection.ts
@@ -1,17 +1,13 @@
-import { getAgentCatalog } from '@/lib/agent-catalog'
-import { isCustomAgentId } from '../../../shared/commit-message-agent-spec'
+import { isCustomAgentId } from './commit-message-agent-spec'
 import {
   normalizeRepoSourceControlAiOverrides,
   resolveSourceControlActionRecipe
-} from '../../../shared/source-control-ai'
-import type {
-  SourceControlActionId,
-  SourceControlActionRecipe
-} from '../../../shared/source-control-ai-actions'
-import { filterEnabledTuiAgents } from '../../../shared/tui-agent-selection'
-import type { GlobalSettings } from '../../../shared/global-settings-types'
-import type { Repo } from '../../../shared/repo-types'
-import type { TuiAgent } from '../../../shared/tui-agent'
+} from './source-control-ai'
+import type { SourceControlActionId, SourceControlActionRecipe } from './source-control-ai-actions'
+import { filterEnabledTuiAgents, TUI_AGENT_AUTO_PICK_ORDER } from './tui-agent-selection'
+import type { GlobalSettings } from './global-settings-types'
+import type { Repo } from './repo-types'
+import type { TuiAgent } from './tui-agent'
 
 export function readSourceControlLaunchRecipeAgentId(
   recipe: Pick<SourceControlActionRecipe, 'agentId'> | null | undefined
@@ -37,7 +33,7 @@ export function pickSourceControlLaunchAgent(args: {
   ) {
     return args.defaultAgent
   }
-  return getAgentCatalog().find((entry) => enabledAgents.includes(entry.id))?.id ?? null
+  return TUI_AGENT_AUTO_PICK_ORDER.find((agent) => enabledAgents.includes(agent)) ?? null
 }
 
 export type SourceControlLaunchAgentScope = {
diff --git a/src/shared/source-scan/call-argument-scan.ts b/src/shared/source-scan/call-argument-scan.ts
new file mode 100644
index 000000000000..59a411aa2f01
--- /dev/null
+++ b/src/shared/source-scan/call-argument-scan.ts
@@ -0,0 +1,83 @@
+import { stripComments } from './source-tree-scan'
+
+const CLOSER_BY_OPENER: Record<string, string> = { '(': ')', '[': ']', '{': '}' }
+
+/** Top-level argument texts of the call whose `(` ends at `start`; quote-aware, not a parser. */
+export function splitCallArguments(source: string, start: number): string[] {
+  const args: string[] = []
+  const closers: string[] = [')']
+  let current = ''
+  let quote: string | null = null
+  for (let index = start; index < source.length; index += 1) {
+    const char = source[index]!
+    if (quote) {
+      current += char
+      if (char === '\\') {
+        current += source[index + 1] ?? ''
+        index += 1
+      } else if (char === quote) {
+        quote = null
+      }
+      continue
+    }
+    const closer = CLOSER_BY_OPENER[char]
+    if (char === "'" || char === '"' || char === '`') {
+      quote = char
+    } else if (closer) {
+      closers.push(closer)
+    } else if (char === closers.at(-1)) {
+      closers.pop()
+      if (closers.length === 0) {
+        break
+      }
+    } else if (char === ',' && closers.length === 1) {
+      args.push(current.trim())
+      current = ''
+      continue
+    }
+    current += char
+  }
+  if (current.trim()) {
+    args.push(current.trim())
+  }
+  return args
+}
+
+export type RequiredCallArgument = {
+  /** Which positional argument must be present. */
+  index: number
+  /** The call counts only when the text before `.method(` matches, e.g. its receiver. */
+  receiver?: RegExp
+  /** When the argument is an object literal, whether it carries the required field. */
+  acceptsObjectLiteral?: (literal: string) => boolean
+}
+
+/**
+ * `line: .method(args)` for each call that leaves out a required argument. For code the compiler
+ * cannot check, such as `@ts-nocheck` files and `any`-typed receivers.
+ */
+export function findCallsMissingArgument(
+  source: string,
+  requiredByMethod: Record<string, RequiredCallArgument>
+): string[] {
+  const code = stripComments(source)
+  const callRe = new RegExp(`\\.\\s*(${Object.keys(requiredByMethod).join('|')})\\s*\\(`, 'g')
+  const missing: string[] = []
+  for (const match of code.matchAll(callRe)) {
+    const method = match[1]!
+    const required = requiredByMethod[method]!
+    const before = code.slice(0, match.index)
+    if (required.receiver && !required.receiver.test(before)) {
+      continue
+    }
+    const args = splitCallArguments(code, match.index + match[0].length)
+    const argument = args[required.index]
+    const present =
+      argument !== undefined &&
+      (!argument.startsWith('{') || (required.acceptsObjectLiteral?.(argument) ?? true))
+    if (!present) {
+      missing.push(`${before.split('\n').length}: .${method}(${args.join(', ')})`)
+    }
+  }
+  return missing
+}
diff --git a/src/shared/ssh-pending-pty-kill.test.ts b/src/shared/ssh-pending-pty-kill.test.ts
index 9b13a193a077..c2ba4cb95f11 100644
--- a/src/shared/ssh-pending-pty-kill.test.ts
+++ b/src/shared/ssh-pending-pty-kill.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest'
 import {
   decideSshPendingPtyKill,
   MAX_SSH_PENDING_PTY_KILLS_PER_TARGET,
+  normalizeSshPendingPtyKill,
   prunePendingSshPtyKills,
   SSH_PENDING_PTY_KILL_TTL_MS,
   type SshPendingPtyKill,
@@ -64,6 +65,26 @@ describe('decideSshPendingPtyKill', () => {
   })
 })
 
+// A close whose incarnation was never learned (the host was offline across a relaunch) still owes
+// the kill: a `pty2:` id carries a per-start mint epoch, so the id alone names one process.
+describe('a pending kill with no incarnation', () => {
+  const unfenced = { requestedAt: NOW, attempts: 0 }
+
+  it('is kept for an epoch-scoped relay id and dropped for a legacy one', () => {
+    expect(normalizeSshPendingPtyKill(unfenced, 'pty2:epoch-a:3')).toEqual(unfenced)
+    expect(normalizeSshPendingPtyKill(unfenced, 'pty-3')).toBeNull()
+  })
+
+  it('replays while the host lists the id and retires once it does not', () => {
+    expect(
+      decideSshPendingPtyKill(unfenced, { hostListsPty: true, hostIncarnationId: 'inc-z' }, NOW)
+    ).toEqual({ action: 'replay' })
+    expect(
+      decideSshPendingPtyKill(unfenced, { hostListsPty: false, hostIncarnationId: undefined }, NOW)
+    ).toEqual({ action: 'retire', reason: 'host-reports-absent' })
+  })
+})
+
 describe('prunePendingSshPtyKills', () => {
   it('drops expired entries and caps the rest newest-first', () => {
     const entries: SshPendingPtyKillEntry[] = [
diff --git a/src/shared/ssh-pending-pty-kill.ts b/src/shared/ssh-pending-pty-kill.ts
index 186ecd65acc3..89472aee27f3 100644
--- a/src/shared/ssh-pending-pty-kill.ts
+++ b/src/shared/ssh-pending-pty-kill.ts
@@ -12,21 +12,32 @@ import type { SshRemotePtyLease } from './ssh-types'
  *  already the durable, restart-surviving, per-`(targetId, relayPtyId)` record of a remote PTY. */
 export type SshPendingPtyKill = {
   requestedAt: number
-  /** The host-minted PTY incarnation this kill was aimed at, and the whole fence.
+  /** The host-minted PTY incarnation this kill was aimed at, and the fence.
    *
-   *  A relay renumbers from `pty-1` on every start, so `(targetId, relayPtyId)` alone can name a
-   *  DIFFERENT shell after a redeploy — the collision behind #16970. Current relays enforce this
-   *  identity on `pty.shutdown`; the client also proves it from `pty.listProcesses` before replay so
-   *  older relays that ignore the additive field keep the safest available fallback. */
-  incarnationId: string
+   *  A legacy relay renumbers from `pty-1` on every start, so `(targetId, relayPtyId)` alone can
+   *  name a DIFFERENT shell after a redeploy — the collision behind #16970. Current relays enforce
+   *  this identity on `pty.shutdown`; the client also proves it from `pty.listProcesses` before
+   *  replay so older relays that ignore the additive field keep the safest available fallback.
+   *
+   *  Absent only for a `pty2:` id, whose per-start mint epoch makes the id itself the fence. */
+  incarnationId?: string
   /** Replays attempted since. Diagnostic; the TTL, not this, is the bound. */
   attempts: number
 }
 
+/** Whether a relay PTY id names exactly one process: current relays mint `pty2:<epoch>:<n>` with a
+ *  fresh epoch per start, so the id never recurs. Legacy `pty-N` ids restart at 1. */
+export function isEpochScopedRelayPtyId(relayPtyId: string): boolean {
+  return relayPtyId.startsWith('pty2:')
+}
+
 /** Colocated with the type so the two cannot drift. The lease loader is a strict whitelist that
  *  drops anything it does not name, so a record omitted here would be silently stripped on every
  *  launch — the exact failure `closed-terminal-tab-tombstones.ts` records having shipped once. */
-export function normalizeSshPendingPtyKill(value: unknown): SshPendingPtyKill | null {
+export function normalizeSshPendingPtyKill(
+  value: unknown,
+  relayPtyId: string
+): SshPendingPtyKill | null {
   if (!value || typeof value !== 'object') {
     return null
   }
@@ -34,7 +45,11 @@ export function normalizeSshPendingPtyKill(value: unknown): SshPendingPtyKill |
   if (typeof raw.requestedAt !== 'number' || !Number.isFinite(raw.requestedAt)) {
     return null
   }
-  // No incarnation, no fence, and an unfenced kill order is worse than none.
+  const attempts = typeof raw.attempts === 'number' && raw.attempts >= 0 ? raw.attempts : 0
+  if (raw.incarnationId === undefined && isEpochScopedRelayPtyId(relayPtyId)) {
+    return { requestedAt: raw.requestedAt, attempts }
+  }
+  // No fence, and an unfenced kill order is worse than none.
   if (
     typeof raw.incarnationId !== 'string' ||
     !raw.incarnationId ||
@@ -42,11 +57,7 @@ export function normalizeSshPendingPtyKill(value: unknown): SshPendingPtyKill |
   ) {
     return null
   }
-  return {
-    requestedAt: raw.requestedAt,
-    incarnationId: raw.incarnationId,
-    attempts: typeof raw.attempts === 'number' && raw.attempts >= 0 ? raw.attempts : 0
-  }
+  return { requestedAt: raw.requestedAt, incarnationId: raw.incarnationId, attempts }
 }
 
 /** Backstop only — host acknowledgement is the normal exit. This covers a target the user never
@@ -107,6 +118,10 @@ export function decideSshPendingPtyKill(
   if (!observation.hostListsPty) {
     return { action: 'retire', reason: 'host-reports-absent' }
   }
+  if (intent.incarnationId === undefined) {
+    // The id is the fence: only an epoch-scoped id is ever recorded without an incarnation.
+    return { action: 'replay' }
+  }
   if (observation.hostIncarnationId === undefined) {
     // Why not replay: an unfenced kill against a renumbered relay id destroys a shell nobody asked
     // to close, which is strictly worse than the leak. Hosts predating the published incarnation
diff --git a/src/shared/status-bar-defaults.ts b/src/shared/status-bar-defaults.ts
index 2eb855d9dd5c..c32958ee9491 100644
--- a/src/shared/status-bar-defaults.ts
+++ b/src/shared/status-bar-defaults.ts
@@ -10,6 +10,7 @@ export const DEFAULT_STATUS_BAR_ITEMS: StatusBarItem[] = [
   'minimax',
   'grok',
   'cursor',
+  'zcode',
   'ssh',
   'resource-usage',
   'ports'
diff --git a/src/shared/storage-capacity-error.ts b/src/shared/storage-capacity-error.ts
new file mode 100644
index 000000000000..63575e7fa1c4
--- /dev/null
+++ b/src/shared/storage-capacity-error.ts
@@ -0,0 +1,25 @@
+export function storageCapacityErrorCode(
+  error: unknown,
+  seen = new Set<object>()
+): 'ENOSPC' | 'EDQUOT' | 'SQLITE_FULL' | null {
+  if (typeof error !== 'object' || error === null || seen.has(error)) {
+    return null
+  }
+  seen.add(error)
+  // node:sqlite reports SQLITE_FULL through its numeric SQLite result code.
+  if (
+    'code' in error &&
+    error.code === 'ERR_SQLITE_ERROR' &&
+    'errcode' in error &&
+    error.errcode === 13
+  ) {
+    return 'SQLITE_FULL'
+  }
+  if (
+    'code' in error &&
+    (error.code === 'ENOSPC' || error.code === 'EDQUOT' || error.code === 'SQLITE_FULL')
+  ) {
+    return error.code
+  }
+  return 'cause' in error ? storageCapacityErrorCode(error.cause, seen) : null
+}
diff --git a/src/shared/structured-agent-session-dispatch-rejection.test.ts b/src/shared/structured-agent-session-dispatch-rejection.test.ts
new file mode 100644
index 000000000000..be16c8a3fbda
--- /dev/null
+++ b/src/shared/structured-agent-session-dispatch-rejection.test.ts
@@ -0,0 +1,140 @@
+import { describe, expect, it } from 'vitest'
+import {
+  AGENT_SESSION_FAILURE_KINDS,
+  agentSessionFailureFact,
+  isSubmissionRejectionKind
+} from './agent-session-failure'
+import { agentSessionFailureWords } from './agent-session-failure-words'
+import {
+  classifyDispatchRejection,
+  DISPATCH_REJECTED_CANCELLED,
+  DISPATCH_REJECTED_CODEX_QUEUE_FULL,
+  DISPATCH_REJECTED_HOST_RESTARTED,
+  DISPATCH_REJECTED_PROVIDER_CLOSED,
+  DISPATCH_REJECTED_QUEUE_FULL,
+  isWriteFailureSubmission
+} from './structured-agent-session-dispatch-rejection'
+
+describe('classifyDispatchRejection', () => {
+  it.each([
+    [DISPATCH_REJECTED_CANCELLED, 'withdrawn', null, 'cancelled'],
+    [DISPATCH_REJECTED_HOST_RESTARTED, 'undelivered', null, 'hostRestarted'],
+    [DISPATCH_REJECTED_PROVIDER_CLOSED, 'undelivered', null, 'chatClosed'],
+    ['not_delivered', 'undelivered', null, 'notDelivered'],
+    [DISPATCH_REJECTED_QUEUE_FULL, 'transport', 'failure', 'queueFull'],
+    [DISPATCH_REJECTED_CODEX_QUEUE_FULL, 'transport', 'failure', 'queueFull'],
+    ['provider_write_failed: broken pipe', 'transport', 'failure', 'writeFailed'],
+    ['provider_write_failed', 'transport', 'failure', 'writeFailed']
+  ] as const)('reads the legacy marker %j', (reason, category, verdict, kind) => {
+    expect(classifyDispatchRejection({ reason })).toEqual({ category, verdict, kind })
+  })
+
+  it('reads any other legacy reason as a sentence that failed the send', () => {
+    expect(classifyDispatchRejection({ reason: 'Claude does not support .bmp' })).toEqual({
+      category: 'content',
+      verdict: 'failure'
+    })
+    expect(classifyDispatchRejection({ reason: null })).toEqual({
+      category: 'content',
+      verdict: 'failure'
+    })
+  })
+
+  it('fails the send for every kind but a withdrawal, a restart, a close, or a lost send', () => {
+    const noOneFailed = ['cancelled', 'hostRestarted', 'chatClosed', 'notDelivered']
+    for (const kind of AGENT_SESSION_FAILURE_KINDS.filter(isSubmissionRejectionKind)) {
+      const verdict = classifyDispatchRejection({ reason: 'x', rejection: { kind } }).verdict
+      expect([kind, verdict]).toEqual([kind, noOneFailed.includes(kind) ? null : 'failure'])
+    }
+  })
+
+  it.each([
+    ['cancelled', 'withdrawn', null],
+    ['hostRestarted', 'undelivered', null],
+    ['chatClosed', 'undelivered', null],
+    ['notDelivered', 'undelivered', null],
+    // Orca stopped a start that hung: the agent failed, and the message never reached it.
+    ['hostStopped', 'undelivered', 'failure'],
+    ['writeFailed', 'transport', 'failure'],
+    ['queueFull', 'transport', 'failure']
+  ] as const)('reads the written %s rejection as %s, verdict %s', (kind, category, verdict) => {
+    const written = agentSessionFailureWords(agentSessionFailureFact(kind), {
+      surface: 'rejection',
+      provider: 'claude'
+    })
+    expect(classifyDispatchRejection(written)).toEqual({ category, verdict, kind })
+  })
+
+  it('reads a legacy not_delivered row with no fact as a send nobody failed', () => {
+    expect(classifyDispatchRejection({ reason: 'not_delivered' })).toEqual({
+      category: 'undelivered',
+      verdict: null,
+      kind: 'notDelivered'
+    })
+  })
+
+  it('reads the typed fact over the sentence beside it', () => {
+    expect(
+      classifyDispatchRejection({
+        reason: 'The provider stopped before it finished starting.',
+        rejection: { kind: 'providerStartFailed' }
+      })
+    ).toEqual({ category: 'startFailed', verdict: 'failure', kind: 'providerStartFailed' })
+    expect(
+      classifyDispatchRejection({ reason: 'Not sent.', rejection: { kind: 'queueFull' } })
+    ).toMatchObject({ category: 'transport', verdict: 'failure' })
+  })
+
+  it('writes a sentence, not a marker released clients would print, for a restart or a close', () => {
+    for (const kind of ['hostRestarted', 'chatClosed'] as const) {
+      const written = agentSessionFailureWords(agentSessionFailureFact(kind), {
+        surface: 'rejection'
+      })
+      expect(written.reason).not.toMatch(/^[a-z_]+$/)
+      expect(classifyDispatchRejection(written)).toEqual({
+        category: 'undelivered',
+        verdict: null,
+        kind
+      })
+    }
+  })
+
+  it('gives a fact it cannot place no verdict, whatever the reason beside it says', () => {
+    // A newer host's kind, a status-row kind, and a fact with no kind at all.
+    for (const rejection of [{ kind: 'futureKind' }, { kind: 'providerRetrying' }, {}]) {
+      for (const reason of [
+        DISPATCH_REJECTED_QUEUE_FULL,
+        DISPATCH_REJECTED_CANCELLED,
+        'Refused.'
+      ]) {
+        expect(classifyDispatchRejection({ reason, rejection })).toEqual({
+          category: 'undelivered',
+          verdict: null
+        })
+      }
+    }
+  })
+})
+
+describe('isWriteFailureSubmission', () => {
+  it('holds for a legacy row in any state that carries the marker', () => {
+    expect(
+      isWriteFailureSubmission({ reason: 'provider_write_failed: closed before enqueue' })
+    ).toBe(true)
+  })
+
+  it('holds for the bare marker a new host writes, as released clients already read it', () => {
+    const written = agentSessionFailureWords(agentSessionFailureFact('writeFailed'), {
+      surface: 'rejection'
+    })
+    expect(written.reason).toBe('provider_write_failed')
+    expect(isWriteFailureSubmission({ reason: written.reason })).toBe(true)
+  })
+
+  it('holds for a typed write failure and for nothing else', () => {
+    expect(isWriteFailureSubmission({ reason: 'x', rejection: { kind: 'writeFailed' } })).toBe(true)
+    expect(isWriteFailureSubmission({ reason: DISPATCH_REJECTED_QUEUE_FULL })).toBe(false)
+    expect(isWriteFailureSubmission({ reason: 'x', rejection: { kind: 'queueFull' } })).toBe(false)
+    expect(isWriteFailureSubmission({ reason: null })).toBe(false)
+  })
+})
diff --git a/src/shared/structured-agent-session-dispatch-rejection.ts b/src/shared/structured-agent-session-dispatch-rejection.ts
index 14e197325d8f..68e40a530394 100644
--- a/src/shared/structured-agent-session-dispatch-rejection.ts
+++ b/src/shared/structured-agent-session-dispatch-rejection.ts
@@ -1,23 +1,23 @@
 // Why a submission is `rejected`: the message provably did not happen.
 //
-// Two different facts reach this state, and the reason string is what tells them
-// apart. A CONTENT rejection is permanent — the provider looked at this payload
-// and refused it, and it would refuse the same payload again; its reason is the
-// provider's own explanation ("Claude messages support at most 20 images") and is
-// meant to be read. A TRANSPORT rejection is transient — the frame was never
-// handed to the provider at all, so the same text under a fresh id is a first
-// delivery and the next attempt may well succeed; its reason names an internal
-// cause and must NOT be put in front of a person.
+// The host writes each rejection twice: `reason`, a sentence (or, for the cases older clients
+// already recognise, one of the legacy markers below) that released clients print as it is, and
+// `rejection`, the typed fact newer clients read — both from `agentSessionFailureWords`.
+// `classifyDispatchRejection` is the only place a reader judges either.
 //
-// Both are `rejected` because both make the single claim that state exists to
-// make: this message did not reach the provider. Neither is ever re-delivered
-// under its own id — `rejected` is terminal in the reducer — so a retry rotates
-// the client message id, which is a new message and cannot duplicate.
-//
-// Shared rather than main-only because both sides need it: the host writes the
-// reason, and a client has to know which kind it is holding before it can decide
-// whether the string is showable.
+// Every rejection makes the one claim that state exists to make: this message did not reach the
+// provider. None is ever re-delivered under its own id — `rejected` is terminal in the reducer — so
+// a retry rotates the client message id, which is a new message and cannot duplicate.
+
+import {
+  isSubmissionRejectionKind,
+  readAgentSessionFailureFact,
+  type SubmissionRejectionKind
+} from './agent-session-failure'
+import type { AgentJournalSubmission } from './agent-session-journal-types'
 
+/** Orca could not hand the message over. Written bare: released clients hide it, and the error
+ *  that once followed it belongs in the log. Rows from older hosts carry `: <error>` after it. */
 export const DISPATCH_REJECTED_WRITE_FAILED = 'provider_write_failed'
 
 /** Local admission refused the frame before any transport was involved. Two
@@ -29,15 +29,21 @@ export const DISPATCH_REJECTED_CODEX_QUEUE_FULL = 'codex structured dispatch que
 /** The provider confirmed a queued frame was withdrawn before execution. */
 export const DISPATCH_REJECTED_CANCELLED = 'provider_cancelled_before_start'
 
-export function dispatchWriteFailureReason(error: unknown): string {
-  const detail = error instanceof Error ? error.message : String(error)
-  return `${DISPATCH_REJECTED_WRITE_FAILED}: ${detail}`
-}
+/** Legacy marker: accepted by a host process that ended before handing it to any provider.
+ *  Read only; released clients print it raw, so new rows carry a sentence. */
+export const DISPATCH_REJECTED_HOST_RESTARTED = 'host_restarted_before_delivery'
 
-/** True for the internal transport marker, false for a provider's own words. */
-export function dispatchRejectionWasTransportWriteFailure(
-  reason: string | null | undefined
-): boolean {
+/** Legacy marker: accepted, then the provider was closed before the message was handed to it.
+ *  Read only, like the one above. */
+export const DISPATCH_REJECTED_PROVIDER_CLOSED = 'provider_closed_before_delivery'
+
+/** Restart reconciliation found the send absent from a provider history it could trust. Rows
+ *  written before rows carried a fact hold it as their reason; released clients printed it. */
+export const DISPATCH_REJECTED_NOT_DELIVERED = 'not_delivered'
+
+/** True for the internal transport marker, false for a provider's own words. Legacy-reason half
+ *  of `isWriteFailureSubmission`; readers go through that or the classifier. */
+function dispatchRejectionWasTransportWriteFailure(reason: string | null | undefined): boolean {
   return (
     reason === DISPATCH_REJECTED_WRITE_FAILED ||
     reason?.startsWith(`${DISPATCH_REJECTED_WRITE_FAILED}: `) === true
@@ -45,15 +51,138 @@ export function dispatchRejectionWasTransportWriteFailure(
 }
 
 /**
- * True when the reason is ours rather than the provider's, so it must not be
- * shown verbatim. A content rejection carries the provider's own explanation and
- * is the only kind a person should read.
+ * What a rejection means for the chat, whatever wrote it:
+ * - `withdrawn`: the user's Stop took it back; nothing failed.
+ * - `undelivered`: accepted, then never handed over (Orca restarted, the chat closed, the provider
+ *   never took it or stopped first).
+ * - `startFailed`: the agent it waited on did not start.
+ * - `content`: the provider, or Orca's check of the message, refused this payload.
+ * - `transport`: Orca could not hand it over.
+ */
+export type DispatchRejectionCategory =
+  | 'withdrawn'
+  | 'undelivered'
+  | 'startFailed'
+  | 'content'
+  | 'transport'
+
+export type DispatchRejectionClassification = {
+  category: DispatchRejectionCategory
+  /** `failure` when the chat reads Failed; null only when no one failed the user: a withdrawal, a
+   *  host restart, a chat close, or a send the provider never received after a restart. */
+  verdict: 'failure' | null
+  /** The situation, when the row carried one or a legacy marker names it; absent for a legacy
+   *  sentence, whose words are all a reader has, and for a fact this build cannot place. */
+  kind?: SubmissionRejectionKind
+}
+
+const KIND_CATEGORY = {
+  cancelled: 'withdrawn',
+  hostRestarted: 'undelivered',
+  chatClosed: 'undelivered',
+  notDelivered: 'undelivered',
+  providerExited: 'undelivered',
+  hostStopped: 'undelivered',
+  providerStartFailed: 'startFailed',
+  startFailed: 'startFailed',
+  notSignedIn: 'startFailed',
+  historyTooLarge: 'startFailed',
+  managedAccountEnvOverride: 'startFailed',
+  accountSwitchInProgress: 'startFailed',
+  managedAccountUnsupported: 'startFailed',
+  restartFailed: 'startFailed',
+  providerRejected: 'content',
+  attachmentInvalid: 'content',
+  attachmentUnreadable: 'content',
+  emptyMessage: 'content',
+  queueFull: 'transport',
+  writeFailed: 'transport',
+  hostFault: 'transport'
+} satisfies Record<SubmissionRejectionKind, DispatchRejectionCategory>
+
+/** Null only where no one failed the user; a new kind does not compile until it is placed here. */
+const KIND_VERDICT = {
+  cancelled: null,
+  hostRestarted: null,
+  chatClosed: null,
+  notDelivered: null,
+  providerExited: 'failure',
+  providerStartFailed: 'failure',
+  startFailed: 'failure',
+  notSignedIn: 'failure',
+  historyTooLarge: 'failure',
+  managedAccountEnvOverride: 'failure',
+  accountSwitchInProgress: 'failure',
+  managedAccountUnsupported: 'failure',
+  restartFailed: 'failure',
+  providerRejected: 'failure',
+  attachmentInvalid: 'failure',
+  attachmentUnreadable: 'failure',
+  emptyMessage: 'failure',
+  queueFull: 'failure',
+  writeFailed: 'failure',
+  hostFault: 'failure',
+  // Orca stopped a start that hung: the agent failed.
+  hostStopped: 'failure'
+} satisfies Record<SubmissionRejectionKind, 'failure' | null>
+
+/** The legacy markers, by the kind each stands for. */
+const LEGACY_MARKER_KINDS: ReadonlyMap<string, SubmissionRejectionKind> = new Map([
+  [DISPATCH_REJECTED_CANCELLED, 'cancelled'],
+  [DISPATCH_REJECTED_HOST_RESTARTED, 'hostRestarted'],
+  [DISPATCH_REJECTED_PROVIDER_CLOSED, 'chatClosed'],
+  [DISPATCH_REJECTED_QUEUE_FULL, 'queueFull'],
+  [DISPATCH_REJECTED_CODEX_QUEUE_FULL, 'queueFull'],
+  [DISPATCH_REJECTED_NOT_DELIVERED, 'notDelivered']
+])
+
+/** The kind a legacy marker stands for; undefined for any other reason, which is a sentence. */
+function legacyMarkerKind(reason: string | null): SubmissionRejectionKind | undefined {
+  if (dispatchRejectionWasTransportWriteFailure(reason)) {
+    return 'writeFailed'
+  }
+  return reason === null ? undefined : LEGACY_MARKER_KINDS.get(reason)
+}
+
+/**
+ * The one reader of why a submission was rejected. The typed fact decides when the row carries
+ * one; a fact this build cannot place says only that the message was not sent. A row with no
+ * fact, from an older host, is read by its legacy marker, and any other reason is a sentence — a
+ * provider's, or Orca's before rows were typed — which reads as a content failure.
  */
-export function dispatchRejectionReasonIsInternal(reason: string | null | undefined): boolean {
+export function classifyDispatchRejection(
+  submission: Pick<AgentJournalSubmission, 'reason'> & { rejection?: unknown }
+): DispatchRejectionClassification {
+  const { rejection } = submission
+  const factKind = readAgentSessionFailureFact(rejection)?.kind
+  if (typeof rejection === 'object' && rejection !== null && !isSubmissionRejectionKind(factKind)) {
+    // Undelivered, not content: all a fact this build can't place proves is the message didn't happen.
+    return { category: 'undelivered', verdict: null }
+  }
+  const kind = isSubmissionRejectionKind(factKind) ? factKind : legacyMarkerKind(submission.reason)
+  if (!kind) {
+    return { category: 'content', verdict: 'failure' }
+  }
+  return { category: KIND_CATEGORY[kind], verdict: KIND_VERDICT[kind], kind }
+}
+
+/** A Stop withdrew it before it ran: it will not land, and only its sender can send it again. */
+export function dispatchWasWithdrawn(
+  submission: Pick<AgentJournalSubmission, 'dispatchState' | 'reason' | 'rejection'> | undefined
+): boolean {
+  return (
+    submission?.dispatchState === 'rejected' &&
+    classifyDispatchRejection(submission).category === 'withdrawn'
+  )
+}
+
+/** A submission that says Orca never handed it over, in any dispatch state: journals written
+ *  before this state moved hold it as `unknown` carrying the marker. */
+export function isWriteFailureSubmission(
+  submission: Pick<AgentJournalSubmission, 'reason' | 'rejection'>
+): boolean {
   return (
-    dispatchRejectionWasTransportWriteFailure(reason) ||
-    reason === DISPATCH_REJECTED_QUEUE_FULL ||
-    reason === DISPATCH_REJECTED_CODEX_QUEUE_FULL ||
-    reason === DISPATCH_REJECTED_CANCELLED
+    readAgentSessionFailureFact(submission.rejection)?.kind === 'writeFailed' ||
+    dispatchRejectionWasTransportWriteFailure(submission.reason)
   )
 }
diff --git a/src/shared/structured-agent-session-latest-request.test.ts b/src/shared/structured-agent-session-latest-request.test.ts
new file mode 100644
index 000000000000..7cdb1b2d36af
--- /dev/null
+++ b/src/shared/structured-agent-session-latest-request.test.ts
@@ -0,0 +1,313 @@
+import { describe, expect, it } from 'vitest'
+import type {
+  AgentJournalRenderItem,
+  AgentJournalSubmission,
+  AgentJournalTurnLifecycle
+} from './agent-session-journal-types'
+import { AGENT_SESSION_FAILURE_KINDS, isSubmissionRejectionKind } from './agent-session-failure'
+import { agentJournalSubmissionKey } from './agent-session-journal-item-key'
+import {
+  classifyDispatchRejection,
+  DISPATCH_REJECTED_CANCELLED,
+  DISPATCH_REJECTED_CODEX_QUEUE_FULL,
+  DISPATCH_REJECTED_HOST_RESTARTED,
+  DISPATCH_REJECTED_NOT_DELIVERED,
+  DISPATCH_REJECTED_PROVIDER_CLOSED,
+  DISPATCH_REJECTED_QUEUE_FULL,
+  DISPATCH_REJECTED_WRITE_FAILED
+} from './structured-agent-session-dispatch-rejection'
+import {
+  hasStructuredAgentSessionRequest,
+  latestStructuredAgentSessionRequest
+} from './structured-agent-session-latest-request'
+import { projectStructuredAgentSessionStatusSummary } from './structured-agent-session-projection'
+
+const START_FAILURE = 'Claude is not signed in.'
+
+function userEntry(clientMessageId: string, sequence: number): AgentJournalRenderItem {
+  return {
+    itemId: agentJournalSubmissionKey(clientMessageId),
+    revision: 0,
+    sequence,
+    observedAt: sequence,
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: clientMessageId }] }
+  }
+}
+
+function turn(
+  turnId: string,
+  sequence: number,
+  fields: Omit<AgentJournalTurnLifecycle, 'turnId'>
+): AgentJournalRenderItem {
+  return {
+    itemId: `codex:turn:${turnId}`,
+    revision: 1,
+    sequence,
+    observedAt: sequence,
+    body: { kind: 'turn', turnId, ...fields }
+  }
+}
+
+function sent(
+  clientMessageId: string,
+  fields: Partial<AgentJournalSubmission> & Pick<AgentJournalSubmission, 'dispatchState'>
+): AgentJournalSubmission {
+  return {
+    clientMessageId,
+    fence: 1,
+    payloadFingerprint: clientMessageId,
+    providerItemId: null,
+    reason: null,
+    submittedAt: 10,
+    resolvedAt: 20,
+    handoverRecorded: true,
+    ...fields
+  }
+}
+
+const rejected = (clientMessageId: string, reason: string, handedOverAt?: number) =>
+  sent(clientMessageId, {
+    dispatchState: 'rejected',
+    reason,
+    ...(handedOverAt !== undefined ? { handedOverAt } : {})
+  })
+
+type Row = {
+  name: string
+  items: AgentJournalRenderItem[]
+  submissions: AgentJournalSubmission[]
+  fence?: number
+  outcome: 'success' | 'failure' | 'cancellation' | null
+  listed: boolean
+}
+
+const ROWS: Row[] = [
+  {
+    name: 'a send the agent start refused',
+    items: [userEntry('m1', 1)],
+    submissions: [rejected('m1', START_FAILURE)],
+    outcome: 'failure',
+    listed: true
+  },
+  {
+    name: 'a send the user withdrew (no verdict)',
+    items: [userEntry('m1', 1)],
+    submissions: [rejected('m1', DISPATCH_REJECTED_CANCELLED)],
+    outcome: null,
+    listed: false
+  },
+  {
+    name: 'a send still queued when the host restarted (no verdict)',
+    items: [userEntry('m1', 1)],
+    submissions: [rejected('m1', DISPATCH_REJECTED_HOST_RESTARTED)],
+    outcome: null,
+    listed: false
+  },
+  {
+    name: 'a send still queued when the provider closed (no verdict)',
+    items: [userEntry('m1', 1)],
+    submissions: [rejected('m1', DISPATCH_REJECTED_PROVIDER_CLOSED)],
+    outcome: null,
+    listed: false
+  },
+  {
+    name: 'a send crash recovery found the provider never received (no verdict)',
+    items: [userEntry('m1', 1)],
+    submissions: [
+      sent('m1', {
+        dispatchState: 'rejected',
+        reason: DISPATCH_REJECTED_NOT_DELIVERED,
+        recovered: true
+      })
+    ],
+    outcome: null,
+    listed: false
+  },
+  {
+    name: 'a turn that succeeded, then a send crash recovery found the provider never received',
+    items: [
+      userEntry('m1', 1),
+      turn('t1', 2, { state: 'completed', outcome: 'success', completedAt: 15 }),
+      userEntry('m2', 3)
+    ],
+    submissions: [
+      sent('m1', { dispatchState: 'accepted' }),
+      sent('m2', {
+        dispatchState: 'rejected',
+        reason: DISPATCH_REJECTED_NOT_DELIVERED,
+        recovered: true
+      })
+    ],
+    outcome: 'success',
+    listed: true
+  },
+  {
+    name: 'a send crash recovery left unknown',
+    items: [userEntry('m1', 1)],
+    submissions: [sent('m1', { dispatchState: 'unknown', recovered: true })],
+    outcome: null,
+    listed: false
+  },
+  {
+    name: 'a send pending at an older fence',
+    items: [userEntry('m1', 1)],
+    submissions: [sent('m1', { dispatchState: 'pending', handedOverAt: 11, resolvedAt: null })],
+    fence: 2,
+    outcome: null,
+    listed: false
+  },
+  {
+    name: 'a turn that succeeded, then a send the start refused',
+    items: [
+      userEntry('m1', 1),
+      turn('t1', 2, { state: 'completed', outcome: 'success', completedAt: 15 }),
+      userEntry('m2', 3)
+    ],
+    submissions: [sent('m1', { dispatchState: 'accepted' }), rejected('m2', START_FAILURE)],
+    outcome: 'failure',
+    listed: true
+  },
+  {
+    name: 'a refused send, then a turn that succeeded',
+    items: [
+      userEntry('m1', 1),
+      userEntry('m2', 2),
+      turn('t2', 3, { state: 'completed', outcome: 'success', completedAt: 40 })
+    ],
+    submissions: [rejected('m1', START_FAILURE), sent('m2', { dispatchState: 'accepted' })],
+    outcome: 'success',
+    listed: true
+  },
+  {
+    name: 'a steer the provider refused inside a turn that then succeeded',
+    items: [
+      userEntry('m1', 1),
+      turn('t1', 2, { state: 'completed', outcome: 'success', completedAt: 50 }),
+      userEntry('steer', 3)
+    ],
+    submissions: [
+      sent('m1', { dispatchState: 'accepted' }),
+      rejected('steer', 'no active turn to steer', 30)
+    ],
+    outcome: 'success',
+    listed: true
+  },
+  {
+    name: 'a user message the provider journaled itself (history, an older host)',
+    items: [
+      {
+        itemId: 'codex:thread-1:turn-1:0',
+        revision: 0,
+        sequence: 1,
+        observedAt: 1,
+        body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'from history' }] }
+      }
+    ],
+    submissions: [],
+    outcome: null,
+    listed: true
+  },
+  {
+    name: 'a goal and nothing else yet',
+    items: [
+      {
+        itemId: 'codex:goal-entry',
+        revision: 0,
+        sequence: 1,
+        observedAt: 1,
+        body: {
+          kind: 'message',
+          role: 'user',
+          sentAs: 'goal',
+          blocks: [{ type: 'text', text: 'ship it' }]
+        }
+      }
+    ],
+    submissions: [],
+    outcome: null,
+    listed: true
+  }
+]
+
+describe('the latest request and its verdict', () => {
+  it.each(ROWS)('$name', ({ items, submissions, fence, outcome, listed }) => {
+    expect(latestStructuredAgentSessionRequest(items, submissions)?.outcome ?? null).toBe(outcome)
+    const summary = projectStructuredAgentSessionStatusSummary(items, submissions, fence)
+    expect(summary.status !== null).toBe(listed)
+    if (listed && summary.status === 'idle') {
+      expect(summary.turnOutcome ?? null).toBe(outcome)
+    }
+  })
+
+  it('dates an idle session by the refusal it reports, not by the older turn', () => {
+    const items = [
+      userEntry('m1', 1),
+      turn('t1', 2, { state: 'completed', outcome: 'success', completedAt: 15 }),
+      userEntry('m2', 3)
+    ]
+    const submissions = [sent('m1', { dispatchState: 'accepted' }), rejected('m2', START_FAILURE)]
+    expect(projectStructuredAgentSessionStatusSummary(items, submissions)).toMatchObject({
+      status: 'idle',
+      turnOutcome: 'failure',
+      statusStartedAt: 20
+    })
+  })
+})
+
+describe('the sidebar verdict agrees with the rejection classifier', () => {
+  // A sentence as the reason, so only the typed fact can make a kind read as no verdict.
+  const typed = AGENT_SESSION_FAILURE_KINDS.filter(isSubmissionRejectionKind).map((kind) => ({
+    name: `typed ${kind}`,
+    submission: sent('m1', {
+      dispatchState: 'rejected',
+      reason: 'The message was not sent.',
+      rejection: { kind }
+    })
+  }))
+  const legacy = [
+    DISPATCH_REJECTED_CANCELLED,
+    DISPATCH_REJECTED_QUEUE_FULL,
+    DISPATCH_REJECTED_CODEX_QUEUE_FULL,
+    DISPATCH_REJECTED_HOST_RESTARTED,
+    DISPATCH_REJECTED_PROVIDER_CLOSED,
+    DISPATCH_REJECTED_NOT_DELIVERED,
+    DISPATCH_REJECTED_WRITE_FAILED,
+    `${DISPATCH_REJECTED_WRITE_FAILED}: broken pipe`
+  ].map((reason) => ({ name: `legacy ${reason}`, submission: rejected('m1', reason) }))
+  const unknownKind = {
+    name: 'a kind this build cannot place',
+    submission: sent('m1', {
+      dispatchState: 'rejected',
+      reason: 'A newer host wrote this.',
+      rejection: { kind: 'someFutureKind' }
+    })
+  }
+
+  it.each([...typed, ...legacy, unknownKind])('$name', ({ submission }) => {
+    const items = [userEntry('m1', 1)]
+    const { verdict } = classifyDispatchRejection(submission)
+    expect(latestStructuredAgentSessionRequest(items, [submission])?.outcome ?? null).toBe(verdict)
+    expect(hasStructuredAgentSessionRequest(items, [submission])).toBe(verdict === 'failure')
+  })
+
+  const failedNobody = new Set([
+    'typed notDelivered',
+    'typed cancelled',
+    'typed hostRestarted',
+    'typed chatClosed',
+    `legacy ${DISPATCH_REJECTED_NOT_DELIVERED}`,
+    `legacy ${DISPATCH_REJECTED_CANCELLED}`,
+    `legacy ${DISPATCH_REJECTED_HOST_RESTARTED}`,
+    `legacy ${DISPATCH_REJECTED_PROVIDER_CLOSED}`
+  ])
+  const failedNobodyCases = [...typed, ...legacy].filter(({ name }) => failedNobody.has(name))
+  it('covers every send that failed nobody', () => {
+    expect(failedNobodyCases).toHaveLength(failedNobody.size)
+  })
+  it.each(failedNobodyCases)(
+    'gives no verdict for a send that failed nobody: $name',
+    ({ submission }) => {
+      expect(latestStructuredAgentSessionRequest([userEntry('m1', 1)], [submission])).toBeNull()
+    }
+  )
+})
diff --git a/src/shared/structured-agent-session-latest-request.ts b/src/shared/structured-agent-session-latest-request.ts
new file mode 100644
index 000000000000..9679c0c12bd7
--- /dev/null
+++ b/src/shared/structured-agent-session-latest-request.ts
@@ -0,0 +1,145 @@
+// The session's latest request and what became of it: the verdict a sidebar row reports once
+// the session is idle, and whether there is a request to list at all.
+//
+// A request is either a turn, whose record carries the provider's verdict, or a send that never
+// became one because the agent or its start refused it. A send inside a running turn (a steer)
+// is not a request of its own: the turn it joined answers for it.
+
+import type {
+  AgentJournalRenderItem,
+  AgentJournalSubmission,
+  AgentJournalTurnLifecycle,
+  AgentJournalTurnOutcome
+} from './agent-session-journal-types'
+import { agentJournalSubmissionKey } from './agent-session-journal-item-key'
+import { isRootAgentJournalItem } from './agent-session-journal-producer'
+import { readAgentJournalTurn, readAgentJournalTurnOutcome } from './agent-session-turn-record'
+import { classifyDispatchRejection } from './structured-agent-session-dispatch-rejection'
+import { isUnansweredStructuredAgentSessionDispatch } from './structured-agent-session-unanswered-dispatch'
+
+export type StructuredAgentSessionLatestRequest = {
+  kind: 'turn' | 'refused-send'
+  /** The turn's id, or the refused send's journal item key. Unique only within its kind. */
+  id: string
+  running: boolean
+  /** Null while the turn runs, and for a turn whose end carried no verdict. */
+  outcome: AgentJournalTurnOutcome | null
+  /** When it settled: the turn's end, or the refusal. Undefined while it runs. */
+  settledAt: number | undefined
+}
+
+/** Null when the journal holds no request with a verdict to give. Accepted and unanswered sends
+ *  are passed over — the session is working until their turn records — and so are sends that
+ *  failed nobody (withdrawn, or left undelivered by a restart or a close). */
+export function latestStructuredAgentSessionRequest(
+  items: readonly AgentJournalRenderItem[],
+  submissions: readonly AgentJournalSubmission[]
+): StructuredAgentSessionLatestRequest | null {
+  const rejected = rejectedSubmissionsByItem(submissions)
+  for (let index = items.length - 1; index >= 0; index -= 1) {
+    const item = items[index]
+    if (!item || !isRootAgentJournalItem(item)) {
+      continue
+    }
+    const turn = readAgentJournalTurn(item.body)
+    if (turn) {
+      const running = turn.state === 'running'
+      return {
+        kind: 'turn',
+        id: turn.turnId,
+        running,
+        outcome: readAgentJournalTurnOutcome(turn),
+        settledAt: running ? undefined : turnEndedAt(item, turn)
+      }
+    }
+    const submission = rejected.get(item.itemId)
+    if (
+      submission &&
+      classifyDispatchRejection(submission).verdict === 'failure' &&
+      !deliveredIntoRunningTurn(items, index, submission)
+    ) {
+      return {
+        kind: 'refused-send',
+        id: item.itemId,
+        running: false,
+        outcome: 'failure',
+        settledAt: submission.resolvedAt ?? undefined
+      }
+    }
+  }
+  return null
+}
+
+/** Whether the session has a request to list. A send that failed nobody and never became a turn
+ *  leaves nothing to report, so a session holding only those is not listed; a user message the
+ *  provider journaled itself (history, an older host) still is. Deliberately NOT scoped by
+ *  producer: a session whose only content came from a subagent still has content. */
+export function hasStructuredAgentSessionRequest(
+  items: readonly AgentJournalRenderItem[],
+  submissions: readonly AgentJournalSubmission[],
+  currentFence?: number | null
+): boolean {
+  const sent = new Set(
+    submissions.map((submission) => agentJournalSubmissionKey(submission.clientMessageId))
+  )
+  return (
+    items.some(
+      (item) =>
+        readAgentJournalTurn(item.body) !== null ||
+        (item.body.kind === 'message' &&
+          (item.body.role === 'assistant' || (item.body.role === 'user' && !sent.has(item.itemId))))
+    ) ||
+    submissions.some(
+      (submission) =>
+        submission.dispatchState === 'accepted' ||
+        isUnansweredStructuredAgentSessionDispatch(submission, currentFence) ||
+        (submission.dispatchState === 'rejected' &&
+          classifyDispatchRejection(submission).verdict === 'failure')
+    )
+  )
+}
+
+function rejectedSubmissionsByItem(
+  submissions: readonly AgentJournalSubmission[]
+): Map<string, AgentJournalSubmission> {
+  const rejected = new Map<string, AgentJournalSubmission>()
+  for (const submission of submissions) {
+    if (submission.dispatchState === 'rejected') {
+      rejected.set(agentJournalSubmissionKey(submission.clientMessageId), submission)
+    }
+  }
+  return rejected
+}
+
+/** A send handed over while the turn before it was still running joined that turn. Read off the
+ *  host clock, because a turn record's end revises it in place and keeps no sequence of its own.
+ *  A send never handed over reached no turn. */
+function deliveredIntoRunningTurn(
+  items: readonly AgentJournalRenderItem[],
+  index: number,
+  submission: AgentJournalSubmission
+): boolean {
+  // Older hosts dispatched a send as they recorded it.
+  const deliveredAt =
+    submission.handedOverAt ?? (submission.handoverRecorded ? undefined : submission.submittedAt)
+  if (deliveredAt === undefined) {
+    return false
+  }
+  for (let previous = index - 1; previous >= 0; previous -= 1) {
+    const item = items[previous]
+    const turn = readAgentJournalTurn(item?.body)
+    if (item && turn) {
+      const endedAt = turnEndedAt(item, turn)
+      return turn.state === 'running' || (endedAt !== undefined && endedAt > deliveredAt)
+    }
+  }
+  return false
+}
+
+/** A turn recovery settled ended when that settle was written: when the user learns it stopped. */
+function turnEndedAt(
+  item: AgentJournalRenderItem,
+  turn: AgentJournalTurnLifecycle
+): number | undefined {
+  return item.recoveredAt ?? turn.completedAt
+}
diff --git a/src/shared/structured-agent-session-main-agent-working.ts b/src/shared/structured-agent-session-main-agent-working.ts
new file mode 100644
index 000000000000..05e3b775aaa9
--- /dev/null
+++ b/src/shared/structured-agent-session-main-agent-working.ts
@@ -0,0 +1,14 @@
+import type { AgentJournalSubmission } from './agent-session-journal-types'
+import { hasUnansweredStructuredAgentSessionDispatch } from './structured-agent-session-unanswered-dispatch'
+
+/** Whether the session's own agent is working: a running turn, or a send it has not answered.
+ *  The one rule behind every session list's Working and the chat's own Stop. */
+export function isStructuredAgentSessionMainAgentWorking(
+  activeTurnId: string | null,
+  submissions: readonly AgentJournalSubmission[],
+  currentFence?: number | null
+): boolean {
+  return (
+    activeTurnId !== null || hasUnansweredStructuredAgentSessionDispatch(submissions, currentFence)
+  )
+}
diff --git a/src/shared/structured-agent-session-message-projection.ts b/src/shared/structured-agent-session-message-projection.ts
index 6219538fbecd..334cde7cfe8c 100644
--- a/src/shared/structured-agent-session-message-projection.ts
+++ b/src/shared/structured-agent-session-message-projection.ts
@@ -1,5 +1,6 @@
 import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types'
 import { agentJournalSubmissionKey } from './agent-session-journal-item-key'
+import { agentJournalItemPosition } from './agent-session-journal-position'
 import type { NativeChatMessage } from './native-chat-types'
 import {
   reconcileStructuredAgentSessionOutbox,
@@ -20,18 +21,32 @@ export function projectStructuredAgentSessionMessages(
       .filter((submission) => submission.dispatchState === 'rejected')
       .map((submission) => agentJournalSubmissionKey(submission.clientMessageId))
   )
-  const visibleItems = items.filter((item) => !rejected.has(item.itemId))
+  const visibleItems: AgentJournalRenderItem[] = []
+  const refused = new Map<string, AgentJournalRenderItem>()
+  for (const item of items) {
+    if (rejected.has(item.itemId)) {
+      refused.set(item.itemId, item)
+    } else {
+      visibleItems.push(item)
+    }
+  }
   const journalled = new Set(visibleItems.map((item) => item.itemId))
   return [
     ...projectItems(visibleItems),
     ...optimistic
       .filter((entry) => !journalled.has(agentJournalSubmissionKey(entry.clientMessageId)))
-      .map((entry): NativeChatMessage => ({
-        id: agentJournalSubmissionKey(entry.clientMessageId),
-        role: 'user',
-        source: 'transcript',
-        timestamp: entry.queuedAt,
-        blocks: entry.body.blocks
-      }))
+      .map((entry): NativeChatMessage => {
+        const id = agentJournalSubmissionKey(entry.clientMessageId)
+        const recorded = refused.get(id)
+        return {
+          id,
+          role: 'user',
+          source: 'transcript',
+          timestamp: entry.queuedAt,
+          blocks: entry.body.blocks,
+          // A send the journal recorded before refusing it keeps its place there.
+          ...(recorded ? { journalPosition: agentJournalItemPosition(recorded) } : {})
+        }
+      })
   ]
 }
diff --git a/src/shared/structured-agent-session-operation-identity.test.ts b/src/shared/structured-agent-session-operation-identity.test.ts
new file mode 100644
index 000000000000..f0b05ed86d3a
--- /dev/null
+++ b/src/shared/structured-agent-session-operation-identity.test.ts
@@ -0,0 +1,39 @@
+import { describe, expect, it } from 'vitest'
+import { structuredAgentSessionWriteNamesItsTarget } from './structured-agent-session-operation-identity'
+
+describe('structuredAgentSessionWriteNamesItsTarget', () => {
+  it('holds for a cancel naming its turn, prompt or task, as every mobile cancel does', () => {
+    expect(structuredAgentSessionWriteNamesItsTarget('agentSession.cancel', { turnId: 't' })).toBe(
+      true
+    )
+    expect(
+      structuredAgentSessionWriteNamesItsTarget('agentSession.cancel', {
+        turnId: 't',
+        prompt: { itemId: 'i', expectedRevision: 1 }
+      })
+    ).toBe(true)
+    expect(
+      structuredAgentSessionWriteNamesItsTarget('agentSession.cancel', {
+        turnId: 'background-tasks',
+        scope: 'background-tasks',
+        taskId: 'task-1'
+      })
+    ).toBe(true)
+  })
+
+  it('fails for a Stop naming no turn, and for a stop of every background task', () => {
+    expect(structuredAgentSessionWriteNamesItsTarget('agentSession.cancel', {})).toBe(false)
+    expect(
+      structuredAgentSessionWriteNamesItsTarget('agentSession.cancel', {
+        turnId: 'background-tasks',
+        scope: 'background-tasks'
+      })
+    ).toBe(false)
+  })
+
+  it('leaves every other write as it was', () => {
+    expect(
+      structuredAgentSessionWriteNamesItsTarget('agentSession.setOption', { key: 'k', value: 'v' })
+    ).toBe(true)
+  })
+})
diff --git a/src/shared/structured-agent-session-operation-identity.ts b/src/shared/structured-agent-session-operation-identity.ts
new file mode 100644
index 000000000000..bae28095695f
--- /dev/null
+++ b/src/shared/structured-agent-session-operation-identity.ts
@@ -0,0 +1,17 @@
+/**
+ * Whether a structured-session cancel names what it stops (a turn, a prompt, a task), so another
+ * cancel with the same payload is the same intent and may reuse its operation id to replay. A Stop
+ * naming no turn, or one stopping every background task, acts on whatever is in flight when the
+ * host reaches it: its payload is shared with every later one, so each press gets its own id.
+ */
+export function structuredAgentSessionWriteNamesItsTarget(
+  fingerprintMethod: string,
+  fields: Readonly<Record<string, unknown>>
+): boolean {
+  if (fingerprintMethod !== 'agentSession.cancel') {
+    return true
+  }
+  return fields.scope === 'background-tasks'
+    ? fields.taskId !== undefined
+    : fields.turnId !== undefined
+}
diff --git a/src/shared/structured-agent-session-outbox-stop-withdrawal.ts b/src/shared/structured-agent-session-outbox-stop-withdrawal.ts
new file mode 100644
index 000000000000..7d35f9e87202
--- /dev/null
+++ b/src/shared/structured-agent-session-outbox-stop-withdrawal.ts
@@ -0,0 +1,52 @@
+import type { AgentJournalSubmission } from './agent-session-journal-types'
+import type { StructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox'
+
+/** Whether only the user's Retry sends this entry again: a refused one, the one the drain stopped
+ *  on, or one in doubt the unconfirmed probe leaves alone. `NativeChatDeliveryRetry` offers it. */
+function awaitsStructuredAgentSessionRetry(
+  entry: StructuredAgentSessionOutboxEntry,
+  blockedClientMessageId: string | null
+): boolean {
+  return (
+    entry.state === 'rejected' ||
+    entry.clientMessageId === blockedClientMessageId ||
+    (entry.state === 'unconfirmed' && entry.retryAfterUnknownSubmittedAt !== null)
+  )
+}
+
+function unsentStructuredAgentSessionOutboxEntry(
+  submissions: readonly AgentJournalSubmission[],
+  blockedClientMessageId: string | null
+): (entry: StructuredAgentSessionOutboxEntry) => boolean {
+  const held = new Set(submissions.map((submission) => submission.clientMessageId))
+  return (entry) =>
+    !held.has(entry.clientMessageId) &&
+    !awaitsStructuredAgentSessionRetry(entry, blockedClientMessageId)
+}
+
+/**
+ * What a Stop leaves in the outbox: nothing the journal does not already hold may go out after it,
+ * so every such entry goes, as a message the host withdraws leaves the chat. The send on its way
+ * stays: it reaches the host ahead of the Stop, and it comes back from the host's answer, since
+ * the agent may already have it. One waiting on Retry keeps it.
+ */
+export function withdrawUnsentStructuredAgentSessionOutboxEntries(
+  entries: readonly StructuredAgentSessionOutboxEntry[],
+  submissions: readonly AgentJournalSubmission[],
+  blockedClientMessageId: string | null,
+  inFlightClientMessageId: string | null
+): StructuredAgentSessionOutboxEntry[] {
+  const unsent = unsentStructuredAgentSessionOutboxEntry(submissions, blockedClientMessageId)
+  return entries.filter(
+    (entry) => entry.clientMessageId === inFlightClientMessageId || !unsent(entry)
+  )
+}
+
+/** Whether a Stop has something here to withdraw: a message that would still go out on its own. */
+export function hasUnsentStructuredAgentSessionOutboxEntry(
+  entries: readonly StructuredAgentSessionOutboxEntry[],
+  submissions: readonly AgentJournalSubmission[],
+  blockedClientMessageId: string | null
+): boolean {
+  return entries.some(unsentStructuredAgentSessionOutboxEntry(submissions, blockedClientMessageId))
+}
diff --git a/src/shared/structured-agent-session-outbox.ts b/src/shared/structured-agent-session-outbox.ts
index a336dea6fedd..c14209a716cc 100644
--- a/src/shared/structured-agent-session-outbox.ts
+++ b/src/shared/structured-agent-session-outbox.ts
@@ -1,13 +1,25 @@
+import { readAgentSessionFailureFact, type AgentSessionFailureFact } from './agent-session-failure'
 import type { AgentJournalMessageItem, AgentJournalSubmission } from './agent-session-journal-types'
-import { agentSessionRefusalOperationState } from './agent-session-refusal-retry'
-import type {
-  AgentSessionMutationEnvelope,
-  AgentSessionWireRefusalCode
-} from './agent-session-wire'
+import {
+  parseAgentSessionWriteFailure,
+  type AgentSessionWriteFailure,
+  type AgentSessionWriteRefusal
+} from './agent-session-write-failure'
+import {
+  agentSessionOwnerVerdictAllowsFreshOperationId,
+  agentSessionRefusalOperationState
+} from './agent-session-refusal-retry'
+import type { AgentSessionMutationEnvelope } from './agent-session-wire'
 import { structuredAgentSessionPayloadFingerprint } from './structured-agent-session-mutation'
-import { DISPATCH_REJECTED_CANCELLED } from './structured-agent-session-dispatch-rejection'
+import { classifyDispatchRejection } from './structured-agent-session-dispatch-rejection'
 
-export type StructuredAgentSessionOutboxState = 'queued' | 'dispatching' | 'unconfirmed'
+/** `rejected`: the host settled the send as not delivered. The drain never sends it again on its
+ *  own and nothing queues behind it; only the user's Retry does. */
+export type StructuredAgentSessionOutboxState =
+  | 'queued'
+  | 'dispatching'
+  | 'unconfirmed'
+  | 'rejected'
 
 export type StructuredAgentSessionOutboxEntry = {
   clientMessageId: string
@@ -19,6 +31,64 @@ export type StructuredAgentSessionOutboxEntry = {
   lastAttemptAt: number | null
   retryAfterUnknownSubmittedAt: number | null
   source?: 'launch'
+  /** Why the last attempt did not go through. Lives on the message so it goes when the message
+   *  is sent again or delivered, instead of outliving it as a separate error. */
+  lastFailure?: StructuredAgentSessionAttemptFailure
+}
+
+/** A host's rejection fact as a message keeps it: never its provider detail, whose log text is not
+ *  kept client-side, or its refusal. The journal row keeps the whole fact, and words the notice
+ *  while it is loaded; this copy words it when it is not. */
+export type StructuredAgentSessionRejectionFact = Pick<
+  AgentSessionFailureFact,
+  'kind' | 'attachment'
+>
+
+/** Kept as the fact, not the words: the Retry row chooses those when it shows the entry. */
+export type StructuredAgentSessionAttemptFailure =
+  | AgentSessionWriteFailure
+  /** The host recorded the message and the provider turned it down, with the provider's reason. */
+  | { kind: 'rejected'; reason: string | null; rejection?: StructuredAgentSessionRejectionFact }
+
+/** The failure a rejected submission leaves on its message. A fact this build cannot place is
+ *  dropped, leaving the reason. */
+export function structuredAgentSessionRejectedFailure(submission: {
+  reason: string | null
+  rejection?: unknown
+}): Extract<StructuredAgentSessionAttemptFailure, { kind: 'rejected' }> {
+  const fact = readAgentSessionFailureFact(submission.rejection)
+  return {
+    kind: 'rejected',
+    reason: submission.reason,
+    ...(fact
+      ? {
+          rejection: {
+            kind: fact.kind,
+            ...(fact.attachment ? { attachment: fact.attachment } : {})
+          }
+        }
+      : {})
+  }
+}
+
+function parseStructuredAgentSessionAttemptFailure(
+  value: unknown
+): StructuredAgentSessionAttemptFailure | undefined {
+  if (
+    typeof value === 'object' &&
+    value !== null &&
+    'kind' in value &&
+    value.kind === 'rejected' &&
+    'reason' in value
+  ) {
+    return value.reason === null || typeof value.reason === 'string'
+      ? structuredAgentSessionRejectedFailure({
+          reason: value.reason,
+          rejection: 'rejection' in value ? value.rejection : undefined
+        })
+      : undefined
+  }
+  return parseAgentSessionWriteFailure(value)
 }
 
 export type StructuredAgentSessionAttachment = {
@@ -73,25 +143,41 @@ export function updateStructuredAgentSessionOutboxEntry(
   })
 }
 
+/** Staged for another attempt; the last attempt's failure no longer describes it. */
+export function stageStructuredAgentSessionOutboxEntryForSend(
+  { lastFailure: _sentAgain, ...entry }: StructuredAgentSessionOutboxEntry,
+  now: number
+): StructuredAgentSessionOutboxEntry {
+  return { ...entry, state: 'dispatching', lastAttemptAt: now }
+}
+
 export function requeueStructuredAgentSessionSendRefusal(
   entry: StructuredAgentSessionOutboxEntry,
-  code: AgentSessionWireRefusalCode,
+  refusal: AgentSessionWriteRefusal,
   createOperationId: () => string,
   retainOperationId = false
 ): StructuredAgentSessionOutboxEntry {
-  const refusalState = agentSessionRefusalOperationState(code)
+  const refusalSettled = agentSessionRefusalOperationState(refusal.code) === 'settled-rejected'
+  // An exited owner runs nothing under the old id, so a new one can't collide; the message still
+  // holds the head, since nothing recorded it.
+  const ownerExited =
+    refusal.code === 'agent_session_ownership_unknown' &&
+    agentSessionOwnerVerdictAllowsFreshOperationId(refusal.details?.ownerVerdict)
   if (
-    refusalState !== 'settled-rejected' ||
+    !(refusalSettled || ownerExited) ||
     retainOperationId ||
     entry.state === 'unconfirmed' ||
     entry.retryAfterUnknownSubmittedAt !== null
   ) {
     return { ...entry, state: 'queued' }
   }
+  // Only here may the id rotate: an earlier attempt under this id, or one whose delivery was in
+  // doubt, may have landed, so those stay queued behind the block. Only a settled refusal proves
+  // the message never landed and so releases the queue.
   return {
     ...entry,
     clientMessageId: createOperationId(),
-    state: 'queued',
+    state: refusalSettled ? 'rejected' : 'queued',
     lastAttemptAt: null,
     retryAfterUnknownSubmittedAt: null
   }
@@ -109,13 +195,28 @@ export function reconcileStructuredAgentSessionOutbox(
     }
     if (
       submission?.dispatchState === 'rejected' &&
-      submission.reason === DISPATCH_REJECTED_CANCELLED
+      classifyDispatchRejection(submission).category === 'withdrawn'
     ) {
       return []
     }
     if (submission?.dispatchState === 'pending') {
       return entry.state === 'dispatching' ? [entry] : [{ ...entry, state: 'dispatching' as const }]
     }
+    // Accepted, then not delivered — the agent never started, or its start was refused. The text
+    // and why stay here for the user's Retry, and nothing queues behind it. `unconfirmed` is how a
+    // remount reads an entry it left dispatching; the journal has since answered it.
+    if (
+      submission?.dispatchState === 'rejected' &&
+      (entry.state === 'dispatching' || entry.state === 'unconfirmed')
+    ) {
+      return [
+        {
+          ...entry,
+          state: 'rejected' as const,
+          lastFailure: structuredAgentSessionRejectedFailure(submission)
+        }
+      ]
+    }
     if (
       submission?.dispatchState === 'unknown' &&
       entry.retryAfterUnknownSubmittedAt !== -1 &&
@@ -147,6 +248,10 @@ export function admitStructuredAgentSessionOutboxEntry(
   blockedClientMessageId: string | null
 ): StructuredAgentSessionOutboxAdmission {
   for (const entry of entries) {
+    // It can no longer land, so nothing it could be reordered around; it waits for Retry.
+    if (entry.state === 'rejected') {
+      continue
+    }
     if (entry.state === 'unconfirmed' || entry.clientMessageId === blockedClientMessageId) {
       return { state: 'blocked', entry }
     }
@@ -176,10 +281,12 @@ export function parseStructuredAgentSessionOutboxEntry(
     !Array.isArray(body.blocks) ||
     !Array.isArray(entry.previewUris) ||
     !entry.previewUris.every((uri) => typeof uri === 'string') ||
-    !['queued', 'dispatching', 'unconfirmed'].includes(entry.state ?? '')
+    !['queued', 'dispatching', 'unconfirmed', 'rejected'].includes(entry.state ?? '')
   ) {
     return null
   }
+  // A malformed failure is dropped: the row then says only that the message was not sent.
+  const lastFailure = parseStructuredAgentSessionAttemptFailure(entry.lastFailure)
   return {
     clientMessageId: entry.clientMessageId,
     sessionId,
@@ -192,7 +299,8 @@ export function parseStructuredAgentSessionOutboxEntry(
       typeof entry.retryAfterUnknownSubmittedAt === 'number'
         ? entry.retryAfterUnknownSubmittedAt
         : null,
-    ...(entry.source === 'launch' ? { source: 'launch' as const } : {})
+    ...(entry.source === 'launch' ? { source: 'launch' as const } : {}),
+    ...(lastFailure ? { lastFailure } : {})
   }
 }
 
diff --git a/src/shared/structured-agent-session-owed-work.ts b/src/shared/structured-agent-session-owed-work.ts
new file mode 100644
index 000000000000..324c5160ed0e
--- /dev/null
+++ b/src/shared/structured-agent-session-owed-work.ts
@@ -0,0 +1,17 @@
+import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types'
+import { activeStructuredAgentSessionTurnId } from './structured-agent-session-live-turn'
+import { isStructuredAgentSessionMainAgentWorking } from './structured-agent-session-main-agent-working'
+
+/** A running turn or an unanswered send: what a `working` status means, and what an `attention`
+ *  status hides beneath its pending prompt. The main-agent rule, read from the journal's items. */
+export function owesStructuredAgentSessionWork(
+  items: readonly AgentJournalRenderItem[],
+  submissions: readonly AgentJournalSubmission[],
+  currentFence?: number | null
+): boolean {
+  return isStructuredAgentSessionMainAgentWorking(
+    activeStructuredAgentSessionTurnId(items),
+    submissions,
+    currentFence
+  )
+}
diff --git a/src/shared/structured-agent-session-projection.test.ts b/src/shared/structured-agent-session-projection.test.ts
index 3c16614cf454..691872c3587d 100644
--- a/src/shared/structured-agent-session-projection.test.ts
+++ b/src/shared/structured-agent-session-projection.test.ts
@@ -1,15 +1,16 @@
 import { describe, expect, it } from 'vitest'
 import { AGENT_STATUS_MAX_FIELD_LENGTH } from './agent-status-field-normalization'
+import { agentSessionFailureWords } from './agent-session-failure-words'
 import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types'
 import { parsePaneKey } from './stable-pane-id'
 import {
   activeStructuredAgentSessionTurnId,
-  hasPersistedStructuredAgentSessionTurn,
   hasUnansweredStructuredAgentSessionDispatch,
   projectStructuredItemToNativeChat,
   projectStructuredItemsToNativeChat,
   latestStructuredAgentSessionAssistantMessage,
   projectStructuredAgentSessionStatus,
+  projectStructuredAgentSessionStatusState,
   projectStructuredAgentSessionStatusSummary,
   structuredAgentSessionPaneKey
 } from './structured-agent-session-projection'
@@ -103,6 +104,26 @@ describe('structured agent session status projection', () => {
     })
   })
 
+  it("forwards a status row's failure fact and drops one this build cannot place", () => {
+    const words = agentSessionFailureWords(
+      {
+        kind: 'providerExited',
+        detail: { text: 'stderr tail', audience: 'log' }
+      },
+      { surface: 'row' }
+    )
+    expect(
+      projectStructuredItemToNativeChat(item('exit', 1, { kind: 'status', ...words }))?.blocks[0]
+    ).toEqual({ type: 'text', ...words })
+    const future = item('future', 2, { kind: 'status', text: 'Stopped.' })
+    // A newer host's kind reads as no fact, so the row keeps its text and nothing else.
+    Object.assign(future.body, { failure: { kind: 'futureKind' } })
+    expect(projectStructuredItemToNativeChat(future)?.blocks[0]).toEqual({
+      type: 'text',
+      text: 'Stopped.'
+    })
+  })
+
   it('projects running, attention, and completed lifecycle states', () => {
     const running = item('running', 1, {
       kind: 'status',
@@ -129,7 +150,7 @@ describe('structured agent session status projection', () => {
     expect(projectStructuredAgentSessionStatus([running, completed])).toBe('idle')
   })
 
-  it('summarizes status with the newest user prompt, and null before any persisted turn', () => {
+  it('summarizes status with the newest user prompt, and null before any request', () => {
     const running = item('running', 3, {
       kind: 'status',
       text: 'Working',
@@ -149,10 +170,16 @@ describe('structured agent session status projection', () => {
       ]
     })
 
-    expect(projectStructuredAgentSessionStatusSummary([running])).toEqual({
+    expect(projectStructuredAgentSessionStatusSummary([])).toEqual({
       status: null,
       latestPrompt: ''
     })
+    // A turn the provider opened on its own is a request, with no prompt to quote.
+    expect(projectStructuredAgentSessionStatusSummary([running])).toEqual({
+      status: 'working',
+      latestPrompt: '',
+      statusStartedAt: 3
+    })
     expect(projectStructuredAgentSessionStatusSummary([first, second, running])).toEqual({
       status: 'working',
       latestPrompt: 'second line',
@@ -235,6 +262,42 @@ describe('structured agent session status projection', () => {
     })
   })
 
+  it('still reports owed work beneath a pending prompt, which the attention status hides', () => {
+    const asked = item('asked', 1, {
+      kind: 'message',
+      role: 'user',
+      blocks: [{ type: 'text', text: 'go' }]
+    })
+    const prompt = item('prompt', 3, {
+      kind: 'approval',
+      title: 'Run command?',
+      detail: null,
+      options: [{ id: 'yes', label: 'Allow' }],
+      resolution: { state: 'pending', selectedOptionId: null, resolvedBy: null, resolvedAt: null }
+    })
+    const running = item('turn', 2, { kind: 'turn', turnId: 't1', state: 'running' })
+    const settled = item('turn', 2, {
+      kind: 'turn',
+      turnId: 't1',
+      state: 'completed',
+      outcome: 'success'
+    })
+    const accepted = [submission('m1', 'accepted')]
+    const owes = (items: AgentJournalRenderItem[], submissions = accepted) => {
+      const state = projectStructuredAgentSessionStatusState(items, submissions)
+      return [state.summary.status, state.owesWork]
+    }
+
+    expect(owes([asked, running, prompt])).toEqual(['attention', true])
+    expect(owes([asked, settled, prompt])).toEqual(['attention', false])
+    expect(owes([asked, settled, prompt], [...accepted, submission('m2', 'pending')])).toEqual([
+      'attention',
+      true
+    ])
+    expect(owes([asked, running])).toEqual(['working', true])
+    expect(owes([asked, settled])).toEqual(['idle', false])
+  })
+
   it('carries the running tool and the newest assistant prose the sidebar row shows', () => {
     const ask = item('ask', 1, {
       kind: 'message',
@@ -394,15 +457,6 @@ describe('structured agent session status projection', () => {
     expect(parsePaneKey(paneKey)).toMatchObject({ tabId: 'structured-agent-session-1' })
   })
 
-  it('requires a persisted provider conversation turn before TUI resume', () => {
-    const status = item('status', 1, { kind: 'status', text: 'Connected' })
-    const user = item('user', 2, { kind: 'message', role: 'user', blocks: [] })
-
-    expect(hasPersistedStructuredAgentSessionTurn([])).toBe(false)
-    expect(hasPersistedStructuredAgentSessionTurn([status])).toBe(false)
-    expect(hasPersistedStructuredAgentSessionTurn([status, user])).toBe(true)
-  })
-
   it('preserves provider-frame detail on the backward-compatible status line', () => {
     const projected = projectStructuredItemToNativeChat(
       item('frame', 1, {
@@ -611,6 +665,18 @@ describe("producer linkage — a subagent's output never speaks for the parent",
     expect(prose).toContain('delegating')
   })
 
+  it("keeps the child's output as the child's: the transcript message names its producer", () => {
+    // Rendering the child's rows is not enough; unless the message still says who
+    // wrote it, the transcript can only present it as the parent speaking.
+    const messages = projectStructuredItemsToNativeChat(items)
+    const byId = new Map(messages.map((message) => [message.id, message]))
+    expect(byId.get('child-prose')).toMatchObject({ agentId: 'task-1', producerKind: 'agent' })
+    expect(byId.get('child-grep')).toMatchObject({ agentId: 'task-1' })
+    // The session's own rows name no producer: absence is the claim that they are its own.
+    expect(byId.get('root-prose')).not.toHaveProperty('agentId')
+    expect(byId.get('root-task')).not.toHaveProperty('agentId')
+  })
+
   it("falls back to nothing rather than a child's line when the parent said nothing", () => {
     const summary = projectStructuredAgentSessionStatusSummary([
       userAsk,
diff --git a/src/shared/structured-agent-session-projection.ts b/src/shared/structured-agent-session-projection.ts
index 6e61603c7582..f35af81b9325 100644
--- a/src/shared/structured-agent-session-projection.ts
+++ b/src/shared/structured-agent-session-projection.ts
@@ -10,18 +10,20 @@ import {
   type AgentJournalSubmission,
   type AgentJournalTurnOutcome
 } from './agent-session-journal-types'
-import { isRootAgentJournalItem } from './agent-session-journal-producer'
-import { readAgentJournalTurnOutcome } from './agent-session-turn-record'
+import { agentJournalLinkageFields, isRootAgentJournalItem } from './agent-session-journal-producer'
+import { structuredAgentSessionStatusBlock } from './structured-agent-session-status-block'
+import { agentJournalItemRowOrigin } from './agent-session-journal-position'
 import {
   AGENT_STATUS_TOOL_INPUT_MAX_LENGTH,
   AGENT_STATUS_TOOL_NAME_MAX_LENGTH
 } from './agent-status-types'
 import { describeToolInput } from './native-chat-tool-summary'
+import { statusStructuredAgentSessionToolCall } from './structured-agent-session-live-turn'
 import {
-  activeStructuredAgentSessionTurnId,
-  newestStructuredAgentSessionTurn,
-  statusStructuredAgentSessionToolCall
-} from './structured-agent-session-live-turn'
+  hasStructuredAgentSessionRequest,
+  latestStructuredAgentSessionRequest,
+  type StructuredAgentSessionLatestRequest
+} from './structured-agent-session-latest-request'
 import {
   isStructuredAgentSessionToolAction,
   structuredAgentSessionToolCallBlock
@@ -30,13 +32,15 @@ import {
 import type { NativeChatBlock, NativeChatMessage } from './native-chat-types'
 import { sha256 } from './sha256'
 import { structuredAgentSessionStatusStartedAt } from './structured-agent-session-status-started-at'
-import { isUnansweredStructuredAgentSessionDispatch } from './structured-agent-session-unanswered-dispatch'
+import { owesStructuredAgentSessionWork } from './structured-agent-session-owed-work'
 
-// Re-exported so the live-turn readers' existing consumers keep one import site.
+// Re-exported so the live-turn readers' and the unanswered-send rule's existing consumers keep one
+// import site.
 export {
   activeStructuredAgentSessionTurnId,
   newestStructuredAgentSessionTurn
 } from './structured-agent-session-live-turn'
+export { hasUnansweredStructuredAgentSessionDispatch } from './structured-agent-session-unanswered-dispatch'
 
 function boundedText(payload: { head: string; truncated: boolean; byteLength: number }): string {
   return payload.truncated ? `${payload.head}\n… (${payload.byteLength} bytes)` : payload.head
@@ -119,18 +123,7 @@ function itemBlocks(item: AgentJournalRenderItem): {
   if (body.kind !== 'status' || body.turnLifecycle) {
     return null
   }
-  return {
-    role: 'system',
-    blocks: [
-      {
-        type: 'text',
-        text: body.text,
-        ...(body.presentation !== undefined ? { presentation: body.presentation } : {}),
-        ...(body.tone !== undefined ? { tone: body.tone } : {}),
-        ...(body.providerFrame ? { providerFrame: body.providerFrame } : {})
-      }
-    ]
-  }
+  return { role: 'system', blocks: [structuredAgentSessionStatusBlock(body)] }
 }
 
 function isAgentJournalMessageSendMode(value: string): value is AgentJournalMessageSendMode {
@@ -140,8 +133,8 @@ function isAgentJournalMessageSendMode(value: string): value is AgentJournalMess
 const projectedItems = new WeakMap<AgentJournalRenderItem, NativeChatMessage | null>()
 
 /** Deliberately NOT scoped by producer: the transcript shows every agent's
- *  output. The line this module draws is that the transcript renders every item,
- *  while every "what is this agent doing right now" scan renders only the
+ *  output, and each message keeps its row's linkage so the transcript can say
+ *  whose it is. Every "what is this agent doing right now" scan renders only the
  *  session's own agent's. */
 export function projectStructuredItemsToNativeChat(
   items: readonly AgentJournalRenderItem[]
@@ -168,11 +161,10 @@ export function projectStructuredItemToNativeChat(
   const sentAs = item.body.kind === 'message' ? item.body.sentAs : undefined
   const message: NativeChatMessage | null = projected
     ? {
-        id: item.itemId,
+        ...agentJournalItemRowOrigin(item),
+        ...agentJournalLinkageFields(item),
         role: projected.role,
         blocks: projected.blocks,
-        timestamp: item.observedAt,
-        source: 'transcript',
         // A send mode this build cannot name renders as an ordinary message.
         ...(sentAs !== undefined && isAgentJournalMessageSendMode(sentAs) ? { sentAs } : {})
       }
@@ -181,39 +173,6 @@ export function projectStructuredItemToNativeChat(
   return message
 }
 
-/** Deliberately NOT scoped by producer: this is an existence test ("is this
- *  session listable at all"), not an attribution one. A session whose only
- *  content came from a subagent still has content. */
-export function hasPersistedStructuredAgentSessionTurn(
-  items: readonly AgentJournalRenderItem[]
-): boolean {
-  return items.some(
-    (item) =>
-      item.body.kind === 'message' && (item.body.role === 'user' || item.body.role === 'assistant')
-  )
-}
-
-/**
- * A send the host has journaled that the provider has neither opened a turn for nor refused.
- *
- * Codex declares `turn/started` within ~150ms, but Claude's running row can only be written once
- * the SDK echoes the user message back — a 3.4s median and 18s at p90 on real journals. Waiting
- * on that echo to call a session working leaves the whole gap reading idle in the chat and in
- * every session list, so the send itself is the evidence.
- *
- * A live `unknown` still counts because an ambiguous adapter reply does not prove the provider
- * stopped. A recovered `unknown` does not — it outlived the host generation that sent it, so
- * there is nothing still running to report.
- */
-export function hasUnansweredStructuredAgentSessionDispatch(
-  submissions: readonly AgentJournalSubmission[],
-  currentFence?: number | null
-): boolean {
-  return submissions.some((submission) =>
-    isUnansweredStructuredAgentSessionDispatch(submission, currentFence)
-  )
-}
-
 export type StructuredAgentSessionProjectedStatus = 'working' | 'attention' | 'idle'
 
 export function structuredAgentSessionTabId(sessionId: string): string {
@@ -234,10 +193,7 @@ export function projectStructuredAgentSessionStatus(
   ) {
     return 'attention'
   }
-  return activeStructuredAgentSessionTurnId(items) ||
-    hasUnansweredStructuredAgentSessionDispatch(submissions, currentFence)
-    ? 'working'
-    : 'idle'
+  return owesStructuredAgentSessionWork(items, submissions, currentFence) ? 'working' : 'idle'
 }
 
 function messageProse(blocks: readonly NativeChatBlock[]): string {
@@ -307,7 +263,8 @@ export type StructuredAgentSessionStatusProjection = {
   toolName?: string
   toolInput?: string
   lastAssistantMessage?: string
-  /** The newest settled turn's provider verdict; present only while `status` is idle. */
+  /** The latest request's verdict: its turn's, or `failure` for a send the agent or its start
+   *  refused. Present only while `status` is idle. */
   turnOutcome?: AgentJournalTurnOutcome
   statusStartedAt?: number
 }
@@ -323,13 +280,23 @@ export function projectStructuredAgentSessionStatusSummary(
   submissions: readonly AgentJournalSubmission[] = [],
   currentFence?: number | null
 ): StructuredAgentSessionStatusProjection {
-  // A first send has no journalled message until the provider replays it, so the pending
-  // dispatch is also what makes a brand-new session listable at all.
-  if (
-    !hasPersistedStructuredAgentSessionTurn(items) &&
-    !hasUnansweredStructuredAgentSessionDispatch(submissions, currentFence)
-  ) {
-    return { status: null, latestPrompt: '' }
+  return projectStructuredAgentSessionStatusState(items, submissions, currentFence).summary
+}
+
+/** The summary plus the latest request it was read from, whatever the status, so the host's
+ *  completion feed follows the same request the row reports without scanning again. */
+export function projectStructuredAgentSessionStatusState(
+  items: readonly AgentJournalRenderItem[],
+  submissions: readonly AgentJournalSubmission[] = [],
+  currentFence?: number | null
+): {
+  summary: StructuredAgentSessionStatusProjection
+  latestRequest: StructuredAgentSessionLatestRequest | null
+  /** Whether a running turn or an unanswered send is still owed, even beneath a pending prompt. */
+  owesWork: boolean
+} {
+  if (!hasStructuredAgentSessionRequest(items, submissions, currentFence)) {
+    return { summary: { status: null, latestPrompt: '' }, latestRequest: null, owesWork: false }
   }
   const status = projectStructuredAgentSessionStatus(items, submissions, currentFence)
   const statusToolCall = status === 'working' ? statusStructuredAgentSessionToolCall(items) : null
@@ -346,24 +313,29 @@ export function projectStructuredAgentSessionStatusSummary(
     latestStructuredAgentSessionAssistantMessage(items),
     AGENT_STATUS_MAX_FIELD_LENGTH
   )
-  // A verdict is a fact about a finished turn: only an idle session has one to report, and
-  // `readAgentJournalTurnOutcome` already answers null for anything it cannot place.
-  const turnOutcome =
-    status === 'idle' ? readAgentJournalTurnOutcome(newestStructuredAgentSessionTurn(items)) : null
+  const latestRequest = latestStructuredAgentSessionRequest(items, submissions)
+  // A verdict is a fact about a finished request: only an idle session has one to report.
+  const request = status === 'idle' ? latestRequest : null
+  const turnOutcome = request?.outcome
   const statusStartedAt = structuredAgentSessionStatusStartedAt(
     status,
     items,
     submissions,
-    currentFence
+    currentFence,
+    request
   )
   return {
-    status,
-    latestPrompt: normalizePromptField(latestStructuredAgentSessionPrompt(items)),
-    ...(toolName ? { toolName } : {}),
-    ...(toolInput ? { toolInput } : {}),
-    ...(lastAssistantMessage ? { lastAssistantMessage } : {}),
-    ...(turnOutcome ? { turnOutcome } : {}),
-    ...(statusStartedAt !== undefined ? { statusStartedAt } : {})
+    latestRequest,
+    owesWork: status !== 'idle' && owesStructuredAgentSessionWork(items, submissions, currentFence),
+    summary: {
+      status,
+      latestPrompt: normalizePromptField(latestStructuredAgentSessionPrompt(items)),
+      ...(toolName ? { toolName } : {}),
+      ...(toolInput ? { toolInput } : {}),
+      ...(lastAssistantMessage ? { lastAssistantMessage } : {}),
+      ...(turnOutcome ? { turnOutcome } : {}),
+      ...(statusStartedAt !== undefined ? { statusStartedAt } : {})
+    }
   }
 }
 
diff --git a/src/shared/structured-agent-session-read-refusal.ts b/src/shared/structured-agent-session-read-refusal.ts
index 18487f12be38..74279d7811d6 100644
--- a/src/shared/structured-agent-session-read-refusal.ts
+++ b/src/shared/structured-agent-session-read-refusal.ts
@@ -1,11 +1,13 @@
+import type { AgentSessionRefusalReference } from './agent-session-wire-refusals'
+
 /**
  * The one refusal a structured-session READ can raise that is not a failure to read.
  *
- * `agentSession.history` and `agentSession.subscribe` both resolve the session through the host's
- * `requireSession`, which raises this code when the host holds no session object by that id. That
- * is never a transcript Orca could not read — it is a session this host has not attached YET (the
- * surface's hold is what attaches one) or one it has just closed. Both windows end on their own:
- * the first when the hold lands, the second when the chat tab retires.
+ * A current host opens a conversation for any read, so a read meets this code only once quit began.
+ * An older host resolves `agentSession.history` and `agentSession.subscribe` against the sessions it
+ * has attached, and raises it when it holds none by that id. Either way it is never a transcript
+ * Orca could not read: an older host's session is not attached YET (the surface's hold attaches
+ * one) or was just closed, and both windows end on their own.
  *
  * The genuinely latched lease — "Orca cannot prove the previous owner exited" — reaches the client
  * through the ACQUISITION path instead, so narrowing on the code costs a read no real diagnosis.
@@ -43,3 +45,17 @@ export function isUnattachedAgentSessionReadRefusal(error: unknown): boolean {
     message === AGENT_SESSION_UNATTACHED_REFUSAL_CODE
   )
 }
+
+/**
+ * A read refusal no retry reads past: SQLite reported the chat's journal damaged. Decided from the
+ * reason, never the message, which is the bare code for every journal refusal; a journal that
+ * failed to open for any other reason can clear, so its read keeps reconnecting.
+ */
+export function isFinalAgentSessionReadRefusal(
+  refusal: AgentSessionRefusalReference | undefined
+): boolean {
+  return (
+    refusal?.code === 'agent_session_journal_unreadable' &&
+    refusal.details?.reason === 'journalCorrupt'
+  )
+}
diff --git a/src/shared/structured-agent-session-reducer.test.ts b/src/shared/structured-agent-session-reducer.test.ts
index aa90749ffdf5..ca108710bcf8 100644
--- a/src/shared/structured-agent-session-reducer.test.ts
+++ b/src/shared/structured-agent-session-reducer.test.ts
@@ -54,6 +54,37 @@ function hydrationPage(
 }
 
 describe('structured agent session reducer', () => {
+  it("orders one journal write's items by their place in it, whatever order they arrive in", () => {
+    const at = (id: string, sequence: number, sequenceIndex: number): AgentJournalRenderItem => ({
+      ...item(id, sequence),
+      ...(sequenceIndex > 0 ? { sequenceIndex } : {})
+    })
+    const paged = reduceStructuredAgentSession(EMPTY_STRUCTURED_AGENT_SESSION, {
+      type: 'history-page',
+      page: hydrationPage([
+        item('before', 4),
+        at('third', 5, 2),
+        at('first', 5, 0),
+        at('second', 5, 1)
+      ])
+    })
+    expect(paged.items.map(({ itemId }) => itemId)).toEqual(['before', 'first', 'second', 'third'])
+    const live = reduceStructuredAgentSession(paged, {
+      type: 'event',
+      event: {
+        type: 'batch',
+        sessionId: 'session-a',
+        batch: {
+          cursor: { epoch: 'epoch-a', sequence: 6 },
+          items: [at('next-b', 6, 1), at('next-a', 6, 0)],
+          removedItemIds: [],
+          submissions: []
+        }
+      }
+    })
+    expect(live.items.map(({ itemId }) => itemId).slice(-2)).toEqual(['next-a', 'next-b'])
+  })
+
   it('applies an additive targeted-stop capability update without journal churn', () => {
     const backgroundTasks = {
       state: 'monitoring' as const,
@@ -127,6 +158,46 @@ describe('structured agent session reducer', () => {
     ])
   })
 
+  it("keeps a failed read's refusal beside its text until the read recovers", () => {
+    const refusal = {
+      code: 'agent_session_journal_unreadable',
+      details: { reason: 'journalCorrupt' }
+    } as const
+    const failed = reduceStructuredAgentSession(EMPTY_STRUCTURED_AGENT_SESSION, {
+      type: 'error',
+      message: 'agent_session_journal_unreadable',
+      refusal
+    })
+    expect(failed).toMatchObject({ status: 'error', readRefusal: refusal })
+
+    expect(reduceStructuredAgentSession(failed, { type: 'loading' }).readRefusal).toBeUndefined()
+    const live = reduceStructuredAgentSession(
+      reduceStructuredAgentSession(failed, {
+        type: 'history-page',
+        page: hydrationPage([item('a', 1)])
+      }),
+      { type: 'error', message: 'transport died' }
+    )
+    expect(live.readRefusal).toBeUndefined()
+    const recovered = reduceStructuredAgentSession(
+      { ...live, readRefusal: refusal },
+      {
+        type: 'event',
+        event: {
+          type: 'batch',
+          sessionId: 'session-a',
+          batch: {
+            cursor: { epoch: 'epoch-a', sequence: 2 },
+            items: [item('b', 2)],
+            removedItemIds: [],
+            submissions: []
+          }
+        }
+      }
+    )
+    expect(recovered).toMatchObject({ status: 'ready', error: undefined, readRefusal: undefined })
+  })
+
   it('uses the bounded hydration page pagination boundary', () => {
     const restored = reduceStructuredAgentSession(EMPTY_STRUCTURED_AGENT_SESSION, {
       type: 'event',
diff --git a/src/shared/structured-agent-session-reducer.ts b/src/shared/structured-agent-session-reducer.ts
index 2f839f933309..02c554628fb8 100644
--- a/src/shared/structured-agent-session-reducer.ts
+++ b/src/shared/structured-agent-session-reducer.ts
@@ -10,8 +10,10 @@ import type {
   AgentSessionSubscribeEvent,
   AgentSessionTurnActivity
 } from './agent-session-wire'
+import type { AgentSessionRefusalReference } from './agent-session-wire-refusals'
 import { backgroundTaskStatesEqual } from './agent-session-background-task-state-equality'
 import { agentJournalSubmissionKey } from './agent-session-journal-item-key'
+import { compareAgentJournalItems } from './agent-session-journal-position'
 import { readAgentJournalTurn } from './agent-session-turn-record'
 
 /** The last host clock sample: `hostNow - receivedAt` is the client's skew from the host,
@@ -31,7 +33,10 @@ export type StructuredAgentSessionState = {
   retainedItemLimit: number
   hasOlder: boolean
   status: 'idle' | 'loading' | 'ready' | 'error'
+  /** The failed read's own text, for logs; a surface words `readRefusal` instead. */
   error?: string
+  /** The refusal the failed read met, when the host sent one; cleared with `error`. */
+  readRefusal?: AgentSessionRefusalReference
   backgroundTasks?: AgentSessionBackgroundTaskState | null
   commands?: AgentSessionSlashCommand[] | null
   activity?: AgentSessionTurnActivity | null
@@ -44,7 +49,7 @@ export type StructuredAgentSessionState = {
 
 export type StructuredAgentSessionAction =
   | { type: 'loading' }
-  | { type: 'error'; message: string }
+  | { type: 'error'; message: string; refusal?: AgentSessionRefusalReference }
   | { type: 'event'; event: AgentSessionSubscribeEvent }
   | { type: 'history-page'; page: AgentSessionHistoryPage }
   | { type: 'older-page'; requestedCursor: AgentJournalCursor; page: AgentSessionHistoryPage }
@@ -85,7 +90,7 @@ function replacePage(
     epoch: page.epoch,
     cursor: page.liveCursor ?? page.window.nextCursor,
     fence,
-    items: [...page.items].sort((left, right) => left.sequence - right.sequence),
+    items: [...page.items].sort(compareAgentJournalItems),
     submissions: page.submissions,
     retainedItemLimit: Math.max(MAX_RETAINED_ITEMS, page.items.length),
     hasOlder: page.hasOlder,
@@ -114,7 +119,7 @@ function mergeItems(
       byId.set(item.itemId, item)
     }
   }
-  return [...byId.values()].sort((left, right) => left.sequence - right.sequence)
+  return [...byId.values()].sort(compareAgentJournalItems)
 }
 
 /**
@@ -175,10 +180,10 @@ export function reduceStructuredAgentSession(
 ): StructuredAgentSessionState {
   if (action.type === 'loading') {
     // Keep the last transcript visible while a reconnect rehydrates the stream.
-    return { ...state, status: 'loading', error: undefined }
+    return { ...state, status: 'loading', error: undefined, readRefusal: undefined }
   }
   if (action.type === 'error') {
-    return { ...state, status: 'error', error: action.message }
+    return { ...state, status: 'error', error: action.message, readRefusal: action.refusal }
   }
   if (action.type === 'history-page') {
     return {
@@ -271,6 +276,7 @@ export function reduceStructuredAgentSession(
         : mergeSubmissions(state.submissions, event.batch.submissions, items),
     status: 'ready',
     error: undefined,
+    readRefusal: undefined,
     commands: event.commands !== undefined ? event.commands : state.commands,
     ...(backgroundTasks !== undefined ? { backgroundTasks } : {}),
     ...(activity !== undefined ? { activity } : {}),
diff --git a/src/shared/structured-agent-session-send-disposition.test.ts b/src/shared/structured-agent-session-send-disposition.test.ts
index 66a7a9b32fa8..e95a21937d1c 100644
--- a/src/shared/structured-agent-session-send-disposition.test.ts
+++ b/src/shared/structured-agent-session-send-disposition.test.ts
@@ -4,14 +4,19 @@
 // which is the whole reason it was split out.
 
 import { describe, expect, it } from 'vitest'
+import type { AgentSessionFailureFact } from './agent-session-failure'
 import type { AgentJournalSubmission } from './agent-session-journal-types'
 import type { AgentSessionMutationResult, AgentSessionSendResult } from './agent-session-wire'
 import {
-  dispatchWriteFailureReason,
   DISPATCH_REJECTED_CANCELLED,
   DISPATCH_REJECTED_QUEUE_FULL
 } from './structured-agent-session-dispatch-rejection'
-import { disposeStructuredAgentSessionSendResult } from './structured-agent-session-send-disposition'
+import { agentSessionWriteNoticeEnglish } from './agent-session-refusal-notice'
+import {
+  disposeStructuredAgentSessionSendFailure,
+  disposeStructuredAgentSessionSendResult,
+  structuredAgentSessionAttemptFailureParts
+} from './structured-agent-session-send-disposition'
 import {
   createStructuredAgentSessionOutboxEntry,
   reconcileStructuredAgentSessionOutbox,
@@ -26,7 +31,10 @@ const entry: StructuredAgentSessionOutboxEntry = createStructuredAgentSessionOut
   queuedAt: 1
 })
 
-function rejectedWith(reason: string | null): AgentSessionMutationResult<AgentSessionSendResult> {
+function rejectedWith(
+  reason: string | null,
+  extra: { rejection?: AgentSessionFailureFact; replayed?: boolean } = {}
+): AgentSessionMutationResult<AgentSessionSendResult> {
   const submission: AgentJournalSubmission = {
     clientMessageId: 'client-1',
     fence: 1,
@@ -35,25 +43,32 @@ function rejectedWith(reason: string | null): AgentSessionMutationResult<AgentSe
     providerItemId: null,
     reason,
     submittedAt: 10,
-    resolvedAt: 10
+    resolvedAt: 10,
+    ...(extra.rejection ? { rejection: extra.rejection } : {})
   }
   return {
     ok: true,
-    replayed: false,
+    replayed: extra.replayed ?? false,
     fence: 1,
     cursor: { epoch: 'epoch-1', sequence: 10 },
     value: { clientMessageId: 'client-1', submission }
-  } as AgentSessionMutationResult<AgentSessionSendResult>
+  }
 }
 
-function notice(reason: string | null): string | null {
-  return disposeStructuredAgentSessionSendResult({
+function notice(reason: string | null, rejection?: AgentSessionFailureFact): string | undefined {
+  const disposition = disposeStructuredAgentSessionSendResult({
     entries: [entry],
     entry,
     blockedClientMessageId: null,
-    result: rejectedWith(reason),
+    result: rejectedWith(reason, rejection ? { rejection } : {}),
     createOperationId: () => 'unused'
-  }).error
+  })
+  // The reason travels with the message it explains, never as a separate error.
+  expect(disposition.error).toBeNull()
+  const failure = disposition.entries[0]?.lastFailure
+  return (
+    failure && agentSessionWriteNoticeEnglish(structuredAgentSessionAttemptFailureParts(failure))
+  )
 }
 
 describe('what a rejection shows the user', () => {
@@ -67,14 +82,11 @@ describe('what a rejection shows the user', () => {
   })
 
   it('never puts the transport marker on screen', () => {
-    const shown = notice(dispatchWriteFailureReason(new Error('broken pipe')))
+    const shown = notice('provider_write_failed: broken pipe')
     // `provider_write_failed: broken pipe` names nothing a person can act on.
     expect(shown).not.toContain('provider_write_failed')
     expect(shown).not.toContain('broken pipe')
-    // And it says the message is safe to send again, which it is: the frame never left.
-    expect(shown).toBe(
-      "Couldn't reach the agent. Your message was not sent — Retry to send it again."
-    )
+    expect(shown).toBe("Orca couldn't reach the agent. Your message was not sent.")
   })
 
   it('shows a content rejection in the provider own words', () => {
@@ -84,15 +96,55 @@ describe('what a rejection shows the user', () => {
     )
   })
 
-  it('names the cause of a start that died before it could take the message', () => {
-    // The host words this reason for the user: the child's own diagnostic, nothing internal.
-    const reason =
-      'The provider stopped before it finished starting: claude stream-json exited (code 1): claude: not signed in.'
+  it('shows the sentence a host wrote for the person reading it', () => {
+    const reason = 'The provider stopped before it finished starting.'
     expect(notice(reason)).toBe(reason)
   })
 
+  it('never puts the legacy not_delivered marker on screen', () => {
+    // Released clients printed it as it was; it is a marker, not a sentence.
+    expect(notice('not_delivered')).toBe('Your message was not sent.')
+  })
+
+  it.each([
+    ['the legacy marker alone', undefined],
+    ['the marker and its typed fact', { kind: 'cancelled' as const }]
+  ])('fails nothing for a Stop-withdrawn send, first reply or replay: %s', (_label, rejection) => {
+    for (const replayed of [false, true]) {
+      const disposition = disposeStructuredAgentSessionSendResult({
+        entries: [entry],
+        entry,
+        blockedClientMessageId: null,
+        result: rejectedWith(DISPATCH_REJECTED_CANCELLED, { rejection, replayed }),
+        createOperationId: () => 'unused'
+      })
+      expect(disposition).toEqual({
+        entries: [],
+        error: null,
+        blockedClientMessageId: null
+      })
+    }
+  })
+
+  it('reads a withdrawal off the typed fact whatever the reason says', () => {
+    const result = rejectedWith('Withdrawn.', { rejection: { kind: 'cancelled' } })
+    if (!result.ok) {
+      throw new Error('expected rejected submission fixture')
+    }
+    expect(reconcileStructuredAgentSessionOutbox([entry], [result.value.submission])).toEqual([])
+    expect(
+      disposeStructuredAgentSessionSendResult({
+        entries: [entry],
+        entry,
+        blockedClientMessageId: null,
+        result,
+        createOperationId: () => 'unused'
+      }).error
+    ).toBeNull()
+  })
+
   it('claims no cause when the rejection names none', () => {
-    expect(notice(null)).toBe('Message was not sent.')
+    expect(notice(null)).toBe('Your message was not sent.')
   })
 
   it('never puts a local-capacity marker on screen either', () => {
@@ -100,7 +152,184 @@ describe('what a rejection shows the user', () => {
     // ourselves. It has no user-facing meaning, so it gets copy rather than the token.
     const shown = notice(DISPATCH_REJECTED_QUEUE_FULL)
     expect(shown).not.toContain('queue is full')
-    expect(shown).toBe('Orca could not send your message — Retry to send it again.')
+    expect(shown).toBe('Your message was not sent.')
+  })
+})
+
+// A row that carries the host's fact is worded from it; the reason is not read.
+describe('what a rejection with a typed fact shows the user', () => {
+  it('says Orca could not hand the message over, whatever the reason holds', () => {
+    expect(notice('provider_write_failed', { kind: 'writeFailed' })).toBe(
+      "Orca couldn't reach the agent. Your message was not sent."
+    )
+    expect(notice('Something unrelated.', { kind: 'writeFailed' })).toBe(
+      "Orca couldn't reach the agent. Your message was not sent."
+    )
+  })
+
+  it("rebuilds the fact's sentence where a marker stands in for it", () => {
+    expect(notice(DISPATCH_REJECTED_QUEUE_FULL, { kind: 'queueFull' })).toBe(
+      'Too many messages were waiting for the agent, so this one was not sent.'
+    )
+  })
+
+  // The surface names the agent; the host's own sentence is never compared or shown.
+  it('words the fact itself, never the sentence the host wrote beside it', () => {
+    expect(
+      notice('Claude never finished starting, so Orca stopped it.', { kind: 'hostStopped' })
+    ).toBe('The agent never finished starting, so Orca stopped it.')
+  })
+
+  // The message keeps no fact it cannot place, so the host's sentence stands, as on an older host.
+  it("shows a newer host's sentence when its fact cannot be placed", () => {
+    expect(notice('A sentence a newer host wrote.', JSON.parse('{"kind":"fromTheFuture"}'))).toBe(
+      'A sentence a newer host wrote.'
+    )
+  })
+
+  // The message's copy drops the detail and the refusal these kinds are worded from, so the
+  // sentence the host wrote for the person stands in for them; with none, the table's words.
+  it("shows the host's sentence for a kind whose words its copy cannot rebuild", () => {
+    expect(
+      notice('The provider did not accept this message: Image type .bmp.', {
+        kind: 'providerRejected',
+        detail: { text: 'Image type .bmp', audience: 'person' }
+      })
+    ).toBe('The provider did not accept this message: Image type .bmp.')
+    expect(
+      notice("Claude couldn't start. Start a new chat to continue.", {
+        kind: 'startFailed',
+        refusal: { code: 'agent_session_identity_required' }
+      })
+    ).toBe("Claude couldn't start. Start a new chat to continue.")
+    expect(notice(null, { kind: 'providerRejected' })).toBe(
+      'The provider did not accept this message.'
+    )
+  })
+
+  it('says only that the message was not sent for a fact no message can carry', () => {
+    expect(notice('Compaction failed.', { kind: 'compactionFailed' })).toBe(
+      'Your message was not sent.'
+    )
+  })
+})
+
+describe('what a refusal shows the user', () => {
+  it('keeps the refusal as a fact on the message, without the host diagnostic', () => {
+    const disposition = disposeStructuredAgentSessionSendResult({
+      entries: [entry],
+      entry,
+      blockedClientMessageId: null,
+      result: {
+        ok: false,
+        refusal: {
+          code: 'agent_session_checkpoint_stale',
+          message: 'Expected runtime fence 1; the session is at 3.'
+        }
+      },
+      createOperationId: () => 'unused'
+    })
+
+    expect(disposition.error).toBeNull()
+    expect(disposition.blockedClientMessageId).toBe(entry.clientMessageId)
+    expect(disposition.entries).toMatchObject([
+      {
+        clientMessageId: entry.clientMessageId,
+        state: 'queued',
+        lastFailure: { kind: 'refused', code: 'agent_session_checkpoint_stale' }
+      }
+    ])
+    expect(
+      agentSessionWriteNoticeEnglish(
+        structuredAgentSessionAttemptFailureParts(disposition.entries[0]!.lastFailure!)
+      )
+    ).toBe('Your message was not sent.')
+  })
+
+  it("keeps the reason the host named, and says it on the message's Retry row", () => {
+    const disposition = disposeStructuredAgentSessionSendResult({
+      entries: [entry],
+      entry,
+      blockedClientMessageId: null,
+      result: {
+        ok: false,
+        refusal: {
+          code: 'agent_session_conflict',
+          message: 'The chat is still starting.',
+          details: { reason: 'chatStarting' }
+        }
+      },
+      createOperationId: () => 'unused'
+    })
+
+    const lastFailure = disposition.entries[0]?.lastFailure
+    expect(lastFailure).toEqual({
+      kind: 'refused',
+      code: 'agent_session_conflict',
+      details: { reason: 'chatStarting' }
+    })
+    expect(
+      agentSessionWriteNoticeEnglish(structuredAgentSessionAttemptFailureParts(lastFailure!))
+    ).toBe(
+      'The agent is still starting. Your message was not sent. Wait for the agent to finish starting.'
+    )
+  })
+
+  it("keeps a rejected message's typed fact without the provider's detail", () => {
+    const disposition = disposeStructuredAgentSessionSendResult({
+      entries: [entry],
+      entry,
+      blockedClientMessageId: null,
+      result: rejectedWith('An image on this message is empty, so the message was not sent.', {
+        rejection: {
+          kind: 'attachmentInvalid',
+          attachment: { reason: 'empty' },
+          detail: { text: 'image block 2: zero bytes', audience: 'log' }
+        }
+      }),
+      createOperationId: () => 'unused'
+    })
+
+    expect(disposition.entries[0]?.lastFailure).toEqual({
+      kind: 'rejected',
+      reason: 'An image on this message is empty, so the message was not sent.',
+      rejection: { kind: 'attachmentInvalid', attachment: { reason: 'empty' } }
+    })
+  })
+
+  it('keeps a failed request as a fact, not a transport error string', () => {
+    const disposition = disposeStructuredAgentSessionSendFailure({
+      entries: [entry],
+      entry,
+      blockedClientMessageId: null,
+      cause: new Error('socket hang up: ECONNRESET 10.0.0.2:443'),
+      isDeliveryUnknown: () => false
+    })
+
+    expect(disposition.error).toBeNull()
+    expect(disposition.entries[0]?.lastFailure).toEqual({ kind: 'failed' })
+  })
+
+  it('drops the reason once the same message is accepted', () => {
+    const refused: StructuredAgentSessionOutboxEntry = {
+      ...entry,
+      lastFailure: { kind: 'refused', code: 'agent_session_checkpoint_stale' }
+    }
+    const result = rejectedWith(null)
+    if (!result.ok) {
+      throw new Error('expected a send result')
+    }
+    result.value.submission = { ...result.value.submission, dispatchState: 'accepted' }
+    const disposition = disposeStructuredAgentSessionSendResult({
+      entries: [refused],
+      entry: refused,
+      blockedClientMessageId: null,
+      result,
+      createOperationId: () => 'unused'
+    })
+
+    expect(disposition.entries).toEqual([])
+    expect(disposition.error).toBeNull()
   })
 })
 
diff --git a/src/shared/structured-agent-session-send-disposition.ts b/src/shared/structured-agent-session-send-disposition.ts
index 16765a024714..11e2b45fc0be 100644
--- a/src/shared/structured-agent-session-send-disposition.ts
+++ b/src/shared/structured-agent-session-send-disposition.ts
@@ -7,25 +7,36 @@
 // the refs, the React state and the storage write, and nothing else decides an
 // entry's state.
 
+import type { AgentJournalSubmission } from './agent-session-journal-types'
 import type { AgentSessionMutationResult, AgentSessionSendResult } from './agent-session-wire'
 import {
-  dispatchRejectionReasonIsInternal,
-  dispatchRejectionWasTransportWriteFailure
-} from './structured-agent-session-dispatch-rejection'
+  agentSessionWriteNoticeEnglish,
+  agentSessionWriteNoticeParts,
+  agentSessionWriteNotDoneParts
+} from './agent-session-refusal-notice'
+import type { AgentSessionWriteNoticePart } from './agent-session-write-notice-copy'
+import { agentSessionRefusalFailure } from './agent-session-write-failure'
+import type { AgentSessionFailureFact } from './agent-session-failure'
+import {
+  agentSessionFailureSentence,
+  type AgentSessionFailureWordsContext
+} from './agent-session-failure-words'
+import { classifyDispatchRejection } from './structured-agent-session-dispatch-rejection'
 import {
   classifyStructuredAgentSessionSendFailure,
   requeueStructuredAgentSessionSendRefusal,
+  structuredAgentSessionRejectedFailure,
+  type StructuredAgentSessionAttemptFailure,
   type StructuredAgentSessionOutboxEntry
 } from './structured-agent-session-outbox'
 
 export type StructuredAgentSessionSendDisposition = {
   entries: StructuredAgentSessionOutboxEntry[]
+  /** Only for an outcome with no entry left to carry it; a kept entry holds its own failure. */
   error: string | null
   /** The entry the queue is stuck on, or null when nothing blocks it. Always the
    *  next value, never "unchanged": the caller assigns it verbatim. */
   blockedClientMessageId: string | null
-  /** A rejected result arrived before the journal snapshot; Retry must rotate this id. */
-  retryWithFreshClientMessageId: string | null
 }
 
 type SendDispositionInput = {
@@ -36,13 +47,24 @@ type SendDispositionInput = {
 
 function replaceEntryState(
   input: SendDispositionInput,
-  state: StructuredAgentSessionOutboxEntry['state']
+  state: StructuredAgentSessionOutboxEntry['state'],
+  lastFailure?: StructuredAgentSessionAttemptFailure
 ): StructuredAgentSessionOutboxEntry[] {
   return input.entries.map((candidate) =>
-    candidate.clientMessageId === input.entry.clientMessageId ? { ...candidate, state } : candidate
+    candidate.clientMessageId === input.entry.clientMessageId
+      ? withLastFailure({ ...candidate, state }, lastFailure)
+      : candidate
   )
 }
 
+function withLastFailure(
+  entry: StructuredAgentSessionOutboxEntry,
+  lastFailure: StructuredAgentSessionAttemptFailure | undefined
+): StructuredAgentSessionOutboxEntry {
+  const { lastFailure: _previous, ...rest } = entry
+  return lastFailure === undefined ? rest : { ...rest, lastFailure }
+}
+
 function dropEntry(input: SendDispositionInput): StructuredAgentSessionOutboxEntry[] {
   return input.entries.filter(
     (candidate) => candidate.clientMessageId !== input.entry.clientMessageId
@@ -72,6 +94,18 @@ function refusedRedelivery(
   )
 }
 
+/** Whether the journal already answers a send still in flight, so its own reply adds nothing: the
+ *  host holds the message, or rejected it — a later `pending` reply must not undo that. */
+export function journalAnswersInFlightSend(
+  submissions: readonly AgentJournalSubmission[],
+  clientMessageId: string | null
+): boolean {
+  return submissions.some(
+    (submission) =>
+      submission.clientMessageId === clientMessageId && submission.dispatchState !== 'unknown'
+  )
+}
+
 /**
  * What to put on screen for a rejection.
  *
@@ -80,27 +114,81 @@ function refusedRedelivery(
  * a generic string would throw it away. A transport rejection's reason is an
  * internal marker; printing it put `provider_write_failed: broken pipe` in front of
  * users, which names nothing they can act on. That case gets copy that says what
- * happened and that the message is safe to send again — which it is, because the
- * frame provably never left, so a resend cannot duplicate.
+ * happened, and on the phone that the message can be sent again — which it can,
+ * because the frame provably never left, so a resend cannot duplicate.
  *
- * The null default claims no cause, because at that point we know none: all it
- * asserts is the one thing every rejection shares.
+ * The null default claims no cause and no next step, because at that point we know
+ * neither: all it asserts is the one thing every rejection shares.
  *
  * Exported because a client without an outbox needs the same copy: the rule about
  * which reasons a person may read is a property of the reason, not of the queue.
  */
-export function structuredAgentSessionRejectionNotice(reason: string | null): string {
+export function structuredAgentSessionRejectionNotice(
+  reason: string | null,
+  write: 'send' | 'composer-send'
+): string {
+  return agentSessionWriteNoticeEnglish(structuredAgentSessionRejectionParts(reason, write))
+}
+
+export function structuredAgentSessionRejectionParts(
+  reason: string | null,
+  write: 'send' | 'composer-send',
+  /** The host's typed fact, which decides when the row carried one. */
+  fact?: AgentSessionFailureFact,
+  context: AgentSessionFailureWordsContext = {}
+): AgentSessionWriteNoticePart[] {
+  if (fact) {
+    return rejectionFactParts(write, fact, context)
+  }
   if (reason === null) {
-    return 'Message was not sent.'
+    return ['notDoneSend']
+  }
+  const rejection = classifyDispatchRejection({ reason })
+  if (rejection.kind === 'writeFailed') {
+    return ['unreachable', ...agentSessionWriteNotDoneParts(write)]
+  }
+  // A legacy marker is an internal cause with no user-facing meaning; any other reason is a
+  // sentence written to be read — the provider's, or the host's own.
+  return rejection.kind ? agentSessionWriteNotDoneParts(write) : [{ text: reason }]
+}
+
+function rejectionFactParts(
+  write: 'send' | 'composer-send',
+  fact: AgentSessionFailureFact,
+  context: AgentSessionFailureWordsContext
+): AgentSessionWriteNoticePart[] {
+  const { kind } = classifyDispatchRejection({ reason: null, rejection: fact })
+  if (kind === 'writeFailed') {
+    return ['unreachable', ...agentSessionWriteNotDoneParts(write)]
   }
-  if (dispatchRejectionWasTransportWriteFailure(reason)) {
-    return "Couldn't reach the agent. Your message was not sent — Retry to send it again."
+  // A fact this build cannot place proves only that the message did not happen.
+  return kind
+    ? [{ text: agentSessionFailureSentence({ ...fact, kind }, 'rejection', context) }]
+    : agentSessionWriteNotDoneParts(write)
+}
+
+/** Kinds whose words need what the message's copy drops: the provider's detail, or the refusal. */
+const WORDED_FROM_WHOLE_FACT: ReadonlySet<AgentSessionFailureFact['kind']> = new Set<
+  AgentSessionFailureFact['kind']
+>(['providerRejected', 'startFailed', 'restartFailed'])
+
+/** What the Retry row says about why its message did not go through. */
+export function structuredAgentSessionAttemptFailureParts(
+  failure: StructuredAgentSessionAttemptFailure,
+  context: AgentSessionFailureWordsContext = {},
+  /** The journal's whole fact for a recorded rejection, when its submission is loaded: the
+   *  message's own copy keeps only its kind and attachment. */
+  recorded?: AgentSessionFailureFact
+): AgentSessionWriteNoticePart[] {
+  if (failure.kind !== 'rejected') {
+    return agentSessionWriteNoticeParts(failure, 'send', context)
   }
-  // Any other reason we minted is an internal cause with no user-facing meaning;
-  // only a provider's own explanation is worth reading verbatim.
-  return dispatchRejectionReasonIsInternal(reason)
-    ? 'Orca could not send your message — Retry to send it again.'
-    : reason
+  const fact = recorded ?? failure.rejection
+  // Without the journal's fact, the host's sentence still holds what the copy dropped.
+  if (!recorded && fact && WORDED_FROM_WHOLE_FACT.has(fact.kind) && failure.reason !== null) {
+    return [{ text: failure.reason }]
+  }
+  return structuredAgentSessionRejectionParts(failure.reason, 'send', fact, context)
 }
 
 export function disposeStructuredAgentSessionSendResult(
@@ -114,23 +202,31 @@ export function disposeStructuredAgentSessionSendResult(
     const refusedIndex = input.entries.findIndex(
       (candidate) => candidate.clientMessageId === input.entry.clientMessageId
     )
+    const refusal = agentSessionRefusalFailure(result.refusal)
     const entries = input.entries.map((candidate) =>
       candidate.clientMessageId === input.entry.clientMessageId
-        ? requeueStructuredAgentSessionSendRefusal(
-            candidate,
-            result.refusal.code,
-            input.createOperationId,
-            input.entry.lastAttemptAt !== null
+        ? withLastFailure(
+            requeueStructuredAgentSessionSendRefusal(
+              candidate,
+              refusal,
+              input.createOperationId,
+              input.entry.lastAttemptAt !== null
+            ),
+            refusal
           )
         : candidate
     )
+    const refused = entries[refusedIndex]
     return {
       entries,
-      error: result.refusal.message,
+      error: null,
       // Read back by index rather than from the input: a refusal can rotate the id, and the
       // refused entry is not always the head now that an admitted one no longer holds the queue.
-      blockedClientMessageId: entries[refusedIndex]?.clientMessageId ?? null,
-      retryWithFreshClientMessageId: null
+      // A rejected one holds nothing: it can no longer land, and it keeps its own Retry.
+      blockedClientMessageId:
+        !refused || refused.state === 'rejected'
+          ? input.blockedClientMessageId
+          : refused.clientMessageId
     }
   }
   const submission = result.value.submission
@@ -138,24 +234,37 @@ export function disposeStructuredAgentSessionSendResult(
     return {
       entries: dropEntry(input),
       error: 'Message delivery is unconfirmed and Orca will not send it again',
-      blockedClientMessageId: input.blockedClientMessageId,
-      retryWithFreshClientMessageId: null
+      blockedClientMessageId: input.blockedClientMessageId
     }
   }
   if (submission.dispatchState === 'accepted') {
     return {
       entries: dropEntry(input),
       error: null,
-      blockedClientMessageId: input.blockedClientMessageId,
-      retryWithFreshClientMessageId: null
+      blockedClientMessageId: input.blockedClientMessageId
+    }
+  }
+  // A Stop's withdrawal failed nothing, first reply or replay: the entry leaves as the reconcile
+  // drops it, with no notice.
+  if (
+    submission.dispatchState === 'rejected' &&
+    classifyDispatchRejection(submission).category === 'withdrawn'
+  ) {
+    return {
+      entries: dropEntry(input),
+      error: null,
+      blockedClientMessageId: input.blockedClientMessageId
     }
   }
   if (submission.dispatchState === 'rejected') {
     return {
-      entries: replaceEntryState(input, 'queued'),
-      error: structuredAgentSessionRejectionNotice(submission.reason),
-      blockedClientMessageId: input.entry.clientMessageId,
-      retryWithFreshClientMessageId: input.entry.clientMessageId
+      entries: replaceEntryState(
+        input,
+        'rejected',
+        structuredAgentSessionRejectedFailure(submission)
+      ),
+      error: null,
+      blockedClientMessageId: input.blockedClientMessageId
     }
   }
   if (submission.dispatchState === 'unknown' && submission.recovered) {
@@ -166,8 +275,7 @@ export function disposeStructuredAgentSessionSendResult(
           : candidate
       ),
       error: null,
-      blockedClientMessageId: input.blockedClientMessageId,
-      retryWithFreshClientMessageId: null
+      blockedClientMessageId: input.blockedClientMessageId
     }
   }
   // `pending` is the host saying the message was written and is awaiting the
@@ -182,8 +290,7 @@ export function disposeStructuredAgentSessionSendResult(
       submission.dispatchState === 'unknown' ? 'unconfirmed' : 'dispatching'
     ),
     error: null,
-    blockedClientMessageId: input.blockedClientMessageId,
-    retryWithFreshClientMessageId: null
+    blockedClientMessageId: input.blockedClientMessageId
   }
 }
 
@@ -196,11 +303,13 @@ export function disposeStructuredAgentSessionSendFailure(
   const failure = classifyStructuredAgentSessionSendFailure(input.cause, input.isDeliveryUnknown)
   const deliveryUnknown = failure === 'delivery-unknown'
   return {
-    entries: replaceEntryState(input, deliveryUnknown ? 'unconfirmed' : 'queued'),
-    error: deliveryUnknown ? 'Message delivery is unconfirmed' : String(input.cause),
+    // An unconfirmed entry's Retry row already says delivery is unconfirmed.
+    entries: deliveryUnknown
+      ? replaceEntryState(input, 'unconfirmed')
+      : replaceEntryState(input, 'queued', { kind: 'failed' }),
+    error: null,
     blockedClientMessageId: deliveryUnknown
       ? input.blockedClientMessageId
-      : input.entry.clientMessageId,
-    retryWithFreshClientMessageId: null
+      : input.entry.clientMessageId
   }
 }
diff --git a/src/shared/structured-agent-session-start-failure-row-key.ts b/src/shared/structured-agent-session-start-failure-row-key.ts
new file mode 100644
index 000000000000..6dc4a4817b14
--- /dev/null
+++ b/src/shared/structured-agent-session-start-failure-row-key.ts
@@ -0,0 +1,17 @@
+// A failed start's one row is keyed by the start, so a reader finds it by identity, not by its words.
+
+import { parseAgentJournalItemKey } from './agent-session-journal-item-key'
+import type { AgentJournalItemIdentity } from './agent-session-journal-types'
+
+const START_FAILURE_ROW = 'start-failure:'
+
+export function structuredAgentSessionStartFailureRowIdentity(
+  startKey: string
+): Extract<AgentJournalItemIdentity, { provider: 'orca' }> {
+  return { provider: 'orca', clientMessageId: `${START_FAILURE_ROW}${startKey}` }
+}
+
+export function isStructuredAgentSessionStartFailureRow(itemId: string): boolean {
+  const identity = parseAgentJournalItemKey(itemId)
+  return identity?.provider === 'orca' && identity.clientMessageId.startsWith(START_FAILURE_ROW)
+}
diff --git a/src/shared/structured-agent-session-status-block.ts b/src/shared/structured-agent-session-status-block.ts
new file mode 100644
index 000000000000..58dbbe9131c9
--- /dev/null
+++ b/src/shared/structured-agent-session-status-block.ts
@@ -0,0 +1,18 @@
+import { readAgentSessionFailureFact } from './agent-session-failure'
+import type { AgentJournalStatusItem } from './agent-session-journal-types'
+import type { NativeChatTextBlock } from './native-chat-types'
+
+/** A status row as the line a chat paints: named fields only, so a host-only key never leaks. */
+export function structuredAgentSessionStatusBlock(
+  body: AgentJournalStatusItem
+): NativeChatTextBlock {
+  const failure = readAgentSessionFailureFact(body.failure)
+  return {
+    type: 'text',
+    text: body.text,
+    ...(body.presentation !== undefined ? { presentation: body.presentation } : {}),
+    ...(body.tone !== undefined ? { tone: body.tone } : {}),
+    ...(body.providerFrame ? { providerFrame: body.providerFrame } : {}),
+    ...(failure ? { failure } : {})
+  }
+}
diff --git a/src/shared/structured-agent-session-status-started-at.ts b/src/shared/structured-agent-session-status-started-at.ts
index 54f5b44764fd..6588e82026b4 100644
--- a/src/shared/structured-agent-session-status-started-at.ts
+++ b/src/shared/structured-agent-session-status-started-at.ts
@@ -10,6 +10,7 @@ import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-ses
 import { isRootAgentJournalItem } from './agent-session-journal-producer'
 import { readAgentJournalTurn } from './agent-session-turn-record'
 import type { StructuredAgentSessionProjectedStatus } from './structured-agent-session-projection'
+import type { StructuredAgentSessionLatestRequest } from './structured-agent-session-latest-request'
 import type { AgentSessionStatusSummary } from './agent-session-wire'
 import type { AgentMainAgentStatus } from './main-agent-status'
 import type { AgentStatusState } from './agent-status-types'
@@ -20,20 +21,18 @@ export function structuredAgentSessionStatusStartedAt(
   status: StructuredAgentSessionProjectedStatus,
   items: readonly AgentJournalRenderItem[],
   submissions: readonly AgentJournalSubmission[],
-  currentFence?: number | null
+  currentFence: number | null | undefined,
+  latestRequest: Pick<StructuredAgentSessionLatestRequest, 'settledAt'> | null
 ): number | undefined {
   if (status === 'attention') {
     return oldestPendingPromptAt(items)
   }
-  const turnItem = newestTurnItem(items)
-  const turn = readAgentJournalTurn(turnItem?.body)
   if (status === 'idle') {
-    if (!turnItem || !turn || turn.state === 'running') {
-      return undefined
-    }
-    // A turn recovery settled ended when that settle was written: when the user learns it stopped.
-    return turnItem.recoveredAt ?? turn.completedAt
+    // The session went idle when the request it reports settled, not when its newest turn did.
+    return latestRequest?.settledAt
   }
+  const turnItem = newestTurnItem(items)
+  const turn = readAgentJournalTurn(turnItem?.body)
   if (turnItem && turn?.state === 'running') {
     // A mid-turn send joins the running turn; it does not restart the stretch.
     return turn.requestedAt ?? turn.startedAt ?? turnItem.observedAt
diff --git a/src/shared/structured-agent-session-turn-bars.test.ts b/src/shared/structured-agent-session-turn-bars.test.ts
new file mode 100644
index 000000000000..219939d00e69
--- /dev/null
+++ b/src/shared/structured-agent-session-turn-bars.test.ts
@@ -0,0 +1,532 @@
+import { describe, expect, it } from 'vitest'
+import type {
+  AgentJournalRenderItem,
+  AgentJournalSubmission,
+  AgentJournalTurnLifecycle
+} from './agent-session-journal-types'
+import type { NativeChatMessage } from './native-chat-types'
+import {
+  reduceNativeChatTurnTiming,
+  selectNativeChatActiveTurnKey,
+  selectNativeChatTurnStatuses,
+  type NativeChatTurnTimingByTurn
+} from './native-chat-turn-status'
+import {
+  selectStructuredAgentSettledTurns,
+  selectStructuredAgentTurnBars,
+  structuredAgentTurnLocalStartedAt,
+  structuredAgentTurnOrigin
+} from './structured-agent-session-turn-timing'
+
+// Host clock of a live Claude repro (journal rows 44-79): prompt A runs a ~60 s tool
+// chain; 4 s later the user sends B, which Claude picks up by interrupting A's turn.
+const T = 1_790_580_000_000
+const PRIOR = { requestedAt: 1_790_579_265_055, startedAt: 1_790_579_270_679 }
+const PRIOR_END = 1_790_579_272_584
+const A = { sent: T + 74_595, started: T + 76_146, ended: T + 92_372 }
+const B = { sent: T + 79_006, started: T + 92_372, ended: T + 144_349 }
+const SESSION = 'claude:55368cfb'
+
+function user(
+  sequence: number,
+  clientMessageId: string,
+  observedAt: number
+): AgentJournalRenderItem {
+  return {
+    itemId: `orca:${clientMessageId}`,
+    revision: 0,
+    sequence,
+    observedAt,
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: clientMessageId }] }
+  }
+}
+
+function turn(
+  sequence: number,
+  observedAt: number,
+  record: AgentJournalTurnLifecycle
+): AgentJournalRenderItem {
+  return {
+    itemId: `legacy:claude:55368cfb:turn-lifecycle%3A${record.turnId}`,
+    revision: 1,
+    sequence,
+    observedAt,
+    body: { kind: 'turn', ...record }
+  }
+}
+
+function tool(sequence: number, observedAt: number): AgentJournalRenderItem {
+  return {
+    itemId: `orca:claude-tool%3A${sequence}`,
+    revision: 1,
+    sequence,
+    observedAt,
+    body: { kind: 'tool-call', name: 'Bash', input: { command: 'sleep 15' }, state: 'running' }
+  }
+}
+
+function accepted(clientMessageId: string, providerItemId: string | null): AgentJournalSubmission {
+  return {
+    clientMessageId,
+    fence: 1,
+    payloadFingerprint: 'fp',
+    dispatchState: providerItemId ? 'accepted' : 'pending',
+    providerItemId,
+    reason: null,
+    submittedAt: 1,
+    resolvedAt: providerItemId ? 2 : null
+  }
+}
+
+const priorTurn = turn(47, PRIOR_END + 153, {
+  turnId: '5901cefd',
+  state: 'completed',
+  ...PRIOR,
+  completedAt: PRIOR_END,
+  durationMs: 6_218,
+  userItemId: `${SESSION}:5901cefd`
+})
+const turn1 = { turnId: '1020ab78', userItemId: `${SESSION}:1020ab78` }
+const turn2 = { turnId: '6891a0bc', userItemId: `${SESSION}:6891a0bc` }
+const history = [user(44, 'prior', PRIOR.requestedAt), priorTurn]
+const priorSubmission = accepted('prior', `${SESSION}:5901cefd`)
+
+/** B sent while turn 1 still runs (rows 54-61). */
+const whileQueued = {
+  turnId: turn1.turnId,
+  items: [
+    ...history,
+    user(54, 'A', A.sent),
+    turn(57, T + 77_224, {
+      ...turn1,
+      state: 'running',
+      startedAt: A.started,
+      requestedAt: A.sent
+    }),
+    tool(58, T + 77_223),
+    user(60, 'B', B.sent)
+  ],
+  submissions: [priorSubmission, accepted('A', turn1.userItemId), accepted('B', null)]
+}
+
+/** Claude ended turn 1 to pick up B (rows 62-65). */
+const turn1Ended = turn(57, A.ended + 1, {
+  ...turn1,
+  state: 'interrupted',
+  startedAt: A.started,
+  requestedAt: A.sent,
+  completedAt: A.ended
+})
+const whileB = {
+  turnId: turn2.turnId,
+  items: [
+    ...history,
+    user(54, 'A', A.sent),
+    turn1Ended,
+    tool(58, T + 92_329),
+    user(60, 'B', B.sent),
+    turn(65, B.started, { ...turn2, state: 'running', startedAt: B.started, requestedAt: B.sent })
+  ],
+  submissions: [priorSubmission, accepted('A', turn1.userItemId), accepted('B', turn2.userItemId)]
+}
+
+/** Both settled (row 78). Claude's own duration for B counts from turn 1's start. */
+const settled = {
+  items: [
+    ...whileB.items.slice(0, -1),
+    turn(65, B.ended + 1, {
+      ...turn2,
+      state: 'completed',
+      startedAt: B.started,
+      requestedAt: B.sent,
+      completedAt: B.ended,
+      durationMs: 69_595
+    })
+  ],
+  submissions: whileB.submissions
+}
+
+function message(id: string, role: NativeChatMessage['role'] = 'user'): NativeChatMessage {
+  return { id, role, blocks: [{ type: 'text', text: id }], timestamp: null, source: 'transcript' }
+}
+
+describe('a send queued behind a running Claude turn', () => {
+  it('leaves the live bar with the prompt that opened the running turn', () => {
+    const bars = selectStructuredAgentTurnBars(
+      whileQueued.items,
+      whileQueued.submissions,
+      whileQueued.turnId
+    )
+    expect(bars.activeTurnOpenedBy).toBe('orca:A')
+    const transcript = [message('orca:prior'), message('orca:A'), message('orca:B')]
+    expect(selectNativeChatActiveTurnKey(transcript, bars.activeTurnOpenedBy)).toBe('orca:A')
+    // A was sent into an idle session: it counts from its own send, as before.
+    expect(bars.runningTiming).toEqual({
+      state: 'running',
+      startedAt: A.started,
+      requestedAt: A.sent,
+      observedAt: T + 77_224
+    })
+    expect(bars.settledTurns.has('orca:B')).toBe(false)
+  })
+
+  it("moves the bar to B when its own turn opens, counting from A's end", () => {
+    const bars = selectStructuredAgentTurnBars(whileB.items, whileB.submissions, whileB.turnId)
+    expect(bars.activeTurnOpenedBy).toBe('orca:B')
+    expect(bars.settledTurns.get('orca:A')).toEqual({ startedAt: A.started, workedSeconds: 17 })
+    expect(bars.runningTiming && structuredAgentTurnOrigin(bars.runningTiming)).toBe(A.ended)
+    // A client attaching 3 s into turn 2 counts 3 s, not the 13 s B waited behind turn 1.
+    expect(structuredAgentTurnLocalStartedAt(bars.runningTiming!, 50_000, B.started + 3_000)).toBe(
+      47_000
+    )
+  })
+
+  it('settles from the same origin the live counter used, so the bars sum to wall time', () => {
+    const settledTurns = selectStructuredAgentSettledTurns(settled.items, settled.submissions)
+    expect(settledTurns.get('orca:A')).toEqual({ startedAt: A.started, workedSeconds: 17 })
+    // Not 65 s from B's send, and not Claude's own 69.6 s, which counts from turn 1's start.
+    expect(settledTurns.get('orca:B')).toEqual({ startedAt: B.started, workedSeconds: 51 })
+    // The turn before A never overlapped a send; its duration is unchanged.
+    expect(settledTurns.get('orca:prior')).toEqual({ startedAt: PRIOR.startedAt, workedSeconds: 7 })
+
+    const liveOriginB = structuredAgentTurnOrigin(
+      selectStructuredAgentTurnBars(whileB.items, whileB.submissions, whileB.turnId).runningTiming!
+    )
+    expect(Math.floor((B.ended - liveOriginB) / 1000)).toBe(51)
+    expect(A.ended - A.sent + (B.ended - liveOriginB)).toBe(B.ended - A.sent)
+    expect(selectStructuredAgentTurnBars(settled.items, settled.submissions, null)).toMatchObject({
+      activeTurnOpenedBy: null,
+      runningTiming: null
+    })
+  })
+
+  it('shows one live bar under A while B waits, then A settled and B live', () => {
+    const transcript = [message('orca:A'), message('orca:tool', 'assistant'), message('orca:B')]
+    const validTurnKeys = new Set(['orca:A', 'orca:B'])
+    let timing: NativeChatTurnTimingByTurn = {}
+    const pass = (
+      snapshot: { items: AgentJournalRenderItem[]; submissions: AgentJournalSubmission[] },
+      turnId: string,
+      now: number
+    ) => {
+      const bars = selectStructuredAgentTurnBars(snapshot.items, snapshot.submissions, turnId)
+      const activeTurnKey = selectNativeChatActiveTurnKey(transcript, bars.activeTurnOpenedBy)
+      const workingStartedAt = structuredAgentTurnLocalStartedAt(bars.runningTiming!, now, now)
+      timing = reduceNativeChatTurnTiming(timing, {
+        activeTurnKey,
+        validTurnKeys,
+        isWorking: true,
+        workingStartedAt,
+        now
+      })
+      return selectNativeChatTurnStatuses(timing, {
+        activeTurnKey,
+        isWorking: true,
+        workingStartedAt,
+        thinking: false,
+        settledByTurn: bars.settledTurns
+      })
+    }
+
+    const queued = pass(whileQueued, whileQueued.turnId, B.sent + 1_000)
+    expect(timing['orca:A']?.startedAt).toBe(A.sent)
+    expect(timing['orca:B']).toBeUndefined()
+    expect(queued.completedByTurn['orca:B']).toBeUndefined()
+
+    const running = pass(whileB, whileB.turnId, B.started + 1_000)
+    expect(running.completedByTurn['orca:A']?.workedSeconds).toBe(17)
+    expect(running.active?.startedAt).toBe(A.ended)
+  })
+})
+
+describe('a send Codex folds into the running turn', () => {
+  const key = 'codex:thread:t1:0'
+  const items: AgentJournalRenderItem[] = [
+    { ...user(1, 'first', 1_000) },
+    {
+      itemId: 'legacy:codex:s:turn-lifecycle%3At1',
+      revision: 1,
+      sequence: 2,
+      observedAt: 1_200,
+      body: {
+        kind: 'turn',
+        turnId: 't1',
+        state: 'running',
+        userItemId: key,
+        requestedAt: 1_000,
+        startedAt: 1_200
+      }
+    },
+    { ...user(3, 'second', 4_000) }
+  ]
+  const submissions = [accepted('first', key), accepted('second', key)]
+  const ended: AgentJournalRenderItem[] = [
+    items[0]!,
+    {
+      ...items[1]!,
+      observedAt: 9_000,
+      body: {
+        kind: 'turn',
+        turnId: 't1',
+        state: 'completed',
+        userItemId: key,
+        requestedAt: 1_000,
+        startedAt: 1_200,
+        completedAt: 9_000
+      }
+    },
+    items[2]!
+  ]
+  const transcript = [message('orca:first'), message('orca:second')]
+
+  it('keeps exactly one bar, under the opening prompt, live and settled', () => {
+    const live = selectStructuredAgentTurnBars(items, submissions, 't1')
+    expect(selectNativeChatActiveTurnKey(transcript, live.activeTurnOpenedBy)).toBe('orca:first')
+    expect(live.runningTiming && structuredAgentTurnOrigin(live.runningTiming)).toBe(1_000)
+
+    let timing: NativeChatTurnTimingByTurn = {}
+    const validTurnKeys = new Set(['orca:first', 'orca:second'])
+    timing = reduceNativeChatTurnTiming(timing, {
+      activeTurnKey: 'orca:first',
+      validTurnKeys,
+      isWorking: true,
+      workingStartedAt: 1_000,
+      now: 4_500
+    })
+    const after = selectStructuredAgentTurnBars(ended, submissions, null)
+    // The turn is over: nothing names an owner, so the key falls back to the newest prompt,
+    // which never ran a turn of its own and so has nothing to settle.
+    const activeTurnKey = selectNativeChatActiveTurnKey(transcript, after.activeTurnOpenedBy)
+    expect(activeTurnKey).toBe('orca:second')
+    timing = reduceNativeChatTurnTiming(timing, {
+      activeTurnKey,
+      validTurnKeys,
+      isWorking: false,
+      workingStartedAt: null,
+      now: 9_500
+    })
+    const statuses = selectNativeChatTurnStatuses(timing, {
+      activeTurnKey,
+      isWorking: false,
+      thinking: false,
+      settledByTurn: after.settledTurns
+    })
+    expect(statuses.active).toBeNull()
+    expect(Object.keys(statuses.completedByTurn)).toEqual(['orca:first'])
+    expect(statuses.completedByTurn['orca:first']?.workedSeconds).toBe(8)
+  })
+})
+
+describe('turns whose host names no opener', () => {
+  it('falls back to the newest prompt for an older host row with no user key', () => {
+    const items = [
+      user(1, 'u1', 1_000),
+      turn(2, 1_100, { turnId: 't1', state: 'running', startedAt: 1_100 }),
+      user(3, 'u2', 2_000)
+    ]
+    const bars = selectStructuredAgentTurnBars(items, [], 't1')
+    expect(bars.activeTurnOpenedBy).toBeNull()
+    expect(selectNativeChatActiveTurnKey([message('orca:u1'), message('orca:u2')], null)).toBe(
+      'orca:u2'
+    )
+    // Settled timing keeps its journal-order attribution.
+    expect([...selectStructuredAgentSettledTurns(items).keys()]).toEqual(['orca:u1'])
+  })
+
+  it('anchors a turn the provider opened to its own record, never a bystander prompt', () => {
+    const self = 'legacy:claude:55368cfb:turn-lifecycle%3Aresumed'
+    const items = [
+      user(1, 'u1', 1_000),
+      turn(2, 5_000, {
+        turnId: 'resumed',
+        state: 'running',
+        startedAt: 5_000,
+        userItemId: self
+      })
+    ]
+    expect(selectStructuredAgentTurnBars(items, [], 'resumed').activeTurnOpenedBy).toBe(self)
+  })
+
+  it('keeps the running bar on the send Codex opened a turn for before it echoes it', () => {
+    // Codex reports turn/started before hooks and prewarm run, so the turn names its
+    // provider key while the send that opened it is still pending (no alias yet).
+    const key = 'codex:thread:t2:0'
+    const items: AgentJournalRenderItem[] = [
+      user(1, 'first', 1_000),
+      turn(2, 1_100, {
+        turnId: 't1',
+        state: 'completed',
+        userItemId: 'orca:first',
+        startedAt: 1_100,
+        completedAt: 2_000
+      }),
+      tool(3, 1_500),
+      user(4, 'second', 3_000),
+      turn(5, 3_100, { turnId: 't2', state: 'running', startedAt: 3_100, userItemId: key })
+    ]
+    const submissions = [accepted('first', 'claude:first'), accepted('second', null)]
+    const bars = selectStructuredAgentTurnBars(items, submissions, 't2')
+    expect(bars.activeTurnOpenedBy).toBe('orca:second')
+    expect(bars.turnKeysByItemId.get('orca:second')).toBe('orca:second')
+    // A turn with no send in flight still anchors to its own record.
+    const selfOpened = selectStructuredAgentTurnBars(
+      items,
+      [accepted('first', 'claude:first'), accepted('second', 'claude:second')],
+      't2'
+    )
+    expect(selfOpened.activeTurnOpenedBy).toBe('legacy:claude:55368cfb:turn-lifecycle%3At2')
+  })
+
+  it('names nothing for the unanchored transcript', () => {
+    expect(selectNativeChatActiveTurnKey([message('a', 'assistant')], null)).toBe('__unanchored__')
+  })
+})
+
+describe('the previous turn has no recorded end', () => {
+  it('leaves an unverifiable turn null and a later send counting from itself', () => {
+    const items = [
+      user(1, 'u1', 1_000),
+      turn(2, 3_000, { turnId: 't1', state: 'unverifiable', userItemId: 'orca:u1' }),
+      user(3, 'u2', 10_000),
+      turn(4, 12_000, {
+        turnId: 't2',
+        state: 'completed',
+        userItemId: 'orca:u2',
+        requestedAt: 10_000,
+        startedAt: 11_000,
+        completedAt: 20_000
+      })
+    ]
+    const settledTurns = selectStructuredAgentSettledTurns(items)
+    expect(settledTurns.get('orca:u1')).toBeNull()
+    expect(settledTurns.get('orca:u2')).toEqual({ startedAt: 11_000, workedSeconds: 10 })
+  })
+
+  it("waits out the previous row's last host revision, never past its own start", () => {
+    const queued = (lastSeenAt: number) =>
+      selectStructuredAgentTurnBars(
+        [
+          user(1, 'u1', 1_000),
+          turn(2, lastSeenAt, {
+            turnId: 't1',
+            state: 'unverifiable',
+            userItemId: 'orca:u1',
+            startedAt: 1_000
+          }),
+          user(3, 'u2', 2_000),
+          turn(4, 9_000, {
+            turnId: 't2',
+            state: 'running',
+            userItemId: 'orca:u2',
+            requestedAt: 2_000,
+            startedAt: 9_000
+          })
+        ],
+        [],
+        't2'
+      ).runningTiming!
+    expect(structuredAgentTurnOrigin(queued(6_000))).toBe(6_000)
+    expect(structuredAgentTurnOrigin(queued(12_000))).toBe(9_000)
+  })
+})
+
+describe('which turn owns each transcript row', () => {
+  const keysOf = (snapshot: {
+    turnId: string | null
+    items: AgentJournalRenderItem[]
+    submissions: AgentJournalSubmission[]
+  }) =>
+    selectStructuredAgentTurnBars(snapshot.items, snapshot.submissions, snapshot.turnId)
+      .turnKeysByItemId
+
+  it('keeps the rows Claude produces after a mid-turn send with the turn that ran them', () => {
+    // The #23621 shape: B lands mid-turn and three tool calls follow, one turn.
+    const midTurn = {
+      turnId: turn1.turnId,
+      items: [
+        user(54, 'A', A.sent),
+        turn(57, T + 77_224, {
+          ...turn1,
+          state: 'running',
+          startedAt: A.started,
+          requestedAt: A.sent
+        }),
+        tool(58, T + 77_300),
+        user(60, 'B', B.sent),
+        tool(61, T + 80_100),
+        tool(62, T + 80_200),
+        tool(63, T + 80_300)
+      ],
+      submissions: [accepted('A', turn1.userItemId), accepted('B', null)]
+    }
+    const keys = keysOf(midTurn)
+    expect(keys.get('orca:A')).toBe('orca:A')
+    expect(keys.get('orca:B')).toBe('orca:A')
+    for (const sequence of [58, 61, 62, 63]) {
+      expect(keys.get(`orca:claude-tool%3A${sequence}`)).toBe('orca:A')
+    }
+  })
+
+  it('leaves a fresh tail send unowned until the turn proves it continued past it', () => {
+    // B is the newest row: nothing after it says the running turn absorbed it.
+    expect(keysOf(whileQueued).has('orca:B')).toBe(false)
+    // B's own turn opened: B is an opener and keys itself.
+    expect(keysOf(whileB).get('orca:B')).toBe('orca:B')
+    expect(keysOf(whileB).get(`orca:claude-tool%3A58`)).toBe('orca:A')
+  })
+
+  it('folds a Codex-coalesced send into the turn its provider key names', () => {
+    const key = 'codex:thread:t1:0'
+    const items: AgentJournalRenderItem[] = [
+      user(1, 'first', 1_000),
+      {
+        itemId: 'legacy:codex:s:turn-lifecycle%3At1',
+        revision: 1,
+        sequence: 2,
+        observedAt: 1_200,
+        body: {
+          kind: 'turn',
+          turnId: 't1',
+          state: 'running',
+          userItemId: key,
+          requestedAt: 1_000,
+          startedAt: 1_200
+        }
+      },
+      user(3, 'second', 4_000),
+      tool(4, 5_000)
+    ]
+    const submissions = [accepted('first', key), accepted('second', key)]
+    const keys = keysOf({ turnId: 't1', items, submissions })
+    expect(keys.get('orca:first')).toBe('orca:first')
+    expect(keys.get('orca:second')).toBe('orca:first')
+    expect(keys.get('orca:claude-tool%3A4')).toBe('orca:first')
+  })
+
+  it('keys a provider-opened turn and its rows to the turn record itself', () => {
+    const self = 'legacy:claude:55368cfb:turn-lifecycle%3Aresumed'
+    const items = [
+      user(1, 'u1', 1_000),
+      turn(2, 5_000, {
+        turnId: 'resumed',
+        state: 'running',
+        startedAt: 5_000,
+        userItemId: self
+      }),
+      tool(3, 6_000)
+    ]
+    const keys = keysOf({ turnId: 'resumed', items, submissions: [] })
+    // u1 predates the wake turn and never opened one: positional grouping keeps it.
+    expect(keys.has('orca:u1')).toBe(false)
+    expect(keys.get('orca:claude-tool%3A3')).toBe(self)
+  })
+
+  it('attributes nothing for an older host that names no opener', () => {
+    const items = [
+      user(1, 'u1', 1_000),
+      turn(2, 1_100, { turnId: 't1', state: 'running', startedAt: 1_100 }),
+      tool(3, 1_200)
+    ]
+    expect(keysOf({ turnId: 't1', items, submissions: [] }).size).toBe(0)
+  })
+})
diff --git a/src/shared/structured-agent-session-turn-timing.test.ts b/src/shared/structured-agent-session-turn-timing.test.ts
index ba9af94258ff..1cf2d32db919 100644
--- a/src/shared/structured-agent-session-turn-timing.test.ts
+++ b/src/shared/structured-agent-session-turn-timing.test.ts
@@ -226,7 +226,7 @@ describe('explicit user-item attribution', () => {
     expect([...selectStructuredAgentTurnTimings(items).keys()]).toEqual(['claude:s:u1'])
   })
 
-  it('attributes nothing when a keyed row names a user item nobody journaled', () => {
+  it('anchors to the record itself when a keyed row names a user item nobody journaled', () => {
     const items = [
       user('orca:first'),
       lifecycle('auto', {
@@ -236,7 +236,11 @@ describe('explicit user-item attribution', () => {
         completedAt: 2_000
       })
     ]
-    expect(selectStructuredAgentTurnTimings(items).size).toBe(0)
+    // Never the preceding prompt, which did not open this turn; the record's own
+    // key gives the turn a bar at its own position instead.
+    expect([...selectStructuredAgentTurnTimings(items).keys()]).toEqual([
+      'legacy:codex:s:turn-lifecycle%3Aauto'
+    ])
   })
 
   it('falls back to journal order only for rows without a key (older hosts)', () => {
diff --git a/src/shared/structured-agent-session-turn-timing.ts b/src/shared/structured-agent-session-turn-timing.ts
index 3f480013886d..e760796618c0 100644
--- a/src/shared/structured-agent-session-turn-timing.ts
+++ b/src/shared/structured-agent-session-turn-timing.ts
@@ -23,12 +23,18 @@ export type StructuredAgentTurnTiming = {
   completedAt?: number
   /** The provider's own measurement; used when exact host endpoints are unavailable. */
   durationMs?: number
+  /** Host clock this turn's send stopped waiting behind the journal's previous
+   *  turn; present only when the send was issued before that turn ended. */
+  queuedUntil?: number
   /** Host clock when the lifecycle row was appended; with `startedAt` it gives
    *  the host-side lag a client must subtract to anchor a live counter. */
   observedAt: number
 }
 
-function readTiming(item: AgentJournalRenderItem): StructuredAgentTurnTiming | null {
+function readTiming(
+  item: AgentJournalRenderItem,
+  precedingTurnEndedAt: number | undefined
+): StructuredAgentTurnTiming | null {
   const turn = readAgentJournalTurn(item.body)
   if (!turn) {
     return null
@@ -49,26 +55,50 @@ function readTiming(item: AgentJournalRenderItem): StructuredAgentTurnTiming | n
     durationMs !== undefined && Number.isFinite(durationMs) && durationMs >= 0
       ? durationMs
       : undefined
+  // A send queued behind the previous turn counts from that turn's end (recorded, else its row's
+  // last host revision), never past this turn's own start: the provider opens it only after.
+  const queuedUntil =
+    precedingTurnEndedAt === undefined ? undefined : Math.min(precedingTurnEndedAt, startedAt)
   return {
     state,
     startedAt,
     ...(requested !== undefined ? { requestedAt: requested } : {}),
     ...(end !== undefined ? { completedAt: end } : {}),
     ...(measured !== undefined ? { durationMs: measured } : {}),
+    ...(requested !== undefined && queuedUntil !== undefined && queuedUntil > requested
+      ? { queuedUntil }
+      : {}),
     observedAt: item.observedAt
   }
 }
 
-/** Timing keyed by the user message that opened each turn. A row can name the
- *  submission directly or by a provider key that resolves through its alias.
- *  Rows from older hosts carry no key and fall back
+/** One turn record, read in journal order. */
+type StructuredAgentJournalTurn = {
+  timing: StructuredAgentTurnTiming | null
+  /** The transcript key that anchors this turn's bar and owns its rows: the
+   *  opener user item when the host names one it can resolve (or the send still
+   *  in flight ahead of the record), else the turn record's own item (a turn the
+   *  provider opened, or an opener outside the loaded window). Null only for an
+   *  older host that names nothing. */
+  key: string | null
+}
+
+type StructuredAgentJournalTurns = {
+  /** Timing keyed by the user message that opened each turn. */
+  byUserItem: ReadonlyMap<string, StructuredAgentTurnTiming | null>
+  byTurnId: ReadonlyMap<string, StructuredAgentJournalTurn>
+}
+
+/** Every turn record in one pass over the journal. A row can name its user
+ *  message directly or by a provider key that resolves through its alias.
+ *  Rows from older hosts carry no key and fall back, for timing only,
  *  to the nearest user message before them in journal order — the submission
  *  row is written ahead of dispatch, so it always precedes the provider's
  *  turn-start. Untimed rows are skipped unless explicitly unverifiable (null). */
-export function selectStructuredAgentTurnTimings(
+function readStructuredAgentJournalTurns(
   items: readonly AgentJournalRenderItem[],
   submissions: readonly AgentJournalSubmission[] = []
-): ReadonlyMap<string, StructuredAgentTurnTiming | null> {
+): StructuredAgentJournalTurns {
   const itemIds = new Set(items.map((item) => item.itemId))
   const aliases = new Map<string, string>()
   // Codex folds a send issued mid-turn into the running turn under the SAME provider
@@ -78,26 +108,108 @@ export function selectStructuredAgentTurnTimings(
       aliases.set(submission.providerItemId, agentJournalSubmissionKey(submission.clientMessageId))
     }
   }
-  const timings = new Map<string, StructuredAgentTurnTiming | null>()
+  // Sends not yet matched to a provider item. Codex reports a turn open before it
+  // echoes the send, so for that gap the turn names a key no alias resolves yet.
+  const inFlight = new Set(
+    submissions
+      .filter((submission) => submission.dispatchState === 'pending' && !submission.providerItemId)
+      .map((submission) => agentJournalSubmissionKey(submission.clientMessageId))
+  )
+  const byUserItem = new Map<string, StructuredAgentTurnTiming | null>()
+  const byTurnId = new Map<string, StructuredAgentJournalTurn>()
   let precedingUserItemId: string | null = null
+  let inFlightSinceLastTurn: string | null = null
+  let precedingTurnEndedAt: number | undefined
   for (const item of items) {
     if (item.body.kind === 'message' && item.body.role === 'user') {
       precedingUserItemId = item.itemId
+      if (inFlightSinceLastTurn === null && inFlight.has(item.itemId)) {
+        inFlightSinceLastTurn = item.itemId
+      }
       continue
     }
     const turn = readAgentJournalTurn(item.body)
-    const timing = readTiming(item)
-    if (!timing && turn?.state !== 'unverifiable') {
+    if (!turn) {
       continue
     }
-    const key = turn?.userItemId
-    const userItemId =
-      key === undefined ? precedingUserItemId : itemIds.has(key) ? key : (aliases.get(key) ?? null)
+    const timing = readTiming(item, precedingTurnEndedAt)
+    precedingTurnEndedAt = timing?.completedAt ?? item.observedAt
+    const key = turn.userItemId
+    const named = key === undefined ? null : itemIds.has(key) ? key : (aliases.get(key) ?? null)
+    // An unresolved opener is the send still in flight ahead of this record; with none,
+    // it is outside the window, and the turn anchors to its own record like a
+    // provider-opened one — never to a preceding prompt that did not open it.
+    const turnKey = key === undefined ? null : (named ?? inFlightSinceLastTurn ?? item.itemId)
+    inFlightSinceLastTurn = null
+    byTurnId.set(turn.turnId, { timing, key: turnKey })
+    if (!timing && turn.state !== 'unverifiable') {
+      continue
+    }
+    const userItemId = key === undefined ? precedingUserItemId : turnKey
     if (userItemId !== null) {
-      timings.set(userItemId, timing)
+      byUserItem.set(userItemId, timing)
     }
   }
-  return timings
+  return { byUserItem, byTurnId }
+}
+
+/**
+ * Which turn owns each journal item, as the transcript groups rows: every item
+ * between a turn record and the next belongs to that record's turn (the record
+ * is appended when the turn opens and revised in place, and an opener's user
+ * item is written ahead of dispatch, so journal order is turn order). A user
+ * item that opened any turn — even a later one it queued for — keys itself; one
+ * the provider folded into a running turn (a steer) takes that turn's key, but
+ * only once the turn produces more rows after it, so a fresh tail send is not
+ * pulled into the turn it is merely waiting behind. Items before the first turn
+ * record stay absent, and the surface keeps its positional grouping for them.
+ */
+function turnKeysByItemIdOf(
+  items: readonly AgentJournalRenderItem[],
+  byTurnId: ReadonlyMap<string, StructuredAgentJournalTurn>
+): ReadonlyMap<string, string> {
+  const openers = new Set<string>()
+  for (const turn of byTurnId.values()) {
+    if (turn.key !== null) {
+      openers.add(turn.key)
+    }
+  }
+  const keys = new Map<string, string>()
+  let currentKey: string | null = null
+  // User items folded into the current turn, held until a later row proves the
+  // turn continued past them.
+  let pendingUserItemIds: string[] = []
+  for (const item of items) {
+    const turn = readAgentJournalTurn(item.body)
+    if (turn) {
+      currentKey = byTurnId.get(turn.turnId)?.key ?? null
+      pendingUserItemIds = []
+      continue
+    }
+    if (item.body.kind === 'message' && item.body.role === 'user') {
+      if (openers.has(item.itemId)) {
+        keys.set(item.itemId, item.itemId)
+      } else if (currentKey !== null) {
+        pendingUserItemIds.push(item.itemId)
+      }
+      continue
+    }
+    if (currentKey !== null) {
+      for (const userItemId of pendingUserItemIds) {
+        keys.set(userItemId, currentKey)
+      }
+      pendingUserItemIds = []
+      keys.set(item.itemId, currentKey)
+    }
+  }
+  return keys
+}
+
+export function selectStructuredAgentTurnTimings(
+  items: readonly AgentJournalRenderItem[],
+  submissions: readonly AgentJournalSubmission[] = []
+): ReadonlyMap<string, StructuredAgentTurnTiming | null> {
+  return readStructuredAgentJournalTurns(items, submissions).byUserItem
 }
 
 /** The live turn's lifecycle timing, or null when its row carries no host start
@@ -106,20 +218,15 @@ export function selectStructuredAgentRunningTurnTiming(
   items: readonly AgentJournalRenderItem[],
   turnId: string
 ): StructuredAgentTurnTiming | null {
-  for (let index = items.length - 1; index >= 0; index -= 1) {
-    const item = items[index]
-    if (item && readAgentJournalTurn(item.body)?.turnId === turnId) {
-      return readTiming(item)
-    }
-  }
-  return null
+  return readStructuredAgentJournalTurns(items).byTurnId.get(turnId)?.timing ?? null
 }
 
 /** The single instant every reading of a turn's elapsed time counts from: the
- *  send that opened it when the host named one, the provider turn-open otherwise.
+ *  send that opened it when the host named one — or, for a send queued behind the
+ *  previous turn, that turn's end — and the provider turn-open otherwise.
  *  One origin is what keeps the live counter and the settled duration agreeing. */
 export function structuredAgentTurnOrigin(timing: StructuredAgentTurnTiming): number {
-  return timing.requestedAt ?? timing.startedAt
+  return timing.queuedUntil ?? timing.requestedAt ?? timing.startedAt
 }
 
 /** Whole seconds a settled turn ran, or null when the host never observed its end. */
@@ -129,9 +236,9 @@ export function completedStructuredAgentTurnSeconds(
   if (!timing || (timing.state !== 'completed' && timing.state !== 'interrupted')) {
     return null
   }
-  // Provider durations may begin at turn-open, so exact host endpoints preserve the live origin.
+  // Provider durations may begin before the live origin (turn-open, or a turn this send queued behind).
   if (timing.requestedAt !== undefined && timing.completedAt !== undefined) {
-    return Math.max(0, Math.floor((timing.completedAt - timing.requestedAt) / 1000))
+    return Math.max(0, Math.floor((timing.completedAt - structuredAgentTurnOrigin(timing)) / 1000))
   }
   if (timing.durationMs !== undefined) {
     return Math.floor(timing.durationMs / 1000)
@@ -170,9 +277,16 @@ export function structuredAgentTurnLocalStartedAt(
 export function selectStructuredAgentSettledTurns(
   items: readonly AgentJournalRenderItem[],
   submissions: readonly AgentJournalSubmission[] = []
+): NativeChatSettledTurns {
+  return settledTurnsOf(readStructuredAgentJournalTurns(items, submissions), submissions)
+}
+
+function settledTurnsOf(
+  turns: StructuredAgentJournalTurns,
+  submissions: readonly AgentJournalSubmission[]
 ): NativeChatSettledTurns {
   const settled = new Map<string, NativeChatSettledTurn | null>()
-  for (const [userItemId, timing] of selectStructuredAgentTurnTimings(items, submissions)) {
+  for (const [userItemId, timing] of turns.byUserItem) {
     const workedSeconds = completedStructuredAgentTurnSeconds(timing)
     settled.set(
       userItemId,
@@ -189,3 +303,30 @@ export function selectStructuredAgentSettledTurns(
   }
   return settled
 }
+
+/** Everything a chat surface reads off the journal for its turn bars, from one
+ *  pass: settled durations, the running turn's timing, the item that anchors its
+ *  bar — which a message sent while the turn runs is not — and which turn owns
+ *  each row of the transcript. */
+export function selectStructuredAgentTurnBars(
+  items: readonly AgentJournalRenderItem[],
+  submissions: readonly AgentJournalSubmission[],
+  turnId: string | null
+): {
+  settledTurns: NativeChatSettledTurns
+  runningTiming: StructuredAgentTurnTiming | null
+  /** The transcript key the running turn's bar anchors to: its opening user
+   *  message, or the turn record itself when the provider opened the turn.
+   *  Null on an older host, where the newest user message stays the anchor. */
+  activeTurnOpenedBy: string | null
+  turnKeysByItemId: ReadonlyMap<string, string>
+} {
+  const turns = readStructuredAgentJournalTurns(items, submissions)
+  const running = turnId === null ? undefined : turns.byTurnId.get(turnId)
+  return {
+    settledTurns: settledTurnsOf(turns, submissions),
+    runningTiming: running?.timing ?? null,
+    activeTurnOpenedBy: running?.key ?? null,
+    turnKeysByItemId: turnKeysByItemIdOf(items, turns.byTurnId)
+  }
+}
diff --git a/src/shared/structured-agent-session-unanswered-dispatch.ts b/src/shared/structured-agent-session-unanswered-dispatch.ts
index 36c70a357cb7..412b3e981968 100644
--- a/src/shared/structured-agent-session-unanswered-dispatch.ts
+++ b/src/shared/structured-agent-session-unanswered-dispatch.ts
@@ -1,4 +1,5 @@
 import type { AgentJournalSubmission } from './agent-session-journal-types'
+import { isQueuedAgentJournalSubmission } from './agent-session-queued-submission'
 
 /** One send the provider has neither opened a turn for nor refused; the rule is explained on
  *  `hasUnansweredStructuredAgentSessionDispatch`, which asks it of every send. */
@@ -6,6 +7,10 @@ export function isUnansweredStructuredAgentSessionDispatch(
   submission: AgentJournalSubmission,
   currentFence?: number | null
 ): boolean {
+  if (isQueuedAgentJournalSubmission(submission)) {
+    // Accepted and still owed to whichever child the host starts next, whatever the fence.
+    return true
+  }
   return (
     (currentFence == null || submission.fence >= currentFence) &&
     (submission.dispatchState === 'pending' ||
@@ -15,3 +20,25 @@ export function isUnansweredStructuredAgentSessionDispatch(
         submission.reason !== 'host_restarted_before_acknowledgement'))
   )
 }
+
+/**
+ * A send the host has journaled that the provider has neither opened a turn for nor refused.
+ *
+ * Codex declares `turn/started` within ~150ms, but Claude's running row can only be written once
+ * the SDK echoes the user message back — a 3.4s median and 18s at p90 on real journals, and no
+ * echo at all while it retries a rate-limited request. Waiting on that echo to call a session
+ * working leaves the whole gap reading idle in the chat and in every session list, so the send
+ * itself is the evidence.
+ *
+ * A live `unknown` still counts because an ambiguous adapter reply does not prove the provider
+ * stopped. A recovered `unknown` does not — it outlived the host generation that sent it, so
+ * there is nothing still running to report.
+ */
+export function hasUnansweredStructuredAgentSessionDispatch(
+  submissions: readonly AgentJournalSubmission[],
+  currentFence?: number | null
+): boolean {
+  return submissions.some((submission) =>
+    isUnansweredStructuredAgentSessionDispatch(submission, currentFence)
+  )
+}
diff --git a/src/shared/structured-session-marker.ts b/src/shared/structured-session-marker.ts
index 36c90f432ee8..c30dc5a6139d 100644
--- a/src/shared/structured-session-marker.ts
+++ b/src/shared/structured-session-marker.ts
@@ -1,13 +1,18 @@
 /**
- * The marker a structured chat session's child carries when it has NO orchestration identity.
+ * Marks a structured session's child. It names nothing — no handle, no pane key, no token.
  *
- * It names nothing on purpose — no handle, no pane key, no session id, no token — so it grants no
- * authority and cannot be replayed or impersonated. Its only job is to let a CLI verb that would
- * otherwise GUESS an implicit terminal refuse instead: a structured session has no pane, so every
- * guess resolves to a sibling, and `orchestration check` is destructive by default.
+ * Every structured child now also carries its injected session id, and a current CLI checks the id
+ * first, so for it the marker only matters when the id is absent: a child spawned by an Orca that
+ * predates injection. The marker is still written for the opposite case, a CLI that predates the
+ * id, which refuses on it. Either way the answer is refuse, never guess: a structured session has
+ * no pane, so every implicit-terminal guess resolves to a sibling, and `orchestration check` is
+ * destructive by default.
+ *
+ * The reader answers only "does this process carry the marker": a current CLI reaches it after the
+ * id check has already returned, which is what makes a marked child with an id act as its session.
  */
 export const ORCA_STRUCTURED_SESSION_ENV = 'ORCA_STRUCTURED_SESSION'
 
-export function isStructuredSessionWithoutIdentity(env: NodeJS.ProcessEnv = process.env): boolean {
+export function hasStructuredSessionMarker(env: NodeJS.ProcessEnv = process.env): boolean {
   return (env[ORCA_STRUCTURED_SESSION_ENV] ?? '').length > 0
 }
diff --git a/src/shared/structured-worker-handle.ts b/src/shared/structured-worker-handle.ts
new file mode 100644
index 000000000000..c9fd3927c02c
--- /dev/null
+++ b/src/shared/structured-worker-handle.ts
@@ -0,0 +1,7 @@
+// Deliberately not `term_`: `issueHandle` revalidates the renderer graph epoch against the
+// renderer-driven leaves map, so a main-minted `term_` leaf evaporates on the next window reload.
+export const STRUCTURED_WORKER_HANDLE_PREFIX = 'structworker_'
+
+export function isStructuredWorkerHandle(handle: string | null | undefined): handle is string {
+  return typeof handle === 'string' && handle.startsWith(STRUCTURED_WORKER_HANDLE_PREFIX)
+}
diff --git a/src/shared/telemetry-agent-token-usage-schema.ts b/src/shared/telemetry-agent-token-usage-schema.ts
new file mode 100644
index 000000000000..18a3d4a08d5b
--- /dev/null
+++ b/src/shared/telemetry-agent-token-usage-schema.ts
@@ -0,0 +1,23 @@
+import { z } from 'zod'
+
+const tokenCount = z.number().int().nonnegative().max(Number.MAX_SAFE_INTEGER)
+
+export const agentTokenCountsSchema = z
+  .object({
+    input_tokens: tokenCount,
+    output_tokens: tokenCount,
+    cached_input_tokens: tokenCount,
+    cache_write_input_tokens: tokenCount
+  })
+  .strict()
+
+export const agentTokenUsageSchema = agentTokenCountsSchema
+  .extend({
+    provider: z.enum(['claude', 'codex', 'opencode']),
+    analytics_session_id: z.uuidv4(),
+    revision: z.number().int().positive().max(Number.MAX_SAFE_INTEGER)
+  })
+  .strict()
+
+export type AgentTokenCounts = z.infer<typeof agentTokenCountsSchema>
+export type AgentTokenUsage = z.infer<typeof agentTokenUsageSchema>
diff --git a/src/shared/telemetry-event-registry.ts b/src/shared/telemetry-event-registry.ts
index c8e5c25eec77..fdccaea607a8 100644
--- a/src/shared/telemetry-event-registry.ts
+++ b/src/shared/telemetry-event-registry.ts
@@ -1,3 +1,4 @@
+import { agentTokenUsageSchema } from './telemetry-agent-token-usage-schema'
 import {
   agentErrorSchema,
   agentPromptSentSchema,
@@ -121,6 +122,7 @@ export const eventSchemas = {
   setup_script_prompt_shown: setupScriptPromptShownSchema,
   setup_script_prompt_action: setupScriptPromptActionSchema,
 
+  agent_token_usage: agentTokenUsageSchema,
   agent_started: agentStartedSchema,
   agent_prompt_sent: agentPromptSentSchema,
   agent_error: agentErrorSchema,
diff --git a/src/shared/telemetry-property-schemas.ts b/src/shared/telemetry-property-schemas.ts
index ac58e6df7921..766f486c2739 100644
--- a/src/shared/telemetry-property-schemas.ts
+++ b/src/shared/telemetry-property-schemas.ts
@@ -10,6 +10,7 @@ import type { GlobalSettings } from './global-settings-types'
 export const AGENT_KIND_VALUES = [
   'claude-code',
   'claude-agent-teams',
+  'codebuddy',
   'openclaude',
   'codex',
   'autohand',
@@ -19,6 +20,7 @@ export const AGENT_KIND_VALUES = [
   'pi',
   'omp',
   'prime-agent',
+  'qoder',
   'gemini',
   'antigravity',
   'aider',
@@ -30,6 +32,7 @@ export const AGENT_KIND_VALUES = [
   'aug',
   'cline',
   'codebuff',
+  'freebuff',
   'command-code',
   'continue',
   'cursor',
@@ -46,6 +49,7 @@ export const AGENT_KIND_VALUES = [
   'ante',
   'trae',
   'muse',
+  'dsh',
   'zcode',
   'other'
 ] as const
@@ -137,6 +141,10 @@ export const launchSourceSchema = z.enum([
   'conflict_resolution',
   'source_control_recovery',
   'terminal_context_menu',
+  // Launches the host performs for a caller outside the desktop app.
+  'cli',
+  'mobile',
+  'orchestration',
   'unknown'
 ])
 export type LaunchSource = z.infer<typeof launchSourceSchema>
diff --git a/src/shared/terminal-input-kind.ts b/src/shared/terminal-input-kind.ts
new file mode 100644
index 000000000000..f9cef0e2a187
--- /dev/null
+++ b/src/shared/terminal-input-kind.ts
@@ -0,0 +1,8 @@
+/**
+ * Why bytes are written to a PTY. Every host write entry point takes one, so no producer inherits
+ * a transport's default.
+ * - `driving`: input that drives the run, from a person or any client, driver or agent acting on it.
+ * - `launch`: bytes Orca writes to start the run: startup commands, a create-time draft or prompt.
+ * - `query-reply`: the terminal's automatic answer to a query the running program made.
+ */
+export type TerminalInputKind = 'driving' | 'launch' | 'query-reply'
diff --git a/src/shared/terminal-kitty-keyboard-mode-tracker.test.ts b/src/shared/terminal-kitty-keyboard-mode-tracker.test.ts
index d3c6334c921a..7dbf7b94e1ac 100644
--- a/src/shared/terminal-kitty-keyboard-mode-tracker.test.ts
+++ b/src/shared/terminal-kitty-keyboard-mode-tracker.test.ts
@@ -1,5 +1,7 @@
+import { Terminal } from '@xterm/headless'
 import { describe, expect, it } from 'vitest'
 import { TerminalKittyKeyboardModeTracker } from './terminal-kitty-keyboard-mode-tracker'
+import { CONFIRMED_SHELL_MODE_RESET } from './terminal-mode-reset-profiles'
 
 describe('TerminalKittyKeyboardModeTracker', () => {
   it('starts inactive and ignores non-kitty sequences', () => {
@@ -68,6 +70,33 @@ describe('TerminalKittyKeyboardModeTracker', () => {
     expect(tracker.flags).toBe(0)
   })
 
+  // Why: a confirmed-shell reset lands between live chunks in both records, so they must agree.
+  it('agrees with xterm when the confirmed-shell reset interrupts a split live sequence', async () => {
+    const term = new Terminal({ allowProposedApi: true, vtExtensions: { kittyKeyboard: true } })
+    const tracker = new TerminalKittyKeyboardModeTracker()
+    const replies: string[] = []
+    term.onData((data) => replies.push(data))
+    const feed = (data: string): Promise<void> => {
+      tracker.scan(data)
+      return new Promise((resolve) => term.write(data, resolve))
+    }
+    const xtermReport = async (): Promise<string> => {
+      replies.length = 0
+      await new Promise<void>((resolve) => term.write('\x1b[?u', resolve))
+      return replies.join('')
+    }
+
+    await feed('\x1b[>5u\x1b[?1049h\x1b[>3u\x1b[>')
+    await feed(CONFIRMED_SHELL_MODE_RESET)
+    await feed('1u')
+    expect(tracker.flags).toBe(0)
+    expect(await xtermReport()).toBe('\x1b[?0u')
+    await feed('\x1b[?1049l')
+    expect(tracker.flags).toBe(5)
+    expect(await xtermReport()).toBe('\x1b[?5u')
+    term.dispose()
+  })
+
   it('keeps per-screen flags across alternate-screen switches', () => {
     const tracker = new TerminalKittyKeyboardModeTracker()
     tracker.scan('\x1b[>1u')
@@ -315,4 +344,14 @@ describe('TerminalKittyKeyboardModeTracker', () => {
       expect(softReset.hasProvenBaseline).toBe(true)
     })
   })
+
+  // Why: xterm ignores CSI u while the protocol is withheld, so the mirror must stay at 0 too.
+  it('ignores kitty sequences and snapshot flags when the protocol is withheld', () => {
+    const tracker = new TerminalKittyKeyboardModeTracker({ kittyKeyboard: false })
+    tracker.scan('\x1b[>5u\x1b[=31u')
+    expect(tracker.flags).toBe(0)
+    tracker.resetForSnapshot()
+    tracker.restoreSnapshotFlags(31)
+    expect(tracker.flags).toBe(0)
+  })
 })
diff --git a/src/shared/terminal-kitty-keyboard-mode-tracker.ts b/src/shared/terminal-kitty-keyboard-mode-tracker.ts
index 032fc4ec991d..6b2b0e26f839 100644
--- a/src/shared/terminal-kitty-keyboard-mode-tracker.ts
+++ b/src/shared/terminal-kitty-keyboard-mode-tracker.ts
@@ -19,14 +19,13 @@ type KittyStackFrame = { flags: number; known: boolean }
  * DECSET/DECRST 47/1047/1049, the full reset on RIS, and the soft reset on
  * DECSTR (CSI ! p).
  *
- * Why a mirror instead of reading xterm's internal state: Orca defensively
- * wipes the renderer terminal's kitty flags at moments when the TUI may have
- * died (Ctrl+C interrupts, reattach resets) while the TUI is usually still
- * alive and expecting protocol-encoded input. This tracker is fed only by
- * application output, so it reflects what the *application* negotiated,
- * independent of renderer-side defensive writes. The daemon reuses it to
- * carry flags into snapshots (xterm's SerializeAddon does not serialize kitty
- * state).
+ * Why a mirror instead of reading xterm's internal state: xterm's public API
+ * exposes no kitty flags. The renderer scans application output as it queues
+ * it and every mode write of its own; wherever xterm may skip or discard
+ * scanned bytes (snapshot replays, abandoned restores) the renderer re-asserts
+ * the mirror's flags into xterm, so their active-screen flags converge.
+ * The daemon reuses it to carry flags into snapshots (xterm's SerializeAddon does
+ * not serialize kitty state).
  */
 export class TerminalKittyKeyboardModeTracker {
   private scanTail = ''
@@ -48,6 +47,12 @@ export class TerminalKittyKeyboardModeTracker {
   // one. Grounding flips on evidence only: an explicit fresh-PTY reset, a
   // proven snapshot restore, or scanned bytes that state flags absolutely.
   private baselineProven = false
+  private readonly kittyKeyboard: boolean
+
+  /** `kittyKeyboard: false` mirrors an xterm with the protocol withheld, which ignores `CSI u`. */
+  constructor(options: { kittyKeyboard?: boolean } = {}) {
+    this.kittyKeyboard = options.kittyKeyboard ?? true
+  }
 
   /**
    * Current effective kitty keyboard flags. `0` doubles as the conservative
@@ -128,7 +133,7 @@ export class TerminalKittyKeyboardModeTracker {
    */
   restoreSnapshotFlags(flags: number): void {
     const parsed = parseTerminalKittyKeyboardFlags(flags)
-    if (parsed === undefined) {
+    if (parsed === undefined || !this.kittyKeyboard) {
       return
     }
     this.currentFlags = parsed
@@ -183,7 +188,9 @@ export class TerminalKittyKeyboardModeTracker {
         this.applyScreenSwitch(match[1], match[2] === 'h')
         continue
       }
-      this.applyKittySequence(match[3], match[4] ?? '', replay)
+      if (this.kittyKeyboard) {
+        this.applyKittySequence(match[3], match[4] ?? '', replay)
+      }
     }
   }
 
diff --git a/src/shared/terminal-mode-reset-profiles.test.ts b/src/shared/terminal-mode-reset-profiles.test.ts
index d3de25ea4fe1..203d836a3f87 100644
--- a/src/shared/terminal-mode-reset-profiles.test.ts
+++ b/src/shared/terminal-mode-reset-profiles.test.ts
@@ -10,9 +10,13 @@ import {
   PROCESS_BOUNDARY_GROUND,
   RESET_GRAPHIC_RENDITION,
   RESET_MOUSE_REPORTING,
+  buildKittyKeyboardRestore,
   buildPostReplayLiveAgentReattachReset,
+  CONFIRMED_SHELL_MODE_RESET,
+  POST_REPLAY_DEAD_TUI_RESET,
   replayPayloadEndsWithCursorHidden
 } from './terminal-mode-reset-profiles'
+import { TerminalKittyKeyboardModeTracker } from './terminal-kitty-keyboard-mode-tracker'
 
 // Why literal expectations: consumers import these constants, so only a byte-level
 // assertion here can catch a profile silently losing a mode it is meant to clear.
@@ -31,7 +35,7 @@ describe('terminal mode reset profiles', () => {
 
   it('pins the daemon-reattach profile, which keeps bracketed paste', () => {
     expect(POST_REPLAY_REATTACH_RESET).toBe(
-      '\x1b[0m\x1b[0 q\x1b[<99u\x1b[=0u\x1b[?25h\x1b[?9l\x1b[?1000l\x1b[?1002l\x1b[?1003l\x1b[?1006l\x1b[?1016l\x1b[?1004l\x1b7'
+      '\x1b[0m\x1b[0 q\x1b[?25h\x1b[?9l\x1b[?1000l\x1b[?1002l\x1b[?1003l\x1b[?1006l\x1b[?1016l\x1b[?1004l\x1b7'
     )
     expect(POST_REPLAY_REATTACH_RESET).toContain(RESET_GRAPHIC_RENDITION)
     expect(POST_REPLAY_REATTACH_RESET).not.toContain('\x1b[?2004l')
@@ -41,9 +45,7 @@ describe('terminal mode reset profiles', () => {
   // so this profile can reach a plain shell, where armed focus reporting rings BEL on every pane
   // switch. Dropping it would also make this byte-identical to the live-agent profile.
   it('pins the live alternate-screen profile, which keeps mouse reporting but not focus', () => {
-    expect(POST_REPLAY_REATTACH_RESET_KEEP_MOUSE).toBe(
-      '\x1b[0 q\x1b[<99u\x1b[=0u\x1b[?25h\x1b[?1004l'
-    )
+    expect(POST_REPLAY_REATTACH_RESET_KEEP_MOUSE).toBe('\x1b[0 q\x1b[?25h\x1b[?1004l')
     expect(POST_REPLAY_REATTACH_RESET_KEEP_MOUSE).not.toContain(RESET_MOUSE_REPORTING)
     expect(POST_REPLAY_REATTACH_RESET_KEEP_MOUSE).not.toBe(POST_REPLAY_LIVE_AGENT_REATTACH_RESET)
   })
@@ -87,7 +89,7 @@ describe('terminal mode reset profiles', () => {
   // coverage asserts they were passed through unchanged — need a literal here.
   it('pins the live-snapshot and live-agent profiles', () => {
     expect(POST_REPLAY_LIVE_SNAPSHOT_RESET).toBe('\x1b[0 q\x1b[?25h\x1b[?1004l')
-    expect(POST_REPLAY_LIVE_AGENT_REATTACH_RESET).toBe('\x1b[0 q\x1b[<99u\x1b[=0u\x1b[?25h')
+    expect(POST_REPLAY_LIVE_AGENT_REATTACH_RESET).toBe('\x1b[0 q\x1b[?25h')
     expect(POST_REPLAY_LIVE_AGENT_SNAPSHOT_RESET).toBe('\x1b[0 q')
   })
 
@@ -116,4 +118,57 @@ describe('terminal mode reset profiles', () => {
       expect(buildPostReplayLiveAgentReattachReset('x\x1b[?25h')).toContain('\x1b[?25h')
     })
   })
+
+  // Why: a live reattach must keep the app's negotiated flags; the epilogue restores them instead.
+  it('keeps Kitty resets out of every live reattach profile', () => {
+    for (const profile of [
+      POST_REPLAY_REATTACH_RESET,
+      POST_REPLAY_REATTACH_RESET_KEEP_MOUSE,
+      POST_REPLAY_DEAD_TUI_RESET,
+      POST_REPLAY_LIVE_AGENT_REATTACH_RESET,
+      POST_REPLAY_LIVE_SNAPSHOT_RESET,
+      POST_REPLAY_LIVE_AGENT_SNAPSHOT_RESET,
+      buildPostReplayLiveAgentReattachReset('x\x1b[?25l')
+    ]) {
+      // oxlint-disable-next-line no-control-regex -- terminal escape sequences require control chars
+      expect(profile).not.toMatch(/\x1b\[[<=>][0-9;]*u/)
+    }
+    expect(CONFIRMED_SHELL_MODE_RESET).toBe(`${POST_REPLAY_REATTACH_RESET}\x1b[<99u\x1b[=0u`)
+  })
+
+  it('restores proven Kitty flags and only pops unproven ones', () => {
+    expect(buildKittyKeyboardRestore(5)).toBe('\x1b[<99u\x1b[=5u')
+    expect(buildKittyKeyboardRestore(undefined)).toBe('\x1b[<99u')
+  })
+
+  // Why: xterm pushes a relay-redelivered push again while the mirror applies it as a set, so
+  // without the pop-all the app's single pop would leave xterm on the stale frame.
+  it("brings xterm and the mirror to 0 on the app's pop after a redelivered push", async () => {
+    const term = new Terminal({ allowProposedApi: true, vtExtensions: { kittyKeyboard: true } })
+    const mirror = new TerminalKittyKeyboardModeTracker()
+    const replies: string[] = []
+    term.onData((data) => replies.push(data))
+    const write = (data: string): Promise<void> =>
+      new Promise((resolve) => term.write(data, resolve))
+    const xtermFlags = async (): Promise<string> => {
+      replies.length = 0
+      await write('\x1b[?u')
+      return replies.join('')
+    }
+    for (const redelivery of ['\x1b[>1u', '\x1b[>1u']) {
+      mirror.scanReplay(redelivery)
+      await write(redelivery)
+    }
+    const restore = buildKittyKeyboardRestore(mirror.snapshotFlags)
+    mirror.scan(restore)
+    await write(restore)
+    expect(mirror.flags).toBe(1)
+    expect(await xtermFlags()).toBe('\x1b[?1u')
+
+    mirror.scan('\x1b[<u')
+    await write('\x1b[<u')
+    expect(mirror.flags).toBe(0)
+    expect(await xtermFlags()).toBe('\x1b[?0u')
+    term.dispose()
+  })
 })
diff --git a/src/shared/terminal-mode-reset-profiles.ts b/src/shared/terminal-mode-reset-profiles.ts
index 50d6d3aa8e0b..a219c2d70d02 100644
--- a/src/shared/terminal-mode-reset-profiles.ts
+++ b/src/shared/terminal-mode-reset-profiles.ts
@@ -6,6 +6,16 @@
 // Why: SerializeAddon replays mode bits assuming reattach to a live TUI, but Orca restores against a fresh shell with none, so stale bits (e.g. focus reporting rings the bell on click) must be reset.
 export const RESET_TERMINAL_CURSOR_STYLE = '\x1b[0 q'
 export const RESET_KITTY_KEYBOARD_PROTOCOL = '\x1b[<99u\x1b[=0u'
+
+/**
+ * Re-asserts replayed Kitty flags. Pop-all first, so a push a replay
+ * redelivered into xterm's stack cannot resurface on the app's next pop.
+ * Unproven flags only pop, which lands on 0 without proving it.
+ */
+export function buildKittyKeyboardRestore(provenFlags: number | undefined): string {
+  return provenFlags === undefined ? '\x1b[<99u' : `\x1b[<99u\x1b[=${provenFlags}u`
+}
+
 // Why: abandoned byte-gap replay drains live chunks, so a dropped intensity reset must not style them (STA-4042).
 export const RESET_GRAPHIC_RENDITION = '\x1b[0m'
 // Last so a dead process cannot leave stale attributes in the DECSC register.
@@ -17,11 +27,15 @@ export const RESET_MOUSE_REPORTING =
 // Why: serialized panes can end with a live pen, but the following shell assumes default attributes.
 export const POST_REPLAY_MODE_RESET = `${RESET_GRAPHIC_RENDITION}${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}\x1b[?25h${RESET_MOUSE_REPORTING}\x1b[?1004l\x1b[?2004l${SAVE_GROUNDED_CURSOR}`
 
-// Why: same-session live replay; keep cursor/focus cleanup but preserve Kitty flags the running TUI relies on.
+// Why: same-session live replay; keep cursor/focus cleanup (the replay epilogue re-asserts Kitty flags).
 export const POST_REPLAY_LIVE_SNAPSHOT_RESET = `${RESET_TERMINAL_CURSOR_STYLE}\x1b[?25h\x1b[?1004l`
 
 // Why: the normal-buffer fallback can follow a dead TUI, so its stale pen and saved pen must not reach the surviving shell.
-export const POST_REPLAY_REATTACH_RESET = `${RESET_GRAPHIC_RENDITION}${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}\x1b[?25h${RESET_MOUSE_REPORTING}\x1b[?1004l${SAVE_GROUNDED_CURSOR}`
+// No Kitty reset in any reattach profile: the replay epilogue restores the host's flags instead.
+export const POST_REPLAY_REATTACH_RESET = `${RESET_GRAPHIC_RENDITION}${RESET_TERMINAL_CURSOR_STYLE}\x1b[?25h${RESET_MOUSE_REPORTING}\x1b[?1004l${SAVE_GROUNDED_CURSOR}`
+
+// Why: a foreground proof says the app is gone, so its Kitty flags go with its other modes.
+export const CONFIRMED_SHELL_MODE_RESET = `${POST_REPLAY_REATTACH_RESET}${RESET_KITTY_KEYBOARD_PROTOCOL}`
 
 // Why: a foreground shell proves an alternate-screen owner died without its
 // ?1049l cleanup; leave the renderer on the shell's normal buffer as well.
@@ -30,10 +44,10 @@ export const POST_REPLAY_DEAD_TUI_RESET = `\x1b[?1049l${POST_REPLAY_REATTACH_RES
 // Why: an alt-screen reattach replays the daemon's rehydrateSequences, which re-arm the live TUI's
 // mouse modes; wiping them one write later hands drags back to xterm's row selection (#8291).
 // Normal-buffer panes keep RESET_MOUSE_REPORTING so a dead TUI's stale modes never reach a shell (#7893).
-export const POST_REPLAY_REATTACH_RESET_KEEP_MOUSE = `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}\x1b[?25h\x1b[?1004l`
+export const POST_REPLAY_REATTACH_RESET_KEEP_MOUSE = `${RESET_TERMINAL_CURSOR_STYLE}\x1b[?25h\x1b[?1004l`
 
 // Why: a live agent owns focus reporting; resetting ?1004h suppresses the focus-in it needs to re-anchor its cursor (IME).
-export const POST_REPLAY_LIVE_AGENT_REATTACH_RESET = `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}\x1b[?25h`
+export const POST_REPLAY_LIVE_AGENT_REATTACH_RESET = `${RESET_TERMINAL_CURSOR_STYLE}\x1b[?25h`
 
 // Why: a live agent owns cursor/focus here; forcing ?25h/?1004l breaks a parked agent that only arms ?1004h at startup.
 export const POST_REPLAY_LIVE_AGENT_SNAPSHOT_RESET = RESET_TERMINAL_CURSOR_STYLE
@@ -134,6 +148,6 @@ export function replayPayloadEndsWithCursorHidden(payload: string): boolean {
 // Why: some agents hide the real cursor and draw their own, so preserve the payload's final visibility (pty-connection re-shows it if the agent was actually a dead TUI).
 export function buildPostReplayLiveAgentReattachReset(payload: string): string {
   return replayPayloadEndsWithCursorHidden(payload)
-    ? `${RESET_TERMINAL_CURSOR_STYLE}${RESET_KITTY_KEYBOARD_PROTOCOL}`
+    ? RESET_TERMINAL_CURSOR_STYLE
     : POST_REPLAY_LIVE_AGENT_REATTACH_RESET
 }
diff --git a/src/shared/terminal-mouse-encoding.test.ts b/src/shared/terminal-mouse-encoding.test.ts
new file mode 100644
index 000000000000..e9cf475e56e8
--- /dev/null
+++ b/src/shared/terminal-mouse-encoding.test.ts
@@ -0,0 +1,31 @@
+import { describe, expect, it } from 'vitest'
+import { Terminal } from '@xterm/xterm'
+import { readTerminalMouseEncoding } from './terminal-mouse-encoding'
+
+function write(terminal: Terminal, data: string): Promise<void> {
+  return new Promise((resolve) => terminal.write(data, () => resolve()))
+}
+
+describe('readTerminalMouseEncoding', () => {
+  it('reads the encoding from the real vendored renderer xterm build', async () => {
+    // Pinned on purpose: if an upgrade moves the private service, this must fail
+    // loudly — a silent 'default' would bring back X10 reports (#23818).
+    const terminal = new Terminal({ allowProposedApi: true })
+    expect(readTerminalMouseEncoding(terminal)).toBe('default')
+
+    await write(terminal, '\x1b[?1003h\x1b[?1006h')
+    expect(readTerminalMouseEncoding(terminal)).toBe('sgr')
+
+    await write(terminal, '\x1b[?1016h')
+    expect(readTerminalMouseEncoding(terminal)).toBe('sgr-pixels')
+
+    await write(terminal, '\x1bc')
+    expect(readTerminalMouseEncoding(terminal)).toBe('default')
+    terminal.dispose()
+  })
+
+  it('answers default when the private internals are missing', () => {
+    expect(readTerminalMouseEncoding({ cols: 80, rows: 24 })).toBe('default')
+    expect(readTerminalMouseEncoding({ cols: 80, rows: 24, _core: {} })).toBe('default')
+  })
+})
diff --git a/src/shared/terminal-mouse-encoding.ts b/src/shared/terminal-mouse-encoding.ts
new file mode 100644
index 000000000000..289b88ec1d2d
--- /dev/null
+++ b/src/shared/terminal-mouse-encoding.ts
@@ -0,0 +1,40 @@
+/** Mouse report encoding armed by DECSET 1006 (SGR) or 1016 (SGR pixels); independent of the tracking protocol. */
+export type TerminalMouseEncoding = 'default' | 'sgr' | 'sgr-pixels'
+
+/** Private xterm surface read below; optional because an xterm upgrade can move or drop it. */
+type TerminalWithMouseStateCore = {
+  // Why: required public members keep this from being a weak type, so xterm Terminals assign uncast.
+  readonly cols: number
+  readonly rows: number
+  _core?: { mouseStateService?: { activeEncoding?: unknown } }
+}
+
+/**
+ * Reads the encoding xterm itself parsed. Its public `modes` exposes the
+ * tracking protocol but not the encoding, and SerializeAddon omits it, so a
+ * restored pane otherwise emits legacy `ESC [ M` reports that a ConPTY host
+ * types into the app as text (#23818).
+ */
+export function readTerminalMouseEncoding(
+  terminal: TerminalWithMouseStateCore
+): TerminalMouseEncoding {
+  const encoding = terminal._core?.mouseStateService?.activeEncoding
+  if (encoding === 'SGR') {
+    return 'sgr'
+  }
+  if (encoding === 'SGR_PIXELS') {
+    return 'sgr-pixels'
+  }
+  return 'default'
+}
+
+export function buildMouseEncodingRestoreSequence(encoding: TerminalMouseEncoding): string {
+  switch (encoding) {
+    case 'sgr':
+      return '\x1b[?1006h'
+    case 'sgr-pixels':
+      return '\x1b[?1016h'
+    case 'default':
+      return ''
+  }
+}
diff --git a/src/shared/terminal-osc133-command-finished.ts b/src/shared/terminal-osc133-command-finished.ts
index 9468e1aaa5f6..f0a9831d029a 100644
--- a/src/shared/terminal-osc133-command-finished.ts
+++ b/src/shared/terminal-osc133-command-finished.ts
@@ -59,15 +59,19 @@ export type Osc133CommandFinishedScanner = {
 
 export function createOsc133CommandFinishedScanner(
   onCommandFinished: (bestEffortExitCode: number | null) => void,
-  /** OSC 133;C — the shell exec'd a command; the pane's foreground changed. */
-  onCommandStarted?: () => void
+  /**
+   * OSC 133;C — the shell exec'd a command; the pane's foreground changed.
+   * `endInChunk` is the index in the scanned chunk just past the sequence, where the command's own
+   * output begins.
+   */
+  onCommandStarted?: (endInChunk: number) => void
 ): Osc133CommandFinishedScanner {
   let carry = ''
 
-  const handleOsc133 = (payload: string): void => {
+  const handleOsc133 = (payload: string, endInChunk: number): void => {
     const [sequence, exitCode] = payload.split(';')
     if (sequence === 'C') {
-      onCommandStarted?.()
+      onCommandStarted?.(endInChunk)
       return
     }
     if (sequence === 'D') {
@@ -77,6 +81,8 @@ export function createOsc133CommandFinishedScanner(
 
   const scan = (data: string): void => {
     let combined = carry + data
+    // `combined` starts at this index in `data`; negative while it still holds the carry.
+    let combinedStartInChunk = -carry.length
     carry = ''
 
     while (combined.length > 0) {
@@ -97,8 +103,13 @@ export function createOsc133CommandFinishedScanner(
         return
       }
 
-      handleOsc133(combined.slice(payloadStart, terminator.index))
-      combined = combined.slice(terminator.index + terminator.length)
+      const sequenceEnd = terminator.index + terminator.length
+      handleOsc133(
+        combined.slice(payloadStart, terminator.index),
+        combinedStartInChunk + sequenceEnd
+      )
+      combined = combined.slice(sequenceEnd)
+      combinedStartInChunk += sequenceEnd
     }
   }
 
diff --git a/src/shared/terminal-partial-escape-tail.ts b/src/shared/terminal-partial-escape-tail.ts
index 53cfd3c17b4c..5c735dd86ec5 100644
--- a/src/shared/terminal-partial-escape-tail.ts
+++ b/src/shared/terminal-partial-escape-tail.ts
@@ -155,8 +155,8 @@ export function advancePartialEscapeTail(pendingTail: string, chunk: string): st
   // Why the pre-filter: `extractPartialEscapeTail` only leaves `ground` on an ESC byte, so with
   // no pending tail and no ESC in the chunk the answer is always ''. Taking it here skips both
   // the full-chunk concat and the per-code-unit walk on ESC-free output (build logs, `cat`,
-  // piped tool output) — the same gate `TerminalOscCwdTitleScanner.scan` and
-  // `TerminalMouseModeMirror.scan` already apply on the very same ingest path.
+  // piped tool output) — the same gate `TerminalOscCwdTitleScanner.scan` already
+  // applies on the very same ingest path.
   if (pendingTail.length === 0 && !chunk.includes('\x1b')) {
     return ''
   }
diff --git a/src/shared/terminal-restore-parity-fixture.ts b/src/shared/terminal-restore-parity-fixture.ts
index d3d4e0bf2b08..10fb0cd6e583 100644
--- a/src/shared/terminal-restore-parity-fixture.ts
+++ b/src/shared/terminal-restore-parity-fixture.ts
@@ -255,8 +255,8 @@ export function buildParityMainBufferSnapshot(
   if (!alternateScreen && terminal.modes.applicationCursorKeysMode) {
     seqs.push('\x1b[?1h')
   }
-  // Mouse-mode rehydrate omitted: TerminalMouseModeMirror is main-only and
-  // mouse reporting is input encoding — it cannot alter rendered output.
+  // Mouse-mode rehydrate omitted: mouse reporting is input encoding — it
+  // cannot alter rendered output.
   const snapshot: ParityMainSnapshot = {
     data: seqs.join('') + snapshotAnsi,
     cols: terminal.cols,
diff --git a/src/shared/terminal-serialize-absolute-cursor.ts b/src/shared/terminal-serialize-absolute-cursor.ts
index ee2ac371296b..fae85b322936 100644
--- a/src/shared/terminal-serialize-absolute-cursor.ts
+++ b/src/shared/terminal-serialize-absolute-cursor.ts
@@ -6,7 +6,13 @@
 // snapshot that will be replayed into another terminal must therefore end
 // with an absolute CUP derived from the SOURCE terminal's authoritative
 // cursor position. Snapshot producers that also need the VT100 DECSC
-// saved-cursor register carried across the restore compose it here too.
+// saved-cursor register carried across the restore compose it here too, and
+// the mouse encoding the addon's mode trailer omits rides beside it.
+
+import {
+  buildMouseEncodingRestoreSequence,
+  readTerminalMouseEncoding
+} from './terminal-mouse-encoding'
 
 type SerializeCursorTerminal = {
   cols: number
@@ -81,7 +87,20 @@ export function serializeWithAbsoluteCursor<TOpts>(
   if (serialized.length === 0) {
     return serialized
   }
-  return `${serialized}${buildAbsoluteCursorRestoreSequence(terminal, savedCursor)}`
+  // Why: the addon re-arms mouse tracking but not its encoding; restoring one without the other makes X10 reports.
+  const mouseEncodingRestore = serializesModes(opts)
+    ? buildMouseEncodingRestoreSequence(readTerminalMouseEncoding(terminal))
+    : ''
+  return `${serialized}${mouseEncodingRestore}${buildAbsoluteCursorRestoreSequence(terminal, savedCursor)}`
+}
+
+function serializesModes(opts: unknown): boolean {
+  return !(
+    typeof opts === 'object' &&
+    opts !== null &&
+    'excludeModes' in opts &&
+    opts.excludeModes === true
+  )
 }
 
 /** Cursor state appended after serialized modes; safe to replay without the frame body. */
diff --git a/src/shared/terminal-session-state-save-failure.test.ts b/src/shared/terminal-session-state-save-failure.test.ts
new file mode 100644
index 000000000000..aee76908a626
--- /dev/null
+++ b/src/shared/terminal-session-state-save-failure.test.ts
@@ -0,0 +1,44 @@
+import { describe, expect, it } from 'vitest'
+import {
+  createTerminalSessionStateSaveFailureMessage,
+  isTerminalSessionStateSaveFailure,
+  isTerminalSessionStorageCapacityFailure
+} from './terminal-session-state-save-failure'
+
+describe('terminal save failure classification', () => {
+  it.each(['ENOSPC', 'EDQUOT', 'SQLITE_FULL'])('recognizes %s through a wrapper', (code) => {
+    const message = createTerminalSessionStateSaveFailureMessage(
+      new Error('write failed', { cause: Object.assign(new Error('failure'), { code }) })
+    )
+    expect(isTerminalSessionStorageCapacityFailure(message)).toBe(true)
+    expect(isTerminalSessionStateSaveFailure(message)).toBe(true)
+  })
+
+  it.each(['EACCES', 'EPERM', 'EIO', 'SQLITE_BUSY', 'profile-state-writer-exit'])(
+    'does not diagnose %s as exhausted storage',
+    (code) => {
+      const message = createTerminalSessionStateSaveFailureMessage({ code, message: 'disk full' })
+      expect(isTerminalSessionStateSaveFailure(message)).toBe(true)
+      expect(isTerminalSessionStorageCapacityFailure(message)).toBe(false)
+    }
+  )
+
+  it('treats legacy and unknown host errors as unclassified', () => {
+    for (const message of [
+      'ORCA_TERMINAL_SESSION_STATE_SAVE_FAILED: local storage is unavailable.',
+      'Failed to save terminal session state',
+      createTerminalSessionStateSaveFailureMessage(new Error('disk full'))
+    ]) {
+      expect(isTerminalSessionStateSaveFailure(message)).toBe(true)
+      expect(isTerminalSessionStorageCapacityFailure(message)).toBe(false)
+    }
+  })
+
+  it('handles cyclic causes', () => {
+    const error = new Error('cycle')
+    error.cause = error
+    expect(
+      isTerminalSessionStorageCapacityFailure(createTerminalSessionStateSaveFailureMessage(error))
+    ).toBe(false)
+  })
+})
diff --git a/src/shared/terminal-session-state-save-failure.ts b/src/shared/terminal-session-state-save-failure.ts
index 309a98b653aa..c286cd568bd1 100644
--- a/src/shared/terminal-session-state-save-failure.ts
+++ b/src/shared/terminal-session-state-save-failure.ts
@@ -1,10 +1,18 @@
+import { storageCapacityErrorCode } from './storage-capacity-error'
+
 export const TERMINAL_SESSION_STATE_SAVE_FAILED_CODE = 'ORCA_TERMINAL_SESSION_STATE_SAVE_FAILED'
 
 export const TERMINAL_SESSION_STATE_SAVE_FAILED_MESSAGE =
-  'Orca could not save this terminal session because local storage is unavailable.'
+  'Orca could not save this terminal session.'
+const CAPACITY_MARKER = '[storage-capacity-exhausted]'
+
+export function createTerminalSessionStateSaveFailureMessage(error?: unknown): string {
+  const capacity = storageCapacityErrorCode(error) ? ` ${CAPACITY_MARKER}` : ''
+  return `${TERMINAL_SESSION_STATE_SAVE_FAILED_CODE}: ${TERMINAL_SESSION_STATE_SAVE_FAILED_MESSAGE}${capacity}`
+}
 
-export function createTerminalSessionStateSaveFailureMessage(): string {
-  return `${TERMINAL_SESSION_STATE_SAVE_FAILED_CODE}: ${TERMINAL_SESSION_STATE_SAVE_FAILED_MESSAGE}`
+export function isTerminalSessionStorageCapacityFailure(message: string): boolean {
+  return isTerminalSessionStateSaveFailure(message) && message.includes(CAPACITY_MARKER)
 }
 
 export function isTerminalSessionStateSaveFailure(message: string): boolean {
diff --git a/src/shared/terminal-spawn-error-copy.ts b/src/shared/terminal-spawn-error-copy.ts
new file mode 100644
index 000000000000..872c3c76b64c
--- /dev/null
+++ b/src/shared/terminal-spawn-error-copy.ts
@@ -0,0 +1,25 @@
+// Host-published English copy; the renderer matches it to show a translation (#9194).
+export const PTY_ALLOCATION_HINT =
+  'Your system cannot allocate any more pty devices. Close some terminals you are not using, in Orca or another program, then try again.'
+
+export const TERMINAL_PROCESS_LIMIT_HINT =
+  'Your system cannot start another terminal process. Close unused terminals or quit unused processes, then try again.'
+
+// Older hosts still publish these multi-line forms.
+export const LEGACY_PTY_ALLOCATION_HINT = [
+  'Your system cannot allocate any more pty devices.',
+  '',
+  'Orca requires a pty device to launch a new terminal. This error is usually due to having too many terminal windows or terminal sessions open, either in Orca or another program.',
+  '',
+  'Free up some pty devices and try again.'
+].join('\n')
+
+export const LEGACY_TERMINAL_PROCESS_LIMIT_HINT = [
+  'Your system cannot start another terminal process.',
+  '',
+  'This is usually due to having too many terminal sessions or other processes running.',
+  '',
+  'Close unused terminals or quit unused processes and try again.'
+].join('\n')
+
+export const TERMINAL_SPAWN_ISSUE_REQUEST = 'If this persists, please file an issue.'
diff --git a/src/shared/terminal-surface-close-target.test.ts b/src/shared/terminal-surface-close-target.test.ts
new file mode 100644
index 000000000000..54613ca879ba
--- /dev/null
+++ b/src/shared/terminal-surface-close-target.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, it } from 'vitest'
+import { parseTerminalSurfaceCloseTarget } from './terminal-surface-close-target'
+
+describe('parseTerminalSurfaceCloseTarget', () => {
+  it('keeps a well-formed tab or pane target', () => {
+    expect(parseTerminalSurfaceCloseTarget({ kind: 'tab', tabId: 't', leafId: 'x' })).toEqual({
+      kind: 'tab',
+      tabId: 't'
+    })
+    expect(parseTerminalSurfaceCloseTarget({ kind: 'pane', tabId: 't', leafId: 'l' })).toEqual({
+      kind: 'pane',
+      tabId: 't',
+      leafId: 'l'
+    })
+  })
+
+  it.each([
+    null,
+    'tab',
+    { tabId: 't' },
+    { kind: 'tab', tabId: '' },
+    { kind: 'pane', tabId: 't' },
+    { kind: 'pane', tabId: 't', leafId: '' },
+    { kind: 'leaf', tabId: 't', leafId: 'l' }
+  ])('rejects %j', (value) => {
+    expect(parseTerminalSurfaceCloseTarget(value)).toBeNull()
+  })
+})
diff --git a/src/shared/terminal-surface-close-target.ts b/src/shared/terminal-surface-close-target.ts
new file mode 100644
index 000000000000..d2b4d5fa6d2c
--- /dev/null
+++ b/src/shared/terminal-surface-close-target.ts
@@ -0,0 +1,28 @@
+/** What an explicit terminal close removes. A pane close never stands in for its tab. */
+export type TerminalSurfaceCloseTarget =
+  | { kind: 'tab'; tabId: string }
+  | { kind: 'pane'; tabId: string; leafId: string }
+
+export type TerminalPaneCloseTarget = Extract<TerminalSurfaceCloseTarget, { kind: 'pane' }>
+
+function isNonEmptyString(value: unknown): value is string {
+  return typeof value === 'string' && value.length > 0
+}
+
+/** Validates a close target that crossed a process boundary; anything malformed is rejected. */
+export function parseTerminalSurfaceCloseTarget(value: unknown): TerminalSurfaceCloseTarget | null {
+  if (typeof value !== 'object' || value === null || !('kind' in value) || !('tabId' in value)) {
+    return null
+  }
+  const { kind, tabId } = value
+  if (!isNonEmptyString(tabId)) {
+    return null
+  }
+  if (kind === 'tab') {
+    return { kind, tabId }
+  }
+  if (kind !== 'pane' || !('leafId' in value) || !isNonEmptyString(value.leafId)) {
+    return null
+  }
+  return { kind, tabId, leafId: value.leafId }
+}
diff --git a/src/shared/terminal-title-agent-type.ts b/src/shared/terminal-title-agent-type.ts
index 8e8f8b124055..045b0aeceece 100644
--- a/src/shared/terminal-title-agent-type.ts
+++ b/src/shared/terminal-title-agent-type.ts
@@ -1,10 +1,17 @@
+import { isQoderTerminalTitle } from './qoder-terminal-title'
 import {
   AGY_AGENT_NAME_RE,
   DROID_AGENT_NAME_RE,
   HERMES_AGENT_NAME_RE,
   titleHasAgentName
 } from './agent-name-token-match'
-import { containsAgentSpinnerGlyph, isCursorAgentTitle } from './agent-title-core'
+import {
+  containsAgentSpinnerGlyph,
+  isCursorAgentTitle,
+  isDshTerminalTitle
+} from './agent-title-core'
+
+export { DSH_WHALE, isDshTerminalTitle } from './agent-title-core'
 import { isOpenCodeNativeTitle } from './opencode-terminal-title'
 import {
   getPiCompatibleSyntheticAgentLabel,
@@ -34,6 +41,14 @@ export function containsBrailleSpinner(title: string): boolean {
 }
 
 export function isGeminiTerminalTitle(title: string): boolean {
+  // Why: DSH-TUI's idle prefix is `✦`, Gemini's working glyph. The whale is decisive
+  // and is checked first so a resting DSH pane never reads as a working Gemini.
+  if (isQoderTerminalTitle(title)) {
+    return false
+  }
+  if (isDshTerminalTitle(title)) {
+    return false
+  }
   // Why: Gemini OSC glyphs are stronger evidence than any cwd/session text.
   if (
     title.includes(GEMINI_PERMISSION) ||
@@ -90,6 +105,11 @@ function computeIsClaudeAgent(title: string): boolean {
   if (!title || isClaudeManagementTitle(title) || isOpenCodeNativeTitle(title)) {
     return false
   }
+  // Why: DSH's working title is `⠂ 🐋 …`/`⠐ 🐋 …`, and the braille branch below would
+  // otherwise claim every frame of it for Claude.
+  if (isDshTerminalTitle(title)) {
+    return false
+  }
   const lower = title.toLowerCase()
 
   // Why: Claude Code titles are prefixed with status indicators (✳, ". ", "* ",
@@ -150,6 +170,13 @@ function computeAgentLabel(title: string): string | null {
   ) {
     return 'Claude Code'
   }
+  // Why before Gemini: see isDshTerminalTitle — the two share the `✦` glyph.
+  if (isDshTerminalTitle(title)) {
+    return 'DeepSeek Harness'
+  }
+  if (isQoderTerminalTitle(title)) {
+    return 'Qoder CLI'
+  }
   if (isGeminiTerminalTitle(title)) {
     return 'Gemini CLI'
   }
@@ -226,9 +253,11 @@ export const getAgentLabel: (title: string) => string | null =
   memoizeTitleClassification(computeAgentLabel)
 
 const TITLE_LABEL_TO_AGENT: Partial<Record<string, TuiAgent>> = {
+  'DeepSeek Harness': 'dsh',
   'Claude Code': 'claude',
   OpenClaude: 'openclaude',
   Codex: 'codex',
+  'Qoder CLI': 'qoder',
   'Gemini CLI': 'gemini',
   'GitHub Copilot': 'copilot',
   Grok: 'grok',
diff --git a/src/shared/text-search-glob-patterns.test.ts b/src/shared/text-search-glob-patterns.test.ts
new file mode 100644
index 000000000000..0bd96723a9d1
--- /dev/null
+++ b/src/shared/text-search-glob-patterns.test.ts
@@ -0,0 +1,205 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { runProcess } from './child-process/run-process'
+import { splitSearchGlobPatterns } from './text-search-glob-patterns'
+import {
+  buildGitGrepArgs,
+  buildRgArgs,
+  createAccumulator,
+  finalize,
+  ingestRgJsonLine
+} from './text-search'
+
+describe('compound search globs', () => {
+  it.each([
+    ['', []],
+    [' , *.ts,, *.md, ', ['*.ts', '*.md']],
+    ['}.ts, *.md', ['}.ts', '*.md']],
+    ['*.{ts,tsx}, *.md', ['*.{ts,tsx}', '*.md']],
+    ['{src,{lib,test}}/**, *.md', ['{src,{lib,test}}/**', '*.md']],
+    ['*[a,b].ts, *.md', ['*[a,b].ts', '*.md']],
+    ['[{},].ts, *.md', ['[{},].ts', '*.md']],
+    ['[]a,b].ts, *.md', ['[]a,b].ts', '*.md']],
+    ['[!]a,b].ts, *.md', ['[!]a,b].ts', '*.md']],
+    ['[^]a,b].ts, *.md', ['[^]a,b].ts', '*.md']],
+    ['[[:alpha:],].ts, *.md', ['[[:alpha:],].ts', '*.md']],
+    ['[a\\],b].ts, *.md', ['[a\\],b].ts', '*.md']],
+    ['foo\\,bar/**, *.ts', ['foo\\,bar/**', '*.ts']],
+    ['\\{a,b\\}, *.ts', ['\\{a', 'b\\}', '*.ts']],
+    ['\\[a,b\\], *.ts', ['\\[a', 'b\\]', '*.ts']],
+    ['src\\', ['src\\']],
+    ['*.{ts,tsx', ['*.{ts,tsx']],
+    ['[a,b', ['[a,b']]
+  ])('preserves grouped and escaped commas in %s', (input, expected) => {
+    expect(splitSearchGlobPatterns(input, 'git')).toEqual(expected)
+  })
+
+  it('scans deeply nested groups without recursion or expanding alternatives', () => {
+    const pattern = `${'{'.repeat(20_000)}a,b${'}'.repeat(20_000)}`
+    expect(splitSearchGlobPatterns(`${pattern}, *.md`)).toEqual([pattern, '*.md'])
+  })
+})
+
+describe('file search with real search engines', () => {
+  let root: string
+
+  beforeAll(async () => {
+    root = await mkdtemp(join(tmpdir(), 'orca-search-globs-'))
+    for (const file of ['a.ts', 'b.tsx', 'c.md', ',.ts']) {
+      await writeFile(join(root, file), 'needle\n')
+    }
+    const initialized = await runProcess({ program: 'git', args: ['init'], cwd: root })
+    expect(initialized.code).toBe(0)
+  })
+
+  afterAll(async () => {
+    if (root) {
+      await rm(root, { recursive: true, force: true })
+    }
+  })
+
+  it.each([
+    [{ includePattern: '*.{ts,tsx}' }, [',.ts', 'a.ts', 'b.tsx']],
+    [{ includePattern: '[a,b].ts, *.md' }, [',.ts', 'a.ts', 'c.md']],
+    [{ excludePattern: '*.{ts,tsx}' }, ['c.md']],
+    [{ includePattern: '[]a,b].ts, *.md' }, [',.ts', 'a.ts', 'c.md']],
+    [{ excludePattern: '[a,b].ts' }, ['b.tsx', 'c.md']],
+    [{ includePattern: '*.ts, *.tsx', excludePattern: '[a,b].ts' }, ['b.tsx']]
+  ])('matches files with ripgrep using %j', async (options, expected) => {
+    const { rgPath } = await import('@vscode/ripgrep-universal')
+    const result = await runProcess({
+      program: rgPath,
+      args: buildRgArgs('needle', root, options),
+      cwd: root
+    })
+    expect(result.stderr).toBe('')
+    expect(result.code).toBe(0)
+    const accumulator = createAccumulator()
+    for (const line of result.stdout.split('\n')) {
+      ingestRgJsonLine(line, root, accumulator, 100)
+    }
+    expect(
+      finalize(accumulator)
+        .files.map((file) => file.relativePath)
+        .sort()
+    ).toEqual(expected)
+  })
+
+  it.each(['*.{ts,tsx', '[a,b'])('leaves invalid %s for ripgrep to reject', async (pattern) => {
+    const { rgPath } = await import('@vscode/ripgrep-universal')
+    for (const options of [{ includePattern: pattern }, { excludePattern: pattern }]) {
+      const result = await runProcess({
+        program: rgPath,
+        args: buildRgArgs('needle', root, options),
+        cwd: root
+      })
+      expect(result.code).toBe(2)
+      expect(result.stderr).toContain('error parsing glob')
+      expect(result.stderr).toContain(pattern)
+    }
+  })
+
+  it('keeps Git brace syntax literal instead of expanding it', async () => {
+    const result = await runProcess({
+      program: 'git',
+      args: buildGitGrepArgs('needle', { includePattern: '*.{ts,tsx}' }),
+      cwd: root
+    })
+    expect(result.code).toBe(1)
+    expect(result.stdout).toBe('')
+    expect(result.stderr).toBe('')
+  })
+
+  it('preserves character classes in Git exclusions', async () => {
+    const result = await runProcess({
+      program: 'git',
+      args: buildGitGrepArgs('needle', { excludePattern: '[[:alpha:],].ts' }),
+      cwd: root
+    })
+    expect(result.code).toBe(0)
+    expect(result.stdout).toContain('b.tsx\0')
+    expect(result.stdout).toContain('c.md\0')
+    expect(result.stdout).not.toContain('a.ts\0')
+    expect(result.stdout).not.toContain(',.ts\0')
+  })
+
+  it.each(['[a,b].ts', '[[:alpha:],].ts'])(
+    'preserves %s in the Git fallback too',
+    async (includePattern) => {
+      const result = await runProcess({
+        program: 'git',
+        args: buildGitGrepArgs('needle', { includePattern }),
+        cwd: root
+      })
+      expect(result.code).toBe(0)
+      expect(result.stdout).toContain('a.ts\0')
+      expect(result.stdout).toContain(',.ts\0')
+      expect(result.stdout).not.toContain('b.tsx\0')
+      expect(result.stdout).not.toContain('c.md\0')
+    }
+  )
+})
+
+describe('engine-specific character classes', () => {
+  let root: string
+  const files = [',.ts', '[.ts', '].ts', 'a.ts', 'a,b].ts', 'b.tsx', 'c.md']
+
+  beforeAll(async () => {
+    root = await mkdtemp(join(tmpdir(), 'orca-search-class-syntax-'))
+    for (const file of files) {
+      await writeFile(join(root, file), 'needle\n')
+    }
+    expect((await runProcess({ program: 'git', args: ['init'], cwd: root })).code).toBe(0)
+  })
+
+  afterAll(async () => {
+    if (root) {
+      await rm(root, { recursive: true, force: true })
+    }
+  })
+
+  it.each([
+    ['rg', '[a\\].ts, *.md', ['a.ts', 'c.md']],
+    ['rg', '[[:].ts, *.md', ['[.ts', 'c.md']],
+    ['git', '[[:].ts, *.md', ['[.ts', 'c.md']],
+    ['git', '[a\\],b].ts, *.md', [',.ts', '].ts', 'a.ts', 'c.md']],
+    ['git', '[[:alpha:],].ts, *.md', [',.ts', 'a.ts', 'c.md']],
+    ['rg', '[[:alpha:], *.md', ['c.md']]
+  ] as const)(
+    'respects %s syntax in %s for includes and excludes',
+    async (engine, pattern, matches) => {
+      const { rgPath } = await import('@vscode/ripgrep-universal')
+      for (const exclude of [false, true]) {
+        const options = exclude ? { excludePattern: pattern } : { includePattern: pattern }
+        const result = await runProcess({
+          program: engine === 'rg' ? rgPath : 'git',
+          args:
+            engine === 'rg'
+              ? buildRgArgs('needle', root, options)
+              : buildGitGrepArgs('needle', options),
+          cwd: root
+        })
+        expect(result.code).toBe(0)
+        expect(result.stderr).toBe('')
+        let actual: string[]
+        if (engine === 'rg') {
+          const accumulator = createAccumulator()
+          for (const line of result.stdout.split('\n')) {
+            ingestRgJsonLine(line, root, accumulator, 100)
+          }
+          actual = finalize(accumulator).files.map((file) => file.relativePath)
+        } else {
+          actual = result.stdout
+            .trim()
+            .split('\n')
+            .map((line) => line.split('\0')[0])
+        }
+        const selected = new Set<string>(matches)
+        const expected = exclude ? files.filter((file) => !selected.has(file)) : [...matches]
+        expect(actual.sort()).toEqual(expected.sort())
+      }
+    }
+  )
+})
diff --git a/src/shared/text-search-glob-patterns.ts b/src/shared/text-search-glob-patterns.ts
index 5e1e9487a365..b8d511f072dd 100644
--- a/src/shared/text-search-glob-patterns.ts
+++ b/src/shared/text-search-glob-patterns.ts
@@ -1,18 +1,47 @@
-export function splitSearchGlobPatterns(patterns: string): string[] {
+/** Keeps grouped and escaped commas inside globs so search engines receive complete patterns. */
+export function splitSearchGlobPatterns(patterns: string, engine: 'rg' | 'git' = 'rg'): string[] {
   const out: string[] = []
   let current = ''
   let escaping = false
-  for (const ch of patterns) {
+  let braceDepth = 0
+  let characterClassContentStart = -1
+  let posixClassStart = -1
+  for (let index = 0; index < patterns.length; index += 1) {
+    const ch = patterns[index]
     if (escaping) {
       current += `\\${ch}`
       escaping = false
       continue
     }
-    if (ch === '\\') {
+    // Ripgrep treats backslashes literally inside classes; Git uses them as escapes.
+    if (ch === '\\' && (characterClassContentStart === -1 || engine === 'git')) {
       escaping = true
       continue
     }
-    if (ch === ',') {
+    if (characterClassContentStart !== -1) {
+      // A leading ']' (also after negation) is a member, not the end of the class.
+      if (posixClassStart !== -1) {
+        if (ch === ']') {
+          // An incomplete POSIX opener can just be literal '[' and ':' members.
+          if (patterns[index - 1] !== ':' || index <= posixClassStart + 3) {
+            characterClassContentStart = -1
+          }
+          posixClassStart = -1
+        }
+      } else if (engine === 'git' && ch === '[' && patterns[index + 1] === ':') {
+        posixClassStart = index
+      } else if (ch === ']' && index > characterClassContentStart) {
+        characterClassContentStart = -1
+      }
+    } else if (ch === '[') {
+      const next = patterns[index + 1]
+      characterClassContentStart = index + (next === '!' || next === '^' ? 2 : 1)
+    } else if (ch === '{') {
+      braceDepth += 1
+    } else if (ch === '}') {
+      braceDepth = Math.max(0, braceDepth - 1)
+    }
+    if (ch === ',' && braceDepth === 0 && characterClassContentStart === -1) {
       const trimmed = current.trim()
       if (trimmed) {
         out.push(trimmed)
diff --git a/src/shared/text-search.ts b/src/shared/text-search.ts
index 8d5972ffabdf..7bb54243c4dc 100644
--- a/src/shared/text-search.ts
+++ b/src/shared/text-search.ts
@@ -75,12 +75,12 @@ export function buildRgArgs(query: string, target: string, opts: SearchOptionsLi
     args.push('--fixed-strings')
   }
   if (opts.includePattern) {
-    for (const pat of splitSearchGlobPatterns(opts.includePattern)) {
+    for (const pat of splitSearchGlobPatterns(opts.includePattern, 'rg')) {
       args.push('--glob', pat)
     }
   }
   if (opts.excludePattern) {
-    for (const pat of splitSearchGlobPatterns(opts.excludePattern)) {
+    for (const pat of splitSearchGlobPatterns(opts.excludePattern, 'rg')) {
       args.push('--glob', `!${pat}`)
     }
   }
@@ -197,7 +197,7 @@ export function buildGitGrepArgs(query: string, opts: SearchOptionsLike): string
   let hasPathspecs = false
   let hasIncludePathspecs = false
   if (opts.includePattern) {
-    for (const pat of splitSearchGlobPatterns(opts.includePattern)) {
+    for (const pat of splitSearchGlobPatterns(opts.includePattern, 'git')) {
       const pathspecs = toGitGlobPathspecs(pat)
       gitArgs.push(...pathspecs)
       hasPathspecs ||= pathspecs.length > 0
@@ -205,7 +205,7 @@ export function buildGitGrepArgs(query: string, opts: SearchOptionsLike): string
     }
   }
   if (opts.excludePattern) {
-    for (const pat of splitSearchGlobPatterns(opts.excludePattern)) {
+    for (const pat of splitSearchGlobPatterns(opts.excludePattern, 'git')) {
       const pathspecs = toGitGlobPathspecs(pat, true)
       gitArgs.push(...pathspecs)
       hasPathspecs ||= pathspecs.length > 0
diff --git a/src/shared/tui-agent-config.ts b/src/shared/tui-agent-config.ts
index 55082bc24704..27cda1d19796 100644
--- a/src/shared/tui-agent-config.ts
+++ b/src/shared/tui-agent-config.ts
@@ -14,6 +14,7 @@ export type DraftPasteReadySignal =
   | 'codex-composer-prompt'
   | 'render-cursor-after-bracketed-paste'
   | 'grok-composer-prompt'
+  | 'dsh-composer-prompt'
   | 'zcode-composer-prompt'
 
 export type TuiAgentDetectionRuntime = NodeJS.Platform | 'wsl'
@@ -40,7 +41,7 @@ export type TuiAgentConfig = {
   /** Claude Code follows pasted text only where the user's typed words ask, so dispatch briefs need a typed lead line. */
   pasteNeedsTypedRequest?: boolean
   /** Pre-write a trust artifact so the agent's first-launch "trust this folder?" menu doesn't consume the bracketed paste (see agent-trust-presets.ts). */
-  preflightTrust?: 'cursor' | 'copilot' | 'codex' | 'antigravity'
+  preflightTrust?: 'cursor' | 'copilot' | 'codex' | 'antigravity' | 'qoder'
   /** Agent-specific signal that the composer is ready for paste, stronger than the default quiet-render window. */
   draftPasteReadySignal?: DraftPasteReadySignal
   /** Hard deadline for the agent's composer readiness signal. */
@@ -96,6 +97,11 @@ const TUI_AGENT_CONFIG_SOURCE: Record<TuiAgent, TuiAgentConfigSource> = {
     promptInjectionMode: 'stdin-after-start',
     pasteNeedsTypedRequest: true
   },
+  codebuddy: {
+    detectCmd: 'codebuddy',
+    detectCmdAliases: ['cbc'],
+    promptInjectionMode: 'argv'
+  },
   openclaude: {
     detectCmd: 'openclaude',
     promptInjectionMode: 'argv',
@@ -147,7 +153,6 @@ const TUI_AGENT_CONFIG_SOURCE: Record<TuiAgent, TuiAgentConfigSource> = {
     detectCmd: 'opencode2',
     // The private server inherits this pane's hook endpoint and identity.
     launchCmd: 'opencode2 --standalone',
-    expectedProcess: 'opencode2',
     promptInjectionMode: 'flag-prompt',
     draftPasteReadySignal: 'render-cursor-after-bracketed-paste',
     draftPasteReadyTimeoutMs: 20_000
@@ -183,6 +188,11 @@ const TUI_AGENT_CONFIG_SOURCE: Record<TuiAgent, TuiAgentConfigSource> = {
     // Why: Prime Agent embeds Pi's TUI and decodes CSI-u the same way (see pi above).
     windowsShiftEnterEncoding: 'csi-u'
   },
+  qoder: {
+    detectCmd: 'qodercli',
+    promptInjectionMode: 'flag-prompt-interactive',
+    preflightTrust: 'qoder'
+  },
   gemini: {
     detectCmd: 'gemini',
     promptInjectionMode: 'flag-prompt-interactive'
@@ -235,6 +245,10 @@ const TUI_AGENT_CONFIG_SOURCE: Record<TuiAgent, TuiAgentConfigSource> = {
     detectCmd: 'cline',
     promptInjectionMode: 'stdin-after-start'
   },
+  freebuff: {
+    detectCmd: 'freebuff',
+    promptInjectionMode: 'stdin-after-start'
+  },
   codebuff: {
     detectCmd: 'codebuff',
     promptInjectionMode: 'stdin-after-start'
@@ -322,6 +336,24 @@ const TUI_AGENT_CONFIG_SOURCE: Record<TuiAgent, TuiAgentConfigSource> = {
     // Muse 1.3 treats subcommand-shaped prompts as commands even after `--`.
     promptInjectionMode: 'stdin-after-start'
   },
+  dsh: {
+    // Why: DeepSeek Harness publishes one binary (`dsh`) that boots a profile, and only the
+    // `dsh-tui` profile paints a composer. `dsh-tui` (alias `dst`) is the launcher that
+    // selects it, so detect that and require `dsh` too — the launcher delegates to it and
+    // fails without it.
+    detectCmd: 'dsh-tui',
+    detectCmdAliases: ['dst'],
+    detectRequiredCommands: ['dsh'],
+    // Why: the launcher re-execs `dsh --profile dsh-tui`, so the pane's foreground process
+    // is `dsh`, never `dsh-tui`. Readiness and follow-up delivery key off this name.
+    expectedProcess: 'dsh',
+    // Why: the terminal app parses only `--resume`/`--continue` and a workspace target; it
+    // has no prompt flag, so the first prompt is pasted into the composer after startup.
+    promptInjectionMode: 'stdin-after-start',
+    // Why: DSH-TUI animates a whale intro continuously behind its composer, so the default
+    // quiet window never settles (the grok failure mode). See dsh-tui-ready-no-key.txt.
+    draftPasteReadySignal: 'dsh-composer-prompt'
+  },
   zcode: {
     detectCmd: 'zcode',
     // Why: ZCode's entrypoint sets `process.title = 'zcode-cli'` (its `process-name.ts`
diff --git a/src/shared/tui-agent-display-names.ts b/src/shared/tui-agent-display-names.ts
index f85a87834b28..31b6035a9530 100644
--- a/src/shared/tui-agent-display-names.ts
+++ b/src/shared/tui-agent-display-names.ts
@@ -8,12 +8,14 @@ import type { TuiAgent } from './tui-agent'
 export const TUI_AGENT_DISPLAY_NAMES: Record<TuiAgent, string> = {
   claude: 'Claude',
   'claude-agent-teams': 'Claude Agent Teams',
+  codebuddy: 'CodeBuddy',
   openclaude: 'OpenClaude',
   codex: 'Codex',
   devin: 'Devin',
   ante: 'Ante',
   trae: 'Trae',
   muse: 'Muse',
+  dsh: 'DeepSeek Harness',
   zcode: 'ZCode',
   autohand: 'Autohand Code',
   opencode: 'OpenCode',
@@ -22,6 +24,7 @@ export const TUI_AGENT_DISPLAY_NAMES: Record<TuiAgent, string> = {
   pi: 'Pi',
   omp: 'OMP',
   'prime-agent': 'Prime Agent',
+  qoder: 'Qoder CLI',
   gemini: 'Gemini',
   antigravity: 'Antigravity',
   aider: 'Aider',
@@ -33,6 +36,7 @@ export const TUI_AGENT_DISPLAY_NAMES: Record<TuiAgent, string> = {
   aug: 'Auggie',
   cline: 'Cline',
   codebuff: 'Codebuff',
+  freebuff: 'Freebuff',
   'command-code': 'Command Code',
   continue: 'Continue',
   cursor: 'Cursor',
diff --git a/src/shared/tui-agent-permissions.ts b/src/shared/tui-agent-permissions.ts
index 6d6a6bec856b..9fc8eb0a6910 100644
--- a/src/shared/tui-agent-permissions.ts
+++ b/src/shared/tui-agent-permissions.ts
@@ -5,9 +5,11 @@ export type AgentPermissionMode = 'yolo' | 'manual' | 'mixed'
 
 export const YOLO_TUI_AGENT_ARGS: Partial<Record<TuiAgent, string>> = {
   claude: '--dangerously-skip-permissions',
+  codebuddy: '--dangerously-skip-permissions',
   'claude-agent-teams': '--dangerously-skip-permissions',
   openclaude: '--dangerously-skip-permissions',
   codex: '--dangerously-bypass-approvals-and-sandbox',
+  qoder: '--dangerously-skip-permissions',
   gemini: '--yolo',
   antigravity: '--dangerously-skip-permissions',
   aider: '--yes-always',
diff --git a/src/shared/tui-agent-rest-signal.test.ts b/src/shared/tui-agent-rest-signal.test.ts
new file mode 100644
index 000000000000..6e573acc0b06
--- /dev/null
+++ b/src/shared/tui-agent-rest-signal.test.ts
@@ -0,0 +1,63 @@
+import { describe, expect, it } from 'vitest'
+import type { TuiAgent } from './tui-agent'
+import { isTuiAgent, TUI_AGENT_CONFIG } from './tui-agent-config'
+import { getTuiAgentRestSignal, type TuiAgentRestSignal } from './tui-agent-rest-signal'
+
+// Why a full Record: adding a TuiAgent fails to compile here until someone decides what its
+// rest signal is, and a title-table change that moves an agent shows up in review.
+const EXPECTED_REST_SIGNALS: Record<TuiAgent, TuiAgentRestSignal> = {
+  dsh: 'hook-done',
+  codex: 'synthetic-title',
+  cursor: 'synthetic-title',
+  pi: 'synthetic-title',
+  omp: 'synthetic-title',
+  droid: 'synthetic-title',
+  hermes: 'synthetic-title',
+  devin: 'synthetic-title',
+  zcode: 'synthetic-title',
+  claude: 'title',
+  'claude-agent-teams': 'title',
+  openclaude: 'title',
+  opencode: 'title',
+  opencode2: 'title',
+  'mimo-code': 'title',
+  gemini: 'title',
+  antigravity: 'title',
+  aider: 'title',
+  openclaw: 'title',
+  copilot: 'title',
+  grok: 'title',
+  muse: 'ready-body',
+  qoder: 'ready-body',
+  codebuddy: 'none',
+  autohand: 'none',
+  ante: 'none',
+  trae: 'none',
+  'prime-agent': 'none',
+  goose: 'none',
+  amp: 'none',
+  kilo: 'none',
+  kiro: 'none',
+  crush: 'none',
+  aug: 'none',
+  cline: 'none',
+  codebuff: 'none',
+  freebuff: 'none',
+  'command-code': 'none',
+  continue: 'none',
+  kimi: 'none',
+  'mistral-vibe': 'none',
+  'qwen-code': 'none',
+  rovo: 'none'
+}
+
+describe('getTuiAgentRestSignal', () => {
+  it('declares a rest signal for every launchable agent', () => {
+    const derived = Object.fromEntries(
+      Object.keys(TUI_AGENT_CONFIG)
+        .filter(isTuiAgent)
+        .map((agent) => [agent, getTuiAgentRestSignal(agent)])
+    )
+    expect(derived).toEqual(EXPECTED_REST_SIGNALS)
+  })
+})
diff --git a/src/shared/tui-agent-rest-signal.ts b/src/shared/tui-agent-rest-signal.ts
new file mode 100644
index 000000000000..93f694a5d799
--- /dev/null
+++ b/src/shared/tui-agent-rest-signal.ts
@@ -0,0 +1,41 @@
+import { detectAgentStatusFromTitle } from './agent-title-status'
+import { getSyntheticAgentTerminalTitle } from './synthetic-agent-title'
+import type { TuiAgent } from './tui-agent'
+import { TUI_AGENT_CONFIG } from './tui-agent-config'
+
+/**
+ * The strongest lane tui-idle-evidence.ts trusts to say an agent's TUI is at rest:
+ * - `hook-done`: its own hook reports the lead turn ended (DSH).
+ * - `synthetic-title`: its hooks drive an Orca-written `<Agent> ready` title.
+ * - `title`: its running process names itself in a title the status classifier reads.
+ * - `ready-body`: a ready screen Orca recognises (Muse; Qoder, whose idle title can show while
+ *   its trust menu still owns input).
+ * - `none`: no stronger lane, so a quiet foreground process is its only one. Hooks or a first-party
+ *   `done` (amp, kimi, command-code, freebuff) do not count: tui-idle takes their `working` as a
+ *   veto, and trusts a first-party `done` only from DSH.
+ */
+export type TuiAgentRestSignal = 'hook-done' | 'synthetic-title' | 'title' | 'ready-body' | 'none'
+
+/** Lanes keyed on agent identity in tui-idle-evidence.ts, which no title table records. */
+const IDENTITY_REST_SIGNALS: Partial<Record<TuiAgent, TuiAgentRestSignal>> = {
+  dsh: 'hook-done',
+  muse: 'ready-body',
+  qoder: 'ready-body'
+}
+
+// Why derived, not declared per agent: the title tables are the evidence, so a second
+// hand-kept copy could only drift from them. An agent with no evidence falls to `none`.
+export function getTuiAgentRestSignal(agent: TuiAgent): TuiAgentRestSignal {
+  const identitySignal = IDENTITY_REST_SIGNALS[agent]
+  if (identitySignal) {
+    return identitySignal
+  }
+  if (getSyntheticAgentTerminalTitle(agent, 'done') !== null) {
+    return 'synthetic-title'
+  }
+  // Why the process name: the title tables match an agent by the name it runs as.
+  if (detectAgentStatusFromTitle(TUI_AGENT_CONFIG[agent].expectedProcess) !== null) {
+    return 'title'
+  }
+  return 'none'
+}
diff --git a/src/shared/tui-agent-selection.ts b/src/shared/tui-agent-selection.ts
index f3eb7322fb1f..acf305dad599 100644
--- a/src/shared/tui-agent-selection.ts
+++ b/src/shared/tui-agent-selection.ts
@@ -16,6 +16,8 @@ export const TUI_AGENT_AUTO_PICK_ORDER = [
   'ante',
   'trae',
   'muse',
+  'dsh',
+  'qoder',
   'zcode',
   'pi',
   'omp',
@@ -32,6 +34,7 @@ export const TUI_AGENT_AUTO_PICK_ORDER = [
   'autohand',
   'cline',
   'codebuff',
+  'freebuff',
   'command-code',
   'continue',
   'cursor',
@@ -42,7 +45,8 @@ export const TUI_AGENT_AUTO_PICK_ORDER = [
   'rovo',
   'hermes',
   'devin',
-  'openclaw'
+  'openclaw',
+  'codebuddy'
 ] as const satisfies readonly TuiAgent[]
 
 // Why: fresh installs should expose Claude Agent Teams in agent pickers; the
diff --git a/src/shared/tui-agent.ts b/src/shared/tui-agent.ts
index d19fcb0b1cee..a98c45101fd6 100644
--- a/src/shared/tui-agent.ts
+++ b/src/shared/tui-agent.ts
@@ -3,6 +3,7 @@
 export type TuiAgent =
   | 'claude' // Claude Code
   | 'claude-agent-teams' // Claude Code Agent Teams via Orca native panes
+  | 'codebuddy' // CodeBuddy Code
   | 'openclaude' // OpenClaude
   | 'codex' // OpenAI Codex
   | 'autohand' // Autohand Code CLI
@@ -11,6 +12,7 @@ export type TuiAgent =
   | 'mimo-code'
   | 'pi' // Pi (pi.dev)
   | 'omp' // OMP (omp.sh)
+  | 'qoder' // Qoder CLI
   | 'gemini' // Gemini CLI
   | 'antigravity' // Google Antigravity CLI
   | 'aider' // Aider
@@ -22,6 +24,7 @@ export type TuiAgent =
   | 'aug' // Augment/Auggie
   | 'cline' // Cline
   | 'codebuff' // Codebuff
+  | 'freebuff' // Freebuff
   | 'command-code' // Command Code
   | 'continue' // Continue
   | 'cursor' // Cursor
@@ -40,3 +43,4 @@ export type TuiAgent =
   | 'muse' // Muse (Meta `muse` CLI)
   | 'zcode' // ZCode (Z.ai `zcode` CLI)
   | 'prime-agent' // Prime Agent (Prime Intellect)
+  | 'dsh' // DeepSeek Harness (`dsh`, launched through its `dsh-tui` terminal profile)
diff --git a/src/shared/ui-chrome-types.ts b/src/shared/ui-chrome-types.ts
index ae0b23549a2b..f1d60d92d58e 100644
--- a/src/shared/ui-chrome-types.ts
+++ b/src/shared/ui-chrome-types.ts
@@ -63,6 +63,7 @@ export type StatusBarItem =
   | 'minimax'
   | 'grok'
   | 'cursor'
+  | 'zcode'
   | 'ssh'
   | 'resource-usage'
   | 'ports'
diff --git a/src/shared/worker-transcript-background-task-text.test.ts b/src/shared/worker-transcript-background-task-text.test.ts
index 1e9d727406be..a612dbe0d8c4 100644
--- a/src/shared/worker-transcript-background-task-text.test.ts
+++ b/src/shared/worker-transcript-background-task-text.test.ts
@@ -1,6 +1,9 @@
 import { describe, expect, it } from 'vitest'
 import type { NativeChatMessage } from './native-chat-types'
-import { formatWorkerTranscriptMessage } from './worker-transcript-text'
+import { formatWorkerTranscriptMessages } from './worker-transcript-text'
+
+const formatWorkerTranscriptMessage = (message: NativeChatMessage): string =>
+  formatWorkerTranscriptMessages([message]).join('')
 
 function message(blocks: NativeChatMessage['blocks']): NativeChatMessage {
   return { id: 'm-1', role: 'system', blocks, timestamp: null, source: 'hook' }
diff --git a/src/shared/worker-transcript-subagent-attribution.test.ts b/src/shared/worker-transcript-subagent-attribution.test.ts
new file mode 100644
index 000000000000..f67a12d6702d
--- /dev/null
+++ b/src/shared/worker-transcript-subagent-attribution.test.ts
@@ -0,0 +1,49 @@
+import { describe, expect, it } from 'vitest'
+import type { NativeChatMessage } from './native-chat-types'
+import { formatWorkerTranscriptMessages } from './worker-transcript-text'
+
+function message(
+  id: string,
+  text: string,
+  overrides: Partial<NativeChatMessage> = {}
+): NativeChatMessage {
+  return {
+    id,
+    role: 'assistant',
+    blocks: [{ type: 'text', text }],
+    timestamp: 0,
+    source: 'transcript',
+    ...overrides
+  }
+}
+
+const roster = message('roster', 'Kicked off 1 subagent', {
+  role: 'system',
+  blocks: [
+    { type: 'text', text: 'Kicked off 1 subagent' },
+    {
+      type: 'subagent-group',
+      groupId: 'group-1',
+      agents: [{ id: 'task-1', label: 'review the PR', state: 'working' }]
+    }
+  ]
+})
+
+describe("a worker's transcript never gives a subagent's words to the worker", () => {
+  it("tags a subagent's line with the subagent the roster names", () => {
+    const [own, , child] = formatWorkerTranscriptMessages([
+      message('own', 'Delegating the review.'),
+      roster,
+      message('child', 'The PR is CLEAN.', { agentId: 'task-1' })
+    ])
+    expect(own).toBe('[assistant] Delegating the review.')
+    expect(child).toBe('[assistant, subagent review the PR] The PR is CLEAN.')
+  })
+
+  it('still tags a subagent that no roster on the page names', () => {
+    const [child] = formatWorkerTranscriptMessages([
+      message('child', 'Still looking.', { agentId: 'task-9' })
+    ])
+    expect(child).toBe('[assistant, subagent] Still looking.')
+  })
+})
diff --git a/src/shared/worker-transcript-text-scaling.test.ts b/src/shared/worker-transcript-text-scaling.test.ts
index 92283cb24319..d00778e4d1ab 100644
--- a/src/shared/worker-transcript-text-scaling.test.ts
+++ b/src/shared/worker-transcript-text-scaling.test.ts
@@ -1,7 +1,10 @@
 import { expect, it, vi } from 'vitest'
-import { formatWorkerTranscriptMessage } from './worker-transcript-text'
+import { formatWorkerTranscriptMessages } from './worker-transcript-text'
 import type { NativeChatMessage } from './native-chat-types'
 
+const formatWorkerTranscriptMessage = (message: NativeChatMessage): string =>
+  formatWorkerTranscriptMessages([message]).join('')
+
 it('does not shift the remaining twin list for each matching roster', () => {
   const blocks: NativeChatMessage['blocks'] = Array.from({ length: 1000 }, (_, index) => ({
     type: 'subagent-group',
diff --git a/src/shared/worker-transcript-text.ts b/src/shared/worker-transcript-text.ts
index 45a98a878352..fd42193edd8b 100644
--- a/src/shared/worker-transcript-text.ts
+++ b/src/shared/worker-transcript-text.ts
@@ -12,8 +12,36 @@ import {
   subagentGroupFallbackText
 } from './native-chat-subagent-summary'
 import type { NativeChatMessage } from './native-chat-types'
+import { agentJournalItemSubagentId } from './agent-session-journal-producer'
+import {
+  nativeChatSubagentLabel,
+  nativeChatSubagentLabels
+} from './native-chat-subagent-attribution'
+
+/** Every message in one read, each tagged with who it speaks as. A subagent is
+ *  named by the roster on the same page. */
+export function formatWorkerTranscriptMessages(messages: readonly NativeChatMessage[]): string[] {
+  const subagentLabels = nativeChatSubagentLabels(messages)
+  return messages.map((message) => formatWorkerTranscriptMessage(message, subagentLabels))
+}
+
+/** Who a line speaks as. A subagent's lines are tagged as its own, so a peer reading
+ *  a worker's transcript never takes a subagent's words for the worker's. */
+function workerTranscriptSpeaker(
+  message: NativeChatMessage,
+  subagentLabels: ReadonlyMap<string, string> | undefined
+): string {
+  if (agentJournalItemSubagentId(message) === null) {
+    return message.role
+  }
+  const label = nativeChatSubagentLabel(subagentLabels, message)
+  return label === undefined ? `${message.role}, subagent` : `${message.role}, subagent ${label}`
+}
 
-export function formatWorkerTranscriptMessage(message: NativeChatMessage): string {
+function formatWorkerTranscriptMessage(
+  message: NativeChatMessage,
+  subagentLabels: ReadonlyMap<string, string>
+): string {
   // Every roster block is written beside a plain-text twin carrying the same
   // sentence, for clients that cannot draw the block. Text surfaces are those
   // clients, so they print the twin and drop the block. The renderer reaches the
@@ -49,7 +77,7 @@ export function formatWorkerTranscriptMessage(message: NativeChatMessage): strin
     // than reading fields off a shape that has none.
     return '[unsupported block]'
   })
-  return `[${message.role}] ${blocks.filter((line) => line !== null).join('\n')}`.trimEnd()
+  return `[${workerTranscriptSpeaker(message, subagentLabels)}] ${blocks.filter((line) => line !== null).join('\n')}`.trimEnd()
 }
 
 /** For each roster block, the sentence it must print itself — absent when a twin
diff --git a/src/shared/workspace-session-schema-field-coverage.test.ts b/src/shared/workspace-session-schema-field-coverage.test.ts
index 28572703d5aa..c7001060b7b8 100644
--- a/src/shared/workspace-session-schema-field-coverage.test.ts
+++ b/src/shared/workspace-session-schema-field-coverage.test.ts
@@ -91,13 +91,16 @@ describe('workspaceSessionStateSchema field coverage', () => {
     const parsed = parseWorkspaceSession({
       ...MINIMAL_SESSION,
       closedTerminalTabTombstonesByTabId: {
-        'tab-1': { closedAt: 1_700_000_000_000, worktreeId: 'repo:wt-1', ackRevision: 4 }
+        'tab-1': { closedAt: 1_700_000_000_000, worktreeId: 'repo:wt-1', reason: 'cleanup' },
+        // An older build's acknowledgement stamp is dropped; the record itself survives.
+        'tab-2': { closedAt: 1_700_000_000_000, worktreeId: 'repo:wt-1', ackRevision: 4 }
       }
     })
 
     expect(parsed.ok).toBe(true)
     expect(parsed.ok && parsed.value.closedTerminalTabTombstonesByTabId).toEqual({
-      'tab-1': { closedAt: 1_700_000_000_000, worktreeId: 'repo:wt-1', ackRevision: 4 }
+      'tab-1': { closedAt: 1_700_000_000_000, worktreeId: 'repo:wt-1', reason: 'cleanup' },
+      'tab-2': { closedAt: 1_700_000_000_000, worktreeId: 'repo:wt-1' }
     })
   })
 
diff --git a/src/shared/workspace-session-sleeping-agents.ts b/src/shared/workspace-session-sleeping-agents.ts
index 2f2ac1252bb3..624996e0dc28 100644
--- a/src/shared/workspace-session-sleeping-agents.ts
+++ b/src/shared/workspace-session-sleeping-agents.ts
@@ -5,6 +5,7 @@ import {
   RESUMABLE_TUI_AGENTS
 } from './agent-session-resume'
 import { isValidTerminalTabId } from './terminal-tab-id'
+import { normalizeMainAgentStatusField } from './agent-status-types'
 import { salvagingRecord } from './zod-salvage'
 
 const terminalTabIdSchema = z
@@ -96,6 +97,8 @@ const sleepingAgentSessionRecordSchema = z
     terminalTitle: z.string().optional(),
     lastAssistantMessage: z.string().optional(),
     interrupted: z.boolean().optional(),
+    // A malformed value drops the field, never the record.
+    mainAgent: z.unknown().transform(normalizeMainAgentStatusField).optional(),
     connectionId: z.string().nullable().optional(),
     launchConfig: sleepingAgentLaunchConfigSchema.optional(),
     origin: z.enum(['worktree-sleep', 'quit', 'live']).optional(),
diff --git a/tests/e2e/agent-trust-completion.unit.test.ts b/tests/e2e/agent-trust-completion.unit.test.ts
new file mode 100644
index 000000000000..45619ea25df4
--- /dev/null
+++ b/tests/e2e/agent-trust-completion.unit.test.ts
@@ -0,0 +1,282 @@
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentTrustPreset } from '../../src/main/agent-trust-presets'
+import { AGENT_TRUST_WRITE_DEADLINE_MS } from '../../src/main/agent-trust-write-deadline'
+import { runExclusivelyForCodexTrustConfig } from '../../src/main/codex/codex-trust-config-mutation-queue'
+import { preflightAgentTrust } from '../../src/renderer/src/lib/agent-trust-preflight'
+import { launchAgentSessionContinuation } from '../../src/renderer/src/lib/launch-agent-session-continuation'
+
+type TrustRequest = { preset: AgentTrustPreset; workspacePath: string; connectionId?: string }
+const fake = vi.hoisted(() => ({
+  handlers: new Map<string, (event: unknown, args: TrustRequest) => Promise<void>>(),
+  codex: vi.fn(),
+  cursor: vi.fn(),
+  copilot: vi.fn(),
+  antigravity: vi.fn(),
+  remote: vi.fn(),
+  launch: vi.fn()
+}))
+vi.mock('@/store', () => ({
+  useAppStore: { getState: () => ({ settings: {}, ensureDetectedAgents: async () => ['codex'] }) }
+}))
+vi.mock('@/lib/launch-agent-in-new-tab', () => ({ launchAgentInNewTab: fake.launch }))
+vi.mock('@/lib/agent-catalog', () => ({ getAgentLabel: () => 'Codex' }))
+vi.mock('@/lib/connection-context', () => ({ getConnectionIdFromState: () => null }))
+vi.mock('@/lib/worktree-runtime-owner', () => ({ getRuntimeEnvironmentIdForWorktree: () => null }))
+vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+vi.mock('sonner', () => ({ toast: { error: vi.fn(), warning: vi.fn(), success: vi.fn() } }))
+vi.mock('electron', () => ({
+  ipcMain: {
+    removeHandler: (channel: string) => fake.handlers.delete(channel),
+    handle: (channel: string, handler: (event: unknown, args: TrustRequest) => Promise<void>) =>
+      fake.handlers.set(channel, handler)
+  }
+}))
+vi.mock('../../src/main/agent-trust-presets', () => ({
+  markCodexProjectTrusted: fake.codex,
+  markCursorWorkspaceTrusted: fake.cursor,
+  markCopilotFolderTrusted: fake.copilot,
+  markAntigravityWorkspaceTrusted: fake.antigravity
+}))
+vi.mock('../../src/main/remote-agent-trust-presets', () => ({
+  markRemoteAgentWorkspaceTrusted: fake.remote
+}))
+import { registerAgentTrustHandlers } from '../../src/main/ipc/agent-trust'
+
+function deferred() {
+  let resolve: () => void = () => {}
+  let reject: (reason: Error) => void = () => {}
+  const promise = new Promise<void>((yes, no) => {
+    resolve = yes
+    reject = no
+  })
+  return { promise, resolve, reject }
+}
+function invoke(args: TrustRequest): Promise<void> {
+  const handler = fake.handlers.get('agentTrust:markTrusted')
+  if (!handler) {
+    throw new Error('Trust handler missing')
+  }
+  return handler({}, args)
+}
+async function flush(): Promise<void> {
+  for (let index = 0; index < 12; index++) {
+    await Promise.resolve()
+  }
+}
+const workspacePath = join('mock', 'folder workspace')
+
+beforeEach(() => {
+  vi.resetAllMocks()
+  fake.handlers.clear()
+  registerAgentTrustHandlers()
+  vi.stubGlobal('window', { api: { agentTrust: { markTrusted: invoke } } })
+})
+afterEach(() => vi.unstubAllGlobals())
+
+describe('agent trust completion', () => {
+  it('holds the actual session-continuation launch call until the local write settles', async () => {
+    const write = deferred()
+    fake.codex.mockReturnValue(write.promise)
+    fake.launch.mockReturnValue({ surface: { kind: 'local-terminal', tabId: 'mock-tab' } })
+    const request = launchAgentSessionContinuation({
+      agent: 'codex',
+      prompt: 'mock continuation',
+      worktreeId: 'mock-workspace',
+      workspacePath,
+      launchSource: 'sidebar'
+    })
+    await flush()
+    const launchesBeforeWrite = fake.launch.mock.calls.length
+    write.resolve()
+    await expect(request).resolves.toBe(true)
+    expect(launchesBeforeWrite).toBe(0)
+    expect(fake.launch).toHaveBeenCalledTimes(1)
+  })
+
+  it('keeps renderer preflight pending behind the actual config mutation queue', async () => {
+    const blocker = deferred()
+    const key = join('mock', 'codex', 'config.toml')
+    const held = runExclusivelyForCodexTrustConfig(key, () => blocker.promise)
+    let writes = 0
+    let continuationCalls = 0
+    fake.codex.mockImplementation(() =>
+      runExclusivelyForCodexTrustConfig(key, async () => {
+        writes += 1
+      })
+    )
+    const launch = preflightAgentTrust({ agent: 'codex', workspacePath }).then(() => {
+      continuationCalls += 1
+    })
+    await flush()
+    const beforeRelease = { writes, continuationCalls }
+    blocker.resolve()
+    await held
+    await launch
+    await flush()
+    expect(beforeRelease).toEqual({ writes: 0, continuationCalls: 0 })
+    expect(writes).toBe(1)
+    expect(continuationCalls).toBe(1)
+  })
+
+  it('settles best-effort only after a queued local trust failure', async () => {
+    const write = deferred()
+    // Keep the original implementation's discarded promise from leaking into the test runner.
+    void write.promise.catch(() => {})
+    fake.codex.mockReturnValue(write.promise)
+    let settled = false
+    const request = invoke({ preset: 'codex', workspacePath }).then(() => {
+      settled = true
+    })
+    await flush()
+    const beforeFailure = settled
+    write.reject(new Error('mock EACCES'))
+    await expect(request).resolves.toBeUndefined()
+    expect(beforeFailure).toBe(false)
+    expect(settled).toBe(true)
+  })
+
+  it('contains an immediate local writer rejection', async () => {
+    fake.codex.mockRejectedValue(new Error('mock write failed'))
+    await expect(invoke({ preset: 'codex', workspacePath })).resolves.toBeUndefined()
+    await flush()
+  })
+
+  it('bounds a never-settling local write and continues untrusted', async () => {
+    vi.useFakeTimers()
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const write = deferred()
+    void write.promise.catch(() => {})
+    fake.codex.mockReturnValue(write.promise)
+    let settled = false
+    const request = invoke({ preset: 'codex', workspacePath }).then(() => {
+      settled = true
+    })
+    try {
+      await vi.advanceTimersByTimeAsync(AGENT_TRUST_WRITE_DEADLINE_MS - 1)
+      expect(settled).toBe(false)
+      await vi.advanceTimersByTimeAsync(2)
+      await expect(request).resolves.toBeUndefined()
+      expect(settled).toBe(true)
+      expect(warn).toHaveBeenCalledOnce()
+      expect(String(warn.mock.calls[0]?.[0])).toContain('did not settle')
+      // No leaked deadline timer keeps the handler or the process alive.
+      expect(vi.getTimerCount()).toBe(0)
+    } finally {
+      warn.mockRestore()
+      write.resolve()
+      vi.useRealTimers()
+    }
+  })
+
+  it('admits an already-complete write without waiting for any timer', async () => {
+    vi.useFakeTimers()
+    fake.codex.mockResolvedValue(undefined)
+    try {
+      // No timer is advanced: "already done" must settle on microtasks alone.
+      await expect(invoke({ preset: 'codex', workspacePath })).resolves.toBeUndefined()
+      expect(vi.getTimerCount()).toBe(0)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('absorbs a local rejection that arrives after the deadline', async () => {
+    vi.useFakeTimers()
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const write = deferred()
+    fake.codex.mockReturnValue(write.promise)
+    try {
+      const request = invoke({ preset: 'codex', workspacePath })
+      await vi.advanceTimersByTimeAsync(AGENT_TRUST_WRITE_DEADLINE_MS + 1)
+      await expect(request).resolves.toBeUndefined()
+      // Unhandled here would fail the run: the abandoned write is still adopted.
+      write.reject(new Error('mock EACCES after deadline'))
+      await vi.advanceTimersByTimeAsync(1)
+    } finally {
+      warn.mockRestore()
+      vi.useRealTimers()
+    }
+  })
+
+  it('bounds a never-settling SSH trust write without a local fallback', async () => {
+    vi.useFakeTimers()
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const write = deferred()
+    void write.promise.catch(() => {})
+    fake.remote.mockReturnValue(write.promise)
+    try {
+      const request = invoke({ preset: 'codex', workspacePath, connectionId: 'ssh-1' })
+      await vi.advanceTimersByTimeAsync(AGENT_TRUST_WRITE_DEADLINE_MS + 1)
+      await expect(request).resolves.toBeUndefined()
+      // Loss of contact is not a verdict: nothing is written locally instead.
+      expect(fake.codex).not.toHaveBeenCalled()
+      expect(warn).toHaveBeenCalledOnce()
+    } finally {
+      warn.mockRestore()
+      write.resolve()
+      vi.useRealTimers()
+    }
+  })
+
+  it('settles two concurrent launches for the same workspace independently', async () => {
+    const first = deferred()
+    const second = deferred()
+    fake.codex.mockReturnValueOnce(first.promise).mockReturnValueOnce(second.promise)
+    const earlier = invoke({ preset: 'codex', workspacePath })
+    const later = invoke({ preset: 'codex', workspacePath })
+    first.reject(new Error('mock EACCES'))
+    await expect(earlier).resolves.toBeUndefined()
+    second.resolve()
+    await expect(later).resolves.toBeUndefined()
+    // Not deduped by design: the writer's upsert is idempotent per workspace.
+    expect(fake.codex).toHaveBeenCalledTimes(2)
+  })
+
+  it('keeps SSH trust on its remote owner and waits for its result', async () => {
+    const write = deferred()
+    fake.remote.mockReturnValue(write.promise)
+    let settled = false
+    const request = invoke({ preset: 'codex', workspacePath, connectionId: ' ssh-1 ' }).then(() => {
+      settled = true
+    })
+    await flush()
+    const beforeRemote = settled
+    write.resolve()
+    await request
+    expect(beforeRemote).toBe(false)
+    expect(fake.codex).not.toHaveBeenCalled()
+    expect(fake.remote).toHaveBeenCalledWith({
+      preset: 'codex',
+      workspacePath,
+      connectionId: 'ssh-1'
+    })
+  })
+
+  it('keeps remote failures best-effort without a local fallback', async () => {
+    fake.remote.mockRejectedValue(new Error('provider unavailable'))
+    await expect(
+      invoke({ preset: 'codex', workspacePath, connectionId: 'ssh-1' })
+    ).resolves.toBeUndefined()
+    expect(fake.codex).not.toHaveBeenCalled()
+  })
+
+  it.each(['cursor', 'copilot', 'antigravity'] as const)(
+    'keeps %s synchronous preset dispatch',
+    async (preset) => {
+      await invoke({ preset, workspacePath })
+      expect(fake[preset]).toHaveBeenCalledExactlyOnceWith(workspacePath)
+      expect(fake.codex).not.toHaveBeenCalled()
+      expect(fake.remote).not.toHaveBeenCalled()
+    }
+  )
+
+  it('skips a missing workspace and keeps synchronous failures best-effort', async () => {
+    await invoke({ preset: 'codex', workspacePath: '' })
+    expect(fake.codex).not.toHaveBeenCalled()
+    fake.codex.mockImplementation(() => {
+      throw new Error('mock path failure')
+    })
+    await expect(invoke({ preset: 'codex', workspacePath })).resolves.toBeUndefined()
+  })
+})
diff --git a/tests/e2e/browser-address-bar-narrow-toolbar.spec.ts b/tests/e2e/browser-address-bar-narrow-toolbar.spec.ts
index de24f0f4e6d5..4c75f9cdd35d 100644
--- a/tests/e2e/browser-address-bar-narrow-toolbar.spec.ts
+++ b/tests/e2e/browser-address-bar-narrow-toolbar.spec.ts
@@ -24,8 +24,8 @@ import { BROWSER_ADDRESS_BAR_MIN_INLINE_WIDTH } from '../../src/renderer/src/com
 // the middle of that band rather than a fixed window width, because how much
 // chrome flanks the pane (left sidebar, and a right sidebar that other startup
 // paths may re-open) varies between runs.
-const TARGET_TOOLBAR_WIDTH = 420
-const MIN_USABLE_TOOLBAR_WIDTH = BROWSER_ADDRESS_BAR_MIN_INLINE_WIDTH + 100
+const TARGET_TOOLBAR_WIDTH = 260
+const MIN_USABLE_TOOLBAR_WIDTH = BROWSER_ADDRESS_BAR_MIN_INLINE_WIDTH + 20
 const NARROW_WINDOW_HEIGHT = 800
 
 async function startDestinationServer(): Promise<{ url: string; close: () => Promise<void> }> {
@@ -62,6 +62,8 @@ async function setWindowWidth(electronApp: ElectronApplication, width: number):
       if (!window) {
         throw new Error('No Electron window')
       }
+      // Window minimums otherwise mask the narrow-pane state on some runners.
+      window.setMinimumSize(0, 0)
       window.setSize(size.width, size.height)
     },
     { width: Math.round(width), height: NARROW_WINDOW_HEIGHT }
@@ -118,8 +120,11 @@ async function settleToSqueezedRestingState(
         // Chrome flanking the pane is everything the toolbar didn't get.
         await setWindowWidth(electronApp, innerWidth - toolbar + TARGET_TOOLBAR_WIDTH)
         await addressBarInput(page).evaluate((node) => node.blur())
+        const measuredToolbar = await toolbarWidth(page)
         return {
-          toolbar: (await toolbarWidth(page)) > MIN_USABLE_TOOLBAR_WIDTH,
+          toolbar:
+            measuredToolbar > MIN_USABLE_TOOLBAR_WIDTH &&
+            measuredToolbar <= TARGET_TOOLBAR_WIDTH + 5,
           collapsed: (await addressBarOverlay(page).count()) === 0
         }
       },
diff --git a/tests/e2e/browser-floating-shortcut-scope.spec.ts b/tests/e2e/browser-floating-shortcut-scope.spec.ts
index 653c81a0dd9b..a7df8992b441 100644
--- a/tests/e2e/browser-floating-shortcut-scope.spec.ts
+++ b/tests/e2e/browser-floating-shortcut-scope.spec.ts
@@ -69,16 +69,20 @@ function findInput(page: Page, browserTabId: string) {
   return browserOverlay(page, browserTabId).getByPlaceholder('Find in page...')
 }
 
-function grabButton(page: Page, browserTabId: string) {
+function cancelGrabButton(page: Page, browserTabId: string) {
   return browserOverlay(page, browserTabId).getByRole('button', {
-    name: 'Grab page element',
+    name: 'Cancel',
     exact: true
   })
 }
 
 // Why: a non-editable chrome target, so reload and grab are not skipped as text-field keys.
 async function focusChrome(page: Page, browserTabId: string): Promise<void> {
-  const target = grabButton(page, browserTabId)
+  // Reload stays in the toolbar when narrow panes fold their element tools into the menu.
+  const target = browserOverlay(page, browserTabId).getByRole('button', {
+    name: 'Reload',
+    exact: true
+  })
   await expect(target).toBeEnabled()
   await target.focus()
   await expect(target).toBeFocused()
@@ -148,10 +152,10 @@ test.describe('floating browser shortcut scope', () => {
 
           await focusChrome(orcaPage, owner)
           await orcaPage.keyboard.press(`${shortcutModifier}+c`)
-          await expect(grabButton(orcaPage, owner)).toHaveAttribute('data-variant', 'default')
-          await expect(grabButton(orcaPage, other)).toHaveAttribute('data-variant', 'ghost')
-          await grabButton(orcaPage, owner).click()
-          await expect(grabButton(orcaPage, owner)).toHaveAttribute('data-variant', 'ghost')
+          await expect(cancelGrabButton(orcaPage, owner)).toBeVisible()
+          await expect(cancelGrabButton(orcaPage, other)).toBeHidden()
+          await cancelGrabButton(orcaPage, owner).click()
+          await expect(cancelGrabButton(orcaPage, owner)).toBeHidden()
         })
       }
 
diff --git a/tests/e2e/browser-pointer-input-dispatch.spec.ts b/tests/e2e/browser-pointer-input-dispatch.spec.ts
index 3068d0626805..6a797117a648 100644
--- a/tests/e2e/browser-pointer-input-dispatch.spec.ts
+++ b/tests/e2e/browser-pointer-input-dispatch.spec.ts
@@ -178,7 +178,9 @@ function clickSteps(x: number, y: number, button = 'left'): RpcStep[] {
   ]
 }
 
-test('dispatches coordinate pointer input fast enough for real gestures', async ({ orcaPage }) => {
+test('dispatches coordinate pointer input fast enough for real gestures @headful', async ({
+  orcaPage
+}) => {
   // Why: the measurement loop plus the gesture checks drive a few hundred serialized RPCs;
   // a loaded CI runner needs more than the default budget even when each one is fast.
   test.setTimeout(240_000)
@@ -244,13 +246,11 @@ test('dispatches coordinate pointer input fast enough for real gestures', async
     // numbers ride along in the annotation where the failure artifact will carry them.
     test.info().annotations.push({ type: 'pointer-latency', description: latencyReport })
 
-    // Why: absolute milliseconds vary by host, so compare against browser.eval on the same
-    // socket and queue — a pointer event that spawns the helper costs that plus a process
-    // launch. Measured multiples of the control: in process 1.5x/1.5x/4x, via the helper
-    // 5.7x/5.5x/20.5x. These thresholds sit between the two, not near either.
-    expect(latency.mouseMove, latencyReport).toBeLessThan(latency.evalControl * 3)
-    expect(latency.mouseWheel, latencyReport).toBeLessThan(latency.evalControl * 3)
-    expect(latency.click, latencyReport).toBeLessThan(latency.evalControl * 10)
+    // CDP pointer dispatch waits for a frame; fast evaluation can finish far below one.
+    const dispatchControlMs = Math.max(latency.evalControl, 1000 / 60)
+    expect(latency.mouseMove, latencyReport).toBeLessThan(dispatchControlMs * 3)
+    expect(latency.mouseWheel, latencyReport).toBeLessThan(dispatchControlMs * 3)
+    expect(latency.click, latencyReport).toBeLessThan(dispatchControlMs * 10)
 
     // ── Gesture fidelity ──
 
diff --git a/tests/e2e/codex-child-approval-activity-row.unit.test.ts b/tests/e2e/codex-child-approval-activity-row.unit.test.ts
index b9210bf79e87..71bb0fddce18 100644
--- a/tests/e2e/codex-child-approval-activity-row.unit.test.ts
+++ b/tests/e2e/codex-child-approval-activity-row.unit.test.ts
@@ -143,7 +143,9 @@ async function openHost() {
     journalDir: join(root, SESSION)
   })
   const feed = new StructuredAgentSessionStatusFeed({
-    sessions: new Map([[SESSION, indexedStatusFeedSession({ journal, hasProviderChild: true })]]),
+    sessions: new Map([
+      [SESSION, indexedStatusFeedSession({ journal, child: { phase: 'ready' } })]
+    ]),
     getRecord: () => null,
     now: () => 1,
     readBackgroundTasks: () => ({ state: 'monitoring', tasks: [] })
diff --git a/tests/e2e/combined-diff-invalidation-freeze-repro.spec.ts b/tests/e2e/combined-diff-invalidation-freeze-repro.spec.ts
index cb11acf25f38..99b6b939f6d7 100644
--- a/tests/e2e/combined-diff-invalidation-freeze-repro.spec.ts
+++ b/tests/e2e/combined-diff-invalidation-freeze-repro.spec.ts
@@ -299,6 +299,7 @@ test.describe('Combined diff invalidation freeze repro (STA-3420)', () => {
       )
 
       console.log(`external-change burst measurement ${JSON.stringify(measurement)}`)
+      expect(measurement.sectionRowCount).toBe(1)
       expect(measurement.stuckLoadingRowCount).toBe(0)
       expect(measurement.editorCount).toBeGreaterThan(0)
       // Why: before the fix this window blocked continuously — p95 3963ms, 16 samples in 23s.
diff --git a/tests/e2e/combined-diff-scroll-restore.spec.ts b/tests/e2e/combined-diff-scroll-restore.spec.ts
index 496bead3db61..da02f8d0bdd0 100644
--- a/tests/e2e/combined-diff-scroll-restore.spec.ts
+++ b/tests/e2e/combined-diff-scroll-restore.spec.ts
@@ -370,26 +370,27 @@ async function clickVisibleDiffLine(page: Page): Promise<void> {
             return null
           }
           const containerRect = container.getBoundingClientRect()
-          const visibleLine = Array.from(
-            container.querySelectorAll<HTMLElement>('.monaco-diff-editor .view-line')
-          ).find((line) => {
+          for (const line of container.querySelectorAll<HTMLElement>(
+            '.monaco-diff-editor .view-line'
+          )) {
             const rect = line.getBoundingClientRect()
-            return (
-              rect.height > 0 &&
-              rect.bottom > containerRect.top &&
-              rect.top < containerRect.bottom &&
-              rect.right > containerRect.left &&
-              rect.left < containerRect.right
-            )
-          })
-          if (!visibleLine) {
-            return null
-          }
-          const rect = visibleLine.getBoundingClientRect()
-          return {
-            x: rect.left + Math.min(12, Math.max(1, rect.width / 2)),
-            y: rect.top + rect.height / 2
+            const left = Math.max(rect.left, containerRect.left)
+            const right = Math.min(rect.right, containerRect.right)
+            const top = Math.max(rect.top, containerRect.top)
+            const bottom = Math.min(rect.bottom, containerRect.bottom)
+            if (left >= right || top >= bottom) {
+              continue
+            }
+            const point = {
+              x: left + Math.min(12, (right - left) / 2),
+              y: (top + bottom) / 2
+            }
+            // Sticky headers can cover a line whose rectangle intersects the viewport.
+            if (line.contains(document.elementFromPoint(point.x, point.y))) {
+              return point
+            }
           }
+          return null
         })
         return linePoint !== null
       },
diff --git a/tests/e2e/completed-worker-retirement-resume.spec.ts b/tests/e2e/completed-worker-retirement-resume.spec.ts
index 6935cbe1895f..0af7ca46f123 100644
--- a/tests/e2e/completed-worker-retirement-resume.spec.ts
+++ b/tests/e2e/completed-worker-retirement-resume.spec.ts
@@ -160,21 +160,13 @@ for (const closeMode of ['terminal-close-cli', 'worker-release'] as const) {
     const workerBefore = terminalIdentity(worker)
     const workerPaneKey = `${worker.tabId}:${worker.leafId}`
     expect(worker.worktreeId).toBe(targetWorktreeId)
-    await orcaPage.evaluate(
-      ({ tabId, worktreeId }) => {
-        window.dispatchEvent(
-          new CustomEvent('orca-background-mount-terminal-worktree', {
-            detail: { worktreeId, tabIds: [tabId] }
-          })
-        )
-      },
-      { tabId: worker.tabId, worktreeId: targetWorktreeId }
-    )
-    await expect
-      .poll(() =>
-        orcaPage.evaluate((tabId) => Boolean(window.__paneManagers?.get(tabId)), workerBefore.tabId)
+    // Keep the never-opened worker dormant so foreground-shell cleanup cannot retire it first.
+    expect(
+      await orcaPage.evaluate(
+        (tabId) => Boolean(window.__paneManagers?.get(tabId)),
+        workerBefore.tabId
       )
-      .toBe(true)
+    ).toBe(false)
     expect(
       await orcaPage.evaluate(
         (worktreeId) => window.__store?.getState().everActivatedWorktreeIds.has(worktreeId),
@@ -202,70 +194,13 @@ for (const closeMode of ['terminal-close-cli', 'worker-release'] as const) {
       throw new Error('Background worker did not receive its dispatch capability')
     }
 
-    const transcriptPath = seedCurrentCodexTranscript(
-      isolatedHome,
-      PROVIDER_SESSION_ID,
-      targetWorktreePath
-    )
+    seedCurrentCodexTranscript(isolatedHome, PROVIDER_SESSION_ID, targetWorktreePath)
 
-    await orcaPage.evaluate(
-      ({
-        agentCommand,
-        paneKey,
-        providerSessionId,
-        tabId,
-        terminalHandle,
-        transcriptPath,
-        worktreeId
-      }) => {
-        const state = window.__store?.getState()
-        if (!state) {
-          throw new Error('Renderer store unavailable')
-        }
-        const providerSession = {
-          key: 'session_id' as const,
-          id: providerSessionId,
-          transcriptPath
-        }
-        const metadata = { tabId, worktreeId, terminalHandle }
-        const recovery = {
-          providerSession,
-          launchConfig: {
-            // Why not bare 'codex': resume prefers the captured command over
-            // agentCmdOverrides, so a bare name would resolve the machine's real
-            // Codex off PATH and unpin the adoption leg this spec exercises.
-            agentCommand,
-            agentArgs: '--dangerously-bypass-approvals-and-sandbox',
-            agentEnv: {}
-          }
-        }
-        state.setAgentStatus(
-          paneKey,
-          { state: 'working', prompt: 'Report completion, then exit normally', agentType: 'codex' },
-          'Completed background worker',
-          undefined,
-          metadata,
-          recovery
-        )
-        state.setAgentStatus(
-          paneKey,
-          { state: 'done', prompt: 'Report completion, then exit normally', agentType: 'codex' },
-          'Completed background worker',
-          undefined,
-          metadata,
-          recovery
-        )
-      },
-      {
-        agentCommand: completedWorkerFakeCodexCommand,
-        paneKey: workerPaneKey,
-        providerSessionId: PROVIDER_SESSION_ID,
-        tabId: worker.tabId,
-        terminalHandle: workerHandle,
-        transcriptPath,
-        worktreeId: targetWorktreeId
-      }
-    )
+    await client.call('terminal.send', {
+      terminal: workerHandle,
+      text: 'ORCA_E2E_PUBLISH_DONE',
+      enter: true
+    })
 
     const expectedRecovery = {
       origin: 'live',
@@ -348,18 +283,23 @@ for (const closeMode of ['terminal-close-cli', 'worker-release'] as const) {
     await expect
       .poll(() => readCompletedWorkerLedger().filter((event) => event.event === 'normal-exit'))
       .toHaveLength(1)
-    expect(
-      await orcaPage.evaluate(
-        ({ paneKey, tabId, worktreeId }) => {
-          const state = window.__store?.getState()
-          return {
-            tabPresent: Boolean(state?.tabsByWorktree[worktreeId]?.some((tab) => tab.id === tabId)),
-            recoveryPresent: Boolean(state?.sleepingAgentSessionsByPaneKey[paneKey])
-          }
-        },
-        { paneKey: workerPaneKey, tabId: workerBefore.tabId, worktreeId: targetWorktreeId }
+    // The exit marker precedes the asynchronous renderer recovery update.
+    await expect
+      .poll(() =>
+        orcaPage.evaluate(
+          ({ paneKey, tabId, worktreeId }) => {
+            const state = window.__store?.getState()
+            return {
+              tabPresent: Boolean(
+                state?.tabsByWorktree[worktreeId]?.some((tab) => tab.id === tabId)
+              ),
+              recoveryPresent: Boolean(state?.sleepingAgentSessionsByPaneKey[paneKey])
+            }
+          },
+          { paneKey: workerPaneKey, tabId: workerBefore.tabId, worktreeId: targetWorktreeId }
+        )
       )
-    ).toEqual({ tabPresent: true, recoveryPresent: true })
+      .toEqual({ tabPresent: true, recoveryPresent: true })
 
     await orcaPage.evaluate(
       ({ paneKey, tabId, worktreeId }) => {
diff --git a/tests/e2e/cross-version-wire/agent-session-death-evidence-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/agent-session-death-evidence-downgrade.unit.test.ts
new file mode 100644
index 000000000000..33e7a9dfa82a
--- /dev/null
+++ b/tests/e2e/cross-version-wire/agent-session-death-evidence-downgrade.unit.test.ts
@@ -0,0 +1,61 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { expect, test } from 'vitest'
+import {
+  agentSessionLeaseFixture,
+  agentSessionRecordFixture
+} from '../../../src/shared/agent-session-record.test-fixture'
+import { AgentSessionRecordStore } from '../../../src/main/runtime/agent-session-record-store'
+import { agentSessionStorePath } from '../../../src/main/runtime/agent-session-record-store-file'
+import { importReleaseCheckoutModule, materializeReleaseCheckout } from './release-checkout'
+
+// The last release before a proof of death named its owner and its last proof of life.
+const BASELINE_REF = 'v1.4.208-rc.0.zy01'
+const SESSION = 'session-alpha-1'
+
+test('an older build loads a proof of death that names its owner and its last proof of life', async () => {
+  const directory = mkdtempSync(join(tmpdir(), 'orca-death-evidence-downgrade-'))
+  try {
+    // A live owner at fence 7, last renewed at 30000, found gone when this build relaunches.
+    writeFileSync(
+      agentSessionStorePath(directory),
+      JSON.stringify({
+        schemaVersion: 2,
+        hostId: 'local',
+        records: { [SESSION]: agentSessionRecordFixture(agentSessionLeaseFixture()) },
+        operations: {},
+        retiredClaimKeys: [],
+        unusableRecords: {}
+      })
+    )
+    const store = await AgentSessionRecordStore.open({ directory, hostId: 'local' })
+    await store.reconcileOnRestart({ probe: async () => ({ outcome: 'pid-absent' }), now: 90_000 })
+    const evidence = store.getRecord(SESSION)?.lease.deathEvidence
+    expect(evidence).toEqual({
+      kind: 'pid-absent',
+      detail: 'recorded pid absent on host',
+      observedAt: 90_000,
+      ownerFence: 7,
+      lastProvenAliveAt: 30_000
+    })
+
+    const checkout = await materializeReleaseCheckout(BASELINE_REF)
+    const baseline = await importReleaseCheckoutModule(
+      checkout,
+      'src/main/runtime/agent-session-record-store.ts'
+    )
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the pinned release exports this class with the open/read members called below; a missing one fails the test.
+    const OldStore = baseline.AgentSessionRecordStore as {
+      open: (args: { directory: string; hostId: string }) => Promise<AgentSessionRecordStore>
+    }
+    const old = await OldStore.open({ directory, hostId: 'local' })
+    expect(old.isSessionUnreadable(SESSION)).toBe(false)
+    expect(old.getRecord(SESSION)?.lease).toMatchObject({
+      claimStatus: 'released',
+      deathEvidence: evidence
+    })
+  } finally {
+    rmSync(directory, { recursive: true, force: true })
+  }
+})
diff --git a/tests/e2e/cross-version-wire/agent-session-resume-marker-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/agent-session-resume-marker-downgrade.unit.test.ts
new file mode 100644
index 000000000000..d9409b516318
--- /dev/null
+++ b/tests/e2e/cross-version-wire/agent-session-resume-marker-downgrade.unit.test.ts
@@ -0,0 +1,52 @@
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { expect, test } from 'vitest'
+import { structuredAgentSessionWorkingAtStop } from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-working-at-teardown'
+import {
+  journal,
+  NOW,
+  record,
+  SESSION,
+  TEARDOWN_CURRENT,
+  turnItem
+} from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-test-harness'
+import { AgentSessionRecoveryCapsule } from '../../../src/main/runtime/agent-session-recovery-capsule'
+import { importReleaseCheckoutModule, materializeReleaseCheckout } from './release-checkout'
+
+// A release whose marker parser still requires the chat's newest message id.
+const BASELINE_REF = 'v1.4.216-rc.0.zy03'
+
+test('an older build reads the restart offer this build records at quit', async () => {
+  const directory = mkdtempSync(join(tmpdir(), 'orca-resume-marker-downgrade-'))
+  try {
+    // This build: the offer teardown takes for a chat whose turn was running.
+    const marker = structuredAgentSessionWorkingAtStop({
+      sessionId: SESSION,
+      session: { journal: journal([turnItem('turn-1', 'running')]), child: { fence: 1 } },
+      getRecord: () => record(),
+      backgroundTasks: () => undefined,
+      trigger: 'quit',
+      teardownId: TEARDOWN_CURRENT,
+      now: NOW
+    })
+    if (!marker) {
+      throw new Error('this build recorded no offer for a running turn')
+    }
+    await new AgentSessionRecoveryCapsule(directory).record([marker], NOW)
+
+    // The older build, after a downgrade, still lists it.
+    const checkout = await materializeReleaseCheckout(BASELINE_REF)
+    const baseline = await importReleaseCheckoutModule(
+      checkout,
+      'src/main/runtime/agent-session-recovery-capsule.ts'
+    )
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the pinned release exports this class with the constructor and `list` called below; a missing one fails the test.
+    const OldCapsule = baseline.AgentSessionRecoveryCapsule as new (directory: string) => {
+      list: (now: number) => Promise<{ sessionId: string }[]>
+    }
+    expect(await new OldCapsule(directory).list(NOW)).toMatchObject([{ sessionId: SESSION }])
+  } finally {
+    rmSync(directory, { recursive: true, force: true })
+  }
+})
diff --git a/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts b/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
index b038a558517f..3087385da1d5 100644
--- a/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
+++ b/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
@@ -22,6 +22,8 @@ import { AgentSessionRecordStore } from '../../../src/main/runtime/agent-session
 import { RuntimeSubscriptionRegistry } from '../../../src/main/runtime/runtime-subscription-registry'
 import type { AgentSessionSubscribeEvent } from '../../../src/shared/agent-session-wire'
 import {
+  AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
+  AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY,
   AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY,
   AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY,
   AGENT_SESSION_REWIND_RUNTIME_CAPABILITY,
@@ -290,6 +292,40 @@ describe('cross-version structured agent sessions', () => {
       expect(current.protocolVersion).toBe(baseline.protocolVersion)
     })
 
+    // The client sends a Stop naming no turn only to a host advertising this, because older cancel
+    // params are strict and require the turn. The invariant survives a release cut: each build
+    // advertises the capability exactly when its dispatcher accepts that cancel.
+    it('advertises conversation stop exactly where a cancel naming no turn is accepted', async () => {
+      const named = paramsFor('agentSession.cancel')
+      if (typeof named !== 'object' || named === null) {
+        throw new Error('the manifest has no cancel params')
+      }
+      const unnamed = Object.fromEntries(Object.entries(named).filter(([key]) => key !== 'turnId'))
+      for (const build of [current, baseline]) {
+        if (!build.methodNames.includes('agentSession.cancel')) {
+          continue
+        }
+        // Without a host every call answers `structured_agent_session_unsupported`, which would
+        // read as the params refusal this looks for.
+        const hostCalls = structuredHostStub(SESSION, WORKSPACE)
+        await build.installStructuredHost(installableHost(hostCalls))
+        try {
+          const replies = await callBuild(build, 'agentSession.cancel', unnamed, {
+            clientKind: 'runtime',
+            clientCapabilities: current.capabilities
+          })
+          expect(replies, `${build.label}: a cancel naming no turn`).toHaveLength(1)
+          expect(replies[0]?.ok, `${build.label}: a cancel naming no turn`).toBe(
+            build.capabilities.includes(AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY)
+          )
+          expect(hostCalls.cancel).toHaveBeenCalledTimes(replies[0]?.ok ? 1 : 0)
+        } finally {
+          await build.installStructuredHost(null)
+        }
+      }
+      expect(current.capabilities).toContain(AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY)
+    })
+
     it('gets a clean answer from the old dispatcher rather than silence', async () => {
       const registered = new Set(baselineStructuredMethods())
       for (const { method } of STRUCTURED_CALLS) {
@@ -619,6 +655,10 @@ describe('cross-version structured agent sessions', () => {
     let store: AgentSessionRecordStore
     let runtime: unknown
 
+    /** Holds a provider start open, so a reply's timing can be read against it. */
+    let startGate: Promise<void> = Promise.resolve()
+    let starts = 0
+
     /** Phase 2 owns provider processes; the adapter is the only stub here. */
     function adapter(): StructuredAgentSessionAdapter {
       return {
@@ -626,23 +666,27 @@ describe('cross-version structured agent sessions', () => {
         // `supportsLocation`, which this fake also lacks, so the client-supplied-location gate
         // refused for the fake's silence rather than for the location.
         supportsCreate: () => true,
-        acquire: async ({ fence }) => ({
-          process: {
-            hostId: 'local',
-            pid: 4242,
-            processStartTimeMs: 1_700_000_000_000,
-            spawnToken: store.getRecord(SESSION)?.lease.reservedSpawnToken ?? 'spawn-a'
-          },
-          link: {
-            linkId: `link-${fence}`,
-            handle: { provider: 'codex', threadId: THREAD },
-            // A restarted host re-proves the thread it inherited; only the first
-            // owner of a session may claim to have created it.
-            origin: store.getRecord(SESSION)?.providerHandleChain.length ? 'resumed' : 'created',
-            mintedAtFence: fence,
-            observedAt: NOW
+        acquire: async ({ fence }) => {
+          starts += 1
+          await startGate
+          return {
+            process: {
+              hostId: 'local',
+              pid: 4242,
+              processStartTimeMs: 1_700_000_000_000,
+              spawnToken: store.getRecord(SESSION)?.lease.reservedSpawnToken ?? 'spawn-a'
+            },
+            link: {
+              linkId: `link-${fence}`,
+              handle: { provider: 'codex', threadId: THREAD },
+              // A restarted host re-proves the thread it inherited; only the first
+              // owner of a session may claim to have created it.
+              origin: store.getRecord(SESSION)?.providerHandleChain.length ? 'resumed' : 'created',
+              mintedAtFence: fence,
+              observedAt: NOW
+            }
           }
-        }),
+        },
         dispatch: async () => ({
           state: 'accepted',
           providerIdentity: { provider: 'codex', threadId: THREAD, turnId: 'turn-1', ordinal: 1 }
@@ -697,14 +741,18 @@ describe('cross-version structured agent sessions', () => {
       return reattached
     }
 
-    async function call(method: string, params: unknown): Promise<RpcReply[]> {
+    async function call(
+      method: string,
+      params: unknown,
+      clientCapabilities: readonly string[] = [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY]
+    ): Promise<RpcReply[]> {
       return callBuild(
         current,
         method,
         params,
         {
           clientKind: 'runtime',
-          clientCapabilities: [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY],
+          clientCapabilities,
           clientId: 'paired-device-1',
           connectionId: 'connection-1'
         },
@@ -723,6 +771,7 @@ describe('cross-version structured agent sessions', () => {
 
     beforeEach(async () => {
       resetOperationIds()
+      startGate = Promise.resolve()
       root = await mkdtemp(join(tmpdir(), 'orca-cross-version-agent-session-'))
       runtime = runtimeStub()
       await bootHost('a')
@@ -776,5 +825,57 @@ describe('cross-version structured agent sessions', () => {
         fence: reattached.fence
       })
     })
+
+    // A released client answers a send's `pending` as delivered-or-refused; it has no way to show
+    // a rejection that arrives after it. So it is answered once the message is handed over, while
+    // a client that advertises accepted sends is answered at acceptance, start or no start (W9).
+    it('holds the send reply of a released client until the handover, and answers a current one at once', async () => {
+      // Why: the baseline is the newest release, which will itself carry accepted sends.
+      const released = baseline.capabilities.filter(
+        (capability) => capability !== AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY
+      )
+      const created = await answer('agentSession.create', createIntentParams())
+      await bootHost('b')
+      let open = (): void => undefined
+      startGate = new Promise((resolve) => (open = resolve))
+
+      let answered = false
+      const releasedReply = call(
+        'agentSession.send',
+        sendParams('released', created.fence),
+        released
+      ).finally(() => (answered = true))
+      // The start that delivers it is under way, and the reply still waits for it.
+      const before = starts
+      await vi.waitFor(() => expect(starts).toBeGreaterThan(before))
+      await new Promise((resolve) => setTimeout(resolve, 20))
+      expect(answered).toBe(false)
+      open()
+      const [reply] = await releasedReply
+      // Handed over, whatever the provider has said since.
+      expect(reply).toMatchObject({
+        ok: true,
+        result: { value: { submission: { handedOverAt: expect.any(Number) } } }
+      })
+
+      const restarted = await bootHost('c')
+      startGate = new Promise((resolve) => (open = resolve))
+      const currentReply = await call('agentSession.send', sendParams('current', created.fence), [
+        ...released,
+        AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY
+      ])
+      expect(currentReply[0]).toMatchObject({
+        ok: true,
+        result: { value: { submission: { dispatchState: 'pending', handoverRecorded: true } } }
+      })
+      open()
+      await vi.waitFor(async () =>
+        expect(
+          (await restarted.journalSnapshot(SESSION)).submissions.every(
+            (row) => row.dispatchState !== 'pending' || row.handedOverAt
+          )
+        ).toBe(true)
+      )
+    })
   })
 })
diff --git a/tests/e2e/cross-version-wire/cross-version-worktree-ps-verdict.unit.test.ts b/tests/e2e/cross-version-wire/cross-version-worktree-ps-verdict.unit.test.ts
new file mode 100644
index 000000000000..2a111a58d7ca
--- /dev/null
+++ b/tests/e2e/cross-version-wire/cross-version-worktree-ps-verdict.unit.test.ts
@@ -0,0 +1,197 @@
+import { beforeAll, describe, expect, it } from 'vitest'
+import {
+  importReleaseCheckoutModule,
+  importWorkingTreeModuleCopy,
+  materializeReleaseCheckout
+} from './release-checkout'
+
+/**
+ * The verdict on a `worktree ps` agent row, paired across two builds.
+ *
+ * The host now sends `mainAgent` (the main agent's own state, verdict and clock) on each row,
+ * beside the `interrupted` flag every build reads. That is Rule 1 only if an old phone still reads
+ * a new host's row by the flag, and a new phone reads an old host's row, which has no `mainAgent`,
+ * by the same flag. Both halves run a real old build here rather than being reasoned about.
+ *
+ * The pre-change ref is pinned rather than derived: a newer baseline would carry the new reader,
+ * and every "old reader" cell would then pair the change against itself.
+ */
+const PRE_CHANGE_REF = 'v1.4.216-rc.0.zy01'
+const SUITE_TIMEOUT_MS = 180_000
+// Both builds load a copy in the checkout cache, out of reach of `mobile/tsconfig.json`.
+const PHONE_ROW_READER = 'mobile/src/worktree/agent-row-display.ts'
+
+const WORKTREE_ID = 'repo::/worktree'
+const NOW = 1_000_000
+
+type HookSnapshot = Record<string, unknown>
+type AgentRow = Record<string, unknown>
+type DotState = (row: AgentRow, now: number) => string
+
+type HostRowModules = {
+  collectRuntimeWorktreeAgentSources: (args: Record<string, unknown>) => unknown
+  attachRuntimeWorktreeAgentRows: (args: Record<string, unknown>) => void
+}
+
+type Build = {
+  label: string
+  host: HostRowModules
+  agentDotState: DotState
+}
+
+function snapshot(
+  tabId: string,
+  fields: Pick<HookSnapshot, 'state'> & Partial<HookSnapshot>
+): HookSnapshot {
+  return {
+    paneKey: `${tabId}:11111111-1111-4111-8111-111111111111`,
+    tabId,
+    worktreeId: WORKTREE_ID,
+    connectionId: null,
+    prompt: 'ship it',
+    agentType: 'claude',
+    receivedAt: NOW - 1_000,
+    stateStartedAt: NOW - 600_000,
+    ...fields
+  }
+}
+
+// The three verdicts the change separates: a failure the old flag cannot express, the same
+// failure while subagents keep the row working, and a stop the old flag already carries.
+const SNAPSHOTS: HookSnapshot[] = [
+  snapshot('failed-done', {
+    state: 'done',
+    mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: NOW - 600_000 }
+  }),
+  snapshot('failed-working', {
+    state: 'working',
+    mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: NOW - 120_000 }
+  }),
+  snapshot('stopped', {
+    state: 'done',
+    interrupted: true,
+    mainAgent: { state: 'done', outcome: 'cancellation', stateStartedAt: NOW - 600_000 }
+  })
+]
+
+/** A host's `worktree ps` rows, JSON round-tripped as the wire carries them. */
+function publishRows(host: HostRowModules): Record<string, AgentRow> {
+  const summary: Record<string, unknown> = {
+    worktreeId: WORKTREE_ID,
+    status: 'inactive',
+    hasHostSidebarActivity: false,
+    agents: []
+  }
+  host.attachRuntimeWorktreeAgentRows({
+    summaries: new Map([[WORKTREE_ID, summary]]),
+    pathIndex: { byPath: new Map(), byRealPath: new Map() },
+    missingWorktreeIds: new Set(),
+    workingTerminalEvidenceByWorktreeId: new Map(),
+    rowSources: host.collectRuntimeWorktreeAgentSources({
+      hookSnapshots: SNAPSHOTS,
+      mirroredWorktreeIdByTabId: new Map(),
+      connectedPtyEvidence: {
+        tabIds: new Set(SNAPSHOTS.map((row) => row.tabId)),
+        paneKeys: new Set(),
+        ptyIdByTerminalHandle: new Map()
+      }
+    }),
+    orchestrationByPaneKey: null,
+    getSummary: (map: Map<string, unknown>, _paths: unknown, _missing: unknown, id: string) =>
+      map.get(id) ?? null
+  })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: JSON.parse of the rows the host just attached, which are plain objects keyed by paneKey.
+  const rows = JSON.parse(JSON.stringify(summary.agents)) as AgentRow[]
+  return Object.fromEntries(rows.map((row) => [String(row.paneKey).split(':')[0], row]))
+}
+
+function dotStates(build: Build, rows: Record<string, AgentRow>): Record<string, string> {
+  return Object.fromEntries(
+    Object.entries(rows).map(([tabId, row]) => [tabId, build.agentDotState(row, NOW)])
+  )
+}
+
+async function loadBuild(ref: string | null): Promise<Build> {
+  if (ref === null) {
+    const [sources, rows, display] = await Promise.all([
+      import('../../../src/main/runtime/runtime-worktree-agent-sources'),
+      import('../../../src/main/runtime/runtime-worktree-agent-rows'),
+      importWorkingTreeModuleCopy(PHONE_ROW_READER)
+    ])
+    return {
+      label: 'current',
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a dynamic import is typed by its module; this spec drives both builds through one untyped surface.
+      host: { ...sources, ...rows } as unknown as HostRowModules,
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a dynamic import of a copy is typed unknown; this is the current phone's row reader by path.
+      agentDotState: display.agentDotState as unknown as DotState
+    }
+  }
+  const checkout = await materializeReleaseCheckout(ref)
+  const [sources, rows, display] = await Promise.all([
+    importReleaseCheckoutModule(checkout, 'src/main/runtime/runtime-worktree-agent-sources.ts'),
+    importReleaseCheckoutModule(checkout, 'src/main/runtime/runtime-worktree-agent-rows.ts'),
+    importReleaseCheckoutModule(checkout, PHONE_ROW_READER)
+  ])
+  return {
+    label: ref,
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a dynamic import is typed unknown; these two modules are the old host's row surface by path.
+    host: { ...sources, ...rows } as unknown as HostRowModules,
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a dynamic import is typed unknown; this is the old phone's row reader by path.
+    agentDotState: display.agentDotState as unknown as DotState
+  }
+}
+
+let oldBuild: Build
+let newBuild: Build
+let agentRowTimeAt: (row: AgentRow) => number
+
+beforeAll(async () => {
+  ;[oldBuild, newBuild] = await Promise.all([loadBuild(PRE_CHANGE_REF), loadBuild(null)])
+  const display = await importWorkingTreeModuleCopy(PHONE_ROW_READER)
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the rows are JSON the current host published, so the current reader's row type holds.
+  agentRowTimeAt = display.agentRowTimeAt as unknown as (row: AgentRow) => number
+}, SUITE_TIMEOUT_MS)
+
+describe('cross-version worktree ps verdict', () => {
+  it('pairs two real builds that disagree on the row shape', () => {
+    // Anti-vacuous-pass oracle: one module resolved twice would make every cell same-version.
+    expect(oldBuild.agentDotState).not.toBe(newBuild.agentDotState)
+    expect(Object.values(publishRows(oldBuild.host)).some((row) => 'mainAgent' in row)).toBe(false)
+    expect(Object.values(publishRows(newBuild.host)).every((row) => 'mainAgent' in row)).toBe(true)
+  })
+
+  it('an OLD phone reads a new host row by the interrupted flag it always read', () => {
+    const rows = publishRows(newBuild.host)
+    expect(rows.stopped).toMatchObject({ interrupted: true })
+    expect(dotStates(oldBuild, rows)).toEqual({
+      'failed-done': 'done',
+      'failed-working': 'working',
+      stopped: 'interrupted'
+    })
+  })
+
+  it('a NEW phone reads an old host row, which has no mainAgent, by the same flag', () => {
+    const rows = publishRows(oldBuild.host)
+    expect(dotStates(newBuild, rows)).toEqual({
+      'failed-done': 'done',
+      'failed-working': 'working',
+      stopped: 'interrupted'
+    })
+    // Without the main agent's clock the row dates itself, as it always did.
+    expect(agentRowTimeAt(rows['failed-working'])).toBe(NOW - 600_000)
+  })
+
+  it('a NEW phone reads a new host failure as failed, dated by the main agent clock', () => {
+    const rows = publishRows(newBuild.host)
+    expect(dotStates(newBuild, rows)).toEqual({
+      'failed-done': 'failed',
+      'failed-working': 'failed',
+      stopped: 'interrupted'
+    })
+    expect(rows['failed-working']).toMatchObject({
+      state: 'working',
+      mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: NOW - 120_000 }
+    })
+    expect(agentRowTimeAt(rows['failed-working'])).toBe(NOW - 120_000)
+  })
+})
diff --git a/tests/e2e/cross-version-wire/release-checkout-tree.ts b/tests/e2e/cross-version-wire/release-checkout-tree.ts
index 14674bfeefd3..b5f97e78b242 100644
--- a/tests/e2e/cross-version-wire/release-checkout-tree.ts
+++ b/tests/e2e/cross-version-wire/release-checkout-tree.ts
@@ -6,7 +6,15 @@ const CHECKOUT_MAX_OUTPUT_BYTES = 1024 * 1024
 
 // Why: the wire endpoints only need the runtime RPC host, the renderer client, and
 // the shared codec. Skipping cli/relay keeps a cold CI extraction a few seconds.
-const ARCHIVE_PATHS = ['src/main', 'src/shared', 'src/preload', 'src/renderer', 'src/types']
+// The phone's `worktree ps` row reader is one self-contained file, so it rides along alone.
+const ARCHIVE_PATHS = [
+  'src/main',
+  'src/shared',
+  'src/preload',
+  'src/renderer',
+  'src/types',
+  'mobile/src/worktree/agent-row-display.ts'
+]
 
 const ALIAS_SPECIFIER =
   /(\bfrom\s*|\bimport\s*\(\s*|\brequire\s*\(\s*)(['"])@(renderer)?\/([^'"]+)\2/g
diff --git a/tests/e2e/cross-version-wire/release-checkout.ts b/tests/e2e/cross-version-wire/release-checkout.ts
index bb7e23b8470c..a8dd7cc9e99a 100644
--- a/tests/e2e/cross-version-wire/release-checkout.ts
+++ b/tests/e2e/cross-version-wire/release-checkout.ts
@@ -1,6 +1,6 @@
 import { execFileSync } from 'node:child_process'
 import { constants } from 'node:fs'
-import { access, mkdtemp, mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises'
+import { access, copyFile, mkdtemp, mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises'
 import { dirname, isAbsolute, join, relative, resolve, sep } from 'node:path'
 import { lock } from 'proper-lockfile'
 import {
@@ -12,7 +12,7 @@ export const REPO_ROOT = resolve(import.meta.dirname, '..', '..', '..')
 const DEFAULT_CACHE_ROOT = join(REPO_ROOT, 'tests', 'e2e', '.cross-version-checkouts')
 
 // Bump when extraction or the alias rewrite changes so cached trees are rebuilt.
-const CHECKOUT_FORMAT = 3
+const CHECKOUT_FORMAT = 4
 
 const BASELINE_REF_ENV = 'ORCA_CROSS_VERSION_BASELINE_REF'
 const STABLE_DESKTOP_RELEASE_TAG = /^v\d+\.\d+\.\d+$/
@@ -187,10 +187,10 @@ async function assertCheckoutWireSurface(root: string, ref: string): Promise<voi
   }
 }
 
-function checkoutModulePath(checkout: ReleaseCheckout, rootRelativePath: string): string {
+function checkoutModulePath(root: string, rootRelativePath: string): string {
   const fromRoot = rootRelativePath.replace(/^[/\\]+/, '')
-  const absolute = resolve(checkout.root, fromRoot)
-  const fromCheckout = relative(checkout.root, absolute)
+  const absolute = resolve(root, fromRoot)
+  const fromCheckout = relative(root, absolute)
   if (
     !fromRoot ||
     fromCheckout === '..' ||
@@ -218,7 +218,28 @@ export function importReleaseCheckoutModule(
   importModule: (specifier: string) => Promise<Record<string, unknown>> = (specifier) =>
     import(/* @vite-ignore */ specifier) as Promise<Record<string, unknown>>
 ): Promise<Record<string, unknown>> {
-  return importModule(checkoutModulePath(checkout, rootRelativePath))
+  return importModule(checkoutModulePath(checkout.root, rootRelativePath))
+}
+
+/**
+ * Import a copy of a self-contained working-tree module placed under the cache root.
+ *
+ * Why: vite transforms a file against its nearest tsconfig, and `mobile/tsconfig.json` extends
+ * Expo's, which the root-only CI lane does not install. The copy gets the root tsconfig, as the
+ * release checkout's copy does. A relative runtime import would not resolve from the copy.
+ */
+export async function importWorkingTreeModuleCopy(
+  rootRelativePath: string,
+  cacheRoot: string = DEFAULT_CACHE_ROOT
+): Promise<Record<string, unknown>> {
+  const copy = checkoutModulePath(join(cacheRoot, 'working-tree'), rootRelativePath)
+  const staged = `${copy}.${process.pid}.tmp`
+  await mkdir(dirname(copy), { recursive: true })
+  await copyFile(checkoutModulePath(REPO_ROOT, rootRelativePath), staged)
+  // Rename so a concurrent run never imports a half-written copy.
+  await rename(staged, copy)
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a module namespace is a plain record of its exports; callers narrow each export they read.
+  return import(/* @vite-ignore */ copy) as Promise<Record<string, unknown>>
 }
 
 /**
diff --git a/tests/e2e/cross-version-wire/structured-agent-session-surface-manifest.ts b/tests/e2e/cross-version-wire/structured-agent-session-surface-manifest.ts
index d8c8b80b3293..f827d3cda5f7 100644
--- a/tests/e2e/cross-version-wire/structured-agent-session-surface-manifest.ts
+++ b/tests/e2e/cross-version-wire/structured-agent-session-surface-manifest.ts
@@ -115,7 +115,8 @@ export const STRUCTURED_CALLS: {
     hostMethod: 'revealSession',
     result: { ok: true, sessionId: SESSION, workspaceId: WORKSPACE, agent: 'codex', readable: true }
   },
-  { method: 'agentSession.hold', hostMethod: 'hold', result: { held: true } },
+  // A no-op on a host that starts an agent only for work; it still builds the host.
+  { method: 'agentSession.hold', hostMethod: null, result: { held: true } },
   // The restart-resume surface. Bare additions, not capability-negotiated: an RPC method's
   // absence is explicit (`method_not_found`), which the old-dispatcher case below asserts, so a
   // newer client learns it during negotiation instead of by being met with silence.
@@ -129,17 +130,14 @@ export const STRUCTURED_CALLS: {
     hostMethod: 'restartResumableDismiss',
     result: { dismissed: 0 }
   },
-  {
-    method: 'agentSession.restartResume',
-    hostMethod: 'restartResumeAll',
-    result: { results: [] }
-  },
+  // Reattaching alone is nothing now, so this answers that nothing was resumed.
+  { method: 'agentSession.restartResume', hostMethod: null, result: { results: [] } },
   {
     method: 'agentSession.restartContinue',
     hostMethod: 'restartContinueAll',
     result: { resumed: [], continued: [] }
   },
-  { method: 'agentSession.release', hostMethod: 'release', result: { released: true } },
+  { method: 'agentSession.release', hostMethod: null, result: { released: true } },
   {
     method: 'agentSession.history',
     hostMethod: 'history',
diff --git a/tests/e2e/direct-ssh-snapshot-parking.unit.test.ts b/tests/e2e/direct-ssh-snapshot-parking.unit.test.ts
new file mode 100644
index 000000000000..7ac0ec897a7f
--- /dev/null
+++ b/tests/e2e/direct-ssh-snapshot-parking.unit.test.ts
@@ -0,0 +1,290 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render } from '@testing-library/react'
+import { createElement, Fragment, useEffect } from 'react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { exportRemoteWorkspaceSession } from '../../src/shared/remote-workspace-session-projection'
+import type {
+  RemoteWorkspaceObservedSnapshot,
+  RemoteWorkspaceSnapshot
+} from '../../src/shared/remote-workspace-types'
+import {
+  resyncStaleRemoteWorkspace,
+  _resetRemoteWorkspaceStaleResyncForTests
+} from '../../src/main/ipc/remote-workspace-stale-resync'
+import {
+  clearRemoteWorkspaceSnapshotCache,
+  rememberLocallyPatchedRemoteWorkspaceSnapshot,
+  rememberRemoteWorkspaceSnapshot
+} from '../../src/main/ipc/remote-workspace-snapshot-cache'
+import type { DirectSshAuthority, SshProviderEpoch, SshTarget } from '../../src/shared/ssh-types'
+import { useAppStore } from '@/store'
+import { makeTerminalTab, makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
+import { buildWorkspaceSessionPayload } from '@/lib/workspace-session'
+import { applyDirectSshRemoteWorkspaceSnapshot } from '@/hooks/remote-workspace-snapshot-apply'
+import { singlePaneLayoutSnapshot } from '@/store/slices/terminal-helpers'
+import { selectColdParkedTerminalWorktrees } from '@/components/terminal-pane/terminal-hidden-view-parking'
+import {
+  canWatcherCoverParkedTerminalTab,
+  disposeAllParkedTerminalWatchers
+} from '@/components/terminal-pane/terminal-parked-tab-watchers'
+import { useTerminalTabColdParking } from '@/components/terminal-pane/use-terminal-tab-cold-parking'
+
+const { request } = vi.hoisted(() => ({ request: vi.fn() }))
+
+vi.mock('../../src/main/ipc/ssh', () => ({
+  getActiveMultiplexer: () => ({ request })
+}))
+
+vi.mock('@/components/terminal-pane/parked-terminal-byte-watcher', () => ({
+  startParkedTerminalByteWatcher: () => () => {}
+}))
+
+const START_MS = 1_000_000
+const TARGET_ID = 'ssh-parking-host'
+const TARGET: SshTarget = {
+  id: TARGET_ID,
+  label: 'SSH',
+  host: 'example.test',
+  port: 22,
+  username: 'dev'
+}
+const ptyIdFor = (tabId: string): string => `ssh:${TARGET_ID}@@${tabId}`
+const WORKTREE_ID = 'repo-ssh::/work/ssh-parking'
+const LEAF_ID = '11111111-1111-4111-8111-111111111111'
+const TABS = ['tab-a', 'tab-b'].map((id) =>
+  makeTerminalTab({ id, worktreeId: WORKTREE_ID, ptyId: ptyIdFor(id) })
+)
+const ASSIGNMENTS = new Map<string, { groupId: string; isActiveInGroup: boolean }>()
+const PORTALS: never[] = []
+const mounts = new Map<string, number>()
+const authority: DirectSshAuthority = {
+  targetId: TARGET_ID,
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: main-issued opaque tokens are stable strings; this fixture models one unchanged provider incarnation.
+  providerEpoch: 'parking-provider' as SshProviderEpoch,
+  connectionGeneration: 1
+}
+let parkedTabIds: ReadonlySet<string> = new Set()
+
+function AttachedPane({ tabId }: { tabId: string }): null {
+  useEffect(() => {
+    mounts.set(tabId, (mounts.get(tabId) ?? 0) + 1)
+    // Model transport attachment completing through the real store action.
+    const timer = setTimeout(() => {
+      useAppStore.getState().updateTabPtyId(tabId, ptyIdFor(tabId))
+    }, 1_100)
+    return () => clearTimeout(timer)
+  }, [tabId])
+  return null
+}
+
+function ParkingHost(): React.JSX.Element {
+  const tabsByWorktree = useAppStore((state) => state.tabsByWorktree)
+  const pendingStartupByTabId = useAppStore((state) => state.pendingStartupByTabId)
+  const terminalTabs = tabsByWorktree[WORKTREE_ID]
+  const parkedWorktrees = selectColdParkedTerminalWorktrees({
+    worktrees: [
+      {
+        worktreeId: WORKTREE_ID,
+        terminalTabs,
+        hiddenSinceMs: START_MS - 6 * 60_000,
+        isVisible: false,
+        shouldMeasureHiddenWorktree: false,
+        hasActivityTerminalPortal: false
+      },
+      {
+        worktreeId: 'retained-peer',
+        terminalTabs: [],
+        hiddenSinceMs: START_MS - 5 * 60_000,
+        isVisible: false,
+        shouldMeasureHiddenWorktree: false,
+        hasActivityTerminalPortal: false
+      }
+    ],
+    pendingStartupByTabId,
+    parkingEnabled: true,
+    restorePolicy: { sshParkingEnabled: true },
+    nowMs: START_MS
+  })
+  parkedTabIds = useTerminalTabColdParking({
+    worktreeId: WORKTREE_ID,
+    terminalTabs,
+    assignments: ASSIGNMENTS,
+    isWorktreeActive: false,
+    activeTerminalTabId: null,
+    coldParkTerminalPanes:
+      parkedWorktrees.has(WORKTREE_ID) &&
+      terminalTabs.every((tab) => canWatcherCoverParkedTerminalTab(WORKTREE_ID, tab)),
+    shouldMeasureHiddenWorktree: false,
+    activityTerminalPortals: PORTALS
+  })
+  return createElement(
+    Fragment,
+    null,
+    terminalTabs.map((tab) =>
+      parkedTabIds.has(tab.id) ? null : createElement(AttachedPane, { key: tab.id, tabId: tab.id })
+    )
+  )
+}
+
+function ownSnapshot(revision: number): RemoteWorkspaceSnapshot {
+  return {
+    namespace: 'workspace',
+    revision,
+    updatedAt: Date.now(),
+    schemaVersion: 1,
+    session: exportRemoteWorkspaceSession(buildWorkspaceSessionPayload(useAppStore.getState()), {
+      isTargetWorktree: (id) => id === WORKTREE_ID
+    })
+  }
+}
+
+async function applySnapshot(snapshot: RemoteWorkspaceObservedSnapshot): Promise<void> {
+  const result = await applyDirectSshRemoteWorkspaceSnapshot({
+    store: useAppStore,
+    snapshot,
+    token: {
+      authority,
+      catalogRevision: 0,
+      repoFingerprint: 'parking-repo',
+      authorityRequirement: 'required',
+      snapshotRevision: snapshot.revision,
+      outcome: 'complete'
+    },
+    arrival: snapshot.revision,
+    isArrivalCurrent: () => true,
+    isPreparationTokenCurrent: () => true,
+    waitForWorkspaceSessionReady: async () => true,
+    finalizeHydratedTerminals: () => useAppStore.getState().retryDirectSshTargetPanes(authority)
+  })
+  expect(result).toBe('applied')
+}
+
+async function deliverReadAfterOwnReply(own: RemoteWorkspaceSnapshot, read = own): Promise<void> {
+  request.mockResolvedValue(read)
+  let releaseRead: ((snapshot: RemoteWorkspaceSnapshot) => void) | undefined
+  request.mockImplementationOnce(
+    () =>
+      new Promise<RemoteWorkspaceSnapshot>((resolve) => {
+        releaseRead = resolve
+      })
+  )
+  const applies: Promise<void>[] = []
+  const errors: unknown[] = []
+  const resync = resyncStaleRemoteWorkspace(
+    TARGET,
+    (snapshot) => {
+      applies.push(applySnapshot(snapshot))
+    },
+    (error) => errors.push(error)
+  )
+  expect(request).toHaveBeenLastCalledWith('workspace.get', { namespace: expect.any(String) })
+  rememberLocallyPatchedRemoteWorkspaceSnapshot(TARGET_ID, own)
+  await act(async () => {
+    releaseRead?.(read)
+    await resync
+    await Promise.all(applies)
+  })
+  expect(errors).toEqual([])
+}
+
+describe('direct SSH snapshot delivery and parking', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+    vi.setSystemTime(START_MS)
+    mounts.clear()
+    request.mockReset()
+    clearRemoteWorkspaceSnapshotCache()
+    _resetRemoteWorkspaceStaleResyncForTests()
+    Object.defineProperty(window, 'api', {
+      configurable: true,
+      value: {
+        pty: {
+          onData: () => () => {},
+          onReplay: () => () => {},
+          onExit: () => () => {}
+        }
+      }
+    })
+    disposeAllParkedTerminalWatchers()
+    useAppStore.setState({
+      ...useAppStore.getInitialState(),
+      workspaceSessionReady: true,
+      hydrationSucceeded: true,
+      repos: [
+        {
+          id: 'repo-ssh',
+          path: '/work',
+          displayName: 'SSH',
+          badgeColor: 'blue',
+          addedAt: 0,
+          connectionId: TARGET_ID
+        }
+      ],
+      worktreesByRepo: {
+        'repo-ssh': [
+          makeWorktree({
+            id: WORKTREE_ID,
+            repoId: 'repo-ssh',
+            path: '/work/ssh-parking',
+            hostId: `ssh:${TARGET_ID}`
+          })
+        ]
+      },
+      sshConnectionStates: new Map([
+        [TARGET_ID, { ...authority, status: 'connected', error: null, reconnectAttempt: 0 }]
+      ]),
+      tabsByWorktree: { [WORKTREE_ID]: TABS },
+      ptyIdsByTabId: Object.fromEntries(TABS.map((tab) => [tab.id, [ptyIdFor(tab.id)]])),
+      lastKnownRelayPtyIdByTabId: Object.fromEntries(TABS.map((tab) => [tab.id, ptyIdFor(tab.id)])),
+      terminalLayoutsByTabId: Object.fromEntries(
+        TABS.map((tab) => [tab.id, singlePaneLayoutSnapshot(LEAF_ID, ptyIdFor(tab.id))])
+      )
+    })
+  })
+
+  afterEach(() => {
+    cleanup()
+    disposeAllParkedTerminalWatchers()
+    useAppStore.setState(useAppStore.getInitialState(), true)
+    vi.useRealTimers()
+  })
+
+  it('keeps panes parked through pending-read own echoes while still applying a peer edit', async () => {
+    render(createElement(ParkingHost))
+    expect(parkedTabIds).toEqual(new Set(TABS.map((tab) => tab.id)))
+    expect(mounts.size).toBe(0)
+    rememberRemoteWorkspaceSnapshot(TARGET_ID, ownSnapshot(0))
+
+    // Visibility, ordering, measurement and saved PTY coverage stay unchanged throughout.
+
+    for (let revision = 1; revision <= 4; revision += 1) {
+      act(() => {
+        vi.advanceTimersByTime(2_000)
+        useAppStore.getState().updateTabTitle('tab-a', `Local title ${revision}`)
+      })
+      await deliverReadAfterOwnReply(ownSnapshot(revision))
+      expect(parkedTabIds).toEqual(new Set(TABS.map((tab) => tab.id)))
+      expect(mounts.size).toBe(0)
+    }
+
+    const own = ownSnapshot(5)
+    const peer = structuredClone(own)
+    peer.revision = 6
+    for (const tabs of Object.values(peer.session.tabsByWorktreePath)) {
+      for (const tab of tabs) {
+        if (tab.id === 'tab-a') {
+          tab.title = 'Peer title'
+        }
+      }
+    }
+    await deliverReadAfterOwnReply(own, peer)
+    expect(useAppStore.getState().tabsByWorktree[WORKTREE_ID][0].title).toBe('Peer title')
+    expect([...mounts.values()]).toEqual([1, 1])
+    expect(parkedTabIds.size).toBe(0)
+    act(() => vi.advanceTimersByTime(1_100))
+    expect(parkedTabIds).toEqual(new Set(TABS.map((tab) => tab.id)))
+    expect(useAppStore.getState().tabsByWorktree[WORKTREE_ID].map((tab) => tab.ptyId)).toEqual(
+      TABS.map((tab) => ptyIdFor(tab.id))
+    )
+  })
+})
diff --git a/tests/e2e/fixtures/daemon-generation-legacy-close-client.ts b/tests/e2e/fixtures/daemon-generation-legacy-close-client.ts
index 730ebbeffc9a..473071c030b5 100644
--- a/tests/e2e/fixtures/daemon-generation-legacy-close-client.ts
+++ b/tests/e2e/fixtures/daemon-generation-legacy-close-client.ts
@@ -1,11 +1,13 @@
 import { readFileSync } from 'node:fs'
 import process from 'node:process'
+import type { Store } from '../../../src/main/persistence'
 import { OrcaRuntimeService } from '../../../src/main/runtime/orca-runtime'
 import { RpcDispatcher } from '../../../src/main/runtime/rpc/dispatcher'
 import { SESSION_TAB_METHODS } from '../../../src/main/runtime/rpc/methods/session-tabs'
 import { SESSION_TAB_CLOSE_INTENT_RUNTIME_CAPABILITY } from '../../../src/shared/protocol-version'
 import type { RuntimeMobileSessionTabsSnapshot } from '../../../src/shared/runtime-types'
 import { createDesktopDiscoveredDaemonRouter } from './daemon-generation-desktop-discovery'
+import { createDaemonGenerationProfileStore } from './daemon-generation-profile-store'
 
 type FixtureSession = {
   protocolVersion: number
@@ -126,6 +128,7 @@ async function waitForFinish(): Promise<void> {
 async function main(): Promise<void> {
   const config = readConfig()
   const { router } = await createDesktopDiscoveredDaemonRouter(config)
+  let store: Store | null = null
   try {
     const outputBySessionId = new Map<string, string>()
     router.onData((event) => {
@@ -149,7 +152,8 @@ async function main(): Promise<void> {
       }
     }
 
-    const runtime = new OrcaRuntimeService()
+    store = createDaemonGenerationProfileStore(config.cwd)
+    const runtime = new OrcaRuntimeService(store)
     const calls: Record<string, unknown>[] = []
     const sessionByTabId = new Map(config.sessions.map((session) => [session.tabId, session]))
     runtime.setPtyController({
@@ -296,6 +300,7 @@ async function main(): Promise<void> {
   } finally {
     await router.disconnectOnly().catch(() => {})
     router.dispose()
+    await store?.freezeWritesAsync()
   }
 }
 
diff --git a/tests/e2e/fixtures/daemon-generation-profile-store.ts b/tests/e2e/fixtures/daemon-generation-profile-store.ts
new file mode 100644
index 000000000000..a709d84bcc8f
--- /dev/null
+++ b/tests/e2e/fixtures/daemon-generation-profile-store.ts
@@ -0,0 +1,14 @@
+import path from 'node:path'
+import { installOrcadHostAdapters } from '../../../src/main/orcad/orcad-entry'
+import type { Store } from '../../../src/main/persistence'
+import { createProfileStateStore } from '../../../src/main/persistence/profile-state/profile-state-store-factory'
+
+export function createDaemonGenerationProfileStore(directory: string): Store {
+  installOrcadHostAdapters()
+  // The bundled fixture has no profile writer worker; use the synchronous SQLite authority.
+  return createProfileStateStore({
+    dataFile: path.join(directory, 'orca-data.json'),
+    databaseFile: path.join(directory, 'profile-state.sqlite'),
+    profileId: 'legacy-close-fixture'
+  }).store
+}
diff --git a/tests/e2e/global-setup-cli-artifact.unit.test.ts b/tests/e2e/global-setup-cli-artifact.unit.test.ts
new file mode 100644
index 000000000000..4c22d1a219d5
--- /dev/null
+++ b/tests/e2e/global-setup-cli-artifact.unit.test.ts
@@ -0,0 +1,85 @@
+import path from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const fixture = vi.hoisted(() => ({
+  exec: vi.fn(),
+  exists: vi.fn(),
+  write: vi.fn()
+}))
+
+vi.mock('node:child_process', () => ({ execSync: fixture.exec }))
+vi.mock('node:fs', () => ({
+  existsSync: fixture.exists,
+  mkdirSync: vi.fn(),
+  mkdtempSync: (prefix: string) => `${prefix}fixture`,
+  realpathSync: (value: string) => value,
+  writeFileSync: fixture.write
+}))
+vi.mock('./helpers/docker-ssh-relay-image', () => ({ prepareDockerSshRelayImage: vi.fn() }))
+
+import globalSetup from './global-setup'
+
+beforeEach(() => {
+  vi.resetAllMocks()
+  fixture.exists.mockReturnValue(true)
+  for (const name of [
+    'SKIP_BUILD',
+    'ORCA_E2E_WEB_CLIENT',
+    'ORCA_E2E_SSH_LOCALHOST',
+    'ORCA_E2E_SSH_DOCKER',
+    'ORCA_E2E_NESTED_RUNTIME_SSH',
+    'ORCA_E2E_SKILL_STAGING',
+    'ORCA_E2E_TEST_REPO_PATH_FILE'
+  ]) {
+    vi.stubEnv(name, '')
+  }
+})
+
+afterEach(() => vi.unstubAllEnvs())
+
+function commands(): string[] {
+  return fixture.exec.mock.calls.map(([command]) => command)
+}
+
+describe('E2E shared CLI artifact', () => {
+  it('repairs downloaded permissions and installs the local launcher without recompiling', () => {
+    vi.stubEnv('SKIP_BUILD', '1')
+    globalSetup()
+    const prepare = commands().find((command) => command.includes('prepare:cli-output'))
+    expect(prepare).toBe('pnpm run prepare:cli-output')
+    expect(commands()).not.toContain('pnpm run build:cli')
+    expect(commands()).toContain('git init')
+    expect(fixture.exec.mock.calls.find(([command]) => command === prepare)?.[1]).toEqual({
+      cwd: process.cwd(),
+      stdio: 'inherit',
+      timeout: 120_000
+    })
+  })
+
+  it('builds a missing CLI even when the other artifacts exist', () => {
+    vi.stubEnv('SKIP_BUILD', '1')
+    fixture.exists.mockImplementation(
+      (file) => file !== path.join(process.cwd(), 'out', 'cli', 'index.js')
+    )
+    globalSetup()
+    expect(commands()).toContain('pnpm run build:cli')
+    expect(commands().some((command) => command.includes('prepare:cli-output'))).toBe(false)
+  })
+
+  it('rebuilds existing artifacts when reuse is not requested', () => {
+    globalSetup()
+    expect(commands()).toContain('npx electron-vite build --mode e2e')
+    expect(commands()).toContain('pnpm run build:cli')
+  })
+
+  it('fails setup if the downloaded CLI cannot be verified', () => {
+    vi.stubEnv('SKIP_BUILD', '1')
+    fixture.exec.mockImplementation((command) => {
+      if (command.includes('prepare:cli-output')) {
+        throw new Error('Invalid CLI artifact')
+      }
+    })
+    expect(() => globalSetup()).toThrow('Invalid CLI artifact')
+    expect(commands()).not.toContain('git init')
+  })
+})
diff --git a/tests/e2e/global-setup.ts b/tests/e2e/global-setup.ts
index cd5d9b3c4e0b..210c713159b1 100644
--- a/tests/e2e/global-setup.ts
+++ b/tests/e2e/global-setup.ts
@@ -54,6 +54,12 @@ export default function globalSetup(): void {
   }
   if (process.env.SKIP_BUILD && existsSync(outCli)) {
     console.error('[e2e] SKIP_BUILD set and out/cli/index.js exists — skipping CLI build')
+    // Artifact downloads lose executable bits; each runner still needs its local dev launcher.
+    execSync('pnpm run prepare:cli-output', {
+      cwd: root,
+      stdio: 'inherit',
+      timeout: CLI_E2E_BUILD_TIMEOUT_MS
+    })
   } else {
     console.error('[e2e] Building bundled CLI...')
     execSync('pnpm run build:cli', {
diff --git a/tests/e2e/helpers/completed-worker-retirement-fixture.ts b/tests/e2e/helpers/completed-worker-retirement-fixture.ts
index 5ac0d8c1948e..89ae5297fe4e 100644
--- a/tests/e2e/helpers/completed-worker-retirement-fixture.ts
+++ b/tests/e2e/helpers/completed-worker-retirement-fixture.ts
@@ -20,14 +20,34 @@ import { buildFakeAgentCommandOverride } from './fake-agent-command-override'
 import { FAKE_AGENT_PASTE_END_SCANNER_SOURCE } from './fake-agent-paste-end-scanner'
 
 const fakeCliDir = mkdtempSync(path.join(os.tmpdir(), 'orca-e2e-retired-worker-'))
+const recoveryConfigPath = path.join(fakeCliDir, 'recovery-config.json')
 const lifecycleLedgerPath = path.join(fakeCliDir, 'codex-lifecycle.jsonl')
 export const completedWorkerFakeCodexCommand = buildFakeAgentCommandOverride(
   path.join(fakeCliDir, process.platform === 'win32' ? 'codex.cmd' : 'codex')
 )
 const fakeCodexSource = `
-const { appendFileSync } = require('node:fs')
+const { appendFileSync, readFileSync } = require('node:fs')
 const ledger = process.env.ORCA_E2E_CODEX_LIFECYCLE_LEDGER
 const append = (event) => appendFileSync(ledger, JSON.stringify({ pid: process.pid, ...event }) + '\\n')
+async function publishRecovery() {
+  const config = JSON.parse(readFileSync(${JSON.stringify(recoveryConfigPath)}, 'utf8'))
+  for (const hook_event_name of ['UserPromptSubmit', 'Stop']) {
+    const response = await fetch('http://127.0.0.1:' + process.env.ORCA_AGENT_HOOK_PORT + '/hook/codex', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json', 'X-Orca-Agent-Hook-Token': process.env.ORCA_AGENT_HOOK_TOKEN },
+      body: JSON.stringify({
+        paneKey: process.env.ORCA_PANE_KEY,
+        tabId: process.env.ORCA_TAB_ID,
+        worktreeId: process.env.ORCA_WORKTREE_ID,
+        launchToken: process.env.ORCA_AGENT_LAUNCH_TOKEN,
+        env: process.env.ORCA_AGENT_HOOK_ENV,
+        version: process.env.ORCA_AGENT_HOOK_VERSION,
+        payload: { hook_event_name, prompt: 'Report completion, then exit normally', ...config }
+      })
+    })
+    if (response.status !== 204) throw new Error('Recovery hook rejected: ' + response.status)
+  }
+}
 const args = process.argv.slice(2)
 if (args.includes('app-server')) {
   process.stderr.write("error: unrecognized subcommand 'app-server'\\n")
@@ -44,6 +64,10 @@ process.stdin.on('data', (chunk) => {
     process.stdout.write('\\x1b[?25h')
   }
   append({ event: 'input', input })
+  if (input.includes('ORCA_E2E_PUBLISH_DONE')) {
+    void publishRecovery().catch((error) => process.stderr.write(String(error)))
+    return
+  }
   if (input.includes('ORCA_E2E_EXIT_AFTER_DONE')) {
     append({ event: 'normal-exit' })
     process.exit(0)
@@ -179,6 +203,10 @@ export function seedCurrentCodexTranscript(
       payload: { id: providerSessionId, cwd }
     })}\n`
   )
+  writeFileSync(
+    recoveryConfigPath,
+    JSON.stringify({ session_id: providerSessionId, transcript_path: transcriptPath })
+  )
   return transcriptPath
 }
 
diff --git a/tests/e2e/helpers/daemon-generation-runtime-fixture.ts b/tests/e2e/helpers/daemon-generation-runtime-fixture.ts
index 88111024368d..332d21aa2712 100644
--- a/tests/e2e/helpers/daemon-generation-runtime-fixture.ts
+++ b/tests/e2e/helpers/daemon-generation-runtime-fixture.ts
@@ -1,4 +1,12 @@
-import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import {
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  symlinkSync,
+  writeFileSync
+} from 'node:fs'
 import { homedir, tmpdir } from 'node:os'
 import path from 'node:path'
 import { build } from 'esbuild'
@@ -109,6 +117,12 @@ export async function createDaemonGenerationRuntime(
   const reconnectClientEntryPath = path.join(rootDir, 'daemon-generation-reconnect-client.cjs')
   const legacyCloseClientEntryPath = path.join(rootDir, 'daemon-generation-legacy-close-client.cjs')
   const repoRoot = process.cwd()
+  // ESM imports in the bundled fixture resolve from its temp directory, not NODE_PATH.
+  symlinkSync(
+    path.join(repoRoot, 'node_modules'),
+    path.join(rootDir, 'node_modules'),
+    process.platform === 'win32' ? 'junction' : 'dir'
+  )
   await buildFixtureEntry(
     path.join(repoRoot, 'tests/e2e/fixtures/daemon-generation-entry.ts'),
     entryPath
diff --git a/tests/e2e/helpers/docker-ssh-relay-target.ts b/tests/e2e/helpers/docker-ssh-relay-target.ts
index f535b22d0737..9d96859968ee 100644
--- a/tests/e2e/helpers/docker-ssh-relay-target.ts
+++ b/tests/e2e/helpers/docker-ssh-relay-target.ts
@@ -200,6 +200,36 @@ export function blockDockerSshRelayTargetTcpForwarding(target: DockerSshRelayTar
   )
 }
 
+/**
+ * Makes the target unreachable over SSH while the container, its fixtures and `docker exec` stay
+ * up: sshd re-binds to the container's loopback, so the published port stops reaching it. Only new
+ * connections are refused; an established session lives until its client closes it. Returns once
+ * a real ssh client fails to connect, so a config that silently failed to apply surfaces here.
+ */
+export function refuseDockerSshRelayTargetConnections(target: DockerSshRelayTarget): void {
+  // Why HUP, not a restart: see blockDockerSshRelayTargetTcpForwarding — PID 1 is sshd.
+  execDockerSshRelayTargetControlCommand(
+    target,
+    "printf '%s\\n' 'ListenAddress 127.0.0.1' >> /etc/ssh/sshd_config; kill -HUP 1"
+  )
+  const deadline = Date.now() + 60_000
+  let lastProbe = ''
+  while (Date.now() < deadline) {
+    const result = spawnSync('ssh', sshArgs(target, 'true'), {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+      timeout: 15_000
+    })
+    lastProbe = result.stderr || result.stdout || `exit ${result.status}`
+    // Why the auth check: a refusal must look like a dead host, never a credential prompt.
+    if (result.status !== 0 && !/permission denied/i.test(lastProbe)) {
+      return
+    }
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 500)
+  }
+  throw new Error(`sshd kept accepting connections after ListenAddress 127.0.0.1: ${lastProbe}`)
+}
+
 export function writeDockerSshRelayTargetFile(
   target: DockerSshRelayTarget,
   filePath: string,
diff --git a/tests/e2e/helpers/terminal-kitty-keyboard.ts b/tests/e2e/helpers/terminal-kitty-keyboard.ts
new file mode 100644
index 000000000000..61b298a4c3eb
--- /dev/null
+++ b/tests/e2e/helpers/terminal-kitty-keyboard.ts
@@ -0,0 +1,122 @@
+import type { ElectronApplication, Page } from '@stablyai/playwright-test'
+import { expect } from './orca-app'
+import { execInTerminal, focusActiveTerminalInput } from './terminal'
+import { clearTerminalPtyWriteLog, readTerminalPtyWrites } from './terminal-pty-write-spy'
+
+async function dispatchCtrlCToActiveTerminalTextarea(
+  page: Page,
+  options: { keyupCtrlKey?: boolean } = {}
+): Promise<{
+  keydownDefaultPrevented: boolean
+  keyupDefaultPrevented: boolean
+}> {
+  return page.evaluate((dispatchOptions) => {
+    const state = window.__store?.getState()
+    const worktreeId = state?.activeWorktreeId
+    const tabId =
+      state?.activeTabType === 'terminal'
+        ? state.activeTabId
+        : worktreeId
+          ? (state?.activeTabIdByWorktree?.[worktreeId] ?? null)
+          : null
+    const manager = tabId ? window.__paneManagers?.get(tabId) : null
+    const pane = manager?.getActivePane?.() ?? manager?.getPanes?.()[0] ?? null
+    const textarea = pane?.container.querySelector(
+      '.xterm-helper-textarea'
+    ) as HTMLTextAreaElement | null
+    if (!pane || !textarea) {
+      throw new Error('No active terminal textarea for Ctrl+C dispatch')
+    }
+    pane.terminal.clearSelection()
+    pane.terminal.focus()
+    textarea.focus()
+
+    const createEvent = (type: 'keydown' | 'keyup', ctrlKey: boolean): KeyboardEvent => {
+      const event = new KeyboardEvent(type, {
+        key: 'c',
+        code: 'KeyC',
+        ctrlKey,
+        bubbles: true,
+        cancelable: true
+      })
+      Object.defineProperty(event, 'keyCode', { get: () => 67 })
+      Object.defineProperty(event, 'which', { get: () => 67 })
+      return event
+    }
+
+    // Why: Electron headless consumes real Ctrl+C before xterm in automation;
+    // synthetic DOM events still exercise Orca's installed xterm boundary.
+    const keydown = createEvent('keydown', true)
+    textarea.dispatchEvent(keydown)
+    const keyup = createEvent('keyup', dispatchOptions.keyupCtrlKey !== false)
+    textarea.dispatchEvent(keyup)
+    return {
+      keydownDefaultPrevented: keydown.defaultPrevented,
+      keyupDefaultPrevented: keyup.defaultPrevented
+    }
+  }, options)
+}
+
+export async function getKittyKeyboardFlags(page: Page): Promise<number | null> {
+  return page.evaluate(() => {
+    const state = window.__store?.getState()
+    const worktreeId = state?.activeWorktreeId
+    const tabId =
+      state?.activeTabType === 'terminal'
+        ? state.activeTabId
+        : worktreeId
+          ? (state?.activeTabIdByWorktree?.[worktreeId] ?? null)
+          : null
+    const manager = tabId ? window.__paneManagers?.get(tabId) : null
+    const pane = manager?.getActivePane?.() ?? manager?.getPanes?.()[0] ?? null
+    const terminal = pane?.terminal as
+      | {
+          core?: { coreService?: { kittyKeyboard?: { flags?: number } } }
+          _core?: { coreService?: { kittyKeyboard?: { flags?: number } } }
+        }
+      | undefined
+    return (
+      terminal?.core?.coreService?.kittyKeyboard?.flags ??
+      terminal?._core?.coreService?.kittyKeyboard?.flags ??
+      null
+    )
+  })
+}
+
+// Why arm from the PTY: the mirror the shortcut policy reads only sees application output.
+export async function armKittyKeyboardFromPty(
+  page: Page,
+  ptyId: string,
+  command: string
+): Promise<void> {
+  await execInTerminal(page, ptyId, command)
+  await expect
+    .poll(async () => await getKittyKeyboardFlags(page), {
+      timeout: 15_000,
+      message: 'the application never armed kitty keyboard reporting'
+    })
+    .toBe(31)
+}
+
+export async function interruptAndExpectEtx(page: Page, app: ElectronApplication): Promise<void> {
+  await clearTerminalPtyWriteLog(app)
+  await focusActiveTerminalInput(page)
+  await page.keyboard.down('Control')
+  await page.keyboard.up('Control')
+  expect((await readTerminalPtyWrites(app)).join('')).toBe('')
+  await clearTerminalPtyWriteLog(app)
+
+  expect(await dispatchCtrlCToActiveTerminalTextarea(page, { keyupCtrlKey: false })).toEqual({
+    keydownDefaultPrevented: false,
+    keyupDefaultPrevented: false
+  })
+  await expect
+    .poll(async () => (await readTerminalPtyWrites(app)).some((write) => write.includes('\x03')), {
+      timeout: 5_000,
+      message: 'Ctrl+C did not reach the PTY as ETX'
+    })
+    .toBe(true)
+  const writes = (await readTerminalPtyWrites(app)).join('')
+  expect(writes).not.toContain('\x1b[99;5u')
+  expect(writes).not.toContain('\x1b[99')
+}
diff --git a/tests/e2e/host-parked-pane-remote-viewer.spec.ts b/tests/e2e/host-parked-pane-remote-viewer.spec.ts
index 6846369f9de5..f2f8dd7fb397 100644
--- a/tests/e2e/host-parked-pane-remote-viewer.spec.ts
+++ b/tests/e2e/host-parked-pane-remote-viewer.spec.ts
@@ -45,7 +45,7 @@ import {
   launchPairedElectronClient
 } from './helpers/paired-electron-client'
 import { focusActiveTerminalInput } from './helpers/terminal'
-import { waitForTabParked } from './helpers/terminal-hidden-parking'
+import { parkHiddenTabBehindDecoy } from './helpers/terminal-hidden-parking'
 
 const PARK_DELAY_MS = 30_000
 const PAINT_BUDGET_MS = 20_000
@@ -269,19 +269,6 @@ test('a cold-parked host pane keeps serving its paired remote viewer', async ({
 
     // 3. The host cold-parks the pane the client is watching. Nobody touches
     //    it on the host again.
-    // Two decoy tabs on the host: one to age the target, one to take the
-    // most-recently-hidden exemption. Sampled before and after the park lands
-    // so decoy churn cannot be mistaken for the park itself.
-    for (let i = 0; i < 2; i += 1) {
-      await orcaPage.evaluate((id) => {
-        const state = window.__store?.getState()
-        const tab = state?.createTab(id, undefined, undefined, { activate: true })
-        if (tab) {
-          state?.setActiveTab(tab.id)
-          state?.setActiveTabType('terminal', window.__store?.getState().activeWorktreeId ?? null)
-        }
-      }, worktreeId)
-    }
     const readClientState = async (): Promise<unknown> =>
       client.page.evaluate((id) => {
         const manager = window.__paneManagers?.get(id)
@@ -292,8 +279,10 @@ test('a cold-parked host pane keeps serving its paired remote viewer', async ({
           recoveryState: pane?.container?.dataset?.ptyRecoveryState ?? null
         }
       }, webTabId)
-    console.log(`[sta2854] decoys-created client=${JSON.stringify(await readClientState())}`)
-    await waitForTabParked(orcaPage, hostTabId, { parkDelayMs: PARK_DELAY_MS })
+    console.log(`[sta2854] before-park client=${JSON.stringify(await readClientState())}`)
+    await parkHiddenTabBehindDecoy(orcaPage, worktreeId, hostTabId, {
+      parkDelayMs: PARK_DELAY_MS
+    })
     console.log(`[sta2854] post-park client=${JSON.stringify(await readClientState())}`)
 
     // Direct probe: is the host-minted terminal handle still resolvable once
diff --git a/tests/e2e/local-ssh-browser-routing.spec.ts b/tests/e2e/local-ssh-browser-routing.spec.ts
index e2f5249c93c0..427d6ebd6d14 100644
--- a/tests/e2e/local-ssh-browser-routing.spec.ts
+++ b/tests/e2e/local-ssh-browser-routing.spec.ts
@@ -6,6 +6,7 @@ import { waitForSessionReady } from './helpers/store'
 import {
   blockDockerSshRelayTargetTcpForwarding,
   cleanupDockerSshRelayTarget,
+  refuseDockerSshRelayTargetConnections,
   startDockerSshRelayTarget,
   type DockerSshRelayTarget
 } from './helpers/docker-ssh-relay-target'
@@ -88,6 +89,17 @@ async function readSshState(page: Page, targetId: string): Promise<SshState> {
   }, targetId)
 }
 
+/**
+ * The status the panes read. Main's `ssh:getState` drops a target's entry on disconnect and on a
+ * failed connect, so only the renderer store still holds a settled failure verdict.
+ */
+async function readRendererSshStatus(page: Page, targetId: string): Promise<string | null> {
+  return page.evaluate(
+    (targetId) => window.__store?.getState().sshConnectionStates.get(targetId)?.status ?? null,
+    targetId
+  )
+}
+
 /**
  * `ssh:connect` short-circuits for a still-live session, so an advancing generation here is proof
  * the `kill -9` actually landed rather than an artifact of asking for a reconnect.
@@ -570,6 +582,9 @@ test('holds the mount and offers a working local escape hatch when the SSH host
     const worktreeId = remote.worktreeId
 
     await installBrowserPaneMountCensus(orcaPage)
+    // Why: the workspace's terminal redials a disconnected host, and a redial that connects
+    // rightly recovers the route; only a host that stays unreachable can hold the card.
+    refuseDockerSshRelayTargetConnections(target)
     await orcaPage.evaluate(
       async (targetId) => window.api.ssh.disconnect({ targetId }),
       remote.targetId
@@ -620,6 +635,17 @@ test('holds the mount and offers a working local escape hatch when the SSH host
     ).toHaveCount(0)
 
     // (d) The escape hatch, proven by an origin only this device can reach.
+    await expect
+      .poll(() => readRendererSshStatus(orcaPage, remote.targetId), {
+        timeout: 180_000,
+        message: 'the redial of an unreachable host must settle as a failure, not an auth prompt'
+      })
+      .toMatch(/^(disconnected|error|reconnection-failed)$/)
+    await expect(strandedPane.getByText(SSH_UNAVAILABLE_TITLE)).toBeVisible()
+    expect(
+      (await readSshState(orcaPage, remote.targetId)).status,
+      'a host that reconnected would make this escape hatch vacuous'
+    ).not.toBe('connected')
     await strandedPane.getByRole('button', { name: BROWSE_LOCALLY_LABEL }).click()
     await expect
       .poll(
diff --git a/tests/e2e/markdown-callout-source-fidelity.spec.ts b/tests/e2e/markdown-callout-source-fidelity.spec.ts
new file mode 100644
index 000000000000..82fdf9c26ced
--- /dev/null
+++ b/tests/e2e/markdown-callout-source-fidelity.spec.ts
@@ -0,0 +1,95 @@
+import { readFileSync } from 'node:fs'
+import { test, expect } from './helpers/orca-app'
+import { waitForActiveWorktree, waitForSessionReady } from './helpers/store'
+import {
+  cleanupMarkdownFixture,
+  closeActiveEditorTab,
+  createMarkdownFixture,
+  getActiveWorktreeContext,
+  openMarkdownFixture,
+  waitForRichMarkdownEditor
+} from './helpers/markdown-editor-fixture'
+
+const ARTICLE = [
+  '---',
+  'title: Turing-Test',
+  'draft: true',
+  '---',
+  '',
+  '# Der Turing-Test',
+  '',
+  'First paragraph with user_name_field and feature~2.',
+  '',
+  '> [!wissenswert] Das Original war ein Ratespiel',
+  '> In Turings Aufsatz heißt der Test "Imitation Game".',
+  '',
+  'Second paragraph with a literal * and an unmatched `.',
+  '',
+  '> [!zeitstrahl] 75 Jahre Imitation Game',
+  '> - 1950 · Alan Turing veröffentlicht seinen Aufsatz.',
+  '> - 1980 · John Searle widerspricht.',
+  '',
+  'Third paragraph to edit.',
+  '',
+  '> [!NOTE]',
+  '> Keep this callout unchanged.',
+  '',
+  '> [!selbsttest]',
+  '> - Was bedeutet Intelligenz?',
+  ''
+].join('\n')
+
+for (const large of [false, true]) {
+  test(`keeps callout source byte-for-byte across edits, save and reopen (${large ? 'large' : 'article'})`, async ({
+    orcaPage
+  }, testInfo) => {
+    await waitForSessionReady(orcaPage)
+    await waitForActiveWorktree(orcaPage)
+    const context = await getActiveWorktreeContext(orcaPage)
+    const source = ARTICLE + (large ? `\n${'Unchanged user_name prose. '.repeat(2_100)}\n` : '')
+    const filePath = await createMarkdownFixture(
+      context,
+      'callout-fidelity',
+      'article',
+      testInfo.workerIndex,
+      source
+    )
+    try {
+      await openMarkdownFixture(orcaPage, context, filePath)
+      const editor = await waitForRichMarkdownEditor(orcaPage)
+      await expect(editor).toContainText('[!wissenswert]')
+      let expected = source
+      for (const prefix of ['First paragraph', 'Second paragraph', 'Third paragraph']) {
+        const paragraph = editor.locator('p').filter({ hasText: prefix }).first()
+        await paragraph.click()
+        await paragraph.evaluate((element) => {
+          const range = document.createRange()
+          range.selectNodeContents(element)
+          range.collapse(true)
+          const selection = window.getSelection()!
+          selection.removeAllRanges()
+          selection.addRange(range)
+        })
+        await orcaPage.keyboard.insertText('Edited ')
+        expected = expected.replace(prefix, `Edited ${prefix}`)
+        await orcaPage.keyboard.press('ControlOrMeta+S')
+        await expect.poll(() => readFileSync(filePath, 'utf8')).toBe(expected)
+      }
+      await testInfo.attach('saved-source', { body: expected, contentType: 'text/markdown' })
+      await closeActiveEditorTab(orcaPage, filePath)
+      await openMarkdownFixture(orcaPage, context, filePath)
+      const reopened = await waitForRichMarkdownEditor(orcaPage)
+      await expect(reopened).toContainText('Edited First paragraph')
+      await expect(reopened).toContainText('Edited Third paragraph')
+      await expect(reopened.locator('blockquote')).toHaveCount(4)
+      await expect(reopened).toContainText('[!zeitstrahl]')
+      await testInfo.attach('reopened-article', {
+        body: await orcaPage.screenshot({ path: testInfo.outputPath('reopened-article.png') }),
+        contentType: 'image/png'
+      })
+      expect(readFileSync(filePath, 'utf8')).toBe(expected)
+    } finally {
+      await cleanupMarkdownFixture(filePath)
+    }
+  })
+}
diff --git a/tests/e2e/native-chat-history-prepend-anchor.spec.ts b/tests/e2e/native-chat-history-prepend-anchor.spec.ts
index d299cadae6e9..236d30c4475c 100644
--- a/tests/e2e/native-chat-history-prepend-anchor.spec.ts
+++ b/tests/e2e/native-chat-history-prepend-anchor.spec.ts
@@ -138,6 +138,13 @@ test.describe('Native chat transcript anchoring', () => {
         sessionId,
         transcriptPath
       })
+      // Exercise the supported manual paging fallback while the reader stays mid-transcript.
+      await orcaPage.evaluate(() => {
+        Object.defineProperty(window, 'IntersectionObserver', {
+          value: undefined,
+          configurable: true
+        })
+      })
       await toggleTerminalTabToChatView(orcaPage, {
         tabId,
         worktreeId: descriptor.worktreeId
diff --git a/tests/e2e/native-chat-message-rail.spec.ts b/tests/e2e/native-chat-message-rail.spec.ts
index 25ca0a4745bc..16d01060224e 100644
--- a/tests/e2e/native-chat-message-rail.spec.ts
+++ b/tests/e2e/native-chat-message-rail.spec.ts
@@ -143,7 +143,7 @@ test.describe('Native chat message rail', () => {
 
     // Activating the hover preview transfers focus into the prompt picker.
     await rail.press('Enter')
-    await expect(panel.getByRole('button').first()).toBeFocused()
+    await expect(panel.locator('button[data-current="true"]')).toBeFocused()
     await panel.getByRole('button', { name: 'Question 5:', exact: false }).click()
     await expect(panel).not.toBeVisible()
     const target = transcriptWindow.locator('[data-index="10"]')
diff --git a/tests/e2e/paired-client-hosted-browser-restart-survival.spec.ts b/tests/e2e/paired-client-hosted-browser-restart-survival.spec.ts
index 03eb0e0b18d6..0f8e24ecd6e9 100644
--- a/tests/e2e/paired-client-hosted-browser-restart-survival.spec.ts
+++ b/tests/e2e/paired-client-hosted-browser-restart-survival.spec.ts
@@ -112,24 +112,22 @@ test('keeps a client-hosted browser tab across a paired runtime restart', async
       })
       .toContain(opened.remotePageId)
 
-    await expect
-      .poll(() => findMirroredBrowserPage(client!.page, restartedWorktreeId, fixture.origin), {
-        timeout: 180_000,
-        message: 'the client lost its client-hosted row across the runtime restart'
-      })
-      .not.toBeNull()
-
-    // Counted across the whole fixture origin: a recovery that also replays the create URL leaves
-    // two rows, and matching only the moved one would call that a pass.
-    const rows = await readClientBrowserRows(client.page, restartedWorktreeId)
-    const survivorRows = rows.filter((row) => row.url.startsWith(fixture.origin))
-    expect(survivorRows, 'the tab must survive the restart exactly once').toHaveLength(1)
+    let survivor: Awaited<ReturnType<typeof findMirroredBrowserPage>> = null
+    // Reconnection can replace the retained row between reads; wait for the whole contract.
+    await expect(async () => {
+      const rows = await readClientBrowserRows(client!.page, restartedWorktreeId)
+      const survivorRows = rows.filter((row) => row.url.startsWith(fixture.origin))
+      expect(survivorRows, 'the tab must survive the restart exactly once').toHaveLength(1)
 
-    const survivor = await findMirroredBrowserPage(client.page, restartedWorktreeId, fixture.origin)
-    expect(survivor?.remotePageId, 'recovery must keep the page identity it was created with').toBe(
-      opened.remotePageId
-    )
-    expect(survivor?.placementKind, 'the surviving tab must still be client-hosted').toBe('client')
+      survivor = await findMirroredBrowserPage(client!.page, restartedWorktreeId, fixture.origin)
+      expect(
+        survivor?.remotePageId,
+        'recovery must keep the page identity it was created with'
+      ).toBe(opened.remotePageId)
+      expect(survivor?.placementKind, 'the surviving tab must still be client-hosted').toBe(
+        'client'
+      )
+    }).toPass({ timeout: 180_000 })
 
     await focusClientBrowserRow(client.page, restartedWorktreeId, survivor!.localPageId)
     expect(
@@ -140,6 +138,11 @@ test('keeps a client-hosted browser tab across a paired runtime restart', async
       ),
       'the tab must come back where the user left it, not on its create URL'
     ).toBe('moved-on')
+    const renderedRows = await readClientBrowserRows(client.page, restartedWorktreeId)
+    expect(
+      renderedRows.filter((row) => row.url.startsWith(fixture.origin)),
+      'rendering the recovered guest must leave exactly one surviving tab'
+    ).toHaveLength(1)
   } finally {
     if (client) {
       await cleanupE2EDaemons(client.userDataDir).catch(() => undefined)
diff --git a/tests/e2e/paired-remote-terminal-parked-reveal-interactivity.spec.ts b/tests/e2e/paired-remote-terminal-parked-reveal-interactivity.spec.ts
index fe045e3814a9..7c413c061263 100644
--- a/tests/e2e/paired-remote-terminal-parked-reveal-interactivity.spec.ts
+++ b/tests/e2e/paired-remote-terminal-parked-reveal-interactivity.spec.ts
@@ -286,8 +286,16 @@ async function probeInteractivity(
     `LINE:${token}`,
     LIVE_PAINT_BUDGET_MS
   )
-  const paneGrid = await readActivePaneGrid(page, target.webTabId)
+  let paneGrid = await readActivePaneGrid(page, target.webTabId)
+  let ptyGrid = readPtyGridFromContent(readSink(target.sinkPath))
+  console.log(`[paired-grid-initial] ${JSON.stringify({ name, paneGrid, ptyGrid })}`)
   const diagnostics = await readPaneDiagnostics(page, worktreeId, target.webTabId)
+  const screenshotPath = test.info().outputPath(`paired-terminal-${name}.png`)
+  await page.screenshot({ path: screenshotPath })
+  await test.info().attach(`paired-terminal-${name}`, {
+    path: screenshotPath,
+    contentType: 'image/png'
+  })
   let paintedAfterFlip = paintedLive
   if (!paintedLive) {
     await openClientTab(page, worktreeId, flipTo.webTabId)
@@ -299,6 +307,31 @@ async function probeInteractivity(
       LIVE_PAINT_BUDGET_MS
     )
   }
+  // Preserve the scenario report even when geometry fails to converge.
+  await expect
+    .configure({ soft: true })
+    .poll(
+      async () => {
+        paneGrid = await readActivePaneGrid(page, target.webTabId)
+        ptyGrid = readPtyGridFromContent(readSink(target.sinkPath))
+        return {
+          paneGrid,
+          ptyGrid,
+          converged:
+            paneGrid !== null &&
+            ptyGrid !== null &&
+            paneGrid.cols > 0 &&
+            paneGrid.rows > 0 &&
+            paneGrid.cols === ptyGrid.cols &&
+            paneGrid.rows === ptyGrid.rows
+        }
+      },
+      {
+        timeout: REVEAL_BUDGET_MS,
+        message: `${name}: revealed pane and host PTY grids did not converge`
+      }
+    )
+    .toMatchObject({ converged: true })
   const sink = readSink(target.sinkPath)
   return {
     name,
@@ -307,7 +340,7 @@ async function probeInteractivity(
     paintedLive,
     paintedAfterFlip,
     paneGrid,
-    ptyGrid: readPtyGridFromContent(sink),
+    ptyGrid,
     diagnostics
   }
 }
diff --git a/tests/e2e/sidebar-measured-row-scroll.spec.ts b/tests/e2e/sidebar-measured-row-scroll.spec.ts
index a328d9fac700..84c21cd92d19 100644
--- a/tests/e2e/sidebar-measured-row-scroll.spec.ts
+++ b/tests/e2e/sidebar-measured-row-scroll.spec.ts
@@ -71,6 +71,8 @@ test('keeps a collapsed group visible when an idle card below it grows', async (
   orcaPage,
   registerPostElectronShutdownCleanup
 }, testInfo) => {
+  // Why: the fixture's collapse slides rows in from their old position; a hidden window can freeze that mid-flight baseline.
+  await orcaPage.emulateMedia({ reducedMotion: 'reduce' })
   await waitForSessionReady(orcaPage)
   await orcaPage.setViewportSize({ width: 1200, height: 900 })
   const root = realpathSync(mkdtempSync(path.join(os.tmpdir(), 'orca-sidebar-measured-row-')))
diff --git a/tests/e2e/structured-chat-owner-status-activation.unit.test.ts b/tests/e2e/structured-chat-owner-status-activation.unit.test.ts
index f2c7cbd39d45..3d8858b3658b 100644
--- a/tests/e2e/structured-chat-owner-status-activation.unit.test.ts
+++ b/tests/e2e/structured-chat-owner-status-activation.unit.test.ts
@@ -17,6 +17,7 @@ import {
   hostTestAttachParams,
   resetHostTestOperationIds
 } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { STRUCTURED_AGENT_SESSION_IDLE_MS } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep'
 import { AgentSessionRecordStore } from '../../src/main/runtime/agent-session-record-store'
 import { useAppStore } from '../../src/renderer/src/store'
 import { runWorktreeAgentActivationGate } from '../../src/renderer/src/lib/worktree-agent-activation-gate'
@@ -24,9 +25,9 @@ import { readWorktreeStructuredActivationInventory } from '../../src/renderer/sr
 import type { RuntimeMobileSessionTabsResult } from '../../src/shared/runtime-types'
 
 const WORKTREE = 'repo-1::/workspace/repo'
-const SURFACE = 'desktop-chat:1'
 
 let root: string
+let clock: number
 let store: AgentSessionRecordStore
 let host: StructuredAgentSessionHost
 let closeSession: Mock<NonNullable<StructuredAgentSessionAdapter['closeSession']>>
@@ -55,9 +56,9 @@ function openHost(): void {
     journalRoot: root,
     claimKeyId: 'key-1',
     mintSpawnToken: () => 'spawn-a',
-    releaseGraceMs: 5,
+    idleSweep: { intervalMs: 5 },
     probeOwner: async () => ({ outcome: 'pid-absent' }),
-    now: () => NOW
+    now: () => clock
   })
 }
 
@@ -109,6 +110,7 @@ function activate(): ReturnType<typeof runWorktreeAgentActivationGate> {
 
 beforeEach(async () => {
   root = await mkdtemp(join(tmpdir(), 'orca-owner-status-'))
+  clock = NOW
   resetHostTestOperationIds()
   closeSession = vi.fn(async () => true)
   store = await AgentSessionRecordStore.open({ directory: join(root, 'store'), hostId: 'local' })
@@ -126,9 +128,8 @@ afterEach(async () => {
 })
 
 describe('a chat at rest keeps its worktree activatable', () => {
-  it('after idle release forgot the session', async () => {
-    await host.hold(SESSION, SURFACE)
-    host.release(SESSION, SURFACE)
+  it('after the idle sweep stopped its agent and closed the conversation', async () => {
+    clock += STRUCTURED_AGENT_SESSION_IDLE_MS + 1
     await vi.waitFor(() => expect(host.hasSession(SESSION)).toBe(false))
     expect(closeSession).toHaveBeenCalledWith(SESSION)
 
diff --git a/tests/e2e/structured-session-reopened-tab-close.unit.test.ts b/tests/e2e/structured-session-reopened-tab-close.unit.test.ts
new file mode 100644
index 000000000000..35547145c32f
--- /dev/null
+++ b/tests/e2e/structured-session-reopened-tab-close.unit.test.ts
@@ -0,0 +1,231 @@
+// @vitest-environment happy-dom
+
+/**
+ * After /clear the current chat keeps the tab id derived from its first session, so reopening that
+ * first session from history lands in a suffixed tab. Closing or focusing the reopened tab from
+ * main must reach that tab, not the current chat. Runs the real main close/focus path against the
+ * real window store, mirror and IPC bridges; only the process boundary is stubbed.
+ */
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { RuntimeMobileSessionTabsResult } from '../../src/shared/runtime-types'
+import type * as RuntimeRpcClient from '../../src/renderer/src/runtime/runtime-rpc-client'
+import { OrcaRuntimeService } from '../../src/main/runtime/orca-runtime'
+import { setStructuredAgentSessionHost } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-registry'
+import { useAppStore } from '../../src/renderer/src/store'
+import { applyStructuredSessionTabSnapshots } from '../../src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply'
+import { resetLocalStructuredSessionVersionForTests } from '../../src/renderer/src/runtime/local-structured-session-tabs-sync'
+import { resetWebSessionTabsSnapshotFreshnessForTests } from '../../src/renderer/src/runtime/web-session-tabs-sync'
+import { registerSessionTabIpcBridge } from '../../src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge'
+import { registerTerminalUiRoutingIpcBridge } from '../../src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge'
+
+const WORKTREE = 'repo-1::/tmp/wt-reopen'
+const CURRENT_SESSION = 'clear-x'
+const REOPENED_SESSION = 'session-s'
+const CURRENT_TAB = `structured-agent-session-${REOPENED_SESSION}`
+const REOPENED_TAB = `${CURRENT_TAB}:history-1`
+
+type CloseRequest = { requestId: string; tabId: string; worktreeId: string; expiresAt?: number }
+type Listener<T> = (payload: T) => void
+
+type ProcessBoundary = {
+  runtime: Pick<OrcaRuntimeService, 'closeMobileSessionTab'> | null
+  rendererSessionCloses: string[]
+}
+
+const bridge = vi.hoisted((): ProcessBoundary => ({
+  runtime: null,
+  rendererSessionCloses: []
+}))
+
+vi.mock('../../src/renderer/src/runtime/runtime-rpc-client', async (importOriginal) => {
+  const actual = await importOriginal<typeof RuntimeRpcClient>()
+  return {
+    ...actual,
+    callRuntimeRpc: async (
+      _target: unknown,
+      method: string,
+      params: { worktree: string; tabId: string; reason?: 'user' }
+    ) => {
+      if (method !== 'session.tabs.close') {
+        throw new Error(`unexpected rpc ${method}`)
+      }
+      return bridge.runtime!.closeMobileSessionTab(params.worktree, params.tabId, {
+        reason: params.reason
+      })
+    }
+  }
+})
+
+vi.mock('../../src/renderer/src/runtime/structured-agent-session-close', () => ({
+  closeStructuredAgentSession: async (_target: unknown, sessionId: string) => {
+    bridge.rendererSessionCloses.push(sessionId)
+    return 'closed'
+  }
+}))
+
+async function setup() {
+  const listeners: {
+    closeSessionTab?: Listener<{ tabId: string; worktreeId: string }>
+    closeRequest?: Listener<CloseRequest>
+    focusEditorTab?: Listener<{ tabId: string; worktreeId: string; userInitiated?: boolean }>
+  } = {}
+  const pendingResponses = new Map<string, (error?: string) => void>()
+  const register =
+    <T>(assign: (listener: Listener<T>) => void) =>
+    (listener: Listener<T>) => {
+      assign(listener)
+      return () => {}
+    }
+  const noop = () => () => {}
+  vi.stubGlobal('api', {
+    ui: {
+      onCloseSessionTab: register((l) => (listeners.closeSessionTab = l)),
+      onSessionTabCloseRequest: register((l) => (listeners.closeRequest = l)),
+      onFocusEditorTab: register((l) => (listeners.focusEditorTab = l)),
+      onMoveSessionTab: noop,
+      onSplitTerminal: noop,
+      onRenameTerminal: noop,
+      onFocusTerminal: noop,
+      respondSessionTabClose: ({ requestId, error }: { requestId: string; error?: string }) =>
+        pendingResponses.get(requestId)?.(error)
+    }
+  })
+  registerSessionTabIpcBridge([])
+  registerTerminalUiRoutingIpcBridge([])
+
+  const hostSessionCloses: string[] = []
+  const closeResponses: (string | undefined)[] = []
+  const runtime = new OrcaRuntimeService()
+  bridge.runtime = runtime
+  let nextRequest = 0
+  runtime.setNotifier(
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the chat close and focus paths call only these two notifier members.
+    {
+      // Same contract as the window relay: a request the renderer answers with an optional error.
+      closeSessionTab: (tabId: string, worktreeId: string) =>
+        new Promise<void>((resolve, reject) => {
+          const requestId = `close-${++nextRequest}`
+          pendingResponses.set(requestId, (error) => {
+            closeResponses.push(error)
+            return error ? reject(new Error(error)) : resolve()
+          })
+          listeners.closeRequest!({ requestId, tabId, worktreeId })
+        }),
+      focusEditorTab: (tabId: string, worktreeId: string) =>
+        listeners.focusEditorTab!({ tabId, worktreeId })
+    } as never
+  )
+  // No durable store, PTYs or workspace session on disk: the host tab list below is the whole state.
+  Object.assign(runtime, {
+    hasPersistedStructuredAgentSessionStore: () => true,
+    getKnownWorkspaceSessionWorktreeIds: () => new Set(),
+    hydrateHeadlessMobileSessionTabsFromWorkspaceSession: () => new Set(),
+    refreshMobileSessionPtyRecords: async () => new Set(),
+    ensureStructuredAgentSessionHost: async () => undefined
+  })
+  setStructuredAgentSessionHost(
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: restore and tab close call only these host members.
+    {
+      reconcileRestartLeases: async () => undefined,
+      restoreReadableSessions: async () => undefined,
+      close: async (sessionId: string) => {
+        hostSessionCloses.push(sessionId)
+      },
+      setSessionTabVisibility: async () => undefined,
+      listSessionTabs: () => [
+        { sessionId: CURRENT_SESSION, workspaceId: WORKTREE, agent: 'claude' },
+        { sessionId: REOPENED_SESSION, workspaceId: WORKTREE, agent: 'claude' }
+      ]
+    } as never
+  )
+  await runtime.restoreStructuredAgentSessionTabs()
+  const hostSnapshot: RuntimeMobileSessionTabsResult = await runtime.listMobileSessionTabs(
+    `id:${WORKTREE}`
+  )
+
+  // The current chat after /clear: first session's tab id, new session's entity.
+  useAppStore.setState({ activeWorktreeId: WORKTREE })
+  useAppStore.getState().createUnifiedTab(WORKTREE, 'agent-session', {
+    id: CURRENT_TAB,
+    entityId: CURRENT_SESSION,
+    label: 'Claude Chat'
+  })
+  applyStructuredSessionTabSnapshots([hostSnapshot])
+
+  const agentTabs = () =>
+    (useAppStore.getState().unifiedTabsByWorktree[WORKTREE] ?? [])
+      .filter((tab) => tab.contentType === 'agent-session')
+      .map((tab) => ({ id: tab.id, entityId: tab.entityId }))
+  return { runtime, agentTabs, hostSessionCloses, closeResponses }
+}
+
+const initialStoreState = useAppStore.getState()
+
+beforeEach(() => {
+  bridge.rendererSessionCloses = []
+})
+
+afterEach(() => {
+  setStructuredAgentSessionHost(null)
+  bridge.runtime = null
+  useAppStore.setState(initialStoreState, true)
+  resetLocalStructuredSessionVersionForTests()
+  resetWebSessionTabsSnapshotFreshnessForTests()
+  vi.unstubAllGlobals()
+})
+
+describe('closing a chat reopened from history after /clear', () => {
+  it('mirrors the reopened session into a suffixed tab beside the current chat', async () => {
+    const { agentTabs } = await setup()
+
+    expect(agentTabs()).toEqual(
+      expect.arrayContaining([
+        { id: CURRENT_TAB, entityId: CURRENT_SESSION },
+        { id: REOPENED_TAB, entityId: REOPENED_SESSION }
+      ])
+    )
+  })
+
+  it('closes only the reopened tab when the user closes it on the desktop', async () => {
+    const { agentTabs, hostSessionCloses, closeResponses } = await setup()
+
+    useAppStore.getState().closeUnifiedTab(REOPENED_TAB)
+
+    await vi.waitFor(() => expect(hostSessionCloses).toEqual([REOPENED_SESSION]))
+    // Let any stray echo reach the window before asserting the current chat survived.
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    expect(agentTabs()).toEqual([{ id: CURRENT_TAB, entityId: CURRENT_SESSION }])
+    expect(bridge.rendererSessionCloses).toEqual([REOPENED_SESSION])
+    expect(hostSessionCloses).toEqual([REOPENED_SESSION])
+    // The window already removed the tab, so main's relay is acknowledged, not reported missing.
+    expect(closeResponses).toEqual([undefined])
+  })
+
+  it('closes only the reopened tab when a phone closes it through the runtime', async () => {
+    const { runtime, agentTabs, hostSessionCloses } = await setup()
+
+    await runtime.closeMobileSessionTab(`id:${WORKTREE}`, `agent-session:${REOPENED_SESSION}`, {
+      reason: 'user'
+    })
+
+    await vi.waitFor(() =>
+      expect(agentTabs()).toEqual([{ id: CURRENT_TAB, entityId: CURRENT_SESSION }])
+    )
+    expect(bridge.rendererSessionCloses).not.toContain(CURRENT_SESSION)
+    expect(hostSessionCloses).not.toContain(CURRENT_SESSION)
+  })
+
+  it('focuses the reopened tab when a phone activates it through the runtime', async () => {
+    const { runtime } = await setup()
+    useAppStore.getState().activateTab(CURRENT_TAB, { worktreeId: WORKTREE })
+
+    await runtime.activateMobileSessionTab(`id:${WORKTREE}`, `agent-session:${REOPENED_SESSION}`)
+
+    const state = useAppStore.getState()
+    const group = state.groupsByWorktree[WORKTREE]?.find((candidate) =>
+      candidate.tabOrder.includes(REOPENED_TAB)
+    )
+    expect(group?.activeTabId).toBe(REOPENED_TAB)
+  })
+})
diff --git a/tests/e2e/terminal-hidden-view-parking.spec.ts b/tests/e2e/terminal-hidden-view-parking.spec.ts
index 6cf877c62573..f050a0e4280d 100644
--- a/tests/e2e/terminal-hidden-view-parking.spec.ts
+++ b/tests/e2e/terminal-hidden-view-parking.spec.ts
@@ -20,7 +20,7 @@ import {
 } from './helpers/terminal'
 import { parkHiddenTabBehindDecoy, waitForTabParked } from './helpers/terminal-hidden-parking'
 import { waitForPtyShellEcho } from './terminal-pty-readiness'
-import { TERMINAL_TAB_PARK_FLIP_BURST_WINDOW_MS } from '../../src/renderer/src/components/terminal-pane/terminal-park-verdict-flip-telemetry'
+import { TERMINAL_TAB_PARK_FLIP_WINDOW_MS } from '../../src/renderer/src/components/terminal-pane/terminal-park-verdict-flip-telemetry'
 
 // Why: the parking wiring registers this handle (dev/exposeStore builds only)
 // so tests can detect that hidden-view parking is compiled in and which delay
@@ -43,7 +43,7 @@ test.use({
 
 const PARKED_FRAME_SCRIPT_DELAY_MS = 750
 const PARKED_FRAME_COUNT = 25
-const PARK_VERDICT_BURST_SETTLE_MS = TERMINAL_TAB_PARK_FLIP_BURST_WINDOW_MS * 4
+const PARK_VERDICT_WINDOW_SETTLE_MS = Math.ceil(TERMINAL_TAB_PARK_FLIP_WINDOW_MS / 5)
 
 function parkedTuiFrame(runId: string, frame: number): string {
   const progress = `${'█'.repeat((frame % 8) + 1)}${'░'.repeat(8 - ((frame % 8) + 1))}`
@@ -478,7 +478,7 @@ test.describe('Terminal hidden view parking', () => {
     orcaPage,
     testRepoPath
   }, testInfo: TestInfo) => {
-    test.setTimeout(180_000)
+    test.setTimeout(420_000)
     await waitForSessionReady(orcaPage)
     const setup = await setUpParkableTabA(orcaPage)
     const { worktreeId, tabAId, tabAPtyId } = setup
@@ -542,8 +542,8 @@ test.describe('Terminal hidden view parking', () => {
       const mismatches: string[] = []
       for (let cycle = 1; cycle < CYCLES; cycle++) {
         // Why: each cycle intentionally flips this tab's rendered verdict twice.
-        // Let the production anti-churn burst window lapse before the next one.
-        await orcaPage.waitForTimeout(PARK_VERDICT_BURST_SETTLE_MS)
+        // Keep each tab below the 12-flip sustained-churn pin in a 60s window.
+        await orcaPage.waitForTimeout(PARK_VERDICT_WINDOW_SETTLE_MS)
         const rows = await runOneParkRevealCycle(cycle)
         if (JSON.stringify(rows) !== JSON.stringify(referenceRows)) {
           mismatches.push(
diff --git a/tests/e2e/terminal-kitty-reattach-parity.spec.ts b/tests/e2e/terminal-kitty-reattach-parity.spec.ts
new file mode 100644
index 000000000000..bb328a2dd274
--- /dev/null
+++ b/tests/e2e/terminal-kitty-reattach-parity.spec.ts
@@ -0,0 +1,119 @@
+/**
+ * A live app's kitty keyboard flags survive park and reveal in both records:
+ * xterm (which encodes keys) and the pane mirror (which Orca's shortcut policy
+ * reads). The reveal builds a fresh xterm, so without the replay epilogue's
+ * restore xterm would sit at 0 while the mirror adopted the host's flags.
+ */
+import type { ElectronApplication, Page } from '@stablyai/playwright-test'
+import { expect, test } from './helpers/orca-app'
+import { parkHiddenTabBehindDecoy } from './helpers/terminal-hidden-parking'
+import {
+  ensureTerminalVisible,
+  getActiveTabId,
+  waitForActiveWorktree,
+  waitForSessionReady
+} from './helpers/store'
+import {
+  focusActiveTerminalInput,
+  sendToTerminal,
+  waitForActivePanePtyId,
+  waitForActiveTerminalManager
+} from './helpers/terminal'
+import {
+  clearTerminalPtyWriteLog,
+  installTerminalPtyWriteSpy,
+  readTerminalPtyWrites
+} from './helpers/terminal-pty-write-spy'
+import { waitForPtyShellEcho } from './terminal-pty-readiness'
+
+const PARKING_DELAY_MS = Number(process.env.ORCA_E2E_TERMINAL_PARKING_DELAY_MS) || 500
+const APP_FLAGS = 5
+
+test.use({
+  orcaAppExtraEnv: { ORCA_E2E_TERMINAL_PARKING_DELAY_MS: String(PARKING_DELAY_MS) }
+})
+
+async function readXtermKittyFlags(page: Page): Promise<number | null> {
+  return page.evaluate(() => {
+    const state = window.__store?.getState()
+    const tabId = state?.activeTabId ?? null
+    const manager = tabId ? window.__paneManagers?.get(tabId) : null
+    const pane = manager?.getActivePane?.() ?? manager?.getPanes?.()[0] ?? null
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: xterm exposes kitty flags only on its private core; null when absent.
+    const terminal = pane?.terminal as
+      | { _core?: { coreService?: { kittyKeyboard?: { flags?: number } } } }
+      | undefined
+    return terminal?._core?.coreService?.kittyKeyboard?.flags ?? null
+  })
+}
+
+// Why Shift+Enter: the policy emits CSI-u only when the pane mirror reports kitty flags.
+async function expectShiftEnterWrite(
+  page: Page,
+  app: ElectronApplication,
+  expected: string
+): Promise<void> {
+  await clearTerminalPtyWriteLog(app)
+  await focusActiveTerminalInput(page)
+  await page.keyboard.press('Shift+Enter')
+  await expect
+    .poll(async () => (await readTerminalPtyWrites(app)).includes(expected), {
+      timeout: 5_000,
+      message: `Shift+Enter did not write ${JSON.stringify(expected)}`
+    })
+    .toBe(true)
+}
+
+async function activateTerminalTab(page: Page, tabId: string): Promise<void> {
+  await page.evaluate((tabId) => {
+    const state = window.__store?.getState()
+    if (!state) {
+      throw new Error('Orca store unavailable')
+    }
+    state.setActiveTabType('terminal', window.__store?.getState().activeWorktreeId ?? null)
+    state.setActiveTab(tabId)
+  }, tabId)
+  await expect.poll(() => getActiveTabId(page)).toBe(tabId)
+  await waitForActiveTerminalManager(page, 30_000)
+}
+
+test("park and reveal keep a live app's kitty flags in xterm and the mirror", async ({
+  orcaPage,
+  electronApp
+}) => {
+  test.skip(process.platform === 'win32', 'ConPTY panes withhold the kitty protocol')
+  await installTerminalPtyWriteSpy(electronApp)
+  await waitForSessionReady(orcaPage)
+  const worktreeId = await waitForActiveWorktree(orcaPage)
+  await ensureTerminalVisible(orcaPage)
+  await waitForActiveTerminalManager(orcaPage, 30_000)
+  const tabId = await getActiveTabId(orcaPage)
+  if (!tabId) {
+    throw new Error('no active terminal tab')
+  }
+  const ptyId = await waitForActivePanePtyId(orcaPage)
+  await waitForPtyShellEcho(orcaPage, ptyId, 15_000)
+
+  try {
+    // The app stays alive through the park, so nothing grounds its flags.
+    await sendToTerminal(orcaPage, ptyId, `printf '\\033[=${APP_FLAGS}u'; sleep 120\r`)
+    await expect.poll(() => readXtermKittyFlags(orcaPage)).toBe(APP_FLAGS)
+    await expectShiftEnterWrite(orcaPage, electronApp, '\x1b[13;2u')
+
+    await parkHiddenTabBehindDecoy(orcaPage, worktreeId, tabId, {
+      parkDelayMs: PARKING_DELAY_MS
+    })
+    await activateTerminalTab(orcaPage, tabId)
+    await waitForActivePanePtyId(orcaPage)
+
+    await expect
+      .poll(() => readXtermKittyFlags(orcaPage), {
+        timeout: 10_000,
+        message: 'the revealed xterm did not get the live app kitty flags back'
+      })
+      .toBe(APP_FLAGS)
+    await expectShiftEnterWrite(orcaPage, electronApp, '\x1b[13;2u')
+  } finally {
+    await sendToTerminal(orcaPage, ptyId, '\x03').catch(() => undefined)
+  }
+})
diff --git a/tests/e2e/terminal-option-composed-ascii.spec.ts b/tests/e2e/terminal-option-composed-ascii.spec.ts
index 93fe9a74b00d..8aec5f4471cb 100644
--- a/tests/e2e/terminal-option-composed-ascii.spec.ts
+++ b/tests/e2e/terminal-option-composed-ascii.spec.ts
@@ -120,30 +120,32 @@ async function pressOptionComposedKey(
   }, press)
 }
 
-async function armKittyKeyboardFromPty(page: Page, ptyId: string): Promise<void> {
+async function armKittyKeyboardFromPty(page: Page, ptyId: string, flags: number): Promise<void> {
   // Why: this is the byte a real kitty-protocol TUI pushes at startup; routing it
   // through the PTY exercises the same output-scanning mirror the policy reads.
-  await execInTerminal(page, ptyId, `printf '\\033[>1u'`)
+  // `cat` stays in the foreground: flags left armed at exit are grounded by the host.
+  await execInTerminal(page, ptyId, `printf '\\033[>${flags}u'; cat`)
   await expect
     .poll(async () => getPaneKittyKeyboardFlags(page), {
       timeout: 15_000,
       message: 'the pane never mirrored the application kitty keyboard flags'
     })
-    .toBeGreaterThan(0)
+    .toBe(flags)
 }
 
 async function setUpPane(
   page: Page,
-  app: ElectronApplication
-): Promise<{ ptyId: string; joinedWrites: () => Promise<string> }> {
+  app: ElectronApplication,
+  kittyFlags = 1
+): Promise<{ joinedWrites: () => Promise<string> }> {
   await waitForSessionReady(page)
   await waitForActiveWorktree(page)
   await ensureTerminalVisible(page)
   await waitForActiveTerminalManager(page)
   const ptyId = await waitForActivePanePtyId(page)
   await installMainProcessPtyWriteSpy(app)
-  await armKittyKeyboardFromPty(page, ptyId)
-  return { ptyId, joinedWrites: async () => (await getPtyWrites(app)).join('') }
+  await armKittyKeyboardFromPty(page, ptyId, kittyFlags)
+  return { joinedWrites: async () => (await getPtyWrites(app)).join('') }
 }
 
 test.describe('Option-composed text in a kitty-keyboard pane', () => {
@@ -239,9 +241,7 @@ test.describe('Option-composed text in a kitty-keyboard pane', () => {
     orcaPage,
     electronApp
   }) => {
-    const { ptyId, joinedWrites } = await setUpPane(orcaPage, electronApp)
-    await execInTerminal(orcaPage, ptyId, `printf '\\033[<u\\033[>5u'`)
-    await expect.poll(() => getPaneKittyKeyboardFlags(orcaPage)).toBe(5)
+    const { joinedWrites } = await setUpPane(orcaPage, electronApp, 5)
     await setMacOptionAsAlt(orcaPage, 'false')
     await clearPtyWriteLog(electronApp)
     const letters = [
@@ -278,9 +278,7 @@ test.describe('Option-composed text in a kitty-keyboard pane', () => {
     orcaPage,
     electronApp
   }) => {
-    const { ptyId, joinedWrites } = await setUpPane(orcaPage, electronApp)
-    await execInTerminal(orcaPage, ptyId, `printf '\\033[<u\\033[>29u'`)
-    await expect.poll(() => getPaneKittyKeyboardFlags(orcaPage)).toBe(29)
+    const { joinedWrites } = await setUpPane(orcaPage, electronApp, 29)
     await setMacOptionAsAlt(orcaPage, 'false')
     await clearPtyWriteLog(electronApp)
     await pressOptionComposedKey(orcaPage, { key: 'ą', code: 'KeyA' })
@@ -291,9 +289,7 @@ test.describe('Option-composed text in a kitty-keyboard pane', () => {
     orcaPage,
     electronApp
   }, testInfo) => {
-    const { ptyId, joinedWrites } = await setUpPane(orcaPage, electronApp)
-    await execInTerminal(orcaPage, ptyId, `printf '\\033[<u\\033[>5u'; cat`)
-    await expect.poll(() => getPaneKittyKeyboardFlags(orcaPage)).toBe(5)
+    const { joinedWrites } = await setUpPane(orcaPage, electronApp, 5)
     await setMacOptionAsAlt(orcaPage, 'false')
     await clearPtyWriteLog(electronApp)
     const cdp = await orcaPage.context().newCDPSession(orcaPage)
diff --git a/tests/e2e/terminal-reset-input-modes.spec.ts b/tests/e2e/terminal-reset-input-modes.spec.ts
new file mode 100644
index 000000000000..f10797666af3
--- /dev/null
+++ b/tests/e2e/terminal-reset-input-modes.spec.ts
@@ -0,0 +1,131 @@
+/**
+ * Reset Terminal grounds the input modes an app left armed where the host saw
+ * no command end, and the ground survives park and reveal. The reveal builds a
+ * fresh xterm from the host's model, so a renderer-only reset would come back
+ * armed.
+ */
+import type { ElectronApplication, Page } from '@stablyai/playwright-test'
+import { expect, test } from './helpers/orca-app'
+import { parkHiddenTabBehindDecoy } from './helpers/terminal-hidden-parking'
+import {
+  ensureTerminalVisible,
+  getActiveTabId,
+  waitForActiveWorktree,
+  waitForSessionReady
+} from './helpers/store'
+import {
+  focusActiveTerminalInput,
+  sendToTerminal,
+  waitForActivePanePtyId,
+  waitForActiveTerminalManager
+} from './helpers/terminal'
+import { openTerminalContextMenu } from './helpers/terminal-pane-title-actions'
+import {
+  clearTerminalPtyWriteLog,
+  installTerminalPtyWriteSpy,
+  readTerminalPtyWrites
+} from './helpers/terminal-pty-write-spy'
+import { waitForPtyShellEcho } from './terminal-pty-readiness'
+
+const PARKING_DELAY_MS = Number(process.env.ORCA_E2E_TERMINAL_PARKING_DELAY_MS) || 500
+const KITTY_SHIFT_ENTER = '\x1b[13;2u'
+
+test.use({
+  orcaAppExtraEnv: { ORCA_E2E_TERMINAL_PARKING_DELAY_MS: String(PARKING_DELAY_MS) }
+})
+
+type XtermInputModes = { kittyFlags: number | null; mouse: string | null }
+
+async function readXtermInputModes(page: Page): Promise<XtermInputModes> {
+  return page.evaluate(() => {
+    const state = window.__store?.getState()
+    const tabId = state?.activeTabId ?? null
+    const manager = tabId ? window.__paneManagers?.get(tabId) : null
+    const pane = manager?.getActivePane?.() ?? manager?.getPanes?.()[0] ?? null
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: xterm exposes kitty flags only on its private core; null when absent.
+    const terminal = pane?.terminal as
+      | {
+          modes?: { mouseTrackingMode?: string }
+          _core?: { coreService?: { kittyKeyboard?: { flags?: number } } }
+        }
+      | undefined
+    return {
+      kittyFlags: terminal?._core?.coreService?.kittyKeyboard?.flags ?? null,
+      mouse: terminal?.modes?.mouseTrackingMode ?? null
+    }
+  })
+}
+
+// Why Shift+Enter: the policy emits CSI-u only when the pane mirror reports kitty flags.
+async function readShiftEnterWrite(page: Page, app: ElectronApplication): Promise<string> {
+  await clearTerminalPtyWriteLog(app)
+  await focusActiveTerminalInput(page)
+  await page.keyboard.press('Shift+Enter')
+  let written = ''
+  await expect
+    .poll(
+      async () => {
+        written = (await readTerminalPtyWrites(app)).join('')
+        return written.length
+      },
+      { timeout: 5_000, message: 'Shift+Enter wrote nothing' }
+    )
+    .toBeGreaterThan(0)
+  return written
+}
+
+async function expectGrounded(page: Page, app: ElectronApplication, when: string): Promise<void> {
+  await expect
+    .poll(() => readXtermInputModes(page), { timeout: 10_000, message: `xterm armed ${when}` })
+    .toEqual({ kittyFlags: 0, mouse: 'none' })
+  expect(await readShiftEnterWrite(page, app)).not.toContain(KITTY_SHIFT_ENTER)
+}
+
+async function activateTerminalTab(page: Page, tabId: string): Promise<void> {
+  await page.evaluate((tabId) => {
+    const state = window.__store?.getState()
+    if (!state) {
+      throw new Error('Orca store unavailable')
+    }
+    state.setActiveTabType('terminal', window.__store?.getState().activeWorktreeId ?? null)
+    state.setActiveTab(tabId)
+  }, tabId)
+  await expect.poll(() => getActiveTabId(page)).toBe(tabId)
+  await waitForActiveTerminalManager(page, 30_000)
+}
+
+test('Reset Terminal grounds modes an unhooked crash left armed, through park and reveal', async ({
+  orcaPage,
+  electronApp
+}) => {
+  test.skip(process.platform === 'win32', 'ConPTY panes withhold the kitty protocol')
+  await installTerminalPtyWriteSpy(electronApp)
+  await waitForSessionReady(orcaPage)
+  const worktreeId = await waitForActiveWorktree(orcaPage)
+  await ensureTerminalVisible(orcaPage)
+  await waitForActiveTerminalManager(orcaPage, 30_000)
+  const tabId = await getActiveTabId(orcaPage)
+  if (!tabId) {
+    throw new Error('no active terminal tab')
+  }
+  const ptyId = await waitForActivePanePtyId(orcaPage)
+  await waitForPtyShellEcho(orcaPage, ptyId, 15_000)
+
+  // `exec` drops the shell hooks, so no OSC 133;D ever lets the host ground the
+  // modes the printf arms and leaves behind.
+  await sendToTerminal(orcaPage, ptyId, 'exec bash --norc --noprofile\r')
+  await sendToTerminal(orcaPage, ptyId, "printf '\\033[>5u\\033[?1000h\\033[?1006h'\r")
+  await expect
+    .poll(() => readXtermInputModes(orcaPage), { timeout: 10_000 })
+    .toEqual({ kittyFlags: 5, mouse: 'vt200' })
+  expect(await readShiftEnterWrite(orcaPage, electronApp)).toContain(KITTY_SHIFT_ENTER)
+
+  await openTerminalContextMenu(orcaPage)
+  await orcaPage.getByRole('menuitem', { name: 'Reset Terminal', exact: true }).click()
+  await expectGrounded(orcaPage, electronApp, 'after Reset Terminal')
+
+  await parkHiddenTabBehindDecoy(orcaPage, worktreeId, tabId, { parkDelayMs: PARKING_DELAY_MS })
+  await activateTerminalTab(orcaPage, tabId)
+  await waitForActivePanePtyId(orcaPage)
+  await expectGrounded(orcaPage, electronApp, 'after park and reveal')
+})
diff --git a/tests/e2e/terminal-shortcuts.spec.ts b/tests/e2e/terminal-shortcuts.spec.ts
index 85524ec08f7a..0ea9f19b3543 100644
--- a/tests/e2e/terminal-shortcuts.spec.ts
+++ b/tests/e2e/terminal-shortcuts.spec.ts
@@ -34,6 +34,11 @@ import {
   installTerminalPtyWriteSpy as installMainProcessPtyWriteSpy,
   readTerminalPtyWrites as getPtyWrites
 } from './helpers/terminal-pty-write-spy'
+import {
+  armKittyKeyboardFromPty,
+  getKittyKeyboardFlags,
+  interruptAndExpectEtx
+} from './helpers/terminal-kitty-keyboard'
 
 async function setActivePaneForegroundAgent(
   page: Page,
@@ -65,60 +70,6 @@ async function setActivePaneForegroundAgent(
   }, agent)
 }
 
-async function dispatchCtrlCToActiveTerminalTextarea(
-  page: Page,
-  options: { keyupCtrlKey?: boolean } = {}
-): Promise<{
-  keydownDefaultPrevented: boolean
-  keyupDefaultPrevented: boolean
-}> {
-  return page.evaluate((dispatchOptions) => {
-    const state = window.__store?.getState()
-    const worktreeId = state?.activeWorktreeId
-    const tabId =
-      state?.activeTabType === 'terminal'
-        ? state.activeTabId
-        : worktreeId
-          ? (state?.activeTabIdByWorktree?.[worktreeId] ?? null)
-          : null
-    const manager = tabId ? window.__paneManagers?.get(tabId) : null
-    const pane = manager?.getActivePane?.() ?? manager?.getPanes?.()[0] ?? null
-    const textarea = pane?.container.querySelector(
-      '.xterm-helper-textarea'
-    ) as HTMLTextAreaElement | null
-    if (!pane || !textarea) {
-      throw new Error('No active terminal textarea for Ctrl+C dispatch')
-    }
-    pane.terminal.clearSelection()
-    pane.terminal.focus()
-    textarea.focus()
-
-    const createEvent = (type: 'keydown' | 'keyup', ctrlKey: boolean): KeyboardEvent => {
-      const event = new KeyboardEvent(type, {
-        key: 'c',
-        code: 'KeyC',
-        ctrlKey,
-        bubbles: true,
-        cancelable: true
-      })
-      Object.defineProperty(event, 'keyCode', { get: () => 67 })
-      Object.defineProperty(event, 'which', { get: () => 67 })
-      return event
-    }
-
-    // Why: Electron headless consumes real Ctrl+C before xterm in automation;
-    // synthetic DOM events still exercise Orca's installed xterm boundary.
-    const keydown = createEvent('keydown', true)
-    textarea.dispatchEvent(keydown)
-    const keyup = createEvent('keyup', dispatchOptions.keyupCtrlKey !== false)
-    textarea.dispatchEvent(keyup)
-    return {
-      keydownDefaultPrevented: keydown.defaultPrevented,
-      keyupDefaultPrevented: keyup.defaultPrevented
-    }
-  }, options)
-}
-
 async function focusFloatingTerminal(page: Page): Promise<void> {
   await page
     .locator(
@@ -227,53 +178,6 @@ async function getActiveTerminalViewport(
   })
 }
 
-async function enableKittyKeyboardReporting(page: Page, flags: number): Promise<void> {
-  await page.evaluate(async (flags) => {
-    const state = window.__store?.getState()
-    const worktreeId = state?.activeWorktreeId
-    const tabId =
-      state?.activeTabType === 'terminal'
-        ? state.activeTabId
-        : worktreeId
-          ? (state?.activeTabIdByWorktree?.[worktreeId] ?? null)
-          : null
-    const manager = tabId ? window.__paneManagers?.get(tabId) : null
-    const pane = manager?.getActivePane?.() ?? manager?.getPanes?.()[0] ?? null
-    if (!pane) {
-      throw new Error('No active terminal pane for kitty keyboard setup')
-    }
-    await new Promise<void>((resolve) => {
-      pane.terminal.write(`\x1b[=${flags}u`, resolve)
-    })
-  }, flags)
-}
-
-async function getKittyKeyboardFlags(page: Page): Promise<number | null> {
-  return page.evaluate(() => {
-    const state = window.__store?.getState()
-    const worktreeId = state?.activeWorktreeId
-    const tabId =
-      state?.activeTabType === 'terminal'
-        ? state.activeTabId
-        : worktreeId
-          ? (state?.activeTabIdByWorktree?.[worktreeId] ?? null)
-          : null
-    const manager = tabId ? window.__paneManagers?.get(tabId) : null
-    const pane = manager?.getActivePane?.() ?? manager?.getPanes?.()[0] ?? null
-    const terminal = pane?.terminal as
-      | {
-          core?: { coreService?: { kittyKeyboard?: { flags?: number } } }
-          _core?: { coreService?: { kittyKeyboard?: { flags?: number } } }
-        }
-      | undefined
-    return (
-      terminal?.core?.coreService?.kittyKeyboard?.flags ??
-      terminal?._core?.coreService?.kittyKeyboard?.flags ??
-      null
-    )
-  })
-}
-
 async function pressShiftedRussianLayoutKey(page: Page): Promise<{
   keydownDefaultPrevented: boolean
   keypressSent: boolean
@@ -481,14 +385,12 @@ test.describe('Terminal Shortcuts', () => {
 
     // Why: exercise the production PTY-output tracker, not xterm's renderer-
     // local flag state, so the test covers the bytes the shortcut policy sees.
-    await execInTerminal(orcaPage, ptyId, "printf '\\033[>1u'")
+    // The command disarms its own flags: ones left armed at exit are grounded by the host.
+    await execInTerminal(orcaPage, ptyId, "printf '\\033[>1u'; read -r _; printf '\\033[<u'")
     await expect.poll(() => getKittyKeyboardFlags(orcaPage)).toBe(1)
     await pressAndExpectWrite(orcaPage, electronApp, 'Shift+Enter', '\x1b[13;2u')
 
-    // Clear the shell's unconsumed CSI-u line before resetting flags in a settled
-    // command; otherwise its line editor can swallow the reset bytes.
-    await sendToTerminal(orcaPage, ptyId, '\x15\x03')
-    await execInTerminal(orcaPage, ptyId, "printf '\\033[=0u'")
+    await sendToTerminal(orcaPage, ptyId, '\r')
     await expect.poll(() => getKittyKeyboardFlags(orcaPage)).toBe(0)
     await pressAndExpectWrite(orcaPage, electronApp, 'Shift+Enter', '\x1b\r')
   })
@@ -552,42 +454,55 @@ test.describe('Terminal Shortcuts', () => {
     await pressAndExpectWrite(orcaPage, electronApp, 'Control+Enter', '\x1b[13;5u')
   })
 
-  test('plain Ctrl+C sends ETX under kitty keyboard reporting', async ({
+  test('plain Ctrl+C sends ETX and leaves a surviving app its kitty flags', async ({
     orcaPage,
     electronApp
   }) => {
+    test.skip(process.platform === 'win32', 'POSIX trap and printf fixture')
     await installMainProcessPtyWriteSpy(electronApp)
-    await waitForActivePanePtyId(orcaPage)
-    await enableKittyKeyboardReporting(orcaPage, 31)
-    await clearPtyWriteLog(electronApp)
-    await focusActiveTerminalInput(orcaPage)
-    await orcaPage.keyboard.down('Control')
-    await orcaPage.keyboard.up('Control')
-    expect((await getPtyWrites(electronApp)).join('')).toBe('')
-    await clearPtyWriteLog(electronApp)
+    const ptyId = await waitForActivePanePtyId(orcaPage)
+    // SIGINT during shell startup kills the shell, so interrupt only a ready prompt.
+    await execInTerminal(orcaPage, ptyId, 'echo "CTRL_C_""READY"')
+    await waitForTerminalOutput(orcaPage, 'CTRL_C_READY')
+    // An app that survives SIGINT, like an agent TUI, and disarms its own flags on exit.
+    await armKittyKeyboardFromPty(
+      orcaPage,
+      ptyId,
+      `bash -c 'trap "" INT; printf "\\033[=31u"; read -r _; printf "\\033[=0u"'`
+    )
 
-    expect(await dispatchCtrlCToActiveTerminalTextarea(orcaPage, { keyupCtrlKey: false })).toEqual({
-      keydownDefaultPrevented: false,
-      keyupDefaultPrevented: false
-    })
+    await interruptAndExpectEtx(orcaPage, electronApp)
 
-    await expect
-      .poll(async () => (await getPtyWrites(electronApp)).some((write) => write.includes('\x03')), {
-        timeout: 5_000,
-        message: 'Ctrl+C did not reach the PTY as ETX'
-      })
-      .toBe(true)
-    const writes = (await getPtyWrites(electronApp)).join('')
-    expect(writes).not.toContain('\x1b[99;5u')
-    expect(writes).not.toContain('\x1b[99')
+    // Orca no longer guesses the app died: xterm keeps encoding for it, and the
+    // mirror the shortcut policy reads agrees (Shift+Enter stays CSI-u).
+    expect(await getKittyKeyboardFlags(orcaPage)).toBe(31)
+    await pressAndExpectWrite(orcaPage, electronApp, 'Shift+Enter', '\x1b[13;2u')
+
+    await sendToTerminal(orcaPage, ptyId, '\r')
+    await expect.poll(async () => await getKittyKeyboardFlags(orcaPage)).toBe(0)
+    await pressAndExpectWrite(orcaPage, electronApp, 'Shift+Enter', '\x1b\r')
+  })
+
+  test('the host grounds kitty flags an app killed by Ctrl+C left armed', async ({
+    orcaPage,
+    electronApp
+  }) => {
+    test.skip(process.platform === 'win32', 'POSIX printf fixture')
+    await installMainProcessPtyWriteSpy(electronApp)
+    const ptyId = await waitForActivePanePtyId(orcaPage)
+    await execInTerminal(orcaPage, ptyId, 'echo "CTRL_C_""READY"')
+    await waitForTerminalOutput(orcaPage, 'CTRL_C_READY')
+    // `cat` dies on SIGINT with the flags still armed, like a crashed TUI.
+    await armKittyKeyboardFromPty(orcaPage, ptyId, `printf '\\033[=31u'; cat`)
+
+    await interruptAndExpectEtx(orcaPage, electronApp)
 
     await expect
       .poll(async () => await getKittyKeyboardFlags(orcaPage), {
         timeout: 5_000,
-        message: 'Ctrl+C did not clear stale Kitty keyboard flags'
+        message: 'the host did not ground the dead app kitty flags at command end'
       })
       .toBe(0)
-
     await clearPtyWriteLog(electronApp)
     await focusActiveTerminalInput(orcaPage)
     await orcaPage.keyboard.type('x')
@@ -597,11 +512,85 @@ test.describe('Terminal Shortcuts', () => {
         message: 'Post-interrupt keyboard input stayed in Kitty CSI-u mode'
       })
       .toBe(true)
-    const postInterruptWrites = (await getPtyWrites(electronApp)).join('')
-    expect(postInterruptWrites).not.toContain('\x1b[')
+    expect((await getPtyWrites(electronApp)).join('')).not.toContain('\x1b[')
     await orcaPage.keyboard.press('Backspace')
   })
 
+  test('unselected Cmd+C reaches a Kitty app, including after Ctrl+C', async ({
+    orcaPage,
+    electronApp
+  }) => {
+    test.skip(process.platform !== 'darwin', 'macOS copy binding')
+    await installMainProcessPtyWriteSpy(electronApp)
+    const ptyId = await waitForActivePanePtyId(orcaPage)
+    await execInTerminal(orcaPage, ptyId, 'echo "CMD_C_""READY"')
+    await waitForTerminalOutput(orcaPage, 'CMD_C_READY')
+    const select = (text: string | null): Promise<string> =>
+      orcaPage.evaluate(async (selectedText) => {
+        const state = window.__store!.getState()
+        const pane = window.__paneManagers!.get(state.activeTabId!)!.getActivePane()!
+        if (selectedText === null) {
+          pane.terminal.clearSelection()
+          return ''
+        }
+        await new Promise<void>((resolve) =>
+          pane.terminal.write(`\r\n${selectedText}\r\n`, resolve)
+        )
+        const buffer = pane.terminal.buffer.active
+        pane.terminal.select(0, buffer.baseY + buffer.cursorY - 1, selectedText.length)
+        return pane.terminal.getSelection()
+      }, text)
+    // Presses Cmd+C, then a marker chord whose write proves the Cmd+C bytes had their turn.
+    const pressCmdC = async (marker: string, markerWrite: string): Promise<string[]> => {
+      await clearPtyWriteLog(electronApp)
+      await focusActiveTerminalInput(orcaPage)
+      await orcaPage.keyboard.press('Meta+c')
+      await orcaPage.keyboard.press(marker)
+      await expect.poll(async () => await getPtyWrites(electronApp)).toContain(markerWrite)
+      const writes = await getPtyWrites(electronApp)
+      return writes.slice(0, writes.indexOf(markerWrite))
+    }
+    const kittyCmdC = ['\x1b[99;9;99u', '\x1b[99;9:3u']
+    const originalClipboard = await electronApp.evaluate(({ clipboard }) => clipboard.readText())
+    try {
+      await select(null)
+      expect(await pressCmdC('x', 'x')).toEqual([])
+      await orcaPage.keyboard.press('Backspace')
+
+      // An app that survives SIGINT, like an agent TUI, and disarms its own flags on exit.
+      await armKittyKeyboardFromPty(
+        orcaPage,
+        ptyId,
+        `bash -c 'trap "" INT; printf "\\033[=31u"; read -r _; printf "\\033[=0u"'`
+      )
+      await select(null)
+      expect(await pressCmdC('Shift+Enter', '\x1b[13;2u')).toEqual(kittyCmdC)
+
+      const selectedText = await select('Terminal copy selection')
+      expect(selectedText).toBe('Terminal copy selection')
+      await electronApp.evaluate(({ clipboard }) => clipboard.writeText(''))
+      expect(await pressCmdC('Shift+Enter', '\x1b[13;2u')).toEqual([])
+      await expect
+        .poll(() => electronApp.evaluate(({ clipboard }) => clipboard.readText()))
+        .toBe(selectedText)
+
+      await interruptAndExpectEtx(orcaPage, electronApp)
+      expect(await getKittyKeyboardFlags(orcaPage)).toBe(31)
+      await select(null)
+      expect(await pressCmdC('Shift+Enter', '\x1b[13;2u')).toEqual(kittyCmdC)
+
+      await sendToTerminal(orcaPage, ptyId, '\r')
+      await expect.poll(async () => await getKittyKeyboardFlags(orcaPage)).toBe(0)
+      expect(await pressCmdC('x', 'x')).toEqual([])
+      await orcaPage.keyboard.press('Backspace')
+    } finally {
+      await electronApp.evaluate(
+        ({ clipboard }, text) => clipboard.writeText(text),
+        originalClipboard
+      )
+    }
+  })
+
   test('@headful Codex-like background output stays visible without disabling WebGL in auto mode', async ({
     orcaPage
   }) => {
@@ -909,12 +898,13 @@ test.describe('Terminal Shortcuts', () => {
     orcaPage,
     electronApp
   }) => {
+    test.skip(process.platform === 'win32', 'ConPTY panes withhold the kitty protocol')
     await installMainProcessPtyWriteSpy(electronApp)
     // Why: CI can mount the xterm surface before the pane transport has a
     // live PTY. Probe first so xterm onData cannot race a disconnected
     // sendInput path, then clear the probe writes before the layout assertion.
-    await waitForActivePanePtyId(orcaPage)
-    await enableKittyKeyboardReporting(orcaPage, 31)
+    const ptyId = await waitForActivePanePtyId(orcaPage)
+    await armKittyKeyboardFromPty(orcaPage, ptyId, `printf '\\033[=31u'; cat`)
     await clearPtyWriteLog(electronApp)
 
     const dispatch = await pressShiftedRussianLayoutKey(orcaPage)
@@ -936,5 +926,6 @@ test.describe('Terminal Shortcuts', () => {
     const joinedWrites = writes.join('')
     expect(joinedWrites).not.toContain('\x1b[97:1060;2;1060u')
     expect(joinedWrites).not.toContain('\x1b[97:1060;2:3u')
+    await sendToTerminal(orcaPage, ptyId, '\x03')
   })
 })
diff --git a/tests/e2e/terminal-tab-close-restart-persistence.spec.ts b/tests/e2e/terminal-tab-close-restart-persistence.spec.ts
index 9df296d287bf..20421dd17303 100644
--- a/tests/e2e/terminal-tab-close-restart-persistence.spec.ts
+++ b/tests/e2e/terminal-tab-close-restart-persistence.spec.ts
@@ -137,8 +137,19 @@ test('durable whole-tab close removes a split tab across restart', async (// oxl
     const secondLaunch = await session.launch()
     secondApp = secondLaunch.app
     await waitForSessionReady(secondLaunch.page)
-    const restoredWorktreeId = await attachRepoAndOpenTerminal(secondLaunch.page, repoPath)
-    expect(restoredWorktreeId).toBe(worktreeId)
+    // Activation deliberately creates a fresh terminal; observe passive hydration first.
+    await expect
+      .poll(() =>
+        secondLaunch.page.evaluate(
+          (id) =>
+            window.__store
+              ?.getState()
+              .allWorktrees()
+              .some((worktree) => worktree.id === id),
+          worktreeId
+        )
+      )
+      .toBe(true)
 
     // Why: wait past initial worktree effects so this checks resurrection, not
     // only the first hydrated frame before default-tab logic has run.
diff --git a/tests/e2e/terminal-tui-wheel-reports.spec.ts b/tests/e2e/terminal-tui-wheel-reports.spec.ts
index ab02cf7a98b4..f3259409cdbd 100644
--- a/tests/e2e/terminal-tui-wheel-reports.spec.ts
+++ b/tests/e2e/terminal-tui-wheel-reports.spec.ts
@@ -47,8 +47,6 @@ async function probeSmallMouseWheelReports(
       const reports: string[] = []
       const disposable = pane.terminal.onData((data) => reports.push(data))
       try {
-        await new Promise<void>((resolve) => pane.terminal.write('\x1b[?1003h\x1b[?1006h', resolve))
-        await new Promise((resolve) => requestAnimationFrame(() => resolve(undefined)))
         if (!pane.terminal.element.classList.contains('enable-mouse-events')) {
           throw new Error('Mouse reporting mode did not activate')
         }
@@ -139,8 +137,6 @@ async function probeTimedSmallMouseWheelReports(
       const reports: string[] = []
       const disposable = pane.terminal.onData((data) => reports.push(data))
       try {
-        await new Promise<void>((resolve) => pane.terminal.write('\x1b[?1003h\x1b[?1006h', resolve))
-        await new Promise((resolve) => requestAnimationFrame(() => resolve(undefined)))
         if (!pane.terminal.element.classList.contains('enable-mouse-events')) {
           throw new Error('Mouse reporting mode did not activate')
         }
@@ -284,6 +280,18 @@ async function dispatchTuiWheel(
   }, options)
 }
 
+// Let a running TUI own mouse mode; late shell startup output can reset injected modes.
+async function startTuiFixture(page: Page): Promise<void> {
+  const ptyId = await waitForActivePanePtyId(page)
+  await execInTerminal(page, ptyId, `node ${JSON.stringify(VISIBLE_TUI_FIXTURE_PATH)}`)
+  await expect
+    .poll(() => readVisibleTuiOffset(page), {
+      timeout: 10_000,
+      message: 'fullscreen TUI did not render numbered rows'
+    })
+    .toBe(0)
+}
+
 test.describe('terminal TUI wheel reports', () => {
   test('notched mouse wheel ticks produce immediate mouse-reporting TUI scroll reports', async ({
     orcaPage
@@ -296,6 +304,7 @@ test.describe('terminal TUI wheel reports', () => {
       window.__store?.getState().updateSettings({ terminalTuiScrollSensitivity: 1 })
     )
 
+    await startTuiFixture(orcaPage)
     const samples = await probeSmallMouseWheelReports(orcaPage, 4)
 
     expect(
@@ -338,15 +347,7 @@ test.describe('terminal TUI wheel reports', () => {
       window.__store?.getState().updateSettings({ terminalTuiScrollSensitivity: 1 })
     )
 
-    const ptyId = await waitForActivePanePtyId(orcaPage)
-    await execInTerminal(orcaPage, ptyId, `node ${JSON.stringify(VISIBLE_TUI_FIXTURE_PATH)}`)
-
-    await expect
-      .poll(() => readVisibleTuiOffset(orcaPage), {
-        timeout: 10_000,
-        message: 'visible fullscreen TUI did not render numbered rows'
-      })
-      .toBe(0)
+    await startTuiFixture(orcaPage)
 
     await dispatchTuiWheel(orcaPage, {
       deltaY: 10,
@@ -399,6 +400,7 @@ test.describe('terminal TUI wheel reports', () => {
       window.__store?.getState().updateSettings({ terminalTuiScrollSensitivity: 5 })
     )
 
+    await startTuiFixture(orcaPage)
     const slow = await probeTimedSmallMouseWheelReports(orcaPage, {
       drainWaitMs: 120,
       intervalMs: 220,
diff --git a/tests/e2e/worktree-jump-sleep-focus.spec.ts b/tests/e2e/worktree-jump-sleep-focus.spec.ts
new file mode 100644
index 000000000000..eacdea6b8927
--- /dev/null
+++ b/tests/e2e/worktree-jump-sleep-focus.spec.ts
@@ -0,0 +1,68 @@
+import { test, expect } from './helpers/orca-app'
+import {
+  ensureTerminalVisible,
+  getAllWorktreeIds,
+  switchToWorktree,
+  waitForActiveWorktree,
+  waitForSessionReady
+} from './helpers/store'
+import {
+  waitForActivePanePtyId,
+  waitForActiveTerminalManager,
+  waitForTerminalOutput
+} from './helpers/terminal'
+
+test('Cmd+J focuses the terminal after waking a sleeping workspace', async ({
+  orcaPage
+}, testInfo) => {
+  await waitForSessionReady(orcaPage)
+  const source = await waitForActiveWorktree(orcaPage)
+  const target = (await getAllWorktreeIds(orcaPage)).find((id) => id !== source)
+  if (!target) {
+    throw new Error('Expected a second seeded workspace')
+  }
+  await switchToWorktree(orcaPage, target)
+  await ensureTerminalVisible(orcaPage)
+  await waitForActiveTerminalManager(orcaPage)
+  await waitForActivePanePtyId(orcaPage)
+  const targetName = await orcaPage.evaluate((id) => {
+    const state = window.__store!.getState()
+    const worktree = state.getKnownWorktreeById(id)
+    if (!worktree) {
+      throw new Error('Missing target workspace')
+    }
+    return worktree.branch.replace(/^refs\/heads\//, '')
+  }, target)
+  await switchToWorktree(orcaPage, source)
+  await orcaPage.evaluate(async (id) => {
+    await window.__store!.getState().shutdownWorktreeTerminals(id, { keepIdentifiers: true })
+  }, target)
+  await orcaPage.evaluate(() => {
+    const listSessions = window.api.pty.listSessions
+    window.api.pty.listSessions = async (...args) => {
+      await new Promise((resolve) => setTimeout(resolve, 100))
+      return listSessions(...args)
+    }
+  })
+  // Native menu accelerators require OS focus; open the same palette in the hidden renderer.
+  await orcaPage.evaluate(() => window.__store!.getState().openModal('worktree-palette'))
+  const dialog = orcaPage.getByRole('dialog', { name: 'Jump to...' })
+  await expect(dialog).toBeVisible()
+  await dialog.getByRole('combobox').fill(targetName)
+  await expect(dialog.locator('[cmdk-item][data-selected="true"]')).toContainText(targetName)
+  const cdp = await orcaPage.context().newCDPSession(orcaPage)
+  await cdp.send('Emulation.setCPUThrottlingRate', { rate: 8 })
+  await orcaPage.keyboard.press('Enter')
+  await expect(dialog).toBeHidden()
+  await waitForActiveTerminalManager(orcaPage)
+  await waitForActivePanePtyId(orcaPage)
+  const terminal = orcaPage.locator('[data-terminal-tab-id]:visible .xterm-helper-textarea').first()
+  await orcaPage.screenshot({ path: testInfo.outputPath('wake-focus.png') })
+  await expect(terminal).toBeFocused()
+  await cdp.send('Emulation.setCPUThrottlingRate', { rate: 1 })
+  await cdp.detach()
+  await orcaPage.keyboard.type('echo WAKE_KEYBOARD_OK')
+  await orcaPage.keyboard.press('Enter')
+  await waitForTerminalOutput(orcaPage, 'WAKE_KEYBOARD_OK')
+  await orcaPage.screenshot({ path: testInfo.outputPath('wake-typing.png') })
+})
diff --git a/tests/e2e/worktree-scroll-to-current.spec.ts b/tests/e2e/worktree-scroll-to-current.spec.ts
index 07f9f87d05c5..cdb39420ef05 100644
--- a/tests/e2e/worktree-scroll-to-current.spec.ts
+++ b/tests/e2e/worktree-scroll-to-current.spec.ts
@@ -40,7 +40,7 @@ test.describe('Reveal active workspace button', () => {
   // (not a scenario real users hit). Reveal-into-view is covered robustly by
   // the "outside the virtualized window" test below.
 
-  test('clears sidebar filters before revealing a hidden current workspace', async ({
+  test('adjusts sidebar filters before revealing a hidden current workspace', async ({
     orcaPage,
     testRepoPath
   }, testInfo) => {
@@ -94,6 +94,13 @@ test.describe('Reveal active workspace button', () => {
     if (!targetId) {
       throw new Error('Seeded secondary worktree is missing')
     }
+    const targetRepoId = await orcaPage.evaluate(
+      (repoPath) => window.__store!.getState().repos.find((repo) => repo.path === repoPath)?.id,
+      testRepoPath
+    )
+    if (!targetRepoId) {
+      throw new Error('Seeded repository is missing')
+    }
 
     const targetRows = orcaPage.locator(
       `[data-worktree-sidebar] [data-worktree-id=${JSON.stringify(targetId)}]`
@@ -132,7 +139,7 @@ test.describe('Reveal active workspace button', () => {
     await revealButton.click()
     await orcaPage
       .getByRole('dialog', { name: 'Reveal hidden workspace?' })
-      .getByRole('button', { name: 'Clear filters and reveal' })
+      .getByRole('button', { name: 'Adjust filters and reveal' })
       .click()
 
     await expect(targetRow).toBeVisible()
@@ -149,10 +156,11 @@ test.describe('Reveal active workspace button', () => {
           }),
         {
           timeout: 10_000,
-          message: 'Reveal button should clear repo filters that hide the current workspace'
+          message:
+            'Reveal button should preserve selected repos while revealing the current workspace'
         }
       )
-      .toEqual([])
+      .toEqual([filterRepoId, targetRepoId])
   })
 
   test('reveals the current workspace when it starts outside the virtualized window', async ({
diff --git a/tests/tools/google-signin-ua-probe.cjs b/tests/tools/google-signin-ua-probe.cjs
index 47d8b419d7ac..2b3e96387201 100644
--- a/tests/tools/google-signin-ua-probe.cjs
+++ b/tests/tools/google-signin-ua-probe.cjs
@@ -241,7 +241,7 @@ app.whenReady().then(async () => {
       return
     }
     if (isAppMode) {
-      // Mirror applyGoogleAuthUserAgent: Firefox UA on auth navs, restore the
+      // Mirror presentTabIdentityAtNavigationStart: Firefox UA on auth navs, restore the
       // cleaned session UA otherwise. This WebContents UA is what leaks onto
       // cross-host subresource requests while the auth document is on screen.
       const current = window.webContents.getUserAgent()
diff --git a/tests/tools/omp-source-control-runtime-smoke.mjs b/tests/tools/omp-source-control-runtime-smoke.mjs
index 8dce4a547754..9e806320270f 100644
--- a/tests/tools/omp-source-control-runtime-smoke.mjs
+++ b/tests/tools/omp-source-control-runtime-smoke.mjs
@@ -4,7 +4,9 @@ import { join, resolve } from 'node:path'
 import { getCommitMessageAgentSpec } from '../../src/shared/commit-message-agent-spec.ts'
 const reference = process.argv[2]
 assert.ok(reference, 'Pass the read-only source checkout path')
-const { parseArgs } = await import(pathToFileURL(join(resolve(reference), 'packages/coding-agent/src/cli/args.ts')).href)
+const { parseArgs } = await import(
+  pathToFileURL(join(resolve(reference), 'packages/coding-agent/src/cli/args.ts')).href
+)
 const spec = getCommitMessageAgentSpec('omp')
 assert.ok(spec)
 for (const model of ['default', 'provider/model']) {
@@ -20,4 +22,12 @@ for (const model of ['default', 'provider/model']) {
   assert.equal(parsed.model, model === 'default' ? undefined : model)
   assert.deepEqual(parsed.messages, [])
 }
-console.log(JSON.stringify({ actualArgumentParser: true, promptDelivery: spec.promptDelivery, configDefault: true, explicitModel: true, modelCalls: 0 }))
+console.log(
+  JSON.stringify({
+    actualArgumentParser: true,
+    promptDelivery: spec.promptDelivery,
+    configDefault: true,
+    explicitModel: true,
+    modelCalls: 0
+  })
+)
diff --git a/tests/tools/win-update-e2e/app-driver.mjs b/tests/tools/win-update-e2e/app-driver.mjs
index 33f59121f879..62165bfdcd1a 100644
--- a/tests/tools/win-update-e2e/app-driver.mjs
+++ b/tests/tools/win-update-e2e/app-driver.mjs
@@ -20,6 +20,7 @@ import { execFileSync } from 'node:child_process'
 import { mkdirSync, realpathSync, writeFileSync } from 'node:fs'
 import path from 'node:path'
 import { seedFreshProfile } from './onboarding-profile.mjs'
+import { isPidAlive } from './daemon-processes.mjs'
 
 const NEW_TAB_BUTTON = { role: 'button', name: 'New tab' }
 const NEW_TERMINAL_ITEM = /New Terminal/i
@@ -237,7 +238,7 @@ export async function waitForTerminalReady(page, timeoutMs = 60_000, terminalTab
  *     workspace (which would mask a broken restore).
  */
 export async function ensureTerminal(page, { allowCreate = true, timeoutMs = 60_000 } = {}) {
-  // Why: the agent-CLI feature-wall modal can already be up at first interaction
+  // Why: a feature-tip modal can already be up at first interaction
   // (it renders off an async capability check that races app launch). Use the
   // Escape-free dismissal so we never inject a keypress into a restored terminal.
   await dismissKnownOverlays(page)
@@ -295,14 +296,20 @@ async function createWorkspaceFromSeededRepo(page, timeoutMs) {
 }
 
 const OVERLAY_DISMISS_LABELS = ['Got it', 'Dismiss setup scripts', 'Dismiss tip', 'Dismiss update']
-const CLI_FEATURE_TIP_TITLE = 'Let agents drive Orca with the Orca CLI'
+const FEATURE_TIP_DIALOG_TITLES = [
+  'Let agents drive Orca with the Orca CLI',
+  'Search every agent session'
+]
 
 async function dismissKnownOverlays(page) {
   let acted = false
-  const cliFeatureTip = page.getByRole('dialog', { name: CLI_FEATURE_TIP_TITLE }).first()
-  if (await cliFeatureTip.isVisible().catch(() => false)) {
+  for (const name of FEATURE_TIP_DIALOG_TITLES) {
+    const featureTip = page.getByRole('dialog', { name }).first()
+    if (!(await featureTip.isVisible().catch(() => false))) {
+      continue
+    }
     // Why: a global "Close" role also matches the Windows/Linux title-bar button.
-    const dialogClose = cliFeatureTip.locator('[data-slot="dialog-close"]').first()
+    const dialogClose = featureTip.locator('[data-slot="dialog-close"]').first()
     if (await dialogClose.isVisible().catch(() => false)) {
       const clicked = await dialogClose
         .click({ timeout: 3_000 })
@@ -484,30 +491,84 @@ export async function readTerminalTextBestEffort(page) {
   })
 }
 
-/**
- * Close the app gracefully; force-kill its process tree on timeout. Mirrors
- * tests/e2e/helpers/electron-process-shutdown.ts so the daemon (detached) is
- * left alive exactly as a normal quit would.
- */
-export async function closeApp(app, timeoutMs = 10_000) {
+const appShutdownProcesses = {
+  isPidAlive,
+  killTree(pid) {
+    execFileSync('taskkill', ['/pid', String(pid), '/T', '/F'], { stdio: 'ignore' })
+  }
+}
+
+/** Cleanup may kill the tree; survival proofs must disable that fallback. */
+export async function closeApp(
+  app,
+  timeoutMs = 10_000,
+  { allowForceKill = true, processes = appShutdownProcesses } = {}
+) {
   // A partially-created session (launch failed before assignment) passes undefined.
   if (!app) {
     return
   }
-  const mainPid = await resolveElectronMainPid(app)
+  const mainPid = await resolveElectronMainPid(app, { allowLauncherFallback: allowForceKill })
+  const launcher = app.process()
+  let closeStatus = 'not-started'
   let closeTimeout
   try {
+    if (!allowForceKill && mainPid === null) {
+      throw new Error('Cannot verify graceful close without the authoritative Electron PID')
+    }
+    closeStatus = 'pending'
+    const closePromise = app.close().then(
+      () => {
+        closeStatus = 'resolved'
+      },
+      (error) => {
+        closeStatus = 'rejected'
+        throw error
+      }
+    )
     await Promise.race([
-      app.close(),
+      closePromise,
       new Promise((_, reject) => {
         closeTimeout = setTimeout(() => reject(new Error('close timeout')), timeoutMs)
         closeTimeout.unref?.()
       })
     ])
-  } catch {
+    if (!allowForceKill && processes.isPidAlive(mainPid)) {
+      throw new Error('Playwright close resolved while the authoritative Electron PID remains live')
+    }
+  } catch (error) {
+    if (!allowForceKill) {
+      const evidence = {
+        closeStatus,
+        error: error instanceof Error ? error.message : String(error),
+        main: readClosePidEvidence(mainPid, processes),
+        launcher: {
+          ...readClosePidEvidence(launcher?.pid, processes),
+          exitCode: launcher?.exitCode ?? null,
+          signalCode: launcher?.signalCode ?? null,
+          stdio:
+            launcher?.stdio.map((pipe, fd) => ({
+              fd,
+              destroyed: pipe?.destroyed ?? null,
+              readableEnded: pipe?.readableEnded ?? null
+            })) ?? []
+        }
+      }
+      // A surviving daemon can keep the launcher's pipes open after both app processes exit.
+      if (
+        closeStatus === 'pending' &&
+        evidence.main.state === 'exited' &&
+        evidence.launcher.state === 'exited'
+      ) {
+        console.log(`[win-update-e2e] close-verified-by-pids: ${JSON.stringify(evidence)}`)
+        return
+      }
+      console.error(`[win-update-e2e] strict-close-failed: ${JSON.stringify(evidence)}`)
+      throw error
+    }
     if (mainPid) {
       try {
-        execFileSync('taskkill', ['/pid', String(mainPid), '/T', '/F'], { stdio: 'ignore' })
+        processes.killTree(mainPid)
       } catch {
         /* already gone */
       }
@@ -518,3 +579,18 @@ export async function closeApp(app, timeoutMs = 10_000) {
     clearTimeout(closeTimeout)
   }
 }
+
+function readClosePidEvidence(pid, processes) {
+  if (!Number.isInteger(pid) || pid <= 0) {
+    return { pid: pid ?? null, state: 'unverifiable', error: 'PID unavailable' }
+  }
+  try {
+    return { pid, state: processes.isPidAlive(pid) ? 'live' : 'exited' }
+  } catch (error) {
+    return {
+      pid,
+      state: 'unverifiable',
+      error: error instanceof Error ? error.message : String(error)
+    }
+  }
+}
diff --git a/tests/tools/win-update-e2e/app-driver.test.mjs b/tests/tools/win-update-e2e/app-driver.test.mjs
index ac0347662574..14eda7caf17f 100644
--- a/tests/tools/win-update-e2e/app-driver.test.mjs
+++ b/tests/tools/win-update-e2e/app-driver.test.mjs
@@ -10,46 +10,51 @@ function hiddenButton() {
   }
 }
 
+const FEATURE_TIP_TITLES = ['Let agents drive Orca with the Orca CLI', 'Search every agent session']
+
 describe('dismissOverlays', () => {
-  it('dismisses a dialog without clicking the desktop window Close button', async () => {
-    const dialogClose = {
-      first: vi.fn(),
-      isVisible: vi.fn().mockResolvedValue(true),
-      click: vi.fn().mockResolvedValue(undefined)
-    }
-    dialogClose.first.mockReturnValue(dialogClose)
-    const windowClose = {
-      first: vi.fn(),
-      isVisible: vi.fn().mockResolvedValue(true),
-      click: vi.fn().mockRejectedValue(new Error('window closed'))
-    }
-    windowClose.first.mockReturnValue(windowClose)
-    const featureTipDialog = {
-      first: vi.fn(),
-      isVisible: vi.fn().mockResolvedValue(true),
-      locator: vi.fn().mockReturnValue(dialogClose)
-    }
-    featureTipDialog.first.mockReturnValue(featureTipDialog)
+  it.each(FEATURE_TIP_TITLES)(
+    'dismisses %s without clicking the desktop window Close button',
+    async (title) => {
+      const dialogClose = {
+        first: vi.fn(),
+        isVisible: vi.fn().mockResolvedValue(true),
+        click: vi.fn().mockResolvedValue(undefined)
+      }
+      dialogClose.first.mockReturnValue(dialogClose)
+      const windowClose = {
+        first: vi.fn(),
+        isVisible: vi.fn().mockResolvedValue(true),
+        click: vi.fn().mockRejectedValue(new Error('window closed'))
+      }
+      windowClose.first.mockReturnValue(windowClose)
+      const featureTipDialog = {
+        first: vi.fn(),
+        isVisible: vi.fn().mockResolvedValue(true),
+        locator: vi.fn().mockReturnValue(dialogClose)
+      }
+      featureTipDialog.first.mockReturnValue(featureTipDialog)
 
-    const page = {
-      getByRole: vi.fn((role, { name }) => {
-        if (role === 'dialog') {
-          return featureTipDialog
-        }
-        return name === 'Close' ? windowClose : hiddenButton()
-      }),
-      keyboard: { press: vi.fn().mockResolvedValue(undefined) },
-      waitForTimeout: vi.fn().mockResolvedValue(undefined)
-    }
+      const page = {
+        getByRole: vi.fn((role, { name }) => {
+          if (role === 'dialog') {
+            return name === title ? featureTipDialog : hiddenButton()
+          }
+          return name === 'Close' ? windowClose : hiddenButton()
+        }),
+        keyboard: { press: vi.fn().mockResolvedValue(undefined) },
+        waitForTimeout: vi.fn().mockResolvedValue(undefined)
+      }
 
-    await dismissOverlays(page, 1)
+      await dismissOverlays(page, 1)
 
-    expect(dialogClose.click).toHaveBeenCalledOnce()
-    expect(windowClose.click).not.toHaveBeenCalled()
-    expect(page.getByRole).toHaveBeenCalledWith('dialog', {
-      name: 'Let agents drive Orca with the Orca CLI'
-    })
-  })
+      expect(dialogClose.click).toHaveBeenCalledOnce()
+      expect(windowClose.click).not.toHaveBeenCalled()
+      expect(page.getByRole).toHaveBeenCalledWith('dialog', {
+        name: title
+      })
+    }
+  )
 
   it('keeps overlay retries within the caller timeout budget', async () => {
     vi.useFakeTimers()
@@ -145,44 +150,64 @@ describe('dismissOverlays', () => {
     }
   })
 
-  it('dismisses the CLI tip without sending Escape into an already-restored terminal', async () => {
-    const dialogClose = {
-      first: vi.fn(),
-      isVisible: vi.fn().mockResolvedValue(true),
-      click: vi.fn().mockResolvedValue(undefined)
-    }
-    dialogClose.first.mockReturnValue(dialogClose)
-    const featureTipDialog = {
-      first: vi.fn(),
-      isVisible: vi.fn().mockResolvedValue(true),
-      locator: vi.fn().mockReturnValue(dialogClose)
+  it.each(FEATURE_TIP_TITLES)(
+    'dismisses %s without sending Escape into an already-restored terminal',
+    async (title) => {
+      const dialogClose = {
+        first: vi.fn(),
+        isVisible: vi.fn().mockResolvedValue(true),
+        click: vi.fn().mockResolvedValue(undefined)
+      }
+      dialogClose.first.mockReturnValue(dialogClose)
+      const featureTipDialog = {
+        first: vi.fn(),
+        isVisible: vi.fn().mockResolvedValue(true),
+        locator: vi.fn().mockReturnValue(dialogClose)
+      }
+      featureTipDialog.first.mockReturnValue(featureTipDialog)
+      const xterm = {
+        first: vi.fn(),
+        waitFor: vi.fn().mockResolvedValue(undefined)
+      }
+      xterm.first.mockReturnValue(xterm)
+      const terminalSurface = {
+        first: vi.fn(),
+        isVisible: vi.fn().mockResolvedValue(true),
+        waitFor: vi.fn().mockResolvedValue(undefined),
+        locator: vi.fn().mockReturnValue(xterm)
+      }
+      terminalSurface.first.mockReturnValue(terminalSurface)
+      const page = {
+        locator: vi.fn().mockReturnValue(terminalSurface),
+        getByRole: vi.fn((role, { name }) =>
+          role === 'dialog' && name === title ? featureTipDialog : hiddenButton()
+        ),
+        keyboard: { press: vi.fn().mockResolvedValue(undefined) }
+      }
+
+      await ensureTerminal(page, { allowCreate: false })
+
+      expect(dialogClose.click).toHaveBeenCalledOnce()
+      expect(page.keyboard.press).not.toHaveBeenCalled()
     }
-    featureTipDialog.first.mockReturnValue(featureTipDialog)
-    const xterm = {
+  )
+
+  it('dismisses a late session-search tip without dismissing or reopening the composer', async () => {
+    let tipVisible = false
+    const tipClose = {
       first: vi.fn(),
-      waitFor: vi.fn().mockResolvedValue(undefined)
+      isVisible: vi.fn(async () => tipVisible),
+      click: vi.fn(async () => {
+        tipVisible = false
+      })
     }
-    xterm.first.mockReturnValue(xterm)
-    const terminalSurface = {
+    tipClose.first.mockReturnValue(tipClose)
+    const sessionSearchTip = {
       first: vi.fn(),
-      isVisible: vi.fn().mockResolvedValue(true),
-      waitFor: vi.fn().mockResolvedValue(undefined),
-      locator: vi.fn().mockReturnValue(xterm)
-    }
-    terminalSurface.first.mockReturnValue(terminalSurface)
-    const page = {
-      locator: vi.fn().mockReturnValue(terminalSurface),
-      getByRole: vi.fn((role) => (role === 'dialog' ? featureTipDialog : hiddenButton())),
-      keyboard: { press: vi.fn().mockResolvedValue(undefined) }
+      isVisible: vi.fn(async () => tipVisible),
+      locator: vi.fn().mockReturnValue(tipClose)
     }
-
-    await ensureTerminal(page, { allowCreate: false })
-
-    expect(dialogClose.click).toHaveBeenCalledOnce()
-    expect(page.keyboard.press).not.toHaveBeenCalled()
-  })
-
-  it('submits within the composer without dismissing and reopening it', async () => {
+    sessionSearchTip.first.mockReturnValue(sessionSearchTip)
     const newWorkspace = {
       first: vi.fn(),
       click: vi.fn().mockResolvedValue(undefined)
@@ -192,8 +217,13 @@ describe('dismissOverlays', () => {
       last: vi.fn(),
       click: vi
         .fn()
-        .mockRejectedValueOnce(new Error('submit was briefly intercepted'))
-        .mockResolvedValueOnce(undefined)
+        .mockImplementationOnce(async () => {
+          tipVisible = true
+          throw new Error('session-search tip intercepted submission')
+        })
+        .mockImplementationOnce(async () => {
+          expect(tipVisible).toBe(false)
+        })
     }
     createWorktree.last.mockReturnValue(createWorktree)
     const composer = {
@@ -226,6 +256,9 @@ describe('dismissOverlays', () => {
       ),
       getByRole: vi.fn((role, { name }) => {
         if (role === 'dialog') {
+          if (name === 'Search every agent session') {
+            return sessionSearchTip
+          }
           return name === 'Create worktree' ? composer : hiddenButton()
         }
         return name === 'New workspace' ? newWorkspace : hiddenButton()
@@ -238,6 +271,9 @@ describe('dismissOverlays', () => {
 
     expect(composer.getByRole).toHaveBeenCalledWith('button', { name: /^Create worktree/ })
     expect(unintendedDialogClose.click).not.toHaveBeenCalled()
+    expect(tipClose.click).toHaveBeenCalledOnce()
+    expect(page.keyboard.press).not.toHaveBeenCalled()
+    expect(newWorkspace.click).toHaveBeenCalledOnce()
     expect(createWorktree.click).toHaveBeenCalledTimes(2)
   })
 
diff --git a/tests/tools/win-update-e2e/app-shutdown.test.mjs b/tests/tools/win-update-e2e/app-shutdown.test.mjs
new file mode 100644
index 000000000000..bad1ab8e6f6d
--- /dev/null
+++ b/tests/tools/win-update-e2e/app-shutdown.test.mjs
@@ -0,0 +1,119 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { closeApp } from './app-driver.mjs'
+
+const processes = {
+  isPidAlive: vi.fn().mockReturnValue(true),
+  killTree: vi.fn()
+}
+const strictCloseOptions = { allowForceKill: false, processes }
+
+afterEach(() => {
+  vi.useRealTimers()
+  vi.clearAllMocks()
+  processes.isPidAlive.mockReturnValue(true)
+})
+
+describe('update-survival shutdown', () => {
+  it('keeps the force-kill fallback enabled for best-effort cleanup', async () => {
+    const app = {
+      evaluate: vi.fn().mockResolvedValue(123),
+      process: () => ({ pid: 124, stdio: [] }),
+      close: vi.fn().mockRejectedValue(new Error('quit rejected'))
+    }
+
+    await closeApp(app, 45_000, { processes })
+
+    expect(processes.killTree).toHaveBeenCalledExactlyOnceWith(123)
+  })
+
+  it('fails before installation instead of killing the daemon tree after a rejected close', async () => {
+    const failure = new Error('quit rejected')
+    const app = {
+      evaluate: vi.fn().mockResolvedValue(123),
+      process: () => ({ pid: 124, stdio: [] }),
+      close: vi.fn().mockRejectedValue(failure)
+    }
+
+    await expect(closeApp(app, 45_000, strictCloseOptions)).rejects.toBe(failure)
+    expect(processes.killTree).not.toHaveBeenCalled()
+  })
+
+  it('allows normal teardown past ten seconds and still rejects a wedged quit without a tree kill', async () => {
+    vi.useFakeTimers()
+    const app = {
+      evaluate: vi.fn().mockResolvedValue(123),
+      process: () => ({ pid: 124, stdio: [] }),
+      close: vi.fn(() => new Promise(() => {}))
+    }
+    const closed = closeApp(app, 45_000, strictCloseOptions)
+    const rejected = expect(closed).rejects.toThrow('close timeout')
+
+    await vi.advanceTimersByTimeAsync(30_000)
+    expect(vi.getTimerCount()).toBe(1)
+    expect(processes.killTree).not.toHaveBeenCalled()
+    await vi.advanceTimersByTimeAsync(15_000)
+    await rejected
+    expect(processes.killTree).not.toHaveBeenCalled()
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('rejects a resolved close while the authoritative main remains live', async () => {
+    const app = {
+      evaluate: vi.fn().mockResolvedValue(123),
+      process: () => ({ pid: 124, stdio: [] }),
+      close: vi.fn().mockResolvedValue(undefined)
+    }
+
+    await expect(closeApp(app, 45_000, strictCloseOptions)).rejects.toThrow(
+      'authoritative Electron PID remains live'
+    )
+    expect(processes.isPidAlive).toHaveBeenCalledWith(123)
+    expect(processes.killTree).not.toHaveBeenCalled()
+  })
+
+  it('accepts verified main and launcher exit while inherited pipes keep close pending', async () => {
+    vi.useFakeTimers()
+    processes.isPidAlive.mockReturnValue(false)
+    const app = {
+      evaluate: vi.fn().mockResolvedValue(123),
+      process: () => ({ pid: 124, exitCode: 0, stdio: [{ readableEnded: false }] }),
+      close: vi.fn(() => new Promise(() => {}))
+    }
+    const closed = expect(closeApp(app, 45_000, strictCloseOptions)).resolves.toBeUndefined()
+
+    await vi.advanceTimersByTimeAsync(45_000)
+    await closed
+    expect(processes.isPidAlive).toHaveBeenCalledWith(123)
+    expect(processes.isPidAlive).toHaveBeenCalledWith(124)
+    expect(processes.killTree).not.toHaveBeenCalled()
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it.each(['live', 'unverifiable'])(
+    'rejects a %s launcher even when the main exited',
+    async (state) => {
+      vi.useFakeTimers()
+      processes.isPidAlive.mockImplementation((pid) => {
+        if (pid === 123) {
+          return false
+        }
+        if (state === 'unverifiable') {
+          throw new Error('process query failed')
+        }
+        return true
+      })
+      const app = {
+        evaluate: vi.fn().mockResolvedValue(123),
+        process: () => ({ pid: 124, stdio: [] }),
+        close: vi.fn(() => new Promise(() => {}))
+      }
+      const closed = expect(closeApp(app, 45_000, strictCloseOptions)).rejects.toThrow(
+        'close timeout'
+      )
+
+      await vi.advanceTimersByTimeAsync(45_000)
+      await closed
+      expect(processes.killTree).not.toHaveBeenCalled()
+    }
+  )
+})
diff --git a/tests/tools/win-update-e2e/run.mjs b/tests/tools/win-update-e2e/run.mjs
index 7c8d8cde6c5b..fc0ec4b36a63 100644
--- a/tests/tools/win-update-e2e/run.mjs
+++ b/tests/tools/win-update-e2e/run.mjs
@@ -220,9 +220,19 @@ async function runProof(ctx, args) {
   const preScrollback = await readTerminalTextBestEffort(session.page)
 
   // Close app normally; the detached daemon must remain alive.
-  await closeApp(session.app)
+  // Allow renderer acknowledgement and teardown; a tree kill invalidates survival evidence.
+  await closeApp(session.app, 45_000, { allowForceKill: false })
   const daemonAliveAfterClose = preDaemon.pid != null && isPidAlive(preDaemon.pid)
   log('daemon', `alive after app close: ${daemonAliveAfterClose}`)
+  log('marker', `alive after graceful app close: ${isPidAlive(created.markerPid)}`)
+  await delay(60_000)
+  log(
+    'pre-install-control',
+    JSON.stringify({
+      daemonAlive: preDaemon.pid != null && isPidAlive(preDaemon.pid),
+      markerAlive: isPidAlive(created.markerPid)
+    })
+  )
 
   // --- Start the console-window watch through the whole update + soak ---
   const watchDuration = 120 + opts.soakSeconds
@@ -241,6 +251,15 @@ async function runProof(ctx, args) {
   // uninstalls THAT and never scan-discovers the developer's real install.
   ctx.installedExePath = updated.exePath
   log('update', `installed ${updated.exePath} (version ${updated.version})`)
+  log(
+    'post-install-before-relaunch',
+    JSON.stringify({
+      daemonPid: preDaemon.pid,
+      daemonAlive: preDaemon.pid == null ? null : isPidAlive(preDaemon.pid),
+      markerPid: created.markerPid,
+      markerAlive: created.markerPid == null ? null : isPidAlive(created.markerPid)
+    })
+  )
 
   // --- Relaunch and gather post-update evidence ---
   session = await launchInstalledApp({ exePath: updated.exePath, userDataDir })
diff --git a/tests/tools/win-update-e2e/trace-installer-branches.mjs b/tests/tools/win-update-e2e/trace-installer-branches.mjs
new file mode 100644
index 000000000000..78dc59b64f8e
--- /dev/null
+++ b/tests/tools/win-update-e2e/trace-installer-branches.mjs
@@ -0,0 +1,115 @@
+import { readFileSync, writeFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const require = createRequire(import.meta.url)
+const builderRequire = createRequire(require.resolve('electron-builder/package.json'))
+const builderRoot = path.dirname(builderRequire.resolve('app-builder-lib/package.json'))
+const processChecks = path.join(
+  builderRoot,
+  'templates/nsis/include/allowOnlyOneInstallerInstance.nsh'
+)
+const hooks = fileURLToPath(
+  new URL('../../../config/nsis/orca-installer-hooks.nsh', import.meta.url)
+)
+const capabilityCheck = fileURLToPath(
+  new URL('../../../config/nsis/orca-process-check.nsh', import.meta.url)
+)
+
+// CI-only patch: the installer and its embedded uninstaller share these macros.
+const traceMacro = `
+!macro ORCA_E2E_TRACE TEXT
+  Push $R8
+  Push $R9
+  StrCpy $R8 0
+  \${if} \${Errors}
+    StrCpy $R8 1
+  \${endIf}
+  ClearErrors
+  ReadEnvStr $R9 ORCA_E2E_NSIS_TRACE
+  \${if} $R9 != ""
+    FileOpen $R9 "$R9" a
+    \${ifNot} \${Errors}
+      FileSeek $R9 0 END
+      FileWrite $R9 "$EXEPATH | $CMDLINE | dir=$INSTDIR | \${TEXT}$\\r$\\n"
+      FileClose $R9
+    \${endIf}
+  \${endIf}
+  ClearErrors
+  \${if} $R8 == 1
+    SetErrors
+  \${endIf}
+  Pop $R9
+  Pop $R8
+!macroend
+`
+
+function replaceOnce(source, anchor, replacement) {
+  if (source.split(anchor).length !== 2) {
+    throw new Error(`Expected one NSIS trace anchor: ${anchor}`)
+  }
+  return source.replace(anchor, () => replacement)
+}
+
+function insertAfter(source, anchor, insertion) {
+  return replaceOnce(source, anchor, `${anchor}\n${insertion}`)
+}
+
+let checks = readFileSync(processChecks, 'utf8').replaceAll('\r\n', '\n')
+checks = traceMacro + checks
+checks = insertAfter(
+  checks,
+  '!macro FIND_PROCESS _FILE _RETURN',
+  '  !insertmacro ORCA_E2E_TRACE "find image=${_FILE} branch=$IsPowerShellAvailable"'
+)
+checks = insertAfter(
+  checks,
+  '!macro KILL_PROCESS _FILE _FORCE',
+  '  !insertmacro ORCA_E2E_TRACE "kill image=${_FILE} force=${_FORCE} branch=$IsPowerShellAvailable"'
+)
+checks = replaceOnce(
+  checks,
+  '  Pop $0\n!macroend ',
+  '  Pop $0\n  !insertmacro ORCA_E2E_TRACE "kill-result=$0"\n!macroend '
+)
+const findCall = '!insertmacro FIND_PROCESS "${APP_EXECUTABLE_FILENAME}" $R0'
+if (checks.split(findCall).length !== 4) {
+  throw new Error('Expected three find-process calls')
+}
+checks = checks.replaceAll(
+  findCall,
+  () => `${findCall}\n    !insertmacro ORCA_E2E_TRACE "find-result=$R0"`
+)
+let uninstall = readFileSync(hooks, 'utf8').replaceAll('\r\n', '\n')
+uninstall = insertAfter(
+  uninstall,
+  '!macro customUnInstall',
+  '  !insertmacro ORCA_E2E_TRACE "custom-uninstall entered"'
+)
+uninstall = insertAfter(
+  uninstall,
+  '  ${ifNot} ${isUpdated}',
+  '    !insertmacro ORCA_E2E_TRACE "genuine-uninstall daemon sweep"'
+)
+let capability = readFileSync(capabilityCheck, 'utf8').replaceAll('\r\n', '\n')
+capability = insertAfter(
+  capability,
+  '  Pop $0',
+  '  !insertmacro ORCA_E2E_TRACE "capability=$0 powershell=$PowerShellPath"'
+)
+capability = replaceOnce(
+  capability,
+  '  !insertmacro _CHECK_APP_RUNNING',
+  '  !insertmacro ORCA_E2E_TRACE "selected-branch=$IsPowerShellAvailable (0=path,1=image)"\n  !insertmacro _CHECK_APP_RUNNING'
+)
+
+if (!process.argv.includes('--check')) {
+  if (process.env.GITHUB_ACTIONS !== 'true' || process.platform !== 'win32') {
+    throw new Error('Installer tracing may only patch a disposable Windows CI checkout')
+  }
+  writeFileSync(processChecks, checks)
+  writeFileSync(hooks, uninstall)
+  writeFileSync(capabilityCheck, capability)
+}
+console.log('Validated installer/uninstaller branch-trace anchors')
diff --git a/tests/tools/windows-pty-native-capability-smoke/run.test.mjs b/tests/tools/windows-pty-native-capability-smoke/run.test.mjs
index bb8ab525da6b..27439cb498e5 100644
--- a/tests/tools/windows-pty-native-capability-smoke/run.test.mjs
+++ b/tests/tools/windows-pty-native-capability-smoke/run.test.mjs
@@ -1,10 +1,7 @@
-import { readFileSync } from 'node:fs'
 import path from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { checkoutRunProcessPath, formatProbeFailure, packagedProbeInvocation } from './run.mjs'
 
-const runnerSource = readFileSync(new URL('./run.mjs', import.meta.url), 'utf8')
-
 describe('packaged Windows native smoke runner boundary', () => {
   it('uses one checkout-owned runner for current and affected package paths', () => {
     const current = packagedProbeInvocation('/ci/current/dist/win-unpacked/Orca.exe')
@@ -36,12 +33,4 @@ describe('packaged Windows native smoke runner boundary', () => {
     expect(failure).toContain('stdout-tail')
     expect(failure).toContain('stage=target-spawn:start')
   })
-
-  it('does not import child_process or resolve the runner from the artifact', () => {
-    expect(runnerSource).not.toContain('node:child_process')
-    expect(runnerSource).not.toMatch(
-      /path\.join\(resourcesDir[\s\S]*?app\.asar\.unpacked[\s\S]*?run-process\.js/
-    )
-    expect(runnerSource).toContain("'../../../out/shared/child-process/run-process.js'")
-  })
 })